From a1a2c190d45f3a9c43c28216b2c51f4bc49e31b8 Mon Sep 17 00:00:00 2001
From: wuxw <928255095@qq.com>
Date: 星期一, 17 三月 2025 23:23:18 +0800
Subject: [PATCH] 优化用户类型
---
service-user/src/main/java/com/java110/user/cmd/login/PcUserLoginCmd.java | 17 ++++++++++++-----
1 files changed, 12 insertions(+), 5 deletions(-)
diff --git a/service-user/src/main/java/com/java110/user/cmd/login/PcUserLoginCmd.java b/service-user/src/main/java/com/java110/user/cmd/login/PcUserLoginCmd.java
index 9ea5879..3a7a48e 100644
--- a/service-user/src/main/java/com/java110/user/cmd/login/PcUserLoginCmd.java
+++ b/service-user/src/main/java/com/java110/user/cmd/login/PcUserLoginCmd.java
@@ -3,6 +3,7 @@
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.java110.core.annotation.Java110Cmd;
+import com.java110.core.context.CmdContextUtils;
import com.java110.core.context.ICmdDataFlowContext;
import com.java110.core.event.cmd.Cmd;
import com.java110.core.event.cmd.CmdEvent;
@@ -10,6 +11,7 @@
import com.java110.core.factory.GenerateCodeFactory;
import com.java110.core.log.LoggerFactory;
import com.java110.doc.annotation.*;
+import com.java110.dto.app.AppDto;
import com.java110.dto.store.StoreUserDto;
import com.java110.dto.user.UserDto;
import com.java110.dto.user.UserLoginDto;
@@ -100,27 +102,32 @@
Assert.hasKeyAndValue(reqJson, "passwd", "鐢ㄦ埛鐧诲綍锛屾湭鍖呭惈passwd鑺傜偣锛岃妫�鏌�");
AuthenticationFactory.checkLoginErrorCount(reqJson.getString("username"));
+
+ String appId = CmdContextUtils.getAppId(cmdDataFlowContext);
+ if(AppDto.PROPERTY_APP.equals(appId)){
+ reqJson.put("passwd", AuthenticationFactory.passwdMd5(reqJson.getString("passwd")));
+ }
+
}
@Override
public void doCmd(CmdEvent event, ICmdDataFlowContext cmdDataFlowContext, JSONObject reqJson) throws CmdException {
ResponseEntity responseEntity = null;
- JSONObject paramInJson = JSONObject.parseObject(cmdDataFlowContext.getReqData());
//鏍规嵁AppId 鏌ヨ 鏄惁鏈夌櫥褰曠殑鏈嶅姟锛屾煡璇㈢櫥褰曞湴鍧�璋冪敤
UserDto userDto = new UserDto();
- userDto.setName(paramInJson.getString("username"));
- userDto.setPassword(paramInJson.getString("passwd"));
+ userDto.setName(reqJson.getString("username"));
+ userDto.setPassword(reqJson.getString("passwd"));
userDto.setLevelCds(new String[]{UserDto.LEVEL_CD_ADMIN, UserDto.LEVEL_CD_STAFF});
List<UserDto> userDtos = userInnerServiceSMOImpl.getUsers(userDto);
if (ListUtil.isNull(userDtos)) {
userDto.setName("");
- userDto.setTel(paramInJson.getString("username"));
+ userDto.setTel(reqJson.getString("username"));
userDtos = userInnerServiceSMOImpl.getUsers(userDto);
}
if (ListUtil.isNull(userDtos)) {
responseEntity = new ResponseEntity<String>("鐢ㄦ埛鎴栧瘑鐮侀敊璇�", HttpStatus.UNAUTHORIZED);
- AuthenticationFactory.userLoginError(paramInJson.getString("username"));
+ AuthenticationFactory.userLoginError(reqJson.getString("username"));
cmdDataFlowContext.setResponseEntity(responseEntity);
return;
}
--
Gitblit v1.8.0