diff --git a/NOTICE b/NOTICE index 5896e2acd..64df0a066 100644 --- 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 index c2730e101..edc7f7390 100644 --- a/README.md +++ b/README.md @@ -3,18 +3,18 @@
+ href="https://app.codacy.com/gh/orionsec/orion-visor/dashboard?utm_source=gh&utm_medium=referral&utm_content=&utm_campaign=Badge_grade"> - + - + - + - +
@@ -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 index 23cfa2e2a..5c03ad55b 100644 --- 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 index 0b12080c3..fe4f8f124 100644 --- 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 index 4dc2a0416..d7d3d9ceb 100644 --- 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 index e8ad316f8..7adbd875d 100644 --- 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 index 87e710256..ac9388c44 100644 --- 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 index fbafd9229..b6adbfe4e 100644 --- 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 index b7359a9c6..d081b4210 100644 --- 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 index c89123ab8..d3cd16405 100644 --- 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 index 0d9308f58..b58050a5e 100644 --- a/orion-visor-dependencies/pom.xml +++ b/orion-visor-dependencies/pom.xml @@ -14,7 +14,7 @@