mkm/TaskSystem
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

更新

Browse Source
This commit is contained in:
mkm 2023-09-02 10:14:29 +08:00
parent 9063e3c126
commit 6355164fe3
2 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/api/controller/CompanyController.php
View File

@ -203,10 +203,10 @@ class CompanyController extends BaseApiController
if($contract['contract_url']=='' &&$contract['status']==1){ if($contract['contract_url']=='' &&$contract['status']==1){
app(JunziqianController::class)->download_file($contract['contract_no']); app(JunziqianController::class)->download_file($contract['contract_no']);
$contract_url = Contract::where('id', $contract['id'])->value('contract_url'); $contract_url = Contract::where('id', $contract['id'])->value('contract_url');
$find['contract_url'] = 'https://worker-task.lihaink.cn' . $contract_url; $find['contract_url'] = env('url.url_prefix'). $contract_url;
}else{ }else{
$find['contract_url'] = 'https://worker-task.lihaink.cn' . $contract['contract_url']; $find['contract_url'] = env('url.url_prefix') . $contract['contract_url'];
} }
$find['contract_time'] = $contract['create_time']; $find['contract_time'] = $contract['create_time'];
$find['check_status'] = $contract['check_status']; $find['check_status'] = $contract['check_status'];

13
app/api/controller/JunziqianController.php
View File

@ -74,7 +74,7 @@ class JunziqianController extends BaseApiController
if (isset($data['master_email'])) { if (isset($data['master_email'])) {
$request->emailOrMobile = $data['master_email']; //邮箱 $request->emailOrMobile = $data['master_email']; //邮箱
} }
$request->notifyUrl = 'https://worker-task.lihaink.cn/notify_authentication?id=' . $data['id']; $request->notifyUrl = env('url.url_prefix').'/notify_authentication?id=' . $data['id'];
//发起创建企业请求 //发起创建企业请求
$response = $requestUtils->doPost("/v2/user/organizationCreate", $request); $response = $requestUtils->doPost("/v2/user/organizationCreate", $request);
return $response; return $response;
@ -126,8 +126,11 @@ class JunziqianController extends BaseApiController
return $this->success('', (array)$response); return $this->success('', (array)$response);
} }
//签约 //签约
public function Signing($data, $id, $notify = 'https://worker-task.lihaink.cn/notify_url') public function Signing($data, $id, $notify = '')
{ {
if($notify!=''){
$notify=env('url.url_prefix').'/notify_url';
}
$requestUtils = new RequestUtils($this->serviceUrl, $this->appkey, $this->appSecret); $requestUtils = new RequestUtils($this->serviceUrl, $this->appkey, $this->appSecret);
$request = new ApplySignReq(); $request = new ApplySignReq();
$request->contractName = $data['name']; $request->contractName = $data['name'];
@ -180,7 +183,7 @@ class JunziqianController extends BaseApiController
$request->serverCa = 1; //是否需要服务端云证书 $request->serverCa = 1; //是否需要服务端云证书
$request->fileType = 3; $request->fileType = 3;
$request->htmlContent = $data['content']; $request->htmlContent = $data['content'];
$request->notifyUrl = 'https://worker-task.lihaink.cn/notify_url?id=' . $id; $request->notifyUrl = env('url.url_prefix').'/notify_url?id=' . $id;
$request->needQifengSign = 1; $request->needQifengSign = 1;
//发起PING请求 //发起PING请求
@ -193,7 +196,7 @@ class JunziqianController extends BaseApiController
$requestUtils = new RequestUtils($this->serviceUrl, $this->appkey, $this->appSecret); $requestUtils = new RequestUtils($this->serviceUrl, $this->appkey, $this->appSecret);
$find = Db::name('contract')->where('contract_no', $applyNo)->value('contract_url'); $find = Db::name('contract')->where('contract_no', $applyNo)->value('contract_url');
if ($find) { if ($find) {
return $this->success('获取成功', ['url' => 'https://worker-task.lihaink.cn' . $find]); return $this->success('获取成功', ['url' => env('url.url_prefix') . $find]);
} }
//初始化请求参数 //初始化请求参数
$request = array( $request = array(
@ -203,7 +206,7 @@ class JunziqianController extends BaseApiController
if ($response->success == true) { if ($response->success == true) {
$this->getDownload($response->data, root_path() . 'public/uploads/contract/' . $applyNo . '.pdf'); $this->getDownload($response->data, root_path() . 'public/uploads/contract/' . $applyNo . '.pdf');
Db::name('contract')->where('contract_no', $applyNo)->update(['contract_url' => '/uploads/contract/' . $applyNo . '.pdf']); Db::name('contract')->where('contract_no', $applyNo)->update(['contract_url' => '/uploads/contract/' . $applyNo . '.pdf']);
return $this->success('获取成功', ['url' => 'https://worker-task.lihaink.cn/uploads/contract/' . $applyNo . '.pdf']); return $this->success('获取成功', ['url' => env('url.url_prefix').'/uploads/contract/' . $applyNo . '.pdf']);
} else { } else {
return $this->fail('获取失败'); return $this->fail('获取失败');
} }