Merge remote-tracking branch 'origin/master'

src/main/java/com/yipin/liuwanr/service/UserInfoService.java

@@ -541,8 +541,8 @@ public class UserInfoService {
 				userInfoMapper.updateLogInNumber(user);
 				String token = user.getToken();
 				ValueOperations<String, String> redis = stringRedisTemplate.opsForValue();
-				//redis.set(token,lastLoginTime, 24, TimeUnit.HOURS);
+				redis.set(token,lastLoginTime, 24, TimeUnit.HOURS);
-				//user.setDataTime(lastLoginTime);
+				user.setDataTime(lastLoginTime);
 				resp.put("retvalue",user);
 				resp.put("retcode", 200);
 			}

src/main/resources/application-test.properties

@@ -10,7 +10,7 @@ spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver
 #redis\u914D\u7F6E
 spring.redis.database=0
 spring.redis.host=127.0.0.1
-spring.redis.password=msdw@2021
+spring.redis.password=
 spring.redis.port=6379
 spring.redis.timeout=3000
 spring.redis.jedis.pool.max-idle=500

src/main/resources/application-test_keda.properties

@@ -0,0 +1,49 @@
+server.port=8090
+server.servlet.context-path=/liuwanr
+
+#\u6D4B\u8BD5\u6570\u636E\u5E93\u8FDE\u63A5
+spring.datasource.url=jdbc:mysql://rm-wz9y13wf7u8q8610fwo.mysql.rds.aliyuncs.com:3306/keda?useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai
+spring.datasource.username=super
+spring.datasource.password=huoran888
+spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver
+
+#redis\u914D\u7F6E
+spring.redis.database=0
+spring.redis.host=127.0.0.1
+spring.redis.password=msdw@2021
+spring.redis.port=6379
+spring.redis.timeout=3000
+spring.redis.jedis.pool.max-idle=500
+spring.redis.jedis.pool.min-idle=50
+spring.redis.jedis.pool.max-active=2000
+spring.redis.jedis.pool.max-wait=1000
+
+#redis-cluster
+redis.cluster.maxTotal=200
+redis.cluster.maxIdle=8
+redis.cluster.minIdle=3
+redis.cluster.nodes=192.168.136.191:8000,192.168.136.191:8001,192.168.136.191:8002
+
+spring.mina.port=9123
+spring.mina.buffersize=2048
+spring.mina.idletime=15
+spring.main.show-banner=false
+
+#\u65E5\u5FD7\u7EA7\u522B
+logging.level.jdbc=OFF
+logging.level.jdbc.sqltiming=DEBUG
+logging.level.jdbc.resultsettable=DEBUG
+logging.level.com.yipin.liuwar.mapper=DEBUG
+logging.level.com.yipin.liuwanr.mapper=DEBUG
+
+spring.elasticsearch.rest.uris=http://es-cn-v641e944a0006xtwy.elasticsearch.aliyuncs.com:9200
+spring.elasticsearch.rest.username=elastic
+spring.elasticsearch.rest.password=1qaz@WSX
+
+# maxFileSize \u5355\u4E2A\u6570\u636E\u5927\u5C0F
+spring.servlet.multipart.maxFileSize = 1024MB
+# maxRequestSize \u662F\u603B\u6570\u636E\u5927\u5C0F
+spring.servlet.multipart.maxRequestSize=10240MB
+
+pagehelper.reasonable=false
+

src/main/resources/application.properties

@@ -1,2 +1,2 @@
 #\u9009\u62E9\u6307\u5B9A\u73AF\u5883,\u76EE\u524D\u53EA\u6709\u6D4B\u8BD5\u548C\u6B63\u5F0F\u73AF\u5883
-spring.profiles.active=prod
+spring.profiles.active=test_keda