!2 修改获取userID

Merge pull request !2 from rkljw/dev

.gitignore

@@ -9,6 +9,7 @@ bin-release/
 public
 vendor
 runtime
+runtime/*
 # Executables
 *.swf
 *.air

app/Controller/AbstractController.php

@@ -17,9 +17,7 @@ use Hyperf\HttpServer\Contract\RequestInterface;
 use Hyperf\HttpServer\Contract\ResponseInterface;
 use Phper666\JWTAuth\JWT;
 use Psr\Container\ContainerInterface;
-use Hyperf\Logger\LoggerFactory;
 use Psr\Log\LoggerInterface;
-use http\Client\Request;
 
 abstract class AbstractController
 {
@@ -36,23 +34,4 @@ abstract class AbstractController
     protected JWT $jwt;
     protected LoggerInterface $logger;
 
-    protected $UserId;
-
-    protected $websiteId;
-
-
-    public function __construct(LoggerFactory $loggerFactory)
-    {
-        // 第一个参数对应日志的 name, 第二个参数对应 config/autoload/logger.php 内的 key
-        $this->logger = $loggerFactory->get('admin_consumer:', 'default');
-        $headers = $this->request->getHeaders();
-//        var_dump("ceshi:",$headers);
-        if($headers &&  isset($headers['token']) && $headers['token'][0]!='null' && isset($headers['token'][0]) && $headers['token'][0]!=''){
-            $userInfo = $this->jwt->getClaimsByToken($headers['token'][0]);
-            var_dump("用户信息：",$userInfo);
-            $this->UserId = $userInfo['uid'];
-            $this->websiteId = $userInfo['website_id']??0;
-        }
-
-    }
 }

app/Controller/AdController.php

@@ -12,6 +12,7 @@ use App\Tools\Result;
 use App\Constants\ErrorCode;
 use Hyperf\Logger;
 use Hyperf\Validation\Contract\ValidatorFactoryInterface;
+use Hyperf\Context\Context;
 
 /**
  * Class AdController

app/Controller/AuthorityController.php

@@ -11,6 +11,7 @@ use Hyperf\HttpServer\Annotation\AutoController;
 use App\Tools\Result;
 use App\Constants\ErrorCode;
 use Hyperf\Validation\Contract\ValidatorFactoryInterface;
+use Hyperf\Context\Context;
 /**
  * Class AuthorityController
  * @package App\Controller
@@ -161,7 +162,7 @@ class AuthorityController extends AbstractController
         $origin =  $header['origin'][0];
         $logindevice = explode("//", $origin);
         $reqData = [
-            'user_id' => $this->UserId,
+            'user_id' =>Context::get("UserId"),
             'logindevice' => $logindevice[1]
         ];
         $result =  $this->authorityServiceClient->getRecursionMenu($reqData);

app/Controller/ChatController.php

@@ -15,6 +15,7 @@ use App\Amqp\Producer;
 use Hyperf\Snowflake\IdGeneratorInterface;
 use PHPStan\Type\Accessory\OversizedArrayType;
 use function Hyperf\Support\env;
+use Hyperf\Context\Context;
 
 /**
  *
@@ -52,7 +53,7 @@ class ChatController extends AbstractController
             $errorMessage = $validator->errors()->first();
             return Result::error($errorMessage);
         }
-        $requireData['user_id'] = $this->UserId;
+        $requireData['user_id'] =Context::get("UserId");
         $result = $this->chatServiceClient->addContactApply($requireData);
         return $result?Result::success($result['data']):Result::error($result['message']);
     }
@@ -64,7 +65,7 @@ class ChatController extends AbstractController
     public function getContactApplyList()
     {
         $requireData = [];
-        $requireData['user_id'] = $this->UserId;
+        $requireData['user_id'] =Context::get("UserId");
         $result = $this->chatServiceClient->getContactApplyList($requireData);
         return $result?Result::success($result['data']):Result::error($result['message']);
     }
@@ -92,7 +93,7 @@ class ChatController extends AbstractController
             $errorMessage = $validator->errors()->first();
             return Result::error($errorMessage);
         }
-        $requireData['user_id'] = $this->UserId;
+        $requireData['user_id'] =Context::get("UserId");
         //type==1 同意 type==2 拒绝
         $result = $this->chatServiceClient->updateContactApply($requireData);
         if($requireData['type']==1){
@@ -121,7 +122,7 @@ class ChatController extends AbstractController
             $errorMessage = $validator->errors()->first();
             return Result::error($errorMessage);
         }
-        $requireData['user_id'] = $this->UserId;
+        $requireData['user_id'] =Context::get("UserId");
         $result = $this->chatServiceClient->delContact($requireData);
         return $result?Result::success($result['data']):Result::error($result['message']);
     }
@@ -133,7 +134,7 @@ class ChatController extends AbstractController
     public function getContactList()
     {
         $requireData = $this->request->all();
-        $requireData['user_id'] = $this->UserId;
+        $requireData['user_id'] =Context::get("UserId");
         $requireData['keyWord'] = $this->request->input('keyWord','');
         $result = $this->chatServiceClient->getContactList($requireData);
         return $result?Result::success($result['data']):Result::error($result['message']);
@@ -146,7 +147,7 @@ class ChatController extends AbstractController
       public function getTalkSessionList()
       {
           $requireData = $this->request->all();
-          $requireData['user_id'] = $this->UserId;
+          $requireData['user_id'] =Context::get("UserId");
           var_dump("会话列表：",$requireData);
           $result = $this->chatServiceClient->getTalkSessionList($requireData);
           var_dump($result);
@@ -180,10 +181,10 @@ class ChatController extends AbstractController
               $errorMessage = $validator->errors()->first();
               return Result::error($errorMessage);
           }
-          $requireData['user_id'] = $this->UserId;
+          $requireData['user_id'] =Context::get("UserId");
           $userIdArr = array(json_decode($requireData['user_id_arr']));
           $requireData['user_id_arr'] = $userIdArr[0];
-          $requireData['user_id_arr'][] = $this->UserId;
+          $requireData['user_id_arr'][] =Context::get("UserId");
           var_dump($requireData);
           $result = $this->chatServiceClient->addTalkGroup($requireData);
           return $result['code']==200?Result::success($result['data']):Result::error($result['message']);
@@ -243,7 +244,7 @@ class ChatController extends AbstractController
               $errorMessage = $validator->errors()->first();
               return Result::error($errorMessage);
           }
-          $requireData['user_id'] = $this->UserId;
+          $requireData['user_id'] =Context::get("UserId");
           $result = $this->chatServiceClient->addTalkRecords($requireData);
           return $result['code']==200?Result::success($result['data']):Result::error($result['message']);
       }

app/Controller/LinkController.php

@@ -8,6 +8,7 @@ use App\JsonRpc\LinkServiceInterface;
 use Hyperf\Di\Annotation\Inject;
 use Hyperf\HttpServer\Annotation\AutoController;
 use App\Tools\Result;
+use Hyperf\Context\Context;
 
 use Hyperf\Logger;
 use Hyperf\Validation\Contract\ValidatorFactoryInterface;

app/Controller/LoginController.php

@@ -10,6 +10,7 @@ use App\JsonRpc\UserServiceInterface;
 use App\Tools\CommonService;
 use function Hyperf\Support\env;
 use App\Tools\PublicData;
+use Hyperf\Context\Context;
 /**
  * @AutoController()
  */

app/Controller/NewsController.php

@@ -8,7 +8,7 @@ use Hyperf\Di\Annotation\Inject;
 use Hyperf\HttpServer\Annotation\AutoController;
 use App\Tools\Result;
 use Hyperf\Validation\Contract\ValidatorFactoryInterface;
-
+use Hyperf\Context\Context;
 /**
  * Class NewsController
  * @package App\Controller
@@ -227,7 +227,7 @@ class NewsController extends AbstractController
         $loginIp = $this->request->getHeader('x-forwarded-for')[0] ?? $this->request->getHeader('x-real-ip')[0] ?? $this->request->getServerParams()['remote_addr'] ?? '0.0.0.0';
         $requireData['ip'] = $loginIp;
         $requireData['website_id'] = $this->websiteId;
-        $requireData['admin_user_id'] = $this->UserId;
+        $requireData['admin_user_id'] =Context::get("UserId");
         $result = $this->newsServiceClient->addArticle($requireData);
 
         return $result ? Result::success($result['data']) : Result::error($result['message']);

app/Controller/PublicController.php

@@ -9,16 +9,17 @@ use App\Tools\Result;
 use App\Tools\CommonService;
 use Hyperf\Validation\Contract\ValidatorFactoryInterface;
 use App\Tools\PublicData;
-use Hyperf\HttpServer\Annotation\RequestMapping;
 use Hyperf\HttpServer\Contract\RequestInterface;
 use Hyperf\HttpServer\Contract\ResponseInterface;
 use ZipArchive;
 use function Hyperf\Support\env;
+use Hyperf\Context\Context;
 /**
  * Class PublicController
  * @package App\Controller
  */
 //#[AutoController]
+
 class PublicController extends AbstractController
 {
     #[Inject]
@@ -195,7 +196,7 @@ class PublicController extends AbstractController
             return Result::error($errorMessage);
         }
         $requireData = $this->request->all();
-        $requireData['user_id'] = $this->UserId;
+        $requireData['user_id'] =Context::get("UserId");
         if($requireData['id']){
             $result = $this->publicServiceClient->userUpLetterOfComplaint($requireData);
         }else{
@@ -227,7 +228,7 @@ class PublicController extends AbstractController
         }
         var_dump($requireData);
         if(isset($requireData['is_admin']) && !empty($requireData['is_admin'])){
-            $requireData['admin_id'] = $this->UserId;
+            $requireData['admin_id'] =Context::get("UserId");
         }
         $result = $this->publicServiceClient->upLetterOfComplaint($requireData);
         return $result ? Result::success([]) : Result::error($result['message']);
@@ -238,9 +239,10 @@ class PublicController extends AbstractController
      */
     public function getComplaint()
     {
+
         $requireData = $this->request->all();
-        $requireData['user_id'] = $this->UserId;
-        var_dump("用户id：",$this->UserId);
+        $requireData['user_id'] = Context::get("UserId");
+        var_dump("用户id：",Context::get("UserId"));
         if(isset($requireData['is_admin']) && !empty($requireData['is_admin'])){
             unset( $requireData['user_id']);
         }
@@ -255,7 +257,7 @@ class PublicController extends AbstractController
     public function getLetterOfComplaintInfo()
     {
         $requireData = $this->request->all();
-        $requireData['user_id'] = $this->UserId;
+        $requireData['user_id'] =Context::get("UserId");
         if(isset($requireData['is_admin']) && !empty($requireData['is_admin'])){
             unset( $requireData['user_id']);
         }
@@ -276,7 +278,7 @@ class PublicController extends AbstractController
     public function delLetterOfComplaint()
     {
         $requireData = $this->request->all();
-        $requireData['user_id'] = $this->UserId;
+        $requireData['user_id'] =Context::get("UserId");
         if(isset($requireData['is_admin']) && !empty($requireData['is_admin'])){
             unset( $requireData['user_id']);
         }
@@ -370,7 +372,7 @@ class PublicController extends AbstractController
             $errorMessage = $validator->errors()->first();
             return Result::error($errorMessage);
         }
-        $requireData['user_id'] = $this->UserId;
+        $requireData['user_id'] =Context::get("UserId");
         $result = $this->publicServiceClient->checkMeasure($requireData);
         return $result['code']==200 ? Result::success() : Result::error("已经处理了");
     }

app/Controller/UserController.php

@@ -10,6 +10,7 @@ use Hyperf\HttpServer\Annotation\AutoController;
 use App\Tools\Result;
 use App\Constants\ErrorCode;
 use Hyperf\Validation\Contract\ValidatorFactoryInterface;
+use Hyperf\Context\Context;
 /**
  * Class UserController
  * @package App\Controller
@@ -213,7 +214,7 @@ class UserController extends AbstractController
             $errorMessage = $validator->errors()->first();
             return Result::error($errorMessage);
         }
-        $requireData['user_id'] = $this->UserId;
+        $requireData['user_id'] =Context::get("UserId");
         $result =  $this->userServiceClient->addRole($requireData);
         if ($result['code'] != ErrorCode::SUCCESS) {
             return Result::error($result['message'],0,[]);
@@ -241,7 +242,7 @@ class UserController extends AbstractController
             $errorMessage = $validator->errors()->first();
             return Result::error($errorMessage);
         }
-        $requireData['user_id'] = $this->UserId;
+        $requireData['user_id'] =Context::get("UserId");
         $result =  $this->userServiceClient->delRole($requireData);
         if ($result['code'] != ErrorCode::SUCCESS) {
             return Result::error($result['message'],0,[]);
@@ -271,7 +272,7 @@ class UserController extends AbstractController
             $errorMessage = $validator->errors()->first();
             return Result::error($errorMessage);
         }
-        $requireData['user_id'] = $this->UserId;
+        $requireData['user_id'] =Context::get("UserId");
         $requireData['rule'] = $requireData['rule']?json_encode($requireData['rule']):[];
         $result =  $this->userServiceClient->updateRole($requireData);
         if ($result['code'] != ErrorCode::SUCCESS) {

app/Controller/WebController.php

@@ -10,6 +10,7 @@ use Hyperf\HttpServer\Annotation\AutoController;
 use App\Tools\Result;
 use Hyperf\Validation\Contract\ValidatorFactoryInterface;
 use App\Constants\ErrorCode;
+use Hyperf\Context\Context;
 /**
  * Class WebController
  * @package App\Controller
@@ -43,6 +44,7 @@ class WebController extends AbstractController
      */
     public function getWebsiteCategory()
     {
+//        var_dump("网站id：",$this->siteId);
         $data = [
             'website_id'=>$this->siteId
         ];
@@ -59,7 +61,7 @@ class WebController extends AbstractController
     public function getWebsiteId()
     {
         $header = $this->request->getHeaders();
-        var_dump("获取header：",$header);
+//        var_dump("获取header：",$header);
         if(!isset($header['origin'])){
             return Result::error("header请配置origin");
         }

app/Controller/WebsiteController.php

@@ -8,7 +8,7 @@ use Hyperf\Di\Annotation\Inject;
 use Hyperf\HttpServer\Annotation\AutoController;
 use App\Tools\Result;
 use Hyperf\Validation\Contract\ValidatorFactoryInterface;
-
+use Hyperf\Context\Context;
 /**
  * Class WebsiteController
  * @package App\Controller
@@ -146,7 +146,21 @@ class WebsiteController extends AbstractController
      */
     public function delWebsite()
     {
-        $id = (int)$this->request->input("id",'');
+        $requireData = $this->request->all();
+        $validator = $this->validationFactory->make(
+            $requireData,
+            [
+                'id' => 'required',
+            ],
+            [
+                'id.required' => 'id不能为空',
+            ]
+        );
+        if ($validator->fails()){
+            $errorMessage = $validator->errors()->first();
+            return Result::error($errorMessage);
+        }
+        $id = (int)$requireData['id'];
         $result = $this->websiteServiceClient->delWebsite($id);
         return $result['code']==200?Result::success($result['data']):Result::error($result['message']);
     }
@@ -324,7 +338,7 @@ class WebsiteController extends AbstractController
             $errorMessage = $validator->errors()->first();
             return Result::error($errorMessage);
         }
-        $requireData['admin_user_id']  = $this->UserId;
+        $requireData['admin_user_id']  =Context::get("UserId");
         $result = $this->websiteServiceClient->createWebsiteRole($requireData);
         return $result['code']!=0?Result::success($result['data']):Result::error($result['message']);
     }
@@ -396,7 +410,7 @@ class WebsiteController extends AbstractController
             $errorMessage = $validator->errors()->first();
             return Result::error($errorMessage);
         }
-        $requireData['admin_user_id']  = $this->UserId;
+        $requireData['admin_user_id']  =Context::get("UserId");
         $requireData['role_id']  = (int)$requireData['role_id'];
         $requireData['type']  = (int)$requireData['type'];
         $requireData['website_id']  =(int)$requireData['website_id'];
@@ -424,8 +438,245 @@ class WebsiteController extends AbstractController
         return [];
     }
 
+    /**
+     * 管理后台首页统计
+     * @return array
+     */
     public function getAdminIndex()
     {
         return [];
     }
+
+    /**
+     * 获取模板皮肤分类
+     * @return void
+     */
+    public function getTemplateClass()
+    {
+        $result = $this->websiteServiceClient->getTemplateClass([]);
+        return $result['code']==200?Result::success($result['data']):Result::error($result['message']);
+    }
+
+    /**
+     * 添加模板分类
+     * @return void
+     */
+    public function addTemplateClass()
+    {
+        $requireData = $this->request->all();
+        $validator = $this->validationFactory->make(
+            $requireData,
+            [
+                'name' => 'required'
+            ],
+            [
+                'name.required' => '模板类型不能为空'
+            ]
+        );
+        if ($validator->fails()){
+            $errorMessage = $validator->errors()->first();
+            return Result::error($errorMessage);
+        }
+        $data = [
+            'name' => $requireData['name'],
+            'sort' => $requireData['sort']??0,
+        ];
+        $result = $this->websiteServiceClient->addTemplateClass($data);
+        return $result['code']==200?Result::success($result['data']):Result::error($result['message']);
+    }
+
+    /**
+     * 更新模板分类
+     * @return array
+     */
+    public function upTemplateClass()
+    {
+        $requireData = $this->request->all();
+        $validator = $this->validationFactory->make(
+            $requireData,
+            [
+                'name' => 'required',
+                'id'=> 'required',
+            ],
+            [
+                'name.required' => '模板类型不能为空',
+                'name.id' => '模板类型ID不能为空'
+            ]
+        );
+        if ($validator->fails()){
+            $errorMessage = $validator->errors()->first();
+            return Result::error($errorMessage);
+        }
+        $data = [
+            'id'=> $requireData['id'],
+            'name' => $requireData['name'],
+            'sort' => $requireData['sort']??0,
+        ];
+        $result = $this->websiteServiceClient->upTemplateClass($data);
+        return $result['code']==200?Result::success($result['data']):Result::error($result['message']);
+    }
+
+    /**
+     * 删除模板分类
+     * @return array
+     */
+    public function delTemplateClass()
+    {
+        $requireData = $this->request->all();
+        $validator = $this->validationFactory->make(
+            $requireData,
+            [
+                'id' => 'required'
+            ],
+            [
+                'name.required' => '类型id不能为空'
+            ]
+        );
+        if ($validator->fails()){
+            $errorMessage = $validator->errors()->first();
+            return Result::error($errorMessage);
+        }
+        $data = [
+            'id' => $requireData['id']
+        ];
+        $result = $this->websiteServiceClient->delTemplateClass($data);
+        return $result['code']==200?Result::success($result['data']):Result::error($result['message']);
+    }
+
+    /**
+     * 获取分类下的模板
+     * @return array
+     */
+    public function getTemplate()
+    {
+        $requireData = $this->request->all();
+        $validator = $this->validationFactory->make(
+            $requireData,
+            [
+                'template_class_id' => 'required',
+                'page' => 'required',
+                'pageSize' => 'required',
+
+            ],
+            [
+                'template_class_id.required' => '类型template_class_id不能为空',
+                'page.required' => 'page不能为空',
+                'pageSize.required' => '每页显示条数不能为空',
+            ]
+        );
+        if ($validator->fails()){
+            $errorMessage = $validator->errors()->first();
+            return Result::error($errorMessage);
+        }
+        $data = [
+            'template_class_id' => $requireData['template_class_id'],
+            'page' =>  $requireData['page'],
+            'pageSize' =>  $requireData['pageSize'],
+        ];
+        $result = $this->websiteServiceClient->getTemplate($data);
+        return $result['code']==200?Result::success($result['data']):Result::error($result['message']);
+    }
+
+    /**
+     * 创建皮肤模板
+     * @return array
+     */
+    public function addTemplate()
+    {
+        $requireData = $this->request->all();
+//        var_dump("FCK:",$requireData);
+        $validator = $this->validationFactory->make(
+            $requireData,
+            [
+                'template_name' => 'required',
+                'template_class_id' => 'required',
+                'template_img' => 'required'
+            ],
+            [
+                'template_name.required' => '模板名称不能为空',
+                'template_class_id.required' => '模板类型id不能为空',
+                'template_img.required' => '模板图片不能为空',
+            ]
+        );
+        if ($validator->fails()){
+            $errorMessage = $validator->errors()->first();
+            return Result::error($errorMessage);
+        }
+//        var_dump($requireData);
+        $data = [
+            'template_name' => $requireData['template_name'],
+            'template_class_id' => $requireData['template_class_id'],
+            'template_img' => $requireData['template_img'],
+        ];
+        $result = $this->websiteServiceClient->addTemplate($data);
+        return $result['code']==200?Result::success($result['data']):Result::error($result['message']);
+    }
+
+    /**
+     * 更新模板
+     * @return array
+     */
+    public function upTemplate()
+    {
+        $requireData = $this->request->all();
+        $validator = $this->validationFactory->make(
+            $requireData,
+            [
+                'template_name' => 'required',
+                'template_class_id' => 'required',
+                'template_img' => 'required',
+                'id' => 'required',
+
+            ],
+            [
+                'template_name.required' => '模板名称不能为空',
+                'template_class_id.required' => '模板类型id不能为空',
+                'template_img.required' => '模板图片不能为空',
+                'id.required' => '模板id不能为空',
+
+            ]
+        );
+        if ($validator->fails()){
+            $errorMessage = $validator->errors()->first();
+            return Result::error($errorMessage);
+        }
+        $data = [
+            'id'=> $requireData['id'],
+            'template_name' => $requireData['template_name'],
+            'template_img' => $requireData['template_img'],
+            'template_class_id' => $requireData['template_class_id'],
+        ];
+        $result = $this->websiteServiceClient->upTemplate($data);
+        return $result['code']==200?Result::success($result['data']):Result::error($result['message']);
+    }
+
+    /**
+     * 删除模板
+     * @return array
+     */
+    public function delTemplate()
+    {
+        $requireData = $this->request->all();
+        $validator = $this->validationFactory->make(
+            $requireData,
+            [
+                'id' => 'required'
+            ],
+            [
+                'name.required' => '模板id不能为空'
+            ]
+        );
+        if ($validator->fails()){
+            $errorMessage = $validator->errors()->first();
+            return Result::error($errorMessage);
+        }
+        $data = [
+            'id' => $requireData['id']
+        ];
+        $result = $this->websiteServiceClient->delTemplate($data);
+        return $result['code']==200?Result::success($result['data']):Result::error($result['message']);
+    }
+
+
+
 }

app/JsonRpc/WebsiteService.php

@@ -208,4 +208,85 @@ class WebsiteService extends AbstractServiceClient implements WebsiteServiceInte
     {
         return $this->__request(__FUNCTION__, $data);
     }
+
+    /**
+     * @param array $data
+     * @return array|mixed
+     */
+    public function getAdminIndex(array $data)
+    {
+        return $this->__request(__FUNCTION__, $data);
+    }
+
+    /**
+     * @param array $data
+     * @return array|mixed
+     */
+    public function getTemplateClass(array $data)
+    {
+        return $this->__request(__FUNCTION__, $data);
+    }
+
+    /**
+     * @param array $data
+     * @return array|mixed
+     */
+    public function addTemplateClass(array $data)
+    {
+        return $this->__request(__FUNCTION__, $data);
+    }
+
+    /**
+     * @param array $data
+     * @return array|mixed
+     */
+    public function upTemplateClass(array $data)
+    {
+        return $this->__request(__FUNCTION__, $data);
+    }
+
+    /**
+     * @param array $data
+     * @return array|mixed
+     */
+    public function delTemplateClass(array $data)
+    {
+        return $this->__request(__FUNCTION__, $data);
+    }
+
+    /**
+     * @param array $data
+     * @return array|mixed
+     */
+    public function getTemplate(array $data)
+    {
+        return $this->__request(__FUNCTION__, $data);
+    }
+
+    /**
+     * @param array $data
+     * @return array|mixed
+     */
+    public function addTemplate(array $data)
+    {
+        return $this->__request(__FUNCTION__, $data);
+    }
+
+    /**
+     * @param array $data
+     * @return array|mixed
+     */
+    public function upTemplate(array $data)
+    {
+        return $this->__request(__FUNCTION__, $data);
+    }
+
+    /**
+     * @param array $data
+     * @return mixed
+     */
+    public function delTemplate(array $data)
+    {
+        return $this->__request(__FUNCTION__, $data);
+    }
 }

app/JsonRpc/WebsiteServiceInterface.php

@@ -130,4 +130,58 @@ interface WebsiteServiceInterface
      *
      */
     public function getWebsiteCategory(array $data);
+
+    /**
+     * @param array $data
+     * @return mixed
+     */
+    public function getAdminIndex(array $data);
+
+    /**
+     * @param array $data
+     * @return mixed
+     */
+    public function getTemplateClass(array $data);
+
+    /**
+     * @param array $data
+     * @return mixed
+     */
+    public function addTemplateClass(array $data);
+
+    /**
+     * @param array $data
+     * @return mixed
+     */
+    public function upTemplateClass(array $data);
+
+    /**
+     * @param array $data
+     * @return mixed
+     */
+    public function delTemplateClass(array $data);
+
+    /**
+     * @param array $data
+     * @return mixed
+     */
+    public function getTemplate(array $data);
+
+    /**
+     * @param array $data
+     * @return mixed
+     */
+    public function addTemplate(array $data);
+
+    /**
+     * @param array $data
+     * @return mixed
+     */
+    public function upTemplate(array $data);
+
+    /**
+     * @param array $data
+     * @return mixed
+     */
+    public function delTemplate(array $data);
 }

app/Middleware/Auth/FooMiddleware.php

@@ -11,7 +11,7 @@ use Psr\Http\Message\ResponseInterface;
 use Psr\Http\Message\ServerRequestInterface;
 use Psr\Http\Server\MiddlewareInterface;
 use Psr\Http\Server\RequestHandlerInterface;
-
+use Hyperf\Context\Context;
 
 use Phper666\JWTAuth\JWT;
 class FooMiddleware implements MiddlewareInterface
@@ -42,6 +42,8 @@ class FooMiddleware implements MiddlewareInterface
         try {
             if($header &&  isset($header['token']) && $header['token'][0]!='null' && isset($header['token'][0])){
                 $ver = $this->JWT->getClaimsByToken($header['token'][0]);
+//                var_dump("中间件：",$ver);
+                Context::set("UserId",$ver['uid']);
                 if ($ver) {
                     return $handler->handle($request);
                 }

app/Middleware/CorsMiddleware.php

@@ -24,7 +24,7 @@ class CorsMiddleware implements MiddlewareInterface
         if ($request->getMethod() == 'OPTIONS') {
             return $response;
         }
-        var_dump($request);
+//        var_dump($request);
         return $handler->handle($request);
     }
 }

config/api/public.php

@@ -17,7 +17,7 @@ Router::addGroup(
         Router::get('/getCityList', [PublicController::class, 'getCityList']);
         Router::post('/addComplaint', [PublicController::class, 'addComplaint']);
         Router::post('/upComplaint', [PublicController::class, 'upComplaint']);
-        Router::get('/getComplaint', [PublicController::class, 'getComplaint']);
+        Router::post('/getComplaint', [PublicController::class, 'getComplaint']);
         Router::get('/getLetterOfComplaintInfo', [PublicController::class, 'getLetterOfComplaintInfo']);
         Router::post('/delLetterOfComplaint', [PublicController::class, 'delLetterOfComplaint']);
         Router::get('/getLetterType', [PublicController::class, 'getLetterType']);

config/api/website.php

@@ -24,6 +24,15 @@ Router::addGroup(
         Router::post('/createWebsiteRoleUser', [WebsiteController::class, 'createWebsiteRoleUser']);
         Router::post('/delWebsiteRoleUser', [WebsiteController::class, 'delWebsiteRoleUser']);
 
+        Router::get('/getTemplateClass', [WebsiteController::class, 'getTemplateClass']); //获取模板分类
+        Router::post('/addTemplateClass', [WebsiteController::class, 'addTemplateClass']); //添加模板分类
+        Router::post('/upTemplateClass', [WebsiteController::class, 'upTemplateClass']); //更新模板分类
+        Router::post('/delTemplateClass', [WebsiteController::class, 'delTemplateClass']); //删除模板分类
+        Router::get('/getTemplate', [WebsiteController::class, 'getTemplate']); //获取分类下模板列表
+        Router::post('/addTemplate', [WebsiteController::class, 'addTemplate']); //获取分类下模板列表
+        Router::post('/upTemplate', [WebsiteController::class, 'upTemplate']); //更新分类下模板列表
+        Router::post('/delTemplate', [WebsiteController::class, 'delTemplate']); //删除分类下模板列表
+
     },
     ['middleware' => [FooMiddleware::class]]
 );

runtime/container/proxy/App_Controller_AbstractController.proxy.php

@@ -23,6 +23,10 @@ abstract class AbstractController
 {
     use \Hyperf\Di\Aop\ProxyTrait;
     use \Hyperf\Di\Aop\PropertyHandlerTrait;
+    function __construct()
+    {
+        $this->__handlePropertyHandler(__CLASS__);
+    }
     #[Inject]
     protected ContainerInterface $container;
     #[Inject]
@@ -32,20 +36,4 @@ abstract class AbstractController
     #[Inject]
     protected JWT $jwt;
     protected LoggerInterface $logger;
-    protected $UserId;
-    protected $websiteId;
-    public function __construct(LoggerFactory $loggerFactory)
-    {
-        $this->__handlePropertyHandler(__CLASS__);
-        // 第一个参数对应日志的 name, 第二个参数对应 config/autoload/logger.php 内的 key
-        $this->logger = $loggerFactory->get('admin_consumer:', 'default');
-        $headers = $this->request->getHeaders();
-        //        var_dump("ceshi:",$headers);
-        if ($headers && isset($headers['token']) && $headers['token'][0] != 'null' && isset($headers['token'][0]) && $headers['token'][0] != '') {
-            $userInfo = $this->jwt->getClaimsByToken($headers['token'][0]);
-            var_dump("用户信息：", $userInfo);
-            $this->UserId = $userInfo['uid'];
-            $this->websiteId = $userInfo['website_id'] ?? 0;
-        }
-    }
 }

runtime/container/proxy/App_Controller_AdController.proxy.php

@@ -11,6 +11,7 @@ use App\Tools\Result;
 use App\Constants\ErrorCode;
 use Hyperf\Logger;
 use Hyperf\Validation\Contract\ValidatorFactoryInterface;
+use Hyperf\Context\Context;
 /**
  * Class AdController
  * @package App\Controller
@@ -20,7 +21,7 @@ class AdController extends AbstractController
 {
     use \Hyperf\Di\Aop\ProxyTrait;
     use \Hyperf\Di\Aop\PropertyHandlerTrait;
-    function __construct(\Hyperf\Logger\LoggerFactory $loggerFactory)
+    function __construct()
     {
         if (method_exists(parent::class, '__construct')) {
             parent::__construct(...func_get_args());

runtime/container/proxy/App_Controller_AuthorityController.proxy.php

@@ -10,6 +10,7 @@ use Hyperf\HttpServer\Annotation\AutoController;
 use App\Tools\Result;
 use App\Constants\ErrorCode;
 use Hyperf\Validation\Contract\ValidatorFactoryInterface;
+use Hyperf\Context\Context;
 /**
  * Class AuthorityController
  * @package App\Controller
@@ -19,7 +20,7 @@ class AuthorityController extends AbstractController
 {
     use \Hyperf\Di\Aop\ProxyTrait;
     use \Hyperf\Di\Aop\PropertyHandlerTrait;
-    function __construct(\Hyperf\Logger\LoggerFactory $loggerFactory)
+    function __construct()
     {
         if (method_exists(parent::class, '__construct')) {
             parent::__construct(...func_get_args());
@@ -141,7 +142,7 @@ class AuthorityController extends AbstractController
         }
         $origin = $header['origin'][0];
         $logindevice = explode("//", $origin);
-        $reqData = ['user_id' => $this->UserId, 'logindevice' => $logindevice[1]];
+        $reqData = ['user_id' => Context::get("UserId"), 'logindevice' => $logindevice[1]];
         $result = $this->authorityServiceClient->getRecursionMenu($reqData);
         $rep = PublicData::buildMenuTree($result['data']);
         return $rep ? Result::success($rep) : Result::error("查询失败");

runtime/container/proxy/App_Controller_ChatController.proxy.php

@@ -15,6 +15,7 @@ use App\Amqp\Producer;
 use Hyperf\Snowflake\IdGeneratorInterface;
 use PHPStan\Type\Accessory\OversizedArrayType;
 use function Hyperf\Support\env;
+use Hyperf\Context\Context;
 /**
  *
  * Class ChatController
@@ -25,7 +26,7 @@ class ChatController extends AbstractController
 {
     use \Hyperf\Di\Aop\ProxyTrait;
     use \Hyperf\Di\Aop\PropertyHandlerTrait;
-    function __construct(\Hyperf\Logger\LoggerFactory $loggerFactory)
+    function __construct()
     {
         if (method_exists(parent::class, '__construct')) {
             parent::__construct(...func_get_args());
@@ -51,7 +52,7 @@ class ChatController extends AbstractController
             $errorMessage = $validator->errors()->first();
             return Result::error($errorMessage);
         }
-        $requireData['user_id'] = $this->UserId;
+        $requireData['user_id'] = Context::get("UserId");
         $result = $this->chatServiceClient->addContactApply($requireData);
         return $result ? Result::success($result['data']) : Result::error($result['message']);
     }
@@ -62,7 +63,7 @@ class ChatController extends AbstractController
     public function getContactApplyList()
     {
         $requireData = [];
-        $requireData['user_id'] = $this->UserId;
+        $requireData['user_id'] = Context::get("UserId");
         $result = $this->chatServiceClient->getContactApplyList($requireData);
         return $result ? Result::success($result['data']) : Result::error($result['message']);
     }
@@ -78,7 +79,7 @@ class ChatController extends AbstractController
             $errorMessage = $validator->errors()->first();
             return Result::error($errorMessage);
         }
-        $requireData['user_id'] = $this->UserId;
+        $requireData['user_id'] = Context::get("UserId");
         //type==1 同意 type==2 拒绝
         $result = $this->chatServiceClient->updateContactApply($requireData);
         if ($requireData['type'] == 1) {
@@ -97,7 +98,7 @@ class ChatController extends AbstractController
             $errorMessage = $validator->errors()->first();
             return Result::error($errorMessage);
         }
-        $requireData['user_id'] = $this->UserId;
+        $requireData['user_id'] = Context::get("UserId");
         $result = $this->chatServiceClient->delContact($requireData);
         return $result ? Result::success($result['data']) : Result::error($result['message']);
     }
@@ -108,7 +109,7 @@ class ChatController extends AbstractController
     public function getContactList()
     {
         $requireData = $this->request->all();
-        $requireData['user_id'] = $this->UserId;
+        $requireData['user_id'] = Context::get("UserId");
         $requireData['keyWord'] = $this->request->input('keyWord', '');
         $result = $this->chatServiceClient->getContactList($requireData);
         return $result ? Result::success($result['data']) : Result::error($result['message']);
@@ -120,7 +121,7 @@ class ChatController extends AbstractController
     public function getTalkSessionList()
     {
         $requireData = $this->request->all();
-        $requireData['user_id'] = $this->UserId;
+        $requireData['user_id'] = Context::get("UserId");
         var_dump("会话列表：", $requireData);
         $result = $this->chatServiceClient->getTalkSessionList($requireData);
         var_dump($result);
@@ -143,10 +144,10 @@ class ChatController extends AbstractController
             $errorMessage = $validator->errors()->first();
             return Result::error($errorMessage);
         }
-        $requireData['user_id'] = $this->UserId;
+        $requireData['user_id'] = Context::get("UserId");
         $userIdArr = array(json_decode($requireData['user_id_arr']));
         $requireData['user_id_arr'] = $userIdArr[0];
-        $requireData['user_id_arr'][] = $this->UserId;
+        $requireData['user_id_arr'][] = Context::get("UserId");
         var_dump($requireData);
         $result = $this->chatServiceClient->addTalkGroup($requireData);
         return $result['code'] == 200 ? Result::success($result['data']) : Result::error($result['message']);
@@ -180,7 +181,7 @@ class ChatController extends AbstractController
             $errorMessage = $validator->errors()->first();
             return Result::error($errorMessage);
         }
-        $requireData['user_id'] = $this->UserId;
+        $requireData['user_id'] = Context::get("UserId");
         $result = $this->chatServiceClient->addTalkRecords($requireData);
         return $result['code'] == 200 ? Result::success($result['data']) : Result::error($result['message']);
     }

runtime/container/proxy/App_Controller_LinkController.proxy.php

@@ -7,6 +7,7 @@ use App\JsonRpc\LinkServiceInterface;
 use Hyperf\Di\Annotation\Inject;
 use Hyperf\HttpServer\Annotation\AutoController;
 use App\Tools\Result;
+use Hyperf\Context\Context;
 use Hyperf\Logger;
 use Hyperf\Validation\Contract\ValidatorFactoryInterface;
 /**
@@ -18,7 +19,7 @@ class LinkController extends AbstractController
 {
     use \Hyperf\Di\Aop\ProxyTrait;
     use \Hyperf\Di\Aop\PropertyHandlerTrait;
-    function __construct(\Hyperf\Logger\LoggerFactory $loggerFactory)
+    function __construct()
     {
         if (method_exists(parent::class, '__construct')) {
             parent::__construct(...func_get_args());

runtime/container/proxy/App_Controller_LoginController.proxy.php

@@ -12,6 +12,7 @@ use App\JsonRpc\UserServiceInterface;
 use App\Tools\CommonService;
 use function Hyperf\Support\env;
 use App\Tools\PublicData;
+use Hyperf\Context\Context;
 /**
  * @AutoController()
  */
@@ -19,7 +20,7 @@ class LoginController extends AbstractController
 {
     use \Hyperf\Di\Aop\ProxyTrait;
     use \Hyperf\Di\Aop\PropertyHandlerTrait;
-    function __construct(\Hyperf\Logger\LoggerFactory $loggerFactory)
+    function __construct()
     {
         if (method_exists(parent::class, '__construct')) {
             parent::__construct(...func_get_args());

runtime/container/proxy/App_Controller_NewsController.proxy.php

@@ -9,6 +9,7 @@ use Hyperf\Di\Annotation\Inject;
 use Hyperf\HttpServer\Annotation\AutoController;
 use App\Tools\Result;
 use Hyperf\Validation\Contract\ValidatorFactoryInterface;
+use Hyperf\Context\Context;
 /**
  * Class NewsController
  * @package App\Controller
@@ -18,7 +19,7 @@ class NewsController extends AbstractController
 {
     use \Hyperf\Di\Aop\ProxyTrait;
     use \Hyperf\Di\Aop\PropertyHandlerTrait;
-    function __construct(\Hyperf\Logger\LoggerFactory $loggerFactory)
+    function __construct()
     {
         if (method_exists(parent::class, '__construct')) {
             parent::__construct(...func_get_args());
@@ -171,7 +172,7 @@ class NewsController extends AbstractController
         $loginIp = $this->request->getHeader('x-forwarded-for')[0] ?? $this->request->getHeader('x-real-ip')[0] ?? $this->request->getServerParams()['remote_addr'] ?? '0.0.0.0';
         $requireData['ip'] = $loginIp;
         $requireData['website_id'] = $this->websiteId;
-        $requireData['admin_user_id'] = $this->UserId;
+        $requireData['admin_user_id'] = Context::get("UserId");
         $result = $this->newsServiceClient->addArticle($requireData);
         return $result ? Result::success($result['data']) : Result::error($result['message']);
     }

runtime/container/proxy/App_Controller_PublicController.proxy.php

@@ -10,11 +10,11 @@ use App\Tools\Result;
 use App\Tools\CommonService;
 use Hyperf\Validation\Contract\ValidatorFactoryInterface;
 use App\Tools\PublicData;
-use Hyperf\HttpServer\Annotation\RequestMapping;
 use Hyperf\HttpServer\Contract\RequestInterface;
 use Hyperf\HttpServer\Contract\ResponseInterface;
 use ZipArchive;
 use function Hyperf\Support\env;
+use Hyperf\Context\Context;
 /**
  * Class PublicController
  * @package App\Controller
@@ -24,7 +24,7 @@ class PublicController extends AbstractController
 {
     use \Hyperf\Di\Aop\ProxyTrait;
     use \Hyperf\Di\Aop\PropertyHandlerTrait;
-    function __construct(\Hyperf\Logger\LoggerFactory $loggerFactory)
+    function __construct()
     {
         if (method_exists(parent::class, '__construct')) {
             parent::__construct(...func_get_args());
@@ -149,7 +149,7 @@ class PublicController extends AbstractController
             return Result::error($errorMessage);
         }
         $requireData = $this->request->all();
-        $requireData['user_id'] = $this->UserId;
+        $requireData['user_id'] = Context::get("UserId");
         if ($requireData['id']) {
             $result = $this->publicServiceClient->userUpLetterOfComplaint($requireData);
         } else {
@@ -171,7 +171,7 @@ class PublicController extends AbstractController
         }
         var_dump($requireData);
         if (isset($requireData['is_admin']) && !empty($requireData['is_admin'])) {
-            $requireData['admin_id'] = $this->UserId;
+            $requireData['admin_id'] = Context::get("UserId");
         }
         $result = $this->publicServiceClient->upLetterOfComplaint($requireData);
         return $result ? Result::success([]) : Result::error($result['message']);
@@ -183,8 +183,8 @@ class PublicController extends AbstractController
     public function getComplaint()
     {
         $requireData = $this->request->all();
-        $requireData['user_id'] = $this->UserId;
-        var_dump("用户id：", $this->UserId);
+        $requireData['user_id'] = Context::get("UserId");
+        var_dump("用户id：", Context::get("UserId"));
         if (isset($requireData['is_admin']) && !empty($requireData['is_admin'])) {
             unset($requireData['user_id']);
         }
@@ -198,7 +198,7 @@ class PublicController extends AbstractController
     public function getLetterOfComplaintInfo()
     {
         $requireData = $this->request->all();
-        $requireData['user_id'] = $this->UserId;
+        $requireData['user_id'] = Context::get("UserId");
         if (isset($requireData['is_admin']) && !empty($requireData['is_admin'])) {
             unset($requireData['user_id']);
         }
@@ -218,7 +218,7 @@ class PublicController extends AbstractController
     public function delLetterOfComplaint()
     {
         $requireData = $this->request->all();
-        $requireData['user_id'] = $this->UserId;
+        $requireData['user_id'] = Context::get("UserId");
         if (isset($requireData['is_admin']) && !empty($requireData['is_admin'])) {
             unset($requireData['user_id']);
         }
@@ -291,7 +291,7 @@ class PublicController extends AbstractController
             $errorMessage = $validator->errors()->first();
             return Result::error($errorMessage);
         }
-        $requireData['user_id'] = $this->UserId;
+        $requireData['user_id'] = Context::get("UserId");
         $result = $this->publicServiceClient->checkMeasure($requireData);
         return $result['code'] == 200 ? Result::success() : Result::error("已经处理了");
     }

runtime/container/proxy/App_Controller_UserController.proxy.php

@@ -9,6 +9,7 @@ use Hyperf\HttpServer\Annotation\AutoController;
 use App\Tools\Result;
 use App\Constants\ErrorCode;
 use Hyperf\Validation\Contract\ValidatorFactoryInterface;
+use Hyperf\Context\Context;
 /**
  * Class UserController
  * @package App\Controller
@@ -18,7 +19,7 @@ class UserController extends AbstractController
 {
     use \Hyperf\Di\Aop\ProxyTrait;
     use \Hyperf\Di\Aop\PropertyHandlerTrait;
-    function __construct(\Hyperf\Logger\LoggerFactory $loggerFactory)
+    function __construct()
     {
         if (method_exists(parent::class, '__construct')) {
             parent::__construct(...func_get_args());
@@ -172,7 +173,7 @@ class UserController extends AbstractController
             $errorMessage = $validator->errors()->first();
             return Result::error($errorMessage);
         }
-        $requireData['user_id'] = $this->UserId;
+        $requireData['user_id'] = Context::get("UserId");
         $result = $this->userServiceClient->addRole($requireData);
         if ($result['code'] != ErrorCode::SUCCESS) {
             return Result::error($result['message'], 0, []);
@@ -191,7 +192,7 @@ class UserController extends AbstractController
             $errorMessage = $validator->errors()->first();
             return Result::error($errorMessage);
         }
-        $requireData['user_id'] = $this->UserId;
+        $requireData['user_id'] = Context::get("UserId");
         $result = $this->userServiceClient->delRole($requireData);
         if ($result['code'] != ErrorCode::SUCCESS) {
             return Result::error($result['message'], 0, []);
@@ -210,7 +211,7 @@ class UserController extends AbstractController
             $errorMessage = $validator->errors()->first();
             return Result::error($errorMessage);
         }
-        $requireData['user_id'] = $this->UserId;
+        $requireData['user_id'] = Context::get("UserId");
         $requireData['rule'] = $requireData['rule'] ? json_encode($requireData['rule']) : [];
         $result = $this->userServiceClient->updateRole($requireData);
         if ($result['code'] != ErrorCode::SUCCESS) {

runtime/container/proxy/App_Controller_WebsiteController.proxy.php

@@ -9,6 +9,7 @@ use Hyperf\Di\Annotation\Inject;
 use Hyperf\HttpServer\Annotation\AutoController;
 use App\Tools\Result;
 use Hyperf\Validation\Contract\ValidatorFactoryInterface;
+use Hyperf\Context\Context;
 /**
  * Class WebsiteController
  * @package App\Controller
@@ -18,7 +19,7 @@ class WebsiteController extends AbstractController
 {
     use \Hyperf\Di\Aop\ProxyTrait;
     use \Hyperf\Di\Aop\PropertyHandlerTrait;
-    function __construct(\Hyperf\Logger\LoggerFactory $loggerFactory)
+    function __construct()
     {
         if (method_exists(parent::class, '__construct')) {
             parent::__construct(...func_get_args());
@@ -125,7 +126,13 @@ class WebsiteController extends AbstractController
      */
     public function delWebsite()
     {
-        $id = (int) $this->request->input("id", '');
+        $requireData = $this->request->all();
+        $validator = $this->validationFactory->make($requireData, ['id' => 'required'], ['id.required' => 'id不能为空']);
+        if ($validator->fails()) {
+            $errorMessage = $validator->errors()->first();
+            return Result::error($errorMessage);
+        }
+        $id = (int) $requireData['id'];
         $result = $this->websiteServiceClient->delWebsite($id);
         return $result['code'] == 200 ? Result::success($result['data']) : Result::error($result['message']);
     }
@@ -251,7 +258,7 @@ class WebsiteController extends AbstractController
             $errorMessage = $validator->errors()->first();
             return Result::error($errorMessage);
         }
-        $requireData['admin_user_id'] = $this->UserId;
+        $requireData['admin_user_id'] = Context::get("UserId");
         $result = $this->websiteServiceClient->createWebsiteRole($requireData);
         return $result['code'] != 0 ? Result::success($result['data']) : Result::error($result['message']);
     }
@@ -297,7 +304,7 @@ class WebsiteController extends AbstractController
             $errorMessage = $validator->errors()->first();
             return Result::error($errorMessage);
         }
-        $requireData['admin_user_id'] = $this->UserId;
+        $requireData['admin_user_id'] = Context::get("UserId");
         $requireData['role_id'] = (int) $requireData['role_id'];
         $requireData['type'] = (int) $requireData['type'];
         $requireData['website_id'] = (int) $requireData['website_id'];
@@ -323,8 +330,135 @@ class WebsiteController extends AbstractController
     {
         return [];
     }
+    /**
+     * 管理后台首页统计
+     * @return array
+     */
     public function getAdminIndex()
     {
         return [];
     }
+    /**
+     * 获取模板皮肤分类
+     * @return void
+     */
+    public function getTemplateClass()
+    {
+        $result = $this->websiteServiceClient->getTemplateClass([]);
+        return $result['code'] == 200 ? Result::success($result['data']) : Result::error($result['message']);
+    }
+    /**
+     * 添加模板分类
+     * @return void
+     */
+    public function addTemplateClass()
+    {
+        $requireData = $this->request->all();
+        $validator = $this->validationFactory->make($requireData, ['name' => 'required'], ['name.required' => '模板类型不能为空']);
+        if ($validator->fails()) {
+            $errorMessage = $validator->errors()->first();
+            return Result::error($errorMessage);
+        }
+        $data = ['name' => $requireData['name'], 'sort' => $requireData['sort'] ?? 0];
+        $result = $this->websiteServiceClient->addTemplateClass($data);
+        return $result['code'] == 200 ? Result::success($result['data']) : Result::error($result['message']);
+    }
+    /**
+     * 更新模板分类
+     * @return array
+     */
+    public function upTemplateClass()
+    {
+        $requireData = $this->request->all();
+        $validator = $this->validationFactory->make($requireData, ['name' => 'required', 'id' => 'required'], ['name.required' => '模板类型不能为空', 'name.id' => '模板类型ID不能为空']);
+        if ($validator->fails()) {
+            $errorMessage = $validator->errors()->first();
+            return Result::error($errorMessage);
+        }
+        $data = ['id' => $requireData['id'], 'name' => $requireData['name'], 'sort' => $requireData['sort'] ?? 0];
+        $result = $this->websiteServiceClient->upTemplateClass($data);
+        return $result['code'] == 200 ? Result::success($result['data']) : Result::error($result['message']);
+    }
+    /**
+     * 删除模板分类
+     * @return array
+     */
+    public function delTemplateClass()
+    {
+        $requireData = $this->request->all();
+        $validator = $this->validationFactory->make($requireData, ['id' => 'required'], ['name.required' => '类型id不能为空']);
+        if ($validator->fails()) {
+            $errorMessage = $validator->errors()->first();
+            return Result::error($errorMessage);
+        }
+        $data = ['id' => $requireData['id']];
+        $result = $this->websiteServiceClient->delTemplateClass($data);
+        return $result['code'] == 200 ? Result::success($result['data']) : Result::error($result['message']);
+    }
+    /**
+     * 获取分类下的模板
+     * @return array
+     */
+    public function getTemplate()
+    {
+        $requireData = $this->request->all();
+        $validator = $this->validationFactory->make($requireData, ['template_class_id' => 'required', 'page' => 'required', 'pageSize' => 'required'], ['template_class_id.required' => '类型template_class_id不能为空', 'page.required' => 'page不能为空', 'pageSize.required' => '每页显示条数不能为空']);
+        if ($validator->fails()) {
+            $errorMessage = $validator->errors()->first();
+            return Result::error($errorMessage);
+        }
+        $data = ['template_class_id' => $requireData['template_class_id'], 'page' => $requireData['page'], 'pageSize' => $requireData['pageSize']];
+        $result = $this->websiteServiceClient->getTemplate($data);
+        return $result['code'] == 200 ? Result::success($result['data']) : Result::error($result['message']);
+    }
+    /**
+     * 创建皮肤模板
+     * @return array
+     */
+    public function addTemplate()
+    {
+        $requireData = $this->request->all();
+        //        var_dump("FCK:",$requireData);
+        $validator = $this->validationFactory->make($requireData, ['template_name' => 'required', 'template_class_id' => 'required', 'template_img' => 'required'], ['template_name.required' => '模板名称不能为空', 'template_class_id.required' => '模板类型id不能为空', 'template_img.required' => '模板图片不能为空']);
+        if ($validator->fails()) {
+            $errorMessage = $validator->errors()->first();
+            return Result::error($errorMessage);
+        }
+        //        var_dump($requireData);
+        $data = ['template_name' => $requireData['template_name'], 'template_class_id' => $requireData['template_class_id'], 'template_img' => $requireData['template_img']];
+        $result = $this->websiteServiceClient->addTemplate($data);
+        return $result['code'] == 200 ? Result::success($result['data']) : Result::error($result['message']);
+    }
+    /**
+     * 更新模板
+     * @return array
+     */
+    public function upTemplate()
+    {
+        $requireData = $this->request->all();
+        $validator = $this->validationFactory->make($requireData, ['template_name' => 'required', 'template_class_id' => 'required', 'template_img' => 'required', 'id' => 'required'], ['template_name.required' => '模板名称不能为空', 'template_class_id.required' => '模板类型id不能为空', 'template_img.required' => '模板图片不能为空', 'id.required' => '模板id不能为空']);
+        if ($validator->fails()) {
+            $errorMessage = $validator->errors()->first();
+            return Result::error($errorMessage);
+        }
+        $data = ['id' => $requireData['id'], 'template_name' => $requireData['template_name'], 'template_img' => $requireData['template_img'], 'template_class_id' => $requireData['template_class_id']];
+        $result = $this->websiteServiceClient->upTemplate($data);
+        return $result['code'] == 200 ? Result::success($result['data']) : Result::error($result['message']);
+    }
+    /**
+     * 删除模板
+     * @return array
+     */
+    public function delTemplate()
+    {
+        $requireData = $this->request->all();
+        $validator = $this->validationFactory->make($requireData, ['id' => 'required'], ['name.required' => '模板id不能为空']);
+        if ($validator->fails()) {
+            $errorMessage = $validator->errors()->first();
+            return Result::error($errorMessage);
+        }
+        $data = ['id' => $requireData['id']];
+        $result = $this->websiteServiceClient->delTemplate($data);
+        return $result['code'] == 200 ? Result::success($result['data']) : Result::error($result['message']);
+    }
 }

runtime/container/proxy/App_JsonRpc_WebsiteServiceInterface.rpc-client.proxy.php

@@ -2,7 +2,7 @@
 
 namespace App\JsonRpc;
 
-class WebsiteServiceInterface_c62b50c7b2753be00f078b54438742cd extends \Hyperf\RpcClient\Proxy\AbstractProxyService implements WebsiteServiceInterface
+class WebsiteServiceInterface_a0bdfd8ddd0c6c6ee2e2216564b4c6ef extends \Hyperf\RpcClient\Proxy\AbstractProxyService implements WebsiteServiceInterface
 {
     /**
      * @param string $keyword
@@ -174,4 +174,76 @@ class WebsiteServiceInterface_c62b50c7b2753be00f078b54438742cd extends \Hyperf\R
     {
         return $this->client->__call(__FUNCTION__, func_get_args());
     }
+    /**
+     * @param array $data
+     * @return mixed
+     */
+    public function getAdminIndex(array $data)
+    {
+        return $this->client->__call(__FUNCTION__, func_get_args());
+    }
+    /**
+     * @param array $data
+     * @return mixed
+     */
+    public function getTemplateClass(array $data)
+    {
+        return $this->client->__call(__FUNCTION__, func_get_args());
+    }
+    /**
+     * @param array $data
+     * @return mixed
+     */
+    public function addTemplateClass(array $data)
+    {
+        return $this->client->__call(__FUNCTION__, func_get_args());
+    }
+    /**
+     * @param array $data
+     * @return mixed
+     */
+    public function upTemplateClass(array $data)
+    {
+        return $this->client->__call(__FUNCTION__, func_get_args());
+    }
+    /**
+     * @param array $data
+     * @return mixed
+     */
+    public function delTemplateClass(array $data)
+    {
+        return $this->client->__call(__FUNCTION__, func_get_args());
+    }
+    /**
+     * @param array $data
+     * @return mixed
+     */
+    public function getTemplate(array $data)
+    {
+        return $this->client->__call(__FUNCTION__, func_get_args());
+    }
+    /**
+     * @param array $data
+     * @return mixed
+     */
+    public function addTemplate(array $data)
+    {
+        return $this->client->__call(__FUNCTION__, func_get_args());
+    }
+    /**
+     * @param array $data
+     * @return mixed
+     */
+    public function upTemplate(array $data)
+    {
+        return $this->client->__call(__FUNCTION__, func_get_args());
+    }
+    /**
+     * @param array $data
+     * @return mixed
+     */
+    public function delTemplate(array $data)
+    {
+        return $this->client->__call(__FUNCTION__, func_get_args());
+    }
 }

runtime/hyperf.pid

@@ -1 +1 @@
-6204
+5981