feats

src/main/java/com/njyunzhi/invoice/controller/LoginController.java

@@ -2,19 +2,18 @@ package com.njyunzhi.invoice.controller;
 
 import cn.dev33.satoken.stp.StpUtil;
 import com.njyunzhi.invoice.common.BaseController;
+import com.njyunzhi.invoice.common.EncryptUtils;
 import com.njyunzhi.invoice.common.ResponseBean;
 import com.njyunzhi.invoice.common.StringUtils;
 import com.njyunzhi.invoice.entity.SysUser;
 import com.njyunzhi.invoice.service.ISysUserService;
+import com.njyunzhi.invoice.vo.ChangePassword;
 import com.njyunzhi.invoice.vo.LoginParm;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 import java.util.HashMap;
 import java.util.Map;
@@ -44,4 +43,35 @@ public class LoginController extends BaseController {
 
         return ResponseBean.success(result);
     }
+
+    @PostMapping("/admin/logout")
+    @ApiOperation(value="登出", notes = "登出", httpMethod = "POST", response = ResponseBean.class)
+    public ResponseBean logout() throws Exception {
+        StpUtil.logout();
+        return ResponseBean.success("success");
+    }
+
+
+    @PutMapping("/admin/change-password")
+    @ApiOperation(value="修改密码", notes = "修改密码", httpMethod = "PUT", response = ResponseBean.class)
+    public ResponseBean changePassword(@ApiParam("修改密码参数") @RequestBody ChangePassword param) throws Exception {
+        if (StringUtils.isEmpty(param.getOriginPassword()) || StringUtils.isEmpty(param.getNewPassword())) {
+            return ResponseBean.error("原始密码或新密码不能为空", ResponseBean.ERROR_ILLEGAL_PARAMS);
+        }
+
+        SysUser currentUser = currentUser();
+
+        if (!checkPassword(param.getOriginPassword(), currentUser.getPassword(), currentUser.getUserId())) {
+            return ResponseBean.error("原始密码不正确", ResponseBean.ERROR_ILLEGAL_PARAMS);
+        }
+
+        currentUser.setPassword(EncryptUtils.md5(param.getNewPassword(), currentUser.getUserId()));
+        iSysUserService.updateById(currentUser);
+
+        return ResponseBean.success("密码修改成功");
+    }
+
+    private boolean checkPassword(String src, String targ, String salt) {
+        return EncryptUtils.md5(src, salt).equals(targ);
+    }
 }

src/main/java/com/njyunzhi/invoice/controller/SysUserController.java

@@ -31,7 +31,7 @@ import org.springframework.web.bind.annotation.RestController;
 
 @Api(tags = "系统用户")
 @RestController
-@RequestMapping("/")
+@RequestMapping("/admin")
 public class SysUserController extends BaseController {
 
     private final Logger logger = LoggerFactory.getLogger(SysUserController.class);
@@ -46,7 +46,7 @@ public class SysUserController extends BaseController {
      * @param pageSize
      * @return
      */
-    @RequestMapping(value="/admin/user",method= RequestMethod.GET)
+    @RequestMapping(value="/user",method= RequestMethod.GET)
     @ApiOperation(value="列表", notes = "列表", httpMethod = "GET", response = ResponseBean.class)
     public ResponseBean sysUserList(@ApiParam("页码") @RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
 									 @ApiParam("单页数据量") @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize) throws Exception{
@@ -116,4 +116,17 @@ public class SysUserController extends BaseController {
     public ResponseBean sysUserGet(@ApiParam("对象ID") @PathVariable Integer id) throws Exception{
         return ResponseBean.success(iSysUserService.getById(id));
     }
+
+
+    /**
+     * 根据id查询对象
+     * @param id  实体ID
+     */
+    @RequestMapping(value="/user/current",method= RequestMethod.GET)
+    @ApiOperation(value="获取当前人员", notes = "获取当前人员", httpMethod = "GET", response = ResponseBean.class)
+    public ResponseBean getCurrent() throws Exception{
+        SysUser sysUser = currentUser();
+        sysUser.setPassword(null);
+        return ResponseBean.success(sysUser);
+    }
 }

src/main/java/com/njyunzhi/invoice/vo/ChangePassword.java

@@ -0,0 +1,17 @@
+package com.njyunzhi.invoice.vo;
+
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@ApiModel(description = "登录参数")
+@Data
+public class ChangePassword {
+
+    @ApiModelProperty("原始密码")
+    String originPassword;
+
+    @ApiModelProperty("新密码")
+    String newPassword;
+}