Merge branch 'develop' into dev

@@ -43,9 +43,9 @@ class AyrReleaseController extends BaseController
         $this->request->validate([
             'share_id'=>['required']
         ],[
-            'share_id.required' => 'SHARE_ID不能为空'
+            'share_id.required' => 'share_id不能为空'
         ]);
-        $info = $ayrShareLogic->ayr_share_info();
+        $info = $ayrShareLogic->ayr_share_info($this->param['share_id']);
         $this->response('success',Code::SUCCESS,$info);
     }
     /**
@@ -58,7 +58,7 @@ class AyrReleaseController extends BaseController
                               AyrShareLogic $ayrShareLogic,AyrShareHelper $ayrShare){
         $ayrReleaseRequest->validated();
         //获取发送账号详情
-        $share_info = $ayrShareLogic->ayr_share_info();
+        $share_info = $ayrShareLogic->ayr_share_info($this->param['share_id']);
         //验证发送平台
         $ayrShareLogic->verify_param($share_info);
         $data = [

@@ -52,9 +52,9 @@ class AyrShareController extends BaseController
      */
     public function save_account(AyrShareLogic $ayrShareLogic){
         $this->request->validate([
-            'share_id'=>['required'],
+            'id'=>['required'],
         ],[
-            'share_id.required' => 'SHARE_ID不能为空',
+            'id.required' => 'SHARE_ID不能为空',
         ]);
         $info = $ayrShareLogic->ayr_share_info();
         $ayrShareHelper = new AyrShareHelper();

@@ -69,8 +69,11 @@ class AyrShareLogic extends BaseLogic
      * @method :post
      * @time   :2023/5/6 10:16
      */
-    public function ayr_share_info(){
-        $info = $this->model->read(['id'=>$this->param['share_id']]);
+    public function ayr_share_info($share_id = ''){
+        if(isset($this->param['id'])){
+            $share_id = $this->param['id'];
+        }
+        $info = $this->model->read(['id'=>$share_id]);
         if($info === false){
             $this->fail('当前数据不存在或已被删除');
         }

@@ -30,13 +30,13 @@ class NavLogic extends  BaseLogic
      */
     public function list(){
         $where = [];
-        if(!empty($this->param['location'])){
-            $where[] = ['location','=',$this->param['location']];
+        if(!empty($this->requestAll['location'])){
+            $where[] = ['location','=',$this->requestAll['location']];
         }
 
         $lists = $this->getList($where,['sort'=>'asc'],['*'],false);
 
-        $isTree = $this->param['tree']??false;
+        $isTree = $this->requestAll['tree']??false;
 
         if($isTree){
             $lists = list_to_tree($lists);