Commit 1f4889c68ec7ddce46e0e92b6cc947be7d121237
1 parent
6dcb1277
✨ 全局:将 dict 组件,融合到 excel 组件里,减少 starter
Showing
32 changed files
with
41 additions
and
114 deletions
yudao-dependencies/pom.xml
| ... | ... | @@ -108,11 +108,6 @@ |
| 108 | 108 | </dependency> |
| 109 | 109 | <dependency> |
| 110 | 110 | <groupId>cn.iocoder.boot</groupId> |
| 111 | - <artifactId>yudao-spring-boot-starter-biz-dict</artifactId> | |
| 112 | - <version>${revision}</version> | |
| 113 | - </dependency> | |
| 114 | - <dependency> | |
| 115 | - <groupId>cn.iocoder.boot</groupId> | |
| 116 | 111 | <artifactId>yudao-spring-boot-starter-biz-tenant</artifactId> |
| 117 | 112 | <version>${revision}</version> |
| 118 | 113 | </dependency> | ... | ... |
yudao-framework/pom.xml
| ... | ... | @@ -26,7 +26,6 @@ |
| 26 | 26 | <module>yudao-spring-boot-starter-test</module> |
| 27 | 27 | |
| 28 | 28 | <module>yudao-spring-boot-starter-biz-operatelog</module> |
| 29 | - <module>yudao-spring-boot-starter-biz-dict</module> | |
| 30 | 29 | <module>yudao-spring-boot-starter-biz-tenant</module> |
| 31 | 30 | <module>yudao-spring-boot-starter-biz-data-permission</module> |
| 32 | 31 | <module>yudao-spring-boot-starter-biz-ip</module> | ... | ... |
yudao-framework/yudao-spring-boot-starter-biz-dict/pom.xml deleted
| 1 | -<?xml version="1.0" encoding="UTF-8"?> | |
| 2 | -<project xmlns="http://maven.apache.org/POM/4.0.0" | |
| 3 | - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" | |
| 4 | - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> | |
| 5 | - <parent> | |
| 6 | - <groupId>cn.iocoder.boot</groupId> | |
| 7 | - <artifactId>yudao-framework</artifactId> | |
| 8 | - <version>${revision}</version> | |
| 9 | - </parent> | |
| 10 | - <modelVersion>4.0.0</modelVersion> | |
| 11 | - <artifactId>yudao-spring-boot-starter-biz-dict</artifactId> | |
| 12 | - <packaging>jar</packaging> | |
| 13 | - | |
| 14 | - <name>${project.artifactId}</name> | |
| 15 | - <description>字典类型、数据</description> | |
| 16 | - <url>https://github.com/YunaiV/ruoyi-vue-pro</url> | |
| 17 | - | |
| 18 | - <dependencies> | |
| 19 | - <dependency> | |
| 20 | - <groupId>cn.iocoder.boot</groupId> | |
| 21 | - <artifactId>yudao-common</artifactId> | |
| 22 | - </dependency> | |
| 23 | - | |
| 24 | - <!-- Spring 核心 --> | |
| 25 | - <dependency> | |
| 26 | - <groupId>org.springframework.boot</groupId> | |
| 27 | - <artifactId>spring-boot-starter</artifactId> | |
| 28 | - </dependency> | |
| 29 | - | |
| 30 | - <!-- 业务组件 --> | |
| 31 | - <dependency> | |
| 32 | - <groupId>cn.iocoder.boot</groupId> | |
| 33 | - <artifactId>yudao-module-system-api</artifactId> <!-- 需要使用它,进行 Token 的校验 --> | |
| 34 | - <version>${revision}</version> | |
| 35 | - </dependency> | |
| 36 | - | |
| 37 | - <!-- 工具类相关 --> | |
| 38 | - <dependency> | |
| 39 | - <groupId>com.google.guava</groupId> | |
| 40 | - <artifactId>guava</artifactId> | |
| 41 | - </dependency> | |
| 42 | - | |
| 43 | - <!-- Test 测试相关 --> | |
| 44 | - <dependency> | |
| 45 | - <groupId>cn.iocoder.boot</groupId> | |
| 46 | - <artifactId>yudao-spring-boot-starter-test</artifactId> | |
| 47 | - <scope>test</scope> | |
| 48 | - </dependency> | |
| 49 | - </dependencies> | |
| 50 | -</project> |
yudao-framework/yudao-spring-boot-starter-biz-dict/src/main/java/cn/iocoder/yudao/framework/dict/core/package-info.java deleted
yudao-framework/yudao-spring-boot-starter-excel/pom.xml
| ... | ... | @@ -21,11 +21,17 @@ |
| 21 | 21 | <artifactId>yudao-common</artifactId> |
| 22 | 22 | </dependency> |
| 23 | 23 | |
| 24 | + <!-- Spring 核心 --> | |
| 25 | + <dependency> | |
| 26 | + <groupId>org.springframework.boot</groupId> | |
| 27 | + <artifactId>spring-boot-starter</artifactId> | |
| 28 | + </dependency> | |
| 29 | + | |
| 24 | 30 | <!-- 业务组件 --> |
| 25 | 31 | <dependency> |
| 26 | 32 | <groupId>cn.iocoder.boot</groupId> |
| 27 | - <artifactId>yudao-spring-boot-starter-biz-dict</artifactId> | |
| 28 | - <optional>true</optional> <!-- 如果希望使用 @DictFormat 注解,需要引入该依赖 --> | |
| 33 | + <artifactId>yudao-module-system-api</artifactId> <!-- 需要使用它,进行 Dict 的查询 --> | |
| 34 | + <version>${revision}</version> | |
| 29 | 35 | </dependency> |
| 30 | 36 | |
| 31 | 37 | <!-- Web 相关 --> |
| ... | ... | @@ -46,11 +52,24 @@ |
| 46 | 52 | <groupId>com.alibaba</groupId> |
| 47 | 53 | <artifactId>easyexcel</artifactId> |
| 48 | 54 | </dependency> |
| 55 | + | |
| 56 | + <dependency> | |
| 57 | + <groupId>com.google.guava</groupId> | |
| 58 | + <artifactId>guava</artifactId> | |
| 59 | + </dependency> | |
| 60 | + | |
| 49 | 61 | <dependency> |
| 50 | 62 | <groupId>cn.iocoder.boot</groupId> |
| 51 | 63 | <artifactId>yudao-spring-boot-starter-biz-ip</artifactId> |
| 52 | 64 | <optional>true</optional> <!-- 设置为 optional,只有在 AreaConvert 的时候使用 --> |
| 53 | 65 | </dependency> |
| 66 | + | |
| 67 | + <!-- Test 测试相关 --> | |
| 68 | + <dependency> | |
| 69 | + <groupId>cn.iocoder.boot</groupId> | |
| 70 | + <artifactId>yudao-spring-boot-starter-test</artifactId> | |
| 71 | + <scope>test</scope> | |
| 72 | + </dependency> | |
| 54 | 73 | </dependencies> |
| 55 | 74 | |
| 56 | 75 | </project> | ... | ... |
yudao-framework/yudao-spring-boot-starter-biz-dict/src/main/java/cn/iocoder/yudao/framework/dict/config/YudaoDictAutoConfiguration.java renamed to yudao-framework/yudao-spring-boot-starter-excel/src/main/java/cn/iocoder/yudao/framework/dict/config/YudaoDictAutoConfiguration.java
| 1 | 1 | package cn.iocoder.yudao.framework.dict.config; |
| 2 | 2 | |
| 3 | -import cn.iocoder.yudao.framework.dict.core.util.DictFrameworkUtils; | |
| 3 | +import cn.iocoder.yudao.framework.dict.util.DictFrameworkUtils; | |
| 4 | 4 | import cn.iocoder.yudao.module.system.api.dict.DictDataApi; |
| 5 | 5 | import org.springframework.boot.autoconfigure.AutoConfiguration; |
| 6 | 6 | import org.springframework.context.annotation.Bean; | ... | ... |
yudao-framework/yudao-spring-boot-starter-biz-dict/src/main/java/cn/iocoder/yudao/framework/dict/package-info.java renamed to yudao-framework/yudao-spring-boot-starter-excel/src/main/java/cn/iocoder/yudao/framework/dict/package-info.java
yudao-framework/yudao-spring-boot-starter-biz-dict/src/main/java/cn/iocoder/yudao/framework/dict/core/util/DictFrameworkUtils.java renamed to yudao-framework/yudao-spring-boot-starter-excel/src/main/java/cn/iocoder/yudao/framework/dict/util/DictFrameworkUtils.java
yudao-framework/yudao-spring-boot-starter-excel/src/main/java/cn/iocoder/yudao/framework/excel/core/convert/DictConvert.java
| 1 | 1 | package cn.iocoder.yudao.framework.excel.core.convert; |
| 2 | 2 | |
| 3 | 3 | import cn.hutool.core.convert.Convert; |
| 4 | -import cn.iocoder.yudao.framework.dict.core.util.DictFrameworkUtils; | |
| 4 | +import cn.iocoder.yudao.framework.dict.util.DictFrameworkUtils; | |
| 5 | 5 | import cn.iocoder.yudao.framework.excel.core.annotations.DictFormat; |
| 6 | 6 | import com.alibaba.excel.converters.Converter; |
| 7 | 7 | import com.alibaba.excel.enums.CellDataTypeEnum; | ... | ... |
yudao-framework/yudao-spring-boot-starter-biz-dict/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports renamed to yudao-framework/yudao-spring-boot-starter-excel/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
yudao-framework/yudao-spring-boot-starter-biz-dict/src/test/java/cn/iocoder/yudao/framework/dict/core/util/DictFrameworkUtilsTest.java renamed to yudao-framework/yudao-spring-boot-starter-excel/src/test/java/cn/iocoder/yudao/framework/dict/core/util/DictFrameworkUtilsTest.java
| 1 | 1 | package cn.iocoder.yudao.framework.dict.core.util; |
| 2 | 2 | |
| 3 | 3 | import cn.iocoder.yudao.framework.common.enums.CommonStatusEnum; |
| 4 | +import cn.iocoder.yudao.framework.dict.util.DictFrameworkUtils; | |
| 4 | 5 | import cn.iocoder.yudao.framework.test.core.ut.BaseMockitoUnitTest; |
| 5 | 6 | import cn.iocoder.yudao.module.system.api.dict.DictDataApi; |
| 6 | 7 | import cn.iocoder.yudao.module.system.api.dict.dto.DictDataRespDTO; |
| ... | ... | @@ -31,6 +32,7 @@ public class DictFrameworkUtilsTest extends BaseMockitoUnitTest { |
| 31 | 32 | DictDataRespDTO dataRespDTO = randomPojo(DictDataRespDTO.class, o -> o.setStatus(CommonStatusEnum.ENABLE.getStatus())); |
| 32 | 33 | // mock 方法 |
| 33 | 34 | when(dictDataApi.getDictData(dataRespDTO.getDictType(), dataRespDTO.getValue())).thenReturn(dataRespDTO); |
| 35 | + | |
| 34 | 36 | // 断言返回值 |
| 35 | 37 | assertEquals(dataRespDTO.getLabel(), DictFrameworkUtils.getDictDataLabel(dataRespDTO.getDictType(), dataRespDTO.getValue())); |
| 36 | 38 | } |
| ... | ... | @@ -41,6 +43,7 @@ public class DictFrameworkUtilsTest extends BaseMockitoUnitTest { |
| 41 | 43 | DictDataRespDTO resp = randomPojo(DictDataRespDTO.class, o -> o.setStatus(CommonStatusEnum.ENABLE.getStatus())); |
| 42 | 44 | // mock 方法 |
| 43 | 45 | when(dictDataApi.parseDictData(resp.getDictType(), resp.getLabel())).thenReturn(resp); |
| 46 | + | |
| 44 | 47 | // 断言返回值 |
| 45 | 48 | assertEquals(resp.getValue(), DictFrameworkUtils.parseDictDataValue(resp.getDictType(), resp.getLabel())); |
| 46 | 49 | } | ... | ... |
yudao-module-crm/yudao-module-crm-biz/pom.xml
| ... | ... | @@ -69,10 +69,6 @@ |
| 69 | 69 | <groupId>cn.iocoder.boot</groupId> |
| 70 | 70 | <artifactId>yudao-spring-boot-starter-excel</artifactId> |
| 71 | 71 | </dependency> |
| 72 | - <dependency> | |
| 73 | - <groupId>cn.iocoder.boot</groupId> | |
| 74 | - <artifactId>yudao-spring-boot-starter-biz-dict</artifactId> | |
| 75 | - </dependency> | |
| 76 | 72 | |
| 77 | 73 | <!-- Test 测试相关 --> |
| 78 | 74 | <dependency> | ... | ... |
yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/framework/operatelog/core/CrmCustomerIndustryParseFunction.java
| 1 | 1 | package cn.iocoder.yudao.module.crm.framework.operatelog.core; |
| 2 | 2 | |
| 3 | 3 | import cn.hutool.core.util.StrUtil; |
| 4 | -import cn.iocoder.yudao.framework.dict.core.util.DictFrameworkUtils; | |
| 4 | +import cn.iocoder.yudao.framework.dict.util.DictFrameworkUtils; | |
| 5 | 5 | import com.mzt.logapi.service.IParseFunction; |
| 6 | 6 | import lombok.extern.slf4j.Slf4j; |
| 7 | 7 | import org.springframework.stereotype.Component; | ... | ... |
yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/framework/operatelog/core/CrmCustomerLevelParseFunction.java
| 1 | 1 | package cn.iocoder.yudao.module.crm.framework.operatelog.core; |
| 2 | 2 | |
| 3 | 3 | import cn.hutool.core.util.StrUtil; |
| 4 | -import cn.iocoder.yudao.framework.dict.core.util.DictFrameworkUtils; | |
| 4 | +import cn.iocoder.yudao.framework.dict.util.DictFrameworkUtils; | |
| 5 | 5 | import com.mzt.logapi.service.IParseFunction; |
| 6 | 6 | import lombok.extern.slf4j.Slf4j; |
| 7 | 7 | import org.springframework.stereotype.Component; | ... | ... |
yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/framework/operatelog/core/CrmCustomerSourceParseFunction.java
| 1 | 1 | package cn.iocoder.yudao.module.crm.framework.operatelog.core; |
| 2 | 2 | |
| 3 | 3 | import cn.hutool.core.util.StrUtil; |
| 4 | -import cn.iocoder.yudao.framework.dict.core.util.DictFrameworkUtils; | |
| 4 | +import cn.iocoder.yudao.framework.dict.util.DictFrameworkUtils; | |
| 5 | 5 | import com.mzt.logapi.service.IParseFunction; |
| 6 | 6 | import lombok.extern.slf4j.Slf4j; |
| 7 | 7 | import org.springframework.stereotype.Component; | ... | ... |
yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/framework/operatelog/core/CrmProductStatusParseFunction.java
| 1 | 1 | package cn.iocoder.yudao.module.crm.framework.operatelog.core; |
| 2 | 2 | |
| 3 | 3 | import cn.hutool.core.util.StrUtil; |
| 4 | -import cn.iocoder.yudao.framework.dict.core.util.DictFrameworkUtils; | |
| 4 | +import cn.iocoder.yudao.framework.dict.util.DictFrameworkUtils; | |
| 5 | 5 | import cn.iocoder.yudao.module.crm.enums.DictTypeConstants; |
| 6 | 6 | import com.mzt.logapi.service.IParseFunction; |
| 7 | 7 | import lombok.extern.slf4j.Slf4j; | ... | ... |
yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/framework/operatelog/core/CrmProductUnitParseFunction.java
| 1 | 1 | package cn.iocoder.yudao.module.crm.framework.operatelog.core; |
| 2 | 2 | |
| 3 | 3 | import cn.hutool.core.util.StrUtil; |
| 4 | -import cn.iocoder.yudao.framework.dict.core.util.DictFrameworkUtils; | |
| 4 | +import cn.iocoder.yudao.framework.dict.util.DictFrameworkUtils; | |
| 5 | 5 | import cn.iocoder.yudao.module.crm.enums.DictTypeConstants; |
| 6 | 6 | import com.mzt.logapi.service.IParseFunction; |
| 7 | 7 | import lombok.extern.slf4j.Slf4j; | ... | ... |
yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/framework/operatelog/core/CrmReceivableReturnTypeParseFunction.java
| 1 | 1 | package cn.iocoder.yudao.module.crm.framework.operatelog.core; |
| 2 | 2 | |
| 3 | 3 | import cn.hutool.core.util.StrUtil; |
| 4 | -import cn.iocoder.yudao.framework.dict.core.util.DictFrameworkUtils; | |
| 4 | +import cn.iocoder.yudao.framework.dict.util.DictFrameworkUtils; | |
| 5 | 5 | import com.mzt.logapi.service.IParseFunction; |
| 6 | 6 | import lombok.extern.slf4j.Slf4j; |
| 7 | 7 | import org.springframework.stereotype.Component; | ... | ... |
yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/framework/operatelog/core/SysBooleanParseFunction.java
| 1 | 1 | package cn.iocoder.yudao.module.crm.framework.operatelog.core; |
| 2 | 2 | |
| 3 | 3 | import cn.hutool.core.util.StrUtil; |
| 4 | -import cn.iocoder.yudao.framework.dict.core.util.DictFrameworkUtils; | |
| 4 | +import cn.iocoder.yudao.framework.dict.util.DictFrameworkUtils; | |
| 5 | 5 | import cn.iocoder.yudao.module.infra.enums.DictTypeConstants; |
| 6 | 6 | import com.mzt.logapi.service.IParseFunction; |
| 7 | 7 | import lombok.extern.slf4j.Slf4j; | ... | ... |
yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/framework/operatelog/core/SysSexParseFunction.java
| 1 | 1 | package cn.iocoder.yudao.module.crm.framework.operatelog.core; |
| 2 | 2 | |
| 3 | 3 | import cn.hutool.core.util.StrUtil; |
| 4 | -import cn.iocoder.yudao.framework.dict.core.util.DictFrameworkUtils; | |
| 4 | +import cn.iocoder.yudao.framework.dict.util.DictFrameworkUtils; | |
| 5 | 5 | import cn.iocoder.yudao.module.system.enums.DictTypeConstants; |
| 6 | 6 | import com.mzt.logapi.service.IParseFunction; |
| 7 | 7 | import lombok.extern.slf4j.Slf4j; | ... | ... |
yudao-module-erp/yudao-module-erp-biz/pom.xml
| ... | ... | @@ -61,10 +61,6 @@ |
| 61 | 61 | <groupId>cn.iocoder.boot</groupId> |
| 62 | 62 | <artifactId>yudao-spring-boot-starter-excel</artifactId> |
| 63 | 63 | </dependency> |
| 64 | - <dependency> | |
| 65 | - <groupId>cn.iocoder.boot</groupId> | |
| 66 | - <artifactId>yudao-spring-boot-starter-biz-dict</artifactId> | |
| 67 | - </dependency> | |
| 68 | 64 | |
| 69 | 65 | <!-- Test 测试相关 --> |
| 70 | 66 | <dependency> | ... | ... |
yudao-module-mall/yudao-module-product-biz/pom.xml
| ... | ... | @@ -34,10 +34,6 @@ |
| 34 | 34 | <groupId>cn.iocoder.boot</groupId> |
| 35 | 35 | <artifactId>yudao-spring-boot-starter-biz-operatelog</artifactId> |
| 36 | 36 | </dependency> |
| 37 | - <dependency> | |
| 38 | - <groupId>cn.iocoder.boot</groupId> | |
| 39 | - <artifactId>yudao-spring-boot-starter-biz-dict</artifactId> | |
| 40 | - </dependency> | |
| 41 | 37 | |
| 42 | 38 | <!-- Web 相关 --> |
| 43 | 39 | <dependency> | ... | ... |
yudao-module-mall/yudao-module-promotion-biz/pom.xml
| ... | ... | @@ -77,10 +77,6 @@ |
| 77 | 77 | <groupId>cn.iocoder.boot</groupId> |
| 78 | 78 | <artifactId>yudao-spring-boot-starter-excel</artifactId> |
| 79 | 79 | </dependency> |
| 80 | - <dependency> | |
| 81 | - <groupId>cn.iocoder.boot</groupId> | |
| 82 | - <artifactId>yudao-spring-boot-starter-biz-dict</artifactId> | |
| 83 | - </dependency> | |
| 84 | 80 | </dependencies> |
| 85 | 81 | |
| 86 | 82 | </project> | ... | ... |
yudao-module-mall/yudao-module-statistics-biz/pom.xml
| ... | ... | @@ -90,10 +90,6 @@ |
| 90 | 90 | <groupId>cn.iocoder.boot</groupId> |
| 91 | 91 | <artifactId>yudao-spring-boot-starter-excel</artifactId> |
| 92 | 92 | </dependency> |
| 93 | - <dependency> | |
| 94 | - <groupId>cn.iocoder.boot</groupId> | |
| 95 | - <artifactId>yudao-spring-boot-starter-biz-dict</artifactId> | |
| 96 | - </dependency> | |
| 97 | 93 | </dependencies> |
| 98 | 94 | |
| 99 | 95 | </project> | ... | ... |
yudao-module-mall/yudao-module-trade-biz/pom.xml
| ... | ... | @@ -96,11 +96,6 @@ |
| 96 | 96 | <groupId>cn.iocoder.boot</groupId> |
| 97 | 97 | <artifactId>yudao-spring-boot-starter-excel</artifactId> |
| 98 | 98 | </dependency> |
| 99 | - <dependency> | |
| 100 | - <groupId>cn.iocoder.boot</groupId> | |
| 101 | - <artifactId>yudao-spring-boot-starter-biz-dict</artifactId> | |
| 102 | - </dependency> | |
| 103 | - | |
| 104 | 99 | </dependencies> |
| 105 | 100 | |
| 106 | 101 | </project> | ... | ... |
yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/convert/brokerage/BrokerageWithdrawConvert.java
| 1 | 1 | package cn.iocoder.yudao.module.trade.convert.brokerage; |
| 2 | 2 | |
| 3 | 3 | import cn.iocoder.yudao.framework.common.pojo.PageResult; |
| 4 | -import cn.iocoder.yudao.framework.dict.core.util.DictFrameworkUtils; | |
| 4 | +import cn.iocoder.yudao.framework.dict.util.DictFrameworkUtils; | |
| 5 | 5 | import cn.iocoder.yudao.module.member.api.user.dto.MemberUserRespDTO; |
| 6 | 6 | import cn.iocoder.yudao.module.trade.controller.admin.brokerage.vo.withdraw.BrokerageWithdrawPageReqVO; |
| 7 | 7 | import cn.iocoder.yudao.module.trade.controller.admin.brokerage.vo.withdraw.BrokerageWithdrawRespVO; | ... | ... |
yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/convert/order/TradeOrderConvert.java
| ... | ... | @@ -5,7 +5,7 @@ import cn.hutool.core.util.StrUtil; |
| 5 | 5 | import cn.iocoder.yudao.framework.common.pojo.PageResult; |
| 6 | 6 | import cn.iocoder.yudao.framework.common.util.collection.CollectionUtils; |
| 7 | 7 | import cn.iocoder.yudao.framework.common.util.string.StrUtils; |
| 8 | -import cn.iocoder.yudao.framework.dict.core.util.DictFrameworkUtils; | |
| 8 | +import cn.iocoder.yudao.framework.dict.util.DictFrameworkUtils; | |
| 9 | 9 | import cn.iocoder.yudao.framework.ip.core.utils.AreaUtils; |
| 10 | 10 | import cn.iocoder.yudao.module.member.api.address.dto.MemberAddressRespDTO; |
| 11 | 11 | import cn.iocoder.yudao.module.member.api.user.dto.MemberUserRespDTO; | ... | ... |
yudao-module-pay/yudao-module-pay-biz/pom.xml
| ... | ... | @@ -79,11 +79,6 @@ |
| 79 | 79 | <groupId>cn.iocoder.boot</groupId> |
| 80 | 80 | <artifactId>yudao-spring-boot-starter-excel</artifactId> |
| 81 | 81 | </dependency> |
| 82 | - <dependency> | |
| 83 | - <groupId>cn.iocoder.boot</groupId> | |
| 84 | - <artifactId>yudao-spring-boot-starter-biz-dict</artifactId> | |
| 85 | - </dependency> | |
| 86 | - | |
| 87 | 82 | </dependencies> |
| 88 | 83 | |
| 89 | 84 | </project> | ... | ... |
yudao-module-pay/yudao-module-pay-biz/src/main/java/cn/iocoder/yudao/module/pay/convert/wallet/PayWalletRechargeConvert.java
| 1 | 1 | package cn.iocoder.yudao.module.pay.convert.wallet; |
| 2 | 2 | |
| 3 | -import cn.hutool.core.collection.CollUtil; | |
| 4 | 3 | import cn.iocoder.yudao.framework.common.pojo.PageResult; |
| 5 | 4 | import cn.iocoder.yudao.framework.common.util.collection.CollectionUtils; |
| 6 | 5 | import cn.iocoder.yudao.framework.common.util.collection.MapUtils; |
| 7 | 6 | import cn.iocoder.yudao.framework.common.util.object.BeanUtils; |
| 8 | -import cn.iocoder.yudao.framework.dict.core.util.DictFrameworkUtils; | |
| 7 | +import cn.iocoder.yudao.framework.dict.util.DictFrameworkUtils; | |
| 9 | 8 | import cn.iocoder.yudao.module.pay.controller.app.wallet.vo.recharge.AppPayWalletRechargeCreateRespVO; |
| 10 | 9 | import cn.iocoder.yudao.module.pay.controller.app.wallet.vo.recharge.AppPayWalletRechargeRespVO; |
| 11 | 10 | import cn.iocoder.yudao.module.pay.dal.dataobject.order.PayOrderDO; | ... | ... |
yudao-module-system/yudao-module-system-biz/pom.xml
| ... | ... | @@ -36,10 +36,6 @@ |
| 36 | 36 | </dependency> |
| 37 | 37 | <dependency> |
| 38 | 38 | <groupId>cn.iocoder.boot</groupId> |
| 39 | - <artifactId>yudao-spring-boot-starter-biz-dict</artifactId> | |
| 40 | - </dependency> | |
| 41 | - <dependency> | |
| 42 | - <groupId>cn.iocoder.boot</groupId> | |
| 43 | 39 | <artifactId>yudao-spring-boot-starter-biz-data-permission</artifactId> |
| 44 | 40 | </dependency> |
| 45 | 41 | <dependency> | ... | ... |
yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/framework/operatelog/core/BooleanParseFunction.java
| 1 | 1 | package cn.iocoder.yudao.module.system.framework.operatelog.core; |
| 2 | 2 | |
| 3 | 3 | import cn.hutool.core.util.StrUtil; |
| 4 | -import cn.iocoder.yudao.framework.dict.core.util.DictFrameworkUtils; | |
| 4 | +import cn.iocoder.yudao.framework.dict.util.DictFrameworkUtils; | |
| 5 | 5 | import cn.iocoder.yudao.module.infra.enums.DictTypeConstants; |
| 6 | 6 | import com.mzt.logapi.service.IParseFunction; |
| 7 | 7 | import lombok.extern.slf4j.Slf4j; | ... | ... |
yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/framework/operatelog/core/SexParseFunction.java
| 1 | 1 | package cn.iocoder.yudao.module.system.framework.operatelog.core; |
| 2 | 2 | |
| 3 | 3 | import cn.hutool.core.util.StrUtil; |
| 4 | -import cn.iocoder.yudao.framework.dict.core.util.DictFrameworkUtils; | |
| 4 | +import cn.iocoder.yudao.framework.dict.util.DictFrameworkUtils; | |
| 5 | 5 | import cn.iocoder.yudao.module.system.enums.DictTypeConstants; |
| 6 | 6 | import com.mzt.logapi.service.IParseFunction; |
| 7 | 7 | import lombok.extern.slf4j.Slf4j; | ... | ... |