Browse Source

DedeBIZ调整

tags/6.0.0
tianya 3 years ago
parent
commit
d84cbc28f8
12 changed files with 127 additions and 92 deletions
  1. +6
    -4
      src/dede/inc/inc_menu.php
  2. +12
    -21
      src/dede/index_body.php
  3. +1
    -1
      src/dede/templets/index2.htm
  4. +44
    -16
      src/dede/templets/index_body.htm
  5. +33
    -33
      src/dede/templets/module_make.htm
  6. +5
    -0
      src/include/common.inc.php
  7. +19
    -10
      src/include/dedebiz.class.php
  8. +3
    -3
      src/install/templates/step-1.html
  9. +1
    -1
      src/install/templates/step-2.html
  10. +1
    -1
      src/install/templates/step-3.html
  11. +1
    -1
      src/install/templates/step-4.html
  12. +1
    -1
      src/install/templates/step-5.html

+ 6
- 4
src/dede/inc/inc_menu.php View File

@@ -37,7 +37,9 @@ while($row = $dsql->GetObject('mm'))
$addset .= " <m:item name='{$row->typename}' ischannel='1' link='{$row->mancon}?channelid={$row->id}' linkadd='{$row->addcon}?channelid={$row->id}' channelid='{$row->id}' rank='' target='main' />\r\n";
}
//////////////////////////
$helpUrl = DEDEBIZURL."/help";
$gitUrl = DEDEBIZURL."/git";
$dedebizUrl = DEDEBIZURL;
$adminMenu1 = $adminMenu2 = '';
if($cuserLogin->getUserType() >= 10)
{
@@ -158,9 +160,9 @@ $adminMenu1
$adminMenu2
<m:top item='1_10_7_' name='系统帮助' display='none'>
<m:item name='参考文档' link='https://www.dedebiz.com/help' rank='' target='_blank' />
<m:item name='代码托管' link='https://www.dedebiz.com/git' rank='' target='_blank' />
<m:item name='商业支持' link='https://www.dedebiz.com' rank='' target='_blank' />
<m:item name='参考文档' link='$cfg_biz_helpUrl' rank='' target='_blank' />
<m:item name='代码托管' link='$cfg_biz_gitUrl' rank='' target='_blank' />
<m:item name='商业支持' link='$cfg_biz_dedebizUrl' rank='' target='_blank' />
</m:top>
-----------------------------------------------

+ 12
- 21
src/dede/index_body.php View File

@@ -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;
// }
}
?>

+ 1
- 1
src/dede/templets/index2.htm View File

@@ -115,7 +115,7 @@
<form action="action_search.php" target="main" method="post">
<input name="keyword" type="text" value="功能搜索" onfocus="if(this.value=='功能搜索'){this.value='';}" onblur="if(this.value==''){this.value='功能搜索';}" class="allsearch" style="width:150px;"/>
<input name="" type="submit" value="搜索" class="np"/>
<a href='https://www.dedebiz.com/git' target='_blank'>代码托管</a> <a href='https://www.dedebiz.com/help' target='_blank'>帮助中心</a>
<a href='<?php echo $cfg_biz_gitUrl;?>' target='_blank'>代码托管</a> <a href='<?php echo $cfg_biz_helpUrl;?>' target='_blank'>帮助中心</a>
</form>
</div>
</div>


+ 44
- 16
src/dede/templets/index_body.htm View File

@@ -13,8 +13,10 @@
<link rel="stylesheet" type="text/css" href="css/indexbody.css" />
<link href="images/style<?php echo $cfg_admin_skin;?>/style.css" rel="stylesheet" type="text/css" />
<script language="javascript" src="../static/js/jquery.js"></script>
<script src="../static/js/bootstrap.bundle.js"></script>
<script language="javascript" src="../static/js/dedeajax2.js"></script>
<script language="javascript" src="js/indexbody.js"></script>
<script language="javascript" src="js/main.js"></script>
<script type="text/javascript">
function showMore() {
$("#allInfo").toggle();
@@ -337,7 +339,7 @@
<div class="footer">
<!-- //底部 -->
<div align="center" class="footer">
Copyright &copy; 2020 <a href='https://www.dedebiz.com' target='_blank'><u>DedeCMSv6</u></a>. 版权所有 <a
Copyright &copy; 2020 <a href='https://www.dedebiz.com' target='_blank'><u>DedeCMSV6</u></a>. 版权所有 <a
href="https://www.dedebiz.com" target="_blank" title="DedeBiz商业技术支持,提供更专业强大的站点应用开发技术">DedeBIZ技术支持</a>
</div>
@@ -396,6 +398,36 @@
<script>
var dedebizInfo;
function ViewDedeBIZ() {
console.log(dedebizInfo);
ShowMsg(`
<table width="100%" class="table table-borderless"><tbody>
<tr>
<td class="nline" style="text-align:left"> 版本号: </td>
<td class="nline" style="text-align:left"> v${dedebizInfo.result.server_version} </td>
</tr>
<tr>
<td class="nline" style="text-align:left"> 运行时间: </td>
<td class="nline" style="text-align:left"> ${dedebizInfo.result.server_run_time} </td>
</tr>
<tr>
<td class="nline" style="text-align:left"> 服务器系统: </td>
<td class="nline" style="text-align:left"> ${dedebizInfo.result.server_goos}(${dedebizInfo.result.server_goarch}) </td>
</tr>
<tr>
<td class="nline" style="text-align:left"> 内存占用: </td>
<td class="nline" style="text-align:left"> ${dedebizInfo.result.server_memory_usage}% </td>
</tr>
</tbody></table>
`);
}
// 加载服务信息
function LoadServer() {
$.get("index_body.php?dopost=system_info", function (data) {
@@ -406,7 +438,7 @@
infoStr += `
<tr>
<td class="nline" style="text-align:left"> 授权域名: </td>
<td class="nline" style="text-align:left"> ${rsp.result.domain} <a href="https://www.dedebiz.com/auth/?domain=${rsp.result.domain}"><b>【查看】</b></a> </td>
<td class="nline" style="text-align:left"> ${rsp.result.domain} <a href="<?php echo $cfg_biz_dedebizUrl;?>/auth/?domain=${rsp.result.domain}"><b>【查看】</b></a> </td>
</tr>
`;
}
@@ -443,26 +475,22 @@
`;
}
if (typeof rsp.result.server_run_time === "undefined") {
if (rsp.result.core.code != 200) {
// 下面是DedeBIZ Core组件信息
infoStr += `
<tr>
<td class="nline" style="text-align:left"> Dede商业组件: </td>
<td class="nline" style="text-align:left"> <a class="btn btn-danger btn-sm" target="_blank" href="https://www.dedebiz.com/start?code=-1008">如何启动组件</a> </td>
<td class="nline" style="text-align:left"> <a class="btn btn-danger btn-sm" target="_blank" href="<?php echo $cfg_biz_dedebizUrl;?>/start?code=-1008">如何启动组件</a> </td>
</tr>
`;
} else {
// 下面是DedeBIZ Core组件信息
if (typeof rsp.result.server_run_time !== "undefined") {
infoStr += `
<tr>
<td class="nline" style="text-align:left"> 运行时间: </td>
<td class="nline" style="text-align:left"> ${rsp.result.server_run_time} </td>
</tr>
`;
} else {
// 商业组件信息
}
dedebizInfo = JSON.parse(rsp.result.core.data);
infoStr += `
<tr>
<td class="nline" style="text-align:left"> Dede商业组件: </td>
<td class="nline" style="text-align:left"> <a class="btn btn-success btn-sm" href="javascript:ViewDedeBIZ()">查看组件信息</a> </td>
</tr>
`;
}
infoStr += "</tbody></table>";
@@ -471,7 +499,7 @@
$("#_systeminfo").html(`
<div class="py-1">尚未启动Dede商业站点服务,原因:<b>${rsp.msg}</b></div>
<div class="py-1">Dede商业服务可以提升性能、增强安全、支持开源。</div>
<div class="py-1"><a class="btn btn-danger" target="_blank" href="https://www.dedebiz.com/start?code=${rsp.code}">开启商业服务</a></div>
<div class="py-1"><a class="btn btn-danger" target="_blank" href="<?php echo $cfg_biz_dedebizUrl;?>/start?code=${rsp.code}">开启商业服务</a></div>
`);
}
});


+ 33
- 33
src/dede/templets/module_make.htm View File

@@ -2,6 +2,8 @@
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
<meta http-equiv="Content-Type" content="text/html; charset=<?php echo $cfg_soft_lang; ?>">
<link rel="stylesheet" href="../static/css/bootstrap.min.css">
<link href="../static/font-awesome/css/font-awesome.min.css" rel="stylesheet">
<script language="javascript" src="../static/js/dedeajax2.js"></script>
<script language="javascript">
function LoadHashCode()
@@ -66,7 +68,7 @@ td{padding-left:8px}
<div class="bodytitleleft"></div>
<div class="bodytitletxt" style="padding-left:10px;"><b>模块管理</b></div>
</div>
<table width="98%" border="0" cellpadding="1" cellspacing="1" align="center" class="tbtitle" style="background:#CFCFCF;">
<table width="98%" border="0" cellpadding="1" cellspacing="1" align="center" class="table maintable" style="background:#CFCFCF;">
<form action="module_make.php" method="post" enctype="multipart/form-data" name="form1">
<input type='hidden' name='action' value='make'>
<tr>
@@ -89,41 +91,29 @@ td{padding-left:8px}
<tr>
<td align="center" bgcolor="#FFFFFF"><b>封装类型:</b></td>
<td bgcolor="#FFFFFF">
<input name="moduletype" type="radio" id="moduletype1" class='np' value='soft' checked='1' /> 模块
<input name="moduletype" type="radio" id="moduletype2" class='np' value='templets' /> 模板
<input name="moduletype" type="radio" id="moduletype3" class='np' value='plus' /> 小插件
<input name="moduletype" type="radio" id="moduletype3" class='np' value='patch' /> 补丁
<label><input name="moduletype" type="radio" id="moduletype1" class='np' value='soft' checked='1' /> 模块</label>
<label><input name="moduletype" type="radio" id="moduletype2" class='np' value='templets' /> 模板</label>
<label><input name="moduletype" type="radio" id="moduletype3" class='np' value='plus' /> 小插件</label>
<label><input name="moduletype" type="radio" id="moduletype3" class='np' value='patch' /> 补丁</label>
</td>
</tr>
<tr>
<td align="center" bgcolor="#FFFFFF"><b>联系Email:</b></td>
<td bgcolor="#FFFFFF"><input name="email" type="text" id="email" style="width:180px" onchange="LoadHashCode()" class='alltxt'/> </td>
</tr>
<tr>
<td align="center" bgcolor="#FFFFFF"><b>模块识别码:</b></td>
<td align="center" bgcolor="#FFFFFF"><b>开发者ID:</b></td>
<td bgcolor="#FFFFFF">
<span id='modulcode'>由模块名称和Email生成</span>[<a href='javascript:LoadHashCode();'>更新</a>] </td>
</tr>
<tr>
<td align="center" bgcolor="#FFFFFF"><b>开发团队:</b></td>
<td bgcolor="#FFFFFF"><input name="team" type="text" id="team" style="width:180px" class='alltxt' /> </td>
<input name="dev_id" type="text" id="dev_id" style="width:180px" class='alltxt'/> <a href="<?php echo $cfg_biz_dedebizUrl;?>/developer" target="_blank" class="text-success">如何获取开发者ID?</a>
</td>
</tr>
<tr>
<td align="center" bgcolor="#FFFFFF"><b>发布时间:</b></td>
<td bgcolor="#FFFFFF">
<input name="mtime" type="text" id="mtime" style="width:180px" value="<?php echo GetDateMk(time()); ?>" class='alltxt'/> </td>
</tr>
<tr>
<td align="center" bgcolor="#FFFFFF"><b>官方网址:</b></td>
<td bgcolor="#FFFFFF"><input name="url" type="text" id="url" style="width:250px" class='alltxt' /> </td>
</tr>
<tr>
<td align="center" bgcolor="#FFFFFF"><b>是否涉及会员系统:</b></td>
<td bgcolor="#FFFFFF">
<input name="ismember" type="radio" class='np' id="ismember0" value="0" onclick="ShowHideMb('ismember0','rboxct')" checked="checked" />
不涉及
<input name="ismember" type="radio" id="ismember1" value="1" onclick="ShowHideMb('ismember0','rboxct')" class='np' /> 涉及
<label><input name="ismember" type="radio" class='np' id="ismember0" value="0" onclick="ShowHideMb('ismember0','rboxct')" checked="checked" />
不涉及</label>
<label><input name="ismember" type="radio" id="ismember1" value="1" onclick="ShowHideMb('ismember0','rboxct')" class='np' /> 涉及</label>
<div id='rboxct' style='display:none'>
导航使用名称:
<input name="indexname" type="text" id="indexname" style="width:180px" value=""/>
@@ -146,8 +136,8 @@ td{padding-left:8px}
<tr>
<td align="center" bgcolor="#FFFFFF"><b>使用说明文件:</b></td>
<td bgcolor="#FFFFFF">
<input type="checkbox" name="autoreadme" value='1' id="autoreadme" class="np" onclick="ShowHideField('autoreadme','autoreadmeinput','autoreadmect')" />
直接填写
<label><input type="checkbox" name="autoreadme" value='1' id="autoreadme" class="np" onclick="ShowHideField('autoreadme','autoreadmeinput','autoreadmect')" />
直接填写</label>
<br />
<div style='display:block' id='autoreadmeinput'>
<input name="readme" type="file" id="readme" style="width:350px" />
@@ -172,9 +162,8 @@ td{padding-left:8px}
<tr>
<td align="center" bgcolor="#FFFFFF"><b>安装程序:</b></td>
<td bgcolor="#FFFFFF">
<input type="checkbox" name="autosetup" value='1' id="autosetup" class="np" onclick="ShowHideField('autosetup','autosetupinput','autosetupct')" />
自动生成(由系统自动处理安装)
<label><input type="checkbox" name="autosetup" value='1' id="autosetup" class="np" onclick="ShowHideField('autosetup','autosetupinput','autosetupct')" />
自动生成(由系统自动处理安装)</label>
<br />
<div style='display:block' id='autosetupinput'>
<input name="setup" type="file" id="setup" style="width:350px" />
@@ -203,9 +192,8 @@ td{padding-left:8px}
<tr>
<td align="center" bgcolor="#FFFFFF"><b>删除程序:</b></td>
<td bgcolor="#FFFFFF">
<input type="checkbox" name="autodel" value='1' id="autodel" class="np" onclick="ShowHideField('autodel','autodelinput','autodelct')" />
自动生成(由系统自动处理卸载)
<label><input type="checkbox" name="autodel" value='1' id="autodel" class="np" onclick="ShowHideField('autodel','autodelinput','autodelct')" />
自动生成(由系统自动处理卸载)</label>
<br />
<div style='display:block' id='autodelinput'>
<input name="uninstall" type="file" id="uninstall" style="width:350px" />
@@ -241,16 +229,28 @@ td{padding-left:8px}
</p>
</td>
</tr>
<tr>
<td align="center" bgcolor="#FFFFFF"><b>开发者私钥:</b></td>
<td bgcolor="#FFFFFF">
<p>
开发者认证后获取的私钥
<br />
<textarea name="filelist" rows="8" id="filelist" style="width:80%"></textarea>
</p>
</td>
</tr>
<tr bgcolor="#F9FDF0">
<td height="28" colspan="2" bgcolor="#F9FCEF">
<table width="100%" border="0" cellspacing="0" cellpadding="0">
<tr>
<td width="26%">&nbsp;</td>
<td width="15%">
<input name="imageField" type="submit" class="np coolbg" value="提交" />
<button name="imageField" type="submit" class="btn btn-secondary">提交</button>
</td>
<td width="59%">
<input type="button" name="button" id="button" value="返回" onClick="location='plus_main.php';" class="np coolbg" />
<button type="button" name="button" id="button" onClick="location='plus_main.php';" class="btn btn-secondary">返回</button>
</td>
</tr>
</table>


+ 5
- 0
src/include/common.inc.php View File

@@ -31,6 +31,7 @@ define('DEDECONTROL', './control');
define('DEDEAPPTPL', './templates');

// ------------------------------------------------------------------------
define('DEDEBIZURL', "http://127.0.0.1:8898"); // Dede商业支持
define('DEDEVER', 6); // 当前系统大版本
define('DEDEPUB', <<<EOT
-----BEGIN PUBLIC KEY-----
@@ -333,6 +334,10 @@ if (version_compare(PHP_VERSION, '7.2.0', '>='))
require_once(DEDEINC.'/autoload.inc.php');
}

$cfg_biz_helpUrl = DEDEBIZURL."/help";
$cfg_biz_gitUrl = DEDEBIZURL."/git";
$cfg_biz_dedebizUrl = DEDEBIZURL;


//引入数据库类
if ( $GLOBALS['cfg_dbtype'] =='mysql' )


+ 19
- 10
src/include/dedebiz.class.php View File

@@ -2,6 +2,10 @@
// Copyright 2020 The DedeBiz Authors. All rights reserved.
// license that can be found in the LICENSE file.

// @copyright Copyright (c) 2020, DedeBIZ.COM
// @license https://www.dedebiz.com/license
// @link https://www.dedebiz.com

// 本文件为DedeCMS商业组件(www.dedebiz.com)PHP SDK
// 目的是弥补织梦内容管理系统(DedeCMS)性能和安全方面的不足,提供更多功能

@@ -13,26 +17,28 @@ class DedeBizClient
var $socket;
var $appid;
var $key;
var $err;

function __construct($ipaddr, $port)
{
$this->err = "";
if (!function_exists("socket_create")) {
echo json_encode(array(
$this->err = (object)array(
"code" => -1,
"data" => null,
"msg" => "请在php.ini开启extension=sockets",
));
exit;
);
return;
}
$this->socket = socket_create(AF_INET, SOCK_STREAM, SOL_TCP);
$rs = @socket_connect($this->socket, $ipaddr, $port);
if (!$rs) {
echo json_encode(array(
$this->err = (object)array(
"code" => -1,
"data" => null,
"msg" => "连接DedeBiz商业组件服务失败\r\n",
));
exit;
);
return;
}
}

@@ -41,15 +47,18 @@ class DedeBizClient
$this->MakeSign($req);
$str = json_encode($req);
$length = strlen($str);
$s = socket_write($this->socket, $str, $length);
$s = @socket_write($this->socket, $str, $length);

if (!$s) {
echo json_encode(array(
return (object)array(
"code" => -1,
"data" => null,
"msg" => "连接DedeBiz商业组件服务失败\r\n",
));
exit;
);
}

if (!empty($this->err)) {
return $this->err;
}

$msg = "";


+ 3
- 3
src/install/templates/step-1.html View File

@@ -19,7 +19,7 @@
</div>
<div class="top-link">
<ul>
<li><a href="https://www.dedebiz.com" target="_blank">DedeCMSv6</a></li>
<li><a href="https://www.dedebiz.com" target="_blank">DedeCMSV6</a></li>
<li><a href="https://www.dedebiz.com/git" target="_blank">代码托管</a></li>
<li><a href="https://www.dedebiz.com/help" target="_blank">帮助中心</a></li>
<li><a href="https://www.dedebiz.com" target="_blank">Dede商业支持</a></li>
@@ -50,9 +50,9 @@
<div class="pr-title"><h3>阅读许可协议</h3></div>
<div class="pr-agreement">
<p>版权所有 (c)2020,DedeBIZ.COM 保留所有权利。 </p>
<p>感谢您选择由上海穆云智能科技有限公司开发的DedeCMSv6系统,DedeBIZ商业站点管理(以下简称“DedeBIZ”)为该系统唯一商业授权管理平台,DedeBIZ致力于为DedeCMSv6系统客户提供更丰富完善的技术支持,让建站变得更高效、安全、便捷。</p>
<p>感谢您选择由上海穆云智能科技有限公司开发的DedeCMSV6系统,DedeBIZ商业站点管理(以下简称“DedeBIZ”)为该系统唯一商业授权管理平台,DedeBIZ致力于为DedeCMSV6系统客户提供更丰富完善的技术支持,让建站变得更高效、安全、便捷。</p>
<p>电子文本形式的许可协议如同双方书面签署的协议一样,具有完全的和等同的法律效力。您一旦开始确认本协议并安装、使用、修改或分发本软件(或任何基于本软件的衍生著作),则表示您已经完全接受本许可协议的所有的条件和条款。如果您有任何违反本许可协议的行为,上海穆云智能科技有限公司有权收回对您的许可授权,责令停止损害,并追究您的相关法律及经济责任。</p>
<p>如果您不同意本协议中的条款,请勿复制、下载、安装或以其他方式使用DedeCMSv6。</p>
<p>如果您不同意本协议中的条款,请勿复制、下载、安装或以其他方式使用DedeCMSV6。</p>
<strong>一、本授权协议适用且仅适用于 DedeCMSV6.x.x 版本,DedeCMS官方对本授权协议的最终解释权。</strong>
<p>...</p>
</div>


+ 1
- 1
src/install/templates/step-2.html View File

@@ -16,7 +16,7 @@
</div>
<div class="top-link">
<ul>
<li><a href="https://www.dedebiz.com" target="_blank">DedeCMSv6</a></li>
<li><a href="https://www.dedebiz.com" target="_blank">DedeCMSV6</a></li>
<li><a href="https://www.dedebiz.com/git" target="_blank">代码托管</a></li>
<li><a href="https://www.dedebiz.com/help" target="_blank">帮助中心</a></li>
<li><a href="https://www.dedebiz.com" target="_blank">Dede商业支持</a></li>


+ 1
- 1
src/install/templates/step-3.html View File

@@ -56,7 +56,7 @@
</div>
<div class="top-link">
<ul>
<li><a href="https://www.dedebiz.com" target="_blank">DedeCMSv6</a></li>
<li><a href="https://www.dedebiz.com" target="_blank">DedeCMSV6</a></li>
<li><a href="https://www.dedebiz.com/git" target="_blank">代码托管</a></li>
<li><a href="https://www.dedebiz.com/help" target="_blank">帮助中心</a></li>
<li><a href="https://www.dedebiz.com" target="_blank">Dede商业支持</a></li>


+ 1
- 1
src/install/templates/step-4.html View File

@@ -13,7 +13,7 @@
</div>
<div class="top-link">
<ul>
<li><a href="https://www.dedebiz.com" target="_blank">DedeCMSv6</a></li>
<li><a href="https://www.dedebiz.com" target="_blank">DedeCMSV6</a></li>
<li><a href="https://www.dedebiz.com/git" target="_blank">代码托管</a></li>
<li><a href="https://www.dedebiz.com/help" target="_blank">帮助中心</a></li>
<li><a href="https://www.dedebiz.com" target="_blank">Dede商业支持</a></li>


+ 1
- 1
src/install/templates/step-5.html View File

@@ -15,7 +15,7 @@
</div>
<div class="top-link">
<ul>
<li><a href="https://www.dedebiz.com" target="_blank">DedeCMSv6</a></li>
<li><a href="https://www.dedebiz.com" target="_blank">DedeCMSV6</a></li>
<li><a href="https://www.dedebiz.com/git" target="_blank">代码托管</a></li>
<li><a href="https://www.dedebiz.com/help" target="_blank">帮助中心</a></li>
<li><a href="https://www.dedebiz.com" target="_blank">Dede商业支持</a></li>


Loading…
Cancel
Save