Merge pull request #61 from lijiahangmax/dev

merge
lijiahangmax · Nov 1, 2024 · 1e1d139 · 1e1d139
2 parents b1aaaf4 + b48adf1
commit 1e1d139
Show file tree

Hide file tree

Showing 843 changed files with 5,036 additions and 4,992 deletions.
diff --git a/README.md b/README.md
@@ -60,7 +60,8 @@
 
 * 🔗 演示地址: [https://do.orionsec.cn/#/](https://do.orionsec.cn/#/)
 * 🔏 演示账号: orionadmin/orionadmin
-* ⭐ 体验后可以点一下 `star` 这对我很重要! [github](https://github.com/lijiahangmax/orion-ops) [gitee](https://gitee.com/lijiahangmax/orion-ops) [gitcode](https://gitcode.com/lijiahangmax/orion-ops/overview)
+* ⭐ 体验后可以点一下 `star`
+  这对我很重要! [github](https://github.com/lijiahangmax/orion-ops) [gitee](https://gitee.com/lijiahangmax/orion-ops) [gitcode](https://gitcode.com/lijiahangmax/orion-ops/overview)
 * 🌈 如果本项目对你有帮助请帮忙推广一下 让更多的人知道此项目!
 * 🎭 演示环境部分功能不可用, 完整功能请本地部署!
 * 📛 演示环境请不要随便删除数据!
@@ -77,7 +78,7 @@
 
 ## 重构版 orion-visor
 
-`orion-visor` 为 `orion-ops` 的重构版本, 优化了交互逻辑以及UI风格、操作更友好、系统更快速&安全! 目前该项目已荣获 `GVP` 
+`orion-visor` 为 `orion-ops` 的重构版本, 优化了交互逻辑以及UI风格、操作更友好、系统更快速&安全! 目前该项目已荣获 `GVP`
 [项目地址](https://visor.orionsec.cn)
 
 ## 技术栈
@@ -153,9 +154,9 @@
 ![流水线配置](https://yxythpt.oss-cn-shenzhen.aliyuncs.com/2022-04-25/files694386343461173439.png "流水线配置")
 ![流水线任务](https://yxythpt.oss-cn-shenzhen.aliyuncs.com/2022-04-25/files6446052342050924823.png "流水线任务")
 
-### 登陆日志
+### 登录日志
 
-![登陆日志](http://bjucloud.oss-cn-qingdao.aliyuncs.com/album/2022/7/23/4a548584-6cee-4b95-9811-5d2a670bfca8.jpg "登陆日志")
+![登录日志](http://bjucloud.oss-cn-qingdao.aliyuncs.com/album/2022/7/23/4a548584-6cee-4b95-9811-5d2a670bfca8.jpg "登录日志")
 
 ### 安全配置
 
@@ -187,7 +188,7 @@ orion-ops 作为开源项目, 欢迎任何人提出建议以及贡献代码。
 
 <img src="https://oos-sdqd.ctyunapi.cn/album/2022/9/22/018ac2ff-164a-4f7d-a8ae-030c5d899726.png" alt="联系方式" width="540px"/>   
 
-📧 微信添加备注: ops   
+📧 问题/加群微信备注: ops  
 📧 合作/功能定制备注: 合作
 
 ## 支持一下

diff --git a/docker-compose.yml b/docker-compose.yml
@@ -1,7 +1,7 @@
 version: '3.3'
 services:
   orion-ops:
-    image: registry.cn-hangzhou.aliyuncs.com/lijiahangmax/orion-ops:1.2.9
+    image: registry.cn-hangzhou.aliyuncs.com/lijiahangmax/orion-ops:1.3.0
     ports:
       - 1022:22
       - 1080:80
@@ -19,7 +19,7 @@ services:
       - orion-ops-db
       - orion-ops-redis
   orion-ops-db:
-    image: registry.cn-hangzhou.aliyuncs.com/lijiahangmax/orion-ops-mysql:1.2.9
+    image: registry.cn-hangzhou.aliyuncs.com/lijiahangmax/orion-ops-mysql:1.3.0
     privileged: true
     environment:
       - MYSQL_DATABASE=orion-ops
@@ -33,7 +33,7 @@ services:
       - /data/orion-ops-space/docker-volumes/mysql/var-lib-mysql-files:/var/lib/mysql-files
       - /data/orion-ops-space/docker-volumes/mysql/etc-mysql:/etc/mysql
   orion-ops-redis:
-    image: registry.cn-hangzhou.aliyuncs.com/lijiahangmax/orion-ops-redis:1.2.9
+    image: registry.cn-hangzhou.aliyuncs.com/lijiahangmax/orion-ops-redis:1.3.0
     privileged: true
     ports:
       - 16379:6379
@@ -43,7 +43,7 @@ services:
       - /data/orion-ops-space/docker-volumes/orion-ops-redis/data:/data
     command: sh -c "redis-server /usr/local/redis.conf --requirepass $${REDIS_PASSWORD}"
   orion-ops-adminer:
-    image: registry.cn-hangzhou.aliyuncs.com/lijiahangmax/orion-ops-adminer:1.2.9
+    image: registry.cn-hangzhou.aliyuncs.com/lijiahangmax/orion-ops-adminer:1.3.0
     restart: always
     ports:
       - 18080:8080
diff --git a/docker/adminer/build.sh b/docker/adminer/build.sh
@@ -1,4 +1,4 @@
 #/bin/bash
-version=1.2.9
+version=1.3.0
 docker build -t orion-ops-adminer:${version} .
 docker tag orion-ops-adminer:${version} registry.cn-hangzhou.aliyuncs.com/lijiahangmax/orion-ops-adminer:${version}
diff --git a/docker/mysql/build.sh b/docker/mysql/build.sh
@@ -1,5 +1,5 @@
 #/bin/bash
-version=1.2.9
+version=1.3.0
 cp -r ../../sql ./sql
 docker build -t orion-ops-mysql:${version} .
 rm -rf ./sql

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

diff --git a/docker/redis/build.sh b/docker/redis/build.sh
@@ -1,4 +1,4 @@
 #/bin/bash
-version=1.2.9
+version=1.3.0
 docker build -t orion-ops-redis:${version} .
 docker tag orion-ops-redis:${version} registry.cn-hangzhou.aliyuncs.com/lijiahangmax/orion-ops-redis:${version}
diff --git a/docker/service/build.sh b/docker/service/build.sh
@@ -1,5 +1,5 @@
 #/bin/bash
-version=1.2.9
+version=1.3.0
 mv ../../orion-ops-api/orion-ops-web/target/orion-ops-web.jar ./
 mv ../../orion-ops-vue/dist ./
 cp $HOME/orion-ops/lib/machine-monitor-agent-latest.jar ./

diff --git a/orion-ops-api/orion-ops-common/pom.xml b/orion-ops-api/orion-ops-common/pom.xml
@@ -3,9 +3,9 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 
     <parent>
-        <groupId>com.orion.ops</groupId>
+        <groupId>cn.orionsec.ops</groupId>
         <artifactId>orion-ops-api</artifactId>
-        <version>1.2.9</version>
+        <version>1.3.0</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
@@ -22,9 +22,15 @@
 
         <!-- orion-kit -->
         <dependency>
-            <groupId>io.github.lijiahangmax</groupId>
+            <groupId>cn.orionsec.kit</groupId>
             <artifactId>orion-all</artifactId>
         </dependency>
+
+        <!-- web -->
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-web</artifactId>
+        </dependency>
     </dependencies>
 
 </project>
diff --git a/.../orion/ops/annotation/DemoDisableApi.java → ...ionsec/ops/annotation/DemoDisableApi.java b/.../orion/ops/annotation/DemoDisableApi.java → ...ionsec/ops/annotation/DemoDisableApi.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.orion.ops.annotation;
+package cn.orionsec.ops.annotation;
 
 import java.lang.annotation.*;
 

diff --git a/...va/com/orion/ops/annotation/EventLog.java → .../cn/orionsec/ops/annotation/EventLog.java b/...va/com/orion/ops/annotation/EventLog.java → .../cn/orionsec/ops/annotation/EventLog.java
@@ -13,9 +13,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.orion.ops.annotation;
+package cn.orionsec.ops.annotation;
 
-import com.orion.ops.constant.event.EventType;
+import cn.orionsec.ops.constant.event.EventType;
 
 import java.lang.annotation.*;
 

diff --git a/.../com/orion/ops/annotation/IgnoreAuth.java → ...n/orionsec/ops/annotation/IgnoreAuth.java b/.../com/orion/ops/annotation/IgnoreAuth.java → ...n/orionsec/ops/annotation/IgnoreAuth.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.orion.ops.annotation;
+package cn.orionsec.ops.annotation;
 
 import java.lang.annotation.*;
 

diff --git a/...com/orion/ops/annotation/IgnoreCheck.java → .../orionsec/ops/annotation/IgnoreCheck.java b/...com/orion/ops/annotation/IgnoreCheck.java → .../orionsec/ops/annotation/IgnoreCheck.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.orion.ops.annotation;
+package cn.orionsec.ops.annotation;
 
 import java.lang.annotation.*;
 

diff --git a/...a/com/orion/ops/annotation/IgnoreLog.java → ...cn/orionsec/ops/annotation/IgnoreLog.java b/...a/com/orion/ops/annotation/IgnoreLog.java → ...cn/orionsec/ops/annotation/IgnoreLog.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.orion.ops.annotation;
+package cn.orionsec.ops.annotation;
 
 import java.lang.annotation.*;
 
@@ -22,7 +22,7 @@
  *
  * @author Jiahang Li
  * @version 1.0.0
- * @see com.orion.ops.interceptor.LogPrintInterceptor
+ * @see cn.orionsec.ops.interceptor.LogPrintInterceptor
  * @since 2022/4/20 10:33
  */
 @SuppressWarnings("ALL")

diff --git a/...m/orion/ops/annotation/IgnoreWrapper.java → ...rionsec/ops/annotation/IgnoreWrapper.java b/...m/orion/ops/annotation/IgnoreWrapper.java → ...rionsec/ops/annotation/IgnoreWrapper.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.orion.ops.annotation;
+package cn.orionsec.ops.annotation;
 
 import java.lang.annotation.*;
 

diff --git a/...com/orion/ops/annotation/RequireRole.java → .../orionsec/ops/annotation/RequireRole.java b/...com/orion/ops/annotation/RequireRole.java → .../orionsec/ops/annotation/RequireRole.java
@@ -13,9 +13,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.orion.ops.annotation;
+package cn.orionsec.ops.annotation;
 
-import com.orion.ops.constant.user.RoleType;
+import cn.orionsec.ops.constant.user.RoleType;
 
 import java.lang.annotation.*;
 

diff --git a/...com/orion/ops/annotation/RestWrapper.java → .../orionsec/ops/annotation/RestWrapper.java b/...com/orion/ops/annotation/RestWrapper.java → .../orionsec/ops/annotation/RestWrapper.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.orion.ops.annotation;
+package cn.orionsec.ops.annotation;
 
 import java.lang.annotation.*;
 

diff --git a/.../java/com/orion/ops/constant/CnConst.java → ...ava/cn/orionsec/ops/constant/CnConst.java b/.../java/com/orion/ops/constant/CnConst.java → ...ava/cn/orionsec/ops/constant/CnConst.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.orion.ops.constant;
+package cn.orionsec.ops.constant;
 
 /**
  * 中文常量

diff --git a/...in/java/com/orion/ops/constant/Const.java → .../java/cn/orionsec/ops/constant/Const.java b/...in/java/com/orion/ops/constant/Const.java → .../java/cn/orionsec/ops/constant/Const.java
@@ -13,9 +13,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.orion.ops.constant;
+package cn.orionsec.ops.constant;
 
-import com.orion.lang.utils.collect.Lists;
+import cn.orionsec.kit.lang.utils.collect.Lists;
 
 import java.util.List;
 
@@ -26,7 +26,7 @@
  * @version 1.0.0
  * @since 2021/3/30 10:07
  */
-public class Const extends com.orion.lang.constant.Const {
+public class Const implements cn.orionsec.kit.lang.constant.Const {
 
     private Const() {
     }
@@ -177,6 +177,18 @@ private Const() {
 
     public static final String LF_3 = "\n\n\n";
 
+    public static final Integer ENABLE = 1;
+
+    public static final Integer DISABLE = 2;
+
+    public static final Integer NOT_DELETED = 1;
+
+    public static final Integer IS_DELETED = 2;
+
+    public static final Integer INCREMENT = 1;
+
+    public static final Integer DECREMENT = 2;
+
     /**
      * 不安全的文件夹
      */

diff --git a/...java/com/orion/ops/constant/KeyConst.java → ...va/cn/orionsec/ops/constant/KeyConst.java b/...java/com/orion/ops/constant/KeyConst.java → ...va/cn/orionsec/ops/constant/KeyConst.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.orion.ops.constant;
+package cn.orionsec.ops.constant;
 
 /**
  * redis key 常量
@@ -28,14 +28,14 @@ private KeyConst() {
     }
 
     /**
-     * 登陆 token
+     * 登录 token
      * <p>
      * auth:login:{id}
      */
     public static final String LOGIN_TOKEN_KEY = "auth:info:{}";
 
     /**
-     * 登陆 token 绑定 token
+     * 登录 token 绑定 token
      * <p>
      * auth:login:{id}:{timestamp}
      */

diff --git a/.../com/orion/ops/constant/MessageConst.java → ...n/orionsec/ops/constant/MessageConst.java b/.../com/orion/ops/constant/MessageConst.java → ...n/orionsec/ops/constant/MessageConst.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.orion.ops.constant;
+package cn.orionsec.ops.constant;
 
 /**
  * 消息常量

diff --git a/...va/com/orion/ops/constant/ParamConst.java → .../cn/orionsec/ops/constant/ParamConst.java b/...va/com/orion/ops/constant/ParamConst.java → .../cn/orionsec/ops/constant/ParamConst.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.orion.ops.constant;
+package cn.orionsec.ops.constant;
 
 /**
  * 参数常量

diff --git a/...m/orion/ops/constant/PropertiesConst.java → ...rionsec/ops/constant/PropertiesConst.java b/...m/orion/ops/constant/PropertiesConst.java → ...rionsec/ops/constant/PropertiesConst.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.orion.ops.constant;
+package cn.orionsec.ops.constant;
 
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Component;
@@ -36,7 +36,7 @@ public class PropertiesConst {
     public static String ORION_OPS_VERSION;
 
     /**
-     * 登陆 token 请求头
+     * 登录 token 请求头
      */
     public static String LOGIN_TOKEN_HEADER;
 

diff --git a/...va/com/orion/ops/constant/ResultCode.java → .../cn/orionsec/ops/constant/ResultCode.java b/...va/com/orion/ops/constant/ResultCode.java → .../cn/orionsec/ops/constant/ResultCode.java
@@ -13,9 +13,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.orion.ops.constant;
+package cn.orionsec.ops.constant;
 
-import com.orion.lang.define.wrapper.CodeInfo;
+import cn.orionsec.kit.lang.define.wrapper.CodeInfo;
 
 /**
  * wrapper 返回 code