diff --git a/Application/Admin/Conf/config.php b/Application/Admin/Conf/config.php index 90f82c3c5..2b3384f87 100644 --- a/Application/Admin/Conf/config.php +++ b/Application/Admin/Conf/config.php @@ -127,6 +127,7 @@ return array( "tab_settleup_marketorder", "tab_market_altogether", "tab_cmd_tasks", - "tab_operation_log" + "tab_operation_log", + "sys_action_log" ] ); \ No newline at end of file diff --git a/Application/Admin/Controller/PublicController.class.php b/Application/Admin/Controller/PublicController.class.php index 7273be80b..9b31d6136 100644 --- a/Application/Admin/Controller/PublicController.class.php +++ b/Application/Admin/Controller/PublicController.class.php @@ -24,6 +24,10 @@ class PublicController extends \Think\Controller if (!check_verify($verify)) { $this->error('验证码输入错误!'); } + /* 财务账号只能登陆子系统*/ + if(!IS_SUBSITE && $username == "cw"){ + $this->error('账户或密码错误!'); + } /* 调用UC登录接口登录 */ $User = new UserApi; @@ -101,7 +105,10 @@ class PublicController extends \Think\Controller 'last_login_time' => NOW_TIME, 'last_login_ip' => get_client_ip(1), ); - $Member->save($data); + if(!IS_SUBSITE){ + $Member->save($data); + } + $adminData = getAdminData($member['uid']); $groupId = getGameGroup($member['uid']); diff --git a/Application/Admin/Model/MemberModel.class.php b/Application/Admin/Model/MemberModel.class.php index cc4181628..d81965260 100644 --- a/Application/Admin/Model/MemberModel.class.php +++ b/Application/Admin/Model/MemberModel.class.php @@ -69,7 +69,9 @@ class MemberModel extends Model { 'last_login_time' => NOW_TIME, 'last_login_ip' => get_client_ip(1), ); - $this->save($data); + if(!IS_SUBSITE){ + $this->save($data); + } $adminData = getAdminData($user['uid']); $groupId = getGameGroup($user['uid']); diff --git a/Application/Common/Common/function.php b/Application/Common/Common/function.php index 04b978be9..99f47e653 100644 --- a/Application/Common/Common/function.php +++ b/Application/Common/Common/function.php @@ -697,9 +697,9 @@ function action_log($action = null, $model = null, $record_id = null, $user_id = $data['remark'] = '操作url:' . $_SERVER['REQUEST_URI']; } - M('ActionLog')->add($data); + SM('ActionLog',"sys_")->add($data); - if (!empty($action_info['rule'])) { + if (!empty($action_info['rule']) && !IS_SUBSITE) { //解析行为 $rules = parse_action($action, $user_id); diff --git a/Application/Home/Model/MemberModel.class.php b/Application/Home/Model/MemberModel.class.php index 222c54568..65ad1398f 100644 --- a/Application/Home/Model/MemberModel.class.php +++ b/Application/Home/Model/MemberModel.class.php @@ -79,7 +79,10 @@ class MemberModel extends Model{ 'last_login_time' => NOW_TIME, 'last_login_ip' => get_client_ip(1), ); - $this->save($data); + if(!IS_SUBSITE){ + $this->save($data); + } + /* 记录登录SESSION和COOKIES */ $auth = array(