切换海峡项目

@@ -143,21 +143,14 @@ App({
     appId: appId,
     com_id: "",
     onshow_count: 0,
-<<<<<<< HEAD
-    // baseUrl: "http://47.110.158.110:20000/",
-    baseUrl: "https://api.fjhxrl.com/",
-    OSSUrl: "",
-=======
-    refresh_complete:false,
     // baseUrl: "http://47.99.47.16:20000/",
     // baseUrl: "http://47.96.75.229:20000/",
     // baseUrl: "http://192.144.144.220:20000/",
     // baseUrl: "http://154.8.229.55:20000/",
     // baseUrl: "http://47.110.250.177:20000/",
     // baseUrl: "http://47.110.158.110:20000/",
-    baseUrl: "https://api.workai.com.cn/",
+    baseUrl: "https://api.fjhxrl.com/",
     OSSUrl: "", //"https://oss.workai.com.cn/",
->>>>>>> dev2.0
     userInfo: null,
     hostInfo:null,
     hasLogin: false,

@@ -4,7 +4,7 @@
 		"ignore": []
 	},
 	"setting": {
-		"urlCheck": true,
+		"urlCheck": false,
 		"es6": true,
 		"postcss": true,
 		"minified": true,