From 7d174fc58bcc9c136548c789fbdf350a3c6fe52b Mon Sep 17 00:00:00 2001
From: hdw <496960745@qq.com>
Date: 星期四, 15 十一月 2018 13:11:43 +0800
Subject: [PATCH] Merge branch 'dev_lxw' of https://whychdw@gitlab.com/whyclxw1/gx_tieta.git into dev_lxw
---
gx_tieta/src/com/fgkj/actions/ActionUtil.java | 16 +++++++++++++---
1 files changed, 13 insertions(+), 3 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)));
+ }
}
--
Gitblit v1.9.1