From 96aa1b94ca432838e600d08af788b1690430a6f2 Mon Sep 17 00:00:00 2001
From: zenggang <zenggang@easycorp.ltd>
Date: Sat, 29 Jul 2023 03:32:17 +0000
Subject: [PATCH] * Adjust devops setting

---
 module/admin/lang/menu.php           |  2 +-
 module/cne/model.php                 |  2 +-
 module/system/control.php            |  1 +
 module/system/ui/domainview.html.php | 43 ++++++++++++++++++++++++++++
 module/system/ui/ossview.html.php    | 11 ++++---
 5 files changed, 53 insertions(+), 6 deletions(-)
 create mode 100644 module/system/ui/domainview.html.php

diff --git a/module/admin/lang/menu.php b/module/admin/lang/menu.php
index 9f4197f72a..a4a4273c77 100644
--- a/module/admin/lang/menu.php
+++ b/module/admin/lang/menu.php
@@ -190,7 +190,7 @@ $lang->admin->menuList->platform['subMenu']['setrules']    = array('link' => "{$
 
 $lang->admin->menuList->platform['tabMenu']['plat']['backup'] = array('link' => "{$lang->backup->common}|system|browsebackup|");
 $lang->admin->menuList->platform['tabMenu']['plat']['dblist'] = array('link' => "{$lang->devops->dblist}|system|dblist|");
-$lang->admin->menuList->platform['tabMenu']['plat']['domain'] = array('link' => "{$lang->devops->domain}|system|editdomain|");
+$lang->admin->menuList->platform['tabMenu']['plat']['domain'] = array('link' => "{$lang->devops->domain}|system|configdomain|");
 $lang->admin->menuList->platform['tabMenu']['plat']['oss']    = array('link' => "{$lang->devops->oss}|system|ossview|");
 
 $lang->admin->menuList->platform['tabMenu']['menuOrder']['plat']['5']  = 'backup';
diff --git a/module/cne/model.php b/module/cne/model.php
index 36805d6132..0e5a42e876 100644
--- a/module/cne/model.php
+++ b/module/cne/model.php
@@ -1018,7 +1018,7 @@ class cneModel extends model
      * @access public
      * @return object
      */
-    public function allDBList($global = true, $namespace = 'default')
+    public function allDBList($global = true, $namespace = 'quickon-system')
     {
         $apiUrl    = "/api/cne/component/dbservice";
         $apiParams =  array( 'global' => ($global ? 'true' : 'false'), 'namespace' => $namespace, 'channel' => $this->config->CNE->api->channel);
diff --git a/module/system/control.php b/module/system/control.php
index 6a81b12bbc..99a824eca3 100644
--- a/module/system/control.php
+++ b/module/system/control.php
@@ -428,6 +428,7 @@ class system extends control
     public function configDomain()
     {
         $domainSettings = $this->system->getDomainSettings();
+        if($domainSettings->customDomain) $this->locate($this->inLink('domainView'));
         if($domainSettings->customDomain) return print(js::locate($this->inLink('domainView')));
     }
 
diff --git a/module/system/ui/domainview.html.php b/module/system/ui/domainview.html.php
new file mode 100644
index 0000000000..c4f5ed8c74
--- /dev/null
+++ b/module/system/ui/domainview.html.php
@@ -0,0 +1,43 @@
+<?php
+declare(strict_types=1);
+/**
+ * The domainview view file of system module of ZenTaoPMS.
+ * @copyright   Copyright 2009-2023 禅道软件（青岛）有限公司(ZenTao Software (Qingdao) Co., Ltd. www.zentao.net)
+ * @license     ZPL(https://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html)
+ * @author      Zeng Gang<zenggang@easycorp.ltd>
+ * @package     system
+ * @link        https://www.zentao.net
+ */
+namespace zin;
+
+$expiredDate = !empty($cert) ? zget($cert, 'expiredDate', '') : '';
+
+panel
+(
+    set::size('lg'),
+    set::title($lang->system->domain->common),
+    to::headingActions
+    (
+        btn
+        (
+            setClass('primary'),
+            $lang->system->domain->editDomain,
+            set::url($this->createLink('system', 'editDomain')),
+        ),
+    ),
+    tableData
+    (
+        item
+        (
+            set::name($lang->system->domain->currentDomain),
+            zget($domainSettings, 'customDomain', ''),
+        ),
+        item
+        (
+            set::name($lang->system->domain->expiredDate),
+            $expiredDate
+        ),
+    ),
+);
+
+render();
diff --git a/module/system/ui/ossview.html.php b/module/system/ui/ossview.html.php
index efe3855aee..5326e74bb0 100644
--- a/module/system/ui/ossview.html.php
+++ b/module/system/ui/ossview.html.php
@@ -26,14 +26,17 @@ panel
             a
             (
                 set::id('ossVisitUrl'),
+                set::target('_blank'),
                 $lang->system->visit,
             ),
         ),
         item
         (
             set::name($lang->system->oss->user),
-            set::value(''),
-            set::id('ossAdmin'),
+            span
+            (
+                set::id('ossAdmin'),
+            ),
         ),
         item
         (
@@ -53,12 +56,12 @@ panel
         item
         (
             set::name($lang->system->oss->apiURL),
-            set::value($apiURL),
+            $apiURL,
         ),
         item
         (
             set::name($lang->system->oss->accessKey),
-            set::value($ossAccount->username),
+            $ossAccount->username,
         ),
         item
         (