submit

run-prod.sh

@@ -1,42 +1,3 @@
-#!/usr/bin/env bash
-# 定义应用组名
-group_name='zhichen'
-# 定义应用名称
-app_name='zhichen-saas-api'
-# 定义应用版本
-app_version='1.0-SNAPSHOT'
-# 定义应用环境
-profile_active='prod'
-echo '----copy jar----'
-docker stop ${app_name}
-echo '----stop container----'
-docker rm ${app_name}
-echo '----rm container----'
-docker rmi ${group_name}/${app_name}:${app_version}
-echo '----rm image----'
-# 打包编译docker镜像
-docker build -f /mydata/maven/build/Dockerfile -t ${group_name}/${app_name}:${app_version} .
-echo '----build image----'
-docker run -p 5055:5055 --name ${app_name} \
---restart=always \
--e 'spring.profiles.active'=${profile_active} \
--e TZ="Asia/Shanghai" \
--m 10240m \
---cpus=3 \
---log-opt max-size=50m \
---log-opt max-file=3 \
--v /etc/localtime:/etc/localtime \
--v /usr/share/fonts:/usr/share/fonts \
--v /data/logs/prod_api:/logs \
--v /mydata/app/${app_name}/logs:/var/logs \
--d ${group_name}/${app_name}:${app_version}
-echo '----start container----'
-
-echo "开始等待20秒..."
-# 1-10秒内随机
-sleep 5
-echo "等待后继续"
-
 #!/usr/bin/env bash
 # 定义应用组名
 group_admin_name='zhichen'

zhichen-framework/src/main/java/com/zhichen/framework/web/service/SysTenantServiceImpl.java

@@ -180,35 +180,35 @@ public class SysTenantServiceImpl extends ServiceImpl<SysTenantMapper, SysTenant
     @Override
     @Transactional(rollbackFor = Exception.class)
     public Long createTenantAdmin(SysTenantAdminBo bo) {
-        if(Validator.isEmpty(bo.getTenantName())){
-            throw new CustomException("没有企业名称");
-        }
+//        if(Validator.isEmpty(bo.getTenantName())){
+//            throw new CustomException("没有企业名称");
+//        }
         //中正后台企业ID
-        Long tenantId = 867735392558919680L;
+        Long tenantId = 1L;
         //设置新机构
-        SysTenant sysTenant = getById(tenantId);
-        sysTenant.setTenantName(bo.getTenantName());
-        sysTenant.setHostPc(bo.getHostPc());
-        sysTenant.setHostH5(bo.getHostH5());
-        sysTenant.setHostLive(bo.getHostLive());
-        sysTenant.setHostH5Seller(null);
-        sysTenant.setHostAdmin(null);
+//        SysTenant sysTenant = getById(tenantId);
+//        sysTenant.setTenantName(bo.getTenantName());
+//        sysTenant.setHostPc(bo.getHostPc());
+//        sysTenant.setHostH5(bo.getHostH5());
+//        sysTenant.setHostLive(bo.getHostLive());
+//        sysTenant.setHostH5Seller(null);
+//        sysTenant.setHostAdmin(null);
         //生成tenantId
-        Long newTenantId = createTenantId();
-        sysTenant.setTenantId(newTenantId);
-        if (!save(sysTenant)){
-            throw new CustomException("创建企业失败");
-        }
-        //创建账号
-        SysUser admin = userService.selectUserByTenant("admin",tenantId);
-        admin.setTenantId(newTenantId);
-        admin.setUserId(null);
-        if(Validator.isNotEmpty(bo.getPassword())){
-            admin.setPassword(SecurityUtils.encryptPassword(bo.getPassword()));
-        }
-        if (!userService.save(admin)){
-            throw new CustomException("创建后台账号失败");
-        }
+        Long newTenantId = bo.getTenantId();
+//        sysTenant.setTenantId(newTenantId);
+//        if (!save(sysTenant)){
+//            throw new CustomException("创建企业失败");
+//        }
+//        //创建账号
+//        SysUser admin = userService.selectUserByTenant("admin",tenantId);
+//        admin.setTenantId(newTenantId);
+//        admin.setUserId(null);
+//        if(Validator.isNotEmpty(bo.getPassword())){
+//            admin.setPassword(SecurityUtils.encryptPassword(bo.getPassword()));
+//        }
+//        if (!userService.save(admin)){
+//            throw new CustomException("创建后台账号失败");
+//        }
         //创建菜单
         List<SysMenu> list = menuService.listSysMenuByTenant(tenantId);
         if (CollectionUtils.isEmpty(list)){
@@ -250,7 +250,7 @@ public class SysTenantServiceImpl extends ServiceImpl<SysTenantMapper, SysTenant
         });
 
         //新增分销角色
-        initRoles(newTenantId,tenantId);
+//        initRoles(newTenantId,tenantId);
 
         //初始化配置和字典
         initConfigAndDict(newTenantId,tenantId);

zhichen-system/src/main/java/com/zhichen/modules/system/bo/SysTenantAdminBo.java

@@ -15,6 +15,9 @@ public class SysTenantAdminBo implements Serializable {
     @ApiModelProperty("机构名称")
     private String tenantName;
 
+    @ApiModelProperty("机构名称")
+    private Long tenantId;
+
     /** PC域名 */
     @ApiModelProperty("PC域名")
     private String hostPc;