bf

yiming
1 parent 2501ac3d
Showing 3 changed files with 17 additions and 11 deletions
bsthLineProfiles/src/main/java/com/ruoyi/project/monitor/job/controller/JobController.java
bsthLineProfiles/src/main/java/com/ruoyi/project/monitor/job/controller/JobLogController.java
bsthLineProfiles/src/main/java/com/ruoyi/project/system/user/controller/LoginController.java
@@ -45,7 +45,6 @@ public class JobController extends BaseController
         return prefix + "/job";
     }
-    @RequiresPermissions("monitor:job:list")
     @PostMapping("/list")
     @ResponseBody
     public TableDataInfo list(Job job)
@@ -51,8 +51,7 @@ public class JobLogController extends BaseController
         }
         return prefix + "/jobLog";
     }
-
-    @RequiresPermissions("monitor:job:list")
+    
     @PostMapping("/list")
     @ResponseBody
     public TableDataInfo list(JobLog jobLog)
 package com.ruoyi.project.system.user.controller;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
+import com.ruoyi.common.utils.security.ShiroUtils;
+import com.ruoyi.project.system.user.service.IUserService;
+import com.ruoyi.project.system.user.service.UserServiceImpl;
 import org.apache.http.HttpResponse;
 import org.apache.http.client.HttpClient;
 import org.apache.http.client.methods.HttpPost;
@@ -70,6 +69,8 @@ public class LoginController extends BaseController
     @Autowired
     private RuoYiConfig ruoYiConfig;
+    @Autowired
+    private IUserService userService;
     @GetMapping("/login")
     public String login(HttpServletRequest request, HttpServletResponse response)
@@ -105,13 +106,19 @@ public class LoginController extends BaseController
                 JSONArray jsonMenu = dataJson.getJSONArray("userAuthList").getJSONObject(0).getJSONArray("roleList").getJSONObject(0).getJSONArray("resourceList");
+                String account=dataJson.get("account").toString();
+                //userService.registerUser(User user);
                 Map<Long,Menu> menuMap = new HashMap<Long,Menu>();
                 String ids = "";
-
+                Set<String> set=new HashSet();
                 for(Object json:jsonMenu) {
                     ids += ((JSONObject)json).getLongValue("menuId") + ",";
+                    String resourceCode=((JSONObject) json).getString("resourceCode");
+                    if (!"#".equals(resourceCode)){
+                        set.add(resourceCode);
+                    }
                 }
                 ids.substring(0,ids.length() -1);
@@ -120,12 +127,13 @@ public class LoginController extends BaseController
-                login("admin","admin123",false);
+                login("bus123","bus123",false);
                 user = getSysUser();
                 user.setToken(token);
 //    	        user.setPermissions(permissionService.getMenuPermission());
                 tokenService.createToken(user);
-
+                user.setPermissions(set);
+                ShiroUtils.setSysUser(user);
                 //String username = dataJson.getString("account");
 //    	        String username = "admin";