diff --git a/.htaccess b/.htaccess
index e69de29..df8722a 100644
--- a/.htaccess
+++ b/.htaccess
@@ -0,0 +1,8 @@
+<<<<<<< HEAD
+=======
+
+ Header set Access-Control-Allow-Origin "*"
+ Header set Access-Control-Allow-Methods "GET, POST, OPTIONS"
+ Header set Access-Control-Allow-Headers "Content-Type, Authorization"
+
+>>>>>>> 0cee3014507ab00f356db97502f8a1de7a5a6757
diff --git a/FlyCube/Common/Conf/config.php b/FlyCube/Common/Conf/config.php
index 8916db1..ec6ac5f 100644
--- a/FlyCube/Common/Conf/config.php
+++ b/FlyCube/Common/Conf/config.php
@@ -12,7 +12,7 @@ return array(
'TMPL_PARSE_STRING' => array( //添加自己的模板变量规则
'__DATA__' => __ROOT__ . '/Data'
),
- "host" => "https://www.szdot.top/",
+ "host" => "https://www.wxsky.com/",
//微信配置参数
'weixin' => array(
'appid' => 'wx8347571d6893a383', //微信appid
@@ -29,7 +29,7 @@ return array(
'jwtKey' => 'T!o@k_en', //签发 解析token的key
//mqtt
'mqtt' => array(
- 'server' => 'www.szdot.top', // mqtt服务器
+ 'server' => 'www.wxsky.com', // mqtt服务器
'port' => 1883, // mqtt端口
'username' => 'admin', // mqtt用户名
'password' => '123456', // mqtt密码
diff --git a/app-debug.apk b/app-debug.apk
new file mode 100644
index 0000000..71c4714
Binary files /dev/null and b/app-debug.apk differ
diff --git a/index.html b/index.html
index 48dd020..7f3cb83 100644
--- a/index.html
+++ b/index.html
@@ -1,2 +1,2 @@
-hello world
-hello world
\ No newline at end of file
+debug
+release
\ No newline at end of file