diff --git a/adc-da-convert/src/main/java/com/adc/da/convert/common/DocConverterPdf.java b/adc-da-convert/src/main/java/com/adc/da/convert/common/DocConverterPdf.java index 503973d9..52092bc8 100644 --- a/adc-da-convert/src/main/java/com/adc/da/convert/common/DocConverterPdf.java +++ b/adc-da-convert/src/main/java/com/adc/da/convert/common/DocConverterPdf.java @@ -90,7 +90,7 @@ public class DocConverterPdf { System.out.println("源文件不存在"); return; } - SocketOpenOfficeConnection connection = new SocketOpenOfficeConnection("0.0.0.0", 8100); + SocketOpenOfficeConnection connection = new SocketOpenOfficeConnection("10.100.5.122", 8100); // SocketOpenOfficeConnection connection = new SocketOpenOfficeConnection("10.10.66.176", 8100); try { connection.connect(); diff --git a/adc-da-convert/src/main/java/com/adc/da/convert/mq/SendConvertMQService.java b/adc-da-convert/src/main/java/com/adc/da/convert/mq/SendConvertMQService.java index e951244d..712aa318 100644 --- a/adc-da-convert/src/main/java/com/adc/da/convert/mq/SendConvertMQService.java +++ b/adc-da-convert/src/main/java/com/adc/da/convert/mq/SendConvertMQService.java @@ -65,9 +65,9 @@ public class SendConvertMQService { private static final Logger logger = LoggerFactory.getLogger(SendConvertMQService.class); @RabbitListener(bindings = @QueueBinding( - value = @Queue(value = "createConvertStandMQ_SQ_GSAR", durable = "true"), - exchange = @Exchange(value = "convert-exchange_SQ_GSAR", ignoreDeclarationExceptions = "true"), - key = "convert-key_SQ_GSAR")) + value = @Queue(value = "createConvertStandMQ_SQ_GSAR_RELEASE", durable = "true"), + exchange = @Exchange(value = "convert-exchange_SQ_GSAR_RELEASE", ignoreDeclarationExceptions = "true"), + key = "convert-key_SQ_GSAR_RELEASE")) public void createMQ(Map convertInfo, Message message, Channel channel) throws Exception{ try{ try{ diff --git a/adc-da-jwtLogin/src/main/java/com/adc/da/login/security/WebMvcConfig.java b/adc-da-jwtLogin/src/main/java/com/adc/da/login/security/WebMvcConfig.java index c5e5c25e..df332c93 100644 --- a/adc-da-jwtLogin/src/main/java/com/adc/da/login/security/WebMvcConfig.java +++ b/adc-da-jwtLogin/src/main/java/com/adc/da/login/security/WebMvcConfig.java @@ -65,6 +65,9 @@ public class WebMvcConfig implements WebMvcConfigurer { //企业标准导出 addInterceptor.excludePathPatterns("/api/lawss/sarBussionessStand/exportSarBussionessStand"); + //OCR回调存储文件 + addInterceptor.excludePathPatterns("/api/ocr/OCRRestful/OcrHandleResult"); + // //测试接口使用 // addInterceptor.excludePathPatterns("/api/**"); diff --git a/adc-da-main/src/main/resources/application-dev.properties b/adc-da-main/src/main/resources/application-dev.properties index 72319dce..3d67866a 100644 --- a/adc-da-main/src/main/resources/application-dev.properties +++ b/adc-da-main/src/main/resources/application-dev.properties @@ -1,12 +1,11 @@ -# dev config + #============================================= # 数据库配置 #============================================= 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=UTC&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,24 +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=rabbitmq-cluster-01.vs.test.geely.svc -#spring.rabbitmq.port=5672 -#spring.rabbitmq.virtual-host=uat_pcms -#spring.rabbitmq.username=uat_pcms -#spring.rabbitmq.password=VxsBLL5bJruwzXfS -# spring.rabbitmq.publisher-confirms=true -spring.rabbitmq.host=62.234.136.153 +#============================================== +# MQ配置 +#============================================== +spring.rabbitmq.host=10.100.5.119 spring.rabbitmq.port=5672 -spring.rabbitmq.username=guest -spring.rabbitmq.password=guest +spring.rabbitmq.username=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秒 @@ -63,19 +56,19 @@ spring.rabbitmq.listener.simple.retry.max-attempts= 5 # ============================================== # 文档存储路径指向 # ============================================== -file.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:10010/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 diff --git a/adc-da-main/src/main/resources/application.properties b/adc-da-main/src/main/resources/application.properties index 6f42d8db..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,9 +131,9 @@ verifyCodeMode=1 # 文件上传管控及配置 # ============================================================================= # file模块上传文件的服务器地址 -file.path=D:/uploadfile/bus -# 文件下载地址参数 -file.downloadUrl=http://39.98.140.126:10001/uploadPath +file.path=/data/slrs/file +# 文件下载地址参数(弃用) +file.downloadUrl= #上传文件白名单-以,分隔 upload.file.white.lists = doc,docx,xls,xlsx,pdf,PDF,png,jpg,pptx,ppt @@ -147,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 配置 diff --git a/adc-da-slrs/src/main/java/com/adc/da/mq/CreateMQService.java b/adc-da-slrs/src/main/java/com/adc/da/mq/CreateMQService.java index d913c62e..5e6c6f22 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/mq/CreateMQService.java +++ b/adc-da-slrs/src/main/java/com/adc/da/mq/CreateMQService.java @@ -71,7 +71,7 @@ public class CreateMQService { } //发送消息队列 - this.rabbitTemplate.convertAndSend("convert-exchange_SQ_GSAR", "convert-key_SQ_GSAR", convertInfo); + this.rabbitTemplate.convertAndSend("convert-exchange_SQ_GSAR_RELEASE", "convert-key_SQ_GSAR_RELEASE", convertInfo); } } diff --git a/adc-da-slrs/src/main/java/com/adc/da/mq/CreateStandMQService.java b/adc-da-slrs/src/main/java/com/adc/da/mq/CreateStandMQService.java index c0ef3345..1ac295d6 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/mq/CreateStandMQService.java +++ b/adc-da-slrs/src/main/java/com/adc/da/mq/CreateStandMQService.java @@ -29,7 +29,7 @@ public class CreateStandMQService { standMap.put("addOrUpdate", addOrUpdate); //发送消息队列 - this.rabbitTemplate.convertAndSend("stand-exchange_SQ_GSAR", "stand-key_SQ_GSAR", standMap); + this.rabbitTemplate.convertAndSend("stand-exchange_SQ_GSAR_RELEASE", "stand-key_SQ_GSAR_RELEASE", standMap); } public void sendLawsMQ(SarLawsInfo sarLawsInfoEO, String addOrUpdate) throws Exception{ @@ -51,7 +51,7 @@ public class CreateStandMQService { bussMap.put("addOrUpdate", addOrUpdate); //发送消息队列 - this.rabbitTemplate.convertAndSend("buss-exchange_SQ_GSAR", "buss-key_SQ_GSAR", bussMap); + this.rabbitTemplate.convertAndSend("buss-exchange_SQ_GSAR_RELEASE", "buss-key_SQ_GSAR_RELEASE", bussMap); } } diff --git a/adc-da-slrs/src/main/java/com/adc/da/mq/SendBussMQService.java b/adc-da-slrs/src/main/java/com/adc/da/mq/SendBussMQService.java index f8b1108c..bca2139e 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/mq/SendBussMQService.java +++ b/adc-da-slrs/src/main/java/com/adc/da/mq/SendBussMQService.java @@ -45,9 +45,9 @@ public class SendBussMQService { @RabbitListener(bindings = @QueueBinding( - value = @Queue(value = "createBussMQ_SQ_GSAR", durable = "true"), - exchange = @Exchange(value = "buss-exchange_SQ_GSAR", ignoreDeclarationExceptions = "true"), - key = "buss-key_SQ_GSAR")) + value = @Queue(value = "createBussMQ_SQ_GSAR_RELEASE", durable = "true"), + exchange = @Exchange(value = "buss-exchange_SQ_GSAR_RELEASE", ignoreDeclarationExceptions = "true"), + key = "buss-key_SQ_GSAR_RELEASE")) public void createMQ(Map bussMap, Message message, Channel channel) throws Exception{ try{ try{ diff --git a/adc-da-slrs/src/main/java/com/adc/da/mq/SendStandMQService.java b/adc-da-slrs/src/main/java/com/adc/da/mq/SendStandMQService.java index c713507b..4cf2e4e8 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/mq/SendStandMQService.java +++ b/adc-da-slrs/src/main/java/com/adc/da/mq/SendStandMQService.java @@ -46,9 +46,9 @@ public class SendStandMQService { private static final Logger logger = LoggerFactory.getLogger(SendStandMQService.class); @RabbitListener(bindings = @QueueBinding( - value = @Queue(value = "createStandMQ_SQ_GSAR", durable = "true"), - exchange = @Exchange(value = "stand-exchange_SQ_GSAR", ignoreDeclarationExceptions = "true"), - key = "stand-key_SQ_GSAR")) + value = @Queue(value = "createStandMQ_SQ_GSAR_RELEASE", durable = "true"), + exchange = @Exchange(value = "stand-exchange_SQ_GSAR_RELEASE", ignoreDeclarationExceptions = "true"), + key = "stand-key_SQ_GSAR_RELEASE")) public void createMQ(Map standMap, Message message, Channel channel) throws Exception{ try{ try{ diff --git a/adc-da-sys/src/main/java/com/adc/da/sync/service/SyncUserService.java b/adc-da-sys/src/main/java/com/adc/da/sync/service/SyncUserService.java index 760f65cd..2dba6a45 100644 --- a/adc-da-sys/src/main/java/com/adc/da/sync/service/SyncUserService.java +++ b/adc-da-sys/src/main/java/com/adc/da/sync/service/SyncUserService.java @@ -30,7 +30,7 @@ public class SyncUserService { */ public List syncFotonUser()throws Exception{ String appuser = "app_slrs"; - String appkey = "wj5iDTqyguQCxnsoo5VU21BoRSZqevhI"; + String appkey = "Fxi5LHbI5yGbQQDpVp86GcCdXeC5Bjfe"; AuthUtils util = new AuthUtils(appuser, appkey, null); List json=new ArrayList<>(); @@ -45,7 +45,7 @@ public class SyncUserService { params.put("basedn", "ou=People,o=foton.com.cn,o=isp"); System.out.println("RequestBody:" + params.toString()); // 用户测试 - String rs = util.getResponseFromServer("http://172.24.224.42:82/rest/users/getUserList", params); + String rs = util.getResponseFromServer("http://idmsync.foton.com.cn/rest/users/getUserList", params); json.add(rs); @@ -76,7 +76,7 @@ public class SyncUserService { public List syncFotonOrg()throws Exception{ String appuser = "app_slrs"; - String appkey = "wj5iDTqyguQCxnsoo5VU21BoRSZqevhI"; + String appkey = "Fxi5LHbI5yGbQQDpVp86GcCdXeC5Bjfe"; AuthUtils util = new AuthUtils(appuser, appkey, null); byte[] cookie = null; @@ -90,7 +90,7 @@ public class SyncUserService { params.put("filter", "(orgNumber=*)"); params.put("basedn", "ou=Organizations,o=foton.com.cn,o=isp"); // 组织测试 - String rs = util.getResponseFromServer("http://172.24.224.42:82/rest/orgs/getOrgList", params); + String rs = util.getResponseFromServer("http://idmsync.foton.com.cn/rest/orgs/getOrgList", params); json.add(rs);