From 0f5937dd12acdab1902788cddf66e2534c052f26 Mon Sep 17 00:00:00 2001
From: szdotServer <szddot@qq.comm>
Date: Thu, 8 May 2025 19:40:30 +0700
Subject: [PATCH 1/4] teset

---
 .htaccess | 2 --
 1 file changed, 2 deletions(-)

diff --git a/.htaccess b/.htaccess
index 77ecc56..e69de29 100644
--- a/.htaccess
+++ b/.htaccess
@@ -1,2 +0,0 @@
-<IfModule mod_headers.c>
-</IfModule>
\ No newline at end of file

From ce7af147c97c45d943297dadb42c68aaf8d03d55 Mon Sep 17 00:00:00 2001
From: szdotServer <szddot@qq.comm>
Date: Thu, 8 May 2025 19:57:49 +0700
Subject: [PATCH 2/4] test

---
 .htaccess | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/.htaccess b/.htaccess
index df8722a..1511ab4 100644
--- a/.htaccess
+++ b/.htaccess
@@ -1,8 +1,5 @@
-<<<<<<< HEAD
-=======
 <IfModule mod_headers.c>
 	Header set Access-Control-Allow-Origin "*"
 	Header set Access-Control-Allow-Methods "GET, POST, OPTIONS"
 	Header set Access-Control-Allow-Headers "Content-Type, Authorization"
 </IfModule>
->>>>>>> 0cee3014507ab00f356db97502f8a1de7a5a6757

From f056abbb43e8403a8592e7cd5e1b9f64ce88f1c6 Mon Sep 17 00:00:00 2001
From: air <30444667+sszdot@users.noreply.github.com>
Date: Thu, 8 May 2025 21:11:47 +0800
Subject: [PATCH 3/4] =?UTF-8?q?=E3=80=90=E7=B1=BB=20=20=E5=9E=8B=E3=80=91?=
 =?UTF-8?q?=EF=BC=9A=20=E3=80=90=E5=8E=9F=20=20=E5=9B=A0=E3=80=91=EF=BC=9A?=
 =?UTF-8?q?=20=E3=80=90=E8=BF=87=20=20=E7=A8=8B=E3=80=91=EF=BC=9A=20?=
 =?UTF-8?q?=E3=80=90=E5=BD=B1=20=20=E5=93=8D=E3=80=91=EF=BC=9A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 FlyCube/Common/Conf/config.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/FlyCube/Common/Conf/config.php b/FlyCube/Common/Conf/config.php
index ec6ac5f..838a025 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.wxsky.com/",
+	"host" => "https://www.ttaj.info/",
 	//微信配置参数
 	'weixin' => array(
 		'appid' => 'wx8347571d6893a383',			//微信appid
@@ -29,7 +29,7 @@ return array(
 	'jwtKey' => 'T!o@k_en', //签发 解析token的key
 	//mqtt
 	'mqtt' => array(
-		'server' => 'www.wxsky.com',	// mqtt服务器
+		'server' => 'www.ttaj.info',	// mqtt服务器
 		'port' => 1883,	// mqtt端口
 		'username' => 'admin',	// mqtt用户名
 		'password' => '123456',	// mqtt密码

From 55ab8cfb74849d1b614dc8dc20b035d74dfa5446 Mon Sep 17 00:00:00 2001
From: air <30444667+sszdot@users.noreply.github.com>
Date: Thu, 8 May 2025 21:13:34 +0800
Subject: [PATCH 4/4] =?UTF-8?q?=E3=80=90=E7=B1=BB=20=20=E5=9E=8B=E3=80=91?=
 =?UTF-8?q?=EF=BC=9A=20=E3=80=90=E5=8E=9F=20=20=E5=9B=A0=E3=80=91=EF=BC=9A?=
 =?UTF-8?q?=20=E3=80=90=E8=BF=87=20=20=E7=A8=8B=E3=80=91=EF=BC=9A=20?=
 =?UTF-8?q?=E3=80=90=E5=BD=B1=20=20=E5=93=8D=E3=80=91=EF=BC=9A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .htaccess                     | 5 -----
 FlyCube/Common/Conf/debug.php | 2 +-
 2 files changed, 1 insertion(+), 6 deletions(-)

diff --git a/.htaccess b/.htaccess
index 1511ab4..e69de29 100644
--- a/.htaccess
+++ b/.htaccess
@@ -1,5 +0,0 @@
-<IfModule mod_headers.c>
-	Header set Access-Control-Allow-Origin "*"
-	Header set Access-Control-Allow-Methods "GET, POST, OPTIONS"
-	Header set Access-Control-Allow-Headers "Content-Type, Authorization"
-</IfModule>
diff --git a/FlyCube/Common/Conf/debug.php b/FlyCube/Common/Conf/debug.php
index b21ef65..2d31e38 100644
--- a/FlyCube/Common/Conf/debug.php
+++ b/FlyCube/Common/Conf/debug.php
@@ -7,5 +7,5 @@
  */
 return array(
 	//'配置项'=>'配置值'
-	'SHOW_PAGE_TRACE' => false,
+	'SHOW_PAGE_TRACE' => true,
 );