Merge remote-tracking branch 'origin/master'

power-admin/src/main/java/com/manage/controller/FontController.java

@@ -78,25 +78,25 @@ public class FontController {
 
     @RequestMapping(value = "updatePass")
     @ResponseBody
-    public String updatePass(String passFlag){
+    public String updatePass(String passFlag) {
-        if (passFlag.equals("")){
+        if (passFlag.equals("")) {
             return "";
         }
         List<Power_UserVo> powerUserVos = power_userMapper.getuserNameList();
-        StringBuffer sb=new StringBuffer();
+        StringBuffer sb = new StringBuffer();
-        for (Power_UserVo list:powerUserVos){
+        for (Power_UserVo list : powerUserVos) {
             String userPwd = list.getUserPwd();
             String decode = Base64.decode(userPwd);
             String jm = MD5.JM(decode);
             String userName = list.getUserName();
             boolean contains = jm.contains(userName);
-            if (contains){
+            if (contains) {
-                System.out.println("userName:"+userName);
+                System.out.println("userName:" + userName);
-                sb.append("'"+userName+"'"+",");
+                sb.append("'" + userName + "'" + ",");
             }
         }
         String s = sb.toString();
-        return s ;
+        return s;
     }
 
     /**
@@ -810,7 +810,15 @@ public class FontController {
             return "该账号未设置姓名";
         }
     }
-
+   /**
-
+  * @description: 查询菜单授权
-
+  * @author linjj
+  * @date: 2024/9/18 16:44
+  */
+    @RequestMapping(value = "/getUserMun", produces = "text/plain;charset=UTF-8")
+    @ResponseBody
+    public  String getUserMun(Integer userId) {
+        String flag = power_userMapper.getPdf(userId);
+        return flag;
+    }
 }

power-admin/src/main/resources/config/config.properties

@@ -13,7 +13,7 @@ TOKEN_EXPIRE_TIME = 1200000
 #SERVER_PORT = 9001
 
 
-SERVER_IP = 127.0.0.1
+SERVER_IP = localhost
 SERVER_PORT = 8082
 
 #power\u6743\u9650\u7CFB\u7EDFip

power-admin/src/main/resources/config/jdbc.properties

@@ -1,5 +1,5 @@
 jdbc.driver=com.mysql.jdbc.Driver
-jdbc.url=jdbc\:mysql\://localhost\:3306/zj_power?useUnicode\=true&characterEncoding\=utf-8
+jdbc.url=jdbc\:mysql\://localhost\:3306/power?useUnicode\=true&characterEncoding\=utf-8
 jdbc.username=root
 jdbc.password=root
 

power-dao/src/main/java/com/manage/dao/Power_UserMapper.java

@@ -99,4 +99,6 @@ public interface Power_UserMapper {
     List<Power_User> selectDeptIdByDeptCode(String deptCode);
 
     List<Power_User> selectAllRoomUser();
+
+   String getPdf(int userId);
 }

power-dao/src/main/resources/mapper/Power_UserMapper.xml

@@ -788,5 +788,8 @@
   <select id="getuserNameList" resultType="com.manage.vo.Power_UserVo">
     select * from power_user_1
   </select>
+    <select id="getPdf">
+      select user_menu_id from power_user_menu where user_id=#{userId} and menu_id=565
+    </select>
 
 </mapper>