From fa8e55a28c3029d29bde169eb68d43f8aeeb44a3 Mon Sep 17 00:00:00 2001 From: caoyanyi Date: Sat, 16 Dec 2023 17:27:33 +0800 Subject: [PATCH] - Remove repeat or unused methods. --- module/gitea/model.php | 11 ------- module/gitea/test/gitea.class.php | 48 ---------------------------- module/gitea/test/model/create.php | 34 -------------------- module/gitea/test/model/getpairs.php | 20 ------------ module/gitea/test/model/update.php | 36 --------------------- module/gogs/control.php | 2 +- module/gogs/model.php | 34 -------------------- module/gogs/test/gogs.class.php | 48 ---------------------------- module/gogs/test/model/create.php | 34 -------------------- module/gogs/test/model/getpairs.php | 20 ------------ module/gogs/test/model/update.php | 36 --------------------- module/pipeline/model.php | 2 ++ module/repo/control.php | 2 +- 13 files changed, 4 insertions(+), 323 deletions(-) delete mode 100644 module/gitea/test/model/create.php delete mode 100755 module/gitea/test/model/getpairs.php delete mode 100644 module/gitea/test/model/update.php delete mode 100644 module/gogs/test/model/create.php delete mode 100755 module/gogs/test/model/getpairs.php delete mode 100644 module/gogs/test/model/update.php diff --git a/module/gitea/model.php b/module/gitea/model.php index 032e5f5b46..3ee25e7077 100644 --- a/module/gitea/model.php +++ b/module/gitea/model.php @@ -20,17 +20,6 @@ class giteaModel extends model public $developerAccess = 30; public $maintainerAccess = 40; - /** - * Get gitea pairs. - * - * @access public - * @return array - */ - public function getPairs() - { - return $this->loadModel('pipeline')->getPairs('gitea'); - } - /** * Get gitea api base url by gitea id. * diff --git a/module/gitea/test/gitea.class.php b/module/gitea/test/gitea.class.php index 729afe4753..b9b44362a0 100644 --- a/module/gitea/test/gitea.class.php +++ b/module/gitea/test/gitea.class.php @@ -10,17 +10,6 @@ class giteaTest $this->gitea = $this->tester->loadModel('gitea'); } - /** - * Get gitea pairs - * - * @return string - */ - public function getPairs() - { - $pairs = $this->gitea->getPairs(); - return key($pairs); - } - /** * Get gitea tasks. * @@ -34,41 +23,4 @@ class giteaTest if(empty($tasks)) return 0; return $tasks; } - - /** - * Create a gitea. - * - * @access public - * @return object|string - */ - public function create() - { - $giteaID = $this->gitea->create(); - if(dao::isError()) - { - $errors = dao::getError(); - return key($errors); - } - - return $this->gitea->fetchByID($giteaID); - } - - /** - * Update a gitea. - * - * @param int $id - * @access public - * @return object|string - */ - public function update($id) - { - $this->gitea->update($id); - if(dao::isError()) - { - $errors = dao::getError(); - return key($errors); - } - - return $this->gitea->fetchByID($id); - } } diff --git a/module/gitea/test/model/create.php b/module/gitea/test/model/create.php deleted file mode 100644 index a568e5d6d8..0000000000 --- a/module/gitea/test/model/create.php +++ /dev/null @@ -1,34 +0,0 @@ -#!/usr/bin/env php -create(); -cid=1 -pid=1 - -Gitea名称为空 >> name -服务器地址为空 >> url -正确Gitea数据 >> Gitea,http://10.0.7.242:9020,1196c85ba525a268570df9da627e3a7b2d - -*/ - -$gitea = new giteaTest(); - -$_POST = array(); -$_POST['name'] = ''; -$_POST['url'] = 'http://10.0.7.242:9020'; -$_POST['token'] = 'c6769e6761a7d719129b2421dcb3112d936e2b1f'; - -r($gitea->create()) && p() && e('name'); // Gitea名称为空 - -$_POST['name'] = 'Gitea'; -$_POST['url'] = ''; -r($gitea->create()) && p() && e('url'); // 服务器地址为空 - -$_POST['url'] = 'http://10.0.7.242:9020'; -r($gitea->create()) && p('name,url,token') && e('Gitea,http://10.0.7.242:9020,c6769e6761a7d719129b2421dcb3112d936e2b1f'); // 正确Gitea数据 - diff --git a/module/gitea/test/model/getpairs.php b/module/gitea/test/model/getpairs.php deleted file mode 100755 index bd178d5f0e..0000000000 --- a/module/gitea/test/model/getpairs.php +++ /dev/null @@ -1,20 +0,0 @@ -#!/usr/bin/env php -gitPairs(); -cid=1 -pid=1 - -获取Gitea >> 4 - -*/ - -$gitea = new giteaTest(); - -r($gitea->getPairs()) && p() && e('4'); // 获取Gitea - diff --git a/module/gitea/test/model/update.php b/module/gitea/test/model/update.php deleted file mode 100644 index 3b5a9e268d..0000000000 --- a/module/gitea/test/model/update.php +++ /dev/null @@ -1,36 +0,0 @@ -#!/usr/bin/env php -update(); -cid=1 -pid=1 - -Gitea名称为空 >> name -服务器地址为空 >> url -正确Gitea数据 >> Changed Gitea - -*/ - -$gitea = new giteaTest(); - -$giteaID = 3; - -$_POST = array(); -$_POST['name'] = ''; -$_POST['url'] = 'http://10.0.7.242:9020'; -$_POST['token'] = 'c6769e6761a7d719129b2421dcb3112d936e2b1f'; - -r($gitea->update($giteaID)) && p() && e('name'); // Gitea名称为空 - -$_POST['name'] = 'Changed Gitea'; -$_POST['url'] = ''; -r($gitea->update($giteaID)) && p() && e('url'); // 服务器地址为空 - -$_POST['url'] = 'http://10.0.7.242:9020'; -r($gitea->update($giteaID)) && p('name') && e('Changed Gitea'); // 正确Gitea数据 - diff --git a/module/gogs/control.php b/module/gogs/control.php index 263cf7ac85..4f348ca8bf 100644 --- a/module/gogs/control.php +++ b/module/gogs/control.php @@ -115,7 +115,7 @@ class gogs extends control { $gogs = form::data($this->config->gogs->form->edit)->get(); $this->checkToken($gogs); - $this->gogs->update($gogsID, $gogs); + $this->loadModel('pipeline')->update($gogsID, $gogs); if(dao::isError()) return $this->send(array('result' => 'fail', 'message' => dao::getError())); $gogs = $this->gogs->fetchByID($gogsID); diff --git a/module/gogs/model.php b/module/gogs/model.php index 4b9f41a178..a872841db0 100644 --- a/module/gogs/model.php +++ b/module/gogs/model.php @@ -12,17 +12,6 @@ class gogsModel extends model { - /** - * Get gogs pairs. - * - * @access public - * @return array - */ - public function getPairs() - { - return $this->loadModel('pipeline')->getPairs('gogs'); - } - /** * Get gogs api base url by gogs id. * @@ -38,29 +27,6 @@ class gogsModel extends model return rtrim($gogs->url, '/') . '/api/v1%s' . "?token={$gogs->token}"; } - /** - * Create a gogs. - * - * @access public - * @return bool - */ - public function create() - { - return $this->loadModel('pipeline')->create('gogs'); - } - - /** - * Update a gogs. - * - * @param int $id - * @access public - * @return bool - */ - public function update($id) - { - return $this->loadModel('pipeline')->update($id); - } - /** * Bind users. * diff --git a/module/gogs/test/gogs.class.php b/module/gogs/test/gogs.class.php index c3ded018ab..aad5cf0841 100644 --- a/module/gogs/test/gogs.class.php +++ b/module/gogs/test/gogs.class.php @@ -9,52 +9,4 @@ class gogsTest $this->tester = $tester; $this->gogs = $this->tester->loadModel('gogs'); } - - /** - * Get gogs pairs - * - * @return string - */ - public function getPairs() - { - $pairs = $this->gogs->getPairs(); - return key($pairs); - } - - /** - * Create a gogs. - * - * @access public - * @return object|string - */ - public function create() - { - $gogsID = $this->gogs->create(); - if(dao::isError()) - { - $errors = dao::getError(); - return key($errors); - } - - return $this->gogs->fetchByID($gogsID); - } - - /** - * Update a gogs. - * - * @param int $id - * @access public - * @return object|string - */ - public function update($id) - { - $this->gogs->update($id); - if(dao::isError()) - { - $errors = dao::getError(); - return key($errors); - } - - return $this->gogs->fetchByID($id); - } } diff --git a/module/gogs/test/model/create.php b/module/gogs/test/model/create.php deleted file mode 100644 index b846e161c4..0000000000 --- a/module/gogs/test/model/create.php +++ /dev/null @@ -1,34 +0,0 @@ -#!/usr/bin/env php -create(); -cid=1 -pid=1 - -Gogs名称为空 >> name -服务器地址为空 >> url -正确Gogs数据 >> Gogs,http://10.0.7.242:9021,9ff43f9d1a369465bcf0781a3785f46bcef782d1 - -*/ - -$gogs = new gogsTest(); - -$_POST = array(); -$_POST['name'] = ''; -$_POST['url'] = 'http://10.0.7.242:9021'; -$_POST['token'] = '9ff43f9d1a369465bcf0781a3785f46bcef782d1'; - -r($gogs->create()) && p() && e('name'); // Gogs名称为空 - -$_POST['name'] = 'Gogs'; -$_POST['url'] = ''; -r($gogs->create()) && p() && e('url'); // 服务器地址为空 - -$_POST['url'] = 'http://10.0.7.242:9021'; -r($gogs->create()) && p('name,url,token') && e('Gogs,http://10.0.7.242:9021,9ff43f9d1a369465bcf0781a3785f46bcef782d1'); // 正确Gogs数据 - diff --git a/module/gogs/test/model/getpairs.php b/module/gogs/test/model/getpairs.php deleted file mode 100755 index f1df0f1109..0000000000 --- a/module/gogs/test/model/getpairs.php +++ /dev/null @@ -1,20 +0,0 @@ -#!/usr/bin/env php -gitPairs(); -cid=1 -pid=1 - -获取Gogs >> 5 - -*/ - -$gogs = new gogsTest(); - -r($gogs->getPairs()) && p() && e('5'); // 获取Gogs - diff --git a/module/gogs/test/model/update.php b/module/gogs/test/model/update.php deleted file mode 100644 index 3ff346f77c..0000000000 --- a/module/gogs/test/model/update.php +++ /dev/null @@ -1,36 +0,0 @@ -#!/usr/bin/env php -update(); -cid=1 -pid=1 - -Gogs名称为空 >> name -服务器地址为空 >> url -正确Gogs数据 >> Changed Gogs - -*/ - -$gogs = new gogsTest(); - -$gogsID = 3; - -$_POST = array(); -$_POST['name'] = ''; -$_POST['url'] = 'http://10.0.7.242:9021'; -$_POST['token'] = '9ff43f9d1a369465bcf0781a3785f46bcef782d1'; - -r($gogs->update($gogsID)) && p() && e('name'); // Gogs名称为空 - -$_POST['name'] = 'Changed Gogs'; -$_POST['url'] = ''; -r($gogs->update($gogsID)) && p() && e('url'); // 服务器地址为空 - -$_POST['url'] = 'http://10.0.7.242:9021'; -r($gogs->update($gogsID)) && p('name') && e('Changed Gogs'); // 正确Gogs数据 - diff --git a/module/pipeline/model.php b/module/pipeline/model.php index ef2684328a..bbadc74541 100644 --- a/module/pipeline/model.php +++ b/module/pipeline/model.php @@ -66,6 +66,7 @@ class pipelineModel extends model */ public function getList(string $type = 'jenkins', string $orderBy = 'id_desc', object|null $pager = null): array { + $type = strtolower($type); return $this->dao->select('*')->from(TABLE_PIPELINE) ->where('deleted')->eq('0') ->beginIF($type)->AndWhere('type')->in($type)->fi() @@ -84,6 +85,7 @@ class pipelineModel extends model */ public function getPairs(string $type = ''): array { + $type = strtolower($type); return $this->dao->select('id,name')->from(TABLE_PIPELINE) ->where('deleted')->eq('0') ->beginIF($type)->AndWhere('type')->eq($type)->fi() diff --git a/module/repo/control.php b/module/repo/control.php index 0d712649e2..521b38fa27 100644 --- a/module/repo/control.php +++ b/module/repo/control.php @@ -1309,7 +1309,7 @@ class repo extends control */ public function ajaxGetHosts(string $scm) { - $hosts = $this->loadModel(strtolower($scm))->getPairs(); + $hosts = $this->loadModel('pipeline')->getPairs($scm); $options = array(); foreach($hosts as $hostID => $host)