Commit 1776337834d737b5f0af084eee457aef42c54216
1 parent
ceb1e84e
m
Showing
1 changed file
with
7 additions
and
7 deletions
trash-framework/src/main/java/com/trash/framework/web/service/SysLoginService.java
| @@ -122,7 +122,7 @@ public class SysLoginService { | @@ -122,7 +122,7 @@ public class SysLoginService { | ||
| 122 | if (!token.contains("Bearer ")) { | 122 | if (!token.contains("Bearer ")) { |
| 123 | token = "Bearer " + token; | 123 | token = "Bearer " + token; |
| 124 | } | 124 | } |
| 125 | - | 125 | + |
| 126 | Request request = new Request.Builder().url(RemoteServerUtils.remote + LOGIN_URL) | 126 | Request request = new Request.Builder().url(RemoteServerUtils.remote + LOGIN_URL) |
| 127 | .addHeader("Authorization", token).get().build(); | 127 | .addHeader("Authorization", token).get().build(); |
| 128 | 128 | ||
| @@ -132,7 +132,7 @@ public class SysLoginService { | @@ -132,7 +132,7 @@ public class SysLoginService { | ||
| 132 | 132 | ||
| 133 | if (result != null) { | 133 | if (result != null) { |
| 134 | JSONObject json = JSON.parseObject(result); | 134 | JSONObject json = JSON.parseObject(result); |
| 135 | - if ("success".equals(json.getString("message"))) { | 135 | + if (json.getBoolean("success")) { |
| 136 | userJson = json.getJSONObject("result"); | 136 | userJson = json.getJSONObject("result"); |
| 137 | } | 137 | } |
| 138 | } else { | 138 | } else { |
| @@ -301,11 +301,11 @@ public class SysLoginService { | @@ -301,11 +301,11 @@ public class SysLoginService { | ||
| 301 | 301 | ||
| 302 | set.add("*:*:*");// 测试直接给admin | 302 | set.add("*:*:*");// 测试直接给admin |
| 303 | 303 | ||
| 304 | - for (Object object : userJson.getJSONArray("menus")) { | ||
| 305 | - JSONObject menu = (JSONObject) object; | ||
| 306 | - | ||
| 307 | - set.add(menu.getString("code")); | ||
| 308 | - } | 304 | +// for (Object object : userJson.getJSONArray("menus")) { |
| 305 | +// JSONObject menu = (JSONObject) object; | ||
| 306 | +// | ||
| 307 | +// set.add(menu.getString("code")); | ||
| 308 | +// } | ||
| 309 | 309 | ||
| 310 | SysRole role = new SysRole(); | 310 | SysRole role = new SysRole(); |
| 311 | 311 |