Merge branch 'master' of http://47.92.104.23:3000/project/shichuangyi

src/com/kingdee/eas/custom/sso/OAToMBos.java

@@ -7,6 +7,7 @@ import com.kingdee.bos.Context;
 import com.kingdee.eas.cp.eip.sso.util.CASLoginConfigPropUtil;
 import com.kingdee.eas.cp.eip.sso.util.CloudParamUtil;
 import com.kingdee.eas.util.app.DbUtil;
+import com.kingdee.eas.utils.ExpiringMapCache;
 import com.kingdee.jdbc.rowset.IRowSet;
 import com.kingdee.shr.base.syssetting.exception.SHRWebException;
 import com.kingdee.util.StringUtils;

src/com/kingdee/eas/custom/sso/OAToSHR.java

@@ -8,6 +8,7 @@ import com.kingdee.eas.cp.eip.sso.ltpa.LtpaTokenManager;
 import com.kingdee.eas.cp.eip.sso.util.CASLoginConfigPropUtil;
 import com.kingdee.eas.cp.eip.sso.util.CloudParamUtil;
 import com.kingdee.eas.util.app.DbUtil;
+import com.kingdee.eas.utils.ExpiringMapCache;
 import com.kingdee.jdbc.rowset.IRowSet;
 import com.kingdee.shr.base.syssetting.exception.SHRWebException;
 import com.kingdee.util.StringUtils;