diff --git a/app/api/controller/Geo.php b/app/api/controller/Geo.php index 296557d..1480db5 100644 --- a/app/api/controller/Geo.php +++ b/app/api/controller/Geo.php @@ -11,12 +11,13 @@ namespace app\api\controller; use app\api\BaseController; use app\api\middleware\Auth; -use app\api\model\GeoProvince as GeoProvinceModel; -use app\api\model\GeoCity as GeoCityModel; -use app\api\model\GeoArea as GeoAreaModel; -use app\api\model\GeoStreet as GeoStreetModel; -use app\api\model\GeoVillage as GeoVillageModel; -use app\api\model\GeoBrigade as GeoBrigadeModel; +use app\common\model\geo\GeoProvince as GeoProvinceModel; +use app\common\model\geo\GeoCity as GeoCityModel; +use app\common\model\geo\GeoArea as GeoAreaModel; +use app\common\model\geo\GeoStreet as GeoStreetModel; +use app\common\model\geo\GeoVillage as GeoVillageModel; +use app\common\model\geo\GeoBrigade as GeoBrigadeModel; + /** * 首页接口 @@ -29,7 +30,7 @@ class Geo extends BaseController * @var array */ protected $middleware = [ - Auth::class => ['except' => ['Province','City','Area','Street','Village', 'Brigade']] + Auth::class => ['except' => ['Province','City','Area','Street','Village', 'Brigade','test']] ]; /** @@ -124,4 +125,5 @@ class Geo extends BaseController $this->apiSuccess('OK',$list); } + } \ No newline at end of file diff --git a/app/api/model/GeoArea.php b/app/common/model/geo/GeoArea.php similarity index 88% rename from app/api/model/GeoArea.php rename to app/common/model/geo/GeoArea.php index 1b54431..c1ca65e 100644 --- a/app/api/model/GeoArea.php +++ b/app/common/model/geo/GeoArea.php @@ -6,7 +6,7 @@ * * @ 地区联动模型 */ -namespace app\api\model; +namespace app\common\model\geo; use think\model; diff --git a/app/api/model/GeoBrigade.php b/app/common/model/geo/GeoBrigade.php similarity index 85% rename from app/api/model/GeoBrigade.php rename to app/common/model/geo/GeoBrigade.php index 5ad8392..ec7385a 100644 --- a/app/api/model/GeoBrigade.php +++ b/app/common/model/geo/GeoBrigade.php @@ -6,7 +6,7 @@ * * @ 地区联动 - 大队 */ -namespace app\api\model; +namespace app\common\model\geo; use think\model; diff --git a/app/api/model/GeoCity.php b/app/common/model/geo/GeoCity.php similarity index 88% rename from app/api/model/GeoCity.php rename to app/common/model/geo/GeoCity.php index 876b58c..b576af8 100644 --- a/app/api/model/GeoCity.php +++ b/app/common/model/geo/GeoCity.php @@ -6,7 +6,7 @@ * * @ 地区联动模型 */ -namespace app\api\model; +namespace app\common\model\geo; use think\model; diff --git a/app/api/model/GeoProvince.php b/app/common/model/geo/GeoProvince.php similarity index 90% rename from app/api/model/GeoProvince.php rename to app/common/model/geo/GeoProvince.php index 7083f2e..5d5d161 100644 --- a/app/api/model/GeoProvince.php +++ b/app/common/model/geo/GeoProvince.php @@ -6,7 +6,7 @@ * * @ 地区联动模型 */ -namespace app\api\model; +namespace app\common\model\geo; use think\model; diff --git a/app/api/model/GeoStreet.php b/app/common/model/geo/GeoStreet.php similarity index 88% rename from app/api/model/GeoStreet.php rename to app/common/model/geo/GeoStreet.php index cdbaaf3..cf9b998 100644 --- a/app/api/model/GeoStreet.php +++ b/app/common/model/geo/GeoStreet.php @@ -6,7 +6,7 @@ * * @ 地区联动模型 */ -namespace app\api\model; +namespace app\common\model\geo; use think\model; diff --git a/app/api/model/GeoVillage.php b/app/common/model/geo/GeoVillage.php similarity index 88% rename from app/api/model/GeoVillage.php rename to app/common/model/geo/GeoVillage.php index 0913832..20d98f1 100644 --- a/app/api/model/GeoVillage.php +++ b/app/common/model/geo/GeoVillage.php @@ -6,7 +6,7 @@ * * @ 地区联动模型 */ -namespace app\api\model; +namespace app\common\model\geo; use think\model;