From 0959b76706906bd4d1d115379d4b09a89a3da69a Mon Sep 17 00:00:00 2001
From: guofeilong <guofeilong@easycorp.ltd>
Date: Tue, 31 Jan 2023 09:14:53 +0800
Subject: [PATCH 1/8] * code for css in plug

---
 module/admin/css/index.css | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/module/admin/css/index.css b/module/admin/css/index.css
index 3a060cdaf5..ea345fbbd3 100755
--- a/module/admin/css/index.css
+++ b/module/admin/css/index.css
@@ -12,7 +12,7 @@
 .settings-list > .setting-box {flex: 0 0 20%; padding: 18px 0;}
 
 .plugin-list {display: flex; flex-wrap: wrap; padding: 12px 4px 4px 4px;}
-.plugin-list > .plugin-item {flex: 1 1 30%; padding: 16px 4px; border: 1px solid #EDEEF2; border-radius: 4px; margin-right: 16px; margin-bottom: 16px;}
+.plugin-list > .plugin-item {flex: 1 1 26%; padding: 16px 4px; border: 1px solid #EDEEF2; border-radius: 4px; margin-right: 16px; margin-bottom: 16px; width: 0px;}
 .plugin-list > .plugin-item .ext-download {float: right; padding: 6px 0px;}
 .plugin-list > .plugin-item > .plug-title {height: 16px; overflow: hidden;}
 .plugin-list > .plugin-item .extension-desc {overflow: hidden; height: 16px;}

From ffe1ccdbe8e418f7882beebaced83de2cdef0910 Mon Sep 17 00:00:00 2001
From: guofeilong <guofeilong@easycorp.ltd>
Date: Tue, 31 Jan 2023 10:25:38 +0800
Subject: [PATCH 2/8] * code for lang

---
 module/admin/css/index.css       |  6 +++---
 module/admin/lang/de.php         | 16 +++++++++++-----
 module/admin/lang/en.php         | 18 ++++++++++++------
 module/admin/lang/fr.php         | 16 +++++++++++-----
 module/admin/lang/vi.php         | 17 ++++++++++++-----
 module/admin/lang/zh-cn.php      | 18 ++++++++++--------
 module/admin/view/index.html.php |  6 +++++-
 7 files changed, 64 insertions(+), 33 deletions(-)

diff --git a/module/admin/css/index.css b/module/admin/css/index.css
index ea345fbbd3..1fec45f6e9 100755
--- a/module/admin/css/index.css
+++ b/module/admin/css/index.css
@@ -2,7 +2,7 @@
 #zentaoLinks {margin-top: 20px;}
 #zentaoLinks .panel .panel-heading {padding: 6px 10px;}
 .admin {display: flex; background: unset;}
-.admin > .main {flex: 1 1 60%; padding-right: 10px;}
+.admin > .main {flex: 1 1 60%; padding-right: 20px;}
 .admin > .side {flex: 1 1 40%; padding-left: 10px;}
 .panel-title {padding: 10px 0px;}
 .flex {display: flex;}
@@ -20,6 +20,6 @@
 .bottom.flex > .official {flex: 1 1 30%; margin-right: 20px;}
 .bottom.flex > .openClass {flex: 1 1 60%;}
 
-.official.panel > .main-panel {min-height: 200px;}
 .official-img {background-image: url('/static/images/wechat.jpg'); background-repeat: no-repeat; background-size: contain; flex: 1 1 50%; aspect-ratio: 1 / 1; background-position: center;}
-.official-content {flex: 0 0 50%;}
+.official-content {flex: 0 0 50%; display: flex; flex-direction: column; justify-content: center;}
+.official-content > .content {color: #838A9D;}
diff --git a/module/admin/lang/de.php b/module/admin/lang/de.php
index 47418888f7..f0f7ca2c3c 100755
--- a/module/admin/lang/de.php
+++ b/module/admin/lang/de.php
@@ -25,11 +25,17 @@ $lang->admin->resetPWDSetting = 'Reset password Setting';
 $lang->admin->tableEngine     = 'Table Engine';
 $lang->admin->setModuleIndex  = 'Set Module';
 
-$lang->admin->api            = 'API';
-$lang->admin->log            = 'Log';
-$lang->admin->setting        = 'Einstellungen';
-$lang->admin->days           = 'Gültige Tage';
-$lang->admin->resetPWDByMail = 'Reset the password via the email';
+$lang->admin->api                  = 'API';
+$lang->admin->log                  = 'Log';
+$lang->admin->setting              = 'Einstellungen';
+$lang->admin->pluginRecommendation = 'Recommended plug-ins';
+$lang->admin->zentaoInfo           = 'ZenTao information';
+$lang->admin->officialAccount      = 'WeChat Official Account';
+$lang->admin->publicClass          = 'Public class';
+$lang->admin->days                 = 'Gültige Tage';
+$lang->admin->resetPWDByMail       = 'Reset the password via the email';
+$lang->admin->followUs             = 'Follow Us';
+$lang->admin->followUsContent      = 'Check out ZenTao news, events, and support at any time';
 
 $lang->admin->changeEngine   = "Change to InnoDB";
 $lang->admin->changingTable  = 'Replacing data table %s engine...';
diff --git a/module/admin/lang/en.php b/module/admin/lang/en.php
index 914214cb1a..6553136041 100755
--- a/module/admin/lang/en.php
+++ b/module/admin/lang/en.php
@@ -25,11 +25,17 @@ $lang->admin->resetPWDSetting = 'Reset password Setting';
 $lang->admin->tableEngine     = 'Table Engine';
 $lang->admin->setModuleIndex  = 'Set Module';
 
-$lang->admin->api            = 'API';
-$lang->admin->log            = 'Log';
-$lang->admin->setting        = 'Setting';
-$lang->admin->days           = 'Valid Day';
-$lang->admin->resetPWDByMail = 'Reset the password via the email';
+$lang->admin->api                  = 'API';
+$lang->admin->log                  = 'Log';
+$lang->admin->setting              = 'Setting';
+$lang->admin->pluginRecommendation = 'Recommended plug-ins';
+$lang->admin->zentaoInfo           = 'ZenTao information';
+$lang->admin->officialAccount      = 'WeChat Official Account';
+$lang->admin->publicClass          = 'Public class';
+$lang->admin->days                 = 'Valid Day';
+$lang->admin->resetPWDByMail       = 'Reset the password via the email';
+$lang->admin->followUs             = 'Follow Us';
+$lang->admin->followUsContent      = 'Check out ZenTao news, events, and support at any time';
 
 $lang->admin->changeEngine   = "Change to InnoDB";
 $lang->admin->changingTable  = 'Replacing data table %s engine...';
@@ -141,4 +147,4 @@ $lang->admin->safe->resetPWDList[0] = 'Off';
 $lang->admin->safe->noticeMode     = 'The password will be checked when creating and modifying user information, and changing passwords.';
 $lang->admin->safe->noticeWeakMode = 'The password will be checked when logging into the system, creating and modifying user information, and changing passwords.';
 $lang->admin->safe->noticeStrong   = 'The longer the password, the more letters, numbers, or special characters it contains, and the less repetitive the password, the more secure it is!';
-$lang->admin->safe->noticeGd       = 'Your server does not have GD module installed, you cannot use the Captcha function, Please use it after installation.';
\ No newline at end of file
+$lang->admin->safe->noticeGd       = 'Your server does not have GD module installed, you cannot use the Captcha function, Please use it after installation.';
diff --git a/module/admin/lang/fr.php b/module/admin/lang/fr.php
index 745c72f69b..97c4bacb02 100755
--- a/module/admin/lang/fr.php
+++ b/module/admin/lang/fr.php
@@ -25,11 +25,17 @@ $lang->admin->resetPWDSetting = 'Reset password Setting';
 $lang->admin->tableEngine     = 'Table Engine';
 $lang->admin->setModuleIndex  = 'Set Module';
 
-$lang->admin->api            = 'API';
-$lang->admin->log            = 'Log';
-$lang->admin->setting        = 'Paramétrage';
-$lang->admin->days           = 'Durée de conservation';
-$lang->admin->resetPWDByMail = 'Reset the password via the email';
+$lang->admin->api                  = 'API';
+$lang->admin->log                  = 'Log';
+$lang->admin->setting              = 'Paramétrage';
+$lang->admin->pluginRecommendation = 'Recommended plug-ins';
+$lang->admin->zentaoInfo           = 'ZenTao information';
+$lang->admin->officialAccount      = 'WeChat Official Account';
+$lang->admin->publicClass          = 'Public class';
+$lang->admin->days                 = 'Durée de conservation';
+$lang->admin->resetPWDByMail       = 'Reset the password via the email';
+$lang->admin->followUs             = 'Follow Us';
+$lang->admin->followUsContent      = 'Check out ZenTao news, events, and support at any time';
 
 $lang->admin->changeEngine   = "Change to InnoDB";
 $lang->admin->changingTable  = 'Replacing data table %s engine...';
diff --git a/module/admin/lang/vi.php b/module/admin/lang/vi.php
index 4b6e64b021..3c099f1faf 100755
--- a/module/admin/lang/vi.php
+++ b/module/admin/lang/vi.php
@@ -22,10 +22,17 @@ $lang->admin->captcha       = 'Mã xác thực';
 $lang->admin->getCaptcha    = 'Gửi Mã xác thực';
 $lang->admin->register      = 'Register';
 
-$lang->admin->api     = 'API';
-$lang->admin->log     = 'Nhật ký';
-$lang->admin->setting = 'Thiết lập';
-$lang->admin->days    = 'Ngày hợp lệ';
+$lang->admin->api                  = 'API';
+$lang->admin->log                  = 'Nhật ký';
+$lang->admin->setting              = 'Thiết lập';
+$lang->admin->pluginRecommendation = 'Recommended plug-ins';
+$lang->admin->zentaoInfo           = 'ZenTao information';
+$lang->admin->officialAccount      = 'WeChat Official Account';
+$lang->admin->publicClass          = 'Public class';
+$lang->admin->days                 = 'Ngày hợp lệ';
+$lang->admin->resetPWDByMail       = 'Reset the password via the email';
+$lang->admin->followUs             = 'Follow Us';
+$lang->admin->followUsContent      = 'Check out ZenTao news, events, and support at any time';
 
 $lang->admin->info = new stdclass();
 $lang->admin->info->version = 'Phiên bản hiện tại là %s. ';
@@ -84,4 +91,4 @@ $lang->admin->safe->loginCaptchaList[0] = 'No';
 
 $lang->admin->safe->noticeMode   = 'Mật khẩu sẽ được kiểm tra khi người dùng đăng nhập hoặc người dùng thêm hoặc sửa.';
 $lang->admin->safe->noticeStrong = '';
-$lang->admin->safe->noticeGd     = 'Your server does not have GD module installed, you cannot use the Captcha function, Please use it after installation.';
\ No newline at end of file
+$lang->admin->safe->noticeGd     = 'Your server does not have GD module installed, you cannot use the Captcha function, Please use it after installation.';
diff --git a/module/admin/lang/zh-cn.php b/module/admin/lang/zh-cn.php
index 6a37c3cd4a..bd5c9ccf23 100755
--- a/module/admin/lang/zh-cn.php
+++ b/module/admin/lang/zh-cn.php
@@ -31,17 +31,19 @@ $lang->admin->setting              = '设置';
 $lang->admin->pluginRecommendation = '插件推荐';
 $lang->admin->zentaoInfo           = '禅道信息';
 $lang->admin->officialAccount      = '官方公众号';
-$lang->admin->openClass            = '公开课';
+$lang->admin->publicClass          = '公开课';
 $lang->admin->days                 = '日志保存天数';
 $lang->admin->resetPWDByMail       = '通过邮箱重置密码';
+$lang->admin->followUs             = '扫码关注公众号';
+$lang->admin->followUsContent      = '随时查看禅道动态、活动信息、也可获取帮助支持';
 
-$lang->admin->changeEngine   = "更换到InnoDB";
-$lang->admin->changingTable  = '正在更换数据表%s引擎...';
-$lang->admin->changeSuccess  = '已经更换数据表%s引擎为InnoDB。';
-$lang->admin->changeFail     = "更换数据表%s引擎失败，原因：<span class='text-red'>%s</span>。";
-$lang->admin->errorInnodb    = '您当前的数据库不支持使用InnoDB数据表引擎。';
-$lang->admin->changeFinished = "更换数据库引擎完毕。";
-$lang->admin->engineInfo     = "表<strong>%s</strong>的引擎是<strong>%s</strong>。";
+$lang->admin->changeEngine               = "更换到InnoDB";
+$lang->admin->changingTable              = '正在更换数据表%s引擎...';
+$lang->admin->changeSuccess              = '已经更换数据表%s引擎为InnoDB。';
+$lang->admin->changeFail                 = "更换数据表%s引擎失败，原因：<span class='text-red'>%s</span>。";
+$lang->admin->errorInnodb                = '您当前的数据库不支持使用InnoDB数据表引擎。';
+$lang->admin->changeFinished             = "更换数据库引擎完毕。";
+$lang->admin->engineInfo                 = "表<strong>%s</strong>的引擎是<strong>%s</strong>。";
 $lang->admin->engineSummary['hasMyISAM'] = "有%s个表不是InnoDB引擎";
 $lang->admin->engineSummary['allInnoDB'] = "所有的表都是InnoDB引擎了";
 
diff --git a/module/admin/view/index.html.php b/module/admin/view/index.html.php
index 07a6b96023..c6de813d35 100755
--- a/module/admin/view/index.html.php
+++ b/module/admin/view/index.html.php
@@ -46,11 +46,15 @@
 	<div class="flex main-panel">
 	  <div class="official-img"></div>
 	  <div class="official-content">
+	    <h4><?php echo $lang->admin->followUs?></h4>
+            <div class="content"> <?php echo $lang->admin->followUsContent?></div>
           </div>
         </div>
       </div>
       <div class="panel openClass">
-        <div class="panel-title"><?php echo $lang->admin->openClass?></div>
+        <div class="panel-title"><?php echo $lang->admin->publicClass?></div>
+	<div class="classList">
+        </div>
       </div>
     </div>
   </div>

From 0ab09e26c2da208e9d3094d016470ed2bee46443 Mon Sep 17 00:00:00 2001
From: guofeilong <guofeilong@easycorp.ltd>
Date: Tue, 31 Jan 2023 10:46:16 +0800
Subject: [PATCH 3/8] * code for task #83433

---
 module/admin/css/index.css       |  6 +++++-
 module/admin/view/index.html.php | 12 ++++++++++--
 2 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/module/admin/css/index.css b/module/admin/css/index.css
index 1fec45f6e9..bae5ed20db 100755
--- a/module/admin/css/index.css
+++ b/module/admin/css/index.css
@@ -18,8 +18,12 @@
 .plugin-list > .plugin-item .extension-desc {overflow: hidden; height: 16px;}
 
 .bottom.flex > .official {flex: 1 1 30%; margin-right: 20px;}
-.bottom.flex > .openClass {flex: 1 1 60%;}
+.bottom.flex > .publicClass {flex: 1 1 60%;}
 
 .official-img {background-image: url('/static/images/wechat.jpg'); background-repeat: no-repeat; background-size: contain; flex: 1 1 50%; aspect-ratio: 1 / 1; background-position: center;}
 .official-content {flex: 0 0 50%; display: flex; flex-direction: column; justify-content: center;}
 .official-content > .content {color: #838A9D;}
+
+.classList > .classItem {flex: 0 0 50%;}
+.classItem > .classImg {background-image: url('/static/images/wechat.jpg'); background-repeat: no-repeat; background-size: contain; flex: 1 1 50%; aspect-ratio: 1 / 1; }
+.classItem > .classContent {flex: 1 1 50%;}
diff --git a/module/admin/view/index.html.php b/module/admin/view/index.html.php
index c6de813d35..85d19c2a24 100755
--- a/module/admin/view/index.html.php
+++ b/module/admin/view/index.html.php
@@ -51,9 +51,17 @@
           </div>
         </div>
       </div>
-      <div class="panel openClass">
+      <div class="panel publicClass">
         <div class="panel-title"><?php echo $lang->admin->publicClass?></div>
-	<div class="classList">
+	<div class="classList flex">
+	  <div class="classItem flex">
+            <div class="classImg"></div>
+            <div class="classContent"></div>
+          </div>
+	  <div class="classItem flex">
+            <div class="classImg"></div>
+            <div class="classContent"></div>
+          </div>
         </div>
       </div>
     </div>

From e11aa068a3e14e22bb47ea4cb3ba746dcc91f527 Mon Sep 17 00:00:00 2001
From: guofeilong <guofeilong@easycorp.ltd>
Date: Tue, 31 Jan 2023 10:54:49 +0800
Subject: [PATCH 4/8] * code for style in offical-content

---
 module/admin/css/index.css       | 3 ++-
 module/admin/view/index.html.php | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/module/admin/css/index.css b/module/admin/css/index.css
index bae5ed20db..b2a3fe6eb1 100755
--- a/module/admin/css/index.css
+++ b/module/admin/css/index.css
@@ -22,7 +22,8 @@
 
 .official-img {background-image: url('/static/images/wechat.jpg'); background-repeat: no-repeat; background-size: contain; flex: 1 1 50%; aspect-ratio: 1 / 1; background-position: center;}
 .official-content {flex: 0 0 50%; display: flex; flex-direction: column; justify-content: center;}
-.official-content > .content {color: #838A9D;}
+.official-content > .content {color: #838A9D; font-size: 12px;}
+.official-content > .title {color: #313C52; font-size: 13px;}
 
 .classList > .classItem {flex: 0 0 50%;}
 .classItem > .classImg {background-image: url('/static/images/wechat.jpg'); background-repeat: no-repeat; background-size: contain; flex: 1 1 50%; aspect-ratio: 1 / 1; }
diff --git a/module/admin/view/index.html.php b/module/admin/view/index.html.php
index 85d19c2a24..650d5840d9 100755
--- a/module/admin/view/index.html.php
+++ b/module/admin/view/index.html.php
@@ -46,7 +46,7 @@
 	<div class="flex main-panel">
 	  <div class="official-img"></div>
 	  <div class="official-content">
-	    <h4><?php echo $lang->admin->followUs?></h4>
+	    <div class="title"><?php echo $lang->admin->followUs?></div>
             <div class="content"> <?php echo $lang->admin->followUsContent?></div>
           </div>
         </div>

From d795f17a8e185c87c00d663d09ebe05e840c0722 Mon Sep 17 00:00:00 2001
From: tianshujie <tianshujie0123@163.com>
Date: Tue, 31 Jan 2023 13:23:05 +0800
Subject: [PATCH 5/8] * Finish task #83329.

---
 .../xuan/common/ext/lang/zh-cn/xuanxuan.php   | 42 +++++++++----------
 1 file changed, 21 insertions(+), 21 deletions(-)

diff --git a/xuanxuan/extension/xuan/common/ext/lang/zh-cn/xuanxuan.php b/xuanxuan/extension/xuan/common/ext/lang/zh-cn/xuanxuan.php
index d38395c37b..ce9fc2f385 100644
--- a/xuanxuan/extension/xuan/common/ext/lang/zh-cn/xuanxuan.php
+++ b/xuanxuan/extension/xuan/common/ext/lang/zh-cn/xuanxuan.php
@@ -1,28 +1,28 @@
 <?php
 $lang->xuanxuan = new stdclass();
-if($config->vision != 'lite')
-{
-    $lang->admin->menu->xuanxuan = array('link' => '聊天|admin|xuanxuan', 'subModule' => 'client,setting');
-    $lang->admin->menuOrder[6]   = 'xuanxuan';
-}
-
-$lang->admin->menu->xuanxuan['subMenu'] = new stdclass();
-$lang->admin->menu->xuanxuan['subMenu']->index   = array('link' => '首页|admin|xuanxuan');
-$lang->admin->menu->xuanxuan['subMenu']->setting = array('link' => '参数|setting|xuanxuan');
-$lang->admin->menu->xuanxuan['subMenu']->update  = array('link' => '更新|client|browse', 'subModule' => 'client');
-
-$lang->admin->menu->xuanxuan['menuOrder'][0]  = 'index';
-$lang->admin->menu->xuanxuan['menuOrder'][5]  = 'setting';
-$lang->admin->menu->xuanxuan['menuOrder'][10] = 'update';
+//if($config->vision != 'lite')
+//{
+//    $lang->admin->menu->xuanxuan = array('link' => '聊天|admin|xuanxuan', 'subModule' => 'client,setting');
+//    $lang->admin->menuOrder[6]   = 'xuanxuan';
+//}
+//
+//$lang->admin->menu->xuanxuan['subMenu'] = new stdclass();
+//$lang->admin->menu->xuanxuan['subMenu']->index   = array('link' => '首页|admin|xuanxuan');
+//$lang->admin->menu->xuanxuan['subMenu']->setting = array('link' => '参数|setting|xuanxuan');
+//$lang->admin->menu->xuanxuan['subMenu']->update  = array('link' => '更新|client|browse', 'subModule' => 'client');
+//
+//$lang->admin->menu->xuanxuan['menuOrder'][0]  = 'index';
+//$lang->admin->menu->xuanxuan['menuOrder'][5]  = 'setting';
+//$lang->admin->menu->xuanxuan['menuOrder'][10] = 'update';
 
 global $config;
-if($config->edition != 'open')
-{
-    $lang->admin->menu->xuanxuan['subModule']           = 'client,setting,conference';
-    $lang->admin->menu->xuanxuan['subMenu']->conference = array('link' => '音视频|conference|admin');
-    $lang->admin->menu->xuanxuan['menuOrder'][7]        = 'conference';
-    $lang->navGroup->conference                         = 'admin';
-}
+//if($config->edition != 'open')
+//{
+//    $lang->admin->menu->xuanxuan['subModule']           = 'client,setting,conference';
+//    $lang->admin->menu->xuanxuan['subMenu']->conference = array('link' => '音视频|conference|admin');
+//    $lang->admin->menu->xuanxuan['menuOrder'][7]        = 'conference';
+//    $lang->navGroup->conference                         = 'admin';
+//}
 
 $lang->navGroup->im      = 'admin';
 $lang->navGroup->setting = 'admin';

From 062200535c2b54a09eb91a22d43f20a4f1f53d13 Mon Sep 17 00:00:00 2001
From: caoyanyi <caoyanyi@easycorp.ltd>
Date: Tue, 31 Jan 2023 13:54:21 +0800
Subject: [PATCH 6/8] * Modify page style.

---
 module/admin/config.php          | 32 +++++++++++
 module/admin/control.php         | 22 ++++++--
 module/admin/model.php           | 93 ++++++++++++++++++++++++++++++++
 module/admin/view/index.html.php | 31 ++++++-----
 4 files changed, 162 insertions(+), 16 deletions(-)

diff --git a/module/admin/config.php b/module/admin/config.php
index 858e34106c..0a9ddb1c0f 100755
--- a/module/admin/config.php
+++ b/module/admin/config.php
@@ -23,3 +23,35 @@ $config->admin->menuModuleGroup['model']['custom|required']   = array('project',
 $config->admin->menuModuleGroup['feature']['custom|set']      = array('todo', 'feedback', 'user', 'block', 'story', 'task', 'bug', 'testcase', 'testtask', 'feedback', 'user');
 $config->admin->menuModuleGroup['feature']['custom|required'] = array('bug', 'doc', 'product', 'story', 'productplan', 'release', 'task', 'bug', 'testcase', 'testsuite', 'testtask', 'testreport', 'caselib', 'doc', 'feedback', 'user');
 $config->admin->menuModuleGroup['template']['custom|set']     = array('baseline');
+
+$config->admin->plugIns[203] = new stdClass();
+$config->admin->plugIns[203]->name     = '人力资源日历';
+$config->admin->plugIns[203]->desc     = '禅道人力资源日历插件可以帮助项目管理者查看不同维度下的消耗工时、未完成工作量、并行工作量及负载率，同时组织维度待处理状态下实现了模拟负载的功能，帮助管理者详细了解成员的工作负载情况，更好的进行项目人力资源调度。';
+$config->admin->plugIns[203]->viewLink = 'https://www.zentao.net/extension-viewExt-203.html';
+
+$config->admin->plugIns[198] = new stdClass();
+$config->admin->plugIns[198]->name     = '需求池插件';
+$config->admin->plugIns[198]->desc     = '本插件为禅道需求池管理插件，包括：创建需求池 需求池权限管理 收集需求并向需求池录入需求 记录需求提出人信息 评审需求 拆分用户需求、研发需求 需求跟踪矩阵';
+$config->admin->plugIns[198]->viewLink = 'https://www.zentao.net/extension-viewExt-198.html';
+
+$config->admin->plugIns[27] = new stdClass();
+$config->admin->plugIns[27]->name     = 'Excel导出/导入';
+$config->admin->plugIns[27]->desc     = '安装该插件可以支持Excel导出和任务、需求、Bug、用例导入功能。更新提示：新增任务、需求、Bug的excel导入功能。';
+$config->admin->plugIns[27]->viewLink = 'https://www.zentao.net/extension-viewExt-27.html';
+
+$config->admin->plugIns[26] = new stdClass();
+$config->admin->plugIns[26]->name     = '甘特图';
+$config->admin->plugIns[26]->desc     = '禅道甘特图插件 运用此插件可以查看甘特图，维护任务关系。';
+$config->admin->plugIns[26]->viewLink = 'https://www.zentao.net/extension-viewExt-26.html';
+
+$config->admin->plugIns[30] = new stdClass();
+$config->admin->plugIns[30]->name     = '日志日历';
+$config->admin->plugIns[30]->desc     = '运用此插件可以实现工作日志的添加、编辑、查看、删除、导出等功能，方便用户管理工作日志。';
+$config->admin->plugIns[30]->viewLink = 'https://www.zentao.net/extension-viewExt-30.html';
+
+//$config->admin->plugIns[] = new stdClass();
+//$config->admin->plugIns[]->name     = '';
+//$config->admin->plugIns[]->desc     = '';
+//$config->admin->plugIns[]->viewLink = 'https://www.zentao.net/extension-viewExt-203.html';
+
+$config->admin->apiRoot = 'https://www.zentao.net/';
diff --git a/module/admin/control.php b/module/admin/control.php
index f05ab4299d..52e29309a3 100755
--- a/module/admin/control.php
+++ b/module/admin/control.php
@@ -34,11 +34,25 @@ class admin extends control
 
         $this->loadModel('misc');
 
-        $extensions = $this->loadModel('extension')->getExtensionsByAPI('byUpdatedTime', '', 0, 6);
+        /* Check internet. */
+        $curl = curl_init();
+        curl_setopt($curl, CURLOPT_URL, 'https://api.zentao.net/extension-apiGetExtensions.json');
+        curl_setopt($curl, CURLOPT_TIMEOUT_MS, 1000);
+        curl_setopt($curl, CURLOPT_CONNECTTIMEOUT_MS, 1000);
+        curl_setopt($curl, CURLOPT_RETURNTRANSFER, TRUE);
+        curl_setopt($curl, CURLOPT_SSL_VERIFYPEER, FALSE);
+        curl_setopt($curl, CURLOPT_SSL_VERIFYHOST, FALSE);
+        $connected = (bool)curl_exec($curl);
+        curl_close($curl);
 
-        $this->view->title      = $this->lang->admin->common;
-        $this->view->position[] = $this->lang->admin->index;
-        $this->view->extensions = isset($extensions->extensions) ? (array)$extensions->extensions : array();
+        $clientLang = $this->app->getClientLang();
+
+        $this->view->title       = $this->lang->admin->common;
+        $this->view->position[]  = $this->lang->admin->index;
+        $this->view->extensions  = $this->admin->getExtensionsByAPI('extension', 6, $connected);
+        $this->view->hasInternet = $connected;
+        $this->view->publicClass = ($connected and strpos($clientLang, 'zh') === 0) ? $this->admin->getPublicClassByAPI() : array();
+        $this->view->clientLang  = $clientLang;
         $this->display();
     }
 
diff --git a/module/admin/model.php b/module/admin/model.php
index bff5a3bc9d..bab50d297b 100755
--- a/module/admin/model.php
+++ b/module/admin/model.php
@@ -13,6 +13,11 @@
 <?php
 class adminModel extends model
 {
+    /**
+     * The extension manager version. Don't change it.
+     */
+    const EXT_MANAGER_VERSION = '1.3';
+
     /**
      * The api root.
      *
@@ -306,4 +311,92 @@ class adminModel extends model
 
         return $output;
     }
+
+    /**
+     * Get extensions from zentao.net.
+     *
+     * @param  string $type extension|patch
+     * @param  int    $limit
+     * @param  bool   $hasInternet
+     * @access public
+     * @return array
+     */
+    public function getExtensionsByAPI($type = 'extension', $limit = 6, $hasInternet = true)
+    {
+        if($hasInternet)
+        {
+            $searchType = $type == 'extension' ? 'byUpdatedTime' : 'byModule';
+            $param      = $type == 'extension' ? '' : 'MTIxOA==';
+            $extensions = $this->loadModel('extension')->getExtensionsByAPI($searchType, $param, 0, $limit);
+            $extensions = isset($extensions->extensions) ? (array)$extensions->extensions : array();
+        }
+        else
+        {
+            if($this->config->edition == 'open')
+            {
+                $extensions = array(
+                    $this->config->admin->plugIns[27],
+                    $this->config->admin->plugIns[26],
+                    $this->config->admin->plugIns[30]
+                );
+            }
+            else
+            {
+                $extensions = array(
+                    $this->config->admin->plugIns[198],
+                    $this->config->admin->plugIns[203]
+                );
+            }
+        }
+
+        return $extensions;
+    }
+
+    /**
+     * Fetch data from an api.
+     *
+     * @param  string    $url
+     * @access public
+     * @return mixed
+     */
+    public function fetchAPI($url)
+    {
+        $version = $this->loadModel('upgrade')->getOpenVersion(str_replace('.', '_', $this->config->version));
+        $version = str_replace('_', '.', $version);
+
+        $url   .= (strpos($url, '?') === false ? '?' : '&') . 'lang=' . str_replace('-', '_', $this->app->getClientLang()) . '&managerVersion=' . self::EXT_MANAGER_VERSION . '&zentaoVersion=' . $version;
+        $result = json_decode(preg_replace('/[[:cntrl:]]/mu', '', common::http($url)));
+
+        if(!isset($result->status)) return false;
+        if($result->status != 'success') return false;
+        if(isset($result->data)) return json_decode($result->data);
+    }
+
+    /**
+     * Get public class from zentao.net.
+     *
+     * @param  int    $limit
+     * @access public
+     * @return void
+     */
+    public function getPublicClassByAPI($limit = 2)
+    {
+        $apiURL  = $this->config->admin->apiRoot . "publicclass.json";
+        $data    = $this->fetchAPI($apiURL);
+        $courses = $data->videos;
+
+        $index       = 1;
+        $publicClass = array();
+        foreach($courses as $course)
+        {
+            if($index > $limit) return $publicClass;
+
+            $publicClass[$index] = new stdClass();
+            $publicClass[$index]->name = $course->title;
+            $publicClass[$index]->image = $this->config->admin->apiRoot . $course->image->list[0]->smallURL;
+            $publicClass[$index]->viewLink = $this->config->admin->apiRoot . "{$course->alias}-{$course->id}.html";
+            $index++;
+        }
+        return $publicClass;
+    }
 }
diff --git a/module/admin/view/index.html.php b/module/admin/view/index.html.php
index 650d5840d9..921593cb0a 100755
--- a/module/admin/view/index.html.php
+++ b/module/admin/view/index.html.php
@@ -11,6 +11,7 @@
  */
 ?>
 <?php include '../../common/view/header.html.php';?>
+<?php js::set('hasInternet', $hasInternet);?>
 <div id='mainContent' class='main-content admin'>
   <div class="main">
     <div class="settings panel">
@@ -28,6 +29,8 @@
         <div class="setting-box">10</div>
       </div>
     </div>
+
+    <?php if($extensions):?>
     <div class="plug panel">
       <div class="panel-title"><?php echo $lang->admin->pluginRecommendation?></div>
       <div class="plugin-list">
@@ -40,34 +43,38 @@
         <?php endforeach;?>
       </div>
     </div>
+    <?php endif;?>
+
     <div class="flex bottom">
       <div class="panel official">
         <div class="panel-title"><?php echo $lang->admin->officialAccount?></div>
-	<div class="flex main-panel">
-	  <div class="official-img"></div>
-	  <div class="official-content">
-	    <div class="title"><?php echo $lang->admin->followUs?></div>
+	    <div class="flex main-panel">
+	      <div class="official-img"></div>
+	      <div class="official-content">
+	        <div class="title"><?php echo $lang->admin->followUs?></div>
             <div class="content"> <?php echo $lang->admin->followUsContent?></div>
           </div>
         </div>
       </div>
+      <?php if($publicClass):?>
       <div class="panel publicClass">
         <div class="panel-title"><?php echo $lang->admin->publicClass?></div>
-	<div class="classList flex">
-	  <div class="classItem flex">
-            <div class="classImg"></div>
-            <div class="classContent"></div>
-          </div>
-	  <div class="classItem flex">
-            <div class="classImg"></div>
-            <div class="classContent"></div>
+        <div class="classList flex">
+          <?php foreach($publicClass as $class):?>
+	      <div class="classItem flex">
+            <div class="classImg" style="background-image: url('<?php echo $class->image;?>');"></div>
+            <div class="classContent"><?php echo $class->name;?></div>
           </div>
+          <?php endforeach;?>
         </div>
       </div>
+      <?php endif;?>
     </div>
   </div>
+  <?php if($hasInternet and strpos($clientLang, 'zh') === 0):?>
   <div class="side panel">
     <div class="panel-title"><?php echo $lang->admin->zentaoInfo?></div>
   </div>
+  <?php endif;?>
 </div>
 <?php include '../../common/view/footer.html.php';?>

From 85ee9918c09457a3000d61600b747b414cd20452 Mon Sep 17 00:00:00 2001
From: caoyanyi <caoyanyi@easycorp.ltd>
Date: Tue, 31 Jan 2023 15:25:46 +0800
Subject: [PATCH 7/8] * Modify website check.

---
 module/admin/control.php | 21 ++++++---------------
 module/admin/model.php   | 23 ++++++++++++++++++++++-
 2 files changed, 28 insertions(+), 16 deletions(-)

diff --git a/module/admin/control.php b/module/admin/control.php
index 52e29309a3..8a7a31e2c4 100755
--- a/module/admin/control.php
+++ b/module/admin/control.php
@@ -34,24 +34,15 @@ class admin extends control
 
         $this->loadModel('misc');
 
-        /* Check internet. */
-        $curl = curl_init();
-        curl_setopt($curl, CURLOPT_URL, 'https://api.zentao.net/extension-apiGetExtensions.json');
-        curl_setopt($curl, CURLOPT_TIMEOUT_MS, 1000);
-        curl_setopt($curl, CURLOPT_CONNECTTIMEOUT_MS, 1000);
-        curl_setopt($curl, CURLOPT_RETURNTRANSFER, TRUE);
-        curl_setopt($curl, CURLOPT_SSL_VERIFYPEER, FALSE);
-        curl_setopt($curl, CURLOPT_SSL_VERIFYHOST, FALSE);
-        $connected = (bool)curl_exec($curl);
-        curl_close($curl);
-
-        $clientLang = $this->app->getClientLang();
+        $hasInternet = $this->admin->checkInternet();
+        $clientLang  = $this->app->getClientLang();
 
         $this->view->title       = $this->lang->admin->common;
         $this->view->position[]  = $this->lang->admin->index;
-        $this->view->extensions  = $this->admin->getExtensionsByAPI('extension', 6, $connected);
-        $this->view->hasInternet = $connected;
-        $this->view->publicClass = ($connected and strpos($clientLang, 'zh') === 0) ? $this->admin->getPublicClassByAPI() : array();
+        $this->view->extensions  = $this->admin->getExtensionsByAPI('extension', strpos($clientLang, 'zh') === 0 ? 6 : 5, $hasInternet);
+        $this->view->patches     = $this->admin->getExtensionsByAPI('patch', 3, $hasInternet);
+        $this->view->hasInternet = $hasInternet;
+        $this->view->publicClass = ($hasInternet and strpos($clientLang, 'zh') === 0) ? $this->admin->getPublicClassByAPI() : array();
         $this->view->clientLang  = $clientLang;
         $this->display();
     }
diff --git a/module/admin/model.php b/module/admin/model.php
index bab50d297b..04e69e624c 100755
--- a/module/admin/model.php
+++ b/module/admin/model.php
@@ -377,7 +377,7 @@ class adminModel extends model
      *
      * @param  int    $limit
      * @access public
-     * @return void
+     * @return array
      */
     public function getPublicClassByAPI($limit = 2)
     {
@@ -399,4 +399,25 @@ class adminModel extends model
         }
         return $publicClass;
     }
+
+    /**
+     * Check internet.
+     *
+     * @access public
+     * @return bool
+     */
+    public function checkInternet()
+    {
+        $curl = curl_init();
+        curl_setopt($curl, CURLOPT_URL, 'https://api.zentao.net/extension-apiGetExtensions.json');
+        curl_setopt($curl, CURLOPT_TIMEOUT_MS, 1000);
+        curl_setopt($curl, CURLOPT_CONNECTTIMEOUT_MS, 1000);
+        curl_setopt($curl, CURLOPT_RETURNTRANSFER, TRUE);
+        curl_setopt($curl, CURLOPT_SSL_VERIFYPEER, FALSE);
+        curl_setopt($curl, CURLOPT_SSL_VERIFYHOST, FALSE);
+        $connected = curl_exec($curl);
+        curl_close($curl);
+
+        return (bool)$connected;
+    }
 }

From 746bb0da844318aca78218799181248106e62240 Mon Sep 17 00:00:00 2001
From: caoyanyi <caoyanyi@easycorp.ltd>
Date: Tue, 31 Jan 2023 16:14:18 +0800
Subject: [PATCH 8/8] * Modify language check.

---
 module/admin/control.php         | 7 ++++---
 module/admin/view/index.html.php | 2 +-
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/module/admin/control.php b/module/admin/control.php
index 8a7a31e2c4..bde9def349 100755
--- a/module/admin/control.php
+++ b/module/admin/control.php
@@ -36,14 +36,15 @@ class admin extends control
 
         $hasInternet = $this->admin->checkInternet();
         $clientLang  = $this->app->getClientLang();
+        $langNotCN   = common::checkNotCN();
 
         $this->view->title       = $this->lang->admin->common;
         $this->view->position[]  = $this->lang->admin->index;
-        $this->view->extensions  = $this->admin->getExtensionsByAPI('extension', strpos($clientLang, 'zh') === 0 ? 6 : 5, $hasInternet);
+        $this->view->extensions  = $this->admin->getExtensionsByAPI('extension', $langNotCN ? 5 : 6, $hasInternet);
         $this->view->patches     = $this->admin->getExtensionsByAPI('patch', 3, $hasInternet);
         $this->view->hasInternet = $hasInternet;
-        $this->view->publicClass = ($hasInternet and strpos($clientLang, 'zh') === 0) ? $this->admin->getPublicClassByAPI() : array();
-        $this->view->clientLang  = $clientLang;
+        $this->view->publicClass = ($hasInternet and !$langNotCN) ? $this->admin->getPublicClassByAPI() : array();
+        $this->view->langNotCN   = $langNotCN;
         $this->display();
     }
 
diff --git a/module/admin/view/index.html.php b/module/admin/view/index.html.php
index 921593cb0a..1688bddff6 100755
--- a/module/admin/view/index.html.php
+++ b/module/admin/view/index.html.php
@@ -71,7 +71,7 @@
       <?php endif;?>
     </div>
   </div>
-  <?php if($hasInternet and strpos($clientLang, 'zh') === 0):?>
+  <?php if($hasInternet and !$langNotCN):?>
   <div class="side panel">
     <div class="panel-title"><?php echo $lang->admin->zentaoInfo?></div>
   </div>