#add jira username config

2025-12-18 14:25:17 +08:00
parent 3f27eb07c2
commit c4fb6e1b7b
7 changed files with 229 additions and 18 deletions
--- 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
--- 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'),
 ];
--- a/resources/js/components/admin/AdminDashboard.vue
+++ b/resources/js/components/admin/AdminDashboard.vue
@@ -40,16 +40,7 @@
    />

    <!-- 系统设置页面 -->
-    <div v-else-if="currentPage === 'settings'" class="bg-white rounded-xl shadow-sm border border-gray-200 p-8">
-      <div class="text-center py-12">
-        <svg class="w-16 h-16 text-gray-300 mx-auto mb-4" fill="none" stroke="currentColor" viewBox="0 0 24 24">
-          <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M10.325 4.317c.426-1.756 2.924-1.756 3.35 0a1.724 1.724 0 002.573 1.066c1.543-.94 3.31.826 2.37 2.37a1.724 1.724 0 001.065 2.572c1.756.426 1.756 2.924 0 3.35a1.724 1.724 0 00-1.066 2.573c.94 1.543-.826 3.31-2.37 2.37a1.724 1.724 0 00-2.572 1.065c-.426 1.756-2.924 1.756-3.35 0a1.724 1.724 0 00-2.573-1.066c-1.543.94-3.31-.826-2.37-2.37a1.724 1.724 0 00-1.065-2.572c-1.756-.426-1.756-2.924 0-3.35a1.724 1.724 0 001.066-2.573c-.94-1.543.826-3.31 2.37-2.37.996.608 2.296.07 2.572-1.065z"/>
-          <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M15 12a3 3 0 11-6 0 3 3 0 016 0z"/>
-        </svg>
-        <h3 class="text-lg font-medium text-gray-900 mb-2">系统设置</h3>
-        <p class="text-gray-500">此功能正在开发中...</p>
-      </div>
-    </div>
+    <system-settings v-else-if="currentPage === 'settings'" />

    <!-- 操作日志页面 -->
    <div v-else-if="currentPage === 'logs'" class="bg-white rounded-xl shadow-sm border border-gray-200 p-8">
@@ -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 {
--- a/resources/js/components/admin/SystemSettings.vue
+++ b/resources/js/components/admin/SystemSettings.vue
@@ -0,0 +1,174 @@
+<template>
+  <div class="bg-white rounded-xl shadow-sm border border-gray-200 p-8">
+    <div class="mb-6">
+      <h3 class="text-lg font-medium text-gray-900">系统设置</h3>
+      <p class="text-gray-500 mt-1">仅对当前浏览器生效的本地配置。</p>
+    </div>
+
+    <div class="space-y-6">
+      <div class="border border-gray-200 rounded-lg p-6">
+        <div class="flex items-start justify-between gap-4">
+          <div>
+            <h4 class="text-base font-semibold text-gray-900">JIRA</h4>
+            <p class="text-sm text-gray-500 mt-1">
+              设置“JIRA 默认查询用户”（仅本地浏览器生效）。填写后将优先用于周报/工时等页面的默认用户名。
+            </p>
+          </div>
+          <div v-if="jira.loading" class="text-sm text-gray-400">加载中...</div>
+        </div>
+
+        <div class="mt-6 grid grid-cols-1 md:grid-cols-2 gap-4">
+          <div>
+            <label class="block text-sm font-medium text-gray-700 mb-2">默认查询用户（本地）</label>
+            <input
+              type="text"
+              v-model="jira.localDefaultQueryUserDraft"
+              class="w-full px-3 py-2 border border-gray-300 rounded-md focus:outline-none focus:ring-2 focus:ring-blue-500"
+              placeholder="例如: your.name"
+            />
+            <p class="text-xs text-gray-500 mt-2">留空并保存（或点击清除）将使用服务端默认值。</p>
+          </div>
+
+          <div class="space-y-3">
+            <div class="bg-gray-50 border border-gray-200 rounded-md p-4">
+              <div class="text-sm text-gray-700">
+                <div class="flex items-center justify-between gap-2">
+                  <span class="text-gray-500">服务端默认查询用户</span>
+                  <span class="font-mono text-gray-900">{{ jira.serverDefaultUser || '-' }}</span>
+                </div>
+                <div class="flex items-center justify-between gap-2 mt-2">
+                  <span class="text-gray-500">当前生效</span>
+                  <span class="font-mono text-gray-900">{{ effectiveDefaultQueryUser || '-' }}</span>
+                </div>
+                <div class="flex items-center justify-between gap-2 mt-2">
+                  <span class="text-gray-500">JIRA Host</span>
+                  <span class="font-mono text-gray-900">{{ jira.host || '-' }}</span>
+                </div>
+              </div>
+            </div>
+
+            <div class="flex gap-2">
+              <button
+                @click="save"
+                class="px-4 py-2 bg-blue-600 text-white rounded-md hover:bg-blue-700 disabled:opacity-50 disabled:cursor-not-allowed"
+                :disabled="jira.saving"
+              >
+                {{ jira.saving ? '保存中...' : '保存' }}
+              </button>
+              <button
+                @click="clear"
+                class="px-4 py-2 bg-gray-100 text-gray-700 rounded-md hover:bg-gray-200 disabled:opacity-50 disabled:cursor-not-allowed"
+                :disabled="jira.saving"
+              >
+                清除
+              </button>
+            </div>
+
+            <div v-if="jira.message" class="text-sm text-green-700 bg-green-50 border border-green-200 rounded-md px-3 py-2">
+              {{ jira.message }}
+            </div>
+            <div v-if="jira.error" class="text-sm text-red-700 bg-red-50 border border-red-200 rounded-md px-3 py-2">
+              {{ jira.error }}
+            </div>
+          </div>
+        </div>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+import {
+  clearJiraDefaultQueryUserOverride,
+  getJiraDefaultQueryUserOverride,
+  resolveJiraDefaultQueryUser,
+  setJiraDefaultQueryUserOverride
+} from '../../utils/jiraQueryUser';
+
+export default {
+  name: 'SystemSettings',
+  data() {
+    return {
+      jira: {
+        loading: false,
+        saving: false,
+        localDefaultQueryUserDraft: '',
+        localDefaultQueryUserSaved: '',
+        serverDefaultUser: '',
+        host: '',
+        message: '',
+        error: ''
+      }
+    };
+  },
+  computed: {
+    effectiveDefaultQueryUser() {
+      return (this.jira.localDefaultQueryUserSaved || '').trim() || resolveJiraDefaultQueryUser(this.jira.serverDefaultUser);
+    }
+  },
+  async mounted() {
+    const savedOverride = getJiraDefaultQueryUserOverride();
+    this.jira.localDefaultQueryUserDraft = savedOverride;
+    this.jira.localDefaultQueryUserSaved = savedOverride;
+    await this.loadServerConfig();
+  },
+  methods: {
+    async loadServerConfig() {
+      this.jira.loading = true;
+      this.jira.error = '';
+
+      try {
+        const response = await fetch('/api/jira/config');
+        const data = await response.json();
+
+        if (!data.success) {
+          this.jira.error = data.message || '获取配置失败';
+          return;
+        }
+
+        this.jira.serverDefaultUser = (data.data.default_user || '').trim();
+        this.jira.host = (data.data.host || '').trim();
+      } catch (error) {
+        this.jira.error = error.message;
+      } finally {
+        this.jira.loading = false;
+      }
+    },
+
+    async save() {
+      this.jira.saving = true;
+      this.jira.message = '';
+      this.jira.error = '';
+
+      try {
+        setJiraDefaultQueryUserOverride(this.jira.localDefaultQueryUserDraft);
+        const savedOverride = getJiraDefaultQueryUserOverride();
+        this.jira.localDefaultQueryUserSaved = savedOverride;
+        this.jira.localDefaultQueryUserDraft = savedOverride;
+        this.jira.message = '已保存（仅本地浏览器生效）';
+      } catch (error) {
+        this.jira.error = error.message;
+      } finally {
+        this.jira.saving = false;
+      }
+    },
+
+    async clear() {
+      this.jira.saving = true;
+      this.jira.message = '';
+      this.jira.error = '';
+
+      try {
+        clearJiraDefaultQueryUserOverride();
+        this.jira.localDefaultQueryUserDraft = '';
+        this.jira.localDefaultQueryUserSaved = '';
+        this.jira.message = '已清除，将使用服务端默认值';
+      } catch (error) {
+        this.jira.error = error.message;
+      } finally {
+        this.jira.saving = false;
+      }
+    }
+  }
+};
+</script>
--- a/resources/js/components/jira/JiraWorklog.vue
+++ b/resources/js/components/jira/JiraWorklog.vue
@@ -274,6 +274,8 @@
 </template>

 <script>
+import { resolveJiraDefaultQueryUser } from '../../utils/jiraQueryUser';
+
 export default {
  name: 'JiraWorklog',
  data() {
@@ -348,12 +350,14 @@ export default {
  },
  methods: {
    async loadDefaultUser() {
+      this.workLogs.username = resolveJiraDefaultQueryUser('');
+
      try {
        const response = await fetch('/api/jira/config');
        const data = await response.json();

-        if (data.success && data.data.default_user) {
-          this.workLogs.username = data.data.default_user;
+        if (data.success) {
+          this.workLogs.username = resolveJiraDefaultQueryUser(data.data.default_user);
        }
      } catch (error) {
        console.error('获取默认用户失败:', error);
--- a/resources/js/components/jira/WeeklyReport.vue
+++ b/resources/js/components/jira/WeeklyReport.vue
@@ -65,6 +65,8 @@
 </template>

 <script>
+import { resolveJiraDefaultQueryUser } from '../../utils/jiraQueryUser';
+
 export default {
  name: 'WeeklyReport',
  data() {
@@ -84,12 +86,14 @@ export default {
  },
  methods: {
    async loadDefaultUser() {
+      this.weeklyReport.username = resolveJiraDefaultQueryUser('');
+
      try {
        const response = await fetch('/api/jira/config');
        const data = await response.json();

-        if (data.success && data.data.default_user) {
-          this.weeklyReport.username = data.data.default_user;
+        if (data.success) {
+          this.weeklyReport.username = resolveJiraDefaultQueryUser(data.data.default_user);
        }
      } catch (error) {
        console.error('获取默认用户失败:', error);
--- a/resources/js/utils/jiraQueryUser.js
+++ b/resources/js/utils/jiraQueryUser.js
@@ -0,0 +1,37 @@
+const STORAGE_KEY = 'toolbox:jira.defaultQueryUser';
+
+export function getJiraDefaultQueryUserOverride() {
+  try {
+    return (window.localStorage.getItem(STORAGE_KEY) || '').trim();
+  } catch (error) {
+    return '';
+  }
+}
+
+export function setJiraDefaultQueryUserOverride(value) {
+  const trimmedValue = (value || '').trim();
+
+  if (!trimmedValue) {
+    clearJiraDefaultQueryUserOverride();
+    return;
+  }
+
+  try {
+    window.localStorage.setItem(STORAGE_KEY, trimmedValue);
+  } catch (error) {
+    // ignore
+  }
+}
+
+export function clearJiraDefaultQueryUserOverride() {
+  try {
+    window.localStorage.removeItem(STORAGE_KEY);
+  } catch (error) {
+    // ignore
+  }
+}
+
+export function resolveJiraDefaultQueryUser(serverDefaultUser) {
+  return getJiraDefaultQueryUserOverride() || (serverDefaultUser || '').trim();
+}
+