From fe646416d8d46de7b896ddbf65a3ad0cd30b729b Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期三, 15 七月 2020 16:05:56 +0800
Subject: [PATCH] 大淘客与好单库与主包剥离
---
fanli/src/main/java/com/yeshi/fanli/service/impl/user/UserAccountServiceImpl.java | 28 ++++++++++++++++++++--------
1 files changed, 20 insertions(+), 8 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/user/UserAccountServiceImpl.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/user/UserAccountServiceImpl.java
index 424488d..817300d 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/impl/user/UserAccountServiceImpl.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/impl/user/UserAccountServiceImpl.java
@@ -9,6 +9,8 @@
import com.yeshi.fanli.entity.SystemEnum;
import com.yeshi.fanli.entity.system.BusinessSystem;
+import com.yeshi.fanli.entity.system.ConfigKeyEnum;
+import com.yeshi.fanli.service.inter.config.ConfigService;
import com.yeshi.fanli.util.*;
import com.yeshi.fanli.vo.taobao.TaoBaoUser;
import org.springframework.context.annotation.Lazy;
@@ -64,9 +66,6 @@
@Resource
private RedisManager redisManager;
-// @Resource
-// private UserInfoMapper userInfoMapper;
-
@Resource
private UserInfoService userInfoService;
@@ -97,8 +96,9 @@
@Resource
private UserInfoDeleteRecordService userInfoDeleteRecordService;
+
@Resource
- private JedisPool jedisPool;
+ private ConfigService configService;
@Lazy
@Resource
@@ -120,9 +120,10 @@
LogHelper.lgoinInfo(logInfo.toString());
HttpSession session = request.getSession();
- if (first != null && first == true)
+ if (first != null && first == true) {
session.removeAttribute("LAST_LOGIN_USER");
- // 浼氳瘽涓笂娆＄櫥褰曠殑鐢ㄦ埛
+ }
+ // 浼氳瘽涓笂娆＄櫥褰曠殑鐢ㄦ埛
if (wxinstall) {// 瀹夎浜嗗井淇＄殑鐘舵��
UserInfo lastUser = (UserInfo) session.getAttribute("LAST_LOGIN_USER");
UserInfo userInfo = null;
@@ -808,12 +809,23 @@
throw new UserAccountException(1, "璇疯緭鍏ユ墜鏈哄彿鐮�");
}
phone = phone.replaceAll(" ", "");
+ boolean isDemo=false;
+ //鏌ヨ涓婄嚎娴嬭瘯鐨勫彿鐮佷笌楠岃瘉鐮�
+ String demoLogin = configService.getValue(ConfigKeyEnum.demoLoginUser, businessSystem.getSystem());
+ if (!StringUtil.isNullOrEmpty(demoLogin)) {
+ String demoPhone = demoLogin.split("#")[0];
+ String demoCode = demoLogin.split("#")[1];
+ if(phone.equalsIgnoreCase(demoPhone)&&demoCode.equalsIgnoreCase(vcode)){
+ isDemo=true;
+ }
+ }
+
+// "17316780233".equalsIgnoreCase(phone) && "2581".equalsIgnoreCase(vcode);
// 鑻规灉搴旂敤鍟嗗簵涓婄嚎娴嬭瘯鍙风爜
- if ("17316780233".equalsIgnoreCase(phone) && "2581".equalsIgnoreCase(vcode)) {
+ if (isDemo) {//娴嬭瘯鍙风爜
;
} else {
-
if (StringUtil.isNullOrEmpty(vcode)) {
throw new UserAccountException(1, "璇疯緭鍏ラ獙璇佺爜");
}
--
Gitblit v1.8.0