修复登陆不行的bug

dongjian-dashboard-back-common/src/main/java/com/dongjian/dashboard/back/common/Constants.java

@@ -11,12 +11,12 @@ public class Constants {
 	//这个很重要，不要随便动
 	public static final String DES_SALT = "ci3b512jwy199511";
 	
-	public static final String APP_NAME = "data-center-business:";
+	public static final String APP_NAME = "data-center-aeon:";
 
 	//用户ID，登录名，企业ID，token
-	public static final String ACCESS_TOKEN_FORMAT = "RequestHeader:AccessToken:{0}:{1}:{2}:{3}";
+	public static final String ACCESS_TOKEN_FORMAT = APP_NAME + "RequestHeader:AccessToken:{0}:{1}:{2}:{3}";
 	
-	public static final String CAPTCHA_VERIFICATION = "CAPTCHA:VERIFICATION:";
+	public static final String CAPTCHA_VERIFICATION = APP_NAME + "CAPTCHA:VERIFICATION:";
 
 	public static final String DATASOURCE_PREFIX = "dataSourceForCompany_";
 

dongjian-dashboard-back-controller/buildPush-prod.sh

@@ -1,11 +0,0 @@
-aws configure set aws_access_key_id AKIAVRXFMB43TOELSROK
-aws configure set aws_secret_access_key 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
-aws configure set default.region ap-northeast-1
-aws ecr get-login-password --region ap-northeast-1 | docker login --username AWS --password-stdin 381659385655.dkr.ecr.ap-northeast-1.amazonaws.com
-
-docker build -t 381659385655.dkr.ecr.ap-northeast-1.amazonaws.com/dashboard-back:latest\
-    --build-arg JAR_FILE=target/dongjian-dashboard-back-controller-0.0.1-SNAPSHOT.jar \
-    --build-arg LIB_DIR=target/lib \
-    --build-arg CONFIG_DIR=target/config \
-    .
-docker push 381659385655.dkr.ecr.ap-northeast-1.amazonaws.com/dashboard-back:latest

dongjian-dashboard-back-controller/buildPush-staging.sh

@@ -1,11 +0,0 @@
-aws configure set aws_access_key_id AKIA5OFH5OOZPCXZIRUQ
-aws configure set aws_secret_access_key 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
-aws configure set default.region ap-northeast-1
-aws ecr get-login-password --region ap-northeast-1 | docker login --username AWS --password-stdin 923770123186.dkr.ecr.ap-northeast-1.amazonaws.com
-
-docker build -t 923770123186.dkr.ecr.ap-northeast-1.amazonaws.com/dashboard-back:latest\
-    --build-arg JAR_FILE=target/dongjian-dashboard-back-controller-0.0.1-SNAPSHOT.jar \
-    --build-arg LIB_DIR=target/lib \
-    --build-arg CONFIG_DIR=target/config \
-    .
-docker push 923770123186.dkr.ecr.ap-northeast-1.amazonaws.com/dashboard-back:latest

dongjian-dashboard-back-controller/src/main/resources/config/application.properties

@@ -70,7 +70,7 @@ spring.redis.lettuce.pool.max-active=8
 spring.redis.lettuce.pool.max-wait=100
 # 连接池中的最大空闲连接
 spring.redis.lettuce.pool.max-idle=8
-# 连接池中的最小空闲连接
+# 连接池中的最 小空闲连接
 spring.redis.lettuce.pool.min-idle=0
 # 关闭超时时间
 spring.redis.lettuce.shutdown-timeout=100