From ad708ff3a6ed4ac501e8d4948a53533d28d5030e Mon Sep 17 00:00:00 2001 From: wenchaogong Date: Wed, 18 Aug 2021 22:34:46 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E7=94=9F=E4=BA=A7=E7=8E=AF=E5=A2=83?= =?UTF-8?q?=E9=85=8D=E7=BD=AE=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ruoyi-admin/src/main/resources/application-prod.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/ruoyi-admin/src/main/resources/application-prod.yml b/ruoyi-admin/src/main/resources/application-prod.yml index 2640bc0eb..99225faf7 100644 --- a/ruoyi-admin/src/main/resources/application-prod.yml +++ b/ruoyi-admin/src/main/resources/application-prod.yml @@ -10,7 +10,7 @@ spring: # 主库数据源 master: driverClassName: com.mysql.cj.jdbc.Driver - url: jdbc:mysql://172.30.0.36:3306/ry-vue?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&autoReconnect=true + url: jdbc:mysql://172.17.0.1:3306/ry-vue?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&autoReconnect=true username: root password: root # 从库数据源 @@ -72,7 +72,7 @@ spring: spring: redis: # 地址 - host: 172.30.0.48 + host: 172.17.0.1 # 端口，默认为6379 port: 6379 # 数据库索引 @@ -123,7 +123,7 @@ spring: # Spring Boot Admin Client 客户端的相关配置 client: # 设置 Spring Boot Admin Server 地址 - url: http://172.30.0.90:9090/admin + url: http://172.17.0.1:9090/admin instance: prefer-ip: true # 注册实例时，优先使用 IP username: ruoyi @@ -147,7 +147,7 @@ management: cloud-storage: # minio配置 minio: - endpoint: http://172.30.0.54:9000 + endpoint: http://172.17.0.1:9000 accessKey: ruoyi secretKey: ruoyi123 bucketName: ruoyi From fd7b9fa137b56d0245a88f28befae4d508b0d341 Mon Sep 17 00:00:00 2001 From: wenchaogong Date: Thu, 19 Aug 2021 17:50:20 +0800 Subject: [PATCH 2/2] =?UTF-8?q?1=E3=80=81=E5=8E=BB=E6=8E=89=E9=BB=98?= =?UTF-8?q?=E8=AE=A4=E7=99=BB=E5=BD=95=E7=94=A8=E6=88=B7=E5=90=8D=E3=80=81?= =?UTF-8?q?=E5=AF=86=E7=A0=81=202=E3=80=81=E8=B6=85=E7=AE=A1=20=E8=A7=92?= =?UTF-8?q?=E8=89=B2=E3=80=81=E7=94=A8=E6=88=B7=E7=8A=B6=E6=80=81=E7=A6=81?= =?UTF-8?q?=E7=94=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ruoyi-ui/src/views/login.vue | 4 ++-- ruoyi-ui/src/views/system/role/index.vue | 1 + ruoyi-ui/src/views/system/user/index.vue | 1 + 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/ruoyi-ui/src/views/login.vue b/ruoyi-ui/src/views/login.vue index a87cb9df6..a91f1a209 100644 --- a/ruoyi-ui/src/views/login.vue +++ b/ruoyi-ui/src/views/login.vue @@ -65,8 +65,8 @@ export default { codeUrl: "", cookiePassword: "", loginForm: { - username: "admin", - password: "admin123", + username: "", + password: "", rememberMe: false, code: "", uuid: "" diff --git a/ruoyi-ui/src/views/system/role/index.vue b/ruoyi-ui/src/views/system/role/index.vue index 53d4f8d29..042badfd2 100644 --- a/ruoyi-ui/src/views/system/role/index.vue +++ b/ruoyi-ui/src/views/system/role/index.vue @@ -112,6 +112,7 @@