From 9f707c10b87b1250ea5e78be8a0cffe8e73e3895 Mon Sep 17 00:00:00 2001 From: Vinjor Date: Wed, 31 Jul 2024 21:53:13 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=81=E4=B8=9Ademo?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- dl-module-base/pom.xml | 11 ++-- .../iocoder/yudao}/common/TestCommon.java | 2 +- .../java/cn/iocoder/yudao/job/TestJob.java | 4 ++ .../controller/admin/DlCompanyController.java | 34 ++-------- .../module/custom/entity/DlCompany.java | 2 +- .../module/custom/mapper/DlCompanyMapper.java | 10 ++- .../custom/service/DlCompanyService.java | 10 +-- .../service/impl/DlCompanyServiceImpl.java | 14 ++--- .../yudao}/module/custom/vo/CompanyReqVO.java | 4 +- .../main/java/com/dianliang/job/TestJob.java | 4 -- .../dianliang/module/custom/vo/TestVO.java | 4 -- .../mapper/{ => custom}/DlCompanyMapper.xml | 4 +- pom.xml | 63 ++++++++++--------- .../yudao/server/YudaoServerApplication.java | 2 +- .../src/main/resources/application-local.yaml | 1 + .../src/main/resources/application.yaml | 5 +- 16 files changed, 69 insertions(+), 105 deletions(-) rename dl-module-base/src/main/java/{com/dianliang => cn/iocoder/yudao}/common/TestCommon.java (50%) create mode 100644 dl-module-base/src/main/java/cn/iocoder/yudao/job/TestJob.java rename dl-module-base/src/main/java/{com/dianliang => cn/iocoder/yudao}/module/custom/controller/admin/DlCompanyController.java (55%) rename dl-module-base/src/main/java/{com/dianliang => cn/iocoder/yudao}/module/custom/entity/DlCompany.java (96%) rename dl-module-base/src/main/java/{com/dianliang => cn/iocoder/yudao}/module/custom/mapper/DlCompanyMapper.java (68%) rename dl-module-base/src/main/java/{com/dianliang => cn/iocoder/yudao}/module/custom/service/DlCompanyService.java (68%) rename dl-module-base/src/main/java/{com/dianliang => cn/iocoder/yudao}/module/custom/service/impl/DlCompanyServiceImpl.java (67%) rename dl-module-base/src/main/java/{com/dianliang => cn/iocoder/yudao}/module/custom/vo/CompanyReqVO.java (59%) delete mode 100644 dl-module-base/src/main/java/com/dianliang/job/TestJob.java delete mode 100644 dl-module-base/src/main/java/com/dianliang/module/custom/vo/TestVO.java rename dl-module-base/src/main/resources/mapper/{ => custom}/DlCompanyMapper.xml (52%) diff --git a/dl-module-base/pom.xml b/dl-module-base/pom.xml index 5a478b82..5578010f 100644 --- a/dl-module-base/pom.xml +++ b/dl-module-base/pom.xml @@ -3,21 +3,18 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - yudao cn.iocoder.boot + yudao ${revision} 4.0.0 dl-module-base - pom + jar ${project.artifactId} - 点亮业务基础包，存放用户基础库、客户基础库、企业基础库、车辆基础库等 + crm 包下，客户关系管理（Customer Relationship Management）。 + 例如说：客户、联系人、商机、合同、回款等等 - - 8 - 8 - cn.iocoder.boot diff --git a/dl-module-base/src/main/java/com/dianliang/common/TestCommon.java b/dl-module-base/src/main/java/cn/iocoder/yudao/common/TestCommon.java similarity index 50% rename from dl-module-base/src/main/java/com/dianliang/common/TestCommon.java rename to dl-module-base/src/main/java/cn/iocoder/yudao/common/TestCommon.java index 6f5e0b84..9fb906a9 100644 --- a/dl-module-base/src/main/java/com/dianliang/common/TestCommon.java +++ b/dl-module-base/src/main/java/cn/iocoder/yudao/common/TestCommon.java @@ -1,4 +1,4 @@ -package com.dianliang.common; +package cn.iocoder.yudao.common; public interface TestCommon { } diff --git a/dl-module-base/src/main/java/cn/iocoder/yudao/job/TestJob.java b/dl-module-base/src/main/java/cn/iocoder/yudao/job/TestJob.java new file mode 100644 index 00000000..d26cb80b --- /dev/null +++ b/dl-module-base/src/main/java/cn/iocoder/yudao/job/TestJob.java @@ -0,0 +1,4 @@ +package cn.iocoder.yudao.job; + +public class TestJob { +} diff --git a/dl-module-base/src/main/java/com/dianliang/module/custom/controller/admin/DlCompanyController.java b/dl-module-base/src/main/java/cn/iocoder/yudao/module/custom/controller/admin/DlCompanyController.java similarity index 55% rename from dl-module-base/src/main/java/com/dianliang/module/custom/controller/admin/DlCompanyController.java rename to dl-module-base/src/main/java/cn/iocoder/yudao/module/custom/controller/admin/DlCompanyController.java index d8d156eb..eaeef294 100644 --- a/dl-module-base/src/main/java/com/dianliang/module/custom/controller/admin/DlCompanyController.java +++ b/dl-module-base/src/main/java/cn/iocoder/yudao/module/custom/controller/admin/DlCompanyController.java @@ -1,44 +1,20 @@ -package com.dianliang.module.custom.controller.admin; +package cn.iocoder.yudao.module.custom.controller.admin; +import cn.iocoder.yudao.module.custom.entity.DlCompany; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.dianliang.module.custom.vo.CompanyReqVO; +import cn.iocoder.yudao.module.custom.vo.CompanyReqVO; import org.springframework.web.bind.annotation.*; -import javax.annotation.Resource; import org.springframework.validation.annotation.Validated; import org.springframework.security.access.prepost.PreAuthorize; import io.swagger.v3.oas.annotations.tags.Tag; -import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.Operation; -import javax.validation.constraints.*; -import javax.validation.*; -import javax.servlet.http.*; -import java.util.*; -import java.io.IOException; - -import cn.iocoder.yudao.framework.common.pojo.PageParam; -import cn.iocoder.yudao.framework.common.pojo.PageResult; import cn.iocoder.yudao.framework.common.pojo.CommonResult; -import cn.iocoder.yudao.framework.common.util.object.BeanUtils; + import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success; -import cn.iocoder.yudao.framework.excel.core.util.ExcelUtils; - -import cn.iocoder.yudao.framework.apilog.core.annotation.ApiAccessLog; -import static cn.iocoder.yudao.framework.apilog.core.enums.OperateTypeEnum.*; - -import cn.iocoder.yudao.framework.common.pojo.PageResult; -import cn.iocoder.yudao.framework.common.util.object.BeanUtils; -import com.dianliang.module.custom.entity.DlCompany; -import io.swagger.v3.oas.annotations.Operation; -import io.swagger.v3.oas.annotations.tags.Tag; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.security.access.prepost.PreAuthorize; -import org.springframework.validation.annotation.Validated; -import org.springframework.web.bind.annotation.*; -import com.dianliang.module.custom.service.DlCompanyService; - -import javax.validation.Valid; +import cn.iocoder.yudao.module.custom.service.DlCompanyService; /** * 企业信息表（每个租户的下属企业信息）;(dl_company)表控制层 diff --git a/dl-module-base/src/main/java/com/dianliang/module/custom/entity/DlCompany.java b/dl-module-base/src/main/java/cn/iocoder/yudao/module/custom/entity/DlCompany.java similarity index 96% rename from dl-module-base/src/main/java/com/dianliang/module/custom/entity/DlCompany.java rename to dl-module-base/src/main/java/cn/iocoder/yudao/module/custom/entity/DlCompany.java index 93ecb030..93e7fb95 100644 --- a/dl-module-base/src/main/java/com/dianliang/module/custom/entity/DlCompany.java +++ b/dl-module-base/src/main/java/cn/iocoder/yudao/module/custom/entity/DlCompany.java @@ -1,4 +1,4 @@ -package com.dianliang.module.custom.entity; +package cn.iocoder.yudao.module.custom.entity; import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO; import com.baomidou.mybatisplus.annotation.TableName; diff --git a/dl-module-base/src/main/java/com/dianliang/module/custom/mapper/DlCompanyMapper.java b/dl-module-base/src/main/java/cn/iocoder/yudao/module/custom/mapper/DlCompanyMapper.java similarity index 68% rename from dl-module-base/src/main/java/com/dianliang/module/custom/mapper/DlCompanyMapper.java rename to dl-module-base/src/main/java/cn/iocoder/yudao/module/custom/mapper/DlCompanyMapper.java index 59fd87c1..d7872742 100644 --- a/dl-module-base/src/main/java/com/dianliang/module/custom/mapper/DlCompanyMapper.java +++ b/dl-module-base/src/main/java/cn/iocoder/yudao/module/custom/mapper/DlCompanyMapper.java @@ -1,16 +1,14 @@ -package com.dianliang.module.custom.mapper; +package cn.iocoder.yudao.module.custom.mapper; -import com.baomidou.mybatisplus.core.conditions.Wrapper; +import cn.iocoder.yudao.module.custom.entity.DlCompany; +import cn.iocoder.yudao.module.custom.vo.CompanyReqVO; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.metadata.IPage; -import com.baomidou.mybatisplus.core.toolkit.Constants; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.dianliang.module.custom.vo.CompanyReqVO; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; -import com.dianliang.module.custom.entity.DlCompany; - /** +/** * 企业信息表（每个租户的下属企业信息）;(dl_company)表数据库访问层 * @author : http://www.chiner.pro * @date : 2024-7-31 diff --git a/dl-module-base/src/main/java/com/dianliang/module/custom/service/DlCompanyService.java b/dl-module-base/src/main/java/cn/iocoder/yudao/module/custom/service/DlCompanyService.java similarity index 68% rename from dl-module-base/src/main/java/com/dianliang/module/custom/service/DlCompanyService.java rename to dl-module-base/src/main/java/cn/iocoder/yudao/module/custom/service/DlCompanyService.java index b1fb0783..07c7f081 100644 --- a/dl-module-base/src/main/java/com/dianliang/module/custom/service/DlCompanyService.java +++ b/dl-module-base/src/main/java/cn/iocoder/yudao/module/custom/service/DlCompanyService.java @@ -1,14 +1,10 @@ -package com.dianliang.module.custom.service; +package cn.iocoder.yudao.module.custom.service; +import cn.iocoder.yudao.module.custom.entity.DlCompany; +import cn.iocoder.yudao.module.custom.vo.CompanyReqVO; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; -import com.dianliang.module.custom.entity.DlCompany; -import java.util.*; -import javax.validation.*; -import cn.iocoder.yudao.framework.common.pojo.PageResult; -import cn.iocoder.yudao.framework.common.pojo.PageParam; -import com.dianliang.module.custom.vo.CompanyReqVO; /** * 企业信息表（每个租户的下属企业信息）;(dl_company)表服务接口 diff --git a/dl-module-base/src/main/java/com/dianliang/module/custom/service/impl/DlCompanyServiceImpl.java b/dl-module-base/src/main/java/cn/iocoder/yudao/module/custom/service/impl/DlCompanyServiceImpl.java similarity index 67% rename from dl-module-base/src/main/java/com/dianliang/module/custom/service/impl/DlCompanyServiceImpl.java rename to dl-module-base/src/main/java/cn/iocoder/yudao/module/custom/service/impl/DlCompanyServiceImpl.java index 46885eca..8e920daa 100644 --- a/dl-module-base/src/main/java/com/dianliang/module/custom/service/impl/DlCompanyServiceImpl.java +++ b/dl-module-base/src/main/java/cn/iocoder/yudao/module/custom/service/impl/DlCompanyServiceImpl.java @@ -1,18 +1,14 @@ -package com.dianliang.module.custom.service.impl; +package cn.iocoder.yudao.module.custom.service.impl; -import cn.hutool.core.util.StrUtil; -import cn.iocoder.yudao.framework.common.pojo.PageResult; +import cn.iocoder.yudao.module.custom.entity.DlCompany; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.dianliang.module.custom.vo.CompanyReqVO; +import cn.iocoder.yudao.module.custom.vo.CompanyReqVO; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.baomidou.mybatisplus.extension.conditions.update.LambdaUpdateChainWrapper; -import com.dianliang.module.custom.entity.DlCompany; -import com.dianliang.module.custom.mapper.DlCompanyMapper; -import com.dianliang.module.custom.service.DlCompanyService; +import cn.iocoder.yudao.module.custom.mapper.DlCompanyMapper; +import cn.iocoder.yudao.module.custom.service.DlCompanyService; /** * 企业信息表（每个租户的下属企业信息）;(dl_company)表服务实现类 * @author : http://www.chiner.pro diff --git a/dl-module-base/src/main/java/com/dianliang/module/custom/vo/CompanyReqVO.java b/dl-module-base/src/main/java/cn/iocoder/yudao/module/custom/vo/CompanyReqVO.java similarity index 59% rename from dl-module-base/src/main/java/com/dianliang/module/custom/vo/CompanyReqVO.java rename to dl-module-base/src/main/java/cn/iocoder/yudao/module/custom/vo/CompanyReqVO.java index 2d1e8e2f..00026393 100644 --- a/dl-module-base/src/main/java/com/dianliang/module/custom/vo/CompanyReqVO.java +++ b/dl-module-base/src/main/java/cn/iocoder/yudao/module/custom/vo/CompanyReqVO.java @@ -1,6 +1,6 @@ -package com.dianliang.module.custom.vo; +package cn.iocoder.yudao.module.custom.vo; -import com.dianliang.module.custom.entity.DlCompany; +import cn.iocoder.yudao.module.custom.entity.DlCompany; import lombok.Data; /** * 企业查询vo diff --git a/dl-module-base/src/main/java/com/dianliang/job/TestJob.java b/dl-module-base/src/main/java/com/dianliang/job/TestJob.java deleted file mode 100644 index ea1dfabc..00000000 --- a/dl-module-base/src/main/java/com/dianliang/job/TestJob.java +++ /dev/null @@ -1,4 +0,0 @@ -package com.dianliang.job; - -public class TestJob { -} diff --git a/dl-module-base/src/main/java/com/dianliang/module/custom/vo/TestVO.java b/dl-module-base/src/main/java/com/dianliang/module/custom/vo/TestVO.java deleted file mode 100644 index 40955a12..00000000 --- a/dl-module-base/src/main/java/com/dianliang/module/custom/vo/TestVO.java +++ /dev/null @@ -1,4 +0,0 @@ -package com.dianliang.module.custom.vo; - -public class TestVO { -} diff --git a/dl-module-base/src/main/resources/mapper/DlCompanyMapper.xml b/dl-module-base/src/main/resources/mapper/custom/DlCompanyMapper.xml similarity index 52% rename from dl-module-base/src/main/resources/mapper/DlCompanyMapper.xml rename to dl-module-base/src/main/resources/mapper/custom/DlCompanyMapper.xml index 4a6f3004..077be9a0 100644 --- a/dl-module-base/src/main/resources/mapper/DlCompanyMapper.xml +++ b/dl-module-base/src/main/resources/mapper/custom/DlCompanyMapper.xml @@ -1,8 +1,8 @@ - - select * from base_company \ No newline at end of file diff --git a/pom.xml b/pom.xml index 82ee5171..95fb32b5 100644 --- a/pom.xml +++ b/pom.xml @@ -10,8 +10,6 @@ yudao-dependencies yudao-framework - - yudao-server yudao-module-system yudao-module-infra @@ -24,6 +22,8 @@ yudao-module-crm yudao-module-erp dl-module-base + + yudao-server @@ -68,6 +68,9 @@ org.apache.maven.plugins maven-surefire-plugin ${maven-surefire-plugin.version} + + true + @@ -133,34 +136,34 @@ - - - huaweicloud - huawei - https://mirrors.huaweicloud.com/repository/maven/ - - - aliyunmaven - aliyun - https://maven.aliyun.com/repository/public - + + + + + + + + + + + - - spring-milestones - Spring Milestones - https://repo.spring.io/milestone - - false - - - - spring-snapshots - Spring Snapshots - https://repo.spring.io/snapshot - - false - - - + + + + + + + + + + + + + + + + + diff --git a/yudao-server/src/main/java/cn/iocoder/yudao/server/YudaoServerApplication.java b/yudao-server/src/main/java/cn/iocoder/yudao/server/YudaoServerApplication.java index 732da6e7..57db3f94 100644 --- a/yudao-server/src/main/java/cn/iocoder/yudao/server/YudaoServerApplication.java +++ b/yudao-server/src/main/java/cn/iocoder/yudao/server/YudaoServerApplication.java @@ -13,7 +13,7 @@ import org.springframework.boot.autoconfigure.SpringBootApplication; * @author 芋道源码 */ @SuppressWarnings("SpringComponentScan") // 忽略 IDEA 无法识别 ${yudao.info.base-package} -@SpringBootApplication(scanBasePackages = {"${yudao.info.base-package}.server", "${yudao.info.base-package}.module","com.dianliang.module"}) +@SpringBootApplication(scanBasePackages = {"${yudao.info.base-package}.server", "${yudao.info.base-package}.module"}) public class YudaoServerApplication { public static void main(String[] args) { diff --git a/yudao-server/src/main/resources/application-local.yaml b/yudao-server/src/main/resources/application-local.yaml index 2f45d343..14a7ea55 100644 --- a/yudao-server/src/main/resources/application-local.yaml +++ b/yudao-server/src/main/resources/application-local.yaml @@ -175,6 +175,7 @@ logging: cn.iocoder.yudao.module.crm.dal.mysql: debug cn.iocoder.yudao.module.erp.dal.mysql: debug org.springframework.context.support.PostProcessorRegistrationDelegate: ERROR # TODO 芋艿：先禁用，Spring Boot 3.X 存在部分错误的 WARN 提示 + cn.iocoder.yudao.module.custom.mapper.DlCompanyMapper: debug # debug: false diff --git a/yudao-server/src/main/resources/application.yaml b/yudao-server/src/main/resources/application.yaml index 0de06f1b..75afe2c9 100644 --- a/yudao-server/src/main/resources/application.yaml +++ b/yudao-server/src/main/resources/application.yaml @@ -67,6 +67,7 @@ flowable: mybatis-plus: configuration: map-underscore-to-camel-case: true # 虽然默认为 true ，但是还是显示去指定下。 +# log-impl: org.apache.ibatis.logging.stdout.StdOutImpl global-config: db-config: id-type: NONE # “智能”模式，基于 IdTypeEnvironmentPostProcessor + 数据源的类型，自动适配成 AUTO、INPUT 模式。 @@ -78,8 +79,8 @@ mybatis-plus: banner: false # 关闭控制台的 Banner 打印 type-aliases-package: - ${yudao.info.base-package}.module.*.dal.dataobject - - com.dianliang.module.*.entity - mapper-locations: classpath:/mapper/*.xml + - ${yudao.info.base-package}.module.*.entity + mapper-locations: classpath:/mapper/*/*.xml encryptor: password: XDV71a+xqStEA3WH # 加解密的秘钥，可使用 https://www.imaegoo.com/2020/aes-key-generator/ 网站生成