From 889185f5773852a24de0a2230d43d16e95f3df0b Mon Sep 17 00:00:00 2001
From: zeaslity <zeaslity@qq.com>
Date: Thu, 14 Dec 2023 11:54:43 +0800
Subject: [PATCH] [ Agent ] [ App ] - offline build

---
 ...t-wdd.yaml => octopus-agent-standard.yaml} | 32 +++----------------
 server/src/main/resources/application.yml     |  2 ++
 .../wdd/source/octopus/simple-middleware.yaml |  2 +-
 3 files changed, 8 insertions(+), 28 deletions(-)
 rename agent-go/{octopus-agent-wdd.yaml => octopus-agent-standard.yaml} (73%)

diff --git a/agent-go/octopus-agent-wdd.yaml b/agent-go/octopus-agent-standard.yaml
similarity index 73%
rename from agent-go/octopus-agent-wdd.yaml
rename to agent-go/octopus-agent-standard.yaml
index d316ac2..ab76280 100644
--- a/agent-go/octopus-agent-wdd.yaml
+++ b/agent-go/octopus-agent-standard.yaml
@@ -37,6 +37,8 @@ octopus:
     executor:
       # agent执行一条Command的最长超时时间
       processMaxTimeOut: 60
+      #      ossOfflinePrefix: "https://oss-s1.107421.xyz"
+      ossOfflinePrefix: "http://OFFLINE_HOST_IP9000/octopus/"
     status:
       app:
         - Nginx/nginx
@@ -51,12 +53,11 @@ spring:
     allow-circular-references: true
     allow-bean-definition-overriding: true
   rabbitmq:
-    host: 42.192.52.227
-    #    host: 192.168.35.71
+    host: OFFLINE_HOST_IP
     port: 20672
     username: boge
     password: boge8tingH
-    virtual-host: /wdd
+    virtual-host: /
     listener:
       simple:
         retry:
@@ -65,27 +66,4 @@ spring:
           enabled: true
           # retry interval unit ms
           max-interval: 65000
-          initial-interval: 65000
-
-#spring:
-#  application:
-#    name: octopus-agent
-#  profiles:
-#    active: dev
-#  cloud:
-#    nacos:
-#      config:
-#        group: dev
-#        config-retry-time: 3000
-#        file-extension: yaml
-#        max-retry: 3
-#        #        server-addr: "150.230.198.103:21060"
-#        server-addr: "42.192.52.227:21060"
-#        timeout: 5000
-#        config-long-poll-timeout: 5000
-#        extension-configs:
-#          - group: dev
-#            data-id: "common-dev.yaml"
-#
-#server:
-#  port: 8000
\ No newline at end of file
+          initial-interval: 65000
\ No newline at end of file
diff --git a/server/src/main/resources/application.yml b/server/src/main/resources/application.yml
index de88b42..2ce3ab9 100644
--- a/server/src/main/resources/application.yml
+++ b/server/src/main/resources/application.yml
@@ -48,6 +48,8 @@ spring:
         # 连接池中的最小空闲连接数，默认值为0
         min-idle: 10
         time-between-eviction-runs: 50000
+
+
   datasource:
     driver-class-name: com.mysql.cj.jdbc.Driver
     url: jdbc:mysql://42.192.52.227:21306/octopus_server?autoReconnect=true&useSSL=false&useUnicode=true&characterEncoding=UTF-8&serverTimezone=GMT%2B8
diff --git a/source/src/main/java/io/wdd/source/octopus/simple-middleware.yaml b/source/src/main/java/io/wdd/source/octopus/simple-middleware.yaml
index 415e951..52cc834 100644
--- a/source/src/main/java/io/wdd/source/octopus/simple-middleware.yaml
+++ b/source/src/main/java/io/wdd/source/octopus/simple-middleware.yaml
@@ -18,7 +18,7 @@ services:
       - MYSQL_ROOT_PASSWORD=boge8tingH
       - MYSQL_CHARACTER_SET=utf8mb4
       - MYSQL_COLLATE:utf8_general_ci
-      - MYSQL_AUTHENTICATION_PLUGIN=mysql_native_password
+      - MYSQL_AUTHENTICATION_PLUGIN=caching_sha2_password
     healthcheck:
       test: [ 'CMD', '/opt/bitnami/scripts/mysql/healthcheck.sh' ]
       interval: 15s