ccsens_zhengzhichuan
/
cga_v2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

合并

lhqzyy
lzp 2 months ago
parent
00d227ca38 95336df218
commit
f1b4c9288c
11 changed files with 54 additions and 56 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 1
      ruisi_java/ruisi-cc-common/src/main/java/com/ccsens/common/constant/ErrorConstant.java
  2. 3
      ruisi_java/ruisi-cc-common/src/main/java/com/ccsens/common/utils/SmsUtil.java
  3. 32
      ruisi_java/ruisi-web-admin/src/main/resources/application-prod.yml
  4. 6
      ruisi_java/ruisi-web-admin/src/main/resources/application.yml
  5. 2
      ruisi_java/ruisi-web-admin/src/main/resources/logback.xml
  6. 28
      ruisi_java/ruisi-web-client/src/main/resources/application-prod.yml
  7. 8
      ruisi_java/ruisi-web-client/src/main/resources/application.yml
  8. 2
      ruisi_java/ruisi-web-client/src/main/resources/logback.xml
  9. 20
      ruisi_java/ruisi-web-examine/src/main/resources/application-prod.yml
  10. 6
      ruisi_java/ruisi-web-examine/src/main/resources/application.yml
  11. 2
      ruisi_java/ruisi-web-examine/src/main/resources/logback.xml

1
ruisi_java/ruisi-cc-common/src/main/java/com/ccsens/common/constant/ErrorConstant.java
View File

@ -1,7 +1,6 @@
package com.ccsens.common.constant;
import com.ccsens.common.enums.BaseEnum;
import javafx.scene.transform.Scale;
import lombok.AllArgsConstructor;
import lombok.Getter;

3
ruisi_java/ruisi-cc-common/src/main/java/com/ccsens/common/utils/SmsUtil.java
View File

@ -6,7 +6,6 @@ import lombok.extern.slf4j.Slf4j;
import org.json.JSONException;
import org.springframework.stereotype.Component;
import javax.xml.ws.http.HTTPException;
import java.io.IOException;
/**
@ -58,7 +57,7 @@ public class SmsUtil {
// 签名参数未提供或者为空时，会使用默认签名发送短信
result = smsSender.sendWithParam("86", phone,
TEMPLATE_ID_2, params, SMS_SIGN, "", "");
} catch (HTTPException | JSONException | IOException | com.github.qcloudsms.httpclient.HTTPException e) {
} catch (JSONException | IOException | com.github.qcloudsms.httpclient.HTTPException e) {
e.printStackTrace();
log.info("Exception: ",e);
}

32
ruisi_java/ruisi-web-admin/src/main/resources/application-prod.yml
View File

@ -6,9 +6,9 @@ spring:
druid:
# 主库数据源
master:
url: jdbc:mysql://192.168.0.128:3306/ruisi_cga?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
url: jdbc:mysql://172.20.9.15:23306/ruisi_cga?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
username: root
password: Sxinf18aA
password: xian#2024!!!
# 从库数据源
slave:
# 从数据源开关/默认关闭
@ -62,13 +62,13 @@ spring:
# redis 配置
redis:
# 地址
host: localhost
host: 172.20.9.15
# 端口，默认为6379
port: 6379
port: 26379
# 数据库索引
database: 1
# 密码
password:
password: redis111^#
# 连接超时时间
timeout: 10s
lettuce:
@ -88,7 +88,7 @@ app:
# 资源访问路径前缀 示例（/profile）
profileUrl: /profile
# 资源存储路径 示例（ Windows配置D:/ruoyi/uploadPath，Linux配置 /home/ruoyi/uploadPath）
profilePath: /data/cgav2/server/profile/
profilePath: /data/cgav2/profile/
# 分布式ID-WorkID
workerId: 1
# 分布式ID-DataCenterID
@ -99,18 +99,18 @@ ht:
patientUrl: https://api.tall.wiki/ruisi/client/#
name: 认知功能评测云平台系统
file:
path: /data/cgav2/server/profile/
path: /data/cgav2/profile/
#domain: https://api.ccsens.com/test/
domain: http://116.204.40.58/ruisiClient
imgDomain: https://test.tall.wiki/htageClient/profile
reportPath: /data/cgav2/server
ldTemplate: /data/cgav2/server/profile/upload/dTemplate.xlsx
ldTjbgDir: /data/cgav2/server/profile/tjbg/
ldExportDir: /data/cgav2/server/profile/ldExport
ldZQTYDir: /data/cgav2/server/profile/ldZQTYExport
ldZQTYTemplate: /data/cgav2/server/profile/upload/2024年河津流调知情同意书模板-V1.docx
ldTemplate: /data/cgav2/profile/upload/dTemplate.xlsx
ldTjbgDir: /data/cgav2/profile/tjbg/
ldExportDir: /data/cgav2/profile/ldExport
ldZQTYDir: /data/cgav2/profile/ldZQTYExport
ldZQTYTemplate: /data/cgav2/profile/upload/2024年河津流调知情同意书模板-V1.docx
informed:
studySign: /data/cgav2/server/profile/studySign.png
template: /data/cgav2/server/profile/知情同意模板.docx
wordUrl: /data/cgav2/server/profile/informed/
prefixWord: /data/cgav2/server/profile/
studySign: /data/cgav2/profile/studySign.png
template: /data/cgav2/profile/知情同意模板.docx
wordUrl: /data/cgav2/profile/informed/
prefixWord: /data/cgav2/profile/

6
ruisi_java/ruisi-web-admin/src/main/resources/application.yml
View File

@ -76,11 +76,11 @@ spring:
# 地址
host: localhost
# 端口，默认为6379
port: 6379
port: 26379
# 数据库索引
database: 1
database: 0
# 密码
password:
password: redis111^#
# 连接超时时间
timeout: 10s
lettuce:

2
ruisi_java/ruisi-web-admin/src/main/resources/logback.xml
View File

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<configuration>
<!-- 日志存放路径 -->
<property name="log.path" value="/data/cgav2/server/profile/logs" />
<property name="log.path" value="/data/cgav2/logs" />
<!-- 日志输出格式 -->
<property name="log.pattern" value="%d{HH:mm:ss.SSS} [%thread] %-5level %logger{20} - [%method,%line] - %msg%n" />

28
ruisi_java/ruisi-web-client/src/main/resources/application-prod.yml
View File

@ -6,9 +6,9 @@ spring:
druid:
# 主库数据源
master:
url: jdbc:mysql://192.168.0.128:3306/ruisi_cga?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
url: jdbc:mysql://172.20.9.15:23306/ruisi_cga?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
username: root
password: Sxinf18aA
password: xian#2024!!!
# 从库数据源
slave:
# 从数据源开关/默认关闭
@ -62,13 +62,13 @@ spring:
# redis 配置
redis:
# 地址
host: localhost
host: 172.20.9.15
# 端口，默认为6379
port: 6379
port: 26379
# 数据库索引
database: 1
# 密码
password:
password: redis111^#
# 连接超时时间
timeout: 10s
lettuce:
@ -88,7 +88,7 @@ app:
# 资源访问路径前缀 示例（/profile）
profileUrl: /profile
# 资源存储路径 示例（ Windows配置D:/ruoyi/uploadPath，Linux配置 /home/ruoyi/uploadPath）
profilePath: /data/cgav2/server/profile/server/profile
profilePath: /data/cgav2/profile/server/profile
# 分布式ID-WorkID
workerId: 1
# 分布式ID-DataCenterID
@ -98,20 +98,20 @@ ht:
patientUrl: http://172.16.40.155/htage2023/client/#
name: 认知功能评测云平台系统
file:
path: /data/cgav2/server/profile/
path: /data/cgav2/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://172.16.40.155/ruisiClient
imgDomain: http://172.16.40.155/ruisiClient/profile
reportDomain: /data/cgav2/server/profile/server/profile
reportPath: /data/cgav2/server/profile/server/profile
grPath: /data/cgav2/server/profile/server/profile/grReportTemplate.docx
ysPath: /data/cgav2/server/profile/server/profile/ysReportTemplate.docx
reportDomain: /data/cgav2/profile/server/profile
reportPath: /data/cgav2/profile/server/profile
grPath: /data/cgav2/profile/server/profile/grReportTemplate.docx
ysPath: /data/cgav2/profile/server/profile/ysReportTemplate.docx
informed:
studySign: /data/cgav2/server/profile/studySign.png
template: /data/cgav2/server/profile/知情同意模板.docx
wordUrl: /data/cgav2/server/profile/informed/
studySign: /data/cgav2/profile/studySign.png
template: /data/cgav2/profile/知情同意模板.docx
wordUrl: /data/cgav2/profile/informed/
prefixWord: /data/cgav2/server
#clientVersion: v1.6.8
#clientVersion: v1.8.1.0

8
ruisi_java/ruisi-web-client/src/main/resources/application.yml
View File

@ -9,7 +9,7 @@ app:
# 实例演示开关
demoEnabled: true
# 文件路径 示例（ Windows配置D:/ruoyi/uploadPath，Linux配置 /home/ruoyi/uploadPath）
profile: /data/cgav2/server/profile/
profile: /data/cgav2/profile/
# 获取ip地址开关
addressEnabled: false
# 验证码类型 math 数组计算 char 字符验证
@ -76,11 +76,11 @@ spring:
# 地址
host: localhost
# 端口，默认为6379
port: 6379
port: 26379
# 数据库索引
database: 1
database: 0
# 密码
password:
password: redis111^#
# 连接超时时间
timeout: 10s
lettuce:

2
ruisi_java/ruisi-web-client/src/main/resources/logback.xml
View File

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<configuration>
<!-- 日志存放路径 -->
<property name="log.path" value="/data/cgav2/server/profile/logs" />
<property name="log.path" value="/data/cgav2/logs" />
<!-- 日志输出格式 -->
<property name="log.pattern" value="%d{HH:mm:ss.SSS} [%thread] %-5level %logger{20} - [%method,%line] - %msg%n" />

20
ruisi_java/ruisi-web-examine/src/main/resources/application-prod.yml
View File

@ -6,9 +6,9 @@ spring:
druid:
# 主库数据源
master:
url: jdbc:mysql://192.168.0.128:3306/ruisi_cga?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
url: jdbc:mysql://172.20.9.15:23306/ruisi_cga?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
username: root
password: Sxinf18aA
password: xian#2024!!!
# 从库数据源
slave:
# 从数据源开关/默认关闭
@ -62,13 +62,13 @@ spring:
# redis 配置
redis:
# 地址
host: localhost
host: 172.20.9.15
# 端口，默认为6379
port: 6379
port: 26379
# 数据库索引
database: 1
# 密码
password:
password: redis111^#
# 连接超时时间
timeout: 10s
lettuce:
@ -88,7 +88,7 @@ app:
# 资源访问路径前缀 示例（/profile）
profileUrl: /profile
# 资源存储路径 示例（ Windows配置D:/ruoyi/uploadPath，Linux配置 /home/ruoyi/uploadPath）
profilePath: /data/cgav2/server/profile/
profilePath: /data/cgav2/profile/
# 分布式ID-WorkID
workerId: 1
# 分布式ID-DataCenterID
@ -102,12 +102,12 @@ file:
#domain: https://api.ccsens.com/test/
domain: http://localhost:8180/
imgDomain: https://api.tall.wiki/htageClient/profile
reportDomain: /data/cgav2/server/profile/report
reportDomain: /data/cgav2/profile/report
reportPath: /data/ruisi/server/profile
informed:
studySign: /data/cgav2/server/profile/studySign.png
template: /data/cgav2/server/profile/知情同意模板.docx
wordUrl: /data/cgav2/server/profile/informed/
studySign: /data/cgav2/profile/studySign.png
template: /data/cgav2/profile/知情同意模板.docx
wordUrl: /data/cgav2/profile/informed/
prefixWord: /data/ruisi/server
#clientVersion: v1.6.8
#clientVersion: v1.8.1.0

6
ruisi_java/ruisi-web-examine/src/main/resources/application.yml
View File

@ -9,7 +9,7 @@ app:
# 实例演示开关
demoEnabled: true
# 文件路径 示例（ Windows配置D:/ruoyi/uploadPath，Linux配置 /home/ruoyi/uploadPath）
profile: /data/cgav2/server/profile/
profile: /data/cgav2/profile/
# 获取ip地址开关
addressEnabled: false
# 验证码类型 math 数组计算 char 字符验证
@ -76,11 +76,11 @@ spring:
# 地址
host: localhost
# 端口，默认为6379
port: 6379
port: 26379
# 数据库索引
database: 0
# 密码
password:
password: redis111^#
# 连接超时时间
timeout: 10s
lettuce:

2
ruisi_java/ruisi-web-examine/src/main/resources/logback.xml
View File

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<configuration>
<!-- 日志存放路径 -->
<property name="log.path" value="/data/cgav2/server/profile/logs" />
<property name="log.path" value="/data/cgav2/logs" />
<!-- 日志输出格式 -->
<property name="log.pattern" value="%d{HH:mm:ss.SSS} [%thread] %-5level %logger{20} - [%method,%line] - %msg%n" />

Write Preview
Loading…
Cancel
Save