Merge branch 'master' of http://111.229.174.37:3000/Food/food_server
# Conflicts: # .htaccess
This commit is contained in:
commit
1291769ec4
@ -0,0 +1,8 @@
|
||||
<<<<<<< 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
|
@ -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密码
|
||||
|
BIN
app-debug.apk
Normal file
BIN
app-debug.apk
Normal file
Binary file not shown.
@ -1,2 +1,2 @@
|
||||
<a href="app-debug.apk">hello world</a>
|
||||
<a href="app-release.apk">hello world</a>
|
||||
<a href="app-debug.apk">debug</a>
|
||||
<a href="app-release.apk">release</a>
|
Loading…
Reference in New Issue
Block a user