去除网站参数读取的权限

src/main/java/com/gxwebsoft/cms/controller/CmsWebsiteController.java

@@ -2,6 +2,7 @@ package com.gxwebsoft.cms.controller;
 
 import cn.hutool.core.date.DateTime;
 import cn.hutool.core.date.DateUtil;
+import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
 import cn.hutool.http.HttpRequest;
 import com.alibaba.fastjson.JSONObject;
@@ -23,7 +24,9 @@ import com.gxwebsoft.common.core.web.PageResult;
 import com.gxwebsoft.common.core.web.PageParam;
 import com.gxwebsoft.common.core.web.BatchParam;
 import com.gxwebsoft.common.core.annotation.OperationLog;
+import com.gxwebsoft.common.system.entity.Company;
 import com.gxwebsoft.common.system.entity.User;
+import com.gxwebsoft.common.system.service.CompanyService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.security.access.prepost.PreAuthorize;
@@ -53,6 +56,8 @@ public class CmsWebsiteController extends BaseController {
     private CmsWebsiteFieldService cmsWebsiteFieldService;
     @Resource
     private CmsNavigationService cmsNavigationService;
+    @Resource
+    private CompanyService companyService;
 
     @ApiOperation("分页查询网站信息记录表")
     @GetMapping("/page")
@@ -149,18 +154,31 @@ public class CmsWebsiteController extends BaseController {
   @ApiOperation("网站基本信息")
   @GetMapping("/getSiteInfo")
   public ApiResult<CmsWebsite> getSiteInfo(HttpServletRequest request) {
-    String key = "RootSiteInfo";
+    String key = "RootSiteInfo:".concat(getTenantId().toString());
     final String siteInfo = redisUtil.get(key);
     String access_token = JwtUtil.getAccessToken(request);
+
     // 从缓存读取信息
     if(StrUtil.isNotBlank(siteInfo)){
-      return success(JSONObject.parseObject(siteInfo,CmsWebsite.class));
+//      return success(JSONObject.parseObject(siteInfo,CmsWebsite.class));
     }
-
     // 判断是否存在
-//    if (cmsWebsiteService.count() == 0) {
+    if (cmsWebsiteService.count() == 0) {
-//      return fail("站点不存在",null);
+      final Integer tenantId = getTenantId();
-//    }
+      final CmsWebsite cmsWebsite = new CmsWebsite();
+      cmsWebsite.setTenantId(tenantId);
+      final Company company = companyService.getOne(new LambdaQueryWrapper<Company>().last("limit 1"));
+      if (ObjectUtil.isNotEmpty(company)) {
+        cmsWebsite.setDomain(company.getDomain());
+        cmsWebsite.setWebsiteName(company.getShortName());
+        cmsWebsite.setWebsiteCode(company.getCompanyCode());
+        cmsWebsite.setWebsiteIcon("/favicon.ico");
+      }
+      System.out.println("cmsWebsite = " + cmsWebsite);
+      final boolean save = cmsWebsiteService.save(cmsWebsite);
+      System.out.println("save = " + save);
+      return fail("站点不存在",null);
+    }
 
     // 获取站点信息
     final CmsWebsite website = cmsWebsiteService.getOne(new LambdaQueryWrapper<CmsWebsite>().eq(CmsWebsite::getDeleted, 0).last("limit 1"));

src/main/java/com/gxwebsoft/cms/controller/CmsWebsiteFieldController.java

@@ -48,8 +48,6 @@ public class CmsWebsiteFieldController extends BaseController {
         return success(cmsWebsiteFieldService.listRel(param));
     }
 
-    @PreAuthorize("hasAuthority('cms:cmsWebsiteField:list')")
-    @OperationLog
     @ApiOperation("根据id查询应用参数")
     @GetMapping("/{id}")
     public ApiResult<CmsWebsiteField> get(@PathVariable("id") Integer id) {

src/main/java/com/gxwebsoft/common/system/service/impl/TenantServiceImpl.java

@@ -410,7 +410,7 @@ public class TenantServiceImpl extends ServiceImpl<TenantMapper, Tenant> impleme
           menuService.save(menu);
           menu.setParentId(fileParentId);
           menu.setTitle("删除文件");
-          menu.setAuthority("sys:org:remove");
+          menu.setAuthority("sys:file:remove");
           menuService.save(menu);
           menu.setParentId(parentId);
           menu.setTitle("秘钥管理");