From 1d6d1ac56a02a884af47d584ed5f9ceffd9936ba Mon Sep 17 00:00:00 2001
From: ‘liusuyi’ <1951119284@qq.com>
Date: 星期二, 25 七月 2023 13:25:07 +0800
Subject: [PATCH] 获取所有app用户pc接口增加最后位置信息 app任务详情增加完成状态和打卡图片 修复app用户任务列表分页total不正确的问题

---
 ruoyi-admin/src/main/resources/application-druid.yml |   11 ++++++-----
 1 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/ruoyi-admin/src/main/resources/application-druid.yml b/ruoyi-admin/src/main/resources/application-druid.yml
index 916b601..031a481 100644
--- a/ruoyi-admin/src/main/resources/application-druid.yml
+++ b/ruoyi-admin/src/main/resources/application-druid.yml
@@ -2,10 +2,10 @@
 spring:
     datasource:
         type: com.alibaba.druid.pool.DruidDataSource
-        driverClassName: org.postgresql.Driver
         druid:
             # 涓诲簱鏁版嵁婧�
             master:
+                driverClassName: org.postgresql.Driver
                 url: jdbc:postgresql://111.40.46.199:15432/ry-vue?stringtype=unspecified
                 username: postgres
                 password: Yykj.2021
@@ -16,9 +16,10 @@
             slave:
                 # 浠庢暟鎹簮寮�鍏�/榛樿鍏抽棴
 #                enabled: true
-                url: jdbc:postgresql://112.98.126.2:35432/ard732
-                username: postgres
-                password: Yykj.2017
+#                driverClassName: org.postgresql.Driver
+#                url: jdbc:postgresql://112.98.126.2:35432/ard732
+#                username: postgres
+#                password: Yykj.2017
             # 鍒濆杩炴帴鏁�
             initialSize: 5
             # 鏈�灏忚繛鎺ユ睜鏁伴噺
@@ -38,7 +39,7 @@
             testWhileIdle: true
             testOnBorrow: false
             testOnReturn: false
-            webStatFilter: 
+            webStatFilter:
                 enabled: true
             statViewServlet:
                 enabled: true

--
Gitblit v1.9.3