修改bug

aagro-module-system/pom.xml

@@ -3,9 +3,10 @@
          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>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>aagro-module-system</artifactId>
@@ -19,28 +20,28 @@
 
     <dependencies>
         <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-data-permission</artifactId>
         </dependency>
         <dependency>
-            <groupId>cn.aagro.gg</groupId>
+            <groupId>cn.aagro.aa</groupId>
             <artifactId>aagro-spring-boot-starter-biz-tenant</artifactId>
         </dependency>
         <dependency>
-            <groupId>cn.aagro.gg</groupId>
+            <groupId>cn.aagro.aa</groupId>
             <artifactId>aagro-spring-boot-starter-biz-ip</artifactId>
         </dependency>
 
         <!-- Web 相关 -->
         <dependency>
-            <groupId>cn.aagro.gg</groupId>
+            <groupId>cn.aagro.aa</groupId>
             <artifactId>aagro-spring-boot-starter-security</artifactId>
         </dependency>
 
@@ -51,30 +52,32 @@
 
         <!-- 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>
 
         <!-- Job 定时任务相关 -->
         <dependency>
-            <groupId>cn.aagro.gg</groupId>
+            <groupId>cn.aagro.aa</groupId>
             <artifactId>aagro-spring-boot-starter-job</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>
+            <groupId>cn.aagro.aa</groupId>
             <artifactId>aagro-spring-boot-starter-excel</artifactId>
         </dependency>
 
@@ -107,6 +110,11 @@
             <artifactId>captcha-spring-boot-starter</artifactId> <!-- 验证码，一般用于登录使用 -->
         </dependency>
 
+        <dependency>
+            <groupId>org.dromara.hutool</groupId>
+            <artifactId>hutool-extra</artifactId> <!-- 邮件 -->
+        </dependency>
+
     </dependencies>
 
 </project>

aagro-module-system/src/main/java/cn/aagro/ag/module/system/api/dept/DeptApi.java

@@ -1,7 +1,7 @@
-package cn.aagro.pp.module.system.api.dept;
+package cn.aagro.ag.module.system.api.dept;
 
-import cn.aagro.pp.framework.common.util.collection.CollectionUtils;
-import cn.aagro.pp.module.system.api.dept.dto.DeptRespDTO;
+import cn.aagro.ag.framework.common.util.collection.CollectionUtils;
+import cn.aagro.ag.module.system.api.dept.dto.DeptRespDTO;
 
 import java.util.Collection;
 import java.util.List;
@@ -10,7 +10,7 @@ import java.util.Map;
 /**
  * 部门 API 接口
  *
- * @author 芋道源码
+ * @author AIOTAGRO
  */
 public interface DeptApi {
 

aagro-module-system/src/main/java/cn/aagro/ag/module/system/api/dept/DeptApiImpl.java

@@ -1,19 +1,19 @@
-package cn.aagro.pp.module.system.api.dept;
+package cn.aagro.ag.module.system.api.dept;
 
-import cn.aagro.pp.framework.common.util.object.BeanUtils;
-import cn.aagro.pp.module.system.api.dept.dto.DeptRespDTO;
-import cn.aagro.pp.module.system.dal.dataobject.dept.DeptDO;
-import cn.aagro.pp.module.system.service.dept.DeptService;
+import cn.aagro.ag.framework.common.util.object.BeanUtils;
+import cn.aagro.ag.module.system.api.dept.dto.DeptRespDTO;
+import cn.aagro.ag.module.system.dal.dataobject.dept.DeptDO;
+import cn.aagro.ag.module.system.service.dept.DeptService;
 import org.springframework.stereotype.Service;
 
-import javax.annotation.Resource;
+import jakarta.annotation.Resource;
 import java.util.Collection;
 import java.util.List;
 
 /**
  * 部门 API 实现类
  *
- * @author 芋道源码
+ * @author AIOTAGRO
  */
 @Service
 public class DeptApiImpl implements DeptApi {

aagro-module-system/src/main/java/cn/aagro/ag/module/system/api/dept/PostApi.java

@@ -1,9 +1,9 @@
-package cn.aagro.pp.module.system.api.dept;
+package cn.aagro.ag.module.system.api.dept;
 
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.map.MapUtil;
-import cn.aagro.pp.framework.common.util.collection.CollectionUtils;
-import cn.aagro.pp.module.system.api.dept.dto.PostRespDTO;
+import cn.aagro.ag.framework.common.util.collection.CollectionUtils;
+import cn.aagro.ag.module.system.api.dept.dto.PostRespDTO;
 
 import java.util.Collection;
 import java.util.List;
@@ -12,7 +12,7 @@ import java.util.Map;
 /**
  * 岗位 API 接口
  *
- * @author 芋道源码
+ * @author AIOTAGRO
  */
 public interface PostApi {
 

aagro-module-system/src/main/java/cn/aagro/ag/module/system/api/dept/PostApiImpl.java

@@ -1,19 +1,19 @@
-package cn.aagro.pp.module.system.api.dept;
+package cn.aagro.ag.module.system.api.dept;
 
-import cn.aagro.pp.framework.common.util.object.BeanUtils;
-import cn.aagro.pp.module.system.api.dept.dto.PostRespDTO;
-import cn.aagro.pp.module.system.dal.dataobject.dept.PostDO;
-import cn.aagro.pp.module.system.service.dept.PostService;
+import cn.aagro.ag.framework.common.util.object.BeanUtils;
+import cn.aagro.ag.module.system.api.dept.dto.PostRespDTO;
+import cn.aagro.ag.module.system.dal.dataobject.dept.PostDO;
+import cn.aagro.ag.module.system.service.dept.PostService;
 import org.springframework.stereotype.Service;
 
-import javax.annotation.Resource;
+import jakarta.annotation.Resource;
 import java.util.Collection;
 import java.util.List;
 
 /**
  * 岗位 API 实现类
  *
- * @author 芋道源码
+ * @author AIOTAGRO
  */
 @Service
 public class PostApiImpl implements PostApi {

aagro-module-system/src/main/java/cn/aagro/ag/module/system/api/dept/dto/DeptRespDTO.java

@@ -1,12 +1,12 @@
-package cn.aagro.pp.module.system.api.dept.dto;
+package cn.aagro.ag.module.system.api.dept.dto;
 
-import cn.aagro.pp.framework.common.enums.CommonStatusEnum;
+import cn.aagro.ag.framework.common.enums.CommonStatusEnum;
 import lombok.Data;
 
 /**
  * 部门 Response DTO
  *
- * @author 芋道源码
+ * @author AIOTAGRO
  */
 @Data
 public class DeptRespDTO {

aagro-module-system/src/main/java/cn/aagro/ag/module/system/api/dept/dto/PostRespDTO.java

@@ -1,12 +1,12 @@
-package cn.aagro.pp.module.system.api.dept.dto;
+package cn.aagro.ag.module.system.api.dept.dto;
 
-import cn.aagro.pp.framework.common.enums.CommonStatusEnum;
+import cn.aagro.ag.framework.common.enums.CommonStatusEnum;
 import lombok.Data;
 
 /**
  * 岗位 Response DTO
  *
- * @author 芋道源码
+ * @author AIOTAGRO
  */
 @Data
 public class PostRespDTO {

aagro-module-system/src/main/java/cn/aagro/ag/module/system/api/dict/DictDataApi.java

@@ -1,13 +1,13 @@
-package cn.aagro.pp.module.system.api.dict;
+package cn.aagro.ag.module.system.api.dict;
 
-import cn.aagro.pp.framework.common.biz.system.dict.DictDataCommonApi;
+import cn.aagro.ag.framework.common.biz.system.dict.DictDataCommonApi;
 
 import java.util.Collection;
 
 /**
  * 字典数据 API 接口
  *
- * @author 芋道源码
+ * @author AIOTAGRO
  */
 public interface DictDataApi extends DictDataCommonApi {
 

aagro-module-system/src/main/java/cn/aagro/ag/module/system/api/dict/DictDataApiImpl.java

@@ -1,19 +1,19 @@
-package cn.aagro.pp.module.system.api.dict;
+package cn.aagro.ag.module.system.api.dict;
 
-import cn.aagro.pp.framework.common.util.object.BeanUtils;
-import cn.aagro.pp.framework.common.biz.system.dict.dto.DictDataRespDTO;
-import cn.aagro.pp.module.system.dal.dataobject.dict.DictDataDO;
-import cn.aagro.pp.module.system.service.dict.DictDataService;
+import cn.aagro.ag.framework.common.util.object.BeanUtils;
+import cn.aagro.ag.framework.common.biz.system.dict.dto.DictDataRespDTO;
+import cn.aagro.ag.module.system.dal.dataobject.dict.DictDataDO;
+import cn.aagro.ag.module.system.service.dict.DictDataService;
+import jakarta.annotation.Resource;
 import org.springframework.stereotype.Service;
 
-import javax.annotation.Resource;
 import java.util.Collection;
 import java.util.List;
 
 /**
  * 字典数据 API 实现类
  *
- * @author 芋道源码
+ * @author AIOTAGRO
  */
 @Service
 public class DictDataApiImpl implements DictDataApi {

aagro-module-system/src/main/java/cn/aagro/ag/module/system/api/logger/LoginLogApi.java

@@ -1,13 +1,13 @@
-package cn.aagro.pp.module.system.api.logger;
+package cn.aagro.ag.module.system.api.logger;
 
-import cn.aagro.pp.module.system.api.logger.dto.LoginLogCreateReqDTO;
+import cn.aagro.ag.module.system.api.logger.dto.LoginLogCreateReqDTO;
 
-import javax.validation.Valid;
+import jakarta.validation.Valid;
 
 /**
  * 登录日志的 API 接口
  *
- * @author 芋道源码
+ * @author AIOTAGRO
  */
 public interface LoginLogApi {
 

aagro-module-system/src/main/java/cn/aagro/ag/module/system/api/logger/LoginLogApiImpl.java

@@ -1,16 +1,16 @@
-package cn.aagro.pp.module.system.api.logger;
+package cn.aagro.ag.module.system.api.logger;
 
-import cn.aagro.pp.module.system.api.logger.dto.LoginLogCreateReqDTO;
-import cn.aagro.pp.module.system.service.logger.LoginLogService;
+import cn.aagro.ag.module.system.api.logger.dto.LoginLogCreateReqDTO;
+import cn.aagro.ag.module.system.service.logger.LoginLogService;
 import org.springframework.stereotype.Service;
 import org.springframework.validation.annotation.Validated;
 
-import javax.annotation.Resource;
+import jakarta.annotation.Resource;
 
 /**
  * 登录日志的 API 实现类
  *
- * @author 芋道源码
+ * @author AIOTAGRO
  */
 @Service
 @Validated

aagro-module-system/src/main/java/cn/aagro/ag/module/system/api/logger/OperateLogApi.java

@@ -1,14 +1,14 @@
-package cn.aagro.pp.module.system.api.logger;
+package cn.aagro.ag.module.system.api.logger;
 
-import cn.aagro.pp.framework.common.biz.system.logger.OperateLogCommonApi;
-import cn.aagro.pp.framework.common.pojo.PageResult;
-import cn.aagro.pp.module.system.api.logger.dto.OperateLogPageReqDTO;
-import cn.aagro.pp.module.system.api.logger.dto.OperateLogRespDTO;
+import cn.aagro.ag.framework.common.biz.system.logger.OperateLogCommonApi;
+import cn.aagro.ag.framework.common.pojo.PageResult;
+import cn.aagro.ag.module.system.api.logger.dto.OperateLogPageReqDTO;
+import cn.aagro.ag.module.system.api.logger.dto.OperateLogRespDTO;
 
 /**
  * 操作日志 API 接口
  *
- * @author 芋道源码
+ * @author AIOTAGRO
  */
 public interface OperateLogApi extends OperateLogCommonApi {
 

aagro-module-system/src/main/java/cn/aagro/ag/module/system/api/logger/OperateLogApiImpl.java

@@ -1,22 +1,21 @@
-package cn.aagro.pp.module.system.api.logger;
+package cn.aagro.ag.module.system.api.logger;
 
-import cn.aagro.pp.framework.common.pojo.PageResult;
-import cn.aagro.pp.framework.common.util.object.BeanUtils;
-import cn.aagro.pp.framework.common.biz.system.logger.dto.OperateLogCreateReqDTO;
-import cn.aagro.pp.module.system.api.logger.dto.OperateLogPageReqDTO;
-import cn.aagro.pp.module.system.api.logger.dto.OperateLogRespDTO;
-import cn.aagro.pp.module.system.dal.dataobject.logger.OperateLogDO;
-import cn.aagro.pp.module.system.service.logger.OperateLogService;
+import cn.aagro.ag.framework.common.pojo.PageResult;
+import cn.aagro.ag.framework.common.util.object.BeanUtils;
+import cn.aagro.ag.framework.common.biz.system.logger.dto.OperateLogCreateReqDTO;
+import cn.aagro.ag.module.system.api.logger.dto.OperateLogPageReqDTO;
+import cn.aagro.ag.module.system.api.logger.dto.OperateLogRespDTO;
+import cn.aagro.ag.module.system.dal.dataobject.logger.OperateLogDO;
+import cn.aagro.ag.module.system.service.logger.OperateLogService;
 import com.fhs.core.trans.anno.TransMethodResult;
+import jakarta.annotation.Resource;
 import org.springframework.stereotype.Service;
 import org.springframework.validation.annotation.Validated;
 
-import javax.annotation.Resource;
-
 /**
  * 操作日志 API 实现类
  *
- * @author 芋道源码
+ * @author AIOTAGRO
  */
 @Service
 @Validated

aagro-module-system/src/main/java/cn/aagro/ag/module/system/api/logger/dto/LoginLogCreateReqDTO.java

@@ -1,16 +1,16 @@
-package cn.aagro.pp.module.system.api.logger.dto;
+package cn.aagro.ag.module.system.api.logger.dto;
 
 import lombok.Data;
 
-import javax.validation.constraints.NotBlank;
-import javax.validation.constraints.NotEmpty;
-import javax.validation.constraints.NotNull;
-import javax.validation.constraints.Size;
+import jakarta.validation.constraints.NotBlank;
+import jakarta.validation.constraints.NotEmpty;
+import jakarta.validation.constraints.NotNull;
+import jakarta.validation.constraints.Size;
 
 /**
  * 登录日志创建 Request DTO
  *
- * @author 芋道源码
+ * @author AIOTAGRO
  */
 @Data
 public class LoginLogCreateReqDTO {

aagro-module-system/src/main/java/cn/aagro/ag/module/system/api/logger/dto/OperateLogPageReqDTO.java

@@ -1,6 +1,6 @@
-package cn.aagro.pp.module.system.api.logger.dto;
+package cn.aagro.ag.module.system.api.logger.dto;
 
-import cn.aagro.pp.framework.common.pojo.PageParam;
+import cn.aagro.ag.framework.common.pojo.PageParam;
 import lombok.Data;
 
 /**

aagro-module-system/src/main/java/cn/aagro/ag/module/system/api/logger/dto/OperateLogRespDTO.java

@@ -1,4 +1,4 @@
-package cn.aagro.pp.module.system.api.logger.dto;
+package cn.aagro.ag.module.system.api.logger.dto;
 
 import com.fhs.core.trans.anno.Trans;
 import com.fhs.core.trans.constant.TransType;
@@ -26,7 +26,7 @@ public class OperateLogRespDTO implements VO {
     /**
      * 用户编号
      */
-    @Trans(type = TransType.SIMPLE, targetClassName = "cn.aagro.pp.module.system.dal.dataobject.user.AdminUserDO",
+    @Trans(type = TransType.SIMPLE, targetClassName = "cn.aagro.ag.module.system.dal.dataobject.user.AdminUserDO",
             fields = "nickname", ref = "userName")
     private Long userId;
     /**

aagro-module-system/src/main/java/cn/aagro/ag/module/system/api/mail/MailSendApi.java

@@ -1,13 +1,13 @@
-package cn.aagro.pp.module.system.api.mail;
+package cn.aagro.ag.module.system.api.mail;
 
-import cn.aagro.pp.module.system.api.mail.dto.MailSendSingleToUserReqDTO;
+import cn.aagro.ag.module.system.api.mail.dto.MailSendSingleToUserReqDTO;
 
-import javax.validation.Valid;
+import jakarta.validation.Valid;
 
 /**
  * 邮箱发送 API 接口
  *
- * @author 芋道源码
+ * @author AIOTAGRO
  */
 public interface MailSendApi {
 

aagro-module-system/src/main/java/cn/aagro/ag/module/system/api/mail/MailSendApiImpl.java

@@ -1,11 +1,11 @@
-package cn.aagro.pp.module.system.api.mail;
+package cn.aagro.ag.module.system.api.mail;
 
-import cn.aagro.pp.module.system.api.mail.dto.MailSendSingleToUserReqDTO;
-import cn.aagro.pp.module.system.service.mail.MailSendService;
+import cn.aagro.ag.module.system.api.mail.dto.MailSendSingleToUserReqDTO;
+import cn.aagro.ag.module.system.service.mail.MailSendService;
 import org.springframework.stereotype.Service;
 import org.springframework.validation.annotation.Validated;
 
-import javax.annotation.Resource;
+import jakarta.annotation.Resource;
 
 /**
  * 邮件发送 API 实现类

aagro-module-system/src/main/java/cn/aagro/ag/module/system/api/mail/dto/MailSendSingleToUserReqDTO.java

@@ -1,9 +1,10 @@
-package cn.aagro.pp.module.system.api.mail.dto;
+package cn.aagro.ag.module.system.api.mail.dto;
 
 import lombok.Data;
 
-import javax.validation.constraints.Email;
-import javax.validation.constraints.NotNull;
+import jakarta.validation.constraints.Email;
+import jakarta.validation.constraints.NotNull;
+
 import java.util.List;
 import java.util.Map;
 

aagro-module-system/src/main/java/cn/aagro/ag/module/system/api/notify/NotifyMessageSendApi.java

@@ -1,8 +1,8 @@
-package cn.aagro.pp.module.system.api.notify;
+package cn.aagro.ag.module.system.api.notify;
 
-import cn.aagro.pp.module.system.api.notify.dto.NotifySendSingleToUserReqDTO;
+import cn.aagro.ag.module.system.api.notify.dto.NotifySendSingleToUserReqDTO;
 
-import javax.validation.Valid;
+import jakarta.validation.Valid;
 
 /**
  * 站内信发送 API 接口

aagro-module-system/src/main/java/cn/aagro/ag/module/system/api/notify/NotifyMessageSendApiImpl.java

@@ -1,10 +1,10 @@
-package cn.aagro.pp.module.system.api.notify;
+package cn.aagro.ag.module.system.api.notify;
 
-import cn.aagro.pp.module.system.api.notify.dto.NotifySendSingleToUserReqDTO;
-import cn.aagro.pp.module.system.service.notify.NotifySendService;
+import cn.aagro.ag.module.system.api.notify.dto.NotifySendSingleToUserReqDTO;
+import cn.aagro.ag.module.system.service.notify.NotifySendService;
 import org.springframework.stereotype.Service;
 
-import javax.annotation.Resource;
+import jakarta.annotation.Resource;
 
 /**
  * 站内信发送 API 实现类

aagro-module-system/src/main/java/cn/aagro/ag/module/system/api/notify/dto/NotifySendSingleToUserReqDTO.java

@@ -1,9 +1,9 @@
-package cn.aagro.pp.module.system.api.notify.dto;
+package cn.aagro.ag.module.system.api.notify.dto;
 
 import lombok.Data;
 
-import javax.validation.constraints.NotEmpty;
-import javax.validation.constraints.NotNull;
+import jakarta.validation.constraints.NotEmpty;
+import jakarta.validation.constraints.NotNull;
 import java.util.Map;
 
 /**

aagro-module-system/src/main/java/cn/aagro/ag/module/system/api/notify/dto/NotifyTemplateReqDTO.java

@@ -1,11 +1,11 @@
-package cn.aagro.pp.module.system.api.notify.dto;
+package cn.aagro.ag.module.system.api.notify.dto;
 
-import cn.aagro.pp.framework.common.enums.CommonStatusEnum;
-import cn.aagro.pp.framework.common.validation.InEnum;
+import cn.aagro.ag.framework.common.enums.CommonStatusEnum;
+import cn.aagro.ag.framework.common.validation.InEnum;
 import lombok.Data;
 
-import javax.validation.constraints.NotEmpty;
-import javax.validation.constraints.NotNull;
+import jakarta.validation.constraints.NotEmpty;
+import jakarta.validation.constraints.NotNull;
 
 @Data
 public class NotifyTemplateReqDTO {

aagro-module-system/src/main/java/cn/aagro/ag/module/system/api/oauth2/OAuth2TokenApiImpl.java

@@ -1,20 +1,20 @@
-package cn.aagro.pp.module.system.api.oauth2;
+package cn.aagro.ag.module.system.api.oauth2;
 
-import cn.aagro.pp.framework.common.biz.system.oauth2.OAuth2TokenCommonApi;
-import cn.aagro.pp.framework.common.util.object.BeanUtils;
-import cn.aagro.pp.framework.common.biz.system.oauth2.dto.OAuth2AccessTokenCheckRespDTO;
-import cn.aagro.pp.framework.common.biz.system.oauth2.dto.OAuth2AccessTokenCreateReqDTO;
-import cn.aagro.pp.framework.common.biz.system.oauth2.dto.OAuth2AccessTokenRespDTO;
-import cn.aagro.pp.module.system.dal.dataobject.oauth2.OAuth2AccessTokenDO;
-import cn.aagro.pp.module.system.service.oauth2.OAuth2TokenService;
+import cn.aagro.ag.framework.common.biz.system.oauth2.OAuth2TokenCommonApi;
+import cn.aagro.ag.framework.common.util.object.BeanUtils;
+import cn.aagro.ag.framework.common.biz.system.oauth2.dto.OAuth2AccessTokenCheckRespDTO;
+import cn.aagro.ag.framework.common.biz.system.oauth2.dto.OAuth2AccessTokenCreateReqDTO;
+import cn.aagro.ag.framework.common.biz.system.oauth2.dto.OAuth2AccessTokenRespDTO;
+import cn.aagro.ag.module.system.dal.dataobject.oauth2.OAuth2AccessTokenDO;
+import cn.aagro.ag.module.system.service.oauth2.OAuth2TokenService;
 import org.springframework.stereotype.Service;
 
-import javax.annotation.Resource;
+import jakarta.annotation.Resource;
 
 /**
  * OAuth2.0 Token API 实现类
  *
- * @author 芋道源码
+ * @author AIOTAGRO
  */
 @Service
 public class OAuth2TokenApiImpl implements OAuth2TokenCommonApi {

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

@@ -1,4 +1,4 @@
 /**
  * system API 包，定义并实现提供给其它模块的 API
  */
-package cn.aagro.pp.module.system.api;
+package cn.aagro.ag.module.system.api;

aagro-module-system/src/main/java/cn/aagro/ag/module/system/api/permission/PermissionApi.java

@@ -1,6 +1,6 @@
-package cn.aagro.pp.module.system.api.permission;
+package cn.aagro.ag.module.system.api.permission;
 
-import cn.aagro.pp.framework.common.biz.system.permission.PermissionCommonApi;
+import cn.aagro.ag.framework.common.biz.system.permission.PermissionCommonApi;
 
 import java.util.Collection;
 import java.util.Set;
@@ -8,7 +8,7 @@ import java.util.Set;
 /**
  * 权限 API 接口
  *
- * @author 芋道源码
+ * @author AIOTAGRO
  */
 public interface PermissionApi extends PermissionCommonApi {
 

aagro-module-system/src/main/java/cn/aagro/ag/module/system/api/permission/PermissionApiImpl.java

@@ -1,17 +1,17 @@
-package cn.aagro.pp.module.system.api.permission;
+package cn.aagro.ag.module.system.api.permission;
 
-import cn.aagro.pp.framework.common.biz.system.permission.dto.DeptDataPermissionRespDTO;
-import cn.aagro.pp.module.system.service.permission.PermissionService;
+import cn.aagro.ag.framework.common.biz.system.permission.dto.DeptDataPermissionRespDTO;
+import cn.aagro.ag.module.system.service.permission.PermissionService;
 import org.springframework.stereotype.Service;
 
-import javax.annotation.Resource;
+import jakarta.annotation.Resource;
 import java.util.Collection;
 import java.util.Set;
 
 /**
  * 权限 API 实现类
  *
- * @author 芋道源码
+ * @author AIOTAGRO
  */
 @Service
 public class PermissionApiImpl implements PermissionApi {

aagro-module-system/src/main/java/cn/aagro/ag/module/system/api/permission/RoleApi.java

@@ -1,11 +1,11 @@
-package cn.aagro.pp.module.system.api.permission;
+package cn.aagro.ag.module.system.api.permission;
 
 import java.util.Collection;
 
 /**
  * 角色 API 接口
  *
- * @author 芋道源码
+ * @author AIOTAGRO
  */
 public interface RoleApi {
 

aagro-module-system/src/main/java/cn/aagro/ag/module/system/api/permission/RoleApiImpl.java

@@ -1,15 +1,15 @@
-package cn.aagro.pp.module.system.api.permission;
+package cn.aagro.ag.module.system.api.permission;
 
-import cn.aagro.pp.module.system.service.permission.RoleService;
+import cn.aagro.ag.module.system.service.permission.RoleService;
 import org.springframework.stereotype.Service;
 
-import javax.annotation.Resource;
+import jakarta.annotation.Resource;
 import java.util.Collection;
 
 /**
  * 角色 API 实现类
  *
- * @author 芋道源码
+ * @author AIOTAGRO
  */
 @Service
 public class RoleApiImpl implements RoleApi {

aagro-module-system/src/main/java/cn/aagro/ag/module/system/api/sms/SmsCodeApi.java

@@ -1,16 +1,16 @@
-package cn.aagro.pp.module.system.api.sms;
+package cn.aagro.ag.module.system.api.sms;
 
-import cn.aagro.pp.framework.common.exception.ServiceException;
-import cn.aagro.pp.module.system.api.sms.dto.code.SmsCodeValidateReqDTO;
-import cn.aagro.pp.module.system.api.sms.dto.code.SmsCodeSendReqDTO;
-import cn.aagro.pp.module.system.api.sms.dto.code.SmsCodeUseReqDTO;
+import cn.aagro.ag.framework.common.exception.ServiceException;
+import cn.aagro.ag.module.system.api.sms.dto.code.SmsCodeValidateReqDTO;
+import cn.aagro.ag.module.system.api.sms.dto.code.SmsCodeSendReqDTO;
+import cn.aagro.ag.module.system.api.sms.dto.code.SmsCodeUseReqDTO;
 
-import javax.validation.Valid;
+import jakarta.validation.Valid;
 
 /**
  * 短信验证码 API 接口
  *
- * @author 芋道源码
+ * @author AIOTAGRO
  */
 public interface SmsCodeApi {
 

aagro-module-system/src/main/java/cn/aagro/ag/module/system/api/sms/SmsCodeApiImpl.java

@@ -1,18 +1,18 @@
-package cn.aagro.pp.module.system.api.sms;
+package cn.aagro.ag.module.system.api.sms;
 
-import cn.aagro.pp.module.system.api.sms.dto.code.SmsCodeValidateReqDTO;
-import cn.aagro.pp.module.system.api.sms.dto.code.SmsCodeSendReqDTO;
-import cn.aagro.pp.module.system.api.sms.dto.code.SmsCodeUseReqDTO;
-import cn.aagro.pp.module.system.service.sms.SmsCodeService;
+import cn.aagro.ag.module.system.api.sms.dto.code.SmsCodeValidateReqDTO;
+import cn.aagro.ag.module.system.api.sms.dto.code.SmsCodeSendReqDTO;
+import cn.aagro.ag.module.system.api.sms.dto.code.SmsCodeUseReqDTO;
+import cn.aagro.ag.module.system.service.sms.SmsCodeService;
 import org.springframework.stereotype.Service;
 import org.springframework.validation.annotation.Validated;
 
-import javax.annotation.Resource;
+import jakarta.annotation.Resource;
 
 /**
  * 短信验证码 API 实现类
  *
- * @author 芋道源码
+ * @author AIOTAGRO
  */
 @Service
 @Validated

aagro-module-system/src/main/java/cn/aagro/ag/module/system/api/sms/SmsSendApi.java

@@ -1,13 +1,13 @@
-package cn.aagro.pp.module.system.api.sms;
+package cn.aagro.ag.module.system.api.sms;
 
-import cn.aagro.pp.module.system.api.sms.dto.send.SmsSendSingleToUserReqDTO;
+import cn.aagro.ag.module.system.api.sms.dto.send.SmsSendSingleToUserReqDTO;
 
-import javax.validation.Valid;
+import jakarta.validation.Valid;
 
 /**
  * 短信发送 API 接口
  *
- * @author 芋道源码
+ * @author AIOTAGRO
  */
 public interface SmsSendApi {
 

aagro-module-system/src/main/java/cn/aagro/ag/module/system/api/sms/SmsSendApiImpl.java

@@ -1,16 +1,16 @@
-package cn.aagro.pp.module.system.api.sms;
+package cn.aagro.ag.module.system.api.sms;
 
-import cn.aagro.pp.module.system.api.sms.dto.send.SmsSendSingleToUserReqDTO;
-import cn.aagro.pp.module.system.service.sms.SmsSendService;
+import cn.aagro.ag.module.system.api.sms.dto.send.SmsSendSingleToUserReqDTO;
+import cn.aagro.ag.module.system.service.sms.SmsSendService;
 import org.springframework.stereotype.Service;
 import org.springframework.validation.annotation.Validated;
 
-import javax.annotation.Resource;
+import jakarta.annotation.Resource;
 
 /**
  * 短信发送 API 接口
  *
- * @author 芋道源码
+ * @author AIOTAGRO
  */
 @Service
 @Validated

aagro-module-system/src/main/java/cn/aagro/ag/module/system/api/sms/dto/code/SmsCodeSendReqDTO.java

@@ -1,17 +1,17 @@
-package cn.aagro.pp.module.system.api.sms.dto.code;
+package cn.aagro.ag.module.system.api.sms.dto.code;
 
-import cn.aagro.pp.framework.common.validation.InEnum;
-import cn.aagro.pp.framework.common.validation.Mobile;
-import cn.aagro.pp.module.system.enums.sms.SmsSceneEnum;
+import cn.aagro.ag.framework.common.validation.InEnum;
+import cn.aagro.ag.framework.common.validation.Mobile;
+import cn.aagro.ag.module.system.enums.sms.SmsSceneEnum;
 import lombok.Data;
 
-import javax.validation.constraints.NotEmpty;
-import javax.validation.constraints.NotNull;
+import jakarta.validation.constraints.NotEmpty;
+import jakarta.validation.constraints.NotNull;
 
 /**
  * 短信验证码的发送 Request DTO
  *
- * @author 芋道源码
+ * @author AIOTAGRO
  */
 @Data
 public class SmsCodeSendReqDTO {

aagro-module-system/src/main/java/cn/aagro/ag/module/system/api/sms/dto/code/SmsCodeUseReqDTO.java

@@ -1,17 +1,17 @@
-package cn.aagro.pp.module.system.api.sms.dto.code;
+package cn.aagro.ag.module.system.api.sms.dto.code;
 
-import cn.aagro.pp.framework.common.validation.InEnum;
-import cn.aagro.pp.framework.common.validation.Mobile;
-import cn.aagro.pp.module.system.enums.sms.SmsSceneEnum;
+import cn.aagro.ag.framework.common.validation.InEnum;
+import cn.aagro.ag.framework.common.validation.Mobile;
+import cn.aagro.ag.module.system.enums.sms.SmsSceneEnum;
 import lombok.Data;
 
-import javax.validation.constraints.NotEmpty;
-import javax.validation.constraints.NotNull;
+import jakarta.validation.constraints.NotEmpty;
+import jakarta.validation.constraints.NotNull;
 
 /**
  * 短信验证码的使用 Request DTO
  *
- * @author 芋道源码
+ * @author AIOTAGRO
  */
 @Data
 public class SmsCodeUseReqDTO {

aagro-module-system/src/main/java/cn/aagro/ag/module/system/api/sms/dto/code/SmsCodeValidateReqDTO.java

@@ -1,17 +1,17 @@
-package cn.aagro.pp.module.system.api.sms.dto.code;
+package cn.aagro.ag.module.system.api.sms.dto.code;
 
-import cn.aagro.pp.framework.common.validation.InEnum;
-import cn.aagro.pp.framework.common.validation.Mobile;
-import cn.aagro.pp.module.system.enums.sms.SmsSceneEnum;
+import cn.aagro.ag.framework.common.validation.InEnum;
+import cn.aagro.ag.framework.common.validation.Mobile;
+import cn.aagro.ag.module.system.enums.sms.SmsSceneEnum;
 import lombok.Data;
 
-import javax.validation.constraints.NotEmpty;
-import javax.validation.constraints.NotNull;
+import jakarta.validation.constraints.NotEmpty;
+import jakarta.validation.constraints.NotNull;
 
 /**
  * 短信验证码的校验 Request DTO
  *
- * @author 芋道源码
+ * @author AIOTAGRO
  */
 @Data
 public class SmsCodeValidateReqDTO {

aagro-module-system/src/main/java/cn/aagro/ag/module/system/api/sms/dto/send/SmsSendSingleToUserReqDTO.java

@@ -1,15 +1,15 @@
-package cn.aagro.pp.module.system.api.sms.dto.send;
+package cn.aagro.ag.module.system.api.sms.dto.send;
 
-import cn.aagro.pp.framework.common.validation.Mobile;
+import cn.aagro.ag.framework.common.validation.Mobile;
 import lombok.Data;
 
-import javax.validation.constraints.NotEmpty;
+import jakarta.validation.constraints.NotEmpty;
 import java.util.Map;
 
 /**
  * 短信发送给 Admin 或者 Member 用户
  *
- * @author 芋道源码
+ * @author AIOTAGRO
  */
 @Data
 public class SmsSendSingleToUserReqDTO {

aagro-module-system/src/main/java/cn/aagro/ag/module/system/api/social/SocialClientApi.java

@@ -1,16 +1,15 @@
-package cn.aagro.pp.module.system.api.social;
+package cn.aagro.ag.module.system.api.social;
 
-import cn.aagro.pp.module.system.api.social.dto.*;
-import cn.aagro.pp.module.system.enums.social.SocialTypeEnum;
-
-import javax.validation.Valid;
+import cn.aagro.ag.module.system.api.social.dto.*;
+import cn.aagro.ag.module.system.enums.social.SocialTypeEnum;
+import jakarta.validation.Valid;
 
 import java.util.List;
 
 /**
  * 社交应用的 API 接口
  *
- * @author 芋道源码
+ * @author AIOTAGRO
  */
 public interface SocialClientApi {
 

aagro-module-system/src/main/java/cn/aagro/ag/module/system/api/social/SocialClientApiImpl.java

@@ -1,30 +1,30 @@
-package cn.aagro.pp.module.system.api.social;
+package cn.aagro.ag.module.system.api.social;
 
 import cn.binarywang.wx.miniapp.bean.WxMaPhoneNumberInfo;
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.util.ObjUtil;
 import cn.hutool.core.util.StrUtil;
-import cn.aagro.pp.framework.common.util.object.BeanUtils;
-import cn.aagro.pp.module.system.api.social.dto.*;
-import cn.aagro.pp.module.system.enums.social.SocialTypeEnum;
-import cn.aagro.pp.module.system.service.social.SocialClientService;
-import cn.aagro.pp.module.system.service.social.SocialUserService;
+import cn.aagro.ag.framework.common.util.object.BeanUtils;
+import cn.aagro.ag.module.system.api.social.dto.*;
+import cn.aagro.ag.module.system.enums.social.SocialTypeEnum;
+import cn.aagro.ag.module.system.service.social.SocialClientService;
+import cn.aagro.ag.module.system.service.social.SocialUserService;
+import jakarta.annotation.Resource;
 import lombok.extern.slf4j.Slf4j;
 import me.chanjar.weixin.common.bean.WxJsapiSignature;
 import me.chanjar.weixin.common.bean.subscribemsg.TemplateInfo;
 import org.springframework.stereotype.Service;
 import org.springframework.validation.annotation.Validated;
 
-import javax.annotation.Resource;
 import java.util.List;
 
 import static cn.hutool.core.collection.CollUtil.findOne;
-import static cn.aagro.pp.framework.common.util.collection.CollectionUtils.convertList;
+import static cn.aagro.ag.framework.common.util.collection.CollectionUtils.convertList;
 
 /**
  * 社交应用的 API 实现类
  *
- * @author 芋道源码
+ * @author AIOTAGRO
  */
 @Service
 @Validated

aagro-module-system/src/main/java/cn/aagro/ag/module/system/api/social/SocialUserApi.java

@@ -1,15 +1,15 @@
-package cn.aagro.pp.module.system.api.social;
+package cn.aagro.ag.module.system.api.social;
 
-import cn.aagro.pp.framework.common.exception.ServiceException;
-import cn.aagro.pp.module.system.api.social.dto.SocialUserBindReqDTO;
-import cn.aagro.pp.module.system.api.social.dto.SocialUserRespDTO;
-import cn.aagro.pp.module.system.api.social.dto.SocialUserUnbindReqDTO;
-import javax.validation.Valid;
+import cn.aagro.ag.framework.common.exception.ServiceException;
+import cn.aagro.ag.module.system.api.social.dto.SocialUserBindReqDTO;
+import cn.aagro.ag.module.system.api.social.dto.SocialUserRespDTO;
+import cn.aagro.ag.module.system.api.social.dto.SocialUserUnbindReqDTO;
+import jakarta.validation.Valid;
 
 /**
  * 社交用户的 API 接口
  *
- * @author 芋道源码
+ * @author AIOTAGRO
  */
 public interface SocialUserApi {
 

aagro-module-system/src/main/java/cn/aagro/ag/module/system/api/social/SocialUserApiImpl.java

@@ -1,18 +1,18 @@
-package cn.aagro.pp.module.system.api.social;
+package cn.aagro.ag.module.system.api.social;
 
-import cn.aagro.pp.module.system.api.social.dto.SocialUserBindReqDTO;
-import cn.aagro.pp.module.system.api.social.dto.SocialUserRespDTO;
-import cn.aagro.pp.module.system.api.social.dto.SocialUserUnbindReqDTO;
-import cn.aagro.pp.module.system.service.social.SocialUserService;
+import cn.aagro.ag.module.system.api.social.dto.SocialUserBindReqDTO;
+import cn.aagro.ag.module.system.api.social.dto.SocialUserRespDTO;
+import cn.aagro.ag.module.system.api.social.dto.SocialUserUnbindReqDTO;
+import cn.aagro.ag.module.system.service.social.SocialUserService;
 import org.springframework.stereotype.Service;
 import org.springframework.validation.annotation.Validated;
 
-import javax.annotation.Resource;
+import jakarta.annotation.Resource;
 
 /**
  * 社交用户的 API 实现类
  *
- * @author 芋道源码
+ * @author AIOTAGRO
  */
 @Service
 @Validated

aagro-module-system/src/main/java/cn/aagro/ag/module/system/api/social/dto/SocialUserBindReqDTO.java

@@ -1,19 +1,19 @@
-package cn.aagro.pp.module.system.api.social.dto;
+package cn.aagro.ag.module.system.api.social.dto;
 
-import cn.aagro.pp.framework.common.enums.UserTypeEnum;
-import cn.aagro.pp.framework.common.validation.InEnum;
-import cn.aagro.pp.module.system.enums.social.SocialTypeEnum;
+import cn.aagro.ag.framework.common.enums.UserTypeEnum;
+import cn.aagro.ag.framework.common.validation.InEnum;
+import cn.aagro.ag.module.system.enums.social.SocialTypeEnum;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
-import javax.validation.constraints.NotEmpty;
-import javax.validation.constraints.NotNull;
+import jakarta.validation.constraints.NotEmpty;
+import jakarta.validation.constraints.NotNull;
 
 /**
  * 取消绑定社交用户 Request DTO
  *
- * @author 芋道源码
+ * @author AIOTAGRO
  */
 @Data
 @NoArgsConstructor

aagro-module-system/src/main/java/cn/aagro/ag/module/system/api/social/dto/SocialUserRespDTO.java

@@ -1,4 +1,4 @@
-package cn.aagro.pp.module.system.api.social.dto;
+package cn.aagro.ag.module.system.api.social.dto;
 
 import lombok.AllArgsConstructor;
 import lombok.Data;
@@ -7,7 +7,7 @@ import lombok.NoArgsConstructor;
 /**
  * 社交用户 Response DTO
  *
- * @author 芋道源码
+ * @author AIOTAGRO
  */
 @Data
 @NoArgsConstructor

aagro-module-system/src/main/java/cn/aagro/ag/module/system/api/social/dto/SocialUserUnbindReqDTO.java

@@ -1,19 +1,19 @@
-package cn.aagro.pp.module.system.api.social.dto;
+package cn.aagro.ag.module.system.api.social.dto;
 
-import cn.aagro.pp.framework.common.enums.UserTypeEnum;
-import cn.aagro.pp.framework.common.validation.InEnum;
-import cn.aagro.pp.module.system.enums.social.SocialTypeEnum;
+import cn.aagro.ag.framework.common.enums.UserTypeEnum;
+import cn.aagro.ag.framework.common.validation.InEnum;
+import cn.aagro.ag.module.system.enums.social.SocialTypeEnum;
 import lombok.AllArgsConstructor;
 import lombok.Data;
-import lombok.NoArgsConstructor;
 
-import javax.validation.constraints.NotEmpty;
-import javax.validation.constraints.NotNull;
+import jakarta.validation.constraints.NotEmpty;
+import jakarta.validation.constraints.NotNull;
+import lombok.NoArgsConstructor;
 
 /**
  * 社交绑定 Request DTO，使用 code 授权码
  *
- * @author 芋道源码
+ * @author AIOTAGRO
  */
 @Data
 @AllArgsConstructor

aagro-module-system/src/main/java/cn/aagro/ag/module/system/api/social/dto/SocialWxJsapiSignatureRespDTO.java

@@ -1,11 +1,11 @@
-package cn.aagro.pp.module.system.api.social.dto;
+package cn.aagro.ag.module.system.api.social.dto;
 
 import lombok.Data;
 
 /**
  * 微信公众号 JSAPI 签名 Response DTO
  *
- * @author 芋道源码
+ * @author AIOTAGRO
  */
 @Data
 public class SocialWxJsapiSignatureRespDTO {

aagro-module-system/src/main/java/cn/aagro/ag/module/system/api/social/dto/SocialWxPhoneNumberInfoRespDTO.java

@@ -1,11 +1,11 @@
-package cn.aagro.pp.module.system.api.social.dto;
+package cn.aagro.ag.module.system.api.social.dto;
 
 import lombok.Data;
 
 /**
  * 微信小程序的手机信息 Response DTO
  *
- * @author 芋道源码
+ * @author AIOTAGRO
  */
 @Data
 public class SocialWxPhoneNumberInfoRespDTO {

aagro-module-system/src/main/java/cn/aagro/ag/module/system/api/social/dto/SocialWxQrcodeReqDTO.java

@@ -1,9 +1,8 @@
-package cn.aagro.pp.module.system.api.social.dto;
+package cn.aagro.ag.module.system.api.social.dto;
 
+import jakarta.validation.constraints.NotEmpty;
 import lombok.Data;
 
-import javax.validation.constraints.NotEmpty;
-
 /**
  * 获取小程序码 Request DTO
  *

aagro-module-system/src/main/java/cn/aagro/ag/module/system/api/social/dto/SocialWxaOrderNotifyConfirmReceiveReqDTO.java

@@ -1,16 +1,16 @@
-package cn.aagro.pp.module.system.api.social.dto;
+package cn.aagro.ag.module.system.api.social.dto;
 
+import jakarta.validation.constraints.NotEmpty;
+import jakarta.validation.constraints.NotNull;
 import lombok.Data;
 
-import javax.validation.constraints.NotEmpty;
-import javax.validation.constraints.NotNull;
 import java.time.LocalDateTime;
 
 /**
  * 小程序订单上传购物详情
  *
  * @see <a href="https://developers.weixin.qq.com/miniprogram/dev/OpenApiDoc/shopping-order/normal-shopping-detail/uploadShoppingInfo.html">上传购物详情</a>
- * @author 芋道源码
+ * @author AIOTAGRO
  */
 @Data
 public class SocialWxaOrderNotifyConfirmReceiveReqDTO {

aagro-module-system/src/main/java/cn/aagro/ag/module/system/api/social/dto/SocialWxaOrderUploadShippingInfoReqDTO.java

@@ -1,15 +1,14 @@
-package cn.aagro.pp.module.system.api.social.dto;
+package cn.aagro.ag.module.system.api.social.dto;
 
+import jakarta.validation.constraints.NotEmpty;
+import jakarta.validation.constraints.NotNull;
 import lombok.Data;
 
-import javax.validation.constraints.NotEmpty;
-import javax.validation.constraints.NotNull;
-
 /**
  * 小程序订单上传购物详情
  *
  * @see <a href="https://developers.weixin.qq.com/miniprogram/dev/OpenApiDoc/shopping-order/normal-shopping-detail/uploadShoppingInfo.html">上传购物详情</a>
- * @author 芋道源码
+ * @author AIOTAGRO
  */
 @Data
 public class SocialWxaOrderUploadShippingInfoReqDTO {

aagro-module-system/src/main/java/cn/aagro/ag/module/system/api/social/dto/SocialWxaSubscribeMessageSendReqDTO.java

@@ -1,10 +1,10 @@
-package cn.aagro.pp.module.system.api.social.dto;
+package cn.aagro.ag.module.system.api.social.dto;
 
-import cn.aagro.pp.framework.common.enums.UserTypeEnum;
+import cn.aagro.ag.framework.common.enums.UserTypeEnum;
+import jakarta.validation.constraints.NotEmpty;
+import jakarta.validation.constraints.NotNull;
 import lombok.Data;
 
-import javax.validation.constraints.NotEmpty;
-import javax.validation.constraints.NotNull;
 import java.util.HashMap;
 import java.util.Map;
 

aagro-module-system/src/main/java/cn/aagro/ag/module/system/api/social/dto/SocialWxaSubscribeTemplateRespDTO.java

@@ -1,4 +1,4 @@
-package cn.aagro.pp.module.system.api.social.dto;
+package cn.aagro.ag.module.system.api.social.dto;
 
 import lombok.Data;
 

aagro-module-system/src/main/java/cn/aagro/ag/module/system/api/tenant/TenantApiImpl.java

@@ -1,16 +1,16 @@
-package cn.aagro.pp.module.system.api.tenant;
+package cn.aagro.ag.module.system.api.tenant;
 
-import cn.aagro.pp.framework.common.biz.system.tenant.TenantCommonApi;
-import cn.aagro.pp.module.system.service.tenant.TenantService;
+import cn.aagro.ag.framework.common.biz.system.tenant.TenantCommonApi;
+import cn.aagro.ag.module.system.service.tenant.TenantService;
 import org.springframework.stereotype.Service;
 
-import javax.annotation.Resource;
+import jakarta.annotation.Resource;
 import java.util.List;
 
 /**
  * 多租户的 API 实现类
  *
- * @author 芋道源码
+ * @author AIOTAGRO
  */
 @Service
 public class TenantApiImpl implements TenantCommonApi {

aagro-module-system/src/main/java/cn/aagro/ag/module/system/api/user/AdminUserApi.java

@@ -1,7 +1,7 @@
-package cn.aagro.pp.module.system.api.user;
+package cn.aagro.ag.module.system.api.user;
 
-import cn.aagro.pp.framework.common.util.collection.CollectionUtils;
-import cn.aagro.pp.module.system.api.user.dto.AdminUserRespDTO;
+import cn.aagro.ag.framework.common.util.collection.CollectionUtils;
+import cn.aagro.ag.module.system.api.user.dto.AdminUserRespDTO;
 
 import java.util.Collection;
 import java.util.Collections;
@@ -11,7 +11,7 @@ import java.util.Map;
 /**
  * Admin 用户 API 接口
  *
- * @author 芋道源码
+ * @author AIOTAGRO
  */
 public interface AdminUserApi {
 

aagro-module-system/src/main/java/cn/aagro/ag/module/system/api/user/AdminUserApiImpl.java

@@ -1,28 +1,28 @@
-package cn.aagro.pp.module.system.api.user;
+package cn.aagro.ag.module.system.api.user;
 
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.util.ObjUtil;
-import cn.aagro.pp.framework.common.util.object.BeanUtils;
-import cn.aagro.pp.framework.datapermission.core.util.DataPermissionUtils;
-import cn.aagro.pp.module.system.api.user.dto.AdminUserRespDTO;
-import cn.aagro.pp.module.system.dal.dataobject.dept.DeptDO;
-import cn.aagro.pp.module.system.dal.dataobject.user.AdminUserDO;
-import cn.aagro.pp.module.system.service.dept.DeptService;
-import cn.aagro.pp.module.system.service.user.AdminUserService;
+import cn.aagro.ag.framework.common.util.object.BeanUtils;
+import cn.aagro.ag.framework.datapermission.core.util.DataPermissionUtils;
+import cn.aagro.ag.module.system.api.user.dto.AdminUserRespDTO;
+import cn.aagro.ag.module.system.dal.dataobject.dept.DeptDO;
+import cn.aagro.ag.module.system.dal.dataobject.user.AdminUserDO;
+import cn.aagro.ag.module.system.service.dept.DeptService;
+import cn.aagro.ag.module.system.service.user.AdminUserService;
+import jakarta.annotation.Resource;
 import org.springframework.stereotype.Service;
 
-import javax.annotation.Resource;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.List;
 import java.util.Set;
 
-import static cn.aagro.pp.framework.common.util.collection.CollectionUtils.convertSet;
+import static cn.aagro.ag.framework.common.util.collection.CollectionUtils.convertSet;
 
 /**
  * Admin 用户 API 实现类
  *
- * @author 芋道源码
+ * @author AIOTAGRO
  */
 @Service
 public class AdminUserApiImpl implements AdminUserApi {

aagro-module-system/src/main/java/cn/aagro/ag/module/system/api/user/dto/AdminUserRespDTO.java

@@ -1,6 +1,6 @@
-package cn.aagro.pp.module.system.api.user.dto;
+package cn.aagro.ag.module.system.api.user.dto;
 
-import cn.aagro.pp.framework.common.enums.CommonStatusEnum;
+import cn.aagro.ag.framework.common.enums.CommonStatusEnum;
 import lombok.Data;
 
 import java.util.Set;
@@ -8,7 +8,7 @@ import java.util.Set;
 /**
  * Admin 用户 Response DTO
  *
- * @author 芋道源码
+ * @author AIOTAGRO
  */
 @Data
 public class AdminUserRespDTO {

aagro-module-system/src/main/java/cn/aagro/ag/module/system/controller/admin/auth/AuthController.java

@@ -1,43 +1,43 @@
-package cn.aagro.pp.module.system.controller.admin.auth;
+package cn.aagro.ag.module.system.controller.admin.auth;
 
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.util.StrUtil;
-import cn.aagro.pp.framework.common.enums.CommonStatusEnum;
-import cn.aagro.pp.framework.common.enums.UserTypeEnum;
-import cn.aagro.pp.framework.common.pojo.CommonResult;
-import cn.aagro.pp.framework.security.config.SecurityProperties;
-import cn.aagro.pp.framework.security.core.util.SecurityFrameworkUtils;
-import cn.aagro.pp.module.system.controller.admin.auth.vo.*;
-import cn.aagro.pp.module.system.convert.auth.AuthConvert;
-import cn.aagro.pp.module.system.dal.dataobject.permission.MenuDO;
-import cn.aagro.pp.module.system.dal.dataobject.permission.RoleDO;
-import cn.aagro.pp.module.system.dal.dataobject.user.AdminUserDO;
-import cn.aagro.pp.module.system.enums.logger.LoginLogTypeEnum;
-import cn.aagro.pp.module.system.service.auth.AdminAuthService;
-import cn.aagro.pp.module.system.service.permission.MenuService;
-import cn.aagro.pp.module.system.service.permission.PermissionService;
-import cn.aagro.pp.module.system.service.permission.RoleService;
-import cn.aagro.pp.module.system.service.social.SocialClientService;
-import cn.aagro.pp.module.system.service.user.AdminUserService;
+import cn.aagro.ag.framework.common.enums.CommonStatusEnum;
+import cn.aagro.ag.framework.common.enums.UserTypeEnum;
+import cn.aagro.ag.framework.common.pojo.CommonResult;
+import cn.aagro.ag.framework.security.config.SecurityProperties;
+import cn.aagro.ag.framework.security.core.util.SecurityFrameworkUtils;
+import cn.aagro.ag.module.system.controller.admin.auth.vo.*;
+import cn.aagro.ag.module.system.convert.auth.AuthConvert;
+import cn.aagro.ag.module.system.dal.dataobject.permission.MenuDO;
+import cn.aagro.ag.module.system.dal.dataobject.permission.RoleDO;
+import cn.aagro.ag.module.system.dal.dataobject.user.AdminUserDO;
+import cn.aagro.ag.module.system.enums.logger.LoginLogTypeEnum;
+import cn.aagro.ag.module.system.service.auth.AdminAuthService;
+import cn.aagro.ag.module.system.service.permission.MenuService;
+import cn.aagro.ag.module.system.service.permission.PermissionService;
+import cn.aagro.ag.module.system.service.permission.RoleService;
+import cn.aagro.ag.module.system.service.social.SocialClientService;
+import cn.aagro.ag.module.system.service.user.AdminUserService;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.Parameter;
 import io.swagger.v3.oas.annotations.Parameters;
 import io.swagger.v3.oas.annotations.tags.Tag;
+import jakarta.annotation.Resource;
+import jakarta.annotation.security.PermitAll;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.validation.Valid;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
-import javax.annotation.Resource;
-import javax.annotation.security.PermitAll;
-import javax.servlet.http.HttpServletRequest;
-import javax.validation.Valid;
 import java.util.Collections;
 import java.util.List;
 import java.util.Set;
 
-import static cn.aagro.pp.framework.common.pojo.CommonResult.success;
-import static cn.aagro.pp.framework.common.util.collection.CollectionUtils.convertSet;
-import static cn.aagro.pp.framework.security.core.util.SecurityFrameworkUtils.getLoginUserId;
+import static cn.aagro.ag.framework.common.pojo.CommonResult.success;
+import static cn.aagro.ag.framework.common.util.collection.CollectionUtils.convertSet;
+import static cn.aagro.ag.framework.security.core.util.SecurityFrameworkUtils.getLoginUserId;
 
 @Tag(name = "管理后台 - 认证")
 @RestController

aagro-module-system/src/main/java/cn/aagro/ag/module/system/controller/admin/auth/vo/AuthLoginReqVO.java

@@ -1,8 +1,8 @@
-package cn.aagro.pp.module.system.controller.admin.auth.vo;
+package cn.aagro.ag.module.system.controller.admin.auth.vo;
 
 import cn.hutool.core.util.StrUtil;
-import cn.aagro.pp.framework.common.validation.InEnum;
-import cn.aagro.pp.module.system.enums.social.SocialTypeEnum;
+import cn.aagro.ag.framework.common.validation.InEnum;
+import cn.aagro.ag.module.system.enums.social.SocialTypeEnum;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
@@ -10,9 +10,9 @@ import lombok.Data;
 import lombok.NoArgsConstructor;
 import org.hibernate.validator.constraints.Length;
 
-import javax.validation.constraints.AssertTrue;
-import javax.validation.constraints.NotEmpty;
-import javax.validation.constraints.Pattern;
+import jakarta.validation.constraints.AssertTrue;
+import jakarta.validation.constraints.NotEmpty;
+import jakarta.validation.constraints.Pattern;
 
 @Schema(description = "管理后台 - 账号密码登录 Request VO，如果登录并绑定社交用户，需要传递 social 开头的参数")
 @Data

aagro-module-system/src/main/java/cn/aagro/ag/module/system/controller/admin/auth/vo/AuthLoginRespVO.java

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

aagro-module-system/src/main/java/cn/aagro/ag/module/system/controller/admin/auth/vo/AuthMenuRespVO.java

@@ -1,4 +1,4 @@
-package cn.aagro.pp.module.system.controller.admin.auth.vo;
+package cn.aagro.ag.module.system.controller.admin.auth.vo;
 
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.AllArgsConstructor;
@@ -15,13 +15,13 @@ import java.util.List;
 @Builder
 public class AuthMenuRespVO {
 
-    @Schema(description = "菜单名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "芋道")
+    @Schema(description = "菜单名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "AIOTAGRO")
     private Long id;
 
     @Schema(description = "父菜单 ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024")
     private Long parentId;
 
-    @Schema(description = "菜单名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "芋道")
+    @Schema(description = "菜单名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "AIOTAGRO")
     private String name;
 
     @Schema(description = "路由地址,仅菜单类型为菜单或者目录时，才需要传", example = "post")

aagro-module-system/src/main/java/cn/aagro/ag/module/system/controller/admin/auth/vo/AuthPermissionInfoRespVO.java

@@ -1,4 +1,4 @@
-package cn.aagro.pp.module.system.controller.admin.auth.vo;
+package cn.aagro.ag.module.system.controller.admin.auth.vo;
 
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.AllArgsConstructor;
@@ -38,7 +38,7 @@ public class AuthPermissionInfoRespVO {
         @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 nickname;
 
         @Schema(description = "用户头像", requiredMode = Schema.RequiredMode.REQUIRED, example = "https://www.iocoder.cn/xx.jpg")
@@ -62,13 +62,13 @@ public class AuthPermissionInfoRespVO {
     @Builder
     public static class MenuVO {
 
-        @Schema(description = "菜单名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "芋道")
+        @Schema(description = "菜单名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "AIOTAGRO")
         private Long id;
 
         @Schema(description = "父菜单 ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024")
         private Long parentId;
 
-        @Schema(description = "菜单名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "芋道")
+        @Schema(description = "菜单名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "AIOTAGRO")
         private String name;
 
         @Schema(description = "路由地址,仅菜单类型为菜单或者目录时，才需要传", example = "post")

aagro-module-system/src/main/java/cn/aagro/ag/module/system/controller/admin/auth/vo/AuthRegisterReqVO.java

@@ -1,11 +1,11 @@
-package cn.aagro.pp.module.system.controller.admin.auth.vo;
+package cn.aagro.ag.module.system.controller.admin.auth.vo;
 
 
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 import org.hibernate.validator.constraints.Length;
 
-import javax.validation.constraints.*;
+import jakarta.validation.constraints.*;
 
 @Schema(description = "管理后台 - Register Request VO")
 @Data

aagro-module-system/src/main/java/cn/aagro/ag/module/system/controller/admin/auth/vo/AuthResetPasswordReqVO.java

@@ -1,15 +1,14 @@
-package cn.aagro.pp.module.system.controller.admin.auth.vo;
+package cn.aagro.ag.module.system.controller.admin.auth.vo;
 
-import cn.aagro.pp.framework.common.validation.Mobile;
+import cn.aagro.ag.framework.common.validation.Mobile;
 import io.swagger.v3.oas.annotations.media.Schema;
+import jakarta.validation.constraints.NotEmpty;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 import org.hibernate.validator.constraints.Length;
 
-import javax.validation.constraints.NotEmpty;
-
 @Schema(description = "管理后台 - 短信重置账号密码 Request VO")
 @Data
 @NoArgsConstructor

aagro-module-system/src/main/java/cn/aagro/ag/module/system/controller/admin/auth/vo/AuthSmsLoginReqVO.java

@@ -1,13 +1,13 @@
-package cn.aagro.pp.module.system.controller.admin.auth.vo;
+package cn.aagro.ag.module.system.controller.admin.auth.vo;
 
-import cn.aagro.pp.framework.common.validation.Mobile;
+import cn.aagro.ag.framework.common.validation.Mobile;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
-import javax.validation.constraints.NotEmpty;
+import jakarta.validation.constraints.NotEmpty;
 
 @Schema(description = "管理后台 - 短信验证码的登录 Request VO")
 @Data

aagro-module-system/src/main/java/cn/aagro/ag/module/system/controller/admin/auth/vo/AuthSmsSendReqVO.java

@@ -1,16 +1,16 @@
-package cn.aagro.pp.module.system.controller.admin.auth.vo;
+package cn.aagro.ag.module.system.controller.admin.auth.vo;
 
-import cn.aagro.pp.framework.common.validation.InEnum;
-import cn.aagro.pp.framework.common.validation.Mobile;
-import cn.aagro.pp.module.system.enums.sms.SmsSceneEnum;
+import cn.aagro.ag.framework.common.validation.InEnum;
+import cn.aagro.ag.framework.common.validation.Mobile;
+import cn.aagro.ag.module.system.enums.sms.SmsSceneEnum;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
-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-system/src/main/java/cn/aagro/ag/module/system/controller/admin/auth/vo/AuthSocialLoginReqVO.java

@@ -1,15 +1,15 @@
-package cn.aagro.pp.module.system.controller.admin.auth.vo;
+package cn.aagro.ag.module.system.controller.admin.auth.vo;
 
-import cn.aagro.pp.framework.common.validation.InEnum;
-import cn.aagro.pp.module.system.enums.social.SocialTypeEnum;
+import cn.aagro.ag.framework.common.validation.InEnum;
+import cn.aagro.ag.module.system.enums.social.SocialTypeEnum;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
-import javax.validation.constraints.NotEmpty;
-import javax.validation.constraints.NotNull;
+import jakarta.validation.constraints.NotEmpty;
+import jakarta.validation.constraints.NotNull;
 
 @Schema(description = "管理后台 - 社交绑定登录 Request VO，使用 code 授权码 + 账号密码")
 @Data

aagro-module-system/src/main/java/cn/aagro/ag/module/system/controller/admin/auth/vo/CaptchaVerificationReqVO.java

@@ -1,10 +1,9 @@
-package cn.aagro.pp.module.system.controller.admin.auth.vo;
+package cn.aagro.ag.module.system.controller.admin.auth.vo;
 
 import io.swagger.v3.oas.annotations.media.Schema;
+import jakarta.validation.constraints.NotEmpty;
 import lombok.Data;
 
-import javax.validation.constraints.NotEmpty;
-
 @Schema(description = "管理后台 - 验证码 Request VO")
 @Data
 public class CaptchaVerificationReqVO {

aagro-module-system/src/main/java/cn/aagro/ag/module/system/controller/admin/captcha/CaptchaController.java

@@ -1,22 +1,21 @@
-package cn.aagro.pp.module.system.controller.admin.captcha;
+package cn.aagro.ag.module.system.controller.admin.captcha;
 
 import cn.hutool.core.util.StrUtil;
-import cn.aagro.pp.framework.common.util.servlet.ServletUtils;
-import cn.aagro.pp.framework.tenant.core.aop.TenantIgnore;
+import cn.aagro.ag.framework.common.util.servlet.ServletUtils;
+import cn.aagro.ag.framework.tenant.core.aop.TenantIgnore;
 import com.anji.captcha.model.common.ResponseModel;
 import com.anji.captcha.model.vo.CaptchaVO;
 import com.anji.captcha.service.CaptchaService;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
+import jakarta.annotation.Resource;
+import jakarta.annotation.security.PermitAll;
+import jakarta.servlet.http.HttpServletRequest;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
-import javax.annotation.Resource;
-import javax.annotation.security.PermitAll;
-import javax.servlet.http.HttpServletRequest;
-
 @Tag(name = "管理后台 - 验证码")
 @RestController("adminCaptchaController")
 @RequestMapping("/system/captcha")

aagro-module-system/src/main/java/cn/aagro/ag/module/system/controller/admin/dept/DeptController.java

@@ -1,14 +1,14 @@
-package cn.aagro.pp.module.system.controller.admin.dept;
+package cn.aagro.ag.module.system.controller.admin.dept;
 
-import cn.aagro.pp.framework.common.enums.CommonStatusEnum;
-import cn.aagro.pp.framework.common.pojo.CommonResult;
-import cn.aagro.pp.framework.common.util.object.BeanUtils;
-import cn.aagro.pp.module.system.controller.admin.dept.vo.dept.DeptListReqVO;
-import cn.aagro.pp.module.system.controller.admin.dept.vo.dept.DeptRespVO;
-import cn.aagro.pp.module.system.controller.admin.dept.vo.dept.DeptSaveReqVO;
-import cn.aagro.pp.module.system.controller.admin.dept.vo.dept.DeptSimpleRespVO;
-import cn.aagro.pp.module.system.dal.dataobject.dept.DeptDO;
-import cn.aagro.pp.module.system.service.dept.DeptService;
+import cn.aagro.ag.framework.common.enums.CommonStatusEnum;
+import cn.aagro.ag.framework.common.pojo.CommonResult;
+import cn.aagro.ag.framework.common.util.object.BeanUtils;
+import cn.aagro.ag.module.system.controller.admin.dept.vo.dept.DeptListReqVO;
+import cn.aagro.ag.module.system.controller.admin.dept.vo.dept.DeptRespVO;
+import cn.aagro.ag.module.system.controller.admin.dept.vo.dept.DeptSaveReqVO;
+import cn.aagro.ag.module.system.controller.admin.dept.vo.dept.DeptSimpleRespVO;
+import cn.aagro.ag.module.system.dal.dataobject.dept.DeptDO;
+import cn.aagro.ag.module.system.service.dept.DeptService;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.Parameter;
 import io.swagger.v3.oas.annotations.tags.Tag;
@@ -16,11 +16,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-system/src/main/java/cn/aagro/ag/module/system/controller/admin/dept/PostController.java

@@ -1,35 +1,35 @@
-package cn.aagro.pp.module.system.controller.admin.dept;
+package cn.aagro.ag.module.system.controller.admin.dept;
 
-import cn.aagro.pp.framework.apilog.core.annotation.ApiAccessLog;
-import cn.aagro.pp.framework.common.enums.CommonStatusEnum;
-import cn.aagro.pp.framework.common.pojo.CommonResult;
-import cn.aagro.pp.framework.common.pojo.PageParam;
-import cn.aagro.pp.framework.common.pojo.PageResult;
-import cn.aagro.pp.framework.common.util.object.BeanUtils;
-import cn.aagro.pp.framework.excel.core.util.ExcelUtils;
-import cn.aagro.pp.module.system.controller.admin.dept.vo.post.PostPageReqVO;
-import cn.aagro.pp.module.system.controller.admin.dept.vo.post.PostRespVO;
-import cn.aagro.pp.module.system.controller.admin.dept.vo.post.PostSaveReqVO;
-import cn.aagro.pp.module.system.controller.admin.dept.vo.post.PostSimpleRespVO;
-import cn.aagro.pp.module.system.dal.dataobject.dept.PostDO;
-import cn.aagro.pp.module.system.service.dept.PostService;
+import cn.aagro.ag.framework.apilog.core.annotation.ApiAccessLog;
+import cn.aagro.ag.framework.common.enums.CommonStatusEnum;
+import cn.aagro.ag.framework.common.pojo.CommonResult;
+import cn.aagro.ag.framework.common.pojo.PageParam;
+import cn.aagro.ag.framework.common.pojo.PageResult;
+import cn.aagro.ag.framework.common.util.object.BeanUtils;
+import cn.aagro.ag.framework.excel.core.util.ExcelUtils;
+import cn.aagro.ag.module.system.controller.admin.dept.vo.post.PostPageReqVO;
+import cn.aagro.ag.module.system.controller.admin.dept.vo.post.PostRespVO;
+import cn.aagro.ag.module.system.controller.admin.dept.vo.post.PostSaveReqVO;
+import cn.aagro.ag.module.system.controller.admin.dept.vo.post.PostSimpleRespVO;
+import cn.aagro.ag.module.system.dal.dataobject.dept.PostDO;
+import cn.aagro.ag.module.system.service.dept.PostService;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.Parameter;
 import io.swagger.v3.oas.annotations.tags.Tag;
+import jakarta.annotation.Resource;
+import jakarta.servlet.http.HttpServletResponse;
+import jakarta.validation.Valid;
 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.servlet.http.HttpServletResponse;
-import javax.validation.Valid;
 import java.io.IOException;
 import java.util.Collections;
 import java.util.Comparator;
 import java.util.List;
 
-import static cn.aagro.pp.framework.apilog.core.enums.OperateTypeEnum.EXPORT;
-import static cn.aagro.pp.framework.common.pojo.CommonResult.success;
+import static cn.aagro.ag.framework.apilog.core.enums.OperateTypeEnum.EXPORT;
+import static cn.aagro.ag.framework.common.pojo.CommonResult.success;
 
 @Tag(name = "管理后台 - 岗位")
 @RestController

aagro-module-system/src/main/java/cn/aagro/ag/module/system/controller/admin/dept/vo/dept/DeptListReqVO.java

@@ -1,4 +1,4 @@
-package cn.aagro.pp.module.system.controller.admin.dept.vo.dept;
+package cn.aagro.ag.module.system.controller.admin.dept.vo.dept;
 
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
@@ -7,7 +7,7 @@ import lombok.Data;
 @Data
 public class DeptListReqVO {
 
-    @Schema(description = "部门名称，模糊匹配", example = "芋道")
+    @Schema(description = "部门名称，模糊匹配", example = "AIOTAGRO")
     private String name;
 
     @Schema(description = "展示状态，参见 CommonStatusEnum 枚举类", example = "1")

aagro-module-system/src/main/java/cn/aagro/ag/module/system/controller/admin/dept/vo/dept/DeptRespVO.java

@@ -1,4 +1,4 @@
-package cn.aagro.pp.module.system.controller.admin.dept.vo.dept;
+package cn.aagro.ag.module.system.controller.admin.dept.vo.dept;
 
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
@@ -12,7 +12,7 @@ public class DeptRespVO {
     @Schema(description = "部门编号", example = "1024")
     private Long id;
 
-    @Schema(description = "部门名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "芋道")
+    @Schema(description = "部门名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "AIOTAGRO")
     private String name;
 
     @Schema(description = "父部门 ID", example = "1024")

aagro-module-system/src/main/java/cn/aagro/ag/module/system/controller/admin/dept/vo/dept/DeptSaveReqVO.java

@@ -1,14 +1,14 @@
-package cn.aagro.pp.module.system.controller.admin.dept.vo.dept;
+package cn.aagro.ag.module.system.controller.admin.dept.vo.dept;
 
-import cn.aagro.pp.framework.common.enums.CommonStatusEnum;
-import cn.aagro.pp.framework.common.validation.InEnum;
+import cn.aagro.ag.framework.common.enums.CommonStatusEnum;
+import cn.aagro.ag.framework.common.validation.InEnum;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 
-import javax.validation.constraints.Email;
-import javax.validation.constraints.NotBlank;
-import javax.validation.constraints.NotNull;
-import javax.validation.constraints.Size;
+import jakarta.validation.constraints.Email;
+import jakarta.validation.constraints.NotBlank;
+import jakarta.validation.constraints.NotNull;
+import jakarta.validation.constraints.Size;
 
 @Schema(description = "管理后台 - 部门创建/修改 Request VO")
 @Data
@@ -17,7 +17,7 @@ public class DeptSaveReqVO {
     @Schema(description = "部门编号", example = "1024")
     private Long id;
 
-    @Schema(description = "部门名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "芋道")
+    @Schema(description = "部门名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "AIOTAGRO")
     @NotBlank(message = "部门名称不能为空")
     @Size(max = 30, message = "部门名称长度不能超过 30 个字符")
     private String name;

aagro-module-system/src/main/java/cn/aagro/ag/module/system/controller/admin/dept/vo/dept/DeptSimpleRespVO.java

@@ -1,4 +1,4 @@
-package cn.aagro.pp.module.system.controller.admin.dept.vo.dept;
+package cn.aagro.ag.module.system.controller.admin.dept.vo.dept;
 
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.AllArgsConstructor;
@@ -14,7 +14,7 @@ public class DeptSimpleRespVO {
     @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;
 
     @Schema(description = "父部门 ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024")

aagro-module-system/src/main/java/cn/aagro/ag/module/system/controller/admin/dept/vo/post/PostPageReqVO.java

@@ -1,6 +1,6 @@
-package cn.aagro.pp.module.system.controller.admin.dept.vo.post;
+package cn.aagro.ag.module.system.controller.admin.dept.vo.post;
 
-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;
@@ -13,7 +13,7 @@ public class PostPageReqVO extends PageParam {
     @Schema(description = "岗位编码，模糊匹配", example = "aagro")
     private String code;
 
-    @Schema(description = "岗位名称，模糊匹配", example = "芋道")
+    @Schema(description = "岗位名称，模糊匹配", example = "AIOTAGRO")
     private String name;
 
     @Schema(description = "展示状态，参见 CommonStatusEnum 枚举类", example = "1")

aagro-module-system/src/main/java/cn/aagro/ag/module/system/controller/admin/dept/vo/post/PostRespVO.java

@@ -1,8 +1,8 @@
-package cn.aagro.pp.module.system.controller.admin.dept.vo.post;
+package cn.aagro.ag.module.system.controller.admin.dept.vo.post;
 
-import cn.aagro.pp.framework.excel.core.annotations.DictFormat;
-import cn.aagro.pp.framework.excel.core.convert.DictConvert;
-import cn.aagro.pp.module.system.enums.DictTypeConstants;
+import cn.aagro.ag.framework.excel.core.annotations.DictFormat;
+import cn.aagro.ag.framework.excel.core.convert.DictConvert;
+import cn.aagro.ag.module.system.enums.DictTypeConstants;
 import cn.idev.excel.annotation.ExcelIgnoreUnannotated;
 import cn.idev.excel.annotation.ExcelProperty;
 import io.swagger.v3.oas.annotations.media.Schema;

aagro-module-system/src/main/java/cn/aagro/ag/module/system/controller/admin/dept/vo/post/PostSaveReqVO.java

@@ -1,13 +1,13 @@
-package cn.aagro.pp.module.system.controller.admin.dept.vo.post;
+package cn.aagro.ag.module.system.controller.admin.dept.vo.post;
 
-import cn.aagro.pp.framework.common.enums.CommonStatusEnum;
-import cn.aagro.pp.framework.common.validation.InEnum;
+import cn.aagro.ag.framework.common.enums.CommonStatusEnum;
+import cn.aagro.ag.framework.common.validation.InEnum;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 
-import javax.validation.constraints.NotBlank;
-import javax.validation.constraints.NotNull;
-import javax.validation.constraints.Size;
+import jakarta.validation.constraints.NotBlank;
+import jakarta.validation.constraints.NotNull;
+import jakarta.validation.constraints.Size;
 
 @Schema(description = "管理后台 - 岗位创建/修改 Request VO")
 @Data

aagro-module-system/src/main/java/cn/aagro/ag/module/system/controller/admin/dept/vo/post/PostSimpleRespVO.java

@@ -1,4 +1,4 @@
-package cn.aagro.pp.module.system.controller.admin.dept.vo.post;
+package cn.aagro.ag.module.system.controller.admin.dept.vo.post;
 
 import cn.idev.excel.annotation.ExcelProperty;
 import io.swagger.v3.oas.annotations.media.Schema;

aagro-module-system/src/main/java/cn/aagro/ag/module/system/controller/admin/dict/DictDataController.java

@@ -1,33 +1,33 @@
-package cn.aagro.pp.module.system.controller.admin.dict;
+package cn.aagro.ag.module.system.controller.admin.dict;
 
-import cn.aagro.pp.framework.apilog.core.annotation.ApiAccessLog;
-import cn.aagro.pp.framework.common.enums.CommonStatusEnum;
-import cn.aagro.pp.framework.common.pojo.CommonResult;
-import cn.aagro.pp.framework.common.pojo.PageParam;
-import cn.aagro.pp.framework.common.pojo.PageResult;
-import cn.aagro.pp.framework.common.util.object.BeanUtils;
-import cn.aagro.pp.framework.excel.core.util.ExcelUtils;
-import cn.aagro.pp.module.system.controller.admin.dict.vo.data.DictDataPageReqVO;
-import cn.aagro.pp.module.system.controller.admin.dict.vo.data.DictDataRespVO;
-import cn.aagro.pp.module.system.controller.admin.dict.vo.data.DictDataSaveReqVO;
-import cn.aagro.pp.module.system.controller.admin.dict.vo.data.DictDataSimpleRespVO;
-import cn.aagro.pp.module.system.dal.dataobject.dict.DictDataDO;
-import cn.aagro.pp.module.system.service.dict.DictDataService;
+import cn.aagro.ag.framework.apilog.core.annotation.ApiAccessLog;
+import cn.aagro.ag.framework.common.enums.CommonStatusEnum;
+import cn.aagro.ag.framework.common.pojo.CommonResult;
+import cn.aagro.ag.framework.common.pojo.PageParam;
+import cn.aagro.ag.framework.common.pojo.PageResult;
+import cn.aagro.ag.framework.common.util.object.BeanUtils;
+import cn.aagro.ag.framework.excel.core.util.ExcelUtils;
+import cn.aagro.ag.module.system.controller.admin.dict.vo.data.DictDataPageReqVO;
+import cn.aagro.ag.module.system.controller.admin.dict.vo.data.DictDataRespVO;
+import cn.aagro.ag.module.system.controller.admin.dict.vo.data.DictDataSaveReqVO;
+import cn.aagro.ag.module.system.controller.admin.dict.vo.data.DictDataSimpleRespVO;
+import cn.aagro.ag.module.system.dal.dataobject.dict.DictDataDO;
+import cn.aagro.ag.module.system.service.dict.DictDataService;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.Parameter;
 import io.swagger.v3.oas.annotations.tags.Tag;
+import jakarta.annotation.Resource;
+import jakarta.servlet.http.HttpServletResponse;
+import jakarta.validation.Valid;
 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.servlet.http.HttpServletResponse;
-import javax.validation.Valid;
 import java.io.IOException;
 import java.util.List;
 
-import static cn.aagro.pp.framework.apilog.core.enums.OperateTypeEnum.EXPORT;
-import static cn.aagro.pp.framework.common.pojo.CommonResult.success;
+import static cn.aagro.ag.framework.apilog.core.enums.OperateTypeEnum.EXPORT;
+import static cn.aagro.ag.framework.common.pojo.CommonResult.success;
 
 @Tag(name = "管理后台 - 字典数据")
 @RestController

aagro-module-system/src/main/java/cn/aagro/ag/module/system/controller/admin/dict/DictTypeController.java

@@ -1,32 +1,32 @@
-package cn.aagro.pp.module.system.controller.admin.dict;
+package cn.aagro.ag.module.system.controller.admin.dict;
 
-import cn.aagro.pp.framework.apilog.core.annotation.ApiAccessLog;
-import cn.aagro.pp.framework.common.pojo.CommonResult;
-import cn.aagro.pp.framework.common.pojo.PageParam;
-import cn.aagro.pp.framework.common.pojo.PageResult;
-import cn.aagro.pp.framework.common.util.object.BeanUtils;
-import cn.aagro.pp.framework.excel.core.util.ExcelUtils;
-import cn.aagro.pp.module.system.controller.admin.dict.vo.type.DictTypePageReqVO;
-import cn.aagro.pp.module.system.controller.admin.dict.vo.type.DictTypeRespVO;
-import cn.aagro.pp.module.system.controller.admin.dict.vo.type.DictTypeSaveReqVO;
-import cn.aagro.pp.module.system.controller.admin.dict.vo.type.DictTypeSimpleRespVO;
-import cn.aagro.pp.module.system.dal.dataobject.dict.DictTypeDO;
-import cn.aagro.pp.module.system.service.dict.DictTypeService;
+import cn.aagro.ag.framework.apilog.core.annotation.ApiAccessLog;
+import cn.aagro.ag.framework.common.pojo.CommonResult;
+import cn.aagro.ag.framework.common.pojo.PageParam;
+import cn.aagro.ag.framework.common.pojo.PageResult;
+import cn.aagro.ag.framework.common.util.object.BeanUtils;
+import cn.aagro.ag.framework.excel.core.util.ExcelUtils;
+import cn.aagro.ag.module.system.controller.admin.dict.vo.type.DictTypePageReqVO;
+import cn.aagro.ag.module.system.controller.admin.dict.vo.type.DictTypeRespVO;
+import cn.aagro.ag.module.system.controller.admin.dict.vo.type.DictTypeSaveReqVO;
+import cn.aagro.ag.module.system.controller.admin.dict.vo.type.DictTypeSimpleRespVO;
+import cn.aagro.ag.module.system.dal.dataobject.dict.DictTypeDO;
+import cn.aagro.ag.module.system.service.dict.DictTypeService;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.Parameter;
 import io.swagger.v3.oas.annotations.tags.Tag;
+import jakarta.annotation.Resource;
+import jakarta.servlet.http.HttpServletResponse;
+import jakarta.validation.Valid;
 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.servlet.http.HttpServletResponse;
-import javax.validation.Valid;
 import java.io.IOException;
 import java.util.List;
 
-import static cn.aagro.pp.framework.apilog.core.enums.OperateTypeEnum.EXPORT;
-import static cn.aagro.pp.framework.common.pojo.CommonResult.success;
+import static cn.aagro.ag.framework.apilog.core.enums.OperateTypeEnum.EXPORT;
+import static cn.aagro.ag.framework.common.pojo.CommonResult.success;
 
 @Tag(name = "管理后台 - 字典类型")
 @RestController

aagro-module-system/src/main/java/cn/aagro/ag/module/system/controller/admin/dict/vo/data/DictDataPageReqVO.java

@@ -1,20 +1,20 @@
-package cn.aagro.pp.module.system.controller.admin.dict.vo.data;
+package cn.aagro.ag.module.system.controller.admin.dict.vo.data;
 
-import cn.aagro.pp.framework.common.enums.CommonStatusEnum;
-import cn.aagro.pp.framework.common.pojo.PageParam;
-import cn.aagro.pp.framework.common.validation.InEnum;
+import cn.aagro.ag.framework.common.enums.CommonStatusEnum;
+import cn.aagro.ag.framework.common.pojo.PageParam;
+import cn.aagro.ag.framework.common.validation.InEnum;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
-import javax.validation.constraints.Size;
+import jakarta.validation.constraints.Size;
 
 @Schema(description = "管理后台 - 字典类型分页列表 Request VO")
 @Data
 @EqualsAndHashCode(callSuper = true)
 public class DictDataPageReqVO extends PageParam {
 
-    @Schema(description = "字典标签", example = "芋道")
+    @Schema(description = "字典标签", example = "AIOTAGRO")
     @Size(max = 100, message = "字典标签长度不能超过100个字符")
     private String label;
 

aagro-module-system/src/main/java/cn/aagro/ag/module/system/controller/admin/dict/vo/data/DictDataRespVO.java

@@ -1,8 +1,8 @@
-package cn.aagro.pp.module.system.controller.admin.dict.vo.data;
+package cn.aagro.ag.module.system.controller.admin.dict.vo.data;
 
-import cn.aagro.pp.framework.excel.core.annotations.DictFormat;
-import cn.aagro.pp.framework.excel.core.convert.DictConvert;
-import cn.aagro.pp.module.system.enums.DictTypeConstants;
+import cn.aagro.ag.framework.excel.core.annotations.DictFormat;
+import cn.aagro.ag.framework.excel.core.convert.DictConvert;
+import cn.aagro.ag.module.system.enums.DictTypeConstants;
 import cn.idev.excel.annotation.ExcelIgnoreUnannotated;
 import cn.idev.excel.annotation.ExcelProperty;
 import io.swagger.v3.oas.annotations.media.Schema;
@@ -23,7 +23,7 @@ public class DictDataRespVO {
     @ExcelProperty("字典排序")
     private Integer sort;
 
-    @Schema(description = "字典标签", requiredMode = Schema.RequiredMode.REQUIRED, example = "芋道")
+    @Schema(description = "字典标签", requiredMode = Schema.RequiredMode.REQUIRED, example = "AIOTAGRO")
     @ExcelProperty("字典标签")
     private String label;
 

aagro-module-system/src/main/java/cn/aagro/ag/module/system/controller/admin/dict/vo/data/DictDataSaveReqVO.java

@@ -1,13 +1,13 @@
-package cn.aagro.pp.module.system.controller.admin.dict.vo.data;
+package cn.aagro.ag.module.system.controller.admin.dict.vo.data;
 
-import cn.aagro.pp.framework.common.enums.CommonStatusEnum;
-import cn.aagro.pp.framework.common.validation.InEnum;
+import cn.aagro.ag.framework.common.enums.CommonStatusEnum;
+import cn.aagro.ag.framework.common.validation.InEnum;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 
-import javax.validation.constraints.NotBlank;
-import javax.validation.constraints.NotNull;
-import javax.validation.constraints.Size;
+import jakarta.validation.constraints.NotBlank;
+import jakarta.validation.constraints.NotNull;
+import jakarta.validation.constraints.Size;
 
 @Schema(description = "管理后台 - 字典数据创建/修改 Request VO")
 @Data
@@ -20,7 +20,7 @@ public class DictDataSaveReqVO {
     @NotNull(message = "显示顺序不能为空")
     private Integer sort;
 
-    @Schema(description = "字典标签", requiredMode = Schema.RequiredMode.REQUIRED, example = "芋道")
+    @Schema(description = "字典标签", requiredMode = Schema.RequiredMode.REQUIRED, example = "AIOTAGRO")
     @NotBlank(message = "字典标签不能为空")
     @Size(max = 100, message = "字典标签长度不能超过100个字符")
     private String label;

aagro-module-system/src/main/java/cn/aagro/ag/module/system/controller/admin/dict/vo/data/DictDataSimpleRespVO.java

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

aagro-module-system/src/main/java/cn/aagro/ag/module/system/controller/admin/dict/vo/type/DictTypePageReqVO.java

@@ -1,22 +1,22 @@
-package cn.aagro.pp.module.system.controller.admin.dict.vo.type;
+package cn.aagro.ag.module.system.controller.admin.dict.vo.type;
 
-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 org.springframework.format.annotation.DateTimeFormat;
 
-import javax.validation.constraints.Size;
+import jakarta.validation.constraints.Size;
 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
 @EqualsAndHashCode(callSuper = true)
 public class DictTypePageReqVO extends PageParam {
 
-    @Schema(description = "字典类型名称，模糊匹配", example = "芋道")
+    @Schema(description = "字典类型名称，模糊匹配", example = "AIOTAGRO")
     private String name;
 
     @Schema(description = "字典类型，模糊匹配", example = "sys_common_sex")

aagro-module-system/src/main/java/cn/aagro/ag/module/system/controller/admin/dict/vo/type/DictTypeRespVO.java

@@ -1,8 +1,8 @@
-package cn.aagro.pp.module.system.controller.admin.dict.vo.type;
+package cn.aagro.ag.module.system.controller.admin.dict.vo.type;
 
-import cn.aagro.pp.framework.excel.core.annotations.DictFormat;
-import cn.aagro.pp.framework.excel.core.convert.DictConvert;
-import cn.aagro.pp.module.system.enums.DictTypeConstants;
+import cn.aagro.ag.framework.excel.core.annotations.DictFormat;
+import cn.aagro.ag.framework.excel.core.convert.DictConvert;
+import cn.aagro.ag.module.system.enums.DictTypeConstants;
 import cn.idev.excel.annotation.ExcelIgnoreUnannotated;
 import cn.idev.excel.annotation.ExcelProperty;
 import io.swagger.v3.oas.annotations.media.Schema;

aagro-module-system/src/main/java/cn/aagro/ag/module/system/controller/admin/dict/vo/type/DictTypeSaveReqVO.java

@@ -1,11 +1,11 @@
-package cn.aagro.pp.module.system.controller.admin.dict.vo.type;
+package cn.aagro.ag.module.system.controller.admin.dict.vo.type;
 
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 
-import javax.validation.constraints.NotBlank;
-import javax.validation.constraints.NotNull;
-import javax.validation.constraints.Size;
+import jakarta.validation.constraints.NotBlank;
+import jakarta.validation.constraints.NotNull;
+import jakarta.validation.constraints.Size;
 
 @Schema(description = "管理后台 - 字典类型创建/修改 Request VO")
 @Data

aagro-module-system/src/main/java/cn/aagro/ag/module/system/controller/admin/dict/vo/type/DictTypeSimpleRespVO.java

@@ -1,4 +1,4 @@
-package cn.aagro.pp.module.system.controller.admin.dict.vo.type;
+package cn.aagro.ag.module.system.controller.admin.dict.vo.type;
 
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
@@ -10,7 +10,7 @@ public class DictTypeSimpleRespVO {
     @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;
 
     @Schema(description = "字典类型", requiredMode = Schema.RequiredMode.REQUIRED, example = "sys_common_sex")

aagro-module-system/src/main/java/cn/aagro/ag/module/system/controller/admin/ip/AreaController.java

@@ -1,12 +1,12 @@
-package cn.aagro.pp.module.system.controller.admin.ip;
+package cn.aagro.ag.module.system.controller.admin.ip;
 
 import cn.hutool.core.lang.Assert;
-import cn.aagro.pp.framework.common.pojo.CommonResult;
-import cn.aagro.pp.framework.common.util.object.BeanUtils;
-import cn.aagro.pp.framework.ip.core.Area;
-import cn.aagro.pp.framework.ip.core.utils.AreaUtils;
-import cn.aagro.pp.framework.ip.core.utils.IPUtils;
-import cn.aagro.pp.module.system.controller.admin.ip.vo.AreaNodeRespVO;
+import cn.aagro.ag.framework.common.pojo.CommonResult;
+import cn.aagro.ag.framework.common.util.object.BeanUtils;
+import cn.aagro.ag.framework.ip.core.Area;
+import cn.aagro.ag.framework.ip.core.utils.AreaUtils;
+import cn.aagro.ag.framework.ip.core.utils.IPUtils;
+import cn.aagro.ag.module.system.controller.admin.ip.vo.AreaNodeRespVO;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.Parameter;
 import io.swagger.v3.oas.annotations.tags.Tag;
@@ -18,7 +18,7 @@ import org.springframework.web.bind.annotation.RestController;
 
 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-system/src/main/java/cn/aagro/ag/module/system/controller/admin/ip/vo/AreaNodeRespVO.java

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

aagro-module-system/src/main/java/cn/aagro/ag/module/system/controller/admin/logger/LoginLogController.java

@@ -1,31 +1,31 @@
-package cn.aagro.pp.module.system.controller.admin.logger;
+package cn.aagro.ag.module.system.controller.admin.logger;
 
-import cn.aagro.pp.framework.apilog.core.annotation.ApiAccessLog;
-import cn.aagro.pp.framework.common.pojo.CommonResult;
-import cn.aagro.pp.framework.common.pojo.PageParam;
-import cn.aagro.pp.framework.common.pojo.PageResult;
-import cn.aagro.pp.framework.common.util.object.BeanUtils;
-import cn.aagro.pp.framework.excel.core.util.ExcelUtils;
-import cn.aagro.pp.module.system.controller.admin.logger.vo.loginlog.LoginLogPageReqVO;
-import cn.aagro.pp.module.system.controller.admin.logger.vo.loginlog.LoginLogRespVO;
-import cn.aagro.pp.module.system.dal.dataobject.logger.LoginLogDO;
-import cn.aagro.pp.module.system.service.logger.LoginLogService;
+import cn.aagro.ag.framework.apilog.core.annotation.ApiAccessLog;
+import cn.aagro.ag.framework.common.pojo.CommonResult;
+import cn.aagro.ag.framework.common.pojo.PageParam;
+import cn.aagro.ag.framework.common.pojo.PageResult;
+import cn.aagro.ag.framework.common.util.object.BeanUtils;
+import cn.aagro.ag.framework.excel.core.util.ExcelUtils;
+import cn.aagro.ag.module.system.controller.admin.logger.vo.loginlog.LoginLogPageReqVO;
+import cn.aagro.ag.module.system.controller.admin.logger.vo.loginlog.LoginLogRespVO;
+import cn.aagro.ag.module.system.dal.dataobject.logger.LoginLogDO;
+import cn.aagro.ag.module.system.service.logger.LoginLogService;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
+import jakarta.annotation.Resource;
+import jakarta.servlet.http.HttpServletResponse;
+import jakarta.validation.Valid;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.validation.annotation.Validated;
 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 javax.servlet.http.HttpServletResponse;
-import javax.validation.Valid;
 import java.io.IOException;
 import java.util.List;
 
-import static cn.aagro.pp.framework.apilog.core.enums.OperateTypeEnum.EXPORT;
-import static cn.aagro.pp.framework.common.pojo.CommonResult.success;
+import static cn.aagro.ag.framework.apilog.core.enums.OperateTypeEnum.EXPORT;
+import static cn.aagro.ag.framework.common.pojo.CommonResult.success;
 
 @Tag(name = "管理后台 - 登录日志")
 @RestController

aagro-module-system/src/main/java/cn/aagro/ag/module/system/controller/admin/logger/OperateLogController.java

@@ -1,33 +1,33 @@
-package cn.aagro.pp.module.system.controller.admin.logger;
+package cn.aagro.ag.module.system.controller.admin.logger;
 
-import cn.aagro.pp.framework.apilog.core.annotation.ApiAccessLog;
-import cn.aagro.pp.framework.common.pojo.CommonResult;
-import cn.aagro.pp.framework.common.pojo.PageParam;
-import cn.aagro.pp.framework.common.pojo.PageResult;
-import cn.aagro.pp.framework.common.util.object.BeanUtils;
-import cn.aagro.pp.framework.excel.core.util.ExcelUtils;
-import cn.aagro.pp.framework.translate.core.TranslateUtils;
-import cn.aagro.pp.module.system.controller.admin.logger.vo.operatelog.OperateLogPageReqVO;
-import cn.aagro.pp.module.system.controller.admin.logger.vo.operatelog.OperateLogRespVO;
-import cn.aagro.pp.module.system.dal.dataobject.logger.OperateLogDO;
-import cn.aagro.pp.module.system.service.logger.OperateLogService;
+import cn.aagro.ag.framework.apilog.core.annotation.ApiAccessLog;
+import cn.aagro.ag.framework.common.pojo.CommonResult;
+import cn.aagro.ag.framework.common.pojo.PageParam;
+import cn.aagro.ag.framework.common.pojo.PageResult;
+import cn.aagro.ag.framework.common.util.object.BeanUtils;
+import cn.aagro.ag.framework.excel.core.util.ExcelUtils;
+import cn.aagro.ag.framework.translate.core.TranslateUtils;
+import cn.aagro.ag.module.system.controller.admin.logger.vo.operatelog.OperateLogPageReqVO;
+import cn.aagro.ag.module.system.controller.admin.logger.vo.operatelog.OperateLogRespVO;
+import cn.aagro.ag.module.system.dal.dataobject.logger.OperateLogDO;
+import cn.aagro.ag.module.system.service.logger.OperateLogService;
 import com.fhs.core.trans.anno.TransMethodResult;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
+import jakarta.annotation.Resource;
+import jakarta.servlet.http.HttpServletResponse;
+import jakarta.validation.Valid;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.validation.annotation.Validated;
 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 javax.servlet.http.HttpServletResponse;
-import javax.validation.Valid;
 import java.io.IOException;
 import java.util.List;
 
-import static cn.aagro.pp.framework.apilog.core.enums.OperateTypeEnum.EXPORT;
-import static cn.aagro.pp.framework.common.pojo.CommonResult.success;
+import static cn.aagro.ag.framework.apilog.core.enums.OperateTypeEnum.EXPORT;
+import static cn.aagro.ag.framework.common.pojo.CommonResult.success;
 
 @Tag(name = "管理后台 - 操作日志")
 @RestController

aagro-module-system/src/main/java/cn/aagro/ag/module/system/controller/admin/logger/vo/loginlog/LoginLogPageReqVO.java

@@ -1,6 +1,6 @@
-package cn.aagro.pp.module.system.controller.admin.logger.vo.loginlog;
+package cn.aagro.ag.module.system.controller.admin.logger.vo.loginlog;
 
-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;
@@ -8,7 +8,7 @@ import org.springframework.format.annotation.DateTimeFormat;
 
 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
@@ -18,7 +18,7 @@ public class LoginLogPageReqVO extends PageParam {
     @Schema(description = "用户 IP，模拟匹配", example = "127.0.0.1")
     private String userIp;
 
-    @Schema(description = "用户账号，模拟匹配", example = "芋道")
+    @Schema(description = "用户账号，模拟匹配", example = "AIOTAGRO")
     private String username;
 
     @Schema(description = "操作状态", example = "true")

aagro-module-system/src/main/java/cn/aagro/ag/module/system/controller/admin/logger/vo/loginlog/LoginLogRespVO.java

@@ -1,8 +1,8 @@
-package cn.aagro.pp.module.system.controller.admin.logger.vo.loginlog;
+package cn.aagro.ag.module.system.controller.admin.logger.vo.loginlog;
 
-import cn.aagro.pp.framework.excel.core.annotations.DictFormat;
-import cn.aagro.pp.framework.excel.core.convert.DictConvert;
-import cn.aagro.pp.module.system.enums.DictTypeConstants;
+import cn.aagro.ag.framework.excel.core.annotations.DictFormat;
+import cn.aagro.ag.framework.excel.core.convert.DictConvert;
+import cn.aagro.ag.module.system.enums.DictTypeConstants;
 import cn.idev.excel.annotation.ExcelIgnoreUnannotated;
 import cn.idev.excel.annotation.ExcelProperty;
 import io.swagger.v3.oas.annotations.media.Schema;

aagro-module-system/src/main/java/cn/aagro/ag/module/system/controller/admin/logger/vo/operatelog/OperateLogPageReqVO.java

@@ -1,19 +1,19 @@
-package cn.aagro.pp.module.system.controller.admin.logger.vo.operatelog;
+package cn.aagro.ag.module.system.controller.admin.logger.vo.operatelog;
 
-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 org.springframework.format.annotation.DateTimeFormat;
 
 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
 public class OperateLogPageReqVO extends PageParam {
 
-    @Schema(description = "用户编号", example = "芋道")
+    @Schema(description = "用户编号", example = "AIOTAGRO")
     private Long userId;
 
     @Schema(description = "操作模块业务编号", example = "1")

aagro-module-system/src/main/java/cn/aagro/ag/module/system/controller/admin/logger/vo/operatelog/OperateLogRespVO.java

@@ -1,15 +1,15 @@
-package cn.aagro.pp.module.system.controller.admin.logger.vo.operatelog;
+package cn.aagro.ag.module.system.controller.admin.logger.vo.operatelog;
 
-import cn.aagro.pp.module.system.dal.dataobject.user.AdminUserDO;
+import cn.aagro.ag.module.system.dal.dataobject.user.AdminUserDO;
 import cn.idev.excel.annotation.ExcelIgnoreUnannotated;
 import cn.idev.excel.annotation.ExcelProperty;
 import com.fhs.core.trans.anno.Trans;
 import com.fhs.core.trans.constant.TransType;
 import com.fhs.core.trans.vo.VO;
 import io.swagger.v3.oas.annotations.media.Schema;
+import jakarta.validation.constraints.NotEmpty;
 import lombok.Data;
 
-import javax.validation.constraints.NotEmpty;
 import java.time.LocalDateTime;
 
 @Schema(description = "管理后台 - 操作日志 Response VO")
@@ -43,7 +43,7 @@ public class OperateLogRespVO implements VO {
     @ExcelProperty("操作模块业务编号")
     private Long bizId;
 
-    @Schema(description = "操作明细", example = "修改编号为 1 的用户信息，将性别从男改成女，将姓名从芋道改成源码。")
+    @Schema(description = "操作明细", example = "修改编号为 1 的用户信息，将性别从男改成女，将姓名从AIOTAGRO改成源码。")
     private String action;
 
     @Schema(description = "拓展字段", example = "{'orderId': 1}")

aagro-module-system/src/main/java/cn/aagro/ag/module/system/controller/admin/mail/MailAccountController.java

@@ -1,26 +1,26 @@
-package cn.aagro.pp.module.system.controller.admin.mail;
+package cn.aagro.ag.module.system.controller.admin.mail;
 
 
-import cn.aagro.pp.framework.common.pojo.CommonResult;
-import cn.aagro.pp.framework.common.pojo.PageResult;
-import cn.aagro.pp.framework.common.util.object.BeanUtils;
-import cn.aagro.pp.module.system.controller.admin.mail.vo.account.MailAccountPageReqVO;
-import cn.aagro.pp.module.system.controller.admin.mail.vo.account.MailAccountRespVO;
-import cn.aagro.pp.module.system.controller.admin.mail.vo.account.MailAccountSaveReqVO;
-import cn.aagro.pp.module.system.controller.admin.mail.vo.account.MailAccountSimpleRespVO;
-import cn.aagro.pp.module.system.dal.dataobject.mail.MailAccountDO;
-import cn.aagro.pp.module.system.service.mail.MailAccountService;
+import cn.aagro.ag.framework.common.pojo.CommonResult;
+import cn.aagro.ag.framework.common.pojo.PageResult;
+import cn.aagro.ag.framework.common.util.object.BeanUtils;
+import cn.aagro.ag.module.system.controller.admin.mail.vo.account.MailAccountPageReqVO;
+import cn.aagro.ag.module.system.controller.admin.mail.vo.account.MailAccountRespVO;
+import cn.aagro.ag.module.system.controller.admin.mail.vo.account.MailAccountSaveReqVO;
+import cn.aagro.ag.module.system.controller.admin.mail.vo.account.MailAccountSimpleRespVO;
+import cn.aagro.ag.module.system.dal.dataobject.mail.MailAccountDO;
+import cn.aagro.ag.module.system.service.mail.MailAccountService;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.Parameter;
 import io.swagger.v3.oas.annotations.tags.Tag;
+import jakarta.annotation.Resource;
+import jakarta.validation.Valid;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
 
-import javax.annotation.Resource;
-import javax.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