From ba144473b7c280a691b23b37791295970a8817de Mon Sep 17 00:00:00 2001 From: Sandy <1074472615@qq.com> Date: Wed, 22 Jun 2016 10:16:00 +0800 Subject: [PATCH] =?UTF-8?q?=E6=AD=A3=E5=BC=8F=E7=89=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ALand.xcodeproj/project.pbxproj | 4 +- ALand/Application/AppDelegate.m | 13 --- .../StoreManagermentViewController.m | 2 +- .../MIne/ViewController/AboutViewController.m | 3 + .../ViewController/AboutViewController.xib | 1 + .../ViewController/SettingViewController.m | 2 +- .../ViewController/SettingViewController.xib | 16 +-- ALand/Global/HTTPCilent.m | 99 +++++++------------ ALand/Global/JavenQNManager.m | 18 +++- ALand/Info.plist | 4 +- ALand/Macro/UrlHeader.h | 5 +- 11 files changed, 74 insertions(+), 93 deletions(-) diff --git a/ALand.xcodeproj/project.pbxproj b/ALand.xcodeproj/project.pbxproj index 91eb121..d408026 100644 --- a/ALand.xcodeproj/project.pbxproj +++ b/ALand.xcodeproj/project.pbxproj @@ -2926,8 +2926,8 @@ baseConfigurationReference = AAF51B5D53AE9938C03065C3 /* Pods.release.xcconfig */; buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; - CODE_SIGN_IDENTITY = "iPhone Developer"; - "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; + CODE_SIGN_IDENTITY = "iPhone Distribution: Shanghai Gomore Information Technology Co.,Ltd"; + "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution: Shanghai Gomore Information Technology Co.,Ltd"; ENABLE_BITCODE = NO; GCC_PREFIX_HEADER = Aland/PrefixHeader.pch; HEADER_SEARCH_PATHS = ( diff --git a/ALand/Application/AppDelegate.m b/ALand/Application/AppDelegate.m index 773f252..026d4f3 100644 --- a/ALand/Application/AppDelegate.m +++ b/ALand/Application/AppDelegate.m @@ -49,19 +49,6 @@ [UMSocialWechatHandler setWXAppId:@"wx2e218a9fb84928fa" appSecret:@"400c1925383f36f7768de707c69035e2" url:@"http://www.umeng.com/social"]; [MobClick startWithAppkey:@"573ed34ae0f55a408c000018" reportPolicy:(REALTIME) channelId:nil]; - [MobClick setLogEnabled:YES]; - - Class cls = NSClassFromString(@"UMANUtil"); - SEL deviceIDSelector = @selector(openUDIDString); - NSString *deviceID = nil; - if(cls && [cls respondsToSelector:deviceIDSelector]){ - deviceID = [cls performSelector:deviceIDSelector]; - } - NSData* jsonData = [NSJSONSerialization dataWithJSONObject:@{@"oid" : deviceID} - options:NSJSONWritingPrettyPrinted - error:nil]; - - NSLog(@"%@", [[NSString alloc] initWithData:jsonData encoding:NSUTF8StringEncoding]); } diff --git a/ALand/CodeClass/Home/ViewController/StoreManagerment/StoreManagermentViewController.m b/ALand/CodeClass/Home/ViewController/StoreManagerment/StoreManagermentViewController.m index 3cbfe20..03a1a06 100644 --- a/ALand/CodeClass/Home/ViewController/StoreManagerment/StoreManagermentViewController.m +++ b/ALand/CodeClass/Home/ViewController/StoreManagerment/StoreManagermentViewController.m @@ -190,7 +190,7 @@ //生æˆä¸Šä¼ 图片URLçš„å‚æ•° - (NSDictionary *)getParamsWithImageUrl:(NSString *)imageUrl { - self.shopModel.pictures = [NSString stringWithFormat:@"http://7xtefo.com2.z0.glb.qiniucdn.com/%@", imageUrl]; + self.shopModel.pictures = [NSString stringWithFormat:@"http://o93sl2fym.bkt.clouddn.com/%@", imageUrl]; UserInfo *user = [UserInfo shareInstance]; NSDictionary *dicShop = [self.shopModel dictionaryRepresentation]; NSDictionary *params = @{@"operCtx" : @{@"time" : [[NSDate date] timeStampNumber], diff --git a/ALand/CodeClass/MIne/ViewController/AboutViewController.m b/ALand/CodeClass/MIne/ViewController/AboutViewController.m index 9aa923a..9465dfb 100644 --- a/ALand/CodeClass/MIne/ViewController/AboutViewController.m +++ b/ALand/CodeClass/MIne/ViewController/AboutViewController.m @@ -10,6 +10,7 @@ #import "UIImage+Helper.h" @interface AboutViewController () @property (weak, nonatomic) IBOutlet UIImageView *imgViewTop; +@property (weak, nonatomic) IBOutlet UILabel *labelVersion; @end @@ -21,6 +22,8 @@ self.imgViewTop.layer.masksToBounds = YES; self.imgViewTop.layer.cornerRadius = 10; self.imgViewTop.image = [UIImage appIcon]; + NSString *version = [[[NSBundle mainBundle] infoDictionary] objectForKey:@"CFBundleShortVersionString"]; + self.labelVersion.text = [NSString stringWithFormat:@"版本:%@",version]; // Do any additional setup after loading the view from its nib. } diff --git a/ALand/CodeClass/MIne/ViewController/AboutViewController.xib b/ALand/CodeClass/MIne/ViewController/AboutViewController.xib index c798e97..541c4c6 100644 --- a/ALand/CodeClass/MIne/ViewController/AboutViewController.xib +++ b/ALand/CodeClass/MIne/ViewController/AboutViewController.xib @@ -8,6 +8,7 @@ <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner" customClass="AboutViewController"> <connections> <outlet property="imgViewTop" destination="GUS-nD-bR6" id="Mzq-BJ-Fmc"/> + <outlet property="labelVersion" destination="PIk-Fj-Tp4" id="hTn-4c-Tes"/> <outlet property="view" destination="i5M-Pr-FkT" id="sfx-zR-JGt"/> </connections> </placeholder> diff --git a/ALand/CodeClass/MIne/ViewController/SettingViewController.m b/ALand/CodeClass/MIne/ViewController/SettingViewController.m index 23ab9f0..dca6453 100644 --- a/ALand/CodeClass/MIne/ViewController/SettingViewController.m +++ b/ALand/CodeClass/MIne/ViewController/SettingViewController.m @@ -193,7 +193,7 @@ WS(weakSelf) [[JavenQNManager shareInstance] upLoadImage:image isMD5Name:YES name:nil commpelete:^(NSString *key) { - self.reseller.portrait = [NSString stringWithFormat:@"http://7xtefo.com2.z0.glb.qiniucdn.com/%@", key]; + self.reseller.portrait = [NSString stringWithFormat:@"http://o93sl2fym.bkt.clouddn.com/%@", key]; NSDictionary *params = [self getParamsWithReseller:self.reseller]; //ä¸Šä¼ æˆåŠŸä¹‹åŽæŠŠURLä¼ ç»™alandæœåС噍 diff --git a/ALand/CodeClass/MIne/ViewController/SettingViewController.xib b/ALand/CodeClass/MIne/ViewController/SettingViewController.xib index 95c5c6f..ad09f44 100644 --- a/ALand/CodeClass/MIne/ViewController/SettingViewController.xib +++ b/ALand/CodeClass/MIne/ViewController/SettingViewController.xib @@ -30,7 +30,7 @@ <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="calibratedRGB"/> <nil key="highlightedColor"/> </label> - <imageView userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="rightIcon" translatesAutoresizingMaskIntoConstraints="NO" id="Tr7-KF-NsW"> + <imageView userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" misplaced="YES" image="rightIcon" translatesAutoresizingMaskIntoConstraints="NO" id="Tr7-KF-NsW"> <rect key="frame" x="357" y="30" width="10" height="30"/> <constraints> <constraint firstAttribute="width" constant="10" id="21S-TV-ZBG"/> @@ -70,7 +70,7 @@ <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="Tgc-3e-TQr" userLabel="个性ç¾å"> <rect key="frame" x="0.0" y="98" width="375" height="50"/> <subviews> - <imageView userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="rightIcon" translatesAutoresizingMaskIntoConstraints="NO" id="q4e-UX-9Iq"> + <imageView userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" misplaced="YES" image="rightIcon" translatesAutoresizingMaskIntoConstraints="NO" id="q4e-UX-9Iq"> <rect key="frame" x="357" y="10" width="10" height="30"/> <constraints> <constraint firstAttribute="width" constant="10" id="gS6-OO-7Wj"/> @@ -118,7 +118,7 @@ <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="g2a-cQ-j4f" userLabel="消æ¯è®¾ç½®"> <rect key="frame" x="0.0" y="156" width="375" height="50"/> <subviews> - <imageView userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="rightIcon" translatesAutoresizingMaskIntoConstraints="NO" id="ODV-9G-WcV"> + <imageView userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" misplaced="YES" image="rightIcon" translatesAutoresizingMaskIntoConstraints="NO" id="ODV-9G-WcV"> <rect key="frame" x="357" y="10" width="10" height="30"/> <constraints> <constraint firstAttribute="width" constant="10" id="CWA-MV-hPn"/> @@ -164,7 +164,7 @@ <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="7De-WQ-TBD" userLabel="登录密ç "> <rect key="frame" x="0.0" y="214" width="375" height="50"/> <subviews> - <imageView userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="rightIcon" translatesAutoresizingMaskIntoConstraints="NO" id="wt1-KT-vOJ"> + <imageView userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" misplaced="YES" image="rightIcon" translatesAutoresizingMaskIntoConstraints="NO" id="wt1-KT-vOJ"> <rect key="frame" x="357" y="10" width="10" height="30"/> <constraints> <constraint firstAttribute="width" constant="10" id="q7S-WT-utc"/> @@ -226,7 +226,7 @@ <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="wea-du-rfh" userLabel="手机å·ç "> <rect key="frame" x="0.0" y="264" width="375" height="50"/> <subviews> - <imageView userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="rightIcon" translatesAutoresizingMaskIntoConstraints="NO" id="i3E-Tf-yvZ"> + <imageView userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" misplaced="YES" image="rightIcon" translatesAutoresizingMaskIntoConstraints="NO" id="i3E-Tf-yvZ"> <rect key="frame" x="357" y="10" width="10" height="30"/> <constraints> <constraint firstAttribute="width" constant="10" id="NwH-25-OHc"/> @@ -285,7 +285,7 @@ <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="MiY-le-eXG" userLabel="æçް坆ç "> <rect key="frame" x="0.0" y="314" width="375" height="50"/> <subviews> - <imageView userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="rightIcon" translatesAutoresizingMaskIntoConstraints="NO" id="48E-sg-B55"> + <imageView userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" misplaced="YES" image="rightIcon" translatesAutoresizingMaskIntoConstraints="NO" id="48E-sg-B55"> <rect key="frame" x="357" y="10" width="10" height="30"/> <constraints> <constraint firstAttribute="width" constant="10" id="did-6Q-ZDB"/> @@ -344,7 +344,7 @@ <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="3T0-bi-6UQ" userLabel="清空数æ®ç¼“å˜"> <rect key="frame" x="0.0" y="372" width="375" height="50"/> <subviews> - <imageView userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="rightIcon" translatesAutoresizingMaskIntoConstraints="NO" id="Lsf-Uu-0IB"> + <imageView userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" misplaced="YES" image="rightIcon" translatesAutoresizingMaskIntoConstraints="NO" id="Lsf-Uu-0IB"> <rect key="frame" x="357" y="10" width="10" height="30"/> <constraints> <constraint firstAttribute="width" constant="10" id="3TR-ju-sDy"/> @@ -403,7 +403,7 @@ <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="2q7-xh-PXY" userLabel="关于"> <rect key="frame" x="0.0" y="422" width="375" height="50"/> <subviews> - <imageView userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="rightIcon" translatesAutoresizingMaskIntoConstraints="NO" id="7eQ-EI-HIu"> + <imageView userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" misplaced="YES" image="rightIcon" translatesAutoresizingMaskIntoConstraints="NO" id="7eQ-EI-HIu"> <rect key="frame" x="357" y="10" width="10" height="30"/> <constraints> <constraint firstAttribute="width" constant="10" id="VeP-AK-Ucr"/> diff --git a/ALand/Global/HTTPCilent.m b/ALand/Global/HTTPCilent.m index b5828b3..bbeed16 100644 --- a/ALand/Global/HTTPCilent.m +++ b/ALand/Global/HTTPCilent.m @@ -24,7 +24,8 @@ return cilent; } -- (AFHTTPSessionManager *)manager { +- (AFHTTPSessionManager *)manager +{ if (!_manager) { _manager = [[AFHTTPSessionManager alloc] initWithBaseURL:[NSURL URLWithString:REST_BASE_URL]]; _manager.responseSerializer = [AFJSONResponseSerializer serializer]; @@ -89,75 +90,49 @@ - (void)checkUpdateOnVC:(UIViewController *)vc{ - //ç‰ˆæœ¬å· å–的是build - NSString *version = [[[NSBundle mainBundle] infoDictionary] objectForKey:@"CFBundleShortVersionString"]; + //ç‰ˆæœ¬å· å–的是build + NSString *version = [[[NSBundle mainBundle] infoDictionary] objectForKey:@"CFBundleShortVersionString"]; + + NSDictionary *params = @{@"domain": kDomain, + @"version": version, + @"type": @"ipa" + }; + [[[self class] shareCilent] POST:@"app/getUpgrade" parameters:params success:^(NSURLSessionDataTask *task, id responseObject) { - NSDictionary *params = @{@"domain": kDomain, - @"version": version, - @"type": @"ipa" - }; - [[[self class] shareCilent] POST:@"app/getUpgrade" parameters:params success:^(NSURLSessionDataTask *task, id responseObject) { + if (kIsResponseSuccess(responseObject)) { + NSDictionary *dic = responseObject[@"upgradeInfo"]; + NSString *lastestVersion = dic[@"version"]; + BOOL isForceUpdate = [dic[@"forceUpdate"] boolValue]; + NSString *trackViewUrl = dic[@"url"]; - if (kIsResponseSuccess(responseObject)) { - NSDictionary *dic = responseObject[@"upgradeInfo"]; - NSString *lastestVersion = dic[@"version"]; - BOOL isForceUpdate = [dic[@"forceUpdate"] boolValue]; - -#ifdef DEBUG - lastestVersion = @"2.0.1"; - isForceUpdate = [JV_TestTool randomBool]; -#else - -#endif + if (lastestVersion) { - NSArray *arrVersion = [version componentsSeparatedByString:@"."]; - NSArray *arrLatestVersion = [lastestVersion componentsSeparatedByString:@"."]; + UIAlertController *alert = [UIAlertController alertControllerWithTitle:@"æç¤º" message:@"å·²ç»æœ‰æ–°ç‰ˆæœ¬å¯ä»¥ä¸‹è½½äº†å“Ÿï¼" preferredStyle:UIAlertControllerStyleAlert]; + [alert addAction:({ + UIAlertAction *action = [UIAlertAction actionWithTitle:@"å‰å¾€æ›´æ–°" style:UIAlertActionStyleDefault handler:^(UIAlertAction * _Nonnull action) { + [[UIApplication sharedApplication] openURL:[NSURL URLWithString:trackViewUrl]]; + }]; + action; + })]; - NSURL *trackViewUrl = [NSURL URLWithString:@"https://itunes.apple.com/us/app/xin-ying-yang-bu-luo/id1116490021?mt=8&uo=4"]; - - if (![arrVersion[0] isEqualToString: arrLatestVersion[0]]) { - CLog(@"å¤§ç‰ˆæœ¬å·æœ‰æ›´æ–°"); - if (isForceUpdate) { - UIAlertController *alert = [UIAlertController alertControllerWithTitle:@"æç¤º" message:@"å·²ç»æœ‰æ–°ç‰ˆæœ¬å¯ä»¥ä¸‹è½½\n䏿›´æ–°å°†ä¼šè½¯ä»¶å°†æ— 法æ£å¸¸ä½¿ç”¨ï¼ï¼" preferredStyle:UIAlertControllerStyleAlert]; - [alert addAction:({ - UIAlertAction *action = [UIAlertAction actionWithTitle:@"å‰å¾€æ›´æ–°" style:UIAlertActionStyleDefault handler:^(UIAlertAction * _Nonnull action) { - [[UIApplication sharedApplication] openURL:trackViewUrl]; - [vc PresentModalViewController:alert animated:YES]; - }]; - action; - })]; - - [vc PresentModalViewController:alert animated:YES]; - return ; - } + if (!isForceUpdate) { + + [alert addAction:({ + UIAlertAction *action = [UIAlertAction actionWithTitle:@"æš‚ä¸æ›´æ–°" style:UIAlertActionStyleDefault handler:nil]; + action; + })]; } - for (int i = 0; i < 3; i++) { - if (![arrVersion[i] isEqualToString:arrLatestVersion[i]]) { - CLog(@"å°ç‰ˆæœ¬å·æœ‰æ›´æ–°"); - UIAlertController *alert = [UIAlertController alertControllerWithTitle:@"æç¤º" message:@"å·²ç»æœ‰æ–°ç‰ˆæœ¬å¯ä»¥ä¸‹è½½äº†å“Ÿï¼" preferredStyle:UIAlertControllerStyleAlert]; - [alert addAction:({ - UIAlertAction *action = [UIAlertAction actionWithTitle:@"å‰å¾€æ›´æ–°" style:UIAlertActionStyleDefault handler:^(UIAlertAction * _Nonnull action) { - [[UIApplication sharedApplication] openURL:trackViewUrl]; - }]; - action; - })]; - - [alert addAction:({ - UIAlertAction *action = [UIAlertAction actionWithTitle:@"æš‚ä¸æ›´æ–°" style:UIAlertActionStyleDefault handler:nil]; - action; - })]; - [vc PresentModalViewController:alert animated:YES]; - return ; - } - } + [vc PresentModalViewController:alert animated:YES]; + } - - CLog(@"d"); - } failure:^(NSURLSessionDataTask *task, NSError *error) { - - }]; + } + + } failure:^(NSURLSessionDataTask *task, NSError *error) { + + }]; + } diff --git a/ALand/Global/JavenQNManager.m b/ALand/Global/JavenQNManager.m index 699e8c3..410a0b7 100644 --- a/ALand/Global/JavenQNManager.m +++ b/ALand/Global/JavenQNManager.m @@ -12,6 +12,15 @@ #include <CommonCrypto/CommonCrypto.h> #import "NSData+EncodeAdditions.h" #import "UIImage+Helper.h" + +//测试key +//#define kAK @"mRX5pK-bCChgNMxeiC_VlRgSFLuz_WbLT3OyViuh" +//#define kSK @"m8XQ8FjLiUY38pgDUzjHApdJ4YpgdlpmRT6FAwAg" + +//æ£å¼key +#define kAK @"ufPuIR1b_gWCgaIjD_R1ujfl7Djy1VpKoCrHXBxc" +#define kSK @"2JR4SjeRpQp7rxroympYg3iglFB08nEojHGae80c" + @interface JavenQNManager () @property (nonatomic, strong) QNUploadManager *upManager; @property (nonatomic, strong) QNUploadOption *option; @@ -37,8 +46,11 @@ - (void)upLoadImage:(UIImage *)image isMD5Name:(BOOL)isMD5Name name:(NSString *)imageName commpelete:(void(^)(NSString *key))commpelete { - NSString *AK =@"mRX5pK-bCChgNMxeiC_VlRgSFLuz_WbLT3OyViuh"; - NSString *SK = @"m8XQ8FjLiUY38pgDUzjHApdJ4YpgdlpmRT6FAwAg"; + + NSString *AK =kAK; + NSString *SK = kSK; + + self.token = [self makeToken:AK secretKey:SK]; UIImage *imgNewWidth = [image scaledToWidth:200]; @@ -106,7 +118,7 @@ //æŒ‰ä¸ƒç‰›â€œä¸Šä¼ ç–ç•¥â€çš„æè¿°ï¼š <bucket>:<key>,表示åªå…è®¸ç”¨æˆ·ä¸Šä¼ æŒ‡å®škeyçš„æ–‡ä»¶ã€‚åœ¨è¿™ç§æ ¼å¼ä¸‹æ–‡ä»¶é»˜è®¤å…许“修改â€ï¼Œè‹¥å·²å˜åœ¨åŒå资æºåˆ™ä¼šè¢«è¦†ç›–。如果åªå¸Œæœ›ä¸Šä¼ 指定key的文件,并且ä¸å…许修改,那么å¯ä»¥å°†ä¸‹é¢çš„ insertOnly 属性值设为 1。 //æ‰€ä»¥å¦‚æžœå‚æ•°åªä¼ usersçš„è¯ï¼Œä¸‹æ¬¡ä¸Šä¼ key还是aaa的文件会æç¤ºå˜åœ¨åŒå文件,ä¸èƒ½ä¸Šä¼ 。 //ä¼ users:aaaçš„è¯ï¼Œå¯ä»¥è¦†ç›–æ›´æ–°ï¼Œä½†å®žæµ‹å»¶è¿Ÿè¾ƒé•¿ï¼Œæˆ‘ä¸Šä¼ åŒå新文件上去,下载下æ¥çš„è¿˜æ˜¯è€æ–‡ä»¶ã€‚ - [dic setObject:@"aland" forKey:@"scope"];//æ ¹æ® + [dic setObject:@"aland244" forKey:@"scope"];//æ ¹æ® [dic setObject:deadlineNumber forKey:@"deadline"]; diff --git a/ALand/Info.plist b/ALand/Info.plist index d36161e..f0e3485 100644 --- a/ALand/Info.plist +++ b/ALand/Info.plist @@ -17,7 +17,7 @@ <key>CFBundlePackageType</key> <string>APPL</string> <key>CFBundleShortVersionString</key> - <string>1.0.1</string> + <string>1.0.2</string> <key>CFBundleSignature</key> <string>????</string> <key>CFBundleURLTypes</key> @@ -42,7 +42,7 @@ </dict> </array> <key>CFBundleVersion</key> - <string>1.0.1</string> + <string>0</string> <key>LSApplicationQueriesSchemes</key> <array> <string>wechat</string> diff --git a/ALand/Macro/UrlHeader.h b/ALand/Macro/UrlHeader.h index 62959c2..a282dc7 100644 --- a/ALand/Macro/UrlHeader.h +++ b/ALand/Macro/UrlHeader.h @@ -9,7 +9,10 @@ #ifndef UrlHeader_h #define UrlHeader_h -#define REST_BASE_URL @"http://139.196.195.30:8080/aland-server/rest" +#define REST_BASE_URL @"http://139.196.173.244:8080/aland-server/rest" //æ£å¼çŽ¯å¢ƒ + +//#define REST_BASE_URL @"http://139.196.195.30:8080/aland-server/rest" //测试环境 + #define kDomain @"0001" //组织代ç -- 2.18.1