From a5a43d2708298f675d5d1cb9bb31f80c87e65fe5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=BF=9E=E6=89=AC?= Date: Wed, 19 Jul 2023 13:21:17 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8E=A5=E5=85=A5nacos=E9=85=8D=E7=BD=AE?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/resources/application-ab.properties | 89 ------------------- .../resources/application-online.properties | 65 -------------- .../main/resources/bootstrap-dev.properties | 4 +- .../main/resources/bootstrap-test.properties | 3 + .../src/main/resources/bootstrap.properties | 2 +- .../main/resources/application-ab.properties | 72 --------------- .../resources/application-online.properties | 62 ------------- .../main/resources/bootstrap-dev.properties | 4 +- .../main/resources/bootstrap-test.properties | 3 + .../src/main/resources/bootstrap.properties | 11 +-- 10 files changed, 17 insertions(+), 298 deletions(-) delete mode 100644 coolstore-partner-webb/src/main/resources/application-ab.properties delete mode 100644 coolstore-partner-webb/src/main/resources/application-online.properties create mode 100644 coolstore-partner-webb/src/main/resources/bootstrap-test.properties delete mode 100644 coolstore-partner-webc/src/main/resources/application-ab.properties delete mode 100644 coolstore-partner-webc/src/main/resources/application-online.properties create mode 100644 coolstore-partner-webc/src/main/resources/bootstrap-test.properties diff --git a/coolstore-partner-webb/src/main/resources/application-ab.properties b/coolstore-partner-webb/src/main/resources/application-ab.properties deleted file mode 100644 index da322ce70..000000000 --- a/coolstore-partner-webb/src/main/resources/application-ab.properties +++ /dev/null @@ -1,89 +0,0 @@ -#mysql config -default.datasource.url=jdbc:mysql://dingpushcoolcollege.mysql.rds.aliyuncs.com:3306/coolcollege_intelligent_hy?useSSL=false&useUnicode=true&characterEncoding=utf8&allowMultiQueries=true&autoReconnect=true -default.datasource.username=hsay -default.datasource.password=Z3J7xBbgouMD - -#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=zK2oVEz4G1ts23d2 -rocketmq.secretKey=0UstLCS0mh2ASgBh -rocketmq.nameSrvAdder=http://rmq-cn-9lb38l1rx04.cn-hangzhou.rmq.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/ - -#企业corpId -corp.id = 171cddee76471740 -#cdn地址 -cdn.url=https://testhsaypic.coolstore.cn - -#TRTC -trtc.sdkAppId=1400811820 -trtc.secretKey=4854bab106c2ca2a2fda16a8c966933e28a078a34e458999d6227e8cd8ab8219 -trtc.video.callback.secretKey=1ECEAD34DBD84E838BF07FC7360EA4D8 - -weixin.appId=wx6f984e535e571818 -weixin.appSecret=245a483747e6e9f8762d3e8539cf0318 - -signKey=77fea013c3a6459685b83c21a2fc3411 -fixMobileOpenid=HSAY5531DA7 -#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 = 31001 -xxl.job.executor.logpath = logs/xxl-job/jobhandler -xxl.job.executor.logretentiondays = 3 -xxl.job.accessToken = - -hs.mdm.baseUrl=http://36.7.115.86:10112 -hs.mdm.appkey = HSAYPartner -hs.mdm.appsec = ab39fedb886fa3587c7f517551976de8b2606f5511fd8f8675266825d74c5cd3 - -#sms -hs.sms.accessKeyId = LTAI4GEZKz9PBqqKa3hjup3W -hs.sms.accessKeySecret = iVOiK74k7C1wVbuUbipgJbfpAh1Zdb -hs.sms.templateCode = SMS_461530041 - -ec.baseUrl=https://oapi-gateway.shpr.top/basic - -#阿里云ak sk -aliyun.accessKeyId=LTAI5t9RaXvABZbHvoXjDFJ1 -aliyun.accessKeySecret=zhOK7WWo3yGoUWkOMaatty19k25CMd -aliyun.authCode=Y81FVZepk6 \ No newline at end of file diff --git a/coolstore-partner-webb/src/main/resources/application-online.properties b/coolstore-partner-webb/src/main/resources/application-online.properties deleted file mode 100644 index 3764060eb..000000000 --- a/coolstore-partner-webb/src/main/resources/application-online.properties +++ /dev/null @@ -1,65 +0,0 @@ -#mysql config -default.datasource.url=jdbc:mysql://store-coolcollege.mysql.rds.aliyuncs.com:3306/coolcollege_intelligent_config?useUnicode=true&characterEncoding=UTF-8&useSSL=false&autoReconnect=true&failOverReadOnly=false&serverTimezone=Asia/Shanghai&allowMultiQueries=true -default.datasource.username=coolstore -default.datasource.password=CSCErYcXniNYm7bT - -#redis -spring.redis.host=store-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@store-coolcollege.redis.rds.aliyuncs.com:6379/0 -redis.isv.host.uri=http://userInfo:Cx111111@store-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://store-isv.coolcollege.cn - -#rocketmq \u914D\u7F6E -rocketmq.accessKey=LTAI5t5ouXZuFgxJMbQea3b2 -rocketmq.secretKey=yuomDstRjSdihtN5zo8viDbWu8Z0ig -rocketmq.nameSrvAdder=http://MQ_INST_1947409023213164_BX5N7rwl.cn-hangzhou.mq-internal.aliyuncs.com:8080 -rocketmq.topic=simple_message -rocketmq.orderTopic=order_message - -#oss配置 -oss.accessKeyId=LTAI5tKSnAbkEbmT6CeBwNN3 -oss.accessKeySecret=PbXOzUFwAvZ2K5zIawwa7NAJE2pFXS -oss.endpoint=oss-cn-shanghai.aliyuncs.com -oss.bucket=vec-coolstore -corp.id = 171cddee76471740 -oss.file.dir = partner/ -#TRTC -trtc.sdkAppId=1400811820 -trtc.secretKey=4854bab106c2ca2a2fda16a8c966933e28a078a34e458999d6227e8cd8ab8219 -trtc.video.callback.secretKey=1ECEAD34DBD84E838BF07FC7360EA4D8 - -weixin.appId=wx6f984e535e571818 -weixin.appSecret=245a483747e6e9f8762d3e8539cf0318 - -signKey=d851f2a9ac90474abecdc2fbb148d4d7 -fixMobileOpenid=HSAY4AF322E -#阿里云ak sk -aliyun.accessKeyId= -aliyun.accessKeySecret= -aliyun.authCode= \ No newline at end of file diff --git a/coolstore-partner-webb/src/main/resources/bootstrap-dev.properties b/coolstore-partner-webb/src/main/resources/bootstrap-dev.properties index 73e64f0f1..e20af0316 100644 --- a/coolstore-partner-webb/src/main/resources/bootstrap-dev.properties +++ b/coolstore-partner-webb/src/main/resources/bootstrap-dev.properties @@ -1,3 +1,3 @@ -spring.cloud.nacos.discovery.server-addr=192.168.1.202:8848 -spring.cloud.nacos.config.server-addr=192.168.1.202:8848 +spring.cloud.nacos.discovery.server-addr=121.41.41.92 +spring.cloud.nacos.config.server-addr=121.41.41.92 spring.cloud.nacos.config.file-extension=properties \ No newline at end of file diff --git a/coolstore-partner-webb/src/main/resources/bootstrap-test.properties b/coolstore-partner-webb/src/main/resources/bootstrap-test.properties new file mode 100644 index 000000000..e20af0316 --- /dev/null +++ b/coolstore-partner-webb/src/main/resources/bootstrap-test.properties @@ -0,0 +1,3 @@ +spring.cloud.nacos.discovery.server-addr=121.41.41.92 +spring.cloud.nacos.config.server-addr=121.41.41.92 +spring.cloud.nacos.config.file-extension=properties \ No newline at end of file diff --git a/coolstore-partner-webb/src/main/resources/bootstrap.properties b/coolstore-partner-webb/src/main/resources/bootstrap.properties index e8cb5a145..ed2256673 100644 --- a/coolstore-partner-webb/src/main/resources/bootstrap.properties +++ b/coolstore-partner-webb/src/main/resources/bootstrap.properties @@ -1,5 +1,5 @@ spring.application.name=hsay-partner-webb -spring.profiles.active=dev +spring.profiles.active=@profileActive@ server.port=31000 server.servlet.context-path=/partner/pc diff --git a/coolstore-partner-webc/src/main/resources/application-ab.properties b/coolstore-partner-webc/src/main/resources/application-ab.properties deleted file mode 100644 index 62c2e93e6..000000000 --- a/coolstore-partner-webc/src/main/resources/application-ab.properties +++ /dev/null @@ -1,72 +0,0 @@ -#mysql config -default.datasource.url=jdbc:mysql://dingpushcoolcollege.mysql.rds.aliyuncs.com:3306/coolcollege_intelligent_hy?useSSL=false&useUnicode=true&characterEncoding=utf8&allowMultiQueries=true&autoReconnect=true -default.datasource.username=hsay -default.datasource.password=Z3J7xBbgouMD - -#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=zK2oVEz4G1ts23d2 -rocketmq.secretKey=0UstLCS0mh2ASgBh -rocketmq.nameSrvAdder=http://rmq-cn-9lb38l1rx04.cn-hangzhou.rmq.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/ - -#企业corpId -corp.id = 171cddee76471740 -#cdn地址 -cdn.url=https://testhsaypic.coolstore.cn - -#TRTC -trtc.sdkAppId=1400811820 -trtc.secretKey=4854bab106c2ca2a2fda16a8c966933e28a078a34e458999d6227e8cd8ab8219 - -weixin.appId=wxb2a0addf956ad4b7 -weixin.appSecret=77abdcae754add92889566b543e5ad79 - -signKey=77fea013c3a6459685b83c21a2fc3411 -fixMobileOpenid=HSAY5531DA7 - -#飞书通知 -feishu.notice.link.url = https://applink.feishu.cn/client/web_app/open?appId=cli_a4f3e24dc73a100c&lk_target_url=https%3A%2F%2Ftest-hsay-web.coolstore.cn%2F%23%2Fwork%2Fbench - -#阿里云ak sk -aliyun.accessKeyId=LTAI5t9RaXvABZbHvoXjDFJ1 -aliyun.accessKeySecret=zhOK7WWo3yGoUWkOMaatty19k25CMd -aliyun.authCode=Y81FVZepk6 \ No newline at end of file diff --git a/coolstore-partner-webc/src/main/resources/application-online.properties b/coolstore-partner-webc/src/main/resources/application-online.properties deleted file mode 100644 index 1ce5a8613..000000000 --- a/coolstore-partner-webc/src/main/resources/application-online.properties +++ /dev/null @@ -1,62 +0,0 @@ -#mysql config -default.datasource.url=jdbc:mysql://store-coolcollege.mysql.rds.aliyuncs.com:3306/coolcollege_intelligent_config?useUnicode=true&characterEncoding=UTF-8&useSSL=false&autoReconnect=true&failOverReadOnly=false&serverTimezone=Asia/Shanghai&allowMultiQueries=true -default.datasource.username=coolstore -default.datasource.password=CSCErYcXniNYm7bT - -#redis -spring.redis.host=store-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@store-coolcollege.redis.rds.aliyuncs.com:6379/0 -redis.isv.host.uri=http://userInfo:Cx111111@store-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 - -#rocketmq \u914D\u7F6E -rocketmq.accessKey=LTAI5t5ouXZuFgxJMbQea3b2 -rocketmq.secretKey=yuomDstRjSdihtN5zo8viDbWu8Z0ig -rocketmq.nameSrvAdder=http://MQ_INST_1947409023213164_BX5N7rwl.cn-hangzhou.mq-internal.aliyuncs.com:8080 -rocketmq.topic=simple_message - -#oss配置 -oss.accessKeyId=LTAI5tKSnAbkEbmT6CeBwNN3 -oss.accessKeySecret=PbXOzUFwAvZ2K5zIawwa7NAJE2pFXS -oss.endpoint=oss-cn-shanghai.aliyuncs.com -oss.bucket=vec-coolstore -corp.id = 171cddee76471740 -oss.file.dir = partner/171cddee76471740/ - -#TRTC -trtc.sdkAppId=1400811820 -trtc.secretKey=4854bab106c2ca2a2fda16a8c966933e28a078a34e458999d6227e8cd8ab8219 - -weixin.appId=wxb2a0addf956ad4b7 -weixin.appSecret=77abdcae754add92889566b543e5ad79 - -signKey=d851f2a9ac90474abecdc2fbb148d4d7 -fixMobileOpenid=HSAY4AF322E -#阿里云ak sk -aliyun.accessKeyId= -aliyun.accessKeySecret= -aliyun.authCode= \ No newline at end of file diff --git a/coolstore-partner-webc/src/main/resources/bootstrap-dev.properties b/coolstore-partner-webc/src/main/resources/bootstrap-dev.properties index 73e64f0f1..e20af0316 100644 --- a/coolstore-partner-webc/src/main/resources/bootstrap-dev.properties +++ b/coolstore-partner-webc/src/main/resources/bootstrap-dev.properties @@ -1,3 +1,3 @@ -spring.cloud.nacos.discovery.server-addr=192.168.1.202:8848 -spring.cloud.nacos.config.server-addr=192.168.1.202:8848 +spring.cloud.nacos.discovery.server-addr=121.41.41.92 +spring.cloud.nacos.config.server-addr=121.41.41.92 spring.cloud.nacos.config.file-extension=properties \ No newline at end of file diff --git a/coolstore-partner-webc/src/main/resources/bootstrap-test.properties b/coolstore-partner-webc/src/main/resources/bootstrap-test.properties new file mode 100644 index 000000000..e20af0316 --- /dev/null +++ b/coolstore-partner-webc/src/main/resources/bootstrap-test.properties @@ -0,0 +1,3 @@ +spring.cloud.nacos.discovery.server-addr=121.41.41.92 +spring.cloud.nacos.config.server-addr=121.41.41.92 +spring.cloud.nacos.config.file-extension=properties \ No newline at end of file diff --git a/coolstore-partner-webc/src/main/resources/bootstrap.properties b/coolstore-partner-webc/src/main/resources/bootstrap.properties index 0f8e4f464..ed2256673 100644 --- a/coolstore-partner-webc/src/main/resources/bootstrap.properties +++ b/coolstore-partner-webc/src/main/resources/bootstrap.properties @@ -1,7 +1,8 @@ -spring.application.name=hsay-partner-webc -spring.profiles.active=dev -server.port=30900 -server.servlet.context-path=/partner/mini/program +spring.application.name=hsay-partner-webb +spring.profiles.active=@profileActive@ + +server.port=31000 +server.servlet.context-path=/partner/pc #logback logging.config=classpath:logback-spring.xml @@ -46,6 +47,6 @@ allow.upload.video.size=1024 * 1024 * 10L allow.upload.audio.size=1024 * 1024 * 10L server.connection-timeout=18000000 -server.tomcat.basedir=/tmp/tomcat/partner-c +server.tomcat.basedir=/tmp/tomcat/partner-b log4j2.formatMsgNoLookups=true