From 3eef280adee1cad8041cd9309be8e77f21cc2299 Mon Sep 17 00:00:00 2001
From: thinkgem <thinkgem@163.com>
Date: Sat, 11 May 2024 15:28:25 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/com/jeesite/modules/cms/entity/Site.java  | 5 ++---
 .../java/com/jeesite/modules/cms/web/SiteController.java    | 6 ------
 web-fast/pom.xml                                            | 2 +-
 3 files changed, 3 insertions(+), 10 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
index 67a236ca..fba2eed7 100644
--- 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 class Site extends DataEntity<Site> {
 	 * 获取当前编辑的站点编号
 	 */
 	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
index 51c309ec..c7acdb48 100644
--- 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 class SiteController extends BaseController {
 			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;
 		}
diff --git a/web-fast/pom.xml b/web-fast/pom.xml
index 52861ee7..8e57cfc8 100644
--- a/web-fast/pom.xml
+++ b/web-fast/pom.xml
@@ -90,7 +90,7 @@
 		<dependency>
 			<groupId>com.jeesite</groupId>
 			<artifactId>jeesite-vue-dist</artifactId>
-			<version>5.7.0-SNAPSHOT</version>
+			<version>5.7.1-SNAPSHOT</version>
 		</dependency>
 
 	</dependencies>