From 54936e80685da4fb6d5b15b98bbeffc241dfbcd6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8B=8F=E7=AB=B9=E7=BA=A2?= Date: Tue, 9 Apr 2024 11:14:07 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/resources/application-ab.properties | 86 +++++++++++++++++++ .../resources/application-test.properties | 6 +- .../src/main/resources/application.properties | 1 - 3 files changed, 90 insertions(+), 3 deletions(-) create mode 100644 coolstore-partner-web/src/main/resources/application-ab.properties diff --git a/coolstore-partner-web/src/main/resources/application-ab.properties b/coolstore-partner-web/src/main/resources/application-ab.properties new file mode 100644 index 000000000..df93f62c6 --- /dev/null +++ b/coolstore-partner-web/src/main/resources/application-ab.properties @@ -0,0 +1,86 @@ + +#mysql config +default.datasource.url=jdbc:mysql://dingpushcoolcollege.mysql.rds.aliyuncs.com:3306/coolcollege_intelligent_36?useSSL=false&useUnicode=true&characterEncoding=utf8&allowMultiQueries=true&autoReconnect=true +default.datasource.username=coolstore +default.datasource.password=CSCErYcXniNYm7bT + +#redis +spring.redis.host=tstore-coolcollege.redis.rds.aliyuncs.com +spring.redis.port=6379 +spring.redis.password=Cx111111 +spring.redis.database=0 +spring.redis.timeout=2000ms +spring.redis.lettuce.pool.max-wait=100ms +spring.redis.lettuce.pool.max-active=1024 +spring.redis.lettuce.pool.max-idle=200 +spring.redis.lettuce.pool.min-idle=0 +spring.redis.lettuce.shutdown-timeout=100ms +redis.host.uri=http://userInfo:Cx111111@tstore-coolcollege.redis.rds.aliyuncs.com:6379/0 +redis.isv.host.uri=http://userInfo:Cx111111@tstore-coolcollege.redis.rds.aliyuncs.com:6379/2 + +#pagehelper +pagehelper.helper-dialect=mysql +pagehelper.reasonable=false +pagehelper.returnPageInfo=check +pagehelper.support-methods-arguments=false +pagehelper.params=count=countSql +pagehelper.page-size-zero=true + +spring.mvc.async.request-timeout=60000 + +# mybatis config +mybatis.mapper-locations=classpath*:mapper/**/*Mapper.xml + +mybatis.configuration.call-setters-on-nulls=true +mybatis.configuration.map-underscore-to-camel-case=true + +isv.domain=https://abstore-isv.coolstore.cn/isv + +#rocketmq \u914D\u7F6E +rocketmq.accessKey=LTAI5t5ouXZuFgxJMbQea3b2 +rocketmq.secretKey=yuomDstRjSdihtN5zo8viDbWu8Z0ig +rocketmq.nameSrvAdder=http://MQ_INST_1947409023213164_BX3sLZnA.cn-hangzhou.mq-internal.aliyuncs.com:8080 +rocketmq.topic=simple_message + +#oss配置 +oss.accessKeyId=LTAI5tRSXy2MrqaaBJ6gReur +oss.accessKeySecret=FFsl8d9batprJ0vXr0k4Y8ada40Wm2 +oss.endpoint=oss-cn-hangzhou.aliyuncs.com +oss.bucket=cool-store-hsay +oss.file.dir=partner/171cddee76471740/ +oss.excelFile.dir=lineExcel/ + +#企业corpId +corp.id=171cddee76471740 +#cdn地址 +cdn.url=https://testhsaypic.coolstore.cn + +#TRTC +trtc.sdkAppId=1600026212 +trtc.secretKey=e036b654c665f649f053a01ff6f5652a826980027be298d4d49949f6e26434a5 +trtc.video.callback.secretKey=ur4wq2iFbRI03Q35 + +weixin.appId=wx085c84fe42691bf1 +weixin.appSecret=58e89c9ec4ade1d094bbe21836a19ec4 +weixin.index.url=pages/index/index + +signKey=77fea013c3a6459685b83c21a2fc3411 +fixMobileOpenid=HSAY5531DA7 +#xxljob配置 +#xxljob配置 +xxl.job.admin.addresses = http://10.7.53.224:10001/xxl-job-admin +xxl.job.executor.appname = ${spring.application.name} +xxl.job.executor.ip = +xxl.job.executor.port = 40001 +xxl.job.executor.logpath = logs/xxl-job/jobhandler +xxl.job.executor.logretentiondays = 30 +xxl.job.accessToken = 25365115eed84e9ba5e0040abb255a09 + +exhibition.channel.id=52399 +recommended.channel.id=52400 + +coolstore.page.domain=https://t2store.coolstore.cn/ + +xfsg.url=https://inf-test.xianfengsg.com/InfService + +mybatis.configuration.variables.enterpriseId=e17cd2dc350541df8a8b0af9bd27f77d \ No newline at end of file diff --git a/coolstore-partner-web/src/main/resources/application-test.properties b/coolstore-partner-web/src/main/resources/application-test.properties index 52f6cc03c..ea9f85964 100644 --- a/coolstore-partner-web/src/main/resources/application-test.properties +++ b/coolstore-partner-web/src/main/resources/application-test.properties @@ -1,6 +1,6 @@ #mysql config -default.datasource.url=jdbc:mysql://dingpushcoolcollege.mysql.rds.aliyuncs.com:3306/coolcollege_intelligent_36?useSSL=false&useUnicode=true&characterEncoding=utf8&allowMultiQueries=true&autoReconnect=true +default.datasource.url=jdbc:mysql://dingpushcoolcollege.mysql.rds.aliyuncs.com:3306/coolcollege_intelligent_69?useSSL=false&useUnicode=true&characterEncoding=utf8&allowMultiQueries=true&autoReconnect=true default.datasource.username=coolstore default.datasource.password=CSCErYcXniNYm7bT @@ -81,4 +81,6 @@ recommended.channel.id=52400 coolstore.page.domain=https://t2store.coolstore.cn/ -xfsg.url=https://inf-test.xianfengsg.com/InfService \ No newline at end of file +xfsg.url=https://inf-test.xianfengsg.com/InfService + +mybatis.configuration.variables.enterpriseId=28c20a7b42b94171acb1ab3f631d69e1 \ No newline at end of file diff --git a/coolstore-partner-web/src/main/resources/application.properties b/coolstore-partner-web/src/main/resources/application.properties index 8f1465a9f..39d308f91 100644 --- a/coolstore-partner-web/src/main/resources/application.properties +++ b/coolstore-partner-web/src/main/resources/application.properties @@ -50,7 +50,6 @@ server.connection-timeout=18000000 server.tomcat.basedir=/tmp/tomcat/partner-b log4j2.formatMsgNoLookups=true -mybatis.configuration.variables.enterpriseId=e17cd2dc350541df8a8b0af9bd27f77d enterprise.dingCorpId=dingef2502a50df74ccc35c2f4657eb6378f wx.pay.merchantId=1670560201 From 5c74e478dd4303c516d2a8e4057245ae9f03d34e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8B=8F=E7=AB=B9=E7=BA=A2?= Date: Tue, 9 Apr 2024 11:17:47 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- coolstore-partner-web/src/main/resources/application.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/coolstore-partner-web/src/main/resources/application.properties b/coolstore-partner-web/src/main/resources/application.properties index 39d308f91..2a707966a 100644 --- a/coolstore-partner-web/src/main/resources/application.properties +++ b/coolstore-partner-web/src/main/resources/application.properties @@ -1,5 +1,5 @@ spring.application.name=hsay-partner-web -spring.profiles.active=test +spring.profiles.active=@profileActive@ server.port=40000 server.servlet.context-path=/xfsg