From 22ec62482cb1b99cf06dd301a3e53298ec0efca2 Mon Sep 17 00:00:00 2001 From: HuangXin Date: Fri, 18 Sep 2020 09:31:51 +0800 Subject: [PATCH] =?UTF-8?q?OCT=20REM:=201.=20=E6=9B=B4=E6=96=B0=E9=85=8D?= =?UTF-8?q?=E7=BD=AE=E6=96=87=E4=BB=B6=EF=BC=8C=E6=94=AF=E6=8C=81=E9=85=8D?= =?UTF-8?q?=E7=BD=AE=E9=A1=B9=E5=8A=A0=E5=AF=86=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- config/application-dispose.properties | 5 ++--- config/application-local.properties | 27 +++++---------------------- config/application-test.properties | 22 ++-------------------- 3 files changed, 9 insertions(+), 45 deletions(-) diff --git a/config/application-dispose.properties b/config/application-dispose.properties index cbaa9b64..3be98aaa 100644 --- a/config/application-dispose.properties +++ b/config/application-dispose.properties @@ -37,9 +37,9 @@ auth.token-timeout-minute=30 # 2 AES256加密 crypto.security-protocol-type=0 # AES256秘钥 -crypto.aes-key=hkoUV5ZWh0q1jSxMnpjovVn19Qg99HY6DD40 +crypto.aes-key=ENC@Trf2LEETes3oKnY1CF7LINcm2KlJbJxHIyvERz2174CTzQEhJtuo+PnO+fR3eDf+ # 3DES秘钥 -crypto.des-key=P3mq9iSIvQcvfyfdWR8sAnfAadO +crypto.des-key=ENC@JPYbpchhllvf6M+uolBFYOgM2fSyqGChRcnzoOCt6WM= #信任主机配置 # 白名单开关 @@ -48,4 +48,3 @@ trust.auth-white-list-check=true trust.auth-host-token=165B2AA40395fA27278E59eEd4DD5EA490DA175344DE2673A5B17D3760E12F0 # 白名单主机，多个主机逗号(,)分割 trust.auth-hosts=127.0.0.12,::1 - diff --git a/config/application-local.properties b/config/application-local.properties index 90b4a289..f6ec869a 100644 --- a/config/application-local.properties +++ b/config/application-local.properties @@ -4,16 +4,17 @@ server.tomcat.basedir=./basedir # 多个项目放在nginx下同个端口，通过该配置区分 server.servlet.context-path=/dispose # 配置数据源 -spring.datasource.url=jdbc:mysql://10.88.77.65:33061/dispose_hx?serverTimezone=Asia/Shanghai&zeroDateTimeBehavior\ +spring.datasource.url=jdbc:mysql://10.88.77.65:33061/dispose_test_v2?serverTimezone=Asia/Shanghai&zeroDateTimeBehavior\ =convertToNull&useUnicode=true&characterEncoding=utf8&allowMultiQueries=true spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver spring.datasource.username=root -spring.datasource.password=h0K0_8u +spring.datasource.password=ENC@eBlCdflAlcnta81xW9f86A== -#spring.datasource.url=jdbc:mysql://172.28.72.118:33061/dispose_v2?serverTimezone=Asia/Shanghai&zeroDateTimeBehavior=convertToNull&useUnicode=true +#spring.datasource.url=jdbc:mysql://172.28.72.118:33061/dispose_hx_v2?serverTimezone=Asia/Shanghai&zeroDateTimeBehavior\ +# =convertToNull&useUnicode=true #spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver #spring.datasource.username=phoenix -#spring.datasource.password=Hy@rfph32 +#spring.datasource.password=ENC@yr1dDL7FO8J642rqx5sD7Q== # 配置连接池 spring.datasource.type=org.apache.commons.dbcp2.BasicDataSource @@ -42,22 +43,4 @@ spring.jackson.mapper.allow-coercion-of-scalars=false #====custom config,begin with phoenix==== #test phoenix.system-name=phoenix framework -#config the swagger api switch true:可访问;false:不可访问 -phoenix.swagger-switch=true -#config which client to use in redis, -#jedis or redisson-sentinel,redisson-single -phoenix.redis.type=redisson-single -#config redis info -#jedis config example>redis://:dfu56li_jdo8pd@172.28.72.111:7379/0,多个用逗号分隔 -#redisson sentinel config example>redis://172.28.72.104:28379,redis://172.28.72.124:28380,redis://172.28.72.124:28381 -#redisson single config example>redis://172.28.72.104:8380 -#phoenix.redis-server=redis://172.28.72.104:8380 -phoenix.redis-redisson-sentinel-master-name=mymaster -phoenix.redis-redisson-pwd=cmcc2019 -#config request dec switch,true=dec,false=plain do nothing -phoenix.request-dec-switch=false -#config response enc switch,true=enc,false=plain do nothing -phoenix.response-enc-switch=false -#config aes 128 key,用于上述body的加解密 -phoenix.aes-key=Wt4EJu6Rrq5udd/42bNpCQ== #====custom config,begin with phoenix==== diff --git a/config/application-test.properties b/config/application-test.properties index 8985a781..e9f1cd6a 100644 --- a/config/application-test.properties +++ b/config/application-test.properties @@ -8,11 +8,11 @@ spring.datasource.url=jdbc:mysql://10.88.77.65:33061/ci_dispose_v2?serverTimezon =convertToNull&useUnicode=true&characterEncoding=utf8&allowMultiQueries=true spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver spring.datasource.username=root -spring.datasource.password=h0K0_8u +spring.datasource.password=ENC@eBlCdflAlcnta81xW9f86A== #spring.datasource.url=jdbc:mysql://172.28.72.118:33061/ci_dispose_v2?serverTimezone=Asia/Shanghai&zeroDateTimeBehavior=convertToNull&useUnicode=true #spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver #spring.datasource.username=phoenix -#spring.datasource.password=Hy@rfph32 +#spring.datasource.password=ENC@yr1dDL7FO8J642rqx5sD7Q== # 配置连接池 spring.datasource.schema=classpath:test_db/unit_test.sql @@ -43,22 +43,4 @@ spring.jackson.mapper.allow-coercion-of-scalars=false #====custom config,begin with phoenix==== #test phoenix.system-name=phoenix framework -#config the swagger api switch true:可访问;false:不可访问 -phoenix.swagger-switch=true -#config which client to use in redis, -#jedis or redisson-sentinel,redisson-single -phoenix.redis.type=redisson-single -#config redis info -#jedis config example>redis://:dfu56li_jdo8pd@172.28.72.111:7379/0,多个用逗号分隔 -#redisson sentinel config example>redis://172.28.72.104:28379,redis://172.28.72.124:28380,redis://172.28.72.124:28381 -#redisson single config example>redis://172.28.72.104:8380 -#phoenix.redis-server=redis://172.28.72.104:8380 -phoenix.redis-redisson-sentinel-master-name=mymaster -phoenix.redis-redisson-pwd=cmcc2019 -#config request dec switch,true=dec,false=plain do nothing -phoenix.request-dec-switch=false -#config response enc switch,true=enc,false=plain do nothing -phoenix.response-enc-switch=false -#config aes 128 key,用于上述body的加解密 -phoenix.aes-key=Wt4EJu6Rrq5udd/42bNpCQ== #====custom config,begin with phoenix====