Merge pull request #46 from lijiahangmax/dev

Dev

README.md

@@ -19,19 +19,19 @@
 	<a target="_blank" style="text-decoration: none" href="https://gitee.com/lijiahangmax/orion-ops/members">
 		<img src="https://gitee.com/lijiahangmax/orion-ops/badge/fork.svg?theme=dark" alt="fork"/>
 	</a>		
-	<!-- <a target="_blank" style="text-decoration: none" href="https://github.com/lijiahangmax/orion-ops">
+	<a target="_blank" style="text-decoration: none" href="https://github.com/lijiahangmax/orion-ops">
 		<img src="https://img.shields.io/github/stars/lijiahangmax/orion-ops.svg?style=social" alt="star"/>
-	</a> -->	
+	</a>	
 </p>
 
 <br/>  
 
-当前最新版本: **1.2.3**  
+当前最新版本: **1.2.4**  
 github: https://github.com/lijiahangmax/orion-ops  
 gitee: https://gitee.com/lijiahangmax/orion-ops  
 csdn: https://blog.csdn.net/qq_41011894  
 orion-kit: [gitee](https://gitee.com/lijiahangmax/orion-kit) [github](https://github.com/lijiahangmax/orion-kit)    
-文档: https://lijiahangmax.gitee.io/orion-ops/#/    
+文档: https://lijiahangmax.github.io/orion-ops/#/    
 demo: http://101.43.254.243:1080/#/
 
 演示账号: `orionadmin`    
@@ -62,12 +62,12 @@ github: https://github.com/lijiahangmax/orion-ops-pro
 
 ## 快速开始
 
-安装文档: https://lijiahangmax.gitee.io/orion-ops/#/quickstart/install   
-开发文档: https://lijiahangmax.gitee.io/orion-ops/#/advance/second-dev   
-操作手册: https://lijiahangmax.gitee.io/orion-ops/#/operator/machine  
-常见问题: https://lijiahangmax.gitee.io/orion-ops/#/quickstart/faq  
-通用模板: https://lijiahangmax.gitee.io/orion-ops/#/template/java-springboot-template  
-roadmap: https://lijiahangmax.gitee.io/orion-ops/#/about/roadmap
+安装文档: https://lijiahangmax.github.io/orion-ops/#/quickstart/install   
+开发文档: https://lijiahangmax.github.io/orion-ops/#/advance/second-dev   
+操作手册: https://lijiahangmax.github.io/orion-ops/#/operator/machine  
+常见问题: https://lijiahangmax.github.io/orion-ops/#/quickstart/faq  
+通用模板: https://lijiahangmax.github.io/orion-ops/#/template/java-springboot-template  
+roadmap: https://lijiahangmax.github.io/orion-ops/#/about/roadmap
 
 ## 技术栈
 

docker-compose.yml

@@ -1,7 +1,7 @@
 version: '3.3'
 services:
   orion-ops:
-    image: registry.cn-hangzhou.aliyuncs.com/lijiahangmax/orion-ops:1.2.3
+    image: registry.cn-hangzhou.aliyuncs.com/lijiahangmax/orion-ops:1.2.4
     ports:
       - 1022:22
       - 1080:80
@@ -18,7 +18,7 @@ services:
       - orion-ops-db
       - orion-ops-redis
   orion-ops-db:
-    image: registry.cn-hangzhou.aliyuncs.com/lijiahangmax/orion-ops-mysql:1.2.3
+    image: registry.cn-hangzhou.aliyuncs.com/lijiahangmax/orion-ops-mysql:1.2.4
     privileged: true
     environment:
       - MYSQL_DATABASE=orion-ops

docker/mysql/build.sh

@@ -1,5 +1,5 @@
 mv ../../sql/init-schema.sql ./
 mv ../../sql/init-data.sql ./
-docker build -t orion-ops-mysql:1.2.3 .
+docker build -t orion-ops-mysql:1.2.4 .
 rm -f ./init-schema.sql
 rm -f ./init-data.sql

docker/orion-ops/Dockerfile

@@ -13,7 +13,8 @@ RUN sed -i 's/#PermitRootLogin.*/PermitRootLogin yes/g' /etc/ssh/sshd_config &&
     ssh-keygen -t ed25519 -P '' -f /etc/ssh/ssh_host_ed25519_key && \
     echo 'root:orionadmin' | chpasswd
 WORKDIR /app
-COPY ./orion-ops-web-1.2.3.jar /app/app.jar
+COPY ./machine-monitor-agent-latest.jar /root/orion-ops/lib/machine-monitor-agent-latest.jar
+COPY ./orion-ops-web-1.2.4.jar /app/app.jar
 COPY ./dist/index.html /usr/share/nginx/html/
 COPY ./dist /usr/share/nginx/html/ops
 ADD ./entrypoint.sh /app/entrypoint.sh

docker/orion-ops/build.sh

@@ -1,5 +1,7 @@
-mv ../../orion-ops-api/orion-ops-web/target/orion-ops-web-1.2.3.jar ./
+mv ../../orion-ops-api/orion-ops-web/target/orion-ops-web-1.2.4.jar ./
 mv ../../orion-ops-vue/dist ./
-docker build -t orion-ops:1.2.3 .
-rm -f ./orion-ops-web-1.2.3.jar
+cp $HOME/orion-ops/lib/machine-monitor-agent-latest.jar ./
+docker build -t orion-ops:1.2.4 .
+rm -f ./orion-ops-web-1.2.4.jar
 rm -rf ./dist
+rm -rf ./machine-monitor-agent-latest.jar

docs/README.md

@@ -19,19 +19,19 @@
 	<a target="_blank" style="text-decoration: none" href="https://gitee.com/lijiahangmax/orion-ops/members">
 		<img src="https://gitee.com/lijiahangmax/orion-ops/badge/fork.svg?theme=dark" alt="fork"/>
 	</a>		
-	<!-- <a target="_blank" style="text-decoration: none" href="https://github.com/lijiahangmax/orion-ops">
+	<a target="_blank" style="text-decoration: none" href="https://github.com/lijiahangmax/orion-ops">
 		<img src="https://img.shields.io/github/stars/lijiahangmax/orion-ops.svg?style=social" alt="star"/>
-	</a> -->	
+	</a>	
 </p>
 
 <br/>  
 
-当前最新版本: **1.2.3**  
+当前最新版本: **1.2.4**  
 github: https://github.com/lijiahangmax/orion-ops  
 gitee: https://gitee.com/lijiahangmax/orion-ops  
 csdn: https://blog.csdn.net/qq_41011894  
 orion-kit: [gitee](https://gitee.com/lijiahangmax/orion-kit) [github](https://github.com/lijiahangmax/orion-kit)    
-文档: https://lijiahangmax.gitee.io/orion-ops/#/    
+文档: https://lijiahangmax.github.io/orion-ops/#/    
 demo: http://101.43.254.243:1080/#/
 
 演示账号: `orionadmin`    
@@ -62,12 +62,12 @@ github: https://github.com/lijiahangmax/orion-ops-pro
 
 ## 快速开始
 
-安装文档: https://lijiahangmax.gitee.io/orion-ops/#/quickstart/install   
-开发文档: https://lijiahangmax.gitee.io/orion-ops/#/advance/second-dev   
-操作手册: https://lijiahangmax.gitee.io/orion-ops/#/operator/machine  
-常见问题: https://lijiahangmax.gitee.io/orion-ops/#/quickstart/faq  
-通用模板: https://lijiahangmax.gitee.io/orion-ops/#/template/java-springboot-template  
-roadmap: https://lijiahangmax.gitee.io/orion-ops/#/about/roadmap
+安装文档: https://lijiahangmax.github.io/orion-ops/#/quickstart/install   
+开发文档: https://lijiahangmax.github.io/orion-ops/#/advance/second-dev   
+操作手册: https://lijiahangmax.github.io/orion-ops/#/operator/machine  
+常见问题: https://lijiahangmax.github.io/orion-ops/#/quickstart/faq  
+通用模板: https://lijiahangmax.github.io/orion-ops/#/template/java-springboot-template  
+roadmap: https://lijiahangmax.github.io/orion-ops/#/about/roadmap
 
 ## 技术栈