From 07ca788ad4bcd926c0d72600771e5a4cbade10cd Mon Sep 17 00:00:00 2001 From: ccsens_zhengzhichuan Date: Tue, 10 Mar 2026 18:35:57 +0800 Subject: [PATCH] =?UTF-8?q?=E7=94=9F=E4=BA=A7=E9=83=A8=E7=BD=B2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/application-prod.yml | 20 +++++------ .../src/main/resources/mapper/dao/RmsDao.xml | 3 +- .../src/main/resources/application-prod.yml | 35 ++++++++++--------- 3 files changed, 30 insertions(+), 28 deletions(-) diff --git a/ruisi_java/ruisi-web-admin/src/main/resources/application-prod.yml b/ruisi_java/ruisi-web-admin/src/main/resources/application-prod.yml index bd00879..570d9c2 100644 --- a/ruisi_java/ruisi-web-admin/src/main/resources/application-prod.yml +++ b/ruisi_java/ruisi-web-admin/src/main/resources/application-prod.yml @@ -6,9 +6,9 @@ spring: druid: # 主库数据源 master: - url: jdbc:mysql://172.28.145.18:23306/ruisi_cga?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8 + url: jdbc:mysql://192.168.0.128:3306/ruisi_cga?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8 username: root - password: xian#2024!!! + password: Sxinf18aA # 从库数据源 slave: # 从数据源开关/默认关闭 @@ -62,13 +62,13 @@ spring: # redis 配置 redis: # 地址 - host: 172.28.147.15 + host: localhost # 端口，默认为6379 - port: 26379 + port: 6379 # 数据库索引 database: 1 # 密码 - password: redis111^# + password: 123456 # 连接超时时间 timeout: 10s lettuce: @@ -88,7 +88,7 @@ app: # 资源访问路径前缀 示例（/profile） profileUrl: /profile # 资源存储路径 示例（ Windows配置D:/ruoyi/uploadPath，Linux配置 /home/ruoyi/uploadPath） - profilePath: /data/cgav2/profile/ + profilePath: /data/cgav2/server/profile/ # 分布式ID-WorkID workerId: 1 # 分布式ID-DataCenterID @@ -114,7 +114,7 @@ file: ysPath: /data/cgav2/server/profile/ysReportTemplate.docx informed: - studySign: /data/cgav2/profile/studySign.png - template: /data/cgav2/profile/知情同意模板.docx - wordUrl: /data/cgav2/profile/informed/ - prefixWord: /data/cgav2/profile/ \ No newline at end of file + studySign: /data/cgav2/server/profile/studySign.png + template: /data/cgav2/server/profile/知情同意模板.docx + wordUrl: /data/cgav2/server/profile/informed/ + prefixWord: /data/cgav2/server/profile/ \ No newline at end of file diff --git a/ruisi_java/ruisi-web-admin/src/main/resources/mapper/dao/RmsDao.xml b/ruisi_java/ruisi-web-admin/src/main/resources/mapper/dao/RmsDao.xml index 3cb9cb3..ab3923b 100644 --- a/ruisi_java/ruisi-web-admin/src/main/resources/mapper/dao/RmsDao.xml +++ b/ruisi_java/ruisi-web-admin/src/main/resources/mapper/dao/RmsDao.xml @@ -1489,7 +1489,8 @@ d.dept_name as hospitalName WHERE user_id = #{userId} ) - group by r.id desc + group by r.id + order by r.id desc diff --git a/ruisi_java/ruisi-web-client/src/main/resources/application-prod.yml b/ruisi_java/ruisi-web-client/src/main/resources/application-prod.yml index 2ffbe72..e31d08d 100644 --- a/ruisi_java/ruisi-web-client/src/main/resources/application-prod.yml +++ b/ruisi_java/ruisi-web-client/src/main/resources/application-prod.yml @@ -6,13 +6,13 @@ spring: druid: # 主库数据源 master: - url: jdbc:mysql://172.28.145.18:23306/ruisi_cga?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8 + url: jdbc:mysql://192.168.0.128:3306/ruisi_cga?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8 username: root - password: xian#2024!!! + password: Sxinf18aA # 从库数据源 slave: # 从数据源开关/默认关闭 - enabled: true + enabled: false url: jdbc:mysql://172.28.145.18:23306/ruisi_cga_whszxyjhyy?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8 username: root password: xian#2024!!! @@ -62,13 +62,13 @@ spring: # redis 配置 redis: # 地址 - host: 172.28.147.15 + host: localhost # 端口，默认为6379 - port: 26379 + port: 6379 # 数据库索引 database: 1 # 密码 - password: redis111^# + password: 123456 # 连接超时时间 timeout: 10s lettuce: @@ -102,34 +102,35 @@ app: # 资源访问路径前缀 示例（/profile） profileUrl: /profile # 资源存储路径 示例（ Windows配置D:/ruoyi/uploadPath，Linux配置 /home/ruoyi/uploadPath） - profilePath: /data/cgav2/profile + profilePath: /data/cgav2/server/profile # 分布式ID-WorkID workerId: 1 # 分布式ID-DataCenterID dataCenterId: 1 file: - path: /data/cgav2/profile/ + path: /data/cgav2/server/profile/ # webPath: http://172.16.40.155:59001/ruisi/client/# webPath: https://rs.sxyfrs.com/ruisi/clienths/# #domain: https://api.ccsens.com/test/ domain: http://116.204.40.58/ruisiClient imgDomain: http://116.204.40.58/ruisiClient/profile - reportDomain: /data/cgav2/profile - reportPath: /data/cgav2/profile - grPath: /data/cgav2/profile/grReportTemplate.docx - ysPath: /data/cgav2/profile/ysReportTemplate.docx + reportDomain: /data/cgav2/server/profile + reportPath: /data/cgav2/server/profile + grPath: /data/cgav2/server/profile/grReportTemplate.docx + ysPath: /data/cgav2/server/profile/ysReportTemplate.docx + allPath: /data/cgav2/server/profile/allReportTemplate.docx informed: - studySign: /data/cgav2/profile/studySign.png - template: /data/cgav2/profile/知情同意模板.docx - wordUrl: /data/cgav2/profile/informed/ - prefixWord: /data/cgav2/ + studySign: /data/cgav2/server/profile/studySign.png + template: /data/cgav2/server/profile/知情同意模板.docx + wordUrl: /data/cgav2/server/profile/informed/ + prefixWord: /data/cgav2/server/ #clientVersion: v1.6.8 #clientVersion: v1.8.1.0 #clientVersion: v1.8.2.0 clientVersion: v1.8.3.0 # 医院id，不同医院部署的时候需要修改 -hospitalId: 184 +hospitalId: 106 generalPassword: cga123# \ No newline at end of file