Ver código fonte

修改包名为yushu

luoguangyi 3 anos atrás
pai
commit
1d1ec05e8d
100 arquivos alterados com 302 adições e 290 exclusões
  1. 1 0
      .gitignore
  2. 7 7
      iot-admin-server/pom.xml
  3. 1 1
      iot-admin-server/src/main/java/com/persagy/AdminServerApplication.java
  4. 1 1
      iot-admin-server/src/main/java/com/persagy/framework/async/config/AsyncConfiguration.java
  5. 1 1
      iot-admin-server/src/main/java/com/persagy/framework/monitor/config/AdminServerConfiguration.java
  6. 1 1
      iot-admin-server/src/main/java/com/persagy/modules/infra/codegen/config/CodegenConfiguration.java
  7. 1 1
      iot-admin-server/src/main/java/com/persagy/modules/infra/codegen/config/CodegenProperties.java
  8. 2 2
      iot-admin-server/src/main/java/com/persagy/modules/infra/controller/doc/InfDbDocController.java
  9. 2 2
      iot-admin-server/src/main/java/com/persagy/modules/infra/enums/InfErrorCodeConstants.java
  10. 2 2
      iot-admin-server/src/main/java/com/persagy/modules/infra/enums/SysErrorCodeConstants.java
  11. 17 17
      iot-admin-server/src/main/java/com/persagy/modules/tool/controller/codegen/ToolCodegenController.java
  12. 3 3
      iot-admin-server/src/main/java/com/persagy/modules/tool/controller/codegen/vo/ToolCodegenDetailRespVO.java
  13. 1 1
      iot-admin-server/src/main/java/com/persagy/modules/tool/controller/codegen/vo/ToolCodegenPreviewRespVO.java
  14. 3 3
      iot-admin-server/src/main/java/com/persagy/modules/tool/controller/codegen/vo/ToolCodegenUpdateReqVO.java
  15. 1 1
      iot-admin-server/src/main/java/com/persagy/modules/tool/controller/codegen/vo/column/ToolCodegenColumnBaseVO.java
  16. 1 1
      iot-admin-server/src/main/java/com/persagy/modules/tool/controller/codegen/vo/column/ToolCodegenColumnRespVO.java
  17. 1 1
      iot-admin-server/src/main/java/com/persagy/modules/tool/controller/codegen/vo/table/ToolCodegenTableBaseVO.java
  18. 3 3
      iot-admin-server/src/main/java/com/persagy/modules/tool/controller/codegen/vo/table/ToolCodegenTablePageReqVO.java
  19. 1 1
      iot-admin-server/src/main/java/com/persagy/modules/tool/controller/codegen/vo/table/ToolCodegenTableRespVO.java
  20. 1 1
      iot-admin-server/src/main/java/com/persagy/modules/tool/controller/codegen/vo/table/ToolSchemaTableRespVO.java
  21. 0 0
      iot-admin-server/src/main/java/com/yushu/modules/tool/controller/test/ToolTestDemoController.http
  22. 9 9
      iot-admin-server/src/main/java/com/persagy/modules/tool/controller/test/ToolTestDemoController.java
  23. 1 1
      iot-admin-server/src/main/java/com/persagy/modules/tool/controller/test/vo/ToolTestDemoBaseVO.java
  24. 1 1
      iot-admin-server/src/main/java/com/persagy/modules/tool/controller/test/vo/ToolTestDemoCreateReqVO.java
  25. 1 1
      iot-admin-server/src/main/java/com/persagy/modules/tool/controller/test/vo/ToolTestDemoExcelVO.java
  26. 2 2
      iot-admin-server/src/main/java/com/persagy/modules/tool/controller/test/vo/ToolTestDemoExportReqVO.java
  27. 3 3
      iot-admin-server/src/main/java/com/persagy/modules/tool/controller/test/vo/ToolTestDemoPageReqVO.java
  28. 1 1
      iot-admin-server/src/main/java/com/persagy/modules/tool/controller/test/vo/ToolTestDemoRespVO.java
  29. 1 1
      iot-admin-server/src/main/java/com/persagy/modules/tool/controller/test/vo/ToolTestDemoUpdateReqVO.java
  30. 13 13
      iot-admin-server/src/main/java/com/persagy/modules/tool/convert/codegen/ToolCodegenConvert.java
  31. 8 8
      iot-admin-server/src/main/java/com/persagy/modules/tool/convert/test/ToolTestDemoConvert.java
  32. 4 4
      iot-admin-server/src/main/java/com/persagy/modules/tool/dal/dataobject/codegen/ToolCodegenColumnDO.java
  33. 3 3
      iot-admin-server/src/main/java/com/persagy/modules/tool/dal/dataobject/codegen/ToolCodegenTableDO.java
  34. 1 1
      iot-admin-server/src/main/java/com/persagy/modules/tool/dal/dataobject/codegen/ToolSchemaColumnDO.java
  35. 1 1
      iot-admin-server/src/main/java/com/persagy/modules/tool/dal/dataobject/codegen/ToolSchemaTableDO.java
  36. 2 2
      iot-admin-server/src/main/java/com/persagy/modules/tool/dal/dataobject/test/ToolTestDemoDO.java
  37. 3 3
      iot-admin-server/src/main/java/com/persagy/modules/tool/dal/mysql/codegen/ToolCodegenColumnMapper.java
  38. 6 6
      iot-admin-server/src/main/java/com/persagy/modules/tool/dal/mysql/codegen/ToolCodegenTableMapper.java
  39. 3 3
      iot-admin-server/src/main/java/com/persagy/modules/tool/dal/mysql/codegen/ToolSchemaColumnMapper.java
  40. 4 4
      iot-admin-server/src/main/java/com/persagy/modules/tool/dal/mysql/codegen/ToolSchemaTableMapper.java
  41. 7 7
      iot-admin-server/src/main/java/com/persagy/modules/tool/dal/mysql/test/ToolTestDemoMapper.java
  42. 1 1
      iot-admin-server/src/main/java/com/persagy/modules/tool/enums/ToolDictTypeConstants.java
  43. 2 2
      iot-admin-server/src/main/java/com/persagy/modules/tool/enums/ToolErrorCodeConstants.java
  44. 1 1
      iot-admin-server/src/main/java/com/persagy/modules/tool/enums/codegen/ToolCodegenColumnHtmlTypeEnum.java
  45. 1 1
      iot-admin-server/src/main/java/com/persagy/modules/tool/enums/codegen/ToolCodegenColumnListConditionEnum.java
  46. 1 1
      iot-admin-server/src/main/java/com/persagy/modules/tool/enums/codegen/ToolCodegenImportTypeEnum.java
  47. 1 1
      iot-admin-server/src/main/java/com/persagy/modules/tool/enums/codegen/ToolCodegenTemplateTypeEnum.java
  48. 6 6
      iot-admin-server/src/main/java/com/persagy/modules/tool/framework/errorcode/config/ErrorCodeConfiguration.java
  49. 1 1
      iot-admin-server/src/main/java/com/persagy/modules/tool/framework/errorcode/config/ErrorCodeProperties.java
  50. 1 1
      iot-admin-server/src/main/java/com/persagy/modules/tool/framework/errorcode/core/dto/ErrorCodeAutoGenerateReqDTO.java
  51. 1 1
      iot-admin-server/src/main/java/com/persagy/modules/tool/framework/errorcode/core/dto/ErrorCodeRespDTO.java
  52. 1 1
      iot-admin-server/src/main/java/com/persagy/modules/tool/framework/errorcode/core/generator/ErrorCodeAutoGenerator.java
  53. 4 4
      iot-admin-server/src/main/java/com/persagy/modules/tool/framework/errorcode/core/generator/ErrorCodeAutoGeneratorImpl.java
  54. 2 2
      iot-admin-server/src/main/java/com/persagy/modules/tool/framework/errorcode/core/loader/ErrorCodeLoader.java
  55. 4 4
      iot-admin-server/src/main/java/com/persagy/modules/tool/framework/errorcode/core/loader/ErrorCodeLoaderImpl.java
  56. 3 3
      iot-admin-server/src/main/java/com/persagy/modules/tool/framework/errorcode/core/service/ErrorCodeFrameworkService.java
  57. 8 8
      iot-admin-server/src/main/java/com/persagy/modules/tool/service/codegen/ToolCodegenService.java
  58. 10 10
      iot-admin-server/src/main/java/com/persagy/modules/tool/service/codegen/impl/ToolCodegenBuilder.java
  59. 14 14
      iot-admin-server/src/main/java/com/persagy/modules/tool/service/codegen/impl/ToolCodegenEngine.java
  60. 3 3
      iot-admin-server/src/main/java/com/persagy/modules/tool/service/codegen/impl/ToolCodegenSQLParser.java
  61. 19 19
      iot-admin-server/src/main/java/com/persagy/modules/tool/service/codegen/impl/ToolCodegenServiceImpl.java
  62. 7 7
      iot-admin-server/src/main/java/com/persagy/modules/tool/service/test/ToolTestDemoService.java
  63. 12 12
      iot-admin-server/src/main/java/com/persagy/modules/tool/service/test/impl/ToolTestDemoServiceImpl.java
  64. 3 3
      iot-admin-server/src/main/resources/application.yaml
  65. 2 1
      iot-common/pom.xml
  66. 1 1
      iot-common/src/main/java/com.persagy/framework/common/core/IntArrayValuable.java
  67. 1 1
      iot-common/src/main/java/com.persagy/framework/common/core/KeyValue.java
  68. 3 3
      iot-common/src/main/java/com.persagy/framework/common/exception/ErrorCode.java
  69. 2 2
      iot-common/src/main/java/com.persagy/framework/common/exception/ServiceException.java
  70. 2 2
      iot-common/src/main/java/com.persagy/framework/common/exception/enums/GlobalErrorCodeConstants.java
  71. 1 1
      iot-common/src/main/java/com.persagy/framework/common/exception/enums/ServiceErrorCodeRange.java
  72. 3 3
      iot-common/src/main/java/com.persagy/framework/common/exception/util/ServiceExceptionUtil.java
  73. 4 4
      iot-common/src/main/java/com.persagy/framework/common/pojo/CommonResult.java
  74. 1 1
      iot-common/src/main/java/com.persagy/framework/common/pojo/PageParam.java
  75. 1 1
      iot-common/src/main/java/com.persagy/framework/common/pojo/PageResult.java
  76. 1 1
      iot-common/src/main/java/com.persagy/framework/common/pojo/SortingField.java
  77. 1 1
      iot-common/src/main/java/com.persagy/framework/common/test/WebFilterOrderEnum.java
  78. 1 1
      iot-common/src/main/java/com.persagy/framework/common/util/collection/ArrayUtils.java
  79. 1 1
      iot-common/src/main/java/com.persagy/framework/common/util/collection/CollectionUtils.java
  80. 2 2
      iot-common/src/main/java/com.persagy/framework/common/util/collection/MapUtils.java
  81. 1 1
      iot-common/src/main/java/com.persagy/framework/common/util/collection/SetUtils.java
  82. 2 2
      iot-common/src/main/java/com.persagy/framework/common/util/date/DateUtils.java
  83. 1 1
      iot-common/src/main/java/com/persagy/framework/common/util/io/FileUtils.java
  84. 3 3
      iot-common/src/main/java/com.persagy/framework/common/util/json/FastJsonUtil.java
  85. 1 1
      iot-common/src/main/java/com.persagy/framework/common/util/json/JsonUtils.java
  86. 1 1
      iot-common/src/main/java/com.persagy/framework/common/util/monitor/TracerUtils.java
  87. 1 1
      iot-common/src/main/java/com.persagy/framework/common/util/object/ObjectUtils.java
  88. 2 2
      iot-common/src/main/java/com.persagy/framework/common/util/servlet/ServletUtils.java
  89. 1 1
      iot-common/src/main/java/com.persagy/framework/common/util/sping/SpringAopUtils.java
  90. 1 1
      iot-common/src/main/java/com.persagy/framework/common/util/sping/SpringExpressionUtils.java
  91. 1 1
      iot-common/src/main/java/com.persagy/framework/common/util/string/StrUtils.java
  92. 2 2
      iot-common/src/main/java/com.persagy/framework/common/validation/InEnum.java
  93. 2 2
      iot-common/src/main/java/com.persagy/framework/common/validation/InEnumValidator.java
  94. 17 7
      iot-dependencies/pom.xml
  95. 2 2
      iot-spring-boot-starter-excel/pom.xml
  96. 2 2
      iot-spring-boot-starter-excel/src/main/java/com.persagy.framework.excel.core.convert/JsonConvert.java
  97. 1 1
      iot-spring-boot-starter-excel/src/main/java/com.persagy.framework.excel.core.util/ExcelListener.java
  98. 1 1
      iot-spring-boot-starter-excel/src/main/java/com.persagy.framework.excel.core.util/ExcelUtils.java
  99. 2 2
      iot-spring-boot-starter-extension/pom.xml
  100. 0 0
      iot-spring-boot-starter-extension/src/main/java/com/persagy/framework/extension/core/package-info.java

+ 1 - 0
.gitignore

@@ -31,3 +31,4 @@ build/
 .vscode/
 demo/
 rebel.xml
+spring-cloud-alibaba-examples/

+ 7 - 7
iot-admin-server/pom.xml

@@ -3,7 +3,7 @@
          xmlns="http://maven.apache.org/POM/4.0.0"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
-        <groupId>com.persagy</groupId>
+        <groupId>com.yushu</groupId>
         <artifactId>iot</artifactId>
         <version>${revision}</version>
     </parent>
@@ -19,7 +19,7 @@
 
         <!-- Web 相关 -->
         <dependency>
-            <groupId>com.persagy</groupId>
+            <groupId>com.yushu</groupId>
             <artifactId>iot-spring-boot-starter-web</artifactId>
         </dependency>
         <!-- spring boot 配置所需依赖 -->
@@ -31,18 +31,18 @@
 
         <!-- DB 相关 -->
         <dependency>
-            <groupId>com.persagy</groupId>
+            <groupId>com.yushu</groupId>
             <artifactId>iot-spring-boot-starter-mybatis</artifactId>
         </dependency>
 
         <!--        <dependency>-->
-        <!--            <groupId>com.persagy</groupId>-->
+        <!--            <groupId>com.yushu</groupId>-->
         <!--            <artifactId>iot-spring-boot-starter-redis</artifactId>-->
         <!--        </dependency>-->
 
         <!-- 监控相关 -->
         <!--        <dependency>-->
-        <!--            <groupId>com.persagy</groupId>-->
+        <!--            <groupId>com.yushu</groupId>-->
         <!--            <artifactId>iot-spring-boot-starter-monitor</artifactId>-->
         <!--        </dependency>-->
 
@@ -53,14 +53,14 @@
 
         <!-- Test 测试相关 -->
         <dependency>
-            <groupId>com.persagy</groupId>
+            <groupId>com.yushu</groupId>
             <artifactId>iot-spring-boot-starter-test</artifactId>
             <scope>test</scope>
         </dependency>
 
         <!-- 工具类相关 -->
         <dependency>
-            <groupId>com.persagy</groupId>
+            <groupId>com.yushu</groupId>
             <artifactId>iot-spring-boot-starter-excel</artifactId>
         </dependency>
 

+ 1 - 1
iot-admin-server/src/main/java/com/persagy/AdminServerApplication.java

@@ -1,4 +1,4 @@
-package com.persagy;
+package com.yushu;
 
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;

+ 1 - 1
iot-admin-server/src/main/java/com/persagy/framework/async/config/AsyncConfiguration.java

@@ -1,4 +1,4 @@
-package com.persagy.framework.async.config;
+package com.yushu.framework.async.config;
 
 import org.springframework.context.annotation.Configuration;
 import org.springframework.scheduling.annotation.EnableAsync;

+ 1 - 1
iot-admin-server/src/main/java/com/persagy/framework/monitor/config/AdminServerConfiguration.java

@@ -1,4 +1,4 @@
-package com.persagy.framework.monitor.config;
+package com.yushu.framework.monitor.config;
 
 import de.codecentric.boot.admin.server.config.EnableAdminServer;
 import org.springframework.context.annotation.Configuration;

+ 1 - 1
iot-admin-server/src/main/java/com/persagy/modules/infra/codegen/config/CodegenConfiguration.java

@@ -1,4 +1,4 @@
-package com.persagy.modules.infra.codegen.config;
+package com.yushu.modules.infra.codegen.config;
 
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.context.annotation.Configuration;

+ 1 - 1
iot-admin-server/src/main/java/com/persagy/modules/infra/codegen/config/CodegenProperties.java

@@ -1,4 +1,4 @@
-package com.persagy.modules.infra.codegen.config;
+package com.yushu.modules.infra.codegen.config;
 
 import lombok.Data;
 import org.springframework.boot.context.properties.ConfigurationProperties;

+ 2 - 2
iot-admin-server/src/main/java/com/persagy/modules/infra/controller/doc/InfDbDocController.java

@@ -1,4 +1,4 @@
-package com.persagy.modules.infra.controller.doc;
+package com.yushu.modules.infra.controller.doc;
 
 import cn.hutool.core.io.FileUtil;
 import cn.hutool.core.util.IdUtil;
@@ -10,7 +10,7 @@ import cn.smallbun.screw.core.execute.DocumentationExecute;
 import cn.smallbun.screw.core.process.ProcessConfig;
 import com.baomidou.dynamic.datasource.spring.boot.autoconfigure.DataSourceProperty;
 import com.baomidou.dynamic.datasource.spring.boot.autoconfigure.DynamicDataSourceProperties;
-import com.persagy.framework.common.util.servlet.ServletUtils;
+import com.yushu.framework.common.util.servlet.ServletUtils;
 import com.zaxxer.hikari.HikariConfig;
 import com.zaxxer.hikari.HikariDataSource;
 import io.swagger.annotations.Api;

+ 2 - 2
iot-admin-server/src/main/java/com/persagy/modules/infra/enums/InfErrorCodeConstants.java

@@ -1,6 +1,6 @@
-package com.persagy.modules.infra.enums;
+package com.yushu.modules.infra.enums;
 
-import com.persagy.framework.common.exception.ErrorCode;
+import com.yushu.framework.common.exception.ErrorCode;
 
 /**
  * Infra 错误码枚举类

+ 2 - 2
iot-admin-server/src/main/java/com/persagy/modules/infra/enums/SysErrorCodeConstants.java

@@ -1,6 +1,6 @@
-package com.persagy.modules.infra.enums;
+package com.yushu.modules.infra.enums;
 
-import com.persagy.framework.common.exception.ErrorCode;
+import com.yushu.framework.common.exception.ErrorCode;
 
 /**
  * System 错误码枚举类

+ 17 - 17
iot-admin-server/src/main/java/com/persagy/modules/tool/controller/codegen/ToolCodegenController.java

@@ -1,22 +1,22 @@
-package com.persagy.modules.tool.controller.codegen;
+package com.yushu.modules.tool.controller.codegen;
 
 import cn.hutool.core.io.IoUtil;
 import cn.hutool.core.util.ZipUtil;
-import com.persagy.framework.common.pojo.CommonResult;
-import com.persagy.framework.common.pojo.PageResult;
-import com.persagy.framework.common.util.collection.CollectionUtils;
-import com.persagy.framework.common.util.servlet.ServletUtils;
-import com.persagy.modules.tool.controller.codegen.vo.ToolCodegenDetailRespVO;
-import com.persagy.modules.tool.controller.codegen.vo.ToolCodegenPreviewRespVO;
-import com.persagy.modules.tool.controller.codegen.vo.ToolCodegenUpdateReqVO;
-import com.persagy.modules.tool.controller.codegen.vo.table.ToolCodegenTablePageReqVO;
-import com.persagy.modules.tool.controller.codegen.vo.table.ToolCodegenTableRespVO;
-import com.persagy.modules.tool.controller.codegen.vo.table.ToolSchemaTableRespVO;
-import com.persagy.modules.tool.convert.codegen.ToolCodegenConvert;
-import com.persagy.modules.tool.dal.dataobject.codegen.ToolCodegenColumnDO;
-import com.persagy.modules.tool.dal.dataobject.codegen.ToolCodegenTableDO;
-import com.persagy.modules.tool.dal.dataobject.codegen.ToolSchemaTableDO;
-import com.persagy.modules.tool.service.codegen.ToolCodegenService;
+import com.yushu.framework.common.pojo.CommonResult;
+import com.yushu.framework.common.pojo.PageResult;
+import com.yushu.framework.common.util.collection.CollectionUtils;
+import com.yushu.framework.common.util.servlet.ServletUtils;
+import com.yushu.modules.tool.controller.codegen.vo.ToolCodegenDetailRespVO;
+import com.yushu.modules.tool.controller.codegen.vo.ToolCodegenPreviewRespVO;
+import com.yushu.modules.tool.controller.codegen.vo.ToolCodegenUpdateReqVO;
+import com.yushu.modules.tool.controller.codegen.vo.table.ToolCodegenTablePageReqVO;
+import com.yushu.modules.tool.controller.codegen.vo.table.ToolCodegenTableRespVO;
+import com.yushu.modules.tool.controller.codegen.vo.table.ToolSchemaTableRespVO;
+import com.yushu.modules.tool.convert.codegen.ToolCodegenConvert;
+import com.yushu.modules.tool.dal.dataobject.codegen.ToolCodegenColumnDO;
+import com.yushu.modules.tool.dal.dataobject.codegen.ToolCodegenTableDO;
+import com.yushu.modules.tool.dal.dataobject.codegen.ToolSchemaTableDO;
+import com.yushu.modules.tool.service.codegen.ToolCodegenService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
@@ -34,7 +34,7 @@ import java.util.List;
 import java.util.Map;
 import java.util.Set;
 
-import static com.persagy.framework.common.pojo.CommonResult.success;
+import static com.yushu.framework.common.pojo.CommonResult.success;
 
 @Api(tags = "代码生成器")
 @RestController

+ 3 - 3
iot-admin-server/src/main/java/com/persagy/modules/tool/controller/codegen/vo/ToolCodegenDetailRespVO.java

@@ -1,7 +1,7 @@
-package com.persagy.modules.tool.controller.codegen.vo;
+package com.yushu.modules.tool.controller.codegen.vo;
 
-import com.persagy.modules.tool.controller.codegen.vo.column.ToolCodegenColumnRespVO;
-import com.persagy.modules.tool.controller.codegen.vo.table.ToolCodegenTableRespVO;
+import com.yushu.modules.tool.controller.codegen.vo.column.ToolCodegenColumnRespVO;
+import com.yushu.modules.tool.controller.codegen.vo.table.ToolCodegenTableRespVO;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;

+ 1 - 1
iot-admin-server/src/main/java/com/persagy/modules/tool/controller/codegen/vo/ToolCodegenPreviewRespVO.java

@@ -1,4 +1,4 @@
-package com.persagy.modules.tool.controller.codegen.vo;
+package com.yushu.modules.tool.controller.codegen.vo;
 
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;

+ 3 - 3
iot-admin-server/src/main/java/com/persagy/modules/tool/controller/codegen/vo/ToolCodegenUpdateReqVO.java

@@ -1,7 +1,7 @@
-package com.persagy.modules.tool.controller.codegen.vo;
+package com.yushu.modules.tool.controller.codegen.vo;
 
-import com.persagy.modules.tool.controller.codegen.vo.column.ToolCodegenColumnBaseVO;
-import com.persagy.modules.tool.controller.codegen.vo.table.ToolCodegenTableBaseVO;
+import com.yushu.modules.tool.controller.codegen.vo.column.ToolCodegenColumnBaseVO;
+import com.yushu.modules.tool.controller.codegen.vo.table.ToolCodegenTableBaseVO;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;

+ 1 - 1
iot-admin-server/src/main/java/com/persagy/modules/tool/controller/codegen/vo/column/ToolCodegenColumnBaseVO.java

@@ -1,4 +1,4 @@
-package com.persagy.modules.tool.controller.codegen.vo.column;
+package com.yushu.modules.tool.controller.codegen.vo.column;
 
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;

+ 1 - 1
iot-admin-server/src/main/java/com/persagy/modules/tool/controller/codegen/vo/column/ToolCodegenColumnRespVO.java

@@ -1,4 +1,4 @@
-package com.persagy.modules.tool.controller.codegen.vo.column;
+package com.yushu.modules.tool.controller.codegen.vo.column;
 
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;

+ 1 - 1
iot-admin-server/src/main/java/com/persagy/modules/tool/controller/codegen/vo/table/ToolCodegenTableBaseVO.java

@@ -1,4 +1,4 @@
-package com.persagy.modules.tool.controller.codegen.vo.table;
+package com.yushu.modules.tool.controller.codegen.vo.table;
 
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;

+ 3 - 3
iot-admin-server/src/main/java/com/persagy/modules/tool/controller/codegen/vo/table/ToolCodegenTablePageReqVO.java

@@ -1,6 +1,6 @@
-package com.persagy.modules.tool.controller.codegen.vo.table;
+package com.yushu.modules.tool.controller.codegen.vo.table;
 
-import com.persagy.framework.common.pojo.PageParam;
+import com.yushu.framework.common.pojo.PageParam;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -10,7 +10,7 @@ import org.springframework.format.annotation.DateTimeFormat;
 
 import java.util.Date;
 
-import static com.persagy.framework.common.util.date.DateUtils.DATE_TIME_FORMAT_SHOW;
+import static com.yushu.framework.common.util.date.DateUtils.DATE_TIME_FORMAT_SHOW;
 
 @ApiModel("表定义分页 Request VO")
 @Data

+ 1 - 1
iot-admin-server/src/main/java/com/persagy/modules/tool/controller/codegen/vo/table/ToolCodegenTableRespVO.java

@@ -1,4 +1,4 @@
-package com.persagy.modules.tool.controller.codegen.vo.table;
+package com.yushu.modules.tool.controller.codegen.vo.table;
 
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;

+ 1 - 1
iot-admin-server/src/main/java/com/persagy/modules/tool/controller/codegen/vo/table/ToolSchemaTableRespVO.java

@@ -1,4 +1,4 @@
-package com.persagy.modules.tool.controller.codegen.vo.table;
+package com.yushu.modules.tool.controller.codegen.vo.table;
 
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;

iot-admin-server/src/main/java/com/persagy/modules/tool/controller/test/ToolTestDemoController.http → iot-admin-server/src/main/java/com/yushu/modules/tool/controller/test/ToolTestDemoController.http


+ 9 - 9
iot-admin-server/src/main/java/com/persagy/modules/tool/controller/test/ToolTestDemoController.java

@@ -1,13 +1,13 @@
-package com.persagy.modules.tool.controller.test;
+package com.yushu.modules.tool.controller.test;
 
 import cn.hutool.core.thread.ThreadUtil;
-import com.persagy.framework.common.pojo.CommonResult;
-import com.persagy.framework.common.pojo.PageResult;
-import com.persagy.framework.excel.core.util.ExcelUtils;
-import com.persagy.modules.tool.controller.test.vo.*;
-import com.persagy.modules.tool.convert.test.ToolTestDemoConvert;
-import com.persagy.modules.tool.dal.dataobject.test.ToolTestDemoDO;
-import com.persagy.modules.tool.service.test.ToolTestDemoService;
+import com.yushu.framework.common.pojo.CommonResult;
+import com.yushu.framework.common.pojo.PageResult;
+import com.yushu.framework.excel.core.util.ExcelUtils;
+import com.yushu.modules.tool.controller.test.vo.*;
+import com.yushu.modules.tool.convert.test.ToolTestDemoConvert;
+import com.yushu.modules.tool.dal.dataobject.test.ToolTestDemoDO;
+import com.yushu.modules.tool.service.test.ToolTestDemoService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiOperation;
@@ -22,7 +22,7 @@ import java.util.Collection;
 import java.util.List;
 import java.util.concurrent.TimeUnit;
 
-import static com.persagy.framework.common.pojo.CommonResult.success;
+import static com.yushu.framework.common.pojo.CommonResult.success;
 
 @Api(tags = "测试示例")
 @RestController

+ 1 - 1
iot-admin-server/src/main/java/com/persagy/modules/tool/controller/test/vo/ToolTestDemoBaseVO.java

@@ -1,4 +1,4 @@
-package com.persagy.modules.tool.controller.test.vo;
+package com.yushu.modules.tool.controller.test.vo;
 
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;

+ 1 - 1
iot-admin-server/src/main/java/com/persagy/modules/tool/controller/test/vo/ToolTestDemoCreateReqVO.java

@@ -1,4 +1,4 @@
-package com.persagy.modules.tool.controller.test.vo;
+package com.yushu.modules.tool.controller.test.vo;
 
 import io.swagger.annotations.ApiModel;
 import lombok.Data;

+ 1 - 1
iot-admin-server/src/main/java/com/persagy/modules/tool/controller/test/vo/ToolTestDemoExcelVO.java

@@ -1,4 +1,4 @@
-package com.persagy.modules.tool.controller.test.vo;
+package com.yushu.modules.tool.controller.test.vo;
 
 import com.alibaba.excel.annotation.ExcelProperty;
 import lombok.Data;

+ 2 - 2
iot-admin-server/src/main/java/com/persagy/modules/tool/controller/test/vo/ToolTestDemoExportReqVO.java

@@ -1,4 +1,4 @@
-package com.persagy.modules.tool.controller.test.vo;
+package com.yushu.modules.tool.controller.test.vo;
 
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -7,7 +7,7 @@ import org.springframework.format.annotation.DateTimeFormat;
 
 import java.util.Date;
 
-import static com.persagy.framework.common.util.date.DateUtils.DATE_TIME_FORMAT_SHOW;
+import static com.yushu.framework.common.util.date.DateUtils.DATE_TIME_FORMAT_SHOW;
 
 @ApiModel(value = "字典类型 Excel 导出 Request VO", description = "参数和 ToolTestDemoPageReqVO 是一致的")
 @Data

+ 3 - 3
iot-admin-server/src/main/java/com/persagy/modules/tool/controller/test/vo/ToolTestDemoPageReqVO.java

@@ -1,6 +1,6 @@
-package com.persagy.modules.tool.controller.test.vo;
+package com.yushu.modules.tool.controller.test.vo;
 
-import com.persagy.framework.common.pojo.PageParam;
+import com.yushu.framework.common.pojo.PageParam;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -10,7 +10,7 @@ import org.springframework.format.annotation.DateTimeFormat;
 
 import java.util.Date;
 
-import static com.persagy.framework.common.util.date.DateUtils.DATE_TIME_FORMAT_SHOW;
+import static com.yushu.framework.common.util.date.DateUtils.DATE_TIME_FORMAT_SHOW;
 
 @ApiModel("字典类型分页 Request VO")
 @Data

+ 1 - 1
iot-admin-server/src/main/java/com/persagy/modules/tool/controller/test/vo/ToolTestDemoRespVO.java

@@ -1,4 +1,4 @@
-package com.persagy.modules.tool.controller.test.vo;
+package com.yushu.modules.tool.controller.test.vo;
 
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;

+ 1 - 1
iot-admin-server/src/main/java/com/persagy/modules/tool/controller/test/vo/ToolTestDemoUpdateReqVO.java

@@ -1,4 +1,4 @@
-package com.persagy.modules.tool.controller.test.vo;
+package com.yushu.modules.tool.controller.test.vo;
 
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;

+ 13 - 13
iot-admin-server/src/main/java/com/persagy/modules/tool/convert/codegen/ToolCodegenConvert.java

@@ -1,16 +1,16 @@
-package com.persagy.modules.tool.convert.codegen;
-
-import com.persagy.framework.common.pojo.PageResult;
-import com.persagy.modules.tool.controller.codegen.vo.ToolCodegenDetailRespVO;
-import com.persagy.modules.tool.controller.codegen.vo.ToolCodegenPreviewRespVO;
-import com.persagy.modules.tool.controller.codegen.vo.ToolCodegenUpdateReqVO;
-import com.persagy.modules.tool.controller.codegen.vo.column.ToolCodegenColumnRespVO;
-import com.persagy.modules.tool.controller.codegen.vo.table.ToolCodegenTableRespVO;
-import com.persagy.modules.tool.controller.codegen.vo.table.ToolSchemaTableRespVO;
-import com.persagy.modules.tool.dal.dataobject.codegen.ToolCodegenColumnDO;
-import com.persagy.modules.tool.dal.dataobject.codegen.ToolCodegenTableDO;
-import com.persagy.modules.tool.dal.dataobject.codegen.ToolSchemaColumnDO;
-import com.persagy.modules.tool.dal.dataobject.codegen.ToolSchemaTableDO;
+package com.yushu.modules.tool.convert.codegen;
+
+import com.yushu.framework.common.pojo.PageResult;
+import com.yushu.modules.tool.controller.codegen.vo.ToolCodegenDetailRespVO;
+import com.yushu.modules.tool.controller.codegen.vo.ToolCodegenPreviewRespVO;
+import com.yushu.modules.tool.controller.codegen.vo.ToolCodegenUpdateReqVO;
+import com.yushu.modules.tool.controller.codegen.vo.column.ToolCodegenColumnRespVO;
+import com.yushu.modules.tool.controller.codegen.vo.table.ToolCodegenTableRespVO;
+import com.yushu.modules.tool.controller.codegen.vo.table.ToolSchemaTableRespVO;
+import com.yushu.modules.tool.dal.dataobject.codegen.ToolCodegenColumnDO;
+import com.yushu.modules.tool.dal.dataobject.codegen.ToolCodegenTableDO;
+import com.yushu.modules.tool.dal.dataobject.codegen.ToolSchemaColumnDO;
+import com.yushu.modules.tool.dal.dataobject.codegen.ToolSchemaTableDO;
 import org.mapstruct.Mapper;
 import org.mapstruct.factory.Mappers;
 

+ 8 - 8
iot-admin-server/src/main/java/com/persagy/modules/tool/convert/test/ToolTestDemoConvert.java

@@ -1,11 +1,11 @@
-package com.persagy.modules.tool.convert.test;
-
-import com.persagy.framework.common.pojo.PageResult;
-import com.persagy.modules.tool.controller.test.vo.ToolTestDemoCreateReqVO;
-import com.persagy.modules.tool.controller.test.vo.ToolTestDemoExcelVO;
-import com.persagy.modules.tool.controller.test.vo.ToolTestDemoRespVO;
-import com.persagy.modules.tool.controller.test.vo.ToolTestDemoUpdateReqVO;
-import com.persagy.modules.tool.dal.dataobject.test.ToolTestDemoDO;
+package com.yushu.modules.tool.convert.test;
+
+import com.yushu.framework.common.pojo.PageResult;
+import com.yushu.modules.tool.controller.test.vo.ToolTestDemoCreateReqVO;
+import com.yushu.modules.tool.controller.test.vo.ToolTestDemoExcelVO;
+import com.yushu.modules.tool.controller.test.vo.ToolTestDemoRespVO;
+import com.yushu.modules.tool.controller.test.vo.ToolTestDemoUpdateReqVO;
+import com.yushu.modules.tool.dal.dataobject.test.ToolTestDemoDO;
 import org.mapstruct.Mapper;
 import org.mapstruct.factory.Mappers;
 

+ 4 - 4
iot-admin-server/src/main/java/com/persagy/modules/tool/dal/dataobject/codegen/ToolCodegenColumnDO.java

@@ -1,10 +1,10 @@
-package com.persagy.modules.tool.dal.dataobject.codegen;
+package com.yushu.modules.tool.dal.dataobject.codegen;
 
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
-import com.persagy.framework.mybatis.core.dataobject.BaseDO;
-import com.persagy.modules.tool.enums.codegen.ToolCodegenColumnHtmlTypeEnum;
-import com.persagy.modules.tool.enums.codegen.ToolCodegenColumnListConditionEnum;
+import com.yushu.framework.mybatis.core.dataobject.BaseDO;
+import com.yushu.modules.tool.enums.codegen.ToolCodegenColumnHtmlTypeEnum;
+import com.yushu.modules.tool.enums.codegen.ToolCodegenColumnListConditionEnum;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;

+ 3 - 3
iot-admin-server/src/main/java/com/persagy/modules/tool/dal/dataobject/codegen/ToolCodegenTableDO.java

@@ -1,8 +1,8 @@
-package com.persagy.modules.tool.dal.dataobject.codegen;
+package com.yushu.modules.tool.dal.dataobject.codegen;
 
 import com.baomidou.mybatisplus.annotation.TableName;
-import com.persagy.framework.mybatis.core.dataobject.BaseDO;
-import com.persagy.modules.tool.enums.codegen.ToolCodegenTemplateTypeEnum;
+import com.yushu.framework.mybatis.core.dataobject.BaseDO;
+import com.yushu.modules.tool.enums.codegen.ToolCodegenTemplateTypeEnum;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;

+ 1 - 1
iot-admin-server/src/main/java/com/persagy/modules/tool/dal/dataobject/codegen/ToolSchemaColumnDO.java

@@ -1,4 +1,4 @@
-package com.persagy.modules.tool.dal.dataobject.codegen;
+package com.yushu.modules.tool.dal.dataobject.codegen;
 
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;

+ 1 - 1
iot-admin-server/src/main/java/com/persagy/modules/tool/dal/dataobject/codegen/ToolSchemaTableDO.java

@@ -1,4 +1,4 @@
-package com.persagy.modules.tool.dal.dataobject.codegen;
+package com.yushu.modules.tool.dal.dataobject.codegen;
 
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Builder;

+ 2 - 2
iot-admin-server/src/main/java/com/persagy/modules/tool/dal/dataobject/test/ToolTestDemoDO.java

@@ -1,8 +1,8 @@
-package com.persagy.modules.tool.dal.dataobject.test;
+package com.yushu.modules.tool.dal.dataobject.test;
 
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
-import com.persagy.framework.mybatis.core.dataobject.BaseDO;
+import com.yushu.framework.mybatis.core.dataobject.BaseDO;
 import lombok.*;
 
 /**

+ 3 - 3
iot-admin-server/src/main/java/com/persagy/modules/tool/dal/mysql/codegen/ToolCodegenColumnMapper.java

@@ -1,8 +1,8 @@
-package com.persagy.modules.tool.dal.mysql.codegen;
+package com.yushu.modules.tool.dal.mysql.codegen;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.persagy.framework.mybatis.core.mapper.BaseMapperX;
-import com.persagy.modules.tool.dal.dataobject.codegen.ToolCodegenColumnDO;
+import com.yushu.framework.mybatis.core.mapper.BaseMapperX;
+import com.yushu.modules.tool.dal.dataobject.codegen.ToolCodegenColumnDO;
 import org.apache.ibatis.annotations.Mapper;
 
 import java.util.List;

+ 6 - 6
iot-admin-server/src/main/java/com/persagy/modules/tool/dal/mysql/codegen/ToolCodegenTableMapper.java

@@ -1,11 +1,11 @@
-package com.persagy.modules.tool.dal.mysql.codegen;
+package com.yushu.modules.tool.dal.mysql.codegen;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.persagy.framework.common.pojo.PageResult;
-import com.persagy.framework.mybatis.core.mapper.BaseMapperX;
-import com.persagy.framework.mybatis.core.query.QueryWrapperX;
-import com.persagy.modules.tool.controller.codegen.vo.table.ToolCodegenTablePageReqVO;
-import com.persagy.modules.tool.dal.dataobject.codegen.ToolCodegenTableDO;
+import com.yushu.framework.common.pojo.PageResult;
+import com.yushu.framework.mybatis.core.mapper.BaseMapperX;
+import com.yushu.framework.mybatis.core.query.QueryWrapperX;
+import com.yushu.modules.tool.controller.codegen.vo.table.ToolCodegenTablePageReqVO;
+import com.yushu.modules.tool.dal.dataobject.codegen.ToolCodegenTableDO;
 import org.apache.ibatis.annotations.Mapper;
 
 @Mapper

+ 3 - 3
iot-admin-server/src/main/java/com/persagy/modules/tool/dal/mysql/codegen/ToolSchemaColumnMapper.java

@@ -1,8 +1,8 @@
-package com.persagy.modules.tool.dal.mysql.codegen;
+package com.yushu.modules.tool.dal.mysql.codegen;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.persagy.framework.mybatis.core.mapper.BaseMapperX;
-import com.persagy.modules.tool.dal.dataobject.codegen.ToolSchemaColumnDO;
+import com.yushu.framework.mybatis.core.mapper.BaseMapperX;
+import com.yushu.modules.tool.dal.dataobject.codegen.ToolSchemaColumnDO;
 import org.apache.ibatis.annotations.Mapper;
 
 import java.util.List;

+ 4 - 4
iot-admin-server/src/main/java/com/persagy/modules/tool/dal/mysql/codegen/ToolSchemaTableMapper.java

@@ -1,9 +1,9 @@
-package com.persagy.modules.tool.dal.mysql.codegen;
+package com.yushu.modules.tool.dal.mysql.codegen;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.persagy.framework.mybatis.core.mapper.BaseMapperX;
-import com.persagy.framework.mybatis.core.query.QueryWrapperX;
-import com.persagy.modules.tool.dal.dataobject.codegen.ToolSchemaTableDO;
+import com.yushu.framework.mybatis.core.mapper.BaseMapperX;
+import com.yushu.framework.mybatis.core.query.QueryWrapperX;
+import com.yushu.modules.tool.dal.dataobject.codegen.ToolSchemaTableDO;
 import org.apache.ibatis.annotations.Mapper;
 
 import java.util.Collection;

+ 7 - 7
iot-admin-server/src/main/java/com/persagy/modules/tool/dal/mysql/test/ToolTestDemoMapper.java

@@ -1,11 +1,11 @@
-package com.persagy.modules.tool.dal.mysql.test;
+package com.yushu.modules.tool.dal.mysql.test;
 
-import com.persagy.framework.common.pojo.PageResult;
-import com.persagy.framework.mybatis.core.mapper.BaseMapperX;
-import com.persagy.framework.mybatis.core.query.QueryWrapperX;
-import com.persagy.modules.tool.controller.test.vo.ToolTestDemoExportReqVO;
-import com.persagy.modules.tool.controller.test.vo.ToolTestDemoPageReqVO;
-import com.persagy.modules.tool.dal.dataobject.test.ToolTestDemoDO;
+import com.yushu.framework.common.pojo.PageResult;
+import com.yushu.framework.mybatis.core.mapper.BaseMapperX;
+import com.yushu.framework.mybatis.core.query.QueryWrapperX;
+import com.yushu.modules.tool.controller.test.vo.ToolTestDemoExportReqVO;
+import com.yushu.modules.tool.controller.test.vo.ToolTestDemoPageReqVO;
+import com.yushu.modules.tool.dal.dataobject.test.ToolTestDemoDO;
 import org.apache.ibatis.annotations.Mapper;
 
 import java.util.List;

+ 1 - 1
iot-admin-server/src/main/java/com/persagy/modules/tool/enums/ToolDictTypeConstants.java

@@ -1,4 +1,4 @@
-package com.persagy.modules.tool.enums;
+package com.yushu.modules.tool.enums;
 
 /**
  * Tool 字典类型的枚举类

+ 2 - 2
iot-admin-server/src/main/java/com/persagy/modules/tool/enums/ToolErrorCodeConstants.java

@@ -1,6 +1,6 @@
-package com.persagy.modules.tool.enums;
+package com.yushu.modules.tool.enums;
 
-import com.persagy.framework.common.exception.ErrorCode;
+import com.yushu.framework.common.exception.ErrorCode;
 
 /**
  * Tool 错误码枚举类

+ 1 - 1
iot-admin-server/src/main/java/com/persagy/modules/tool/enums/codegen/ToolCodegenColumnHtmlTypeEnum.java

@@ -1,4 +1,4 @@
-package com.persagy.modules.tool.enums.codegen;
+package com.yushu.modules.tool.enums.codegen;
 
 import lombok.AllArgsConstructor;
 import lombok.Getter;

+ 1 - 1
iot-admin-server/src/main/java/com/persagy/modules/tool/enums/codegen/ToolCodegenColumnListConditionEnum.java

@@ -1,4 +1,4 @@
-package com.persagy.modules.tool.enums.codegen;
+package com.yushu.modules.tool.enums.codegen;
 
 import lombok.AllArgsConstructor;
 import lombok.Getter;

+ 1 - 1
iot-admin-server/src/main/java/com/persagy/modules/tool/enums/codegen/ToolCodegenImportTypeEnum.java

@@ -1,4 +1,4 @@
-package com.persagy.modules.tool.enums.codegen;
+package com.yushu.modules.tool.enums.codegen;
 
 import lombok.AllArgsConstructor;
 import lombok.Getter;

+ 1 - 1
iot-admin-server/src/main/java/com/persagy/modules/tool/enums/codegen/ToolCodegenTemplateTypeEnum.java

@@ -1,4 +1,4 @@
-package com.persagy.modules.tool.enums.codegen;
+package com.yushu.modules.tool.enums.codegen;
 
 import lombok.AllArgsConstructor;
 import lombok.Getter;

+ 6 - 6
iot-admin-server/src/main/java/com/persagy/modules/tool/framework/errorcode/config/ErrorCodeConfiguration.java

@@ -1,10 +1,10 @@
-//package com.persagy.adminserver.modules.tool.framework.errorcode.config;
+//package com.yushu.adminserver.modules.tool.framework.errorcode.config;
 //
-//import com.persagy.adminserver.modules.tool.framework.errorcode.core.generator.ErrorCodeAutoGenerator;
-//import com.persagy.adminserver.modules.tool.framework.errorcode.core.loader.ErrorCodeLoader;
-//import com.persagy.adminserver.modules.tool.framework.errorcode.core.service.ErrorCodeFrameworkService;
-//import com.persagy.adminserver.modules.tool.framework.errorcode.core.loader.ErrorCodeLoaderImpl;
-//import com.persagy.adminserver.modules.tool.framework.errorcode.core.generator.ErrorCodeAutoGeneratorImpl;
+//import com.yushu.adminserver.modules.tool.framework.errorcode.core.generator.ErrorCodeAutoGenerator;
+//import com.yushu.adminserver.modules.tool.framework.errorcode.core.loader.ErrorCodeLoader;
+//import com.yushu.adminserver.modules.tool.framework.errorcode.core.service.ErrorCodeFrameworkService;
+//import com.yushu.adminserver.modules.tool.framework.errorcode.core.loader.ErrorCodeLoaderImpl;
+//import com.yushu.adminserver.modules.tool.framework.errorcode.core.generator.ErrorCodeAutoGeneratorImpl;
 //import org.springframework.beans.factory.annotation.Value;
 //import org.springframework.boot.context.properties.EnableConfigurationProperties;
 //import org.springframework.context.annotation.Bean;

+ 1 - 1
iot-admin-server/src/main/java/com/persagy/modules/tool/framework/errorcode/config/ErrorCodeProperties.java

@@ -1,4 +1,4 @@
-package com.persagy.modules.tool.framework.errorcode.config;
+package com.yushu.modules.tool.framework.errorcode.config;
 
 import lombok.Data;
 import org.springframework.boot.context.properties.ConfigurationProperties;

+ 1 - 1
iot-admin-server/src/main/java/com/persagy/modules/tool/framework/errorcode/core/dto/ErrorCodeAutoGenerateReqDTO.java

@@ -1,4 +1,4 @@
-package com.persagy.modules.tool.framework.errorcode.core.dto;
+package com.yushu.modules.tool.framework.errorcode.core.dto;
 
 import lombok.Data;
 import lombok.experimental.Accessors;

+ 1 - 1
iot-admin-server/src/main/java/com/persagy/modules/tool/framework/errorcode/core/dto/ErrorCodeRespDTO.java

@@ -1,4 +1,4 @@
-package com.persagy.modules.tool.framework.errorcode.core.dto;
+package com.yushu.modules.tool.framework.errorcode.core.dto;
 
 import lombok.Data;
 

+ 1 - 1
iot-admin-server/src/main/java/com/persagy/modules/tool/framework/errorcode/core/generator/ErrorCodeAutoGenerator.java

@@ -1,4 +1,4 @@
-package com.persagy.modules.tool.framework.errorcode.core.generator;
+package com.yushu.modules.tool.framework.errorcode.core.generator;
 
 /**
  * 错误码的自动生成器

+ 4 - 4
iot-admin-server/src/main/java/com/persagy/modules/tool/framework/errorcode/core/generator/ErrorCodeAutoGeneratorImpl.java

@@ -1,11 +1,11 @@
-//package com.persagy.adminserver.modules.tool.framework.errorcode.core.generator;
+//package com.yushu.adminserver.modules.tool.framework.errorcode.core.generator;
 //
 //import cn.hutool.core.collection.CollUtil;
 //import cn.hutool.core.util.ClassUtil;
 //import cn.hutool.core.util.ReflectUtil;
-//import com.persagy.framework.common.exception.ErrorCode;
-//import com.persagy.adminserver.modules.tool.framework.errorcode.core.dto.ErrorCodeAutoGenerateReqDTO;
-//import com.persagy.adminserver.modules.tool.framework.errorcode.core.service.ErrorCodeFrameworkService;
+//import com.yushu.framework.common.exception.ErrorCode;
+//import com.yushu.adminserver.modules.tool.framework.errorcode.core.dto.ErrorCodeAutoGenerateReqDTO;
+//import com.yushu.adminserver.modules.tool.framework.errorcode.core.service.ErrorCodeFrameworkService;
 //import lombok.RequiredArgsConstructor;
 //import lombok.extern.slf4j.Slf4j;
 //import org.springframework.boot.context.event.ApplicationReadyEvent;

+ 2 - 2
iot-admin-server/src/main/java/com/persagy/modules/tool/framework/errorcode/core/loader/ErrorCodeLoader.java

@@ -1,6 +1,6 @@
-//package com.persagy.adminserver.modules.tool.framework.errorcode.core.loader;
+//package com.yushu.adminserver.modules.tool.framework.errorcode.core.loader;
 //
-//import com.persagy.framework.common.exception.util.ServiceExceptionUtil;
+//import com.yushu.framework.common.exception.util.ServiceExceptionUtil;
 //
 ///**
 // * 错误码加载器

+ 4 - 4
iot-admin-server/src/main/java/com/persagy/modules/tool/framework/errorcode/core/loader/ErrorCodeLoaderImpl.java

@@ -1,9 +1,9 @@
-//package com.persagy.adminserver.modules.tool.framework.errorcode.core.loader;
+//package com.yushu.adminserver.modules.tool.framework.errorcode.core.loader;
 //
 //import cn.hutool.core.collection.CollUtil;
-//import com.persagy.adminserver.modules.tool.framework.errorcode.core.dto.ErrorCodeRespDTO;
-//import com.persagy.adminserver.modules.tool.framework.errorcode.core.service.ErrorCodeFrameworkService;
-//import com.persagy.framework.common.util.date.DateUtils;
+//import com.yushu.adminserver.modules.tool.framework.errorcode.core.dto.ErrorCodeRespDTO;
+//import com.yushu.adminserver.modules.tool.framework.errorcode.core.service.ErrorCodeFrameworkService;
+//import com.yushu.framework.common.util.date.DateUtils;
 //import lombok.RequiredArgsConstructor;
 //import lombok.extern.slf4j.Slf4j;
 //import org.springframework.boot.context.event.ApplicationReadyEvent;

+ 3 - 3
iot-admin-server/src/main/java/com/persagy/modules/tool/framework/errorcode/core/service/ErrorCodeFrameworkService.java

@@ -1,7 +1,7 @@
-//package com.persagy.adminserver.modules.tool.framework.errorcode.core.service;
+//package com.yushu.adminserver.modules.tool.framework.errorcode.core.service;
 //
-//import com.persagy.adminserver.modules.tool.framework.errorcode.core.dto.ErrorCodeAutoGenerateReqDTO;
-//import com.persagy.adminserver.modules.tool.framework.errorcode.core.dto.ErrorCodeRespDTO;
+//import com.yushu.adminserver.modules.tool.framework.errorcode.core.dto.ErrorCodeAutoGenerateReqDTO;
+//import com.yushu.adminserver.modules.tool.framework.errorcode.core.dto.ErrorCodeRespDTO;
 //
 //import javax.validation.Valid;
 //import java.util.Date;

+ 8 - 8
iot-admin-server/src/main/java/com/persagy/modules/tool/service/codegen/ToolCodegenService.java

@@ -1,11 +1,11 @@
-package com.persagy.modules.tool.service.codegen;
-
-import com.persagy.framework.common.pojo.PageResult;
-import com.persagy.modules.tool.controller.codegen.vo.ToolCodegenUpdateReqVO;
-import com.persagy.modules.tool.controller.codegen.vo.table.ToolCodegenTablePageReqVO;
-import com.persagy.modules.tool.dal.dataobject.codegen.ToolCodegenColumnDO;
-import com.persagy.modules.tool.dal.dataobject.codegen.ToolCodegenTableDO;
-import com.persagy.modules.tool.dal.dataobject.codegen.ToolSchemaTableDO;
+package com.yushu.modules.tool.service.codegen;
+
+import com.yushu.framework.common.pojo.PageResult;
+import com.yushu.modules.tool.controller.codegen.vo.ToolCodegenUpdateReqVO;
+import com.yushu.modules.tool.controller.codegen.vo.table.ToolCodegenTablePageReqVO;
+import com.yushu.modules.tool.dal.dataobject.codegen.ToolCodegenColumnDO;
+import com.yushu.modules.tool.dal.dataobject.codegen.ToolCodegenTableDO;
+import com.yushu.modules.tool.dal.dataobject.codegen.ToolSchemaTableDO;
 
 import java.util.List;
 import java.util.Map;

+ 10 - 10
iot-admin-server/src/main/java/com/persagy/modules/tool/service/codegen/impl/ToolCodegenBuilder.java

@@ -1,17 +1,17 @@
-package com.persagy.modules.tool.service.codegen.impl;
+package com.yushu.modules.tool.service.codegen.impl;
 
 import cn.hutool.core.map.MapUtil;
 import cn.hutool.core.util.StrUtil;
 import com.google.common.collect.Sets;
-import com.persagy.framework.mybatis.core.dataobject.BaseDO;
-import com.persagy.modules.tool.convert.codegen.ToolCodegenConvert;
-import com.persagy.modules.tool.dal.dataobject.codegen.ToolCodegenColumnDO;
-import com.persagy.modules.tool.dal.dataobject.codegen.ToolCodegenTableDO;
-import com.persagy.modules.tool.dal.dataobject.codegen.ToolSchemaColumnDO;
-import com.persagy.modules.tool.dal.dataobject.codegen.ToolSchemaTableDO;
-import com.persagy.modules.tool.enums.codegen.ToolCodegenColumnHtmlTypeEnum;
-import com.persagy.modules.tool.enums.codegen.ToolCodegenColumnListConditionEnum;
-import com.persagy.modules.tool.enums.codegen.ToolCodegenTemplateTypeEnum;
+import com.yushu.framework.mybatis.core.dataobject.BaseDO;
+import com.yushu.modules.tool.convert.codegen.ToolCodegenConvert;
+import com.yushu.modules.tool.dal.dataobject.codegen.ToolCodegenColumnDO;
+import com.yushu.modules.tool.dal.dataobject.codegen.ToolCodegenTableDO;
+import com.yushu.modules.tool.dal.dataobject.codegen.ToolSchemaColumnDO;
+import com.yushu.modules.tool.dal.dataobject.codegen.ToolSchemaTableDO;
+import com.yushu.modules.tool.enums.codegen.ToolCodegenColumnHtmlTypeEnum;
+import com.yushu.modules.tool.enums.codegen.ToolCodegenColumnListConditionEnum;
+import com.yushu.modules.tool.enums.codegen.ToolCodegenTemplateTypeEnum;
 import org.springframework.stereotype.Component;
 
 import java.math.BigDecimal;

+ 14 - 14
iot-admin-server/src/main/java/com/persagy/modules/tool/service/codegen/impl/ToolCodegenEngine.java

@@ -1,4 +1,4 @@
-package com.persagy.modules.tool.service.codegen.impl;
+package com.yushu.modules.tool.service.codegen.impl;
 
 import cn.hutool.core.map.MapUtil;
 import cn.hutool.core.util.StrUtil;
@@ -6,19 +6,19 @@ import cn.hutool.extra.template.TemplateConfig;
 import cn.hutool.extra.template.TemplateEngine;
 import cn.hutool.extra.template.engine.velocity.VelocityEngine;
 import com.google.common.collect.Maps;
-import com.persagy.framework.common.exception.util.ServiceExceptionUtil;
-import com.persagy.framework.common.pojo.CommonResult;
-import com.persagy.framework.common.pojo.PageParam;
-import com.persagy.framework.common.pojo.PageResult;
-import com.persagy.framework.common.util.collection.CollectionUtils;
-import com.persagy.framework.common.util.date.DateUtils;
-import com.persagy.framework.excel.core.util.ExcelUtils;
-import com.persagy.framework.mybatis.core.dataobject.BaseDO;
-import com.persagy.framework.mybatis.core.mapper.BaseMapperX;
-import com.persagy.framework.mybatis.core.query.QueryWrapperX;
-import com.persagy.modules.infra.codegen.config.CodegenProperties;
-import com.persagy.modules.tool.dal.dataobject.codegen.ToolCodegenColumnDO;
-import com.persagy.modules.tool.dal.dataobject.codegen.ToolCodegenTableDO;
+import com.yushu.framework.common.exception.util.ServiceExceptionUtil;
+import com.yushu.framework.common.pojo.CommonResult;
+import com.yushu.framework.common.pojo.PageParam;
+import com.yushu.framework.common.pojo.PageResult;
+import com.yushu.framework.common.util.collection.CollectionUtils;
+import com.yushu.framework.common.util.date.DateUtils;
+import com.yushu.framework.excel.core.util.ExcelUtils;
+import com.yushu.framework.mybatis.core.dataobject.BaseDO;
+import com.yushu.framework.mybatis.core.mapper.BaseMapperX;
+import com.yushu.framework.mybatis.core.query.QueryWrapperX;
+import com.yushu.modules.infra.codegen.config.CodegenProperties;
+import com.yushu.modules.tool.dal.dataobject.codegen.ToolCodegenColumnDO;
+import com.yushu.modules.tool.dal.dataobject.codegen.ToolCodegenTableDO;
 import org.springframework.stereotype.Component;
 
 import javax.annotation.PostConstruct;

+ 3 - 3
iot-admin-server/src/main/java/com/persagy/modules/tool/service/codegen/impl/ToolCodegenSQLParser.java

@@ -1,4 +1,4 @@
-package com.persagy.modules.tool.service.codegen.impl;
+package com.yushu.modules.tool.service.codegen.impl;
 
 import cn.hutool.core.collection.CollUtil;
 import com.alibaba.druid.DbType;
@@ -9,8 +9,8 @@ import com.alibaba.druid.sql.ast.statement.SQLPrimaryKey;
 import com.alibaba.druid.sql.ast.statement.SQLTableElement;
 import com.alibaba.druid.sql.dialect.mysql.ast.statement.MySqlCreateTableStatement;
 import com.alibaba.druid.sql.repository.SchemaRepository;
-import com.persagy.modules.tool.dal.dataobject.codegen.ToolSchemaColumnDO;
-import com.persagy.modules.tool.dal.dataobject.codegen.ToolSchemaTableDO;
+import com.yushu.modules.tool.dal.dataobject.codegen.ToolSchemaColumnDO;
+import com.yushu.modules.tool.dal.dataobject.codegen.ToolSchemaTableDO;
 import org.apache.commons.collections4.KeyValue;
 import org.apache.commons.collections4.keyvalue.DefaultKeyValue;
 

+ 19 - 19
iot-admin-server/src/main/java/com/persagy/modules/tool/service/codegen/impl/ToolCodegenServiceImpl.java

@@ -1,22 +1,22 @@
-package com.persagy.modules.tool.service.codegen.impl;
+package com.yushu.modules.tool.service.codegen.impl;
 
 import cn.hutool.core.collection.CollUtil;
-import com.persagy.framework.common.pojo.PageResult;
-import com.persagy.framework.common.util.collection.CollectionUtils;
-import com.persagy.modules.infra.codegen.config.CodegenProperties;
-import com.persagy.modules.tool.controller.codegen.vo.ToolCodegenUpdateReqVO;
-import com.persagy.modules.tool.controller.codegen.vo.table.ToolCodegenTablePageReqVO;
-import com.persagy.modules.tool.convert.codegen.ToolCodegenConvert;
-import com.persagy.modules.tool.dal.dataobject.codegen.ToolCodegenColumnDO;
-import com.persagy.modules.tool.dal.dataobject.codegen.ToolCodegenTableDO;
-import com.persagy.modules.tool.dal.dataobject.codegen.ToolSchemaColumnDO;
-import com.persagy.modules.tool.dal.dataobject.codegen.ToolSchemaTableDO;
-import com.persagy.modules.tool.dal.mysql.codegen.ToolCodegenColumnMapper;
-import com.persagy.modules.tool.dal.mysql.codegen.ToolCodegenTableMapper;
-import com.persagy.modules.tool.dal.mysql.codegen.ToolSchemaColumnMapper;
-import com.persagy.modules.tool.dal.mysql.codegen.ToolSchemaTableMapper;
-import com.persagy.modules.tool.enums.codegen.ToolCodegenImportTypeEnum;
-import com.persagy.modules.tool.service.codegen.ToolCodegenService;
+import com.yushu.framework.common.pojo.PageResult;
+import com.yushu.framework.common.util.collection.CollectionUtils;
+import com.yushu.modules.infra.codegen.config.CodegenProperties;
+import com.yushu.modules.tool.controller.codegen.vo.ToolCodegenUpdateReqVO;
+import com.yushu.modules.tool.controller.codegen.vo.table.ToolCodegenTablePageReqVO;
+import com.yushu.modules.tool.convert.codegen.ToolCodegenConvert;
+import com.yushu.modules.tool.dal.dataobject.codegen.ToolCodegenColumnDO;
+import com.yushu.modules.tool.dal.dataobject.codegen.ToolCodegenTableDO;
+import com.yushu.modules.tool.dal.dataobject.codegen.ToolSchemaColumnDO;
+import com.yushu.modules.tool.dal.dataobject.codegen.ToolSchemaTableDO;
+import com.yushu.modules.tool.dal.mysql.codegen.ToolCodegenColumnMapper;
+import com.yushu.modules.tool.dal.mysql.codegen.ToolCodegenTableMapper;
+import com.yushu.modules.tool.dal.mysql.codegen.ToolSchemaColumnMapper;
+import com.yushu.modules.tool.dal.mysql.codegen.ToolSchemaTableMapper;
+import com.yushu.modules.tool.enums.codegen.ToolCodegenImportTypeEnum;
+import com.yushu.modules.tool.service.codegen.ToolCodegenService;
 import org.apache.commons.collections4.KeyValue;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -28,8 +28,8 @@ import java.util.Map;
 import java.util.Set;
 import java.util.stream.Collectors;
 
-import static com.persagy.framework.common.exception.util.ServiceExceptionUtil.exception;
-import static com.persagy.modules.tool.enums.ToolErrorCodeConstants.*;
+import static com.yushu.framework.common.exception.util.ServiceExceptionUtil.exception;
+import static com.yushu.modules.tool.enums.ToolErrorCodeConstants.*;
 
 /**
  * 代码生成 Service 实现类

+ 7 - 7
iot-admin-server/src/main/java/com/persagy/modules/tool/service/test/ToolTestDemoService.java

@@ -1,11 +1,11 @@
-package com.persagy.modules.tool.service.test;
+package com.yushu.modules.tool.service.test;
 
-import com.persagy.framework.common.pojo.PageResult;
-import com.persagy.modules.tool.controller.test.vo.ToolTestDemoCreateReqVO;
-import com.persagy.modules.tool.controller.test.vo.ToolTestDemoExportReqVO;
-import com.persagy.modules.tool.controller.test.vo.ToolTestDemoPageReqVO;
-import com.persagy.modules.tool.controller.test.vo.ToolTestDemoUpdateReqVO;
-import com.persagy.modules.tool.dal.dataobject.test.ToolTestDemoDO;
+import com.yushu.framework.common.pojo.PageResult;
+import com.yushu.modules.tool.controller.test.vo.ToolTestDemoCreateReqVO;
+import com.yushu.modules.tool.controller.test.vo.ToolTestDemoExportReqVO;
+import com.yushu.modules.tool.controller.test.vo.ToolTestDemoPageReqVO;
+import com.yushu.modules.tool.controller.test.vo.ToolTestDemoUpdateReqVO;
+import com.yushu.modules.tool.dal.dataobject.test.ToolTestDemoDO;
 
 import javax.validation.Valid;
 import java.util.Collection;

+ 12 - 12
iot-admin-server/src/main/java/com/persagy/modules/tool/service/test/impl/ToolTestDemoServiceImpl.java

@@ -1,14 +1,14 @@
-package com.persagy.modules.tool.service.test.impl;
+package com.yushu.modules.tool.service.test.impl;
 
-import com.persagy.framework.common.pojo.PageResult;
-import com.persagy.modules.tool.controller.test.vo.ToolTestDemoCreateReqVO;
-import com.persagy.modules.tool.controller.test.vo.ToolTestDemoExportReqVO;
-import com.persagy.modules.tool.controller.test.vo.ToolTestDemoPageReqVO;
-import com.persagy.modules.tool.controller.test.vo.ToolTestDemoUpdateReqVO;
-import com.persagy.modules.tool.convert.test.ToolTestDemoConvert;
-import com.persagy.modules.tool.dal.dataobject.test.ToolTestDemoDO;
-import com.persagy.modules.tool.dal.mysql.test.ToolTestDemoMapper;
-import com.persagy.modules.tool.service.test.ToolTestDemoService;
+import com.yushu.framework.common.pojo.PageResult;
+import com.yushu.modules.tool.controller.test.vo.ToolTestDemoCreateReqVO;
+import com.yushu.modules.tool.controller.test.vo.ToolTestDemoExportReqVO;
+import com.yushu.modules.tool.controller.test.vo.ToolTestDemoPageReqVO;
+import com.yushu.modules.tool.controller.test.vo.ToolTestDemoUpdateReqVO;
+import com.yushu.modules.tool.convert.test.ToolTestDemoConvert;
+import com.yushu.modules.tool.dal.dataobject.test.ToolTestDemoDO;
+import com.yushu.modules.tool.dal.mysql.test.ToolTestDemoMapper;
+import com.yushu.modules.tool.service.test.ToolTestDemoService;
 import org.springframework.stereotype.Service;
 import org.springframework.validation.annotation.Validated;
 
@@ -16,8 +16,8 @@ import javax.annotation.Resource;
 import java.util.Collection;
 import java.util.List;
 
-import static com.persagy.framework.common.exception.util.ServiceExceptionUtil.exception;
-import static com.persagy.modules.tool.enums.ToolErrorCodeConstants.TEST_DEMO_NOT_EXISTS;
+import static com.yushu.framework.common.exception.util.ServiceExceptionUtil.exception;
+import static com.yushu.modules.tool.enums.ToolErrorCodeConstants.TEST_DEMO_NOT_EXISTS;
 
 /**
  * 字典类型 Service 实现类

+ 3 - 3
iot-admin-server/src/main/resources/application.yaml

@@ -38,7 +38,7 @@ mybatis-plus:
 biz:
   info:
     version: 1.0.0
-    base-package: com.persagy
+    base-package: com.yushu
   web:
     api-prefix: /api
     controller-package: ${biz.info.base-package}
@@ -53,8 +53,8 @@ biz:
     db-schemas: ${spring.datasource.dynamic.datasource.master.name}
   error-code: # 错误码相关配置项
     constants-class-list:
-      - com.persagy.modules.infra.enums.InfErrorCodeConstants
-      - com.persagy.modules.infra.enums.SysErrorCodeConstants
+      - com.yushu.modules.infra.enums.InfErrorCodeConstants
+      - com.yushu.modules.infra.enums.SysErrorCodeConstants
 debug: true
 management:
   health:

+ 2 - 1
iot-common/pom.xml

@@ -3,9 +3,10 @@
          xmlns="http://maven.apache.org/POM/4.0.0"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
-        <groupId>com.persagy</groupId>
+        <groupId>com.yushu</groupId>
         <artifactId>iot</artifactId>
         <version>${revision}</version>
+        <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>iot-common</artifactId>

+ 1 - 1
iot-common/src/main/java/com.persagy/framework/common/core/IntArrayValuable.java

@@ -1,4 +1,4 @@
-package com.persagy.framework.common.core;
+package com.yushu.framework.common.core;
 
 /**
  * 可生成 Int 数组的接口

+ 1 - 1
iot-common/src/main/java/com.persagy/framework/common/core/KeyValue.java

@@ -1,4 +1,4 @@
-package com.persagy.framework.common.core;
+package com.yushu.framework.common.core;
 
 import lombok.AllArgsConstructor;
 import lombok.Data;

+ 3 - 3
iot-common/src/main/java/com.persagy/framework/common/exception/ErrorCode.java

@@ -1,7 +1,7 @@
-package com.persagy.framework.common.exception;
+package com.yushu.framework.common.exception;
 
-import com.persagy.framework.common.exception.enums.GlobalErrorCodeConstants;
-import com.persagy.framework.common.exception.enums.ServiceErrorCodeRange;
+import com.yushu.framework.common.exception.enums.GlobalErrorCodeConstants;
+import com.yushu.framework.common.exception.enums.ServiceErrorCodeRange;
 import lombok.Data;
 
 /**

+ 2 - 2
iot-common/src/main/java/com.persagy/framework/common/exception/ServiceException.java

@@ -1,6 +1,6 @@
-package com.persagy.framework.common.exception;
+package com.yushu.framework.common.exception;
 
-import com.persagy.framework.common.exception.enums.ServiceErrorCodeRange;
+import com.yushu.framework.common.exception.enums.ServiceErrorCodeRange;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 

+ 2 - 2
iot-common/src/main/java/com.persagy/framework/common/exception/enums/GlobalErrorCodeConstants.java

@@ -1,6 +1,6 @@
-package com.persagy.framework.common.exception.enums;
+package com.yushu.framework.common.exception.enums;
 
-import com.persagy.framework.common.exception.ErrorCode;
+import com.yushu.framework.common.exception.ErrorCode;
 
 /**
  * 全局错误码枚举

+ 1 - 1
iot-common/src/main/java/com.persagy/framework/common/exception/enums/ServiceErrorCodeRange.java

@@ -1,4 +1,4 @@
-package com.persagy.framework.common.exception.enums;
+package com.yushu.framework.common.exception.enums;
 
 /**
  * 业务异常的错误码区间,解决:解决各模块错误码定义,避免重复,在此只声明不做实际使用

+ 3 - 3
iot-common/src/main/java/com.persagy/framework/common/exception/util/ServiceExceptionUtil.java

@@ -1,8 +1,8 @@
-package com.persagy.framework.common.exception.util;
+package com.yushu.framework.common.exception.util;
 
 import com.google.common.annotations.VisibleForTesting;
-import com.persagy.framework.common.exception.ErrorCode;
-import com.persagy.framework.common.exception.ServiceException;
+import com.yushu.framework.common.exception.ErrorCode;
+import com.yushu.framework.common.exception.ServiceException;
 import lombok.extern.slf4j.Slf4j;
 
 import java.util.Map;

+ 4 - 4
iot-common/src/main/java/com.persagy/framework/common/pojo/CommonResult.java

@@ -1,9 +1,9 @@
-package com.persagy.framework.common.pojo;
+package com.yushu.framework.common.pojo;
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.persagy.framework.common.exception.ErrorCode;
-import com.persagy.framework.common.exception.ServiceException;
-import com.persagy.framework.common.exception.enums.GlobalErrorCodeConstants;
+import com.yushu.framework.common.exception.ErrorCode;
+import com.yushu.framework.common.exception.ServiceException;
+import com.yushu.framework.common.exception.enums.GlobalErrorCodeConstants;
 import lombok.Data;
 import org.springframework.util.Assert;
 

+ 1 - 1
iot-common/src/main/java/com.persagy/framework/common/pojo/PageParam.java

@@ -1,4 +1,4 @@
-package com.persagy.framework.common.pojo;
+package com.yushu.framework.common.pojo;
 
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;

+ 1 - 1
iot-common/src/main/java/com.persagy/framework/common/pojo/PageResult.java

@@ -1,4 +1,4 @@
-package com.persagy.framework.common.pojo;
+package com.yushu.framework.common.pojo;
 
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;

+ 1 - 1
iot-common/src/main/java/com.persagy/framework/common/pojo/SortingField.java

@@ -1,4 +1,4 @@
-package com.persagy.framework.common.pojo;
+package com.yushu.framework.common.pojo;
 
 import java.io.Serializable;
 

+ 1 - 1
iot-common/src/main/java/com.persagy/framework/common/test/WebFilterOrderEnum.java

@@ -1,4 +1,4 @@
-package com.persagy.framework.common.enums;
+package com.yushu.framework.common.test;
 
 /**
  * Web 过滤器顺序的枚举类,保证过滤器按照符合我们的预期

+ 1 - 1
iot-common/src/main/java/com.persagy/framework/common/util/collection/ArrayUtils.java

@@ -1,4 +1,4 @@
-package com.persagy.framework.common.util.collection;
+package com.yushu.framework.common.util.collection;
 
 import cn.hutool.core.util.ArrayUtil;
 

+ 1 - 1
iot-common/src/main/java/com.persagy/framework/common/util/collection/CollectionUtils.java

@@ -1,4 +1,4 @@
-package com.persagy.framework.common.util.collection;
+package com.yushu.framework.common.util.collection;
 
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.collection.CollectionUtil;

+ 2 - 2
iot-common/src/main/java/com.persagy/framework/common/util/collection/MapUtils.java

@@ -1,10 +1,10 @@
-package com.persagy.framework.common.util.collection;
+package com.yushu.framework.common.util.collection;
 
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.collection.CollectionUtil;
 import com.google.common.collect.Maps;
 import com.google.common.collect.Multimap;
-import com.persagy.framework.common.core.KeyValue;
+import com.yushu.framework.common.core.KeyValue;
 
 import java.util.ArrayList;
 import java.util.Collection;

+ 1 - 1
iot-common/src/main/java/com.persagy/framework/common/util/collection/SetUtils.java

@@ -1,4 +1,4 @@
-package com.persagy.framework.common.util.collection;
+package com.yushu.framework.common.util.collection;
 
 import java.util.Arrays;
 import java.util.HashSet;

+ 2 - 2
iot-common/src/main/java/com.persagy/framework/common/util/date/DateUtils.java

@@ -1,4 +1,4 @@
-package com.persagy.framework.common.util.date;
+package com.yushu.framework.common.util.date;
 
 import cn.hutool.core.date.DateUtil;
 import lombok.extern.slf4j.Slf4j;
@@ -13,7 +13,7 @@ import java.time.temporal.TemporalUnit;
 import java.util.Date;
 
 /**
- * Description: 基于Java8的时间工具类 Company: Persagy
+ * Description: 基于Java8的时间工具类 Company: yushu
  * 配合hutool的DateUtil工具类实现各种时间转换需求
  * @author luoguangyi
  * @version 1.0

+ 1 - 1
iot-common/src/main/java/com/persagy/framework/common/util/io/FileUtils.java

@@ -1,4 +1,4 @@
-package com.persagy.framework.common.util.io;
+package com.yushu.framework.common.util.io;
 
 import cn.hutool.core.io.FileUtil;
 import cn.hutool.core.util.IdUtil;

+ 3 - 3
iot-common/src/main/java/com.persagy/framework/common/util/json/FastJsonUtil.java

@@ -1,4 +1,4 @@
-//package com.persagy.framework.common.util.json;
+//package com.yushu.framework.common.util.json;
 //
 //
 //import cn.hutool.core.util.StrUtil;
@@ -10,7 +10,7 @@
 ///**
 // * @description: fastJson工具类
 // * @author: luoguangyi
-// * @company: Persagy Technology Co.,Ltd
+// * @company: yushu Technology Co.,Ltd
 // * @since: 2020/7/9 14:48
 // * @version: V1.0
 // **/
@@ -22,7 +22,7 @@
 //     * @description:将json数据转换成pojo对象list
 //     * @exception:
 //     * @author: LuoGuangyi
-//     * @company: Persagy Technology Co.,Ltd
+//     * @company: yushu Technology Co.,Ltd
 //     * @return: java.util.List<T>
 //     * @since: 2020/10/31 21:24
 //     * @version: V1.0

+ 1 - 1
iot-common/src/main/java/com.persagy/framework/common/util/json/JsonUtils.java

@@ -1,4 +1,4 @@
-package com.persagy.framework.common.util.json;
+package com.yushu.framework.common.util.json;
 
 import cn.hutool.core.util.ArrayUtil;
 import cn.hutool.core.util.StrUtil;

+ 1 - 1
iot-common/src/main/java/com.persagy/framework/common/util/monitor/TracerUtils.java

@@ -1,4 +1,4 @@
-package com.persagy.framework.common.util.monitor;
+package com.yushu.framework.common.util.monitor;
 
 import org.apache.skywalking.apm.toolkit.trace.TraceContext;
 

+ 1 - 1
iot-common/src/main/java/com.persagy/framework/common/util/object/ObjectUtils.java

@@ -1,4 +1,4 @@
-package com.persagy.framework.common.util.object;
+package com.yushu.framework.common.util.object;
 
 import cn.hutool.core.util.ObjectUtil;
 

+ 2 - 2
iot-common/src/main/java/com.persagy/framework/common/util/servlet/ServletUtils.java

@@ -1,9 +1,9 @@
-package com.persagy.framework.common.util.servlet;
+package com.yushu.framework.common.util.servlet;
 
 import cn.hutool.core.io.IoUtil;
 import cn.hutool.core.util.StrUtil;
 import cn.hutool.extra.servlet.ServletUtil;
-import com.persagy.framework.common.util.json.JsonUtils;
+import com.yushu.framework.common.util.json.JsonUtils;
 import org.springframework.http.MediaType;
 import org.springframework.web.context.request.RequestAttributes;
 import org.springframework.web.context.request.RequestContextHolder;

+ 1 - 1
iot-common/src/main/java/com.persagy/framework/common/util/sping/SpringAopUtils.java

@@ -1,4 +1,4 @@
-package com.persagy.framework.common.util.sping;
+package com.yushu.framework.common.util.sping;
 
 import cn.hutool.core.bean.BeanUtil;
 import org.springframework.aop.framework.AdvisedSupport;

+ 1 - 1
iot-common/src/main/java/com.persagy/framework/common/util/sping/SpringExpressionUtils.java

@@ -1,4 +1,4 @@
-package com.persagy.framework.common.util.sping;
+package com.yushu.framework.common.util.sping;
 
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.map.MapUtil;

+ 1 - 1
iot-common/src/main/java/com.persagy/framework/common/util/string/StrUtils.java

@@ -1,4 +1,4 @@
-package com.persagy.framework.common.util.string;
+package com.yushu.framework.common.util.string;
 
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;

+ 2 - 2
iot-common/src/main/java/com.persagy/framework/common/validation/InEnum.java

@@ -1,6 +1,6 @@
-package com.persagy.framework.common.validation;
+package com.yushu.framework.common.validation;
 
-import com.persagy.framework.common.core.IntArrayValuable;
+import com.yushu.framework.common.core.IntArrayValuable;
 
 import javax.validation.Constraint;
 import javax.validation.Payload;

+ 2 - 2
iot-common/src/main/java/com.persagy/framework/common/validation/InEnumValidator.java

@@ -1,6 +1,6 @@
-package com.persagy.framework.common.validation;
+package com.yushu.framework.common.validation;
 
-import com.persagy.framework.common.core.IntArrayValuable;
+import com.yushu.framework.common.core.IntArrayValuable;
 
 import javax.validation.ConstraintValidator;
 import javax.validation.ConstraintValidatorContext;

+ 17 - 7
iot-dependencies/pom.xml

@@ -4,7 +4,7 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
 
-    <groupId>com.persagy</groupId>
+    <groupId>com.yushu</groupId>
     <artifactId>iot-dependencies</artifactId>
     <version>${revision}</version>
     <packaging>pom</packaging>
@@ -50,6 +50,16 @@
         <screw.version>1.0.5</screw.version>
         <guava.version>30.1.1-jre</guava.version>
         <commons-io.version>2.6</commons-io.version>
+        <!-- Maven Plugin Versions -->
+        <maven-compiler-plugin.version>3.7.0</maven-compiler-plugin.version>
+        <maven-deploy-plugin.version>2.8.2</maven-deploy-plugin.version>
+        <maven-surefire-plugin.version>2.21.0</maven-surefire-plugin.version>
+        <maven-source-plugin.version>2.2.1</maven-source-plugin.version>
+        <maven-javadoc-plugin.version>3.1.1</maven-javadoc-plugin.version>
+        <maven-gpg-plugin.version>1.6</maven-gpg-plugin.version>
+        <flatten-maven-plugin.version>1.1.0</flatten-maven-plugin.version>
+        <gmavenplus-plugin.version>1.6</gmavenplus-plugin.version>
+        <jacoco.version>0.8.3</jacoco.version>
     </properties>
 
     <dependencyManagement>
@@ -89,18 +99,18 @@
             </dependency>
             <!-- 测试 相关 -->
             <dependency>
-                <groupId>com.persagy</groupId>
+                <groupId>com.yushu</groupId>
                 <artifactId>iot-spring-boot-starter-test</artifactId>
                 <version>${revision}</version>
             </dependency>
             <dependency>
-                <groupId>com.persagy</groupId>
+                <groupId>com.yushu</groupId>
                 <artifactId>iot-spring-boot-starter-redis</artifactId>
                 <version>${revision}</version>
             </dependency>
             <!-- Web 相关 -->
             <dependency>
-                <groupId>com.persagy</groupId>
+                <groupId>com.yushu</groupId>
                 <artifactId>iot-spring-boot-starter-web</artifactId>
                 <version>${revision}</version>
             </dependency>
@@ -131,7 +141,7 @@
             </dependency>
             <!-- DB 相关 -->
             <dependency>
-                <groupId>com.persagy</groupId>
+                <groupId>com.yushu</groupId>
                 <artifactId>iot-spring-boot-starter-mybatis</artifactId>
                 <version>${revision}</version>
             </dependency>
@@ -244,13 +254,13 @@
 
             <!-- 工具类相关 -->
             <dependency>
-                <groupId>com.persagy</groupId>
+                <groupId>com.yushu</groupId>
                 <artifactId>iot-common</artifactId>
                 <version>${revision}</version>
             </dependency>
 
             <dependency>
-                <groupId>com.persagy</groupId>
+                <groupId>com.yushu</groupId>
                 <artifactId>iot-spring-boot-starter-excel</artifactId>
                 <version>${revision}</version>
             </dependency>

+ 2 - 2
iot-spring-boot-starter-excel/pom.xml

@@ -3,7 +3,7 @@
          xmlns="http://maven.apache.org/POM/4.0.0"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
-        <groupId>com.persagy</groupId>
+        <groupId>com.yushu</groupId>
         <artifactId>iot</artifactId>
         <version>${revision}</version>
     </parent>
@@ -15,7 +15,7 @@
     <description>Excel 拓展</description>
     <dependencies>
         <dependency>
-            <groupId>com.persagy</groupId>
+            <groupId>com.yushu</groupId>
             <artifactId>iot-common</artifactId>
         </dependency>
 

+ 2 - 2
iot-spring-boot-starter-excel/src/main/java/com.persagy.framework.excel.core.convert/JsonConvert.java

@@ -1,11 +1,11 @@
-package com.persagy.framework.excel.core.convert;
+package com.yushu.framework.excel.core.convert;
 
 import com.alibaba.excel.converters.Converter;
 import com.alibaba.excel.enums.CellDataTypeEnum;
 import com.alibaba.excel.metadata.CellData;
 import com.alibaba.excel.metadata.GlobalConfiguration;
 import com.alibaba.excel.metadata.property.ExcelContentProperty;
-import com.persagy.framework.common.util.json.JsonUtils;
+import com.yushu.framework.common.util.json.JsonUtils;
 
 /**
  * Excel Json 转换器

+ 1 - 1
iot-spring-boot-starter-excel/src/main/java/com.persagy.framework.excel.core.util/ExcelListener.java

@@ -1,4 +1,4 @@
-package com.persagy.framework.excel.core.util;
+package com.yushu.framework.excel.core.util;
 
 import com.alibaba.excel.context.AnalysisContext;
 import com.alibaba.excel.event.AnalysisEventListener;

+ 1 - 1
iot-spring-boot-starter-excel/src/main/java/com.persagy.framework.excel.core.util/ExcelUtils.java

@@ -1,4 +1,4 @@
-package com.persagy.framework.excel.core.util;
+package com.yushu.framework.excel.core.util;
 
 import com.alibaba.excel.EasyExcel;
 import com.alibaba.excel.read.metadata.ReadSheet;

+ 2 - 2
iot-spring-boot-starter-extension/pom.xml

@@ -3,7 +3,7 @@
          xmlns="http://maven.apache.org/POM/4.0.0"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
-        <groupId>com.persagy</groupId>
+        <groupId>com.yushu</groupId>
         <artifactId>iot</artifactId>
         <version>${revision}</version>
     </parent>
@@ -21,7 +21,7 @@
 
     <dependencies>
         <dependency>
-            <groupId>com.persagy</groupId>
+            <groupId>com.yushu</groupId>
             <artifactId>iot-common</artifactId>
         </dependency>
 

+ 0 - 0
iot-spring-boot-starter-extension/src/main/java/com/persagy/framework/extension/core/package-info.java


Alguns arquivos não foram mostrados porque muitos arquivos mudaram nesse diff