up

niucloud/app/adminapi/controller/addon/Backup.php

@@ -0,0 +1,125 @@
+<?php
+// +----------------------------------------------------------------------
+// | Niucloud-admin 企业快速开发的多应用管理平台
+// +----------------------------------------------------------------------
+// | 官方网址：https://www.niucloud.com
+// +----------------------------------------------------------------------
+// | niucloud团队 版权所有 开源版本可自由商用
+// +----------------------------------------------------------------------
+// | Author: Niucloud Team
+// +----------------------------------------------------------------------
+
+namespace app\adminapi\controller\addon;
+
+use app\service\admin\upgrade\BackupRecordsService;
+use core\base\BaseAdminController;
+use think\Response;
+
+class Backup extends BaseAdminController
+{
+
+    /**
+     * 获取升级记录分页列表
+     * @return Response
+     */
+    public function getRecords()
+    {
+        $data = $this->request->params([
+            [ "content", "" ],
+        ]);
+        return success(( new BackupRecordsService() )->getPage($data));
+    }
+
+    /**
+     * 修改备注
+     * @return Response
+     */
+    public function modifyRemark()
+    {
+        $data = $this->request->params([
+            [ "id", "" ],
+            [ 'remark', '' ]
+        ]);
+        ( new BackupRecordsService() )->modifyRemark($data);
+        return success('MODIFY_SUCCESS');
+    }
+
+    /**
+     * 恢复前检测文件是否存在
+     * @return Response
+     */
+    public function checkDirExist()
+    {
+        $data = $this->request->params([
+            [ "id", 0 ],
+        ]);
+        return success(( new BackupRecordsService() )->checkDirExist($data[ 'id' ]));
+    }
+
+    /**
+     * 检测目录权限
+     * @return Response
+     */
+    public function checkPermission()
+    {
+        return success(( new BackupRecordsService() )->checkPermission());
+    }
+
+    /**
+     * 恢复备份
+     * @return Response
+     */
+    public function restoreBackup()
+    {
+        $data = $this->request->params([
+            [ 'id', 0 ],
+            [ 'task', '' ]
+        ]);
+        $res = ( new BackupRecordsService() )->restore($data);
+        return $res;
+    }
+
+    /**
+     * 删除升级记录
+     * @return Response
+     */
+    public function deleteRecords()
+    {
+        $data = $this->request->params([
+            [ "ids", [] ],
+        ]);
+        ( new BackupRecordsService() )->del($data[ 'ids' ]);
+        return success('DELETE_SUCCESS');
+    }
+
+    /**
+     * 手动备份
+     * @return Response
+     */
+    public function manualBackup()
+    {
+        $data = $this->request->params([
+            [ 'task', '' ]
+        ]);
+        $res = ( new BackupRecordsService() )->manualBackup($data);
+        return $res;
+    }
+
+    /**
+     * 获取正在进行的恢复任务
+     * @return Response
+     */
+    public function getRestoreTask()
+    {
+        return success(( new BackupRecordsService() )->getRestoreTask());
+    }
+
+    /**
+     * 获取正在进行的备份任务
+     * @return Response
+     */
+    public function getBackupTask()
+    {
+        return success(( new BackupRecordsService() )->getBackupTask());
+    }
+}

niucloud/app/adminapi/controller/addon/Upgrade.php

@@ -11,6 +11,7 @@
 
 namespace app\adminapi\controller\addon;
 
+use app\service\admin\upgrade\UpgradeRecordsService;
 use app\service\admin\upgrade\UpgradeService;
 use core\base\BaseAdminController;
 use think\Response;
@@ -24,7 +25,10 @@ class Upgrade extends BaseAdminController
      */
     public function upgrade($addon = '')
     {
-        return success(data:( new UpgradeService() )->upgrade($addon));
+        $data = $this->request->params([
+           ['is_need_backup', true]
+        ]);
+        return success(data: ( new UpgradeService() )->upgrade($addon, $data));
     }
 
     /**
@@ -32,7 +36,7 @@ class Upgrade extends BaseAdminController
      * @param $app_key
      * @return Response
      */
-    public function execute($addon = '')
+    public function execute()
     {
         return success(data: ( new UpgradeService() )->execute());
     }
@@ -72,6 +76,30 @@ class Upgrade extends BaseAdminController
      */
     public function clearUpgradeTask()
     {
-        return success(data:( new UpgradeService() )->clearUpgradeTask());
+        return success(data: ( new UpgradeService() )->clearUpgradeTask(0, 1));
+    }
+
+    public function operate($operate) {
+        return success(( new UpgradeService() )->operate($operate));
+    }
+
+    /**
+     * 获取升级记录分页列表
+     * @return Response
+     */
+    public function getRecords()
+    {
+        $data = $this->request->params([
+            [ "name", "" ],
+        ]);
+        return success(( new UpgradeRecordsService() )->getPage($data));
+    }
+
+    public function delRecords() {
+        $data = $this->request->params([
+            [ 'ids', '' ],
+        ]);
+        ( new UpgradeRecordsService() )->del($data['ids']);
+        return success('DELETE_SUCCESS');
     }
 }

niucloud/app/adminapi/controller/diy/DiyForm.php

@@ -370,16 +370,4 @@ class DiyForm extends BaseAdminController
         return success(( new DiyFormRecordsService() )->getFieldStatList($data));
     }
 
-    /**
-     * 获取万能表单微信小程序二维码
-     * @return Response
-     */
-    public function getQrcode()
-    {
-        $data = $this->request->params([
-            [ "form_id", '' ],
-        ]);
-        return success(( new DiyFormService() )->getQrcode($data[ 'form_id' ]));
-    }
-
 }

niucloud/app/adminapi/controller/member/Member.php

@@ -152,6 +152,7 @@ class Member extends BaseAdminController
     {
         $data = $this->request->params([
             ['keyword', ''],
+            ['member_ids', []],
         ]);
         return success((new MemberService())->getList($data));
     }

niucloud/app/adminapi/controller/niucloud/Module.php

@@ -49,7 +49,8 @@ class Module extends BaseAdminController
      * @return Response
      * @throws \GuzzleHttp\Exception\GuzzleException
      */
-    public function getFrameworkLastVersion() {
+    public function getFrameworkLastVersion()
+    {
         return success(data: ( new NiucloudService() )->getFrameworkLastVersion());
     }
 
@@ -58,7 +59,8 @@ class Module extends BaseAdminController
      * @return Response
      * @throws \GuzzleHttp\Exception\GuzzleException
      */
-    public function getFrameworkVersionList() {
+    public function getFrameworkVersionList()
+    {
         return success(data: ( new NiucloudService() )->getFrameworkVersionList());
     }
 
@@ -66,7 +68,20 @@ class Module extends BaseAdminController
      * 申请体验
      * @return Response
      */
-    public function applyExperience() {
+    public function applyExperience()
+    {
         return success(( new NiucloudService() )->applyExperience());
     }
+
+    /**
+     * 获取应用/插件的版本更新记录
+     * @return Response
+     */
+    public function getAppVersionList()
+    {
+        $data = $this->request->params([
+            [ 'app_key', '' ],
+        ]);
+        return success(data: ( new NiucloudService() )->getAppVersionList($data[ 'app_key' ]));
+    }
 }

niucloud/app/adminapi/controller/pay/PayRefund.php

@@ -17,6 +17,13 @@ use core\base\BaseAdminController;
 
 class PayRefund extends BaseAdminController
 {
+    /**
+     * @return \think\Response
+     */
+    public function getStatus()
+    {
+        return success(RefundDict::getStatus());
+    }
     /**
      * 退款列表
      * @return \think\Response

niucloud/app/adminapi/controller/sys/Config.php

@@ -148,7 +148,8 @@ class Config extends BaseAdminController
      * 获取开发者key
      * @return Response
      */
-    public function getDeveloperToken() {
+    public function getDeveloperToken()
+    {
         return success(data: ( new ConfigService() )->getDeveloperToken());
     }
 
@@ -156,7 +157,8 @@ class Config extends BaseAdminController
      * 设置开发者key
      * @return Response
      */
-    public function setDeveloperToken() {
+    public function setDeveloperToken()
+    {
         $data = $this->request->params([
             [ 'token', '' ],
         ]);
@@ -168,7 +170,9 @@ class Config extends BaseAdminController
      * 获取install.php配置
      * @return Response
      */
-    public function getInstallConfig() {
+    public function getInstallConfig()
+    {
         return success(config('install'));
     }
+
 }

niucloud/app/adminapi/controller/sys/System.php

@@ -91,4 +91,19 @@ class System extends BaseAdminController
     {
         return success(['app_debug' => env('app_debug', false)]);
     }
+
+    /**
+     * 获取推广二维码
+     * @return Response
+     */
+    public function getSpreadQrcode()
+    {
+        $params = $this->request->params([
+            ['form_id', ''],
+            ['folder',''],
+            ['page',''],
+            ['params',[]]
+        ]);
+        return success((new SystemService())->getQrcode($params));
+    }
 }

niucloud/app/adminapi/controller/verify/Verifier.php

@@ -36,6 +36,16 @@ class Verifier extends BaseAdminController
         return success(data: ( new VerifierService() )->getList());
     }
 
+    /**
+     * 获取核销员信息
+     * @param int $order_id
+     * @return Response
+     */
+    public function detail($id)
+    {
+        return success(data: ( new VerifierService() )->getDetail($id));
+    }
+
     /**
      * 添加核销员
      * @param int $order_id
@@ -50,6 +60,20 @@ class Verifier extends BaseAdminController
         return success(data: ( new VerifierService() )->add($data));
     }
 
+    /**
+     * 添加核销员
+     * @param int $order_id
+     * @return Response
+     */
+    public function edit($id)
+    {
+        $data = $this->request->params([
+            [ 'verify_type', '' ],
+        ]);
+        ( new VerifierService() )->edit($id,$data);
+        return success('EDIT_SUCCESS');
+    }
+
     /**
      * 删除核销员
      */

niucloud/app/adminapi/route/niucloud.php

@@ -42,6 +42,9 @@ Route::group('niucloud', function () {
     // 获取框架版本更新记录
     Route::get('framework/version/list', 'niucloud.Module/getFrameworkVersionList');
 
+    // 获取应用/插件的版本更新记录
+    Route::get('app_version/list', 'niucloud.Module/getAppVersionList');
+
     // 云编译
     Route::post('build', 'niucloud.Cloud/build');
     // 云编译

niucloud/app/adminapi/route/pay.php

@@ -52,6 +52,7 @@ Route::group('pay', function () {
     //退款列表
     Route::get('refund', 'pay.PayRefund/pages');
     //退款详情
+    Route::get('refund/status', 'pay.PayRefund/getStatus');
     Route::get('refund/:refund_no', 'pay.PayRefund/detail');
     //退款方式
     Route::get('refund/type', 'pay.PayRefund/getRefundType');

niucloud/app/adminapi/route/sys.php

@@ -23,6 +23,7 @@ Route::group('sys', function() {
     //系统信息
     Route::get('info', 'sys.System/info');
     Route::get('url', 'sys.System/url');
+    Route::get('qrcode', 'sys.System/getSpreadQrcode');
     /***************************************************** 用户组 ****************************************************/
     //用户组列表
     Route::get('role', 'sys.Role/lists');
@@ -56,7 +57,7 @@ Route::group('sys', function() {
     //授权用户菜单
     Route::get('authmenu', 'sys.Auth/authMenuList');
     // 获取菜单信息
-    Route::get('menu/:app_type/info/:menu_key', 'sys.Menu/info');
+    Route::get('menu/info/:menu_key', 'sys.Menu/info');
     // 初始化菜单
     Route::post('menu/refresh', 'sys.Menu/refreshMenu');
 
@@ -267,7 +268,6 @@ Route::group('sys', function() {
     // 百度编辑器文件上传
     Route::post('ueditor', 'sys.Ueditor/upload');
 
-
     /***************************************************** 小票打印管理 ****************************************************/
 
     // 小票打印机分页列表

niucloud/app/adminapi/route/upgrade.php

@@ -19,18 +19,59 @@ use think\facade\Route;
  * 路由
  */
 Route::group('', function () {
+
     // 获取正在进行的升级任务
     Route::get('upgrade/task', 'addon.Upgrade/getUpgradeTask');
+
     // 执行升级
     Route::post('upgrade/execute', 'addon.Upgrade/execute');
+
     // 清除升级任务
     Route::post('upgrade/clear', 'addon.Upgrade/clearUpgradeTask');
+
     // 升级环境检测
-    Route::get('upgrade/check/[:addon]', 'addon.Upgrade/upgradePreCheck');
+    Route::get('upgrade/check/[:addon]', 'addon.Upgrade/upgradePreCheck')->pattern(['addon' => '[\w|\,]+']);
+
     // 升级
-    Route::post('upgrade/[:addon]', 'addon.Upgrade/upgrade');
+    Route::post('upgrade/[:addon]', 'addon.Upgrade/upgrade')->pattern(['addon' => '[\w|\,]+']);
+
     // 获取升级内容
-    Route::get('upgrade/[:addon]', 'addon.Upgrade/getUpgradeContent');
+    Route::get('upgrade/[:addon]', 'addon.Upgrade/getUpgradeContent')->pattern(['addon' => '[\w|\,]+']);
+
+    Route::post('upgrade/operate/:operate', 'addon.Upgrade/operate');
+
+    // 升级记录分页列表
+    Route::get('upgrade/records', 'addon.Upgrade/getRecords');
+
+    // 删除升级记录
+    Route::delete('upgrade/records', 'addon.Upgrade/delRecords');
+
+    // 备份记录分页列表
+    Route::get('backup/records', 'addon.Backup/getRecords');
+
+    // 修改备注
+    Route::put('backup/remark', 'addon.Backup/modifyRemark');
+
+    // 恢复前检测文件是否存在，备份
+    Route::post('backup/check_dir', 'addon.Backup/checkDirExist');
+
+    // 检测目录权限
+    Route::post('backup/check_permission', 'addon.Backup/checkPermission');
+
+    // 恢复升级备份
+    Route::post('backup/restore', 'addon.Backup/restoreBackup');
+
+    // 删除升级记录
+    Route::post('backup/delete', 'addon.Backup/deleteRecords');
+
+    // 手动备份
+    Route::post('backup/manual', 'addon.Backup/manualBackup');
+
+    // 获取进行中的恢复
+    Route::get('backup/restore_task', 'addon.Backup/getRestoreTask');
+
+    // 获取进行中的备份
+    Route::get('backup/task', 'addon.Backup/getBackupTask');
 })->middleware([
     AdminCheckToken::class,
     AdminCheckRole::class,

niucloud/app/adminapi/route/verify.php

@@ -28,6 +28,8 @@ Route::group('verify', function () {
     /*****************************************************  核销员相关接口 ****************************************************/
     // 添加核销员
     Route::post('verifier', 'verify.Verifier/add');
+    Route::post('verifier/:id', 'verify.Verifier/edit');
+    Route::get('verifier/:id', 'verify.Verifier/detail');
     // 获取核销员列表
     Route::get('verifier', 'verify.Verifier/lists');
     // 获取核销员列表

niucloud/app/api/controller/sys/Verify.php

@@ -22,7 +22,8 @@ class Verify extends BaseApiController
      * 获取验证码
      * @return Response
      */
-    public function getVerifyCode(){
+    public function getVerifyCode()
+    {
         $data = $this->request->params([
             [ 'data', [] ],
             [ 'type', '' ]
@@ -34,25 +35,30 @@ class Verify extends BaseApiController
      * 获取核销码信息
      * @return Response
      */
-    public function getInfoByCode(){
+    public function getInfoByCode()
+    {
         $data = $this->request->params([
             [ 'code', '' ],
         ]);
         return success(data: ( new VerifyService() )->getInfoByCode($data[ 'code' ]));
     }
+
     /**
      * 核销
      * @param $code
      * @return Response
      */
-    public function verify($code){
+    public function verify($code)
+    {
         return success(data: ( new VerifyService() )->verify($code));
     }
+
     /**
      * 校验是否是核销员
      * @return Response
      */
-    public function checkVerifier(){
+    public function checkVerifier()
+    {
         return success(data: ( new VerifyService() )->checkVerifier());
     }
 
@@ -60,7 +66,8 @@ class Verify extends BaseApiController
      * 核销记录
      * @return void
      */
-    public function records(){
+    public function records()
+    {
         $data = $this->request->params([
             [ 'relate_tag', 0 ],
             [ 'type', '' ],
@@ -76,7 +83,8 @@ class Verify extends BaseApiController
      * @param $code
      * @return Response
      */
-    public function detail(string|int $code){
+    public function detail(string|int $code)
+    {
         return success(data: ( new VerifyService() )->getRecordsDetailByVerifier($code));
 
     }

niucloud/app/common.php

@@ -554,7 +554,7 @@ function dir_copy(string $src = '', string $dst = '', &$files = [], $exclude_dir
             if (is_dir($src . '/' . $file)) {
                 // 排除目录
                 if (count($exclude_dirs) && in_array($file, $exclude_dirs)) continue;
-                dir_copy($src . '/' . $file, $dst . '/' . $file, $files);
+                dir_copy($src . '/' . $file, $dst . '/' . $file, $files, $exclude_dirs, $exclude_files);
             } else {
                 // 排除文件
                 if (count($exclude_files) && in_array($file, $exclude_files)) continue;
@@ -1033,10 +1033,13 @@ function get_last_time($time = null)
 
 /**
  * 检查目录及其子目录的权限
- * @param string $dir 要检查的目录路径
- * @return void
+ * @param $dir 要检查的目录路径
+ * @param $data
+ * @param $exclude_dir 排除排除无需检测的的文件夹
+ * @return array|array[]|mixed
  */
-function checkDirPermissions($dir, $data = []) {
+function checkDirPermissions($dir, $data = [], $exclude_dir = [])
+{
     if (!is_dir($dir)) {
         throw new \RuntimeException(sprintf('指定的路径 "%s" 不是一个有效的目录', $dir));
     }
@@ -1062,9 +1065,21 @@ function checkDirPermissions($dir, $data = []) {
                     continue;
                 }
                 $fullPath = $dir . DIRECTORY_SEPARATOR . $file;
+
+                // 忽略指定目录
+                $is_exclude = false;
+                foreach ($exclude_dir as $k => $item) {
+                    if (strpos($fullPath, $item)) {
+                        $is_exclude = true;
+                        break;
+                    }
+                }
+
+                if ($is_exclude) continue;
+
                 // 判断是否为目录，如果是则递归调用
                 if (is_dir($fullPath)) {
-                    $data = checkDirPermissions($fullPath, $data); // 递归调用自身来检查子目录
+                    $data = checkDirPermissions($fullPath, $data, $exclude_dir); // 递归调用自身来检查子目录
                 } else {
                     // 如果是文件，则检查其读写权限
                     if (!is_readable($fullPath)) $data[ 'unreadable' ][] = $fullPath;
@@ -1080,3 +1095,41 @@ function checkDirPermissions($dir, $data = []) {
         return $data;
     }
 }
+
+/**
+ * 下载网络图片
+ * @param $img_url 图片URL
+ * @param $file_name 本地保存位置
+ * @return bool
+ */
+function downloadImage($img_url, $file_name)
+{
+
+    // 初始化 cURL 会话
+    $ch = curl_init($img_url);
+
+    // 打开本地文件以写入模式
+    $fp = fopen($file_name, 'wb');
+
+    // 设置 cURL 选项
+    curl_setopt($ch, CURLOPT_FILE, $fp);
+    curl_setopt($ch, CURLOPT_HEADER, 0);
+
+    // 跳过 SSL 验证
+    curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, false);
+    curl_setopt($ch, CURLOPT_SSL_VERIFYHOST, false);
+
+    // 执行 cURL 会话
+    curl_exec($ch);
+
+    // 检查是否有错误发生
+    if (curl_errno($ch)) {
+//        echo 'Curl error: ' . curl_error($ch);
+        return false;
+    }
+
+    // 关闭 cURL 会话和文件句柄
+    curl_close($ch);
+    fclose($fp);
+    return true;
+}

niucloud/app/dict/diy_form/ComponentDict.php

@@ -460,6 +460,7 @@ class ComponentDict
 //                                'default' => '', // 默认值 存储数据类型不同，各组件自行处理
 //                                'value' => '', // 字段值 存储数据类型不同，各组件自行处理
 //                            ],
+//                            'placeholder' => '请输入', // 提示语
 //                            "fontSize" => 14,
 //                            "fontWeight" => "normal",
 //                        ]
@@ -683,7 +684,17 @@ class ComponentDict
 //                                'max' => 0 // 最多填写 N 项
 //                            ],
 //                            'btnText' => '新增一组'
-                    //     ]
+//                        ],
+//                        // 渲染值
+//                        'render' => function($data) {
+//                            // todo 处理业务数据
+//                            return '';
+//                        },
+//                        // 转换类型
+//                        'convert' => function($data) {
+//                            // todo 处理业务数据
+//                            return $data;
+//                        }
 //                    ],
                     'FormDate' => [
                         'title' => '日期',

niucloud/app/dict/diy_form/TemplateDict.php

@@ -381,7 +381,7 @@ class TemplateDict
                                     "unique" => false,
                                     "autofill" => false,
                                     "privacyProtection" => false,
-                                    'cache' => false,
+                                    'cache' => true,
                                     "default" => [
                                         "date" => "",
                                         "timestamp" => 0
@@ -576,7 +576,7 @@ class TemplateDict
                                     "unique" => false,
                                     "autofill" => false,
                                     "privacyProtection" => false,
-                                    'cache' => false,
+                                    'cache' => true,
                                     "default" => [
                                         "start" => [
                                             "date" => "",

niucloud/app/dict/menu/admin.php

@@ -1140,6 +1140,20 @@ return [
                                 'status' => '1',
                                 'is_show' => '1',
                             ],
+                            [
+                                'menu_name' => '编辑核销员',
+                                'menu_key' => 'edit_verifier',
+                                'menu_short_name' => '编辑核销员',
+                                'menu_type' => '2',
+                                'icon' => '',
+                                'api_url' => 'verify/verifier/<id>',
+                                'router_path' => '',
+                                'view_path' => '',
+                                'methods' => 'post',
+                                'sort' => '100',
+                                'status' => '1',
+                                'is_show' => '1',
+                            ],
                             [
                                 'menu_name' => '删除核销员',
                                 'menu_key' => 'delete_verifier',
@@ -2437,122 +2451,6 @@ return [
                     ],
                 ],
             ],
-            [
-                'menu_name' => '小票打印',
-                'menu_key' => 'printer_management',
-                'menu_short_name' => '小票打印',
-                'menu_type' => '1',
-                'icon' => 'element FolderChecked',
-                'api_url' => 'printer',
-                'router_path' => 'printer/list',
-                'view_path' => 'printer/list',
-                'methods' => 'get',
-                'sort' => '30',
-                'status' => '1',
-                'is_show' => '1',
-                'children' => [
-                    [
-                        'menu_name' => '删除打印机',
-                        'menu_key' => 'delete_printer',
-                        'menu_short_name' => '删除打印机',
-                        'menu_type' => '2',
-                        'icon' => '',
-                        'api_url' => 'printer/<id>',
-                        'router_path' => '',
-                        'view_path' => '',
-                        'methods' => 'delete',
-                        'sort' => '100',
-                        'status' => '1',
-                        'is_show' => '1',
-                    ]
-                ]
-            ],
-            [
-                'menu_name' => '添加打印机',
-                'menu_key' => 'printer_add',
-                'menu_short_name' => '添加打印机',
-                'menu_type' => '1',
-                'icon' => '',
-                'api_url' => 'printer',
-                'router_path' => 'printer/add',
-                'view_path' => 'printer/edit',
-                'methods' => 'post',
-                'sort' => '0',
-                'status' => '1',
-                'is_show' => '0',
-            ],
-            [
-                'menu_name' => '编辑打印机',
-                'menu_key' => 'printer_edit',
-                'menu_short_name' => '添加打印机',
-                'menu_type' => '1',
-                'icon' => '',
-                'api_url' => 'printer/<id>',
-                'router_path' => 'printer/edit',
-                'view_path' => 'printer/edit',
-                'methods' => 'put',
-                'sort' => '0',
-                'status' => '1',
-                'is_show' => '0',
-            ],
-            [
-                'menu_name' => '小票打印模板',
-                'menu_key' => 'printer_template_management',
-                'menu_short_name' => '小票打印模板',
-                'menu_type' => '1',
-                'icon' => 'element FolderChecked',
-                'api_url' => 'printer/template',
-                'router_path' => 'printer/template/list',
-                'view_path' => 'printer/template_list',
-                'methods' => 'get',
-                'sort' => '96',
-                'status' => '1',
-                'is_show' => '0',
-                'children' => [
-                    [
-                        'menu_name' => '删除打印模板',
-                        'menu_key' => 'delete_printer_template',
-                        'menu_short_name' => '删除打印模板',
-                        'menu_type' => '2',
-                        'icon' => '',
-                        'api_url' => 'printer/template/<id>',
-                        'router_path' => '',
-                        'view_path' => '',
-                        'methods' => 'delete',
-                        'sort' => '100',
-                        'status' => '1',
-                        'is_show' => '1',
-                    ]
-                ]
-            ],
-            [
-                'menu_name' => '添加打印模板',
-                'menu_key' => 'printer_template_add',
-                'menu_short_name' => '添加打印模板',
-                'menu_type' => '1',
-                'icon' => '',
-                'api_url' => 'printer/template',
-                'router_path' => 'printer/template/add',
-                'view_path' => 'printer/template_edit',
-                'methods' => 'post',
-                'sort' => '0',
-                'status' => '1',
-                'is_show' => '0',
-            ],
-            [
-                'menu_name' => '编辑打印模板',
-                'menu_key' => 'printer_template_edit',
-                'menu_short_name' => '编辑打印模板',
-                'menu_type' => '1',
-                'icon' => '',
-                'api_url' => 'printer/template/<id>',
-                'router_path' => 'printer/template/edit',
-                'view_path' => 'printer/template_edit',
-                'methods' => 'put',
-                'sort' => '0',
-                'status' => '1',
-                'is_show' => '0',
-            ],
             [
                 'menu_name' => '系统工具',
                 'menu_key' => 'setting_tool',
@@ -2699,36 +2597,6 @@ return [
                             ]
                         ]
                     ],
-                    [
-                        'menu_name' => '数据导出',
-                        'menu_key' => 'setting_export',
-                        'menu_short_name' => '数据导出',
-                        'menu_type' => '1',
-                        'icon' => 'element FolderChecked',
-                        'api_url' => 'sys/export',
-                        'router_path' => 'setting/export',
-                        'view_path' => 'setting/export',
-                        'methods' => 'get',
-                        'sort' => '98',
-                        'status' => '1',
-                        'is_show' => '1',
-                        'children' => [
-                            [
-                                'menu_name' => '删除报表',
-                                'menu_key' => 'delete_export',
-                                'menu_short_name' => '删除报表',
-                                'menu_type' => '2',
-                                'icon' => '',
-                                'api_url' => 'sys/export/<id>',
-                                'router_path' => '',
-                                'view_path' => '',
-                                'methods' => 'delete',
-                                'sort' => '100',
-                                'status' => '1',
-                                'is_show' => '1',
-                            ]
-                        ]
-                    ],
                 ]
             ],
 
@@ -2860,7 +2728,190 @@ return [
         ]
     ],
     [
-        'menu_name' => '开发',
+        'menu_name' => '数据导出',
+        'menu_key' => 'setting_export',
+        'menu_short_name' => '数据导出',
+        'menu_type' => '0',
+        'icon' => 'element Files',
+        'api_url' => '',
+        'router_path' => '',
+        'view_path' => '',
+        'methods' => '',
+        'sort' => '0',
+        'status' => '1',
+        'is_show' => '1',
+        'menu_attr' => 'setting_export',
+        'children' => [
+            [
+                'menu_name' => '数据导出列表',
+                'menu_key' => 'setting_export_list',
+                'menu_short_name' => '数据导出列表',
+                'menu_type' => '1',
+                'icon' => 'element FolderChecked',
+                'api_url' => 'sys/export',
+                'router_path' => 'setting/export',
+                'view_path' => 'setting/export',
+                'methods' => 'get',
+                'sort' => '98',
+                'status' => '1',
+                'is_show' => '1',
+                'menu_attr' => 'setting_export',
+                'children' => [
+                    [
+                        'menu_name' => '删除报表',
+                        'menu_key' => 'delete_export',
+                        'menu_short_name' => '删除报表',
+                        'menu_type' => '2',
+                        'icon' => '',
+                        'api_url' => 'sys/export/<id>',
+                        'router_path' => '',
+                        'view_path' => '',
+                        'methods' => 'delete',
+                        'sort' => '100',
+                        'status' => '1',
+                        'is_show' => '1',
+                        'menu_attr' => 'setting_export',
+                    ]
+                ]
+            ],
+        ]
+    ],
+    [
+        'menu_name' => '打印管理',
+        'menu_key' => 'printer_management',
+        'menu_short_name' => '打印管理',
+        'menu_type' => '0',
+        'icon' => 'element Files',
+        'api_url' => '',
+        'router_path' => '',
+        'view_path' => '',
+        'methods' => '',
+        'sort' => '0',
+        'status' => '1',
+        'is_show' => '1',
+        'menu_attr' => 'printer_management',
+        'children' => [
+            [
+                'menu_name' => '小票打印',
+                'menu_key' => 'printer_management_list',
+                'menu_short_name' => '小票打印',
+                'menu_type' => '1',
+                'icon' => 'element FolderChecked',
+                'api_url' => 'printer',
+                'router_path' => 'printer/list',
+                'view_path' => 'printer/list',
+                'methods' => 'get',
+                'sort' => '30',
+                'status' => '1',
+                'is_show' => '1',
+                'menu_attr' => 'printer_management',
+                'children' => [
+                    [
+                        'menu_name' => '删除打印机',
+                        'menu_key' => 'delete_printer',
+                        'menu_short_name' => '删除打印机',
+                        'menu_type' => '2',
+                        'icon' => '',
+                        'api_url' => 'printer/<id>',
+                        'router_path' => '',
+                        'view_path' => '',
+                        'methods' => 'delete',
+                        'sort' => '100',
+                        'status' => '1',
+                        'is_show' => '1',
+                    ]
+                ]
+            ],
+            [
+                'menu_name' => '添加打印机',
+                'menu_key' => 'printer_add',
+                'menu_short_name' => '添加打印机',
+                'menu_type' => '1',
+                'icon' => '',
+                'api_url' => 'printer',
+                'router_path' => 'printer/add',
+                'view_path' => 'printer/edit',
+                'methods' => 'post',
+                'sort' => '0',
+                'status' => '1',
+                'is_show' => '0',
+            ],
+            [
+                'menu_name' => '编辑打印机',
+                'menu_key' => 'printer_edit',
+                'menu_short_name' => '添加打印机',
+                'menu_type' => '1',
+                'icon' => '',
+                'api_url' => 'printer/<id>',
+                'router_path' => 'printer/edit',
+                'view_path' => 'printer/edit',
+                'methods' => 'put',
+                'sort' => '0',
+                'status' => '1',
+                'is_show' => '0',
+            ],
+            [
+                'menu_name' => '小票打印模板',
+                'menu_key' => 'printer_template_management',
+                'menu_short_name' => '小票打印模板',
+                'menu_type' => '1',
+                'icon' => 'element FolderChecked',
+                'api_url' => 'printer/template',
+                'router_path' => 'printer/template/list',
+                'view_path' => 'printer/template_list',
+                'methods' => 'get',
+                'sort' => '96',
+                'status' => '1',
+                'is_show' => '0',
+                'children' => [
+                    [
+                        'menu_name' => '删除打印模板',
+                        'menu_key' => 'delete_printer_template',
+                        'menu_short_name' => '删除打印模板',
+                        'menu_type' => '2',
+                        'icon' => '',
+                        'api_url' => 'printer/template/<id>',
+                        'router_path' => '',
+                        'view_path' => '',
+                        'methods' => 'delete',
+                        'sort' => '100',
+                        'status' => '1',
+                        'is_show' => '1',
+                    ]
+                ]
+            ],
+            [
+                'menu_name' => '添加打印模板',
+                'menu_key' => 'printer_template_add',
+                'menu_short_name' => '添加打印模板',
+                'menu_type' => '1',
+                'icon' => '',
+                'api_url' => 'printer/template',
+                'router_path' => 'printer/template/add',
+                'view_path' => 'printer/template_edit',
+                'methods' => 'post',
+                'sort' => '0',
+                'status' => '1',
+                'is_show' => '0',
+            ],
+            [
+                'menu_name' => '编辑打印模板',
+                'menu_key' => 'printer_template_edit',
+                'menu_short_name' => '编辑打印模板',
+                'menu_type' => '1',
+                'icon' => '',
+                'api_url' => 'printer/template/<id>',
+                'router_path' => 'printer/template/edit',
+                'view_path' => 'printer/template_edit',
+                'methods' => 'put',
+                'sort' => '0',
+                'status' => '1',
+                'is_show' => '0',
+            ],
+        ]
+    ],
+    [
+        'menu_name' => '开发管理',
         'menu_key' => 'tool',
         'menu_short_name' => '开发',
         'parent_key' => '',
@@ -2984,7 +3035,7 @@ return [
                 'router_path' => 'tools/addon',
                 'view_path' => 'tools/addon/index',
                 'methods' => '',
-                'sort' => '110',
+                'sort' => '119',
                 'status' => '1',
                 'is_show' => '1',
                 'children' => [
@@ -3028,7 +3079,21 @@ return [
                 'router_path' => 'tools/code',
                 'view_path' => 'tools/code/index',
                 'methods' => 'get',
-                'sort' => '100',
+                'sort' => '118',
+                'status' => '1',
+                'is_show' => '1',
+            ],
+            [
+                'menu_name' => '更新缓存',
+                'menu_key' => 'update_cache',
+                'menu_short_name' => '更新缓存',
+                'menu_type' => '1',
+                'icon' => 'nc-iconfont nc-icon-qingliV6xx',
+                'api_url' => 'sys/schema/clear',
+                'router_path' => 'tools/update_cache',
+                'view_path' => 'tools/updatecache',
+                'methods' => 'post',
+                'sort' => '117',
                 'status' => '1',
                 'is_show' => '1',
             ],
@@ -3042,7 +3107,7 @@ return [
                 'router_path' => 'tools/code/edit',
                 'view_path' => 'tools/code/edit',
                 'methods' => '',
-                'sort' => '99',
+                'sort' => '100',
                 'status' => '1',
                 'is_show' => '0',
                 'children' => [
@@ -3114,7 +3179,7 @@ return [
                 'router_path' => 'tools/addon_edit',
                 'view_path' => 'tools/addon/edit',
                 'methods' => 'get',
-                'sort' => '90',
+                'sort' => '100',
                 'status' => '1',
                 'is_show' => '0',
                 'children' => [
@@ -3148,20 +3213,6 @@ return [
                     ],
                 ]
             ],
-            [
-                'menu_name' => '更新缓存',
-                'menu_key' => 'update_cache',
-                'menu_short_name' => '更新缓存',
-                'menu_type' => '1',
-                'icon' => 'nc-iconfont nc-icon-qingliV6xx',
-                'api_url' => 'sys/schema/clear',
-                'router_path' => 'tools/update_cache',
-                'view_path' => 'tools/updatecache',
-                'methods' => 'post',
-                'sort' => '98',
-                'status' => '1',
-                'is_show' => '1',
-            ],
             [
                 'menu_name' => '数据字典',
                 'menu_key' => 'sys_dict_dict_dict_list',
@@ -3172,7 +3223,7 @@ return [
                 'router_path' => 'tools/list',
                 'view_path' => 'dict/list',
                 'methods' => 'get',
-                'sort' => '90',
+                'sort' => '106',
                 'status' => '1',
                 'is_show' => '1',
                 'children' => [
@@ -3230,7 +3281,7 @@ return [
                 'router_path' => 'tools/detection',
                 'view_path' => 'tools/detection',
                 'methods' => '',
-                'sort' => '50',
+                'sort' => '105',
                 'status' => '1',
                 'is_show' => '1',
             ],
@@ -3244,7 +3295,7 @@ return [
                 'router_path' => 'tools/menu',
                 'view_path' => 'auth/menu',
                 'methods' => 'get',
-                'sort' => '48',
+                'sort' => '104',
                 'status' => '1',
                 'is_show' => '1',
                 'children' => [
@@ -3316,7 +3367,7 @@ return [
                 'router_path' => 'tools/schedule',
                 'view_path' => 'tools/schedule',
                 'methods' => '',
-                'sort' => '40',
+                'sort' => '103',
                 'status' => '1',
                 'is_show' => '1',
                 'children' => [
@@ -3388,7 +3439,7 @@ return [
                 'router_path' => 'tools/schedule_log',
                 'view_path' => 'tools/schedule_log',
                 'methods' => '',
-                'sort' => '40',
+                'sort' => '100',
                 'status' => '1',
                 'is_show' => '0'
             ],
@@ -3402,24 +3453,10 @@ return [
                 'router_path' => 'tools/authorize',
                 'view_path' => 'app/authorize',
                 'methods' => '',
-                'sort' => '30',
+                'sort' => '102',
                 'status' => '1',
                 'is_show' => '1',
                 'children' => [
-                    [
-                        'menu_name' => '系统升级',
-                        'menu_key' => 'system_upgrade',
-                        'menu_short_name' => '系统升级',
-                        'menu_type' => '2',
-                        'icon' => '',
-                        'api_url' => 'upgrade',
-                        'router_path' => '',
-                        'view_path' => '',
-                        'methods' => 'post',
-                        'sort' => '100',
-                        'status' => '1',
-                        'is_show' => '1',
-                    ],
                     [
                         'menu_name' => '绑定授权信息',
                         'menu_key' => 'bind_app_auth',
@@ -3436,6 +3473,62 @@ return [
                     ]
                 ]
             ],
+            [
+                'menu_name' => '系统更新',
+                'menu_key' => 'system_upgrade',
+                'menu_short_name' => '系统更新',
+                'menu_type' => '1',
+                'icon' => 'iconfont iconxitonggengxin',
+                'api_url' => '',
+                'router_path' => 'tools/upgrade',
+                'view_path' => 'app/upgrade',
+                'methods' => '',
+                'sort' => '101',
+                'status' => '1',
+                'is_show' => '1',
+            ],
+            [
+                'menu_name' => '升级记录',
+                'menu_key' => 'upgrade_records',
+                'menu_short_name' => '升级记录',
+                'menu_type' => '1',
+                'icon' => 'iconfont iconshengjijilu',
+                'api_url' => 'upgrade/records',
+                'router_path' => 'tools/upgrade_records',
+                'view_path' => 'tools/upgrade_records',
+                'methods' => 'post',
+                'sort' => '100',
+                'status' => '1',
+                'is_show' => '1',
+            ],
+            [
+                'menu_name' => '备份记录',
+                'menu_key' => 'backup_records',
+                'menu_short_name' => '备份记录',
+                'menu_type' => '1',
+                'icon' => 'iconfont iconbeifenjiluV6xx',
+                'api_url' => 'backup/records',
+                'router_path' => 'tools/backup_records',
+                'view_path' => 'tools/backup_records',
+                'methods' => 'post',
+                'sort' => '99',
+                'status' => '1',
+                'is_show' => '1',
+            ],
+            [
+                'menu_name' => '云编译',
+                'menu_key' => 'cloud_compile',
+                'menu_short_name' => '云编译',
+                'menu_type' => '1',
+                'icon' => 'iconfont iconyun2',
+                'api_url' => '',
+                'router_path' => 'tools/cloud_compile',
+                'view_path' => 'tools/cloud_compile',
+                'methods' => 'post',
+                'sort' => '98',
+                'status' => '1',
+                'is_show' => '1',
+            ],
             [
                 'menu_name' => '开发者key',
                 'menu_key' => 'developer_token',
@@ -3446,7 +3539,7 @@ return [
                 'router_path' => 'tools/developer_token',
                 'view_path' => 'setting/developer_token',
                 'methods' => 'get',
-                'sort' => '20',
+                'sort' => '97',
                 'status' => '1',
                 'is_show' => '1',
                 'children' => [

niucloud/app/dict/schedule/schedule.php

@@ -12,6 +12,19 @@ return [
         'class' => '',
         'function' => ''
     ],
+    [
+        'key' => 'auto_clear_schedule_log',
+        'name' => '定时清理计划任务日志表',
+        'desc' => '',
+        'time' => [
+            'type' => 'day',
+            'day' => 1,
+            'hour' => 1,
+            'min' => 1
+        ],
+        'class' => 'app\job\schedule\AutoClearScheduleLog',
+        'function' => ''
+    ],
     [
         'key' => 'transfer_check_finish',
         'name' => '检验在线转账是否处理完毕',
@@ -22,5 +35,18 @@ return [
         ],
         'class' => 'app\job\transfer\schedule\CheckFinish',
         'function' => ''
-    ]
+    ],
+    [
+        'key' => 'auto_clear_upgrade_records',
+        'name' => '定时清理升级/备份记录表',
+        'desc' => '',
+        'time' => [
+            'type' => 'day',
+            'day' => 1,
+            'hour' => 1,
+            'min' => 1
+        ],
+        'class' => 'app\job\upgrade\AutoClearUpgradeRecords',
+        'function' => ''
+    ],
 ];

niucloud/app/dict/sys/BackupDict.php

@@ -0,0 +1,34 @@
+<?php
+// +----------------------------------------------------------------------
+// | Niucloud-admin 企业快速开发的多应用管理平台
+// +----------------------------------------------------------------------
+// | 官方网址：https://www.niucloud.com
+// +----------------------------------------------------------------------
+// | niucloud团队 版权所有 开源版本可自由商用
+// +----------------------------------------------------------------------
+// | Author: Niucloud Team
+// +----------------------------------------------------------------------
+
+namespace app\dict\sys;
+
+/**
+ * 备份记录字典
+ */
+class BackupDict
+{
+    const STATUS_READY = 'ready'; //准备执行
+
+    const STATUS_COMPLETE = 'complete'; // 完成
+
+    const STATUS_FAIL = 'fail'; // 失败
+
+    public static function getStatus($status)
+    {
+        $status_list = [
+            self::STATUS_READY => get_lang('dict_backup.ready'),
+            self::STATUS_COMPLETE => get_lang('dict_backup.complete'),
+            self::STATUS_FAIL => get_lang('dict_backup.fail'),
+        ];
+        return $status_list[ $status ] ?? '';
+    }
+}

niucloud/app/dict/sys/CloudDict.php

@@ -28,7 +28,9 @@ class CloudDict
 
     const APPLET_AUDIT_FAIL = -2;
 
-    public static function getAppletUploadSatus($status) {
+    const APPLET_AUDIT_UNDO = -3;
+
+    public static function getAppletUploadStatus($status) {
         $status_list = [
             self::APPLET_UPLOADING => get_lang('dict_cloud_applet.uploading'),
             self::APPLET_UPLOAD_SUCCESS => get_lang('dict_cloud_applet.upload_success'),
@@ -36,6 +38,7 @@ class CloudDict
             self::APPLET_AUDITING => get_lang('dict_cloud_applet.auditing'),
             self::APPLET_AUDIT_FAIL => get_lang('dict_cloud_applet.audit_fail'),
             self::APPLET_PUBLISHED => get_lang('dict_cloud_applet.published'),
+            self::APPLET_AUDIT_UNDO => get_lang('dict_cloud_applet.undo')
         ];
         return $status_list[$status] ?? '';
     }

niucloud/app/dict/sys/UpgradeDict.php

@@ -0,0 +1,40 @@
+<?php
+// +----------------------------------------------------------------------
+// | Niucloud-admin 企业快速开发的多应用管理平台
+// +----------------------------------------------------------------------
+// | 官方网址：https://www.niucloud.com
+// +----------------------------------------------------------------------
+// | niucloud团队 版权所有 开源版本可自由商用
+// +----------------------------------------------------------------------
+// | Author: Niucloud Team
+// +----------------------------------------------------------------------
+
+namespace app\dict\sys;
+
+/**
+ * 升级记录字典
+ * Class UpgradeRecordsDict
+ * @package app\dict\sys
+ *
+ */
+class UpgradeDict
+{
+    const STATUS_READY = 'ready'; //准备执行
+
+    const STATUS_COMPLETE = 'complete'; // 完成
+
+    const STATUS_FAIL = 'fail'; // 失败
+
+    const STATUS_CANCEL = 'cancel';
+
+    public static function getStatus($status)
+    {
+        $status_list = [
+            self::STATUS_READY => get_lang('dict_upgrade.ready'),
+            self::STATUS_COMPLETE => get_lang('dict_upgrade.complete'),
+            self::STATUS_FAIL => get_lang('dict_upgrade.fail'),
+            self::STATUS_CANCEL => get_lang('dict_upgrade.cancel'),
+        ];
+        return $status_list[ $status ] ?? '';
+    }
+}

niucloud/app/install/source/database.sql

@@ -153,7 +153,7 @@ CREATE TABLE `diy_form_submit_config` (
   `id` INT(11) NOT NULL AUTO_INCREMENT COMMENT '主键id',
   `form_id` INT(11) NOT NULL DEFAULT 0 COMMENT '所属万能表单id',
   `submit_after_action` VARCHAR(255) NOT NULL DEFAULT '' COMMENT '填表人提交后操作，text：文字信息，voucher：核销凭证',
-  `tips_type` VARCHAR(255) NOT NULL COMMENT '提示内容类型，default：默认提示，diy：自定义提示',
+  `tips_type` VARCHAR(255) NOT NULL DEFAULT '' COMMENT '提示内容类型，default：默认提示，diy：自定义提示',
   `tips_text` VARCHAR(255) NOT NULL DEFAULT '' COMMENT '自定义提示内容',
   `time_limit_type` VARCHAR(255) NOT NULL DEFAULT '0' COMMENT '核销凭证有效期限制类型，no_limit：不限制，specify_time：指定固定开始结束时间，submission_time：按提交时间设置有效期',
   `time_limit_rule` TEXT DEFAULT NULL COMMENT '核销凭证时间限制规则，json格式',
@@ -289,7 +289,7 @@ CREATE TABLE `generate_table` (
 DROP TABLE IF EXISTS `jobs`;
 CREATE TABLE `jobs` (
   `id` int(11) NOT NULL AUTO_INCREMENT,
-  `queue` varchar(255) NOT NULL,
+  `queue` varchar(255) NOT NULL DEFAULT '',
   `payload` longtext NOT NULL,
   `attempts` tinyint(4) UNSIGNED NOT NULL DEFAULT 0,
   `reserve_time` int(11) UNSIGNED NULL DEFAULT 0,
@@ -504,7 +504,7 @@ CREATE TABLE `pay` (
   `trade_id` int(11) NOT NULL DEFAULT 0 COMMENT '业务id',
   `trade_no` varchar(255) NOT NULL DEFAULT '' COMMENT '交易单号',
   `body` varchar(1000) NOT NULL DEFAULT '' COMMENT '支付主体',
-  `money` decimal(10, 2) NOT NULL COMMENT '支付金额',
+  `money` decimal(10, 2) NOT NULL DEFAULT 0.00 COMMENT '支付金额',
   `voucher` varchar(255) NOT NULL DEFAULT '' COMMENT '支付票据',
   `status` int(11) NOT NULL DEFAULT 0 COMMENT '支付状态（0.待支付 1. 支付中 2. 已支付 -1已取消）',
   `json` varchar(255) NOT NULL DEFAULT '' COMMENT '支付扩展用支付信息',
@@ -700,6 +700,21 @@ CREATE TABLE `sys_attachment_category` (
 ) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '附件分类表' ROW_FORMAT = Dynamic;
 
 
+DROP TABLE IF EXISTS `sys_backup_records`;
+CREATE TABLE `sys_backup_records` (
+  `id` INT NOT NULL AUTO_INCREMENT COMMENT '主键id',
+  `version` VARCHAR(255) NOT NULL DEFAULT '' COMMENT '备份版本号',
+  `backup_key` VARCHAR(255) NOT NULL DEFAULT '' COMMENT '备份标识',
+  `content` VARCHAR(255) NOT NULL DEFAULT '' COMMENT '备份内容',
+  `status` VARCHAR(255) NOT NULL DEFAULT '' COMMENT '状态',
+  `fail_reason` LONGTEXT DEFAULT NULL COMMENT '失败原因',
+  `remark` VARCHAR(500) NOT NULL DEFAULT '' COMMENT '备注',
+  `create_time` INT NOT NULL DEFAULT 0 COMMENT '创建时间',
+  `complete_time` INT NOT NULL DEFAULT 0 COMMENT '完成时间',
+  PRIMARY KEY (`id`)
+) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '备份记录表' ROW_FORMAT = Dynamic;
+
+
 DROP TABLE IF EXISTS `sys_config`;
 CREATE TABLE `sys_config` (
   `id` int(10) UNSIGNED NOT NULL AUTO_INCREMENT COMMENT '主键',
@@ -966,6 +981,22 @@ CREATE TABLE `sys_schedule_log` (
 ) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '计划任务执行记录' ROW_FORMAT = Dynamic;
 
 
+DROP TABLE IF EXISTS `sys_upgrade_records`;
+CREATE TABLE `sys_upgrade_records` (
+  `id` INT NOT NULL AUTO_INCREMENT COMMENT '主键id',
+  `upgrade_key` VARCHAR(255) NOT NULL DEFAULT '' COMMENT '升级标识',
+  `app_key` VARCHAR(255) NOT NULL DEFAULT '' COMMENT '插件标识',
+  `name` LONGTEXT DEFAULT NULL  COMMENT '升级名称',
+  `content` TEXT DEFAULT NULL COMMENT '升级内容',
+  `prev_version` VARCHAR(255) NOT NULL DEFAULT '' COMMENT '前一版本',
+  `current_version` VARCHAR(255) NOT NULL DEFAULT '' COMMENT '当前版本',
+  `status` VARCHAR(255) NOT NULL DEFAULT '' COMMENT '状态',
+  `fail_reason` LONGTEXT DEFAULT NULL COMMENT '失败原因',
+  `create_time` INT NOT NULL DEFAULT 0 COMMENT '创建时间',
+  `complete_time` INT NOT NULL DEFAULT 0 COMMENT '完成时间',
+  PRIMARY KEY (`id`)
+) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '升级记录表' ROW_FORMAT = Dynamic;
+
 DROP TABLE IF EXISTS `sys_user`;
 CREATE TABLE `sys_user` (
   `uid` smallint(5) UNSIGNED NOT NULL AUTO_INCREMENT COMMENT '系统用户ID',
@@ -974,13 +1005,13 @@ CREATE TABLE `sys_user` (
   `password` varchar(100) NOT NULL DEFAULT '' COMMENT '用户密码',
   `real_name` varchar(16) NOT NULL DEFAULT '' COMMENT '实际姓名',
   `last_ip` varchar(50) NOT NULL DEFAULT '' COMMENT '最后一次登录ip',
-  `last_time` int(10) UNSIGNED NOT NULL DEFAULT 0 COMMENT '最后一次登录时间',
-  `create_time` int(10) UNSIGNED NOT NULL DEFAULT 0 COMMENT '添加时间',
-  `login_count` int(10) UNSIGNED NOT NULL DEFAULT 0 COMMENT '登录次数',
-  `is_del` tinyint(3) UNSIGNED NOT NULL DEFAULT 0,
+  `last_time` int(10) NOT NULL DEFAULT 0 COMMENT '最后一次登录时间',
+  `create_time` int(10) NOT NULL DEFAULT 0 COMMENT '添加时间',
+  `login_count` int(10) NOT NULL DEFAULT 0 COMMENT '登录次数',
+  `is_del` tinyint(3) NOT NULL DEFAULT 0,
   `delete_time` int(11) NOT NULL DEFAULT 0 COMMENT '删除时间',
   `update_time` int(11) NOT NULL DEFAULT 0 COMMENT '更新时间',
-  `status` tinyint(3) UNSIGNED NOT NULL DEFAULT 1 COMMENT '后台管理员状态 1有效0无效',
+  `status` tinyint(3) NOT NULL DEFAULT 1 COMMENT '后台管理员状态 1有效0无效',
   `role_ids` varchar(255) NOT NULL DEFAULT '' COMMENT '权限组',
   `is_admin` tinyint(4) NOT NULL DEFAULT '0' COMMENT '是否是管理员',
   PRIMARY KEY (`uid`) USING BTREE,
@@ -1045,9 +1076,9 @@ CREATE TABLE `web_adv` (
 DROP TABLE IF EXISTS `web_friendly_link`;
 CREATE TABLE `web_friendly_link` (
   `id` INT(11) UNSIGNED NOT NULL AUTO_INCREMENT COMMENT '索引id',
-  `link_title` VARCHAR(100) NOT NULL COMMENT '标题',
-  `link_url` VARCHAR(100) NOT NULL COMMENT '链接',
-  `link_pic` VARCHAR(100) NOT NULL COMMENT '图片',
+  `link_title` VARCHAR(100) NOT NULL DEFAULT '' COMMENT '标题',
+  `link_url` VARCHAR(100) NOT NULL DEFAULT '' COMMENT '链接',
+  `link_pic` VARCHAR(100) NOT NULL DEFAULT '' COMMENT '图片',
   `sort` INT(11) NOT NULL DEFAULT 0 COMMENT '排序号',
   `is_show` INT(11) NOT NULL DEFAULT 1 COMMENT '是否显示 1.是 2.否',
   PRIMARY KEY (`id`)

niucloud/app/job/schedule/AutoClearScheduleLog.php

@@ -0,0 +1,47 @@
+<?php
+// +----------------------------------------------------------------------
+// | Niucloud-admin 企业快速开发的多应用管理平台
+// +----------------------------------------------------------------------
+// | 官方网址：https://www.niucloud.com
+// +----------------------------------------------------------------------
+// | niucloud团队 版权所有 开源版本可自由商用
+// +----------------------------------------------------------------------
+// | Author: Niucloud Team
+// +----------------------------------------------------------------------
+
+namespace app\job\schedule;
+
+use app\model\sys\SysScheduleLog;
+use core\base\BaseJob;
+use think\facade\Log;
+
+/**
+ * 队列异步调用定时任务
+ */
+class AutoClearScheduleLog extends BaseJob
+{
+    /****执行成功的数据记录留存时间***/
+    const SUCCESS_SAVE_DAY = 3;
+    /***执行失败的数据记录留存时间***/
+    const ERROR_SAVE_DAY = 7;
+
+    public function doJob()
+    {
+        Log::write('AutoClearScheduleLog 定时清除schedule_log数据' . date('Y-m-d h:i:s'));
+        try {
+            ( new SysScheduleLog() )->where([
+                [ 'execute_time', '<', time() - self::SUCCESS_SAVE_DAY * 86400 ],
+                [ 'status', '=', 'success' ],
+            ])->delete();
+            ( new SysScheduleLog() )->where([
+                [ 'execute_time', '<', time() - self::ERROR_SAVE_DAY * 86400 ],
+                [ 'status', '=', 'error' ],
+            ])->delete();
+            return true;
+        } catch (\Exception $e) {
+            Log::write('AutoClearScheduleLog 定时清除schedule_log数据失败' . date('Y-m-d h:i:s') . $e->getMessage() . $e->getFile() . $e->getLine());
+            return false;
+        }
+
+    }
+}

niucloud/app/job/upgrade/AutoClearUpgradeRecords.php

@@ -0,0 +1,54 @@
+<?php
+// +----------------------------------------------------------------------
+// | Niucloud-admin 企业快速开发的多应用管理平台
+// +----------------------------------------------------------------------
+// | 官方网址：https://www.niucloud.com
+// +----------------------------------------------------------------------
+// | niucloud团队 版权所有 开源版本可自由商用
+// +----------------------------------------------------------------------
+// | Author: Niucloud Team
+// +----------------------------------------------------------------------
+
+namespace app\job\upgrade;
+
+use app\dict\sys\BackupDict;
+use app\dict\sys\UpgradeDict;
+use app\model\sys\SysUpgradeRecords;
+use app\service\admin\upgrade\BackupRecordsService;
+use core\base\BaseJob;
+use think\facade\Log;
+
+/**
+ * 队列异步调用定时任务
+ */
+class AutoClearUpgradeRecords extends BaseJob
+{
+    const DAY = 7; // 清除7天前的数据
+
+    public function doJob()
+    {
+        Log::write('AutoClearUpgradeRecords 定时清除升级记录、备份记录数据' . date('Y-m-d h:i:s'));
+        try {
+            // 清除7天前的升级记录数据
+            ( new SysUpgradeRecords() )->where([
+                [ 'create_time', '<', time() - self::DAY * 86400 ],
+                [ 'status', 'in', [ UpgradeDict::STATUS_READY, UpgradeDict::STATUS_FAIL ] ]
+            ])->delete();
+
+            // 清除7天前的备份记录数据
+            $backup_records_service = new BackupRecordsService();
+            $backup_records = $backup_records_service->getList([
+                [ 'create_time', '<', time() - self::DAY * 86400 ],
+                [ 'status', 'in', [ BackupDict::STATUS_READY, BackupDict::STATUS_FAIL ] ]
+            ], 'id');
+
+            $backup_records_service->del(array_column($backup_records, 'id'));
+
+            return true;
+        } catch (\Exception $e) {
+            Log::write('AutoClearScheduleLog 定时清除升级记录、备份记录数据失败' . date('Y-m-d h:i:s') . $e->getMessage() . $e->getFile() . $e->getLine());
+            return false;
+        }
+
+    }
+}

niucloud/app/job/wxoplatform/GetVersionUploadResult.php

@@ -0,0 +1,34 @@
+<?php
+// +----------------------------------------------------------------------
+// | Niucloud-admin 企业快速开发的多应用管理平台
+// +----------------------------------------------------------------------
+// | 官方网址：https://www.niucloud.com
+// +----------------------------------------------------------------------
+// | niucloud团队 版权所有 开源版本可自由商用
+// +----------------------------------------------------------------------
+// | Author: Niucloud Team
+// +----------------------------------------------------------------------
+
+namespace app\job\wxoplatform;
+
+use app\service\admin\wxoplatform\WeappVersionService;
+use core\base\BaseJob;
+
+/**
+ * 队列异步调用支付定时未支付恢复
+ */
+class GetVersionUploadResult extends BaseJob
+{
+
+    /**
+     * 消费
+     * @param $data
+     * @return true
+     */
+    protected function doJob($task_key, $is_all)
+    {
+        WeappVersionService::getVersionUploadResult($task_key, $is_all);
+        return true;
+    }
+
+}

niucloud/app/job/wxoplatform/VersionUploadSuccess.php

@@ -0,0 +1,34 @@
+<?php
+// +----------------------------------------------------------------------
+// | Niucloud-admin 企业快速开发的多应用管理平台
+// +----------------------------------------------------------------------
+// | 官方网址：https://www.niucloud.com
+// +----------------------------------------------------------------------
+// | niucloud团队 版权所有 开源版本可自由商用
+// +----------------------------------------------------------------------
+// | Author: Niucloud Team
+// +----------------------------------------------------------------------
+
+namespace app\job\wxoplatform;
+
+use app\service\admin\wxoplatform\WeappVersionService;
+use core\base\BaseJob;
+
+/**
+ * 队列异步调用支付定时未支付恢复
+ */
+class VersionUploadSuccess extends BaseJob
+{
+
+    /**
+     * 消费
+     * @param $data
+     * @return true
+     */
+    protected function doJob($task_key, $is_all)
+    {
+        WeappVersionService::uploadSuccess($task_key, $is_all);
+        return true;
+    }
+
+}

niucloud/app/lang/en/validate.php

@@ -36,19 +36,6 @@ return [
         'real_name_require' => 'real_name is require',
         'password_require' => 'password is require',
     ],
-    //站点
-    'validate_site' => [
-        'site_name_require' => 'site_name is require',
-        'site_name_max' => 'site_name is not exceed 120 points',
-        'keywords_require' => 'keywords is require',
-        'keywords_max' => 'site_name is not exceed 30 points',
-        'group_id_require' => 'group_id is require',
-        'group_id_number' => 'group_id must be a number',
-        'expire_time_number' => 'expire_time must be a number',
-        'group_name_require' => 'group_name is require',
-        'group_name_max' => 'group_name is not exceed 120 points',
-        'group_roles_require' => 'group_roles is require'
-    ],
     //附件
     'validate_attachment' => [
         'name_require' => 'name is require',

niucloud/app/lang/zh-cn/api.php

@@ -37,6 +37,7 @@ return [
     'SERVER_CROSS_REQUEST_FAIL' => '服务器跨域请求异常',
     'ADDON_INSTALL_NOT_EXIST' => '未找到插件安装任务',
     'ADDON_INSTALL_EXECUTED' => '插件安装任务已执行',
+    'ADDON_INSTALLING' => '插件安装中',
     'INSTALL_CHECK_NOT_PASS' => '安装校验未通过',
     'ADDON_SQL_FAIL' => '插件sql执行失败',
     'ADDON_DIR_FAIL' => '插件文件操作失败',
@@ -56,6 +57,10 @@ return [
     'ADDON_ZIP_ERROR' => '插件压缩失败',
     'PHP_SCRIPT_RUNNING_OUT_OF_MEMORY' => 'PHP脚本运行内存不足, 具体操作方法<a style="text-decoration: underline;" href="https://www.kancloud.cn/niushop/niushop_v6/3248604" target="blank">点击查看相关手册</a>',
     'BEFORE_UPGRADING_NEED_UPGRADE_FRAMEWORK' => '升级插件前需要先升级框架',
+    'UPGRADE_RECORD_NOT_EXIST' => '升级记录不存在',
+    'UPGRADE_BACKUP_CODE_NOT_FOUND' => '未找到备份的源码文件',
+    'UPGRADE_BACKUP_SQL_NOT_FOUND' => '未找到备份的数据库文件',
+    'NOT_EXIST_UPGRADE_CONTENT' => '没有获取到可以升级的内容',
     //登录注册重置账号....
 
     'LOGIN_SUCCESS' => '登录成功',
@@ -289,6 +294,8 @@ return [
     'VERIFY_TYPE_ERROR' => '核销类型错误',
     'VERIFY_CODE_EXPIRED' => '当前核销码已核销或已失效',
     'VERIFIER_NOT_EXIST' => '核销员不存在',
+    'VERIFIER_EXIST'=>'核销员已存在',
+    'VERIFIER_NOT_AUTH' => '该核销员没有权限',
 
     //签到相关
     'SIGN_NOT_USE' => '签到未开启',
@@ -312,7 +319,5 @@ return [
     'DIRECTORY' => '目录',
     'WAS_NOT_CREATED' => '创建失败',
 
-    /********************************************************* 微信开放平台 **************************************/
-
     'PRINTER_NOT_EXIST' => '打印机不存在'
 ];

niucloud/app/lang/zh-cn/dict.php

@@ -376,7 +376,6 @@ return [
         'oct' => '10月',
         'nov' => '11月',
         'dec' => '12月',
-
     ],
     'dict_site_layout' => [
         'default' => '默认'
@@ -387,7 +386,8 @@ return [
         'upload_fail' => '上传失败',
         'auditing' => '审核中',
         'audit_success' => '审核通过',
-        'audit_fail' => '审核失败'
+        'audit_fail' => '审核失败',
+        'published' => '已发布'
     ],
     'dict_wechat_media' => [
         'type_image' => '图片',
@@ -414,5 +414,16 @@ return [
     // 打印机品牌
     'dict_printer' => [
         'yilianyun' => '易联云打印机'
+    ],
+    'dict_upgrade' => [
+        'ready' => '升级中',
+        'complete' => '完成',
+        'fail' => '失败',
+        'cancel' => '已取消'
+    ],
+    'dict_backup' => [
+        'ready' => '准备执行',
+        'complete' => '完成',
+        'fail' => '失败'
     ]
 ];

niucloud/app/lang/zh-cn/validate.php

@@ -36,22 +36,6 @@ return [
         'real_name_require' => '实际姓名必须填写',
         'password_require' => '账号密码必须填写',
     ],
-    //站点
-    'validate_site' => [
-        'site_name_require' => '网站名称必须填写',
-        'site_name_max' => '网站名称最多不能超过20个字符',
-        'keywords_require' => '关键字必须填写',
-        'keywords_max' => '关键字最多不能超过30个字符',
-        'group_id_require' => '站点分组必须填写',
-        'group_id_number' => '站点分组必须是整数',
-        'expire_time_number' => '到期时间必须是时间戳',
-        'group_name_require' => '站点分组名称必须填写',
-        'group_name_max' => '站点分组名称不能超过20字符',
-        'app_require' => '套餐主应用必须选择',
-        'front_end_name_require' => '前台名称必须填写',
-        'front_end_name_max' => '前台名称最多不能超过20个字符',
-        'site_domain_cannot_repeated' => '站点域名不能重复'
-    ],
     //附件
     'validate_attachment' => [
         'name_require' => '附件组名称必须填写',

niucloud/app/listener/system/ShowAppListener.php

@@ -37,13 +37,20 @@ class ShowAppListener
                     'key' => 'diy_form',
                     'url' => '/diy_form/list',
                 ],
-//                [
-//                    'title' => '万能a表单',
-//                    'desc' => '万能a表单',
-//                    'icon' => 'static/resource/images/diy_form/icon.png',
-//                    'key' => 'diy_faorm',
-//                    'url' => '/diy_faorm/list',
-//                ]
+                [
+                    'title' => '小票打印',
+                    'desc' => '支持打印机添加，便捷创建小票打印模板',
+                    'icon' => 'static/resource/images/tool/printer_icon.png',
+                    'key' => 'printer_management',
+                    'url' => '/printer/list',
+                ],
+                [
+                    'title' => '数据导出',
+                    'desc' => '展示导出文件，支持删除与下载',
+                    'icon' => 'static/resource/images/tool/export_icon.png',
+                    'key' => 'setting_export',
+                    'url' => '/setting/export',
+                ],
             ],
             // 营销
             'promotion' => [

niucloud/app/model/member/Member.php

@@ -202,9 +202,16 @@ class Member extends BaseModel
      */
     public function searchMemberLabelAttr(Query $query, $value, $data)
     {
+
         if ($value) {
-            $query->whereLike('member_label', '%"' . $value . '"%');
+            if (is_array($value)) {
+                $temp_where = array_map(function($item) { return '%"' . $item . '"%'; }, $value);
+            } else {
+                $temp_where = [ '%"' . $value . '"%' ];
             }
+            $query->where('member_label', 'like', $temp_where, 'or');
+        }
+
     }
 
     /**
@@ -268,4 +275,5 @@ class Member extends BaseModel
     {
         return $this->hasOne(MemberLevel::class, 'level_id', 'member_level')->bind([ 'member_level_name' => 'level_name' ]);
     }
+
 }

niucloud/app/model/sys/SysBackupRecords.php

@@ -0,0 +1,112 @@
+<?php
+// +----------------------------------------------------------------------
+// | Niucloud-admin 企业快速开发的多应用管理平台
+// +----------------------------------------------------------------------
+// | 官方网址：https://www.niucloud.com
+// +----------------------------------------------------------------------
+// | niucloud团队 版权所有 开源版本可自由商用
+// +----------------------------------------------------------------------
+// | Author: Niucloud Team
+// +----------------------------------------------------------------------
+
+namespace app\model\sys;
+
+use app\dict\sys\UpgradeDict;
+use core\base\BaseModel;
+
+/**
+ * 备份记录表模型
+ */
+class SysBackupRecords extends BaseModel
+{
+
+    /**
+     * 数据表主键
+     * @var string
+     *
+     */
+    protected $pk = 'id';
+
+    /**
+     * 模型名称
+     * @var string
+     */
+    protected $name = 'sys_backup_records';
+
+    protected $type = [
+        'create_time' => 'timestamp',
+        'complete_time' => 'timestamp'
+    ];
+
+    // 设置json类型字段
+    protected $json = [ 'fail_reason' ];
+
+    // 设置JSON数据返回数组
+    protected $jsonAssoc = true;
+
+    /**
+     * 状态字段转化
+     * @param $value
+     * @param $data
+     * @return mixed
+     */
+    public function getStatusNameAttr($value, $data)
+    {
+        if (empty($data[ 'status' ])) return '';
+        return UpgradeDict::getStatus($data[ 'status' ]);
+    }
+
+    /**
+     * 备份目录
+     * @param $value
+     * @param $data
+     * @return string
+     */
+    public function getBackupDirAttr($value, $data)
+    {
+        if (empty($data[ 'backup_key' ])) return '';
+        return 'upgrade' . DIRECTORY_SEPARATOR . $data[ 'backup_key' ];
+    }
+
+    /**
+     * 备份源码目录
+     * @param $value
+     * @param $data
+     * @return string
+     */
+    public function getBackupCodeDirAttr($value, $data)
+    {
+        if (empty($data[ 'backup_key' ])) return '';
+
+        $root_path = dirname(root_path()) . DIRECTORY_SEPARATOR;
+        $upgrade_dir = $root_path . 'upgrade' . DIRECTORY_SEPARATOR;
+        return $upgrade_dir . $data[ 'backup_key' ] . DIRECTORY_SEPARATOR . 'backup' . DIRECTORY_SEPARATOR . 'code' . DIRECTORY_SEPARATOR;
+    }
+
+    /**
+     * 备份数据库目录
+     * @param $value
+     * @param $data
+     * @return string
+     */
+    public function getBackupSqlDirAttr($value, $data)
+    {
+        if (empty($data[ 'backup_key' ])) return '';
+        $root_path = dirname(root_path()) . DIRECTORY_SEPARATOR;
+        $upgrade_dir = $root_path . 'upgrade' . DIRECTORY_SEPARATOR;
+        return $upgrade_dir . $data[ 'backup_key' ] . DIRECTORY_SEPARATOR . 'backup' . DIRECTORY_SEPARATOR . 'sql' . DIRECTORY_SEPARATOR;
+    }
+
+    /**
+     * 搜索器:备份内容
+     * @param $query
+     * @param $value
+     * @param $data
+     */
+    public function searchContentAttr($query, $value, $data)
+    {
+        if ($value != '') {
+            $query->where("content", 'like', '%' . $this->handelSpecialCharacter($value) . '%');
+        }
+    }
+}

niucloud/app/model/sys/SysUpgradeRecords.php

@@ -0,0 +1,130 @@
+<?php
+// +----------------------------------------------------------------------
+// | Niucloud-admin 企业快速开发的多应用管理平台
+// +----------------------------------------------------------------------
+// | 官方网址：https://www.niucloud.com
+// +----------------------------------------------------------------------
+// | niucloud团队 版权所有 开源版本可自由商用
+// +----------------------------------------------------------------------
+// | Author: Niucloud Team
+// +----------------------------------------------------------------------
+
+namespace app\model\sys;
+
+use app\dict\sys\UpgradeDict;
+use core\base\BaseModel;
+
+/**
+ * 升级记录表模型
+ */
+class SysUpgradeRecords extends BaseModel
+{
+
+    /**
+     * 数据表主键
+     * @var string
+     */
+    protected $pk = 'id';
+
+    /**
+     * 模型名称
+     * @var string
+     */
+    protected $name = 'sys_upgrade_records';
+
+    protected $type = [
+        'create_time' => 'timestamp',
+        'complete_time' => 'timestamp'
+    ];
+
+    // 设置json类型字段
+    protected $json = [ 'fail_reason' ];
+
+    // 设置JSON数据返回数组
+    protected $jsonAssoc = true;
+
+    /**
+     * 状态字段转化
+     * @param $value
+     * @param $data
+     * @return mixed
+     */
+    public function getStatusNameAttr($value, $data)
+    {
+        if (empty($data[ 'status' ])) return '';
+        return UpgradeDict::getStatus($data[ 'status' ]);
+    }
+
+    /**
+     * 备份目录
+     * @param $value
+     * @param $data
+     * @return string
+     */
+    public function getBackupDirAttr($value, $data)
+    {
+        if (empty($data[ 'upgrade_key' ])) return '';
+        return 'upgrade' . DIRECTORY_SEPARATOR . $data[ 'upgrade_key' ];
+    }
+
+    /**
+     * 备份源码目录
+     * @param $value
+     * @param $data
+     * @return string
+     */
+    public function getBackupCodeDirAttr($value, $data)
+    {
+        if (empty($data[ 'upgrade_key' ])) return '';
+
+        $root_path = dirname(root_path()) . DIRECTORY_SEPARATOR;
+        $upgrade_dir = $root_path . 'upgrade' . DIRECTORY_SEPARATOR;
+        return $upgrade_dir . $data[ 'upgrade_key' ] . DIRECTORY_SEPARATOR . 'backup' . DIRECTORY_SEPARATOR . 'code' . DIRECTORY_SEPARATOR;
+    }
+
+    /**
+     * 备份数据库目录
+     * @param $value
+     * @param $data
+     * @return string
+     */
+    public function getBackupSqlDirAttr($value, $data)
+    {
+        if (empty($data[ 'upgrade_key' ])) return '';
+        $root_path = dirname(root_path()) . DIRECTORY_SEPARATOR;
+        $upgrade_dir = $root_path . 'upgrade' . DIRECTORY_SEPARATOR;
+        return $upgrade_dir . $data[ 'upgrade_key' ] . DIRECTORY_SEPARATOR . 'backup' . DIRECTORY_SEPARATOR . 'sql' . DIRECTORY_SEPARATOR;
+    }
+
+    /**
+     * 搜索器:升级名称
+     * @param $query
+     * @param $value
+     * @param $data
+     */
+    public function searchNameAttr($query, $value, $data)
+    {
+        if ($value != '') {
+            $query->where("name", 'like', '%' . $this->handelSpecialCharacter($value) . '%');
+        }
+    }
+
+    /**
+     * 关联备份记录
+     * @return \think\model\relation\HasOne
+     */
+    public function backupRecord()
+    {
+        return $this->hasOne(SysBackupRecords::class, 'backup_key', 'upgrade_key');
+    }
+
+    public function getContentAttr($value) {
+        if (!empty($value)) {
+            try {
+                return json_decode($value, true);
+            } catch (\Exception $e) {
+            }
+        }
+        return $value;
+    }
+}

niucloud/app/model/verify/Verify.php

@@ -18,8 +18,6 @@ use think\db\Query;
 
 /**
  * 核销记录模型
- * Class Poster
- * @package app\model\verify
  */
 class Verify extends BaseModel
 {
@@ -42,7 +40,8 @@ class Verify extends BaseModel
     // 设置JSON数据返回数组
     protected $jsonAssoc = true;
 
-    public function member() {
+    public function member()
+    {
         return $this->hasOne(Member::class, 'member_id', 'verifier_member_id');
     }
 
@@ -85,6 +84,7 @@ class Verify extends BaseModel
             $query->where('relate_tag', '=', $value);
         }
     }
+
     /**
      * 核销员
      * @param $query
@@ -136,7 +136,8 @@ class Verify extends BaseModel
      * @param $value
      * @return void
      */
-    public function getTypeNameAttr($value, $data) {
+    public function getTypeNameAttr($value, $data)
+    {
         if (empty($data[ 'type' ]))
             return '';
         return VerifyDict::getType()[ $data[ 'type' ] ][ 'name' ] ?? '';

niucloud/app/model/weapp/WeappVersion.php

@@ -35,6 +35,6 @@ class WeappVersion extends BaseModel
     protected $name = 'weapp_version';
 
     public function getStatusNameAttr($value, $data) {
-        if (isset($data['status'])) return CloudDict::getAppletUploadSatus($data['status']);
+        if (isset($data['status'])) return CloudDict::getAppletUploadStatus($data['status']);
     }
 }

niucloud/app/service/admin/diy_form/DiyFormService.php

@@ -623,39 +623,6 @@ class DiyFormService extends BaseAdminService
         return ( new DiyFormFields() )->where([ [ 'field_id', '>', 0 ] ])->withSearch([ 'form_id' ], $where)->field($field)->order($order)->select()->toArray();
     }
 
-    /**
-     * 获取万能表单微信小程序二维码
-     * @param $form_id
-     * @return array
-     */
-    public function getQrcode($form_id)
-    {
-        if (empty($form_id)) {
-            throw new AdminException('缺少参考form_id');
-        }
-
-        $page = 'app/pages/index/diy_form';
-
-        $data = [
-            [
-                'key' => 'form_id',
-                'value' => $form_id
-            ],
-        ];
-        $dir = 'upload/diy_form_qrcode';
-
-        $path = '';
-        try {
-            $path = qrcode('', $page, $data, $dir, 'weapp');
-        } catch (\Exception $e) {
-            Log::write('万能表单微信小程序二维码生成error' . $e->getMessage() . $e->getFile() . $e->getLine());
-        }
-
-        return [
-            'path' => $path
-        ];
-    }
-
     /**
      * 检测表单名称唯一性
      * @param array $data

niucloud/app/service/admin/generator/vm/search/select2.vm

@@ -1,5 +1,5 @@
 <el-form-item :label="t('{LCASE_COLUMN_NAME}')" prop="{COLUMN_NAME}">
-    <el-select class="" v-model="{LCASE_CLASS_NAME}Table.searchParam.{COLUMN_NAME}" clearable :placeholder="t('{LCASE_COLUMN_NAME}Placeholder')">
+    <el-select v-model="{LCASE_CLASS_NAME}Table.searchParam.{COLUMN_NAME}" clearable :placeholder="t('{LCASE_COLUMN_NAME}Placeholder')">
         <el-option label="全部" value=""></el-option>
 
     </el-select>

niucloud/app/service/admin/member/MemberService.php

@@ -65,8 +65,13 @@ class MemberService extends BaseAdminService
     public function getList(array $where = [])
     {
         $field = 'member_id, nickname, headimg';
-        return  $this->model->withSearch(['keyword'],$where)->field($field)->order('member_id desc')->limit($this->getPageParam()['limit'] ?? 0)->select()->toArray();
+        $temp_where[] = [];
+        if (!empty($where[ 'member_ids' ])) {
+            $temp_where[] = [ 'member_id', 'in', implode(',', $where[ 'member_ids' ]) ];
         }
+        return $this->model->where($temp_where)->withSearch([ 'keyword' ], $where)->field($field)->order('member_id desc')->limit($this->getPageParam()[ 'limit' ] ?? 0)->select()->toArray();
+    }
+
     /**
      * 会员详情
      * @param int $member_id
@@ -154,7 +159,8 @@ class MemberService extends BaseAdminService
      * 组合整理数据
      * @param $data
      */
-    public function makeUp($data){
+    public function makeUp($data)
+    {
         //会员标签
         if (!empty($data[ 'member_label' ])) {
             $data[ 'member_label_array' ] = ( new MemberLabelService() )->getMemberLabelListByLabelIds($data[ 'member_label' ]);
@@ -167,7 +173,8 @@ class MemberService extends BaseAdminService
      * @return int
      * @throws DbException
      */
-    public function getCount(array $where = []){
+    public function getCount(array $where = [])
+    {
         $where[] = [ 'is_del', '=', 0 ];
         return $this->model->where($where)->count();
     }
@@ -178,7 +185,8 @@ class MemberService extends BaseAdminService
      * @param int $status
      * @return true
      */
-    public function setStatus(array $member_ids, int $status){
+    public function setStatus(array $member_ids, int $status)
+    {
         $where = array(
             [ 'member_id', 'in', $member_ids ],
         );
@@ -240,7 +248,8 @@ class MemberService extends BaseAdminService
      * 获取会员权益字典
      * @return mixed
      */
-    public function getMemberBenefitsDict() {
+    public function getMemberBenefitsDict()
+    {
         return ( new DictLoader("MemberBenefits") )->load();
     }
 
@@ -248,7 +257,8 @@ class MemberService extends BaseAdminService
      * 获取会员礼包字典
      * @return array|null
      */
-    public function getMemberGiftDict() {
+    public function getMemberGiftDict()
+    {
         return ( new DictLoader("MemberGift") )->load();
     }
 
@@ -256,7 +266,8 @@ class MemberService extends BaseAdminService
      * 获取成长值规则字典
      * @return array|null
      */
-    public function getGrowthRuleDict() {
+    public function getGrowthRuleDict()
+    {
         return ( new DictLoader("GrowthRule") )->load();
     }
 
@@ -264,7 +275,8 @@ class MemberService extends BaseAdminService
      * 获取积分规则字典
      * @return array|null
      */
-    public function getPointRuleDict() {
+    public function getPointRuleDict()
+    {
         return ( new DictLoader("PointRule") )->load();
     }
 
@@ -273,7 +285,8 @@ class MemberService extends BaseAdminService
      * @param array $benefits
      * @return array|null
      */
-    public function getMemberBenefitsContent(array $benefits) {
+    public function getMemberBenefitsContent(array $benefits)
+    {
         return ( new CoreMemberService() )->getBenefitsContent($benefits);
     }
 
@@ -282,7 +295,8 @@ class MemberService extends BaseAdminService
      * @param array $benefits
      * @return array|null
      */
-    public function getMemberGiftsContent(array $gifts) {
+    public function getMemberGiftsContent(array $gifts)
+    {
         return ( new CoreMemberService() )->getGiftContent($gifts);
     }
 }

niucloud/app/service/admin/niucloud/NiucloudService.php

@@ -37,7 +37,8 @@ class NiucloudService extends BaseAdminService
      * @param $data
      * @return \app\model\sys\SysConfig|bool|\think\Model
      */
-    public function setAuthorize($data){
+    public function setAuthorize($data)
+    {
 
         $data = [
             'auth_code' => $data[ 'auth_code' ],
@@ -54,10 +55,10 @@ class NiucloudService extends BaseAdminService
      * 获取授权信息
      * @return mixed|string[]
      */
-    public function getAuthorize(){
-        $info = $this->core_config_service->getConfig(ConfigKeyDict::NIUCLOUD_CONFIG);
-        if(empty($info))
+    public function getAuthorize()
     {
+        $info = $this->core_config_service->getConfig(ConfigKeyDict::NIUCLOUD_CONFIG);
+        if (empty($info)) {
             $info = [];
             $info[ 'value' ] = [
                 'auth_code' => '',
@@ -70,18 +71,29 @@ class NiucloudService extends BaseAdminService
     /**
      * 获取框架最新版本
      */
-    public function getFrameworkLastVersion() {
+    public function getFrameworkLastVersion()
+    {
         return ( new CoreModuleService() )->getFrameworkLastVersion();
     }
 
     /**
      * 获取框架版本更新记录
      */
-    public function getFrameworkVersionList() {
+    public function getFrameworkVersionList()
+    {
         return ( new CoreModuleService() )->getFrameworkVersionList();
     }
 
-    public function applyExperience() {
+    public function applyExperience()
+    {
         return ( new CoreModuleService() )->applyExperience();
     }
+
+    /**
+     * 获取应用/插件的版本更新记录
+     */
+    public function getAppVersionList($app_key)
+    {
+        return ( new CoreModuleService() )->getAppVersionList($app_key);
+    }
 }

niucloud/app/service/admin/sys/ConfigService.php

@@ -118,17 +118,13 @@ class ConfigService extends BaseAdminService
      */
     public function getService()
     {
-        $info = ( new CoreConfigService() )->getConfig('SERVICE_INFO');
-        if (empty($info)) {
-            $info = [];
-            $info[ 'value' ] = [
-                'wechat_code' => '',
-                'enterprise_wechat' => '',
-                'tel' => '',
+        $info = ( new CoreConfigService() )->getConfig('SERVICE_INFO')[ 'value' ] ?? [];
+        return [
+            'wechat_code' => $info[ 'wechat_code' ] ?? '',
+            'enterprise_wechat' => $info[ 'enterprise_wechat' ] ?? '',
+            'tel' => $info[ 'tel' ] ?? ''
         ];
     }
-        return $info[ 'value' ];
-    }
 
     /**
      * 设置服务信息
@@ -171,7 +167,7 @@ class ConfigService extends BaseAdminService
         if (empty($info)) {
             $info = [];
             $info[ 'value' ] = [
-                'key' => 'IZQBZ-3UHEU-WTCVD-2464U-I5N4V-ZFFU3',
+                'key' => '',
                 'is_open' => 1, // 是否开启定位
                 'valid_time' => 5 // 定位有效期/分钟，过期后将重新获取定位信息，0为不过期
             ];

niucloud/app/service/admin/sys/SystemService.php

@@ -14,8 +14,10 @@ namespace app\service\admin\sys;
 use app\job\sys\CheckJob;
 use app\service\core\sys\CoreSysConfigService;
 use core\base\BaseAdminService;
+use core\exception\AdminException;
 use think\facade\Cache;
 use think\facade\Db;
+use think\facade\Log;
 use Throwable;
 
 /**
@@ -179,4 +181,37 @@ class SystemService extends BaseAdminService
         }
         return false;
     }
+
+    /**
+     * 获取二维码
+     * @param $data
+     * @return array
+     */
+    public function getQrcode($data)
+    {
+        $page = $data[ 'page' ];//'app/pages/index/diy_form';
+        $qrcode_data = [];
+        foreach ($data[ 'params' ] as $item) {
+            $qrcode_data[] = [
+                'key' => $item[ 'column_name' ],
+                'value' => $item[ 'column_value' ]
+            ];
+        }
+        $dir = 'upload/' . $data[ 'folder' ] . '_qrcode';
+
+        try {
+            // h5
+            //$h5_path = qrcode('', $page, $data, $dir);
+
+            // 微信小程序
+            $weapp_path = qrcode('', $page, $qrcode_data, $dir, 'weapp');
+            return [
+                'h5_path' => '',
+                'weapp_path' => $weapp_path
+            ];
+        } catch (AdminException $e) {
+            Log::write('获取推广微信小程序二维码error' . $e->getMessage() . $e->getFile() . $e->getLine() . 'params:' . json_encode($data, 256));
+            throw new AdminException($e->getMessage() . $e->getFile() . $e->getLine() . 'params:' . json_encode($data, 256));
+        }
+    }
 }

niucloud/app/service/admin/upgrade/BackupRecordsService.php

@@ -0,0 +1,662 @@
+<?php
+// +----------------------------------------------------------------------
+// | Niucloud-admin 企业快速开发的多应用管理平台
+// +----------------------------------------------------------------------
+// | 官方网址：https://www.niucloud.com
+// +----------------------------------------------------------------------
+// | niucloud团队 版权所有 开源版本可自由商用
+// +----------------------------------------------------------------------
+// | Author: Niucloud Team
+// +----------------------------------------------------------------------
+
+namespace app\service\admin\upgrade;
+
+use app\dict\sys\BackupDict;
+use app\model\sys\SysBackupRecords;
+use app\service\admin\sys\SystemService;
+use core\base\BaseAdminService;
+use core\exception\AdminException;
+use core\exception\CommonException;
+use core\util\DbBackup;
+use think\facade\Cache;
+use think\facade\Db;
+
+/**
+ * 备份记录表服务层
+ */
+class BackupRecordsService extends BaseAdminService
+{
+
+    protected $upgrade_dir;
+
+    protected $root_path;
+
+    protected $cache_key = 'backup'; // 手动备份
+
+    protected $cache_restore_key = 'restore'; // 恢复
+
+    public function __construct()
+    {
+        parent::__construct();
+        $this->model = new SysBackupRecords();
+        $this->root_path = dirname(root_path()) . DIRECTORY_SEPARATOR;
+        $this->upgrade_dir = $this->root_path . 'upgrade' . DIRECTORY_SEPARATOR;
+    }
+
+    /**
+     * 添加备份记录
+     * @param array $data
+     * @return mixed
+     */
+    public function add(array $data)
+    {
+        $data[ 'status' ] = BackupDict::STATUS_READY;
+        $data[ 'create_time' ] = time();
+        $res = $this->model->create($data);
+        return $res->id;
+    }
+
+    /**
+     * 编辑备份记录
+     * @param array $condition
+     * @param array $data
+     * @return true
+     */
+    public function edit($condition, array $data)
+    {
+        $this->model->where($condition)->update($data);
+        return true;
+    }
+
+    /**
+     * 修改备注
+     * @param $params
+     * @return true
+     */
+    public function modifyRemark($params)
+    {
+        return $this->edit([
+            [ 'id', '=', $params[ 'id' ] ]
+        ], [ 'remark' => $params[ 'remark' ] ]);
+    }
+
+    /**
+     * 执行完成，更新备份记录的状态
+     * @param $backup_key
+     * @return void
+     */
+    public function complete($backup_key)
+    {
+        $this->model->where([
+            [ 'backup_key', '=', $backup_key ],
+        ])->update([
+            'status' => BackupDict::STATUS_COMPLETE,
+            'complete_time' => time()
+        ]);
+    }
+
+    /**
+     * 执行失败，更新备份记录的状态
+     * @param $backup_key
+     * @return void
+     */
+    public function failed($backup_key)
+    {
+        $info = $this->getInfo([
+            [ 'backup_key', '=', $backup_key ]
+        ], 'id,backup_key');
+        if (!empty($info)) {
+            $this->del($info[ 'id' ]);
+        }
+    }
+
+    /**
+     * 删除备份记录
+     * @param $ids
+     * @return true
+     */
+    public function del($ids)
+    {
+        $list = $this->model->field('id,backup_key')->where([ [ 'id', 'in', $ids ] ])->select()->toArray();
+        if (empty($list)) {
+            throw new AdminException('UPGRADE_RECORD_NOT_EXIST');
+        }
+        try {
+            Db::startTrans();
+
+            foreach ($list as $k => $v) {
+                // 删除备份文件
+                $upgrade_dir = project_path() . 'upgrade' . DIRECTORY_SEPARATOR . $v[ 'backup_key' ] . DIRECTORY_SEPARATOR;
+                if (is_dir($upgrade_dir)) {
+                    del_target_dir($upgrade_dir, true);
+                }
+            }
+
+            $this->model->where([ [ 'id', 'in', $ids ] ])->delete();
+            Db::commit();
+            return true;
+        } catch (\Exception $e) {
+            Db::rollback();
+            throw new CommonException($e->getMessage());
+        }
+    }
+
+    /**
+     * 恢复前检测文件是否存在
+     * @param $id
+     * @return void
+     */
+    public function checkDirExist($id)
+    {
+        $field = 'id, version, backup_key';
+        $info = $this->model->where([
+            [ 'id', '=', $id ],
+            [ 'status', '=', BackupDict::STATUS_COMPLETE ]
+        ])->field($field)->append([ 'backup_dir', 'backup_code_dir', 'backup_sql_dir' ])->findOrEmpty()->toArray();
+
+        if (empty($info)) {
+            throw new AdminException('UPGRADE_RECORD_NOT_EXIST');
+        }
+
+        // 检测源码目录是否存在
+        if (!is_dir($info[ 'backup_code_dir' ])) {
+            throw new AdminException('UPGRADE_BACKUP_CODE_NOT_FOUND');
+        }
+
+        // 检测数据库目录是否存在
+        if (!is_dir($info[ 'backup_sql_dir' ])) {
+            throw new AdminException('UPGRADE_BACKUP_SQL_NOT_FOUND');
+        }
+    }
+
+    /**
+     * 检测目录权限
+     * @return void
+     */
+    public function checkPermission()
+    {
+        $niucloud_dir = $this->root_path . 'niucloud' . DIRECTORY_SEPARATOR;
+        $admin_dir = $this->root_path . 'admin' . DIRECTORY_SEPARATOR;
+        $web_dir = $this->root_path . 'web' . DIRECTORY_SEPARATOR;
+        $wap_dir = $this->root_path . 'uni-app' . DIRECTORY_SEPARATOR;
+
+        if (!is_dir($admin_dir)) throw new CommonException('ADMIN_DIR_NOT_EXIST');
+        if (!is_dir($web_dir)) throw new CommonException('WEB_DIR_NOT_EXIST');
+        if (!is_dir($wap_dir)) throw new CommonException('UNIAPP_DIR_NOT_EXIST');
+
+        $data = [
+            // 目录检测
+            'dir' => [
+                // 要求可读权限
+                'is_readable' => [],
+                // 要求可写权限
+                'is_write' => []
+            ]
+        ];
+
+        $data[ 'dir' ][ 'is_readable' ][] = [ 'dir' => str_replace(project_path(), '', $niucloud_dir), 'status' => is_readable($niucloud_dir) ];
+        $data[ 'dir' ][ 'is_readable' ][] = [ 'dir' => str_replace(project_path(), '', $admin_dir), 'status' => is_readable($admin_dir) ];
+        $data[ 'dir' ][ 'is_readable' ][] = [ 'dir' => str_replace(project_path(), '', $web_dir), 'status' => is_readable($web_dir) ];
+        $data[ 'dir' ][ 'is_readable' ][] = [ 'dir' => str_replace(project_path(), '', $wap_dir), 'status' => is_readable($wap_dir) ];
+
+        $data[ 'dir' ][ 'is_write' ][] = [ 'dir' => str_replace(project_path(), '', $niucloud_dir), 'status' => is_write($niucloud_dir) ];
+        $data[ 'dir' ][ 'is_write' ][] = [ 'dir' => str_replace(project_path(), '', $admin_dir), 'status' => is_write($admin_dir) ];
+        $data[ 'dir' ][ 'is_write' ][] = [ 'dir' => str_replace(project_path(), '', $web_dir), 'status' => is_write($web_dir) ];
+        $data[ 'dir' ][ 'is_write' ][] = [ 'dir' => str_replace(project_path(), '', $wap_dir), 'status' => is_write($wap_dir) ];
+
+        // 检测全部目录及文件是否可读可写，忽略指定目录
+
+        // 忽略指定目录，admin
+        $exclude_admin_dir = [ 'dist', 'node_modules' ];
+        $check_res = checkDirPermissions(project_path() . 'admin', [], $exclude_admin_dir);
+
+        // 忽略指定目录，uni-app
+        $exclude_uniapp_dir = [ 'dist', 'node_modules' ];
+        $check_res = array_merge2($check_res, checkDirPermissions(project_path() . 'uni-app', [], $exclude_uniapp_dir));
+
+        // 忽略指定目录，web
+        $exclude_web_dir = [ '.nuxt', '.output', 'dist', 'node_modules' ];
+        $check_res = array_merge2($check_res, checkDirPermissions(project_path() . 'web', [], $exclude_web_dir));
+
+        // 忽略指定目录，niucloud
+        $exclude_niucloud_dir = [
+            'public' . DIRECTORY_SEPARATOR . 'admin',
+            'public' . DIRECTORY_SEPARATOR . 'wap',
+            'public' . DIRECTORY_SEPARATOR . 'web',
+            'public' . DIRECTORY_SEPARATOR . 'upload',
+            'public' . DIRECTORY_SEPARATOR . 'file',
+            'runtime',
+            'vendor'
+        ];
+        $check_res = array_merge2($check_res, checkDirPermissions(project_path() . 'niucloud', [], $exclude_niucloud_dir));
+
+        if (!empty($check_res[ 'unreadable' ])) {
+            foreach ($check_res[ 'unreadable' ] as $item) {
+                $data[ 'dir' ][ 'is_readable' ][] = [ 'dir' => str_replace(project_path(), '', $item), 'status' => false ];
+            }
+        }
+        if (!empty($check_res[ 'not_writable' ])) {
+            foreach ($check_res[ 'not_writable' ] as $item) {
+                $data[ 'dir' ][ 'is_write' ][] = [ 'dir' => str_replace(project_path(), '', $item), 'status' => false ];
+            }
+        }
+
+        $check_res = array_merge(
+            array_column($data[ 'dir' ][ 'is_readable' ], 'status'),
+            array_column($data[ 'dir' ][ 'is_write' ], 'status')
+        );
+
+        // 是否通过校验
+        $data[ 'is_pass' ] = !in_array(false, $check_res);
+
+        return $data;
+    }
+
+    /**
+     * 备份恢复
+     * @param $data
+     * @return array
+     */
+    public function restore($data)
+    {
+
+        $field = 'id, version, backup_key';
+        $info = $this->model->where([
+            [ 'id', '=', $data[ 'id' ] ],
+            [ 'status', '=', BackupDict::STATUS_COMPLETE ]
+        ])->field($field)->append([ 'backup_dir', 'backup_code_dir', 'backup_sql_dir' ])->findOrEmpty()->toArray();
+
+        if (empty($info)) {
+            throw new AdminException('UPGRADE_RECORD_NOT_EXIST');
+        }
+
+        // 恢复源码备份
+        if (!is_dir($info[ 'backup_code_dir' ])) {
+            throw new AdminException('UPGRADE_BACKUP_CODE_NOT_FOUND');
+        }
+
+        // 恢复数据库备份
+        if (!is_dir($info[ 'backup_sql_dir' ])) {
+            throw new AdminException('UPGRADE_BACKUP_SQL_NOT_FOUND');
+        }
+
+        $res = [ 'code' => 1, 'data' => [], 'msg' => '' ];
+        $cache_data = Cache::get($this->cache_restore_key);
+        if (!empty($cache_data) && !empty($cache_data[ 'key' ])) {
+            $key = $cache_data[ 'key' ];
+        } else {
+            $key = uniqid();
+        }
+
+        try {
+            if ($data[ 'task' ] == '') {
+
+                $key = uniqid();
+
+                $res[ 'data' ] = [
+                    'content' => '开始恢复备份',
+                    'task' => 'backupCode'
+                ];
+
+                $temp = [
+                    'key' => $key,
+                    'data' => [ $res[ 'data' ] ]
+                ];
+
+                Cache::set($this->cache_key, null);
+
+                Cache::set($this->cache_restore_key, $temp);
+
+                // 添加恢复日志
+                $this->add([
+                    'backup_key' => $key,
+                    'content' => "自动备份",
+                    'version' => $info[ 'version' ]
+                ]);
+
+            } elseif ($data[ 'task' ] == 'backupCode') {
+                $res[ 'data' ] = [
+                    'content' => '备份源码',
+                    'task' => 'backupSql'
+                ];
+
+                $temp = Cache::get($this->cache_restore_key);
+                $temp[ 'data' ][] = $res[ 'data' ];
+                Cache::set($this->cache_restore_key, $temp);
+
+                //备份源码
+                $this->backupCode($key);
+
+            } elseif ($data[ 'task' ] == 'backupSql') {
+                $backup_result = $this->backupSql($key);
+                if ($backup_result === true) {
+                    //备份数据库
+                    $res[ 'data' ] = [
+                        'content' => '数据库备份完成',
+                        'task' => 'restoreCode'
+                    ];
+                } else {
+                    $res[ 'data' ] = [
+                        'content' => '',
+                        'task' => 'backupSql'
+                    ];
+                    if ($backup_result % 5 == 0) {
+                        $res[ 'data' ][ 'content' ] = $backup_result == 0 ? '数据库开始备份' : '数据库备份中已备份' . $backup_result . '%';
+                    }
+                }
+
+                $temp = Cache::get($this->cache_restore_key);
+                $temp[ 'data' ][] = $res[ 'data' ];
+                Cache::set($this->cache_restore_key, $temp);
+            } elseif ($data[ 'task' ] == 'restoreCode') {
+
+                $res[ 'data' ] = [
+                    'content' => '恢复源码备份',
+                    'task' => 'restoreSql'
+                ];
+
+                $temp = Cache::get($this->cache_restore_key);
+                $temp[ 'data' ][] = $res[ 'data' ];
+                Cache::set($this->cache_restore_key, $temp);
+
+                // 恢复源码备份
+                $root_path = dirname(root_path()) . DIRECTORY_SEPARATOR;
+                dir_copy($info[ 'backup_code_dir' ], rtrim($root_path, DIRECTORY_SEPARATOR));
+
+            } elseif ($data[ 'task' ] == 'restoreSql') {
+                // 恢复数据库备份
+                $db = new DbBackup($info[ 'backup_sql_dir' ]);
+                $restore_result = $db->restoreDatabase();
+
+                if ($restore_result === true) {
+                    $res[ 'data' ] = [
+                        'content' => '恢复数据库备份',
+                        'task' => 'restoreData'
+                    ];
+                } else {
+                    $res[ 'data' ] = [
+                        'content' => '',
+                        'task' => 'restoreSql'
+                    ];
+                }
+
+                $temp = Cache::get($this->cache_restore_key);
+                $temp[ 'data' ][] = $res[ 'data' ];
+                Cache::set($this->cache_restore_key, $temp);
+            } elseif ($data[ 'task' ] == 'restoreData') {
+
+                $res[ 'data' ] = [
+                    'content' => '恢复数据',
+                    'task' => 'restoreComplete'
+                ];
+
+                $temp = Cache::get($this->cache_restore_key);
+                $temp[ 'data' ][] = $res[ 'data' ];
+                Cache::set($this->cache_restore_key, $temp);
+                // todo 恢复数据
+
+            } elseif ($data[ 'task' ] == 'restoreComplete') {
+
+                $res[ 'data' ] = [
+                    'content' => '备份恢复完成',
+                    'task' => 'end'
+                ];
+
+                // 修改备份记录状态
+                $this->edit([
+                    [ 'backup_key', '=', Cache::get($this->cache_restore_key)[ 'key' ] ],
+                ], [
+                    'status' => BackupDict::STATUS_COMPLETE,
+                    'complete_time' => time()
+                ]);
+
+                Cache::set($this->cache_restore_key, null);
+
+                ( new SystemService() )->clearCache(); // 清除缓存
+            }
+            return $res;
+        } catch (\Exception $e) {
+            $res[ 'data' ] = [
+                'content' => '备份恢复失败，稍后请手动恢复，备份文件路径：' . $info[ 'backup_dir' ] . '，失败原因：' . $e->getMessage() . $e->getFile() . $e->getLine(),
+                'task' => 'fail'
+            ];
+
+            $fail_reason = [
+                'Message' => '失败原因：' . $e->getMessage(),
+                'File' => '文件：' . $e->getFile(),
+                'Line' => '代码行号：' . $e->getLine(),
+                'Trace' => $e->getTrace()
+            ];
+
+            // 修改备份记录状态
+            $this->edit([
+                [ 'backup_key', '=', Cache::get($this->cache_restore_key)[ 'key' ] ],
+            ], [
+                'fail_reason' => $fail_reason,
+                'status' => BackupDict::STATUS_FAIL,
+                'complete_time' => time()
+            ]);
+            Cache::set($this->cache_restore_key, null);
+
+            return $res;
+        }
+    }
+
+    /**
+     * 手动备份
+     * @param $data
+     * @return array
+     */
+    public function manualBackup($data)
+    {
+        $res = [ 'code' => 1, 'data' => [], 'msg' => '' ];
+        $key = uniqid();
+        $cache_data = Cache::get($this->cache_key);
+        if ($cache_data) {
+            $key = $cache_data[ 'key' ];
+        }
+        try {
+            if ($data[ 'task' ] == '') {
+
+                $key = uniqid();
+
+                $res[ 'data' ] = [
+                    'content' => '开始备份',
+                    'task' => 'backupCode'
+                ];
+
+                $temp = [
+                    'key' => $key,
+                    'data' => [ $res[ 'data' ] ]
+                ];
+
+                Cache::set($this->cache_key, null);
+
+                Cache::set($this->cache_key, $temp);
+                // 添加备份日志
+                $this->add([
+                    'backup_key' => $key,
+                    'content' => "手动备份",
+                    'version' => "v" . config('version.version'),
+                ]);
+
+            } elseif ($data[ 'task' ] == 'backupCode') {
+
+                $res[ 'data' ] = [
+                    'content' => '备份源码',
+                    'task' => 'backupSql'
+                ];
+                $temp = Cache::get($this->cache_key);
+                $temp[ 'data' ][] = $res[ 'data' ];
+                Cache::set($this->cache_key, $temp);
+
+                //备份源码
+                $this->backupCode($key);
+
+            } elseif ($data[ 'task' ] == 'backupSql') {
+                $backup_result = $this->backupSql($key);
+                if ($backup_result === true || $backup_result == 100) {
+                    //备份数据库
+                    $res[ 'data' ] = [
+                        'content' => '数据库备份完成',
+                        'task' => 'backComplete'
+                    ];
+                } else {
+                    $res[ 'data' ] = [
+                        'content' => $backup_result == 0 ? '数据库开始备份' : '数据库备份已备份' . $backup_result . '%',
+                        'task' => 'backupSql'
+                    ];
+                }
+
+                $temp = Cache::get($this->cache_restore_key);
+                $temp[ 'data' ][] = $res[ 'data' ];
+                Cache::set($this->cache_restore_key, $temp);
+            } elseif ($data[ 'task' ] == 'backComplete') {
+
+                $res[ 'data' ] = [
+                    'content' => '备份完成',
+                    'task' => 'end'
+                ];
+
+                // 修改备份记录状态
+                $this->complete(Cache::get($this->cache_key)[ 'key' ]);
+
+                Cache::set($this->cache_key, null);
+            }
+            return $res;
+        } catch (\Exception $e) {
+
+            $res[ 'data' ] = [
+                'content' => '备份失败，稍后请重新手动备份，失败原因：' . $e->getMessage() . $e->getFile() . $e->getLine(),
+                'task' => 'fail'
+            ];
+
+            // 修改备份记录状态
+            $this->failed(Cache::get($this->cache_key)[ 'key' ]);
+
+            Cache::set($this->cache_key, null);
+            return $res;
+        }
+    }
+
+    /**
+     * 获取正在进行的恢复任务
+     * @return mixed|null
+     */
+    public function getRestoreTask()
+    {
+        $task_data = Cache::get($this->cache_restore_key) ?? [];
+        return $task_data;
+    }
+
+    /**
+     * 获取正在进行的备份任务
+     * @return mixed|null
+     */
+    public function getBackupTask()
+    {
+        $task_data = Cache::get($this->cache_key) ?? [];
+        return $task_data;
+    }
+
+    /**
+     * 获取备份记录信息
+     * @param array $condition
+     * @param $field
+     * @return array
+     */
+    public function getInfo(array $condition, $field = 'id, version, backup_key, content, status, fail_reason, create_time, complete_time')
+    {
+        return $this->model->field($field)->where($condition)->findOrEmpty()->toArray();
+    }
+
+    /**
+     * 备份记录列表
+     * @param $condition
+     * @return array
+     * @throws \think\db\exception\DataNotFoundException
+     * @throws \think\db\exception\DbException
+     * @throws \think\db\exception\ModelNotFoundException
+     */
+    public function getList($condition = [], $field = 'id, version, backup_key, content, status, fail_reason, create_time, complete_time')
+    {
+        $order = "id desc";
+        return $this->model->where($condition)->field($field)->order($order)->select()->toArray();
+    }
+
+    /**
+     * 备份记录分页列表
+     * @param array $where
+     * @return array
+     */
+    public function getPage(array $where = [])
+    {
+        $field = 'id, version, backup_key, content, remark, complete_time';
+        $order = "id desc";
+        $search_model = $this->model->where([
+            [ 'status', '=', BackupDict::STATUS_COMPLETE ],
+            [ 'content|version', 'like', '%' . $where[ 'content' ] . '%' ]
+        ])->append([ 'backup_dir' ])->field($field)->order($order);
+        return $this->pageQuery($search_model);
+    }
+
+    /**
+     * 备份代码
+     * @param $backup_key
+     * @return void
+     */
+    public function backupCode($backup_key)
+    {
+        $backup_dir = $this->upgrade_dir . $backup_key . DIRECTORY_SEPARATOR . 'backup' . DIRECTORY_SEPARATOR . 'code' . DIRECTORY_SEPARATOR;
+
+        // 创建目录
+        dir_mkdir($backup_dir);
+
+        // 备份admin
+        dir_copy($this->root_path . 'admin', $backup_dir . 'admin', exclude_dirs: [ '.vscode', 'node_modules', 'dist' ]);
+
+        // 备份uni-app
+        dir_copy($this->root_path . 'uni-app', $backup_dir . 'uni-app', exclude_dirs: [ 'node_modules', 'dist' ]);
+
+        // 备份web
+        dir_copy($this->root_path . 'web', $backup_dir . 'web', exclude_dirs: [ 'node_modules', '.nuxt', '.output', 'dist' ]);
+
+        // 备份niucloud全部代码
+        $niucloud_dir = $backup_dir . 'niucloud' . DIRECTORY_SEPARATOR;
+
+        dir_copy($this->root_path . 'niucloud', $niucloud_dir, exclude_dirs: [ 'runtime', 'upload' ]);
+        return true;
+    }
+
+    /**
+     * 备份数据库
+     * @param $backup_key
+     * @return void
+     */
+    public function backupSql($backup_key)
+    {
+        $backup_dir = $this->upgrade_dir . $backup_key . DIRECTORY_SEPARATOR . 'backup' . DIRECTORY_SEPARATOR . 'sql' . DIRECTORY_SEPARATOR;
+        // 创建目录
+        dir_mkdir($backup_dir);
+
+        $prefix = config('database.connections.' . config('database.default'))[ 'prefix' ];
+
+        // 不需要备份的表
+        $not_need_backup = [
+            "{$prefix}sys_schedule_log",
+            "{$prefix}sys_user_log",
+            "{$prefix}jobs",
+            "{$prefix}jobs_failed",
+            "{$prefix}sys_upgrade_records",
+            "{$prefix}sys_backup_records"
+        ];
+
+        $db = new DbBackup($backup_dir, 1024 * 1024 * 2, $not_need_backup, key: $backup_key);
+
+        $result = $db->backupDatabaseSegment();
+        if ($result === true) return true;
+
+        return $db->getBackupProgress();
+    }
+
+}

niucloud/app/service/admin/upgrade/BackupService.php

@@ -11,10 +11,6 @@
 
 namespace app\service\admin\upgrade;
 
-use app\dict\addon\AddonDict;
-use app\service\admin\generator\GenerateService;
-use core\util\DbBackup;
-
 /**
  * 框架及插件升级备份
  * @package app\service\core\upgrade
@@ -31,92 +27,21 @@ class BackupService extends UpgradeService
 
         // 创建目录
         dir_mkdir($backup_dir);
+
         // 备份admin
         dir_copy($this->root_path . 'admin', $backup_dir . 'admin', exclude_dirs: [ '.vscode', 'node_modules', 'dist' ]);
+
         // 备份uni-app
         dir_copy($this->root_path . 'uni-app', $backup_dir . 'uni-app', exclude_dirs: [ 'node_modules', 'dist' ]);
+
         // 备份web
-        dir_copy($this->root_path . 'web', $backup_dir . 'web', exclude_dirs:[ 'node_modules', '.nuxt', '.output' ]);
+        dir_copy($this->root_path . 'web', $backup_dir . 'web', exclude_dirs: [ 'node_modules', '.nuxt', '.output', 'dist' ]);
 
-        // 备份niucloud
+        // 备份niucloud全部代码
         $niucloud_dir = $backup_dir . 'niucloud' . DIRECTORY_SEPARATOR;
-        if ($this->upgrade_task[ 'upgrade' ][ 'app_key' ] == AddonDict::FRAMEWORK_KEY) {
-            dir_copy($this->root_path . 'niucloud', $niucloud_dir, exclude_dirs:[ 'addon', 'config', 'public', 'vendor', 'runtime' ]);
-            // 备份版本文件
-            $version_file = $this->root_path . 'niucloud' . DIRECTORY_SEPARATOR . 'config' . DIRECTORY_SEPARATOR . 'version.php';
-            $to_version_file = $niucloud_dir . 'config' . DIRECTORY_SEPARATOR . 'version.php';
-            file_copy($version_file, $to_version_file);
-        } else {
-            $addon = $this->upgrade_task[ 'upgrade' ][ 'app_key' ];
-            $addon_dir = $this->root_path . 'niucloud' . DIRECTORY_SEPARATOR . 'addon' . DIRECTORY_SEPARATOR . $addon;
-            $to_addon_dir = $niucloud_dir . 'addon' . DIRECTORY_SEPARATOR . $addon;
-            dir_copy($addon_dir, $to_addon_dir);
-        }
-        // 备份前端文件
-        if (is_dir(public_path() . 'admin')) {
-            dir_copy(public_path() . 'admin', $niucloud_dir . 'public' . DIRECTORY_SEPARATOR . 'admin');
-        }
-        if (is_dir(public_path() . 'wap')) {
-            dir_copy(public_path() . 'wap', $niucloud_dir . 'public' . DIRECTORY_SEPARATOR . 'wap');
-        }
-        if (is_dir(public_path() . 'web')) {
-            dir_copy(public_path() . 'web', $niucloud_dir . 'public' . DIRECTORY_SEPARATOR . 'web');
-        }
+
+        dir_copy($this->root_path . 'niucloud', $niucloud_dir, exclude_dirs: [ 'runtime', 'upload' ]);
 
         return true;
     }
-
-    /**
-     * 备份数据库
-     * @return void
-     */
-    public function backupSql()
-    {
-        $backup_dir = $this->upgrade_dir . $this->upgrade_task[ 'key' ] . DIRECTORY_SEPARATOR . 'backup' . DIRECTORY_SEPARATOR . 'sql' . DIRECTORY_SEPARATOR;
-        // 创建目录
-        dir_mkdir($backup_dir);
-
-        $db = new DbBackup([
-            'path' => $backup_dir,//数据库备份路径
-            'part' => 1048576,//数据库备份卷大小
-            'compress' => 0,//数据库备份文件是否启用压缩 0不压缩 1 压缩
-            'level' => 9 //数据库备份文件压缩级别 1普通 4 一般  9最高
-        ]);
-
-        $tables = [];
-        $prefix = config('database.connections.' . config('database.default'))[ 'prefix' ];
-        if ($this->upgrade_task[ 'upgrade' ][ 'app_key' ] == AddonDict::FRAMEWORK_KEY) {
-            // 不需要备份的表
-            $noot_need_backup = [ "{$prefix}sys_schedule_log", "{$prefix}sys_user_log", "{$prefix}jobs", "{$prefix}jobs_failed" ];
-            $sys_models = ( new GenerateService() )->getModels([ 'addon' => 'system' ]);
-            foreach ($sys_models as $model) {
-                $name = "\\$model";
-                $class = new $name();
-
-                if (!in_array($class->getTable(), $noot_need_backup)) {
-                    $tables[] = $class->getTable();
-                }
-            }
-        } else {
-            $addon_models = ( new GenerateService() )->getModels([ 'addon' => $this->upgrade_task[ 'upgrade' ][ 'app_key' ] ]);
-            foreach ($addon_models as $model) {
-                try {
-                    // 不需要备份的表
-                    $noot_need_backup = [ "{$prefix}shop_stat", "{$prefix}shop_goods_stat", "{$prefix}shop_goods_browse" ];
-                    $name = "\\$model";
-                    $class = new $name();
-
-                    if (!in_array($class->getTable(), $noot_need_backup)) {
-                        $tables[] = $class->getTable();
-                    }
-                } catch (\Exception $e) {
-                }
-            }
-        }
-
-        foreach ($tables as $table) {
-            $db->setFile()->backup($table);
-        }
-        return true;
-    }
 }

niucloud/app/service/admin/upgrade/RestoreService.php

@@ -11,50 +11,10 @@
 
 namespace app\service\admin\upgrade;
 
-
-use core\util\DbBackup;
-
 /**
  * 框架及插件升级恢复备份
  * @package app\service\core\upgrade
  */
 class RestoreService extends UpgradeService
 {
-    /**
-     * 恢复代码备份
-     * @return true
-     */
-    public function restoreCode() {
-        $backup_dir = $this->upgrade_dir .$this->upgrade_task['key'] . DIRECTORY_SEPARATOR . 'backup' . DIRECTORY_SEPARATOR . 'code' . DIRECTORY_SEPARATOR;
-        if (is_dir($backup_dir)) {
-            // 删除前端文件
-//            if (is_dir(public_path() . 'admin')) del_target_dir(public_path() . 'admin', true);
-//            if (is_dir(public_path() . 'wap')) del_target_dir(public_path() . 'wap', true);
-//            if (is_dir(public_path() . 'web')) del_target_dir(public_path() . 'web', true);
-
-            dir_copy($backup_dir, rtrim($this->root_path, DIRECTORY_SEPARATOR));
-        }
-        return true;
-    }
-
-    /**
-     * 恢复数据库备份
-     * @return true
-     */
-    public function restoreSql() {
-        $backup_dir = $this->upgrade_dir .$this->upgrade_task['key'] . DIRECTORY_SEPARATOR . 'backup' . DIRECTORY_SEPARATOR . 'sql' . DIRECTORY_SEPARATOR;
-        if (is_dir($backup_dir)) {
-            $db = new DbBackup([
-                'path'     => $backup_dir //数据库备份路径
-            ]);
-            $file_list = $db->fileList();
-            if (!empty($file_list)) {
-                $db->setSqlMode();
-                foreach ($file_list as $file) {
-                    $db->setFile($file)->import(0, $file['time']);
-                }
-            }
-        }
-        return true;
-    }
 }

niucloud/app/service/admin/upgrade/UpgradeRecordsService.php

@@ -0,0 +1,128 @@
+<?php
+// +----------------------------------------------------------------------
+// | Niucloud-admin 企业快速开发的多应用管理平台
+// +----------------------------------------------------------------------
+// | 官方网址：https://www.niucloud.com
+// +----------------------------------------------------------------------
+// | niucloud团队 版权所有 开源版本可自由商用
+// +----------------------------------------------------------------------
+// | Author: Niucloud Team
+// +----------------------------------------------------------------------
+
+namespace app\service\admin\upgrade;
+
+use app\dict\sys\UpgradeDict;
+use app\model\sys\SysUpgradeRecords;
+use core\base\BaseAdminService;
+use think\facade\Log;
+
+/**
+ * 升级记录表服务层
+ */
+class UpgradeRecordsService extends BaseAdminService
+{
+
+    public function __construct()
+    {
+        parent::__construct();
+        $this->model = new SysUpgradeRecords();
+    }
+
+    /**
+     * 添加升级记录
+     * @param array $data
+     * @return mixed
+     */
+    public function add(array $data)
+    {
+        $data[ 'create_time' ] = time();
+        $res = $this->model->create($data);
+
+        // 关联备份记录
+        $is_need_backup = $data['is_need_backup'] ?? true;
+        if ($is_need_backup) {
+            ( new BackupRecordsService() )->add([
+                'version' => $data[ 'current_version' ],
+                'backup_key' => $data[ 'upgrade_key' ],
+                'content' => '自动备份'
+            ]);
+        }
+        return $res->id;
+    }
+
+    /**
+     * 编辑升级记录
+     * @param array $condition
+     * @param array $data
+     * @return true
+     */
+    public function edit($condition, array $data)
+    {
+        $this->model->where($condition)->update($data);
+        return true;
+    }
+
+    /**
+     * 执行完成，更新升级记录状态，备份记录状态
+     * @param $upgrade_key
+     * @return void
+     */
+    public function complete($upgrade_key)
+    {
+        // 记录升级日志
+        $this->edit([
+            [ 'upgrade_key', '=', $upgrade_key ]
+        ], [
+            'status' => UpgradeDict::STATUS_COMPLETE,
+            'complete_time' => time()
+        ]);
+        ( new BackupRecordsService() )->complete($upgrade_key);
+    }
+
+    /**
+     * 执行失败，更新升级记录状态，备份记录状态
+     * @param $fail_reason
+     * @return void
+     */
+    public function failed($upgrade_key, $fail_reason = [])
+    {
+        $this->model->where([ [ 'upgrade_key', '=', $upgrade_key ] ])->update(['status' => UpgradeDict::STATUS_FAIL, 'fail_reason' => $fail_reason ]);
+        ( new BackupRecordsService() )->failed($upgrade_key);
+    }
+
+    /**
+     * 获取升级记录信息
+     * @param array $condition
+     * @param $field
+     * @return array
+     */
+    public function getInfo(array $condition, $field = 'id, upgrade_key, app_key, name, content, prev_version, current_version, status, fail_reason, create_time, complete_time')
+    {
+        return $this->model->field($field)->where($condition)->findOrEmpty()->toArray();
+    }
+
+    /**
+     * 升级记录分页列表
+     * @param array $where
+     * @return array
+     */
+    public function getPage(array $where = [])
+    {
+        $field = 'id, upgrade_key, app_key, name, content, prev_version, current_version, complete_time, create_time, status, fail_reason';
+        $order = "id desc";
+        $search_model = $this->model->where([
+//            [ 'status', '=', UpgradeDict::STATUS_COMPLETE ],
+            [ 'name|content|current_version', 'like', '%' . $where[ 'name' ] . '%' ]
+        ])->field($field)->order($order)->append(['status_name']);
+        return $this->pageQuery($search_model);
+    }
+
+    /**
+     * 刪除升级记录
+     * @param $ids
+     * @return void
+     */
+    public function del($ids) {
+        $this->model->where([['id', 'in', $ids]])->delete();
+    }
+}

niucloud/app/service/admin/upgrade/UpgradeService.php

@@ -12,7 +12,10 @@
 namespace app\service\admin\upgrade;
 
 use app\dict\addon\AddonDict;
+use app\dict\sys\BackupDict;
+use app\dict\sys\UpgradeDict;
 use app\model\addon\Addon;
+use app\model\sys\SysBackupRecords;
 use app\service\admin\install\InstallSystemService;
 use app\service\admin\sys\ConfigService;
 use app\service\core\addon\CoreAddonCloudService;
@@ -22,13 +25,17 @@ use app\service\core\addon\CoreDependService;
 use app\service\core\addon\WapTrait;
 use app\service\core\channel\CoreH5Service;
 use app\service\core\menu\CoreMenuService;
+use app\service\core\niucloud\CoreCloudBuildService;
 use app\service\core\niucloud\CoreModuleService;
 use app\service\core\schedule\CoreScheduleInstallService;
 use core\base\BaseAdminService;
+use core\exception\CloudBuildException;
 use core\exception\CommonException;
+use core\util\DbBackup;
 use core\util\niucloud\BaseNiucloudClient;
 use think\facade\Cache;
 use think\facade\Db;
+use think\facade\Log;
 
 /**
  * 框架及插件升级
@@ -51,13 +58,15 @@ class UpgradeService extends BaseAdminService
 
     private $steps = [
         'requestUpgrade' => [ 'step' => 'requestUpgrade', 'title' => '请求升级' ],
-        'downloadFile' => ['step' => 'downloadFile', 'title' => '下载更新文件'],
+        'downloadFile' => [ 'step' => 'downloadFile', 'title' => '' ],
         'backupCode' => [ 'step' => 'backupCode', 'title' => '备份源码' ],
-        'backupSql' => ['step' => 'backupSql', 'title' => '备份数据库'],
+        'backupSql' => [ 'step' => 'backupSql', 'title' => '' ],
         'coverCode' => [ 'step' => 'coverCode', 'title' => '合并更新文件' ],
         'handleUniapp' => [ 'step' => 'handleUniapp', 'title' => '处理uniapp' ],
         'refreshMenu' => [ 'step' => 'refreshMenu', 'title' => '刷新菜单' ],
         'installSchedule' => [ 'step' => 'installSchedule', 'title' => '安装计划任务' ],
+        'cloudBuild' => [ 'step' => 'cloudBuild', 'title' => '开始云编译' ],
+        'gteCloudBuildLog' => [ 'step' => 'gteCloudBuildLog', 'title' => '' ],
         'upgradeComplete' => [ 'step' => 'upgradeComplete', 'title' => '升级完成' ]
     ];
 
@@ -68,6 +77,10 @@ class UpgradeService extends BaseAdminService
         $this->root_path = dirname(root_path()) . DIRECTORY_SEPARATOR;
         $this->upgrade_dir = $this->root_path . 'upgrade' . DIRECTORY_SEPARATOR;
         $this->upgrade_task = Cache::get($this->cache_key);
+
+        if (!empty($this->upgrade_task) && !isset($this->upgrade_task[ 'upgrade_apps' ])) {
+            $this->upgrade_task[ 'upgrade_apps' ] = [ AddonDict::FRAMEWORK_KEY ];
+        }
     }
 
     /**
@@ -75,7 +88,8 @@ class UpgradeService extends BaseAdminService
      * @param string $addon
      * @return void
      */
-    public function upgradePreCheck(string $addon = '') {
+    public function upgradePreCheck(string $addon = '')
+    {
         $niucloud_dir = $this->root_path . 'niucloud' . DIRECTORY_SEPARATOR;
         $admin_dir = $this->root_path . 'admin' . DIRECTORY_SEPARATOR;
         $web_dir = $this->root_path . 'web' . DIRECTORY_SEPARATOR;
@@ -105,10 +119,32 @@ class UpgradeService extends BaseAdminService
         $data[ 'dir' ][ 'is_write' ][] = [ 'dir' => str_replace(project_path(), '', $web_dir), 'status' => is_write($web_dir) ];
         $data[ 'dir' ][ 'is_write' ][] = [ 'dir' => str_replace(project_path(), '', $wap_dir), 'status' => is_write($wap_dir) ];
 
-        // 校验niucloud/public下 wap web admin 目录及文件是否可读可写
-        $check_res = checkDirPermissions(public_path() . 'wap');
-        $check_res = array_merge2($check_res, checkDirPermissions(public_path() . 'admin'));
-        $check_res = array_merge2($check_res, checkDirPermissions(public_path() . 'web'));
+        // 检测全部目录及文件是否可读可写，忽略指定目录
+
+        // 忽略指定目录，admin
+        $exclude_admin_dir = [ 'dist', 'node_modules' ];
+        $check_res = checkDirPermissions(project_path() . 'admin', [], $exclude_admin_dir);
+
+        // 忽略指定目录，uni-app
+        $exclude_uniapp_dir = [ 'dist', 'node_modules' ];
+        $check_res = array_merge2($check_res, checkDirPermissions(project_path() . 'uni-app', [], $exclude_uniapp_dir));
+
+        // 忽略指定目录，web
+        $exclude_web_dir = [ '.nuxt', '.output', 'dist', 'node_modules' ];
+        $check_res = array_merge2($check_res, checkDirPermissions(project_path() . 'web', [], $exclude_web_dir));
+
+        // 忽略指定目录，niucloud
+        $exclude_niucloud_dir = [
+            'public' . DIRECTORY_SEPARATOR . 'admin',
+            'public' . DIRECTORY_SEPARATOR . 'wap',
+            'public' . DIRECTORY_SEPARATOR . 'web',
+            'public' . DIRECTORY_SEPARATOR . 'upload',
+            'public' . DIRECTORY_SEPARATOR . 'file',
+            'runtime',
+            'vendor',
+            '.user.ini'
+        ];
+        $check_res = array_merge2($check_res, checkDirPermissions(project_path() . 'niucloud', [], $exclude_niucloud_dir));
 
         if (!empty($check_res[ 'unreadable' ])) {
             foreach ($check_res[ 'unreadable' ] as $item) {
@@ -128,6 +164,7 @@ class UpgradeService extends BaseAdminService
 
         // 是否通过校验
         $data[ 'is_pass' ] = !in_array(false, $check_res);
+
         return $data;
     }
 
@@ -136,27 +173,36 @@ class UpgradeService extends BaseAdminService
      * @param $addon
      * @return array
      */
-    public function upgrade(string $addon = '') {
+    public function upgrade(string $addon = '', $data = [])
+    {
         if ($this->upgrade_task) throw new CommonException('UPGRADE_TASK_EXIST');
 
         $upgrade_content = $this->getUpgradeContent($addon);
+        if (empty($upgrade_content[ 'content' ])) throw new CommonException("NOT_EXIST_UPGRADE_CONTENT");
 
         $upgrade = [
             'product_key' => BaseNiucloudClient::PRODUCT,
             'framework_version' => config('version.version')
         ];
+
+        $upgrade[ 'app_key' ] = $upgrade_content[ 'content' ][ 0 ][ 'app' ][ 'app_key' ];
+        $upgrade[ 'version' ] = $upgrade_content[ 'content' ][ 0 ][ 'version' ];
+
         if (!$addon) {
-            $upgrade['app_key'] = AddonDict::FRAMEWORK_KEY;
+            $upgrade_title = '框架';
+//            $upgrade[ 'app_key' ] = AddonDict::FRAMEWORK_KEY;
             $upgrade[ 'version' ] = config('version.version');
         } else {
-            $upgrade['app_key'] = $addon;
-            $upgrade['version'] = (new Addon())->where([ ['key', '=', $addon] ])->value('version');
-
-            // 判断框架版本是否低于插件支持版本
-            $last_version = $upgrade_content['version_list'][ count($upgrade_content['version_list']) - 1];
-            if (str_replace('.', '', config('version.version')) < str_replace('.', '', $last_version['niucloud_version']['version_no'])) {
-                throw new CommonException('BEFORE_UPGRADING_NEED_UPGRADE_FRAMEWORK');
-            }
+//            $upgrade[ 'app_key' ] = $addon;
+//            $upgrade[ 'version' ] = ( new Addon() )->where([ [ 'key', '=', $addon ] ])->value('version');
+            $upgrade_title = ( new Addon() )->where([ [ 'key', 'in', $addon ] ])->field('title')->select()->toArray();
+            $upgrade_title = implode(',', array_column($upgrade_title, 'title'));
+//
+//            // 判断框架版本是否低于插件支持版本
+//            $last_version = $upgrade_content[ 'version_list' ][ count($upgrade_content[ 'version_list' ]) - 1 ];
+//            if (str_replace('.', '', config('version.version')) < str_replace('.', '', $last_version[ 'niucloud_version' ][ 'version_no' ])) {
+//                throw new CommonException('BEFORE_UPGRADING_NEED_UPGRADE_FRAMEWORK');
+//            }
         }
 
         $response = ( new CoreAddonCloudService() )->upgradeAddon($upgrade);
@@ -170,6 +216,13 @@ class UpgradeService extends BaseAdminService
                 dir_mkdir($upgrade_dir);
             }
 
+            // 是否需要备份
+            $is_need_backup = $data[ 'is_need_backup' ] ?? true;
+            if (!$is_need_backup) {
+                unset($this->steps[ 'backupCode' ]);
+                unset($this->steps[ 'backupSql' ]);
+            }
+
             $upgrade_task = [
                 'key' => $key,
                 'upgrade' => $upgrade,
@@ -177,10 +230,28 @@ class UpgradeService extends BaseAdminService
                 'step' => 'requestUpgrade',
                 'executed' => [ 'requestUpgrade' ],
                 'log' => [ $this->steps[ 'requestUpgrade' ][ 'title' ] ],
-                'params' => ['token' => $response['token'] ],
-                'upgrade_content' => $upgrade_content
+                'params' => [ 'app_key' => $upgrade[ 'app_key' ], 'token' => $response[ 'token' ] ],
+                'upgrade_content' => $upgrade_content,
+                'upgrade_apps' => $upgrade_content[ 'upgrade_apps' ],
+                'is_need_backup' => $is_need_backup
             ];
 
+            foreach ($upgrade_content[ 'content' ] as $k => $v) {
+                unset($upgrade_content[ 'content' ][ $k ][ 'version_list' ]);
+            }
+
+            // 记录升级日志
+            ( new UpgradeRecordsService() )->add([
+                'upgrade_key' => $upgrade_task[ 'key' ],
+                'app_key' => $upgrade[ 'app_key' ],
+                'name' => $upgrade_title,
+                'content' => json_encode($upgrade_content),
+                'prev_version' => "",
+                'current_version' => "",
+                'status' => UpgradeDict::STATUS_READY,
+                'is_need_backup' => $is_need_backup
+            ]);
+
             Cache::set($this->cache_key, $upgrade_task);
             return $upgrade_task;
         } catch (\Exception $e) {
@@ -192,7 +263,8 @@ class UpgradeService extends BaseAdminService
      * 执行升级
      * @return true
      */
-    public function execute() {
+    public function execute()
+    {
         if (!$this->upgrade_task) return true;
 
         $steps = isset($this->upgrade_task[ 'steps' ]) ? array_keys($this->upgrade_task[ 'steps' ]) : array_keys($this->steps);
@@ -211,14 +283,39 @@ class UpgradeService extends BaseAdminService
                     $this->upgrade_task[ 'step' ] = $step;
                     $this->upgrade_task[ 'params' ] = [];
                     $this->upgrade_task[ 'executed' ][] = $step;
+                    if (!empty($this->steps[ $step ][ 'title' ])) {
                         $this->upgrade_task[ 'log' ][] = $this->steps[ $step ][ 'title' ];
                     }
+                }
+                if (!in_array($step, [ 'upgradeComplete', 'restoreComplete' ])) {
                     Cache::set($this->cache_key, $this->upgrade_task);
+                } else {
+                    $this->clearUpgradeTask(2);
+                }
+            } catch (CloudBuildException $e) {
+                if (strpos($e->getMessage(), '队列') !== false) {
+                    throw new CloudBuildException($e->getMessage());
+                }
+                $this->upgrade_task[ 'step' ] = $step;
+                $this->upgrade_task[ 'error' ][] = '升级失败，失败原因：' . $e->getMessage() . $e->getFile() . $e->getLine();
+
+                $fail_reason = [
+                    'Message' => '失败原因：' . $e->getMessage(),
+                    'File' => '文件：' . $e->getFile(),
+                    'Line' => '代码行号：' . $e->getLine(),
+                    'Trace' => $e->getTrace()
+                ];
+                $this->upgradeErrorHandle($fail_reason);
             } catch (\Exception $e) {
                 $this->upgrade_task[ 'step' ] = $step;
                 $this->upgrade_task[ 'error' ][] = '升级失败，失败原因：' . $e->getMessage() . $e->getFile() . $e->getLine();
-                Cache::set($this->cache_key, $this->upgrade_task);
-                $this->upgradeErrorHandle();
+                $fail_reason = [
+                    'Message' => '失败原因：' . $e->getMessage(),
+                    'File' => '文件：' . $e->getFile(),
+                    'Line' => '代码行号：' . $e->getLine(),
+                    'Trace' => $e->getTrace()
+                ];
+                $this->upgradeErrorHandle($fail_reason);
             }
             return true;
         } else {
@@ -234,12 +331,35 @@ class UpgradeService extends BaseAdminService
      * @param $step
      * @return true|null
      */
-    public function downloadFile(string $token, string $dir = '', int $index = -1, $step = 0, $length = 0) {
+    public function downloadFile(string $app_key, string $token, string $dir = '', int $index = -1, $step = 0, $length = 0)
+    {
         if (!$dir) {
-            $dir = $this->upgrade_dir .$this->upgrade_task['key'] . DIRECTORY_SEPARATOR . 'download' . DIRECTORY_SEPARATOR;
+            $dir = $this->upgrade_dir . $this->upgrade_task[ 'key' ] . DIRECTORY_SEPARATOR . 'download' . DIRECTORY_SEPARATOR . $app_key . DIRECTORY_SEPARATOR;
             dir_mkdir($dir);
         }
-        $res = (new CoreAddonCloudService())->downloadUpgradeFile($token, $dir, $index, $step, $length);
+        $res = ( new CoreAddonCloudService() )->downloadUpgradeFile($app_key, $token, $dir, $index, $step, $length);
+
+        if ($res === true) {
+            $index = array_search($app_key, $this->upgrade_task[ 'upgrade_apps' ]);
+            if ($app_key == AddonDict::FRAMEWORK_KEY) {
+                $this->upgrade_task[ 'log' ][] = "下载更新文件";
+            } else {
+                $this->upgrade_task[ 'log' ][] = "下载" . $this->upgrade_task[ 'upgrade_content' ][ 'content' ][ $index ][ 'app' ][ 'app_name' ] . "更新文件";
+            }
+            $index++;
+            if (isset($this->upgrade_task[ 'upgrade_apps' ][ $index ])) {
+                $upgrade = [
+                    'product_key' => BaseNiucloudClient::PRODUCT,
+                    'framework_version' => config('version.version'),
+                    'app_key' => $this->upgrade_task[ 'upgrade_content' ][ 'content' ][ $index ][ 'app' ][ 'app_key' ],
+                    'version' => $this->upgrade_task[ 'upgrade_content' ][ 'content' ][ $index ][ 'version' ]
+                ];
+                $response = ( new CoreAddonCloudService() )->upgradeAddon($upgrade);
+                if (isset($response[ 'code' ]) && $response[ 'code' ] == 0) throw new CommonException($response[ 'msg' ]);
+
+                return [ 'app_key' => $upgrade[ 'app_key' ], 'token' => $response[ 'token' ] ];
+            }
+        }
         return $res;
     }
 
@@ -247,7 +367,8 @@ class UpgradeService extends BaseAdminService
      * 备份源码
      * @return true
      */
-    public function backupCode() {
+    public function backupCode()
+    {
         ( new BackupService() )->backupCode();
         return true;
     }
@@ -256,21 +377,49 @@ class UpgradeService extends BaseAdminService
      * 备份数据库
      * @return true
      */
-    public function backupSql() {
-        (new BackupService())->backupSql();
-        return true;
+    public function backupSql($index = 0)
+    {
+        $backup_dir = $this->upgrade_dir . $this->upgrade_task[ 'key' ] . DIRECTORY_SEPARATOR . 'backup' . DIRECTORY_SEPARATOR . 'sql' . DIRECTORY_SEPARATOR;
+        // 创建目录
+        dir_mkdir($backup_dir);
+
+        $db = new DbBackup($backup_dir, 1024 * 1024 * 2, key: $this->upgrade_task[ 'key' ]);
+
+        $prefix = config('database.connections.' . config('database.default'))[ 'prefix' ];
+
+        // 不需要备份的表
+        $not_need_backup = [
+            "{$prefix}sys_schedule_log",
+            "{$prefix}sys_user_log",
+            "{$prefix}jobs",
+            "{$prefix}jobs_failed",
+            "{$prefix}sys_upgrade_records",
+            "{$prefix}sys_backup_records"
+        ];
+
+        $result = $db->setExcludeTables($not_need_backup)->backupDatabaseSegment();
+        if ($db->getBackupProgress() == 100) {
+            $this->upgrade_task[ 'log' ][] = "数据库备份完成";
+        } else {
+            $this->upgrade_task[ 'log' ][] = $db->getBackupProgress() == 0 ? '数据库开始备份' : '数据库备份已备份' . $db->getBackupProgress() . '%';
+        }
+        if ($result === true) return true;
+        return [ 'index' => $result ];
     }
 
     /**
      * 覆盖更新升级的代码
      * @return void
      */
-    public function coverCode($index = 0) {
+    public function coverCode($index = 0, $addon = "")
+    {
         $this->upgrade_task[ 'is_cover' ] = 1;
-        $addon = $this->upgrade_task['upgrade']['app_key'];
+        if (empty($addon)) $addon = $this->upgrade_task[ 'upgrade_apps' ][ 0 ];
 
-        $version_list = array_reverse($this->upgrade_task['upgrade_content']['version_list']);
-        $code_dir = $this->upgrade_dir .$this->upgrade_task['key'] . DIRECTORY_SEPARATOR . 'download' . DIRECTORY_SEPARATOR . 'code' . DIRECTORY_SEPARATOR;
+        $app_index = array_search($addon, $this->upgrade_task[ 'upgrade_apps' ]);
+
+        $version_list = array_reverse($this->upgrade_task[ 'upgrade_content' ][ 'content' ][ $app_index ][ 'version_list' ]);
+        $code_dir = $this->upgrade_dir . $this->upgrade_task[ 'key' ] . DIRECTORY_SEPARATOR . 'download' . DIRECTORY_SEPARATOR . $addon . DIRECTORY_SEPARATOR . 'code' . DIRECTORY_SEPARATOR;
 
         $version_item = $version_list[ $index ];
         $version_no = $version_item[ 'version_no' ];
@@ -321,8 +470,12 @@ class UpgradeService extends BaseAdminService
 
         $index++;
         if ($index < count($version_list)) {
-            return compact('index');
+            return compact('index', 'addon');
         } else {
+            $app_index++;
+            if (isset($this->upgrade_task[ 'upgrade_apps' ][ $app_index ])) {
+                return [ 'index' => 0, 'addon' => $this->upgrade_task[ 'upgrade_apps' ][ $app_index ] ];
+            }
             return true;
         }
     }
@@ -332,7 +485,8 @@ class UpgradeService extends BaseAdminService
      * @param string $version_no
      * @return void
      */
-    public function installDepend(string $dir, array $change_files) {
+    public function installDepend(string $dir, array $change_files)
+    {
         $addon = $this->upgrade_task[ 'upgrade' ][ 'app_key' ];
         $depend_service = new CoreDependService();
 
@@ -352,7 +506,7 @@ class UpgradeService extends BaseAdminService
             $original = $depend_service->getComposerContent();
             $new = $depend_service->jsonFileToArray($dir . $composer);
             foreach ($new as $name => $value) {
-                $original[$name] = isset($original[$name]) && is_array($original[$name]) ? array_merge($original[$name], $new[$name]) : $new[$name];
+                $original[ $name ] = isset($original[ $name ]) && is_array($original[ $name ]) ? array_map('unserialize', array_unique(array_map('serialize', array_merge($original[ $name ], $new[ $name ])))) : $new[ $name ];
             }
             $depend_service->writeArrayToJsonFile($original, $dir . $composer);
         }
@@ -390,8 +544,11 @@ class UpgradeService extends BaseAdminService
      * @param string $verson_no
      * @return true
      */
-    public function handleUniapp() {
-        $code_dir = $this->upgrade_dir .$this->upgrade_task['key'] . DIRECTORY_SEPARATOR . 'download' . DIRECTORY_SEPARATOR . 'code' . DIRECTORY_SEPARATOR;
+    public function handleUniapp()
+    {
+        $key = end($this->upgrade_task[ 'upgrade_apps' ]);
+
+        $code_dir = $this->upgrade_dir . $this->upgrade_task[ 'key' ] . DIRECTORY_SEPARATOR . 'download' . DIRECTORY_SEPARATOR . $key . DIRECTORY_SEPARATOR . 'code' . DIRECTORY_SEPARATOR;
         $exclude_files = [ '.env.development', '.env.production', 'manifest.json' ];
         dir_copy($code_dir . 'uni-app', $this->root_path . 'uni-app', exclude_files: $exclude_files);
 
@@ -440,7 +597,8 @@ class UpgradeService extends BaseAdminService
      * @param string $sql_file
      * @return true
      */
-    private function executeSql(string $sql_file) {
+    private function executeSql(string $sql_file)
+    {
         $sql_content = file_get_contents($sql_file);
 
         if (!empty($sql_content)) {
@@ -461,11 +619,20 @@ class UpgradeService extends BaseAdminService
      * 刷新菜单
      * @return void
      */
-    public function refreshMenu() {
-        if ($this->upgrade_task['upgrade']['app_key'] == AddonDict::FRAMEWORK_KEY) {
+    public function refreshMenu($addon = "")
+    {
+        if (empty($addon)) $addon = $this->upgrade_task[ 'upgrade_apps' ][ 0 ];
+        $app_index = array_search($addon, $this->upgrade_task[ 'upgrade_apps' ]);
+
+        if ($addon == AddonDict::FRAMEWORK_KEY) {
             ( new InstallSystemService() )->installMenu();
         } else {
-            (new CoreMenuService())->refreshAddonMenu($this->upgrade_task['upgrade']['app_key']);
+            ( new CoreMenuService() )->refreshAddonMenu($addon);
+        }
+
+        $app_index++;
+        if (isset($this->upgrade_task[ 'upgrade_apps' ][ $app_index ])) {
+            return [ 'addon' => $this->upgrade_task[ 'upgrade_apps' ][ $app_index ] ];
         }
         return true;
     }
@@ -474,28 +641,88 @@ class UpgradeService extends BaseAdminService
      * 安装计划任务
      * @return true
      */
-    public function installSchedule() {
-        if ($this->upgrade_task['upgrade']['app_key'] == AddonDict::FRAMEWORK_KEY) {
+    public function installSchedule($addon = "")
+    {
+        if (empty($addon)) $addon = $this->upgrade_task[ 'upgrade_apps' ][ 0 ];
+        $app_index = array_search($addon, $this->upgrade_task[ 'upgrade_apps' ]);
+
+        if ($addon == AddonDict::FRAMEWORK_KEY) {
             ( new CoreScheduleInstallService() )->installSystemSchedule();
         } else {
-            (new CoreScheduleInstallService())->installAddonSchedule($this->upgrade_task['upgrade']['app_key']);
+            ( new CoreScheduleInstallService() )->installAddonSchedule($addon);
+        }
+
+        $app_index++;
+        if (isset($this->upgrade_task[ 'upgrade_apps' ][ $app_index ])) {
+            return [ 'addon' => $this->upgrade_task[ 'upgrade_apps' ][ $app_index ] ];
         }
         return true;
     }
 
+    /**
+     * 云编译
+     * @return void
+     */
+    public function cloudBuild()
+    {
+        ( new CoreCloudBuildService() )->cloudBuild();
+    }
+
+    /**
+     * 获取云编译日志
+     * @return void
+     */
+    public function gteCloudBuildLog()
+    {
+        $log = ( new CoreCloudBuildService() )->getBuildLog();
+        if (empty($log)) return true;
+
+        foreach ($log[ 'data' ][ 0 ] as $item) {
+            if ($item[ 'code' ] == 0) {
+                $this->upgrade_task[ 'step' ] = 'gteCloudBuildLog';
+                $this->upgrade_task[ 'error' ][] = $item[ 'msg' ];
+                Cache::set($this->cache_key, $this->upgrade_task);
+
+                $fail_reason = [
+                    'Message' => '失败原因 云编译错误：' . $item[ 'msg' ],
+                    'File' => '',
+                    'Line' => '',
+                    'Trace' => ''
+                ];
+
+                ( new CoreCloudBuildService() )->clearTask();
+
+                $this->upgradeErrorHandle($fail_reason);
+
+                return true;
+            }
+            if (!in_array($item[ 'action' ], $this->upgrade_task[ 'log' ])) {
+                $this->upgrade_task[ 'log' ][] = $item[ 'action' ];
+                Cache::set($this->cache_key, $this->upgrade_task);
+            }
+        }
+
+        sleep(2);
+        return [];
+    }
+
     /**
      * 更新完成
      * @return void
      */
-    public function upgradeComplete() {
-        $addon = $this->upgrade_task['upgrade']['app_key'];
+    public function upgradeComplete()
+    {
+        foreach ($this->upgrade_task[ 'upgrade_apps' ] as $addon) {
             if ($addon != AddonDict::FRAMEWORK_KEY) {
                 $core_addon_service = new CoreAddonService();
                 $install_data = $core_addon_service->getAddonConfig($addon);
                 $install_data[ 'icon' ] = 'addon/' . $addon . '/icon.png';
                 $core_addon_service->set($install_data);
             }
-        $this->clearUpgradeTask(5);
+        }
+        // 执行完成，更新升级记录状态，备份记录状态
+        ( new UpgradeRecordsService() )->complete($this->upgrade_task[ 'key' ]);
+        $this->clearUpgradeTask(2);
         return true;
     }
 
@@ -503,7 +730,8 @@ class UpgradeService extends BaseAdminService
      * 升级出错之后的处理
      * @return true|void
      */
-    public function upgradeErrorHandle() {
+    public function upgradeErrorHandle($fail_reason = [])
+    {
         $steps = [];
         $steps[ $this->upgrade_task[ 'step' ] ] = [];
 
@@ -513,19 +741,29 @@ class UpgradeService extends BaseAdminService
         }
         $steps[ 'restoreComplete' ] = [ 'step' => 'restoreComplete', 'title' => '备份恢复完成' ];
         $this->upgrade_task[ 'steps' ] = $steps;
+        $this->upgrade_task[ 'params' ] = [];
         Cache::set($this->cache_key, $this->upgrade_task);
+
+        Log::write('升级出错之后的处理：' . json_encode($fail_reason));
     }
 
     /**
      * 恢复源码
      * @return void
      */
-    public function restoreCode() {
+    public function restoreCode()
+    {
+        if ($this->upgrade_task[ 'is_need_backup' ]) {
+            $backup_dir = $this->upgrade_dir . $this->upgrade_task[ 'key' ] . DIRECTORY_SEPARATOR . 'backup' . DIRECTORY_SEPARATOR . 'code' . DIRECTORY_SEPARATOR;
+        } else {
+            $backup_dir = $this->upgrade_dir . $this->upgrade_task[ 'upgrade_content' ][ 'last_backup' ][ 'key' ] . DIRECTORY_SEPARATOR . 'backup' . DIRECTORY_SEPARATOR . 'code' . DIRECTORY_SEPARATOR;
+        }
         try {
-            (new RestoreService())->restoreCode();
+            if (is_dir($backup_dir)) {
+                dir_copy($backup_dir, rtrim($this->root_path, DIRECTORY_SEPARATOR));
+            }
             return true;
         } catch (\Exception $e) {
-            $backup_dir = $this->upgrade_dir .$this->upgrade_task['key'] . DIRECTORY_SEPARATOR . 'backup' . DIRECTORY_SEPARATOR . 'code' . DIRECTORY_SEPARATOR;
             $this->upgrade_task[ 'error' ][] = '源码备份恢复失败稍后请手动恢复，源码备份文件路径：' . $backup_dir . '，失败原因：' . $e->getMessage() . $e->getFile() . $e->getLine();
             Cache::set($this->cache_key, $this->upgrade_task);
             return true;
@@ -536,20 +774,32 @@ class UpgradeService extends BaseAdminService
      * 恢复数据库
      * @return void
      */
-    public function restoreSql() {
+    public function restoreSql($index = 0)
+    {
+        if ($this->upgrade_task[ 'is_need_backup' ]) {
+            $backup_dir = $this->upgrade_dir . $this->upgrade_task[ 'key' ] . DIRECTORY_SEPARATOR . 'backup' . DIRECTORY_SEPARATOR . 'sql' . DIRECTORY_SEPARATOR;
+        } else {
+            $backup_dir = $this->upgrade_dir . $this->upgrade_task[ 'upgrade_content' ][ 'last_backup' ][ 'key' ] . DIRECTORY_SEPARATOR . 'backup' . DIRECTORY_SEPARATOR . 'sql' . DIRECTORY_SEPARATOR;
+        }
         try {
-            (new RestoreService())->restoreSql();
+            if (is_dir($backup_dir)) {
+                $db = new DbBackup($backup_dir, key: $this->upgrade_task[ 'key' ]);
+                $result = $db->restoreDatabase();
+                if ($result !== true) return [ 'index' => $result ];
+            }
+
             return true;
         } catch (\Exception $e) {
-            $backup_dir = $this->upgrade_dir .$this->upgrade_task['key'] . DIRECTORY_SEPARATOR . 'backup' . DIRECTORY_SEPARATOR . 'sql' . DIRECTORY_SEPARATOR;
             $this->upgrade_task[ 'error' ][] = '数据库备份恢复失败稍后请手动恢复，数据库备份文件路径：' . $backup_dir . '，失败原因：' . $e->getMessage() . $e->getFile() . $e->getLine();
             Cache::set($this->cache_key, $this->upgrade_task);
             return true;
         }
     }
 
-    public function restoreComplete() {
-        $this->clearUpgradeTask(5);
+    public function restoreComplete()
+    {
+        ( new UpgradeRecordsService() )->failed($this->upgrade_task[ 'key' ], $this->upgrade_task[ 'error' ]);
+        $this->clearUpgradeTask(2);
         return true;
     }
 
@@ -559,26 +809,56 @@ class UpgradeService extends BaseAdminService
      * @return array|\core\util\niucloud\Response|object|\Psr\Http\Message\ResponseInterface
      * @throws \GuzzleHttp\Exception\GuzzleException
      */
-    public function getUpgradeContent(string $addon = '') {
+    public function getUpgradeContent(string $addon = '')
+    {
+        $content = [
+            'content' => [],
+            'upgrade_apps' => []
+        ];
+
         $upgrade = [
             'product_key' => BaseNiucloudClient::PRODUCT
         ];
+        $apps = [];
         if (!$addon) {
             $upgrade[ 'app_key' ] = AddonDict::FRAMEWORK_KEY;
             $upgrade[ 'version' ] = config('version.version');
+            array_push($apps, $upgrade);
         } else {
-            $upgrade['app_key'] = $addon;
-            $upgrade['version'] = (new Addon())->where([ ['key', '=', $addon] ])->value('version');
+            $addons = array_filter(explode(',', $addon));
+            foreach ($addons as $key) {
+                $info = ( new Addon() )->where([ [ 'key', '=', $key ] ])->field('version,type')->find();
+                $upgrade[ 'app_key' ] = $key;
+                $upgrade[ 'version' ] = $info[ 'version' ];
+                if ($info[ 'type' ] == 'app') {
+                    array_unshift($apps, $upgrade);
+                } else {
+                    array_push($apps, $upgrade);
+                }
+            }
         }
 
-        return (new CoreModuleService())->getUpgradeContent($upgrade)['data'] ?? [];
+        foreach ($apps as $item) {
+            $upgrade_content = ( new CoreModuleService() )->getUpgradeContent($item)[ 'data' ] ?? [];
+            if (!empty($upgrade_content)) {
+                $content[ 'content' ][] = $upgrade_content;
+                $content[ 'upgrade_apps' ][] = $upgrade_content[ 'app' ][ 'app_key' ];
+            }
+        }
+
+        if (!empty($content[ 'content' ])) {
+            $content[ 'last_backup' ] = ( new SysBackupRecords() )->where([ [ 'status', '=', BackupDict::STATUS_COMPLETE ] ])->order('complete_time desc')->find();
+        }
+
+        return $content;
     }
 
     /**
      * 获取正在进行的升级任务
      * @return mixed|null
      */
-    public function getUpgradeTask() {
+    public function getUpgradeTask()
+    {
         return $this->upgrade_task;
     }
 
@@ -586,12 +866,20 @@ class UpgradeService extends BaseAdminService
      * 清除升级任务
      * @return true
      */
-    public function clearUpgradeTask(int $delayed = 0) {
+    public function clearUpgradeTask(int $delayed = 0, int $is_active = 0)
+    {
+        // 主动取消升级
+        if ($is_active && $this->upgrade_task && !empty($this->upgrade_task[ 'key' ])) {
+            ( new UpgradeRecordsService() )->edit([ [ 'upgrade_key', '=', $this->upgrade_task[ 'key' ] ], [ 'status', '=', UpgradeDict::STATUS_READY ] ], [ 'status' => UpgradeDict::STATUS_CANCEL ]);
+        }
+
         if ($delayed) {
             Cache::set($this->cache_key, $this->upgrade_task, $delayed);
         } else {
             Cache::set($this->cache_key, null);
         }
+        // 清除云编译的任务缓存
+        ( new CoreCloudBuildService() )->clearTask();
         return true;
     }
 
@@ -604,4 +892,30 @@ class UpgradeService extends BaseAdminService
     {
         return root_path() . 'addon' . DIRECTORY_SEPARATOR . $addon . DIRECTORY_SEPARATOR . 'package' . DIRECTORY_SEPARATOR;
     }
+
+    /**
+     * 用户操作
+     * @param $operate
+     * @return void
+     */
+    public function operate($operate)
+    {
+        if (!$this->upgrade_task) return true;
+
+        switch ($operate) {
+            case 'local':
+                $this->upgrade_task[ 'step' ] = 'gteCloudBuildLog';
+                Cache::set($this->cache_key, $this->upgrade_task);
+                break;
+            case 'rollback':
+                $fail_reason = [
+                    'Message' => '失败原因：一键云编译队列任务过多',
+                    'File' => '',
+                    'Line' => '',
+                    'Trace' => ''
+                ];
+                $this->upgradeErrorHandle($fail_reason);
+                break;
+        }
+    }
 }

niucloud/app/service/admin/verify/VerifierService.php

@@ -61,7 +61,8 @@ class VerifierService extends BaseAdminService
      * 组合整理数据
      * @param $data
      */
-    public function makeUp($data){
+    public function makeUp($data)
+    {
         //核销类型
         if (!empty($data[ 'verify_type' ])) {
             $type = VerifyDict::getType();
@@ -77,6 +78,13 @@ class VerifierService extends BaseAdminService
         return $data;
     }
 
+    public function getDetail($id)
+    {
+        return $this->model->with([ 'member' => function ($query) {
+            $query->field('member_id, nickname, mobile, headimg');
+        } ])->field('')->findOrEmpty($id)->toArray();
+    }
+
     /**
      * 添加核销员
      * @param array $data
@@ -88,13 +96,23 @@ class VerifierService extends BaseAdminService
         if ($member->isEmpty()) throw new CommonException('MEMBER_NOT_EXIST');
 
         $model = $this->model->where([ [ 'member_id', '=', $data[ 'member_id' ] ] ])->findOrEmpty();
-        if (!$model->isEmpty()) return $model->id;
+        if (!$model->isEmpty()) throw new CommonException('VERIFIER_EXIST');
 
         $data[ 'create_time' ] = time();
         $res = $this->model->create($data);
         return $res->id;
     }
 
+    /**
+     * 编辑核销员
+     * @param array $data
+     * @return mixed
+     */
+    public function edit($id, $data)
+    {
+        $this->model->where([ [ 'id', '=', $id ] ])->update($data);
+    }
+
     /**
      * 删除核销员
      * @param int $id

niucloud/app/service/admin/verify/VerifyService.php

@@ -33,7 +33,8 @@ class VerifyService extends BaseAdminService
      * @return array
      * @throws \think\db\exception\DbException
      */
-    public function getPage(array $where  = []) {
+    public function getPage(array $where = [])
+    {
         $search_model = $this->model->where([ [ 'id', '>', 0 ] ])->withSearch([ 'code', 'type', 'create_time', 'verifier_member_id' ], $where)
             ->with([ 'member' => function($query) {
                 $query->field('member_id, nickname, mobile, headimg');
@@ -47,7 +48,8 @@ class VerifyService extends BaseAdminService
      * @param string $verify_code
      * @return array
      */
-    public function getDetail(string $verify_code) {
+    public function getDetail(string $verify_code)
+    {
         $info = $this->model->where([
             [ 'code', '=', $verify_code ]
         ])->field('*')

niucloud/app/service/api/diy/DiyConfigService.php

@@ -71,16 +71,15 @@ class DiyConfigService extends BaseApiService
         // 检测当前站点是多应用还是单应用
         if ($key == 'app') {
             $apps = ( new CoreAddonService() )->getList([ [ 'type', '=', 'app' ] ]);
+
             $list = ( new CoreDiyConfigService() )->getBottomList();
             $bottom_list_keys = array_column($list, 'key');
-
             // 排除没有底部导航的应用
             foreach ($apps as $k => $v) {
                 if (!in_array($v[ 'key' ], $bottom_list_keys)) {
                     unset($apps[ $k ]);
                 }
             }
-            $apps = array_values($apps);
             if (count($apps) == 1) {
                 $key = $apps[ 0 ][ 'key' ];
             }

niucloud/app/service/api/sys/AreaService.php

@@ -220,7 +220,7 @@ class AreaService extends BaseApiService
                     'formatted_addresses' => $address_data[ 'formatted_addresses' ]
                 ];
             } else {
-                throw new ApiException($res[ 'message' ]);
+                throw new ApiException('请检查地图配置：'.$res[ 'message' ]);
             }
 
         } else {

niucloud/app/service/api/verify/VerifyService.php

@@ -22,7 +22,6 @@ use core\base\BaseApiService;
 class VerifyService extends BaseApiService
 {
 
-
     /**
      * 获取核销码(对应业务调用)
      * @param $type
@@ -49,7 +48,7 @@ class VerifyService extends BaseApiService
      */
     public function getInfoByCode($code)
     {
-        return ( new CoreVerifyService() )->getInfoByCode($code);
+        return ( new CoreVerifyService() )->getInfoByCode($this->member_id,$code);
     }
 
     /**

niucloud/app/service/core/addon/CoreAddonCloudService.php

@@ -35,7 +35,10 @@ class CoreAddonCloudService extends CoreCloudBaseService
         $package_dir = $temp_dir . 'package' . DIRECTORY_SEPARATOR;
         dir_mkdir($package_dir);
 
-        $compile = (new CoreAddonService())->getAddonConfig($addon)['compile'] ?? [];
+
+        $addon_config = (new CoreAddonService())->getAddonConfig($addon);
+        $compile = $addon_config['compile'] ?? [];
+        $custom_port = $addon_config['port']?? [];
 
         $need_build = false;
         // 拷贝composer文件
@@ -60,6 +63,19 @@ class CoreAddonCloudService extends CoreCloudBaseService
             $need_build = true;
         }
 
+        // 自定义端口
+        if (!empty($custom_port)) {
+            $addon_path = $this->addonPath($addon);
+            foreach ($custom_port as $port) {
+                if (is_dir($addon_path . $port[ 'name' ])) {
+                    dir_copy($addon_path . $port[ 'name' ], $package_dir . $port[ 'name' ]);
+                    $json_path = $package_dir . $port[ 'name' ] . DIRECTORY_SEPARATOR . 'info.json';
+                    file_put_contents($json_path, json_encode($port));
+                }
+            }
+            $need_build = true;
+        }
+
         if ($need_build) {
             // 将临时目录下文件生成压缩包
             $zip_file = $temp_dir . DIRECTORY_SEPARATOR . 'build.zip';
@@ -224,10 +240,6 @@ class CoreAddonCloudService extends CoreCloudBaseService
      */
     public function downloadAddon(string $addon, string $version) {
         $action_token = (new CoreModuleService())->getActionToken('download', ['data' => ['app_key' => $addon, 'version' => $version, 'product_key' => BaseNiucloudClient::PRODUCT ]]);
-        if (isset($action_token['code']) && $action_token['code'] != 1) {
-            if ($action_token['code'] == 401) $action_token = (new CoreModuleService())->getActionToken('download', ['data' => ['app_key' => $addon, 'version' => $version, 'product_key' => BaseNiucloudClient::PRODUCT]]);
-            if ($action_token['code'] != 1) throw new CommonException($action_token['msg']);
-        }
 
         $query = [
             'authorize_code' => $this->auth_code,
@@ -265,10 +277,6 @@ class CoreAddonCloudService extends CoreCloudBaseService
      */
     public function upgradeAddon(array $data = []) {
         $action_token = (new CoreModuleService())->getActionToken('upgrade', ['data' => $data ]);
-        if (isset($action_token['code']) && $action_token['code'] != 1) {
-            if ($action_token['code'] == 401) $action_token = (new CoreModuleService())->getActionToken('upgrade', ['data' => $data ]);
-            if ($action_token['code'] != 1) throw new CommonException($action_token['msg']);
-        }
 
         $query = [
             'authorize_code' => $this->auth_code,
@@ -286,7 +294,7 @@ class CoreAddonCloudService extends CoreCloudBaseService
      * @param string $token
      * @return void
      */
-    public function downloadUpgradeFile(string $token, string $dir = '', int $index = -1, $step = 0, $length = 0) {
+    public function downloadUpgradeFile(string $app_key, string $token, string $dir = '', int $index = -1, $step = 0, $length = 0) {
         $query = [
             'authorize_code' => $this->auth_code,
             'token' => $token
@@ -302,7 +310,7 @@ class CoreAddonCloudService extends CoreCloudBaseService
             $step = (int)ceil($length / $chunk_size);
 
             $index++;
-            return compact('token', 'dir', 'index', 'step', 'length');
+            return compact('app_key', 'token', 'dir', 'index', 'step', 'length');
         } else {
             $zip_file = $dir . 'upgrade.zip';
             $zip_resource = fopen($zip_file, 'a');
@@ -319,7 +327,7 @@ class CoreAddonCloudService extends CoreCloudBaseService
                 fclose($zip_resource);
 
                 $index++;
-                return compact('token', 'dir', 'index', 'step', 'length');
+                return compact('app_key', 'token', 'dir', 'index', 'step', 'length');
             } else {
                 $zip = new \ZipArchive();
                 if ($zip->open($zip_file) === true) {

niucloud/app/service/core/addon/CoreAddonDevelopService.php

@@ -366,6 +366,7 @@ class CoreAddonDevelopService extends CoreAddonBaseService
             if (empty($image)) return true;
             if (check_file_is_remote($image)) {
                 try {
+                    downloadImage($image,$file); // 将云存储的图片下载到本地
                     (new CoreFetchService())->setRootPath($dir)->setRename($name)->image($image, 0, FileDict::LOCAL);
                 } catch ( UploadFileException $e ) {
                     return true;

niucloud/app/service/core/addon/WapTrait.php

@@ -83,6 +83,7 @@ trait WapTrait
             $addon_arr[] = $addon; // 追加新装插件
         }
         $addon_arr = array_unique($addon_arr);
+
         foreach ($addon_arr as $k => $v) {
             $addon_path = $compile_path . str_replace('/', DIRECTORY_SEPARATOR, 'addon/' . $v . '/components/diy'); // 插件自定义组件根目录
             $addon_file_arr = getFileMap($addon_path);

niucloud/app/service/core/menu/CoreMenuService.php

@@ -90,10 +90,15 @@ class CoreMenuService extends BaseCoreService
         $addon_admin_tree = $addon_loader->load(["addon" => $addon, "app_type" => "admin"]);
 
         if (isset($addon_admin_tree['delete'])) unset($addon_admin_tree['delete']);
-
-        $admin_menu = $this->loadMenu($addon_admin_tree, "admin", $addon);
+        $menu_list = [];
+        if (!empty($addon_admin_tree)) {
+            $menu_list = array_merge($menu_list, $this->loadMenu($addon_admin_tree, "admin", $addon));
+        }
         $this->deleteByAddon($addon, false);
-        $this->install($admin_menu);
+        if(!empty($menu_list))
+        {
+            $this->install($menu_list);
+        }
 
         return true;
 

niucloud/app/service/core/niucloud/CoreCloudBuildService.php

@@ -17,6 +17,7 @@ use app\service\core\addon\CoreAddonBaseService;
 use app\service\core\addon\CoreAddonDevelopDownloadService;
 use app\service\core\addon\WapTrait;
 use core\base\BaseCoreService;
+use core\exception\CloudBuildException;
 use core\exception\CommonException;
 use core\util\niucloud\BaseNiucloudClient;
 use core\util\niucloud\CloudService;
@@ -49,7 +50,8 @@ class CoreCloudBuildService extends BaseCoreService
      * 编译前环境检测
      * @return array|array[]
      */
-    public function buildPreCheck() {
+    public function buildPreCheck()
+    {
         $niucloud_dir = $this->root_path . 'niucloud' . DIRECTORY_SEPARATOR;
         $admin_dir = $this->root_path . 'admin' . DIRECTORY_SEPARATOR;
         $web_dir = $this->root_path . 'web' . DIRECTORY_SEPARATOR;
@@ -113,7 +115,8 @@ class CoreCloudBuildService extends BaseCoreService
      * @param $addon
      * @return void
      */
-    public function cloudBuild() {
+    public function cloudBuild()
+    {
         if ($this->build_task) throw new CommonException('CLOUD_BUILD_TASK_EXIST');
 
         $action_token = ( new CoreModuleService() )->getActionToken('cloudbuild', [ 'data' => [ 'product_key' => BaseNiucloudClient::PRODUCT ] ]);
@@ -164,7 +167,7 @@ class CoreCloudBuildService extends BaseCoreService
             ],
             'timeout' => 300.0
         ]);
-        if (isset($response['code']) && $response['code'] == 0) throw new CommonException($response['msg']);
+        if (isset($response[ 'code' ]) && $response[ 'code' ] == 0) throw new CloudBuildException($response[ 'msg' ]);
 
         $this->build_task = [
             'task_key' => $task_key,
@@ -175,12 +178,14 @@ class CoreCloudBuildService extends BaseCoreService
         return $this->build_task;
     }
 
-    private function handleUniapp(string $dir) {
+    private function handleUniapp(string $dir)
+    {
         $addon = ( new Addon() )->where([ [ 'status', '=', AddonDict::ON ] ])->value('key', '');
         $this->compileDiyComponentsCode($dir . DIRECTORY_SEPARATOR . 'src' . DIRECTORY_SEPARATOR, $addon);
     }
 
-    private function handleCustomPort(string $package_dir) {
+    private function handleCustomPort(string $package_dir)
+    {
         $addons = get_site_addons();
 
         foreach ($addons as $addon) {
@@ -202,7 +207,8 @@ class CoreCloudBuildService extends BaseCoreService
      * 安装时云编译
      * @return void
      */
-    public function installBuild() {
+    public function installBuild()
+    {
         if ($this->build_task) throw new CommonException('CLOUD_BUILD_TASK_EXIST');
 
         // 上传任务key
@@ -269,7 +275,8 @@ class CoreCloudBuildService extends BaseCoreService
      * 获取编译任务
      * @return mixed
      */
-    public function getBuildTask() {
+    public function getBuildTask()
+    {
         return $this->build_task;
     }
 
@@ -277,7 +284,8 @@ class CoreCloudBuildService extends BaseCoreService
      * 获取编译执行日志
      * @return void
      */
-    public function getBuildLog() {
+    public function getBuildLog()
+    {
         if (!$this->build_task) return;
 
         $query = [
@@ -300,7 +308,8 @@ class CoreCloudBuildService extends BaseCoreService
      * @param array $log
      * @return array
      */
-    public function buildSuccess(array $log) {
+    public function buildSuccess(array $log)
+    {
         try {
             $query = [
                 'authorize_code' => $this->auth_code,
@@ -377,7 +386,8 @@ class CoreCloudBuildService extends BaseCoreService
      * 清除任务
      * @return void
      */
-    public function clearTask() {
+    public function clearTask()
+    {
         if (!$this->build_task) return;
         $temp_dir = runtime_path() . 'backup' . DIRECTORY_SEPARATOR . 'cloud_build' . DIRECTORY_SEPARATOR . $this->build_task[ 'task_key' ] . DIRECTORY_SEPARATOR;;
         @del_target_dir($temp_dir, true);

niucloud/app/service/core/niucloud/CoreModuleService.php

@@ -73,7 +73,6 @@ class CoreModuleService extends BaseNiucloudClient
 
     }
 
-
     /**
      * 操作token
      * @param $action
@@ -92,7 +91,8 @@ class CoreModuleService extends BaseNiucloudClient
      * @return array|\core\util\niucloud\Response|object|ResponseInterface
      * @throws GuzzleException
      */
-    public function getUpgradeContent($data) {
+    public function getUpgradeContent($data)
+    {
         return $this->httpGet('member_app_upgrade/content', $data);
     }
 
@@ -112,7 +112,8 @@ class CoreModuleService extends BaseNiucloudClient
      * @return array|\core\util\niucloud\Response|object|ResponseInterface
      * @throws GuzzleException
      */
-    public function getFrameworkLastVersion() {
+    public function getFrameworkLastVersion()
+    {
         return $this->httpGet('store/framework/lastversion', [ 'product_key' => self::PRODUCT ])[ 'data' ] ?? false;
     }
 
@@ -121,15 +122,18 @@ class CoreModuleService extends BaseNiucloudClient
      * @return false|mixed
      * @throws GuzzleException
      */
-    public function getFrameworkVersionList() {
+    public function getFrameworkVersionList()
+    {
         return $this->httpGet('store/framework/version', [ 'product_key' => self::PRODUCT ])[ 'data' ] ?? false;
     }
 
     /**
      * 申请体验
+     * @return array|false|mixed
      * @throws GuzzleException
      */
-    public function applyExperience() {
+    public function applyExperience()
+    {
         $data = $this->httpGet('apply/experience', [ 'product_key' => self::PRODUCT ])[ 'data' ] ?? [];
         if (!empty($data)) {
             ( new CoreConfigService() )->setConfig(ConfigKeyDict::NIUCLOUD_CONFIG, [
@@ -141,4 +145,14 @@ class CoreModuleService extends BaseNiucloudClient
             return false;
         }
     }
+
+    /**
+     * 获取应用/插件的版本更新记录
+     * @return false|mixed
+     * @throws GuzzleException
+     */
+    public function getAppVersionList($app_key)
+    {
+        return $this->httpGet('store/app_version/list', [ 'product_key' => self::PRODUCT, 'app_key' => $app_key ])[ 'data' ] ?? false;
+    }
 }

niucloud/app/service/core/pay/CorePayService.php

@@ -251,7 +251,7 @@ class CorePayService extends BaseCoreService
             event('OfflinePayAfter', [
                 'trade_type' => $trade_type,
                 'trade_id' => $trade_id,
-                'out_trade_no' => $out_trade_no,
+                'out_trade_no' => $out_trade_no
             ]);
         } else {
             //将支付设置为支付中
@@ -263,7 +263,7 @@ class CorePayService extends BaseCoreService
                 ]
             );
             if (env('queue.state', true)) {
-                PayReturnTo::dispatch([ 'out_trade_no' => $out_trade_no ], secs: 15);
+                PayReturnTo::dispatch([ 'out_trade_no' => $out_trade_no ], secs: 60);
             }
         }
         return $pay_result;
@@ -476,7 +476,7 @@ class CorePayService extends BaseCoreService
             }
         };
 
-        Log::write('业务'.'_'.$channel.'_'.$type.'_'.$action);
+        Log::write('业务_' . $channel . '_' . $type . '_' . $action);
         return $this->pay_event->init($channel, $type)->notify($action, $callback);
     }
 

niucloud/app/service/core/pay/CoreRefundService.php

@@ -45,6 +45,13 @@ class CoreRefundService extends BaseCoreService
         //通过交易流水号获取支付单据
         $pay = (new CorePayService())->findPayInfoByOutTradeNo($out_trade_no);
         if($pay->isEmpty()) throw new PayException('ALIPAY_TRANSACTION_NO_NOT_EXIST');//单据不存在
+
+        //查询当前支付已存在的退狂单据,所有的退款总额不能超过支付单据的支付金额
+        $total_refund_money = $this->model->where([['out_trade_no', '=', $out_trade_no], ['status', '<>', RefundDict::FAIL]])->sum('money');
+
+        $comparison = bccomp(bcadd($total_refund_money, $money), $pay['money']);//浮点数直接进行比较会出现精度问题
+        if ($comparison > 0) throw new PayException('退款金额不能超过支付总额');//退款金额不能超过支付总额
+
         //校验当前数据是否存在
         //存在就修改,不存在就创建
         $refund_no = create_no();

niucloud/app/service/core/pay/CoreTransferSceneService.php

@@ -71,78 +71,11 @@ class CoreTransferSceneService extends BaseCoreService
 
         $config = $this->getWechatTransferSceneConfig();
         //查询业务和场景的对应关系表
-//        $trade_scene_event_array = [
-//            'shop_fenxiao' => [
-//                'name' => '分销',
-//                'scene' => TransferDict::XJYX,
-//                'perception' => '',
-//                'infos' => [
-//                    '活动名称' => '分销佣金',
-//                    '奖励说明' => '分销佣金奖励'
-//                ]
-//            ]
-//        ];
         $trade_scene_event_array = event('GetWechatTransferTradeScene', []);
-
-//        [
-//            'xjyx' =>  [
-//                'name' => '现金营销',
-//                'scene_id' => 1001,
-//                'user_recv_perception' => [//收款感知
-//                    '活动奖励',
-//                    '现金奖励',
-//                ],
-//                'transfer_scene_report_infos' => [//报备背景信息
-//                    '活动名称',
-//                    '奖励说明'
-//                ],
-//                'trade_scene_data' => [
-//                    'shop_fenxiao' => [
-//                        'name' => '分销',
-//                        'scene' => TransferDict::XJYX,
-//                        'infos' => [
-//                            '活动名称' => '分销佣金',
-//                            '奖励说明' => '分销佣金奖励'
-//                        ],
-//                        'perception' => '活动奖励'
-//                    ]
-//                ]
-//            ],
-//            'qypf' =>  [
-//                'name' => '企业赔付',
-//                'scene_id' => 1002,
-//                'user_recv_perception' => [
-//                    '退款',
-//                    '商家赔付',
-//                ],
-//                'transfer_scene_report_infos' => [
-//                    '赔付原因',
-//                ]
-//            ],
-//            'yjbc' =>  [
-//                'name' => '佣金报酬',
-//                'scene_id' => 1005,
-//                'user_recv_perception' => [
-//                    '劳务报酬',
-//                    '报销款',
-//                    '企业补贴',
-//                    '开工利是'
-//                ],
-//                'transfer_scene_report_infos' => [
-//                    '岗位类型',
-//                    '报酬说明'
-//                ]
-//            ],
-//
-//        ];
         $trade_scene_column = ( new TransferScene() )->where([ [ 'id', '=', 0 ] ])->column('*', 'type');
         $trade_scene_list = [];
         foreach ($trade_scene_event_array as $trade_scene_item) {
             foreach ($trade_scene_item as $trade_scene_key => $trade_scene_item_item) {
-//                $trade_scene_select_data = $trade_scene_item_item;
-//                foreach($trade_scene_column as $trade_scene_column_item){
-//                    if($trade_scene_column_item['type'] == )
-//                }
                 $trade_scene_select_data = $trade_scene_column[ $trade_scene_key ] ?? $trade_scene_item_item;
                 $trade_scene_select_data = array_merge($trade_scene_item_item, $trade_scene_select_data);
                 if (!isset($trade_scene_list[ $trade_scene_item_item[ 'scene' ] ])) $trade_scene_list[ $trade_scene_item_item[ 'scene' ] ] = [];
@@ -153,14 +86,8 @@ class CoreTransferSceneService extends BaseCoreService
 
         foreach ($list as $key => &$v) {
             $v[ 'scene_id' ] = $config[ $key ] ?? '';
-//            $item_transfer_scene_report_infos = $v['transfer_scene_report_infos'] ?? [];
             $trade_scene_data = $trade_scene_list[ $key ] ?? [];
             $v[ 'trade_scene_data' ] = $trade_scene_data;
-//            foreach($item_transfer_scene_report_infos as $item_k => $item_v){
-//
-//            }
-
-            // $trade_scene_list = $trade_scene_list[$key] ?? [];
         }
         //然后根据支持的业务来完善业务场景备注
 

niucloud/app/service/core/pay/CoreTransferService.php

@@ -32,6 +32,7 @@ use Throwable;
 class CoreTransferService extends BaseCoreService
 {
     protected $pay_event;
+
     public function __construct()
     {
         parent::__construct();
@@ -49,7 +50,8 @@ class CoreTransferService extends BaseCoreService
      * @return string|null
      * @throws Exception
      */
-    public function create(string $main_type, int $main_id, float $money, string $trade_type, string $remark){
+    public function create(string $main_type, int $main_id, float $money, string $trade_type, string $remark)
+    {
         $transfer_no = create_no();
         $transfer_data = array(
             'money' => $money,
@@ -72,7 +74,8 @@ class CoreTransferService extends BaseCoreService
      * @param array $data
      * @return true
      */
-    public function transfer(string $transfer_no, string $transfer_type, array $data){
+    public function transfer(string $transfer_no, string $transfer_type, array $data)
+    {
         $transfer = $this->findTransferByTransferNo($transfer_no);
 
         if ($transfer->isEmpty()) throw new PayException('TRANSFER_ORDER_INVALID');
@@ -151,12 +154,14 @@ class CoreTransferService extends BaseCoreService
 
         return $return_result;
     }
+
     /**
      * 通过转账单号查询转账
      * @param string $transfer_no
      * @return Pay|array|mixed|Model
      */
-    public function findTransferByTransferNo(string $transfer_no){
+    public function findTransferByTransferNo(string $transfer_no)
+    {
         $where = array(
             [ 'transfer_no', '=', $transfer_no ]
         );
@@ -170,7 +175,8 @@ class CoreTransferService extends BaseCoreService
      * @param $params
      * @return true
      */
-    public function transferNotify(string $transfer_no, $params){
+    public function transferNotify(string $transfer_no, $params)
+    {
         Log::write('transferNotify' . $transfer_no);
         $transfer = $this->findTransferByTransferNo($transfer_no);
         if ($transfer->isEmpty()) throw new PayException('TRANSFER_ORDER_INVALID');
@@ -194,6 +200,7 @@ class CoreTransferService extends BaseCoreService
         }
         return true;
     }
+
     /**
      * 转账完成
      * @param string $transfer_no
@@ -201,7 +208,8 @@ class CoreTransferService extends BaseCoreService
      * @param array $params
      * @return bool
      */
-    public function success(string $transfer_no, array $params = []){
+    public function success(string $transfer_no, array $params = [])
+    {
         $transfer = $this->findTransferByTransferNo($transfer_no);
         Log::write('transferNotifyStatus2' . $transfer[ 'transfer_status' ]);
         if ($transfer->isEmpty()) throw new PayException('TRANSFER_ORDER_INVALID');
@@ -243,7 +251,8 @@ class CoreTransferService extends BaseCoreService
      * @param array $params
      * @return true
      */
-    public function fail(string $transfer_no, array $params = []){
+    public function fail(string $transfer_no, array $params = [])
+    {
         $transfer = $this->findTransferByTransferNo($transfer_no);
 
         if ($transfer->isEmpty()) throw new PayException('TRANSFER_ORDER_INVALID');
@@ -260,7 +269,8 @@ class CoreTransferService extends BaseCoreService
     }
 
 
-    public function check(array $data){
+    public function check(array $data)
+    {
         $transfer_no = $data[ 'transfer_no' ];
         $transfer = $this->findTransferByTransferNo($transfer_no);
         if ($transfer->isEmpty()) throw new PayException('TRANSFER_ORDER_INVALID');
@@ -292,7 +302,8 @@ class CoreTransferService extends BaseCoreService
      * @param $type
      * @return true
      */
-    public function dealing($transfer_no, $status){
+    public function dealing($transfer_no, $status)
+    {
         $this->model->where([
             [ 'transfer_no', '=', $transfer_no ]
         ])->update(
@@ -330,10 +341,10 @@ class CoreTransferService extends BaseCoreService
      * @param string $transfer_no
      * @return void
      */
-    public function cancel(string $transfer_no){
+    public function cancel(string $transfer_no)
+    {
 
         try {
-            $transfer_no = $transfer_no;
             $transfer = $this->findTransferByTransferNo($transfer_no);
             if ($transfer->isEmpty()) throw new PayException('TRANSFER_ORDER_INVALID');
             if (!in_array($transfer[ 'transfer_status' ], [ TransferDict::WAIT, TransferDict::DEALING, TransferDict::FAIL, TransferDict::WAIT_USER, TransferDict::WAIT_USER_ING, TransferDict::FAIL_ING ])) throw new PayException('TRANFER_IS_CHANGE');//只有待转账和转账中的订单可以校验
@@ -348,11 +359,9 @@ class CoreTransferService extends BaseCoreService
             }
             return true;
         } catch (Throwable $e) {
-
             throw new PayException($e->getMessage());
         }
 
     }
 
-
 }

niucloud/app/service/core/verify/CoreVerifyService.php

@@ -72,10 +72,23 @@ class CoreVerifyService extends BaseCoreService
      * @param string $verify_code
      * @return array
      */
-    public function getInfoByCode(string $verify_code)
+    public function getInfoByCode(string $member_id, $verify_code)
     {
         //获取核销码数据
         $value = $this->getCodeData($verify_code);
+        $data = event('VerifyCheck', $value);
+        if (!empty($data)) {
+            $value = end($data);
+        }
+
+        // 检测核销员身份，是否有核销权限
+        $verifier = ( new Verifier() )->where([ [ 'member_id', '=', $member_id ] ])->field('id,verify_type')->findOrEmpty()->toArray();
+        if (!empty($verifier)) {
+            if (!in_array($value[ 'type' ], $verifier[ 'verify_type' ])) {
+                throw new CommonException('VERIFIER_NOT_AUTH');
+            }
+        }
+
         return $value;
     }
 
@@ -109,7 +122,6 @@ class CoreVerifyService extends BaseCoreService
         //是核销码失效
         $this->clearCode($verify_code);
 
-
         return true;
     }
 

niucloud/app/service/core/weapp/CoreWeappCloudService.php

@@ -14,6 +14,7 @@ namespace app\service\core\weapp;
 use app\dict\sys\CloudDict;
 use app\model\addon\Addon;
 use app\model\weapp\WeappVersion;
+use app\service\api\diy\DiyConfigService;
 use app\service\core\addon\CoreAddonDevelopDownloadService;
 use app\service\core\addon\WapTrait;
 use app\service\core\niucloud\CoreCloudBaseService;
@@ -44,7 +45,8 @@ class CoreWeappCloudService extends CoreCloudBaseService
      * 上传小程序
      * @param $addon
      */
-    public function uploadWeapp(array $data) {
+    public function uploadWeapp(array $data)
+    {
         if (!request()->isSsl()) throw new CommonException('CURR_SITE_IS_NOT_OPEN_SSL');
 
         $config = ( new CoreWeappConfigService() )->getWeappConfig();
@@ -65,6 +67,7 @@ class CoreWeappCloudService extends CoreCloudBaseService
         // 如果不存在编译版小程序
         if ($compile_addon->isEmpty()) {
             dir_copy($this->root_path . 'uni-app', $uni_dir, exclude_dirs: [ 'node_modules', 'unpackage', 'dist' ]);
+//            $this->handleTabbar($uni_dir . DIRECTORY_SEPARATOR . 'src' . DIRECTORY_SEPARATOR);
             // 替换env文件
             $this->weappEnvReplace($uni_dir . DIRECTORY_SEPARATOR . '.env.production');
         } else {
@@ -106,12 +109,49 @@ class CoreWeappCloudService extends CoreCloudBaseService
         return [ 'key' => $query[ 'timestamp' ] ];
     }
 
+    /**
+     * 处理底部导航
+     * @param $compile_path
+     * @return void
+     */
+    public function handleTabbar($compile_path)
+    {
+        $bottomList = array_column(( new DiyConfigService() )->getBottomList(), null, 'key');
+        $tabbarList = [];
+        foreach ($bottomList as $app_item) {
+            array_push($tabbarList, ...$app_item[ 'value' ][ 'list' ]);
+        }
+
+        $tabbarList = array_map(function ($item) {
+            $link = array_filter(explode('/', $item[ 'link' ][ 'url' ]));
+            $item[ 'link' ] = $item[ 'link' ][ 'url' ];
+            $item[ 'component' ] = implode('-', $link);
+            $item[ 'name' ] = lcfirst(implode('', array_map(function ($str) {
+                return ucfirst($str);
+            }, $link)));
+            return $item;
+        }, $tabbarList);
+        $tabbarList = array_column($tabbarList, null, 'name');
+
+        if (isset($tabbarList[ 'appPagesIndexIndex' ])) unset($tabbarList[ 'appPagesIndexIndex' ]);
+        if (isset($tabbarList[ 'appPagesMemberIndex' ])) unset($tabbarList[ 'appPagesMemberIndex' ]);
+
+        // 处理vue文件
+        $tpl = str_replace('/', DIRECTORY_SEPARATOR, public_path() . 'static/tpl/tabbar.tpl');
+        $content = view($tpl, [ 'tabbarList' => $tabbarList ])->getContent();
+        file_put_contents(str_replace('/', DIRECTORY_SEPARATOR, $compile_path . 'app/pages/index/tabbar.vue'), $content);
+
+        // 处理tabbar.json
+        file_put_contents($compile_path . 'tabbar.json', json_encode(array_column($tabbarList, 'link'), JSON_UNESCAPED_SLASHES | JSON_PRETTY_PRINT));
+    }
+
     /**
      * 小程序上传env文件处理
      * @param string $env_file
      * @return void
      */
-    private function weappEnvReplace(string $env_file) {
+    private function weappEnvReplace(string $env_file)
+    {
         $env = file_get_contents($env_file);
         $env = str_replace("VITE_APP_BASE_URL=''", "VITE_APP_BASE_URL='" . (string) url('/api/', [], '', true) . "'", $env);
         $env = str_replace("VITE_IMG_DOMAIN=''", "VITE_IMG_DOMAIN='" . (string) url('/', [], '', true) . "'", $env);
@@ -123,7 +163,8 @@ class CoreWeappCloudService extends CoreCloudBaseService
      * @param string $vendor_file
      * @return void
      */
-    private function weappCompileReplace(string $path) {
+    private function weappCompileReplace(string $path)
+    {
         // 替换request.js
         $request_file = $path . DIRECTORY_SEPARATOR . 'utils' . DIRECTORY_SEPARATOR . 'request.js';
         $content = file_get_contents($request_file);
@@ -141,7 +182,8 @@ class CoreWeappCloudService extends CoreCloudBaseService
      * 获取微信小程序预览码
      * @return void
      */
-    public function getWeappPreviewImage() {
+    public function getWeappPreviewImage()
+    {
         $query = [
             'authorize_code' => $this->auth_code,
         ];
@@ -161,7 +203,8 @@ class CoreWeappCloudService extends CoreCloudBaseService
      * @param string $timestamp
      * @return void
      */
-    public function getWeappCompileLog(string $timestamp) {
+    public function getWeappCompileLog(string $timestamp)
+    {
         $query = [
             'authorize_code' => $this->auth_code,
             'timestamp' => $timestamp

niucloud/app/service/core/weapp/CoreWeappDeliveryService.php

@@ -102,6 +102,9 @@ class CoreWeappDeliveryService extends BaseCoreService
 
             Log::write('发货信息录入接口，参数打印：' . json_encode($data));
 
+            //微信订单录入有时差 延时3秒执行发货通知
+            sleep(3);
+
             $api = CoreWeappService::appApiClient();
             $result = $api->postJson('wxa/sec/order/upload_shipping_info', $data)->toArray();
 
@@ -149,6 +152,9 @@ class CoreWeappDeliveryService extends BaseCoreService
 
             Log::write('确认收货提醒接口，参数打印：' . json_encode($data));
 
+            //微信订单录入有时差 延时3秒执行发货通知
+            sleep(3);
+
             $api = CoreWeappService::appApiClient();
 
             $result = $api->postJson('wxa/sec/order/notify_confirm_receive', $data)->toArray();
@@ -167,7 +173,7 @@ class CoreWeappDeliveryService extends BaseCoreService
      * 1、如设置为空路径或小程序中不存在的路径，将仍然跳转平台默认的确认收货页面，不会进入你的小程序。
      * 2、平台会在路径后面增加支付单的 transaction_id、merchant_id、merchant_trade_no 作为query参数，如果存在二级商户号则还会再增加 sub_merchant_id 参数,开发者可以在小程序中通过onLaunch等方式获取。
      * 3、如你需要在path中携带自定义的query参数，请注意与上面的参数进行区分
-     * @param int $type
+     * @param string $type
      * @return mixed
      * @throws InvalidArgumentException
      */

niucloud/app/service/core/weapp/CoreWeappService.php

@@ -86,7 +86,7 @@ class CoreWeappService extends BaseCoreService
         ]);
         if ($response->isFailed()) {
             // 出错了，处理异常
-            throw new CommonException('WECHAT_MINI_PROGRAM_CODE_GENERATION_FAILED');
+            throw new CommonException('微信小程序码生成失败：errcode:' . $response[ 'errcode' ] . 'errmsg:' . $response[ 'errmsg' ]);
         }
         $response->saveAs($filepath);
         return $filepath;

niucloud/app/upgrade/v152/Upgrade.php

@@ -423,6 +423,7 @@ class Upgrade
                 }
             }
         }
+        try {
             if (!empty($data)) {
                 $diy_theme_model = new DiyTheme();
                 foreach ($data as $k => &$v) {
@@ -437,6 +438,8 @@ class Upgrade
                 }
                 $diy_theme_model->insertAll($data);
             }
+        } catch (\Exception $e) {
+        }
         return true;
     }
 

niucloud/app/upgrade/v153/upgrade.sql

@@ -0,0 +1,48 @@
+
+ALTER TABLE `web_friendly_link` MODIFY COLUMN link_title VARCHAR (100) NOT NULL DEFAULT '' COMMENT '标题';
+
+ALTER TABLE `web_friendly_link` MODIFY COLUMN link_url VARCHAR (100) NOT NULL DEFAULT '' COMMENT '链接';
+
+ALTER TABLE `web_friendly_link` MODIFY COLUMN link_pic VARCHAR (100) NOT NULL DEFAULT '' COMMENT '图片';
+
+ALTER TABLE `pay_transfer` CHANGE COLUMN `extra` `extra` VARCHAR (1000) NOT NULL DEFAULT '' COMMENT '扩展信息';
+
+DROP TABLE IF EXISTS `sys_backup_records`;
+CREATE TABLE `sys_backup_records`
+(
+    `id`            INT(11) NOT NULL AUTO_INCREMENT COMMENT '主键id',
+    `version`       VARCHAR(255) NOT NULL DEFAULT '' COMMENT '备份版本号',
+    `backup_key`    VARCHAR(255) NOT NULL DEFAULT '' COMMENT '备份标识',
+    `content`       VARCHAR(255) NOT NULL DEFAULT '' COMMENT '备份内容',
+    `status`        VARCHAR(255) NOT NULL DEFAULT '' COMMENT '状态',
+    `fail_reason`   LONGTEXT              DEFAULT NULL COMMENT '失败原因',
+    `remark`        VARCHAR(500) NOT NULL DEFAULT '' COMMENT '备注',
+    `create_time`   INT(11) NOT NULL DEFAULT 0 COMMENT '创建时间',
+    `complete_time` INT(11) NOT NULL DEFAULT 0 COMMENT '完成时间',
+    PRIMARY KEY (`id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE utf8mb4_general_ci COMMENT='备份记录表';
+
+DROP TABLE IF EXISTS `sys_upgrade_records`;
+CREATE TABLE `sys_upgrade_records`
+(
+    `id`              INT(11) NOT NULL AUTO_INCREMENT COMMENT '主键id',
+    `upgrade_key`     VARCHAR(255) NOT NULL DEFAULT '' COMMENT '升级标识',
+    `app_key`         VARCHAR(255) NOT NULL DEFAULT '' COMMENT '插件标识',
+    `name`            VARCHAR(255) NOT NULL DEFAULT '' COMMENT '升级名称',
+    `content`         LONGTEXT DEFAULT NULL COMMENT '升级内容',
+    `prev_version`    VARCHAR(255) NOT NULL DEFAULT '' COMMENT '前一版本',
+    `current_version` VARCHAR(255) NOT NULL DEFAULT '' COMMENT '当前版本',
+    `status`          VARCHAR(255) NOT NULL DEFAULT '' COMMENT '状态',
+    `fail_reason`     LONGTEXT              DEFAULT NULL COMMENT '失败原因',
+    `create_time`     INT(11) NOT NULL DEFAULT 0 COMMENT '创建时间',
+    `complete_time`   INT(11) NOT NULL DEFAULT 0 COMMENT '完成时间',
+    PRIMARY KEY (`id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE utf8mb4_general_ci COMMENT='升级记录表';
+
+ALTER TABLE `pay` MODIFY COLUMN `money` DECIMAL (10, 2) NOT NULL DEFAULT 0.00 COMMENT '支付金额';
+
+ALTER TABLE `jobs` MODIFY COLUMN `queue` VARCHAR (255) NOT NULL DEFAULT '';
+
+ALTER TABLE `diy_form_submit_config` MODIFY COLUMN `tips_type` VARCHAR (255) NOT NULL DEFAULT '' COMMENT '提示内容类型，default：默认提示，diy：自定义提示';
+
+ALTER TABLE `diy_theme` CHANGE COLUMN `title` `title` VARCHAR(255) NOT NULL DEFAULT '' COMMENT '标题';

niucloud/app/validate/member/CashOutConfig.php

@@ -26,7 +26,7 @@ class CashOutConfig extends Validate
         'rate' => 'between:0,100',      //提现手续费比率
         'is_auto_verify' => 'in:0,1',  //是否自动审核
         'is_auto_transfer' => 'in:0,1',  //是否自动转账
-        'transfer_type' => 'require',
+        'transfer_type' => 'requireIf:is_open,1',
     ];
 
     protected $message = [

niucloud/config/version.php

@@ -1,6 +1,6 @@
 <?php
 
 return [
-    'version' => '1.5.2',
-    'code' => '2025031402'
+    'version' => '1.5.3',
+    'code' => '2025052201'
 ];

niucloud/core/dict/PackageGift.php

@@ -1 +0,0 @@
-// | 官方网址：https://www.niucloud.com

niucloud/core/exception/CloudBuildException.php

@@ -0,0 +1,18 @@
+<?php
+
+namespace core\exception;
+
+use RuntimeException;
+use Throwable;
+
+/**
+ * 平台管理端错误异常处理类
+ */
+class CloudBuildException extends RuntimeException
+{
+    public function __construct($message = "", $code = 0, Throwable $previous = null)
+    {
+
+        parent::__construct($message, $code, $previous);
+    }
+}

niucloud/core/pay/Wechatpay.php

@@ -493,7 +493,6 @@ class Wechatpay extends BasePay
             '_action' => 'refund',
             'transaction_id' => $out_trade_no,
             'out_refund_no' => $refund_no,
-            ''
         ];
         $result = Pay::wechat()->query($order);
         if (empty($result))

niucloud/core/util/DbBackup.php

@@ -1,532 +1,216 @@
 <?php
-
 namespace core\util;
 
+use think\facade\Cache;
 use think\facade\Db;
 
 class DbBackup
 {
-    /**
-     * 文件指针
-     * @var resource
-     */
-    private $fp;
-    /**
-     * 备份文件信息 part - 卷号，name - 文件名
-     * @var array
-     */
-    private $file;
-    /**
-     * 当前打开文件大小
-     * @var integer
-     */
-    private $size = 0;
+    private $key;
+    private $backupPath;
+    private $maxFileSize;
+    private $currentFileIndex = 1;
+    private $currentFile;
+    private $currentFileSize = 0;
+    private $tableOffset = [];
+    private $tables = [];
+    private $excludeTables = [];
+    private $totalTables;
+    private $processedTables = 0;
+    private $restoreIndex = 0;
 
-    /**
-     * 数据库配置
-     * @var integer
-     */
-    private $dbconfig = array();
-    /**
-     * 备份配置
-     * @var integer
-     */
-    private $config = array(
-        // 数据库备份路径
-        'path'     => './backup/',
-        // 数据库备份卷大小
-        'part'     => 20971520,
-        // 数据库备份文件是否启用压缩 0不压缩 1 压缩
-        'compress' => 0,
-        // 数据库备份文件压缩级别 1普通 4 一般  9最高
-        'level'    => 9,
-    );
+    private $startime = 0;
 
-    /**
-     * 数据库备份构造方法
-     * @param  array  $file  备份或还原的文件信息
-     * @param  array  $config  备份配置信息
-     */
-    public function __construct($config = [])
+    private $maxExecuteTime = 10;
+
+    public function __construct($backupPath, $maxFileSize = 1024 * 1024, $excludeTables = [], $key = '')
     {
-        $this->config = is_array($config) && !empty($config) ? array_merge($this->config, $config) : $this->config;
-        //初始化文件名
-        $this->setFile();
-        //初始化数据库连接参数
-        $this->setDbConn();
-        //检查文件是否可写
-        if (!$this->checkPath($this->config['path'])) {
-            throw new \Exception("The current directory is not writable");
+        $this->key = $key;
+        $cache = $this->getCache();
+        $this->backupPath = $backupPath;
+        $this->maxFileSize = $maxFileSize;
+        $this->excludeTables = $excludeTables;
+        if (!is_dir($this->backupPath)) {
+            mkdir($this->backupPath, 0777, true);
         }
+        $this->currentFileIndex = $cache['currentFileIndex'] ?? 0;
+        $this->currentFile = $this->backupPath . '/backup_' . $this->currentFileIndex . '.sql';
+        $this->tables = $cache['tables'] ?? [];
+        $this->totalTables = count($this->getAllTables());
+        $this->processedTables = $cache['processedTables'] ?? 0;
+        $this->tableOffset = $cache['tableOffset'] ?? [];
+        $this->currentFileSize = $cache['currentFileSize'] ?? 0;
+        $this->restoreIndex = $cache['restoreIndex'] ?? 0;
+        $this->startime = time();
     }
 
-    /**
-     * 设置脚本运行超时时间
-     * 0表示不限制，支持连贯操作
-     */
-    public function setTimeout($time = null)
-    {
-        if (!is_null($time)) {
-            set_time_limit($time) || ini_set("max_execution_time", $time);
+    private function getCache() {
+        $cache = Cache::get('db_backup_' . $this->key, []);
+        return $cache;
     }
+
+    private function setCache() {
+        $cache = [
+            'currentFileIndex' => $this->currentFileIndex,
+            'processedTables' => $this->processedTables,
+            'tableOffset' => $this->tableOffset,
+            'currentFileSize' => $this->currentFileSize,
+            'restoreIndex' => $this->restoreIndex,
+            'tables' => $this->tables
+        ];
+        Cache::set('db_backup_' . $this->key, $cache, 3600);
+    }
+
+    public function setExcludeTables($tables) {
+        $this->tables = [];
+        $this->excludeTables = $tables;
+        $this->totalTables = count($this->getAllTables());
         return $this;
     }
 
-    /**
-     * 设置数据库连接必备参数
-     * @param  array  $dbconfig  数据库连接配置信息
-     * @return object
-     */
-    public function setDbConn($dbconfig = [])
+    public function backupDatabaseSegment($limit = 1000)
     {
-        if (empty($dbconfig)) {
-            $this->dbconfig = config('database.connections.'.config('database.default'));
-        } else {
-            $this->dbconfig = $dbconfig;
-        }
-        return $this;
+        $tables = array_slice($this->getAllTables(), $this->processedTables);
+        if (!empty($tables)) {
+            foreach ($tables as $table) {
+                if (!isset($this->tableOffset[$table])) {
+                    $this->tableOffset[$table] = 0;
+                    $this->backupTableStructure($table);
                 }
 
-    /**
-     * 设置备份文件名
-     *
-     * @param  Array  $file  文件名字
-     * @return object
-     */
-    public function setFile($file = null)
-    {
-        if (is_null($file)) {
-            $this->file = ['name' => date('Ymd-His'), 'part' => 1];
-        } else {
-            if (!array_key_exists("name", $file) && !array_key_exists("part", $file)) {
-                $this->file = $file['1'];
-            } else {
-                $this->file = $file;
-            }
-        }
-        return $this;
-    }
-
-    /**
-     * 数据库表列表
-     *
-     * @param  null  $table
-     * @param  int  $type
-     * @return array
-     */
-    public function dataList($table = null, $type = 1)
-    {
-        if (is_null($table)) {
-            $list = Db::query("SHOW TABLE STATUS");
-        } else {
-            if ($type) {
-                $list = Db::query("SHOW FULL COLUMNS FROM {$table}");
-            } else {
-                $list = Db::query("show columns from {$table}");
-            }
-        }
-
-        return array_map('array_change_key_case', $list);
-    }
-
-    /**
-     * 数据库备份文件列表
-     *
-     * @return array
-     */
-    public function fileList()
-    {
-        if (!is_dir($this->config['path'])) {
-            mkdir($this->config['path'], 0755, true);
-        }
-        $path = realpath($this->config['path']);
-        $flag = \FilesystemIterator::KEY_AS_FILENAME;
-        $glob = new \FilesystemIterator($path, $flag);
-        $list = array();
-        foreach ($glob as $name => $file) {
-            if (preg_match('/^\\d{8,8}-\\d{6,6}-\\d+\\.sql(?:\\.gz)?$/', $name)) {
-                $name1 = $name;
-                $name  = sscanf($name, '%4s%2s%2s-%2s%2s%2s-%d');
-                $date  = "{$name[0]}-{$name[1]}-{$name[2]}";
-                $time  = "{$name[3]}:{$name[4]}:{$name[5]}";
-                $part  = $name[6];
-                if (isset($list["{$date} {$time}"])) {
-                    $info         = $list["{$date} {$time}"];
-                    $info['part'] = max($info['part'], $part);
-                    $info['size'] = $info['size'] + $file->getSize();
-                } else {
-                    $info['part'] = $part;
-                    $info['size'] = $file->getSize();
-                }
-                $extension               = strtoupper(pathinfo($file->getFilename(), PATHINFO_EXTENSION));
-                $info['name']            = $name1;
-                $info['compress']        = $extension === 'SQL' ? '-' : $extension;
-                $info['time']            = strtotime("{$date} {$time}");
-                $list["{$date} {$time}"] = $info;
-            }
-        }
-        return $list;
-    }
-
-    /**
-     * 获取文件名称
-     *
-     * @param  string  $type
-     * @param  int  $time
-     * @return array|false|mixed|string
-     * @throws \Exception
-     */
-    public function getFile($type = '', $time = 0)
-    {
-        //
-        if (!is_numeric($time)) {
-            throw new \Exception("{$time} Illegal data type");
-        }
-        switch ($type) {
-            case 'time':
-                $name = date('Ymd-His', $time).'-*.sql*';
-                $path = realpath($this->config['path']).DIRECTORY_SEPARATOR.$name;
-                return glob($path);
+                while (true) {
+                    $data = Db::table($table)->limit($this->tableOffset[$table], $limit)->select()->toArray();
+                    if (empty($data)) {
                         break;
-            case 'timeverif':
-                $name  = date('Ymd-His', $time).'-*.sql*';
-                $path  = realpath($this->config['path']).DIRECTORY_SEPARATOR.$name;
-                $files = glob($path);
-                $list  = array();
-                foreach ($files as $name) {
-                    $basename        = basename($name);
-                    $match           = sscanf($basename, '%4s%2s%2s-%2s%2s%2s-%d');
-                    $gz              = preg_match('/^\\d{8,8}-\\d{6,6}-\\d+\\.sql.gz$/', $basename);
-                    $list[$match[6]] = array($match[6], $name, $gz);
                     }
-                $last = end($list);
-                if (count($list) === $last[0]) {
-                    return $list;
-                } else {
-                    throw new \Exception("File {$files['0']} may be damaged, please check again");
-                }
-                break;
-            case 'pathname':
-                return "{$this->config['path']}{$this->file['name']}-{$this->file['part']}.sql";
-                break;
-            case 'filename':
-                return "{$this->file['name']}-{$this->file['part']}.sql";
-                break;
-            case 'filepath':
-                return $this->config['path'];
-                break;
-            default:
-                $arr = array(
-                    'pathname' => "{$this->config['path']}{$this->file['name']}-{$this->file['part']}.sql",
-                    'filename' => "{$this->file['name']}-{$this->file['part']}.sql",
-                    'filepath' => $this->config['path'], 'file' => $this->file
-                );
-                return $arr;
+                    $this->backupTableData($table, $data);
+                    $this->tableOffset[$table] += $limit;
+
+                    if (time() - $this->startime > $this->maxExecuteTime) {
+                        $this->setCache();
+                        return $this->processedTables;
                     }
                 }
 
-    /**
-     * 删除备份文件
-     *
-     * @param $time
-     * @return mixed
-     * @throws \Exception
-     */
-    public function delFile($time)
-    {
-        if ($time) {
-            $file = $this->getFile('time', $time);
-            array_map("unlink", $file);
-            $file = $this->getFile('time', $time);
-            if (count($file)) {
-                throw new \Exception("File ".implode('##', $file)." deleted failed");
-            } else {
-                return $time;
-            }
-        } else {
-            throw new \Exception("{$time} Time parameter is incorrect");
-        }
+                if (time() - $this->startime > $this->maxExecuteTime) {
+                    $this->setCache();
+                    return $this->processedTables;
                 }
 
-    /**
-     * 下载备份
-     *
-     * @param  string  $time
-     * @param  integer  $part
-     * @return array|mixed|string
-     */
-    public function downloadFile($time, $part = 0)
-    {
-        $file     = $this->getFile('time', $time);
-        $fileName = $file[$part];
-        if (file_exists($fileName)) {
-            ob_end_clean();
-            header("Cache-Control: must-revalidate, post-check=0, pre-check=0");
-            header('Content-Description: File Transfer');
-            header('Content-Type: application/octet-stream');
-            header('Content-Length: '.filesize($fileName));
-            header('Content-Disposition: attachment; filename='.basename($fileName));
-            readfile($fileName);
-        } else {
-            throw new \Exception("{$time} File is abnormal");
+                $this->processedTables++;
             }
         }
-
-    public function setSqlMode() {
-        Db::query("SET sql_mode = '';");
         return true;
     }
 
-    /**
-     * 导入表
-     *
-     * @param $start
-     * @param $time
-     * @return array|false|int
-     * @throws Exception
-     */
-    public function import($start, $time)
+    public function getBackupProgress() {
+        return round($this->processedTables / $this->totalTables * 100);
+    }
+
+    private function backupTableStructure($table)
     {
-        //还原数据
-        $this->file = $this->getFile('time', $time);
-        if ($this->config['compress']) {
-            $gz   = gzopen($this->file[0], 'r');
-            $size = 0;
-        } else {
-            $size = filesize($this->file[0]);
-            $gz   = fopen($this->file[0], 'r');
+        $dropTableQuery = "DROP TABLE IF EXISTS `$table`;\n";
+        $dropLength = strlen($dropTableQuery);
+        if ($this->currentFileSize + $dropLength > $this->maxFileSize) {
+            $this->startNewFile();
         }
-        $sql = '';
-        if ($start) {
-            $this->config['compress'] ? gzseek($gz, $start) : fseek($gz, $start);
+        $fp = fopen($this->currentFile, 'a');
+        fwrite($fp, $dropTableQuery);
+        $this->currentFileSize += $dropLength;
+
+        $createTableQuery = $this->getTableCreateQuery($table);
+        $query = $createTableQuery . ";\n";
+        $queryLength = strlen($query);
+        if ($this->currentFileSize + $queryLength > $this->maxFileSize) {
+            $this->startNewFile();
+            $fp = fopen($this->currentFile, 'a');
         }
-        for ($i = 0; $i < 1000; $i++) {
-            $sql .= $this->config['compress'] ? gzgets($gz) : fgets($gz);
-            if (preg_match('/.*;$/', trim($sql))) {
-                if (false !== Db::query($sql)) {
-                    $start += strlen($sql);
-                } else {
-                    return false;
-                }
-                $sql = '';
-            } elseif ($this->config['compress'] ? gzeof($gz) : feof($gz)) {
-                return 0;
-            }
-        }
-        return array($start, $size);
+        fwrite($fp, $query);
+        fclose($fp);
+        $this->currentFileSize += $queryLength;
     }
 
-    /**
-     * 写入初始数据
-     *
-     * @return boolean true - 写入成功，false - 写入失败
-     */
-    public function backupInit()
+    private function backupTableData($table, $data)
     {
-        $sql = "-- -----------------------------\n";
-        $sql .= "-- Think MySQL Data Transfer \n";
-        $sql .= "-- \n";
-        $sql .= "-- Host     : ".$this->dbconfig['hostname']."\n";
-        $sql .= "-- Port     : ".$this->dbconfig['hostport']."\n";
-        $sql .= "-- Database : ".$this->dbconfig['database']."\n";
-        $sql .= "-- \n";
-        $sql .= "-- Part : #{$this->file['part']}\n";
-        $sql .= "-- Date : ".date("Y-m-d H:i:s")."\n";
-        $sql .= "-- -----------------------------\n\n";
-        $sql .= "SET FOREIGN_KEY_CHECKS = 0;\n\n";
-        return $this->write($sql);
+        $columns = implode(', ', array_map(function ($column){
+            return "`{$column}`";
+        }, array_keys($data[0])));
+        $valueSets = [];
+        foreach ($data as $row) {
+            $values = [];
+            foreach ($row as $value) {
+                if (is_int($value)) {
+                    $values[] = (string)$value; // 整数类型直接转换为字符串
+                } elseif (is_float($value)) {
+                    $values[] = (string)$value; // 浮点数类型直接转换为字符串
+                } elseif (is_bool($value)) {
+                    $values[] = $value ? '1' : '0'; // 布尔类型转换为 1 或 0
+                } elseif (is_null($value)) {
+                    $values[] = 'NULL'; // 空值使用 NULL
+                } else {
+                    $values[] = Db::getPdo()->quote($value); // 其他类型使用 quote 方法处理
+                }
+            }
+            $valueSets[] = '(' . implode(', ', $values) . ')';
+        }
+        $insertQuery = "INSERT INTO `$table` ($columns) VALUES\n" . implode(",\n", $valueSets) . ";\n";
+        $queryLength = strlen($insertQuery);
+        if ($this->currentFileSize + $queryLength > $this->maxFileSize) {
+            $this->startNewFile();
+        }
+        $fp = fopen($this->currentFile, 'a');
+        fwrite($fp, $insertQuery);
+        fclose($fp);
+        $this->currentFileSize += $queryLength;
     }
 
-    /**
-     * 查询单条
-     * @param $sql
-     * @return array|mixed
-     */
-    public function selectOne($sql) {
-        $result = Db::query($sql);
-        return $result[0] ?? [];
-    }
-
-    /**
-     * 备份表结构
-     *
-     * @param  string  $table  表名
-     * @param  integer  $start  起始行数
-     * @return boolean        false - 备份失败
-     */
-    public function backup($table, $start = 0)
+    private function getAllTables()
     {
-        // 备份表结构
-        if (0 == $start) {
-            $result = $this->selectOne("SHOW CREATE TABLE `{$table}`");
-            $sql = "\n";
-            $sql .= "-- -----------------------------\n";
-            $sql .= "-- Table structure for `{$table}`\n";
-            $sql .= "-- -----------------------------\n";
-            $sql .= "DROP TABLE IF EXISTS `{$table}`;\n";
-            $sql .= trim($result['Create Table']).";\n\n";
-            if (false === $this->write($sql)) {
-                return false;
+        if (!empty($this->tables)) return $this->tables;
+
+        $tables = Db::query('SHOW TABLES');
+        $this->tables = [];
+        foreach ($tables as $table) {
+            $table_name = current($table);
+            if (in_array($table_name, $this->excludeTables)) {
+                continue;
             }
+            $this->tables[] = $table_name;
         }
-        //数据总数
-        $result = $this->selectOne("SELECT COUNT(*) AS count FROM `{$table}`");
-        $count  = $result['count'];
-        //备份表数据
-        if ($count) {
-            //写入数据注释
-            if (0 == $start) {
-                $sql = "-- -----------------------------\n";
-                $sql .= "-- Records of `{$table}`\n";
-                $sql .= "-- -----------------------------\n";
-                $this->write($sql);
-            }
-            //备份数据记录
-            $result = Db::query("SELECT * FROM `{$table}` LIMIT {$start}, 1000");
-            $sql = "INSERT INTO `{$table}` VALUES\n";
-            foreach ($result as $index => $row) {
-                $row = array_map(function ($item){
-                    return is_string($item) ? addslashes($item) : $item;
-                }, $row);
-                $sql .= "('".str_replace(array("\r", "\n"), array('\\r', '\\n'),
-                        implode("', '", $row))."')";
-                $sql .= $index < (count($result) - 1) ? ",\n" : ";\n";
+        return $this->tables;
     }
 
-            if (false === $this->write($sql)) {
-                return false;
-            }
-            //还有更多数据
-            if ($count > $start + 1000) {
-                return $this->backup($table, $start + 1000);
-            }
-        }
-        //备份下一表
-        return true;
-    }
-
-    /**
-     * 优化表
-     *
-     * @param  String  $tables  表名
-     * @return String $tables
-     */
-    public function optimize($tables = null)
+    private function getTableCreateQuery($tableName)
     {
-        if ($tables) {
-            if (is_array($tables)) {
-                $tables = implode('`,`', $tables);
-                $list   = db ::select("OPTIMIZE TABLE `{$tables}`");
-            } else {
-                $list = Db::query("OPTIMIZE TABLE `{$tables}`");
-            }
-            if ($list) {
-                return $tables;
-            } else {
-                throw new \Exception("data sheet'{$tables}'Repair mistakes please try again!");
-            }
-        } else {
-            throw new \Exception("Please specify the table to be repaired!");
-        }
+        $result = Db::query("SHOW CREATE TABLE $tableName");
+        return $result[0]['Create Table'];
     }
 
-    /**
-     * 修复表
-     *
-     * @param  String  $tables  表名
-     * @return String $tables
-     */
-    public function repair($tables = null)
+    private function startNewFile()
     {
-        if ($tables) {
-            if (is_array($tables)) {
-                $tables = implode('`,`', $tables);
-                $list   = Db::query("REPAIR TABLE `{$tables}`");
-            } else {
-                $list = Db::query("REPAIR TABLE `{$tables}`");
-            }
-            if ($list) {
-
-                return $list;
-            } else {
-                throw new \Exception("data sheet'{$tables}'Repair mistakes please try again!");
-            }
-        } else {
-            throw new \Exception("Please specify the table to be repaired!");
-        }
+        $this->currentFileIndex++;
+        $this->currentFile = $this->backupPath . '/backup_' . $this->currentFileIndex . '.sql';
+        $this->currentFileSize = 0;
     }
 
-    /**
-     * 写入SQL语句
-     *
-     * @param  string  $sql  要写入的SQL语句
-     * @return boolean     true - 写入成功，false - 写入失败！
-     */
-    private function write($sql)
+    public function restoreDatabase()
     {
-        $size = strlen($sql);
-        //由于压缩原因，无法计算出压缩后的长度，这里假设压缩率为50%，
-        //一般情况压缩率都会高于50%；
-        $size = $this->config['compress'] ? $size / 2 : $size;
-        $this->open($size);
-        return $this->config['compress'] ? @gzwrite($this->fp, $sql) : @fwrite($this->fp, $sql);
-    }
+        $backupFiles = glob($this->backupPath . '/backup_*.sql');
+        natsort($backupFiles);
+        $backupFiles = array_values($backupFiles);
 
-    /**
-     * 打开一个卷，用于写入数据
-     *
-     * @param  integer  $size  写入数据的大小
-     */
-    private function open($size)
-    {
-        if ($this->fp) {
-            $this->size += $size;
-            if ($this->size > $this->config['part']) {
-                $this->config['compress'] ? @gzclose($this->fp) : @fclose($this->fp);
-                $this->fp = null;
-                $this->file['part']++;
-                session('backup_file', $this->file);
-                $this->backupInit();
-            }
-        } else {
-            $backuppath = $this->config['path'];
-            $filename   = "{$backuppath}{$this->file['name']}-{$this->file['part']}.sql";
-            if ($this->config['compress']) {
-                $filename = "{$filename}.gz";
-                $this->fp = @gzopen($filename, "a{$this->config['level']}");
-            } else {
-                $this->fp = @fopen($filename, 'a');
-            }
-            $this->size = filesize($filename) + $size;
-        }
-    }
+        if ($this->restoreIndex >= count($backupFiles)) return true;
+        $backupFile = $backupFiles[$this->restoreIndex];
 
-    /**
-     * 检查目录是否可写
-     *
-     * @param  string  $path  目录
-     * @return boolean
-     */
-    protected function checkPath($path)
-    {
-        if (is_dir($path)) {
-            return true;
-        }
-        if (mkdir($path, 0755, true)) {
-            return true;
-        } else {
-            return false;
+        $sql = file_get_contents($backupFile);
+        $queries = explode(";\n", $sql);
+        foreach ($queries as $query) {
+            if (trim($query) !== '') {
+                Db::execute($query);
             }
         }
-
-    /**
-     * 析构方法，用于关闭文件资源
-     */
-    public function __destruct()
-    {
-        if ($this->fp) {
-            $this->config['compress'] ? @gzclose($this->fp) : @fclose($this->fp);
+        $this->restoreIndex++;
+        $this->setCache();
+        return $this->restoreIndex;
     }
 }
-
-}