From 7f2ff527abf22c79d6256364a918ad46a30d540b Mon Sep 17 00:00:00 2001 From: liuxiaoquan Date: Wed, 1 Mar 2023 11:36:26 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E6=B2=A1=E4=BB=80=E4=B9=88=E6=94=B9?= =?UTF-8?q?=E5=8A=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/admin/controller/nk/PublicBenefitActivities.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/admin/controller/nk/PublicBenefitActivities.php b/app/admin/controller/nk/PublicBenefitActivities.php index e7b5357..a432a3c 100644 --- a/app/admin/controller/nk/PublicBenefitActivities.php +++ b/app/admin/controller/nk/PublicBenefitActivities.php @@ -18,4 +18,4 @@ class PublicBenefitActivities extends ArticleCommon{ '/admin/nk.public_benefit_activities/read', ]; } -} \ No newline at end of file +} From b7e2a1deb16c7d8021e13c33000db562ffb3917c Mon Sep 17 00:00:00 2001 From: liuxiaoquan Date: Wed, 1 Mar 2023 13:26:05 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E4=BF=AE=E6=94=B9.gitignore?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitignore | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.gitignore b/.gitignore index e64bee4..4f90f60 100644 --- a/.gitignore +++ b/.gitignore @@ -5,6 +5,9 @@ *.env *.lock *.ini +.htaccess +404.html +index.html /runtime/* /public/storage/* /public/backup/* From 83d0b5f05b0204a36d3656ad67315ed33ccd0ba1 Mon Sep 17 00:00:00 2001 From: liuxiaoquan Date: Thu, 2 Mar 2023 18:13:42 +0800 Subject: [PATCH 3/4] =?UTF-8?q?api=E6=B7=BB=E5=8A=A0=E5=9C=B0=E5=8C=BA?= =?UTF-8?q?=E6=A8=A1=E5=9E=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .htaccess | 1 + 404.html | 7 ++ app/api/controller/Geo.gc.php | 96 +++++++++++++++ app/api/controller/Geo.php | 223 +++++++++++++++++++--------------- app/api/model/GeoArea.php | 26 ++++ app/api/model/GeoBrigade.php | 22 ++++ app/api/model/GeoCity.php | 25 ++++ app/api/model/GeoProvince.php | 31 +++++ app/api/model/GeoStreet.php | 23 ++++ app/api/model/GeoVillage.php | 25 ++++ index.html | 39 ++++++ 11 files changed, 422 insertions(+), 96 deletions(-) create mode 100644 .htaccess create mode 100644 404.html create mode 100644 app/api/controller/Geo.gc.php create mode 100644 app/api/model/GeoArea.php create mode 100644 app/api/model/GeoBrigade.php create mode 100644 app/api/model/GeoCity.php create mode 100644 app/api/model/GeoProvince.php create mode 100644 app/api/model/GeoStreet.php create mode 100644 app/api/model/GeoVillage.php create mode 100644 index.html diff --git a/.htaccess b/.htaccess new file mode 100644 index 0000000..0519ecb --- /dev/null +++ b/.htaccess @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/404.html b/404.html new file mode 100644 index 0000000..6f17eaf --- /dev/null +++ b/404.html @@ -0,0 +1,7 @@ + +404 Not Found + +

404 Not Found

+
nginx
+ + \ No newline at end of file diff --git a/app/api/controller/Geo.gc.php b/app/api/controller/Geo.gc.php new file mode 100644 index 0000000..55e48b1 --- /dev/null +++ b/app/api/controller/Geo.gc.php @@ -0,0 +1,96 @@ + ['except' => ['province','city','area','street','village','brigade'] ] + ]; + + /** + * 省 + */ + public function province(){ + $res = Db::table('fa_geo_province')->where(['switch'=>1]) + ->field('province_id id,province_code code,province_name name') + ->select(); + $this->apiSuccess('OK',$res); + } + + /** + * 市 + */ + public function city(){ + $pcode = get_params('pcode'); + // $pcode = '130000'; + if(!$pcode) $this->apiError('请先选择省份'); + $res = Db::table('fa_geo_city')->where(['switch'=>1,'province_code'=>$pcode]) + ->field('city_id id,city_code code,city_name name') + ->select(); + $this->apiSuccess('OK',$res); + } + + /** + * 区 + */ + public function area(){ + $pcode = get_params('pcode'); + // $pcode = '140100'; + if(!$pcode) $this->apiError('请先选择城市'); + $res = Db::table('fa_geo_area')->where(['switch'=>1,'city_code'=>$pcode]) + ->field('area_id id,area_code code,area_name name') + ->select(); + $this->apiSuccess('OK',$res); + } + + /** + * 街道 + */ + public function street(){ + $pcode = get_params('pcode'); + // $pcode = '410102'; + if(!$pcode) $this->apiError('请先选择区/县'); + $res = Db::table('fa_geo_street')->where(['switch'=>1,'area_code'=>$pcode]) + ->field('street_id id,street_code code,street_name name') + ->select(); + $this->apiSuccess('OK',$res); + } + + /** + * 村 + */ + public function village(){ + $pcode = get_params('pcode'); + // $pcode = '410102'; + if(!$pcode) $this->apiError('请先选择镇/街道'); + $res = Db::table('fa_geo_village')->where(['switch'=>1,'street_code'=>$pcode]) + ->field('village_id id,village_code code,village_name name') + ->select(); + $this->apiSuccess('OK',$res); + } + + /** + * 大队 + */ + public function brigade(){ + + $res = Db::table('fa_geo_brigade') + ->select(); + $this->apiSuccess('OK',$res); + } + + +} diff --git a/app/api/controller/Geo.php b/app/api/controller/Geo.php index 55e48b1..2f0607c 100644 --- a/app/api/controller/Geo.php +++ b/app/api/controller/Geo.php @@ -1,96 +1,127 @@ - ['except' => ['province','city','area','street','village','brigade'] ] - ]; - - /** - * 省 - */ - public function province(){ - $res = Db::table('fa_geo_province')->where(['switch'=>1]) - ->field('province_id id,province_code code,province_name name') - ->select(); - $this->apiSuccess('OK',$res); - } - - /** - * 市 - */ - public function city(){ - $pcode = get_params('pcode'); - // $pcode = '130000'; - if(!$pcode) $this->apiError('请先选择省份'); - $res = Db::table('fa_geo_city')->where(['switch'=>1,'province_code'=>$pcode]) - ->field('city_id id,city_code code,city_name name') - ->select(); - $this->apiSuccess('OK',$res); - } - - /** - * 区 - */ - public function area(){ - $pcode = get_params('pcode'); - // $pcode = '140100'; - if(!$pcode) $this->apiError('请先选择城市'); - $res = Db::table('fa_geo_area')->where(['switch'=>1,'city_code'=>$pcode]) - ->field('area_id id,area_code code,area_name name') - ->select(); - $this->apiSuccess('OK',$res); - } - - /** - * 街道 - */ - public function street(){ - $pcode = get_params('pcode'); - // $pcode = '410102'; - if(!$pcode) $this->apiError('请先选择区/县'); - $res = Db::table('fa_geo_street')->where(['switch'=>1,'area_code'=>$pcode]) - ->field('street_id id,street_code code,street_name name') - ->select(); - $this->apiSuccess('OK',$res); - } - - /** - * 村 - */ - public function village(){ - $pcode = get_params('pcode'); - // $pcode = '410102'; - if(!$pcode) $this->apiError('请先选择镇/街道'); - $res = Db::table('fa_geo_village')->where(['switch'=>1,'street_code'=>$pcode]) - ->field('village_id id,village_code code,village_name name') - ->select(); - $this->apiSuccess('OK',$res); - } - - /** - * 大队 - */ - public function brigade(){ - - $res = Db::table('fa_geo_brigade') - ->select(); - $this->apiSuccess('OK',$res); - } - - -} +市->区->街道/农村->大队 + */ +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; + +/** + * 首页接口 + */ +class Geo1 extends BaseController +{ + + /** + * 控制器中间件 [不需要鉴权] + * @var array + */ + protected $middleware = [ + Auth::class => ['except' => ['Province','City','Area','Street','Village', 'Brigade']] + ]; + + /** + * 省 + * + * echo json + */ + function Province(GeoProvinceModel $province){ + $list = $province::Get(); + + $this->apiSuccess('OK',$list); + } + + /** + * 市 + * + * @param $pcode 码 + * + * @echo json + */ + function City(GeoCityModel $city){ + $pcode = get_params('pcode'); + // $pcode = '130000'; + if(!$pcode) $this->apiError('请先选择省份'); + + $list = $city::Get($pcode); + + $this->apiSuccess('OK',$list); + } + + /** + * 区 + * + * @param $pcode 码 + * + * echo json + */ + function Area(GeoAreaModel $area){ + $pcode = get_params('pcode'); + // $pcode = '140100'; + if(!$pcode) $this->apiError('请先选择城市'); + + $list = $area::Get($pcode); + + $this->apiSuccess('OK',$list); + } + + /** + * 镇/街道 + * + * @param $pcode 码 + * + * echo json + */ + function Street(GeoStreetModel $street){ + $pcode = get_params('pcode'); + // $pcode = '410102'; + if(!$pcode) $this->apiError('请先选择镇/街道'); + + $list = $street::Get($pcode); + + $this->apiSuccess('OK',$list); + } + + /** + * 村 + * + * @param $pcode 码 + * + * echo json + */ + function Village(GeoVillageModel $village){ + $pcode = get_params('pcode'); + // $pcode = '410102'; + if(!$pcode) $this->apiError('请先选择镇/街道'); + + $list = $village::Get($pcode); + + $this->apiSuccess('OK',$list); + } + + + /** + * 大队 + * + * @param $pcode 码 + * + * echo json + */ + function Brigade(GeoBrigadeModel $brigade) { + $list = $brigade::Get(); + + $this->apiSuccess('OK',$list); + } +} \ No newline at end of file diff --git a/app/api/model/GeoArea.php b/app/api/model/GeoArea.php new file mode 100644 index 0000000..1b54431 --- /dev/null +++ b/app/api/model/GeoArea.php @@ -0,0 +1,26 @@ +1,'city_code'=>$pcode]) + ->field('area_id id,area_code code,area_name name') + ->select(); + + return $list; + } + + +} \ No newline at end of file diff --git a/app/api/model/GeoBrigade.php b/app/api/model/GeoBrigade.php new file mode 100644 index 0000000..5ad8392 --- /dev/null +++ b/app/api/model/GeoBrigade.php @@ -0,0 +1,22 @@ +1,'province_code'=>$pcode]) + ->field('city_id id,city_code code,city_name name') + ->select(); + + return $list; + } + + +} \ No newline at end of file diff --git a/app/api/model/GeoProvince.php b/app/api/model/GeoProvince.php new file mode 100644 index 0000000..7083f2e --- /dev/null +++ b/app/api/model/GeoProvince.php @@ -0,0 +1,31 @@ +belongsToMany(User::class,'fa_geo_city','user_id','role_id'); + // } + + /** + * 省 + */ + static function Get(){ + $res = self::where(['switch'=>1]) + ->field('province_id id,province_code code,province_name name') + ->select(); + + return $res; + } + +} \ No newline at end of file diff --git a/app/api/model/GeoStreet.php b/app/api/model/GeoStreet.php new file mode 100644 index 0000000..cdbaaf3 --- /dev/null +++ b/app/api/model/GeoStreet.php @@ -0,0 +1,23 @@ +1,'area_code'=>$pcode]) + ->field('street_id id,street_code code,street_name name') + ->select(); + + return $list; + } +} \ No newline at end of file diff --git a/app/api/model/GeoVillage.php b/app/api/model/GeoVillage.php new file mode 100644 index 0000000..0913832 --- /dev/null +++ b/app/api/model/GeoVillage.php @@ -0,0 +1,25 @@ +1,'street_code'=>$pcode]) + ->field('village_id id,village_code code,village_name name') + ->select(); + + return $list; + } +} \ No newline at end of file diff --git a/index.html b/index.html new file mode 100644 index 0000000..86aeca2 --- /dev/null +++ b/index.html @@ -0,0 +1,39 @@ + + + + + 恭喜，站点创建成功！ + + + +
+

恭喜, 站点创建成功！

+

这是默认index.html，本页面由系统自动生成

+
    +
  • 本页面在FTP根目录下的index.html
    • +
  • 您可以修改、删除或覆盖本页面
    • +
  • FTP相关信息，请到“面板系统后台 > FTP” 查看
    • +
+
+ + \ No newline at end of file From a73cfbccea58188f06f20d0e202f0ab7095f4ad7 Mon Sep 17 00:00:00 2001 From: liuxiaoquan Date: Thu, 2 Mar 2023 18:19:52 +0800 Subject: [PATCH 4/4] =?UTF-8?q?api=E5=9C=B0=E5=8C=BA=E8=81=94=E5=8A=A8?= =?UTF-8?q?=E6=96=87=E4=BB=B6=E6=9B=BF=E6=8D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/api/controller/Geo.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/api/controller/Geo.php b/app/api/controller/Geo.php index 2f0607c..296557d 100644 --- a/app/api/controller/Geo.php +++ b/app/api/controller/Geo.php @@ -21,7 +21,7 @@ use app\api\model\GeoBrigade as GeoBrigadeModel; /** * 首页接口 */ -class Geo1 extends BaseController +class Geo extends BaseController { /**