生产部署

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
+  studySign: /data/cgav2/server/profile/studySign.png
-  template: /data/cgav2/profile/知情同意模板.docx
+  template: /data/cgav2/server/profile/知情同意模板.docx
-  wordUrl: /data/cgav2/profile/informed/
+  wordUrl: /data/cgav2/server/profile/informed/
-  prefixWord: /data/cgav2/profile/
+  prefixWord: /data/cgav2/server/profile/

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}
             )
         </if>
-        group by r.id desc
+        group by r.id
+        order by r.id desc
     </select>
 
 <!--    <resultMap id="ResultMap" type="com.ccsens.system.domain.vo.RmsVo$ReportScore">-->

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
+  reportDomain: /data/cgav2/server/profile
-  reportPath: /data/cgav2/profile
+  reportPath: /data/cgav2/server/profile
-  grPath: /data/cgav2/profile/grReportTemplate.docx
+  grPath: /data/cgav2/server/profile/grReportTemplate.docx
-  ysPath: /data/cgav2/profile/ysReportTemplate.docx
+  ysPath: /data/cgav2/server/profile/ysReportTemplate.docx
+  allPath: /data/cgav2/server/profile/allReportTemplate.docx
 
 informed:
-  studySign: /data/cgav2/profile/studySign.png
+  studySign: /data/cgav2/server/profile/studySign.png
-  template: /data/cgav2/profile/知情同意模板.docx
+  template: /data/cgav2/server/profile/知情同意模板.docx
-  wordUrl: /data/cgav2/profile/informed/
+  wordUrl: /data/cgav2/server/profile/informed/
-  prefixWord: /data/cgav2/
+  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#