Merge pull request #51 from lijiahangmax/dev

Dev
lijiahangmax · Aug 1, 2024 · 8f601d1 · 8f601d1
2 parents cd02573 + 53109e7
commit 8f601d1
Show file tree

Hide file tree

Showing 21 changed files with 37 additions and 29 deletions.
diff --git a/README.md b/README.md
@@ -58,12 +58,13 @@
 
 ## 演示环境
 
-演示地址: http://101.43.254.243:1080/#/  
-演示账号: orionadmin/orionadmin
-
-⭐ 体验后可以点一下 `star` 这对我很重要!  
-🌈 如果本项目对你有帮助请帮忙推广一下 让更多的人知道此项目!
-[github](https://github.com/lijiahangmax/orion-ops)  [gitee](https://gitee.com/lijiahangmax/orion-ops)
+* 🔗 演示地址: http://101.43.254.243:1080/#/
+* 🔏 演示账号: orionadmin/orionadmin
+* ⭐ 体验后可以点一下 `star` 这对我很重要! [github](https://github.com/lijiahangmax/orion-ops) [gitee](https://gitee.com/lijiahangmax/orion-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.6
+    image: registry.cn-hangzhou.aliyuncs.com/lijiahangmax/orion-ops:1.2.7
     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.6
+    image: registry.cn-hangzhou.aliyuncs.com/lijiahangmax/orion-ops-mysql:1.2.7
     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.6
+    image: registry.cn-hangzhou.aliyuncs.com/lijiahangmax/orion-ops-redis:1.2.7
     privileged: true
     ports:
       - 16379:6379
@@ -42,8 +42,8 @@ services:
     volumes:
       - /data/orion-ops-space/docker-volumes/orion-ops-redis/data:/data
     command: sh -c "redis-server /usr/local/redis.conf --requirepass $${REDIS_PASSWORD}"
-  orion-adminer:
-    image: adminer
+  orion-ops-adminer:
+    image: registry.cn-hangzhou.aliyuncs.com/lijiahangmax/orion-ops-adminer:1.2.7
     restart: always
     ports:
       - 18080:8080
diff --git a/docker-upgrade.sh b/docker-upgrade.sh
@@ -1,6 +1,5 @@
 #/bin/bash
 docker compose down
-sh ./pull.sh
 # demo 启动
 if [ "$1" == "demo" ]; then
     sed -i 's/DEMO_MODE=false/DEMO_MODE=true/g' docker-compose.yml

diff --git a/docker/adminer/Dockerfile b/docker/adminer/Dockerfile
@@ -0,0 +1 @@
+FROM adminer:latest
diff --git a/docker/adminer/build.sh b/docker/adminer/build.sh
@@ -0,0 +1,5 @@
+#/bin/bash
+version=1.2.7
+docker build -t orion-ops-adminer:${version} .
+docker tag orion-ops-adminer:${version} registry.cn-hangzhou.aliyuncs.com/lijiahangmax/orion-ops-adminer:${version}
+docker push 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.6
+version=1.2.7
 cp -r ../../sql ./sql
 docker build -t orion-ops-mysql:${version} .
 rm -rf ./sql

diff --git a/docker/redis/build.sh b/docker/redis/build.sh
@@ -1,5 +1,5 @@
 #/bin/bash
-version=1.2.6
+version=1.2.7
 docker build -t orion-ops-redis:${version} .
 docker tag orion-ops-redis:${version} registry.cn-hangzhou.aliyuncs.com/lijiahangmax/orion-ops-redis:${version}
 docker push registry.cn-hangzhou.aliyuncs.com/lijiahangmax/orion-ops-redis:${version}
diff --git a/docker/service/build.sh b/docker/service/build.sh
@@ -1,6 +1,6 @@
 #/bin/bash
-version=1.2.6
-mv ../../orion-ops-api/orion-ops-web/target/orion-ops-web-${version}.jar ./orion-ops-web.jar
+version=1.2.7
+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 ./
 docker build -t orion-ops:${version} .

diff --git a/orion-ops-api/orion-ops-common/pom.xml b/orion-ops-api/orion-ops-common/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>com.orion.ops</groupId>
         <artifactId>orion-ops-api</artifactId>
-        <version>1.2.6</version>
+        <version>1.2.7</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

diff --git a/orion-ops-api/orion-ops-dao/pom.xml b/orion-ops-api/orion-ops-dao/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>com.orion.ops</groupId>
         <artifactId>orion-ops-api</artifactId>
-        <version>1.2.6</version>
+        <version>1.2.7</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

diff --git a/orion-ops-api/orion-ops-data/pom.xml b/orion-ops-api/orion-ops-data/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>com.orion.ops</groupId>
         <artifactId>orion-ops-api</artifactId>
-        <version>1.2.6</version>
+        <version>1.2.7</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

diff --git a/orion-ops-api/orion-ops-mapping/pom.xml b/orion-ops-api/orion-ops-mapping/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>com.orion.ops</groupId>
         <artifactId>orion-ops-api</artifactId>
-        <version>1.2.6</version>
+        <version>1.2.7</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

diff --git a/orion-ops-api/orion-ops-model/pom.xml b/orion-ops-api/orion-ops-model/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>com.orion.ops</groupId>
         <artifactId>orion-ops-api</artifactId>
-        <version>1.2.6</version>
+        <version>1.2.7</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

diff --git a/orion-ops-api/orion-ops-runner/pom.xml b/orion-ops-api/orion-ops-runner/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <artifactId>orion-ops-api</artifactId>
         <groupId>com.orion.ops</groupId>
-        <version>1.2.6</version>
+        <version>1.2.7</version>
     </parent>
 
     <name>orion-ops-runner</name>

diff --git a/orion-ops-api/orion-ops-service/pom.xml b/orion-ops-api/orion-ops-service/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>com.orion.ops</groupId>
         <artifactId>orion-ops-api</artifactId>
-        <version>1.2.6</version>
+        <version>1.2.7</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

diff --git a/...ervice/src/main/java/com/orion/ops/handler/terminal/watcher/TerminalWatcherProcessor.java b/...ervice/src/main/java/com/orion/ops/handler/terminal/watcher/TerminalWatcherProcessor.java
@@ -36,7 +36,7 @@ public TerminalWatcherProcessor() {
     @Override
     public void watch() {
         this.run = true;
-        Threads.start(this, SchedulerPools.TERMINAL_SCHEDULER);
+        Threads.start(this, SchedulerPools.TERMINAL_WATCHER_SCHEDULER);
     }
 
     @SneakyThrows

diff --git a/orion-ops-api/orion-ops-web/pom.xml b/orion-ops-api/orion-ops-web/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>com.orion.ops</groupId>
         <artifactId>orion-ops-api</artifactId>
-        <version>1.2.6</version>
+        <version>1.2.7</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
@@ -59,6 +59,8 @@
     </dependencies>
 
     <build>
+        <!-- 设置构建的 jar 包名 -->
+        <finalName>${project.artifactId}</finalName>
         <resources>
             <resource>
                 <directory>src/main/resources</directory>

diff --git a/orion-ops-api/orion-ops-web/src/main/resources/application.properties b/orion-ops-api/orion-ops-web/src/main/resources/application.properties
@@ -31,7 +31,7 @@ logging.logback.rollingpolicy.max-history=30
 logging.logback.rollingpolicy.max-file-size=64MB
 logging.logback.rollingpolicy.total-size-cap=0B
 # app
-app.version=1.2.6
+app.version=1.2.7
 login.token.header=O-Login-Token
 value.mix.secret.key=${SECRET_KEY:orion_ops}
 demo.mode=${DEMO_MODE:false}

diff --git a/orion-ops-api/pom.xml b/orion-ops-api/pom.xml
@@ -11,7 +11,7 @@
     <name>orion-ops-api</name>
     <groupId>com.orion.ops</groupId>
     <artifactId>orion-ops-api</artifactId>
-    <version>1.2.6</version>
+    <version>1.2.7</version>
     <packaging>pom</packaging>
     <modelVersion>4.0.0</modelVersion>
     <url>https://github.com/lijiahangmax/orion-ops</url>

diff --git a/orion-ops-vue/package.json b/orion-ops-vue/package.json
@@ -1,6 +1,6 @@
 {
   "name": "orion-ops-vue",
-  "version": "1.2.6",
+  "version": "1.2.7",
   "private": true,
   "scripts": {
     "serve": "vue-cli-service serve  --mode dev",

diff --git a/orion-ops-vue/src/components/system/ThreadMetrics.vue b/orion-ops-vue/src/components/system/ThreadMetrics.vue
@@ -97,7 +97,7 @@ export default {
 
 .metrics-value-wrapper {
   margin-right: 8px;
-  width: 48px;
+  width: 74px;
   display: inline-block;
 
   .metrics-value {