From 9fd62d45dc743396f7d8af176f203a1f0bd6bd2f Mon Sep 17 00:00:00 2001
From: gongfuxiang <2499232802@qq.com>
Date: Thu, 14 Feb 2019 23:23:19 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BA=94=E7=94=A8=E9=92=A9=E5=AD=90=E5=90=8D?=
=?UTF-8?q?=E7=A7=B0=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
application/index/controller/Common.php | 2 +-
application/index/controller/User.php | 2 +-
application/index/view/default/public/header.html | 6 +++---
application/index/view/default/user/index.html | 6 +++---
.../plugins/commontopmaxpicture/config.json | 2 +-
application/plugins/commontopnotice/config.json | 2 +-
.../plugins/usercentertopnotice/config.json | 2 +-
application/plugins/userlogingiveintegral/Hook.php | 14 +++++++-------
.../plugins/userlogingiveintegral/config.json | 2 +-
application/service/UserService.php | 4 ++--
application/tags.php | 6 +++---
11 files changed, 24 insertions(+), 24 deletions(-)
diff --git a/application/index/controller/Common.php b/application/index/controller/Common.php
index 67f226c7f..9eb3b7805 100755
--- a/application/index/controller/Common.php
+++ b/application/index/controller/Common.php
@@ -81,7 +81,7 @@ class Common extends Controller
private function CommonPluginsInit()
{
// 公共顶部钩子
- $this->assign('plugins_common_top_data', Hook::listen('plugins_common_top', ['hook_name'=>'plugins_common_top', 'is_control'=>false]));
+ $this->assign('plugins_view_common_top_data', Hook::listen('plugins_view_common_top', ['hook_name'=>'plugins_view_common_top', 'is_control'=>false, 'user'=>$this->user]));
}
/**
diff --git a/application/index/controller/User.php b/application/index/controller/User.php
index eed755732..49a2cb785 100755
--- a/application/index/controller/User.php
+++ b/application/index/controller/User.php
@@ -137,7 +137,7 @@ class User extends Common
$this->assign('goods_browse_list', $data['data']);
// 用户中心顶部钩子
- $this->assign('plugins_user_center_top_data', Hook::listen('plugins_user_center_top', ['hook_name'=>'plugins_user_center_top', 'is_control'=>false]));
+ $this->assign('plugins_view_user_center_top_data', Hook::listen('plugins_view_user_center_top', ['hook_name'=>'plugins_view_user_center_top', 'is_control'=>false, 'user'=>$this->user]));
return $this->fetch();
}
diff --git a/application/index/view/default/public/header.html b/application/index/view/default/public/header.html
index 3b896d804..590b79108 100755
--- a/application/index/view/default/public/header.html
+++ b/application/index/view/default/public/header.html
@@ -42,11 +42,11 @@
{{if isset($shopxo_is_develop) and $shopxo_is_develop eq true and (!isset($is_header) or $is_header eq 1)}}
- plugins_common_top
+ plugins_view_common_top
{{/if}}
-{{if !empty($plugins_common_top_data) and is_array($plugins_common_top_data) and (!isset($is_header) or $is_header eq 1)}}
- {{foreach $plugins_common_top_data as $hook}}
+{{if !empty($plugins_view_common_top_data) and is_array($plugins_view_common_top_data) and (!isset($is_header) or $is_header eq 1)}}
+ {{foreach $plugins_view_common_top_data as $hook}}
{{if is_string($hook) or is_int($hook)}}
{{$hook|raw}}
{{/if}}
diff --git a/application/index/view/default/user/index.html b/application/index/view/default/user/index.html
index 365d1bcd9..2de79c513 100755
--- a/application/index/view/default/user/index.html
+++ b/application/index/view/default/user/index.html
@@ -29,11 +29,11 @@
{{if isset($shopxo_is_develop) and $shopxo_is_develop eq true}}
- plugins_user_center_top
+ plugins_view_user_center_top
{{/if}}
- {{if !empty($plugins_user_center_top_data) and is_array($plugins_user_center_top_data)}}
- {{foreach $plugins_user_center_top_data as $hook}}
+ {{if !empty($plugins_view_user_center_top_data) and is_array($plugins_view_user_center_top_data)}}
+ {{foreach $plugins_view_user_center_top_data as $hook}}
{{if is_string($hook) or is_int($hook)}}
{{$hook|raw}}
{{/if}}
diff --git a/application/plugins/commontopmaxpicture/config.json b/application/plugins/commontopmaxpicture/config.json
index 28ed936e8..0a0ff7ea0 100755
--- a/application/plugins/commontopmaxpicture/config.json
+++ b/application/plugins/commontopmaxpicture/config.json
@@ -17,7 +17,7 @@
"is_home":false
},
"hook":{
- "plugins_common_top":[
+ "plugins_view_common_top":[
"app\\plugins\\commontopmaxpicture\\Hook"
]
}
diff --git a/application/plugins/commontopnotice/config.json b/application/plugins/commontopnotice/config.json
index e29936753..096d7efc7 100755
--- a/application/plugins/commontopnotice/config.json
+++ b/application/plugins/commontopnotice/config.json
@@ -17,7 +17,7 @@
"is_home":false
},
"hook":{
- "plugins_common_top":[
+ "plugins_view_common_top":[
"app\\plugins\\commontopnotice\\Hook"
]
}
diff --git a/application/plugins/usercentertopnotice/config.json b/application/plugins/usercentertopnotice/config.json
index 7d1d3a29c..bb17341a8 100755
--- a/application/plugins/usercentertopnotice/config.json
+++ b/application/plugins/usercentertopnotice/config.json
@@ -17,7 +17,7 @@
"is_home":false
},
"hook":{
- "plugins_user_center_top":[
+ "plugins_view_user_center_top":[
"app\\plugins\\usercentertopnotice\\Hook"
]
}
diff --git a/application/plugins/userlogingiveintegral/Hook.php b/application/plugins/userlogingiveintegral/Hook.php
index 083f59bee..268e07ce8 100644
--- a/application/plugins/userlogingiveintegral/Hook.php
+++ b/application/plugins/userlogingiveintegral/Hook.php
@@ -37,12 +37,12 @@ class Hook
// 是否控制器钩子
if(isset($params['is_control']) && $params['is_control'] === true && !empty($params['hook_name']))
{
- if(!empty($params['user']))
+ if(!empty($params['user_id']))
{
switch($params['hook_name'])
{
// 用户登录成功后赠送积分
- case 'plugins_user_login_end' :
+ case 'plugins_control_user_login_end' :
$ret = $this->LoginGiveIntegral($params);
break;
@@ -96,7 +96,7 @@ class Hook
if(isset($ret['data']['is_day_once']) && $ret['data']['is_day_once'] == 1)
{
$where = [
- ['user_id', '=', $params['user']['id']],
+ ['user_id', '=', $params['user_id']],
['add_time', '>=', strtotime(date('Y-m-d 00:00:00'))],
['type', '=', 1],
['msg', '=', '登录赠送积分'],
@@ -113,17 +113,17 @@ class Hook
if(!empty($give_integral))
{
// 用户积分添加
- $user_integral = Db::name('User')->where(['id'=>$params['user']['id']])->value('integral');
- if(!Db::name('User')->where(['id'=>$params['user']['id']])->setInc('integral', $give_integral))
+ $user_integral = Db::name('User')->where(['id'=>$params['user_id']])->value('integral');
+ if(!Db::name('User')->where(['id'=>$params['user_id']])->setInc('integral', $give_integral))
{
return DataReturn('登录赠送积分失败', -10);
}
// 积分日志
- IntegralService::UserIntegralLogAdd($params['user']['id'], $user_integral, $user_integral+$give_integral, '登录赠送积分', 1);
+ IntegralService::UserIntegralLogAdd($params['user_id'], $user_integral, $user_integral+$give_integral, '登录赠送积分', 1);
// 更新用户登录缓存数据
- UserService::UserLoginRecord($params['user']['id']);
+ UserService::UserLoginRecord($params['user_id']);
return DataReturn('登录赠送积分成功', 0);
} else {
diff --git a/application/plugins/userlogingiveintegral/config.json b/application/plugins/userlogingiveintegral/config.json
index 557783541..bb39de96a 100644
--- a/application/plugins/userlogingiveintegral/config.json
+++ b/application/plugins/userlogingiveintegral/config.json
@@ -17,7 +17,7 @@
"is_home":false
},
"hook":{
- "plugins_user_login_end":[
+ "plugins_control_user_login_end":[
"app\\plugins\\userlogingiveintegral\\Hook"
]
}
diff --git a/application/service/UserService.php b/application/service/UserService.php
index 55e1de3fc..82bfadc6b 100755
--- a/application/service/UserService.php
+++ b/application/service/UserService.php
@@ -812,7 +812,7 @@ class UserService
}
// 用户登录前钩子
- $ret = Hook::listen('plugins_user_login_begin', ['hook_name'=>'plugins_user_login_begin', 'is_control'=>true, 'params'=>$params, 'user'=>$user]);
+ $ret = Hook::listen('plugins_control_user_login_begin', ['hook_name'=>'plugins_control_user_login_begin', 'is_control'=>true, 'params'=>$params, 'user_id'=>$user['id']]);
if(isset($ret['code']) && $ret['code'] != 0)
{
return $ret;
@@ -831,7 +831,7 @@ class UserService
if(self::UserLoginRecord($user['id']))
{
// 用户登录后钩子
- $ret = Hook::listen('plugins_user_login_end', ['hook_name'=>'plugins_user_login_end', 'is_control'=>true, 'params'=>$params, 'user'=>$user]);
+ $ret = Hook::listen('plugins_control_user_login_end', ['hook_name'=>'plugins_control_user_login_end', 'is_control'=>true, 'params'=>$params, 'user_id'=>$user['id']]);
if(isset($ret['code']) && $ret['code'] != 0)
{
return $ret;
diff --git a/application/tags.php b/application/tags.php
index 123936f82..89e43b8fb 100755
--- a/application/tags.php
+++ b/application/tags.php
@@ -32,16 +32,16 @@ return array (
'log_write' =>
array (
),
- 'plugins_common_top' =>
+ 'plugins_view_common_top' =>
array (
0 => 'app\\plugins\\commontopmaxpicture\\Hook',
1 => 'app\\plugins\\commontopnotice\\Hook',
),
- 'plugins_user_center_top' =>
+ 'plugins_view_user_center_top' =>
array (
0 => 'app\\plugins\\usercentertopnotice\\Hook',
),
- 'plugins_user_login_end' =>
+ 'plugins_control_user_login_end' =>
array (
0 => 'app\\plugins\\userlogingiveintegral\\Hook',
),
--
GitLab