group-four
/
cloud-car
5
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/dev' into dev

dev.business
Number7 2024-10-08 11:56:49 +08:00
parent d0e51b14b1 59c16de298
commit 6e5e07af85
10 changed files with 65 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
cloud-auth/src/main/java/com/muyu/auth/controller/TokenController.java
View File

@ -7,6 +7,7 @@ import com.muyu.auth.form.RegisterBody;
import com.muyu.auth.service.SysFirmService;
import com.muyu.auth.service.SysLoginService;
import com.muyu.cloud.common.many.datasource.constents.DatasourceContent;
import com.muyu.common.core.constant.SecurityConstants;
import com.muyu.common.core.domain.Result;
import com.muyu.common.core.utils.JwtUtils;
import com.muyu.common.core.utils.StringUtils;
@ -14,6 +15,8 @@ import com.muyu.common.security.auth.AuthUtil;
import com.muyu.common.security.service.TokenService;
import com.muyu.common.security.utils.SecurityUtils;
import com.muyu.common.system.domain.LoginUser;
import com.muyu.common.system.domain.SysUser;
import com.muyu.common.system.remote.RemoteUserService;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.tags.Tag;
import lombok.extern.log4j.Log4j2;
@ -32,6 +35,7 @@ import java.sql.Connection;
import java.sql.DriverManager;
import java.sql.SQLException;
import java.sql.Statement;
import java.util.Date;
/**
* token 控制
@ -51,6 +55,9 @@ public class TokenController {
@Autowired
private SysFirmService sysFirmService;
@Autowired
private RemoteUserService remoteUserService;
@PostMapping("login")
@Operation(summary = "登录", description = "登录")
public Result<?> login (@RequestBody LoginBody form) {
@ -120,6 +127,13 @@ public class TokenController {
} else {
log.warn("数据库 {} 创建成功", settlement.getDatabaseName());
SysUser sysUser = new SysUser();
sysUser.setCreateTime(new Date());
sysUser.setUserName(settlement.getFirmName());
sysUser.setDatabaseName(settlement.getDatabaseName());
remoteUserService.addUser(sysUser, SecurityConstants.INNER);
// 切换到新的数据库连接
Connection connection = null;
try {

9
cloud-common/cloud-common-system/src/main/java/com/muyu/common/system/remote/RemoteUserService.java
View File

@ -8,6 +8,7 @@ import com.muyu.common.system.domain.SysUser;
import com.muyu.common.system.remote.factory.RemoteUserFallbackFactory;
import com.muyu.common.system.domain.LoginUser;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
import java.util.List;
@ -52,4 +53,12 @@ public interface RemoteUserService {
*/
@PostMapping("/user/enterprise")
Result<Boolean>settlementEnterpriseInfo(@RequestBody Business enterprise, @RequestHeader(SecurityConstants.FROM_SOURCE) String source);
/**
* 用户添加
* @param sysUser
* @return
*/
@PostMapping("/user/addUser")
public Result<Integer> addUser(@RequestBody SysUser sysUser,@RequestHeader(SecurityConstants.FROM_SOURCE)String source);
}

6
cloud-common/cloud-common-system/src/main/java/com/muyu/common/system/remote/factory/RemoteUserFallbackFactory.java
View File

@ -45,6 +45,12 @@ public class RemoteUserFallbackFactory implements FallbackFactory<RemoteUserServ
return Result.error("入驻企业失败");
}
@Override
public Result<Integer> addUser(SysUser sysUser, String source) {
return Result.error("用户添加失败");
}
};
}
}

7
cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/controller/SysUserController.java
View File

@ -302,4 +302,11 @@ public class SysUserController extends BaseController {
public Result deptTree (SysDept dept) {
return success(deptService.selectDeptTreeList(dept));
}
@PostMapping("/addUser")
public Result<Integer> addUser(@RequestBody SysUser sysUser){
Integer i = userService.addUser(sysUser);
return Result.success(i);
}
}

3
cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/mapper/SysUserMapper.java
View File

@ -158,5 +158,8 @@ public interface SysUserMapper extends BaseMapper<SysUser> {
List<SysUser> selectCompanyList();
Integer addUser(SysUser sysUser);
}

1
cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/SysUserService.java
View File

@ -230,5 +230,6 @@ public interface SysUserService extends IService<SysUser> {
List<SysUser> selectCompanyList();
Integer addUser(SysUser sysUser);
}

5
cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/impl/SysUserServiceImpl.java
View File

@ -518,4 +518,9 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
return userMapper.selectCompanyList();
}
@Override
public Integer addUser(SysUser sysUser) {
return userMapper.addUser(sysUser);
}
}

8
cloud-modules/cloud-modules-system/src/main/resources/mapper/system/SysUserMapper.xml
View File

@ -24,6 +24,7 @@
<result property="updateBy" column="update_by"/>
<result property="updateTime" column="update_time"/>
<result property="remark" column="remark"/>
<result property="databaseName" column="database_name"/>
<association property="dept" javaType="com.muyu.common.system.domain.SysDept" resultMap="deptResult"/>
<collection property="roles" javaType="java.util.List" resultMap="RoleResult"/>
</resultMap>
@ -204,6 +205,7 @@
<if test="status != null and status != ''">status,</if>
<if test="createBy != null and createBy != ''">create_by,</if>
<if test="remark != null and remark != ''">remark,</if>
<if test="databaseName !=null and databaseName!=''">database_name,</if>
create_time
)values(
<if test="userId != null and userId != ''">#{userId},</if>
@ -218,6 +220,7 @@
<if test="status != null and status != ''">#{status},</if>
<if test="createBy != null and createBy != ''">#{createBy},</if>
<if test="remark != null and remark != ''">#{remark},</if>
<if test="databaseName!=null and databaseName!=''">#{databaseName}</if>
sysdate()
)
</insert>
@ -228,6 +231,11 @@
INSERT INTO `saas`.`tb_enterprise` (`enterprise_id`, `enterprise_name`, `enterprise_car_count`, `enterprise_fence_count`, `enterprise_database_name`)
VALUES (NULL, #{firmName}, 0, 0, #{databaseName});
</insert>
<insert id="addUser">
INSERT INTO `four`.`sys_user`
(`dept_id`, `user_name`, `nick_name`, `user_type`, `email`, `phonenumber`, `sex`, `avatar`, `password`, `status`, `del_flag`, `login_ip`, `login_date`, `create_by`, `create_time`, `update_by`, `update_time`, `remark`, `database_name`)
VALUES ( 105, #{userName}, '若依', '00', 'ry@qq.com', '15666666666', '1', '', '$2a$10$7JB720yubVSZvUI0rEqK/.VqGOZTH.ulu33dHOiBE8ByOhJIrdAu2', '0', '0', '47.101.53.251', '2024-05-23 15:08:18', 'admin', #{createTime}, '', NULL, '测试员', #{databaseName});
</insert>
<update id="updateUser" parameterType="com.muyu.common.system.domain.SysUser">
update sys_user

10
cloud-modules/saas/saas-server/src/main/java/com/muyu/server/controller/EnterpriseController.java
View File

@ -6,6 +6,7 @@ import com.muyu.common.core.constant.SecurityConstants;
import com.muyu.common.core.domain.Result;
import com.muyu.common.domain.Enterprise;
import com.muyu.common.system.domain.Business;
import com.muyu.common.system.domain.SysUser;
import com.muyu.common.system.remote.RemoteUserService;
import com.muyu.common.util.PageUtils;
import com.muyu.server.controller.form.DeleteEnterpriseByIds;
@ -27,6 +28,7 @@ import java.sql.Connection;
import java.sql.DriverManager;
import java.sql.SQLException;
import java.sql.Statement;
import java.util.Date;
import java.util.HashMap;
import java.util.Map;
@ -95,8 +97,14 @@ public class EnterpriseController {
business.setDatabaseName(form.getEnterpriseDatabaseName());
remoteUserService.settlementEnterpriseInfo(business, SecurityConstants.INNER);
SysUser sysUser = new SysUser();
sysUser.setDatabaseName(form.getEnterpriseDatabaseName());
sysUser.setUserName(form.getEnterpriseName());
sysUser.setCreateTime(new Date());
remoteUserService.addUser(sysUser, SecurityConstants.INNER);
String createDatabaseUrl="jdbc:mysql://"+ DatasourceContent.IP+":"+DatasourceContent.PORT+"?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8";
String createDatabaseSql = "CREATE DATABASE IF NOT EXISTS " + form.getEnterpriseDatabaseName() + ";";
try (Connection adminConn = DriverManager.getConnection(createDatabaseUrl, DatasourceContent.USER_NAME, DatasourceContent.PASSWORD);
Statement stmt = adminConn.createStatement()) {
@ -122,6 +130,8 @@ public class EnterpriseController {
ClassPathResource rc = new ClassPathResource("static/saas.sql");
EncodedResource er = new EncodedResource(rc, "utf-8");
ScriptUtils.executeSqlScript(connection, er);
}
} catch (SQLException e) {

3
cloud-modules/saas/saas-server/src/main/java/com/muyu/server/controller/TemplateController.java
View File

@ -17,7 +17,8 @@ import java.util.List;
import java.util.concurrent.ExecutionException;
/**
* @Author：liuxinyue
* 报文模版管理
* @author liuxinyue
* @Package：com.template.controller
* @Project：cloud-server-c
* @name：TemplateController