Sfoglia il codice sorgente

@IPU_REQ_2021@spring
session2.1.12为最后一个支持动态修改session失效时间的版本,所支持的springboot最高版本为2.1.18。

weihf 3 anni fa
parent
commit
8b033c4ffb

+ 18 - 16
ipu-rest-scaffold/pom.xml

@ -43,25 +43,22 @@
43 43
	</repositories>
44 44
45 45
	<properties>
46
	    <!-- 如果不使用docker打包功能,请设置dockerDirectory为${basedir} -->
47
        <!-- <dockerDirectory>${basedir}</dockerDirectory> -->
46
		<!-- 如果不使用docker打包功能,请设置dockerDirectory为${basedir} -->
47
		<!-- <dockerDirectory>${basedir}</dockerDirectory> -->
48 48
		<env>dev</env>
49 49
		<start-class>com.ai.ipu.server.RestScaffoldStart</start-class>
50 50
		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
51
		<ipu>3.2-SNAPSHOT</ipu>
51
		<ipu>3.3-SNAPSHOT</ipu>
52 52
		<!-- ipu-dependencies3.3-SNAPSHOT起,不再支持springboot1.x,升级为springboot2.1.3-RELEASE -->
53
		<ipu-rest>3.2-SNAPSHOT</ipu-rest>
54
		<org.springframework.boot>1.5.9.RELEASE</org.springframework.boot>
53
		<ipu-rest>3.1-SNAPSHOT</ipu-rest>
54
		<org.springframework.boot>2.1.18.RELEASE</org.springframework.boot>
55 55
56 56
		<!-- docker仓库服务器及端口,如果只是docker容器,则为镜像前缀 -->
57
		<!-- ipudocker.com对应公网阿里云私库47.105.130.83或公司内网亚信云私库10.19.14.114  -->
57
		<!-- ipudocker.com对应公网阿里云私库47.105.130.83或公司内网亚信云私库10.19.14.114 -->
58 58
		<docker-registry-server>ipudocker.com:5000</docker-registry-server>
59
		<!-- docker仓库身份认证方式及用户密码,如果只是docker容器,请设置为空。
60
		由于3.3-SNAPSHOT的parent pom里已经缺省设置好了阿里云和亚信云私人仓库用户、密码,因此这里不再需要定义
61
		如果是自己安装的私人仓库,且用户、密码不同,则必须打开注释,定义自己的仓库用户、密码。
62
		<docker-registry-auth>basic</docker-registry-auth>
63
		<docker-registry-username>ipu</docker-registry-username>
64
		<docker-registry-password>ipuDocker@83</docker-registry-password> -->
59
		<!-- docker仓库身份认证方式及用户密码,如果只是docker容器,请设置为空。 由于3.3-SNAPSHOT的parent pom里已经缺省设置好了阿里云和亚信云私人仓库的用户、密码,因此这里不再需要定义 
60
			如果是自己安装的私人仓库,且用户、密码不同,则必须打开注释,定义自己的仓库用户、密码。 <docker-registry-auth>basic</docker-registry-auth> 
61
			<docker-registry-username>ipu</docker-registry-username> <docker-registry-password>ipuDocker@83</docker-registry-password> -->
65 62
	</properties>
66 63
67 64
	<dependencyManagement>
@ -91,6 +88,7 @@
91 88
		<dependency>
92 89
			<groupId>com.ai.ipu.server</groupId>
93 90
			<artifactId>ipu-restful</artifactId>
91
			<version>3.3-SNAPSHOT</version>
94 92
		</dependency>
95 93
		<dependency>
96 94
			<groupId>com.ai.ipu</groupId>
@ -112,17 +110,21 @@
112 110
					<groupId>org.springframework.boot</groupId>
113 111
					<artifactId>spring-boot-starter-logging</artifactId>
114 112
				</exclusion>
113
				<exclusion>
114
					<groupId>org.springframework.data</groupId>
115
					<artifactId>spring-data-redis</artifactId>
116
				</exclusion>
115 117
			</exclusions>
116 118
		</dependency>
117 119
		<dependency>
118
			<groupId>org.springframework.session</groupId>
119
			<artifactId>spring-session-data-redis</artifactId>
120
			<groupId>org.springframework.boot</groupId>
121
			<artifactId>spring-boot-starter-web</artifactId>
122
			<version>${org.springframework.boot}</version>
120 123
		</dependency>
121
122 124
	</dependencies>
123 125
124 126
	<build>
125
        <!-- <directory>${project.basedir}/docker/target</directory> -->
127
		<!-- <directory>${project.basedir}/docker/target</directory> -->
126 128
		<plugins>
127 129
			<!-- ==========应用包和依赖包分离的打包方法================ -->
128 130
			<plugin>

+ 3 - 4
ipu-rest-scaffold/src/main/java/com/ai/ipu/server/config/RedisSessionConfig.java

@ -1,6 +1,5 @@
1 1
package com.ai.ipu.server.config;
2 2

3
import org.springframework.beans.factory.annotation.Qualifier;
4 3
import org.springframework.beans.factory.annotation.Value;
5 4
import org.springframework.context.ApplicationEventPublisher;
6 5
import org.springframework.context.annotation.Bean;
@ -25,9 +24,9 @@ public class RedisSessionConfig {
25 24
    @Primary
26 25
    @Bean
27 26
    public RedisOperationsSessionRepository sessionRepository(
28
        @Qualifier("sessionRedisTemplate") 
29
        RedisOperations<Object, Object> sessionRedisTemplate, ApplicationEventPublisher applicationEventPublisher) {
30
        RedisOperationsSessionRepository sessionRepository = new RedisOperationsSessionRepository(sessionRedisTemplate);
27
//    		@Qualifier("redisTemplate")
28
        RedisOperations<Object, Object> springStringRedisCache, ApplicationEventPublisher applicationEventPublisher) {
29
        RedisOperationsSessionRepository sessionRepository = new RedisOperationsSessionRepository(springStringRedisCache);
31 30
        sessionRepository.setApplicationEventPublisher(applicationEventPublisher);
32 31
        sessionRepository.setDefaultMaxInactiveInterval(sessionTimeout);
33 32
        return sessionRepository;

+ 11 - 2
ipu-rest-scaffold/src/main/resources/dev/application.yml

@ -1,5 +1,12 @@
1
#1.x默认/
2
#server.context-path=/ipu
3
#默认/。注册DispatcherServlet对应path,亦可通过dispatcherRegistration方法配置
4
#server.servlet-path=/
5
#2.x
6
#server.servlet.context-path=/ipu
1 7
server:
2
  context-path: /ipu
8
  servlet:
9
    context-path: /ipu
3 10
  #通过启动命令传参指定端口
4 11
  port: unknown
5 12
spring:
@ -28,7 +35,9 @@ spring:
28 35
web:
29 36
  root: webapp/
30 37
logging:
31
  file: target/logs/${project.artifactId}.log
38
  level: 
39
    root: DEBUG
40
  file: /data/logs/boot.log
32 41
define:
33 42
  session:
34 43
    timeout: 1800

+ 11 - 4
ipu-rest-scaffold/src/main/resources/docker/application.yml

@ -1,5 +1,12 @@
1
#1.x默认/
2
#server.context-path=/ipu
3
#默认/。注册DispatcherServlet对应path,亦可通过dispatcherRegistration方法配置
4
#server.servlet-path=/
5
#2.x
6
#server.servlet.context-path=/ipu
1 7
server:
2
  context-path: /ipu
8
  servlet:
9
    context-path: /ipu
3 10
  #通过启动命令传参指定端口
4 11
  port: unknown
5 12
spring:
@ -16,9 +23,9 @@ spring:
16 23
    store-type: redis
17 24
  #redis集群和连接池相关配置
18 25
  redis:
19
    host: 47.105.160.21
20
    port: 7111
21
    password: ipu
26
    host: rest-scaffold-redis
27
    port: 6379
28
    password: ipu@321
22 29
    pool:
23 30
      max-active: 8
24 31
      max-idle: 8

+ 8 - 1
ipu-rest-scaffold/src/main/resources/pro/application.yml

@ -1,5 +1,12 @@
1
#1.x默认/
2
#server.context-path=/ipu
3
#默认/。注册DispatcherServlet对应path,亦可通过dispatcherRegistration方法配置
4
#server.servlet-path=/
5
#2.x
6
#server.servlet.context-path=/ipu
1 7
server:
2
  context-path: /ipu
8
  servlet:
9
    context-path: /ipu
3 10
  #通过启动命令传参指定端口
4 11
  port: unknown
5 12
spring:

+ 8 - 1
ipu-rest-scaffold/src/main/resources/test/application.yml

@ -1,5 +1,12 @@
1
#1.x默认/
2
#server.context-path=/ipu
3
#默认/。注册DispatcherServlet对应path,亦可通过dispatcherRegistration方法配置
4
#server.servlet-path=/
5
#2.x
6
#server.servlet.context-path=/ipu
1 7
server:
2
  context-path: /ipu
8
  servlet:
9
    context-path: /ipu
3 10
  #通过启动命令传参指定端口
4 11
  port: unknown
5 12
spring: