Merge remote-tracking branch 'origin/master'

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

@@ -58,7 +58,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("用户密码不在指定范围");
@@ -68,7 +68,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);
 
@@ -122,10 +122,6 @@ public class SysLoginService {
         if(redisService.getCacheObject(form.getUuid()) == null){
             throw new BaseException("登录超时,请重新登录");
         }
-        String cacheObject = redisService.getCacheObject(form.getUuid()).toString();
-        if (StringUtils.isBlank(cacheObject)) {
-            throw new BaseException("登录超时,请重新登录");
-        }
         String phone = form.getPhone();
         if (StringUtils.isBlank(phone)) {
             throw new BaseException("缺少参数,手机号码");

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));

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

@@ -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);

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 "";
-//    }
-//
-//
-//}