From 81f1655f5a2598eb676d883b7e488b61b73c92eb Mon Sep 17 00:00:00 2001
From: haotian <2421912570@qq.com>
Date: Mon, 14 Apr 2025 11:15:07 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0--=E7=99=BB=E5=BD=95=E6=97=B6?=
 =?UTF-8?q?=E8=BF=94=E5=9B=9EuserId?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/ruoyi/web/controller/app/AppSystemController.java   | 5 +++++
 ruoyi-admin/src/main/resources/application.yml              | 6 +++---
 .../main/java/com/ruoyi/system/domain/dto/OrderListDto.java | 2 ++
 3 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/app/AppSystemController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/app/AppSystemController.java
index 3685309b..4e475d5b 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/app/AppSystemController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/app/AppSystemController.java
@@ -134,7 +134,10 @@ public class AppSystemController extends BaseController {
         AjaxResult ajax = success();
         // 生成令牌
         String token = loginService.appLoginPassword(loginBody.getUsername(), loginBody.getPassword());
+
+        Long userId = sysUserService.selectUserByUserName(loginBody.getUsername()).getUserId();
         ajax.put(Constants.TOKEN, token);
+        ajax.put("userId",userId);
         return ajax;
     }
 
@@ -149,7 +152,9 @@ public class AppSystemController extends BaseController {
         AjaxResult ajax = success();
         // 生成令牌
         String token = loginService.appLoginMessage(loginBody.getUsername(), loginBody.getCode(),loginBody.getPhone());
+        Long userId = sysUserService.selectUserByUserName(loginBody.getUsername()).getUserId();
         ajax.put(Constants.TOKEN, token);
+        ajax.put("userId",userId);
         return ajax;
     }
     /*
diff --git a/ruoyi-admin/src/main/resources/application.yml b/ruoyi-admin/src/main/resources/application.yml
index 260eb573..20b6f87d 100644
--- a/ruoyi-admin/src/main/resources/application.yml
+++ b/ruoyi-admin/src/main/resources/application.yml
@@ -18,12 +18,12 @@ ruoyi:
 #  # 腾讯云
 #  domain: http://82.156.153.112:8081
 
-#  # 火山云
+  # 火山云
 #  domain: http://14.103.162.172:8081
 #
 #  idCardPath: /home/IdCard
 #  profile: /home/uploadPath
-  # 获取ip地址开关
+#   获取ip地址开关
   addressEnabled: false
   # 验证码类型 math 数组计算 char 字符验证
   captchaType: math
@@ -87,7 +87,7 @@ spring:
   redis:
     # 地址
     host: localhost
-#    host: 172.17.0.3 # 腾讯云
+##    host: 172.17.0.3 # 腾讯云
 #    host: 172.17.0.2 #火山云
 
 #     端口，默认为6379
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain/dto/OrderListDto.java b/ruoyi-system/src/main/java/com/ruoyi/system/domain/dto/OrderListDto.java
index 827c5823..22b3da2a 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/domain/dto/OrderListDto.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain/dto/OrderListDto.java
@@ -9,6 +9,8 @@ public class OrderListDto {
 
     private Long userId;
 
+//    private String orderInfoId;
+
     private String nickName;
     private String phonenumber;