魏熙美 6 years ago
parent
commit
429dd6cf95

+ 51
- 1
src/main/java/com.huiju.welcome/controller/SysUserController.java View File

13
 import io.swagger.annotations.ApiImplicitParam;
13
 import io.swagger.annotations.ApiImplicitParam;
14
 import io.swagger.annotations.ApiImplicitParams;
14
 import io.swagger.annotations.ApiImplicitParams;
15
 import io.swagger.annotations.ApiOperation;
15
 import io.swagger.annotations.ApiOperation;
16
+import lombok.extern.slf4j.Slf4j;
17
+import org.apache.commons.lang3.StringUtils;
16
 import org.apache.http.HttpStatus;
18
 import org.apache.http.HttpStatus;
17
 import org.slf4j.Logger;
19
 import org.slf4j.Logger;
18
 import org.slf4j.LoggerFactory;
20
 import org.slf4j.LoggerFactory;
37
  */
39
  */
38
 @RestController
40
 @RestController
39
 @RequestMapping("/")
41
 @RequestMapping("/")
42
+@Slf4j
40
 public class SysUserController extends BaseController {
43
 public class SysUserController extends BaseController {
41
 
44
 
42
     private final Logger logger = LoggerFactory.getLogger(TdSpecController.class);
45
     private final Logger logger = LoggerFactory.getLogger(TdSpecController.class);
200
         ResponseBean responseBean = new ResponseBean();
203
         ResponseBean responseBean = new ResponseBean();
201
 
204
 
202
         sysUser.setCreateDate(LocalDateTime.now());
205
         sysUser.setCreateDate(LocalDateTime.now());
203
-
204
         boolean success = sysUserService.save(sysUser);
206
         boolean success = sysUserService.save(sysUser);
207
+
208
+        String defaultPwd = "123456";
209
+        String passwd = Encrypt.md5(Encrypt.md5(defaultPwd), sysUser.getUserId().toString());
210
+        log.info("创建新人员:{}, 默认密码:{},加密盐:{}, 加密后: {}", sysUser.getUsername(), defaultPwd, sysUser.getUserId().toString(), passwd);
211
+        sysUser.setPassword(passwd);
212
+        success = sysUserService.updateById(sysUser);
213
+
214
+
205
         if (!success) {
215
         if (!success) {
206
             responseBean.addError(HttpStatus.SC_INTERNAL_SERVER_ERROR, "新增用户失败");
216
             responseBean.addError(HttpStatus.SC_INTERNAL_SERVER_ERROR, "新增用户失败");
207
             return responseBean;
217
             return responseBean;
208
         }
218
         }
209
 
219
 
220
+        responseBean.addSuccess(sysUser);
221
+        return responseBean;
222
+    }
223
+
224
+    @ApiOperation(value = "修改密码", notes = "修改密码")
225
+    @ApiImplicitParams({
226
+            @ApiImplicitParam(paramType = "form", dataType = "String", name = "oldPwd", value = "旧密码"),
227
+            @ApiImplicitParam(paramType = "form", dataType = "String", name = "newPwd", value = "新密码")
228
+    })
229
+    @RequestMapping(value = "/updatePwd", method = RequestMethod.POST)
230
+    public ResponseBean updatePwd(@RequestParam String oldPwd, @RequestParam String newPwd, HttpSession session) {
231
+        ResponseBean responseBean = new ResponseBean();
232
+        if (StringUtils.isBlank(oldPwd)) {
233
+            responseBean.addError(HttpStatus.SC_BAD_REQUEST, "旧密码不能为空");
234
+        }
235
+        if (StringUtils.isBlank(newPwd)) {
236
+            responseBean.addError(HttpStatus.SC_BAD_REQUEST, "新密码不能为空");
237
+        }
238
+
239
+        Integer userId = (Integer) session.getAttribute("token-id");
240
+        SysUser currentUser = sysUserService.getById(userId);
241
+        oldPwd = Encrypt.md5(oldPwd);
242
+        // 密码校验
243
+        if (!checkPassword(oldPwd, currentUser)) {
244
+            responseBean.addError(HttpStatus.SC_BAD_REQUEST, "旧密码不正确");
245
+            return responseBean;
246
+        }
247
+
248
+        String passwd = Encrypt.md5(Encrypt.md5(newPwd), currentUser.getUserId().toString());
249
+        log.info("修改人员信息:{}, 新密码:{},加密盐:{}, 加密后: {}", currentUser.getUsername(), newPwd, currentUser.getUserId().toString(), passwd);
250
+        currentUser.setPassword(passwd);
251
+        boolean success = sysUserService.updateById(currentUser);
252
+
253
+
254
+        if (!success) {
255
+            responseBean.addError(HttpStatus.SC_INTERNAL_SERVER_ERROR, "修改密码失败");
256
+            return responseBean;
257
+        }
258
+
210
         return responseBean;
259
         return responseBean;
211
     }
260
     }
212
 
261
 
217
     @RequestMapping(value = "/sysuser", method = RequestMethod.PUT)
266
     @RequestMapping(value = "/sysuser", method = RequestMethod.PUT)
218
     public ResponseBean update(@RequestBody SysUser sysUser, HttpServletRequest request) {
267
     public ResponseBean update(@RequestBody SysUser sysUser, HttpServletRequest request) {
219
         ResponseBean responseBean = new ResponseBean();
268
         ResponseBean responseBean = new ResponseBean();
269
+        sysUser.setPassword(null);
220
         boolean success = sysUserService.updateById(sysUser);
270
         boolean success = sysUserService.updateById(sysUser);
221
         if (!success) {
271
         if (!success) {
222
             responseBean.addError(HttpStatus.SC_INTERNAL_SERVER_ERROR, "更新用户失败");
272
             responseBean.addError(HttpStatus.SC_INTERNAL_SERVER_ERROR, "更新用户失败");

+ 4
- 0
src/main/java/com.huiju.welcome/utils/Encrypt.java View File

78
         }
78
         }
79
         return encodeStr;
79
         return encodeStr;
80
     }
80
     }
81
+
82
+    public static void main(String[] args) {
83
+        System.out.println(md5("123456"));
84
+    }
81
 }
85
 }