修改bug

aagro-module-mp/pom.xml

@@ -3,8 +3,8 @@
          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">
     <parent>
-        <groupId>cn.aagro.gg</groupId>
-        <artifactId>aiot</artifactId>
+        <groupId>cn.aagro.aa</groupId>
+        <artifactId>aiotagro</artifactId>
         <version>${revision}</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
@@ -21,25 +21,25 @@
 
     <dependencies>
         <dependency>
-            <groupId>cn.aagro.gg</groupId>
+            <groupId>cn.aagro.aa</groupId>
             <artifactId>aagro-module-system</artifactId>
             <version>${revision}</version>
         </dependency>
         <dependency>
-            <groupId>cn.aagro.gg</groupId>
+            <groupId>cn.aagro.aa</groupId>
             <artifactId>aagro-module-infra</artifactId>
             <version>${revision}</version>
         </dependency>
 
         <!-- 业务组件 -->
         <dependency>
-            <groupId>cn.aagro.gg</groupId>
+            <groupId>cn.aagro.aa</groupId>
             <artifactId>aagro-spring-boot-starter-biz-tenant</artifactId>
         </dependency>
 
         <!-- Web 相关 -->
         <dependency>
-            <groupId>cn.aagro.gg</groupId>
+            <groupId>cn.aagro.aa</groupId>
             <artifactId>aagro-spring-boot-starter-security</artifactId>
         </dependency>
 
@@ -50,32 +50,31 @@
 
         <!-- DB 相关 -->
         <dependency>
-            <groupId>cn.aagro.gg</groupId>
+            <groupId>cn.aagro.aa</groupId>
             <artifactId>aagro-spring-boot-starter-mybatis</artifactId>
         </dependency>
 
         <dependency>
-            <groupId>cn.aagro.gg</groupId>
+            <groupId>cn.aagro.aa</groupId>
             <artifactId>aagro-spring-boot-starter-redis</artifactId>
         </dependency>
 
         <!-- 消息队列相关 -->
         <dependency>
-            <groupId>cn.aagro.gg</groupId>
+            <groupId>cn.aagro.aa</groupId>
             <artifactId>aagro-spring-boot-starter-mq</artifactId>
         </dependency>
 
         <!-- Test 测试相关 -->
         <dependency>
-            <groupId>cn.aagro.gg</groupId>
-            <artifactId>aagro-spring-boot-starter-test</artifactId>
-            <version>${revision}</version>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-test</artifactId>
             <scope>test</scope>
         </dependency>
 
         <!-- 工具类相关 -->
         <dependency>
-            <groupId>cn.aagro.gg</groupId>
+            <groupId>cn.aagro.aa</groupId>
             <artifactId>aagro-spring-boot-starter-excel</artifactId>
         </dependency>
 
@@ -86,4 +85,4 @@
         </dependency>
     </dependencies>
 
-</project>
+</project>

aagro-module-mp/src/main/java/cn/aagro/ag/module/mp/controller/admin/account/MpAccountController.java

@@ -1,11 +1,11 @@
-package cn.aagro.pp.module.mp.controller.admin.account;
+package cn.aagro.ag.module.mp.controller.admin.account;
 
-import cn.aagro.pp.framework.common.pojo.CommonResult;
-import cn.aagro.pp.framework.common.pojo.PageResult;
-import cn.aagro.pp.module.mp.controller.admin.account.vo.*;
-import cn.aagro.pp.module.mp.convert.account.MpAccountConvert;
-import cn.aagro.pp.module.mp.dal.dataobject.account.MpAccountDO;
-import cn.aagro.pp.module.mp.service.account.MpAccountService;
+import cn.aagro.ag.framework.common.pojo.CommonResult;
+import cn.aagro.ag.framework.common.pojo.PageResult;
+import cn.aagro.ag.module.mp.controller.admin.account.vo.*;
+import cn.aagro.ag.module.mp.convert.account.MpAccountConvert;
+import cn.aagro.ag.module.mp.dal.dataobject.account.MpAccountDO;
+import cn.aagro.ag.module.mp.service.account.MpAccountService;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.Parameter;
 import io.swagger.v3.oas.annotations.tags.Tag;
@@ -13,11 +13,11 @@ import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
-import javax.annotation.Resource;
-import javax.validation.Valid;
+import jakarta.annotation.Resource;
+import jakarta.validation.Valid;
 import java.util.List;
 
-import static cn.aagro.pp.framework.common.pojo.CommonResult.success;
+import static cn.aagro.ag.framework.common.pojo.CommonResult.success;
 
 @Tag(name = "管理后台 - 公众号账号")
 @RestController

aagro-module-mp/src/main/java/cn/aagro/ag/module/mp/controller/admin/account/vo/MpAccountBaseVO.java

@@ -1,9 +1,9 @@
-package cn.aagro.pp.module.mp.controller.admin.account.vo;
+package cn.aagro.ag.module.mp.controller.admin.account.vo;
 
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 
-import javax.validation.constraints.NotEmpty;
+import jakarta.validation.constraints.NotEmpty;
 
 /**
  * 公众号账号 Base VO，提供给添加、修改、详细的子 VO 使用
@@ -14,7 +14,7 @@ import javax.validation.constraints.NotEmpty;
 @Data
 public class MpAccountBaseVO {
 
-    @Schema(description = "公众号名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "芋道源码")
+    @Schema(description = "公众号名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "AIOTAGRO")
     @NotEmpty(message = "公众号名称不能为空")
     private String name;
 
@@ -37,7 +37,7 @@ public class MpAccountBaseVO {
     @Schema(description = "加密密钥", example = "gjN+Ksei")
     private String aesKey;
 
-    @Schema(description = "备注", example = "请关注芋道源码，学习技术")
+    @Schema(description = "备注", example = "请关注AIOTAGRO，学习技术")
     private String remark;
 
 }

aagro-module-mp/src/main/java/cn/aagro/ag/module/mp/controller/admin/account/vo/MpAccountCreateReqVO.java

@@ -1,4 +1,4 @@
-package cn.aagro.pp.module.mp.controller.admin.account.vo;
+package cn.aagro.ag.module.mp.controller.admin.account.vo;
 
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;

aagro-module-mp/src/main/java/cn/aagro/ag/module/mp/controller/admin/account/vo/MpAccountPageReqVO.java

@@ -1,6 +1,6 @@
-package cn.aagro.pp.module.mp.controller.admin.account.vo;
+package cn.aagro.ag.module.mp.controller.admin.account.vo;
 
-import cn.aagro.pp.framework.common.pojo.PageParam;
+import cn.aagro.ag.framework.common.pojo.PageParam;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 import lombok.EqualsAndHashCode;

aagro-module-mp/src/main/java/cn/aagro/ag/module/mp/controller/admin/account/vo/MpAccountRespVO.java

@@ -1,4 +1,4 @@
-package cn.aagro.pp.module.mp.controller.admin.account.vo;
+package cn.aagro.ag.module.mp.controller.admin.account.vo;
 
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;

aagro-module-mp/src/main/java/cn/aagro/ag/module/mp/controller/admin/account/vo/MpAccountSimpleRespVO.java

@@ -1,4 +1,4 @@
-package cn.aagro.pp.module.mp.controller.admin.account.vo;
+package cn.aagro.ag.module.mp.controller.admin.account.vo;
 
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
@@ -10,7 +10,7 @@ public class MpAccountSimpleRespVO {
     @Schema(description = "编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024")
     private Long id;
 
-    @Schema(description = "公众号名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "芋道源码")
+    @Schema(description = "公众号名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "AIOTAGRO")
     private String name;
 
 }

aagro-module-mp/src/main/java/cn/aagro/ag/module/mp/controller/admin/account/vo/MpAccountUpdateReqVO.java

@@ -1,11 +1,11 @@
-package cn.aagro.pp.module.mp.controller.admin.account.vo;
+package cn.aagro.ag.module.mp.controller.admin.account.vo;
 
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.ToString;
 
-import javax.validation.constraints.NotNull;
+import jakarta.validation.constraints.NotNull;
 
 @Schema(description = "管理后台 - 公众号账号更新 Request VO")
 @Data

aagro-module-mp/src/main/java/cn/aagro/ag/module/mp/controller/admin/material/MpMaterialController.java

@@ -1,11 +1,11 @@
-package cn.aagro.pp.module.mp.controller.admin.material;
+package cn.aagro.ag.module.mp.controller.admin.material;
 
-import cn.aagro.pp.framework.common.pojo.CommonResult;
-import cn.aagro.pp.framework.common.pojo.PageResult;
-import cn.aagro.pp.module.mp.controller.admin.material.vo.*;
-import cn.aagro.pp.module.mp.convert.material.MpMaterialConvert;
-import cn.aagro.pp.module.mp.dal.dataobject.material.MpMaterialDO;
-import cn.aagro.pp.module.mp.service.material.MpMaterialService;
+import cn.aagro.ag.framework.common.pojo.CommonResult;
+import cn.aagro.ag.framework.common.pojo.PageResult;
+import cn.aagro.ag.module.mp.controller.admin.material.vo.*;
+import cn.aagro.ag.module.mp.convert.material.MpMaterialConvert;
+import cn.aagro.ag.module.mp.dal.dataobject.material.MpMaterialDO;
+import cn.aagro.ag.module.mp.service.material.MpMaterialService;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.Parameter;
 import io.swagger.v3.oas.annotations.tags.Tag;
@@ -13,11 +13,11 @@ import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
-import javax.annotation.Resource;
-import javax.validation.Valid;
+import jakarta.annotation.Resource;
+import jakarta.validation.Valid;
 import java.io.IOException;
 
-import static cn.aagro.pp.framework.common.pojo.CommonResult.success;
+import static cn.aagro.ag.framework.common.pojo.CommonResult.success;
 
 @Tag(name = "管理后台 - 公众号素材")
 @RestController

aagro-module-mp/src/main/java/cn/aagro/ag/module/mp/controller/admin/material/vo/MpMaterialPageReqVO.java

@@ -1,12 +1,12 @@
-package cn.aagro.pp.module.mp.controller.admin.material.vo;
+package cn.aagro.ag.module.mp.controller.admin.material.vo;
 
-import cn.aagro.pp.framework.common.pojo.PageParam;
+import cn.aagro.ag.framework.common.pojo.PageParam;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.ToString;
 
-import javax.validation.constraints.NotNull;
+import jakarta.validation.constraints.NotNull;
 
 @Schema(description = "管理后台 - 公众号素材的分页 Request VO")
 @Data

aagro-module-mp/src/main/java/cn/aagro/ag/module/mp/controller/admin/material/vo/MpMaterialRespVO.java

@@ -1,4 +1,4 @@
-package cn.aagro.pp.module.mp.controller.admin.material.vo;
+package cn.aagro.ag.module.mp.controller.admin.material.vo;
 
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;

aagro-module-mp/src/main/java/cn/aagro/ag/module/mp/controller/admin/material/vo/MpMaterialUploadNewsImageReqVO.java

@@ -1,11 +1,11 @@
-package cn.aagro.pp.module.mp.controller.admin.material.vo;
+package cn.aagro.ag.module.mp.controller.admin.material.vo;
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 import org.springframework.web.multipart.MultipartFile;
 
-import javax.validation.constraints.NotNull;
+import jakarta.validation.constraints.NotNull;
 
 @Schema(description = "管理后台 - 公众号素材上传图文内容中的图片 Request VO")
 @Data

aagro-module-mp/src/main/java/cn/aagro/ag/module/mp/controller/admin/material/vo/MpMaterialUploadPermanentReqVO.java

@@ -1,4 +1,4 @@
-package cn.aagro.pp.module.mp.controller.admin.material.vo;
+package cn.aagro.ag.module.mp.controller.admin.material.vo;
 
 import cn.hutool.core.util.ObjectUtil;
 import com.fasterxml.jackson.annotation.JsonIgnore;
@@ -7,9 +7,9 @@ import lombok.Data;
 import me.chanjar.weixin.common.api.WxConsts;
 import org.springframework.web.multipart.MultipartFile;
 
-import javax.validation.constraints.AssertTrue;
-import javax.validation.constraints.NotEmpty;
-import javax.validation.constraints.NotNull;
+import jakarta.validation.constraints.AssertTrue;
+import jakarta.validation.constraints.NotEmpty;
+import jakarta.validation.constraints.NotNull;
 
 @Schema(description = "管理后台 - 公众号素材上传永久 Request VO")
 @Data

aagro-module-mp/src/main/java/cn/aagro/ag/module/mp/controller/admin/material/vo/MpMaterialUploadRespVO.java

@@ -1,4 +1,4 @@
-package cn.aagro.pp.module.mp.controller.admin.material.vo;
+package cn.aagro.ag.module.mp.controller.admin.material.vo;
 
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;

aagro-module-mp/src/main/java/cn/aagro/ag/module/mp/controller/admin/material/vo/MpMaterialUploadTemporaryReqVO.java

@@ -1,12 +1,12 @@
-package cn.aagro.pp.module.mp.controller.admin.material.vo;
+package cn.aagro.ag.module.mp.controller.admin.material.vo;
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 import org.springframework.web.multipart.MultipartFile;
 
-import javax.validation.constraints.NotEmpty;
-import javax.validation.constraints.NotNull;
+import jakarta.validation.constraints.NotEmpty;
+import jakarta.validation.constraints.NotNull;
 
 @Schema(description = "管理后台 - 公众号素材上传临时 Request VO")
 @Data

aagro-module-mp/src/main/java/cn/aagro/ag/module/mp/controller/admin/menu/MpMenuController.java

@@ -1,11 +1,11 @@
-package cn.aagro.pp.module.mp.controller.admin.menu;
+package cn.aagro.ag.module.mp.controller.admin.menu;
 
-import cn.aagro.pp.framework.common.pojo.CommonResult;
-import cn.aagro.pp.module.mp.controller.admin.menu.vo.MpMenuRespVO;
-import cn.aagro.pp.module.mp.controller.admin.menu.vo.MpMenuSaveReqVO;
-import cn.aagro.pp.module.mp.convert.menu.MpMenuConvert;
-import cn.aagro.pp.module.mp.dal.dataobject.menu.MpMenuDO;
-import cn.aagro.pp.module.mp.service.menu.MpMenuService;
+import cn.aagro.ag.framework.common.pojo.CommonResult;
+import cn.aagro.ag.module.mp.controller.admin.menu.vo.MpMenuRespVO;
+import cn.aagro.ag.module.mp.controller.admin.menu.vo.MpMenuSaveReqVO;
+import cn.aagro.ag.module.mp.convert.menu.MpMenuConvert;
+import cn.aagro.ag.module.mp.dal.dataobject.menu.MpMenuDO;
+import cn.aagro.ag.module.mp.service.menu.MpMenuService;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.Parameter;
 import io.swagger.v3.oas.annotations.tags.Tag;
@@ -13,11 +13,11 @@ import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
-import javax.annotation.Resource;
-import javax.validation.Valid;
+import jakarta.annotation.Resource;
+import jakarta.validation.Valid;
 import java.util.List;
 
-import static cn.aagro.pp.framework.common.pojo.CommonResult.success;
+import static cn.aagro.ag.framework.common.pojo.CommonResult.success;
 
 @Tag(name = "管理后台 - 公众号菜单")
 @RestController

aagro-module-mp/src/main/java/cn/aagro/ag/module/mp/controller/admin/menu/vo/MpMenuBaseVO.java

@@ -1,17 +1,17 @@
-package cn.aagro.pp.module.mp.controller.admin.menu.vo;
+package cn.aagro.ag.module.mp.controller.admin.menu.vo;
 
-import cn.aagro.pp.module.mp.dal.dataobject.message.MpMessageDO;
+import cn.aagro.ag.module.mp.dal.dataobject.message.MpMessageDO;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 import me.chanjar.weixin.common.api.WxConsts;
 import org.hibernate.validator.constraints.URL;
 
-import javax.validation.Valid;
-import javax.validation.constraints.NotEmpty;
-import javax.validation.constraints.NotNull;
+import jakarta.validation.Valid;
+import jakarta.validation.constraints.NotEmpty;
+import jakarta.validation.constraints.NotNull;
 import java.util.List;
 
-import static cn.aagro.pp.module.mp.framework.mp.core.util.MpUtils.*;
+import static cn.aagro.ag.module.mp.framework.mp.core.util.MpUtils.*;
 
 /**
  * 公众号菜单 Base VO，提供给添加、修改、详细的子 VO 使用

aagro-module-mp/src/main/java/cn/aagro/ag/module/mp/controller/admin/menu/vo/MpMenuRespVO.java

@@ -1,4 +1,4 @@
-package cn.aagro.pp.module.mp.controller.admin.menu.vo;
+package cn.aagro.ag.module.mp.controller.admin.menu.vo;
 
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;

aagro-module-mp/src/main/java/cn/aagro/ag/module/mp/controller/admin/menu/vo/MpMenuSaveReqVO.java

@@ -1,11 +1,11 @@
-package cn.aagro.pp.module.mp.controller.admin.menu.vo;
+package cn.aagro.ag.module.mp.controller.admin.menu.vo;
 
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 
-import javax.validation.Valid;
-import javax.validation.constraints.NotEmpty;
-import javax.validation.constraints.NotNull;
+import jakarta.validation.Valid;
+import jakarta.validation.constraints.NotEmpty;
+import jakarta.validation.constraints.NotNull;
 import java.util.List;
 
 @Schema(description = "管理后台 - 公众号菜单保存 Request VO")

aagro-module-mp/src/main/java/cn/aagro/ag/module/mp/controller/admin/message/MpAutoReplyController.java

@@ -1,14 +1,14 @@
-package cn.aagro.pp.module.mp.controller.admin.message;
+package cn.aagro.ag.module.mp.controller.admin.message;
 
-import cn.aagro.pp.framework.common.pojo.CommonResult;
-import cn.aagro.pp.framework.common.pojo.PageResult;
-import cn.aagro.pp.module.mp.controller.admin.message.vo.autoreply.MpAutoReplyCreateReqVO;
-import cn.aagro.pp.module.mp.controller.admin.message.vo.autoreply.MpAutoReplyRespVO;
-import cn.aagro.pp.module.mp.controller.admin.message.vo.autoreply.MpAutoReplyUpdateReqVO;
-import cn.aagro.pp.module.mp.controller.admin.message.vo.message.MpMessagePageReqVO;
-import cn.aagro.pp.module.mp.convert.message.MpAutoReplyConvert;
-import cn.aagro.pp.module.mp.dal.dataobject.message.MpAutoReplyDO;
-import cn.aagro.pp.module.mp.service.message.MpAutoReplyService;
+import cn.aagro.ag.framework.common.pojo.CommonResult;
+import cn.aagro.ag.framework.common.pojo.PageResult;
+import cn.aagro.ag.module.mp.controller.admin.message.vo.autoreply.MpAutoReplyCreateReqVO;
+import cn.aagro.ag.module.mp.controller.admin.message.vo.autoreply.MpAutoReplyRespVO;
+import cn.aagro.ag.module.mp.controller.admin.message.vo.autoreply.MpAutoReplyUpdateReqVO;
+import cn.aagro.ag.module.mp.controller.admin.message.vo.message.MpMessagePageReqVO;
+import cn.aagro.ag.module.mp.convert.message.MpAutoReplyConvert;
+import cn.aagro.ag.module.mp.dal.dataobject.message.MpAutoReplyDO;
+import cn.aagro.ag.module.mp.service.message.MpAutoReplyService;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.Parameter;
 import io.swagger.v3.oas.annotations.tags.Tag;
@@ -16,10 +16,10 @@ import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
-import javax.annotation.Resource;
-import javax.validation.Valid;
+import jakarta.annotation.Resource;
+import jakarta.validation.Valid;
 
-import static cn.aagro.pp.framework.common.pojo.CommonResult.success;
+import static cn.aagro.ag.framework.common.pojo.CommonResult.success;
 
 @Tag(name = "管理后台 - 公众号自动回复")
 @RestController

aagro-module-mp/src/main/java/cn/aagro/ag/module/mp/controller/admin/message/MpMessageController.java

@@ -1,23 +1,23 @@
-package cn.aagro.pp.module.mp.controller.admin.message;
+package cn.aagro.ag.module.mp.controller.admin.message;
 
-import cn.aagro.pp.framework.common.pojo.CommonResult;
-import cn.aagro.pp.framework.common.pojo.PageResult;
-import cn.aagro.pp.module.mp.controller.admin.message.vo.message.MpMessagePageReqVO;
-import cn.aagro.pp.module.mp.controller.admin.message.vo.message.MpMessageRespVO;
-import cn.aagro.pp.module.mp.controller.admin.message.vo.message.MpMessageSendReqVO;
-import cn.aagro.pp.module.mp.convert.message.MpMessageConvert;
-import cn.aagro.pp.module.mp.dal.dataobject.message.MpMessageDO;
-import cn.aagro.pp.module.mp.service.message.MpMessageService;
+import cn.aagro.ag.framework.common.pojo.CommonResult;
+import cn.aagro.ag.framework.common.pojo.PageResult;
+import cn.aagro.ag.module.mp.controller.admin.message.vo.message.MpMessagePageReqVO;
+import cn.aagro.ag.module.mp.controller.admin.message.vo.message.MpMessageRespVO;
+import cn.aagro.ag.module.mp.controller.admin.message.vo.message.MpMessageSendReqVO;
+import cn.aagro.ag.module.mp.convert.message.MpMessageConvert;
+import cn.aagro.ag.module.mp.dal.dataobject.message.MpMessageDO;
+import cn.aagro.ag.module.mp.service.message.MpMessageService;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
-import javax.annotation.Resource;
-import javax.validation.Valid;
+import jakarta.annotation.Resource;
+import jakarta.validation.Valid;
 
-import static cn.aagro.pp.framework.common.pojo.CommonResult.success;
+import static cn.aagro.ag.framework.common.pojo.CommonResult.success;
 
 @Tag(name = "管理后台 - 公众号消息")
 @RestController

aagro-module-mp/src/main/java/cn/aagro/ag/module/mp/controller/admin/message/vo/autoreply/MpAutoReplyBaseVO.java

@@ -1,18 +1,18 @@
-package cn.aagro.pp.module.mp.controller.admin.message.vo.autoreply;
+package cn.aagro.ag.module.mp.controller.admin.message.vo.autoreply;
 
 import cn.hutool.core.util.ObjectUtil;
-import cn.aagro.pp.module.mp.dal.dataobject.message.MpMessageDO;
-import cn.aagro.pp.module.mp.enums.message.MpAutoReplyTypeEnum;
-import cn.aagro.pp.module.mp.framework.mp.core.util.MpUtils.*;
+import cn.aagro.ag.module.mp.dal.dataobject.message.MpMessageDO;
+import cn.aagro.ag.module.mp.enums.message.MpAutoReplyTypeEnum;
+import cn.aagro.ag.module.mp.framework.mp.core.util.MpUtils.*;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 import me.chanjar.weixin.common.api.WxConsts;
 import org.hibernate.validator.constraints.URL;
 
-import javax.validation.Valid;
-import javax.validation.constraints.AssertTrue;
-import javax.validation.constraints.NotEmpty;
-import javax.validation.constraints.NotNull;
+import jakarta.validation.Valid;
+import jakarta.validation.constraints.AssertTrue;
+import jakarta.validation.constraints.NotEmpty;
+import jakarta.validation.constraints.NotNull;
 import java.util.List;
 
 /**

aagro-module-mp/src/main/java/cn/aagro/ag/module/mp/controller/admin/message/vo/autoreply/MpAutoReplyCreateReqVO.java

@@ -1,11 +1,11 @@
-package cn.aagro.pp.module.mp.controller.admin.message.vo.autoreply;
+package cn.aagro.ag.module.mp.controller.admin.message.vo.autoreply;
 
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.ToString;
 
-import javax.validation.constraints.NotNull;
+import jakarta.validation.constraints.NotNull;
 
 @Schema(description = "管理后台 - 公众号自动回复的创建 Request VO")
 @Data

aagro-module-mp/src/main/java/cn/aagro/ag/module/mp/controller/admin/message/vo/autoreply/MpAutoReplyPageReqVO.java

@@ -1,12 +1,12 @@
-package cn.aagro.pp.module.mp.controller.admin.message.vo.autoreply;
+package cn.aagro.ag.module.mp.controller.admin.message.vo.autoreply;
 
-import cn.aagro.pp.framework.common.pojo.PageParam;
+import cn.aagro.ag.framework.common.pojo.PageParam;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.ToString;
 
-import javax.validation.constraints.NotNull;
+import jakarta.validation.constraints.NotNull;
 
 @Schema(description = "管理后台 - 公众号自动回复的分页 Request VO")
 @Data

aagro-module-mp/src/main/java/cn/aagro/ag/module/mp/controller/admin/message/vo/autoreply/MpAutoReplyRespVO.java

@@ -1,4 +1,4 @@
-package cn.aagro.pp.module.mp.controller.admin.message.vo.autoreply;
+package cn.aagro.ag.module.mp.controller.admin.message.vo.autoreply;
 
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;

aagro-module-mp/src/main/java/cn/aagro/ag/module/mp/controller/admin/message/vo/autoreply/MpAutoReplyUpdateReqVO.java

@@ -1,11 +1,11 @@
-package cn.aagro.pp.module.mp.controller.admin.message.vo.autoreply;
+package cn.aagro.ag.module.mp.controller.admin.message.vo.autoreply;
 
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.ToString;
 
-import javax.validation.constraints.NotNull;
+import jakarta.validation.constraints.NotNull;
 
 @Schema(description = "管理后台 - 公众号自动回复的更新 Request VO")
 @Data

aagro-module-mp/src/main/java/cn/aagro/ag/module/mp/controller/admin/message/vo/message/MpMessagePageReqVO.java

@@ -1,16 +1,16 @@
-package cn.aagro.pp.module.mp.controller.admin.message.vo.message;
+package cn.aagro.ag.module.mp.controller.admin.message.vo.message;
 
-import cn.aagro.pp.framework.common.pojo.PageParam;
+import cn.aagro.ag.framework.common.pojo.PageParam;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.ToString;
 import org.springframework.format.annotation.DateTimeFormat;
 
-import javax.validation.constraints.NotNull;
+import jakarta.validation.constraints.NotNull;
 import java.time.LocalDateTime;
 
-import static cn.aagro.pp.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
+import static cn.aagro.ag.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
 
 @Schema(description = "管理后台 - 公众号消息分页 Request VO")
 @Data

aagro-module-mp/src/main/java/cn/aagro/ag/module/mp/controller/admin/message/vo/message/MpMessageRespVO.java

@@ -1,6 +1,6 @@
-package cn.aagro.pp.module.mp.controller.admin.message.vo.message;
+package cn.aagro.ag.module.mp.controller.admin.message.vo.message;
 
-import cn.aagro.pp.module.mp.dal.dataobject.message.MpMessageDO;
+import cn.aagro.ag.module.mp.dal.dataobject.message.MpMessageDO;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.extension.handlers.JacksonTypeHandler;
 import io.swagger.v3.oas.annotations.media.Schema;

aagro-module-mp/src/main/java/cn/aagro/ag/module/mp/controller/admin/message/vo/message/MpMessageSendReqVO.java

@@ -1,13 +1,13 @@
-package cn.aagro.pp.module.mp.controller.admin.message.vo.message;
+package cn.aagro.ag.module.mp.controller.admin.message.vo.message;
 
-import cn.aagro.pp.module.mp.dal.dataobject.message.MpMessageDO;
-import cn.aagro.pp.module.mp.framework.mp.core.util.MpUtils.*;
+import cn.aagro.ag.module.mp.dal.dataobject.message.MpMessageDO;
+import cn.aagro.ag.module.mp.framework.mp.core.util.MpUtils.*;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 
-import javax.validation.Valid;
-import javax.validation.constraints.NotEmpty;
-import javax.validation.constraints.NotNull;
+import jakarta.validation.Valid;
+import jakarta.validation.constraints.NotEmpty;
+import jakarta.validation.constraints.NotNull;
 import java.util.List;
 
 @Schema(description = "管理后台 - 公众号消息发送 Request VO")

aagro-module-mp/src/main/java/cn/aagro/ag/module/mp/controller/admin/news/MpDraftController.java

@@ -1,14 +1,14 @@
-package cn.aagro.pp.module.mp.controller.admin.news;
+package cn.aagro.ag.module.mp.controller.admin.news;
 
 import cn.hutool.core.collection.CollUtil;
-import cn.aagro.pp.framework.common.pojo.CommonResult;
-import cn.aagro.pp.framework.common.pojo.PageResult;
-import cn.aagro.pp.framework.common.util.collection.CollectionUtils;
-import cn.aagro.pp.framework.common.util.object.PageUtils;
-import cn.aagro.pp.module.mp.controller.admin.news.vo.MpDraftPageReqVO;
-import cn.aagro.pp.module.mp.dal.dataobject.material.MpMaterialDO;
-import cn.aagro.pp.module.mp.framework.mp.core.MpServiceFactory;
-import cn.aagro.pp.module.mp.service.material.MpMaterialService;
+import cn.aagro.ag.framework.common.pojo.CommonResult;
+import cn.aagro.ag.framework.common.pojo.PageResult;
+import cn.aagro.ag.framework.common.util.collection.CollectionUtils;
+import cn.aagro.ag.framework.common.util.object.PageUtils;
+import cn.aagro.ag.module.mp.controller.admin.news.vo.MpDraftPageReqVO;
+import cn.aagro.ag.module.mp.dal.dataobject.material.MpMaterialDO;
+import cn.aagro.ag.module.mp.framework.mp.core.MpServiceFactory;
+import cn.aagro.ag.module.mp.service.material.MpMaterialService;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.Parameter;
 import io.swagger.v3.oas.annotations.Parameters;
@@ -20,16 +20,16 @@ import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
-import javax.annotation.Resource;
+import jakarta.annotation.Resource;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
 
-import static cn.aagro.pp.framework.common.exception.util.ServiceExceptionUtil.exception;
-import static cn.aagro.pp.framework.common.pojo.CommonResult.success;
-import static cn.aagro.pp.framework.common.util.collection.MapUtils.findAndThen;
-import static cn.aagro.pp.module.mp.enums.ErrorCodeConstants.*;
+import static cn.aagro.ag.framework.common.exception.util.ServiceExceptionUtil.exception;
+import static cn.aagro.ag.framework.common.pojo.CommonResult.success;
+import static cn.aagro.ag.framework.common.util.collection.MapUtils.findAndThen;
+import static cn.aagro.ag.module.mp.enums.ErrorCodeConstants.*;
 
 @Tag(name = "管理后台 - 公众号草稿")
 @RestController

aagro-module-mp/src/main/java/cn/aagro/ag/module/mp/controller/admin/news/MpFreePublishController.java

@@ -1,14 +1,14 @@
-package cn.aagro.pp.module.mp.controller.admin.news;
+package cn.aagro.ag.module.mp.controller.admin.news;
 
 import cn.hutool.core.collection.CollUtil;
-import cn.aagro.pp.framework.common.pojo.CommonResult;
-import cn.aagro.pp.framework.common.pojo.PageResult;
-import cn.aagro.pp.framework.common.util.collection.CollectionUtils;
-import cn.aagro.pp.framework.common.util.object.PageUtils;
-import cn.aagro.pp.module.mp.controller.admin.news.vo.MpFreePublishPageReqVO;
-import cn.aagro.pp.module.mp.dal.dataobject.material.MpMaterialDO;
-import cn.aagro.pp.module.mp.framework.mp.core.MpServiceFactory;
-import cn.aagro.pp.module.mp.service.material.MpMaterialService;
+import cn.aagro.ag.framework.common.pojo.CommonResult;
+import cn.aagro.ag.framework.common.pojo.PageResult;
+import cn.aagro.ag.framework.common.util.collection.CollectionUtils;
+import cn.aagro.ag.framework.common.util.object.PageUtils;
+import cn.aagro.ag.module.mp.controller.admin.news.vo.MpFreePublishPageReqVO;
+import cn.aagro.ag.module.mp.dal.dataobject.material.MpMaterialDO;
+import cn.aagro.ag.module.mp.framework.mp.core.MpServiceFactory;
+import cn.aagro.ag.module.mp.service.material.MpMaterialService;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.Parameter;
 import io.swagger.v3.oas.annotations.Parameters;
@@ -21,16 +21,16 @@ import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
-import javax.annotation.Resource;
+import jakarta.annotation.Resource;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
 
-import static cn.aagro.pp.framework.common.exception.util.ServiceExceptionUtil.exception;
-import static cn.aagro.pp.framework.common.pojo.CommonResult.success;
-import static cn.aagro.pp.framework.common.util.collection.MapUtils.findAndThen;
-import static cn.aagro.pp.module.mp.enums.ErrorCodeConstants.*;
+import static cn.aagro.ag.framework.common.exception.util.ServiceExceptionUtil.exception;
+import static cn.aagro.ag.framework.common.pojo.CommonResult.success;
+import static cn.aagro.ag.framework.common.util.collection.MapUtils.findAndThen;
+import static cn.aagro.ag.module.mp.enums.ErrorCodeConstants.*;
 
 @Tag(name = "管理后台 - 公众号发布能力")
 @RestController

aagro-module-mp/src/main/java/cn/aagro/ag/module/mp/controller/admin/news/vo/MpDraftPageReqVO.java

@@ -1,12 +1,12 @@
-package cn.aagro.pp.module.mp.controller.admin.news.vo;
+package cn.aagro.ag.module.mp.controller.admin.news.vo;
 
-import cn.aagro.pp.framework.common.pojo.PageParam;
+import cn.aagro.ag.framework.common.pojo.PageParam;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.ToString;
 
-import javax.validation.constraints.NotNull;
+import jakarta.validation.constraints.NotNull;
 
 @Schema(description = "管理后台 - 公众号草稿的分页 Request VO")
 @Data

aagro-module-mp/src/main/java/cn/aagro/ag/module/mp/controller/admin/news/vo/MpFreePublishPageReqVO.java

@@ -1,12 +1,12 @@
-package cn.aagro.pp.module.mp.controller.admin.news.vo;
+package cn.aagro.ag.module.mp.controller.admin.news.vo;
 
-import cn.aagro.pp.framework.common.pojo.PageParam;
+import cn.aagro.ag.framework.common.pojo.PageParam;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.ToString;
 
-import javax.validation.constraints.NotNull;
+import jakarta.validation.constraints.NotNull;
 
 @Schema(description = "管理后台 - 公众号已发布列表的分页 Request VO")
 @Data

aagro-module-mp/src/main/java/cn/aagro/ag/module/mp/controller/admin/open/MpOpenController.java

@@ -1,15 +1,15 @@
-package cn.aagro.pp.module.mp.controller.admin.open;
+package cn.aagro.ag.module.mp.controller.admin.open;
 
 import cn.hutool.core.lang.Assert;
 import cn.hutool.core.util.StrUtil;
-import cn.aagro.pp.framework.tenant.core.aop.TenantIgnore;
-import cn.aagro.pp.framework.tenant.core.util.TenantUtils;
-import cn.aagro.pp.module.mp.controller.admin.open.vo.MpOpenCheckSignatureReqVO;
-import cn.aagro.pp.module.mp.controller.admin.open.vo.MpOpenHandleMessageReqVO;
-import cn.aagro.pp.module.mp.dal.dataobject.account.MpAccountDO;
-import cn.aagro.pp.module.mp.framework.mp.core.MpServiceFactory;
-import cn.aagro.pp.module.mp.framework.mp.core.context.MpContextHolder;
-import cn.aagro.pp.module.mp.service.account.MpAccountService;
+import cn.aagro.ag.framework.tenant.core.aop.TenantIgnore;
+import cn.aagro.ag.framework.tenant.core.util.TenantUtils;
+import cn.aagro.ag.module.mp.controller.admin.open.vo.MpOpenCheckSignatureReqVO;
+import cn.aagro.ag.module.mp.controller.admin.open.vo.MpOpenHandleMessageReqVO;
+import cn.aagro.ag.module.mp.dal.dataobject.account.MpAccountDO;
+import cn.aagro.ag.module.mp.framework.mp.core.MpServiceFactory;
+import cn.aagro.ag.module.mp.framework.mp.core.context.MpContextHolder;
+import cn.aagro.ag.module.mp.service.account.MpAccountService;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import lombok.extern.slf4j.Slf4j;
@@ -20,7 +20,7 @@ import me.chanjar.weixin.mp.bean.message.WxMpXmlOutMessage;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
-import javax.annotation.Resource;
+import jakarta.annotation.Resource;
 import java.util.Objects;
 
 @Tag(name = "管理后台 - 公众号回调")

aagro-module-mp/src/main/java/cn/aagro/ag/module/mp/controller/admin/open/vo/MpOpenCheckSignatureReqVO.java

@@ -1,9 +1,9 @@
-package cn.aagro.pp.module.mp.controller.admin.open.vo;
+package cn.aagro.ag.module.mp.controller.admin.open.vo;
 
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 
-import javax.validation.constraints.NotEmpty;
+import jakarta.validation.constraints.NotEmpty;
 
 @Schema(description = "管理后台 - 公众号校验签名 Request VO")
 @Data

aagro-module-mp/src/main/java/cn/aagro/ag/module/mp/controller/admin/open/vo/MpOpenHandleMessageReqVO.java

@@ -1,10 +1,10 @@
-package cn.aagro.pp.module.mp.controller.admin.open.vo;
+package cn.aagro.ag.module.mp.controller.admin.open.vo;
 
 
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 
-import javax.validation.constraints.NotEmpty;
+import jakarta.validation.constraints.NotEmpty;
 
 @Schema(description = "管理后台 - 公众号处理消息 Request VO")
 @Data

aagro-module-mp/src/main/java/cn/aagro/ag/module/mp/controller/admin/statistics/MpStatisticsController.java

@@ -1,9 +1,9 @@
-package cn.aagro.pp.module.mp.controller.admin.statistics;
+package cn.aagro.ag.module.mp.controller.admin.statistics;
 
-import cn.aagro.pp.framework.common.pojo.CommonResult;
-import cn.aagro.pp.module.mp.controller.admin.statistics.vo.*;
-import cn.aagro.pp.module.mp.convert.statistics.MpStatisticsConvert;
-import cn.aagro.pp.module.mp.service.statistics.MpStatisticsService;
+import cn.aagro.ag.framework.common.pojo.CommonResult;
+import cn.aagro.ag.module.mp.controller.admin.statistics.vo.*;
+import cn.aagro.ag.module.mp.convert.statistics.MpStatisticsConvert;
+import cn.aagro.ag.module.mp.service.statistics.MpStatisticsService;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import me.chanjar.weixin.mp.bean.datacube.WxDataCubeInterfaceResult;
@@ -16,10 +16,10 @@ import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
-import javax.annotation.Resource;
+import jakarta.annotation.Resource;
 import java.util.List;
 
-import static cn.aagro.pp.framework.common.pojo.CommonResult.success;
+import static cn.aagro.ag.framework.common.pojo.CommonResult.success;
 
 @Tag(name = "管理后台 - 公众号统计")
 @RestController

aagro-module-mp/src/main/java/cn/aagro/ag/module/mp/controller/admin/statistics/vo/MpStatisticsGetReqVO.java

@@ -1,13 +1,13 @@
-package cn.aagro.pp.module.mp.controller.admin.statistics.vo;
+package cn.aagro.ag.module.mp.controller.admin.statistics.vo;
 
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 import org.springframework.format.annotation.DateTimeFormat;
 
-import javax.validation.constraints.NotNull;
+import jakarta.validation.constraints.NotNull;
 import java.time.LocalDateTime;
 
-import static cn.aagro.pp.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
+import static cn.aagro.ag.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
 
 @Schema(description = "管理后台 - 获得统计数据 Request VO")
 @Data

aagro-module-mp/src/main/java/cn/aagro/ag/module/mp/controller/admin/statistics/vo/MpStatisticsInterfaceSummaryRespVO.java

@@ -1,4 +1,4 @@
-package cn.aagro.pp.module.mp.controller.admin.statistics.vo;
+package cn.aagro.ag.module.mp.controller.admin.statistics.vo;
 
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;

aagro-module-mp/src/main/java/cn/aagro/ag/module/mp/controller/admin/statistics/vo/MpStatisticsUpstreamMessageRespVO.java

@@ -1,4 +1,4 @@
-package cn.aagro.pp.module.mp.controller.admin.statistics.vo;
+package cn.aagro.ag.module.mp.controller.admin.statistics.vo;
 
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;

aagro-module-mp/src/main/java/cn/aagro/ag/module/mp/controller/admin/statistics/vo/MpStatisticsUserCumulateRespVO.java

@@ -1,4 +1,4 @@
-package cn.aagro.pp.module.mp.controller.admin.statistics.vo;
+package cn.aagro.ag.module.mp.controller.admin.statistics.vo;
 
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;

aagro-module-mp/src/main/java/cn/aagro/ag/module/mp/controller/admin/statistics/vo/MpStatisticsUserSummaryRespVO.java

@@ -1,4 +1,4 @@
-package cn.aagro.pp.module.mp.controller.admin.statistics.vo;
+package cn.aagro.ag.module.mp.controller.admin.statistics.vo;
 
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;

aagro-module-mp/src/main/java/cn/aagro/ag/module/mp/controller/admin/tag/MpTagController.java

@@ -1,11 +1,11 @@
-package cn.aagro.pp.module.mp.controller.admin.tag;
+package cn.aagro.ag.module.mp.controller.admin.tag;
 
-import cn.aagro.pp.framework.common.pojo.CommonResult;
-import cn.aagro.pp.framework.common.pojo.PageResult;
-import cn.aagro.pp.module.mp.controller.admin.tag.vo.*;
-import cn.aagro.pp.module.mp.convert.tag.MpTagConvert;
-import cn.aagro.pp.module.mp.dal.dataobject.tag.MpTagDO;
-import cn.aagro.pp.module.mp.service.tag.MpTagService;
+import cn.aagro.ag.framework.common.pojo.CommonResult;
+import cn.aagro.ag.framework.common.pojo.PageResult;
+import cn.aagro.ag.module.mp.controller.admin.tag.vo.*;
+import cn.aagro.ag.module.mp.convert.tag.MpTagConvert;
+import cn.aagro.ag.module.mp.dal.dataobject.tag.MpTagDO;
+import cn.aagro.ag.module.mp.service.tag.MpTagService;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.Parameter;
 import io.swagger.v3.oas.annotations.tags.Tag;
@@ -13,11 +13,11 @@ import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
-import javax.annotation.Resource;
-import javax.validation.Valid;
+import jakarta.annotation.Resource;
+import jakarta.validation.Valid;
 import java.util.List;
 
-import static cn.aagro.pp.framework.common.pojo.CommonResult.success;
+import static cn.aagro.ag.framework.common.pojo.CommonResult.success;
 
 @Tag(name = "管理后台 - 公众号标签")
 @RestController

aagro-module-mp/src/main/java/cn/aagro/ag/module/mp/controller/admin/tag/vo/MpTagBaseVO.java

@@ -1,9 +1,9 @@
-package cn.aagro.pp.module.mp.controller.admin.tag.vo;
+package cn.aagro.ag.module.mp.controller.admin.tag.vo;
 
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 
-import javax.validation.constraints.NotEmpty;
+import jakarta.validation.constraints.NotEmpty;
 
 /**
  * 公众号标签 Base VO，提供给添加、修改、详细的子 VO 使用

aagro-module-mp/src/main/java/cn/aagro/ag/module/mp/controller/admin/tag/vo/MpTagCreateReqVO.java

@@ -1,11 +1,11 @@
-package cn.aagro.pp.module.mp.controller.admin.tag.vo;
+package cn.aagro.ag.module.mp.controller.admin.tag.vo;
 
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.ToString;
 
-import javax.validation.constraints.NotNull;
+import jakarta.validation.constraints.NotNull;
 
 @Schema(description = "管理后台 - 公众号标签创建 Request VO")
 @Data

aagro-module-mp/src/main/java/cn/aagro/ag/module/mp/controller/admin/tag/vo/MpTagPageReqVO.java

@@ -1,12 +1,12 @@
-package cn.aagro.pp.module.mp.controller.admin.tag.vo;
+package cn.aagro.ag.module.mp.controller.admin.tag.vo;
 
-import cn.aagro.pp.framework.common.pojo.PageParam;
+import cn.aagro.ag.framework.common.pojo.PageParam;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.ToString;
 
-import javax.validation.constraints.NotEmpty;
+import jakarta.validation.constraints.NotEmpty;
 
 @Schema(description = "管理后台 - 公众号标签分页 Request VO")
 @Data

aagro-module-mp/src/main/java/cn/aagro/ag/module/mp/controller/admin/tag/vo/MpTagRespVO.java

@@ -1,4 +1,4 @@
-package cn.aagro.pp.module.mp.controller.admin.tag.vo;
+package cn.aagro.ag.module.mp.controller.admin.tag.vo;
 
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;

aagro-module-mp/src/main/java/cn/aagro/ag/module/mp/controller/admin/tag/vo/MpTagSimpleRespVO.java

@@ -1,4 +1,4 @@
-package cn.aagro.pp.module.mp.controller.admin.tag.vo;
+package cn.aagro.ag.module.mp.controller.admin.tag.vo;
 
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;

aagro-module-mp/src/main/java/cn/aagro/ag/module/mp/controller/admin/tag/vo/MpTagUpdateReqVO.java

@@ -1,11 +1,11 @@
-package cn.aagro.pp.module.mp.controller.admin.tag.vo;
+package cn.aagro.ag.module.mp.controller.admin.tag.vo;
 
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.ToString;
 
-import javax.validation.constraints.NotNull;
+import jakarta.validation.constraints.NotNull;
 
 @Schema(description = "管理后台 - 公众号标签更新 Request VO")
 @Data

aagro-module-mp/src/main/java/cn/aagro/ag/module/mp/controller/admin/user/MpUserController.java

@@ -1,13 +1,13 @@
-package cn.aagro.pp.module.mp.controller.admin.user;
+package cn.aagro.ag.module.mp.controller.admin.user;
 
-import cn.aagro.pp.framework.common.pojo.CommonResult;
-import cn.aagro.pp.framework.common.pojo.PageResult;
-import cn.aagro.pp.module.mp.controller.admin.user.vo.MpUserPageReqVO;
-import cn.aagro.pp.module.mp.controller.admin.user.vo.MpUserRespVO;
-import cn.aagro.pp.module.mp.controller.admin.user.vo.MpUserUpdateReqVO;
-import cn.aagro.pp.module.mp.convert.user.MpUserConvert;
-import cn.aagro.pp.module.mp.dal.dataobject.user.MpUserDO;
-import cn.aagro.pp.module.mp.service.user.MpUserService;
+import cn.aagro.ag.framework.common.pojo.CommonResult;
+import cn.aagro.ag.framework.common.pojo.PageResult;
+import cn.aagro.ag.module.mp.controller.admin.user.vo.MpUserPageReqVO;
+import cn.aagro.ag.module.mp.controller.admin.user.vo.MpUserRespVO;
+import cn.aagro.ag.module.mp.controller.admin.user.vo.MpUserUpdateReqVO;
+import cn.aagro.ag.module.mp.convert.user.MpUserConvert;
+import cn.aagro.ag.module.mp.dal.dataobject.user.MpUserDO;
+import cn.aagro.ag.module.mp.service.user.MpUserService;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.Parameter;
 import io.swagger.v3.oas.annotations.tags.Tag;
@@ -15,10 +15,10 @@ import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
-import javax.annotation.Resource;
-import javax.validation.Valid;
+import jakarta.annotation.Resource;
+import jakarta.validation.Valid;
 
-import static cn.aagro.pp.framework.common.pojo.CommonResult.success;
+import static cn.aagro.ag.framework.common.pojo.CommonResult.success;
 
 @Tag(name = "管理后台 - 公众号粉丝")
 @RestController

aagro-module-mp/src/main/java/cn/aagro/ag/module/mp/controller/admin/user/vo/MpUserPageReqVO.java

@@ -1,12 +1,12 @@
-package cn.aagro.pp.module.mp.controller.admin.user.vo;
+package cn.aagro.ag.module.mp.controller.admin.user.vo;
 
-import cn.aagro.pp.framework.common.pojo.PageParam;
+import cn.aagro.ag.framework.common.pojo.PageParam;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.ToString;
 
-import javax.validation.constraints.NotNull;
+import jakarta.validation.constraints.NotNull;
 
 @Schema(description = "管理后台 - 公众号粉丝分页 Request VO")
 @Data

aagro-module-mp/src/main/java/cn/aagro/ag/module/mp/controller/admin/user/vo/MpUserRespVO.java

@@ -1,4 +1,4 @@
-package cn.aagro.pp.module.mp.controller.admin.user.vo;
+package cn.aagro.ag.module.mp.controller.admin.user.vo;
 
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
@@ -26,7 +26,7 @@ public class MpUserRespVO  {
     @Schema(description = "取消关注时间")
     private LocalDateTime unsubscribeTime;
 
-    @Schema(description = "昵称", example = "芋道")
+    @Schema(description = "昵称", example = "AIOTAGRO")
     private String nickname;
     @Schema(description = "头像地址", example = "https://www.iocoder.cn/1.png")
     private String headImageUrl;

aagro-module-mp/src/main/java/cn/aagro/ag/module/mp/controller/admin/user/vo/MpUserUpdateReqVO.java

@@ -1,9 +1,9 @@
-package cn.aagro.pp.module.mp.controller.admin.user.vo;
+package cn.aagro.ag.module.mp.controller.admin.user.vo;
 
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 
-import javax.validation.constraints.NotNull;
+import jakarta.validation.constraints.NotNull;
 import java.util.List;
 
 @Schema(description = "管理后台 - 公众号粉丝更新 Request VO")
@@ -14,7 +14,7 @@ public class MpUserUpdateReqVO {
     @NotNull(message = "编号不能为空")
     private Long id;
 
-    @Schema(description = "昵称", example = "芋道")
+    @Schema(description = "昵称", example = "AIOTAGRO")
     private String nickname;
 
     @Schema(description = "备注", example = "你是一个芋头嘛")

aagro-module-mp/src/main/java/cn/aagro/ag/module/mp/controller/package-info.java

@@ -3,4 +3,4 @@
  * 1. admin 包：提供给管理后台 aagro-ui-admin 前端项目
  * 2. app 包：提供给用户 APP aagro-ui-app 前端项目，它的 Controller 和 VO 都要添加 App 前缀，用于和管理后台进行区分
  */
-package cn.aagro.pp.module.mp.controller;
+package cn.aagro.ag.module.mp.controller;

aagro-module-mp/src/main/java/cn/aagro/ag/module/mp/convert/account/MpAccountConvert.java

@@ -1,11 +1,11 @@
-package cn.aagro.pp.module.mp.convert.account;
+package cn.aagro.ag.module.mp.convert.account;
 
-import cn.aagro.pp.framework.common.pojo.PageResult;
-import cn.aagro.pp.module.mp.controller.admin.account.vo.MpAccountCreateReqVO;
-import cn.aagro.pp.module.mp.controller.admin.account.vo.MpAccountRespVO;
-import cn.aagro.pp.module.mp.controller.admin.account.vo.MpAccountSimpleRespVO;
-import cn.aagro.pp.module.mp.controller.admin.account.vo.MpAccountUpdateReqVO;
-import cn.aagro.pp.module.mp.dal.dataobject.account.MpAccountDO;
+import cn.aagro.ag.framework.common.pojo.PageResult;
+import cn.aagro.ag.module.mp.controller.admin.account.vo.MpAccountCreateReqVO;
+import cn.aagro.ag.module.mp.controller.admin.account.vo.MpAccountRespVO;
+import cn.aagro.ag.module.mp.controller.admin.account.vo.MpAccountSimpleRespVO;
+import cn.aagro.ag.module.mp.controller.admin.account.vo.MpAccountUpdateReqVO;
+import cn.aagro.ag.module.mp.dal.dataobject.account.MpAccountDO;
 import org.mapstruct.Mapper;
 import org.mapstruct.factory.Mappers;
 

aagro-module-mp/src/main/java/cn/aagro/ag/module/mp/convert/material/MpMaterialConvert.java

@@ -1,10 +1,10 @@
-package cn.aagro.pp.module.mp.convert.material;
+package cn.aagro.ag.module.mp.convert.material;
 
-import cn.aagro.pp.framework.common.pojo.PageResult;
-import cn.aagro.pp.module.mp.controller.admin.material.vo.MpMaterialRespVO;
-import cn.aagro.pp.module.mp.controller.admin.material.vo.MpMaterialUploadRespVO;
-import cn.aagro.pp.module.mp.dal.dataobject.account.MpAccountDO;
-import cn.aagro.pp.module.mp.dal.dataobject.material.MpMaterialDO;
+import cn.aagro.ag.framework.common.pojo.PageResult;
+import cn.aagro.ag.module.mp.controller.admin.material.vo.MpMaterialRespVO;
+import cn.aagro.ag.module.mp.controller.admin.material.vo.MpMaterialUploadRespVO;
+import cn.aagro.ag.module.mp.dal.dataobject.account.MpAccountDO;
+import cn.aagro.ag.module.mp.dal.dataobject.material.MpMaterialDO;
 import me.chanjar.weixin.mp.bean.material.WxMpMaterial;
 import org.mapstruct.Mapper;
 import org.mapstruct.Mapping;

aagro-module-mp/src/main/java/cn/aagro/ag/module/mp/convert/menu/MpMenuConvert.java

@@ -1,9 +1,9 @@
-package cn.aagro.pp.module.mp.convert.menu;
+package cn.aagro.ag.module.mp.convert.menu;
 
-import cn.aagro.pp.module.mp.controller.admin.menu.vo.MpMenuRespVO;
-import cn.aagro.pp.module.mp.controller.admin.menu.vo.MpMenuSaveReqVO;
-import cn.aagro.pp.module.mp.dal.dataobject.menu.MpMenuDO;
-import cn.aagro.pp.module.mp.service.message.bo.MpMessageSendOutReqBO;
+import cn.aagro.ag.module.mp.controller.admin.menu.vo.MpMenuRespVO;
+import cn.aagro.ag.module.mp.controller.admin.menu.vo.MpMenuSaveReqVO;
+import cn.aagro.ag.module.mp.dal.dataobject.menu.MpMenuDO;
+import cn.aagro.ag.module.mp.service.message.bo.MpMessageSendOutReqBO;
 import me.chanjar.weixin.common.bean.menu.WxMenuButton;
 import org.mapstruct.Mapper;
 import org.mapstruct.Mapping;

aagro-module-mp/src/main/java/cn/aagro/ag/module/mp/convert/message/MpAutoReplyConvert.java

@@ -1,11 +1,11 @@
-package cn.aagro.pp.module.mp.convert.message;
+package cn.aagro.ag.module.mp.convert.message;
 
-import cn.aagro.pp.framework.common.pojo.PageResult;
-import cn.aagro.pp.module.mp.controller.admin.message.vo.autoreply.MpAutoReplyCreateReqVO;
-import cn.aagro.pp.module.mp.controller.admin.message.vo.autoreply.MpAutoReplyRespVO;
-import cn.aagro.pp.module.mp.controller.admin.message.vo.autoreply.MpAutoReplyUpdateReqVO;
-import cn.aagro.pp.module.mp.dal.dataobject.message.MpAutoReplyDO;
-import cn.aagro.pp.module.mp.service.message.bo.MpMessageSendOutReqBO;
+import cn.aagro.ag.framework.common.pojo.PageResult;
+import cn.aagro.ag.module.mp.controller.admin.message.vo.autoreply.MpAutoReplyCreateReqVO;
+import cn.aagro.ag.module.mp.controller.admin.message.vo.autoreply.MpAutoReplyRespVO;
+import cn.aagro.ag.module.mp.controller.admin.message.vo.autoreply.MpAutoReplyUpdateReqVO;
+import cn.aagro.ag.module.mp.dal.dataobject.message.MpAutoReplyDO;
+import cn.aagro.ag.module.mp.service.message.bo.MpMessageSendOutReqBO;
 import org.mapstruct.Mapper;
 import org.mapstruct.Mapping;
 import org.mapstruct.Mappings;

aagro-module-mp/src/main/java/cn/aagro/ag/module/mp/convert/message/MpMessageConvert.java

@@ -1,12 +1,12 @@
-package cn.aagro.pp.module.mp.convert.message;
+package cn.aagro.ag.module.mp.convert.message;
 
-import cn.aagro.pp.framework.common.pojo.PageResult;
-import cn.aagro.pp.module.mp.controller.admin.message.vo.message.MpMessageRespVO;
-import cn.aagro.pp.module.mp.controller.admin.message.vo.message.MpMessageSendReqVO;
-import cn.aagro.pp.module.mp.dal.dataobject.account.MpAccountDO;
-import cn.aagro.pp.module.mp.dal.dataobject.message.MpMessageDO;
-import cn.aagro.pp.module.mp.dal.dataobject.user.MpUserDO;
-import cn.aagro.pp.module.mp.service.message.bo.MpMessageSendOutReqBO;
+import cn.aagro.ag.framework.common.pojo.PageResult;
+import cn.aagro.ag.module.mp.controller.admin.message.vo.message.MpMessageRespVO;
+import cn.aagro.ag.module.mp.controller.admin.message.vo.message.MpMessageSendReqVO;
+import cn.aagro.ag.module.mp.dal.dataobject.account.MpAccountDO;
+import cn.aagro.ag.module.mp.dal.dataobject.message.MpMessageDO;
+import cn.aagro.ag.module.mp.dal.dataobject.user.MpUserDO;
+import cn.aagro.ag.module.mp.service.message.bo.MpMessageSendOutReqBO;
 import me.chanjar.weixin.common.api.WxConsts;
 import me.chanjar.weixin.mp.bean.kefu.WxMpKefuMessage;
 import me.chanjar.weixin.mp.bean.message.WxMpXmlMessage;

aagro-module-mp/src/main/java/cn/aagro/ag/module/mp/convert/statistics/MpStatisticsConvert.java

@@ -1,9 +1,9 @@
-package cn.aagro.pp.module.mp.convert.statistics;
+package cn.aagro.ag.module.mp.convert.statistics;
 
-import cn.aagro.pp.module.mp.controller.admin.statistics.vo.MpStatisticsInterfaceSummaryRespVO;
-import cn.aagro.pp.module.mp.controller.admin.statistics.vo.MpStatisticsUpstreamMessageRespVO;
-import cn.aagro.pp.module.mp.controller.admin.statistics.vo.MpStatisticsUserCumulateRespVO;
-import cn.aagro.pp.module.mp.controller.admin.statistics.vo.MpStatisticsUserSummaryRespVO;
+import cn.aagro.ag.module.mp.controller.admin.statistics.vo.MpStatisticsInterfaceSummaryRespVO;
+import cn.aagro.ag.module.mp.controller.admin.statistics.vo.MpStatisticsUpstreamMessageRespVO;
+import cn.aagro.ag.module.mp.controller.admin.statistics.vo.MpStatisticsUserCumulateRespVO;
+import cn.aagro.ag.module.mp.controller.admin.statistics.vo.MpStatisticsUserSummaryRespVO;
 import me.chanjar.weixin.mp.bean.datacube.WxDataCubeInterfaceResult;
 import me.chanjar.weixin.mp.bean.datacube.WxDataCubeMsgResult;
 import me.chanjar.weixin.mp.bean.datacube.WxDataCubeUserCumulate;
@@ -19,7 +19,7 @@ import java.time.LocalDateTime;
 import java.time.format.DateTimeFormatter;
 import java.util.List;
 
-import static cn.aagro.pp.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY;
+import static cn.aagro.ag.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY;
 
 @Mapper
 public interface MpStatisticsConvert {

aagro-module-mp/src/main/java/cn/aagro/ag/module/mp/convert/tag/MpTagConvert.java

@@ -1,11 +1,11 @@
-package cn.aagro.pp.module.mp.convert.tag;
+package cn.aagro.ag.module.mp.convert.tag;
 
-import cn.aagro.pp.framework.common.pojo.PageResult;
-import cn.aagro.pp.module.mp.controller.admin.tag.vo.MpTagRespVO;
-import cn.aagro.pp.module.mp.controller.admin.tag.vo.MpTagSimpleRespVO;
-import cn.aagro.pp.module.mp.controller.admin.tag.vo.MpTagUpdateReqVO;
-import cn.aagro.pp.module.mp.dal.dataobject.account.MpAccountDO;
-import cn.aagro.pp.module.mp.dal.dataobject.tag.MpTagDO;
+import cn.aagro.ag.framework.common.pojo.PageResult;
+import cn.aagro.ag.module.mp.controller.admin.tag.vo.MpTagRespVO;
+import cn.aagro.ag.module.mp.controller.admin.tag.vo.MpTagSimpleRespVO;
+import cn.aagro.ag.module.mp.controller.admin.tag.vo.MpTagUpdateReqVO;
+import cn.aagro.ag.module.mp.dal.dataobject.account.MpAccountDO;
+import cn.aagro.ag.module.mp.dal.dataobject.tag.MpTagDO;
 import me.chanjar.weixin.mp.bean.tag.WxUserTag;
 import org.mapstruct.Mapper;
 import org.mapstruct.Mapping;

aagro-module-mp/src/main/java/cn/aagro/ag/module/mp/convert/user/MpUserConvert.java

@@ -1,13 +1,13 @@
-package cn.aagro.pp.module.mp.convert.user;
+package cn.aagro.ag.module.mp.convert.user;
 
 import cn.hutool.core.date.LocalDateTimeUtil;
-import cn.aagro.pp.framework.common.enums.CommonStatusEnum;
-import cn.aagro.pp.framework.common.pojo.PageResult;
-import cn.aagro.pp.framework.common.util.collection.CollectionUtils;
-import cn.aagro.pp.module.mp.controller.admin.user.vo.MpUserRespVO;
-import cn.aagro.pp.module.mp.controller.admin.user.vo.MpUserUpdateReqVO;
-import cn.aagro.pp.module.mp.dal.dataobject.account.MpAccountDO;
-import cn.aagro.pp.module.mp.dal.dataobject.user.MpUserDO;
+import cn.aagro.ag.framework.common.enums.CommonStatusEnum;
+import cn.aagro.ag.framework.common.pojo.PageResult;
+import cn.aagro.ag.framework.common.util.collection.CollectionUtils;
+import cn.aagro.ag.module.mp.controller.admin.user.vo.MpUserRespVO;
+import cn.aagro.ag.module.mp.controller.admin.user.vo.MpUserUpdateReqVO;
+import cn.aagro.ag.module.mp.dal.dataobject.account.MpAccountDO;
+import cn.aagro.ag.module.mp.dal.dataobject.user.MpUserDO;
 import me.chanjar.weixin.mp.bean.result.WxMpUser;
 import org.mapstruct.Mapper;
 import org.mapstruct.Mapping;

aagro-module-mp/src/main/java/cn/aagro/ag/module/mp/dal/dataobject/account/MpAccountDO.java

@@ -1,6 +1,6 @@
-package cn.aagro.pp.module.mp.dal.dataobject.account;
+package cn.aagro.ag.module.mp.dal.dataobject.account;
 
-import cn.aagro.pp.framework.tenant.core.db.TenantBaseDO;
+import cn.aagro.ag.framework.tenant.core.db.TenantBaseDO;
 import com.baomidou.mybatisplus.annotation.KeySequence;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
@@ -9,7 +9,7 @@ import lombok.*;
 /**
  * 公众号账号 DO
  *
- * @author 芋道源码
+ * @author AIOTAGRO
  */
 @TableName("mp_account")
 @KeySequence("mp_account_seq") // 用于 Oracle、PostgreSQL、Kingbase、DB2、H2 数据库的主键自增。如果是 MySQL 等数据库，可不写。

aagro-module-mp/src/main/java/cn/aagro/ag/module/mp/dal/dataobject/material/MpMaterialDO.java

@@ -1,7 +1,7 @@
-package cn.aagro.pp.module.mp.dal.dataobject.material;
+package cn.aagro.ag.module.mp.dal.dataobject.material;
 
-import cn.aagro.pp.framework.mybatis.core.dataobject.BaseDO;
-import cn.aagro.pp.module.mp.dal.dataobject.account.MpAccountDO;
+import cn.aagro.ag.framework.mybatis.core.dataobject.BaseDO;
+import cn.aagro.ag.module.mp.dal.dataobject.account.MpAccountDO;
 import com.baomidou.mybatisplus.annotation.KeySequence;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
@@ -14,7 +14,7 @@ import me.chanjar.weixin.common.api.WxConsts;
  * 1. <a href="https://developers.weixin.qq.com/doc/offiaccount/Asset_Management/New_temporary_materials.html">临时素材</a>
  * 2. <a href="https://developers.weixin.qq.com/doc/offiaccount/Asset_Management/Adding_Permanent_Assets.html">永久素材</a>
  *
- * @author 芋道源码
+ * @author AIOTAGRO
  */
 @TableName("mp_material")
 @KeySequence("mp_material_seq") // 用于 Oracle、PostgreSQL、Kingbase、DB2、H2 数据库的主键自增。如果是 MySQL 等数据库，可不写。

aagro-module-mp/src/main/java/cn/aagro/ag/module/mp/dal/dataobject/menu/MpMenuDO.java

@@ -1,8 +1,8 @@
-package cn.aagro.pp.module.mp.dal.dataobject.menu;
+package cn.aagro.ag.module.mp.dal.dataobject.menu;
 
-import cn.aagro.pp.framework.mybatis.core.dataobject.BaseDO;
-import cn.aagro.pp.module.mp.dal.dataobject.account.MpAccountDO;
-import cn.aagro.pp.module.mp.dal.dataobject.message.MpMessageDO;
+import cn.aagro.ag.framework.mybatis.core.dataobject.BaseDO;
+import cn.aagro.ag.module.mp.dal.dataobject.account.MpAccountDO;
+import cn.aagro.ag.module.mp.dal.dataobject.message.MpMessageDO;
 import com.baomidou.mybatisplus.annotation.KeySequence;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
@@ -19,7 +19,7 @@ import java.util.List;
 /**
  * 公众号菜单 DO
  *
- * @author 芋道源码
+ * @author AIOTAGRO
  */
 @TableName(value = "mp_menu", autoResultMap = true)
 @KeySequence("mp_menu_seq") // 用于 Oracle、PostgreSQL、Kingbase、DB2、H2 数据库的主键自增。如果是 MySQL 等数据库，可不写。

aagro-module-mp/src/main/java/cn/aagro/ag/module/mp/dal/dataobject/message/MpAutoReplyDO.java

@@ -1,10 +1,10 @@
-package cn.aagro.pp.module.mp.dal.dataobject.message;
+package cn.aagro.ag.module.mp.dal.dataobject.message;
 
-import cn.aagro.pp.framework.common.util.collection.SetUtils;
-import cn.aagro.pp.framework.mybatis.core.dataobject.BaseDO;
-import cn.aagro.pp.module.mp.dal.dataobject.account.MpAccountDO;
-import cn.aagro.pp.module.mp.enums.message.MpAutoReplyMatchEnum;
-import cn.aagro.pp.module.mp.enums.message.MpAutoReplyTypeEnum;
+import cn.aagro.ag.framework.common.util.collection.SetUtils;
+import cn.aagro.ag.framework.mybatis.core.dataobject.BaseDO;
+import cn.aagro.ag.module.mp.dal.dataobject.account.MpAccountDO;
+import cn.aagro.ag.module.mp.enums.message.MpAutoReplyMatchEnum;
+import cn.aagro.ag.module.mp.enums.message.MpAutoReplyTypeEnum;
 import com.baomidou.mybatisplus.annotation.KeySequence;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
@@ -22,7 +22,7 @@ import java.util.Set;
 /**
  * 公众号消息自动回复 DO
  *
- * @author 芋道源码
+ * @author AIOTAGRO
  */
 @TableName(value = "mp_auto_reply", autoResultMap = true)
 @KeySequence("mp_auto_reply_seq") // 用于 Oracle、PostgreSQL、Kingbase、DB2、H2 数据库的主键自增。如果是 MySQL 等数据库，可不写。

aagro-module-mp/src/main/java/cn/aagro/ag/module/mp/dal/dataobject/message/MpMessageDO.java

@@ -1,9 +1,9 @@
-package cn.aagro.pp.module.mp.dal.dataobject.message;
+package cn.aagro.ag.module.mp.dal.dataobject.message;
 
-import cn.aagro.pp.framework.mybatis.core.dataobject.BaseDO;
-import cn.aagro.pp.module.mp.dal.dataobject.account.MpAccountDO;
-import cn.aagro.pp.module.mp.dal.dataobject.user.MpUserDO;
-import cn.aagro.pp.module.mp.enums.message.MpMessageSendFromEnum;
+import cn.aagro.ag.framework.mybatis.core.dataobject.BaseDO;
+import cn.aagro.ag.module.mp.dal.dataobject.account.MpAccountDO;
+import cn.aagro.ag.module.mp.dal.dataobject.user.MpUserDO;
+import cn.aagro.ag.module.mp.enums.message.MpMessageSendFromEnum;
 import com.baomidou.mybatisplus.annotation.KeySequence;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
@@ -15,14 +15,14 @@ import lombok.ToString;
 import me.chanjar.weixin.common.api.WxConsts;
 import me.chanjar.weixin.mp.builder.kefu.NewsBuilder;
 
-import javax.validation.constraints.NotEmpty;
+import jakarta.validation.constraints.NotEmpty;
 import java.io.Serializable;
 import java.util.List;
 
 /**
  * 公众号消息 DO
  *
- * @author 芋道源码
+ * @author AIOTAGRO
  */
 @TableName(value = "mp_message", autoResultMap = true)
 @KeySequence("mp_message_seq") // 用于 Oracle、PostgreSQL、Kingbase、DB2、H2 数据库的主键自增。如果是 MySQL 等数据库，可不写。

aagro-module-mp/src/main/java/cn/aagro/ag/module/mp/dal/dataobject/tag/MpTagDO.java

@@ -1,16 +1,16 @@
-package cn.aagro.pp.module.mp.dal.dataobject.tag;
+package cn.aagro.ag.module.mp.dal.dataobject.tag;
 
-import cn.aagro.pp.module.mp.dal.dataobject.account.MpAccountDO;
+import cn.aagro.ag.module.mp.dal.dataobject.account.MpAccountDO;
 import lombok.*;
 
 import com.baomidou.mybatisplus.annotation.*;
-import cn.aagro.pp.framework.mybatis.core.dataobject.BaseDO;
+import cn.aagro.ag.framework.mybatis.core.dataobject.BaseDO;
 import me.chanjar.weixin.mp.bean.tag.WxUserTag;
 
 /**
  * 公众号标签 DO
  *
- * @author 芋道源码
+ * @author AIOTAGRO
  */
 @TableName("mp_tag")
 @KeySequence("mp_tag_seq") // 用于 Oracle、PostgreSQL、Kingbase、DB2、H2 数据库的主键自增。如果是 MySQL 等数据库，可不写。

aagro-module-mp/src/main/java/cn/aagro/ag/module/mp/dal/dataobject/user/MpUserDO.java

@@ -1,10 +1,10 @@
-package cn.aagro.pp.module.mp.dal.dataobject.user;
+package cn.aagro.ag.module.mp.dal.dataobject.user;
 
-import cn.aagro.pp.framework.common.enums.CommonStatusEnum;
-import cn.aagro.pp.framework.mybatis.core.dataobject.BaseDO;
-import cn.aagro.pp.framework.mybatis.core.type.LongListTypeHandler;
-import cn.aagro.pp.module.mp.dal.dataobject.account.MpAccountDO;
-import cn.aagro.pp.module.mp.dal.dataobject.tag.MpTagDO;
+import cn.aagro.ag.framework.common.enums.CommonStatusEnum;
+import cn.aagro.ag.framework.mybatis.core.dataobject.BaseDO;
+import cn.aagro.ag.framework.mybatis.core.type.LongListTypeHandler;
+import cn.aagro.ag.module.mp.dal.dataobject.account.MpAccountDO;
+import cn.aagro.ag.module.mp.dal.dataobject.tag.MpTagDO;
 import com.baomidou.mybatisplus.annotation.KeySequence;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
@@ -17,7 +17,7 @@ import java.util.List;
 /**
  * 微信公众号粉丝 DO
  *
- * @author 芋道源码
+ * @author AIOTAGRO
  */
 @TableName(value = "mp_user", autoResultMap = true)
 @KeySequence("mp_user_seq") // 用于 Oracle、PostgreSQL、Kingbase、DB2、H2 数据库的主键自增。如果是 MySQL 等数据库，可不写。

aagro-module-mp/src/main/java/cn/aagro/ag/module/mp/dal/mysql/account/MpAccountMapper.java

@@ -1,10 +1,10 @@
-package cn.aagro.pp.module.mp.dal.mysql.account;
+package cn.aagro.ag.module.mp.dal.mysql.account;
 
-import cn.aagro.pp.framework.common.pojo.PageResult;
-import cn.aagro.pp.framework.mybatis.core.mapper.BaseMapperX;
-import cn.aagro.pp.framework.mybatis.core.query.LambdaQueryWrapperX;
-import cn.aagro.pp.module.mp.controller.admin.account.vo.MpAccountPageReqVO;
-import cn.aagro.pp.module.mp.dal.dataobject.account.MpAccountDO;
+import cn.aagro.ag.framework.common.pojo.PageResult;
+import cn.aagro.ag.framework.mybatis.core.mapper.BaseMapperX;
+import cn.aagro.ag.framework.mybatis.core.query.LambdaQueryWrapperX;
+import cn.aagro.ag.module.mp.controller.admin.account.vo.MpAccountPageReqVO;
+import cn.aagro.ag.module.mp.dal.dataobject.account.MpAccountDO;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Select;
 

aagro-module-mp/src/main/java/cn/aagro/ag/module/mp/dal/mysql/material/MpMaterialMapper.java

@@ -1,10 +1,10 @@
-package cn.aagro.pp.module.mp.dal.mysql.material;
+package cn.aagro.ag.module.mp.dal.mysql.material;
 
-import cn.aagro.pp.framework.common.pojo.PageResult;
-import cn.aagro.pp.framework.mybatis.core.mapper.BaseMapperX;
-import cn.aagro.pp.framework.mybatis.core.query.LambdaQueryWrapperX;
-import cn.aagro.pp.module.mp.controller.admin.material.vo.MpMaterialPageReqVO;
-import cn.aagro.pp.module.mp.dal.dataobject.material.MpMaterialDO;
+import cn.aagro.ag.framework.common.pojo.PageResult;
+import cn.aagro.ag.framework.mybatis.core.mapper.BaseMapperX;
+import cn.aagro.ag.framework.mybatis.core.query.LambdaQueryWrapperX;
+import cn.aagro.ag.module.mp.controller.admin.material.vo.MpMaterialPageReqVO;
+import cn.aagro.ag.module.mp.dal.dataobject.material.MpMaterialDO;
 import org.apache.ibatis.annotations.Mapper;
 
 import java.util.Collection;

aagro-module-mp/src/main/java/cn/aagro/ag/module/mp/dal/mysql/menu/MpMenuMapper.java

@@ -1,8 +1,8 @@
-package cn.aagro.pp.module.mp.dal.mysql.menu;
+package cn.aagro.ag.module.mp.dal.mysql.menu;
 
-import cn.aagro.pp.framework.mybatis.core.mapper.BaseMapperX;
-import cn.aagro.pp.framework.mybatis.core.query.LambdaQueryWrapperX;
-import cn.aagro.pp.module.mp.dal.dataobject.menu.MpMenuDO;
+import cn.aagro.ag.framework.mybatis.core.mapper.BaseMapperX;
+import cn.aagro.ag.framework.mybatis.core.query.LambdaQueryWrapperX;
+import cn.aagro.ag.module.mp.dal.dataobject.menu.MpMenuDO;
 import org.apache.ibatis.annotations.Mapper;
 
 import java.util.List;

aagro-module-mp/src/main/java/cn/aagro/ag/module/mp/dal/mysql/message/MpAutoReplyMapper.java

@@ -1,12 +1,12 @@
-package cn.aagro.pp.module.mp.dal.mysql.message;
+package cn.aagro.ag.module.mp.dal.mysql.message;
 
-import cn.aagro.pp.framework.common.pojo.PageResult;
-import cn.aagro.pp.framework.mybatis.core.mapper.BaseMapperX;
-import cn.aagro.pp.framework.mybatis.core.query.LambdaQueryWrapperX;
-import cn.aagro.pp.module.mp.controller.admin.message.vo.message.MpMessagePageReqVO;
-import cn.aagro.pp.module.mp.dal.dataobject.message.MpAutoReplyDO;
-import cn.aagro.pp.module.mp.enums.message.MpAutoReplyMatchEnum;
-import cn.aagro.pp.module.mp.enums.message.MpAutoReplyTypeEnum;
+import cn.aagro.ag.framework.common.pojo.PageResult;
+import cn.aagro.ag.framework.mybatis.core.mapper.BaseMapperX;
+import cn.aagro.ag.framework.mybatis.core.query.LambdaQueryWrapperX;
+import cn.aagro.ag.module.mp.controller.admin.message.vo.message.MpMessagePageReqVO;
+import cn.aagro.ag.module.mp.dal.dataobject.message.MpAutoReplyDO;
+import cn.aagro.ag.module.mp.enums.message.MpAutoReplyMatchEnum;
+import cn.aagro.ag.module.mp.enums.message.MpAutoReplyTypeEnum;
 import org.apache.ibatis.annotations.Mapper;
 
 import java.util.List;

aagro-module-mp/src/main/java/cn/aagro/ag/module/mp/dal/mysql/message/MpMessageMapper.java

@@ -1,10 +1,10 @@
-package cn.aagro.pp.module.mp.dal.mysql.message;
+package cn.aagro.ag.module.mp.dal.mysql.message;
 
-import cn.aagro.pp.framework.common.pojo.PageResult;
-import cn.aagro.pp.framework.mybatis.core.mapper.BaseMapperX;
-import cn.aagro.pp.framework.mybatis.core.query.LambdaQueryWrapperX;
-import cn.aagro.pp.module.mp.controller.admin.message.vo.message.MpMessagePageReqVO;
-import cn.aagro.pp.module.mp.dal.dataobject.message.MpMessageDO;
+import cn.aagro.ag.framework.common.pojo.PageResult;
+import cn.aagro.ag.framework.mybatis.core.mapper.BaseMapperX;
+import cn.aagro.ag.framework.mybatis.core.query.LambdaQueryWrapperX;
+import cn.aagro.ag.module.mp.controller.admin.message.vo.message.MpMessagePageReqVO;
+import cn.aagro.ag.module.mp.dal.dataobject.message.MpMessageDO;
 import org.apache.ibatis.annotations.Mapper;
 
 @Mapper

aagro-module-mp/src/main/java/cn/aagro/ag/module/mp/dal/mysql/tag/MpTagMapper.java

@@ -1,10 +1,10 @@
-package cn.aagro.pp.module.mp.dal.mysql.tag;
+package cn.aagro.ag.module.mp.dal.mysql.tag;
 
-import cn.aagro.pp.framework.common.pojo.PageResult;
-import cn.aagro.pp.framework.mybatis.core.mapper.BaseMapperX;
-import cn.aagro.pp.framework.mybatis.core.query.LambdaQueryWrapperX;
-import cn.aagro.pp.module.mp.controller.admin.tag.vo.MpTagPageReqVO;
-import cn.aagro.pp.module.mp.dal.dataobject.tag.MpTagDO;
+import cn.aagro.ag.framework.common.pojo.PageResult;
+import cn.aagro.ag.framework.mybatis.core.mapper.BaseMapperX;
+import cn.aagro.ag.framework.mybatis.core.query.LambdaQueryWrapperX;
+import cn.aagro.ag.module.mp.controller.admin.tag.vo.MpTagPageReqVO;
+import cn.aagro.ag.module.mp.dal.dataobject.tag.MpTagDO;
 import org.apache.ibatis.annotations.Mapper;
 
 import java.util.List;

aagro-module-mp/src/main/java/cn/aagro/ag/module/mp/dal/mysql/user/MpUserMapper.java

@@ -1,10 +1,10 @@
-package cn.aagro.pp.module.mp.dal.mysql.user;
+package cn.aagro.ag.module.mp.dal.mysql.user;
 
-import cn.aagro.pp.framework.common.pojo.PageResult;
-import cn.aagro.pp.framework.mybatis.core.mapper.BaseMapperX;
-import cn.aagro.pp.framework.mybatis.core.query.LambdaQueryWrapperX;
-import cn.aagro.pp.module.mp.controller.admin.user.vo.MpUserPageReqVO;
-import cn.aagro.pp.module.mp.dal.dataobject.user.MpUserDO;
+import cn.aagro.ag.framework.common.pojo.PageResult;
+import cn.aagro.ag.framework.mybatis.core.mapper.BaseMapperX;
+import cn.aagro.ag.framework.mybatis.core.query.LambdaQueryWrapperX;
+import cn.aagro.ag.module.mp.controller.admin.user.vo.MpUserPageReqVO;
+import cn.aagro.ag.module.mp.dal.dataobject.user.MpUserDO;
 import org.apache.ibatis.annotations.Mapper;
 
 import java.util.List;

aagro-module-mp/src/main/java/cn/aagro/ag/module/mp/enums/ErrorCodeConstants.java

@@ -1,6 +1,6 @@
-package cn.aagro.pp.module.mp.enums;
+package cn.aagro.ag.module.mp.enums;
 
-import cn.aagro.pp.framework.common.exception.ErrorCode;
+import cn.aagro.ag.framework.common.exception.ErrorCode;
 
 /**
  * Mp 错误码枚举类

aagro-module-mp/src/main/java/cn/aagro/ag/module/mp/enums/message/MpAutoReplyMatchEnum.java

@@ -1,4 +1,4 @@
-package cn.aagro.pp.module.mp.enums.message;
+package cn.aagro.ag.module.mp.enums.message;
 
 import lombok.AllArgsConstructor;
 import lombok.Getter;
@@ -6,7 +6,7 @@ import lombok.Getter;
 /**
  * 公众号消息自动回复的匹配模式
  *
- * @author 芋道源码
+ * @author AIOTAGRO
  */
 @Getter
 @AllArgsConstructor

aagro-module-mp/src/main/java/cn/aagro/ag/module/mp/enums/message/MpAutoReplyTypeEnum.java

@@ -1,4 +1,4 @@
-package cn.aagro.pp.module.mp.enums.message;
+package cn.aagro.ag.module.mp.enums.message;
 
 import lombok.AllArgsConstructor;
 import lombok.Getter;
@@ -6,7 +6,7 @@ import lombok.Getter;
 /**
  * 公众号消息自动回复的类型
  *
- * @author 芋道源码
+ * @author AIOTAGRO
  */
 @Getter
 @AllArgsConstructor

aagro-module-mp/src/main/java/cn/aagro/ag/module/mp/enums/message/MpMessageSendFromEnum.java

@@ -1,4 +1,4 @@
-package cn.aagro.pp.module.mp.enums.message;
+package cn.aagro.ag.module.mp.enums.message;
 
 import lombok.AllArgsConstructor;
 import lombok.Getter;
@@ -6,7 +6,7 @@ import lombok.Getter;
 /**
  * 微信公众号消息的发送来源
  *
- * @author 芋道源码
+ * @author AIOTAGRO
  */
 @Getter
 @AllArgsConstructor

aagro-module-mp/src/main/java/cn/aagro/ag/module/mp/framework/mp/config/MpConfiguration.java

@@ -1,17 +1,17 @@
-package cn.aagro.pp.module.mp.framework.mp.config;
+package cn.aagro.ag.module.mp.framework.mp.config;
 
-import cn.aagro.pp.module.mp.framework.mp.core.DefaultMpServiceFactory;
-import cn.aagro.pp.module.mp.framework.mp.core.MpServiceFactory;
-import cn.aagro.pp.module.mp.service.handler.menu.MenuHandler;
-import cn.aagro.pp.module.mp.service.handler.message.MessageReceiveHandler;
-import cn.aagro.pp.module.mp.service.handler.message.MessageAutoReplyHandler;
-import cn.aagro.pp.module.mp.service.handler.other.KfSessionHandler;
-import cn.aagro.pp.module.mp.service.handler.other.NullHandler;
-import cn.aagro.pp.module.mp.service.handler.other.ScanHandler;
-import cn.aagro.pp.module.mp.service.handler.other.StoreCheckNotifyHandler;
-import cn.aagro.pp.module.mp.service.handler.user.LocationHandler;
-import cn.aagro.pp.module.mp.service.handler.user.SubscribeHandler;
-import cn.aagro.pp.module.mp.service.handler.user.UnsubscribeHandler;
+import cn.aagro.ag.module.mp.framework.mp.core.DefaultMpServiceFactory;
+import cn.aagro.ag.module.mp.framework.mp.core.MpServiceFactory;
+import cn.aagro.ag.module.mp.service.handler.menu.MenuHandler;
+import cn.aagro.ag.module.mp.service.handler.message.MessageReceiveHandler;
+import cn.aagro.ag.module.mp.service.handler.message.MessageAutoReplyHandler;
+import cn.aagro.ag.module.mp.service.handler.other.KfSessionHandler;
+import cn.aagro.ag.module.mp.service.handler.other.NullHandler;
+import cn.aagro.ag.module.mp.service.handler.other.ScanHandler;
+import cn.aagro.ag.module.mp.service.handler.other.StoreCheckNotifyHandler;
+import cn.aagro.ag.module.mp.service.handler.user.LocationHandler;
+import cn.aagro.ag.module.mp.service.handler.user.SubscribeHandler;
+import cn.aagro.ag.module.mp.service.handler.user.UnsubscribeHandler;
 import com.binarywang.spring.starter.wxjava.mp.properties.WxMpProperties;
 import me.chanjar.weixin.common.redis.RedisTemplateWxRedisOps;
 import org.springframework.context.annotation.Bean;
@@ -21,7 +21,7 @@ import org.springframework.data.redis.core.StringRedisTemplate;
 /**
  * 微信公众号的配置类
  *
- * @author 芋道源码
+ * @author AIOTAGRO
  */
 @Configuration
 public class MpConfiguration {

aagro-module-mp/src/main/java/cn/aagro/ag/module/mp/framework/mp/core/DefaultMpServiceFactory.java

@@ -1,16 +1,16 @@
-package cn.aagro.pp.module.mp.framework.mp.core;
+package cn.aagro.ag.module.mp.framework.mp.core;
 
-import cn.aagro.pp.module.mp.dal.dataobject.account.MpAccountDO;
-import cn.aagro.pp.module.mp.service.handler.menu.MenuHandler;
-import cn.aagro.pp.module.mp.service.handler.message.MessageReceiveHandler;
-import cn.aagro.pp.module.mp.service.handler.message.MessageAutoReplyHandler;
-import cn.aagro.pp.module.mp.service.handler.other.KfSessionHandler;
-import cn.aagro.pp.module.mp.service.handler.other.NullHandler;
-import cn.aagro.pp.module.mp.service.handler.other.ScanHandler;
-import cn.aagro.pp.module.mp.service.handler.other.StoreCheckNotifyHandler;
-import cn.aagro.pp.module.mp.service.handler.user.LocationHandler;
-import cn.aagro.pp.module.mp.service.handler.user.SubscribeHandler;
-import cn.aagro.pp.module.mp.service.handler.user.UnsubscribeHandler;
+import cn.aagro.ag.module.mp.dal.dataobject.account.MpAccountDO;
+import cn.aagro.ag.module.mp.service.handler.menu.MenuHandler;
+import cn.aagro.ag.module.mp.service.handler.message.MessageReceiveHandler;
+import cn.aagro.ag.module.mp.service.handler.message.MessageAutoReplyHandler;
+import cn.aagro.ag.module.mp.service.handler.other.KfSessionHandler;
+import cn.aagro.ag.module.mp.service.handler.other.NullHandler;
+import cn.aagro.ag.module.mp.service.handler.other.ScanHandler;
+import cn.aagro.ag.module.mp.service.handler.other.StoreCheckNotifyHandler;
+import cn.aagro.ag.module.mp.service.handler.user.LocationHandler;
+import cn.aagro.ag.module.mp.service.handler.user.SubscribeHandler;
+import cn.aagro.ag.module.mp.service.handler.user.UnsubscribeHandler;
 import com.binarywang.spring.starter.wxjava.mp.properties.WxMpProperties;
 import com.google.common.collect.Maps;
 import lombok.RequiredArgsConstructor;
@@ -29,7 +29,7 @@ import java.util.Map;
 /**
  * 默认的 {@link MpServiceFactory} 实现类
  *
- * @author 芋道源码
+ * @author AIOTAGRO
  */
 @Slf4j
 @RequiredArgsConstructor

aagro-module-mp/src/main/java/cn/aagro/ag/module/mp/framework/mp/core/MpServiceFactory.java

@@ -1,7 +1,7 @@
-package cn.aagro.pp.module.mp.framework.mp.core;
+package cn.aagro.ag.module.mp.framework.mp.core;
 
 import cn.hutool.core.lang.Assert;
-import cn.aagro.pp.module.mp.dal.dataobject.account.MpAccountDO;
+import cn.aagro.ag.module.mp.dal.dataobject.account.MpAccountDO;
 import me.chanjar.weixin.mp.api.WxMpMessageRouter;
 import me.chanjar.weixin.mp.api.WxMpService;
 
@@ -10,7 +10,7 @@ import java.util.List;
 /**
  * {@link WxMpService} 工厂接口
  *
- * @author 芋道源码
+ * @author AIOTAGRO
  */
 public interface MpServiceFactory {
 

aagro-module-mp/src/main/java/cn/aagro/ag/module/mp/framework/mp/core/context/MpContextHolder.java

@@ -15,9 +15,9 @@
  * Author: lengleng (wangiegie@gmail.com)
  */
 
-package cn.aagro.pp.module.mp.framework.mp.core.context;
+package cn.aagro.ag.module.mp.framework.mp.core.context;
 
-import cn.aagro.pp.module.mp.controller.admin.open.vo.MpOpenHandleMessageReqVO;
+import cn.aagro.ag.module.mp.controller.admin.open.vo.MpOpenHandleMessageReqVO;
 import com.alibaba.ttl.TransmittableThreadLocal;
 import lombok.experimental.UtilityClass;
 import me.chanjar.weixin.mp.api.WxMpMessageHandler;
@@ -27,9 +27,9 @@ import me.chanjar.weixin.mp.api.WxMpMessageHandler;
  *
  * 目的：解决微信多公众号的问题，在 {@link WxMpMessageHandler} 实现类中，可以通过 {@link #getAppId()} 获取到当前的 appId
  *
- * @see cn.aagro.pp.module.mp.controller.admin.open.MpOpenController#handleMessage(String, String, MpOpenHandleMessageReqVO)
+ * @see cn.aagro.ag.module.mp.controller.admin.open.MpOpenController#handleMessage(String, String, MpOpenHandleMessageReqVO)
  *
- * @author 芋道源码
+ * @author AIOTAGRO
  */
 public class MpContextHolder {
 

aagro-module-mp/src/main/java/cn/aagro/ag/module/mp/framework/mp/core/util/MpUtils.java

@@ -1,16 +1,16 @@
-package cn.aagro.pp.module.mp.framework.mp.core.util;
+package cn.aagro.ag.module.mp.framework.mp.core.util;
 
 import cn.hutool.core.util.StrUtil;
-import cn.aagro.pp.framework.common.util.validation.ValidationUtils;
+import cn.aagro.ag.framework.common.util.validation.ValidationUtils;
 import lombok.extern.slf4j.Slf4j;
 import me.chanjar.weixin.common.api.WxConsts;
 
-import javax.validation.Validator;
+import jakarta.validation.Validator;
 
 /**
  * 公众号工具类
  *
- * @author 芋道源码
+ * @author AIOTAGRO
  */
 @Slf4j
 public class MpUtils {

aagro-module-mp/src/main/java/cn/aagro/ag/module/mp/framework/package-info.java

@@ -0,0 +1,6 @@
+/**
+ * 属于 mp 模块的 framework 封装
+ *
+ * @author AIOTAGRO
+ */
+package cn.aagro.ag.module.mp.framework;

aagro-module-mp/src/main/java/cn/aagro/ag/module/mp/framework/web/config/MpWebConfiguration.java

@@ -1,14 +1,14 @@
-package cn.aagro.pp.module.mp.framework.web.config;
+package cn.aagro.ag.module.mp.framework.web.config;
 
-import cn.aagro.pp.framework.swagger.config.AagroSwaggerAutoConfiguration;
-import org.springdoc.core.GroupedOpenApi;
+import cn.aagro.ag.framework.swagger.config.AagroSwaggerAutoConfiguration;
+import org.springdoc.core.models.GroupedOpenApi;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 
 /**
  * mp 模块的 web 组件的 Configuration
  *
- * @author 芋道源码
+ * @author AIOTAGRO
  */
 @Configuration(proxyBeanMethods = false)
 public class MpWebConfiguration {
@@ -21,4 +21,4 @@ public class MpWebConfiguration {
         return AagroSwaggerAutoConfiguration.buildGroupedOpenApi("mp");
     }
 
-}
+}

aagro-module-mp/src/main/java/cn/aagro/ag/module/mp/framework/web/package-info.java

@@ -0,0 +1,4 @@
+/**
+ * mp 模块的 web 配置
+ */
+package cn.aagro.ag.module.mp.framework.web;

aagro-module-mp/src/main/java/cn/aagro/ag/module/mp/package-info.java

@@ -5,4 +5,4 @@
  * 1. Controller URL：以 /mp/ 开头，避免和其它 Module 冲突
  * 2. DataObject 表名：以 mp_ 开头，方便在数据库中区分
  */
-package cn.aagro.pp.module.mp;
+package cn.aagro.ag.module.mp;

aagro-module-mp/src/main/java/cn/aagro/ag/module/mp/service/account/MpAccountService.java

@@ -1,21 +1,21 @@
-package cn.aagro.pp.module.mp.service.account;
+package cn.aagro.ag.module.mp.service.account;
 
-import cn.aagro.pp.framework.common.pojo.PageResult;
-import cn.aagro.pp.module.mp.controller.admin.account.vo.MpAccountCreateReqVO;
-import cn.aagro.pp.module.mp.controller.admin.account.vo.MpAccountPageReqVO;
-import cn.aagro.pp.module.mp.controller.admin.account.vo.MpAccountUpdateReqVO;
-import cn.aagro.pp.module.mp.dal.dataobject.account.MpAccountDO;
+import cn.aagro.ag.framework.common.pojo.PageResult;
+import cn.aagro.ag.module.mp.controller.admin.account.vo.MpAccountCreateReqVO;
+import cn.aagro.ag.module.mp.controller.admin.account.vo.MpAccountPageReqVO;
+import cn.aagro.ag.module.mp.controller.admin.account.vo.MpAccountUpdateReqVO;
+import cn.aagro.ag.module.mp.dal.dataobject.account.MpAccountDO;
 
-import javax.validation.Valid;
+import jakarta.validation.Valid;
 import java.util.List;
 
-import static cn.aagro.pp.framework.common.exception.util.ServiceExceptionUtil.exception;
-import static cn.aagro.pp.module.mp.enums.ErrorCodeConstants.ACCOUNT_NOT_EXISTS;
+import static cn.aagro.ag.framework.common.exception.util.ServiceExceptionUtil.exception;
+import static cn.aagro.ag.module.mp.enums.ErrorCodeConstants.ACCOUNT_NOT_EXISTS;
 
 /**
  * 公众号账号 Service 接口
  *
- * @author 芋道源码
+ * @author AIOTAGRO
  */
 public interface MpAccountService {
 

aagro-module-mp/src/main/java/cn/aagro/ag/module/mp/service/account/MpAccountServiceImpl.java

@@ -1,18 +1,18 @@
-package cn.aagro.pp.module.mp.service.account;
+package cn.aagro.ag.module.mp.service.account;
 
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.util.ObjUtil;
-import cn.aagro.pp.framework.common.exception.util.ServiceExceptionUtil;
-import cn.aagro.pp.framework.common.pojo.PageResult;
-import cn.aagro.pp.framework.tenant.core.util.TenantUtils;
-import cn.aagro.pp.module.mp.controller.admin.account.vo.MpAccountCreateReqVO;
-import cn.aagro.pp.module.mp.controller.admin.account.vo.MpAccountPageReqVO;
-import cn.aagro.pp.module.mp.controller.admin.account.vo.MpAccountUpdateReqVO;
-import cn.aagro.pp.module.mp.convert.account.MpAccountConvert;
-import cn.aagro.pp.module.mp.dal.dataobject.account.MpAccountDO;
-import cn.aagro.pp.module.mp.dal.mysql.account.MpAccountMapper;
-import cn.aagro.pp.module.mp.enums.ErrorCodeConstants;
-import cn.aagro.pp.module.mp.framework.mp.core.MpServiceFactory;
+import cn.aagro.ag.framework.common.exception.util.ServiceExceptionUtil;
+import cn.aagro.ag.framework.common.pojo.PageResult;
+import cn.aagro.ag.framework.tenant.core.util.TenantUtils;
+import cn.aagro.ag.module.mp.controller.admin.account.vo.MpAccountCreateReqVO;
+import cn.aagro.ag.module.mp.controller.admin.account.vo.MpAccountPageReqVO;
+import cn.aagro.ag.module.mp.controller.admin.account.vo.MpAccountUpdateReqVO;
+import cn.aagro.ag.module.mp.convert.account.MpAccountConvert;
+import cn.aagro.ag.module.mp.dal.dataobject.account.MpAccountDO;
+import cn.aagro.ag.module.mp.dal.mysql.account.MpAccountMapper;
+import cn.aagro.ag.module.mp.enums.ErrorCodeConstants;
+import cn.aagro.ag.module.mp.framework.mp.core.MpServiceFactory;
 import com.google.common.annotations.VisibleForTesting;
 import lombok.Getter;
 import lombok.extern.slf4j.Slf4j;
@@ -24,18 +24,18 @@ import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Service;
 import org.springframework.validation.annotation.Validated;
 
-import javax.annotation.PostConstruct;
-import javax.annotation.Resource;
+import jakarta.annotation.PostConstruct;
+import jakarta.annotation.Resource;
 import java.time.LocalDateTime;
 import java.util.Collections;
 import java.util.List;
 import java.util.Map;
 import java.util.concurrent.TimeUnit;
 
-import static cn.aagro.pp.framework.common.exception.util.ServiceExceptionUtil.exception;
-import static cn.aagro.pp.framework.common.util.collection.CollectionUtils.convertMap;
-import static cn.aagro.pp.framework.common.util.collection.CollectionUtils.getMaxValue;
-import static cn.aagro.pp.module.system.enums.ErrorCodeConstants.USER_USERNAME_EXISTS;
+import static cn.aagro.ag.framework.common.exception.util.ServiceExceptionUtil.exception;
+import static cn.aagro.ag.framework.common.util.collection.CollectionUtils.convertMap;
+import static cn.aagro.ag.framework.common.util.collection.CollectionUtils.getMaxValue;
+import static cn.aagro.ag.module.system.enums.ErrorCodeConstants.USER_USERNAME_EXISTS;
 
 /**
  * 公众号账号 Service 实现类
@@ -226,4 +226,4 @@ public class MpAccountServiceImpl implements MpAccountService {
         }
     }
 
-}
+}

aagro-module-mp/src/main/java/cn/aagro/ag/module/mp/service/handler/menu/MenuHandler.java

@@ -1,7 +1,7 @@
-package cn.aagro.pp.module.mp.service.handler.menu;
+package cn.aagro.ag.module.mp.service.handler.menu;
 
-import cn.aagro.pp.module.mp.framework.mp.core.context.MpContextHolder;
-import cn.aagro.pp.module.mp.service.menu.MpMenuService;
+import cn.aagro.ag.module.mp.framework.mp.core.context.MpContextHolder;
+import cn.aagro.ag.module.mp.service.menu.MpMenuService;
 import me.chanjar.weixin.common.session.WxSessionManager;
 import me.chanjar.weixin.mp.api.WxMpMessageHandler;
 import me.chanjar.weixin.mp.api.WxMpService;
@@ -9,7 +9,7 @@ import me.chanjar.weixin.mp.bean.message.WxMpXmlMessage;
 import me.chanjar.weixin.mp.bean.message.WxMpXmlOutMessage;
 import org.springframework.stereotype.Component;
 
-import javax.annotation.Resource;
+import jakarta.annotation.Resource;
 import java.util.Map;
 
 /**
@@ -17,7 +17,7 @@ import java.util.Map;
  *
  * 逻辑：粉丝点击菜单时，触发对应的回复
  *
- * @author 芋道源码
+ * @author AIOTAGRO
  */
 @Component
 public class MenuHandler implements WxMpMessageHandler {