up

app/Http/Controllers/AjaxController.php

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

app/Http/Controllers/PermController.php

@@ -180,7 +180,7 @@
 		            }
 		            }
 
 
 		            // 查看菜单权限
 		            // 查看菜单权限
-		            $permId = 'cron_'.$permId . '_check';
+		            $permId = $permId . '_check';
 
 
 		           	if (!in_array($permId, $perms)) {
 		           	if (!in_array($permId, $perms)) {
 		                unset($menus[$k]);
 		                unset($menus[$k]);

app/Http/Controllers/WebController.php

@@ -93,7 +93,7 @@ class WebController extends Controller
     public function showPage($request,$info){
     public function showPage($request,$info){
         $info['title'] = '预览';
         $info['title'] = '预览';
         $id = $request->input("tmpl_relation_id",0);
         $id = $request->input("tmpl_relation_id",0);
-        $html = (new \App\Services\LabelService)->getLabelHtml(5);
+        $html = (new \App\Services\LabelService)->getLabelHtml($id);
         $info["html"] = $html;
         $info["html"] = $html;
         return view('web', $info);
         return view('web', $info);
     }
     }

app/Services/LabelService.php

@@ -10,6 +10,8 @@ use App\Http\Controllers\Controller;
 use App\Model\TemplateListModel;
 use App\Model\TemplateListModel;
 use App\Model\NodesModel;
 use App\Model\NodesModel;
 use App\Model\TmplRelationsModel;
 use App\Model\TmplRelationsModel;
+use DNS1D;
+use DNS2D;
 
 
 class LabelService {
 class LabelService {
     public function getLabelHtml($id){
     public function getLabelHtml($id){

config/website.php

@@ -12,7 +12,7 @@ return [
 
 
     'domain' => 'liexin.net',
     'domain' => 'liexin.net',
 
 
-    'risk_url' => 'http://risk.liexin.net',
+    'risk_url' => 'http://label.liexin.net',
     // API项目
     // API项目
     'api_domain' => 'http://api.liexin.com/',
     'api_domain' => 'http://api.liexin.com/',
     // 获取用户权限接口
     // 获取用户权限接口