revert(app): Backup folder name to application

Rhilip · Sep 17, 2019 · 19121a6 · 19121a6
1 parent 36588cc
commit 19121a6
Show file tree

Hide file tree

Showing 79 changed files with 96 additions and 495 deletions.
diff --git a/.gitignore b/.gitignore
@@ -4,7 +4,7 @@
 !**/.gitkeep
 
 # Test File
-src/Controllers/TestController.php
+application/Controllers/TestController.php
 
 # Backup Folder
 /backup/

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -9,19 +9,20 @@
 - **template:** Add git commit hash in `CHANGELOG.md` (76bc527)
 
 ### Feat
-- **Auth:** Sep Auth part from Site to new components (f36884e)
 - **Auth:** Use JWT to set cookies content (bf897c6)
+- **Auth:** Sep Auth part from Site to new components (f36884e)
 - **Auth:** Add Auth By passkey support for special route (aff1f87)
 - **Auth/Login:** Add full Advanced Options support (6009dc8)
 - **Bonus:** Pre-Add Bonus system (59ddd39)
-- **Secret:** Protect jwt key for env('APP_SECRET_KEY') (dfa67da)
 - **Secret:** Check session and user_id match or not in jwt payload (358ba5d)
+- **Secret:** Protect jwt key for env('APP_SECRET_KEY') (dfa67da)
 - **Sessions:** record user access information at Auth->onRequestAfter() (e2a22a7)
 - **Sessions/List:** Use SessionsListForm to show user sessions (9ecfb97)
 - **Site:** Add page Site/{Logs,Rules} (65cea9e)
 - **Torrent:** Show team, quality information in torrent/details page (44314e3)
 - **Torrent/Download:** Add user download pos check (db6d5ff)
 - **Torrent/Search:** Use MySQL fulltext search. (354c07b)
+- **ban:** Sync site ban list of username and email in Crontab Jobs (33cc1e6)
 - **ban_ips:** Store banned ip in components/Site (01084c9)
 - **torrents/tags:** Store torrent tags in TABLE `torrents` (4d573e2)
 

diff --git a/src/Commands/ServiceCommand.php → application/Commands/ServiceCommand.php b/src/Commands/ServiceCommand.php → application/Commands/ServiceCommand.php
diff --git a/src/Components/.gitkeep → application/Components/.gitkeep b/src/Components/.gitkeep → application/Components/.gitkeep
diff --git a/src/Components/Auth.php → application/Components/Auth.php b/src/Components/Auth.php → application/Components/Auth.php
diff --git a/src/Components/Site.php → application/Components/Site.php b/src/Components/Site.php → application/Components/Site.php
diff --git a/src/Controllers/AdminController.php → application/Controllers/AdminController.php b/src/Controllers/AdminController.php → application/Controllers/AdminController.php
diff --git a/src/Controllers/Api/v1/ApiController.php → ...tion/Controllers/Api/v1/ApiController.php b/src/Controllers/Api/v1/ApiController.php → ...tion/Controllers/Api/v1/ApiController.php
diff --git a/src/Controllers/Api/v1/TorrentController.php → .../Controllers/Api/v1/TorrentController.php b/src/Controllers/Api/v1/TorrentController.php → .../Controllers/Api/v1/TorrentController.php
diff --git a/src/Controllers/AuthController.php → application/Controllers/AuthController.php b/src/Controllers/AuthController.php → application/Controllers/AuthController.php
diff --git a/src/Controllers/CaptchaController.php → ...ication/Controllers/CaptchaController.php b/src/Controllers/CaptchaController.php → ...ication/Controllers/CaptchaController.php
diff --git a/src/Controllers/IndexController.php → application/Controllers/IndexController.php b/src/Controllers/IndexController.php → application/Controllers/IndexController.php
diff --git a/src/Controllers/LinksController.php → application/Controllers/LinksController.php b/src/Controllers/LinksController.php → application/Controllers/LinksController.php
diff --git a/src/Controllers/MaintenanceController.php → ...ion/Controllers/MaintenanceController.php b/src/Controllers/MaintenanceController.php → ...ion/Controllers/MaintenanceController.php
diff --git a/src/Controllers/ManageController.php → application/Controllers/ManageController.php b/src/Controllers/ManageController.php → application/Controllers/ManageController.php
diff --git a/src/Controllers/NewsController.php → application/Controllers/NewsController.php b/src/Controllers/NewsController.php → application/Controllers/NewsController.php
diff --git a/src/Controllers/RssController.php → application/Controllers/RssController.php b/src/Controllers/RssController.php → application/Controllers/RssController.php
diff --git a/src/Controllers/SiteController.php → application/Controllers/SiteController.php b/src/Controllers/SiteController.php → application/Controllers/SiteController.php
diff --git a/src/Controllers/SubtitlesController.php → ...ation/Controllers/SubtitlesController.php b/src/Controllers/SubtitlesController.php → ...ation/Controllers/SubtitlesController.php
diff --git a/src/Controllers/TorrentController.php → ...ication/Controllers/TorrentController.php b/src/Controllers/TorrentController.php → ...ication/Controllers/TorrentController.php
diff --git a/src/Controllers/TorrentsController.php → ...cation/Controllers/TorrentsController.php b/src/Controllers/TorrentsController.php → ...cation/Controllers/TorrentsController.php
diff --git a/src/Controllers/TrackerController.php → ...ication/Controllers/TrackerController.php b/src/Controllers/TrackerController.php → ...ication/Controllers/TrackerController.php
diff --git a/src/Controllers/UserController.php → application/Controllers/UserController.php b/src/Controllers/UserController.php → application/Controllers/UserController.php
diff --git a/src/Exceptions/TrackerException.php → application/Exceptions/TrackerException.php b/src/Exceptions/TrackerException.php → application/Exceptions/TrackerException.php
diff --git a/src/Lang/en.php → application/Lang/en.php b/src/Lang/en.php → application/Lang/en.php
diff --git a/src/Lang/zh_CN.php → application/Lang/zh_CN.php b/src/Lang/zh_CN.php → application/Lang/zh_CN.php
diff --git a/src/Libraries/.gitkeep → application/Libraries/.gitkeep b/src/Libraries/.gitkeep → application/Libraries/.gitkeep
diff --git a/src/Libraries/Bencode/Bencode.php → application/Libraries/Bencode/Bencode.php b/src/Libraries/Bencode/Bencode.php → application/Libraries/Bencode/Bencode.php
diff --git a/...Libraries/Bencode/ParseErrorException.php → ...Libraries/Bencode/ParseErrorException.php b/...Libraries/Bencode/ParseErrorException.php → ...Libraries/Bencode/ParseErrorException.php
diff --git a/src/Libraries/Bonus.php → application/Libraries/Bonus.php b/src/Libraries/Bonus.php → application/Libraries/Bonus.php
diff --git a/src/Libraries/Constant.php → application/Libraries/Constant.php b/src/Libraries/Constant.php → application/Libraries/Constant.php
diff --git a/src/Libraries/GeoIP/GeoIPInterface.php → ...cation/Libraries/GeoIP/GeoIPInterface.php b/src/Libraries/GeoIP/GeoIPInterface.php → ...cation/Libraries/GeoIP/GeoIPInterface.php
diff --git a/src/Libraries/Mailer.php → application/Libraries/Mailer.php b/src/Libraries/Mailer.php → application/Libraries/Mailer.php
diff --git a/src/Middleware/ApiMiddleware.php → application/Middleware/ApiMiddleware.php b/src/Middleware/ApiMiddleware.php → application/Middleware/ApiMiddleware.php
diff --git a/src/Middleware/AuthMiddleware.php → application/Middleware/AuthMiddleware.php b/src/Middleware/AuthMiddleware.php → application/Middleware/AuthMiddleware.php
diff --git a/src/Middleware/IpBanMiddleware.php → application/Middleware/IpBanMiddleware.php b/src/Middleware/IpBanMiddleware.php → application/Middleware/IpBanMiddleware.php
diff --git a/src/Models/Api/v1/Form/TorrentsForm.php → ...ation/Models/Api/v1/Form/TorrentsForm.php b/src/Models/Api/v1/Form/TorrentsForm.php → ...ation/Models/Api/v1/Form/TorrentsForm.php
diff --git a/src/Models/Form/Auth/UserConfirmForm.php → ...tion/Models/Form/Auth/UserConfirmForm.php b/src/Models/Form/Auth/UserConfirmForm.php → ...tion/Models/Form/Auth/UserConfirmForm.php
diff --git a/src/Models/Form/Auth/UserLoginForm.php → ...cation/Models/Form/Auth/UserLoginForm.php b/src/Models/Form/Auth/UserLoginForm.php → ...cation/Models/Form/Auth/UserLoginForm.php
@@ -88,6 +88,7 @@ protected function loadUserFromPdo()
         }
 
         // User enable 2FA but it's code is wrong
+        /*
         if (!is_null($this->self['opt'])) {
             try {
                 $tfa = new TwoFactorAuth(config('base.site_name'));
@@ -100,6 +101,7 @@ protected function loadUserFromPdo()
                 return;
             }
         }
+        */
 
         // User 's status is banned or pending~
         if (in_array($this->self['status'], [User::STATUS_DISABLED, User::STATUS_PENDING])) {

diff --git a/src/Models/Form/Auth/UserLogoutForm.php → ...ation/Models/Form/Auth/UserLogoutForm.php b/src/Models/Form/Auth/UserLogoutForm.php → ...ation/Models/Form/Auth/UserLogoutForm.php
diff --git a/src/Models/Form/Auth/UserRecoverForm.php → ...tion/Models/Form/Auth/UserRecoverForm.php b/src/Models/Form/Auth/UserRecoverForm.php → ...tion/Models/Form/Auth/UserRecoverForm.php
diff --git a/src/Models/Form/Auth/UserRegisterForm.php → ...ion/Models/Form/Auth/UserRegisterForm.php b/src/Models/Form/Auth/UserRegisterForm.php → ...ion/Models/Form/Auth/UserRegisterForm.php
diff --git a/src/Models/Form/Links/ApplyForm.php → application/Models/Form/Links/ApplyForm.php b/src/Models/Form/Links/ApplyForm.php → application/Models/Form/Links/ApplyForm.php
diff --git a/src/Models/Form/Links/EditForm.php → application/Models/Form/Links/EditForm.php b/src/Models/Form/Links/EditForm.php → application/Models/Form/Links/EditForm.php
diff --git a/src/Models/Form/Links/RemoveForm.php → application/Models/Form/Links/RemoveForm.php b/src/Models/Form/Links/RemoveForm.php → application/Models/Form/Links/RemoveForm.php
diff --git a/...odels/Form/Manage/Categories/EditForm.php → ...odels/Form/Manage/Categories/EditForm.php b/...odels/Form/Manage/Categories/EditForm.php → ...odels/Form/Manage/Categories/EditForm.php
diff --git a/...els/Form/Manage/Categories/RemoveForm.php → ...els/Form/Manage/Categories/RemoveForm.php b/...els/Form/Manage/Categories/RemoveForm.php → ...els/Form/Manage/Categories/RemoveForm.php
diff --git a/src/Models/Form/News/EditForm.php → application/Models/Form/News/EditForm.php b/src/Models/Form/News/EditForm.php → application/Models/Form/News/EditForm.php
diff --git a/src/Models/Form/News/SearchForm.php → application/Models/Form/News/SearchForm.php b/src/Models/Form/News/SearchForm.php → application/Models/Form/News/SearchForm.php
diff --git a/src/Models/Form/Rss/FeedForm.php → application/Models/Form/Rss/FeedForm.php b/src/Models/Form/Rss/FeedForm.php → application/Models/Form/Rss/FeedForm.php
diff --git a/src/Models/Form/Site/Logs.php → application/Models/Form/Site/Logs.php b/src/Models/Form/Site/Logs.php → application/Models/Form/Site/Logs.php
diff --git a/src/Models/Form/Subtitles/DeleteForm.php → ...tion/Models/Form/Subtitles/DeleteForm.php b/src/Models/Form/Subtitles/DeleteForm.php → ...tion/Models/Form/Subtitles/DeleteForm.php
diff --git a/src/Models/Form/Subtitles/DownloadForm.php → ...on/Models/Form/Subtitles/DownloadForm.php b/src/Models/Form/Subtitles/DownloadForm.php → ...on/Models/Form/Subtitles/DownloadForm.php
diff --git a/src/Models/Form/Subtitles/SearchForm.php → ...tion/Models/Form/Subtitles/SearchForm.php b/src/Models/Form/Subtitles/SearchForm.php → ...tion/Models/Form/Subtitles/SearchForm.php
diff --git a/src/Models/Form/Subtitles/UploadForm.php → ...tion/Models/Form/Subtitles/UploadForm.php b/src/Models/Form/Subtitles/UploadForm.php → ...tion/Models/Form/Subtitles/UploadForm.php
diff --git a/src/Models/Form/Torrent/CommentsForm.php → ...tion/Models/Form/Torrent/CommentsForm.php b/src/Models/Form/Torrent/CommentsForm.php → ...tion/Models/Form/Torrent/CommentsForm.php
diff --git a/src/Models/Form/Torrent/DetailsForm.php → ...ation/Models/Form/Torrent/DetailsForm.php b/src/Models/Form/Torrent/DetailsForm.php → ...ation/Models/Form/Torrent/DetailsForm.php
diff --git a/src/Models/Form/Torrent/DownloadForm.php → ...tion/Models/Form/Torrent/DownloadForm.php b/src/Models/Form/Torrent/DownloadForm.php → ...tion/Models/Form/Torrent/DownloadForm.php
diff --git a/src/Models/Form/Torrent/SnatchForm.php → ...cation/Models/Form/Torrent/SnatchForm.php b/src/Models/Form/Torrent/SnatchForm.php → ...cation/Models/Form/Torrent/SnatchForm.php
diff --git a/src/Models/Form/Torrent/StructureForm.php → ...ion/Models/Form/Torrent/StructureForm.php b/src/Models/Form/Torrent/StructureForm.php → ...ion/Models/Form/Torrent/StructureForm.php
diff --git a/src/Models/Form/Torrents/SearchForm.php → ...ation/Models/Form/Torrents/SearchForm.php b/src/Models/Form/Torrents/SearchForm.php → ...ation/Models/Form/Torrents/SearchForm.php
diff --git a/src/Models/Form/Torrents/TagsForm.php → ...ication/Models/Form/Torrents/TagsForm.php b/src/Models/Form/Torrents/TagsForm.php → ...ication/Models/Form/Torrents/TagsForm.php
diff --git a/src/Models/Form/Torrents/UploadForm.php → ...ation/Models/Form/Torrents/UploadForm.php b/src/Models/Form/Torrents/UploadForm.php → ...ation/Models/Form/Torrents/UploadForm.php
diff --git a/src/Models/Form/Traits/FileSentTrait.php → ...tion/Models/Form/Traits/FileSentTrait.php b/src/Models/Form/Traits/FileSentTrait.php → ...tion/Models/Form/Traits/FileSentTrait.php
diff --git a/...Form/Traits/actionRateLimitCheckTrait.php → ...Form/Traits/actionRateLimitCheckTrait.php b/...Form/Traits/actionRateLimitCheckTrait.php → ...Form/Traits/actionRateLimitCheckTrait.php
diff --git a/...dels/Form/Traits/isValidSubtitleTrait.php → ...dels/Form/Traits/isValidSubtitleTrait.php b/...dels/Form/Traits/isValidSubtitleTrait.php → ...dels/Form/Traits/isValidSubtitleTrait.php
diff --git a/...odels/Form/Traits/isValidTorrentTrait.php → ...odels/Form/Traits/isValidTorrentTrait.php b/...odels/Form/Traits/isValidTorrentTrait.php → ...odels/Form/Traits/isValidTorrentTrait.php
diff --git a/src/Models/Form/Traits/isValidUserTrait.php → ...n/Models/Form/Traits/isValidUserTrait.php b/src/Models/Form/Traits/isValidUserTrait.php → ...n/Models/Form/Traits/isValidUserTrait.php
diff --git a/src/Models/Form/User/InviteActionForm.php → ...ion/Models/Form/User/InviteActionForm.php b/src/Models/Form/User/InviteActionForm.php → ...ion/Models/Form/User/InviteActionForm.php
diff --git a/src/Models/Form/User/InviteForm.php → application/Models/Form/User/InviteForm.php b/src/Models/Form/User/InviteForm.php → application/Models/Form/User/InviteForm.php
diff --git a/src/Models/Form/User/SessionsListForm.php → ...ion/Models/Form/User/SessionsListForm.php b/src/Models/Form/User/SessionsListForm.php → ...ion/Models/Form/User/SessionsListForm.php
diff --git a/src/Models/Form/User/UserDetailsForm.php → ...tion/Models/Form/User/UserDetailsForm.php b/src/Models/Form/User/UserDetailsForm.php → ...tion/Models/Form/User/UserDetailsForm.php
diff --git a/src/Models/Torrent.php → application/Models/Torrent.php b/src/Models/Torrent.php → application/Models/Torrent.php
diff --git a/src/Models/User.php → application/Models/User.php b/src/Models/User.php → application/Models/User.php
diff --git a/src/Process/CronTabProcess.php → application/Process/CronTabProcess.php b/src/Process/CronTabProcess.php → application/Process/CronTabProcess.php
diff --git a/src/Process/TrackerAnnounceProcess.php → ...cation/Process/TrackerAnnounceProcess.php b/src/Process/TrackerAnnounceProcess.php → ...cation/Process/TrackerAnnounceProcess.php
diff --git a/src/Timer/.gitkeep → application/Timer/.gitkeep b/src/Timer/.gitkeep → application/Timer/.gitkeep
diff --git a/composer.json b/composer.json
@@ -1,5 +1,5 @@
 {
-  "name": "rhilip/rid-pt",
+  "name": "rhilip/ridpt",
   "description": "基于 swoole 的Private Torrent源码",
   "type": "project",
   "keywords": [
@@ -31,31 +31,25 @@
     "ext-mbstring": "*",
     "psr/log": "^1.1",
     "vlucas/phpdotenv": "^3.5",
+    "adhocore/cli": "^0.4.0",
     "league/plates": "^3.3",
-    "mjohnson/decoda": "^6.12",
+    "firebase/php-jwt": "^5.0",
     "phpmailer/phpmailer": "^6.0",
-    "siriusphp/validation": "^2.3",
     "soundasleep/html2text": "^1.1",
-    "robthree/twofactorauth": "^1.6",
-    "firebase/php-jwt": "^5.0"
+    "siriusphp/validation": "^2.3",
+    "mjohnson/decoda": "^6.12"
+  },
+  "require-dev": {
+    "eaglewu/swoole-ide-helper": "dev-master"
   },
   "autoload": {
     "psr-4": {
       "Rid\\": "framework/",
-      "App\\": "src/"
+      "App\\": "application/"
     },
     "files": [
       "framework/Rid.php",
       "framework/functions.php"
     ]
-  },
-  "repositories": {
-    "packagist": {
-      "type": "composer",
-      "url": "https://mirrors.aliyun.com/composer/"
-    }
-  },
-  "require-dev": {
-    "eaglewu/swoole-ide-helper": "dev-master"
   }
 }