|
@@ -1,17 +1,17 @@
|
|
|
package com.jiayue.ssi.controller;
|
|
|
|
|
|
+import cn.hutool.crypto.SmUtil;
|
|
|
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
|
|
|
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
|
|
+import com.jiayue.ssi.annotation.InterfaceLimit;
|
|
|
import com.jiayue.ssi.entity.SysUser;
|
|
|
import com.jiayue.ssi.service.SysUserService;
|
|
|
+import com.jiayue.ssi.util.RandomPwd;
|
|
|
import com.jiayue.ssi.util.ResponseVO;
|
|
|
import lombok.extern.slf4j.Slf4j;
|
|
|
import org.apache.commons.lang3.StringUtils;
|
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
|
-import org.springframework.security.access.prepost.PreAuthorize;
|
|
|
-import org.springframework.validation.annotation.Validated;
|
|
|
import org.springframework.web.bind.annotation.*;
|
|
|
-
|
|
|
import javax.servlet.http.HttpServletRequest;
|
|
|
|
|
|
/**
|
|
@@ -32,16 +32,16 @@ public class SysUserController {
|
|
|
*
|
|
|
* @return 用户信息
|
|
|
*/
|
|
|
-
|
|
|
@GetMapping(value = "/getAll")
|
|
|
- public ResponseVO getAll(Integer currentPage, Integer pageSize, String username,String password,String status) {
|
|
|
+ @InterfaceLimit
|
|
|
+ public ResponseVO getAll(Integer currentPage, Integer pageSize, String username,String phonenumber,String status) {
|
|
|
try {
|
|
|
QueryWrapper<SysUser> wrapper = new QueryWrapper<>();
|
|
|
if(StringUtils.isNotEmpty(username)){
|
|
|
wrapper.eq("username",username);
|
|
|
}
|
|
|
- if(StringUtils.isNotEmpty(password)){
|
|
|
- wrapper.eq("password",password);
|
|
|
+ if(StringUtils.isNotEmpty(phonenumber)){
|
|
|
+ wrapper.eq("phonenumber",phonenumber);
|
|
|
}
|
|
|
if(StringUtils.isNotEmpty(status)){
|
|
|
wrapper.eq("status",status);
|
|
@@ -50,7 +50,7 @@ public class SysUserController {
|
|
|
return ResponseVO.success(result);
|
|
|
} catch (Exception e) {
|
|
|
e.printStackTrace();
|
|
|
- log.error(" 获取所有用户异常");
|
|
|
+ log.error("获取所有用户异常");
|
|
|
return ResponseVO.error(null);
|
|
|
}
|
|
|
}
|
|
@@ -59,7 +59,8 @@ public class SysUserController {
|
|
|
* 新增用户
|
|
|
*/
|
|
|
@PostMapping
|
|
|
- public ResponseVO add(@RequestBody SysUser user, HttpServletRequest request) {
|
|
|
+ @InterfaceLimit
|
|
|
+ public ResponseVO add(@RequestBody SysUser user) {
|
|
|
if (StringUtils.isEmpty(user.getUsername())){
|
|
|
return ResponseVO.fail("用户账号不能为空!");
|
|
|
}
|
|
@@ -81,34 +82,11 @@ public class SysUserController {
|
|
|
return ResponseVO.fail(user.getMailbox() + "邮箱已存在!");
|
|
|
}
|
|
|
|
|
|
-// user.setPassword(SecurityUtils.encryptPassword(user.getPassword()));
|
|
|
- // 生成初始密码
|
|
|
-
|
|
|
+ // 生成8位初始密码
|
|
|
+ String randomPwd = RandomPwd.getRandomPwd(8);
|
|
|
+ user.setPassword(SmUtil.sm3(randomPwd).toUpperCase());
|
|
|
return ResponseVO.success(sysUserService.save(user));
|
|
|
}
|
|
|
-// /**
|
|
|
-// * 保存用户信息
|
|
|
-// *
|
|
|
-// * @param sysUser 参数
|
|
|
-// * @return 执行结果
|
|
|
-// */
|
|
|
-// @PostMapping(value = "sysUser/")
|
|
|
-// public ResponseVO save(@RequestBody SysUser sysUser) {
|
|
|
-// try {
|
|
|
-// boolean bo = sysUserService.saveUser(sysUser);
|
|
|
-// if (bo){
|
|
|
-// return ResponseVO.success("保存用户信息成功");
|
|
|
-// }
|
|
|
-// else{
|
|
|
-// log.error("保存用户信息失败");
|
|
|
-// return ResponseVO.fail();
|
|
|
-// }
|
|
|
-// } catch (Exception e) {
|
|
|
-// e.printStackTrace();
|
|
|
-// log.error("保存用户信息异常");
|
|
|
-// return ResponseVO.fail("保存用户信息异常");
|
|
|
-// }
|
|
|
-// }
|
|
|
|
|
|
/**
|
|
|
* 更新用户信息
|