feats

src/main/java/com/yunzhi/demo/common/Constants.java

@@ -17,6 +17,9 @@ public class Constants {
     public final static String SUPER_ADMIN_ID = "1";
     public final static Integer SUPER_ADMIN_ROLE = 1;
 
+    // 默认用户密码
+    public final static String DEFAULT_PASSWORD = "abc@123";
+
     // 系统参数
     // 阅读文章可获取的积分
     public final static String SYS_PARAM_POST_POINTS = "POINTS_OF_PER_POST";

src/main/java/com/yunzhi/demo/controller/LoginController.java

@@ -12,10 +12,7 @@ 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.PutMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 import java.util.HashMap;
 import java.util.Map;
@@ -89,7 +86,7 @@ public class LoginController extends BaseController {
         SysUser currentUser = getCurrentUser();
         SysLogin sysLogin = iSysLoginService.getByUser(currentUser.getUserId());
 
-        if (!checkPassword(param.getOriginPassword(), currentUser.getUserId(), sysLogin.getPassword())) {
+        if (!checkPassword(param.getOriginPassword(), sysLogin.getPassword(), currentUser.getUserId())) {
             return ResponseBean.error("原始密码不正确", ResponseBean.ERROR_ILLEGAL_PARAMS);
         }
 
@@ -99,6 +96,18 @@ public class LoginController extends BaseController {
         return ResponseBean.success("密码修改成功");
     }
 
+    @PutMapping("/admin/reset-password/{userId}")
+    @ApiOperation(value="重置密码", notes = "重置密码", httpMethod = "PUT", response = ResponseBean.class)
+    public ResponseBean resetPassword(@ApiParam("用户ID") @PathVariable String userId) throws Exception {
+        SysLogin sysLogin = iSysLoginService.getByUser(userId);
+
+        String newPassword = EncryptUtils.md5(EncryptUtils.md5(Constants.DEFAULT_PASSWORD), userId);
+        sysLogin.setPassword(newPassword);
+        iSysLoginService.updateById(sysLogin);
+
+        return ResponseBean.success("重置密码成功");
+    }
+
     private boolean checkPassword(String src, String targ, String salt) {
         return EncryptUtils.md5(src, salt).equals(targ);
     }

src/main/java/com/yunzhi/demo/controller/SysUserController.java

@@ -108,7 +108,7 @@ public class SysUserController extends BaseController {
             SysLogin newLogin = new SysLogin();
             newLogin.setUserId(sysUser.getUserId());
             newLogin.setLoginName(sysUser.getLoginName());
-            newLogin.setPassword(EncryptUtils.md5(EncryptUtils.md5("abc@123"), sysUser.getUserId()));
+            newLogin.setPassword(EncryptUtils.md5(EncryptUtils.md5(Constants.DEFAULT_PASSWORD), sysUser.getUserId()));
 
             iSysLoginService.save(newLogin);
 

src/main/java/com/yunzhi/demo/controller/TdPostTypeController.java

@@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yunzhi.demo.common.BaseController;
 import com.yunzhi.demo.common.Constants;
 import com.yunzhi.demo.common.ResponseBean;
+import com.yunzhi.demo.common.StringUtils;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
@@ -70,9 +71,12 @@ public class TdPostTypeController extends BaseController {
      * @param tdPostType 实体对象
      * @return
      */
-    @RequestMapping(value="/tdPostType",method= RequestMethod.POST)
+    @RequestMapping(value="/admin/post-type",method= RequestMethod.POST)
     @ApiOperation(value="保存", notes = "保存", httpMethod = "POST", response = ResponseBean.class)
     public ResponseBean tdPostTypeAdd(@ApiParam("保存内容") @RequestBody TdPostType tdPostType) throws Exception{
+        if (StringUtils.isEmpty(tdPostType.getName())) {
+            return ResponseBean.error("类型名称不能为空", ResponseBean.ERROR_ILLEGAL_PARAMS);
+        }
 
         if (iTdPostTypeService.save(tdPostType)){
             return ResponseBean.success(tdPostType);
@@ -85,10 +89,17 @@ public class TdPostTypeController extends BaseController {
      * 根据id删除对象
      * @param id  实体ID
      */
-    @RequestMapping(value="/tdPostType/{id}", method= RequestMethod.DELETE)
+    @RequestMapping(value="/post-type/{id}", method= RequestMethod.DELETE)
     @ApiOperation(value="删除", notes = "删除", httpMethod = "DELETE", response = ResponseBean.class)
-    public ResponseBean tdPostTypeDelete(@ApiParam("对象ID") @PathVariable Integer id) throws Exception{
-        if(iTdPostTypeService.removeById(id)){
+    public ResponseBean tdPostTypeDelete(@ApiParam("对象ID") @PathVariable String id) throws Exception{
+        TdPostType tdPostType = iTdPostTypeService.getById(id);
+        if (null == tdPostType || Constants.STATUS_DELETED.equals(tdPostType.getStatus())) {
+            return ResponseBean.success("success");
+        }
+
+        tdPostType.setStatus(Constants.STATUS_DELETED);
+
+        if(iTdPostTypeService.updateById(tdPostType)){
             return ResponseBean.success("success");
         }else {
             return ResponseBean.error("删除失败, 请重试", ResponseBean.ERROR_UNAVAILABLE);
@@ -101,10 +112,13 @@ public class TdPostTypeController extends BaseController {
      * @param tdPostType 实体对象
      * @return
      */
-    @RequestMapping(value="/tdPostType/{id}",method= RequestMethod.PUT)
+    @RequestMapping(value="/post-type/{id}",method= RequestMethod.PUT)
     @ApiOperation(value="更新", notes = "更新", httpMethod = "PUT", response = ResponseBean.class)
-    public ResponseBean tdPostTypeUpdate(@ApiParam("对象ID") @PathVariable Integer id,
-                                        @ApiParam("更新内容") @RequestBody TdPostType tdPostType) throws Exception{
+    public ResponseBean tdPostTypeUpdate(@ApiParam("对象ID") @PathVariable String id,
+                                         @ApiParam("更新内容") @RequestBody TdPostType tdPostType) throws Exception {
+        if (StringUtils.isEmpty(tdPostType.getName())) {
+            return ResponseBean.error("类型名称不能为空", ResponseBean.ERROR_ILLEGAL_PARAMS);
+        }
 
         if (iTdPostTypeService.updateById(tdPostType)){
             return ResponseBean.success(iTdPostTypeService.getById(id));
@@ -117,9 +131,14 @@ public class TdPostTypeController extends BaseController {
      * 根据id查询对象
      * @param id  实体ID
      */
-    @RequestMapping(value="/tdPostType/{id}",method= RequestMethod.GET)
+    @RequestMapping(value="/post-type/{id}",method= RequestMethod.GET)
     @ApiOperation(value="详情", notes = "详情", httpMethod = "GET", response = ResponseBean.class)
     public ResponseBean tdPostTypeGet(@ApiParam("对象ID") @PathVariable Integer id) throws Exception{
-        return ResponseBean.success(iTdPostTypeService.getById(id));
+        TdPostType tdPostType = iTdPostTypeService.getById(id);
+        if (null == tdPostType || Constants.STATUS_DELETED.equals(tdPostType.getStatus())) {
+            return ResponseBean.error("没有找到对应的信息", ResponseBean.ERROR_ILLEGAL_PARAMS);
+        }
+
+        return ResponseBean.success(tdPostType);
     }
 }

src/main/java/com/yunzhi/demo/entity/TdPostType.java

@@ -27,7 +27,7 @@ public class TdPostType implements Serializable {
     private static final long serialVersionUID = 1L;
 
     @ApiModelProperty(value = "分类主键")
-    @TableId(value = "type_id", type = IdType.INPUT)
+    @TableId(value = "type_id", type = IdType.UUID)
     private String typeId;
 
     @ApiModelProperty(value = "名称")