WJB
/
ai-manus
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: WJB:a03ef97f78bb0cc01e2240686a8567e4b5187be1
Branches Tags
WJB:main
WJB:dev-wen-file-tree
WJB:dev-wen
WJB:dev-wuhan
..
compare: WJB:fd10dd061b41d0ba3d0ef43acb47069267f273e8
Branches Tags
WJB:main
WJB:dev-wen-file-tree
WJB:dev-wen
WJB:dev-wuhan

No commits in common. "a03ef97f78bb0cc01e2240686a8567e4b5187be1" and "fd10dd061b41d0ba3d0ef43acb47069267f273e8" have entirely different histories.
a03ef97f78 ... fd10dd061b

37 changed files with 2859 additions and 3677 deletions
Show Stats Expand all files Collapse all files

91
.idea/workspace.xml
View File

@ -1,91 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="AutoImportSettings">
<option name="autoReloadType" value="SELECTIVE" />
</component>
<component name="ChangeListManager">
<list default="true" id="e154df99-7110-436b-8d6d-6f9500ad8711" name="Changes" comment="">
<change beforePath="$PROJECT_DIR$/web-server/common/pom.xml" beforeDir="false" afterPath="$PROJECT_DIR$/web-server/common/pom.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/web-server/eureka-server/pom.xml" beforeDir="false" afterPath="$PROJECT_DIR$/web-server/eureka-server/pom.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/web-server/face-proc/pom.xml" beforeDir="false" afterPath="$PROJECT_DIR$/web-server/face-proc/pom.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/web-server/infrastructure/pom.xml" beforeDir="false" afterPath="$PROJECT_DIR$/web-server/infrastructure/pom.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/web-server/zuul-server/pom.xml" beforeDir="false" afterPath="$PROJECT_DIR$/web-server/zuul-server/pom.xml" afterDir="false" />
</list>
<option name="SHOW_DIALOG" value="false" />
<option name="HIGHLIGHT_CONFLICTS" value="true" />
<option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
<option name="LAST_RESOLUTION" value="IGNORE" />
</component>
<component name="Git.Settings">
<option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
</component>
<component name="KubernetesApiPersistence">{}</component>
<component name="KubernetesApiProvider">{
&quot;isMigrated&quot;: true
}</component>
<component name="MavenImportPreferences">
<option name="generalSettings">
<MavenGeneralSettings>
<option name="customMavenHome" value="D:\maven\apache-maven-3.9.9-bin\apache-maven-3.9.9" />
<option name="mavenHomeTypeForPersistence" value="CUSTOM" />
<option name="userSettingsFile" value="D:\maven\apache-maven-3.9.9-bin\apache-maven-3.9.9\conf\settings.xml" />
</MavenGeneralSettings>
</option>
</component>
<component name="ProjectColorInfo">{
&quot;associatedIndex&quot;: 5
}</component>
<component name="ProjectId" id="30D1KsY0Uz8nStNA6nLXC6ttZ19" />
<component name="ProjectViewState">
<option name="hideEmptyMiddlePackages" value="true" />
<option name="showLibraryContents" value="true" />
</component>
<component name="PropertiesComponent">{
&quot;keyToString&quot;: {
&quot;ModuleVcsDetector.initialDetectionPerformed&quot;: &quot;true&quot;,
&quot;RunOnceActivity.ShowReadmeOnStart&quot;: &quot;true&quot;,
&quot;RunOnceActivity.git.unshallow&quot;: &quot;true&quot;,
&quot;git-widget-placeholder&quot;: &quot;main&quot;,
&quot;last_opened_file_path&quot;: &quot;D:/xiaotieAI/ai-manus&quot;,
&quot;node.js.detected.package.eslint&quot;: &quot;true&quot;,
&quot;node.js.detected.package.stylelint&quot;: &quot;true&quot;,
&quot;node.js.detected.package.tslint&quot;: &quot;true&quot;,
&quot;node.js.selected.package.eslint&quot;: &quot;(autodetect)&quot;,
&quot;node.js.selected.package.stylelint&quot;: &quot;&quot;,
&quot;node.js.selected.package.tslint&quot;: &quot;(autodetect)&quot;,
&quot;nodejs_package_manager_path&quot;: &quot;npm&quot;,
&quot;project.structure.last.edited&quot;: &quot;SDKs&quot;,
&quot;project.structure.proportion&quot;: &quot;0.0&quot;,
&quot;project.structure.side.proportion&quot;: &quot;0.2&quot;,
&quot;settings.editor.selected.configurable&quot;: &quot;reference.projectsettings.compiler.javacompiler&quot;,
&quot;vue.rearranger.settings.migration&quot;: &quot;true&quot;
}
}</component>
<component name="SharedIndexes">
<attachedChunks>
<set>
<option value="bundled-jdk-9823dce3aa75-fbdcb00ec9e3-intellij.indexing.shared.core-IU-251.23774.435" />
<option value="bundled-js-predefined-d6986cc7102b-f27c65a3e318-JavaScript-IU-251.23774.435" />
</set>
</attachedChunks>
</component>
<component name="TaskManager">
<task active="true" id="Default" summary="Default task">
<changelist id="e154df99-7110-436b-8d6d-6f9500ad8711" name="Changes" comment="" />
<created>1753147269297</created>
<option name="number" value="Default" />
<option name="presentableId" value="Default" />
<updated>1753147269297</updated>
<workItem from="1753147270514" duration="348000" />
<workItem from="1753147648400" duration="228000" />
<workItem from="1753147892148" duration="291000" />
<workItem from="1753148203384" duration="640000" />
<workItem from="1753149113791" duration="4000" />
<workItem from="1753149150269" duration="99000" />
</task>
<servers />
</component>
<component name="TypeScriptGeneratedFilesManager">
<option name="version" value="3" />
</component>
</project>

8
chat-client/.env.development
View File

@ -2,11 +2,11 @@
# 此文件修改后需要重启项目 # 此文件修改后需要重启项目
NODE_ENV=development NODE_ENV=development
#VUE_APP_BASE_URL='/vab-mock-server' #VUE_APP_BASE_URL='/vab-mock-server'
VUE_APP_BASE_URL='http://localhost:10001' # VUE_APP_BASE_URL='http://localhost:10001'
VUE_APP_API_BASE_URL='http://localhost:8080' # VUE_APP_API_BASE_URL='http://localhost:8080'
#北京服务器配置 #北京服务器配置
# VUE_APP_BASE_URL='http://192.168.1.211:80/brichat' VUE_APP_BASE_URL='http://192.168.1.211:80/brichat'
# VUE_APP_API_BASE_URL='http://192.168.1.211:80/brichat' VUE_APP_API_BASE_URL='http://192.168.1.211:80/brichat'
#武汉公司服务器 #武汉公司服务器
# VUE_APP_BASE_URL='http://192.168.8.253:80/brichat' # VUE_APP_BASE_URL='http://192.168.8.253:80/brichat'
# VUE_APP_API_BASE_URL='http://192.168.8.253:80/brichat' # VUE_APP_API_BASE_URL='http://192.168.8.253:80/brichat'

8
chat-client/.env.production
View File

@ -2,11 +2,11 @@
# 此文件修改后需要重启项目 # 此文件修改后需要重启项目
NODE_ENV=production NODE_ENV=production
# VUE_APP_BASE_URL='/vab-mock-server' # VUE_APP_BASE_URL='/vab-mock-server'
VUE_APP_BASE_URL='http://localhost:10001' # VUE_APP_BASE_URL='http://localhost:10001'
VUE_APP_API_BASE_URL='http://localhost:10001' # VUE_APP_API_BASE_URL='http://localhost:10001'
#北京服务器 #北京服务器
# VUE_APP_BASE_URL='http://192.168.1.211:80/brichat' VUE_APP_BASE_URL='http://192.168.1.211:80/brichat'
# VUE_APP_API_BASE_URL='http://192.168.1.211:80/brichat' VUE_APP_API_BASE_URL='http://192.168.1.211:80/brichat'
#武汉公司服务器 #武汉公司服务器
# VUE_APP_BASE_URL='http://192.168.8.253:80/brichat' # VUE_APP_BASE_URL='http://192.168.8.253:80/brichat'
# VUE_APP_API_BASE_URL='http://192.168.8.253:80/brichat' # VUE_APP_API_BASE_URL='http://192.168.8.253:80/brichat'

2
chat-client/library/components/VabApp/index.vue
View File

@ -1,7 +1,7 @@
<script lang="ts" setup> <script lang="ts" setup>
import { pwa } from '@/config' import { pwa } from '@/config'
import { useHead } from '@vueuse/head' import { useHead } from '@vueuse/head'
import { enLocale, zhLocale, zhTwLocale} from '@/i18n' import { enLocale, zhLocale } from '@/i18n'
const route = useRoute() const route = useRoute()
const { locale: language } = useI18n() const { locale: language } = useI18n()

5567
chat-client/package-lock.json generated
View File

File diff suppressed because it is too large Load Diff

1
chat-client/package.json
View File

@ -47,7 +47,6 @@
"highlight.js": "^11.11.1", "highlight.js": "^11.11.1",
"image-conversion": "^2.1.1", "image-conversion": "^2.1.1",
"js-cookie": "^3.0.5", "js-cookie": "^3.0.5",
"js-message": "^2.1.0",
"jsencrypt": "^3.3.2", "jsencrypt": "^3.3.2",
"lodash": "^4.17.21", "lodash": "^4.17.21",
"lunisolar": "^2.5.2", "lunisolar": "^2.5.2",

44
chat-client/src/api/prologue.ts
View File

@ -1,44 +0,0 @@
import request from '@/utils/request'
export function getRemark(chatType: string) {
return request({
url: '/brichat-service/prologue/getRemark',
method: 'get',
params: { chatType },
})
}
export function saveRemark(data: any) {
return request({
url: '/brichat-service/prologue/saveRemark',
method: 'post',
data,
})
}
// 获取指定 chatType 下的推荐问题列表
export function getRecommendations(chatType: string) {
return request({
url: '/brichat-service/prologue/getRecommendations',
method: 'get',
params: { chatType },
})
}
// 编辑推荐问题
export function eidtRecommendation(data: any) {
return request({
url: '/brichat-service/prologue/eidtRecommendation',
method: 'post',
data,
})
}
// 删除指定的推荐问题
export function deleteRecommendation(id: string) {
return request({
url: '/brichat-service/prologue/deleteRecommendation',
method: 'delete',
params: { id },
})
}

4
chat-client/src/i18n/index.ts
View File

@ -9,10 +9,8 @@ import zhTw from '@/locales/zh-TW'
import enLocale from 'element-plus/dist/locale/en' import enLocale from 'element-plus/dist/locale/en'
import zhLocale from 'element-plus/dist/locale/zh-cn' import zhLocale from 'element-plus/dist/locale/zh-cn'
import zhTwLocale from 'element-plus/dist/locale/zh-tw'
export { enLocale, zhLocale }
export { enLocale, zhLocale, zhTwLocale }
const messages: Record<LanguageType, any> = { const messages: Record<LanguageType, any> = {
en: { en: {

22
chat-client/src/locales/en.ts
View File

@ -523,27 +523,5 @@ export default {
addSuccess: 'Add Successfully', addSuccess: 'Add Successfully',
addFail:'Add Failed' addFail:'Add Failed'
}, },
prologue:{
chatType: 'Chat Type',
selectChatType: 'Select Chat Type',
prologueContent: 'Prologue Content',
addRecommend: 'Add Recommendation',
recommendQuestion: 'Recommended Question',
actions: 'Actions',
edit: 'Edit',
delete: 'Delete',
confirmDelete: 'Are you sure you want to delete this recommendation?',
confirmSave: 'Are you sure you want to save the changes?',
deleteSuccess: 'Deleted successfully',
deleteFailure: 'Failed to delete, please try again later',
saveSuccess: 'Saved successfully',
saveFailure: 'Failed to save, please try again later',
loadSuccess: 'Loaded successfully',
loadFailure: 'Failed to load, please try again later',
noContent: 'No content found',
loading: 'Loading...',
updateRecommendation: 'Update Recommendation',
addRecommendation: 'Add Recommendation',
}
}, },
} }

22
chat-client/src/locales/zh-TW.ts
View File

@ -523,27 +523,5 @@ export default {
addSuccess:'新增成功', addSuccess:'新增成功',
addFail:'新增失敗', addFail:'新增失敗',
}, },
prologue:{
chatType: '聊天類型',
selectChatType: '選擇聊天類型',
prologueContent: '開場白內容',
addRecommend: '新增推薦問題',
recommendQuestion: '推薦問題',
actions: '操作',
edit: '編輯',
delete: '刪除',
confirmDelete: '確定要刪除該推薦問題嗎?',
confirmSave: '是否確認保存修改？',
deleteSuccess: '刪除成功',
deleteFailure: '刪除失敗，請稍後重試',
saveSuccess: '保存成功',
saveFailure: '保存失敗，請稍後重試',
loadSuccess: '加載成功',
loadFailure: '加載失敗，請稍後重試',
noContent: '未找到內容',
loading: '加載中...',
updateRecommendation: '更新推薦問題',
addRecommendation: '新增推薦問題',
}
}, },
} }

22
chat-client/src/locales/zh.ts
View File

@ -531,27 +531,5 @@ export default {
addSuccess: '新增成功', addSuccess: '新增成功',
addFail: '新增失败', addFail: '新增失败',
}, },
prologue:{
chatType: '聊天类型',
selectChatType: '选择聊天类型',
prologueContent: '开场白内容',
addRecommend: '新增推荐问题',
recommendQuestion: '推荐问题',
actions: '操作',
edit: '编辑',
delete: '删除',
confirmDelete: '确定要删除该推荐问题吗?',
confirmSave: '是否确认保存修改？',
deleteSuccess: '删除成功',
deleteFailure: '删除失败，请稍后重试',
saveSuccess: '保存成功',
saveFailure: '保存失败，请稍后重试',
loadSuccess: '加载成功',
loadFailure: '加载失败，请稍后重试',
noContent: '未找到内容',
loading: '加载中...',
updateRecommendation: '更新推荐问题',
addRecommendation: '新增推荐问题',
}
}, },
} }

61
chat-client/src/views/chatweb/chartReport/index.vue
View File

@ -1,8 +1,6 @@
<template> <template>
<div class="main-container"> <div class="main-container">
<!-- 等待 openRemark 数据加载完成后再渲染 ChatBox -->
<ChatBox <ChatBox
v-if="openRemark"
:chat-type="chatType" :chat-type="chatType"
:user-id="userId" :user-id="userId"
:placeholder="placeholder" :placeholder="placeholder"
@ -17,14 +15,13 @@
</div> </div>
</template> </template>
<script setup lang="ts"> <script setup lang="ts">
import { ref, computed } from 'vue' import { ref, computed } from 'vue'
import ChatBox from '@/views/chatweb/components/ChatBox.vue' import ChatBox from '@/views/chatweb/components/ChatBox.vue'
import { useAclStore } from '@/store/modules/acl' import { useAclStore } from '@/store/modules/acl'
import { ElMessage } from 'element-plus' import { ElMessage } from 'element-plus'
import { useI18n } from 'vue-i18n' import { useI18n } from 'vue-i18n'
import { getRemark,getRecommendations } from '@/api/prologue'
const { t, locale } = useI18n() const { t, locale } = useI18n()
const aclStore = useAclStore() const aclStore = useAclStore()
@ -32,56 +29,15 @@ const aclStore = useAclStore()
// ChatBox组件配置 - 图表报告专用 // ChatBox组件配置 - 图表报告专用
const chatType = ref('3') // 图表报告聊天类型 const chatType = ref('3') // 图表报告聊天类型
const userId = computed(() => aclStore.getUserId) // 用户ID const userId = computed(() => aclStore.getUserId) // 用户ID
const placeholder = computed(() => t('vabI18n.chat.placeEnterChart')) const placeholder = ref('请输入您的图表报告问题...') // 自定义占位符
// const openRemark = ref(`Hello 😊, I am BRI assistant, a senior data analyst. You can ask questions, and I can analyze the retrieved data and convert it into a visual chart. const openRemark = ref(`Hello 😊, I am BRI assistant, a senior data analyst. You can ask questions, and I can analyze the retrieved data and convert it into a visual chart.
// | Function | Narrative | | Function | Narrative |
// |--------------|----------| |--------------|----------|
// | Supported types | Bar chart (bar), line chart (line), pie chart (pie), scatter chart (scatter), scatter chart (bubble) with ripple effect <br>chart (effectScatter), candlestick chart (candlestick), radar chart (radar), heat map (heatmap), <br>tree map (tree), rectangular tree map (treemap), sunburst chart (sunburst), map (map), path map (lines), <br>relationship diagram (graph), box plot (boxplot), parallel coordinate system (parallel), dashboard (gauge), funnel chart (funnel), <br>Sankey diagram (sankey), theme river diagram (themeRiver) and pictorial column chart (pictorialBar). | | Supported types | Bar chart (bar), line chart (line), pie chart (pie), scatter chart (scatter), scatter chart (bubble) with ripple effect <br>chart (effectScatter), candlestick chart (candlestick), radar chart (radar), heat map (heatmap), <br>tree map (tree), rectangular tree map (treemap), sunburst chart (sunburst), map (map), path map (lines), <br>relationship diagram (graph), box plot (boxplot), parallel coordinate system (parallel), dashboard (gauge), funnel chart (funnel), <br>Sankey diagram (sankey), theme river diagram (themeRiver) and pictorial column chart (pictorialBar). |
// | Question template | [question], [graph type] |`) // 开场白 | Question template | [question], [graph type] |`) // 开场白
const openRemark = ref('') const recommendQuestions = ref(['各系统的故障次数，折线图','大學站和何東樓車廠站在5月发生的故障统计，饼图'])
const recommendQuestions = ref<string[]>([]) // 推荐问题列表
// const recommendQuestions = ref(['各系统的故障次数，折线图','大學站和何東樓車廠站在5月发生的故障统计，饼图'])
// ChatBox组件事件处理器 // ChatBox组件事件处理器
// 获取数据库中的 openRemark 数据
const fetchOpenRemark = async () => {
try {
const response = await getRemark(chatType.value) // 根据 chatType 获取开场白内容
if (response.data && response.data.content) {
openRemark.value = response.data.content // 更新 openRemark
} else {
openRemark.value = '默认的开场白' // 如果没有返回内容，设置默认值
}
} catch (error) {
ElMessage.error('加载开场白失败，请稍后重试')
console.error(error)
}
}
// 获取推荐问题
const fetchRecommendations = async () => {
try {
const response = await getRecommendations(chatType.value) // 根据 chatType 获取推荐问题列表
if (response.data) {
recommendQuestions.value = response.data.map(item => item.questionContent) // 更新推荐问题
} else {
recommendQuestions.value = []
}
} catch (error) {
ElMessage.error('加载推荐问题失败，请稍后重试')
console.error(error)
}
}
// 在组件加载时获取 openRemark 和推荐问题数据
onMounted(() => {
fetchOpenRemark()
fetchRecommendations()
})
// 处理流式请求完成事件 // 处理流式请求完成事件
const handleStreamComplete = (data: { const handleStreamComplete = (data: {
conversationId: string conversationId: string
@ -93,7 +49,6 @@ console.log('图表报告 - 对话完成:', data)
// 可以根据需要添加特定的数据处理 // 可以根据需要添加特定的数据处理
} }
// 处理文件来源点击事件 // 处理文件来源点击事件
const handleSourceClick = (source: { const handleSourceClick = (source: {
fileName: string fileName: string

50
chat-client/src/views/chatweb/codeQuery/index.vue
View File

@ -1,7 +1,6 @@
<template> <template>
<div class="main-container"> <div class="main-container">
<ChatBox <ChatBox
v-if="isRemarkLoaded"
:chat-type="chatType" :chat-type="chatType"
:user-id="userId" :user-id="userId"
:placeholder="placeholder" :placeholder="placeholder"
@ -22,62 +21,19 @@ import ChatBox from '@/views/chatweb/components/ChatBox.vue'
import { useAclStore } from '@/store/modules/acl' import { useAclStore } from '@/store/modules/acl'
import { ElMessage } from 'element-plus' import { ElMessage } from 'element-plus'
import { useI18n } from 'vue-i18n' import { useI18n } from 'vue-i18n'
import { getRemark,getRecommendations} from '@/api/prologue'
const { t, locale } = useI18n() const { t, locale } = useI18n()
const aclStore = useAclStore() const aclStore = useAclStore()
const isRemarkLoaded = ref(false)
// ChatBox组件配置 - 诊断代码查询专用 // ChatBox组件配置 - 诊断代码查询专用
const chatType = ref('5') // 诊断代码查询聊天类型 const chatType = ref('5') // 诊断代码查询聊天类型
const userId = computed(() => aclStore.getUserId) // 用户ID const userId = computed(() => aclStore.getUserId) // 用户ID
// const placeholder = ref('请输入您的诊断代码查询问题...') // 自定义占位符 // const placeholder = ref('请输入您的诊断代码查询问题...') // 自定义占位符
const placeholder = computed(() => t('vabI18n.chat.placeEnterDiag')) const placeholder = computed(() => t('vabI18n.chat.placeEnterDiag'))
const openRemark = ref('') const openRemark = ref('您好，我是北铁所的诊断代码查询助手,可以帮助您快速定位到故障的诊断代码相关信息,您可以输入如下格式问题:故障描述+代码+数字, 例如: ') // 开场白
const recommendQuestions = ref<string[]>([]) // 推荐问题列表 const recommendQuestions = ref(['配属潮州所的CRH2A-1248车组担当D7303次（饶平-广州东），11：01分车组运行至惠州南一罗浮山区间，IDU报01车司机室HVAC送风机速度反馈故障（代码001）','配属潮州所的CRH2A-1248车组担当D7303次（饶平-广州东），11：01分车组运行至惠州南一罗浮山区间，IDU报02车接触器K断开，故障车牵引丢失。'])
// const openRemark = ref('您好，我是北铁所的诊断代码查询助手,可以帮助您快速定位到故障的诊断代码相关信息,您可以输入如下格式问题:故障描述+代码+数字, 例如: ') // 开场白
// const recommendQuestions = ref(['配属潮州所的CRH2A-1248车组担当D7303次（饶平-广州东），11：01分车组运行至惠州南一罗浮山区间，IDU报01车司机室HVAC送风机速度反馈故障（代码001）','配属潮州所的CRH2A-1248车组担当D7303次（饶平-广州东），11：01分车组运行至惠州南一罗浮山区间，IDU报02车接触器K断开，故障车牵引丢失。'])
// ChatBox组件事件处理器 // ChatBox组件事件处理器
// 获取数据库中的 openRemark 数据
const fetchOpenRemark = async () => {
try {
const response = await getRemark(chatType.value) // 根据 chatType 获取开场白内容
if (response.data && response.data.content) {
openRemark.value = response.data.content // 更新 openRemark
} else {
openRemark.value = '默认的开场白' // 如果没有返回内容，设置默认值
}
isRemarkLoaded.value = true // 数据加载完成后设置为 true
} catch (error) {
ElMessage.error('加载开场白失败，请稍后重试')
console.error(error)
isRemarkLoaded.value = true
}
}
// 获取推荐问题
const fetchRecommendations = async () => {
try {
const response = await getRecommendations(chatType.value) // 根据 chatType 获取推荐问题列表
if (response.data) {
recommendQuestions.value = response.data.map(item => item.questionContent) // 更新推荐问题
} else {
recommendQuestions.value = []
}
} catch (error) {
ElMessage.error('加载推荐问题失败，请稍后重试')
console.error(error)
}
}
// 在组件加载时获取 openRemark 和推荐问题数据
onMounted(() => {
fetchOpenRemark()
fetchRecommendations()
})
// 处理流式请求完成事件 // 处理流式请求完成事件
const handleStreamComplete = (data: { const handleStreamComplete = (data: {
conversationId: string conversationId: string

58
chat-client/src/views/chatweb/index.vue
View File

@ -4,7 +4,6 @@
<!-- 左侧聊天对话框 --> <!-- 左侧聊天对话框 -->
<el-col :span="showChart ? 14 : 24" class="chat-panel"> <el-col :span="showChart ? 14 : 24" class="chat-panel">
<ChatBox <ChatBox
v-if="isRemarkLoaded"
:chat-type="chatType" :chat-type="chatType"
:user-id="userId" :user-id="userId"
:placeholder="placeholder" :placeholder="placeholder"
@ -62,8 +61,6 @@ import { sendMessages } from '@/api/historicalRecords'
import { getMaintStatData, type TraceFile } from '@/api/chat' import { getMaintStatData, type TraceFile } from '@/api/chat'
import { ElMessage } from 'element-plus' import { ElMessage } from 'element-plus'
import { useI18n } from 'vue-i18n' import { useI18n } from 'vue-i18n'
import { getRemark,getRecommendations} from '@/api/prologue'
const { t, locale } = useI18n() const { t, locale } = useI18n()
const userStore = useUserStore() const userStore = useUserStore()
const aclStore = useAclStore() const aclStore = useAclStore()
@ -72,14 +69,12 @@ const aclStore = useAclStore()
const chatType = ref('1') // 聊天类型 const chatType = ref('1') // 聊天类型
const userId = computed(() => aclStore.getUserId) // 用户ID const userId = computed(() => aclStore.getUserId) // 用户ID
const placeholder = ref('输入您的问题...') // 输入框占位符 const placeholder = ref('输入您的问题...') // 输入框占位符
const openRemark = ref('') const openRemark = ref(`Hello😊, I am a BRI assistant, a senior train fault analysis expert. You can ask questions about train faults, and I can analyze the retrieved data. Please refer to the following tips:
const recommendQuestions = ref<string[]>([]) | Question templates for different functions | Description |
// const openRemark = ref(`Hello😊, I am a BRI assistant, a senior train fault analysis expert. You can ask questions about train faults, and I can analyze the retrieved data. Please refer to the following tips: |--------------|----------|
// | Question templates for different functions | Description | | Fault diagnosis | [Train car number] + [Fault problem/fault phenomenon] |
// |--------------|----------| | Maintenance record query | [Train car number] + [Latest N maintenance records] |`) // 开场白
// | Fault diagnosis | [Train car number] + [Fault problem/fault phenomenon] | const recommendQuestions = ref(['T34 train, What to do if the Passenger Door cannot be opened','The latest 5 maintenance records of T34 train'])
// | Maintenance record query | [Train car number] + [Latest N maintenance records] |`) // 开场白
// const recommendQuestions = ref(['T34 train, What to do if the Passenger Door cannot be opened','The latest 5 maintenance records of T34 train'])
const showChart = ref(false) const showChart = ref(false)
const pdfUrl = ref('/static-resources/files/pdfFile/开悟大模型智能体平台简介1.pdf') const pdfUrl = ref('/static-resources/files/pdfFile/开悟大模型智能体平台简介1.pdf')
@ -87,7 +82,6 @@ const pdfVisible = ref(false)
const dialogVisible = ref(false) const dialogVisible = ref(false)
const pdfFiles = ref([]) const pdfFiles = ref([])
const loadChart = ref(true) const loadChart = ref(true)
const isRemarkLoaded = ref(false)
// 定义类型 // 定义类型
type ConversationIdInfo = Record<string, string> type ConversationIdInfo = Record<string, string>
@ -135,46 +129,6 @@ interface PieChartDataItem {
name: string name: string
} }
// 获取数据库中的 openRemark 数据
const fetchOpenRemark = async () => {
try {
const response = await getRemark(chatType.value) // 根据 chatType 获取开场白内容
if (response.data && response.data.content) {
openRemark.value = response.data.content // 更新 openRemark
} else {
openRemark.value = '默认的开场白' // 如果没有返回内容，设置默认值
}
isRemarkLoaded.value = true // 数据加载完成后设置为 true
} catch (error) {
ElMessage.error('加载开场白失败，请稍后重试')
console.error(error)
isRemarkLoaded.value = true
}
}
// 获取推荐问题
const fetchRecommendations = async () => {
try {
const response = await getRecommendations(chatType.value) // 根据 chatType 获取推荐问题列表
if (response.data) {
recommendQuestions.value = response.data.map(item => item.questionContent) // 更新推荐问题
} else {
recommendQuestions.value = []
}
} catch (error) {
ElMessage.error('加载推荐问题失败，请稍后重试')
console.error(error)
}
}
// 在组件加载时获取 openRemark 和推荐问题数据
onMounted(() => {
fetchOpenRemark()
fetchRecommendations()
})
const openPdf = (url: string) => { const openPdf = (url: string) => {
pdfUrl.value = url.replace('/var/www/assets/', '/') pdfUrl.value = url.replace('/var/www/assets/', '/')
console.log('pdfUrl.value', pdfUrl.value) console.log('pdfUrl.value', pdfUrl.value)

31
chat-client/src/views/chatweb/intelqa/index.vue
View File

@ -1,7 +1,6 @@
<template> <template>
<div class="main-container"> <div class="main-container">
<ChatBox <ChatBox
v-if="isRemarkLoaded"
:chat-type="chatType" :chat-type="chatType"
:user-id="userId" :user-id="userId"
:placeholder="placeholder" :placeholder="placeholder"
@ -21,41 +20,17 @@ import { ref, computed } from 'vue'
import ChatBox from '@/views/chatweb/components/ChatBox.vue' import ChatBox from '@/views/chatweb/components/ChatBox.vue'
import { useAclStore } from '@/store/modules/acl' import { useAclStore } from '@/store/modules/acl'
import { ElMessage } from 'element-plus' import { ElMessage } from 'element-plus'
import { getRemark } from '@/api/prologue'
const aclStore = useAclStore() const aclStore = useAclStore()
const isRemarkLoaded = ref(false)
// ChatBox组件配置 - 智能问答专用 // ChatBox组件配置 - 智能问答专用
const chatType = ref('2') // 智能问答聊天类型 const chatType = ref('2') // 智能问答聊天类型
const userId = computed(() => aclStore.getUserId) // 用户ID const userId = computed(() => aclStore.getUserId) // 用户ID
const placeholder = ref('请输入您的智能问答问题...') // 自定义占位符 const placeholder = ref('请输入您的智能问答问题...') // 自定义占位符
// const openRemark = ref('你好，我是北京铁道所的车辆智能运维助手☺️，欢迎您向本助手提问车辆故障问题！') // 开场白 const openRemark = ref('你好，我是北京铁道所的车辆智能运维助手☺️，欢迎您向本助手提问车辆故障问题！') // 开场白
const openRemark = ref('') const recommendQuestions = ref(['配属广州南所的CRH2A-2298车组担当D7200/7197次（深圳北-汕头）,12:27分车组在普宁站集控关门时，因旅客阻门导致MON报229803车4位车门关闭故障（代码111），机械师检查车门无异常，通知司机再次关门后正常。','配属广州动车所的CRH1A-1011车组担当C8001次（广州东—深圳），6:45分在广州东站待开时，机械师汇报pis无法输入车次'])
const recommendQuestions = ref(['配属广州南所的CRH2A-2298车组担当D7200/7197次（深圳北-汕头）,12:27分车组在普宁站集控关门时，因旅客阻门导致MON报229803车4位车门关闭故障（代码111），机械师检查车门无异常，通知司机再次关门后正常。','配属广州动车所的CRH1A-1011车组担当C8001次（广州东—深圳），6:45分在广州东站待开时，机械师汇报pis无法输入车次'])
// ChatBox组件事件处理器 // ChatBox组件事件处理器
// 获取数据库中的 openRemark 数据
const fetchOpenRemark = async () => {
try {
const response = await getRemark(chatType.value) // 根据 chatType 获取开场白内容
if (response.data && response.data.content) {
openRemark.value = response.data.content // 更新 openRemark
} else {
openRemark.value = '默认的开场白' // 如果没有返回内容，设置默认值
}
isRemarkLoaded.value = true
} catch (error) {
ElMessage.error('加载开场白失败，请稍后重试')
console.error(error)
isRemarkLoaded.value = true
}
}
// 在组件加载时获取 openRemark 数据
onMounted(() => {
fetchOpenRemark()
})
// 处理流式请求完成事件 // 处理流式请求完成事件
const handleStreamComplete = (data: { const handleStreamComplete = (data: {
conversationId: string conversationId: string

147
chat-client/src/views/permission/prologueManage/index.vue
View File

@ -1,147 +0,0 @@
<template>
<el-card>
<el-form :model="form" label-width="120px">
<el-form-item>
<el-button type="primary" @click="load">查询</el-button>
<el-button type="success" @click="save">保存</el-button>
</el-form-item>
<el-form-item :label="聊天类型">
<el-select v-model="form.chatType" placeholder="选择聊天类型">
<el-option label="故障诊断" value="1" />
<el-option label="智能问答" value="2" />
<el-option label="图表报告" value="3" />
<el-option label="应急助手问答" value="4" />
<el-option label="诊断代码查询" value="5" />
</el-select>
</el-form-item>
<el-form-item label="开场白内容">
<el-input type="textarea" v-model="form.content" rows="8"></el-input>
</el-form-item>
<!-- 新增推荐问题 -->
<el-form-item>
<el-button type="primary" @click="addRecommend">新增推荐问题</el-button>
</el-form-item>
<!-- 推荐问题列表 -->
<el-table :data="recommendations" style="width: 100%" border>
<el-table-column label="推荐问题" prop="questionContent" />
<el-table-column label="操作" width="180">
<template v-slot="scope">
<el-button size="mini" @click="editRecommend(scope.row)">编辑</el-button>
<el-button size="mini" type="danger" @click="deleteRecommend(scope.row)">删除</el-button>
</template>
</el-table-column>
</el-table>
</el-form>
</el-card>
</template>
<script setup lang="ts">
import { ref, watch, onMounted } from 'vue'
import { ElMessage, ElMessageBox } from 'element-plus'
import { getRemark, saveRemark, getRecommendations, editRecommendation, deleteRecommendation } from '@/api/prologue'
import { useI18n } from 'vue-i18n'
const { t, locale } = useI18n()
defineOptions({
name: 'prologueManage',
})
const form = ref({
chatType: '1', // 默认选中 '故障诊断'
content: '',
})
const recommendations = ref([]) // 推荐问题列表
const currentRecommendation = ref({ questionContent: '' }) // 当前正在编辑的推荐问题
// 查询开场白内容
const load = async () => {
try {
const res = await getRemark(form.value.chatType) // 根据 chatType 获取开场白
if (res.data) {
form.value.content = res.data.content
ElMessage.success('加载成功')
await loadRecommendations() // 获取推荐问题列表
} else {
form.value.content = ''
ElMessage.error('未找到开场白内容')
}
} catch (error) {
ElMessage.error('加载失败，请稍后重试')
}
}
// 查询推荐问题列表
const loadRecommendations = async () => {
try {
const res = await getRecommendations(form.value.chatType) // 使用 chatType 获取推荐问题
if (res.data) {
console.log('recommend questions return data:', res.data)
recommendations.value = res.data // 确保 res.data 是推荐问题列表
}
} catch (error) {
ElMessage.error('加载推荐问题失败')
}
}
// 监听 chatType 的变化，动态请求并更新 content 和推荐问题内容
watch(
() => form.value.chatType,
() => {
load()
}
)
// 保存修改后的内容
const save = () => {
ElMessageBox.confirm('是否确认保存修改？', '提示', {
confirmButtonText: '确认',
cancelButtonText: '取消',
type: 'warning',
}).then(async () => {
try {
await saveRemark(form.value)
ElMessage.success('保存成功')
} catch (error) {
ElMessage.error('保存失败，请稍后重试')
}
})
}
// 新增推荐问题
const addRecommend = () => {
// currentRecommendation.value = { questionContent: '' } // 清空编辑框
// dialogVisible.value = true // 显示编辑对话框
}
// 编辑推荐问题
const editRecommend = (row: any) => {
// currentRecommendation.value = { ...row } // 填充编辑框
// dialogVisible.value = true // 显示编辑对话框
}
// 删除推荐问题
const deleteRecommend = (row: any) => {
ElMessageBox.confirm('确定要删除该推荐问题吗?', '删除确认', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning',
}).then(async () => {
try {
await deleteRecommendation(row.id) // 根据 id 删除推荐问题
console.log('待删除的row.id',row.id)
ElMessage.success('删除成功')
await loadRecommendations() // 重新加载推荐问题列表
} catch (error) {
ElMessage.error('删除失败')
}
})
}
// 在组件加载时获取初始的开场白内容
onMounted(load)
</script>

13
chat-server/pom.xml
View File

@ -254,19 +254,6 @@
</configuration> </configuration>
</plugin> </plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.8.1</version>
<configuration>
<source>1.8</source>
<target>1.8</target>
<compilerArgs>
<arg>-Xlint:unchecked</arg>
</compilerArgs>
</configuration>
</plugin>
<!--↓↓↓自动生成插件yq--> <!--↓↓↓自动生成插件yq-->
<plugin> <plugin>
<groupId>org.mybatis.generator</groupId> <groupId>org.mybatis.generator</groupId>

51
chat-server/src/main/java/com/bjtds/brichat/controller/PrologueController.java
View File

@ -1,51 +0,0 @@
package com.bjtds.brichat.controller;
import com.bjtds.brichat.entity.sys.ApiKey;
import com.bjtds.brichat.entity.sys.PrologueQuestion;
import com.bjtds.brichat.entity.sys.SystemRemark;
import com.bjtds.brichat.service.PrologueService;
import com.bjtds.brichat.util.ResultUtils;
import com.netflix.discovery.converters.Auto;
import io.swagger.annotations.Api;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.ResponseEntity;
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
import java.util.ArrayList;
import java.util.List;
@Api(tags = "开场白配置")
@RestController
@Slf4j
@CrossOrigin(value = "*",maxAge = 3600)
@RequestMapping("/prologue")
public class PrologueController {
@Autowired
private PrologueService prologueService;
@GetMapping("/getRemark")
public ResultUtils getRemark(@RequestParam String chatType) {
SystemRemark systemRemark = prologueService.getRemark(chatType);
return ResultUtils.success(systemRemark);
}
@PostMapping("/saveRemark")
public ResultUtils saveRemark(@RequestBody SystemRemark remark) {
return ResultUtils.success(prologueService.saveOrUpdate(remark));
}
@GetMapping("/getRecommendations")
public ResultUtils getRecommendations(@RequestParam String chatType) {
List<PrologueQuestion> questions = prologueService.getRecommendations(chatType);
return ResultUtils.success(questions);
}
@DeleteMapping("/deleteRecommendation")
public ResultUtils deleteRecommendation(@RequestParam Integer id) {
return ResultUtils.success(prologueService.deleteRecommendQuestionById(id));
}
}

25
chat-server/src/main/java/com/bjtds/brichat/entity/sys/PrologueQuestion.java
View File

@ -1,25 +0,0 @@
package com.bjtds.brichat.entity.sys;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.NoArgsConstructor;
import java.time.LocalDateTime;
@Data
@NoArgsConstructor
@AllArgsConstructor
public class PrologueQuestion {
private Integer id;
// 聊天类型（1 表示诊断助手，2 表示通用问答...）
private String chatType;
// 推荐问题内容
private String questionContent;
// 更新时间
private LocalDateTime updatedAt;
}

25
chat-server/src/main/java/com/bjtds/brichat/entity/sys/SystemRemark.java
View File

@ -1,25 +0,0 @@
package com.bjtds.brichat.entity.sys;
import io.swagger.annotations.ApiModel;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.NoArgsConstructor;
import java.time.LocalDateTime;
@Data
@AllArgsConstructor
@NoArgsConstructor
public class SystemRemark {
private Integer id;
// 聊天类型（1 表示诊断助手，2 表示通用问答...）
private String chatType;
// 开场白内容
private String content;
// 更新时间
private LocalDateTime updatedAt;
}

19
chat-server/src/main/java/com/bjtds/brichat/mapper/opengauss/PrologueMapper.java
View File

@ -1,19 +0,0 @@
package com.bjtds.brichat.mapper.opengauss;
import com.bjtds.brichat.entity.sys.PrologueQuestion;
import com.bjtds.brichat.entity.sys.SystemRemark;
import org.apache.ibatis.annotations.Mapper;
import java.util.List;
@Mapper
public interface PrologueMapper {
SystemRemark findByChatType(String chatType);
Boolean updateRemark(SystemRemark remark);
List<PrologueQuestion> getQuestionsbyChatType(String chatType);
Boolean deleteQuesById(Integer id);
}

18
chat-server/src/main/java/com/bjtds/brichat/service/PrologueService.java
View File

@ -1,18 +0,0 @@
package com.bjtds.brichat.service;
import com.bjtds.brichat.entity.sys.PrologueQuestion;
import com.bjtds.brichat.entity.sys.SystemRemark;
import java.util.List;
public interface PrologueService {
SystemRemark getRemark(String chatType);
Boolean saveOrUpdate(SystemRemark remark);
List<PrologueQuestion> getRecommendations(String chatType);
Boolean deleteRecommendQuestionById(Integer id);
}

45
chat-server/src/main/java/com/bjtds/brichat/service/impl/PrologueServiceImpl.java
View File

@ -1,45 +0,0 @@
package com.bjtds.brichat.service.impl;
import com.bjtds.brichat.entity.sys.PrologueQuestion;
import com.bjtds.brichat.entity.sys.SystemRemark;
import com.bjtds.brichat.mapper.opengauss.PrologueMapper;
import com.bjtds.brichat.service.PrologueService;
import com.netflix.discovery.converters.Auto;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.time.LocalDateTime;
import java.util.List;
@Slf4j
@Service
public class PrologueServiceImpl implements PrologueService {
@Autowired
private PrologueMapper prologueMapper;
@Override
public SystemRemark getRemark(String chatType) {
return prologueMapper.findByChatType(chatType);
}
@Override
public Boolean saveOrUpdate(SystemRemark remark) {
SystemRemark re = new SystemRemark();
re.setContent(remark.getContent());
re.setChatType(remark.getChatType());
re.setUpdatedAt(LocalDateTime.now());
return prologueMapper.updateRemark(re);
}
@Override
public List<PrologueQuestion> getRecommendations(String chatType) {
return prologueMapper.getQuestionsbyChatType(chatType);
}
@Override
public Boolean deleteRecommendQuestionById(Integer id) {
return prologueMapper.deleteQuesById(id);
}
}

2
chat-server/src/main/resources/application-beijing.yml
View File

@ -48,4 +48,4 @@ dify:
email: bjtds@bjtds.com # 请替换为实际的 Dify 服务邮箱，若不需要调用 server相关接口可不填 email: bjtds@bjtds.com # 请替换为实际的 Dify 服务邮箱，若不需要调用 server相关接口可不填
password: 123456Aa # 请替换为实际的 Dify 服务密码，若不需要调用 server相关接口可不填 password: 123456Aa # 请替换为实际的 Dify 服务密码，若不需要调用 server相关接口可不填
dataset: dataset:
api-key: ${dify-dataset-api-key:dataset-zVa4uJBUem96P19o8iBtyihQ} # 请替换为实际的知识库api-key, 若不需要调用知识库可不填 api-key: ${dify-dataset-api-key:dataset-0Hij9IwoWYbJe1vvwVh8y7DS} # 请替换为实际的知识库api-key, 若不需要调用知识库可不填

2
chat-server/src/main/resources/application.yml
View File

@ -18,7 +18,7 @@ spring:
# 可选值: wuhan, beijing # 可选值: wuhan, beijing
# 线上部署时可通过环境变量 SPRING_PROFILES_ACTIVE 覆盖 # 线上部署时可通过环境变量 SPRING_PROFILES_ACTIVE 覆盖
profiles: profiles:
active: beijing active: wuhan
# 文件上传配置 # 文件上传配置
servlet: servlet:

40
chat-server/src/main/resources/com/bjtds/brichat/mapper/opengauss/PrologueMapper.xml
View File

@ -1,40 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.bjtds.brichat.mapper.opengauss.PrologueMapper">
<resultMap id="remarkResultMap" type="com.bjtds.brichat.entity.sys.SystemRemark">
<result column="id" property="id" />
<result column="chat_type" property="chatType" />
<result column="content" property="content" />
<result column="updated_at" property="updatedAt" />
</resultMap>
<resultMap id="RecommendResultMap" type="com.bjtds.brichat.entity.sys.PrologueQuestion">
<result column="id" property="id" />
<result column="chat_type" property="chatType" />
<result column="question_content" property="questionContent" />
<result column="updated_at" property="updatedAt" />
</resultMap>
<update id="updateRemark">
update bripg.t_chat_prologue
set content= #{content} , updated_at =#{updatedAt}
where chat_type = #{chatType}
</update>
<delete id="deleteQuesById">
DELETE FROM bripg.t_chat_recommendations
WHERE id = #{id}
</delete>
<select id="findByChatType" resultMap="remarkResultMap">
SELECT id, chat_type, content, updated_at
FROM bripg.t_chat_prologue
WHERE chat_type = #{chatType}
</select>
<select id="getQuestionsbyChatType" resultMap="RecommendResultMap">
SELECT * FROM bripg.t_chat_recommendations
WHERE chat_type = #{chatType}
</select>
</mapper>

6
web-server/.idea/compiler.xml
View File

@ -18,10 +18,10 @@
<component name="JavacSettings"> <component name="JavacSettings">
<option name="ADDITIONAL_OPTIONS_OVERRIDE"> <option name="ADDITIONAL_OPTIONS_OVERRIDE">
<module name="common" options="-parameters" /> <module name="common" options="-parameters" />
<module name="eureka-server" options="-parameters -Xlint:unchecked" /> <module name="eureka-server" options="-parameters" />
<module name="face-proc" options="-parameters" /> <module name="face-proc" options="-parameters" />
<module name="infrastructure" options="-parameters -Xlint:unchecked" /> <module name="infrastructure" options="-parameters" />
<module name="zuul-server" options="-parameters -Xlint:unchecked" /> <module name="zuul-server" options="-parameters" />
</option> </option>
</component> </component>
</project> </project>

10
web-server/.idea/jarRepositories.xml
View File

@ -1,16 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<project version="4"> <project version="4">
<component name="RemoteRepositoriesConfiguration"> <component name="RemoteRepositoriesConfiguration">
<remote-repository>
<option name="id" value="central" />
<option name="name" value="Central Repository" />
<option name="url" value="https://repo.maven.apache.org/maven2" />
</remote-repository>
<remote-repository>
<option name="id" value="spring-milestones" />
<option name="name" value="Spring Milestones" />
<option name="url" value="https://repo.spring.io/milestone" />
</remote-repository>
<remote-repository> <remote-repository>
<option name="id" value="central" /> <option name="id" value="central" />
<option name="name" value="Maven Central repository" /> <option name="name" value="Maven Central repository" />

8
web-server/.idea/misc.xml
View File

@ -10,16 +10,10 @@
<option value="$PROJECT_DIR$/eureka-server/pom.xml" /> <option value="$PROJECT_DIR$/eureka-server/pom.xml" />
<option value="$PROJECT_DIR$/face-proc/pom.xml" /> <option value="$PROJECT_DIR$/face-proc/pom.xml" />
<option value="$PROJECT_DIR$/infrastructure/pom.xml" /> <option value="$PROJECT_DIR$/infrastructure/pom.xml" />
<option value="$PROJECT_DIR$/../chat-server/pom.xml" />
</list> </list>
</option> </option>
<option name="ignoredFiles">
<set>
<option value="$PROJECT_DIR$/../chat-server/pom.xml" />
</set>
</option>
</component> </component>
<component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" project-jdk-name="1.8" project-jdk-type="JavaSDK"> <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" default="true" project-jdk-name="1.8" project-jdk-type="JavaSDK">
<output url="file://$PROJECT_DIR$/out" /> <output url="file://$PROJECT_DIR$/out" />
</component> </component>
</project> </project>

16
web-server/common/pom.xml
View File

@ -16,8 +16,6 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xs
</parent> </parent>
<properties> <properties>
<java.version>1.8</java.version> <java.version>1.8</java.version>
<maven.compiler.source>1.8</maven.compiler.source>
<maven.compiler.target>1.8</maven.compiler.target>
</properties> </properties>
<dependencies> <dependencies>
<dependency> <dependency>
@ -108,20 +106,6 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xs
</snapshotRepository> </snapshotRepository>
</distributionManagement> </distributionManagement>
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.8.1</version>
<configuration>
<source>1.8</source>
<target>1.8</target>
</configuration>
</plugin>
</plugins>
</build>
</project> </project>

41
web-server/common/target/surefire-reports/TEST-com.bjtds.common.CommonTest.xml
View File

File diff suppressed because one or more lines are too long

17
web-server/eureka-server/pom.xml
View File

@ -18,12 +18,8 @@
<java.version>1.8</java.version> <java.version>1.8</java.version>
<spring-cloud.version>Greenwich.RELEASE</spring-cloud.version> <spring-cloud.version>Greenwich.RELEASE</spring-cloud.version>
<docker.image.prefix>bjtds</docker.image.prefix> <!--镜像前缀，随便取--> <docker.image.prefix>bjtds</docker.image.prefix> <!--镜像前缀，随便取-->
<maven.compiler.source>1.8</maven.compiler.source>
<maven.compiler.target>1.8</maven.compiler.target>
</properties> </properties>
<dependencies> <dependencies>
<dependency> <dependency>
<groupId>org.springframework.boot</groupId> <groupId>org.springframework.boot</groupId>
@ -60,19 +56,6 @@
<artifactId>spring-boot-maven-plugin</artifactId> <artifactId>spring-boot-maven-plugin</artifactId>
</plugin> </plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.8.1</version>
<configuration>
<source>1.8</source>
<target>1.8</target>
<compilerArgs>
<arg>-Xlint:unchecked</arg>
</compilerArgs>
</configuration>
</plugin>
<plugin> <plugin>
<groupId>com.spotify</groupId> <groupId>com.spotify</groupId>
<artifactId>dockerfile-maven-plugin</artifactId> <artifactId>dockerfile-maven-plugin</artifactId>

2
web-server/face-proc/pom.xml
View File

@ -19,8 +19,6 @@
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding> <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<spring-boot.version>2.1.2.RELEASE</spring-boot.version> <spring-boot.version>2.1.2.RELEASE</spring-boot.version>
<maven.compiler.source>1.8</maven.compiler.source>
<maven.compiler.target>1.8</maven.compiler.target>
</properties> </properties>
<dependencies> <dependencies>

15
web-server/infrastructure/pom.xml
View File

@ -18,8 +18,6 @@
<java.version>1.8</java.version> <java.version>1.8</java.version>
<spring-cloud.version>Greenwich.RELEASE</spring-cloud.version> <spring-cloud.version>Greenwich.RELEASE</spring-cloud.version>
<docker.image.prefix>bjtds</docker.image.prefix> <docker.image.prefix>bjtds</docker.image.prefix>
<maven.compiler.source>1.8</maven.compiler.source>
<maven.compiler.target>1.8</maven.compiler.target>
</properties> </properties>
<dependencies> <dependencies>
@ -191,19 +189,6 @@
<artifactId>spring-boot-maven-plugin</artifactId> <artifactId>spring-boot-maven-plugin</artifactId>
</plugin> </plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.8.1</version>
<configuration>
<source>1.8</source>
<target>1.8</target>
<compilerArgs>
<arg>-Xlint:unchecked</arg>
</compilerArgs>
</configuration>
</plugin>
<!-- package的时候能够将依赖的 本地jar包 打包到最终的目标jar中 --> <!-- package的时候能够将依赖的 本地jar包 打包到最终的目标jar中 -->
<!-- <!--
<plugin> <plugin>

2
web-server/infrastructure/src/main/resources/application-opengauss.yml
View File

@ -13,7 +13,7 @@ spring:
# url: jdbc:opengauss://${db-host:192.168.8.241}:${db-port:15000}/${db-name:bridb} # url: jdbc:opengauss://${db-host:192.168.8.241}:${db-port:15000}/${db-name:bridb}
# username: ${db-username:bripg} # username: ${db-username:bripg}
# password: ${db-passwd:Chuangrui139*} # password: ${db-passwd:Chuangrui139*}
url: jdbc:opengauss://${db-host:192.168.1.211}:${db-port:6600}/${db-name:bridb} url: jdbc:opengauss://${db-host:192.168.8.253}:${db-port:6600}/${db-name:bridb}
username: ${db-username:bripg} username: ${db-username:bripg}
password: ${db-passwd:Chuangrui139*} password: ${db-passwd:Chuangrui139*}
servlet: servlet:

15
web-server/zuul-server/pom.xml
View File

@ -18,8 +18,6 @@
<java.version>1.8</java.version> <java.version>1.8</java.version>
<spring-cloud.version>Greenwich.RELEASE</spring-cloud.version> <spring-cloud.version>Greenwich.RELEASE</spring-cloud.version>
<docker.image.prefix>bjtds</docker.image.prefix> <docker.image.prefix>bjtds</docker.image.prefix>
<maven.compiler.source>1.8</maven.compiler.source>
<maven.compiler.target>1.8</maven.compiler.target>
</properties> </properties>
<dependencies> <dependencies>
@ -132,19 +130,6 @@
<artifactId>spring-boot-maven-plugin</artifactId> <artifactId>spring-boot-maven-plugin</artifactId>
</plugin> </plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.8.1</version>
<configuration>
<source>1.8</source>
<target>1.8</target>
<compilerArgs>
<arg>-Xlint:unchecked</arg>
</compilerArgs>
</configuration>
</plugin>
<plugin> <plugin>
<groupId>com.spotify</groupId> <groupId>com.spotify</groupId>
<artifactId>dockerfile-maven-plugin</artifactId> <artifactId>dockerfile-maven-plugin</artifactId>

2
web-server/zuul-server/src/main/resources/application-opengauss.yml
View File

@ -17,7 +17,7 @@ spring:
# password: ${db-passwd:Chuangrui139*} # password: ${db-passwd:Chuangrui139*}
# #
#pg版本 #pg版本
url: jdbc:opengauss://${db-host:192.168.1.211}:${db-port:6600}/${db-name:bridb} url: jdbc:opengauss://${db-host:192.168.8.253}:${db-port:6600}/${db-name:bridb}
username: ${db-username:bripg} username: ${db-username:bripg}
password: ${db-passwd:Chuangrui139*} password: ${db-passwd:Chuangrui139*}
# hikari: # hikari: