From 6f507a88aaa6ba13c6cd20be81e4486b843f8a9d Mon Sep 17 00:00:00 2001
From: LiJun <LiJun@192.168.10.20>
Date: 星期四, 15 十一月 2018 11:40:32 +0800
Subject: [PATCH] 在跨域请求中添加key识别判断，判断不通过则返回校验失败 <--------------------跨域访问------------------------------->
---
gx_tieta/src/com/fgkj/actions/Batt_rtdataAction.java | 10 ++++-
gx_tieta/src/com/fgkj/actions/Batttestdata_infAction.java | 14 +++++--
gx_tieta/src/com/fgkj/actions/BattInfAction.java | 15 ++++---
gx_tieta/src/com/fgkj/actions/Batt_rtstateAction.java | 14 +++++--
gx_tieta/src/com/fgkj/actions/BatttestdataAction.java | 16 +++++--
gx_tieta/src/com/fgkj/actions/ActionUtil.java | 16 ++++++-
gx_tieta/src/com/fgkj/actions/ram/Fbs9100_stateAction.java | 15 ++++---
7 files changed, 70 insertions(+), 30 deletions(-)
diff --git a/gx_tieta/src/com/fgkj/actions/ActionUtil.java b/gx_tieta/src/com/fgkj/actions/ActionUtil.java
index a68083d..d3193d6 100644
--- a/gx_tieta/src/com/fgkj/actions/ActionUtil.java
+++ b/gx_tieta/src/com/fgkj/actions/ActionUtil.java
@@ -33,7 +33,9 @@
public class ActionUtil extends ActionSupport{
public static String time_yyyyMMddHHmmss = "yyyy-MM-dd HH:mm:ss";
+ public final static String CROSS_DOMAIN_KEY = "44c4a294cb66d13727c14b065dbe8548"; //璺ㄥ煙璇锋眰 key
+ public String key; //璺ㄥ煙璇嗗埆鐮�
/*
* 鑾峰彇HttpServletRequest
@@ -246,9 +248,6 @@
return new SimpleDateFormat( "yyyy-MM-dd HH:mm:ss").format(c.getTime());
}
- public static void main(String[] args) {
- System.out.println(ActionUtil.EncryptionMD5("vip"));
- }
//鑾峰彇鏃堕棿鐨勫勾浠�
public static int getDateYear(Date date){
@@ -485,4 +484,15 @@
res.setHeader("Access-Control-Allow-Headers", "X-Requested-With,content-type,token");
res.setHeader("Access-Control-Allow-Methods", "GET, HEAD, POST, PUT, DELETE, TRACE, OPTIONS, PATCH");
}
+
+
+
+ public void setKey(String key) {
+ this.key = key;
+ }
+
+ public static void main(String[] args) {
+ String str = "绂忓厜鐢靛瓙";
+ System.out.println(EncryptionMD5(EncryptionMD5(str)));
+ }
}
diff --git a/gx_tieta/src/com/fgkj/actions/BattInfAction.java b/gx_tieta/src/com/fgkj/actions/BattInfAction.java
index 5cf8ab1..ee929e1 100644
--- a/gx_tieta/src/com/fgkj/actions/BattInfAction.java
+++ b/gx_tieta/src/com/fgkj/actions/BattInfAction.java
@@ -379,12 +379,15 @@
//璺ㄥ煙璁块棶鑾峰彇鎵�鏈夌數姹犵粍鐨勪俊鎭�<-------璺ㄥ煙----------->
public String searchInform_ky(){
- HttpServletResponse res = ActionUtil.getResponse();
- res.setHeader("Access-Control-Allow-Origin", "*"); //鍏佽璺ㄥ煙璁块棶
- res.setHeader("Access-Control-Allow-Headers", "X-Requested-With,content-type,token");
- res.setHeader("Access-Control-Allow-Methods", "GET, HEAD, POST, PUT, DELETE, TRACE, OPTIONS, PATCH");
- ServiceModel model;
- model = service.searchInform_ky();
+ isAllowHeaders(); //鍏佽璺ㄥ煙璁块棶
+ //System.out.println(key+"@@@@@@@@@@@@@@@@@@@@@@");
+ ServiceModel model = new ServiceModel();
+ if(key != null && CROSS_DOMAIN_KEY.equals(key)){
+ model = service.searchInform_ky();
+ }else{
+ model.setCode(0);
+ model.setMsg("璇嗗埆鐮侀敊璇�");
+ }
result = ActionUtil.tojson(model);
return SUCCESS;
}
diff --git a/gx_tieta/src/com/fgkj/actions/Batt_rtdataAction.java b/gx_tieta/src/com/fgkj/actions/Batt_rtdataAction.java
index 4552b44..304eac1 100644
--- a/gx_tieta/src/com/fgkj/actions/Batt_rtdataAction.java
+++ b/gx_tieta/src/com/fgkj/actions/Batt_rtdataAction.java
@@ -30,8 +30,14 @@
//璺ㄥ煙璁块棶鏌ヨ鐢垫睜缁勭殑鍗曚綋鏁版嵁 < ! ---- ---- 璺ㄥ煙璁块棶 ------------>
public String serchByCondition_ky(){
ActionUtil.isAllowHeaders();
- Batt_rtdata rtdata=getGson("yyyy-MM-dd HH:mm:ss").fromJson(json, Batt_rtdata.class);
- ServiceModel model=service.serchByCondition_ky(rtdata);
+ ServiceModel model = new ServiceModel();
+ if(key != null && CROSS_DOMAIN_KEY.equals(key)){
+ Batt_rtdata rtdata=getGson("yyyy-MM-dd HH:mm:ss").fromJson(json, Batt_rtdata.class);
+ model=service.serchByCondition_ky(rtdata);
+ }else{
+ model.setCode(0);
+ model.setMsg("璇嗗埆鐮侀敊璇�");
+ }
result=ActionUtil.tojson(model);
return SUCCESS;
}
diff --git a/gx_tieta/src/com/fgkj/actions/Batt_rtstateAction.java b/gx_tieta/src/com/fgkj/actions/Batt_rtstateAction.java
index 23bb17f..d8ce249 100644
--- a/gx_tieta/src/com/fgkj/actions/Batt_rtstateAction.java
+++ b/gx_tieta/src/com/fgkj/actions/Batt_rtstateAction.java
@@ -14,7 +14,7 @@
import com.fgkj.services.Batt_rtstateService;
import com.opensymphony.xwork2.ActionSupport;
-public class Batt_rtstateAction extends ActionSupport{
+public class Batt_rtstateAction extends ActionUtil{
private Batt_rtstateService service=new Batt_rtstateService();
private ServiceModel model;
private Batt_rtstate rtstate;
@@ -91,9 +91,15 @@
//瀹炴椂鐩戞祴涓殑鏌ヨ瀹炴椂缁勭淇℃伅 <!-- 璺ㄥ煙璁块棶 --->
public String serchByCondition_ky(){
ActionUtil.isAllowHeaders(); //鍏佽璺ㄥ煙璁块棶
- //System.out.println("寮�濮嬫煡璇tstate");
- rtstate = ActionUtil.getGson().fromJson(json, Batt_rtstate.class);
- model=service.serchByCondition_ky(rtstate);
+ model = new ServiceModel();
+ if(key != null && CROSS_DOMAIN_KEY.equals(key)){
+ //System.out.println("寮�濮嬫煡璇tstate");
+ rtstate = ActionUtil.getGson().fromJson(json, Batt_rtstate.class);
+ model=service.serchByCondition_ky(rtstate);
+ }else{
+ model.setCode(0);
+ model.setMsg("璇嗗埆鐮侀敊璇�");
+ }
//System.out.println(model);
result = ActionUtil.getGson("yyyy-MM-dd HH:mm:ss").toJson(model);
return SUCCESS;
diff --git a/gx_tieta/src/com/fgkj/actions/BatttestdataAction.java b/gx_tieta/src/com/fgkj/actions/BatttestdataAction.java
index f0ae854..e50ffd1 100644
--- a/gx_tieta/src/com/fgkj/actions/BatttestdataAction.java
+++ b/gx_tieta/src/com/fgkj/actions/BatttestdataAction.java
@@ -6,7 +6,7 @@
import com.fgkj.services.Batttestdata_infService;
import com.opensymphony.xwork2.ActionSupport;
-public class BatttestdataAction extends ActionSupport {
+public class BatttestdataAction extends ActionUtil{
private BatttestdataService service = new BatttestdataService();
private String result;
private Batttestdata btd;
@@ -39,10 +39,16 @@
* @return
*/
public String findhistory_ky(){
- ActionUtil.isAllowHeaders();
- Batttestdata btd = ActionUtil.getGson().fromJson(json, Batttestdata.class);
- //System.out.println(btd);
- ServiceModel model = service.serchByCondition_ky(btd);
+ isAllowHeaders();
+ ServiceModel model = new ServiceModel();
+ if(key !=null && CROSS_DOMAIN_KEY.equals(key)){
+ Batttestdata btd = ActionUtil.getGson().fromJson(json, Batttestdata.class);
+ //System.out.println(btd);
+ model = service.serchByCondition_ky(btd);
+ }else{
+ model.setCode(0);
+ model.setMsg("璇嗗埆鐮侀敊璇�");
+ }
result = ActionUtil.tojson(model);
//System.out.println("*************************");
return SUCCESS;
diff --git a/gx_tieta/src/com/fgkj/actions/Batttestdata_infAction.java b/gx_tieta/src/com/fgkj/actions/Batttestdata_infAction.java
index 1f594b2..a78f163 100644
--- a/gx_tieta/src/com/fgkj/actions/Batttestdata_infAction.java
+++ b/gx_tieta/src/com/fgkj/actions/Batttestdata_infAction.java
@@ -15,7 +15,7 @@
import com.fgkj.services.Batttestdata_infService;
import com.opensymphony.xwork2.ActionSupport;
-public class Batttestdata_infAction extends ActionSupport{
+public class Batttestdata_infAction extends ActionUtil{
private Batttestdata_inf bti;
private Batt_Maint_Dealarm bmd;
private ServiceModel model;
@@ -93,9 +93,15 @@
* 鏍规嵁鐢垫睜缁刬d鏌ヨ鐢垫睜缁勭殑inf琛ㄤ腑鐨勬斁鐢典俊鎭� <!------ 璺ㄥ煙璁块棶 --------->
*/
public String searchBattTestInfDataById_ky(){
- ActionUtil.isAllowHeaders();
- Batttestdata_inf bti = ActionUtil.getGson().fromJson(json, Batttestdata_inf.class);
- model=service.serchByCondition_ky(bti);
+ isAllowHeaders();
+ if(key != null && CROSS_DOMAIN_KEY.equals(key)){
+ Batttestdata_inf bti = ActionUtil.getGson().fromJson(json, Batttestdata_inf.class);
+ model=service.serchByCondition_ky(bti);
+ }else{
+ model = new ServiceModel();
+ model.setCode(0);
+ model.setMsg("璇嗗埆鐮侀敊璇�");
+ }
result=ActionUtil.tojson(model);
return SUCCESS;
}
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 6a2e01d..3762e11 100644
--- a/gx_tieta/src/com/fgkj/actions/ram/Fbs9100_stateAction.java
+++ b/gx_tieta/src/com/fgkj/actions/ram/Fbs9100_stateAction.java
@@ -111,12 +111,15 @@
}
//11.1FBS9100璁惧閫氫俊鐘舵�佹煡璇� <-- 璺ㄥ煙 -->
- public String serchByCondition_ky(){
- HttpServletResponse res = ActionUtil.getResponse();
- res.setHeader("Access-Control-Allow-Origin", "*"); //鍏佽璺ㄥ煙璁块棶
- res.setHeader("Access-Control-Allow-Headers", "X-Requested-With,content-type,token");
- res.setHeader("Access-Control-Allow-Methods", "GET, HEAD, POST, PUT, DELETE, TRACE, OPTIONS, PATCH");
- ServiceModel model = service.serchByCondition_ky();
+ public String serchByCondition_ky(){
+ isAllowHeaders(); //鍏佽璺ㄥ煙璁块棶
+ ServiceModel model = new ServiceModel();
+ if(key != null && CROSS_DOMAIN_KEY.equals(key)){
+ model = service.serchByCondition_ky();
+ }else{
+ model.setCode(0);
+ model.setMsg("璇嗗埆鐮侀敊璇�");
+ }
result = tojson(model);
return SUCCESS;
}
--
Gitblit v1.9.1