youxiw2000 / bsthLineProfiles · Commits

Commit e45187edebb38b0bfb113e998df17b2e4338f0c1

Authored by yiming
1 parent 2501ac3d
build: skipped

bf

Inline Side-by-side
Showing 3 changed files with 17 additions and 11 deletions
bsthLineProfiles/src/main/java/com/ruoyi/project/monitor/job/controller/JobController.java
  View file @e45187e
... ... @@ -45,7 +45,6 @@ public class JobController extends BaseController
45 45 return prefix + "/job";
46 46 }
47 47  
48   - @RequiresPermissions("monitor:job:list")
49 48 @PostMapping("/list")
50 49 @ResponseBody
51 50 public TableDataInfo list(Job job)
... ...
bsthLineProfiles/src/main/java/com/ruoyi/project/monitor/job/controller/JobLogController.java
  View file @e45187e
... ... @@ -51,8 +51,7 @@ public class JobLogController extends BaseController
51 51 }
52 52 return prefix + "/jobLog";
53 53 }
54   -
55   - @RequiresPermissions("monitor:job:list")
  54 +
56 55 @PostMapping("/list")
57 56 @ResponseBody
58 57 public TableDataInfo list(JobLog jobLog)
... ...
bsthLineProfiles/src/main/java/com/ruoyi/project/system/user/controller/LoginController.java
  View file @e45187e
1 1 package com.ruoyi.project.system.user.controller;
2 2  
3   -import java.util.ArrayList;
4   -import java.util.Date;
5   -import java.util.HashMap;
6   -import java.util.List;
7   -import java.util.Map;
  3 +import java.util.*;
8 4  
9 5 import javax.servlet.http.HttpServletRequest;
10 6 import javax.servlet.http.HttpServletResponse;
11 7  
  8 +import com.ruoyi.common.utils.security.ShiroUtils;
  9 +import com.ruoyi.project.system.user.service.IUserService;
  10 +import com.ruoyi.project.system.user.service.UserServiceImpl;
12 11 import org.apache.http.HttpResponse;
13 12 import org.apache.http.client.HttpClient;
14 13 import org.apache.http.client.methods.HttpPost;
... ... @@ -70,6 +69,8 @@ public class LoginController extends BaseController
70 69 @Autowired
71 70 private RuoYiConfig ruoYiConfig;
72 71  
  72 + @Autowired
  73 + private IUserService userService;
73 74  
74 75 @GetMapping("/login")
75 76 public String login(HttpServletRequest request, HttpServletResponse response)
... ... @@ -105,13 +106,19 @@ public class LoginController extends BaseController
105 106  
106 107 JSONArray jsonMenu = dataJson.getJSONArray("userAuthList").getJSONObject(0).getJSONArray("roleList").getJSONObject(0).getJSONArray("resourceList");
107 108  
  109 + String account=dataJson.get("account").toString();
  110 + //userService.registerUser(User user);
108 111  
109 112 Map<Long,Menu> menuMap = new HashMap<Long,Menu>();
110 113  
111 114 String ids = "";
112   -
  115 + Set<String> set=new HashSet();
113 116 for(Object json:jsonMenu) {
114 117 ids += ((JSONObject)json).getLongValue("menuId") + ",";
  118 + String resourceCode=((JSONObject) json).getString("resourceCode");
  119 + if (!"#".equals(resourceCode)){
  120 + set.add(resourceCode);
  121 + }
115 122 }
116 123  
117 124 ids.substring(0,ids.length() -1);
... ... @@ -120,12 +127,13 @@ public class LoginController extends BaseController
120 127  
121 128  
122 129  
123   - login("admin","admin123",false);
  130 + login("bus123","bus123",false);
124 131 user = getSysUser();
125 132 user.setToken(token);
126 133 // user.setPermissions(permissionService.getMenuPermission());
127 134 tokenService.createToken(user);
128   -
  135 + user.setPermissions(set);
  136 + ShiroUtils.setSysUser(user);
129 137  
130 138 //String username = dataJson.getString("account");
131 139 // String username = "admin";
... ...