From 0b19ab7926cb1df1998b288f2ba86f8e1deb3956 Mon Sep 17 00:00:00 2001
From: lidongdong <1459917685@qq.com>
Date: 星期日, 09 十月 2022 14:26:12 +0800
Subject: [PATCH] 测试导办人员
---
flower_city/src/main/java/com/dg/core/controller/UserController.java | 100 +++++++++++++++++++++++++-------------------------
1 files changed, 50 insertions(+), 50 deletions(-)
diff --git a/flower_city/src/main/java/com/dg/core/controller/UserController.java b/flower_city/src/main/java/com/dg/core/controller/UserController.java
index ab059d8..e000a15 100644
--- a/flower_city/src/main/java/com/dg/core/controller/UserController.java
+++ b/flower_city/src/main/java/com/dg/core/controller/UserController.java
@@ -50,8 +50,8 @@
SysUser user=null;
//管理员登录
- if(StringUtils.equals("zigonggaoadmin",account) || StringUtils.equals("yangxiao",account) )
- {
+// if(StringUtils.equals("zigonggaoadmin",account) || StringUtils.equals("yangxiao",account) )
+// {
user= IUserService.getUserByAccount(account);
if(user==null || !password.equals(user.getPassword()))
@@ -76,55 +76,55 @@
map.put("userName", user.getUserName());
return ResultData.success(map);
- }
+// }
- HuaChengSysUser huaChengSysUser=iHuaChengSysUserService.selectData("",account,"");
- if(huaChengSysUser==null || !password.equals(huaChengSysUser.getPassword()))
- {
- //提示用户名或密码错误
- return ResultData.fail(HttpStatus.UNAUTHORIZED, "用户名或密码错误");
- }
-
- //本地表查询用户
- user = IUserService.selectData(huaChengSysUser.getUserId()+"");
- if (user == null) {
- //本地没有此用户 新用户
- SysUser newSysUser=new SysUser();
- //默认 1系统后台用户
- newSysUser.setUserType("1");
- newSysUser.setPhonenumber(huaChengSysUser.getPhone());
- newSysUser.setUserId(huaChengSysUser.getUserId());
- newSysUser.setUserName(huaChengSysUser.getNickName());
- newSysUser.setSex(huaChengSysUser.getSex());
- newSysUser.setAvatar(huaChengSysUser.getImageUrl());
- newSysUser.setCreateTime(LocalDateTime.now());
- newSysUser.setUpdateTime(LocalDateTime.now());
- IUserService.insertConfig(newSysUser);
- }
-
- user = IUserService.selectData(huaChengSysUser.getUserId()+"");
-
- if (user == null) {
- return ResultData.error("用户不存在！请联系管理员");
- }
-
- String token = tokenManager.getTokenByUserId(user.getUserId());
- System.out.println("token "+token);
- if (token == null) {
- //生成一个token，保存用户登录状态
- token = tokenManager.createToken(user.getUserId(), user.getUserId());
- }
-
- user.setLoginDate(LocalDateTime.now());
- //更新登录时间
- IUserService.updateConfig(user);
-
- Map<String, Object> map = new HashMap<>();
- map.put("token", token);
- map.put("userId", user.getUserId());
- map.put("userName", user.getUserName());
-
- return ResultData.success(map);
+// HuaChengSysUser huaChengSysUser=iHuaChengSysUserService.selectData("",account,"");
+// if(huaChengSysUser==null || !password.equals(huaChengSysUser.getPassword()))
+// {
+// //提示用户名或密码错误
+// return ResultData.fail(HttpStatus.UNAUTHORIZED, "用户名或密码错误");
+// }
+//
+// //本地表查询用户
+// user = IUserService.selectData(huaChengSysUser.getUserId()+"");
+// if (user == null) {
+// //本地没有此用户 新用户
+// SysUser newSysUser=new SysUser();
+// //默认 1系统后台用户
+// newSysUser.setUserType("1");
+// newSysUser.setPhonenumber(huaChengSysUser.getPhone());
+// newSysUser.setUserId(huaChengSysUser.getUserId());
+// newSysUser.setUserName(huaChengSysUser.getNickName());
+// newSysUser.setSex(huaChengSysUser.getSex());
+// newSysUser.setAvatar(huaChengSysUser.getImageUrl());
+// newSysUser.setCreateTime(LocalDateTime.now());
+// newSysUser.setUpdateTime(LocalDateTime.now());
+// IUserService.insertConfig(newSysUser);
+// }
+//
+// user = IUserService.selectData(huaChengSysUser.getUserId()+"");
+//
+// if (user == null) {
+// return ResultData.error("用户不存在！请联系管理员");
+// }
+//
+// String token = tokenManager.getTokenByUserId(user.getUserId());
+// System.out.println("token "+token);
+// if (token == null) {
+// //生成一个token，保存用户登录状态
+// token = tokenManager.createToken(user.getUserId(), user.getUserId());
+// }
+//
+// user.setLoginDate(LocalDateTime.now());
+// //更新登录时间
+// IUserService.updateConfig(user);
+//
+// Map<String, Object> map = new HashMap<>();
+// map.put("token", token);
+// map.put("userId", user.getUserId());
+// map.put("userName", user.getUserName());
+//
+// return ResultData.success(map);
}
@ApiOperation("发送登录短信验证码")
--
Gitblit v1.7.1