feat: 完成字典模块改造，前端完成首页界面

Yi.BBS.Vue3/.env.development

@@ -1,2 +1,2 @@
-VITE_APP_BASEAPI="https://www.dev.com"
+VITE_APP_BASEAPI="/api-dev"
-VITE_TTT="test"
+VITE_APP_URL="http://localhost:19003/api"

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
+    })
+};

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
+    })
+};

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");})
 </script>
 <style scoped>
 .mt_1

Yi.BBS.Vue3/src/components/BottomInfo.vue

@@ -0,0 +1,25 @@
+<template>
+<div class="body-div">
+<a>站长：橙子</a>
+<a>YiFramework意框架</a>
+<a>关于本站&nbsp&nbsp&nbsp&nbsp建议反馈</a>
+<a>2023 <span style="color: #40a9ff ;">意社区</span> | 赣ICP备xxxxxx号-4</a>
+</div>
+</template>
+<script setup>
+</script>
+<style scoped>
+a{
+    display: block;
+}
+a:hover {
+    color: #40a9ff;
+    cursor:pointer;
+}
+.body-div
+{
+    background: transparent;
+    color: rgba(0,0,0,.45);
+    font-size: 14px;
+}
+</style>

Yi.BBS.Vue3/src/components/DisscussCard.vue

@@ -7,14 +7,13 @@
 
 
 
-        <div class=" item item-title "> <el-link size="100" :underline="false" @click="enterDiscuss">Alibaba Java
+        <div class=" item item-title "> <el-link size="100" :underline="false" @click="enterDiscuss">{{props.title}}</el-link></div>
-                技术图谱</el-link></div>
+        <div class=" item item-description">{{props.introduction}}</div>
-        <div class=" item item-description">一个适合新手的Java学习平台</div>
         <div class=" item item-tag"><el-tag v-for="i in 4" :key="i">教程</el-tag></div>
         <div class=" item item-bottom">
             <el-space :size="10" :spacer="spacer">
                 <div class="item-description">
-                    2022-12-26 15:01:35
+                   {{ props.createTime }}
                 </div>
 
 
@@ -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 = () => {

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"
   ></mavon-editor>

Yi.BBS.Vue3/src/components/PlateCard.vue

@@ -8,9 +8,9 @@
             class="image"
           />
           <div style="padding: 14px">
-            <span>学习教程</span>
+            <span>{{props.name}}</span>
             <div class="bottom">
-              <time class="remarks">{{ remarks }}</time>
+              <time class="remarks">{{ props.introduction }}</time>
               <RouterLink to="/discuss">    <el-button text class="button" type="primary">进入<el-icon><CaretRight /></el-icon></el-button> </RouterLink> 
             </div>
           </div>
@@ -19,10 +19,8 @@
     </el-row>
   </template>
   
-  <script lang="ts" setup>
+  <script  setup>
-  import { ref } from 'vue'
+const props = defineProps(['name','introduction'])
-  
-  const remarks = "关于学习的教程"
   </script>
   
   <style>

Yi.BBS.Vue3/src/layout/AppBody.vue

@@ -16,7 +16,9 @@ background-color:#F0F2F5;
 
 }
 .content-main{
-   max-width:1200px;
+   /* max-width:1200px; */
    margin: 0 auto;
+   display: flex;
+   justify-content: center;
 }
 </style>

Yi.BBS.Vue3/src/utils/request.js

@@ -1,8 +1,8 @@
 
 import axios from 'axios';
+
 const myaxios = axios.create({
-    // baseURL:'/'// 
+    baseURL:import.meta.env.VITE_APP_BASEAPI,
-    // baseURL: process.env.VUE_APP_BASE_API, // /dev-apis
     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);
 });

Yi.BBS.Vue3/src/views/AddArticle.vue

@@ -1,4 +1,5 @@
 <template>
+  <div style="width: 100%;">
     <div class="body-div">
         <el-form  label-width="120px" label-position="left">
 
@@ -29,6 +30,7 @@
     <el-form-item >  <el-button class="submit-btn" type="primary">提交</el-button></el-form-item>
     </el-form>
   </div>
+  </div>
 </template>
 <script setup>
 import MavonEdit from '@/components/MavonEdit.vue'

Yi.BBS.Vue3/src/views/Article.vue

@@ -1,94 +1,114 @@
 <template>
-    <el-row :gutter="20" class="top-div">
+    <div style="width: 90%;min-width: 1200px;">
-        <el-col :span="17">
+        <!-- <div style="width: 1200px;"> -->
+        <el-row :gutter="20" class="top-div">
 
-            <el-row class="left-div">
+            <el-col :span="5">
-                <el-col :span="24">
+                <el-row>
-                    <AvatarInfo :size="50" :showWatching="true" :time="'2023-03-08 21:09:02'"></AvatarInfo>
+                    <el-col :span="24">
 
-                    <el-divider />
+                        <InfoCard class="art-info-left" header="主题信息" text="展开" hideDivider="true">
-                    <h2>面试题挑战</h2>
+                            <template #content>
-                    文章详情
+                                <el-tree :data="data" @node-click="handleNodeClick" />
+                            </template>
+                        </InfoCard>
+                        <el-col :span="24">
+                            <InfoCard :items=items header="推荐好友" text="更多">
+                                <template #item="temp">
+                                    <AvatarInfo />
+                                </template>
+                            </InfoCard>
+                        </el-col>
+
+                    </el-col>
+
+                </el-row>
+
+            </el-col>
+
+            <el-col :span="14">
+
+                <el-row class="left-div">
+                    <el-col :span="24">
+                        <AvatarInfo :size="50" :showWatching="true" :time="'2023-03-08 21:09:02'"></AvatarInfo>
+
+                        <el-divider />
+                        <h2>面试题挑战</h2>
+                        文章详情
 
 
-                    <el-divider class="tab-divider" />
+                        <el-divider class="tab-divider" />
 
 
-                    <el-space :size="10" :spacer="spacer">
+                        <el-space :size="10" :spacer="spacer">
-                        <el-button icon="Pointer" text>
+                            <el-button icon="Pointer" text>
-                            4</el-button>
+                                4</el-button>
-                        <el-button icon="Star" text>
+                            <el-button icon="Star" text>
-                            0</el-button>
+                                0</el-button>
-                        <el-button icon="Share" text>
+                            <el-button icon="Share" text>
-                            分享</el-button>
+                                分享</el-button>
-                        <el-button icon="Operation" text>
+                            <el-button icon="Operation" text>
-                            操作</el-button>
+                                操作</el-button>
-                    </el-space>
+                        </el-space>
 
-                </el-col>
+                    </el-col>
 
-                <el-col :span="24">
+                    <el-col :span="24">
-                    文章评论
+                        文章评论
-                </el-col>
+                    </el-col>
-            </el-row>
+                </el-row>
 
-        </el-col>
+            </el-col>
 
-        <el-col :span="7">
+            <el-col :span="5">
-            <el-row class="right-div">
+                <el-row class="right-div">
-                <el-col :span="24">
+                    <el-col :span="24">
-                    <InfoCard class="art-info-right" header="文章信息" text="更多" hideDivider="true">
+                        <InfoCard class="art-info-right" header="文章信息" text="更多" hideDivider="true">
-                        <template #content>
+                            <template #content>
-                            <div>
+                                <div>
-                                <ul class="art-info-ul">
+                                    <ul class="art-info-ul">
-                                    <li>
+                                        <li>
-                                        分类： <span>文章</span>
+                                            分类： <span>文章</span>
-                                    </li>
+                                        </li>
-                                    标签： <el-tag type="success">文章</el-tag>
+                                        标签： <el-tag type="success">文章</el-tag>
-                                    <el-tag type="info">资源</el-tag>
+                                        <el-tag type="info">资源</el-tag>
-                                </ul>
+                                    </ul>
-                            </div>
+                                </div>
-                        </template>
+                            </template>
-                    </InfoCard>
+                        </InfoCard>
-                </el-col>
+                    </el-col>
-                <el-col :span="24">
+                    <el-col :span="24">
-                    <InfoCard class="art-info-right" header="目录" hideDivider="true">
+                        <InfoCard class="art-info-right" header="目录" hideDivider="true">
-                        <template #content>
+                            <template #content>
-                            <div>
+                                <div>
-                                <ul class="art-info-ul">
+                                    <ul class="art-info-ul">
-                                    <li v-for="i in 6">
+                                        <li v-for="i in 6">
-                                        <el-button style="width: 100%;
+                                            <el-button style="width: 100%;
-                                          justify-content: left" :key="你好" type="primary" text>{{i}}：第一小结</el-button>
+                                              justify-content: left" :key="你好" type="primary" text>{{ i }}：第一小结</el-button>
-                                    </li>
+                                        </li>
-                                </ul>
+                                    </ul>
-                            </div>
+                                </div>
-                        </template>
+                            </template>
-                    </InfoCard>
+                        </InfoCard>
-                </el-col>
+                    </el-col>
-                <el-col :span="24">
+                    <el-col :span="24">
-                    <InfoCard :items=items header="推荐好友" text="更多">
+                        <InfoCard :items=items header="推荐好友" text="更多">
-                        <template #item="temp">
+                            <template #item="temp">
-                            <AvatarInfo />
+                                <AvatarInfo />
-                        </template>
+                            </template>
-                    </InfoCard>
+                        </InfoCard>
-                </el-col>
+                    </el-col>
-                <el-col :span="24">
+                    <el-col :span="24">
-                    <InfoCard :items=items header="推荐好友" text="更多">
+                        <InfoCard :items=items header="推荐好友" text="更多">
-                        <template #item="temp">
+                            <template #item="temp">
-                            <AvatarInfo />
+                                <AvatarInfo />
-                        </template>
+                            </template>
-                    </InfoCard>
+                        </InfoCard>
-                </el-col>
+                    </el-col>
-                <el-col :span="24">
+                </el-row>
-                    <InfoCard :items=items header="推荐好友" text="更多">
+            </el-col>
-                        <template #item="temp">
+        </el-row>
-                            <AvatarInfo />
+    </div>
-                        </template>
-                    </InfoCard>
-                </el-col>
-            </el-row>
-        </el-col>
-    </el-row>
 </template>
 <script setup>
 import { h, ref } from 'vue'
@@ -96,8 +116,86 @@ import AvatarInfo from '@/components/AvatarInfo.vue'
 import InfoCard from '../components/InfoCard.vue';
 const spacer = h(ElDivider, { direction: 'vertical' })
 const items = [{ user: "用户1" }, { user: "用户2" }, { user: "用户3" }]
+const handleNodeClick = (data) => {
+    console.log(data)
+}
+
+const data = [
+    {
+        label: 'HTML',
+        children: [
+            {
+                label: 'Level two 1-1',
+                children: [
+                    {
+                        label: 'Level three 1-1-1',
+                    },
+                ],
+            },
+        ],
+    },
+    {
+        label: 'HTML5',
+        children: [
+            {
+                label: 'Level two 2-1',
+                children: [
+                    {
+                        label: 'Level three 2-1-1',
+                    },
+                ],
+            },
+            {
+                label: 'Level two 2-2',
+                children: [
+                    {
+                        label: 'Level three 2-2-1',
+                    },
+                ],
+            },
+        ],
+    },
+    {
+        label: 'XHTML',
+        children: [
+            {
+                label: 'Level two 3-1',
+                children: [
+                    {
+                        label: 'Level three 3-1-1',
+                    },
+                ],
+            },
+            {
+                label: 'Level two 3-2',
+                children: [
+                    {
+                        label: 'Level three 3-2-1',
+                    },
+                ],
+            },
+        ],
+    },
+    {
+        label: 'Xcss',
+    },
+    {
+        label: 'CSS3',
+    },
+    {
+        label: 'Bootstrap 5',
+    },
+    {
+        label: 'Tcp/ip',
+    }
+]
+
 </script>
 <style scoped >
+.art-info-left {
+    margin-bottom: 1rem;
+}
+
 .art-info-ul span {
     margin-left: 1rem;
 }
@@ -108,11 +206,12 @@ const items = [{ user: "用户1" }, { user: "用户2" }, { user: "用户3" }]
 
 .art-info-ul {
     padding: 0;
+    margin: 0;
 }
 
 li {
     list-style: none;
-    margin-bottom: 1rem;
+    margin-bottom: 0.5rem;
 }
 
 .art-info-right {

Yi.BBS.Vue3/src/views/Discuss.vue

@@ -1,5 +1,5 @@
 <template>
-    <div class="body-div">
+    <div style="width: 1200px;" class="body-div">
 <div class="header">
     <el-form :inline="true" >
             <el-form-item label="标签：" >
@@ -73,7 +73,7 @@ min-height: 1000px;
 .header{
 background-color: #FFFFFF;
 padding: 1rem;
-margin: 2rem 0rem 1rem 0rem;
+margin: 1rem 0rem ;
 }
 .header .el-input
 {

Yi.BBS.Vue3/src/views/Index.vue

@@ -1,4 +1,5 @@
 <template >
+  <div style="width: 1200px;">
   <el-row :gutter="20" class="top-div" >
 
     <el-col :span="17">
@@ -9,12 +10,12 @@
      
       <el-row class="left-div">
 
-        <el-col :span="8" v-for="i in 6" class="plate" :style="{  'padding-left': i%3==1?0:0.2+'rem','padding-right': i%3==0?0:0.2+'rem'}" >
+        <el-col :span="8" v-for="i in plateList" class="plate" :style="{  'padding-left': i%3==1?0:0.2+'rem','padding-right': i%3==0?0:0.2+'rem'}" >
-<PlateCard/>
+          <PlateCard :name="i.name" :introduction="i.introduction"/>
           </el-col>
 
-        <el-col :span="24" v-for="i in 10" :key="i">
+        <el-col :span="24" v-for="i in discussList">
-<DisscussCard/>
+<DisscussCard :title="i.title" :introduction="i.introduction" :createTime="i.createTime"/>
           
         </el-col>
       </el-row>
@@ -74,10 +75,14 @@
            </template>
            </InfoCard>
          </el-col>
+
+         <el-col :span="24" style=" background: transparent;">
+        <BottomInfo/>
+        </el-col>
       </el-row>
     </el-col>
   </el-row>
-
+</div>
 </template>
 
 <script setup>
@@ -86,7 +91,24 @@ import InfoCard from '@/components/InfoCard.vue'
 import PlateCard from '@/components/PlateCard.vue'
 import ScrollbarInfo from '@/components/ScrollbarInfo.vue'
 import AvatarInfo from '@/components/AvatarInfo.vue'
-const items=[{user:"用户1"},{user:"用户2"},{user:"用户3"}]
+import BottomInfo from '@/components/BottomInfo.vue'
+
+import {getList} from '@/apis/plateApi.js'
+import {getList as discussGetList} from '@/apis/discussApi.js'
+import { onMounted, ref } from 'vue'
+var plateList=ref([]);
+var discussList=ref([]);
+  const items=[{user:"用户1"},{user:"用户2"},{user:"用户3"}]
+
+  onMounted(async()=>{
+ const response=  await getList();
+ plateList.value= response.items;
+const discussReponse=await discussGetList();
+discussList.value= discussReponse.items;
+
+  })
+
+
 </script>
 <style scoped >
 .introduce

Yi.BBS.Vue3/vite.config.js

@@ -1,6 +1,6 @@
 import { fileURLToPath, URL } from 'node:url'
 
-import { defineConfig } from 'vite'
+import { defineConfig, loadEnv } from 'vite';
 import vue from '@vitejs/plugin-vue'
 import AutoImport from 'unplugin-auto-import/vite'
 import Components from 'unplugin-vue-components/vite'
@@ -8,7 +8,9 @@ import { ElementPlusResolver } from 'unplugin-vue-components/resolvers'
 
 var CopyWebpackPlugin = require('copy-webpack-plugin');
 /** @type {import('vite').UserConfig} */
-export default defineConfig({
+export default defineConfig(({ command, mode })=>{
+  const env = loadEnv(mode, process.cwd(), '')
+ return {
   // envDir: 'env',
   plugins: [
     vue(), 
@@ -28,12 +30,16 @@ export default defineConfig({
     port:18001,
     open:true,
     proxy:{
-      '/api': {
+
-        target: 'http://localhost:19001',
+      [env.VITE_APP_BASEAPI]: {
+        target: env.VITE_APP_URL,
         changeOrigin: true,
-        rewrite: (path) => path.replace(/^\/api/, ''),
+        rewrite: (path) => path.replace(/^\/api-dev/, ''),
       },
     }
 
   }
-})
+}
+}
+)
+

Yi.Framework.Net6/Yi.Framework.DictionaryManager/DictionaryConst.cs

@@ -4,7 +4,7 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 
-namespace Yi.RBAC.Domain.Shared.Dictionary.ConstClasses
+namespace Yi.Framework.DictionaryManager
 {
     /// <summary>
     /// 常量定义

Yi.Framework.Net6/Yi.Framework.DictionaryManager/DictionaryService.cs

@@ -1,12 +1,12 @@
-using Yi.RBAC.Application.Contracts.Dictionary;
 using Cike.AutoWebApi.Setting;
-using Yi.RBAC.Application.Contracts.Dictionary.Dtos;
-using Yi.RBAC.Domain.Dictionary.Entities;
 using Yi.Framework.Ddd.Services;
 using Microsoft.AspNetCore.Mvc;
 using Yi.Framework.Ddd.Dtos;
+using Yi.Framework.DictionaryManager.Entities;
+using Yi.Framework.DictionaryManager.Dtos.Dictionary;
+using Yi.Framework.Core.Attributes;
 
-namespace Yi.RBAC.Application.Dictionary
+namespace Yi.Framework.DictionaryManager
 {
     /// <summary>
     /// Dictionary服务实现

Yi.Framework.Net6/Yi.Framework.DictionaryManager/DictionaryTypeConst.cs

@@ -4,7 +4,7 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 
-namespace Yi.RBAC.Domain.Shared.Dictionary.ConstClasses
+namespace Yi.Framework.DictionaryManager
 {
     /// <summary>
     /// 常量定义

Yi.Framework.Net6/Yi.Framework.DictionaryManager/DictionaryTypeService.cs

@@ -1,12 +1,12 @@
-using Yi.RBAC.Application.Contracts.Dictionary;
 using Cike.AutoWebApi.Setting;
-using Yi.RBAC.Application.Contracts.Dictionary.Dtos;
-using Yi.RBAC.Domain.Dictionary.Entities;
 using Yi.Framework.Ddd.Services;
 using Yi.Framework.Ddd.Dtos;
 using SqlSugar;
+using Yi.Framework.DictionaryManager.Dtos.DictionaryType;
+using Yi.Framework.DictionaryManager.Entities;
+using Yi.Framework.Core.Attributes;
 
-namespace Yi.RBAC.Application.Dictionary
+namespace Yi.Framework.DictionaryManager
 {
     /// <summary>
     /// DictionaryType服务实现

Yi.Framework.Net6/Yi.Framework.DictionaryManager/Dtos/Dictionary/DictionaryCreateInputVo.cs

@@ -4,7 +4,7 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 
-namespace Yi.RBAC.Application.Contracts.Dictionary.Dtos
+namespace Yi.Framework.DictionaryManager.Dtos.Dictionary
 {
     /// <summary>
     /// Dictionary输入创建对象

Yi.Framework.Net6/Yi.Framework.DictionaryManager/Dtos/Dictionary/DictionaryGetListInputVo.cs

@@ -5,7 +5,7 @@ using System.Text;
 using System.Threading.Tasks;
 using Yi.Framework.Ddd.Dtos;
 
-namespace Yi.RBAC.Application.Contracts.Dictionary.Dtos
+namespace Yi.Framework.DictionaryManager.Dtos.Dictionary
 {
     public class DictionaryGetListInputVo : PagedAndSortedResultRequestDto
     {

Yi.Framework.Net6/Yi.Framework.DictionaryManager/Dtos/Dictionary/DictionaryGetListOutputDto.cs

@@ -5,7 +5,7 @@ using System.Text;
 using System.Threading.Tasks;
 using Yi.Framework.Ddd.Dtos;
 
-namespace Yi.RBAC.Application.Contracts.Dictionary.Dtos
+namespace Yi.Framework.DictionaryManager.Dtos.Dictionary
 {
     public class DictionaryGetListOutputDto : IEntityDto<long>
     {

Yi.Framework.Net6/Yi.Framework.DictionaryManager/Dtos/Dictionary/DictionaryGetOutputDto.cs

@@ -5,7 +5,7 @@ using System.Text;
 using System.Threading.Tasks;
 using Yi.Framework.Ddd.Dtos;
 
-namespace Yi.RBAC.Application.Contracts.Dictionary.Dtos
+namespace Yi.Framework.DictionaryManager.Dtos.Dictionary
 {
     public class DictionaryGetOutputDto : IEntityDto<long>
     {

Yi.Framework.Net6/Yi.Framework.DictionaryManager/Dtos/Dictionary/DictionaryUpdateInputVo.cs

@@ -4,7 +4,7 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 
-namespace Yi.RBAC.Application.Contracts.Dictionary.Dtos
+namespace Yi.Framework.DictionaryManager.Dtos.Dictionary
 {
     public class DictionaryUpdateInputVo
     {

Yi.Framework.Net6/Yi.Framework.DictionaryManager/Dtos/DictionaryType/DictionaryTypeCreateInputVo.cs

@@ -4,7 +4,7 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 
-namespace Yi.RBAC.Application.Contracts.Dictionary.Dtos
+namespace Yi.Framework.DictionaryManager.Dtos.DictionaryType
 {
     /// <summary>
     /// DictionaryType输入创建对象

Yi.Framework.Net6/Yi.Framework.DictionaryManager/Dtos/DictionaryType/DictionaryTypeGetListInputVo.cs

@@ -5,7 +5,7 @@ using System.Text;
 using System.Threading.Tasks;
 using Yi.Framework.Ddd.Dtos;
 
-namespace Yi.RBAC.Application.Contracts.Dictionary.Dtos
+namespace Yi.Framework.DictionaryManager.Dtos.DictionaryType
 {
     public class DictionaryTypeGetListInputVo : PagedAllResultRequestDto
     {

Yi.Framework.Net6/Yi.Framework.DictionaryManager/Dtos/DictionaryType/DictionaryTypeGetListOutputDto.cs

@@ -5,7 +5,7 @@ using System.Text;
 using System.Threading.Tasks;
 using Yi.Framework.Ddd.Dtos;
 
-namespace Yi.RBAC.Application.Contracts.Dictionary.Dtos
+namespace Yi.Framework.DictionaryManager.Dtos.DictionaryType
 {
     public class DictionaryTypeGetListOutputDto : IEntityDto<long>
     {

Yi.Framework.Net6/Yi.Framework.DictionaryManager/Dtos/DictionaryType/DictionaryTypeGetOutputDto.cs

@@ -5,7 +5,7 @@ using System.Text;
 using System.Threading.Tasks;
 using Yi.Framework.Ddd.Dtos;
 
-namespace Yi.RBAC.Application.Contracts.Dictionary.Dtos
+namespace Yi.Framework.DictionaryManager.Dtos.DictionaryType
 {
     public class DictionaryTypeGetOutputDto : IEntityDto<long>
     {

Yi.Framework.Net6/Yi.Framework.DictionaryManager/Dtos/DictionaryType/DictionaryTypeUpdateInputVo.cs

@@ -4,7 +4,7 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 
-namespace Yi.RBAC.Application.Contracts.Dictionary.Dtos
+namespace Yi.Framework.DictionaryManager.Dtos.DictionaryType
 {
     public class DictionaryTypeUpdateInputVo
     {

Yi.Framework.Net6/Yi.Framework.DictionaryManager/Entities/DictionaryEntity.cs

@@ -8,10 +8,10 @@ using Yi.Framework.Data.Auditing;
 using Yi.Framework.Data.Entities;
 using Yi.Framework.Ddd.Entities;
 
-namespace Yi.RBAC.Domain.Dictionary.Entities
+namespace Yi.Framework.DictionaryManager.Entities
 {
     [SugarTable("Dictionary")]
-    public class DictionaryEntity : AuditedObject, IEntity<long>, ISoftDelete, IOrderNum,IState
+    public class DictionaryEntity : AuditedObject, IEntity<long>, ISoftDelete, IOrderNum, IState
     {
         /// <summary>
         /// 主键

Yi.Framework.Net6/Yi.Framework.DictionaryManager/Entities/DictionaryTypeEntity.cs

@@ -8,10 +8,10 @@ using Yi.Framework.Data.Auditing;
 using Yi.Framework.Data.Entities;
 using Yi.Framework.Ddd.Entities;
 
-namespace Yi.RBAC.Domain.Dictionary.Entities
+namespace Yi.Framework.DictionaryManager.Entities
 {
     [SugarTable("DictionaryType")]
-    public class DictionaryTypeEntity : AuditedObject,IEntity<long>, ISoftDelete, IOrderNum
+    public class DictionaryTypeEntity : AuditedObject, IEntity<long>, ISoftDelete, IOrderNum
     {
         /// <summary>
         /// 主键

Yi.Framework.Net6/Yi.Framework.DictionaryManager/IDictionaryService.cs

@@ -3,10 +3,10 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
-using Yi.RBAC.Application.Contracts.Dictionary.Dtos;
 using Yi.Framework.Ddd.Services.Abstract;
+using Yi.Framework.DictionaryManager.Dtos.Dictionary;
 
-namespace Yi.RBAC.Application.Contracts.Dictionary
+namespace Yi.Framework.DictionaryManager
 {
     /// <summary>
     /// Dictionary服务抽象

Yi.Framework.Net6/Yi.Framework.DictionaryManager/IDictionaryTypeService.cs

@@ -3,10 +3,10 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
-using Yi.RBAC.Application.Contracts.Dictionary.Dtos;
 using Yi.Framework.Ddd.Services.Abstract;
+using Yi.Framework.DictionaryManager.Dtos.DictionaryType;
 
-namespace Yi.RBAC.Application.Contracts.Dictionary
+namespace Yi.Framework.DictionaryManager
 {
     /// <summary>
     /// DictionaryType服务抽象

Yi.Framework.Net6/Yi.Framework.DictionaryManager/Yi.Framework.DictionaryManager.csproj

@@ -0,0 +1,14 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>net6.0</TargetFramework>
+    <ImplicitUsings>enable</ImplicitUsings>
+    <Nullable>enable</Nullable>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\src\framework\Yi.Framework.Data\Yi.Framework.Data.csproj" />
+    <ProjectReference Include="..\src\framework\Yi.Framework.Ddd\Yi.Framework.Ddd.csproj" />
+  </ItemGroup>
+
+</Project>

Yi.Framework.Net6/Yi.Framework.DictionaryManager/YiFrameworkDictionaryManagerModule.cs

@@ -0,0 +1,17 @@
+using Microsoft.AspNetCore.Builder;
+using Microsoft.Extensions.DependencyInjection;
+using StartupModules;
+
+namespace Yi.Framework.DictionaryManager
+{
+    public class YiFrameworkDictionaryManagerModule : IStartupModule
+    {
+        public void Configure(IApplicationBuilder app, ConfigureMiddlewareContext context)
+        {
+        }
+
+        public void ConfigureServices(IServiceCollection services, ConfigureServicesContext context)
+        {
+        }
+    }
+}

Yi.Framework.Net6/Yi.Framework.sln

@@ -101,6 +101,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Yi.Framework.FileManager",
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Yi.Framework.MultiTenancy", "src\framework\Yi.Framework.MultiTenancy\Yi.Framework.MultiTenancy.csproj", "{590B1EC0-CDA9-4937-BE07-FBB04437D21F}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Yi.Framework.DictionaryManager", "Yi.Framework.DictionaryManager\Yi.Framework.DictionaryManager.csproj", "{8941B30D-698B-477A-8737-43E7B4A8695A}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -263,6 +265,10 @@ Global
 		{590B1EC0-CDA9-4937-BE07-FBB04437D21F}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{590B1EC0-CDA9-4937-BE07-FBB04437D21F}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{590B1EC0-CDA9-4937-BE07-FBB04437D21F}.Release|Any CPU.Build.0 = Release|Any CPU
+		{8941B30D-698B-477A-8737-43E7B4A8695A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{8941B30D-698B-477A-8737-43E7B4A8695A}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{8941B30D-698B-477A-8737-43E7B4A8695A}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{8941B30D-698B-477A-8737-43E7B4A8695A}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -310,6 +316,7 @@ Global
 		{8A604A6B-D1FA-4CFF-BCF5-557519B10FCB} = {EEF5F221-0E32-4A3D-B647-B4B5E7305806}
 		{1BF3115D-B027-4805-AF7B-41B3AE9CB355} = {EEF5F221-0E32-4A3D-B647-B4B5E7305806}
 		{590B1EC0-CDA9-4937-BE07-FBB04437D21F} = {5F2B846D-96CE-400A-878E-220498F4EE31}
+		{8941B30D-698B-477A-8737-43E7B4A8695A} = {EEF5F221-0E32-4A3D-B647-B4B5E7305806}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {6C1A3808-0F4F-43FB-A9FE-5F27A3BB2ECF}

Yi.Framework.Net6/src/project/rbac/Yi.RBAC.Application.Contracts/ApplicationContractsSwaggerDoc.xml

@@ -4,26 +4,6 @@
         <name>Yi.RBAC.Application.Contracts</name>
     </assembly>
     <members>
-        <member name="T:Yi.RBAC.Application.Contracts.Dictionary.Dtos.DictionaryTypeCreateInputVo">
-            <summary>
-            DictionaryType输入创建对象
-            </summary>
-        </member>
-        <member name="T:Yi.RBAC.Application.Contracts.Dictionary.Dtos.DictionaryCreateInputVo">
-            <summary>
-            Dictionary输入创建对象
-            </summary>
-        </member>
-        <member name="T:Yi.RBAC.Application.Contracts.Dictionary.IDictionaryService">
-            <summary>
-            Dictionary服务抽象
-            </summary>
-        </member>
-        <member name="T:Yi.RBAC.Application.Contracts.Dictionary.IDictionaryTypeService">
-            <summary>
-            DictionaryType服务抽象
-            </summary>
-        </member>
         <member name="T:Yi.RBAC.Application.Contracts.Identity.Dtos.DeptCreateInputVo">
             <summary>
             Dept输入创建对象

Yi.Framework.Net6/src/project/rbac/Yi.RBAC.Application/ApplicationSwaggerDoc.xml

@@ -4,28 +4,6 @@
         <name>Yi.RBAC.Application</name>
     </assembly>
     <members>
-        <member name="T:Yi.RBAC.Application.Dictionary.DictionaryService">
-            <summary>
-            Dictionary服务实现
-            </summary>
-        </member>
-        <member name="P:Yi.RBAC.Application.Dictionary.DictionaryService._dictionaryRepository">
-            <summary>
-            查询
-            </summary>
-        </member>
-        <member name="M:Yi.RBAC.Application.Dictionary.DictionaryService.GetDicType(System.String)">
-            <summary>
-            根据字典类型获取字典列表
-            </summary>
-            <param name="dicType"></param>
-            <returns></returns>
-        </member>
-        <member name="T:Yi.RBAC.Application.Dictionary.DictionaryTypeService">
-            <summary>
-            DictionaryType服务实现
-            </summary>
-        </member>
         <member name="M:Yi.RBAC.Application.Identity.AccountService.PostLoginAsync(Yi.RBAC.Application.Contracts.Identity.Dtos.Account.LoginInputVo)">
             <summary>
             登录

Yi.Framework.Net6/src/project/rbac/Yi.RBAC.Domain/DataSeeds/DeptDataSeed.cs

@@ -6,7 +6,6 @@ using System.Text;
 using System.Threading.Tasks;
 using Yi.Framework.Data.DataSeeds;
 using Yi.Framework.Ddd.Repositories;
-using Yi.RBAC.Domain.Dictionary.Entities;
 using Yi.RBAC.Domain.Identity.Entities;
 
 namespace Yi.RBAC.Domain.DataSeeds

Yi.Framework.Net6/src/project/rbac/Yi.RBAC.Domain/DataSeeds/DictionaryDataSeed.cs

@@ -6,7 +6,7 @@ using System.Text;
 using System.Threading.Tasks;
 using Yi.Framework.Data.DataSeeds;
 using Yi.Framework.Ddd.Repositories;
-using Yi.RBAC.Domain.Dictionary.Entities;
+using Yi.Framework.DictionaryManager.Entities;
 
 namespace Yi.RBAC.Domain.DataSeeds
 {

Yi.Framework.Net6/src/project/rbac/Yi.RBAC.Domain/DataSeeds/DictionaryTypeDataSeed.cs

@@ -6,7 +6,8 @@ using System.Text;
 using System.Threading.Tasks;
 using Yi.Framework.Data.DataSeeds;
 using Yi.Framework.Ddd.Repositories;
-using Yi.RBAC.Domain.Dictionary.Entities;
+using Yi.Framework.DictionaryManager.Entities;
+
 
 namespace Yi.RBAC.Domain.DataSeeds
 {

Yi.Framework.Net6/src/project/rbac/Yi.RBAC.Domain/DomainSwaggerDoc.xml

@@ -4,96 +4,6 @@
         <name>Yi.RBAC.Domain</name>
     </assembly>
     <members>
-        <member name="P:Yi.RBAC.Domain.Dictionary.Entities.DictionaryEntity.Id">
-            <summary>
-            主键
-            </summary>
-        </member>
-        <member name="P:Yi.RBAC.Domain.Dictionary.Entities.DictionaryEntity.IsDeleted">
-            <summary>
-            逻辑删除
-            </summary>
-        </member>
-        <member name="P:Yi.RBAC.Domain.Dictionary.Entities.DictionaryEntity.OrderNum">
-            <summary>
-            排序
-            </summary>
-        </member>
-        <member name="P:Yi.RBAC.Domain.Dictionary.Entities.DictionaryEntity.State">
-            <summary>
-            状态
-            </summary>
-        </member>
-        <member name="P:Yi.RBAC.Domain.Dictionary.Entities.DictionaryEntity.Remark">
-             <summary>
-             描述 
-            </summary>
-        </member>
-        <member name="P:Yi.RBAC.Domain.Dictionary.Entities.DictionaryEntity.ListClass">
-             <summary>
-             tag类型 
-            </summary>
-        </member>
-        <member name="P:Yi.RBAC.Domain.Dictionary.Entities.DictionaryEntity.CssClass">
-             <summary>
-             tagClass 
-            </summary>
-        </member>
-        <member name="P:Yi.RBAC.Domain.Dictionary.Entities.DictionaryEntity.DictType">
-             <summary>
-             字典类型 
-            </summary>
-        </member>
-        <member name="P:Yi.RBAC.Domain.Dictionary.Entities.DictionaryEntity.DictLabel">
-             <summary>
-             字典标签 
-            </summary>
-        </member>
-        <member name="P:Yi.RBAC.Domain.Dictionary.Entities.DictionaryEntity.DictValue">
-             <summary>
-             字典值 
-            </summary>
-        </member>
-        <member name="P:Yi.RBAC.Domain.Dictionary.Entities.DictionaryEntity.IsDefault">
-             <summary>
-             是否为该类型的默认值 
-            </summary>
-        </member>
-        <member name="P:Yi.RBAC.Domain.Dictionary.Entities.DictionaryTypeEntity.Id">
-            <summary>
-            主键
-            </summary>
-        </member>
-        <member name="P:Yi.RBAC.Domain.Dictionary.Entities.DictionaryTypeEntity.IsDeleted">
-            <summary>
-            逻辑删除
-            </summary>
-        </member>
-        <member name="P:Yi.RBAC.Domain.Dictionary.Entities.DictionaryTypeEntity.OrderNum">
-            <summary>
-            排序
-            </summary>
-        </member>
-        <member name="P:Yi.RBAC.Domain.Dictionary.Entities.DictionaryTypeEntity.State">
-            <summary>
-            状态
-            </summary>
-        </member>
-        <member name="P:Yi.RBAC.Domain.Dictionary.Entities.DictionaryTypeEntity.DictName">
-             <summary>
-             字典名称 
-            </summary>
-        </member>
-        <member name="P:Yi.RBAC.Domain.Dictionary.Entities.DictionaryTypeEntity.DictType">
-             <summary>
-             字典类型 
-            </summary>
-        </member>
-        <member name="P:Yi.RBAC.Domain.Dictionary.Entities.DictionaryTypeEntity.Remark">
-             <summary>
-             描述 
-            </summary>
-        </member>
         <member name="T:Yi.RBAC.Domain.Identity.AccountManager">
             <summary>
             用户领域服务

Yi.Framework.Net6/src/project/rbac/Yi.RBAC.Domain/Yi.RBAC.Domain.csproj

@@ -15,6 +15,7 @@
 	  <PackageReference Include="UAParser" Version="3.1.47" />
 	</ItemGroup>
   <ItemGroup>
+    <ProjectReference Include="..\..\..\..\Yi.Framework.DictionaryManager\Yi.Framework.DictionaryManager.csproj" />
     <ProjectReference Include="..\..\..\framework\Yi.Framework.Data\Yi.Framework.Data.csproj" />
     <ProjectReference Include="..\..\..\module\Yi.Framework.EventBus\Yi.Framework.EventBus.csproj" />
     <ProjectReference Include="..\..\..\module\Yi.Framework.FileManager\Yi.Framework.FileManager.csproj" />

Yi.Framework.Net6/src/project/rbac/Yi.RBAC.Domain/YiRBACDomainModule.cs

@@ -9,6 +9,7 @@ using System.Text;
 using System.Threading.Tasks;
 using Yi.Framework.Core.Attributes;
 using Yi.Framework.Data;
+using Yi.Framework.DictionaryManager;
 using Yi.Framework.EventBus;
 using Yi.Framework.FileManager;
 using Yi.Framework.OperLogManager;
@@ -24,7 +25,8 @@ namespace Yi.RBAC.Domain
         typeof(YiFrameworkThumbnailSharpModule),
         typeof(YiFrameworkEventBusModule),
         typeof(YiFrameworkOperLogManagerModule),
-        typeof(YiFrameworkFileManagerModule)
+        typeof(YiFrameworkFileManagerModule),
+        typeof(YiFrameworkDictionaryManagerModule)
         )]
     public class YiRBACDomainModule : IStartupModule
     {