改造：平台用户的登录及注册,关键词：isAdmin

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"));

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);
       }
     };

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));
   }
 
   /**