diff --git a/app/api/controller/Agreement.php b/app/api/controller/Agreement.php index 2bd93f374add68341a62e7a4090a4d0e0ea891ec..1fc7135e209089ff539f26c1677db4fc4bf92ebf 100644 --- a/app/api/controller/Agreement.php +++ b/app/api/controller/Agreement.php @@ -11,7 +11,7 @@ namespace app\api\controller; use app\service\ApiService; -use app\service\SystemBaseService; +use app\service\AgreementService; /** * 协议 @@ -45,7 +45,7 @@ class Agreement extends Common */ public function Index() { - return ApiService::ApiDataReturn(SystemBaseService::AgreementData($this->data_request)); + return ApiService::ApiDataReturn(AgreementService::AgreementData($this->data_request)); } } ?> \ No newline at end of file diff --git a/app/index/controller/Agreement.php b/app/index/controller/Agreement.php index 64c49dfe2b15d1e899df18a3c0a459293e9943a3..5be6e818c4db6e7dfd99a472dc4009a1b118c6ab 100644 --- a/app/index/controller/Agreement.php +++ b/app/index/controller/Agreement.php @@ -10,8 +10,8 @@ // +---------------------------------------------------------------------- namespace app\index\controller; -use app\service\ConfigService; use app\service\SeoService; +use app\service\AgreementService; /** * 协议 @@ -52,15 +52,18 @@ class Agreement extends Common $data = []; if(!empty($params['document'])) { - $key = 'common_agreement_'.$params['document']; - $ret = ConfigService::ConfigContentRow($key); + // 获取协议内容 + $ret = AgreementService::AgreementData($params); // 浏览器标题 - if(!empty($ret['data']['name'])) + if(!empty($ret['data'])) { - MyViewAssign('home_seo_site_title', SeoService::BrowserSeoTitle($ret['data']['name'])); + if(!empty($ret['data']['name'])) + { + MyViewAssign('home_seo_site_title', SeoService::BrowserSeoTitle($ret['data']['name'])); + } + $data = $ret['data']; } - $data = $ret['data']; } // 是否仅展示内容 diff --git a/app/service/AgreementService.php b/app/service/AgreementService.php new file mode 100644 index 0000000000000000000000000000000000000000..a8ce79b6a991503da8be29c1e32d3f465d85a426 --- /dev/null +++ b/app/service/AgreementService.php @@ -0,0 +1,54 @@ + 'empty', + 'key_name' => 'document', + 'error_msg' => '协议文档类型有误', + ], + ]; + $ret = ParamsChecked($params, $p); + if($ret !== true) + { + return DataReturn($ret, -1); + } + + // 获取内容 + return ConfigService::ConfigContentRow('common_agreement_'.$params['document']); + } +} +?> \ No newline at end of file diff --git a/app/service/ConfigService.php b/app/service/ConfigService.php index 58e68577638178d541b2391de7771e3701919ec0..997c8542e1135daf5a60720b126458722d282c49 100755 --- a/app/service/ConfigService.php +++ b/app/service/ConfigService.php @@ -22,25 +22,30 @@ use app\service\ResourcesService; */ class ConfigService { + // 不参与缓存的配置 + public static $not_cache_field_list = [ + 'common_agreement_userregister', + 'common_agreement_userprivacy', + ]; + // 富文本,不实例化的字段 public static $rich_text_list = [ - 'home_footer_info', - 'common_email_currency_template', - 'home_email_user_reg', - 'home_email_user_forget_pwd', - 'home_email_user_email_binding', - 'home_site_close_reason', - 'common_agreement_userregister', - 'common_agreement_userprivacy', - 'common_self_extraction_address', - 'home_index_floor_top_right_keywords', - 'home_index_floor_manual_mode_goods', - 'home_index_floor_left_top_category', - 'admin_email_login_template', - 'home_email_login_template', - 'home_site_security_record_url', - 'layout_index_home_data', - ]; + 'common_agreement_userregister', + 'common_agreement_userprivacy', + 'common_email_currency_template', + 'home_footer_info', + 'home_email_user_reg', + 'home_email_user_forget_pwd', + 'home_email_user_email_binding', + 'home_site_close_reason', + 'common_self_extraction_address', + 'home_index_floor_top_right_keywords', + 'home_index_floor_manual_mode_goods', + 'home_index_floor_left_top_category', + 'admin_email_login_template', + 'home_email_login_template', + 'home_site_security_record_url', + ]; // 附件字段列表 public static $attachment_field_list = [ @@ -186,6 +191,7 @@ class ConfigService // 单条配置缓存删除 MyCache($k, null); + MyCache($k.'_row_data', null); } } if($success > 0) @@ -265,6 +271,12 @@ class ConfigService // 数据处理 foreach($data as $k=>&$v) { + // 不参与缓存的配置 + if(in_array($k, self::$not_cache_field_list)) + { + continue; + } + // 富文本字段处理 if(in_array($k, self::$rich_text_list)) { @@ -361,7 +373,8 @@ class ConfigService */ public static function ConfigContentRow($key) { - $data = MyCache($key); + $cache_key = $key.'_row_data'; + $data = MyCache($cache_key); if($data === null) { $data = Db::name('Config')->where(['only_tag'=>$key])->field('name,value,type,upd_time')->find(); @@ -376,7 +389,7 @@ class ConfigService } else { $data = []; } - MyCache($key, $data); + MyCache($cache_key, $data); } return DataReturn('操作成功', 0, $data); diff --git a/app/service/SystemBaseService.php b/app/service/SystemBaseService.php index d45747a3c942e4bf2cf58493865067f7fd7752b1..46bae15c894a197f1bd13a65b8f6cb1c813d7643 100644 --- a/app/service/SystemBaseService.php +++ b/app/service/SystemBaseService.php @@ -14,7 +14,6 @@ use think\facade\Db; use app\service\ResourcesService; use app\service\QuickNavService; use app\service\PluginsService; -use app\service\ConfigService; /** * 系统基础公共信息服务层 @@ -445,35 +444,6 @@ class SystemBaseService return $status; } - /** - * 协议数据 - * @author Devil - * @blog http://gong.gg/ - * @version 1.0.0 - * @date 2021-04-25 - * @desc description - * @param [array] $params [输入参数] - */ - public static function AgreementData($params = []) - { - // 请求参数 - $p = [ - [ - 'checked_type' => 'empty', - 'key_name' => 'document', - 'error_msg' => '协议文档类型有误', - ], - ]; - $ret = ParamsChecked($params, $p); - if($ret !== true) - { - return DataReturn($ret, -1); - } - - // 获取内容 - return ConfigService::ConfigContentRow('common_agreement_'.$params['document']); - } - /** * 附件地址 * @author Devil