From 91a67828554fa17b57ee9962f5fc47d525b9ce9e Mon Sep 17 00:00:00 2001
From: wang <wzh@>
Date: Sat, 25 Jul 2026 15:12:45 +0800
Subject: [PATCH] =?UTF-8?q?fix:=E4=BC=98=E5=8C=96https?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mapper/service/ServiceApplicationsMapper.xml |  2 +-
 .../net/lab1024/sa/base/config/FileConfig.java   |  7 +++++--
 yun-base/src/main/resources/prod/yun-base.yaml   | 16 +++++++++++-----
 3 files changed, 17 insertions(+), 8 deletions(-)

diff --git a/yun-admin/src/main/resources/mapper/service/ServiceApplicationsMapper.xml b/yun-admin/src/main/resources/mapper/service/ServiceApplicationsMapper.xml
index ec495bb..c86cf6f 100644
--- a/yun-admin/src/main/resources/mapper/service/ServiceApplicationsMapper.xml
+++ b/yun-admin/src/main/resources/mapper/service/ServiceApplicationsMapper.xml
@@ -477,7 +477,7 @@
             </if>
         </where>
         GROUP BY tsa.user_id, tsa.certificate_number
-        ORDER BY annualServiceDuration DESC, tsa.user_id ASC
+        ORDER BY quarterlyServiceDuration DESC, tsa.user_id ASC
         LIMIT 1
     </select>
     <select id="getdepartmentStatistics"
diff --git a/yun-base/src/main/java/net/lab1024/sa/base/config/FileConfig.java b/yun-base/src/main/java/net/lab1024/sa/base/config/FileConfig.java
index 97dce11..a260241 100644
--- a/yun-base/src/main/java/net/lab1024/sa/base/config/FileConfig.java
+++ b/yun-base/src/main/java/net/lab1024/sa/base/config/FileConfig.java
@@ -74,9 +74,12 @@ public class FileConfig implements WebMvcConfigurer {
     @Bean
     @ConditionalOnProperty(prefix = "file.storage", name = {"mode"}, havingValue = MODE_CLOUD)
     public S3Client initAmazonS3() {
+        String endpointUrl = endpoint.startsWith(HTTP) || endpoint.startsWith(HTTPS)
+                ? endpoint
+                : HTTP + endpoint;
         return S3Client.builder()
-                .region(Region.AWS_GLOBAL)
-                .endpointOverride(URI.create((urlPrefix.startsWith(HTTPS) ? HTTPS : HTTP) + endpoint))
+                .region(Region.of(region))
+                .endpointOverride(URI.create(endpointUrl))
                 .credentialsProvider(
                         StaticCredentialsProvider.create(
                                 AwsBasicCredentials.create(accessKey, secretKey)))
diff --git a/yun-base/src/main/resources/prod/yun-base.yaml b/yun-base/src/main/resources/prod/yun-base.yaml
index 82f3173..c1345db 100644
--- a/yun-base/src/main/resources/prod/yun-base.yaml
+++ b/yun-base/src/main/resources/prod/yun-base.yaml
@@ -98,15 +98,21 @@ file:
   storage:
     mode: cloud
     local:
-      upload-path: /home/laywer/upload/   #文件上传目录
+      upload-path: /home/laywer/upload/
       url-prefix:
     cloud:
-      region: oss-cn-hangzhou
-      endpoint: 8.148.67.92:9000
+      region: us-east-1
+
+      # Java SDK 通过 HTTP 连接本机 MinIO
+      endpoint: http://127.0.0.1:9000
+
       bucket-name: file
       access-key: minioadmin
       secret-key: 12345678
-      url-prefix: http://${file.storage.cloud.endpoint}/${file.storage.cloud.bucket-name}/
+
+      # 浏览器通过 Nginx 443 反向代理访问文件
+      url-prefix: https://8.148.67.92/minio/file/
+
       private-url-expire-seconds: 3600
 
 # open api配置
@@ -182,4 +188,4 @@ smart:
     # 数据库配置检测-开关 默认开启 可选（作用是固定间隔读取数据库配置更新任务，关闭后只能重启服务或通过接口修改定时任务，建议开启）
     db-refresh-enabled: true
     # 数据库配置检测-执行间隔 默认120秒 可选
-    db-refresh-interval: 60
\ No newline at end of file
+    db-refresh-interval: 60