Bläddra i källkod

Merge branch 'master' of http://116.131.8.26:3000/FengR/zxt_gateway

FengR 10 timmar sedan
förälder
incheckning
bf7ee0210b
4 ändrade filer med 244 tillägg och 85 borttagningar
  1. 6 1
      .env
  2. 202 61
      app/Controller/PublicController.php
  3. 25 21
      app/Tools/PublicData.php
  4. 11 2
      config/api/public.php

+ 6 - 1
.env

@@ -52,6 +52,8 @@ AMQP_USER=rabbitmq
 AMQP_PASSWORD=zxt_mq_dev
 
 
+#test1
+
 
 
 #小程序获取openid
@@ -70,4 +72,7 @@ THE_HOST= adminpre.bjzxtw.org.cn
 
 
 BAIDU_API_KEY = HZKNvKz4AHMRUVgbMt94vNo9
-BAIDU_SECRET_KEY = JorrzAQD669Y4vfuEWAgc0meGxuhHMTy
+BAIDU_SECRET_KEY = JorrzAQD669Y4vfuEWAgc0meGxuhHMTy
+
+
+OA_API_URL =  http://oa.znxyw.org.cn/api.php

+ 202 - 61
app/Controller/PublicController.php

@@ -385,7 +385,7 @@ class PublicController extends AbstractController
         }
         $fileName = $requireData['fileName'] . time() . mt_rand(1, 1000000) . '.zip';
         $zipFileName = $allDir . DIRECTORY_SEPARATOR . $requireData['fileName'] . time() . mt_rand(1, 1000000) . '.zip';
-//        $zipFileName = 'public/zip/files.zip';
+        //        $zipFileName = 'public/zip/files.zip';
 
         if ($zip->open($zipFileName, ZipArchive::CREATE) === true) {
             /** @var array<string> $files */
@@ -447,7 +447,7 @@ class PublicController extends AbstractController
 
             $zip->close();
             // 将zip文件提供给用户进行下载
-//            readfile($zipFileName);
+            //            readfile($zipFileName);
             $fileUrlName = explode("public", $zipFileName);
             return Result::success(['fileUrl' => env('HOST') . $fileUrlName[1]]);
         } else {
@@ -1569,7 +1569,7 @@ class PublicController extends AbstractController
     {
 
         $result = $this->publicServiceClient->getIpInfo([]);
-        var_dump("========",$result);
+        var_dump("========", $result);
         return $result['code'] == 200 ? Result::success($result['data']) : Result::error($result['message']);
     }
 
@@ -1751,15 +1751,15 @@ class PublicController extends AbstractController
             return $this->response->json(
                 [
                     'id'    => uniqid(),
-                    'target'=> '采集失败',
+                    'target' => '采集失败',
                     'desc'  => '内容包含iframe标签',
                     'error' => '内容包含iframe标签'
                 ]
             );
         }
-        $arr_catid = explode(',',$requireData['catid']);
-        $arr_web_site_id = explode(',',$requireData['web_site_id']);
-        if(count($arr_catid) != count($arr_web_site_id)){
+        $arr_catid = explode(',', $requireData['catid']);
+        $arr_web_site_id = explode(',', $requireData['web_site_id']);
+        if (count($arr_catid) != count($arr_web_site_id)) {
             return $this->response->json(
                 [
                     'id' => uniqid(),
@@ -1791,7 +1791,7 @@ class PublicController 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['admin_user_id'] = 32;  
+                $requireData['admin_user_id'] = 32;
                 $requireData['level'] = isset($requireData['level']) &&  $requireData['level'] ? $requireData['level'] : 0;
                 $requireData['hits'] = isset($requireData['hits']) &&  $requireData['hits'] ? $requireData['hits'] : 0;
                 $requireData['is_original'] = isset($requireData['is_original']) &&  $requireData['is_original'] ? $requireData['is_original'] : 0;
@@ -2029,30 +2029,30 @@ class PublicController extends AbstractController
     public function addSectorPlace()
     {
 
-        $requireData = $this->request->all(); 
+        $requireData = $this->request->all();
         // // 先获取 type_id 的值,避免重复计算 
-        $typeId = $requireData['type_id'] ?? null; 
-        $type = $requireData['type'] ?? 0; 
-         
-        $validator = $this->validationFactory->make( 
-            $requireData, 
-            [ 
-                'type_id' => 'required|integer', 
-                'name' => 'required|string', 
-                'height' => 'required|integer', 
-                'sector_img' => 'required|string', 
-                'sector_type' => 'required|integer', 
-                'line_num' => 'required|integer', 
-                'column_num' => 'required|integer', 
-            ], 
-            [ 
-                'type_id.required' => '版式类型不能为空', 
-                'type_id.integer' => '版式类型必须为整数', 
-                'name.required' => '版式名称不能为空', 
-                'name.string' => '版式名称必须为字符串', 
-                'height.required' => '高度不能为空', 
-                'height.integer' => '高度必须为整数', 
-                'sector_img.required' => '通栏图片不能为空', 
+        $typeId = $requireData['type_id'] ?? null;
+        $type = $requireData['type'] ?? 0;
+
+        $validator = $this->validationFactory->make(
+            $requireData,
+            [
+                'type_id' => 'required|integer',
+                'name' => 'required|string',
+                'height' => 'required|integer',
+                'sector_img' => 'required|string',
+                'sector_type' => 'required|integer',
+                'line_num' => 'required|integer',
+                'column_num' => 'required|integer',
+            ],
+            [
+                'type_id.required' => '版式类型不能为空',
+                'type_id.integer' => '版式类型必须为整数',
+                'name.required' => '版式名称不能为空',
+                'name.string' => '版式名称必须为字符串',
+                'height.required' => '高度不能为空',
+                'height.integer' => '高度必须为整数',
+                'sector_img.required' => '通栏图片不能为空',
                 'sector_img.string' => '通栏图片必须为字符串',
                 'sector_type.required' => '通栏编号不能为空',
                 'sector_type.integer' => '通栏编号必须为整数',
@@ -2066,24 +2066,24 @@ class PublicController extends AbstractController
             $errorMessage = $validator->errors()->first();
             return Result::error($errorMessage);
         }
-        if($typeId == 1){
+        if ($typeId == 1) {
             $validator = $this->validationFactory->make(
                 $requireData,
                 [
                     'component_num' => 'required|integer',
                 ],
                 [
-                    
+
                     'component_num.required' => '组件数量不能为空',
                     'component_num.integer' => '组件数量必须为整数',
                 ]
-            ); 
+            );
             $requireData['width'] = 1200;
             unset($requireData['component_type']);
             unset($requireData['type']);
             unset($requireData['cat_num']);
             unset($requireData['sort_id']);
-        }else{
+        } else {
             $type = $requireData['type'] ?? null;
             $validator = $this->validationFactory->make(
                 $requireData,
@@ -2109,11 +2109,10 @@ class PublicController extends AbstractController
         if ($validator->fails()) {
             $errorMessage = $validator->errors()->first();
             return Result::error($errorMessage);
-         }
+        }
         $requireData['user_id'] = Context::get("UserId");
         $result = $this->publicServiceClient->addSectorPlace($requireData);
-        return $result['code'] == 200? Result::success($result['data']) : Result::error($result['message']);
-
+        return $result['code'] == 200 ? Result::success($result['data']) : Result::error($result['message']);
     }
     /** 
      * 通栏版式管理-编辑通栏版式
@@ -2125,7 +2124,7 @@ class PublicController extends AbstractController
         $requireData = $this->request->all();
         $typeId = $requireData['type_id'] ?? null;
         $type = $requireData['type'] ?? 0;
-        
+
         $validator = $this->validationFactory->make(
             $requireData,
             [
@@ -2158,24 +2157,24 @@ class PublicController extends AbstractController
             $errorMessage = $validator->errors()->first();
             return Result::error($errorMessage);
         }
-        if($typeId == 1){
+        if ($typeId == 1) {
             $validator = $this->validationFactory->make(
                 $requireData,
                 [
                     'component_num' => 'required|integer',
                 ],
                 [
-                    
+
                     'component_num.required' => '组件数量不能为空',
                     'component_num.integer' => '组件数量必须为整数',
                 ]
-            ); 
+            );
             $requireData['width'] = 1200;
             unset($requireData['component_type']);
             unset($requireData['type']);
             unset($requireData['cat_num']);
             unset($requireData['sort_id']);
-        }else{
+        } else {
             $type = $requireData['type'] ?? null;
             $validator = $this->validationFactory->make(
                 $requireData,
@@ -2204,8 +2203,7 @@ class PublicController extends AbstractController
         }
         $requireData['user_id'] = Context::get("UserId");
         $result = $this->publicServiceClient->upSectorPlace($requireData);
-        return $result['code'] == 200? Result::success($result['data']) : Result::error($result['message']);
-        
+        return $result['code'] == 200 ? Result::success($result['data']) : Result::error($result['message']);
     }
     /**
      * 通栏版式管理-删除通栏版式
@@ -2835,7 +2833,7 @@ class PublicController extends AbstractController
         }
         $requireData['user_id'] = Context::get("UserId");
         $result = $this->publicServiceClient->getAllSectorComponentStyle($requireData);
-        return $result['code'] == 200? Result::success($result['data']) : Result::error($result['message']);
+        return $result['code'] == 200 ? Result::success($result['data']) : Result::error($result['message']);
     }
     /**
      * 自助建站-ai会话-获取会话列表
@@ -2861,7 +2859,7 @@ class PublicController extends AbstractController
         }
         $requireData['user_id'] = Context::get("UserId");
         $result = $this->publicServiceClient->getAiSessionList($requireData);
-        return $result['code'] == 200? Result::success($result['data']) : Result::error($result['message']);
+        return $result['code'] == 200 ? Result::success($result['data']) : Result::error($result['message']);
     }
     /**
      * 自助建站-ai会话-创建会话
@@ -2891,7 +2889,7 @@ class PublicController extends AbstractController
         }
         $requireData['user_id'] = Context::get("UserId");
         $result = $this->publicServiceClient->addAiSession($requireData);
-        return $result['code'] == 200? Result::success($result['data']) : Result::error($result['message']);
+        return $result['code'] == 200 ? Result::success($result['data']) : Result::error($result['message']);
     }
     /**
      * 自助建站-ai会话-修改会话
@@ -2915,7 +2913,7 @@ class PublicController extends AbstractController
         }
         $requireData['user_id'] = Context::get("UserId");
         $result = $this->publicServiceClient->upAiSession($requireData);
-        return $result['code'] == 200? Result::success($result['data']) : Result::error($result['message']);
+        return $result['code'] == 200 ? Result::success($result['data']) : Result::error($result['message']);
     }
     /**
      * 自助建站-ai会话-删除会话
@@ -2939,7 +2937,7 @@ class PublicController extends AbstractController
         }
         $requireData['user_id'] = Context::get("UserId");
         $result = $this->publicServiceClient->delAiSession($requireData);
-        return $result['code'] == 200? Result::success($result['data']) : Result::error($result['message']);
+        return $result['code'] == 200 ? Result::success($result['data']) : Result::error($result['message']);
     }
     /**
      * 自助建站-ai会话-发送消息
@@ -2968,7 +2966,7 @@ class PublicController extends AbstractController
         }
         $requireData['user_id'] = Context::get("UserId");
         $result = $this->publicServiceClient->sendAiMessage($requireData);
-        return $result['code'] == 200? Result::success($result['data']) : Result::error($result['message']);
+        return $result['code'] == 200 ? Result::success($result['data']) : Result::error($result['message']);
     }
     /**
      * 自助建站-ai会话-获取消息列表
@@ -2992,7 +2990,7 @@ class PublicController extends AbstractController
         }
         $requestData['user_id'] = Context::get("UserId");
         $result = $this->publicServiceClient->getAiMessageList($requestData);
-        return $result['code'] == 200? Result::success($result['data']) : Result::error($result['message']);
+        return $result['code'] == 200 ? Result::success($result['data']) : Result::error($result['message']);
     }
     /**
      * 自助建站-ai会话-添加模板草稿
@@ -3022,7 +3020,7 @@ class PublicController extends AbstractController
         }
         $requireData['user_id'] = Context::get("UserId");
         $result = $this->publicServiceClient->addTemplateDraftbox($requireData);
-        return $result['code'] == 200? Result::success($result['data']) : Result::error($result['message']);
+        return $result['code'] == 200 ? Result::success($result['data']) : Result::error($result['message']);
     }
     /**
      * 自助建站-ai会话-修改模板草稿
@@ -3046,7 +3044,7 @@ class PublicController extends AbstractController
         }
         $requireData['user_id'] = Context::get("UserId");
         $result = $this->publicServiceClient->upTemplateDraftbox($requireData);
-        return $result['code'] == 200? Result::success($result['data']) : Result::error($result['message']);
+        return $result['code'] == 200 ? Result::success($result['data']) : Result::error($result['message']);
     }
     /**
      * 自助建站-ai会话-获取模板草稿列表
@@ -3070,7 +3068,7 @@ class PublicController extends AbstractController
         }
         $requireData['user_id'] = Context::get("UserId");
         $result = $this->publicServiceClient->getTemplateDraftboxList($requireData);
-        return $result['code'] == 200? Result::success($result['data']) : Result::error($result['message']);
+        return $result['code'] == 200 ? Result::success($result['data']) : Result::error($result['message']);
     }
 
     /**
@@ -3097,7 +3095,7 @@ class PublicController extends AbstractController
         }
         $requireData['user_id'] = Context::get("UserId");
         $result = $this->publicServiceClient->checkRepeatKeyword($requireData);
-        return $result['code'] == 200? Result::success($result['data']) : Result::error($result['message']);
+        return $result['code'] == 200 ? Result::success($result['data']) : Result::error($result['message']);
     }
     /**
      * 自助建站-验证临时模板
@@ -3123,7 +3121,7 @@ class PublicController extends AbstractController
         }
         $requireData['user_id'] = Context::get("UserId");
         $result = $this->publicServiceClient->checkWebTemplate($requireData);
-        return $result['code'] == 200? Result::success($result['data']) : Result::error($result['message']);
+        return $result['code'] == 200 ? Result::success($result['data']) : Result::error($result['message']);
     }
     /**
      * 自助建站-ai会话-获取所有皮肤
@@ -3134,7 +3132,7 @@ class PublicController extends AbstractController
         $requireData = $this->request->all();
         $requireData['user_id'] = Context::get("UserId");
         $result = $this->publicServiceClient->getAITemplate($requireData);
-        return $result['code'] == 200? Result::success($result['data']) : Result::error($result['message']);
+        return $result['code'] == 200 ? Result::success($result['data']) : Result::error($result['message']);
     }
     /**
      * 自助建站-ai会话-删除聊天记录
@@ -3159,7 +3157,7 @@ class PublicController extends AbstractController
         }
         $requireData['user_id'] = Context::get("UserId");
         $result = $this->publicServiceClient->delAiChatRecord($requireData);
-        return $result['code'] == 200? Result::success($result['data']) : Result::error($result['message']);
+        return $result['code'] == 200 ? Result::success($result['data']) : Result::error($result['message']);
     }
     /**
      * 自助建站-ai会话-给模板添加导航
@@ -3184,7 +3182,150 @@ class PublicController extends AbstractController
         }
         $requireData['user_id'] = Context::get("UserId");
         $result = $this->publicServiceClient->addTemplateCates($requireData);
-        return $result['code'] == 200? Result::success($result['data']) : Result::error($result['message']);
+        return $result['code'] == 200 ? Result::success($result['data']) : Result::error($result['message']);
     }
-}
 
+    //查询oa
+    /**
+     * 自助建站-oa查询-人员查询
+     * @return array
+     */
+    public function getPersonList()
+    {
+        $requireData = $this->request->all();
+        $validator = $this->validationFactory->make(
+            $requireData,
+            [
+                'zhengshuno' => 'required',
+                'ssxmid' => 'required',
+            ],
+            [
+                'zhengshuno.required' => '证书编号不能为空',
+                'ssxmid.required' => '项目id不能为空',
+            ]
+        );
+        if ($validator->fails()) {
+            $errorMessage = $validator->errors()->first();
+            return Result::error($errorMessage);
+        }
+        $requireData['user_id'] = Context::get("UserId");
+        echo $oaurl = env('OA_API_URL') . '?m=openweb&a=zhengjiandata&ssxmid=' . $requireData['ssxmid'] . '&zhengshuno=' . $requireData['zhengshuno'] . '&title=' . $requireData['name'];
+        $result = PublicData::http_get($oaurl);
+        var_dump($result, '-----------------------------');
+        $result = json_decode($result, true);
+        var_dump($result);
+        if ($result['msg'] == 'notfund') {
+            return Result::error('未匹配到数据');
+        }
+        unset($result['data']['mima']);
+        return $result['code'] == 200 ? Result::success($result['data']) : Result::error($result['message']);
+    }
+
+    /**
+     * 自助建站-oa查询-项目查询
+     * @return array
+     */
+    public function getCarList()
+    {
+        $requireData = $this->request->all();
+        $validator = $this->validationFactory->make(
+            $requireData,
+            [
+                'chepaihao' => 'required',
+                'ssxmid' => 'required',
+            ],
+            [
+                'chepaihao.required' => '车辆编号不能为空',
+                'ssxmid.required' => '项目id不能为空',
+            ]
+        );
+        if ($validator->fails()) {
+            $errorMessage = $validator->errors()->first();
+            return Result::error($errorMessage);
+        }
+        $requireData['user_id'] = Context::get("UserId");
+        echo $oaurl = env('OA_API_URL') . '?m=openweb&a=chepaidata&ssxmid=' . $requireData['ssxmid'] . '&chepaihao=' . $requireData['chepaihao'] . '&sswz=' . $requireData['chexing'];
+        $result = PublicData::http_get($oaurl);
+        var_dump($result, '-----------------------------');
+        $result = json_decode($result, true);
+        var_dump($result, '-----------------1------------');
+        if ($result['msg'] == 'notfund') {
+            return Result::error('未匹配到数据');
+        }
+        unset($result['data']['mima']);
+        return $result['code'] == 200 ? Result::success($result['data']) : Result::error($result['message']);
+    }
+    /**
+     * 自助建站-oa查询-地市查询
+     * @return array
+     */
+    function getCity()
+    {
+        $requireData = $this->request->all();
+        $validator = $this->validationFactory->make(
+            $requireData,
+            [
+                'sheng' => 'required',
+                'shi' => 'required',
+                'ssxmid' => 'required',
+            ],
+            [
+                'sheng.required' => '省不能为空',
+                'shi.required' => '市不能为空',
+                'ssxmid.required' => '项目id不能为空',
+            ]
+        );
+        if ($validator->fails()) {
+            $errorMessage = $validator->errors()->first();
+            return Result::error($errorMessage);
+        }
+        $requireData['user_id'] = Context::get("UserId");
+        echo $oaurl = env('OA_API_URL') . '?m=openweb&a=diqudata&ssxmid=' . $requireData['ssxmid'] . '&sheng=' . $requireData['sheng']
+            . '&shi=' . $requireData['shi'] ?? ''
+            . '&xian=' . $requireData['xian'] ?? '';
+
+        $result = PublicData::http_get($oaurl);
+        var_dump($result, '-----------------------------');
+        $result = json_decode($result, true);
+        var_dump($result);
+        if ($result['msg'] == 'notfund') {
+            return Result::error('未匹配到数据');
+        }
+        unset($result['data']['mima']);
+        return $result['code'] == 200 ? Result::success($result['data']) : Result::error($result['message']);
+    }
+    /**
+     * 自助建站-oa查询-介绍信
+     * @return array
+     */
+    function getIntroduce()
+    {
+        $requireData = $this->request->all();
+        $validator = $this->validationFactory->make(
+            $requireData,
+            [
+                'bianma' => 'required',
+                'ssxmid' => 'required',
+            ],
+            [
+                'bianma.required' => '编号不能为空',
+                'ssxmid.required' => '项目id不能为空',
+            ]
+        );
+        if ($validator->fails()) {
+            $errorMessage = $validator->errors()->first();
+            return Result::error($errorMessage);
+        }
+        $requireData['user_id'] = Context::get("UserId");
+        echo $oaurl = env('OA_API_URL') . '?m=openweb&a=jieshaodata&ssxmid=' . $requireData['ssxmid'] . '&bianma=' . $requireData['bianma'];
+        $result = PublicData::http_get($oaurl);
+        var_dump($result, '-----------------------------');
+        $result = json_decode($result, true);
+        var_dump($result);
+        if ($result['msg'] == 'notfund') {
+            return Result::error('未匹配到数据');
+        }
+        unset($result['data']['mima']);
+        return $result['code'] == 200 ? Result::success($result['data']) : Result::error($result['message']);
+    }
+}

+ 25 - 21
app/Tools/PublicData.php

@@ -1,5 +1,7 @@
 <?php
+
 namespace App\Tools;
+
 use Hyperf\Snowflake\IdGeneratorInterface;
 use Hyperf\Context\ApplicationContext;
 use function Hyperf\Support\env;
@@ -13,7 +15,8 @@ class PublicData
      * @param $parentId
      * @return array
      */
-    public static  function buildMenuTree($menuItems, $parentId = 0) {
+    public static  function buildMenuTree($menuItems, $parentId = 0)
+    {
         $tree = [];
         foreach ($menuItems as $item) {
             if ($item['pid'] == $parentId) {
@@ -22,8 +25,8 @@ class PublicData
                 // 如果子菜单存在,则添加到当前菜单的children中
                 if ($children) {
                     $item['children'] = $children;
-                }else{
-                     $item['children'] = [];
+                } else {
+                    $item['children'] = [];
                 }
                 // 将当前菜单添加到树中
                 $tree[] = $item;
@@ -32,7 +35,8 @@ class PublicData
         return $tree;
     }
 
-    public static  function buildCategoryTree($menuItems, $parentId = 0) {
+    public static  function buildCategoryTree($menuItems, $parentId = 0)
+    {
         $tree = [];
         foreach ($menuItems as $item) {
             if ($item['pid'] == $parentId) {
@@ -55,7 +59,8 @@ class PublicData
      * @param $column
      * @return array
      */
-    public static  function arrayColumnAsKey($array, $column) {
+    public static  function arrayColumnAsKey($array, $column)
+    {
         $result = [];
         foreach ($array as $item) {
             if (isset($item[$column])) {
@@ -74,7 +79,7 @@ class PublicData
      * @param $eTime
      * @return float
      */
-    public static function residueDay($sTime,$eTime)
+    public static function residueDay($sTime, $eTime)
     {
         $startTime = strtotime($sTime);
         $endTime = strtotime($eTime);
@@ -159,7 +164,7 @@ class PublicData
     {
         // 初始化CURL会话
         $ch = curl_init($url);
-        var_dump("参数:",$data);
+        var_dump("参数:", $data);
         // 设置CURL选项
         curl_setopt($ch, CURLOPT_RETURNTRANSFER, true); // 将curl_exec()获取的信息以文件流的形式返回,而不是直接输出。
         curl_setopt($ch, CURLOPT_HEADER, false); // 将curl_exec()获取的信息以文件流的形式返回,而不是直接输出。
@@ -168,7 +173,7 @@ class PublicData
         $headers = [
             'Authorization: Bearer be1856920c54ac537b530d69bc2eda73.gOO2BMq9NXavzEMq',
             'Content-Type: application/json',
-//            'Custom-Header: customHeaderValue'
+            //            'Custom-Header: customHeaderValue'
         ];
         curl_setopt($ch, CURLOPT_HTTPHEADER, $headers);
         // 如果有额外的CURL选项,则合并它们
@@ -198,10 +203,10 @@ class PublicData
         if ($headerEnd !== false) {
             // 去除响应头,只保留响应体
             $responseBody = substr($response, $headerEnd + 4); // +4 是因为 "\r\n\r\n" 有4个字符
-//            echo $responseBody; // 输出:This is the response body.
+            //            echo $responseBody; // 输出:This is the response body.
         } else {
             // 如果没有找到空行,可能响应格式不正确或没有响应头
-//            echo "No headers found in response.";
+            //            echo "No headers found in response.";
         }
         return [
             'response' => $responseBody,
@@ -237,7 +242,7 @@ class PublicData
         curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
         $response = curl_exec($ch);
         curl_close($ch);
-        var_dump("返回数据:",$response);
+        var_dump("返回数据:", $response);
         $cleanStr = preg_replace('/<script[^>]*?>.*?<\/script>/is', '', $response);
         $jsonStr = trim(preg_replace('/\s+/', ' ', $cleanStr)); // 压缩空白符
         $jsonStr = preg_replace('/^.*?({.*})$/', '$1', $jsonStr); // 提取最后一个完整 JSON
@@ -245,20 +250,21 @@ class PublicData
         if (json_last_error() !== JSON_ERROR_NONE) {
             return json_last_error_msg();
         }
-        var_dump("返回数据111:",$response);
+        var_dump("返回数据111:", $response);
         return $arr;
     }
     /**
      * @param $text
      * @return bool|string
      */
-    public static  function getCouplet($text="") {
-        if($text){
-            $api_url = "https://apis.tianapi.com/msdl/index?key=44c4f9b3d66ce06900a098c78b90478f&num=10&fenlei=".urlencode($text);
-        }else{
+    public static  function getCouplet($text = "")
+    {
+        if ($text) {
+            $api_url = "https://apis.tianapi.com/msdl/index?key=44c4f9b3d66ce06900a098c78b90478f&num=10&fenlei=" . urlencode($text);
+        } else {
             $api_url = "https://apis.tianapi.com/msdl/index?key=44c4f9b3d66ce06900a098c78b90478f&num=10";
         }
-        var_dump("请求地址:",$api_url);
+        var_dump("请求地址:", $api_url);
         $ch = curl_init();
         curl_setopt($ch, CURLOPT_URL, $api_url);
         curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
@@ -315,8 +321,6 @@ class PublicData
         // 关闭会话
         curl_close($ch);
         // 返回结果
-        return json_decode($response,true);
+        return json_decode($response, true);
     }
-
-
-}
+}

+ 11 - 2
config/api/public.php

@@ -179,15 +179,24 @@ Router::addGroup(
         Router::post('/getTemplateDraftboxList', [PublicController::class, 'getTemplateDraftboxList']);
 
         // 自助建站-验证关键词填写重复问题 
-        Router::post('/checkRepeatKeyword', [PublicController::class, 'checkRepeatKeyword']); 
+        Router::post('/checkRepeatKeyword', [PublicController::class, 'checkRepeatKeyword']);
         // 自助建站-验证临时模板 
-        Router::post('/checkWebTemplate', [PublicController::class, 'checkWebTemplate']); 
+        Router::post('/checkWebTemplate', [PublicController::class, 'checkWebTemplate']);
         // 自助建站-ai会话-获取所有皮肤
         Router::post('/getAITemplate', [PublicController::class, 'getAITemplate']);
         // 自助建站-ai会话-删除聊天记录
         Router::post('/delAiChatRecord', [PublicController::class, 'delAiChatRecord']);
         // 自助建站-ai会话-给模板添加导航
         Router::post('/addTemplateCates', [PublicController::class, 'addTemplateCates']);
+        //oa 查询
+        //人员查询
+        Router::post('/getPersonList', [PublicController::class, 'getPersonList']);
+        //车牌查询
+        Router::post('/getCarList', [PublicController::class, 'getCarList']);
+        //地市查询
+        Router::post('/getCity', [PublicController::class, 'getCity']);
+        //介绍信查询
+        Router::post('/getIntroduce', [PublicController::class, 'getIntroduce']);
     },
     ['middleware' => [FooMiddleware::class]]
 );