diff --git a/laws-modules/src/main/java/com/jero/modules/laws/marketStandard/service/impl/LawsMarketStandardDetailServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/laws/marketStandard/service/impl/LawsMarketStandardDetailServiceImpl.java index 46115a09..5531a433 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/marketStandard/service/impl/LawsMarketStandardDetailServiceImpl.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/marketStandard/service/impl/LawsMarketStandardDetailServiceImpl.java @@ -373,7 +373,7 @@ public class LawsMarketStandardDetailServiceImpl extends ServiceImpl map = new HashMap<>(); List> listMap = new ArrayList<>(); diff --git a/laws-modules/src/main/resources/excelTemplate/clauseImport.xlsx b/laws-modules/src/main/resources/excelTemplate/clauseImport.xlsx index f8d0c1a9..66d76574 100644 Binary files a/laws-modules/src/main/resources/excelTemplate/clauseImport.xlsx and b/laws-modules/src/main/resources/excelTemplate/clauseImport.xlsx differ diff --git a/laws-modules/src/main/resources/pdfTemplate/noPermission.pdf b/laws-modules/src/main/resources/pdfTemplate/noPermission.pdf index fdcfde6e..e69de29b 100644 Binary files a/laws-modules/src/main/resources/pdfTemplate/noPermission.pdf and b/laws-modules/src/main/resources/pdfTemplate/noPermission.pdf differ diff --git a/laws-modules/src/main/resources/wordTemplate/enterpriseUpdate.docx b/laws-modules/src/main/resources/wordTemplate/enterpriseUpdate.docx index 28ab4d88..e69de29b 100644 Binary files a/laws-modules/src/main/resources/wordTemplate/enterpriseUpdate.docx and b/laws-modules/src/main/resources/wordTemplate/enterpriseUpdate.docx differ diff --git a/laws-single-startup/src/main/resources/application-dev.yml b/laws-single-startup/src/main/resources/application-dev.yml index c2f4963d..2ab3814e 100644 --- a/laws-single-startup/src/main/resources/application-dev.yml +++ b/laws-single-startup/src/main/resources/application-dev.yml @@ -145,13 +145,13 @@ spring: connectionProperties: druid.stat.mergeSql\=true;druid.stat.slowSqlMillis\=5000;druid.stat.logSlowSql\=true datasource: master: - url: jdbc:p6spy:mysql://10.10.10.44:3306/laws_chery_dev?characterEncoding=UTF-8&useUnicode=true&useSSL=false&tinyInt1isBit=false&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai&nullCatalogMeansCurrent=true + url: jdbc:p6spy:mysql://10.10.10.44:3306/laws_chery_dev_rsm_uat?characterEncoding=UTF-8&useUnicode=true&useSSL=false&tinyInt1isBit=false&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai&nullCatalogMeansCurrent=true username: root password: hzwlsoft.com driver-class-name: com.p6spy.engine.spy.P6SpyDriver redis: database: 12 - host: middleware.hzwlsoft.com + host: localhost lettuce: pool: max-active: 8 #最大连接数据库连接数,设 0 为没有限制 @@ -159,8 +159,8 @@ spring: max-wait: -1ms #最大建立连接等待时间。如果超过此时间将接到异常。设为-1表示无限制。 min-idle: 0 #最小等待连接中的数量,设 0 为没有限制 shutdown-timeout: 100ms - password: hzwlsoft.com - port: 4780 + password: + port: 6379 #rabbitmq 配置 rabbitmq: @@ -254,7 +254,7 @@ jero: # 文件、图片上传方式,可选项:qiniu(七牛云)、system(跟随系统配置) upload-type: system # 在线预览文件服务器地址配置 - file-view-domain: 127.0.0.1:8012 + file-view-domain: 127.0.0.10:8012 # minio文件上传 minio: minio_url: @@ -395,7 +395,7 @@ hiwork: # 是否发送消息 isSend: true # 是否推送统一待办 - isWorkflow: false + isWorkflow: true # 前端调用地址 url: https://iamuat.mychery.com:5443/idp/oauth2/authorize?state=123456&client_id=CGRSM&redirect_uri= fontUrl: http://localhost:3344{url}?projectId={projectId}&taskName={taskName}&taskId={taskId}&processInstanceId={processInstanceId}&nodeId={nodeId} @@ -499,7 +499,7 @@ srms: # pdf预览 后端url back_url_pdf: /laws-chery/sys/common/view/{id}?type=view&at={token} # 其他文件预览 替换kkfileviewurl - font_url_other: http://127.0.0.1:8012/onlinePreview?url={back_url_other}&watermarkTxt={mark}&watermarkSign={mark_md5} + font_url_other: http://127.0.0.10:8012/onlinePreview?url={back_url_other}&watermarkTxt={mark}&watermarkSign={mark_md5} # 其他文件预览 后端url 替换后端地址 back_url_other: http://localhost:8188/${srms.back_url_pdf}&fullfilename={file_name} # 其他文件水印标识 @@ -566,7 +566,7 @@ sys_role: # 飞书对接: feishu: # 是否推送飞书 - isSendStatus: false + isSendStatus: true # 重定向到前端的地址前缀 redirect_prefix: http://localhost:3344/transferRedirectPage?finalRedirectPage= # app的id