网关修改

src/main/java/com/neotel/smfcore/custom/micron20031/Micron20031Api.java

@@ -36,7 +36,7 @@ public class Micron20031Api {
     public static String Email_CC="";
     public static String Email_CC="";
     private static String apiAddr = "";
     private static String apiAddr = "";
 
 
-    private static String url_getToken="https://devapigtwy.micron.com/token";
+    private static String url_getToken="https://apim-opc-prod.micron.com/token";
     private static  String api_CheckUserRights="CheckUserRights";
     private static  String api_CheckUserRights="CheckUserRights";
     private static  String      api_CheckStockAvailable="CheckStockAvailable";
     private static  String      api_CheckStockAvailable="CheckStockAvailable";
     private static  String   api_TriggerMatReqOrder="TriggerMatReqOrder";
     private static  String   api_TriggerMatReqOrder="TriggerMatReqOrder";
@@ -211,11 +211,19 @@ public class Micron20031Api {
     }
     }
 
 
     //Dev使用
     //Dev使用
-    final static String auth = "Basic c0E1UENNdHhJTFAwZ0VFb1ZyUGFkMnhHTmZNYTp1WmRuSWYxVW1kOG9uNUpHa3NRclZ4RDdtWklh";
+    //final static String auth = "Basic c0E1UENNdHhJTFAwZ0VFb1ZyUGFkMnhHTmZNYTp1WmRuSWYxVW1kOG9uNUpHa3NRclZ4RDdtWklh";
 
 
     //test使用
     //test使用
     //final static String auth = "Basic bnhPa2tXX21SZHNja0NuaXZWTWlVRmg3SllzYTpSN2FkVTZZcXBnTmRSNEpKejNUTm5Qd2Z5Q3dh";
     //final static String auth = "Basic bnhPa2tXX21SZHNja0NuaXZWTWlVRmg3SllzYTpSN2FkVTZZcXBnTmRSNEpKejNUTm5Qd2Z5Q3dh";
 
 
+    final static String userName = "O4xtTDhZoA8IH3LWyI69JnbQMxmjhmTeBKNMIcYQhdnX9m8t";
+    final static String password = "FCIdcIukdghfb71CqdH7q9NVuqcqADRky3efd0C2amsm52zjlkqgfBCFzxswqDkZ";
+
+    public static void main(String[] args) {
+        String auth = userName + ":" + password;
+        String encode = Base64.getEncoder().encodeToString(auth.getBytes());
+        System.out.println(encode);
+    }
 
 
     public static String getAuthToken() {
     public static String getAuthToken() {
         if (ObjectUtil.isEmpty(url_getToken)) {
         if (ObjectUtil.isEmpty(url_getToken)) {
@@ -227,7 +235,11 @@ public class Micron20031Api {
             dataMap.put("grant_type", "client_credentials");
             dataMap.put("grant_type", "client_credentials");
 
 
             Map<String, String> headerMap = new HashMap<>();
             Map<String, String> headerMap = new HashMap<>();
-            headerMap.put("Authorization", auth);
+
+            String auth = userName + ":" + password;
+            String authorization = Base64.getEncoder().encodeToString(auth.getBytes());
+
+            headerMap.put("Authorization", "Basic "+authorization);
             headerMap.put("Content-Type", "application/x-www-form-urlencoded");
             headerMap.put("Content-Type", "application/x-www-form-urlencoded");
 
 
             String resultStr = HttpHelper.post(url_getToken, dataMap, headerMap);
             String resultStr = HttpHelper.post(url_getToken, dataMap, headerMap);
@@ -788,7 +800,7 @@ public class Micron20031Api {
         dataMap.put("MicronPN",barcode.getPartNumber());
         dataMap.put("MicronPN",barcode.getPartNumber());
         dataMap.put("LotNo",barcode.getBarcode());
         dataMap.put("LotNo",barcode.getBarcode());
         dataMap.put("BatchNo",barcode.getBatch());
         dataMap.put("BatchNo",barcode.getBatch());
-        dataMap.put("Location","512");
+        dataMap.put("Location","MC99");
         dataMap.put("RemainingQuantity",1);
         dataMap.put("RemainingQuantity",1);
         dataMap.put("Mode","ENABLE_MAM_SAP");
         dataMap.put("Mode","ENABLE_MAM_SAP");
         dataMap.put("Username",username);
         dataMap.put("Username",username);

src/main/resources/config/application.yml

@@ -2,7 +2,7 @@ server:
   port: 8800
   port: 8800
 
 
 micron:
 micron:
-  apiAddr: https://devapigtwy.micron.com/t/app.mfg/MMSIL/v1/DEVL/SINGAPORE/
+  apiAddr: https://apim-opc-prod.micron.com/t/app.mfg/mmsilose/v1/DEVL/SINGAPORE/
   api_CheckUserRights: CheckUserRights
   api_CheckUserRights: CheckUserRights
   api_CheckStockAvailable: CheckStockAvailable
   api_CheckStockAvailable: CheckStockAvailable
   api_TriggerMatReqOrder: TriggerMatReqOrder
   api_TriggerMatReqOrder: TriggerMatReqOrder
@@ -15,7 +15,7 @@ micron:
   api_ChkAuthoriseToDispatch: ChkAuthoriseToDispatch
   api_ChkAuthoriseToDispatch: ChkAuthoriseToDispatch
   api_ReturnMaterial: ReturnMaterial
   api_ReturnMaterial: ReturnMaterial
   defToken: Bearer 0f1a4408-7235-3f01-b671-f71491dc6bfa
   defToken: Bearer 0f1a4408-7235-3f01-b671-f71491dc6bfa
-  getTokenUrl: https://devapigtwy.micron.com/token
+  getTokenUrl: https://apim-opc-prod.micron.com/token
   email:
   email:
     to: leandraang@micron.com
     to: leandraang@micron.com
     cc: eileentanyl@micron.com
     cc: eileentanyl@micron.com
@@ -37,7 +37,7 @@ micron:
 
 
 api:
 api:
   name: 20031
   name: 20031
-  inCheckUrl: https://devapigtwy.micron.com/t/app.mfg/MMSIL/v1/DEVL/SINGAPORE/ReturnMaterial
+  inCheckUrl: https://apim-opc-prod.micron.com/t/app.mfg/mmsilose/v1/DEVL/SINGAPORE/ReturnMaterial
 #  loginCheckUrl: https://testapigtwy.micron.com/t/app.mfg/mmsil/v1/DEVL/SINGAPORE/CheckUserRights
 #  loginCheckUrl: https://testapigtwy.micron.com/t/app.mfg/mmsil/v1/DEVL/SINGAPORE/CheckUserRights
 # 文件存储路径
 # 文件存储路径
 file:
 file: