Skip to content

Commit 1e1d139

Browse files
lijiahangmaxlijiahangmax
authored
Merge pull request #61 from lijiahangmax/dev
merge
2 parents b1aaaf4 + b48adf1 commit 1e1d139

843 files changed

Lines changed: 5036 additions & 4992 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎README.md‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,8 @@
6060

6161
* 🔗 演示地址: [https://do.orionsec.cn/#/](https://do.orionsec.cn/#/)
6262
* 🔏 演示账号: orionadmin/orionadmin
63-
* ⭐ 体验后可以点一下 `star` 这对我很重要! [github](https://github.com/lijiahangmax/orion-ops) [gitee](https://gitee.com/lijiahangmax/orion-ops) [gitcode](https://gitcode.com/lijiahangmax/orion-ops/overview)
63+
* ⭐ 体验后可以点一下 `star`
64+
这对我很重要! [github](https://github.com/lijiahangmax/orion-ops) [gitee](https://gitee.com/lijiahangmax/orion-ops) [gitcode](https://gitcode.com/lijiahangmax/orion-ops/overview)
6465
* 🌈 如果本项目对你有帮助请帮忙推广一下 让更多的人知道此项目!
6566
* 🎭 演示环境部分功能不可用, 完整功能请本地部署!
6667
* 📛 演示环境请不要随便删除数据!
@@ -77,7 +78,7 @@
7778

7879
## 重构版 orion-visor
7980

80-
`orion-visor` 为 `orion-ops` 的重构版本, 优化了交互逻辑以及UI风格、操作更友好、系统更快速&安全! 目前该项目已荣获 `GVP`
81+
`orion-visor` 为 `orion-ops` 的重构版本, 优化了交互逻辑以及UI风格、操作更友好、系统更快速&安全! 目前该项目已荣获 `GVP`
8182
[项目地址](https://visor.orionsec.cn)
8283

8384
## 技术栈
@@ -153,9 +154,9 @@
153154
![流水线配置](https://yxythpt.oss-cn-shenzhen.aliyuncs.com/2022-04-25/files694386343461173439.png "流水线配置")
154155
![流水线任务](https://yxythpt.oss-cn-shenzhen.aliyuncs.com/2022-04-25/files6446052342050924823.png "流水线任务")
155156

156-
### 登陆日志
157+
### 登录日志
157158

158-
![登陆日志](http://bjucloud.oss-cn-qingdao.aliyuncs.com/album/2022/7/23/4a548584-6cee-4b95-9811-5d2a670bfca8.jpg "登陆日志")
159+
![登录日志](http://bjucloud.oss-cn-qingdao.aliyuncs.com/album/2022/7/23/4a548584-6cee-4b95-9811-5d2a670bfca8.jpg "登录日志")
159160

160161
### 安全配置
161162

@@ -187,7 +188,7 @@ orion-ops 作为开源项目, 欢迎任何人提出建议以及贡献代码。
187188

188189
<img src="https://oos-sdqd.ctyunapi.cn/album/2022/9/22/018ac2ff-164a-4f7d-a8ae-030c5d899726.png" alt="联系方式" width="540px"/>
189190

190-
📧 微信添加备注: ops
191+
📧 问题/加群微信备注: ops
191192
📧 合作/功能定制备注: 合作
192193

193194
## 支持一下

‎docker-compose.yml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
version: '3.3'
22
services:
33
orion-ops:
4-
image: registry.cn-hangzhou.aliyuncs.com/lijiahangmax/orion-ops:1.2.9
4+
image: registry.cn-hangzhou.aliyuncs.com/lijiahangmax/orion-ops:1.3.0
55
ports:
66
- 1022:22
77
- 1080:80
@@ -19,7 +19,7 @@ services:
1919
- orion-ops-db
2020
- orion-ops-redis
2121
orion-ops-db:
22-
image: registry.cn-hangzhou.aliyuncs.com/lijiahangmax/orion-ops-mysql:1.2.9
22+
image: registry.cn-hangzhou.aliyuncs.com/lijiahangmax/orion-ops-mysql:1.3.0
2323
privileged: true
2424
environment:
2525
- MYSQL_DATABASE=orion-ops
@@ -33,7 +33,7 @@ services:
3333
- /data/orion-ops-space/docker-volumes/mysql/var-lib-mysql-files:/var/lib/mysql-files
3434
- /data/orion-ops-space/docker-volumes/mysql/etc-mysql:/etc/mysql
3535
orion-ops-redis:
36-
image: registry.cn-hangzhou.aliyuncs.com/lijiahangmax/orion-ops-redis:1.2.9
36+
image: registry.cn-hangzhou.aliyuncs.com/lijiahangmax/orion-ops-redis:1.3.0
3737
privileged: true
3838
ports:
3939
- 16379:6379
@@ -43,7 +43,7 @@ services:
4343
- /data/orion-ops-space/docker-volumes/orion-ops-redis/data:/data
4444
command: sh -c "redis-server /usr/local/redis.conf --requirepass $${REDIS_PASSWORD}"
4545
orion-ops-adminer:
46-
image: registry.cn-hangzhou.aliyuncs.com/lijiahangmax/orion-ops-adminer:1.2.9
46+
image: registry.cn-hangzhou.aliyuncs.com/lijiahangmax/orion-ops-adminer:1.3.0
4747
restart: always
4848
ports:
4949
- 18080:8080

‎docker/adminer/build.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
#/bin/bash
2-
version=1.2.9
2+
version=1.3.0
33
docker build -t orion-ops-adminer:${version} .
44
docker tag orion-ops-adminer:${version} registry.cn-hangzhou.aliyuncs.com/lijiahangmax/orion-ops-adminer:${version}

‎docker/mysql/build.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#/bin/bash
2-
version=1.2.9
2+
version=1.3.0
33
cp -r ../../sql ./sql
44
docker build -t orion-ops-mysql:${version} .
55
rm -rf ./sql

‎docker/push.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#/bin/bash
2-
version=1.2.9
2+
version=1.3.0
33
docker push registry.cn-hangzhou.aliyuncs.com/lijiahangmax/orion-ops-adminer:${version}
44
docker push registry.cn-hangzhou.aliyuncs.com/lijiahangmax/orion-ops-mysql:${version}
55
docker push registry.cn-hangzhou.aliyuncs.com/lijiahangmax/orion-ops-redis:${version}

‎docker/redis/build.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
#/bin/bash
2-
version=1.2.9
2+
version=1.3.0
33
docker build -t orion-ops-redis:${version} .
44
docker tag orion-ops-redis:${version} registry.cn-hangzhou.aliyuncs.com/lijiahangmax/orion-ops-redis:${version}

‎docker/service/build.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#/bin/bash
2-
version=1.2.9
2+
version=1.3.0
33
mv ../../orion-ops-api/orion-ops-web/target/orion-ops-web.jar ./
44
mv ../../orion-ops-vue/dist ./
55
cp $HOME/orion-ops/lib/machine-monitor-agent-latest.jar ./

‎orion-ops-api/orion-ops-common/pom.xml‎

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@
33
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
44

55
<parent>
6-
<groupId>com.orion.ops</groupId>
6+
<groupId>cn.orionsec.ops</groupId>
77
<artifactId>orion-ops-api</artifactId>
8-
<version>1.2.9</version>
8+
<version>1.3.0</version>
99
<relativePath>../pom.xml</relativePath>
1010
</parent>
1111

@@ -22,9 +22,15 @@
2222

2323
<!-- orion-kit -->
2424
<dependency>
25-
<groupId>io.github.lijiahangmax</groupId>
25+
<groupId>cn.orionsec.kit</groupId>
2626
<artifactId>orion-all</artifactId>
2727
</dependency>
28+
29+
<!-- web -->
30+
<dependency>
31+
<groupId>org.springframework.boot</groupId>
32+
<artifactId>spring-boot-starter-web</artifactId>
33+
</dependency>
2834
</dependencies>
2935

3036
</project>

orion-ops-api/orion-ops-common/src/main/java/com/orion/ops/annotation/DemoDisableApi.java renamed to orion-ops-api/orion-ops-common/src/main/java/cn/orionsec/ops/annotation/DemoDisableApi.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
* See the License for the specific language governing permissions and
1414
* limitations under the License.
1515
*/
16-
package com.orion.ops.annotation;
16+
package cn.orionsec.ops.annotation;
1717

1818
import java.lang.annotation.*;
1919

orion-ops-api/orion-ops-common/src/main/java/com/orion/ops/annotation/EventLog.java renamed to orion-ops-api/orion-ops-common/src/main/java/cn/orionsec/ops/annotation/EventLog.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,9 @@
1313
* See the License for the specific language governing permissions and
1414
* limitations under the License.
1515
*/
16-
package com.orion.ops.annotation;
16+
package cn.orionsec.ops.annotation;
1717

18-
import com.orion.ops.constant.event.EventType;
18+
import cn.orionsec.ops.constant.event.EventType;
1919

2020
import java.lang.annotation.*;
2121

0 commit comments

Comments
 (0)