From 75657a7d6d749df2159f3d5801d405baa11d866b Mon Sep 17 00:00:00 2001 From: Newnius Date: Tue, 23 Apr 2019 16:57:15 +0800 Subject: [PATCH] update --- WorkspaceManager.class.php | 17 +++--- agent.logic.php | 21 ++++++++ ajax.php | 19 ++++--- footer.php | 1 - help.php | 4 +- index.php | 2 +- install.php | 53 ++----------------- job.logic.php | 23 ++++---- modals.php | 39 ++++++++++---- static/agent.js | 1 - static/job.js | 16 ++++-- static/resource.js | 105 +++++++++++++++++++++++++++++++++++++ static/script.js | 9 +++- static/summary.js | 100 +++++++++++++++++++++++++++++++++-- static/ucenter.js | 4 ++ static/workspace.js | 52 ++++++++++++++---- ucenter.php | 22 ++++---- user.logic.php | 31 +++++++++++ 18 files changed, 396 insertions(+), 123 deletions(-) create mode 100755 static/resource.js diff --git a/WorkspaceManager.class.php b/WorkspaceManager.class.php index daa540f..7ef5265 100755 --- a/WorkspaceManager.class.php +++ b/WorkspaceManager.class.php @@ -15,21 +15,20 @@ class WorkspaceManager public static function add(CRObject $workspace) { $name = $workspace->get('name'); - $content = $workspace->get('content'); - $virtual_cluster = $workspace->getInt('virtual_cluster'); - $permission = $workspace->getInt('permission'); + $type = $workspace->get('type'); + $git_repo = $workspace->get('git_repo'); $created_at = $workspace->getInt('created_at', time()); $updated_at = $workspace->getInt('updated_at', time()); $created_by = $workspace->get('created_by'); $key_values = array( - 'name' => '?', 'content' => '?', 'virtual_cluster' => '?', 'permission' => '?', + 'name' => '?', 'type' => '?', 'git_repo' => '?', 'created_at' => '?', 'updated_at' => '?', 'created_by' => '?' ); $builder = new SQLBuilder(); $builder->insert(self::$table, $key_values); $sql = $builder->build(); - $params = array($name, $content, $virtual_cluster, $permission, $created_at, $updated_at, $created_by); + $params = array($name, $type, $git_repo, $created_at, $updated_at, $created_by); return (new MysqlPDO())->execute($sql, $params); } @@ -87,19 +86,19 @@ class WorkspaceManager { $id = $workspace->getInt('id'); $name = $workspace->get('name'); - $content = $workspace->get('content'); - $permission = $workspace->getInt('permission'); + $type = $workspace->get('type'); + $git_repo = $workspace->get('git_repo'); $updated_at = $workspace->getInt('updated_at', time()); $key_values = array( - 'name' => '?', 'content' => '?', 'permission' => '?', 'updated_at' => '?' + 'name' => '?', 'type' => '?', 'git_repo' => '?', 'updated_at' => '?' ); $where = array('id' => '?'); $builder = new SQLBuilder(); $builder->update(self::$table, $key_values); $builder->where($where); $sql = $builder->build(); - $params = array($name, $content, $permission, $updated_at, $id); + $params = array($name, $type, $git_repo, $updated_at, $id); return (new MysqlPDO())->execute($sql, $params); } diff --git a/agent.logic.php b/agent.logic.php index 8f0367f..aff5a87 100644 --- a/agent.logic.php +++ b/agent.logic.php @@ -63,3 +63,24 @@ function agent_list(CRObject $rule) $res['errno'] = $res['agents'] === null ? Code::FAIL : Code::SUCCESS; return $res; } + +function resource_list() +{ + if (!AccessController::hasAccess(Session::get('role', 'visitor'), 'system.summary')) { + $res['errno'] = Code::NO_PRIVILEGE; + return $res; + } + + $spider = new Spider(); + $spider->doGet(YAO_SCHEDULER_ADDR . '?action=resource_list'); + $msg = json_decode($spider->getBody(), true); + + if ($msg['code'] !== 0) { + $res['errno'] = $msg['code'] !== null ? $msg['code'] : Code::UNKNOWN_ERROR; + $res['msg'] = $msg['error']; + return $res; + } + $res['resources'] = $msg['resources']; + $res['errno'] = Code::SUCCESS; + return $res; +} diff --git a/ajax.php b/ajax.php index 7166aa1..5b682d5 100644 --- a/ajax.php +++ b/ajax.php @@ -128,6 +128,10 @@ switch ($action) { $res = agent_remove($job); break; + case 'resource_list': + $res = resource_list(); + break; + case 'workspace_list': $rule = new CRObject(); $rule->set('offset', cr_get_GET('offset')); @@ -138,9 +142,8 @@ switch ($action) { case 'workspace_add': $workspace = new CRObject(); $workspace->set('name', cr_get_POST('name')); - $workspace->set('content', cr_get_POST('content')); - $workspace->set('virtual_cluster', cr_get_POST('virtual_cluster')); - $workspace->set('permission', cr_get_POST('permission')); + $workspace->set('type', cr_get_POST('type')); + $workspace->set('git_repo', cr_get_POST('git_repo')); $res = workspace_add($workspace); break; @@ -148,9 +151,8 @@ switch ($action) { $workspace = new CRObject(); $workspace->set('id', cr_get_POST('id')); $workspace->set('name', cr_get_POST('name')); - $workspace->set('content', cr_get_POST('content')); - $workspace->set('virtual_cluster', cr_get_POST('virtual_cluster')); - $workspace->set('permission', cr_get_POST('permission')); + $workspace->set('type', cr_get_POST('type')); + $workspace->set('git_repo', cr_get_POST('git_repo')); $res = workspace_update($workspace); break; @@ -177,6 +179,11 @@ switch ($action) { $res = oauth_get_url(); break; + case 'user_login': + $user = new CRObject(); + $res = user_login($user); + break; + default: break; } diff --git a/footer.php b/footer.php index 7970921..234d25f 100755 --- a/footer.php +++ b/footer.php @@ -5,7 +5,6 @@ require_once('config.inc.php');
+ + +