diff --git a/yinmeng-ios/DingDangApp.xcodeproj/project.pbxproj b/yinmeng-ios/DingDangApp.xcodeproj/project.pbxproj index b79d5cf..cabc415 100644 --- a/yinmeng-ios/DingDangApp.xcodeproj/project.pbxproj +++ b/yinmeng-ios/DingDangApp.xcodeproj/project.pbxproj @@ -3,7 +3,7 @@ archiveVersion = 1; classes = { }; - objectVersion = 54; + objectVersion = 53; objects = { /* Begin PBXBuildFile section */ @@ -739,7 +739,7 @@ 23B2A8012B283ACA001C0913 /* UserInfoSkillVo.m in Sources */ = {isa = PBXBuildFile; fileRef = 23B2A7EA2B283ACA001C0913 /* UserInfoSkillVo.m */; }; 23B2A8022B283ACA001C0913 /* MvpViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 23B2A7ED2B283ACA001C0913 /* MvpViewController.m */; }; 23B2A8032B283ACA001C0913 /* Api.m in Sources */ = {isa = PBXBuildFile; fileRef = 23B2A7EF2B283ACA001C0913 /* Api.m */; }; - 23B2A8042B283ACA001C0913 /* HttpRequestHelper.m in Sources */ = {isa = PBXBuildFile; fileRef = 23B2A7F22B283ACA001C0913 /* HttpRequestHelper.m */; }; + 23B2A8042B283ACA001C0913 /* DDRequestTool.m in Sources */ = {isa = PBXBuildFile; fileRef = 23B2A7F22B283ACA001C0913 /* DDRequestTool.m */; }; 23B62C322B299E80005FD3DE /* Api+DDDynamicApi.m in Sources */ = {isa = PBXBuildFile; fileRef = 23B62C312B299E80005FD3DE /* Api+DDDynamicApi.m */; }; 8C2C3EC92B277E7F002C3C34 /* DDIAPHelper.m in Sources */ = {isa = PBXBuildFile; fileRef = 8C2C3EC82B277E7F002C3C34 /* DDIAPHelper.m */; }; 8C2C3ECC2B2784DE002C3C34 /* DDIAPRechargeStorage.m in Sources */ = {isa = PBXBuildFile; fileRef = 8C2C3ECB2B2784DE002C3C34 /* DDIAPRechargeStorage.m */; }; @@ -2146,9 +2146,9 @@ 23B2A7ED2B283ACA001C0913 /* MvpViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MvpViewController.m; sourceTree = ""; }; 23B2A7EF2B283ACA001C0913 /* Api.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = Api.m; sourceTree = ""; }; 23B2A7F02B283ACA001C0913 /* Api.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Api.h; sourceTree = ""; }; - 23B2A7F22B283ACA001C0913 /* HttpRequestHelper.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = HttpRequestHelper.m; sourceTree = ""; }; - 23B2A7F32B283ACA001C0913 /* ApiHost.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ApiHost.h; sourceTree = ""; }; - 23B2A7F42B283ACA001C0913 /* HttpRequestHelper.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HttpRequestHelper.h; sourceTree = ""; }; + 23B2A7F22B283ACA001C0913 /* DDRequestTool.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = DDRequestTool.m; sourceTree = ""; }; + 23B2A7F32B283ACA001C0913 /* DDHostURL.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DDHostURL.h; sourceTree = ""; }; + 23B2A7F42B283ACA001C0913 /* DDRequestTool.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DDRequestTool.h; sourceTree = ""; }; 23B2A8062B2843B6001C0913 /* DDMacroHeader.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DDMacroHeader.h; sourceTree = ""; }; 23B62C302B299E80005FD3DE /* Api+DDDynamicApi.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "Api+DDDynamicApi.h"; sourceTree = ""; }; 23B62C312B299E80005FD3DE /* Api+DDDynamicApi.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = "Api+DDDynamicApi.m"; sourceTree = ""; }; @@ -5529,9 +5529,9 @@ 23B2A7F12B283ACA001C0913 /* Net */ = { isa = PBXGroup; children = ( - 23B2A7F22B283ACA001C0913 /* HttpRequestHelper.m */, - 23B2A7F32B283ACA001C0913 /* ApiHost.h */, - 23B2A7F42B283ACA001C0913 /* HttpRequestHelper.h */, + 23B2A7F22B283ACA001C0913 /* DDRequestTool.m */, + 23B2A7F32B283ACA001C0913 /* DDHostURL.h */, + 23B2A7F42B283ACA001C0913 /* DDRequestTool.h */, ); path = Net; sourceTree = ""; @@ -6547,7 +6547,7 @@ 23B2A8032B283ACA001C0913 /* Api.m in Sources */, 188AF5CB2A27648A004DD4CF /* RoomPublicScreenTextCell.m in Sources */, 18660CE22A2192A80032D0C9 /* AppMessageManager.m in Sources */, - 23B2A8042B283ACA001C0913 /* HttpRequestHelper.m in Sources */, + 23B2A8042B283ACA001C0913 /* DDRequestTool.m in Sources */, 188EC0F62A47CF3200060F03 /* DDChatHelper.m in Sources */, 18660D942A2195600032D0C9 /* DynamicViewController.m in Sources */, 18B1EA3B2A273F0F00DDE889 /* DDSearchPageNoDataView.m in Sources */, diff --git a/yinmeng-ios/DingDangApp/AppDelegate/AppDelegate+CYLTabBar.m b/yinmeng-ios/DingDangApp/AppDelegate/AppDelegate+CYLTabBar.m index 91c64c2..bee2cf2 100644 --- a/yinmeng-ios/DingDangApp/AppDelegate/AppDelegate+CYLTabBar.m +++ b/yinmeng-ios/DingDangApp/AppDelegate/AppDelegate+CYLTabBar.m @@ -19,7 +19,7 @@ #import "AccountModel.h" #import "UserInfoModel.h" #import "AccountInfoStorage.h" -#import "HttpRequestHelper.h" +#import "DDRequestTool.h" #import "DDLoginRequest.h" /// Tool #import @@ -53,7 +53,9 @@ @"access_token" : accountModel.access_token, @"issue_type" : @"multi" }; - [HttpRequestHelper POST:@"/oauth/ticket" params:param success:^(BaseModel * _Nonnull data) { + + NSString *url = [DDEncryptManager dd_aesDecryptWithText:@"6emKfy4lcAfMp/eLOoAMhA=="]; + [DDRequestTool DD_Request_POST:url params:param success:^(BaseModel * _Nonnull data) { [ToolsObject DismissSVProgressHUD]; NSArray *tickets = [data.data valueForKey:@"tickets"]; NSString *ticket = [tickets[0] valueForKey:@"ticket"]; diff --git a/yinmeng-ios/DingDangApp/BsaseClass/Tool/IAPManager/IAPManager.m b/yinmeng-ios/DingDangApp/BsaseClass/Tool/IAPManager/IAPManager.m index ba44f51..aa4b8f4 100644 --- a/yinmeng-ios/DingDangApp/BsaseClass/Tool/IAPManager/IAPManager.m +++ b/yinmeng-ios/DingDangApp/BsaseClass/Tool/IAPManager/IAPManager.m @@ -221,7 +221,9 @@ [parm setObject:self.productPrice forKey:@"price"]; [parm setObject:base64String forKey:@"receipt_data"]; WeakSelf(ws); - [NetworkRequest requestPOST:@"/finance/create/order" parameters:parm block:^(BaseResponse * _Nonnull response) { + // /finance/create/order + NSString *url = [DDEncryptManager dd_aesDecryptWithText:@"n+zlYdpnmtzHUDM9EJhAbcqg8hQmjmPYjm3hA+NQyFA="]; + [NetworkRequest requestPOST:url parameters:parm block:^(BaseResponse * _Nonnull response) { if (response.isSuccess) { [ws handleActionWithType:InternalPurchase_VerScuess data:nil]; } else { diff --git a/yinmeng-ios/DingDangApp/BsaseClass/Tool/ToolsObject.m b/yinmeng-ios/DingDangApp/BsaseClass/Tool/ToolsObject.m index 9923344..0119d1f 100644 --- a/yinmeng-ios/DingDangApp/BsaseClass/Tool/ToolsObject.m +++ b/yinmeng-ios/DingDangApp/BsaseClass/Tool/ToolsObject.m @@ -762,7 +762,10 @@ static NSString *SAVEROOMCONFIG = @"ROOMCONFIG"; NSMutableDictionary *params = [[NSMutableDictionary alloc] init]; [params setObject:room_id forKey:@"room_id"]; [params setObject:pwd forKey:@"pwd"]; - [NetworkRequest requestPOST:@"/room/check/password" parameters:params block:^(BaseResponse * _Nonnull response) { + + /// /room/check/password + NSString *url = [DDEncryptManager dd_aesDecryptWithText:@"MZbC2NLXxGmFpeOgHUlT28w7YdWRpGzDsQ4X4rC72UI="]; + [NetworkRequest requestPOST:url parameters:params block:^(BaseResponse * _Nonnull response) { if (response.isSuccess) { [ws goToRoomVC:room_id followUser:followUser passWord:pwd]; @@ -1324,7 +1327,9 @@ static NSString *SAVEROOMCONFIG = @"ROOMCONFIG"; }return _microrunArr; } + (void)goAppService{ - [NetworkRequest requestPOST:@"/my/support/staff" parameters:@{}.mutableCopy block:^(BaseResponse * _Nonnull response) { + /// /my/support/staff + NSString *url = [DDEncryptManager dd_aesDecryptWithText:@"Q31Gyh7TfL4P0ID6I3fxHkSVqT8Sk+YgI+Quj3Ji8AM="]; + [NetworkRequest requestPOST:url parameters:@{}.mutableCopy block:^(BaseResponse * _Nonnull response) { if ([ToolsObject IsNullWithObject:response.data]) { [ToolsObject addPopVieToText:response.msg]; return; diff --git a/yinmeng-ios/DingDangApp/CodeClass/Home/HomeViewController.m b/yinmeng-ios/DingDangApp/CodeClass/Home/HomeViewController.m index b676721..efc32a3 100644 --- a/yinmeng-ios/DingDangApp/CodeClass/Home/HomeViewController.m +++ b/yinmeng-ios/DingDangApp/CodeClass/Home/HomeViewController.m @@ -126,7 +126,9 @@ [dict setObject:@(self.pageNum) forKey:@"page_number"]; [dict setObject:@"hot" forKey:@"scene"]; WeakSelf(weakSelf) - [NetworkRequest requestPOST:@"/room/list" parameters:dict block:^(BaseResponse * _Nonnull response) { + /// /room/list + NSString *url = [DDEncryptManager dd_aesDecryptWithText:@"U7Vw0Xckn7CQFkKrvg3Lzw=="]; + [NetworkRequest requestPOST:url parameters:dict block:^(BaseResponse * _Nonnull response) { if (response.code == 200) { if ([ToolsObject IsNullWithObject:response.data[@"record"]]) { return; @@ -162,7 +164,9 @@ NSMutableDictionary *requestDict = [NSMutableDictionary dictionary]; [requestDict setObject:@"1" forKey:@"position"]; WeakSelf(weakSelf) - [NetworkRequest requestPOST:@"/home/banner/list" parameters:requestDict block:^(BaseResponse * _Nonnull response) { + /// /home/banner/list + NSString *url = [DDEncryptManager dd_aesDecryptWithText:@"taXStvDpHVvneGGdAV5tOOBccGTNu33SGtYAuLUhAKw="]; + [NetworkRequest requestPOST:url parameters:requestDict block:^(BaseResponse * _Nonnull response) { if (response.code == 200) { if ([ToolsObject IsNullWithObject:response.data]){ return; @@ -231,7 +235,9 @@ headerView.roomlistBlock = ^{ NSMutableDictionary *requestDict = [NSMutableDictionary dictionary]; [requestDict setObject:@"2" forKey:@"type"]; - [NetworkRequest requestPOST:@"/room/random/room" parameters:requestDict block:^(BaseResponse * _Nonnull response) { + /// /room/random/room + NSString *url = [DDEncryptManager dd_aesDecryptWithText:@"ZFpqoY77MXoepco/FBXmG6jMZNPM0O3VvHGrBX07elw="]; + [NetworkRequest requestPOST:url parameters:requestDict block:^(BaseResponse * _Nonnull response) { if (response.code == 200) { if ([ToolsObject IsNullWithObject:response.data]){ return; diff --git a/yinmeng-ios/DingDangApp/CodeClass/Message/会话列表/ConversationListVC.m b/yinmeng-ios/DingDangApp/CodeClass/Message/会话列表/ConversationListVC.m index aea513a..5a061dd 100644 --- a/yinmeng-ios/DingDangApp/CodeClass/Message/会话列表/ConversationListVC.m +++ b/yinmeng-ios/DingDangApp/CodeClass/Message/会话列表/ConversationListVC.m @@ -329,7 +329,10 @@ trailingSwipeActionsConfigurationForRowAtIndexPath:(NSIndexPath *)indexPath{ //随机平台房 NSMutableDictionary *dic = [NSMutableDictionary dictionary]; [dic setObject:@"2" forKey:@"type"]; - [NetworkRequest requestPOST:@"/room/random/room" parameters:dic block:^(BaseResponse * _Nonnull response) { + + /// /room/random/room + NSString *url = [DDEncryptManager dd_aesDecryptWithText:@"ZFpqoY77MXoepco/FBXmG6jMZNPM0O3VvHGrBX07elw="]; + [NetworkRequest requestPOST:url parameters:dic block:^(BaseResponse * _Nonnull response) { if (response.code == 200) { if ([ToolsObject IsNullWithObject:response.data]) { return; diff --git a/yinmeng-ios/DingDangApp/CodeClass/MyInfo/CC/DDMyInfoJuBaoViewController.m b/yinmeng-ios/DingDangApp/CodeClass/MyInfo/CC/DDMyInfoJuBaoViewController.m index 0f13ae9..b3cb9fb 100644 --- a/yinmeng-ios/DingDangApp/CodeClass/MyInfo/CC/DDMyInfoJuBaoViewController.m +++ b/yinmeng-ios/DingDangApp/CodeClass/MyInfo/CC/DDMyInfoJuBaoViewController.m @@ -443,7 +443,10 @@ [requestDict setValue:images forKey:@"report_img"];//证据:图片地址,多个用豆号分开 WeakSelf(weakSelf) - [NetworkRequest requestPOST:@"/room/report" parameters:requestDict block:^(BaseResponse * _Nonnull response) { + + /// /room/report + NSString *url = [DDEncryptManager dd_aesDecryptWithText:@"FsKVcXsP8WRb7QpBRRo2DA=="]; + [NetworkRequest requestPOST:url parameters:requestDict block:^(BaseResponse * _Nonnull response) { [ToolsObject DismissSVProgressHUD]; if (response.code == 200){ [ToolsObject addPopVieToText:@"举报成功"]; diff --git a/yinmeng-ios/DingDangApp/CodeClass/MyInfo/CC/DDMyInfoReportViewController.m b/yinmeng-ios/DingDangApp/CodeClass/MyInfo/CC/DDMyInfoReportViewController.m index 26915fc..11159a7 100644 --- a/yinmeng-ios/DingDangApp/CodeClass/MyInfo/CC/DDMyInfoReportViewController.m +++ b/yinmeng-ios/DingDangApp/CodeClass/MyInfo/CC/DDMyInfoReportViewController.m @@ -399,7 +399,9 @@ [requestDict setValue:images forKey:@"report_img"]; WeakSelf(weakSelf) - [NetworkRequest requestPOST:@"/room/report" parameters:requestDict block:^(BaseResponse * _Nonnull response) { + /// /room/report + NSString *url = [DDEncryptManager dd_aesDecryptWithText:@"FsKVcXsP8WRb7QpBRRo2DA=="]; + [NetworkRequest requestPOST:url parameters:requestDict block:^(BaseResponse * _Nonnull response) { [ToolsObject DismissSVProgressHUD]; if (response.code == 200){ [ToolsObject addPopVieToText:@"举报成功"]; diff --git a/yinmeng-ios/DingDangApp/CodeClass/MyInfo/CC/DDMyInfoSettingViewController.m b/yinmeng-ios/DingDangApp/CodeClass/MyInfo/CC/DDMyInfoSettingViewController.m index 62af39e..47151b8 100644 --- a/yinmeng-ios/DingDangApp/CodeClass/MyInfo/CC/DDMyInfoSettingViewController.m +++ b/yinmeng-ios/DingDangApp/CodeClass/MyInfo/CC/DDMyInfoSettingViewController.m @@ -234,7 +234,7 @@ case DDMyInfoModelType_PrivacyAgreement: { /* 隐私协议 */ - DDWebViewController * webVC = [DDWebViewController webControlerWithUrlStr:[NSString stringWithFormat:@"%@/boyou/modules/rule/privacy-wap.html",API_HOST_H5_URL] isShowNavBar:YES navTitle:@"隐私协议"]; + DDWebViewController * webVC = [DDWebViewController webControlerWithUrlStr:[NSString stringWithFormat:@"%@/boyou/modules/rule/privacy-wap.html",DD__HOST_H5_API_URL] isShowNavBar:YES navTitle:@"隐私协议"]; webVC.view.backgroundColor = UIColor.whiteColor; [[ToolsObject getCurrentViewController].navigationController pushViewController:webVC animated:NO]; } diff --git a/yinmeng-ios/DingDangApp/CodeClass/MyInfo/CC/DDMyInformationViewController.m b/yinmeng-ios/DingDangApp/CodeClass/MyInfo/CC/DDMyInformationViewController.m index 04a9f7a..be9c627 100644 --- a/yinmeng-ios/DingDangApp/CodeClass/MyInfo/CC/DDMyInformationViewController.m +++ b/yinmeng-ios/DingDangApp/CodeClass/MyInfo/CC/DDMyInformationViewController.m @@ -349,7 +349,9 @@ }else if([menuStr isEqualToString:@"封禁"]){ [weakSelf showBanUser]; }else if([menuStr isEqualToString:@"冻结账户"]){ - [NetworkRequest requestPOST:@"/room/frozen/user" parameters:@{@"operated_user_id":weakSelf.personModel.user_id} block:^(BaseResponse * _Nonnull response) { + /// /room/frozen/user + NSString *url = [DDEncryptManager dd_aesDecryptWithText:@"VtZ38L82TjHNEMHEZI7xDCa+swHJguBHlNrOPT0AXSI="]; + [NetworkRequest requestPOST:url parameters:@{@"operated_user_id":weakSelf.personModel.user_id} block:^(BaseResponse * _Nonnull response) { if (response.code == 200){ [weakSelf.view jk_makeToast:@"封禁成功"]; if (weakSelf.navigationController.viewControllers.count>1) { @@ -384,7 +386,9 @@ DDCustomAlertView * alertView = [[DDCustomAlertView alloc] init:@[@"取消",@"封禁"] title:[NSString stringWithFormat:@"是否封禁 ID:%@ %@",weakSelf.personModel.user_number,weakSelf.personModel.nickname] content:@"" alertType:0]; alertView.alertViewClickBlock = ^(NSInteger index, NSString * _Nonnull title) { if ([title isEqualToString:@"封禁"]) { - [NetworkRequest requestPOST:@"/room/ban/user" parameters:@{@"operated_user_id":weakSelf.personModel.user_id}.mutableCopy block:^(BaseResponse * _Nonnull response) { + /// /room/ban/user + NSString *url = [DDEncryptManager dd_aesDecryptWithText:@"phbXGX/MU86O3iZxSm6ZJw=="]; + [NetworkRequest requestPOST:url parameters:@{@"operated_user_id":weakSelf.personModel.user_id}.mutableCopy block:^(BaseResponse * _Nonnull response) { if (response.code == 200){ [weakSelf.view jk_makeToast:@"封禁成功"]; if (weakSelf.navigationController.viewControllers.count>1) { diff --git a/yinmeng-ios/DingDangApp/CodeClass/MyInfo/CC/DDMyRoomListViewController.m b/yinmeng-ios/DingDangApp/CodeClass/MyInfo/CC/DDMyRoomListViewController.m index 144d0b3..9f888cd 100644 --- a/yinmeng-ios/DingDangApp/CodeClass/MyInfo/CC/DDMyRoomListViewController.m +++ b/yinmeng-ios/DingDangApp/CodeClass/MyInfo/CC/DDMyRoomListViewController.m @@ -117,9 +117,11 @@ [requestDict setObject:@(self.pageNum) forKey:@"page_number"]; NSString *postUrl = @""; if ([self.type isEqualToString:@"myRoom"]) { - postUrl = @"/my/room/list"; + /// /my/room/list + postUrl = [DDEncryptManager dd_aesDecryptWithText:@"mcsaWqOdUsSOpNBfRcldbA=="]; }else{ - postUrl = @"/my/collect/list"; + /// /my/collect/list + postUrl = [DDEncryptManager dd_aesDecryptWithText:@"AQO+entAAdrXRwECGySbUyHcb+nbWudrBtFn4gZ8FBA="]; } WeakSelf(weakSelf) [NetworkRequest requestPOST:postUrl parameters:requestDict block:^(BaseResponse * _Nonnull response) { diff --git a/yinmeng-ios/DingDangApp/CodeClass/Room/DDRoomRequest.m b/yinmeng-ios/DingDangApp/CodeClass/Room/DDRoomRequest.m index 9ada40c..a83e4c6 100644 --- a/yinmeng-ios/DingDangApp/CodeClass/Room/DDRoomRequest.m +++ b/yinmeng-ios/DingDangApp/CodeClass/Room/DDRoomRequest.m @@ -11,7 +11,7 @@ #import "UserInfoModel.h" #import "DDMessageCustomRemoteExtModel.h" /// Tool -#import "HttpRequestHelper.h" +#import "DDRequestTool.h" #import "DDLoginRequest.h" //#import "NSObject+DDExtension.h" /// Third @@ -44,7 +44,10 @@ @"uid": roomUid, @"intoUid": uid }; - [HttpRequestHelper GET:@"/room/get" params:param success:^(BaseModel * _Nonnull data) { + + /// /room/get + NSString *url = [DDEncryptManager dd_aesDecryptWithText:@"jXpOPAmK96W+TSfRtsEEeg=="]; + [DDRequestTool DD_Request_GET:url params:param success:^(BaseModel * _Nonnull data) { RoomInfoModel *roomModel = [RoomInfoModel DD_ModeWithJSON:data.data]; [roomSubject sendNext:roomModel]; [roomSubject sendCompleted]; @@ -85,7 +88,10 @@ @"ticket" : ticket, }; - [HttpRequestHelper POST:@"/room/open" params:param success:^(BaseModel * _Nonnull data) { + + /// /room/open + NSString *url = [DDEncryptManager dd_aesDecryptWithText:@"wOBApINPXycOHm9BIPL1EA=="]; + [DDRequestTool DD_Request_POST:url params:param success:^(BaseModel * _Nonnull data) { RoomInfoModel *roomInfo = [RoomInfoModel DD_ModeWithJSON:data.data]; success(roomInfo); } failure:^(NSInteger resCode, NSString * _Nonnull message) { @@ -130,7 +136,10 @@ @"type":@(type), @"uid":[[AccountInfoStorage instance] getUid] }; - [HttpRequestHelper POST:@"/fans/fansRoom" params:param success:^(BaseModel * _Nonnull data) { + + /// /fans/fansRoom + NSString *url = [DDEncryptManager dd_aesDecryptWithText:@"cWyMqgH9Rs8/dNrBGW76iA=="]; + [DDRequestTool DD_Request_POST:url params:param success:^(BaseModel * _Nonnull data) { if (data.code == 200) { if (type == 1) { [ToolsObject addPopVieToText: @"收藏成功"]; diff --git a/yinmeng-ios/DingDangApp/CodeClass/Room/RoomViewController.m b/yinmeng-ios/DingDangApp/CodeClass/Room/RoomViewController.m index d077bfb..70dde8e 100644 --- a/yinmeng-ios/DingDangApp/CodeClass/Room/RoomViewController.m +++ b/yinmeng-ios/DingDangApp/CodeClass/Room/RoomViewController.m @@ -824,7 +824,7 @@ static dispatch_once_t onceToken; // // // /// 排行榜 -// DDWebViewController *controller = [DDWebViewController webControlerWithUrlStr:[NSString stringWithFormat:@"%@/modules/room_rank/index.html",API_HOST_H5_URL] isShowNavBar:NO isHalf:YES data:@{@"roomUid":self.roomID}]; +// DDWebViewController *controller = [DDWebViewController webControlerWithUrlStr:[NSString stringWithFormat:@"%@/modules/room_rank/index.html",DD__HOST_H5_API_URL] isShowNavBar:NO isHalf:YES data:@{@"roomUid":self.roomID}]; // [self.navigationController pushViewController:controller animated:normal]; KRepeatClickTime(1); NSString * routing = @"http://beta.api.nnbc123.cn/yinmeng/modules/roomRank/index.html?roomUid=200343"; @@ -2974,7 +2974,10 @@ static dispatch_once_t onceToken; WeakSelf(ws); NSMutableDictionary *params = [[NSMutableDictionary alloc] init]; [params setObject:self.roomID forKey:@"room_id"]; - [NetworkRequest requestPOST:@"/room/ban/room" parameters:params block:^(BaseResponse * _Nonnull response) { + + /// /room/ban/room + NSString *url = [DDEncryptManager dd_aesDecryptWithText:@"qRqcL5tFr3mB01AZQ0IjNA=="]; + [NetworkRequest requestPOST:url parameters:params block:^(BaseResponse * _Nonnull response) { if(response.code ==200){ [ToolsObject addPopVieToText:@"操作成功"]; [ws dismissViewControllerAnimated:YES completion:^{ @@ -2990,7 +2993,10 @@ static dispatch_once_t onceToken; [params setObject:passWordText forKey:@"pwd"]; [params setObject:self.roomID forKey:@"room_id"]; if(isEdit){ - [NetworkRequest requestPOST:@"/room/set/pwd" parameters:params block:^(BaseResponse * _Nonnull response) { + + /// /room/set/pwd + NSString *url = [DDEncryptManager dd_aesDecryptWithText:@"zUgZRsG7thVR+RmJ6hnNhw=="]; + [NetworkRequest requestPOST:url parameters:params block:^(BaseResponse * _Nonnull response) { if(response.code ==200){ [ToolsObject addPopVieToText:@"房间上锁成功"]; ws.roomInfoModel.room_info.room_pwd = passWordText; @@ -2998,12 +3004,17 @@ static dispatch_once_t onceToken; } }]; }else{ - [NetworkRequest requestPOST:@"/room/check/password" parameters:params block:^(BaseResponse * _Nonnull response) { + + /// /room/check/password + NSString *url = [DDEncryptManager dd_aesDecryptWithText:@"MZbC2NLXxGmFpeOgHUlT28w7YdWRpGzDsQ4X4rC72UI="]; + [NetworkRequest requestPOST:url parameters:params block:^(BaseResponse * _Nonnull response) { if(response.code ==200){ + /// /room/set/pwd + NSString *urlP = [DDEncryptManager dd_aesDecryptWithText:@"zUgZRsG7thVR+RmJ6hnNhw=="]; NSMutableDictionary *paramsTwo = [[NSMutableDictionary alloc] init]; [paramsTwo setObject:@"" forKey:@"pwd"]; [paramsTwo setObject:self.roomID forKey:@"room_id"]; - [NetworkRequest requestPOST:@"/room/set/pwd" parameters:paramsTwo block:^(BaseResponse * _Nonnull response) { + [NetworkRequest requestPOST:urlP parameters:paramsTwo block:^(BaseResponse * _Nonnull response) { if(response.code ==200){ [ToolsObject addPopVieToText:@"房间解锁成功"]; ws.roomInfoModel.room_info.room_pwd = @""; @@ -3020,7 +3031,9 @@ static dispatch_once_t onceToken; //获取商店礼物 - (void)requestGetShopGifts{ NSMutableDictionary *params = [[NSMutableDictionary alloc] init]; - [NetworkRequest requestPOST:@"/gift/list" parameters:params block:^(BaseResponse * _Nonnull response) { + /// /gift/list + NSString *url = [DDEncryptManager dd_aesDecryptWithText:@"Tie7aCy0+0Of2TetwhQDPg=="]; + [NetworkRequest requestPOST:url parameters:params block:^(BaseResponse * _Nonnull response) { if(response.code ==200){ self.roomInfoModel.shopGiftsArray = [NSMutableArray arrayWithArray:[NSArray yy_modelArrayWithClass:[RoomGiftModel class] json:response.data]]; @@ -3031,7 +3044,9 @@ static dispatch_once_t onceToken; - (void)requestGetluckGifts{ NSMutableDictionary *params = [[NSMutableDictionary alloc] init]; [params setObject:@"2" forKey:@"type"]; - [NetworkRequest requestPOST:@"/gift/list" parameters:params block:^(BaseResponse * _Nonnull response) { + /// /gift/list + NSString *url = [DDEncryptManager dd_aesDecryptWithText:@"Tie7aCy0+0Of2TetwhQDPg=="]; + [NetworkRequest requestPOST:url parameters:params block:^(BaseResponse * _Nonnull response) { if(response.code ==200){ self.roomInfoModel.luckGiftsArray = [NSMutableArray arrayWithArray:[NSArray yy_modelArrayWithClass:[RoomGiftModel class] json:response.data]]; } @@ -3041,7 +3056,9 @@ static dispatch_once_t onceToken; - (void)requestGetPricileGifts{ NSMutableDictionary *params = [[NSMutableDictionary alloc] init]; [params setObject:@"4" forKey:@"type"]; - [NetworkRequest requestPOST:@"/gift/list" parameters:params block:^(BaseResponse * _Nonnull response) { + /// /gift/list + NSString *url = [DDEncryptManager dd_aesDecryptWithText:@"Tie7aCy0+0Of2TetwhQDPg=="]; + [NetworkRequest requestPOST:url parameters:params block:^(BaseResponse * _Nonnull response) { if(response.code ==200){ self.roomInfoModel.pricileGiftsArray =[NSMutableArray arrayWithArray: [NSArray yy_modelArrayWithClass:[RoomGiftModel class] json:response.data]]; @@ -3051,7 +3068,9 @@ static dispatch_once_t onceToken; //获取背包礼物 - (void)requestGetpackageGifts{ NSMutableDictionary *params = [[NSMutableDictionary alloc] init]; - [NetworkRequest requestPOST:@"/gift/backpack" parameters:params block:^(BaseResponse * _Nonnull response) { + /// /gift/backpack + NSString *url = [DDEncryptManager dd_aesDecryptWithText:@"rGlTScWC8Gf8j5oxtTxsAA=="]; + [NetworkRequest requestPOST:url parameters:params block:^(BaseResponse * _Nonnull response) { if(response.code ==200){ NSArray *array = [NSArray yy_modelArrayWithClass:[RoomGiftModel class] json:response.data]; __block NSInteger packageGiftValue = 0; @@ -3084,7 +3103,9 @@ static dispatch_once_t onceToken; - (void)requestBanUserToUserID:(NSString *)userID{ NSMutableDictionary *paramas = [[NSMutableDictionary alloc] init]; [paramas setObject:userID forKey:@"operated_user_id"]; - [NetworkRequest requestPOST:@"/room/ban/user" parameters:paramas block:^(BaseResponse * _Nonnull response) { + /// /room/ban/user + NSString *url = [DDEncryptManager dd_aesDecryptWithText:@"phbXGX/MU86O3iZxSm6ZJw=="]; + [NetworkRequest requestPOST:url parameters:paramas block:^(BaseResponse * _Nonnull response) { if(response.code ==200){ [ToolsObject addPopVieToText:@"封禁成功"]; } @@ -3093,8 +3114,10 @@ static dispatch_once_t onceToken; ///冻结用户 - (void)requestFrozenUserToUserID:(NSString *)userID{ NSMutableDictionary *paramas = [[NSMutableDictionary alloc] init]; + /// /room/frozen/user + NSString *url = [DDEncryptManager dd_aesDecryptWithText:@"VtZ38L82TjHNEMHEZI7xDCa+swHJguBHlNrOPT0AXSI="]; [paramas setObject:userID forKey:@"operated_user_id"]; - [NetworkRequest requestPOST:@"/room/frozen/user" parameters:paramas block:^(BaseResponse * _Nonnull response) { + [NetworkRequest requestPOST:url parameters:paramas block:^(BaseResponse * _Nonnull response) { if(response.code ==200){ [ToolsObject addPopVieToText:@"封禁成功"]; } @@ -3105,7 +3128,10 @@ static dispatch_once_t onceToken; WeakSelf(ws); NSMutableDictionary *parmas = [[NSMutableDictionary alloc] init]; [parmas setObject:self.roomID forKey:@"room_id"]; - [NetworkRequest requestPOST:@"/room/mic/list" parameters:parmas block:^(BaseResponse * _Nonnull response) { + + /// /room/mic/list + NSString *url = [DDEncryptManager dd_aesDecryptWithText:@"rUJwosE/KetSQuO6L4XYTA=="]; + [NetworkRequest requestPOST:url parameters:parmas block:^(BaseResponse * _Nonnull response) { if(response.code ==200){ NSArray * dataArray = [NSArray yy_modelArrayWithClass:RoomMicroModel.class json:response.data].mutableCopy; [ws initMicroListToArray:dataArray]; @@ -3137,7 +3163,9 @@ static dispatch_once_t onceToken; [dataDic setObject:self.roomID forKey:@"room_id"]; [dataDic setObject:@"2" forKey:@"position"]; WeakSelf(ws); - [NetworkRequest requestPOST:@"/home/banner/list" parameters:dataDic block:^(BaseResponse * _Nonnull response) { + /// /home/banner/list + NSString *url = [DDEncryptManager dd_aesDecryptWithText:@"PuB7oi7TobImxHTR/ubaIA=="]; + [NetworkRequest requestPOST:url parameters:dataDic block:^(BaseResponse * _Nonnull response) { if(response.code ==200){ NSArray *dataArray = [DDBannerModel mj_objectArrayWithKeyValuesArray:response.data].mutableCopy; [ws.roomEventView reloadEventArray:dataArray]; @@ -3150,7 +3178,10 @@ static dispatch_once_t onceToken; [parmas setObject:microModel.user_id forKey:@"user_id"]; [parmas setObject:self.roomID forKey:@"room_id"]; WeakSelf(ws); - [NetworkRequest requestPOST:@"/room/get/status" parameters:parmas block:^(BaseResponse * _Nonnull response) { + + /// /room/get/status + NSString *url = [DDEncryptManager dd_aesDecryptWithText:@"hj+dfNmt8Zk78QlB9xYoHYe/PxCPXBNA04n5mDqMGcA="]; + [NetworkRequest requestPOST:url parameters:parmas block:^(BaseResponse * _Nonnull response) { if(response.code ==200){ NSDictionary *dataDict = response.data; NSInteger is_ban_talk =[dataDict[@"is_ban_talk"] integerValue]; diff --git a/yinmeng-ios/DingDangApp/CodeClass/Room/Tool/agora/AgoraTool.m b/yinmeng-ios/DingDangApp/CodeClass/Room/Tool/agora/AgoraTool.m index 9d6c240..d9bc5a8 100644 --- a/yinmeng-ios/DingDangApp/CodeClass/Room/Tool/agora/AgoraTool.m +++ b/yinmeng-ios/DingDangApp/CodeClass/Room/Tool/agora/AgoraTool.m @@ -30,7 +30,10 @@ static dispatch_once_t onceToken; } NSMutableDictionary *params = [[NSMutableDictionary alloc] init]; [params setObject:self.roomID forKey:@"room_id"]; - [NetworkRequest requestPOST:@"/room/refresh/token" parameters:params block:^(BaseResponse * _Nonnull response) { + + /// /room/refresh/token + NSString *url = [DDEncryptManager dd_aesDecryptWithText:@"urBVVuyA+4zlo1pjwUox/ozI2BMZWk++NSsijbKit7k="]; + [NetworkRequest requestPOST:url parameters:params block:^(BaseResponse * _Nonnull response) { if([ToolsObject IsNullWithObject:response.data]){ [self refreshToken]; return;; diff --git a/yinmeng-ios/DingDangApp/CodeClass/Room/VC/CreatRoomViewController.m b/yinmeng-ios/DingDangApp/CodeClass/Room/VC/CreatRoomViewController.m index 3ac0325..efd55f5 100644 --- a/yinmeng-ios/DingDangApp/CodeClass/Room/VC/CreatRoomViewController.m +++ b/yinmeng-ios/DingDangApp/CodeClass/Room/VC/CreatRoomViewController.m @@ -83,7 +83,10 @@ @"room_head":self.roomInfo.room_head }.mutableCopy; WeakSelf(ws); - [NetworkRequest requestPOST:@"/room/create/room" parameters:params block:^(BaseResponse * _Nonnull response) { + + /// /room/create/room + NSString *url = [DDEncryptManager dd_aesDecryptWithText:@"ChxMUvYUT7npeuVmsUNThyE/Dr+rK2bdvJQnr0QDjXo="]; + [NetworkRequest requestPOST:url parameters:params block:^(BaseResponse * _Nonnull response) { [ToolsObject DismissSVProgressHUD]; if(response.code ==200){ if(![ToolsObject IsNullWithObject:response.data]){ @@ -120,7 +123,9 @@ @"room_head":self.roomInfo.room_head, @"fans_can_see":@(self.roomInfo.fans_can_see)}.mutableCopy; WeakSelf(ws); - [NetworkRequest requestPOST:@"/room/edit/info" parameters:params block:^(BaseResponse * _Nonnull response) { + /// /room/edit/info + NSString *url = [DDEncryptManager dd_aesDecryptWithText:@"bu2SreaUL51PfbpYIFUlCA=="]; + [NetworkRequest requestPOST:url parameters:params block:^(BaseResponse * _Nonnull response) { [ToolsObject DismissSVProgressHUD]; if(response.code ==200){ [ToolsObject addPopVieToText:@"修改成功"]; @@ -138,7 +143,9 @@ NSMutableDictionary *params =@{ @"room_id":self.roomInfo.room_id, }.mutableCopy; - [NetworkRequest requestPOST:@"/room/cancel" parameters:params block:^(BaseResponse * _Nonnull response) { + /// /room/cancel + NSString *url = [DDEncryptManager dd_aesDecryptWithText:@"5/ZGj6QKrzIhciHArsxkrQ=="]; + [NetworkRequest requestPOST:url parameters:params block:^(BaseResponse * _Nonnull response) { [ToolsObject DismissSVProgressHUD]; if(response.code ==200){ dispatch_async(dispatch_get_main_queue(), ^{ @@ -215,7 +222,9 @@ - (void)getRoomBgList{ NSMutableDictionary *params = [[NSMutableDictionary alloc] init]; WeakSelf(ws); - [NetworkRequest requestPOST:@"/room/wallpaper/list" parameters:params block:^(BaseResponse * _Nonnull response) { + /// /room/wallpaper/list + NSString *url = [DDEncryptManager dd_aesDecryptWithText:@"owppLuL3ybChTuqrMmW6r6vyiioZYvDs+ZNRdixsEjo="]; + [NetworkRequest requestPOST:url parameters:params block:^(BaseResponse * _Nonnull response) { if(response.code ==200){ NSArray *dataArray =[NSArray yy_modelArrayWithClass:[RoomCreatBgImageModel class] json:response.data]; __block BOOL isSelect = NO; @@ -246,7 +255,10 @@ - (void)getRoomTypeList{ NSMutableDictionary *params = [[NSMutableDictionary alloc] init]; WeakSelf(ws); - [NetworkRequest requestPOST:@"/room/type/list" parameters:params block:^(BaseResponse * _Nonnull response) { + + /// /room/type/list + NSString *url = [DDEncryptManager dd_aesDecryptWithText:@"3LQBcQSBkDIKNtUvUQ3ZhA=="]; + [NetworkRequest requestPOST:url parameters:params block:^(BaseResponse * _Nonnull response) { if(response.code ==200){ NSArray *dataArrayay =[NSArray yy_modelArrayWithClass:[RoomTypeModel class] json:response.data]; [dataArrayay enumerateObjectsUsingBlock:^(id _Nonnull obj, NSUInteger idx, BOOL * _Nonnull stop) { @@ -273,7 +285,10 @@ NSMutableDictionary *params = [[NSMutableDictionary alloc] init]; [params setObject:self.roomInfo.room_id forKey:@"room_id"]; WeakSelf(ws); - [NetworkRequest requestPOST:@"/room/account" parameters:params block:^(BaseResponse * _Nonnull response) { + + /// /room/account + NSString *url = [DDEncryptManager dd_aesDecryptWithText:@"95n4OlfuaAWaZZhZ0MuTMQ=="]; + [NetworkRequest requestPOST:url parameters:params block:^(BaseResponse * _Nonnull response) { if(response.code ==200){ NSInteger room_account = [response.data[@"room_account"] integerValue]; ws.roomInfo.room_account = room_account; diff --git a/yinmeng-ios/DingDangApp/CodeClass/Room/View/NewSendGiftView/DDRoomSendGiftsView.m b/yinmeng-ios/DingDangApp/CodeClass/Room/View/NewSendGiftView/DDRoomSendGiftsView.m index 9c8abcf..104392e 100644 --- a/yinmeng-ios/DingDangApp/CodeClass/Room/View/NewSendGiftView/DDRoomSendGiftsView.m +++ b/yinmeng-ios/DingDangApp/CodeClass/Room/View/NewSendGiftView/DDRoomSendGiftsView.m @@ -1042,7 +1042,9 @@ - (void)requestDiamond{ NSMutableDictionary *params = [[NSMutableDictionary alloc] init]; - [NetworkRequest requestPOST:@"/room/get/diamond" parameters:params block:^(BaseResponse * _Nonnull response) { + /// /room/get/diamond + NSString *url = [DDEncryptManager dd_aesDecryptWithText:@"BhnNy37Jcng79i9BXQdHBDAz+Mvz3Bfl1UPcCqsgZQU="]; + [NetworkRequest requestPOST:url parameters:params block:^(BaseResponse * _Nonnull response) { if ([ToolsObject IsNullWithObject:response.data]) { return; } diff --git a/yinmeng-ios/DingDangApp/CodeClass/Room/View/PopView/RoomBlackListView.m b/yinmeng-ios/DingDangApp/CodeClass/Room/View/PopView/RoomBlackListView.m index 46b59bc..c21445e 100644 --- a/yinmeng-ios/DingDangApp/CodeClass/Room/View/PopView/RoomBlackListView.m +++ b/yinmeng-ios/DingDangApp/CodeClass/Room/View/PopView/RoomBlackListView.m @@ -63,7 +63,9 @@ [params setObject:self.roomID forKey:@"room_id"]; [params setObject:@(self.page) forKey:@"page"]; WeakSelf(ws); - [NetworkRequest requestPOST:@"/room/black/list" parameters:params block:^(BaseResponse * _Nonnull response) { + /// /room/black/list + NSString *url = [DDEncryptManager dd_aesDecryptWithText:@"Ms0RwvTt4UOQKcJGD20khBUgrWktxXSF6uj3qNjKfCg="]; + [NetworkRequest requestPOST:url parameters:params block:^(BaseResponse * _Nonnull response) { if(response.code ==200){ NSArray * dataArray = [NSArray yy_modelArrayWithClass:RoomUserInfoModel.class json:response.data[@"list"]].mutableCopy; if(ws.page ==1){ @@ -122,7 +124,10 @@ NSMutableDictionary *dataDic = [[NSMutableDictionary alloc] init]; [dataDic setObject:model.user_id forKey:@"blacklist_user_id"]; [dataDic setObject:self.roomID forKey:@"room_id"]; - [NetworkRequest requestPOST:@"/room/del/black/list" parameters:dataDic block:^(BaseResponse * _Nonnull response) { + + /// /room/del/black/list + NSString *url = [DDEncryptManager dd_aesDecryptWithText:@"PDCqh9cF1ZRorFLXbQlXaxKR0uqOjUlrk7QJhvnOmXs="]; + [NetworkRequest requestPOST:url parameters:dataDic block:^(BaseResponse * _Nonnull response) { if(response.code ==200){ [ToolsObject addPopVieToText:@"操作成功"]; [self.dataSource removeObjectAtIndex:index]; diff --git a/yinmeng-ios/DingDangApp/CodeClass/Room/View/PopView/RoomCharmView.m b/yinmeng-ios/DingDangApp/CodeClass/Room/View/PopView/RoomCharmView.m index 593c273..72e3983 100644 --- a/yinmeng-ios/DingDangApp/CodeClass/Room/View/PopView/RoomCharmView.m +++ b/yinmeng-ios/DingDangApp/CodeClass/Room/View/PopView/RoomCharmView.m @@ -131,7 +131,10 @@ [params setValue:self.userID forKey:@"mic_user_id"]; [params setObject:@(self.page) forKey:@"page"]; WeakSelf(ws); - [NetworkRequest requestPOST:@"/room/charm/sum/list" parameters:params block:^(BaseResponse * _Nonnull response) { + + /// /room/charm/sum/list + NSString *url = [DDEncryptManager dd_aesDecryptWithText:@"Pq2vDcKFwQQ/cCRUB+vx++7JHaHqMlZzGbz2ZXgaqQo="]; + [NetworkRequest requestPOST:url parameters:params block:^(BaseResponse * _Nonnull response) { if(response.code ==200){ NSArray * dataArray = [NSArray yy_modelArrayWithClass:RoomUserInfoModel.class json:response.data[@"record"]].mutableCopy; BOOL next = [[response.data objectForKey:@"next"] boolValue]; diff --git a/yinmeng-ios/DingDangApp/CodeClass/Room/View/PopView/RoomMicroListView.m b/yinmeng-ios/DingDangApp/CodeClass/Room/View/PopView/RoomMicroListView.m index 1fb28be..64e6a9c 100644 --- a/yinmeng-ios/DingDangApp/CodeClass/Room/View/PopView/RoomMicroListView.m +++ b/yinmeng-ios/DingDangApp/CodeClass/Room/View/PopView/RoomMicroListView.m @@ -119,7 +119,9 @@ [params setObject:self.roomID forKey:@"room_id"]; [params setObject:@(self.page) forKey:@"page"]; WeakSelf(ws); - [NetworkRequest requestPOST:@"/room/row/mic" parameters:params block:^(BaseResponse * _Nonnull response) { + /// /room/row/mic + NSString *url = [DDEncryptManager dd_aesDecryptWithText:@"z6kwc0pf9JOlKPnMQW6emw=="]; + [NetworkRequest requestPOST:url parameters:params block:^(BaseResponse * _Nonnull response) { if(response.code ==200){ NSArray * dataArray = [NSArray yy_modelArrayWithClass:RoomMicroModel.class json:response.data[@"list"]].mutableCopy; BOOL next = [[response.data objectForKey:@"next"] boolValue]; diff --git a/yinmeng-ios/DingDangApp/CodeClass/Room/View/PopView/RoomOnlineUserListView.m b/yinmeng-ios/DingDangApp/CodeClass/Room/View/PopView/RoomOnlineUserListView.m index 344c218..85f422a 100644 --- a/yinmeng-ios/DingDangApp/CodeClass/Room/View/PopView/RoomOnlineUserListView.m +++ b/yinmeng-ios/DingDangApp/CodeClass/Room/View/PopView/RoomOnlineUserListView.m @@ -120,7 +120,9 @@ [params setObject:self.roomID forKey:@"room_id"]; [params setObject:@(self.page) forKey:@"page"]; WeakSelf(ws); - [NetworkRequest requestPOST:@"/room/user/list" parameters:params block:^(BaseResponse * _Nonnull response) { + /// /room/user/list + NSString *url = [DDEncryptManager dd_aesDecryptWithText:@"txXsvOCm2HUIxjXweSd4Rw=="]; + [NetworkRequest requestPOST:url parameters:params block:^(BaseResponse * _Nonnull response) { [ws.listView endMJRefresh]; if(response.code ==200){ diff --git a/yinmeng-ios/DingDangApp/CodeClass/Room/View/PopView/RoomSetManagerListView.m b/yinmeng-ios/DingDangApp/CodeClass/Room/View/PopView/RoomSetManagerListView.m index 8337367..5c253fe 100644 --- a/yinmeng-ios/DingDangApp/CodeClass/Room/View/PopView/RoomSetManagerListView.m +++ b/yinmeng-ios/DingDangApp/CodeClass/Room/View/PopView/RoomSetManagerListView.m @@ -74,7 +74,9 @@ [params setValue:self.roomInfoModel.room_auth forKey:@"room_auth"]; WeakSelf(ws); - [NetworkRequest requestPOST:@"/room/admin/list" parameters:params block:^(BaseResponse * _Nonnull response) { + /// /room/admin/list + NSString *url = [DDEncryptManager dd_aesDecryptWithText:@"0hk6rYtBOSvAOsY4Sf1KMnj/C72P5nRxv1lUbFelMPQ="]; + [NetworkRequest requestPOST:url parameters:params block:^(BaseResponse * _Nonnull response) { if(response.code ==200){ NSArray * dataArray = [NSArray yy_modelArrayWithClass:RoomUserInfoModel.class json:response.data[@"list"]].mutableCopy; NSInteger total = [[response.data objectForKey:@"count"] integerValue]; @@ -164,7 +166,10 @@ NSMutableDictionary *dataDic = [[NSMutableDictionary alloc] init]; [dataDic setObject:model.user_id forKey:@"blacklist_user_id"]; [dataDic setObject:self.roomID forKey:@"room_id"]; - [NetworkRequest requestPOST:@"/room/del/black/list" parameters:dataDic block:^(BaseResponse * _Nonnull response) { + + /// /room/del/black/list + NSString *url = [DDEncryptManager dd_aesDecryptWithText:@"PDCqh9cF1ZRorFLXbQlXaxKR0uqOjUlrk7QJhvnOmXs="]; + [NetworkRequest requestPOST:url parameters:dataDic block:^(BaseResponse * _Nonnull response) { if(response.code ==200){ [ToolsObject addPopVieToText:@"操作成功"]; [self.dataSource removeObjectAtIndex:index]; diff --git a/yinmeng-ios/DingDangApp/CodeClass/Room/View/PopView/RoomUserInfoView.m b/yinmeng-ios/DingDangApp/CodeClass/Room/View/PopView/RoomUserInfoView.m index 62296cf..e2c8f88 100644 --- a/yinmeng-ios/DingDangApp/CodeClass/Room/View/PopView/RoomUserInfoView.m +++ b/yinmeng-ios/DingDangApp/CodeClass/Room/View/PopView/RoomUserInfoView.m @@ -182,7 +182,9 @@ [dataDic setObject:self.roomID forKey:@"room_id"]; [dataDic setObject:self.userID forKey:@"operated_user_id"]; WeakSelf(ws); - [NetworkRequest requestPOST:@"/room/user/card" parameters:dataDic block:^(BaseResponse * _Nonnull response) { + /// /room/user/card + NSString *url = [DDEncryptManager dd_aesDecryptWithText:@"//hHvGcCmFN5UgoNulBXBA=="]; + [NetworkRequest requestPOST:url parameters:dataDic block:^(BaseResponse * _Nonnull response) { if(response.code ==200){ ws.userCardModel = [RoomCardUserModel yy_modelWithDictionary:response.data]; [ws reloadUserInfo]; diff --git a/yinmeng-ios/DingDangApp/CodeClass/Room/View/RoomRightOnLineUserListView/RoomRightOnLineUserListView.m b/yinmeng-ios/DingDangApp/CodeClass/Room/View/RoomRightOnLineUserListView/RoomRightOnLineUserListView.m index c31be8e..2b479cd 100644 --- a/yinmeng-ios/DingDangApp/CodeClass/Room/View/RoomRightOnLineUserListView/RoomRightOnLineUserListView.m +++ b/yinmeng-ios/DingDangApp/CodeClass/Room/View/RoomRightOnLineUserListView/RoomRightOnLineUserListView.m @@ -142,7 +142,10 @@ [params setObject:self.roomID forKey:@"room_id"]; [params setObject:@(self.page) forKey:@"page"]; WeakSelf(ws); - [NetworkRequest requestPOST:@"/room/user/list" parameters:params block:^(BaseResponse * _Nonnull response) { + + /// /room/user/list + NSString *url = [DDEncryptManager dd_aesDecryptWithText:@"txXsvOCm2HUIxjXweSd4Rw=="]; + [NetworkRequest requestPOST:@"" parameters:params block:^(BaseResponse * _Nonnull response) { if(response.code ==200){ NSArray * dataArray = [NSArray yy_modelArrayWithClass:RoomUserInfoModel.class json:response.data[@"list"]].mutableCopy; NSString *count = [response.data objectForKey:@"count"]; diff --git a/yinmeng-ios/DingDangApp/CodeClass/SearchPage/DDSearchListVC.m b/yinmeng-ios/DingDangApp/CodeClass/SearchPage/DDSearchListVC.m index 9320b80..712e1b6 100644 --- a/yinmeng-ios/DingDangApp/CodeClass/SearchPage/DDSearchListVC.m +++ b/yinmeng-ios/DingDangApp/CodeClass/SearchPage/DDSearchListVC.m @@ -77,8 +77,9 @@ [dic setObject:@(20) forKey:@"current_page"]; [dic setObject:@(self.pageNum) forKey:@"page_number"]; - - [NetworkRequest requestPOST:@"/home/search" parameters:dic block:^(BaseResponse * _Nonnull response) { + /// /home/search + NSString *url = [DDEncryptManager dd_aesDecryptWithText:@"9IiqdwQ2vgAWrRrCUnNGlA=="]; + [NetworkRequest requestPOST:url parameters:dic block:^(BaseResponse * _Nonnull response) { if (response.isSuccess) { if ([ToolsObject IsNullWithObject:response.data]) { diff --git a/yinmeng-ios/DingDangApp/CodeClass/SearchPage/DDSearchPageViewController.m b/yinmeng-ios/DingDangApp/CodeClass/SearchPage/DDSearchPageViewController.m index 8c3c83d..0863cb4 100644 --- a/yinmeng-ios/DingDangApp/CodeClass/SearchPage/DDSearchPageViewController.m +++ b/yinmeng-ios/DingDangApp/CodeClass/SearchPage/DDSearchPageViewController.m @@ -192,7 +192,9 @@ [requestDict setObject:@(20) forKey:@"current_page"]; [requestDict setObject:@(1) forKey:@"page_number"]; - [NetworkRequest requestPOST:@"/home/search" parameters:requestDict block:^(BaseResponse * _Nonnull response) { + /// /home/search + NSString *url = [DDEncryptManager dd_aesDecryptWithText:@"9IiqdwQ2vgAWrRrCUnNGlA=="]; + [NetworkRequest requestPOST:url parameters:requestDict block:^(BaseResponse * _Nonnull response) { if (response.code == 200){ [weakSelf.userListArr removeAllObjects]; [weakSelf.userListArr addObjectsFromArray:[NSArray yy_modelArrayWithClass:DDFansFollowVisitModel.class json:response.data[@"record"][@"userList"][@"list"]]]; diff --git a/yinmeng-ios/DingDangApp/CodeClass/SearchPage/DDSearchRoomListViewController.m b/yinmeng-ios/DingDangApp/CodeClass/SearchPage/DDSearchRoomListViewController.m index ff45cae..03d30df 100644 --- a/yinmeng-ios/DingDangApp/CodeClass/SearchPage/DDSearchRoomListViewController.m +++ b/yinmeng-ios/DingDangApp/CodeClass/SearchPage/DDSearchRoomListViewController.m @@ -116,7 +116,9 @@ [requestDict setObject:@(20) forKey:@"current_page"]; [requestDict setObject:@(self.pageNum) forKey:@"page_number"]; WeakSelf(weakSelf) - [NetworkRequest requestPOST:@"/home/search" parameters:requestDict block:^(BaseResponse * _Nonnull response) { + /// /home/search + NSString *url = [DDEncryptManager dd_aesDecryptWithText:@"9IiqdwQ2vgAWrRrCUnNGlA=="]; + [NetworkRequest requestPOST:url parameters:requestDict block:^(BaseResponse * _Nonnull response) { if (response.code == 200) { if ([ToolsObject IsNullWithObject:response.data]) { [weakSelf.myTableView.mj_header endRefreshing]; diff --git a/yinmeng-ios/DingDangApp/CodeClass/SearchPage/DDSearchUserListViewController.m b/yinmeng-ios/DingDangApp/CodeClass/SearchPage/DDSearchUserListViewController.m index 4a21f44..d7154cc 100644 --- a/yinmeng-ios/DingDangApp/CodeClass/SearchPage/DDSearchUserListViewController.m +++ b/yinmeng-ios/DingDangApp/CodeClass/SearchPage/DDSearchUserListViewController.m @@ -56,7 +56,9 @@ [requestDict setObject:@(20) forKey:@"current_page"]; [requestDict setObject:@(self.pageNum) forKey:@"page_number"]; WeakSelf(weakSelf) - [NetworkRequest requestPOST:@"/home/search" parameters:requestDict block:^(BaseResponse * _Nonnull response) { + /// /home/search + NSString *url = [DDEncryptManager dd_aesDecryptWithText:@"9IiqdwQ2vgAWrRrCUnNGlA=="]; + [NetworkRequest requestPOST:url parameters:requestDict block:^(BaseResponse * _Nonnull response) { if (response.code == 200) { if ([ToolsObject IsNullWithObject:response.data]) { [weakSelf.myTableView.mj_header endRefreshing]; diff --git a/yinmeng-ios/DingDangApp/PrefixHeader.pch b/yinmeng-ios/DingDangApp/PrefixHeader.pch index 13e9e43..121980d 100644 --- a/yinmeng-ios/DingDangApp/PrefixHeader.pch +++ b/yinmeng-ios/DingDangApp/PrefixHeader.pch @@ -18,6 +18,6 @@ #import "DDUtility.h" #import "DDMacroHeader.h" #import "AccountInfoStorage.h" -#import "ApiHost.h" +#import "DDHostURL.h" #import "DDEncryptManager.h" #endif /* PrefixHeader_pch */ diff --git a/yinmeng-ios/DingDangApp/V2Versions/Home/DDV2HomeListVC.m b/yinmeng-ios/DingDangApp/V2Versions/Home/DDV2HomeListVC.m index 4e53415..cef83a2 100644 --- a/yinmeng-ios/DingDangApp/V2Versions/Home/DDV2HomeListVC.m +++ b/yinmeng-ios/DingDangApp/V2Versions/Home/DDV2HomeListVC.m @@ -72,8 +72,9 @@ [dic setObject:self.type forKey:@"type_id"]; } - - [NetworkRequest requestPOST:@"/room/list" parameters:dic block:^(BaseResponse * _Nonnull response) { + /// /room/list + NSString *url = [DDEncryptManager dd_aesDecryptWithText:@"U7Vw0Xckn7CQFkKrvg3Lzw=="]; + [NetworkRequest requestPOST:url parameters:dic block:^(BaseResponse * _Nonnull response) { if (response.isSuccess) { if ([ToolsObject IsNullWithObject:response.data]) { [ws endrefresh]; @@ -199,14 +200,5 @@ return _collectionView; } -/* -#pragma mark - Navigation - -// In a storyboard-based application, you will often want to do a little preparation before navigation -- (void)prepareForSegue:(UIStoryboardSegue *)segue sender:(id)sender { - // Get the new view controller using [segue destinationViewController]. - // Pass the selected object to the new view controller. -} -*/ @end diff --git a/yinmeng-ios/DingDangApp/V2Versions/Home/DDV2HomePVC.m b/yinmeng-ios/DingDangApp/V2Versions/Home/DDV2HomePVC.m index bee0780..271d7ec 100644 --- a/yinmeng-ios/DingDangApp/V2Versions/Home/DDV2HomePVC.m +++ b/yinmeng-ios/DingDangApp/V2Versions/Home/DDV2HomePVC.m @@ -166,7 +166,10 @@ - (void)authorClick{ WeakSelf(weakSelf) - [NetworkRequest requestPOST:@"/user/check/realname" parameters:@{}.mutableCopy block:^(BaseResponse * _Nonnull response) { + + /// /user/check/realname + NSString *url = [DDEncryptManager dd_aesDecryptWithText:@"Q0K4JZX64TUtYL1gUlE3MVLu+BpvZwSs2zMh/EKhqng="]; + [NetworkRequest requestPOST:url parameters:@{}.mutableCopy block:^(BaseResponse * _Nonnull response) { if ([ToolsObject IsNullWithObject:response.data]) { return; } @@ -255,7 +258,9 @@ WeakSelf(ws) NSMutableDictionary *dic = [NSMutableDictionary dictionary]; [dic setObject:@"2" forKey:@"type"]; - [NetworkRequest requestPOST:@"/home/recommend" parameters:dic block:^(BaseResponse * _Nonnull response) { + /// /home/recommend + NSString *url = [DDEncryptManager dd_aesDecryptWithText:@"3Hv23VuclDgvbVxXTtna/g=="]; + [NetworkRequest requestPOST:@"" parameters:dic block:^(BaseResponse * _Nonnull response) { if (response.isSuccess) { if ([ToolsObject IsNullWithObject:response.data]) { return; @@ -289,9 +294,10 @@ } uid:@""]; return; - + /// /home/type/list + NSString *urlhome = [DDEncryptManager dd_aesDecryptWithText:@"toOWbCb2BoGittWB0fw6Ow=="]; NSMutableDictionary *dic = [NSMutableDictionary dictionary]; - [NetworkRequest requestPOST:@"/home/type/list" parameters:dic block:^(BaseResponse * _Nonnull response) { + [NetworkRequest requestPOST:urlhome parameters:dic block:^(BaseResponse * _Nonnull response) { [self endRefresh]; if (response.isSuccess) { if ([ToolsObject IsNullWithObject:response.data]) { @@ -431,9 +437,12 @@ } - (void)xindong { + + /// /room/random/room + NSString *url = [DDEncryptManager dd_aesDecryptWithText:@"ZFpqoY77MXoepco/FBXmG6jMZNPM0O3VvHGrBX07elw="]; NSMutableDictionary *dic = [NSMutableDictionary dictionary]; [dic setObject:@"2" forKey:@"type"]; - [NetworkRequest requestPOST:@"/room/random/room" parameters:dic block:^(BaseResponse * _Nonnull response) { + [NetworkRequest requestPOST:url parameters:dic block:^(BaseResponse * _Nonnull response) { if (response.isSuccess) { if ([ToolsObject IsNullWithObject:response.data]){ return; diff --git a/yinmeng-ios/DingDangApp/V2Versions/Home/DDV2HomeVC.m b/yinmeng-ios/DingDangApp/V2Versions/Home/DDV2HomeVC.m index 6367a99..e0e0797 100644 --- a/yinmeng-ios/DingDangApp/V2Versions/Home/DDV2HomeVC.m +++ b/yinmeng-ios/DingDangApp/V2Versions/Home/DDV2HomeVC.m @@ -63,6 +63,9 @@ } return; + + /// /room/list + NSString *url = [DDEncryptManager dd_aesDecryptWithText:@"U7Vw0Xckn7CQFkKrvg3Lzw=="]; NSMutableDictionary *dic = [NSMutableDictionary dictionary]; [dic setObject:@(20) forKey:@"current_page"]; [dic setObject:@(self.pageNum) forKey:@"page_number"]; @@ -73,7 +76,7 @@ [dic setObject:self.type forKey:@"type_id"]; } - [NetworkRequest requestPOST:@"/room/list" parameters:dic block:^(BaseResponse * _Nonnull response) { + [NetworkRequest requestPOST:url parameters:dic block:^(BaseResponse * _Nonnull response) { if (response.isSuccess) { if ([ToolsObject IsNullWithObject:response.data]) { [ws endrefresh]; @@ -104,10 +107,12 @@ -(void)requestNoCollectionData { + /// /room/random/room + NSString *url = [DDEncryptManager dd_aesDecryptWithText:@"ZFpqoY77MXoepco/FBXmG6jMZNPM0O3VvHGrBX07elw="]; NSMutableDictionary *dic = [NSMutableDictionary dictionary]; [dic setObject:@"1" forKey:@"type"]; WeakSelf(ws) - [NetworkRequest requestPOST:@"/room/random/room" parameters:dic block:^(BaseResponse * _Nonnull response) { + [NetworkRequest requestPOST:url parameters:dic block:^(BaseResponse * _Nonnull response) { if (response.isSuccess) { if ([ToolsObject IsNullWithObject:response.data]) { [ws endrefresh]; @@ -272,15 +277,4 @@ return _collectionView; } - -/* -#pragma mark - Navigation - -// In a storyboard-based application, you will often want to do a little preparation before navigation -- (void)prepareForSegue:(UIStoryboardSegue *)segue sender:(id)sender { - // Get the new view controller using [segue destinationViewController]. - // Pass the selected object to the new view controller. -} -*/ - @end diff --git a/yinmeng-ios/DingDangApp/V2Versions/Login/DDLoginRequest.m b/yinmeng-ios/DingDangApp/V2Versions/Login/DDLoginRequest.m index c15f107..bd5bc9c 100644 --- a/yinmeng-ios/DingDangApp/V2Versions/Login/DDLoginRequest.m +++ b/yinmeng-ios/DingDangApp/V2Versions/Login/DDLoginRequest.m @@ -8,7 +8,7 @@ #import "DDLoginRequest.h" /// Tool #import "DDSystemTool.h" -#import "HttpRequestHelper.h" +#import "DDRequestTool.h" #import "NSObject+DDExtension.h" /// Model #import "AccountModel.h" @@ -19,11 +19,14 @@ /// 获取验证码 + (void)DD_LoadRequestPhoneCode:(NSString *)phone success:(completedEvent)success{ + + /// sms/getCode + NSString *url = [DDEncryptManager dd_aesDecryptWithText:@"PuB7oi7TobImxHTR/ubaIA=="]; // type: 1-注册账号 NSMutableDictionary *param = [NSMutableDictionary dictionary]; param[@"mobile"] = [DDSystemTool DD_GetPhoneEncryptDes:phone]; param[@"type"] = @(1); - [HttpRequestHelper POST:@"sms/getCode" params:param success:^(BaseModel * _Nonnull data) { + [DDRequestTool DD_Request_POST:url params:param success:^(BaseModel * _Nonnull data) { [ToolsObject addPopVieToText:data.message]; success(); } failure:^(NSInteger resCode, NSString * _Nonnull message) { @@ -50,7 +53,9 @@ + (void)DD_LoadRequestUserInfo:(NSString *)userId completed:(completedUserInfo)completed { NSMutableDictionary *param = [NSMutableDictionary dictionary]; param[@"uid"] = userId; - [HttpRequestHelper GET:@"/user/get" params:param success:^(BaseModel * _Nonnull data) { + /// /user/get + NSString *url = [DDEncryptManager dd_aesDecryptWithText:@"OwB0eTFOOWD9nfMNy4ybFw=="]; + [DDRequestTool DD_Request_GET:url params:param success:^(BaseModel * _Nonnull data) { UserInfoModel *userInfo = [UserInfoModel DD_ModelWithDict:data.data]; completed(userInfo); } failure:^(NSInteger resCode, NSString * _Nonnull message) { @@ -61,7 +66,9 @@ #pragma mark - Private Method + (NSString *)DD_GetLoginUrlTitle { - return @"oauth/token"; + /// oauth/token + NSString *url = [DDEncryptManager dd_aesDecryptWithText:@"v2KK141KFSgVePeICi+mwQ=="]; + return url; } /// 获取登录公共参数 @@ -77,7 +84,7 @@ /// 发起请求 + (void)DD_LoadRequestLogin:(NSDictionary *)params completed:(completedEvent)completed{ - [HttpRequestHelper POST:[self DD_GetLoginUrlTitle] params:params success:^(BaseModel * _Nonnull data) { + [DDRequestTool DD_Request_POST:[self DD_GetLoginUrlTitle] params:params success:^(BaseModel * _Nonnull data) { AccountModel *accountModel = [AccountModel DD_ModelWithDict:data.data]; if (accountModel && accountModel.access_token.length > 0) { [[AccountInfoStorage instance] saveAccountInfo:accountModel]; diff --git a/yinmeng-ios/DingDangApp/V2Versions/Login/DDV2LoginVC.m b/yinmeng-ios/DingDangApp/V2Versions/Login/DDV2LoginVC.m index e4be060..7956d0d 100644 --- a/yinmeng-ios/DingDangApp/V2Versions/Login/DDV2LoginVC.m +++ b/yinmeng-ios/DingDangApp/V2Versions/Login/DDV2LoginVC.m @@ -161,12 +161,12 @@ if (!_protocolView) { _protocolView = [[DDProtocolView alloc] init]; _protocolView.privacyBlock = ^{ - DDWebViewController * webVC = [DDWebViewController webControlerWithUrlStr:[NSString stringWithFormat:@"%@/boyou/modules/rule/privacy-wap.html",API_HOST_H5_URL] isShowNavBar:YES navTitle:@"隐私协议"]; + DDWebViewController * webVC = [DDWebViewController webControlerWithUrlStr:[NSString stringWithFormat:@"%@/boyou/modules/rule/privacy-wap.html",DD__HOST_H5_API_URL] isShowNavBar:YES navTitle:@"隐私协议"]; webVC.view.backgroundColor = UIColor.whiteColor; [[ToolsObject getCurrentViewController].navigationController pushViewController:webVC animated:NO]; }; _protocolView.userBlock = ^{ - DDWebViewController * webVC = [DDWebViewController webControlerWithUrlStr:[NSString stringWithFormat:@"%@/boyou/modules/rule/protocol.html",API_HOST_H5_URL] isShowNavBar:YES navTitle:@"用户协议"]; + DDWebViewController * webVC = [DDWebViewController webControlerWithUrlStr:[NSString stringWithFormat:@"%@/boyou/modules/rule/protocol.html",DD__HOST_H5_API_URL] isShowNavBar:YES navTitle:@"用户协议"]; webVC.view.backgroundColor = UIColor.whiteColor; [[ToolsObject getCurrentViewController].navigationController pushViewController:webVC animated:NO]; }; diff --git a/yinmeng-ios/DingDangApp/V2Versions/Login/DDV2PhoneLoginVC.m b/yinmeng-ios/DingDangApp/V2Versions/Login/DDV2PhoneLoginVC.m index a06ee18..0bfd2c0 100644 --- a/yinmeng-ios/DingDangApp/V2Versions/Login/DDV2PhoneLoginVC.m +++ b/yinmeng-ios/DingDangApp/V2Versions/Login/DDV2PhoneLoginVC.m @@ -15,7 +15,7 @@ #import "DDLoginSVGAView.h" /// Tool #import "AppDelegate+CYLTabBar.h" -#import "HttpRequestHelper.h" +#import "DDRequestTool.h" #import "DDSystemTool.h" #import "DDAppColor.h" #import "UIImage+Custom.h" diff --git a/yinmeng-ios/DingDangApp/V2Versions/Mine/DDMineVC.m b/yinmeng-ios/DingDangApp/V2Versions/Mine/DDMineVC.m index 0f918de..4dd7d0a 100644 --- a/yinmeng-ios/DingDangApp/V2Versions/Mine/DDMineVC.m +++ b/yinmeng-ios/DingDangApp/V2Versions/Mine/DDMineVC.m @@ -200,7 +200,7 @@ } else if ([type isEqualToString:@"我要开播"]) { [self broadcastClick]; } else if ([type isEqualToString:@"我的等级"]) { - DDWebViewController * webVC = [DDWebViewController webControlerWithUrlStr:[NSString stringWithFormat:@"%@/boyou/modules/level/index.html",API_HOST_H5_URL] isShowNavBar:YES navTitle:@"我的等级"]; + DDWebViewController * webVC = [DDWebViewController webControlerWithUrlStr:[NSString stringWithFormat:@"%@/boyou/modules/level/index.html",DD__HOST_H5_API_URL] isShowNavBar:YES navTitle:@"我的等级"]; webVC.view.backgroundColor = UIColor.whiteColor; [[ToolsObject getCurrentViewController].navigationController pushViewController:webVC animated:NO]; @@ -211,7 +211,7 @@ }; [alertView showAlertView]; } else if ([type isEqualToString:@"帮助与反馈"]) { - DDWebViewController * webVC = [DDWebViewController webControlerWithUrlStr:[NSString stringWithFormat:@"%@/boyou/modules/rule/guide.html",API_HOST_H5_URL] isShowNavBar:YES navTitle:@"帮助与反馈"]; + DDWebViewController * webVC = [DDWebViewController webControlerWithUrlStr:[NSString stringWithFormat:@"%@/boyou/modules/rule/guide.html",DD__HOST_H5_API_URL] isShowNavBar:YES navTitle:@"帮助与反馈"]; webVC.view.backgroundColor = UIColor.whiteColor; [[ToolsObject getCurrentViewController].navigationController pushViewController:webVC animated:NO]; @@ -275,7 +275,7 @@ - (void)authorClick{ - DDWebViewController * webVC = [DDWebViewController webControlerWithUrlStr:[NSString stringWithFormat:@"%@/boyou/modules/identity/new.html",API_HOST_H5_URL] isShowNavBar:YES navTitle:@"实名认证"]; + DDWebViewController * webVC = [DDWebViewController webControlerWithUrlStr:[NSString stringWithFormat:@"%@/boyou/modules/identity/new.html",DD__HOST_H5_API_URL] isShowNavBar:YES navTitle:@"实名认证"]; webVC.view.backgroundColor = UIColor.whiteColor; [[ToolsObject getCurrentViewController].navigationController pushViewController:webVC animated:NO]; diff --git a/yinmeng-ios/DingDangApp/V2Versions/Mine/MyExchange/DDMyExchangeVC.m b/yinmeng-ios/DingDangApp/V2Versions/Mine/MyExchange/DDMyExchangeVC.m index 5e01eee..b7a7857 100644 --- a/yinmeng-ios/DingDangApp/V2Versions/Mine/MyExchange/DDMyExchangeVC.m +++ b/yinmeng-ios/DingDangApp/V2Versions/Mine/MyExchange/DDMyExchangeVC.m @@ -76,9 +76,11 @@ { NSString *requestUrl = @""; if (self.walletType == 2) { - requestUrl = @"/finance/exchange/list"; + /// /finance/exchange/list + requestUrl = [DDEncryptManager dd_aesDecryptWithText:@"j44O15FnXrdhwJJ39tW0SOiutBVElf0TtXQ4QAUI6Qg="]; }else{ - requestUrl = @"/guild/exchangeGuild/list"; + /// /guild/exchangeGuild/list + requestUrl = [DDEncryptManager dd_aesDecryptWithText:@"P5SkK8RMl04uxF1htJzSoE6sEjtGMoPc6Hw5sfu58hI="]; } @weakify(self) NSMutableDictionary *params = [[NSMutableDictionary alloc] init]; @@ -177,7 +179,9 @@ if (cell.oldBtn.style == 4) { NSMutableDictionary *dic = [NSMutableDictionary dictionary]; [dic setObject:cell.oldBtn.textF.text forKey:@"charm"]; - [NetworkRequest requestPOST:@"/finance/exchange" parameters:dic block:^(BaseResponse * _Nonnull response) { + /// /finance/exchange + NSString *url = [DDEncryptManager dd_aesDecryptWithText:@"j44O15FnXrdhwJJ39tW0SM6Bg/I5dfOBH6o3+gC9kDU="]; + [NetworkRequest requestPOST:url parameters:dic block:^(BaseResponse * _Nonnull response) { @strongify(self) if (response.isSuccess) { [ToolsObject addPopVieToText:response.msg]; @@ -191,7 +195,9 @@ }else{ NSMutableDictionary *dic = [NSMutableDictionary dictionary]; [dic setObject:cell.oldBtn.model.base forKey:@"charm"]; - [NetworkRequest requestPOST:@"/finance/exchange" parameters:dic block:^(BaseResponse * _Nonnull response) { + /// /finance/exchange + NSString *url = [DDEncryptManager dd_aesDecryptWithText:@"j44O15FnXrdhwJJ39tW0SM6Bg/I5dfOBH6o3+gC9kDU="]; + [NetworkRequest requestPOST:url parameters:dic block:^(BaseResponse * _Nonnull response) { @strongify(self) if (response.isSuccess) { [ToolsObject addPopVieToText:response.msg]; @@ -215,7 +221,10 @@ if ([cell.oldBtn.textF.text intValue]%10 == 0) { NSMutableDictionary *dic = [NSMutableDictionary dictionary]; [dic setObject:cell.oldBtn.textF.text forKey:@"exchangeCharm"]; - [NetworkRequest requestPOST:@"/guild/exchangeGuild/charm" parameters:dic block:^(BaseResponse * _Nonnull response) { + /// /guild/exchangeGuild/charm + NSString *url = [DDEncryptManager dd_aesDecryptWithText:@"P5SkK8RMl04uxF1htJzSoNvK8IuWI1qwAIKHb5DjWo0="]; + + [NetworkRequest requestPOST:url parameters:dic block:^(BaseResponse * _Nonnull response) { @strongify(self) if (response.isSuccess) { [ToolsObject addPopVieToText:response.msg]; @@ -234,7 +243,9 @@ } NSMutableDictionary *dic = [NSMutableDictionary dictionary]; [dic setObject:cell.oldBtn.model.base forKey:@"exchangeCharm"]; - [NetworkRequest requestPOST:@"/guild/exchangeGuild/charm" parameters:dic block:^(BaseResponse * _Nonnull response) { + /// /guild/exchangeGuild/charm + NSString *url = [DDEncryptManager dd_aesDecryptWithText:@"P5SkK8RMl04uxF1htJzSoNvK8IuWI1qwAIKHb5DjWo0="]; + [NetworkRequest requestPOST:url parameters:dic block:^(BaseResponse * _Nonnull response) { @strongify(self) if (response.isSuccess) { [ToolsObject addPopVieToText:response.msg]; @@ -254,7 +265,9 @@ { @weakify(self) NSMutableDictionary *params = [[NSMutableDictionary alloc] init]; - [NetworkRequest requestPOST:@"/guild/getGuildUser/charm" parameters:params block:^(BaseResponse * _Nonnull response) { + /// /guild/getGuildUser/charm + NSString *url = [DDEncryptManager dd_aesDecryptWithText:@"jp/BOZbsqqmPWYuaUmJDNOwDpCuGSM8As1SdAeNA/yg="]; + [NetworkRequest requestPOST:url parameters:params block:^(BaseResponse * _Nonnull response) { @strongify(self) if (response.isSuccess) { if ([ToolsObject IsNullWithObject:response.data]) { diff --git a/yinmeng-ios/DingDangApp/V2Versions/Mine/MyRecharge/View/DDMyRechargeCell.m b/yinmeng-ios/DingDangApp/V2Versions/Mine/MyRecharge/View/DDMyRechargeCell.m index 4cae11d..a46c982 100644 --- a/yinmeng-ios/DingDangApp/V2Versions/Mine/MyRecharge/View/DDMyRechargeCell.m +++ b/yinmeng-ios/DingDangApp/V2Versions/Mine/MyRecharge/View/DDMyRechargeCell.m @@ -465,7 +465,7 @@ text.yy_alignment = NSTextAlignmentLeft; text.yy_color = DDHEXColor(0x999999); [text yy_setTextHighlightRange:[text.string rangeOfString:@"充值协议,"] color:DDHEXColor(0x0690FE) backgroundColor:[UIColor whiteColor] userInfo:nil tapAction:^(UIView * _Nonnull containerView, NSAttributedString * _Nonnull text, NSRange range, CGRect rect) { - DDWebViewController * webVC = [DDWebViewController webControlerWithUrlStr:[NSString stringWithFormat:@"%@/boyou/modules/rule/rechargeAgreement.html",API_HOST_H5_URL] isShowNavBar:NO navTitle:@"充值协议"]; + DDWebViewController * webVC = [DDWebViewController webControlerWithUrlStr:[NSString stringWithFormat:@"%@/boyou/modules/rule/rechargeAgreement.html",DD__HOST_H5_API_URL] isShowNavBar:NO navTitle:@"充值协议"]; webVC.view.backgroundColor = UIColor.whiteColor; [[ToolsObject getCurrentViewController].navigationController pushViewController:webVC animated:NO]; } longPressAction:nil]; @@ -480,7 +480,9 @@ } - (void)serviceClick { - [NetworkRequest requestPOST:@"/my/support/staff" parameters:@{}.mutableCopy block:^(BaseResponse * _Nonnull response) { + /// /my/support/staff + NSString *url = [DDEncryptManager dd_aesDecryptWithText:@"Q31Gyh7TfL4P0ID6I3fxHkSVqT8Sk+YgI+Quj3Ji8AM="]; + [NetworkRequest requestPOST:url parameters:@{}.mutableCopy block:^(BaseResponse * _Nonnull response) { if ([ToolsObject IsNullWithObject:response.data]) { [ToolsObject addPopVieToText:response.msg]; return; diff --git a/yinmeng-ios/DingDangApp/YingMeng/DDBaseCompilation/DDBaseUI/DDClientConfig/DDClientConfig.m b/yinmeng-ios/DingDangApp/YingMeng/DDBaseCompilation/DDBaseUI/DDClientConfig/DDClientConfig.m index 63f6ebf..0200527 100644 --- a/yinmeng-ios/DingDangApp/YingMeng/DDBaseCompilation/DDBaseUI/DDClientConfig/DDClientConfig.m +++ b/yinmeng-ios/DingDangApp/YingMeng/DDBaseCompilation/DDBaseUI/DDClientConfig/DDClientConfig.m @@ -6,7 +6,7 @@ // #import "DDClientConfig.h" -#import "HttpRequestHelper.h" +#import "DDRequestTool.h" #import "DDUtility.h" #import "NSString+DDUtils.h" @@ -30,7 +30,9 @@ - (void)clientInit { NSDictionary *params = [NSDictionary dictionary]; - [HttpRequestHelper GET:@"/client/init" params:params success:^(BaseModel * _Nonnull data) { + /// /client/init + NSString *url = [DDEncryptManager dd_aesDecryptWithText:@"F4QHLrzw6NaFvemJzMLFhA=="]; + [DDRequestTool DD_Request_POST:url params:params success:^(BaseModel * _Nonnull data) { if (data.code == 200) { self.retryCount = 0; NSDictionary *initData = data.data; diff --git a/yinmeng-ios/DingDangApp/YingMeng/DDBaseCompilation/MVP/Api/Api.h b/yinmeng-ios/DingDangApp/YingMeng/DDBaseCompilation/MVP/Api/Api.h index 213cf3d..6e72c6b 100644 --- a/yinmeng-ios/DingDangApp/YingMeng/DDBaseCompilation/MVP/Api/Api.h +++ b/yinmeng-ios/DingDangApp/YingMeng/DDBaseCompilation/MVP/Api/Api.h @@ -6,7 +6,7 @@ // #import -#import "HttpRequestHelper.h" +#import "DDRequestTool.h" NS_ASSUME_NONNULL_BEGIN @@ -18,15 +18,15 @@ NS_ASSUME_NONNULL_BEGIN completion : 网络请求完成的回调 ... : 可变参数,第一个为 __FUNCTION__ ,接下来依次为该接口的协议参数 */ -+ (void)makeRequest:(NSString *)route method:(HttpRequestHelperMethod)method completion:(HttpRequestHelperCompletion)completion, ...; ++ (void)makeRequest:(NSString *)route method:(DDRequestToolMethod)method completion:(DDRequestToolCompletion)completion, ...; -+ (void)getUserInfo:(HttpRequestHelperCompletion)completion uid:(NSString *)uid; ++ (void)getUserInfo:(DDRequestToolCompletion)completion uid:(NSString *)uid; /// 获取手机号的验证码 /// @param completion 请求完成 /// @param mobile 手机号 /// @param type 类型 请看XPEunm中的枚举 -+ (void)phoneSmsCode:(HttpRequestHelperCompletion)completion mobile:(NSString *)mobile type:(NSString *)type; ++ (void)phoneSmsCode:(DDRequestToolCompletion)completion mobile:(NSString *)mobile type:(NSString *)type; /// 校验手机号码 /// @param complection 完成 @@ -34,7 +34,7 @@ NS_ASSUME_NONNULL_BEGIN /// @param code 验证码 /// @param uid 用户的uid /// @param ticket ticket -+ (void)checkMoblieCode:(HttpRequestHelperCompletion)complection ++ (void)checkMoblieCode:(DDRequestToolCompletion)complection mobile:(NSString *)mobile code:(NSString *)code uid:(NSString *)uid @@ -43,19 +43,19 @@ NS_ASSUME_NONNULL_BEGIN /// 补全用户资料 /// @param complection 完成 /// @param userInfo 需要更新的用户信息 -+ (void)completeUserInfo:(HttpRequestHelperCompletion)complection ++ (void)completeUserInfo:(DDRequestToolCompletion)complection userInfo:(NSDictionary *)userInfo; /// 获取用户钱包余额信息 /// @param complection 完成 /// @param uid 用户uid /// @param ticket ticketg -+ (void)getUserWalletInfo:(HttpRequestHelperCompletion)complection ++ (void)getUserWalletInfo:(DDRequestToolCompletion)complection uid:(NSString *)uid ticket:(NSString *)ticket; /// 批量验证 /// @param complection 完成 /// @param transcationIdStr 需要验证的数据 -+ (void)requestCheckTranscationIds:(HttpRequestHelperCompletion)complection ++ (void)requestCheckTranscationIds:(DDRequestToolCompletion)complection transcationIdStr:(NSString *)transcationIdStr; /// 锁麦/开麦 @@ -65,7 +65,7 @@ NS_ASSUME_NONNULL_BEGIN /// @param position 坑位 /// @param ticket 用户的ticket /// @param uid uid -+ (void)microMuteCompletion:(HttpRequestHelperCompletion)complection ++ (void)microMuteCompletion:(DDRequestToolCompletion)complection roomUid:(NSString *)roomUid state:(NSString *)state position:(NSString *)position @@ -79,7 +79,7 @@ NS_ASSUME_NONNULL_BEGIN /// @param position 坑位 /// @param ticket 用户的ticket /// @param uid uid -+ (void)microLockCompletion:(HttpRequestHelperCompletion)complection ++ (void)microLockCompletion:(DDRequestToolCompletion)complection roomUid:(NSString *)roomUid state:(NSString *)state position:(NSString *)position diff --git a/yinmeng-ios/DingDangApp/YingMeng/DDBaseCompilation/MVP/Api/Api.m b/yinmeng-ios/DingDangApp/YingMeng/DDBaseCompilation/MVP/Api/Api.m index ff2aa18..0becb9a 100644 --- a/yinmeng-ios/DingDangApp/YingMeng/DDBaseCompilation/MVP/Api/Api.m +++ b/yinmeng-ios/DingDangApp/YingMeng/DDBaseCompilation/MVP/Api/Api.m @@ -9,7 +9,7 @@ @implementation Api -+ (void)makeRequest:(NSString *)route method:(HttpRequestHelperMethod)method completion:(HttpRequestHelperCompletion)completion, ... { ++ (void)makeRequest:(NSString *)route method:(DDRequestToolMethod)method completion:(DDRequestToolCompletion)completion, ... { va_list arg_lists; va_start(arg_lists, completion); @@ -40,19 +40,23 @@ }; va_end(arg_lists); - [HttpRequestHelper request:route method:method params:params completion:completion]; + [DDRequestTool DD_Request:route method:method params:params completion:completion]; } -+ (void)getUserInfo:(HttpRequestHelperCompletion)completion uid:(NSString *)uid { - [self makeRequest:@"user/get" method:HttpRequestHelperMethodGET completion:completion, __FUNCTION__, uid, nil]; ++ (void)getUserInfo:(DDRequestToolCompletion)completion uid:(NSString *)uid { + /// user/get + NSString *url = [DDEncryptManager dd_aesDecryptWithText:@"Nq7kd0ySV5Mtz5opiSWmFw=="]; + [self makeRequest:url method:DDRequestToolMethodGET completion:completion, __FUNCTION__, uid, nil]; } /// 获取手机号的验证码 /// @param completion 请求完成 /// @param mobile 手机号 /// @param type 类型 请看XPEunm中的枚举 -+ (void)phoneSmsCode:(HttpRequestHelperCompletion)completion mobile:(NSString *)mobile type:(NSString *)type { - [self makeRequest:@"sms/getCode" method:HttpRequestHelperMethodPOST completion:completion, __FUNCTION__, mobile, type, nil]; ++ (void)phoneSmsCode:(DDRequestToolCompletion)completion mobile:(NSString *)mobile type:(NSString *)type { + /// sms/getCode + NSString *url = [DDEncryptManager dd_aesDecryptWithText:@"PuB7oi7TobImxHTR/ubaIA=="]; + [self makeRequest:url method:DDRequestToolMethodPOST completion:completion, __FUNCTION__, mobile, type, nil]; } /// 校验手机号码 @@ -61,20 +65,24 @@ /// @param code 验证码 /// @param uid 用户的uid /// @param ticket ticket -+ (void)checkMoblieCode:(HttpRequestHelperCompletion)complection ++ (void)checkMoblieCode:(DDRequestToolCompletion)complection mobile:(NSString *)mobile code:(NSString *)code uid:(NSString *)uid ticket:(NSString *)ticket { - [self makeRequest:@"sms/verify" method:HttpRequestHelperMethodPOST completion:complection, __FUNCTION__, mobile, code, uid, ticket,nil]; + /// sms/verify + NSString *url = [DDEncryptManager dd_aesDecryptWithText:@"y/v8AKtK6n5dUdTbSlzlBg=="]; + [self makeRequest:url method:DDRequestToolMethodPOST completion:complection, __FUNCTION__, mobile, code, uid, ticket,nil]; } /// 补全用户资料 /// @param complection 完成 /// @param userInfo 需要更新的用户信息 -+ (void)completeUserInfo:(HttpRequestHelperCompletion)complection ++ (void)completeUserInfo:(DDRequestToolCompletion)complection userInfo:(NSDictionary *)userInfo { - [HttpRequestHelper request:@"user/v2/update" method:HttpRequestHelperMethodPOST params:userInfo completion:complection]; + /// user/v2/update + NSString *url = [DDEncryptManager dd_aesDecryptWithText:@"czMeGys+NUO+k7yaGaXljg=="]; + [DDRequestTool DD_Request:url method:DDRequestToolMethodPOST params:userInfo completion:complection]; } @@ -82,16 +90,18 @@ /// @param complection 完成 /// @param uid 用户uid /// @param ticket ticketg -+ (void)getUserWalletInfo:(HttpRequestHelperCompletion)complection uid:(NSString *)uid ticket:(NSString *)ticket { - [self makeRequest:@"purse/query" method:HttpRequestHelperMethodGET completion:complection, __FUNCTION__, uid, ticket,nil]; ++ (void)getUserWalletInfo:(DDRequestToolCompletion)complection uid:(NSString *)uid ticket:(NSString *)ticket { + [self makeRequest:@"purse/query" method:DDRequestToolMethodGET completion:complection, __FUNCTION__, uid, ticket,nil]; } /// 批量验证 /// @param complection 完成 /// @param transcationIdStr 需要验证的数据 -+ (void)requestCheckTranscationIds:(HttpRequestHelperCompletion)complection ++ (void)requestCheckTranscationIds:(DDRequestToolCompletion)complection transcationIdStr:(NSString *)transcationIdStr { - [self makeRequest:@"verify/checkIOSChargeRecord" method:HttpRequestHelperMethodPOST completion:complection, __FUNCTION__,transcationIdStr, nil]; + /// verify/checkIOSChargeRecord + NSString *url = [DDEncryptManager dd_aesDecryptWithText:@"txQqEPo8Jap4SvoIAw/+fgleOC8ui2US+VDuEKM16TM="]; + [self makeRequest:url method:DDRequestToolMethodPOST completion:complection, __FUNCTION__,transcationIdStr, nil]; } /// 锁麦/开麦 @@ -101,8 +111,10 @@ /// @param position 坑位 /// @param ticket 用户的ticket /// @param uid uid -+ (void)microMuteCompletion:(HttpRequestHelperCompletion)complection roomUid:(NSString *)roomUid state:(NSString *)state position:(NSString *)position ticket:(NSString *)ticket uid:(NSString *)uid { - [self makeRequest:@"room/mic/lockmic" method:HttpRequestHelperMethodPOST completion:complection, __FUNCTION__, roomUid, state, position, ticket, uid, nil]; ++ (void)microMuteCompletion:(DDRequestToolCompletion)complection roomUid:(NSString *)roomUid state:(NSString *)state position:(NSString *)position ticket:(NSString *)ticket uid:(NSString *)uid { + /// room/mic/lockmic + NSString *url = [DDEncryptManager dd_aesDecryptWithText:@"SlsZ8qw3HETylhX+Fo0LEsTuX8veT6MsPI8GVCbS7C8="]; + [self makeRequest:url method:DDRequestToolMethodPOST completion:complection, __FUNCTION__, roomUid, state, position, ticket, uid, nil]; } /// 锁坑/开锁 @@ -112,7 +124,9 @@ /// @param position 坑位 /// @param ticket 用户的ticket /// @param uid uid -+ (void)microLockCompletion:(HttpRequestHelperCompletion)complection roomUid:(NSString *)roomUid state:(NSString *)state position:(NSString *)position ticket:(NSString *)ticket uid:(NSString *)uid { - [self makeRequest:@"room/mic/lockpos" method:HttpRequestHelperMethodPOST completion:complection, __FUNCTION__, roomUid, state, position, ticket, uid, nil]; ++ (void)microLockCompletion:(DDRequestToolCompletion)complection roomUid:(NSString *)roomUid state:(NSString *)state position:(NSString *)position ticket:(NSString *)ticket uid:(NSString *)uid { + /// room/mic/lockpos + NSString *url = [DDEncryptManager dd_aesDecryptWithText:@"3ylbyxDfEkAFNIIkdSmbAJu34/lxuxkwno0OeTX8DUw="]; + [self makeRequest:url method:DDRequestToolMethodPOST completion:complection, __FUNCTION__, roomUid, state, position, ticket, uid, nil]; } @end diff --git a/yinmeng-ios/DingDangApp/YingMeng/DDBaseCompilation/MVP/Presenter/BaseMvpPresenter.h b/yinmeng-ios/DingDangApp/YingMeng/DDBaseCompilation/MVP/Presenter/BaseMvpPresenter.h index 882c4c0..e06e010 100644 --- a/yinmeng-ios/DingDangApp/YingMeng/DDBaseCompilation/MVP/Presenter/BaseMvpPresenter.h +++ b/yinmeng-ios/DingDangApp/YingMeng/DDBaseCompilation/MVP/Presenter/BaseMvpPresenter.h @@ -7,7 +7,7 @@ #import #import "BaseMvpProtocol.h" -#import "HttpRequestHelper.h" +#import "DDRequestTool.h" NS_ASSUME_NONNULL_BEGIN @@ -20,14 +20,14 @@ typedef void(^HttpFail)(NSInteger code, NSString * _Nullable msg); - (id)getView; - (void)detatchView; - (void)logout; -- (HttpRequestHelperCompletion)createHttpCompletion:(HttpSuccess _Nonnull)success; -- (HttpRequestHelperCompletion)createHttpCompletion:(HttpSuccess _Nonnull)success showLoading:(BOOL)loading; -- (HttpRequestHelperCompletion)createHttpCompletion:(HttpSuccess _Nonnull)success errorToast:(BOOL)toast; -- (HttpRequestHelperCompletion)createHttpCompletion:(HttpSuccess _Nonnull)success showLoading:(BOOL)loading errorToast:(BOOL)toast; -- (HttpRequestHelperCompletion)createHttpCompletion:(HttpSuccess _Nonnull)success fail:(HttpFail _Nullable)fail; -- (HttpRequestHelperCompletion)createHttpCompletion:(HttpSuccess _Nonnull)success fail:(HttpFail _Nullable)fail showLoading:(BOOL)loading; -- (HttpRequestHelperCompletion)createHttpCompletion:(HttpSuccess _Nonnull)success fail:(HttpFail _Nullable)fail errorToast:(BOOL)toast; -- (HttpRequestHelperCompletion)createHttpCompletion:(HttpSuccess _Nonnull)success fail:(HttpFail _Nullable)fail showLoading:(BOOL)loading errorToast:(BOOL)toast; +- (DDRequestToolCompletion)createHttpCompletion:(HttpSuccess _Nonnull)success; +- (DDRequestToolCompletion)createHttpCompletion:(HttpSuccess _Nonnull)success showLoading:(BOOL)loading; +- (DDRequestToolCompletion)createHttpCompletion:(HttpSuccess _Nonnull)success errorToast:(BOOL)toast; +- (DDRequestToolCompletion)createHttpCompletion:(HttpSuccess _Nonnull)success showLoading:(BOOL)loading errorToast:(BOOL)toast; +- (DDRequestToolCompletion)createHttpCompletion:(HttpSuccess _Nonnull)success fail:(HttpFail _Nullable)fail; +- (DDRequestToolCompletion)createHttpCompletion:(HttpSuccess _Nonnull)success fail:(HttpFail _Nullable)fail showLoading:(BOOL)loading; +- (DDRequestToolCompletion)createHttpCompletion:(HttpSuccess _Nonnull)success fail:(HttpFail _Nullable)fail errorToast:(BOOL)toast; +- (DDRequestToolCompletion)createHttpCompletion:(HttpSuccess _Nonnull)success fail:(HttpFail _Nullable)fail showLoading:(BOOL)loading errorToast:(BOOL)toast; diff --git a/yinmeng-ios/DingDangApp/YingMeng/DDBaseCompilation/MVP/Presenter/BaseMvpPresenter.m b/yinmeng-ios/DingDangApp/YingMeng/DDBaseCompilation/MVP/Presenter/BaseMvpPresenter.m index cb4792e..399d6c0 100644 --- a/yinmeng-ios/DingDangApp/YingMeng/DDBaseCompilation/MVP/Presenter/BaseMvpPresenter.m +++ b/yinmeng-ios/DingDangApp/YingMeng/DDBaseCompilation/MVP/Presenter/BaseMvpPresenter.m @@ -46,35 +46,35 @@ [[self getView] tokenInvalid]; } -- (HttpRequestHelperCompletion)createHttpCompletion:(HttpSuccess)success { +- (DDRequestToolCompletion)createHttpCompletion:(HttpSuccess)success { return [self createHttpCompletion:success fail:nil]; } -- (HttpRequestHelperCompletion)createHttpCompletion:(HttpSuccess)success showLoading:(BOOL)loading { +- (DDRequestToolCompletion)createHttpCompletion:(HttpSuccess)success showLoading:(BOOL)loading { return [self createHttpCompletion:success fail:nil showLoading:loading]; } -- (HttpRequestHelperCompletion)createHttpCompletion:(HttpSuccess)success errorToast:(BOOL)toast { +- (DDRequestToolCompletion)createHttpCompletion:(HttpSuccess)success errorToast:(BOOL)toast { return [self createHttpCompletion:success fail:nil errorToast:toast]; } -- (HttpRequestHelperCompletion)createHttpCompletion:(HttpSuccess)success showLoading:(BOOL)loading errorToast:(BOOL)toast { +- (DDRequestToolCompletion)createHttpCompletion:(HttpSuccess)success showLoading:(BOOL)loading errorToast:(BOOL)toast { return [self createHttpCompletion:success fail:nil showLoading:loading errorToast:toast]; } -- (HttpRequestHelperCompletion)createHttpCompletion:(HttpSuccess)success fail:(HttpFail)fail { +- (DDRequestToolCompletion)createHttpCompletion:(HttpSuccess)success fail:(HttpFail)fail { return [self createHttpCompletion:success fail:fail showLoading:NO errorToast:YES]; } -- (HttpRequestHelperCompletion)createHttpCompletion:(HttpSuccess)success fail:(HttpFail)fail showLoading:(BOOL)loading { +- (DDRequestToolCompletion)createHttpCompletion:(HttpSuccess)success fail:(HttpFail)fail showLoading:(BOOL)loading { return [self createHttpCompletion:success fail:fail showLoading:loading errorToast:YES]; } -- (HttpRequestHelperCompletion)createHttpCompletion:(HttpSuccess)success fail:(HttpFail)fail errorToast:(BOOL)toast { +- (DDRequestToolCompletion)createHttpCompletion:(HttpSuccess)success fail:(HttpFail)fail errorToast:(BOOL)toast { return [self createHttpCompletion:success fail:fail showLoading:NO errorToast:toast]; } -- (HttpRequestHelperCompletion)createHttpCompletion:(HttpSuccess)success fail:(HttpFail)fail showLoading:(BOOL)loading errorToast:(BOOL)toast { +- (DDRequestToolCompletion)createHttpCompletion:(HttpSuccess)success fail:(HttpFail)fail showLoading:(BOOL)loading errorToast:(BOOL)toast { if (loading) { [self.view dd_showAnchorGIFWaitView]; } diff --git a/yinmeng-ios/DingDangApp/YingMeng/DDBaseCompilation/Net/ApiHost.h b/yinmeng-ios/DingDangApp/YingMeng/DDBaseCompilation/Net/ApiHost.h deleted file mode 100644 index 8a6a1a9..0000000 --- a/yinmeng-ios/DingDangApp/YingMeng/DDBaseCompilation/Net/ApiHost.h +++ /dev/null @@ -1,21 +0,0 @@ -// -// ApiHost.h -// xplan-ios -// -// Created by zu on 2021/9/6. -// - -#ifndef ApiHost_h -#define ApiHost_h - -#ifdef DEBUG -#define API_HOST_H5_URL @"https://h5.boyou.live" -#define API_HOST_URL @"https://api.boyou.live" -//#define API_HOST_H5_URL @"http://beta.h5.nnbc123.cn" -//#define API_HOST_URL @"http://beta.api.nnbc123.cn" -#else -#define API_HOST_H5_URL @"https://h5.boyou.live" -#define API_HOST_URL @"https://api.boyou.live" -#endif - -#endif /* ApiHost_h */ diff --git a/yinmeng-ios/DingDangApp/YingMeng/DDBaseCompilation/Net/DDHostURL.h b/yinmeng-ios/DingDangApp/YingMeng/DDBaseCompilation/Net/DDHostURL.h new file mode 100644 index 0000000..df50bdd --- /dev/null +++ b/yinmeng-ios/DingDangApp/YingMeng/DDBaseCompilation/Net/DDHostURL.h @@ -0,0 +1,21 @@ +// +// DDHostURL.h +// xplan-ios +// +// Created by zu on 2021/9/6. +// + +#ifndef DDHostURL_h +#define DDHostURL_h + +#ifdef DEBUG +#define DD__HOST_H5_API_URL @"https://h5.boyou.live" +#define DD_HOST_API_URL @"https://api.boyou.live" +//#define DD__HOST_H5_API_URL @"http://beta.h5.nnbc123.cn" +//#define DD_HOST_API_URL @"http://beta.api.nnbc123.cn" +#else +#define DD__HOST_H5_API_URL @"https://h5.boyou.live" +#define DD_HOST_API_URL @"https://api.boyou.live" +#endif + +#endif /* DDHostURL_h */ diff --git a/yinmeng-ios/DingDangApp/YingMeng/DDBaseCompilation/Net/HttpRequestHelper.h b/yinmeng-ios/DingDangApp/YingMeng/DDBaseCompilation/Net/DDRequestTool.h similarity index 57% rename from yinmeng-ios/DingDangApp/YingMeng/DDBaseCompilation/Net/HttpRequestHelper.h rename to yinmeng-ios/DingDangApp/YingMeng/DDBaseCompilation/Net/DDRequestTool.h index 3cfb33e..ec7fc29 100644 --- a/yinmeng-ios/DingDangApp/YingMeng/DDBaseCompilation/Net/HttpRequestHelper.h +++ b/yinmeng-ios/DingDangApp/YingMeng/DDBaseCompilation/Net/DDRequestTool.h @@ -1,5 +1,5 @@ // -// HttpRequestHelper.h +// DDRequestTool.h // xplan-ios // // Created by zu on 2021/9/3. @@ -8,56 +8,56 @@ #import #import "BaseModel.h" -typedef NS_ENUM(NSUInteger, HttpRequestHelperMethod) { - HttpRequestHelperMethodPOST, - HttpRequestHelperMethodGET, - HttpRequestHelperMethodDELETE +typedef NS_ENUM(NSUInteger, DDRequestToolMethod) { + DDRequestToolMethodPOST, + DDRequestToolMethodGET, + DDRequestToolMethodDELETE }; static dispatch_once_t onceToken; -typedef void(^HttpRequestHelperCompletion)(BaseModel* _Nullable data, NSInteger code, NSString * _Nullable msg); +typedef void(^DDRequestToolCompletion)(BaseModel* _Nullable data, NSInteger code, NSString * _Nullable msg); NS_ASSUME_NONNULL_BEGIN -@interface HttpRequestHelper : NSObject +@interface DDRequestTool : NSObject -+ (NSDictionary*)configBaseParmars:(NSDictionary *)parmars; ++ (NSDictionary*)DD_Request_ConfigBaseParmars:(NSDictionary *)parmars; -+ (void)GET:(NSString *)method ++ (void)DD_Request_GET:(NSString *)method params:(NSDictionary *)params success:(void (^)(BaseModel *data))success failure:(void (^)(NSInteger resCode, NSString *message))failure; -+ (void)POST:(NSString *)method ++ (void)DD_Request_POST:(NSString *)method params:(NSDictionary *)params success:(void (^)(BaseModel *data))success failure:(void (^)(NSInteger resCode, NSString *message))failure; -+ (void)DELETE:(NSString *)method ++ (void)DD_Request_DELETE:(NSString *)method params:(NSDictionary *)params success:(void (^)(BaseModel *data))success failure:(void (^)(NSInteger resCode, NSString *message))failure; -+ (void)request:(NSString *)url - method:(HttpRequestHelperMethod)method ++ (void)DD_Request:(NSString *)url + method:(DDRequestToolMethod)method params:(NSDictionary *)params success:(void (^)(BaseModel *data))success failure:(void (^)(NSInteger resCode, NSString *message))failure; -+ (void)request:(NSString *)path - method:(HttpRequestHelperMethod)method ++ (void)DD_Request:(NSString *)path + method:(DDRequestToolMethod)method params:(NSDictionary *)params - completion:(HttpRequestHelperCompletion)completion; + completion:(DDRequestToolCompletion)completion; /// 增加或编辑技能卡专用接口 Post 请求参数放入到 body 里 使用 application/json 类型传递 /// @param path 请求地址 /// @param params 参数 /// @param completion 回调 -+ (void)postSkillCard:(NSString *)path ++ (void)DD_Request_PostSkillCard:(NSString *)path params:(NSString *)params - completion:(HttpRequestHelperCompletion)completion; + completion:(DDRequestToolCompletion)completion; @end diff --git a/yinmeng-ios/DingDangApp/YingMeng/DDBaseCompilation/Net/HttpRequestHelper.m b/yinmeng-ios/DingDangApp/YingMeng/DDBaseCompilation/Net/DDRequestTool.m similarity index 78% rename from yinmeng-ios/DingDangApp/YingMeng/DDBaseCompilation/Net/HttpRequestHelper.m rename to yinmeng-ios/DingDangApp/YingMeng/DDBaseCompilation/Net/DDRequestTool.m index bd39c7a..943512f 100644 --- a/yinmeng-ios/DingDangApp/YingMeng/DDBaseCompilation/Net/HttpRequestHelper.m +++ b/yinmeng-ios/DingDangApp/YingMeng/DDBaseCompilation/Net/DDRequestTool.m @@ -1,12 +1,12 @@ // -// HttpRequestHelper.m +// DDRequestTool.m // xplan-ios // // Created by zu on 2021/9/3. // -#import "HttpRequestHelper.h" -#import "ApiHost.h" +#import "DDRequestTool.h" +#import "DDHostURL.h" #import "DDUtility.h" #import "AccountInfoStorage.h" #import "DDReachability.h" @@ -15,28 +15,27 @@ #import "TTAlertView.h" #import "DDCurVCManager.h" -@implementation HttpRequestHelper +@implementation DDRequestTool static BOOL isShowing = NO; -+(AFHTTPSessionManager *)requestManager -{ - static AFHTTPSessionManager *manager = nil; ++(AFHTTPSessionManager *)DD_Get_RequestManager { + static AFHTTPSessionManager *sseion_manager = nil; static dispatch_once_t onceToken; dispatch_once(&onceToken, ^{ - manager = [[AFHTTPSessionManager manager]initWithBaseURL:[NSURL URLWithString:API_HOST_URL]]; - manager.responseSerializer = [AFJSONResponseSerializer serializer]; - manager.requestSerializer.HTTPShouldHandleCookies = YES; + sseion_manager = [[AFHTTPSessionManager manager]initWithBaseURL:[NSURL URLWithString:DD_HOST_API_URL]]; + sseion_manager.responseSerializer = [AFJSONResponseSerializer serializer]; + sseion_manager.requestSerializer.HTTPShouldHandleCookies = YES; // 客户端是否信任非法证书 - manager.securityPolicy.allowInvalidCertificates = YES; - AFSecurityPolicy *securityPolicy= [AFSecurityPolicy defaultPolicy]; - manager.securityPolicy = securityPolicy; + sseion_manager.securityPolicy.allowInvalidCertificates = YES; + AFSecurityPolicy *security= [AFSecurityPolicy defaultPolicy]; + sseion_manager.securityPolicy = security; // 是否在证书域字段中验证域名 - [manager.securityPolicy setValidatesDomainName:NO]; - manager.responseSerializer.acceptableContentTypes = [NSSet setWithObjects:@"application/json", @"text/json", @"text/javascript",@"text/html",@"text/plain",@"image/jpeg",@"image/png", nil]; - manager.requestSerializer.timeoutInterval = 60; + [sseion_manager.securityPolicy setValidatesDomainName:NO]; + sseion_manager.responseSerializer.acceptableContentTypes = [NSSet setWithObjects:@"application/json", @"text/json", @"text/javascript",@"text/html",@"text/plain",@"image/jpeg",@"image/png", nil]; + sseion_manager.requestSerializer.timeoutInterval = 60; }); - return manager; + return sseion_manager; } + (void)showNoNetAlert { @@ -59,7 +58,7 @@ static BOOL isShowing = NO; } } -+ (void)GET:(NSString *)method ++ (void)DD_Request_GET:(NSString *)method params:(NSDictionary *)params success:(void (^)(BaseModel *data))success failure:(void (^)(NSInteger resCode, NSString *message))failure @@ -75,13 +74,13 @@ static BOOL isShowing = NO; return; } - [self configHeaders]; - params = [self configBaseParmars:params]; + [self DD_Request_ConfigHeaders]; + params = [self DD_Request_ConfigBaseParmars:params]; #ifdef DEBUG NSLog(@"\nmethod:\n%@\nparameter:\n%@", method, params); #endif - AFHTTPSessionManager *manager = [HttpRequestHelper requestManager]; + AFHTTPSessionManager *manager = [DDRequestTool DD_Get_RequestManager]; [manager GET:method parameters:params headers:nil progress:nil success:^(NSURLSessionDataTask * _Nonnull task, id _Nullable responseObject) { BaseModel *baseModel = [BaseModel DD_ModelWithDict:responseObject]; @@ -90,11 +89,11 @@ static BOOL isShowing = NO; #endif success(baseModel); } failure:^(NSURLSessionDataTask * _Nullable task, NSError * _Nonnull error) { - [self handleNetError:error method:method failure:failure]; + [self DD_Net_HandleError:error method:method failure:failure]; }]; } -+ (void)POST:(NSString *)method ++ (void)DD_Request_POST:(NSString *)method params:(NSDictionary *)params success:(void (^)(BaseModel *data))success failure:(void (^)(NSInteger resCode, NSString *message))failure @@ -108,13 +107,13 @@ static BOOL isShowing = NO; return; } - [self configHeaders]; - params = [self configBaseParmars:params]; + [self DD_Request_ConfigHeaders]; + params = [self DD_Request_ConfigBaseParmars:params]; #ifdef DEBUG NSLog(@"\nmethod:\n%@\nparameter:\n%@", method, params); #endif - AFHTTPSessionManager *manager = [HttpRequestHelper requestManager]; + AFHTTPSessionManager *manager = [DDRequestTool DD_Get_RequestManager]; [manager POST:method parameters:params headers:nil progress:nil success:^(NSURLSessionDataTask * _Nonnull task, id _Nullable responseObject) { BaseModel *baseModel = [BaseModel DD_ModelWithDict:responseObject]; #ifdef DEBUG @@ -122,11 +121,11 @@ static BOOL isShowing = NO; #endif success(baseModel); } failure:^(NSURLSessionDataTask * _Nullable task, NSError * _Nonnull error) { - [self handleNetError:error method:method failure:failure]; + [self DD_Net_HandleError:error method:method failure:failure]; }]; } -+ (void)DELETE:(NSString *)method ++ (void)DD_Request_DELETE:(NSString *)method params:(NSDictionary *)params success:(void (^)(BaseModel *data))success failure:(void (^)(NSInteger resCode, NSString *message))failure @@ -140,13 +139,13 @@ static BOOL isShowing = NO; return; } - [self configHeaders]; - params = [self configBaseParmars:params]; + [self DD_Request_ConfigHeaders]; + params = [self DD_Request_ConfigBaseParmars:params]; #ifdef DEBUG NSLog(@"\nmethod:\n%@\nparameter:\n%@", method, params); #endif - AFHTTPSessionManager *manager = [HttpRequestHelper requestManager]; + AFHTTPSessionManager *manager = [DDRequestTool DD_Get_RequestManager]; [manager DELETE:method parameters:params headers:nil success:^(NSURLSessionDataTask * _Nonnull task, id _Nullable responseObject) { BaseModel *baseModel = [BaseModel DD_ModelWithDict:responseObject]; #ifdef DEBUG @@ -154,38 +153,38 @@ static BOOL isShowing = NO; #endif success(baseModel); } failure:^(NSURLSessionDataTask * _Nullable task, NSError * _Nonnull error) { - [self handleNetError:error method:method failure:failure]; + [self DD_Net_HandleError:error method:method failure:failure]; }]; } -+ (void)request:(NSString *)url - method:(HttpRequestHelperMethod)method ++ (void)DD_Request:(NSString *)url + method:(DDRequestToolMethod)method params:(NSDictionary *)params success:(void (^)(BaseModel *data))success failure:(void (^)(NSInteger resCode, NSString *message))failure { switch (method) { - case HttpRequestHelperMethodGET: { - [self GET:url params:params success:success failure:failure]; + case DDRequestToolMethodGET: { + [self DD_Request_GET:url params:params success:success failure:failure]; } break; - case HttpRequestHelperMethodPOST:{ - [self POST:url params:params success:success failure:failure]; + case DDRequestToolMethodPOST:{ + [self DD_Request_POST:url params:params success:success failure:failure]; } break; - case HttpRequestHelperMethodDELETE:{ - [self DELETE:url params:params success:success failure:failure]; + case DDRequestToolMethodDELETE:{ + [self DD_Request_DELETE:url params:params success:success failure:failure]; } break; } } -+ (void)request:(NSString *)path - method:(HttpRequestHelperMethod)method ++ (void)DD_Request:(NSString *)path + method:(DDRequestToolMethod)method params:(NSDictionary *)params - completion:(HttpRequestHelperCompletion)completion + completion:(DDRequestToolCompletion)completion { - [self request:path method:method params:params success:^(BaseModel *data) { + [self DD_Request:path method:method params:params success:^(BaseModel *data) { if (completion) { completion(data, data.code, data.message); } @@ -196,9 +195,9 @@ static BOOL isShowing = NO; }]; } -+ (void)configHeaders ++ (void)DD_Request_ConfigHeaders { - AFHTTPSessionManager *client = [HttpRequestHelper requestManager]; + AFHTTPSessionManager *client = [DDRequestTool DD_Get_RequestManager]; if ([[AccountInfoStorage instance] getUid].length > 0) { [client.requestSerializer setValue:[[AccountInfoStorage instance] getUid] forHTTPHeaderField:@"pub_uid"]; } else { @@ -211,7 +210,7 @@ static BOOL isShowing = NO; } } -+ (NSDictionary*)configBaseParmars:(NSDictionary *)parmars ++ (NSDictionary*)DD_Request_ConfigBaseParmars:(NSDictionary *)parmars { NSDictionary *defaultBasciParame = @{ @"os" : @"iOS", @@ -235,7 +234,7 @@ static BOOL isShowing = NO; return dic; } -+ (void)handleNetError:(NSError *)error method:(NSString *)method ++ (void)DD_Net_HandleError:(NSError *)error method:(NSString *)method failure:(void (^)(NSInteger resCode, NSString *message))failure { #ifdef DEBUG @@ -265,9 +264,9 @@ static BOOL isShowing = NO; /// @param path 请求地址 /// @param params 参数 /// @param completion 回调 -+ (void)postSkillCard:(NSString *)path ++ (void)DD_Request_PostSkillCard:(NSString *)path params:(NSString *)params - completion:(HttpRequestHelperCompletion)completion{ + completion:(DDRequestToolCompletion)completion{ if ([AFNetworkReachabilityManager sharedManager].networkReachabilityStatus == 0) { dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(0.01 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{ @@ -276,14 +275,14 @@ static BOOL isShowing = NO; return; } - [self configHeaders]; - NSDictionary *baseParams = [self configBaseParmars:nil]; + [self DD_Request_ConfigHeaders]; + NSDictionary *baseParams = [self DD_Request_ConfigBaseParmars:nil]; #ifdef DEBUG // NSLog(@"\nmethod:\n%@\nparameter:\n%@", method, params); #endif - AFHTTPSessionManager *manager = [HttpRequestHelper requestManager]; - NSString *url = API_HOST_URL; + AFHTTPSessionManager *manager = [DDRequestTool DD_Get_RequestManager]; + NSString *url = DD_HOST_API_URL; NSString *urlPath = [NSString stringWithFormat:@"%@/%@", url ,path]; #ifdef DEBUG @@ -337,7 +336,7 @@ static BOOL isShowing = NO; } } if (error) { - [self handleNetError:error method:path failure:^(NSInteger resCode, NSString *message) { + [self DD_Net_HandleError:error method:path failure:^(NSInteger resCode, NSString *message) { completion(nil, resCode, message); }]; } diff --git a/yinmeng-ios/DingDangApp/YingMeng/DDMain/DDDynamic/DDDynamicApi/Api+DDDynamicApi.h b/yinmeng-ios/DingDangApp/YingMeng/DDMain/DDDynamic/DDDynamicApi/Api+DDDynamicApi.h index 83a017a..7d91834 100644 --- a/yinmeng-ios/DingDangApp/YingMeng/DDMain/DDDynamic/DDDynamicApi/Api+DDDynamicApi.h +++ b/yinmeng-ios/DingDangApp/YingMeng/DDMain/DDDynamic/DDDynamicApi/Api+DDDynamicApi.h @@ -10,11 +10,11 @@ NS_ASSUME_NONNULL_BEGIN @interface Api (DDDynamicApi) -+ (void)dd_getDynamicRecommendList:(HttpRequestHelperCompletion)completion page:(NSString *)page pageSize:(NSString *)pageSize types:(NSString *)types; -+ (void)dd_getDynamicLatestList:(HttpRequestHelperCompletion)completion dynamicId:(NSString *)dynamicId pageSize:(NSString *)pageSize types:(NSString *)types; -+ (void)dd_getDynamicFollowerList:(HttpRequestHelperCompletion)completion dynamicId:(NSString *)dynamicId pageSize:(NSString *)pageSize types:(NSString *)types; -+ (void)dd_getDynamicLike:(HttpRequestHelperCompletion)completion dynamicId:(NSString *)dynamicId uid:(NSString *)uid status:(NSString *)status likedUid:(NSString *)likedUid worldId:(NSString *)worldId; -+ (void)dd_getDynamicPublish:(HttpRequestHelperCompletion)completion uid:(NSString *)uid type:(NSString *)type worldId:(NSString *)worldId content:(NSString *)content resList:(NSArray *)resList; ++ (void)dd_getDynamicRecommendList:(DDRequestToolCompletion)completion page:(NSString *)page pageSize:(NSString *)pageSize types:(NSString *)types; ++ (void)dd_getDynamicLatestList:(DDRequestToolCompletion)completion dynamicId:(NSString *)dynamicId pageSize:(NSString *)pageSize types:(NSString *)types; ++ (void)dd_getDynamicFollowerList:(DDRequestToolCompletion)completion dynamicId:(NSString *)dynamicId pageSize:(NSString *)pageSize types:(NSString *)types; ++ (void)dd_getDynamicLike:(DDRequestToolCompletion)completion dynamicId:(NSString *)dynamicId uid:(NSString *)uid status:(NSString *)status likedUid:(NSString *)likedUid worldId:(NSString *)worldId; ++ (void)dd_getDynamicPublish:(DDRequestToolCompletion)completion uid:(NSString *)uid type:(NSString *)type worldId:(NSString *)worldId content:(NSString *)content resList:(NSArray *)resList; @end NS_ASSUME_NONNULL_END diff --git a/yinmeng-ios/DingDangApp/YingMeng/DDMain/DDDynamic/DDDynamicApi/Api+DDDynamicApi.m b/yinmeng-ios/DingDangApp/YingMeng/DDMain/DDDynamic/DDDynamicApi/Api+DDDynamicApi.m index 3a51e72..32253c2 100644 --- a/yinmeng-ios/DingDangApp/YingMeng/DDMain/DDDynamic/DDDynamicApi/Api+DDDynamicApi.m +++ b/yinmeng-ios/DingDangApp/YingMeng/DDMain/DDDynamic/DDDynamicApi/Api+DDDynamicApi.m @@ -7,22 +7,26 @@ #import "Api+DDDynamicApi.h" -@implementation Api (DDDynamicApi) -+ (void)dd_getDynamicRecommendList:(HttpRequestHelperCompletion)completion page:(NSString *)page pageSize:(NSString *)pageSize types:(NSString *)types { ++ (void)dd_getDynamicRecommendList:(DDRequestToolCompletion)completion page:(NSString *)page pageSize:(NSString *)pageSize types:(NSString *)types { NSString *url = [DDEncryptManager dd_aesDecryptWithText:@"2qK/TFxH7CmT0qabLIO/GqDsHEJxU6baoiALPp9GdoGIaemk6FEUSySzpRW3U6BX"];///dynamic/square/recommendDynamics - [self makeRequest:url method:HttpRequestHelperMethodGET completion:completion, __FUNCTION__, page, pageSize, types, nil]; + [self makeRequest:url method:DDRequestToolMethodGET completion:completion, __FUNCTION__, page, pageSize, types, nil]; } -+ (void)dd_getDynamicLatestList:(HttpRequestHelperCompletion)completion dynamicId:(NSString *)dynamicId pageSize:(NSString *)pageSize types:(NSString *)types { ++ (void)dd_getDynamicLatestList:(DDRequestToolCompletion)completion dynamicId:(NSString *)dynamicId pageSize:(NSString *)pageSize types:(NSString *)types { NSString *url = [DDEncryptManager dd_aesDecryptWithText:@"2JAl2i0YEgWwLua1dq82YsvEzZjRxaUpRe4QOn//VDk="];///dynamic/square/latestDynamics - [self makeRequest:url method:HttpRequestHelperMethodGET completion:completion, __FUNCTION__, dynamicId, pageSize, types, nil]; + [self makeRequest:url method:DDRequestToolMethodGET completion:completion, __FUNCTION__, dynamicId, pageSize, types, nil]; + } -+ (void)dd_getDynamicFollowerList:(HttpRequestHelperCompletion)completion dynamicId:(NSString *)dynamicId pageSize:(NSString *)pageSize types:(NSString *)types { - [self makeRequest:@"dynamic/square/followerDynamics" method:HttpRequestHelperMethodGET completion:completion, __FUNCTION__, dynamicId, pageSize, types, nil]; ++ (void)dd_getDynamicFollowerList:(DDRequestToolCompletion)completion dynamicId:(NSString *)dynamicId pageSize:(NSString *)pageSize types:(NSString *)types { + /// dynamic/square/followerDynamics + NSString *url = [DDEncryptManager dd_aesDecryptWithText:@"Rfu/SktHE9HjJk0oylLdPYyIsgtTedeVD+peB0Zy5ts="]; + [self makeRequest:url method:DDRequestToolMethodGET completion:completion, __FUNCTION__, dynamicId, pageSize, types, nil]; } -+ (void)dd_getDynamicLike:(HttpRequestHelperCompletion)completion dynamicId:(NSString *)dynamicId uid:(NSString *)uid status:(NSString *)status likedUid:(NSString *)likedUid worldId:(NSString *)worldId { - [self makeRequest:@"dynamic/like" method:HttpRequestHelperMethodPOST completion:completion, __FUNCTION__, dynamicId, uid, status, likedUid, worldId, nil]; ++ (void)dd_getDynamicLike:(DDRequestToolCompletion)completion dynamicId:(NSString *)dynamicId uid:(NSString *)uid status:(NSString *)status likedUid:(NSString *)likedUid worldId:(NSString *)worldId { + /// dynamic/like + NSString *url = [DDEncryptManager dd_aesDecryptWithText:@"mhPt+ybyGJMytLYDUlasZg=="]; + [self makeRequest:url method:DDRequestToolMethodPOST completion:completion, __FUNCTION__, dynamicId, uid, status, likedUid, worldId, nil]; } -+ (void)dd_getDynamicPublish:(HttpRequestHelperCompletion)completion uid:(NSString *)uid type:(NSString *)type worldId:(NSString *)worldId content:(NSString *)content resList:(NSArray *)resList { ++ (void)dd_getDynamicPublish:(DDRequestToolCompletion)completion uid:(NSString *)uid type:(NSString *)type worldId:(NSString *)worldId content:(NSString *)content resList:(NSArray *)resList { NSMutableDictionary * dic = [NSMutableDictionary dictionary]; [dic setObject:uid forKey:@"uid"]; [dic setObject:type forKey:@"type"]; @@ -35,6 +39,8 @@ [dic setObject:resList forKey:@"resList"]; } - [HttpRequestHelper postSkillCard:@"dynamic/square/publish" params:dic.dd_toJSONString completion:completion]; + /// dynamic/square/publish + NSString *url = [DDEncryptManager dd_aesDecryptWithText:@"JU9Cj+C3FU2fzPyOKeR8g6xZzxAfnY4jP/qOWKeMwD8="]; + [DDRequestTool DD_Request_POSTSkillCard:url params:dic.dd_toJSONString completion:completion]; } @end diff --git a/yinmeng-ios/DingDangApp/YingMeng/DDMain/DDHome/DDHomeApi/Api+DDHomeApi.h b/yinmeng-ios/DingDangApp/YingMeng/DDMain/DDHome/DDHomeApi/Api+DDHomeApi.h index b9c755d..25d8144 100644 --- a/yinmeng-ios/DingDangApp/YingMeng/DDMain/DDHome/DDHomeApi/Api+DDHomeApi.h +++ b/yinmeng-ios/DingDangApp/YingMeng/DDMain/DDHome/DDHomeApi/Api+DDHomeApi.h @@ -10,13 +10,13 @@ NS_ASSUME_NONNULL_BEGIN @interface Api (DDHomeApi) -+ (void)dd_getHomePageMenuList:(HttpRequestHelperCompletion)completion uid:(NSString *)uid; -+ (void)dd_getHomePagePickResource:(HttpRequestHelperCompletion)completion uid:(NSString *)uid rid:(NSString *)rid; -+ (void)homeBannerList:(HttpRequestHelperCompletion)completion uid:(NSString *)uid type:(NSString *)type; -+ (void)dd_getHomePageTagComplection:(HttpRequestHelperCompletion)complection uid:(NSString *)uid; -+ (void)dd_getHomePageRecommendRoomList:(HttpRequestHelperCompletion)completion uid:(NSString *)uid; -+ (void)dd_getHomePageRecommendListComplection:(HttpRequestHelperCompletion)complection uid:(NSString *)uid tabId:(NSString *)tabId pageNum:(NSString *)pageNum pageSize:(NSString *)pageSize; -+ (void)dd_getHomePageSearchComplection:(HttpRequestHelperCompletion)complection key:(NSString *)key type:(NSString *)type page:(NSString *)page pageSize:(NSString *)pageSize; ++ (void)dd_getHomePageMenuList:(DDRequestToolCompletion)completion uid:(NSString *)uid; ++ (void)dd_getHomePagePickResource:(DDRequestToolCompletion)completion uid:(NSString *)uid rid:(NSString *)rid; ++ (void)homeBannerList:(DDRequestToolCompletion)completion uid:(NSString *)uid type:(NSString *)type; ++ (void)dd_getHomePageTagComplection:(DDRequestToolCompletion)complection uid:(NSString *)uid; ++ (void)dd_getHomePageRecommendRoomList:(DDRequestToolCompletion)completion uid:(NSString *)uid; ++ (void)dd_getHomePageRecommendListComplection:(DDRequestToolCompletion)complection uid:(NSString *)uid tabId:(NSString *)tabId pageNum:(NSString *)pageNum pageSize:(NSString *)pageSize; ++ (void)dd_getHomePageSearchComplection:(DDRequestToolCompletion)complection key:(NSString *)key type:(NSString *)type page:(NSString *)page pageSize:(NSString *)pageSize; @end NS_ASSUME_NONNULL_END diff --git a/yinmeng-ios/DingDangApp/YingMeng/DDMain/DDHome/DDHomeApi/Api+DDHomeApi.m b/yinmeng-ios/DingDangApp/YingMeng/DDMain/DDHome/DDHomeApi/Api+DDHomeApi.m index 46aae3c..11406e1 100644 --- a/yinmeng-ios/DingDangApp/YingMeng/DDMain/DDHome/DDHomeApi/Api+DDHomeApi.m +++ b/yinmeng-ios/DingDangApp/YingMeng/DDMain/DDHome/DDHomeApi/Api+DDHomeApi.m @@ -8,28 +8,45 @@ #import "Api+DDHomeApi.h" @implementation Api (DDHomeApi) -+ (void)dd_getHomePageMenuList:(HttpRequestHelperCompletion)completion uid:(NSString *)uid { - [self makeRequest:@"home/currentResource" method:HttpRequestHelperMethodGET completion:completion, __FUNCTION__, uid, nil]; ++ (void)dd_getHomePageMenuList:(DDRequestToolCompletion)completion uid:(NSString *)uid { + /// home/currentResource + NSString *url = [DDEncryptManager dd_aesDecryptWithText:@"Ug27jbUcnIfIvS5oDGzCDk97ZczB31aveCP6Tt/pU0k="]; + [self makeRequest:url method:DDRequestToolMethodGET completion:completion, __FUNCTION__, uid, nil]; } -+ (void)dd_getHomePagePickResource:(HttpRequestHelperCompletion)completion uid:(NSString *)uid rid:(NSString *)rid { ++ (void)dd_getHomePagePickResource:(DDRequestToolCompletion)completion uid:(NSString *)uid rid:(NSString *)rid { + + /// home/pickResource + NSString *url = [DDEncryptManager dd_aesDecryptWithText:@"gdAniWQH3Hdty50FhzWGku9tUU6qE8U1A4svGgj7lSQ="]; NSMutableDictionary * pararms = [NSMutableDictionary dictionary]; [pararms setObject:uid forKey:@"uid"]; [pararms setObject:rid forKey:@"id"]; - [HttpRequestHelper request:@"home/pickResource" method:HttpRequestHelperMethodGET params:pararms completion:completion]; + [DDRequestTool request:url method:DDRequestToolMethodGET params:pararms completion:completion]; } -+ (void)homeBannerList:(HttpRequestHelperCompletion)completion uid:(NSString *)uid type:(NSString *)type { - [self makeRequest:@"home/banner" method:HttpRequestHelperMethodGET completion:completion, __FUNCTION__, uid, type, nil]; ++ (void)homeBannerList:(DDRequestToolCompletion)completion uid:(NSString *)uid type:(NSString *)type { + + /// home/banner + NSString *url = [DDEncryptManager dd_aesDecryptWithText:@"v/pmkVBiJ/jqFA7yOvQ3Vw=="]; + [self makeRequest:url method:DDRequestToolMethodGET completion:completion, __FUNCTION__, uid, type, nil]; } -+ (void)dd_getHomePageTagComplection:(HttpRequestHelperCompletion)complection uid:(NSString *)uid { - [self makeRequest:@"home/tagV2" method:HttpRequestHelperMethodGET completion:complection, __FUNCTION__, uid, nil]; ++ (void)dd_getHomePageTagComplection:(DDRequestToolCompletion)complection uid:(NSString *)uid { + + /// home/tagV2 + NSString *url = [DDEncryptManager dd_aesDecryptWithText:@"+GgLqI6SrlMJo2bw4fSGPQ=="]; + [self makeRequest:url method:DDRequestToolMethodGET completion:complection, __FUNCTION__, uid, nil]; } -+ (void)dd_getHomePageRecommendRoomList:(HttpRequestHelperCompletion)completion uid:(NSString *)uid { - [self makeRequest:@"home/tab/homeV2" method:HttpRequestHelperMethodGET completion:completion, __FUNCTION__, uid, nil]; ++ (void)dd_getHomePageRecommendRoomList:(DDRequestToolCompletion)completion uid:(NSString *)uid { + /// home/tab/homeV2 + NSString *url = [DDEncryptManager dd_aesDecryptWithText:@"TckcW28WGlygz1CRmrRc9Q=="]; + [self makeRequest:url method:DDRequestToolMethodGET completion:completion, __FUNCTION__, uid, nil]; } -+ (void)dd_getHomePageRecommendListComplection:(HttpRequestHelperCompletion)complection uid:(NSString *)uid tabId:(NSString *)tabId pageNum:(NSString *)pageNum pageSize:(NSString *)pageSize { - [self makeRequest:@"home/tab/mapV2" method:HttpRequestHelperMethodGET completion:complection, __FUNCTION__, uid, tabId, pageNum, pageSize, nil]; ++ (void)dd_getHomePageRecommendListComplection:(DDRequestToolCompletion)complection uid:(NSString *)uid tabId:(NSString *)tabId pageNum:(NSString *)pageNum pageSize:(NSString *)pageSize { + /// home/tab/mapV2 + NSString *url = [DDEncryptManager dd_aesDecryptWithText:@"7gOkQ961jyE8WltlwpeZxQ=="]; + [self makeRequest:url method:DDRequestToolMethodGET completion:complection, __FUNCTION__, uid, tabId, pageNum, pageSize, nil]; } -+ (void)dd_getHomePageSearchComplection:(HttpRequestHelperCompletion)complection key:(NSString *)key type:(NSString *)type page:(NSString *)page pageSize:(NSString *)pageSize { - [self makeRequest:@"search/room" method:HttpRequestHelperMethodGET completion:complection, __FUNCTION__, key, type, page, pageSize, nil]; ++ (void)dd_getHomePageSearchComplection:(DDRequestToolCompletion)complection key:(NSString *)key type:(NSString *)type page:(NSString *)page pageSize:(NSString *)pageSize { + /// search/room + NSString *url = [DDEncryptManager dd_aesDecryptWithText:@"5msaHiHiM6MkRfkc3hGC5Q=="]; + [self makeRequest:url method:DDRequestToolMethodGET completion:complection, __FUNCTION__, key, type, page, pageSize, nil]; } @end diff --git a/yinmeng-ios/DingDangApp/YingMeng/DDMain/DDMine/DDMineApi/Api+DDMineApi.h b/yinmeng-ios/DingDangApp/YingMeng/DDMain/DDMine/DDMineApi/Api+DDMineApi.h index 39e3324..2c52eb6 100644 --- a/yinmeng-ios/DingDangApp/YingMeng/DDMain/DDMine/DDMineApi/Api+DDMineApi.h +++ b/yinmeng-ios/DingDangApp/YingMeng/DDMain/DDMine/DDMineApi/Api+DDMineApi.h @@ -10,16 +10,16 @@ NS_ASSUME_NONNULL_BEGIN @interface Api (DDMineApi) -+ (void)dd_getMainFansListCompletion:(HttpRequestHelperCompletion)completion uid:(NSString *)uid pageNo:(NSString *)pageNo pageSize:(NSString *)pageSize; -+ (void)dd_getMainAttentionCompletion:(HttpRequestHelperCompletion)completion uid:(NSString *)uid likedUid:(NSString *)likedUid ticket:(NSString *)ticket type:(NSString *)type; -+ (void)dd_getMainAttentionListCompletion:(HttpRequestHelperCompletion)completion uid:(NSString *)uid pageNo:(NSString *)pageNo pageSize:(NSString *)pageSize; -+ (void)dd_getMainFootPrint:(HttpRequestHelperCompletion)completion uid:(NSString *)uid page:(NSString *)page pageSize:(NSString *)pageSize; -+ (void)dd_getMainVisitorListCompletion:(HttpRequestHelperCompletion)completion pageNum:(NSString *)pageNum pageSize:(NSString *)pageSize; -+ (void)dd_getMainRechargeList:(HttpRequestHelperCompletion)completion channelType:(NSString *)channelType; -+ (void)dd_getMainCheckReceipt:(HttpRequestHelperCompletion)completion chooseEnv:(NSString *)chooseEnv chargeRecordId:(NSString *)chargeRecordId transcationId:(NSString *)transcationId uid:(NSString *)uid ticket:(NSString *)ticket; -+ (void)dd_dd_getMainRequestIAPRecharge:(HttpRequestHelperCompletion)completion chargeProdId:(NSString *)chargeProdId uid:(NSString *)uid ticket:(NSString *)ticket deviceInfo:(NSString *)deviceInfo clientIp:(NSString *)clientIp; -+ (void)dd_getMainDressUpShopList:(HttpRequestHelperCompletion)completion dressType:(NSString *)dressType; -+ (void)dd_getMainUserGiftWall:(HttpRequestHelperCompletion)comletion uid:(NSString *)uid giftType:(NSString *)giftType; ++ (void)dd_getMainFansListCompletion:(DDRequestToolCompletion)completion uid:(NSString *)uid pageNo:(NSString *)pageNo pageSize:(NSString *)pageSize; ++ (void)dd_getMainAttentionCompletion:(DDRequestToolCompletion)completion uid:(NSString *)uid likedUid:(NSString *)likedUid ticket:(NSString *)ticket type:(NSString *)type; ++ (void)dd_getMainAttentionListCompletion:(DDRequestToolCompletion)completion uid:(NSString *)uid pageNo:(NSString *)pageNo pageSize:(NSString *)pageSize; ++ (void)dd_getMainFootPrint:(DDRequestToolCompletion)completion uid:(NSString *)uid page:(NSString *)page pageSize:(NSString *)pageSize; ++ (void)dd_getMainVisitorListCompletion:(DDRequestToolCompletion)completion pageNum:(NSString *)pageNum pageSize:(NSString *)pageSize; ++ (void)dd_getMainRechargeList:(DDRequestToolCompletion)completion channelType:(NSString *)channelType; ++ (void)dd_getMainCheckReceipt:(DDRequestToolCompletion)completion chooseEnv:(NSString *)chooseEnv chargeRecordId:(NSString *)chargeRecordId transcationId:(NSString *)transcationId uid:(NSString *)uid ticket:(NSString *)ticket; ++ (void)dd_dd_getMainRequestIAPRecharge:(DDRequestToolCompletion)completion chargeProdId:(NSString *)chargeProdId uid:(NSString *)uid ticket:(NSString *)ticket deviceInfo:(NSString *)deviceInfo clientIp:(NSString *)clientIp; ++ (void)dd_getMainDressUpShopList:(DDRequestToolCompletion)completion dressType:(NSString *)dressType; ++ (void)dd_getMainUserGiftWall:(DDRequestToolCompletion)comletion uid:(NSString *)uid giftType:(NSString *)giftType; @end diff --git a/yinmeng-ios/DingDangApp/YingMeng/DDMain/DDMine/DDMineApi/Api+DDMineApi.m b/yinmeng-ios/DingDangApp/YingMeng/DDMain/DDMine/DDMineApi/Api+DDMineApi.m index 8f00da9..8e17911 100644 --- a/yinmeng-ios/DingDangApp/YingMeng/DDMain/DDMine/DDMineApi/Api+DDMineApi.m +++ b/yinmeng-ios/DingDangApp/YingMeng/DDMain/DDMine/DDMineApi/Api+DDMineApi.m @@ -8,38 +8,66 @@ #import "Api+DDMineApi.h" @implementation Api (DDMineApi) -+ (void)dd_getMainFansListCompletion:(HttpRequestHelperCompletion)completion uid:(NSString *)uid pageNo:(NSString *)pageNo pageSize:(NSString *)pageSize { - [self makeRequest:@"fans/fanslist" method:HttpRequestHelperMethodGET completion:completion, __FUNCTION__, uid, pageNo, pageSize, nil]; ++ (void)dd_getMainFansListCompletion:(DDRequestToolCompletion)completion uid:(NSString *)uid pageNo:(NSString *)pageNo pageSize:(NSString *)pageSize { + + /// fans/fanslist + NSString *url = [DDEncryptManager dd_aesDecryptWithText:@"zBxBj0ZniYqWlBRf0fhEUQ=="]; + [self makeRequest:url method:DDRequestToolMethodGET completion:completion, __FUNCTION__, uid, pageNo, pageSize, nil]; } -+ (void)dd_getMainAttentionCompletion:(HttpRequestHelperCompletion)completion uid:(NSString *)uid likedUid:(NSString *)likedUid ticket:(NSString *)ticket type:(NSString *)type { - [self makeRequest:@"fans/like" method:HttpRequestHelperMethodPOST completion:completion, __FUNCTION__, uid, likedUid, ticket, type, nil]; ++ (void)dd_getMainAttentionCompletion:(DDRequestToolCompletion)completion uid:(NSString *)uid likedUid:(NSString *)likedUid ticket:(NSString *)ticket type:(NSString *)type { + + /// fans/like + NSString *url = [DDEncryptManager dd_aesDecryptWithText:@"kGQqq0f38dxz/430g/zmDQ=="]; + [self makeRequest:url method:DDRequestToolMethodPOST completion:completion, __FUNCTION__, uid, likedUid, ticket, type, nil]; } -+ (void)dd_getMainAttentionListCompletion:(HttpRequestHelperCompletion)completion uid:(NSString *)uid pageNo:(NSString *)pageNo pageSize:(NSString *)pageSize { - [self makeRequest:@"fans/following" method:HttpRequestHelperMethodGET completion:completion, __FUNCTION__, uid, pageNo, pageSize, nil]; ++ (void)dd_getMainAttentionListCompletion:(DDRequestToolCompletion)completion uid:(NSString *)uid pageNo:(NSString *)pageNo pageSize:(NSString *)pageSize { + + /// fans/following + NSString *url = [DDEncryptManager dd_aesDecryptWithText:@"1vvztie72x9OVVPHk5b9WQ=="]; + [self makeRequest:url method:DDRequestToolMethodGET completion:completion, __FUNCTION__, uid, pageNo, pageSize, nil]; } -+ (void)dd_getMainFootPrint:(HttpRequestHelperCompletion)completion uid:(NSString *)uid page:(NSString *)page pageSize:(NSString *)pageSize { - [self makeRequest:@"userroom/getInRoomRecord" method:HttpRequestHelperMethodGET completion:completion, __FUNCTION__, uid, page, pageSize, nil]; ++ (void)dd_getMainFootPrint:(DDRequestToolCompletion)completion uid:(NSString *)uid page:(NSString *)page pageSize:(NSString *)pageSize { + + + /// userroom/getInRoomRecord + NSString *url = [DDEncryptManager dd_aesDecryptWithText:@"uVXyMw3lgdBYqkruy4XDM1fa4u2pOEVU2JZmiH8RbqQ="]; + [self makeRequest:url method:DDRequestToolMethodGET completion:completion, __FUNCTION__, uid, page, pageSize, nil]; } -+ (void)dd_getMainVisitorListCompletion:(HttpRequestHelperCompletion)completion pageNum:(NSString *)pageNum pageSize:(NSString *)pageSize { - [self makeRequest:@"uservisitrecord/visitUserList" method:HttpRequestHelperMethodGET completion:completion, __FUNCTION__, pageNum, pageSize, nil]; ++ (void)dd_getMainVisitorListCompletion:(DDRequestToolCompletion)completion pageNum:(NSString *)pageNum pageSize:(NSString *)pageSize { + + /// uservisitrecord/visitUserList + NSString *url = [DDEncryptManager dd_aesDecryptWithText:@"4nc4yN4680RKkWv+HXZZWp2S+SN54LogKeBIj1AZn1I="]; + [self makeRequest:url method:DDRequestToolMethodGET completion:completion, __FUNCTION__, pageNum, pageSize, nil]; } -+ (void)dd_getMainRechargeList:(HttpRequestHelperCompletion)completion channelType:(NSString *)channelType { - NSString *getUrl =@"chargeprod/list"; - [self makeRequest:getUrl method:HttpRequestHelperMethodGET completion:completion, __FUNCTION__,channelType, nil]; ++ (void)dd_getMainRechargeList:(DDRequestToolCompletion)completion channelType:(NSString *)channelType { + + /// chargeprod/list + NSString *getUrl = [DDEncryptManager dd_aesDecryptWithText:@"NVTLVC7gVGeWWia1+CcmwA=="]; + [self makeRequest:getUrl method:DDRequestToolMethodGET completion:completion, __FUNCTION__,channelType, nil]; } -+ (void)dd_getMainCheckReceipt:(HttpRequestHelperCompletion)completion chooseEnv:(NSString *)chooseEnv chargeRecordId:(NSString *)chargeRecordId transcationId:(NSString *)transcationId uid:(NSString *)uid ticket:(NSString *)ticket { - NSString *getUrl = @"storeKitV2/verifyOrder"; - [self makeRequest:getUrl method:HttpRequestHelperMethodPOST completion:completion, __FUNCTION__, chooseEnv, chargeRecordId, transcationId, uid, ticket, nil]; ++ (void)dd_getMainCheckReceipt:(DDRequestToolCompletion)completion chooseEnv:(NSString *)chooseEnv chargeRecordId:(NSString *)chargeRecordId transcationId:(NSString *)transcationId uid:(NSString *)uid ticket:(NSString *)ticket { + + /// storeKitV2/verifyOrder + NSString *getUrl = [DDEncryptManager dd_aesDecryptWithText:@"6N1znjVvZNnIl1SCFGF+YEJYFuhiQakENe5L7oVTERM="]; + [self makeRequest:getUrl method:DDRequestToolMethodPOST completion:completion, __FUNCTION__, chooseEnv, chargeRecordId, transcationId, uid, ticket, nil]; } -+ (void)dd_dd_getMainRequestIAPRecharge:(HttpRequestHelperCompletion)completion chargeProdId:(NSString *)chargeProdId uid:(NSString *)uid ticket:(NSString *)ticket deviceInfo:(NSString *)deviceInfo clientIp:(NSString *)clientIp { - NSString *getUrl = @"storeKitV/placeOrder";// - [self makeRequest:getUrl method:HttpRequestHelperMethodPOST completion:completion, __FUNCTION__,chargeProdId, uid, ticket, deviceInfo, clientIp, nil]; ++ (void)dd_dd_getMainRequestIAPRecharge:(DDRequestToolCompletion)completion chargeProdId:(NSString *)chargeProdId uid:(NSString *)uid ticket:(NSString *)ticket deviceInfo:(NSString *)deviceInfo clientIp:(NSString *)clientIp { + + /// storeKitV/placeOrder + NSString *getUrl = [DDEncryptManager dd_aesDecryptWithText:@"xdu4oBXAPyTiqXHp9aIxBdNskY5sfuYogM9LVAEoO0o="]; + [self makeRequest:getUrl method:DDRequestToolMethodPOST completion:completion, __FUNCTION__,chargeProdId, uid, ticket, deviceInfo, clientIp, nil]; } -+ (void)dd_getMainDressUpShopList:(HttpRequestHelperCompletion)completion dressType:(NSString *)dressType { - [self makeRequest:@"dress/shop/list" method:HttpRequestHelperMethodGET completion:completion, __FUNCTION__, dressType, nil]; ++ (void)dd_getMainDressUpShopList:(DDRequestToolCompletion)completion dressType:(NSString *)dressType { + + /// dress/shop/list + NSString *url = [DDEncryptManager dd_aesDecryptWithText:@"t6kZmzITyB1jVSfDykUMXA=="]; + [self makeRequest:url method:DDRequestToolMethodGET completion:completion, __FUNCTION__, dressType, nil]; } -+ (void)dd_getMainUserGiftWall:(HttpRequestHelperCompletion)comletion uid:(NSString *)uid giftType:(NSString *)giftType { - [self makeRequest:@"giftwall/getByGiftType" method:HttpRequestHelperMethodGET completion:comletion, __FUNCTION__, uid, giftType, nil]; ++ (void)dd_getMainUserGiftWall:(DDRequestToolCompletion)comletion uid:(NSString *)uid giftType:(NSString *)giftType { + + /// giftwall/getByGiftType + NSString *url = [DDEncryptManager dd_aesDecryptWithText:@"B/NyIIwMdpZPCjWixdc/I0tRbmiefGlsKdpe0YrHCkM="]; + [self makeRequest:url method:DDRequestToolMethodGET completion:comletion, __FUNCTION__, uid, giftType, nil]; } diff --git a/yinmeng-ios/Podfile.lock b/yinmeng-ios/Podfile.lock index a1bebb0..de00cc7 100644 --- a/yinmeng-ios/Podfile.lock +++ b/yinmeng-ios/Podfile.lock @@ -591,4 +591,4 @@ SPEC CHECKSUMS: PODFILE CHECKSUM: 4a3e8c3e3691165802b43178346af03c39e4ae9b -COCOAPODS: 1.12.1 +COCOAPODS: 1.14.2