[ env ] - 更改基础环境，优化代码

agent/src/main/resources/bootstrap.yml

@@ -11,7 +11,7 @@ spring:
         file-extension: yaml
         max-retry: 3
         #        server-addr: 43.154.83.213:21060
-        server-addr: 140.238.52.228:21060
+        server-addr: 150.230.198.103:21060
         #server-addr: https://nacos.107421.xyz:443
         timeout: 5000
         config-long-poll-timeout: 5000

server/src/main/resources/bootstrap.yml

@@ -2,22 +2,22 @@ spring:
   application:
     name: octopus-server
   profiles:
-    active: dev
+    active: k3s
   cloud:
     nacos:
       config:
-        group: dev
+        group: k3s
         config-retry-time: 3000
         file-extension: yaml
         max-retry: 3
         #        server-addr: 43.154.83.213:21060
-        server-addr: 140.238.52.228:21060
+        server-addr: 150.230.198.103:21060
         #        server-addr: https://nacos.107421.xyz:443
         timeout: 5000
         config-long-poll-timeout: 5000
         extension-configs:
-          - group: dev
+          - group: k3s
-            data-id: common-dev.yaml
+            data-id: common-k3s.yaml
 
 server:
   port: 9999

source/src/main/java/io/wdd/source/octopus/0-cleanup-k3s.sh

@@ -0,0 +1,56 @@
+#!/bin/bash
+
+echo "开始执行k3s默认的清除内容！"
+
+chmod +x /usr/local/bin/k3s-uninstall.sh
+chmod +x /usr/local/bin/k3s-agent-uninstall.sh
+
+/usr/local/bin/k3s-uninstall.sh
+/usr/local/bin/k3s-agent-uninstall.sh
+rm -rf /root/k3s-install/
+
+echo "开始清理containerd"
+
+echo "关停所有的容器！"
+crictl ps -a | grep -v Running | awk '{print $1}' | xargs sudo crictl rm && crictl rmi --prune
+
+echo "清除所有的镜像！"
+crictl images -q | xargs -n 1 crictl rmi 2>/dev/null
+
+apt-remove containerd
+
+echo "开始清理docker相关的内容"
+
+docker system df
+# 占用存储空间，又没有用的容器
+docker images -aq -f 'dangling=true' | xargs docker rmi
+
+# 删除所有
+echo "删除所有"
+docker system prune -a
+
+echo ""
+echo "清除docker运行的容器！"
+docker stop $(docker ps -a  | awk '{print $1 }')
+docker rm $(docker ps -a  | awk '{print $1 }')
+
+echo "删除镜像"
+docker rmi $(docker images | grep "none" | awk '{print $3}')
+
+echo "删除所有镜像 谨慎使用"
+docker rmi $(docker images -q) -f
+
+echo ""
+echo "开始删除docker的文件"
+rm -rf /var/lib/docker
+
+echo " "
+echo "开始清理系统残余"
+echo ""
+apt-get autoremove
+
+cat >>/etc/nginx/nginx.conf <<EOF
+include /etc/nginx/conf.d/stream/*.conf
+EOF
+
+systemctl restart nginx

source/src/main/java/io/wdd/source/octopus/nacos-2.2.0-initdb-schema.sql

@@ -0,0 +1,255 @@
+/*
+ * Copyright 1999-2018 Alibaba Group Holding Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+create database nacos_config;
+
+use nacos_config;
+/******************************************/
+/*   数据库全名 = nacos_config   */
+/*   表名称 = config_info   */
+/******************************************/
+CREATE TABLE `config_info`
+(
+    `id`                 bigint(20)   NOT NULL AUTO_INCREMENT COMMENT 'id',
+    `data_id`            varchar(255) NOT NULL COMMENT 'data_id',
+    `group_id`           varchar(128)          DEFAULT NULL,
+    `content`            longtext     NOT NULL COMMENT 'content',
+    `md5`                varchar(32)           DEFAULT NULL COMMENT 'md5',
+    `gmt_create`         datetime     NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
+    `gmt_modified`       datetime     NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '修改时间',
+    `src_user`           text COMMENT 'source user',
+    `src_ip`             varchar(50)           DEFAULT NULL COMMENT 'source ip',
+    `app_name`           varchar(128)          DEFAULT NULL,
+    `tenant_id`          varchar(128)          DEFAULT '' COMMENT '租户字段',
+    `c_desc`             varchar(256)          DEFAULT NULL,
+    `c_use`              varchar(64)           DEFAULT NULL,
+    `effect`             varchar(64)           DEFAULT NULL,
+    `type`               varchar(64)           DEFAULT NULL,
+    `c_schema`           text,
+    `encrypted_data_key` text         NOT NULL COMMENT '秘钥',
+    PRIMARY KEY (`id`),
+    UNIQUE KEY `uk_configinfo_datagrouptenant` (`data_id`, `group_id`, `tenant_id`)
+) ENGINE = InnoDB
+  DEFAULT CHARSET = utf8
+  COLLATE = utf8_bin COMMENT ='config_info';
+
+/******************************************/
+/*   数据库全名 = nacos_config   */
+/*   表名称 = config_info_aggr   */
+/******************************************/
+CREATE TABLE `config_info_aggr`
+(
+    `id`           bigint(20)   NOT NULL AUTO_INCREMENT COMMENT 'id',
+    `data_id`      varchar(255) NOT NULL COMMENT 'data_id',
+    `group_id`     varchar(128) NOT NULL COMMENT 'group_id',
+    `datum_id`     varchar(255) NOT NULL COMMENT 'datum_id',
+    `content`      longtext     NOT NULL COMMENT '内容',
+    `gmt_modified` datetime     NOT NULL COMMENT '修改时间',
+    `app_name`     varchar(128) DEFAULT NULL,
+    `tenant_id`    varchar(128) DEFAULT '' COMMENT '租户字段',
+    PRIMARY KEY (`id`),
+    UNIQUE KEY `uk_configinfoaggr_datagrouptenantdatum` (`data_id`, `group_id`, `tenant_id`, `datum_id`)
+) ENGINE = InnoDB
+  DEFAULT CHARSET = utf8
+  COLLATE = utf8_bin COMMENT ='增加租户字段';
+
+
+/******************************************/
+/*   数据库全名 = nacos_config   */
+/*   表名称 = config_info_beta   */
+/******************************************/
+CREATE TABLE `config_info_beta`
+(
+    `id`                 bigint(20)   NOT NULL AUTO_INCREMENT COMMENT 'id',
+    `data_id`            varchar(255) NOT NULL COMMENT 'data_id',
+    `group_id`           varchar(128) NOT NULL COMMENT 'group_id',
+    `app_name`           varchar(128)          DEFAULT NULL COMMENT 'app_name',
+    `content`            longtext     NOT NULL COMMENT 'content',
+    `beta_ips`           varchar(1024)         DEFAULT NULL COMMENT 'betaIps',
+    `md5`                varchar(32)           DEFAULT NULL COMMENT 'md5',
+    `gmt_create`         datetime     NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
+    `gmt_modified`       datetime     NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '修改时间',
+    `src_user`           text COMMENT 'source user',
+    `src_ip`             varchar(50)           DEFAULT NULL COMMENT 'source ip',
+    `tenant_id`          varchar(128)          DEFAULT '' COMMENT '租户字段',
+    `encrypted_data_key` text         NOT NULL COMMENT '秘钥',
+    PRIMARY KEY (`id`),
+    UNIQUE KEY `uk_configinfobeta_datagrouptenant` (`data_id`, `group_id`, `tenant_id`)
+) ENGINE = InnoDB
+  DEFAULT CHARSET = utf8
+  COLLATE = utf8_bin COMMENT ='config_info_beta';
+
+/******************************************/
+/*   数据库全名 = nacos_config   */
+/*   表名称 = config_info_tag   */
+/******************************************/
+CREATE TABLE `config_info_tag`
+(
+    `id`           bigint(20)   NOT NULL AUTO_INCREMENT COMMENT 'id',
+    `data_id`      varchar(255) NOT NULL COMMENT 'data_id',
+    `group_id`     varchar(128) NOT NULL COMMENT 'group_id',
+    `tenant_id`    varchar(128)          DEFAULT '' COMMENT 'tenant_id',
+    `tag_id`       varchar(128) NOT NULL COMMENT 'tag_id',
+    `app_name`     varchar(128)          DEFAULT NULL COMMENT 'app_name',
+    `content`      longtext     NOT NULL COMMENT 'content',
+    `md5`          varchar(32)           DEFAULT NULL COMMENT 'md5',
+    `gmt_create`   datetime     NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
+    `gmt_modified` datetime     NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '修改时间',
+    `src_user`     text COMMENT 'source user',
+    `src_ip`       varchar(50)           DEFAULT NULL COMMENT 'source ip',
+    PRIMARY KEY (`id`),
+    UNIQUE KEY `uk_configinfotag_datagrouptenanttag` (`data_id`, `group_id`, `tenant_id`, `tag_id`)
+) ENGINE = InnoDB
+  DEFAULT CHARSET = utf8
+  COLLATE = utf8_bin COMMENT ='config_info_tag';
+
+/******************************************/
+/*   数据库全名 = nacos_config   */
+/*   表名称 = config_tags_relation   */
+/******************************************/
+CREATE TABLE `config_tags_relation`
+(
+    `id`        bigint(20)   NOT NULL COMMENT 'id',
+    `tag_name`  varchar(128) NOT NULL COMMENT 'tag_name',
+    `tag_type`  varchar(64)  DEFAULT NULL COMMENT 'tag_type',
+    `data_id`   varchar(255) NOT NULL COMMENT 'data_id',
+    `group_id`  varchar(128) NOT NULL COMMENT 'group_id',
+    `tenant_id` varchar(128) DEFAULT '' COMMENT 'tenant_id',
+    `nid`       bigint(20)   NOT NULL AUTO_INCREMENT,
+    PRIMARY KEY (`nid`),
+    UNIQUE KEY `uk_configtagrelation_configidtag` (`id`, `tag_name`, `tag_type`),
+    KEY `idx_tenant_id` (`tenant_id`)
+) ENGINE = InnoDB
+  DEFAULT CHARSET = utf8
+  COLLATE = utf8_bin COMMENT ='config_tag_relation';
+
+/******************************************/
+/*   数据库全名 = nacos_config   */
+/*   表名称 = group_capacity   */
+/******************************************/
+CREATE TABLE `group_capacity`
+(
+    `id`                bigint(20) unsigned NOT NULL AUTO_INCREMENT COMMENT '主键ID',
+    `group_id`          varchar(128)        NOT NULL DEFAULT '' COMMENT 'Group ID，空字符表示整个集群',
+    `quota`             int(10) unsigned    NOT NULL DEFAULT '0' COMMENT '配额，0表示使用默认值',
+    `usage`             int(10) unsigned    NOT NULL DEFAULT '0' COMMENT '使用量',
+    `max_size`          int(10) unsigned    NOT NULL DEFAULT '0' COMMENT '单个配置大小上限，单位为字节，0表示使用默认值',
+    `max_aggr_count`    int(10) unsigned    NOT NULL DEFAULT '0' COMMENT '聚合子配置最大个数，，0表示使用默认值',
+    `max_aggr_size`     int(10) unsigned    NOT NULL DEFAULT '0' COMMENT '单个聚合数据的子配置大小上限，单位为字节，0表示使用默认值',
+    `max_history_count` int(10) unsigned    NOT NULL DEFAULT '0' COMMENT '最大变更历史数量',
+    `gmt_create`        datetime            NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
+    `gmt_modified`      datetime            NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '修改时间',
+    PRIMARY KEY (`id`),
+    UNIQUE KEY `uk_group_id` (`group_id`)
+) ENGINE = InnoDB
+  DEFAULT CHARSET = utf8
+  COLLATE = utf8_bin COMMENT ='集群、各Group容量信息表';
+
+/******************************************/
+/*   数据库全名 = nacos_config   */
+/*   表名称 = his_config_info   */
+/******************************************/
+CREATE TABLE `his_config_info`
+(
+    `id`                 bigint(20) unsigned NOT NULL,
+    `nid`                bigint(20) unsigned NOT NULL AUTO_INCREMENT,
+    `data_id`            varchar(255)        NOT NULL,
+    `group_id`           varchar(128)        NOT NULL,
+    `app_name`           varchar(128)                 DEFAULT NULL COMMENT 'app_name',
+    `content`            longtext            NOT NULL,
+    `md5`                varchar(32)                  DEFAULT NULL,
+    `gmt_create`         datetime            NOT NULL DEFAULT CURRENT_TIMESTAMP,
+    `gmt_modified`       datetime            NOT NULL DEFAULT CURRENT_TIMESTAMP,
+    `src_user`           text,
+    `src_ip`             varchar(50)                  DEFAULT NULL,
+    `op_type`            char(10)                     DEFAULT NULL,
+    `tenant_id`          varchar(128)                 DEFAULT '' COMMENT '租户字段',
+    `encrypted_data_key` text                NOT NULL COMMENT '秘钥',
+    PRIMARY KEY (`nid`),
+    KEY `idx_gmt_create` (`gmt_create`),
+    KEY `idx_gmt_modified` (`gmt_modified`),
+    KEY `idx_did` (`data_id`)
+) ENGINE = InnoDB
+  DEFAULT CHARSET = utf8
+  COLLATE = utf8_bin COMMENT ='多租户改造';
+
+
+/******************************************/
+/*   数据库全名 = nacos_config   */
+/*   表名称 = tenant_capacity   */
+/******************************************/
+CREATE TABLE `tenant_capacity`
+(
+    `id`                bigint(20) unsigned NOT NULL AUTO_INCREMENT COMMENT '主键ID',
+    `tenant_id`         varchar(128)        NOT NULL DEFAULT '' COMMENT 'Tenant ID',
+    `quota`             int(10) unsigned    NOT NULL DEFAULT '0' COMMENT '配额，0表示使用默认值',
+    `usage`             int(10) unsigned    NOT NULL DEFAULT '0' COMMENT '使用量',
+    `max_size`          int(10) unsigned    NOT NULL DEFAULT '0' COMMENT '单个配置大小上限，单位为字节，0表示使用默认值',
+    `max_aggr_count`    int(10) unsigned    NOT NULL DEFAULT '0' COMMENT '聚合子配置最大个数',
+    `max_aggr_size`     int(10) unsigned    NOT NULL DEFAULT '0' COMMENT '单个聚合数据的子配置大小上限，单位为字节，0表示使用默认值',
+    `max_history_count` int(10) unsigned    NOT NULL DEFAULT '0' COMMENT '最大变更历史数量',
+    `gmt_create`        datetime            NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
+    `gmt_modified`      datetime            NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '修改时间',
+    PRIMARY KEY (`id`),
+    UNIQUE KEY `uk_tenant_id` (`tenant_id`)
+) ENGINE = InnoDB
+  DEFAULT CHARSET = utf8
+  COLLATE = utf8_bin COMMENT ='租户容量信息表';
+
+
+CREATE TABLE `tenant_info`
+(
+    `id`            bigint(20)   NOT NULL AUTO_INCREMENT COMMENT 'id',
+    `kp`            varchar(128) NOT NULL COMMENT 'kp',
+    `tenant_id`     varchar(128) default '' COMMENT 'tenant_id',
+    `tenant_name`   varchar(128) default '' COMMENT 'tenant_name',
+    `tenant_desc`   varchar(256) DEFAULT NULL COMMENT 'tenant_desc',
+    `create_source` varchar(32)  DEFAULT NULL COMMENT 'create_source',
+    `gmt_create`    bigint(20)   NOT NULL COMMENT '创建时间',
+    `gmt_modified`  bigint(20)   NOT NULL COMMENT '修改时间',
+    PRIMARY KEY (`id`),
+    UNIQUE KEY `uk_tenant_info_kptenantid` (`kp`, `tenant_id`),
+    KEY `idx_tenant_id` (`tenant_id`)
+) ENGINE = InnoDB
+  DEFAULT CHARSET = utf8
+  COLLATE = utf8_bin COMMENT ='tenant_info';
+
+CREATE TABLE `users`
+(
+    `username` varchar(50)  NOT NULL PRIMARY KEY,
+    `password` varchar(500) NOT NULL,
+    `enabled`  boolean      NOT NULL
+);
+
+CREATE TABLE `roles`
+(
+    `username` varchar(50) NOT NULL,
+    `role`     varchar(50) NOT NULL,
+    UNIQUE INDEX `idx_user_role` (`username` ASC, `role` ASC) USING BTREE
+);
+
+CREATE TABLE `permissions`
+(
+    `role`     varchar(50)  NOT NULL,
+    `resource` varchar(255) NOT NULL,
+    `action`   varchar(8)   NOT NULL,
+    UNIQUE INDEX `uk_role_permission` (`role`, `resource`, `action`) USING BTREE
+);
+
+INSERT INTO users (username, password, enabled)
+VALUES ('nacos', '$2a$10$EuWPZHzz32dJN7jexM34MOeYirDdFAZm2kuWj7VEOJhhZkDrxfvUu', TRUE);
+
+INSERT INTO roles (username, role)
+VALUES ('nacos', 'ROLE_ADMIN');

source/src/main/java/io/wdd/source/octopus/nginx-reverse.sh

@@ -0,0 +1,54 @@
+#!/bin/bash
+
+# https://docs.nginx.com/nginx/admin-guide/security-controls/securing-tcp-traffic-upstream/
+
+echo "增加"
+
+num=$(cat "/etc/nginx/nginx.conf" | grep -c "conf.d/stream")
+
+if [[ $num -eq 0 ]]; then
+    cat >>/etc/nginx/nginx.conf <<EOF
+include /etc/nginx/conf.d/stream/*.conf;
+EOF
+fi
+
+mkdir -p /etc/nginx/conf.d/stream/
+
+echo "开始写入反向代理的配置"
+cat >/etc/nginx/conf.d/stream/octopus-env-proxy.conf <<EOF
+stream {
+
+    # mysql
+    server {
+        listen 21306;
+        proxy_pass 150.230.198.103:21306;
+    }
+
+    # nacos
+    server {
+            listen 21060;
+            proxy_pass 150.230.198.103:21060;
+        }
+
+
+    #rabbitmq
+    server {
+     listen 20672;
+            proxy_pass 150.230.198.103:20672;
+        }
+    # dashboard
+     server {
+      listen 20678;
+                proxy_pass 150.230.198.103:20678;
+            }
+
+    # redis
+    server {
+     listen 21370;
+            proxy_pass 150.230.198.103:21370;
+        }
+}
+EOF
+
+echo "开始重启Nginx！"
+systemctl restart nginx

source/src/main/java/io/wdd/source/octopus/run-enviroment-compose.yaml

@@ -0,0 +1,108 @@
+version: '2.1'
+
+services:
+  mysql:
+    # https://hub.docker.com/r/bitnami/mysql
+    image: bitnami/mysql:8.0.32-debian-11-r12
+    ports:
+      - '21306:3306'
+    volumes:
+      #- '/octopus-server/mysql/data:/bitnami/mysql/data'
+      - 'mysql_data:/bitnami/mysql/data'
+      - '/octopus-server/mysql/nacos-2.2.0-initdb.sql:/docker-entrypoint-initdb.d/nacos-2.2.0-initdb.sql'
+      # - '/octopus-server/mysql/wdd-server.sql:/docker-entrypoint-initdb.d/wdd-server.sql'
+    networks:
+      - app-tier
+    environment:
+      - MYSQL_ROOT_USER=wmm
+      - MYSQL_ROOT_PASSWORD=Superwmm.23
+      - MYSQL_CHARACTER_SET=utf8mb4
+      - MYSQL_COLLATE:utf8_general_ci
+      - MYSQL_AUTHENTICATION_PLUGIN=mysql_native_password
+    healthcheck:
+      test: [ 'CMD', '/opt/bitnami/scripts/mysql/healthcheck.sh' ]
+      interval: 15s
+      timeout: 5s
+      retries: 6
+  redis-master:
+    # https://hub.docker.com/r/bitnami/redis
+    image: bitnami/redis:6.2.11-debian-11-r1
+    networks:
+      - app-tier
+    environment:
+      - REDIS_PASSWORD=Superwmm.23
+      # Redis 6.0 features a new multi-threading model
+      - REDIS_IO_THREADS=4
+      - REDIS_IO_THREADS_DO_READS=yes
+      - REDIS_PORT_NUMBER=6379
+      - REDIS_REPLICATION_MODE=master
+      #- REDIS_DISABLE_COMMANDS=FLUSHDB,FLUSHALL
+    ports:
+      - '21370:6379'
+    volumes:
+      - 'redis_data:/bitnami/redis/data'
+  rabbitmq:
+    # https://hub.docker.com/r/bitnami/rabbitmq
+    image: docker.io/bitnami/rabbitmq:3.11.10-debian-11-r0
+    ports:
+      - '4369'
+      - '5551'
+      - '5552'
+      - '20672:5672'
+      - '25672'
+      - '20678:15672'
+    environment:
+      - RABBITMQ_VHOST=/
+      - RABBITMQ_VHOSTS=/dev
+      - RABBITMQ_USERNAME=wmm
+      - RABBITMQ_PASSWORD=Superwmm.23
+      - RABBITMQ_SECURE_PASSWORD=no
+      - RABBITMQ_LOAD_DEFINITIONS=no
+      - RABBITMQ_NODE_PORT_NUMBER=5672
+      - RABBITMQ_NODE_SSL_PORT_NUMBER=5671
+      - RABBITMQ_MANAGEMENT_PORT_NUMBER=15672
+    volumes:
+      - 'rabbitmq_data:/bitnami/rabbitmq/mnesia'
+  nacos:
+    # https://hub.docker.com/r/nacos/nacos-server
+    image: docker.io/nacos/nacos-server:v2.2.0-slim
+    ports:
+      - '21060:8848'
+    environment:
+      - MODE=standalone
+      - MYSQL_SERVICE_HOST=mysql
+      - MYSQL_SERVICE_PORT=3306
+      - MYSQL_SERVICE_DB_NAME=nacos_config
+      - MYSQL_SERVICE_USER=wmm
+      - MYSQL_SERVICE_PASSWORD=Superwmm.23
+    depends_on:
+      - mysql
+    volumes:
+      - 'rabbitmq_data:/bitnami/rabbitmq/mnesia'
+
+#  redis-replica:
+#    image: redis-image
+#    ports:
+#      - '6379'
+#    networks:
+#      - app-tier
+#    depends_on:
+#      - redis-master
+#    environment:
+#      - REDIS_REPLICATION_MODE=slave
+#      - REDIS_MASTER_HOST=redis-master
+#      - REDIS_MASTER_PORT_NUMBER=6379
+#      - REDIS_MASTER_PASSWORD=Superwmm.23
+#      - REDIS_PASSWORD=Superwmm.23
+
+volumes:
+  mysql_data:
+    driver: local
+  redis_data:
+    driver: local
+  rabbitmq_data:
+    driver: local
+
+networks:
+  app-tier:
+    driver: bridge

source/src/main/java/io/wdd/source/shell/agent-bootup.sh

@@ -2,7 +2,7 @@
 
 #####  environment variables ######
 
-JAVA_OPTS="-Xms128m -Xmx512m -Ddebug=false -Dfile.encoding=utf-8  --spring.profiles.active=k3s --spring.cloud.nacos.config.group=k3s --spring.cloud.nacos.config.server-addr=140.238.52.228:21060 --spring.cloud.nacos.config.extension-configs[0].dataId=common-k3s.yaml --spring.cloud.nacos.config.extension-configs[0].group=k3s"
+JAVA_OPTS="-Xms128m -Xmx512m -Ddebug=false -Dfile.encoding=utf-8  --spring.profiles.active=k3s --spring.cloud.nacos.config.group=k3s --spring.cloud.nacos.config.server-addr=150.230.198.103:21060 --spring.cloud.nacos.config.extension-configs[0].dataId=common-k3s.yaml --spring.cloud.nacos.config.extension-configs[0].group=k3s"
 
 DependLibFiles=(
   wdd-lib-file.sh

source/src/main/java/io/wdd/source/shell/install-nginx.sh

@@ -1,22 +1,34 @@
 #!/bin/bash
 
-
 . /root/IdeaProjects/ProjectOctopus/source/src/main/java/io/wdd/source/shell/lib/wdd-lib-log.sh
 
 . /root/IdeaProjects/ProjectOctopus/source/src/main/java/io/wdd/source/shell/lib/wdd-lib-env.sh
 
+warn "开始清除所有版本的Nginx！"
 
+log "开始下载最新版本的Nginx"
 
-log "wdd is awesome !"
+wget https://nginx.org/download/nginx-1.22.1.tar.gz
-error "error message"
+tar -zvxf nginx-1.22.1.tar.gz
 
-debug "debug message"
+# sudo apt install curl gnupg2 ca-certificates lsb-release ubuntu-keyring
-info "woshinibaba!"
 
+sudo apt install -y curl gnupg2 ca-certificates lsb-release ubuntu-keyring
 
-debug "-------------------"
+curl https://nginx.org/keys/nginx_signing.key | gpg --dearmor \
+    | sudo tee /usr/share/keyrings/nginx-archive-keyring.gpg >/dev/null
 
-log "env TEST_ENV is $(env | grep TEST_ENV)"
+log "开始添加稳定版本的Nginx源！"
 
-TEST_ENV=cccc
+echo "deb [signed-by=/usr/share/keyrings/nginx-archive-keyring.gpg] \
-log "env TEST_ENV is $(env | grep TEST_ENV)"
+http://nginx.org/packages/ubuntu $(lsb_release -cs) nginx" \
+    | sudo tee /etc/apt/sources.list.d/nginx.list
+
+echo -e "Package: *\nPin: origin nginx.org\nPin: release o=nginx\nPin-Priority: 900\n" \
+  | sudo tee /etc/apt/preferences.d/99nginx
+
+sudo apt update
+
+sudo apt install nginx
+
+sudo apt upgrade nginx

source/src/main/java/io/wdd/source/shell/server-bootup.sh

@@ -2,7 +2,7 @@
 
 #####  environment variables ######
 
-JAVA_OPTS="-Xms4096m -Xmx4096m -Dfile.encoding=utf-8  -Dspring.profiles.active=k3s -Dspring.cloud.nacos.config.group=k3s -Dspring.cloud.nacos.config.server-addr=140.238.52.228:21060 -Dspring.cloud.nacos.config.extension-configs[0].dataId=common-k3s.yaml -Dspring.cloud.nacos.config.extension-configs[0].group=k3s -Ddebug=false -Dlogging.level.io.wdd.server=info"
+JAVA_OPTS="-Xms4096m -Xmx4096m -Dfile.encoding=utf-8  -Dspring.profiles.active=k3s -Dspring.cloud.nacos.config.group=k3s -Dspring.cloud.nacos.config.server-addr=150.230.198.103:21060 -Dspring.cloud.nacos.config.extension-configs[0].dataId=common-k3s.yaml -Dspring.cloud.nacos.config.extension-configs[0].group=k3s -Ddebug=false -Dlogging.level.io.wdd.server=info"
 
 DOCKER_VERSION="20.10.10"