From 3ef81c28a45982f424dc254b79b5e16879152633 Mon Sep 17 00:00:00 2001
From: akun <957746831@qq.com>
Date: Tue, 30 Apr 2024 15:33:00 +0800
Subject: [PATCH] =?UTF-8?q?=E9=85=8D=E7=BD=AE=E5=8F=8A=E8=AE=A2=E5=8D=95?=
 =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 sf-admin/src/main/resources/application-druid.yml   |  4 ++--
 sf-admin/src/main/resources/application.yml         |  7 +++----
 .../main/java/com/sf/file/config/AmazonConfig.java  |  2 +-
 .../sf/order/controller/OrderInfoController.java    | 13 +++++++++++++
 4 files changed, 19 insertions(+), 7 deletions(-)

diff --git a/sf-admin/src/main/resources/application-druid.yml b/sf-admin/src/main/resources/application-druid.yml
index 293e088..4dcf478 100644
--- a/sf-admin/src/main/resources/application-druid.yml
+++ b/sf-admin/src/main/resources/application-druid.yml
@@ -6,9 +6,9 @@ spring:
         druid:
             # 主库数据源
             master:
-                url: jdbc:mysql://192.168.1.23:22001/sac_competition?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
+                url: jdbc:mysql://47.108.66.163:3306/sac_competition?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
                 username: root
-                password: abc&^321
+                password: 82^hsgGHbs^2
             # 从库数据源
             slave:
                 # 从数据源开关/默认关闭
diff --git a/sf-admin/src/main/resources/application.yml b/sf-admin/src/main/resources/application.yml
index 9f9beb2..10f2f35 100644
--- a/sf-admin/src/main/resources/application.yml
+++ b/sf-admin/src/main/resources/application.yml
@@ -70,9 +70,9 @@ spring:
   # redis 配置
   redis:
     # 地址
-    host: 192.168.1.23
+    host: 47.108.66.163
     # 端口，默认为6379
-    port: 22002
+    port: 6379
     # 数据库索引
     database: 0
     # 密码
@@ -132,8 +132,7 @@ xss:
 file:
   ceph:
     #endpoint: http://127.0.0.1:9000
-    upload: http://192.168.1.23:9000
-    endpoint: http://118.114.160.245
+    endpoint: http://47.108.66.163:9000
     # 50M
     defaultMaxSize: 52428800
     access:
diff --git a/sf-file/src/main/java/com/sf/file/config/AmazonConfig.java b/sf-file/src/main/java/com/sf/file/config/AmazonConfig.java
index 4548feb..dd20714 100644
--- a/sf-file/src/main/java/com/sf/file/config/AmazonConfig.java
+++ b/sf-file/src/main/java/com/sf/file/config/AmazonConfig.java
@@ -19,7 +19,7 @@ import lombok.extern.slf4j.Slf4j;
 @Configuration
 @Slf4j
 public class AmazonConfig {
-	@Value("${file.ceph.upload}")
+	@Value("${file.ceph.endpoint}")
     private String FILE_CEPH_POINT;
 
     @Value("${file.ceph.access.key}")
diff --git a/sf-order/src/main/java/com/sf/order/controller/OrderInfoController.java b/sf-order/src/main/java/com/sf/order/controller/OrderInfoController.java
index 4ecbfab..37b7d23 100644
--- a/sf-order/src/main/java/com/sf/order/controller/OrderInfoController.java
+++ b/sf-order/src/main/java/com/sf/order/controller/OrderInfoController.java
@@ -43,6 +43,19 @@ public class OrderInfoController extends BaseController {
         return getDataTable(list);
     }
 
+    /**
+     * 我的订单列表（当前用户）
+     */
+    @GetMapping("/myOrderList")
+    public TableDataInfo myOrderList(OrderListReqVo vo) {
+        vo.setAppCode(RequestUtils.getHeader(RequestHeaderEnums.APP_CODE.getCode()));
+        vo.setUserId(getUserId());
+        // startPage();
+        List<OrderListResVo> list = orderInfoService.queryList(vo);
+        return getDataTable(list);
+    }
+
+
 
     /**
      * 导出订单基础信息列表