Steven 5 سال پیش
والد
کامیت
b592f43657

+ 11 - 3
MusicGradeExam/MusicGradeExam/Base/KSBaseWKWebViewController.m

@@ -130,10 +130,18 @@
 
 - (NSString *)url {
     if (_url) {
-#warning 修改
+        if ([_url containsString:@"Authorization="]) {
+            NSRange range = [_url rangeOfString:@"Authorization="];
+            if (range.location != NSNotFound) {
+                _url = [_url substringToIndex:range.location-1];
+            }
+        }
         NSString *sepectString = [_url containsString:@"?"] ? @"&" : @"?";
-        NSString *token = [[NSString stringWithFormat:@"Authorization=%@ %@", UserDefault(Token_type), UserDefault(TokenKey)] stringByAddingPercentEncodingWithAllowedCharacters:[NSCharacterSet URLQueryAllowedCharacterSet]];
-        _url = [NSString stringWithFormat:@"%@%@%@",_url, sepectString, token];
+        NSString *tokenStr = UserDefault(TokenKey);
+        if (![NSString isEmptyString:tokenStr]) {
+            NSString *token = [[NSString stringWithFormat:@"Authorization=%@ %@", UserDefault(Token_type), tokenStr] stringByAddingPercentEncodingWithAllowedCharacters:[NSCharacterSet URLQueryAllowedCharacterSet]];
+            _url = [NSString stringWithFormat:@"%@%@%@",_url, sepectString, token];
+        }
     }
     return _url;
 }

+ 1 - 3
MusicGradeExam/MusicGradeExam/UI/Classroom/Service/Classroom/Model/Classroom.m

@@ -104,9 +104,7 @@
 }
 
 - (RoomMember *)getMember:(NSString *)userId {
-    if ([userId isEqualToString:self.currentMember.userId]) {
-        return self.currentMember;
-    }
+
     for(RoomMember *mem in self.memberList) {
         if([mem.userId isEqualToString:userId]) {
             return mem;