更新

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

@@ -1,19 +1,22 @@
 package com.zhongshu.card.server.core.dataConfig;
 
 /**
+ * 全卡项目默认设置信息
+ *
  * @author TRX
  * @date 2024/5/31
  */
-public class CardDefault {
+public class CardSystemDefault {
 
-    public static  final String DEFAULT_PLATFORM_NAME = "全卡项目平台";
+    // 平台名称
+    public static final String DEFAULT_PLATFORM_NAME = "全卡项目平台";
 
+    // 平台初始用户登录名
     public static final String SUPER_ADMIN_NAME = "18723497166";
 
-    /**
-     * 默认密码
-     */
+    // 默认密码
     public static final String DEFAULT_PASSWORD = "123abc";
 
+    // 平台默认角色名称
     public static final String DEFAULT_ROLE_NAME = "管理员";
 }

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

@@ -19,7 +19,7 @@ import com.zhongshu.card.client.ret.ResultMessage;
 import com.zhongshu.card.client.service.org.OrganizationService;
 import com.zhongshu.card.client.utils.type.*;
 import com.zhongshu.card.server.core.dao.org.*;
-import com.zhongshu.card.server.core.dataConfig.CardDefault;
+import com.zhongshu.card.server.core.dataConfig.CardSystemDefault;
 import com.zhongshu.card.server.core.domain.org.*;
 import com.zhongshu.card.server.core.service.base.SuperService;
 import com.zhongshu.card.server.core.service.sync.ProjectSyncIotCenterService;
@@ -594,7 +594,7 @@ public class OrganizationServiceImpl extends SuperService implements Organizatio
         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(CardDefault.DEFAULT_PLATFORM_NAME);
+            organizationModel.setName(CardSystemDefault.DEFAULT_PLATFORM_NAME);
             organizationModel.setAuthType(authType);
             organizationModel.setRemark("系统自动初始化");
             com.github.microservice.auth.client.content.ResultContent<String> resultContent = organizationService.add(organizationModel);
@@ -618,7 +618,7 @@ public class OrganizationServiceImpl extends SuperService implements Organizatio
             organization.setName(organizationModel.getName());
             organization.setRemark(organizationModel.getRemark());
             organization.setCode("000001");
-            organization.setContactPhone(CardDefault.SUPER_ADMIN_NAME);
+            organization.setContactPhone(CardSystemDefault.SUPER_ADMIN_NAME);
             organizationDao.save(organization);
             // 初始用户信息
             initOrganization(organization, "");
@@ -643,7 +643,7 @@ public class OrganizationServiceImpl extends SuperService implements Organizatio
             //未注册
             //TODO 权限中心: 注册用户
             if (StringUtils.isEmpty(password)) {
-                password = CardDefault.DEFAULT_PASSWORD;
+                password = CardSystemDefault.DEFAULT_PASSWORD;
             }
             com.github.microservice.auth.client.content.ResultContent<String> addModelResult = userService.add(UserAuthModel.builder().loginType(LoginType.Phone).loginValue(organization.getContactPhone()).passWord(password).build());
             userId = addModelResult.getContent();
@@ -697,7 +697,7 @@ public class OrganizationServiceImpl extends SuperService implements Organizatio
     public ResultContent initResource(Organization organization, String userId) {
         UserAccount userAccount = userCountDao.findTopByUserId(userId);
 
-        Role adminRole = roleDao.findTopByNameAndOid(CardDefault.DEFAULT_ROLE_NAME, organization.getOid());
+        Role adminRole = roleDao.findTopByNameAndOid(CardSystemDefault.DEFAULT_ROLE_NAME, organization.getOid());
         if (ObjectUtils.isEmpty(adminRole)) {
             Set<String> auth = Set.of(AuthConstant.Admin);
             if (organization.getAuthType().equals(AuthType.Platform)) {
@@ -707,8 +707,8 @@ public class OrganizationServiceImpl extends SuperService implements Organizatio
             String oid = organization.getOid();
             // 权限中心: 角色组
             RoleGroupModel admin = new RoleGroupModel();
-            admin.setName(CardDefault.DEFAULT_ROLE_NAME);
-            admin.setRemark(CardDefault.DEFAULT_ROLE_NAME);
+            admin.setName(CardSystemDefault.DEFAULT_ROLE_NAME);
+            admin.setRemark(CardSystemDefault.DEFAULT_ROLE_NAME);
             admin.setOrganizationId(oid);
             admin.setIdentity(auth);
             com.github.microservice.auth.client.content.ResultContent<String> updateRoleGroupAdmin = roleService.updateRoleGroup(admin);
@@ -719,8 +719,8 @@ public class OrganizationServiceImpl extends SuperService implements Organizatio
                 // 权限中心: 角色信息
                 RoleModel roleModel = new RoleModel();
                 roleModel.setOrganizationId(oid);
-                roleModel.setName(CardDefault.DEFAULT_ROLE_NAME);
-                roleModel.setRemark(CardDefault.DEFAULT_ROLE_NAME);
+                roleModel.setName(CardSystemDefault.DEFAULT_ROLE_NAME);
+                roleModel.setRemark(CardSystemDefault.DEFAULT_ROLE_NAME);
                 roleModel.setAuth(auth);
                 com.github.microservice.auth.client.content.ResultContent<String> updateRole = roleService.updateRole(roleModel);
                 String roleId = updateRole.getContent();
@@ -737,8 +737,8 @@ public class OrganizationServiceImpl extends SuperService implements Organizatio
                 adminRole.setAuth(auth);
                 adminRole.setOid(oid);
                 adminRole.setRoleGroupId(groupId);
-                adminRole.setName(CardDefault.DEFAULT_ROLE_NAME);
-                adminRole.setRemark(CardDefault.DEFAULT_ROLE_NAME);
+                adminRole.setName(CardSystemDefault.DEFAULT_ROLE_NAME);
+                adminRole.setRemark(CardSystemDefault.DEFAULT_ROLE_NAME);
                 adminRole.setRoleType(RoleType.BuildIn);
                 adminRole.setIsAdmin(Boolean.TRUE);
                 adminRole.setRoleId(roleId);

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

@@ -18,7 +18,7 @@ import com.zhongshu.card.client.service.org.UserAccountService;
 import com.zhongshu.card.client.utils.type.*;
 import com.zhongshu.card.server.core.dao.org.*;
 import com.zhongshu.card.server.core.dao.school.DictInfoDao;
-import com.zhongshu.card.server.core.dataConfig.CardDefault;
+import com.zhongshu.card.server.core.dataConfig.CardSystemDefault;
 import com.zhongshu.card.server.core.domain.org.*;
 import com.zhongshu.card.server.core.domain.school.DictInfo;
 import com.zhongshu.card.server.core.service.base.SuperService;
@@ -140,7 +140,7 @@ public class UserAccountServiceImpl extends SuperService implements UserAccountS
                     return ResultContent.buildFail(validateResult.getMsg());
                 }
                 if (StringUtils.isEmpty(password)) {
-                    password = CardDefault.DEFAULT_PASSWORD;
+                    password = CardSystemDefault.DEFAULT_PASSWORD;
                 }
 
                 //权限中心：添加用户
@@ -253,7 +253,7 @@ public class UserAccountServiceImpl extends SuperService implements UserAccountS
         UserAccount userAccount = userCountDao.findTopByLoginName(loginName);
         if (ObjectUtils.isEmpty(userAccount)) {
             String cardNumber = param.getCardNumber();
-            String passWord = CardDefault.DEFAULT_PASSWORD;
+            String passWord = CardSystemDefault.DEFAULT_PASSWORD;
             if (ValidateUtils.isIDCard(cardNumber)) {
                 passWord = cardNumber.substring(12, 18);
                 passWord = passWord.toLowerCase().replace("x", "0");
@@ -454,7 +454,7 @@ public class UserAccountServiceImpl extends SuperService implements UserAccountS
             return ResultContent.buildFail(String.format(ResultMessage.DATA_NOT_EXIST, param.getUserId()));
         }
         com.github.microservice.auth.client.content.ResultContent<Void> resultContent =
-                userService.updateLoginPassword(param.getUserId(), CardDefault.DEFAULT_PASSWORD);
+                userService.updateLoginPassword(param.getUserId(), CardSystemDefault.DEFAULT_PASSWORD);
         if (resultContent.getState() != ResultState.Success) {
             return ResultContent.buildFail(resultContent.getMsg());
         }