gitee/course-tencent-cloud
1
0
Fork 0
mirror of https://gitee.com/koogua/course-tencent-cloud.git synced 2025-06-23 11:58:41 +08:00
Code Issues Releases Wiki Activity

Merge branch 'koogua/I399X5' into develop

Browse Source
This commit is contained in:
koogua 2021-03-03 19:47:28 +08:00
commit c2d0316281
2 changed files with 2 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/Http/Home/Controllers/UserConsoleController.php
View File

@ -263,11 +263,7 @@ class UserConsoleController extends Controller
$subscribe = $subscribeRepo->findByUserId($this->authUser->id); $subscribe = $subscribeRepo->findByUserId($this->authUser->id);
$subscribed = 0; $subscribed = $subscribe ? 1 : 0;
if ($subscribe) {
$subscribed = $subscribe->deleted == 0 ? 1 : 0;
}
$this->view->pick('user/console/subscribe'); $this->view->pick('user/console/subscribe');
$this->view->setVar('subscribed', $subscribed); $this->view->setVar('subscribed', $subscribed);

5
app/Services/Logic/Notice/AccountLogin.php
View File

@ -16,9 +16,6 @@ class AccountLogin extends LogicService
public function handleTask(TaskModel $task) public function handleTask(TaskModel $task)
{ {
/**
* @todo 鉴于微信消息模板４.30下线，暂时下线登录通知
*/
$wechatOA = $this->getSettings('wechat.oa'); $wechatOA = $this->getSettings('wechat.oa');
if ($wechatOA['enabled'] == 0) return; if ($wechatOA['enabled'] == 0) return;
@ -31,7 +28,7 @@ class AccountLogin extends LogicService
$subscribe = $subscribeRepo->findByUserId($userId); $subscribe = $subscribeRepo->findByUserId($userId);
if ($subscribe && $subscribe->deleted == 0) { if ($subscribe) {
$notice = new WeChatAccountLoginNotice(); $notice = new WeChatAccountLoginNotice();