修改put和delete请求,新增

1.密码是复杂密码
2.登录密码输入5次错误锁定，3分钟后再次输入密码
                 3.密码一月内不更换，需要在登录前修改密码（符合密码要求规则）才可再次登录。

boman-api/boman-api-system/src/main/java/com/boman/system/api/RemoteSysMenuService.java

@@ -39,10 +39,10 @@ public interface RemoteSysMenuService {
      * @param id
      * @return
      */
-    @DeleteMapping("/menu/remove/{id}")
+    @GetMapping("/menu/remove/{id}")
     public AjaxResult remove(@PathVariable("id") Long id);
 
-    @PutMapping("/menu")
+    @PostMapping("/menu/put")
     public AjaxResult edit(@Validated @RequestBody SysMenu menu);
 
 

boman-api/boman-domain/src/main/java/com.boman.domain/constant/Constants.java

@@ -109,6 +109,23 @@ public class Constants
      */
     public final static long TOKEN_EXPIRE = 120;
 
+    /**
+     * 密码错误锁定时长
+     */
+    public final static long USERNAME_EXPIRATION = 3;
+    /**
+     * 修改密码的有效时长
+     */
+    public final static long UPDATE_PASSWORD= 60;
+    /**
+     * 密码有效期的KEY
+     */
+    public  static final String LOGIN_NUM = "login_num: ";
+    /**
+     * 判断2个月内是否修改密码
+     */
+    public  static final String PASSWORD_USER = "password_user: ";
+
     /**
      * 参数管理 cache key
      */

boman-auth/src/main/java/com/boman/auth/controller/TokenController.java

@@ -21,6 +21,8 @@ import org.springframework.web.bind.annotation.*;
 
 import java.util.Map;
 
+import static com.boman.common.core.utils.SecurityUtils.checkStrongPwd;
+
 
 /**
  * token 控制
@@ -52,6 +54,9 @@ public class TokenController {
             }
             openId = (String) jsonObject.get("openId");
         }
+        if ("1".equals(checkStrongPwd(form.getPassword()))) {
+            return R.fail("密码必须包含数字、大小写字母、特殊符号且大于8位");
+        }
         // 用户登录
         LoginUser userInfo = sysLoginService.login(form.getUsername(), form.getPassword());
         // 如果是微信登录并且获取到的用户的unionId不为空
@@ -112,7 +117,7 @@ public class TokenController {
         return sysLoginService.phoneScanLogin(form);
     }
 
-    @DeleteMapping("logout")
+    @GetMapping("logout")
     public R<?> logout(HttpServletRequest request) {
         LoginUser loginUser = tokenService.getLoginUser(request);
         if (StringUtils.isNotNull(loginUser)) {

boman-auth/src/main/java/com/boman/auth/service/SysLoginService.java

@@ -18,6 +18,9 @@ import com.boman.system.api.RemoteUserService;
 import com.boman.domain.SysUser;
 import com.boman.system.api.model.LoginUser;
 
+import java.util.concurrent.TimeUnit;
+
+import static com.boman.domain.constant.Constants.LOGIN_NUM;
 import static com.boman.domain.constant.Constants.SUCCESS;
 
 /**
@@ -52,7 +55,7 @@ public class SysLoginService {
             throw new BaseException("用户/密码必须填写");
         }
 
-        // 密码如果不在指定范围内 错误
+/*        // 密码如果不在指定范围内 错误
         if (password.length() < UserConstants.PASSWORD_MIN_LENGTH || password.length() > UserConstants.PASSWORD_MAX_LENGTH) {
             remoteLogService.saveLogininfor(username, Constants.LOGIN_FAIL, "用户密码不在指定范围");
             throw new BaseException("用户密码不在指定范围");
@@ -62,7 +65,7 @@ public class SysLoginService {
         if (username.length() < UserConstants.USERNAME_MIN_LENGTH || username.length() > UserConstants.USERNAME_MAX_LENGTH) {
             remoteLogService.saveLogininfor(username, Constants.LOGIN_FAIL, "用户名不在指定范围");
             throw new BaseException("用户名不在指定范围");
-        }
+        }*/
         // 查询用户信息
         R<LoginUser> userResult = remoteUserService.getUserInfo(username);
 
@@ -89,8 +92,27 @@ public class SysLoginService {
 
         if (!SecurityUtils.matchesPassword(password, user.getPassword())) {
             remoteLogService.saveLogininfor(username, Constants.LOGIN_FAIL, "用户密码错误");
+            if (!"admin".equals(username)){
+                String num = redisService.getCacheObject(LOGIN_NUM + username);
+                if(StringUtils.isEmpty(num)){
+                    num = "0";
+                }
+                if(Integer.parseInt(num) == 5){
+                    throw new BaseException("登录密码输入5次错误,现已锁定，3分钟后再次输入密码");
+                }
+                //存入redis登录错误次数
+                redisService.setCacheObject(LOGIN_NUM + username, String.valueOf(Integer.parseInt(num)+1), Constants.USERNAME_EXPIRATION, TimeUnit.MINUTES);
+            }
             throw new BaseException("用户不存在/密码错误");
         }
+        //判断2个月内是否修改密码，排除admin
+        if(StringUtils.isNotEmpty(username) && !"admin".equals(username)){
+            String isUpdate = redisService.getCacheObject(Constants.PASSWORD_USER + username);
+            if(StringUtils.isEmpty(isUpdate)){
+                //自定义异常类
+                throw new BaseException("60天内为登录,需修改密码后重新登录");
+            }
+        }
         remoteLogService.saveLogininfor(username, Constants.LOGIN_SUCCESS, "登录成功");
         return userInfo;
     }
@@ -120,7 +142,10 @@ public class SysLoginService {
             remoteLogService.saveLogininfor(userName, Constants.LOGIN_FAIL, "对不起，您的账号已被删除");
             throw new BaseException("对不起，您的账号：" + userName + " 已被删除");
         }
+        //
+        if (!"admin".equals(userName)) {
 
+        }
         if (UserStatus.DISABLE.getCode().equals(user.getStatus())) {
             remoteLogService.saveLogininfor(userName, Constants.LOGIN_FAIL, "用户已停用，请联系管理员");
             throw new BaseException("对不起，您的账号：" + userName + " 已停用");

boman-common/boman-common-core/src/main/java/com/boman/common/core/utils/PwdCheckUtil.java

@@ -0,0 +1,111 @@
+package com.boman.common.core.utils;
+
+/**
+ * @Author: tjf
+ * @Date: 2022/10/10 9:24
+ * @Describe:
+ */
+public class PwdCheckUtil {
+    //定义特殊字符
+    public static String SPECIAL_CHAR = "!\"#$%&'()*+,-./:;<=>?@[\\]^_`{|}~";
+
+    /**
+     * @brief   检测密码中字符长度
+     * @param[in] password            密码字符串
+     * @return  符合长度要求 返回true
+     */
+    public static boolean checkPasswordLength(String password, String minNum, String maxNum) {
+        boolean flag =false;
+        if (StringUtils.isBlank(maxNum))  {
+            minNum = StringUtils.isBlank(minNum) ? "0":minNum;
+            if (password.length() >= Integer.parseInt(minNum)) {
+                flag = true;
+            }
+        } else {
+            minNum = StringUtils.isBlank(minNum) ? "0":minNum;
+            if (password.length() >= Integer.parseInt(minNum) &&
+                    password.length() <= Integer.parseInt(maxNum)) {
+                flag = true;
+            }
+        }
+        return flag;
+    }
+
+    /**
+     * @brief   检测密码中是否包含数字
+     * @param[in] password            密码字符串
+     * @return  包含数字 返回true
+     */
+    public static boolean checkContainDigit(String password) {
+        char[] chPass = password.toCharArray();
+        for (int i = 0; i < chPass.length; i++) {
+            if (Character.isDigit(chPass[i])) {
+                return true;
+            }
+        }
+        return false;
+    }
+
+    /**
+     * @brief   检测密码中是否包含字母（不区分大小写）
+     * @param[in] password            密码字符串
+     * @return  包含字母 返回true
+     */
+    public static boolean checkContainCase(String password) {
+        char[] chPass = password.toCharArray();
+        for (int i = 0; i < chPass.length; i++) {
+            if (Character.isLetter(chPass[i])) {
+                return true;
+            }
+        }
+        return false;
+    }
+
+
+    /**
+     * @brief   检测密码中是否包含小写字母
+     * @param[in] password            密码字符串
+     * @return  包含小写字母 返回true
+     */
+    public static boolean checkContainLowerCase(String password) {
+        char[] chPass = password.toCharArray();
+        for (int i = 0; i < chPass.length; i++) {
+            if (Character.isLowerCase(chPass[i])) {
+                return true;
+            }
+        }
+        return false;
+    }
+
+
+    /**
+     * @brief   检测密码中是否包含大写字母
+     * @param[in] password            密码字符串
+     * @return  包含大写字母 返回true
+     */
+    public static boolean checkContainUpperCase(String password) {
+        char[] chPass = password.toCharArray();
+        for (int i = 0; i < chPass.length; i++) {
+            if (Character.isUpperCase(chPass[i])) {
+                return true;
+            }
+        }
+        return false;
+    }
+
+
+    /**
+     * @brief   检测密码中是否包含特殊符号
+     * @param[in] password            密码字符串
+     * @return  包含特殊符号 返回true
+     */
+    public static boolean checkContainSpecialChar(String password) {
+        char[] chPass = password.toCharArray();
+        for (int i = 0; i < chPass.length; i++) {
+            if (SPECIAL_CHAR.indexOf(chPass[i]) != -1) {
+                return true;
+            }
+        }
+        return false;
+    }
+}

boman-common/boman-common-core/src/main/java/com/boman/common/core/utils/SecurityUtils.java

@@ -2,6 +2,7 @@ package com.boman.common.core.utils;
 
 import javax.servlet.http.HttpServletRequest;
 
+import com.google.common.base.Preconditions;
 import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
 import com.boman.domain.constant.CacheConstants;
 import com.boman.common.core.text.Convert;
@@ -86,4 +87,26 @@ public class SecurityUtils
         BCryptPasswordEncoder passwordEncoder = new BCryptPasswordEncoder();
         return passwordEncoder.matches(rawPassword, encodedPassword);
     }
+
+    /**
+     * @brief   检测密码复杂度是否为 强
+     * @param[in] password  密码字符串
+     * @return  符合长度要求 返回true
+     */
+    public static String checkStrongPwd(String pwd) {
+        try {
+            Preconditions.checkNotNull(pwd);
+            if (!PwdCheckUtil.checkPasswordLength(pwd, "8", null)
+                    || !PwdCheckUtil.checkContainLowerCase(pwd)
+                    || !PwdCheckUtil.checkContainUpperCase(pwd)
+                    || !PwdCheckUtil.checkContainDigit(pwd)
+                    || !PwdCheckUtil.checkContainSpecialChar(pwd)
+            ) {
+                return "1";
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return "0";
+    }
 }

boman-modules/boman-gen/src/main/java/com/boman/gen/controller/GenController.java

@@ -139,7 +139,7 @@ public class GenController extends BaseController {
      */
     @PreAuthorize(hasPermi = "tool:gen:edit")
     @Log(title = "代码生成", businessType = BusinessType.UPDATE)
-    @PutMapping
+    @PostMapping("/put")
     public AjaxResult editSave(@Validated @RequestBody GenTable genTable) {
         genTableService.validateEdit(genTable);
         genTableService.updateGenTable(genTable);
@@ -152,7 +152,7 @@ public class GenController extends BaseController {
      */
     @PreAuthorize(hasPermi = "tool:gen:remove")
     @Log(title = "代码生成", businessType = BusinessType.DELETE)
-    @DeleteMapping("/{tableIds}")
+    @GetMapping("/delete/{tableIds}")
     public AjaxResult remove(@PathVariable Long[] tableIds) {
         genTableService.deleteGenTableByIds(tableIds);
         //loadTableServer.loadTable(new GenTable());

boman-modules/boman-gen/src/main/java/com/boman/gen/controller/GenTableColumnController.java

@@ -65,7 +65,7 @@ public class GenTableColumnController extends BaseController {
     * @Date 2021/3/24
     */
     @Log(title = "修改业务表字段", businessType = BusinessType.UPDATE)
-    @PutMapping
+    @PostMapping("/put")
     public AjaxResult edit(@Validated @RequestBody GenTableColumn genTableColumn)
     {
         genTableColumn.setUpdateBy(SecurityUtils.getUsername());
@@ -76,7 +76,7 @@ public class GenTableColumnController extends BaseController {
      * 删除表字段
      */
     @Log(title = "删除表字段", businessType = BusinessType.DELETE)
-    @DeleteMapping("/{columnIds}")
+    @GetMapping("/delete/{columnIds}")
     public AjaxResult remove(@PathVariable String columnIds)
     {
         return toAjax(genTableColumnService.deleteGenTableColumnByColumnIds(columnIds));

boman-modules/boman-gen/src/main/java/com/boman/gen/controller/GenTableRelationController.java

@@ -57,7 +57,7 @@ public class GenTableRelationController extends BaseController {
     /**
      * 修改关联关系表
      */
-    @PutMapping
+    @PostMapping("/put")
     public AjaxResult edit(@Validated @RequestBody GenTableRelation genTableRelation)
     {
 
@@ -68,7 +68,7 @@ public class GenTableRelationController extends BaseController {
     /**
      * 删除关联关系表
      */
-    @DeleteMapping("/{ids}")
+    @GetMapping("/delete/{ids}")
     public AjaxResult remove(@PathVariable Long[] ids)
     {
         return toAjax(genTableRelationService.deleteGenTableRelation(ids));

boman-modules/boman-job/src/main/java/com/boman/job/controller/SysJobController.java

@@ -92,9 +92,9 @@ public class SysJobController extends BaseController
     /**
      * 修改定时任务
      */
-    @PreAuthorize(hasPermi = "monitor:job:edit")
+    @PreAuthorize(hasPermi = "monitor:job:run")
     @Log(title = "定时任务", businessType = BusinessType.UPDATE)
-    @PutMapping
+    @PostMapping("/run")
     public AjaxResult edit(@RequestBody SysJob sysJob) throws SchedulerException, TaskException
     {
         if (!CronUtils.isValid(sysJob.getCronExpression()))
@@ -110,7 +110,7 @@ public class SysJobController extends BaseController
      */
     @PreAuthorize(hasPermi = "monitor:job:changeStatus")
     @Log(title = "定时任务", businessType = BusinessType.UPDATE)
-    @PutMapping("/changeStatus")
+    @GetMapping("/delete/{jobIds}")
     public AjaxResult changeStatus(@RequestBody SysJob job) throws SchedulerException
     {
         SysJob newJob = jobService.selectJobById(job.getJobId());

boman-modules/boman-job/src/main/java/com/boman/job/controller/SysJobLogController.java

@@ -72,7 +72,7 @@ public class SysJobLogController extends BaseController
      */
     @PreAuthorize(hasPermi = "monitor:job:remove")
     @Log(title = "定时任务调度日志", businessType = BusinessType.DELETE)
-    @DeleteMapping("/{jobLogIds}")
+    @GetMapping("/delete/{jobLogIds}")
     public AjaxResult remove(@PathVariable Long[] jobLogIds)
     {
         return toAjax(jobLogService.deleteJobLogByIds(jobLogIds));
@@ -83,7 +83,7 @@ public class SysJobLogController extends BaseController
      */
     @PreAuthorize(hasPermi = "monitor:job:remove")
     @Log(title = "调度日志", businessType = BusinessType.CLEAN)
-    @DeleteMapping("/clean")
+    @GetMapping("/clean")
     public AjaxResult clean()
     {
         jobLogService.cleanJobLog();

boman-modules/boman-system/src/main/java/com/boman/system/controller/SysConfigController.java

@@ -98,7 +98,7 @@ public class SysConfigController extends BaseController
      */
     @PreAuthorize(hasPermi = "system:config:edit")
     @Log(title = "参数管理", businessType = BusinessType.UPDATE)
-    @PutMapping
+    @PostMapping("/put")
     public AjaxResult edit(@Validated @RequestBody SysConfig config)
     {
         if (UserConstants.NOT_UNIQUE.equals(configService.checkConfigKeyUnique(config)))
@@ -114,7 +114,7 @@ public class SysConfigController extends BaseController
      */
     @PreAuthorize(hasPermi = "system:config:remove")
     @Log(title = "参数管理", businessType = BusinessType.DELETE)
-    @DeleteMapping("/{ids}")
+    @GetMapping(value = "/delete/{ids}")
     public AjaxResult remove(@PathVariable Long[] ids)
     {
         return toAjax(configService.deleteConfigByIds(ids));
@@ -125,7 +125,7 @@ public class SysConfigController extends BaseController
      */
     @PreAuthorize(hasPermi = "system:config:remove")
     @Log(title = "参数管理", businessType = BusinessType.CLEAN)
-    @DeleteMapping("/clearCache")
+    @GetMapping("/clearCache")
     public AjaxResult clearCache()
     {
         configService.clearCache();

boman-modules/boman-system/src/main/java/com/boman/system/controller/SysDeptController.java

@@ -195,7 +195,7 @@ public class SysDeptController extends BaseController
      */
     @PreAuthorize(hasPermi = "system:dept:edit")
     @Log(title = "部门管理", businessType = BusinessType.UPDATE)
-    @PutMapping
+    @PostMapping("/put")
     public AjaxResult edit(@Validated @RequestBody SysDept dept)
     {
         if (UserConstants.NOT_UNIQUE.equals(deptService.checkDeptNameUnique(dept)))
@@ -220,7 +220,7 @@ public class SysDeptController extends BaseController
      */
     @PreAuthorize(hasPermi = "system:dept:remove")
     @Log(title = "部门管理", businessType = BusinessType.DELETE)
-    @DeleteMapping("/{id}")
+    @GetMapping(value = "/delete/{id}")
     public AjaxResult remove(@PathVariable Long id)
     {
         if (deptService.hasChildById(id))

boman-modules/boman-system/src/main/java/com/boman/system/controller/SysDictDataController.java

@@ -128,7 +128,7 @@ public class SysDictDataController extends BaseController
      */
     @PreAuthorize(hasPermi = "system:dict:edit")
     @Log(title = "字典数据", businessType = BusinessType.UPDATE)
-    @PutMapping
+    @PostMapping("/put")
     public AjaxResult edit(@Validated @RequestBody SysDictData dict)
     {
         dict.setUpdateBy(SecurityUtils.getUsername());
@@ -140,7 +140,7 @@ public class SysDictDataController extends BaseController
      */
     @PreAuthorize(hasPermi = "system:dict:remove")
     @Log(title = "字典类型", businessType = BusinessType.DELETE)
-    @DeleteMapping("/{ids}")
+    @GetMapping(value = "/delete/{ids}")
     public AjaxResult remove(@PathVariable Long[] ids)
     {
         return toAjax(dictDataService.deleteDictDataByIds(ids));

boman-modules/boman-system/src/main/java/com/boman/system/controller/SysDictTypeController.java

@@ -87,7 +87,7 @@ public class SysDictTypeController extends BaseController
      */
     @PreAuthorize(hasPermi = "system:dict:edit")
     @Log(title = "字典类型", businessType = BusinessType.UPDATE)
-    @PutMapping
+    @PostMapping("/put")
     public AjaxResult edit(@Validated @RequestBody SysDictType dict)
     {
         if (UserConstants.NOT_UNIQUE.equals(dictTypeService.checkDictTypeUnique(dict)))
@@ -103,7 +103,7 @@ public class SysDictTypeController extends BaseController
      */
     @PreAuthorize(hasPermi = "system:dict:remove")
     @Log(title = "字典类型", businessType = BusinessType.DELETE)
-    @DeleteMapping("/{ids}")
+    @GetMapping(value = "/delete/{ids}")
     public AjaxResult remove(@PathVariable Long[] ids)
     {
         return toAjax(dictTypeService.deleteDictTypeByIds(ids));
@@ -114,7 +114,7 @@ public class SysDictTypeController extends BaseController
      */
     @PreAuthorize(hasPermi = "system:dict:remove")
     @Log(title = "字典类型", businessType = BusinessType.CLEAN)
-    @DeleteMapping("/clearCache")
+    @GetMapping("/clearCache")
     public AjaxResult clearCache()
     {
         dictTypeService.clearCache();

boman-modules/boman-system/src/main/java/com/boman/system/controller/SysLogininforController.java

@@ -57,7 +57,7 @@ public class SysLogininforController extends BaseController
 
     @PreAuthorize(hasPermi = "system:logininfor:remove")
     @Log(title = "登录日志", businessType = BusinessType.DELETE)
-    @DeleteMapping("/{ids}")
+    @GetMapping(value = "/delete/{ids}")
     public AjaxResult remove(@PathVariable Long[] ids)
     {
         return toAjax(logininforService.deleteLogininforByIds(ids));
@@ -65,7 +65,7 @@ public class SysLogininforController extends BaseController
 
     @PreAuthorize(hasPermi = "system:logininfor:remove")
     @Log(title = "登录日志", businessType = BusinessType.DELETE)
-    @DeleteMapping("/clean")
+    @GetMapping("clean")
     public AjaxResult clean()
     {
         logininforService.cleanLogininfor();

boman-modules/boman-system/src/main/java/com/boman/system/controller/SysMenuController.java

@@ -168,7 +168,7 @@ public class SysMenuController extends BaseController
      */
     @PreAuthorize(hasPermi = "system:menu:edit")
     @Log(title = "菜单管理", businessType = BusinessType.UPDATE)
-    @PutMapping
+    @PostMapping("/put")
     public AjaxResult edit(@Validated @RequestBody SysMenu menu)
     {
         if (UserConstants.NOT_UNIQUE.equals(menuService.checkMenuNameUnique(menu)))
@@ -193,7 +193,7 @@ public class SysMenuController extends BaseController
      */
     @PreAuthorize(hasPermi = "system:menu:remove")
     @Log(title = "菜单管理", businessType = BusinessType.DELETE)
-    @DeleteMapping("/{id}")
+    @GetMapping(value = "/delete/{ids}")
     public AjaxResult remove(@PathVariable("id") Long id)
     {
         if (menuService.hasChildById(id))
@@ -212,7 +212,7 @@ public class SysMenuController extends BaseController
      */
     @PreAuthorize(hasPermi = "system:menu:remove")
     @Log(title = "菜单管理", businessType = BusinessType.DELETE)
-    @DeleteMapping("/remove/{id}")
+    @GetMapping("/remove/{id}")
     public AjaxResult delete(@PathVariable("id") Long id)
     {
         if (menuService.hasChildById(id))

boman-modules/boman-system/src/main/java/com/boman/system/controller/SysNoticeController.java

@@ -72,7 +72,7 @@ public class SysNoticeController extends BaseController
      */
     @PreAuthorize(hasPermi = "system:notice:edit")
     @Log(title = "通知公告", businessType = BusinessType.UPDATE)
-    @PutMapping
+    @PostMapping("/put")
     public AjaxResult edit(@Validated @RequestBody SysNotice notice)
     {
         notice.setUpdateBy(SecurityUtils.getUsername());
@@ -84,7 +84,7 @@ public class SysNoticeController extends BaseController
      */
     @PreAuthorize(hasPermi = "system:notice:remove")
     @Log(title = "通知公告", businessType = BusinessType.DELETE)
-    @DeleteMapping("/{ids}")
+    @GetMapping(value = "/delete/{ids}")
     public AjaxResult remove(@PathVariable Long[] ids)
     {
         return toAjax(noticeService.deleteNoticeByIds(ids));

boman-modules/boman-system/src/main/java/com/boman/system/controller/SysOperlogController.java

@@ -53,7 +53,7 @@ public class SysOperlogController extends BaseController
     }
 
     @PreAuthorize(hasPermi = "system:operlog:remove")
-    @DeleteMapping("/{ids}")
+    @GetMapping(value = "/delete/{ids}")
     public AjaxResult remove(@PathVariable Long[] ids)
     {
         return toAjax(operLogService.deleteOperLogByIds(ids));
@@ -61,7 +61,7 @@ public class SysOperlogController extends BaseController
 
     @PreAuthorize(hasPermi = "system:operlog:remove")
     @Log(title = "操作日志", businessType = BusinessType.CLEAN)
-    @DeleteMapping("/clean")
+    @GetMapping("/clean")
     public AjaxResult clean()
     {
         operLogService.cleanOperLog();

boman-modules/boman-system/src/main/java/com/boman/system/controller/SysPostController.java

@@ -94,7 +94,7 @@ public class SysPostController extends BaseController
      */
     @PreAuthorize(hasPermi = "system:post:edit")
     @Log(title = "岗位管理", businessType = BusinessType.UPDATE)
-    @PutMapping
+    @PostMapping("/put")
     public AjaxResult edit(@Validated @RequestBody SysPost post)
     {
         if (UserConstants.NOT_UNIQUE.equals(postService.checkPostNameUnique(post)))
@@ -114,7 +114,7 @@ public class SysPostController extends BaseController
      */
     @PreAuthorize(hasPermi = "system:post:remove")
     @Log(title = "岗位管理", businessType = BusinessType.DELETE)
-    @DeleteMapping("/{ids}")
+    @GetMapping(value = "/delete/{ids}")
     public AjaxResult remove(@PathVariable Long[] ids)
     {
         return toAjax(postService.deletePostByIds(ids));

boman-modules/boman-system/src/main/java/com/boman/system/controller/SysProfileController.java

@@ -1,6 +1,10 @@
 package com.boman.system.controller;
 
 import java.io.IOException;
+import java.util.concurrent.TimeUnit;
+
+import com.boman.common.redis.service.RedisService;
+import com.boman.domain.constant.Constants;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -25,6 +29,9 @@ import com.boman.domain.SysUser;
 import com.boman.system.api.model.LoginUser;
 import com.boman.system.service.ISysUserService;
 
+import static com.boman.common.core.utils.SecurityUtils.checkStrongPwd;
+import static com.boman.domain.constant.Constants.LOGIN_NUM;
+
 /**
  * 个人信息 业务处理
  * 
@@ -43,6 +50,9 @@ public class SysProfileController extends BaseController
     @Autowired
     private RemoteFileService remoteFileService;
 
+    @Autowired
+    private RedisService redisService;
+
     /**
      * 个人信息
      */
@@ -61,7 +71,7 @@ public class SysProfileController extends BaseController
      * 修改用户
      */
     @Log(title = "个人信息", businessType = BusinessType.UPDATE)
-    @PutMapping
+    @PostMapping("/put")
     public AjaxResult updateProfile(@RequestBody SysUser user)
     {
         if (userService.updateUserProfile(user) > 0)
@@ -82,7 +92,7 @@ public class SysProfileController extends BaseController
      * 重置密码
      */
     @Log(title = "个人信息", businessType = BusinessType.UPDATE)
-    @PutMapping("/updatePwd")
+    @PostMapping("/updatePwd")
     public AjaxResult updatePwd(String oldPassword, String newPassword)
     {
         String username = SecurityUtils.getUsername();
@@ -96,12 +106,17 @@ public class SysProfileController extends BaseController
         {
             return AjaxResult.error("新密码不能与旧密码相同");
         }
+        if ("1".equals(checkStrongPwd(newPassword))) {
+            return AjaxResult.error("密码必须包含数字、大小写字母、特殊符号且大于8位");
+        }
         if (userService.resetUserPwd(username, SecurityUtils.encryptPassword(newPassword)) > 0)
         {
             // 更新缓存用户密码
             LoginUser loginUser = tokenService.getLoginUser();
             loginUser.getSysUser().setPassword(SecurityUtils.encryptPassword(newPassword));
             tokenService.setLoginUser(loginUser);
+            //更新用户60天内修改密码的key
+            redisService.setCacheObject(Constants.PASSWORD_USER + username,60, Constants.UPDATE_PASSWORD, TimeUnit.DAYS);
             return AjaxResult.success();
         }
         return AjaxResult.error("修改密码异常，请联系管理员");

boman-modules/boman-system/src/main/java/com/boman/system/controller/SysRoleController.java

@@ -91,7 +91,7 @@ public class SysRoleController extends BaseController
      */
     @PreAuthorize(hasPermi = "system:role:edit")
     @Log(title = "角色管理", businessType = BusinessType.UPDATE)
-    @PutMapping
+    @PostMapping("/put")
     public AjaxResult edit(@Validated @RequestBody SysRole role)
     {
         roleService.checkRoleAllowed(role);
@@ -112,7 +112,7 @@ public class SysRoleController extends BaseController
      */
     @PreAuthorize(hasPermi = "system:role:edit")
     @Log(title = "角色管理", businessType = BusinessType.UPDATE)
-    @PutMapping("/dataScope")
+    @PostMapping("/dataScope")
     public AjaxResult dataScope(@RequestBody SysRole role)
     {
         roleService.checkRoleAllowed(role);
@@ -124,7 +124,7 @@ public class SysRoleController extends BaseController
      */
     @PreAuthorize(hasPermi = "system:role:edit")
     @Log(title = "角色管理", businessType = BusinessType.UPDATE)
-    @PutMapping("/changeStatus")
+    @PostMapping("/changeStatus")
     public AjaxResult changeStatus(@RequestBody SysRole role)
     {
         roleService.checkRoleAllowed(role);
@@ -137,7 +137,7 @@ public class SysRoleController extends BaseController
      */
     @PreAuthorize(hasPermi = "system:role:remove")
     @Log(title = "角色管理", businessType = BusinessType.DELETE)
-    @DeleteMapping("/{ids}")
+    @GetMapping(value = "/delete/{ids}")
     public AjaxResult remove(@PathVariable Long[] ids)
     {
         return toAjax(roleService.deleteRoleByIds(ids));

boman-modules/boman-system/src/main/java/com/boman/system/controller/SysRoleDataController.java

@@ -108,7 +108,7 @@ public class SysRoleDataController extends BaseController
      */
     @PreAuthorize(hasPermi = "system:data:edit")
     @Log(title = "角色权限数据", businessType = BusinessType.UPDATE)
-    @PutMapping
+    @PostMapping("/put")
     public AjaxResult edit(@RequestBody SysRoleData sysRoleData)
     {
         return toAjax(sysRoleDataService.updateSysRoleData(sysRoleData));
@@ -119,7 +119,7 @@ public class SysRoleDataController extends BaseController
      */
     @PreAuthorize(hasPermi = "system:data:remove")
     @Log(title = "角色权限数据", businessType = BusinessType.DELETE)
-	@DeleteMapping("/{ids}")
+    @GetMapping(value = "/delete/{ids}")
     public AjaxResult remove(@PathVariable Long[] ids)
     {
         return toAjax(sysRoleDataService.deleteSysRoleDataByIds(ids));

boman-modules/boman-system/src/main/java/com/boman/system/controller/SysUserController.java

@@ -15,14 +15,7 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-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.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 import com.boman.domain.constant.UserConstants;
 import com.boman.domain.dto.R;
@@ -39,6 +32,8 @@ import com.boman.domain.SysRole;
 import com.boman.domain.SysUser;
 import com.boman.system.api.model.LoginUser;
 
+import static com.boman.common.core.utils.SecurityUtils.checkStrongPwd;
+
 /**
  * 用户信息
  * 
@@ -246,7 +241,7 @@ public class SysUserController extends BaseController
      */
     @PreAuthorize(hasPermi = "system:user:edit")
     @Log(title = "用户管理", businessType = BusinessType.UPDATE)
-    @PutMapping
+    @PostMapping("/put")
     public AjaxResult edit(@Validated @RequestBody SysUser user)
     {
         //userService.checkUserAllowed(user);
@@ -269,7 +264,7 @@ public class SysUserController extends BaseController
      */
     @PreAuthorize(hasPermi = "system:user:remove")
     @Log(title = "用户管理", businessType = BusinessType.DELETE)
-    @DeleteMapping("/{ids}")
+    @GetMapping(value = "/delete/{ids}")
     public AjaxResult remove(@PathVariable Long[] ids)
     {
         return toAjax(userService.deleteUserByIds(ids));
@@ -284,17 +279,47 @@ public class SysUserController extends BaseController
     public AjaxResult resetPwd(@RequestBody SysUser user)
     {
         //userService.checkUserAllowed(user);
+        if ("1".equals(checkStrongPwd(user.getPassword()))) {
+            return AjaxResult.error("密码必须包含数字、大小写字母、特殊符号且大于8位");
+        }
         user.setPassword(SecurityUtils.encryptPassword(user.getPassword()));
         user.setUpdateBy(SecurityUtils.getUsername());
         return toAjax(userService.resetPwd(user));
     }
+    @PostMapping("/resetPwdLogin")
+    public AjaxResult resetPwdLogin(@RequestParam("userName") String userName, @RequestParam("oldPassword") String oldPassword, @RequestParam("newPassword") String newPassword) {
+        //userService.checkUserAllowed(user);
+        if ("admin".equals(userName)){
+            return AjaxResult.success("不允许操作超级管理员");
+        }
+        SysUser user = userService.selectUserByUserName(userName);
+        if (user == null){
+            return AjaxResult.success("当前用户不存在");
+        }
+        String password = user.getPassword();
+        if (!SecurityUtils.matchesPassword(oldPassword, password))
+        {
+            return AjaxResult.success("修改密码失败，旧密码错误");
+        }
+        if (SecurityUtils.matchesPassword(newPassword, password))
+        {
+            return AjaxResult.success("新密码不能与旧密码相同");
+        }
+
+        if ("1".equals(checkStrongPwd(newPassword))) {
+            return AjaxResult.success("密码必须包含数字、大小写字母、特殊符号且大于8位");
+        }
+        user.setPassword(SecurityUtils.encryptPassword(newPassword));
+        user.setUpdateBy(userName);
+        return toAjax(userService.resetPwdLogin(user));
+    }
 
     /**
      * 状态修改
      */
     @PreAuthorize(hasPermi = "system:user:edit")
     @Log(title = "用户管理", businessType = BusinessType.UPDATE)
-    @PutMapping("/changeStatus")
+    @PostMapping("/changeStatus")
     public AjaxResult changeStatus(@RequestBody SysUser user)
     {
         userService.checkUserAllowed(user);

boman-modules/boman-system/src/main/java/com/boman/system/controller/SysUserOnlineController.java

@@ -102,7 +102,7 @@ public class SysUserOnlineController extends BaseController
      */
     @PreAuthorize(hasPermi = "monitor:online:forceLogout")
     @Log(title = "在线用户", businessType = BusinessType.FORCE)
-    @DeleteMapping("/{tokenId}")
+    @GetMapping(value = "/delete/{tokenId}")
     public AjaxResult forceLogout(@PathVariable String tokenId)
     {
         redisService.deleteObject(CacheConstants.LOGIN_TOKEN_KEY + tokenId);

boman-modules/boman-system/src/main/java/com/boman/system/controller/TableController.java

@@ -1,42 +0,0 @@
-//package com.boman.system.controller;
-//
-//import com.boman.system.api.RemoteDeptService;
-//import com.boman.system.api.RemoteMenuService;
-//import com.boman.system.api.RemoteUserService;
-//import io.seata.spring.annotation.GlobalTransactional;
-//import org.springframework.beans.factory.annotation.Autowired;
-//import org.springframework.web.bind.annotation.GetMapping;
-//import org.springframework.web.bind.annotation.RequestMapping;
-//import org.springframework.web.bind.annotation.RestController;
-//
-//
-///**
-// * @author shiqian
-// * @description
-// * @date 2021年03月22日 09:19
-// **/
-//@RestController
-//@RequestMapping
-//public class TableController {
-//
-////    @Autowired
-////    private TableServiceCmdService tableServiceCmdService;
-//
-//    @Autowired
-//    private RemoteDeptService remoteDeptService;
-//    @Autowired
-//    private RemoteUserService remoteUserService;
-//
-//
-//
-//    @GetMapping("sq")
-//    @GlobalTransactional(rollbackFor = Exception.class)
-//    public String getByTableName() {
-//        int update = remoteDeptService.update();
-//        int update1 = remoteUserService.update();
-//        int i = 1/0;
-//        return "";
-//    }
-//
-//
-//}

boman-modules/boman-system/src/main/java/com/boman/system/mapper/SysUserMapper.java

@@ -71,6 +71,8 @@ public interface SysUserMapper
      */
     public int resetUserPwd(@Param("userName") String userName, @Param("password") String password);
 
+    public int updateUserByUserName(SysUser user);
+
     /**
      * 通过用户ID删除用户
      * 

boman-modules/boman-system/src/main/java/com/boman/system/service/ISysUserService.java

@@ -142,6 +142,15 @@ public interface ISysUserService
      */
     public int resetUserPwd(String userName, String password);
 
+
+    /**
+     * 登录页重置用户密码
+     *
+     * @param user 用户信息
+     * @return 结果
+     */
+    public int resetPwdLogin(SysUser user);
+
     /**
      * 通过用户ID删除用户
      * 

boman-modules/boman-system/src/main/java/com/boman/system/service/impl/SysUserServiceImpl.java

@@ -3,10 +3,13 @@ package com.boman.system.service.impl;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
+import java.util.concurrent.TimeUnit;
 
 import com.alibaba.fastjson.JSONObject;
 import com.boman.common.core.utils.DateUtils;
 import com.boman.common.core.utils.obj.ObjectUtils;
+import com.boman.common.redis.service.RedisService;
+import com.boman.domain.constant.Constants;
 import com.boman.domain.dto.AjaxResult;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -59,6 +62,9 @@ public class SysUserServiceImpl implements ISysUserService
     @Autowired
     private ISysConfigService configService;
 
+    @Autowired
+    private RedisService redisService;
+
     /**
      * 根据条件分页查询用户列表
      * 
@@ -223,6 +229,8 @@ public class SysUserServiceImpl implements ISysUserService
         insertUserPost(user);
         // 新增用户与角色管理
         insertUserRole(user);
+        //更新用户60天内修改密码的key
+        redisService.setCacheObject(Constants.PASSWORD_USER + user.getUserName(),60, Constants.UPDATE_PASSWORD, TimeUnit.DAYS);
         return rows;
     }
 
@@ -294,6 +302,8 @@ public class SysUserServiceImpl implements ISysUserService
     @Override
     public int resetPwd(SysUser user)
     {
+        //更新用户60天内修改密码的key
+        redisService.setCacheObject(Constants.PASSWORD_USER + user.getUserName(),60, Constants.UPDATE_PASSWORD, TimeUnit.DAYS);
         return userMapper.updateUser(user);
     }
 
@@ -310,6 +320,19 @@ public class SysUserServiceImpl implements ISysUserService
         return userMapper.resetUserPwd(userName, password);
     }
 
+    /**
+     * 登录页重置用户密码
+     * @param user 用户信息
+     * @return
+     */
+    @Override
+    public int resetPwdLogin(SysUser user) {
+        //更新用户60天内修改密码的key
+        redisService.setCacheObject(Constants.PASSWORD_USER + user.getUserName(),60, Constants.UPDATE_PASSWORD, TimeUnit.DAYS);
+        return userMapper.updateUserByUserName(user);
+
+    }
+
     /**
      * 新增用户角色信息
      * 

boman-modules/boman-system/src/main/resources/mapper/system/SysUserMapper.xml

@@ -173,6 +173,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 	<update id="resetUserPwd" parameterType="com.boman.domain.SysUser">
  		update sys_user set password = #{password} where user_name = #{userName}
 	</update>
+
+	<update id="updateUserByUserName" parameterType="com.boman.domain.SysUser">
+		update sys_user
+		<set>
+			<if test="password != null and password != ''">password = #{password},</if>
+			update_time = sysdate()
+		</set>
+		where user_name = #{userName}
+	</update>
 	
 	<delete id="deleteUserById" parameterType="Long">
  		delete from sys_user where id = #{id}
@@ -212,7 +221,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
 	<select id="getByPhone" resultMap="SysUserResult">
 		<include refid="selectUserVo"/>
-		 where u.phonenumber = #{phone}  and u.del_flag = '0' and u.status = '0' limit 1;
+		 where u.phonenumber = #{phone}  and u.del_flag = '0' limit 1;
 	</select>
 	
 </mapper> 

boman-web-core/src/main/java/com/boman/web/core/controller/AttendanceSetController.java

@@ -62,7 +62,7 @@ public class AttendanceSetController extends BaseController
      * 修改考勤设置
      */
     @Log(title = "考勤设置", businessType = BusinessType.UPDATE)
-    @PutMapping
+    @PostMapping(value = "/put")
     public AjaxResult edit(@RequestBody AttendanceSet attendanceSet)
     {
         return toAjax(attendanceSetService.updateAttendanceSet(attendanceSet));
@@ -72,7 +72,7 @@ public class AttendanceSetController extends BaseController
      * 删除考勤设置
      */
     @Log(title = "考勤设置", businessType = BusinessType.DELETE)
-	@DeleteMapping("/{ids}")
+    @GetMapping("/delete/{ids}")
     public AjaxResult remove(@PathVariable Long[] ids)
     {
         return toAjax(attendanceSetService.deleteAttendanceSetByIds(ids));

boman-web-core/src/main/java/com/boman/web/core/controller/CzrkJzdzController.java

@@ -92,7 +92,7 @@ public class CzrkJzdzController extends BaseController {
      */
 //    @PreAuthorize("@ss.hasPermi('system:jzdz:edit')")
     @Log(title = "常住人口对应的居住地址", businessType = BusinessType.UPDATE)
-    @PutMapping
+    @PostMapping("/put")
     public AjaxResult edit(@RequestBody CzrkJzdz czrkJzdz) {
         return toAjax(czrkJzdzService.updateCzrkJzdz(czrkJzdz));
     }
@@ -102,7 +102,7 @@ public class CzrkJzdzController extends BaseController {
      */
 //    @PreAuthorize("@ss.hasPermi('system:jzdz:remove')")
     @Log(title = "常住人口对应的居住地址", businessType = BusinessType.DELETE)
-    @DeleteMapping("/{ids}")
+    @GetMapping(value = "/delete/{ids}")
     public AjaxResult remove(@PathVariable Long[] ids) {
         return toAjax(czrkJzdzService.deleteCzrkJzdzByIds(ids));
     }

boman-web-core/src/main/java/com/boman/web/core/controller/GridInfoController.java

@@ -67,7 +67,7 @@ public class GridInfoController extends BaseController
     /**
      * 修改网格信息
      */
-    @PutMapping
+    @PostMapping("/put")
     public AjaxResult edit(@RequestBody GridInfo gridInfo)
     {
         return toAjax(gridInfoService.updateGridInfo(gridInfo));
@@ -76,7 +76,7 @@ public class GridInfoController extends BaseController
     /**
      * 删除网格信息
      */
-	@DeleteMapping("/{ids}")
+    @GetMapping(value = "/delete/{ids}")
     public AjaxResult remove(@PathVariable Long[] ids)
     {
         return toAjax(gridInfoService.deleteGridInfoByIds(ids));

boman-web-core/src/main/java/com/boman/web/core/controller/VaccineInfoController.java

@@ -91,7 +91,7 @@ public class VaccineInfoController extends BaseController {
      */
 //    @PreAuthorize(hasPermi = "@ss.hasPermi('core:info:edit')")
     @Log(title = "疫苗信息", businessType = BusinessType.UPDATE)
-    @PutMapping
+    @PostMapping("/put")
     public AjaxResult edit(@RequestBody VaccineInfoOperation vaccineInfo) {
       /*  vaccineInfo.setUpdateBy(SecurityUtils.getUsername());
         return toAjax(vaccineInfoService.updateVaccineInfo(vaccineInfo));*/
@@ -108,7 +108,7 @@ public class VaccineInfoController extends BaseController {
      */
 //    @PreAuthorize(hasPermi = "@ss.hasPermi('core:info:remove')")
     @Log(title = "疫苗信息", businessType = BusinessType.DELETE)
-    @DeleteMapping("/{ids}")
+    @GetMapping(value = "/delete/{ids}")
     public AjaxResult remove(@PathVariable Long[] ids) {
         return toAjax(vaccineInfoService.deleteVaccineInfoByIds(ids));
     }

boman-web-core/src/main/java/com/boman/web/core/controller/VaccineInfoOperationController.java

@@ -89,7 +89,7 @@ public class VaccineInfoOperationController extends BaseController
      */
 //    @PreAuthorize(hasPermi = "@ss.hasPermi('core:operation:edit')")
     @Log(title = "疫苗信息操作", businessType = BusinessType.UPDATE)
-    @PutMapping
+    @PostMapping("/put")
     public AjaxResult edit(@RequestBody VaccineInfoOperation vaccineInfoOperation)
     {
         return toAjax(vaccineInfoOperationService.updateVaccineInfoOperation(vaccineInfoOperation));
@@ -100,7 +100,7 @@ public class VaccineInfoOperationController extends BaseController
      */
 //    @PreAuthorize(hasPermi = "@ss.hasPermi('core:operation:remove')")
     @Log(title = "疫苗信息操作", businessType = BusinessType.DELETE)
-	@DeleteMapping("/{ids}")
+    @GetMapping(value = "/delete/{ids}")
     public AjaxResult remove(@PathVariable Long[] ids)
     {
         return toAjax(vaccineInfoOperationService.deleteVaccineInfoOperationByIds(ids));