Merge pull request #65 from dromara/dev

merge
dromara · Nov 1, 2024 · 6f42d41 · 6f42d41
2 parents 988528c + 8db6776
commit 6f42d41
Show file tree

Hide file tree

Showing 986 changed files with 4,539 additions and 4,545 deletions.
diff --git a/README.md b/README.md
@@ -53,7 +53,8 @@
 
 * 🔗 演示地址: [https://dv.orionsec.cn/](https://dv.orionsec.cn/)
 * 🔏 演示账号: admin/admin
-* ⭐ 体验后可以点一下 `star` 这对我很重要! [github](https://github.com/dromara/orion-visor) [gitee](https://gitee.com/dromara/orion-visor) [gitcode](https://gitcode.com/dromara/orion-visor/overview)
+* ⭐ 体验后可以点一下 `star`
+  这对我很重要! [github](https://github.com/dromara/orion-visor) [gitee](https://gitee.com/dromara/orion-visor) [gitcode](https://gitcode.com/dromara/orion-visor/overview)
 * 🌈 如果本项目对你有帮助请帮忙推广一下 让更多的人知道此项目!
 * 🎭 演示环境部分功能不可用, 完整功能请本地部署!
 * 📛 演示环境请不要随便删除数据!
@@ -80,7 +81,7 @@ docker compose up -d
 
 ## 技术栈
 
-* SpringBoot 2.7.17
+* SpringBoot 2.7.+
 * Mysql 8.0.+
 * Redis 6.0.+
 * Vue3 3.2.+
@@ -122,7 +123,7 @@ docker compose up -d
 微信: ljh1553488  
 QQ群: 755242157
 
-📧 咨询问题微信备注: vis  
+📧 问题/加群微信备注: ops  
 📧 合作/功能定制备注: 合作
 
 ## 支持一下
@@ -137,4 +138,8 @@ QQ群: 755242157
 
 ## License
 
-本项目遵循 [Apache-2.0](https://github.com/dromara/orion-visor/blob/main/LICENSE) 开源许可证。  
+本项目遵循 [Apache-2.0](https://github.com/dromara/orion-visor/blob/main/LICENSE) 开源许可证。
+
+## Gite 最有价值开源项目 GVP
+
+![GVP](https://bjuimg.obs.cn-north-4.myhuaweicloud.com/images/2024/10/24/8dd98b8d-9de5-44e6-86d3-04e27ec66123.jpg "GVP")
diff --git a/docker-compose-testing.yml b/docker-compose-testing.yml
@@ -1,7 +1,7 @@
 version: '3.3'
 services:
   service:
-    image: registry.cn-hangzhou.aliyuncs.com/lijiahangmax/orion-visor-service:2.1.8
+    image: registry.cn-hangzhou.aliyuncs.com/lijiahangmax/orion-visor-service:2.2.0
     privileged: true
     ports:
       - 1081:80
@@ -32,7 +32,7 @@ services:
       - mysql
       - redis
   mysql:
-    image: registry.cn-hangzhou.aliyuncs.com/lijiahangmax/orion-visor-mysql:2.1.8
+    image: registry.cn-hangzhou.aliyuncs.com/lijiahangmax/orion-visor-mysql:2.2.0
     privileged: true
     ports:
       - 3307:3306
@@ -52,7 +52,7 @@ services:
       retries: 10
       start_period: 3s
   redis:
-    image: registry.cn-hangzhou.aliyuncs.com/lijiahangmax/orion-visor-redis:2.1.8
+    image: registry.cn-hangzhou.aliyuncs.com/lijiahangmax/orion-visor-redis:2.2.0
     privileged: true
     ports:
       - 6380:6379

diff --git a/docker-compose.yml b/docker-compose.yml
@@ -1,7 +1,7 @@
 version: '3.3'
 services:
   service:
-    image: registry.cn-hangzhou.aliyuncs.com/lijiahangmax/orion-visor-service:2.1.8
+    image: registry.cn-hangzhou.aliyuncs.com/lijiahangmax/orion-visor-service:2.2.0
     privileged: true
     ports:
       - ${SERVICE_PORT:-1081}:80
@@ -32,7 +32,7 @@ services:
       - mysql
       - redis
   mysql:
-    image: registry.cn-hangzhou.aliyuncs.com/lijiahangmax/orion-visor-mysql:2.1.8
+    image: registry.cn-hangzhou.aliyuncs.com/lijiahangmax/orion-visor-mysql:2.2.0
     privileged: true
     ports:
       - 3307:3306
@@ -52,7 +52,7 @@ services:
       retries: 15
       start_period: 3s
   redis:
-    image: registry.cn-hangzhou.aliyuncs.com/lijiahangmax/orion-visor-redis:2.1.8
+    image: registry.cn-hangzhou.aliyuncs.com/lijiahangmax/orion-visor-redis:2.2.0
     privileged: true
     ports:
       - 6380:6379
@@ -68,7 +68,7 @@ services:
       retries: 15
       start_period: 3s
   adminer:
-    image: registry.cn-hangzhou.aliyuncs.com/lijiahangmax/orion-visor-adminer:2.1.8
+    image: registry.cn-hangzhou.aliyuncs.com/lijiahangmax/orion-visor-adminer:2.2.0
     ports:
       - 8081:8080
     depends_on:

diff --git a/docker/adminer/build.sh b/docker/adminer/build.sh
@@ -1,4 +1,4 @@
 #/bin/bash
-version=2.1.8
+version=2.2.0
 docker build -t orion-visor-adminer:${version} .
 docker tag orion-visor-adminer:${version} registry.cn-hangzhou.aliyuncs.com/lijiahangmax/orion-visor-adminer:${version}
diff --git a/docker/mysql/build.sh b/docker/mysql/build.sh
@@ -1,5 +1,5 @@
 #/bin/bash
-version=2.1.8
+version=2.2.0
 cp -r ../../sql ./sql
 docker build -t orion-visor-mysql:${version} .
 rm -rf ./sql

diff --git a/docker/push.sh b/docker/push.sh
@@ -1,5 +1,5 @@
 #/bin/bash
-version=2.1.8
+version=2.2.0
 docker push registry.cn-hangzhou.aliyuncs.com/lijiahangmax/orion-visor-adminer:${version}
 docker push registry.cn-hangzhou.aliyuncs.com/lijiahangmax/orion-visor-mysql:${version}
 docker push registry.cn-hangzhou.aliyuncs.com/lijiahangmax/orion-visor-redis:${version}

diff --git a/docker/redis/build.sh b/docker/redis/build.sh
@@ -1,4 +1,4 @@
 #/bin/bash
-version=2.1.8
+version=2.2.0
 docker build -t orion-visor-redis:${version} .
 docker tag orion-visor-redis:${version} registry.cn-hangzhou.aliyuncs.com/lijiahangmax/orion-visor-redis:${version}
diff --git a/docker/service/build.sh b/docker/service/build.sh
@@ -1,5 +1,5 @@
 #/bin/bash
-version=2.1.8
+version=2.2.0
 mv ../../orion-visor-launch/target/orion-visor-launch.jar ./orion-visor-launch.jar
 mv ../../orion-visor-ui/dist ./dist
 docker build -t orion-visor-service:${version} .

diff --git a/orion-visor-dependencies/pom.xml b/orion-visor-dependencies/pom.xml
@@ -4,7 +4,7 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
 
-    <groupId>com.orion.visor</groupId>
+    <groupId>org.dromara.visor</groupId>
     <artifactId>orion-visor-dependencies</artifactId>
     <version>${revision}</version>
     <packaging>pom</packaging>
@@ -14,11 +14,11 @@
     <url>https://github.com/dromara/orion-visor</url>
 
     <properties>
-        <revision>2.1.8</revision>
+        <revision>2.2.0</revision>
         <spring.boot.version>2.7.17</spring.boot.version>
         <spring.boot.admin.version>2.7.15</spring.boot.admin.version>
         <flatten.maven.plugin.version>1.5.0</flatten.maven.plugin.version>
-        <orion.kit.version>1.0.9</orion.kit.version>
+        <orion.kit.version>2.0.0</orion.kit.version>
         <aspectj.version>1.9.7</aspectj.version>
         <lombok.version>1.18.26</lombok.version>
         <springdoc.version>1.6.15</springdoc.version>
@@ -48,95 +48,95 @@
 
             <!-- orion-kit -->
             <dependency>
-                <groupId>io.github.lijiahangmax</groupId>
+                <groupId>cn.orionsec.kit</groupId>
                 <artifactId>orion-all</artifactId>
                 <version>${orion.kit.version}</version>
                 <exclusions>
                     <exclusion>
                         <artifactId>orion-log</artifactId>
-                        <groupId>io.github.lijiahangmax</groupId>
+                        <groupId>cn.orionsec.kit</groupId>
                     </exclusion>
                 </exclusions>
             </dependency>
 
             <!-- orion-visor-starter -->
             <dependency>
-                <groupId>com.orion.visor</groupId>
+                <groupId>org.dromara.visor</groupId>
                 <artifactId>orion-visor-framework-common</artifactId>
                 <version>${revision}</version>
             </dependency>
             <dependency>
-                <groupId>com.orion.visor</groupId>
+                <groupId>org.dromara.visor</groupId>
                 <artifactId>orion-visor-spring-boot-starter-banner</artifactId>
                 <version>${revision}</version>
             </dependency>
             <dependency>
-                <groupId>com.orion.visor</groupId>
+                <groupId>org.dromara.visor</groupId>
                 <artifactId>orion-visor-spring-boot-starter-web</artifactId>
                 <version>${revision}</version>
             </dependency>
             <dependency>
-                <groupId>com.orion.visor</groupId>
+                <groupId>org.dromara.visor</groupId>
                 <artifactId>orion-visor-spring-boot-starter-swagger</artifactId>
                 <version>${revision}</version>
             </dependency>
             <dependency>
-                <groupId>com.orion.visor</groupId>
+                <groupId>org.dromara.visor</groupId>
                 <artifactId>orion-visor-spring-boot-starter-datasource</artifactId>
                 <version>${revision}</version>
             </dependency>
             <dependency>
-                <groupId>com.orion.visor</groupId>
+                <groupId>org.dromara.visor</groupId>
                 <artifactId>orion-visor-spring-boot-starter-mybatis</artifactId>
                 <version>${revision}</version>
             </dependency>
             <dependency>
-                <groupId>com.orion.visor</groupId>
+                <groupId>org.dromara.visor</groupId>
                 <artifactId>orion-visor-spring-boot-starter-job</artifactId>
                 <version>${revision}</version>
             </dependency>
             <dependency>
-                <groupId>com.orion.visor</groupId>
+                <groupId>org.dromara.visor</groupId>
                 <artifactId>orion-visor-spring-boot-starter-websocket</artifactId>
                 <version>${revision}</version>
             </dependency>
             <dependency>
-                <groupId>com.orion.visor</groupId>
+                <groupId>org.dromara.visor</groupId>
                 <artifactId>orion-visor-spring-boot-starter-redis</artifactId>
                 <version>${revision}</version>
             </dependency>
             <dependency>
-                <groupId>com.orion.visor</groupId>
+                <groupId>org.dromara.visor</groupId>
                 <artifactId>orion-visor-spring-boot-starter-desensitize</artifactId>
                 <version>${revision}</version>
             </dependency>
             <dependency>
-                <groupId>com.orion.visor</groupId>
+                <groupId>org.dromara.visor</groupId>
                 <artifactId>orion-visor-spring-boot-starter-log</artifactId>
                 <version>${revision}</version>
             </dependency>
             <dependency>
-                <groupId>com.orion.visor</groupId>
+                <groupId>org.dromara.visor</groupId>
                 <artifactId>orion-visor-spring-boot-starter-storage</artifactId>
                 <version>${revision}</version>
             </dependency>
             <dependency>
-                <groupId>com.orion.visor</groupId>
+                <groupId>org.dromara.visor</groupId>
                 <artifactId>orion-visor-spring-boot-starter-security</artifactId>
                 <version>${revision}</version>
             </dependency>
             <dependency>
-                <groupId>com.orion.visor</groupId>
+                <groupId>org.dromara.visor</groupId>
                 <artifactId>orion-visor-spring-boot-starter-monitor</artifactId>
                 <version>${revision}</version>
             </dependency>
             <dependency>
-                <groupId>com.orion.visor</groupId>
+                <groupId>org.dromara.visor</groupId>
                 <artifactId>orion-visor-spring-boot-starter-test</artifactId>
                 <version>${revision}</version>
             </dependency>
             <dependency>
-                <groupId>com.orion.visor</groupId>
+                <groupId>org.dromara.visor</groupId>
                 <artifactId>orion-visor-spring-boot-starter-biz-operator-log</artifactId>
                 <version>${revision}</version>
             </dependency>

diff --git a/orion-visor-framework/orion-visor-framework-common/pom.xml b/orion-visor-framework/orion-visor-framework-common/pom.xml
@@ -3,7 +3,7 @@
          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>com.orion.visor</groupId>
+        <groupId>org.dromara.visor</groupId>
         <artifactId>orion-visor-framework</artifactId>
         <version>${revision}</version>
     </parent>
@@ -18,7 +18,7 @@
 
     <dependencies>
         <dependency>
-            <groupId>io.github.lijiahangmax</groupId>
+            <groupId>cn.orionsec.kit</groupId>
             <artifactId>orion-all</artifactId>
         </dependency>
 

diff --git a/...uration/OrionCommonAutoConfiguration.java → ...uration/OrionCommonAutoConfiguration.java b/...uration/OrionCommonAutoConfiguration.java → ...uration/OrionCommonAutoConfiguration.java
@@ -13,12 +13,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.orion.visor.framework.common.configuration;
+package org.dromara.visor.framework.common.configuration;
 
-import com.orion.spring.SpringHolder;
-import com.orion.visor.framework.common.configuration.config.AsyncExecutorConfig;
-import com.orion.visor.framework.common.constant.AutoConfigureOrderConst;
-import com.orion.visor.framework.common.thread.ThreadPoolMdcTaskExecutor;
+import cn.orionsec.kit.spring.SpringHolder;
+import org.dromara.visor.framework.common.configuration.config.AsyncExecutorConfig;
+import org.dromara.visor.framework.common.constant.AutoConfigureOrderConst;
+import org.dromara.visor.framework.common.thread.ThreadPoolMdcTaskExecutor;
 import org.springframework.boot.autoconfigure.AutoConfiguration;
 import org.springframework.boot.autoconfigure.AutoConfigureOrder;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;

diff --git a/...iguration/config/AsyncExecutorConfig.java → ...iguration/config/AsyncExecutorConfig.java b/...iguration/config/AsyncExecutorConfig.java → ...iguration/config/AsyncExecutorConfig.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.orion.visor.framework.common.configuration.config;
+package org.dromara.visor.framework.common.configuration.config;
 
 import lombok.Data;
 import org.springframework.boot.context.properties.ConfigurationProperties;

diff --git a/...r/framework/common/constant/AppConst.java → ...r/framework/common/constant/AppConst.java b/...r/framework/common/constant/AppConst.java → ...r/framework/common/constant/AppConst.java
@@ -13,9 +13,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.orion.visor.framework.common.constant;
+package org.dromara.visor.framework.common.constant;
 
-import com.orion.lang.constant.OrionConst;
+import cn.orionsec.kit.lang.constant.OrionConst;
 
 /**
  * 项目常量
@@ -29,7 +29,7 @@ public interface AppConst extends OrionConst {
     /**
      * 同 ${orion.version} 迭代时候需要手动更改
      */
-    String VERSION = "2.1.8";
+    String VERSION = "2.2.0";
 
     /**
      * 同 ${spring.application.name}

diff --git a/...mon/constant/AutoConfigureOrderConst.java → ...mon/constant/AutoConfigureOrderConst.java b/...mon/constant/AutoConfigureOrderConst.java → ...mon/constant/AutoConfigureOrderConst.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.orion.visor.framework.common.constant;
+package org.dromara.visor.framework.common.constant;
 
 /**
  * 自动装配排序常量

diff --git a/...ework/common/constant/BeanOrderConst.java → ...ework/common/constant/BeanOrderConst.java b/...ework/common/constant/BeanOrderConst.java → ...ework/common/constant/BeanOrderConst.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.orion.visor.framework.common.constant;
+package org.dromara.visor.framework.common.constant;
 
 /**
  * bean 排序常量

diff --git a/...or/framework/common/constant/CnConst.java → ...or/framework/common/constant/CnConst.java b/...or/framework/common/constant/CnConst.java → ...or/framework/common/constant/CnConst.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.orion.visor.framework.common.constant;
+package org.dromara.visor.framework.common.constant;
 
 /**
  * 常量 - 中文

diff --git a/...isor/framework/common/constant/Const.java → ...isor/framework/common/constant/Const.java b/...isor/framework/common/constant/Const.java → ...isor/framework/common/constant/Const.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.orion.visor.framework.common.constant;
+package org.dromara.visor.framework.common.constant;
 
 /**
  * 常量
@@ -22,7 +22,7 @@
  * @version 1.0.0
  * @since 2023/6/23 18:49
  */
-public interface Const extends com.orion.lang.constant.Const, FieldConst, CnConst {
+public interface Const extends cn.orionsec.kit.lang.constant.Const, FieldConst, CnConst {
 
     Integer NOT_DELETE = 0;
 

diff --git a/.../framework/common/constant/ErrorCode.java → .../framework/common/constant/ErrorCode.java b/.../framework/common/constant/ErrorCode.java → .../framework/common/constant/ErrorCode.java
@@ -13,12 +13,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.orion.visor.framework.common.constant;
+package org.dromara.visor.framework.common.constant;
 
-import com.orion.lang.define.wrapper.CodeInfo;
-import com.orion.lang.define.wrapper.HttpWrapper;
-import com.orion.lang.utils.Exceptions;
-import com.orion.lang.utils.Strings;
+import cn.orionsec.kit.lang.define.wrapper.CodeInfo;
+import cn.orionsec.kit.lang.define.wrapper.HttpWrapper;
+import cn.orionsec.kit.lang.utils.Exceptions;
+import cn.orionsec.kit.lang.utils.Strings;
 
 /**
  * 用于定义错误码