From e67f70a178622fb1972d1e8d1d3fefc7f85afb1a Mon Sep 17 00:00:00 2001 From: wangxy <1356089412@qq.com> Date: Mon, 8 Apr 2024 10:25:44 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/ruoyi/web/controller/home/HomeController.java | 4 ++-- ruoyi-admin/src/main/resources/application-dev.yml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/home/HomeController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/home/HomeController.java index 78ff9e5..b88a7b3 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/home/HomeController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/home/HomeController.java @@ -111,7 +111,7 @@ public class HomeController { windowWrapper.eq(SysColumn::getColumnType, WINDOW_COLUMN_TYPE); windowWrapper.eq(SysColumn::getColumnGrade, COLUMN_GRADE); windowWrapper.eq(SysColumn::getStatus,STATUS); - queryWrapper.orderByAsc(SysColumn::getOrderNum); + windowWrapper.orderByAsc(SysColumn::getOrderNum); List windowColumns = columnService.list(windowWrapper); mmap.put("windowColumns", windowColumns); //访问量 @@ -168,7 +168,7 @@ public class HomeController { windowWrapper.eq(SysColumn::getColumnType, WINDOW_COLUMN_TYPE); windowWrapper.eq(SysColumn::getColumnGrade, COLUMN_GRADE); windowWrapper.eq(SysColumn::getStatus,STATUS); - queryWrapper.orderByAsc(SysColumn::getOrderNum); + windowWrapper.orderByAsc(SysColumn::getOrderNum); List windowColumns = columnService.list(windowWrapper); mmap.put("windowColumns", windowColumns); diff --git a/ruoyi-admin/src/main/resources/application-dev.yml b/ruoyi-admin/src/main/resources/application-dev.yml index 4ca0f88..35bcb4f 100644 --- a/ruoyi-admin/src/main/resources/application-dev.yml +++ b/ruoyi-admin/src/main/resources/application-dev.yml @@ -8,7 +8,7 @@ spring: # 主库数据源 master: #url: jdbc:postgresql://192.168.254.176:5432/work-portal?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8 - url: jdbc:highgo://127.0.0.1:5866/work-portal?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8 + url: jdbc:highgo://192.168.254.85:5866/work-portal?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8 #username: postgres highgo #password: Qwer@1234 Qwer@1234 username: ENC(6lCfD2O9U7Q/OtDbbDJcsQ==)