作者 lyh

修改from信息

@@ -66,6 +66,13 @@ class ServersIpController extends BaseController @@ -66,6 +66,13 @@ class ServersIpController extends BaseController
66 $serversIpModel = new ServersIpModel(); 66 $serversIpModel = new ServersIpModel();
67 $this->map['status'] = 0; 67 $this->map['status'] = 0;
68 $data = $serversIpModel->lists($this->map,$this->page,$this->row,$this->order); 68 $data = $serversIpModel->lists($this->map,$this->page,$this->row,$this->order);
  69 + if(!empty($data) && !empty($data['list'])){
  70 + $projectModel = new Project();
  71 + foreach ($data['list'] as $k => $v){
  72 + $v['project_title'] = $projectModel->formatQuery(['serve_id'=>$v['id']])->pluck('title')->toArray();
  73 + $data['list'][$k] = $v;
  74 + }
  75 + }
69 $this->response('success',Code::SUCCESS,$data); 76 $this->response('success',Code::SUCCESS,$data);
70 } 77 }
71 78
@@ -158,7 +165,7 @@ class ServersIpController extends BaseController @@ -158,7 +165,7 @@ class ServersIpController extends BaseController
158 ]); 165 ]);
159 $serverModel = new Servers(); 166 $serverModel = new Servers();
160 $info = $serverModel->read(['id'=>$this->map['servers_id']]); 167 $info = $serverModel->read(['id'=>$this->map['servers_id']]);
161 - $data[] = []; 168 + $data = [];
162 $serversIpModel = new ServersIpModel(); 169 $serversIpModel = new ServersIpModel();
163 $list = $serversIpModel->list($this->map); 170 $list = $serversIpModel->list($this->map);
164 foreach ($list as $v){ 171 foreach ($list as $v){
@@ -43,7 +43,8 @@ class WebSettingFromController extends BaseController @@ -43,7 +43,8 @@ class WebSettingFromController extends BaseController
43 { 43 {
44 $message = $request->input('message', 'success'); 44 $message = $request->input('message', 'success');
45 $url = $request->input('url'); 45 $url = $request->input('url');
46 - $webSettingFromLogic->fromBackMsgSet($message, $url); 46 + $other = $request->input('other') ?? false;
  47 + $webSettingFromLogic->fromBackMsgSet($message, $url, $other);
47 $this->response('success'); 48 $this->response('success');
48 } 49 }
49 50
@@ -61,10 +61,10 @@ class WebSettingFromLogic extends BaseLogic @@ -61,10 +61,10 @@ class WebSettingFromLogic extends BaseLogic
61 * @param $url 61 * @param $url
62 * @return WebSettingFormBack|mixed 62 * @return WebSettingFormBack|mixed
63 */ 63 */
64 - public function fromBackMsgSet($message, $url) 64 + public function fromBackMsgSet($message, $url, $other = false)
65 { 65 {
66 $project_id = $this->user['project_id']; 66 $project_id = $this->user['project_id'];
67 - $info = WebSettingFormBack::saveBack($project_id, $message, $url); 67 + $info = WebSettingFormBack::saveBack($project_id, $message, $url,$other);
68 return $info; 68 return $info;
69 } 69 }
70 70