wulin/wl_management
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'version_performance_2.0' of http://gitlab.ldxinyong.com/enterpriseManagement/lz_management into version_performance_2.0

Browse Source
This commit is contained in:
杜建超 2020-11-05 15:25:13 +08:00
commit b2075bf6a5
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/main/java/com/lz/config/ShiroConfig.java
View File

@ -52,6 +52,7 @@ public class ShiroConfig {
Map<String, String> filterMap = new LinkedHashMap<>(); Map<String, String> filterMap = new LinkedHashMap<>();
filterMap.put("/webjars/**", "anon"); filterMap.put("/webjars/**", "anon");
filterMap.put("/file/**", "anon"); filterMap.put("/file/**", "anon");
filterMap.put("/user/lzstaffrole/role/**", "anon");
filterMap.put("/test/**", "anon"); filterMap.put("/test/**", "anon");
filterMap.put("/druid/**", "anon"); filterMap.put("/druid/**", "anon");
filterMap.put("/app/**", "anon"); filterMap.put("/app/**", "anon");
@ -69,7 +70,7 @@ public class ShiroConfig {
filterMap.put("/dtlg/jump", "anon"); filterMap.put("/dtlg/jump", "anon");
filterMap.put("/luck/getLuckById", "anon"); filterMap.put("/luck/getLuckById", "anon");
filterMap.put("/luck/updateLuck", "anon"); filterMap.put("/luck/updateLuck", "anon");
filterMap.put("/**", "oauth2"); filterMap.put("/**", "anon");
shiroFilter.setFilterChainDefinitionMap(filterMap); shiroFilter.setFilterChainDefinitionMap(filterMap);
return shiroFilter; return shiroFilter;

7
src/main/java/com/lz/modules/flow/service/impl/FlowStartServiceImpl.java
View File

@ -201,12 +201,15 @@ public class FlowStartServiceImpl extends ServiceImpl<FlowStartMapper, FlowStart
return s; return s;
} }
}).collect(Collectors.toList()); }).collect(Collectors.toList());
for (String str:ids for(int i = 0; i < ids.size();){//过滤掉已经发起的
) {//过滤掉已经发起的 String str = ids.get(i);
if(maps.containsKey(str)){ if(maps.containsKey(str)){
ids.remove(str); ids.remove(str);
continue;
} }
i++;
} }
if(ids.size() == 0){ if(ids.size() == 0){
return R.ok("发起成功，该任务已经发起过") return R.ok("发起成功，该任务已经发起过")
.put("data", flowStart1); .put("data", flowStart1);

4
src/main/java/com/lz/modules/sys/oauth2/OAuth2Filter.java
View File

@ -57,10 +57,6 @@ public class OAuth2Filter extends AuthenticatingFilter {
protected boolean onAccessDenied(ServletRequest request, ServletResponse response) throws Exception { protected boolean onAccessDenied(ServletRequest request, ServletResponse response) throws Exception {
//获取请求token，如果token不存在，直接返回401 //获取请求token，如果token不存在，直接返回401
String token = getRequestToken((HttpServletRequest) request); String token = getRequestToken((HttpServletRequest) request);
String profile = SpringContextUtils.getActiveProfile();
if(!"prod".equals(profile) ){
return true;
}
if(StringUtils.isBlank(token)){ if(StringUtils.isBlank(token)){
HttpServletResponse httpResponse = (HttpServletResponse) response; HttpServletResponse httpResponse = (HttpServletResponse) response;
httpResponse.setHeader("Access-Control-Allow-Credentials", "true"); httpResponse.setHeader("Access-Control-Allow-Credentials", "true");