Merge branch 'master' of http://119.23.72.7/sunlong_v5/note-library

.env

@@ -57,5 +57,5 @@ MAIL_ENCRYPTION=tls
 ADMIN=liuzhiyong@teshehui.com
 ADMIN=liuzhiyong@teshehui.com
 LOGIN_DOMAIN='user.liexin.net'
 LOGIN_DOMAIN='user.liexin.net'
 
 
-ERP_SUPPLY_DOMAIN=http://192.168.1.235:6888
-ERP_SUPPLY_DB_NAME=demo
+ERP_DOMAIN=http://192.168.1.235:6888
+ERP_DB_NAME=ICHUNT
\ No newline at end of file

.gitignore

@@ -15,3 +15,4 @@ Homestead.json
 /storage/debugbar
 /storage/debugbar
 .DS_Store
 .DS_Store
 */.DS_Store
 */.DS_Store
+.env
\ No newline at end of file

app/Http/Controllers/AjaxController.php

@@ -92,9 +92,10 @@ Class AjaxController extends Controller
             $tmpl->status = ($tmpl->status == -1) ? 1 :-1;
             $tmpl->status = ($tmpl->status == -1) ? 1 :-1;
             $tmpl->save();
             $tmpl->save();
             //此处推送到erp
             //此处推送到erp
-
-            $a = $this->erp->createIssueLabel(1,"测试模板0001","田超",1);
-            dump($a);
+            $this->pushTemplateErp();
+//            dump($this->erp);
+//            $a = $this->erp->createIssueLabel(1,"测试模板0001","田超",1);
+//            dump($a);
 
 
 
 
             return $this->ajaxReturn(0,"修改成功");
             return $this->ajaxReturn(0,"修改成功");
@@ -140,12 +141,21 @@ Class AjaxController extends Controller
     protected function pushTemplateErp(){
     protected function pushTemplateErp(){
         try{
         try{
             //登录
             //登录
-            $soap = new \SoapClient(env("ERP_SUPPLY_DOMAIN").'/ormrpc/services/EASLogin?wsdl');
-            $res = $soap->login('PT', '123456', 'eas', env('ERP_SUPPLY_DB_NAME'),  'L2', 1, 'BaseDB');
+            $soap = new \SoapClient(env("ERP_DOMAIN").'/ormrpc/services/EASLogin?wsdl');
+            $res = $soap->login('PT', '123456', 'eas', env('ERP_DB_NAME'),  'L2', 1, 'BaseDB');
             //接口
             //接口
-            $this->erp = new \SoapClient(ENV("ERP_SUPPLY_DOMAIN").'/ormrpc/services/WSIchuntjKFacade?wsdl');
+            $this->erp = new \SoapClient(ENV("ERP_DOMAIN").'/ormrpc/services/WSIchuntjKFacade?wsdl');
+//            dump($this->erp);
+            $this->erp->createIssueLabel(json_encode([
+                "templateId"=>1,
+                "templateNmae"=>"aaaa",
+                "createUser"=>"bbbb",
+                "status"=>1,
+            ]));
+            return true;
         }catch(\Exception $e){
         }catch(\Exception $e){
-
+            return false;
+//        dump($e->getMessage());
         }
         }
     }
     }
 
 

app/Http/Controllers/WebController.php

@@ -54,7 +54,7 @@ class WebController extends Controller
     // 首页
     // 首页
     public function index(Request $request)
     public function index(Request $request)
     {
     {
-        $JobsModel = new JobsModel();
+//        $JobsModel = new JobsModel();
 
 
         $info = $this->getPageInfo($request);
         $info = $this->getPageInfo($request);