Merge pull request #3 from lijiahangmax/dev

merge
lijiahangmax · Feb 23, 2024 · 14ba61d · 14ba61d
2 parents 3c0939a + b57e85e
commit 14ba61d
Show file tree

Hide file tree

Showing 315 changed files with 9,482 additions and 8,406 deletions.
diff --git a/README.md b/README.md
@@ -50,7 +50,7 @@ orion-all       | 全部模块聚合 包含了上述所有模块的引用
 
 ### 如何使用
 ``` pom.xml
-# 当前最新版本 1.0.5
+# 当前最新版本 1.0.6
 <dependency>
     <groupId>io.github.lijiahangmax</groupId>
     <artifactId>模块名称</artifactId>
@@ -61,7 +61,7 @@ orion-all       | 全部模块聚合 包含了上述所有模块的引用
 <dependency>
     <groupId>io.github.lijiahangmax</groupId>
     <artifactId>orion-all</artifactId>
-    <version>1.0.5</version>
+    <version>1.0.6</version>
 </dependency>
 ```
 
@@ -392,50 +392,29 @@ MD5签名   | Signatures.md5
 ┌─ftp
 │  ├─client                 FTPClient 工具类
 │  │  │
-│  │  ├─bigfile
-│  │  │   FtpDownload       FTPClient 大文件下载
-│  │  │   FtpUpload         FTPClient 大文件上传
+│  │  ├─transfer            FTP 大文件传输
 │  │  │
 │  │  ├─config              FTPClient 配置
 │  │  │
 │  │  └─pool                FTPClient 连接池
 │  │
 │  └─server                 FTPServer 工具类
 │
-├─remote
+├─host                      远程机器连接工具 jsch
 │  │
-│  ├─channel                远程机器连接工具 jsch
-│  │  │
-│  │  ├─sftp                sftp 执行器
-│  │  │  │
-│  │  │  └─bigfile
-│  │  │     SftpDownload    sftp 大文件下载
-│  │  │     SftpUpload      sftp 大文件上传
-│  │  │
-│  │  └─ssh
-│  │       CommandExecutor  远程命令执行器
-│  │       ShellExecutor    shell 执行器
-│  │
-│  └─connection             远程机器连接工具 ssh2
-│      │
-│      ├─scp                scp 执行器
-│      │
-│      ├─sftp               sftp 执行器
-│      │  │
-│      │  └─bigfile        
-│      │    SftpDownload    sftp 大文件下载
-│      │    SftpUpload      sftp 大文件上传
-│      │
-│      └─ssh
-│           CommandExecutor 远程命令执行器
-│           ShellExecutor   shell 执行器
+│  ├─sftp                   sftp 执行器
+│  │  
+│  └─ssh                    shell / command 执行器 
+│
+├─socket
+│    Sockets                socket 工具类
+│    TcpReceive             tcp 接收器
+│    TcpSend                tcp 发送器
+│    UdpReceive             udp 接收器
+│    UdpSend                udp 发送器
 │
-└─socket
-     Sockets                socket 工具类
-     TcpReceive             tcp 接收器
-     TcpSend                tcp 发送器
-     UdpReceive             udp 接收器
-     UdpSend                udp 发送器
+└─specification             标准定义
+ 
 ```
 <br/>
 

diff --git a/orion-all/pom.xml b/orion-all/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>io.github.lijiahangmax</groupId>
         <artifactId>orion-kit</artifactId>
-        <version>1.0.5</version>
+        <version>1.0.6</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
@@ -18,70 +18,70 @@
         <dependency>
             <groupId>io.github.lijiahangmax</groupId>
             <artifactId>orion-lang</artifactId>
-            <version>${orion.lang.version}</version>
+            <version>${orion.kit.version}</version>
         </dependency>
 
         <!-- ext -->
         <dependency>
             <groupId>io.github.lijiahangmax</groupId>
             <artifactId>orion-ext</artifactId>
-            <version>${orion.ext.version}</version>
+            <version>${orion.kit.version}</version>
         </dependency>
 
         <!-- log -->
         <dependency>
             <groupId>io.github.lijiahangmax</groupId>
             <artifactId>orion-log</artifactId>
-            <version>${orion.log.version}</version>
+            <version>${orion.kit.version}</version>
         </dependency>
 
         <!-- office -->
         <dependency>
             <groupId>io.github.lijiahangmax</groupId>
             <artifactId>orion-office</artifactId>
-            <version>${orion.office.version}</version>
+            <version>${orion.kit.version}</version>
         </dependency>
 
         <!-- http -->
         <dependency>
             <groupId>io.github.lijiahangmax</groupId>
             <artifactId>orion-http</artifactId>
-            <version>${orion.http.version}</version>
+            <version>${orion.kit.version}</version>
         </dependency>
 
         <!-- net -->
         <dependency>
             <groupId>io.github.lijiahangmax</groupId>
             <artifactId>orion-net</artifactId>
-            <version>${orion.net.version}</version>
+            <version>${orion.kit.version}</version>
         </dependency>
 
         <!-- web -->
         <dependency>
             <groupId>io.github.lijiahangmax</groupId>
             <artifactId>orion-web</artifactId>
-            <version>${orion.web.version}</version>
+            <version>${orion.kit.version}</version>
         </dependency>
 
         <!-- redis -->
         <dependency>
             <groupId>io.github.lijiahangmax</groupId>
             <artifactId>orion-redis</artifactId>
-            <version>${orion.redis.version}</version>
+            <version>${orion.kit.version}</version>
         </dependency>
 
         <!-- spring -->
         <dependency>
             <groupId>io.github.lijiahangmax</groupId>
             <artifactId>orion-spring</artifactId>
-            <version>${orion.spring.version}</version>
+            <version>${orion.kit.version}</version>
         </dependency>
 
         <!-- generator -->
         <dependency>
             <groupId>io.github.lijiahangmax</groupId>
             <artifactId>orion-generator</artifactId>
-            <version>${orion.generator.version}</version>
+            <version>${orion.kit.version}</version>
         </dependency>
     </dependencies>
 

diff --git a/orion-all/src/test/java/com/orion/Tests.java b/orion-all/src/test/java/com/orion/Tests.java
@@ -20,7 +20,8 @@ public static void main(String[] args) throws Exception {
         StopWatch w = StopWatch.begin();
 
         w.stop();
-        System.out.println("\n\n\n" + w);
+        System.out.println("\n\n\n");
+        LOGGER.info(w.toString());
     }
 
 }
diff --git a/orion-ext/pom.xml b/orion-ext/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>io.github.lijiahangmax</groupId>
         <artifactId>orion-kit</artifactId>
-        <version>1.0.5</version>
+        <version>1.0.6</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
@@ -18,14 +18,14 @@
         <dependency>
             <groupId>io.github.lijiahangmax</groupId>
             <artifactId>orion-lang</artifactId>
-            <version>${orion.lang.version}</version>
+            <version>${orion.kit.version}</version>
         </dependency>
 
         <!-- log -->
         <dependency>
             <groupId>io.github.lijiahangmax</groupId>
             <artifactId>orion-log</artifactId>
-            <version>${orion.log.version}</version>
+            <version>${orion.kit.version}</version>
         </dependency>
 
         <!-- mail -->
@@ -35,18 +35,17 @@
             <version>${mail.version}</version>
         </dependency>
 
-        <!-- dom4j -->
-        <dependency>
-            <groupId>dom4j</groupId>
-            <artifactId>dom4j</artifactId>
-            <version>${dom4j.version}</version>
-        </dependency>
-
         <!-- git -->
         <dependency>
             <groupId>org.eclipse.jgit</groupId>
             <artifactId>org.eclipse.jgit</artifactId>
             <version>${jgit.version}</version>
+            <exclusions>
+                <exclusion>
+                    <artifactId>slf4j-api</artifactId>
+                    <groupId>org.slf4j</groupId>
+                </exclusion>
+            </exclusions>
         </dependency>
 
     </dependencies>

diff --git a/orion-ext/src/main/java/com/orion/ext/location/LocationConst.java b/orion-ext/src/main/java/com/orion/ext/location/LocationConst.java
@@ -10,13 +10,10 @@
  * @version 1.0.0
  * @since 2023/3/7 17:48
  */
-public class LocationConst {
+public interface LocationConst {
 
-    private LocationConst() {
-    }
+    String CZ88_NET = "CZ88.NET";
 
-    public static final String CZ88_NET = "CZ88.NET";
-
-    public static final String UNKNOWN = KitConfig.get(KitExtConfiguration.CONFIG.LOCATION_UNKNOWN);
+    String UNKNOWN = KitConfig.get(KitExtConfiguration.CONFIG.LOCATION_UNKNOWN);
 
 }
diff --git a/orion-ext/src/main/java/com/orion/ext/location/ext/LocationExt.java b/orion-ext/src/main/java/com/orion/ext/location/ext/LocationExt.java
@@ -25,8 +25,10 @@
  */
 public class LocationExt {
 
-    private LocationExt() {
-    }
+    /**
+     * 查询器
+     */
+    private static final LocationSeeker SEEKER;
 
     /**
      * dat文件
@@ -38,10 +40,9 @@ private LocationExt() {
             .with(".region.dat")
             .build();
 
-    /**
-     * 查询器
-     */
-    private static final LocationSeeker SEEKER;
+
+    private LocationExt() {
+    }
 
     // init
     static {

diff --git a/orion-ext/src/main/java/com/orion/ext/location/ext/core/LocationSeeker.java b/orion-ext/src/main/java/com/orion/ext/location/ext/core/LocationSeeker.java
@@ -47,9 +47,14 @@ public class LocationSeeker {
     private MappedByteBuffer mbb;
 
     /**
-     * 起始地区的开始和结束的绝对偏移
+     * 起始地区的开始的绝对偏移
      */
-    private long ipBegin, ipEnd;
+    private long ipBegin;
+
+    /**
+     * 起始地区的结束的绝对偏移
+     */
+    private long ipEnd;
 
     private IpLocation loc;
 

diff --git a/orion-ext/src/main/java/com/orion/ext/location/region/LocationRegions.java b/orion-ext/src/main/java/com/orion/ext/location/region/LocationRegions.java
@@ -27,9 +27,6 @@ public class LocationRegions {
 
     private static final String UNKNOWN = new Region().toString();
 
-    private LocationRegions() {
-    }
-
     /**
      * db文件路径
      */
@@ -45,6 +42,9 @@ private LocationRegions() {
      */
     private static final DbSearcher SEARCHER;
 
+    private LocationRegions() {
+    }
+
     static {
         boolean init;
         try {

diff --git a/orion-ext/src/main/java/com/orion/ext/process/ProcessAwaitExecutor.java b/orion-ext/src/main/java/com/orion/ext/process/ProcessAwaitExecutor.java
@@ -277,15 +277,6 @@ public ProcessAwaitExecutor interrupt() {
         return this.write(new byte[]{3}, true);
     }
 
-    /**
-     * 挂起 键入 ctrl+x
-     *
-     * @return this
-     */
-    public ProcessAwaitExecutor hangUp() {
-        return this.write(new byte[]{24}, true);
-    }
-
     /**
      * 退出
      *

diff --git a/orion-ext/src/main/java/com/orion/ext/tail/delay/DelayTracker.java b/orion-ext/src/main/java/com/orion/ext/tail/delay/DelayTracker.java
@@ -60,7 +60,7 @@ protected void read() throws IOException {
      * @param str str
      * @return str
      */
-    private static String cleanMissCode(String str) {
+    public static String cleanMissCode(String str) {
         int testCount = Math.min(str.length(), 2);
         for (int i = testCount; i > 0; i--) {
             if (Spells.isMessyCode(String.valueOf(str.charAt(i - 1)))) {

diff --git a/orion-ext/src/main/java/com/orion/ext/watch/folder/FolderWatcher.java b/orion-ext/src/main/java/com/orion/ext/watch/folder/FolderWatcher.java
@@ -137,11 +137,10 @@ public FileVisitResult postVisitDirectory(Path dir, IOException exc) throws IOEx
                     }
                 });
             }
+        } catch (AccessDeniedException e) {
+            // ignore 禁止访问异常
         } catch (IOException e) {
-            if (!(e instanceof AccessDeniedException)) {
-                // 非禁止访问异常
-                throw Exceptions.watch(e);
-            }
+            throw Exceptions.watch(e);
         }
     }
 

diff --git a/orion-generator/pom.xml b/orion-generator/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>io.github.lijiahangmax</groupId>
         <artifactId>orion-kit</artifactId>
-        <version>1.0.5</version>
+        <version>1.0.6</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
@@ -18,14 +18,14 @@
         <dependency>
             <groupId>io.github.lijiahangmax</groupId>
             <artifactId>orion-lang</artifactId>
-            <version>${orion.lang.version}</version>
+            <version>${orion.kit.version}</version>
         </dependency>
 
         <!-- log -->
         <dependency>
             <groupId>io.github.lijiahangmax</groupId>
             <artifactId>orion-log</artifactId>
-            <version>${orion.log.version}</version>
+            <version>${orion.kit.version}</version>
         </dependency>
     </dependencies>
 

diff --git a/orion-generator/src/main/java/com/orion/generator/addres/AddressType.java b/orion-generator/src/main/java/com/orion/generator/addres/AddressType.java
@@ -27,12 +27,12 @@ public enum AddressType {
 
     ;
 
+    private final String[] suffix;
+
     AddressType(String[] suffix) {
         this.suffix = suffix;
     }
 
-    private final String[] suffix;
-
     public String[] getSuffix() {
         return suffix;
     }