Merge branch 'dev/ver/1.0.0' of http://git.ichunt.net/semour/semour_web into dev/ver/1.0.0

.env

@@ -13,6 +13,13 @@ DB_DATABASE=semour
 DB_USERNAME=semour
 DB_PASSWORD='semour#zsyM'
 
+DB_CMS_CONNECTION=web
+DB_CMS_HOST=192.168.1.238
+DB_CMS_PORT=3306
+DB_CMS_DATABASE=icdata
+DB_CMS_USERNAME=icdata
+DB_CMS_PASSWORD='icdata#zsyM'
+
 BROADCAST_DRIVER=log
 CACHE_DRIVER=file
 QUEUE_CONNECTION=sync

app/Http/Controllers/Api/AuthApiController.php

@@ -225,7 +225,7 @@ class AuthApiController extends Controller
 //            return $this->setError('Email code send failed');
 //        }
 
-        return $this->setSuccess('Email code send success '.$code);
+        return $this->setSuccess('A verification code has been sent. Please enter the code below to continue. '.$code);
     }
 
 }

app/Http/Controllers/UserController.php

@@ -24,7 +24,7 @@ class UserController extends Controller
 
     public function inquiry(Request $request)
     {
-        $userId = $_COOKIE['sem_user_id'];
+        $userId = \Auth::id();
         //获取不同状态的统计
         $statusCount = InquiryService::getStatusCount($userId);
         return view('user.inquiry',compact('statusCount'));

app/Http/Services/UserService.php

@@ -32,7 +32,7 @@ class UserService
             'company_name' => $data['company_name'],
             'account_properties' => $data['account_properties'],
             'sale_id' => $salesId,
-            'sale_name' => \Arr::get($sales, 'name'),
+            'sale_name' => \Arr::get($sales, 'name',''),
             'create_time' => time(),
             'password' => Hash::make($data['password']),
         ]);