rkljw 2 روز پیش
والد
کامیت
0ac54b3b4f
4فایلهای تغییر یافته به همراه74 افزوده شده و 0 حذف شده
  1. 56 0
      app/Controller/PublicController.php
  2. 12 0
      app/JsonRpc/PublicRpcService.php
  3. 3 0
      app/JsonRpc/PublicRpcServiceInterface.php
  4. 3 0
      config/api/public.php

+ 56 - 0
app/Controller/PublicController.php

@@ -1210,5 +1210,61 @@ class PublicController extends AbstractController
         $result = $this->publicServiceClient->upBlackWord($requireData);
         return $result['code'] == 200 ? Result::success($result['data']) : Result::error($result['message']);
     }
+
+    /**
+     * 获取ip信息-经纬度
+     * @return array
+     */
+    public function getIpInfo()
+    {
+
+        $result = $this->publicServiceClient->getIpInfo([]);
+        var_dump("========",$result);
+        return $result['code'] == 200 ? Result::success($result['data']) : Result::error($result['message']);
+    }
+
+    /**
+     * 获取天气信息
+     * @return array
+     */
+    public function getWeatherInfo()
+    {
+        $requireData = $this->request->all();
+        $validator = $this->validationFactory->make(
+            $requireData,
+            [
+                'latitude' => 'required',
+                'longitude' => 'required',
+            ],
+            [
+                'latitude.required' => '纬度不能为空',
+                'longitude.required' => '经度不能为空',
+            ]
+        );
+        if ($validator->fails()) {
+            $errorMessage = $validator->errors()->first();
+            return Result::error($errorMessage);
+        }
+        $result = $this->publicServiceClient->getWeatherInfo($requireData);
+        return $result['code'] == 200 ? Result::success($result['data']) : Result::error($result['message']);
+    }
+
+    /**
+     * 获取日历信息
+     * @return array
+     */
+    public function getCalendar()
+    {
+        $year = $this->request->input('year', date('Y'));
+        $month = $this->request->input('month', date('m'));
+        $day = $this->request->input('day', date('d'));
+        $hour = $this->request->input('day', date('H'));
+        $data['year'] = $year;
+        $data['month'] = $month;
+        $data['day'] = $day;
+        $data['hour'] = $hour;
+        $result = $this->publicServiceClient->getCalendar($data);
+        return $result['code'] == 200 ? Result::success($result['data']) : Result::error($result['message']);
+    }
 }
 

+ 12 - 0
app/JsonRpc/PublicRpcService.php

@@ -320,4 +320,16 @@ class PublicRpcService extends AbstractServiceClient implements PublicRpcService
     {
         return $this->__request(__FUNCTION__, $data);
     }
+    public function getIpInfo(array $data)
+    {
+        return $this->__request(__FUNCTION__, $data);
+    }
+    public function getWeatherInfo(array $data)
+    {
+        return $this->__request(__FUNCTION__, $data);
+    }
+    public function getCalendar(array $data)
+    {
+        return $this->__request(__FUNCTION__, $data);
+    }
 }

+ 3 - 0
app/JsonRpc/PublicRpcServiceInterface.php

@@ -166,5 +166,8 @@ interface PublicRpcServiceInterface
     public function addBlackWord(array $data);
     public function delBlackWord(array $data);
     public function upBlackWord(array $data);
+    public function getIpInfo(array $data);
+    public function getWeatherInfo(array $data);
+    public function getCalendar(array $data);
 
 }

+ 3 - 0
config/api/public.php

@@ -94,6 +94,9 @@ Router::addGroup(
 
         Router::post('/uploadFile', [MinioController::class, 'uploadFiles']);
 
+        Router::get('/getIpInfo', [PublicController::class, 'getIpInfo']);
+        Router::get('/getCalendar', [PublicController::class, 'getCalendar']);
+        Router::get('/getWeatherInfo', [PublicController::class, 'getWeatherInfo']);
 
     }
 );