Prechádzať zdrojové kódy

新增取消关注接口

王大坤 2 rokov pred
rodič
commit
fd21b093ea
100 zmenil súbory, kde vykonal 25 pridanie a 2 odobranie
  1. 0 0
      .editorconfig
  2. 0 0
      .env.example
  3. 0 0
      .gitattributes
  4. 0 0
      .gitignore
  5. 0 0
      .styleci.yml
  6. 0 0
      README.md
  7. 0 0
      app/Admin/Actions/AdminSetting.php
  8. 0 0
      app/Admin/Controllers/AuthController.php
  9. 0 0
      app/Admin/Controllers/ColumnController.php
  10. 0 0
      app/Admin/Controllers/HomeController.php
  11. 0 0
      app/Admin/Controllers/MsgController.php
  12. 0 0
      app/Admin/Controllers/ProductController.php
  13. 0 0
      app/Admin/Controllers/ProductTypeController.php
  14. 0 0
      app/Admin/Controllers/ReportController.php
  15. 0 0
      app/Admin/Controllers/ReportLogController.php
  16. 0 0
      app/Admin/Controllers/SettingController.php
  17. 0 0
      app/Admin/Controllers/UserController.php
  18. 0 0
      app/Admin/Controllers/UserMemberController.php
  19. 0 0
      app/Admin/Controllers/UserMemberOrderController.php
  20. 0 0
      app/Admin/Forms/AdminSetting.php
  21. 0 0
      app/Admin/Metrics/Examples/NewDevices.php
  22. 0 0
      app/Admin/Metrics/Examples/NewLock.php
  23. 0 0
      app/Admin/Metrics/Examples/NewMsg.php
  24. 0 0
      app/Admin/Metrics/Examples/NewProduct.php
  25. 0 0
      app/Admin/Metrics/Examples/NewReport.php
  26. 0 0
      app/Admin/Metrics/Examples/NewUsers.php
  27. 0 0
      app/Admin/Metrics/Examples/ProductOrders.php
  28. 0 0
      app/Admin/Metrics/Examples/Sessions.php
  29. 0 0
      app/Admin/Metrics/Examples/Tickets.php
  30. 0 0
      app/Admin/Metrics/Examples/TotalLock.php
  31. 0 0
      app/Admin/Metrics/Examples/TotalMsg.php
  32. 0 0
      app/Admin/Metrics/Examples/TotalProduct.php
  33. 0 0
      app/Admin/Metrics/Examples/TotalReport.php
  34. 0 0
      app/Admin/Metrics/Examples/TotalUsers.php
  35. 0 0
      app/Admin/Repositories/Column.php
  36. 0 0
      app/Admin/Repositories/Msg.php
  37. 0 0
      app/Admin/Repositories/Product.php
  38. 0 0
      app/Admin/Repositories/ProductType.php
  39. 0 0
      app/Admin/Repositories/Question.php
  40. 0 0
      app/Admin/Repositories/QuestionType.php
  41. 0 0
      app/Admin/Repositories/Report.php
  42. 0 0
      app/Admin/Repositories/ReportLog.php
  43. 0 0
      app/Admin/Repositories/User.php
  44. 0 0
      app/Admin/Repositories/UserMember.php
  45. 0 0
      app/Admin/Repositories/UserMemberOrder.php
  46. 0 0
      app/Admin/bootstrap.php
  47. 0 0
      app/Admin/routes.php
  48. 0 0
      app/Console/Commands/AnJuKePicker.php
  49. 0 0
      app/Console/Commands/DataSeeder.php
  50. 0 0
      app/Console/Commands/DongFangDiPicker.php
  51. 0 0
      app/Console/Commands/UserRepair.php
  52. 0 0
      app/Console/Commands/importMap.php
  53. 0 0
      app/Console/Kernel.php
  54. 0 0
      app/Exceptions/Handler.php
  55. 0 0
      app/Helper/AttachmentHelper.php
  56. 0 0
      app/Helper/JpushHelper.php
  57. 0 0
      app/Helper/LogHelper.php
  58. 0 0
      app/Helper/PayHelper.php
  59. 0 0
      app/Helper/function.php
  60. 0 1
      app/Http/Controllers/Controller.php
  61. 0 0
      app/Http/Controllers/V1/AttachmentController.php
  62. 0 0
      app/Http/Controllers/V1/AuthController.php
  63. 0 0
      app/Http/Controllers/V1/Controller.php
  64. 0 0
      app/Http/Controllers/V1/EmailController.php
  65. 0 0
      app/Http/Controllers/V1/IndexController.php
  66. 0 0
      app/Http/Controllers/V1/MemberController.php
  67. 0 0
      app/Http/Controllers/V1/MsgController.php
  68. 0 0
      app/Http/Controllers/V1/PayController.php
  69. 1 1
      app/Http/Controllers/V1/ProductController.php
  70. 0 0
      app/Http/Controllers/V1/RegionController.php
  71. 0 0
      app/Http/Controllers/V1/SettingsController.php
  72. 0 0
      app/Http/Controllers/V1/SmsController.php
  73. 24 0
      app/Http/Controllers/V1/UserController.php
  74. 0 0
      app/Http/Controllers/V1/UserFolderController.php
  75. 0 0
      app/Http/Kernel.php
  76. 0 0
      app/Http/Middleware/Authenticate.php
  77. 0 0
      app/Http/Middleware/EncryptCookies.php
  78. 0 0
      app/Http/Middleware/PreventRequestsDuringMaintenance.php
  79. 0 0
      app/Http/Middleware/RedirectIfAuthenticated.php
  80. 0 0
      app/Http/Middleware/TrimStrings.php
  81. 0 0
      app/Http/Middleware/TrustHosts.php
  82. 0 0
      app/Http/Middleware/TrustProxies.php
  83. 0 0
      app/Http/Middleware/VerifyCsrfToken.php
  84. 0 0
      app/Models/AccountLog.php
  85. 0 0
      app/Models/Article.php
  86. 0 0
      app/Models/BaseAttachment.php
  87. 0 0
      app/Models/BaseConfig.php
  88. 0 0
      app/Models/BaseDistrict.php
  89. 0 0
      app/Models/Column.php
  90. 0 0
      app/Models/EmailCode.php
  91. 0 0
      app/Models/Help.php
  92. 0 0
      app/Models/MailCode.php
  93. 0 0
      app/Models/Msg.php
  94. 0 0
      app/Models/MsgRead.php
  95. 0 0
      app/Models/Order.php
  96. 0 0
      app/Models/Product.php
  97. 0 0
      app/Models/ProductType.php
  98. 0 0
      app/Models/Region.php
  99. 0 0
      app/Models/Report.php
  100. 0 0
      app/Models/ReportLog.php

+ 0 - 0
.editorconfig


+ 0 - 0
.env.example


+ 0 - 0
.gitattributes


+ 0 - 0
.gitignore


+ 0 - 0
.styleci.yml


+ 0 - 0
README.md


+ 0 - 0
app/Admin/Actions/AdminSetting.php


+ 0 - 0
app/Admin/Controllers/AuthController.php


+ 0 - 0
app/Admin/Controllers/ColumnController.php


+ 0 - 0
app/Admin/Controllers/HomeController.php


+ 0 - 0
app/Admin/Controllers/MsgController.php


+ 0 - 0
app/Admin/Controllers/ProductController.php


+ 0 - 0
app/Admin/Controllers/ProductTypeController.php


+ 0 - 0
app/Admin/Controllers/ReportController.php


+ 0 - 0
app/Admin/Controllers/ReportLogController.php


+ 0 - 0
app/Admin/Controllers/SettingController.php


+ 0 - 0
app/Admin/Controllers/UserController.php


+ 0 - 0
app/Admin/Controllers/UserMemberController.php


+ 0 - 0
app/Admin/Controllers/UserMemberOrderController.php


+ 0 - 0
app/Admin/Forms/AdminSetting.php


+ 0 - 0
app/Admin/Metrics/Examples/NewDevices.php


+ 0 - 0
app/Admin/Metrics/Examples/NewLock.php


+ 0 - 0
app/Admin/Metrics/Examples/NewMsg.php


+ 0 - 0
app/Admin/Metrics/Examples/NewProduct.php


+ 0 - 0
app/Admin/Metrics/Examples/NewReport.php


+ 0 - 0
app/Admin/Metrics/Examples/NewUsers.php


+ 0 - 0
app/Admin/Metrics/Examples/ProductOrders.php


+ 0 - 0
app/Admin/Metrics/Examples/Sessions.php


+ 0 - 0
app/Admin/Metrics/Examples/Tickets.php


+ 0 - 0
app/Admin/Metrics/Examples/TotalLock.php


+ 0 - 0
app/Admin/Metrics/Examples/TotalMsg.php


+ 0 - 0
app/Admin/Metrics/Examples/TotalProduct.php


+ 0 - 0
app/Admin/Metrics/Examples/TotalReport.php


+ 0 - 0
app/Admin/Metrics/Examples/TotalUsers.php


+ 0 - 0
app/Admin/Repositories/Column.php


+ 0 - 0
app/Admin/Repositories/Msg.php


+ 0 - 0
app/Admin/Repositories/Product.php


+ 0 - 0
app/Admin/Repositories/ProductType.php


+ 0 - 0
app/Admin/Repositories/Question.php


+ 0 - 0
app/Admin/Repositories/QuestionType.php


+ 0 - 0
app/Admin/Repositories/Report.php


+ 0 - 0
app/Admin/Repositories/ReportLog.php


+ 0 - 0
app/Admin/Repositories/User.php


+ 0 - 0
app/Admin/Repositories/UserMember.php


+ 0 - 0
app/Admin/Repositories/UserMemberOrder.php


+ 0 - 0
app/Admin/bootstrap.php


+ 0 - 0
app/Admin/routes.php


+ 0 - 0
app/Console/Commands/AnJuKePicker.php


+ 0 - 0
app/Console/Commands/DataSeeder.php


+ 0 - 0
app/Console/Commands/DongFangDiPicker.php


+ 0 - 0
app/Console/Commands/UserRepair.php


+ 0 - 0
app/Console/Commands/importMap.php


+ 0 - 0
app/Console/Kernel.php


+ 0 - 0
app/Exceptions/Handler.php


+ 0 - 0
app/Helper/AttachmentHelper.php


+ 0 - 0
app/Helper/JpushHelper.php


+ 0 - 0
app/Helper/LogHelper.php


+ 0 - 0
app/Helper/PayHelper.php


+ 0 - 0
app/Helper/function.php


+ 0 - 1
app/Http/Controllers/Controller.php

xqd
@@ -11,7 +11,6 @@ use Illuminate\Http\Request;
 class Controller extends BaseController
 {
     use AuthorizesRequests, DispatchesJobs, ValidatesRequests;
-
     /**
      * Validate the given request with the given rules.
      *

+ 0 - 0
app/Http/Controllers/V1/AttachmentController.php


+ 0 - 0
app/Http/Controllers/V1/AuthController.php


+ 0 - 0
app/Http/Controllers/V1/Controller.php


+ 0 - 0
app/Http/Controllers/V1/EmailController.php


+ 0 - 0
app/Http/Controllers/V1/IndexController.php


+ 0 - 0
app/Http/Controllers/V1/MemberController.php


+ 0 - 0
app/Http/Controllers/V1/MsgController.php


+ 0 - 0
app/Http/Controllers/V1/PayController.php


+ 1 - 1
app/Http/Controllers/V1/ProductController.php

xqd
@@ -139,7 +139,7 @@ class ProductController extends Controller
     }
 
     /**
-     * @return void
+     * @return mixed
      * 添加产品
      */
     public function addProduct(Request $request){

+ 0 - 0
app/Http/Controllers/V1/RegionController.php


+ 0 - 0
app/Http/Controllers/V1/SettingsController.php


+ 0 - 0
app/Http/Controllers/V1/SmsController.php


+ 24 - 0
app/Http/Controllers/V1/UserController.php

xqd xqd
@@ -7,6 +7,7 @@ use App\Models\User;
 use App\Models\UserFollow;
 use App\Services\Api\SortService;
 use App\Services\Api\UserService;
+use Couchbase\RegexpSearchQuery;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Validator;
 use App\Services\Base\ErrorCode;
@@ -143,6 +144,29 @@ class UserController extends Controller
         return $this->success();
     }
 
+    /**
+     * 取消关注
+     *
+     * @param Request $request
+     * @return \Illuminate\Http\JsonResponse
+     */
+    public function cancelFollow(Request $request)
+    {
+        $user = User::where('id',$request->get('user_id'))->first();
+        if (!$user){
+            return $this->error('用户不存在!');
+        }
+        $collect = UserFollow::where('user_id',$this->userId)->where('to_user_id',$user->id)->first();
+        if(!$collect){
+            return $this->error("您还未关注!");
+        }
+        $delete = UserFollow::where('user_id',$this->userId)->where('to_user_id',$user->id)->delete();
+        if (!$delete){
+            return $this->error('取消关注失败!');
+        }
+        return $this->success();
+    }
+
     /**
      * 删除用户
      */

+ 0 - 0
app/Http/Controllers/V1/UserFolderController.php


+ 0 - 0
app/Http/Kernel.php


+ 0 - 0
app/Http/Middleware/Authenticate.php


+ 0 - 0
app/Http/Middleware/EncryptCookies.php


+ 0 - 0
app/Http/Middleware/PreventRequestsDuringMaintenance.php


+ 0 - 0
app/Http/Middleware/RedirectIfAuthenticated.php


+ 0 - 0
app/Http/Middleware/TrimStrings.php


+ 0 - 0
app/Http/Middleware/TrustHosts.php


+ 0 - 0
app/Http/Middleware/TrustProxies.php


+ 0 - 0
app/Http/Middleware/VerifyCsrfToken.php


+ 0 - 0
app/Models/AccountLog.php


+ 0 - 0
app/Models/Article.php


+ 0 - 0
app/Models/BaseAttachment.php


+ 0 - 0
app/Models/BaseConfig.php


+ 0 - 0
app/Models/BaseDistrict.php


+ 0 - 0
app/Models/Column.php


+ 0 - 0
app/Models/EmailCode.php


+ 0 - 0
app/Models/Help.php


+ 0 - 0
app/Models/MailCode.php


+ 0 - 0
app/Models/Msg.php


+ 0 - 0
app/Models/MsgRead.php


+ 0 - 0
app/Models/Order.php


+ 0 - 0
app/Models/Product.php


+ 0 - 0
app/Models/ProductType.php


+ 0 - 0
app/Models/Region.php


+ 0 - 0
app/Models/Report.php


+ 0 - 0
app/Models/ReportLog.php


Niektoré súbory nie sú zobrazené, pretože je v týchto rozdielových dátach zmenené mnoho súborov