取消配置缓存

app/common.php

@@ -6,6 +6,75 @@ use think\facade\Cache;
 use app\common\model\Config;
 use app\common\service\LangService;
 
+// if (!function_exists('site_config')) {
+
+//     /**
+//      * 获取/设置系统配置
+//      * @param string $name 属性名
+//      * @param mixed  $vars 属性值
+//      * @return mixed
+//      */
+//     function site_config(string $name,mixed $vars='')
+//     {
+        
+//         if(strpos($name,'.')!==false){
+//             $name=explode('.',$name);
+//             $group=$name[0];
+//             $name=$name[1];
+//         }else{
+//             $group=$name;
+//             $name='';
+//         }
+//         if(!$vars){
+//             $groupval=Cache::get('site_config_'.$group);
+//             if(!$groupval){
+//                 $groupval=Config::where('group',$group)->column('value','name');
+                
+//                 foreach ($groupval as $key=>$val){
+//                     if(is_string($val)){
+//                         if (str_starts_with($val, '{') &&  str_ends_with($val, '}')) {
+//                             $groupval[$key]=json_decode($val,true);
+//                             continue;
+//                         }
+//                         if(str_starts_with($val, '[') &&  str_ends_with($val, ']')){
+//                             $groupval[$key]=json_decode($val,true);
+//                             continue;
+//                         }
+//                     }
+//                     $groupval[$key]=$val;
+//                 }
+//                 Cache::set('site_config_'.$group,$groupval);
+//             }
+//             if($name) {
+//                 $type=Config::where(['group'=>$group,'name'=>$name])->value('type');
+//                 if($type=='array'){
+//                     $array=str_replace(' ', '', $groupval[$name]);
+//                     $array=str_replace('　', '', $array);
+//                     return explode(',', $array);
+//                 }
+//                 return $groupval[$name];
+//             }else{
+//                 return $groupval;
+//             }
+//         }else{
+//             if($name) {
+//                 if(is_array($vars)){
+//                     $vars=json_encode($vars,JSON_UNESCAPED_UNICODE);
+//                 }
+//                 Config::where(['group'=>$group,'name'=>$name])->update(['value'=>$vars]);
+//             }else{
+//                 foreach ($vars as $key=>$val){
+//                     if(is_array($val)){
+//                         $val=json_encode($val,JSON_UNESCAPED_UNICODE);
+//                     }
+//                     Config::where(['group'=>$group,'name'=>$key])->update(['value'=>$val]);
+//                 }
+//             }
+//             Cache::delete('site_config_'.$group);
+//         }
+//     }
+// }
+
 if (!function_exists('site_config')) {
 
     /**
@@ -26,7 +95,8 @@ if (!function_exists('site_config')) {
             $name='';
         }
         if(!$vars){
-            $groupval=Cache::get('site_config_'.$group);
+            // $groupval=Cache::get('site_config_'.$group);
+            $groupval=null;
             if(!$groupval){
                 $groupval=Config::where('group',$group)->column('value','name');
                 
@@ -43,7 +113,6 @@ if (!function_exists('site_config')) {
                     }
                     $groupval[$key]=$val;
                 }
-                Cache::set('site_config_'.$group,$groupval);
             }
             if($name) {
                 $type=Config::where(['group'=>$group,'name'=>$name])->value('type');
@@ -70,7 +139,6 @@ if (!function_exists('site_config')) {
                     Config::where(['group'=>$group,'name'=>$key])->update(['value'=>$val]);
                 }
             }
-            Cache::delete('site_config_'.$group);
         }
     }
 }