Skip to content

Commit aca32be

Browse files
modstartmodstart
committed
feat: release 5.5.0
1 parent 6f06e72 commit aca32be

File tree

33 files changed

+763
-186
lines changed

33 files changed

+763
-186
lines changed

‎module/Member/Core/ModuleServiceProvider.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,7 @@ public function boot(Dispatcher $events)
111111
$row->column(3, DashboardItemA::makeIconNumberTitle(
112112
'iconfont icon-user',
113113
ModelUtil::count('member_user', ['isDeleted' => false]),
114-
'用户数',
114+
'用户',
115115
modstart_admin_url('member'), ColorUtil::randomColor()
116116
));
117117
});

‎module/ModuleStore/Admin/Controller/ModuleStoreController.php‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ public function disable()
101101
$ret = ModuleManager::disable($module);
102102
BizException::throwsIfResponseError($ret);
103103
return $this->doFinish([
104-
'<span class="ub-text-success">禁用成功，请 <a href="javascript:;" onclick="window.location.reload()">刷新后台</a> 查看最新系统</span>',
104+
'<span class="ub-text-success">禁用成功，请 <a href="javascript:;" onclick="parent.location.reload()">刷新后台</a> 查看最新系统</span>',
105105
]);
106106
}
107107
}
@@ -123,7 +123,7 @@ public function enable()
123123
$ret = ModuleManager::enable($module);
124124
BizException::throwsIfResponseError($ret);
125125
return $this->doFinish([
126-
'<span class="ub-text-success">启动成功，请 <a href="javascript:;" onclick="window.location.reload()">刷新后台</a> 查看最新系统</span>',
126+
'<span class="ub-text-success">启动成功，请 <a href="javascript:;" onclick="parent.location.reload()">刷新后台</a> 查看最新系统</span>',
127127
]);
128128
}
129129
}
@@ -148,7 +148,7 @@ public function uninstall()
148148
$ret = ModuleManager::uninstall($module);
149149
BizException::throwsIfResponseError($ret);
150150
return $this->doFinish([
151-
'<span class="ub-text-success">卸载完成，请 <a href="javascript:;" onclick="window.location.reload()">刷新后台</a> 查看最新系统</span>',
151+
'<span class="ub-text-success">卸载完成，请 <a href="javascript:;" onclick="parent.location.reload()">刷新后台</a> 查看最新系统</span>',
152152
]);
153153
}
154154
} else {
@@ -157,7 +157,7 @@ public function uninstall()
157157
$ret = ModuleStoreUtil::removeModule($module, $version);
158158
BizException::throwsIfResponseError($ret);
159159
return $this->doFinish([
160-
'<span class="ub-text-success">卸载完成，请 <a href="javascript:;" onclick="window.location.reload()">刷新后台</a> 查看最新系统</span>',
160+
'<span class="ub-text-success">卸载完成，请 <a href="javascript:;" onclick="parent.location.reload()">刷新后台</a> 查看最新系统</span>',
161161
]);
162162
default:
163163
$ret = ModuleManager::uninstall($module);
@@ -192,7 +192,7 @@ public function upgrade()
192192
$ret = ModuleManager::enable($module);
193193
BizException::throwsIfResponseError($ret);
194194
return $this->doFinish([
195-
'<span class="ub-text-success">升级安装完成，请 <a href="javascript:;" onclick="window.location.reload()">刷新后台</a> 查看最新系统</span>',
195+
'<span class="ub-text-success">升级安装完成，请 <a href="javascript:;" onclick="parent.location.reload()">刷新后台</a> 查看最新系统</span>',
196196
]);
197197
case 'unpackPackage':
198198
$package = $dataInput->getTrimString('package');
@@ -274,7 +274,7 @@ public function install()
274274
$ret = ModuleManager::enable($module);
275275
BizException::throwsIfResponseError($ret);
276276
return $this->doFinish([
277-
'<span class="ub-text-success">安装完成，请 <a href="javascript:;" onclick="window.location.reload()">刷新后台</a> 查看最新系统</span>',
277+
'<span class="ub-text-success">安装完成，请 <a href="javascript:;" onclick="parent.location.reload()">刷新后台</a> 查看最新系统</span>',
278278
]);
279279
default:
280280
return $this->doNext('install', 'installModule', [
@@ -293,7 +293,7 @@ public function install()
293293
$ret = ModuleManager::enable($module);
294294
BizException::throwsIfResponseError($ret);
295295
return $this->doFinish([
296-
'<span class="ub-text-success">安装完成，请 <a href="javascript:;" onclick="window.location.reload()">刷新后台</a> 查看最新系统</span>',
296+
'<span class="ub-text-success">安装完成，请 <a href="javascript:;" onclick="parent.location.reload()">刷新后台</a> 查看最新系统</span>',
297297
]);
298298
case 'unpackPackage':
299299
$package = $dataInput->getTrimString('package');

‎module/ModuleStore/Docs/release.md‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,9 @@
1+
## 2.0.0
2+
3+
- 新增：模块市场页面刷新兼容TAB标签
4+
5+
---
6+
17
## 1.9.0 预览宝功能支持，升级逻辑优化
28

39
- 新增：模块市场预览包功能支持

‎module/ModuleStore/config.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
"Vendor:>=1.4.0"
1717
],
1818
"modstartVersion": ">=3.3.0",
19-
"version": "1.9.0",
19+
"version": "2.0.0",
2020
"author": "官方",
2121
"description": "提供各种各样的应用模块，方便应用快速集成"
2222
}

‎module/Vendor/Docs/release.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
## 3.7.0
1+
## 3.7.0 任务调度升级，订单处理优化
22

33
- 新增：任务调度执行器ScheduleRunner
44
- 新增：SiteUrlBiz 网站链接管理基础组件

‎module/Vendor/Installer/function.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ function php_version_requires()
6767
function php_version_ok()
6868
{
6969
if (INSTALL_APP == 'CMS9') {
70-
if (version_compare(PHP_VERSION, '8.0.0', '<')) {
70+
if (version_compare(PHP_VERSION, '8.1.0', '<')) {
7171
return false;
7272
}
7373
return true;

‎module/Vendor/Tecmz/Tecmz.php‎

Lines changed: 289 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -425,4 +425,293 @@ public function personVerifyIdCard($name, $idCardNumber)
425425
return $this->request('/person_verify_id_card', $post);
426426
}
427427

428+
private function callFileConvertQueue($type, $url, $name = null, $param = [])
429+
{
430+
$post = [];
431+
$post['url'] = $url;
432+
$post['name'] = $name;
433+
$post['param'] = json_encode($param, JSON_UNESCAPED_UNICODE);
434+
return $this->request('/' . $type . '/queue', $post);
435+
}
436+
437+
private function callFileConvertQuery($type, $jobId)
438+
{
439+
$post = [];
440+
$post['jobId'] = $jobId;
441+
return $this->request('/' . $type . '/query', $post);
442+
}
443+
444+
/**
445+
*
446+
* @param $url string
447+
* @param $name string
448+
* @param $param array
449+
* @return array|mixed
450+
*/
451+
public function aiToImageQueue($url, $name = null, $param = [])
452+
{
453+
return $this->callFileConvertQueue('ai_to_image', $url, $name, $param);
454+
}
455+
456+
/**
457+
* @param $jobId int
458+
* @return array|mixed
459+
*/
460+
public function aiToImageQuery($jobId)
461+
{
462+
return $this->callFileConvertQuery('ai_to_image', $jobId);
463+
}
464+
465+
/**
466+
*
467+
* @param $url string
468+
* @param $name string
469+
* @param $param array
470+
* @return array|mixed
471+
*/
472+
public function amrConvertQueue($url, $name = null, $param = [])
473+
{
474+
return $this->callFileConvertQueue('amr_convert', $url, $name, $param);
475+
}
476+
477+
/**
478+
* @param $jobId int
479+
* @return array|mixed
480+
*/
481+
public function amrConvertQuery($jobId)
482+
{
483+
return $this->callFileConvertQuery('amr_convert', $jobId);
484+
}
485+
486+
/**
487+
*
488+
* @param $url string
489+
* @param $name string
490+
* @param $param array
491+
* @return array|mixed
492+
*/
493+
public function docToPdfQueue($url, $name = null, $param = [])
494+
{
495+
return $this->callFileConvertQueue('doc_to_pdf', $url, $name, $param);
496+
}
497+
498+
/**
499+
* @param $jobId int
500+
* @return array|mixed
501+
*/
502+
public function docToPdfQuery($jobId)
503+
{
504+
return $this->callFileConvertQuery('doc_to_pdf', $jobId);
505+
}
506+
507+
/**
508+
*
509+
* @param $url string
510+
* @param $name string
511+
* @param $param array
512+
* @return array|mixed
513+
*/
514+
public function epsToImageQueue($url, $name = null, $param = [])
515+
{
516+
return $this->callFileConvertQueue('eps_to_image', $url, $name, $param);
517+
}
518+
519+
/**
520+
* @param $jobId int
521+
* @return array|mixed
522+
*/
523+
public function epsToImageQuery($jobId)
524+
{
525+
return $this->callFileConvertQuery('eps_to_image', $jobId);
526+
}
527+
528+
/**
529+
*
530+
* @param $url string
531+
* @param $name string
532+
* @param $param array
533+
* @return array|mixed
534+
*/
535+
public function mp3ConvertQueue($url, $name = null, $param = [])
536+
{
537+
return $this->callFileConvertQueue('mp3_convert', $url, $name, $param);
538+
}
539+
540+
/**
541+
* @param $jobId int
542+
* @return array|mixed
543+
*/
544+
public function mp3ConvertQuery($jobId)
545+
{
546+
return $this->callFileConvertQuery('mp3_convert', $jobId);
547+
}
548+
549+
/**
550+
*
551+
* @param $url string
552+
* @param $name string
553+
* @param $param array
554+
* @return array|mixed
555+
*/
556+
public function wavConvertQueue($url, $name = null, $param = [])
557+
{
558+
return $this->callFileConvertQueue('wav_convert', $url, $name, $param);
559+
}
560+
561+
/**
562+
* @param $jobId int
563+
* @return array|mixed
564+
*/
565+
public function wavConvertQuery($jobId)
566+
{
567+
return $this->callFileConvertQuery('wav_convert', $jobId);
568+
}
569+
570+
/**
571+
*
572+
* @param $url string
573+
* @param $name string
574+
* @param $param array
575+
* @return array|mixed
576+
*/
577+
public function pdfCollectQueue($url, $name = null, $param = [])
578+
{
579+
return $this->callFileConvertQueue('pdf_collect', $url, $name, $param);
580+
}
581+
582+
/**
583+
* @param $jobId int
584+
* @return array|mixed
585+
*/
586+
public function pdfCollectQuery($jobId)
587+
{
588+
return $this->callFileConvertQuery('pdf_collect', $jobId);
589+
}
590+
591+
/**
592+
*
593+
* @param $url string
594+
* @param $name string
595+
* @param $param array
596+
* @return array|mixed
597+
*/
598+
public function pdfDecryptQueue($url, $name = null, $param = [])
599+
{
600+
return $this->callFileConvertQueue('pdf_decrypt', $url, $name, $param);
601+
}
602+
603+
/**
604+
* @param $jobId int
605+
* @return array|mixed
606+
*/
607+
public function pdfDecryptQuery($jobId)
608+
{
609+
return $this->callFileConvertQuery('pdf_decrypt', $jobId);
610+
}
611+
612+
/**
613+
*
614+
* @param $url string
615+
* @param $name string
616+
* @param $param array
617+
* @return array|mixed
618+
*/
619+
public function pdfEncryptQueue($url, $name = null, $param = [])
620+
{
621+
return $this->callFileConvertQueue('pdf_encrypt', $url, $name, $param);
622+
}
623+
624+
/**
625+
* @param $jobId int
626+
* @return array|mixed
627+
*/
628+
public function pdfEncryptQuery($jobId)
629+
{
630+
return $this->callFileConvertQuery('pdf_encrypt', $jobId);
631+
}
632+
633+
/**
634+
*
635+
* @param $url string
636+
* @param $name string
637+
* @param $param array
638+
* @return array|mixed
639+
*/
640+
public function pdfOptimizeQueue($url, $name = null, $param = [])
641+
{
642+
return $this->callFileConvertQueue('pdf_optimize', $url, $name, $param);
643+
}
644+
645+
/**
646+
* @param $jobId int
647+
* @return array|mixed
648+
*/
649+
public function pdfOptimizeQuery($jobId)
650+
{
651+
return $this->callFileConvertQuery('pdf_optimize', $jobId);
652+
}
653+
654+
/**
655+
*
656+
* @param $url string
657+
* @param $name string
658+
* @param $param array
659+
* @return array|mixed
660+
*/
661+
public function pdfToImageQueue($url, $name = null, $param = [])
662+
{
663+
return $this->callFileConvertQueue('pdf_to_image', $url, $name, $param);
664+
}
665+
666+
/**
667+
* @param $jobId int
668+
* @return array|mixed
669+
*/
670+
public function pdfToImageQuery($jobId)
671+
{
672+
return $this->callFileConvertQuery('pdf_to_image', $jobId);
673+
}
674+
675+
/**
676+
*
677+
* @param $url string
678+
* @param $name string
679+
* @param $param array
680+
* @return array|mixed
681+
*/
682+
public function pdfWatermarkQueue($url, $name = null, $param = [])
683+
{
684+
return $this->callFileConvertQueue('pdf_watermark', $url, $name, $param);
685+
}
686+
687+
/**
688+
* @param $jobId int
689+
* @return array|mixed
690+
*/
691+
public function pdfWatermarkQuery($jobId)
692+
{
693+
return $this->callFileConvertQuery('pdf_watermark', $jobId);
694+
}
695+
696+
/**
697+
*
698+
* @param $url string
699+
* @param $name string
700+
* @param $param array
701+
* @return array|mixed
702+
*/
703+
public function psdToImageQueue($url, $name = null, $param = [])
704+
{
705+
return $this->callFileConvertQueue('psd_to_image', $url, $name, $param);
706+
}
707+
708+
/**
709+
* @param $jobId int
710+
* @return array|mixed
711+
*/
712+
public function psdToImageQuery($jobId)
713+
{
714+
return $this->callFileConvertQuery('psd_to_image', $jobId);
715+
}
716+
428717
}

0 commit comments

Comments
 (0)