更换文件服务器域名

src/main/java/com/gxwebsoft/common/core/utils/MyQrCodeUtil.java

@@ -60,7 +60,7 @@ public class MyQrCodeUtil {
    */
   public static String createQrCode(String type,Integer id, String content) throws IOException {
     String filePath = "/www/wwwroot/file.ws/file/qrcode/".concat(type).concat("/");
-    String qrcodeUrl = "https://file.gxwebsoft.com/qrcode/".concat(type).concat("/");
+    String qrcodeUrl = "https://file.websoft.top/qrcode/".concat(type).concat("/");
     // 将URL转为BufferedImage
     BufferedImage bufferedImage = ImageIO.read(new URL(logoUrl));
     // 生成二维码

src/main/java/com/gxwebsoft/common/system/controller/MainController.java

@@ -548,9 +548,9 @@ public class MainController extends BaseController {
         return fail("用户不存在",null);
       }
       user = adminsByPhone.get(0);
-      if(redisUtil.get(CACHE_KEY_VERIFICATION_CODE_BY_DEV_SMS).equals(code) && user.getTenantId().equals(5)){
+//      if(redisUtil.get(CACHE_KEY_VERIFICATION_CODE_BY_DEV_SMS).equals(code) && user.getTenantId().equals(5)){
-        return fail("登录失败 10398",null);
+//        return fail("登录失败 10398",null);
-      }
+//      }
       // 签发token
       String access_token = JwtUtil.buildToken(new JwtSubject(phone, user.getTenantId()),
         tokenExpireTime, configProperties.getTokenKey());

src/main/java/com/gxwebsoft/common/system/controller/UserController.java

@@ -547,6 +547,12 @@ public class UserController extends BaseController {
     @ApiOperation("查询全部用户All")
     @GetMapping("/pageAll")
     public ApiResult<List<User>> pageAll(UserParam param){
+      final User loginUser = getLoginUser();
+      if(loginUser != null){
+        if(!loginUser.getTenantId().equals(5)){
+          param.setTenantId(getLoginUser().getTenantId());
+        }
+      }
       return success(userService.pageAll(param));
     }
 }

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

@@ -8,6 +8,7 @@ import com.gxwebsoft.common.core.utils.DomainUtil;
 import com.gxwebsoft.common.core.utils.RedisUtil;
 import com.gxwebsoft.common.system.entity.*;
 import com.gxwebsoft.common.system.mapper.TenantMapper;
+import com.gxwebsoft.common.system.param.MenuParam;
 import com.gxwebsoft.common.system.service.*;
 import com.gxwebsoft.common.system.param.TenantParam;
 import com.gxwebsoft.common.core.web.PageParam;
@@ -105,7 +106,7 @@ public class TenantServiceImpl extends ServiceImpl<TenantMapper, Tenant> impleme
       // 添加超级管理员
       User superAdmin = new User();
       superAdmin.setUsername("superAdmin");
-      superAdmin.setNickname("超级管理员");
+      superAdmin.setNickname(company.getShortName());
       superAdmin.setPhone(company.getPhone());
       superAdmin.setEmail(company.getEmail());
       superAdmin.setTemplateId(company.getTemplateId());
@@ -224,7 +225,7 @@ public class TenantServiceImpl extends ServiceImpl<TenantMapper, Tenant> impleme
           menu.setIcon("AuditOutlined");
           menu.setAuthority("sys:company:profile");
           menu.setSortNumber(1);
-          menu.setHide(0);
+          menu.setHide(1);
           menuService.save(menu);
           Integer profileParentId = menu.getMenuId();
           menu.setParentId(profileParentId);
@@ -239,6 +240,7 @@ public class TenantServiceImpl extends ServiceImpl<TenantMapper, Tenant> impleme
           menu.setPath("/system/menu");
           menu.setComponent("/system/menu");
           menu.setIcon("appstore-outlined");
+          menu.setHide(0);
           menu.setAuthority("");
           menu.setSortNumber(2);
           menuService.save(menu);
@@ -584,6 +586,7 @@ public class TenantServiceImpl extends ServiceImpl<TenantMapper, Tenant> impleme
             saveRedis(company);
           }
         }
+
       }
       // 发送邮件通知
       String title = "恭喜！您的应用已创建成功";

src/main/resources/application.yml

@@ -88,8 +88,8 @@ config:
   swagger-description: websoft - 基于java spring、vue3、antd构建的前后端分离快速开发框架
   swagger-version: 2.0
   token-key: WLgNsWJ8rPjRtnjzX/Gx2RGS80Kwnm/ZeLbvIL+NrBs=
-  server-url: https://server.gxwebsoft.com/api
+  server-url: https://server.websoft.top/api
-  file-server: https://file.gxwebsoft.com
+  file-server: https://file.websoft.top
   upload-path: /Users/gxwebsoft/Documents/uploads/
   local-upload-path: /Users/gxwebsoft/Documents/uploads/