Merge branch 'master' of https://gitee.com/antai-wuliu/ANTAI-API

src/main/java/com/steerinfo/dil/controller/SystemFileController.java

@@ -238,6 +238,9 @@ public class SystemFileController extends BaseRESTfulController {
     @PostMapping("/previewfile2")
     public RESTfulResult previewfile2(@RequestBody HashMap parmas) {
         try {
+            if (parmas.get("id")==null) {
+                return failed(1,"当前详单没有图片");
+            }
         SystemFile value = systemFileMapper.selectByPrimaryKey(parmas.get("id").toString());
         if (value==null){
             return failed(1,"该文件不存在！请查验文件是否被清除或已损坏！");

src/main/resources/application-dev2.yml

@@ -0,0 +1,73 @@
+#测试环境配置文件
+spring:
+  datasource:
+    url: jdbc:oracle:thin:@172.16.90.214:1521/gxmes
+    password: gxmestest
+    username: gxmestest
+    driver-class-name: oracle.jdbc.OracleDriver
+  application:
+    name: antai-api
+  mvc:
+    async:
+      request-timeout: 15000
+
+server:
+  port: 8080
+  tomcat:
+    max-threads: 1000
+    accept-count: 800
+    basedir: /tomcat/baseDir
+eureka:
+  client:
+    registerWithEureka: false
+    fetchRegistry: false
+
+openfeign:
+  ColumnDataFeign:
+    url: ${COLUMNDATAFEIGN_URL:172.16.90.214:8083}
+  AmsFeign:
+    url: ${AMSFEIGN_URL:localhost:8079}
+  BmsFeign:
+    url: ${BMSFEIGN_URL:localhost:8078}
+  TmsFeign:
+    url: ${TMSFEIGN_URL:localhost:8086}
+  WMSFeign:
+    url: ${WMSFEIGN_URL:localhost:8093}
+  OMSFeign:
+    url: ${OMSFEIGN_URL:localhost:8095}
+  RmsFeign:
+    url: ${RMSFEIGN_URL:localhost:8060}
+  IntegrationFeign:
+    url: ${INTEGRATIONFEIGN_URL:localhost:8066}
+  OTMSFeign:
+    url: ${OTMSFEIGN_URL:localhost:8038}
+  EmsFeign:
+    url: ${TMSFEIGN_URL:localhost:8096}
+  SSOFeign:
+    url: ${SSOFEIGN_URL:172.16.90.214:9001}
+  WebSocketFeign:
+    url: ${WEBSOCKETFEIGN_URL:localhost:8000}
+  REPORTFeign:
+    url: ${REPORTFEIGN_URL:localhost:8055}
+
+
+#远程调用
+feign:
+  hystrix:
+    enabled: false #开启熔断，熔断时间和feign超时时间必须一致，否则时间短的生效
+  client:
+    config:
+      default:  #默认配置,连接时间要短，读取时间要长
+        connectTimeout: 1000 #单位毫秒
+        readTimeout: 30000 #单位毫秒
+#熔断器
+hystrix:
+  command:
+    default:
+      execution:
+        isolation:
+          thread:
+            timeoutInMilliseconds: 15000 #设置熔断时间,单位毫秒
+          strategy: SEMAPHORE
+          semaphore:
+            maxConcurrentRequests: 1