Authored by 于良

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

... ... @@ -230,7 +230,7 @@
83CBB9F71A601CBA00E9B192 /* Project object */ = {
isa = PBXProject;
attributes = {
LastUpgradeCheck = 610;
LastUpgradeCheck = 0730;
ORGANIZATIONNAME = Facebook;
TargetAttributes = {
00E356ED1AD99517003FC87E = {
... ... @@ -416,6 +416,7 @@
"-lc++",
);
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE = "";
TEST_HOST = "$(BUILT_PRODUCTS_DIR)/YH_Vendor.app/YH_Vendor";
};
name = Release;
... ... @@ -426,6 +427,7 @@
buildSettings = {
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImage;
CODE_SIGN_IDENTITY = "iPhone Developer";
DEAD_CODE_STRIPPING = NO;
HEADER_SEARCH_PATHS = (
"$(inherited)",
... ... @@ -455,6 +457,8 @@
buildSettings = {
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImage;
CODE_SIGN_IDENTITY = "iPhone Developer";
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
HEADER_SEARCH_PATHS = (
"$(inherited)",
/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include,
... ... @@ -473,7 +477,7 @@
);
PRODUCT_BUNDLE_IDENTIFIER = cn.yoho.marketplace;
PRODUCT_NAME = YH_Vendor;
PROVISIONING_PROFILE = "a0f51c74-3d7f-4d12-aba7-ef6055594004";
PROVISIONING_PROFILE = "b1f4ea2a-a435-4a56-b648-390635342be6";
};
name = Release;
};
... ... @@ -497,6 +501,7 @@
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
COPY_PHASE_STRIP = NO;
ENABLE_STRICT_OBJC_MSGSEND = YES;
ENABLE_TESTABILITY = YES;
GCC_C_LANGUAGE_STANDARD = gnu99;
GCC_DYNAMIC_NO_PIC = NO;
GCC_OPTIMIZATION_LEVEL = 0;
... ...
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "0620"
LastUpgradeVersion = "0730"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
... ...
... ... @@ -21,7 +21,7 @@
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleVersion</key>
<string>1.0.0.2016053001</string>
<string>1.0.0.2016060602</string>
<key>LSRequiresIPhoneOS</key>
<true/>
<key>NSAppTransportSecurity</key>
... ...
module.exports = {
dev: {
// baseUrl: 'http://testapi.yoho.cn:28077',
// baseUrl: 'http://testapi.yoho.cn:28078',
baseUrl: 'http://192.168.102.205:8080',
httpTimeout: 30000, //毫秒
},
prd: {
baseUrl: 'http://192.168.102.205:8080',
baseUrl: 'http://testapi.yoho.cn:28078',
HTTPTimeout: 30000, //毫秒
},
... ...
... ... @@ -3,7 +3,7 @@
export default function timeoutPromise(ms, promise) {
return new Promise((resolve, reject) => {
const timeoutId = setTimeout(() => {
reject(new Error("Network timeout"))
reject(new Error("Request timeout"))
}, ms);
promise.then(
(res) => {
... ...