From fcffefadf23c59189e2ddc27765da34f8239445b Mon Sep 17 00:00:00 2001
From: "Captain.B" <bin@fit2cloud.com>
Date: Wed, 22 Jul 2020 13:35:38 +0800
Subject: [PATCH 1/4] =?UTF-8?q?refactor:=20=E4=BF=AE=E6=94=B9=E6=B2=A1?=
 =?UTF-8?q?=E6=9C=89=E8=A7=92=E8=89=B2=E7=9A=84=E7=94=A8=E6=88=B7=E7=9A=84?=
 =?UTF-8?q?=E8=A7=86=E5=9B=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 frontend/src/business/components/settings/SettingMenu.vue | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/frontend/src/business/components/settings/SettingMenu.vue b/frontend/src/business/components/settings/SettingMenu.vue
index d58d04ab40..cc3fd00952 100644
--- a/frontend/src/business/components/settings/SettingMenu.vue
+++ b/frontend/src/business/components/settings/SettingMenu.vue
@@ -29,7 +29,8 @@
         <span>{{$t('commons.workspace')}}</span>
       </template>
       <el-menu-item index="/setting/member">{{$t('commons.member')}}</el-menu-item>
-      <el-menu-item index="/setting/testcase/report/template">{{$t('test_track.plan_view.report_template')}}</el-menu-item>
+      <el-menu-item index="/setting/testcase/report/template">{{$t('test_track.plan_view.report_template')}}
+      </el-menu-item>
     </el-submenu>
 
     <el-submenu index="4">
@@ -38,7 +39,9 @@
         <span>{{$t('commons.personal_info')}}</span>
       </template>
       <el-menu-item index="/setting/personsetting">{{$t('commons.personal_setting')}}</el-menu-item>
-      <el-menu-item index="/setting/apikeys">API Keys</el-menu-item>
+      <el-menu-item v-permission="['admin', 'org_admin', 'test_manager', 'test_user', 'test_viewer']"
+                    index="/setting/apikeys">API Keys
+      </el-menu-item>
     </el-submenu>
 
   </el-menu>

From 4b11a3ff856926918a9c9219c1921f1a84725986 Mon Sep 17 00:00:00 2001
From: shiziyuan9527 <yuhao.li@fit2cloud.com>
Date: Wed, 22 Jul 2020 13:54:39 +0800
Subject: [PATCH 2/4] =?UTF-8?q?fix:=20=E6=B7=BB=E5=8A=A0=E7=94=A8=E6=88=B7?=
 =?UTF-8?q?=E6=9D=A5=E6=BA=90=E5=88=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 frontend/src/business/components/settings/system/User.vue | 1 +
 frontend/src/i18n/en-US.js                                | 3 ++-
 frontend/src/i18n/zh-CN.js                                | 3 ++-
 frontend/src/i18n/zh-TW.js                                | 3 ++-
 4 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/frontend/src/business/components/settings/system/User.vue b/frontend/src/business/components/settings/system/User.vue
index 11220863f9..b735db6b2e 100644
--- a/frontend/src/business/components/settings/system/User.vue
+++ b/frontend/src/business/components/settings/system/User.vue
@@ -32,6 +32,7 @@
             <span>{{ scope.row.createTime | timestampFormatDate }}</span>
           </template>
         </el-table-column>
+        <el-table-column prop="source" :label="$t('user.source')"/>
         <el-table-column :label="$t('commons.operating')">
           <template v-slot:default="scope">
             <ms-table-operator @editClick="edit(scope.row)" @deleteClick="del(scope.row)">
diff --git a/frontend/src/i18n/en-US.js b/frontend/src/i18n/en-US.js
index cc4c7c6880..143faa00b7 100644
--- a/frontend/src/i18n/en-US.js
+++ b/frontend/src/i18n/en-US.js
@@ -224,7 +224,8 @@ export default {
     email_format_is_incorrect: 'Email format is incorrect',
     delete_confirm: 'Are you sure you want to delete this User?',
     apikey_delete_confirm: 'Are you sure you want to delete this API Key?',
-    input_id_placeholder: 'Please enter ID (only supports numbers and English letters)'
+    input_id_placeholder: 'Please enter ID (only supports numbers and English letters)',
+    source: 'Source'
   },
   role: {
     please_choose_role: 'Please Choose Role',
diff --git a/frontend/src/i18n/zh-CN.js b/frontend/src/i18n/zh-CN.js
index b413d578b5..dc543fe090 100644
--- a/frontend/src/i18n/zh-CN.js
+++ b/frontend/src/i18n/zh-CN.js
@@ -222,7 +222,8 @@ export default {
     email_format_is_incorrect: '邮箱格式不正确',
     delete_confirm: '这个用户确定要删除吗?',
     apikey_delete_confirm: '这个 API Key 确定要删除吗?',
-    input_id_placeholder: '请输入ID (只支持数字、英文字母)'
+    input_id_placeholder: '请输入ID (只支持数字、英文字母)',
+    source: '用户来源'
   },
   role: {
     please_choose_role: '请选择角色',
diff --git a/frontend/src/i18n/zh-TW.js b/frontend/src/i18n/zh-TW.js
index 4d943726c4..bf4f432a6c 100644
--- a/frontend/src/i18n/zh-TW.js
+++ b/frontend/src/i18n/zh-TW.js
@@ -221,7 +221,8 @@ export default {
     email_format_is_incorrect: '郵箱格式不正確',
     delete_confirm: '這個用戶確定要刪除嗎?',
     apikey_delete_confirm: '這個 API Key 確定要刪除嗎?',
-    input_id_placeholder: '請輸入ID (只支持數字、英文字母)'
+    input_id_placeholder: '請輸入ID (只支持數字、英文字母)',
+    source: '用戶來源'
   },
   role: {
     please_choose_role: '請選擇角色',

From 1f09dbb24a5bb60d58f152109fc7a73863a889dc Mon Sep 17 00:00:00 2001
From: "Captain.B" <bin@fit2cloud.com>
Date: Wed, 22 Jul 2020 13:57:53 +0800
Subject: [PATCH 3/4] =?UTF-8?q?refactor:=20=E8=B0=83=E6=95=B4session?=
 =?UTF-8?q?=E8=BF=87=E6=9C=9F=E6=97=B6=E9=97=B4=E4=B8=BA=E5=8F=AF=E9=85=8D?=
 =?UTF-8?q?=E7=BD=AE=EF=BC=8C=E9=BB=98=E8=AE=A41800s?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/io/metersphere/config/ShiroConfig.java    | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/backend/src/main/java/io/metersphere/config/ShiroConfig.java b/backend/src/main/java/io/metersphere/config/ShiroConfig.java
index 92d723b810..f668f89d8e 100644
--- a/backend/src/main/java/io/metersphere/config/ShiroConfig.java
+++ b/backend/src/main/java/io/metersphere/config/ShiroConfig.java
@@ -14,11 +14,13 @@ import org.apache.shiro.web.session.mgt.DefaultWebSessionManager;
 import org.springframework.aop.framework.autoproxy.DefaultAdvisorAutoProxyCreator;
 import org.springframework.boot.web.servlet.FilterRegistrationBean;
 import org.springframework.context.ApplicationContext;
+import org.springframework.context.EnvironmentAware;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.DependsOn;
 import org.springframework.context.event.ContextRefreshedEvent;
 import org.springframework.context.event.EventListener;
+import org.springframework.core.env.Environment;
 
 import javax.servlet.DispatcherType;
 import javax.servlet.Filter;
@@ -27,7 +29,8 @@ import java.util.Map;
 import java.util.Objects;
 
 @Configuration
-public class ShiroConfig {
+public class ShiroConfig implements EnvironmentAware {
+    private Environment env;
 
     @Bean
     public ShiroFilterFactoryBean getShiroFilterFactoryBean(DefaultWebSecurityManager sessionManager) {
@@ -115,9 +118,11 @@ public class ShiroConfig {
 
     @Bean
     public SessionManager sessionManager(MemoryConstrainedCacheManager memoryConstrainedCacheManager) {
+        Long sessionTimeout = env.getProperty("session.timeout", Long.class, 1800L); // 默认1800s, 半个小时
+
         DefaultWebSessionManager sessionManager = new DefaultWebSessionManager();
         sessionManager.setSessionIdUrlRewritingEnabled(false);
-        sessionManager.setGlobalSessionTimeout(1800000L);
+        sessionManager.setGlobalSessionTimeout(sessionTimeout * 1000);// 超时时间ms
         sessionManager.setDeleteInvalidSessions(true);
         sessionManager.setSessionValidationSchedulerEnabled(true);
         SimpleCookie sessionIdCookie = new SimpleCookie();
@@ -137,4 +142,9 @@ public class ShiroConfig {
         ShiroDBRealm shiroDBRealm = (ShiroDBRealm) context.getBean("shiroDBRealm");
         ((DefaultWebSecurityManager) context.getBean("securityManager")).setRealm(shiroDBRealm);
     }
+
+    @Override
+    public void setEnvironment(Environment environment) {
+        this.env = environment;
+    }
 }

From 4bd14608a32e016a226f531f707f5aa23ec810d4 Mon Sep 17 00:00:00 2001
From: "Captain.B" <bin@fit2cloud.com>
Date: Wed, 22 Jul 2020 14:50:35 +0800
Subject: [PATCH 4/4] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E6=80=A7=E8=83=BD?=
 =?UTF-8?q?=E6=B5=8B=E8=AF=95=E6=97=A5=E5=BF=97=E6=9F=A5=E7=9C=8B=E6=97=B6?=
 =?UTF-8?q?=E7=9A=84=20duplicate=20key=20=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/performance/report/components/LogDetails.vue     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frontend/src/business/components/performance/report/components/LogDetails.vue b/frontend/src/business/components/performance/report/components/LogDetails.vue
index 3dcc9e8fe0..6c2307328b 100644
--- a/frontend/src/business/components/performance/report/components/LogDetails.vue
+++ b/frontend/src/business/components/performance/report/components/LogDetails.vue
@@ -3,7 +3,7 @@
     <el-tabs type="border-card" :stretch="true">
       <el-tab-pane v-for="item in resource" :key="item.resourceId" :label="item.resourceName" class="logging-content">
         <ul class="infinite-list" v-infinite-scroll="load(item.resourceId)" infinite-scroll-disabled="disabled">
-          <li class="infinite-list-item" v-for="log in logContent" :key="log.id">{{ log.content }}</li>
+          <li class="infinite-list-item" v-for="(log, index) in logContent" :key="index">{{ log.content }}</li>
         </ul>
         <el-link type="primary" @click="downloadLogFile(item)">{{$t('load_test.download_log_file')}}</el-link>
       </el-tab-pane>