diff --git a/app/admin/service/curd/templates/controller/controller.code b/app/admin/service/curd/templates/controller/controller.code
deleted file mode 100644
index a9421a9..0000000
--- a/app/admin/service/curd/templates/controller/controller.code
+++ /dev/null
@@ -1,30 +0,0 @@
-model = new {{modelFilename}}();
- {{selectList}}
- }
-
- {{indexMethod}}
-
-
- {{exportMethod}}
-}
\ No newline at end of file
diff --git a/app/admin/service/curd/templates/controller/exportMethod.code b/app/admin/service/curd/templates/controller/exportMethod.code
deleted file mode 100644
index eef4c7a..0000000
--- a/app/admin/service/curd/templates/controller/exportMethod.code
+++ /dev/null
@@ -1,31 +0,0 @@
-
- /**
- * @NodeAnotation(title="导出")
- */
- public function export()
- {
- list($page, $limit, $where) = $this->buildTableParames();
-
-
- $this->model = $this->model{{relationIndexMethod}};
-
- $fields = $this->request->param('fields', '{}', null);
- $image_fields = $this->request->param('image_fields', '{}', null);
- $select_fields = $this->request->param('select_fields', '{}', null);
- $date_fields = $this->request->param('date_fields', '{}', null);
-
- $fields = json_decode($fields, true);
- $image_fields = json_decode($image_fields, true);
- $select_fields = json_decode($select_fields, true);
- $date_fields = json_decode($date_fields, true);
-
- $content = \app\common\tools\ExportTools::excel($this->model, $where, $fields, $image_fields, $select_fields, $date_fields);
-
- $export_file_name = $this->exportFileName;
-
- if (empty($export_file_name)) {
- $export_file_name = $this->model->getName();
- }
-
- return download($content, $export_file_name . date('YmdHis') . '.xlsx', true);
- }
\ No newline at end of file
diff --git a/app/admin/service/curd/templates/controller/indexMethod.code b/app/admin/service/curd/templates/controller/indexMethod.code
deleted file mode 100644
index d1a6724..0000000
--- a/app/admin/service/curd/templates/controller/indexMethod.code
+++ /dev/null
@@ -1,31 +0,0 @@
-
- /**
- * @NodeAnotation(title="列表")
- */
- public function index()
- {
- if ($this->request->isAjax()) {
- if (input('selectFields')) {
- return $this->selectList();
- }
- list($page, $limit, $where) = $this->buildTableParames();
- $count = $this->model
- {{relationIndexMethod}}
- ->where($where)
- ->count();
- $list = $this->model
- {{relationIndexMethod}}
- ->where($where)
- ->page($page, $limit)
- ->order($this->sort)
- ->select();
- $data = [
- 'code' => 0,
- 'msg' => '',
- 'count' => $count,
- 'data' => $list,
- ];
- return json($data);
- }
- return $this->fetch();
- }
\ No newline at end of file
diff --git a/app/admin/service/curd/templates/controller/select.code b/app/admin/service/curd/templates/controller/select.code
deleted file mode 100644
index ac7ddda..0000000
--- a/app/admin/service/curd/templates/controller/select.code
+++ /dev/null
@@ -1,2 +0,0 @@
-
- $this->assign('{{var_name}}', $this->model::{{name}}, true);
diff --git a/app/admin/service/curd/templates/js/_common.code b/app/admin/service/curd/templates/js/_common.code
deleted file mode 100644
index cf96015..0000000
--- a/app/admin/service/curd/templates/js/_common.code
+++ /dev/null
@@ -1,10 +0,0 @@
-var init = {
- table_elem: '#currentTable',
- table_render_id: 'currentTableRenderId',
- index_url: '{{controllerUrl}}/index',
- add_url: '{{controllerUrl}}/add',
- edit_url: '{{controllerUrl}}/edit',
- delete_url: '{{controllerUrl}}/delete',
- export_url: '{{controllerUrl}}/export',
- modify_url: '{{controllerUrl}}/modify',
-};
\ No newline at end of file
diff --git a/app/admin/service/curd/templates/js/add.code b/app/admin/service/curd/templates/js/add.code
deleted file mode 100644
index 4a445e0..0000000
--- a/app/admin/service/curd/templates/js/add.code
+++ /dev/null
@@ -1,3 +0,0 @@
-$(function(){
- ua.listen();
-})
\ No newline at end of file
diff --git a/app/admin/service/curd/templates/js/edit.code b/app/admin/service/curd/templates/js/edit.code
deleted file mode 100644
index 4a445e0..0000000
--- a/app/admin/service/curd/templates/js/edit.code
+++ /dev/null
@@ -1,3 +0,0 @@
-$(function(){
- ua.listen();
-})
\ No newline at end of file
diff --git a/app/admin/service/curd/templates/js/index.code b/app/admin/service/curd/templates/js/index.code
deleted file mode 100644
index 8f4cb8e..0000000
--- a/app/admin/service/curd/templates/js/index.code
+++ /dev/null
@@ -1,10 +0,0 @@
-$(function(){
- ua.table.render({
- init: init,
- cols: [[
- {{indexCols}}
- ]],
- });
-
- ua.listen();
-})
\ No newline at end of file
diff --git a/app/admin/service/curd/templates/model/model.code b/app/admin/service/curd/templates/model/model.code
deleted file mode 100644
index 31dd34c..0000000
--- a/app/admin/service/curd/templates/model/model.code
+++ /dev/null
@@ -1,21 +0,0 @@
-belongsTo('{{relationModel}}', '{{foreignKey}}', '{{primaryKey}}');
- }
diff --git a/app/admin/service/curd/templates/model/select.code b/app/admin/service/curd/templates/model/select.code
deleted file mode 100644
index 574ba95..0000000
--- a/app/admin/service/curd/templates/model/select.code
+++ /dev/null
@@ -1,2 +0,0 @@
-
- public const {{name}} = {{values}};
diff --git a/app/admin/service/curd/templates/view/form.code b/app/admin/service/curd/templates/view/form.code
deleted file mode 100644
index 9e92c33..0000000
--- a/app/admin/service/curd/templates/view/form.code
+++ /dev/null
@@ -1,11 +0,0 @@
-
\ No newline at end of file
diff --git a/app/admin/service/curd/templates/view/index.code b/app/admin/service/curd/templates/view/index.code
deleted file mode 100644
index 5d171c0..0000000
--- a/app/admin/service/curd/templates/view/index.code
+++ /dev/null
@@ -1,13 +0,0 @@
-
\ No newline at end of file
diff --git a/app/admin/service/curd/templates/view/module/checkbox.code b/app/admin/service/curd/templates/view/module/checkbox.code
deleted file mode 100644
index d9f1b1d..0000000
--- a/app/admin/service/curd/templates/view/module/checkbox.code
+++ /dev/null
@@ -1,7 +0,0 @@
-
-
diff --git a/app/admin/service/curd/templates/view/module/checkboxInput.code b/app/admin/service/curd/templates/view/module/checkboxInput.code
deleted file mode 100644
index 3a3bddf..0000000
--- a/app/admin/service/curd/templates/view/module/checkboxInput.code
+++ /dev/null
@@ -1,3 +0,0 @@
- {foreach ${{name}} as $k=>$v}
-
- {/foreach}
\ No newline at end of file
diff --git a/app/admin/service/curd/templates/view/module/city.code b/app/admin/service/curd/templates/view/module/city.code
deleted file mode 100644
index 04df697..0000000
--- a/app/admin/service/curd/templates/view/module/city.code
+++ /dev/null
@@ -1,7 +0,0 @@
-
-
\ No newline at end of file
diff --git a/app/admin/service/curd/templates/view/module/cityMain.code b/app/admin/service/curd/templates/view/module/cityMain.code
deleted file mode 100644
index b118c2d..0000000
--- a/app/admin/service/curd/templates/view/module/cityMain.code
+++ /dev/null
@@ -1 +0,0 @@
-
\ No newline at end of file
diff --git a/app/admin/service/curd/templates/view/module/date.code b/app/admin/service/curd/templates/view/module/date.code
deleted file mode 100644
index 8458b4b..0000000
--- a/app/admin/service/curd/templates/view/module/date.code
+++ /dev/null
@@ -1,7 +0,0 @@
-
-
\ No newline at end of file
diff --git a/app/admin/service/curd/templates/view/module/editor.code b/app/admin/service/curd/templates/view/module/editor.code
deleted file mode 100644
index 11380d0..0000000
--- a/app/admin/service/curd/templates/view/module/editor.code
+++ /dev/null
@@ -1,7 +0,0 @@
-
-
\ No newline at end of file
diff --git a/app/admin/service/curd/templates/view/module/file.code b/app/admin/service/curd/templates/view/module/file.code
deleted file mode 100644
index a045801..0000000
--- a/app/admin/service/curd/templates/view/module/file.code
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
\ No newline at end of file
diff --git a/app/admin/service/curd/templates/view/module/files.code b/app/admin/service/curd/templates/view/module/files.code
deleted file mode 100644
index f343dfe..0000000
--- a/app/admin/service/curd/templates/view/module/files.code
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
\ No newline at end of file
diff --git a/app/admin/service/curd/templates/view/module/image.code b/app/admin/service/curd/templates/view/module/image.code
deleted file mode 100644
index f735437..0000000
--- a/app/admin/service/curd/templates/view/module/image.code
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
\ No newline at end of file
diff --git a/app/admin/service/curd/templates/view/module/images.code b/app/admin/service/curd/templates/view/module/images.code
deleted file mode 100644
index 4bd8de8..0000000
--- a/app/admin/service/curd/templates/view/module/images.code
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
\ No newline at end of file
diff --git a/app/admin/service/curd/templates/view/module/input.code b/app/admin/service/curd/templates/view/module/input.code
deleted file mode 100644
index 7656fcd..0000000
--- a/app/admin/service/curd/templates/view/module/input.code
+++ /dev/null
@@ -1,7 +0,0 @@
-
-
\ No newline at end of file
diff --git a/app/admin/service/curd/templates/view/module/option.code b/app/admin/service/curd/templates/view/module/option.code
deleted file mode 100644
index 7593045..0000000
--- a/app/admin/service/curd/templates/view/module/option.code
+++ /dev/null
@@ -1,4 +0,0 @@
-
- {foreach ${{name}} as $k=>$v}
-
- {/foreach}
\ No newline at end of file
diff --git a/app/admin/service/curd/templates/view/module/radio.code b/app/admin/service/curd/templates/view/module/radio.code
deleted file mode 100644
index d9f1b1d..0000000
--- a/app/admin/service/curd/templates/view/module/radio.code
+++ /dev/null
@@ -1,7 +0,0 @@
-
-
diff --git a/app/admin/service/curd/templates/view/module/radioInput.code b/app/admin/service/curd/templates/view/module/radioInput.code
deleted file mode 100644
index 1a033ec..0000000
--- a/app/admin/service/curd/templates/view/module/radioInput.code
+++ /dev/null
@@ -1,3 +0,0 @@
- {foreach ${{name}} as $k=>$v}
-
- {/foreach}
\ No newline at end of file
diff --git a/app/admin/service/curd/templates/view/module/select.code b/app/admin/service/curd/templates/view/module/select.code
deleted file mode 100644
index c638a79..0000000
--- a/app/admin/service/curd/templates/view/module/select.code
+++ /dev/null
@@ -1,9 +0,0 @@
-
-
\ No newline at end of file
diff --git a/app/admin/service/curd/templates/view/module/table.code b/app/admin/service/curd/templates/view/module/table.code
deleted file mode 100644
index 24ec507..0000000
--- a/app/admin/service/curd/templates/view/module/table.code
+++ /dev/null
@@ -1,7 +0,0 @@
-
-
\ No newline at end of file
diff --git a/app/admin/service/curd/templates/view/module/tableMain.code b/app/admin/service/curd/templates/view/module/tableMain.code
deleted file mode 100644
index 3fdf4e0..0000000
--- a/app/admin/service/curd/templates/view/module/tableMain.code
+++ /dev/null
@@ -1,3 +0,0 @@
-
-
-
\ No newline at end of file
diff --git a/app/admin/service/curd/templates/view/module/tag.code b/app/admin/service/curd/templates/view/module/tag.code
deleted file mode 100644
index 75938c8..0000000
--- a/app/admin/service/curd/templates/view/module/tag.code
+++ /dev/null
@@ -1,7 +0,0 @@
-
-
\ No newline at end of file
diff --git a/app/admin/service/curd/templates/view/module/textarea.code b/app/admin/service/curd/templates/view/module/textarea.code
deleted file mode 100644
index c7bc984..0000000
--- a/app/admin/service/curd/templates/view/module/textarea.code
+++ /dev/null
@@ -1,7 +0,0 @@
-
-
\ No newline at end of file
diff --git a/app/admin/service/initAdminData/MallCate.php b/app/admin/service/initAdminData/MallCate.php
deleted file mode 100644
index 389f965..0000000
--- a/app/admin/service/initAdminData/MallCate.php
+++ /dev/null
@@ -1,12 +0,0 @@
- "手机",
- "image" => "http://admin.demo.ulthon.com/upload/20220417/72ef1d769595627af51d76c612a789bf.png",
- "sort" => 0,
- "status" => 1,
- "remark" => "",
- )
-);
-
-return $ul_mall_cate;
diff --git a/app/admin/service/initAdminData/MallGoods.php b/app/admin/service/initAdminData/MallGoods.php
deleted file mode 100644
index f6f74a0..0000000
--- a/app/admin/service/initAdminData/MallGoods.php
+++ /dev/null
@@ -1,34 +0,0 @@
- "落地-风扇",
- "logo" => "http://admin.demo.ulthon.com/upload/20220417/72ef1d769595627af51d76c612a789bf.png",
- "images" => "http://admin.host/upload/20200514/95496713918290f6315ea3f87efa6bf2.jpg|http://admin.host/upload/20200514/ae29fa9cba4fc02defb7daed41cb2b13.jpg|http://admin.host/upload/20200514/f0a104d88ec7dc6fb42d2f87cbc71b76.jpg|http://admin.host/upload/20200514/3b88be4b1934690e5c1bd6b54b9ab5c8.jpg",
- "describe" => "<p>76654757</p>\n\n<p><img alt="" src="http://admin.host/upload/20200515/198070421110fa01f2c2ac2f52481647.jpg" style="height:689px; width:790px" /></p>\n\n<p><img alt="" src="http://admin.host/upload/20200515/a07a742c15a78781e79f8a3317006c1d.jpg" style="height:877px; width:790px" /></p>\n",
- "market_price" => 599.00,
- "discount_price" => 368.00,
- "sales" => 0,
- "virtual_sales" => 594,
- "stock" => 0,
- "total_stock" => 0,
- "sort" => 675,
- "status" => 1,
- "remark" => "",
- ),
- array(
- "title" => "电脑",
- "logo" => "http://admin.demo.ulthon.com/upload/20220417/72ef1d769595627af51d76c612a789bf.png",
- "images" => "http://admin.host/upload/20200514/f0a104d88ec7dc6fb42d2f87cbc71b76.jpg",
- "describe" => "<p>477</p>\n",
- "market_price" => 0.00,
- "discount_price" => 0.00,
- "sales" => 0,
- "virtual_sales" => 0,
- "stock" => 115,
- "total_stock" => 320,
- "sort" => 0,
- "status" => 1,
- "remark" => "",
- )
-);
-return $ul_mall_goods;
diff --git a/app/admin/service/initAdminData/MallTag.php b/app/admin/service/initAdminData/MallTag.php
deleted file mode 100644
index 771971e..0000000
--- a/app/admin/service/initAdminData/MallTag.php
+++ /dev/null
@@ -1,32 +0,0 @@
- 1,
- "title" => "便宜",
- "create_time" => 1657347818,
- "update_time" => 1657347818,
- "delete_time" => 0
- ),
- array(
- "id" => 2,
- "title" => "售后",
- "create_time" => 1657347825,
- "update_time" => 1657347825,
- "delete_time" => 0
- ),
- array(
- "id" => 3,
- "title" => "黑科技",
- "create_time" => 1657347836,
- "update_time" => 1657347836,
- "delete_time" => 0
- ),
- array(
- "id" => 4,
- "title" => "大厂",
- "create_time" => 1657347850,
- "update_time" => 1657347850,
- "delete_time" => 0
- )
-);
-return $ul_mall_tag;
\ No newline at end of file
diff --git a/app/admin/service/initAdminData/SystemAuth.php b/app/admin/service/initAdminData/SystemAuth.php
deleted file mode 100644
index cfb0567..0000000
--- a/app/admin/service/initAdminData/SystemAuth.php
+++ /dev/null
@@ -1,21 +0,0 @@
- 1,
- "title" => "管理员",
- "sort" => 1,
- "status" => 1,
- "remark" => "测试管理员",
- ),
- array(
- "id" => 6,
- "title" => "游客权限",
- "sort" => 0,
- "status" => 1,
- "remark" => "",
-
- )
-);
-
-
-return $ul_system_auth;
diff --git a/app/admin/service/initAdminData/SystemAuthNode.php b/app/admin/service/initAdminData/SystemAuthNode.php
deleted file mode 100644
index 5e63e29..0000000
--- a/app/admin/service/initAdminData/SystemAuthNode.php
+++ /dev/null
@@ -1,5 +0,0 @@
- "alisms_access_key_id",
- "group" => "sms",
- "value" => "填你的",
- "remark" => "阿里大于公钥",
- "sort" => 0,
- ),
- array(
- "name" => "alisms_access_key_secret",
- "group" => "sms",
- "value" => "填你的",
- "remark" => "阿里大鱼私钥",
- "sort" => 0,
- ),
- array(
- "name" => "upload_type",
- "group" => "upload",
- "value" => "local_public",
- "remark" => "当前上传方式 local_public,alioss,qnoss,txoss）",
- "sort" => 0,
- ),
- array(
- "name" => "upload_allow_ext",
- "group" => "upload",
- "value" => "jpg,jpeg,png,gif,bmp,doc,docx,xls,xlsx,ppt,pptx,pdf,zip,rar,7z,txt,mp3,wma,wav,mid,m4a,mp4,avi,wmv,3gp,flv,webp,svg,ico",
- "remark" => "允许上传的文件类型",
- "sort" => 0,
- ),
- array(
- "name" => "upload_allow_size",
- "group" => "upload",
- "value" => "1024000",
- "remark" => "允许上传的大小",
- "sort" => 0,
- ),
- array(
- "name" => "upload_allow_mime",
- "group" => "upload",
- "value" => "image/gif,image/jpeg,video/x-msvideo,text/plain,image/png",
- "remark" => "允许上传的文件mime",
- "sort" => 0,
- ),
- array(
- "name" => "upload_allow_type",
- "group" => "upload",
- "value" => "local_public,alioss,qnoss,txcos",
- "remark" => "可用的上传文件方式",
- "sort" => 0,
- ),
- array(
- "name" => "alioss_access_key_id",
- "group" => "upload",
- "value" => "填你的",
- "remark" => "阿里云oss公钥",
- "sort" => 0,
- ),
- array(
- "name" => "alioss_access_key_secret",
- "group" => "upload",
- "value" => "填你的",
- "remark" => "阿里云oss私钥",
- "sort" => 0,
- ),
- array(
- "name" => "alioss_endpoint",
- "group" => "upload",
- "value" => "填你的",
- "remark" => "阿里云oss数据中心",
- "sort" => 0,
- ),
- array(
- "name" => "alioss_bucket",
- "group" => "upload",
- "value" => "填你的",
- "remark" => "阿里云oss空间名称",
- "sort" => 0,
- ),
- array(
- "name" => "alioss_domain",
- "group" => "upload",
- "value" => "填你的",
- "remark" => "阿里云oss访问域名",
- "sort" => 0,
- ),
- array(
- "name" => "logo_title",
- "group" => "site",
- "value" => "ulthon_admin",
- "remark" => "LOGO标题",
- "sort" => 0,
- ),
- array(
- "name" => "logo_image",
- "group" => "site",
- "value" => "/static/common/images/logo-2.png",
- "remark" => "logo图片",
- "sort" => 0,
- ),
- array(
- "name" => "site_name",
- "group" => "site",
- "value" => "ulthon_admin后台系统",
- "remark" => "站点名称",
- "sort" => 0,
- ),
- array(
- "name" => "site_ico",
- "group" => "site",
- "value" => "/favicon.ico",
- "remark" => "浏览器图标",
- "sort" => 0,
- ),
- array(
- "name" => "site_copyright",
- "group" => "site",
- "value" => "填你的",
- "remark" => "版权信息",
- "sort" => 0,
- ),
- array(
- "name" => "site_beian",
- "group" => "site",
- "value" => "填你的",
- "remark" => "备案信息",
- "sort" => 0,
- ),
- array(
- "name" => "site_version",
- "group" => "site",
- "value" => "2.0.0",
- "remark" => "版本信息",
- "sort" => 0,
- ),
- array(
- "name" => "sms_type",
- "group" => "sms",
- "value" => "alisms",
- "remark" => "短信类型",
- "sort" => 0,
- ),
- array(
- "name" => "miniapp_appid",
- "group" => "wechat",
- "value" => "填你的",
- "remark" => "小程序公钥",
- "sort" => 0,
- ),
- array(
- "name" => "miniapp_appsecret",
- "group" => "wechat",
- "value" => "填你的",
- "remark" => "小程序私钥",
- "sort" => 0,
- ),
- array(
- "name" => "web_appid",
- "group" => "wechat",
- "value" => "填你的",
- "remark" => "公众号公钥",
- "sort" => 0,
- ),
- array(
- "name" => "web_appsecret",
- "group" => "wechat",
- "value" => "填你的",
- "remark" => "公众号私钥",
- "sort" => 0,
- ),
- array(
- "name" => "txcos_secret_id",
- "group" => "upload",
- "value" => "填你的",
- "remark" => "腾讯云cos密钥",
- "sort" => 0,
- ),
- array(
- "name" => "txcos_secret_key",
- "group" => "upload",
- "value" => "填你的",
- "remark" => "腾讯云cos私钥",
- "sort" => 0,
- ),
- array(
- "name" => "txcos_region",
- "group" => "upload",
- "value" => "填你的",
- "remark" => "存储桶地域",
- "sort" => 0,
- ),
- array(
- "name" => "txcos_bucket",
- "group" => "upload",
- "value" => "填你的",
- "remark" => "存储桶名称",
- "sort" => 0,
- ),
- array(
- "name" => "qnoss_access_key",
- "group" => "upload",
- "value" => "填你的",
- "remark" => "访问密钥",
- "sort" => 0,
- ),
- array(
- "name" => "qnoss_secret_key",
- "group" => "upload",
- "value" => "填你的",
- "remark" => "安全密钥",
- "sort" => 0,
- ),
- array(
- "name" => "qnoss_bucket",
- "group" => "upload",
- "value" => "填你的",
- "remark" => "存储空间",
- "sort" => 0,
- ),
- array(
- "name" => "qnoss_domain",
- "group" => "upload",
- "value" => "填你的",
- "remark" => "访问域名",
- "sort" => 0,
- ),
- array(
- "name" => "txcos_domain",
- "group" => "upload",
- "value" => "填你的",
- "remark" => "访问域名",
- "sort" => 0,
- ),
- array(
- "name" => "txcos_appid",
- "group" => "upload",
- "value" => "填你的",
- "remark" => "APPID",
- "sort" => 0,
- ),
- array(
- "name" => "file",
- "group" => "site",
- "value" => "",
- "remark" => "",
- "sort" => 0,
- ),
- array(
- "name" => "site_domain",
- "group" => "site",
- "value" => "http://admin.demo.ulthon.com",
- "remark" => "",
- "sort" => 0,
- )
-);
-return $ul_system_config;
diff --git a/app/admin/service/initAdminData/SystemMenu.php b/app/admin/service/initAdminData/SystemMenu.php
deleted file mode 100644
index 44ea1a7..0000000
--- a/app/admin/service/initAdminData/SystemMenu.php
+++ /dev/null
@@ -1,160 +0,0 @@
- 227,
- "pid" => 99999999,
- "title" => "后台首页",
- "icon" => "fa fa-home",
- "href" => "index/welcome",
- "params" => "",
- "target" => "_self",
- "sort" => 0,
- "status" => 1,
- ),
- array(
- "id" => 228,
- "pid" => 0,
- "title" => "系统管理",
- "icon" => "fa fa-cog",
- "href" => "",
- "params" => "",
- "target" => "_self",
- "sort" => 0,
- "status" => 1,
- ),
- array(
- "id" => 234,
- "pid" => 228,
- "title" => "菜单管理",
- "icon" => "fa fa-tree",
- "href" => "system.menu/index",
- "params" => "",
- "target" => "_self",
- "sort" => 10,
- "status" => 1,
- ),
- array(
- "id" => 244,
- "pid" => 228,
- "title" => "管理员管理",
- "icon" => "fa fa-user",
- "href" => "system.admin/index",
- "params" => "",
- "target" => "_self",
- "sort" => 12,
- "status" => 1,
- ),
- array(
- "id" => 245,
- "pid" => 228,
- "title" => "角色管理",
- "icon" => "fa fa-bitbucket-square",
- "href" => "system.auth/index",
- "params" => "",
- "target" => "_self",
- "sort" => 11,
- "status" => 1,
- ),
- array(
- "id" => 246,
- "pid" => 228,
- "title" => "节点管理",
- "icon" => "fa fa-list",
- "href" => "system.node/index",
- "params" => "",
- "target" => "_self",
- "sort" => 9,
- "status" => 1,
- ),
- array(
- "id" => 247,
- "pid" => 228,
- "title" => "配置管理",
- "icon" => "fa fa-asterisk",
- "href" => "system.config/index",
- "params" => "",
- "target" => "_self",
- "sort" => 8,
- "status" => 1,
- ),
- array(
- "id" => 248,
- "pid" => 228,
- "title" => "上传管理",
- "icon" => "fa fa-arrow-up",
- "href" => "system.uploadfile/index",
- "params" => "",
- "target" => "_self",
- "sort" => 0,
- "status" => 1,
- ),
- array(
- "id" => 249,
- "pid" => 0,
- "title" => "商城管理",
- "icon" => "fa fa-list",
- "href" => "",
- "params" => "",
- "target" => "_self",
- "sort" => 0,
- "status" => 1,
- ),
- array(
- "id" => 250,
- "pid" => 249,
- "title" => "商品分类",
- "icon" => "fa fa-calendar-check-o",
- "href" => "mall.cate/index",
- "params" => "",
- "target" => "_self",
- "sort" => 0,
- "status" => 1,
- ),
- array(
- "id" => 251,
- "pid" => 249,
- "title" => "商品管理",
- "icon" => "fa fa-list",
- "href" => "mall.goods/index",
- "params" => "",
- "target" => "_self",
- "sort" => 0,
- "status" => 1,
- ),
- array(
- "id" => 252,
- "pid" => 228,
- "title" => "快捷入口",
- "icon" => "fa fa-list",
- "href" => "system.quick/index",
- "params" => "",
- "target" => "_self",
- "sort" => 0,
- "status" => 1,
- ),
- array(
- "id" => 253,
- "pid" => 228,
- "title" => "日志管理",
- "icon" => "fa fa-connectdevelop",
- "href" => "debug.log/index",
- "params" => "",
- "target" => "_self",
- "sort" => 0,
- "status" => 1,
- ),
- array(
- "id" => 254,
- "pid" => 249,
- "title" => "商品标签",
- "icon" => "fa fa-connectdevelop",
- "href" => "mall.tag/index",
- "params" => "",
- "target" => "_self",
- "sort" => 0,
- "status" => 1,
- ),
-);
-
-
-return $ul_system_menu;
diff --git a/app/admin/service/initAdminData/SystemNode.php b/app/admin/service/initAdminData/SystemNode.php
deleted file mode 100644
index 00db427..0000000
--- a/app/admin/service/initAdminData/SystemNode.php
+++ /dev/null
@@ -1,726 +0,0 @@
- 1,
- "node" => "system.admin",
- "title" => "管理员管理",
- "type" => 1,
- "is_auth" => 1,
- "create_time" => 1657347263,
- "update_time" => 1657347263
- ),
- array(
- "id" => 2,
- "node" => "system.admin/index",
- "title" => "列表",
- "type" => 2,
- "is_auth" => 1,
- "create_time" => 1657347263,
- "update_time" => 1657347263
- ),
- array(
- "id" => 3,
- "node" => "system.admin/add",
- "title" => "添加",
- "type" => 2,
- "is_auth" => 1,
- "create_time" => 1657347263,
- "update_time" => 1657347263
- ),
- array(
- "id" => 4,
- "node" => "system.admin/edit",
- "title" => "编辑",
- "type" => 2,
- "is_auth" => 1,
- "create_time" => 1657347263,
- "update_time" => 1657347263
- ),
- array(
- "id" => 5,
- "node" => "system.admin/password",
- "title" => "编辑",
- "type" => 2,
- "is_auth" => 1,
- "create_time" => 1657347263,
- "update_time" => 1657347263
- ),
- array(
- "id" => 6,
- "node" => "system.admin/delete",
- "title" => "删除",
- "type" => 2,
- "is_auth" => 1,
- "create_time" => 1657347263,
- "update_time" => 1657347263
- ),
- array(
- "id" => 7,
- "node" => "system.admin/modify",
- "title" => "属性修改",
- "type" => 2,
- "is_auth" => 1,
- "create_time" => 1657347263,
- "update_time" => 1657347263
- ),
- array(
- "id" => 8,
- "node" => "system.admin/export",
- "title" => "导出",
- "type" => 2,
- "is_auth" => 1,
- "create_time" => 1657347264,
- "update_time" => 1657347264
- ),
- array(
- "id" => 9,
- "node" => "system.auth",
- "title" => "角色权限管理",
- "type" => 1,
- "is_auth" => 1,
- "create_time" => 1657347264,
- "update_time" => 1657347264
- ),
- array(
- "id" => 10,
- "node" => "system.auth/authorize",
- "title" => "授权",
- "type" => 2,
- "is_auth" => 1,
- "create_time" => 1657347264,
- "update_time" => 1657347264
- ),
- array(
- "id" => 11,
- "node" => "system.auth/saveAuthorize",
- "title" => "授权保存",
- "type" => 2,
- "is_auth" => 1,
- "create_time" => 1657347264,
- "update_time" => 1657347264
- ),
- array(
- "id" => 12,
- "node" => "system.auth/index",
- "title" => "列表",
- "type" => 2,
- "is_auth" => 1,
- "create_time" => 1657347264,
- "update_time" => 1657347264
- ),
- array(
- "id" => 13,
- "node" => "system.auth/add",
- "title" => "添加",
- "type" => 2,
- "is_auth" => 1,
- "create_time" => 1657347264,
- "update_time" => 1657347264
- ),
- array(
- "id" => 14,
- "node" => "system.auth/edit",
- "title" => "编辑",
- "type" => 2,
- "is_auth" => 1,
- "create_time" => 1657347264,
- "update_time" => 1657347264
- ),
- array(
- "id" => 15,
- "node" => "system.auth/delete",
- "title" => "删除",
- "type" => 2,
- "is_auth" => 1,
- "create_time" => 1657347265,
- "update_time" => 1657347265
- ),
- array(
- "id" => 16,
- "node" => "system.auth/export",
- "title" => "导出",
- "type" => 2,
- "is_auth" => 1,
- "create_time" => 1657347265,
- "update_time" => 1657347265
- ),
- array(
- "id" => 17,
- "node" => "system.auth/modify",
- "title" => "属性修改",
- "type" => 2,
- "is_auth" => 1,
- "create_time" => 1657347265,
- "update_time" => 1657347265
- ),
- array(
- "id" => 18,
- "node" => "system.config",
- "title" => "系统配置管理",
- "type" => 1,
- "is_auth" => 1,
- "create_time" => 1657347265,
- "update_time" => 1657347265
- ),
- array(
- "id" => 19,
- "node" => "system.config/index",
- "title" => "列表",
- "type" => 2,
- "is_auth" => 1,
- "create_time" => 1657347265,
- "update_time" => 1657347265
- ),
- array(
- "id" => 20,
- "node" => "system.config/save",
- "title" => "保存",
- "type" => 2,
- "is_auth" => 1,
- "create_time" => 1657347265,
- "update_time" => 1657347265
- ),
- array(
- "id" => 21,
- "node" => "system.menu",
- "title" => "菜单管理",
- "type" => 1,
- "is_auth" => 1,
- "create_time" => 1657347265,
- "update_time" => 1657347265
- ),
- array(
- "id" => 22,
- "node" => "system.menu/index",
- "title" => "列表",
- "type" => 2,
- "is_auth" => 1,
- "create_time" => 1657347265,
- "update_time" => 1657347265
- ),
- array(
- "id" => 23,
- "node" => "system.menu/add",
- "title" => "添加",
- "type" => 2,
- "is_auth" => 1,
- "create_time" => 1657347266,
- "update_time" => 1657347266
- ),
- array(
- "id" => 24,
- "node" => "system.menu/edit",
- "title" => "编辑",
- "type" => 2,
- "is_auth" => 1,
- "create_time" => 1657347266,
- "update_time" => 1657347266
- ),
- array(
- "id" => 25,
- "node" => "system.menu/delete",
- "title" => "删除",
- "type" => 2,
- "is_auth" => 1,
- "create_time" => 1657347266,
- "update_time" => 1657347266
- ),
- array(
- "id" => 26,
- "node" => "system.menu/modify",
- "title" => "属性修改",
- "type" => 2,
- "is_auth" => 1,
- "create_time" => 1657347266,
- "update_time" => 1657347266
- ),
- array(
- "id" => 27,
- "node" => "system.menu/getMenuTips",
- "title" => "添加菜单提示",
- "type" => 2,
- "is_auth" => 1,
- "create_time" => 1657347266,
- "update_time" => 1657347266
- ),
- array(
- "id" => 28,
- "node" => "system.menu/export",
- "title" => "导出",
- "type" => 2,
- "is_auth" => 1,
- "create_time" => 1657347266,
- "update_time" => 1657347266
- ),
- array(
- "id" => 29,
- "node" => "system.node",
- "title" => "系统节点管理",
- "type" => 1,
- "is_auth" => 1,
- "create_time" => 1657347266,
- "update_time" => 1657347266
- ),
- array(
- "id" => 30,
- "node" => "system.node/index",
- "title" => "列表",
- "type" => 2,
- "is_auth" => 1,
- "create_time" => 1657347266,
- "update_time" => 1657347266
- ),
- array(
- "id" => 31,
- "node" => "system.node/refreshNode",
- "title" => "系统节点更新",
- "type" => 2,
- "is_auth" => 1,
- "create_time" => 1657347267,
- "update_time" => 1657347267
- ),
- array(
- "id" => 32,
- "node" => "system.node/clearNode",
- "title" => "清除失效节点",
- "type" => 2,
- "is_auth" => 1,
- "create_time" => 1657347267,
- "update_time" => 1657347267
- ),
- array(
- "id" => 33,
- "node" => "system.node/add",
- "title" => "添加",
- "type" => 2,
- "is_auth" => 1,
- "create_time" => 1657347267,
- "update_time" => 1657347267
- ),
- array(
- "id" => 34,
- "node" => "system.node/edit",
- "title" => "编辑",
- "type" => 2,
- "is_auth" => 1,
- "create_time" => 1657347267,
- "update_time" => 1657347267
- ),
- array(
- "id" => 35,
- "node" => "system.node/delete",
- "title" => "删除",
- "type" => 2,
- "is_auth" => 1,
- "create_time" => 1657347267,
- "update_time" => 1657347267
- ),
- array(
- "id" => 36,
- "node" => "system.node/export",
- "title" => "导出",
- "type" => 2,
- "is_auth" => 1,
- "create_time" => 1657347267,
- "update_time" => 1657347267
- ),
- array(
- "id" => 37,
- "node" => "system.node/modify",
- "title" => "属性修改",
- "type" => 2,
- "is_auth" => 1,
- "create_time" => 1657347267,
- "update_time" => 1657347267
- ),
- array(
- "id" => 38,
- "node" => "system.uploadfile",
- "title" => "上传文件管理",
- "type" => 1,
- "is_auth" => 1,
- "create_time" => 1657347268,
- "update_time" => 1657347268
- ),
- array(
- "id" => 39,
- "node" => "system.uploadfile/index",
- "title" => "列表",
- "type" => 2,
- "is_auth" => 1,
- "create_time" => 1657347268,
- "update_time" => 1657347268
- ),
- array(
- "id" => 40,
- "node" => "system.uploadfile/add",
- "title" => "添加",
- "type" => 2,
- "is_auth" => 1,
- "create_time" => 1657347268,
- "update_time" => 1657347268
- ),
- array(
- "id" => 41,
- "node" => "system.uploadfile/edit",
- "title" => "编辑",
- "type" => 2,
- "is_auth" => 1,
- "create_time" => 1657347268,
- "update_time" => 1657347268
- ),
- array(
- "id" => 42,
- "node" => "system.uploadfile/delete",
- "title" => "删除",
- "type" => 2,
- "is_auth" => 1,
- "create_time" => 1657347268,
- "update_time" => 1657347268
- ),
- array(
- "id" => 43,
- "node" => "system.uploadfile/export",
- "title" => "导出",
- "type" => 2,
- "is_auth" => 1,
- "create_time" => 1657347268,
- "update_time" => 1657347268
- ),
- array(
- "id" => 44,
- "node" => "system.uploadfile/modify",
- "title" => "属性修改",
- "type" => 2,
- "is_auth" => 1,
- "create_time" => 1657347268,
- "update_time" => 1657347268
- ),
- array(
- "id" => 45,
- "node" => "mall.cate",
- "title" => "商品分类管理",
- "type" => 1,
- "is_auth" => 1,
- "create_time" => 1657347268,
- "update_time" => 1657347268
- ),
- array(
- "id" => 46,
- "node" => "mall.cate/index",
- "title" => "列表",
- "type" => 2,
- "is_auth" => 1,
- "create_time" => 1657347269,
- "update_time" => 1657347269
- ),
- array(
- "id" => 47,
- "node" => "mall.cate/add",
- "title" => "添加",
- "type" => 2,
- "is_auth" => 1,
- "create_time" => 1657347269,
- "update_time" => 1657347269
- ),
- array(
- "id" => 48,
- "node" => "mall.cate/edit",
- "title" => "编辑",
- "type" => 2,
- "is_auth" => 1,
- "create_time" => 1657347269,
- "update_time" => 1657347269
- ),
- array(
- "id" => 49,
- "node" => "mall.cate/delete",
- "title" => "删除",
- "type" => 2,
- "is_auth" => 1,
- "create_time" => 1657347269,
- "update_time" => 1657347269
- ),
- array(
- "id" => 50,
- "node" => "mall.cate/export",
- "title" => "导出",
- "type" => 2,
- "is_auth" => 1,
- "create_time" => 1657347269,
- "update_time" => 1657347269
- ),
- array(
- "id" => 51,
- "node" => "mall.cate/modify",
- "title" => "属性修改",
- "type" => 2,
- "is_auth" => 1,
- "create_time" => 1657347269,
- "update_time" => 1657347269
- ),
- array(
- "id" => 52,
- "node" => "mall.goods",
- "title" => "商城商品管理",
- "type" => 1,
- "is_auth" => 1,
- "create_time" => 1657347269,
- "update_time" => 1657347269
- ),
- array(
- "id" => 53,
- "node" => "mall.goods/index",
- "title" => "列表",
- "type" => 2,
- "is_auth" => 1,
- "create_time" => 1657347270,
- "update_time" => 1657347270
- ),
- array(
- "id" => 54,
- "node" => "mall.goods/stock",
- "title" => "入库",
- "type" => 2,
- "is_auth" => 1,
- "create_time" => 1657347270,
- "update_time" => 1657347270
- ),
- array(
- "id" => 55,
- "node" => "mall.goods/add",
- "title" => "添加",
- "type" => 2,
- "is_auth" => 1,
- "create_time" => 1657347270,
- "update_time" => 1657347270
- ),
- array(
- "id" => 56,
- "node" => "mall.goods/edit",
- "title" => "编辑",
- "type" => 2,
- "is_auth" => 1,
- "create_time" => 1657347270,
- "update_time" => 1657347270
- ),
- array(
- "id" => 57,
- "node" => "mall.goods/delete",
- "title" => "删除",
- "type" => 2,
- "is_auth" => 1,
- "create_time" => 1657347270,
- "update_time" => 1657347270
- ),
- array(
- "id" => 58,
- "node" => "mall.goods/export",
- "title" => "导出",
- "type" => 2,
- "is_auth" => 1,
- "create_time" => 1657347270,
- "update_time" => 1657347270
- ),
- array(
- "id" => 59,
- "node" => "mall.goods/modify",
- "title" => "属性修改",
- "type" => 2,
- "is_auth" => 1,
- "create_time" => 1657347270,
- "update_time" => 1657347270
- ),
- array(
- "id" => 60,
- "node" => "system.quick",
- "title" => "快捷入口管理",
- "type" => 1,
- "is_auth" => 1,
- "create_time" => 1657347270,
- "update_time" => 1657347270
- ),
- array(
- "id" => 61,
- "node" => "system.quick/index",
- "title" => "列表",
- "type" => 2,
- "is_auth" => 1,
- "create_time" => 1657347271,
- "update_time" => 1657347271
- ),
- array(
- "id" => 62,
- "node" => "system.quick/add",
- "title" => "添加",
- "type" => 2,
- "is_auth" => 1,
- "create_time" => 1657347271,
- "update_time" => 1657347271
- ),
- array(
- "id" => 63,
- "node" => "system.quick/edit",
- "title" => "编辑",
- "type" => 2,
- "is_auth" => 1,
- "create_time" => 1657347271,
- "update_time" => 1657347271
- ),
- array(
- "id" => 64,
- "node" => "system.quick/delete",
- "title" => "删除",
- "type" => 2,
- "is_auth" => 1,
- "create_time" => 1657347271,
- "update_time" => 1657347271
- ),
- array(
- "id" => 65,
- "node" => "system.quick/export",
- "title" => "导出",
- "type" => 2,
- "is_auth" => 1,
- "create_time" => 1657347271,
- "update_time" => 1657347271
- ),
- array(
- "id" => 66,
- "node" => "system.quick/modify",
- "title" => "属性修改",
- "type" => 2,
- "is_auth" => 1,
- "create_time" => 1657347271,
- "update_time" => 1657347271
- ),
- array(
- "id" => 69,
- "node" => "debug.log",
- "title" => "debug_log",
- "type" => 1,
- "is_auth" => 1,
- "create_time" => 1657347271,
- "update_time" => 1657347271
- ),
- array(
- "id" => 70,
- "node" => "debug.log/index",
- "title" => "列表",
- "type" => 2,
- "is_auth" => 1,
- "create_time" => 1657347272,
- "update_time" => 1657347272
- ),
- array(
- "id" => 71,
- "node" => "debug.log/add",
- "title" => "添加",
- "type" => 2,
- "is_auth" => 1,
- "create_time" => 1657347272,
- "update_time" => 1657347272
- ),
- array(
- "id" => 72,
- "node" => "debug.log/edit",
- "title" => "编辑",
- "type" => 2,
- "is_auth" => 1,
- "create_time" => 1657347272,
- "update_time" => 1657347272
- ),
- array(
- "id" => 73,
- "node" => "debug.log/delete",
- "title" => "删除",
- "type" => 2,
- "is_auth" => 1,
- "create_time" => 1657347272,
- "update_time" => 1657347272
- ),
- array(
- "id" => 74,
- "node" => "debug.log/export",
- "title" => "导出",
- "type" => 2,
- "is_auth" => 1,
- "create_time" => 1657347272,
- "update_time" => 1657347272
- ),
- array(
- "id" => 75,
- "node" => "debug.log/modify",
- "title" => "属性修改",
- "type" => 2,
- "is_auth" => 1,
- "create_time" => 1657347272,
- "update_time" => 1657347272
- ),
- array(
- "id" => 76,
- "node" => "mall.tag",
- "title" => "mall_tag",
- "type" => 1,
- "is_auth" => 1,
- "create_time" => 1657347614,
- "update_time" => 1657347614
- ),
- array(
- "id" => 77,
- "node" => "mall.tag/index",
- "title" => "列表",
- "type" => 2,
- "is_auth" => 1,
- "create_time" => 1657347614,
- "update_time" => 1657347614
- ),
- array(
- "id" => 78,
- "node" => "mall.tag/add",
- "title" => "添加",
- "type" => 2,
- "is_auth" => 1,
- "create_time" => 1657347615,
- "update_time" => 1657347615
- ),
- array(
- "id" => 79,
- "node" => "mall.tag/edit",
- "title" => "编辑",
- "type" => 2,
- "is_auth" => 1,
- "create_time" => 1657347615,
- "update_time" => 1657347615
- ),
- array(
- "id" => 80,
- "node" => "mall.tag/delete",
- "title" => "删除",
- "type" => 2,
- "is_auth" => 1,
- "create_time" => 1657347615,
- "update_time" => 1657347615
- ),
- array(
- "id" => 81,
- "node" => "mall.tag/export",
- "title" => "导出",
- "type" => 2,
- "is_auth" => 1,
- "create_time" => 1657347615,
- "update_time" => 1657347615
- ),
- array(
- "id" => 82,
- "node" => "mall.tag/modify",
- "title" => "属性修改",
- "type" => 2,
- "is_auth" => 1,
- "create_time" => 1657347615,
- "update_time" => 1657347615
- )
-);
-
-
-return $ul_system_node;
diff --git a/app/admin/service/initAdminData/SystemQuick.php b/app/admin/service/initAdminData/SystemQuick.php
deleted file mode 100644
index 622493b..0000000
--- a/app/admin/service/initAdminData/SystemQuick.php
+++ /dev/null
@@ -1,61 +0,0 @@
- "管理员管理",
- "icon" => "fa fa-user",
- "href" => "system.admin/index",
- "sort" => 0,
- "status" => 1,
- ),
- array(
- "title" => "角色管理",
- "icon" => "fa fa-bitbucket-square",
- "href" => "system.auth/index",
- "sort" => 0,
- "status" => 1,
- ),
- array(
- "title" => "菜单管理",
- "icon" => "fa fa-tree",
- "href" => "system.menu/index",
- "sort" => 0,
- "status" => 1,
- ),
- array(
- "title" => "节点管理",
- "icon" => "fa fa-list",
- "href" => "system.node/index",
- "sort" => 0,
- "status" => 1,
- ),
- array(
- "title" => "配置管理",
- "icon" => "fa fa-asterisk",
- "href" => "system.config/index",
- "sort" => 0,
- "status" => 1,
- ),
- array(
- "title" => "上传管理",
- "icon" => "fa fa-arrow-up",
- "href" => "system.uploadfile/index",
- "sort" => 0,
- "status" => 1,
- ),
- array(
- "title" => "商品分类",
- "icon" => "fa fa-calendar-check-o",
- "href" => "mall.cate/index",
- "sort" => 0,
- "status" => 1,
- ),
- array(
- "title" => "商品管理",
- "icon" => "fa fa-list",
- "href" => "mall.goods/index",
- "sort" => 0,
- "status" => 1,
- )
-);
-
-return $ul_system_quick;
diff --git a/app/common/command/admin/Update.php b/app/common/command/admin/Update.php
index 7da2a93..a599f7e 100644
--- a/app/common/command/admin/Update.php
+++ b/app/common/command/admin/Update.php
@@ -251,7 +251,7 @@ class Update extends Command
}
foreach ($last_version_skip_config['append_dir'] as $dir) {
- if(str_starts_with($file_path,$dir)){
+ if (str_starts_with($file_path, $dir)) {
$last_version_list_append_files[] = $file_path;
continue;
}
@@ -259,10 +259,10 @@ class Update extends Command
}
foreach ($last_version_list_append_files as $file_path) {
- $now_file_path = $now_dir. '/'. $file_path;
- $last_file_path = $last_version_dir. '/'. $file_path;
+ $now_file_path = $now_dir . '/' . $file_path;
+ $last_file_path = $last_version_dir . '/' . $file_path;
- if(file_exists($now_file_path)){
+ if (file_exists($now_file_path)) {
continue;
}
@@ -286,6 +286,12 @@ class Update extends Command
$this->cleanWorkpaceDir();
$output->writeln('更新完成');
// 更新完成
+
+ if (!empty(Version::UPDATE_TIPS)) {
+ foreach (Version::UPDATE_TIPS as $content) {
+ $output->writeln($content);
+ }
+ }
}
protected function cleanWorkpaceDir()
diff --git a/app/common/command/admin/Version.php b/app/common/command/admin/Version.php
index d708064..7ac3b26 100644
--- a/app/common/command/admin/Version.php
+++ b/app/common/command/admin/Version.php
@@ -7,10 +7,8 @@ namespace app\common\command\admin;
use think\App as ThinkApp;
use think\console\Command;
use think\console\Input;
-use think\console\input\Argument;
use think\console\input\Option;
use think\console\Output;
-use think\facade\App;
class Version extends Command
{
@@ -23,6 +21,11 @@ class Version extends Command
'发布新版本',
];
+ public const UPDATE_TIPS = [
+ '本次调整了append类型的更新文件列表，',
+ '建议删除以下目录的内容，再重新获取更新，以便初始化相关类，但如果您定制了相关文件，请不要删除，可以参考最新版本的代码调整文件',
+ ];
+
protected function configure()
{
// 指令配置
@@ -33,7 +36,6 @@ class Version extends Command
protected function execute(Input $input, Output $output)
{
-
// 指令输出
$output->info('当前版本号为：' . $this::VERSION);
$output->info('当前Layui版本号为：' . $this::LAYUI_VERSION);
@@ -56,12 +58,12 @@ class Version extends Command
$output->writeln('>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>');
$version = $this::VERSION;
- $comment = implode(";", $this::COMMENT);
+ $comment = implode(';', $this::COMMENT);
$output->info('生成标签：' . $version);
$output->info('标签描述：' . $comment);
exec("git tag -a $version -m \"$comment\"");
$output->info('推送到远程仓库');
- exec("git push --tags");
+ exec('git push --tags');
}
}
}
diff --git a/config/update.php b/config/update.php
index b582157..9ac04c4 100644
--- a/config/update.php
+++ b/config/update.php
@@ -18,17 +18,25 @@ $config['skip_files'] = $skip_files;
$skip_dir = [];
$skip_dir[] = 'runtime';
$skip_dir[] = 'vendor';
-$skip_dir[] = 'extend/trait';
+$skip_dir[] = 'app/admin/controller';
+$skip_dir[] = 'app/admin/middleware';
+$skip_dir[] = 'app/admin/model';
+$skip_dir[] = 'app/admin/service';
+$skip_dir[] = 'app/admin/traits';
$config['skip_dir'] = $skip_dir;
-
// append 如果当前版本不存在，则追加，如果存在，则不应当覆盖
// append 的文件应当在skip内部
$config['append_files'] = [];
-$config['append_dir'] = [
- 'extend/trait',
-];
+$append_dir = [];
+$append_dir[] = 'app/admin/controller';
+$append_dir[] = 'app/admin/middleware';
+$append_dir[] = 'app/admin/model';
+$append_dir[] = 'app/admin/service';
+$append_dir[] = 'app/admin/traits';
+
+$config['append_dir'] = $append_dir;
return $config;