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

multiple-server/src/com/ai/server/multiple/core/bean/MultipleBean.java

@@ -1,14 +1,15 @@
package com.ai.server.multiple.core.bean;
import com.ai.server.multiple.core.context.MultipleContextData;
import com.ailk.mobile.frame.bean.AbstractBean;
import com.ailk.mobile.frame.context.IContext;
import com.ailk.mobile.frame.context.impl.DefaultContextData;
public class MultipleBean extends AbstractBean{
	// modify by wyj
	@Override
	protected MultipleContextData getContextData() throws Exception {
	protected DefaultContextData getContextData() throws Exception {
		IContext<?> context = getContext();
		return (MultipleContextData)context.getContextData();
		return (DefaultContextData)context.getContextData();
	}
}

multiple-server/src/com/ai/server/multiple/core/session/MultipleSessionManager.java

@@ -1,9 +1,9 @@
package com.ai.server.multiple.core.session;
import com.ai.server.multiple.core.context.MultipleContextData;
import com.ai.server.multiple.util.Constant;
import com.ailk.common.data.IData;
import com.ailk.mobile.frame.context.IContextData;
import com.ailk.mobile.frame.context.impl.DefaultContextData;
import com.ailk.mobile.frame.session.impl.AbstractSessionManager;
import com.ailk.mobile.util.MobileUtility;
@@ -15,7 +15,8 @@ public class MultipleSessionManager extends AbstractSessionManager{
	@Override
	public void customVerify(String sessionId, IData param, IContextData contextData) throws Exception {
		String account = param.getString(Constant.Session.ACCOUNT, "");
		String sessionAccount = ((MultipleContextData)contextData).getAccount();
		// modify by wyj
		String sessionAccount = ((DefaultContextData)contextData).getData().getString(Constant.Session.ACCOUNT);
		// TODO Auto-generated method stub
		if (log.isDebugEnabled()) {
			log.debug("Session Verify account : " + account);

multiple-server/web/biz/js/login.js

@@ -25,7 +25,7 @@ require(["common","mobile","wadeMobile","util"], function(Common,Mobile,WadeMobi
				return;
			}
			console.log("登陆成功:" + result);
			Common.put("ACCOUNT", sessionId);
			Common.put("ACCOUNT", $("#J_username").val());
			WadeMobile.initAppConfig(result.get("APPS").toString());
			Mobile.openTemplate("Index", result);
		});