Merge remote-tracking branch 'origin/dev2.0' into dev2.0

src/main/java/com/glxp/api/entity/sync/SocketMsgEntity.java

@@ -15,6 +15,6 @@ import lombok.NoArgsConstructor;
 public class SocketMsgEntity {
 
     private String type;
-    private String content;
+    private Object content;
     private String remark;
 }

src/main/java/com/glxp/api/service/sync/SocketMsgService.java

@@ -45,7 +45,7 @@ public class SocketMsgService {
 
     //发票确认
     public void invoiceConfirm(SocketMsgEntity socketMsgEntity) {
-        String billNo = socketMsgEntity.getContent();
+        String billNo = (String) socketMsgEntity.getContent();
         BaseResponse<IoOrderEntity> baseResponse = spGetHttpClient.getOrderByBillNo(billNo);
         if (baseResponse != null && baseResponse.getCode() == 20000) {
             IoOrderEntity orderEntity = baseResponse.getData();

src/main/java/com/glxp/api/service/sync/SpsWebSocketClient.java

@@ -11,7 +11,6 @@ import org.java_websocket.handshake.ServerHandshake;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import javax.annotation.Resource;
 import java.net.URI;
 import java.net.URISyntaxException;
 import java.util.ArrayList;

src/main/resources/application-dev.yml

@@ -47,6 +47,8 @@ logging:
     com.glxp.api.dao: debug
 
 file_path: D:/udi/udiwms/udiwmsfile/
+file_lpath: /udiwms/image/register/file/getImage
+file_url: http://127.0.0.1:9991
 UDI_KEY: 6b137c66-6286-46c6-8efa-c2f5dd9237df
 UDI_SERVER_URL: https://www.udims.com/UDI_DL_Server_test
 SPMS_KEY: lCOdWCBKS6Kw45wdnnqUTELXyuSKnXEs