Merge pull request #74 from dromara/dev

Dev
dromara · Dec 24, 2024 · c25e74c · c25e74c
2 parents 0de59dd + bbe2980
commit c25e74c
Show file tree

Hide file tree

Showing 1,034 changed files with 10,068 additions and 2,299 deletions.
diff --git a/NOTICE b/NOTICE
@@ -5,5 +5,5 @@
  1. 禁止修改或删除 LICENSE 文件。
  2. 禁止修改或删除源码头部的版权声明。
  3. 本项目可免费商业使用，商业使用请保留项目源码、出处、描述文件和作者声明等。
- 4. 分发源码时候，请注明软件出处 https://visor.orionsec.cn/
+ 4. 分发源码时候，请注明软件出处 https://visor.dromara.org/
  5. 不可二次开发或参与同类竞品的开发。
diff --git a/README.md b/README.md
@@ -3,18 +3,18 @@
 <p align="center">
     <a target="_blank"
        style="text-decoration: none !important;"
-       href="https://app.codacy.com/gh/lijiahangmax/orion-visor/dashboard?utm_source=gh&utm_medium=referral&utm_content=&utm_campaign=Badge_grade">
+       href="https://app.codacy.com/gh/orionsec/orion-visor/dashboard?utm_source=gh&utm_medium=referral&utm_content=&utm_campaign=Badge_grade">
       <img src="https://app.codacy.com/project/badge/Grade/49eaab3a9a474af3b87e1d21ffec71c4" alt="quality" />
     </a>
     <a target="_blank"
        style="text-decoration: none !important;"
        href="https://www.apache.org/licenses/LICENSE-2.0">
-      <img src="https://img.shields.io/github/license/lijiahangmax/orion-visor" alt="License" />
+      <img src="https://img.shields.io/github/license/dromara/orion-visor" alt="License" />
     </a>
     <a target="_blank"
        style="text-decoration: none !important;"
        href="https://github.com/dromara/orion-visor/releases">
-      <img src="https://img.shields.io/github/v/release/lijiahangmax/orion-visor" alt="release" />
+      <img src="https://img.shields.io/github/v/release/dromara/orion-visor" alt="release" />
     </a>
     <a target="_blank"
        style="text-decoration: none !important;"
@@ -29,12 +29,12 @@
     <a target="_blank"
        style="text-decoration: none !important;"
        href="https://github.com/dromara/orion-visor">
-      <img src="https://img.shields.io/github/stars/lijiahangmax/orion-visor" alt="star" />
+      <img src="https://img.shields.io/github/stars/dromara/orion-visor" alt="star" />
     </a>
     <a target="_blank"
        style="text-decoration: none !important;"
        href="https://github.com/dromara/orion-visor">
-      <img src="https://img.shields.io/github/forks/lijiahangmax/orion-visor" alt="star" />
+      <img src="https://img.shields.io/github/forks/dromara/orion-visor" alt="star" />
     </a>
 </p>
 
@@ -73,11 +73,11 @@ docker compose up -d
 
 ## 项目文档
 
-* [文档地址](https://visor.orionsec.cn/)
-* [安装文档](https://visor.orionsec.cn/quickstart/docker.html)
-* [更新日志](https://visor.orionsec.cn/update/change-log.html)
-* [操作手册](https://visor.orionsec.cn/operator/asset.html)
-* [常见问题](https://visor.orionsec.cn/support/faq.html)
+* [文档地址](https://visor.dromara.org/)
+* [安装文档](https://visor.dromara.org/quickstart/docker.html)
+* [更新日志](https://visor.dromara.org/update/change-log.html)
+* [操作手册](https://visor.dromara.org/operator/asset.html)
+* [常见问题](https://visor.dromara.org/support/faq.html)
 
 ## 技术栈
 
@@ -110,7 +110,7 @@ docker compose up -d
 
 ## Star History
 
-[![Star History Chart](https://api.star-history.com/svg?repos=lijiahangmax/orion-visor&type=Date)](https://star-history.com/#lijiahangmax/orion-visor&Date)
+[![Star History Chart](https://api.star-history.com/svg?repos=dromara/orion-visor&type=Date)](https://star-history.com/#dromara/orion-visor&Date)
 
 ## 关于我
 

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.2.1
+    image: registry.cn-hangzhou.aliyuncs.com/orionsec/orion-visor-service:2.2.2
     privileged: true
     ports:
       - 1081:80
@@ -32,7 +32,7 @@ services:
       - mysql
       - redis
   mysql:
-    image: registry.cn-hangzhou.aliyuncs.com/lijiahangmax/orion-visor-mysql:2.2.1
+    image: registry.cn-hangzhou.aliyuncs.com/orionsec/orion-visor-mysql:2.2.2
     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.2.1
+    image: registry.cn-hangzhou.aliyuncs.com/orionsec/orion-visor-redis:2.2.2
     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.2.1
+    image: registry.cn-hangzhou.aliyuncs.com/orionsec/orion-visor-service:2.2.2
     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.2.1
+    image: registry.cn-hangzhou.aliyuncs.com/orionsec/orion-visor-mysql:2.2.2
     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.2.1
+    image: registry.cn-hangzhou.aliyuncs.com/orionsec/orion-visor-redis:2.2.2
     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.2.1
+    image: registry.cn-hangzhou.aliyuncs.com/orionsec/orion-visor-adminer:2.2.2
     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.2.1
+version=2.2.2
 docker build -t orion-visor-adminer:${version} .
-docker tag orion-visor-adminer:${version} registry.cn-hangzhou.aliyuncs.com/lijiahangmax/orion-visor-adminer:${version}
+docker tag orion-visor-adminer:${version} registry.cn-hangzhou.aliyuncs.com/orionsec/orion-visor-adminer:${version}
diff --git a/docker/mysql/build.sh b/docker/mysql/build.sh
@@ -1,6 +1,6 @@
 #/bin/bash
-version=2.2.1
+version=2.2.2
 cp -r ../../sql ./sql
 docker build -t orion-visor-mysql:${version} .
 rm -rf ./sql
-docker tag orion-visor-mysql:${version} registry.cn-hangzhou.aliyuncs.com/lijiahangmax/orion-visor-mysql:${version}
+docker tag orion-visor-mysql:${version} registry.cn-hangzhou.aliyuncs.com/orionsec/orion-visor-mysql:${version}
diff --git a/docker/mysql/my.cnf b/docker/mysql/my.cnf
@@ -18,7 +18,7 @@ default-time_zone='+8:00'
 # 服务端字符集
 character_set_server=utf8mb4
 # 字符排序规则
-collation_server=utf8mb4_general_ci
+collation_server=utf8mb4_unicode_ci
 # 默认存储引擎
 default-storage-engine=InnoDB 
 # 禁止 DNS 解析

diff --git a/docker/push.sh b/docker/push.sh
@@ -1,6 +1,6 @@
 #/bin/bash
-version=2.2.1
-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}
-docker push registry.cn-hangzhou.aliyuncs.com/lijiahangmax/orion-visor-service:${version}
+version=2.2.2
+docker push registry.cn-hangzhou.aliyuncs.com/orionsec/orion-visor-adminer:${version}
+docker push registry.cn-hangzhou.aliyuncs.com/orionsec/orion-visor-mysql:${version}
+docker push registry.cn-hangzhou.aliyuncs.com/orionsec/orion-visor-redis:${version}
+docker push registry.cn-hangzhou.aliyuncs.com/orionsec/orion-visor-service:${version}
diff --git a/docker/redis/build.sh b/docker/redis/build.sh
@@ -1,4 +1,4 @@
 #/bin/bash
-version=2.2.1
+version=2.2.2
 docker build -t orion-visor-redis:${version} .
-docker tag orion-visor-redis:${version} registry.cn-hangzhou.aliyuncs.com/lijiahangmax/orion-visor-redis:${version}
+docker tag orion-visor-redis:${version} registry.cn-hangzhou.aliyuncs.com/orionsec/orion-visor-redis:${version}
diff --git a/docker/service/build.sh b/docker/service/build.sh
@@ -1,8 +1,8 @@
 #/bin/bash
-version=2.2.1
+version=2.2.2
 mv ../../orion-visor-launch/target/orion-visor-launch.jar ./orion-visor-launch.jar
 mv ../../orion-visor-ui/dist ./dist
 docker build --no-cache -t orion-visor-service:${version} .
 rm -rf ./orion-visor-launch.jar
 rm -rf ./dist
-docker tag orion-visor-service:${version} registry.cn-hangzhou.aliyuncs.com/lijiahangmax/orion-visor-service:${version}
+docker tag orion-visor-service:${version} registry.cn-hangzhou.aliyuncs.com/orionsec/orion-visor-service:${version}
diff --git a/orion-visor-dependencies/pom.xml b/orion-visor-dependencies/pom.xml
@@ -14,7 +14,7 @@
     <url>https://github.com/dromara/orion-visor</url>
 
     <properties>
-        <revision>2.2.1</revision>
+        <revision>2.2.2</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>

diff --git a/...n/java/org/dromara/visor/framework/common/configuration/OrionCommonAutoConfiguration.java b/...n/java/org/dromara/visor/framework/common/configuration/OrionCommonAutoConfiguration.java
@@ -1,5 +1,12 @@
 /*
- * Copyright (c) 2023 - present Jiahang Li (visor.orionsec.cn ljh1553488six@139.com).
+ * Copyright (c) 2023 - present Dromara, All rights reserved.
+ *
+ *   https://visor.dromara.org
+ *   https://visor.dromara.org.cn
+ *   https://visor.orionsec.cn
+ *
+ * Members:
+ *   Jiahang Li - ljh1553488six@139.com - author
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/...ain/java/org/dromara/visor/framework/common/configuration/config/AsyncExecutorConfig.java b/...ain/java/org/dromara/visor/framework/common/configuration/config/AsyncExecutorConfig.java
@@ -1,5 +1,12 @@
 /*
- * Copyright (c) 2023 - present Jiahang Li (visor.orionsec.cn ljh1553488six@139.com).
+ * Copyright (c) 2023 - present Dromara, All rights reserved.
+ *
+ *   https://visor.dromara.org
+ *   https://visor.dromara.org.cn
+ *   https://visor.orionsec.cn
+ *
+ * Members:
+ *   Jiahang Li - ljh1553488six@139.com - author
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/...-framework-common/src/main/java/org/dromara/visor/framework/common/constant/AppConst.java b/...-framework-common/src/main/java/org/dromara/visor/framework/common/constant/AppConst.java
@@ -1,5 +1,12 @@
 /*
- * Copyright (c) 2023 - present Jiahang Li (visor.orionsec.cn ljh1553488six@139.com).
+ * Copyright (c) 2023 - present Dromara, All rights reserved.
+ *
+ *   https://visor.dromara.org
+ *   https://visor.dromara.org.cn
+ *   https://visor.orionsec.cn
+ *
+ * Members:
+ *   Jiahang Li - ljh1553488six@139.com - author
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -29,7 +36,7 @@ public interface AppConst extends OrionConst {
     /**
      * 同 ${orion.version} 迭代时候需要手动更改
      */
-    String VERSION = "2.2.1";
+    String VERSION = "2.2.2";
 
     /**
      * 同 ${spring.application.name}

diff --git a/...on/src/main/java/org/dromara/visor/framework/common/constant/AutoConfigureOrderConst.java b/...on/src/main/java/org/dromara/visor/framework/common/constant/AutoConfigureOrderConst.java
@@ -1,5 +1,12 @@
 /*
- * Copyright (c) 2023 - present Jiahang Li (visor.orionsec.cn ljh1553488six@139.com).
+ * Copyright (c) 2023 - present Dromara, All rights reserved.
+ *
+ *   https://visor.dromara.org
+ *   https://visor.dromara.org.cn
+ *   https://visor.orionsec.cn
+ *
+ * Members:
+ *   Jiahang Li - ljh1553488six@139.com - author
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/...work-common/src/main/java/org/dromara/visor/framework/common/constant/BeanOrderConst.java b/...work-common/src/main/java/org/dromara/visor/framework/common/constant/BeanOrderConst.java
@@ -1,5 +1,12 @@
 /*
- * Copyright (c) 2023 - present Jiahang Li (visor.orionsec.cn ljh1553488six@139.com).
+ * Copyright (c) 2023 - present Dromara, All rights reserved.
+ *
+ *   https://visor.dromara.org
+ *   https://visor.dromara.org.cn
+ *   https://visor.orionsec.cn
+ *
+ * Members:
+ *   Jiahang Li - ljh1553488six@139.com - author
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/...r-framework-common/src/main/java/org/dromara/visor/framework/common/constant/CnConst.java b/...r-framework-common/src/main/java/org/dromara/visor/framework/common/constant/CnConst.java
@@ -1,5 +1,12 @@
 /*
- * Copyright (c) 2023 - present Jiahang Li (visor.orionsec.cn ljh1553488six@139.com).
+ * Copyright (c) 2023 - present Dromara, All rights reserved.
+ *
+ *   https://visor.dromara.org
+ *   https://visor.dromara.org.cn
+ *   https://visor.orionsec.cn
+ *
+ * Members:
+ *   Jiahang Li - ljh1553488six@139.com - author
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/...sor-framework-common/src/main/java/org/dromara/visor/framework/common/constant/Const.java b/...sor-framework-common/src/main/java/org/dromara/visor/framework/common/constant/Const.java
@@ -1,5 +1,12 @@
 /*
- * Copyright (c) 2023 - present Jiahang Li (visor.orionsec.cn ljh1553488six@139.com).
+ * Copyright (c) 2023 - present Dromara, All rights reserved.
+ *
+ *   https://visor.dromara.org
+ *   https://visor.dromara.org.cn
+ *   https://visor.orionsec.cn
+ *
+ * Members:
+ *   Jiahang Li - ljh1553488six@139.com - author
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/...framework-common/src/main/java/org/dromara/visor/framework/common/constant/ErrorCode.java b/...framework-common/src/main/java/org/dromara/visor/framework/common/constant/ErrorCode.java
@@ -1,5 +1,12 @@
 /*
- * Copyright (c) 2023 - present Jiahang Li (visor.orionsec.cn ljh1553488six@139.com).
+ * Copyright (c) 2023 - present Dromara, All rights reserved.
+ *
+ *   https://visor.dromara.org
+ *   https://visor.dromara.org.cn
+ *   https://visor.orionsec.cn
+ *
+ * Members:
+ *   Jiahang Li - ljh1553488six@139.com - author
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/...mework-common/src/main/java/org/dromara/visor/framework/common/constant/ErrorMessage.java b/...mework-common/src/main/java/org/dromara/visor/framework/common/constant/ErrorMessage.java
@@ -1,5 +1,12 @@
 /*
- * Copyright (c) 2023 - present Jiahang Li (visor.orionsec.cn ljh1553488six@139.com).
+ * Copyright (c) 2023 - present Dromara, All rights reserved.
+ *
+ *   https://visor.dromara.org
+ *   https://visor.dromara.org.cn
+ *   https://visor.orionsec.cn
+ *
+ * Members:
+ *   Jiahang Li - ljh1553488six@139.com - author
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -119,6 +126,8 @@ public interface ErrorMessage {
 
     String AUTH_ERROR = "认证失败";
 
+    String FILE_UPLOAD_ERROR = "文件上传失败";
+
     String SCRIPT_UPLOAD_ERROR = "脚本上传失败";
 
     String EXEC_ERROR = "执行失败";

diff --git a/...ork-common/src/main/java/org/dromara/visor/framework/common/constant/ExtraFieldConst.java b/...ork-common/src/main/java/org/dromara/visor/framework/common/constant/ExtraFieldConst.java
@@ -1,5 +1,12 @@
 /*
- * Copyright (c) 2023 - present Jiahang Li (visor.orionsec.cn ljh1553488six@139.com).
+ * Copyright (c) 2023 - present Dromara, All rights reserved.
+ *
+ *   https://visor.dromara.org
+ *   https://visor.dromara.org.cn
+ *   https://visor.orionsec.cn
+ *
+ * Members:
+ *   Jiahang Li - ljh1553488six@139.com - author
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/...ramework-common/src/main/java/org/dromara/visor/framework/common/constant/FieldConst.java b/...ramework-common/src/main/java/org/dromara/visor/framework/common/constant/FieldConst.java
@@ -1,5 +1,12 @@
 /*
- * Copyright (c) 2023 - present Jiahang Li (visor.orionsec.cn ljh1553488six@139.com).
+ * Copyright (c) 2023 - present Dromara, All rights reserved.
+ *
+ *   https://visor.dromara.org
+ *   https://visor.dromara.org.cn
+ *   https://visor.orionsec.cn
+ *
+ * Members:
+ *   Jiahang Li - ljh1553488six@139.com - author
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/...framework-common/src/main/java/org/dromara/visor/framework/common/constant/FileConst.java b/...framework-common/src/main/java/org/dromara/visor/framework/common/constant/FileConst.java
@@ -1,5 +1,12 @@
 /*
- * Copyright (c) 2023 - present Jiahang Li (visor.orionsec.cn ljh1553488six@139.com).
+ * Copyright (c) 2023 - present Dromara, All rights reserved.
+ *
+ *   https://visor.dromara.org
+ *   https://visor.dromara.org.cn
+ *   https://visor.orionsec.cn
+ *
+ * Members:
+ *   Jiahang Li - ljh1553488six@139.com - author
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/...rk-common/src/main/java/org/dromara/visor/framework/common/constant/FilterOrderConst.java b/...rk-common/src/main/java/org/dromara/visor/framework/common/constant/FilterOrderConst.java
@@ -1,5 +1,12 @@
 /*
- * Copyright (c) 2023 - present Jiahang Li (visor.orionsec.cn ljh1553488six@139.com).
+ * Copyright (c) 2023 - present Dromara, All rights reserved.
+ *
+ *   https://visor.dromara.org
+ *   https://visor.dromara.org.cn
+ *   https://visor.orionsec.cn
+ *
+ * Members:
+ *   Jiahang Li - ljh1553488six@139.com - author
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.