From 0313d737f6f77d40ab6470d06313ec625f37e60f Mon Sep 17 00:00:00 2001
From: augushong <augushong@ulthon.com>
Date: Fri, 9 Dec 2022 16:34:51 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E7=89=88=E6=9C=AC=E8=AE=BE?=
 =?UTF-8?q?=E7=BD=AE=E6=9C=89=E6=95=88=E6=80=A7=EF=BC=9B=E4=BC=98=E5=8C=96?=
 =?UTF-8?q?=E6=97=B6=E9=97=B4=E8=8C=83=E5=9B=B4=E5=92=8C=E6=95=B0=E5=AD=97?=
 =?UTF-8?q?=E8=8C=83=E5=9B=B4=E7=9A=84placeholder?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/admin/service/ConfigService.php          | 22 --------------------
 app/common/controller/AdminController.php    |  3 +--
 public/static/plugs/easy-admin/easy-admin.js |  8 +++----
 3 files changed, 5 insertions(+), 28 deletions(-)
 delete mode 100644 app/admin/service/ConfigService.php

diff --git a/app/admin/service/ConfigService.php b/app/admin/service/ConfigService.php
deleted file mode 100644
index fd919d0..0000000
--- a/app/admin/service/ConfigService.php
+++ /dev/null
@@ -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;
-    }
-
-}
\ No newline at end of file
diff --git a/app/common/controller/AdminController.php b/app/common/controller/AdminController.php
index dd58c64..37ecb10 100644
--- a/app/common/controller/AdminController.php
+++ b/app/common/controller/AdminController.php
@@ -5,7 +5,6 @@
 namespace app\common\controller;
 
 use app\admin\model\SystemAdmin;
-use app\admin\service\ConfigService;
 use app\BaseController;
 use app\common\constants\AdminConstant;
 use app\common\service\AuthService;
@@ -331,7 +330,7 @@ class AdminController extends BaseController
             'thisControllerJsPath' => "{$thisControllerJsPath}",
             'autoloadJs'           => $autoloadJs,
             'isSuperAdmin'         => $isSuperAdmin,
-            'version'              => env('app_debug') ? time() : ConfigService::getVersion(),
+            'version'              => env('app_debug') ? time() : sysconfig('site', 'site_version')
         ];
 
         View::assign($data);
diff --git a/public/static/plugs/easy-admin/easy-admin.js b/public/static/plugs/easy-admin/easy-admin.js
index 483e27c..aa56a77 100644
--- a/public/static/plugs/easy-admin/easy-admin.js
+++ b/public/static/plugs/easy-admin/easy-admin.js
@@ -584,8 +584,8 @@ define(["jquery", "tableSelect", "ckeditor", 'miniTheme', 'tableData', 'citypick
                                 formHtml += '\t<div class="layui-form-item form-item-time-limit layui-inline ' + formSearchHideClass + ' ">\n' +
                                     '<label class="layui-form-label">' + d.title + '</label>\n' +
                                     '<div class="layui-input-inline">\n' +
-                                    '<input id="c-' + d.elemIdName + '-min_date" name="[' + d.fieldAlias + ']min_date"  data-search-op="min_date"  value="' + d.searchValue + '" placeholder="' + d.searchTip + '最小值" class="layui-input">\n' +
-                                    '<input id="c-' + d.elemIdName + '-max_date" name="[' + d.fieldAlias + ']max_date"  data-search-op="max_date"  value="' + d.searchValue + '" placeholder="' + d.searchTip + '最大值" class="layui-input">\n' +
+                                    '<input id="c-' + d.elemIdName + '-min_date" name="[' + d.fieldAlias + ']min_date"  data-search-op="min_date"  value="' + d.searchValue + '" placeholder="最小值" class="layui-input">\n' +
+                                    '<input id="c-' + d.elemIdName + '-max_date" name="[' + d.fieldAlias + ']max_date"  data-search-op="max_date"  value="' + d.searchValue + '" placeholder="最大值" class="layui-input">\n' +
                                     '</div>\n' +
                                     '</div>';
                                 break;
@@ -594,8 +594,8 @@ define(["jquery", "tableSelect", "ckeditor", 'miniTheme', 'tableData', 'citypick
                                 formHtml += '\t<div class="layui-form-item form-item-number-limit layui-inline ' + formSearchHideClass + ' ">\n' +
                                     '<label class="layui-form-label">' + d.title + '</label>\n' +
                                     '<div class="layui-input-inline">\n' +
-                                    '<input id="c-' + d.elemIdName + '-min" name="[' + d.fieldAlias + ']min"  data-search-op="min" type="text" value="' + d.searchValue + '" placeholder="' + d.searchTip + '最小值" class="layui-input">\n' +
-                                    '<input id="c-' + d.elemIdName + '-max" name="[' + d.fieldAlias + ']max"  data-search-op="max" type="text" value="' + d.searchValue + '" placeholder="' + d.searchTip + '最大值" class="layui-input">\n' +
+                                    '<input id="c-' + d.elemIdName + '-min" name="[' + d.fieldAlias + ']min"  data-search-op="min" type="text" value="' + d.searchValue + '" placeholder="最小值" class="layui-input">\n' +
+                                    '<input id="c-' + d.elemIdName + '-max" name="[' + d.fieldAlias + ']max"  data-search-op="max" type="text" value="' + d.searchValue + '" placeholder="最大值" class="layui-input">\n' +
                                     '</div>\n' +
                                     '</div>';
                                 break;