From 4f5a5b0a00c01491f009074351089f086f950d3e Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期二, 01 六月 2021 19:09:48 +0800
Subject: [PATCH] 系统配置改为数据库

---
 fanli/src/main/java/com/yeshi/fanli/service/impl/user/wx/WXMPUserLoginServiceImpl.java |   12 ++++++++----
 1 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/user/wx/WXMPUserLoginServiceImpl.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/user/wx/WXMPUserLoginServiceImpl.java
index 8f06375..9418f05 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/impl/user/wx/WXMPUserLoginServiceImpl.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/impl/user/wx/WXMPUserLoginServiceImpl.java
@@ -3,6 +3,7 @@
 import javax.annotation.Resource;
 
 import com.yeshi.fanli.entity.SystemEnum;
+import com.yeshi.fanli.service.inter.config.SystemConfigService;
 import com.yeshi.fanli.util.SystemInfoUtil;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -41,6 +42,9 @@
     @Resource
     private ForbiddenUserIdentifyCodeService forbiddenUserIdentifyCodeService;
 
+    @Resource
+    private SystemConfigService systemConfigService;
+
     @Transactional(rollbackFor = Exception.class)
     @Override
     public WXMPLoginResult wxmpLogin(WXMPLoginData loginData) throws UserAccountException {
@@ -69,8 +73,8 @@
                 } else {
                     UserInfo userInfo = new UserInfo();
                     userInfo.setAppId(loginData.getAppId());
-                    userInfo.setNickName(Constant.systemCommonConfig.getDefaultNickName());
-                    userInfo.setPortrait(Constant.systemCommonConfig.getDefaultPortrait());
+                    userInfo.setNickName(null);
+                    userInfo.setPortrait(userInfoService.getDefaultPortrait(system));
                     userInfo.setPhone(loginData.getPhone());
 
                     if (!StringUtil.isNullOrEmpty(loginData.getLastUser().getNickName()))
@@ -112,8 +116,8 @@
                 } else {// 鏂扮敤鎴�
                     userInfo = new UserInfo();
                     userInfo.setAppId(loginData.getAppId());
-                    userInfo.setNickName(Constant.systemCommonConfig.getDefaultNickName());
-                    userInfo.setPortrait(Constant.systemCommonConfig.getDefaultPortrait());
+                    userInfo.setNickName(null);
+                    userInfo.setPortrait(null);
                     userInfo.setPhone(loginData.getPhone());
                     userInfo.setPlatform("wxmp");
 

--
Gitblit v1.8.0