This commit is contained in:
lcj
2025-07-25 15:58:03 +08:00
parent b9e9d6e855
commit eaac167036
785 changed files with 797 additions and 792 deletions

View File

@ -46,7 +46,12 @@ public class SysRegisterService {
String password = registerBody.getPassword();
// 校验用户类型是否存在
String userType = UserType.getUserType(registerBody.getUserType()).getUserType();
// 校验密码是否符合要求
String pattern = "^(?!.*\\s)(?!^[a-zA-Z]+$)(?!^[0-9]+$)(?!^[^a-zA-Z0-9]+$)(?!^[a-zA-Z0-9]+$).{8,18}$";
boolean isValid = password.matches(pattern);
if (!isValid) {
throw new UserException("注册失败密码需满足818位包含大小写字母、数字、特殊字符中的至少三种组合");
}
boolean captchaEnabled = captchaProperties.getEnable();
// 验证码开关
if (captchaEnabled) {

View File

@ -148,11 +148,11 @@ mybatis-plus:
# 自定义配置 是否全局开启逻辑删除 关闭后 所有逻辑删除功能将失效
enableLogicDelete: true
# 多包名使用 例如 org.dromara.**.mapper,org.xxx.**.mapper
mapperPackage: org.dromara.**.mapper
mapperPackage: org.dromara.**.mapper,org.dromara.app.**.mapper
# 对应的 XML 文件位置
mapperLocations: classpath*:mapper/**/*Mapper.xml
mapperLocations: classpath*:mapper/**/*Mapper.xml,classpath*:mapper/app/**/*Mapper.xml
# 实体扫描多个package用逗号或者分号分隔
typeAliasesPackage: org.dromara.**.domain
typeAliasesPackage: org.dromara.**.domain,org.dromara.app.**.domain
global-config:
dbConfig:
# 主键类型
@ -193,6 +193,7 @@ api-decrypt:
- /v3/api-docs/** # 放行OpenAPI文档
- /actuator/** # 放行监控接口
- /other/ys7Device/webhook # 放行萤石云设备回调接口
- /auth/register # 放行注册接口
springdoc:
api-docs:
@ -252,6 +253,8 @@ springdoc:
packages-to-scan: org.dromara.drone
- group: 20.代码生成模块
packages-to-scan: org.dromara.generator
- group: 16.app模块
packages-to-scan: org.dromara.app
# knife4j的增强配置不需要增强可以不配
knife4j:
enable: true

View File

@ -11,7 +11,7 @@ import java.util.Arrays;
import java.util.List;
/**
* @author lcj
* @author lilemy
* @date 2025/4/23 10:15
*/
@SpringBootTest

View File

@ -17,7 +17,7 @@ import java.util.Date;
import java.util.List;
/**
* @author lcj
* @author lilemy
* @date 2025/5/30 9:48
*/
@Slf4j

View File

@ -9,7 +9,7 @@ import java.util.HashMap;
import java.util.Map;
/**
* @author lcj
* @author lilemy
* @date 2025/7/7 10:13
*/
@Slf4j

View File

@ -11,7 +11,7 @@ import org.springframework.boot.test.context.SpringBootTest;
import java.util.List;
/**
* @author lcj
* @author lilemy
* @date 2025/7/21 11:35
*/
@Slf4j

View File

@ -11,7 +11,7 @@ import java.util.Date;
import java.util.List;
/**
* @author lcj
* @author lilemy
* @date 2025/7/22 15:36
*/
@SpringBootTest

View File

@ -11,7 +11,7 @@ import org.springframework.boot.test.context.SpringBootTest;
import java.util.List;
/**
* @author lcj
* @author lilemy
* @date 2025/6/12 17:06
*/
@Slf4j

View File

@ -3,7 +3,7 @@ package org.dromara.common.core.constant;
import java.util.regex.Pattern;
/**
* @author lcj
* @author lilemy
* @date 2025/4/7 17:12
*/
public interface DateConstant {

View File

@ -3,7 +3,7 @@ package org.dromara.common.core.domain.vo;
import lombok.Data;
/**
* @author lcj
* @author lilemy
* @date 2025/3/19 11:40
*/
@Data

View File

@ -14,7 +14,6 @@ import org.springframework.http.HttpMethod;
import org.springframework.util.CollectionUtils;
import org.springframework.util.PathMatcher;
import org.springframework.web.method.HandlerMethod;
import org.springframework.web.servlet.HandlerExceptionResolver;
import org.springframework.web.servlet.HandlerExecutionChain;
import org.springframework.web.servlet.mvc.method.annotation.RequestMappingHandlerMapping;
@ -46,7 +45,7 @@ public class CryptoFilter implements Filter {
//boolean responseFlag = apiEncrypt != null && apiEncrypt.response();
//直接全局加密
boolean responseFlag = true;
boolean responseFlag = false;
// 检查请求是否被排除
if (isExcludedPath(servletRequest.getRequestURI())) {
@ -58,8 +57,6 @@ public class CryptoFilter implements Filter {
return;
}
ServletRequest requestWrapper = null;
ServletResponse responseWrapper = null;
EncryptResponseBodyWrapper responseBodyWrapper = null;

View File

@ -3,7 +3,7 @@ package org.dromara.common.constant;
import java.io.File;
/**
* @author lcj
* @author lilemy
* @date 2025/4/23 11:09
*/
public interface DesignMapFileConstant {

View File

@ -1,7 +1,7 @@
package org.dromara.common.constant;
/**
* @author lcj
* @author lilemy
* @date 2025/4/24 17:44
*/
public interface GeoJsonConstant {

View File

@ -3,7 +3,7 @@ package org.dromara.common.enums;
import lombok.Getter;
/**
* @author lcj
* @author lilemy
* @date 2025/4/14 14:03
*/
@Getter

View File

@ -3,7 +3,7 @@ package org.dromara.common.enums;
import lombok.Getter;
/**
* @author lcj
* @author lilemy
* @date 2025/4/14 10:42
*/
@Getter

View File

@ -4,7 +4,7 @@ import java.math.BigDecimal;
import java.math.RoundingMode;
/**
* @author lcj
* @author lilemy
* @date 2025/5/27 9:16
*/
public class BigDecimalUtil {

View File

@ -18,7 +18,7 @@ import java.util.zip.ZipEntry;
import java.util.zip.ZipOutputStream;
/**
* @author lcj
* @author lilemy
* @date 2025/4/17 14:53
*/
public class DocumentUtil {

View File

@ -13,7 +13,7 @@ import java.util.Arrays;
import java.util.List;
/**
* @author lcj
* @author lilemy
* @date 2025/4/23 10:42
*/
@Slf4j

View File

@ -10,7 +10,7 @@ import org.springframework.stereotype.Component;
/**
* @author lcj
* @author lilemy
* @date 2025/6/25 10:57
*/
@Slf4j

View File

@ -16,7 +16,7 @@ import java.util.Map;
import java.util.stream.Collectors;
/**
* @author lcj
* @author lilemy
* @date 2025/4/24 11:48
*/
public class JSTUtil {

View File

@ -3,7 +3,7 @@ package org.dromara.common.utils;
import cn.hutool.json.JSONArray;
/**
* @author lcj
* @author lilemy
* @date 2025/5/30 14:55
*/
public class JsonDimensionUtil {

View File

@ -8,7 +8,7 @@ import java.util.List;
import java.util.function.Function;
/**
* @author lcj
* @author lilemy
* @date 2025/5/28 11:25
*/
public class PageConvertUtil {

View File

@ -19,7 +19,7 @@ import java.io.FileOutputStream;
import java.io.IOException;
/**
* @author lcj
* @author lilemy
* @date 2025/7/7 9:56
*/
public class PdfBoxQrCodeGenerator {

View File

@ -1,7 +1,7 @@
package org.dromara.contractor.constant;
/**
* @author lcj
* @author lilemy
* @date 2025/4/2 17:18
*/
public interface SubConstructionUserConstant {

View File

@ -30,7 +30,7 @@ import java.util.List;
/**
* 施工人员
*
* @author lcj
* @author lilemy
* @date 2025-03-07
*/
@Validated

View File

@ -25,7 +25,7 @@ import java.util.List;
/**
* 施工人员文件存储
*
* @author lcj
* @author lilemy
* @date 2025-04-01
*/
@Validated

View File

@ -28,7 +28,7 @@ import java.util.List;
/**
* 分包单位
*
* @author lcj
* @author lilemy
* @date 2025-03-07
*/
@Validated

View File

@ -28,7 +28,7 @@ import java.util.List;
/**
* 分包方物料
*
* @author lcj
* @author lilemy
* @date 2025-06-27
*/
@Validated

View File

@ -28,7 +28,7 @@ import java.util.List;
/**
* 分包方物料记录
*
* @author lcj
* @author lilemy
* @date 2025-06-27
*/
@Validated

View File

@ -28,7 +28,7 @@ import java.util.List;
/**
* 分包方工器具
*
* @author lcj
* @author lilemy
* @date 2025-06-26
*/
@Validated

View File

@ -26,7 +26,7 @@ import java.util.List;
/**
* 分包方工器具记录
*
* @author lcj
* @author lilemy
* @date 2025-06-26
*/
@Validated

View File

@ -26,7 +26,7 @@ import java.util.List;
/**
* 分包合同
*
* @author lcj
* @author lilemy
* @date 2025-06-25
*/
@Validated

View File

@ -12,7 +12,7 @@ import java.util.Date;
/**
* 施工人员对象 sub_construction_user
*
* @author lcj
* @author lilemy
* @date 2025-03-07
*/
@Data

View File

@ -11,7 +11,7 @@ import java.util.Date;
/**
* 施工人员文件存储对象 sub_construction_user_file
*
* @author lcj
* @author lilemy
* @date 2025-04-01
*/
@Data

View File

@ -11,7 +11,7 @@ import java.io.Serial;
/**
* 分包单位对象 sub_contractor
*
* @author lcj
* @author lilemy
* @date 2025-03-07
*/
@Data

View File

@ -12,7 +12,7 @@ import java.math.BigDecimal;
/**
* 分包方物料对象 sub_contractor_material
*
* @author lcj
* @author lilemy
* @date 2025-06-27
*/
@Data

View File

@ -13,7 +13,7 @@ import java.util.Date;
/**
* 分包方物料记录对象 sub_contractor_material_record
*
* @author lcj
* @author lilemy
* @date 2025-06-27
*/
@Data

View File

@ -12,7 +12,7 @@ import java.math.BigDecimal;
/**
* 分包方工器具对象 sub_contractor_tool
*
* @author lcj
* @author lilemy
* @date 2025-06-26
*/
@Data

View File

@ -15,7 +15,7 @@ import java.util.Date;
/**
* 分包方工器具记录对象 sub_contractor_tool_record
*
* @author lcj
* @author lilemy
* @date 2025-06-26
*/
@Data

View File

@ -12,7 +12,7 @@ import java.util.Date;
/**
* 分包合同对象 sub_subcontract
*
* @author lcj
* @author lilemy
* @date 2025-06-25
*/
@Data

View File

@ -7,7 +7,7 @@ import java.io.Serial;
import java.io.Serializable;
/**
* @author lcj
* @author lilemy
* @date 2025/4/7 15:04
*/
@Data

View File

@ -7,7 +7,7 @@ import java.io.Serial;
import java.io.Serializable;
/**
* @author lcj
* @author lilemy
* @date 2025/4/7 10:52
*/
@Data

View File

@ -9,7 +9,7 @@ import java.io.Serializable;
/**
* 根据项目id一键开关施工人员打卡状态
*
* @author lcj
* @author lilemy
* @date 2025/4/2 9:14
*/
@Data

View File

@ -10,7 +10,7 @@ import java.util.List;
/**
* 批量修改施工人员状态请求对象
*
* @author lcj
* @author lilemy
* @date 2025/4/1 17:11
*/
@Data

View File

@ -9,7 +9,7 @@ import java.io.Serializable;
/**
* 施工人员迁移请求对象
*
* @author lcj
* @author lilemy
* @date 2025/3/31 14:50
*/
@Data

View File

@ -6,7 +6,7 @@ import java.io.Serial;
import java.io.Serializable;
/**
* @author lcj
* @author lilemy
* @date 2025/3/5 14:05
*/
@Data

View File

@ -7,7 +7,7 @@ import java.io.Serial;
import java.io.Serializable;
/**
* @author lcj
* @author lilemy
* @date 2025/4/28 9:40
*/
@Data

View File

@ -6,7 +6,7 @@ import java.io.Serial;
import java.io.Serializable;
/**
* @author lcj
* @author lilemy
* @date 2025/3/5 14:31
*/
@Data

View File

@ -9,7 +9,7 @@ import java.io.Serializable;
/**
* 更新施工人员打卡状态
*
* @author lcj
* @author lilemy
* @date 2025/4/2 9:14
*/
@Data

View File

@ -7,7 +7,7 @@ import java.io.Serial;
import java.io.Serializable;
/**
* @author lcj
* @author lilemy
* @date 2025/3/5 15:04
*/
@Data

View File

@ -7,7 +7,7 @@ import java.io.Serial;
import java.io.Serializable;
/**
* @author lcj
* @author lilemy
* @date 2025/4/2 11:35
*/
@Data

View File

@ -6,7 +6,7 @@ import java.io.Serial;
import java.io.Serializable;
/**
* @author lcj
* @author lilemy
* @date 2025/4/1 10:06
*/
@Data

View File

@ -5,7 +5,7 @@ import lombok.Data;
import lombok.NoArgsConstructor;
/**
* @author lcj
* @author lilemy
* @date 2025/4/1 15:21
*/
@Data

View File

@ -7,7 +7,7 @@ import java.io.Serializable;
import java.util.List;
/**
* @author lcj
* @author lilemy
* @date 2025/4/1 10:01
*/
@Data

View File

@ -8,7 +8,7 @@ import java.io.Serializable;
import java.util.List;
/**
* @author lcj
* @author lilemy
* @date 2025/4/9 9:25
*/
@Data

View File

@ -7,7 +7,7 @@ import java.io.Serializable;
import java.util.Map;
/**
* @author lcj
* @author lilemy
* @date 2025/3/5 14:05
*/
@Data

View File

@ -6,7 +6,7 @@ import java.io.Serial;
import java.io.Serializable;
/**
* @author lcj
* @author lilemy
* @date 2025/3/5 14:31
*/
@Data

View File

@ -7,7 +7,7 @@ import java.io.Serializable;
import java.util.Map;
/**
* @author lcj
* @author lilemy
* @date 2025/3/5 15:04
*/
@Data

View File

@ -6,7 +6,7 @@ import java.io.Serial;
import java.io.Serializable;
/**
* @author lcj
* @author lilemy
* @date 2025/6/27 14:18
*/
@Data

View File

@ -6,7 +6,7 @@ import java.io.Serial;
import java.io.Serializable;
/**
* @author lcj
* @author lilemy
* @date 2025/6/27 14:20
*/
@Data

View File

@ -6,7 +6,7 @@ import java.io.Serial;
import java.io.Serializable;
/**
* @author lcj
* @author lilemy
* @date 2025/6/27 14:20
*/
@Data

View File

@ -9,7 +9,7 @@ import java.math.BigDecimal;
import java.util.Date;
/**
* @author lcj
* @author lilemy
* @date 2025/6/27 14:35
*/
@Data

View File

@ -6,7 +6,7 @@ import java.io.Serial;
import java.io.Serializable;
/**
* @author lcj
* @author lilemy
* @date 2025/6/27 14:36
*/
@Data

View File

@ -9,7 +9,7 @@ import java.math.BigDecimal;
import java.util.Date;
/**
* @author lcj
* @author lilemy
* @date 2025/6/27 14:36
*/
@Data

View File

@ -7,7 +7,7 @@ import java.io.Serializable;
import java.math.BigDecimal;
/**
* @author lcj
* @author lilemy
* @date 2025/6/26 15:26
*/
@Data

View File

@ -6,7 +6,7 @@ import java.io.Serial;
import java.io.Serializable;
/**
* @author lcj
* @author lilemy
* @date 2025/6/26 15:26
*/
@Data

View File

@ -7,7 +7,7 @@ import java.io.Serializable;
import java.math.BigDecimal;
/**
* @author lcj
* @author lilemy
* @date 2025/6/26 15:26
*/
@Data

View File

@ -9,7 +9,7 @@ import java.math.BigDecimal;
import java.util.Date;
/**
* @author lcj
* @author lilemy
* @date 2025/6/26 17:52
*/
@Data

View File

@ -6,7 +6,7 @@ import java.io.Serial;
import java.io.Serializable;
/**
* @author lcj
* @author lilemy
* @date 2025/6/26 17:52
*/
@Data

View File

@ -9,7 +9,7 @@ import java.math.BigDecimal;
import java.util.Date;
/**
* @author lcj
* @author lilemy
* @date 2025/6/26 17:52
*/
@Data

View File

@ -9,7 +9,7 @@ import java.math.BigDecimal;
import java.util.Date;
/**
* @author lcj
* @author lilemy
* @date 2025/6/25 16:36
*/
@Data

View File

@ -6,7 +6,7 @@ import java.io.Serial;
import java.io.Serializable;
/**
* @author lcj
* @author lilemy
* @date 2025/6/25 16:37
*/
@Data

View File

@ -9,7 +9,7 @@ import java.math.BigDecimal;
import java.util.Date;
/**
* @author lcj
* @author lilemy
* @date 2025/6/25 16:37
*/
@Data

View File

@ -3,7 +3,7 @@ package org.dromara.contractor.domain.enums;
import lombok.Getter;
/**
* @author lcj
* @author lilemy
* @date 2025/4/3 17:47
*/
@Getter

View File

@ -3,7 +3,7 @@ package org.dromara.contractor.domain.enums;
import lombok.Getter;
/**
* @author lcj
* @author lilemy
* @date 2025/6/27 10:30
*/
@Getter

View File

@ -13,7 +13,7 @@ import java.io.Serializable;
import java.util.Date;
/**
* @author lcj
* @author lilemy
* @date 2025/4/2 14:46
*/
@Data

View File

@ -10,7 +10,7 @@ import java.util.Date;
import java.util.List;
/**
* @author lcj
* @author lilemy
* @date 2025/4/8 17:38
*/
@Data

View File

@ -8,7 +8,7 @@ import java.io.Serializable;
import java.util.Date;
/**
* @author lcj
* @author lilemy
* @date 2025/4/7 15:06
*/
@Data

View File

@ -7,7 +7,7 @@ import java.io.Serializable;
/**
* @author lcj
* @author lilemy
* @date 2025/4/7 10:16
*/
@Data

View File

@ -6,7 +6,7 @@ import java.io.Serial;
import java.io.Serializable;
/**
* @author lcj
* @author lilemy
* @date 2025/4/28 9:33
*/
@Data

View File

@ -17,7 +17,7 @@ import java.util.Date;
/**
* 施工人员视图对象 bus_construction_user
*
* @author lcj
* @author lilemy
* @date 2025-03-07
*/
@Data

View File

@ -15,7 +15,7 @@ import java.io.Serializable;
/**
* 施工人员文件存储视图对象 bus_construction_user_file
*
* @author lcj
* @author lilemy
* @date 2025-04-01
*/
@Data

View File

@ -15,7 +15,7 @@ import java.util.Map;
/**
* 分包单位视图对象 sub_contractor
*
* @author lcj
* @author lilemy
* @date 2025-03-07
*/
@Data

View File

@ -17,7 +17,7 @@ import java.math.BigDecimal;
/**
* 分包方物料视图对象 sub_contractor_material
*
* @author lcj
* @author lilemy
* @date 2025-06-27
*/
@Data

View File

@ -17,7 +17,7 @@ import java.util.Date;
/**
* 分包方物料记录视图对象 sub_contractor_material_record
*
* @author lcj
* @author lilemy
* @date 2025-06-27
*/
@Data

View File

@ -17,7 +17,7 @@ import java.util.Date;
/**
* 分包方工器具视图对象 sub_contractor_tool
*
* @author lcj
* @author lilemy
* @date 2025-06-26
*/
@Data

View File

@ -16,7 +16,7 @@ import java.util.Date;
/**
* 分包方工器具记录视图对象 sub_contractor_tool_entry
*
* @author lcj
* @author lilemy
* @date 2025-06-26
*/
@Data

View File

@ -13,7 +13,7 @@ import java.util.Date;
/**
* 分包合同视图对象 sub_subcontract
*
* @author lcj
* @author lilemy
* @date 2025-06-25
*/
@Data

View File

@ -24,7 +24,7 @@ import java.util.Arrays;
import java.util.Map;
/**
* @author lcj
* @author lilemy
* @date 2025/7/21 15:57
*/
@Component

View File

@ -7,7 +7,7 @@ import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
/**
* 施工人员文件存储Mapper接口
*
* @author lcj
* @author lilemy
* @date 2025-04-01
*/
public interface SubConstructionUserFileMapper extends BaseMapperPlus<SubConstructionUserFile, SubConstructionUserFileVo> {

View File

@ -7,7 +7,7 @@ import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
/**
* 施工人员Mapper接口
*
* @author lcj
* @author lilemy
* @date 2025-03-07
*/
public interface SubConstructionUserMapper extends BaseMapperPlus<SubConstructionUser, SubConstructionUserVo> {

View File

@ -7,7 +7,7 @@ import org.dromara.contractor.domain.vo.contractor.SubContractorVo;
/**
* 分包单位Mapper接口
*
* @author lcj
* @author lilemy
* @date 2025-03-07
*/
public interface SubContractorMapper extends BaseMapperPlus<SubContractor, SubContractorVo> {

View File

@ -7,7 +7,7 @@ import org.dromara.contractor.domain.vo.contractormaterial.SubContractorMaterial
/**
* 分包方物料Mapper接口
*
* @author lcj
* @author lilemy
* @date 2025-06-27
*/
public interface SubContractorMaterialMapper extends BaseMapperPlus<SubContractorMaterial, SubContractorMaterialVo> {

View File

@ -7,7 +7,7 @@ import org.dromara.contractor.domain.vo.contractormaterialrecord.SubContractorMa
/**
* 分包方物料记录Mapper接口
*
* @author lcj
* @author lilemy
* @date 2025-06-27
*/
public interface SubContractorMaterialRecordMapper extends BaseMapperPlus<SubContractorMaterialRecord, SubContractorMaterialRecordVo> {

View File

@ -7,7 +7,7 @@ import org.dromara.contractor.domain.vo.contractortool.SubContractorToolVo;
/**
* 分包方工器具Mapper接口
*
* @author lcj
* @author lilemy
* @date 2025-06-26
*/
public interface SubContractorToolMapper extends BaseMapperPlus<SubContractorTool, SubContractorToolVo> {

View File

@ -7,7 +7,7 @@ import org.dromara.contractor.domain.vo.contractortoolentry.SubContractorToolRec
/**
* 分包方工器具记录Mapper接口
*
* @author lcj
* @author lilemy
* @date 2025-06-26
*/
public interface SubContractorToolRecordMapper extends BaseMapperPlus<SubContractorToolRecord, SubContractorToolRecordVo> {

View File

@ -7,7 +7,7 @@ import org.dromara.contractor.domain.vo.subcontract.SubSubcontractVo;
/**
* 分包合同Mapper接口
*
* @author lcj
* @author lilemy
* @date 2025-06-25
*/
public interface SubSubcontractMapper extends BaseMapperPlus<SubSubcontract, SubSubcontractVo> {

View File

@ -16,7 +16,7 @@ import java.util.List;
/**
* 施工人员文件存储Service接口
*
* @author lcj
* @author lilemy
* @date 2025-04-01
*/
public interface ISubConstructionUserFileService extends IService<SubConstructionUserFile> {

View File

@ -19,7 +19,7 @@ import java.util.List;
/**
* 施工人员Service接口
*
* @author lcj
* @author lilemy
* @date 2025-03-07
*/
public interface ISubConstructionUserService extends IService<SubConstructionUser> {

View File

@ -17,7 +17,7 @@ import java.util.List;
/**
* 分包方物料记录Service接口
*
* @author lcj
* @author lilemy
* @date 2025-06-27
*/
public interface ISubContractorMaterialRecordService extends IService<SubContractorMaterialRecord> {

Some files were not shown because too many files have changed in this diff Show More