From 2939be73720cd598283009e3b5b4f85b341d6ac4 Mon Sep 17 00:00:00 2001
From: wucongxing8150 <815046773@qq.com>
Date: Fri, 15 Aug 2025 15:41:24 +0800
Subject: [PATCH] 434443333444

---
 .../file/constant/OSSFileTypeEnum.java        |  2 +-
 .../file/controller/OSSFileController.java    | 22 +++++++++++++++++--
 2 files changed, 21 insertions(+), 3 deletions(-)

diff --git a/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/file/constant/OSSFileTypeEnum.java b/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/file/constant/OSSFileTypeEnum.java
index cd3535d..9e09679 100644
--- a/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/file/constant/OSSFileTypeEnum.java
+++ b/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/file/constant/OSSFileTypeEnum.java
@@ -7,7 +7,7 @@ import net.lab1024.sa.base.common.enumeration.BaseEnum;
 @AllArgsConstructor
 @Getter
 public enum OSSFileTypeEnum implements BaseEnum {
-    PUBLIC(1, "public"),
+    PUBLIC(1, "static/images"),
     SIGN(2, "sign"),
     ;
 
diff --git a/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/file/controller/OSSFileController.java b/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/file/controller/OSSFileController.java
index 8a4fcfa..43c4473 100644
--- a/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/file/controller/OSSFileController.java
+++ b/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/file/controller/OSSFileController.java
@@ -8,6 +8,8 @@ import com.aliyun.oss.model.PolicyConditions;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import jakarta.annotation.Resource;
+import net.lab1024.sa.admin.config.AppConfig;
+import net.lab1024.sa.admin.config.EnvConfig;
 import net.lab1024.sa.admin.config.OssConfig;
 import net.lab1024.sa.admin.constant.AdminSwaggerTagConst;
 import net.lab1024.sa.admin.module.business.file.constant.OSSFileTypeEnum;
@@ -15,6 +17,7 @@ import net.lab1024.sa.admin.module.business.file.domain.vo.OSSPolicyVO;
 import net.lab1024.sa.base.common.domain.ResponseDTO;
 import net.lab1024.sa.base.common.util.SmartRequestUtil;
 import net.lab1024.sa.base.constant.SwaggerTagConst;
+import org.checkerframework.checker.units.qual.A;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PathVariable;
@@ -23,6 +26,7 @@ import org.springframework.web.bind.annotation.RestController;
 
 import java.io.File;
 import java.util.Date;
+import java.util.Objects;
 
 @RestController
 @Tag(name = SwaggerTagConst.Support.FILE)
@@ -31,13 +35,21 @@ public class OSSFileController {
     @Resource
     private OssConfig ossConfig;
 
+    @Resource
+    private EnvConfig envConfig;
+
     @Operation(summary = "获取上传文件 Policy, notes=\"type==1 普通；type==2 签名图片\"")
     @GetMapping("/file/getOSSPolicy/{type}")
     @SaCheckPermission("ossFile:add")
     public ResponseDTO<OSSPolicyVO> getOSSPolicy(@PathVariable int type){
         OSSFileTypeEnum ossFileType = OSSFileTypeEnum.getByVal(type);
         Long requestUserId = SmartRequestUtil.getRequestUserId();
-        String dir = ossFileType.getDesc() + File.separator + "images/";
+
+        String dir = "dev/static/images/images";
+        if (Objects.equals(envConfig.getActive(), "prod")){
+             dir = "prod/static/images/";
+        }
+
 //        String dir = ossFileType.getDesc() + File.separator + requestUserId + File.separator;
         // callbackUrl为 上传回调服务器的URL，请将下面的IP和Port配置为您自己的真实信息。
         OSSClient client = new OSSClient(ossConfig.getEndpoint(), ossConfig.getAccessKey(), ossConfig.getAccessKeySecret());
@@ -70,7 +82,13 @@ public class OSSFileController {
     public ResponseDTO<OSSPolicyVO> getOSSPolicyAdmin(@PathVariable int type){
         OSSFileTypeEnum ossFileType = OSSFileTypeEnum.getByVal(type);
         Long requestUserId = SmartRequestUtil.getRequestUserId();
-        String dir = ossFileType.getDesc() + File.separator + "images/";
+
+        String dir = "dev/static/images/images";
+        if (Objects.equals(envConfig.getActive(), "prod")){
+            dir = "prod/static/images/";
+        }
+
+//        String dir = ossFileType.getDesc() + File.separator + "images/";
 //        String dir = ossFileType.getDesc() + File.separator + requestUserId + File.separator;
         // callbackUrl为 上传回调服务器的URL，请将下面的IP和Port配置为您自己的真实信息。
         OSSClient client = new OSSClient(ossConfig.getEndpoint(), ossConfig.getAccessKey(), ossConfig.getAccessKeySecret());