Backup local changes before resolving remote repository issue

openhis-server-new/openhis-application/src/main/java/com/openhis/web/debug/DebugController.java

@@ -0,0 +1,34 @@
+package com.openhis.web.debug;
+
+import com.core.common.core.domain.R;
+import com.openhis.web.basedatamanage.appservice.IPractitionerAppService;
+import com.openhis.web.basedatamanage.dto.UserAndPractitionerDto;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.annotation.Resource;
+
+/**
+ * 调试控制器 - 用于检查API返回数据
+ */
+@RestController
+@RequestMapping("/debug")
+public class DebugController {
+
+    @Resource
+    private IPractitionerAppService practitionerAppService;
+
+    /**
+     * 获取用户及参与者数据用于调试
+     */
+    @GetMapping("/user-practitioner-debug")
+    public R<UserAndPractitionerDto> getUserPractitionerDebug() {
+        // 获取第一页第一条数据用于调试
+        var page = practitionerAppService.getUserPractitionerPage(new UserAndPractitionerDto(), "", 1, 1);
+        if (page.getRecords() != null && !page.getRecords().isEmpty()) {
+            return R.ok(page.getRecords().get(0));
+        }
+        return R.fail("没有找到数据");
+    }
+}

openhis-server-new/openhis-application/src/main/resources/application-dev.yml

@@ -6,13 +6,13 @@ spring:
     druid:
       # 主库数据源
       master:
-        url: jdbc:postgresql://192.168.110.252:15432/postgresql?currentSchema=hisdev&characterEncoding=UTF-8&client_encoding=UTF-8
+        url: jdbc:postgresql://47.116.196.11:15432/postgresql?currentSchema=hisdev&characterEncoding=UTF-8&client_encoding=UTF-8
         username: postgresql
-        password: Jchl1528
+        password: Jchl1528  # 请替换为实际的数据库密码
       # 从库数据源
       slave:
         # 从数据源开关/默认关闭
-        enabled:
+        enabled: false
         url:
         username:
         password:
@@ -35,10 +35,12 @@ spring:
       # 配置一个连接在池中最大生存的时间，单位是毫秒
       maxEvictableIdleTimeMillis: 900000
       # 配置检测连接是否有效
-      validationQuery: SELECT 1 # FROM DUAL
+      validationQuery: SELECT 1
       testWhileIdle: true
-      testOnBorrow: false
+      testOnBorrow: true  # 改为true以确保连接有效
       testOnReturn: false
+      # 配置监控统计拦截的filters，去掉后监控界面sql无法统计，'wall'用于防火墙
+      filters: stat,wall,slf4j
       webStatFilter:
         enabled: true
       statViewServlet:
@@ -59,14 +61,12 @@ spring:
         wall:
           config:
             multi-statement-allow: true
-
-
   # redis 配置
   redis:
     # 地址
-    host: 192.168.110.252
+    host: 47.116.196.11
     # 端口，默认为6379
-    port: 6379
+    port: 26379
     # 数据库索引
     database: 1
     # 密码
@@ -83,10 +83,8 @@ spring:
         max-active: 8
         # #连接池最大阻塞等待时间（使用负值表示没有限制）
         max-wait: -1ms
-    # 文言
-    messages:
-      basename: i18n/general_message/messages
-      encoding: utf-8
+
+# 服务器配置
 server:
   # 服务器的HTTP端口，默认为18080
   port: 18080

openhis-server-new/openhis-application/src/main/resources/application.yml

@@ -34,6 +34,14 @@ logging:
   level:
     com.openhis: debug
     org.springframework: warn
+    # MyBatis和MyBatis-Plus日志
+    com.baomidou.mybatisplus: debug
+    com.openhis.web.regdoctorstation.mapper: debug
+    # JDBC日志
+    org.springframework.jdbc.core: debug
+    # Druid SQL日志
+    com.alibaba.druid: debug
+    com.alibaba.druid.sql: debug
 
 # 用户配置
 user: