From 8b598aa96206f7e341e56a05fffe03c57c291e57 Mon Sep 17 00:00:00 2001 From: zhangchenbiao Date: Tue, 4 Jul 2023 14:08:29 +0800 Subject: [PATCH] =?UTF-8?q?=E9=85=8D=E7=BD=AE=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- coolstore-partner-webb/pom.xml | 24 ------ .../store/controller/OssClientController.java | 6 +- .../main/resources/application-ab.properties | 1 + .../main/resources/application-dev.properties | 77 ------------------- .../main/resources/application-hd.properties | 60 --------------- .../resources/application-local.properties | 2 +- .../resources/application-online.properties | 2 +- .../main/resources/application-pre.properties | 61 --------------- .../resources/application-test.properties | 60 --------------- coolstore-partner-webc/pom.xml | 24 ------ .../store/controller/OssClientController.java | 6 +- .../main/resources/application-ab.properties | 1 + .../main/resources/application-dev.properties | 64 --------------- .../main/resources/application-hd.properties | 57 -------------- .../resources/application-local.properties | 2 +- .../resources/application-online.properties | 1 + .../main/resources/application-pre.properties | 57 -------------- .../resources/application-test.properties | 57 -------------- 18 files changed, 10 insertions(+), 552 deletions(-) delete mode 100644 coolstore-partner-webb/src/main/resources/application-dev.properties delete mode 100644 coolstore-partner-webb/src/main/resources/application-hd.properties delete mode 100644 coolstore-partner-webb/src/main/resources/application-pre.properties delete mode 100644 coolstore-partner-webb/src/main/resources/application-test.properties delete mode 100644 coolstore-partner-webc/src/main/resources/application-dev.properties delete mode 100644 coolstore-partner-webc/src/main/resources/application-hd.properties delete mode 100644 coolstore-partner-webc/src/main/resources/application-pre.properties delete mode 100644 coolstore-partner-webc/src/main/resources/application-test.properties diff --git a/coolstore-partner-webb/pom.xml b/coolstore-partner-webb/pom.xml index d6ef7b991..83e98f2db 100644 --- a/coolstore-partner-webb/pom.xml +++ b/coolstore-partner-webb/pom.xml @@ -32,12 +32,6 @@ - - dev - - dev - - local @@ -47,12 +41,6 @@ local - - test - - test - - ab @@ -65,18 +53,6 @@ online - - hd - - hd - - - - pre - - pre - - diff --git a/coolstore-partner-webb/src/main/java/com/cool/store/controller/OssClientController.java b/coolstore-partner-webb/src/main/java/com/cool/store/controller/OssClientController.java index ce0f45217..8ed8596db 100644 --- a/coolstore-partner-webb/src/main/java/com/cool/store/controller/OssClientController.java +++ b/coolstore-partner-webb/src/main/java/com/cool/store/controller/OssClientController.java @@ -38,17 +38,15 @@ public class OssClientController { private String endpoint; @Value("${oss.bucket:null}") private String bucket; - @Value("${corp.id:null}") - private String corpId; @Value("${cdn.url:null}") private String cdnUrl; + @Value("${oss.file.dir:null}") + private String dir; @GetMapping("/getUploadFileConfig") public ResponseResult getUploadFileConfig(){ // host的格式为 bucketname.endpoint String host = "https://" + bucket + "." + endpoint; - // 用户上传文件时指定的前缀。 - String dir = "partner/" + corpId + "/"; OSS client = new OSSClientBuilder().build(endpoint, accessKeyId, accessKeySecret); try { diff --git a/coolstore-partner-webb/src/main/resources/application-ab.properties b/coolstore-partner-webb/src/main/resources/application-ab.properties index c55d8d105..4e26bb2be 100644 --- a/coolstore-partner-webb/src/main/resources/application-ab.properties +++ b/coolstore-partner-webb/src/main/resources/application-ab.properties @@ -46,6 +46,7 @@ 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 diff --git a/coolstore-partner-webb/src/main/resources/application-dev.properties b/coolstore-partner-webb/src/main/resources/application-dev.properties deleted file mode 100644 index 8bb7797e4..000000000 --- a/coolstore-partner-webb/src/main/resources/application-dev.properties +++ /dev/null @@ -1,77 +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=LTAI5t5ouXZuFgxJMbQea3b2 -rocketmq.secretKey=yuomDstRjSdihtN5zo8viDbWu8Z0ig -rocketmq.nameSrvAdder=http://MQ_INST_1947409023213164_BX3sLZnA.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 - -#TRTC -trtc.sdkAppId=1400811820 -trtc.secretKey=4854bab106c2ca2a2fda16a8c966933e28a078a34e458999d6227e8cd8ab8219 -trtc.video.callback.secretKey=1ECEAD34DBD84E838BF07FC7360EA4D8 - -weixin.appId=wx6f984e535e571818 -weixin.appSecret=245a483747e6e9f8762d3e8539cf0318 - -signKey=77fea013c3a6459685b83c21a2fc3411 - -#MDM -hs.mdm.baseUrl=http://10.56.21.30 -hs.mdm.appkey = HSAYPartner -hs.mdm.appsec = ab39fedb886fa3587c7f517551976de8b2606f5511fd8f8675266825d74c5cd3 - -#xxljob配置 -xxl.job.admin.addresses = https://djob.coolstore.cn/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 = - - -ec.baseUrl=https://oapi-gateway.shpr.top/basic \ No newline at end of file diff --git a/coolstore-partner-webb/src/main/resources/application-hd.properties b/coolstore-partner-webb/src/main/resources/application-hd.properties deleted file mode 100644 index 68a52a3fb..000000000 --- a/coolstore-partner-webb/src/main/resources/application-hd.properties +++ /dev/null @@ -1,60 +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://hdstore-isv.coolcollege.cn/isv - -#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 - -#TRTC -trtc.sdkAppId=1400811820 -trtc.secretKey=4854bab106c2ca2a2fda16a8c966933e28a078a34e458999d6227e8cd8ab8219 -trtc.video.callback.secretKey=1ECEAD34DBD84E838BF07FC7360EA4D8 - -weixin.appId=wx6f984e535e571818 -weixin.appSecret=245a483747e6e9f8762d3e8539cf0318 - -signKey=d851f2a9ac90474abecdc2fbb148d4d7 \ No newline at end of file diff --git a/coolstore-partner-webb/src/main/resources/application-local.properties b/coolstore-partner-webb/src/main/resources/application-local.properties index 3778e03d3..ed31db487 100644 --- a/coolstore-partner-webb/src/main/resources/application-local.properties +++ b/coolstore-partner-webb/src/main/resources/application-local.properties @@ -49,7 +49,7 @@ 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地址 diff --git a/coolstore-partner-webb/src/main/resources/application-online.properties b/coolstore-partner-webb/src/main/resources/application-online.properties index 0880a6389..8981186df 100644 --- a/coolstore-partner-webb/src/main/resources/application-online.properties +++ b/coolstore-partner-webb/src/main/resources/application-online.properties @@ -48,7 +48,7 @@ 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 diff --git a/coolstore-partner-webb/src/main/resources/application-pre.properties b/coolstore-partner-webb/src/main/resources/application-pre.properties deleted file mode 100644 index b522cf8d7..000000000 --- a/coolstore-partner-webb/src/main/resources/application-pre.properties +++ /dev/null @@ -1,61 +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 - -#TRTC -trtc.sdkAppId=1400811820 -trtc.secretKey=4854bab106c2ca2a2fda16a8c966933e28a078a34e458999d6227e8cd8ab8219 -trtc.video.callback.secretKey=1ECEAD34DBD84E838BF07FC7360EA4D8 - -weixin.appId=wx6f984e535e571818 -weixin.appSecret=245a483747e6e9f8762d3e8539cf0318 - -signKey=d851f2a9ac90474abecdc2fbb148d4d7 - diff --git a/coolstore-partner-webb/src/main/resources/application-test.properties b/coolstore-partner-webb/src/main/resources/application-test.properties deleted file mode 100644 index ec9163915..000000000 --- a/coolstore-partner-webb/src/main/resources/application-test.properties +++ /dev/null @@ -1,60 +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://tstore-isv.coolcollege.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 -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 - -#TRTC -trtc.sdkAppId=1400811820 -trtc.secretKey=4854bab106c2ca2a2fda16a8c966933e28a078a34e458999d6227e8cd8ab8219 -trtc.video.callback.secretKey=1ECEAD34DBD84E838BF07FC7360EA4D8 - -weixin.appId=wx6f984e535e571818 -weixin.appSecret=245a483747e6e9f8762d3e8539cf0318 - -signKey=77fea013c3a6459685b83c21a2fc3411 \ No newline at end of file diff --git a/coolstore-partner-webc/pom.xml b/coolstore-partner-webc/pom.xml index fe65b122a..307713804 100644 --- a/coolstore-partner-webc/pom.xml +++ b/coolstore-partner-webc/pom.xml @@ -37,12 +37,6 @@ - - dev - - dev - - local @@ -52,12 +46,6 @@ local - - test - - test - - ab @@ -70,18 +58,6 @@ online - - hd - - hd - - - - pre - - pre - - diff --git a/coolstore-partner-webc/src/main/java/com/cool/store/controller/OssClientController.java b/coolstore-partner-webc/src/main/java/com/cool/store/controller/OssClientController.java index 9765ba326..8a84e166e 100644 --- a/coolstore-partner-webc/src/main/java/com/cool/store/controller/OssClientController.java +++ b/coolstore-partner-webc/src/main/java/com/cool/store/controller/OssClientController.java @@ -35,17 +35,15 @@ public class OssClientController { private String endpoint; @Value("${oss.bucket:null}") private String bucket; - @Value("${corp.id:null}") - private String corpId; @Value("${cdn.url:null}") private String cdnUrl; + @Value("${oss.file.dir:null}") + private String dir; @GetMapping("/getUploadFileConfig") public ResponseResult getUploadFileConfig(){ // host的格式为 bucketname.endpoint String host = "https://" + bucket + "." + endpoint; - // 用户上传文件时指定的前缀。 - String dir = "partner/" + corpId + "/"; OSS client = new OSSClientBuilder().build(endpoint, accessKeyId, accessKeySecret); try { diff --git a/coolstore-partner-webc/src/main/resources/application-ab.properties b/coolstore-partner-webc/src/main/resources/application-ab.properties index 0fa71c1b6..2ec82d81d 100644 --- a/coolstore-partner-webc/src/main/resources/application-ab.properties +++ b/coolstore-partner-webc/src/main/resources/application-ab.properties @@ -46,6 +46,7 @@ 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 diff --git a/coolstore-partner-webc/src/main/resources/application-dev.properties b/coolstore-partner-webc/src/main/resources/application-dev.properties deleted file mode 100644 index 523ab9009..000000000 --- a/coolstore-partner-webc/src/main/resources/application-dev.properties +++ /dev/null @@ -1,64 +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=LTAI5t5ouXZuFgxJMbQea3b2 -rocketmq.secretKey=yuomDstRjSdihtN5zo8viDbWu8Z0ig -rocketmq.nameSrvAdder=http://MQ_INST_1947409023213164_BX3sLZnA.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 - -#TRTC -trtc.sdkAppId=1400811820 -trtc.secretKey=4854bab106c2ca2a2fda16a8c966933e28a078a34e458999d6227e8cd8ab8219 - -weixin.appId=wxb2a0addf956ad4b7 -weixin.appSecret=77abdcae754add92889566b543e5ad79 - -signKey=77fea013c3a6459685b83c21a2fc3411 - -#MDM -hs.mdm.baseUrl=http://10.56.21.30/ -hs.mdm.appkey = HSAYPartner -hs.mdm.appsec = ab39fedb886fa3587c7f517551976de8b2606f5511fd8f8675266825d74c5cd3 diff --git a/coolstore-partner-webc/src/main/resources/application-hd.properties b/coolstore-partner-webc/src/main/resources/application-hd.properties deleted file mode 100644 index 5c6a6f25c..000000000 --- a/coolstore-partner-webc/src/main/resources/application-hd.properties +++ /dev/null @@ -1,57 +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 -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 - -#TRTC -trtc.sdkAppId=1400811820 -trtc.secretKey=4854bab106c2ca2a2fda16a8c966933e28a078a34e458999d6227e8cd8ab8219 - -weixin.appId=wxb2a0addf956ad4b7 -weixin.appSecret=77abdcae754add92889566b543e5ad79 - -signKey=d851f2a9ac90474abecdc2fbb148d4d7 \ No newline at end of file diff --git a/coolstore-partner-webc/src/main/resources/application-local.properties b/coolstore-partner-webc/src/main/resources/application-local.properties index 42ff5394d..0619f7aa1 100644 --- a/coolstore-partner-webc/src/main/resources/application-local.properties +++ b/coolstore-partner-webc/src/main/resources/application-local.properties @@ -50,7 +50,7 @@ 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地址 diff --git a/coolstore-partner-webc/src/main/resources/application-online.properties b/coolstore-partner-webc/src/main/resources/application-online.properties index 5c6a6f25c..08400e97f 100644 --- a/coolstore-partner-webc/src/main/resources/application-online.properties +++ b/coolstore-partner-webc/src/main/resources/application-online.properties @@ -46,6 +46,7 @@ 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 diff --git a/coolstore-partner-webc/src/main/resources/application-pre.properties b/coolstore-partner-webc/src/main/resources/application-pre.properties deleted file mode 100644 index 5c6a6f25c..000000000 --- a/coolstore-partner-webc/src/main/resources/application-pre.properties +++ /dev/null @@ -1,57 +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 -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 - -#TRTC -trtc.sdkAppId=1400811820 -trtc.secretKey=4854bab106c2ca2a2fda16a8c966933e28a078a34e458999d6227e8cd8ab8219 - -weixin.appId=wxb2a0addf956ad4b7 -weixin.appSecret=77abdcae754add92889566b543e5ad79 - -signKey=d851f2a9ac90474abecdc2fbb148d4d7 \ No newline at end of file diff --git a/coolstore-partner-webc/src/main/resources/application-test.properties b/coolstore-partner-webc/src/main/resources/application-test.properties deleted file mode 100644 index fce020c05..000000000 --- a/coolstore-partner-webc/src/main/resources/application-test.properties +++ /dev/null @@ -1,57 +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 - -#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 -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 - -#TRTC -trtc.sdkAppId=1400811820 -trtc.secretKey=4854bab106c2ca2a2fda16a8c966933e28a078a34e458999d6227e8cd8ab8219 - -weixin.appId=wxb2a0addf956ad4b7 -weixin.appSecret=77abdcae754add92889566b543e5ad79 - -signKey=77fea013c3a6459685b83c21a2fc3411 \ No newline at end of file