Merge branch 'master' of ssh://10.10.100.21/source/iOSUU

# Conflicts:
#	shiku_im/shiku_im/controller/myOA/ALLURLHeader.h
#	shiku_im/shiku_im/文件夹1/设备管理/viewcontellers/四大表单/LYYDocumentDetailVC.m
#	shiku_im/shiku_im/文件夹1/设备管理/viewcontellers/四大表单/LYYDocumentVC.m
#	shiku_im/shiku_im/文件夹1/设备管理2.0/Controllers/DeviceFormVC.m

shiku_im/shiku_im.xcodeproj/project.pbxproj

@@ -1458,6 +1458,7 @@
 		995CD902214F7A180068859B /* UASClientDetailVC.m in Sources */ = {isa = PBXBuildFile; fileRef = 995CD901214F7A180068859B /* UASClientDetailVC.m */; settings = {COMPILER_FLAGS = "-fobjc-arc"; }; };
 		995CD905214F7A930068859B /* UASClientDetailFooterView.m in Sources */ = {isa = PBXBuildFile; fileRef = 995CD904214F7A930068859B /* UASClientDetailFooterView.m */; settings = {COMPILER_FLAGS = "-fobjc-arc"; }; };
 		995CD908214FA1F70068859B /* UASClientDocuVC.m in Sources */ = {isa = PBXBuildFile; fileRef = 995CD907214FA1F70068859B /* UASClientDocuVC.m */; settings = {COMPILER_FLAGS = "-fobjc-arc"; }; };
+		996069DC230CD24A0073E089 /* YRWebVC.m in Sources */ = {isa = PBXBuildFile; fileRef = 996069DB230CD24A0073E089 /* YRWebVC.m */; settings = {COMPILER_FLAGS = "-fobjc-arc"; }; };
 		9961DACD2195678E007CA402 /* scheData.json in Resources */ = {isa = PBXBuildFile; fileRef = 9961DACC2195678D007CA402 /* scheData.json */; };
 		9961DAD021956846007CA402 /* UASScheHeader.m in Sources */ = {isa = PBXBuildFile; fileRef = 9961DACF21956846007CA402 /* UASScheHeader.m */; settings = {COMPILER_FLAGS = "-fobjc-arc"; }; };
 		9961DAD32195687D007CA402 /* UASScheModel.m in Sources */ = {isa = PBXBuildFile; fileRef = 9961DAD22195687D007CA402 /* UASScheModel.m */; settings = {COMPILER_FLAGS = "-fobjc-arc"; }; };
@@ -1688,7 +1689,7 @@
 		AA3C8DF81EC072E60058C5C3 /* VisitReportCustomView.m in Sources */ = {isa = PBXBuildFile; fileRef = AA3C8DF71EC072E60058C5C3 /* VisitReportCustomView.m */; settings = {COMPILER_FLAGS = "-fobjc-arc"; }; };
 		AA3C8DFB1EC077840058C5C3 /* CustomTableViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = AA3C8DFA1EC077840058C5C3 /* CustomTableViewCell.m */; settings = {COMPILER_FLAGS = "-fobjc-arc"; }; };
 		AA3CFB221F468C790045B1ED /* ReportMenuVC.m in Sources */ = {isa = PBXBuildFile; fileRef = AA3CFB211F468C790045B1ED /* ReportMenuVC.m */; settings = {COMPILER_FLAGS = "-fobjc-arc"; }; };
-		AA3CFB251F4690560045B1ED /* ReportMenuModel.m in Sources */ = {isa = PBXBuildFile; fileRef = AA3CFB241F4690560045B1ED /* ReportMenuModel.m */; };
+		AA3CFB251F4690560045B1ED /* ReportMenuModel.m in Sources */ = {isa = PBXBuildFile; fileRef = AA3CFB241F4690560045B1ED /* ReportMenuModel.m */; settings = {COMPILER_FLAGS = "-fobjc-arc"; }; };
 		AA40A2B51EC2B6AD00A23AF5 /* SearcherDescribleVC.m in Sources */ = {isa = PBXBuildFile; fileRef = AA40A2B41EC2B6AD00A23AF5 /* SearcherDescribleVC.m */; };
 		AA40A2B71EC2EE8E00A23AF5 /* clearImage@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = AA40A2B61EC2EE8E00A23AF5 /* clearImage@2x.png */; };
 		AA4463651ECD844400DE000B /* CustomerDetailVC.m in Sources */ = {isa = PBXBuildFile; fileRef = AA4463641ECD844400DE000B /* CustomerDetailVC.m */; settings = {COMPILER_FLAGS = "-fobjc-arc"; }; };
@@ -5138,6 +5139,8 @@
 		995CD904214F7A930068859B /* UASClientDetailFooterView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = UASClientDetailFooterView.m; sourceTree = "<group>"; };
 		995CD906214FA1F70068859B /* UASClientDocuVC.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = UASClientDocuVC.h; sourceTree = "<group>"; };
 		995CD907214FA1F70068859B /* UASClientDocuVC.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = UASClientDocuVC.m; sourceTree = "<group>"; };
+		996069DA230CD2490073E089 /* YRWebVC.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = YRWebVC.h; sourceTree = "<group>"; };
+		996069DB230CD24A0073E089 /* YRWebVC.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = YRWebVC.m; sourceTree = "<group>"; };
 		9961DACC2195678D007CA402 /* scheData.json */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.json; path = scheData.json; sourceTree = "<group>"; };
 		9961DACE21956846007CA402 /* UASScheHeader.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = UASScheHeader.h; sourceTree = "<group>"; };
 		9961DACF21956846007CA402 /* UASScheHeader.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = UASScheHeader.m; sourceTree = "<group>"; };
@@ -12210,6 +12213,15 @@
 			name = UIDevice;
 			sourceTree = "<group>";
 		};
+		996069D9230CD21A0073E089 /* WebView */ = {
+			isa = PBXGroup;
+			children = (
+				996069DA230CD2490073E089 /* YRWebVC.h */,
+				996069DB230CD24A0073E089 /* YRWebVC.m */,
+			);
+			name = WebView;
+			sourceTree = "<group>";
+		};
 		99B02ADC22EED6650014A144 /* RN */ = {
 			isa = PBXGroup;
 			children = (
@@ -14129,6 +14141,7 @@
 		B858A46C1D62E4D800BAA0E2 /* lib(工具类) */ = {
 			isa = PBXGroup;
 			children = (
+				996069D9230CD21A0073E089 /* WebView */,
 				9911B8E92308D5CE0064F498 /* UIDevice */,
 				99D0B9F721378E4C0002DFC4 /* TIPopGesture */,
 				276522AC20F5DC3300AA0F67 /* CLSlider */,
@@ -19409,6 +19422,7 @@
 				27DB548B20DB7EED00BAB4C7 /* NetAccessModel.m in Sources */,
 				CC875A5A19361892007D2DA1 /* CDataScanner_Extensions.m in Sources */,
 				CCE2416E18FFB8EB00A3CB5A /* XMPPDigestMD5Authentication.m in Sources */,
+				996069DC230CD24A0073E089 /* YRWebVC.m in Sources */,
 				20BEEDEE1FC6BF4E006384DA /* UASProdueCityMainModel.m in Sources */,
 				CCE242FB18FFB8EB00A3CB5A /* XMPPIQ.m in Sources */,
 				276BDE9D20A17F4600C1DB57 /* FPwToEmailSucVC.m in Sources */,

shiku_im/shiku_im.xcodeproj/xcshareddata/xcschemes/shiku_im.xcscheme

@@ -65,7 +65,7 @@
       </AdditionalOptions>
    </LaunchAction>
    <ProfileAction
-      buildConfiguration = "Release"
+      buildConfiguration = "Debug"
       shouldUseLaunchSchemeArgsEnv = "YES"
       savedToolIdentifier = ""
       useCustomWorkingDirectory = "NO"

shiku_im/shiku_im/AppDelegate.mm

@@ -561,7 +561,7 @@
     
     if (self.allowRotation == YES) {
         //横屏
-       return [Orientation getOrientation];
+       return UIInterfaceOrientationMaskLandscapeRight;
         
     }else{
         //竖屏
@@ -2034,7 +2034,7 @@
         
         NSString *sessionId=[userDefault stringForKey:@"sessionId"];
         
-        NSString * ips=[userDefault objectForKey:@"ipAndPort"];
+        NSString * ips=[UASUserInfo shareManager].urlIp;
         
         NSString * userID=[userDefault objectForKey:@"erpaccount"];
         
@@ -2395,7 +2395,7 @@
     
     NSString * sessionId=[userDefault stringForKey:@"sessionId"];
     
-    NSString * ips=[userDefault objectForKey:@"ipAndPort"];
+    NSString * ips=[UASUserInfo shareManager].urlIp;
     
     NSString * userID=[userDefault objectForKey:@"erpaccount"];
     
@@ -3122,7 +3122,7 @@
 //    }
 //    
 //    NSString * emcode = [[NSUserDefaults standardUserDefaults] stringForKey:@"erpaccount"];
-//    NSString * ipStr = [[NSUserDefaults standardUserDefaults] stringForKey:@"ipAndPort"];
+//    NSString * ipStr = [UASUserInfo shareManager].urlIp;
 //    NSString *sessionId = [[NSUserDefaults standardUserDefaults] stringForKey:@"sessionId"];
 //    
 //    NSString *url = [NSString stringWithFormat:@"%@/mobile/queryMobileMac.action?master=%@&sessionUser=%@&emcode=%@&macaddress=%@&sessionId=%@",ipStr,g_master,g_sessionUser,emcode,locaIdent,sessionId];
@@ -3260,7 +3260,7 @@
     //取出sessionID和IP和员工编号
     NSUserDefaults * userDefault=[NSUserDefaults standardUserDefaults];
     NSString * sessionId=[userDefault stringForKey:@"sessionId"];
-    NSString * ips=[userDefault objectForKey:@"ipAndPort"];
+    NSString * ips=[UASUserInfo shareManager].urlIp;
     NSString * userID=[[NSUserDefaults standardUserDefaults] objectForKey:@"erpaccount"];
     NSString * master=[[[NSUserDefaults standardUserDefaults] objectForKey:@"masterDic"]objectForKey:@"ma_user"];
     NSString * userNum=[userDefault objectForKey:kMY_USER_LoginName];
@@ -3631,9 +3631,8 @@
     
     //不管有没有请求成功都要创建表
     //创建表存数据
-
     NSString * emcode = [[NSUserDefaults standardUserDefaults] stringForKey:@"erpaccount"];
-    NSString * ipStr = [[NSUserDefaults standardUserDefaults] stringForKey:@"ipAndPort"];
+    NSString * ipStr = [UASUserInfo shareManager].urlIp;
     NSString *sessionId = [[NSUserDefaults standardUserDefaults] stringForKey:@"sessionId"];
     
     NSString *url = [NSString stringWithFormat:@"%@mobile/mobileoutplan.action?master=%@&sessionUser=%@&emcode=%@&sessionId=%@",ipStr,g_master,g_sessionUser,emcode,sessionId];
@@ -4323,7 +4322,7 @@
     NSUserDefaults *userDefault=[NSUserDefaults standardUserDefaults];
     NSString *sessionId=[userDefault stringForKey:@"sessionId"];
     
-    NSString * ips=[userDefault objectForKey:@"ipAndPort"];
+    NSString * ips=[UASUserInfo shareManager].urlIp;
     
     NSString * userID=[userDefault objectForKey:@"erpaccount"];
     
@@ -4592,7 +4591,7 @@
     NSUserDefaults *userDefault=[NSUserDefaults standardUserDefaults];
     NSString *sessionId=[userDefault stringForKey:@"sessionId"];
     
-    NSString * ips=[userDefault objectForKey:@"ipAndPort"];
+    NSString * ips=[UASUserInfo shareManager].urlIp;
     
     NSString * userID=[userDefault objectForKey:@"erpaccount"];
     
@@ -4921,7 +4920,7 @@
 - (void)updataOutoffOutWorkPlan:(NSString *)planId
 {
     NSString * emcode = [[NSUserDefaults standardUserDefaults] stringForKey:@"erpaccount"];
-    NSString * ipStr = [[NSUserDefaults standardUserDefaults] stringForKey:@"ipAndPort"];
+    NSString * ipStr = [UASUserInfo shareManager].urlIp;
     NSString *sessionId = [[NSUserDefaults standardUserDefaults] stringForKey:@"sessionId"];
     
     NSString *url = [NSString stringWithFormat:@"%@/mobile/mobileplanUpdate.action?master=%@&sessionUser=%@&emcode=%@&sessionId=%@&id=%@",ipStr,g_master,g_sessionUser,emcode,sessionId,planId];
@@ -5604,7 +5603,7 @@
     //[self saveUserData];
     //参数
     //DLog(@"dic=%@,name=%@",[[userDefaults objectForKey:@"ipDic"] objectForKey:@"host_name"],[[userDefaults objectForKey:@"ipDic"] objectForKey:@"host_name"]);
-    NSString *ip=[userDefaults objectForKey:@"ipAndPort"] ;//[[userDefaults objectForKey:@"ipDic"] objectForKey:@"ip"];//self.ipCombox.textField.text;
+    NSString *ip=[UASUserInfo shareManager].urlIp;//[[userDefaults objectForKey:@"ipDic"] objectForKey:@"ip"];//self.ipCombox.textField.text;
     NSString *userName=[userDefaults objectForKey:@"erpaccount"];
     NSString *passWord= [NSString encodeSeciWithStr:[NSString stringWithFormat:@"%@",[userDefaults objectForKey:@"userPass"]]];
     NSString *master=[[userDefaults objectForKey:@"masterDic"] objectForKey:@"ma_user"];//self.masterCombox.textField.text;
@@ -6541,7 +6540,7 @@
     UASNetworkManager *manager = [UASNetworkManager shareManager];
     manager.responseSerializer = [AFJSONResponseSerializer serializer];
     
-    NSString *ip = [[NSUserDefaults standardUserDefaults] objectForKey:@"ipAndPort"];
+    NSString *ip = [UASUserInfo shareManager].urlIp;
     NSString *sessionId = [[NSUserDefaults standardUserDefaults] objectForKey:@"sessionId"];
     
     NSString *url = [NSString stringWithFormat:@"%@mobile/QueryEmployee.action?em_name=%@&sessionId=%@",ip,name,sessionId];

shiku_im/shiku_im/JOABFriendsVC.m

@@ -401,7 +401,7 @@ NSString *cellId = @"cellResId";
     
     NSUserDefaults * userDefault=[NSUserDefaults standardUserDefaults];
     
-    NSString *ip=[userDefault objectForKey:@"ipAndPort"];
+    NSString *ip=[UASUserInfo shareManager].urlIp;
     
     NSString *sessionId=[userDefault objectForKey:@"sessionId"];
     

shiku_im/shiku_im/TestViewController.m

@@ -67,7 +67,7 @@
 //
 //    NSString *sessionId=[userDefault stringForKey:@"sessionId"];
 //
-//    NSString * ips=[userDefault objectForKey:@"ipAndPort"];
+//    NSString * ips=[UASUserInfo shareManager].urlIp;
 //
 //    //3.拼接sessionID
 //    NSString *paramSessionId=[@"" stringByAppendingFormat:@"JSESSIONID=%@",sessionId];
@@ -102,7 +102,7 @@
     NSUserDefaults *userDefault=[NSUserDefaults standardUserDefaults];
     NSString *sessionId=[userDefault stringForKey:@"sessionId"];
     
-    NSString * ips=[userDefault objectForKey:@"ipAndPort"];
+    NSString * ips=[UASUserInfo shareManager].urlIp;
     
     //拼接sessionID
     NSString *paramSessionId=[@"" stringByAppendingFormat:@"JSESSIONID=%@",sessionId];
@@ -175,7 +175,7 @@
 */
     
     NSString *sessionId=[[NSUserDefaults standardUserDefaults] stringForKey:@"sessionId"];
-    NSString *ip=[[NSUserDefaults standardUserDefaults] objectForKey:@"ipAndPort"];
+    NSString *ip=[UASUserInfo shareManager].urlIp;
     
     //录入日期
     NSDate *senddate = [NSDate date];

shiku_im/shiku_im/controller/AddBusinessOpVC.m

@@ -144,7 +144,7 @@ static NSString *cellID = @"cellID";
 {
     NSString *sessionId=[[NSUserDefaults standardUserDefaults] stringForKey:@"sessionId"];
     
-    NSString *ip=[[NSUserDefaults standardUserDefaults] objectForKey:@"ipAndPort"];
+    NSString *ip=[UASUserInfo shareManager].urlIp;
     
     NSString *url = [NSString stringWithFormat:@"%@common/getCodeString.action?master=%@&sessionUser=%@&type=2&caller=BusinessChance&sessionId=%@",ip,g_master,g_sessionUser,sessionId];
 //    DLog(@"aaaaaaaa:%@",url);
@@ -836,7 +836,7 @@ static NSString *cellID = @"cellID";
 - (void)getYItijiao{
     NSString *sessionId=[[NSUserDefaults standardUserDefaults] stringForKey:@"sessionId"];
     
-    NSString *ip=[[NSUserDefaults standardUserDefaults] objectForKey:@"ipAndPort"];
+    NSString *ip=[UASUserInfo shareManager].urlIp;
     
     NSString *url = [NSString stringWithFormat:@"%@crm/chance/submitBusinessChance.action?master=%@&sessionUser=%@&id=%@&caller=BusinessChance&sessionId=%@",ip,g_master,g_sessionUser,_MYCode,sessionId];
     //    DLog(@"aaaaaaaa:%@",url);
@@ -874,7 +874,7 @@ static NSString *cellID = @"cellID";
     
     NSString *sessionId=[userDefault stringForKey:@"sessionId"];
     
-    NSString * ips=[userDefault objectForKey:@"ipAndPort"];
+    NSString * ips=[UASUserInfo shareManager].urlIp;
     
     NSString * userID=[[NSUserDefaults standardUserDefaults] objectForKey:@"erpaccount"];
     
@@ -978,7 +978,7 @@ static NSString *cellID = @"cellID";
     
     NSString *sessionId=[[NSUserDefaults standardUserDefaults] stringForKey:@"sessionId"];
     
-    NSString *ip=[[NSUserDefaults standardUserDefaults] objectForKey:@"ipAndPort"];
+    NSString *ip=[UASUserInfo shareManager].urlIp;
     
     NSString *url = [NSString stringWithFormat:@"%@common/getId.action?master=%@&sessionUser=%@&seq=BUSINESSCHANCE_SEQ&caller=BusinessChance&sessionId=%@",ip,g_master,g_sessionUser,sessionId];
     //    DLog(@"aaaaaaaa:%@",url);

shiku_im/shiku_im/controller/AddBusinessViewController.m

@@ -129,7 +129,7 @@
 {
     NSString *sessionId=[[NSUserDefaults standardUserDefaults] stringForKey:@"sessionId"];
     
-    NSString *ip=[[NSUserDefaults standardUserDefaults] objectForKey:@"ipAndPort"];
+    NSString *ip=[UASUserInfo shareManager].urlIp;
     
     NSString *url = [NSString stringWithFormat:@"%@common/getCodeString.action?master=%@&sessionUser=%@&type=2&caller=BusinessChance&sessionId=%@",ip,g_master,g_sessionUser,sessionId];
     DLog(@"aaaaaaaa:%@",url);
@@ -165,7 +165,7 @@
 -(void)getbusinessChanceRecord{
     
     NSString *sessionId=[[NSUserDefaults standardUserDefaults] stringForKey:@"sessionId"];
-    NSString *ip=[[NSUserDefaults standardUserDefaults] objectForKey:@"ipAndPort"];
+    NSString *ip=[UASUserInfo shareManager].urlIp;
     NSString *url = [NSString stringWithFormat:@"%@/mobile/crm/getBusinessChanceRecorder.action?master=%@&sessionUser=%@&sessionId=%@",ip,g_master,g_sessionUser,sessionId];
     
    DLog(@"aaaaaaaa:%@",url);

shiku_im/shiku_im/controller/AddClientInputVC.m

@@ -119,7 +119,7 @@
 -(void)getCode //获取单据编号
 {
     NSString *sessionId=[[NSUserDefaults standardUserDefaults] stringForKey:@"sessionId"];
-    NSString *ip=[[NSUserDefaults standardUserDefaults] objectForKey:@"ipAndPort"];
+    NSString *ip=[UASUserInfo shareManager].urlIp;
     NSString *master = [[[NSUserDefaults standardUserDefaults] objectForKey:@"masterDic"]objectForKey:@"ma_user"];
     NSString *sessionUser = [[NSUserDefaults standardUserDefaults] objectForKey:@"erpaccount"];
     
@@ -151,7 +151,7 @@
 -(void)getId
 {
     NSString *sessionId=[[NSUserDefaults standardUserDefaults] stringForKey:@"sessionId"];
-    NSString *ip=[[NSUserDefaults standardUserDefaults] objectForKey:@"ipAndPort"];
+    NSString *ip=[UASUserInfo shareManager].urlIp;
     NSString *master = [[[NSUserDefaults standardUserDefaults] objectForKey:@"masterDic"]objectForKey:@"ma_user"];
     NSString *sessionUser = [[NSUserDefaults standardUserDefaults] objectForKey:@"erpaccount"];
     
@@ -180,7 +180,7 @@
 -(void)getPaymentscodeData //获取收款方式数据
 {
     NSString *sessionId=[[NSUserDefaults standardUserDefaults] stringForKey:@"sessionId"];
-    NSString *ip=[[NSUserDefaults standardUserDefaults] objectForKey:@"ipAndPort"];
+    NSString *ip=[UASUserInfo shareManager].urlIp;
     
     NSString *url = [NSString stringWithFormat:@"%@mobile/common/getDbfind.action?which=form&caller=Customer!Base&field=cu_paymentscode&sessionId=%@",ip,sessionId];
     
@@ -271,7 +271,7 @@
 -(void)saveAction
 {
     NSString *sessionId=[[NSUserDefaults standardUserDefaults] stringForKey:@"sessionId"];
-    NSString *ip=[[NSUserDefaults standardUserDefaults] objectForKey:@"ipAndPort"];
+    NSString *ip=[UASUserInfo shareManager].urlIp;
     NSString *master = [[[NSUserDefaults standardUserDefaults] objectForKey:@"masterDic"]objectForKey:@"ma_user"];
     NSString *sessionUser = [[NSUserDefaults standardUserDefaults] objectForKey:@"erpaccount"];
     

shiku_im/shiku_im/controller/AddDateViewController.m

@@ -114,7 +114,7 @@
 -(void)getCode //获取单据编号
 {
     NSString *sessionId=[[NSUserDefaults standardUserDefaults] stringForKey:@"sessionId"];
-    NSString *ip=[[NSUserDefaults standardUserDefaults] objectForKey:@"ipAndPort"];
+    NSString *ip=[UASUserInfo shareManager].urlIp;
     NSString *master = [[[NSUserDefaults standardUserDefaults] objectForKey:@"masterDic"]objectForKey:@"ma_user"];
     NSString *sessionUser = [[NSUserDefaults standardUserDefaults] objectForKey:@"erpaccount"];
     
@@ -143,7 +143,7 @@
    
     
     NSString *sessionId=[[NSUserDefaults standardUserDefaults] stringForKey:@"sessionId"];
-    NSString *ip=[[NSUserDefaults standardUserDefaults] objectForKey:@"ipAndPort"];
+    NSString *ip=[UASUserInfo shareManager].urlIp;
     NSString *sellername = [[NSUserDefaults standardUserDefaults] stringForKey:@"personName"];
     NSString *master = [[[NSUserDefaults standardUserDefaults] objectForKey:@"masterDic"]objectForKey:@"ma_user"];
     NSString *sessionUser = [[NSUserDefaults standardUserDefaults] objectForKey:@"erpaccount"];
@@ -442,7 +442,7 @@
     [self.view endEditing:YES];
     if (_isCanSave) {
         NSString *sessionId=[[NSUserDefaults standardUserDefaults] stringForKey:@"sessionId"];
-        NSString *ip=[[NSUserDefaults standardUserDefaults] objectForKey:@"ipAndPort"];
+        NSString *ip=[UASUserInfo shareManager].urlIp;
         NSString *master = [[[NSUserDefaults standardUserDefaults] objectForKey:@"masterDic"]objectForKey:@"ma_user"];
         NSString *sessionUser = [[NSUserDefaults standardUserDefaults] objectForKey:@"erpaccount"];
         
@@ -589,7 +589,7 @@
         shangjiBianhao = @" ";
     }
     NSString *sessionId=[[NSUserDefaults standardUserDefaults] stringForKey:@"sessionId"];
-    NSString *ip=[[NSUserDefaults standardUserDefaults] objectForKey:@"ipAndPort"];
+    NSString *ip=[UASUserInfo shareManager].urlIp;
     NSString *master = [[[NSUserDefaults standardUserDefaults] objectForKey:@"masterDic"]objectForKey:@"ma_user"];
     NSString *sessionUser = [[NSUserDefaults standardUserDefaults] objectForKey:@"erpaccount"];
     

shiku_im/shiku_im/controller/AddFormalClientVC.m

@@ -141,7 +141,7 @@
 -(void)getCode //获取单据编号
 {
     NSString *sessionId=[[NSUserDefaults standardUserDefaults] stringForKey:@"sessionId"];
-    NSString *ip=[[NSUserDefaults standardUserDefaults] objectForKey:@"ipAndPort"];
+    NSString *ip=[UASUserInfo shareManager].urlIp;
     NSString *master = [[[NSUserDefaults standardUserDefaults] objectForKey:@"masterDic"]objectForKey:@"ma_user"];
     NSString *sessionUser = [[NSUserDefaults standardUserDefaults] objectForKey:@"erpaccount"];
     
@@ -176,7 +176,7 @@
 -(void)getId
 {
     NSString *sessionId=[[NSUserDefaults standardUserDefaults] stringForKey:@"sessionId"];
-    NSString *ip=[[NSUserDefaults standardUserDefaults] objectForKey:@"ipAndPort"];
+    NSString *ip=[UASUserInfo shareManager].urlIp;
     NSString *master = [[[NSUserDefaults standardUserDefaults] objectForKey:@"masterDic"]objectForKey:@"ma_user"];
     NSString *sessionUser = [[NSUserDefaults standardUserDefaults] objectForKey:@"erpaccount"];
     
@@ -209,7 +209,7 @@
 {
     [_indicationV startAnimating];
     NSString *sessionId=[[NSUserDefaults standardUserDefaults] stringForKey:@"sessionId"];
-    NSString *ip=[[NSUserDefaults standardUserDefaults] objectForKey:@"ipAndPort"];
+    NSString *ip=[UASUserInfo shareManager].urlIp;
     NSString *master = [[[NSUserDefaults standardUserDefaults] objectForKey:@"masterDic"]objectForKey:@"ma_user"];
     NSString *sessionUser = [[NSUserDefaults standardUserDefaults] objectForKey:@"erpaccount"];
     
@@ -491,7 +491,7 @@
     [_indicationV startAnimating];
     
     NSString *sessionId=[[NSUserDefaults standardUserDefaults] stringForKey:@"sessionId"];
-    NSString *ip=[[NSUserDefaults standardUserDefaults] objectForKey:@"ipAndPort"];
+    NSString *ip=[UASUserInfo shareManager].urlIp;
     
     NSDate *senddate = [NSDate date];
     NSDateFormatter *f=[[NSDateFormatter alloc]init];
@@ -614,7 +614,7 @@
     [_indicationV startAnimating];
     
     NSString *sessionId=[[NSUserDefaults standardUserDefaults] stringForKey:@"sessionId"];
-    NSString *ip=[[NSUserDefaults standardUserDefaults] objectForKey:@"ipAndPort"];
+    NSString *ip=[UASUserInfo shareManager].urlIp;
     
     NSDate *senddate = [NSDate date];
     NSDateFormatter *f=[[NSDateFormatter alloc]init];
@@ -724,7 +724,7 @@
     [_indicationV startAnimating];
     
     NSString *sessionId=[[NSUserDefaults standardUserDefaults] stringForKey:@"sessionId"];
-    NSString *ip=[[NSUserDefaults standardUserDefaults] objectForKey:@"ipAndPort"];
+    NSString *ip=[UASUserInfo shareManager].urlIp;
     
     NSString *url = [NSString stringWithFormat:@"%@scm/sale/submitCustomerBase.action?id=%@&caller=Customer!Base&sessionId=%@",ip,_cuid,sessionId];
     
@@ -856,7 +856,7 @@
     [_indicationV startAnimating];
     
     NSString *sessionId=[[NSUserDefaults standardUserDefaults] stringForKey:@"sessionId"];
-    NSString *ip=[[NSUserDefaults standardUserDefaults] objectForKey:@"ipAndPort"];
+    NSString *ip=[UASUserInfo shareManager].urlIp;
     
     NSString *url = [NSString stringWithFormat:@"%@scm/sale/resSubmitCustomerBase.action?id=%@&caller=Customer!Base&sessionId=%@",ip,_cuid,sessionId];
     

shiku_im/shiku_im/controller/ApplySubscribeViewController.m

@@ -169,7 +169,7 @@
     return tf;
 }
 -(void)getCode{
-     NSString *ipStr=[[NSUserDefaults standardUserDefaults] objectForKey:@"ipAndPort"];
+     NSString *ipStr=[UASUserInfo shareManager].urlIp;
     NSString *sessionId=[[NSUserDefaults standardUserDefaults] stringForKey:@"sessionId"];
     //    [[NSUserDefaults standardUserDefaults] setObject:sessionId forKey:@"sessionId"];
     NSString *url = [NSString stringWithFormat:@"%@common/getCodeString.action?type=2&caller=SubsApply&sessionId=%@",ipStr,sessionId];

shiku_im/shiku_im/controller/ApprovalprocessVC.m

@@ -164,7 +164,7 @@ static NSString *cellID = @"cellID";
     //    common/desktop/process/alreadyLaunch.action?count=3&isMobile=1
     
     NSString *sessionId=[[NSUserDefaults standardUserDefaults] stringForKey:@"sessionId"];
-    NSString *ip=[[NSUserDefaults standardUserDefaults] objectForKey:@"ipAndPort"];
+    NSString *ip=[UASUserInfo shareManager].urlIp;
     
     NSString *url;
     

shiku_im/shiku_im/controller/B2BAddTaskVC.m

@@ -221,7 +221,7 @@ static NSString *cellID = @"cellID";
 				//mobile/mobiletask/getAllTasks?emuu=&enuu=&pageNumber=&pageSize=&status=
 				
 				NSString *sessionId = [[NSUserDefaults standardUserDefaults] stringForKey:@"sessionId"];
-    NSString *ip = [[NSUserDefaults standardUserDefaults] objectForKey:@"ipAndPort"];
+    NSString *ip = [UASUserInfo shareManager].urlIp;
     
     NSString *url = [NSString stringWithFormat:@"%@mobile/mobiletask/getAllTasks?emuu=%@&enuu=%@&pageNumber=%@&pageSize=%d&status=%@&sessionId=%@",ip,g_emcode,g_B2B_enuu,@"1",_increaseNum,conditionStr,sessionId];
 				

shiku_im/shiku_im/controller/B2BAddVisitReportVC.m

@@ -141,7 +141,7 @@
     [_indicationV startAnimating];
     bbi.enabled = NO;
     NSString *sessionId = [[NSUserDefaults standardUserDefaults] stringForKey:@"sessionId"];
-    NSString *ip = [[NSUserDefaults standardUserDefaults] objectForKey:@"ipAndPort"];
+    NSString *ip = [UASUserInfo shareManager].urlIp;
     
     NSDictionary *params;
     

shiku_im/shiku_im/controller/B2BApprovalDetailVC.m

@@ -159,7 +159,7 @@
 {
 				[HUD show:YES];
 				
-				NSString *ip = [[NSUserDefaults standardUserDefaults] objectForKey:@"ipAndPort"];
+				NSString *ip = [UASUserInfo shareManager].urlIp;
     NSString *sessionId = [[NSUserDefaults standardUserDefaults] stringForKey:@"sessionId"];
 				
 				NSString *url;
@@ -625,7 +625,7 @@
 -(void)TongYiToView:(NSString * )detail
 {
 				[HUD show:YES];
-				NSString *ip = [[NSUserDefaults standardUserDefaults] objectForKey:@"ipAndPort"];
+				NSString *ip = [UASUserInfo shareManager].urlIp;
 				NSString *sessionId = [[NSUserDefaults standardUserDefaults] stringForKey:@"sessionId"];
 				
 				NSString *url = [NSString stringWithFormat:@"%@mobile/approvalflow/auditDocuments?id=%@&description=%@&dealtype=%@&sessionId=%@",ip,_jpid,detail,@"202",sessionId];
@@ -671,7 +671,7 @@
 -(void)rejectAction:(NSString * )detail
 {
 				[HUD show:YES];
-				NSString *ip = [[NSUserDefaults standardUserDefaults] objectForKey:@"ipAndPort"];
+				NSString *ip = [UASUserInfo shareManager].urlIp;
 				NSString *sessionId = [[NSUserDefaults standardUserDefaults] stringForKey:@"sessionId"];
 				
 				NSString *url = [NSString stringWithFormat:@"%@mobile/approvalflow/auditDocuments?id=%@&description=%@&dealtype=%@&sessionId=%@",ip,_jpid,detail,@"203",sessionId];

shiku_im/shiku_im/controller/B2BApprovalVC.m

@@ -166,7 +166,7 @@ static NSString *cellID = @"cellID";
     //    common/desktop/process/alreadyLaunch.action?count=3&isMobile=1
     
     NSString *sessionId = [[NSUserDefaults standardUserDefaults] stringForKey:@"sessionId"];
-    NSString *ip = [[NSUserDefaults standardUserDefaults] objectForKey:@"ipAndPort"];
+    NSString *ip = [UASUserInfo shareManager].urlIp;
     
     NSString *url;
     

shiku_im/shiku_im/controller/B2BChangeViewController.m

@@ -219,7 +219,7 @@
     DLog(@"点击了发送");
 
     NSString *sessionId=[[NSUserDefaults standardUserDefaults] stringForKey:@"sessionId"];
-    NSString *ip=[[NSUserDefaults standardUserDefaults] objectForKey:@"ipAndPort"];
+    NSString *ip=[UASUserInfo shareManager].urlIp;
 
     NSString *url = [NSString stringWithFormat:@"%@/mobile/detailCenter/changeDealMan?id=%@&emcode=%@&reason=%@&sessionId=%@",ip,self.backID,self.backEmcode,_textView.text,sessionId];
     

shiku_im/shiku_im/controller/B2BDocumentDetailVC.m

@@ -139,7 +139,7 @@
 {
     [HUD show:YES];
     
-    NSString *ip = [[NSUserDefaults standardUserDefaults] objectForKey:@"ipAndPort"];
+    NSString *ip = [UASUserInfo shareManager].urlIp;
     NSString *sessionId = [[NSUserDefaults standardUserDefaults] stringForKey:@"sessionId"];
     
     NSString *url;
@@ -540,7 +540,7 @@
             
             
             [HUD show:YES];
-            NSString *ip = [[NSUserDefaults standardUserDefaults] objectForKey:@"ipAndPort"];
+            NSString *ip = [UASUserInfo shareManager].urlIp;
             NSString *sessionId = [[NSUserDefaults standardUserDefaults] stringForKey:@"sessionId"];
             
             NSString *url = [NSString stringWithFormat:@"%@mobile/detailCenter/resubmitDocuments?id=%@&whichpage=%@&sessionId=%@",ip,_dan_id,whichpage,sessionId];
@@ -614,7 +614,7 @@
             
             
             [HUD show:YES];
-            NSString *ip = [[NSUserDefaults standardUserDefaults] objectForKey:@"ipAndPort"];
+            NSString *ip = [UASUserInfo shareManager].urlIp;
             NSString *sessionId = [[NSUserDefaults standardUserDefaults] stringForKey:@"sessionId"];
             
             NSString *url = [NSString stringWithFormat:@"%@mobile/detailCenter/deleteDocuments?id=%@&whichpage=%@&sessionId=%@",ip,_dan_id,whichpage,sessionId];
@@ -716,7 +716,7 @@
     if (alertView.tag == 100) {
         if (buttonIndex == 1) {
             [HUD show:YES];
-            NSString *ip = [[NSUserDefaults standardUserDefaults] objectForKey:@"ipAndPort"];
+            NSString *ip = [UASUserInfo shareManager].urlIp;
             NSString *sessionId = [[NSUserDefaults standardUserDefaults] stringForKey:@"sessionId"];
             
             NSString *url = [NSString stringWithFormat:@"%@mobile/detailCenter/resubmitDocuments?id=%@&whichpage=%@&sessionId=%@",ip,_dan_id,whichpage,sessionId];
@@ -769,7 +769,7 @@
     else if (alertView.tag == 200) {
         if (buttonIndex == 1) {
             [HUD show:YES];
-            NSString *ip = [[NSUserDefaults standardUserDefaults] objectForKey:@"ipAndPort"];
+            NSString *ip = [UASUserInfo shareManager].urlIp;
             NSString *sessionId = [[NSUserDefaults standardUserDefaults] stringForKey:@"sessionId"];
             
             NSString *url = [NSString stringWithFormat:@"%@mobile/detailCenter/deleteDocuments?id=%@&whichpage=%@&sessionId=%@",ip,_dan_id,whichpage,sessionId];

shiku_im/shiku_im/controller/B2BDocumentListVC.m

@@ -191,7 +191,7 @@ static NSString *cellID = @"cellID";
     pageSize = [NSString stringWithFormat:@"%d",10+_increasePageNum];
     emcode = [[NSUserDefaults standardUserDefaults] objectForKey:@"erpaccount"];
     sessionId = [[NSUserDefaults standardUserDefaults] stringForKey:@"sessionId"];
-    ip = [[NSUserDefaults standardUserDefaults] objectForKey:@"ipAndPort"];
+    ip = [UASUserInfo shareManager].urlIp;
     DLog(@"ipshi:%@",ip);
     
     NSString *url = @"";

shiku_im/shiku_im/controller/B2BGetAllPersonVC.m

@@ -1401,7 +1401,7 @@
     
     NSUserDefaults * userDefault=[NSUserDefaults standardUserDefaults];
     
-    NSString *ip=[userDefault objectForKey:@"ipAndPort"];
+    NSString *ip=[UASUserInfo shareManager].urlIp;
     
     NSString *sessionId=[userDefault objectForKey:@"sessionId"];
     

shiku_im/shiku_im/controller/B2BMyHandleWorkVC.m

@@ -94,7 +94,7 @@ static NSString *cellID = @"cellID";
     self.uv.hidden = NO;
     [_searchBar resignFirstResponder];
     NSString *sessionId = [[NSUserDefaults standardUserDefaults] stringForKey:@"sessionId"];
-    NSString *ip = [[NSUserDefaults standardUserDefaults] objectForKey:@"ipAndPort"];
+    NSString *ip = [UASUserInfo shareManager].urlIp;
     
     NSString *url = [NSString stringWithFormat:@"%@mobile/mobiletask/myTasks?emuu=%@&enuu=%@&pageNumber=%@&pageSize=%d&status=%@&sessionId=%@",ip,g_emcode,g_B2B_enuu,@"1",1000,conditionStr,sessionId];
     DLog(@"我的任务列表:%@",url);
@@ -186,7 +186,7 @@ static NSString *cellID = @"cellID";
     self.uv.hidden = NO;
     [_searchBar resignFirstResponder];
     NSString *sessionId = [[NSUserDefaults standardUserDefaults] stringForKey:@"sessionId"];
-    NSString *ip = [[NSUserDefaults standardUserDefaults] objectForKey:@"ipAndPort"];
+    NSString *ip = [UASUserInfo shareManager].urlIp;
     
     NSString *url = [NSString stringWithFormat:@"%@mobile/mobiletask/getAllTasks?emuu=%@&enuu=%@&pageNumber=%@&pageSize=%d&status=%@&sessionId=%@",ip,g_emcode,g_B2B_enuu,@"1",1000,conditionStr,sessionId];
     DLog(@"我的任务列表:%@",url);

shiku_im/shiku_im/controller/B2BNewTaskVC.m

@@ -60,7 +60,7 @@ static NSString *ID = @"status11";
     DLog(@"点击了发送");
     [MBProgressHUD showMessage:@"发送中...."];
     NSString *sessionId=[[NSUserDefaults standardUserDefaults] stringForKey:@"sessionId"];
-    NSString *ip=[[NSUserDefaults standardUserDefaults] objectForKey:@"ipAndPort"];
+    NSString *ip=[UASUserInfo shareManager].urlIp;
     NSString * aStr,*bStr,*cStr;
     for (UITableViewCell * cell in _tableView.visibleCells) {
         if (cell.detailTextLabel.tag == 1) {

shiku_im/shiku_im/controller/B2BReplyTaskVC.m

@@ -417,7 +417,7 @@ typedef NS_ENUM(NSInteger, HandleClickType)
 				NSData *jsonData2 = [NSJSONSerialization dataWithJSONObject:gridStore options:NSJSONWritingPrettyPrinted error:nil];
 				NSString *gridStr = [[NSString alloc] initWithData:jsonData2 encoding:NSUTF8StringEncoding];
 								
-				NSString *ip = [[NSUserDefaults standardUserDefaults] objectForKey:@"ipAndPort"];
+				NSString *ip = [UASUserInfo shareManager].urlIp;
 				NSString *sessionId = [[NSUserDefaults standardUserDefaults] objectForKey:@"sessionId"];
 				NSString *url = [NSString stringWithFormat:@"%@mobile/mobiletask/changeTaskStaus?formStore=%@&gridStore=%@&sessionId=%@",ip,formStr,gridStr,sessionId];
 								
@@ -474,7 +474,7 @@ typedef NS_ENUM(NSInteger, HandleClickType)
     UASNetworkManager *manager = [UASNetworkManager shareManager];
     manager.responseSerializer = [AFHTTPResponseSerializer serializer];
 				
-    NSString *ip = [[NSUserDefaults standardUserDefaults] objectForKey:@"ipAndPort"];
+    NSString *ip = [UASUserInfo shareManager].urlIp;
     NSString *sessionId=[[NSUserDefaults standardUserDefaults] objectForKey:@"sessionId"];
 				
     NSString *paramSessionId=[@"" stringByAppendingFormat:@"JSESSIONID=%@",sessionId];
@@ -604,7 +604,7 @@ typedef NS_ENUM(NSInteger, HandleClickType)
     
     //分离字ipAndPort符串，
     NSUserDefaults *userDefault=[NSUserDefaults standardUserDefaults];
-    NSString *ip=[userDefault objectForKey:@"ipAndPort"];
+    NSString *ip=[UASUserInfo shareManager].urlIp;
     NSArray *array11= [ip componentsSeparatedByString:@"//"];
     NSString *tempStr1=[array11 objectAtIndex:1] ;
     NSArray *array22=[tempStr1 componentsSeparatedByString:@"/"];

shiku_im/shiku_im/controller/BTDocumentVC.m

@@ -155,7 +155,7 @@ static NSString *cellID = @"cellID";
 -(void)isAdmin //判断是否为管理员
 {
     NSString *sessionId=[[NSUserDefaults standardUserDefaults] stringForKey:@"sessionId"];
-    NSString *ip=[[NSUserDefaults standardUserDefaults] objectForKey:@"ipAndPort"];
+    NSString *ip=[UASUserInfo shareManager].urlIp;
     NSString *emcode=[[NSUserDefaults standardUserDefaults] stringForKey:@"erpaccount"];
     NSString *master = [[[NSUserDefaults standardUserDefaults] objectForKey:@"masterDic"]objectForKey:@"ma_user"];
     NSString *sessionUser = [[NSUserDefaults standardUserDefaults] objectForKey:@"erpaccount"];
@@ -216,7 +216,7 @@ static NSString *cellID = @"cellID";
 
 -(void)getDataFromSeverWithCaller:(NSString *)caller
 {
-    NSString *ip = [[NSUserDefaults standardUserDefaults] objectForKey:@"ipAndPort"];
+    NSString *ip = [UASUserInfo shareManager].urlIp;
     NSString *sessionId = [[NSUserDefaults standardUserDefaults] stringForKey:@"sessionId"];
     
     NSString *url = [NSString stringWithFormat:@"%@mobile/common/getformandgriddetail.action?caller=%@&condition=1=1&sessionId=%@&id=0",ip,caller,sessionId];
@@ -317,7 +317,7 @@ static NSString *cellID = @"cellID";
 
 -(void)getCodeAndId //获取新单据编号和单据id
 {
-    NSString *ip = [[NSUserDefaults standardUserDefaults] objectForKey:@"ipAndPort"];
+    NSString *ip = [UASUserInfo shareManager].urlIp;
     NSString *sessionId = [[NSUserDefaults standardUserDefaults] stringForKey:@"sessionId"];
     
     NSString *url = [NSString stringWithFormat:@"%@common/getCodeString.action?&caller=%@&sessionId=%@&type=2",ip,_caller,sessionId];
@@ -1153,7 +1153,7 @@ static NSString *cellID = @"cellID";
     //mobile/oa/saveAndSubmitAskLeave.action?caller=Ask4Leave&formStore={"va_startime":"2016-11-16%2014:10:00","va_endtime":"2016-11-16%2016:00:00"} 请假单
     
     NSString *sessionId=[[NSUserDefaults standardUserDefaults] stringForKey:@"sessionId"];
-    NSString *ip=[[NSUserDefaults standardUserDefaults] objectForKey:@"ipAndPort"];
+    NSString *ip=[UASUserInfo shareManager].urlIp;
     
     NSString *url = [NSString stringWithFormat:@"%@mobile/oa/commonSaveAndSubmit.action",ip];
     
@@ -1258,7 +1258,7 @@ static NSString *cellID = @"cellID";
     
     NSString *sessionId=[userDefault stringForKey:@"sessionId"];
     
-    NSString * ips=[userDefault objectForKey:@"ipAndPort"];
+    NSString * ips=[UASUserInfo shareManager].urlIp;
     
     NSString * userID=[[NSUserDefaults standardUserDefaults] objectForKey:@"erpaccount"];
     NSString *master=[[[NSUserDefaults standardUserDefaults] objectForKey:@"masterDic"]objectForKey:@"ma_user"];

shiku_im/shiku_im/controller/BTUpdateDocumentVC.m

@@ -163,7 +163,7 @@ static NSString *cellID = @"cellID";
 
 -(void)getDataFromSeverWithCaller:(NSString *)caller
 {
-    NSString *ip = [[NSUserDefaults standardUserDefaults] objectForKey:@"ipAndPort"];
+    NSString *ip = [UASUserInfo shareManager].urlIp;
     NSString *sessionId = [[NSUserDefaults standardUserDefaults] stringForKey:@"sessionId"];
     
     NSString *url = [NSString stringWithFormat:@"%@mobile/getformandgriddetail.action?caller=%@&condition=1=1&sessionId=%@&id=%@",ip,_caller,sessionId,_listid];
@@ -1221,7 +1221,7 @@ static NSString *cellID = @"cellID";
     //mobile/oa/saveAndSubmitAskLeave.action?caller=Ask4Leave&formStore={"va_startime":"2016-11-16%2014:10:00","va_endtime":"2016-11-16%2016:00:00"} 请假单
     
     NSString *sessionId=[[NSUserDefaults standardUserDefaults] stringForKey:@"sessionId"];
-    NSString *ip=[[NSUserDefaults standardUserDefaults] objectForKey:@"ipAndPort"];
+    NSString *ip=[UASUserInfo shareManager].urlIp;
     
     NSDictionary *dic = [NSDictionary dictionaryWithObjectsAndKeys:_caller,@"caller",
                          formStr,@"formStore",
@@ -1289,7 +1289,7 @@ static NSString *cellID = @"cellID";
     
     NSString *sessionId=[userDefault stringForKey:@"sessionId"];
     
-    NSString * ips=[userDefault objectForKey:@"ipAndPort"];
+    NSString * ips=[UASUserInfo shareManager].urlIp;
     
     NSString * userID=[[NSUserDefaults standardUserDefaults] objectForKey:@"erpaccount"];
     NSString *master=[[[NSUserDefaults standardUserDefaults] objectForKey:@"masterDic"]objectForKey:@"ma_user"];
@@ -1477,7 +1477,7 @@ static NSString *cellID = @"cellID";
 -(void)deleteDetailDataToSeverWithId:(NSString *)deatilID andKey:(NSString *)key
 {
     NSString *sessionId=[[NSUserDefaults standardUserDefaults] stringForKey:@"sessionId"];
-    NSString *ip=[[NSUserDefaults standardUserDefaults] objectForKey:@"ipAndPort"];
+    NSString *ip=[UASUserInfo shareManager].urlIp;
     
     
     NSString *url = [NSString stringWithFormat:@"%@common/deleteDetail.action?caller=%@&gridcaller=%@&condition=%@=%@&master=%@&sessionUser=%@&sessionId=%@",ip,_caller,_caller,key,deatilID,g_master,g_sessionUser,sessionId];

shiku_im/shiku_im/controller/CRMViewController.m

@@ -250,7 +250,7 @@ static NSString *cellID = @"cellID";
 -(void)getdakaCode:(UIButton *)sender
 {
     NSString *sessionId=[[NSUserDefaults standardUserDefaults] stringForKey:@"sessionId"];
-    NSString *ip=[[NSUserDefaults standardUserDefaults] objectForKey:@"ipAndPort"];
+    NSString *ip=[UASUserInfo shareManager].urlIp;
     
     NSString *url = [NSString stringWithFormat:@"%@common/getCodeString.action?type=2&caller=CardLog&master=%@&sessionUser=%@&sessionId=%@",ip,g_master,g_sessionUser,sessionId];
     
@@ -287,7 +287,7 @@ static NSString *cellID = @"cellID";
     //取出sessionID和IP和员工编号
     NSString *sessionId=[[NSUserDefaults standardUserDefaults] stringForKey:@"sessionId"];
     
-    NSString * ips=[[NSUserDefaults standardUserDefaults] objectForKey:@"ipAndPort"];
+    NSString * ips=[UASUserInfo shareManager].urlIp;
     
     NSString * userID=[[NSUserDefaults standardUserDefaults] objectForKey:@"erpaccount"];
     
@@ -346,7 +346,7 @@ static NSString *cellID = @"cellID";
 -(void)getIsFormalClient //用来判断是否正式客户
 {
     NSString *sessionId=[[NSUserDefaults standardUserDefaults] stringForKey:@"sessionId"];
-    NSString *ip=[[NSUserDefaults standardUserDefaults] objectForKey:@"ipAndPort"];
+    NSString *ip=[UASUserInfo shareManager].urlIp;
     NSString *master = [[[NSUserDefaults standardUserDefaults] objectForKey:@"masterDic"] objectForKey:@"ma_user"];
     NSString *sessionUser = [[NSUserDefaults standardUserDefaults] objectForKey:@"erpaccount"];
     
@@ -386,7 +386,7 @@ static NSString *cellID = @"cellID";
     /*接口：mobile/crm/getPersonalRank.action
      参数：String emcode,String yearmonth(201605)*/
     NSString *sessionId=[[NSUserDefaults standardUserDefaults] stringForKey:@"sessionId"];
-    NSString *ip=[[NSUserDefaults standardUserDefaults] objectForKey:@"ipAndPort"];
+    NSString *ip=[UASUserInfo shareManager].urlIp;
     NSString *emcode=[[NSUserDefaults standardUserDefaults] stringForKey:@"erpaccount"];
     NSString *master = [[[NSUserDefaults standardUserDefaults] objectForKey:@"masterDic"]objectForKey:@"ma_user"];
     NSString *sessionUser = [[NSUserDefaults standardUserDefaults] objectForKey:@"erpaccount"];
@@ -608,7 +608,7 @@ static NSString *cellID = @"cellID";
     /*接口：mobile/crm/getSalesKit.action
      参数：String emcode,String yearmonth(201605)*/
     NSString *sessionId=[[NSUserDefaults standardUserDefaults] stringForKey:@"sessionId"];
-    NSString *ip=[[NSUserDefaults standardUserDefaults] objectForKey:@"ipAndPort"];
+    NSString *ip=[UASUserInfo shareManager].urlIp;
     NSString *emcode=[[NSUserDefaults standardUserDefaults] stringForKey:@"erpaccount"];
     NSString *master = [[[NSUserDefaults standardUserDefaults] objectForKey:@"masterDic"]objectForKey:@"ma_user"];
     NSString *sessionUser = [[NSUserDefaults standardUserDefaults] objectForKey:@"erpaccount"];
@@ -693,7 +693,7 @@ static NSString *cellID = @"cellID";
     /*接口：mobile/crm/getTargets.action
      参数：String emcode,String yearmonth,int page,int pageSize*/
     NSString *sessionId=[[NSUserDefaults standardUserDefaults] stringForKey:@"sessionId"];
-    NSString *ip=[[NSUserDefaults standardUserDefaults] objectForKey:@"ipAndPort"];
+    NSString *ip=[UASUserInfo shareManager].urlIp;
     NSString *emcode=[[NSUserDefaults standardUserDefaults] stringForKey:@"erpaccount"];
     NSString *master = [[[NSUserDefaults standardUserDefaults] objectForKey:@"masterDic"]objectForKey:@"ma_user"];
     NSString *sessionUser = [[NSUserDefaults standardUserDefaults] objectForKey:@"erpaccount"];
@@ -852,7 +852,7 @@ static NSString *cellID = @"cellID";
     /*接口：mobile/crm/getInactionCusts.action
      参数：String emcode,int page,int pageSize*/
     NSString *sessionId=[[NSUserDefaults standardUserDefaults] stringForKey:@"sessionId"];
-    NSString *ip=[[NSUserDefaults standardUserDefaults] objectForKey:@"ipAndPort"];
+    NSString *ip=[UASUserInfo shareManager].urlIp;
     NSString *emcode=[[NSUserDefaults standardUserDefaults] stringForKey:@"erpaccount"];
     NSString *master = [[[NSUserDefaults standardUserDefaults] objectForKey:@"masterDic"]objectForKey:@"ma_user"];
     NSString *sessionUser = [[NSUserDefaults standardUserDefaults] objectForKey:@"erpaccount"];

shiku_im/shiku_im/controller/ClientKindVC.m

@@ -76,7 +76,7 @@
 -(void)getPaymentsData
 {
     NSString *sessionId=[[NSUserDefaults standardUserDefaults] stringForKey:@"sessionId"];
-    NSString *ip=[[NSUserDefaults standardUserDefaults] objectForKey:@"ipAndPort"];
+    NSString *ip=[UASUserInfo shareManager].urlIp;
     NSString *master = [[[NSUserDefaults standardUserDefaults] objectForKey:@"masterDic"]objectForKey:@"ma_user"];
     NSString *sessionUser = [[NSUserDefaults standardUserDefaults] objectForKey:@"erpaccount"];
     

shiku_im/shiku_im/controller/ClientReportVC.m

@@ -157,7 +157,7 @@
 {
     //    %@mobile/common/getPanel.action?caller=%@&formCondition=%@=%@&gridCondition=%@=%@&sessionId=%@",ip,self.caller,self.keyField,self.sa_id,self.pfField,self.sa_id,sessionId];
     NSString *sessionId=[[NSUserDefaults standardUserDefaults] stringForKey:@"sessionId"];
-    NSString *ip=[[NSUserDefaults standardUserDefaults] objectForKey:@"ipAndPort"];
+    NSString *ip=[UASUserInfo shareManager].urlIp;
     NSString *master = [[[NSUserDefaults standardUserDefaults] objectForKey:@"masterDic"]objectForKey:@"ma_user"];
     NSString *sessionUser = [[NSUserDefaults standardUserDefaults] objectForKey:@"erpaccount"];
     
@@ -185,7 +185,7 @@
 -(void)getCode //获取单据编号
 {
     NSString *sessionId=[[NSUserDefaults standardUserDefaults] stringForKey:@"sessionId"];
-    NSString *ip=[[NSUserDefaults standardUserDefaults] objectForKey:@"ipAndPort"];
+    NSString *ip=[UASUserInfo shareManager].urlIp;
     NSString *master = [[[NSUserDefaults standardUserDefaults] objectForKey:@"masterDic"]objectForKey:@"ma_user"];
     NSString *sessionUser = [[NSUserDefaults standardUserDefaults] objectForKey:@"erpaccount"];
     
@@ -215,7 +215,7 @@
 -(void)getId
 {
     NSString *sessionId=[[NSUserDefaults standardUserDefaults] stringForKey:@"sessionId"];
-    NSString *ip=[[NSUserDefaults standardUserDefaults] objectForKey:@"ipAndPort"];
+    NSString *ip=[UASUserInfo shareManager].urlIp;
     NSString *master = [[[NSUserDefaults standardUserDefaults] objectForKey:@"masterDic"]objectForKey:@"ma_user"];
     NSString *sessionUser = [[NSUserDefaults standardUserDefaults] objectForKey:@"erpaccount"];
     
@@ -249,7 +249,7 @@
     [_indicationV startAnimating];
     bbi.enabled = NO;
     NSString *sessionId=[[NSUserDefaults standardUserDefaults] stringForKey:@"sessionId"];
-    NSString *ip=[[NSUserDefaults standardUserDefaults] objectForKey:@"ipAndPort"];
+    NSString *ip=[UASUserInfo shareManager].urlIp;
     NSString *master = [[[NSUserDefaults standardUserDefaults] objectForKey:@"masterDic"]objectForKey:@"ma_user"];
     NSString *sessionUser = [[NSUserDefaults standardUserDefaults] objectForKey:@"erpaccount"];
     NSDate *senddate = [NSDate date];
@@ -399,7 +399,7 @@
     UASNetworkManager *manager = [UASNetworkManager shareManager];
     manager.responseSerializer = [AFJSONResponseSerializer serializer];
     
-    NSString *ip = [[NSUserDefaults standardUserDefaults] objectForKey:@"ipAndPort"];
+    NSString *ip = [UASUserInfo shareManager].urlIp;
     NSString *sessionId = [[NSUserDefaults standardUserDefaults] objectForKey:@"sessionId"];
     NSString *master = [[[NSUserDefaults standardUserDefaults] objectForKey:@"masterDic"]objectForKey:@"ma_user"];
     NSString *sessionUser = [[NSUserDefaults standardUserDefaults] objectForKey:@"erpaccount"];
@@ -424,7 +424,7 @@
     UASNetworkManager *manager = [UASNetworkManager shareManager];
     manager.responseSerializer = [AFJSONResponseSerializer serializer];
     
-    NSString *ip = [[NSUserDefaults standardUserDefaults] objectForKey:@"ipAndPort"];
+    NSString *ip = [UASUserInfo shareManager].urlIp;
     NSString *sessionId = [[NSUserDefaults standardUserDefaults] objectForKey:@"sessionId"];
     NSString *master = [[[NSUserDefaults standardUserDefaults] objectForKey:@"masterDic"]objectForKey:@"ma_user"];
     NSString *sessionUser = [[NSUserDefaults standardUserDefaults] objectForKey:@"erpaccount"];
@@ -449,7 +449,7 @@
     UASNetworkManager *manager = [UASNetworkManager shareManager];
     manager.responseSerializer = [AFJSONResponseSerializer serializer];
     
-    NSString *ip = [[NSUserDefaults standardUserDefaults] objectForKey:@"ipAndPort"];
+    NSString *ip = [UASUserInfo shareManager].urlIp;
     NSString *sessionId = [[NSUserDefaults standardUserDefaults] objectForKey:@"sessionId"];
     NSString *master = [[[NSUserDefaults standardUserDefaults] objectForKey:@"masterDic"]objectForKey:@"ma_user"];
     NSString *sessionUser = [[NSUserDefaults standardUserDefaults] objectForKey:@"erpaccount"];
@@ -753,7 +753,7 @@
 
 -(void)clickFanTiJiao{
 
-    NSString *ip = [[NSUserDefaults standardUserDefaults] objectForKey:@"ipAndPort"];
+    NSString *ip = [UASUserInfo shareManager].urlIp;
     NSString *sessionId = [[NSUserDefaults standardUserDefaults] objectForKey:@"sessionId"];
     NSString *master = [[[NSUserDefaults standardUserDefaults] objectForKey:@"masterDic"]objectForKey:@"ma_user"];
     NSString *sessionUser = [[NSUserDefaults standardUserDefaults] objectForKey:@"erpaccount"];
@@ -822,7 +822,7 @@
 }
 -(void)DeleteVisitReportFromSever{
     
-    NSString *ip = [[NSUserDefaults standardUserDefaults] objectForKey:@"ipAndPort"];
+    NSString *ip = [UASUserInfo shareManager].urlIp;
     NSString *sessionId = [[NSUserDefaults standardUserDefaults] objectForKey:@"sessionId"];
     NSString *master = [[[NSUserDefaults standardUserDefaults] objectForKey:@"masterDic"]objectForKey:@"ma_user"];
     NSString *sessionUser = [[NSUserDefaults standardUserDefaults] objectForKey:@"erpaccount"];

shiku_im/shiku_im/controller/ClientSelectVC.m

@@ -96,7 +96,7 @@ static NSString *cellID = @"cellID";
     _searchBar.text = @"";
     
     NSString *sessionId=[[NSUserDefaults standardUserDefaults] stringForKey:@"sessionId"];
-    NSString *ip=[[NSUserDefaults standardUserDefaults] objectForKey:@"ipAndPort"];
+    NSString *ip=[UASUserInfo shareManager].urlIp;
     NSString *emcode = [[NSUserDefaults standardUserDefaults] stringForKey:@"erpaccount"];
     NSString *master = [[[NSUserDefaults standardUserDefaults] objectForKey:@"masterDic"]objectForKey:@"ma_user"];
     NSString *sessionUser = [[NSUserDefaults standardUserDefaults] objectForKey:@"erpaccount"];
@@ -143,7 +143,7 @@ static NSString *cellID = @"cellID";
     [_allDataArr removeAllObjects];
     [_searchArr removeAllObjects];
     NSString *sessionId=[[NSUserDefaults standardUserDefaults] stringForKey:@"sessionId"];
-    NSString *ip=[[NSUserDefaults standardUserDefaults] objectForKey:@"ipAndPort"];
+    NSString *ip=[UASUserInfo shareManager].urlIp;
 //    NSString *sellercode = [[NSUserDefaults standardUserDefaults] stringForKey:@"erpaccount"];
     NSString *master = [[[NSUserDefaults standardUserDefaults] objectForKey:@"masterDic"]objectForKey:@"ma_user"];
     NSString *sessionUser = [[NSUserDefaults standardUserDefaults] objectForKey:@"erpaccount"];
@@ -303,7 +303,7 @@ static NSString *cellID = @"cellID";
     if (_SelectedArr.count == 1)
     {
         NSString *sessionId=[[NSUserDefaults standardUserDefaults] stringForKey:@"sessionId"];
-        NSString *ip=[[NSUserDefaults standardUserDefaults] objectForKey:@"ipAndPort"];
+        NSString *ip=[UASUserInfo shareManager].urlIp;
         NSString *master = [[[NSUserDefaults standardUserDefaults] objectForKey:@"masterDic"]objectForKey:@"ma_user"];
         NSString *sessionUser = [[NSUserDefaults standardUserDefaults] objectForKey:@"erpaccount"];
         

shiku_im/shiku_im/controller/ClientViewController.m

@@ -276,7 +276,7 @@ static NSString *cellID = @"cellID";
     [_dataArr removeAllObjects];
     
     NSString *sessionId=[[NSUserDefaults standardUserDefaults] stringForKey:@"sessionId"];
-    NSString *ip=[[NSUserDefaults standardUserDefaults] objectForKey:@"ipAndPort"];
+    NSString *ip=[UASUserInfo shareManager].urlIp;
 //    NSString *emcode = [[NSUserDefaults standardUserDefaults] stringForKey:@"erpaccount"];
     NSString *master = [[[NSUserDefaults standardUserDefaults] objectForKey:@"masterDic"]objectForKey:@"ma_user"];
     NSString *sessionUser = [[NSUserDefaults standardUserDefaults] objectForKey:@"erpaccount"];
@@ -361,7 +361,7 @@ static NSString *cellID = @"cellID";
 -(void)getIsFormalClient //用来判断是否正式客户
 {
     NSString *sessionId=[[NSUserDefaults standardUserDefaults] stringForKey:@"sessionId"];
-    NSString *ip=[[NSUserDefaults standardUserDefaults] objectForKey:@"ipAndPort"];
+    NSString *ip=[UASUserInfo shareManager].urlIp;
     NSString *master = [[[NSUserDefaults standardUserDefaults] objectForKey:@"masterDic"] objectForKey:@"ma_user"];
     NSString *sessionUser = [[NSUserDefaults standardUserDefaults] objectForKey:@"erpaccount"];
     

shiku_im/shiku_im/controller/CompanyDetailVC.m

@@ -93,7 +93,7 @@
 -(void)getDataFromServer
 {
     NSString *sessionId=[[NSUserDefaults standardUserDefaults] stringForKey:@"sessionId"];
-    NSString *ip=[[NSUserDefaults standardUserDefaults] objectForKey:@"ipAndPort"];
+    NSString *ip=[UASUserInfo shareManager].urlIp;
     NSString *master = [[[NSUserDefaults standardUserDefaults] objectForKey:@"masterDic"]objectForKey:@"ma_user"];
     NSString *sessionUser = [[NSUserDefaults standardUserDefaults] objectForKey:@"erpaccount"];
     
@@ -147,7 +147,7 @@
 -(void)getShangjiState //获取商机阶段数据
 {
     NSString *sessionId=[[NSUserDefaults standardUserDefaults] stringForKey:@"sessionId"];
-    NSString *ip=[[NSUserDefaults standardUserDefaults] objectForKey:@"ipAndPort"];
+    NSString *ip=[UASUserInfo shareManager].urlIp;
     NSString *master = [[[NSUserDefaults standardUserDefaults] objectForKey:@"masterDic"]objectForKey:@"ma_user"];
     NSString *sessionUser = [[NSUserDefaults standardUserDefaults] objectForKey:@"erpaccount"];
     

shiku_im/shiku_im/controller/CreatBussinessVC.m

@@ -72,7 +72,7 @@ static NSString * CellID = @"CellID";
 {
     NSString *sessionId=[[NSUserDefaults standardUserDefaults] stringForKey:@"sessionId"];
     
-    NSString *ip=[[NSUserDefaults standardUserDefaults] objectForKey:@"ipAndPort"];
+    NSString *ip=[UASUserInfo shareManager].urlIp;
     
     NSString *url = [NSString stringWithFormat:@"%@common/getCodeString.action?master=%@&sessionUser=%@&type=2&caller=BusinessChance&sessionId=%@",ip,g_master,g_sessionUser,sessionId];
     DLog(@"aaaaaaaa:%@",url);
@@ -817,7 +817,7 @@ static NSString * CellID = @"CellID";
     
     NSString *sessionId=[userDefault stringForKey:@"sessionId"];
     
-    NSString * ips=[userDefault objectForKey:@"ipAndPort"];
+    NSString * ips=[UASUserInfo shareManager].urlIp;
     
     NSString * userID=[[NSUserDefaults standardUserDefaults] objectForKey:@"erpaccount"];
     
@@ -929,7 +929,7 @@ static NSString * CellID = @"CellID";
     
     NSString *sessionId=[[NSUserDefaults standardUserDefaults] stringForKey:@"sessionId"];
     
-    NSString *ip=[[NSUserDefaults standardUserDefaults] objectForKey:@"ipAndPort"];
+    NSString *ip=[UASUserInfo shareManager].urlIp;
     
     NSString *url = [NSString stringWithFormat:@"%@common/getId.action?master=%@&sessionUser=%@&seq=BUSINESSCHANCE_SEQ&caller=BusinessChance&sessionId=%@",ip,g_master,g_sessionUser,sessionId];
     //    DLog(@"aaaaaaaa:%@",url);
@@ -959,7 +959,7 @@ static NSString * CellID = @"CellID";
 - (void)getYItijiao{
     NSString *sessionId=[[NSUserDefaults standardUserDefaults] stringForKey:@"sessionId"];
     
-    NSString *ip=[[NSUserDefaults standardUserDefaults] objectForKey:@"ipAndPort"];
+    NSString *ip=[UASUserInfo shareManager].urlIp;
     
     NSString *url = [NSString stringWithFormat:@"%@crm/chance/submitBusinessChance.action?master=%@&sessionUser=%@&id=%@&caller=BusinessChance&sessionId=%@",ip,g_master,g_sessionUser,_BackSJId,sessionId];
     //    DLog(@"aaaaaaaa:%@",url);

shiku_im/shiku_im/controller/CurrencyVC.m

@@ -71,7 +71,7 @@
 -(void)getPaymentsData
 {
     NSString *sessionId=[[NSUserDefaults standardUserDefaults] stringForKey:@"sessionId"];
-    NSString *ip=[[NSUserDefaults standardUserDefaults] objectForKey:@"ipAndPort"];
+    NSString *ip=[UASUserInfo shareManager].urlIp;
     NSString *master = [[[NSUserDefaults standardUserDefaults] objectForKey:@"masterDic"]objectForKey:@"ma_user"];
     NSString *sessionUser = [[NSUserDefaults standardUserDefaults] objectForKey:@"erpaccount"];
     

shiku_im/shiku_im/controller/DocumentDataVC.m

@@ -198,7 +198,7 @@
 
 -(void)getDataFromServerWithSF
 {
-    NSString *ip = [[NSUserDefaults standardUserDefaults] objectForKey:@"ipAndPort"];
+    NSString *ip = [UASUserInfo shareManager].urlIp;
     NSString *sessionId = [[NSUserDefaults standardUserDefaults] stringForKey:@"sessionId"];
     
     NSString *url = [NSString stringWithFormat:@"%@common/dbfind.action?caller=%@&field=%@&which=form&condition=1=1&page=1&pageSize=1000&%@",ip,_caller,_field,hypAdd];
@@ -269,7 +269,7 @@
 
 -(void)getDataFromServerWithVD
 {
-    NSString *ip = [[NSUserDefaults standardUserDefaults] objectForKey:@"ipAndPort"];
+    NSString *ip = [UASUserInfo shareManager].urlIp;
     NSString *sessionId = [[NSUserDefaults standardUserDefaults] stringForKey:@"sessionId"];
     
     NSString *url = [NSString stringWithFormat:@"%@mobile/common/getComboValue.action?caller=%@&field=%@&%@",ip,_caller,_field,hypAdd];
@@ -335,7 +335,7 @@
 
 -(void)getDataFromServerWithVD2
 {
-    NSString *ip = [[NSUserDefaults standardUserDefaults] objectForKey:@"ipAndPort"];
+    NSString *ip = [UASUserInfo shareManager].urlIp;
     NSString *sessionId = [[NSUserDefaults standardUserDefaults] stringForKey:@"sessionId"];
     
     NSString *url = [NSString stringWithFormat:@"%@mobile/common/getComboValue.action?caller=%@&field=%@&%@",ip,_caller,_secondField,hypAdd];
@@ -404,7 +404,7 @@
 
 -(void)getDataFromServerWithDF
 {
-    NSString *ip = [[NSUserDefaults standardUserDefaults] objectForKey:@"ipAndPort"];
+    NSString *ip = [UASUserInfo shareManager].urlIp;
     NSString *sessionId = [[NSUserDefaults standardUserDefaults] stringForKey:@"sessionId"];
     
     NSString *url = [NSString stringWithFormat:@"%@common/dbfind.action?caller=%@&field=%@&which=form&condition=1=1&page=1&pageSize=10000&%@",ip,_caller,_field,hypAdd];

shiku_im/shiku_im/controller/DocumentDetailVC.m

@@ -241,7 +241,7 @@
                 for (NSDictionary *dic in arr) {
                     DLog(@"%@",FORMAT(@"%@common/download.action?path=%@&%@",g_id,dic[@"fp_path"],mustString));
                     //                NSURL *url = [NSURL URLWithString:FORMAT(@"%@common/download.action?path=%@",g_id,dic[@"fp_path"])];
-                    NSString *ip=[[NSUserDefaults standardUserDefaults] objectForKey:@"ipAndPort"];
+                    NSString *ip=[UASUserInfo shareManager].urlIp;
                     
                     NSString *urlStr = FORMAT(@"%@common/download.action?path=%@&%@",ip,dic[@"fp_path"],mustString);
                     
@@ -430,7 +430,7 @@
     [_formdata removeAllObjects];
     [_formconfigs removeAllObjects];
     
-    NSString *ip = [[NSUserDefaults standardUserDefaults] objectForKey:@"ipAndPort"];
+    NSString *ip = [UASUserInfo shareManager].urlIp;
     NSString *sessionId = [[NSUserDefaults standardUserDefaults] stringForKey:@"sessionId"];
     
     NSString *url = [NSString stringWithFormat:@"%@mobile/common/getformandgriddata.action?caller=%@&id=%@&sessionId=%@&isprocess=1",ip,_caller,_dan_id,sessionId];
@@ -838,7 +838,7 @@
         
         NSString *sessionId=[[NSUserDefaults standardUserDefaults] stringForKey:@"sessionId"];
         
-        NSString *ip=[[NSUserDefaults standardUserDefaults] objectForKey:@"ipAndPort"];
+        NSString *ip=[UASUserInfo shareManager].urlIp;
         
         
         NSString *url = [NSString stringWithFormat:@"%@common/getCurrentJnodes.action?master=%@&sessionUser=%@&emcode=%@&caller=%@&sessionId=%@&keyValue=%@&_noc=1",ip,g_master,g_sessionUser,[[NSUserDefaults standardUserDefaults] objectForKey:@"erpaccount"],_caller,sessionId,_dan_id];
@@ -1181,7 +1181,7 @@
 {
     [HUD show:YES];
     //重新提交需要清除审批流和更改单据状态
-    NSString *ip = [[NSUserDefaults standardUserDefaults] objectForKey:@"ipAndPort"];
+    NSString *ip = [UASUserInfo shareManager].urlIp;
     NSString *sessionId = [[NSUserDefaults standardUserDefaults] stringForKey:@"sessionId"];
     
     NSString *url = [NSString stringWithFormat:@"%@mobile/commonres.action?caller=%@&id=%@&sessionId=%@",ip,_caller,_dan_id,sessionId];
@@ -1281,7 +1281,7 @@
     [UASAlertView showWithTitle:nil content:@"确认删除该条单据？" sureTitle:Localized(@"UU_custom_sure") cancelTitle:Localized(@"UU_custom_cancle") click:^(NSInteger index) {
         if (index == 2) {
             [HUD show:YES];
-            NSString *ip = [[NSUserDefaults standardUserDefaults] objectForKey:@"ipAndPort"];
+            NSString *ip = [UASUserInfo shareManager].urlIp;
             NSString *sessionId = [[NSUserDefaults standardUserDefaults] stringForKey:@"sessionId"];
             
             NSString *url = [NSString stringWithFormat:@"%@mobile/commonres.action?caller=%@&id=%@&sessionId=%@",ip,_caller,_dan_id,sessionId];
@@ -1333,7 +1333,7 @@
     
     if (buttonIndex == 1) {
         [HUD show:YES];
-        NSString *ip = [[NSUserDefaults standardUserDefaults] objectForKey:@"ipAndPort"];
+        NSString *ip = [UASUserInfo shareManager].urlIp;
         NSString *sessionId = [[NSUserDefaults standardUserDefaults] stringForKey:@"sessionId"];
         
         NSString *url = [NSString stringWithFormat:@"%@mobile/commonres.action?caller=%@&id=%@&sessionId=%@",ip,_caller,_dan_id,sessionId];
@@ -1382,7 +1382,7 @@
 
 -(void)deleteDataToServer //删除单据
 {
-    NSString *ip = [[NSUserDefaults standardUserDefaults] objectForKey:@"ipAndPort"];
+    NSString *ip = [UASUserInfo shareManager].urlIp;
     NSString *sessionId = [[NSUserDefaults standardUserDefaults] stringForKey:@"sessionId"];
     
     NSString *url = [NSString stringWithFormat:@"%@mobile/commondelete.action?caller=%@&id=%@&sessionId=%@",ip,_caller,_dan_id,sessionId];

shiku_im/shiku_im/controller/DocumentListVC.m

@@ -214,7 +214,7 @@ static NSString *cellID = @"cellID";
     emcode = g_emcode;
     currentMaster = [[[NSUserDefaults standardUserDefaults] objectForKey:@"masterDic"] objectForKey:@"ma_user"];
     sessionId = [[NSUserDefaults standardUserDefaults] stringForKey:@"sessionId"];
-    ip = [[NSUserDefaults standardUserDefaults] objectForKey:@"ipAndPort"];
+    ip = [UASUserInfo shareManager].urlIp;
     
     NSString *url = @"";
     if ([_caller isEqualToString:@"Workovertime"]) {

shiku_im/shiku_im/controller/DocumentVC.m

@@ -157,7 +157,7 @@ static NSString *cellID = @"cellID";
 -(void)isAdmin //判断是否为管理员
 {
     NSString *sessionId=[[NSUserDefaults standardUserDefaults] stringForKey:@"sessionId"];
-    NSString *ip=[[NSUserDefaults standardUserDefaults] objectForKey:@"ipAndPort"];
+    NSString *ip=[UASUserInfo shareManager].urlIp;
     NSString *emcode=[[NSUserDefaults standardUserDefaults] stringForKey:@"erpaccount"];
     NSString *master = [[[NSUserDefaults standardUserDefaults] objectForKey:@"masterDic"]objectForKey:@"ma_user"];
     NSString *sessionUser = [[NSUserDefaults standardUserDefaults] objectForKey:@"erpaccount"];
@@ -216,7 +216,7 @@ static NSString *cellID = @"cellID";
 -(void)getDataFromSeverWithCaller:(NSString *)caller
 {
     [MBProgressHUD showMessage:@"" toView:self.view];
-    NSString *ip = [[NSUserDefaults standardUserDefaults] objectForKey:@"ipAndPort"];
+    NSString *ip = [UASUserInfo shareManager].urlIp;
     NSString *sessionId = [[NSUserDefaults standardUserDefaults] stringForKey:@"sessionId"];
     NSString *url = [NSString stringWithFormat:@"%@mobile/common/getformandgriddetail.action?caller=%@&condition=1=1&sessionId=%@&id=0",ip,caller,sessionId];
 
@@ -326,7 +326,7 @@ static NSString *cellID = @"cellID";
 
 -(void)getCodeAndId //获取新单据编号和单据id
 {
-    NSString *ip = [[NSUserDefaults standardUserDefaults] objectForKey:@"ipAndPort"];
+    NSString *ip = [UASUserInfo shareManager].urlIp;
     NSString *sessionId = [[NSUserDefaults standardUserDefaults] stringForKey:@"sessionId"];
     
     NSString *url = [NSString stringWithFormat:@"%@common/getCodeString.action?&caller=%@&sessionId=%@&type=2",ip,_caller,sessionId];
@@ -1265,7 +1265,7 @@ static NSString *cellID = @"cellID";
     //mobile/oa/saveAndSubmitAskLeave.action?caller=Ask4Leave&formStore={"va_startime":"2016-11-16%2014:10:00","va_endtime":"2016-11-16%2016:00:00"} 请假单
     
     NSString *sessionId=[[NSUserDefaults standardUserDefaults] stringForKey:@"sessionId"];
-    NSString *ip=[[NSUserDefaults standardUserDefaults] objectForKey:@"ipAndPort"];
+    NSString *ip=[UASUserInfo shareManager].urlIp;
     NSString *url = [NSString stringWithFormat:@"%@mobile/oa/commonSaveAndSubmit.action",ip];
     
     if ([_caller isEqualToString:@"ExtraWork$"]) {
@@ -1386,7 +1386,7 @@ static NSString *cellID = @"cellID";
     
     NSString *sessionId=[userDefault stringForKey:@"sessionId"];
     
-    NSString * ips=[userDefault objectForKey:@"ipAndPort"];
+    NSString * ips=[UASUserInfo shareManager].urlIp;
     
     NSString * userID=[[NSUserDefaults standardUserDefaults] objectForKey:@"erpaccount"];
     NSString *master=[[[NSUserDefaults standardUserDefaults] objectForKey:@"masterDic"]objectForKey:@"ma_user"];

shiku_im/shiku_im/controller/ERPHandleTaskVC.m

@@ -119,7 +119,7 @@ static NSString *cellID = @"cellID";
     self.uv.hidden = NO;
     [_searchBar resignFirstResponder];
     NSString *sessionId = [[NSUserDefaults standardUserDefaults] stringForKey:@"sessionId"];
-    NSString *ip = [[NSUserDefaults standardUserDefaults] objectForKey:@"ipAndPort"];
+    NSString *ip = [UASUserInfo shareManager].urlIp;
     NSString * PersonName=[[NSUserDefaults standardUserDefaults] objectForKey:@"personName"];
     NSString * user = [[NSUserDefaults standardUserDefaults] objectForKey:@"erpaccount"];
     NSString *url = [NSString stringWithFormat:@"%@common/datalist/data.action?caller=ResourceAssignment&page=%d&pageSize=%d&condition=(recorder='%@' or ra_resourcecode='%@') and nvl(class,' ')<>'projecttask'&_noc=1&sessionId=%@&master=%@&sessionUser=%@",ip,1,200,PersonName,user,sessionId,g_master,g_sessionUser];

shiku_im/shiku_im/controller/EditStringVC.m

@@ -430,7 +430,7 @@ static NSString *headerID = @"headerID";
     NSString *str = [[NSString alloc] initWithData:jsonData encoding:NSUTF8StringEncoding];
     
     NSString *sessionId=[[NSUserDefaults standardUserDefaults] stringForKey:@"sessionId"];
-    NSString *ip=[[NSUserDefaults standardUserDefaults] objectForKey:@"ipAndPort"];
+    NSString *ip=[UASUserInfo shareManager].urlIp;
     
     
     NSString *url = [NSString stringWithFormat:@"%@mobile/common/updatemobiledefault.action?caller=%@&formStore=%@&master=%@&sessionUser=%@&sessionId=%@",ip,_caller,str,g_master,g_sessionUser,sessionId];

shiku_im/shiku_im/controller/FollowShangjiVC.m

@@ -187,7 +187,7 @@ static NSString *cellID = @"cellID";
     [self.view endEditing:YES];
     
     NSString *sessionId=[[NSUserDefaults standardUserDefaults] stringForKey:@"sessionId"];
-    NSString *ip=[[NSUserDefaults standardUserDefaults] objectForKey:@"ipAndPort"];
+    NSString *ip=[UASUserInfo shareManager].urlIp;
     NSString *emcode = [[NSUserDefaults standardUserDefaults] stringForKey:@"erpaccount"];
     NSString *master = [[[NSUserDefaults standardUserDefaults] objectForKey:@"masterDic"]objectForKey:@"ma_user"];
     NSString *sessionUser = [[NSUserDefaults standardUserDefaults] objectForKey:@"erpaccount"];

shiku_im/shiku_im/controller/ForgetClientMoreVC.m

@@ -66,7 +66,7 @@ static NSString *cellID = @"cellID";
     /*接口：mobile/crm/getInactionCusts.action
      参数：String emcode,int page,int pageSize*/
     NSString *sessionId=[[NSUserDefaults standardUserDefaults] stringForKey:@"sessionId"];
-    NSString *ip=[[NSUserDefaults standardUserDefaults] objectForKey:@"ipAndPort"];
+    NSString *ip=[UASUserInfo shareManager].urlIp;
     NSString *emcode=[[NSUserDefaults standardUserDefaults] stringForKey:@"erpaccount"];
     NSString *master = [[[NSUserDefaults standardUserDefaults] objectForKey:@"masterDic"]objectForKey:@"ma_user"];
     NSString *sessionUser = [[NSUserDefaults standardUserDefaults] objectForKey:@"erpaccount"];

shiku_im/shiku_im/controller/GoOnFollowSJVC.m

@@ -90,7 +90,7 @@
 -(void)getId
 {
     NSString *sessionId=[[NSUserDefaults standardUserDefaults] stringForKey:@"sessionId"];
-    NSString *ip=[[NSUserDefaults standardUserDefaults] objectForKey:@"ipAndPort"];
+    NSString *ip=[UASUserInfo shareManager].urlIp;
     NSString *master = [[[NSUserDefaults standardUserDefaults] objectForKey:@"masterDic"]objectForKey:@"ma_user"];
     NSString *sessionUser = [[NSUserDefaults standardUserDefaults] objectForKey:@"erpaccount"];
     
@@ -122,7 +122,7 @@
 -(void)updateSchedule //更新状态
 {
     NSString *sessionId=[[NSUserDefaults standardUserDefaults] stringForKey:@"sessionId"];
-    NSString *ip=[[NSUserDefaults standardUserDefaults] objectForKey:@"ipAndPort"];
+    NSString *ip=[UASUserInfo shareManager].urlIp;
     NSString *master = [[[NSUserDefaults standardUserDefaults] objectForKey:@"masterDic"]objectForKey:@"ma_user"];
     NSString *sessionUser = [[NSUserDefaults standardUserDefaults] objectForKey:@"erpaccount"];
     
@@ -369,7 +369,7 @@
     f.dateFormat = @"yyyy-MM-dd HH:mm:ss";
     NSString* s = [f stringFromDate:senddate];
     NSString *sessionId=[[NSUserDefaults standardUserDefaults] stringForKey:@"sessionId"];
-    NSString *ip=[[NSUserDefaults standardUserDefaults] objectForKey:@"ipAndPort"];
+    NSString *ip=[UASUserInfo shareManager].urlIp;
     NSString *master = [[[NSUserDefaults standardUserDefaults] objectForKey:@"masterDic"]objectForKey:@"ma_user"];
     NSString *sessionUser = [[NSUserDefaults standardUserDefaults] objectForKey:@"erpaccount"];
     

shiku_im/shiku_im/controller/HandleTaskViewController.m

@@ -657,7 +657,7 @@ typedef NS_ENUM(NSInteger, HandleClickType)
 //    manager.responseSerializer.acceptableContentTypes =[NSSet setWithObject:@"text/html"];
 //    manager.responseSerializer.acceptableContentTypes =[NSSet setWithObject:@"application/json"];
     NSUserDefaults *userDefault=[NSUserDefaults standardUserDefaults];
-    NSString *ip=[userDefault objectForKey:@"ipAndPort"];
+    NSString *ip=[UASUserInfo shareManager].urlIp;
     NSString *sessionId=[userDefault objectForKey:@"sessionId"];
     
     NSString *paramSessionId=[@"" stringByAppendingFormat:@"JSESSIONID=%@",sessionId];
@@ -754,7 +754,7 @@ typedef NS_ENUM(NSInteger, HandleClickType)
     UASNetworkManager *manager = [UASNetworkManager shareManager];
     manager.responseSerializer = [AFHTTPResponseSerializer serializer];
     NSUserDefaults *userDefault=[NSUserDefaults standardUserDefaults];
-    NSString *ip=[userDefault objectForKey:@"ipAndPort"];
+    NSString *ip=[UASUserInfo shareManager].urlIp;
     NSString *master=[[userDefault objectForKey:@"masterDic"]objectForKey:@"ma_user"];
     
     NSString *sessionId=[userDefault objectForKey:@"sessionId"];
@@ -807,7 +807,7 @@ typedef NS_ENUM(NSInteger, HandleClickType)
     UASNetworkManager *manager = [UASNetworkManager shareManager];
     manager.responseSerializer = [AFHTTPResponseSerializer serializer];
     NSUserDefaults *userDefault=[NSUserDefaults standardUserDefaults];
-    NSString *ip=[userDefault objectForKey:@"ipAndPort"];
+    NSString *ip=[UASUserInfo shareManager].urlIp;
     NSString *master=[[userDefault objectForKey:@"masterDic"]objectForKey:@"ma_user"];
     
     NSString *sessionId=[userDefault objectForKey:@"sessionId"];
@@ -846,7 +846,7 @@ typedef NS_ENUM(NSInteger, HandleClickType)
     UASNetworkManager *manager = [UASNetworkManager shareManager];
     manager.responseSerializer = [AFHTTPResponseSerializer serializer];
     NSUserDefaults *userDefault=[NSUserDefaults standardUserDefaults];
-    NSString *ip=[userDefault objectForKey:@"ipAndPort"];
+    NSString *ip=[UASUserInfo shareManager].urlIp;
   //  NSString *master=[[userDefault objectForKey:@"masterDic"]objectForKey:@"ma_user"];
     
     NSString *sessionId=[userDefault objectForKey:@"sessionId"];
@@ -895,7 +895,7 @@ typedef NS_ENUM(NSInteger, HandleClickType)
     
     //分离字ipAndPort符串，
     NSUserDefaults *userDefault=[NSUserDefaults standardUserDefaults];
-    NSString *ip=[userDefault objectForKey:@"ipAndPort"];
+    NSString *ip=[UASUserInfo shareManager].urlIp;
     NSArray *array11= [ip componentsSeparatedByString:@"//"];
     NSString *tempStr1=[array11 objectAtIndex:1] ;
     NSArray *array22=[tempStr1 componentsSeparatedByString:@"/"];

shiku_im/shiku_im/controller/JOAddressBookVC.m

@@ -922,7 +922,7 @@
     
     NSUserDefaults * userDefault=[NSUserDefaults standardUserDefaults];
     
-    NSString *ip=[userDefault objectForKey:@"ipAndPort"];
+    NSString *ip=[UASUserInfo shareManager].urlIp;
     
     NSString *sessionId=[userDefault objectForKey:@"sessionId"];
     

shiku_im/shiku_im/controller/JODYWebViewController.m

@@ -199,7 +199,7 @@
     NSString * sessionId = [[NSUserDefaults standardUserDefaults] objectForKey:@"sessionId"];
     NSUserDefaults *userDefaults=[NSUserDefaults standardUserDefaults];
     //   NSString *userName=[userDefaults stringForKey:@"erpaccount"];
-    NSString *ip=[userDefaults objectForKey:@"ipAndPort"] ;
+    NSString *ip=[UASUserInfo shareManager].urlIp ;
     //    NSString *sessionId=[userDefaults stringForKey:@"sessionId"];
     //    DLog(@"userName=%@ ip=%@ sessionId=%@",userName,ip,sessionId);
     

shiku_im/shiku_im/controller/JONEWDYTableView.m

@@ -500,7 +500,7 @@
     NSUserDefaults *userDefault=[NSUserDefaults standardUserDefaults];
     NSString *sessionId=[userDefault stringForKey:@"sessionId"];
     //DLog(@"sessionId333=%@",sessionId);
-    NSString * ips=[userDefault objectForKey:@"ipAndPort"];
+    NSString * ips=[UASUserInfo shareManager].urlIp;
     //3.拼接session
     NSString *paramSessionId=[@"" stringByAppendingFormat:@"JSESSIONID=%@",sessionId];
     //4.设置cookie

shiku_im/shiku_im/controller/LoginViewController.m

@@ -1086,7 +1086,7 @@ parameters:nil progress:nil success:^(NSURLSessionDataTask *task, id responseObj
         
         doubleMasterArray=[userDefaults objectForKey:@"doubleMasterArray"];
         tempMasterDic=[userDefaults objectForKey:@"masterDic"];
-        tempIp=[userDefaults objectForKey:@"ipAndPort"];
+        tempIp= [UASUserInfo shareManager].urlIp;
         //DLog(@"loginState=%@",[userDefaults objectForKey:@"loginState"]?@"YES":@"NO");
         if ([userDefaults boolForKey:@"isRemerberPass"]) {
             remerberPass.checked=YES;

shiku_im/shiku_im/controller/LoseShangjiVC.m

@@ -56,7 +56,7 @@
 -(void)getCode //获取单据编号
 {
     NSString *sessionId=[[NSUserDefaults standardUserDefaults] stringForKey:@"sessionId"];
-    NSString *ip=[[NSUserDefaults standardUserDefaults] objectForKey:@"ipAndPort"];
+    NSString *ip=[UASUserInfo shareManager].urlIp;
     NSString *master = [[[NSUserDefaults standardUserDefaults] objectForKey:@"masterDic"]objectForKey:@"ma_user"];
     NSString *sessionUser = [[NSUserDefaults standardUserDefaults] objectForKey:@"erpaccount"];
     
@@ -235,7 +235,7 @@
 -(void)saveDoneAction
 {
     NSString *sessionId=[[NSUserDefaults standardUserDefaults] stringForKey:@"sessionId"];
-    NSString *ip=[[NSUserDefaults standardUserDefaults] objectForKey:@"ipAndPort"];
+    NSString *ip=[UASUserInfo shareManager].urlIp;
     NSString *master = [[[NSUserDefaults standardUserDefaults] objectForKey:@"masterDic"]objectForKey:@"ma_user"];
     NSString *sessionUser = [[NSUserDefaults standardUserDefaults] objectForKey:@"erpaccount"];
     

shiku_im/shiku_im/controller/MFselectVC.m

@@ -113,7 +113,7 @@ static NSString *cellID = @"cellID";
 
 -(void)getDataFromServer
 {
-    NSString *ip = [[NSUserDefaults standardUserDefaults] objectForKey:@"ipAndPort"];
+    NSString *ip = [UASUserInfo shareManager].urlIp;
     NSString *sessionId = [[NSUserDefaults standardUserDefaults] stringForKey:@"sessionId"];
     
     NSString *url = [NSString stringWithFormat:@"%@common/dbfind.action?caller=%@&field=%@&which=form&condition=1=1&page=1&pageSize=1000&%@",ip,_caller,_field,hypAdd];

shiku_im/shiku_im/controller/MeViewController.m

@@ -343,8 +343,8 @@ UASNetworkManager *meChangeMasterManager;
         
         labelTel.text=[@"TEL:" stringByAppendingString:[userDefault objectForKey:@"userName"]];
     }
-    if ([userDefault objectForKey:@"ipAndPort"]) {
-        labelIp.text=[@"IP:" stringByAppendingString:[userDefault objectForKey:@"ipAndPort"]];
+    if ([UASUserInfo shareManager].urlIp) {
+        labelIp.text=[@"IP:" stringByAppendingString:[UASUserInfo shareManager].urlIp];
     }
     if ([[userDefault stringForKey:@"erpUuId"] isEqualToString:@"(null)"]) {
         labelUU.text=@"UU:未注册";
@@ -526,7 +526,7 @@ UASNetworkManager *meChangeMasterManager;
 //            
 //            if (![[userDefaults stringForKey:@"erpUuId"] isEqualToString:@"(null)"]) {
 //                if([userDefaults stringForKey:@"ipAndPort"])
-//                    labelIp.text=[@"IP:" stringByAppendingString:[userDefaults objectForKey:@"ipAndPort"]];
+//                    labelIp.text=[@"IP:" stringByAppendingString:[UASUserInfo shareManager].urlIp];
 //                else
 //                    labelIp.text=@"IP:未登录";
 //                

shiku_im/shiku_im/controller/MySubordinateVC.m

@@ -90,7 +90,7 @@ static NSString *cellID = @"cellID";
 {
     [_searchArr removeAllObjects];
     NSString *sessionId=[[NSUserDefaults standardUserDefaults] stringForKey:@"sessionId"];
-    NSString *ip=[[NSUserDefaults standardUserDefaults] objectForKey:@"ipAndPort"];
+    NSString *ip=[UASUserInfo shareManager].urlIp;
     NSString *emcode = [[NSUserDefaults standardUserDefaults] stringForKey:@"erpaccount"];
     NSString *master = [[[NSUserDefaults standardUserDefaults] objectForKey:@"masterDic"]objectForKey:@"ma_user"];
     NSString *sessionUser = [[NSUserDefaults standardUserDefaults] objectForKey:@"erpaccount"];

shiku_im/shiku_im/controller/MyWebViewController.m

@@ -68,7 +68,7 @@ UIActivityIndicatorView * activityIndicator;
    //从本地沙盒取出单据
     NSUserDefaults *userDefaults=[NSUserDefaults standardUserDefaults];
     NSString *userName=[userDefaults stringForKey:@"erpaccount"];
-    NSString *ip=[userDefaults objectForKey:@"ipAndPort"] ;
+    NSString *ip=[UASUserInfo shareManager].urlIp;
     //self.master=[[userDefaults objectForKey:@"masterDic"] objectForKey:@"ma_user"];
     self.sessionId=[userDefaults stringForKey:@"sessionId"];
     NSString *param=[@"" stringByAppendingFormat:@"u=%@&master=%@&url=%@&device=2&sessionId=%@",userName,self.master,self.linkUrl,self.sessionId];

shiku_im/shiku_im/controller/PaymentsVC.m

@@ -73,7 +73,7 @@
 -(void)getPaymentsData
 {
     NSString *sessionId=[[NSUserDefaults standardUserDefaults] stringForKey:@"sessionId"];
-    NSString *ip=[[NSUserDefaults standardUserDefaults] objectForKey:@"ipAndPort"];
+    NSString *ip=[UASUserInfo shareManager].urlIp;
     NSString *master = [[[NSUserDefaults standardUserDefaults] objectForKey:@"masterDic"]objectForKey:@"ma_user"];
     NSString *sessionUser = [[NSUserDefaults standardUserDefaults] objectForKey:@"erpaccount"];
     

shiku_im/shiku_im/controller/QiangShangjiVC.m

@@ -232,7 +232,7 @@ static NSString *cellID = @"cellID";
 -(void)isAdmin //判断是否为管理员
 {
     NSString *sessionId=[[NSUserDefaults standardUserDefaults] stringForKey:@"sessionId"];
-    NSString *ip=[[NSUserDefaults standardUserDefaults] objectForKey:@"ipAndPort"];
+    NSString *ip=[UASUserInfo shareManager].urlIp;
     NSString *emcode=[[NSUserDefaults standardUserDefaults] stringForKey:@"erpaccount"];
     NSString *master = [[[NSUserDefaults standardUserDefaults] objectForKey:@"masterDic"]objectForKey:@"ma_user"];
     NSString *sessionUser = [[NSUserDefaults standardUserDefaults] objectForKey:@"erpaccount"];
@@ -283,7 +283,7 @@ static NSString *cellID = @"cellID";
     [self.view endEditing:YES];
     
     NSString *sessionId=[[NSUserDefaults standardUserDefaults] stringForKey:@"sessionId"];
-    NSString *ip=[[NSUserDefaults standardUserDefaults] objectForKey:@"ipAndPort"];
+    NSString *ip=[UASUserInfo shareManager].urlIp;
     NSString *master = [[[NSUserDefaults standardUserDefaults] objectForKey:@"masterDic"]objectForKey:@"ma_user"];
     NSString *sessionUser = [[NSUserDefaults standardUserDefaults] objectForKey:@"erpaccount"];
     
@@ -543,7 +543,7 @@ static NSString *cellID = @"cellID";
 -(void)qiangAgainAction:(int)sender
 {
     NSString *sessionId=[[NSUserDefaults standardUserDefaults] stringForKey:@"sessionId"];
-    NSString *ip=[[NSUserDefaults standardUserDefaults] objectForKey:@"ipAndPort"];
+    NSString *ip=[UASUserInfo shareManager].urlIp;
     NSString *master = [[[NSUserDefaults standardUserDefaults] objectForKey:@"masterDic"]objectForKey:@"ma_user"];
     NSString *sessionUser = [[NSUserDefaults standardUserDefaults] objectForKey:@"erpaccount"];
     
@@ -604,7 +604,7 @@ static NSString *cellID = @"cellID";
     [_indicationV startAnimating];
     
     NSString *sessionId=[[NSUserDefaults standardUserDefaults] stringForKey:@"sessionId"];
-    NSString *ip=[[NSUserDefaults standardUserDefaults] objectForKey:@"ipAndPort"];
+    NSString *ip=[UASUserInfo shareManager].urlIp;
     NSString *emcode = [[NSUserDefaults standardUserDefaults] objectForKey:@"erpaccount"];
     NSString *master = [[[NSUserDefaults standardUserDefaults] objectForKey:@"masterDic"]objectForKey:@"ma_user"];
     NSString *sessionUser = [[NSUserDefaults standardUserDefaults] objectForKey:@"erpaccount"];

shiku_im/shiku_im/controller/SalemanSelectVC.m

@@ -76,7 +76,7 @@ static NSString *cellID = @"cellID";
 -(void)getPeopleDataFromServer
 {
     NSString *sessionId=[[NSUserDefaults standardUserDefaults] stringForKey:@"sessionId"];
-    NSString *ip=[[NSUserDefaults standardUserDefaults] objectForKey:@"ipAndPort"];
+    NSString *ip=[UASUserInfo shareManager].urlIp;
     NSString *master = [[[NSUserDefaults standardUserDefaults] objectForKey:@"masterDic"]objectForKey:@"ma_user"];
     NSString *sessionUser = [[NSUserDefaults standardUserDefaults] objectForKey:@"erpaccount"];
     
@@ -153,7 +153,7 @@ static NSString *cellID = @"cellID";
     UASNetworkManager *manager = [UASNetworkManager shareManager];
     manager.responseSerializer = [AFJSONResponseSerializer serializer];
     
-    NSString *ip = [[NSUserDefaults standardUserDefaults] objectForKey:@"ipAndPort"];
+    NSString *ip = [UASUserInfo shareManager].urlIp;
     NSString *sessionId = [[NSUserDefaults standardUserDefaults] objectForKey:@"sessionId"];
     NSString *master = [[[NSUserDefaults standardUserDefaults] objectForKey:@"masterDic"]objectForKey:@"ma_user"];
     NSString *sessionUser = [[NSUserDefaults standardUserDefaults] objectForKey:@"erpaccount"];

shiku_im/shiku_im/controller/SearchClientVC.m

@@ -190,7 +190,7 @@ static NSString *cellID = @"cellID";
     _searchBar.text = @"";
     
     NSString *sessionId=[[NSUserDefaults standardUserDefaults] stringForKey:@"sessionId"];
-    NSString *ip=[[NSUserDefaults standardUserDefaults] objectForKey:@"ipAndPort"];
+    NSString *ip=[UASUserInfo shareManager].urlIp;
     NSString *emcode = [[NSUserDefaults standardUserDefaults] stringForKey:@"erpaccount"];
     NSString *master = [[[NSUserDefaults standardUserDefaults] objectForKey:@"masterDic"]objectForKey:@"ma_user"];
     NSString *sessionUser = [[NSUserDefaults standardUserDefaults] objectForKey:@"erpaccount"];

shiku_im/shiku_im/controller/ShangjiDetailVC.m

@@ -128,7 +128,7 @@
 {
     [_indicationV startAnimating];
     NSString *sessionId=[[NSUserDefaults standardUserDefaults] stringForKey:@"sessionId"];
-    NSString *ip=[[NSUserDefaults standardUserDefaults] objectForKey:@"ipAndPort"];
+    NSString *ip=[UASUserInfo shareManager].urlIp;
     NSString *master = [[[NSUserDefaults standardUserDefaults] objectForKey:@"masterDic"]objectForKey:@"ma_user"];
     NSString *sessionUser = [[NSUserDefaults standardUserDefaults] objectForKey:@"erpaccount"];
     
@@ -210,7 +210,7 @@
     [_SJdataArr removeAllObjects];
     
     NSString *sessionId=[[NSUserDefaults standardUserDefaults] stringForKey:@"sessionId"];
-    NSString *ip=[[NSUserDefaults standardUserDefaults] objectForKey:@"ipAndPort"];
+    NSString *ip=[UASUserInfo shareManager].urlIp;
     NSString *master = [[[NSUserDefaults standardUserDefaults] objectForKey:@"masterDic"]objectForKey:@"ma_user"];
     NSString *sessionUser = [[NSUserDefaults standardUserDefaults] objectForKey:@"erpaccount"];
     
@@ -357,7 +357,7 @@
     [_SJPointArr removeAllObjects];
     
     NSString *sessionId=[[NSUserDefaults standardUserDefaults] stringForKey:@"sessionId"];
-    NSString *ip=[[NSUserDefaults standardUserDefaults] objectForKey:@"ipAndPort"];
+    NSString *ip=[UASUserInfo shareManager].urlIp;
     
     NSString *url = [NSString stringWithFormat:@"%@mobile/crm/getStagePoints.action?bccode=%@&currentStep=%@&master=%@&sessionUser=%@&sessionId=%@",ip,_SJCode,_panelDataArr[@"bc_currentprocess"],g_master,g_sessionUser,sessionId];
     
@@ -812,7 +812,7 @@
     DLog(@"获取日程，是否有数据，判断能否添加");
     
     NSString *sessionId=[[NSUserDefaults standardUserDefaults] stringForKey:@"sessionId"];
-    NSString *ip=[[NSUserDefaults standardUserDefaults] objectForKey:@"ipAndPort"];
+    NSString *ip=[UASUserInfo shareManager].urlIp;
     NSString *sellername = [[NSUserDefaults standardUserDefaults] stringForKey:@"personName"];
     NSString *master = [[[NSUserDefaults standardUserDefaults] objectForKey:@"masterDic"]objectForKey:@"ma_user"];
     NSString *sessionUser = [[NSUserDefaults standardUserDefaults] objectForKey:@"erpaccount"];
@@ -918,7 +918,7 @@
     [_indicationV startAnimating];
     
     NSString *sessionId=[[NSUserDefaults standardUserDefaults] stringForKey:@"sessionId"];
-    NSString *ip=[[NSUserDefaults standardUserDefaults] objectForKey:@"ipAndPort"];
+    NSString *ip=[UASUserInfo shareManager].urlIp;
     NSString *master = [[[NSUserDefaults standardUserDefaults] objectForKey:@"masterDic"]objectForKey:@"ma_user"];
     NSString *sessionUser = [[NSUserDefaults standardUserDefaults] objectForKey:@"erpaccount"];
     
@@ -1038,7 +1038,7 @@
     [UASAlertView showWithTitle:nil content:@"您确定释放此商机?" sureTitle:Localized(@"UU_custom_yes") cancelTitle:Localized(@"UU_custom_no") click:^(NSInteger index) {
         if (index == 2) {
             NSString *sessionId=[[NSUserDefaults standardUserDefaults] stringForKey:@"sessionId"];
-            NSString *ip=[[NSUserDefaults standardUserDefaults] objectForKey:@"ipAndPort"];
+            NSString *ip=[UASUserInfo shareManager].urlIp;
             NSString *string = [NSString stringWithFormat:@"%@",_panelDataArr[@"bc_code"]];
             NSString *master = [[[NSUserDefaults standardUserDefaults] objectForKey:@"masterDic"]objectForKey:@"ma_user"];
             NSString *sessionUser = [[NSUserDefaults standardUserDefaults] objectForKey:@"erpaccount"];
@@ -1101,7 +1101,7 @@
     if (buttonIndex==1)
     {
         NSString *sessionId=[[NSUserDefaults standardUserDefaults] stringForKey:@"sessionId"];
-        NSString *ip=[[NSUserDefaults standardUserDefaults] objectForKey:@"ipAndPort"];
+        NSString *ip=[UASUserInfo shareManager].urlIp;
         NSString *string = [NSString stringWithFormat:@"%@",_panelDataArr[@"bc_code"]];
         NSString *master = [[[NSUserDefaults standardUserDefaults] objectForKey:@"masterDic"]objectForKey:@"ma_user"];
         NSString *sessionUser = [[NSUserDefaults standardUserDefaults] objectForKey:@"erpaccount"];
@@ -1163,7 +1163,7 @@
 -(void)qiangAction //抢
 {
     NSString *sessionId=[[NSUserDefaults standardUserDefaults] stringForKey:@"sessionId"];
-    NSString *ip=[[NSUserDefaults standardUserDefaults] objectForKey:@"ipAndPort"];
+    NSString *ip=[UASUserInfo shareManager].urlIp;
     NSString *master = [[[NSUserDefaults standardUserDefaults] objectForKey:@"masterDic"]objectForKey:@"ma_user"];
     NSString *sessionUser = [[NSUserDefaults standardUserDefaults] objectForKey:@"erpaccount"];
     
@@ -1227,7 +1227,7 @@
 {
     [_indicationV startAnimating];
     NSString *sessionId=[[NSUserDefaults standardUserDefaults] stringForKey:@"sessionId"];
-    NSString *ip=[[NSUserDefaults standardUserDefaults] objectForKey:@"ipAndPort"];
+    NSString *ip=[UASUserInfo shareManager].urlIp;
     NSString *emcode = [[NSUserDefaults standardUserDefaults] objectForKey:@"erpaccount"];
     NSString *master = [[[NSUserDefaults standardUserDefaults] objectForKey:@"masterDic"]objectForKey:@"ma_user"];
     NSString *sessionUser = [[NSUserDefaults standardUserDefaults] objectForKey:@"erpaccount"];

shiku_im/shiku_im/controller/ShangjiKuVC.m

@@ -64,7 +64,7 @@ static NSString *cellID = @"cellID";
 -(void)getDataFromServer
 {
     NSString *sessionId=[[NSUserDefaults standardUserDefaults] stringForKey:@"sessionId"];
-    NSString *ip=[[NSUserDefaults standardUserDefaults] objectForKey:@"ipAndPort"];
+    NSString *ip=[UASUserInfo shareManager].urlIp;
     NSString *master = [[[NSUserDefaults standardUserDefaults] objectForKey:@"masterDic"]objectForKey:@"ma_user"];
     NSString *sessionUser = [[NSUserDefaults standardUserDefaults] objectForKey:@"erpaccount"];
     
@@ -149,7 +149,7 @@ static NSString *cellID = @"cellID";
     if (_SelectedArr.count == 1)
     {
         NSString *sessionId=[[NSUserDefaults standardUserDefaults] stringForKey:@"sessionId"];
-        NSString *ip=[[NSUserDefaults standardUserDefaults] objectForKey:@"ipAndPort"];
+        NSString *ip=[UASUserInfo shareManager].urlIp;
         NSString *master = [[[NSUserDefaults standardUserDefaults] objectForKey:@"masterDic"]objectForKey:@"ma_user"];
         NSString *sessionUser = [[NSUserDefaults standardUserDefaults] objectForKey:@"erpaccount"];
         

shiku_im/shiku_im/controller/ShareSelectVC.m

@@ -311,7 +311,7 @@
 }
 -(void)getContractPeopleFromServer{
     NSString *sessionId=[[NSUserDefaults standardUserDefaults] stringForKey:@"sessionId"];
-    NSString *ip=[[NSUserDefaults standardUserDefaults] objectForKey:@"ipAndPort"];
+    NSString *ip=[UASUserInfo shareManager].urlIp;
     NSString *master = [[[NSUserDefaults standardUserDefaults] objectForKey:@"masterDic"]objectForKey:@"ma_user"];
     NSString *sessionUser = [[NSUserDefaults standardUserDefaults] objectForKey:@"erpaccount"];
     
@@ -408,7 +408,7 @@
 -(void)getGuanLianShangji //获取关联商机数据
 {
     NSString *sessionId=[[NSUserDefaults standardUserDefaults] stringForKey:@"sessionId"];
-    NSString *ip=[[NSUserDefaults standardUserDefaults] objectForKey:@"ipAndPort"];
+    NSString *ip=[UASUserInfo shareManager].urlIp;
     NSString *master = [[[NSUserDefaults standardUserDefaults] objectForKey:@"masterDic"]objectForKey:@"ma_user"];
     NSString *sessionUser = [[NSUserDefaults standardUserDefaults] objectForKey:@"erpaccount"];
     
@@ -460,7 +460,7 @@
 -(void)getClientDataFromServer //获取客户数据
 {
     NSString *sessionId=[[NSUserDefaults standardUserDefaults] stringForKey:@"sessionId"];
-    NSString *ip=[[NSUserDefaults standardUserDefaults] objectForKey:@"ipAndPort"];
+    NSString *ip=[UASUserInfo shareManager].urlIp;
     NSString *sellercode = [[NSUserDefaults standardUserDefaults] stringForKey:@"erpaccount"];
     NSString *master = [[[NSUserDefaults standardUserDefaults] objectForKey:@"masterDic"]objectForKey:@"ma_user"];
     NSString *sessionUser = [[NSUserDefaults standardUserDefaults] objectForKey:@"erpaccount"];
@@ -508,7 +508,7 @@
 -(void)getShangjiState //获取商机阶段数据
 {
     NSString *sessionId=[[NSUserDefaults standardUserDefaults] stringForKey:@"sessionId"];
-    NSString *ip=[[NSUserDefaults standardUserDefaults] objectForKey:@"ipAndPort"];
+    NSString *ip=[UASUserInfo shareManager].urlIp;
     NSString *master = [[[NSUserDefaults standardUserDefaults] objectForKey:@"masterDic"]objectForKey:@"ma_user"];
     NSString *sessionUser = [[NSUserDefaults standardUserDefaults] objectForKey:@"erpaccount"];
     

shiku_im/shiku_im/controller/UASBaseVC.m

@@ -83,7 +83,7 @@
         
         [self.navigationController popViewControllerAnimated:YES];
         [SVProgressHUD dismiss];
-        [MBProgressHUD hideHUD];
+        
         
     }else{
         

shiku_im/shiku_im/controller/UASMainVC.m

@@ -724,18 +724,18 @@
 
 -(void)checkReactNativeShouldUpdate{
     
-    NSError *packErr = nil;
-    
-    NSDictionary *packageInfo = [CodePushPackage  getCurrentPackage:&packErr];
-    
-    NSDictionary *prePackage = [CodePushPackage getPreviousPackage:nil];
-    
-    NSString *filePath = [CodePushPackage getCurrentPackageHash:nil];
-    
-    
-    CodePushConfig *config = [CodePushConfig current];
-    
-    [CodePushPackage installPackage:packageInfo removePendingUpdate:YES error:nil];
+//    NSError *packErr = nil;
+//    
+//    NSDictionary *packageInfo = [CodePushPackage  getCurrentPackage:&packErr];
+//    
+//    NSDictionary *prePackage = [CodePushPackage getPreviousPackage:nil];
+//    
+//    NSString *filePath = [CodePushPackage getCurrentPackageHash:nil];
+//    
+//    
+//    CodePushConfig *config = [CodePushConfig current];
+//    
+//    [CodePushPackage installPackage:packageInfo removePendingUpdate:YES error:nil];
     
 //    [CodePushPackage downloadPackage:packageInfo expectedBundleFileName:nil publicKey:nil operationQueue:dispatch_get_global_queue(0, 0) progressCallback:^(long long curr, long long total) {
 //        

shiku_im/shiku_im/controller/UASUuFriendsManager.m

@@ -86,7 +86,7 @@ static UASUuFriendsManager *manager = nil;
         manager1.completionQueue = dispatch_get_global_queue(0,0);
         NSUserDefaults * userDefault=[NSUserDefaults standardUserDefaults];
         
-        NSString *ip=[userDefault objectForKey:@"ipAndPort"];
+        NSString *ip=[UASUserInfo shareManager].urlIp;
         
         NSString *sessionId=[userDefault objectForKey:@"sessionId"];
         

shiku_im/shiku_im/controller/UpdateDocumentVC.m

@@ -168,7 +168,7 @@ static NSString *cellID = @"cellID";
 }
 -(void)deleteDataToServer //删除单据
 {
-    NSString *ip = [[NSUserDefaults standardUserDefaults] objectForKey:@"ipAndPort"];
+    NSString *ip = [UASUserInfo shareManager].urlIp;
     NSString *sessionId = [[NSUserDefaults standardUserDefaults] stringForKey:@"sessionId"];
     
     NSString *url = [NSString stringWithFormat:@"%@mobile/commondelete.action?caller=%@&id=%@&sessionId=%@",ip,_caller,_listid,sessionId];
@@ -246,7 +246,7 @@ static NSString *cellID = @"cellID";
 -(void)getDataFromSeverWithCaller:(NSString *)caller
 {
     [MBProgressHUD showMessage:@"" toView:self.view];
-    NSString *ip = [[NSUserDefaults standardUserDefaults] objectForKey:@"ipAndPort"];
+    NSString *ip = [UASUserInfo shareManager].urlIp;
     NSString *sessionId = [[NSUserDefaults standardUserDefaults] stringForKey:@"sessionId"];
     
     NSString *url = [NSString stringWithFormat:@"%@mobile/getformandgriddetail.action?caller=%@&condition=1=1&sessionId=%@&id=%@",ip,_caller,sessionId,_listid];
@@ -1410,7 +1410,7 @@ static NSString *cellID = @"cellID";
     //mobile/oa/saveAndSubmitAskLeave.action?caller=Ask4Leave&formStore={"va_startime":"2016-11-16%2014:10:00","va_endtime":"2016-11-16%2016:00:00"} 请假单
     
     NSString *sessionId=[[NSUserDefaults standardUserDefaults] stringForKey:@"sessionId"];
-    NSString *ip=[[NSUserDefaults standardUserDefaults] objectForKey:@"ipAndPort"];
+    NSString *ip=[UASUserInfo shareManager].urlIp;
     
     NSDictionary *dic = [NSDictionary dictionaryWithObjectsAndKeys:_caller,@"caller",
                          formStr,@"formStore",
@@ -1478,7 +1478,7 @@ static NSString *cellID = @"cellID";
     
     NSString *sessionId=[userDefault stringForKey:@"sessionId"];
     
-    NSString * ips=[userDefault objectForKey:@"ipAndPort"];
+    NSString * ips=[UASUserInfo shareManager].urlIp;
     
     NSString * userID=[[NSUserDefaults standardUserDefaults] objectForKey:@"erpaccount"];
     NSString *master=[[[NSUserDefaults standardUserDefaults] objectForKey:@"masterDic"]objectForKey:@"ma_user"];
@@ -1675,7 +1675,7 @@ static NSString *cellID = @"cellID";
 -(void)deleteDetailDataToSeverWithId:(NSString *)deatilID andKey:(NSString *)key
 {
     NSString *sessionId=[[NSUserDefaults standardUserDefaults] stringForKey:@"sessionId"];
-    NSString *ip=[[NSUserDefaults standardUserDefaults] objectForKey:@"ipAndPort"];
+    NSString *ip=[UASUserInfo shareManager].urlIp;
     
     
     NSString *url = [NSString stringWithFormat:@"%@common/deleteDetail.action?caller=%@&gridcaller=%@&condition=%@=%@&master=%@&sessionUser=%@&sessionId=%@",ip,_caller,_caller,key,deatilID,g_master,g_sessionUser,sessionId];

shiku_im/shiku_im/controller/VisitClientViewController.m

@@ -933,7 +933,7 @@ static NSString *cellID = @"cellID";
     _weiwancheng = 0;
     
     NSString *sessionId=[[NSUserDefaults standardUserDefaults] stringForKey:@"sessionId"];
-    NSString *ip=[[NSUserDefaults standardUserDefaults] objectForKey:@"ipAndPort"];
+    NSString *ip=[UASUserInfo shareManager].urlIp;
     NSString *master = [[[NSUserDefaults standardUserDefaults] objectForKey:@"masterDic"]objectForKey:@"ma_user"];
     NSString *sessionUser = [[NSUserDefaults standardUserDefaults] objectForKey:@"erpaccount"];
     

shiku_im/shiku_im/controller/VisitDestinationVC.m

@@ -346,7 +346,7 @@ updatingLocation:(BOOL)updatingLocation
 //请求数据
 -(void)getDataFromSever{
     NSString *sessionId = [[NSUserDefaults standardUserDefaults] stringForKey:@"sessionId"];
-    NSString *ip = [[NSUserDefaults standardUserDefaults] objectForKey:@"ipAndPort"];
+    NSString *ip = [UASUserInfo shareManager].urlIp;
     NSString *sellercode = [[NSUserDefaults standardUserDefaults] stringForKey:@"erpaccount"];
     NSString *master = [[[NSUserDefaults standardUserDefaults] objectForKey:@"masterDic"]objectForKey:@"ma_user"];
     NSString *sessionUser = [[NSUserDefaults standardUserDefaults] objectForKey:@"erpaccount"];

shiku_im/shiku_im/controller/VisitPlanVC.m

@@ -130,7 +130,7 @@
 -(void)getCode //获取单据编号
 {
     NSString *sessionId=[[NSUserDefaults standardUserDefaults] stringForKey:@"sessionId"];
-    NSString *ip=[[NSUserDefaults standardUserDefaults] objectForKey:@"ipAndPort"];
+    NSString *ip=[UASUserInfo shareManager].urlIp;
     NSString *master = [[[NSUserDefaults standardUserDefaults] objectForKey:@"masterDic"]objectForKey:@"ma_user"];
     NSString *sessionUser = [[NSUserDefaults standardUserDefaults] objectForKey:@"erpaccount"];
     
@@ -159,7 +159,7 @@
 -(void)getId
 {
     NSString *sessionId=[[NSUserDefaults standardUserDefaults] stringForKey:@"sessionId"];
-    NSString *ip=[[NSUserDefaults standardUserDefaults] objectForKey:@"ipAndPort"];
+    NSString *ip=[UASUserInfo shareManager].urlIp;
     NSString *master = [[[NSUserDefaults standardUserDefaults] objectForKey:@"masterDic"]objectForKey:@"ma_user"];
     NSString *sessionUser = [[NSUserDefaults standardUserDefaults] objectForKey:@"erpaccount"];
     
@@ -482,7 +482,7 @@
     [_indicationV startAnimating];
     
     NSString *sessionId=[[NSUserDefaults standardUserDefaults] stringForKey:@"sessionId"];
-    NSString *ip=[[NSUserDefaults standardUserDefaults] objectForKey:@"ipAndPort"];
+    NSString *ip=[UASUserInfo shareManager].urlIp;
     NSString *master = [[[NSUserDefaults standardUserDefaults] objectForKey:@"masterDic"]objectForKey:@"ma_user"];
     NSString *sessionUser = [[NSUserDefaults standardUserDefaults] objectForKey:@"erpaccount"];
     

shiku_im/shiku_im/controller/Web/WYWebController.m

@@ -44,7 +44,7 @@
    
     
     NSString *userName = [[NSUserDefaults standardUserDefaults] stringForKey:@"erpaccount"];
-    NSString *ip = [[NSUserDefaults standardUserDefaults] objectForKey:@"ipAndPort"] ;
+    NSString *ip = [UASUserInfo shareManager].urlIp ;
     NSString *sessionId = [[NSUserDefaults standardUserDefaults] objectForKey:@"sessionId"];
     NSString *secondUrl;
     if ([_typeCode isEqualToString:@"process"] || [_typeCode isEqualToString:@"transferprocess"]) {

shiku_im/shiku_im/controller/WorkmatesVC.m

@@ -97,7 +97,7 @@ static NSString *cellID = @"cellID";
 -(void)getPeopleDataFromServer
 {
     NSString *sessionId=[[NSUserDefaults standardUserDefaults] stringForKey:@"sessionId"];
-    NSString *ip=[[NSUserDefaults standardUserDefaults] objectForKey:@"ipAndPort"];
+    NSString *ip=[UASUserInfo shareManager].urlIp;
     NSString *master = [[[NSUserDefaults standardUserDefaults] objectForKey:@"masterDic"]objectForKey:@"ma_user"];
     NSString *sessionUser = [[NSUserDefaults standardUserDefaults] objectForKey:@"erpaccount"];
 
@@ -200,7 +200,7 @@ static NSString *cellID = @"cellID";
     if (_SelectedArr.count == 1)
     {
     NSString *sessionId=[[NSUserDefaults standardUserDefaults] stringForKey:@"sessionId"];
-    NSString *ip=[[NSUserDefaults standardUserDefaults] objectForKey:@"ipAndPort"];
+    NSString *ip=[UASUserInfo shareManager].urlIp;
         NSString *master = [[[NSUserDefaults standardUserDefaults] objectForKey:@"masterDic"]objectForKey:@"ma_user"];
         NSString *sessionUser = [[NSUserDefaults standardUserDefaults] objectForKey:@"erpaccount"];
     
@@ -268,7 +268,7 @@ static NSString *cellID = @"cellID";
     UASNetworkManager *manager = [UASNetworkManager shareManager];
 //    manager.responseSerializer = [AFHTTPResponseSerializer serializer];
     
-    NSString *ip = [[NSUserDefaults standardUserDefaults] objectForKey:@"ipAndPort"];
+    NSString *ip = [UASUserInfo shareManager].urlIp;
     NSString *sessionId = [[NSUserDefaults standardUserDefaults] objectForKey:@"sessionId"];
     NSString *master = [[[NSUserDefaults standardUserDefaults] objectForKey:@"masterDic"]objectForKey:@"ma_user"];
     NSString *sessionUser = [[NSUserDefaults standardUserDefaults] objectForKey:@"erpaccount"];

shiku_im/shiku_im/controller/XiaShuMoreVC.m

@@ -83,7 +83,7 @@ static NSString *cellID = @"cellID";
     /*接口：mobile/crm/getTargets.action
      参数：String emcode,String yearmonth,int page,int pageSize*/
     NSString *sessionId=[[NSUserDefaults standardUserDefaults] stringForKey:@"sessionId"];
-    NSString *ip=[[NSUserDefaults standardUserDefaults] objectForKey:@"ipAndPort"];
+    NSString *ip=[UASUserInfo shareManager].urlIp;
     NSString *emcode=[[NSUserDefaults standardUserDefaults] stringForKey:@"erpaccount"];
     NSString *master = [[[NSUserDefaults standardUserDefaults] objectForKey:@"masterDic"]objectForKey:@"ma_user"];
     NSString *sessionUser = [[NSUserDefaults standardUserDefaults] objectForKey:@"erpaccount"];

shiku_im/shiku_im/controller/YPSelectShenPiPersonVC.m

@@ -313,7 +313,7 @@
      
      NSString *sessionId=[userDefault stringForKey:@"sessionId"];
      
-     NSString * ips=[userDefault objectForKey:@"ipAndPort"];
+     NSString * ips=[UASUserInfo shareManager].urlIp;
      
      NSString * userID=[[NSUserDefaults standardUserDefaults] objectForKey:@"erpaccount"];
      NSString *master=[[[NSUserDefaults standardUserDefaults] objectForKey:@"masterDic"]objectForKey:@"ma_user"];

shiku_im/shiku_im/controller/ZXVisitReportViewController.m

@@ -85,7 +85,7 @@ static NSString *ID = @"status11";
 -(void)getCode //获取单据编号
 {
     NSString *sessionId=[[NSUserDefaults standardUserDefaults] stringForKey:@"sessionId"];
-    NSString *ip=[[NSUserDefaults standardUserDefaults] objectForKey:@"ipAndPort"];
+    NSString *ip=[UASUserInfo shareManager].urlIp;
     NSString *master = [[[NSUserDefaults standardUserDefaults] objectForKey:@"masterDic"]objectForKey:@"ma_user"];
     NSString *sessionUser = [[NSUserDefaults standardUserDefaults] objectForKey:@"erpaccount"];
     
@@ -119,7 +119,7 @@ static NSString *ID = @"status11";
 -(void)getId
 {
     NSString *sessionId=[[NSUserDefaults standardUserDefaults] stringForKey:@"sessionId"];
-    NSString *ip=[[NSUserDefaults standardUserDefaults] objectForKey:@"ipAndPort"];
+    NSString *ip=[UASUserInfo shareManager].urlIp;
     NSString *master = [[[NSUserDefaults standardUserDefaults] objectForKey:@"masterDic"]objectForKey:@"ma_user"];
     NSString *sessionUser = [[NSUserDefaults standardUserDefaults] objectForKey:@"erpaccount"];
     
@@ -191,7 +191,7 @@ static NSString *ID = @"status11";
     [_HUD show:YES];
     _uploadBtn.userInteractionEnabled = NO;
     NSString *sessionId=[[NSUserDefaults standardUserDefaults] stringForKey:@"sessionId"];
-    NSString *ip=[[NSUserDefaults standardUserDefaults] objectForKey:@"ipAndPort"];
+    NSString *ip=[UASUserInfo shareManager].urlIp;
     
     NSDate *senddate = [NSDate date];
     NSDateFormatter* f=[[NSDateFormatter alloc]init];
@@ -332,7 +332,7 @@ static NSString *ID = @"status11";
 -(void)updateVisitPlanStatus{
     
     NSString *sessionId=[[NSUserDefaults standardUserDefaults] stringForKey:@"sessionId"];
-    NSString *ip=[[NSUserDefaults standardUserDefaults] objectForKey:@"ipAndPort"];
+    NSString *ip=[UASUserInfo shareManager].urlIp;
     NSString *url = [NSString stringWithFormat:@"%@mobile/crm/updateVistPlan.action",ip];
 //    {master=UAS_TEST, vr_id=46727, cu_nichestep=, vp_id=12485, sessionUser=U0736, bc_nichecode=, cu_code=null, sessionId=768986E1877658D329A27C1F8F792BA2}
     NSDictionary *params = [@{
@@ -448,7 +448,7 @@ static NSString *ID = @"status11";
     UASNetworkManager *manager = [UASNetworkManager shareManager];
     manager.responseSerializer = [AFJSONResponseSerializer serializer];
     
-    NSString *ip = [[NSUserDefaults standardUserDefaults] objectForKey:@"ipAndPort"];
+    NSString *ip = [UASUserInfo shareManager].urlIp;
     NSString *sessionId = [[NSUserDefaults standardUserDefaults] objectForKey:@"sessionId"];
     NSString *master = [[[NSUserDefaults standardUserDefaults] objectForKey:@"masterDic"]objectForKey:@"ma_user"];
     NSString *sessionUser = [[NSUserDefaults standardUserDefaults] objectForKey:@"erpaccount"];
@@ -473,7 +473,7 @@ static NSString *ID = @"status11";
 -(void)getVisitTypeFromSever{
 
     NSString *sessionId=[[NSUserDefaults standardUserDefaults] stringForKey:@"sessionId"];
-    NSString *ip=[[NSUserDefaults standardUserDefaults] objectForKey:@"ipAndPort"];
+    NSString *ip=[UASUserInfo shareManager].urlIp;
 //    _custcode _detailArray[0][1]
     NSString *url = [NSString stringWithFormat:@"%@mobile/crm/getVisitType.action?custcode=%@&custname=%@&sessionId=%@&master=%@&sessionUser=%@",ip,_custcode,_detailArray[0][1],sessionId,g_master,g_sessionUser];
     DLog(@"获取拜访类型的URL是:%@",url);
@@ -587,7 +587,7 @@ static NSString *ID = @"status11";
     
     
     NSString *sessionId=[[NSUserDefaults standardUserDefaults] stringForKey:@"sessionId"];
-    NSString *ip=[[NSUserDefaults standardUserDefaults] objectForKey:@"ipAndPort"];
+    NSString *ip=[UASUserInfo shareManager].urlIp;
     NSString *master = [[[NSUserDefaults standardUserDefaults] objectForKey:@"masterDic"]objectForKey:@"ma_user"];
     NSString *sessionUser = [[NSUserDefaults standardUserDefaults] objectForKey:@"erpaccount"];
     

shiku_im/shiku_im/controller/ZeTianSignDetailVC.m

@@ -139,7 +139,7 @@
     [_formdata removeAllObjects];
     [_formconfigs removeAllObjects];
     
-    NSString *ip = [[NSUserDefaults standardUserDefaults] objectForKey:@"ipAndPort"];
+    NSString *ip = [UASUserInfo shareManager].urlIp;
     NSString *sessionId = [[NSUserDefaults standardUserDefaults] stringForKey:@"sessionId"];
     
     NSString *url = [NSString stringWithFormat:@"%@mobile/common/getformandgriddata.action?caller=%@&id=%@&sessionId=%@",ip,_caller,_dan_id,sessionId];

shiku_im/shiku_im/controller/myOA/ALLURLHeader.h

@@ -11,9 +11,14 @@
 
 
 /*ip地址*/
+<<<<<<< HEAD
 #define g_id  [[NSUserDefaults standardUserDefaults] objectForKey:@"ipAndPort"]
 //#define g_id @"http://117.25.180.218:8090/zz_test/"
 //#define g_id @"http://10.1.80.180:8080/uas/"
+=======
+#define g_id  [UASUserInfo shareManager].urlIp
+
+>>>>>>> 7b36e507e52248c27163decd95f59cd59cf25cea
 /*新账户中心token*/
 #define g_accountToken [[NSUserDefaults standardUserDefaults] objectForKey:@"accountToken"]
 /*sessionId*/
@@ -38,7 +43,7 @@
 
 /*********** 特殊：贝腾公司（创建商机要用）***************/
 #define g_BeiTengCompany [[[[NSUserDefaults standardUserDefaults] objectForKey:@"erpTempNameAndIpDic"]objectForKey:@"name"] containsString:@"贝腾"]
-//[[[NSUserDefaults standardUserDefaults] objectForKey:@"ipAndPort"] isEqualToString:@"http://202.104.151.184:8099/ERP/"]
+//[[UASUserInfo shareManager].urlIp isEqualToString:@"http://202.104.151.184:8099/ERP/"]
 
 static NSString * const ubtob = @"http://192.168.253.58:8080/ERP/";
 //验证码Url

shiku_im/shiku_im/controller/myOA/AlldocumentsViewController.m

@@ -350,7 +350,7 @@ static NSString *cellID = @"cellID";
     [HUD show:YES];
     
     NSString *sessionId = [[NSUserDefaults standardUserDefaults] stringForKey:@"sessionId"];
-    NSString *ip = [[NSUserDefaults standardUserDefaults] objectForKey:@"ipAndPort"];
+    NSString *ip = [UASUserInfo shareManager].urlIp;
     
     [self.view endEditing:YES];
     

shiku_im/shiku_im/controller/myOA/ERPNewTaskViewController.m

@@ -119,7 +119,7 @@ static NSString *ID = @"status11";
     //    mobile/mobiletask/saveTask?formStore=
     DLog(@"点击了发送");
     NSString *sessionId=[[NSUserDefaults standardUserDefaults] stringForKey:@"sessionId"];
-    NSString *ip=[[NSUserDefaults standardUserDefaults] objectForKey:@"ipAndPort"];
+    NSString *ip=[UASUserInfo shareManager].urlIp;
     NSString * aStr,*bStr,*cStr;
     for (UITableViewCell * cell in _tableView.visibleCells) {
         if (cell.detailTextLabel.tag == 1) {

shiku_im/shiku_im/controller/myOA/JOComposeViewController.m

@@ -968,7 +968,7 @@
 				
 				NSString *sessionId=[userDefault stringForKey:@"sessionId"];
 				
-				NSString * ips=[userDefault objectForKey:@"ipAndPort"];
+				NSString * ips=[UASUserInfo shareManager].urlIp;
 				
 				NSString * userID=[[NSUserDefaults standardUserDefaults] objectForKey:@"erpaccount"];
 				NSString *master=[[[NSUserDefaults standardUserDefaults] objectForKey:@"masterDic"]objectForKey:@"ma_user"];

shiku_im/shiku_im/controller/myOA/JOGETAddressTableViewController.m

@@ -104,7 +104,7 @@
     
     NSString *sessionId=[userDefault stringForKey:@"sessionId"];
     
-    NSString * ips=[userDefault objectForKey:@"ipAndPort"];
+    NSString * ips=[UASUserInfo shareManager].urlIp;
     
     NSString * userID=[userDefault objectForKey:@"erpaccount"];
     //3.拼接sessionID

shiku_im/shiku_im/controller/myOA/JOGETLabelTableViewController.m

@@ -108,7 +108,7 @@
     
     NSString *sessionId=[userDefault stringForKey:@"sessionId"];
     
-    NSString * ips=[userDefault objectForKey:@"ipAndPort"];
+    NSString * ips=[UASUserInfo shareManager].urlIp;
     
     NSString * userID=[userDefault objectForKey:@"erpaccount"];
     //3.拼接sessionID

shiku_im/shiku_im/controller/myOA/JOGetShenPiManVC.m

@@ -173,7 +173,7 @@ parms：{master=UAS, sessionUser=U0736, _noc=1, sessionId=AA69EFEAE77AB759248A21
     
     NSString *sessionId=[userDefault stringForKey:@"sessionId"];
     
-    NSString * ips=[userDefault objectForKey:@"ipAndPort"];
+    NSString * ips=[UASUserInfo shareManager].urlIp;
     
     NSString * userID=[[NSUserDefaults standardUserDefaults] objectForKey:@"erpaccount"];
     NSString *master=[[[NSUserDefaults standardUserDefaults] objectForKey:@"masterDic"]objectForKey:@"ma_user"];
@@ -269,7 +269,7 @@ parms：{master=UAS, sessionUser=U0736, _noc=1, sessionId=AA69EFEAE77AB759248A21
     
     NSString *sessionId=[userDefault stringForKey:@"sessionId"];
     
-    NSString * ips=[userDefault objectForKey:@"ipAndPort"];
+    NSString * ips=[UASUserInfo shareManager].urlIp;
     
     NSString * userID=[[NSUserDefaults standardUserDefaults] objectForKey:@"erpaccount"];
     NSString *master=[[[NSUserDefaults standardUserDefaults] objectForKey:@"masterDic"]objectForKey:@"ma_user"];

shiku_im/shiku_im/controller/myOA/JOHYJYViewController.m

@@ -241,7 +241,7 @@
     
     NSString *sessionId=[userDefault stringForKey:@"sessionId"];
     
-    NSString * ips=[userDefault objectForKey:@"ipAndPort"];
+    NSString * ips=[UASUserInfo shareManager].urlIp;
     
     NSString * userID=[[NSUserDefaults standardUserDefaults] objectForKey:@"erpaccount"];
     NSString *master=[[[NSUserDefaults standardUserDefaults] objectForKey:@"masterDic"]objectForKey:@"ma_user"];
@@ -287,7 +287,7 @@
     
     NSString *sessionId=[userDefault stringForKey:@"sessionId"];
     
-    NSString * ips=[userDefault objectForKey:@"ipAndPort"];
+    NSString * ips=[UASUserInfo shareManager].urlIp;
     
     NSString * userID=[[NSUserDefaults standardUserDefaults] objectForKey:@"erpaccount"];
     NSString *master=[[[NSUserDefaults standardUserDefaults] objectForKey:@"masterDic"]objectForKey:@"ma_user"];
@@ -334,7 +334,7 @@
     
     NSString *sessionId=[userDefault stringForKey:@"sessionId"];
     
-    NSString * ips=[userDefault objectForKey:@"ipAndPort"];
+    NSString * ips=[UASUserInfo shareManager].urlIp;
     
     NSString * userID=[[NSUserDefaults standardUserDefaults] objectForKey:@"erpaccount"];
     NSString *master=[[[NSUserDefaults standardUserDefaults] objectForKey:@"masterDic"]objectForKey:@"ma_user"];
@@ -516,7 +516,7 @@
     
     NSString *sessionId=[userDefault stringForKey:@"sessionId"];
     
-    NSString * ips=[userDefault objectForKey:@"ipAndPort"];
+    NSString * ips=[UASUserInfo shareManager].urlIp;
     
     NSString * userID=[[NSUserDefaults standardUserDefaults] objectForKey:@"erpaccount"];
     NSString *master=[[[NSUserDefaults standardUserDefaults] objectForKey:@"masterDic"]objectForKey:@"ma_user"];
@@ -566,7 +566,7 @@
     
     NSString *sessionId=[userDefault stringForKey:@"sessionId"];
     
-    NSString * ips=[userDefault objectForKey:@"ipAndPort"];
+    NSString * ips=[UASUserInfo shareManager].urlIp;
     
     NSString * userID=[[NSUserDefaults standardUserDefaults] objectForKey:@"erpaccount"];
     NSString *master=[[[NSUserDefaults standardUserDefaults] objectForKey:@"masterDic"]objectForKey:@"ma_user"];

shiku_im/shiku_im/controller/myOA/JOHYQDXQViewController.m

@@ -131,7 +131,7 @@
     
     NSString *sessionId=[userDefault stringForKey:@"sessionId"];
     
-    NSString * ips=[userDefault objectForKey:@"ipAndPort"];
+    NSString * ips=[UASUserInfo shareManager].urlIp;
     
     
     

shiku_im/shiku_im/controller/myOA/JOHYRWLBViewController.m

@@ -228,7 +228,7 @@
     
     NSString *sessionId=[userDefault stringForKey:@"sessionId"];
     
-    NSString * ips=[userDefault objectForKey:@"ipAndPort"];
+    NSString * ips=[UASUserInfo shareManager].urlIp;
     
     
     

shiku_im/shiku_im/controller/myOA/JOHYTableViewController.m

@@ -214,7 +214,7 @@
     
     NSString *sessionId=[userDefault stringForKey:@"sessionId"];
     
-    NSString * ips=[userDefault objectForKey:@"ipAndPort"];
+    NSString * ips=[UASUserInfo shareManager].urlIp;
     
     NSString * userID=[userDefault objectForKey:@"erpaccount"];
     

shiku_im/shiku_im/controller/myOA/JOHYXQTableViewController.m

@@ -459,7 +459,7 @@
     
     NSString *sessionId=[userDefault stringForKey:@"sessionId"];
     
-    NSString * ips=[userDefault objectForKey:@"ipAndPort"];
+    NSString * ips=[UASUserInfo shareManager].urlIp;
     
    
     
@@ -538,7 +538,7 @@
     
     NSString *sessionId=[userDefault stringForKey:@"sessionId"];
     
-    NSString * ips=[userDefault objectForKey:@"ipAndPort"];
+    NSString * ips=[UASUserInfo shareManager].urlIp;
     
    
     
@@ -690,7 +690,7 @@
     
     NSString *sessionId=[userDefault stringForKey:@"sessionId"];
     
-    NSString * ips=[userDefault objectForKey:@"ipAndPort"];
+    NSString * ips=[UASUserInfo shareManager].urlIp;
     
     
     
@@ -802,7 +802,7 @@
             
             NSString *sessionId=[userDefault stringForKey:@"sessionId"];
             
-            NSString * ips=[userDefault objectForKey:@"ipAndPort"];
+            NSString * ips=[UASUserInfo shareManager].urlIp;
             
             
             
@@ -897,7 +897,7 @@
         
         NSString *sessionId=[userDefault stringForKey:@"sessionId"];
         
-        NSString * ips=[userDefault objectForKey:@"ipAndPort"];
+        NSString * ips=[UASUserInfo shareManager].urlIp;
         
        
         

shiku_im/shiku_im/controller/myOA/JOHttpTool.m

@@ -11,7 +11,7 @@
 /*
  #define g_master [[[NSUserDefaults standardUserDefaults] objectForKey:@"masterDic"]objectForKey:@"ma_user"]
  #define g_sessionUser [[NSUserDefaults standardUserDefaults] objectForKey:@"erpaccount"]
- #define g_id = [[NSUserDefaults standardUserDefaults] objectForKey:@"ipAndPort"]
+ #define g_id = [UASUserInfo shareManager].urlIp
  #define g_sessionId [[NSUserDefaults standardUserDefaults] stringForKey:@"sessionId"]
  
  */

shiku_im/shiku_im/controller/myOA/JOMyselfVC.m

@@ -37,7 +37,7 @@
     
     NSUserDefaults *userDefault=[NSUserDefaults standardUserDefaults];
     NSString *sessionId=[userDefault stringForKey:@"sessionId"];
-    NSString * ips=[userDefault objectForKey:@"ipAndPort"];
+    NSString * ips=[UASUserInfo shareManager].urlIp;
     NSString * userNum=[userDefault objectForKey:kMY_USER_LoginName];
     NSString * userName = [[NSUserDefaults standardUserDefaults] stringForKey:@"personName"];
     NSString * userID=[[NSUserDefaults standardUserDefaults] objectForKey:@"erpaccount"];

shiku_im/shiku_im/controller/myOA/JONewMeetingTableViewController.m

@@ -522,7 +522,7 @@
                 
                 NSString *sessionId=[userDefault stringForKey:@"sessionId"];
                 
-                NSString * ips=[userDefault objectForKey:@"ipAndPort"];
+                NSString * ips=[UASUserInfo shareManager].urlIp;
                 
                 NSString * userID=[[NSUserDefaults standardUserDefaults] objectForKey:@"erpaccount"];
                 NSString *master=[[[NSUserDefaults standardUserDefaults] objectForKey:@"masterDic"]objectForKey:@"ma_user"];
@@ -593,7 +593,7 @@
     
     NSString *sessionId=[userDefault stringForKey:@"sessionId"];
     
-    NSString * ips=[userDefault objectForKey:@"ipAndPort"];
+    NSString * ips=[UASUserInfo shareManager].urlIp;
     
     NSString * userID=[[NSUserDefaults standardUserDefaults] objectForKey:@"erpaccount"];
     NSString *master=[[[NSUserDefaults standardUserDefaults] objectForKey:@"masterDic"]objectForKey:@"ma_user"];
@@ -637,7 +637,7 @@
 - (void)confirmAction:(NSString *)code
 {
     NSString *sessionId=[[NSUserDefaults standardUserDefaults] stringForKey:@"sessionId"];
-    NSString *ip=[[NSUserDefaults standardUserDefaults] objectForKey:@"ipAndPort"];
+    NSString *ip=[UASUserInfo shareManager].urlIp;
     NSString * userID=[[NSUserDefaults standardUserDefaults] objectForKey:@"erpaccount"];
     NSString *master=[[[NSUserDefaults standardUserDefaults] objectForKey:@"masterDic"]objectForKey:@"ma_user"];
     
@@ -692,7 +692,7 @@
 - (void)sethuiyiMrCode
 {
     NSString *sessionId=[[NSUserDefaults standardUserDefaults] stringForKey:@"sessionId"];
-    NSString *ip=[[NSUserDefaults standardUserDefaults] objectForKey:@"ipAndPort"];
+    NSString *ip=[UASUserInfo shareManager].urlIp;
     NSString *emcode = [[NSUserDefaults standardUserDefaults] objectForKey:@"erpaccount"];
     
     int pageSize = 30;
@@ -753,7 +753,7 @@
     
     NSString *sessionId=[userDefault stringForKey:@"sessionId"];
     
-    NSString * ips=[userDefault objectForKey:@"ipAndPort"];
+    NSString * ips=[UASUserInfo shareManager].urlIp;
    
     
     
@@ -1223,7 +1223,7 @@
     
     NSString *sessionId=[userDefault stringForKey:@"sessionId"];
     
-    NSString * ips=[userDefault objectForKey:@"ipAndPort"];
+    NSString * ips=[UASUserInfo shareManager].urlIp;
     
     NSString * userID=[[NSUserDefaults standardUserDefaults] objectForKey:@"erpaccount"];
     NSString *master=[[[NSUserDefaults standardUserDefaults] objectForKey:@"masterDic"]objectForKey:@"ma_user"];

shiku_im/shiku_im/controller/myOA/JOOAEmergencyViewController.m

@@ -140,7 +140,7 @@
 -(void)getShangjiState //获取商机阶段数据
 {
     NSString *sessionId=[[NSUserDefaults standardUserDefaults] stringForKey:@"sessionId"];
-    NSString *ip=[[NSUserDefaults standardUserDefaults] objectForKey:@"ipAndPort"];
+    NSString *ip=[UASUserInfo shareManager].urlIp;
     NSString *master = [[[NSUserDefaults standardUserDefaults] objectForKey:@"masterDic"]objectForKey:@"ma_user"];
     NSString *sessionUser = [[NSUserDefaults standardUserDefaults] objectForKey:@"erpaccount"];
     

shiku_im/shiku_im/controller/myOA/JOOASetUpViewController.m

@@ -498,7 +498,7 @@
 
     
     NSString *sessionId=[[NSUserDefaults standardUserDefaults] stringForKey:@"sessionId"];
-    NSString *ip=[[NSUserDefaults standardUserDefaults] objectForKey:@"ipAndPort"];
+    NSString *ip=[UASUserInfo shareManager].urlIp;
     NSString * userID=[[NSUserDefaults standardUserDefaults] objectForKey:@"erpaccount"];
     NSString *master=[[[NSUserDefaults standardUserDefaults] objectForKey:@"masterDic"]objectForKey:@"ma_user"];
 
@@ -551,7 +551,7 @@
 -(void)postRENWUToServerWith:(NSString *)code
 {
     NSString *sessionId=[[NSUserDefaults standardUserDefaults] stringForKey:@"sessionId"];
-    NSString *ip=[[NSUserDefaults standardUserDefaults] objectForKey:@"ipAndPort"];
+    NSString *ip=[UASUserInfo shareManager].urlIp;
     
     NSDictionary *params;
     NSString * types;

shiku_im/shiku_im/controller/myOA/JOOAViewController.m

@@ -638,7 +638,7 @@
     /*
      请求参数配置
      */
-    NSString *ip=[[NSUserDefaults standardUserDefaults] objectForKey:@"ipAndPort"];
+    NSString *ip=[UASUserInfo shareManager].urlIp;
     NSString *sessionId=[[NSUserDefaults standardUserDefaults] stringForKey:@"sessionId"];
     NSString * userID=[[NSUserDefaults standardUserDefaults] objectForKey:@"erpaccount"];
     NSString *master=[[[NSUserDefaults standardUserDefaults] objectForKey:@"masterDic"]objectForKey:@"ma_user"];
@@ -2148,7 +2148,7 @@
     
     
     //1,ip
-    NSString *ip=[[NSUserDefaults standardUserDefaults] objectForKey:@"ipAndPort"];
+    NSString *ip=[UASUserInfo shareManager].urlIp;
     NSString *sessionId=[[NSUserDefaults standardUserDefaults] stringForKey:@"sessionId"];
     
     NSDate *senddate = [NSDate date];
@@ -3190,7 +3190,7 @@
 {
     
     NSString *sessionId=[[NSUserDefaults standardUserDefaults] stringForKey:@"sessionId"];
-    NSString *ip=[[NSUserDefaults standardUserDefaults] objectForKey:@"ipAndPort"];
+    NSString *ip=[UASUserInfo shareManager].urlIp;
     NSString *emcode = [[NSUserDefaults standardUserDefaults] stringForKey:@"erpaccount"];
     NSString *master = [[[NSUserDefaults standardUserDefaults] objectForKey:@"masterDic"]objectForKey:@"ma_user"];
     NSString *sessionUser = [[NSUserDefaults standardUserDefaults] objectForKey:@"erpaccount"];

shiku_im/shiku_im/controller/myOA/JOOutWorkPlanVC.m

@@ -2303,7 +2303,7 @@
     [MBProgressHUD showMessage:@"" toView:self.view];
     
     
-    NSString *ip = [[NSUserDefaults standardUserDefaults] objectForKey:@"ipAndPort"];
+    NSString *ip = [UASUserInfo shareManager].urlIp;
     NSString *sessionId = [[NSUserDefaults standardUserDefaults] stringForKey:@"sessionId"];
     
     //caller =@"MOBILEOUTPLAN";
@@ -2393,7 +2393,7 @@
     
     
     NSString *sessionId=[[NSUserDefaults standardUserDefaults] stringForKey:@"sessionId"];
-    NSString *ip=[[NSUserDefaults standardUserDefaults] objectForKey:@"ipAndPort"];
+    NSString *ip=[UASUserInfo shareManager].urlIp;
     //NSString * userID=[[NSUserDefaults standardUserDefaults] objectForKey:@"erpaccount"];
     //NSString *master=[[[NSUserDefaults standardUserDefaults] objectForKey:@"masterDic"]objectForKey:@"ma_user"];
     if ((model.Latitude == nil || model.Latitude.length == 0) || (model.Longetude == nil || model.Longetude.length == 0)) {
@@ -2515,7 +2515,7 @@
     
     NSString *sessionId=[userDefault stringForKey:@"sessionId"];
     
-    NSString * ips=[userDefault objectForKey:@"ipAndPort"];
+    NSString * ips=[UASUserInfo shareManager].urlIp;
     
     NSString * userID=[[NSUserDefaults standardUserDefaults] objectForKey:@"erpaccount"];
     NSString *master=[[[NSUserDefaults standardUserDefaults] objectForKey:@"masterDic"]objectForKey:@"ma_user"];
@@ -2556,7 +2556,7 @@
     
     NSUserDefaults *userDefault=[NSUserDefaults standardUserDefaults];
     
-    NSString * ips=[userDefault objectForKey:@"ipAndPort"];
+    NSString * ips=[UASUserInfo shareManager].urlIp;
     
     NSString *urlAdd = [NSString stringWithFormat:@"/mobile/crm/searchCustomer.action"];
     

shiku_im/shiku_im/controller/myOA/JOPunchCardViewController.m

@@ -898,7 +898,7 @@
     NSUserDefaults *userDefault=[NSUserDefaults standardUserDefaults];
     NSString *sessionId=[userDefault stringForKey:@"sessionId"];
     
-    NSString * ips=[userDefault objectForKey:@"ipAndPort"];
+    NSString * ips=[UASUserInfo shareManager].urlIp;
     
     
     NSString * userID=[[NSUserDefaults standardUserDefaults] objectForKey:@"erpaccount"];

shiku_im/shiku_im/controller/myOA/JOTXTableViewController.m

@@ -151,7 +151,7 @@
     
     NSString *sessionId=[userDefault stringForKey:@"sessionId"];
     
-    NSString * ips=[userDefault objectForKey:@"ipAndPort"];
+    NSString * ips=[UASUserInfo shareManager].urlIp;
     
     
     

shiku_im/shiku_im/controller/myOA/JOWQQDXQViewController.m

@@ -138,7 +138,7 @@
     
     NSString *sessionId=[userDefault stringForKey:@"sessionId"];
     
-    NSString * ips=[userDefault objectForKey:@"ipAndPort"];
+    NSString * ips=[UASUserInfo shareManager].urlIp;
     
     
     
@@ -318,7 +318,7 @@
     JOWQModel * model=_dateArray[sender.view.tag];
     
     NSUserDefaults *userDefault=[NSUserDefaults standardUserDefaults];
-    NSString * ips=[userDefault objectForKey:@"ipAndPort"];
+    NSString * ips=[UASUserInfo shareManager].urlIp;
     NSString *url=[@"" stringByAppendingFormat:@"%@common/downloadbyId.action?id=%@",ips,model.mo_attachid];
     NSURL * urls=[NSURL URLWithString:url];
     DLog(@"蹦在这里了吗%@",urls);

shiku_im/shiku_im/controller/myOA/JOWQSCDKViewController.m

@@ -103,7 +103,7 @@
     
     NSString *sessionId=[userDefault stringForKey:@"sessionId"];
     
-    NSString * ips=[userDefault objectForKey:@"ipAndPort"];
+    NSString * ips=[UASUserInfo shareManager].urlIp;
     
     NSString * userID=[[NSUserDefaults standardUserDefaults] objectForKey:@"erpaccount"];
     NSString *master=[[[NSUserDefaults standardUserDefaults] objectForKey:@"masterDic"]objectForKey:@"ma_user"];
@@ -155,7 +155,7 @@
     
     NSString *sessionId=[userDefault stringForKey:@"sessionId"];
     
-    NSString * ips=[userDefault objectForKey:@"ipAndPort"];
+    NSString * ips=[UASUserInfo shareManager].urlIp;
     
     NSString * userID=[[NSUserDefaults standardUserDefaults] objectForKey:@"erpaccount"];
     NSString *master=[[[NSUserDefaults standardUserDefaults] objectForKey:@"masterDic"]objectForKey:@"ma_user"];
@@ -877,7 +877,7 @@
     
     NSString *sessionId=[userDefault stringForKey:@"sessionId"];
     
-    NSString * ips=[userDefault objectForKey:@"ipAndPort"];
+    NSString * ips=[UASUserInfo shareManager].urlIp;
     
     //3.拼接sessionID
     NSString *paramSessionId=[@"" stringByAppendingFormat:@"JSESSIONID=%@",sessionId];
@@ -935,7 +935,7 @@
     manager.responseSerializer.acceptableContentTypes =[NSSet setWithObject:@"text/html"];
     manager.responseSerializer.acceptableContentTypes =[NSSet setWithObject:@"application/json"];
     NSUserDefaults *userDefault=[NSUserDefaults standardUserDefaults];
-    NSString *ip=[userDefault objectForKey:@"ipAndPort"];
+    NSString *ip=[UASUserInfo shareManager].urlIp;
     NSString *sessionId=[userDefault objectForKey:@"sessionId"];
     
     NSString *paramSessionId=[@"" stringByAppendingFormat:@"JSESSIONID=%@",sessionId];
@@ -990,7 +990,7 @@
     NSUserDefaults *userDefault=[NSUserDefaults standardUserDefaults];
     NSString *sessionId=[userDefault stringForKey:@"sessionId"];
     
-    NSString * ips=[userDefault objectForKey:@"ipAndPort"];
+    NSString * ips=[UASUserInfo shareManager].urlIp;
     
     NSString * userID=[userDefault objectForKey:@"erpaccount"];
     

shiku_im/shiku_im/controller/myOA/JOWQSZTableViewController.m

@@ -171,7 +171,7 @@
     NSUserDefaults *userDefault=[NSUserDefaults standardUserDefaults];
     NSString *sessionId=[userDefault stringForKey:@"sessionId"];
     
-    NSString * ips=[userDefault objectForKey:@"ipAndPort"];
+    NSString * ips=[UASUserInfo shareManager].urlIp;
     
     NSString * userID=[[NSUserDefaults standardUserDefaults] objectForKey:@"erpaccount"];
     NSString *master=[[[NSUserDefaults standardUserDefaults] objectForKey:@"masterDic"]objectForKey:@"ma_user"];

shiku_im/shiku_im/controller/myOA/JOWQTableViewCell.m

@@ -213,7 +213,7 @@
     
 
     NSUserDefaults *userDefault=[NSUserDefaults standardUserDefaults];
-    NSString * ips=[userDefault objectForKey:@"ipAndPort"];
+    NSString * ips=[UASUserInfo shareManager].urlIp;
     
     
     

shiku_im/shiku_im/controller/myOA/JOWQViewController.m

@@ -130,7 +130,7 @@
     
     NSString *sessionId=[userDefault stringForKey:@"sessionId"];
     
-    NSString * ips=[userDefault objectForKey:@"ipAndPort"];
+    NSString * ips=[UASUserInfo shareManager].urlIp;
     
     NSString * userID=[userDefault objectForKey:@"erpaccount"];
     
@@ -223,7 +223,7 @@
     
     NSString *sessionId=[userDefault stringForKey:@"sessionId"];
     
-    NSString * ips=[userDefault objectForKey:@"ipAndPort"];
+    NSString * ips=[UASUserInfo shareManager].urlIp;
     
     
     NSString * userID=[[NSUserDefaults standardUserDefaults] objectForKey:@"erpaccount"];
@@ -732,7 +732,7 @@ updatingLocation:(BOOL)updatingLocation
     
     NSString *sessionId=[userDefault stringForKey:@"sessionId"];
     
-    NSString * ips=[userDefault objectForKey:@"ipAndPort"];
+    NSString * ips=[UASUserInfo shareManager].urlIp;
     NSString * userID=[[NSUserDefaults standardUserDefaults] objectForKey:@"erpaccount"];
     NSString *master=[[[NSUserDefaults standardUserDefaults] objectForKey:@"masterDic"]objectForKey:@"ma_user"];
     

shiku_im/shiku_im/controller/myOA/JOXZHYRWViewController.m

@@ -538,7 +538,7 @@
 -(void)getCode
 {
     NSString *sessionId=[[NSUserDefaults standardUserDefaults] stringForKey:@"sessionId"];
-    NSString *ip=[[NSUserDefaults standardUserDefaults] objectForKey:@"ipAndPort"];
+    NSString *ip=[UASUserInfo shareManager].urlIp;
     
     NSString *url = [NSString stringWithFormat:@"%@common/getCodeString.action?type=2&caller=ProjectTask&sessionId=%@",ip,sessionId];
     
@@ -576,7 +576,7 @@
 -(void)postRENWUToServerWith:(NSString *)code
 {
     NSString *sessionId=[[NSUserDefaults standardUserDefaults] stringForKey:@"sessionId"];
-    NSString *ip=[[NSUserDefaults standardUserDefaults] objectForKey:@"ipAndPort"];
+    NSString *ip=[UASUserInfo shareManager].urlIp;
     
     NSString * userID=[[NSUserDefaults standardUserDefaults] objectForKey:@"erpaccount"];
     NSString *master=[[[NSUserDefaults standardUserDefaults] objectForKey:@"masterDic"]objectForKey:@"ma_user"];

shiku_im/shiku_im/controller/myOA/LYYDAKAManager.m

@@ -453,7 +453,7 @@ static  LYYDAKAManager *instance = nil;
             
             NSString *sessionId=[userDefault stringForKey:@"sessionId"];
             
-            NSString * ips=[userDefault objectForKey:@"ipAndPort"];
+            NSString * ips=[UASUserInfo shareManager].urlIp;
             
             NSString * userID=[userDefault objectForKey:@"erpaccount"];
             
@@ -936,7 +936,7 @@ static  LYYDAKAManager *instance = nil;
         //取出sessionID和IP和员工编号
         NSUserDefaults * userDefault=[NSUserDefaults standardUserDefaults];
         NSString * sessionId=[userDefault stringForKey:@"sessionId"];
-        NSString * ips=[userDefault objectForKey:@"ipAndPort"];
+        NSString * ips=[UASUserInfo shareManager].urlIp;
         NSString * userID=[userDefault objectForKey:@"erpaccount"];
         NSString * master=[[userDefault objectForKey:@"masterDic"]objectForKey:@"ma_user"];
         NSString * userNum=[userDefault objectForKey:kMY_USER_LoginName];