Merge remote-tracking branch 'origin/master'

# Conflicts:
#	src/client_config_prod.php

src/client_config_prod.php

@@ -22,9 +22,9 @@ return [
 		'clientId' => 'common',
 		'clientSecret' => '2LMbaS2Ac9a2cPPBlZwq'
 	],
-	'bbs' => [
-		'apiUrl' => 'http://bbs.ibanshou.cn/api/server.php',
-		'clientId' => 'common',
-		'clientSecret' => 'IH74bqAosUxCiXe0Hh29'
-	],
+    'bbs' => [
+        'apiUrl' => 'http://bbs.ibanshou.cn/api/server.php',
+        'clientId' => 'common',
+        'clientSecret' => '1WQwnpjcURS0JwSkdiq3r'
+    ],
 ];
\ No newline at end of file