Merge remote-tracking branch 'origin/master'

app/Http/Controllers/Api/LoginController.php

@@ -20,6 +20,6 @@ class LoginController extends BaseController
         //生成token
         $jwtToken = TokenService::getToken($return['id']);
 
-        return $this->json_return(200,'', ['token' => $jwtToken, 'emp_name'=>$return['name'],'is_main'=>$return['is_main'],'top_depart_id'=>$return['top_depart_id'],'top_depart_title'=>$return['top_depart_title']]);
+        return $this->json_return(200,'', ['id' => $return['id'],'token' => $jwtToken, 'emp_name'=>$return['name'],'is_main'=>$return['is_main'],'top_depart_id'=>$return['top_depart_id'],'top_depart_title'=>$return['top_depart_title']]);
     }
 }

app/Service/ConstructionService.php

@@ -29,6 +29,9 @@ class ConstructionService extends Service
         list($status,$msg) = $this->constructionRule($data, $user, false);
         if(!$status) return [$status,$msg];
 
+        $params = $this->getDataFile($data);
+        (new OperationLogService())->setOperationList($params,$user,2);
+
         try {
             DB::beginTransaction();
 
@@ -118,8 +121,6 @@ class ConstructionService extends Service
             DB::rollBack();
             return [false,$exception->getMessage()];
         }
-        $params = $this->getDataFile($data);
-        (new OperationLogService())->setOperationList($params,$user,2);
 
         return [true,''];
     }

app/Service/PurchaseOrderService.php

@@ -31,6 +31,9 @@ class PurchaseOrderService extends Service
         list($status,$msg) = $this->orderRule($data,$user, false);
         if(!$status) return [$status,$msg];
 
+        $params = $this->getDataFile($data);
+        (new OperationLogService())->setOperationList($params,$user,2);
+
         try{
             DB::beginTransaction();
             $material_model = PurchaseOrder::where('order_number',$data['order_number'])->first();
@@ -94,9 +97,6 @@ class PurchaseOrderService extends Service
             return [false,$e->getMessage()];
         }
 
-        $params = $this->getDataFile($data);
-        (new OperationLogService())->setOperationList($params,$user,2);
-
         return [true,''];
     }
 

app/Service/ReturnExchangeOrderService.php

@@ -20,6 +20,9 @@ class ReturnExchangeOrderService extends Service
         list($status,$msg) = $this->orderRule($data,$user,false);
         if(!$status) return [$status,$msg];
 
+        $params = $this->getDataFile($data);
+        (new OperationLogService())->setOperationList($params,$user,2);
+
         try{
             DB::beginTransaction();
             $material_model = ReturnExchangeOrder::where('order_number',$data['order_number'])->first();
@@ -85,9 +88,6 @@ class ReturnExchangeOrderService extends Service
             return [false,$e->getMessage()];
         }
 
-        $params = $this->getDataFile($data);
-        (new OperationLogService())->setOperationList($params,$user,2);
-
         return [true,''];
     }
 

app/Service/SalesOrderService.php

@@ -34,6 +34,9 @@ class SalesOrderService extends Service
         list($status,$msg) = $this->salesOrderRule($data, $user, false);
         if(!$status) return [$status,$msg];
 
+        $params = $this->getDataFile($data);
+        (new OperationLogService())->setOperationList($params,$user,2);
+
         try {
             DB::beginTransaction();
 
@@ -161,9 +164,6 @@ class SalesOrderService extends Service
             return [false,$exception->getMessage()];
         }
 
-        $params = $this->getDataFile($data);
-        (new OperationLogService())->setOperationList($params,$user,2);
-
         return [true,''];
     }
 

app/Service/Service.php

@@ -411,4 +411,16 @@ class Service
 
         return $data;
     }
+
+    // 校验域名是否通畅可达
+    // $domain baidu.com 不要带http这些协议头
+    // gethostbyname() 函数可能会受到 PHP 配置中的 allow_url_fopen 和 disable_functions 选项的限制
+    function isDomainAvailable($domain) {
+        $ip = gethostbyname($domain);
+
+        // 如果解析失败或者返回的 IP 地址与输入的域名相同，则说明域名无效
+        if ($ip === $domain || filter_var($ip, FILTER_VALIDATE_IP) === false)  return false;
+
+        return true;
+    }
 }

app/Service/SportsBagService.php

@@ -207,7 +207,7 @@ class SportsBagService extends Service
         $product = [];
         if(! empty($ergs['product'])){
             $sales_p_info = SportsBagProductInfo::where('del_time',0)
-                ->where('sports_bag_id',array_column($data['data'],'id'))
+                ->whereIn('sports_bag_id',array_column($data['data'],'id'))
                 ->get()->toArray();
             $map = (new ProductService())->getProductDetail(array_column($sales_p_info,'product_id'));
             foreach ($sales_p_info as $value){

config/database.php

@@ -91,6 +91,15 @@ return [
             'prefix_indexes' => true,
         ],
 
+        //sqlserver 用友数据库
+        'sqlsrvs' => [
+            'driver' => 'sqlsrv',
+            'host' =>  '',
+            'port' => '',
+            'database' => '',
+            'username' => '',
+            'password' => '',
+        ],
     ],
 
     /*