build: 更换minio 服务器

.gitlab-ci.yml

@@ -2,7 +2,7 @@
 image: git.mesalab.cn:7443/nezha/nz-build-env:1.3
 # 定义全局变量
 variables:
-  MINIO_HOST: 'http://192.168.41.160:2020/'
+  MINIO_HOST: 'http://192.168.40.48:2020/'
   MINIO_USER: 'admin'
   MINIO_PWD: "Nezha@02!"
   MAVEN_REPO: "/etc/maven/repository/"
@@ -55,8 +55,15 @@ dev_build:
   script:
     - env | sort
     - pwd
+    - export FILE_NAME=$CI_PROJECT_NAME-$CI_COMMIT_REF_NAME-$CI_COMMIT_SHORT_SHA.tar.gz
+    - export BRANCH_ARRAY=(${CI_COMMIT_REF_NAME//-/ })
+    - echo -e "version=${BRANCH_ARRAY[1]}\ncommit=$CI_COMMIT_SHORT_SHA\nbuildDate=`date +'%Y%m%d%H%m%S'`" >>./src/main/resources/version.properties
     - mvn clean install -Dxjar.password=111111 -Dxjar.excludes=/db/*,/static/**/*
-    - cd ./target && go build xjar.go && cd ..
+    - cd ./target && go build xjar.go && tar -zcvf $FILE_NAME xjar nz-talon.xjar
+    - mc alias set nz $MINIO_HOST $MINIO_USER $MINIO_PWD
+    - mc cp $FILE_NAME nz/ci-cd/nz-talon/$FILE_NAME
+    - mc cp $FILE_NAME nz/ci-cd/nz-talon/$CI_PROJECT_NAME-$CI_COMMIT_REF_NAME-latest.tar.gz
+    - cd ../
   artifacts:
     name: "$CI_PROJECT_NAME-$CI_COMMIT_REF_NAME-$CI_COMMIT_SHORT_SHA"
     when: on_success

src/main/java/net/geedge/confagent/util/OSHIUtils.java

@@ -163,6 +163,7 @@ public class OSHIUtils {
             procsData.put("path",proc.getPath());
             procsData.put("virtualSize",proc.getVirtualSize());
             procsData.put("residentSetSize",proc.getResidentSetSize());
+            procsData.put("runTime",proc.getUpTime());
             result.add(procsData);
         }
 
@@ -208,11 +209,13 @@ public class OSHIUtils {
             map.put("receiveQueue",connection.getReceiveQueue());
             if (connection.getowningProcessId() == -1 ){
                 //未知进程 getowningProcessId 返回 -1 为避免获取进程name error
-                map.put("processId","unknown");
-                map.put("processName","unknown");
+                map.put("processId",-1);
+                map.put("processName","");
+                map.put("processCmd","");
             }else {
                 map.put("processId",connection.getowningProcessId());
                 map.put("processName",operatingSystem.getProcess(connection.getowningProcessId()).getName());
+                map.put("processCmd",operatingSystem.getProcess(connection.getowningProcessId()).getCommandLine());
             }
 
             result.add(map);