From 49c6164445c3802f015045395cfe30a6ad0ec129 Mon Sep 17 00:00:00 2001 From: Machengtianjiang Date: Thu, 24 Dec 2020 17:25:16 +0800 Subject: [PATCH] =?UTF-8?q?=E7=AB=AF=E5=8F=A3=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/ruoyi/winery/controller/mini/MiniController.java | 2 -- ruoyi-admin/src/main/resources/application-prod.yml | 8 ++++---- ruoyi-admin/src/main/resources/application.yml | 2 +- 3 files changed, 5 insertions(+), 7 deletions(-) diff --git a/hope-winery/src/main/java/com/ruoyi/winery/controller/mini/MiniController.java b/hope-winery/src/main/java/com/ruoyi/winery/controller/mini/MiniController.java index 51d4ae6f8..fe404042e 100644 --- a/hope-winery/src/main/java/com/ruoyi/winery/controller/mini/MiniController.java +++ b/hope-winery/src/main/java/com/ruoyi/winery/controller/mini/MiniController.java @@ -75,7 +75,6 @@ public class MiniController { } - @Log(title = "提交酒庄厂家记录", businessType = BusinessType.INSERT) @PostMapping("/postForm") AjaxResult postForm(@RequestBody JSONObject json) { @@ -92,7 +91,6 @@ public class MiniController { } - @Log(title = "获取酒庄厂家记录", businessType = BusinessType.OTHER) @GetMapping("/getForm") AjaxResult getForm(@RequestParam String openid) { diff --git a/ruoyi-admin/src/main/resources/application-prod.yml b/ruoyi-admin/src/main/resources/application-prod.yml index 5a50c5f2e..4b4a3e19a 100644 --- a/ruoyi-admin/src/main/resources/application-prod.yml +++ b/ruoyi-admin/src/main/resources/application-prod.yml @@ -6,9 +6,9 @@ spring: druid: # 主库数据源 master: - url: jdbc:mysql://localhost:3306/ry-vue?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&autoReconnect=true + url: jdbc:mysql://175.24.17.162:3306/ruoyi?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&autoReconnect=true username: root - password: root + password: 26616494 # 从库数据源 slave: # 从数据源开关/默认关闭 @@ -58,11 +58,11 @@ spring: # redis 配置 redis: # 地址 - host: 192.168.0.222 + host: 175.24.17.162 # 端口,默认为6379 port: 6379 # 密码 - password: + password: 26616494 # 连接超时时间 timeout: 10s lettuce: diff --git a/ruoyi-admin/src/main/resources/application.yml b/ruoyi-admin/src/main/resources/application.yml index 813d33e20..18315bf5a 100644 --- a/ruoyi-admin/src/main/resources/application.yml +++ b/ruoyi-admin/src/main/resources/application.yml @@ -18,7 +18,7 @@ ruoyi: # 开发环境配置 server: # 服务器的HTTP端口,默认为8080 - port: 8080 + port: 18989 servlet: # 应用的访问路径 context-path: /