From f6bfafc3a6cd50f11fbf498ecf21498bd9112ff4 Mon Sep 17 00:00:00 2001
From: D:/workspace/chenjingjing/git/gx_tieta/gx_tieta/.gitignore <chenjingjing@LAPTOP-E51P2139>
Date: 星期二, 08 一月 2019 17:37:51 +0800
Subject: [PATCH] Merge branch 'dev_lxw' of https://whyccjj@gitlab.com/whyclxw1/gx_tieta.git into dev_lxw
---
gx_tieta/WebRoot/zzlogin1.jsp | 7 ++++++-
1 files changed, 6 insertions(+), 1 deletions(-)
diff --git a/gx_tieta/WebRoot/zzlogin1.jsp b/gx_tieta/WebRoot/zzlogin1.jsp
index 8f0c2ad..3572c01 100644
--- a/gx_tieta/WebRoot/zzlogin1.jsp
+++ b/gx_tieta/WebRoot/zzlogin1.jsp
@@ -5,6 +5,11 @@
%>
<%@ taglib uri="/struts-tags" prefix="s" %>
<%@taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"%>
+<%
+ ServletContext context = getServletContext();
+ String serverInfo = context.getServerInfo();
+ System.out.println(serverInfo);
+ %>
<!DOCTYPE HTML123>
<html>
<head>
@@ -100,7 +105,7 @@
console.info(JSON.stringify(temp));
SendDeviceThreadInfo(temp,function(data){
console.info(data);
-
+
searchDeviceThreadInfo({dev_id:910000001});
});
--
Gitblit v1.9.1