From e24cf1bd1c83f48f351a604d810999fe443aa245 Mon Sep 17 00:00:00 2001 From: xiaochong0302 Date: Sun, 28 Apr 2024 21:17:36 +0800 Subject: [PATCH 1/9] =?UTF-8?q?1.=E8=B0=83=E6=95=B4=E7=BC=96=E8=BE=91?= =?UTF-8?q?=E5=99=A8=E6=9D=A1=E7=9B=AE=202.=E5=A2=9E=E5=8A=A0=E4=BB=A3?= =?UTF-8?q?=E7=A0=81=E5=9D=97=E5=A4=8D=E5=88=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/Console/Tasks/SyncAppInfoTask.php | 4 ++++ public/static/admin/js/content.editor.js | 11 ++++++----- public/static/home/css/content.css | 24 +++++++++++++++++++++++- public/static/home/js/content.editor.js | 9 +++++---- public/static/home/js/copy.js | 17 +++++++++++++++-- 5 files changed, 53 insertions(+), 12 deletions(-) diff --git a/app/Console/Tasks/SyncAppInfoTask.php b/app/Console/Tasks/SyncAppInfoTask.php index cbca2b44..361d029e 100644 --- a/app/Console/Tasks/SyncAppInfoTask.php +++ b/app/Console/Tasks/SyncAppInfoTask.php @@ -15,6 +15,8 @@ class SyncAppInfoTask extends Task public function mainAction() { + echo '------ start sync app info ------' . PHP_EOL; + $url = 'https://www.koogua.com/api/instance/collect'; $site = $this->getSettings('site'); @@ -37,6 +39,8 @@ class SyncAppInfoTask extends Task $client = new Client(); $client->request('POST', $url, ['form_params' => $params]); + + echo '------ end sync app info ------' . PHP_EOL; } } diff --git a/public/static/admin/js/content.editor.js b/public/static/admin/js/content.editor.js index d9e370a5..b7b948cb 100644 --- a/public/static/admin/js/content.editor.js +++ b/public/static/admin/js/content.editor.js @@ -6,18 +6,19 @@ layui.use(['jquery'], function () { var options = { uploadJson: '/admin/upload/content/img', - cssPath: '/static/lib/kindeditor/content.css', + cssPath: '/static/home/css/content.css', width: '100%', height: '300px', items: [ 'selectall', '|', 'undo', 'redo', '|', - 'copy', 'plainpaste', 'wordpaste', '|', - 'formatblock', 'forecolor', 'hilitecolor', 'bold', 'italic', 'underline', 'removeformat', '|', - 'insertorderedlist', 'insertunorderedlist', 'table', '|', - 'superscript', 'subscript', '|', 'image', 'link', 'unlink', '|', + 'formatblock', 'forecolor', 'hilitecolor', 'bold', 'italic', 'underline', 'strikethrough', 'removeformat', '|', + 'insertorderedlist', 'insertunorderedlist', 'table', 'code', '|', + 'superscript', 'subscript', '|', + 'image', 'link', 'unlink', '|', 'source', 'about' ], + pasteType: 1, extraFileUploadParams: { csrf_token: $('meta[name="csrf-token"]').attr('content') } diff --git a/public/static/home/css/content.css b/public/static/home/css/content.css index fd953ae6..d5ff9a65 100644 --- a/public/static/home/css/content.css +++ b/public/static/home/css/content.css @@ -178,7 +178,8 @@ font-family: Consolas, Monaco, Andale Mono, monospace; line-height: 1.7em; overflow: auto; - padding: 6px 10px; + padding: 15px 10px; + margin-bottom: 15px; border-left: 5px solid #6CE26C; } @@ -218,4 +219,25 @@ .ke-content blockquote p { color: #666; +} + +.ke-content pre { + position: relative; +} + +.ke-content pre > span.kg-copy { + position: absolute; + top: 10px; + right: 10px; + padding: 0 10px; + color: #fff; + font-size: 12px; + border-radius: 3px; + background: rgba(0, 0, 0, 0.5); + cursor: pointer; + display: none; +} + +.ke-content pre:hover > span.kg-copy { + display: block; } \ No newline at end of file diff --git a/public/static/home/js/content.editor.js b/public/static/home/js/content.editor.js index cbefda90..1a09f8f6 100644 --- a/public/static/home/js/content.editor.js +++ b/public/static/home/js/content.editor.js @@ -12,12 +12,13 @@ layui.use(['jquery'], function () { items: [ 'selectall', '|', 'undo', 'redo', '|', - 'copy', 'plainpaste', 'wordpaste', '|', - 'formatblock', 'forecolor', 'hilitecolor', 'bold', 'italic', 'underline', 'removeformat', '|', - 'insertorderedlist', 'insertunorderedlist', 'table', '|', - 'superscript', 'subscript', '|', 'image', 'link', 'unlink', '|', + 'formatblock', 'formatblock', 'forecolor', 'hilitecolor', 'bold', 'italic', 'underline', 'strikethrough', 'removeformat', '|', + 'insertorderedlist', 'insertunorderedlist', 'table', 'code', '|', + 'superscript', 'subscript', '|', + 'image', 'link', 'unlink', '|', 'source', 'about' ], + pasteType: 1, extraFileUploadParams: { csrf_token: $('meta[name="csrf-token"]').attr('content') } diff --git a/public/static/home/js/copy.js b/public/static/home/js/copy.js index c66d263f..0c7bfc12 100644 --- a/public/static/home/js/copy.js +++ b/public/static/home/js/copy.js @@ -1,9 +1,22 @@ -layui.use(['layer'], function () { +layui.use(['jquery','layer'], function () { + var $ = layui.jquery; var layer = layui.layer; + + if ($('.ke-content').length > 0) { + var kePres = $('pre'); + if (kePres.length > 0) { + kePres.each(function () { + var text = $(this).text(); + var btn = $('复制').attr('data-clipboard-text', text); + $(this).prepend(btn); + }); + } + } + var clipboard = new ClipboardJS('.kg-copy'); - clipboard.on('success', function (e) { + clipboard.on('success', function () { layer.msg('内容已经复制到剪贴板'); }); From 9addc3debeb1ae5e7665a06595fe581143e79539 Mon Sep 17 00:00:00 2001 From: xiaochong0302 Date: Mon, 29 Apr 2024 16:26:59 +0800 Subject: [PATCH 2/9] =?UTF-8?q?=E8=B0=83=E6=95=B4=E7=BC=96=E8=BE=91?= =?UTF-8?q?=E5=99=A8=E6=9D=A1=E7=9B=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/static/admin/js/content.editor.js | 1 - public/static/home/js/content.editor.js | 1 - 2 files changed, 2 deletions(-) diff --git a/public/static/admin/js/content.editor.js b/public/static/admin/js/content.editor.js index b7b948cb..60b32074 100644 --- a/public/static/admin/js/content.editor.js +++ b/public/static/admin/js/content.editor.js @@ -14,7 +14,6 @@ layui.use(['jquery'], function () { 'undo', 'redo', '|', 'formatblock', 'forecolor', 'hilitecolor', 'bold', 'italic', 'underline', 'strikethrough', 'removeformat', '|', 'insertorderedlist', 'insertunorderedlist', 'table', 'code', '|', - 'superscript', 'subscript', '|', 'image', 'link', 'unlink', '|', 'source', 'about' ], diff --git a/public/static/home/js/content.editor.js b/public/static/home/js/content.editor.js index 1a09f8f6..269d8aab 100644 --- a/public/static/home/js/content.editor.js +++ b/public/static/home/js/content.editor.js @@ -14,7 +14,6 @@ layui.use(['jquery'], function () { 'undo', 'redo', '|', 'formatblock', 'formatblock', 'forecolor', 'hilitecolor', 'bold', 'italic', 'underline', 'strikethrough', 'removeformat', '|', 'insertorderedlist', 'insertunorderedlist', 'table', 'code', '|', - 'superscript', 'subscript', '|', 'image', 'link', 'unlink', '|', 'source', 'about' ], From 4e80f3938ab83f2628ee848fe40a66cf421c6abd Mon Sep 17 00:00:00 2001 From: xiaochong0302 Date: Thu, 2 May 2024 11:04:21 +0800 Subject: [PATCH 3/9] =?UTF-8?q?=E7=99=BB=E5=BD=95=E5=90=8E=E5=8F=B0?= =?UTF-8?q?=E5=90=8C=E6=97=B6=E7=99=BB=E5=BD=95=E5=89=8D=E5=8F=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/Http/Admin/Services/Session.php | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/app/Http/Admin/Services/Session.php b/app/Http/Admin/Services/Session.php index 232ca195..f20a7ec1 100644 --- a/app/Http/Admin/Services/Session.php +++ b/app/Http/Admin/Services/Session.php @@ -8,6 +8,7 @@ namespace App\Http\Admin\Services; use App\Services\Auth\Admin as AdminAuth; +use App\Services\Auth\Home as HomeAuth; use App\Validators\Account as AccountValidator; class Session extends Service @@ -35,6 +36,8 @@ class Session extends Service $this->auth->saveAuthInfo($user); + $this->loginHome($user); + $this->eventsManager->fire('Account:afterLogin', $this, $user); } @@ -47,4 +50,11 @@ class Session extends Service $this->eventsManager->fire('Account:afterLogout', $this, $user); } + protected function loginHome($user) + { + $auth = new HomeAuth(); + + $auth->saveAuthInfo($user); + } + } From bd14979e9b6d90acffe9e72d96be313050287da9 Mon Sep 17 00:00:00 2001 From: xiaochong0302 Date: Sun, 5 May 2024 21:52:13 +0800 Subject: [PATCH 4/9] =?UTF-8?q?=E8=B0=83=E6=95=B4=E7=BC=96=E8=BE=91?= =?UTF-8?q?=E5=99=A8htmlTags=E5=B1=9E=E6=80=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/static/admin/js/content.editor.js | 15 ++++++++++++++- public/static/home/js/content.editor.js | 13 ++++++++++++- 2 files changed, 26 insertions(+), 2 deletions(-) diff --git a/public/static/admin/js/content.editor.js b/public/static/admin/js/content.editor.js index 60b32074..c14cbb7a 100644 --- a/public/static/admin/js/content.editor.js +++ b/public/static/admin/js/content.editor.js @@ -17,7 +17,20 @@ layui.use(['jquery'], function () { 'image', 'link', 'unlink', '|', 'source', 'about' ], - pasteType: 1, + htmlTags: { + span: ['.color', '.background-color'], + a: ['id', 'class', 'href', 'target', 'name'], + img: ['id', 'class', 'src', 'width', 'height', 'alt', 'title'], + table: ['id', 'class'], + div: ['id', 'class'], + pre: ['id', 'class'], + hr: ['id', 'class'], + embed: ['id', 'class', 'src', 'width', 'height', 'type', 'loop', 'autostart', 'quality', 'align', 'wmode'], + iframe: ['id', 'class', 'src', 'width', 'height'], + 'td,th': ['id', 'class'], + 'p,ol,ul,li,blockquote,h1,h2,h3,h4,h5,h6': ['id', 'class'], + 'br,tbody,tr,strong,b,sub,sup,em,i,u,strike,s,del': ['id', 'class'], + }, extraFileUploadParams: { csrf_token: $('meta[name="csrf-token"]').attr('content') } diff --git a/public/static/home/js/content.editor.js b/public/static/home/js/content.editor.js index 269d8aab..01c091f3 100644 --- a/public/static/home/js/content.editor.js +++ b/public/static/home/js/content.editor.js @@ -17,7 +17,18 @@ layui.use(['jquery'], function () { 'image', 'link', 'unlink', '|', 'source', 'about' ], - pasteType: 1, + htmlTags: { + span: ['.color', '.background-color'], + a: ['id', 'class', 'href', 'target', 'name'], + img: ['id', 'class', 'src', 'width', 'height', 'alt', 'title'], + table: ['id', 'class'], + div: ['id', 'class'], + pre: ['id', 'class'], + hr: ['id', 'class'], + 'td,th': ['id', 'class'], + 'p,ol,ul,li,blockquote,h1,h2,h3,h4,h5,h6': ['id', 'class'], + 'br,tbody,tr,strong,b,sub,sup,em,i,u,strike,s,del': ['id', 'class'], + }, extraFileUploadParams: { csrf_token: $('meta[name="csrf-token"]').attr('content') } From a0e8e932e1d065c2b7faa66c01866fe3767f7d64 Mon Sep 17 00:00:00 2001 From: xiaochong0302 Date: Thu, 9 May 2024 21:37:23 +0800 Subject: [PATCH 5/9] v1.7.0 --- CHANGELOG.md | 11 +++++++++++ app/Library/Paginator/Adapter/XunSearch.php | 2 +- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index ee828153..2cbc7afc 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,14 @@ +### [v1.7.0](https://gitee.com/koogua/course-tencent-cloud/releases/v1.7.0)(2024-05-15) + +- 升级layui-2.9.8 +- 调整html编辑器属性 +- 增加代码块内容复制 +- 清理无用的Captcha配置 +- 联系人QQ改为上传二维码图片 +- 修正logo,favicon上传路径 +- 登录后台同时登录前台 +- 移动端修正评论发表 + ### [v1.6.9](https://gitee.com/koogua/course-tencent-cloud/releases/v1.6.9)(2024-04-15) - 增加用户删除和还原功能 diff --git a/app/Library/Paginator/Adapter/XunSearch.php b/app/Library/Paginator/Adapter/XunSearch.php index f524bce1..c2d57e25 100644 --- a/app/Library/Paginator/Adapter/XunSearch.php +++ b/app/Library/Paginator/Adapter/XunSearch.php @@ -42,7 +42,7 @@ class XunSearch extends PaginatorAdapter public function __construct(array $config) { - if (!isset($config['xs']) || ($config['xs'] instanceof \XS) == false) { + if (!isset($config['xs']) || !($config['xs'] instanceof \XS)) { throw new PaginatorException('Invalid xs parameter'); } From 0c30cda0c396381aff19df4fe3bc4e0785902cf8 Mon Sep 17 00:00:00 2001 From: xiaochong0302 Date: Thu, 9 May 2024 21:38:40 +0800 Subject: [PATCH 6/9] v1.7.0 --- app/Library/AppInfo.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/Library/AppInfo.php b/app/Library/AppInfo.php index 3a8f3414..a7f0f48e 100644 --- a/app/Library/AppInfo.php +++ b/app/Library/AppInfo.php @@ -16,7 +16,7 @@ class AppInfo protected $link = 'https://www.koogua.com'; - protected $version = '1.6.9'; + protected $version = '1.7.0'; public function __get($name) { From a31c991b1c00326262710500dbbee0a72253db4e Mon Sep 17 00:00:00 2001 From: xiaochong0302 Date: Sun, 12 May 2024 19:02:07 +0800 Subject: [PATCH 7/9] =?UTF-8?q?1.=E4=BC=98=E5=8C=96ShareUrl=202.=E7=AC=AC?= =?UTF-8?q?=E4=B8=89=E6=96=B9=E7=99=BB=E5=BD=95=E5=A2=9E=E5=8A=A0=E8=B4=A6?= =?UTF-8?q?=E5=8F=B7=E5=8F=AF=E7=94=A8=E6=80=A7=E5=88=A4=E6=96=AD=203.?= =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=85=AC=E4=BC=97=E5=8F=B7=E5=85=B3=E6=B3=A8?= =?UTF-8?q?=E7=9B=B8=E5=85=B3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- CHANGELOG.md | 2 + .../Api/Controllers/ConnectController.php | 4 +- .../Home/Controllers/AccountController.php | 2 +- .../Home/Controllers/AnswerController.php | 2 +- .../Home/Controllers/ArticleController.php | 2 +- .../Home/Controllers/ChapterController.php | 2 +- .../Home/Controllers/CourseController.php | 2 +- app/Http/Home/Controllers/HelpController.php | 2 +- app/Http/Home/Controllers/IndexController.php | 2 +- app/Http/Home/Controllers/PageController.php | 2 +- .../Home/Controllers/PointGiftController.php | 8 + .../Home/Controllers/PublicController.php | 39 ++- .../Home/Controllers/QuestionController.php | 2 +- .../Home/Controllers/TeacherController.php | 2 +- app/Http/Home/Controllers/UserController.php | 2 +- app/Http/Home/Controllers/VipController.php | 2 +- .../WeChatOfficialAccountController.php | 104 ++++-- app/Http/Home/Services/Connect.php | 4 + app/Http/Home/Services/FullH5Url.php | 153 --------- app/Http/Home/Services/FullWebUrl.php | 79 ----- app/Http/Home/Services/ShareUrl.php | 123 ------- .../Home/Services/WeChatOfficialAccount.php | 299 +++++------------ app/Library/AppInfo.php | 2 +- app/Models/Connect.php | 4 +- app/Repos/Connect.php | 13 + app/Services/Logic/Url/FullH5Url.php | 5 - app/Services/Logic/Url/ShareUrl.php | 2 + app/Services/Logic/WeChat/OfficialAccount.php | 317 ++++++++++++++++++ app/Services/OAuth/WeChat.php | 2 +- app/Validators/WeChatOfficialAccount.php | 29 ++ 30 files changed, 598 insertions(+), 615 deletions(-) delete mode 100644 app/Http/Home/Services/FullH5Url.php delete mode 100644 app/Http/Home/Services/FullWebUrl.php delete mode 100644 app/Http/Home/Services/ShareUrl.php create mode 100644 app/Services/Logic/WeChat/OfficialAccount.php create mode 100644 app/Validators/WeChatOfficialAccount.php diff --git a/CHANGELOG.md b/CHANGELOG.md index 2cbc7afc..8e8b0cc4 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,5 @@ +### [v1.7.1](https://gitee.com/koogua/course-tencent-cloud/releases/v1.7.1)(2024-06-15) + ### [v1.7.0](https://gitee.com/koogua/course-tencent-cloud/releases/v1.7.0)(2024-05-15) - 升级layui-2.9.8 diff --git a/app/Http/Api/Controllers/ConnectController.php b/app/Http/Api/Controllers/ConnectController.php index 9f06fbd2..5951835d 100644 --- a/app/Http/Api/Controllers/ConnectController.php +++ b/app/Http/Api/Controllers/ConnectController.php @@ -29,7 +29,7 @@ class ConnectController extends Controller $service->setWechatRedirectCache($redirect); } - $url = $service->getAuthorizeUrl(ConnectModel::PROVIDER_WECHAT); + $url = $service->getAuthorizeUrl(ConnectModel::PROVIDER_WECHAT_OA); return $this->response->redirect($url, true); } @@ -41,7 +41,7 @@ class ConnectController extends Controller { $service = new ConnectService(); - $data = $service->handleCallback(ConnectModel::PROVIDER_WECHAT); + $data = $service->handleCallback(ConnectModel::PROVIDER_WECHAT_OA); $redirect = $service->getWechatRedirectCache(); diff --git a/app/Http/Home/Controllers/AccountController.php b/app/Http/Home/Controllers/AccountController.php index 093fbea1..1a5a871d 100644 --- a/app/Http/Home/Controllers/AccountController.php +++ b/app/Http/Home/Controllers/AccountController.php @@ -8,12 +8,12 @@ namespace App\Http\Home\Controllers; use App\Http\Home\Services\Account as AccountService; -use App\Http\Home\Services\FullH5Url as FullH5UrlService; use App\Services\Logic\Account\EmailUpdate as EmailUpdateService; use App\Services\Logic\Account\OAuthProvider as OAuthProviderService; use App\Services\Logic\Account\PasswordReset as PasswordResetService; use App\Services\Logic\Account\PasswordUpdate as PasswordUpdateService; use App\Services\Logic\Account\PhoneUpdate as PhoneUpdateService; +use App\Services\Logic\Url\FullH5Url as FullH5UrlService; /** * @RoutePrefix("/account") diff --git a/app/Http/Home/Controllers/AnswerController.php b/app/Http/Home/Controllers/AnswerController.php index efb3be6b..17c2cedd 100644 --- a/app/Http/Home/Controllers/AnswerController.php +++ b/app/Http/Home/Controllers/AnswerController.php @@ -8,7 +8,6 @@ namespace App\Http\Home\Controllers; use App\Http\Home\Services\Answer as AnswerService; -use App\Http\Home\Services\FullH5Url as FullH5UrlService; use App\Http\Home\Services\Question as QuestionService; use App\Models\Answer as AnswerModel; use App\Services\Logic\Answer\AnswerAccept as AnswerAcceptService; @@ -17,6 +16,7 @@ use App\Services\Logic\Answer\AnswerDelete as AnswerDeleteService; use App\Services\Logic\Answer\AnswerInfo as AnswerInfoService; use App\Services\Logic\Answer\AnswerLike as AnswerLikeService; use App\Services\Logic\Answer\AnswerUpdate as AnswerUpdateService; +use App\Services\Logic\Url\FullH5Url as FullH5UrlService; use Phalcon\Mvc\View; /** diff --git a/app/Http/Home/Controllers/ArticleController.php b/app/Http/Home/Controllers/ArticleController.php index f6effe5a..b991d198 100644 --- a/app/Http/Home/Controllers/ArticleController.php +++ b/app/Http/Home/Controllers/ArticleController.php @@ -9,7 +9,6 @@ namespace App\Http\Home\Controllers; use App\Http\Home\Services\Article as ArticleService; use App\Http\Home\Services\ArticleQuery as ArticleQueryService; -use App\Http\Home\Services\FullH5Url as FullH5UrlService; use App\Models\Article as ArticleModel; use App\Services\Logic\Article\ArticleClose as ArticleCloseService; use App\Services\Logic\Article\ArticleCreate as ArticleCreateService; @@ -20,6 +19,7 @@ use App\Services\Logic\Article\ArticleLike as ArticleLikeService; use App\Services\Logic\Article\ArticleList as ArticleListService; use App\Services\Logic\Article\ArticleUpdate as ArticleUpdateService; use App\Services\Logic\Article\RelatedArticleList as RelatedArticleListService; +use App\Services\Logic\Url\FullH5Url as FullH5UrlService; use Phalcon\Mvc\View; /** diff --git a/app/Http/Home/Controllers/ChapterController.php b/app/Http/Home/Controllers/ChapterController.php index 1119a909..94db91de 100644 --- a/app/Http/Home/Controllers/ChapterController.php +++ b/app/Http/Home/Controllers/ChapterController.php @@ -7,7 +7,6 @@ namespace App\Http\Home\Controllers; -use App\Http\Home\Services\FullH5Url as FullH5UrlService; use App\Models\ChapterLive as LiveModel; use App\Models\Course as CourseModel; use App\Services\Logic\Chapter\ChapterInfo as ChapterInfoService; @@ -15,6 +14,7 @@ use App\Services\Logic\Chapter\ChapterLike as ChapterLikeService; use App\Services\Logic\Chapter\Learning as ChapterLearningService; use App\Services\Logic\Course\BasicInfo as CourseInfoService; use App\Services\Logic\Course\ChapterList as CourseChapterListService; +use App\Services\Logic\Url\FullH5Url as FullH5UrlService; /** * @RoutePrefix("/chapter") diff --git a/app/Http/Home/Controllers/CourseController.php b/app/Http/Home/Controllers/CourseController.php index b80acb00..d9aaced0 100644 --- a/app/Http/Home/Controllers/CourseController.php +++ b/app/Http/Home/Controllers/CourseController.php @@ -8,7 +8,6 @@ namespace App\Http\Home\Controllers; use App\Http\Home\Services\CourseQuery as CourseQueryService; -use App\Http\Home\Services\FullH5Url as FullH5UrlService; use App\Services\Logic\Course\ChapterList as CourseChapterListService; use App\Services\Logic\Course\ConsultList as CourseConsultListService; use App\Services\Logic\Course\CourseFavorite as CourseFavoriteService; @@ -20,6 +19,7 @@ use App\Services\Logic\Course\ResourceList as CourseResourceListService; use App\Services\Logic\Course\ReviewList as CourseReviewListService; use App\Services\Logic\Course\TopicList as CourseTopicListService; use App\Services\Logic\Reward\OptionList as RewardOptionList; +use App\Services\Logic\Url\FullH5Url as FullH5UrlService; use Phalcon\Mvc\View; /** diff --git a/app/Http/Home/Controllers/HelpController.php b/app/Http/Home/Controllers/HelpController.php index 2de44d92..dfe7a9b7 100644 --- a/app/Http/Home/Controllers/HelpController.php +++ b/app/Http/Home/Controllers/HelpController.php @@ -7,9 +7,9 @@ namespace App\Http\Home\Controllers; -use App\Http\Home\Services\FullH5Url as FullH5UrlService; use App\Services\Logic\Help\HelpInfo as HelpInfoService; use App\Services\Logic\Help\HelpList as HelpListService; +use App\Services\Logic\Url\FullH5Url as FullH5UrlService; /** * @RoutePrefix("/help") diff --git a/app/Http/Home/Controllers/IndexController.php b/app/Http/Home/Controllers/IndexController.php index 38dc4890..279bbf2d 100644 --- a/app/Http/Home/Controllers/IndexController.php +++ b/app/Http/Home/Controllers/IndexController.php @@ -7,8 +7,8 @@ namespace App\Http\Home\Controllers; -use App\Http\Home\Services\FullH5Url as FullH5UrlService; use App\Http\Home\Services\Index as IndexService; +use App\Services\Logic\Url\FullH5Url as FullH5UrlService; class IndexController extends Controller { diff --git a/app/Http/Home/Controllers/PageController.php b/app/Http/Home/Controllers/PageController.php index 7bb30570..86920f7d 100644 --- a/app/Http/Home/Controllers/PageController.php +++ b/app/Http/Home/Controllers/PageController.php @@ -7,9 +7,9 @@ namespace App\Http\Home\Controllers; -use App\Http\Home\Services\FullH5Url as FullH5UrlService; use App\Http\Home\Services\Index as IndexService; use App\Services\Logic\Page\PageInfo as PageInfoService; +use App\Services\Logic\Url\FullH5Url as FullH5UrlService; /** * @RoutePrefix("/page") diff --git a/app/Http/Home/Controllers/PointGiftController.php b/app/Http/Home/Controllers/PointGiftController.php index dac85a45..1b7a8c0d 100644 --- a/app/Http/Home/Controllers/PointGiftController.php +++ b/app/Http/Home/Controllers/PointGiftController.php @@ -11,6 +11,7 @@ use App\Services\Logic\Point\GiftInfo as GiftInfoService; use App\Services\Logic\Point\GiftList as GiftListService; use App\Services\Logic\Point\GiftRedeem as GiftRedeemService; use App\Services\Logic\Point\HotGiftList as HotGiftListService; +use App\Services\Logic\Url\FullH5Url as FullH5UrlService; use App\Services\Logic\User\Console\BalanceInfo as BalanceInfoService; use Phalcon\Mvc\Dispatcher; use Phalcon\Mvc\View; @@ -38,6 +39,13 @@ class PointGiftController extends Controller */ public function listAction() { + $service = new FullH5UrlService(); + + if ($service->isMobileBrowser() && $service->h5Enabled()) { + $location = $service->getPointGiftListUrl(); + return $this->response->redirect($location); + } + $this->seo->prependTitle('积分商城'); $this->view->pick('point/gift/list'); diff --git a/app/Http/Home/Controllers/PublicController.php b/app/Http/Home/Controllers/PublicController.php index a79a0dc2..b8b4c01a 100644 --- a/app/Http/Home/Controllers/PublicController.php +++ b/app/Http/Home/Controllers/PublicController.php @@ -7,10 +7,11 @@ namespace App\Http\Home\Controllers; -use App\Http\Home\Services\ShareUrl as ShareUrlService; use App\Library\CsrfToken as CsrfTokenService; use App\Repos\Upload as UploadRepo; use App\Services\LiveNotify as LiveNotifyService; +use App\Services\Logic\Url\ShareUrl as ShareUrlService; +use App\Services\Logic\WeChat\OfficialAccount as WeChatOAService; use App\Services\Pay\Alipay as AlipayService; use App\Services\Pay\Wxpay as WxpayService; use App\Services\Storage as StorageService; @@ -150,6 +151,42 @@ class PublicController extends \Phalcon\Mvc\Controller exit; } + /** + * @Get("/wechat/oa/notify", name="home.wechat_oa.verify") + */ + public function wechatOaVerifyAction() + { + $service = new WeChatOAService(); + + $app = $service->getOfficialAccount(); + + $response = $app->server->serve(); + + $response->send(); + + exit; + } + + /** + * @Post("/wechat/oa/notify", name="home.wechat_oa.notify") + */ + public function wechatOaNotifyAction() + { + $service = new WeChatOAService(); + + $app = $service->getOfficialAccount(); + + $app->server->push(function ($message) use ($service) { + return $service->handleNotify($message); + }); + + $response = $app->server->serve(); + + $response->send(); + + exit; + } + /** * @Post("/live/notify", name="home.live_notify") */ diff --git a/app/Http/Home/Controllers/QuestionController.php b/app/Http/Home/Controllers/QuestionController.php index eeb603e4..d721e6cc 100644 --- a/app/Http/Home/Controllers/QuestionController.php +++ b/app/Http/Home/Controllers/QuestionController.php @@ -7,7 +7,6 @@ namespace App\Http\Home\Controllers; -use App\Http\Home\Services\FullH5Url as FullH5UrlService; use App\Http\Home\Services\Question as QuestionService; use App\Http\Home\Services\QuestionQuery as QuestionQueryService; use App\Models\Question as QuestionModel; @@ -20,6 +19,7 @@ use App\Services\Logic\Question\QuestionLike as QuestionLikeService; use App\Services\Logic\Question\QuestionList as QuestionListService; use App\Services\Logic\Question\QuestionUpdate as QuestionUpdateService; use App\Services\Logic\Question\RelatedQuestionList as RelatedQuestionListService; +use App\Services\Logic\Url\FullH5Url as FullH5UrlService; use Phalcon\Mvc\View; /** diff --git a/app/Http/Home/Controllers/TeacherController.php b/app/Http/Home/Controllers/TeacherController.php index 6dfc10c6..3cd62594 100644 --- a/app/Http/Home/Controllers/TeacherController.php +++ b/app/Http/Home/Controllers/TeacherController.php @@ -7,9 +7,9 @@ namespace App\Http\Home\Controllers; -use App\Http\Home\Services\FullH5Url as FullH5UrlService; use App\Services\Logic\Teacher\CourseList as TeacherCourseListService; use App\Services\Logic\Teacher\TeacherList as TeacherListService; +use App\Services\Logic\Url\FullH5Url as FullH5UrlService; use App\Services\Logic\User\UserInfo as UserInfoService; use Phalcon\Mvc\View; diff --git a/app/Http/Home/Controllers/UserController.php b/app/Http/Home/Controllers/UserController.php index a1bb9b61..1978a4f2 100644 --- a/app/Http/Home/Controllers/UserController.php +++ b/app/Http/Home/Controllers/UserController.php @@ -7,7 +7,7 @@ namespace App\Http\Home\Controllers; -use App\Http\Home\Services\FullH5Url as FullH5UrlService; +use App\Services\Logic\Url\FullH5Url as FullH5UrlService; use App\Services\Logic\User\AnswerList as UserAnswerListService; use App\Services\Logic\User\ArticleList as UserArticleListService; use App\Services\Logic\User\CourseList as UserCourseListService; diff --git a/app/Http/Home/Controllers/VipController.php b/app/Http/Home/Controllers/VipController.php index 34c0b84c..2940b063 100644 --- a/app/Http/Home/Controllers/VipController.php +++ b/app/Http/Home/Controllers/VipController.php @@ -7,7 +7,7 @@ namespace App\Http\Home\Controllers; -use App\Http\Home\Services\FullH5Url as FullH5UrlService; +use App\Services\Logic\Url\FullH5Url as FullH5UrlService; use App\Services\Logic\Vip\CourseList as VipCourseListService; use App\Services\Logic\Vip\OptionList as VipOptionListService; use App\Services\Logic\Vip\UserList as VipUserListService; diff --git a/app/Http/Home/Controllers/WeChatOfficialAccountController.php b/app/Http/Home/Controllers/WeChatOfficialAccountController.php index 1f8f4ccf..e52bd79d 100644 --- a/app/Http/Home/Controllers/WeChatOfficialAccountController.php +++ b/app/Http/Home/Controllers/WeChatOfficialAccountController.php @@ -7,31 +7,59 @@ namespace App\Http\Home\Controllers; -use App\Http\Home\Services\WeChatOfficialAccount as WeChatOAService; +use App\Http\Home\Services\WeChatOfficialAccount as HomeWeChatOAService; +use App\Services\Logic\WeChat\OfficialAccount as WeChatOAService; use App\Traits\Response as ResponseTrait; /** * @RoutePrefix("/wechat/oa") */ -class WeChatOfficialAccountController extends \Phalcon\Mvc\Controller +class WeChatOfficialAccountController extends Controller { use ResponseTrait; /** - * @Get("/subscribe/status", name="home.wechat_oa.sub_status") + * @Get("/bind", name="home.wechat_oa.bind") */ - public function subscribeStatusAction() + public function bindAction() { - $service = new WeChatOAService(); + $captcha = $this->getSettings('captcha'); - $status = $service->getSubscribeStatus(); + $this->seo->prependTitle('绑定帐号'); - return $this->jsonSuccess(['status' => $status]); + $this->view->pick('wechat/oa/bind'); + $this->view->setVar('captcha', $captcha); } /** - * @Get("/subscribe/qrcode", name="home.wechat_oa.sub_qrcode") + * @Get("/login/qrcode", name="home.wechat_oa.login_qrcode") + */ + public function loginQrCodeAction() + { + $service = new WeChatOAService(); + + $qrcode = $service->createLoginQrCode(); + + return $this->jsonSuccess(['qrcode' => $qrcode]); + } + + /** + * @Get("/login/status", name="home.wechat_oa.lgoin_status") + */ + public function loginStatusAction() + { + $ticket = $this->request->getQuery('ticket'); + + $service = new WeChatOAService(); + + $data = $service->getLoginStatus($ticket); + + return $this->jsonSuccess(['data' => $data]); + } + + /** + * @Get("/subscribe/qrcode", name="home.wechat_oa.subscribe_qrcode") */ public function subscribeQrCodeAction() { @@ -43,39 +71,63 @@ class WeChatOfficialAccountController extends \Phalcon\Mvc\Controller } /** - * @Get("/notify", name="home.wechat_oa.verify") + * @Get("/subscribe/status", name="home.wechat_oa.subscribe_status") */ - public function verifyAction() + public function subscribeStatusAction() { $service = new WeChatOAService(); - $app = $service->getOfficialAccount(); + $status = $service->getSubscribeStatus(); - $response = $app->server->serve(); - - $response->send(); - - exit; + return $this->jsonSuccess(['status' => $status]); } /** - * @Post("/notify", name="home.wechat_oa.notify") + * @Post("/auth/login", name="home.wechat_oa.auth_login") */ - public function notifyAction() + public function authLoginAction() { - $service = new WeChatOAService(); + $service = new HomeWeChatOAService(); - $app = $service->getOfficialAccount(); + $service->authLogin(); - $app->server->push(function ($message) use ($service) { - return $service->handleNotify($message); - }); + $returnUrl = $this->request->getPost('return_url', 'string'); - $response = $app->server->serve(); + $location = $returnUrl ?: $this->url->get(['for' => 'home.index']); - $response->send(); + return $this->jsonSuccess(['location' => $location]); + } - exit; + /** + * @Post("/bind/login", name="home.wechat_oa.bind_login") + */ + public function bindLoginAction() + { + $service = new HomeWeChatOAService(); + + $service->bindLogin(); + + $returnUrl = $this->request->getPost('return_url', 'string'); + + $location = $returnUrl ?: $this->url->get(['for' => 'home.index']); + + return $this->jsonSuccess(['location' => $location]); + } + + /** + * @Post("/bind/register", name="home.wechat_oa.bind_register") + */ + public function bindRegisterAction() + { + $service = new HomeWeChatOAService(); + + $service->bindRegister(); + + $returnUrl = $this->request->getPost('return_url', 'string'); + + $location = $returnUrl ?: $this->url->get(['for' => 'home.index']); + + return $this->jsonSuccess(['location' => $location]); } } diff --git a/app/Http/Home/Services/Connect.php b/app/Http/Home/Services/Connect.php index f2c1eabf..83ca171a 100644 --- a/app/Http/Home/Services/Connect.php +++ b/app/Http/Home/Services/Connect.php @@ -101,6 +101,10 @@ class Connect extends Service $user = $userRepo->findById($connect->user_id); + $validator = new AccountValidator(); + + $validator->checkIfAllowLogin($user); + $this->handleLoginNotice($user); $auth = $this->getAppAuth(); diff --git a/app/Http/Home/Services/FullH5Url.php b/app/Http/Home/Services/FullH5Url.php deleted file mode 100644 index 8b326f08..00000000 --- a/app/Http/Home/Services/FullH5Url.php +++ /dev/null @@ -1,153 +0,0 @@ -baseUrl = $this->getBaseUrl(); - } - - public function getHomeUrl() - { - return sprintf('%s/index/index', $this->baseUrl); - } - - public function getAccountRegisterUrl() - { - return sprintf('%s/account/register', $this->baseUrl); - } - - public function getAccountLoginUrl() - { - return sprintf('%s/account/login', $this->baseUrl); - } - - public function getAccountForgetUrl() - { - return sprintf('%s/account/forget', $this->baseUrl); - } - - public function getVipIndexUrl() - { - return sprintf('%s/vip/index', $this->baseUrl); - } - - public function getHelpIndexUrl() - { - return sprintf('%s/help/index', $this->baseUrl); - } - - public function getCourseListUrl() - { - return sprintf('%s/course/list', $this->baseUrl); - } - - public function getArticleListUrl() - { - return sprintf('%s/article/list', $this->baseUrl); - } - - public function getQuestionListUrl() - { - return sprintf('%s/question/list', $this->baseUrl); - } - - public function getLiveListUrl() - { - return sprintf('%s/discovery/index', $this->baseUrl); - } - - public function getTeacherListUrl() - { - return sprintf('%s/discovery/index', $this->baseUrl); - } - - public function getPointGiftListUrl() - { - return sprintf('%s/point/gift/list', $this->baseUrl); - } - - public function getPageInfoUrl($id) - { - return sprintf('%s/page/info?id=%s', $this->baseUrl, $id); - } - - public function getHelpInfoUrl($id) - { - return sprintf('%s/help/info?id=%s', $this->baseUrl, $id); - } - - public function getArticleInfoUrl($id) - { - return sprintf('%s/article/info?id=%s', $this->baseUrl, $id); - } - - public function getQuestionInfoUrl($id) - { - return sprintf('%s/question/info?id=%s', $this->baseUrl, $id); - } - - public function getAnswerInfoUrl($id) - { - return sprintf('%s/answer/info?id=%s', $this->baseUrl, $id); - } - - public function getCourseInfoUrl($id) - { - return sprintf('%s/course/info?id=%s', $this->baseUrl, $id); - } - - public function getChapterInfoUrl($id) - { - $chapterRepo = new ChapterRepo(); - - $chapter = $chapterRepo->findById($id); - - if ($chapter->model == CourseModel::MODEL_VOD) { - return sprintf('%s/chapter/vod?id=%s', $this->baseUrl, $id); - } elseif ($chapter->model == CourseModel::MODEL_LIVE) { - return sprintf('%s/chapter/live?id=%s', $this->baseUrl, $id); - } elseif ($chapter->model == CourseModel::MODEL_READ) { - return sprintf('%s/chapter/read?id=%s', $this->baseUrl, $id); - } else { - return $this->getHomeUrl(); - } - } - - public function getUserIndexUrl($id) - { - return sprintf('%s/user/index?id=%s', $this->baseUrl, $id); - } - - public function getTeacherIndexUrl($id) - { - return sprintf('%s/teacher/index?id=%s', $this->baseUrl, $id); - } - - public function getPointGiftInfoUrl($id) - { - return sprintf('%s/point/gift/info?id=%s', $this->baseUrl, $id); - } - - protected function getBaseUrl() - { - return sprintf('%s/h5/#/pages', kg_site_url()); - } - -} diff --git a/app/Http/Home/Services/FullWebUrl.php b/app/Http/Home/Services/FullWebUrl.php deleted file mode 100644 index c7bea066..00000000 --- a/app/Http/Home/Services/FullWebUrl.php +++ /dev/null @@ -1,79 +0,0 @@ -baseUrl = $this->getBaseUrl(); - } - - public function getHomeUrl() - { - return $this->baseUrl; - } - - public function getArticleShowUrl($id) - { - $route = $this->url->get(['for' => 'home.article.show', 'id' => $id]); - - return $this->baseUrl . $route; - } - - public function getQuestionShowUrl($id) - { - $route = $this->url->get(['for' => 'home.question.show', 'id' => $id]); - - return $this->baseUrl . $route; - } - - public function getCourseShowUrl($id) - { - $route = $this->url->get(['for' => 'home.course.show', 'id' => $id]); - - return $this->baseUrl . $route; - } - - public function getChapterShowUrl($id) - { - $route = $this->url->get(['for' => 'home.chapter.show', 'id' => $id]); - - return $this->baseUrl . $route; - } - - public function getUserShowUrl($id) - { - $route = $this->url->get(['for' => 'home.user.show', 'id' => $id]); - - return $this->baseUrl . $route; - } - - public function getTeacherShowUrl($id) - { - $route = $this->url->get(['for' => 'home.teacher.show', 'id' => $id]); - - return $this->baseUrl . $route; - } - - public function getPointGiftShowUrl($id) - { - $route = $this->url->get(['for' => 'home.point_gift.show', 'id' => $id]); - - return $this->baseUrl . $route; - } - - protected function getBaseUrl() - { - return kg_site_url(); - } - -} \ No newline at end of file diff --git a/app/Http/Home/Services/ShareUrl.php b/app/Http/Home/Services/ShareUrl.php deleted file mode 100644 index b69a8592..00000000 --- a/app/Http/Home/Services/ShareUrl.php +++ /dev/null @@ -1,123 +0,0 @@ -fullWebUrl = new FullWebUrl(); - $this->fullH5Url = new FullH5Url(); - } - - public function handle($id, $type) - { - if ($type == 'article') { - $result = $this->getArticleUrl($id); - } elseif ($type == 'question') { - $result = $this->getQuestionUrl($id); - } elseif ($type == 'course') { - $result = $this->getCourseUrl($id); - } elseif ($type == 'chapter') { - $result = $this->getChapterUrl($id); - } elseif ($type == 'user') { - $result = $this->getUserUrl($id); - } elseif ($type == 'teacher') { - $result = $this->getTeacherUrl($id); - } else { - $result = $this->getHomeUrl(); - } - - $gotoH5 = $this->h5Enabled() && $this->isMobileBrowser(); - - return $gotoH5 ? $result['h5'] : $result['web']; - } - - public function getHomeUrl() - { - $webUrl = $this->fullWebUrl->getHomeUrl(); - - $h5Url = $this->fullH5Url->getHomeUrl(); - - return ['web' => $webUrl, 'h5' => $h5Url]; - } - - public function getArticleUrl($id = 0) - { - $webUrl = $this->fullWebUrl->getArticleShowUrl($id); - - $h5Url = $this->fullH5Url->getArticleInfoUrl($id); - - return ['web' => $webUrl, 'h5' => $h5Url]; - } - - public function getQuestionUrl($id = 0) - { - $webUrl = $this->fullWebUrl->getQuestionShowUrl($id); - - $h5Url = $this->fullH5Url->getQuestionInfoUrl($id); - - return ['web' => $webUrl, 'h5' => $h5Url]; - } - - public function getCourseUrl($id = 0) - { - $webUrl = $this->fullWebUrl->getCourseShowUrl($id); - - $h5Url = $this->fullH5Url->getCourseInfoUrl($id); - - return ['web' => $webUrl, 'h5' => $h5Url]; - } - - public function getChapterUrl($id = 0) - { - $webUrl = $this->fullWebUrl->getChapterShowUrl($id); - - $h5Url = $this->fullH5Url->getChapterInfoUrl($id); - - return ['web' => $webUrl, 'h5' => $h5Url]; - } - - public function getUserUrl($id = 0) - { - $webUrl = $this->fullWebUrl->getUserShowUrl($id); - - $h5Url = $this->fullH5Url->getUserIndexUrl($id); - - return ['web' => $webUrl, 'h5' => $h5Url]; - } - - public function getTeacherUrl($id = 0) - { - $webUrl = $this->fullWebUrl->getTeacherShowUrl($id); - - $h5Url = $this->fullH5Url->getTeacherIndexUrl($id); - - return ['web' => $webUrl, 'h5' => $h5Url]; - } - -} diff --git a/app/Http/Home/Services/WeChatOfficialAccount.php b/app/Http/Home/Services/WeChatOfficialAccount.php index 038581dd..e12ed1a4 100644 --- a/app/Http/Home/Services/WeChatOfficialAccount.php +++ b/app/Http/Home/Services/WeChatOfficialAccount.php @@ -7,242 +7,119 @@ namespace App\Http\Home\Services; -use App\Models\WeChatSubscribe as WeChatSubscribeModel; +use App\Models\Connect as ConnectModel; +use App\Models\User as UserModel; +use App\Repos\Connect as ConnectRepo; use App\Repos\User as UserRepo; -use App\Repos\WeChatSubscribe as WeChatSubscribeRepo; -use App\Services\WeChat as WeChatService; -use EasyWeChat\Kernel\Messages\Text as TextMessage; +use App\Services\Auth\Home as AuthService; +use App\Services\Logic\Account\Register as RegisterService; +use App\Services\Logic\Notice\External\AccountLogin as AccountLoginNotice; +use App\Validators\Account as AccountValidator; +use App\Validators\WeChatOfficialAccount as WeChatOAValidator; class WeChatOfficialAccount extends Service { - public function getOfficialAccount() + public function authLogin() { - $service = new WeChatService(); + $ticket = $this->request->getPost('ticket'); - return $service->getOfficialAccount(); - } + $validator = new WeChatOAValidator(); - public function createSubscribeQrCode() - { - $user = $this->getLoginUser(); + $openId = $validator->checkLoginOpenId($ticket); - $app = $this->getOfficialAccount(); + $connectRepo = new ConnectRepo(); - $result = $app->qrcode->temporary($user->id); - - return $app->qrcode->url($result['ticket']); - } - - public function getSubscribeStatus() - { - $user = $this->getLoginUser(); - - $subscribeRepo = new WeChatSubscribeRepo(); - - $subscribe = $subscribeRepo->findByUserId($user->id); - - return $subscribe ? 1 : 0; - } - - public function handleNotify($message) - { - $service = new WeChatService(); - - $service->logger->debug('Received Message ' . json_encode($message)); - - switch ($message['MsgType']) { - case 'event': - switch ($message['Event']) { - case 'subscribe': - return $this->handleSubscribeEvent($message); - case 'unsubscribe': - return $this->handleUnsubscribeEvent($message); - case 'SCAN': - return $this->handleScanEvent($message); - case 'CLICK': - return $this->handleClickEvent($message); - case 'VIEW': - return $this->handleViewEvent($message); - case 'LOCATION': - return $this->handleLocationEvent($message); - default: - return $this->noMatchReply(); - } - case 'text': - return $this->handleTextReply($message); - case 'image': - return $this->handleImageReply($message); - case 'voice': - return $this->handleVoiceReply($message); - case 'video': - return $this->handleVideoReply($message); - case 'shortvideo': - return $this->handleShortVideoReply($message); - case 'location': - return $this->handleLocationReply($message); - case 'link': - return $this->handleLinkReply($message); - default: - return $this->noMatchReply(); - } - } - - protected function handleSubscribeEvent($message) - { - $openId = $message['FromUserName'] ?? ''; - $eventKey = $message['EventKey'] ?? ''; - - /** - * 带场景值的关注事件 - */ - $userId = str_replace('qrscene_', '', $eventKey); - - if ($userId && $openId) { - $this->saveWechatSubscribe($userId, $openId); - } - - return new TextMessage('开心呀，我们又多了一个小伙伴!'); - } - - protected function handleUnsubscribeEvent($message) - { - $openId = $message['FromUserName'] ?? ''; - - $subscribeRepo = new WeChatSubscribeRepo(); - - $subscribe = $subscribeRepo->findByOpenId($openId); - - if ($subscribe) { - $subscribe->deleted = 1; - $subscribe->update(); - } - - return new TextMessage('伤心呀，我们又少了一个小伙伴!'); - } - - protected function handleScanEvent($message) - { - $openId = $message['FromUserName'] ?? ''; - $eventKey = $message['EventKey'] ?? ''; - - $userId = str_replace('qrscene_', '', $eventKey); - - if ($userId && $openId) { - $userInfo = $this->getUserInfo($openId); - $unionId = $userInfo['unionid'] ?: ''; - $this->saveWechatSubscribe($userId, $openId, $unionId); - } - - return $this->emptyReply(); - } - - protected function handleClickEvent($message) - { - return $this->emptyReply(); - } - - protected function handleViewEvent($message) - { - return $this->emptyReply(); - } - - protected function handleLocationEvent($message) - { - return $this->emptyReply(); - } - - protected function handleTextReply($message) - { - return $this->emptyReply(); - } - - protected function handleImageReply($message) - { - return $this->emptyReply(); - } - - protected function handleVoiceReply($message) - { - return $this->emptyReply(); - } - - protected function handleVideoReply($message) - { - return $this->emptyReply(); - } - - protected function handleShortVideoReply($message) - { - return $this->emptyReply(); - } - - protected function handleLocationReply($message) - { - return $this->emptyReply(); - } - - protected function handleLinkReply($message) - { - return $this->emptyReply(); - } - - protected function emptyReply() - { - return null; - } - - protected function noMatchReply() - { - return new TextMessage('没有匹配的服务哦！'); - } - - protected function saveWechatSubscribe($userId, $openId, $unionId = '') - { - if (!$userId || !$openId) return; + $connect = $connectRepo->findByOpenId($openId, ConnectModel::PROVIDER_WECHAT_OA); $userRepo = new UserRepo(); - $user = $userRepo->findById($userId); + $user = $userRepo->findById($connect->user_id); - if (!$user) return; + $validator = new AccountValidator(); - $subscribeRepo = new WeChatSubscribeRepo(); + $validator->checkIfAllowLogin($user); - $subscribe = $subscribeRepo->findByOpenId($openId); + $this->handleLoginNotice($user); - if ($subscribe) { - if ($subscribe->user_id != $userId) { - $subscribe->user_id = $userId; - } - 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(); - } + $auth = $this->getAppAuth(); + + $auth->saveAuthInfo($user); } - protected function getUserInfo($openId) + public function bindLogin() { - $app = $this->getOfficialAccount(); + $post = $this->request->getPost(); - return $app->user->get($openId); + $validator = new AccountValidator(); + + $user = $validator->checkUserLogin($post['account'], $post['password']); + + $validator = new WeChatOAValidator(); + + $openId = $validator->checkLoginOpenId($post['ticket']); + + $connect = new ConnectModel(); + + $connect->user_id = $user->id; + $connect->open_id = $openId; + $connect->provider = ConnectModel::PROVIDER_WECHAT_OA; + + $connect->create(); + + $this->handleLoginNotice($user); + + $auth = $this->getAppAuth(); + + $auth->saveAuthInfo($user); } - protected function getWechatLogger() + public function bindRegister() { - $service = new WeChatService(); + $post = $this->request->getPost(); - return $service->logger; + $validator = new WeChatOAValidator(); + + $openId = $validator->checkLoginOpenId($post['ticket']); + + $registerService = new RegisterService(); + + $account = $registerService->handle(); + + $userRepo = new UserRepo(); + + $user = $userRepo->findById($account->id); + + $connect = new ConnectModel(); + + $connect->user_id = $user->id; + $connect->open_id = $openId; + $connect->provider = ConnectModel::PROVIDER_WECHAT_OA; + + $connect->create(); + + $this->handleLoginNotice($user); + + $auth = $this->getAppAuth(); + + $auth->saveAuthInfo($user); + } + + protected function getAppAuth() + { + /** + * @var $auth AuthService + */ + $auth = $this->getDI()->get('auth'); + + return $auth; + } + + protected function handleLoginNotice(UserModel $user) + { + $notice = new AccountLoginNotice(); + + $notice->createTask($user); } } diff --git a/app/Library/AppInfo.php b/app/Library/AppInfo.php index a7f0f48e..77a93f03 100644 --- a/app/Library/AppInfo.php +++ b/app/Library/AppInfo.php @@ -16,7 +16,7 @@ class AppInfo protected $link = 'https://www.koogua.com'; - protected $version = '1.7.0'; + protected $version = '1.7.1'; public function __get($name) { diff --git a/app/Models/Connect.php b/app/Models/Connect.php index 9f7d17e7..5fd4a32a 100644 --- a/app/Models/Connect.php +++ b/app/Models/Connect.php @@ -15,7 +15,9 @@ class Connect extends Model const PROVIDER_QQ = 1; // QQ const PROVIDER_WEIXIN = 2; // 微信扫码 const PROVIDER_WEIBO = 3; // 新浪微博 - const PROVIDER_WECHAT = 4; // 公众号网页 + const PROVIDER_WECHAT_OA = 4; // 微信公众号 + const PROVIDER_WECHAT_MINI = 5; // 微信小程序 + /** * 主键编号 diff --git a/app/Repos/Connect.php b/app/Repos/Connect.php index 4d580743..82a56b5b 100644 --- a/app/Repos/Connect.php +++ b/app/Repos/Connect.php @@ -67,4 +67,17 @@ class Connect extends Repository ]); } + /** + * @param int $userId + * @param int $provider + * @return ConnectModel|Model|bool + */ + public function findByUserId($userId, $provider) + { + return ConnectModel::findFirst([ + 'conditions' => 'user_id = ?1 AND provider = ?2 AND deleted = 0', + 'bind' => [1 => $userId, 2 => $provider], + ]); + } + } diff --git a/app/Services/Logic/Url/FullH5Url.php b/app/Services/Logic/Url/FullH5Url.php index be8cb36a..e5fa5def 100644 --- a/app/Services/Logic/Url/FullH5Url.php +++ b/app/Services/Logic/Url/FullH5Url.php @@ -116,11 +116,6 @@ class FullH5Url extends AppService return $this->getFullUrl('/question/info', ['id' => $id]); } - public function getAnswerInfoUrl($id) - { - return $this->getFullUrl('/answer/info', ['id' => $id]); - } - public function getTopicInfoUrl($id) { return $this->getFullUrl('/topic/info', ['id' => $id]); diff --git a/app/Services/Logic/Url/ShareUrl.php b/app/Services/Logic/Url/ShareUrl.php index 7741a6b6..4ccf8203 100644 --- a/app/Services/Logic/Url/ShareUrl.php +++ b/app/Services/Logic/Url/ShareUrl.php @@ -48,6 +48,8 @@ class ShareUrl extends AppService $result = $this->getArticleUrl($id); } elseif ($type == 'page') { $result = $this->getPageUrl($id); + } elseif ($type == 'help') { + $result = $this->getHelpUrl($id); } elseif ($type == 'question') { $result = $this->getQuestionUrl($id); } elseif ($type == 'course') { diff --git a/app/Services/Logic/WeChat/OfficialAccount.php b/app/Services/Logic/WeChat/OfficialAccount.php new file mode 100644 index 00000000..5f3c6cd4 --- /dev/null +++ b/app/Services/Logic/WeChat/OfficialAccount.php @@ -0,0 +1,317 @@ +getOfficialAccount(); + } + + public function createSubscribeQrCode() + { + $user = $this->getLoginUser(); + + $app = $this->getOfficialAccount(); + + $sceneValue = sprintf('%s%s', self::QR_SCENE_SUBSCRIBE, $user->id); + + $result = $app->qrcode->temporary($sceneValue); + + $url = $app->qrcode->url($result['ticket']); + + return ['url' => $url]; + } + + public function createLoginQrCode() + { + $app = $this->getOfficialAccount(); + + $ticket = Text::random(0, 16); + + $sceneValue = sprintf('%s%s', self::QR_SCENE_LOGIN, $ticket); + + $result = $app->qrcode->temporary($sceneValue); + + $keyName = $this->getLoginCacheKey($ticket); + + $content = [ + 'action' => '', + 'open_id' => '', + ]; + + $this->getCache()->save($keyName, $content, 30 * 60); + + $url = $app->qrcode->url($result['ticket']); + + return [ + 'ticket' => $ticket, + 'url' => $url, + ]; + } + + public function getLoginStatus($ticket) + { + $keyName = $this->getLoginCacheKey($ticket); + + return $this->getCache()->get($keyName); + } + + public function getSubscribeStatus() + { + $user = $this->getLoginUser(); + + $connectRepo = new ConnectRepo(); + + $connect = $connectRepo->findByUserId($user->id, ConnectModel::PROVIDER_WECHAT_OA); + + return $connect ? 1 : 0; + } + + public function getLoginOpenId($ticket) + { + $keyName = $this->getLoginCacheKey($ticket); + + $content = $this->getCache()->get($keyName); + + return $content['open_id'] ?? null; + } + + public function getLoginCacheKey($key) + { + return "wechat_oa_login:{$key}"; + } + + public function handleNotify($message) + { + $logger = $this->getWeChatLogger(); + + $logger->debug('Received Message: ' . json_encode($message)); + + switch ($message['MsgType']) { + case 'event': + switch ($message['Event']) { + case 'subscribe': + return $this->handleSubscribeEvent($message); + case 'unsubscribe': + return $this->handleUnsubscribeEvent($message); + case 'SCAN': + return $this->handleScanEvent($message); + case 'CLICK': + return $this->handleClickEvent($message); + case 'VIEW': + return $this->handleViewEvent($message); + case 'LOCATION': + return $this->handleLocationEvent($message); + default: + return $this->noMatchReply(); + } + case 'text': + return $this->handleTextReply($message); + case 'image': + return $this->handleImageReply($message); + case 'voice': + return $this->handleVoiceReply($message); + case 'video': + return $this->handleVideoReply($message); + case 'shortvideo': + return $this->handleShortVideoReply($message); + case 'location': + return $this->handleLocationReply($message); + case 'link': + return $this->handleLinkReply($message); + default: + return $this->noMatchReply(); + } + } + + protected function handleSubscribeEvent($message) + { + $openId = $message['FromUserName'] ?? ''; + + if (empty($openId)) return null; + + return new TextMessage('开心呀，我们又多了一个小伙伴!'); + } + + protected function handleUnsubscribeEvent($message) + { + $openId = $message['FromUserName'] ?? ''; + + if (empty($openId)) return null; + + $connectRepo = new ConnectRepo(); + + $connect = $connectRepo->findByOpenId($openId, ConnectModel::PROVIDER_WECHAT_OA); + + if ($connect) { + $connect->deleted = 1; + $connect->update(); + } + + return new TextMessage('伤心呀，我们又少了一个小伙伴!'); + } + + protected function handleScanEvent($message) + { + $openId = $message['FromUserName'] ?? ''; + $eventKey = $message['EventKey'] ?? ''; + + if (Text::startsWith($eventKey, self::QR_SCENE_LOGIN)) { + return $this->handleLoginScanEvent($eventKey, $openId); + } elseif (Text::startsWith($eventKey, self::QR_SCENE_SUBSCRIBE)) { + return $this->handleSubscribeScanEvent($eventKey, $openId); + } + + return $this->emptyReply(); + } + + protected function handleLoginScanEvent($eventKey, $openId) + { + $ticket = str_replace(self::QR_SCENE_LOGIN, '', $eventKey); + + if (empty($ticket) || empty($openId)) return null; + + $connectRepo = new ConnectRepo(); + + $connect = $connectRepo->findByOpenId($openId, ConnectModel::PROVIDER_WECHAT_OA); + + $keyName = $this->getLoginCacheKey($ticket); + + $cache = $this->getCache(); + + $content = [ + 'action' => $connect ? 'login' : 'bind', + 'open_id' => $openId, + ]; + + $cache->save($keyName, $content, 30 * 60); + + return $this->emptyReply(); + } + + protected function handleSubscribeScanEvent($eventKey, $openId) + { + $userId = str_replace(self::QR_SCENE_SUBSCRIBE, '', $eventKey); + + if (empty($userId) || empty($openId)) return null; + + $userInfo = $this->getUserInfo($openId); + + $unionId = $userInfo['unionid'] ?: ''; + + $connectRepo = new ConnectRepo(); + + $connect = $connectRepo->findByOpenId($openId, ConnectModel::PROVIDER_WECHAT_OA); + + if ($connect) return null; + + $connect = new ConnectModel(); + + $connect->user_id = $userId; + $connect->open_id = $openId; + $connect->union_id = $unionId; + $connect->provider = ConnectModel::PROVIDER_WECHAT_OA; + + $connect->create(); + + return $this->emptyReply(); + } + + protected function handleClickEvent($message) + { + return $this->emptyReply(); + } + + protected function handleViewEvent($message) + { + return $this->emptyReply(); + } + + protected function handleLocationEvent($message) + { + return $this->emptyReply(); + } + + protected function handleTextReply($message) + { + return $this->emptyReply(); + } + + protected function handleImageReply($message) + { + return $this->emptyReply(); + } + + protected function handleVoiceReply($message) + { + return $this->emptyReply(); + } + + protected function handleVideoReply($message) + { + return $this->emptyReply(); + } + + protected function handleShortVideoReply($message) + { + return $this->emptyReply(); + } + + protected function handleLocationReply($message) + { + return $this->emptyReply(); + } + + protected function handleLinkReply($message) + { + return $this->emptyReply(); + } + + protected function emptyReply() + { + return null; + } + + protected function noMatchReply() + { + return new TextMessage('没有匹配的服务哦！'); + } + + 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/Services/OAuth/WeChat.php b/app/Services/OAuth/WeChat.php index 98a1390e..6ebd8a99 100644 --- a/app/Services/OAuth/WeChat.php +++ b/app/Services/OAuth/WeChat.php @@ -91,7 +91,7 @@ class WeChat extends OAuth $userInfo['name'] = $data['nickname']; $userInfo['avatar'] = $data['headimgurl']; $userInfo['unionid'] = $data['unionid'] ?? ''; - $userInfo['provider'] = ConnectModel::PROVIDER_WECHAT; + $userInfo['provider'] = ConnectModel::PROVIDER_WECHAT_OA; return $userInfo; } diff --git a/app/Validators/WeChatOfficialAccount.php b/app/Validators/WeChatOfficialAccount.php new file mode 100644 index 00000000..f8322b66 --- /dev/null +++ b/app/Validators/WeChatOfficialAccount.php @@ -0,0 +1,29 @@ +getLoginOpenId($ticket); + + if (!$openId) { + throw new BadRequestException('wechat_oa.invalid_login_ticket'); + } + + return $openId; + } + +} From 8a5aa01d1c9f56b79babb4b3f0860699a7447634 Mon Sep 17 00:00:00 2001 From: xiaochong0302 Date: Mon, 13 May 2024 18:52:57 +0800 Subject: [PATCH 8/9] =?UTF-8?q?=E6=94=AF=E4=BB=98=E9=99=90=E9=A2=9D1w->10w?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/Validators/Order.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/Validators/Order.php b/app/Validators/Order.php index 1c6ca41d..c0888816 100644 --- a/app/Validators/Order.php +++ b/app/Validators/Order.php @@ -118,7 +118,7 @@ class Order extends Validator { $value = $this->filter->sanitize($amount, ['trim', 'float']); - if ($value < 0.01 || $value > 10000) { + if ($value < 0.01 || $value > 100000) { throw new BadRequestException('order.invalid_pay_amount'); } From 56f66c01bdd6ad495c9f9f70cefc9254b3cc9656 Mon Sep 17 00:00:00 2001 From: xiaochong0302 Date: Thu, 16 May 2024 11:29:19 +0800 Subject: [PATCH 9/9] =?UTF-8?q?=E8=B0=83=E6=95=B4=E5=BE=AE=E4=BF=A1?= =?UTF-8?q?=E5=85=AC=E4=BC=97=E5=8F=B7=E6=A8=A1=E6=9D=BF=E6=B6=88=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/Http/Admin/Views/setting/wechat_oa_notice.volt | 2 ++ .../Logic/Notice/External/WeChat/AccountLogin.php | 8 ++++---- .../Logic/Notice/External/WeChat/GoodsDeliver.php | 6 +++--- app/Services/Logic/Notice/External/WeChat/OrderFinish.php | 6 +++--- .../Logic/Notice/External/WeChat/RefundFinish.php | 8 ++++---- 5 files changed, 16 insertions(+), 14 deletions(-) diff --git a/app/Http/Admin/Views/setting/wechat_oa_notice.volt b/app/Http/Admin/Views/setting/wechat_oa_notice.volt index 7b86a162..37cccc21 100644 --- a/app/Http/Admin/Views/setting/wechat_oa_notice.volt +++ b/app/Http/Admin/Views/setting/wechat_oa_notice.volt @@ -47,6 +47,7 @@ +
diff --git a/app/Services/Logic/Notice/External/WeChat/AccountLogin.php b/app/Services/Logic/Notice/External/WeChat/AccountLogin.php index 36208a08..6319492f 100644 --- a/app/Services/Logic/Notice/External/WeChat/AccountLogin.php +++ b/app/Services/Logic/Notice/External/WeChat/AccountLogin.php @@ -43,10 +43,10 @@ class AccountLogin extends WeChatNotice $params = [ 'first' => $first, 'remark' => $remark, - 'keyword1' => $loginUser, - 'keyword2' => $loginTime, - 'keyword3' => $loginRegion, - 'keyword4' => $loginIp, + 'thing3' => $loginUser, + 'time2' => $loginTime, + 'thing7' => $loginRegion, + 'character_string8' => $loginIp, ]; $templateId = $this->getTemplateId($this->templateCode); diff --git a/app/Services/Logic/Notice/External/WeChat/GoodsDeliver.php b/app/Services/Logic/Notice/External/WeChat/GoodsDeliver.php index 70304e3b..6d336c33 100644 --- a/app/Services/Logic/Notice/External/WeChat/GoodsDeliver.php +++ b/app/Services/Logic/Notice/External/WeChat/GoodsDeliver.php @@ -33,9 +33,9 @@ class GoodsDeliver extends WeChatNotice $params = [ 'first' => $first, 'remark' => $remark, - 'keyword1' => $params['order_sn'], - 'keyword2' => $params['goods_name'], - 'keyword3' => date('Y-m-d H:i', $params['deliver_time']), + 'character_string12' => $params['order_sn'], + 'thing14' => $params['goods_name'], + 'time3' => date('Y-m-d H:i', $params['deliver_time']), ]; $templateId = $this->getTemplateId($this->templateCode); diff --git a/app/Services/Logic/Notice/External/WeChat/OrderFinish.php b/app/Services/Logic/Notice/External/WeChat/OrderFinish.php index b242b881..2594bcd2 100644 --- a/app/Services/Logic/Notice/External/WeChat/OrderFinish.php +++ b/app/Services/Logic/Notice/External/WeChat/OrderFinish.php @@ -33,9 +33,9 @@ class OrderFinish extends WeChatNotice $params = [ 'first' => $first, 'remark' => $remark, - 'keyword1' => sprintf('%s元', $params['order']['amount']), - 'keyword2' => $params['order']['subject'], - 'keyword3' => date('Y-m-d H:i', $params['order']['update_time']), + 'amount3' => sprintf('%s元', $params['order']['amount']), + 'thing1' => $params['order']['subject'], + 'time4' => date('Y-m-d H:i', $params['order']['update_time']), ]; $templateId = $this->getTemplateId($this->templateCode); diff --git a/app/Services/Logic/Notice/External/WeChat/RefundFinish.php b/app/Services/Logic/Notice/External/WeChat/RefundFinish.php index da710593..f19d3c0c 100644 --- a/app/Services/Logic/Notice/External/WeChat/RefundFinish.php +++ b/app/Services/Logic/Notice/External/WeChat/RefundFinish.php @@ -33,10 +33,10 @@ class RefundFinish extends WeChatNotice $params = [ 'first' => $first, 'remark' => $remark, - 'keyword1' => $params['refund']['sn'], - 'keyword2' => $params['refund']['subject'], - 'keyword3' => sprintf('%s元', $params['refund']['amount']), - 'keyword4' => date('Y-m-d H:i', $params['refund']['update_time']), + 'character_string5' => $params['refund']['sn'], + 'thing1' => $params['refund']['subject'], + 'amount2' => sprintf('%s元', $params['refund']['amount']), + 'time4' => date('Y-m-d H:i', $params['refund']['update_time']), ]; $templateId = $this->getTemplateId($this->templateCode);