From 44ce2bf685af597f1468020a6a301aa6024ea5fa Mon Sep 17 00:00:00 2001 From: evoxwht <442384644@qq.com> Date: Mon, 24 Apr 2023 10:44:15 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E7=A7=BB=E5=8A=A8=E7=AB=AF=E5=92=8Cpc?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0icp=E5=A4=87=E6=A1=88=E4=BB=A5=E5=8F=8A?= =?UTF-8?q?=E7=BD=91=E5=AE=89=E5=A4=87=E6=A1=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../api/controller/pc/PublicController.php | 2 ++ .../api/controller/v1/PublicController.php | 3 +++ crmeb/app/api/route/v1.php | 2 -- .../pages/index/visualization/index.vue | 21 ++++++++++++++----- 4 files changed, 21 insertions(+), 7 deletions(-) diff --git a/crmeb/app/api/controller/pc/PublicController.php b/crmeb/app/api/controller/pc/PublicController.php index a27240474..2af4a81e3 100644 --- a/crmeb/app/api/controller/pc/PublicController.php +++ b/crmeb/app/api/controller/pc/PublicController.php @@ -51,6 +51,8 @@ class PublicController $data['site_keywords'] = sys_config('site_keywords'); $data['site_description'] = sys_config('site_description'); $data['network_security'] = sys_config('network_security'); + $data['icp_url'] = sys_config('icp_url'); + $data['network_security_url'] = sys_config('network_security_url'); $logoUrl = sys_config('pc_logo'); if (strstr($logoUrl, 'http') === false && $logoUrl) { $logoUrl = sys_config('site_url') . $logoUrl; diff --git a/crmeb/app/api/controller/v1/PublicController.php b/crmeb/app/api/controller/v1/PublicController.php index 377c6c25e..e10d2d1a2 100644 --- a/crmeb/app/api/controller/v1/PublicController.php +++ b/crmeb/app/api/controller/v1/PublicController.php @@ -117,6 +117,9 @@ class PublicController public function getSiteConfig() { $data['record_No'] = sys_config('record_No'); + $data['icp_url'] = sys_config('icp_url'); + $data['network_security'] = sys_config('network_security'); + $data['network_security_url'] = sys_config('network_security_url'); return app('json')->success($data); } diff --git a/crmeb/app/api/route/v1.php b/crmeb/app/api/route/v1.php index a87fd31ee..24010e15d 100644 --- a/crmeb/app/api/route/v1.php +++ b/crmeb/app/api/route/v1.php @@ -365,8 +365,6 @@ Route::group(function () { Route::post('user/set_visit', 'v1.user.UserController/set_visit')->name('setVisit');// 添加用户访问记录 //复制口令接口 Route::get('copy_words', 'v1.PublicController/copy_words')->name('copyWords');// 复制口令接口 - //获取网站配置 - Route::get('site_config', 'v1.PublicController/getSiteConfig')->name('getSiteConfig');//获取网站配置 //活动---积分商城 Route::get('store_integral/index', 'v1.activity.StoreIntegralController/index')->name('storeIntegralIndex');//积分商城首页数据 diff --git a/template/uni-app/pages/index/visualization/index.vue b/template/uni-app/pages/index/visualization/index.vue index 96bf02933..b9d96666f 100644 --- a/template/uni-app/pages/index/visualization/index.vue +++ b/template/uni-app/pages/index/visualization/index.vue @@ -89,7 +89,8 @@ - {{site_config}} + {{site_config.record_No}} + {{site_config.network_security}} { - this.site_config = res.data.record_No; + this.site_config = res.data; }) .catch((err) => { return this.$util.Tips({ @@ -486,13 +487,23 @@ // #endif goICP() { // #ifdef H5 - window.open("http://beian.miit.gov.cn/"); + window.open(this.site_config.icp_url); // #endif // #ifdef MP uni.navigateTo({ - url: `/pages/annex/web_view/index?url=https://beian.miit.gov.cn/`, + url: `/pages/annex/web_view/index?url=` + this.site_config.icp_url, }); // #endif + }, + goNetwork() { + // #ifdef H5 + window.open(this.site_config.network_security_url); + // #endif + // #ifdef MP + uni.navigateTo({ + url: `/pages/annex/web_view/index?url=` + this.site_config.network_security_url, + }); + // #endif }, onLoadFun() {}, reconnect() { From a4a6bd7f3d7690800edbdd74c1d6e75b7950875a Mon Sep 17 00:00:00 2001 From: evoxwht <442384644@qq.com> Date: Mon, 24 Apr 2023 10:44:30 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=96=87=E4=BB=B6?= =?UTF-8?q?=E4=BB=A5=E5=8F=8A=E6=95=B0=E6=8D=AE=E5=BA=93=E5=A4=87=E6=B3=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- crmeb/app/services/system/SystemDatabackupServices.php | 6 +++++- crmeb/app/services/system/log/SystemFileServices.php | 1 + 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/crmeb/app/services/system/SystemDatabackupServices.php b/crmeb/app/services/system/SystemDatabackupServices.php index 1d5e79a1b..90ed20369 100644 --- a/crmeb/app/services/system/SystemDatabackupServices.php +++ b/crmeb/app/services/system/SystemDatabackupServices.php @@ -53,6 +53,9 @@ class SystemDatabackupServices extends BaseServices public function getDataList() { $list = $this->dbBackup->dataList(); + foreach ($list as &$item) { + $item['is_edit'] = false; + } $count = count($list); return compact('list', 'count'); } @@ -69,6 +72,7 @@ class SystemDatabackupServices extends BaseServices $count = count($list); foreach ($list as $key => $f) { $list[$key]['EXTRA'] = ($f['EXTRA'] == 'auto_increment' ? '是' : ' '); + $list[$key]['is_edit'] = false; } return compact('list', 'count'); } @@ -91,7 +95,7 @@ class SystemDatabackupServices extends BaseServices { $tables = explode(',', $tables); $data = ''; - ini_set ("memory_limit","-1"); + ini_set("memory_limit", "-1"); foreach ($tables as $t) { $res = $this->dbBackup->backup($t, 0); if ($res == false && $res != 0) { diff --git a/crmeb/app/services/system/log/SystemFileServices.php b/crmeb/app/services/system/log/SystemFileServices.php index 8990fa77d..ee84f82b7 100644 --- a/crmeb/app/services/system/log/SystemFileServices.php +++ b/crmeb/app/services/system/log/SystemFileServices.php @@ -288,6 +288,7 @@ class SystemFileServices extends BaseServices $navList[$key]['pathname'] = $value['pathname']; $navList[$key]['contextmenu'] = true; $list[$key]['mark'] = $markList[str_replace(root_path(), '/', $value['pathname'])] ?? ''; + $list[$key]['is_edit'] = false; } return compact('dir', 'list', 'navList'); }