BJ_ZTEITS-Developers / parking-cloud-yudao

Commit dd2f5ba2c301bcc0ea4404c0ee2b147808e72b0c

Authored by YunaiV
1 parent d9a5ef33

统一 boot 和 cloud 代码

Inline Side-by-side
Showing 8 changed files with 54 additions and 85 deletions
... ... @@ -15,12 +15,12 @@
15 15 <!-- 各种 module 拓展 -->
16 16 <module>yudao-module-system</module>
17 17 <module>yudao-module-infra</module>
18   -<!-- <module>yudao-module-member</module>-->
19   - <!-- <module>yudao-module-bpm</module>-->
20   -<!-- <module>yudao-module-report</module>-->
21   -<!-- <module>yudao-module-mp</module>-->
22   -<!-- <module>yudao-module-pay</module>-->
23   -<!-- <module>yudao-module-mall</module>-->
  18 + <module>yudao-module-member</module>
  19 + <module>yudao-module-bpm</module>
  20 + <module>yudao-module-report</module>
  21 + <module>yudao-module-mp</module>
  22 + <module>yudao-module-pay</module>
  23 + <module>yudao-module-mall</module>
24 24 <!-- 示例项目 -->
25 25 <!-- <module>yudao-example</module>-->
26 26 </modules>
... ...
yudao-framework/yudao-spring-boot-starter-biz-error-code/src/main/java/cn/iocoder/yudao/framework/errorcode/config/YudaoErrorCodeConfiguration.java renamed to yudao-framework/yudao-spring-boot-starter-biz-error-code/src/main/java/cn/iocoder/yudao/framework/errorcode/config/YudaoErrorCodeAutoConfiguration.java
  View file @dd2f5ba
... ... @@ -21,7 +21,7 @@ import org.springframework.scheduling.annotation.EnableScheduling;
21 21 @ConditionalOnProperty(prefix = "yudao.error-code", value = "enable", matchIfMissing = true) // 允许使用 yudao.error-code.enable=false 禁用访问日志
22 22 @EnableConfigurationProperties(ErrorCodeProperties.class)
23 23 @EnableScheduling // 开启调度任务的功能，因为 ErrorCodeRemoteLoader 通过定时刷新错误码
24   -public class YudaoErrorCodeConfiguration {
  24 +public class YudaoErrorCodeAutoConfiguration {
25 25  
26 26 @Bean
27 27 public ErrorCodeAutoGenerator errorCodeAutoGenerator(@Value("${spring.application.name}") String applicationName,
... ...
yudao-framework/yudao-spring-boot-starter-biz-error-code/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
  View file @dd2f5ba
1   -cn.iocoder.yudao.framework.errorcode.config.YudaoErrorCodeConfiguration
2 1 \ No newline at end of file
  2 +cn.iocoder.yudao.framework.errorcode.config.YudaoErrorCodeAutoConfiguration
... ...
yudao-framework/yudao-spring-boot-starter-biz-tenant/src/test/java/cn/iocoder/yudao/framework/tenant/core/job/TestJob.java deleted
View file @d9a5ef3
1   -package cn.iocoder.yudao.framework.tenant.core.job;
2   -
3   -import cn.hutool.core.collection.CollUtil;
4   -import cn.iocoder.yudao.framework.quartz.core.handler.JobHandler;
5   -import cn.iocoder.yudao.framework.tenant.core.context.TenantContextHolder;
6   -import org.springframework.stereotype.Component;
7   -
8   -import java.util.List;
9   -import java.util.concurrent.CopyOnWriteArrayList;
10   -
11   -@Component
12   -public class TestJob implements JobHandler {
13   -
14   - private final List<Long> tenantIds = new CopyOnWriteArrayList<>();
15   -
16   - @Override
17   - @TenantJob // 标记多租户
18   - public String execute(String param) throws Exception {
19   - tenantIds.add(TenantContextHolder.getTenantId());
20   - return "success";
21   - }
22   -
23   - public List<Long> getTenantIds() {
24   - CollUtil.sort(tenantIds, Long::compareTo);
25   - return tenantIds;
26   - }
27   -
28   -}
yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/framework/security/config/SecurityConfiguration.java
  View file @dd2f5ba
... ... @@ -29,8 +29,6 @@ public class SecurityConfiguration {
29 29 .antMatchers("/swagger-resources/**").anonymous()
30 30 .antMatchers("/webjars/**").anonymous()
31 31 .antMatchers("/*/api-docs").anonymous();
32   - // 积木报表
33   - registry.antMatchers("/jmreport/**").permitAll();
34 32 // Spring Boot Actuator 的安全配置
35 33 registry.antMatchers("/actuator").anonymous()
36 34 .antMatchers("/actuator/**").anonymous();
... ...
yudao-module-member/yudao-module-member-biz/src/test/java/cn/iocoder/yudao/module/member/service/address/AddressServiceImplTest.java renamed to yudao-module-member/yudao-module-member-biz/src/test/java/cn/iocoder/yudao/module/member/service/address/MemberAddressServiceImplTest.java
  View file @dd2f5ba
... ... @@ -24,7 +24,7 @@ import static org.junit.jupiter.api.Assertions.assertNull;
24 24 * @author 芋道源码
25 25 */
26 26 @Import(AddressServiceImpl.class)
27   -public class AddressServiceImplTest extends BaseDbUnitTest {
  27 +public class MemberAddressServiceImplTest extends BaseDbUnitTest {
28 28  
29 29 @Resource
30 30 private AddressServiceImpl addressService;
... ...
yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/convert/dict/DictDataConvert.java
  View file @dd2f5ba
... ... @@ -31,5 +31,4 @@ public interface DictDataConvert {
31 31  
32 32 List<AppDictDataRespVO> convertList03(List<DictDataDO> list);
33 33  
34   - List<DictDataRespDTO> convertList04(List<DictDataDO> list);
35 34 }
... ...
yudao-server/pom.xml
  View file @dd2f5ba
... ... @@ -37,59 +37,59 @@
37 37 </dependency>
38 38  
39 39 <!-- 会员中心。默认注释，保证编译速度 -->
40   -<!-- <dependency>-->
41   -<!-- <groupId>cn.iocoder.boot</groupId>-->
42   -<!-- <artifactId>yudao-module-member-biz</artifactId>-->
43   -<!-- <version>${revision}</version>-->
44   -<!-- </dependency>-->
  40 + <dependency>
  41 + <groupId>cn.iocoder.boot</groupId>
  42 + <artifactId>yudao-module-member-biz</artifactId>
  43 + <version>${revision}</version>
  44 + </dependency>
45 45  
46 46 <!-- 数据报表。默认注释，保证编译速度 -->
47   -<!-- <dependency>-->
48   -<!-- <groupId>cn.iocoder.boot</groupId>-->
49   -<!-- <artifactId>yudao-module-report-biz</artifactId>-->
50   -<!-- <version>${revision}</version>-->
51   -<!-- </dependency>-->
  47 + <dependency>
  48 + <groupId>cn.iocoder.boot</groupId>
  49 + <artifactId>yudao-module-report-biz</artifactId>
  50 + <version>${revision}</version>
  51 + </dependency>
52 52 <!-- 工作流。默认注释，保证编译速度 -->
53   -<!-- <dependency>-->
54   -<!-- <groupId>cn.iocoder.boot</groupId>-->
55   -<!-- <artifactId>yudao-module-bpm-biz</artifactId>-->
56   -<!-- <version>${revision}</version>-->
57   -<!-- </dependency>-->
  53 + <dependency>
  54 + <groupId>cn.iocoder.boot</groupId>
  55 + <artifactId>yudao-module-bpm-biz</artifactId>
  56 + <version>${revision}</version>
  57 + </dependency>
58 58 <!-- 支付服务。默认注释，保证编译速度 -->
59   -<!-- <dependency>-->
60   -<!-- <groupId>cn.iocoder.boot</groupId>-->
61   -<!-- <artifactId>yudao-module-pay-biz</artifactId>-->
62   -<!-- <version>${revision}</version>-->
63   -<!-- </dependency>-->
  59 + <dependency>
  60 + <groupId>cn.iocoder.boot</groupId>
  61 + <artifactId>yudao-module-pay-biz</artifactId>
  62 + <version>${revision}</version>
  63 + </dependency>
64 64  
65 65 <!-- 微信公众号模块。默认注释，保证编译速度 -->
66   -<!-- <dependency>-->
67   -<!-- <groupId>cn.iocoder.boot</groupId>-->
68   -<!-- <artifactId>yudao-module-mp-biz</artifactId>-->
69   -<!-- <version>${revision}</version>-->
70   -<!-- </dependency>-->
  66 + <dependency>
  67 + <groupId>cn.iocoder.boot</groupId>
  68 + <artifactId>yudao-module-mp-biz</artifactId>
  69 + <version>${revision}</version>
  70 + </dependency>
71 71  
72 72 <!-- 商城相关模块。默认注释，保证编译速度-->
73   -<!-- <dependency>-->
74   -<!-- <groupId>cn.iocoder.boot</groupId>-->
75   -<!-- <artifactId>yudao-module-promotion-biz</artifactId>-->
76   -<!-- <version>${revision}</version>-->
77   -<!-- </dependency>-->
78   -<!-- <dependency>-->
79   -<!-- <groupId>cn.iocoder.boot</groupId>-->
80   -<!-- <artifactId>yudao-module-product-biz</artifactId>-->
81   -<!-- <version>${revision}</version>-->
82   -<!-- </dependency>-->
83   -<!-- <dependency>-->
84   -<!-- <groupId>cn.iocoder.boot</groupId>-->
85   -<!-- <artifactId>yudao-module-trade-biz</artifactId>-->
86   -<!-- <version>${revision}</version>-->
87   -<!-- </dependency>-->
88   -<!-- <dependency>-->
89   -<!-- <groupId>cn.iocoder.boot</groupId>-->
90   -<!-- <artifactId>yudao-module-statistics-biz</artifactId>-->
91   -<!-- <version>${revision}</version>-->
92   -<!-- </dependency>-->
  73 + <dependency>
  74 + <groupId>cn.iocoder.boot</groupId>
  75 + <artifactId>yudao-module-promotion-biz</artifactId>
  76 + <version>${revision}</version>
  77 + </dependency>
  78 + <dependency>
  79 + <groupId>cn.iocoder.boot</groupId>
  80 + <artifactId>yudao-module-product-biz</artifactId>
  81 + <version>${revision}</version>
  82 + </dependency>
  83 + <dependency>
  84 + <groupId>cn.iocoder.boot</groupId>
  85 + <artifactId>yudao-module-trade-biz</artifactId>
  86 + <version>${revision}</version>
  87 + </dependency>
  88 + <dependency>
  89 + <groupId>cn.iocoder.boot</groupId>
  90 + <artifactId>yudao-module-statistics-biz</artifactId>
  91 + <version>${revision}</version>
  92 + </dependency>
93 93  
94 94 <!-- spring boot 配置所需依赖 -->
95 95 <dependency>
... ...