mobile / yh_vendor · Commits

Go to a project

Authored by 于良
Commit ceb03d9d746e1dc4c7f7f7e0a6ae631d2286e311 1 parent f0fee3c0

接口地址使用测试环境地址 review by 盖剑秋

Inline Side-by-side
Showing 5 changed files with 12 additions and 7 deletions
@@ -230,7 +230,7 @@ @@ -230,7 +230,7 @@
230 83CBB9F71A601CBA00E9B192 /* Project object */ = { 230 83CBB9F71A601CBA00E9B192 /* Project object */ = {
231 isa = PBXProject; 231 isa = PBXProject;
232 attributes = { 232 attributes = {
233 - LastUpgradeCheck = 610; 233 + LastUpgradeCheck = 0730;
234 ORGANIZATIONNAME = Facebook; 234 ORGANIZATIONNAME = Facebook;
235 TargetAttributes = { 235 TargetAttributes = {
236 00E356ED1AD99517003FC87E = { 236 00E356ED1AD99517003FC87E = {
@@ -416,6 +416,7 @@ @@ -416,6 +416,7 @@
416 "-lc++", 416 "-lc++",
417 ); 417 );
418 PRODUCT_NAME = "$(TARGET_NAME)"; 418 PRODUCT_NAME = "$(TARGET_NAME)";
  419 + PROVISIONING_PROFILE = "";
419 TEST_HOST = "$(BUILT_PRODUCTS_DIR)/YH_Vendor.app/YH_Vendor"; 420 TEST_HOST = "$(BUILT_PRODUCTS_DIR)/YH_Vendor.app/YH_Vendor";
420 }; 421 };
421 name = Release; 422 name = Release;
@@ -426,6 +427,7 @@ @@ -426,6 +427,7 @@
426 buildSettings = { 427 buildSettings = {
427 ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; 428 ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
428 ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImage; 429 ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImage;
  430 + CODE_SIGN_IDENTITY = "iPhone Developer";
429 DEAD_CODE_STRIPPING = NO; 431 DEAD_CODE_STRIPPING = NO;
430 HEADER_SEARCH_PATHS = ( 432 HEADER_SEARCH_PATHS = (
431 "$(inherited)", 433 "$(inherited)",
@@ -455,6 +457,8 @@ @@ -455,6 +457,8 @@
455 buildSettings = { 457 buildSettings = {
456 ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; 458 ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
457 ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImage; 459 ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImage;
  460 + CODE_SIGN_IDENTITY = "iPhone Developer";
  461 + "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
458 HEADER_SEARCH_PATHS = ( 462 HEADER_SEARCH_PATHS = (
459 "$(inherited)", 463 "$(inherited)",
460 /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include, 464 /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include,
@@ -473,7 +477,7 @@ @@ -473,7 +477,7 @@
473 ); 477 );
474 PRODUCT_BUNDLE_IDENTIFIER = cn.yoho.marketplace; 478 PRODUCT_BUNDLE_IDENTIFIER = cn.yoho.marketplace;
475 PRODUCT_NAME = YH_Vendor; 479 PRODUCT_NAME = YH_Vendor;
476 - PROVISIONING_PROFILE = "a0f51c74-3d7f-4d12-aba7-ef6055594004"; 480 + PROVISIONING_PROFILE = "b1f4ea2a-a435-4a56-b648-390635342be6";
477 }; 481 };
478 name = Release; 482 name = Release;
479 }; 483 };
@@ -497,6 +501,7 @@ @@ -497,6 +501,7 @@
497 "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; 501 "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
498 COPY_PHASE_STRIP = NO; 502 COPY_PHASE_STRIP = NO;
499 ENABLE_STRICT_OBJC_MSGSEND = YES; 503 ENABLE_STRICT_OBJC_MSGSEND = YES;
  504 + ENABLE_TESTABILITY = YES;
500 GCC_C_LANGUAGE_STANDARD = gnu99; 505 GCC_C_LANGUAGE_STANDARD = gnu99;
501 GCC_DYNAMIC_NO_PIC = NO; 506 GCC_DYNAMIC_NO_PIC = NO;
502 GCC_OPTIMIZATION_LEVEL = 0; 507 GCC_OPTIMIZATION_LEVEL = 0;
1 <?xml version="1.0" encoding="UTF-8"?> 1 <?xml version="1.0" encoding="UTF-8"?>
2 <Scheme 2 <Scheme
3 - LastUpgradeVersion = "0620" 3 + LastUpgradeVersion = "0730"
4 version = "1.3"> 4 version = "1.3">
5 <BuildAction 5 <BuildAction
6 parallelizeBuildables = "YES" 6 parallelizeBuildables = "YES"
@@ -21,7 +21,7 @@ @@ -21,7 +21,7 @@
21 <key>CFBundleSignature</key> 21 <key>CFBundleSignature</key>
22 <string>????</string> 22 <string>????</string>
23 <key>CFBundleVersion</key> 23 <key>CFBundleVersion</key>
24 - <string>1.0.0.2016053001</string> 24 + <string>1.0.0.2016060602</string>
25 <key>LSRequiresIPhoneOS</key> 25 <key>LSRequiresIPhoneOS</key>
26 <true/> 26 <true/>
27 <key>NSAppTransportSecurity</key> 27 <key>NSAppTransportSecurity</key>
1 module.exports = { 1 module.exports = {
2 dev: { 2 dev: {
3 - // baseUrl: 'http://testapi.yoho.cn:28077', 3 + // baseUrl: 'http://testapi.yoho.cn:28078',
4 baseUrl: 'http://192.168.102.205:8080', 4 baseUrl: 'http://192.168.102.205:8080',
5 httpTimeout: 30000, //毫秒 5 httpTimeout: 30000, //毫秒
6 6
7 }, 7 },
8 prd: { 8 prd: {
9 - baseUrl: 'http://192.168.102.205:8080', 9 + baseUrl: 'http://testapi.yoho.cn:28078',
10 HTTPTimeout: 30000, //毫秒 10 HTTPTimeout: 30000, //毫秒
11 11
12 }, 12 },
@@ -3,7 +3,7 @@ @@ -3,7 +3,7 @@
3 export default function timeoutPromise(ms, promise) { 3 export default function timeoutPromise(ms, promise) {
4 return new Promise((resolve, reject) => { 4 return new Promise((resolve, reject) => {
5 const timeoutId = setTimeout(() => { 5 const timeoutId = setTimeout(() => {
6 - reject(new Error("Network timeout")) 6 + reject(new Error("Request timeout"))
7 }, ms); 7 }, ms);
8 promise.then( 8 promise.then(
9 (res) => { 9 (res) => {