@ -2,6 +2,7 @@ package com.cloud.kicc.system.service.impl;
@@ -2,6 +2,7 @@ package com.cloud.kicc.system.service.impl;
import cn.hutool.core.lang.Validator ;
import cn.hutool.core.text.CharSequenceUtil ;
import cn.hutool.core.util.ArrayUtil ;
import cn.hutool.core.util.ObjectUtil ;
import cn.javaer.aliyun.sms.SmsClient ;
import com.baomidou.dynamic.datasource.annotation.DSTransactional ;
@ -13,9 +14,12 @@ import com.cloud.kicc.common.core.exception.CheckedException;
@@ -13,9 +14,12 @@ import com.cloud.kicc.common.core.exception.CheckedException;
import com.cloud.kicc.common.core.exception.ValidateCodeException ;
import com.cloud.kicc.common.data.entity.KiccUser ;
import com.cloud.kicc.common.data.entity.SsoUser ;
import com.cloud.kicc.common.security.util.SecurityUtils ;
import com.cloud.kicc.commonbiz.api.feign.RemotePushConcernFanService ;
import com.cloud.kicc.system.api.entity.Dept ;
import com.cloud.kicc.system.api.entity.User ;
import com.cloud.kicc.system.api.entity.UserRole ;
import com.cloud.kicc.system.api.enums.UserTypeEnum ;
import com.cloud.kicc.system.service.* ;
import lombok.AllArgsConstructor ;
import lombok.extern.slf4j.Slf4j ;
@ -49,6 +53,7 @@ public class AppServiceImpl implements AppService {
@@ -49,6 +53,7 @@ public class AppServiceImpl implements AppService {
private final DeptService deptService ;
private final UserRoleService userRoleService ;
private final ISsoUserService iSsoUserService ;
private final RemotePushConcernFanService remotePushConcernFanService ;
/ * *
* 发送手机验证码
@ -90,7 +95,7 @@ public class AppServiceImpl implements AppService {
@@ -90,7 +95,7 @@ public class AppServiceImpl implements AppService {
String execAdminUserId = configService . getValueByKey ( "app.exec.admin.userId" ) ;
KiccUser kiccUser = userService . getUserById ( execAdminUserId ) ;
Optional . ofNullable ( kiccUser ) . orElseThrow ( ( ) - > new CheckedException ( "当前系统管理执行用户无效请重新在参数管理中配置!" ) ) ;
String initUserType = configService . getValueByKey ( "app.init.deptId " ) ;
String initUserType = configService . getValueByKey ( "app.init.normal.userType " ) ;
String initTenantId = configService . getValueByKey ( "app.init.tenantId" ) ;
String initRoleIds = configService . getValueByKey ( "app.init.roleIds" ) ;
String initPassword = configService . getValueByKey ( "appid.password" ) ;
@ -135,6 +140,11 @@ public class AppServiceImpl implements AppService {
@@ -135,6 +140,11 @@ public class AppServiceImpl implements AppService {
ur . setTenantId ( initTenantId ) ;
return ur ;
} ) . collect ( Collectors . toList ( ) ) ) ;
// 创建系统中的用户强制关联内部企业
List < User > enterpriseUserList = userService . list ( Wrappers . < User > lambdaQuery ( ) . in ( User : : getUserType , UserTypeEnum . INTERNAL_USER . getValue ( ) ) ) ;
remotePushConcernFanService . bindConcernEnterpriseUser ( user . getId ( ) , enterpriseUserList ) ;
// 处理原密码给到APP自动一键登陆
ssoUser . setPassword ( initPassword ) ;
return ssoUser ;