|
@@ -268,29 +268,19 @@ class session_helper
|
|
|
|
|
|
static public function need_wechat_author()
|
|
|
{
|
|
|
- Log::record(__METHOD__ . " 1",Log::DEBUG);
|
|
|
wechat_helper::clear_origin_url();
|
|
|
- if (util::from_wechat() == false) {
|
|
|
- Log::record(__METHOD__ . " 2",Log::DEBUG);
|
|
|
+ if (util::from_wechat() == false || session_helper::client_type() == session_helper::device_mini) {
|
|
|
return false;
|
|
|
}
|
|
|
else
|
|
|
{
|
|
|
- Log::record(__METHOD__ . " 3",Log::DEBUG);
|
|
|
-
|
|
|
- if(session_helper::client_type() == session_helper::device_mini) {
|
|
|
- Log::record(__METHOD__ . " 4",Log::DEBUG);
|
|
|
-
|
|
|
- return false;
|
|
|
- }
|
|
|
-
|
|
|
$relay_id = session_helper::relay_id();
|
|
|
- if(session_helper::logined()) {
|
|
|
- Log::record(__METHOD__ . " 5",Log::DEBUG);
|
|
|
-
|
|
|
- return false;
|
|
|
- }
|
|
|
- elseif (wechat_helper::has_userinfo())
|
|
|
+// if(session_helper::logined())
|
|
|
+// {
|
|
|
+// Log::record(__METHOD__ . " 5",Log::DEBUG);
|
|
|
+// return false;
|
|
|
+// }
|
|
|
+ if (wechat_helper::has_userinfo())
|
|
|
{
|
|
|
Log::record(__METHOD__ . " 6",Log::DEBUG);
|
|
|
|
|
@@ -298,7 +288,6 @@ class session_helper
|
|
|
if(session_helper::logined())
|
|
|
{
|
|
|
Log::record(__METHOD__ . " 7",Log::DEBUG);
|
|
|
-
|
|
|
$id_logginer = new login\memberid_log(session_helper::memberid());
|
|
|
if(session_helper::binded_wechat())
|
|
|
{
|
|
@@ -320,7 +309,6 @@ class session_helper
|
|
|
else
|
|
|
{
|
|
|
Log::record(__METHOD__ . " 8",Log::DEBUG);
|
|
|
-
|
|
|
$wechat_loginer = new login\open_userinfo_log($user_info);
|
|
|
if ($wechat_loginer->ismember()) {
|
|
|
$wechat_loginer->login();
|