+
+app->getModuleRoot() . '/common/view/footer.html.php';?>
diff --git a/module/instance/view/baseinfo.html.php b/module/instance/view/baseinfo.html.php
new file mode 100644
index 0000000000..16f2912585
--- /dev/null
+++ b/module/instance/view/baseinfo.html.php
@@ -0,0 +1,115 @@
+
+
+ instance->backup->autoBackup;?>
+
+
+
+
+
+solution) && array_key_exists(strtolower($instance->chart), $this->config->instance->seniorChartList)):?>
+
+
+
+
+
+
+
+
+
+
+
+ | instance->status;?> | ++ instance->printStatus($instance);?> + | +
|---|---|
| instance->source;?> | ++ instance->sourceList, $instance->source, '');?> + | +
| instance->appTemplate;?> | +createLink('store', 'appView', "id=$instance->appID"), $instance->appName);?> | +
| instance->installAt;?> | +createdAt, 0, 16);?> | +
| instance->runDuration;?> | +runDuration);?> | +
| instance->defaultAccount;?> | +username;?> | +
| instance->defaultPassword;?> | +password;?> | +
+
+
+
+ instance->cpuUsage;?>
+ instance->printCpuUsage($instance, $instanceMetric->cpu, 'pie');?>
+
+
+ instance->memUsage;?>
+ instance->printMemUsage($instance, $instanceMetric->memory, 'pie');?>
+
+
+
+
+
+ instance->upgradeToSenior;?>
+
+
++ + $seniorApp):?> + 0) $seniorAppHtml .= $lang->instance->or;?> + id"), $seniorApp->alias, '_blank');?> + + appID"), $instance->appName, '_blank');?> + instance->descOfSwitchSerial, $currentAppUrl, $seniorAppHtml);?> + instance->serialDiff, '_blank', "id='serialDiff' class=''");?> +
+
+ status == 'stopped' ? '' : 'disabled';?>
+
+ inLink('toSenior', "id={$instance->id}&seniorAppID={$seniorApp->id}", '', true);?>
+ instance->switchTo . $seniorApp->alias, '', $disabled . " class='iframe btn btn-primary' title='{$lang->instance->upgrade}' data-width='520' data-app='space'");?>
+
+
+ instance->stopInstanceTips;?>
+
+
+
+
diff --git a/module/instance/view/custominstall.html.php b/module/instance/view/custominstall.html.php
new file mode 100644
index 0000000000..6571490d43
--- /dev/null
+++ b/module/instance/view/custominstall.html.php
@@ -0,0 +1,69 @@
+
+ * @package instance
+ * @version $Id$
+ * @link https://www.qucheng.com
+ */
+?>
+app->getModuleRoot() . '/common/view/header.html.php';?>
+
+
+ instance->operationLog;?>
+
+
+
+
+
+
+| instance->log->date;?> | +instance->log->message;?> | ++ |
|---|---|---|
| date;?> | +instance->printLog($instance, $log);?> | ++ |
+
+
+
+
+
+app->getModuleRoot() . '/common/view/footer.html.php';?>
diff --git a/module/instance/view/editname.html.php b/module/instance/view/editname.html.php
new file mode 100644
index 0000000000..63fe7dde60
--- /dev/null
+++ b/module/instance/view/editname.html.php
@@ -0,0 +1,28 @@
+
+ * @package instance
+ * @version $Id$
+ * @link https://www.qucheng.com
+ */
+?>
+app->getModuleRoot() . '/common/view/header.html.php';?>
+
+
+app->getModuleRoot() . '/common/view/footer.html.php';?>
diff --git a/module/instance/view/install.html.php b/module/instance/view/install.html.php
new file mode 100644
index 0000000000..f187c398cf
--- /dev/null
+++ b/module/instance/view/install.html.php
@@ -0,0 +1,118 @@
+
+ * @package instance
+ * @version $Id$
+ * @link https://www.qucheng.cn
+ */
+?>
+app->getModuleRoot() . '/common/view/header.html.php';?>
+instance->notices);?>
+
+
+
+instance->editName;?>
+
+
+app->getModuleRoot() . '/common/view/footer.html.php';?>
diff --git a/module/instance/view/resourceerror.html.php b/module/instance/view/resourceerror.html.php
new file mode 100644
index 0000000000..42334cf10d
--- /dev/null
+++ b/module/instance/view/resourceerror.html.php
@@ -0,0 +1,22 @@
+
+ * @package instance
+ * @version $Id$
+ * @link https://www.qucheng.cn
+ */
+?>
+app->getModuleRoot() . '/common/view/header.html.php';?>
+
+
+
+
+
+ instance->installApp . $cloudApp->alias . $cloudApp->app_version;?>
+
+
+app->getModuleRoot() . '/common/view/footer.html.php';?>
diff --git a/module/instance/view/restoresettings.html.php b/module/instance/view/restoresettings.html.php
new file mode 100644
index 0000000000..02412b1f31
--- /dev/null
+++ b/module/instance/view/restoresettings.html.php
@@ -0,0 +1,55 @@
+
+ * @package instance
+ * @version $Id$
+ * @link https://www.qucheng.cn
+ */
+?>
+app->getModuleRoot() . '/common/view/header.html.php';?>
+app->getModuleRoot() . '/common/view/datepicker.html.php';?>
+instance->notices);?>
+id);?>
+
+
+
+
+
+ instance->errors->notEnoughResource;?>
+instance->errors->notEnoughMemory, $cloudApp->alias, $requiredMemory, $freeMemory, $gapMemory);?>
+
+
+app->getModuleRoot() . '/common/view/footer.html.php';?>
diff --git a/module/instance/view/tosenior.html.php b/module/instance/view/tosenior.html.php
new file mode 100644
index 0000000000..349ca35546
--- /dev/null
+++ b/module/instance/view/tosenior.html.php
@@ -0,0 +1,28 @@
+
+ * @package instance
+ * @version $Id$
+ * @link https://www.qucheng.cn
+ */
+?>
+app->getModuleRoot() . '/common/view/header.html.php';?>
+
+
+ instance->restore->autoRestore;?>
+
+
+
+
+
+app->getModuleRoot() . '/common/view/footer.html.php';?>
diff --git a/module/instance/view/upgrade.html.php b/module/instance/view/upgrade.html.php
new file mode 100644
index 0000000000..0aa14ee7f5
--- /dev/null
+++ b/module/instance/view/upgrade.html.php
@@ -0,0 +1,32 @@
+
+ * @package instance
+ * @version $Id$
+ * @link https://www.qucheng.com
+ */
+?>
+app->getModuleRoot() . '/common/view/header.html.php';?>
+instance->notices);?>
+
+
+ instance->toSeniorAttention;?>
+
+
+
+
+
+app->getModuleRoot() . '/common/view/footer.html.php';?>
diff --git a/module/instance/view/view.html.php b/module/instance/view/view.html.php
new file mode 100644
index 0000000000..83511316be
--- /dev/null
+++ b/module/instance/view/view.html.php
@@ -0,0 +1,50 @@
+
+ * @package instance
+ * @version $Id$
+ * @link https://www.qucheng.com
+ */
+?>
+app->getModuleRoot() . '/common/view/header.html.php';?>
+instance->notices);?>
+id));?>
+demoAppLife);?>
+
+
+
+instance->upgrade} : {$instance->name}";?>
+
+
+
+
+
+
+
+app->getModuleRoot() . '/common/view/footer.html.php';?>
diff --git a/module/space/control.php b/module/space/control.php
new file mode 100644
index 0000000000..a6541ee60a
--- /dev/null
+++ b/module/space/control.php
@@ -0,0 +1,64 @@
+
+ * @package space
+ * @version $Id$
+ * @link https://www.qucheng.com
+ */
+class space extends control
+{
+ /**
+ * Browse departments and users of a space.
+ *
+ * @param int $param
+ * @param string $type
+ * @param string $orderBy
+ * @param int $recTotal
+ * @param int $recPerPage
+ * @param int $pageID
+ @access public
+ * @return void
+ */
+ public function browse($spaceID = null, $browseType = 'all', $recTotal = 0, $recPerPage = 24, $pageID = 1)
+ {
+ $this->app->loadLang('instance');
+ $this->loadModel('instance');
+ $this->loadModel('store');
+
+ $spaceType = $this->cookie->spaceType ? $this->cookie->spaceType : 'bycard';
+
+ $space = null;
+ if($spaceID) $space = $this->space->getByID($spaceID);
+ if(empty($space)) $space = $this->space->defaultSpace($this->app->user->account);
+
+ $search = '';
+ if(!empty($_POST))
+ {
+ $conditions = fixer::input('post')
+ ->trim('search')
+ ->setDefault('search', '')
+ ->get();
+ $search = $conditions->search;
+ }
+
+ $this->app->loadClass('pager', true);
+ $pager = pager::init($recTotal, $recPerPage, $pageID);
+
+ $instances = $this->space->getSpaceInstances($space->id, $browseType, $search, $pager);
+
+ $this->view->title = $this->lang->space->common;
+ $this->view->position[] = $this->lang->space->common;
+ $this->view->pager = $pager;
+ $this->view->browseType = $browseType;
+ $this->view->spaceType = $spaceType;
+ $this->view->instances = $instances;
+ $this->view->currentSpace = $space;
+ $this->view->searchName = $search;
+
+ $this->display();
+ }
+}
diff --git a/module/space/css/browse.css b/module/space/css/browse.css
new file mode 100644
index 0000000000..fee40be048
--- /dev/null
+++ b/module/space/css/browse.css
@@ -0,0 +1,20 @@
+#dropMenu .col-left {padding-bottom: 0;}
+input.search-input#search {padding:5px;}
+.q-card-title {padding-left: 15px; margin-left: -15px; line-height: 18px; font-size: 16px; font-weight: 700; overflow: hidden; text-overflow: ellipsis; white-space: nowrap; vertical-align: middle; }
+#cardsContainer .row {min-height: calc(100vh - 160px);}
+#cardsContainer .panel{border-radius: 2px;}
+#cardsContainer .panel-heading {padding: 14px 14px 20px 14px;}
+#cardsContainer .panel-body {padding: 0 14px;}
+#cardsContainer .panel-footer .count-down{display: inline-block; margin: 0 10px;}
+#cardsContainer .instance-detail {height: 44px; margin-bottom: 6px;}
+#cardsContainer .instance-logo {float: left;}
+#cardsContainer .instance-logo img {width: 44px; height: 44px;}
+#cardsContainer .instance-intro {float: left; padding-left: 20px; margin-bottom: 0; line-height: 22px; width: calc(100% - 44px); display: -webkit-box; -webkit-line-clamp: 2; -webkit-box-orient: vertical; overflow: hidden; text-overflow: ellipsis; vertical-align: middle;}
+#cardsContainer .instance-actions {padding: 14px 0 0 0;}
+#cardsContainer .instance-footer {height: 50px; padding: 14px; font-size: 13px; font-weight: 600;}
+#cardsContainer .instance-footer span {display: inline-block;}
+.input-group-btn {float: left;}
+#spaceSearchForm > div.btn-toolbar.pull-left > a {padding: 3px;}
+#spaceSearchForm button[type=submit] {height: 32px;}
+#spaceSearchForm a.btn {margin-top: 3px;}
+.solution-link {line-height: 18px; text-align: center; max-width: 140px; display: inline-block; float: right;}
diff --git a/module/space/js/browse.js b/module/space/js/browse.js
new file mode 100644
index 0000000000..6863ba967c
--- /dev/null
+++ b/module/space/js/browse.js
@@ -0,0 +1,133 @@
+$(function()
+{
+ $(".switchButton").on('click', function()
+ {
+ var spaceType = $(this).attr('data-type');
+ $.cookie('spaceType', spaceType, {expires:config.cookieLife, path:config.webRoot});
+ });
+ $('.btn-uninstall').on('click', function(event)
+ {
+ bootbox.confirm(instanceNotices.confirmUninstall, function(result)
+ {
+ if(!result) return;
+
+ var loadingDialog = bootbox.dialog(
+ {
+ message: '
+
+
+
+
+
+
+
+
+
+
+ ' + instanceNotices.uninstalling + '
',
+ });
+
+ let id = $(event.target).closest('button').attr('instance-id');
+ let url = createLink('instance', 'ajaxUninstall', 'id=' + id, 'json');
+ $.post(url).done(function(response)
+ {
+ loadingDialog.modal('hide');
+
+ let res = JSON.parse(response);
+ if(res.result == 'success')
+ {
+ window.location.reload();
+ }
+ else
+ {
+ bootbox.alert(
+ {
+ title: instanceNotices.fail,
+ message: res.message,
+ });
+ }
+ });
+ });
+ });
+
+ $('.btn-start').on('click', function(event)
+ {
+ bootbox.confirm(instanceNotices.confirmStart, function(result)
+ {
+ if(!result) return;
+
+ var loadingDialog = bootbox.dialog(
+ {
+ message: ' ' + instanceNotices.starting + '
',
+ });
+
+ let id = $(event.target).closest('button').attr('instance-id');
+ let url = createLink('instance', 'ajaxStart', 'id=' + id, 'json');
+ $.post(url).done(function(response)
+ {
+ loadingDialog.modal('hide');
+
+ let res = JSON.parse(response);
+ if(res.result == 'success')
+ {
+ window.location.reload();
+ }
+ else
+ {
+ bootbox.alert(
+ {
+ title: instanceNotices.fail,
+ message: res.message,
+ });
+ }
+ });
+ });
+ });
+
+ $('.btn-stop').on('click', function(event)
+ {
+ bootbox.confirm(instanceNotices.confirmStop, function(result)
+ {
+ if(!result) return;
+
+ var loadingDialog = bootbox.dialog(
+ {
+ message: ' ' + instanceNotices.stopping + '
',
+ });
+
+ let id = $(event.target).closest('button').attr('instance-id');
+ let url = createLink('instance', 'ajaxStop', 'id=' + id, 'json');
+ $.post(url).done(function(response)
+ {
+ loadingDialog.modal('hide');
+
+ let res = JSON.parse(response);
+ if(res.result == 'success')
+ {
+ window.location.reload();
+ }
+ else
+ {
+ bootbox.alert(
+ {
+ title: instanceNotices.fail,
+ message: res.message,
+ });
+ } });
+ });
+ });
+
+ var enableTimer = true;
+ window.parent.$(window.parent.document).on('showapp', function(event, app)
+ {
+ enableTimer = app.code == 'space';
+ });
+
+ setInterval(function()
+ {
+ if(!enableTimer) return;
+
+ var statusURL = createLink('instance', 'ajaxStatus');
+ $.post(statusURL, {idList: instanceIdList}).done(function(response)
+ {
+ let res = JSON.parse(response);
+ if(res.result == 'success' && res.data instanceof Array)
+ {
+ res.data.forEach(function(instance)
+ {
+ if($(".instance-status[instance-id=" + instance.id + "]").data('status') != instance.status) window.location.reload();
+ });
+ }
+ if(res.locate) window.parent.location.href = res.locate;
+ });
+ }, 1000 * 5);
+})
diff --git a/module/space/js/common.js b/module/space/js/common.js
new file mode 100644
index 0000000000..940461c4ed
--- /dev/null
+++ b/module/space/js/common.js
@@ -0,0 +1,4 @@
+$(function()
+{
+ window.parent.$.apps.close('store');
+});
diff --git a/module/space/lang/zh-cn.php b/module/space/lang/zh-cn.php
new file mode 100644
index 0000000000..d2f9ea809f
--- /dev/null
+++ b/module/space/lang/zh-cn.php
@@ -0,0 +1,20 @@
+space->status = '状态';
+$lang->space->noApps = '暂无服务';
+$lang->space->defaultSpace = '默认空间';
+$lang->space->systemSpace = '系统空间';
+$lang->space->searchInstance = '搜索服务';
+$lang->space->upgrade = '升级';
+$lang->space->install = '添加应用';
+
+$lang->space->notice = new stdclass;
+$lang->space->notice->toInstall = '请到应用市场安装';
+
+$lang->space->byList = '列表';
+$lang->space->byCard = '卡片';
+
+$lang->space->filterList['all'] = '全部';
+//$lang->space->filterList['toBeUpdated'] = '待更新';
+$lang->space->filterList['running'] = '运行中';
+$lang->space->filterList['stopped'] = '已停止';
+$lang->space->filterList['abnormal'] = '异常';
diff --git a/module/space/model.php b/module/space/model.php
new file mode 100644
index 0000000000..6b5e430439
--- /dev/null
+++ b/module/space/model.php
@@ -0,0 +1,132 @@
+
+ * @package space
+ * @version $Id$
+ * @link https://www.qucheng.com
+ */
+class spaceModel extends model
+{
+ /**
+ * Get space list by user account.
+ *
+ * @param string $account
+ * @access public
+ * @return array
+ */
+ public function getSpacesByAccount($account)
+ {
+ return $this->dao->select('*')->from(TABLE_SPACE)->where('deleted')->eq(0)->andWhere('owner')->eq($account)->fetchAll();
+ }
+
+ /**
+ * Get user's default space by user account.
+ *
+ * @param string $account
+ * @access public
+ * @return object
+ */
+ public function defaultSpace($account)
+ {
+ $default = $this->dao->select('*')->from(TABLE_SPACE)->where('deleted')->eq(0)->andWhere('owner')->eq($account)->orderBy('default desc')->limit(1)->fetch();
+
+ if(empty($default)) return $this->createDefaultSpace($account);
+ return $default;
+ }
+
+ /**
+ * Get system space.
+ *
+ * @param string $account
+ * @access public
+ * @return object
+ */
+ public function getSystemSpace($account)
+ {
+ $k8space = $this->config->k8space;
+
+ $sysSpace = $this->dao->select('*')->from(TABLE_SPACE)->where('k8space')->eq($k8space)->andWhere('owner')->eq($account)->fetch();
+ if($sysSpace) return $sysSpace;
+
+ $spaceData = new stdClass;
+ $spaceData->name = $this->lang->space->systemSpace;
+ $spaceData->owner = $account;
+ $spaceData->k8space = $k8space;
+ $spaceData->default = 0;
+ $spaceData->createdAt = date('Y-m-d H:i:s');
+
+ $this->dao->insert(TABLE_SPACE)->data($spaceData)->autoCheck()->exec();
+
+ return $this->dao->select('*')->from(TABLE_SPACE)->where('id')->eq($this->dao->lastInsertId())->fetch();
+ }
+
+ /**
+ * Create default space by account
+ *
+ * @param string $account
+ * @access public
+ * @return object
+ */
+ public function createDefaultSpace($account)
+ {
+ $default = new stdclass;
+ $default->name = $this->lang->space->defaultSpace;
+ $default->k8space = 'quickon-app';
+ $default->owner = $account;
+ $default->default = true;
+ $default->createdAt = date('Y-m-d H:i:s');
+
+ $this->dao->insert(TABLE_SPACE)->data($default)->autoCheck()->exec();
+
+ return $this->dao->select('*')->from(TABLE_SPACE)->where('id')->eq($this->dao->lastInsertId())->fetch();
+ }
+
+ /**
+ * Get app list in space
+ *
+ * @param int $spaceID
+ * @param object $pager
+ * @access public
+ * @return array
+ */
+ public function getSpaceInstances($spaceID, $status = 'all', $searchName = '', $pager = null)
+ {
+ $space = $this->dao->select('*')->from(TABLE_SPACE)->where('deleted')->eq(0)->andWhere('id')->eq($spaceID)->fetch();
+
+ $instances = $this->dao->select('*')->from(TABLE_INSTANCE)
+ ->where('deleted')->eq(0)
+ ->andWhere('space')->eq($spaceID)
+ ->beginIF($status !== 'all')->andWhere('status')->eq($status)->fi()
+ ->beginIF(!empty($searchName))->andWhere('name')->like("%{$searchName}%")->fi()
+ ->orderBy('id desc')->page($pager)->fetchAll('id');
+
+ $this->loadModel('store');
+ foreach($instances as $instance) $instance->latestVersion = $this->store->appLatestVersion($instance->appID, $instance->version);
+
+ $solutionIDList = array_column($instances, 'solution');
+ $solutions = $this->dao->select('*')->from(TABLE_SOLUTION)->where('id')->in($solutionIDList)->fetchAll('id');
+ foreach($instances as $instance) $instance->solutionData = zget($solutions, $instance->solution, new stdclass);
+
+ return $instances;
+ }
+
+ /**
+ * Get space by id.
+ *
+ * @param int $id
+ * @access public
+ * @return object
+ */
+ public function getByID($id)
+ {
+ return $this->dao->select('*')->from(TABLE_SPACE)
+ ->where('deleted')->eq(0)
+ ->andWhere('id')->eq($id)
+ ->andWhere('owner')->eq($this->app->user->account)
+ ->fetch();
+ }
+}
diff --git a/module/space/view/ajaxgetdropmenu.html.php b/module/space/view/ajaxgetdropmenu.html.php
new file mode 100644
index 0000000000..5c82847d8d
--- /dev/null
+++ b/module/space/view/ajaxgetdropmenu.html.php
@@ -0,0 +1,16 @@
+
+
+
diff --git a/module/space/view/browse.html.php b/module/space/view/browse.html.php
new file mode 100644
index 0000000000..429524a66c
--- /dev/null
+++ b/module/space/view/browse.html.php
@@ -0,0 +1,54 @@
+
+ * @package space
+ * @version $Id$
+ * @link https://www.qucheng.com
+ */
+?>
+app->getModuleRoot() . '/common/view/header.html.php';?>
+instance->notices);?>
+
+
+
+
+
+ -
+
+
- id"), $space->name, '', 'class="search-list-item ' . ($space->id == $spaceID ? 'selected' : '') . '"');?> + +
+
+
+
+
+
+app->getModuleRoot() . '/common/view/footer.html.php';?>
diff --git a/module/space/view/browsebycard.html.php b/module/space/view/browsebycard.html.php
new file mode 100644
index 0000000000..0a1449d120
--- /dev/null
+++ b/module/space/view/browsebycard.html.php
@@ -0,0 +1,66 @@
+
+ * @package space
+ * @version $Id$
+ * @link https://www.qucheng.com
+ */
+?>
+
+
+
+
+
+ createLink('store', 'browse'), $lang->space->noApps . ', ' . $lang->space->notice->toInstall, '', "class='btn btn-info'");?>
+
+
+
+
+
+
+
+
+
+
+
+
+ latestVersion) && empty($instance->solution)):?>
+
+
+
+
+
+
+
+
+ instance->canDo('visit', $instance);?>
+ instance->url($instance), $lang->instance->visit, '_blank', "class='btn btn-primary' title='{$lang->instance->visit}'". ($canVisit ? '' : ' disabled style="pointer-events: none;"'));?>
+ latestVersion) && empty($instance->solution)):?>
+ id", '', true), "" . $lang->space->upgrade, '', "class='btn btn-link iframe' title='{$lang->space->upgrade}' data-width='500' data-app='space'");?>
+
+ solution):?>
+ solution"), $instance->solutionData->name, '', "title='{$instance->solutionData->name}' class='label label-success label-outline solution-link text-ellipsis'");?>
+
+
+
diff --git a/module/space/view/browsebylist.html.php b/module/space/view/browsebylist.html.php
new file mode 100644
index 0000000000..5d72f2e362
--- /dev/null
+++ b/module/space/view/browsebylist.html.php
@@ -0,0 +1,56 @@
+
+ * @package space
+ * @version $Id$
+ * @link https://www.qucheng.net
+ */
+?>
+
+
+
diff --git a/module/store/config.php b/module/store/config.php
new file mode 100644
index 0000000000..174589f29e
--- /dev/null
+++ b/module/store/config.php
@@ -0,0 +1,3 @@
+store = new stdclass;
+$config->store->quchengSiteHost = 'https://qucheng.com';
diff --git a/module/store/control.php b/module/store/control.php
new file mode 100644
index 0000000000..58373c491a
--- /dev/null
+++ b/module/store/control.php
@@ -0,0 +1,128 @@
+
+ * @package store
+ * @version $Id$
+ * @link https://www.qucheng.com
+ */
+class store extends control
+{
+ /**
+ * Contruct function, load cne model.
+ *
+ * @access public
+ * @return void
+ */
+ public function __construct()
+ {
+ parent::__construct();
+ $this->loadModel('cne');
+ $this->app->loadLang('instance');
+ }
+
+ /**
+ * Index page.
+ *
+ * @access public
+ * @return void
+ */
+ public function index()
+ {
+ $this->locate($this->createLink('store', 'browse'));
+ }
+
+ /**
+ * Browse departments and users of a store.
+ *
+ * @param int $recTotal
+ * @param int $recPerPage
+ * @param int $pageID
+ * @param string $channel
+ * @access public
+ * @return void
+ */
+ public function browse($sortType = 'create_time', $recPerPage = 0, $pageID = 1, $channel = '')
+ {
+ global $config;
+ if(empty($recPerPage)) $recPerPage = $this->cookie->pagerStoreBrowse ? $this->cookie->pagerStoreBrowse : 24;
+ if(in_array( $channel, array('stable', 'test')))
+ {
+ $config->CNE->api->channel = $channel;
+ $config->cloud->api->channel = $channel;
+ $this->session->set('cloudChannel', $channel);
+ }
+
+ $keyword = '';
+ $postCategories = array();
+ if(!empty($_POST))
+ {
+ $pageID = 1;
+ $conditions = fixer::input('post')
+ ->setDefault('keyword', '')
+ ->setDefault('categories', array())
+ ->get();
+ $keyword = $conditions->keyword;
+ $postCategories = $conditions->categories;
+ }
+
+ $pagedApps = $this->store->searchApps($sortType, $keyword, $postCategories, $pageID, $recPerPage);
+ $this->app->loadClass('pager', true);
+ $pager = pager::init($pagedApps->total, $recPerPage, $pageID);
+
+ $pagedCategories = $this->store->getCategories();
+ $categories = array_combine(array_column($pagedCategories->categories, 'id'), array_column($pagedCategories->categories, 'alias'));
+
+ $this->lang->switcherMenu = $this->store->getBrowseSwitcher();
+
+ $this->view->title = $this->lang->store->common;
+ $this->view->position[] = $this->lang->store->common;
+ $this->view->cloudApps = $pagedApps->apps;
+ $this->view->categories = $categories;
+ $this->view->postCategories = $postCategories;
+ $this->view->keyword = $keyword;
+ $this->view->sortType = $sortType;
+ $this->view->pager = $pager;
+
+ $this->display();
+ }
+
+ /**
+ * Show app detail.
+ *
+ * @param int $id
+ * @access public
+ * @return viod
+ */
+ public function appView($id, $pageID = 1, $recPerPage = 20)
+ {
+ $appInfo = $this->store->getAppInfo($id, true);
+ if(empty($appInfo)) return print(js::locate('back', 'parent'));
+
+ $this->lang->switcherMenu = $this->store->getAppViewSwitcher($appInfo);
+
+ $dynamicResult = $this->store->appDynamic($appInfo, $pageID, $recPerPage);
+ $articles = array();
+ $totalArticle = 0;
+ if(!empty($dynamicResult))
+ {
+ $articles = $dynamicResult->articles;
+ $totalArticle = $dynamicResult->recTotal;
+ }
+ $this->view->dynamicArticles = $articles;
+
+ $this->app->loadClass('pager', true);
+ $pager = pager::init($totalArticle, $recPerPage, $pageID);
+ $this->view->dynamicPager = $pager;
+
+ $this->view->title = $appInfo->alias;
+ $this->view->position[] = $appInfo->alias;
+ $this->view->cloudApp = $appInfo;
+ $this->view->components = null; // Hide custom installation in version 1.0. If want, opened by: $this->store->getAppSettings($id);
+
+ $this->display();
+ }
+}
diff --git a/module/store/css/appview.css b/module/store/css/appview.css
new file mode 100644
index 0000000000..100ea476d8
--- /dev/null
+++ b/module/store/css/appview.css
@@ -0,0 +1,19 @@
+.app-logo div {text-align: right; padding-right: 8px;}
+.app-logo img {width: 48px; height: 48px;}
+table tr td.app-desc {vertical-align: top;}
+table tr td.app-action {vertical-align: top; text-align: center;}
+#mainContent .cell{padding: 20px;}
+#mainContent .app-logo img {width: 50px; height: 50px; display: inline-block; margin-right: 20px;}
+#mainContent hr {margin: 10px 0 0 0;}
+#appInfoHeader {height: 60px;}
+#appInfoHeader button .icon{color: #70c0fb;}
+#appInfoHeader .btn {display: inline-block; margin: 0 10px;}
+#appInfoHeader .icon:before {padding-right: 5px; font-size: 18px;}
+#appInfoHeader .icon-docker:before {color: #2196f3;}
+#appInfoHeader .icon-forum:before {color: #ff9800;}
+#appInfoHeader .dropdown .icon {padding-right: 5px;}
+#appInfoBody h3 {margin-top: 40px;}
+.dynamicContainer {padding: 10px; border: solid 1px #ddd;}
+.dynamicContainer table {margin-bottom: 0;}
+.screenshotsContainer .errorBox{padding: 20px; border: solid 1px #ddd;}
+.screenshotsContainer img{width: 100%; height: auto; border: solid 1px #ddd; border-radius: 3px; padding: 5px;}
diff --git a/module/store/css/browse.css b/module/store/css/browse.css
new file mode 100644
index 0000000000..145a1a7ade
--- /dev/null
+++ b/module/store/css/browse.css
@@ -0,0 +1,17 @@
+#appSearchForm input[type=text] {padding: 5px 10px;}
+#appSearchForm button[type=submit] {height: 32px;}
+#appContainer .row {min-height: calc(100vh - 130px);}
+#appContainer .card a:hover {color: #0b89b2;}
+#appContainer .card.panel {border-radius: 2px;}
+#appContainer .panel-heading {padding-right: 20px;}
+#appContainer .app-name {font-size: 18px; font-weight: 700; display: inline-block;padding: 8px 0; overflow: hidden; text-overflow: ellipsis; white-space: nowrap; vertical-align: middle;}
+#appContainer .app-detail {height: 80px;}
+#appContainer .app-logo {float: left;}
+#appContainer .app-logo img {width: 80px; height: 80px;}
+#appContainer .app-desc {float: left; padding-left: 20px; width: calc(100% - 80px);}
+#appContainer .app-desc {display: -webkit-box; -webkit-line-clamp: 4; -webkit-box-orient: vertical; overflow: hidden; text-overflow: ellipsis; vertical-align: middle;}
+#appContainer .app-footer {height: 50px; padding: 10px 20px; font-size: 14px; font-weight: bold;}
+#appContainer .app-footer span {display: inline-block; margin: 0 10px;}
+#appContainer .pagination ul {float: right;}
+#appContainer .btn-toolbar {height: 40px;}
+.sort {padding: 0 10px;}
diff --git a/module/store/js/browse.js b/module/store/js/browse.js
new file mode 100644
index 0000000000..b496914f29
--- /dev/null
+++ b/module/store/js/browse.js
@@ -0,0 +1,6 @@
+$(function()
+{
+ $('#appSearchForm #submit').attr('id', '');
+
+ $("input[name='categories[]']").on('change', function(){$('#appSearchForm').submit();});
+});
diff --git a/module/store/lang/zh-cn.php b/module/store/lang/zh-cn.php
new file mode 100644
index 0000000000..a8630fa27c
--- /dev/null
+++ b/module/store/lang/zh-cn.php
@@ -0,0 +1,28 @@
+store->appType = '应用类别';
+$lang->store->appVersion = '版本';
+$lang->store->releaseDate = '发布日期';
+$lang->store->author = '发布者';
+$lang->store->empty = '暂无应用';
+$lang->store->install = '安装';
+$lang->store->customInstall = '自定义安装';
+$lang->store->searchApp = '查找应用';
+$lang->store->testChannel = '测试版';
+$lang->store->stableChannel = '稳定版';
+$lang->store->appBasicInfo = '基本信息';
+$lang->store->screenshots = '应用截图';
+$lang->store->appDynamic = '应用动态';
+$lang->store->noDynamicArticle = '暂无动态';
+$lang->store->noScreenshot = '暂无截图';
+$lang->store->cloudStore = '应用市场';
+
+$lang->store->support = '支持';
+$lang->store->gitUrl = '应用源码';
+$lang->store->dockerfileUrl = 'Dockerfile';
+$lang->store->forumUrl = '论坛';
+
+$lang->store->sortTypes = array();
+$lang->store->sortTypes['id'] = '默认';
+$lang->store->sortTypes['create_time'] = '最新上架';
+$lang->store->sortTypes['update_time'] = '最近更新';
+//$lang->store->sortTypes['name'] = '名称';
diff --git a/module/store/model.php b/module/store/model.php
new file mode 100644
index 0000000000..87d716d35a
--- /dev/null
+++ b/module/store/model.php
@@ -0,0 +1,409 @@
+
+ * @package store
+ * @version $Id$
+ * @link https://www.qucheng.com
+ */
+class storeModel extends model
+{
+ /**
+ * Construct function: set api headers.
+ *
+ * @param string $appName
+ * @access public
+ * @return void
+ */
+ public function __construct($appName = '')
+ {
+ parent::__construct($appName);
+
+ global $config, $app;
+ $config->cloud->api->headers[] = "{$config->cloud->api->auth}: {$config->cloud->api->token}";
+
+ if($config->cloud->api->switchChannel && $app->session->cloudChannel) $config->cloud->api->channel = $app->session->cloudChannel;
+ }
+
+ /**
+ * Get app list from cloud market.
+ *
+ * @param string $keyword
+ * @param array $categories
+ * @param int $page
+ * @param int $pageSize
+ * @access public
+ * @return object
+ */
+ public function searchApps($sortBy = '', $keyword = '', $categories = array(), $page = 1, $pageSize = 20)
+ {
+ $apiUrl = $this->config->cloud->api->host;
+ $apiUrl .= '/api/market/applist?channel='. $this->config->cloud->api->channel;
+ $apiUrl .= "&q=" . rawurlencode(trim($keyword));
+ $apiUrl .= "&sort=" . rawurlencode(trim($sortBy));
+ $apiUrl .= "&page=$page";
+ $apiUrl .= "&page_size=$pageSize";
+ foreach($categories as $category) $apiUrl .= "&category=$category"; // The names of category are same that reason is CNE api is required.
+
+ $result = commonModel::apiGet($apiUrl, array(), $this->config->cloud->api->headers);
+ if($result->code == 200) return $result->data;
+
+ $pagedApps = new stdclass;
+ $pagedApps->apps = array();
+ $pagedApps->total = 0;
+ return $pagedApps;
+ }
+
+ /**
+ * Get app info by App chart from cloud market.
+ *
+ @param string $chart
+ * @param string $channel
+ * @param bool $analysis
+ * @param string $version
+ * @access public
+ * @return object|null
+ */
+ public function getAppInfoByChart($chart, $channel, $analysis, $version = '')
+ {
+ return $this->getAppInfo(0, $analysis, $chart, $version, $channel);
+ }
+
+ /**
+ * Get app info from cloud market.
+ *
+ * @param int $id
+ * @param boolean $analysis true: log this request for analysis.
+ * @param string $name
+ * @param string $version
+ * @param string $channel
+ * @access public
+ * @return object|null
+ */
+ public function getAppInfo($id, $analysis = false, $name = '', $version ='', $channel = '')
+ {
+ $apiParams = array();
+ $apiParams['analysis'] = $analysis ? 'true' : 'false' ;
+
+ if($id) $apiParams['id'] = $id;
+ if($name) $apiParams['name'] = $name;
+ if($version) $apiParams['version'] = $version;
+ if($channel) $apiParams['channel'] = $channel;
+
+ $apiUrl = $this->config->cloud->api->host;
+ $apiUrl .= '/api/market/appinfo';
+ $result = commonModel::apiGet($apiUrl, $apiParams, $this->config->cloud->api->headers);
+ if(!isset($result->code) || $result->code != 200) return null;
+
+ return $result->data;
+ }
+
+ /**
+ * Get app version list to install.
+ *
+ * @param int $id
+ * @param string $name
+ * @param string $channel
+ * @param int $page
+ * @param int $pageSize
+ * @access public
+ * @return mixed
+ */
+ public function appVersionList($id, $name = '', $channel = '', $page = 1, $pageSize = 3)
+ {
+ $apiParams = array();
+ $apiParams['page'] = $page;
+ $apiParams['page_size'] = $pageSize;
+
+ if($id) $apiParams['id'] = $id;
+ if($name) $apiParams['name'] = $name;
+ if($channel) $apiParams['channel'] = $channel;
+
+ $apiUrl = $this->config->cloud->api->host;
+ $apiUrl .= '/api/market/app/version';
+ $result = commonModel::apiGet($apiUrl, $apiParams, $this->config->cloud->api->headers);
+ if(!isset($result->code) || $result->code != 200) return null;
+
+ return array_combine(array_column($result->data, 'version'), $result->data);
+ }
+
+ /**
+ * Get upgradable versions of app from cloud market.
+ *
+ * @param string $currentVersion
+ * @param int $appID appID is required if no appName.
+ * @param string $appName appName is required if no appID.
+ * @param string $channel
+ * @access public
+ * @return mixed
+ */
+ public function getUpgradableVersions($currentVersion, $appID = 0, $appName = '', $channel = '')
+ {
+ $channel = $channel ? $channel : $this->config->cloud->api->channel;
+ $apiUrl = $this->config->cloud->api->host;
+ $apiUrl .= '/api/market/app/version/upgradable';
+
+ $conditions = array('version' => $currentVersion, 'channel' => $channel);
+ if($appID)
+ {
+ $conditions['id'] = $appID;
+ }
+ else
+ {
+ $conditions['name'] = $appName;
+ }
+
+ $result = commonModel::apiGet($apiUrl, $conditions, $this->config->cloud->api->headers);
+ if(!isset($result->code) || $result->code != 200) return array();
+
+ return $result->data;
+ }
+
+ /**
+ * Get the latest version of QuCheng platform.
+ *
+ * @access public
+ * @return object
+ */
+ public function platformLatestVersion()
+ {
+ $versionList = $this->getUpgradableVersions($this->config->platformVersion, 0, $this->config->edition == 'open' ? 'qucheng' : 'qucheng-biz', $this->config->cloud->api->channel);
+
+ $latestVersion = $this->pickHighestVersion($versionList);
+ if(!empty($latestVersion) && version_compare(str_replace('-', '.', $latestVersion->version), str_replace('-', '.', $this->config->platformVersion), '>')) return $latestVersion;
+
+ $latestVersion = new stdclass;
+ $latestVersion->app_version = getenv('APP_VERSION');
+ $latestVersion->version = $this->config->platformVersion;
+
+ return $latestVersion;
+ }
+
+ /**
+ * Get the latest versions of app from cloud market.
+ *
+ * @param int $appID
+ * @param string $currentVersion
+ * @access public
+ * @return object|null
+ */
+ public function appLatestVersion($appID, $currentVersion)
+ {
+ $versionList = $this->getUpgradableVersions($currentVersion, $appID);
+
+ $latestVersion = $this->pickHighestVersion($versionList);
+ if(empty($latestVersion)) return null;
+
+ if(version_compare(str_replace('-', '.', $latestVersion->version), str_replace('-', '.', $currentVersion), '>')) return $latestVersion;
+
+ return null;
+ }
+
+ /**
+ * Pick highest version from version list and compared version.
+ *
+ * @param array $versionList
+ * @access private
+ * @return object|null
+ */
+ private function pickHighestVersion($versionList)
+ {
+ if(empty($versionList)) return null;
+
+ $highestVersion = new stdclass;
+ $highestVersion->version = '0.0.0';
+ foreach($versionList as $version)
+ {
+ if(version_compare(str_replace('-', '.', $version->version), str_replace('-', '.', $highestVersion->version), '>')) $highestVersion = $version;
+ }
+
+ return $highestVersion;
+ }
+
+ /**
+ * Get app setting from cloud market.
+ *
+ * @param int $id
+ * @access public
+ * @return array
+ */
+ public function getAppSettings($id)
+ {
+ $apiUrl = $this->config->cloud->api->host;
+ $apiUrl .= '/api/market/appsettings';
+ $result = commonModel::apiGet($apiUrl, array('id' => $id), $this->config->cloud->api->headers);
+ if($result->code != 200) return array();
+
+ /* Convert "." to "_" */
+ $components = $result->data->components;
+ foreach($result->data->components as &$component)
+ {
+ foreach($component->settings as $setting) $setting->field = str_replace('.', '_', $setting->field);
+ }
+
+ return $components;
+ }
+
+ /**
+ * Get category list from cloud market.
+ *
+ * @access public
+ * @return object
+ */
+ public function getCategories()
+ {
+ $apiUrl = $this->config->cloud->api->host;
+ $apiUrl .= '/api/market/categories';
+ $result = commonModel::apiGet($apiUrl, array(), $this->config->cloud->api->headers);
+ if($result->code == 200) return $result->data;
+
+ $categories = new stdclass;
+ $categories->categories = array();
+ $categories->total = 0;
+ return $categories;
+ }
+
+ /**
+ * Get switcher of browse page of store.
+ *
+ * @access public
+ * @return string
+ */
+ public function getBrowseSwitcher()
+ {
+ $title = $this->lang->store->cloudStore;
+
+ if($this->config->cloud->api->switchChannel) $title .= '（' . ($this->config->cloud->api->channel == 'stable' ? $this->lang->store->stableChannel : $this->lang->store->testChannel) . '）';
+
+ $output = "
+
+
+
+
+createLink('store', 'browse'), $lang->space->noApps . ', ' . $lang->space->notice->toInstall, '', "class='btn btn-info'");?>
+";
+ if($this->config->cloud->api->switchChannel)
+ {
+ $stableActive = $this->config->cloud->api->channel == 'stable' ? 'active' : '';
+ $testActive = $this->config->cloud->api->channel != 'stable' ? 'active' : '';
+
+ $output .= "{$title}";
+ $output .= "";
+ }
+ else
+ {
+ $output .= "{$title}";
+ }
+
+ $output .= "
";
+
+ return $output;
+ }
+
+ /**
+ * Get switcher of app view page of store.
+ *
+ * @param object $app
+ * @access public
+ * @return string
+ */
+ public function getAppViewSwitcher($app)
+ {
+ $output = $this->getBrowseSwitcher();
+ $output .= "";
+ $output .= html::a(helper::createLink('store', 'appview', "id=$app->id"), $app->alias, '', 'class="btn"');
+ $output .= "
";
+
+ return $output;
+ }
+
+ /**
+ * Get app dynamic news from Qucheng offical site.
+ *
+ * @param object $cloudApp
+ * @param int $pageID
+ * @param int $recPerPage
+ * @access public
+ * @return object|null
+ */
+ public function appDynamic($cloudApp, $pageID = 1, $recPerPage = 20)
+ {
+ $alias = strtolower(str_replace('-', '', $cloudApp->chart));
+ $url = $this->config->store->quchengSiteHost . "/article-apibrowse-{$alias}-{$pageID}-{$recPerPage}.html";
+
+ $result = commonModel::apiGet($url);
+ if($result && $result->code == 200) return $result->data;
+
+ return null;
+ }
+
+ /**
+ * Get solution list.
+ *
+ * @param string $sortBy possible vlues: id,name,create_time,update_time
+ * @param string $keyword
+ * @param int $page
+ * @param int $pageSize
+ * @access public
+ * @return object
+ */
+ public function searchSolutions($sortBy = '', $keyword = '', $page = 1, $pageSize = 20)
+ {
+ $apiUrl = $this->config->cloud->api->host;
+ $apiUrl .= '/api/market/solution/list?channel='. $this->config->cloud->api->channel;
+ $apiUrl .= "&sort=" . rawurlencode(trim($sortBy));
+ $apiUrl .= "&q=" . rawurlencode(trim($keyword));
+ $apiUrl .= "&page=$page";
+ $apiUrl .= "&page_size=$pageSize";
+
+ $result = commonModel::apiGet($apiUrl, array(), $this->config->cloud->api->headers);
+ if($result->code == 200) return $result->data;
+
+ $pagedApps = new stdclass;
+ $pagedApps->apps = array();
+ $pagedApps->total = 0;
+ return $pagedApps;
+ }
+
+ /**
+ * Get solution info by ID.
+ *
+ * @param int $id
+ * @access public
+ * @return object
+ */
+ public function getSolutionByID($id)
+ {
+ $apiParams = array();
+ $apiParams['id'] = $id;
+
+ $apiUrl = $this->config->cloud->api->host;
+ $apiUrl .= '/api/market/solution/info?channel='. $this->config->cloud->api->channel;
+ $result = commonModel::apiGet($apiUrl, $apiParams, $this->config->cloud->api->headers);
+ if(!isset($result->code) || $result->code != 200) return null;
+
+ $solution = $result->data;
+ $solution->apps = array_combine(array_column($solution->apps, 'chart'), $solution->apps);
+
+ return $solution;
+ }
+ /**
+ * Get solution config by ID.
+ *
+ * @param int $id
+ * @access public
+ * @return object
+ */
+ public function solutionConfigByID($id)
+ {
+ $apiParams = array();
+ $apiParams['id'] = $id;
+
+ $apiUrl = $this->config->cloud->api->host;
+ $apiUrl .= '/api/market/solution/schema?channel='. $this->config->cloud->api->channel;
+ $result = commonModel::apiGet($apiUrl, $apiParams, $this->config->cloud->api->headers);
+ if(!isset($result->code) || $result->code != 200) return null;
+
+ return $result->data;
+ }
+}
diff --git a/module/store/view/appview.html.php b/module/store/view/appview.html.php
new file mode 100644
index 0000000000..1fce38b6a2
--- /dev/null
+++ b/module/store/view/appview.html.php
@@ -0,0 +1,107 @@
+
+ * @package store
+ * @version $Id$
+ * @link https://www.qucheng.com
+ */
+?>
+app->getModuleRoot() . '/common/view/header.html.php';?>
+instance->notices);?>
+
+
+
+
+
+
+app->getModuleRoot() . '/common/view/footer.html.php';?>
diff --git a/module/store/view/browse.html.php b/module/store/view/browse.html.php
new file mode 100644
index 0000000000..108250915d
--- /dev/null
+++ b/module/store/view/browse.html.php
@@ -0,0 +1,76 @@
+
+ * @package store
+ * @version $Id$
+ * @link https://www.qucheng.com
+ */
+?>
+app->getModuleRoot() . '/common/view/header.html.php';?>
+
+
+
+
+
+
+ logo ? $cloudApp->logo : '', "referrer='origin'");?>
+
+ alias;?>
+
+ id}", '', true), $lang->instance->install, '', "class='iframe btn btn-primary' title='{$lang->instance->install}' data-width='520' data-app='space'");?>
+
+
+
+
+
+
+
+ +
+
+
+
+
+
+ store->empty;?>
+
+
+
+
+
+
+
+
+ store->appBasicInfo;?>
+desc;?>
+| store->appVersion;?>: | +app_version;?> | +store->author;?>: | +author;?> | +
|---|---|---|---|
| store->releaseDate;?>: | +publish_time))->format('Y-m-d');?> | +store->appType;?>: | +categories, 'alias')), '/');?> | +
store->screenshots;?>
+ +
+
+ store->appDynamic;?>
+
+
+
+
+
+
+
+
+ | store->noDynamicArticle;?> |
| url, $article->title, "target='_blank'");?> |
+
+
+
+
+
+
+
+
+
+ store->empty;?>
+
+
+
+
+
+
+
+
+
+app->getModuleRoot() . '/common/view/footer.html.php';?>