From 010f5c0e6e90fe0c26684486bab80d40498ae31f Mon Sep 17 00:00:00 2001 From: "HUOJIN\\92525" Date: Fri, 31 Oct 2025 18:02:59 +0800 Subject: [PATCH] no message --- .../src/main/java/org/jeecg/common/api/vo/Result.java | 2 +- .../main/java/org/jeecg/common/aspect/AutoLogAspect.java | 2 +- .../java/org/jeecg/common/aspect/annotation/AutoDict.java | 2 +- .../java/org/jeecg/common/aspect/annotation/AutoLog.java | 2 +- .../src/main/java/org/jeecg/common/util/IpUtils.java | 2 +- .../src/main/java/org/jeecg/config/Swagger3Config.java | 4 ++-- .../org/cpte/modules/base/controller/AreaController.java | 7 +++---- .../src/main/java/org/cpte/modules/base/entity/Area.java | 7 +++---- .../main/java/org/cpte/modules/base/mapper/AreaMapper.java | 2 +- .../java/org/cpte/modules/base/service/IAreaService.java | 2 +- .../cpte/modules/base/service/impl/AreaServiceImpl.java | 2 +- .../src/main/resources/application-dev.yml | 6 +++--- .../src/main/resources/application-prod.yml | 6 +++--- 13 files changed, 22 insertions(+), 24 deletions(-) diff --git a/cpte-boot-base-core/src/main/java/org/jeecg/common/api/vo/Result.java b/cpte-boot-base-core/src/main/java/org/jeecg/common/api/vo/Result.java index 902c667..e8d1382 100644 --- a/cpte-boot-base-core/src/main/java/org/jeecg/common/api/vo/Result.java +++ b/cpte-boot-base-core/src/main/java/org/jeecg/common/api/vo/Result.java @@ -11,7 +11,7 @@ import java.io.Serializable; /** * 接口返回数据格式 * @author scott - * @email jeecgos@163.com + * @email cpteos@163.com * @date 2019年1月19日 */ @Data diff --git a/cpte-boot-base-core/src/main/java/org/jeecg/common/aspect/AutoLogAspect.java b/cpte-boot-base-core/src/main/java/org/jeecg/common/aspect/AutoLogAspect.java index 28f7cab..ef21a9f 100644 --- a/cpte-boot-base-core/src/main/java/org/jeecg/common/aspect/AutoLogAspect.java +++ b/cpte-boot-base-core/src/main/java/org/jeecg/common/aspect/AutoLogAspect.java @@ -36,7 +36,7 @@ import java.util.Date; * 系统日志，切面处理类 * * @Author scott - * @email jeecgos@163.com + * @email cpteos@163.com * @Date 2018年1月14日 */ @Aspect diff --git a/cpte-boot-base-core/src/main/java/org/jeecg/common/aspect/annotation/AutoDict.java b/cpte-boot-base-core/src/main/java/org/jeecg/common/aspect/annotation/AutoDict.java index a6537cb..0ea8cdb 100644 --- a/cpte-boot-base-core/src/main/java/org/jeecg/common/aspect/annotation/AutoDict.java +++ b/cpte-boot-base-core/src/main/java/org/jeecg/common/aspect/annotation/AutoDict.java @@ -6,7 +6,7 @@ import java.lang.annotation.*; * 通过此注解声明的接口，自动实现字典翻译 * * @Author scott - * @email jeecgos@163.com + * @email cpteos@163.com * @Date 2022年01月05日 */ @Target(ElementType.METHOD) diff --git a/cpte-boot-base-core/src/main/java/org/jeecg/common/aspect/annotation/AutoLog.java b/cpte-boot-base-core/src/main/java/org/jeecg/common/aspect/annotation/AutoLog.java index 5206f60..0515dd1 100644 --- a/cpte-boot-base-core/src/main/java/org/jeecg/common/aspect/annotation/AutoLog.java +++ b/cpte-boot-base-core/src/main/java/org/jeecg/common/aspect/annotation/AutoLog.java @@ -9,7 +9,7 @@ import java.lang.annotation.*; * 系统日志注解 * * @Author scott - * @email jeecgos@163.com + * @email cpteos@163.com * @Date 2019年1月14日 */ @Target(ElementType.METHOD) diff --git a/cpte-boot-base-core/src/main/java/org/jeecg/common/util/IpUtils.java b/cpte-boot-base-core/src/main/java/org/jeecg/common/util/IpUtils.java index eda4950..bdbf2af 100644 --- a/cpte-boot-base-core/src/main/java/org/jeecg/common/util/IpUtils.java +++ b/cpte-boot-base-core/src/main/java/org/jeecg/common/util/IpUtils.java @@ -16,7 +16,7 @@ import java.util.regex.Pattern; * IP地址 * * @Author scott - * @email jeecgos@163.com + * @email cpteos@163.com * @Date 2019年01月14日 */ public class IpUtils { diff --git a/cpte-boot-base-core/src/main/java/org/jeecg/config/Swagger3Config.java b/cpte-boot-base-core/src/main/java/org/jeecg/config/Swagger3Config.java index 56888f8..def1fb1 100644 --- a/cpte-boot-base-core/src/main/java/org/jeecg/config/Swagger3Config.java +++ b/cpte-boot-base-core/src/main/java/org/jeecg/config/Swagger3Config.java @@ -116,9 +116,9 @@ public class Swagger3Config implements WebMvcConfigurer { public OpenAPI customOpenAPI() { return new OpenAPI() .info(new Info() - .title("JeecgBoot 后台服务API接口文档") + .title("Cpte Cloud 后台服务API接口文档") .version("3.8.3") - .contact(new Contact().name("北京国炬信息技术有限公司").url("www.jeccg.com").email("jeecgos@163.com")) + .contact(new Contact().name("中邮科技股份有限公司").url("www.cpte.com").email("cpteos@163.com")) .description("后台API接口") .termsOfService("NO terms of service") .license(new License().name("Apache 2.0").url("http://www.apache.org/licenses/LICENSE-2.0.html"))) diff --git a/cpte-boot-module/cpte-module-wms/src/main/java/org/cpte/modules/base/controller/AreaController.java b/cpte-boot-module/cpte-module-wms/src/main/java/org/cpte/modules/base/controller/AreaController.java index dbdec05..af337d5 100644 --- a/cpte-boot-module/cpte-module-wms/src/main/java/org/cpte/modules/base/controller/AreaController.java +++ b/cpte-boot-module/cpte-module-wms/src/main/java/org/cpte/modules/base/controller/AreaController.java @@ -41,7 +41,7 @@ import org.apache.shiro.authz.annotation.RequiresPermissions; /** * @Description: 库区 * @author: cpte - * @Date: 2025-10-27 + * @Date: 2025-10-29 * @Version: V1.0 */ @Tag(name="库区") @@ -68,12 +68,11 @@ public class AreaController extends JeecgController { @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, HttpServletRequest req) { - - // 自定义查询规则 Map customeRuleMap = new HashMap<>(); // 自定义多选的查询规则为：LIKE_WITH_OR - customeRuleMap.put("delFlag", QueryRuleEnum.LIKE_WITH_OR); + customeRuleMap.put("areaCode", QueryRuleEnum.RIGHT_LIKE); + customeRuleMap.put("areaName", QueryRuleEnum.RIGHT_LIKE); QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(area, req.getParameterMap(),customeRuleMap); Page page = new Page(pageNo, pageSize); IPage pageList = areaService.page(page, queryWrapper); diff --git a/cpte-boot-module/cpte-module-wms/src/main/java/org/cpte/modules/base/entity/Area.java b/cpte-boot-module/cpte-module-wms/src/main/java/org/cpte/modules/base/entity/Area.java index 882ad3e..932ba12 100644 --- a/cpte-boot-module/cpte-module-wms/src/main/java/org/cpte/modules/base/entity/Area.java +++ b/cpte-boot-module/cpte-module-wms/src/main/java/org/cpte/modules/base/entity/Area.java @@ -22,7 +22,7 @@ import lombok.experimental.Accessors; /** * @Description: 库区 * @author: cpte - * @Date: 2025-10-27 + * @Date: 2025-10-29 * @Version: V1.0 */ @Data @@ -65,9 +65,8 @@ public class Area implements Serializable { @Schema(description = "创建人") private java.lang.String createBy; /**创建日期*/ - @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") - @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") - @Schema(description = "创建日期") + @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") private java.util.Date createTime; /**更新人*/ @Schema(description = "更新人") diff --git a/cpte-boot-module/cpte-module-wms/src/main/java/org/cpte/modules/base/mapper/AreaMapper.java b/cpte-boot-module/cpte-module-wms/src/main/java/org/cpte/modules/base/mapper/AreaMapper.java index 162e8c2..2308f8d 100644 --- a/cpte-boot-module/cpte-module-wms/src/main/java/org/cpte/modules/base/mapper/AreaMapper.java +++ b/cpte-boot-module/cpte-module-wms/src/main/java/org/cpte/modules/base/mapper/AreaMapper.java @@ -9,7 +9,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; /** * @Description: 库区 * @author: cpte - * @Date: 2025-10-27 + * @Date: 2025-10-29 * @Version: V1.0 */ public interface AreaMapper extends BaseMapper { diff --git a/cpte-boot-module/cpte-module-wms/src/main/java/org/cpte/modules/base/service/IAreaService.java b/cpte-boot-module/cpte-module-wms/src/main/java/org/cpte/modules/base/service/IAreaService.java index 5a5f314..fd807bc 100644 --- a/cpte-boot-module/cpte-module-wms/src/main/java/org/cpte/modules/base/service/IAreaService.java +++ b/cpte-boot-module/cpte-module-wms/src/main/java/org/cpte/modules/base/service/IAreaService.java @@ -6,7 +6,7 @@ import com.baomidou.mybatisplus.extension.service.IService; /** * @Description: 库区 * @author: cpte - * @Date: 2025-10-27 + * @Date: 2025-10-29 * @Version: V1.0 */ public interface IAreaService extends IService { diff --git a/cpte-boot-module/cpte-module-wms/src/main/java/org/cpte/modules/base/service/impl/AreaServiceImpl.java b/cpte-boot-module/cpte-module-wms/src/main/java/org/cpte/modules/base/service/impl/AreaServiceImpl.java index b375d07..98a7223 100644 --- a/cpte-boot-module/cpte-module-wms/src/main/java/org/cpte/modules/base/service/impl/AreaServiceImpl.java +++ b/cpte-boot-module/cpte-module-wms/src/main/java/org/cpte/modules/base/service/impl/AreaServiceImpl.java @@ -10,7 +10,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; /** * @Description: 库区 * @author: cpte - * @Date: 2025-10-27 + * @Date: 2025-10-29 * @Version: V1.0 */ @Service diff --git a/cpte-module-system/cpte-system-start/src/main/resources/application-dev.yml b/cpte-module-system/cpte-system-start/src/main/resources/application-dev.yml index 4b68f3c..8bbfd8f 100644 --- a/cpte-module-system/cpte-system-start/src/main/resources/application-dev.yml +++ b/cpte-module-system/cpte-system-start/src/main/resources/application-dev.yml @@ -25,7 +25,7 @@ spring: # lazy-initialization: true flyway: # 是否启用flyway - enabled: true + enabled: false # 是否关闭要清除已有库下的表功能,生产环境必须为true,否则会删库，非常重要！！！ clean-disabled: true servlet: @@ -194,7 +194,7 @@ jeecg: # AIRag向量库 ai-rag: embed-store: - host: 47.103.100.52 + host: 127.0.0.1 port: 5432 database: postgres user: postgres @@ -214,7 +214,7 @@ jeecg: uploadType: local # 前端访问地址 domainUrl: - pc: http://localhost:3100 + pc: http://localhost:8080 app: http://localhost:8051 path: #文件上传根目录 设置 diff --git a/cpte-module-system/cpte-system-start/src/main/resources/application-prod.yml b/cpte-module-system/cpte-system-start/src/main/resources/application-prod.yml index b476fb0..50f87a7 100644 --- a/cpte-module-system/cpte-system-start/src/main/resources/application-prod.yml +++ b/cpte-module-system/cpte-system-start/src/main/resources/application-prod.yml @@ -144,7 +144,7 @@ spring: master: url: jdbc:mysql://127.0.0.1:3306/cpte-wms?characterEncoding=UTF-8&useUnicode=true&useSSL=false&tinyInt1isBit=false&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai username: root - password: root + password: Youchain@56 driver-class-name: com.mysql.cj.jdbc.Driver # 多数据源配置 #multi-datasource1: @@ -161,7 +161,7 @@ spring: password: #mybatis plus 设置 mybatis-plus: - mapper-locations: classpath*:org/jeecg/**/xml/*Mapper.xml + mapper-locations: classpath*:org/jeecg/**/xml/*Mapper.xml,,classpath*:org/cpte/**/xml/*Mapper.xml global-config: # 关闭MP3.0自带的banner banner: false @@ -209,7 +209,7 @@ jeecg: uploadType: alioss # 前端访问地址 domainUrl: - pc: http://localhost:3100 + pc: http://localhost:8080 app: http://localhost:8051 path: #文件上传根目录 设置