代码优化

thinkgem · May 11, 2024 · 3cd5b23 · 3cd5b23
1 parent ad29250
commit 3cd5b23
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 9 deletions.
diff --git a/modules/cms/src/main/java/com/jeesite/modules/cms/entity/Site.java b/modules/cms/src/main/java/com/jeesite/modules/cms/entity/Site.java
@@ -180,9 +180,8 @@ public void setCustomIndexView(String customIndexView) {
 	 * 获取当前编辑的站点编号
 	 */
 	public static String getCurrentSiteCode() {
-		String siteCode = (String) UserUtils.getCache("currentSiteCode");
-		String defaultSiteCode = MAIN_SITE_CODE;
-		return StringUtils.isNotBlank(siteCode) ? siteCode : defaultSiteCode;
+		String siteCode = UserUtils.getCache("currentSiteCode");
+		return StringUtils.isNotBlank(siteCode) ? siteCode : MAIN_SITE_CODE;
 	}
 
 	/**

diff --git a/modules/cms/src/main/java/com/jeesite/modules/cms/web/SiteController.java b/modules/cms/src/main/java/com/jeesite/modules/cms/web/SiteController.java
@@ -154,12 +154,6 @@ public String select(String siteCode, String redirect, HttpServletRequest reques
 			return REDIRECT + adminPath + "/cms/index";
 		}
 		UserUtils.putCache("currentSiteCode", siteCode);
-		// 保存到Cookie中，下次登录后自动切换到该站点
-		String cookieName = "siteCode";
-		if (Global.isUseCorpModel()){
-			cookieName = CorpUtils.getCurrentCorpCode() + "_" + cookieName;
-		}
-		CookieUtils.setCookie(response, cookieName, siteCode);
 		if (StringUtils.isNotBlank(redirect)){
 			return REDIRECT + redirect;
 		}