From d6ca242de2fec9db9514255a1a3f427ef80cf5ee Mon Sep 17 00:00:00 2001 From: "zhczyx@163.com" Date: Mon, 3 Nov 2025 22:44:06 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E7=99=BB=E9=99=86=E4=B8=8D?= =?UTF-8?q?=E8=A1=8C=E7=9A=84bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/dongjian/dashboard/back/common/Constants.java | 6 +++--- dongjian-dashboard-back-controller/buildPush-prod.sh | 11 ----------- .../buildPush-staging.sh | 11 ----------- .../src/main/resources/config/application.properties | 2 +- 4 files changed, 4 insertions(+), 26 deletions(-) delete mode 100644 dongjian-dashboard-back-controller/buildPush-prod.sh delete mode 100644 dongjian-dashboard-back-controller/buildPush-staging.sh diff --git a/dongjian-dashboard-back-common/src/main/java/com/dongjian/dashboard/back/common/Constants.java b/dongjian-dashboard-back-common/src/main/java/com/dongjian/dashboard/back/common/Constants.java index b8e3fd2..9a5ac6c 100644 --- a/dongjian-dashboard-back-common/src/main/java/com/dongjian/dashboard/back/common/Constants.java +++ b/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_"; diff --git a/dongjian-dashboard-back-controller/buildPush-prod.sh b/dongjian-dashboard-back-controller/buildPush-prod.sh deleted file mode 100644 index 523eb09..0000000 --- a/dongjian-dashboard-back-controller/buildPush-prod.sh +++ /dev/null @@ -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 \ No newline at end of file diff --git a/dongjian-dashboard-back-controller/buildPush-staging.sh b/dongjian-dashboard-back-controller/buildPush-staging.sh deleted file mode 100644 index 9b20e10..0000000 --- a/dongjian-dashboard-back-controller/buildPush-staging.sh +++ /dev/null @@ -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 \ No newline at end of file diff --git a/dongjian-dashboard-back-controller/src/main/resources/config/application.properties b/dongjian-dashboard-back-controller/src/main/resources/config/application.properties index 56a06ba..d2ad357 100644 --- a/dongjian-dashboard-back-controller/src/main/resources/config/application.properties +++ b/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