小程序修改

.env

@@ -11,9 +11,15 @@ DB_CHARSET=utf8mb4
 DB_COLLATION=utf8mb4_unicode_ci
 DB_PREFIX=
 
-REDIS_HOST=101.254.114.211
-REDIS_AUTH=YPWWnFnNebc7427B
-REDIS_PORT=26739
+#REDIS_HOST=101.254.114.211
+#REDIS_AUTH=YPWWnFnNebc7427B
+#REDIS_PORT=26739
+#REDIS_DB=0
+
+
+REDIS_HOST=192.168.1.201
+REDIS_AUTH=
+REDIS_PORT=6379
 REDIS_DB=0
 
 AMQP_HOST=103.105.201.2

app/Controller/CollectorController.php

@@ -115,8 +115,23 @@ class CollectorController extends AbstractController
         $data = [];
         $data['admin_user_id'] = Context::get("UserId");
         $data['time'] = microtime();
+        $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);
+        }
 //        $b  = $this->Iservice->push($data,1);
-        $result = $this->Gservice->push($data,1);
+        $data['id'] = $requireData['id'];
+        $result = $this->Gservice->push($data,3);
         return Result::success($result);
 
     }

app/Controller/LoginController.php

@@ -82,7 +82,7 @@ class LoginController extends AbstractController
             'user_name' => $userInfos['data']['user_name'],
             'mobile' => $userInfos['data']['mobile'],
             'email' => $userInfos['data']['email'],
-            'rong_token' => $userInfos['data']['rong_token'],
+//            'rong_token' => $userInfos['data']['rong_token'],
             'level_id' => $userInfos['data']['level_id'],
         ];
         var_dump($userData);

app/Controller/PublicController.php

@@ -68,7 +68,7 @@ class PublicController extends AbstractController
             if ($file == null) {
                 return Result::error("未找到上传文件");
             }
-            $data = CommonService::uploadFile($file, ['png', 'jpg', 'png', 'jpeg', 'gif', 'xls', 'xlsx', 'pdf', 'xls', 'xlsx', 'doc', 'docx', 'ppt', 'zip', 'pptx', 'mp4', 'flv'], 'image');
+            $data = CommonService::uploadFile($file, ['png', 'jpg', 'jpeg', 'gif', 'xls', 'xlsx', 'pdf', 'doc', 'docx', 'ppt', 'zip', 'pptx', 'mp4', 'flv','rar','tar'], 'image');
 
             $data['imgUrl'] = $urlN->imgUrl($data['src']);
             $data['oldFileName'] = $fileName;
@@ -173,22 +173,18 @@ class PublicController extends AbstractController
             [
                 'title' => 'required',
                 'nature' => 'required',
-                'nature_level' => 'required',
-                'type' => 'required',
+                'nature_level0' => 'required',
                 'name' => 'required',
                 'mobile' => 'required',
                 'describe' => 'required',
-                'type_level' => 'required',
             ],
             [
                 'title.required' => '标题不能为空',
-                'nature.required' => '性质不能为空',
-                'nature_level.required' => '进度不能为空',
-                'type.required' => '类型不能为空',
+                'nature.required' => '类型不能为空',
+                'nature_level0.required' => '类型进度不能为空',
                 'name.required' => '姓名不能为空',
                 'mobile.required' => '手机号码不能为空',
                 'describe.required' => '详细说明不能为空',
-                'type_level.required' => '类型进度不能为空',
             ]
         );
         if ($validator->fails()) {
@@ -242,11 +238,15 @@ class PublicController extends AbstractController
 
         $requireData = $this->request->all();
         $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']);
         }
         $result = $this->publicServiceClient->getLetterOfComplaint($requireData);
+        if($result['code']==200){
+            foreach ($result['data']['rows']as $key=>$val){
+                $result['data']['rows'][$key]['created_at'] = date("Y-m-d",strtotime($val['created_at']));
+            }
+        }
         return $result ? Result::success($result['data']) : Result::error($result['message']);
     }
 
@@ -293,11 +293,49 @@ class PublicController extends AbstractController
     public function getLetterType()
     {
         $requireData = $this->request->all();
+        $validator = $this->validationFactory->make(
+            $requireData,
+            [
+                'type' => 'required',
+            ],
+            [
+                'type.required' => '类型不能为空',
+            ]
+        );
+        if ($validator->fails()) {
+            $errorMessage = $validator->errors()->first();
+            return Result::error($errorMessage);
+        }
         $result = $this->publicServiceClient->getLetterType($requireData);
         $rep = PublicData::buildMenuTree($result['data']);
         return $rep ? Result::success($rep) : Result::error("查询失败");
     }
 
+    /**
+     * @return array
+     */
+    public function getLetterTypeChildren()
+    {
+        $requireData = $this->request->all();
+        $validator = $this->validationFactory->make(
+            $requireData,
+            [
+                'type' => 'required',
+                'pid' => 'required',
+            ],
+            [
+                'type.required' => '类型不能为空',
+                'pid.required' => 'PID不能为空',
+            ]
+        );
+        if ($validator->fails()) {
+            $errorMessage = $validator->errors()->first();
+            return Result::error($errorMessage);
+        }
+        $result = $this->publicServiceClient->getLetterType($requireData);
+        return $result['code']==200 ? Result::success($result['data']) : Result::error("查询失败");
+    }
+
     public function downloadFile(RequestInterface $request, ResponseInterface $response)
     {
         //验证是否有传参数

app/Job/GatherExampleJob.php

@@ -28,6 +28,7 @@ class GatherExampleJob extends Job
     public function handle()
     {
         try {
+            var_dump("消费者");
             $collector = new CollectorController();
             $result = $collector->goSendCrawler($this->params);
             var_dump("消费消息队列：",$this->params,$result);

app/Middleware/Auth/FooMiddleware.php

@@ -37,7 +37,8 @@ class FooMiddleware implements MiddlewareInterface
 
         $header = $request->getHeaders();
         try {
-            if($header &&  isset($header['token']) && $header['token'][0]!='null' && isset($header['token'][0])){
+            if($header &&  isset($header['token']) && $header['token'][0]!='null' && $header['token'][0]!='' && isset($header['token'][0])){
+                var_dump("token类型：",$header['token'][0]);
                 $ver = $this->JWT->getClaimsByToken($header['token'][0]);
                 $tokenTime =  $this->JWT->getTokenDynamicCacheTime($header['token'][0]);
                 if($tokenTime==0){

config/api/public.php

@@ -31,6 +31,8 @@ Router::addGroup(
         Router::post('/delLetterOfComplaint', [PublicController::class, 'delLetterOfComplaint']);
         //获取类型
         Router::get('/getLetterType', [PublicController::class, 'getLetterType']);
+        //获取子类型
+        Router::get('/getLetterTypeChildren', [PublicController::class, 'getLetterTypeChildren']);
         //下载文件
         Router::addRoute(['GET', 'POST'],'/downloadFile', [PublicController::class, 'downloadFile']);
         //检测是否已经被审核