diff --git a/app/Http/Api/Controllers/AnswerController.php b/app/Http/Api/Controllers/AnswerController.php
index 79c1c416..d49ed3ae 100644
--- a/app/Http/Api/Controllers/AnswerController.php
+++ b/app/Http/Api/Controllers/AnswerController.php
@@ -7,6 +7,7 @@
namespace App\Http\Api\Controllers;
+use App\Models\Answer as AnswerModel;
use App\Services\Logic\Answer\AnswerAccept as AnswerAcceptService;
use App\Services\Logic\Answer\AnswerCreate as AnswerCreateService;
use App\Services\Logic\Answer\AnswerDelete as AnswerDeleteService;
@@ -30,6 +31,17 @@ class AnswerController extends Controller
$answer = $service->handle($id);
+ if ($answer['deleted'] == 1) {
+ $this->notFound();
+ }
+
+ $approved = $answer['published'] != AnswerModel::PUBLISH_APPROVED;
+ $owned = $answer['me']['owned'] == 1;
+
+ if (!$approved && !$owned) {
+ $this->notFound();
+ }
+
return $this->jsonSuccess(['answer' => $answer]);
}
@@ -82,7 +94,7 @@ class AnswerController extends Controller
$service->handle($id);
- return $this->jsonSuccess(['msg' => '删除回答成功']);
+ return $this->jsonSuccess();
}
/**
diff --git a/app/Http/Api/Controllers/ArticleController.php b/app/Http/Api/Controllers/ArticleController.php
index fa636c57..c61ac491 100644
--- a/app/Http/Api/Controllers/ArticleController.php
+++ b/app/Http/Api/Controllers/ArticleController.php
@@ -7,10 +7,14 @@
namespace App\Http\Api\Controllers;
+use App\Models\Article as ArticleModel;
+use App\Services\Logic\Article\ArticleClose as ArticleCloseService;
+use App\Services\Logic\Article\ArticleDelete as ArticleDeleteService;
use App\Services\Logic\Article\ArticleFavorite as ArticleFavoriteService;
use App\Services\Logic\Article\ArticleInfo as ArticleInfoService;
use App\Services\Logic\Article\ArticleLike as ArticleLikeService;
use App\Services\Logic\Article\ArticleList as ArticleListService;
+use App\Services\Logic\Article\ArticlePrivate as ArticlePrivateService;
use App\Services\Logic\Article\CategoryList as CategoryListService;
use App\Services\Logic\Article\CommentList as CommentListService;
@@ -53,6 +57,22 @@ class ArticleController extends Controller
$article = $service->handle($id);
+ if ($article['deleted'] == 1) {
+ $this->notFound();
+ }
+
+ $approved = $article['published'] == ArticleModel::PUBLISH_APPROVED;
+ $owned = $article['me']['owned'] == 1;
+ $private = $article['private'] == 1;
+
+ if (!$approved && !$owned) {
+ $this->notFound();
+ }
+
+ if ($private && !$owned) {
+ $this->forbidden();
+ }
+
return $this->jsonSuccess(['article' => $article]);
}
@@ -68,6 +88,46 @@ class ArticleController extends Controller
return $this->jsonPaginate($pager);
}
+ /**
+ * @Post("/{id:[0-9]+}/delete", name="api.article.delete")
+ */
+ public function deleteAction($id)
+ {
+ $service = new ArticleDeleteService();
+
+ $service->handle($id);
+
+ return $this->jsonSuccess();
+ }
+
+ /**
+ * @Post("/{id:[0-9]+}/close", name="home.article.close")
+ */
+ public function closeAction($id)
+ {
+ $service = new ArticleCloseService();
+
+ $article = $service->handle($id);
+
+ $msg = $article->closed == 1 ? '关闭评论成功' : '开启评论成功';
+
+ return $this->jsonSuccess(['msg' => $msg]);
+ }
+
+ /**
+ * @Post("/{id:[0-9]+}/private", name="home.article.private")
+ */
+ public function privateAction($id)
+ {
+ $service = new ArticlePrivateService();
+
+ $article = $service->handle($id);
+
+ $msg = $article->private == 1 ? '开启仅我可见成功' : '关闭仅我可见成功';
+
+ return $this->jsonSuccess(['msg' => $msg]);
+ }
+
/**
* @Post("/{id:[0-9]+}/favorite", name="api.article.favorite")
*/
diff --git a/app/Http/Api/Controllers/ChapterController.php b/app/Http/Api/Controllers/ChapterController.php
index 63ca974f..1b96f7c5 100644
--- a/app/Http/Api/Controllers/ChapterController.php
+++ b/app/Http/Api/Controllers/ChapterController.php
@@ -65,8 +65,16 @@ class ChapterController extends Controller
$chapter = $service->handle($id);
+ if ($chapter['deleted'] == 1) {
+ $this->notFound();
+ }
+
+ if ($chapter['published'] == 0) {
+ $this->notFound();
+ }
+
if ($chapter['me']['owned'] == 0) {
- return $this->jsonError(['msg' => '没有访问章节权限']);
+ $this->forbidden();
}
return $this->jsonSuccess(['chapter' => $chapter]);
diff --git a/app/Http/Api/Controllers/CommentController.php b/app/Http/Api/Controllers/CommentController.php
index 4e9031c2..55e8a9a2 100644
--- a/app/Http/Api/Controllers/CommentController.php
+++ b/app/Http/Api/Controllers/CommentController.php
@@ -85,7 +85,7 @@ class CommentController extends Controller
$service->handle($id);
- return $this->jsonSuccess(['msg' => '删除评论成功']);
+ return $this->jsonSuccess();
}
/**
diff --git a/app/Http/Api/Controllers/ConnectController.php b/app/Http/Api/Controllers/ConnectController.php
new file mode 100644
index 00000000..9f06fbd2
--- /dev/null
+++ b/app/Http/Api/Controllers/ConnectController.php
@@ -0,0 +1,74 @@
+request->getQuery('redirect', 'trim');
+
+ $service = new ConnectService();
+
+ if ($redirect) {
+ $service->setWechatRedirectCache($redirect);
+ }
+
+ $url = $service->getAuthorizeUrl(ConnectModel::PROVIDER_WECHAT);
+
+ return $this->response->redirect($url, true);
+ }
+
+ /**
+ * @Get("/wechat/callback", name="api.oauth.wechat_callback")
+ */
+ public function wechatCallbackAction()
+ {
+ $service = new ConnectService();
+
+ $data = $service->handleCallback(ConnectModel::PROVIDER_WECHAT);
+
+ $redirect = $service->getWechatRedirectCache();
+
+ if ($redirect) {
+ $service->removeWechatRedirectCache();
+ if (strpos($redirect, '?')) {
+ $location = $redirect . '&' . http_build_query($data);
+ } else {
+ $location = $redirect . '?' . http_build_query($data);
+ }
+ } else {
+ $location = kg_h5_index_url() . '?' . http_build_query($data);
+ }
+
+ return $this->response->redirect($location, true);
+ }
+
+ /**
+ * @Get("/wechat/info", name="api.oauth.wechat_info")
+ */
+ public function wechatInfoAction()
+ {
+ $service = new ConnectService();
+
+ $wechat = $service->getWechatInfo();
+
+ return $this->jsonSuccess(['wechat' => $wechat]);
+ }
+
+}
diff --git a/app/Http/Api/Controllers/ConsultController.php b/app/Http/Api/Controllers/ConsultController.php
index 4a9b1386..45db1c0e 100644
--- a/app/Http/Api/Controllers/ConsultController.php
+++ b/app/Http/Api/Controllers/ConsultController.php
@@ -7,6 +7,7 @@
namespace App\Http\Api\Controllers;
+use App\Models\Consult as ConsultModel;
use App\Services\Logic\Consult\ConsultCreate as ConsultCreateService;
use App\Services\Logic\Consult\ConsultDelete as ConsultDeleteService;
use App\Services\Logic\Consult\ConsultInfo as ConsultInfoService;
@@ -28,6 +29,17 @@ class ConsultController extends Controller
$consult = $service->handle($id);
+ if ($consult['deleted'] == 1) {
+ $this->notFound();
+ }
+
+ $approved = $consult['published'] == ConsultModel::PUBLISH_APPROVED;
+ $owned = $consult['me']['owned'] == 1;
+
+ if (!$approved && !$owned) {
+ $this->notFound();
+ }
+
return $this->jsonSuccess(['consult' => $consult]);
}
diff --git a/app/Http/Api/Controllers/Controller.php b/app/Http/Api/Controllers/Controller.php
index 60c3dac3..f9677c20 100644
--- a/app/Http/Api/Controllers/Controller.php
+++ b/app/Http/Api/Controllers/Controller.php
@@ -11,6 +11,7 @@ use App\Models\User as UserModel;
use App\Services\Auth\Api as ApiAuth;
use App\Traits\Response as ResponseTrait;
use App\Traits\Security as SecurityTrait;
+use App\Validators\Validator as AppValidator;
use Phalcon\Mvc\Dispatcher;
class Controller extends \Phalcon\Mvc\Controller
@@ -30,6 +31,10 @@ class Controller extends \Phalcon\Mvc\Controller
$this->setCors();
}
+ $validator = new AppValidator();
+
+ $validator->checkSiteStatus();
+
$this->checkRateLimit();
return true;
diff --git a/app/Http/Api/Controllers/CourseController.php b/app/Http/Api/Controllers/CourseController.php
index 5c449652..62c8596b 100644
--- a/app/Http/Api/Controllers/CourseController.php
+++ b/app/Http/Api/Controllers/CourseController.php
@@ -55,6 +55,14 @@ class CourseController extends Controller
$course = $service->handle($id);
+ if ($course['deleted'] == 1) {
+ $this->notFound();
+ }
+
+ if ($course['published'] == 0) {
+ $this->notFound();
+ }
+
return $this->jsonSuccess(['course' => $course]);
}
diff --git a/app/Http/Api/Controllers/HelpController.php b/app/Http/Api/Controllers/HelpController.php
index e944dc47..06dc00c1 100644
--- a/app/Http/Api/Controllers/HelpController.php
+++ b/app/Http/Api/Controllers/HelpController.php
@@ -37,6 +37,14 @@ class HelpController extends Controller
$help = $service->handle($id);
+ if ($help['deleted'] == 1) {
+ $this->notFound();
+ }
+
+ if ($help['published'] == 0) {
+ $this->notFound();
+ }
+
return $this->jsonSuccess(['help' => $help]);
}
diff --git a/app/Http/Api/Controllers/ImFriendController.php b/app/Http/Api/Controllers/ImFriendController.php
new file mode 100644
index 00000000..958bcf7c
--- /dev/null
+++ b/app/Http/Api/Controllers/ImFriendController.php
@@ -0,0 +1,30 @@
+handle($id);
+
+ return $this->jsonSuccess();
+ }
+
+}
diff --git a/app/Http/Api/Controllers/ImGroupController.php b/app/Http/Api/Controllers/ImGroupController.php
index 928cb225..5e199b08 100644
--- a/app/Http/Api/Controllers/ImGroupController.php
+++ b/app/Http/Api/Controllers/ImGroupController.php
@@ -9,6 +9,7 @@ namespace App\Http\Api\Controllers;
use App\Services\Logic\Im\GroupInfo as GroupInfoService;
use App\Services\Logic\Im\GroupList as GroupListService;
+use App\Services\Logic\Im\GroupQuit as GroupQuitService;
use App\Services\Logic\Im\GroupUserList as GroupUserListService;
/**
@@ -38,6 +39,14 @@ class ImGroupController extends Controller
$group = $service->handle($id);
+ if ($group['deleted'] == 1) {
+ $this->notFound();
+ }
+
+ if ($group['published'] == 0) {
+ $this->notFound();
+ }
+
return $this->jsonSuccess(['group' => $group]);
}
@@ -53,4 +62,16 @@ class ImGroupController extends Controller
return $this->jsonPaginate($pager);
}
+ /**
+ * @Post("/{id:[0-9]+}/quit", name="api.im_group.quit")
+ */
+ public function quitAction($id)
+ {
+ $service = new GroupQuitService();
+
+ $service->handle($id);
+
+ return $this->jsonSuccess();
+ }
+
}
diff --git a/app/Http/Api/Controllers/IndexController.php b/app/Http/Api/Controllers/IndexController.php
index eb9557d9..d6efa30c 100644
--- a/app/Http/Api/Controllers/IndexController.php
+++ b/app/Http/Api/Controllers/IndexController.php
@@ -8,6 +8,7 @@
namespace App\Http\Api\Controllers;
use App\Caches\IndexArticleList;
+use App\Caches\IndexFlashSaleList;
use App\Caches\IndexLiveList;
use App\Caches\IndexQuestionList;
use App\Caches\IndexSimpleFeaturedCourseList;
@@ -15,6 +16,7 @@ use App\Caches\IndexSimpleFreeCourseList;
use App\Caches\IndexSimpleNewCourseList;
use App\Caches\IndexSimpleVipCourseList;
use App\Caches\IndexSlideList;
+use App\Caches\IndexTeacherList;
/**
* @RoutePrefix("/api/index")
@@ -70,6 +72,30 @@ class IndexController extends Controller
return $this->jsonSuccess(['lives' => $lives]);
}
+ /**
+ * @Get("/teachers", name="api.index.teachers")
+ */
+ public function teachersAction()
+ {
+ $cache = new IndexTeacherList();
+
+ $teachers = $cache->get();
+
+ return $this->jsonSuccess(['teachers' => $teachers]);
+ }
+
+ /**
+ * @Get("/flash/sales", name="api.index.flash_sales")
+ */
+ public function flashSalesAction()
+ {
+ $cache = new IndexFlashSaleList();
+
+ $sales = $cache->get();
+
+ return $this->jsonSuccess(['sales' => $sales]);
+ }
+
/**
* @Get("/courses/featured", name="api.index.featured_courses")
*/
diff --git a/app/Http/Api/Controllers/OrderController.php b/app/Http/Api/Controllers/OrderController.php
index dbd9dc47..cd5fb1f3 100644
--- a/app/Http/Api/Controllers/OrderController.php
+++ b/app/Http/Api/Controllers/OrderController.php
@@ -29,6 +29,10 @@ class OrderController extends Controller
$order = $service->handle($sn);
+ if ($order['deleted'] == 1) {
+ $this->notFound();
+ }
+
return $this->jsonSuccess(['order' => $order]);
}
diff --git a/app/Http/Api/Controllers/PageController.php b/app/Http/Api/Controllers/PageController.php
index 7ef38905..e8094151 100644
--- a/app/Http/Api/Controllers/PageController.php
+++ b/app/Http/Api/Controllers/PageController.php
@@ -24,6 +24,14 @@ class PageController extends Controller
$page = $service->handle($id);
+ if ($page['deleted'] == 1) {
+ $this->notFound();
+ }
+
+ if ($page['published'] == 0) {
+ $this->notFound();
+ }
+
return $this->jsonSuccess(['page' => $page]);
}
diff --git a/app/Http/Api/Controllers/PublicController.php b/app/Http/Api/Controllers/PublicController.php
index bc4058e2..c350a69c 100644
--- a/app/Http/Api/Controllers/PublicController.php
+++ b/app/Http/Api/Controllers/PublicController.php
@@ -49,8 +49,12 @@ class PublicController extends Controller
$content = [];
+ /**
+ * ssl通过nginx转发实现
+ */
if ($this->request->isSecure()) {
- $content['connect_url'] = sprintf('wss://%s/wss', $this->request->getHttpHost());
+ list($domain) = explode(':', $websocket->connect_address);
+ $content['connect_url'] = sprintf('wss://%s/wss', $domain);
} else {
$content['connect_url'] = sprintf('ws://%s', $websocket->connect_address);
}
diff --git a/app/Http/Api/Controllers/QuestionController.php b/app/Http/Api/Controllers/QuestionController.php
index d76c82bb..a3e402d3 100644
--- a/app/Http/Api/Controllers/QuestionController.php
+++ b/app/Http/Api/Controllers/QuestionController.php
@@ -7,9 +7,11 @@
namespace App\Http\Api\Controllers;
+use App\Models\Question as QuestionModel;
use App\Services\Logic\Question\AnswerList as AnswerListService;
use App\Services\Logic\Question\CategoryList as CategoryListService;
use App\Services\Logic\Question\CommentList as CommentListService;
+use App\Services\Logic\Question\QuestionDelete as QuestionDeleteService;
use App\Services\Logic\Question\QuestionFavorite as QuestionFavoriteService;
use App\Services\Logic\Question\QuestionInfo as QuestionInfoService;
use App\Services\Logic\Question\QuestionLike as QuestionLikeService;
@@ -54,6 +56,17 @@ class QuestionController extends Controller
$question = $service->handle($id);
+ if ($question['deleted'] == 1) {
+ $this->notFound();
+ }
+
+ $approved = $question['published'] == QuestionModel::PUBLISH_APPROVED;
+ $owned = $question['me']['owned'] == 1;
+
+ if (!$approved && !$owned) {
+ $this->notFound();
+ }
+
return $this->jsonSuccess(['question' => $question]);
}
@@ -81,6 +94,18 @@ class QuestionController extends Controller
return $this->jsonPaginate($pager);
}
+ /**
+ * @Post("/{id:[0-9]+}/delete", name="api.question.delete")
+ */
+ public function deleteAction($id)
+ {
+ $service = new QuestionDeleteService();
+
+ $service->handle($id);
+
+ return $this->jsonSuccess();
+ }
+
/**
* @Post("/{id:[0-9]+}/favorite", name="api.question.favorite")
*/
diff --git a/app/Http/Api/Controllers/RefundController.php b/app/Http/Api/Controllers/RefundController.php
index 8f5249d3..17c8e692 100644
--- a/app/Http/Api/Controllers/RefundController.php
+++ b/app/Http/Api/Controllers/RefundController.php
@@ -43,6 +43,14 @@ class RefundController extends Controller
$refund = $service->handle($sn);
+ if ($refund['deleted'] == 1) {
+ $this->notFound();
+ }
+
+ if ($refund['me']['owned'] == 0) {
+ $this->forbidden();
+ }
+
return $this->jsonSuccess(['refund' => $refund]);
}
diff --git a/app/Http/Api/Controllers/ReviewController.php b/app/Http/Api/Controllers/ReviewController.php
index 1c88a173..2f6d0e9d 100644
--- a/app/Http/Api/Controllers/ReviewController.php
+++ b/app/Http/Api/Controllers/ReviewController.php
@@ -7,6 +7,7 @@
namespace App\Http\Api\Controllers;
+use App\Models\Review as ReviewModel;
use App\Services\Logic\Review\ReviewCreate as ReviewCreateService;
use App\Services\Logic\Review\ReviewDelete as ReviewDeleteService;
use App\Services\Logic\Review\ReviewInfo as ReviewInfoService;
@@ -28,6 +29,17 @@ class ReviewController extends Controller
$review = $service->handle($id);
+ if ($review['deleted'] == 1) {
+ $this->notFound();
+ }
+
+ $approved = $review['published'] == ReviewModel::PUBLISH_APPROVED;
+ $owned = $review['me']['owned'] == 1;
+
+ if (!$approved && !$owned) {
+ $this->notFound();
+ }
+
return $this->jsonSuccess(['review' => $review]);
}
diff --git a/app/Http/Api/Controllers/TradeController.php b/app/Http/Api/Controllers/TradeController.php
index 4e772559..99cd5b13 100644
--- a/app/Http/Api/Controllers/TradeController.php
+++ b/app/Http/Api/Controllers/TradeController.php
@@ -27,6 +27,14 @@ class TradeController extends Controller
$trade = $service->handle($sn);
+ if ($trade['deleted'] == 1) {
+ $this->notFound();
+ }
+
+ if ($trade['me']['owned'] == 0) {
+ $this->forbidden();
+ }
+
return $this->jsonSuccess(['trade' => $trade]);
}
@@ -54,6 +62,18 @@ class TradeController extends Controller
return $this->jsonSuccess($content);
}
+ /**
+ * @Post("/mini/create", name="api.trade.mini_create")
+ */
+ public function createMiniTradeAction()
+ {
+ $service = new TradeService();
+
+ $content = $service->createMiniTrade();
+
+ return $this->jsonSuccess($content);
+ }
+
/**
* @Post("/app/create", name="api.trade.app_create")
*/
@@ -61,7 +81,7 @@ class TradeController extends Controller
{
$service = new TradeService();
- $content = $service->createMpTrade();
+ $content = $service->createAppTrade();
return $this->jsonSuccess($content);
}
diff --git a/app/Http/Api/Controllers/UserController.php b/app/Http/Api/Controllers/UserController.php
index 6bb5ecfa..13d3a078 100644
--- a/app/Http/Api/Controllers/UserController.php
+++ b/app/Http/Api/Controllers/UserController.php
@@ -30,6 +30,10 @@ class UserController extends Controller
$user = $service->handle($id);
+ if ($user['deleted'] == 1) {
+ $this->notFound();
+ }
+
return $this->jsonSuccess(['user' => $user]);
}
diff --git a/app/Http/Api/Services/Connect.php b/app/Http/Api/Services/Connect.php
new file mode 100644
index 00000000..fde7af49
--- /dev/null
+++ b/app/Http/Api/Services/Connect.php
@@ -0,0 +1,210 @@
+ kg_full_url(['for' => 'api.oauth.wechat']),
+ 'auto_login' => 1,
+ ];
+ }
+
+ public function getWechatRedirectCache()
+ {
+ return $this->session->get('wechat_redirect');
+ }
+
+ public function setWechatRedirectCache($redirect)
+ {
+ $this->session->set('wechat_redirect', $redirect);
+ }
+
+ public function removeWechatRedirectCache()
+ {
+ $this->session->remove('wechat_redirect');
+ }
+
+ public function handleCallback($provider)
+ {
+ $code = $this->request->getQuery('code');
+ $state = $this->request->getQuery('state');
+
+ $openUser = $this->getOpenUserInfo($code, $state, $provider);
+ $relation = $this->getConnectRelation($openUser['id'], $provider);
+
+ $token = null;
+
+ if ($relation) {
+
+ $userRepo = new UserRepo();
+
+ $user = $userRepo->findById($relation->user_id);
+
+ $auth = new ApiAuthService();
+
+ $token = $auth->saveAuthInfo($user);
+
+ $this->handleLoginNotice($user);
+ }
+
+ return [
+ 'openid' => $openUser['id'],
+ 'token' => $token,
+ ];
+ }
+
+ public function getAuthorizeUrl($provider)
+ {
+ $auth = $this->getConnectAuth($provider);
+
+ return $auth->getAuthorizeUrl();
+ }
+
+ public function getOpenUserInfo($code, $state, $provider)
+ {
+ $auth = $this->getConnectAuth($provider);
+
+ $auth->checkState($state);
+
+ $token = $auth->getAccessToken($code);
+
+ $openId = $auth->getOpenId($token);
+
+ return $auth->getUserInfo($token, $openId);
+ }
+
+ public function getConnectRelation($openId, $provider)
+ {
+ $connectRepo = new ConnectRepo();
+
+ return $connectRepo->findByOpenId($openId, $provider);
+ }
+
+ public function getConnectAuth($provider)
+ {
+ $auth = null;
+
+ switch ($provider) {
+ case ConnectModel::PROVIDER_QQ:
+ $auth = $this->getQQAuth();
+ break;
+ case ConnectModel::PROVIDER_WEIBO:
+ $auth = $this->getWeiBoAuth();
+ break;
+ case ConnectModel::PROVIDER_WECHAT:
+ $auth = $this->getWeChatAuth();
+ break;
+ }
+
+ if (!$auth) {
+ throw new Exception('Invalid OAuth Provider');
+ }
+
+ return $auth;
+ }
+
+ protected function getQQAuth()
+ {
+ $settings = $this->getSettings('oauth.qq');
+
+ $settings['redirect_uri'] = kg_full_url(['for' => 'api.oauth.qq_callback']);
+
+ return new QQAuth(
+ $settings['client_id'],
+ $settings['client_secret'],
+ $settings['redirect_uri']
+ );
+ }
+
+ protected function getWeChatAuth()
+ {
+ /**
+ * 使用的是微信公众号网页授权登录功能
+ */
+ $settings = $this->getSettings('wechat.oa');
+
+ $settings['redirect_uri'] = kg_full_url(['for' => 'api.oauth.wechat_callback']);
+
+ return new WeChatAuth(
+ $settings['app_id'],
+ $settings['app_secret'],
+ $settings['redirect_uri']
+ );
+ }
+
+ protected function getWeiBoAuth()
+ {
+ $settings = $this->getSettings('oauth.weibo');
+
+ $settings['redirect_uri'] = kg_full_url(['for' => 'api.oauth.weibo_callback']);
+
+ return new WeiBoAuth(
+ $settings['client_id'],
+ $settings['client_secret'],
+ $settings['redirect_uri']
+ );
+ }
+
+ protected function handleConnectRelation(UserModel $user, array $openUser)
+ {
+ $connectRepo = new ConnectRepo();
+
+ $connect = $connectRepo->findByOpenId($openUser['id'], $openUser['provider']);
+
+ if ($connect) {
+
+ $connect->open_name = $openUser['name'];
+ $connect->open_avatar = $openUser['avatar'];
+
+ if ($connect->user_id != $user->id) {
+ $connect->user_id = $user->id;
+ }
+
+ if ($connect->deleted == 1) {
+ $connect->deleted = 0;
+ }
+
+ $connect->update();
+
+ } else {
+
+ $connect = new ConnectModel();
+
+ $connect->user_id = $user->id;
+ $connect->open_id = $openUser['id'];
+ $connect->open_name = $openUser['name'];
+ $connect->open_avatar = $openUser['avatar'];
+ $connect->provider = $openUser['provider'];
+
+ $connect->create();
+ }
+ }
+
+ protected function handleLoginNotice(UserModel $user)
+ {
+ $service = new AccountLoginNoticeService();
+
+ $service->createTask($user);
+ }
+
+}
diff --git a/app/Http/Api/Services/Trade.php b/app/Http/Api/Services/Trade.php
index 933aae6e..36946153 100644
--- a/app/Http/Api/Services/Trade.php
+++ b/app/Http/Api/Services/Trade.php
@@ -75,6 +75,45 @@ class Trade extends Service
{
$post = $this->request->getPost();
+ $order = $this->checkOrderBySn($post['order_sn']);
+
+ $user = $this->getLoginUser();
+
+ $channel = TradeModel::CHANNEL_WXPAY;
+
+ $trade = new TradeModel();
+
+ $trade->subject = $order->subject;
+ $trade->amount = $order->amount;
+ $trade->channel = $channel;
+ $trade->order_id = $order->id;
+ $trade->owner_id = $user->id;
+
+ $trade->create();
+
+ $wxpay = new Wxpay();
+
+ $response = $wxpay->mp($trade, $post['open_id']);
+
+ $payment = [
+ 'appId' => $response->appId,
+ 'timeStamp' => $response->timeStamp,
+ 'nonceStr' => $response->nonceStr,
+ 'package' => $response->package,
+ 'signType' => $response->signType,
+ 'paySign' => $response->paySign,
+ ];
+
+ return [
+ 'trade' => $this->handleTradeInfo($trade->sn),
+ 'payment' => $payment,
+ ];
+ }
+
+ public function createMiniTrade()
+ {
+ $post = $this->request->getPost();
+
$validator = new ClientValidator();
$platform = $this->getPlatform();
@@ -120,7 +159,7 @@ class Trade extends Service
public function createAppTrade()
{
-
+ return [];
}
protected function getPlatform()
diff --git a/app/Http/Home/Controllers/AccountController.php b/app/Http/Home/Controllers/AccountController.php
index a7a18363..a7f86564 100644
--- a/app/Http/Home/Controllers/AccountController.php
+++ b/app/Http/Home/Controllers/AccountController.php
@@ -28,6 +28,10 @@ class AccountController extends Controller
$returnUrl = $this->request->getHTTPReferer();
+ $service = new OAuthProviderService();
+
+ $oauthProvider = $service->handle();
+
$service = new AccountService();
$captcha = $service->getSettings('captcha');
@@ -35,6 +39,7 @@ class AccountController extends Controller
$this->seo->prependTitle('注册');
$this->view->setVar('return_url', $returnUrl);
+ $this->view->setVar('local_oauth', $oauthProvider['local']);
$this->view->setVar('captcha', $captcha);
}
diff --git a/app/Http/Home/Controllers/AnswerController.php b/app/Http/Home/Controllers/AnswerController.php
index 0a09e4d7..a833382b 100644
--- a/app/Http/Home/Controllers/AnswerController.php
+++ b/app/Http/Home/Controllers/AnswerController.php
@@ -57,8 +57,15 @@ class AnswerController extends Controller
$answer = $service->handle($id);
- if ($answer['published'] != AnswerModel::PUBLISH_APPROVED) {
- return $this->notFound();
+ if ($answer['deleted'] == 1) {
+ $this->notFound();
+ }
+
+ $approved = $answer['published'] != AnswerModel::PUBLISH_APPROVED;
+ $owned = $answer['me']['owned'] == 1;
+
+ if (!$approved && !$owned) {
+ $this->notFound();
}
$questionId = $answer['question']['id'];
diff --git a/app/Http/Home/Controllers/ArticleController.php b/app/Http/Home/Controllers/ArticleController.php
index b43d0278..cbd48b8f 100644
--- a/app/Http/Home/Controllers/ArticleController.php
+++ b/app/Http/Home/Controllers/ArticleController.php
@@ -10,12 +10,14 @@ namespace App\Http\Home\Controllers;
use App\Http\Home\Services\Article as ArticleService;
use App\Http\Home\Services\ArticleQuery as ArticleQueryService;
use App\Models\Article as ArticleModel;
+use App\Services\Logic\Article\ArticleClose as ArticleCloseService;
use App\Services\Logic\Article\ArticleCreate as ArticleCreateService;
use App\Services\Logic\Article\ArticleDelete as ArticleDeleteService;
use App\Services\Logic\Article\ArticleFavorite as ArticleFavoriteService;
use App\Services\Logic\Article\ArticleInfo as ArticleInfoService;
use App\Services\Logic\Article\ArticleLike as ArticleLikeService;
use App\Services\Logic\Article\ArticleList as ArticleListService;
+use App\Services\Logic\Article\ArticlePrivate as ArticlePrivateService;
use App\Services\Logic\Article\ArticleUpdate as ArticleUpdateService;
use App\Services\Logic\Article\RelatedArticleList as RelatedArticleListService;
use Phalcon\Mvc\View;
@@ -103,8 +105,20 @@ class ArticleController extends Controller
$article = $service->handle($id);
- if ($article['published'] != ArticleModel::PUBLISH_APPROVED) {
- return $this->notFound();
+ if ($article['deleted'] == 1) {
+ $this->notFound();
+ }
+
+ $approved = $article['published'] == ArticleModel::PUBLISH_APPROVED;
+ $owned = $article['me']['owned'] == 1;
+ $private = $article['private'] == 1;
+
+ if (!$approved && !$owned) {
+ $this->notFound();
+ }
+
+ if ($private && !$owned) {
+ $this->forbidden();
}
$this->seo->prependTitle(['专栏', $article['title']]);
@@ -195,6 +209,34 @@ class ArticleController extends Controller
return $this->jsonSuccess($content);
}
+ /**
+ * @Post("/{id:[0-9]+}/close", name="home.article.close")
+ */
+ public function closeAction($id)
+ {
+ $service = new ArticleCloseService();
+
+ $article = $service->handle($id);
+
+ $msg = $article->closed == 1 ? '关闭评论成功' : '开启评论成功';
+
+ return $this->jsonSuccess(['msg' => $msg]);
+ }
+
+ /**
+ * @Post("/{id:[0-9]+}/private", name="home.article.private")
+ */
+ public function privateAction($id)
+ {
+ $service = new ArticlePrivateService();
+
+ $article = $service->handle($id);
+
+ $msg = $article->private == 1 ? '开启仅我可见成功' : '关闭仅我可见成功';
+
+ return $this->jsonSuccess(['msg' => $msg]);
+ }
+
/**
* @Post("/{id:[0-9]+}/favorite", name="home.article.favorite")
*/
diff --git a/app/Http/Home/Controllers/ChapterController.php b/app/Http/Home/Controllers/ChapterController.php
index c1a75bff..6e2ba588 100644
--- a/app/Http/Home/Controllers/ChapterController.php
+++ b/app/Http/Home/Controllers/ChapterController.php
@@ -39,20 +39,24 @@ class ChapterController extends Controller
*/
public function showAction($id)
{
- $service = new ChapterInfoService();
-
- $chapter = $service->handle($id);
-
- if ($chapter['published'] == 0) {
- return $this->notFound();
- }
-
if ($this->authUser->id == 0) {
return $this->response->redirect(['for' => 'home.account.login']);
}
+ $service = new ChapterInfoService();
+
+ $chapter = $service->handle($id);
+
+ if ($chapter['deleted'] == 1) {
+ $this->notFound();
+ }
+
+ if ($chapter['published'] == 0) {
+ $this->notFound();
+ }
+
if ($chapter['me']['owned'] == 0) {
- return $this->forbidden();
+ $this->forbidden();
}
$service = new CourseInfoService();
diff --git a/app/Http/Home/Controllers/ConnectController.php b/app/Http/Home/Controllers/ConnectController.php
index f9bf060d..395556b3 100644
--- a/app/Http/Home/Controllers/ConnectController.php
+++ b/app/Http/Home/Controllers/ConnectController.php
@@ -119,6 +119,19 @@ class ConnectController extends Controller
$service = new ConnectService();
+ $openUser = $service->getOpenUserInfo($code, $state, $provider);
+
+ /**
+ * 微信扫码登录检查是否关注过公众号，关注过直接登录
+ */
+ if ($provider == ConnectModel::PROVIDER_WEIXIN && !empty($openUser['unionid'])) {
+ $subscribe = $service->getWeChatSubscribe($openUser['unionid']);
+ if ($subscribe && $subscribe->deleted == 0) {
+ $service->authSubscribeLogin($subscribe);
+ return $this->response->redirect(['for' => 'home.index']);
+ }
+ }
+
$openUser = $service->getOpenUserInfo($code, $state, $provider);
$connect = $service->getConnectRelation($openUser['id'], $openUser['provider']);
@@ -129,7 +142,7 @@ class ConnectController extends Controller
}
} else {
if ($connect) {
- $service->authLogin($connect);
+ $service->authConnectLogin($connect);
return $this->response->redirect(['for' => 'home.index']);
}
}
diff --git a/app/Http/Home/Controllers/ConsultController.php b/app/Http/Home/Controllers/ConsultController.php
index d1d78730..dfacf179 100644
--- a/app/Http/Home/Controllers/ConsultController.php
+++ b/app/Http/Home/Controllers/ConsultController.php
@@ -7,6 +7,7 @@
namespace App\Http\Home\Controllers;
+use App\Models\Consult as ConsultModel;
use App\Services\Logic\Consult\ConsultCreate as ConsultCreateService;
use App\Services\Logic\Consult\ConsultDelete as ConsultDeleteService;
use App\Services\Logic\Consult\ConsultInfo as ConsultInfoService;
@@ -37,6 +38,17 @@ class ConsultController extends Controller
$consult = $service->handle($id);
+ if ($consult['deleted'] == 1) {
+ $this->notFound();
+ }
+
+ $approved = $consult['published'] == ConsultModel::PUBLISH_APPROVED;
+ $owned = $consult['me']['owned'] == 1;
+
+ if (!$approved && !$owned) {
+ $this->notFound();
+ }
+
$this->view->setVar('consult', $consult);
}
diff --git a/app/Http/Home/Controllers/Controller.php b/app/Http/Home/Controllers/Controller.php
index f295e6c8..3cd93081 100644
--- a/app/Http/Home/Controllers/Controller.php
+++ b/app/Http/Home/Controllers/Controller.php
@@ -147,7 +147,8 @@ class Controller extends \Phalcon\Mvc\Controller
* ssl通过nginx转发实现
*/
if ($this->request->isSecure()) {
- $websocket->connect_url = sprintf('wss://%s/wss', $this->request->getHttpHost());
+ list($domain) = explode(':', $websocket->connect_address);
+ $websocket->connect_url = sprintf('wss://%s/wss', $domain);
} else {
$websocket->connect_url = sprintf('ws://%s', $websocket->connect_address);
}
diff --git a/app/Http/Home/Controllers/CourseController.php b/app/Http/Home/Controllers/CourseController.php
index ec180bb5..bc1ae450 100644
--- a/app/Http/Home/Controllers/CourseController.php
+++ b/app/Http/Home/Controllers/CourseController.php
@@ -77,8 +77,12 @@ class CourseController extends Controller
$course = $service->handle($id);
+ if ($course['deleted'] == 1) {
+ $this->notFound();
+ }
+
if ($course['published'] == 0) {
- return $this->notFound();
+ $this->notFound();
}
$service = new CourseChapterListService();
diff --git a/app/Http/Home/Controllers/HelpController.php b/app/Http/Home/Controllers/HelpController.php
index db5cbe88..e41ccb9a 100644
--- a/app/Http/Home/Controllers/HelpController.php
+++ b/app/Http/Home/Controllers/HelpController.php
@@ -40,8 +40,12 @@ class HelpController extends Controller
$help = $service->handle($id);
+ if ($help['deleted'] == 1) {
+ $this->notFound();
+ }
+
if ($help['published'] == 0) {
- return $this->notFound();
+ $this->notFound();
}
$featuredCourses = $this->getFeaturedCourses();
diff --git a/app/Http/Home/Controllers/ImController.php b/app/Http/Home/Controllers/ImController.php
index 13df71d5..bb530c2d 100644
--- a/app/Http/Home/Controllers/ImController.php
+++ b/app/Http/Home/Controllers/ImController.php
@@ -145,7 +145,7 @@ class ImController extends Controller
}
/**
- * @Post("/notice/read", name="home.im.read_notice")
+ * @Get("/notice/read", name="home.im.read_notice")
*/
public function readNoticeAction()
{
diff --git a/app/Http/Home/Controllers/ImGroupController.php b/app/Http/Home/Controllers/ImGroupController.php
index 858c9374..fdabf072 100644
--- a/app/Http/Home/Controllers/ImGroupController.php
+++ b/app/Http/Home/Controllers/ImGroupController.php
@@ -51,8 +51,12 @@ class ImGroupController extends Controller
$group = $service->getGroup($id);
+ if ($group['deleted'] == 1) {
+ $this->notFound();
+ }
+
if ($group['published'] == 0) {
- return $this->notFound();
+ $this->notFound();
}
$this->seo->prependTitle(['群组', $group['name']]);
diff --git a/app/Http/Home/Controllers/OrderController.php b/app/Http/Home/Controllers/OrderController.php
index 70a74c56..98310103 100644
--- a/app/Http/Home/Controllers/OrderController.php
+++ b/app/Http/Home/Controllers/OrderController.php
@@ -45,6 +45,14 @@ class OrderController extends Controller
$order = $service->handle($sn);
+ if ($order['deleted'] == 1) {
+ $this->notFound();
+ }
+
+ if ($order['me']['owned'] == 0) {
+ $this->forbidden();
+ }
+
$this->view->setRenderLevel(View::LEVEL_ACTION_VIEW);
$this->view->setVar('order', $order);
}
diff --git a/app/Http/Home/Controllers/PackageController.php b/app/Http/Home/Controllers/PackageController.php
index 67e739f1..0baf6299 100644
--- a/app/Http/Home/Controllers/PackageController.php
+++ b/app/Http/Home/Controllers/PackageController.php
@@ -27,7 +27,7 @@ class PackageController extends Controller
$package = $service->handle($id);
if ($package['published'] == 0) {
- return $this->notFound();
+ $this->notFound();
}
$this->seo->prependTitle(['套餐', $package['title']]);
diff --git a/app/Http/Home/Controllers/PageController.php b/app/Http/Home/Controllers/PageController.php
index 286d63fe..5689b2c9 100644
--- a/app/Http/Home/Controllers/PageController.php
+++ b/app/Http/Home/Controllers/PageController.php
@@ -25,8 +25,12 @@ class PageController extends Controller
$page = $service->handle($id);
+ if ($page['deleted'] == 1) {
+ $this->notFound();
+ }
+
if ($page['published'] == 0) {
- return $this->notFound();
+ $this->notFound();
}
$featuredCourses = $this->getFeaturedCourses();
diff --git a/app/Http/Home/Controllers/PointGiftController.php b/app/Http/Home/Controllers/PointGiftController.php
index 2023605b..f6c50caa 100644
--- a/app/Http/Home/Controllers/PointGiftController.php
+++ b/app/Http/Home/Controllers/PointGiftController.php
@@ -68,8 +68,12 @@ class PointGiftController extends Controller
$gift = $service->handle($id);
+ if ($gift['deleted'] == 1) {
+ $this->notFound();
+ }
+
if ($gift['published'] == 0) {
- return $this->notFound();
+ $this->notFound();
}
$hotGifts = $this->getHotGifts();
diff --git a/app/Http/Home/Controllers/QuestionController.php b/app/Http/Home/Controllers/QuestionController.php
index a2f406fb..7c92df29 100644
--- a/app/Http/Home/Controllers/QuestionController.php
+++ b/app/Http/Home/Controllers/QuestionController.php
@@ -102,8 +102,15 @@ class QuestionController extends Controller
$question = $service->handle($id);
- if ($question['published'] != QuestionModel::PUBLISH_APPROVED) {
- return $this->notFound();
+ if ($question['deleted'] == 1) {
+ $this->notFound();
+ }
+
+ $approved = $question['published'] == QuestionModel::PUBLISH_APPROVED;
+ $owned = $question['me']['owned'] == 1;
+
+ if (!$approved && !$owned) {
+ $this->notFound();
}
$this->seo->prependTitle(['问答', $question['title']]);
diff --git a/app/Http/Home/Controllers/RefundController.php b/app/Http/Home/Controllers/RefundController.php
index 591f579e..ba01b011 100644
--- a/app/Http/Home/Controllers/RefundController.php
+++ b/app/Http/Home/Controllers/RefundController.php
@@ -63,6 +63,14 @@ class RefundController extends Controller
$refund = $service->handle($sn);
+ if ($refund['deleted'] == 1) {
+ $this->notFound();
+ }
+
+ if ($refund['me']['owned'] == 0) {
+ $this->forbidden();
+ }
+
$this->view->setRenderLevel(View::LEVEL_ACTION_VIEW);
$this->view->setVar('refund', $refund);
}
diff --git a/app/Http/Home/Controllers/ReviewController.php b/app/Http/Home/Controllers/ReviewController.php
index 5b3db66c..2b6ab9f6 100644
--- a/app/Http/Home/Controllers/ReviewController.php
+++ b/app/Http/Home/Controllers/ReviewController.php
@@ -7,6 +7,7 @@
namespace App\Http\Home\Controllers;
+use App\Models\Review as ReviewModel;
use App\Services\Logic\Review\ReviewCreate as ReviewCreateService;
use App\Services\Logic\Review\ReviewDelete as ReviewDeleteService;
use App\Services\Logic\Review\ReviewInfo as ReviewInfoService;
@@ -50,6 +51,17 @@ class ReviewController extends Controller
$review = $service->handle($id);
+ if ($review['deleted'] == 1) {
+ $this->notFound();
+ }
+
+ $approved = $review['published'] == ReviewModel::PUBLISH_APPROVED;
+ $owned = $review['me']['owned'] == 1;
+
+ if (!$approved && !$owned) {
+ $this->notFound();
+ }
+
return $this->jsonSuccess(['review' => $review]);
}
diff --git a/app/Http/Home/Controllers/TopicController.php b/app/Http/Home/Controllers/TopicController.php
index c6098c64..33ff9ad7 100644
--- a/app/Http/Home/Controllers/TopicController.php
+++ b/app/Http/Home/Controllers/TopicController.php
@@ -27,7 +27,7 @@ class TopicController extends Controller
$topic = $service->handle($id);
if ($topic['published'] == 0) {
- return $this->notFound();
+ $this->notFound();
}
$this->seo->prependTitle(['专题', $topic['title']]);
diff --git a/app/Http/Home/Controllers/UserController.php b/app/Http/Home/Controllers/UserController.php
index 80a09280..6870b2db 100644
--- a/app/Http/Home/Controllers/UserController.php
+++ b/app/Http/Home/Controllers/UserController.php
@@ -32,7 +32,7 @@ class UserController extends Controller
$user = $service->handle($id);
if ($user['deleted'] == 1) {
- return $this->notFound();
+ $this->notFound();
}
$this->seo->prependTitle(['空间', $user['name']]);
diff --git a/app/Http/Home/Services/Connect.php b/app/Http/Home/Services/Connect.php
index 3f598fab..df7b7c9f 100644
--- a/app/Http/Home/Services/Connect.php
+++ b/app/Http/Home/Services/Connect.php
@@ -9,11 +9,14 @@ namespace App\Http\Home\Services;
use App\Models\Connect as ConnectModel;
use App\Models\User as UserModel;
+use App\Models\WeChatSubscribe as WeChatSubscribeModel;
use App\Repos\Connect as ConnectRepo;
use App\Repos\User as UserRepo;
+use App\Repos\WeChatSubscribe as WeChatSubscribeRepo;
use App\Services\Auth\Home as AuthService;
+use App\Services\Auth\Home as HomeAuthService;
use App\Services\Logic\Account\Register as RegisterService;
-use App\Services\Logic\Notice\AccountLogin as AccountLoginNoticeService;
+use App\Services\Logic\Notice\AccountLogin as AccountLoginNotice;
use App\Services\OAuth\QQ as QQAuth;
use App\Services\OAuth\WeiBo as WeiBoAuth;
use App\Services\OAuth\WeiXin as WeiXinAuth;
@@ -79,7 +82,20 @@ class Connect extends Service
$this->handleConnectRelation($user, $openUser);
}
- public function authLogin(ConnectModel $connect)
+ public function authSubscribeLogin(WeChatSubscribeModel $subscribe)
+ {
+ $userRepo = new UserRepo();
+
+ $user = $userRepo->findById($subscribe->user_id);
+
+ $this->handleLoginNotice($user);
+
+ $auth = new HomeAuthService();
+
+ $auth->saveAuthInfo($user);
+ }
+
+ public function authConnectLogin(ConnectModel $connect)
{
$userRepo = new UserRepo();
@@ -112,6 +128,13 @@ class Connect extends Service
return $auth->getUserInfo($token, $openId);
}
+ public function getWeChatSubscribe($unionId)
+ {
+ $subscribeRepo = new WeChatSubscribeRepo();
+
+ return $subscribeRepo->findByUnionId($unionId);
+ }
+
public function getConnectRelation($openId, $provider)
{
$connectRepo = new ConnectRepo();
@@ -200,6 +223,14 @@ class Connect extends Service
$connect->user_id = $user->id;
}
+ if (empty($connect->union_id) && !empty($openUser['unionid'])) {
+ $connect->union_id = $openUser['unionid'];
+ }
+
+ if ($connect->deleted == 1) {
+ $connect->deleted = 0;
+ }
+
$connect->update();
} else {
@@ -207,6 +238,7 @@ class Connect extends Service
$connect = new ConnectModel();
$connect->user_id = $user->id;
+ $connect->union_id = $openUser['unionid'];
$connect->open_id = $openUser['id'];
$connect->open_name = $openUser['name'];
$connect->open_avatar = $openUser['avatar'];
@@ -218,9 +250,9 @@ class Connect extends Service
protected function handleLoginNotice(UserModel $user)
{
- $service = new AccountLoginNoticeService();
+ $notice = new AccountLoginNotice();
- $service->createTask($user);
+ $notice->createTask($user);
}
}
diff --git a/app/Http/Home/Services/WeChatOfficialAccount.php b/app/Http/Home/Services/WeChatOfficialAccount.php
index d04ec722..038581dd 100644
--- a/app/Http/Home/Services/WeChatOfficialAccount.php
+++ b/app/Http/Home/Services/WeChatOfficialAccount.php
@@ -114,7 +114,8 @@ class WeChatOfficialAccount extends Service
$subscribe = $subscribeRepo->findByOpenId($openId);
if ($subscribe) {
- $subscribe->delete();
+ $subscribe->deleted = 1;
+ $subscribe->update();
}
return new TextMessage('伤心呀，我们又少了一个小伙伴!');
@@ -128,7 +129,9 @@ class WeChatOfficialAccount extends Service
$userId = str_replace('qrscene_', '', $eventKey);
if ($userId && $openId) {
- $this->saveWechatSubscribe($userId, $openId);
+ $userInfo = $this->getUserInfo($openId);
+ $unionId = $userInfo['unionid'] ?: '';
+ $this->saveWechatSubscribe($userId, $openId, $unionId);
}
return $this->emptyReply();
@@ -194,7 +197,7 @@ class WeChatOfficialAccount extends Service
return new TextMessage('没有匹配的服务哦！');
}
- protected function saveWechatSubscribe($userId, $openId)
+ protected function saveWechatSubscribe($userId, $openId, $unionId = '')
{
if (!$userId || !$openId) return;
@@ -211,14 +214,35 @@ class WeChatOfficialAccount extends Service
if ($subscribe) {
if ($subscribe->user_id != $userId) {
$subscribe->user_id = $userId;
- $subscribe->update();
}
+ if (empty($subscribe->union_id) && !empty($unionId)) {
+ $subscribe->union_id = $unionId;
+ }
+ if ($subscribe->deleted == 1) {
+ $subscribe->deleted = 0;
+ }
+ $subscribe->update();
} else {
$subscribe = new WeChatSubscribeModel();
$subscribe->user_id = $userId;
$subscribe->open_id = $openId;
+ $subscribe->union_id = $unionId;
$subscribe->create();
}
}
+ protected function getUserInfo($openId)
+ {
+ $app = $this->getOfficialAccount();
+
+ return $app->user->get($openId);
+ }
+
+ protected function getWechatLogger()
+ {
+ $service = new WeChatService();
+
+ return $service->logger;
+ }
+
}
diff --git a/app/Http/Home/Views/account/login.volt b/app/Http/Home/Views/account/login.volt
index 59254fef..34641c28 100644
--- a/app/Http/Home/Views/account/login.volt
+++ b/app/Http/Home/Views/account/login.volt
@@ -2,9 +2,6 @@
{% block content %}
- {% set login_with_phone = oauth_provider.local.login_with_phone == 1 %}
- {% set login_with_email = oauth_provider.local.login_with_email == 1 %}
-
首页
登录
diff --git a/app/Http/Home/Views/account/login_by_password.volt b/app/Http/Home/Views/account/login_by_password.volt
index a1d15f4a..cded753e 100644
--- a/app/Http/Home/Views/account/login_by_password.volt
+++ b/app/Http/Home/Views/account/login_by_password.volt
@@ -1,20 +1,8 @@
@@ -64,11 +64,16 @@
{% endif %}