2018/01/03

1.更改model 2.配置请求地址

2018/01/03
1.更改model 2.配置请求地址
afc5bcad · 朱建香 · 29132d8d · afc5bcad · afc5bcad · afc5bcad
Commit afc5bcad authored Jan 03, 2018 by 朱建香
Show whitespace changes
Inline Side-by-side

Showing with 7 additions and 2 deletions

dev/src/public/config.js
+1 -1

dev/src/public/defaultConfig.js
+4 -0

dev/src/public/public.js
+2 -1

No files found.
--- a/dev/src/public/config.js
+++ b/dev/src/public/config.js
@@ -24,7 +24,7 @@ export default {
 	"hijackMode": {
 		20: "hijackingAlarm",
 	},
-	"model": "UGEN_SECURITY_SMARTDOOR_YJ2017",
+	"model": "USMARTLOCK_SECURITY_SMARTDOOR_SMART_LOCK",
 	"GET_MSG_INTERVAL": 5000,
 	"wifi_add_timeout": 300000,
 	//门铃晃动间隔时间

--- a/dev/src/public/defaultConfig.js
+++ b/dev/src/public/defaultConfig.js
+export default {
+	"url": "https://cloud.iot.u-gen.net/"
+}
\ No newline at end of file
--- a/dev/src/public/public.js
+++ b/dev/src/public/public.js
 import config from './config.js';
 import VueI18n from 'vue-i18n';
+import defaultConfig from './defaultConfig.js';
 var VueTouch = require('vue-touch');
 Vue.use(VueTouch);

@@ -23,7 +24,7 @@ const iot = new UIOT({
 		//96外网
 //		url: 'http://jycinema.u-gen.net'
 		//正式
-		url: 'https://cloud.iot.u-gen.net/'
+		url: defaultConfig.url
 		//正式测试
 //		url: 'https://cloud.iot.u-gen.net/test-openapi/'
    },