diff --git a/lib/EmergencyService/zdxtEmergencyAppService/src/main/java/com/zdxt/app/controller/AppThirdLoginController.java b/lib/EmergencyService/zdxtEmergencyAppService/src/main/java/com/zdxt/app/controller/AppThirdLoginController.java index 659e6451..952d4c1c 100644 --- a/lib/EmergencyService/zdxtEmergencyAppService/src/main/java/com/zdxt/app/controller/AppThirdLoginController.java +++ b/lib/EmergencyService/zdxtEmergencyAppService/src/main/java/com/zdxt/app/controller/AppThirdLoginController.java @@ -175,6 +175,9 @@ public class AppThirdLoginController { @ResponseBody public ZDResponse szyptGetToken(@RequestParam("code") String code, @RequestParam("url") String url){ try { + System.out.println("====================== 获取政务微信认证签名URL ======================"); + log.info("获取政务微信认证签名URL:{}",url); + System.out.println(url); // 获取 access_token String accessTokenJson = HttpUtil.HttpSendGet(szyptUrl + "/cgi-bin/gettoken?corpid="+szyptCorpid+"&corpsecret="+szyptCorpsecret, null); JSONObject tokenObj = JSONObject.parseObject(accessTokenJson); diff --git a/lib/EmergencyService/zdxtEmergencyAuthService/src/main/java/com/zdxt/auth/framework/config/CorsFilter.java b/lib/EmergencyService/zdxtEmergencyAuthService/src/main/java/com/zdxt/auth/framework/config/CorsFilter.java index 9fd8bdf8..7ae6da80 100644 --- a/lib/EmergencyService/zdxtEmergencyAuthService/src/main/java/com/zdxt/auth/framework/config/CorsFilter.java +++ b/lib/EmergencyService/zdxtEmergencyAuthService/src/main/java/com/zdxt/auth/framework/config/CorsFilter.java @@ -23,45 +23,16 @@ import java.util.Map; * @author: QingWang.Li * @date: 2020/5/27 11:35 */ -@Component() +@Component public class CorsFilter implements Filter { private static final Logger log = LoggerFactory.getLogger(CorsFilter.class); -// public void doFilter(ServletRequest request, ServletResponse response, FilterChain chain) -// throws IOException, ServletException { -// HttpServletResponse res = (HttpServletResponse) response; -// res.addHeader("Access-Control-Allow-Credentials", "true"); -// res.addHeader("Access-Control-Allow-Origin", "*"); -// res.addHeader("Access-Control-Allow-Methods", "GET, POST, DELETE, PUT"); -// res.addHeader("Access-Control-Allow-Headers", "Content-Type,X-CAF-Authorization-Token,sessionToken,X-TOKEN,token"); -// res.addHeader("X-Frame-Options", "SAMEORIGIN"); -//// res.addHeader("Access-Control-Allow-Headers", "Content-Type,X-CAF-Authorization-Token,sessionToken,X-TOKEN"); -//// User user = ShiroUtils.getSysUser(); -//// Map payload = new HashMap<>(); -//// payload.put("id", user.getUserId()); -//// payload.put("name", user.getPassword()); -//// String token1 = JWTUtils.sign(payload); -//// res.addHeader("token", token1); -// -//// if (((HttpServletRequest) request).getMethod().equals("OPTIONS")) { -//// response.getWriter().println("ok"); -//// return; -//// } -//// TODO 暂时允许options 判断请求方法是否为OPTIONS -// if (((HttpServletRequest) request).getMethod().equals("OPTIONS")) { -// // 设置响应头信息,禁止OPTIONS请求 -// res.setHeader("Allow", "GET, POST, HEAD, PUT, DELETE"); -// res.setStatus(HttpServletResponse.SC_METHOD_NOT_ALLOWED); -// return; -// } -// chain.doFilter(request, response); -// } public void doFilter(ServletRequest request, ServletResponse response, FilterChain chain) throws IOException, ServletException { //配置可信域名 - String[] authhosts = {"http://10.132.108.3:85","http://jdm.szssfj.cn","http://localhost:85","http://192.168.31.196:3301","http://192.168.31.196:85","http://127.0.0.1:85", - "http://localhost:3301","http://192.168.110.35:3301","http://localhost:86","http://192.168.110.41:3301","http://192.168.31.71:3301"}; + String[] authhosts = {"http://10.132.108.3:85","http://jdm.szssfj.cn","http://localhost:85","http://192.168.31.196:3301", + "http://localhost:3301"}; String authost = ""; HttpServletRequest httprequest = (HttpServletRequest) request; String origin = httprequest.getHeader("Origin"); diff --git a/lib/EmergencyService/zdxtEmergencyAuthService/src/main/java/com/zdxt/auth/framework/config/CsrfFilter.java b/lib/EmergencyService/zdxtEmergencyAuthService/src/main/java/com/zdxt/auth/framework/config/CsrfFilter.java index 0a4ff6cf..14125f90 100644 --- a/lib/EmergencyService/zdxtEmergencyAuthService/src/main/java/com/zdxt/auth/framework/config/CsrfFilter.java +++ b/lib/EmergencyService/zdxtEmergencyAuthService/src/main/java/com/zdxt/auth/framework/config/CsrfFilter.java @@ -98,7 +98,7 @@ public class CsrfFilter implements Filter { HttpServletResponse resp = (HttpServletResponse) servletResponse; resp.setStatus(HttpStatus.BAD_REQUEST.value()); resp.setContentType("text/html; charset=utf-8"); - resp.getWriter().write("系统不支持当前域名的访问!"); + resp.getWriter().write(JSONObject.toJSONString(ZDResponse.error("系统不支持当前域名【"+serverName+"】的访问!"))); return; } else { filterChain.doFilter(servletRequest, servletResponse); @@ -116,7 +116,7 @@ public class CsrfFilter implements Filter { /** * 判断是否为忽略的URL * - * @param URL路径 + * @param * @return true-忽略,false-过滤 */ private boolean isExcludeUrl(String url) { @@ -132,7 +132,7 @@ public class CsrfFilter implements Filter { */ private boolean checkBlankList(String serverName) { String[] allowdServerName = ALLOWED_SERVERNAMES.split(","); - List serverNameList = Arrays.asList(allowdServerName); + String[] serverNameList = allowdServerName; for(String str : serverNameList){ if(!isEmpty(str) && str.equals(serverName)){ return true;