From bb5cd0a360b57503b803d1dccb7364ac5fa25eef Mon Sep 17 00:00:00 2001 From: "zhaokaiyao@91isoft.com" <6922339zky> Date: Wed, 15 Dec 2021 10:41:31 +0800 Subject: [PATCH 01/11] =?UTF-8?q?=E6=B8=85=E5=8D=95=E8=AF=A6=E6=83=85=20?= =?UTF-8?q?=E5=9B=A0=E4=B8=BA=E5=AE=9E=E6=96=BD=E6=97=A5=E6=9C=9F=E6=8A=A5?= =?UTF-8?q?=E9=94=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../entity/StandRegionalTimeDto.java | 6 +++--- .../impl/SarLawsAttrDetailedListServiceImpl.java | 12 ++++++------ 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsAttrDetailedList/entity/StandRegionalTimeDto.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsAttrDetailedList/entity/StandRegionalTimeDto.java index 7b50a568..26a498c1 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsAttrDetailedList/entity/StandRegionalTimeDto.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsAttrDetailedList/entity/StandRegionalTimeDto.java @@ -21,15 +21,15 @@ public class StandRegionalTimeDto { @ApiModelProperty(value = "实施日期") @DateTimeFormat(pattern="yyyy-MM-dd") @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd") - private Date putTime; + private String putTime; @ApiModelProperty(value = "在产车实施日期") @DateTimeFormat(pattern="yyyy-MM-dd") @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd") - private Date zccssrq; + private String zccssrq; @ApiModelProperty(value = "新车型实施日期") @DateTimeFormat(pattern="yyyy-MM-dd") @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd") - private Date xcxssrq; + private String xcxssrq; } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsAttrDetailedList/service/impl/SarLawsAttrDetailedListServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsAttrDetailedList/service/impl/SarLawsAttrDetailedListServiceImpl.java index 037c2f22..6394e360 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsAttrDetailedList/service/impl/SarLawsAttrDetailedListServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsAttrDetailedList/service/impl/SarLawsAttrDetailedListServiceImpl.java @@ -301,14 +301,14 @@ public class SarLawsAttrDetailedListServiceImpl extends ServiceImpl> mapList, StandRegionalTimeDto s) { - String putTime = new SimpleDateFormat("yyyy-MM-dd").format(s.getPutTime()); - String xcx = new SimpleDateFormat("yyyy-MM-dd").format(s.getXcxssrq()); - String zcc = new SimpleDateFormat("yyyy-MM-dd").format(s.getZccssrq()); +// String putTime = new SimpleDateFormat("yyyy-MM-dd").format(s.getPutTime()); +// String xcx = new SimpleDateFormat("yyyy-MM-dd").format(s.getXcxssrq()); +// String zcc = new SimpleDateFormat("yyyy-MM-dd").format(s.getZccssrq()); // putTime.add(new SimpleDateFormat("yyyy-MM-dd").format(s.getPutTime()); // xcx.add(new SimpleDateFormat("yyyy-MM-dd").format(s.getXcxssrq())); // zcc.add(new SimpleDateFormat("yyyy-MM-dd").format(s.getZccssrq())); - mapList.put("实施日期("+s.getCountry()+")", Collections.singletonList(putTime)); - mapList.put("新车型实施日期("+s.getCountry()+")", Collections.singletonList(xcx)); - mapList.put("在产车实施日期("+s.getCountry()+")", Collections.singletonList(zcc)); + mapList.put("实施日期("+s.getCountry()+")",Arrays.asList(s.getPutTime().split(","))); + mapList.put("新车型实施日期("+s.getCountry()+")", Arrays.asList(s.getXcxssrq().split(","))); + mapList.put("在产车实施日期("+s.getCountry()+")", Arrays.asList(s.getZccssrq().split(","))); } } From 27625262600681ab2685536e675d769b75516a3f Mon Sep 17 00:00:00 2001 From: "zhaokaiyao@91isoft.com" <6922339zky> Date: Wed, 15 Dec 2021 15:16:55 +0800 Subject: [PATCH 02/11] =?UTF-8?q?=E6=B0=B4=E5=8D=B0=E9=80=8F=E6=98=8E?= =?UTF-8?q?=E5=BA=A6=20=E5=9C=A8beginText=E6=96=B9=E6=B3=95=E5=90=8E?= =?UTF-8?q?=E6=89=8D=E8=83=BD=E7=94=9F=E6=95=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/adc/da/util/WaterMarkUtil.java | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/adc-da-base/src/main/java/com/adc/da/util/WaterMarkUtil.java b/adc-da-base/src/main/java/com/adc/da/util/WaterMarkUtil.java index e28415b7..cb03edc7 100644 --- a/adc-da-base/src/main/java/com/adc/da/util/WaterMarkUtil.java +++ b/adc-da-base/src/main/java/com/adc/da/util/WaterMarkUtil.java @@ -46,16 +46,17 @@ public class WaterMarkUtil { // 获得PDF最顶层 under = stamper.getOverContent(i); under.saveState(); - // set Transparency - PdfGState gs = new PdfGState(); - // 设置透明度为0.2 - gs.setFillOpacity(0.25f); - under.setGState(gs); + under.restoreState(); under.beginText(); under.setFontAndSize(base, 30); under.setTextMatrix(30, 30); under.setColorFill(BaseColor.LIGHT_GRAY); + // 设置透明度为0.2 + // set Transparency + PdfGState gs = new PdfGState(); + gs.setFillOpacity(0.2f); + under.setGState(gs); for (int y = 0; y < 50; y++) { for (int x = 0; x < 50; x++) { // 水印文字成45度角倾斜 x位置 y位置 角度 From 5b64f6998976e6453c377edaad17a6b82d337c00 Mon Sep 17 00:00:00 2001 From: "zhaokaiyao@91isoft.com" <6922339zky> Date: Wed, 15 Dec 2021 15:17:18 +0800 Subject: [PATCH 03/11] =?UTF-8?q?=E8=B5=84=E6=96=99=E4=B8=AD=E5=BF=83?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/FileMaterialController.java | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/fileMaterialCenter/controller/FileMaterialController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/fileMaterialCenter/controller/FileMaterialController.java index f1dc2bd1..9f285c75 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/fileMaterialCenter/controller/FileMaterialController.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/fileMaterialCenter/controller/FileMaterialController.java @@ -5,6 +5,7 @@ import com.adc.da.http.ResponseMessage; import com.adc.da.http.Result; import com.adc.da.slrs.fileMaterialCenter.entity.FileMaterialPage; import com.adc.da.slrs.fileMaterialCenter.service.IFileMaterialService; +import com.adc.da.util.UUIDUtils; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import io.swagger.annotations.ApiModelProperty; @@ -15,8 +16,11 @@ import com.adc.da.slrs.fileMaterialCenter.entity.FileMaterial; import io.swagger.annotations.Api; import com.adc.da.base.web.BaseController; +import javax.xml.crypto.Data; import java.lang.reflect.Array; +import java.text.SimpleDateFormat; import java.util.Arrays; +import java.util.Date; import java.util.List; /** @@ -29,7 +33,7 @@ import java.util.List; */ @RestController @Api(description = "资料中心") -@RequestMapping("/fileMaterialCenter/file-material") +@RequestMapping("/${restPath}/fileMaterialCenter/file-material") public class FileMaterialController extends BaseController { @Autowired @@ -37,7 +41,14 @@ public class FileMaterialController extends BaseController { @PostMapping @ApiOperation("新增文件资料组") - public ResponseMessage addFileMaterial(FileMaterial material){ + public ResponseMessage addFileMaterial(@RequestBody FileMaterial material){ + + +// Date date = new Date(); +// String strDateFormat = "yyyy-MM-dd HH:mm:ss"; +// SimpleDateFormat sdf = new SimpleDateFormat(strDateFormat); + material.setId(UUIDUtils.randomUUID20()); + material.setDataUploadTime(new Date()); boolean save = iFileMaterialService.save(material); return Result.success(save); From f00f5b90212c4b04b540e0f87740d00be285d7ce Mon Sep 17 00:00:00 2001 From: "zhaokaiyao@91isoft.com" <6922339zky> Date: Wed, 15 Dec 2021 17:50:25 +0800 Subject: [PATCH 04/11] commit --- .../controller/FileMaterialController.java | 2 +- .../da/slrs/fileMaterialCenter/entity/FileMaterial.java | 5 +++++ .../service/impl/FileMaterialServiceImpl.java | 9 ++++----- 3 files changed, 10 insertions(+), 6 deletions(-) diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/fileMaterialCenter/controller/FileMaterialController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/fileMaterialCenter/controller/FileMaterialController.java index 9f285c75..646b7fc1 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/fileMaterialCenter/controller/FileMaterialController.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/fileMaterialCenter/controller/FileMaterialController.java @@ -58,7 +58,7 @@ public class FileMaterialController extends BaseController { @DeleteMapping @ApiOperation("删除文件资料组") public ResponseMessage deleteMaterial(String id){ - List idList = Arrays.asList(id.split(id)); + List idList = Arrays.asList(id.split(",")); boolean b = iFileMaterialService.removeByIds(idList); return Result.success(b); diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/fileMaterialCenter/entity/FileMaterial.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/fileMaterialCenter/entity/FileMaterial.java index ec068ebc..6533651e 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/fileMaterialCenter/entity/FileMaterial.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/fileMaterialCenter/entity/FileMaterial.java @@ -6,6 +6,7 @@ import java.util.Date; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableLogic; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.Tag; @@ -58,4 +59,8 @@ public class FileMaterial extends BaseEntity { @ApiModelProperty(value = "置顶") @TableField("is_top") private Integer isTop; + + @ApiModelProperty(value = "删除标志") + @TableLogic(value = "0",delval = "1") + private String delFlag; } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/fileMaterialCenter/service/impl/FileMaterialServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/fileMaterialCenter/service/impl/FileMaterialServiceImpl.java index f9b159c5..5692f135 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/fileMaterialCenter/service/impl/FileMaterialServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/fileMaterialCenter/service/impl/FileMaterialServiceImpl.java @@ -36,7 +36,7 @@ public class FileMaterialServiceImpl extends ServiceImpl queryWrapper = new QueryWrapper<>(); if (queryPage.getDataType()!=null){ - queryWrapper.eq("data_type",queryPage.getDataTitle()); + queryWrapper.eq("data_type",queryPage.getDataType()); } if (queryPage.getDataTitle()!=null){ @@ -48,9 +48,8 @@ public class FileMaterialServiceImpl extends ServiceImpl(queryPage.getPage(),queryPage.getPageSize()),queryWrapper); @@ -60,7 +59,7 @@ public class FileMaterialServiceImpl extends ServiceImpl getFileMaterialType() { QueryWrapper queryWrapper = new QueryWrapper<>(); - queryWrapper.select("data_type"); + queryWrapper.select("DISTINCT data_type"); return this.listObjs(queryWrapper, item -> item.toString()); } From e605e9d93c947b877001cb7f5627ca5c7a09571e Mon Sep 17 00:00:00 2001 From: 2510220824 <2510220824@qq.com> Date: Thu, 18 Nov 2021 17:27:08 +0800 Subject: [PATCH 05/11] =?UTF-8?q?update:=E4=BF=AE=E6=AD=A3=E7=BA=BF?= =?UTF-8?q?=E4=B8=8Aocr=E8=AF=86=E5=88=AB=E6=96=87=E4=BB=B6=E5=AD=98?= =?UTF-8?q?=E5=82=A8=E5=9C=B0=E5=9D=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/resources/application-dev.properties | 39 ++++++++----------- 1 file changed, 17 insertions(+), 22 deletions(-) diff --git a/adc-da-main/src/main/resources/application-dev.properties b/adc-da-main/src/main/resources/application-dev.properties index bd254d7d..e8488555 100644 --- a/adc-da-main/src/main/resources/application-dev.properties +++ b/adc-da-main/src/main/resources/application-dev.properties @@ -3,10 +3,9 @@ # 数据库配置 #============================================= spring.datasource.driverClassName = com.mysql.cj.jdbc.Driver -spring.datasource.url = jdbc:mysql://39.100.23.127:3306/foton_slrs_test2?useUnicode=true&characterEncoding=utf8&serverTimezone=Asia/Shanghai&useSSL=false -#spring.datasource.url = jdbc:mysql://10.96.10.54/foton_slrs_test?useUnicode=true&characterEncoding=utf8&serverTimezone=UTC&useSSL=false -spring.datasource.username = root -spring.datasource.password = root +spring.datasource.url = jdbc:mysql://10.100.5.111:3306/foton_slrs?useUnicode=true&characterEncoding=utf8&serverTimezone=UTC&useSSL=false +spring.datasource.username = tempuser +spring.datasource.password = Fting&8g35g#geg2 @@ -16,10 +15,10 @@ spring.application.name=FotonLAWSSystem application.code=20200101 application.center=1 #============================================== -#Eruept +#Eureka eureka.client.allow-redirects=true eureka.client.register-with-eureka=true -eureka.client.service-url.defaultZone=http://62.234.136.153:8761/eureka/ +eureka.client.service-url.defaultZone=http://10.100.5.117:4201/eureka/ #============================================== # 邮箱配置1 @@ -35,22 +34,18 @@ spring.mail.properties.smtp.starttls.required=false spring.mail.properties.mail.smtp.ssl.enable=false spring.mail.port=587 -# ============================================== -# rabbitMQ -# ============================================== -#spring.rabbitmq.host=10.2.186.93 -#spring.rabbitmq.port=5672 -#spring.rabbitmq.username=ca -#spring.rabbitmq.password=cs986432 -spring.rabbitmq.host=62.234.118.181 +#============================================== +# MQ配置 +#============================================== +spring.rabbitmq.host=10.100.5.119 spring.rabbitmq.port=5672 spring.rabbitmq.username=admin -spring.rabbitmq.password=admin +spring.rabbitmq.password=foton@admin spring.rabbitmq.listener.simple.acknowledge-mode= manual # 生产者 默认关闭 发版 需改为 true -spring.rabbitmq.listener.direct.auto-startup=false +spring.rabbitmq.listener.direct.auto-startup=true # 消费者 默认关闭 发版 需改为 true -spring.rabbitmq.listener.simple.auto-startup=false +spring.rabbitmq.listener.simple.auto-startup=true #消费失败消息干掉 spring.rabbitmq.listener.simple.default-requeue-rejected= true #5秒 @@ -58,22 +53,22 @@ spring.rabbitmq.listener.simple.retry.initial-interval= 5000 spring.rabbitmq.listener.simple.retry.enabled= true #最大重试5次 spring.rabbitmq.listener.simple.retry.max-attempts= 5 +# ============================================== # 文档存储路径指向 # ============================================== -file.path=/usr/laws/file/ -file.split.path=/usr/laws/file/ +file.path=/data/slrs/file # 云端OCR识别集成配置参数 #OCR请求识别URL地址 OCR.handleFileUrl = http://61.136.1.103:8091/WebService.asmx/FileConversion # OCR回调接口地址 配置客户本地的IP及端口号 -OCR.callBackUrl = http://62.234.136.153:8033/api/ocr/OCRRestful/OcrHandleResult +OCR.callBackUrl = https://slrs.foton.com.cn/api/ocr/OCRRestful/OcrHandleResult OCR.userId =dayuzhou1234 OCR.authCode =123456 OCR.publicKey =EC4KKA6ZDTCPAOCRBC5M # OCR文件存储路径 -OCR.ocrPath=/opt/foton-slrs/front/dist/file/ +OCR.ocrPath=/data/slrs/ocrResultFile/ # OCR文件请求下载或在线预览时URL -OCR.ocrDownPath=http://62.234.136.153:8038/file/ +OCR.ocrDownPath=/data/slrs/ocrResultFile/ OCR.times=20 OCR.convertType=BOTH \ No newline at end of file From 7ee5bab2e4f6985a44aa199b3f86def5186335cb Mon Sep 17 00:00:00 2001 From: 2510220824 <2510220824@qq.com> Date: Fri, 19 Nov 2021 11:25:57 +0800 Subject: [PATCH 06/11] =?UTF-8?q?update:=E6=96=B0=E5=A2=9E=E6=8B=86?= =?UTF-8?q?=E5=88=86=E5=9B=BE=E7=89=87=E8=B7=AF=E5=BE=84=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- adc-da-main/src/main/resources/application-dev.properties | 1 + 1 file changed, 1 insertion(+) diff --git a/adc-da-main/src/main/resources/application-dev.properties b/adc-da-main/src/main/resources/application-dev.properties index e8488555..f71986ae 100644 --- a/adc-da-main/src/main/resources/application-dev.properties +++ b/adc-da-main/src/main/resources/application-dev.properties @@ -57,6 +57,7 @@ spring.rabbitmq.listener.simple.retry.max-attempts= 5 # 文档存储路径指向 # ============================================== file.path=/data/slrs/file +file.split.path=/data/slrs/file/splitImage/ # 云端OCR识别集成配置参数 #OCR请求识别URL地址 From b030fb3e892e574d8884acdf98203bb280283fee Mon Sep 17 00:00:00 2001 From: 2510220824 <2510220824@qq.com> Date: Fri, 19 Nov 2021 15:14:23 +0800 Subject: [PATCH 07/11] =?UTF-8?q?update:=E6=9B=B4=E6=96=B0=E6=8B=86?= =?UTF-8?q?=E5=88=86=E5=9B=BE=E7=89=87=E5=AD=98=E5=82=A8=E4=BD=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/SarFileSplitInfoEOServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/service/impl/SarFileSplitInfoEOServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/service/impl/SarFileSplitInfoEOServiceImpl.java index b0f15bbd..40bc2020 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/service/impl/SarFileSplitInfoEOServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/service/impl/SarFileSplitInfoEOServiceImpl.java @@ -486,7 +486,7 @@ public class SarFileSplitInfoEOServiceImpl implements SarFileSplitInfoEOService if (!file1.exists()) { file1.mkdirs(); } - String filepathandname = filePath + "/img/" + imageName; + String filepathandname = splitFilePath +"/" + imageName; try { FileOutputStream fos = new FileOutputStream(filepathandname); fos.write(bytev); From 5ef31f98375b023025e7b8d5b05c6a472517054b Mon Sep 17 00:00:00 2001 From: Superman_Main <396572590@qq.com> Date: Sat, 20 Nov 2021 11:31:26 +0800 Subject: [PATCH 08/11] feat: There is no way the --- adc-da-main/src/main/resources/application-dev.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/adc-da-main/src/main/resources/application-dev.properties b/adc-da-main/src/main/resources/application-dev.properties index f71986ae..a4aa4373 100644 --- a/adc-da-main/src/main/resources/application-dev.properties +++ b/adc-da-main/src/main/resources/application-dev.properties @@ -63,7 +63,7 @@ file.split.path=/data/slrs/file/splitImage/ #OCR请求识别URL地址 OCR.handleFileUrl = http://61.136.1.103:8091/WebService.asmx/FileConversion # OCR回调接口地址 配置客户本地的IP及端口号 -OCR.callBackUrl = https://slrs.foton.com.cn/api/ocr/OCRRestful/OcrHandleResult +OCR.callBackUrl = https://srms.foton.com.cn/api/ocr/OCRRestful/OcrHandleResult OCR.userId =dayuzhou1234 OCR.authCode =123456 OCR.publicKey =EC4KKA6ZDTCPAOCRBC5M From 0877fb2df86b0168cbe848cc93efb62544af5c45 Mon Sep 17 00:00:00 2001 From: Superman_Main <396572590@qq.com> Date: Sat, 20 Nov 2021 16:46:00 +0800 Subject: [PATCH 09/11] feat: There is no way the --- .../src/main/resources/application.properties | 26 ++++++------------- 1 file changed, 8 insertions(+), 18 deletions(-) diff --git a/adc-da-main/src/main/resources/application.properties b/adc-da-main/src/main/resources/application.properties index a6f3ac0c..75fa37d5 100644 --- a/adc-da-main/src/main/resources/application.properties +++ b/adc-da-main/src/main/resources/application.properties @@ -9,12 +9,12 @@ spring.profiles.active=dev server.compression.enabled=true server.compression.mime-types=application/json,application/xml,text/html,text/plain,text/css,application/x-javascript # 端口号设置 -server.port=9999 +server.port=4202 #主服务session超时 server.servlet.session.timeout =600 #tomcat /resource/local/version-manager 创建tomcat指定临时目录 -server.tomcat.basedir=/resource/local/version-manager +server.tomcat.basedir=/data/slrs/temp # http-only server.session.cookie.http-only=true @@ -30,20 +30,14 @@ logging.level.org.springframework=info # 请求前缀 restPath=/api -#server.servlet.context-path=/api #是否将自己注册到Eureka Server上，默认为true eureka.client.register-with-eureka=true ##是否从Eureka Server上获取注册信息，默认为true eureka.client.fetch-registry=true +eureka.instance.prefer-ip-address=true - -#eureka.client.service-url.defaultZone=http://10.5.116.172:8672/eureka/ -#eureka.client.service-url.defaultZone=http://127.0.0.1:8671/eureka/ -#eureka.client.service-url.defaultZone=http://10.5.116.172:8672/eureka/ - -eureka.client.service-url.defaultZone=http://62.234.136.153:8761/eureka/ -#eureka.client.service-url.defaultZone=http://10.96.10.171:8761/eureka/ +eureka.client.service-url.defaultZone=http://10.100.5.117:4201/eureka/ # 请求连接的超时时间 默认的时间为 1 秒 ribbon.ConnectTimeout=500000 @@ -137,12 +131,9 @@ verifyCodeMode=1 # 文件上传管控及配置 # ============================================================================= # file模块上传文件的服务器地址 -file.path=D:/uploadfile/bus - -stand.edit.file.path = /usr/laws/file/ -# onlyoffice 预览地址 -file.downloadUrl=http://10.100.5.116:1080/file/ - +file.path=/data/slrs/file +# 文件下载地址参数(弃用) +file.downloadUrl= #上传文件白名单-以,分隔 upload.file.white.lists = doc,docx,xls,xlsx,pdf,PDF,png,jpg,pptx,ppt @@ -150,14 +141,13 @@ upload.file.white.lists = doc,docx,xls,xlsx,pdf,PDF,png,jpg,pptx,ppt # elasticsearch 配置 # ============================================================================= elasticsearch.clustername=elasticsearch -elasticsearch.ip=172.17.0.1 +elasticsearch.ip=10.100.5.122 elasticsearch.port=9300 elasticsearch.poolSize=5 elas.flag=true # 文档转换TCP通讯地址 convert.host=127.0.0.1 -#convert.host=0.0.0.0 # ============================================================================= # scheduled 配置 From 9dc572e3d9babbd6f052da8b968ec563be54c8b1 Mon Sep 17 00:00:00 2001 From: Superman_Main <396572590@qq.com> Date: Wed, 8 Dec 2021 21:26:20 +0800 Subject: [PATCH 10/11] feat: There is no way the --- adc-da-main/src/main/resources/application.properties | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/adc-da-main/src/main/resources/application.properties b/adc-da-main/src/main/resources/application.properties index 75fa37d5..21b5ccfd 100644 --- a/adc-da-main/src/main/resources/application.properties +++ b/adc-da-main/src/main/resources/application.properties @@ -132,8 +132,11 @@ verifyCodeMode=1 # ============================================================================= # file模块上传文件的服务器地址 file.path=/data/slrs/file -# 文件下载地址参数(弃用) -file.downloadUrl= + +stand.edit.file.path = /usr/laws/file/ +# onlyoffice 预览地址 +file.downloadUrl=https://srms.foton.com.cn/file/ + #上传文件白名单-以,分隔 upload.file.white.lists = doc,docx,xls,xlsx,pdf,PDF,png,jpg,pptx,ppt From f8309fdce0b13f399aa9fd1e6436d7a4ec1523c2 Mon Sep 17 00:00:00 2001 From: super_liu <396572590@qq.com> Date: Wed, 15 Dec 2021 14:26:03 +0800 Subject: [PATCH 11/11] feat: There is no way the --- adc-da-main/src/main/resources/application.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/adc-da-main/src/main/resources/application.properties b/adc-da-main/src/main/resources/application.properties index 21b5ccfd..be7c405b 100644 --- a/adc-da-main/src/main/resources/application.properties +++ b/adc-da-main/src/main/resources/application.properties @@ -133,7 +133,7 @@ verifyCodeMode=1 # file模块上传文件的服务器地址 file.path=/data/slrs/file -stand.edit.file.path = /usr/laws/file/ +stand.edit.file.path = /data/slrs/file/ # onlyoffice 预览地址 file.downloadUrl=https://srms.foton.com.cn/file/