修改路由

.gitignore

@@ -14,7 +14,7 @@ runtime
 *.air
 *.ipa
 *.apk
-
+.env
 # Project files, i.e. `.project`, `.actionScriptProperties` and `.flexProperties`
 # should NOT be excluded as they contain compiler settings and other important
 # information for Eclipse / Flash Builder.

app/Controller/AdController.php

@@ -17,7 +17,7 @@ use Hyperf\Validation\Contract\ValidatorFactoryInterface;
  * Class AdController
  * @package App\Controller
  */
-#[AutoController]
+//#[AutoController]
 class AdController extends AbstractController
 {
     #[Inject]

app/Controller/AuthorityController.php

@@ -15,7 +15,7 @@ use Hyperf\Validation\Contract\ValidatorFactoryInterface;
  * Class AuthorityController
  * @package App\Controller
  */
-#[AutoController]
+//#[AutoController]
 class AuthorityController extends AbstractController
 {
     #[Inject]

app/Controller/LinkController.php

@@ -16,7 +16,7 @@ use Hyperf\Validation\Contract\ValidatorFactoryInterface;
  * Class LinkController
  * @package App\Controller
  */
-#[AutoController]
+//#[AutoController]
 class LinkController extends AbstractController
 {
     #[Inject]

app/Controller/NewsController.php

@@ -13,7 +13,7 @@ use Hyperf\Validation\Contract\ValidatorFactoryInterface;
  * Class NewsController
  * @package App\Controller
  */
-#[AutoController]
+//#[AutoController]
 class NewsController extends AbstractController
 {
     #[Inject]

app/Controller/PublicController.php

@@ -18,7 +18,7 @@ use function Hyperf\Support\env;
  * Class PublicController
  * @package App\Controller
  */
-#[AutoController]
+//#[AutoController]
 class PublicController extends AbstractController
 {
     #[Inject]
@@ -68,6 +68,7 @@ class PublicController extends AbstractController
                return  Result::error("未找到上传文件");
             }
             $data = CommonService::uploadFile($file, ['png','jpg','png','jpeg','gif','xls', 'xlsx', 'pdf', 'xls', 'xlsx', 'doc', 'docx', 'ppt', 'zip', 'pptx', 'mp4', 'flv'], 'image');
+
             $data['imgUrl'] = $urlN->imgUrl($data['src']);
             $data['oldFileName'] = $fileName;
             return  Result::success($data, '上传成功');

app/Controller/UserController.php

@@ -14,7 +14,7 @@ use Hyperf\Validation\Contract\ValidatorFactoryInterface;
  * Class UserController
  * @package App\Controller
  */
-#[AutoController]
+//#[AutoController]
 class UserController extends AbstractController
 {
     #[Inject]

app/Controller/WebsiteController.php

@@ -13,7 +13,7 @@ use Hyperf\Validation\Contract\ValidatorFactoryInterface;
  * Class WebsiteController
  * @package App\Controller
  */
-#[AutoController]
+//#[AutoController]
 class WebsiteController extends AbstractController
 {
     #[Inject]

app/Middleware/Auth/FooMiddleware.php

@@ -65,13 +65,6 @@ class FooMiddleware implements MiddlewareInterface
                 ]
             );
         }
-
-//        return $this->response->json(
-//            [
-//                'code' => 1,
-//                'data' => [],
-//                'message' => 'token无效,请重新登录',
-//            ]
-//        );
+        return false;
     }
 }

app/Tools/CommonService.php

@@ -80,12 +80,12 @@ class CommonService
 
     public  function imgUrl(string $str)
     {
-        $scheme =$this->request->geturi()->getScheme() ?? 'http';
+        $scheme = $this->request->getUri()->getScheme() ?? 'http';
         $host =  $this->request->getUri()->getHost() ?? '127.0.0.1';
-        $port = $this->request->getUri()->getPort() ?? config('server.servers.port', 9500);
+        $port = $this->request->getUri()->getPort() ?? '';
 
         $url = '';
-        if ($port == 80 || $port == 443) {
+        if ($port == 80 || $port == 443 || empty($port)) {
             $url = "{$scheme}://{$host}/{$str}";
         } else {
             $url = "{$scheme}://{$host}:{$port}/{$str}";

config/api/ad.php

@@ -0,0 +1,22 @@
+<?php
+
+declare(strict_types=1);
+
+use App\Controller\AdController;
+use Hyperf\HttpServer\Router\Router;
+use App\Middleware\Auth\FooMiddleware;
+Router::addGroup(
+    '/ad', function () {
+        Router::post('/createAd', [AdController::class, 'createAd']);
+        Router::post('/createAdPlace', [AdController::class, 'createAdPlace']);
+        Router::get('/getAdInfo', [AdController::class, 'getAdInfo']);
+        Router::get('/getAdList', [AdController::class, 'getAdList']);
+        Router::post('/updateAd', [AdController::class, 'updateAd']);
+        Router::post('/delAd', [AdController::class, 'delAd']);
+        Router::get('/getAdPlaceList', [AdController::class, 'getAdPlaceList']);
+        Router::post('/updateAdPlace', [AdController::class, 'updateAdPlace']);
+        Router::post('/delAdPlace', [AdController::class, 'delAdPlace']);
+    },
+    ['middleware' => [FooMiddleware::class]]
+);
+

config/api/authority.php

@@ -0,0 +1,17 @@
+<?php
+
+declare(strict_types=1);
+
+use App\Controller\AuthorityController;
+use Hyperf\HttpServer\Router\Router;
+use App\Middleware\Auth\FooMiddleware;
+Router::addGroup(
+    '/authority', function () {
+        Router::get('/getMenuList', [AuthorityController::class, 'getMenuList']);
+        Router::post('/delMenu', [AuthorityController::class, 'delMenu']);
+        Router::post('/addMenu', [AuthorityController::class, 'addMenu']);
+        Router::post('/updateMenu', [AuthorityController::class, 'updateMenu']);
+        Router::get('/getRecursionMenu', [AuthorityController::class, 'getRecursionMenu']);
+    },
+    ['middleware' => [FooMiddleware::class]]
+);

config/api/chat.php

@@ -0,0 +1,5 @@
+<?php
+
+declare(strict_types=1);
+use Hyperf\HttpServer\Router\Router;
+

config/api/link.php

@@ -0,0 +1,16 @@
+<?php
+
+declare(strict_types=1);
+
+use App\Controller\LinkController;
+use Hyperf\HttpServer\Router\Router;
+use App\Middleware\Auth\FooMiddleware;
+Router::addGroup(
+    '/link', function () {
+        Router::get('/getLinkList', [LinkController::class, 'getLinkList']);
+        Router::post('/createLink', [LinkController::class, 'createLink']);
+        Router::post('/updateLink', [LinkController::class, 'updateLink']);
+        Router::post('/delLink', [LinkController::class, 'delLink']);
+    },
+    ['middleware' => [FooMiddleware::class]]
+);

config/api/login.php

@@ -0,0 +1,9 @@
+<?php
+
+declare(strict_types=1);
+use Hyperf\HttpServer\Router\Router;
+Router::post('/api/login', 'App\Controller\LoginController@login');
+Router::post('/api/checkVerifyCode', 'App\Controller\LoginController@checkVerifyCode');
+
+Router::post('/api/registerOrLogin', 'App\Controller\LoginController@registerOrLogin');
+

config/api/news.php

@@ -0,0 +1,23 @@
+<?php
+
+declare(strict_types=1);
+
+use App\Controller\NewsController;
+use Hyperf\HttpServer\Router\Router;
+use App\Middleware\Auth\FooMiddleware;
+Router::addGroup(
+    '/news', function () {
+    Router::get('/getCategoryList', [NewsController::class, 'getCategoryList']);
+    Router::get('/categoryList', [NewsController::class, 'categoryList']);
+    Router::post('/addCategory', [NewsController::class, 'addCategory']);
+    Router::post('/updateCategory', [NewsController::class, 'updateCategory']);
+    Router::post('/delCategory', [NewsController::class, 'delCategory']);
+    Router::get('/getArticleList', [NewsController::class, 'getArticleList']);
+    Router::post('/addArticle', [NewsController::class, 'addArticle']);
+    Router::post('/updateArticle', [NewsController::class, 'updateArticle']);
+    Router::post('/delArticle', [NewsController::class, 'delArticle']);
+    Router::get('/getArticleInfo', [NewsController::class, 'getArticleInfo']);
+
+},
+    ['middleware' => [FooMiddleware::class]]
+);

config/api/public.php

@@ -1,8 +1,29 @@
 <?php
 
 declare(strict_types=1);
+use App\Controller\PublicController;
 use Hyperf\HttpServer\Router\Router;
-Router::addRoute(['GET', 'POST'], '/api/verifyCode', 'App\Controller\IndexController@verifyCode');
+use App\Middleware\Auth\FooMiddleware;
+Router::addRoute(['GET', 'POST'], '/verifyCode', 'App\Controller\IndexController@verifyCode');
 
-//Router::addRoute(['GET','POST'], '/public/checkMeasure', 'App\Controller\PublicController@checkMeasure');
+Router::addGroup(
+    '/public', function () {
+        Router::get('/getDistrictList', [PublicController::class, 'getDistrictList']);
+        Router::get('/getUserLevelList', [PublicController::class, 'getUserLevelList']);
+        Router::post('/uploadFile', [PublicController::class, 'uploadFile']);
+        Router::post('/addUserLevel', [PublicController::class, 'addUserLevel']);
+        Router::post('/delUserLevel', [PublicController::class, 'delUserLevel']);
+        Router::post('/updateUserLevel', [PublicController::class, 'updateUserLevel']);
+        Router::get('/getCityList', [PublicController::class, 'getCityList']);
+        Router::post('/addComplaint', [PublicController::class, 'addComplaint']);
+        Router::post('/upComplaint', [PublicController::class, 'upComplaint']);
+        Router::get('/getComplaint', [PublicController::class, 'getComplaint']);
+        Router::get('/getLetterOfComplaintInfo', [PublicController::class, 'getLetterOfComplaintInfo']);
+        Router::post('/delLetterOfComplaint', [PublicController::class, 'delLetterOfComplaint']);
+        Router::get('/getLetterType', [PublicController::class, 'getLetterType']);
+        Router::post('/downloadFile', [PublicController::class, 'downloadFile']);
+        Router::post('/checkMeasure', [PublicController::class, 'checkMeasure']);
 
+    },
+    ['middleware' => [FooMiddleware::class]]
+);

config/api/user.php

@@ -1,9 +1,24 @@
 <?php
 
 declare(strict_types=1);
+
+use App\Controller\UserController;
 use Hyperf\HttpServer\Router\Router;
-Router::post('/api/login', 'App\Controller\LoginController@login');
-Router::post('/api/checkVerifyCode', 'App\Controller\LoginController@checkVerifyCode');
+use App\Middleware\Auth\FooMiddleware;
+Router::addGroup(
+    '/user', function () {
+        Router::post('/createUser', [UserController::class, 'createUser']);
+        Router::post('/updateUser', [UserController::class, 'updateUser']);
+        Router::get('/getUserInfo', [UserController::class, 'getUserInfo']);
+        Router::get('/getUserList', [UserController::class, 'getUserList']);
+        Router::post('/delUser', [UserController::class, 'delUser']);
+        Router::post('/verifyUserInfo', [UserController::class, 'verifyUserInfo']);
+        Router::get('/roleList', [UserController::class, 'roleList']);
+        Router::post('/addRole', [UserController::class, 'addRole']);
+        Router::post('/delRole', [UserController::class, 'delRole']);
+        Router::post('/updateRole', [UserController::class, 'updateRole']);
 
-Router::post('/api/registerOrLogin', 'App\Controller\LoginController@registerOrLogin');
+    },
+    ['middleware' => [FooMiddleware::class]]
+);
 

config/api/website.php

@@ -0,0 +1,29 @@
+<?php
+
+declare(strict_types=1);
+
+use App\Controller\WebsiteController;
+use Hyperf\HttpServer\Router\Router;
+use App\Middleware\Auth\FooMiddleware;
+Router::addGroup(
+    '/website', function () {
+        Router::post('/addWebsite', [WebsiteController::class, 'addWebsite']);
+        Router::get('/getWebsiteList', [WebsiteController::class, 'getWebsiteList']);
+        Router::post('/updateWebsite', [WebsiteController::class, 'updateWebsite']);
+        Router::post('/delWebsite', [WebsiteController::class, 'delWebsite']);
+        Router::get('/getWebsiteInfo', [WebsiteController::class, 'getWebsiteInfo']);
+        Router::get('/getWebsiteColumn', [WebsiteController::class, 'getWebsiteColumn']);
+        Router::get('/getWebsiteColumnList', [WebsiteController::class, 'getWebsiteColumnList']);
+        Router::post('/addWebsiteColumn', [WebsiteController::class, 'addWebsiteColumn']);
+        Router::post('/updateWebsiteColumn', [WebsiteController::class, 'updateWebsiteColumn']);
+        Router::post('/delWebsiteColumn', [WebsiteController::class, 'delWebsiteColumn']);
+        Router::get('/getWebsiteRoleList', [WebsiteController::class, 'getWebsiteRoleList']);
+        Router::post('/createWebsiteRole', [WebsiteController::class, 'createWebsiteRole']);
+        Router::post('/delWebsiteRole', [WebsiteController::class, 'delWebsiteRole']);
+        Router::get('/getWebsiteRoleUserList', [WebsiteController::class, 'getWebsiteRoleUserList']);
+        Router::post('/createWebsiteRoleUser', [WebsiteController::class, 'createWebsiteRoleUser']);
+        Router::post('/delWebsiteRoleUser', [WebsiteController::class, 'delWebsiteRoleUser']);
+
+    },
+    ['middleware' => [FooMiddleware::class]]
+);

config/routes.php

@@ -25,4 +25,12 @@ Router::addServer('ws', function () {
 });
 
 require __DIR__.'/api/user.php';
-require __DIR__.'/api/public.php';
+require __DIR__.'/api/public.php';
+require __DIR__.'/api/ad.php';
+require __DIR__.'/api/complaint.php';
+require __DIR__.'/api/authority.php';
+require __DIR__.'/api/chat.php';
+require __DIR__.'/api/link.php';
+require __DIR__.'/api/login.php';
+require __DIR__.'/api/news.php';
+require __DIR__.'/api/website.php';

runtime/container/proxy/App_Controller_AdController.proxy.php

@@ -15,7 +15,7 @@ use Hyperf\Validation\Contract\ValidatorFactoryInterface;
  * Class AdController
  * @package App\Controller
  */
-#[AutoController]
+//#[AutoController]
 class AdController extends AbstractController
 {
     use \Hyperf\Di\Aop\ProxyTrait;

runtime/container/proxy/App_Controller_AuthorityController.proxy.php

@@ -14,7 +14,7 @@ use Hyperf\Validation\Contract\ValidatorFactoryInterface;
  * Class AuthorityController
  * @package App\Controller
  */
-#[AutoController]
+//#[AutoController]
 class AuthorityController extends AbstractController
 {
     use \Hyperf\Di\Aop\ProxyTrait;

runtime/container/proxy/App_Controller_LinkController.proxy.php

@@ -13,7 +13,7 @@ use Hyperf\Validation\Contract\ValidatorFactoryInterface;
  * Class LinkController
  * @package App\Controller
  */
-#[AutoController]
+//#[AutoController]
 class LinkController extends AbstractController
 {
     use \Hyperf\Di\Aop\ProxyTrait;

runtime/container/proxy/App_Controller_NewsController.proxy.php

@@ -13,7 +13,7 @@ use Hyperf\Validation\Contract\ValidatorFactoryInterface;
  * Class NewsController
  * @package App\Controller
  */
-#[AutoController]
+//#[AutoController]
 class NewsController extends AbstractController
 {
     use \Hyperf\Di\Aop\ProxyTrait;

runtime/container/proxy/App_Controller_PublicController.proxy.php

@@ -19,7 +19,7 @@ use function Hyperf\Support\env;
  * Class PublicController
  * @package App\Controller
  */
-#[AutoController]
+//#[AutoController]
 class PublicController extends AbstractController
 {
     use \Hyperf\Di\Aop\ProxyTrait;

runtime/container/proxy/App_Controller_UserController.proxy.php

@@ -13,7 +13,7 @@ use Hyperf\Validation\Contract\ValidatorFactoryInterface;
  * Class UserController
  * @package App\Controller
  */
-#[AutoController]
+//#[AutoController]
 class UserController extends AbstractController
 {
     use \Hyperf\Di\Aop\ProxyTrait;

runtime/container/proxy/App_Controller_WebsiteController.proxy.php

@@ -13,7 +13,7 @@ use Hyperf\Validation\Contract\ValidatorFactoryInterface;
  * Class WebsiteController
  * @package App\Controller
  */
-#[AutoController]
+//#[AutoController]
 class WebsiteController extends AbstractController
 {
     use \Hyperf\Di\Aop\ProxyTrait;

runtime/container/proxy/App_Tools_CommonService.proxy.php

@@ -80,11 +80,11 @@ class CommonService
     }
     public function imgUrl(string $str)
     {
-        $scheme = $this->request->geturi()->getScheme() ?? 'http';
+        $scheme = $this->request->getUri()->getScheme() ?? 'http';
         $host = $this->request->getUri()->getHost() ?? '127.0.0.1';
-        $port = $this->request->getUri()->getPort() ?? config('server.servers.port', 9500);
+        $port = $this->request->getUri()->getPort() ?? '';
         $url = '';
-        if ($port == 80 || $port == 443) {
+        if ($port == 80 || $port == 443 || empty($port)) {
             $url = "{$scheme}://{$host}/{$str}";
         } else {
             $url = "{$scheme}://{$host}:{$port}/{$str}";

runtime/hyperf.pid

@@ -1 +1 @@
-4490
+48511