Merge branch 'master' of http://114.215.100.48:3000/ipu/android-share.git

display-server/web/res/js/mobile/browser-toolkit.js

@@ -138,14 +138,16 @@ define(["module","jcl","clientTool"],function(module,Wade,clientTool) {
	browserTool.redirect = (function() {
		return {
			/**
			 * isContext 为true时,data参数作为页面渲染参数 encode 只支持传boolean的false
			 * isContext 为true时,data参数作为页面渲染参数
			 * isEncode 只支持传boolean的false
			 */
			buildUrl : function(action, data, isContext, encode) {
			buildUrl : function(action, data, isContext, isEncode) {
				var url = browserTool.ServerPath;
				url += "?action=" + action;
				if (data) {
					if(encode!=false){
					if(isEncode){
						data = encodeURI(encodeURI(data.toString()));
						url += "&isEncode=true";
					}else{
						url += "&isEncode=false";
					}
@@ -165,7 +167,7 @@ define(["module","jcl","clientTool"],function(module,Wade,clientTool) {
			},
			
			toPage : function(action, params) {
				var url = this.buildUrl(action, params);
				var url = this.buildUrl(action, params, true);
				document.location.href = url;
			},
			

display-server/web/res/js/mobile/mobile-browser.js

@@ -19,15 +19,6 @@ define(["browserTool","jcl"],function(browserTool,Wade) {
		/*调用服务*/
		this.dataRequest = function(action, param, callback, err) {
			browserTool.ajax.post(action, param, callback, err);
			/*browserTool.ajax.post(action, param, function(resultData){
				resultData = Wade.DataMap(resultData);
				var x_resultcode = resultData.get("X_RESULTCODE");
				if(x_resultcode < 0){
					err(resultData);
				}else{
					callback(resultData);
				};
			}, err);*/
		};
		/******************页面跳转**********************/
		/*页面跳转,url为跳转目标*/
@@ -132,6 +123,9 @@ define(["browserTool","jcl"],function(browserTool,Wade) {
		};
		/*关闭窗口*/
		this.closeWindow = function(result) {
			if(typeof(result) != "string"){
				result = result.toString();
			}
			if (windowFlag&&windowCallback) {//windowFlag标识可以防止递归关闭所有窗口
				if(result){//返回值为空不执行回调
					windowCallback(result);

display-server/web/res/js/mobile/wade-mobile.js

@@ -1,7 +1,7 @@
/**
 * 与客户端交互的基础API
 */
define(["jcl","base64","jcl","res/js/mobile/expand-mobile.js","biz/js/common/biz-mobile.js"],function(Wade,Base64,$) {
define(["jcl","base64","res/js/mobile/expand-mobile.js","biz/js/common/biz-mobile.js"],function(Wade,Base64) {
	//终端类型,a为android,i为ios
	var terminalType = window["TerminalType"];
    var deviceType = (function(){
@@ -185,10 +185,13 @@ define(["jcl","base64","jcl","res/js/mobile/expand-mobile.js","biz/js/common/biz
			            delete callbacks[callbackKey];
			        }
			    }
			},error:function(callbackKey, message) {
			},error:function(callbackKey, message, isEncode) {
				if(typeof message == "undefined"){
					return;
				}
        		if(isEncode){
        			message = decodeURIComponent(message);
        		}
			    if (callbacks[callbackKey]) {
		            if (callbacks[callbackKey].error) {
		                if(typeof callbacks[callbackKey].error==="function"){

ipu-server/etc/server-data.xml

@@ -3,9 +3,9 @@
  <!ENTITY component.data SYSTEM "classpath:server-data-comp.xml">
]>
<datas>
    <action name="Login.init" class="com.ipu.server.bean.Login" method="init" verify="false" encrypt="true"></action>
    <action name="Login.refreshVerifyCode" class="com.ipu.server.bean.Login" method="refreshVerifyCode" verify="false" encrypt="true"></action>
    <action name="Login.doLogin" class="com.ipu.server.bean.Login" method="doLogin" verify="false" encrypt="true"></action>
    <action name="Index.getMenuData" class="com.ipu.server.bean.Index" method="getMenuData" verify="false"></action>
    <action name="Login.init" class="com.ipu.server.bean.LoginBean" method="init" verify="false" encrypt="true"></action>
    <action name="Login.refreshVerifyCode" class="com.ipu.server.bean.LoginBean" method="refreshVerifyCode" verify="false" encrypt="true"></action>
    <action name="Login.doLogin" class="com.ipu.server.bean.LoginBean" method="doLogin" verify="false" encrypt="true"></action>
    <action name="Index.getMenuData" class="com.ipu.server.bean.IndexBean" method="getMenuData" verify="false"></action>
    
</datas>

ipu-server/web/encrypt/template/server-config.xml

@@ -1 +1 @@
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

ipu-server/web/encrypt/template/server-data.xml

@@ -1 +1 @@
6oPEPrVxr2sNeDXETQoyHQiILx9vTuBmLt9pTJIYok0DVnhpaGmmM9llw6De9chkjQa9Vo1UlNi1bM2sg8bdUQyDzGyrutngv9Q3LMwnFVx3y973d372YrJztjnU05C4UIhs2co/Tn5We+orDc9rYCdHALBO3cSCi2YKfWzvs7DZscllYPIZ/dV5oxZJkIAllxrIlNzJ39OYrfrwJrA9TLYGykgFLZanTs+U7Kq+V+SSXZ1TuyiLBNuv3Wqr1BYzg22cfC7ggf7dqCoGk5YjgxYHB0tf3FsYy1Mk05WvQNAhha4EwoG8fd+XxxA5viGKsUbqS+pHTwpCt7juTWwzsmiKrPsjzJL0d4ILJyxIUzZySHXQqPvQrSDlY4ud24Gcd5lWFxCd0mwuhBb/YG9jqG7eGaP91JA0+kwzXz7gBr81gpS/OKnA1K+svfi7vGwOou51+/mDQPBYof6rwqUCPcbFl0Bqf6w9I8XLE4eN/3WcYNsG75SAqtyg63YmuHArYgnUnoIoyiv1RB2ssW4a3xCxJemvKI+r2qnGg1GoAzh+yNsATB7oSrUk9N7IZwLhj6scUSIx9gfUAit0pyalvW/Z8KEgXEf0msBluXXa7v1yKPWMdkfu8ZsVslmSxlWjPiygOuj8/K1i0c5YcIiVcMpPsi9bpOXh0ZiUeTv/ZV+70b0i0Ax9Y1OrRYINFXhq2n1zd+i8ALAA3GDkgnfv7nOTgFg976T0FJYsvSKUrjeuhYLi6MJu6x/895tutPCQ39qONq8oHzrQ3YpkXuq20fU0sH5Ly9l9M5aYQA5qrJ+mKAjN26FClnKURG5tZJeqzBETui8vLdj4U/giBw8UkiDZqOKqFdAe
6oPEPrVxr2sNeDXETQoyHQiILx9vTuBmLt9pTJIYok0DVnhpaGmmM9llw6De9chkjQa9Vo1UlNi1bM2sg8bdUQyDzGyrutngv9Q3LMwnFVx3y973d372YrJztjnU05C4UIhs2co/Tn5We+orDc9rYCdHALBO3cSCi2YKfWzvs7DZscllYPIZ/dV5oxZJkIAllxrIlNzJ39OYrfrwJrA9TLYGykgFLZanTs+U7Kq+V+SSXZ1TuyiLBNuv3Wqr1BYzcS9IF0R4YhCQ74vylso9xlNA6a7Khkp21Hd72ZD5LLGns2Z0bVxudp0/NBBB3xnlgfHnkWrtxW562IAI8NMAGFNQjK95QJzbuNCzNlnYgssHgUgYcMDy/UJszavF37mG1FDSUW6dNFUUliy9IpSuN66FguLowm7rH/z3m2608JBtNF7nIOm3tVcwL1JvPOoSr6y9+Lu8bA6i7nX7+YNA8Fih/qvCpQI9xsWXQGp/rD0jxcsTh43/dZxg2wbvlICq3KDrdia4cCtiCdSegijKK/VEHayxbhrfELEl6a8oj6vaqcaDUagDOH7I2wBMHuhKtST03shnAuGPqxxRIjH2B9QCK3SnJqW9TsazXccVXTB27Bn54HngzBTwfiIdYrLDNQFo1bolFB/RTxoQZ3hcjuicgRDigwz/B0eEYZP6g12U1Oiz3NmCJ8wRE7ovLy3YH2qqwK5eKlKogch60XP+Vzn/zxmxGhzxCQtjg3n5uml3mVYXEJ3SbC6EFv9gb2Oobt4Zo/3UkDT1M9+eA8JfFio/QerJDppY0N2KZF7qttH1NLB+S8vZfTOWmEAOaqyfpigIzduhQpZylERubWSXqswRE7ovLy3Y+FP4IgcPFJIg2ajiqhXQHg==