diff --git a/src/dede/inc/inc_menu.php b/src/dede/inc/inc_menu.php index 7d08ac60..b24e3ecb 100755 --- a/src/dede/inc/inc_menu.php +++ b/src/dede/inc/inc_menu.php @@ -37,7 +37,9 @@ while($row = $dsql->GetObject('mm')) $addset .= " \r\n"; } ////////////////////////// - +$helpUrl = DEDEBIZURL."/help"; +$gitUrl = DEDEBIZURL."/git"; +$dedebizUrl = DEDEBIZURL; $adminMenu1 = $adminMenu2 = ''; if($cuserLogin->getUserType() >= 10) { @@ -158,9 +160,9 @@ $adminMenu1 $adminMenu2 - - - + + + ----------------------------------------------- diff --git a/src/dede/index_body.php b/src/dede/index_body.php index ad1f05d9..c4489a47 100755 --- a/src/dede/index_body.php +++ b/src/dede/index_body.php @@ -245,6 +245,17 @@ else if ($dopost == 'getRightSide') { openssl_public_decrypt(base64_decode($cfg_auth_code), $decotent, DEDEPUB); + $core_info = new stdClass; + if (!empty($cfg_bizcore_appid) && !empty($cfg_bizcore_key)) { + $client = new DedeBizClient($cfg_bizcore_hostname, $cfg_bizcore_port); + $client->appid = $cfg_bizcore_appid; + $client->key = $cfg_bizcore_key; + $core_info = $client->SystemInfo(); + if ($core_info->code === 200) { + $client->Close(); + } + } + if (!empty($decotent)) { $res = json_decode($decotent); if (isset($res->sid)) { @@ -257,30 +268,10 @@ else if ($dopost == 'getRightSide') { "stype" => $res->stype == 1? "企业单位" : "个人", "auth_version" => $res->auth_version, "auth_at" => date("Y-m-d", $res->auth_at), + "core" => $core_info, ), )); } - - } - - - - - - // 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 80a05741..95e28497 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 11fd60f7..29405129 100755 --- a/src/dede/templets/index_body.htm +++ b/src/dede/templets/index_body.htm @@ -13,8 +13,10 @@ + +