Merge branch 'zzd'

# Conflicts:
#	resources/js/queryForm/queryForm.js

app/Http/Kernel.php

@@ -43,9 +43,7 @@ class Kernel extends HttpKernel
         ],
 
         'api' => [
-            LogPostRequest::class,
-//            'throttle:60,1',
-            'bindings',
+            //'bindings', //隐性转换参数为数据库模型 先在API中去除此中间件
         ],
         'apiLocal' => [
             LogPostRequest::class,

app/Providers/RouteServiceProvider.php

@@ -16,6 +16,11 @@ class RouteServiceProvider extends ServiceProvider
      */
     protected $namespace = 'App\Http\Controllers';
 
+    /**
+     * @var string
+     */
+    protected $apinamespace = 'App\Http\ApiControllers';
+
     /**
      * Define your route model bindings, pattern filters, etc.
      *
@@ -69,7 +74,7 @@ class RouteServiceProvider extends ServiceProvider
     {
         Route::prefix('api')
              ->middleware('api')
-             ->namespace($this->namespace)
+             ->namespace($this->apinamespace)
              ->group(base_path('routes/api.php'));
         Route::prefix('apiLocal')
              ->middleware('apiLocal')

config/api.php

@@ -68,4 +68,11 @@ return [
     https://wcs.baoshi56.com/api/thirdPart/haochuang/sorting/process
     https://wcs.baoshi56.com/api/thirdPart/haochuang/sorting/done
      **/
+
+    'rate_limits' => [
+        // 访问频率限制，次数/分钟
+        'access' =>  env('RATE_LIMITS', '60,1'),
+        // 登录相关，次数/分钟
+        'sign' =>  env('SIGN_RATE_LIMITS', '10,1'),
+    ],
 ];

resources/js/queryForm/queryForm.js

@@ -116,6 +116,11 @@ const query = function getQueryForm(data) {
        _parentNode.addClass('header-float');
        _parentNode.css('top',0);
        _parentNode.zIndex(95);
+        let dom = _this.appendDom ? $("#" + _this.appendDom + "") : null;
+        if (!dom)return;
+        dom.css('top', _parentNode.offset().top);
+        dom.css('background', 'rgb(255, 255, 255)');
+        dom.css('position', 'fixed');
     }
 
     // form fixed