From 0cfb087f022d0917b89fcae549036822d45cef3b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=B0=8F=E8=83=A1?= <3203164629@qq.com> Date: Mon, 16 Jan 2023 12:40:42 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E8=87=B3V1.68=EF=BC=8C?= =?UTF-8?q?=E6=9B=B4=E6=96=B0=E5=86=85=E5=AE=B9=E5=9C=A8=E7=AC=94=E8=AE=B0?= =?UTF-8?q?=E4=B8=AD=E6=9F=A5=E7=9C=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- core/core_version.php | 2 +- core/template/default/common/showmessage.htm | 6 +++--- install/data/install.sql | 9 +++++++++ user/{login => }/api_qqlogin/class/ErrorCase.class.php | 0 user/{login => }/api_qqlogin/class/Oauth.class.php | 0 user/{login => }/api_qqlogin/class/QC.class.php | 0 user/{login => }/api_qqlogin/class/Recorder.class.php | 0 user/{login => }/api_qqlogin/class/URL.class.php | 0 user/{login => }/api_qqlogin/comm/config.php | 0 user/{login => }/api_qqlogin/comm/inc.php | 0 user/{login => }/api_qqlogin/comm/utils.php | 0 user/{login => }/api_qqlogin/qqConnectAPI.php | 0 user/language/zh-cn/lang.php | 2 +- user/login/template/login_single.htm | 2 +- user/login/template/login_single1.htm | 2 +- user/login/template/login_single2.htm | 2 +- user/profile/index.php | 2 +- user/profile/password.php | 2 +- user/profile/template/profile.htm | 3 --- user/{login => }/qqlogin.php | 2 +- 20 files changed, 20 insertions(+), 14 deletions(-) rename user/{login => }/api_qqlogin/class/ErrorCase.class.php (100%) rename user/{login => }/api_qqlogin/class/Oauth.class.php (100%) rename user/{login => }/api_qqlogin/class/QC.class.php (100%) rename user/{login => }/api_qqlogin/class/Recorder.class.php (100%) rename user/{login => }/api_qqlogin/class/URL.class.php (100%) rename user/{login => }/api_qqlogin/comm/config.php (100%) rename user/{login => }/api_qqlogin/comm/inc.php (100%) rename user/{login => }/api_qqlogin/comm/utils.php (100%) rename user/{login => }/api_qqlogin/qqConnectAPI.php (100%) rename user/{login => }/qqlogin.php (98%) diff --git a/core/core_version.php b/core/core_version.php index 53736a4..14bcd48 100644 --- a/core/core_version.php +++ b/core/core_version.php @@ -14,7 +14,7 @@ if(!defined('CORE_VERSION')) { define('CORE_VERSION', '2.02'); define('CORE_RELEASE', '20180909'); define('CORE_FIXBUG' , '20000000'); - define('CORE_XHVERSION', '1.67'); + define('CORE_XHVERSION', '1.68'); define('CORE_XHRELEASE', '20220125'); define('CORE_XHFIXBUG' , '20220125'); } \ No newline at end of file diff --git a/core/template/default/common/showmessage.htm b/core/template/default/common/showmessage.htm index 7a8ffd5..edc3919 100644 --- a/core/template/default/common/showmessage.htm +++ b/core/template/default/common/showmessage.htm @@ -109,16 +109,16 @@ - + diff --git a/install/data/install.sql b/install/data/install.sql index 63ab1ae..08e8d08 100644 --- a/install/data/install.sql +++ b/install/data/install.sql @@ -1192,6 +1192,15 @@ CREATE TABLE dzz_user_profile ( PRIMARY KEY (uid,fieldid) ) ENGINE=MyISAM; +DROP TABLE IF EXISTS `dzz_user_qqconnect`; +CREATE TABLE `dzz_user_qqconnect` ( + `openid` varchar(255) NOT NULL COMMENT 'Openid', + `uid` int(10) unsigned NOT NULL COMMENT '对应UID', + `dateline` int(10) NOT NULL DEFAULT '0' COMMENT '创建时间', + `unbind` tinyint(1) NOT NULL DEFAULT '0', + PRIMARY KEY (`openid`(20)), + KEY `uid` (`uid`) +) ENGINE=MyISAM DEFAULT CHARSET=utf8; DROP TABLE IF EXISTS dzz_user_profile_setting; CREATE TABLE dzz_user_profile_setting ( diff --git a/user/login/api_qqlogin/class/ErrorCase.class.php b/user/api_qqlogin/class/ErrorCase.class.php similarity index 100% rename from user/login/api_qqlogin/class/ErrorCase.class.php rename to user/api_qqlogin/class/ErrorCase.class.php diff --git a/user/login/api_qqlogin/class/Oauth.class.php b/user/api_qqlogin/class/Oauth.class.php similarity index 100% rename from user/login/api_qqlogin/class/Oauth.class.php rename to user/api_qqlogin/class/Oauth.class.php diff --git a/user/login/api_qqlogin/class/QC.class.php b/user/api_qqlogin/class/QC.class.php similarity index 100% rename from user/login/api_qqlogin/class/QC.class.php rename to user/api_qqlogin/class/QC.class.php diff --git a/user/login/api_qqlogin/class/Recorder.class.php b/user/api_qqlogin/class/Recorder.class.php similarity index 100% rename from user/login/api_qqlogin/class/Recorder.class.php rename to user/api_qqlogin/class/Recorder.class.php diff --git a/user/login/api_qqlogin/class/URL.class.php b/user/api_qqlogin/class/URL.class.php similarity index 100% rename from user/login/api_qqlogin/class/URL.class.php rename to user/api_qqlogin/class/URL.class.php diff --git a/user/login/api_qqlogin/comm/config.php b/user/api_qqlogin/comm/config.php similarity index 100% rename from user/login/api_qqlogin/comm/config.php rename to user/api_qqlogin/comm/config.php diff --git a/user/login/api_qqlogin/comm/inc.php b/user/api_qqlogin/comm/inc.php similarity index 100% rename from user/login/api_qqlogin/comm/inc.php rename to user/api_qqlogin/comm/inc.php diff --git a/user/login/api_qqlogin/comm/utils.php b/user/api_qqlogin/comm/utils.php similarity index 100% rename from user/login/api_qqlogin/comm/utils.php rename to user/api_qqlogin/comm/utils.php diff --git a/user/login/api_qqlogin/qqConnectAPI.php b/user/api_qqlogin/qqConnectAPI.php similarity index 100% rename from user/login/api_qqlogin/qqConnectAPI.php rename to user/api_qqlogin/qqConnectAPI.php diff --git a/user/language/zh-cn/lang.php b/user/language/zh-cn/lang.php index 184d061..1e393b5 100644 --- a/user/language/zh-cn/lang.php +++ b/user/language/zh-cn/lang.php @@ -165,7 +165,7 @@ $lang=array ( 'unbind'=>'未绑定', 'bind'=>'绑定', 'update_password_success'=>'更改密码成功！', - 'bindemail_subject'=>'綁定邮箱', + 'bindemail_subject'=>'绑定邮箱', 'qq_quick_login'=>'恭喜您{username}，QQ快捷登录绑定成功！', 'registe_failed'=>'注册失败', 'perform_security_verification'=>'进行安全验证', diff --git a/user/login/template/login_single.htm b/user/login/template/login_single.htm index df7e30d..6e48c00 100644 --- a/user/login/template/login_single.htm +++ b/user/login/template/login_single.htm @@ -73,7 +73,7 @@ {lang other_login}： 管理员登录 - + diff --git a/user/login/template/login_single1.htm b/user/login/template/login_single1.htm index 0635bc6..34a9433 100644 --- a/user/login/template/login_single1.htm +++ b/user/login/template/login_single1.htm @@ -76,7 +76,7 @@ {lang other_login}： 管理员登录 - + diff --git a/user/login/template/login_single2.htm b/user/login/template/login_single2.htm index d621549..8715e90 100644 --- a/user/login/template/login_single2.htm +++ b/user/login/template/login_single2.htm @@ -62,7 +62,7 @@ {lang other_login}： 管理员登录 - + diff --git a/user/profile/index.php b/user/profile/index.php index 27edcdd..102d715 100644 --- a/user/profile/index.php +++ b/user/profile/index.php @@ -21,7 +21,7 @@ $space = C::t('user_profile')->get_userprofile_by_uid($uid);//用户资料信息 $userstatus = C::t('user_status')->fetch($uid);//用户状态 $scdlsj=dgmdate($userstatus['lastvisit']); $zcsj=dgmdate($space['regdate']); -//$qqlogin = DB::fetch_first("select openid,unbind from %t where uid=%d", array('user_qqconnect', $uid)); +$qqlogin = DB::fetch_first("select openid,unbind from %t where uid=%d", array('user_qqconnect', $uid)); //读取缓存 loadcache('profilesetting'); diff --git a/user/profile/password.php b/user/profile/password.php index 20f51d2..218fabb 100644 --- a/user/profile/password.php +++ b/user/profile/password.php @@ -140,7 +140,7 @@ elseif ($do == 'bindqq'){//绑定qq showTips(array('lang'=>lang('qq_login_closed'),'referer'=>$_G['siteurl']),'html'); } - require_once DZZ_ROOT."./user/login/api_qqlogin/qqConnectAPI.php"; + require_once DZZ_ROOT."./user/api_qqlogin/qqConnectAPI.php"; $inurl = $_SERVER["HTTP_REFERER"]; //来路 diff --git a/user/profile/template/profile.htm b/user/profile/template/profile.htm index f0bd126..482875e 100644 --- a/user/profile/template/profile.htm +++ b/user/profile/template/profile.htm @@ -3,9 +3,6 @@