From 9166fc50aa3c07d8268b637a5e0d822bbaeb4c32 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=A9=99=E5=AD=90?= <454313500@qq.com> Date: Sat, 11 Mar 2023 01:16:28 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E5=AE=8C=E6=88=90=E5=AD=97=E5=85=B8?= =?UTF-8?q?=E6=A8=A1=E5=9D=97=E6=94=B9=E9=80=A0=EF=BC=8C=E5=89=8D=E7=AB=AF?= =?UTF-8?q?=E5=AE=8C=E6=88=90=E9=A6=96=E9=A1=B5=E7=95=8C=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Yi.BBS.Vue3/.env.development | 4 +- Yi.BBS.Vue3/src/apis/discussApi.js | 8 + Yi.BBS.Vue3/src/apis/plateApi.js | 8 + Yi.BBS.Vue3/src/components/AvatarInfo.vue | 3 +- Yi.BBS.Vue3/src/components/BottomInfo.vue | 25 ++ Yi.BBS.Vue3/src/components/DisscussCard.vue | 10 +- Yi.BBS.Vue3/src/components/MavonEdit.vue | 2 +- Yi.BBS.Vue3/src/components/PlateCard.vue | 10 +- Yi.BBS.Vue3/src/layout/AppBody.vue | 4 +- Yi.BBS.Vue3/src/utils/request.js | 6 +- Yi.BBS.Vue3/src/views/AddArticle.vue | 2 + Yi.BBS.Vue3/src/views/Article.vue | 261 ++++++++++++------ Yi.BBS.Vue3/src/views/Discuss.vue | 4 +- Yi.BBS.Vue3/src/views/Index.vue | 34 ++- Yi.BBS.Vue3/vite.config.js | 18 +- .../DictionaryConst.cs | 2 +- .../DictionaryService.cs | 8 +- .../DictionaryTypeConst.cs | 2 +- .../DictionaryTypeService.cs | 8 +- .../Dictionary/DictionaryCreateInputVo.cs | 2 +- .../Dictionary/DictionaryGetListInputVo.cs | 2 +- .../Dictionary/DictionaryGetListOutputDto.cs | 2 +- .../Dtos/Dictionary/DictionaryGetOutputDto.cs | 2 +- .../Dictionary/DictionaryUpdateInputVo.cs | 2 +- .../DictionaryTypeCreateInputVo.cs | 2 +- .../DictionaryTypeGetListInputVo.cs | 4 +- .../DictionaryTypeGetListOutputDto.cs | 2 +- .../DictionaryTypeGetOutputDto.cs | 2 +- .../DictionaryTypeUpdateInputVo.cs | 2 +- .../Entities/DictionaryEntity.cs | 4 +- .../Entities/DictionaryTypeEntity.cs | 4 +- .../IDictionaryService.cs | 4 +- .../IDictionaryTypeService.cs | 4 +- .../Yi.Framework.DictionaryManager.csproj | 14 + .../YiFrameworkDictionaryManagerModule.cs | 17 ++ Yi.Framework.Net6/Yi.Framework.sln | 7 + .../project/BBS/Yi.BBS.Web/yi-sqlsugar-dev.db | Bin 237568 -> 237568 bytes .../project/bbs/Yi.BBS.Web/yi-sqlsugar-dev.db | Bin 237568 -> 237568 bytes .../ApplicationContractsSwaggerDoc.xml | 20 -- .../ApplicationSwaggerDoc.xml | 22 -- .../Yi.RBAC.Domain/DataSeeds/DeptDataSeed.cs | 1 - .../DataSeeds/DictionaryDataSeed.cs | 2 +- .../DataSeeds/DictionaryTypeDataSeed.cs | 3 +- .../rbac/Yi.RBAC.Domain/DomainSwaggerDoc.xml | 90 ------ .../rbac/Yi.RBAC.Domain/Yi.RBAC.Domain.csproj | 1 + .../rbac/Yi.RBAC.Domain/YiRBACDomainModule.cs | 4 +- 46 files changed, 359 insertions(+), 279 deletions(-) create mode 100644 Yi.BBS.Vue3/src/apis/discussApi.js create mode 100644 Yi.BBS.Vue3/src/apis/plateApi.js create mode 100644 Yi.BBS.Vue3/src/components/BottomInfo.vue rename Yi.Framework.Net6/{src/project/rbac/Yi.RBAC.Domain.Shared/Dictionary/ConstClasses => Yi.Framework.DictionaryManager}/DictionaryConst.cs (80%) rename Yi.Framework.Net6/{src/project/rbac/Yi.RBAC.Application/Dictionary => Yi.Framework.DictionaryManager}/DictionaryService.cs (90%) rename Yi.Framework.Net6/{src/project/rbac/Yi.RBAC.Domain.Shared/Dictionary/ConstClasses => Yi.Framework.DictionaryManager}/DictionaryTypeConst.cs (80%) rename Yi.Framework.Net6/{src/project/rbac/Yi.RBAC.Application/Dictionary => Yi.Framework.DictionaryManager}/DictionaryTypeService.cs (88%) rename Yi.Framework.Net6/{src/project/rbac/Yi.RBAC.Application.Contracts/Dictionary => Yi.Framework.DictionaryManager}/Dtos/Dictionary/DictionaryCreateInputVo.cs (93%) rename Yi.Framework.Net6/{src/project/rbac/Yi.RBAC.Application.Contracts/Dictionary => Yi.Framework.DictionaryManager}/Dtos/Dictionary/DictionaryGetListInputVo.cs (86%) rename Yi.Framework.Net6/{src/project/rbac/Yi.RBAC.Application.Contracts/Dictionary => Yi.Framework.DictionaryManager}/Dtos/Dictionary/DictionaryGetListOutputDto.cs (93%) rename Yi.Framework.Net6/{src/project/rbac/Yi.RBAC.Application.Contracts/Dictionary => Yi.Framework.DictionaryManager}/Dtos/Dictionary/DictionaryGetOutputDto.cs (93%) rename Yi.Framework.Net6/{src/project/rbac/Yi.RBAC.Application.Contracts/Dictionary => Yi.Framework.DictionaryManager}/Dtos/Dictionary/DictionaryUpdateInputVo.cs (92%) rename Yi.Framework.Net6/{src/project/rbac/Yi.RBAC.Application.Contracts/Dictionary => Yi.Framework.DictionaryManager}/Dtos/DictionaryType/DictionaryTypeCreateInputVo.cs (90%) rename Yi.Framework.Net6/{src/project/rbac/Yi.RBAC.Application.Contracts/Dictionary => Yi.Framework.DictionaryManager}/Dtos/DictionaryType/DictionaryTypeGetListInputVo.cs (77%) rename Yi.Framework.Net6/{src/project/rbac/Yi.RBAC.Application.Contracts/Dictionary => Yi.Framework.DictionaryManager}/Dtos/DictionaryType/DictionaryTypeGetListOutputDto.cs (90%) rename Yi.Framework.Net6/{src/project/rbac/Yi.RBAC.Application.Contracts/Dictionary => Yi.Framework.DictionaryManager}/Dtos/DictionaryType/DictionaryTypeGetOutputDto.cs (90%) rename Yi.Framework.Net6/{src/project/rbac/Yi.RBAC.Application.Contracts/Dictionary => Yi.Framework.DictionaryManager}/Dtos/DictionaryType/DictionaryTypeUpdateInputVo.cs (89%) rename Yi.Framework.Net6/{src/project/rbac/Yi.RBAC.Domain/Dictionary => Yi.Framework.DictionaryManager}/Entities/DictionaryEntity.cs (96%) rename Yi.Framework.Net6/{src/project/rbac/Yi.RBAC.Domain/Dictionary => Yi.Framework.DictionaryManager}/Entities/DictionaryTypeEntity.cs (89%) rename Yi.Framework.Net6/{src/project/rbac/Yi.RBAC.Application.Contracts/Dictionary => Yi.Framework.DictionaryManager}/IDictionaryService.cs (80%) rename Yi.Framework.Net6/{src/project/rbac/Yi.RBAC.Application.Contracts/Dictionary => Yi.Framework.DictionaryManager}/IDictionaryTypeService.cs (81%) create mode 100644 Yi.Framework.Net6/Yi.Framework.DictionaryManager/Yi.Framework.DictionaryManager.csproj create mode 100644 Yi.Framework.Net6/Yi.Framework.DictionaryManager/YiFrameworkDictionaryManagerModule.cs diff --git a/Yi.BBS.Vue3/.env.development b/Yi.BBS.Vue3/.env.development index 1bd077c8..0216e5bd 100644 --- a/Yi.BBS.Vue3/.env.development +++ b/Yi.BBS.Vue3/.env.development @@ -1,2 +1,2 @@ -VITE_APP_BASEAPI="https://www.dev.com" -VITE_TTT="test" \ No newline at end of file +VITE_APP_BASEAPI="/api-dev" +VITE_APP_URL="http://localhost:19003/api" \ No newline at end of file diff --git a/Yi.BBS.Vue3/src/apis/discussApi.js b/Yi.BBS.Vue3/src/apis/discussApi.js new file mode 100644 index 00000000..9c748044 --- /dev/null +++ b/Yi.BBS.Vue3/src/apis/discussApi.js @@ -0,0 +1,8 @@ +import myaxios from '@/utils/request' +export function getList(data){ + return myaxios({ + url: '/discuss', + method: 'get', + params:data + }) +}; \ No newline at end of file diff --git a/Yi.BBS.Vue3/src/apis/plateApi.js b/Yi.BBS.Vue3/src/apis/plateApi.js new file mode 100644 index 00000000..0362ac3a --- /dev/null +++ b/Yi.BBS.Vue3/src/apis/plateApi.js @@ -0,0 +1,8 @@ +import myaxios from '@/utils/request' +export function getList(data){ + return myaxios({ + url: '/plate', + method: 'get', + params:data + }) +}; \ No newline at end of file diff --git a/Yi.BBS.Vue3/src/components/AvatarInfo.vue b/Yi.BBS.Vue3/src/components/AvatarInfo.vue index 4ab45ca6..ab7c3ec3 100644 --- a/Yi.BBS.Vue3/src/components/AvatarInfo.vue +++ b/Yi.BBS.Vue3/src/components/AvatarInfo.vue @@ -23,8 +23,7 @@ import { onMounted } from 'vue'; const props = defineProps(['size', 'src','showWatching','time']) -onMounted(()=>{ -console.log(props.time,"props.time");}) + \ No newline at end of file diff --git a/Yi.BBS.Vue3/src/components/DisscussCard.vue b/Yi.BBS.Vue3/src/components/DisscussCard.vue index aa1711db..bf54ccc9 100644 --- a/Yi.BBS.Vue3/src/components/DisscussCard.vue +++ b/Yi.BBS.Vue3/src/components/DisscussCard.vue @@ -7,14 +7,13 @@ -
Alibaba Java - 技术图谱
-
一个适合新手的Java学习平台
+
{{props.title}}
+
{{props.introduction}}
教程
- 2022-12-26 15:01:35 + {{ props.createTime }}
@@ -35,6 +34,9 @@ import { h, ref } from 'vue' import { useRouter } from 'vue-router' import AvatarInfo from './AvatarInfo.vue'; + +const props = defineProps(['title','introduction','createTime']) + const router = useRouter() const spacer = h(ElDivider, { direction: 'vertical' }) const enterDiscuss = () => { diff --git a/Yi.BBS.Vue3/src/components/MavonEdit.vue b/Yi.BBS.Vue3/src/components/MavonEdit.vue index e60281b5..dd255b46 100644 --- a/Yi.BBS.Vue3/src/components/MavonEdit.vue +++ b/Yi.BBS.Vue3/src/components/MavonEdit.vue @@ -3,7 +3,7 @@ :subfield="subfield" :codeStyle="props.codeStyle" :ishljs="true" - :style="{minHeight:props.height,maxHeight:'50rem'}" + :style="{minHeight:props.height,maxHeight:'100%'}" class="edit" @change="change" > diff --git a/Yi.BBS.Vue3/src/components/PlateCard.vue b/Yi.BBS.Vue3/src/components/PlateCard.vue index 85b19435..d698275d 100644 --- a/Yi.BBS.Vue3/src/components/PlateCard.vue +++ b/Yi.BBS.Vue3/src/components/PlateCard.vue @@ -8,9 +8,9 @@ class="image" />
- 学习教程 + {{props.name}}
- + 进入
@@ -19,10 +19,8 @@ - \ No newline at end of file diff --git a/Yi.BBS.Vue3/src/utils/request.js b/Yi.BBS.Vue3/src/utils/request.js index af4c22a2..e0c5a117 100644 --- a/Yi.BBS.Vue3/src/utils/request.js +++ b/Yi.BBS.Vue3/src/utils/request.js @@ -1,8 +1,8 @@ import axios from 'axios'; + const myaxios = axios.create({ - // baseURL:'/'// - // baseURL: process.env.VUE_APP_BASE_API, // /dev-apis + baseURL:import.meta.env.VITE_APP_BASEAPI, timeout: 50000, // transformResponse: [data => { // const json = JsonBig({ @@ -24,7 +24,7 @@ myaxios.interceptors.request.use(function (config) { // 响应拦截器 myaxios.interceptors.response.use(function (response) { - return response; + return response.data; }, function (error) { return Promise.reject(error); }); diff --git a/Yi.BBS.Vue3/src/views/AddArticle.vue b/Yi.BBS.Vue3/src/views/AddArticle.vue index adb86c57..a7d8c6a5 100644 --- a/Yi.BBS.Vue3/src/views/AddArticle.vue +++ b/Yi.BBS.Vue3/src/views/AddArticle.vue @@ -1,4 +1,5 @@