Merge remote-tracking branch 'origin/dev' into dev

.example.env

@@ -1 +1,34 @@
-APP_DEBUG = true

[APP]
DEFAULT_TIMEZONE = Asia/Shanghai

[DATABASE]
TYPE = mysql
HOSTNAME = 127.0.0.1
DATABASE = test
USERNAME = username
PASSWORD = password
HOSTPORT = 3306
CHARSET = utf8
DEBUG = true
PREFIX = la_

[LANG]
default_lang = zh-cn

[PROJECT]
UNIQUE_IDENTIFICATION = likeadmin
# 演示环境
DEMO_ENV = false
+APP_DEBUG = true
+
+[APP]
+DEFAULT_TIMEZONE = Asia/Shanghai
+
+[DATABASE]
+TYPE = mysql
+HOSTNAME = 127.0.0.1
+DATABASE = test
+USERNAME = username
+PASSWORD = password
+HOSTPORT = 3306
+CHARSET = utf8
+DEBUG = true
+PREFIX = la_
+
+[LANG]
+default_lang = zh-cn
+
+[PROJECT]
+UNIQUE_IDENTIFICATION = likeadmin
+# 演示环境
+DEMO_ENV = false
+
+[DATABASE]
+TYPE = "mysql"
+HOSTNAME = "47.109.36.146"
+DATABASE = "worker_task"
+USERNAME = "worker_task"
+PASSWORD = "p4WGD67TezzzX3Mc"
+HOSTPORT = "3306"
+CHARSET = "utf8mb4"
+DEBUG = "0"
+PREFIX = "la_"

app/api/controller/CompanyController.php

@@ -21,6 +21,8 @@ use app\common\model\informationg\UserInformationgDemand;
  */
 class CompanyController extends BaseApiController
 {
+    public array $notNeedLogin = ['street_company'];
+
 
     //**签约公司*/
     public function index()
@@ -344,4 +346,18 @@ class CompanyController extends BaseApiController
         Db::name('company_complaint_feedback')->insertGetId(['company_id'=>$company['id'], 'content'=>$params['content'],'create_time'=>time(), 'update_time'=>time()]);
         return $this->success('成功');
     }
+
+    /**
+     * 查询镇管理公司
+     */
+    public function street_company(){
+        $street=$this->request->param('street_code');
+        $company = Company::where('street', $street)->where('company_type',41)->find();
+        if($company){
+            return $this->success('ok',['title'=>$company['company_name'],'organization_code'=>$company['organization_code']]);
+        }else{
+            return $this->fail('没有镇管理公司');
+        }
+
+    }
 }