更新

FullCardServer/src/main/java/com/zhongshu/card/server/core/dataConfig/CardDefault.java

@@ -6,8 +6,9 @@ package com.zhongshu.card.server.core.dataConfig;
  */
 public class CardDefault {
 
-    public static final String SUPER_ADMIN_NAME = "18723497166";
+    public static  final String DEFAULT_PLATFORM_NAME = "全卡项目平台";
 
+    public static final String SUPER_ADMIN_NAME = "18723497166";
 
     /**
      * 默认密码

FullCardServer/src/main/java/com/zhongshu/card/server/core/init/SuperCountInit.java

@@ -1,9 +1,14 @@
 package com.zhongshu.card.server.core.init;
 
+import com.zhongshu.card.client.service.org.OrganizationService;
 import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.CommandLineRunner;
 import org.springframework.stereotype.Component;
 
+import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.TimeUnit;
+
 /**
  * 平台用户的初始化
  *
@@ -14,10 +19,21 @@ import org.springframework.stereotype.Component;
 @Slf4j
 public class SuperCountInit implements CommandLineRunner {
 
+    @Autowired
+    OrganizationService organizationService;
+
     @Override
     public void run(String... args) throws Exception {
         // 平台 平台用户的初始化
         log.info("SuperCountInit");
-
+        CompletableFuture.runAsync(()->{
+            try {
+                TimeUnit.SECONDS.sleep(10);
+                log.info("---------开始初始平台管理员信息-----------");
+                organizationService.initSuperOrganization();
+            }catch (Exception e){
+                e.printStackTrace();
+            }
+        });
     }
 }

FullCardServer/src/main/java/com/zhongshu/card/server/core/service/org/OrganizationServiceImpl.java

@@ -16,9 +16,15 @@ import com.zhongshu.card.client.model.org.OrganizationModel;
 import com.zhongshu.card.client.ret.ResultContent;
 import com.zhongshu.card.client.service.org.OrganizationService;
 import com.zhongshu.card.client.type.UserState;
-import com.zhongshu.card.server.core.dao.org.*;
+import com.zhongshu.card.server.core.dao.org.OrganizationDao;
+import com.zhongshu.card.server.core.dao.org.OrganizationUserDao;
+import com.zhongshu.card.server.core.dao.org.RoleDao;
+import com.zhongshu.card.server.core.dao.org.UserCountDao;
 import com.zhongshu.card.server.core.dataConfig.CardDefault;
-import com.zhongshu.card.server.core.domain.org.*;
+import com.zhongshu.card.server.core.domain.org.Organization;
+import com.zhongshu.card.server.core.domain.org.OrganizationUser;
+import com.zhongshu.card.server.core.domain.org.Role;
+import com.zhongshu.card.server.core.domain.org.UserAccount;
 import com.zhongshu.card.server.core.util.BeanUtils;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.ObjectUtils;
@@ -79,12 +85,13 @@ public class OrganizationServiceImpl implements OrganizationService {
     @Override
     public ResultContent initSuperOrganization() {
         String oid = "";
-        AuthType authType = AuthType.Project;
+
+        AuthType authType = AuthType.Platform;
         Organization organization = organizationDao.findByAuthType(authType);
         if (ObjectUtils.isEmpty(organization)) {
             log.info("initSuperOrganization 开始初始平台结构信息");
             com.github.microservice.auth.client.model.OrganizationModel organizationModel = new com.github.microservice.auth.client.model.OrganizationModel();
-            organizationModel.setName("全卡项目平台");
+            organizationModel.setName(CardDefault.DEFAULT_PLATFORM_NAME);
             organizationModel.setAuthType(authType);
             organizationModel.setRemark("系统自动初始化");
             com.github.microservice.auth.client.content.ResultContent<String>
@@ -115,6 +122,7 @@ public class OrganizationServiceImpl implements OrganizationService {
             initOrganization(organization);
         } else {
             oid = organization.getOid();
+            log.info("平台管理员账号已存在...");
         }
         return ResultContent.buildSuccess(oid);
     }
@@ -182,6 +190,10 @@ public class OrganizationServiceImpl implements OrganizationService {
      */
     public ResultContent initResource(Organization organization, String userId) {
         UserAccount userAccount = userCountDao.findTopByUserId(userId);
+        Set<String> auth = Set.of(AuthConstant.Admin);
+        if(organization.getAuthType().equals(AuthType.Platform)) {
+            auth = Set.of(AuthConstant.SuperAdmin);
+        }
 
         String oid = organization.getOid();
         // 权限中心: 角色组
@@ -189,14 +201,14 @@ public class OrganizationServiceImpl implements OrganizationService {
         admin.setName(CardDefault.DEFAULT_ROLE_NAME);
         admin.setRemark(CardDefault.DEFAULT_ROLE_NAME);
         admin.setOrganizationId(oid);
-        admin.setIdentity(Set.of(AuthConstant.Admin));
+        admin.setIdentity(auth);
         com.github.microservice.auth.client.content.ResultContent<String> updateRoleGroupAdmin = roleService.updateRoleGroup(admin);
         String groupId = updateRoleGroupAdmin.getContent();
         log.info("初始权限中心角色组成功：{}", groupId);
 
         Role adminRole = null;
         if (!StringUtils.isEmpty(groupId)) {
-            Set<String> auth = Set.of(AuthConstant.Admin);
+
             // 权限中心: 角色信息
             RoleModel roleModel = new RoleModel();
             roleModel.setOrganizationId(oid);