public_commit

app/JsonRpc/PublicRpcServiceInterface.php

@@ -0,0 +1,34 @@
+<?php
+
+namespace App\JsonRpc;
+interface PublicRpcServiceInterface
+{
+    /**
+     * @param array $data
+     */
+    public function getDistrictList(array $data): array;
+
+    /**
+     * @param array $data
+     * @return array
+     */
+    public function getUserLevelList(array $data): array;
+
+    /**
+     * @param array $data
+     * @return array
+     */
+    public function addUserLevel(array $data): array;
+
+
+    public function updateUserLevel(array $data): array;
+
+    /**
+     * @param int $id
+     * @return array
+     */
+    public function delUserLevel(array $data): array;
+
+
+
+}

app/JsonRpc/WebsiteServiceInterface.php

@@ -0,0 +1,48 @@
+<?php
+
+namespace App\JsonRpc;
+interface WebsiteServiceInterface
+{
+    /**
+     * @param array $data
+     */
+    public function getWebsitetList(string $keyword,int $page,int $pageSize): array;
+
+    /**
+     * @param array $data
+     * @return array
+     */
+    public function createWebsite(array $data): array;
+
+    /**
+     * @param array $data
+     * @return array
+     */
+    public function updateWebsite(int $id,array $data): array;
+
+    /**
+     * @param int $id
+     * @return array
+     */
+    public function delWebsite(int $id): array;
+
+    /**
+     * @param int $id
+     * @return array
+     */
+    public function getWebsiteInfo(int $id): array;
+
+    public function getWebsiteColumn(array $data): array;
+    public function getWebsiteColumnList(string $keyword,int $page,int $pageSize): array;
+    public function createWebsiteColumn(array $data): array;
+    public function updateWebsiteColumn(int $id,array $data): array;
+    public function getWebsiteRoleList(string $keyword,int $page,int $pageSize,int $websiteId): array;
+    public function createWebsiteRole(array $data): array;
+    public function updateWebsiteRole(int $id,array $data): array;
+    public function delWebsiteRole(int $id): array;
+    public function getWebsiteRoleUserList(string $keyword,int $page,int $pageSize,int $websiteId,int $roleId): array;
+    public function createWebsiteRoleUser(array $data): array;
+    public function updateWebsiteRoleUser(int $id,array $data): array;
+    public function delWebsiteRoleUser(int $id): array;
+
+}

runtime/hyperf.pid

@@ -1,5 +1 @@
-<<<<<<< HEAD
-141
-=======
-194
->>>>>>> 734053e (public_commit)
+395

vendor/composer/autoload_classmap.php

@@ -11,30 +11,20 @@ return array(
     'App\\Controller\\IndexController' => $baseDir . '/app/Controller/IndexController.php',
     'App\\Exception\\Handler\\AppExceptionHandler' => $baseDir . '/app/Exception/Handler/AppExceptionHandler.php',
     'App\\Exception\\Handler\\JsonRpcExceptionHandler' => $baseDir . '/app/Exception/Handler/JsonRpcExceptionHandler.php',
-<<<<<<< HEAD
-    'App\\JsonRpc\\NewsService' => $baseDir . '/app/JsonRpc/NewsService.php',
-    'App\\JsonRpc\\NewsServiceInterface' => $baseDir . '/app/JsonRpc/NewsServiceInterface.php',
-    'App\\Listener\\DbQueryExecutedListener' => $baseDir . '/app/Listener/DbQueryExecutedListener.php',
-    'App\\Listener\\ResumeExitCoordinatorListener' => $baseDir . '/app/Listener/ResumeExitCoordinatorListener.php',
-    '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\\JsonRpc\\DistrictService' => $baseDir . '/app/JsonRpc/DistrictService.php',
-    'App\\JsonRpc\\DistrictServiceInterface' => $baseDir . '/app/JsonRpc/DistrictServiceInterface.php',
     'App\\JsonRpc\\LinkService' => $baseDir . '/app/JsonRpc/LinkService.php',
     'App\\JsonRpc\\LinkServiceInterface' => $baseDir . '/app/JsonRpc/LinkServiceInterface.php',
+    'App\\JsonRpc\\NewsService' => $baseDir . '/app/JsonRpc/NewsService.php',
+    'App\\JsonRpc\\NewsServiceInterface' => $baseDir . '/app/JsonRpc/NewsServiceInterface.php',
     'App\\JsonRpc\\PublicRpcService' => $baseDir . '/app/JsonRpc/PublicRpcService.php',
     'App\\JsonRpc\\PublicRpcServiceInterface' => $baseDir . '/app/JsonRpc/PublicRpcServiceInterface.php',
     'App\\JsonRpc\\WebsiteService' => $baseDir . '/app/JsonRpc/WebsiteService.php',
     'App\\JsonRpc\\WebsiteServiceInterface' => $baseDir . '/app/JsonRpc/WebsiteServiceInterface.php',
     'App\\Listener\\DbQueryExecutedListener' => $baseDir . '/app/Listener/DbQueryExecutedListener.php',
     'App\\Listener\\ResumeExitCoordinatorListener' => $baseDir . '/app/Listener/ResumeExitCoordinatorListener.php',
-    'App\\Model\\District' => $baseDir . '/app/Model/District.php',
-    'App\\Model\\LevelUser' => $baseDir . '/app/Model/LevelUser.php',
+    '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\\Link' => $baseDir . '/app/Model/Link.php',
-    'App\\Model\\Menu' => $baseDir . '/app/Model/Menu.php',
->>>>>>> 734053e (public_commit)
     'App\\Model\\Model' => $baseDir . '/app/Model/Model.php',
     'App\\Tools\\Result' => $baseDir . '/app/Tools/Result.php',
     'Attribute' => $vendorDir . '/symfony/polyfill-php80/Resources/stubs/Attribute.php',

vendor/composer/autoload_static.php

@@ -695,30 +695,20 @@ class ComposerStaticInit88f2a4d4a4e81dc7d415bcdf39930654
         'App\\Controller\\IndexController' => __DIR__ . '/../..' . '/app/Controller/IndexController.php',
         'App\\Exception\\Handler\\AppExceptionHandler' => __DIR__ . '/../..' . '/app/Exception/Handler/AppExceptionHandler.php',
         'App\\Exception\\Handler\\JsonRpcExceptionHandler' => __DIR__ . '/../..' . '/app/Exception/Handler/JsonRpcExceptionHandler.php',
-<<<<<<< HEAD
-        'App\\JsonRpc\\NewsService' => __DIR__ . '/../..' . '/app/JsonRpc/NewsService.php',
-        'App\\JsonRpc\\NewsServiceInterface' => __DIR__ . '/../..' . '/app/JsonRpc/NewsServiceInterface.php',
-        'App\\Listener\\DbQueryExecutedListener' => __DIR__ . '/../..' . '/app/Listener/DbQueryExecutedListener.php',
-        'App\\Listener\\ResumeExitCoordinatorListener' => __DIR__ . '/../..' . '/app/Listener/ResumeExitCoordinatorListener.php',
-        '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\\JsonRpc\\DistrictService' => __DIR__ . '/../..' . '/app/JsonRpc/DistrictService.php',
-        'App\\JsonRpc\\DistrictServiceInterface' => __DIR__ . '/../..' . '/app/JsonRpc/DistrictServiceInterface.php',
         'App\\JsonRpc\\LinkService' => __DIR__ . '/../..' . '/app/JsonRpc/LinkService.php',
         'App\\JsonRpc\\LinkServiceInterface' => __DIR__ . '/../..' . '/app/JsonRpc/LinkServiceInterface.php',
+        'App\\JsonRpc\\NewsService' => __DIR__ . '/../..' . '/app/JsonRpc/NewsService.php',
+        'App\\JsonRpc\\NewsServiceInterface' => __DIR__ . '/../..' . '/app/JsonRpc/NewsServiceInterface.php',
         'App\\JsonRpc\\PublicRpcService' => __DIR__ . '/../..' . '/app/JsonRpc/PublicRpcService.php',
         'App\\JsonRpc\\PublicRpcServiceInterface' => __DIR__ . '/../..' . '/app/JsonRpc/PublicRpcServiceInterface.php',
         'App\\JsonRpc\\WebsiteService' => __DIR__ . '/../..' . '/app/JsonRpc/WebsiteService.php',
         'App\\JsonRpc\\WebsiteServiceInterface' => __DIR__ . '/../..' . '/app/JsonRpc/WebsiteServiceInterface.php',
         'App\\Listener\\DbQueryExecutedListener' => __DIR__ . '/../..' . '/app/Listener/DbQueryExecutedListener.php',
         'App\\Listener\\ResumeExitCoordinatorListener' => __DIR__ . '/../..' . '/app/Listener/ResumeExitCoordinatorListener.php',
-        'App\\Model\\District' => __DIR__ . '/../..' . '/app/Model/District.php',
-        'App\\Model\\LevelUser' => __DIR__ . '/../..' . '/app/Model/LevelUser.php',
+        '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\\Link' => __DIR__ . '/../..' . '/app/Model/Link.php',
-        'App\\Model\\Menu' => __DIR__ . '/../..' . '/app/Model/Menu.php',
->>>>>>> 734053e (public_commit)
         'App\\Model\\Model' => __DIR__ . '/../..' . '/app/Model/Model.php',
         'App\\Tools\\Result' => __DIR__ . '/../..' . '/app/Tools/Result.php',
         'Attribute' => __DIR__ . '/..' . '/symfony/polyfill-php80/Resources/stubs/Attribute.php',