将最新的代码合并到当前开发分支中

app/admin/service/ConfigService.php

@@ -1,22 +0,0 @@
-<?php
-
-
-namespace app\admin\service;
-
-use think\facade\Cache;
-
-class ConfigService
-{
-
-    public static function getVersion()
-    {
-        $version = Cache('version');
-        if (empty($version)) {
-            $version = sysconfig('site', 'site_version');
-            cache('site_version', $version);
-            Cache::set('version', $version, 3600);
-        }
-        return $version;
-    }
-
-}

app/admin/service/curd/templates/controller/exportMethod.code

@@ -21,5 +21,11 @@
 
         $content = \app\common\tools\ExportTools::excel($this->model, $where, $fields, $image_fields, $select_fields, $date_fields);
 
-        return download($content, $this->model->getName() . date('YmdHis') . '.xlsx', true);
+        $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);
     }

app/admin/service/curd/templates/view/index.code

@@ -1,6 +1,7 @@
 <div class="layuimini-container">
     <div class="layuimini-main">
         <table id="currentTable" class="layui-table layui-hide"
+               data-auth-index="{:auth('{{controllerUrl}}/index')}"
                data-auth-add="{:auth('{{controllerUrl}}/add')}"
                data-auth-edit="{:auth('{{controllerUrl}}/edit')}"
                data-auth-delete="{:auth('{{controllerUrl}}/delete')}"

app/admin/service/initAdminData/SystemConfig.php

@@ -24,7 +24,7 @@ $ul_system_config = array(
     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",
+        "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,
     ),
@@ -231,6 +231,13 @@ $ul_system_config = array(
         "remark" => "访问域名",
         "sort" => 0,
     ),
+    array(
+        "name" => "txcos_appid",
+        "group" => "upload",
+        "value" => "填你的",
+        "remark" => "APPID",
+        "sort" => 0,
+    ),
     array(
         "name" => "file",
         "group" => "site",