no message

app/Http/Controllers/AdminApi/NotifyController.php

@@ -58,11 +58,11 @@ class NotifyController extends ApiController
                 Firm::where('authFlowId',$authFlowId)->update(['authorizeUserInfo'=>1,'realnameStatus'=>1,'orgId'=>$orgId,'authorizedInfo'=>$authorizedInfo]);
 
                 //检测系统内部的企业印章信息
-                JobServer::creatServer()->createFirmSealJob($orgId);
+//                JobServer::creatServer()->createFirmSealJob($orgId);
             }else{
                 Member::where('authFlowId',$authFlowId)->update(['authorizeUserInfo'=>1,'realnameStatus'=>1,'psnId'=>$psnId,'authorizedInfo'=>$authorizedInfo]);
                 //检测系统内部的企业印章信息
-                JobServer::creatServer()->createMemberSealJob($psnId);
+//                JobServer::creatServer()->createMemberSealJob($psnId);
             }
 
 

app/Servers/ESign/ESignContractServer.php

@@ -198,9 +198,9 @@ class ESignContractServer
                 ];
                 //获取签章
                 $m_id = $member->{'id'};
-                $seal=MemberSeal::where('m_id',$m_id)->where('seal_status',1)->select(['id','seal_id'])->first();
-                //印章ID
-                $assignedSealId=$seal->{'seal_id'};
+//                $seal=MemberSeal::where('m_id',$m_id)->where('seal_status',1)->select(['id','seal_id'])->first();
+//                //印章ID
+//                $assignedSealId=$seal->{'seal_id'};
                 //组装信息
                 $signersData = [
                     "signerType" => 0,
@@ -218,7 +218,7 @@ class ESignContractServer
                             "normalSignFieldConfig" => [
                                 "autoSign" =>false,
                                 "signFieldStyle" =>1,
-                                "assignedSealId"=>$assignedSealId,    // 在signFields中设置 assignedSealId为授权企业印章id
+//                                "assignedSealId"=>$assignedSealId,    // 在signFields中设置 assignedSealId为授权企业印章id
                                 "signFieldPosition" => [
                                     "positionPage" =>$value['positionPage'].'',
                                     "positionX" =>(int)$value['positionX'],
@@ -238,9 +238,9 @@ class ESignContractServer
                 ];
                 //获取用户签章
                 $firm_id = $firm->{'id'};
-                $seal=FirmSeal::where('firm_id',$firm_id)->where('seal_type','CONTRACT')->select(['id','seal_id'])->first();
-                //印章ID
-                $assignedSealId=$seal->{'seal_id'};
+//                $seal=FirmSeal::where('firm_id',$firm_id)->where('seal_type','CONTRACT')->select(['id','seal_id'])->first();
+//                //印章ID
+//                $assignedSealId=$seal->{'seal_id'};
                 $signersData = [
                     "signerType" => 1,
                     "orgSignerInfo" => [
@@ -263,7 +263,7 @@ class ESignContractServer
                             "normalSignFieldConfig" => [
                                 "autoSign" =>false,
                                 "signFieldStyle" =>1,
-                                "assignedSealId"=>$assignedSealId,    // 在signFields中设置 assignedSealId为授权企业印章id
+//                                "assignedSealId"=>$assignedSealId,    // 在signFields中设置 assignedSealId为授权企业印章id
                                 "signFieldPosition" => [
                                     "positionPage" =>$value['positionPage'].'',
                                     "positionX" =>(int)$value['positionX'],

app/Servers/ESign/ESignFirmServer.php

@@ -73,7 +73,7 @@ class ESignFirmServer
      */
     function organizationsIdentityInfo($firm_id,$orgName){
         $info =  Firm::where('id',$firm_id)->where('authType','ORG')->select(['realnameStatus','authorizeUserInfo','orgId'])->first();
-        if($info->{'realnameStatus'}==1  && $info->{'authorizeUserInfo'} == 1 && $info->{'orgId'}!=''){
+        if($info->{'realnameStatus'}==1 && $info->{'orgId'}!=''){
             return $info->{'realnameStatus'};
         }
 
@@ -99,11 +99,14 @@ class ESignFirmServer
                 'orgId'=>$orgId,
             ]);
 
-            if (empty($realnameStatus) || empty($authorizeUserInfo)){//走认证授权流程
+//            if (empty($realnameStatus) || empty($authorizeUserInfo)){//走认证授权流程
+//                $this->orgAuthUrl($firm_id,$orgName);
+//            }else{
+//                //检测系统内部的企业印章信息
+//                JobServer::creatServer()->createFirmSealJob($orgId);
+//            }
+            if (empty($realnameStatus)){//走认证授权流程
                 $this->orgAuthUrl($firm_id,$orgName);
-            }else{
-                //检测系统内部的企业印章信息
-                JobServer::creatServer()->createFirmSealJob($orgId);
             }
         }else{//证明从来没有在e签宝注册过
             //realnameStatus 0 - 未实名，1 - 已实名
@@ -150,11 +153,11 @@ class ESignFirmServer
                     ]
                 ],
             ],
-            "authorizeConfig"=>[
-                "authorizedScopes"=>[
-                    "get_org_identity_info","get_psn_identity_info","org_initiate_sign","psn_initiate_sign","manage_org_resource","manage_psn_resource","psn_sign_file_storage","org_sign_file_storage","org_approval_info","use_org_order"
-                ]
-            ],
+//            "authorizeConfig"=>[
+//                "authorizedScopes"=>[
+//                    "get_org_identity_info","get_psn_identity_info","org_initiate_sign","psn_initiate_sign","manage_org_resource","manage_psn_resource","psn_sign_file_storage","org_sign_file_storage","org_approval_info","use_org_order"
+//                ]
+//            ],
             "notifyUrl"=>route('adminApi.notify.esignNotify'),
             "clientType"=>"ALL",
             "appScheme"=>""

app/Servers/ESign/ESignServer.php

@@ -79,11 +79,11 @@ class ESignServer
                     "psnIDCardType" => "CRED_PSN_CH_IDCARD",
                 ],
             ],
-            "authorizeConfig" =>[
-                "authorizedScopes" => [
-                    "get_psn_identity_info","psn_initiate_sign","manage_psn_resource","psn_sign_file_storage"
-                ],
-            ],
+//            "authorizeConfig" =>[
+//                "authorizedScopes" => [
+//                    "get_psn_identity_info","psn_initiate_sign","manage_psn_resource","psn_sign_file_storage"
+//                ],
+//            ],
             "redirectConfig"=>[
                 "redirectUrl"=>'',
             ],
@@ -98,7 +98,6 @@ class ESignServer
         $response = EsignHttpHelper::doCommHttp($config['eSignHost'], $apiaddr, $requestType, $signAndBuildSignAndJsonHeader, $paramStr);
         $ret=json_decode($response->getBody(),true);
 
-        var_dump($ret);
         if(isset($ret['code']) && $ret['code']==0){
             $authShortUrl=RedisDataServer::creatServer()->getData($m_id.'_memberUrl');
             if($authShortUrl){
@@ -136,7 +135,7 @@ class ESignServer
     function personsidentityinfo($m_id,$phone,$psnName,$id_number)
     {
         $info =  Member::where('id_number',$id_number)->where('id',$m_id)->where('authType','PSN')->select(['realnameStatus','authorizeUserInfo','psnId'])->first();
-        if($info->{'realnameStatus'}==1 && $info->{'authorizeUserInfo'} == 1 && $info->{'psnId'}!=''){
+        if($info->{'realnameStatus'}==1 && $info->{'psnId'}!=''){
             return $info->{'realnameStatus'};
         }
 
@@ -147,9 +146,7 @@ class ESignServer
         //发起接口请求
         $response = EsignHttpHelper::doCommHttp($config['eSignHost'], $apiaddr, $requestType, $signAndBuildSignAndJsonHeader, "");
         $ret=json_decode($response->getBody(),true);
-        var_dump($ret);
         if(isset($ret['code']) && $ret['code']==0){
-            var_dump(147);
             //realnameStatus 0 - 未实名，1 - 已实名
             $realnameStatus = $ret['data']['realnameStatus'];
             //true - 已授权，false - 未授权
@@ -162,17 +159,18 @@ class ESignServer
                 'authorizeUserInfo'=>$authorizeUserInfo,
                 'psnId'=>$psnId,
             ]);
-            if (empty($realnameStatus) || empty($authorizeUserInfo)){//走个人认证授权流程
-                var_dump(258);
+//            if (empty($realnameStatus) || empty($authorizeUserInfo)){//走个人认证授权流程
+//                $this->psnauthurl($m_id,$phone,$psnName,$id_number,$psnId);
+//            }else{
+//                //检测系统内部的印章信息
+//                JobServer::creatServer()->createMemberSealJob($psnId);
+//            }
+            if (empty($realnameStatus)){//走个人认证授权流程
                 $this->psnauthurl($m_id,$phone,$psnName,$id_number,$psnId);
-            }else{
-                //检测系统内部的印章信息
-                JobServer::creatServer()->createMemberSealJob($psnId);
             }
             //未授权也注销
             if(empty($authorizeUserInfo))$realnameStatus=0;
         }else{//证明从来没有在e签宝注册过
-            var_dump(369);
             //realnameStatus 0 - 未实名，1 - 已实名
             $realnameStatus = 0;
             //true - 已授权，false - 未授权