Merge branch 'feature/1003103' into 'master'

feat:[1003103]小睿小程序独立管理端1期

See merge request rays/pcloud-common-parent!134

pcloud-common/src/main/java/com/pcloud/common/utils/SessionUtil.java

@@ -109,6 +109,14 @@ public abstract class SessionUtil {
 	public static final String AGENT_MEMBER_ID = "agentMemberId";
 	public static final String MEMBER_ID = "memberId";
 	/**
+	 * 小睿小程序管理端出版社id
+	 */
+	public static final String RAY_AGENT_ID = "rayAgentId";
+	/**
+	 * 是否7天自动登录
+	 */
+	public static final String IS_REMEMBER = "isRemember";
+	/**
 	 * 登录场景
 	 */
 	public static final String CLIENT_CODE = "clientCode";
@@ -126,6 +134,7 @@ public abstract class SessionUtil {
 	private static final Integer DEFAULT_SESSION_TIMEOUT = 2 * 60 * 60;
 	private static final Integer DEFAULT_SESSION_TIMEOUT_ERP = 24 * 60 * 60;
 	private static final Integer DEFAULT_SESSION_TIMEOUT_XCX = 15 * 24 * 60 * 60;
+	private static final Integer DEFAULT_SESSION_TIMEOUT_SEVEN = 7 * 24 * 60 * 60;
 
 	/**
 	 * token写入redis
@@ -144,6 +153,10 @@ public abstract class SessionUtil {
 		if ("pcloud".equals(map.get(SYSTEM_CODE))) {
 			timeOut = DEFAULT_SESSION_TIMEOUT_ERP;
 		}
+		//7天自动登录
+		if ("rayPcloud".equals(map.get(SYSTEM_CODE)) && "1".equals(map.get(IS_REMEMBER))){
+			timeOut = DEFAULT_SESSION_TIMEOUT_SEVEN;
+		}
 		JedisClusterUtils.setObject(token, map, timeOut);
 		return token;
 	}
@@ -180,6 +193,10 @@ public abstract class SessionUtil {
 		if ("pcloud".equals(map.get(SYSTEM_CODE))) {
 			timeOut = DEFAULT_SESSION_TIMEOUT_ERP;
 		}
+		//7天自动登录
+		if ("rayPcloud".equals(map.get(SYSTEM_CODE)) && "1".equals(map.get(IS_REMEMBER))){
+			timeOut = DEFAULT_SESSION_TIMEOUT_SEVEN;
+		}
 		JedisClusterUtils.expireObject(token, timeOut);
 		return map;
 	}
@@ -204,6 +221,10 @@ public abstract class SessionUtil {
 		if ("pcloud".equals(map.get(SYSTEM_CODE))) {
 			timeOut = DEFAULT_SESSION_TIMEOUT_ERP;
 		}
+		//7天自动登录
+		if ("rayPcloud".equals(map.get(SYSTEM_CODE)) && "1".equals(map.get(IS_REMEMBER))){
+			timeOut = DEFAULT_SESSION_TIMEOUT_SEVEN;
+		}
 		JedisClusterUtils.expireObject(token, timeOut);
 		return map;
 	}
@@ -231,6 +252,10 @@ public abstract class SessionUtil {
 		if ("pcloud".equals(map.get(SYSTEM_CODE))) {
 			timeOut = DEFAULT_SESSION_TIMEOUT_ERP;
 		}
+		//7天自动登录
+		if ("rayPcloud".equals(map.get(SYSTEM_CODE)) && "1".equals(map.get(IS_REMEMBER))){
+			timeOut = DEFAULT_SESSION_TIMEOUT_SEVEN;
+		}
 		JedisClusterUtils.expireObject(token, timeOut);
 		Object o = map.get(key);
 		if (o == null) {