|
@@ -40,6 +40,8 @@ public class AccountController {
|
|
|
@Autowired
|
|
|
private LogService logService;
|
|
|
|
|
|
+ private Integer[] appLoginUserType = {3};
|
|
|
+
|
|
|
@ResponseBody
|
|
|
@GetMapping("/captcha")
|
|
|
public BaseResponse<Map<String, Object>> captcha() {
|
|
@@ -67,12 +69,35 @@ public class AccountController {
|
|
|
user.dataRangeList = userService.getUserDataRange(user.getUserId());
|
|
|
user.permissionList = accountService.getUserPerms(user.getUserId());
|
|
|
|
|
|
- logService.save("登录","","登录",user.userId);
|
|
|
+ logService.save("登录", "", "登录", user.userId);
|
|
|
|
|
|
return RespGenerstor.success(user);
|
|
|
|
|
|
}
|
|
|
|
|
|
+ @PostMapping("/appLogin")
|
|
|
+ public BaseResponse<UserModel> appLogin(HttpServletResponse response, HttpServletRequest request, @RequestBody DesModel model) throws Exception {
|
|
|
+ String[] desData = desUtils.decoder(model.getToken(), dateUtils.DateToDateTime(dateUtils.StrToDate(model.getTm(), "yyyy/MM/dd HH:mm:ss"))).split("\\|");
|
|
|
+
|
|
|
+ UserModel user = accountService.verifyUser(desData[0], desData[1]);
|
|
|
+
|
|
|
+ if (user == null)
|
|
|
+ throw new BaseException(BaseErrorEnum.USER_PASSWORD_ERROR);
|
|
|
+
|
|
|
+ if (!Arrays.asList(appLoginUserType).contains(user.getUserTypeId()))
|
|
|
+ throw new BaseException(BaseErrorEnum.APP_LOGIN_ERROR);
|
|
|
+
|
|
|
+ user.token = TokenUtils.sign(user.getUserId() + '|' + user.getUserTypeId());
|
|
|
+ user.dataRangeList = userService.getUserDataRange(user.getUserId());
|
|
|
+ user.permissionList = accountService.getUserPerms(user.getUserId());
|
|
|
+
|
|
|
+ logService.save("登录", "", "登录", user.userId);
|
|
|
+
|
|
|
+ return RespGenerstor.success(user);
|
|
|
+
|
|
|
+ }
|
|
|
+
|
|
|
+
|
|
|
@ResponseBody
|
|
|
@GetMapping("/info")
|
|
|
public BaseResponse<UserInfoModel> info() {
|
|
@@ -89,7 +114,7 @@ public class AccountController {
|
|
|
|
|
|
ObjectNode jObject = jsonMapper.jsonToObject(json, ObjectNode.class);*/
|
|
|
|
|
|
- /* var Menus = accountService.getSysMenu("T01");*/
|
|
|
+ /* var Menus = accountService.getSysMenu("T01");*/
|
|
|
|
|
|
var Menus = accountService.getUserMenuList(accountService.getLoginUserID());
|
|
|
|