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

Compare commits

base: group-four:fe90a341ff33dbd2f6f59a831c42fd370e1adfd6
Branches Tags
group-four:dev
group-four:dev.template
group-four:dev.business
group-four:dev.vehiclegateway
group-four:dev.operation
group-four:dev.event
group-four:master
..
compare: group-four:e8bc92c658675643d1442a672bf06628460923e5
Branches Tags
group-four:dev
group-four:dev.template
group-four:dev.business
group-four:dev.vehiclegateway
group-four:dev.operation
group-four:dev.event
group-four:master

No commits in common. "fe90a341ff33dbd2f6f59a831c42fd370e1adfd6" and "e8bc92c658675643d1442a672bf06628460923e5" have entirely different histories.
fe90a341ff ... e8bc92c658

17 changed files with 19 additions and 242 deletions
Show Stats Expand all files Collapse all files

4
cloud-auth/pom.xml
View File

@ -57,10 +57,6 @@
<groupId>com.muyu</groupId>
<artifactId>cloud-common-api-doc</artifactId>
</dependency>
<dependency>
<groupId>com.mysql</groupId>
<artifactId>mysql-connector-j</artifactId>
</dependency>
</dependencies>

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

@ -1,10 +1,7 @@
package com.muyu.auth.controller;
import com.muyu.auth.form.EnterpriseSettlement;
import com.muyu.auth.form.Firm;
import com.muyu.auth.form.LoginBody;
import com.muyu.auth.form.RegisterBody;
import com.muyu.auth.service.SysFirmService;
import com.muyu.auth.service.SysLoginService;
import com.muyu.common.core.domain.Result;
import com.muyu.common.core.utils.JwtUtils;
@ -34,16 +31,8 @@ public class TokenController {
@Autowired
private SysLoginService sysLoginService;
@Autowired
private SysFirmService sysFirmService;
@PostMapping("login")
public Result<?> login (@RequestBody LoginBody form) {
//查询企业是否存在
Firm firm = sysFirmService.findFirmByName(form.getFirmName());
if (firm.getDatabaseName() == null){
return Result.error(null,"企业不存在");
}
// 用户登录
LoginUser userInfo = sysLoginService.login(form.getUsername(), form.getPassword());
// 获取登录token
@ -80,10 +69,4 @@ public class TokenController {
sysLoginService.register(registerBody.getUsername(), registerBody.getPassword());
return Result.success();
}
@PostMapping("/enterprise")
public Result<?> enterprise( @RequestBody EnterpriseSettlement settlement){
sysLoginService.enterprise(settlement.getDatabaseName(),settlement.getFirmName());
return Result.success();
}
}

8
cloud-auth/src/main/java/com/muyu/auth/form/Firm.java → cloud-auth/src/main/java/com/muyu/auth/form/Enterprise.java
View File

@ -3,19 +3,15 @@ package com.muyu.auth.form;
import lombok.Data;
/**
* 企业登录对象
* 企业入驻对象
* @author 袁子龙
* @package com.muyu.auth.form
* @name Enterprise
* @date 2024/9/30 10:30
*/
@Data
public class Firm {
public class Enterprise {
/**
* 企业id
*/
private Integer id;
/**
* 企业名称
*/

23
cloud-auth/src/main/java/com/muyu/auth/form/EnterpriseSettlement.java
View File

@ -1,23 +0,0 @@
package com.muyu.auth.form;
import lombok.Data;
/**
* 企业入驻
* @author 袁子龙
* @package com.muyu.auth.form
* @name EnterpriseSettlement
* @date 2024/9/30 11:25
*/
@Data
public class EnterpriseSettlement {
/**
* 企业名称
*/
private String firmName;
/**
* 数据库名称
*/
private String databaseName;
}

21
cloud-auth/src/main/java/com/muyu/auth/form/LoginBody.java
View File

@ -1,14 +1,10 @@
package com.muyu.auth.form;
import lombok.Data;
/**
* 用户登录对象
*
* @author muyu
*/
@Data
public class LoginBody {
/**
* 用户名
@ -20,11 +16,20 @@ public class LoginBody {
*/
private String password;
/**
* 企业名称
*/
private String firmName;
public String getUsername () {
return username;
}
public void setUsername (String username) {
this.username = username;
}
public String getPassword () {
return password;
}
public void setPassword (String password) {
this.password = password;
}
}

57
cloud-auth/src/main/java/com/muyu/auth/service/SysFirmService.java
View File

@ -1,57 +0,0 @@
package com.muyu.auth.service;
import com.muyu.auth.form.Firm;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
import org.springframework.data.redis.core.RedisTemplate;
import java.sql.Connection;
import java.sql.DriverManager;
import java.sql.ResultSet;
import java.sql.Statement;
/**
* 数据源
* @author 袁子龙
* @package com.muyu.auth.service
* @name SysFirmService
* @date 2024/9/30 11:05
*/
@Component
public class SysFirmService {
//数据库账号
static final String USER="root";
//数据库密码
static final String PASSWORD="Lw030106";
@Autowired
private RedisTemplate redisTemplate;
public Firm findFirmByName(String firmName){
Firm firm = new Firm();
try {
DriverManager.registerDriver(new com.mysql.cj.jdbc.Driver());
Connection connection= DriverManager.getConnection("jdbc:mysql://47.101.53.251:3306/datasource?useUnicode=true&characterEncoding=utf8&serverTimezone=GMT&useSSL=false",USER,PASSWORD);
String sql="select * from `datasource` where firm_name = '"+firmName+"'";
Statement stmt = connection.createStatement();
ResultSet rs = stmt.executeQuery(sql);
while (rs.next()){
firm.setId(rs.getInt("id"));
firm.setFirmName(rs.getString("firm_name"));
firm.setDatabaseName(rs.getString("database_name"));
}
} catch (Exception e) {
throw new RuntimeException(e);
}
//数据源不为空
if (firm!=null){
redisTemplate.opsForValue().set("datasource",firm.getDatabaseName());
}
return firm;
};
}

27
cloud-auth/src/main/java/com/muyu/auth/service/SysLoginService.java
View File

@ -1,6 +1,5 @@
package com.muyu.auth.service;
import com.muyu.auth.form.EnterpriseSettlement;
import com.muyu.common.core.constant.CacheConstants;
import com.muyu.common.core.constant.Constants;
import com.muyu.common.core.constant.SecurityConstants;
@ -13,7 +12,6 @@ import com.muyu.common.core.utils.StringUtils;
import com.muyu.common.core.utils.ip.IpUtils;
import com.muyu.common.redis.service.RedisService;
import com.muyu.common.security.utils.SecurityUtils;
import com.muyu.common.system.domain.Enterprise;
import com.muyu.common.system.remote.RemoteUserService;
import com.muyu.common.system.domain.SysUser;
import com.muyu.common.system.domain.LoginUser;
@ -126,29 +124,4 @@ public class SysLoginService {
}
recordLogService.recordLogininfor(username, Constants.REGISTER, "注册成功");
}
/**
* 企业入驻
* @param databaseName
* @param fileName
*/
public void enterprise (String databaseName,String fileName) {
// 参数校验 数据库名或企业名称不能为空
if (StringUtils.isAnyBlank(databaseName, fileName)) {
throw new ServiceException("数据库名或企业名称不能为空");
}
if (databaseName.length() < UserConstants.PASSWORD_MIN_LENGTH || databaseName.length() > UserConstants.PASSWORD_MAX_LENGTH) {
throw new ServiceException("数据库名长度必须在5到20个字符之间");
}
if (fileName.length() < UserConstants.Firm_NAME_MIN_LENGTH || fileName.length() > UserConstants.Firm_NAME_MAX_LENGTH) {
throw new ServiceException("企业名称长度必须在2到20个字符之间");
}
Enterprise settlement = new Enterprise();
settlement.setDatabaseName(databaseName);
settlement.setFirmName(fileName);
remoteUserService.settlementEnterpriseInfo(settlement, SecurityConstants.INNER);
}
}

12
cloud-common/cloud-common-core/src/main/java/com/muyu/common/core/constant/UserConstants.java
View File

@ -110,16 +110,4 @@ public class UserConstants {
public static final int PASSWORD_MIN_LENGTH = 5;
public static final int PASSWORD_MAX_LENGTH = 20;
/**
* 企业名称长度限制
*/
public static final int Firm_NAME_MIN_LENGTH = 2;
public static final int Firm_NAME_MAX_LENGTH = 20;
/**
* 数据库名称长度限制
*/
public static final int DATABASE_NAME_MIN_LENGTH = 2;
public static final int DATABASE_NAME_MAX_LENGTH = 20;
}

42
cloud-common/cloud-common-system/src/main/java/com/muyu/common/system/domain/Enterprise.java
View File

@ -1,42 +0,0 @@
package com.muyu.common.system.domain;
import com.muyu.common.core.annotation.Excel;
import com.muyu.common.core.annotation.Excel.ColumnType;
import com.muyu.common.core.web.domain.BaseEntity;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.NoArgsConstructor;
import lombok.experimental.SuperBuilder;
/**
* 企业对象
* @author 袁子龙
* @package com.muyu.common.system.domain
* @name Enterprise
* @date 2024/9/30 12:05
*/
@Data
@SuperBuilder
@NoArgsConstructor
@AllArgsConstructor
@EqualsAndHashCode(callSuper = true)
public class Enterprise extends BaseEntity {
private static final long serialVersionUID = 1L;
/**
* 企业Id
*/
@Excel(name = "企业序号",cellType = ColumnType.NUMERIC, prompt = "企业编号")
private Integer id;
/**
* 企业名称
*/
@Excel(name = "企业名称")
private String firmName;
/**
* 数据库名称
*/
@Excel(name = "数据库名称")
private String databaseName;
}

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

@ -4,7 +4,6 @@ import com.muyu.common.core.constant.SecurityConstants;
import com.muyu.common.core.constant.ServiceNameConstants;
import com.muyu.common.core.domain.Result;
import com.muyu.common.core.web.page.TableDataInfo;
import com.muyu.common.system.domain.Enterprise;
import com.muyu.common.system.domain.SysFirmUser;
import com.muyu.common.system.domain.SysUser;
import com.muyu.common.system.remote.factory.RemoteUserFallbackFactory;
@ -45,13 +44,4 @@ public interface RemoteUserService {
@GetMapping("/user/companyList")
Result<List<SysUser>> companyList();
/**
* 入驻企业信息
* @param enterprise
* @param source
* @return
*/
@PostMapping("/user/settlement")
Result<Boolean>settlementEnterpriseInfo(@RequestBody Enterprise enterprise, @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

@ -2,7 +2,6 @@ package com.muyu.common.system.remote.factory;
import com.muyu.common.core.domain.Result;
import com.muyu.common.core.web.page.TableDataInfo;
import com.muyu.common.system.domain.Enterprise;
import com.muyu.common.system.domain.SysFirmUser;
import com.muyu.common.system.remote.RemoteUserService;
import com.muyu.common.system.domain.SysUser;
@ -42,11 +41,6 @@ public class RemoteUserFallbackFactory implements FallbackFactory<RemoteUserServ
return Result.error("获取企业列表失败:" + throwable.getMessage());
}
@Override
public Result<Boolean> settlementEnterpriseInfo(Enterprise enterprise, String source) {
return Result.error("入驻企业失败");
}
};
}
}

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

@ -10,7 +10,10 @@ import com.muyu.common.log.enums.BusinessType;
import com.muyu.common.security.annotation.InnerAuth;
import com.muyu.common.security.annotation.RequiresPermissions;
import com.muyu.common.security.utils.SecurityUtils;
import com.muyu.common.system.domain.*;
import com.muyu.common.system.domain.SysDept;
import com.muyu.common.system.domain.SysRole;
import com.muyu.common.system.domain.SysUser;
import com.muyu.common.system.domain.LoginUser;
import com.muyu.system.domain.resp.AuthRoleResp;
import com.muyu.system.domain.resp.UserDetailInfoResp;
import com.muyu.system.domain.resp.UserInfoResp;
@ -133,15 +136,6 @@ public class SysUserController extends BaseController {
return Result.success(userService.registerUser(sysUser));
}
/**
* 入驻企业信息
*/
@InnerAuth
@PostMapping("/enterprise")
public Result<Boolean> enterprise (@RequestBody Enterprise enterprise){
return Result.success(userService.enterprise(enterprise));
}
/**
* 获取用户信息
*

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

@ -1,7 +1,6 @@
package com.muyu.system.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.muyu.common.system.domain.Enterprise;
import com.muyu.common.system.domain.SysUser;
import org.apache.ibatis.annotations.Param;
@ -67,8 +66,6 @@ public interface SysUserMapper extends BaseMapper<SysUser> {
*/
int insertUser(SysUser user);
int enterprise(Enterprise enterprise);
/**
* 修改用户信息
*
@ -145,6 +142,4 @@ public interface SysUserMapper extends BaseMapper<SysUser> {
List<SysUser> selectCompanyList();
}

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

@ -1,7 +1,6 @@
package com.muyu.system.service;
import com.baomidou.mybatisplus.extension.service.IService;
import com.muyu.common.system.domain.Enterprise;
import com.muyu.common.system.domain.SysUser;
import java.util.List;
@ -134,7 +133,6 @@ public interface SysUserService extends IService<SysUser> {
*/
boolean registerUser(SysUser user);
boolean enterprise(Enterprise enterprise);
/**
* 修改用户信息
*
@ -230,5 +228,4 @@ public interface SysUserService extends IService<SysUser> {
List<SysUser> selectCompanyList();
}

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

@ -8,7 +8,6 @@ import com.muyu.common.core.utils.StringUtils;
import com.muyu.common.core.utils.bean.BeanValidators;
import com.muyu.common.datascope.annotation.DataScope;
import com.muyu.common.security.utils.SecurityUtils;
import com.muyu.common.system.domain.Enterprise;
import com.muyu.common.system.domain.SysRole;
import com.muyu.common.system.domain.SysUser;
import com.muyu.system.domain.SysPost;
@ -258,11 +257,6 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
return userMapper.insertUser(user) > 0;
}
@Override
public boolean enterprise(Enterprise enterprise){
return userMapper.enterprise(enterprise) > 0;
}
/**
* 修改保存用户信息
*

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

@ -221,9 +221,6 @@
sysdate()
)
</insert>
<insert id="enterprise">
INSERT INTO `datasource`.`datasource` (`id`, `firm_name`, `database_name`) VALUES (NULL, #{firmName}, #{databaseName});
</insert>
<update id="updateUser" parameterType="com.muyu.common.system.domain.SysUser">
update sys_user

3
cloud-modules/saas/saas-server/src/main/resources/bootstrap.yml
View File

@ -11,9 +11,6 @@ nacos:
# SPRING_AMQP_DESERIALIZATION_TRUST_ALL=true spring.amqp.deserialization.trust.all
# Spring
spring:
mvc:
pathmatch:
matching-strategy: ant_path_matcher
amqp:
deserialization:
trust: