From 8becc566ccc6d1112256a8c4e6edce83e4193d75 Mon Sep 17 00:00:00 2001
From: "382696293@qq.com" <382696293@qq.com>
Date: Tue, 19 Dec 2023 10:45:26 +0800
Subject: [PATCH] =?UTF-8?q?=E7=94=A8=E6=88=B7=E4=BF=A1=E6=81=AF=E7=BC=93?=
 =?UTF-8?q?=E5=AD=98=E6=B7=BB=E5=8A=A0=E7=94=A8=E6=88=B7id=E5=92=8C?=
 =?UTF-8?q?=E7=94=A8=E6=88=B7=E6=98=B5=E7=A7=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/flossom/common/security/service/TokenService.java     | 4 ++++
 ...erIntegraController.java => WxUserIntegralController.java} | 3 +--
 2 files changed, 5 insertions(+), 2 deletions(-)
 rename flossom-modules/flossom-mini-program/src/main/java/com/flossom/miniProgram/controller/{WxUserIntegraController.java => WxUserIntegralController.java} (89%)

diff --git a/flossom-common/flossom-common-security/src/main/java/com/flossom/common/security/service/TokenService.java b/flossom-common/flossom-common-security/src/main/java/com/flossom/common/security/service/TokenService.java
index f9f7bfd..c0879b0 100644
--- a/flossom-common/flossom-common-security/src/main/java/com/flossom/common/security/service/TokenService.java
+++ b/flossom-common/flossom-common-security/src/main/java/com/flossom/common/security/service/TokenService.java
@@ -55,6 +55,10 @@ public class TokenService
         loginUser.setToken(token);
         loginUser.setUserid(userId);
         loginUser.setUsername(userName);
+        if(loginUser.getWxUserMember() != null) {
+            loginUser.setWxUserid(loginUser.getWxUserid());
+            loginUser.setWxUsername(loginUser.getWxUsername());
+        }
         loginUser.setIpaddr(IpUtils.getIpAddr());
         refreshToken(loginUser);
 
diff --git a/flossom-modules/flossom-mini-program/src/main/java/com/flossom/miniProgram/controller/WxUserIntegraController.java b/flossom-modules/flossom-mini-program/src/main/java/com/flossom/miniProgram/controller/WxUserIntegralController.java
similarity index 89%
rename from flossom-modules/flossom-mini-program/src/main/java/com/flossom/miniProgram/controller/WxUserIntegraController.java
rename to flossom-modules/flossom-mini-program/src/main/java/com/flossom/miniProgram/controller/WxUserIntegralController.java
index de5215e..364bcb0 100644
--- a/flossom-modules/flossom-mini-program/src/main/java/com/flossom/miniProgram/controller/WxUserIntegraController.java
+++ b/flossom-modules/flossom-mini-program/src/main/java/com/flossom/miniProgram/controller/WxUserIntegralController.java
@@ -2,7 +2,6 @@ package com.flossom.miniProgram.controller;
 
 import com.flossom.common.core.domain.entity.WxUserIntegralLog;
 import com.flossom.common.core.web.controller.BaseController;
-import com.flossom.common.core.web.domain.AjaxResult;
 import com.flossom.common.core.web.page.TableDataInfo;
 import com.flossom.miniProgram.service.IWxUserIntegralService;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -18,7 +17,7 @@ import java.util.List;
  */
 @RestController
 @RequestMapping("/integralLog")
-public class WxUserIntegraController extends BaseController {
+public class WxUserIntegralController extends BaseController {
 
     @Autowired
     private IWxUserIntegralService wxUserIntegralLogService;