Просмотр исходного кода

1.修改iOS Apex Drivers登陆请求。

Pen Li 7 лет назад
Родитель
Сommit
24c111425c

+ 0 - 2
Redant Drivers/Apex And Drivers/AppDelegate.m

@@ -150,8 +150,6 @@
     }];
     [application registerForRemoteNotifications];
     
-    NSUserDefaults *userDefaults = [[NSUserDefaults alloc] initWithSuiteName:@"group.radrivers"];
-    [userDefaults setObject:@"Haha" forKey:@"test"];
     
     return YES;
 }

+ 10 - 7
Redant Drivers/Apex And Drivers/RADataProvider.m

@@ -116,16 +116,19 @@
 + (NSDictionary *)requestLogin:(NSString *)user password:(NSString *)pwd {
     
 
-    return @{
-             @"result" : @(RESULT_TRUE)
-             };
+//    return @{
+//             @"result" : @(RESULT_TRUE)
+//             };
     
     NSMutableDictionary *params = [NSMutableDictionary dictionary];
-
-    [params setObject:user forKey:@"user"];
-    [params setObject:pwd forKey:@"password"];
     
-    NSData* json=[self get_json:URL_HOST parameters:params  file:nil];
+    user = [[RASingleton sharedInstance] encryptString:user];
+    pwd = [[RASingleton sharedInstance] encryptString:pwd];
+    
+    [params setObject:user forKey:@"name"];
+    [params setObject:pwd forKey:@"password"];
+
+    NSData* json=[self get_json:URL_LOGIN parameters:params  file:nil];
     
     return [self handleJsonData:json];
 }

+ 4 - 0
Redant Drivers/Apex And Drivers/RASingleton.h

@@ -38,4 +38,8 @@
 
 - (void)loadSavedReuqiredLocation;
 
+- (NSString *)encryptString:(NSString *)str;
+
+- (NSString *)decryptString:(NSString *)str;
+
 @end

+ 19 - 4
Redant Drivers/Apex And Drivers/RASingleton.m

@@ -35,7 +35,7 @@ static RASingleton *singleton;
     if (!self.user) {
         return nil;
     }
-    return [AESCrypt encrypt:self.user password:self.secretKey];
+    return [self encryptString:self.user];
 }
 
 - (NSString *)encryptPassword {
@@ -43,7 +43,7 @@ static RASingleton *singleton;
     if (!self.password) {
         return nil;
     }
-    return [AESCrypt encrypt:self.password password:self.secretKey];
+    return [self encryptString:self.password];
 }
 
 - (void)saveUserInfo {
@@ -61,12 +61,12 @@ static RASingleton *singleton;
 }
 
 - (NSString *)savedUser {
-    NSString * user = [AESCrypt decrypt:[[NSUserDefaults standardUserDefaults] stringForKey:@"user"] password:self.secretKey];
+    NSString * user = [self decryptString:[[NSUserDefaults standardUserDefaults] stringForKey:@"user"]];
     return user;
 }
 
 - (NSString *)savedPassword {
-    NSString * password = [AESCrypt decrypt:[[NSUserDefaults standardUserDefaults] stringForKey:@"password"] password:self.secretKey];
+    NSString * password = [self decryptString:[[NSUserDefaults standardUserDefaults] stringForKey:@"password"]];
     return password;
 }
 
@@ -139,5 +139,20 @@ static RASingleton *singleton;
     
 }
 
+#pragma mark - Utils
+
+- (NSString *)encryptString:(NSString *)str {
+    if (str == nil) {
+        return nil;
+    }
+    return [AESCrypt encrypt:str password:self.secretKey];
+}
+
+- (NSString *)decryptString:(NSString *)str {
+    if (str == nil) {
+        return nil;
+    }
+    return [AESCrypt decrypt:str password:self.secretKey];
+}
 
 @end

+ 5 - 2
Redant Drivers/Apex And Drivers/config.h

@@ -9,7 +9,10 @@
 #ifndef config_h
 #define config_h
 
-#define URL_ERR_LOG     @""
-#define URL_HOST        @"http://192.168.0.124:8080/j/userLogin.do"
+#define URL_HOST                @"http://192.168.0.124:8080"
+#define APPENDING_STR(var)      [URL_HOST stringByAppendingString:var]
+
+#define URL_ERR_LOG             @""
+#define URL_LOGIN               APPENDING_STR(@"/j/userLogin.do/")
 
 #endif /* config_h */