From 130577f06eff00ccdccd0024f1da8d90c7ecef8e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B5=B5=E5=BF=A0=E6=9E=97?= <170083662@qq.com>
Date: Mon, 16 Sep 2024 14:14:49 +0800
Subject: [PATCH] =?UTF-8?q?=E6=94=B9=E9=80=A0=EF=BC=9A=E5=B9=B3=E5=8F=B0?=
 =?UTF-8?q?=E7=94=A8=E6=88=B7=E7=9A=84=E7=99=BB=E5=BD=95=E5=8F=8A=E6=B3=A8?=
 =?UTF-8?q?=E5=86=8C,=E5=85=B3=E9=94=AE=E8=AF=8D=EF=BC=9AisAdmin?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../cms/controller/CmsWebsiteController.java         | 12 +++++-------
 .../common/core/config/MybatisPlusConfig.java        |  5 +++--
 .../common/system/controller/MainController.java     |  2 +-
 3 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/src/main/java/com/gxwebsoft/cms/controller/CmsWebsiteController.java b/src/main/java/com/gxwebsoft/cms/controller/CmsWebsiteController.java
index 79e518a..044bd97 100644
--- a/src/main/java/com/gxwebsoft/cms/controller/CmsWebsiteController.java
+++ b/src/main/java/com/gxwebsoft/cms/controller/CmsWebsiteController.java
@@ -143,20 +143,18 @@ public class CmsWebsiteController extends BaseController {
   @ApiOperation("网站基本信息")
   @GetMapping("/getSiteInfo")
   public ApiResult<CmsWebsite> getSiteInfo(HttpServletRequest request) {
-    final Integer tenantId = getTenantId();
-    String key = "RootSiteInfo:" + tenantId;
+    String key = "RootSiteInfo";
     final String siteInfo = redisUtil.get(key);
     String access_token = JwtUtil.getAccessToken(request);
-    System.out.println("access_token = " + access_token);
     // 从缓存读取信息
     if(StrUtil.isNotBlank(siteInfo)){
-//      return success(JSONObject.parseObject(siteInfo,CmsWebsite.class));
+      return success(JSONObject.parseObject(siteInfo,CmsWebsite.class));
     }
 
     // 判断是否存在
-    if (cmsWebsiteService.count() == 0) {
-      return fail("站点不存在",null);
-    }
+//    if (cmsWebsiteService.count() == 0) {
+//      return fail("站点不存在",null);
+//    }
 
     // 获取站点信息
     final CmsWebsite website = cmsWebsiteService.getOne(new LambdaQueryWrapper<CmsWebsite>().eq(CmsWebsite::getDeleted, 0).last("limit 1"));
diff --git a/src/main/java/com/gxwebsoft/common/core/config/MybatisPlusConfig.java b/src/main/java/com/gxwebsoft/common/core/config/MybatisPlusConfig.java
index b14a3e8..317c402 100644
--- a/src/main/java/com/gxwebsoft/common/core/config/MybatisPlusConfig.java
+++ b/src/main/java/com/gxwebsoft/common/core/config/MybatisPlusConfig.java
@@ -74,9 +74,10 @@ public class MybatisPlusConfig {
           "sys_components",
           "sys_website_field",
           "sys_white_domain",
-//          "cms_website",
+          "cms_website",
           "cms_domain",
-          "cms_website_field"
+          "cms_website_field",
+          "cms_navigation"
         ).contains(tableName);
       }
     };
diff --git a/src/main/java/com/gxwebsoft/common/system/controller/MainController.java b/src/main/java/com/gxwebsoft/common/system/controller/MainController.java
index 0e0efcb..ac3b03b 100644
--- a/src/main/java/com/gxwebsoft/common/system/controller/MainController.java
+++ b/src/main/java/com/gxwebsoft/common/system/controller/MainController.java
@@ -581,7 +581,7 @@ public class MainController extends BaseController {
     // 签发token
     String access_token = JwtUtil.buildToken(new JwtSubject(phone, adminByPhone.getTenantId()),
       tokenExpireTime, configProperties.getTokenKey());
-    return success("登录成功", new LoginResult(access_token, adminByPhone));
+    return success("注册成功", new LoginResult(access_token, adminByPhone));
   }
 
   /**