2 Commits 4b65e03946 ... 4c590db5d0

Autore SHA1 Messaggio Data
  DESKTOP-70VPDLK\Administrator 4c590db5d0 Merge branch 'master' of http://git.jhcs888.com/ph/esign_serve 5 mesi fa
  DESKTOP-70VPDLK\Administrator e7fe7ae84f no message 5 mesi fa

+ 12 - 1
.idea/deployment.xml

@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
-  <component name="PublishConfigData" autoUpload="Always" serverName="esign_serve" remoteFilesAllowedToDisappearOnAutoupload="false">
+  <component name="PublishConfigData" autoUpload="Always" serverName="zs" remoteFilesAllowedToDisappearOnAutoupload="false" confirmBeforeUploading="false">
+    <option name="confirmBeforeUploading" value="false" />
     <serverData>
       <paths name="esign_serve">
         <serverdata>
@@ -12,6 +13,16 @@
           </excludedPaths>
         </serverdata>
       </paths>
+      <paths name="zs">
+        <serverdata>
+          <mappings>
+            <mapping deploy="/" local="$PROJECT_DIR$" web="/" />
+          </mappings>
+          <excludedPaths>
+            <excludedPath path="/.env" />
+          </excludedPaths>
+        </serverdata>
+      </paths>
     </serverData>
     <option name="myAutoUpload" value="ALWAYS" />
   </component>

+ 3 - 0
.idea/esign_serve.iml

@@ -8,6 +8,7 @@
       <sourceFolder url="file://$MODULE_DIR$/tests" isTestSource="true" packagePrefix="Tests\" />
       <sourceFolder url="file://$MODULE_DIR$/tests/Feature" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/tests/Unit" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/spec" isTestSource="true" />
       <excludeFolder url="file://$MODULE_DIR$/vendor/adbario/php-dot-notation" />
       <excludeFolder url="file://$MODULE_DIR$/vendor/alibabacloud/client" />
       <excludeFolder url="file://$MODULE_DIR$/vendor/alibabacloud/sdk" />
@@ -127,6 +128,8 @@
       <excludeFolder url="file://$MODULE_DIR$/vendor/webmozart/assert" />
       <excludeFolder url="file://$MODULE_DIR$/vendor/phpoffice/math" />
       <excludeFolder url="file://$MODULE_DIR$/vendor/phpoffice/phpword" />
+      <excludeFolder url="file://$MODULE_DIR$/storage/app" />
+      <excludeFolder url="file://$MODULE_DIR$/storage/framework" />
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />

+ 57 - 0
.idea/phpspec.xml

@@ -11,6 +11,63 @@
       <PhpSpecSuiteConfiguration>
         <option name="myPath" value="$PROJECT_DIR$" />
       </PhpSpecSuiteConfiguration>
+      <PhpSpecSuiteConfiguration>
+        <option name="myPath" value="$PROJECT_DIR$" />
+      </PhpSpecSuiteConfiguration>
+      <PhpSpecSuiteConfiguration>
+        <option name="myPath" value="$PROJECT_DIR$" />
+      </PhpSpecSuiteConfiguration>
+      <PhpSpecSuiteConfiguration>
+        <option name="myPath" value="$PROJECT_DIR$" />
+      </PhpSpecSuiteConfiguration>
+      <PhpSpecSuiteConfiguration>
+        <option name="myPath" value="$PROJECT_DIR$" />
+      </PhpSpecSuiteConfiguration>
+      <PhpSpecSuiteConfiguration>
+        <option name="myPath" value="$PROJECT_DIR$" />
+      </PhpSpecSuiteConfiguration>
+      <PhpSpecSuiteConfiguration>
+        <option name="myPath" value="$PROJECT_DIR$" />
+      </PhpSpecSuiteConfiguration>
+      <PhpSpecSuiteConfiguration>
+        <option name="myPath" value="$PROJECT_DIR$" />
+      </PhpSpecSuiteConfiguration>
+      <PhpSpecSuiteConfiguration>
+        <option name="myPath" value="$PROJECT_DIR$" />
+      </PhpSpecSuiteConfiguration>
+      <PhpSpecSuiteConfiguration>
+        <option name="myPath" value="$PROJECT_DIR$" />
+      </PhpSpecSuiteConfiguration>
+      <PhpSpecSuiteConfiguration>
+        <option name="myPath" value="$PROJECT_DIR$" />
+      </PhpSpecSuiteConfiguration>
+      <PhpSpecSuiteConfiguration>
+        <option name="myPath" value="$PROJECT_DIR$" />
+      </PhpSpecSuiteConfiguration>
+      <PhpSpecSuiteConfiguration>
+        <option name="myPath" value="$PROJECT_DIR$" />
+      </PhpSpecSuiteConfiguration>
+      <PhpSpecSuiteConfiguration>
+        <option name="myPath" value="$PROJECT_DIR$" />
+      </PhpSpecSuiteConfiguration>
+      <PhpSpecSuiteConfiguration>
+        <option name="myPath" value="$PROJECT_DIR$" />
+      </PhpSpecSuiteConfiguration>
+      <PhpSpecSuiteConfiguration>
+        <option name="myPath" value="$PROJECT_DIR$" />
+      </PhpSpecSuiteConfiguration>
+      <PhpSpecSuiteConfiguration>
+        <option name="myPath" value="$PROJECT_DIR$" />
+      </PhpSpecSuiteConfiguration>
+      <PhpSpecSuiteConfiguration>
+        <option name="myPath" value="$PROJECT_DIR$" />
+      </PhpSpecSuiteConfiguration>
+      <PhpSpecSuiteConfiguration>
+        <option name="myPath" value="$PROJECT_DIR$" />
+      </PhpSpecSuiteConfiguration>
+      <PhpSpecSuiteConfiguration>
+        <option name="myPath" value="$PROJECT_DIR$" />
+      </PhpSpecSuiteConfiguration>
     </suites>
   </component>
 </project>

+ 2 - 0
.idea/sshConfigs.xml

@@ -3,6 +3,8 @@
   <component name="SshConfigs">
     <configs>
       <sshConfig authType="PASSWORD" host="139.9.209.98" id="32667e50-9ae5-4ba4-887c-eb63a72333f5" port="22" nameFormat="DESCRIPTIVE" username="root" useOpenSSHConfig="true" />
+      <sshConfig authType="PASSWORD" host="113.45.176.174" id="b77472eb-8cb7-402b-b69d-6c7acb9ede16" port="22" nameFormat="DESCRIPTIVE" username="root" useOpenSSHConfig="true" />
+      <sshConfig authType="PASSWORD" host="121.37.217.17" id="2c9dd1a3-bd32-458a-b106-04550549f59a" port="22" nameFormat="DESCRIPTIVE" username="root" useOpenSSHConfig="true" />
     </configs>
   </component>
 </project>

+ 8 - 1
.idea/webServers.xml

@@ -3,7 +3,14 @@
   <component name="WebServers">
     <option name="servers">
       <webServer id="5d512391-bcde-40be-8490-61f7f6f02028" name="esign_serve">
-        <fileTransfer rootFolder="/www/wwwroot/testsign.jhcs888.com/esign_serve" accessType="SFTP" host="139.9.209.98" port="22" sshConfigId="32667e50-9ae5-4ba4-887c-eb63a72333f5" sshConfig="root@139.9.209.98:22 password">
+        <fileTransfer rootFolder="/www/wwwroot/testsign.jhcs888.com/esign_serve" accessType="SFTP" host="113.45.176.174" port="22" sshConfigId="b77472eb-8cb7-402b-b69d-6c7acb9ede16" sshConfig="root@113.45.176.174:22 password">
+          <advancedOptions>
+            <advancedOptions dataProtectionLevel="Private" keepAliveTimeout="0" passiveMode="true" shareSSLContext="true" />
+          </advancedOptions>
+        </fileTransfer>
+      </webServer>
+      <webServer id="e37b9327-954c-45b8-b025-0054453374c7" name="zs">
+        <fileTransfer rootFolder="/www/wwwroot/esign.jhcs888.com/esign_serve" accessType="SFTP" host="121.37.217.17" port="22" sshConfigId="2c9dd1a3-bd32-458a-b106-04550549f59a" sshConfig="root@121.37.217.17:22 password">
           <advancedOptions>
             <advancedOptions dataProtectionLevel="Private" keepAliveTimeout="0" passiveMode="true" shareSSLContext="true" />
           </advancedOptions>

+ 3 - 3
app/Http/Controllers/Api/MemberController.php

@@ -85,7 +85,7 @@ class MemberController extends ApiController
         $parts = parse_url($current_url);
         $query = isset($parts['query']) ? $parts['query'] : '';
         // 根据需求修改URL
-        $new_url = 'https://smlt.esign.cn/'.$query; // 自定义URL
+        $new_url = 'https://t.esign.cn/'.$query; // 自定义URL
         // 执行重定向
         header("Location: $new_url");
     }
@@ -102,7 +102,7 @@ class MemberController extends ApiController
         $parts = parse_url($current_url);
         $query = isset($parts['query']) ? $parts['query'] : '';
         // 根据需求修改URL
-        $new_url = 'https://smlt.esign.cn/'.$query; // 自定义URL
+        $new_url = 'https://t.esign.cn/'.$query; // 自定义URL
         // 执行重定向
         header("Location: $new_url");
     }
@@ -119,7 +119,7 @@ class MemberController extends ApiController
         $parts = parse_url($current_url);
         $query = isset($parts['query']) ? $parts['query'] : '';
         // 根据需求修改URL
-        $new_url = 'https://smlt.esign.cn/'.$query; // 自定义URL
+        $new_url = 'https://t.esign.cn/'.$query; // 自定义URL
         // 执行重定向
         header("Location: $new_url");
     }

+ 5 - 5
app/Servers/ESign/ESignContractServer.php

@@ -81,10 +81,10 @@ class ESignContractServer
 
         $signAndBuildSignAndJsonHeader = EsignHttpHelper::signAndBuildSignAndJsonHeader($config['eSignAppId'], $config['eSignAppSecret'], $paramStr, $requestType, $apiaddr);
         //获取文件上传地址
-//        EsignLogHelper::printMsg($signAndBuildSignAndJsonHeader);
+        EsignLogHelper::printMsg($signAndBuildSignAndJsonHeader);
         $response = EsignHttpHelper::doCommHttp($config['eSignHost'], $apiaddr, $requestType, $signAndBuildSignAndJsonHeader, $paramStr);
-//        EsignLogHelper::printMsg($response->getStatus());
-//        EsignLogHelper::printMsg($response->getBody());
+        EsignLogHelper::printMsg($response->getStatus());
+        EsignLogHelper::printMsg($response->getBody());
         $fileUploadUrl=json_decode($response->getBody())->data->fileUploadUrl;
         $fileId=json_decode($response->getBody())->data->fileId;
         //文件流put上传
@@ -309,8 +309,8 @@ class ESignContractServer
                 $zh_url = route('member.sign').'?'.$path;
 
                 if($urlRet){
-                    $content='尊敬的'.$item['promissoryName'].',您有待签署合同《'.$file_name.'》,点击签署 '.$urlRet.'。拒收请回复R';
-//                    $content='尊敬的'.$item['promissoryName'].',您有待签署合同《'.$file_name.'》,点击签署 '.$zh_url.'。拒收请回复R';
+//                    $content='尊敬的'.$item['promissoryName'].',您有待签署合同《'.$file_name.'》,点击签署 '.$urlRet.'。拒收请回复R';
+                    $content='尊敬的'.$item['promissoryName'].',您有待签署合同《'.$file_name.'》,点击签署 '.$zh_url.'。拒收请回复R';
                     SmsServer::creatServer()->sendContent($item['psnAccount'],$content);
                     SignContract::where('id',$sign_id)->update(['sign_url'=>$urlRet]);
                 }

+ 2 - 2
app/Servers/ESign/ESignFirmServer.php

@@ -194,8 +194,8 @@ class ESignFirmServer
             $path = trim($parts['path'],'/');
             $zh_url = route('member.firm').'?'.$path;
 
-            $content='尊敬的'.$firm['legal_name'].',您有关联的企业信息待认证,点击认证 '.$authShortUrl.'。拒收请回复R';
-//            $content='尊敬的'.$firm['legal_name'].',您有关联的企业信息待认证,点击认证 '.$zh_url.'。拒收请回复R';
+//            $content='尊敬的'.$firm['legal_name'].',您有关联的企业信息待认证,点击认证 '.$authShortUrl.'。拒收请回复R';
+            $content='尊敬的'.$firm['legal_name'].',您有关联的企业信息待认证,点击认证 '.$zh_url.'。拒收请回复R';
             SmsServer::creatServer()->sendContent($firm['phone'],$content);
 
             //存入数据库

+ 3 - 2
app/Servers/ESign/ESignServer.php

@@ -98,6 +98,7 @@ class ESignServer
         $response = EsignHttpHelper::doCommHttp($config['eSignHost'], $apiaddr, $requestType, $signAndBuildSignAndJsonHeader, $paramStr);
         $ret=json_decode($response->getBody(),true);
 
+
         if(isset($ret['code']) && $ret['code']==0){
             $authShortUrl=RedisDataServer::creatServer()->getData($m_id.'_memberUrl');
             if($authShortUrl){
@@ -113,8 +114,8 @@ class ESignServer
                 $zh_url = route('member.user').'?'.$path;
                 RedisDataServer::creatServer()->setData($m_id.'_memberUrl',$authShortUrl,'str',600);
                 $authFlowId = $ret['data']['authFlowId'];
-                $content='尊敬的'.$signMember['name'].',您有待认证信息,点击认证 '.$authShortUrl.'。拒收请回复R';
-//                $content='尊敬的'.$signMember['name'].',您有待认证信息,点击认证 '.$zh_url.'。拒收请回复R';
+//                $content='尊敬的'.$signMember['name'].',您有待认证信息,点击认证 '.$authShortUrl.'。拒收请回复R';
+                $content='尊敬的'.$signMember['name'].',您有待认证信息,点击认证 '.$zh_url.'。拒收请回复R';
                  SmsServer::creatServer()->sendContent($signMember['phone'],$content);
                 //存入数据库
                 $signMember->update([

+ 1 - 0
app/Servers/System/SmsServer.php

@@ -97,6 +97,7 @@ class SmsServer
             $message_server = EasySmsService::getMessageServer();
             $message_server->setContent($content);
             $send_info = EasySmsService::getSmsServer()->creatQybSms()->send($phone, $message_server);
+//            Log::info($message);
         }catch (\Exception $e){
             $this->errorMsg=$e->getMessage();
             return false;