From 1e6912bf5940b447c7c1a372d193bde1afc552e3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8B=8F=E7=AB=B9=E7=BA=A2?= <570057076@qq.com>
Date: Thu, 11 Dec 2025 01:08:26 +0000
Subject: [PATCH] Merge #10 into master from cc_20251110_ossupdate
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

feat:oss切换

* cc_20251110_ossupdate: (1 commits squashed)

  - feat:oss切换

Signed-off-by: 苏竹红 <570057076@qq.com>
Merged-by: 苏竹红 <570057076@qq.com>

CR-link: https://codeup.aliyun.com/692ea314dec569489f6f167c/hangzhou/java/custom_zxjp/change/10
---
 .../main/resources/application-ab.properties  | 28 +++++++++++++------
 .../resources/application-online.properties   |  6 ++--
 2 files changed, 22 insertions(+), 12 deletions(-)

diff --git a/coolstore-partner-web/src/main/resources/application-ab.properties b/coolstore-partner-web/src/main/resources/application-ab.properties
index e26125f33..4c2403baf 100644
--- a/coolstore-partner-web/src/main/resources/application-ab.properties
+++ b/coolstore-partner-web/src/main/resources/application-ab.properties
@@ -37,17 +37,27 @@ rocketmq.topic=zx_simple_message
 rocketmq.orderTopic=zx_order_message
 
 #oss配置
-oss.host=https://oss-store.coolcollege.cn/
-oss.accessKeyId=LTAI5tRSXy2MrqaaBJ6gReur
-oss.accessKeySecret=FFsl8d9batprJ0vXr0k4Y8ada40Wm2
+#oss.host=https://oss-store.coolcollege.cn/
+#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/
+##cdn地址
+#cdn.url=https://testhsaypic.coolstore.cn
+
+
+#oss配置
+oss.accessKeyId=LTAI5tGBwmXwZkMuHK4MudMJ
+oss.accessKeySecret=bnZoUMRQ9834STgz5E291YrqlBu6yn
+oss.bucket=store-ossfile-zx
+oss.file.dir=eid/${mybatis.configuration.variables.enterpriseId}/
 oss.endpoint=oss-cn-hangzhou.aliyuncs.com
-oss.bucket=cool-store-hsay
-oss.file.dir=partner/171cddee76471740/
-oss.excelFile.dir=lineExcel/
-
-
+oss.host=https://ossfilezx.coolstore.cn/
 #cdn地址
-cdn.url=https://testhsaypic.coolstore.cn
+cdn.url=https://ossfilezx.coolstore.cn/
+
 
 #TRTC
 trtc.sdkAppId=1600026212
diff --git a/coolstore-partner-web/src/main/resources/application-online.properties b/coolstore-partner-web/src/main/resources/application-online.properties
index faea71843..80f7eb457 100644
--- a/coolstore-partner-web/src/main/resources/application-online.properties
+++ b/coolstore-partner-web/src/main/resources/application-online.properties
@@ -39,14 +39,14 @@ rocketmq.orderTopic=zx_order_message
 #oss配置
 oss.accessKeyId=LTAI5tGBwmXwZkMuHK4MudMJ
 oss.accessKeySecret=bnZoUMRQ9834STgz5E291YrqlBu6yn
-oss.bucket=store-ossfile
+oss.bucket=store-ossfile-zx
 oss.file.dir=eid/${mybatis.configuration.variables.enterpriseId}/
 oss.endpoint=oss-cn-hangzhou.aliyuncs.com
-oss.host=https://oss-cool.coolstore.cn/
+oss.host=https://ossfilezx.coolstore.cn/
 
 
 #cdn地址
-cdn.url=https://oss-cool.coolstore.cn
+cdn.url=https://ossfilezx.coolstore.cn/
 
 
 #TRTC