From c0acf598e44d3ac2fced4061764d1a01e40a2d62 Mon Sep 17 00:00:00 2001
From: LiJun <LiJun@192.168.10.20>
Date: 星期二, 27 十一月 2018 09:56:55 +0800
Subject: [PATCH] 跨域访问请求中的允许跨域访问代码注释，在过滤器中开启跨域允许接口
---
gx_tieta/src/com/fgkj/actions/Batt_rtdataAction.java | 2 +-
gx_tieta/src/com/fgkj/actions/Batttestdata_infAction.java | 2 +-
gx_tieta/src/com/fgkj/Filters/CrossDomainLimitFilter.java | 25 +++++++++++++++++--------
gx_tieta/src/com/fgkj/actions/BattInfAction.java | 2 +-
gx_tieta/src/com/fgkj/actions/Batt_rtstateAction.java | 2 +-
gx_tieta/src/com/fgkj/actions/BatttestdataAction.java | 2 +-
gx_tieta/src/com/fgkj/actions/ram/Fbs9100_stateAction.java | 2 +-
7 files changed, 23 insertions(+), 14 deletions(-)
diff --git a/gx_tieta/src/com/fgkj/Filters/CrossDomainLimitFilter.java b/gx_tieta/src/com/fgkj/Filters/CrossDomainLimitFilter.java
index 0338b17..3aa02b1 100644
--- a/gx_tieta/src/com/fgkj/Filters/CrossDomainLimitFilter.java
+++ b/gx_tieta/src/com/fgkj/Filters/CrossDomainLimitFilter.java
@@ -14,6 +14,8 @@
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
+import org.omg.CORBA.Request;
+
import com.fgkj.actions.ActionUtil;
import com.fgkj.dto.ServiceModel;
@@ -22,17 +24,24 @@
public final static String CROSS_DOMAIN_KEY = "44c4a294cb66d13727c14b065dbe8548"; //璺ㄥ煙璇锋眰 key
- public void doFilter(ServletRequest req, ServletResponse response,
+ public void doFilter(ServletRequest req, ServletResponse resp,
FilterChain chain) throws IOException, ServletException {
HttpServletRequest request=(HttpServletRequest)req;
+ HttpServletResponse response =(HttpServletResponse)resp;
String URL=request.getRequestURI();
+ request.setCharacterEncoding("UTF-8");
+ response.setCharacterEncoding("UTF-8");
+ response.setContentType("text/html;charset=utf-8");
//妫�娴嬭法鍩熻闂殑璇锋眰
- if(URL != null && URL.endsWith("_ky") && false){
+ if(URL != null && URL.endsWith("_ky")){
String key = req.getParameter("key"); //鑾峰彇鏍￠獙鐮�
- ServiceModel model = new ServiceModel(); //鏄惁鍏佽璁块棶
- boolean isAlowVisit = false;
- System.out.println(key+"=="+CROSS_DOMAIN_KEY);
+ ServiceModel model = new ServiceModel();
+ boolean isAlowVisit = false; //鏄惁鍏佽璁块棶
+ //System.out.println(key+"=="+CROSS_DOMAIN_KEY);
if(key != null && CROSS_DOMAIN_KEY.equals(key)){
+ response.setHeader("Access-Control-Allow-Origin", "*"); //鍏佽璺ㄥ煙璁块棶
+ response.setHeader("Access-Control-Allow-Headers", "X-Requested-With,content-type,token");
+ response.setHeader("Access-Control-Allow-Methods", "GET, HEAD, POST, PUT, DELETE, TRACE, OPTIONS, PATCH");
//System.out.println("寮�濮嬩紤鐪�500姣绉�");
try {
Thread.sleep(500);
@@ -46,11 +55,11 @@
isAlowVisit = true;
}else{
- model.setMsg("鏍￠獙鐮佸彂閫佸け璐�");
+ model.setMsg("鏍￠獙鐮佸彂閫佸け璐�,key:"+key);
}
if(isAlowVisit){
//閫氳繃璇锋眰
- chain.doFilter(request, response); //涓嶅厑璁歌法鍩�
+ chain.doFilter(request, response); //鍏佽璺ㄥ煙
}else{
//涓嶈兘鏀捐鐨勮姹�
PrintWriter out = response.getWriter();
@@ -60,7 +69,7 @@
}
}else{
//闈炶法鍩熻姹�
- chain.doFilter(request, response);
+ //chain.doFilter(request, response);
//SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
//System.out.println("闈炶法鍩熻姹備笉鍏佽鏀捐"+request.getRemoteHost()+" At "+sdf.format(new Date()));
}
diff --git a/gx_tieta/src/com/fgkj/actions/BattInfAction.java b/gx_tieta/src/com/fgkj/actions/BattInfAction.java
index c7a3da5..8520b5f 100644
--- a/gx_tieta/src/com/fgkj/actions/BattInfAction.java
+++ b/gx_tieta/src/com/fgkj/actions/BattInfAction.java
@@ -386,7 +386,7 @@
//璺ㄥ煙璁块棶鑾峰彇鎵�鏈夌數姹犵粍鐨勪俊鎭�<-------璺ㄥ煙----------->
public String searchInform_ky(){
- isAllowHeaders(); //鍏佽璺ㄥ煙璁块棶
+ //isAllowHeaders(); //鍏佽璺ㄥ煙璁块棶
ServiceModel model = new ServiceModel();
model = service.searchInform_ky();
result = ActionUtil.tojson(model);
diff --git a/gx_tieta/src/com/fgkj/actions/Batt_rtdataAction.java b/gx_tieta/src/com/fgkj/actions/Batt_rtdataAction.java
index bb15585..ecff064 100644
--- a/gx_tieta/src/com/fgkj/actions/Batt_rtdataAction.java
+++ b/gx_tieta/src/com/fgkj/actions/Batt_rtdataAction.java
@@ -29,7 +29,7 @@
//璺ㄥ煙璁块棶鏌ヨ鐢垫睜缁勭殑鍗曚綋鏁版嵁 < ! ---- ---- 璺ㄥ煙璁块棶 ------------>
public String serchByCondition_ky(){
- ActionUtil.isAllowHeaders();
+ //ActionUtil.isAllowHeaders();
ServiceModel model = new ServiceModel();
Batt_rtdata rtdata=getGson("yyyy-MM-dd HH:mm:ss").fromJson(json, Batt_rtdata.class);
model=service.serchByCondition_ky(rtdata);
diff --git a/gx_tieta/src/com/fgkj/actions/Batt_rtstateAction.java b/gx_tieta/src/com/fgkj/actions/Batt_rtstateAction.java
index 09d13cc..74ee71d 100644
--- a/gx_tieta/src/com/fgkj/actions/Batt_rtstateAction.java
+++ b/gx_tieta/src/com/fgkj/actions/Batt_rtstateAction.java
@@ -90,7 +90,7 @@
//瀹炴椂鐩戞祴涓殑鏌ヨ瀹炴椂缁勭淇℃伅 <!-- 璺ㄥ煙璁块棶 --->
public String serchByCondition_ky(){
- ActionUtil.isAllowHeaders(); //鍏佽璺ㄥ煙璁块棶
+ //ActionUtil.isAllowHeaders(); //鍏佽璺ㄥ煙璁块棶
model = new ServiceModel();
//System.out.println("寮�濮嬫煡璇tstate");
rtstate = ActionUtil.getGson().fromJson(json, Batt_rtstate.class);
diff --git a/gx_tieta/src/com/fgkj/actions/BatttestdataAction.java b/gx_tieta/src/com/fgkj/actions/BatttestdataAction.java
index 8064b68..ac4e031 100644
--- a/gx_tieta/src/com/fgkj/actions/BatttestdataAction.java
+++ b/gx_tieta/src/com/fgkj/actions/BatttestdataAction.java
@@ -39,7 +39,7 @@
* @return
*/
public String findhistory_ky(){
- isAllowHeaders();
+ //isAllowHeaders();
ServiceModel model = new ServiceModel();
btd = ActionUtil.getGson().fromJson(json, Batttestdata.class);
model = service.serchByCondition_ky(btd);
diff --git a/gx_tieta/src/com/fgkj/actions/Batttestdata_infAction.java b/gx_tieta/src/com/fgkj/actions/Batttestdata_infAction.java
index 89c21c4..00a9aca 100644
--- a/gx_tieta/src/com/fgkj/actions/Batttestdata_infAction.java
+++ b/gx_tieta/src/com/fgkj/actions/Batttestdata_infAction.java
@@ -93,7 +93,7 @@
* 鏍规嵁鐢垫睜缁刬d鏌ヨ鐢垫睜缁勭殑inf琛ㄤ腑鐨勬斁鐢典俊鎭� <!------ 璺ㄥ煙璁块棶 --------->
*/
public String searchBattTestInfDataById_ky(){
- isAllowHeaders();
+ //isAllowHeaders();
Batttestdata_inf bti = ActionUtil.getGson().fromJson(json, Batttestdata_inf.class);
model=service.serchByCondition_ky(bti);
result=ActionUtil.tojson(model);
diff --git a/gx_tieta/src/com/fgkj/actions/ram/Fbs9100_stateAction.java b/gx_tieta/src/com/fgkj/actions/ram/Fbs9100_stateAction.java
index f06e421..081c8ba 100644
--- a/gx_tieta/src/com/fgkj/actions/ram/Fbs9100_stateAction.java
+++ b/gx_tieta/src/com/fgkj/actions/ram/Fbs9100_stateAction.java
@@ -112,7 +112,7 @@
//11.1FBS9100璁惧閫氫俊鐘舵�佹煡璇� <-- 璺ㄥ煙 -->
public String serchByCondition_ky(){
- isAllowHeaders(); //鍏佽璺ㄥ煙璁块棶
+ //isAllowHeaders(); //鍏佽璺ㄥ煙璁块棶
ServiceModel model = new ServiceModel();
model = service.serchByCondition_ky();
result = tojson(model);
--
Gitblit v1.9.1