Skip to content

X
xffruit
Commit ae3ccba1 authored by 陈俊俊's avatar 陈俊俊
Browse files
Options

no message

parent 9c691fb9
Hide whitespace changes
Inline Side-by-side
Showing with 28 additions and 30 deletions
XFFruit/Controllers/HTTPController/ICRHTTPController.m
View file @ ae3ccba1
...@@ -1301,7 +1301,7 @@ acceptTypeJson:YES ...@@ -1301,7 +1301,7 @@ acceptTypeJson:YES
} }
}; };
NSDictionary *dict = data; NSDictionary *dict = data;
NSString *urlStr = [[[self class] UrlForPluginHTTPAction:XFFHttp_SurveySave] stringByAppendingFormat:@"?time=%@&operator.id=%@&operator.operName=%@&enterprise=%@",[[NSDate date] httpParameterString],@"admin",@"123456",@"402851814e20d2d9014e20d2e8960030"]; NSString *urlStr = [[[self class] UrlForPluginHTTPAction:XFFHttp_SurveySave] stringByAppendingFormat:@"?time=%@&operator.id=%@&operator.operName=%@&enterprise=%@",[[NSDate date] httpParameterString],@"admin",@"thoradmin",@"211534962"];
NSString *encodeUrlStr = [urlStr stringByAddingPercentEscapesUsingEncoding:NSUTF8StringEncoding]; NSString *encodeUrlStr = [urlStr stringByAddingPercentEscapesUsingEncoding:NSUTF8StringEncoding];
[self POST:encodeUrlStr parameters:dict needToken:NO acceptTypeJson:YES success:success failure:failure]; [self POST:encodeUrlStr parameters:dict needToken:NO acceptTypeJson:YES success:success failure:failure];
} }
......
XFFruit/Macro/ICRAppMacro.h
View file @ ae3ccba1
...@@ -26,9 +26,9 @@ ...@@ -26,9 +26,9 @@
//#define HTTP_REST_API_BASE_URL @"http://115.28.191.44:8080/IPatrol/rest" //#define HTTP_REST_API_BASE_URL @"http://115.28.191.44:8080/IPatrol/rest"
//new HTTP //new HTTP
#define HTTP_REST_API_BASE_URL @"http://218.244.151.129:8281/XFFruit-server/rest" #define HTTP_REST_API_BASE_URL @"http://218.244.151.129:7580/cruiser-server/rest"
//#define HTTP_REST_API_BASE_URL @"http://218.244.151.129:8281/XFFruit-server/rest"
// Import Headers // Import Headers
#import "ICRUtilsMacro.h" #import "ICRUtilsMacro.h"
......
XFFruit/ViewControllers/Login/ICRLoginViewController.m
View file @ ae3ccba1
...@@ -116,33 +116,31 @@ ...@@ -116,33 +116,31 @@
// NSString *nsRegisterCode = self.m_containerView.m_cCodeTextF.text; // NSString *nsRegisterCode = self.m_containerView.m_cCodeTextF.text;
// NSString *nsUserName = self.m_containerView.m_userNameTextF.text; // NSString *nsUserName = self.m_containerView.m_userNameTextF.text;
// NSString *nsPassword = [self.m_containerView.m_passwordTextF.text uppercaseMD5String]; // NSString *nsPassword = [self.m_containerView.m_passwordTextF.text uppercaseMD5String];
// NSString *nsRegisterCode = @"211534962";
// void(^succ)(id) = ^(id data) { NSString *nsUserName = @"admin";
// ICRUserUtil *userUtil = [ICRUserUtil sharedInstance]; NSString *nsPassword = @"thoradmin";
// userUtil.bAutoLogin = @( [_m_containerView isAutoLogin] );
// [userUtil saveArchive];
// void(^succ)(id) = ^(id data) {
// ICRAppViewControllerManager *mgr = ICRUserUtil *userUtil = [ICRUserUtil sharedInstance];
// [ICRAppViewControllerManager getAppViewControllerManager]; userUtil.bAutoLogin = @( [_m_containerView isAutoLogin] );
// [userUtil saveArchive];
// [mgr openMainFrame];
// }; ICRAppViewControllerManager *mgr =
// [ICRAppViewControllerManager getAppViewControllerManager];
// void(^fail)(id) = ^(id data) {
// [IBTLoadingView showTips:data]; [mgr openMainFrame];
// }; };
// ICRHTTPController *httpCtrl = [ICRHTTPController sharedController];
// [httpCtrl doLoginWithUserName:nsUserName void(^fail)(id) = ^(id data) {
// password:nsPassword [IBTLoadingView showTips:data];
// registerCode:nsRegisterCode };
// success:succ ICRHTTPController *httpCtrl = [ICRHTTPController sharedController];
// failure:fail]; [httpCtrl doLoginWithUserName:nsUserName
password:nsPassword
ICRAppViewControllerManager *mgr = registerCode:nsRegisterCode
[ICRAppViewControllerManager getAppViewControllerManager]; success:succ
failure:fail];
[mgr openMainFrame];
} }
#pragma mark - TextObserver #pragma mark - TextObserver
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment