diff --git a/.env.example b/.env.example index 2d5f4ff..c91c8cd 100644 --- a/.env.example +++ b/.env.example @@ -71,7 +71,6 @@ JIRA_PASSWORD= JIRA_API_TOKEN= JIRA_AUTH_TYPE=basic JIRA_TIMEOUT=30 -JIRA_DEFAULT_USER= # CRM Slave Database Configuration CRMSLAVE_DB_HOST=127.0.0.1 diff --git a/config/jira.php b/config/jira.php index c8f1ae3..295e8c5 100644 --- a/config/jira.php +++ b/config/jira.php @@ -27,6 +27,6 @@ return [ 'AM' => 'AM', ], - // 默认用户(如果未指定) - 'default_user' => env('JIRA_DEFAULT_USER'), + // 默认查询用户(如果未指定,默认使用 JIRA_USERNAME) + 'default_user' => env('JIRA_USERNAME'), ]; diff --git a/resources/js/components/admin/AdminDashboard.vue b/resources/js/components/admin/AdminDashboard.vue index 9ad29ff..32914bc 100644 --- a/resources/js/components/admin/AdminDashboard.vue +++ b/resources/js/components/admin/AdminDashboard.vue @@ -40,16 +40,7 @@ /> -
-
- - - - -

系统设置

-

此功能正在开发中...

-
-
+
@@ -72,6 +63,7 @@ import JiraWorklog from '../jira/JiraWorklog.vue'; import MessageSync from '../message-sync/MessageSync.vue'; import EventConsumerSync from '../message-sync/EventConsumerSync.vue'; import MessageDispatch from '../message-sync/MessageDispatch.vue'; +import SystemSettings from './SystemSettings.vue'; export default { name: 'AdminDashboard', @@ -82,7 +74,8 @@ export default { JiraWorklog, MessageSync, EventConsumerSync, - MessageDispatch + MessageDispatch, + SystemSettings }, data() { return { diff --git a/resources/js/components/admin/SystemSettings.vue b/resources/js/components/admin/SystemSettings.vue new file mode 100644 index 0000000..2131475 --- /dev/null +++ b/resources/js/components/admin/SystemSettings.vue @@ -0,0 +1,174 @@ + + + diff --git a/resources/js/components/jira/JiraWorklog.vue b/resources/js/components/jira/JiraWorklog.vue index 9dca889..84e7f8e 100644 --- a/resources/js/components/jira/JiraWorklog.vue +++ b/resources/js/components/jira/JiraWorklog.vue @@ -274,6 +274,8 @@