From bf1563dbb4a19380daa610eeb7d49fc4b47282e0 Mon Sep 17 00:00:00 2001
From: luliqiang <kidgrow>
Date: Fri, 14 Aug 2020 15:15:16 +0800
Subject: [PATCH] Merge branch 'dev' of http://192.168.2.240:7070/r/kidgrow-microservices-platform into dev
---
kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-server/src/main/java/com/kidgrow/usercenter/controller/SysUserController.java | 44 +++++++++++++++++++++++++++++++++-----------
1 files changed, 33 insertions(+), 11 deletions(-)
diff --git a/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-server/src/main/java/com/kidgrow/usercenter/controller/SysUserController.java b/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-server/src/main/java/com/kidgrow/usercenter/controller/SysUserController.java
index aed44e1..75f2a9a 100644
--- a/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-server/src/main/java/com/kidgrow/usercenter/controller/SysUserController.java
+++ b/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-server/src/main/java/com/kidgrow/usercenter/controller/SysUserController.java
@@ -75,7 +75,10 @@
*/
@ApiOperation(value = "根据access_token当前登录用户")
@GetMapping("/users/current")
- public ResultBody<LoginAppUser> getLoginAppUser(@LoginUser(isFull = true) SysUser user) {
+ public ResultBody<LoginAppUser> getLoginAppUser(@LoginUser(isFull = true) SysUser user,HttpServletRequest request) {
+ if(user!=null){
+ loginLogs(user, request);
+ }
return ResultBody.ok().data(appUserService.getLoginAppUser(user));
}
@@ -94,12 +97,8 @@
*/
@GetMapping(value = "/users-anon/login", params = "username")
@ApiOperation(value = "根据用户名查询用户")
- public LoginAppUser findByUsername(String username, HttpServletRequest request) {
-
+ public LoginAppUser findByUsername(String username) {
LoginAppUser loginAppUser = appUserService.findByUsername(username);
- if (loginAppUser != null) {
- loginLogs(loginAppUser, request);
- }
return loginAppUser;
}
@@ -109,7 +108,7 @@
* @param sysUser
* @return
*/
- private int loginLogs(LoginAppUser sysUser, HttpServletRequest request) {
+ private int loginLogs(SysUser sysUser, HttpServletRequest request) {
SysUserLogs sysUserLogs = new SysUserLogs();
sysUserLogs.setClientId(ClientContextHolder.getClient());
sysUserLogs.setLoginAgentSystem(request.getHeader(CommonConstant.USER_AGENT_SYSTEM));
@@ -200,8 +199,6 @@
})
@GetMapping("/users")
public PageResult<SysUser> findUsers(@RequestParam Map<String, Object> params) {
-// log.info("租户ID："+ TenantContextHolder.getTenant());
-// log.info("IP:"+request.getHeader(CommonConstant.USER_AGENT_IP));
return appUserService.findUsers(params);
}
/**
@@ -253,6 +250,18 @@
return ResultBody.failed(ADMIN_CHANGE_MSG);
}
return appUserService.updatePassword(id, null, null, true);
+ }
+
+ /**
+ * 返回给Python加密密码
+ */
+ @GetMapping(value = "/users/python")
+ public ResultBody jiaMipython(@RequestBody String password) {
+ if (password==null||"".equals(password)) {
+ return ResultBody.failed().msg("请输入密码");
+ }
+ ResultBody resultBody = appUserService.jiaMipython(password);
+ return resultBody;
}
/**
@@ -319,7 +328,20 @@
boolean v = appUserService.delUser(id);
return ResultBody.ok().msg("删除成功").data(v);
}
-
+ /**
+ * 删除用户 不删除关系表 ，role_user 表 和 用户组织
+ *
+ * @param id
+ */
+ @DeleteMapping(value = "/users/deleteNoContact/{id}")
+ //@AuditLog(operation = "'删除用户:' + #id")
+ public ResultBody deleteNoContact(@PathVariable Long id) {
+ if (checkAdmin(id)) {
+ return ResultBody.failed(ADMIN_CHANGE_MSG);
+ }
+ boolean v = appUserService.deleteNoContact(id);
+ return ResultBody.ok().msg("删除成功").data(v);
+ }
/**
* 新增or更新
@@ -399,7 +421,7 @@
* 根据map查询
*/
private boolean checkAdmin(long id) {
- return id == 1L;
+ return id == CommonConstant.ADMIN_USER_ID;
}
@PostMapping("/users/findAll")
--
Gitblit v1.8.0