feat:完成仅自己可见功能

Yi.BBS.Vue3/package-lock.json

@@ -10,6 +10,7 @@
       "dependencies": {
         "@element-plus/icons-vue": "^2.1.0",
         "axios": "^1.3.4",
+        "echarts": "^5.4.2",
         "element-plus": "^2.2.32",
         "highlight": "^0.2.4",
         "marked": "^4.2.12",
@@ -1876,6 +1877,15 @@
         "node": ">=12"
       }
     },
+    "node_modules/echarts": {
+      "version": "5.4.2",
+      "resolved": "https://registry.npmmirror.com/echarts/-/echarts-5.4.2.tgz",
+      "integrity": "sha512-2W3vw3oI2tWJdyAz+b8DuWS0nfXtSDqlDmqgin/lfzbkB01cuMEN66KWBlmur3YMp5nEDEEt5s23pllnAzB4EA==",
+      "dependencies": {
+        "tslib": "2.3.0",
+        "zrender": "5.4.3"
+      }
+    },
     "node_modules/electron-to-chromium": {
       "version": "1.4.311",
       "resolved": "https://registry.npmmirror.com/electron-to-chromium/-/electron-to-chromium-1.4.311.tgz",
@@ -3366,6 +3376,11 @@
         "node": ">=8.0"
       }
     },
+    "node_modules/tslib": {
+      "version": "2.3.0",
+      "resolved": "https://registry.npmmirror.com/tslib/-/tslib-2.3.0.tgz",
+      "integrity": "sha512-N82ooyxVNm6h1riLCoyS9e3fuJ3AMG2zIZs2Gd1ATcSFjSA23Q0fzjjZeh0jbJvWVDZ0cJT8yaNNaaXHzueNjg=="
+    },
     "node_modules/ufo": {
       "version": "1.1.0",
       "resolved": "https://registry.npmmirror.com/ufo/-/ufo-1.1.0.tgz",
@@ -3836,6 +3851,14 @@
       "version": "0.4.0",
       "resolved": "https://registry.npmmirror.com/yarm/-/yarm-0.4.0.tgz",
       "integrity": "sha512-yCoX5QCA5Upb+VP7/UBuNGBz7MO5oWyc6degv5AifeGnakpaHeNwE/SNOPMefFKpQBionZyUeRdBo63Dl+awDQ=="
+    },
+    "node_modules/zrender": {
+      "version": "5.4.3",
+      "resolved": "https://registry.npmmirror.com/zrender/-/zrender-5.4.3.tgz",
+      "integrity": "sha512-DRUM4ZLnoaT0PBVvGBDO9oWIDBKFdAVieNWxWwK0niYzJCMwGchRk21/hsE+RKkIveH3XHCyvXcJDkgLVvfizQ==",
+      "dependencies": {
+        "tslib": "2.3.0"
+      }
     }
   },
   "dependencies": {
@@ -5246,6 +5269,15 @@
       "integrity": "sha512-7GO6HghkA5fYG9TYnNxi14/7K9f5occMlp3zXAuSxn7CKCxt9xbNWG7yF8hTCSUchlfWSe3uLmlPfigevRItzQ==",
       "dev": true
     },
+    "echarts": {
+      "version": "5.4.2",
+      "resolved": "https://registry.npmmirror.com/echarts/-/echarts-5.4.2.tgz",
+      "integrity": "sha512-2W3vw3oI2tWJdyAz+b8DuWS0nfXtSDqlDmqgin/lfzbkB01cuMEN66KWBlmur3YMp5nEDEEt5s23pllnAzB4EA==",
+      "requires": {
+        "tslib": "2.3.0",
+        "zrender": "5.4.3"
+      }
+    },
     "electron-to-chromium": {
       "version": "1.4.311",
       "resolved": "https://registry.npmmirror.com/electron-to-chromium/-/electron-to-chromium-1.4.311.tgz",
@@ -6413,6 +6445,11 @@
         "is-number": "^7.0.0"
       }
     },
+    "tslib": {
+      "version": "2.3.0",
+      "resolved": "https://registry.npmmirror.com/tslib/-/tslib-2.3.0.tgz",
+      "integrity": "sha512-N82ooyxVNm6h1riLCoyS9e3fuJ3AMG2zIZs2Gd1ATcSFjSA23Q0fzjjZeh0jbJvWVDZ0cJT8yaNNaaXHzueNjg=="
+    },
     "ufo": {
       "version": "1.1.0",
       "resolved": "https://registry.npmmirror.com/ufo/-/ufo-1.1.0.tgz",
@@ -6776,6 +6813,14 @@
       "version": "0.4.0",
       "resolved": "https://registry.npmmirror.com/yarm/-/yarm-0.4.0.tgz",
       "integrity": "sha512-yCoX5QCA5Upb+VP7/UBuNGBz7MO5oWyc6degv5AifeGnakpaHeNwE/SNOPMefFKpQBionZyUeRdBo63Dl+awDQ=="
+    },
+    "zrender": {
+      "version": "5.4.3",
+      "resolved": "https://registry.npmmirror.com/zrender/-/zrender-5.4.3.tgz",
+      "integrity": "sha512-DRUM4ZLnoaT0PBVvGBDO9oWIDBKFdAVieNWxWwK0niYzJCMwGchRk21/hsE+RKkIveH3XHCyvXcJDkgLVvfizQ==",
+      "requires": {
+        "tslib": "2.3.0"
+      }
     }
   }
 }

Yi.BBS.Vue3/package.json

@@ -10,6 +10,7 @@
   "dependencies": {
     "@element-plus/icons-vue": "^2.1.0",
     "axios": "^1.3.4",
+    "echarts": "^5.4.2",
     "element-plus": "^2.2.32",
     "highlight": "^0.2.4",
     "marked": "^4.2.12",

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

@@ -14,13 +14,14 @@
 
 
   <el-divider />
-
+<div v-hasPer="['bbs:comment:add']">
   <el-input v-model="topContent" placeholder="发表一个友善的评论吧~" :rows="5" type="textarea"></el-input>
-  <el-button @click="addTopComment" type="primary" class="btn-top-comment">发表评论</el-button>
+  <el-button @click="addTopComment" type="primary" class="btn-top-comment"  >发表评论</el-button>
   <el-button class="btn-top-comment">其他</el-button>
   
-
   <el-divider />
+</div>
+
   <!-- 开始评论主体 -->
 
   <div v-for="item in commentList" :key="item.id" class="comment1">
@@ -31,13 +32,13 @@
     <span class="time"> {{ item.creationTime }} </span>
     <span class="pointer"><el-icon>
         <Pointer />
-      </el-icon> 4</span>
+      </el-icon> 0</span>
-    <el-button type="primary" @click="replay(item.createUser.nick, item.id, item.id)" size="large" text>回复</el-button>
+    <el-button type="primary" @click="replay(item.createUser.nick, item.id, item.id)" size="large" text v-hasPer="['bbs:comment:add']">回复</el-button>
-    <el-button  type="danger" @click="delComment(item.id)" size="large" text>删除</el-button>
+    <el-button  type="danger" @click="delComment(item.id)" size="large" text v-hasPer="['bbs:comment:remove']">删除</el-button>
     <div v-show="replayId == item.id" class="input-reply">
       <el-input v-model="form.content" :placeholder="placeholder" :rows="3" type="textarea"></el-input>
       <div class="btn-reply">
-        <el-button @click="addComment" type="primary">回复</el-button>
+        <el-button @click="addComment" type="primary" v-hasPer="['bbs:comment:add']">回复</el-button>
         
       </div>
     </div>
@@ -57,12 +58,12 @@
       <span class="pointer"> <el-icon>
           <Pointer />
         </el-icon>0</span>
-      <el-button  type="primary" @click="replay(children.createUser.nick, children.id, item.id)" size="large" text>回复</el-button>
+      <el-button  type="primary" @click="replay(children.createUser.nick, children.id, item.id)" size="large" text v-hasPer="['bbs:comment:add']">回复</el-button>
-      <el-button  type="danger" @click="delComment(children.id)" size="large" text>删除</el-button>
+      <el-button  type="danger" @click="delComment(children.id)" size="large" text v-hasPer="['bbs:comment:remove']">删除</el-button>
       <div v-show="replayId == children.id" class="input-reply">
       <el-input v-model="form.content" :placeholder="placeholder" :rows="3" type="textarea"></el-input>
       <div class="btn-reply">
-        <el-button @click="addComment" type="primary">回复</el-button>
+        <el-button @click="addComment" type="primary" v-hasPer="['bbs:comment:add']">回复</el-button>
       </div>
     </div>
 

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

@@ -1,85 +1,151 @@
 <template>
+    <el-badge :value="props.badge ?? ''" class="box-card">
+        <el-card shadow="never" :style="{ 'border-color': discuss.color }">
+            <el-row>
 
-      <el-badge  :value="props.badge??''" class="box-card"  >
+            <!-- 头部 -->
-    <el-card shadow="never" :style="{'border-color':props.color}" >
+                <el-col :span=24 class="card-header">
+                    <AvatarInfo :userInfo="discuss.user" :time="discuss.creationTime" />
+                </el-col>
 
-        <div class="card-header">
+
-          <AvatarInfo  :userInfo="props.user" :time="props.creationTime"/>
+                <!-- 身体 -->
-        </div>
+
+                <el-col :span=18 >
+                    <el-row>
+                        
+                        <el-col v-if="discuss.isBan" :span=24 class=" item item-title "> <el-link size="100" :underline="false"
+                        style="color:#F56C6C;" >{{ discuss.title }}</el-link></el-col>
+
+                    <el-col v-else :span=24 class=" item item-title "> <el-link size="100" :underline="false"
+                        @click="enterDiscuss(discuss.id)">{{ discuss.title }}</el-link></el-col>
 
                       
 
-        <div class=" item item-title "> <el-link size="100" :underline="false" @click="enterDiscuss(props.id)">{{props.title}}</el-link></div>
+                <el-col :span=24 class=" item item-description">{{ discuss.introduction }}</el-col>
-        <div class=" item item-description">{{props.introduction}}</div>
+                <el-col :span=24 class=" item item-tag"><el-tag v-for="i in 4" :key="i">教程</el-tag></el-col>
-        <div class=" item item-tag"><el-tag v-for="i in 4" :key="i">教程</el-tag></div>
+            </el-row>
-        <div class=" item item-bottom">
+                </el-col>
-            <el-space :size="10" :spacer="spacer">
-                <div class="item-description">
-                   {{ props.creationTime }}
-                </div>
          
 
-                <el-button  text @click="agree" >
+                <el-col :span=6 style="    display: flex;justify-content: center;">
-                    <el-icon v-if="isAgree" color="#409EFF"><CircleCheckFilled /></el-icon>
+                    <el-image  :preview-src-list="[getUrl(discuss.cover)]" v-if="discuss.cover" :src="getUrl(discuss.cover)"  style="width: 100px;height: 100px;"  />
-                    <el-icon v-else color="#1E1E1E" ><Pointer /></el-icon>     点赞:{{ agreeNum??0 }}</el-button>
+                </el-col>
-                <el-button icon="Star" text>
-                    收藏</el-button>
-               
-                    <el-button icon="View" text>
-                    浏览数:{{ props.seeNum??0 }}</el-button>
 
 
-            </el-space>
+
-        </div>
+                
-    </el-card>
+                <!-- 底部 -->
-</el-badge>
+                <el-col :span=24 class=" item item-bottom " style="    margin-bottom: 0;">
+                    <el-space :size="10" :spacer="spacer">
+                        <div class="item-description">
+                            {{ discuss.creationTime }}
+                        </div>
+
+
+                        <el-button text @click="agree">
+                            <el-icon v-if="discuss.isAgree" color="#409EFF">
+                                <CircleCheckFilled />
+                            </el-icon>
+                            <el-icon v-else color="#1E1E1E">
+                                <Pointer />
+                            </el-icon> 点赞:{{ discuss.agreeNum ?? 0 }}</el-button>
+                        <el-button icon="Star" text>
+                            收藏</el-button>
+
+                        <el-button icon="View" text>
+                            浏览数:{{ discuss.seeNum ?? 0 }}</el-button>
+
+
+                    </el-space>
+                </el-col>
+
+            </el-row>
+
+        </el-card>
+    </el-badge>
 </template>
 <script setup>
-import { h, ref ,toRef,onMounted} from 'vue'
+import { h, ref, toRef, onMounted ,reactive} from 'vue'
 import { useRouter } from 'vue-router'
 import AvatarInfo from './AvatarInfo.vue';
-import {operate} from '@/apis/agreeApi'
+import { operate } from '@/apis/agreeApi'
-
-const props = defineProps(['title','introduction','creationTime','id','user','badge',"color","seeNum","agreeNum","isAgree"])
 
+const props = defineProps(['discuss','badge'])
+const discuss=reactive({
+    id:'',
+    title:"",
+    introduction:"",
+    creationTime:"",
+    user:{},
+    color:"",
+    seeNum:0,
+    agreeNum:0,
+    isAgree:false,
+    cover:"",
+    isBan:false,
+    isAgree:false,
+    agreeNum:0
+})
 const router = useRouter()
 const spacer = h(ElDivider, { direction: 'vertical' })
 const enterDiscuss = (id) => {
     router.push(`/article/${id}`)
 }
-const agreeNum=ref(0)
+const getUrl= (str)=>{
-const isAgree=ref(false)
+return `${import.meta.env.VITE_APP_BASEAPI}/file/${str}`
-//点赞操作
-const agree=async ()=>{
-  const response=  await operate(props.id)
-  const res=response.data;
-  //提示框，颜色区分
-  if(res.isAgree)
-  {
-    isAgree.value=true;
-    agreeNum.value+=1;
-    ElMessage({
-    message: res.message,
-    type: 'success',
-  })
-  }
-  else
-  {
-    isAgree.value=false;
-    agreeNum.value-=1;
-    ElMessage({
-    message: res.message,
-    type: 'warning',
-  })
-  }
 }
-onMounted(()=>{
+
-    isAgree.value=props.isAgree;
+//点赞操作
-    agreeNum.value=props.agreeNum;
+const agree = async () => {
-    })
+    const response = await operate(discuss.id)
+    const res = response.data;
+    //提示框，颜色区分
+    if (res.isAgree) {
+        discuss.isAgree = true;
+        discuss.agreeNum += 1;
+        ElMessage({
+            message: res.message,
+            type: 'success',
+        })
+    }
+    else {
+        discuss.isAgree = false;
+        discuss.agreeNum-= 1;
+        ElMessage({
+            message: res.message,
+            type: 'warning',
+        })
+    }
+}
+onMounted(() => {
+
+    // id:'',
+    // title:"",
+    // introduction:"",
+    // creationTime:"",
+    // user:{},
+    // color:"",
+    // seeNum:0,
+    // agreeNum:0,
+    // isAgree:""
+    discuss.id=props.discuss.id;
+    discuss.title=props.discuss.title;
+    discuss.introduction=props.discuss.introduction;
+    discuss.creationTime=props.discuss.creationTime;
+    discuss.user=props.discuss.user;
+    discuss.color=props.discuss.color;
+    discuss.seeNum=props.discuss.seeNum;
+    discuss.isAgree=props.discuss.isAgree;
+    discuss.agreeNum=props.discuss.agreeNum;
+    discuss.isBan=props.discuss.isBan;
+    discuss.cover=props.discuss.cover;
+    discuss.value = props.isAgree;
+    discuss.value = props.agreeNum;
+})
 </script>
 <style scoped>
-.el-card{
+.el-card {
     border: 2px solid white
 }
 
@@ -127,5 +193,4 @@ onMounted(()=>{
     font-size: initial;
     font-weight: 700;
 }
-
 </style>

Yi.BBS.Vue3/src/components/echars/VisitsLineChart.vue

@@ -0,0 +1,51 @@
+<template>
+    <div ref="VisitsLineChart"></div>
+</template>
+<script setup>
+import * as echarts from 'echarts/core';
+import { GridComponent } from 'echarts/components';
+import { LineChart } from 'echarts/charts';
+import { UniversalTransition } from 'echarts/features';
+import { CanvasRenderer } from 'echarts/renderers';
+import { ref ,onMounted} from 'vue';
+
+echarts.use([GridComponent, LineChart, CanvasRenderer, UniversalTransition]);
+
+const VisitsLineChart=ref(null);
+
+onMounted(()=>{
+  var myChart = echarts.init(VisitsLineChart.value, null, {
+    width: 320,
+    height: 230
+  });
+var option;
+
+option = {
+  xAxis: {
+    type: 'category',
+    boundaryGap: false,
+    data: ['Mon', 'Tue', 'Wed', 'Thu', 'Fri', 'Sat', 'Sun']
+  },
+  yAxis: {
+    type: 'value'
+  },
+  series: [
+    {
+      data: [82, 93, 90, 93, 129, 133, 132],
+      type: 'line',
+      areaStyle: {}
+    }
+  ]
+};
+
+option && myChart.setOption(option);
+
+window.addEventListener('resize', function() {
+    myChart.resize();
+  });
+})
+
+
+
+
+</script>

Yi.BBS.Vue3/src/directive/permission/hasDiscussPermi.js

@@ -0,0 +1,29 @@
+ /**
+ * v-hasDiscussPermi 操作权限处理
+ */
+ 
+ import useUserStore from '@/stores/user'
+
+ //传一个值，一个主题id的创建者id，判断当前主题是否为自己创建，拥有*:*:*，直接跳过
+ export default {
+   mounted(el, binding, vnode) {
+     const { value } = binding
+     const all_permission = "*:*:*";
+     const permissions = useUserStore().permissions
+     const userId = useUserStore().id
+     if (value && value instanceof Array && value.length > 0) {
+       const permissionFlag = value
+ 
+       const hasPermissions = permissions.some(permission => {
+         return all_permission === permission || permissionFlag==userId
+       })
+ 
+       if (!hasPermissions) {
+         el.parentNode && el.parentNode.removeChild(el)
+       }
+     } else {
+       throw new Error(`请设置操作主题用户签值`)
+     }
+   }
+ }
+ 

Yi.BBS.Vue3/src/stores/user.js

@@ -53,7 +53,8 @@ const useUserStore = defineStore('user',
             // this.permissions=["*:*:*"]
             this.name = user.nick
             this.icon = avatar;
-            this.userName=user.userName
+            this.userName=user.userName;
+            this.id=user.id;
             resolve(res)
           }).catch(error => {
             reject(error)

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

@@ -39,7 +39,9 @@ const response=error.response.data;
 //业务异常+应用异常，统一处理
  switch(response.code) 
  {
-
+    case 401:
+    ElMessage.error('登录已过期')
+    break;
     case 403:  
     ElMessage.error(response.message)
     break;

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

@@ -5,7 +5,7 @@
       <el-col :span="5">
         <el-row class="art-info-left">
           <el-col :span="24">
-            <InfoCard header="主题信息" text="展开" hideDivider="true">
+            <InfoCard header="文章信息" text="展开" hideDivider="true">
               <template #content>
                 <el-button style="width: 100%; margin-bottom: 0.8rem" @click="loadDiscuss(true)">首页</el-button>
                 <el-button v-hasPer="['bbs:article:add']" @click="addArticle(0)" type="primary"
@@ -17,14 +17,14 @@
             </InfoCard>
           </el-col>
           <el-col :span="24">
-            <InfoCard :items="items" header="推荐好友" text="更多">
+            <InfoCard :items="items" header="作者分享" text="更多">
               <template #item="temp">
                 <AvatarInfo />
               </template>
             </InfoCard>
           </el-col>
           <el-col :span="24">
-            <InfoCard :items="items" header="推荐好友" text="更多">
+            <InfoCard :items="items" header="内容推荐" text="更多">
               <template #item="temp">
                 <AvatarInfo />
               </template>
@@ -41,6 +41,9 @@
             <!-- :userInfo="{nick:'qwe'} -->
             <el-divider />
             <h2>{{ discuss.title }}</h2>
+            <el-image  :preview-src-list="[getUrl(discuss.cover)]" v-if="discuss.cover" :src="getUrl(discuss.cover)"  style="width: 150px;height: 150px;"  />
+
+            
             <ArticleContentInfo :code="discuss.content??''"></ArticleContentInfo>
 
             <el-divider class="tab-divider" />
@@ -66,7 +69,7 @@
       <el-col :span="5">
         <el-row class="right-div">
           <el-col :span="24">
-            <InfoCard class="art-info-right" header="文章信息" text="更多" hideDivider="true">
+            <InfoCard class="art-info-right" header="主题信息" text="更多" hideDivider="true">
               <template #content>
                 <div>
                   <ul class="art-info-ul">
@@ -79,9 +82,9 @@
                       v-hasPer="['bbs:discuss:remove']"
                         @click="delHander(route.params.discussId)">删除</el-button>
                     </li>
-                    <li>分类： <span>文章</span></li>
+                    <li>分类： <span>主题</span></li>
                     标签：
-                    <el-tag type="success">文章</el-tag>
+                    <el-tag type="success">主题</el-tag>
                     <el-tag type="info">资源</el-tag>
                   </ul>
                 </div>
@@ -104,14 +107,14 @@
             </InfoCard>
           </el-col>
           <el-col :span="24">
-            <InfoCard :items="items" header="推荐好友" text="更多">
+            <InfoCard :items="items" header="其他" text="更多">
               <template #item="temp">
                 <AvatarInfo />
               </template>
             </InfoCard>
           </el-col>
           <el-col :span="24">
-            <InfoCard :items="items" header="推荐好友" text="更多">
+            <InfoCard :items="items" header="其他" text="更多">
               <template #item="temp">
                 <AvatarInfo />
               </template>
@@ -145,7 +148,10 @@ const items = [{ user: "用户1" }, { user: "用户2" }, { user: "用户3" }];
 const articleData = ref([]);
 //主题内容
 const discuss = ref({});
-
+//封面url
+const getUrl= (str)=>{
+return `${import.meta.env.VITE_APP_BASEAPI}/file/${str}`
+}
 
 //当前默认选择的子文章
 const currentNodeKey=route.params.articleId;

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

@@ -48,7 +48,7 @@
     <el-tab-pane label="最热" name="host">   </el-tab-pane>
   </el-tabs>
 
-  <el-collapse  >
+  <el-collapse class="collapse-list" style="background-color: #F0F2F5;" >
       <el-collapse-item >
         <template #title>
           <div class="collapse-top">
@@ -58,14 +58,14 @@
           </div>
         </template>
 <div class="div-item" v-for="i in topDiscussList" >
-  <DisscussCard :title="i.title" :isAgree="i.isAgree" :introduction="i.introduction" :creationTime="i.creationTime" :agreeNum="i.agreeNum" :id="i.id" :user="i.user" :color="i.color"  :seeNum="i.seeNum" badge="置顶"/>
+  <DisscussCard :discuss="i" badge="置顶"/>
 </div>
 </el-collapse-item>
 </el-collapse>
 <el-divider v-show="topDiscussList.length>0" />
   
 <div class="div-item" v-for="i in discussList" >
-  <DisscussCard :title="i.title" :isAgree="i.isAgree" :introduction="i.introduction" :creationTime="i.creationTime" :agreeNum="i.agreeNum" :id="i.id" :color="i.color"  :seeNum="i.seeNum" :user="i.user"/>
+  <DisscussCard :discuss="i"/>
 </div>
 <div>
     <el-pagination
@@ -210,4 +210,7 @@ display: flex;
 {
     width:20rem;
 }
+.collapse-list >>> .el-collapse-item__header {
+border-bottom-color: #F0F2F5 !important;
+}
 </style>

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

@@ -2,7 +2,7 @@
   <div style="width: 100%">
     <div class="body-div">
       <el-form label-width="120px" :model="editForm" label-position="left" :rules="rules" ref="ruleFormRef">
-        <el-form-item label="分类：">
+        <el-form-item label="类型：">
           <el-radio-group v-model="radio">
             <el-radio-button label="discuss">主题</el-radio-button>
             <el-radio-button label="article">文章</el-radio-button>
@@ -10,6 +10,16 @@
             <el-radio-button label="orther">其他</el-radio-button>
           </el-radio-group>
         </el-form-item>
+
+        <el-form-item label="权限：" v-if="route.query.artType == 'discuss'">
+          <el-radio-group v-model="perRadio">
+            <el-radio-button label="Public">公开</el-radio-button>
+            <el-radio-button label="Oneself">仅自己可见</el-radio-button>
+            <el-radio-button label="User">部分用户可见</el-radio-button>
+          </el-radio-group>
+        </el-form-item>
+
+
         <el-form-item v-if="route.query.artType == 'article'" label="子文章名称：" prop="name">
           <el-input placeholder="请输入" v-model="editForm.name" />
         </el-form-item>
@@ -22,8 +32,21 @@
         <el-form-item label="内容：" prop="content">
           <MavonEdit height="30rem" v-model="editForm.content" :codeStyle="codeStyle" />
         </el-form-item>
-        <el-form-item label="封面：">
+        <el-form-item label="封面：" v-if="route.query.artType == 'discuss'">
-          <el-input placeholder="请输入" />
+
+<!-- 主题封面选择 -->
+
+<el-upload
+    class="avatar-uploader"
+    :action="fileUploadUrl"
+    :show-file-list="false"
+    :on-success="onSuccess"
+  >
+    <el-image v-if="dialogImageUrl" :src="getUrl(dialogImageUrl)"  style="width: 178px;height: 178px;" class="avatar" />
+    <el-icon v-else class="avatar-uploader-icon"><Plus /></el-icon>
+  </el-upload>
+          
+
         </el-form-item>
         <el-form-item label="标签：" prop="types">
           <el-input placeholder="请输入" v-model="editForm.types" />
@@ -54,16 +77,32 @@ import {
 //数据定义
 const route = useRoute();
 const router = useRouter();
+const perRadio=ref("Public");
 const radio = ref(route.query.artType);
 const codeStyle = "atom-one-dark";
 
+//封面完整显示的url
+const fileUploadUrl=`${import.meta.env.VITE_APP_BASEAPI}/file`
+//封面的url
+const dialogImageUrl = ref('')
+
+//文件上传成功后
+const onSuccess=(response)=>{
+  dialogImageUrl.value=response[0].id
+}
+//封面url
+const getUrl= (str)=>{
+return `${import.meta.env.VITE_APP_BASEAPI}/file/${str}`
+}
+
+
 //整个页面上的表单
 const editForm = reactive({
   title: "",
   types: "",
   introduction: "",
   content: "",
-  name: ""
+  name: "",
 });
 
 //组装主题内容： 需要更新主题信息
@@ -87,7 +126,7 @@ const rules = reactive({
   ],
   content: [
     { required: true, message: "请输入内容", trigger: "blur" },
-    { min: 10, max: 4000, message: "长度 10 到4000", trigger: "blur" },
+    { min: 10, max: 4000, message: "长度 10 到9999", trigger: "blur" },
   ],
 });
 //提交按钮,需要区分操作类型
@@ -104,7 +143,8 @@ const submit = async (formEl) => {
         discuss.introduction = editForm.introduction;
         discuss.content = editForm.content;
         discuss.plateId = discuss.plateId ?? route.query.plateId
-
+        discuss.cover=dialogImageUrl.value;
+        discuss.permissionType=perRadio.value;
         //主题创建
         if (route.query.operType == "create") {
           const response = await discussAdd(discuss);
@@ -189,6 +229,8 @@ const loadDiscuss = async () => {
   editForm.types = res.types;
   editForm.introduction = res.introduction;
   discuss.plateId = res.plateId;
+  dialogImageUrl.value= res.cover;
+  perRadio.value=res.permissionType;
 };
 //加载文章
 const loadArticle = async () => {
@@ -210,4 +252,34 @@ const loadArticle = async () => {
   margin: 1.5rem;
   padding: 1.5rem;
 }
+
+
+
+.avatar-uploader >>>.el-upload {
+  border: 1px dashed var(--el-border-color);
+  border-radius: 6px;
+  cursor: pointer;
+  position: relative;
+  overflow: hidden;
+  transition: var(--el-transition-duration-fast);
+  
+}
+
+.avatar-uploader >>>.el-upload:hover {
+  border-color: var(--el-color-primary);
+}
+
+.el-icon.avatar-uploader-icon {
+  font-size: 28px;
+  color: #8c939d;
+  width: 178px;
+  height: 178px;
+  text-align: center;
+}
+.el-upload
+{
+  
+
+
+}
 </style>

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

@@ -1,91 +1,97 @@
 <template >
   <div style="width: 1200px;">
-  <el-row :gutter="20" class="top-div" >
+    <el-row :gutter="20" class="top-div">
 
-    <el-col :span="17">
+      <el-col :span="17">
-      <div class="scrollbar">
+        <div class="scrollbar">
-        <ScrollbarInfo/>
+          <ScrollbarInfo />
-      </div>
+        </div>
 
 
-      <el-row class="left-div">
+        <el-row class="left-div">
-        <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'}" >
+          <el-col :span="8" v-for="i in plateList" class="plate"
-          <PlateCard :name="i.name" :introduction="i.introduction" :id="i.id" />
+            :style="{ 'padding-left': i % 3 == 1 ? 0 : 0.2 + 'rem', 'padding-right': i % 3 == 0 ? 0 : 0.2 + 'rem' }">
+            <PlateCard :name="i.name" :introduction="i.introduction" :id="i.id" />
           </el-col>
 
-        <el-col :span="24" v-for="i in discussList">
+          <el-col :span="24" v-for="i in discussList">
-<DisscussCard :title="i.title" :introduction="i.introduction" :creationTime="i.creationTime" :agreeNum="i.agreeNum" :id="i.id" :user="i.user" :seeNum="i.seeNum" :isAgree="i.isAgree"/>
+            <DisscussCard :discuss="i" />
 
-        </el-col>
+          </el-col>
-        <el-col :span="24">
+          <el-col :span="24">
-           <el-empty  v-show="discussList.length<=0" description="推荐位置，空空如也" />
+            <el-empty v-show="discussList.length <= 0" description="推荐位置，空空如也" />
-        </el-col>
+          </el-col>
-      </el-row>
+        </el-row>
 
       </el-col>
 
-     <el-col :span="7">
+      <el-col :span="7">
-      <el-row class="right-div">
+        <el-row class="right-div">
-        <el-col :span="24" >
+          <el-col :span="24">
 
 
-          <el-carousel trigger="click" height="150px">
+            <el-carousel trigger="click" height="150px">
-      <el-carousel-item v-for="item in bannerList">
+              <el-carousel-item v-for="item in bannerList">
-        <div class="carousel-font" :style="{color:item.color}">{{ item.name }}</div>
+                <div class="carousel-font" :style="{ color: item.color }">{{ item.name }}</div>
-        <el-image style="width: 100%; height: 100%" :src="item.logo" fit="cover" />
+                <el-image style="width: 100%; height: 100%" :src="item.logo" fit="cover" />
-      </el-carousel-item>
+              </el-carousel-item>
-    </el-carousel>
+            </el-carousel>
 
-        </el-col>
+          </el-col>
 
-        <el-col :span="24" >
+          <el-col :span="24" >
-         <InfoCard  header="简介" text="详情">
+            <InfoCard header="访问统计" class="VisitsLineChart" text="详情">
-          <template #content >
+              <template #content>
-            <div class="introduce">
+                <VisitsLineChart />
 
-              没有什么能够阻挡，人类对代码<span style="color: #1890ff;">优雅</span>的追求
+              </template>
-            </div>
+            </InfoCard>
-       
+          </el-col>
-          </template>
-          </InfoCard>
-        </el-col>
-
-        <el-col :span="24" >
-          <InfoCard :items=items  header="本月排行" text="更多">
-           <template #item="temp">
-            <AvatarInfo>
-<template #bottom>
-  本月积分：680
-</template>
-              
-            </AvatarInfo>
-           </template>
-           </InfoCard>
-         </el-col>
 
 
-         <el-col :span="24" >
-          <InfoCard :items=items  header="推荐好友" text="更多">
-           <template #item="temp">
-            <AvatarInfo/>
-           </template>
-           </InfoCard>
-         </el-col>
-         <el-col :span="24" >
-          <InfoCard :items=items  header="其他" text="更多">
-           <template #item="temp">
-          {{temp}}
-           </template>
-           </InfoCard>
-         </el-col>
 
-         <el-col :span="24" style=" background: transparent;">
+          <el-col :span="24">
-        <BottomInfo/>
+            <InfoCard header="简介" text="详情">
-        </el-col>
+              <template #content>
-      </el-row>
+                <div class="introduce">
-    </el-col>
+
-  </el-row>
+                  没有什么能够阻挡，人类对代码<span style="color: #1890ff;">优雅</span>的追求
-</div>
+                </div>
+
+              </template>
+            </InfoCard>
+          </el-col>
+
+          <el-col :span="24">
+            <InfoCard :items=items header="本月排行" text="更多">
+              <template #item="temp">
+                <AvatarInfo>
+                  <template #bottom>
+                    本月积分：680
+                  </template>
+
+                </AvatarInfo>
+              </template>
+            </InfoCard>
+          </el-col>
+
+
+          <el-col :span="24">
+            <InfoCard :items=items header="推荐好友" text="更多">
+              <template #item="temp">
+                <AvatarInfo />
+              </template>
+            </InfoCard>
+          </el-col>
+
+
+          <el-col :span="24" style=" background: transparent;">
+            <BottomInfo />
+          </el-col>
+        </el-row>
+      </el-col>
+    </el-row>
+  </div>
 </template>
 
 <script setup>
@@ -95,68 +101,75 @@ import PlateCard from '@/components/PlateCard.vue'
 import ScrollbarInfo from '@/components/ScrollbarInfo.vue'
 import AvatarInfo from '@/components/AvatarInfo.vue'
 import BottomInfo from '@/components/BottomInfo.vue'
+import VisitsLineChart from '@/components/echars/VisitsLineChart.vue'
 
-import {getList} from '@/apis/plateApi.js'
+import { getList } from '@/apis/plateApi.js'
-import {getList as bannerGetList} from '@/apis/bannerApi.js'
+import { getList as bannerGetList } from '@/apis/bannerApi.js'
-import {getList as discussGetList} from '@/apis/discussApi.js'
+import { getList as discussGetList } from '@/apis/discussApi.js'
-import { onMounted, ref ,reactive} from 'vue'
+import { onMounted, ref, reactive } from 'vue'
-var plateList=ref([]);
+var plateList = ref([]);
-var discussList=ref([]);
+var discussList = ref([]);
-var bannerList=ref([]);
+var bannerList = ref([]);
 
-  const items=[{user:"用户1"},{user:"用户2"},{user:"用户3"}]
+const items = [{ user: "用户1" }, { user: "用户2" }, { user: "用户3" }]
- //主题查询参数 
+//主题查询参数 
-  const query=reactive({
+const query = reactive({
-  pageNum:1,
+  pageNum: 1,
-  pageSize:10,
+  pageSize: 10,
-  isTop:true
+  isTop: true
 });
 
 //初始化
-  onMounted(async()=>{
+onMounted(async () => {
-plateList.value= ( await getList()).data.items;
+  plateList.value = (await getList()).data.items;
-discussList.value=(await discussGetList(query)).data.items;
+  discussList.value = (await discussGetList(query)).data.items;
-bannerList.value=(await bannerGetList()).data.items
+  bannerList.value = (await bannerGetList()).data.items
-  });
+});
 
 
 </script>
 <style scoped >
-.introduce
+.introduce {
-{
+  color: rgba(0, 0, 0, .45);
-color: rgba(0,0,0,.45);
+  font-size: small;
-font-size: small;
 }
-.plate
+
-{
+.plate {
   background: transparent !important;
 
 }
-.left-div .el-col{
-background-color: #FFFFFF;
 
-margin-bottom: 1rem;
+.left-div .el-col {
-}
+  background-color: #FFFFFF;
-.right-div .el-col
+
-{
-  background-color:#FFFFFF;
   margin-bottom: 1rem;
 }
-.carousel-font{
+
+.right-div .el-col {
+  background-color: #FFFFFF;
+  margin-bottom: 1rem;
+}
+
+.carousel-font {
   position: absolute;
-    z-index: 1;
+  z-index: 1;
-    top: 10%;
+  top: 10%;
-    left: 10%;
+  left: 10%;
 }
 
 
-.top-div
+.top-div {
-{
 
   padding-top: 0.5rem;
 }
-.scrollbar
+
-{ display: block;
+.scrollbar {
+  display: block;
   margin-bottom: 0.5rem;
 }
+.VisitsLineChart >>> .el-card__body
+{
+
+  padding: 0.5rem;
+}
 </style>

Yi.Framework.Net6/src/framework/Yi.Framework.Core/Exceptions/AuthException.cs

@@ -21,8 +21,9 @@ namespace Yi.Framework.Core.Exceptions
         public LogLevel LogLevel { get; set; }
 
         public AuthException(
-    ResultCodeEnum code = ResultCodeEnum.NoPermission,
+
     string? message = null,
+        ResultCodeEnum code = ResultCodeEnum.NoPermission,
     string? details = null,
     Exception? innerException = null,
     LogLevel logLevel = LogLevel.Warning)

Yi.Framework.Net6/src/project/BBS/Yi.BBS.Application.Contracts/ApplicationContractsSwaggerDoc.xml

@@ -94,11 +94,36 @@
             Discuss输入创建对象
             </summary>
         </member>
+        <member name="P:Yi.BBS.Application.Contracts.Forum.Dtos.Discuss.DiscussCreateInputVo.PermissionType">
+            <summary>
+            默认公开
+            </summary>
+        </member>
+        <member name="P:Yi.BBS.Application.Contracts.Forum.Dtos.Discuss.DiscussCreateInputVo.Cover">
+            <summary>
+            封面
+            </summary>
+        </member>
         <member name="P:Yi.BBS.Application.Contracts.Forum.Dtos.Discuss.DiscussGetListOutputDto.IsAgree">
             <summary>
             是否已点赞
             </summary>
         </member>
+        <member name="P:Yi.BBS.Application.Contracts.Forum.Dtos.Discuss.DiscussGetListOutputDto.Cover">
+            <summary>
+            封面
+            </summary>
+        </member>
+        <member name="P:Yi.BBS.Application.Contracts.Forum.Dtos.Discuss.DiscussUpdateInputVo.Cover">
+            <summary>
+            封面
+            </summary>
+        </member>
+        <member name="P:Yi.BBS.Application.Contracts.Forum.Dtos.DiscussGetOutputDto.Cover">
+            <summary>
+            封面
+            </summary>
+        </member>
         <member name="T:Yi.BBS.Application.Contracts.Forum.Dtos.MyTypeCreateInputVo">
             <summary>
             Label输入创建对象

Yi.Framework.Net6/src/project/BBS/Yi.BBS.Application/ApplicationSwaggerDoc.xml

@@ -49,6 +49,13 @@
             <returns></returns>
             <exception cref="T:Yi.Framework.Core.Exceptions.UserFriendlyException"></exception>
         </member>
+        <member name="M:Yi.BBS.Application.Forum.ArticleService.VerifyDiscussCreateIdAsync(System.Nullable{System.Int64})">
+            <summary>
+            效验创建权限
+            </summary>
+            <param name="userId"></param>
+            <returns></returns>
+        </member>
         <member name="T:Yi.BBS.Application.Forum.CommentService">
             <summary>
             评论
@@ -96,6 +103,14 @@
             <param name="input"></param>
             <returns></returns>
         </member>
+        <member name="M:Yi.BBS.Application.Forum.DiscussService.VerifyDiscussPermissionAsync(System.Int64)">
+            <summary>
+            效验主题查询权限
+            </summary>
+            <param name="discussId"></param>
+            <returns></returns>
+            <exception cref="T:Yi.Framework.Core.Exceptions.UserFriendlyException"></exception>
+        </member>
         <member name="T:Yi.BBS.Application.Forum.MyTypeService">
             <summary>
             Label服务实现

Yi.Framework.Net6/src/project/BBS/Yi.BBS.Domain.Shared/Forum/EnumClasses/DiscussPermissionTypeEnum.cs

@@ -0,0 +1,27 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Yi.BBS.Domain.Shared.Forum.EnumClasses
+{
+    public enum DiscussPermissionTypeEnum
+    {
+        /// <summary>
+        /// 默认：公开
+        /// </summary>
+        Public = 0,
+
+        /// <summary>
+        /// 仅自己可见
+        /// </summary>
+        Oneself,
+
+        /// <summary>
+        /// 部分用户可见
+        /// </summary>
+        User
+
+    }
+}

Yi.Framework.Net6/src/project/BBS/Yi.BBS.Domain/DataSeeds/BbsMenuDataSeed.cs

@@ -24,6 +24,7 @@ namespace Yi.BBS.Domain.DataSeed
         public override List<MenuEntity> GetSeedData()
         {
             List<MenuEntity> entities = new List<MenuEntity>();
+
             //BBS
             MenuEntity bbs = new MenuEntity()
             {
@@ -39,6 +40,76 @@ namespace Yi.BBS.Domain.DataSeed
                 IsDeleted = false
             };
             entities.Add(bbs);
+
+
+            //评论管理
+            MenuEntity comment = new MenuEntity()
+            {
+                Id = SnowflakeHelper.NextId,
+                MenuName = "评论管理",
+                PermissionCode = "bbs:comment:list",
+                MenuType = MenuTypeEnum.Menu,
+                Router = "comment",
+                IsShow = true,
+                IsLink = false,
+                IsCache = true,
+                Component = "bbs/comment/index",
+                MenuIcon = "education",
+                OrderNum = 100,
+                ParentId = bbs.Id,
+                IsDeleted = false
+            };
+            entities.Add(comment);
+
+            MenuEntity commentQuery = new MenuEntity()
+            {
+                Id = SnowflakeHelper.NextId,
+                MenuName = "评论查询",
+                PermissionCode = "bbs:comment:query",
+                MenuType = MenuTypeEnum.Component,
+                OrderNum = 100,
+                ParentId = comment.Id,
+                IsDeleted = false
+            };
+            entities.Add(commentQuery);
+
+            MenuEntity commentAdd = new MenuEntity()
+            {
+                Id = SnowflakeHelper.NextId,
+                MenuName = "评论新增",
+                PermissionCode = "bbs:comment:add",
+                MenuType = MenuTypeEnum.Component,
+                OrderNum = 100,
+                ParentId = comment.Id,
+                IsDeleted = false
+            };
+            entities.Add(commentAdd);
+
+            MenuEntity commentEdit = new MenuEntity()
+            {
+                Id = SnowflakeHelper.NextId,
+                MenuName = "评论修改",
+                PermissionCode = "bbs:comment:edit",
+                MenuType = MenuTypeEnum.Component,
+                OrderNum = 100,
+                ParentId = comment.Id,
+                IsDeleted = false
+            };
+            entities.Add(commentEdit);
+
+            MenuEntity commentRemove = new MenuEntity()
+            {
+                Id = SnowflakeHelper.NextId,
+                MenuName = "评论删除",
+                PermissionCode = "bbs:comment:remove",
+                MenuType = MenuTypeEnum.Component,
+                OrderNum = 100,
+                ParentId = comment.Id,
+                IsDeleted = false
+            };
+            entities.Add(commentRemove);
+
+
             //文章管理
             MenuEntity article = new MenuEntity()
             {

Yi.Framework.Net6/src/project/BBS/Yi.BBS.Domain/DomainSwaggerDoc.xml

@@ -46,6 +46,11 @@
             被评论的用户信息
             </summary>
         </member>
+        <member name="P:Yi.BBS.Domain.Forum.Entities.DiscussEntity.Cover">
+            <summary>
+            封面
+            </summary>
+        </member>
         <member name="T:Yi.BBS.Domain.Forum.ForumManager">
             <summary>
             论坛模块的领域服务

Yi.Framework.Net6/src/project/BBS/Yi.BBS.Web/YiBBSWebModule.cs

@@ -13,6 +13,7 @@ using Yi.Framework.Data.Json;
 using Yi.Framework.OperLogManager;
 using Yi.Framework.Core.Module;
 using Microsoft.Extensions.Options;
+using System.Text.Json.Serialization;
 
 namespace Yi.BBS.Web
 {
@@ -30,7 +31,8 @@ namespace Yi.BBS.Web
             services.AddControllers().AddJsonOptions(opt => {
                 opt.JsonSerializerOptions.Converters.Add(new DateTimeJsonConverter("yyyy-MM-dd HH:mm:ss"));
                 opt.JsonSerializerOptions.Converters.Add(new LongToStringConverter());
-        }); 
+                opt.JsonSerializerOptions.Converters.Add(new JsonStringEnumConverter());
+            }); 
 
             services.AddAutoApiService(opt =>
             {

Yi.Framework.Net6/src/project/BBS/Yi.BBS.Web/appsettings.json

@@ -32,7 +32,7 @@
     "Audience": "yi",
     "Issuer": "localhost:19002",
     "Subject": "yiframwork",
-    "ExpSecond": 3600
+    "ExpSecond": 259200
   },
 
   //开启种子数据

Yi.Framework.Net6/src/project/bbs/Yi.BBS.Application.Contracts/ApplicationContractsSwaggerDoc.xml

@@ -94,11 +94,36 @@
             Discuss输入创建对象
             </summary>
         </member>
+        <member name="P:Yi.BBS.Application.Contracts.Forum.Dtos.Discuss.DiscussCreateInputVo.PermissionType">
+            <summary>
+            默认公开
+            </summary>
+        </member>
+        <member name="P:Yi.BBS.Application.Contracts.Forum.Dtos.Discuss.DiscussCreateInputVo.Cover">
+            <summary>
+            封面
+            </summary>
+        </member>
         <member name="P:Yi.BBS.Application.Contracts.Forum.Dtos.Discuss.DiscussGetListOutputDto.IsAgree">
             <summary>
             是否已点赞
             </summary>
         </member>
+        <member name="P:Yi.BBS.Application.Contracts.Forum.Dtos.Discuss.DiscussGetListOutputDto.Cover">
+            <summary>
+            封面
+            </summary>
+        </member>
+        <member name="P:Yi.BBS.Application.Contracts.Forum.Dtos.Discuss.DiscussUpdateInputVo.Cover">
+            <summary>
+            封面
+            </summary>
+        </member>
+        <member name="P:Yi.BBS.Application.Contracts.Forum.Dtos.DiscussGetOutputDto.Cover">
+            <summary>
+            封面
+            </summary>
+        </member>
         <member name="T:Yi.BBS.Application.Contracts.Forum.Dtos.MyTypeCreateInputVo">
             <summary>
             Label输入创建对象

Yi.Framework.Net6/src/project/bbs/Yi.BBS.Application.Contracts/Forum/Dtos/Discuss/DiscussCreateInputVo.cs

@@ -3,6 +3,7 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
+using Yi.BBS.Domain.Shared.Forum.EnumClasses;
 
 namespace Yi.BBS.Application.Contracts.Forum.Dtos.Discuss
 {
@@ -19,5 +20,14 @@ namespace Yi.BBS.Application.Contracts.Forum.Dtos.Discuss
         public string? Color { get; set; }
 
         public long plateId { get; set; }
+
+        /// <summary>
+        /// 默认公开
+        /// </summary>
+        public DiscussPermissionTypeEnum PermissionType { get; set; } = DiscussPermissionTypeEnum.Public;
+        /// <summary>
+        /// 封面
+        /// </summary>
+        public string? Cover { get; set; }
     }
 }

Yi.Framework.Net6/src/project/bbs/Yi.BBS.Application.Contracts/Forum/Dtos/Discuss/DiscussGetListInputVo.cs

@@ -18,6 +18,7 @@ namespace Yi.BBS.Application.Contracts.Forum.Dtos.Discuss
         //Ĭ<>ϲ<EFBFBD>ѯ<EFBFBD><D1AF><EFBFBD>ö<EFBFBD>
         public bool IsTop { get; set; } = false;
 
+
         //<2F><>ѯ<EFBFBD><D1AF>ʽ
         public QueryDiscussTypeEnum Type { get; set; } = QueryDiscussTypeEnum.New;
     }

Yi.Framework.Net6/src/project/bbs/Yi.BBS.Application.Contracts/Forum/Dtos/Discuss/DiscussGetListOutputDto.cs

@@ -4,6 +4,8 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
+using Yi.BBS.Domain.Shared.Forum.ConstClasses;
+using Yi.BBS.Domain.Shared.Forum.EnumClasses;
 using Yi.Framework.Ddd.Dtos;
 using Yi.RBAC.Application.Contracts.Identity.Dtos;
 
@@ -32,13 +34,58 @@ namespace Yi.BBS.Application.Contracts.Forum.Dtos.Discuss
         //<2F>Ƿ<EFBFBD><C7B7>ö<EFBFBD><C3B6><EFBFBD>Ĭ<EFBFBD><C4AC>false
         public bool IsTop { get; set; }
 
+        public DiscussPermissionTypeEnum PermissionType { get; set; }
+        //<2F>Ƿ<EFBFBD><C7B7><EFBFBD>ֹ<EFBFBD><D6B9>Ĭ<EFBFBD><C4AC>false
+        public bool IsBan { get; set; }
 
-        //<2F>Ƿ<EFBFBD>˽<EFBFBD>У<EFBFBD>Ĭ<EFBFBD><C4AC>false
+
-        public bool IsPrivate { get; set; }
+        /// <summary>
+        /// <20><><EFBFBD><EFBFBD>
+        /// </summary>
+        public string? Cover { get; set; }
 
         //˽<><CBBD><EFBFBD><EFBFBD>Ҫ<EFBFBD>ж<EFBFBD>codeȨ<65><C8A8>
         public string? PrivateCode { get; set; }
         public DateTime CreationTime { get; set; }
+
+
+
         public UserGetListOutputDto User { get; set; }
     }
+
+
+    public static class DiscussGetListOutputDtoExtension
+    {
+
+        public static void ApplyPermissionTypeFilter(this List<DiscussGetListOutputDto> dtos, long userId)
+        {
+            dtos?.ForEach(dto =>
+            {
+                switch (dto.PermissionType)
+                {
+                    case DiscussPermissionTypeEnum.Public:
+                        break;
+                    case DiscussPermissionTypeEnum.Oneself:
+                        //<2F><>ǰ<EFBFBD><C7B0><EFBFBD><EFBFBD><EFBFBD>ǽ<EFBFBD><C7BD>Լ<EFBFBD><D4BC>ɼ<EFBFBD><C9BC><EFBFBD>ͬʱ<CDAC><CAB1><EFBFBD>ǵ<EFBFBD>ǰ<EFBFBD><C7B0>¼<EFBFBD>û<EFBFBD>
+                        if (dto.User.Id != userId)
+                        {
+                            dto.Title = DiscussConst.˽<EFBFBD><EFBFBD>;
+                            dto.Introduction= "";
+                            dto.Cover = null;
+                            //<2F><><EFBFBD><EFBFBD>ֹ
+                            dto.IsBan = true;
+                        }
+                        break;
+                    case DiscussPermissionTypeEnum.User:
+                        break;
+                    default:
+                        break;
+                }
+
+
+            });
+        }
+
+    }
+
 }

Yi.Framework.Net6/src/project/bbs/Yi.BBS.Application.Contracts/Forum/Dtos/Discuss/DiscussGetOutputDto.cs

@@ -4,6 +4,7 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
+using Yi.BBS.Domain.Shared.Forum.EnumClasses;
 using Yi.Framework.Ddd.Dtos;
 using Yi.RBAC.Application.Contracts.Identity.Dtos;
 
@@ -25,14 +26,17 @@ namespace Yi.BBS.Application.Contracts.Forum.Dtos
         //<2F>Ƿ<EFBFBD><C7B7>ö<EFBFBD><C3B6><EFBFBD>Ĭ<EFBFBD><C4AC>false
         public bool IsTop { get; set; }
 
-
+        /// <summary>
+        /// <20><><EFBFBD><EFBFBD>
+        /// </summary>
+        public string? Cover { get; set; }
         //<2F>Ƿ<EFBFBD>˽<EFBFBD>У<EFBFBD>Ĭ<EFBFBD><C4AC>false
         public bool IsPrivate { get; set; }
 
         //˽<><CBBD><EFBFBD><EFBFBD>Ҫ<EFBFBD>ж<EFBFBD>codeȨ<65><C8A8>
         public string? PrivateCode { get; set; }
         public DateTime CreationTime { get; set; }
-
+        public DiscussPermissionTypeEnum PermissionType { get; set; }
         public UserGetListOutputDto User { get; set; }
     }
 }

Yi.Framework.Net6/src/project/bbs/Yi.BBS.Application.Contracts/Forum/Dtos/Discuss/DiscussUpdateInputVo.cs

@@ -3,6 +3,7 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
+using Yi.BBS.Domain.Shared.Forum.EnumClasses;
 
 namespace Yi.BBS.Application.Contracts.Forum.Dtos.Discuss
 {
@@ -15,5 +16,13 @@ namespace Yi.BBS.Application.Contracts.Forum.Dtos.Discuss
         public int SeeNum { get; set; }
         public string Content { get; set; }
         public string? Color { get; set; }
+
+
+        public DiscussPermissionTypeEnum PermissionType { get; set; }
+
+        /// <summary>
+        /// <20><><EFBFBD><EFBFBD>
+        /// </summary>
+        public string? Cover { get; set; }
     }
 }

Yi.Framework.Net6/src/project/bbs/Yi.BBS.Application.Contracts/Forum/IDiscussService.cs

@@ -14,6 +14,6 @@ namespace Yi.BBS.Application.Contracts.Forum
     /// </summary>
     public interface IDiscussService : ICrudAppService<DiscussGetOutputDto, DiscussGetListOutputDto, long, DiscussGetListInputVo, DiscussCreateInputVo, DiscussUpdateInputVo>
     {
-
+        Task VerifyDiscussPermissionAsync(long discussId);
     }
 }

Yi.Framework.Net6/src/project/bbs/Yi.BBS.Application/ApplicationSwaggerDoc.xml

@@ -49,6 +49,13 @@
             <returns></returns>
             <exception cref="T:Yi.Framework.Core.Exceptions.UserFriendlyException"></exception>
         </member>
+        <member name="M:Yi.BBS.Application.Forum.ArticleService.VerifyDiscussCreateIdAsync(System.Nullable{System.Int64})">
+            <summary>
+            效验创建权限
+            </summary>
+            <param name="userId"></param>
+            <returns></returns>
+        </member>
         <member name="T:Yi.BBS.Application.Forum.CommentService">
             <summary>
             评论
@@ -96,6 +103,14 @@
             <param name="input"></param>
             <returns></returns>
         </member>
+        <member name="M:Yi.BBS.Application.Forum.DiscussService.VerifyDiscussPermissionAsync(System.Int64)">
+            <summary>
+            效验主题查询权限
+            </summary>
+            <param name="discussId"></param>
+            <returns></returns>
+            <exception cref="T:Yi.Framework.Core.Exceptions.UserFriendlyException"></exception>
+        </member>
         <member name="T:Yi.BBS.Application.Forum.MyTypeService">
             <summary>
             Label服务实现

Yi.Framework.Net6/src/project/bbs/Yi.BBS.Application/Forum/ArticleService.cs

@@ -8,6 +8,9 @@ using Microsoft.AspNetCore.Mvc;
 using Yi.BBS.Domain.Forum.Repositories;
 using Yi.Framework.Ddd.Repositories;
 using Yi.BBS.Domain.Shared.Forum.ConstClasses;
+using Yi.BBS.Domain.Shared.Forum.EnumClasses;
+using Yi.Framework.Core.CurrentUsers;
+using Yi.RBAC.Domain.Shared.Identity.ConstClasses;
 
 namespace Yi.BBS.Application.Forum
 {
@@ -26,6 +29,11 @@ namespace Yi.BBS.Application.Forum
         [Autowired]
         private IRepository<DiscussEntity> _discussRepository { get; set; }
 
+        [Autowired]
+        private ICurrentUser _currentUser { get; set; }
+
+        [Autowired]
+        private IDiscussService _discussService { get; set; }
         /// <summary>
         /// 获取文章全部平铺信息
         /// </summary>
@@ -35,10 +43,8 @@ namespace Yi.BBS.Application.Forum
         [Route("/api/article/all/discuss-id/{discussId}")]
         public async Task<List<ArticleAllOutputDto>> GetAllAsync([FromRoute] long discussId)
         {
-            if (!await _discussRepository.IsAnyAsync(x => x.Id == discussId))
+            await _discussService.VerifyDiscussPermissionAsync(discussId);
-            {
+
-                throw new UserFriendlyException(DiscussConst.主题不存在);
-            }
 
             var entities = await _articleRepository.GetTreeAsync(x => x.DiscussId == discussId);
             //var result = entities.Tile();
@@ -72,7 +78,8 @@ namespace Yi.BBS.Application.Forum
         /// <exception cref="UserFriendlyException"></exception>
         public async override Task<ArticleGetOutputDto> CreateAsync(ArticleCreateInputVo input)
         {
-            if (!await _discussRepository.IsAnyAsync(x => x.Id == input.DiscussId))
+            var discuss = await _discussRepository.GetFirstAsync(x => x.Id == input.DiscussId);
+            if (discuss is null)
             {
                 throw new UserFriendlyException(DiscussConst.主题不存在);
             }
@@ -80,7 +87,27 @@ namespace Yi.BBS.Application.Forum
             {
                 throw new UserFriendlyException(ArticleConst.文章不存在);
             }
+            await VerifyDiscussCreateIdAsync(discuss.CreatorId);
             return await base.CreateAsync(input);
         }
+
+
+        /// <summary>
+        /// 效验创建权限
+        /// </summary>
+        /// <param name="userId"></param>
+        /// <returns></returns>
+        public async Task VerifyDiscussCreateIdAsync(long? userId)
+        {
+            //只有文章是特殊的，不能在其他主题下创建
+            //主题的创建者不是当前用户，同时，没有权限或者超级管理
+
+            //false  & true  & false  ,三个条件任意满意一个，即可成功使用||，最后取反，一个都不满足
+            //
+            if (userId != _currentUser.Id && !UserConst.Admin.Equals( _currentUser.UserName)&& !_currentUser.Permission.Contains("bbs:discuss:add"))
+            {
+                throw new UserFriendlyException("无权限在其他用户主题中创建子文章");
+            }
+        }
     }
 }

Yi.Framework.Net6/src/project/bbs/Yi.BBS.Application/Forum/CommentService.cs

@@ -34,7 +34,8 @@ namespace Yi.BBS.Application.Forum
         [Autowired]
         private IRepository<DiscussEntity> _discussRepository { get; set; }
 
-
+        [Autowired]
+        private IDiscussService _discussService { get; set; }
         /// <summary>
         /// 获取改主题下的评论,结构为二维列表，该查询无分页
         /// </summary>
@@ -43,6 +44,7 @@ namespace Yi.BBS.Application.Forum
         /// <returns></returns>
         public async Task<PagedResultDto<CommentGetListOutputDto>> GetDiscussIdAsync([FromRoute] long discussId, [FromQuery] CommentGetListInputVo input)
         {
+            await _discussService.VerifyDiscussPermissionAsync(discussId);
 
             var entities = await _DbQueryable.WhereIF(!string.IsNullOrEmpty(input.Content), x => x.Content.Contains(input.Content))
               .Where(x => x.DiscussId == discussId)

Yi.Framework.Net6/src/project/bbs/Yi.BBS.Application/Forum/DiscussService.cs

@@ -29,6 +29,10 @@ namespace Yi.BBS.Application.Forum
     public class DiscussService : CrudAppService<DiscussEntity, DiscussGetOutputDto, DiscussGetListOutputDto, long, DiscussGetListInputVo, DiscussCreateInputVo, DiscussUpdateInputVo>,
        IDiscussService, IAutoApiService
     {
+        public DiscussService(ICurrentUser currentUser)
+        {
+            _currentUser = currentUser;
+        }
         [Autowired]
         private ForumManager _forumManager { get; set; }
 
@@ -38,7 +42,7 @@ namespace Yi.BBS.Application.Forum
         [Autowired]
         private IDistributedEventBus _distributedEventBus { get; set; }
 
-        [Autowired]
+        //[Autowired]
         private ICurrentUser _currentUser { get; set; }
         /// <summary>
         /// 单查
@@ -47,12 +51,16 @@ namespace Yi.BBS.Application.Forum
         /// <returns></returns>
         public async override Task<DiscussGetOutputDto> GetAsync(long id)
         {
+
             //查询主题发布 浏览主题 事件，浏览数+1
             var item = await _DbQueryable.LeftJoin<UserEntity>((discuss, user) => discuss.CreatorId == user.Id)
                      .Select((discuss, user) => new DiscussGetOutputDto
                      {
                          User = new UserGetListOutputDto() { UserName = user.UserName, Nick = user.Nick, Icon = user.Icon }
                      }, true).SingleAsync(discuss => discuss.Id == id);
+
+           await VerifyDiscussPermissionAsync(item.Id);
+
             if (item is not null)
             {
                 _distributedEventBus.PublishAsync(new SeeDiscussEventArgs { DiscussId = item.Id, OldSeeNum = item.SeeNum });
@@ -84,9 +92,14 @@ namespace Yi.BBS.Application.Forum
                      {
                          Id=discuss.Id,
                          IsAgree = SqlFunc.Subqueryable<AgreeEntity>().Where(x => x.CreatorId == _currentUser.Id && x.DiscussId == discuss.Id).Any(),
-                         User = new UserGetListOutputDto() { UserName = user.UserName, Nick = user.Nick, Icon = user.Icon }
+                       
+                         User = new UserGetListOutputDto() { Id=user.Id, UserName = user.UserName, Nick = user.Nick, Icon = user.Icon }
+                        
                      }, true)
                 .ToPageListAsync(input.PageNum, input.PageSize, total);
+
+            //查询完主题之后，要过滤一下私有的主题信息
+            items.ApplyPermissionTypeFilter(_currentUser.Id);
             return new PagedResultDto<DiscussGetListOutputDto>(total, items);
         }
 
@@ -101,8 +114,33 @@ namespace Yi.BBS.Application.Forum
             {
                 throw new UserFriendlyException(PlateConst.板块不存在);
             }
-            var entity = await _forumManager.CreateDiscussAsync(input.plateId, input.Title, input.Types, input.Content, input.Introduction);
+            var entity = await _forumManager.CreateDiscussAsync(await MapToEntityAsync(input));
             return await MapToGetOutputDtoAsync(entity);
         }
+
+
+
+
+        /// <summary>
+        /// 效验主题查询权限
+        /// </summary>
+        /// <param name="discussId"></param>
+        /// <returns></returns>
+        /// <exception cref="UserFriendlyException"></exception>
+        public async Task VerifyDiscussPermissionAsync(long discussId)
+        {
+            var discuss = await _repository.GetFirstAsync(x => x.Id == discussId);
+            if (discuss is null)
+            {
+                throw new UserFriendlyException(DiscussConst.主题不存在);
+            }
+            if (discuss.PermissionType == DiscussPermissionTypeEnum.Oneself)
+            {
+                if (discuss.CreatorId != _currentUser.Id)
+                {
+                    throw new UserFriendlyException(DiscussConst.私密);
+                }
+            }
+        }
     }
 }

Yi.Framework.Net6/src/project/bbs/Yi.BBS.Domain.Shared/Forum/ConstClasses/ArticleConst.cs

@@ -13,5 +13,7 @@ namespace Yi.BBS.Domain.Shared.Forum.ConstClasses
     public class ArticleConst
     {
         public const string 文章不存在 = "传入的文章id不存在";
+
+        public const string 文章无权限 = "该文章无权限";
     }
 }

Yi.Framework.Net6/src/project/bbs/Yi.BBS.Domain.Shared/Forum/ConstClasses/DiscussConst.cs

@@ -13,5 +13,7 @@ namespace Yi.BBS.Domain.Shared.Forum.ConstClasses
     public class DiscussConst
     {
         public const string 主题不存在 = "传入的主题id不存在";
+
+        public const string 私密 = "【私密】您无该主题权限";
     }
 }

Yi.Framework.Net6/src/project/bbs/Yi.BBS.Domain/DataSeeds/BbsMenuDataSeed.cs

@@ -24,6 +24,7 @@ namespace Yi.BBS.Domain.DataSeed
         public override List<MenuEntity> GetSeedData()
         {
             List<MenuEntity> entities = new List<MenuEntity>();
+
             //BBS
             MenuEntity bbs = new MenuEntity()
             {
@@ -39,6 +40,76 @@ namespace Yi.BBS.Domain.DataSeed
                 IsDeleted = false
             };
             entities.Add(bbs);
+
+
+            //评论管理
+            MenuEntity comment = new MenuEntity()
+            {
+                Id = SnowflakeHelper.NextId,
+                MenuName = "评论管理",
+                PermissionCode = "bbs:comment:list",
+                MenuType = MenuTypeEnum.Menu,
+                Router = "comment",
+                IsShow = true,
+                IsLink = false,
+                IsCache = true,
+                Component = "bbs/comment/index",
+                MenuIcon = "education",
+                OrderNum = 100,
+                ParentId = bbs.Id,
+                IsDeleted = false
+            };
+            entities.Add(comment);
+
+            MenuEntity commentQuery = new MenuEntity()
+            {
+                Id = SnowflakeHelper.NextId,
+                MenuName = "评论查询",
+                PermissionCode = "bbs:comment:query",
+                MenuType = MenuTypeEnum.Component,
+                OrderNum = 100,
+                ParentId = comment.Id,
+                IsDeleted = false
+            };
+            entities.Add(commentQuery);
+
+            MenuEntity commentAdd = new MenuEntity()
+            {
+                Id = SnowflakeHelper.NextId,
+                MenuName = "评论新增",
+                PermissionCode = "bbs:comment:add",
+                MenuType = MenuTypeEnum.Component,
+                OrderNum = 100,
+                ParentId = comment.Id,
+                IsDeleted = false
+            };
+            entities.Add(commentAdd);
+
+            MenuEntity commentEdit = new MenuEntity()
+            {
+                Id = SnowflakeHelper.NextId,
+                MenuName = "评论修改",
+                PermissionCode = "bbs:comment:edit",
+                MenuType = MenuTypeEnum.Component,
+                OrderNum = 100,
+                ParentId = comment.Id,
+                IsDeleted = false
+            };
+            entities.Add(commentEdit);
+
+            MenuEntity commentRemove = new MenuEntity()
+            {
+                Id = SnowflakeHelper.NextId,
+                MenuName = "评论删除",
+                PermissionCode = "bbs:comment:remove",
+                MenuType = MenuTypeEnum.Component,
+                OrderNum = 100,
+                ParentId = comment.Id,
+                IsDeleted = false
+            };
+            entities.Add(commentRemove);
+
+
             //文章管理
             MenuEntity article = new MenuEntity()
             {

Yi.Framework.Net6/src/project/bbs/Yi.BBS.Domain/DomainSwaggerDoc.xml

@@ -46,6 +46,11 @@
             被评论的用户信息
             </summary>
         </member>
+        <member name="P:Yi.BBS.Domain.Forum.Entities.DiscussEntity.Cover">
+            <summary>
+            封面
+            </summary>
+        </member>
         <member name="T:Yi.BBS.Domain.Forum.ForumManager">
             <summary>
             论坛模块的领域服务

Yi.Framework.Net6/src/project/bbs/Yi.BBS.Domain/Forum/Entities/DiscussEntity.cs

@@ -5,6 +5,7 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 using System.Xml.Linq;
+using Yi.BBS.Domain.Shared.Forum.EnumClasses;
 using Yi.Framework.Data.Auditing;
 using Yi.Framework.Data.Entities;
 using Yi.Framework.Ddd.Entities;
@@ -12,7 +13,7 @@ using Yi.Framework.Ddd.Entities;
 namespace Yi.BBS.Domain.Forum.Entities
 {
     [SugarTable("Discuss")]
-    public class DiscussEntity : IEntity<long>, ISoftDelete,IAuditedObject
+    public class DiscussEntity : IEntity<long>, ISoftDelete, IAuditedObject
     {
         public DiscussEntity()
         {
@@ -29,7 +30,10 @@ namespace Yi.BBS.Domain.Forum.Entities
         public string? Introduction { get; set; }
         public int AgreeNum { get; set; }
         public int SeeNum { get; set; }
-
+        /// <summary>
+        /// 封面
+        /// </summary>
+        public string? Cover { get; set; }
         public string Content { get; set; }
 
         public string? Color { get; set; }
@@ -40,11 +44,7 @@ namespace Yi.BBS.Domain.Forum.Entities
         public bool IsTop { get; set; }
 
 
-        //是否私有，默认false
+        public DiscussPermissionTypeEnum PermissionType { get; set; }
-        public bool IsPrivate { get; set; }
-
-        //私有需要判断code权限
-        public string? PrivateCode { get; set; }
 
         public long PlateId { get; set; }
         public DateTime CreationTime { get; set; }

Yi.Framework.Net6/src/project/bbs/Yi.BBS.Domain/Forum/ForumManager.cs

@@ -26,14 +26,9 @@ namespace Yi.BBS.Domain.Forum
         }
 
         //主题是不能直接创建的，需要由领域服务统一创建
-        public async Task<DiscussEntity> CreateDiscussAsync(long plateId, string title, string types, string content, string? introduction = null)
+        public async Task<DiscussEntity> CreateDiscussAsync(DiscussEntity entity)
         {
-            var entity = new DiscussEntity(plateId);
             entity.Id = SnowflakeHelper.NextId;
-            entity.Title = title;
-            entity.Types = types;
-            entity.Introduction = introduction;
-            entity.Content = content;
             entity.CreationTime = DateTime.Now;
             entity.AgreeNum = 0;
             entity.SeeNum = 0;

Yi.Framework.Net6/src/project/bbs/Yi.BBS.Web/YiBBSWebModule.cs

@@ -13,6 +13,7 @@ using Yi.Framework.Data.Json;
 using Yi.Framework.OperLogManager;
 using Yi.Framework.Core.Module;
 using Microsoft.Extensions.Options;
+using System.Text.Json.Serialization;
 
 namespace Yi.BBS.Web
 {
@@ -30,7 +31,8 @@ namespace Yi.BBS.Web
             services.AddControllers().AddJsonOptions(opt => {
                 opt.JsonSerializerOptions.Converters.Add(new DateTimeJsonConverter("yyyy-MM-dd HH:mm:ss"));
                 opt.JsonSerializerOptions.Converters.Add(new LongToStringConverter());
-        }); 
+                opt.JsonSerializerOptions.Converters.Add(new JsonStringEnumConverter());
+            }); 
 
             services.AddAutoApiService(opt =>
             {

Yi.Framework.Net6/src/project/bbs/Yi.BBS.Web/appsettings.json

@@ -32,7 +32,7 @@
     "Audience": "yi",
     "Issuer": "localhost:19002",
     "Subject": "yiframwork",
-    "ExpSecond": 3600
+    "ExpSecond": 259200
   },
 
   //开启种子数据