cqp 3 هفته پیش
والد
کامیت
a618784cd9

+ 8 - 4
app/Http/Controllers/Api/TestController.php

@@ -92,7 +92,8 @@ class TestController extends BaseController
     }
     }
 
 
     public function salesOrderGet(Request $request){
     public function salesOrderGet(Request $request){
-        list($bool, $data) = (new TestService())->salesOrderGet($request->all());
+        $common_array = $request->common_param;
+        list($bool, $data) = (new TestService())->salesOrderGet($request->all(),$common_array);
 
 
         if($bool){
         if($bool){
             return $this->json_return(200,'',$data);
             return $this->json_return(200,'',$data);
@@ -102,7 +103,8 @@ class TestController extends BaseController
     }
     }
 
 
     public function materialAddU8(Request $request){
     public function materialAddU8(Request $request){
-        list($bool, $data) = (new TestService())->materialAddU8($request->all());
+        $common_array = $request->common_param;
+        list($bool, $data) = (new TestService())->materialAddU8($request->all(), $common_array);
 
 
         if($bool){
         if($bool){
             return $this->json_return(200,'',$data);
             return $this->json_return(200,'',$data);
@@ -112,7 +114,8 @@ class TestController extends BaseController
     }
     }
 
 
     public function productInAddU8(Request $request){
     public function productInAddU8(Request $request){
-        list($bool, $data) = (new TestService())->ProductInAddU8($request->all());
+        $common_array = $request->common_param;
+        list($bool, $data) = (new TestService())->ProductInAddU8($request->all(), $common_array);
 
 
         if($bool){
         if($bool){
             return $this->json_return(200,'',$data);
             return $this->json_return(200,'',$data);
@@ -122,7 +125,8 @@ class TestController extends BaseController
     }
     }
 
 
     public function dispatchAddU8(Request $request){
     public function dispatchAddU8(Request $request){
-        list($bool, $data) = (new TestService())->DispatchAddU8($request->all());
+        $common_array = $request->common_param;
+        list($bool, $data) = (new TestService())->DispatchAddU8($request->all(), $common_array);
 
 
         if($bool){
         if($bool){
             return $this->json_return(200,'',$data);
             return $this->json_return(200,'',$data);

+ 1 - 1
app/Http/Kernel.php

@@ -66,7 +66,7 @@ class Kernel extends HttpKernel
         'checkLogin' => \App\Http\Middleware\CheckLogin::class,
         'checkLogin' => \App\Http\Middleware\CheckLogin::class,
         'CheckJRFIDLogin' => \App\Http\Middleware\CheckJRFIDLogin::class,
         'CheckJRFIDLogin' => \App\Http\Middleware\CheckJRFIDLogin::class,
         'CheckAssetLogin' => \App\Http\Middleware\CheckAssetLogin::class,
         'CheckAssetLogin' => \App\Http\Middleware\CheckAssetLogin::class,
-        'checkWeixin' => \App\Http\Middleware\CheckWeinxin::class,
+        'CheckU8' => \App\Http\Middleware\CheckU8::class,
         'U8Deal' => \App\Http\Middleware\U8Deal::class,
         'U8Deal' => \App\Http\Middleware\U8Deal::class,
     ];
     ];
 
 

+ 36 - 0
app/Http/Middleware/CheckU8.php

@@ -0,0 +1,36 @@
+<?php
+
+namespace App\Http\Middleware;
+
+use Closure;
+use Illuminate\Http\Request;
+
+class CheckU8
+{
+    /**
+     * Handle an incoming request.
+     *
+     * @param  Request  $request
+     * @param Closure $next
+     * @return mixed
+     */
+    public function handle($request, Closure $next)
+    {
+        $site = $request->header('Site');
+        if(empty($site)) return response()->json(['code'=>201,'msg'=>'缺少站点信息','data'=>null]);
+
+        $config = config("u");
+        if(! isset($config[$site])) return [false, '站点:' . $site . '暂未配置,请联系管理员'];
+        $site_array = $config[$site];
+        if(empty($site_array['api_host'])) return  [false, '站点:' . $site . '下用友对外域名暂未配置,请联系管理员'];
+        if(empty($site_array['api_port'])) return  [false, '站点:' . $site . '下用友对外域名端口暂未配置,请联系管理员'];
+
+        $request->common_param = [
+            'site' => $site,
+            'api_host' => $site_array['api_host'],
+            'api_port' => $site_array['api_port'],
+        ];
+
+        return $next($request);
+    }
+}

+ 0 - 33
app/Http/Middleware/CheckWeinxin.php

@@ -1,33 +0,0 @@
-<?php
-
-namespace App\Http\Middleware;
-
-use Closure;
-use Illuminate\Http\Request;
-
-class CheckWeinxin
-{
-    /**
-     * Handle an incoming request.
-     *
-     * @param  Request  $request
-     * @param Closure $next
-     * @return mixed
-     */
-    public function handle($request, Closure $next)
-    {
-//        $token = $request->header('ciphertext');
-//        if (empty($token)) return response()->json(['code'=>401,'msg'=>'缺少openid','data'=>null]);
-
-        $token = $request->header('Authorization');
-//        if(empty($token)) return response()->json(['code'=>401,'msg'=>'缺少登录凭证','data'=>null]);
-
-        if(strpos($token, "Bearer ") === false) $token = "Bearer " . $token;
-        $data['token'] = $token;
-        $data['header'] = ["Authorization: {$token}",'Content-Type:application/json'];
-
-        $request->common_param = $data;
-
-        return $next($request);
-    }
-}

+ 8 - 4
app/Http/Middleware/U8Deal.php

@@ -33,8 +33,7 @@ class U8Deal
         $return = json_decode($response->content(),true);
         $return = json_decode($response->content(),true);
 
 
         if(isset($return['code'])){
         if(isset($return['code'])){
-            $data = $request->all();
-            $site = $data['site'] ?? "LFMY";
+            $site = $request->header('Site');
             $path = $request->path();
             $path = $request->path();
             $type = 0;
             $type = 0;
             if($path == "api/materialAddU8"){
             if($path == "api/materialAddU8"){
@@ -44,8 +43,13 @@ class U8Deal
             }elseif ($path == "api/dispatchAddU8"){
             }elseif ($path == "api/dispatchAddU8"){
                 $type = RecordTable::type_three;
                 $type = RecordTable::type_three;
             }
             }
-            $return_data = "";
-            if(! empty($return['data']) && is_array($return['data'])) $return_data = json_encode($return['data']);
+            $return_data = null;
+
+            if (!empty($return['data']) && is_array($return['data'])) {
+                $return_data = json_encode($return['data'], JSON_UNESCAPED_UNICODE);
+            } else {
+                $return_data = json_encode(new \stdClass()); // "{}"
+            }
             RecordTable::insert([
             RecordTable::insert([
                'msg' => $return['msg'] ?? "",
                'msg' => $return['msg'] ?? "",
                'data' => json_encode($request->all()),
                'data' => json_encode($request->all()),

+ 19 - 16
app/Service/TestService.php

@@ -429,11 +429,11 @@ class TestService extends Service
     }
     }
 
 
     //-----------------------------------朗峰u8-----
     //-----------------------------------朗峰u8-----
-    public function getToken(){
-        list($status, $msg) = $this->SetU8();
+    public function getToken($common_array){
+        list($status, $msg) = $this->SetU8($common_array);
         if(! $status) return [false , $msg];
         if(! $status) return [false , $msg];
         $host = $msg;
         $host = $msg;
-        $key = "lf_u8_long_token_demo";
+        $key = "lf_u8_long_token_demo_" . $common_array['site'];
         if(! Cache::has($key)){
         if(! Cache::has($key)){
             $url = $host . "/api/System/GetToken";
             $url = $host . "/api/System/GetToken";
             $date = date("Y-m-d");
             $date = date("Y-m-d");
@@ -460,8 +460,8 @@ class TestService extends Service
         return [true, [$host, $token]];
         return [true, [$host, $token]];
     }
     }
 
 
-    public function salesOrderGet($data){
-        list($status, $msg) = $this->getToken();
+    public function salesOrderGet($data, $common_array){
+        list($status, $msg) = $this->getToken($common_array);
         if(! $status) return [false, $msg];
         if(! $status) return [false, $msg];
         list($host, $token) = $msg;
         list($host, $token) = $msg;
 
 
@@ -537,11 +537,14 @@ class TestService extends Service
         return [true, $return];
         return [true, $return];
     }
     }
 
 
-    private function SetU8(){
-        $api_host = env('API_HOST');
-        if(empty($api_host)) return [false, '用友对外域名不存在'];
-        $api_port = env('API_PORT');
-        if(empty($api_port)) return [false, '用友对外域名端口不存在'];
+    private function SetU8($common_array){
+//        $api_host = env('API_HOST');
+//        if(empty($api_host)) return [false, '用友对外域名不存在'];
+//        $api_port = env('API_PORT');
+//        if(empty($api_port)) return [false, '用友对外域名端口不存在'];
+        $api_host = $common_array['api_host'];
+        $api_port = $common_array['api_port'];
+
         //映射ip是否通畅
         //映射ip是否通畅
         $bool = $this->isDomainAvailable($api_host);
         $bool = $this->isDomainAvailable($api_host);
         if(! $bool) return [false, '用友对外域名不可达'];
         if(! $bool) return [false, '用友对外域名不可达'];
@@ -570,8 +573,8 @@ class TestService extends Service
         return [true, $result['data']['DataTable1']];
         return [true, $result['data']['DataTable1']];
     }
     }
 
 
-    public function materialAddU8($data){
-        list($status, $msg) = $this->getToken();
+    public function materialAddU8($data,$common_array){
+        list($status, $msg) = $this->getToken($common_array);
         if(! $status) return [false, $msg];
         if(! $status) return [false, $msg];
         list($host, $token) = $msg;
         list($host, $token) = $msg;
 
 
@@ -597,8 +600,8 @@ class TestService extends Service
         return [true, $result['data']];
         return [true, $result['data']];
     }
     }
 
 
-    public function productInAddU8($data){
-        list($status, $msg) = $this->getToken();
+    public function productInAddU8($data,$common_array){
+        list($status, $msg) = $this->getToken($common_array);
         if(! $status) return [false, $msg];
         if(! $status) return [false, $msg];
         list($host, $token) = $msg;
         list($host, $token) = $msg;
 
 
@@ -623,8 +626,8 @@ class TestService extends Service
         return [true, $result['data']];
         return [true, $result['data']];
     }
     }
 
 
-    public function dispatchAddU8($data){
-        list($status, $msg) = $this->getToken();
+    public function dispatchAddU8($data,$common_array){
+        list($status, $msg) = $this->getToken($common_array);
         if(! $status) return [false, $msg];
         if(! $status) return [false, $msg];
         list($host, $token) = $msg;
         list($host, $token) = $msg;
 
 

+ 16 - 0
config/u.php

@@ -0,0 +1,16 @@
+<?php
+//状态码
+return [
+    "LFMY" => [
+        'api_host' => 'samata2924.imwork.net',
+        'api_port' => '47438',
+    ],
+    "HCLT" => [
+        'api_host' => '',
+        'api_port' => '',
+    ],
+    "JLWM" => [
+        'api_host' => '',
+        'api_port' => '',
+    ],
+];

+ 6 - 5
routes/api.php

@@ -61,11 +61,12 @@ Route::any('production_status','Api\ReportFormsController@production_status');
 
 
 //朗峰
 //朗峰
 Route::any('recordList', 'Api\TestController@recordList');
 Route::any('recordList', 'Api\TestController@recordList');
-Route::any('salesOrderGet', 'Api\TestController@salesOrderGet');
-Route::any('materialAddU8', 'Api\TestController@materialAddU8')->middleware('U8Deal');;
-Route::any('productInAddU8', 'Api\TestController@productInAddU8')->middleware('U8Deal');;
-Route::any('dispatchAddU8', 'Api\TestController@dispatchAddU8')->middleware('U8Deal');;
-
+Route::group(['middleware'=> ['CheckU8']],function ($route){
+    $route->any('salesOrderGet', 'Api\TestController@salesOrderGet');
+    $route->any('materialAddU8', 'Api\TestController@materialAddU8')->middleware('U8Deal');
+    $route->any('productInAddU8', 'Api\TestController@productInAddU8')->middleware('U8Deal');
+    $route->any('dispatchAddU8', 'Api\TestController@dispatchAddU8')->middleware('U8Deal');
+});
 Route::group(['middleware'=> ['CheckJRFIDLogin']],function ($route){
 Route::group(['middleware'=> ['CheckJRFIDLogin']],function ($route){
     //站点获取登录后
     //站点获取登录后
     $route->any('getSiteByLogin', 'Api\JRFIDController@getSite2');
     $route->any('getSiteByLogin', 'Api\JRFIDController@getSite2');