Skip to content

Commit 13db7e3

Browse files
Scorrt-2021Scorrt-2021
committed
Merge branch 'refs/heads/develop-v3' into master-v3
2 parents d1adc2d + 12024e5 commit 13db7e3

15 files changed

Lines changed: 90 additions & 52 deletions

File tree

‎diboot-admin-ui/src/layout/header/index.vue‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ const enableI18n = import.meta.env.VITE_APP_ENABLE_I18N === 'true'
4040
<slot name="topNav" />
4141
</div>
4242
<menu-search class="item" />
43-
<div class="item">
43+
<div v-if="router.hasRoute('ChatAI')" class="item">
4444
<el-tooltip effect="dark" :content="$t('layout.header.chatAi')" placement="bottom" :show-after="300">
4545
<el-icon :size="24" style="color: #21ba45">
4646
<icon name="Local:ChatAi" @click="openChatAi" />

‎diboot-admin-ui/src/views/org-structure/position/List.vue‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<script setup lang="ts" name="Position">
2-
import { Search, Plus } from '@element-plus/icons-vue'
2+
import { Search, Plus, ArrowDown } from '@element-plus/icons-vue'
33
import type { Position } from './type'
44
import Detail from './Detail.vue'
55
import Form from './Form.vue'

‎diboot-admin-ui/src/views/system/role/List.vue‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,6 @@ const { queryParam, onSearch, resetFilter, getList, loading, dataList, paginatio
1010
1111
getList()
1212
13-
// 搜索区折叠
14-
const searchState = ref(false)
15-
1613
const formRef = ref()
1714
const openForm = (id?: string) => {
1815
formRef.value?.open(id)

‎diboot-admin-ui/src/views/system/schedule-job/List.vue‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,9 @@ const logListPermission = checkPermission('logList')
7979
<el-dropdown-item v-if="updatePermission" @click="openForm(item.id)">
8080
{{ $t('operation.update') }}
8181
</el-dropdown-item>
82-
<el-dropdown-item v-if="logListPermission" @click="openLog(item.id)"> 日志 </el-dropdown-item>
82+
<el-dropdown-item v-if="logListPermission" @click="openLog(item.id)">
83+
{{ $t('scheduleJobLog.title') }}
84+
</el-dropdown-item>
8385
<el-dropdown-item v-if="deletePermission" divided @click="remove(item.id)">
8486
{{ $t('operation.delete') }}
8587
</el-dropdown-item>

‎diboot-admin-ui/src/views/system/schedule-job/locales/en.ts‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,14 +26,20 @@ const en: Locale = {
2626
},
2727
scheduleJobLog: {
2828
startTime: 'Start Time',
29+
startTimeAlias: 'Execute Time',
2930
endTime: 'End Time',
3031
runStatus: 'Execution Status',
3132
triggerMode: 'Trigger Mode',
3233
elapsedSeconds: 'Elapsed Time',
3334
paramJson: 'Parameters',
3435
executeMsg: 'Execution Result Information',
3536
success: 'Success',
36-
fail: 'Failure'
37+
fail: 'Failure',
38+
title: 'Job Log',
39+
triggerModeOptions: {
40+
auto: 'Auto',
41+
manual: 'Manual'
42+
}
3743
}
3844
}
3945

‎diboot-admin-ui/src/views/system/schedule-job/locales/zhCN.ts‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,14 +25,20 @@ const zhCN = {
2525
},
2626
scheduleJobLog: {
2727
startTime: '开始时间',
28+
startTimeAlias: '执行时间',
2829
endTime: '结束时间',
2930
runStatus: '执行状态',
3031
triggerMode: '触发方式',
3132
elapsedSeconds: '耗时',
3233
paramJson: '参数',
3334
executeMsg: '执行结果信息',
3435
success: '成功',
35-
fail: '失败'
36+
fail: '失败',
37+
title: '日志',
38+
triggerModeOptions: {
39+
auto: '自动',
40+
manual: '手动'
41+
}
3642
}
3743
}
3844

‎diboot-admin-ui/src/views/system/schedule-job/log/List.vue‎

Lines changed: 43 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<script setup lang="ts">
2-
import { Refresh, Search } from '@element-plus/icons-vue'
2+
import { ArrowUp, ArrowDown, Search } from '@element-plus/icons-vue'
33
import type { ScheduleJobLog } from '../type'
44
import Detail from './Detail.vue'
55
@@ -47,68 +47,74 @@ const openDetail = (id: string) => {
4747
</script>
4848

4949
<template>
50-
<el-drawer v-model="visible" title="日志" size="850px">
50+
<el-drawer v-model="visible" :title="$t('scheduleJobLog.title')" size="850px">
5151
<div class="list-page">
52+
<el-header>
53+
<el-space wrap class="list-operation">
54+
<el-button v-has-permission="'logDelete'" @click="batchRemove(selectedKeys)">{{
55+
$t('operation.batchDelete')
56+
}}</el-button>
57+
<el-space>
58+
<el-select
59+
v-model="queryParam.runStatus"
60+
:label="$t('scheduleJobLog.runStatus')"
61+
clearable
62+
@change="onSearch"
63+
>
64+
<el-option :label="$t('scheduleJobLog.success')" value="S" />
65+
<el-option :label="$t('scheduleJobLog.fail')" value="F" />
66+
</el-select>
67+
<el-button :icon="Search" type="primary" @click="onSearch">{{ $t('operation.search') }}</el-button>
68+
<el-button :title="$t('title.reset')" @click="resetFilter">{{ $t('operation.reset') }}</el-button>
69+
<el-button
70+
:icon="searchState ? ArrowUp : ArrowDown"
71+
:title="searchState ? $t('searchState.up') : $t('searchState.down')"
72+
@click="searchState = !searchState"
73+
/>
74+
</el-space>
75+
</el-space>
76+
</el-header>
77+
5278
<el-form v-show="searchState" label-width="80px" class="list-search" @submit.prevent>
5379
<el-row :gutter="18">
5480
<el-col :md="12" :sm="24">
55-
<el-form-item label="执行结果">
56-
<el-select v-model="queryParam.runStatus" clearable @change="onSearch">
57-
<el-option label="成功" value="S" />
58-
<el-option label="失败" value="F" />
59-
</el-select>
60-
</el-form-item>
61-
</el-col>
62-
<el-col :md="12" :sm="24">
63-
<el-form-item label="触发方式">
81+
<el-form-item :label="$t('scheduleJobLog.triggerMode')">
6482
<el-select v-model="queryParam.triggerMode" clearable @change="onSearch">
65-
<el-option label="自动" value="AUTO" />
66-
<el-option label="手动" value="MANUAL" />
83+
<el-option :label="$t('scheduleJobLog.triggerModeOptions.auto')" value="AUTO" />
84+
<el-option :label="$t('scheduleJobLog.triggerModeOptions.manual')" value="MANUAL" />
6785
</el-select>
6886
</el-form-item>
6987
</el-col>
7088
<el-col :md="12" :sm="24">
71-
<el-form-item label="执行时间">
89+
<el-form-item :label="$t('scheduleJobLog.startTimeAlias')">
7290
<date-range
7391
:model-value="dateRangeQuery.startTime as [string, string]"
7492
@update:model-value="dateRangeQuery.startTime = $event as [string, string]"
7593
@change="onSearch"
7694
/>
7795
</el-form-item>
7896
</el-col>
79-
<el-col :md="12" :sm="24" style="margin-left: auto">
80-
<el-form-item>
81-
<el-button type="primary" @click="onSearch">{{ $t('operation.search') }}</el-button>
82-
<el-button @click="resetFilter">{{ $t('operation.reset') }}</el-button>
83-
</el-form-item>
84-
</el-col>
8597
</el-row>
8698
</el-form>
87-
<el-header>
88-
<el-space wrap class="list-operation">
89-
<el-button v-has-permission="'logDelete'" @click="batchRemove(selectedKeys)">批量删除</el-button>
90-
<el-space>
91-
<el-button :icon="Refresh" circle @click="getList()" />
92-
<el-button :icon="Search" circle @click="searchState = !searchState" />
93-
</el-space>
94-
</el-space>
95-
</el-header>
99+
96100
<el-table
97101
ref="tableRef"
98102
v-loading="loading"
99103
:data="dataList"
100104
height="100%"
105+
stripe
106+
style="border-top: 1px solid var(--el-border-color-lighter)"
101107
@selection-change="(arr: ScheduleJobLog[]) => (selectedKeys = arr.map(e => e.id))"
102108
>
103109
<el-table-column type="selection" width="55" />
104-
<el-table-column prop="startTime" label="执行时间" align="center" width="165" />
105-
<el-table-column prop="endTime" label="结束时间" align="center" width="165" />
106-
<el-table-column prop="elapsedSeconds" label="耗时（s）" align="right" width="100" />
107-
<el-table-column prop="triggerModeLabel" align="center" label="触发方式" />
108-
<el-table-column prop="runStatus" align="center" label="执行结果">
110+
<el-table-column prop="startTime" :label="$t('scheduleJobLog.startTimeAlias')" align="center" width="140" />
111+
<el-table-column prop="endTime" :label="$t('scheduleJobLog.endTime')" align="center" width="140" />
112+
<el-table-column prop="elapsedSeconds" :label="$t('scheduleJobLog.elapsedSeconds')" align="right" width="120" />
113+
<el-table-column prop="triggerModeLabel" align="center" :label="$t('scheduleJobLog.triggerMode')" />
114+
<el-table-column prop="runStatus" align="center" :label="$t('scheduleJobLog.runStatus')">
109115
<template #default="{ row }">
110-
<el-tag v-if="row.runStatus === 'S'">成功</el-tag>
111-
<el-tag v-else type="danger">失败</el-tag>
116+
<el-tag v-if="row.runStatus === 'S'">{{ $t('scheduleJobLog.success') }}</el-tag>
117+
<el-tag v-else type="danger">{{ $t('scheduleJobLog.fail') }}</el-tag>
112118
</template>
113119
</el-table-column>
114120
<el-table-column :label="$t('operation.label')" align="center" width="130" fixed="right">
@@ -117,7 +123,7 @@ const openDetail = (id: string) => {
117123
>{{ $t('title.detail') }}
118124
</el-button>
119125
<el-button v-has-permission="'logDelete'" text bg type="primary" size="small" @click="remove(row.id)">
120-
删除
126+
{{ $t('operation.delete') }}
121127
</el-button>
122128
</template>
123129
</el-table-column>

‎diboot-ai-starter/src/main/java/com/diboot/ai/config/DefaultAiConfigurator.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,6 @@
2727
public class DefaultAiConfigurator implements AiConfigurator{
2828
@Override
2929
public void configure(AiConfiguration aiConfiguration) {
30-
log.info("---------> enabled DefaultAiConfigurator");
30+
log.info("启用 DefaultAiConfigurator");
3131
}
3232
}

‎diboot-ai-starter/src/main/java/com/diboot/ai/init/AiPluginInitializer.java‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,12 @@ private synchronized void insertInitData() {
6161
// 初始化chat ai相关资源
6262
if (resourcePermissionService != null && !resourcePermissionService.exists(IamResource::getResourceCode, "ChatAI")) {
6363
List<IamResourceListVO> permissionListVOs = new ArrayList<>();
64-
IamResourceListVO chatAIPermission = (IamResourceListVO) new IamResourceListVO().setChildren(new ArrayList<>()).setParentId("0").setDisplayType("MENU").setDisplayName("ChatAI").setDisplayNameI18n("Resource.ChatAI").setRoutePath("chat-ai").setResourceCode("ChatAI").setPermissionCode("").setMeta("{\"icon\":\"Element:Cpu\",\"componentPath\":\"@/views/chat-ai/index.vue\",\"keepAlive\":false,\"hidden\":true}").setSortId(90L);
64+
IamResourceListVO chatAIPermission = (IamResourceListVO) new IamResourceListVO()
65+
.setChildren(new ArrayList<>())
66+
.setParentId("0").setDisplayType("MENU").setDisplayName("ChatAI").setDisplayNameI18n("Resource.ChatAI")
67+
.setRoutePath("chat-ai").setResourceCode("ChatAI").setPermissionCode("AiSession:read,AiSession:write,AiSessionRecord:read,AiSessionRecord:write")
68+
.setMeta("{\"icon\":\"Element:Cpu\",\"componentPath\":\"@/views/chat-ai/index.vue\",\"keepAlive\":false,\"hidden\":true}")
69+
.setSortId(90L);
6570
permissionListVOs.add(chatAIPermission);
6671
// 插入多层级资源权限初始数据
6772
try {

‎diboot-ai-starter/src/main/java/com/diboot/starter/AiAutoConfig.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ public class AiAutoConfig implements WebMvcConfigurer {
5353
private AiProperties aiProperties;
5454

5555
public AiAutoConfig() {
56-
log.info("初始化 AI 内核 自动配置");
56+
log.info("初始化 AI 组件自动配置");
5757
}
5858

5959
/**

0 commit comments

Comments
 (0)