application—prod删除配置

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

@@ -7,6 +7,7 @@ import com.neotel.smfcore.common.exception.ValidateException;
 import com.neotel.smfcore.common.utils.DateUtil;
 import com.neotel.smfcore.common.utils.HttpHelper;
 import com.neotel.smfcore.common.utils.JsonUtil;
+import com.neotel.smfcore.common.utils.StringUtils;
 import com.neotel.smfcore.core.barcode.service.po.Barcode;
 import com.neotel.smfcore.custom.micron20031.bean.DepositMatReqBean;
 import com.neotel.smfcore.custom.micron20031.bean.MatOrderBean;
@@ -200,32 +201,38 @@ public class Micron20031Api {
         return "";
     }
 
+    final static String auth = "Basic c0E1UENNdHhJTFAwZ0VFb1ZyUGFkMnhHTmZNYTp1WmRuSWYxVW1kOG9uNUpHa3NRclZ4RDdtWklh";
 
     public static String getAuthToken() {
         if (ObjectUtil.isEmpty(url_getToken)) {
             //直接返回默认的token
             return "";
         }
-
         try {
-            final String auth = "Basic c0E1UENNdHhJTFAwZ0VFb1ZyUGFkMnhHTmZNYTp1WmRuSWYxVW1kOG9uNUpHa3NRclZ4RDdtWklh";
-
             Map<String, Object> dataMap = new HashMap<>();
             dataMap.put("grant_type", "client_credentials");
 
-            String resultStr = HttpHelper.postJsonWithAuth(url_getToken, dataMap, auth, "application/x-www-form-urlencoded");
+            Map<String, String> headerMap = new HashMap<>();
+            headerMap.put("Authorization", auth);
+            headerMap.put("Content-Type", "application/x-www-form-urlencoded");
+
+            String resultStr = HttpHelper.post(url_getToken, dataMap, headerMap);
             log.info("get token from MES 返回:" + resultStr);
 
             JSONObject object = JSONObject.parseObject(resultStr);
             api_AUTH_TOKEN = object.getString("token_type") + " " + object.getString("access_token");
             return api_AUTH_TOKEN;
 
-        } catch (ApiException e) {
+        } catch (Exception e) {
             log.error("checkUserRights Error", e);
         }
         return "";
     }
 
+    public static void main(String[] args) {
+        getAuthToken();
+    }
+
     /**
      * Order
      * CheckUserRights
@@ -288,6 +295,9 @@ public class Micron20031Api {
 
         //pnMap的key为pn, value为库存数量
         String checkStockAvailableUrl = getUrl(api_CheckStockAvailable);
+        if (StringUtils.isBlank(checkStockAvailableUrl)){
+            return new ArrayList<>();
+        }
         String auth = getAuthToken();
         List<Map<String,String>> paramList = new ArrayList<>();
         for (String pn : pnMap.keySet()) {
@@ -332,6 +342,9 @@ public class Micron20031Api {
     public static MatOrderBean triggerMatReqOrder(MatOrderBean orderBean) throws ApiException {
         //pnMap的key为pn, value为库存数量
         String checkStockAvailableUrl =  getUrl(api_TriggerMatReqOrder);
+        if (StringUtils.isBlank(checkStockAvailableUrl)){
+            return orderBean;
+        }
         String auth = getAuthToken();
         Map<String,Object> dataMap = new HashMap<>();
         dataMap.put("MicronPN",orderBean.getMicronPN());
@@ -366,7 +379,10 @@ public class Micron20031Api {
     public static List<DepositMatReqBean> getMatReqDetail(String matReqNo) throws ApiException {
         //pnMap的key为pn, value为库存数量
         String getMatReqDetailUrl = getUrl(api_GetMatReqDetail);
-        ;
+        if (StringUtils.isBlank(getMatReqDetailUrl)){
+            return new ArrayList<>();
+        }
+
         String auth = getAuthToken();
         Map<String, Object> dataMap = new HashMap<>();
         dataMap.put("MatReqNo", matReqNo);
@@ -410,6 +426,9 @@ public class Micron20031Api {
     public static Barcode depositCreateMA(Barcode barcode,String username) throws ApiException {
         //pnMap的key为pn, value为库存数量
         String depositCreateMAUrl = getUrl(api_DepositCreateMA);
+        if (StringUtils.isBlank(depositCreateMAUrl)){
+            return barcode;
+        }
         String auth = getAuthToken();
         Map<String,Object> dataMap = new HashMap<>();
         dataMap.put("MicronPN",barcode.getPartNumber());
@@ -459,6 +478,9 @@ public class Micron20031Api {
      */
     public static void sendEmail(String to, String cc, String subject, String conent){
         String url = getUrl(api_SendEmail);
+        if (StringUtils.isBlank(url)){
+            return;
+        }
         String auth = getAuthToken();
         try {
             Map<String,Object> dataMap = new HashMap<>();
@@ -491,6 +513,9 @@ public class Micron20031Api {
      */
     public static void mATrackOut(Barcode barcode){
         String url = getUrl(api_MATrackOut);
+        if (StringUtils.isBlank(url)){
+            return;
+        }
         String auth = getAuthToken();
         try {
             Map<String,Object> dataMap = new HashMap<>();

src/main/resources/config/application-prod.yml

-micron:
-  apiAddr: https://testapigtwy.micron.com/t/app.mfg/mmsil/v1/DEVL/SINGAPORE/
-  api_CheckUserRights: CheckUserRights
-  api_CheckStockAvailable: CheckStockAvailable
-  api_TriggerMatReqOrder: TriggerMatReqOrder
-  api_GetMatReqDetail: GetMatReqDetail
-  api_DepositCreateMA: DepositCreateMA
-  api_SendEmail: SendEmail
-  api_MATrackOut: MATrackOut
-  api_GetEquipIDList: GetEquipIDList
-  api_GetMicronPN: GetMicronPN
-  api_ChkAuthoriseToDispatch: ChkAuthoriseToDispatch
-  api_ReturnMaterial: ReturnMaterial
-  defToken: Bearer 0f1a4408-7235-3f01-b671-f71491dc6bfa
-#  getTokenUrl: https://boapi3testgtwy.micron.com/token
-  email:
-    to:
-    cc:
-api:
-  name: 20031
-  inCheckUrl: https://testapigtwy.micron.com/t/app.mfg/mmsil/v1/DEVL/SINGAPORE/ReturnMaterial
-#  loginCheckUrl: https://testapigtwy.micron.com/t/app.mfg/mmsil/v1/DEVL/SINGAPORE/CheckUserRights
-
 # 登录相关配置
 login:
   single-login: false