no message

XFFruit/Controllers/HTTPController/ICRHTTPController.m

@@ -1301,7 +1301,7 @@ acceptTypeJson:YES
         }
     };
     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];
     [self POST:encodeUrlStr parameters:dict needToken:NO acceptTypeJson:YES success:success failure:failure];
 }

XFFruit/Macro/ICRAppMacro.h

@@ -26,9 +26,9 @@
 //#define HTTP_REST_API_BASE_URL          @"http://115.28.191.44:8080/IPatrol/rest"
 
 //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 "ICRUtilsMacro.h"

XFFruit/ViewControllers/Login/ICRLoginViewController.m

@@ -116,33 +116,31 @@
 //    NSString *nsRegisterCode = self.m_containerView.m_cCodeTextF.text;
 //    NSString *nsUserName = self.m_containerView.m_userNameTextF.text;
 //    NSString *nsPassword = [self.m_containerView.m_passwordTextF.text uppercaseMD5String];
-//    
-//    void(^succ)(id) = ^(id data) {
-//        ICRUserUtil *userUtil = [ICRUserUtil sharedInstance];
-//        userUtil.bAutoLogin = @( [_m_containerView isAutoLogin] );
-//        [userUtil saveArchive];
-//        
-//        ICRAppViewControllerManager *mgr =
-//        [ICRAppViewControllerManager getAppViewControllerManager];
-//        
-//        [mgr openMainFrame];
-//    };
-//    
-//    void(^fail)(id) = ^(id data) {
-//        [IBTLoadingView showTips:data];
-//    };
-//    ICRHTTPController *httpCtrl = [ICRHTTPController sharedController];
-//    [httpCtrl doLoginWithUserName:nsUserName
-//                         password:nsPassword
-//                     registerCode:nsRegisterCode
-//                          success:succ
-//                          failure:fail];
-    
-    ICRAppViewControllerManager *mgr =
-    [ICRAppViewControllerManager getAppViewControllerManager];
-    
-    [mgr openMainFrame];
-    
+        NSString *nsRegisterCode = @"211534962";
+        NSString *nsUserName = @"admin";
+        NSString *nsPassword = @"thoradmin";
+   
+    
+    void(^succ)(id) = ^(id data) {
+        ICRUserUtil *userUtil = [ICRUserUtil sharedInstance];
+        userUtil.bAutoLogin = @( [_m_containerView isAutoLogin] );
+        [userUtil saveArchive];
+        
+        ICRAppViewControllerManager *mgr =
+        [ICRAppViewControllerManager getAppViewControllerManager];
+        
+        [mgr openMainFrame];
+    };
+    
+    void(^fail)(id) = ^(id data) {
+        [IBTLoadingView showTips:data];
+    };
+    ICRHTTPController *httpCtrl = [ICRHTTPController sharedController];
+    [httpCtrl doLoginWithUserName:nsUserName
+                         password:nsPassword
+                     registerCode:nsRegisterCode
+                          success:succ
+                          failure:fail];
 }
 
 #pragma mark - TextObserver