From ac9141298b3afdb3c645a34bb18afa8ea2eb3c8a Mon Sep 17 00:00:00 2001 From: tianya Date: Wed, 30 Sep 2020 15:31:25 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/dede/inc/inc_menu.php | 2 +- src/dede/index_body.php | 62 ++++++++++++++++--- src/dede/templets/index2.htm | 2 +- src/dede/templets/index_body.htm | 100 ++++++++++++++++++++++--------- src/include/common.inc.php | 15 +++++ 5 files changed, 144 insertions(+), 37 deletions(-) diff --git a/src/dede/inc/inc_menu.php b/src/dede/inc/inc_menu.php index 9a830c63..839c0333 100755 --- a/src/dede/inc/inc_menu.php +++ b/src/dede/inc/inc_menu.php @@ -161,7 +161,7 @@ $adminMenu2 - + diff --git a/src/dede/index_body.php b/src/dede/index_body.php index fe950fcb..0c96a787 100755 --- a/src/dede/index_body.php +++ b/src/dede/index_body.php @@ -226,16 +226,62 @@ else if ($dopost == 'getRightSide') { // 直接采用DedeBIZ重写方法 exit; } elseif ($dopost == "system_info") { - $client = new DedeBizClient('127.0.0.1', 8181); - $client->appid = "1008665"; - $client->key = "I04NcaYUCmRukRDE"; - $rs = $client->SystemInfo(); - - if ($rs->code === 200) { - echo $rs->data; - $client->Close(); + if (!extension_loaded("openssl")) { + echo json_encode(array( + "code" => -1001, + "msg"=>"PHP不支持OpenSSL，无法完成Dede商业授权", + "result"=>null, + )); exit; } + + if (empty($cfg_auth_code)) { + echo json_encode(array( + "code" => -1002, + "msg"=>"当前站点尚未购买Dede商业授权", + "result"=>null, + )); + exit; + } + + openssl_public_decrypt(base64_decode($cfg_auth_code), $decotent, DEDEPUB); + + if (!empty($decotent)) { + $res = json_decode($decotent); + if (isset($res->sid)) { + echo json_encode(array( + "code" => 200, + "msg"=>"", + "result"=>array( + "domain" => $res->domain, + "title" => $res->title, + "stype" => $res->stype == 1? "企业单位" : "个人", + "auth_version" => $res->auth_version, + "auth_at" => date("Y-m-d", $res->auth_at), + ), + )); + } + + + } + + + + + + // openssl_public_decrypt(base64_decode($cfg_auth_code), $decotent, DEDEPUB); + // var_dump($decotent); + + // $client = new DedeBizClient('127.0.0.1', 8181); + // $client->appid = "1008665"; + // $client->key = "I04NcaYUCmRukRDE"; + // $rs = $client->SystemInfo(); + + // if ($rs->code === 200) { + // echo $rs->data; + // $client->Close(); + // exit; + // } } ?> \ No newline at end of file diff --git a/src/dede/templets/index2.htm b/src/dede/templets/index2.htm index 4564e809..346a545c 100755 --- a/src/dede/templets/index2.htm +++ b/src/dede/templets/index2.htm @@ -115,7 +115,7 @@
- 代码托管 官方论坛 + 代码托管 官方论坛
diff --git a/src/dede/templets/index_body.htm b/src/dede/templets/index_body.htm index 19ad44d1..f94350e4 100755 --- a/src/dede/templets/index_body.htm +++ b/src/dede/templets/index_body.htm @@ -81,7 +81,7 @@
- Dede商业服务 + Dede商业服务授权
@@ -401,33 +401,79 @@ $.get("index_body.php?dopost=system_info", function (data) { let rsp = JSON.parse(data); if (rsp.code === 200) { - $("#_systeminfo").html(` - - - - - - - - - - - - - - - - - - -
运行时间： ${rsp.result.server_run_time}
系统： ${rsp.result.server_goos}（${rsp.result.server_goarch}）
版本号： v${rsp.result.server_version}
内存使用： -
${rsp.result.server_memory_usage}%
-
- `); + let infoStr = ``; + if (typeof rsp.result.domain !== "undefined") { + infoStr += ` + + + + + `; + } + if (typeof rsp.result.title !== "undefined") { + infoStr += ` + + + + + `; + } + if (typeof rsp.result.stype !== "undefined") { + infoStr += ` + + + + + `; + } + if (typeof rsp.result.auth_version !== "undefined") { + infoStr += ` + + + + + `; + } + if (typeof rsp.result.auth_at !== "undefined") { + infoStr += ` + + + + + `; + } + + if (typeof rsp.result.server_run_time === "undefined") { + // 下面是DedeBIZ Core组件信息 + infoStr += ` + + + + + `; + } else { + // 下面是DedeBIZ Core组件信息 + if (typeof rsp.result.server_run_time !== "undefined") { + infoStr += ` + + + + + `; + } else { + // 商业组件信息 + } + } + infoStr += "
授权域名： ${rsp.result.domain} 【查看】
站点名称： ${rsp.result.title}
站点类型： ${rsp.result.stype}
授权版本： v${rsp.result.auth_version}.x.x
授权时间： ${rsp.result.auth_at}
Dede商业组件： 如何启动组件
运行时间： ${rsp.result.server_run_time}
"; + + $("#_systeminfo").html(infoStr); } else { - $("#_systeminfo").html(`尚未启动Dede商业站点服务，去开启`); + $("#_systeminfo").html(` +
尚未启动Dede商业站点服务，原因：${rsp.msg}
+
Dede商业服务可以提升性能、增强安全、支持开源。
+
开启商业服务
+ `); } - }); } @@ -435,7 +481,7 @@ LoadServer(); setInterval(function () { LoadServer(); - }, 1000) + }, 5000) }); diff --git a/src/include/common.inc.php b/src/include/common.inc.php index 714c2a79..fc231a45 100755 --- a/src/include/common.inc.php +++ b/src/include/common.inc.php @@ -31,6 +31,21 @@ define('DEDEMODEL', './model'); define('DEDECONTROL', './control'); define('DEDEAPPTPL', './templates'); +// ------------------------------------------------------------------------ +define('DEDEVER', 6); // 当前系统大版本 +define('DEDEPUB', <<