diff --git a/.github/workflows/e2e.yaml b/.github/workflows/e2e.yaml index 09e4b46d..87eef70c 100644 --- a/.github/workflows/e2e.yaml +++ b/.github/workflows/e2e.yaml @@ -4,9 +4,8 @@ on: pull_request: branches: - main - - dev -concurrency: +concurrency: group: ${{github.workflow}} - ${{github.ref}} cancel-in-progress: true diff --git a/NOTICE b/NOTICE new file mode 100644 index 00000000..c78b4c20 --- /dev/null +++ b/NOTICE @@ -0,0 +1,7 @@ + * 在使用本项目前,请您仔细阅读免责声明,确保您已充分理解其中的内容 + + * 本项目采用 APACHE LICENSE 2.0 开源协议,如您需要源码的开发方式,需要遵循以下几点 + + 1. 禁止修改或删除 LICENSE 文件。 + 2. 不可二次开发或参与同类竞品的开发。 + 3. 本项目可免费商业使用,商业使用请保留项目源码、出处、描述文件和作者声明等。 diff --git a/docker-compose-testing.yml b/docker-compose-testing.yml index 349be792..5cb4679d 100644 --- a/docker-compose-testing.yml +++ b/docker-compose-testing.yml @@ -1,7 +1,7 @@ version: '3.3' services: orion-visor-service: - image: registry.cn-hangzhou.aliyuncs.com/lijiahangmax/orion-visor-service:2.0.10 + image: registry.cn-hangzhou.aliyuncs.com/lijiahangmax/orion-visor-service:2.0.11 privileged: true ports: - 1081:80 @@ -32,7 +32,7 @@ services: - orion-visor-mysql - orion-visor-redis orion-visor-mysql: - image: registry.cn-hangzhou.aliyuncs.com/lijiahangmax/orion-visor-mysql:2.0.10 + image: registry.cn-hangzhou.aliyuncs.com/lijiahangmax/orion-visor-mysql:2.0.11 privileged: true ports: - 3307:3306 @@ -52,7 +52,7 @@ services: retries: 10 start_period: 3s orion-visor-redis: - image: registry.cn-hangzhou.aliyuncs.com/lijiahangmax/orion-visor-redis:2.0.10 + image: registry.cn-hangzhou.aliyuncs.com/lijiahangmax/orion-visor-redis:2.0.11 privileged: true ports: - 6380:6379 diff --git a/docker-compose.yml b/docker-compose.yml index 779231a5..a19a7010 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,7 +1,7 @@ version: '3.3' services: orion-visor-service: - image: registry.cn-hangzhou.aliyuncs.com/lijiahangmax/orion-visor-service:2.0.10 + image: registry.cn-hangzhou.aliyuncs.com/lijiahangmax/orion-visor-service:2.0.11 privileged: true ports: - 1081:80 @@ -32,7 +32,7 @@ services: - orion-visor-mysql - orion-visor-redis orion-visor-mysql: - image: registry.cn-hangzhou.aliyuncs.com/lijiahangmax/orion-visor-mysql:2.0.10 + image: registry.cn-hangzhou.aliyuncs.com/lijiahangmax/orion-visor-mysql:2.0.11 privileged: true ports: - 3307:3306 @@ -52,7 +52,7 @@ services: retries: 10 start_period: 3s orion-visor-redis: - image: registry.cn-hangzhou.aliyuncs.com/lijiahangmax/orion-visor-redis:2.0.10 + image: registry.cn-hangzhou.aliyuncs.com/lijiahangmax/orion-visor-redis:2.0.11 privileged: true ports: - 6380:6379 diff --git a/docker-upgrade.sh b/docker-upgrade.sh index 3887bcfa..42e6059e 100644 --- a/docker-upgrade.sh +++ b/docker-upgrade.sh @@ -4,4 +4,4 @@ docker compose down if [ "$1" == "demo" ]; then sed -i 's/DEMO_MODE=false/DEMO_MODE=true/g' docker-compose.yml fi -docker compose up -d +docker compose up -d --remove-orphans diff --git a/docker/e2e/testsuite.yaml b/docker/e2e/testsuite.yaml index 0cef6acc..8554d5e6 100644 --- a/docker/e2e/testsuite.yaml +++ b/docker/e2e/testsuite.yaml @@ -36,22 +36,14 @@ items: - name: haveUnRead request: api: /orion-visor/api/infra/system-message/has-unread - header: - Authorization: Bearer {{.login.data.token}} - name: queryOperatorLog request: api: /orion-visor/api/infra/mine/query-operator-log method: POST - header: - Authorization: Bearer {{.login.data.token}} - name: hostList request: api: /orion-visor/api/infra/tag/list?type=HOST - header: - Authorization: Bearer {{.login.data.token}} - name: queryHost request: api: /orion-visor/api/asset/host/query method: POST - header: - Authorization: Bearer {{.login.data.token}} diff --git a/docker/mysql/build.sh b/docker/mysql/build.sh index 43cc515a..50b32314 100644 --- a/docker/mysql/build.sh +++ b/docker/mysql/build.sh @@ -1,5 +1,5 @@ #/bin/bash -version=2.0.10 +version=2.0.11 cp -r ../../sql ./sql docker build -t orion-visor-mysql:${version} . rm -rf ./sql diff --git a/docker/redis/build.sh b/docker/redis/build.sh index b6539d5d..3201a2ec 100644 --- a/docker/redis/build.sh +++ b/docker/redis/build.sh @@ -1,5 +1,5 @@ #/bin/bash -version=2.0.10 +version=2.0.11 docker build -t orion-visor-redis:${version} . docker tag orion-visor-redis:${version} registry.cn-hangzhou.aliyuncs.com/lijiahangmax/orion-visor-redis:${version} docker push registry.cn-hangzhou.aliyuncs.com/lijiahangmax/orion-visor-redis:${version} diff --git a/docker/service/build.sh b/docker/service/build.sh index 2f7da874..0584384d 100644 --- a/docker/service/build.sh +++ b/docker/service/build.sh @@ -1,5 +1,5 @@ #/bin/bash -version=2.0.10 +version=2.0.11 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 index 68975b9e..a4a33549 100644 --- a/orion-visor-dependencies/pom.xml +++ b/orion-visor-dependencies/pom.xml @@ -14,7 +14,7 @@ https://github.com/dromara/orion-visor - 2.0.10 + 2.0.11 2.7.17 2.7.15 1.5.0 diff --git a/orion-visor-framework/orion-visor-framework-common/src/main/java/com/orion/visor/framework/common/constant/AppConst.java b/orion-visor-framework/orion-visor-framework-common/src/main/java/com/orion/visor/framework/common/constant/AppConst.java index 45e0e88e..0c44fdf4 100644 --- a/orion-visor-framework/orion-visor-framework-common/src/main/java/com/orion/visor/framework/common/constant/AppConst.java +++ b/orion-visor-framework/orion-visor-framework-common/src/main/java/com/orion/visor/framework/common/constant/AppConst.java @@ -14,7 +14,7 @@ public interface AppConst extends OrionConst { /** * 同 ${orion.version} 迭代时候需要手动更改 */ - String VERSION = "2.0.10"; + String VERSION = "2.0.11"; /** * 同 ${spring.application.name} diff --git a/orion-visor-framework/orion-visor-framework-common/src/main/java/com/orion/visor/framework/common/constant/ExtraFieldConst.java b/orion-visor-framework/orion-visor-framework-common/src/main/java/com/orion/visor/framework/common/constant/ExtraFieldConst.java index fe428a78..f0060c82 100644 --- a/orion-visor-framework/orion-visor-framework-common/src/main/java/com/orion/visor/framework/common/constant/ExtraFieldConst.java +++ b/orion-visor-framework/orion-visor-framework-common/src/main/java/com/orion/visor/framework/common/constant/ExtraFieldConst.java @@ -43,4 +43,6 @@ public interface ExtraFieldConst extends FieldConst { String LOG_ID = "logId"; + String DARK = "dark"; + } diff --git a/orion-visor-framework/orion-visor-framework-common/src/main/java/com/orion/visor/framework/common/constant/FieldConst.java b/orion-visor-framework/orion-visor-framework-common/src/main/java/com/orion/visor/framework/common/constant/FieldConst.java index 08655aec..bec9ff55 100644 --- a/orion-visor-framework/orion-visor-framework-common/src/main/java/com/orion/visor/framework/common/constant/FieldConst.java +++ b/orion-visor-framework/orion-visor-framework-common/src/main/java/com/orion/visor/framework/common/constant/FieldConst.java @@ -31,6 +31,8 @@ public interface FieldConst { String INFO = "info"; + String EXTRA = "extra"; + String REL_ID = "relId"; String BEFORE = "before"; @@ -59,10 +61,24 @@ public interface FieldConst { String TIME = "time"; + String ISSUE = "issue"; + + String EXPIRE = "expire"; + String LOCATION = "location"; String USER_AGENT = "userAgent"; String ERROR_MESSAGE = "errorMessage"; + String UUID = "uuid"; + + String REDIRECT = "redirect"; + + String SCHEMA = "schema"; + + String FILTER = "filter"; + + String LICENSE = "license"; + } diff --git a/orion-visor-framework/orion-visor-spring-boot-starter-mybatis/src/main/java/com/orion/visor/framework/mybatis/core/generator/core/CustomFileFilter.java b/orion-visor-framework/orion-visor-spring-boot-starter-mybatis/src/main/java/com/orion/visor/framework/mybatis/core/generator/core/CustomFileFilter.java index 78e65056..98cefd24 100644 --- a/orion-visor-framework/orion-visor-spring-boot-starter-mybatis/src/main/java/com/orion/visor/framework/mybatis/core/generator/core/CustomFileFilter.java +++ b/orion-visor-framework/orion-visor-spring-boot-starter-mybatis/src/main/java/com/orion/visor/framework/mybatis/core/generator/core/CustomFileFilter.java @@ -38,13 +38,13 @@ public class CustomFileFilter { public List doFilter() { // 生成文件副本 List files = originCustomerFile.stream().map(s -> - new CustomFile.Builder() - .enableFileOverride() - .templatePath(s.getTemplatePath()) - .filePath(s.getFilePath()) - .fileName(s.getFileName()) - .packageName(s.getPackageName()) - .build()) + new CustomFile.Builder() + .enableFileOverride() + .templatePath(s.getTemplatePath()) + .filePath(s.getFilePath()) + .fileName(s.getFileName()) + .packageName(s.getPackageName()) + .build()) .collect(Collectors.toList()); // 不生成对外 api 文件 if (!table.isEnableProviderApi()) { diff --git a/orion-visor-framework/orion-visor-spring-boot-starter-mybatis/src/main/resources/templates/orion-vue-views-components-form-modal.vue.vm b/orion-visor-framework/orion-visor-spring-boot-starter-mybatis/src/main/resources/templates/orion-vue-views-components-form-modal.vue.vm index c69dde87..9e035c23 100644 --- a/orion-visor-framework/orion-visor-spring-boot-starter-mybatis/src/main/resources/templates/orion-vue-views-components-form-modal.vue.vm +++ b/orion-visor-framework/orion-visor-spring-boot-starter-mybatis/src/main/resources/templates/orion-vue-views-components-form-modal.vue.vm @@ -1,6 +1,6 @@ diff --git a/orion-visor-ui/src/components/asset/host/authorized-host-modal/index.vue b/orion-visor-ui/src/components/asset/host/authorized-host-modal/index.vue index c0e35a8e..952758d9 100644 --- a/orion-visor-ui/src/components/asset/host/authorized-host-modal/index.vue +++ b/orion-visor-ui/src/components/asset/host/authorized-host-modal/index.vue @@ -37,6 +37,7 @@ :allow-clear="true" :data="filterOptions" :filter-option="tagLabelFilter"> + - - - -