From d2662100f2ef7c40739e9923e8ee3ea091ab7fb7 Mon Sep 17 00:00:00 2001
From: weiweiw <14335254+weiweiw22@user.noreply.gitee.com>
Date: Thu, 8 Aug 2024 14:09:32 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=BC=8F=E6=B4=9E=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 bonus-auth/src/main/resources/bootstrap.yml    | 8 ++++----
 bonus-gateway/src/main/resources/bootstrap.yml | 4 ----
 docker/mysql/dockerfile                        | 6 ++++++
 docker/nacos/dockerfile                        | 8 +++++++-
 docker/nginx/dockerfile                        | 9 ++++++++-
 docker/redis/dockerfile                        | 9 ++++++++-
 scripts/auth_bootstrap.yml                     | 5 -----
 scripts/gateway_bootstrap.yml                  | 9 ---------
 8 files changed, 33 insertions(+), 25 deletions(-)

diff --git a/bonus-auth/src/main/resources/bootstrap.yml b/bonus-auth/src/main/resources/bootstrap.yml
index 20b9326..fa19722 100644
--- a/bonus-auth/src/main/resources/bootstrap.yml
+++ b/bonus-auth/src/main/resources/bootstrap.yml
@@ -26,8 +26,8 @@ spring:
         shared-configs:
           - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension}
 
-#加密组件
-jasypt:
-  encryptor:
-    password: Encrypt
+##加密组件
+#jasypt:
+#  encryptor:
+#    password: Encrypt
 
diff --git a/bonus-gateway/src/main/resources/bootstrap.yml b/bonus-gateway/src/main/resources/bootstrap.yml
index 0e3b8d9..af423ce 100644
--- a/bonus-gateway/src/main/resources/bootstrap.yml
+++ b/bonus-gateway/src/main/resources/bootstrap.yml
@@ -48,7 +48,3 @@ spring:
 #system:
 #  encryptEnabled: false
 #  decryptEnabled: false
-#加密组件
-jasypt:
-  encryptor:
-    password: Encrypt
\ No newline at end of file
diff --git a/docker/mysql/dockerfile b/docker/mysql/dockerfile
index cc006f4..7491c36 100644
--- a/docker/mysql/dockerfile
+++ b/docker/mysql/dockerfile
@@ -1,3 +1,9 @@
+# 创建 bonus 用户，此段代码未测试
+RUN group add -g 1002 bonus && \
+useradd -u 1002 -g 1002 -m -s /usr/sbin/nologin bonus
+# 切换到 bonus 用户
+USER bonus
+# end 创建用户
 # 基础镜像
 FROM mysql:5.7
 # author
diff --git a/docker/nacos/dockerfile b/docker/nacos/dockerfile
index 4282481..c2e817a 100644
--- a/docker/nacos/dockerfile
+++ b/docker/nacos/dockerfile
@@ -1,5 +1,11 @@
+# 创建 bonus 用户，此段代码未测试
+RUN group add -g 1002 bonus && \
+useradd -u 1002 -g 1002 -m -s /usr/sbin/nologin bonus
+# 切换到 bonus 用户
+USER bonus
+# end 创建用户
 # 基础镜像
-FROM nacos/nacos-server
+FROM nacos/nacos-server:2.2.3
 # author
 MAINTAINER bonus
 
diff --git a/docker/nginx/dockerfile b/docker/nginx/dockerfile
index cca0c75..b31283d 100644
--- a/docker/nginx/dockerfile
+++ b/docker/nginx/dockerfile
@@ -1,5 +1,12 @@
+# 创建 bonus 用户，此段代码未测试
+RUN group add -g 1002 bonus && \
+useradd -u 1002 -g 1002 -m -s /usr/sbin/nologin bonus
+# 切换到 bonus 用户
+USER bonus
+# end 创建用户
+
 # 基础镜像
-FROM nginx
+FROM nginx:1.17.1
 # author
 MAINTAINER bonus
 
diff --git a/docker/redis/dockerfile b/docker/redis/dockerfile
index 05c2bc4..e7797ab 100644
--- a/docker/redis/dockerfile
+++ b/docker/redis/dockerfile
@@ -1,5 +1,12 @@
+# 创建 bonus 用户，此段代码未测试
+RUN group add -g 1002 bonus && \
+useradd -u 1002 -g 1002 -m -s /usr/sbin/nologin bonus
+# 切换到 bonus 用户
+USER bonus
+# end 创建用户
+
 # 基础镜像
-FROM redis
+FROM redis:3.2.12
 # author
 MAINTAINER ruoyi
 
diff --git a/scripts/auth_bootstrap.yml b/scripts/auth_bootstrap.yml
index 522780c..e0ed78e 100755
--- a/scripts/auth_bootstrap.yml
+++ b/scripts/auth_bootstrap.yml
@@ -26,8 +26,3 @@ spring:
         shared-configs:
           - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension}
 
-#加密组件
-jasypt:
-  encryptor:
-    password: Encrypt
-
diff --git a/scripts/gateway_bootstrap.yml b/scripts/gateway_bootstrap.yml
index 93b2eb7..5018c35 100755
--- a/scripts/gateway_bootstrap.yml
+++ b/scripts/gateway_bootstrap.yml
@@ -43,12 +43,3 @@ spring:
             data-type: json
             rule-type: gw-flow
 
-
-#系统 自动 加解密开关
-system:
-  encryptEnabled: false
-  decryptEnabled: true
-#加密组件
-jasypt:
-  encryptor:
-    password: Encrypt
\ No newline at end of file