Browse Source

项目结构调整

wanggaokun 1 year ago
parent
commit
9ddd4d75e9
100 changed files with 193 additions and 194 deletions
  1. 1 1
      README.md
  2. 1 1
      eco-common/common-core/src/main/java/org/eco/common/core/config/AsyncConfig.java
  3. 4 4
      eco-common/common-core/src/main/java/org/eco/common/core/config/EcoConfig.java
  4. 1 1
      eco-common/common-core/src/main/java/org/eco/common/core/config/ThreadPoolConfig.java
  5. 1 1
      eco-common/common-core/src/main/java/org/eco/common/core/core/page/PageDomain.java
  6. 1 1
      eco-common/common-core/src/main/java/org/eco/common/core/core/page/TableSupport.java
  7. 1 1
      eco-common/common-core/src/main/java/org/eco/common/core/core/text/CharsetKit.java
  8. 1 1
      eco-common/common-core/src/main/java/org/eco/common/core/core/text/Convert.java
  9. 1 1
      eco-common/common-core/src/main/java/org/eco/common/core/core/text/StrFormatter.java
  10. 1 1
      eco-common/common-core/src/main/java/org/eco/common/core/enums/UserType.java
  11. 2 2
      eco-common/common-core/src/main/java/org/eco/common/core/exception/base/BaseException.java
  12. 1 1
      eco-common/common-core/src/main/java/org/eco/common/core/factory/YmlPropertySourceFactory.java
  13. 1 1
      eco-common/common-core/src/main/java/org/eco/common/core/manager/ShutdownManager.java
  14. 1 1
      eco-common/common-core/src/main/java/org/eco/common/core/utils/TreeBuildUtils.java
  15. 1 1
      eco-common/common-core/src/main/java/org/eco/common/core/utils/bean/BeanUtils.java
  16. 1 1
      eco-common/common-core/src/main/java/org/eco/common/core/utils/bean/BeanValidators.java
  17. 3 3
      eco-common/common-core/src/main/java/org/eco/common/core/utils/file/FileTypeUtils.java
  18. 7 7
      eco-common/common-core/src/main/java/org/eco/common/core/utils/file/FileUploadUtils.java
  19. 8 8
      eco-common/common-core/src/main/java/org/eco/common/core/utils/file/FileUtils.java
  20. 4 4
      eco-common/common-core/src/main/java/org/eco/common/core/utils/file/ImageUtils.java
  21. 1 1
      eco-common/common-core/src/main/java/org/eco/common/core/utils/file/MimeTypeUtils.java
  22. 2 2
      eco-common/common-core/src/main/java/org/eco/common/core/utils/html/EscapeUtil.java
  23. 1 1
      eco-common/common-core/src/main/java/org/eco/common/core/utils/html/HTMLFilter.java
  24. 1 1
      eco-common/common-core/src/main/java/org/eco/common/core/utils/http/HttpHelper.java
  25. 2 2
      eco-common/common-core/src/main/java/org/eco/common/core/utils/http/HttpUtils.java
  26. 2 2
      eco-common/common-core/src/main/java/org/eco/common/core/utils/ip/AddressUtils.java
  27. 2 2
      eco-common/common-core/src/main/java/org/eco/common/core/utils/ip/RegionUtils.java
  28. 1 1
      eco-common/common-core/src/main/java/org/eco/common/core/utils/poi/ExcelHandlerAdapter.java
  29. 9 9
      eco-common/common-core/src/main/java/org/eco/common/core/utils/poi/ExcelUtil.java
  30. 2 2
      eco-common/common-core/src/main/java/org/eco/common/core/utils/reflect/ReflectUtils.java
  31. 1 1
      eco-common/common-core/src/main/java/org/eco/common/core/utils/sign/Base64.java
  32. 1 1
      eco-common/common-core/src/main/java/org/eco/common/core/utils/sign/Md5Utils.java
  33. 2 2
      eco-common/common-core/src/main/java/org/eco/common/core/utils/sql/SqlUtil.java
  34. 1 1
      eco-common/common-core/src/main/java/org/eco/common/core/utils/uuid/IdUtils.java
  35. 3 3
      eco-common/common-core/src/main/java/org/eco/common/core/utils/uuid/Seq.java
  36. 1 1
      eco-common/common-core/src/main/java/org/eco/common/core/utils/uuid/UUID.java
  37. 1 1
      eco-common/common-core/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
  38. 1 1
      eco-common/common-encrypt/src/main/java/org/eco/common/encrypt/core/encryptor/RsaEncryptor.java
  39. 1 1
      eco-common/common-encrypt/src/main/java/org/eco/common/encrypt/core/encryptor/Sm2Encryptor.java
  40. 2 2
      eco-common/common-encrypt/src/main/java/org/eco/common/encrypt/filter/CryptoFilter.java
  41. 1 1
      eco-common/common-encrypt/src/main/java/org/eco/common/encrypt/interceptor/MybatisDecryptInterceptor.java
  42. 1 1
      eco-common/common-encrypt/src/main/java/org/eco/common/encrypt/interceptor/MybatisEncryptInterceptor.java
  43. 1 1
      eco-common/common-excel/src/main/java/org/eco/common/excel/annotation/ExcelDictFormat.java
  44. 2 2
      eco-common/common-excel/src/main/java/org/eco/common/excel/convert/ExcelDictConvert.java
  45. 1 1
      eco-common/common-excel/src/main/java/org/eco/common/excel/convert/ExcelEnumConvert.java
  46. 1 1
      eco-common/common-excel/src/main/java/org/eco/common/excel/core/CellMergeStrategy.java
  47. 2 2
      eco-common/common-excel/src/main/java/org/eco/common/excel/core/DefaultExcelListener.java
  48. 2 2
      eco-common/common-excel/src/main/java/org/eco/common/excel/core/ExcelDownHandler.java
  49. 2 2
      eco-common/common-excel/src/main/java/org/eco/common/excel/utils/ExcelUtil.java
  50. 2 2
      eco-common/common-json/src/main/java/org/eco/common/json/utils/JsonUtils.java
  51. 9 10
      eco-common/common-log/src/main/java/org/eco/common/log/aspect/LogAspect.java
  52. 1 1
      eco-common/common-orm/src/main/java/org/eco/common/orm/core/page/PageQuery.java
  53. 2 2
      eco-common/common-orm/src/main/java/org/eco/common/orm/core/service/impl/BaseServiceImpl.java
  54. 3 3
      eco-common/common-oss/src/main/java/org/eco/common/oss/core/OssClient.java
  55. 1 1
      eco-common/common-oss/src/main/java/org/eco/common/oss/factory/OssFactory.java
  56. 3 3
      eco-common/common-ratelimiter/src/main/java/org/eco/common/ratelimiter/aspectj/RateLimiterAspect.java
  57. 1 1
      eco-common/common-redis/src/main/java/org/eco/common/redis/config/RedisConfig.java
  58. 1 1
      eco-common/common-redis/src/main/java/org/eco/common/redis/handler/KeyPrefixHandler.java
  59. 1 1
      eco-common/common-redis/src/main/java/org/eco/common/redis/utils/CacheUtils.java
  60. 1 1
      eco-common/common-redis/src/main/java/org/eco/common/redis/utils/QueueUtils.java
  61. 1 1
      eco-common/common-redis/src/main/java/org/eco/common/redis/utils/RedisUtils.java
  62. 1 1
      eco-common/common-security/src/main/java/org/eco/common/security/config/SecurityConfig.java
  63. 1 1
      eco-common/common-security/src/main/java/org/eco/common/security/handler/AllUrlHandler.java
  64. 1 1
      eco-common/common-security/src/main/java/org/eco/common/security/handler/GlobalExceptionHandler.java
  65. 2 2
      eco-common/common-security/src/main/java/org/eco/common/security/listener/UserActionListener.java
  66. 1 1
      eco-common/common-springdoc/src/main/java/org/eco/common/springdoc/config/SpringDocConfig.java
  67. 1 1
      eco-common/common-tenant/src/main/java/org/eco/common/tenant/config/TenantConfig.java
  68. 1 1
      eco-common/common-tenant/src/main/java/org/eco/common/tenant/handle/TenantKeyPrefixHandler.java
  69. 1 1
      eco-common/common-tenant/src/main/java/org/eco/common/tenant/manager/TenantSpringCacheManager.java
  70. 3 3
      eco-common/common-web/src/main/java/org/eco/common/web/aspectj/RepeatSubmitAspect.java
  71. 1 1
      eco-common/common-web/src/main/java/org/eco/common/web/config/FilterConfig.java
  72. 2 2
      eco-common/common-web/src/main/java/org/eco/common/web/config/ResourcesConfig.java
  73. 1 1
      eco-common/common-web/src/main/java/org/eco/common/web/core/BaseController.java
  74. 1 1
      eco-common/common-web/src/main/java/org/eco/common/web/filter/RepeatableFilter.java
  75. 1 1
      eco-common/common-web/src/main/java/org/eco/common/web/filter/XssFilter.java
  76. 1 1
      eco-common/common-web/src/main/java/org/eco/common/web/filter/XssHttpServletRequestWrapper.java
  77. 6 6
      eco-common/common-web/src/main/java/org/eco/common/web/interceptor/FlexWebInvokeTimeInterceptor.java
  78. 1 1
      eco-common/common-web/src/main/java/org/eco/common/web/utils/UnsignedMathGenerator.java
  79. 2 2
      eco-extra/monitor/src/main/java/org/eco/monitor/admin/MonitorAdminApplication.java
  80. 6 6
      eco-extra/monitor/src/main/resources/application.yml
  81. 1 1
      eco-extra/powerjob-server/src/main/resources/application-dev.properties
  82. 1 1
      eco-extra/powerjob-server/src/main/resources/application-prod.properties
  83. 2 2
      eco-extra/powerjob-server/src/main/resources/application.properties
  84. 1 1
      eco-modules/generator/src/main/java/org/eco/generator/controller/GenController.java
  85. 1 1
      eco-modules/generator/src/main/java/org/eco/generator/domain/GenTable.java
  86. 1 1
      eco-modules/generator/src/main/java/org/eco/generator/domain/GenTableColumn.java
  87. 1 1
      eco-modules/generator/src/main/java/org/eco/generator/service/GenTableColumnServiceImpl.java
  88. 5 5
      eco-modules/generator/src/main/java/org/eco/generator/service/GenTableServiceImpl.java
  89. 1 1
      eco-modules/generator/src/main/java/org/eco/generator/util/GenUtils.java
  90. 2 2
      eco-modules/generator/src/main/java/org/eco/generator/util/VelocityUtils.java
  91. 3 3
      eco-modules/generator/src/main/resources/generator.yml
  92. 3 3
      eco-modules/generator/src/main/resources/mapper/generator/GenTableColumnMapper.xml
  93. 9 9
      eco-modules/generator/src/main/resources/mapper/generator/GenTableMapper.xml
  94. 2 2
      eco-modules/generator/src/main/resources/vm/java/listener.java.vm
  95. 2 2
      eco-modules/generator/src/main/resources/vm/java/serviceImpl.java.vm
  96. 1 1
      eco-modules/system/src/main/java/org/eco/system/aspectj/DataScopeAspect.java
  97. 1 1
      eco-modules/system/src/main/java/org/eco/system/config/ServerConfig.java
  98. 1 1
      eco-modules/system/src/main/java/org/eco/system/controller/monitor/CacheController.java
  99. 2 2
      eco-modules/system/src/main/java/org/eco/system/controller/monitor/SysUserOnlineController.java
  100. 1 1
      eco-modules/system/src/main/java/org/eco/system/controller/system/SysDeptController.java

+ 1 - 1
README.md

@@ -1,3 +1,3 @@
-# km
+# eco
 
 脚手架

+ 1 - 1
eco-common/common-core/src/main/java/org/eco/common/core/config/AsyncConfig.java

@@ -2,7 +2,7 @@ package org.eco.common.core.config;
 
 import cn.hutool.core.util.ArrayUtil;
 import org.eco.common.core.exception.ServiceException;
-import com.km.common.core.utils.SpringUtils;
+import org.eco.common.core.utils.SpringUtils;
 import org.springframework.aop.interceptor.AsyncUncaughtExceptionHandler;
 import org.springframework.boot.autoconfigure.AutoConfiguration;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;

+ 4 - 4
eco-common/common-core/src/main/java/org/eco/common/core/config/KmConfig.java → eco-common/common-core/src/main/java/org/eco/common/core/config/EcoConfig.java

@@ -12,8 +12,8 @@ import org.springframework.stereotype.Component;
  */
 @Setter
 @Component
-@ConfigurationProperties(prefix = "km")
-public class KmConfig {
+@ConfigurationProperties(prefix = "eco")
+public class EcoConfig {
 
     /**
      * 文件路径
@@ -47,11 +47,11 @@ public class KmConfig {
     private boolean demoEnabled;
 
     public void setProfile(String profile) {
-        KmConfig.profile = profile;
+        EcoConfig.profile = profile;
     }
 
     public void setAddressEnabled(boolean addressEnabled) {
-        KmConfig.addressEnabled = addressEnabled;
+        EcoConfig.addressEnabled = addressEnabled;
     }
 
     /**

+ 1 - 1
eco-common/common-core/src/main/java/org/eco/common/core/config/ThreadPoolConfig.java

@@ -1,6 +1,6 @@
 package org.eco.common.core.config;
 
-import com.km.common.core.utils.Threads;
+import org.eco.common.core.utils.Threads;
 import jakarta.annotation.PreDestroy;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.concurrent.BasicThreadFactory;

+ 1 - 1
eco-common/common-core/src/main/java/org/eco/common/core/core/page/PageDomain.java

@@ -1,6 +1,6 @@
 package org.eco.common.core.core.page;
 
-import com.km.common.core.utils.StringUtils;
+import org.eco.common.core.utils.StringUtils;
 
 /**
  * 分页数据

+ 1 - 1
eco-common/common-core/src/main/java/org/eco/common/core/core/page/TableSupport.java

@@ -1,7 +1,7 @@
 package org.eco.common.core.core.page;
 
 import org.eco.common.core.core.text.Convert;
-import com.km.common.core.utils.ServletUtils;
+import org.eco.common.core.utils.ServletUtils;
 
 /**
  * 表格数据处理

+ 1 - 1
eco-common/common-core/src/main/java/org/eco/common/core/core/text/CharsetKit.java

@@ -1,6 +1,6 @@
 package org.eco.common.core.core.text;
 
-import com.km.common.core.utils.StringUtils;
+import org.eco.common.core.utils.StringUtils;
 
 import java.nio.charset.Charset;
 import java.nio.charset.StandardCharsets;

+ 1 - 1
eco-common/common-core/src/main/java/org/eco/common/core/core/text/Convert.java

@@ -1,6 +1,6 @@
 package org.eco.common.core.core.text;
 
-import com.km.common.core.utils.StringUtils;
+import org.eco.common.core.utils.StringUtils;
 import org.apache.commons.lang3.ArrayUtils;
 
 import java.math.BigDecimal;

+ 1 - 1
eco-common/common-core/src/main/java/org/eco/common/core/core/text/StrFormatter.java

@@ -1,6 +1,6 @@
 package org.eco.common.core.core.text;
 
-import com.km.common.core.utils.StringUtils;
+import org.eco.common.core.utils.StringUtils;
 
 /**
  * 字符串格式化

+ 1 - 1
eco-common/common-core/src/main/java/org/eco/common/core/enums/UserType.java

@@ -1,6 +1,6 @@
 package org.eco.common.core.enums;
 
-import com.km.common.core.utils.StringUtils;
+import org.eco.common.core.utils.StringUtils;
 
 /**
  * 设备类型

+ 2 - 2
eco-common/common-core/src/main/java/org/eco/common/core/exception/base/BaseException.java

@@ -1,7 +1,7 @@
 package org.eco.common.core.exception.base;
 
-import com.km.common.core.utils.MessageUtils;
-import com.km.common.core.utils.StringUtils;
+import org.eco.common.core.utils.MessageUtils;
+import org.eco.common.core.utils.StringUtils;
 
 import java.io.Serial;
 

+ 1 - 1
eco-common/common-core/src/main/java/org/eco/common/core/factory/YmlPropertySourceFactory.java

@@ -1,6 +1,6 @@
 package org.eco.common.core.factory;
 
-import com.km.common.core.utils.StringUtils;
+import org.eco.common.core.utils.StringUtils;
 import org.springframework.beans.factory.config.YamlPropertiesFactoryBean;
 import org.springframework.core.env.PropertiesPropertySource;
 import org.springframework.core.env.PropertySource;

+ 1 - 1
eco-common/common-core/src/main/java/org/eco/common/core/manager/ShutdownManager.java

@@ -1,6 +1,6 @@
 package org.eco.common.core.manager;
 
-import com.km.common.core.utils.Threads;
+import org.eco.common.core.utils.Threads;
 import jakarta.annotation.PreDestroy;
 import jakarta.annotation.Resource;
 import org.slf4j.Logger;

+ 1 - 1
eco-common/common-core/src/main/java/org/eco/common/core/utils/TreeBuildUtils.java

@@ -5,7 +5,7 @@ import cn.hutool.core.lang.tree.Tree;
 import cn.hutool.core.lang.tree.TreeNodeConfig;
 import cn.hutool.core.lang.tree.TreeUtil;
 import cn.hutool.core.lang.tree.parser.NodeParser;
-import com.km.common.core.utils.reflect.ReflectUtils;
+import org.eco.common.core.utils.reflect.ReflectUtils;
 import lombok.AccessLevel;
 import lombok.NoArgsConstructor;
 

+ 1 - 1
eco-common/common-core/src/main/java/org/eco/common/core/utils/bean/BeanUtils.java

@@ -1,4 +1,4 @@
-package com.km.common.core.utils.bean;
+package org.eco.common.core.utils.bean;
 
 import java.lang.reflect.Method;
 import java.util.ArrayList;

+ 1 - 1
eco-common/common-core/src/main/java/org/eco/common/core/utils/bean/BeanValidators.java

@@ -1,4 +1,4 @@
-package com.km.common.core.utils.bean;
+package org.eco.common.core.utils.bean;
 
 import jakarta.validation.ConstraintViolation;
 import jakarta.validation.ConstraintViolationException;

+ 3 - 3
eco-common/common-core/src/main/java/org/eco/common/core/utils/file/FileTypeUtils.java

@@ -1,4 +1,4 @@
-package com.km.common.core.utils.file;
+package org.eco.common.core.utils.file;
 
 import org.apache.commons.lang3.StringUtils;
 
@@ -13,7 +13,7 @@ public class FileTypeUtils {
     /**
      * 获取文件类型
      * <p>
-     * 例如: km.txt, 返回: txt
+     * 例如: XX.txt, 返回: txt
      *
      * @param file 文件名
      * @return 后缀(不含".")
@@ -28,7 +28,7 @@ public class FileTypeUtils {
     /**
      * 获取文件类型
      * <p>
-     * 例如: km.txt, 返回: txt
+     * 例如: xx.txt, 返回: txt
      *
      * @param fileName 文件名
      * @return 后缀(不含".")

+ 7 - 7
eco-common/common-core/src/main/java/org/eco/common/core/utils/file/FileUploadUtils.java

@@ -1,13 +1,13 @@
-package com.km.common.core.utils.file;
+package org.eco.common.core.utils.file;
 
-import org.eco.common.core.config.KmConfig;
+import org.eco.common.core.config.EcoConfig;
 import org.eco.common.core.constant.Constants;
 import org.eco.common.core.exception.file.FileNameLengthLimitExceededException;
 import org.eco.common.core.exception.file.FileSizeLimitExceededException;
 import org.eco.common.core.exception.file.InvalidExtensionException;
-import com.km.common.core.utils.DateUtils;
-import com.km.common.core.utils.StringUtils;
-import com.km.common.core.utils.uuid.Seq;
+import org.eco.common.core.utils.DateUtils;
+import org.eco.common.core.utils.StringUtils;
+import org.eco.common.core.utils.uuid.Seq;
 import org.apache.commons.io.FilenameUtils;
 import org.springframework.web.multipart.MultipartFile;
 
@@ -35,7 +35,7 @@ public class FileUploadUtils {
     /**
      * 默认上传的地址
      */
-    private static String defaultBaseDir = KmConfig.getProfile();
+    private static String defaultBaseDir = EcoConfig.getProfile();
 
     public static String getDefaultBaseDir() {
         return defaultBaseDir;
@@ -125,7 +125,7 @@ public class FileUploadUtils {
     }
 
     public static final String getPathFileName(String uploadDir, String fileName) throws IOException {
-        int dirLastIndex = KmConfig.getProfile().length() + 1;
+        int dirLastIndex = EcoConfig.getProfile().length() + 1;
         String currentDir = StringUtils.substring(uploadDir, dirLastIndex);
         return Constants.RESOURCE_PREFIX + "/" + currentDir + "/" + fileName;
     }

+ 8 - 8
eco-common/common-core/src/main/java/org/eco/common/core/utils/file/FileUtils.java

@@ -1,10 +1,10 @@
-package com.km.common.core.utils.file;
+package org.eco.common.core.utils.file;
 
 import cn.hutool.core.io.FileUtil;
-import org.eco.common.core.config.KmConfig;
-import com.km.common.core.utils.DateUtils;
-import com.km.common.core.utils.StringUtils;
-import com.km.common.core.utils.uuid.IdUtils;
+import org.eco.common.core.config.EcoConfig;
+import org.eco.common.core.utils.DateUtils;
+import org.eco.common.core.utils.StringUtils;
+import org.eco.common.core.utils.uuid.IdUtils;
 import jakarta.servlet.http.HttpServletRequest;
 import jakarta.servlet.http.HttpServletResponse;
 import lombok.AccessLevel;
@@ -68,7 +68,7 @@ public class FileUtils extends FileUtil {
      * @throws IOException IO异常
      */
     public static String writeImportBytes(byte[] data) throws IOException {
-        return writeByte(data, KmConfig.getImportPath());
+        return writeByte(data, EcoConfig.getImportPath());
     }
 
     /**
@@ -223,7 +223,7 @@ public class FileUtils extends FileUtil {
     }
 
     /**
-     * 获取文件名称 /profile/upload/2022/04/16/km.png -- km.png
+     * 获取文件名称 /profile/upload/2022/04/16/xx.png -- xx.png
      *
      * @param fileName 路径名称
      * @return 没有文件路径的名称
@@ -239,7 +239,7 @@ public class FileUtils extends FileUtil {
     }
 
     /**
-     * 获取不带后缀文件名称 /profile/upload/2022/04/16/km.png -- km
+     * 获取不带后缀文件名称 /profile/upload/2022/04/16/xx.png -- xx
      *
      * @param fileName 路径名称
      * @return 没有文件路径和后缀的名称

+ 4 - 4
eco-common/common-core/src/main/java/org/eco/common/core/utils/file/ImageUtils.java

@@ -1,8 +1,8 @@
-package com.km.common.core.utils.file;
+package org.eco.common.core.utils.file;
 
-import org.eco.common.core.config.KmConfig;
+import org.eco.common.core.config.EcoConfig;
 import org.eco.common.core.constant.Constants;
-import com.km.common.core.utils.StringUtils;
+import org.eco.common.core.utils.StringUtils;
 import org.apache.poi.util.IOUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -64,7 +64,7 @@ public class ImageUtils {
                 in = urlConnection.getInputStream();
             } else {
                 // 本机地址
-                String localPath = KmConfig.getProfile();
+                String localPath = EcoConfig.getProfile();
                 String downloadPath = localPath + StringUtils.substringAfter(url, Constants.RESOURCE_PREFIX);
                 in = new FileInputStream(downloadPath);
             }

+ 1 - 1
eco-common/common-core/src/main/java/org/eco/common/core/utils/file/MimeTypeUtils.java

@@ -1,4 +1,4 @@
-package com.km.common.core.utils.file;
+package org.eco.common.core.utils.file;
 
 /**
  * 媒体类型工具类

+ 2 - 2
eco-common/common-core/src/main/java/org/eco/common/core/utils/html/EscapeUtil.java

@@ -1,6 +1,6 @@
-package com.km.common.core.utils.html;
+package org.eco.common.core.utils.html;
 
-import com.km.common.core.utils.StringUtils;
+import org.eco.common.core.utils.StringUtils;
 
 /**
  * 转义和反转义工具类

+ 1 - 1
eco-common/common-core/src/main/java/org/eco/common/core/utils/html/HTMLFilter.java

@@ -1,4 +1,4 @@
-package com.km.common.core.utils.html;
+package org.eco.common.core.utils.html;
 
 import java.util.ArrayList;
 import java.util.Collections;

+ 1 - 1
eco-common/common-core/src/main/java/org/eco/common/core/utils/http/HttpHelper.java

@@ -1,4 +1,4 @@
-package com.km.common.core.utils.http;
+package org.eco.common.core.utils.http;
 
 import jakarta.servlet.ServletRequest;
 import org.apache.commons.lang3.exception.ExceptionUtils;

+ 2 - 2
eco-common/common-core/src/main/java/org/eco/common/core/utils/http/HttpUtils.java

@@ -1,7 +1,7 @@
-package com.km.common.core.utils.http;
+package org.eco.common.core.utils.http;
 
 import org.eco.common.core.constant.Constants;
-import com.km.common.core.utils.StringUtils;
+import org.eco.common.core.utils.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

+ 2 - 2
eco-common/common-core/src/main/java/org/eco/common/core/utils/ip/AddressUtils.java

@@ -1,8 +1,8 @@
-package com.km.common.core.utils.ip;
+package org.eco.common.core.utils.ip;
 
 import cn.hutool.core.net.NetUtil;
 import cn.hutool.http.HtmlUtil;
-import com.km.common.core.utils.StringUtils;
+import org.eco.common.core.utils.StringUtils;
 import lombok.AccessLevel;
 import lombok.NoArgsConstructor;
 import lombok.extern.slf4j.Slf4j;

+ 2 - 2
eco-common/common-core/src/main/java/org/eco/common/core/utils/ip/RegionUtils.java

@@ -1,10 +1,10 @@
-package com.km.common.core.utils.ip;
+package org.eco.common.core.utils.ip;
 
 import cn.hutool.core.io.FileUtil;
 import cn.hutool.core.io.resource.ClassPathResource;
 import cn.hutool.core.util.ObjectUtil;
 import org.eco.common.core.exception.ServiceException;
-import com.km.common.core.utils.file.FileUtils;
+import org.eco.common.core.utils.file.FileUtils;
 import lombok.extern.slf4j.Slf4j;
 import org.lionsoul.ip2region.xdb.Searcher;
 

+ 1 - 1
eco-common/common-core/src/main/java/org/eco/common/core/utils/poi/ExcelHandlerAdapter.java

@@ -1,4 +1,4 @@
-package com.km.common.core.utils.poi;
+package org.eco.common.core.utils.poi;
 
 import org.apache.poi.ss.usermodel.Cell;
 import org.apache.poi.ss.usermodel.Workbook;

+ 9 - 9
eco-common/common-core/src/main/java/org/eco/common/core/utils/poi/ExcelUtil.java

@@ -1,16 +1,16 @@
-package com.km.common.core.utils.poi;
+package org.eco.common.core.utils.poi;
 
 import org.eco.common.core.annotation.Excel;
 import org.eco.common.core.annotation.Excels;
-import org.eco.common.core.config.KmConfig;
+import org.eco.common.core.config.EcoConfig;
 import org.eco.common.core.core.domain.CommonResult;
 import org.eco.common.core.core.text.Convert;
-import com.km.common.core.utils.DateUtils;
-import com.km.common.core.utils.StringUtils;
-import com.km.common.core.utils.file.FileTypeUtils;
-import com.km.common.core.utils.file.FileUtils;
-import com.km.common.core.utils.file.ImageUtils;
-import com.km.common.core.utils.reflect.ReflectUtils;
+import org.eco.common.core.utils.DateUtils;
+import org.eco.common.core.utils.StringUtils;
+import org.eco.common.core.utils.file.FileTypeUtils;
+import org.eco.common.core.utils.file.FileUtils;
+import org.eco.common.core.utils.file.ImageUtils;
+import org.eco.common.core.utils.reflect.ReflectUtils;
 import jakarta.servlet.http.HttpServletResponse;
 import org.apache.commons.lang3.ArrayUtils;
 import org.apache.commons.lang3.RegExUtils;
@@ -1162,7 +1162,7 @@ public class ExcelUtil<T> {
      * @param filename 文件名称
      */
     public String getAbsoluteFile(String filename) {
-        String downloadPath = KmConfig.getDownloadPath() + filename;
+        String downloadPath = EcoConfig.getDownloadPath() + filename;
         File desc = new File(downloadPath);
         if (!desc.getParentFile().exists()) {
             desc.getParentFile().mkdirs();

+ 2 - 2
eco-common/common-core/src/main/java/org/eco/common/core/utils/reflect/ReflectUtils.java

@@ -1,8 +1,8 @@
-package com.km.common.core.utils.reflect;
+package org.eco.common.core.utils.reflect;
 
 import cn.hutool.core.util.ReflectUtil;
 import org.eco.common.core.core.text.Convert;
-import com.km.common.core.utils.DateUtils;
+import org.eco.common.core.utils.DateUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.lang3.Validate;
 import org.apache.poi.ss.usermodel.DateUtil;

+ 1 - 1
eco-common/common-core/src/main/java/org/eco/common/core/utils/sign/Base64.java

@@ -1,4 +1,4 @@
-package com.km.common.core.utils.sign;
+package org.eco.common.core.utils.sign;
 
 /**
  * Base64工具类

+ 1 - 1
eco-common/common-core/src/main/java/org/eco/common/core/utils/sign/Md5Utils.java

@@ -1,4 +1,4 @@
-package com.km.common.core.utils.sign;
+package org.eco.common.core.utils.sign;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

+ 2 - 2
eco-common/common-core/src/main/java/org/eco/common/core/utils/sql/SqlUtil.java

@@ -1,6 +1,6 @@
-package com.km.common.core.utils.sql;
+package org.eco.common.core.utils.sql;
 
-import com.km.common.core.utils.StringUtils;
+import org.eco.common.core.utils.StringUtils;
 
 /**
  * sql操作工具类

+ 1 - 1
eco-common/common-core/src/main/java/org/eco/common/core/utils/uuid/IdUtils.java

@@ -1,4 +1,4 @@
-package com.km.common.core.utils.uuid;
+package org.eco.common.core.utils.uuid;
 
 /**
  * ID生成器工具类

+ 3 - 3
eco-common/common-core/src/main/java/org/eco/common/core/utils/uuid/Seq.java

@@ -1,7 +1,7 @@
-package com.km.common.core.utils.uuid;
+package org.eco.common.core.utils.uuid;
 
-import com.km.common.core.utils.DateUtils;
-import com.km.common.core.utils.StringUtils;
+import org.eco.common.core.utils.DateUtils;
+import org.eco.common.core.utils.StringUtils;
 
 import java.util.concurrent.atomic.AtomicInteger;
 

+ 1 - 1
eco-common/common-core/src/main/java/org/eco/common/core/utils/uuid/UUID.java

@@ -1,4 +1,4 @@
-package com.km.common.core.utils.uuid;
+package org.eco.common.core.utils.uuid;
 
 import java.security.MessageDigest;
 import java.security.NoSuchAlgorithmException;

+ 1 - 1
eco-common/common-core/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports

@@ -1,5 +1,5 @@
 org.eco.common.core.config.ApplicationConfig
 org.eco.common.core.config.AsyncConfig
-org.eco.common.core.config.KmConfig
+org.eco.common.core.config.EcoConfig
 org.eco.common.core.config.ThreadPoolConfig
 org.eco.common.core.config.ValidatorConfig

+ 1 - 1
eco-common/common-encrypt/src/main/java/org/eco/common/encrypt/core/encryptor/RsaEncryptor.java

@@ -1,6 +1,6 @@
 package org.eco.common.encrypt.core.encryptor;
 
-import com.km.common.core.utils.StringUtils;
+import org.eco.common.core.utils.StringUtils;
 import org.eco.common.encrypt.core.EncryptContext;
 import org.eco.common.encrypt.enumd.AlgorithmType;
 import org.eco.common.encrypt.enumd.EncodeType;

+ 1 - 1
eco-common/common-encrypt/src/main/java/org/eco/common/encrypt/core/encryptor/Sm2Encryptor.java

@@ -1,6 +1,6 @@
 package org.eco.common.encrypt.core.encryptor;
 
-import com.km.common.core.utils.StringUtils;
+import org.eco.common.core.utils.StringUtils;
 import org.eco.common.encrypt.core.EncryptContext;
 import org.eco.common.encrypt.enumd.AlgorithmType;
 import org.eco.common.encrypt.enumd.EncodeType;

+ 2 - 2
eco-common/common-encrypt/src/main/java/org/eco/common/encrypt/filter/CryptoFilter.java

@@ -3,8 +3,8 @@ package org.eco.common.encrypt.filter;
 import cn.hutool.core.util.ObjectUtil;
 import org.eco.common.core.constant.HttpStatus;
 import org.eco.common.core.exception.ServiceException;
-import com.km.common.core.utils.SpringUtils;
-import com.km.common.core.utils.StringUtils;
+import org.eco.common.core.utils.SpringUtils;
+import org.eco.common.core.utils.StringUtils;
 import org.eco.common.encrypt.annotation.ApiEncrypt;
 import org.eco.common.encrypt.properties.ApiDecryptProperties;
 import jakarta.servlet.Filter;

+ 1 - 1
eco-common/common-encrypt/src/main/java/org/eco/common/encrypt/interceptor/MybatisDecryptInterceptor.java

@@ -3,7 +3,7 @@ package org.eco.common.encrypt.interceptor;
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.convert.Convert;
 import cn.hutool.core.util.ObjectUtil;
-import com.km.common.core.utils.StringUtils;
+import org.eco.common.core.utils.StringUtils;
 import org.eco.common.encrypt.annotation.EncryptField;
 import org.eco.common.encrypt.core.EncryptContext;
 import org.eco.common.encrypt.core.EncryptorManager;

+ 1 - 1
eco-common/common-encrypt/src/main/java/org/eco/common/encrypt/interceptor/MybatisEncryptInterceptor.java

@@ -3,7 +3,7 @@ package org.eco.common.encrypt.interceptor;
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.convert.Convert;
 import cn.hutool.core.util.ObjectUtil;
-import com.km.common.core.utils.StringUtils;
+import org.eco.common.core.utils.StringUtils;
 import org.eco.common.encrypt.annotation.EncryptField;
 import org.eco.common.encrypt.core.EncryptContext;
 import org.eco.common.encrypt.core.EncryptorManager;

+ 1 - 1
eco-common/common-excel/src/main/java/org/eco/common/excel/annotation/ExcelDictFormat.java

@@ -1,6 +1,6 @@
 package org.eco.common.excel.annotation;
 
-import com.km.common.core.utils.StringUtils;
+import org.eco.common.core.utils.StringUtils;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Inherited;

+ 2 - 2
eco-common/common-excel/src/main/java/org/eco/common/excel/convert/ExcelDictConvert.java

@@ -10,8 +10,8 @@ import com.alibaba.excel.metadata.data.ReadCellData;
 import com.alibaba.excel.metadata.data.WriteCellData;
 import com.alibaba.excel.metadata.property.ExcelContentProperty;
 import org.eco.common.core.service.DictService;
-import com.km.common.core.utils.SpringUtils;
-import com.km.common.core.utils.StringUtils;
+import org.eco.common.core.utils.SpringUtils;
+import org.eco.common.core.utils.StringUtils;
 import org.eco.common.excel.annotation.ExcelDictFormat;
 import org.eco.common.excel.utils.ExcelUtil;
 import lombok.extern.slf4j.Slf4j;

+ 1 - 1
eco-common/common-excel/src/main/java/org/eco/common/excel/convert/ExcelEnumConvert.java

@@ -9,7 +9,7 @@ import com.alibaba.excel.metadata.GlobalConfiguration;
 import com.alibaba.excel.metadata.data.ReadCellData;
 import com.alibaba.excel.metadata.data.WriteCellData;
 import com.alibaba.excel.metadata.property.ExcelContentProperty;
-import com.km.common.core.utils.reflect.ReflectUtils;
+import org.eco.common.core.utils.reflect.ReflectUtils;
 import org.eco.common.excel.annotation.ExcelEnumFormat;
 import lombok.extern.slf4j.Slf4j;
 

+ 1 - 1
eco-common/common-excel/src/main/java/org/eco/common/excel/core/CellMergeStrategy.java

@@ -4,7 +4,7 @@ import cn.hutool.core.collection.CollUtil;
 import com.alibaba.excel.annotation.ExcelProperty;
 import com.alibaba.excel.metadata.Head;
 import com.alibaba.excel.write.merge.AbstractMergeStrategy;
-import com.km.common.core.utils.reflect.ReflectUtils;
+import org.eco.common.core.utils.reflect.ReflectUtils;
 import org.eco.common.excel.annotation.CellMerge;
 import lombok.AllArgsConstructor;
 import lombok.Data;

+ 2 - 2
eco-common/common-excel/src/main/java/org/eco/common/excel/core/DefaultExcelListener.java

@@ -5,8 +5,8 @@ import com.alibaba.excel.context.AnalysisContext;
 import com.alibaba.excel.event.AnalysisEventListener;
 import com.alibaba.excel.exception.ExcelAnalysisException;
 import com.alibaba.excel.exception.ExcelDataConvertException;
-import com.km.common.core.utils.StreamUtils;
-import com.km.common.core.utils.ValidatorUtils;
+import org.eco.common.core.utils.StreamUtils;
+import org.eco.common.core.utils.ValidatorUtils;
 import org.eco.common.json.utils.JsonUtils;
 import jakarta.validation.ConstraintViolation;
 import jakarta.validation.ConstraintViolationException;

+ 2 - 2
eco-common/common-excel/src/main/java/org/eco/common/excel/core/ExcelDownHandler.java

@@ -13,8 +13,8 @@ import com.alibaba.excel.write.metadata.holder.WriteSheetHolder;
 import com.alibaba.excel.write.metadata.holder.WriteWorkbookHolder;
 import org.eco.common.core.exception.ServiceException;
 import org.eco.common.core.service.DictService;
-import com.km.common.core.utils.SpringUtils;
-import com.km.common.core.utils.StreamUtils;
+import org.eco.common.core.utils.SpringUtils;
+import org.eco.common.core.utils.StreamUtils;
 import org.eco.common.excel.annotation.ExcelDictFormat;
 import org.eco.common.excel.annotation.ExcelEnumFormat;
 import lombok.extern.slf4j.Slf4j;

+ 2 - 2
eco-common/common-excel/src/main/java/org/eco/common/excel/utils/ExcelUtil.java

@@ -10,8 +10,8 @@ import com.alibaba.excel.write.metadata.WriteSheet;
 import com.alibaba.excel.write.metadata.fill.FillConfig;
 import com.alibaba.excel.write.metadata.fill.FillWrapper;
 import com.alibaba.excel.write.style.column.LongestMatchColumnWidthStyleStrategy;
-import com.km.common.core.utils.StringUtils;
-import com.km.common.core.utils.file.FileUtils;
+import org.eco.common.core.utils.StringUtils;
+import org.eco.common.core.utils.file.FileUtils;
 import org.eco.common.excel.convert.ExcelBigNumberConvert;
 import org.eco.common.excel.core.CellMergeStrategy;
 import org.eco.common.excel.core.DefaultExcelListener;

+ 2 - 2
eco-common/common-json/src/main/java/org/eco/common/json/utils/JsonUtils.java

@@ -7,8 +7,8 @@ import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.core.type.TypeReference;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.exc.MismatchedInputException;
-import com.km.common.core.utils.SpringUtils;
-import com.km.common.core.utils.StringUtils;
+import org.eco.common.core.utils.SpringUtils;
+import org.eco.common.core.utils.StringUtils;
 import lombok.AccessLevel;
 import lombok.NoArgsConstructor;
 

+ 9 - 10
eco-common/common-log/src/main/java/org/eco/common/log/aspect/LogAspect.java

@@ -5,15 +5,6 @@ import cn.hutool.core.map.MapUtil;
 import cn.hutool.core.util.ArrayUtil;
 import cn.hutool.core.util.ObjectUtil;
 import com.alibaba.ttl.TransmittableThreadLocal;
-import org.eco.common.core.core.domain.model.LoginUser;
-import com.km.common.core.utils.ServletUtils;
-import com.km.common.core.utils.SpringUtils;
-import com.km.common.core.utils.StringUtils;
-import org.eco.common.json.utils.JsonUtils;
-import org.eco.common.log.annotation.Log;
-import org.eco.common.log.enums.BusinessStatus;
-import org.eco.common.log.event.OperLogEvent;
-import org.eco.common.security.utils.LoginHelper;
 import jakarta.servlet.http.HttpServletRequest;
 import jakarta.servlet.http.HttpServletResponse;
 import lombok.extern.slf4j.Slf4j;
@@ -23,6 +14,15 @@ import org.aspectj.lang.annotation.AfterReturning;
 import org.aspectj.lang.annotation.AfterThrowing;
 import org.aspectj.lang.annotation.Aspect;
 import org.aspectj.lang.annotation.Before;
+import org.eco.common.core.core.domain.model.LoginUser;
+import org.eco.common.core.utils.ServletUtils;
+import org.eco.common.core.utils.SpringUtils;
+import org.eco.common.core.utils.StringUtils;
+import org.eco.common.json.utils.JsonUtils;
+import org.eco.common.log.annotation.Log;
+import org.eco.common.log.enums.BusinessStatus;
+import org.eco.common.log.event.OperLogEvent;
+import org.eco.common.security.utils.LoginHelper;
 import org.springframework.boot.autoconfigure.AutoConfiguration;
 import org.springframework.http.HttpMethod;
 import org.springframework.validation.BindingResult;
@@ -120,7 +120,6 @@ public class LogAspect {
         } catch (Exception exp) {
             // 记录本地异常日志
             log.error("异常信息:{}", exp.getMessage());
-            exp.printStackTrace();
         } finally {
             TIME_THREADLOCAL.remove();
         }

+ 1 - 1
eco-common/common-orm/src/main/java/org/eco/common/orm/core/page/PageQuery.java

@@ -1,7 +1,7 @@
 package org.eco.common.orm.core.page;
 
 import org.eco.common.core.core.text.Convert;
-import com.km.common.core.utils.ServletUtils;
+import org.eco.common.core.utils.ServletUtils;
 import com.mybatisflex.core.paginate.Page;
 import lombok.Data;
 

+ 2 - 2
eco-common/common-orm/src/main/java/org/eco/common/orm/core/service/impl/BaseServiceImpl.java

@@ -2,8 +2,8 @@ package org.eco.common.orm.core.service.impl;
 
 import org.eco.common.core.core.page.PageDomain;
 import org.eco.common.core.core.page.TableSupport;
-import com.km.common.core.utils.StringUtils;
-import com.km.common.core.utils.sql.SqlUtil;
+import org.eco.common.core.utils.sql.SqlUtil;
+import org.eco.common.core.utils.StringUtils;
 import org.eco.common.orm.core.service.IBaseService;
 import com.mybatisflex.core.BaseMapper;
 import com.mybatisflex.core.query.QueryWrapper;

+ 3 - 3
eco-common/common-oss/src/main/java/org/eco/common/oss/core/OssClient.java

@@ -3,9 +3,9 @@ package org.eco.common.oss.core;
 import cn.hutool.core.io.IoUtil;
 import cn.hutool.core.util.IdUtil;
 import org.eco.common.core.constant.Constants;
-import com.km.common.core.utils.DateUtils;
-import com.km.common.core.utils.StringUtils;
-import com.km.common.core.utils.file.FileUtils;
+import org.eco.common.core.utils.DateUtils;
+import org.eco.common.core.utils.StringUtils;
+import org.eco.common.core.utils.file.FileUtils;
 import org.eco.common.oss.constant.OssConstant;
 import org.eco.common.oss.entity.UploadResult;
 import org.eco.common.oss.enumd.AccessPolicyType;

+ 1 - 1
eco-common/common-oss/src/main/java/org/eco/common/oss/factory/OssFactory.java

@@ -1,7 +1,7 @@
 package org.eco.common.oss.factory;
 
 import org.eco.common.core.constant.CacheNames;
-import com.km.common.core.utils.StringUtils;
+import org.eco.common.core.utils.StringUtils;
 import org.eco.common.json.utils.JsonUtils;
 import org.eco.common.oss.constant.OssConstant;
 import org.eco.common.oss.core.OssClient;

+ 3 - 3
eco-common/common-ratelimiter/src/main/java/org/eco/common/ratelimiter/aspectj/RateLimiterAspect.java

@@ -3,9 +3,9 @@ package org.eco.common.ratelimiter.aspectj;
 import cn.hutool.core.util.ArrayUtil;
 import org.eco.common.core.constant.GlobalConstants;
 import org.eco.common.core.exception.ServiceException;
-import com.km.common.core.utils.MessageUtils;
-import com.km.common.core.utils.ServletUtils;
-import com.km.common.core.utils.StringUtils;
+import org.eco.common.core.utils.MessageUtils;
+import org.eco.common.core.utils.ServletUtils;
+import org.eco.common.core.utils.StringUtils;
 import org.eco.common.ratelimiter.annotation.RateLimiter;
 import org.eco.common.ratelimiter.enums.LimitType;
 import org.eco.common.redis.utils.RedisUtils;

+ 1 - 1
eco-common/common-redis/src/main/java/org/eco/common/redis/config/RedisConfig.java

@@ -120,7 +120,7 @@ public class RedisConfig {
      *   # 集群配置
      *   clusterServersConfig:
      *     # 客户端名称
-     *     clientName: ${km.name}
+     *     clientName: ${eco.name}
      *     # master最小空闲连接数
      *     masterConnectionMinimumIdleSize: 32
      *     # master连接池大小

+ 1 - 1
eco-common/common-redis/src/main/java/org/eco/common/redis/handler/KeyPrefixHandler.java

@@ -1,6 +1,6 @@
 package org.eco.common.redis.handler;
 
-import com.km.common.core.utils.StringUtils;
+import org.eco.common.core.utils.StringUtils;
 import org.redisson.api.NameMapper;
 
 /**

+ 1 - 1
eco-common/common-redis/src/main/java/org/eco/common/redis/utils/CacheUtils.java

@@ -1,6 +1,6 @@
 package org.eco.common.redis.utils;
 
-import com.km.common.core.utils.SpringUtils;
+import org.eco.common.core.utils.SpringUtils;
 import lombok.AccessLevel;
 import lombok.NoArgsConstructor;
 import org.redisson.api.RMap;

+ 1 - 1
eco-common/common-redis/src/main/java/org/eco/common/redis/utils/QueueUtils.java

@@ -1,6 +1,6 @@
 package org.eco.common.redis.utils;
 
-import com.km.common.core.utils.SpringUtils;
+import org.eco.common.core.utils.SpringUtils;
 import lombok.AccessLevel;
 import lombok.NoArgsConstructor;
 import org.redisson.api.RBlockingQueue;

+ 1 - 1
eco-common/common-redis/src/main/java/org/eco/common/redis/utils/RedisUtils.java

@@ -1,6 +1,6 @@
 package org.eco.common.redis.utils;
 
-import com.km.common.core.utils.SpringUtils;
+import org.eco.common.core.utils.SpringUtils;
 import lombok.AccessLevel;
 import lombok.NoArgsConstructor;
 import org.redisson.api.ObjectListener;

+ 1 - 1
eco-common/common-security/src/main/java/org/eco/common/security/config/SecurityConfig.java

@@ -3,7 +3,7 @@ package org.eco.common.security.config;
 import cn.dev33.satoken.interceptor.SaInterceptor;
 import cn.dev33.satoken.router.SaRouter;
 import cn.dev33.satoken.stp.StpUtil;
-import com.km.common.core.utils.SpringUtils;
+import org.eco.common.core.utils.SpringUtils;
 import org.eco.common.security.config.properties.SecurityProperties;
 import org.eco.common.security.handler.AllUrlHandler;
 import lombok.RequiredArgsConstructor;

+ 1 - 1
eco-common/common-security/src/main/java/org/eco/common/security/handler/AllUrlHandler.java

@@ -1,7 +1,7 @@
 package org.eco.common.security.handler;
 
 import cn.hutool.core.util.ReUtil;
-import com.km.common.core.utils.SpringUtils;
+import org.eco.common.core.utils.SpringUtils;
 import lombok.Data;
 import org.springframework.beans.factory.InitializingBean;
 import org.springframework.web.method.HandlerMethod;

+ 1 - 1
eco-common/common-security/src/main/java/org/eco/common/security/handler/GlobalExceptionHandler.java

@@ -8,7 +8,7 @@ import cn.hutool.http.HttpStatus;
 import org.eco.common.core.core.domain.CommonResult;
 import org.eco.common.core.exception.ServiceException;
 import org.eco.common.core.exception.base.BaseException;
-import com.km.common.core.utils.StreamUtils;
+import org.eco.common.core.utils.StreamUtils;
 import jakarta.servlet.http.HttpServletRequest;
 import jakarta.validation.ConstraintViolation;
 import jakarta.validation.ConstraintViolationException;

+ 2 - 2
eco-common/common-security/src/main/java/org/eco/common/security/listener/UserActionListener.java

@@ -9,8 +9,8 @@ import org.eco.common.core.constant.CacheConstants;
 import org.eco.common.core.core.domain.dto.UserOnlineDTO;
 import org.eco.common.core.core.domain.model.LoginUser;
 import org.eco.common.core.enums.UserType;
-import com.km.common.core.utils.ServletUtils;
-import com.km.common.core.utils.ip.AddressUtils;
+import org.eco.common.core.utils.ServletUtils;
+import org.eco.common.core.utils.ip.AddressUtils;
 import org.eco.common.redis.utils.RedisUtils;
 import org.eco.common.security.utils.LoginHelper;
 import lombok.RequiredArgsConstructor;

+ 1 - 1
eco-common/common-springdoc/src/main/java/org/eco/common/springdoc/config/SpringDocConfig.java

@@ -1,6 +1,6 @@
 package org.eco.common.springdoc.config;
 
-import com.km.common.core.utils.StringUtils;
+import org.eco.common.core.utils.StringUtils;
 import org.eco.common.springdoc.config.properties.SpringDocProperties;
 import org.eco.common.springdoc.handler.OpenApiHandler;
 import io.swagger.v3.oas.models.OpenAPI;

+ 1 - 1
eco-common/common-tenant/src/main/java/org/eco/common/tenant/config/TenantConfig.java

@@ -2,7 +2,7 @@ package org.eco.common.tenant.config;
 
 import cn.dev33.satoken.dao.SaTokenDao;
 import cn.hutool.core.util.ObjectUtil;
-import com.km.common.core.utils.reflect.ReflectUtils;
+import org.eco.common.core.utils.reflect.ReflectUtils;
 import org.eco.common.orm.config.MyBatisFlexConfig;
 import org.eco.common.redis.config.RedisConfig;
 import org.eco.common.redis.config.properties.RedissonProperties;

+ 1 - 1
eco-common/common-tenant/src/main/java/org/eco/common/tenant/handle/TenantKeyPrefixHandler.java

@@ -2,7 +2,7 @@ package org.eco.common.tenant.handle;
 
 import cn.hutool.core.util.ObjectUtil;
 import org.eco.common.core.constant.GlobalConstants;
-import com.km.common.core.utils.StringUtils;
+import org.eco.common.core.utils.StringUtils;
 import org.eco.common.redis.handler.KeyPrefixHandler;
 import org.eco.common.tenant.helper.TenantHelper;
 import lombok.extern.slf4j.Slf4j;

+ 1 - 1
eco-common/common-tenant/src/main/java/org/eco/common/tenant/manager/TenantSpringCacheManager.java

@@ -1,7 +1,7 @@
 package org.eco.common.tenant.manager;
 
 import org.eco.common.core.constant.GlobalConstants;
-import com.km.common.core.utils.StringUtils;
+import org.eco.common.core.utils.StringUtils;
 import org.eco.common.redis.manager.FlexSpringCacheManager;
 import org.eco.common.tenant.helper.TenantHelper;
 import org.springframework.cache.Cache;

+ 3 - 3
eco-common/common-web/src/main/java/org/eco/common/web/aspectj/RepeatSubmitAspect.java

@@ -7,9 +7,9 @@ import cn.hutool.crypto.SecureUtil;
 import org.eco.common.core.constant.GlobalConstants;
 import org.eco.common.core.core.domain.CommonResult;
 import org.eco.common.core.exception.ServiceException;
-import com.km.common.core.utils.MessageUtils;
-import com.km.common.core.utils.ServletUtils;
-import com.km.common.core.utils.StringUtils;
+import org.eco.common.core.utils.MessageUtils;
+import org.eco.common.core.utils.ServletUtils;
+import org.eco.common.core.utils.StringUtils;
 import org.eco.common.json.utils.JsonUtils;
 import org.eco.common.redis.utils.RedisUtils;
 import org.eco.common.web.annotation.RepeatSubmit;

+ 1 - 1
eco-common/common-web/src/main/java/org/eco/common/web/config/FilterConfig.java

@@ -1,6 +1,6 @@
 package org.eco.common.web.config;
 
-import com.km.common.core.utils.StringUtils;
+import org.eco.common.core.utils.StringUtils;
 import org.eco.common.web.config.properties.XssProperties;
 import org.eco.common.web.filter.RepeatableFilter;
 import org.eco.common.web.filter.XssFilter;

+ 2 - 2
eco-common/common-web/src/main/java/org/eco/common/web/config/ResourcesConfig.java

@@ -1,6 +1,6 @@
 package org.eco.common.web.config;
 
-import org.eco.common.core.config.KmConfig;
+import org.eco.common.core.config.EcoConfig;
 import org.eco.common.core.constant.Constants;
 import org.eco.common.web.interceptor.FlexWebInvokeTimeInterceptor;
 import org.springframework.boot.autoconfigure.AutoConfiguration;
@@ -29,7 +29,7 @@ public class ResourcesConfig implements WebMvcConfigurer {
     @Override
     public void addResourceHandlers(ResourceHandlerRegistry registry) {
         registry.addResourceHandler(Constants.RESOURCE_PREFIX + "/**")
-            .addResourceLocations("file:" + KmConfig.getProfile() + "/");
+            .addResourceLocations("file:" + EcoConfig.getProfile() + "/");
     }
 
 

+ 1 - 1
eco-common/common-web/src/main/java/org/eco/common/web/core/BaseController.java

@@ -1,6 +1,6 @@
 package org.eco.common.web.core;
 
-import com.km.common.core.utils.DateUtils;
+import org.eco.common.core.utils.DateUtils;
 import org.springframework.web.bind.WebDataBinder;
 import org.springframework.web.bind.annotation.InitBinder;
 

+ 1 - 1
eco-common/common-web/src/main/java/org/eco/common/web/filter/RepeatableFilter.java

@@ -1,6 +1,6 @@
 package org.eco.common.web.filter;
 
-import com.km.common.core.utils.StringUtils;
+import org.eco.common.core.utils.StringUtils;
 import jakarta.servlet.Filter;
 import jakarta.servlet.FilterChain;
 import jakarta.servlet.FilterConfig;

+ 1 - 1
eco-common/common-web/src/main/java/org/eco/common/web/filter/XssFilter.java

@@ -1,6 +1,6 @@
 package org.eco.common.web.filter;
 
-import com.km.common.core.utils.StringUtils;
+import org.eco.common.core.utils.StringUtils;
 import jakarta.servlet.Filter;
 import jakarta.servlet.FilterChain;
 import jakarta.servlet.FilterConfig;

+ 1 - 1
eco-common/common-web/src/main/java/org/eco/common/web/filter/XssHttpServletRequestWrapper.java

@@ -3,7 +3,7 @@ package org.eco.common.web.filter;
 import cn.hutool.core.io.IoUtil;
 import cn.hutool.core.util.StrUtil;
 import cn.hutool.http.HtmlUtil;
-import com.km.common.core.utils.StringUtils;
+import org.eco.common.core.utils.StringUtils;
 import jakarta.servlet.ReadListener;
 import jakarta.servlet.ServletInputStream;
 import jakarta.servlet.http.HttpServletRequest;

+ 6 - 6
eco-common/common-web/src/main/java/org/eco/common/web/interceptor/FlexWebInvokeTimeInterceptor.java

@@ -3,8 +3,8 @@ package org.eco.common.web.interceptor;
 import cn.hutool.core.io.IoUtil;
 import cn.hutool.core.map.MapUtil;
 import com.alibaba.ttl.TransmittableThreadLocal;
-import com.km.common.core.utils.SpringUtils;
-import com.km.common.core.utils.StringUtils;
+import org.eco.common.core.utils.SpringUtils;
+import org.eco.common.core.utils.StringUtils;
 import org.eco.common.json.utils.JsonUtils;
 import org.eco.common.web.filter.RepeatedlyRequestWrapper;
 import jakarta.servlet.http.HttpServletRequest;
@@ -43,14 +43,14 @@ public class FlexWebInvokeTimeInterceptor implements HandlerInterceptor {
                     BufferedReader reader = request.getReader();
                     jsonParam = IoUtil.read(reader);
                 }
-                log.info("[Km]开始请求 => URL[{}],参数类型[json],参数:[{}]", url, jsonParam);
+                log.info("[Eco]开始请求 => URL[{}],参数类型[json],参数:[{}]", url, jsonParam);
             } else {
                 Map<String, String[]> parameterMap = request.getParameterMap();
                 if (MapUtil.isNotEmpty(parameterMap)) {
                     String parameters = JsonUtils.toJsonString(parameterMap);
-                    log.info("[Km]开始请求 => URL[{}],参数类型[param],参数:[{}]", url, parameters);
+                    log.info("[Eco]开始请求 => URL[{}],参数类型[param],参数:[{}]", url, parameters);
                 } else {
-                    log.info("[Km]开始请求 => URL[{}],无参数", url);
+                    log.info("[Eco]开始请求 => URL[{}],无参数", url);
                 }
             }
 
@@ -71,7 +71,7 @@ public class FlexWebInvokeTimeInterceptor implements HandlerInterceptor {
         if (!prodProfile.equals(SpringUtils.getActiveProfile())) {
             StopWatch stopWatch = invokeTimeTL.get();
             stopWatch.stop();
-            log.info("[Km]结束请求 => URL[{}],耗时:[{}]毫秒", request.getMethod() + " " + request.getRequestURI(), stopWatch.getTime());
+            log.info("[Eco]结束请求 => URL[{}],耗时:[{}]毫秒", request.getMethod() + " " + request.getRequestURI(), stopWatch.getTime());
             invokeTimeTL.remove();
         }
     }

+ 1 - 1
eco-common/common-web/src/main/java/org/eco/common/web/utils/UnsignedMathGenerator.java

@@ -4,7 +4,7 @@ import cn.hutool.captcha.generator.CodeGenerator;
 import cn.hutool.core.math.Calculator;
 import cn.hutool.core.util.CharUtil;
 import cn.hutool.core.util.RandomUtil;
-import com.km.common.core.utils.StringUtils;
+import org.eco.common.core.utils.StringUtils;
 
 import java.io.Serial;
 

+ 2 - 2
eco-extra/monitor/src/main/java/org/eco/monitor/admin/KmMonitorAdminApplication.java → eco-extra/monitor/src/main/java/org/eco/monitor/admin/MonitorAdminApplication.java

@@ -11,10 +11,10 @@ import org.springframework.boot.autoconfigure.SpringBootApplication;
  */
 @EnableAdminServer
 @SpringBootApplication
-public class KmMonitorAdminApplication {
+public class MonitorAdminApplication {
 
     public static void main(String[] args) {
-        SpringApplication.run(KmMonitorAdminApplication.class, args);
+        SpringApplication.run(MonitorAdminApplication.class, args);
         System.out.println("SpringBoot Admin 监控程序启动成功!");
     }
 

+ 6 - 6
eco-extra/monitor/src/main/resources/application.yml

@@ -2,23 +2,23 @@ server:
   port: 9099
 spring:
   application:
-    name: Km-Monitor-AdminServer
+    name: Monitor-AdminServer
   profiles:
     active: @profiles.active@
 
 logging:
-  config: classpath:logback-km-monitor.xml
+  config: classpath:logback-monitor.xml
 
 --- # 监控中心服务端配置
 spring:
   security:
     user:
-      name: km
+      name: eco
       password: 123456
   boot:
     admin:
       ui:
-        title: Km服务监控中心
+        title: 服务监控中心
       context-path: /admin
 
 --- # Actuator 监控端点的配置项
@@ -31,7 +31,7 @@ management:
     health:
       show-details: ALWAYS
     logfile:
-      external-file: ./logs/km-monitor.log
+      external-file: ./logs/monitor.log
 
 --- # 监控配置
 spring.boot.admin.client:
@@ -41,5 +41,5 @@ spring.boot.admin.client:
   url: http://localhost:9099/admin
   instance:
     service-host-type: IP
-  username: km
+  username: eco
   password: 123456

+ 1 - 1
eco-extra/powerjob-server/src/main/resources/application-dev.properties

@@ -25,7 +25,7 @@ spring.boot.admin.client.enabled=true
 # 设置 Spring Boot Admin Server 地址
 spring.boot.admin.client.url:http://localhost:9099/admin
 spring.boot.admin.client.instance.service-host-type=IP
-spring.boot.admin.client.username=km
+spring.boot.admin.client.username=eco
 spring.boot.admin.client.password=123456
 ####### MongoDB properties(Non-core configuration properties)  #######
 ####### delete mongodb config to disable mongodb #######

+ 1 - 1
eco-extra/powerjob-server/src/main/resources/application-prod.properties

@@ -12,7 +12,7 @@ spring.boot.admin.client.enabled=true
 # 设置 Spring Boot Admin Server 地址
 spring.boot.admin.client.url:http://localhost:9090/admin
 spring.boot.admin.client.instance.service-host-type=IP
-spring.boot.admin.client.username=km
+spring.boot.admin.client.username=eco
 spring.boot.admin.client.password=123456
 ####### MongoDB properties(Non-core configuration properties)  #######
 ####### delete mongodb config to disable mongodb #######

+ 2 - 2
eco-extra/powerjob-server/src/main/resources/application.properties

@@ -24,8 +24,8 @@ oms.http.port=10010
 oms.table-prefix=pj_
 
 # Actuator 监控端点的配置项
-spring.application.name: Km-Powerjob-Server
+spring.application.name: Powerjob-Server
 management.endpoints.web.exposure.include=*
 management.endpoint.health.show-details=ALWAYS
-management.endpoint.logfile.external-file=./logs/km-powerjob-server.log
+management.endpoint.logfile.external-file=./logs/powerjob-server.log
 management.health.mongo.enabled=${oms.mongodb.enable}

+ 1 - 1
eco-modules/generator/src/main/java/org/eco/generator/controller/GenController.java

@@ -172,7 +172,7 @@ public class GenController extends BaseController {
         response.reset();
         response.addHeader("Access-Control-Allow-Origin", "*");
         response.addHeader("Access-Control-Expose-Headers", "Content-Disposition");
-        response.setHeader("Content-Disposition", "attachment; filename=\"km.zip\"");
+        response.setHeader("Content-Disposition", "attachment; filename=\"eco-code.zip\"");
         response.addHeader("Content-Length", "" + data.length);
         response.setContentType("application/octet-stream; charset=UTF-8");
         IOUtils.write(data, response.getOutputStream());

+ 1 - 1
eco-modules/generator/src/main/java/org/eco/generator/domain/GenTable.java

@@ -3,7 +3,7 @@ package org.eco.generator.domain;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import org.eco.common.core.constant.GenConstants;
-import com.km.common.core.utils.StringUtils;
+import org.eco.common.core.utils.StringUtils;
 import com.mybatisflex.annotation.Column;
 import com.mybatisflex.annotation.Id;
 import com.mybatisflex.annotation.Table;

+ 1 - 1
eco-modules/generator/src/main/java/org/eco/generator/domain/GenTableColumn.java

@@ -1,7 +1,7 @@
 package org.eco.generator.domain;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
-import com.km.common.core.utils.StringUtils;
+import org.eco.common.core.utils.StringUtils;
 import com.mybatisflex.annotation.Column;
 import com.mybatisflex.annotation.Id;
 import com.mybatisflex.annotation.Table;

+ 1 - 1
eco-modules/generator/src/main/java/org/eco/generator/service/GenTableColumnServiceImpl.java

@@ -15,7 +15,7 @@ import org.springframework.stereotype.Service;
 import java.util.Date;
 import java.util.List;
 
-import static com.km.generator.domain.table.GenTableColumnTableDef.GEN_TABLE_COLUMN;
+import static org.eco.generator.domain.table.GenTableColumnTableDef.GEN_TABLE_COLUMN;
 
 /**
  * 业务字段 服务层实现

+ 5 - 5
eco-modules/generator/src/main/java/org/eco/generator/service/GenTableServiceImpl.java

@@ -9,9 +9,9 @@ import org.eco.common.core.constant.GenConstants;
 import org.eco.common.core.core.page.PageResult;
 import org.eco.common.core.core.text.CharsetKit;
 import org.eco.common.core.exception.ServiceException;
-import com.km.common.core.utils.DateUtils;
-import com.km.common.core.utils.StreamUtils;
-import com.km.common.core.utils.StringUtils;
+import org.eco.common.core.utils.DateUtils;
+import org.eco.common.core.utils.StreamUtils;
+import org.eco.common.core.utils.StringUtils;
 import org.eco.common.orm.core.page.PageQuery;
 import org.eco.common.orm.core.service.impl.BaseServiceImpl;
 import org.eco.common.security.utils.LoginHelper;
@@ -51,8 +51,8 @@ import java.util.Map;
 import java.util.zip.ZipEntry;
 import java.util.zip.ZipOutputStream;
 
-import static com.km.generator.domain.table.GenTableColumnTableDef.GEN_TABLE_COLUMN;
-import static com.km.generator.domain.table.GenTableTableDef.GEN_TABLE;
+import static org.eco.generator.domain.table.GenTableColumnTableDef.GEN_TABLE_COLUMN;
+import static org.eco.generator.domain.table.GenTableTableDef.GEN_TABLE;
 
 /**
  * 业务 服务层实现

+ 1 - 1
eco-modules/generator/src/main/java/org/eco/generator/util/GenUtils.java

@@ -1,7 +1,7 @@
 package org.eco.generator.util;
 
 import org.eco.common.core.constant.GenConstants;
-import com.km.common.core.utils.StringUtils;
+import org.eco.common.core.utils.StringUtils;
 import org.eco.common.security.utils.LoginHelper;
 import org.eco.generator.config.GenConfig;
 import org.eco.generator.domain.GenTable;

+ 2 - 2
eco-modules/generator/src/main/java/org/eco/generator/util/VelocityUtils.java

@@ -4,8 +4,8 @@ import cn.hutool.core.collection.CollUtil;
 import com.alibaba.fastjson2.JSON;
 import com.alibaba.fastjson2.JSONObject;
 import org.eco.common.core.constant.GenConstants;
-import com.km.common.core.utils.DateUtils;
-import com.km.common.core.utils.StringUtils;
+import org.eco.common.core.utils.DateUtils;
+import org.eco.common.core.utils.StringUtils;
 import org.eco.common.orm.helper.DataBaseHelper;
 import org.eco.generator.domain.GenTable;
 import org.eco.generator.domain.GenTableColumn;

+ 3 - 3
eco-modules/generator/src/main/resources/generator.yml

@@ -1,12 +1,12 @@
 # 代码生成
 gen:
   # 作者
-  author: km
+  author: wgk
   # 默认生成包路径 system 需改成自己的模块名称 如 system monitor tool
-  packageName: com.km.demo
+  packageName: org.eco.demo
   # 自动去除表前后缀,默认是false
   autoRemove: true
   # 表前缀(生成类名不会包含表前缀,多个用逗号分隔)
-  tablePrefix: sys_,km_
+  tablePrefix: sys_,eco_
   # 表后缀(生成类名不会包含表前缀,多个用逗号分隔)
   tableSuffix: _t

+ 3 - 3
eco-modules/generator/src/main/resources/mapper/generator/GenTableColumnMapper.xml

@@ -56,7 +56,7 @@
     </sql>
 
     <select id="selectDbTableColumnsByName" parameterType="String" resultMap="GenTableColumnResult">
-        <if test="@com.km.common.orm.helper.DataBaseHelper@isMySql()">
+        <if test="@org.eco.common.orm.helper.DataBaseHelper@isMySql()">
             select column_name,
             (case when (is_nullable = 'no' <![CDATA[ && ]]> column_key != 'PRI') then '1' else '0' end) as is_required,
             (case when column_key = 'PRI' then '1' else '0' end) as is_pk,
@@ -67,7 +67,7 @@
             from information_schema.columns where table_schema = (select database()) and table_name = (#{tableName})
             order by ordinal_position
         </if>
-        <if test="@com.km.common.orm.helper.DataBaseHelper@isPostgreSql()">
+        <if test="@org.eco.common.orm.helper.DataBaseHelper@isPostgreSql()">
             SELECT column_name, is_required, is_pk, sort, column_comment, is_increment, column_type
             FROM (
             SELECT c.relname AS table_name,
@@ -101,7 +101,7 @@
             WHERE table_name = (#{tableName})
             AND column_type <![CDATA[ <> ]]> '-'
         </if>
-        <if test="@com.km.common.orm.helper.DataBaseHelper@isDmSql()">
+        <if test="@org.eco.common.orm.helper.DataBaseHelper@isDmSql()">
             select sc.NAME column_name,
             (case when sc.NULLABLE$ = 'N' then '1' else null end) as is_required,
             (case when sc.INFO2 = 1 then '1' else '0' end) is_pk,

+ 9 - 9
eco-modules/generator/src/main/resources/mapper/generator/GenTableMapper.xml

@@ -78,7 +78,7 @@
     </sql>
 
     <select id="selectDbTableList" resultMap="GenTableResult">
-        <if test="@com.km.common.orm.helper.DataBaseHelper@isMySql()">
+        <if test="@org.eco.common.orm.helper.DataBaseHelper@isMySql()">
             select table_name, table_comment, create_time, update_time
             from information_schema.tables
             where table_schema = (select database())
@@ -93,7 +93,7 @@
             order by create_time desc
             limit ${pageOffset}, ${pageSize}
         </if>
-        <if test="@com.km.common.orm.helper.DataBaseHelper@isPostgreSql()">
+        <if test="@org.eco.common.orm.helper.DataBaseHelper@isPostgreSql()">
             select table_name, table_comment, create_time, update_time
             from (
             SELECT c.relname AS table_name,
@@ -118,7 +118,7 @@
             order by create_time desc
             limit ${pageSize} OFFSET ${pageOffset}
         </if>
-        <if test="@com.km.common.orm.helper.DataBaseHelper@isDmSql()">
+        <if test="@org.eco.common.orm.helper.DataBaseHelper@isDmSql()">
             select so.NAME table_name, st.COMMENT$ table_comment, so.CRTDATE create_time from SYS.SYSOBJECTS so left join
             SYS.SYSTABLECOMMENTS st on so.NAME = st.TVNAME and st.TABLE_TYPE = 'TABLE' and st.SCHNAME = (select CURR_SCH
             from V$SESSIONS WHERE CURR_SCH = 'km' LIMIT 1)
@@ -141,7 +141,7 @@
 
     <select id="selectDbTableList_COUNT" resultType="long">
         select count(*) from
-        <if test="@com.km.common.orm.helper.DataBaseHelper@isMySql()">
+        <if test="@org.eco.common.orm.helper.DataBaseHelper@isMySql()">
             (select table_name, table_comment, create_time, update_time
             from information_schema.tables
             where table_schema = (select database())
@@ -155,7 +155,7 @@
             </if>
             ) t
         </if>
-        <if test="@com.km.common.orm.helper.DataBaseHelper@isPostgreSql()">
+        <if test="@org.eco.common.orm.helper.DataBaseHelper@isPostgreSql()">
             (select table_name, table_comment, create_time, update_time
             from (
             SELECT c.relname AS table_name,
@@ -178,7 +178,7 @@
                 AND lower(table_comment) like lower(concat('%', #{tableComment}, '%'))
             </if>) t
         </if>
-        <if test="@com.km.common.orm.helper.DataBaseHelper@isDmSql()">
+        <if test="@org.eco.common.orm.helper.DataBaseHelper@isDmSql()">
             (select so.NAME table_name, st.COMMENT$ table_comment, so.CRTDATE create_time from SYS.SYSOBJECTS so left
             join
             SYS.SYSTABLECOMMENTS st on so.NAME = st.TVNAME and st.TABLE_TYPE = 'TABLE' and st.SCHNAME = (select CURR_SCH
@@ -199,7 +199,7 @@
     </select>
 
     <select id="selectDbTableListByNames" resultMap="GenTableResult">
-        <if test="@com.km.common.orm.helper.DataBaseHelper@isMySql()">
+        <if test="@org.eco.common.orm.helper.DataBaseHelper@isMySql()">
             select table_name, table_comment, create_time, update_time from information_schema.tables
             where table_name NOT LIKE 'pj_%' and table_name NOT LIKE 'gen_%' and table_schema = (select database())
             and table_name in
@@ -207,7 +207,7 @@
                 #{name}
             </foreach>
         </if>
-        <if test="@com.km.common.orm.helper.DataBaseHelper@isPostgreSql()">
+        <if test="@org.eco.common.orm.helper.DataBaseHelper@isPostgreSql()">
             select table_name, table_comment, create_time, update_time
             from (
             SELECT c.relname AS table_name,
@@ -227,7 +227,7 @@
                 #{name}
             </foreach>
         </if>
-        <if test="@com.km.common.orm.helper.DataBaseHelper@isDmSql()">
+        <if test="@org.eco.common.orm.helper.DataBaseHelper@isDmSql()">
             select so.NAME table_name, st.COMMENT$ table_comment, so.CRTDATE create_time from SYS.SYSOBJECTS so left join
             SYS.SYSTABLECOMMENTS st on so.NAME = st.TVNAME and st.TABLE_TYPE = 'TABLE' and st.SCHNAME = (select CURR_SCH
             from V$SESSIONS WHERE CURR_SCH = 'km' LIMIT 1)

+ 2 - 2
eco-modules/generator/src/main/resources/vm/java/listener.java.vm

@@ -5,8 +5,8 @@ import cn.hutool.core.util.ObjectUtil;
 import com.alibaba.excel.context.AnalysisContext;
 import com.alibaba.excel.event.AnalysisEventListener;
 import org.eco.common.core.exception.ServiceException;
-import com.km.common.core.utils.SpringUtils;
-import com.km.common.core.utils.ValidatorUtils;
+import org.eco.common.core.utils.SpringUtils;
+import org.eco.common.core.utils.ValidatorUtils;
 import org.eco.common.excel.core.ExcelListener;
 import org.eco.common.excel.core.ExcelResult;
 import ${packageName}.domain.bo.${ClassName}Bo;

+ 2 - 2
eco-modules/generator/src/main/resources/vm/java/serviceImpl.java.vm

@@ -6,8 +6,8 @@ import java.util.List;
 import cn.hutool.core.util.ObjectUtil;
 import com.mybatisflex.core.paginate.Page;
 import com.mybatisflex.core.query.QueryWrapper;
-import com.km.common.core.utils.MapstructUtils;
-import com.km.common.core.utils.StringUtils;
+import org.eco.common.core.utils.MapstructUtils;
+import org.eco.common.core.utils.StringUtils;
 import org.eco.common.orm.core.page.PageQuery;
 import org.eco.common.core.core.page.PageResult;
 import org.eco.common.orm.core.service.impl.BaseServiceImpl;

+ 1 - 1
eco-modules/system/src/main/java/org/eco/system/aspectj/DataScopeAspect.java

@@ -2,7 +2,7 @@ package org.eco.system.aspectj;
 
 import org.eco.common.core.annotation.DataScope;
 import org.eco.common.core.core.domain.model.LoginUser;
-import com.km.common.core.utils.StringUtils;
+import org.eco.common.core.utils.StringUtils;
 import org.eco.common.orm.core.domain.BaseEntity;
 import org.eco.common.security.utils.LoginHelper;
 import org.eco.system.domain.vo.SysRoleVo;

+ 1 - 1
eco-modules/system/src/main/java/org/eco/system/config/ServerConfig.java

@@ -1,6 +1,6 @@
 package org.eco.system.config;
 
-import com.km.common.core.utils.ServletUtils;
+import org.eco.common.core.utils.ServletUtils;
 import jakarta.servlet.http.HttpServletRequest;
 import org.springframework.stereotype.Component;
 

+ 1 - 1
eco-modules/system/src/main/java/org/eco/system/controller/monitor/CacheController.java

@@ -3,7 +3,7 @@ package org.eco.system.controller.monitor;
 import cn.dev33.satoken.annotation.SaCheckPermission;
 import org.eco.system.domain.vo.CacheListInfoVo;
 import org.eco.common.core.core.domain.CommonResult;
-import com.km.common.core.utils.StringUtils;
+import org.eco.common.core.utils.StringUtils;
 import lombok.RequiredArgsConstructor;
 import org.redisson.spring.data.connection.RedissonConnectionFactory;
 import org.springframework.data.redis.connection.RedisConnection;

+ 2 - 2
eco-modules/system/src/main/java/org/eco/system/controller/monitor/SysUserOnlineController.java

@@ -9,8 +9,8 @@ import org.eco.common.core.constant.CacheConstants;
 import org.eco.common.core.core.domain.CommonResult;
 import org.eco.common.core.core.domain.dto.UserOnlineDTO;
 import org.eco.common.core.core.page.PageResult;
-import com.km.common.core.utils.StreamUtils;
-import com.km.common.core.utils.StringUtils;
+import org.eco.common.core.utils.StreamUtils;
+import org.eco.common.core.utils.StringUtils;
 import org.eco.common.orm.core.page.PageQuery;
 import org.eco.common.redis.utils.RedisUtils;
 import org.eco.common.web.core.BaseController;

+ 1 - 1
eco-modules/system/src/main/java/org/eco/system/controller/system/SysDeptController.java

@@ -5,7 +5,7 @@ import org.eco.system.domain.bo.SysDeptBo;
 import org.eco.common.core.constant.UserConstants;
 import org.eco.common.core.core.domain.CommonResult;
 import org.eco.common.core.core.text.Convert;
-import com.km.common.core.utils.StringUtils;
+import org.eco.common.core.utils.StringUtils;
 import org.eco.common.log.annotation.Log;
 import org.eco.common.log.enums.BusinessType;
 import org.eco.common.web.core.BaseController;

Some files were not shown because too many files changed in this diff