From 1b449b83dff3ae26196753a84f01eb396791729d Mon Sep 17 00:00:00 2001
From: sugar1569 <sugar1569@vip.qq.com>
Date: Tue, 2 Apr 2019 18:12:50 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B8=B8=E7=94=A8=E7=B1=BB=E5=AE=8C=E5=96=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 extend/service/CacheService.php          |  2 +-
 extend/service/FormBuilder.php           | 10 ++++++++-
 extend/service/JsonService.php           |  9 ++++++++
 extend/service/PHPExcelService.php       |  4 +---
 extend/service/SystemConfigService.php   | 27 ++++++++++++++++++++----
 extend/service/WechatTemplateService.php |  2 +-
 6 files changed, 44 insertions(+), 10 deletions(-)

diff --git a/extend/service/CacheService.php b/extend/service/CacheService.php
index 6b0c8670..06ed4d6b 100644
--- a/extend/service/CacheService.php
+++ b/extend/service/CacheService.php
@@ -15,7 +15,7 @@ class CacheService
     protected static $globalCacheName = '_cached_1515146130';
 
 
-    public static function set($name, $value, $expire = 0)
+    public static function set($name, $value, $expire = 3600)
     {
         return self::handler()->set($name,$value,$expire);
     }
diff --git a/extend/service/FormBuilder.php b/extend/service/FormBuilder.php
index 4c5a7dfa..3e72086b 100644
--- a/extend/service/FormBuilder.php
+++ b/extend/service/FormBuilder.php
@@ -21,7 +21,9 @@ class FormBuilder extends Form
      * 1 父级刷新 不能再提交
      * 2 父级刷新关闭弹框 不能再提交 成功关闭
      * 3 父页面刷新可以重复添加 可以再次提交
-     * 4 不能再提交
+     * 4 父级不刷新 不能再提交
+     * 5 父级不刷新 不能再提交 关闭弹窗
+     * 6 父级不刷新 当前窗口刷新
      * str 自定义
      * @return $this
      */
@@ -44,6 +46,12 @@ class FormBuilder extends Form
             case 4:
                 $js = '$r.btn.disabled(false);$r.btn.finish();';//提交成功不能再提交
                 break;
+            case 5:
+                $js = '$r.btn.disabled(false);$r.btn.finish();setTimeout(function(){parent.layer.close(parent.layer.getFrameIndex(window.name));},2000);';//父级不刷新 不能再提交 关闭弹窗
+                break;
+            case 6:
+                $js = 'setTimeout(function(){window.location.reload(),2000});';//父级不刷新 当前窗口刷新
+                break;
             default:
                 $js = $jscallback;
                 break;
diff --git a/extend/service/JsonService.php b/extend/service/JsonService.php
index 2ebdb2e8..bcc17e2e 100644
--- a/extend/service/JsonService.php
+++ b/extend/service/JsonService.php
@@ -58,4 +58,13 @@ class JsonService
         return self::result(400,$msg,$data);
     }
 
+    public static function success($msg,$data=[])
+    {
+        if(true == is_array($msg)){
+            $data = $msg;
+            $msg = self::$SUCCESSFUL_DEFAULT_MSG;
+        }
+        return self::result(200,$msg,$data);
+    }
+
 }
\ No newline at end of file
diff --git a/extend/service/PHPExcelService.php b/extend/service/PHPExcelService.php
index c16bde80..147c6fb3 100644
--- a/extend/service/PHPExcelService.php
+++ b/extend/service/PHPExcelService.php
@@ -1,8 +1,6 @@
 <?php
 namespace service;
 
-use PHPExcel_IOFactory;
-use PHPExcel;
 use service\JsonService as Json;
 use think\Request;
 
@@ -61,7 +59,7 @@ class PHPExcelService
      * return
      */
     private static function initialize($data,$fun){
-//        vendor("PHPExcel.PHPExcel.PHPExcel");
+        vendor("PHPExcel.PHPExcel.PHPExcel");
         self::$PHPExcel= new \PHPExcel();
         if($fun!==null && is_callable($fun)){
             self::$styleArray=$fun();
diff --git a/extend/service/SystemConfigService.php b/extend/service/SystemConfigService.php
index f067875b..3119459f 100644
--- a/extend/service/SystemConfigService.php
+++ b/extend/service/SystemConfigService.php
@@ -9,6 +9,7 @@ namespace service;
 
 
 use app\admin\model\system\SystemConfig;
+use service\CacheService as Cache;
 
 /** 获取系统配置服务类
  * Class SystemConfigService
@@ -34,16 +35,28 @@ class SystemConfigService
      */
     public static function get($key)
     {
-        return SystemConfig::getValue($key);
+        $cacheName = 'config_'.$key;
+        $config = Cache::get($cacheName);
+        if($config) return $config;
+        $config = SystemConfig::getValue($key);
+        Cache::set($cacheName,$config);
+        return $config;
     }
 
     /** 获取多个配置
      * @param $keys ',' 隔开
      * @return array
      */
-    public static function more($keys)
+    public static function more($keys,$update = false)
     {
-        return SystemConfig::getMore($keys);
+        $keys = is_array($keys) ? implode(',',$keys) : $keys;
+        $cacheName = 'more_'.$keys;
+        $config = Cache::get($cacheName);
+        if($config && !$update) return $config;
+        $config = SystemConfig::getMore($keys);
+        if(!$config) exception('对应的配置不存在!');
+        Cache::set($cacheName,$config);
+        return $config;
     }
 
     /**获取全部配置
@@ -51,7 +64,13 @@ class SystemConfigService
      */
     public static function getAll()
     {
-        return SystemConfig::getAllConfig()?:[];
+        $cacheName = 'config_all';
+        $config = Cache::get($cacheName);
+        if($config) return $config;
+        $config = SystemConfig::getAllConfig()?:[];
+        if(!$config) exception('对应的配置不存在!');
+        Cache::set($cacheName,$config);
+        return $config;
     }
 
 }
\ No newline at end of file
diff --git a/extend/service/WechatTemplateService.php b/extend/service/WechatTemplateService.php
index b08fbf1c..2ba3b387 100644
--- a/extend/service/WechatTemplateService.php
+++ b/extend/service/WechatTemplateService.php
@@ -68,7 +68,7 @@ class WechatTemplateService
      * @param string $defaultColor
      * @return bool
      */
-    public static function sendAdminNoticeTemplate(array $data,$url = null,$defaultColor = '')
+    public static function sendAdminNoticeTemplate(array $data,$url = 'pages/index/index',$defaultColor = '')
     {
         $adminIds = explode(',',trim(SystemConfigService::get('site_store_admin_uids')));
         $kefuIds = ServiceModel::where('notify',1)->column('uid');