From 66927f7d995bae853ee866249029dfa4629d0301 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B5=B5=E5=95=B8=E9=9D=9E?= <8153694@qq.com>
Date: Thu, 17 Aug 2023 15:06:54 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=AF=BC=E5=87=BA=E5=8A=A8?=
=?UTF-8?q?=E6=80=81=E5=88=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../xhx/busiz/h5/web/ApiLoginController.java | 11 ++++++++++-
.../xhx/busiz/h5/web/DingTalkLoginController.java | 15 +--------------
2 files changed, 11 insertions(+), 15 deletions(-)
diff --git a/attendance-performance-manager/src/main/java/com/mortals/xhx/busiz/h5/web/ApiLoginController.java b/attendance-performance-manager/src/main/java/com/mortals/xhx/busiz/h5/web/ApiLoginController.java
index 82636fe3..abb94f7a 100644
--- a/attendance-performance-manager/src/main/java/com/mortals/xhx/busiz/h5/web/ApiLoginController.java
+++ b/attendance-performance-manager/src/main/java/com/mortals/xhx/busiz/h5/web/ApiLoginController.java
@@ -63,6 +63,14 @@ public class ApiLoginController extends BaseJsonBodyController {
JSONObject ret = new JSONObject();
JSONObject data = new JSONObject();
+ String loginName = loginForm.getLoginName();
+ String password = loginForm.getPassword();
+ String ip = super.getRequestIP(request);
+ if (StringUtils.isEmpty(loginName) || StringUtils.isEmpty(password)) {
+ ret.put(KEY_RESULT_CODE, VALUE_RESULT_FAILURE);
+ ret.put(KEY_RESULT_MSG, "鏈幏鍙栧埌鐢ㄦ埛淇℃伅锛岃閲嶆柊鐧诲綍");
+ return ret.toJSONString();
+ }
UserEntity userEntity = null;
try {
if (ObjectUtils.isEmpty(loginForm.getCode())) {
@@ -73,7 +81,8 @@ public class ApiLoginController extends BaseJsonBodyController {
if (personRest.getCode() != YesNoEnum.YES.getValue()) {
throw new AppException(DING_AUTH_FAIL,String.format("鑾峰彇閽夐拤鐢ㄦ埛寮傚父,%s", personRest.getMsg()));
}
- log.info(personRest.getData());
+ userEntity = userService.doLogin(loginName, password, ip);
+
if (!ObjectUtils.isEmpty(loginForm.getCode())) {
//鏇存柊缁戝畾閽夐拤
userEntity.setDingUserId(loginForm.getCode());
diff --git a/attendance-performance-manager/src/main/java/com/mortals/xhx/busiz/h5/web/DingTalkLoginController.java b/attendance-performance-manager/src/main/java/com/mortals/xhx/busiz/h5/web/DingTalkLoginController.java
index 1ab08e41..ddba833f 100644
--- a/attendance-performance-manager/src/main/java/com/mortals/xhx/busiz/h5/web/DingTalkLoginController.java
+++ b/attendance-performance-manager/src/main/java/com/mortals/xhx/busiz/h5/web/DingTalkLoginController.java
@@ -67,22 +67,10 @@ public class DingTalkLoginController extends BaseCRUDJsonBodyMappingController<U
@Autowired
private UserService userService;
@Autowired
- private ValidCodeService validCodeService;
- @Autowired
- private ResourceService resourceService;
- @Autowired
- private MenuService menuService;
-
- @Autowired
- private ICacheService cacheService;
- @Autowired
private IAuthTokenService authTokenService;
@Autowired
private StaffService staffService;
- @Autowired
- private DeptService deptService;
-
@Autowired
private IDingPersonService dingPersonService;
@@ -104,7 +92,6 @@ public class DingTalkLoginController extends BaseCRUDJsonBodyMappingController<U
throw new AppException(String.format("鑾峰彇閽夐拤鐢ㄦ埛寮傚父,%s", personRest.getMsg()));
}
log.info(personRest.getData());
-
if (ObjectUtils.isEmpty(personRest.getData()))
throw new AppException(1012, "鏈壘鍒板搷搴旂殑閽夐拤鐢ㄦ埛锛�");
//鏍规嵁閽夐拤鐨勭敤鎴锋煡璇㈢郴缁熺粦瀹氱殑鐢ㄦ埛,鑾峰彇
@@ -120,7 +107,7 @@ public class DingTalkLoginController extends BaseCRUDJsonBodyMappingController<U
data.put("userType", userEntity.getUserType());
userEntity.setLoginTime(System.currentTimeMillis());
userEntity.setToken(IdUtil.fastSimpleUUID());
- userEntity.setExpireTime(DateUtils.addCurrDate(7).getTime());
+ userEntity.setExpireTime(DateUtils.addCurrDate(1).getTime());
String token = authTokenService.createToken(userEntity);
data.put("token", token);
ret.put(KEY_RESULT_DATA, data);
--
2.24.3