BJ_ZTEITS-Developers / parking-cloud-yudao

Commit 2aec04a88865bf6cb0ffd11d07595115912b5f31

Authored by fengdan
1 parent fabf9693

yudao-module-wechat-mp 模块合并到 yudao-module-wechat 模块 中 

weixin-java-mp 更新为 最新正式版本 4.3.0
Inline Side-by-side
Showing 53 changed files with 184 additions and 322 deletions
... ... @@ -18,7 +18,6 @@
18 18 <module>yudao-module-system</module>
19 19 <module>yudao-module-infra</module>
20 20 <module>yudao-module-pay</module>
21   - <module>yudao-module-wechat-mp</module>
22 21 <module>yudao-module-wechat</module>
23 22 </modules>
24 23  
... ...
yudao-dependencies/pom.xml
  View file @2aec04a
... ... @@ -64,7 +64,7 @@
64 64 <tencentcloud-sdk-java.version>3.1.471</tencentcloud-sdk-java.version>
65 65 <yunpian-java-sdk.version>1.2.7</yunpian-java-sdk.version>
66 66 <justauth.version>1.4.0</justauth.version>
67   - <weixin-java-mp.version>3.3.0</weixin-java-mp.version>
  67 + <weixin-java-mp.version>4.3.0</weixin-java-mp.version>
68 68 </properties>
69 69  
70 70 <dependencyManagement>
... ...
yudao-module-wechat-mp/pom.xml deleted
View file @fabf969
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   - <artifactId>yudao</artifactId>
7   - <groupId>cn.iocoder.boot</groupId>
8   - <version>${revision}</version>
9   - </parent>
10   - <modelVersion>4.0.0</modelVersion>
11   - <modules>
12   - <module>yudao-module-wechat-mp-api</module>
13   - <module>yudao-module-wechat-mp-biz</module>
14   - </modules>
15   - <artifactId>yudao-module-wechat-mp</artifactId>
16   - <packaging>pom</packaging>
17   -
18   - <name>${project.artifactId}</name>
19   - <description>
20   - 微信公众号模块，主要实现 账号管理，粉丝管理 等功能。
21   - </description>
22   -
23   -
24   -</project>
yudao-module-wechat-mp/yudao-module-wechat-mp-api/pom.xml deleted
View file @fabf969
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   - <artifactId>yudao-module-wechat-mp</artifactId>
7   - <groupId>cn.iocoder.boot</groupId>
8   - <version>${revision}</version>
9   - </parent>
10   - <modelVersion>4.0.0</modelVersion>
11   - <artifactId>yudao-module-wechat-mp-api</artifactId>
12   - <packaging>jar</packaging>
13   -
14   - <name>${project.artifactId}</name>
15   - <description>
16   - 微信公众号模块 API，暴露给其它模块调用
17   - </description>
18   -
19   - <dependencies>
20   - <dependency>
21   - <groupId>cn.iocoder.boot</groupId>
22   - <artifactId>yudao-common</artifactId>
23   - </dependency>
24   - </dependencies>
25   -
26   -</project>
yudao-module-wechat-mp/yudao-module-wechat-mp-biz/pom.xml deleted
View file @fabf969
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   - <artifactId>yudao-module-wechat-mp</artifactId>
7   - <groupId>cn.iocoder.boot</groupId>
8   - <version>${revision}</version>
9   - </parent>
10   - <modelVersion>4.0.0</modelVersion>
11   - <packaging>jar</packaging>
12   -
13   - <artifactId>yudao-module-wechat-mp-biz</artifactId>
14   -
15   - <name>${project.artifactId}</name>
16   - <description>
17   - 微信公众号模块，主要实现 账号管理，粉丝管理 等功能。
18   - </description>
19   -
20   - <dependencies>
21   - <dependency>
22   - <groupId>cn.iocoder.boot</groupId>
23   - <artifactId>yudao-module-wechat-mp-api</artifactId>
24   - <version>${revision}</version>
25   - </dependency>
26   -
27   - <!-- 业务组件 -->
28   - <dependency>
29   - <groupId>cn.iocoder.boot</groupId>
30   - <artifactId>yudao-spring-boot-starter-biz-operatelog</artifactId>
31   - </dependency>
32   -
33   - <!-- Web 相关 -->
34   - <dependency>
35   - <groupId>cn.iocoder.boot</groupId>
36   - <artifactId>yudao-spring-boot-starter-web</artifactId>
37   - </dependency>
38   -
39   - <dependency>
40   - <groupId>cn.iocoder.boot</groupId>
41   - <artifactId>yudao-spring-boot-starter-security</artifactId>
42   - </dependency>
43   -
44   - <!-- DB 相关 -->
45   - <dependency>
46   - <groupId>cn.iocoder.boot</groupId>
47   - <artifactId>yudao-spring-boot-starter-mybatis</artifactId>
48   - </dependency>
49   -
50   - <!-- Test 测试相关 -->
51   - <dependency>
52   - <groupId>cn.iocoder.boot</groupId>
53   - <artifactId>yudao-spring-boot-starter-test</artifactId>
54   - </dependency>
55   - <dependency>
56   - <groupId>cn.iocoder.boot</groupId>
57   - <artifactId>yudao-spring-boot-starter-excel</artifactId>
58   - </dependency>
59   - <dependency>
60   - <groupId>cn.iocoder.boot</groupId>
61   - <artifactId>yudao-spring-boot-starter-mq</artifactId>
62   - </dependency>
63   -
64   - <dependency>
65   - <groupId>org.springframework.boot</groupId>
66   - <artifactId>spring-boot-configuration-processor</artifactId>
67   - <optional>true</optional>
68   - </dependency>
69   -
70   - <dependency>
71   - <groupId>com.github.binarywang</groupId>
72   - <artifactId>weixin-java-mp</artifactId>
73   - </dependency>
74   -
75   - </dependencies>
76   -
77   -</project>
yudao-module-wechat-mp/yudao-module-wechat-mp-api/src/main/java/cn/iocoder/yudao/module/wechatMp/enums/ErrorCodeConstants.java renamed to yudao-module-wechat/yudao-module-mp-api/src/main/java/cn/iocoder/yudao/module/mp/enums/ErrorCodeConstants.java
  View file @2aec04a
1   -package cn.iocoder.yudao.module.wechatMp.enums;
  1 +package cn.iocoder.yudao.module.mp.enums;
2 2  
3 3 import cn.iocoder.yudao.framework.common.exception.ErrorCode;
4 4  
... ...
yudao-module-wechat/yudao-module-mp-api/src/main/java/cn/iocoder/yudao/module/mp/package-info.java 0 → 100644
  View file @2aec04a
  1 +/**
  2 + * mp 模块，我们放微信微信公众号。
  3 + * 例如说：提供微信公众号的账号、菜单、粉丝、标签、消息、自动回复、素材、模板通知、运营数据等功能
  4 + *
  5 + * 1. Controller URL：以 /mp/ 开头，避免和其它 Module 冲突
  6 + * 2. DataObject 表名：以 mp_ 开头，方便在数据库中区分
  7 + */
  8 +package cn.iocoder.yudao.module.mp;
... ...
yudao-module-wechat/yudao-module-mp-biz/pom.xml
  View file @2aec04a
... ... @@ -79,6 +79,16 @@
79 79 </dependency>
80 80  
81 81 <!-- 工具类相关 -->
  82 +
  83 + <dependency>
  84 + <groupId>com.github.binarywang</groupId>
  85 + <artifactId>weixin-java-mp</artifactId>
  86 + </dependency>
  87 + <dependency>
  88 + <groupId>cn.iocoder.boot</groupId>
  89 + <artifactId>yudao-spring-boot-starter-excel</artifactId>
  90 + </dependency>
  91 +
82 92 </dependencies>
83 93  
84 94 </project>
... ...
yudao-module-wechat-mp/yudao-module-wechat-mp-biz/src/main/java/cn/iocoder/yudao/module/wechatMp/controller/admin/account/WxAccountController.java renamed to yudao-module-wechat/yudao-module-mp-biz/src/main/java/cn/iocoder/yudao/module/mp/admin/account/WxAccountController.java
  View file @2aec04a
1   -package cn.iocoder.yudao.module.wechatMp.controller.admin.account;
  1 +package cn.iocoder.yudao.module.mp.admin.account;
2 2  
3 3 import cn.iocoder.yudao.framework.common.pojo.CommonResult;
4 4 import cn.iocoder.yudao.framework.common.pojo.PageResult;
5 5 import cn.iocoder.yudao.framework.excel.core.util.ExcelUtils;
6 6 import cn.iocoder.yudao.framework.operatelog.core.annotations.OperateLog;
7   -import cn.iocoder.yudao.module.wechatMp.controller.admin.account.vo.*;
8   -import cn.iocoder.yudao.module.wechatMp.convert.account.WxAccountConvert;
9   -import cn.iocoder.yudao.module.wechatMp.dal.dataobject.account.WxAccountDO;
10   -import cn.iocoder.yudao.module.wechatMp.service.account.WxAccountService;
  7 +import cn.iocoder.yudao.module.mp.admin.account.vo.*;
  8 +import cn.iocoder.yudao.module.mp.convert.account.WxAccountConvert;
  9 +import cn.iocoder.yudao.module.mp.dal.dataobject.account.WxAccountDO;
  10 +import cn.iocoder.yudao.module.mp.service.account.WxAccountService;
11 11 import io.swagger.annotations.Api;
12 12 import io.swagger.annotations.ApiImplicitParam;
13 13 import io.swagger.annotations.ApiOperation;
... ...
yudao-module-wechat-mp/yudao-module-wechat-mp-biz/src/main/java/cn/iocoder/yudao/module/wechatMp/controller/admin/account/vo/WxAccountBaseVO.java renamed to yudao-module-wechat/yudao-module-mp-biz/src/main/java/cn/iocoder/yudao/module/mp/admin/account/vo/WxAccountBaseVO.java
  View file @2aec04a
1   -package cn.iocoder.yudao.module.wechatMp.controller.admin.account.vo;
  1 +package cn.iocoder.yudao.module.mp.admin.account.vo;
2 2  
3 3 import lombok.*;
4 4 import java.util.*;
... ...
yudao-module-wechat-mp/yudao-module-wechat-mp-biz/src/main/java/cn/iocoder/yudao/module/wechatMp/controller/admin/account/vo/WxAccountCreateReqVO.java renamed to yudao-module-wechat/yudao-module-mp-biz/src/main/java/cn/iocoder/yudao/module/mp/admin/account/vo/WxAccountCreateReqVO.java
  View file @2aec04a
1   -package cn.iocoder.yudao.module.wechatMp.controller.admin.account.vo;
  1 +package cn.iocoder.yudao.module.mp.admin.account.vo;
2 2  
3 3 import lombok.*;
4   -import java.util.*;
5 4 import io.swagger.annotations.*;
6   -import javax.validation.constraints.*;
7 5  
8 6 @ApiModel("管理后台 - 公众号账户创建 Request VO")
9 7 @Data
... ...
yudao-module-wechat-mp/yudao-module-wechat-mp-biz/src/main/java/cn/iocoder/yudao/module/wechatMp/controller/admin/account/vo/WxAccountExcelVO.java renamed to yudao-module-wechat/yudao-module-mp-biz/src/main/java/cn/iocoder/yudao/module/mp/admin/account/vo/WxAccountExcelVO.java
  View file @2aec04a
1   -package cn.iocoder.yudao.module.wechatMp.controller.admin.account.vo;
  1 +package cn.iocoder.yudao.module.mp.admin.account.vo;
2 2  
3 3 import lombok.*;
4 4 import java.util.*;
... ...
yudao-module-wechat-mp/yudao-module-wechat-mp-biz/src/main/java/cn/iocoder/yudao/module/wechatMp/controller/admin/account/vo/WxAccountExportReqVO.java renamed to yudao-module-wechat/yudao-module-mp-biz/src/main/java/cn/iocoder/yudao/module/mp/admin/account/vo/WxAccountExportReqVO.java
  View file @2aec04a
1   -package cn.iocoder.yudao.module.wechatMp.controller.admin.account.vo;
  1 +package cn.iocoder.yudao.module.mp.admin.account.vo;
2 2  
3 3 import lombok.*;
4 4 import java.util.*;
... ...
yudao-module-wechat-mp/yudao-module-wechat-mp-biz/src/main/java/cn/iocoder/yudao/module/wechatMp/controller/admin/account/vo/WxAccountPageReqVO.java renamed to yudao-module-wechat/yudao-module-mp-biz/src/main/java/cn/iocoder/yudao/module/mp/admin/account/vo/WxAccountPageReqVO.java
  View file @2aec04a
1   -package cn.iocoder.yudao.module.wechatMp.controller.admin.account.vo;
  1 +package cn.iocoder.yudao.module.mp.admin.account.vo;
2 2  
3 3 import lombok.*;
4 4 import java.util.*;
... ...
yudao-module-wechat-mp/yudao-module-wechat-mp-biz/src/main/java/cn/iocoder/yudao/module/wechatMp/controller/admin/account/vo/WxAccountRespVO.java renamed to yudao-module-wechat/yudao-module-mp-biz/src/main/java/cn/iocoder/yudao/module/mp/admin/account/vo/WxAccountRespVO.java
  View file @2aec04a
1   -package cn.iocoder.yudao.module.wechatMp.controller.admin.account.vo;
  1 +package cn.iocoder.yudao.module.mp.admin.account.vo;
2 2  
3 3 import lombok.*;
4 4 import java.util.*;
... ...
yudao-module-wechat-mp/yudao-module-wechat-mp-biz/src/main/java/cn/iocoder/yudao/module/wechatMp/controller/admin/account/vo/WxAccountUpdateReqVO.java renamed to yudao-module-wechat/yudao-module-mp-biz/src/main/java/cn/iocoder/yudao/module/mp/admin/account/vo/WxAccountUpdateReqVO.java
  View file @2aec04a
1   -package cn.iocoder.yudao.module.wechatMp.controller.admin.account.vo;
  1 +package cn.iocoder.yudao.module.mp.admin.account.vo;
2 2  
3 3 import lombok.*;
4   -import java.util.*;
5 4 import io.swagger.annotations.*;
6 5 import javax.validation.constraints.*;
7 6  
... ...
yudao-module-wechat-mp/yudao-module-wechat-mp-biz/src/main/java/cn/iocoder/yudao/module/wechatMp/controller/admin/accountfans/WxAccountFansController.java renamed to yudao-module-wechat/yudao-module-mp-biz/src/main/java/cn/iocoder/yudao/module/mp/admin/accountfans/WxAccountFansController.java
  View file @2aec04a
1   -package cn.iocoder.yudao.module.wechatMp.controller.admin.accountfans;
  1 +package cn.iocoder.yudao.module.mp.admin.accountfans;
2 2  
3   -import org.springframework.web.bind.annotation.*;
4   -import javax.annotation.Resource;
5   -import org.springframework.validation.annotation.Validated;
  3 +import cn.iocoder.yudao.framework.common.pojo.CommonResult;
  4 +import cn.iocoder.yudao.framework.common.pojo.PageResult;
  5 +import cn.iocoder.yudao.framework.excel.core.util.ExcelUtils;
  6 +import cn.iocoder.yudao.framework.operatelog.core.annotations.OperateLog;
  7 +import cn.iocoder.yudao.module.mp.admin.accountfans.vo.*;
  8 +import cn.iocoder.yudao.module.mp.convert.accountfans.WxAccountFansConvert;
  9 +import cn.iocoder.yudao.module.mp.dal.dataobject.accountfans.WxAccountFansDO;
  10 +import cn.iocoder.yudao.module.mp.service.accountfans.WxAccountFansService;
  11 +import io.swagger.annotations.Api;
  12 +import io.swagger.annotations.ApiImplicitParam;
  13 +import io.swagger.annotations.ApiOperation;
6 14 import org.springframework.security.access.prepost.PreAuthorize;
7   -import io.swagger.annotations.*;
  15 +import org.springframework.validation.annotation.Validated;
  16 +import org.springframework.web.bind.annotation.*;
8 17  
9   -import javax.validation.constraints.*;
10   -import javax.validation.*;
11   -import javax.servlet.http.*;
12   -import java.util.*;
  18 +import javax.annotation.Resource;
  19 +import javax.servlet.http.HttpServletResponse;
  20 +import javax.validation.Valid;
13 21 import java.io.IOException;
  22 +import java.util.Collection;
  23 +import java.util.List;
14 24  
15   -import cn.iocoder.yudao.framework.common.pojo.PageResult;
16   -import cn.iocoder.yudao.framework.common.pojo.CommonResult;
17 25 import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
18   -
19   -import cn.iocoder.yudao.framework.excel.core.util.ExcelUtils;
20   -
21   -import cn.iocoder.yudao.framework.operatelog.core.annotations.OperateLog;
22   -import static cn.iocoder.yudao.framework.operatelog.core.enums.OperateTypeEnum.*;
23   -
24   -import cn.iocoder.yudao.module.wechatMp.controller.admin.accountfans.vo.*;
25   -import cn.iocoder.yudao.module.wechatMp.dal.dataobject.accountfans.WxAccountFansDO;
26   -import cn.iocoder.yudao.module.wechatMp.convert.accountfans.WxAccountFansConvert;
27   -import cn.iocoder.yudao.module.wechatMp.service.accountfans.WxAccountFansService;
  26 +import static cn.iocoder.yudao.framework.operatelog.core.enums.OperateTypeEnum.EXPORT;
28 27  
29 28 @Api(tags = "管理后台 - 微信公众号粉丝")
30 29 @RestController
... ... @@ -90,7 +89,7 @@ public class WxAccountFansController {
90 89 @PreAuthorize("@ss.hasPermission('wechatMp:wx-account-fans:export')")
91 90 @OperateLog(type = EXPORT)
92 91 public void exportWxAccountFansExcel(@Valid WxAccountFansExportReqVO exportReqVO,
93   - HttpServletResponse response) throws IOException {
  92 + HttpServletResponse response) throws IOException {
94 93 List<WxAccountFansDO> list = wxAccountFansService.getWxAccountFansList(exportReqVO);
95 94 // 导出 Excel
96 95 List<WxAccountFansExcelVO> datas = WxAccountFansConvert.INSTANCE.convertList02(list);
... ...
yudao-module-wechat-mp/yudao-module-wechat-mp-biz/src/main/java/cn/iocoder/yudao/module/wechatMp/controller/admin/accountfans/vo/WxAccountFansBaseVO.java renamed to yudao-module-wechat/yudao-module-mp-biz/src/main/java/cn/iocoder/yudao/module/mp/admin/accountfans/vo/WxAccountFansBaseVO.java
  View file @2aec04a
1   -package cn.iocoder.yudao.module.wechatMp.controller.admin.accountfans.vo;
  1 +package cn.iocoder.yudao.module.mp.admin.accountfans.vo;
2 2  
3 3 import lombok.*;
4 4 import java.util.*;
... ...
yudao-module-wechat-mp/yudao-module-wechat-mp-biz/src/main/java/cn/iocoder/yudao/module/wechatMp/controller/admin/accountfans/vo/WxAccountFansCreateReqVO.java renamed to yudao-module-wechat/yudao-module-mp-biz/src/main/java/cn/iocoder/yudao/module/mp/admin/accountfans/vo/WxAccountFansCreateReqVO.java
  View file @2aec04a
1   -package cn.iocoder.yudao.module.wechatMp.controller.admin.accountfans.vo;
  1 +package cn.iocoder.yudao.module.mp.admin.accountfans.vo;
2 2  
3 3 import lombok.*;
4   -import java.util.*;
5 4 import io.swagger.annotations.*;
6   -import javax.validation.constraints.*;
7 5  
8 6 @ApiModel("管理后台 - 微信公众号粉丝创建 Request VO")
9 7 @Data
... ...
yudao-module-wechat-mp/yudao-module-wechat-mp-biz/src/main/java/cn/iocoder/yudao/module/wechatMp/controller/admin/accountfans/vo/WxAccountFansExcelVO.java renamed to yudao-module-wechat/yudao-module-mp-biz/src/main/java/cn/iocoder/yudao/module/mp/admin/accountfans/vo/WxAccountFansExcelVO.java
  View file @2aec04a
1   -package cn.iocoder.yudao.module.wechatMp.controller.admin.accountfans.vo;
  1 +package cn.iocoder.yudao.module.mp.admin.accountfans.vo;
2 2  
3 3 import lombok.*;
4 4 import java.util.*;
... ...
yudao-module-wechat-mp/yudao-module-wechat-mp-biz/src/main/java/cn/iocoder/yudao/module/wechatMp/controller/admin/accountfans/vo/WxAccountFansExportReqVO.java renamed to yudao-module-wechat/yudao-module-mp-biz/src/main/java/cn/iocoder/yudao/module/mp/admin/accountfans/vo/WxAccountFansExportReqVO.java
  View file @2aec04a
1   -package cn.iocoder.yudao.module.wechatMp.controller.admin.accountfans.vo;
  1 +package cn.iocoder.yudao.module.mp.admin.accountfans.vo;
2 2  
3 3 import lombok.*;
4 4 import java.util.*;
... ...
yudao-module-wechat-mp/yudao-module-wechat-mp-biz/src/main/java/cn/iocoder/yudao/module/wechatMp/controller/admin/accountfans/vo/WxAccountFansPageReqVO.java renamed to yudao-module-wechat/yudao-module-mp-biz/src/main/java/cn/iocoder/yudao/module/mp/admin/accountfans/vo/WxAccountFansPageReqVO.java
  View file @2aec04a
1   -package cn.iocoder.yudao.module.wechatMp.controller.admin.accountfans.vo;
  1 +package cn.iocoder.yudao.module.mp.admin.accountfans.vo;
2 2  
3 3 import lombok.*;
4 4 import java.util.*;
... ...
yudao-module-wechat-mp/yudao-module-wechat-mp-biz/src/main/java/cn/iocoder/yudao/module/wechatMp/controller/admin/accountfans/vo/WxAccountFansRespVO.java renamed to yudao-module-wechat/yudao-module-mp-biz/src/main/java/cn/iocoder/yudao/module/mp/admin/accountfans/vo/WxAccountFansRespVO.java
  View file @2aec04a
1   -package cn.iocoder.yudao.module.wechatMp.controller.admin.accountfans.vo;
  1 +package cn.iocoder.yudao.module.mp.admin.accountfans.vo;
2 2  
3 3 import lombok.*;
4 4 import java.util.*;
... ...
yudao-module-wechat-mp/yudao-module-wechat-mp-biz/src/main/java/cn/iocoder/yudao/module/wechatMp/controller/admin/accountfans/vo/WxAccountFansUpdateReqVO.java renamed to yudao-module-wechat/yudao-module-mp-biz/src/main/java/cn/iocoder/yudao/module/mp/admin/accountfans/vo/WxAccountFansUpdateReqVO.java
  View file @2aec04a
1   -package cn.iocoder.yudao.module.wechatMp.controller.admin.accountfans.vo;
  1 +package cn.iocoder.yudao.module.mp.admin.accountfans.vo;
2 2  
3 3 import lombok.*;
4   -import java.util.*;
5 4 import io.swagger.annotations.*;
6 5 import javax.validation.constraints.*;
7 6  
... ...
yudao-module-wechat-mp/yudao-module-wechat-mp-biz/src/main/java/cn/iocoder/yudao/module/wechatMp/builder/AbstractBuilder.java renamed to yudao-module-wechat/yudao-module-mp-biz/src/main/java/cn/iocoder/yudao/module/mp/builder/AbstractBuilder.java
  View file @2aec04a
1   -package cn.iocoder.yudao.module.wechatMp.builder;
  1 +package cn.iocoder.yudao.module.mp.builder;
2 2  
3 3 import me.chanjar.weixin.mp.api.WxMpService;
4 4 import me.chanjar.weixin.mp.bean.message.WxMpXmlMessage;
... ...
yudao-module-wechat-mp/yudao-module-wechat-mp-biz/src/main/java/cn/iocoder/yudao/module/wechatMp/builder/ImageBuilder.java renamed to yudao-module-wechat/yudao-module-mp-biz/src/main/java/cn/iocoder/yudao/module/mp/builder/ImageBuilder.java
  View file @2aec04a
1   -package cn.iocoder.yudao.module.wechatMp.builder;
  1 +package cn.iocoder.yudao.module.mp.builder;
2 2  
3 3 import me.chanjar.weixin.mp.api.WxMpService;
4 4 import me.chanjar.weixin.mp.bean.message.WxMpXmlMessage;
... ...
yudao-module-wechat-mp/yudao-module-wechat-mp-biz/src/main/java/cn/iocoder/yudao/module/wechatMp/builder/TextBuilder.java renamed to yudao-module-wechat/yudao-module-mp-biz/src/main/java/cn/iocoder/yudao/module/mp/builder/TextBuilder.java
  View file @2aec04a
1   -package cn.iocoder.yudao.module.wechatMp.builder;
  1 +package cn.iocoder.yudao.module.mp.builder;
2 2  
3 3 import me.chanjar.weixin.mp.api.WxMpService;
4 4 import me.chanjar.weixin.mp.bean.message.WxMpXmlMessage;
... ...
yudao-module-wechat-mp/yudao-module-wechat-mp-biz/src/main/java/cn/iocoder/yudao/module/wechatMp/config/WxMpConfig.java renamed to yudao-module-wechat/yudao-module-mp-biz/src/main/java/cn/iocoder/yudao/module/mp/config/WxMpConfig.java
  View file @2aec04a
1   -package cn.iocoder.yudao.module.wechatMp.config;
  1 +package cn.iocoder.yudao.module.mp.config;
2 2  
3 3  
4 4 import cn.hutool.extra.spring.SpringUtil;
5   -import cn.iocoder.yudao.module.wechatMp.controller.admin.account.vo.WxAccountExportReqVO;
6   -import cn.iocoder.yudao.module.wechatMp.dal.dataobject.account.WxAccountDO;
7   -import cn.iocoder.yudao.module.wechatMp.handler.*;
8   -import cn.iocoder.yudao.module.wechatMp.service.account.WxAccountService;
  5 +import cn.iocoder.yudao.module.mp.admin.account.vo.WxAccountExportReqVO;
  6 +import cn.iocoder.yudao.module.mp.dal.dataobject.account.WxAccountDO;
  7 +import cn.iocoder.yudao.module.mp.handler.*;
  8 +import cn.iocoder.yudao.module.mp.service.account.WxAccountService;
9 9 import com.google.common.collect.Maps;
10 10 import lombok.extern.slf4j.Slf4j;
11 11 import me.chanjar.weixin.common.api.WxConsts;
12   -import me.chanjar.weixin.mp.api.WxMpInMemoryConfigStorage;
13 12 import me.chanjar.weixin.mp.api.WxMpMessageRouter;
14 13 import me.chanjar.weixin.mp.api.WxMpService;
15 14 import me.chanjar.weixin.mp.api.impl.WxMpServiceImpl;
  15 +import me.chanjar.weixin.mp.config.impl.WxMpDefaultConfigImpl;
16 16 import me.chanjar.weixin.mp.constant.WxMpEventConstants;
17 17 import org.springframework.beans.factory.InitializingBean;
18 18 import org.springframework.beans.factory.annotation.Autowired;
19 19 import org.springframework.stereotype.Component;
20 20 import org.springframework.util.CollectionUtils;
21 21  
22   -import javax.annotation.PostConstruct;
23 22 import java.util.List;
24 23 import java.util.Map;
25 24 import java.util.stream.Collectors;
... ... @@ -51,7 +50,7 @@ public class WxMpConfig implements InitializingBean {
51 50 public static void init(List<WxAccountDO> wxAccountDOS) {
52 51 mpServices = wxAccountDOS.stream().map(wxAccountDO -> {
53 52 // TODO 亚洲：使用 WxMpInMemoryConfigStorage 的话，多节点会不会存在 accessToken 冲突
54   - WxMpInMemoryConfigStorage configStorage = new WxMpInMemoryConfigStorage();
  53 + WxMpDefaultConfigImpl configStorage = new WxMpDefaultConfigImpl();
55 54 configStorage.setAppId(wxAccountDO.getAppid());
56 55 configStorage.setSecret(wxAccountDO.getAppsecret());
57 56 configStorage.setToken(wxAccountDO.getToken());
... ...
yudao-module-wechat-mp/yudao-module-wechat-mp-biz/src/main/java/cn/iocoder/yudao/module/wechatMp/convert/account/WxAccountConvert.java renamed to yudao-module-wechat/yudao-module-mp-biz/src/main/java/cn/iocoder/yudao/module/mp/convert/account/WxAccountConvert.java
  View file @2aec04a
1   -package cn.iocoder.yudao.module.wechatMp.convert.account;
2   -
3   -import java.util.*;
  1 +package cn.iocoder.yudao.module.mp.convert.account;
4 2  
5 3 import cn.iocoder.yudao.framework.common.pojo.PageResult;
6   -
  4 +import cn.iocoder.yudao.module.mp.admin.account.vo.WxAccountCreateReqVO;
  5 +import cn.iocoder.yudao.module.mp.admin.account.vo.WxAccountExcelVO;
  6 +import cn.iocoder.yudao.module.mp.admin.account.vo.WxAccountRespVO;
  7 +import cn.iocoder.yudao.module.mp.admin.account.vo.WxAccountUpdateReqVO;
  8 +import cn.iocoder.yudao.module.mp.dal.dataobject.account.WxAccountDO;
7 9 import org.mapstruct.Mapper;
8 10 import org.mapstruct.factory.Mappers;
9   -import cn.iocoder.yudao.module.wechatMp.controller.admin.account.vo.*;
10   -import cn.iocoder.yudao.module.wechatMp.dal.dataobject.account.WxAccountDO;
  11 +
  12 +import java.util.List;
11 13  
12 14 /**
13 15 * 公众号账户 Convert
... ...
yudao-module-wechat-mp/yudao-module-wechat-mp-biz/src/main/java/cn/iocoder/yudao/module/wechatMp/convert/accountfans/WxAccountFansConvert.java renamed to yudao-module-wechat/yudao-module-mp-biz/src/main/java/cn/iocoder/yudao/module/mp/convert/accountfans/WxAccountFansConvert.java
  View file @2aec04a
1   -package cn.iocoder.yudao.module.wechatMp.convert.accountfans;
2   -
3   -import java.util.*;
  1 +package cn.iocoder.yudao.module.mp.convert.accountfans;
4 2  
5 3 import cn.iocoder.yudao.framework.common.pojo.PageResult;
6   -
  4 +import cn.iocoder.yudao.module.mp.admin.accountfans.vo.WxAccountFansCreateReqVO;
  5 +import cn.iocoder.yudao.module.mp.admin.accountfans.vo.WxAccountFansExcelVO;
  6 +import cn.iocoder.yudao.module.mp.admin.accountfans.vo.WxAccountFansRespVO;
  7 +import cn.iocoder.yudao.module.mp.admin.accountfans.vo.WxAccountFansUpdateReqVO;
  8 +import cn.iocoder.yudao.module.mp.dal.dataobject.accountfans.WxAccountFansDO;
7 9 import org.mapstruct.Mapper;
8 10 import org.mapstruct.factory.Mappers;
9   -import cn.iocoder.yudao.module.wechatMp.controller.admin.accountfans.vo.*;
10   -import cn.iocoder.yudao.module.wechatMp.dal.dataobject.accountfans.WxAccountFansDO;
  11 +
  12 +import java.util.List;
11 13  
12 14 /**
13 15 * 微信公众号粉丝 Convert
... ...
yudao-module-wechat-mp/yudao-module-wechat-mp-biz/src/main/java/cn/iocoder/yudao/module/wechatMp/dal/dataobject/account/WxAccountDO.java renamed to yudao-module-wechat/yudao-module-mp-biz/src/main/java/cn/iocoder/yudao/module/mp/dal/dataobject/account/WxAccountDO.java
  View file @2aec04a
1   -package cn.iocoder.yudao.module.wechatMp.dal.dataobject.account;
  1 +package cn.iocoder.yudao.module.mp.dal.dataobject.account;
2 2  
3 3 import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO;
4 4 import com.baomidou.mybatisplus.annotation.KeySequence;
... ...
yudao-module-wechat-mp/yudao-module-wechat-mp-biz/src/main/java/cn/iocoder/yudao/module/wechatMp/dal/dataobject/accountfans/WxAccountFansDO.java renamed to yudao-module-wechat/yudao-module-mp-biz/src/main/java/cn/iocoder/yudao/module/mp/dal/dataobject/accountfans/WxAccountFansDO.java
  View file @2aec04a
1   -package cn.iocoder.yudao.module.wechatMp.dal.dataobject.accountfans;
  1 +package cn.iocoder.yudao.module.mp.dal.dataobject.accountfans;
2 2  
3 3 import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO;
4 4 import com.baomidou.mybatisplus.annotation.KeySequence;
... ...
yudao-module-wechat-mp/yudao-module-wechat-mp-biz/src/main/java/cn/iocoder/yudao/module/wechatMp/dal/mysql/account/WxAccountMapper.java renamed to yudao-module-wechat/yudao-module-mp-biz/src/main/java/cn/iocoder/yudao/module/mp/dal/mysql/account/WxAccountMapper.java
  View file @2aec04a
1   -package cn.iocoder.yudao.module.wechatMp.dal.mysql.account;
2   -
3   -import java.util.*;
  1 +package cn.iocoder.yudao.module.mp.dal.mysql.account;
4 2  
5 3 import cn.iocoder.yudao.framework.common.pojo.PageResult;
6   -import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX;
7 4 import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX;
8   -import cn.iocoder.yudao.module.wechatMp.dal.dataobject.account.WxAccountDO;
  5 +import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX;
  6 +import cn.iocoder.yudao.module.mp.admin.account.vo.WxAccountExportReqVO;
  7 +import cn.iocoder.yudao.module.mp.admin.account.vo.WxAccountPageReqVO;
  8 +import cn.iocoder.yudao.module.mp.dal.dataobject.account.WxAccountDO;
9 9 import org.apache.ibatis.annotations.Mapper;
10   -import cn.iocoder.yudao.module.wechatMp.controller.admin.account.vo.*;
  10 +
  11 +import java.util.List;
11 12  
12 13 /**
13 14 * 公众号账户 Mapper
... ...
yudao-module-wechat-mp/yudao-module-wechat-mp-biz/src/main/java/cn/iocoder/yudao/module/wechatMp/dal/mysql/accountfans/WxAccountFansMapper.java renamed to yudao-module-wechat/yudao-module-mp-biz/src/main/java/cn/iocoder/yudao/module/mp/dal/mysql/accountfans/WxAccountFansMapper.java
  View file @2aec04a
1   -package cn.iocoder.yudao.module.wechatMp.dal.mysql.accountfans;
2   -
3   -import java.util.*;
  1 +package cn.iocoder.yudao.module.mp.dal.mysql.accountfans;
4 2  
5 3 import cn.iocoder.yudao.framework.common.pojo.PageResult;
6   -import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX;
7 4 import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX;
8   -import cn.iocoder.yudao.module.wechatMp.dal.dataobject.accountfans.WxAccountFansDO;
  5 +import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX;
  6 +import cn.iocoder.yudao.module.mp.admin.accountfans.vo.WxAccountFansExportReqVO;
  7 +import cn.iocoder.yudao.module.mp.admin.accountfans.vo.WxAccountFansPageReqVO;
  8 +import cn.iocoder.yudao.module.mp.dal.dataobject.accountfans.WxAccountFansDO;
9 9 import org.apache.ibatis.annotations.Mapper;
10   -import cn.iocoder.yudao.module.wechatMp.controller.admin.accountfans.vo.*;
  10 +
  11 +import java.util.List;
11 12  
12 13 /**
13 14 * 微信公众号粉丝 Mapper
... ...
yudao-module-wechat-mp/yudao-module-wechat-mp-biz/src/main/java/cn/iocoder/yudao/module/wechatMp/handler/KfSessionHandler.java renamed to yudao-module-wechat/yudao-module-mp-biz/src/main/java/cn/iocoder/yudao/module/mp/handler/KfSessionHandler.java
  View file @2aec04a
1   -package cn.iocoder.yudao.module.wechatMp.handler;
  1 +package cn.iocoder.yudao.module.mp.handler;
2 2  
3 3 import me.chanjar.weixin.common.session.WxSessionManager;
4 4 import me.chanjar.weixin.mp.api.WxMpMessageHandler;
... ...
yudao-module-wechat-mp/yudao-module-wechat-mp-biz/src/main/java/cn/iocoder/yudao/module/wechatMp/handler/LocationHandler.java renamed to yudao-module-wechat/yudao-module-mp-biz/src/main/java/cn/iocoder/yudao/module/mp/handler/LocationHandler.java
  View file @2aec04a
1   -package cn.iocoder.yudao.module.wechatMp.handler;
  1 +package cn.iocoder.yudao.module.mp.handler;
2 2  
3   -import cn.iocoder.yudao.module.wechatMp.builder.TextBuilder;
  3 +import cn.iocoder.yudao.module.mp.builder.TextBuilder;
4 4 import lombok.extern.slf4j.Slf4j;
5 5 import me.chanjar.weixin.common.session.WxSessionManager;
6 6 import me.chanjar.weixin.mp.api.WxMpMessageHandler;
... ...
yudao-module-wechat-mp/yudao-module-wechat-mp-biz/src/main/java/cn/iocoder/yudao/module/wechatMp/handler/LogHandler.java renamed to yudao-module-wechat/yudao-module-mp-biz/src/main/java/cn/iocoder/yudao/module/mp/handler/LogHandler.java
  View file @2aec04a
1   -package cn.iocoder.yudao.module.wechatMp.handler;
  1 +package cn.iocoder.yudao.module.mp.handler;
2 2  
3 3 import cn.iocoder.yudao.framework.common.util.json.JsonUtils;
4 4 import lombok.extern.slf4j.Slf4j;
... ...
yudao-module-wechat-mp/yudao-module-wechat-mp-biz/src/main/java/cn/iocoder/yudao/module/wechatMp/handler/MenuHandler.java renamed to yudao-module-wechat/yudao-module-mp-biz/src/main/java/cn/iocoder/yudao/module/mp/handler/MenuHandler.java
  View file @2aec04a
1   -package cn.iocoder.yudao.module.wechatMp.handler;
  1 +package cn.iocoder.yudao.module.mp.handler;
2 2  
3 3 import me.chanjar.weixin.common.session.WxSessionManager;
4 4 import me.chanjar.weixin.mp.api.WxMpMessageHandler;
... ...
yudao-module-wechat-mp/yudao-module-wechat-mp-biz/src/main/java/cn/iocoder/yudao/module/wechatMp/handler/MsgHandler.java renamed to yudao-module-wechat/yudao-module-mp-biz/src/main/java/cn/iocoder/yudao/module/mp/handler/MsgHandler.java
  View file @2aec04a
1   -package cn.iocoder.yudao.module.wechatMp.handler;
2   -
3   -import cn.hutool.core.date.DateUtil;
4   -import cn.hutool.core.io.FileUtil;
5   -import cn.hutool.http.HtmlUtil;
6   -import cn.hutool.http.HttpUtil;
7   -import cn.hutool.json.JSONUtil;
8   -import cn.iocoder.yudao.framework.common.util.json.JsonUtils;
9   -import cn.iocoder.yudao.module.wechatMp.builder.TextBuilder;
10   -import cn.iocoder.yudao.module.wechatMp.dal.dataobject.account.WxAccountDO;
11   -import cn.iocoder.yudao.module.wechatMp.service.account.WxAccountService;
  1 +package cn.iocoder.yudao.module.mp.handler;
  2 +
12 3 import lombok.extern.slf4j.Slf4j;
13   -import me.chanjar.weixin.common.error.WxErrorException;
14 4 import me.chanjar.weixin.common.session.WxSessionManager;
15 5 import me.chanjar.weixin.mp.api.WxMpMessageHandler;
16 6 import me.chanjar.weixin.mp.api.WxMpService;
17 7 import me.chanjar.weixin.mp.bean.message.WxMpXmlMessage;
18 8 import me.chanjar.weixin.mp.bean.message.WxMpXmlOutMessage;
19   -import me.chanjar.weixin.mp.bean.result.WxMpUser;
20   -import org.apache.commons.lang3.StringUtils;
21   -import org.springframework.beans.factory.annotation.Autowired;
22   -import org.springframework.beans.factory.annotation.Value;
23 9 import org.springframework.stereotype.Component;
24 10  
25   -import java.io.File;
26   -import java.io.UnsupportedEncodingException;
27 11 import java.util.Map;
28 12  
29   -import static me.chanjar.weixin.common.api.WxConsts.XmlMsgType;
30   -
31 13 @Component
32 14 @Slf4j
33 15 public class MsgHandler implements WxMpMessageHandler {
... ...
yudao-module-wechat-mp/yudao-module-wechat-mp-biz/src/main/java/cn/iocoder/yudao/module/wechatMp/handler/NullHandler.java renamed to yudao-module-wechat/yudao-module-mp-biz/src/main/java/cn/iocoder/yudao/module/mp/handler/NullHandler.java
  View file @2aec04a
1   -package cn.iocoder.yudao.module.wechatMp.handler;
  1 +package cn.iocoder.yudao.module.mp.handler;
2 2  
3 3 import me.chanjar.weixin.common.session.WxSessionManager;
4 4 import me.chanjar.weixin.mp.api.WxMpMessageHandler;
... ...
yudao-module-wechat-mp/yudao-module-wechat-mp-biz/src/main/java/cn/iocoder/yudao/module/wechatMp/handler/ScanHandler.java renamed to yudao-module-wechat/yudao-module-mp-biz/src/main/java/cn/iocoder/yudao/module/mp/handler/ScanHandler.java
  View file @2aec04a
1   -package cn.iocoder.yudao.module.wechatMp.handler;
  1 +package cn.iocoder.yudao.module.mp.handler;
2 2  
3 3 import me.chanjar.weixin.common.error.WxErrorException;
4 4 import me.chanjar.weixin.common.session.WxSessionManager;
... ...
yudao-module-wechat-mp/yudao-module-wechat-mp-biz/src/main/java/cn/iocoder/yudao/module/wechatMp/handler/StoreCheckNotifyHandler.java renamed to yudao-module-wechat/yudao-module-mp-biz/src/main/java/cn/iocoder/yudao/module/mp/handler/StoreCheckNotifyHandler.java
  View file @2aec04a
1   -package cn.iocoder.yudao.module.wechatMp.handler;
  1 +package cn.iocoder.yudao.module.mp.handler;
2 2  
3 3 import me.chanjar.weixin.common.session.WxSessionManager;
4 4 import me.chanjar.weixin.mp.api.WxMpMessageHandler;
... ...
yudao-module-wechat-mp/yudao-module-wechat-mp-biz/src/main/java/cn/iocoder/yudao/module/wechatMp/handler/SubscribeHandler.java renamed to yudao-module-wechat/yudao-module-mp-biz/src/main/java/cn/iocoder/yudao/module/mp/handler/SubscribeHandler.java
  View file @2aec04a
1   -package cn.iocoder.yudao.module.wechatMp.handler;
2   -
3   -import cn.hutool.core.date.DateUtil;
4   -import cn.iocoder.yudao.framework.common.util.json.JsonUtils;
5   -import cn.iocoder.yudao.module.wechatMp.builder.TextBuilder;
6   -import cn.iocoder.yudao.module.wechatMp.controller.admin.accountfans.vo.WxAccountFansCreateReqVO;
7   -import cn.iocoder.yudao.module.wechatMp.controller.admin.accountfans.vo.WxAccountFansUpdateReqVO;
8   -import cn.iocoder.yudao.module.wechatMp.dal.dataobject.account.WxAccountDO;
9   -import cn.iocoder.yudao.module.wechatMp.dal.dataobject.accountfans.WxAccountFansDO;
10   -import cn.iocoder.yudao.module.wechatMp.service.account.WxAccountService;
11   -import cn.iocoder.yudao.module.wechatMp.service.accountfans.WxAccountFansService;
  1 +package cn.iocoder.yudao.module.mp.handler;
  2 +
12 3 import lombok.extern.slf4j.Slf4j;
13 4 import me.chanjar.weixin.common.error.WxErrorException;
14 5 import me.chanjar.weixin.common.session.WxSessionManager;
... ... @@ -16,11 +7,8 @@ import me.chanjar.weixin.mp.api.WxMpMessageHandler;
16 7 import me.chanjar.weixin.mp.api.WxMpService;
17 8 import me.chanjar.weixin.mp.bean.message.WxMpXmlMessage;
18 9 import me.chanjar.weixin.mp.bean.message.WxMpXmlOutMessage;
19   -import me.chanjar.weixin.mp.bean.result.WxMpUser;
20   -import org.springframework.beans.factory.annotation.Autowired;
21 10 import org.springframework.stereotype.Component;
22 11  
23   -import java.io.UnsupportedEncodingException;
24 12 import java.util.Map;
25 13  
26 14 @Component
... ...
yudao-module-wechat-mp/yudao-module-wechat-mp-biz/src/main/java/cn/iocoder/yudao/module/wechatMp/handler/UnsubscribeHandler.java renamed to yudao-module-wechat/yudao-module-mp-biz/src/main/java/cn/iocoder/yudao/module/mp/handler/UnsubscribeHandler.java
  View file @2aec04a
1   -package cn.iocoder.yudao.module.wechatMp.handler;
2   -
3   -import cn.hutool.core.date.DateUtil;
4   -import cn.iocoder.yudao.module.wechatMp.controller.admin.accountfans.vo.WxAccountFansUpdateReqVO;
5   -import cn.iocoder.yudao.module.wechatMp.dal.dataobject.account.WxAccountDO;
6   -import cn.iocoder.yudao.module.wechatMp.dal.dataobject.accountfans.WxAccountFansDO;
7   -import cn.iocoder.yudao.module.wechatMp.service.account.WxAccountService;
8   -import cn.iocoder.yudao.module.wechatMp.service.accountfans.WxAccountFansService;
  1 +package cn.iocoder.yudao.module.mp.handler;
  2 +
  3 +import cn.iocoder.yudao.module.mp.admin.accountfans.vo.WxAccountFansUpdateReqVO;
  4 +import cn.iocoder.yudao.module.mp.dal.dataobject.account.WxAccountDO;
  5 +import cn.iocoder.yudao.module.mp.dal.dataobject.accountfans.WxAccountFansDO;
  6 +import cn.iocoder.yudao.module.mp.service.account.WxAccountService;
  7 +import cn.iocoder.yudao.module.mp.service.accountfans.WxAccountFansService;
9 8 import lombok.extern.slf4j.Slf4j;
10 9 import me.chanjar.weixin.common.session.WxSessionManager;
11 10 import me.chanjar.weixin.mp.api.WxMpMessageHandler;
12 11 import me.chanjar.weixin.mp.api.WxMpService;
13 12 import me.chanjar.weixin.mp.bean.message.WxMpXmlMessage;
14 13 import me.chanjar.weixin.mp.bean.message.WxMpXmlOutMessage;
15   -import org.springframework.beans.BeanUtils;
16 14 import org.springframework.beans.factory.annotation.Autowired;
17 15 import org.springframework.stereotype.Component;
18 16  
... ...
yudao-module-wechat-mp/yudao-module-wechat-mp-biz/src/main/java/cn/iocoder/yudao/module/wechatMp/mq/costomer/dict/WxConfigDataRefreshConsumer.java renamed to yudao-module-wechat/yudao-module-mp-biz/src/main/java/cn/iocoder/yudao/module/mp/mq/costomer/dict/WxConfigDataRefreshConsumer.java
  View file @2aec04a
1   -package cn.iocoder.yudao.module.wechatMp.mq.costomer.dict;
  1 +package cn.iocoder.yudao.module.mp.mq.costomer.dict;
2 2  
3 3 import cn.iocoder.yudao.framework.mq.core.pubsub.AbstractChannelMessageListener;
4   -import cn.iocoder.yudao.module.wechatMp.config.WxMpConfig;
5   -import cn.iocoder.yudao.module.wechatMp.mq.message.dict.WxConfigDataRefreshMessage;
  4 +import cn.iocoder.yudao.module.mp.config.WxMpConfig;
  5 +import cn.iocoder.yudao.module.mp.mq.message.dict.WxConfigDataRefreshMessage;
6 6 import lombok.extern.slf4j.Slf4j;
7 7 import org.springframework.stereotype.Component;
8 8  
... ...
yudao-module-wechat-mp/yudao-module-wechat-mp-biz/src/main/java/cn/iocoder/yudao/module/wechatMp/mq/message/dict/WxConfigDataRefreshMessage.java renamed to yudao-module-wechat/yudao-module-mp-biz/src/main/java/cn/iocoder/yudao/module/mp/mq/message/dict/WxConfigDataRefreshMessage.java
  View file @2aec04a
1   -package cn.iocoder.yudao.module.wechatMp.mq.message.dict;
  1 +package cn.iocoder.yudao.module.mp.mq.message.dict;
2 2  
3 3 import cn.iocoder.yudao.framework.mq.core.pubsub.AbstractChannelMessage;
4 4 import lombok.Data;
... ...
yudao-module-wechat-mp/yudao-module-wechat-mp-biz/src/main/java/cn/iocoder/yudao/module/wechatMp/mq/producer/dict/WxMpConfigDataProducer.java renamed to yudao-module-wechat/yudao-module-mp-biz/src/main/java/cn/iocoder/yudao/module/mp/mq/producer/dict/WxMpConfigDataProducer.java
  View file @2aec04a
1   -package cn.iocoder.yudao.module.wechatMp.mq.producer.dict;
  1 +package cn.iocoder.yudao.module.mp.mq.producer.dict;
2 2  
3 3 import cn.iocoder.yudao.framework.mq.core.RedisMQTemplate;
4   -import cn.iocoder.yudao.module.wechatMp.mq.message.dict.WxConfigDataRefreshMessage;
  4 +import cn.iocoder.yudao.module.mp.mq.message.dict.WxConfigDataRefreshMessage;
5 5 import org.springframework.stereotype.Component;
6 6  
7 7 import javax.annotation.Resource;
... ...
yudao-module-wechat-mp/yudao-module-wechat-mp-biz/src/main/java/cn/iocoder/yudao/module/wechatMp/service/account/WxAccountService.java renamed to yudao-module-wechat/yudao-module-mp-biz/src/main/java/cn/iocoder/yudao/module/mp/service/account/WxAccountService.java
  View file @2aec04a
1   -package cn.iocoder.yudao.module.wechatMp.service.account;
  1 +package cn.iocoder.yudao.module.mp.service.account;
2 2  
3   -import java.util.*;
4   -import javax.validation.*;
5   -
6   -import cn.iocoder.yudao.module.wechatMp.controller.admin.account.vo.*;
7   -import cn.iocoder.yudao.module.wechatMp.dal.dataobject.account.WxAccountDO;
8 3 import cn.iocoder.yudao.framework.common.pojo.PageResult;
  4 +import cn.iocoder.yudao.module.mp.admin.account.vo.WxAccountCreateReqVO;
  5 +import cn.iocoder.yudao.module.mp.admin.account.vo.WxAccountExportReqVO;
  6 +import cn.iocoder.yudao.module.mp.admin.account.vo.WxAccountPageReqVO;
  7 +import cn.iocoder.yudao.module.mp.admin.account.vo.WxAccountUpdateReqVO;
  8 +import cn.iocoder.yudao.module.mp.dal.dataobject.account.WxAccountDO;
9 9 import com.baomidou.mybatisplus.core.toolkit.support.SFunction;
10 10  
  11 +import javax.validation.Valid;
  12 +import java.util.Collection;
  13 +import java.util.List;
  14 +
11 15 /**
12 16 * 公众号账户 Service 接口
13 17 *
... ... @@ -76,5 +80,5 @@ public interface WxAccountService {
76 80 * @param val
77 81 * @return
78 82 */
79   - WxAccountDO findBy(SFunction<WxAccountDO,?> field, Object val);
  83 + WxAccountDO findBy(SFunction<WxAccountDO, ?> field, Object val);
80 84 }
... ...
yudao-module-wechat-mp/yudao-module-wechat-mp-biz/src/main/java/cn/iocoder/yudao/module/wechatMp/service/account/WxAccountServiceImpl.java renamed to yudao-module-wechat/yudao-module-mp-biz/src/main/java/cn/iocoder/yudao/module/mp/service/account/WxAccountServiceImpl.java
  View file @2aec04a
1   -package cn.iocoder.yudao.module.wechatMp.service.account;
  1 +package cn.iocoder.yudao.module.mp.service.account;
2 2  
3   -import cn.iocoder.yudao.module.wechatMp.mq.producer.dict.WxMpConfigDataProducer;
  3 +import cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil;
  4 +import cn.iocoder.yudao.framework.common.pojo.PageResult;
  5 +import cn.iocoder.yudao.module.mp.admin.account.vo.WxAccountCreateReqVO;
  6 +import cn.iocoder.yudao.module.mp.admin.account.vo.WxAccountExportReqVO;
  7 +import cn.iocoder.yudao.module.mp.admin.account.vo.WxAccountPageReqVO;
  8 +import cn.iocoder.yudao.module.mp.admin.account.vo.WxAccountUpdateReqVO;
  9 +import cn.iocoder.yudao.module.mp.convert.account.WxAccountConvert;
  10 +import cn.iocoder.yudao.module.mp.dal.dataobject.account.WxAccountDO;
  11 +import cn.iocoder.yudao.module.mp.dal.mysql.account.WxAccountMapper;
  12 +import cn.iocoder.yudao.module.mp.enums.ErrorCodeConstants;
  13 +import cn.iocoder.yudao.module.mp.mq.producer.dict.WxMpConfigDataProducer;
4 14 import com.baomidou.mybatisplus.core.toolkit.support.SFunction;
5 15 import org.springframework.stereotype.Service;
6   -
7   -import javax.annotation.Resource;
8   -
9 16 import org.springframework.validation.annotation.Validated;
10 17  
11   -import java.util.*;
12   -
13   -import cn.iocoder.yudao.module.wechatMp.controller.admin.account.vo.*;
14   -import cn.iocoder.yudao.module.wechatMp.dal.dataobject.account.WxAccountDO;
15   -import cn.iocoder.yudao.framework.common.pojo.PageResult;
16   -
17   -import cn.iocoder.yudao.module.wechatMp.convert.account.WxAccountConvert;
18   -import cn.iocoder.yudao.module.wechatMp.dal.mysql.account.WxAccountMapper;
  18 +import javax.annotation.Resource;
  19 +import java.util.Collection;
  20 +import java.util.List;
19 21  
20   -import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
21   -import static cn.iocoder.yudao.module.wechatMp.enums.ErrorCodeConstants.*;
22 22  
23 23 /**
24 24 * 公众号账户 Service 实现类
... ... @@ -66,7 +66,7 @@ public class WxAccountServiceImpl implements WxAccountService {
66 66  
67 67 private void validateWxAccountExists(Long id) {
68 68 if (wxAccountMapper.selectById(id) == null) {
69   - throw exception(WX_ACCOUNT_NOT_EXISTS);
  69 + throw ServiceExceptionUtil.exception(ErrorCodeConstants.WX_ACCOUNT_NOT_EXISTS);
70 70 }
71 71 }
72 72  
... ...
yudao-module-wechat-mp/yudao-module-wechat-mp-biz/src/main/java/cn/iocoder/yudao/module/wechatMp/service/accountfans/WxAccountFansService.java renamed to yudao-module-wechat/yudao-module-mp-biz/src/main/java/cn/iocoder/yudao/module/mp/service/accountfans/WxAccountFansService.java
  View file @2aec04a
1   -package cn.iocoder.yudao.module.wechatMp.service.accountfans;
  1 +package cn.iocoder.yudao.module.mp.service.accountfans;
2 2  
3   -import java.util.*;
4   -import javax.validation.*;
5   -
6   -import cn.iocoder.yudao.module.wechatMp.controller.admin.accountfans.vo.*;
7   -import cn.iocoder.yudao.module.wechatMp.dal.dataobject.account.WxAccountDO;
8   -import cn.iocoder.yudao.module.wechatMp.dal.dataobject.accountfans.WxAccountFansDO;
9 3 import cn.iocoder.yudao.framework.common.pojo.PageResult;
  4 +import cn.iocoder.yudao.module.mp.admin.accountfans.vo.WxAccountFansCreateReqVO;
  5 +import cn.iocoder.yudao.module.mp.admin.accountfans.vo.WxAccountFansExportReqVO;
  6 +import cn.iocoder.yudao.module.mp.admin.accountfans.vo.WxAccountFansPageReqVO;
  7 +import cn.iocoder.yudao.module.mp.admin.accountfans.vo.WxAccountFansUpdateReqVO;
  8 +import cn.iocoder.yudao.module.mp.dal.dataobject.accountfans.WxAccountFansDO;
10 9 import com.baomidou.mybatisplus.core.toolkit.support.SFunction;
11 10  
  11 +import javax.validation.Valid;
  12 +import java.util.Collection;
  13 +import java.util.List;
  14 +
12 15 /**
13 16 * 微信公众号粉丝 Service 接口
14 17 *
... ...
yudao-module-wechat-mp/yudao-module-wechat-mp-biz/src/main/java/cn/iocoder/yudao/module/wechatMp/service/accountfans/WxAccountFansServiceImpl.java renamed to yudao-module-wechat/yudao-module-mp-biz/src/main/java/cn/iocoder/yudao/module/mp/service/accountfans/WxAccountFansServiceImpl.java
  View file @2aec04a
1   -package cn.iocoder.yudao.module.wechatMp.service.accountfans;
  1 +package cn.iocoder.yudao.module.mp.service.accountfans;
2 2  
  3 +import cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil;
  4 +import cn.iocoder.yudao.framework.common.pojo.PageResult;
  5 +import cn.iocoder.yudao.module.mp.admin.accountfans.vo.WxAccountFansCreateReqVO;
  6 +import cn.iocoder.yudao.module.mp.admin.accountfans.vo.WxAccountFansExportReqVO;
  7 +import cn.iocoder.yudao.module.mp.admin.accountfans.vo.WxAccountFansPageReqVO;
  8 +import cn.iocoder.yudao.module.mp.admin.accountfans.vo.WxAccountFansUpdateReqVO;
  9 +import cn.iocoder.yudao.module.mp.convert.accountfans.WxAccountFansConvert;
  10 +import cn.iocoder.yudao.module.mp.dal.dataobject.accountfans.WxAccountFansDO;
  11 +import cn.iocoder.yudao.module.mp.dal.mysql.accountfans.WxAccountFansMapper;
  12 +import cn.iocoder.yudao.module.mp.enums.ErrorCodeConstants;
3 13 import com.baomidou.mybatisplus.core.toolkit.support.SFunction;
4 14 import org.springframework.stereotype.Service;
5   -
6   -import javax.annotation.Resource;
7   -
8 15 import org.springframework.validation.annotation.Validated;
9 16  
10   -import java.util.*;
11   -
12   -import cn.iocoder.yudao.module.wechatMp.controller.admin.accountfans.vo.*;
13   -import cn.iocoder.yudao.module.wechatMp.dal.dataobject.accountfans.WxAccountFansDO;
14   -import cn.iocoder.yudao.framework.common.pojo.PageResult;
15   -
16   -import cn.iocoder.yudao.module.wechatMp.convert.accountfans.WxAccountFansConvert;
17   -import cn.iocoder.yudao.module.wechatMp.dal.mysql.accountfans.WxAccountFansMapper;
18   -
19   -import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
20   -import static cn.iocoder.yudao.module.wechatMp.enums.ErrorCodeConstants.*;
  17 +import javax.annotation.Resource;
  18 +import java.util.Collection;
  19 +import java.util.List;
21 20  
22 21 /**
23 22 * 微信公众号粉丝 Service 实现类
... ... @@ -59,7 +58,7 @@ public class WxAccountFansServiceImpl implements WxAccountFansService {
59 58  
60 59 private void validateWxAccountFansExists(Long id) {
61 60 if (wxAccountFansMapper.selectById(id) == null) {
62   - throw exception(WX_ACCOUNT_FANS_NOT_EXISTS);
  61 + throw ServiceExceptionUtil.exception(ErrorCodeConstants.WX_ACCOUNT_FANS_NOT_EXISTS);
63 62 }
64 63 }
65 64  
... ...
yudao-server/pom.xml
  View file @2aec04a
... ... @@ -63,7 +63,7 @@
63 63 <!-- 微信公众号 -->
64 64 <dependency>
65 65 <groupId>cn.iocoder.boot</groupId>
66   - <artifactId>yudao-module-wechat-mp-biz</artifactId>
  66 + <artifactId>yudao-module-mp-biz</artifactId>
67 67 <version>${revision}</version>
68 68 </dependency>
69 69  
... ...
yudao-server/src/main/resources/application-local.yaml
  View file @2aec04a
... ... @@ -44,8 +44,8 @@ spring:
44 44 datasource:
45 45 master:
46 46 name: ruoyi-vue-pro
47   - url: jdbc:mysql://127.0.0.1:3306/${spring.datasource.dynamic.datasource.master.name}?allowMultiQueries=true&useUnicode=true&useSSL=false&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&autoReconnect=true&nullCatalogMeansCurrent=true # MySQL Connector/J 8.X 连接的示例
48   -# url: jdbc:mysql://127.0.0.1:3306/${spring.datasource.dynamic.datasource.master.name}?useSSL=false&allowPublicKeyRetrieval=true&useUnicode=true&characterEncoding=UTF-8&serverTimezone=CTT # MySQL Connector/J 5.X 连接的示例
  47 +# url: jdbc:mysql://127.0.0.1:3306/${spring.datasource.dynamic.datasource.master.name}?allowMultiQueries=true&useUnicode=true&useSSL=false&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&autoReconnect=true&nullCatalogMeansCurrent=true # MySQL Connector/J 8.X 连接的示例
  48 + url: jdbc:mysql://127.0.0.1:3306/${spring.datasource.dynamic.datasource.master.name}?useSSL=false&allowPublicKeyRetrieval=true&useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai # MySQL Connector/J 5.X 连接的示例
49 49 # url: jdbc:postgresql://127.0.0.1:5432/${spring.datasource.dynamic.datasource.slave.name} # PostgreSQL 连接的示例
50 50 # url: jdbc:oracle:thin:@127.0.0.1:1521:xe # Oracle 连接的示例
51 51 # url: jdbc:sqlserver://127.0.0.1:1433;DatabaseName=${spring.datasource.dynamic.datasource.master.name} # SQLServer 连接的示例
... ... @@ -55,8 +55,8 @@ spring:
55 55 # password: JSm:g(*%lU4ZAkz06cd52KqT3)i1?H7W
56 56 slave: # 模拟从库，可根据自己需要修改
57 57 name: ruoyi-vue-pro
58   - url: jdbc:mysql://127.0.0.1:3306/${spring.datasource.dynamic.datasource.slave.name}?allowMultiQueries=true&useUnicode=true&useSSL=false&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&autoReconnect=true&nullCatalogMeansCurrent=true # MySQL Connector/J 8.X 连接的示例
59   -# url: jdbc:mysql://127.0.0.1:3306/${spring.datasource.dynamic.datasource.slave.name}?useSSL=false&allowPublicKeyRetrieval=true&useUnicode=true&characterEncoding=UTF-8&serverTimezone=CTT # MySQL Connector/J 5.X 连接的示例
  58 +# url: jdbc:mysql://127.0.0.1:3306/${spring.datasource.dynamic.datasource.slave.name}?allowMultiQueries=true&useUnicode=true&useSSL=false&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&autoReconnect=true&nullCatalogMeansCurrent=true # MySQL Connector/J 8.X 连接的示例
  59 + url: jdbc:mysql://127.0.0.1:3306/${spring.datasource.dynamic.datasource.slave.name}?useSSL=false&allowPublicKeyRetrieval=true&useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai # MySQL Connector/J 5.X 连接的示例
60 60 # url: jdbc:postgresql://127.0.0.1:5432/${spring.datasource.dynamic.datasource.slave.name} # PostgreSQL 连接的示例
61 61 # url: jdbc:oracle:thin:@127.0.0.1:1521:xe # Oracle 连接的示例
62 62 # url: jdbc:sqlserver://127.0.0.1:1433;DatabaseName=${spring.datasource.dynamic.datasource.slave.name} # SQLServer 连接的示例
... ...