Merge pull request #7 from lijiahangmax/dev

merge
lijiahangmax · Nov 1, 2024 · 4c07200 · 4c07200
2 parents 43d7f50 + 9de4729
commit 4c07200
Show file tree

Hide file tree

Showing 849 changed files with 3,211 additions and 3,218 deletions.
diff --git a/README.md b/README.md
@@ -2,8 +2,8 @@
 <p align="center">
     <a target="_blank"
        style="text-decoration: none !important;"
-       href="https://search.maven.org/artifact/io.github.lijiahangmax/orion-all">
-        <img src="https://img.shields.io/maven-central/v/io.github.lijiahangmax/orion-all.svg" alt="maven"/>
+       href="https://search.maven.org/artifact/cn.orionsec.kit/orion-all">
+        <img src="https://img.shields.io/maven-central/v/cn.orionsec.kit/orion-all.svg" alt="maven"/>
     </a>
     <a target="_blank"
        style="text-decoration: none !important;"
@@ -63,9 +63,9 @@
 ```xml
 <!-- 模块化引用 -->
 <dependency>
-    <groupId>io.github.lijiahangmax</groupId>
+    <groupId>cn.orionsec.kit</groupId>
     <artifactId>模块名称</artifactId>
-    <version>1.0.9</version>
+    <version>2.0.0</version>
 </dependency>
 ```
 
@@ -74,9 +74,9 @@
 ```xml
 <!-- 如果想引用所有可以直接引入 orion-all -->
 <dependency>
-    <groupId>io.github.lijiahangmax</groupId>
+    <groupId>cn.orionsec.kit</groupId>
     <artifactId>orion-all</artifactId>
-    <version>1.0.9</version>
+    <version>2.0.0</version>
 </dependency>
 ```
 
@@ -454,6 +454,9 @@
 
 <img src="https://yxythpt.oss-cn-shenzhen.aliyuncs.com/2022-03-28/files5090991341399292419.jpg" alt="联系微信" width="268px"/>
 
+📧 问题/加群微信备注: kit  
+📧 合作/功能定制备注: 合作
+
 ### 支持一下
 
 <img src="https://yxythpt.oss-cn-shenzhen.aliyuncs.com/2022-04-25/files4948235556147091810.png" alt="收款码" width="540px"/>

diff --git a/orion-all/pom.xml b/orion-all/pom.xml
@@ -2,9 +2,9 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
-        <groupId>io.github.lijiahangmax</groupId>
+        <groupId>cn.orionsec.kit</groupId>
         <artifactId>orion-kit</artifactId>
-        <version>1.0.9</version>
+        <version>2.0.0</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
@@ -16,70 +16,70 @@
     <dependencies>
         <!-- lang -->
         <dependency>
-            <groupId>io.github.lijiahangmax</groupId>
+            <groupId>cn.orionsec.kit</groupId>
             <artifactId>orion-lang</artifactId>
             <version>${orion.kit.version}</version>
         </dependency>
 
         <!-- ext -->
         <dependency>
-            <groupId>io.github.lijiahangmax</groupId>
+            <groupId>cn.orionsec.kit</groupId>
             <artifactId>orion-ext</artifactId>
             <version>${orion.kit.version}</version>
         </dependency>
 
         <!-- log -->
         <dependency>
-            <groupId>io.github.lijiahangmax</groupId>
+            <groupId>cn.orionsec.kit</groupId>
             <artifactId>orion-log</artifactId>
             <version>${orion.kit.version}</version>
         </dependency>
 
         <!-- office -->
         <dependency>
-            <groupId>io.github.lijiahangmax</groupId>
+            <groupId>cn.orionsec.kit</groupId>
             <artifactId>orion-office</artifactId>
             <version>${orion.kit.version}</version>
         </dependency>
 
         <!-- http -->
         <dependency>
-            <groupId>io.github.lijiahangmax</groupId>
+            <groupId>cn.orionsec.kit</groupId>
             <artifactId>orion-http</artifactId>
             <version>${orion.kit.version}</version>
         </dependency>
 
         <!-- net -->
         <dependency>
-            <groupId>io.github.lijiahangmax</groupId>
+            <groupId>cn.orionsec.kit</groupId>
             <artifactId>orion-net</artifactId>
             <version>${orion.kit.version}</version>
         </dependency>
 
         <!-- web -->
         <dependency>
-            <groupId>io.github.lijiahangmax</groupId>
+            <groupId>cn.orionsec.kit</groupId>
             <artifactId>orion-web</artifactId>
             <version>${orion.kit.version}</version>
         </dependency>
 
         <!-- redis -->
         <dependency>
-            <groupId>io.github.lijiahangmax</groupId>
+            <groupId>cn.orionsec.kit</groupId>
             <artifactId>orion-redis</artifactId>
             <version>${orion.kit.version}</version>
         </dependency>
 
         <!-- spring -->
         <dependency>
-            <groupId>io.github.lijiahangmax</groupId>
+            <groupId>cn.orionsec.kit</groupId>
             <artifactId>orion-spring</artifactId>
             <version>${orion.kit.version}</version>
         </dependency>
 
         <!-- generator -->
         <dependency>
-            <groupId>io.github.lijiahangmax</groupId>
+            <groupId>cn.orionsec.kit</groupId>
             <artifactId>orion-generator</artifactId>
             <version>${orion.kit.version}</version>
         </dependency>

diff --git a/...src/main/java/com/orion/package-info.java → ...in/java/cn/orionsec/kit/package-info.java b/...src/main/java/com/orion/package-info.java → ...in/java/cn/orionsec/kit/package-info.java
@@ -28,5 +28,5 @@
  * <p>
  * [email protected]
  */
-package com.orion;
+package cn.orionsec.kit;
 
diff --git a/...test/java/com/orion/AddLicenseHeader.java → ...ava/cn/orionsec/kit/AddLicenseHeader.java b/...test/java/com/orion/AddLicenseHeader.java → ...ava/cn/orionsec/kit/AddLicenseHeader.java
@@ -19,12 +19,12 @@
  * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
  * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
-package com.orion;
+package cn.orionsec.kit;
 
-import com.orion.lang.define.StopWatch;
-import com.orion.lang.utils.io.FileReaders;
-import com.orion.lang.utils.io.FileWriters;
-import com.orion.lang.utils.io.Files1;
+import cn.orionsec.kit.lang.define.StopWatch;
+import cn.orionsec.kit.lang.utils.io.FileReaders;
+import cn.orionsec.kit.lang.utils.io.FileWriters;
+import cn.orionsec.kit.lang.utils.io.Files1;
 
 import java.io.ByteArrayOutputStream;
 import java.io.File;

diff --git a/orion-all/src/test/java/com/orion/Tests.java → .../src/test/java/cn/orionsec/kit/Tests.java b/orion-all/src/test/java/com/orion/Tests.java → .../src/test/java/cn/orionsec/kit/Tests.java
@@ -19,9 +19,9 @@
  * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
  * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
-package com.orion;
+package cn.orionsec.kit;
 
-import com.orion.lang.define.StopWatch;
+import cn.orionsec.kit.lang.define.StopWatch;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

diff --git a/orion-ext/pom.xml b/orion-ext/pom.xml
@@ -2,9 +2,9 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
-        <groupId>io.github.lijiahangmax</groupId>
+        <groupId>cn.orionsec.kit</groupId>
         <artifactId>orion-kit</artifactId>
-        <version>1.0.9</version>
+        <version>2.0.0</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
@@ -16,14 +16,14 @@
     <dependencies>
         <!-- lang -->
         <dependency>
-            <groupId>io.github.lijiahangmax</groupId>
+            <groupId>cn.orionsec.kit</groupId>
             <artifactId>orion-lang</artifactId>
             <version>${orion.kit.version}</version>
         </dependency>
 
         <!-- log -->
         <dependency>
-            <groupId>io.github.lijiahangmax</groupId>
+            <groupId>cn.orionsec.kit</groupId>
             <artifactId>orion-log</artifactId>
             <version>${orion.kit.version}</version>
         </dependency>

diff --git a/...va/com/orion/ext/KitExtConfiguration.java → ...orionsec/kit/ext/KitExtConfiguration.java b/...va/com/orion/ext/KitExtConfiguration.java → ...orionsec/kit/ext/KitExtConfiguration.java
@@ -19,10 +19,10 @@
  * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
  * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
-package com.orion.ext;
+package cn.orionsec.kit.ext;
 
-import com.orion.lang.config.KitConfig;
-import com.orion.lang.utils.Strings;
+import cn.orionsec.kit.lang.config.KitConfig;
+import cn.orionsec.kit.lang.utils.Strings;
 
 /**
  * orion-ext 配置初始化器

diff --git a/...com/orion/ext/location/LocationConst.java → ...onsec/kit/ext/location/LocationConst.java b/...com/orion/ext/location/LocationConst.java → ...onsec/kit/ext/location/LocationConst.java
@@ -19,10 +19,10 @@
  * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
  * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
-package com.orion.ext.location;
+package cn.orionsec.kit.ext.location;
 
-import com.orion.ext.KitExtConfiguration;
-import com.orion.lang.config.KitConfig;
+import cn.orionsec.kit.ext.KitExtConfiguration;
+import cn.orionsec.kit.lang.config.KitConfig;
 
 /**
  * 地址常量

diff --git a/...n/java/com/orion/ext/location/Region.java → .../cn/orionsec/kit/ext/location/Region.java b/...n/java/com/orion/ext/location/Region.java → .../cn/orionsec/kit/ext/location/Region.java
@@ -19,7 +19,7 @@
  * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
  * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
-package com.orion.ext.location;
+package cn.orionsec.kit.ext.location;
 
 import java.io.Serializable;
 

diff --git a/...m/orion/ext/location/ext/LocationExt.java → ...sec/kit/ext/location/ext/LocationExt.java b/...m/orion/ext/location/ext/LocationExt.java → ...sec/kit/ext/location/ext/LocationExt.java
@@ -19,19 +19,19 @@
  * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
  * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
-package com.orion.ext.location.ext;
+package cn.orionsec.kit.ext.location.ext;
 
-import com.orion.ext.location.Region;
-import com.orion.ext.location.ext.core.IpLocation;
-import com.orion.ext.location.ext.core.LocationSeeker;
-import com.orion.ext.location.region.LocationRegions;
-import com.orion.lang.constant.Const;
-import com.orion.lang.define.builder.StringJoiner;
-import com.orion.lang.utils.Exceptions;
-import com.orion.lang.utils.Strings;
-import com.orion.lang.utils.Systems;
-import com.orion.lang.utils.io.Files1;
-import com.orion.lang.utils.net.IPs;
+import cn.orionsec.kit.ext.location.Region;
+import cn.orionsec.kit.ext.location.ext.core.IpLocation;
+import cn.orionsec.kit.ext.location.ext.core.LocationSeeker;
+import cn.orionsec.kit.ext.location.region.LocationRegions;
+import cn.orionsec.kit.lang.constant.Const;
+import cn.orionsec.kit.lang.define.builder.StringJoiner;
+import cn.orionsec.kit.lang.utils.Exceptions;
+import cn.orionsec.kit.lang.utils.Strings;
+import cn.orionsec.kit.lang.utils.Systems;
+import cn.orionsec.kit.lang.utils.io.Files1;
+import cn.orionsec.kit.lang.utils.net.IPs;
 
 import java.io.File;
 import java.io.IOException;

diff --git a/...ion/ext/location/ext/core/IpLocation.java → ...kit/ext/location/ext/core/IpLocation.java b/...ion/ext/location/ext/core/IpLocation.java → ...kit/ext/location/ext/core/IpLocation.java
@@ -19,10 +19,10 @@
  * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
  * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
-package com.orion.ext.location.ext.core;
+package cn.orionsec.kit.ext.location.ext.core;
 
-import com.orion.ext.location.LocationConst;
-import com.orion.lang.utils.Strings;
+import cn.orionsec.kit.ext.location.LocationConst;
+import cn.orionsec.kit.lang.utils.Strings;
 
 /**
  * ip 所在的国家和地区

diff --git a/...ext/location/ext/core/LocationSeeker.java → ...ext/location/ext/core/LocationSeeker.java b/...ext/location/ext/core/LocationSeeker.java → ...ext/location/ext/core/LocationSeeker.java
@@ -19,13 +19,13 @@
  * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
  * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
-package com.orion.ext.location.ext.core;
+package cn.orionsec.kit.ext.location.ext.core;
 
-import com.orion.ext.location.LocationConst;
-import com.orion.ext.location.Region;
-import com.orion.lang.constant.Const;
-import com.orion.lang.utils.Strings;
-import com.orion.lang.utils.io.Files1;
+import cn.orionsec.kit.ext.location.LocationConst;
+import cn.orionsec.kit.ext.location.Region;
+import cn.orionsec.kit.lang.constant.Const;
+import cn.orionsec.kit.lang.utils.Strings;
+import cn.orionsec.kit.lang.utils.io.Files1;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

diff --git a/.../ext/location/ext/core/SeekerSupport.java → .../ext/location/ext/core/SeekerSupport.java b/.../ext/location/ext/core/SeekerSupport.java → .../ext/location/ext/core/SeekerSupport.java
@@ -19,9 +19,9 @@
  * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
  * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
-package com.orion.ext.location.ext.core;
+package cn.orionsec.kit.ext.location.ext.core;
 
-import com.orion.lang.utils.Strings;
+import cn.orionsec.kit.lang.utils.Strings;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

diff --git a/.../ext/location/region/LocationRegions.java → .../ext/location/region/LocationRegions.java b/.../ext/location/region/LocationRegions.java → .../ext/location/region/LocationRegions.java
@@ -19,19 +19,19 @@
  * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
  * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
-package com.orion.ext.location.region;
+package cn.orionsec.kit.ext.location.region;
 
-import com.orion.ext.location.Region;
-import com.orion.ext.location.region.block.DataBlock;
-import com.orion.ext.location.region.config.DbConfig;
-import com.orion.ext.location.region.core.DbSearcher;
-import com.orion.lang.constant.Const;
-import com.orion.lang.define.builder.StringJoiner;
-import com.orion.lang.utils.Exceptions;
-import com.orion.lang.utils.Strings;
-import com.orion.lang.utils.Systems;
-import com.orion.lang.utils.io.Files1;
-import com.orion.lang.utils.net.IPs;
+import cn.orionsec.kit.ext.location.Region;
+import cn.orionsec.kit.ext.location.region.block.DataBlock;
+import cn.orionsec.kit.ext.location.region.config.DbConfig;
+import cn.orionsec.kit.ext.location.region.core.DbSearcher;
+import cn.orionsec.kit.lang.constant.Const;
+import cn.orionsec.kit.lang.define.builder.StringJoiner;
+import cn.orionsec.kit.lang.utils.Exceptions;
+import cn.orionsec.kit.lang.utils.Strings;
+import cn.orionsec.kit.lang.utils.Systems;
+import cn.orionsec.kit.lang.utils.io.Files1;
+import cn.orionsec.kit.lang.utils.net.IPs;
 
 import java.io.File;
 import java.io.IOException;

diff --git a/.../ext/location/region/block/DataBlock.java → .../ext/location/region/block/DataBlock.java b/.../ext/location/region/block/DataBlock.java → .../ext/location/region/block/DataBlock.java
@@ -19,7 +19,7 @@
  * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
  * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
-package com.orion.ext.location.region.block;
+package cn.orionsec.kit.ext.location.region.block;
 
 /**
  * @author Jiahang Li

diff --git a/...xt/location/region/block/HeaderBlock.java → ...xt/location/region/block/HeaderBlock.java b/...xt/location/region/block/HeaderBlock.java → ...xt/location/region/block/HeaderBlock.java
@@ -19,9 +19,9 @@
  * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
  * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
-package com.orion.ext.location.region.block;
+package cn.orionsec.kit.ext.location.region.block;
 
-import com.orion.ext.location.region.core.RegionSupport;
+import cn.orionsec.kit.ext.location.region.core.RegionSupport;
 
 /**
  * @author Jiahang Li

diff --git a/...ext/location/region/block/IndexBlock.java → ...ext/location/region/block/IndexBlock.java b/...ext/location/region/block/IndexBlock.java → ...ext/location/region/block/IndexBlock.java
@@ -19,9 +19,9 @@
  * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
  * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
-package com.orion.ext.location.region.block;
+package cn.orionsec.kit.ext.location.region.block;
 
-import com.orion.ext.location.region.core.RegionSupport;
+import cn.orionsec.kit.ext.location.region.core.RegionSupport;
 
 /**
  * @author Jiahang Li

diff --git a/.../ext/location/region/config/DbConfig.java → .../ext/location/region/config/DbConfig.java b/.../ext/location/region/config/DbConfig.java → .../ext/location/region/config/DbConfig.java
@@ -19,9 +19,9 @@
  * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
  * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
-package com.orion.ext.location.region.config;
+package cn.orionsec.kit.ext.location.region.config;
 
-import com.orion.lang.constant.Const;
+import cn.orionsec.kit.lang.constant.Const;
 
 import java.io.Serializable;