Merge branch '0328_footcat_fr'

app/JsonRpc/FooterService.php

@@ -29,14 +29,13 @@ class FooterService implements FooterServiceInterface
         if(isset($data['name'])){
             array_push($where, ['footer_category.name','like','%'.$data['name'].'%']);
         }
-        $query = FooterCategory::query();
+        $query = FooterCategory::leftJoin("website", "website.id", "footer_category.website_id")
+        ->select("footer_category.*", "website.website_name", "website.id as website_id");
         if (!empty($where)) {
             $query->where($where);
         }
         $count = $query->count();
-        $rep = $query->leftJoin("website", "website.id", "footer_category.website_id")
-            ->select("footer_category.*", "website.website_name", "website.id as website_id")
-            ->offset(($data['page'] - 1) * $data['pageSize'])
+        $rep = $query->offset(($data['page'] - 1) * $data['pageSize'])
             ->limit($data['pageSize'])
             ->orderByDesc("updated_at")
             ->get();
@@ -218,6 +217,7 @@ class FooterService implements FooterServiceInterface
         $where = [];
         array_push($where, ['fcat_id',$data['fcat_id']]);
         $type = FooterCategory::where('id', $data['fcat_id'])->value('type');
+        // return Result::success($type);
         if($type == 1){
             if(isset($data['list_title'])){
                 array_push($where, ['list_title','like','%'.$data['list_title'].'%']);
@@ -225,11 +225,13 @@ class FooterService implements FooterServiceInterface
             if(isset($data['con_title'])){
                 array_push($where, ['con_title','like','%'.$data['con_title'].'%']);
             }
+            var_dump($where);
         }
-        $count = FooterContent::where($where)->count();
-        $rep = FooterContent::where($where)
-        ->leftJoin('footer_category','footer_category.id','fcat_id')
-        ->select('footer_content.*','footer_category.type')
+        // return Result::success($where);
+        $query = FooterContent:: leftJoin('footer_category','footer_category.id','fcat_id')
+        ->select('footer_content.*','footer_category.type');
+        $count = $query->where($where)->count();
+        $rep = $query->where($where)
         ->limit($data['pageSize'])
         ->offset(($data['page']-1)*$data['pageSize'])
         ->orderBy("updated_at","desc")

composer.lock

@@ -7646,16 +7646,16 @@
         },
         {
             "name": "hyperf/watcher",
-            "version": "v3.1.21",
+            "version": "v3.1.43",
             "source": {
                 "type": "git",
                 "url": "https://github.com/hyperf/watcher.git",
-                "reference": "e95490f91a95ec9c7f52255aba563f59fd9b396c"
+                "reference": "a5f41a66a8b8f651335b4a7c403e03ff0b0f4802"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/hyperf/watcher/zipball/e95490f91a95ec9c7f52255aba563f59fd9b396c",
-                "reference": "e95490f91a95ec9c7f52255aba563f59fd9b396c",
+                "url": "https://api.github.com/repos/hyperf/watcher/zipball/a5f41a66a8b8f651335b4a7c403e03ff0b0f4802",
+                "reference": "a5f41a66a8b8f651335b4a7c403e03ff0b0f4802",
                 "shasum": ""
             },
             "require": {
@@ -7669,11 +7669,11 @@
             },
             "type": "library",
             "extra": {
-                "branch-alias": {
-                    "dev-master": "3.1-dev"
-                },
                 "hyperf": {
                     "config": "Hyperf\\Watcher\\ConfigProvider"
+                },
+                "branch-alias": {
+                    "dev-master": "3.1-dev"
                 }
             },
             "autoload": {
@@ -7696,7 +7696,7 @@
             ],
             "support": {
                 "issues": "https://github.com/hyperf/watcher/issues",
-                "source": "https://github.com/hyperf/watcher/tree/v3.1.21"
+                "source": "https://github.com/hyperf/watcher/tree/v3.1.43"
             },
             "funding": [
                 {
@@ -7708,7 +7708,7 @@
                     "type": "open_collective"
                 }
             ],
-            "time": "2024-05-09T13:40:44+00:00"
+            "time": "2024-10-06T12:33:12+00:00"
         },
         {
             "name": "mockery/mockery",

runtime/hyperf.pid

@@ -1 +1 @@
-39007
+617

vendor/composer/autoload_classmap.php

@@ -49,6 +49,7 @@ return array(
     'App\\Model\\Article' => $baseDir . '/app/Model/Article.php',
     'App\\Model\\ArticleData' => $baseDir . '/app/Model/ArticleData.php',
     'App\\Model\\Category' => $baseDir . '/app/Model/Category.php',
+    'App\\Model\\Component' => $baseDir . '/app/Model/Component.php',
     'App\\Model\\Department' => $baseDir . '/app/Model/Department.php',
     'App\\Model\\District' => $baseDir . '/app/Model/District.php',
     'App\\Model\\FooterCategory' => $baseDir . '/app/Model/FooterCategory.php',
@@ -57,6 +58,7 @@ return array(
     'App\\Model\\LetterType' => $baseDir . '/app/Model/LetterType.php',
     'App\\Model\\Link' => $baseDir . '/app/Model/Link.php',
     'App\\Model\\Model' => $baseDir . '/app/Model/Model.php',
+    'App\\Model\\Sector' => $baseDir . '/app/Model/Sector.php',
     'App\\Model\\Template' => $baseDir . '/app/Model/Template.php',
     'App\\Model\\TemplateClass' => $baseDir . '/app/Model/TemplateClass.php',
     'App\\Model\\User' => $baseDir . '/app/Model/User.php',
@@ -67,6 +69,7 @@ return array(
     'App\\Model\\WebsiteGroup' => $baseDir . '/app/Model/WebsiteGroup.php',
     'App\\Model\\WebsiteRole' => $baseDir . '/app/Model/WebsiteRole.php',
     'App\\Model\\WebsiteRoleUser' => $baseDir . '/app/Model/WebsiteRoleUser.php',
+    'App\\Model\\WebsiteTemplate' => $baseDir . '/app/Model/WebsiteTemplate.php',
     'App\\Model\\WebsiteTemplateInfo' => $baseDir . '/app/Model/WebsiteTemplateInfo.php',
     'App\\Service\\MinioService' => $baseDir . '/app/Service/MinioService.php',
     'App\\Tools\\Result' => $baseDir . '/app/Tools/Result.php',
@@ -2679,6 +2682,8 @@ return array(
     'Hyperf\\Watcher\\Driver\\FindNewerDriver' => $vendorDir . '/hyperf/watcher/src/Driver/FindNewerDriver.php',
     'Hyperf\\Watcher\\Driver\\FswatchDriver' => $vendorDir . '/hyperf/watcher/src/Driver/FswatchDriver.php',
     'Hyperf\\Watcher\\Driver\\ScanFileDriver' => $vendorDir . '/hyperf/watcher/src/Driver/ScanFileDriver.php',
+    'Hyperf\\Watcher\\Event\\BeforeServerRestart' => $vendorDir . '/hyperf/watcher/src/Event/BeforeServerRestart.php',
+    'Hyperf\\Watcher\\Listener\\ReloadDotenvListener' => $vendorDir . '/hyperf/watcher/src/Listener/ReloadDotenvListener.php',
     'Hyperf\\Watcher\\Option' => $vendorDir . '/hyperf/watcher/src/Option.php',
     'Hyperf\\Watcher\\Process' => $vendorDir . '/hyperf/watcher/src/Process.php',
     'Hyperf\\Watcher\\Watcher' => $vendorDir . '/hyperf/watcher/src/Watcher.php',
@@ -3133,6 +3138,9 @@ return array(
     'Monolog\\Utils' => $vendorDir . '/monolog/monolog/src/Monolog/Utils.php',
     'Normalizer' => $vendorDir . '/symfony/polyfill-intl-normalizer/Resources/stubs/Normalizer.php',
     'Override' => $vendorDir . '/symfony/polyfill-php83/Resources/stubs/Override.php',
+    'Overtrue\\Pinyin\\Collection' => $vendorDir . '/overtrue/pinyin/src/Collection.php',
+    'Overtrue\\Pinyin\\Converter' => $vendorDir . '/overtrue/pinyin/src/Converter.php',
+    'Overtrue\\Pinyin\\Pinyin' => $vendorDir . '/overtrue/pinyin/src/Pinyin.php',
     'PHPUnit\\Event\\Application\\Finished' => $vendorDir . '/phpunit/phpunit/src/Event/Events/Application/Finished.php',
     'PHPUnit\\Event\\Application\\FinishedSubscriber' => $vendorDir . '/phpunit/phpunit/src/Event/Events/Application/FinishedSubscriber.php',
     'PHPUnit\\Event\\Application\\Started' => $vendorDir . '/phpunit/phpunit/src/Event/Events/Application/Started.php',

vendor/composer/autoload_static.php

@@ -4,7 +4,7 @@
 
 namespace Composer\Autoload;
 
-class ComposerStaticInita4fab8fe7069cf132d8088fb346f5c2a
+class ComposerStaticInit6fc437c88f7dd6b81abfce2f28c92f05
 {
     public static $files = array (
         '9c7a683baffd24f5595c1dc5f5273030' => __DIR__ . '/..' . '/hyperf/engine/src/Functions.php',
@@ -90,6 +90,10 @@ class ComposerStaticInita4fab8fe7069cf132d8088fb346f5c2a
             'PhpDocReader\\' => 13,
             'PhpCsFixer\\' => 11,
         ),
+        'O' => 
+        array (
+            'Overtrue\\Pinyin\\' => 16,
+        ),
         'M' => 
         array (
             'Monolog\\' => 8,
@@ -328,8 +332,8 @@ class ComposerStaticInita4fab8fe7069cf132d8088fb346f5c2a
         ),
         'Psr\\Http\\Server\\' => 
         array (
-            0 => __DIR__ . '/..' . '/psr/http-server-handler/src',
-            1 => __DIR__ . '/..' . '/psr/http-server-middleware/src',
+            0 => __DIR__ . '/..' . '/psr/http-server-middleware/src',
+            1 => __DIR__ . '/..' . '/psr/http-server-handler/src',
         ),
         'Psr\\Http\\Message\\' => 
         array (
@@ -372,6 +376,10 @@ class ComposerStaticInita4fab8fe7069cf132d8088fb346f5c2a
         array (
             0 => __DIR__ . '/..' . '/friendsofphp/php-cs-fixer/src',
         ),
+        'Overtrue\\Pinyin\\' => 
+        array (
+            0 => __DIR__ . '/..' . '/overtrue/pinyin/src',
+        ),
         'Monolog\\' => 
         array (
             0 => __DIR__ . '/..' . '/monolog/monolog/src/Monolog',
@@ -750,6 +758,7 @@ class ComposerStaticInita4fab8fe7069cf132d8088fb346f5c2a
         'App\\Model\\Article' => __DIR__ . '/../..' . '/app/Model/Article.php',
         'App\\Model\\ArticleData' => __DIR__ . '/../..' . '/app/Model/ArticleData.php',
         'App\\Model\\Category' => __DIR__ . '/../..' . '/app/Model/Category.php',
+        'App\\Model\\Component' => __DIR__ . '/../..' . '/app/Model/Component.php',
         'App\\Model\\Department' => __DIR__ . '/../..' . '/app/Model/Department.php',
         'App\\Model\\District' => __DIR__ . '/../..' . '/app/Model/District.php',
         'App\\Model\\FooterCategory' => __DIR__ . '/../..' . '/app/Model/FooterCategory.php',
@@ -758,6 +767,7 @@ class ComposerStaticInita4fab8fe7069cf132d8088fb346f5c2a
         'App\\Model\\LetterType' => __DIR__ . '/../..' . '/app/Model/LetterType.php',
         'App\\Model\\Link' => __DIR__ . '/../..' . '/app/Model/Link.php',
         'App\\Model\\Model' => __DIR__ . '/../..' . '/app/Model/Model.php',
+        'App\\Model\\Sector' => __DIR__ . '/../..' . '/app/Model/Sector.php',
         'App\\Model\\Template' => __DIR__ . '/../..' . '/app/Model/Template.php',
         'App\\Model\\TemplateClass' => __DIR__ . '/../..' . '/app/Model/TemplateClass.php',
         'App\\Model\\User' => __DIR__ . '/../..' . '/app/Model/User.php',
@@ -768,6 +778,7 @@ class ComposerStaticInita4fab8fe7069cf132d8088fb346f5c2a
         'App\\Model\\WebsiteGroup' => __DIR__ . '/../..' . '/app/Model/WebsiteGroup.php',
         'App\\Model\\WebsiteRole' => __DIR__ . '/../..' . '/app/Model/WebsiteRole.php',
         'App\\Model\\WebsiteRoleUser' => __DIR__ . '/../..' . '/app/Model/WebsiteRoleUser.php',
+        'App\\Model\\WebsiteTemplate' => __DIR__ . '/../..' . '/app/Model/WebsiteTemplate.php',
         'App\\Model\\WebsiteTemplateInfo' => __DIR__ . '/../..' . '/app/Model/WebsiteTemplateInfo.php',
         'App\\Service\\MinioService' => __DIR__ . '/../..' . '/app/Service/MinioService.php',
         'App\\Tools\\Result' => __DIR__ . '/../..' . '/app/Tools/Result.php',
@@ -3380,6 +3391,8 @@ class ComposerStaticInita4fab8fe7069cf132d8088fb346f5c2a
         'Hyperf\\Watcher\\Driver\\FindNewerDriver' => __DIR__ . '/..' . '/hyperf/watcher/src/Driver/FindNewerDriver.php',
         'Hyperf\\Watcher\\Driver\\FswatchDriver' => __DIR__ . '/..' . '/hyperf/watcher/src/Driver/FswatchDriver.php',
         'Hyperf\\Watcher\\Driver\\ScanFileDriver' => __DIR__ . '/..' . '/hyperf/watcher/src/Driver/ScanFileDriver.php',
+        'Hyperf\\Watcher\\Event\\BeforeServerRestart' => __DIR__ . '/..' . '/hyperf/watcher/src/Event/BeforeServerRestart.php',
+        'Hyperf\\Watcher\\Listener\\ReloadDotenvListener' => __DIR__ . '/..' . '/hyperf/watcher/src/Listener/ReloadDotenvListener.php',
         'Hyperf\\Watcher\\Option' => __DIR__ . '/..' . '/hyperf/watcher/src/Option.php',
         'Hyperf\\Watcher\\Process' => __DIR__ . '/..' . '/hyperf/watcher/src/Process.php',
         'Hyperf\\Watcher\\Watcher' => __DIR__ . '/..' . '/hyperf/watcher/src/Watcher.php',
@@ -3834,6 +3847,9 @@ class ComposerStaticInita4fab8fe7069cf132d8088fb346f5c2a
         'Monolog\\Utils' => __DIR__ . '/..' . '/monolog/monolog/src/Monolog/Utils.php',
         'Normalizer' => __DIR__ . '/..' . '/symfony/polyfill-intl-normalizer/Resources/stubs/Normalizer.php',
         'Override' => __DIR__ . '/..' . '/symfony/polyfill-php83/Resources/stubs/Override.php',
+        'Overtrue\\Pinyin\\Collection' => __DIR__ . '/..' . '/overtrue/pinyin/src/Collection.php',
+        'Overtrue\\Pinyin\\Converter' => __DIR__ . '/..' . '/overtrue/pinyin/src/Converter.php',
+        'Overtrue\\Pinyin\\Pinyin' => __DIR__ . '/..' . '/overtrue/pinyin/src/Pinyin.php',
         'PHPUnit\\Event\\Application\\Finished' => __DIR__ . '/..' . '/phpunit/phpunit/src/Event/Events/Application/Finished.php',
         'PHPUnit\\Event\\Application\\FinishedSubscriber' => __DIR__ . '/..' . '/phpunit/phpunit/src/Event/Events/Application/FinishedSubscriber.php',
         'PHPUnit\\Event\\Application\\Started' => __DIR__ . '/..' . '/phpunit/phpunit/src/Event/Events/Application/Started.php',
@@ -6396,9 +6412,9 @@ class ComposerStaticInita4fab8fe7069cf132d8088fb346f5c2a
     public static function getInitializer(ClassLoader $loader)
     {
         return \Closure::bind(function () use ($loader) {
-            $loader->prefixLengthsPsr4 = ComposerStaticInita4fab8fe7069cf132d8088fb346f5c2a::$prefixLengthsPsr4;
-            $loader->prefixDirsPsr4 = ComposerStaticInita4fab8fe7069cf132d8088fb346f5c2a::$prefixDirsPsr4;
-            $loader->classMap = ComposerStaticInita4fab8fe7069cf132d8088fb346f5c2a::$classMap;
+            $loader->prefixLengthsPsr4 = ComposerStaticInit6fc437c88f7dd6b81abfce2f28c92f05::$prefixLengthsPsr4;
+            $loader->prefixDirsPsr4 = ComposerStaticInit6fc437c88f7dd6b81abfce2f28c92f05::$prefixDirsPsr4;
+            $loader->classMap = ComposerStaticInit6fc437c88f7dd6b81abfce2f28c92f05::$classMap;
 
         }, null, ClassLoader::class);
     }