diff --git a/bonus-auth/src/main/resources/bootstrap.yml b/bonus-auth/src/main/resources/bootstrap.yml index 181def8..20b9326 100644 --- a/bonus-auth/src/main/resources/bootstrap.yml +++ b/bonus-auth/src/main/resources/bootstrap.yml @@ -12,16 +12,14 @@ spring: active: dev cloud: nacos: - username: nacos - password: nacos discovery: # 服务注册地址 server-addr: 192.168.0.14:8848 - namespace: f648524d-0a7b-449e-8f92-64e05236fd51 + namespace: 9404b13b-4b90-4759-98c7-f5d7a670ffd8 config: # 配置中心地址 server-addr: 192.168.0.14:8848 - namespace: f648524d-0a7b-449e-8f92-64e05236fd51 + namespace: 9404b13b-4b90-4759-98c7-f5d7a670ffd8 # 配置文件格式 file-extension: yml # 共享配置 @@ -31,4 +29,5 @@ spring: #加密组件 jasypt: encryptor: - password: Encrypt \ No newline at end of file + password: Encrypt + diff --git a/bonus-common/bonus-common-core/src/main/java/com/bonus/common/core/utils/encryption/AesCbcUtils.java b/bonus-common/bonus-common-core/src/main/java/com/bonus/common/core/utils/encryption/AesCbcUtils.java index f01653f..c51d403 100644 --- a/bonus-common/bonus-common-core/src/main/java/com/bonus/common/core/utils/encryption/AesCbcUtils.java +++ b/bonus-common/bonus-common-core/src/main/java/com/bonus/common/core/utils/encryption/AesCbcUtils.java @@ -78,17 +78,17 @@ public class AesCbcUtils { return null; } - public static void main(String[] args) { - // String json=""; - - String json="{\"username\":\"guest\",\"password\":\"admin@123\"}"; - String data=encrypt(json); - System.err.println(data); - String jm=decrypt("\"yeCxaGhmdDt+zDsKPr1prukR15BfIMLMOYIFKdgffGpMV76qVD8ANU4zsLiRZ87+7hd1Yje182nHhUOp/TeYCRuuUPQzmuXH7ikYVEWR1Rmc8uLq3G/BTMU6wFMSRFDBXARRl+dvnpyfX+MleF0KB1OAeuOIKv1gQPskmvDiFAniUlowf/96ZzMl7Bokqc/Lse8lMV92IQB14yQNa0+u/2kvdirzrcq+HCt9K8Ot3C59mjDqg49WoM65LEmaHmZqzdmmjbQlGH7ZOAFTLvF5kPzUsMz5Uim1uNvByB3eLFohc1UgB28DWoTyh43sRMPpq3S1BB20gcrBf3uVra/4qehBr3z98CGhGRyKHbjsCKl0Ri6YO1rp5aMRd9Y3wbOJFrZXFag5iifQx+ooDBeu6h1KCb5JfCjyAmw9+pgEL6X3eELPzK13XjblDyEikjx2Edv45MGsC0DUcjvz/Sb4E/8rn3o1Ep7W31xNCdn5mzZ8VO9POhE3DMK6woeN2C7TW+7YO/Zs9e4zKLS4vThvk5urCn2Ff2HkVBzoPtP2imuqQrY8898sbLllyaJEG0DPSrCf985ZgVa03JsO/EkMr3KAiHV5SHBZS1XEXqjdpL+YEdOnlfBXUk83kJhLj9rhUrTFza7ednQSzjq4XpIJJVy2aJhhj1chsmIM1Xl//0Dbak9Lb6VUq5Xr2IFAjNTgyxwtcFCdEvp4YZCSP6kqWgEpeAVlejyYOcNckUnWkjeHjtfgwvVsvUjWzyIRFCa7m/oY28xBV16RmW/r4XXquqKVdbPtATzrmf7pJCynXZ3IPd9ZGc1OTLnss9Ln9XNTH0E/I4Ma95fn9uxA+sOQkQ==\""); - String jiemi=decrypt(data); - System.err.println(jm); - System.err.println(jiemi); - } +// public static void main(String[] args) { +// // String json=""; +// +// String json="{\"username\":\"guest\",\"password\":\"admin@123\"}"; +// String data=encrypt(json); +// System.err.println(data); +// String jm=decrypt("\"yeCxaGhmdDt+zDsKPr1prukR15BfIMLMOYIFKdgffGpMV76qVD8ANU4zsLiRZ87+7hd1Yje182nHhUOp/TeYCRuuUPQzmuXH7ikYVEWR1Rmc8uLq3G/BTMU6wFMSRFDBXARRl+dvnpyfX+MleF0KB1OAeuOIKv1gQPskmvDiFAniUlowf/96ZzMl7Bokqc/Lse8lMV92IQB14yQNa0+u/2kvdirzrcq+HCt9K8Ot3C59mjDqg49WoM65LEmaHmZqzdmmjbQlGH7ZOAFTLvF5kPzUsMz5Uim1uNvByB3eLFohc1UgB28DWoTyh43sRMPpq3S1BB20gcrBf3uVra/4qehBr3z98CGhGRyKHbjsCKl0Ri6YO1rp5aMRd9Y3wbOJFrZXFag5iifQx+ooDBeu6h1KCb5JfCjyAmw9+pgEL6X3eELPzK13XjblDyEikjx2Edv45MGsC0DUcjvz/Sb4E/8rn3o1Ep7W31xNCdn5mzZ8VO9POhE3DMK6woeN2C7TW+7YO/Zs9e4zKLS4vThvk5urCn2Ff2HkVBzoPtP2imuqQrY8898sbLllyaJEG0DPSrCf985ZgVa03JsO/EkMr3KAiHV5SHBZS1XEXqjdpL+YEdOnlfBXUk83kJhLj9rhUrTFza7ednQSzjq4XpIJJVy2aJhhj1chsmIM1Xl//0Dbak9Lb6VUq5Xr2IFAjNTgyxwtcFCdEvp4YZCSP6kqWgEpeAVlejyYOcNckUnWkjeHjtfgwvVsvUjWzyIRFCa7m/oY28xBV16RmW/r4XXquqKVdbPtATzrmf7pJCynXZ3IPd9ZGc1OTLnss9Ln9XNTH0E/I4Ma95fn9uxA+sOQkQ==\""); +// String jiemi=decrypt(data); +// System.err.println(jm); +// System.err.println(jiemi); +// } /** * AES解密 diff --git a/bonus-common/bonus-common-core/src/main/java/com/bonus/common/core/utils/encryption/Sm2Util.java b/bonus-common/bonus-common-core/src/main/java/com/bonus/common/core/utils/encryption/Sm2Util.java index 0893d96..f5fb18d 100644 --- a/bonus-common/bonus-common-core/src/main/java/com/bonus/common/core/utils/encryption/Sm2Util.java +++ b/bonus-common/bonus-common-core/src/main/java/com/bonus/common/core/utils/encryption/Sm2Util.java @@ -31,14 +31,14 @@ public class Sm2Util { return HexUtil.encodeHexStr(BCUtil.encodeECPrivateKey(sm2.getPrivateKey())); } - public static void main(String[] args) { - String privateKey = getPrivateKey(); - String publicKey = getPublicKey(); - String msg= encrypt(publicKey,"1234567890"); -// String msg2= decrypt(privateKey,msg); - System.err.println(msg); -// System.err.println(msg2); - } +// public static void main(String[] args) { +// String privateKey = getPrivateKey(); +// String publicKey = getPublicKey(); +// String msg= encrypt(publicKey,"1234567890"); +//// String msg2= decrypt(privateKey,msg); +// System.err.println(msg); +//// System.err.println(msg2); +// } /** * 加密 *公钥加密 diff --git a/bonus-common/bonus-common-core/src/main/java/com/bonus/common/core/utils/encryption/Sm3Util.java b/bonus-common/bonus-common-core/src/main/java/com/bonus/common/core/utils/encryption/Sm3Util.java index 872d497..514463c 100644 --- a/bonus-common/bonus-common-core/src/main/java/com/bonus/common/core/utils/encryption/Sm3Util.java +++ b/bonus-common/bonus-common-core/src/main/java/com/bonus/common/core/utils/encryption/Sm3Util.java @@ -15,11 +15,11 @@ public class Sm3Util { static SM3 sm3 = SmUtil.sm3WithSalt("2cc0c5f9f1749f1632efa9f63e902323".getBytes(StandardCharsets.UTF_8)); - public static void main(String[] args) { - - String msg= encrypt("1234567890"); - System.err.println(msg); - } +// public static void main(String[] args) { +// +// String msg= encrypt("1234567890"); +// System.err.println(msg); +// } public static String encrypt(String data) { return Sm3Util.sm3.digestHex(data); diff --git a/bonus-common/bonus-common-core/src/main/java/com/bonus/common/core/utils/encryption/Sm4Utils.java b/bonus-common/bonus-common-core/src/main/java/com/bonus/common/core/utils/encryption/Sm4Utils.java index 4de974b..9819556 100644 --- a/bonus-common/bonus-common-core/src/main/java/com/bonus/common/core/utils/encryption/Sm4Utils.java +++ b/bonus-common/bonus-common-core/src/main/java/com/bonus/common/core/utils/encryption/Sm4Utils.java @@ -47,10 +47,10 @@ public class Sm4Utils { } - public static void main(String[] args) { - String msg= encode("1234567890"); - System.err.println(msg); - - } +// public static void main(String[] args) { +// String msg= encode("1234567890"); +// System.err.println(msg); +// +// } } diff --git a/bonus-gateway/src/main/java/com/bonus/gateway/BonusGatewayApplication.java b/bonus-gateway/src/main/java/com/bonus/gateway/BonusGatewayApplication.java index 6d38efc..eaf16b2 100644 --- a/bonus-gateway/src/main/java/com/bonus/gateway/BonusGatewayApplication.java +++ b/bonus-gateway/src/main/java/com/bonus/gateway/BonusGatewayApplication.java @@ -25,10 +25,13 @@ public class BonusGatewayApplication implements CommandLineRunner { private StringEncryptor encryptor; @Override public void run(String... args) throws Exception { -// String nacos = encrypt("Jjsp@nacos2023" ); -// String mogodb = encrypt("Bonus@admin123!" ); -// System.err.println( "nacos原始明文密码加密后的结果为：" + nacos ); -// System.err.println( "mogodb原始明文密码加密后的结果为：" + mogodb ); + String nacos = encrypt("Jjsp@nacos2023" ); + String mogodb = encrypt("Bonus@admin123!" ); + System.err.println( "nacos原始明文密码加密后的结果为：" + nacos ); + System.err.println( "mogodb原始明文密码加密后的结果为：" + mogodb ); +// String string = decrypt("ENC(b8K5x5rjN7qdGdmhgzFayK/P6ZVbC/UNBHjx2SBJkoqU149aXRtJsFhDZcgpckFf)"); +// System.err.println( "明文结果为：" + string ); + } private String encrypt( String originPassord ) { diff --git a/bonus-gateway/src/main/resources/bootstrap.yml b/bonus-gateway/src/main/resources/bootstrap.yml index cb2282e..0e3b8d9 100644 --- a/bonus-gateway/src/main/resources/bootstrap.yml +++ b/bonus-gateway/src/main/resources/bootstrap.yml @@ -13,16 +13,14 @@ spring: active: dev cloud: nacos: - username: nacos - password: ENC(b8K5x5rjN7qdGdmhgzFayK/P6ZVbC/UNBHjx2SBJkoqU149aXRtJsFhDZcgpckFf) discovery: # 服务注册地址 server-addr: 192.168.0.14:8848 - namespace: f0e6fc14-465e-4268-adc8-cb33c3d4d755 + namespace: 9404b13b-4b90-4759-98c7-f5d7a670ffd8 config: # 配置中心地址 server-addr: 192.168.0.14:8848 - namespace: f0e6fc14-465e-4268-adc8-cb33c3d4d755 + namespace: 9404b13b-4b90-4759-98c7-f5d7a670ffd8 # 配置文件格式 file-extension: yml # 共享配置 @@ -38,20 +36,18 @@ spring: datasource: ds1: nacos: - username: nacos - password: nacos server-addr: 192.168.0.14:8848 - namespace: f648524d-0a7b-449e-8f92-64e05236fd51 + namespace: 9404b13b-4b90-4759-98c7-f5d7a670ffd8 dataId: sentinel-bonus-gateway groupId: DEFAULT_GROUP data-type: json rule-type: gw-flow -#系统 自动 加解密开关 -system: - encryptEnabled: true - decryptEnabled: true +##系统 自动 加解密开关 +#system: +# encryptEnabled: false +# decryptEnabled: false #加密组件 jasypt: encryptor: diff --git a/bonus-modules/bonus-file/src/main/resources/bootstrap.yml b/bonus-modules/bonus-file/src/main/resources/bootstrap.yml index c0df226..4eff81f 100644 --- a/bonus-modules/bonus-file/src/main/resources/bootstrap.yml +++ b/bonus-modules/bonus-file/src/main/resources/bootstrap.yml @@ -12,16 +12,14 @@ spring: active: dev cloud: nacos: - username: nacos - password: nacos discovery: # 服务注册地址 - server-addr: 192.168.0.14:8848 - namespace: f648524d-0a7b-449e-8f92-64e05236fd51 + server-addr: 192.168.0.56:8848 + namespace: 9cde1ce1-98bc-4b9c-9213-f1fbf8a5b3cc config: # 配置中心地址 - server-addr: 192.168.0.14:8848 - namespace: f648524d-0a7b-449e-8f92-64e05236fd51 + server-addr: 192.168.0.56:8848 + namespace: 9cde1ce1-98bc-4b9c-9213-f1fbf8a5b3cc # 配置文件格式 file-extension: yml # 共享配置 diff --git a/bonus-modules/bonus-gen/src/main/resources/bootstrap.yml b/bonus-modules/bonus-gen/src/main/resources/bootstrap.yml index 11efc19..e796a65 100644 --- a/bonus-modules/bonus-gen/src/main/resources/bootstrap.yml +++ b/bonus-modules/bonus-gen/src/main/resources/bootstrap.yml @@ -12,16 +12,14 @@ spring: active: dev cloud: nacos: - username: nacos - password: nacos discovery: # 服务注册地址 - server-addr: 192.168.0.14:8848 - namespace: f648524d-0a7b-449e-8f92-64e05236fd51 + server-addr: 192.168.0.56:8848 + namespace: 9cde1ce1-98bc-4b9c-9213-f1fbf8a5b3cc config: # 配置中心地址 - server-addr: 192.168.0.14:8848 - namespace: f648524d-0a7b-449e-8f92-64e05236fd51 + server-addr: 192.168.0.56:8848 + namespace: 9cde1ce1-98bc-4b9c-9213-f1fbf8a5b3cc # 配置文件格式 file-extension: yml # 共享配置 diff --git a/bonus-modules/bonus-job/src/main/resources/bootstrap.yml b/bonus-modules/bonus-job/src/main/resources/bootstrap.yml index a910bfb..e6943c9 100644 --- a/bonus-modules/bonus-job/src/main/resources/bootstrap.yml +++ b/bonus-modules/bonus-job/src/main/resources/bootstrap.yml @@ -12,16 +12,14 @@ spring: active: dev cloud: nacos: - username: nacos - password: nacos discovery: # 服务注册地址 - server-addr: 192.168.0.14:8848 - namespace: f648524d-0a7b-449e-8f92-64e05236fd51 + server-addr: 192.168.0.56:8848 + namespace: 9cde1ce1-98bc-4b9c-9213-f1fbf8a5b3cc config: # 配置中心地址 - server-addr: 192.168.0.14:8848 - namespace: f648524d-0a7b-449e-8f92-64e05236fd51 + server-addr: 192.168.0.56:8848 + namespace: 9cde1ce1-98bc-4b9c-9213-f1fbf8a5b3cc # 配置文件格式 file-extension: yml # 共享配置 diff --git a/bonus-modules/bonus-mongodb/src/main/resources/bootstrap.yml b/bonus-modules/bonus-mongodb/src/main/resources/bootstrap.yml index b6dab15..a899746 100644 --- a/bonus-modules/bonus-mongodb/src/main/resources/bootstrap.yml +++ b/bonus-modules/bonus-mongodb/src/main/resources/bootstrap.yml @@ -16,15 +16,13 @@ spring: active: dev cloud: nacos: - username: nacos - password: nacos discovery: # 服务注册地址 - server-addr: 192.168.0.14:8848 + server-addr: 192.168.0.56:8848 namespace: f648524d-0a7b-449e-8f92-64e05236fd51 config: # 配置中心地址 - server-addr: 192.168.0.14:8848 + server-addr: 192.168.0.56:8848 namespace: f648524d-0a7b-449e-8f92-64e05236fd51 # 配置文件格式 file-extension: yml diff --git a/bonus-modules/bonus-obs/src/main/resources/bootstrap.yml b/bonus-modules/bonus-obs/src/main/resources/bootstrap.yml index fc67aa2..ce2580d 100644 --- a/bonus-modules/bonus-obs/src/main/resources/bootstrap.yml +++ b/bonus-modules/bonus-obs/src/main/resources/bootstrap.yml @@ -16,16 +16,14 @@ spring: active: dev cloud: nacos: - username: nacos - password: nacos discovery: # 服务注册地址 - server-addr: 192.168.0.14:8848 - namespace: f648524d-0a7b-449e-8f92-64e05236fd51 + server-addr: 192.168.0.56:8848 + namespace: 9cde1ce1-98bc-4b9c-9213-f1fbf8a5b3cc config: # 配置中心地址 - server-addr: 192.168.0.14:8848 - namespace: f648524d-0a7b-449e-8f92-64e05236fd51 + server-addr: 192.168.0.56:8848 + namespace: 9cde1ce1-98bc-4b9c-9213-f1fbf8a5b3cc # 配置文件格式 file-extension: yml # 共享配置 diff --git a/bonus-modules/bonus-oss/src/main/resources/bootstrap.yml b/bonus-modules/bonus-oss/src/main/resources/bootstrap.yml index ba57d35..2e2afe3 100644 --- a/bonus-modules/bonus-oss/src/main/resources/bootstrap.yml +++ b/bonus-modules/bonus-oss/src/main/resources/bootstrap.yml @@ -15,16 +15,14 @@ spring: active: dev cloud: nacos: - username: nacos - password: nacos discovery: # 服务注册地址 - server-addr: 192.168.0.14:8848 - namespace: f648524d-0a7b-449e-8f92-64e05236fd51 + server-addr: 192.168.0.56:8848 + namespace: 9cde1ce1-98bc-4b9c-9213-f1fbf8a5b3cc config: # 配置中心地址 - server-addr: 192.168.0.14:8848 - namespace: f648524d-0a7b-449e-8f92-64e05236fd51 + server-addr: 192.168.0.56:8848 + namespace: 9cde1ce1-98bc-4b9c-9213-f1fbf8a5b3cc # 配置文件格式 file-extension: yml # 共享配置 diff --git a/bonus-modules/bonus-system/src/main/resources/bootstrap.yml b/bonus-modules/bonus-system/src/main/resources/bootstrap.yml index 2976aef..1c61dcd 100644 --- a/bonus-modules/bonus-system/src/main/resources/bootstrap.yml +++ b/bonus-modules/bonus-system/src/main/resources/bootstrap.yml @@ -12,22 +12,16 @@ spring: active: dev cloud: nacos: - username: nacos - password: nacos discovery: # 服务注册地址 server-addr: 192.168.0.14:8848 - namespace: f0e6fc14-465e-4268-adc8-cb33c3d4d755 + namespace: 9404b13b-4b90-4759-98c7-f5d7a670ffd8 config: # 配置中心地址 server-addr: 192.168.0.14:8848 - namespace: f0e6fc14-465e-4268-adc8-cb33c3d4d755 + namespace: 9404b13b-4b90-4759-98c7-f5d7a670ffd8 # 配置文件格式 file-extension: yml # 共享配置 shared-configs: - - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension} -system: - supports: - phoneLogin: true - emailLogin: true \ No newline at end of file + - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension} \ No newline at end of file diff --git a/bonus-modules/bonus-system/src/main/resources/logback.xml b/bonus-modules/bonus-system/src/main/resources/logback.xml index 172aec7..b368f5a 100644 --- a/bonus-modules/bonus-system/src/main/resources/logback.xml +++ b/bonus-modules/bonus-system/src/main/resources/logback.xml @@ -70,7 +70,7 @@ - + diff --git a/bonus-visual/bonus-monitor/src/main/resources/bootstrap.yml b/bonus-visual/bonus-monitor/src/main/resources/bootstrap.yml index eb48e79..a77fede 100644 --- a/bonus-visual/bonus-monitor/src/main/resources/bootstrap.yml +++ b/bonus-visual/bonus-monitor/src/main/resources/bootstrap.yml @@ -12,16 +12,14 @@ spring: active: dev cloud: nacos: - username: nacos - password: nacos discovery: # 服务注册地址 - server-addr: 192.168.0.14:8848 - namespace: f648524d-0a7b-449e-8f92-64e05236fd51 + server-addr: 192.168.0.56:8848 + namespace: 9cde1ce1-98bc-4b9c-9213-f1fbf8a5b3cc config: # 配置中心地址 - server-addr: 192.168.0.14:8848 - namespace: f648524d-0a7b-449e-8f92-64e05236fd51 + server-addr: 192.168.0.56:8848 + namespace: 9cde1ce1-98bc-4b9c-9213-f1fbf8a5b3cc # 配置文件格式 file-extension: yml # 共享配置 diff --git a/docker/bonus/auth/dockerfile b/docker/bonus/auth/dockerfile index 51849dc..15652e0 100644 --- a/docker/bonus/auth/dockerfile +++ b/docker/bonus/auth/dockerfile @@ -1,3 +1,10 @@ +# 创建 bonus 用户，此段代码未测试 +RUN group add -g 1002 bonus && \ +useradd -u 1002 -g 1002 -m -s /usr/sbin/nologin bonus +# 切换到 bonus 用户 +USER bonus +# end 创建用户 + # 基础镜像 FROM openjdk:8-jre # author diff --git a/docker/bonus/gateway/dockerfile b/docker/bonus/gateway/dockerfile index 39a3022..08a8c2a 100644 --- a/docker/bonus/gateway/dockerfile +++ b/docker/bonus/gateway/dockerfile @@ -1,3 +1,10 @@ +# 创建 bonus 用户，此段代码未测试 +RUN group add -g 1002 bonus && \ +useradd -u 1002 -g 1002 -m -s /usr/sbin/nologin bonus +# 切换到 bonus 用户 +USER bonus +# end 创建用户 + # 基础镜像 FROM openjdk:8-jre # author diff --git a/docker/bonus/modules/file/dockerfile b/docker/bonus/modules/file/dockerfile index 56a65e0..ddaf0d8 100644 --- a/docker/bonus/modules/file/dockerfile +++ b/docker/bonus/modules/file/dockerfile @@ -1,3 +1,10 @@ +# 创建 bonus 用户，此段代码未测试 +RUN group add -g 1002 bonus && \ +useradd -u 1002 -g 1002 -m -s /usr/sbin/nologin bonus +# 切换到 bonus 用户 +USER bonus +# end 创建用户 + # 基础镜像 FROM openjdk:8-jre # author diff --git a/docker/bonus/modules/gen/dockerfile b/docker/bonus/modules/gen/dockerfile index 7629871..1cb27a6 100644 --- a/docker/bonus/modules/gen/dockerfile +++ b/docker/bonus/modules/gen/dockerfile @@ -1,3 +1,10 @@ +# 创建 bonus 用户，此段代码未测试 +RUN group add -g 1002 bonus && \ +useradd -u 1002 -g 1002 -m -s /usr/sbin/nologin bonus +# 切换到 bonus 用户 +USER bonus +# end 创建用户 + # 基础镜像 FROM openjdk:8-jre # author diff --git a/docker/bonus/modules/job/dockerfile b/docker/bonus/modules/job/dockerfile index 853666f..9180547 100644 --- a/docker/bonus/modules/job/dockerfile +++ b/docker/bonus/modules/job/dockerfile @@ -1,3 +1,10 @@ +# 创建 bonus 用户，此段代码未测试 +RUN group add -g 1002 bonus && \ +useradd -u 1002 -g 1002 -m -s /usr/sbin/nologin bonus +# 切换到 bonus 用户 +USER bonus +# end 创建用户 + # 基础镜像 FROM openjdk:8-jre # author diff --git a/docker/bonus/modules/system/dockerfile b/docker/bonus/modules/system/dockerfile index f9d5e3c..88c1935 100644 --- a/docker/bonus/modules/system/dockerfile +++ b/docker/bonus/modules/system/dockerfile @@ -1,3 +1,10 @@ +# 创建 bonus 用户，此段代码未测试 +RUN group add -g 1002 bonus && \ +useradd -u 1002 -g 1002 -m -s /usr/sbin/nologin bonus +# 切换到 bonus 用户 +USER bonus +# end 创建用户 + # 基础镜像 FROM openjdk:8-jre # author diff --git a/docker/bonus/visual/monitor/dockerfile b/docker/bonus/visual/monitor/dockerfile index 879e19f..cc08dc6 100644 --- a/docker/bonus/visual/monitor/dockerfile +++ b/docker/bonus/visual/monitor/dockerfile @@ -1,3 +1,10 @@ +# 创建 bonus 用户，此段代码未测试 +RUN group add -g 1002 bonus && \ +useradd -u 1002 -g 1002 -m -s /usr/sbin/nologin bonus +# 切换到 bonus 用户 +USER bonus +# end 创建用户 + # 基础镜像 FROM openjdk:8-jre # author diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml index d92b37b..fb47c4a 100644 --- a/docker/docker-compose.yml +++ b/docker/docker-compose.yml @@ -2,7 +2,7 @@ version : '3.8' services: bonus-nacos: container_name: bonus-nacos - image: nacos/nacos-server + image: nacos/nacos-server:2.2.3 build: context: ./nacos environment: diff --git a/docker/nacos/conf/application.properties b/docker/nacos/conf/application.properties index ff79ba7..ef84bd5 100644 --- a/docker/nacos/conf/application.properties +++ b/docker/nacos/conf/application.properties @@ -2,7 +2,7 @@ spring.datasource.platform=mysql db.num=1 db.url.0=jdbc:mysql://bonus-mysql:3306/ry-config?characterEncoding=utf8&connectTimeout=1000&socketTimeout=3000&autoReconnect=true&useUnicode=true&useSSL=false&serverTimezone=UTC db.user=root -db.password=password +#db.password=password nacos.naming.empty-service.auto-clean=true nacos.naming.empty-service.clean.initial-delay-ms=50000 diff --git a/scripts/auth_bootstrap.yml b/scripts/auth_bootstrap.yml index 2c12ea0..522780c 100755 --- a/scripts/auth_bootstrap.yml +++ b/scripts/auth_bootstrap.yml @@ -12,8 +12,6 @@ spring: active: dev cloud: nacos: - username: nacos - password: nacos discovery: # 服务注册地址 server-addr: 192.168.0.56:8848 diff --git a/scripts/file_bootstrap.yml b/scripts/file_bootstrap.yml index 5cf5094..5e2e9cc 100755 --- a/scripts/file_bootstrap.yml +++ b/scripts/file_bootstrap.yml @@ -12,8 +12,6 @@ spring: active: dev cloud: nacos: - username: nacos - password: nacos discovery: # 服务注册地址 server-addr: 192.168.0.56:8848 diff --git a/scripts/gateway_bootstrap.yml b/scripts/gateway_bootstrap.yml index 83ff0f5..93b2eb7 100755 --- a/scripts/gateway_bootstrap.yml +++ b/scripts/gateway_bootstrap.yml @@ -13,8 +13,6 @@ spring: active: dev cloud: nacos: - username: nacos - password: nacos discovery: # 服务注册地址 server-addr: 192.168.0.56:8848 @@ -38,8 +36,6 @@ spring: datasource: ds1: nacos: - username: nacos - password: nacos server-addr: 192.168.0.56:8848 namespace: 9cde1ce1-98bc-4b9c-9213-f1fbf8a5b3cc dataId: sentinel-bonus-gateway diff --git a/scripts/gen_bootstrap.yml b/scripts/gen_bootstrap.yml index 26563d7..981d1ee 100755 --- a/scripts/gen_bootstrap.yml +++ b/scripts/gen_bootstrap.yml @@ -12,8 +12,6 @@ spring: active: dev cloud: nacos: - username: nacos - password: nacos discovery: # 服务注册地址 server-addr: 192.168.0.56:8848 diff --git a/scripts/job_bootstrap.yml b/scripts/job_bootstrap.yml index 88ec5cb..432d92f 100755 --- a/scripts/job_bootstrap.yml +++ b/scripts/job_bootstrap.yml @@ -12,8 +12,6 @@ spring: active: dev cloud: nacos: - username: nacos - password: nacos discovery: # 服务注册地址 server-addr: 192.168.0.56:8848 diff --git a/scripts/system_bootstrap.yml b/scripts/system_bootstrap.yml index 446fab6..86527f4 100755 --- a/scripts/system_bootstrap.yml +++ b/scripts/system_bootstrap.yml @@ -12,8 +12,6 @@ spring: active: dev cloud: nacos: - username: nacos - password: nacos discovery: # 服务注册地址 server-addr: 192.168.0.56:8848 diff --git a/scripts/visual_bootstrap.yml b/scripts/visual_bootstrap.yml index fb410b6..4a9f56f 100755 --- a/scripts/visual_bootstrap.yml +++ b/scripts/visual_bootstrap.yml @@ -12,8 +12,6 @@ spring: active: dev cloud: nacos: - username: nacos - password: nacos discovery: # 服务注册地址 server-addr: 192.168.0.56:8848