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;