+
+ |
+
+ |
+
+
+
+
+ -
+
+
+ -
+
+
+ -
+
+
+
+
+ |
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/admin/templets/sys_login.htm b/src/admin/templets/sys_login.htm
new file mode 100644
index 00000000..2577e236
--- /dev/null
+++ b/src/admin/templets/sys_login.htm
@@ -0,0 +1,151 @@
+
+
+
+
+
+
+ |
+
+ |
+
+
+
+
+
+ -
+
+
+ -
+
+
+ -
+
+
+
+
+ |
+
+
+
+
+
\ No newline at end of file
diff --git a/src/admin/templets/sys_payment.htm b/src/admin/templets/sys_payment.htm
index 57baaa27..0c53612e 100644
--- a/src/admin/templets/sys_payment.htm
+++ b/src/admin/templets/sys_payment.htm
@@ -1,52 +1,180 @@
-
-
-
- |
-
- |
-
-
- | 支付方式 |
- 描述 |
- 排序 |
- 管理 |
-
- {dede:datalist empty='| 暂无文档 |
'}
-
- | {dede:field.name/} |
- {dede:field.description/} |
- {dede:field.rank/} |
-
-
- 安装
-
- 修改
- 删除
-
- |
-
- {/dede:datalist}
-
- | {dede:pagelist listsize='6'/} |
-
-
-
+
+
+
+
+ |
+
+ |
+
+
+
+
+ -
+
+
+ -
+
+
+ -
+
+
+ -
+
+
+ -
+
+
+
+
+ |
+
+
+
+
\ No newline at end of file
diff --git a/src/apps/recommend.php b/src/apps/recommend.php
index be0e2264..d8d52d33 100755
--- a/src/apps/recommend.php
+++ b/src/apps/recommend.php
@@ -42,9 +42,7 @@ else if ($action == 'send') {
$mailbody .= "Powered by DedeBIZ";
$headers = "From: ".$cfg_adminemail."\r\nReply-To: ".$cfg_adminemail;
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;
+ $client = new DedeBizClient();
$client->MailSend($email,$mailtitle,$mailtitle,$mailbody);
$client->Close();
} else {
diff --git a/src/system/archive/searchview.class.php b/src/system/archive/searchview.class.php
index 3c70d804..34d90cc1 100755
--- a/src/system/archive/searchview.class.php
+++ b/src/system/archive/searchview.class.php
@@ -152,15 +152,13 @@ class SearchView
function GetKeywords($keyword)
{
global $cfg_soft_lang;
- global $cfg_bizcore_appid, $cfg_bizcore_key, $cfg_bizcore_hostname, $cfg_bizcore_port;
+ global $cfg_bizcore_appid, $cfg_bizcore_key;
$keyword = cn_substr($keyword, 50);
$row = $this->dsql->GetOne("SELECT spwords FROM `#@__search_keywords` WHERE keyword='".addslashes($keyword)."'; ");
if (!is_array($row)) {
if (strlen($keyword) > 7) {
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;
+ $client = new DedeBizClient();
$data = $client->Spliteword($keyword);
$kvs = explode(",", $data->data);
$keywords = $keyword." ";
diff --git a/src/system/helpers/cache.helper.php b/src/system/helpers/cache.helper.php
index 479d1490..e09efd87 100755
--- a/src/system/helpers/cache.helper.php
+++ b/src/system/helpers/cache.helper.php
@@ -20,14 +20,12 @@ if (!defined('DEDEINC')) exit('dedebiz');
if (!function_exists('GetCache')) {
function GetCache($prefix, $key)
{
- global $cfg_bizcore_appid, $cfg_bizcore_key, $cfg_bizcore_hostname, $cfg_bizcore_port;
+ global $cfg_bizcore_appid, $cfg_bizcore_key;
$key = md5($key);
//商业组件缓存
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;
+ $client = new DedeBizClient();
$key = trim($prefix.'_'.$key);
$data = $client->CacheGet($key);
$result = unserialize($data->data);
@@ -60,13 +58,11 @@ if (!function_exists('GetCache')) {
if (!function_exists('SetCache')) {
function SetCache($prefix, $key, $value, $timeout = 3600)
{
- global $cfg_bizcore_appid, $cfg_bizcore_key, $cfg_bizcore_hostname, $cfg_bizcore_port;
+ global $cfg_bizcore_appid, $cfg_bizcore_key;
$key = md5($key);
//商业组件缓存
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;
+ $client = new DedeBizClient();
$key = trim($prefix.'_'.$key);
$data = $client->CacheSet($key,serialize($value),$timeout);
$result = unserialize($data->data);
@@ -92,13 +88,11 @@ if (!function_exists('DelCache')) {
//删缓存
function DelCache($prefix, $key)
{
- global $cfg_bizcore_appid, $cfg_bizcore_key, $cfg_bizcore_hostname, $cfg_bizcore_port;
+ global $cfg_bizcore_appid, $cfg_bizcore_key;
$key = md5($key);
//商业组件缓存
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;
+ $client = new DedeBizClient();
$key = trim($prefix.'_'.$key);
$data = $client->CacheDel($key);
$client->Close();
diff --git a/src/system/inc/inc_fun_funAdmin.php b/src/system/inc/inc_fun_funAdmin.php
index fce54437..7cd7c41e 100755
--- a/src/system/inc/inc_fun_funAdmin.php
+++ b/src/system/inc/inc_fun_funAdmin.php
@@ -24,16 +24,14 @@ function SpGetPinyin($str, $ishead = 0, $isclose = 1)
if ($pinyins==null) {
$pinyins = array();
}
- global $cfg_bizcore_appid, $cfg_bizcore_key, $cfg_bizcore_hostname, $cfg_bizcore_port;
+ global $cfg_bizcore_appid, $cfg_bizcore_key;
global $cfg_soft_lang;
$restr = '';
if (!empty($cfg_bizcore_appid) && !empty($cfg_bizcore_key)) {
if ($cfg_soft_lang == "utf-8") {
$str = gb2utf8($str);
}
- $client = new DedeBizClient($cfg_bizcore_hostname, $cfg_bizcore_port);
- $client->appid = $cfg_bizcore_appid;
- $client->key = $cfg_bizcore_key;
+ $client = new DedeBizClient();
$data = $client->Pinyin($str, "");
$restr = $data->data;
$client->Close();
diff --git a/src/system/libraries/dedebiz.class.php b/src/system/libraries/dedebiz.class.php
index 83903a5d..95110c13 100644
--- a/src/system/libraries/dedebiz.class.php
+++ b/src/system/libraries/dedebiz.class.php
@@ -8,8 +8,11 @@ class DedeBizClient
var $appid;
var $key;
var $err;
- function __construct($ipaddr, $port)
+ function __construct()
{
+ global $cfg_bizcore_appid,$cfg_bizcore_key,$cfg_bizcore_hostname, $cfg_bizcore_port;
+ $this->appid = $cfg_bizcore_appid;
+ $this->key = $cfg_bizcore_key;
$this->err = "";
if (!function_exists("socket_create")) {
$this->err = (object)array(
@@ -20,7 +23,7 @@ class DedeBizClient
return;
}
$this->socket = socket_create(AF_INET, SOCK_STREAM, SOL_TCP);
- $rs = @socket_connect($this->socket, $ipaddr, $port);
+ $rs = @socket_connect($this->socket, $cfg_bizcore_hostname, $cfg_bizcore_port);
if (!$rs) {
$this->err = (object)array(
"code" => -1,
@@ -64,8 +67,16 @@ class DedeBizClient
);
return $this->request($req);
}
+ function IsEnabled()
+ {
+ $rs = $this->Ping();
+ if ($rs->code===200 && $rs->data === "Hello www.dedebiz.com") {
+ return true;
+ }
+ return false;
+ }
//检测是否连接
- function Ping($i)
+ function Ping()
{
$req = array(
"method" => "ping",
@@ -195,6 +206,35 @@ class DedeBizClient
);
return $this->request($req);
}
+ //云服务设置
+ function CloudSet($config=array())
+ {
+ $req = array(
+ "method" => "cloud_set",
+ "parms" => array(
+ "aliyun_enabled" => $config['aliyun_enabled'],
+ "aliyun_access_key_id" => $config['aliyun_access_key_id'],
+ "aliyun_access_key_secret" => $config['aliyun_access_key_secret'],
+ "huaweicloud_enabled" => $config['huaweicloud_enabled'],
+ "huawei_access_key_id" => $config['huawei_access_key_id'],
+ "huawei_secret_access_key" => $config['huawei_secret_access_key'],
+ "tencent_enabled" => $config['tencent_enabled'],
+ "tencent_secret_id" => $config['tencent_secret_id'],
+ "tencent_secret_key" => $config['tencent_secret_key'],
+ )
+ );
+ return $this->request($req);
+ }
+ function CloudGet()
+ {
+ $req = array(
+ "method" => "cloud_get",
+ "parms" => array(
+ "name" => "dedebiz"
+ )
+ );
+ return $this->request($req);
+ }
//拼接规则就是method+
function MakeSign(&$req)
{
diff --git a/src/user/inc/inc_pwd_functions.php b/src/user/inc/inc_pwd_functions.php
index 23698d90..fa1f22e6 100755
--- a/src/user/inc/inc_pwd_functions.php
+++ b/src/user/inc/inc_pwd_functions.php
@@ -43,11 +43,9 @@ function random($length, $numeric = 0)
function sendmail($email, $mailtitle, $mailbody, $headers)
{
global $cfg_sendmail_bysmtp, $cfg_smtp_server, $cfg_smtp_port, $cfg_smtp_usermail, $cfg_smtp_user, $cfg_smtp_password, $cfg_adminemail;
- global $cfg_bizcore_appid,$cfg_bizcore_key,$cfg_bizcore_hostname,$cfg_bizcore_port;
+ global $cfg_bizcore_appid,$cfg_bizcore_key;
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;
+ $client = new DedeBizClient();
$client->MailSend($email,$mailtitle,$mailtitle,$mailbody);
$client->Close();
} else {
diff --git a/src/user/index_do.php b/src/user/index_do.php
index db59dc36..7ae90f0f 100755
--- a/src/user/index_do.php
+++ b/src/user/index_do.php
@@ -35,9 +35,7 @@ if ($fmdo == 'sendMail') {
$mailbody .= "Powered by DedeBIZ开发团队\r\n";
$headers = "From: ".$cfg_adminemail."\r\nReply-To: ".$cfg_adminemail;
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;
+ $client = new DedeBizClient();
$client->MailSend($cfg_ml->fields['email'],$mailtitle,$mailtitle,$mailbody);
$client->Close();
} else {
diff --git a/src/user/templets/album_add.htm b/src/user/templets/album_add.htm
index 5a08d0a9..a0f9a062 100755
--- a/src/user/templets/album_add.htm
+++ b/src/user/templets/album_add.htm
@@ -22,7 +22,7 @@