fix

ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysLoginController.java

@@ -6,13 +6,11 @@ import java.util.Set;
 
 import com.ruoyi.common.core.domain.entity.SysDictData;
 import com.ruoyi.common.core.domain.model.LoginUser;
+import com.ruoyi.common.utils.PasswordValidator;
 import com.ruoyi.system.service.ISysDictDataService;
 import com.ruoyi.system.service.ISysUserService;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 import com.ruoyi.common.constant.Constants;
 import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.common.core.domain.entity.SysMenu;
@@ -25,12 +23,11 @@ import com.ruoyi.system.service.ISysMenuService;
 
 /**
  * 登录验证
- * 
+ *
  * @author ruoyi
  */
 @RestController
-public class SysLoginController
-{
+public class SysLoginController {
     @Autowired
     private SysLoginService loginService;
 
@@ -48,29 +45,28 @@ public class SysLoginController
 
     /**
      * 登录方法
-     * 
+     *
      * @param loginBody 登录信息
      * @return 结果
      */
     @PostMapping("/login")
-    public AjaxResult login(@RequestBody LoginBody loginBody)
-    {
+    public AjaxResult login(@RequestBody LoginBody loginBody) {
         AjaxResult ajax = AjaxResult.success();
         // 生成令牌
         String token = loginService.login(loginBody.getUsername(), loginBody.getPassword(), loginBody.getCode(),
                 loginBody.getUuid());
         ajax.put(Constants.TOKEN, token);
+        ajax.put("weakPwd", PasswordValidator.isValidPassword(loginBody.getPassword(), loginBody.getUsername()) ? false : true);
         return ajax;
     }
 
     /**
      * 获取用户信息
-     * 
+     *
      * @return 用户信息
      */
     @GetMapping("getInfo")
-    public AjaxResult getInfo()
-    {
+    public AjaxResult getInfo() {
         SysUser user = SecurityUtils.getLoginUser().getUser();
         // 角色集合
         Set<String> roles = permissionService.getRolePermission(user);
@@ -83,30 +79,35 @@ public class SysLoginController
         return ajax;
     }
 
+    @PostMapping("checkWeakPwd")
+    public AjaxResult checkWeakPwd(@RequestBody LoginBody loginBody) {
+        PasswordValidator.isValidPasswordApi(loginBody.getPassword());
+        return AjaxResult.success();
+    }
+
     /**
      * 获取路由信息
-     * 
+     *
      * @return 路由信息
      */
     @GetMapping("getRouters")
-    public AjaxResult getRouters()
-    {
+    public AjaxResult getRouters() {
         Long userId = SecurityUtils.getUserId();
         List<SysMenu> menus = menuService.selectMenuTreeByUserId(userId);
         // 设置菜单不可见
         SysUser user = userService.selectUserById(userId);
         String taskLx = user.getTaskLx();
-        if(!taskLx.isEmpty()){
+        if (!taskLx.isEmpty()) {
             String[] taskLxList = taskLx.split(",");
             SysDictData sysDictData = new SysDictData();
             sysDictData.setDictType("task_lx");
             List<SysDictData> sysDictDataList = dictDataService.selectDictDataList(sysDictData);
             for (String item : taskLxList) {
                 for (SysDictData dictData : sysDictDataList) {
-                    if (Objects.equals(item, dictData.getDictValue())){
+                    if (Objects.equals(item, dictData.getDictValue())) {
                         for (SysMenu menu : menus) {
-                            System.out.println(dictData.getDictLabel()+"===="+menu.getMenuName());
-                            if (menu.getMenuName().equals(dictData.getDictLabel())){
+                            System.out.println(dictData.getDictLabel() + "====" + menu.getMenuName());
+                            if (menu.getMenuName().equals(dictData.getDictLabel())) {
                                 menu.setVisible("1");
                             }
                         }

ruoyi-admin/src/main/resources/application-druid.yml

@@ -8,7 +8,7 @@ spring:
             master:
                 url: jdbc:mysql://ruoyi-mysql:3306/ry-vue?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&serverTimezone=GMT%2B8
                 username: root
-                password: 7ZH2jxM1
+                password: xcr3k493
             # 从库数据源
             slave:
                 # 从数据源开关/默认关闭
@@ -42,13 +42,13 @@ spring:
             webStatFilter: 
                 enabled: true
             statViewServlet:
-                enabled: true
+                enabled: false
                 # 设置白名单，不填则允许所有访问
                 allow:
                 url-pattern: /druid/*
                 # 控制台管理用户名和密码
                 login-username: ruoyi
-                login-password: 123456
+                login-password: xcr3k493
             filter:
                 stat:
                     enabled: true

ruoyi-admin/src/main/resources/application.yml

@@ -79,7 +79,7 @@ spring:
     # 数据库索引
     database: 0
     # 密码
-    password: 7ZH2jxM1
+    password: xcr3k493
     # 连接超时时间
     timeout: 10s
     lettuce: