From 57b5fa2bc4321dc5d86d9b7bd9831c9ff80ac036 Mon Sep 17 00:00:00 2001
From: zhangchenbiao <chenbiao.zhang@coolcollege.cn>
Date: Wed, 29 May 2024 17:17:08 +0800
Subject: [PATCH] fix

---
 .../com/cool/store/service/impl/OSSServiceImpl.java |  5 ++++-
 .../src/main/resources/application-hd.properties    | 11 +++++------
 .../main/resources/application-online.properties    | 13 ++++++-------
 3 files changed, 15 insertions(+), 14 deletions(-)

diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/OSSServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/OSSServiceImpl.java
index 5c89bb197..e0230e857 100644
--- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/OSSServiceImpl.java
+++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/OSSServiceImpl.java
@@ -1,5 +1,6 @@
 package com.cool.store.service.impl;
 
+import cn.hutool.core.date.DateUtil;
 import com.aliyun.oss.OSS;
 import com.aliyun.oss.OSSClientBuilder;
 import com.aliyun.oss.common.utils.BinaryUtil;
@@ -9,6 +10,7 @@ import com.cool.store.enums.ErrorCodeEnum;
 import com.cool.store.exception.ServiceException;
 import com.cool.store.response.ResponseResult;
 import com.cool.store.service.OSSService;
+import com.cool.store.utils.poi.DateUtils;
 import com.cool.store.vo.oss.OssUploadConfigVO;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Value;
@@ -57,7 +59,8 @@ public class OSSServiceImpl implements OSSService {
             byte[] binaryData = postPolicy.getBytes("utf-8");
             String encodedPolicy = BinaryUtil.toBase64String(binaryData);
             String signature = client.calculatePostSignature(postPolicy);
-            OssUploadConfigVO result = new OssUploadConfigVO(accessKeyId, encodedPolicy, signature, dir, host, String.valueOf(expireEndTime / 1000), cdnUrl);
+            String time = DateUtil.format(new Date(), "yyMM") + "/";
+            OssUploadConfigVO result = new OssUploadConfigVO(accessKeyId, encodedPolicy, signature, dir + time, host, String.valueOf(expireEndTime / 1000), cdnUrl);
             return result;
         }catch (Exception e){
             log.info("exception", e);
diff --git a/coolstore-partner-web/src/main/resources/application-hd.properties b/coolstore-partner-web/src/main/resources/application-hd.properties
index 0529f3120..2d49248e5 100644
--- a/coolstore-partner-web/src/main/resources/application-hd.properties
+++ b/coolstore-partner-web/src/main/resources/application-hd.properties
@@ -32,16 +32,15 @@ rocketmq.nameSrvAdder=http://MQ_INST_1947409023213164_BX5N7rwl.cn-hangzhou.mq-in
 rocketmq.topic=simple_message
 
 #oss配置
-oss.accessKeyId=LTAI5tRSXy2MrqaaBJ6gReur
-oss.accessKeySecret=FFsl8d9batprJ0vXr0k4Y8ada40Wm2
+oss.accessKeyId=LTAI5tS2khSZfYrTL5cerHbY
+oss.accessKeySecret=YChLLev5KRZmgHCAkU7odkhGWk1aif
 oss.endpoint=oss-cn-hangzhou.aliyuncs.com
-oss.bucket=cool-store-hsay
-oss.file.dir=partner/171cddee76471740/
-oss.excelFile.dir=lineExcel/
+oss.bucket=coolstore-storage
+oss.file.dir=eid/9ee7b8b48e2447f9a2075b5a46e94d08/
 
 
 #cdn地址
-cdn.url=https://testhsaypic.coolstore.cn
+cdn.url=https://oss-store.coolcollege.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 2b8839188..56f7254b6 100644
--- a/coolstore-partner-web/src/main/resources/application-online.properties
+++ b/coolstore-partner-web/src/main/resources/application-online.properties
@@ -32,16 +32,15 @@ rocketmq.nameSrvAdder=http://MQ_INST_1947409023213164_BX5N7rwl.cn-hangzhou.mq-in
 rocketmq.topic=simple_message
 
 #oss配置
-oss.accessKeyId=LTAI5tRSXy2MrqaaBJ6gReur
-oss.accessKeySecret=FFsl8d9batprJ0vXr0k4Y8ada40Wm2
+oss.accessKeyId=LTAI5tS2khSZfYrTL5cerHbY
+oss.accessKeySecret=YChLLev5KRZmgHCAkU7odkhGWk1aif
 oss.endpoint=oss-cn-hangzhou.aliyuncs.com
-oss.bucket=cool-store-hsay
-oss.file.dir=partner/171cddee76471740/
-oss.excelFile.dir=lineExcel/
+oss.bucket=coolstore-storage
+oss.file.dir=eid/9ee7b8b48e2447f9a2075b5a46e94d08/
 
 
 #cdn地址
-cdn.url=https://testhsaypic.coolstore.cn
+cdn.url=https://oss-store.coolcollege.cn
 
 #TRTC
 trtc.sdkAppId=1600026212
@@ -60,7 +59,7 @@ fixMobileOpenid=HSAY4AF322E
 xxl.job.admin.addresses = http://10.7.53.217:10001/xxl-job-admin,http://10.6.49.25:10001/xxl-job-admin
 xxl.job.executor.appname = ${spring.application.name}
 xxl.job.executor.ip =
-xxl.job.executor.port = 30201
+xxl.job.executor.port = 40001
 xxl.job.executor.logpath = logs/xxl-job/jobhandler
 xxl.job.executor.logretentiondays = 30
 xxl.job.accessToken =