From 60bb4ce8d3ef0f8a324c6844cc990405de5d2e0f Mon Sep 17 00:00:00 2001
From: JLChen <551775569@qq.com>
Date: 星期五, 05 三月 2021 11:06:13 +0800
Subject: [PATCH] 2021-03-05 1.更新

---
 EZSDK/EZSDK/EZ/Global/EZHttpUtil.m |   35 ++++++++++++++++++++++-------------
 1 files changed, 22 insertions(+), 13 deletions(-)

diff --git a/EZSDK/EZSDK/EZ/Global/EZHttpUtil.m b/EZSDK/EZSDK/EZ/Global/EZHttpUtil.m
index 3b79af6..8b9150b 100644
--- a/EZSDK/EZSDK/EZ/Global/EZHttpUtil.m
+++ b/EZSDK/EZSDK/EZ/Global/EZHttpUtil.m
@@ -24,20 +24,29 @@
 #define SECRET_KEY @"WeJ8TY88vbakCcnvH8G1tDUqzLWY8yss"
 
 
+#define TIME_OUT 15.0f
+
 @implementation EZHttpUtil
 
 #pragma mark -鎺ュ彛璇锋眰閮ㄥ垎
 
 
-
-
+/// sharedManager
++ (id)sharedManager {
+    static dispatch_once_t once;
+    static id instance;
+    dispatch_once(&once, ^{
+        instance = [self new];
+    });
+    return instance;
+}
 
 /**
  *  @since 娌充笢鑾峰彇瀛愯处鍙穞oken鐨勬帴鍙�
  *
  *  @param block 鍥炶皟block
  */
-+ (void)getChildToken:(void (^)(NSString *accessToken))block{
+- (void)getChildToken:(void (^)(NSString *accessToken))block{
     
     //2.璁剧疆璇锋眰鍙傛暟
     NSMutableDictionary *parameters = [NSMutableDictionary dictionary];
@@ -65,7 +74,7 @@
  *  @param completion   鍥炶皟block锛宔rror涓虹┖鏃惰〃绀烘坊鍔犳垚鍔�
  *
  */
-+ (void)addDeviceByHDL:(NSString *)deviceSerial
+- (void)addDeviceByHDL:(NSString *)deviceSerial
                               verifyCode:(NSString *)verifyCode
                               completion:(void (^)(ResponseData *responseData))completion{
 
@@ -92,7 +101,7 @@
  *  @param completion   鍥炶皟block锛宔rror涓虹┖鏃惰〃绀烘坊鍔犳垚鍔�
  *
  */
-+ (void)deleteDeviceByHDL:(NSString *)deviceSerial completion:(void (^)(ResponseData *responseData))completion{
+- (void)deleteDeviceByHDL:(NSString *)deviceSerial completion:(void (^)(ResponseData *responseData))completion{
     //1.璁剧疆璇锋眰鍙傛暟
     NSMutableDictionary *parameters = [NSMutableDictionary dictionary];
     [parameters setValue:deviceSerial forKey:@"deviceSerial"];
@@ -111,7 +120,7 @@
 
 /// 鍒锋柊token
 /// @param block 缁撴灉
-+ (void)refreshHDLToken:(void (^)(BOOL isSuccess))block{
+- (void)refreshHDLToken:(void (^)(BOOL isSuccess))block{
 
     //1.璁剧疆璇锋眰鍙傛暟
     NSMutableDictionary *parameters = [NSMutableDictionary dictionary];
@@ -148,7 +157,7 @@
 /// @param apiPath 鎺ュ彛鍦板潃
 /// @param parameters 璇锋眰鍙傛暟
 /// @param completion 璇锋眰鍝嶅簲鍙傛暟
-+ (void)requestHttpsPost:(NSString *)apiPath
+- (void)requestHttpsPost:(NSString *)apiPath
                                 parameters:(NSMutableDictionary *)parameters
               completion:(void (^)(ResponseData *responseData))completion{
     
@@ -176,7 +185,7 @@
 /// @param apiPath 鎺ュ彛鍦板潃
 /// @param parameters 璇锋眰鍙傛暟
 /// @param completion 璇锋眰鍝嶅簲鍙傛暟
-+ (void)requestHttpsBase:(NSString *)apiPath
+- (void)requestHttpsBase:(NSString *)apiPath
                                 parameters:(NSMutableDictionary *)parameters
                                 completion:(void (^)(ResponseData *responseData))completion{
     
@@ -194,7 +203,7 @@
       
     //3.request
     NSMutableURLRequest * request = [[AFJSONRequestSerializer serializer] requestWithMethod:@"post" URLString:URL parameters:parameters error:nil];
-    request.timeoutInterval = 10.0f;
+    request.timeoutInterval = TIME_OUT;
     [request setValue:@"application/json" forHTTPHeaderField:@"Content-Type"];
     [request setValue:@"application/json" forHTTPHeaderField:@"Accept"];
     [request setValue:GlobalKit.shareKit.hdlAccessToken forHTTPHeaderField:@"Authorization"];
@@ -223,7 +232,7 @@
 /**
  *  鍩虹鏈嶅姟鐨勬帴鍙ｉ兘瑕佹牎楠宻ign
  */
-+(NSMutableDictionary *)GetSignRequestDictionary:(NSMutableDictionary *)params{
+-(NSMutableDictionary *)GetSignRequestDictionary:(NSMutableDictionary *)params{
     if(params == NULL){
         params =[NSMutableDictionary dictionary];
     }
@@ -262,7 +271,7 @@
 
 /// 瀛楃涓插垽绌�
 /// @param valueStr 浼犲叆鍒ゆ柇瀛楃
-+ (BOOL)stringIsNullOrEmpty:(NSString *)valueStr
+- (BOOL)stringIsNullOrEmpty:(NSString *)valueStr
 {
     if((valueStr == nil || [valueStr isKindOfClass:[NSNull class]] || valueStr.length == 0)){
         return YES;
@@ -275,7 +284,7 @@
 /**
  MD5杞崲+杞皬鍐�
  */
-+ (NSString*)signMD5Encrypt:(NSString *)str
+- (NSString*)signMD5Encrypt:(NSString *)str
 {
     const char *cStr = [str UTF8String];
     unsigned char digest[CC_MD5_DIGEST_LENGTH];
@@ -295,7 +304,7 @@
 /// </summary>
 /// <param name="valueStr"></param>
 /// <returns></returns>
-+(bool)IfValueNeedSign:(NSString *)valueStr{
+-(bool)IfValueNeedSign:(NSString *)valueStr{
     if (( [self stringIsNullOrEmpty:valueStr])//鍒ょ┖瀛楃
         || ([[valueStr substringToIndex:1] isEqual:@"{"])//鍒ゆ柇鏄惁涓哄璞�
         || ([[valueStr substringToIndex:1] isEqual:@"["])//鍒ゆ柇鏄惁涓烘暟缁�

--
Gitblit v1.8.0