From 01f207d979d6be17c8cdec293feab48828c0ec3e Mon Sep 17 00:00:00 2001
From: 黄千龙 <huangqianlong@prec-tech.com>
Date: 星期五, 08 四月 2022 14:22:52 +0800
Subject: [PATCH] Merge branch 'master' of http://47.92.229.245:8089/r/OlyMEBG

---
 force-app/main/default/classes/NFMUtil.cls |   18 ++++++++++--------
 1 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/force-app/main/default/classes/NFMUtil.cls b/force-app/main/default/classes/NFMUtil.cls
index 56315c8..91cf2fc 100644
--- a/force-app/main/default/classes/NFMUtil.cls
+++ b/force-app/main/default/classes/NFMUtil.cls
@@ -179,6 +179,8 @@
             NFM702_ENDPOINT = 'https://wdp.olympus.com.cn:44302/RESTAdapter/NFM702';
             NFM703_ENDPOINT = 'https://wdp.olympus.com.cn:44302/RESTAdapter/NFM703';
 
+            //鍏堟鍚庝慨
+            NFM112_ENDPOINT = 'http://wdp.olympus.com.cn:8089/RESTAdapter/NFM112';
             //鏍锋湰绠$悊
             NFM115_ENDPOINT = 'https://wdp.olympus.com.cn:44302/RESTAdapter/NFM115';
 
@@ -1047,13 +1049,13 @@
         req.setEndpoint(endpoint);
         req.setMethod('GET');
         HTTPResponse response = http.send(req);
-        String statusCode = response.getStatus();
+        String statusCode = String.valueof(response.getStatusCode());
         System.debug('response:' + response);
         //http锛氱姸鎬佸拰code
         //濡傛灉鐘舵�佷笉閫氳繃 锛� 鍒欏皢鐘舵�佸強绌虹殑鐨勬暟鎹� 锛� 杩斿洖
-        if (String.isNotBlank(statusCode)) {
-            return new response(statusCode, null);
-        }
+        // if (String.isNotBlank(statusCode)) {
+        //     return new response(statusCode, null);
+        // }
         System.debug('=====2======' + response.getBody());
         //姝e父鎵ц
         return new response(statusCode, response.getBody());
@@ -1070,13 +1072,13 @@
         req.setMethod('POST');
         req.setBody(jsonStr);
         HTTPResponse response = http.send(req);
-        String statusCode = response.getStatus();
+        String statusCode = String.valueof(response.getStatusCode());
         System.debug('response:' + response);
         //http锛氱姸鎬佸拰code
         //濡傛灉鐘舵�佷笉閫氳繃 锛� 鍒欏皢鐘舵�佸強绌虹殑鐨勬暟鎹� 锛� 杩斿洖
-        if (String.isNotBlank(statusCode)) {
-            return new response(statusCode, null);
-        }
+        // if (String.isNotBlank(statusCode)) {
+        //     return new response(statusCode, null);
+        // }
         System.debug('=====2======' + response.getBody());
         //姝e父鎵ц
         return new response(statusCode, response.getBody());

--
Gitblit v1.9.1