【博思达】【小米物料WIP对接 修改】

src/main/java/com/uas/eis/task/SyncProductStockTask.java

@@ -36,7 +36,7 @@ public class SyncProductStockTask {
     @Scheduled(cron = "0 0/1 * * * ?")
     public void SyncProductStock() {
         System.out.println("13434");
-        X5JsonHttpClient x5JsonHttpClient = new X5JsonHttpClient(configuration.getX5appid(),configuration.getX5appkey(),"https://mipoq.p.mi.com/HttpAdapter/HttpMessageServlet?interfaceNamespace=http://xiaomi.com/oem/dummy&interface=SI_MI_OEM_IF123_VENDOR_STOCK_S_OUT&senderService=UPSTAR_TECH_QAS&qos=BE",baseDao);
+        X5JsonHttpClient x5JsonHttpClient = new X5JsonHttpClient(configuration.getX5appid(),configuration.getX5appkey(),configuration.getX5ProductStockUrl(),baseDao);
         Map<String,Object> data = new HashMap<>();
         SimpleDateFormat sf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
         String format = sf.format(new Date());
@@ -65,7 +65,7 @@ public class SyncProductStockTask {
         System.out.println("1啊"+data);
         System.out.println("2啊"+ JSON.toJSONString(data));
         if(list.size()>0){
-            x5JsonHttpClient.post(data,"ProductStock");
+            x5JsonHttpClient.post(data, "ProductStock");
         }
     }
 }

src/main/java/com/uas/eis/task/SyncProductWIPTask.java

@@ -36,7 +36,7 @@ public class SyncProductWIPTask {
     @Scheduled(cron = "0 0/1 * * * ?")
     public void SyncProductWIP() {
         System.out.println("13434");
-        X5JsonHttpClient x5JsonHttpClient = new X5JsonHttpClient(configuration.getX5appid(),configuration.getX5appkey(),"https://mipoq.p.mi.com/HttpAdapter/HttpMessageServlet?interfaceNamespace=http://xiaomi.com/oem/dummy&interface=SI_MI_OEM_IF122_VENDOR_WIP_S_OUT&senderService=UPSTAR_TECH_QAS&qos=BE",baseDao);
+        X5JsonHttpClient x5JsonHttpClient = new X5JsonHttpClient(configuration.getX5appid(),configuration.getX5appkey(),configuration.getX5ProductWIPUrl(),baseDao);
         Map<String,Object> data = new HashMap<>();
         SimpleDateFormat sf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
         String format = sf.format(new Date());

src/main/java/com/uas/eis/task/httpclient/X5JsonHttpClient.java

@@ -3,6 +3,7 @@ package com.uas.eis.task.httpclient;
 import com.alibaba.fastjson.JSON;
 import com.uas.eis.beans.x5domain.*;
 import com.uas.eis.dao.BaseDao;
+import com.uas.eis.utils.Configuration;
 import com.uas.eis.utils.X5StringUtils;
 import org.apache.commons.codec.digest.DigestUtils;
 import org.apache.http.HttpResponse;
@@ -15,12 +16,16 @@ import org.apache.http.util.EntityUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import javax.annotation.Resource;
 import javax.xml.bind.DatatypeConverter;
 import java.io.UnsupportedEncodingException;
 import java.util.Date;
 
 public class X5JsonHttpClient extends X5HttpClient {
 
+    @Resource(name = "configuration")
+    private Configuration configuration;
+
     private final Logger logger = LoggerFactory.getLogger(this.getClass());
 
     /**
@@ -66,8 +71,9 @@ public class X5JsonHttpClient extends X5HttpClient {
         String data = X5StringUtils.encodeBase64(JSON.toJSONString(x5Request));
         System.out.println("4啊"+data);
         String encoding = null;
+        String account=configuration.getX5username()+":"+configuration.getX5username();
         try {
-            encoding = DatatypeConverter.printBase64Binary("RFCMESUPSTAR:dhH9$qFr".getBytes("UTF-8"));  //username  password 自行修改  中间":"不可少
+            encoding = DatatypeConverter.printBase64Binary(account.getBytes("UTF-8"));  //username  password 自行修改  中间":"不可少
         } catch (UnsupportedEncodingException e) {
             e.printStackTrace();
         }

src/main/java/com/uas/eis/utils/Configuration.java

@@ -70,6 +70,12 @@ public class Configuration {
     @Value("${fs.x5vendercode}")
     private String x5vendercode;
 
+    @Value("${fs.x5ProductStockUrl}")
+    private String x5ProductStockUrl;
+
+    @Value("${fs.x5ProductWIPUrl}")
+    private String x5ProductWIPUrl;
+
     @Value("${spring.datasource.username}")
     private String username;
 
@@ -152,4 +158,20 @@ public class Configuration {
     public void setX5vendercode(String x5vendercode) {
         this.x5vendercode = x5vendercode;
     }
+
+    public String getX5ProductWIPUrl() {
+        return x5ProductWIPUrl;
+    }
+
+    public void setX5ProductWIPUrl(String x5ProductWIPUrl) {
+        this.x5ProductWIPUrl = x5ProductWIPUrl;
+    }
+
+    public String getX5ProductStockUrl() {
+        return x5ProductStockUrl;
+    }
+
+    public void setX5ProductStockUrl(String x5ProductStockUrl) {
+        this.x5ProductStockUrl = x5ProductStockUrl;
+    }
 }

src/main/resources/application-prod.yml

@@ -52,4 +52,6 @@ fs:
     x5password: dhH9$qFr
     x5appid: xm_oem_9022
     x5appkey: f0a1d3b00b914db9bd23b5850932dd39
+    x5ProductStockUrl: https://mipoq.p.mi.com/HttpAdapter/HttpMessageServlet?interfaceNamespace=http://xiaomi.com/oem/dummy&interface=SI_MI_OEM_IF123_VENDOR_STOCK_S_OUT&senderService=UPSTAR_TECH_QAS&qos=BE
+    x5ProductWIPUrl: https://mipoq.p.mi.com/HttpAdapter/HttpMessageServlet?interfaceNamespace=http://xiaomi.com/oem/dummy&interface=SI_MI_OEM_IF122_VENDOR_WIP_S_OUT&senderService=UPSTAR_TECH_QAS&qos=BE
     x5vendercode: 100122