Merge remote-tracking branch 'origin/master'

Author: Zhao-github

README.md

@@ -42,7 +42,7 @@ php think apiadmin:adminRouter
 > 第五步：获取管理后台账号密码
 
 ```
-cat application/install/lock.ini
+cat install/lock.ini
 ```
 
 ## 灵 感

app/controller/admin/Login.php

@@ -139,7 +139,7 @@ public function getAccessMenuData(int $uid): array {
             }
         }
 
-        return $returnData;
+        return array_values($returnData);
     }
 
     /**

app/controller/admin/ThirdLogin.php

@@ -305,7 +305,7 @@ private function doLogin(string $openid, array $userDetail): Response {
                 'nickname'    => $userDetail['nickname'],
                 'username'    => 'ApiAdmin_qq_' . Strs::randString(8),
                 'openid'      => $openid,
-                'create_ip'   => request()->ip(1),
+                'create_ip'   => sprintf("%u", ip2long($this->request->ip())),
                 'status'      => 1,
                 'create_time' => time(),
                 'password'    => Tools::userMd5('ApiAdmin')
@@ -336,8 +336,8 @@ private function doLogin(string $openid, array $userDetail): Response {
             }
         }
 
-        $userInfo['access'] = (new Login(App()))->getAccess($userInfo['id']);
-        $userInfo['menu'] = (new Login(App()))->getAccessMenuData($userInfo['id']);
+        $userInfo['access'] = (new Login(App()))->getAccess(intval($userInfo['id']));
+        $userInfo['menu'] = (new Login(App()))->getAccessMenuData(intval($userInfo['id']));
 
         $apiAuth = md5(uniqid() . time());
         cache('Login:' . $apiAuth, json_encode($userInfo), config('apiadmin.ONLINE_TIME'));

app/controller/api/BuildToken.php

@@ -30,6 +30,7 @@ public function getAccessToken() {
 
         $signature = $param['signature'];
         unset($param['signature']);
+        unset($param['Access-Token']);
         $sign = $this->getAuthToken($appInfo['app_secret'], $param);
         $this->debug($sign);
         if ($sign !== $signature) {

app/middleware/ApiAuth.php

@@ -7,12 +7,13 @@
 use app\model\AdminList;
 use app\util\ReturnCode;
 use think\facade\Cache;
+use think\Request;
 
 class ApiAuth {
 
     /**
      * 获取接口基本配置参数，校验接口Hash是否合法，校验APP_ID是否合法等
-     * @param $request
+     * @param Request $request
      * @param \Closure $next
      * @return mixed|\think\response\Json
      * @throws \think\db\exception\DataNotFoundException
@@ -51,6 +52,14 @@ public function handle($request, \Closure $next) {
             }
 
             $accessToken = $request->header('Access-Token', '');
+            if (!$accessToken) {
+                if ($apiInfo['method'] == 2) {
+                    $accessToken = $request->get('Access-Token', '');
+                }
+                if ($apiInfo['method'] == 1) {
+                    $accessToken = $request->post('Access-Token', '');
+                }
+            }
             if (!$accessToken) {
                 return json([
                     'code' => ReturnCode::AUTH_ERROR,

app/middleware/RequestFilter.php

@@ -35,7 +35,7 @@ public function handle($request, \Closure $next) {
         }
 
         if ($newRule) {
-            $validate = Validate::make($newRule);
+            $validate = Validate::rule($newRule);
             if (!$validate->check($data)) {
                 return json(['code' => ReturnCode::PARAM_INVALID, 'msg' => $validate->getError(), 'data' => []]);
             }
@@ -50,7 +50,7 @@ public function handle($request, \Closure $next) {
      * @return array
      * @author zhaoxiang <zhaoxiang051405@gmail.com>
      */
-    public function buildValidateRule($rule = array()) {
+    public function buildValidateRule($rule = []) {
         $newRule = [];
         if ($rule) {
             foreach ($rule as $value) {

app/util/Strs.php

@@ -20,7 +20,7 @@ class Strs {
      * @return string
      */
     public static function uuid(): string {
-        $charId = md5(uniqid(mt_rand(), true));
+        $charId = md5(uniqid(strval(mt_rand()), true));
         $hyphen = chr(45);
         $uuid = chr(123)
             . substr($charId, 0, 8) . $hyphen

composer.json

@@ -23,7 +23,7 @@
         "php": ">=7.2.5",
         "topthink/framework": "^6.0",
         "topthink/think-orm": "^2.0",
-        "endroid/qrcode": "^3.9"
+        "topthink/think-migration": "^3.0"
     },
     "require-dev": {
         "symfony/var-dumper": "^4.2",