Merge branch 'master' of http://10.1.235.20:3000/ipu/android-share

multiple-client/assets/mobile-config.xml

@@ -5,7 +5,7 @@
	<config name="request_host" value="http://10.0.2.2:8080"/>
	-->
	<!-- 必须。10.0.2.2为Android模拟器的保留ip地址。访问到本机电脑时使用 -->
	<config name="request_host" value="http://114.215.100.48:8080"/> 
	<config name="request_host" value="http://123.57.35.51:80/"/> 
	<!-- 必须。容器应用名或请求根路径 -->
	<config name="request_path" value="/mult"/>
	<!-- 必须。数据接口的servlet路径 -->

multiple-server/etc/server-data-result.txt

@@ -5,5 +5,5 @@ LoginBean.checkSmsPwdBy4A={"employeeCodes":[{"employeeCode":"C8003"},{"employeeC
LocusPassWord.saveUuid={}
LoginBean.doLogin={"USER_NAME":"CS114593_01","SESSION_ID":"271450231500240","CODE":"00"}
LoginBean.checkLogin={"USER_NAME":"CS114593_01","SESSION_ID":"531450231390975","UUID":"0000000000000003092070243"}
IndexBean.getAppDatas={"APPS":[{"appName":"政企客户信息","requestServlet":"/mobiledata","appPath":"eci","appId":"eci","appIcon":"e_ico-eci","appIndexPage":"EciMenu","belong":"SELF,CHANNAL","appWelcomePage":"welcome/Welcome-eci.htm","requestPath":"/eci","requestHost":"http://192.168.137.1:8080","appType":"I"},{"appName":"智能终端CRM","requestServlet":"/mobiledata","appPath":"smartCRM","appId":"smartCRM","appIcon":"e_ico-wade-ob","appIndexPage":"Index","belong":"SELF,CHANNAL","appWelcomePage":"welcome/Welcome-smartCRM.htm","requestPath":"/smartCRM","requestHost":"http://192.168.137.1:8080","appType":"I"},{"appName":"实名登记","requestServlet":"/mobiledata","appPath":"realname-server","appId":"realname","appIcon":"e_ico-realname","appIndexPage":"Index","belong":"SELF,CHANNAL","appWelcomePage":"welcome/Welcome-realname.htm","requestPath":"/realname-server","requestHost":"http://192.168.137.1:8080","appType":"I"},{"appName":"光宽带","requestServlet":"/mobiledata","appPath":"guangkuandai","appId":"guangkuandai","appIcon":"e_ico-guangkuandai","appIndexPage":"Index","belong":"SELF,CHANNAL","appWelcomePage":"welcome/Welcome-guangkuandai.htm","requestPath":"/guangkuandai","requestHost":"http://192.168.137.1:8080","appType":"I"},{"appName":"换卡易","requestServlet":"/mobiledata","appPath":"bukayi","appId":"bukayi","appIcon":"e_ico-bukayi","appIndexPage":"UserConfirm","belong":"SELF,CHANNAL","appWelcomePage":"welcome/Welcome-bukayi.htm","requestPath":"/bukayi","requestHost":"http://192.168.137.1:8080","appType":"I"},{"appName":"工作台","requestServlet":"/mobiledata","appPath":"ioo","appId":"ioo","appIcon":"e_ico-conect","appIndexPage":"Home","belong":"SELF,CHANNAL","appWelcomePage":"welcome/Welcome-bukayi.htm","requestPath":"/ioo","requestHost":"http://192.168.137.1:8080","appType":"I"}]}
IndexBean.getAppDatas={"APPS":[{"appName":"政企客户信息","requestServlet":"/mobiledata","appPath":"eci","appId":"eci","appIcon":"e_ico-eci","appIndexPage":"EciMenu","belong":"SELF,CHANNAL","appWelcomePage":"welcome/Welcome.htm","requestPath":"/eci-server","requestHost":"http://123.57.35.51:80/","appType":"I"},{"appName":"智能终端CRM","requestServlet":"/mobiledata","appPath":"smartCRM","appId":"smartCRM","appIcon":"e_ico-wade-ob","appIndexPage":"Index","belong":"SELF,CHANNAL","appWelcomePage":"welcome/Welcome.htm","requestPath":"/smartCRM","requestHost":"http://123.57.35.51:80/","appType":"I"},{"appName":"实名登记","requestServlet":"/mobiledata","appPath":"realname-server","appId":"realname","appIcon":"e_ico-realname","appIndexPage":"Index","belong":"SELF,CHANNAL","appWelcomePage":"welcome/Welcome.htm","requestPath":"/realname-server","requestHost":"http://123.57.35.51:80/","appType":"I"},{"appName":"光宽带","requestServlet":"/mobiledata","appPath":"guangkuandai","appId":"guangkuandai","appIcon":"e_ico-guangkuandai","appIndexPage":"Index","belong":"SELF,CHANNAL","appWelcomePage":"welcome/Welcome.htm","requestPath":"/appserver","requestHost":"http://123.57.35.51:80/","appType":"I"},{"appName":"换卡易","requestServlet":"/mobiledata","appPath":"bukayi","appId":"bukayi","appIcon":"e_ico-bukayi","appIndexPage":"UserConfirm","belong":"SELF,CHANNAL","appWelcomePage":"welcome/Welcome.htm","requestPath":"/bukayi-server","requestHost":"http://123.57.35.51:80/","appType":"I"},{"appName":"工作台","requestServlet":"/mobiledata","appPath":"ioo","appId":"ioo","appIcon":"e_ico-conect","appIndexPage":"Home","belong":"SELF,CHANNAL","appWelcomePage":"welcome/Welcome.htm","requestPath":"/ioo","requestHost":"http://123.57.35.51:80/","appType":"I"},{"appName":"一体化","requestServlet":"/mobiledata","appPath":"salemanm","appId":"salemanm","appIcon":"e_ico-conect","appIndexPage":"Home","belong":"SELF,CHANNAL","appWelcomePage":"welcome/Welcome.htm","requestPath":"/salemanm-server","requestHost":"http://123.57.35.51:80/","appType":"I"}]}
LoginBean.initAppConfig={}

multiple-server/web/template/webapp/welcome/WelcomeDisplay.html

@@ -1,10 +0,0 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
<html>
<head>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
<title>Insert title here</title>
</head>
<body>
<center>Display欢迎页面</center>
</body>
</html>

multiple-server/web/template/webapp/welcome/WelcomeIoo.html

@@ -1,10 +0,0 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
<html>
<head>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
<title>Insert title here</title>
</head>
<body>
<center>Ioo欢迎页面</center>
</body>
</html>

multiple-server/web/welcome/Welcome-bukayi.htm

@@ -1,15 +0,0 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
<html>
<head>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
<style type="text/css">
	body { margin:0; padding:0;position:absolute;width:100%;height:100%;overflow:hidden;}
	div { margin:0; padding:0;}
	img { border:0; outline: none; vertical-align:middle;width:100%; height:100%;}
</style>
<title>加载中</title>
</head>
<body>
<img src="../biz/img/welcome-bukayi.jpg" />
</body>
</html>

multiple-server/web/welcome/Welcome-guangkuandai.htm

@@ -1,15 +0,0 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
<html>
<head>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
<style type="text/css">
	body { margin:0; padding:0;position:absolute;width:100%;height:100%;overflow:hidden;}
	div { margin:0; padding:0;}
	img { border:0; outline: none; vertical-align:middle;width:100%; height:100%;}
</style>
<title>加载中</title>
</head>
<body>
<img src="../biz/img/welcome-guangkuandai.jpg" />
</body>
</html>

multiple-server/web/welcome/Welcome-realname.htm

@@ -1,15 +0,0 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
<html>
<head>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
<style type="text/css">
	body { margin:0; padding:0;position:absolute;width:100%;height:100%;overflow:hidden;}
	div { margin:0; padding:0;}
	img { border:0; outline: none; vertical-align:middle;width:100%; height:100%;}
</style>
<title>加载中</title>
</head>
<body>
<img src="../biz/img/welcome-realname.jpg" />
</body>
</html>

multiple-server/web/welcome/Welcome-smartCRM.htm

@@ -1,15 +0,0 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
<html>
<head>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
<style type="text/css">
	body { margin:0; padding:0;position:absolute;width:100%;height:100%;overflow:hidden;}
	div { margin:0; padding:0;}
	img { border:0; outline: none; vertical-align:middle;width:100%; height:100%;}
</style>
<title>加载中</title>
</head>
<body>
<img src="../biz/img/welcome-smartCRM.png" />
</body>
</html>

multiple-server/web/welcome/Welcome-eci.htm

@@ -10,6 +10,6 @@
<title>加载中</title>
</head>
<body>
<img src="../biz/img/welcome-eci.jpg" />
<img src="../biz/img/welcome.png" />
</body>
</html>
</html>

multiple-server/web/welcome/WelcomeDisplay.htm

@@ -1,10 +0,0 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
<html>
<head>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
<title>Insert title here</title>
</head>
<body>
<center>Display欢迎页面</center>
</body>
</html>

multiple-server/web/welcome/WelcomeIoo.htm

@@ -1,10 +0,0 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
<html>
<head>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
<title>Insert title here</title>
</head>
<body>
<center>Ioo欢迎页面</center>
</body>
</html>