!17 update Yi.Furion.Net6/Yi.Framework.Infrastructure/Helper/MimeHelper.cs. 后缀名拼写错误。

Merge pull request !17 from zsmygitee/N/A

.gitignore

@@ -2,17 +2,11 @@
 ## files generated by popular Visual Studio add-ons.
 ##
 ## Get latest from https://github.com/github/gitignore/blob/master/VisualStudio.gitignore
-WebFirst/SoEasyPlatform.exe
-WebFirst/excel
-WebFirst/wwwroot
-WebFirst/SoEasyPlatform.exe
-WebFirst/appsettings.Development.json
-WebFirst/appsettings.json
-WebFirst/SoEasyPlatform.pdb
-WebFirst/SoEasyPlatform.Views.pdb
-WebFirst/web.config
-WebFirst/WebFirst.exe
+dist/
 
+appsettings.Production.json
+appsettings.Development.json
+wwwroot
 # User-specific files
 *.rsuser
 *.suo

README.md

@@ -1,7 +1,6 @@
-
-
-<h1 align="center"><img align="left" height="100px" src="https://user-images.githubusercontent.com/68722157/138828506-f58b7c57-5e10-4178-8f7d-5d5e12050113.png"> Yi框架</h1>
-<h4 align="center">一套与SqlSugar一样爽的.Net6开源框架</h4>
+<h1 align="center"><img align="left" height="150px" src="https://user-images.githubusercontent.com/68722157/138828506-f58b7c57-5e10-4178-8f7d-5d5e12050113.png"> Yi框架</h1>
+<h4 align="center">一套以用户体验出发的.Net6 Web开源框架</h4>
+<h5 align="center">支持原生版本、Furion版本、Abp版本，前端后台接入Ruoyi Vue3.0</h5>
 <h2 align="center">集大成者，终究轮子</h2>
 
 [English](README-en.md) | 简体中文
@@ -14,87 +13,189 @@
 
 模块分化较多，可根据业务自行引用或抛弃，集大成者，大而全乎，也许你能从中学习到一些独特见解
 
-正在持续更进业务模块，已接入ruoyi
-
 **英文：YiFramework**
 
-Yi框架-一套与SqlSugar一样爽的.Net6低代码开源框架。
+Yi框架-一套与SqlSugar一样爽的.Net6开源框架。
 与Sqlsugar理念一致，以用户体验出发。
-架构干净整洁、无业务代码、采用微软风格原生框架封装、CodeFrist+配套自研文件模板代码生成器 开发。
 适合.Net6学习、Sqlsugar学习 、项目二次开发。
 集大成者，终究轮子
 
-Yi框架最新版本标签：`v1.2.1`，具体版本可以查看标签迭代
+Yi框架最新版本标签：`v3.0.0`，具体版本可以查看标签迭代
 
 （项目与Sqlsugar同步更新，但这作者老杰哥代码天天爆肝到凌晨两点，我们也尽量会跟上他的脚步。更新频繁，所以可watching持续关注。）
 
 ————这不仅仅是一个程序，更是一个艺术品，面向艺术的开发！
 
-**分支**：
+> 核心特点：简单好用，框架不以打包形式引用，而是直接以项目附带源码给出，自由度拉满，遵循Mit协议，允许随意修改（请注明来源即可）
 
-（本项目由EFCore版本历经3年不断迭代至Sqlsugar版本，现EFcore版本已弃用，目前sqlsugar已带业务功能）
+**分支：**
 
-**SqlSugar**:.Net6 DDD领域驱动设计 简单分层微服务架构
+（本项目由EFCore版本历经4年不断迭代至Sqlsugar版本，现EFcore版本已弃用，目前sqlsugar已带业务功能）
 
-- Yi.Framework.Net6：.NetCore 6 意框架 （后端）
+- (推荐) **Furion**: 基于Furion分支，回归开发本质，极度简单，用起来贼爽
 
-- Yi.Vue3.X.RuoYi：Vue3 RuoYi前端框架 （前端后台）
+- ~~**Framework**~~: 框架分支，所有东西都在这里
 
-  （你没有听错，已经接入java流行指数最高最火爆的框架之一，与其他框架不同，Yi框架后端为完全重制版，并非为ruoyi java模仿版）
-  
-- Yi.Vue3.x.Vant：Vue3 移动端前端框架 （前端前台）持续迭代
+- ~~**SqlSugar**:.Net6 DDD领域驱动设计 简单分层微服务架构~~
 
-**SqlSugar-Dev**：为sqlsugar分支的实时开发版本
+- ~~**SqlSugar-Dev**：为sqlsugar分支的实时开发版本~~
 
-~~**ec**: EFcore完整电商项目~~
+- ~~**abp**:基于abp.vnext项目~~
 
 ****
 
+**目录：**
+
+Yi后端框架分为3个部分：
+
+- Infrastructure（基础设施，框架底层+sqlsugar+furion）
+- Module（应用模块，可选项，例如缓存模块、微信模块、文件模块、日志模块等）
+- Application（业务模块，用于开发）
+
+另外，光说不练假把式，我们不仅仅提供一个空白的框架，还同时提供3个基于yi框架的业务模块，没有听错，目前为1个后端，支持3个前端。各个模块关系解耦，可单独使用其中的任意业务模块
+
+- Yi.RuoYi.Vue3：Ruoyi后台管理系统Rbac Vue3前端（推荐）
+
+- Yi.Furion.Net6：.NET6后端（推荐）
+
+- Yi.App.Vue3：移动端App Vue3前端
+
+- Yi.BBS.Vue3：Web网页端BBS论坛 Vue3+Ts前端
+
+后续我们持续更新各大应用模块及业务模块：shop商场、erp进销存、mes工厂系统等
+
+业务支持并扩展至各个领域，用于具体项目的二次开发极大复用后端代码及前端代码，以通用的部分+不通的部分快速二开
+
+
 ### 演示地址：
 
 废话少说直接上地址，**请不要**更改里面的数据
 
-API服务：[yi.ccnetcore.com](http://yi.ccnetcore.com)    管理员账号：cc 、 123456
+官网网址：[ccnetcore.com](https://ccnetcore.com)  (已上线，欢迎加入)
 
-网关地址：~~[gate.ccnetcore.com/swagger](http://gate.ccnetcore.com/swagger)~~
+Bbs社区系统：[ccnetcore.com](https://ccnetcore.com)  (已上线，欢迎加入)
 
-~~WebFirst开发：所有代码生成器已经配置完成，无需任何操作数据库及任何代码，只需要网页表格上点点点即可~~
+Rbac后台管理系统：[yi.ccnetcore.com](http://yi.ccnetcore.com)    (已上线)~~管理员账号：cc 、 123456~~
 
-代码自动生成：
+App移动端系统：[xxx](xxx)正在部署
 
-![代码生成](Readme/%E4%BB%A3%E7%A0%81%E7%94%9F%E6%88%90.gif)
+网关地址：~~[gate.ccnetcore.com/swagger](http://gate.ccnetcore.com/swagger)~~(目前使用单体架构部署，无需网关)
 
 ### 支持:
 
 - [x] 完全支持单体应用架构
 - [x] 完全支持分布式应用架构
 - [x] 完全支持微服务架构
-- [ ] 即将支持网格服务架构（我们将在后续版本加入dapr）
 
 ****
-### 软件架构:
+### 详细到爆炸的Yi框架教程导航：
 
-**架构**：后端.NET6(Asp.NetCore 6)、WebFirst代码生成器~~与.NET5(Asp.NetCore 5)、前端Vue（2.0）~~
-
-**关系型数据库**：mysql、sql server、sqlite、oracle(正在兼容中)
-
-**操作系统**：Windows、Linux
-
-**身份验证**：JWT、IdentityServer4
-
-**组件**：SqlSugar、Autofac、Castle、Swagger、Log4Net、Redis、RabbitMq、ES、Quartz.net、~~T4~~
-
-**分布式**：CAP、Lock
-
-**微服务**：Consul、Ocelot、IdentityService、Apollo、Docker、Jenkins、Nginx、K8s、ELK、Polly
-
-**封装**：Json处理模块，滑动验证码模块，base64图片处理模块，异常捕捉模块、邮件处理模块、linq封装模块、随机数模块、统一接口模块、基于策略的jwt验证、过滤器、数据库连接、跨域、初始化种子数据、Base32、Console输出、日期处理、文件传输、html筛选、http请求、ip过滤、md5加密、Rsa加密、序列化、雪花算法、字符串处理、编码处理、地址处理、xml处理、心跳检查。。。
+1. [框架快速开始](https://ccnetcore.com/article/1641733850189139969)(已完成)
+2. [框架模块教程](https://ccnetcore.com/article/1641733991574933505)(已完成)
+3. [应用模块教程](https://ccnetcore.com/article/1641734073091231745)
+4. [Yi.RBAC后台系统](https://ccnetcore.com/article/1641734171128893441)
+5. [Yi.BBS社区系统](https://ccnetcore.com/article/1641734308475572225)
 
 ****
-<h3>业务支持模块</h3>
+### 它的理念:
+优雅的进行快速开发，通常，简单程度与优雅程度不可兼得，Yi框架并不一昧的追求极致的解耦，会站在用户使用角度上，在使用难易度进行考虑衡量
+
+例如：我们大部分功能紧密贴合Sqlsugar，虽然缺少其他orm的替换性，但在使用程度上降低的使用难度
+
+> 一个面向用户的快速开发后端框架
+
+在真正的使用这，你会明白这一点，极致的简单，也是优雅的一种体现。
+****
+
+### 特点:
+- 面向用户的后端框架，使用简单，适合小型、企业级项目
+- 项目内置源码，不打包
+- 开箱即用
+- 支持模块化
+- 支持动态Api
+- 支持属性注入
+- 内置包含大量通用场景模块
+- 等等
+
+### 基础设施简介
+- Jwt鉴权
+- 接口级别授权
+- 对象映射
+- O/RM
+- 数据过滤
+- 多租户
+- 逻辑删除
+- 审计日志
+- 种子数据
+- 工作单元
+- 模块化
+- 动态Api
+- 属性注入
+- 自动依赖注入
+- 当前用户
+- 仓储
+- Crud
+
+
+### 内置模块简介
+- 后台任务
+- 本地缓存
+- 分布式缓存
+- 事件总线
+- 字典管理
+- 文件管理
+- 图片操作
+- Excel操作
+- 操作日志管理
+- Sms短信
+- 微信支付
+- WebFirst代码生成
+
+### 业务项目
+- RABC后台管理系统
+- BBS社区系统
+- APP移动端系统
+
+> 重复的东西，无需再写一遍，这也是优雅的体现之一
+
+****
+### 核心技术
+#### 后端
+C# Asp.NetCore 6.0
+- [x] 动态Api：Cike.AutoApi
+- [x] 鉴权授权：Jwt
+- [x] 日志：Nlog
+- [x] 模块化：StartupModules
+- [x] 依赖注入：Autofac
+- [x] 对象映射：Mapster
+- [x] ORM:SqlsugarCore
+- [x] 多租户：Abp
+- [x] 后台任务：Quartz.Net
+- [x] 本地缓存：MemortCache
+- [x] 分布式缓存：CSRedisCore
+- [x] 事件总线：Cike.EventBus
+- [x] 图像操作：SixLabors.ImageSharp
+- [x] Excle操作：ExcelToObject.Npoi
+
+#### 前端
+js Vue3.2
+- [x] 异步请求：axios
+- [x] 图表：echarts
+- [x] ui：element-plus
+- [x] 存储：pinia
+- [x] 路由：vue-router
+- [x] 打包：vite
+
+#### 运维
+- [x] 部署：nginx
+- [x] CICD：gitlab+Jenkins
+- [x] Docker：harbor
+
+****
+### 业务支持模块：  
 
 RABC权限管理系统（正在更新）
-（大部分ruoyi功能，采用ruoyi前端）
+（采用ruoyi前端）
 - 用户管理
 - 角色管理
 - 菜单管理
@@ -105,15 +206,39 @@ RABC权限管理系统（正在更新）
 - 用户在线
 - 操作日志
 - 登录日志
-- 等等
+- 定时任务
+- 缓存列表
+- 服务监控
+- WebFirst代码生成工具
 
-ERP进销存系统（正在更新）
-- 供货商管理
-- 等等
+ **演示截图：** 
+![输入图片说明](readme/1.png)
+![输入图片说明](readme/2.png)
+![输入图片说明](readme/3.png)
+![输入图片说明](readme/4.png)
+![输入图片说明](readme/5.png)
+![输入图片说明](readme/6.png)
+![输入图片说明](readme/7.png)
+![输入图片说明](readme/8.png)
+![输入图片说明](readme/9.png)
+![输入图片说明](readme/10.png)
+![输入图片说明](readme/1696760969217.jpg)
+![输入图片说明](readme/1696761014270.jpg)
 
 BBS论坛系统（持续迭代）
 - 文章管理
 - 评论管理
+- 主题管理
+- 板块管理
+- 点赞管理
+- 等等
+
+APP移动端系统（持续迭代）
+- 动态查询
+- 我的资料
+
+ERP进销存系统（持续迭代）
+- 供货商管理
 - 等等
 
 SHOP电商系统（持续迭代）
@@ -124,109 +249,6 @@ SHOP电商系统（持续迭代）
 - 等等
 
 
-![输入图片说明](Readme/%E7%94%A8%E6%88%B7%E7%AE%A1%E7%90%86.png)
-
-![输入图片说明](Readme/%E8%8F%9C%E5%8D%95%E7%AE%A1%E7%90%86.png)
-
-### 框架支持模块:
-
-大致如图：
-
-![image](https://user-images.githubusercontent.com/68722157/142923071-2fa524eb-e833-4143-a926-51566e56e889.png)
-![image](https://user-images.githubusercontent.com/68722157/142923150-ebe1b538-c3fc-42dd-bea8-83e10e0f819a.png)
-![image](https://user-images.githubusercontent.com/68722157/142923529-e4fbb2f6-def1-4702-b9da-5adbd22f0a2f.png)
-
-(删除线代表已实现功能还未迁移过来)
-- [x] 支持大致`DDD领域驱动设计`进行分层，支持微服务扩展
-- [x] 支持采用`异步`开发awit/async
-- [x] 支持数据库主从`读写分离`
-- [x] 支持功能替换，无需改动代码，只需配置`json文件`进行装配即可
-- [x] 支持`Aop封装`，FilterAop、IocAop、LogAop、SqlAop
-- [x] 支持`Log4Net日志`记录，自动生成至bin目录下的logs文件夹
-- [x] 支持`DbSeed数据库种子数据`接入
-- [x] 支持主流`数据库随意切换`，Mysql/Sqlite/Sqlserver/Oracle
-- [x] 支持上海杰哥官方`SqlSugar ORM`封装
-- [x] 支持新版`SwaggerWebAPI`，jwt身份认证接入
-- [x] 支持`Cors`跨域
-- [x] 支持`AutoFac`自动映射依赖注入
-- [x] 支持`consul`服务器注册与发现
-- [x] 支持`健康检查`
-- [x] 支持`RabbitMQ`消息队列
-- [x] 支持`Redis`多级缓存
-- [x] 支持`MemoryCache`多级缓存 
-- [x] 支持`Ocelot`网关，路由、服务聚合、服务发现、认证、鉴权、限流、熔断、缓存、Header头传递
-- [x] 支持`Apollo`全局配置中心;
-- [x] 支持`docker`镜像制作
-- [x] 支持`Quartz.net`任务调度，实现任意接口被调度
-- [x] 支持`ThumbnailSharp`缩略图封装
-- [x] 支持`ELK`，log4net+kafka+es+logstach+kibana
-- [x] 支持`IdentityService4`授权中心
-- [x] 支持`Es`分词查询
-- [x] 支持多级`缓存`
-- [x] 支持`CAP`分布式事务，mysql+rabbitMq
-- [x] 支持`Docker+k8s`部署
-- [x] 支持`Jenkins+CI/CD`
-- [x] 支持`AutoMapper`模块映射
-- [x] 支持`微信支付`模块
-- [x] 支持`单表多租户`常用功能
-- [x] 支持`逻辑删除`常用功能
-- [x] 支持`操作日志`常用功能
-- [x] 支持`自动分表`
-- [x] 支持`数据权限`
-- [x] 支持`CodeFrist`快速构建数据库
-- [x] 支持自研文件版`代码生成器`快速构建通用代码
-- [x] 支持完整`Dto`模式
-- [x] 支持 太多了忘了
-
-
-****
-### 目录结构:
-
-![image](https://s1.ax1x.com/2022/04/09/LCTleH.png)
-![image](https://s1.ax1x.com/2022/04/24/L4qlSs.png)
-![image](https://s1.ax1x.com/2022/04/24/L4q1ln.png)
-
-我们大致依照DDD领域驱动设计分层
-
-分层如此清晰！什么？还感觉太复杂了？用户只需关注Api、Service其他都是轮子啊！
-
-- BackGround：后台进程（通常使用消息队列进行消费任务）
-- Test：测试（单元测试）
-- Domain：领域层（Dto、服务接口层、模型层、仓储层、服务层）
-- Infrastructure：基础实例层(通用工具层、核心层、定时任务Job、国际化、Web扩展层)
-- Module：模块层（其他模块，可按需进行引入，例如微信支付、代码生成）
-- MicroServiceInstance：服务层（微服务）
-
-****
-### 安装教程:
-
-我们将在之后更新教程手册！
-
-后端
-1.  下载全部源码，默认使用sqlite数据库，已经生成
-2.  直接点击sln文件运行即可，没有任何其他依赖
-
-前端
-1.  下载全部源码，npm i 安装依赖
-2.  使用npm run dev进行运行
-
-
-****
-### 使用说明:
-
-~~1.  导入使用仓库中的WebFirst数据库~~
-~~2.  使用WebFirst添加实体、同步实体、修改模板生成路径并生成方案~~
-
- 没了，恭喜你已经成功完成了项目，并且已经具备大部分通用场景业务
-是不是一个字？爽！
-到此为止，你无需写任何一个代码！
-
-**爽点**：
-
-新人，看这里，项目下载之后直接可以启动，无任何依赖，之后你可以查看`Test控制器`，迫不及待的快来爽一爽！
-
-我们将使用说明转移至我们的官方论坛中，正在制作中，尽情期待！
-
 ****
 ### 感谢：
 
@@ -238,44 +260,30 @@ SHOP电商系统（持续迭代）
 
 [朝夕教育]https://www.zhaoxiedu.net
 
-[Sqlsugar]https://www.donet5.com/Home/Doc
+[Sqlsugar老杰哥]https://www.donet5.com/Home/Doc
 
-[RuYiAdmin]https://gitee.com/pang-mingjun/RuYiAdmin
+[RuYiAdmin如意老兄]https://gitee.com/pang-mingjun/RuYiAdmin
 
-[ZrAdminNetCore]https://gitee.com/izory/ZrAdminNetCore
+[ZrAdminNetCore字母老哥]https://gitee.com/izory/ZrAdminNetCore
+
+[Admin.NET周哥]https://gitee.com/zuohuaijun/Admin.NET
+
+[Furion百小僧]https://furion.baiqian.ltd/
 
 ****
 ### 联系我们：
 
 作者QQ：`454313500`，2029年之前作者24小时在线，时刻保持活跃更新。
 
-QQ交流群：官方一群（已满）、官方二群（已满）、官方三群：`786308927`（加作者QQ后同意）
+QQ交流群：官方一群（已满）、官方二群（已满）、官方三群：`786308927`（基本已满）、官方四群:`498310311`（新群）
 
 联系作者，这里人人都是顾问
 
-官方网址：正在建设
+官方网址留言区：[ccnetcore.com](https://ccnetcore.com) 
 
 ****
 ### FQA:
 
-问1：为什么不采用EFcore？
+前往官网查看留言区
 
-答1：别问，问就是Sqlsugar，和本框架一样爽！
-
-问2：以后会持续更新下去吗？
-
-答2：一定会的，我们的标题是 一个和Sqlsugar一样爽的.Net6开源框架 ，只要Sqlsugar在，我们将一直更新下去。
-
-问3：这个框架的针对人群是哪些人？适合所有人吗？
-
-答3：并不是适合所有人，应该算适合需要有一定基础的开发人员，当然，如果你是大神，你完全可以将这个框架二次开发！
-
-问4：花如此多的精力制作这个框架，是为了什么？是为了赚钱吗？和目前主流的abp等框架比，又有什么意义呢？
-
-答4：我们与Sqlsugar作者理念一致，我们是从用户角度出发，框架是为用户服务，与ABP复杂上手理念完全是相反的。
-
-问5：为何不出版一个详细的说明书呢？
-
-答5：暂时不会了，之后可能会，代码都是基于Asp.NetCore框架，适用于新手不用造轮子，整个框架较为简单，阅读源码后，基本能自定义改造使用了，过难也已经封装完毕，别忘了，其意义是为了开发更加简易！建议添加作者好友，这里人人都是顾问。
-
-我大抵要厌倦了负重前行。
+[留言区](https://ccnetcore.com/discuss/1641030787056930818)

Yi.App.Vue3/src/api/articleApi.ts

@@ -1,17 +1,16 @@
 import myaxios from '@/utils/myaxios'
-import { ArticleEntity } from '@/type/interface/ArticleEntity'
 
 export default {
     add(data:any) {
         return myaxios({
-            url: `/article/add`,
+            url: `/Trends`,
             method: 'post',
             data: data
         })
     },
     pageList(data:any) {
         return myaxios({
-          url: '/article/pageList',
+          url: '/Trends',
           method: 'get',
           params: data
         })

Yi.App.Vue3/src/api/fileApi.ts

@@ -1,11 +1,11 @@
 import myaxios from '@/utils/myaxios'
 
 export default{
-   upload(type:string,data:any){
+   upload(data:any){
     return myaxios({
-        url: `/file/upload/${type}`,
+        url: `/file`,
         headers:{"Content-Type": "application/x-www-form-urlencoded; charset=UTF-8"},
-        method: 'POST',
+        method: 'post',
         data:data
       });
 } 

Yi.App.Vue3/src/api/login.ts

@@ -33,7 +33,7 @@ export function register(data:any) {
 // 获取用户详细信息
 export function getInfo() {
   return myaxios({
-    url: '/account/getUserAllInfo',
+    url: '/account',
     method: 'get'
   })
 }

Yi.App.Vue3/src/components/AppUserIcon.vue

@@ -0,0 +1,35 @@
+<template>
+  <van-image round :width="width" :height="height" :src="getUrl()" />
+</template>
+
+<script setup lang="ts">
+const props = defineProps({
+  src: { type: String, default: "null", required: false },
+  width: { type: String, default: "3rem", required: false },
+  height: { type: String, default: "3rem", required: false },
+});
+
+const url = `${import.meta.env.VITE_APP_BASE_API}/file/`;
+const getUrl = () => {
+  const src = props.src;
+  if (src === null || typeof src === "undefined" || src.trim() === "") {
+    return "/icon.jpg";
+
+    // 字符串为 null、未定义或为空字符串
+  } else {
+    return url + "src";
+  }
+};
+</script>
+<style scoped>
+.col-body {
+  text-align: center;
+}
+.col-body .van-icon {
+  margin-bottom: 0.6rem;
+}
+p {
+  font-size: large;
+  font-weight: bold;
+}
+</style>

Yi.App.Vue3/src/permission.ts

@@ -4,7 +4,7 @@ import router from './router'
 // import 'nprogress/nprogress.css'
 import { getToken } from '@/utils/auth'
 // import { isHttp } from '@/utils/validate'
-import useUserStore from '@/store/modules/user'
+import useUserStore from '@/store/modules/user.js'
 import { isRelogin } from '@/utils/myaxios'
 // import useSettingsStore from '@/store/modules/settings'
 // import usePermissionStore from '@/store/modules/permission'

Yi.App.Vue3/src/store/modules/user.ts

@@ -21,21 +21,23 @@ const useUserStore = defineStore(
         return new Promise((resolve, reject) => {
        
           login(username, password, code, uuid).then(res => {
-            if(!res.status)
+            if(!(res as any).succeeded)
             {
               reject(res)
             }
             setToken(res.data.token);
             this.token = res.data.token;
-            resolve(res);
+    
+          return  resolve(res);
           }).catch(error => {
-            reject(error)
+            return  reject(error)
           })
         })
       },
       // 获取用户信息
       getInfo() {
         return new Promise((resolve, reject) => {
+       
           getInfo().then(response => {
             const res=response.data;
             const user = res.user
@@ -55,9 +57,9 @@ const useUserStore = defineStore(
             this.user.username = user.userName;
             this.user.nick=user.nick
             this.user.icon = user.icon;
-            resolve(res)
+           resolve(res)
           }).catch(error => {
-            reject(error)
+           reject(error)
           })
 
 

Yi.App.Vue3/src/type/interface/ArticleEntity.ts

@@ -3,6 +3,6 @@ export interface ArticleEntity{
     content: string;
     images:string[];
     isDeleted:boolean;
-    createTime:string;
+    creationTime:string;
 }
 // import { ArticleEntity } from '@/type/interface/ArticleEntity'

Yi.App.Vue3/src/utils/myaxios.ts

@@ -5,37 +5,43 @@ import axios from 'axios'
 import JsonBig from 'json-bigint'
 import { getToken } from '@/utils/auth'
 import { useRouter } from "vue-router";
-import useUserStore from '@/store/modules/user'
+import useUserStore from '@/store/modules/user.js'
 import { Notify } from 'vant';
 // import VuetifyDialogPlugin from 'vuetify-dialog/nuxt/index';
 export let isRelogin = { show: false };
 const myaxios = axios.create({
-        // baseURL:'/'// 
-        baseURL: import.meta.env.VITE_APP_BASE_API, // /dev-apis
-        timeout: 50000,
-        headers: {
-            'Authorization': 'Bearer ' + ""
-        },
-        //雪花id精度问题
-        transformResponse: [ data => {
-            const json = JsonBig({
-              storeAsString: true
-            })
-            return json.parse(data)
-          }],
-    })
-    // 请求拦截器
-myaxios.interceptors.request.use(function(config:any) {
-    const isToken = (config.headers || {}).isToken === false
-    // 是否需要防止数据重复提交
-    const isRepeatSubmit = (config.headers || {}).repeatSubmit === false
-    if (getToken() && !isToken) {
-        config.headers['Authorization'] = 'Bearer ' + getToken()
-      }
-    // store.dispatch("openLoad");
-    return config;
-}, function(error) {
-    return Promise.reject(error);
+  // baseURL:'/'// 
+  baseURL: import.meta.env.VITE_APP_BASE_API, // /dev-apis
+  timeout: 50000,
+  headers: {
+    'Authorization': 'Bearer ' + ""
+  },
+  //雪花id精度问题
+  transformResponse: [data => {
+    const json = JsonBig({
+      storeAsString: true
+    });
+    try {
+      return json.parse(data);
+    }
+    catch
+    {
+      return data;
+    }
+  }],
+})
+// 请求拦截器
+myaxios.interceptors.request.use(function (config:any) {
+  const isToken = (config.headers || {}).isToken === false
+  // 是否需要防止数据重复提交
+  const isRepeatSubmit = (config.headers || {}).repeatSubmit === false
+  if (getToken() && !isToken) {
+    config.headers['Authorization'] = 'Bearer ' + getToken()
+  }
+  // store.dispatch("openLoad");
+  return config;
+}, function (error) {
+  return Promise.reject(error);
 });
 
 // 响应拦截器
@@ -53,18 +59,25 @@ myaxios.interceptors.response.use(async function(response) {
   }
     // store.dispatch("closeLoad");
     return resp;
-}, async function(error) {
+}, 
+async function(error) {
+const code=error.response.status;
+const message=error.message;
 //未授权、失败
 if(error.response==undefined)
 {
   Notify({ type: 'danger', message: `服务器异常:${error.message}` });
+
+  // useUserStore().logOut().then(() => {
+  //   location.href = '/';
+  // })
+
   return Promise.reject(error);;
 }
 
-const resp = error.response.data
-if (resp.code == undefined && resp.message == undefined) {
+if (code == undefined &&message == undefined) {
     Notify({ type: 'danger', message: '未知错误' });
-} else if (resp.code == 401) {
+} else if (code == 401) {
     // if (!isRelogin.show) {
       Notify({ type: 'warning', message: '登录过期' });
     //登出
@@ -73,9 +86,10 @@ if (resp.code == undefined && resp.message == undefined) {
       })
       isRelogin.show = false;
     // }
-} else if (resp.code !== 200) {
-    Notify({ type: 'danger', message: `错误代码：${resp.code}，原因：${resp.message}` });
+} else if (code !== 200) {
+    Notify({ type: 'danger', message: `错误代码：${code}，原因：${message}` });
 }
     return Promise.reject(error);
 });
+
 export default myaxios

Yi.App.Vue3/src/view/login.vue

@@ -36,8 +36,9 @@
 <script setup lang="ts">
 import { ref } from "vue";
 import { useRouter } from "vue-router";
-import useUserStore from "@/store/modules/user";
+import useUserStore from "@/store/modules/user.js";
 import { Toast } from "vant";
+import { debug } from "console";
 
 const router = useRouter();
 const redirect = ref(undefined);
@@ -55,15 +56,16 @@ const login = () => {
     .login(loginForm.value)
     .then((response: any) => {
       Toast({
-        message: response.message,
+        message: "登录成功",
         position: "bottom",
       });
+   
       router.push({ path: redirect.value || "/" });
     })
     .catch((response:any) => {
       loginForm.value.password="";
       Toast({
-        message: response.message,
+        message: response.errors,
         position: "bottom",
       });
       // loading.value = false;

Yi.App.Vue3/src/view/main/recommend.vue

@@ -21,7 +21,7 @@
             item.user == null ? "-" : item.user.nick ?? item.user.username
           }}</span>
           <br />
-          <app-createTime :time="item.createTime" />
+          <app-createTime :time="item.creationTime" />
         </van-col>
 
         <van-col span="6" class="down">
@@ -58,10 +58,15 @@
               text="评论"
               @click="openComment(item.id)"
             />
-            <van-grid-item
+            <!-- <van-grid-item
               icon="good-job-o"
               :text="`点赞:${item.agreeNum}`"
               @click="aggreeHand(item.id)"
+            /> -->
+                      <van-grid-item
+              icon="good-job-o"
+              :text="`点赞:10`"
+              @click="aggreeHand(item.id)"
             />
           </van-grid>
         </van-col>
@@ -113,7 +118,6 @@ import AppUserIcon from "@/components/AppUserIcon.vue";
 import articleApi from "@/api/articleApi";
 import agreeApi from "@/api/agreeApi";
 import commentApi from "@/api/commentApi";
-import { ArticleEntity } from "@/type/interface/ArticleEntity";
 const VanImagePreview = ImagePreview.Component;
 const url = `${import.meta.env.VITE_APP_BASE_API}/file/`;
 const data = reactive({
@@ -174,19 +178,17 @@ const onLoad = async () => {
   // 异步更新数据
   // setTimeout 仅做示例，真实场景中一般为 ajax 请求
   articleApi.pageList(queryParams.value).then((response: any) => {
-    if (response.data.data.length == 0) {
+    if (response.data.items.length == 0) {
       console.log("结束");
       finished.value = true;
     } else {
       console.log("执行");
-      articleList.value.push(...response.data.data);
+      articleList.value.push(...response.data.items);
       totol.value = response.data.totol;
       queryParams.value.pageNum += 1;
     }
 
     loading.value = false;
-
-    console.log(loading.value);
   });
 };
 const onRefresh = () => {

Yi.App.Vue3/src/view/my.vue

@@ -93,7 +93,7 @@ import AppGrid from "@/components/AppGrid.vue";
 import { AppGridData } from "@/type/class/AppGridData";
 import { ref } from "vue";
 import { Dialog } from "vant";
-import useUserStore from "@/store/modules/user";
+import useUserStore from "@/store/modules/user.js";
 import { storeToRefs } from 'pinia';
 import   AppUserIcon from "@/components/AppUserIcon.vue";
 const show = ref<boolean>(false);

Yi.App.Vue3/src/view/send/imageText.vue

@@ -97,8 +97,8 @@ const afterRead = (file: any) => {
     });
   }
 
-  fileApi.upload("image", formData).then((response: any) => {
-    images.value.push(...response.data);
+  fileApi.upload(formData).then((response: any) => {
+    images.value.push(...response.data.map((x:any)=>x.id));
 
     if (file.length == undefined) {
       file.status = "done";

Yi.App.Vue3/tsconfig.json

@@ -19,6 +19,6 @@
       "@/*": ["./src/*"]
     }
   },
-  "include": ["src/**/*.ts", "src/**/*.d.ts", "src/**/*.tsx", "src/**/*.vue"],
+  "include": ["src/**/*.ts", "src/**/*.d.ts", "src/**/*.tsx", "src/**/*.vue", "src/store/modules/user.ts", "src/utils/myaxios.ts"],
   "references": [{ "path": "./tsconfig.node.json" }]
 }

Yi.BBS.Vue3/.env.development

@@ -0,0 +1,2 @@
+VITE_APP_BASEAPI="/api-dev"
+VITE_APP_URL="http://localhost:19001/api"

Yi.BBS.Vue3/.env.production

@@ -0,0 +1 @@
+VITE_APP_BASEAPI="/prod-api"

Yi.BBS.Vue3/.gitignore

@@ -1,21 +1,26 @@
-.DS_Store
-node_modules
-/dist
-
-
-# local env files
-.env.local
-.env.*.local
-
-# Log files
+# Logs
+logs
+*.log
 npm-debug.log*
 yarn-debug.log*
 yarn-error.log*
 pnpm-debug.log*
+lerna-debug.log*
+
+node_modules
+.DS_Store
+dist
+dist-ssr
+coverage
+*.local
+
+/cypress/videos/
+/cypress/screenshots/
 
 # Editor directories and files
+.vscode/*
+!.vscode/extensions.json
 .idea
-.vscode
 *.suo
 *.ntvs*
 *.njsproj

Yi.BBS.Vue3/.vscode/extensions.json

@@ -0,0 +1,3 @@
+{
+  "recommendations": ["Vue.volar", "Vue.vscode-typescript-vue-plugin"]
+}

Yi.BBS.Vue3/README.md

@@ -0,0 +1,29 @@
+# yi-bbs
+
+This template should help get you started developing with Vue 3 in Vite.
+
+## Recommended IDE Setup
+
+[VSCode](https://code.visualstudio.com/) + [Volar](https://marketplace.visualstudio.com/items?itemName=Vue.volar) (and disable Vetur) + [TypeScript Vue Plugin (Volar)](https://marketplace.visualstudio.com/items?itemName=Vue.vscode-typescript-vue-plugin).
+
+## Customize configuration
+
+See [Vite Configuration Reference](https://vitejs.dev/config/).
+
+## Project Setup
+
+```sh
+npm install
+```
+
+### Compile and Hot-Reload for Development
+
+```sh
+npm run dev
+```
+
+### Compile and Minify for Production
+
+```sh
+npm run build
+```

Yi.BBS.Vue3/index.html

@@ -0,0 +1,14 @@
+<!DOCTYPE html>
+<html lang="en">
+  <head>
+    <meta charset="UTF-8">
+    <link rel="icon" href="/favicon.ico">
+
+    <meta name="viewport" content="width=device-width,initial-scale=1" />
+    <title>意社区</title>
+  </head>
+  <body>
+    <div id="app"></div>
+    <script type="module" src="/src/main.js"></script>
+  </body>
+</html>

Yi.BBS.Vue3/package.json

@@ -0,0 +1,34 @@
+{
+  "name": "yi-bbs",
+  "version": "0.0.0",
+  "private": true,
+  "scripts": {
+    "dev": "vite",
+    "build": "vite build",
+    "preview": "vite preview"
+  },
+  "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",
+    "i": "^0.3.7",
+    "marked": "^4.2.12",
+    "mavon-editor": "^3.0.0",
+    "nprogress": "^0.2.0",
+    "pinia": "^2.0.32",
+    "vue": "^3.2.47",
+    "vue-cropper": "1.0.3",
+    "vue-router": "^4.1.6",
+    "yarm": "^0.4.0"
+  },
+  "devDependencies": {
+    "@vitejs/plugin-vue": "^4.0.0",
+    "copy-webpack-plugin": "^11.0.0",
+    "sass": "1.52.1",
+    "unplugin-auto-import": "^0.15.0",
+    "unplugin-vue-components": "^0.24.0",
+    "vite": "^4.1.3"
+  }
+}

Yi.BBS.Vue3/src/App.vue

@@ -0,0 +1,28 @@
+<script setup>
+</script>
+
+<template>
+    <el-config-provider :locale="locale">
+  <RouterView />
+</el-config-provider>
+</template>
+<script setup>
+import useConfigStore from "@/stores/config";
+import { ElConfigProvider } from 'element-plus'
+import {onMounted  } from "vue";
+
+import zhCn from 'element-plus/dist/locale/zh-cn.mjs'
+const locale= zhCn;
+
+const configStore = useConfigStore();
+
+//加载全局信息
+onMounted(async()=>{
+
+await configStore.getConfig();
+})
+
+</script>
+<style scoped>
+
+</style>

Yi.BBS.Vue3/src/apis/accessApi.js

@@ -0,0 +1,17 @@
+import request from '@/utils/request'  
+// 触发访问
+export function access() {
+  return request({
+    url: '/access-log',
+    method: 'post'
+  })
+}
+
+
+// 获取本周数据
+export function getWeek() {
+  return request({
+    url: '/access-log/week',
+    method: 'get'
+  })
+}

Yi.BBS.Vue3/src/apis/accountApi.js

@@ -0,0 +1,79 @@
+import request from '@/utils/request'
+
+// 登录方法
+export function login(username, password, code, uuid) {
+    const data = {
+      username,
+      password,
+      code,
+      uuid
+    }
+    return request({
+      url: '/account/login',
+      headers: {
+        isToken: false
+      },
+      method: 'post',
+      data: data
+    })
+  }
+  
+  // 注册方法
+  export function register(userName,password,phone,code,uuid) {
+    const data = {
+      userName,
+      password,
+      phone,
+      code,
+      uuid
+    }
+    return request({
+      url: '/account/register',
+      headers: {
+        isToken: false
+      },
+      method: 'post',
+      data: data
+    })
+  }
+  
+  // 获取用户详细信息
+  export function getInfo() {
+    return request({
+      url: '/account',
+      method: 'get'
+    })
+  }
+
+  
+// 退出方法
+export function logout() {
+    return request({
+      url: '/account/logout',
+      method: 'post'
+    })
+  }
+  
+  // 获取验证码
+  export function getCodeImg() {
+    return request({
+      url: '/account/captcha-image',
+      headers: {
+        isToken: false
+      },
+      method: 'get',
+      timeout: 20000
+    })
+  }
+    // 获取短信验证码
+    export function getCodePhone(phone) {
+      return request({
+        url: '/account/captcha-phone',
+        headers: {
+          isToken: false
+        },
+        method: 'post',
+        timeout: 20000,
+        data:{phone}
+      })
+    }

Yi.BBS.Vue3/src/apis/agreeApi.js

@@ -0,0 +1,11 @@
+import myaxios from '@/utils/request'
+export function operate(discussId){
+    if(discussId==undefined)
+    {
+        return;
+    }
+    return myaxios({
+        url: `/agree/operate/${discussId}`,
+        method: 'post'
+    })
+};

Yi.BBS.Vue3/src/apis/articleApi.js

@@ -0,0 +1,41 @@
+import myaxios from '@/utils/request'
+export function getList(data){
+    return myaxios({
+        url: '/article',
+        method: 'get',
+        params:data
+    })
+};
+export function get(id){
+    return myaxios({
+        url: `/article/${id}`,
+        method: 'get'
+    })
+};
+export function add(data){
+    return myaxios({
+        url: `/article`,
+        method: 'post',
+        data:data
+    })
+};
+export function update(id,data){
+    return myaxios({
+        url: `/article/${id}`,
+        method: 'put',
+        data:data
+    })
+};
+export function del(ids){
+    return myaxios({
+        url: `/article/${ids}`,
+        method: 'delete'
+    })
+};
+export function all(discussId)
+{
+    return myaxios({
+        url: `/article/all/discuss-id/${discussId}`,
+        method: 'get'
+    })
+}

Yi.BBS.Vue3/src/apis/bannerApi.js

@@ -0,0 +1,8 @@
+import myaxios from '@/utils/request'
+export function getList(data){
+    return myaxios({
+        url: '/banner',
+        method: 'get',
+        params:data
+    })
+};

Yi.BBS.Vue3/src/apis/commentApi.js

@@ -0,0 +1,22 @@
+import myaxios from '@/utils/request'
+export function getListByDiscussId(discussId,data){
+    return myaxios({
+        url: `/comment/discuss-id/${discussId}`,
+        method: 'get',
+        params:data
+    })
+};
+export function add(data){
+    return myaxios({
+        url: `/comment`,
+        method: 'post',
+        data:data
+    })
+};
+
+export function del(ids){
+    return myaxios({
+        url: `/comment/${ids}`,
+        method: 'delete'
+    })
+};

Yi.BBS.Vue3/src/apis/configApi.js

@@ -0,0 +1,9 @@
+import myaxios from '@/utils/request'
+
+//获取配置
+export function getAll(){
+    return myaxios({
+        url: '/config',
+        method: 'get'
+    })
+};

Yi.BBS.Vue3/src/apis/discussApi.js

@@ -0,0 +1,51 @@
+import myaxios from '@/utils/request'
+export function getList(data){
+    return myaxios({
+        url: '/discuss',
+        method: 'get',
+        params:data
+    })
+};
+export function getTopList(data){
+
+    if(data==undefined)
+    {
+        data={isTop:true}
+    }
+    else
+    {
+        data["isTop"]=true;
+    }
+
+    return myaxios({
+        url: '/discuss',
+        method: 'get',
+        params:data
+    })
+};
+export function get(id){
+    return myaxios({
+        url: `/discuss/${id}`,
+        method: 'get'
+    })
+};
+export function add(data){
+    return myaxios({
+        url: `/discuss`,
+        method: 'post',
+        data:data
+    })
+};
+export function update(id,data){
+    return myaxios({
+        url: `/discuss/${id}`,
+        method: 'put',
+        data:data
+    })
+};
+export function del(ids){
+    return myaxios({
+        url: `/discuss/${ids}`,
+        method: 'delete'
+    })
+};

Yi.BBS.Vue3/src/apis/fileApi.js

@@ -0,0 +1,9 @@
+import myaxios from '@/utils/request'
+export function upload(data){
+    return myaxios({
+        url: '/file',
+        method: 'post',
+        data:data,
+        headers: { 'Content-Type': 'multipart/form-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/apis/userApi.js

@@ -0,0 +1,139 @@
+import myaxios from '@/utils/request'
+
+// 查询用户列表
+export function listUser(query) {
+  return myaxios({
+    url: '/user',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询用户详细
+export function getUser(userId) {
+  return myaxios({
+    url: '/user/' + parseStrEmpty(userId),
+    method: 'get'
+  })
+}
+
+// 新增用户
+export function addUser(data) {
+  return myaxios({
+    url: '/user',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改用户
+export function updateUser(id, data) {
+  return myaxios({
+    url: `/user/${id}`,
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除用户
+export function delUser(userId) {
+  return myaxios({
+    url: `/user/${userId}`,
+    method: 'delete',
+  })
+}
+
+// 用户密码重置
+export function resetUserPwd(id, password) {
+  const data = {
+    password
+  }
+
+
+  return myaxios({
+    url: `/account/rest-password/${id}`,
+    method: 'put',
+    data: data
+  })
+}
+
+// 用户状态修改
+export function changeUserStatus(userId, isDel) {
+  return myaxios({
+    url: `/user/${userId}/${isDel}`,
+    method: 'put'
+  })
+}
+
+// 查询用户个人信息
+export function getUserProfile() {
+  return myaxios({
+    url: '/account',
+    method: 'get'
+  })
+}
+
+// 修改用户个人信息
+export function updateUserProfile(data) {
+  return myaxios({
+    url: `/user/profile`,
+    method: 'put',
+    data:  data 
+  })
+}
+// 只修改用户头像
+export function updateUserIcon(data) {
+  return myaxios({
+    url: `/account/icon`,
+    method: 'put',
+    data:{icon:data}  
+  })
+}
+
+
+// 用户密码重置
+export function updateUserPwd(oldPassword, newPassword) {
+  const data = {
+    oldPassword,
+    newPassword
+  }
+  return myaxios({
+    url: '/account/password',
+    method: 'put',
+    data: data
+  })
+}
+
+// 用户头像上传
+export function uploadAvatar(data) {
+  return request({
+    url: '/system/user/profile/avatar',
+    method: 'post',
+    data: data
+  })
+}
+
+// 查询授权角色
+export function getAuthRole(userId) {
+  return request({
+    url: '/system/user/authRole/' + userId,
+    method: 'get'
+  })
+}
+
+// 保存授权角色
+export function updateAuthRole(data) {
+  return request({
+    url: '/system/user/authRole',
+    method: 'put',
+    params: data
+  })
+}
+
+// // 查询部门下拉树结构
+// export function deptTreeSelect() {
+//   return request({
+//     url: '/system/user/deptTree',
+//     method: 'get'
+//   })
+// }

Yi.BBS.Vue3/src/assets/github-markdown.css

@@ -0,0 +1,710 @@
+@font-face {
+    font-family: octicons-link;
+    src: url(data:font/woff;charset=utf-8;base64,d09GRgABAAAAAAZwABAAAAAACFQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABEU0lHAAAGaAAAAAgAAAAIAAAAAUdTVUIAAAZcAAAACgAAAAoAAQAAT1MvMgAAAyQAAABJAAAAYFYEU3RjbWFwAAADcAAAAEUAAACAAJThvmN2dCAAAATkAAAABAAAAAQAAAAAZnBnbQAAA7gAAACyAAABCUM+8IhnYXNwAAAGTAAAABAAAAAQABoAI2dseWYAAAFsAAABPAAAAZwcEq9taGVhZAAAAsgAAAA0AAAANgh4a91oaGVhAAADCAAAABoAAAAkCA8DRGhtdHgAAAL8AAAADAAAAAwGAACfbG9jYQAAAsAAAAAIAAAACABiATBtYXhwAAACqAAAABgAAAAgAA8ASm5hbWUAAAToAAABQgAAAlXu73sOcG9zdAAABiwAAAAeAAAAME3QpOBwcmVwAAAEbAAAAHYAAAB/aFGpk3jaTY6xa8JAGMW/O62BDi0tJLYQincXEypYIiGJjSgHniQ6umTsUEyLm5BV6NDBP8Tpts6F0v+k/0an2i+itHDw3v2+9+DBKTzsJNnWJNTgHEy4BgG3EMI9DCEDOGEXzDADU5hBKMIgNPZqoD3SilVaXZCER3/I7AtxEJLtzzuZfI+VVkprxTlXShWKb3TBecG11rwoNlmmn1P2WYcJczl32etSpKnziC7lQyWe1smVPy/Lt7Kc+0vWY/gAgIIEqAN9we0pwKXreiMasxvabDQMM4riO+qxM2ogwDGOZTXxwxDiycQIcoYFBLj5K3EIaSctAq2kTYiw+ymhce7vwM9jSqO8JyVd5RH9gyTt2+J/yUmYlIR0s04n6+7Vm1ozezUeLEaUjhaDSuXHwVRgvLJn1tQ7xiuVv/ocTRF42mNgZGBgYGbwZOBiAAFGJBIMAAizAFoAAABiAGIAznjaY2BkYGAA4in8zwXi+W2+MjCzMIDApSwvXzC97Z4Ig8N/BxYGZgcgl52BCSQKAA3jCV8CAABfAAAAAAQAAEB42mNgZGBg4f3vACQZQABIMjKgAmYAKEgBXgAAeNpjYGY6wTiBgZWBg2kmUxoDA4MPhGZMYzBi1AHygVLYQUCaawqDA4PChxhmh/8ODDEsvAwHgMKMIDnGL0x7gJQCAwMAJd4MFwAAAHjaY2BgYGaA4DAGRgYQkAHyGMF8NgYrIM3JIAGVYYDT+AEjAwuDFpBmA9KMDEwMCh9i/v8H8sH0/4dQc1iAmAkALaUKLgAAAHjaTY9LDsIgEIbtgqHUPpDi3gPoBVyRTmTddOmqTXThEXqrob2gQ1FjwpDvfwCBdmdXC5AVKFu3e5MfNFJ29KTQT48Ob9/lqYwOGZxeUelN2U2R6+cArgtCJpauW7UQBqnFkUsjAY/kOU1cP+DAgvxwn1chZDwUbd6CFimGXwzwF6tPbFIcjEl+vvmM/byA48e6tWrKArm4ZJlCbdsrxksL1AwWn/yBSJKpYbq8AXaaTb8AAHja28jAwOC00ZrBeQNDQOWO//sdBBgYGRiYWYAEELEwMTE4uzo5Zzo5b2BxdnFOcALxNjA6b2ByTswC8jYwg0VlNuoCTWAMqNzMzsoK1rEhNqByEyerg5PMJlYuVueETKcd/89uBpnpvIEVomeHLoMsAAe1Id4AAAAAAAB42oWQT07CQBTGv0JBhagk7HQzKxca2sJCE1hDt4QF+9JOS0nbaaYDCQfwCJ7Au3AHj+LO13FMmm6cl7785vven0kBjHCBhfpYuNa5Ph1c0e2Xu3jEvWG7UdPDLZ4N92nOm+EBXuAbHmIMSRMs+4aUEd4Nd3CHD8NdvOLTsA2GL8M9PODbcL+hD7C1xoaHeLJSEao0FEW14ckxC+TU8TxvsY6X0eLPmRhry2WVioLpkrbp84LLQPGI7c6sOiUzpWIWS5GzlSgUzzLBSikOPFTOXqly7rqx0Z1Q5BAIoZBSFihQYQOOBEdkCOgXTOHA07HAGjGWiIjaPZNW13/+lm6S9FT7rLHFJ6fQbkATOG1j2OFMucKJJsxIVfQORl+9Jyda6Sl1dUYhSCm1dyClfoeDve4qMYdLEbfqHf3O/AdDumsjAAB42mNgYoAAZQYjBmyAGYQZmdhL8zLdDEydARfoAqIAAAABAAMABwAKABMAB///AA8AAQAAAAAAAAAAAAAAAAABAAAAAA==) format('woff');
+  }
+  
+  .markdown-body {
+    -ms-text-size-adjust: 100%;
+    -webkit-text-size-adjust: 100%;
+    line-height: 1.5;
+    color: #24292e;
+    font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Helvetica, Arial, sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol";
+    font-size: 16px;
+    line-height: 1.5;
+    word-wrap: break-word;
+  }
+  
+  .markdown-body .pl-c {
+    color: #6a737d;
+  }
+  
+  .markdown-body .pl-c1,
+  .markdown-body .pl-s .pl-v {
+    color: #005cc5;
+  }
+  
+  .markdown-body .pl-e,
+  .markdown-body .pl-en {
+    color: #6f42c1;
+  }
+  
+  .markdown-body .pl-smi,
+  .markdown-body .pl-s .pl-s1 {
+    color: #24292e;
+  }
+  
+  .markdown-body .pl-ent {
+    color: #22863a;
+  }
+  
+  .markdown-body .pl-k {
+    color: #d73a49;
+  }
+  
+  .markdown-body .pl-s,
+  .markdown-body .pl-pds,
+  .markdown-body .pl-s .pl-pse .pl-s1,
+  .markdown-body .pl-sr,
+  .markdown-body .pl-sr .pl-cce,
+  .markdown-body .pl-sr .pl-sre,
+  .markdown-body .pl-sr .pl-sra {
+    color: #032f62;
+  }
+  
+  .markdown-body .pl-v,
+  .markdown-body .pl-smw {
+    color: #e36209;
+  }
+  
+  .markdown-body .pl-bu {
+    color: #b31d28;
+  }
+  
+  .markdown-body .pl-ii {
+    color: #fafbfc;
+    background-color: #b31d28;
+  }
+  
+  .markdown-body .pl-c2 {
+    color: #fafbfc;
+    background-color: #d73a49;
+  }
+  
+  .markdown-body .pl-c2::before {
+    content: "^M";
+  }
+  
+  .markdown-body .pl-sr .pl-cce {
+    font-weight: bold;
+    color: #22863a;
+  }
+  
+  .markdown-body .pl-ml {
+    color: #735c0f;
+  }
+  
+  .markdown-body .pl-mh,
+  .markdown-body .pl-mh .pl-en,
+  .markdown-body .pl-ms {
+    font-weight: bold;
+    color: #005cc5;
+  }
+  
+  .markdown-body .pl-mi {
+    font-style: italic;
+    color: #24292e;
+  }
+  
+  .markdown-body .pl-mb {
+    font-weight: bold;
+    color: #24292e;
+  }
+  
+  .markdown-body .pl-md {
+    color: #b31d28;
+    background-color: #ffeef0;
+  }
+  
+  .markdown-body .pl-mi1 {
+    color: #22863a;
+    background-color: #f0fff4;
+  }
+  
+  .markdown-body .pl-mc {
+    color: #e36209;
+    background-color: #ffebda;
+  }
+  
+  .markdown-body .pl-mi2 {
+    color: #f6f8fa;
+    background-color: #005cc5;
+  }
+  
+  .markdown-body .pl-mdr {
+    font-weight: bold;
+    color: #6f42c1;
+  }
+  
+  .markdown-body .pl-ba {
+    color: #586069;
+  }
+  
+  .markdown-body .pl-sg {
+    color: #959da5;
+  }
+  
+  .markdown-body .pl-corl {
+    text-decoration: underline;
+    color: #032f62;
+  }
+  
+  .markdown-body .octicon {
+    display: inline-block;
+    vertical-align: text-top;
+    fill: currentColor;
+  }
+  
+  .markdown-body a {
+    background-color: transparent;
+    -webkit-text-decoration-skip: objects;
+  }
+  
+  .markdown-body a:active,
+  .markdown-body a:hover {
+    outline-width: 0;
+  }
+  
+  .markdown-body strong {
+    font-weight: inherit;
+  }
+  
+  .markdown-body strong {
+    font-weight: bolder;
+  }
+  
+  .markdown-body h1 {
+    font-size: 2em;
+    margin: 0.67em 0;
+  }
+  
+  .markdown-body img {
+    border-style: none;
+  }
+  
+  .markdown-body svg:not(:root) {
+    overflow: hidden;
+  }
+  
+  .markdown-body code,
+  .markdown-body kbd,
+  .markdown-body pre {
+    font-family: monospace, monospace;
+    font-size: 1em;
+  }
+  
+  .markdown-body hr {
+    box-sizing: content-box;
+    height: 0;
+    overflow: visible;
+  }
+  
+  .markdown-body input {
+    font: inherit;
+    margin: 0;
+  }
+  
+  .markdown-body input {
+    overflow: visible;
+  }
+  
+  .markdown-body [type="checkbox"] {
+    box-sizing: border-box;
+    padding: 0;
+  }
+  
+  .markdown-body * {
+    box-sizing: border-box;
+  }
+  
+  .markdown-body input {
+    font-family: inherit;
+    font-size: inherit;
+    line-height: inherit;
+  }
+  
+  .markdown-body a {
+    color: #0366d6;
+    text-decoration: none;
+  }
+  
+  .markdown-body a:hover {
+    text-decoration: underline;
+  }
+  
+  .markdown-body strong {
+    font-weight: 600;
+  }
+  
+  .markdown-body hr {
+    height: 0;
+    margin: 15px 0;
+    overflow: hidden;
+    background: transparent;
+    border: 0;
+    border-bottom: 1px solid #dfe2e5;
+  }
+  
+  .markdown-body hr::before {
+    display: table;
+    content: "";
+  }
+  
+  .markdown-body hr::after {
+    display: table;
+    clear: both;
+    content: "";
+  }
+  
+  .markdown-body table {
+    border-spacing: 0;
+    border-collapse: collapse;
+  }
+  
+  .markdown-body td,
+  .markdown-body th {
+    padding: 0;
+  }
+  
+  .markdown-body h1,
+  .markdown-body h2,
+  .markdown-body h3,
+  .markdown-body h4,
+  .markdown-body h5,
+  .markdown-body h6 {
+    margin-top: 0;
+    margin-bottom: 0;
+  }
+  
+  .markdown-body h1 {
+    font-size: 32px;
+    font-weight: 600;
+  }
+  
+  .markdown-body h2 {
+    font-size: 24px;
+    font-weight: 600;
+  }
+  
+  .markdown-body h3 {
+    font-size: 20px;
+    font-weight: 600;
+  }
+  
+  .markdown-body h4 {
+    font-size: 16px;
+    font-weight: 600;
+  }
+  
+  .markdown-body h5 {
+    font-size: 14px;
+    font-weight: 600;
+  }
+  
+  .markdown-body h6 {
+    font-size: 12px;
+    font-weight: 600;
+  }
+  
+  .markdown-body p {
+    margin-top: 0;
+    margin-bottom: 10px;
+  }
+  
+  .markdown-body blockquote {
+    margin: 0;
+  }
+  
+  .markdown-body ul,
+  .markdown-body ol {
+    padding-left: 0;
+    margin-top: 0;
+    margin-bottom: 0;
+  }
+  
+  .markdown-body ol ol,
+  .markdown-body ul ol {
+    list-style-type: lower-roman;
+  }
+  
+  .markdown-body ul ul ol,
+  .markdown-body ul ol ol,
+  .markdown-body ol ul ol,
+  .markdown-body ol ol ol {
+    list-style-type: lower-alpha;
+  }
+  
+  .markdown-body dd {
+    margin-left: 0;
+  }
+  
+  .markdown-body code {
+    font-family: "SFMono-Regular", Consolas, "Liberation Mono", Menlo, Courier, monospace;
+    font-size: 12px;
+  }
+  
+  .markdown-body pre {
+    margin-top: 0;
+    margin-bottom: 0;
+    font-family: "SFMono-Regular", Consolas, "Liberation Mono", Menlo, Courier, monospace;
+    font-size: 12px;
+  }
+  
+  .markdown-body .octicon {
+    vertical-align: text-bottom;
+  }
+  
+  .markdown-body .pl-0 {
+    padding-left: 0 !important;
+  }
+  
+  .markdown-body .pl-1 {
+    padding-left: 4px !important;
+  }
+  
+  .markdown-body .pl-2 {
+    padding-left: 8px !important;
+  }
+  
+  .markdown-body .pl-3 {
+    padding-left: 16px !important;
+  }
+  
+  .markdown-body .pl-4 {
+    padding-left: 24px !important;
+  }
+  
+  .markdown-body .pl-5 {
+    padding-left: 32px !important;
+  }
+  
+  .markdown-body .pl-6 {
+    padding-left: 40px !important;
+  }
+  
+  .markdown-body::before {
+    display: table;
+    content: "";
+  }
+  
+  .markdown-body::after {
+    display: table;
+    clear: both;
+    content: "";
+  }
+  
+  .markdown-body>*:first-child {
+    margin-top: 0 !important;
+  }
+  
+  .markdown-body>*:last-child {
+    margin-bottom: 0 !important;
+  }
+  
+  .markdown-body a:not([href]) {
+    color: inherit;
+    text-decoration: none;
+  }
+  
+  .markdown-body .anchor {
+    float: left;
+    padding-right: 4px;
+    margin-left: -20px;
+    line-height: 1;
+  }
+  
+  .markdown-body .anchor:focus {
+    outline: none;
+  }
+  
+  .markdown-body p,
+  .markdown-body blockquote,
+  .markdown-body ul,
+  .markdown-body ol,
+  .markdown-body dl,
+  .markdown-body table,
+  .markdown-body pre {
+    margin-top: 0;
+    margin-bottom: 16px;
+  }
+  
+  .markdown-body hr {
+    height: 0.25em;
+    padding: 0;
+    margin: 24px 0;
+    background-color: #e1e4e8;
+    border: 0;
+  }
+  
+  .markdown-body blockquote {
+    padding: 0 1em;
+    color: #6a737d;
+    border-left: 0.25em solid #dfe2e5;
+  }
+  
+  .markdown-body blockquote>:first-child {
+    margin-top: 0;
+  }
+  
+  .markdown-body blockquote>:last-child {
+    margin-bottom: 0;
+  }
+  
+  .markdown-body kbd {
+    display: inline-block;
+    padding: 3px 5px;
+    font-size: 11px;
+    line-height: 10px;
+    color: #444d56;
+    vertical-align: middle;
+    background-color: #fafbfc;
+    border: solid 1px #c6cbd1;
+    border-bottom-color: #959da5;
+    border-radius: 3px;
+    box-shadow: inset 0 -1px 0 #959da5;
+  }
+  
+  .markdown-body h1,
+  .markdown-body h2,
+  .markdown-body h3,
+  .markdown-body h4,
+  .markdown-body h5,
+  .markdown-body h6 {
+    margin-top: 24px;
+    margin-bottom: 16px;
+    font-weight: 600;
+    line-height: 1.25;
+  }
+  
+  .markdown-body h1 .octicon-link,
+  .markdown-body h2 .octicon-link,
+  .markdown-body h3 .octicon-link,
+  .markdown-body h4 .octicon-link,
+  .markdown-body h5 .octicon-link,
+  .markdown-body h6 .octicon-link {
+    color: #1b1f23;
+    vertical-align: middle;
+    visibility: hidden;
+  }
+  
+  .markdown-body h1:hover .anchor,
+  .markdown-body h2:hover .anchor,
+  .markdown-body h3:hover .anchor,
+  .markdown-body h4:hover .anchor,
+  .markdown-body h5:hover .anchor,
+  .markdown-body h6:hover .anchor {
+    text-decoration: none;
+  }
+  
+  .markdown-body h1:hover .anchor .octicon-link,
+  .markdown-body h2:hover .anchor .octicon-link,
+  .markdown-body h3:hover .anchor .octicon-link,
+  .markdown-body h4:hover .anchor .octicon-link,
+  .markdown-body h5:hover .anchor .octicon-link,
+  .markdown-body h6:hover .anchor .octicon-link {
+    visibility: visible;
+  }
+  
+  .markdown-body h1 {
+    padding-bottom: 0.3em;
+    font-size: 2em;
+    border-bottom: 1px solid #eaecef;
+  }
+  
+  .markdown-body h2 {
+    padding-bottom: 0.3em;
+    font-size: 1.5em;
+    border-bottom: 1px solid #eaecef;
+  }
+  
+  .markdown-body h3 {
+    font-size: 1.25em;
+  }
+  
+  .markdown-body h4 {
+    font-size: 1em;
+  }
+  
+  .markdown-body h5 {
+    font-size: 0.875em;
+  }
+  
+  .markdown-body h6 {
+    font-size: 0.85em;
+    color: #6a737d;
+  }
+  
+  .markdown-body ul,
+  .markdown-body ol {
+    padding-left: 2em;
+  }
+  
+  .markdown-body ul ul,
+  .markdown-body ul ol,
+  .markdown-body ol ol,
+  .markdown-body ol ul {
+    margin-top: 0;
+    margin-bottom: 0;
+  }
+  
+  .markdown-body li>p {
+    margin-top: 16px;
+  }
+  
+  .markdown-body li+li {
+    margin-top: 0.25em;
+  }
+  
+  .markdown-body dl {
+    padding: 0;
+  }
+  
+  .markdown-body dl dt {
+    padding: 0;
+    margin-top: 16px;
+    font-size: 1em;
+    font-style: italic;
+    font-weight: 600;
+  }
+  
+  .markdown-body dl dd {
+    padding: 0 16px;
+    margin-bottom: 16px;
+  }
+  
+  .markdown-body table {
+    display: block;
+    width: 100%;
+    overflow: auto;
+  }
+  
+  .markdown-body table th {
+    font-weight: 600;
+  }
+  
+  .markdown-body table th,
+  .markdown-body table td {
+    padding: 6px 13px;
+    border: 1px solid #dfe2e5;
+  }
+  
+  .markdown-body table tr {
+    background-color: #fff;
+    border-top: 1px solid #c6cbd1;
+  }
+  
+  .markdown-body table tr:nth-child(2n) {
+    background-color: #f6f8fa;
+  }
+  
+  .markdown-body img {
+    max-width: 100%;
+    box-sizing: content-box;
+    background-color: #fff;
+  }
+  
+  .markdown-body img[align=right] {
+    padding-left: 20px;
+  }
+  
+  .markdown-body img[align=left] {
+    padding-right: 20px;
+  }
+  
+  .markdown-body code {
+    padding: 0;
+    padding-top: 0.2em;
+    padding-bottom: 0.2em;
+    margin: 0;
+    font-size: 85%;
+    background-color: rgba(27,31,35,0.05);
+    border-radius: 3px;
+  }
+  
+  .markdown-body code::before,
+  .markdown-body code::after {
+    letter-spacing: -0.2em;
+    content: "\00a0";
+  }
+  
+  .markdown-body pre {
+    word-wrap: normal;
+  }
+  
+  .markdown-body pre>code {
+    padding: 0;
+    margin: 0;
+    font-size: 100%;
+    word-break: normal;
+    white-space: pre;
+    background: transparent;
+    border: 0;
+  }
+  
+  .markdown-body .highlight {
+    margin-bottom: 16px;
+  }
+  
+  .markdown-body .highlight pre {
+    margin-bottom: 0;
+    word-break: normal;
+  }
+  
+  .markdown-body .highlight pre,
+  .markdown-body pre {
+    padding: 16px;
+    overflow: auto;
+    font-size: 85%;
+    line-height: 1.45;
+    /* background-color: #f6f8fa; */
+    border-radius: 3px;
+  }
+  
+  .markdown-body pre code {
+    display: inline;
+    max-width: auto;
+    padding: 0;
+    margin: 0;
+    overflow: visible;
+    line-height: inherit;
+    word-wrap: normal;
+    background-color: transparent;
+    border: 0;
+  }
+  
+  .markdown-body pre code::before,
+  .markdown-body pre code::after {
+    content: normal;
+  }
+  
+  .markdown-body .full-commit .btn-outline:not(:disabled):hover {
+    color: #005cc5;
+    border-color: #005cc5;
+  }
+  
+  .markdown-body kbd {
+    display: inline-block;
+    padding: 3px 5px;
+    font: 11px "SFMono-Regular", Consolas, "Liberation Mono", Menlo, Courier, monospace;
+    line-height: 10px;
+    color: #444d56;
+    vertical-align: middle;
+    background-color: #fafbfc;
+    border: solid 1px #d1d5da;
+    border-bottom-color: #c6cbd1;
+    border-radius: 3px;
+    box-shadow: inset 0 -1px 0 #c6cbd1;
+  }
+  
+  .markdown-body :checked+.radio-label {
+    position: relative;
+    z-index: 1;
+    border-color: #0366d6;
+  }
+  
+  .markdown-body .task-list-item {
+    list-style-type: none;
+  }
+  
+  .markdown-body .task-list-item+.task-list-item {
+    margin-top: 3px;
+  }
+  
+  .markdown-body .task-list-item input {
+    margin: 0 0.2em 0.25em -1.6em;
+    vertical-align: middle;
+  }
+  
+  .markdown-body hr {
+    border-bottom-color: #eee;
+  }
+  

Yi.BBS.Vue3/src/assets/main.css

@@ -0,0 +1,48 @@
+/* @import './base.css'; */
+/* #app {
+  margin: 0 auto;
+  font-weight: normal;
+} */
+
+body
+{
+  margin: 0 auto;
+  font-weight: normal;
+}
+a{
+  text-decoration: none;
+  }
+/* 
+#app {
+  max-width: 1280px;
+  margin: 0 auto;
+  padding: 2rem;
+
+  font-weight: normal;
+}
+
+a,
+.green {
+  text-decoration: none;
+  color: hsla(160, 100%, 37%, 1);
+  transition: 0.4s;
+}
+
+@media (hover: hover) {
+  a:hover {
+    background-color: hsla(160, 100%, 37%, 0.2);
+  }
+}
+
+@media (min-width: 1024px) {
+  body {
+    display: flex;
+    place-items: center;
+  }
+
+  #app {
+    display: grid;
+    grid-template-columns: 1fr 1fr;
+    padding: 0 2rem;
+  }
+} */

Yi.BBS.Vue3/src/assets/styles/index.scss

@@ -0,0 +1,190 @@
+// @import './variables.module.scss';
+// @import './mixin.scss';
+// @import './transition.scss';
+// @import './element-ui.scss';
+// @import './sidebar.scss';
+// @import './btn.scss';
+// @import './ruoyi.scss';
+
+// body {
+//   height: 100%;
+//   margin: 0;
+//   -moz-osx-font-smoothing: grayscale;
+//   -webkit-font-smoothing: antialiased;
+//   text-rendering: optimizeLegibility;
+//   font-family: Helvetica Neue, Helvetica, PingFang SC, Hiragino Sans GB, Microsoft YaHei, Arial, sans-serif;
+// }
+
+// label {
+//   font-weight: 700;
+// }
+
+// html {
+//   height: 100%;
+//   box-sizing: border-box;
+// }
+
+// #app {
+//   height: 100%;
+// }
+
+// *,
+// *:before,
+// *:after {
+//   box-sizing: inherit;
+// }
+
+// .no-padding {
+//   padding: 0px !important;
+// }
+
+// .padding-content {
+//   padding: 4px 0;
+// }
+
+// a:focus,
+// a:active {
+//   outline: none;
+// }
+
+// a,
+// a:focus,
+// a:hover {
+//   cursor: pointer;
+//   color: inherit;
+//   text-decoration: none;
+// }
+
+// div:focus {
+//   outline: none;
+// }
+
+// .fr {
+//   float: right;
+// }
+
+// .fl {
+//   float: left;
+// }
+
+// .pr-5 {
+//   padding-right: 5px;
+// }
+
+// .pl-5 {
+//   padding-left: 5px;
+// }
+
+// .block {
+//   display: block;
+// }
+
+// .pointer {
+//   cursor: pointer;
+// }
+
+// .inlineBlock {
+//   display: block;
+// }
+
+// .clearfix {
+//   &:after {
+//     visibility: hidden;
+//     display: block;
+//     font-size: 0;
+//     content: " ";
+//     clear: both;
+//     height: 0;
+//   }
+// }
+
+// aside {
+//   background: #eef1f6;
+//   padding: 8px 24px;
+//   margin-bottom: 20px;
+//   border-radius: 2px;
+//   display: block;
+//   line-height: 32px;
+//   font-size: 16px;
+//   font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Oxygen, Ubuntu, Cantarell, "Fira Sans", "Droid Sans", "Helvetica Neue", sans-serif;
+//   color: #2c3e50;
+//   -webkit-font-smoothing: antialiased;
+//   -moz-osx-font-smoothing: grayscale;
+
+//   a {
+//     color: #337ab7;
+//     cursor: pointer;
+
+//     &:hover {
+//       color: rgb(32, 160, 255);
+//     }
+//   }
+// }
+
+
+
+// .components-container {
+//   margin: 30px 50px;
+//   position: relative;
+// }
+
+// .pagination-container {
+//   margin-top: 30px;
+// }
+
+.text-center {
+  text-align: center
+}
+
+// .sub-navbar {
+//   height: 50px;
+//   line-height: 50px;
+//   position: relative;
+//   width: 100%;
+//   text-align: right;
+//   padding-right: 20px;
+//   transition: 600ms ease position;
+//   background: linear-gradient(90deg, rgba(32, 182, 249, 1) 0%, rgba(32, 182, 249, 1) 0%, rgba(33, 120, 241, 1) 100%, rgba(33, 120, 241, 1) 100%);
+
+//   .subtitle {
+//     font-size: 20px;
+//     color: #fff;
+//   }
+
+//   &.draft {
+//     background: #d0d0d0;
+//   }
+
+//   &.deleted {
+//     background: #d0d0d0;
+//   }
+// }
+
+// .link-type,
+// .link-type:focus {
+//   color: #337ab7;
+//   cursor: pointer;
+
+//   &:hover {
+//     color: rgb(32, 160, 255);
+//   }
+// }
+
+// .filter-container {
+//   padding-bottom: 10px;
+
+//   .filter-item {
+//     display: inline-block;
+//     vertical-align: middle;
+//     margin-bottom: 10px;
+//   }
+// }
+
+// //refine vue-multiselect plugin
+// .multiselect {
+//   line-height: 16px;
+// }
+
+// .multiselect--active {
+//   z-index: 1000 !important;
+// }

Yi.BBS.Vue3/src/assets/styles/login.scss

@@ -0,0 +1,206 @@
+* {
+    margin: 0;
+    padding: 0;
+}
+/*公共CSS*/
+.box {
+
+    width: 100vw;
+    height: 100vh;
+    background-color: rgb(29, 67, 89);
+    .content {
+        box-shadow: 0px 1px 6px #3B4859;
+        .login-wrapper {
+
+            h1 {
+                text-align: center;
+            }
+            .login-form {
+                .form-item {
+                    margin: 20px 0;
+                    span {
+                        display: block;
+                        margin: 5px 20px;
+                        font-weight: 100;
+                    }
+                    .input-item {
+                        width: 100%;
+                        border-radius: 40px;
+                        padding: 20px;
+                        box-sizing: border-box;
+                        font-size: 20px;
+                        font-weight: 200;
+                        &:focus {
+                            outline: none;
+                        }
+                    }
+                }
+                .login-btn {
+                    width: 100%;
+                    border-radius: 40px;
+                    color: #fff;
+                    border: 0;
+                    font-weight: 100;
+                    margin-top: 10px;
+                    cursor: pointer;
+                }
+            }
+            .divider {
+                width: 100%;
+                margin: 20px 0;
+                text-align: center;
+                display: flex;
+                align-items: center;
+                justify-content: center;
+                span:nth-child(1) {
+                    flex: 1;
+                }
+                span:nth-child(3) {
+                    flex: 1;
+                }
+                .line {
+                    display: inline-block;
+                    max-width: 30%;
+                    width: 30%;
+                }
+                .divider-text {
+                    vertical-align: middle;
+                    margin: 0px 20px;
+                    line-height: 0px;
+                    display: inline-block;
+                    width: 100px;
+                }
+            }
+            .other-login-wrapper {
+                width: 100%;
+                display: flex;
+                justify-content: center;
+                align-items: center;
+            }
+            .other-login-item {
+                border: 1px solid rgb(214, 222, 228);
+                padding: 10px;
+                margin: 10px;
+                cursor: pointer;
+            }
+        }
+    }
+}
+/*一般大于手机的尺寸CSS*/
+@media (min-width: 767px) {
+    .box {
+        background-color: #F0F2F5;
+        .content {
+            width: 85vw;
+            height: 90vh;
+            background: url("@/assets/login_images/login_two.jpg") no-repeat;
+            background-size: 90% 100%;
+            position: absolute;
+            right: 15%;
+            top: 50%;
+            left: 50%;
+            transform: translate(-50%, -50%);
+            border-radius: 20px;
+            background-color: #fff;
+            .login-wrapper {
+                width: 25vw;
+                position: absolute;
+                right: 15%;
+                top: 50%;
+                transform: translateY(-50%);
+                h1 {
+                    text-align: center;
+                    font-size: 45px;
+                    color: rgb(81, 100, 115);
+                    margin-bottom: 40px;
+                }
+                .login-form {
+                    margin: 10px 0;
+                    .form-item {
+                        span {
+                            color: rgb(81, 100, 115);
+                        }
+                        .input-item {
+                            height: 60px;
+                            border: 1px solid rgb(214, 222, 228);
+                        }
+                    }
+                    .login-btn {
+                        height: 50px;
+                        background-color: rgb(59, 72, 89);
+                        font-size: 20px;
+                    }
+                }
+                .divider {
+                    .line {
+                        border-bottom: 1px solid rgb(214, 222, 228);
+                    }
+                }
+                .other-login-item {
+                    border-radius: 20px;
+                    img {
+                        width: 40px;
+                        height: 40px;
+                    }
+                }
+            }
+        }
+    }
+}
+/*手机端CSS*/
+@media (max-width: 768px) {
+    .box {
+        .content {
+            width: 100vw;
+            height: 100vh;
+            background: url("@/assets/login_images/login_bg_phone.png") no-repeat;
+            background-size: 100% 100%;
+            display: flex;
+            align-items: flex-start;
+            justify-content: center;
+            .login-wrapper {
+                width: 70%;
+                height: 60%;
+                padding-top: 15%;
+                h1 {
+                    font-size: 30px;
+                    color: #fff;
+                }
+                .login-form {
+                    .form-item {
+                        margin: 10px 0;
+                        span {
+                            color: rgb(113, 129, 141);
+                        }
+                        .input-item {
+                            height: 30px;
+                            border: 1px solid rgb(113, 129, 141);
+                            background-color: transparent;
+                            color: #fff;
+                        }
+                    }
+                    .login-btn {
+                        height: 40px;
+                        background-color: rgb(235, 95, 93);
+                        font-size: 16px;
+                    }
+                }
+                .divider {
+                    .line {
+                        border-bottom: 1px solid #fff;
+                    }
+                    .divider-text {
+                        color: #fff;
+                    }
+                }
+                .other-login-item {
+                    border-radius: 15px;
+                    img {
+                        width: 35px;
+                        height: 35px;
+                    }
+                }
+            }
+        }
+    }
+}

Yi.BBS.Vue3/src/assets/styles/ruoyi.scss

@@ -0,0 +1,271 @@
+ /**
+ * 通用css样式布局处理
+ * Copyright (c) 2019 ruoyi
+ */
+
+ /** 基础通用 **/
+.pt5 {
+	padding-top: 5px;
+}
+.pr5 {
+	padding-right: 5px;
+}
+.pb5 {
+	padding-bottom: 5px;
+}
+.mt5 {
+	margin-top: 5px;
+}
+.mr5 {
+	margin-right: 5px;
+}
+.mb5 {
+	margin-bottom: 5px;
+}
+.mb8 {
+	margin-bottom: 8px;
+}
+.ml5 {
+	margin-left: 5px;
+}
+.mt10 {
+	margin-top: 10px;
+}
+.mr10 {
+	margin-right: 10px;
+}
+.mb10 {
+	margin-bottom: 10px;
+}
+.ml10 {
+	margin-left: 10px;
+}
+.mt20 {
+	margin-top: 20px;
+}
+.mr20 {
+	margin-right: 20px;
+}
+.mb20 {
+	margin-bottom: 20px;
+}
+.ml20 {
+	margin-left: 20px;
+}
+
+.h1, .h2, .h3, .h4, .h5, .h6, h1, h2, h3, h4, h5, h6 {
+	font-family: inherit;
+	font-weight: 500;
+	line-height: 1.1;
+	color: inherit;
+}
+
+.el-dialog:not(.is-fullscreen) {
+	margin-top: 6vh !important;
+}
+
+.el-dialog.scrollbar .el-dialog__body {
+    overflow: auto;
+	overflow-x: hidden;
+	max-height: 70vh;
+	padding: 10px 20px 0;
+}
+
+.el-table {
+	.el-table__header-wrapper, .el-table__fixed-header-wrapper {
+		th {
+			word-break: break-word;
+			background-color: #f8f8f9 !important;
+			color: #515a6e;
+			height: 40px !important;
+			font-size: 13px;
+		}
+	}
+	.el-table__body-wrapper {
+		.el-button [class*="el-icon-"] + span {
+			margin-left: 1px;
+		}
+	}
+}
+
+/** 表单布局 **/
+.form-header {
+    font-size:15px;
+	color:#6379bb;
+	border-bottom:1px solid #ddd;
+	margin:8px 10px 25px 10px;
+	padding-bottom:5px
+}
+
+/** 表格布局 **/
+.pagination-container {
+	// position: relative;
+	height: 25px;
+	margin-bottom: 10px;
+	margin-top: 15px;
+	padding: 10px 20px !important;
+}
+
+/* tree border */
+.tree-border {
+    margin-top: 5px;
+    border: 1px solid #e5e6e7;
+    background: #FFFFFF none;
+    border-radius:4px;
+    width: 100%;
+}
+
+.pagination-container .el-pagination {
+	right: 0;
+	position: absolute;
+}
+
+@media ( max-width : 768px) {
+  .pagination-container .el-pagination > .el-pagination__jump {
+    display: none !important;
+  }
+  .pagination-container .el-pagination > .el-pagination__sizes {
+    display: none !important;
+  }
+}
+
+.el-table .fixed-width .el-button--small {
+	padding-left: 0;
+	padding-right: 0;
+	width: inherit;
+}
+
+/** 表格更多操作下拉样式 */
+.el-table .el-dropdown-link {
+	cursor: pointer;
+	color: #409EFF;
+	margin-left: 10px;
+}
+
+.el-table .el-dropdown, .el-icon-arrow-down {
+	font-size: 12px;
+}
+
+.el-tree-node__content > .el-checkbox {
+	margin-right: 8px;
+}
+
+.list-group-striped > .list-group-item {
+	border-left: 0;
+	border-right: 0;
+	border-radius: 0;
+	padding-left: 0;
+	padding-right: 0;
+}
+
+.list-group {
+	padding-left: 0px;
+	list-style: none;
+}
+
+.list-group-item {
+	border-bottom: 1px solid #e7eaec;
+	border-top: 1px solid #e7eaec;
+	margin-bottom: -1px;
+	padding: 11px 0px;
+	font-size: 13px;
+}
+
+
+// .el-card__header {
+// 	padding: 14px 15px 7px !important;
+// 	min-height: 40px;
+// }
+
+// .el-card__body {
+// 	padding: 15px 20px 20px 20px !important;
+// }
+
+.card-box {
+	padding-right: 15px;
+	padding-left: 15px;
+	margin-bottom: 10px;
+}
+
+/* button color */
+.el-button--cyan.is-active,
+.el-button--cyan:active {
+  background: #20B2AA;
+  border-color: #20B2AA;
+  color: #FFFFFF;
+}
+
+.el-button--cyan:focus,
+.el-button--cyan:hover {
+  background: #48D1CC;
+  border-color: #48D1CC;
+  color: #FFFFFF;
+}
+
+.el-button--cyan {
+  background-color: #20B2AA;
+  border-color: #20B2AA;
+  color: #FFFFFF;
+}
+
+/* text color */
+.text-navy {
+	color: #1ab394;
+}
+
+.text-primary {
+	color: inherit;
+}
+
+.text-success {
+	color: #1c84c6;
+}
+
+.text-info {
+	color: #23c6c8;
+}
+
+.text-warning {
+	color: #f8ac59;
+}
+
+.text-danger {
+	color: #ed5565;
+}
+
+.text-muted {
+	color: #888888;
+}
+
+/* image */
+.img-circle {
+	border-radius: 50%;
+}
+
+.img-lg {
+	width: 120px;
+	height: 120px;
+}
+
+.avatar-upload-preview {
+	position: absolute;
+	top: 50%;
+	transform: translate(50%, -50%);
+	width: 200px;
+	height: 200px;
+	border-radius: 50%;
+	box-shadow: 0 0 4px #ccc;
+	overflow: hidden;
+}
+
+/* 拖拽列样式 */
+.sortable-ghost{
+	opacity: .8;
+	color: #fff!important;
+	background: #42b983!important;
+}
+
+/* 表格右侧工具栏样式 */
+.top-right-btn {
+	margin-left: auto;
+}

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

@@ -0,0 +1,55 @@
+<template>
+       <el-button text @click="agree">
+                            <el-icon v-if="data.isAgree" color="#409EFF">
+                                <CircleCheckFilled />
+                            </el-icon>
+                            <el-icon v-else color="#1E1E1E">
+                                <Pointer />
+                            </el-icon> 点赞:{{ data.agreeNum ?? 0 }}</el-button>
+    </template>
+    <script setup>
+import {onMounted,reactive,watch} from 'vue'
+import { operate } from '@/apis/agreeApi'
+
+
+//'isAgree','agreeNum','id'
+const props = defineProps([ 'data'])
+
+watch(()=>props,(n)=>{
+    data.id=n.data.id;
+    data.isAgree=n.data.isAgree;
+    data.agreeNum=n.data.agreeNum;
+},{deep:true})
+
+
+const data=reactive({
+    id:'',
+    isAgree:false,
+    agreeNum:0
+})
+// onMounted(()=>{
+  
+// })
+//点赞操作
+const agree = async () => {
+    const response = await operate(data.id)
+    const res = response.data;
+    //提示框，颜色区分
+    if (res.isAgree) {
+        data.isAgree = true;
+        data.agreeNum += 1;
+        ElMessage({
+            message: res.message,
+            type: 'success',
+        })
+    }
+    else {
+        data.isAgree = false;
+        data.agreeNum-= 1;
+        ElMessage({
+            message: res.message,
+            type: 'warning',
+        })
+    }
+}
+</script>

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

@@ -0,0 +1,43 @@
+<template>
+    <div>
+        <div class="markdown-body" v-html="outputHtml"></div>
+    </div>
+</template>
+  
+<script setup>
+import { marked } from 'marked';
+
+import hljs from "highlight.js";
+//可以设置加载样式切换主题
+import 'highlight.js/styles/atom-one-dark.css'
+import '@/assets/github-markdown.css'
+import { ref,watch  } from 'vue';
+
+
+
+const outputHtml=ref("")
+const props = defineProps(['code'])
+watch(props,(n,o)=>{
+    marked.setOptions({
+        renderer: new marked.Renderer(),
+        highlight: function(code) {
+            return hljs.highlightAuto(code).value;
+          },
+        pedantic: false,
+        gfm: true,//允许 Git Hub标准的markdown
+        tables: true,//支持表格
+    
+        breaks: true,
+        sanitize: false,
+        smartLists: true,
+        smartypants: false,
+        xhtml: false,
+        smartLists: true,
+    }
+    );
+    //需要注意代码块样式
+    outputHtml.value = marked(n.code).replace(/<pre>/g, "<pre class='hljs'>")
+})
+
+</script>
+

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

@@ -0,0 +1,131 @@
+<template >
+    <div class="avatar">
+        <div class="avatar-left">
+            <el-avatar :size="props.size" :src="iconUrl" />
+
+            <div v-if="props.isSelf">
+                <div class="nick"> {{ userInfo.nick }}</div>
+            </div>
+
+            <div v-if="!props.isSelf">
+
+                <div class="nick" :class="{ mt_1: props.time != 'undefined' }"> {{ userInfo.nick }}</div>
+                <div class="remarks" v-if="props.time"> {{ props.time }}</div>
+                <div class="remarks">
+                    <slot name="bottom" />
+                </div>
+            </div>
+            <div class="info" v-if="!props.isSelf">
+                <el-tag class="ml-2" type="warning">V8</el-tag>
+                <el-tag class="ml-2" type="danger">会员</el-tag>
+            </div>
+        </div>
+
+
+        <el-button v-if="props.showWatching" type="primary" size="default" icon="Plus">关注</el-button>
+
+    </div>
+</template>
+<script setup>
+import useUserStore from '@/stores/user'
+import { reactive, watch, onMounted, computed, ref } from 'vue';
+//userInfo
+//{icon,name,role,id},根据判断userInfo是否等于未定义，来觉得是当前登录用户信息，还是其他人信息
+const props = defineProps(['size', 'showWatching', 'time', 'userInfo', 'isSelf'])
+const userStore = useUserStore();
+const userInfo = reactive({
+    icon: "",
+    nick: "",
+    role: [],
+    id: ""
+});
+const iconUrl=ref('/src/assets/logo.ico');
+const iconUrlHandler = () => {
+    if (userInfo.icon == null || userInfo.icon == undefined || userInfo.icon == '') {
+
+        return '/src/assets/logo.ico';
+    }
+    return `${import.meta.env.VITE_APP_BASEAPI}/file/${userInfo.icon}`;
+}
+
+watch(userStore, (n) => {
+    if (props.userInfo == undefined) {
+        userInfo.nick = n.name;
+    }
+
+})
+
+watch(() => props, (n) => {
+    Init();
+}, { deep: true })
+
+onMounted(() => {
+    Init();
+})
+
+const Init = () => {
+    //使用传入值
+    if (props.userInfo != undefined) {
+        userInfo.icon = props.userInfo.icon;
+        userInfo.nick = props.userInfo.nick;
+        userInfo.role = props.userInfo.role;
+        userInfo.id = props.userInfo.id;
+           iconUrl.value=iconUrlHandler(userInfo.icon)
+    }
+
+    //使用当前登录用户
+    else {
+     
+        userInfo.icon = userStore.icon;
+        userInfo.nick = userStore.name;
+        userInfo.role = userStore.role;
+        userInfo.id = userStore.id;
+        iconUrl.value=userInfo.icon;
+        
+    }
+}
+
+</script>
+<style scoped>
+.mt_1 {
+    margin-top: 0.5rem;
+}
+
+.nick {
+    font-weight: bold;
+}
+
+.info {
+    margin-top: 0.6rem;
+    margin-left: 1rem;
+}
+
+.info .el-tag {
+    margin-right: 1rem;
+}
+
+.el-icon {
+    color: white;
+
+}
+
+.avatar {
+    display: flex;
+    justify-content: space-between;
+}
+
+.avatar-left {
+    display: flex;
+    justify-content: flex-start;
+    align-items: center;
+}
+
+.el-avatar {
+    margin-right: 1.2rem;
+}
+
+.remarks {
+    padding-top: 0.5rem;
+    color: #8C8C8C;
+}
+</style>

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

@@ -0,0 +1,38 @@
+<template>
+<div class="botton-div">
+<a><el-icon><UserFilled /></el-icon>站长：{{configStore.author}}</a>
+<a><el-icon><Search /></el-icon>{{configStore.bottom}}</a>
+<a><el-icon><View /></el-icon>关于本站</a>
+<a><el-icon><Message /></el-icon>建议反馈</a>
+<p></p>
+<a ><el-icon><Position /></el-icon>{{configStore.icp}}</a>
+</div>
+</template>
+<script setup>
+import useConfigStore from "@/stores/config";
+const  configStore= useConfigStore();
+</script>
+<style scoped>
+.el-icon
+{margin: 0 0.2rem;}
+a{
+    margin-right: 2rem;
+    line-height: 1.8rem;
+}
+a:hover {
+    color: #40a9ff;
+    cursor:pointer;
+}
+.botton-div
+{
+    background: transparent;
+    color: rgba(0,0,0,.45);
+    font-size: 14px;
+    display: flex;
+    flex-wrap: wrap;
+    height: auto;
+    width: auto;
+    justify-content: center;
+    margin: 0.5rem auto;
+}
+</style>

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

@@ -0,0 +1,204 @@
+<template>
+  <el-tabs v-model="activeName" @tab-click="handleClick">
+    <el-tab-pane label="评论" name="comment"></el-tab-pane>
+    <el-tab-pane label="相关内容" name="interrelated"></el-tab-pane>
+  </el-tabs>
+
+  <div class="total">
+    <div style="align-self: center;"> 共{{total}}个评论</div>
+    <div> <el-radio-group v-model="selectRadio">
+        <el-radio-button label="new" name="new">最新</el-radio-button>
+        <el-radio-button label="host" name="host">最热</el-radio-button>
+      </el-radio-group></div>
+  </div>
+
+
+  <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 class="btn-top-comment">其他</el-button>
+  
+  <el-divider />
+</div>
+
+  <!-- 开始评论主体 -->
+
+  <div v-for="item in commentList" :key="item.id" class="comment1">
+    <AvatarInfo :userInfo="item.createUser" />
+    <div class="content">
+      {{ item.content }}
+    </div>
+    <span class="time"> {{ item.creationTime }} </span>
+    <span class="pointer"><el-icon>
+        <Pointer />
+      </el-icon> 0</span>
+    <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 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" v-hasPer="['bbs:comment:add']">回复</el-button>
+        
+      </div>
+    </div>
+
+
+    <!-- 开始子评论主体 -->
+    <div v-for="children in item.children" :key="children.id" class="comment2">
+     
+      <div style="display: flex ;">
+        <AvatarInfo :userInfo="children.createUser" />
+        <span style="align-self: center;color:#606266;"> 回复@{{ children.commentedUser.nick }}</span>
+      </div>
+      <div class="content">
+        {{ children.content }}
+      </div>
+      <span class="time">{{ children.creationTime }} </span>
+      <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 v-hasPer="['bbs:comment:add']">回复</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" v-hasPer="['bbs:comment:add']">回复</el-button>
+      </div>
+    </div>
+
+    </div>
+
+    <el-divider />
+ 
+  </div>
+     <el-empty v-show="commentList.length<=0"  description="评论空空如也，快来抢占沙发~" />
+</template>
+<script setup>
+import { onMounted, reactive, ref } from "vue";
+import { useRoute, useRouter } from "vue-router";
+import { getListByDiscussId, add ,del} from "@/apis/commentApi.js";
+import AvatarInfo from './AvatarInfo.vue';
+//数据定义
+const route = useRoute();
+const router = useRouter();
+const commentList = ref([]);
+const query = reactive({});
+const topContent=ref('');
+//当前回复id
+const replayId = ref('');
+//回复文本框
+const placeholder = ref('')
+
+//选择类型：评论
+const activeName = ref('comment');
+//选择 最新
+const selectRadio = ref('new');
+//评论总数
+const total=ref(0);
+const form = reactive({
+  content: "",
+  discussId: route.params.discussId,
+  query,
+  parentId: 0,
+  rootId: 0,
+});
+onMounted(async () => {
+  await loadComment();
+});
+const loadComment = async () => {
+topContent.value='';
+  form.content = '';
+  const response = await getListByDiscussId(route.params.discussId, query);
+  commentList.value = response.data.items;
+  total.value=response.data.total
+};
+const addTopComment = async () => {
+  form.parentId = 0;
+  form.rootId = 0;
+ form.content=topContent.value;
+  await addComment();
+}
+const addComment = async () => {
+  if(form.content.length<=0)
+  {
+    ElMessage.error('输入评论不能为空!')
+    return 
+  }
+  await add(form);
+  await loadComment();
+  ElMessage({
+    message: '评论发表成功!',
+    type: 'success',
+  })
+};
+const delComment=async(ids)=>{
+  ElMessageBox.confirm(`确定是否删除编号[${ids}]的评论吗?`, "警告", {
+    confirmButtonText: "确认",
+    cancelButtonText: "取消",
+    type: "warning",
+  }).then(async () => {
+   
+await del(ids);
+await loadComment();
+ElMessage({
+    message: '评论已删除!',
+    type: 'success',
+  })
+  });
+
+
+}
+const replay = async (parentUserName, parentId, rootId) => {
+  replayId.value = parentId;
+  form.parentId = parentId;
+  form.rootId = rootId;
+  placeholder.value = `回复@${parentUserName}`;
+}
+
+//切换 评论、相关内容
+const handleClick = () => { }
+</script>
+<style scoped>
+.input-reply {
+  margin-top: 1rem;
+}
+
+.btn-reply {
+  margin: 1rem 0;
+  display: flex;
+  justify-content: end;
+}
+
+.comment1 .pointer {
+  margin: 0 0 0 1rem;
+}
+
+.time {
+  color: #8C8C8C;
+}
+
+.content {
+  margin: 1rem 0;
+}
+
+.total {
+  display: flex;
+
+  justify-content: space-between;
+
+}
+
+.comment2 {
+  margin-left: 3rem;
+}
+
+.el-divider {
+  margin: 1rem 0;
+}
+
+.btn-top-comment {
+  margin-top: 0.5rem;
+  margin-right: 1rem;
+}
+</style>