From 8b67d0abb22ebbab192fa51be7f271eb215999d9 Mon Sep 17 00:00:00 2001
From: 81041 <81041@192.168.10.9>
Date: 星期一, 26 十一月 2018 15:34:06 +0800
Subject: [PATCH] Merge branch 'dev_lxw' of https://whyclxw1@gitlab.com/whyclxw1/gx_tieta.git into dev_lxw
---
gx_tieta/src/com/fgkj/actions/User_infAction.java | 13 +++++++++++++
1 files changed, 13 insertions(+), 0 deletions(-)
diff --git a/gx_tieta/src/com/fgkj/actions/User_infAction.java b/gx_tieta/src/com/fgkj/actions/User_infAction.java
index 1b732d0..cb1ab3b 100644
--- a/gx_tieta/src/com/fgkj/actions/User_infAction.java
+++ b/gx_tieta/src/com/fgkj/actions/User_infAction.java
@@ -1,5 +1,7 @@
package com.fgkj.actions;
+import java.text.SimpleDateFormat;
+import java.util.Date;
import java.util.List;
import com.fgkj.dao.UinfDaoFactory;
@@ -212,6 +214,17 @@
public String checkService(){
return SUCCESS;
}
+
+ //鑾峰彇鏈嶅姟鍣ㄧ殑鏃堕棿
+ public String searchServerTime(){
+ ServiceModel model = new ServiceModel();
+ model.setCode(1);
+ SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+ model.setMsg(sdf.format(new Date()));
+ result = ActionUtil.getGson("yyyy-MM-dd HH:mm:ss").toJson(model);
+ return SUCCESS;
+ }
+
public String test(){
System.out.println(upjson);
System.out.println(uif);
--
Gitblit v1.9.1