From 4097244d5b406e3a2866ce6d8af104e734823682 Mon Sep 17 00:00:00 2001
From: chenchun <chenchun@hytch.com>
Date: Wed, 7 Aug 2024 11:12:01 +0800
Subject: [PATCH] =?UTF-8?q?style:=20=E4=BF=AE=E5=A4=8D=E6=B6=88=E6=81=AF?=
 =?UTF-8?q?=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Consts/DiscussConst.cs                    | 39 +++------
 .../CommentCreatedEventHandler.cs             | 10 ++-
 .../Services/FileService.cs                   |  6 ++
 Yi.Abp.Net8/src/Yi.Abp.Web/Yi.Abp.Web.csproj  |  3 +
 Yi.Bbs.Vue3/src/views/home/Index.vue          | 80 +++++++++----------
 5 files changed, 70 insertions(+), 68 deletions(-)

diff --git a/Yi.Abp.Net8/module/bbs/Yi.Framework.Bbs.Domain.Shared/Consts/DiscussConst.cs b/Yi.Abp.Net8/module/bbs/Yi.Framework.Bbs.Domain.Shared/Consts/DiscussConst.cs
index 29103247..f0a7d249 100644
--- a/Yi.Abp.Net8/module/bbs/Yi.Framework.Bbs.Domain.Shared/Consts/DiscussConst.cs
+++ b/Yi.Abp.Net8/module/bbs/Yi.Framework.Bbs.Domain.Shared/Consts/DiscussConst.cs
@@ -9,7 +9,6 @@ namespace Yi.Framework.Bbs.Domain.Shared.Consts
     /// <summary>
     /// 常量定义
     /// </summary>
-
     public class DiscussConst
     {
         public const string No_Exist = "传入的主题id不存在";
@@ -18,32 +17,20 @@ namespace Yi.Framework.Bbs.Domain.Shared.Consts
 
         public const string AgreeNotice = """
                                           <div>
-                                           <h3 class="title" style="color: #333; font-size: 18px; margin: 0 0 10px;">🍗 您的主题 [{0}] 被 [{1}] 用户点赞！</h3>
-                                                  <p class="link" style="color: #555;font-size: 16px;">
-                                                      点击前往主题地址： 
-                                                      <a href="/article/{2}" target="_blank" style="color: #007BFF;text-decoration: none;">https://ccnetcore.com/article/{2}</a>
-                                                  </p>
+                                           <h3 class="title" style="color: #333; font-size: 18px; margin: 0 0 10px;">🍗 您的主题 [<a href="/article/{2}" target="_blank" style="color: #007BFF;text-decoration: none;">{0}</a>] 有 [{1}] 用户点赞！</h3>
                                           </div>
                                           """;
+
         public const string CommentNotice = """
-                                             <div>
-                                              <h3 class="title" style="color: #333; font-size: 18px; margin: 0 0 10px;">🍖 您的主题 [{0}] 被 [{1}] 用户评论!</h3>
-                                                     <p class="link" style="color: #555;font-size: 16px;">
-                                                         评论内容：[{2}]
-                                                         点击前往主题地址： 
-                                                         <a href="/article/{3}" target="_blank" style="color: #007BFF;text-decoration: none;">https://ccnetcore.com/article/{3}</a>
-                                                     </p>
-                                             </div>
-                                             """;
-        public const string CommentNoticeToReply= """
-                                                  <div>
-                                                   <h3 class="title" style="color: #333; font-size: 18px; margin: 0 0 10px;">🍖 您在主题 [{0}] 的评论被 [{1}] 用户回复!</h3>
-                                                          <p class="link" style="color: #555;font-size: 16px;">
-                                                              评论内容：[{2}]
-                                                              点击前往主题地址： 
-                                                              <a href="/article/{3}" target="_blank" style="color: #007BFF;text-decoration: none;">https://ccnetcore.com/article/{3}</a>
-                                                          </p>
-                                                  </div>
-                                                  """;
+                                            <div>
+                                             <h3 class="title" style="color: #333; font-size: 18px; margin: 0 0 10px;">🍖 您的主题 [<a href="/article/{3}" target="_blank" style="color: #007BFF;text-decoration: none;">{0}</a>] 有 [{1}] 用户评论!</h3>
+                                            </div>
+                                            """;
+
+        public const string CommentNoticeToReply = """
+                                                   <div>
+                                                    <h3 class="title" style="color: #333; font-size: 18px; margin: 0 0 10px;">🍖 您在主题 [<a href="/article/{3}" target="_blank" style="color: #007BFF;text-decoration: none;">{0}</a>] 的评论有 [{1}] 用户回复!</h3>
+                                                   </div>
+                                                   """;
     }
-}
+}
\ No newline at end of file
diff --git a/Yi.Abp.Net8/module/bbs/Yi.Framework.Bbs.Domain/EventHandlers/CommentCreatedEventHandler.cs b/Yi.Abp.Net8/module/bbs/Yi.Framework.Bbs.Domain/EventHandlers/CommentCreatedEventHandler.cs
index b37a15de..0c5f63c3 100644
--- a/Yi.Abp.Net8/module/bbs/Yi.Framework.Bbs.Domain/EventHandlers/CommentCreatedEventHandler.cs
+++ b/Yi.Abp.Net8/module/bbs/Yi.Framework.Bbs.Domain/EventHandlers/CommentCreatedEventHandler.cs
@@ -54,9 +54,15 @@ namespace Yi.Framework.Bbs.Domain.EventHandlers
             var content = commentEntity.Content.Length >= 30 ? commentEntity.Content.Substring(0, 30)+"..." : commentEntity.Content;
             //通知主题作者，有人评论
             await _localEventBus.PublishAsync(new BbsNoticeEventArgs(disucssDto.DiscussUserId, string.Format(DiscussConst.CommentNotice, disucssDto.DiscussTitle, commentUser.UserName, content,commentEntity.DiscussId)), false);
-            //通知回复者，有人评论
-            await _localEventBus.PublishAsync(new BbsNoticeEventArgs(commentEntity.ParentId, string.Format(DiscussConst.CommentNoticeToReply, disucssDto.DiscussTitle, commentUser.UserName, content,commentEntity.DiscussId)), false);
 
+            //如果为空，表示根路径，没有回复者
+            if (commentEntity.ParentId != Guid.Empty)
+            {
+                //通知回复者，有人评论
+                await _localEventBus.PublishAsync(new BbsNoticeEventArgs(commentEntity.ParentId, string.Format(DiscussConst.CommentNoticeToReply, disucssDto.DiscussTitle, commentUser.UserName, content,commentEntity.DiscussId)), false);
+
+            }
+         
         }
     }
 }
diff --git a/Yi.Abp.Net8/module/rbac/Yi.Framework.Rbac.Application/Services/FileService.cs b/Yi.Abp.Net8/module/rbac/Yi.Framework.Rbac.Application/Services/FileService.cs
index 56487a81..f0287ad9 100644
--- a/Yi.Abp.Net8/module/rbac/Yi.Framework.Rbac.Application/Services/FileService.cs
+++ b/Yi.Abp.Net8/module/rbac/Yi.Framework.Rbac.Application/Services/FileService.cs
@@ -37,6 +37,12 @@ namespace Yi.Framework.Rbac.Application.Services
         {
             var path = await GetReturnPathAsync(code, isThumbnail);
 
+            if (!File.Exists(path))
+            {
+                throw new UserFriendlyException("文件不存在",code:"404");
+            }
+            
+
             var steam = await File.ReadAllBytesAsync(path);
 
             //考虑从路径中获取
diff --git a/Yi.Abp.Net8/src/Yi.Abp.Web/Yi.Abp.Web.csproj b/Yi.Abp.Net8/src/Yi.Abp.Web/Yi.Abp.Web.csproj
index e116a610..f50d8a24 100644
--- a/Yi.Abp.Net8/src/Yi.Abp.Web/Yi.Abp.Web.csproj
+++ b/Yi.Abp.Net8/src/Yi.Abp.Web/Yi.Abp.Web.csproj
@@ -37,6 +37,9 @@
     <Content Update="wwwroot\icon\**">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </Content>
+    <Content Update="appsettings.Development.json">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </Content>
   </ItemGroup>
 
   <ItemGroup>
diff --git a/Yi.Bbs.Vue3/src/views/home/Index.vue b/Yi.Bbs.Vue3/src/views/home/Index.vue
index c4535796..59db4649 100644
--- a/Yi.Bbs.Vue3/src/views/home/Index.vue
+++ b/Yi.Bbs.Vue3/src/views/home/Index.vue
@@ -82,9 +82,9 @@
                 <div class="top">你好，很高兴今天又遇到你呀~</div>
                 <el-row class="active">
              
-                  <el-col v-for="item in activeList" :span="6">
+                  <el-col v-for="item in activeList" :span="6" @click="handleToRouter(item.path)">
 
-                    <el-icon color="#70aafb" size="30px" @click="handleToRouter(item.path)">
+                    <el-icon color="#70aafb" size="30px" >
                       <component :is="item.icon"></component>
                     </el-icon>
                     <span> {{item.name}}</span>
@@ -176,8 +176,8 @@
 </template>
 
 <script setup>
-import { onMounted, ref, reactive, computed, nextTick, watch } from "vue";
-import { useRouter } from "vue-router";
+import {onMounted, ref, reactive, computed, nextTick, watch} from "vue";
+import {useRouter} from "vue-router";
 import DisscussCard from "@/components/DisscussCard.vue";
 import InfoCard from "@/components/InfoCard.vue";
 import PlateCard from "@/components/PlateCard.vue";
@@ -185,18 +185,18 @@ import ScrollbarInfo from "@/components/ScrollbarInfo.vue";
 import BottomInfo from "@/components/BottomInfo.vue";
 import VisitsLineChart from "./components/VisitsLineChart/index.vue";
 import AccessLogChart from "./components/AccessLogChart/Index.vue"
-import { access, getAccessList } from "@/apis/accessApi.js";
-import { getList } from "@/apis/plateApi.js";
-import { getList as bannerGetList } from "@/apis/bannerApi.js";
-import { getHomeDiscuss } from "@/apis/discussApi.js";
-import { getWeek } from "@/apis/accessApi.js";
+import {access, getAccessList} from "@/apis/accessApi.js";
+import {getList} from "@/apis/plateApi.js";
+import {getList as bannerGetList} from "@/apis/bannerApi.js";
+import {getHomeDiscuss} from "@/apis/discussApi.js";
+import {getWeek} from "@/apis/accessApi.js";
 import {
   getRecommendedTopic,
   getRecommendedFriend,
   getRankingPoints,
   getUserAnalyse,
 } from "@/apis/analyseApi.js";
-import { getList as getAllDiscussList } from "@/apis/discussApi.js";
+import {getList as getAllDiscussList} from "@/apis/discussApi.js";
 import PointsRanking from "./components/PointsRanking/index.vue";
 import RecommendFriend from "./components/RecommendFriend/index.vue";
 import ThemeData from "./components/RecommendTheme/index.vue";
@@ -224,16 +224,16 @@ const isAllDiscussFinished = ref(false);
 const userAnalyseInfo = ref({});
 const onlineNumber = ref(0);
 
-const activeList=[
-{name:"签到",path:"/activity/sign",icon:"Present"},
-{name:"等级",path:"/activity/level",icon:"Ticket"},
-{name:"大转盘",path:"/activity/lucky",icon:"Sunny"},
-{name:"银行",path:"/activity/bank",icon:"Money"},
+const activeList = [
+  {name: "签到", path: "/activity/sign", icon: "Present"},
+  {name: "等级", path: "/activity/level", icon: "Ticket"},
+  {name: "大转盘", path: "/activity/lucky", icon: "Sunny"},
+  {name: "银行", path: "/activity/bank", icon: "Money"},
 
-{name:"任务",path:"/activity/sign",icon:"Memo"},
-{name:"娱乐城",path:"/activity/sign",icon:"Sunrise"},
-{name:"其他",path:"/activity/sign",icon:"Sunny"},
-{name:"其他",path:"/activity/sign",icon:"Sunny"},
+  {name: "任务", path: "/activity/sign", icon: "Memo"},
+  {name: "娱乐城", path: "/activity/sign", icon: "Sunrise"},
+  {name: "开始", path: "/start", icon: "Position"},
+  {name: "聊天室", path: "/chat", icon: "ChatRound"},
 ];
 
 //主题查询参数
@@ -246,34 +246,34 @@ const query = reactive({
 //初始化
 onMounted(async () => {
   access();
-  const { data: plateData } = await getList();
+  const {data: plateData} = await getList();
   plateList.value = plateData.items;
-  const { data: discussData, config: discussConfig } = await getHomeDiscuss();
+  const {data: discussData, config: discussConfig} = await getHomeDiscuss();
   discussList.value = discussData;
   isDiscussFinished.value = discussConfig.isFinish;
-  const { data: bannerData } = await bannerGetList();
+  const {data: bannerData} = await bannerGetList();
   bannerList.value = bannerData.items;
-  const { data: weekData } = await getWeek();
+  const {data: weekData} = await getWeek();
   weekList.value = weekData;
-  const { data: pointData, config: pointConfig } = await getRankingPoints();
+  const {data: pointData, config: pointConfig} = await getRankingPoints();
   pointList.value = pointData;
   isPointFinished.value = pointConfig.isFinish;
-  const { data: friendData, config: friendConfig } =
-    await getRecommendedFriend();
+  const {data: friendData, config: friendConfig} =
+      await getRecommendedFriend();
   friendList.value = friendData;
   isFriendFinished.value = friendConfig.isFinish;
-  const { data: themeData, config: themeConfig } = await getRecommendedTopic();
+  const {data: themeData, config: themeConfig} = await getRecommendedTopic();
   themeList.value = themeData;
   isThemeFinished.value = themeConfig.isFinish;
-  const { data: allDiscussData, config: allDiscussConfig } =
-    await getAllDiscussList({
-      Type: 0,
-      skipCount: 1,
-      maxResultCount: 30,
-    });
+  const {data: allDiscussData, config: allDiscussConfig} =
+      await getAllDiscussList({
+        Type: 0,
+        skipCount: 1,
+        maxResultCount: 30,
+      });
   isAllDiscussFinished.value = allDiscussConfig.isFinish;
   allDiscussList.value = allDiscussData.items;
-  const { data: userAnalyseInfoData } = await getUserAnalyse();
+  const {data: userAnalyseInfoData} = await getUserAnalyse();
   onlineNumber.value = userAnalyseInfoData.onlineNumber;
   userAnalyseInfo.value = userAnalyseInfoData;
 });
@@ -323,16 +323,16 @@ const handleToRouter = (path) => {
 // 推送的实时人数获取
 const currentOnlineNum = computed(() => useSocketStore().getOnlineNum());
 watch(
-  () => currentOnlineNum.value,
-  (val) => {
-    onlineNumber.value = val;
-  },
-  { deep: true }
+    () => currentOnlineNum.value,
+    (val) => {
+      onlineNumber.value = val;
+    },
+    {deep: true}
 );
 
 const onClickAccessLog = async () => {
   accessLogDialogVisible.value = true;
-  const { data } = await getAccessList();
+  const {data} = await getAccessList();
 
   accessAllList.value = data;
 }