Merge branch 'master' into test

application/.gitattributes

-database.php merge=ours
\ No newline at end of file
+database.php merge=ours
+config.php merge=ours
\ No newline at end of file

application/api_broker/service/BrokerService.php

@@ -65,10 +65,7 @@ class BrokerService
                 } elseif ($item["is_forbidden"] == 1) { //已存在申请关系
                     $is_exits = true;
                 }
-
             }
-
-
         }
         if (!$is_exits && $type == 0)
             //新增申请绑定关系，需要后台同意登陆

application/database.php

@@ -13,18 +13,15 @@ return [
     // 数据库类型
     'type'            => 'mysql',
     // 服务器地址
-    'hostname'        => '106.15.189.146',
-//    'hostname'        => '127.0.0.1',
+    'hostname'        => '47.100.51.167',
     // 数据库名
     'database'        => 'db_tongliandichan',
     // 用户名
     'username'        => 'tldc_online',
-//    'username'        => 'root',
     // 密码
-    'password'        => 'Tljt8workstroot',
-//    'password'        => '123456',
+    'password'        => 'FujuhaofangrootTljt',
     // 端口
-    'hostport'        => '3308',
+    'hostport'        => '3307',
 
 
     //'hostport'        => '',