Merge remote-tracking branch 'origin/master' into cc_20250325_select
# Conflicts: # coolstore-partner-web/src/main/resources/application-online.properties
This commit is contained in:
@@ -31,18 +31,11 @@ rocketmq.nameSrvAdder=http://MQ_INST_1947409023213164_BX5N7rwl.cn-hangzhou.mq-in
|
|||||||
rocketmq.topic=simple_message
|
rocketmq.topic=simple_message
|
||||||
|
|
||||||
#oss配置
|
#oss配置
|
||||||
#oss.host=https://oss-store.coolcollege.cn/
|
|
||||||
#oss.accessKeyId=LTAI5tS2khSZfYrTL5cerHbY
|
|
||||||
#oss.accessKeySecret=YChLLev5KRZmgHCAkU7odkhGWk1aif
|
|
||||||
#oss.endpoint=oss-cn-hangzhou.aliyuncs.com
|
|
||||||
#oss.bucket=coolstore-storage
|
|
||||||
#oss.file.dir=eid/9ee7b8b48e2447f9a2075b5a46e94d08/
|
|
||||||
|
|
||||||
oss.accessKeyId=LTAI5tGBwmXwZkMuHK4MudMJ
|
oss.accessKeyId=LTAI5tGBwmXwZkMuHK4MudMJ
|
||||||
oss.accessKeySecret=bnZoUMRQ9834STgz5E291YrqlBu6yn
|
oss.accessKeySecret=bnZoUMRQ9834STgz5E291YrqlBu6yn
|
||||||
oss.bucket=store-ossfile
|
oss.bucket=store-ossfile
|
||||||
oss.file.dir=eid/${mybatis.configuration.variables.enterpriseId}
|
oss.file.dir=eid/${mybatis.configuration.variables.enterpriseId}
|
||||||
oss.endpoint=https://oss-cn-hangzhou-internal.aliyuncs.com
|
oss.endpoint=oss-cn-hangzhou.aliyuncs.com
|
||||||
oss.host=https://oss-cool.coolstore.cn/
|
oss.host=https://oss-cool.coolstore.cn/
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user