版本更新 (#1666)

* ✨ 父级插件加载 * ✅ 添加测试：更新与添加插件 (#1594) * ✅ 测试更新与添加插件 * ✅ Sourcery建议 * 👷 添加pytest * 🎨 优化代码 * 🐛 bug修复 * 🐛修复添加插件返回403的问题 (#1595) * 完善测试方法 * vscode测试配置 * 重构插件安装过程 * 🎨 修改readme * Update README.md * 🐛 修改bug与版本锁定 * 🐛 修复超级用户对群组功能开关 * 🐛 修复插件商店检查插件更新问题 (#1597) * 🐛 修复插件商店检查插件更新问题 * 🐛 恶意命令检测问题 * 🐛 增加插件状态检查 (#1598) * ✅ 优化测试用例 * 🐛 更改插件更新与安装逻辑 * 🐛 修复更新群组成员信息 * 🎨 代码优化 * 🚀 更新Dockerfile (#1599) * 🎨 更新requirements * ➕ 添加依赖aiocache * ⚡ 添加github镜像 * ✨ 添加仓库目录多获取渠道 * 🐛 修复测试用例 * ✨ 添加API缓存 * 🎨 采取Sourcery建议 * 🐛 文件下载逻辑修改 * 🎨 优化代码 * 🐛 修复插件开关有时出现错误 * ✨ 重构自检ui * 🐛 自检html修正 * 修复签到逻辑bug，并使代码更灵活以适应签到好感度等级配置 (#1606) * 修复签到功能已知问题 * 修复签到功能已知问题 * 修改参数名称 * 修改uid判断 --------- Co-authored-by: HibiKier <45528451+HibiKier@users.noreply.github.com> * 🎨 代码结构优化 * 🐛 私聊时修改插件时删除私聊帮助 * 🐛 过滤父插件 * 🐛 修复自检在ARM上的问题 (#1607) * 🐛 修复自检在ARM上的问题 * ✅ 优化测试 * ✨ 支持mysql，psql，sqlite随机函数 * 🔧 VSCode配置修改 * 🔧 VSCode配置修改 * ✨ 添加金币排行 Co-Authored-By: HibiKier <45528451+HibiKier@users.noreply.github.com> * 📝 修改README Co-Authored-By: HibiKier <45528451+HibiKier@users.noreply.github.com> * 🔨 提取GitHub相关操作 (#1609) * 🔨 提取GitHub相关操作 * 🔨 重构API策略 * ✨ 签到/金币排行限制最大数量 (#1616) * ✨ 签到/金币排行限制最大数量 * 🐛 修复超级用户id获取问题 * 🐛 修复路径解压与挂载 (#1619) * 🐛 修复功能少时zhenxun帮助图片排序问题 (#1620) * 🐛 签到文本适应 (#1622) * 🐛 好感度排行提供默认值 (#1624) * 🎈 优先使用github api (#1625) * ✨ 重构帮助，限制普通用户查询管理插件 (#1626) * 🐛 修复群权限与插件等级匹配 (#1627) * ✨ 当管理员尝试ban真寻时将被反杀 (#1628) * ✨ 群组发言时间检测提供开关配置 (#1630) * 🐳 chore: 支持自动修改版本号 (#1629) * 🎈 perf(github_utils): 支持github url下载遍历 (#1632) * 🎈 perf(github_utils): 支持github url下载遍历 * 🐞 fix(http_utils): 修复一些下载问题 * 🦄 refactor(http_utils): 部分重构 * chore(version): Update version to v0.2.2-e6f17c4 --------- Co-authored-by: AkashiCoin <AkashiCoin@users.noreply.github.com> * 🧪 test(auto_update): 修复测试用例 (#1633) * 🐛 修复商店商品为空时报错 (#1634) * 🐛 修复群权限与插件等级匹配 (#1635) * ✨ message_build支持AtAll (#1639) * 🎈 perf: 使用commit号下载插件 (#1641) * 🎈 perf: 使用commit号下载插件 * chore(version): Update version to v0.2.2-f9c7360 --------- Co-authored-by: AkashiCoin <AkashiCoin@users.noreply.github.com> * 🐳 chore: 修改运行检查触发路径 (#1642) * 🐳 chore: 修改运行检查触发路径 * 🐳 chore: 添加tests目录 * ✨ 重构qq群事件处理 (#1643) * 🐛 签到名称自适应 (#1644) * 🎨 更新README (#1645) * 🐛 fix(http_utils): 流式下载Content-Length错误 (#1647) * 🐛 修复群组中帮助功能状态显示问题 (#1650) * 🐛 修复群欢迎消息设置 (#1651) * 🐛 修复webui下载后首次启动错误 (#1652) * 🐛 修复webui下载后首次启动错误 * chore(version): Update version to v0.2.2-4a8ef85 --------- Co-authored-by: HibiKier <HibiKier@users.noreply.github.com> * ✨ 移除默认图片文件夹：爬 (#1653) * ✨ 安装/移除插件提供插件安装/卸载方法用于插件初始化 (#1654) * ✨ 新增超级用户与管理员帮助模板 (#1655) * ✨ 新增个人信息命令 (#1657) * ✨ 修改个人信息菜单名称 (#1658) * ✨ 新增插件商店api (#1659) * ✨ 新增插件商店api * chore(version): Update version to v0.2.2-7e15f20 --------- Co-authored-by: HibiKier <HibiKier@users.noreply.github.com> * ✨ 将cd，block，count限制复原配置文件 (#1662) * 🎨 修改README (#1663) * 🎨 修改版本号 (#1664) * 🎨 修改requirements (#1665) --------- Co-authored-by: AkashiCoin <l1040186796@gmail.com> Co-authored-by: fanyinrumeng <42991257+fanyinrumeng@users.noreply.github.com> Co-authored-by: AkashiCoin <i@loli.vet> Co-authored-by: Elaga <1728903318@qq.com> Co-authored-by: AkashiCoin <AkashiCoin@users.noreply.github.com> Co-authored-by: HibiKier <HibiKier@users.noreply.github.com>
2026-09-29 00:32:06 +08:00 · 2024-10-01 00:42:23 +08:00
parent daa40ae8b8
commit 4e33bf3a50
216 changed files with 10281 additions and 2538 deletions
@@ -1,5 +1,6 @@
 <!DOCTYPE html>
 <html>
+
 <head>
    <meta charset="utf-8">
    <title>ECharts Example</title>
@@ -7,14 +8,15 @@
    <script src="https://cdn.bootcss.com/echarts/4.2.1/echarts.min.js"></script>
    <link rel="stylesheet" href="main.css">
 </head>
+
 <body>
    <!-- 图表容器 -->
    <div id="main" style="width: 1000px;height:500px;"></div>
- 
+
    <script type="text/javascript">
        // 基于准备好的dom，初始化echarts实例
        var myChart = echarts.init(document.getElementById('main'));
- 
+
        // 指定图表的配置项和数据
        var option = {
            xAxis: {
@@ -23,28 +25,35 @@
            },
            yAxis: {
                type: 'category',
-                data: {{data.category_data|tojson}}
-            },
-            series: [
-                {
-                    data: {{data.data|tojson}},
-                    type: 'bar',
-                    itemStyle: {
-            // 为每个柱子设置随机颜色
-            color: function () {
-                // 生成一个随机颜色
-                return 'rgb(' +
-                    Math.round(Math.random() * 255) + ',' +
-                    Math.round(Math.random() * 255) + ',' +
-                    Math.round(Math.random() * 255) + ')';
-            }
-        }
+                data: {
+                    {
+                        data.category_data | tojson
+                    }
                }
-            ]
-            };
- 
+            },
+            series: [{
+                data: {
+                    {
+                        data.data | tojson
+                    }
+                },
+                type: 'bar',
+                itemStyle: {
+                    // 为每个柱子设置随机颜色
+                    color: function () {
+                        // 生成一个随机颜色
+                        return 'rgb(' +
+                            Math.round(Math.random() * 255) + ',' +
+                            Math.round(Math.random() * 255) + ',' +
+                            Math.round(Math.random() * 255) + ')';
+                    }
+                }
+            }]
+        };
+
        // 使用刚指定的配置项和数据显示图表。
        myChart.setOption(option);
    </script>
 </body>
+
 </html>
@@ -0,0 +1,182 @@
+
+
+@font-face {
+    font-family: fzrzFont;
+    /* 导入的字体文件 */
+    src: url("../../font/fzrzExtraBold.ttf");
+}
+
+
+
+
+body {
+    position: absolute;
+    left: -8px;
+    top: -8px;
+}
+
+.wrapper{
+    height: 750px;
+    width: 395px;
+    background-color: antiquewhite;
+    position: relative;
+}
+
+.top-image {
+    height: 215px;
+    width: 395px;
+}
+
+.abs-image {
+    height: 426px;
+    width: 93px;
+    position: absolute;
+    right: 39px;
+    top: 240px;
+}
+
+.bot-text {
+    height: 55px;
+    width: 335px;
+    position: relative;
+    padding: 0 30px;
+    margin-top: 10px;
+}
+
+.main {
+    height: 448px;
+    width: 335px;
+    padding: 0 30px;
+    position: relative;
+}
+
+.title {
+    background-color: #EB869D;
+    height: 32px;
+    font-family: 'fzrzFont';
+    color: white;
+    width: max-content;
+    border-radius: 20px;
+    padding: 0 10px;
+    float: left;
+    margin-top: 10px;
+}
+
+.title-n {
+    height: 23px;
+    width: 23px;
+    border-radius: 50%;
+    background-color: white;
+    position: absolute;
+    left: 36px;
+    top: 15px;
+    display: flex;
+    justify-content: center; 
+    align-items: center; 
+}
+
+.title-a {
+    background-color: #ED859E;
+    height: 19px;
+    width: 19px;
+    border-radius: 50%;
+}
+
+.network {
+    display: flex;
+    margin-left: 10px;
+}
+
+.network-item {
+    font-family: 'fzrzFont';
+    color: #EC859F;
+    display: flex;
+    justify-items: center;
+    align-items: center;
+    margin-left: 20px;
+}
+
+.network-status {
+    height: 10px;
+    width: 10px;
+    border-radius: 50%;
+    margin-left: 5px;
+}
+
+.network-text {
+    margin-left: 5px;
+}
+
+.network-item {
+    margin-top: 10px;
+}
+
+.data-status-item {
+    margin-top: 10px;
+}
+
+.data-status {
+    width: 100%;
+    height: 240px;
+    /* background-color:blueviolet; */
+    margin-top: 22px;
+}
+
+.data-status-item {
+    display: flex;
+    font-family: 'fzrzFont';
+    font-size: 15px;
+    line-height: 18.5px;
+    height: 50px;
+}
+
+.process {
+    height: 28px;
+    width: 105px;
+    border: #ED859E 4px solid;
+    border-radius: 30px;
+    overflow: hidden;
+}
+
+.process-bar {
+    height: 28px;
+    width: 30px;
+    background-color: #EB869D;
+    border-top-right-radius: 30px;
+    border-bottom-right-radius: 30px;
+}
+
+.data-status-item-text {
+    margin-left: 10px;
+    color: #EC839D;
+}
+
+.line {
+    background-color: #EC859F;
+    height: 2px;
+    width: 100%;
+    border-radius: 20px;
+}
+
+.status-text {
+    font-family: 'fzrzFont';
+    color: #EC859F;
+    height: 185px;
+}
+
+.status-text-title {
+    /* height: 25%; */
+    display: flex;
+    /* justify-content: center; */
+    align-items: center;
+    font-size: 14px;
+}
+
+.tip {
+    font-family: 'fzrzFont';
+    color: #ecbac7;
+    font-size: 10px;
+    position: absolute;
+    right: 5px;
+    bottom: 1px;
+}
@@ -0,0 +1,87 @@
+<!DOCTYPE html>
+<html lang="zh-cn">
+
+<head>
+    <meta charset="UTF-8">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+    <title>test</title>
+    <!-- <link rel="stylesheet" href="./res/font-awesome/css/font-awesome.min.css"> -->
+    <link rel="stylesheet" href="main.css">
+</head>
+
+<body>
+    <div class="wrapper">
+        <img class="top-image" src="res/img/top.jpg"></img>
+        <img class="abs-image" src="res/img/bk.png"></img>
+        <div class="bot-text">
+            <div class="title">
+                <div class="title-n">
+                    <div class="title-a"></div>
+                </div>
+                <span style="margin-left: 22px;">{{data.nickname}}自检</span>
+            </div>
+            <div class="network">
+                <div class="network-item">BaiDu<span class="network-status"
+                        style="background-color: {{data.baidu}}; border: 1px solid {{data.baidu}}"></span></div>
+                <div class="network-item">Google<span class="network-status"
+                        style="background-color: {{data.google}}; border: 1px solid {{data.google}}"></span></div>
+            </div>
+        </div>
+        <div class="main">
+            <div class="data-status">
+                <div class="data-status-item">
+                    <div class="process">
+                        <div class="process-bar" style="width: {{data.cpu_process}}%;"></div>
+                    </div>
+                    <div class="data-status-item-text">
+                        <div>CPU</div>
+                        <!-- <div style="font-size: 13px;">0.8% - 3.5Ghz [14core]</div> -->
+                        <div style="font-size: 13px;">{{data.cpu_info}}</div>
+                    </div>
+                </div>
+                <div class="data-status-item">
+                    <div class="process">
+                        <div class="process-bar" style="width: {{data.ram_process}}%;"></div>
+                    </div>
+                    <div class="data-status-item-text">
+                        <div>RAM</div>
+                        <div>{{data.ram_info}}</div>
+                    </div>
+                </div>
+                <div class="data-status-item">
+                    <div class="process">
+                        <div class="process-bar" style="width: {{data.swap_process}}%;"></div>
+                    </div>
+                    <div class="data-status-item-text">
+                        <div>SWAP</div>
+                        <div>{{data.swap_info}}</div>
+                    </div>
+                </div>
+                <div class="data-status-item">
+                    <div class="process">
+                        <div class="process-bar" style="width: {{data.disk_process}}%;"></div>
+                    </div>
+                    <div class="data-status-item-text">
+                        <div>DISK</div>
+                        <div>{{data.disk_info}}</div>
+                    </div>
+                </div>
+            </div>
+            <div class="line"></div>
+            <div class="status-text">
+                <p class="status-text-title">CPU&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<span
+                        style="font-size: 12px;line-height: 18.5px;">{{data.brand_raw}}</span></p>
+                <p class="status-text-title">SYSTEM&nbsp;&nbsp;&nbsp;&nbsp;<span
+                        style="font-size: 13px;line-height: 18.5px;">{{data.system}}</span></p>
+                <p class="status-text-title">VERSION&nbsp;&nbsp;&nbsp;<span>{{data.version}}</span></p>
+                <p class="status-text-title">PLUGINS&nbsp;&nbsp;&nbsp;<span>{{data.plugin_count}} loaded</span></p>
+            </div>
+        </div>
+        <div class="tip">Create By Zhenxun</div>
+    </div>
+</body>
+<script type="text/javascript" src="main.js">
+</script>
+
+</html>
@@ -0,0 +1,100 @@
+
+
+@font-face {
+    font-family: fzrzFont;
+    /* 导入的字体文件 */
+    src: url("../../font/fzrzExtraBold.ttf");
+}
+
+body {
+    position: absolute;
+    left: -8px;
+    top: -8px;
+}
+
+.wrapper{
+    width: 1400px;
+    position: relative;
+    background-image: url('res/img/bk.jpg');
+    background-size: cover;
+    font-family: 'cr105Font';
+    padding: 20px;
+}
+
+
+.title {
+    font-size: 60px;
+    font-family: 'fzrzFont';
+    /* margin-left: 40px; */
+    /* color: #F67186; */
+    background: linear-gradient(to right, #F67186, #F7889C);
+    -webkit-background-clip: text;
+    background-clip: text;
+    color: transparent;
+    text-align: center;
+}
+
+.main {
+    background-image: url('res/img/main.png');
+    background-size: 100% 100%;
+    /* background-size: cover; */
+    height: 100%;
+    width: 1370px;
+    position: relative;
+    padding: 20px;
+    /* box-shadow: 5px 5px 10px 0 rgba(0,0,0,0.5); */
+}
+
+.items-border {
+    display: flex;
+    flex-wrap: wrap;
+    padding-left: 18px;
+}
+
+.items {
+    border: #F67186 2px solid;
+    border-radius: 20px;
+    width: 675px;
+    padding: 30px;
+    max-width: 600px;
+}
+
+.item-title {
+    background-image: url('res/img/title.png');
+    background-size: cover;
+    background-repeat: no-repeat;
+    height: 55px;
+    width: 350px;
+    font-family: 'fzrzFont';
+    display: flex;
+    justify-content: center;
+    align-items: center;
+    color: white;
+    font-size: 35px;
+    border-radius: 16px;
+    letter-spacing:4px;
+}
+
+.usage-title {
+    font-size: 30px;
+    position: absolute;
+    top: -30px;
+}
+
+.item-des {
+    color: #F78094;
+    border-radius: 20px;
+    font-family: 'fzrzFont';
+    font-size: 30px;
+    padding: 10px;
+}
+
+.item-usage {
+    color: #F78094;
+    border-radius: 20px;
+    font-family: 'fzrzFont';
+    font-size: 20px;
+    border: #F67186 5px dotted;
+    padding: 60px 10px 10px 10px;
+    position: relative;
+}
@@ -0,0 +1,62 @@
+<!DOCTYPE html>
+<html lang="zh-cn">
+
+<head>
+    <meta charset="UTF-8">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+    <title>test</title>
+    <!-- <link rel="stylesheet" href="./res/font-awesome/css/font-awesome.min.css"> -->
+    <link rel="stylesheet" href="main.css">
+</head>
+
+<body>
+    <div class="wrapper">
+        <div class="main">
+            <div class="title">
+                {{data.nickname}}的{{data.help_name}}帮助
+            </div>
+            <div class="items-border">
+            {% for plugin in data['plugin_list'] %}
+                <div class="items">
+                    <div class="item-title">
+                        {{plugin.name}}
+                    </div>
+                    <div class="item-des">
+                        简介: {{plugin.description}}
+                    </div>
+                    <div class="item-usage">
+                        <p class="usage-title">用法:</p>
+                        {{plugin.usage}}
+                    </div>
+                </div>
+            {% endfor %}
+            </div>
+            <!-- <div class="items">
+                <div class="item-title">
+                    刷屏禁言
+                </div>
+                <div class="item-des">
+                    简介: 刷屏禁言相关操作
+                </div>
+                <div class="item-usage">
+                    用法:<br>
+                    指令：<br>
+                    设置刷屏: 查看当前设置<br>
+                    -c [count]: 检测最大次数<br>
+                    -t [time]: 规定时间内<br>
+                    -d [duration]: 禁言时长<br>
+                    示例:<br>
+                        设置刷屏 -c 10: 设置最大次数为10<br>
+                        设置刷屏 -t 100 -d 20: 设置规定时间和禁言时长<br>
+                        设置刷屏 -d 10: 设置禁言时长为10<br>
+                    * 即 X 秒内发送同样消息 N 次，禁言 M 分钟 *
+                </div>
+            </div> -->
+        </div>
+    </div>
+</body>
+<script type="text/javascript" src="main.js">
+</script>
+
+</html>
@@ -0,0 +1,235 @@
+
+
+@font-face {
+    font-family: fzrzFont;
+    /* 导入的字体文件 */
+    src: url("../../font/HYWenHei-85W.ttf");
+}
+
+@font-face {
+    font-family: systFont;
+    /* 导入的字体文件 */
+    src: url("../../font/syst.otf");
+}
+
+@font-face {
+    font-family: syhtFont;
+    /* 导入的字体文件 */
+    src: url("../../font/syht.otf");
+}
+
+
+
+
+
+
+body {
+    position: absolute;
+    left: -8px;
+    top: -8px;
+}
+
+.wrapper{
+    width: 1754px;
+    height: 1240px;
+    position: relative;
+    background-size: cover;
+    font-family: 'fzrzFont';
+    padding: 20px;
+    background-color: #E08A9F;
+    border-radius: 50px;
+    padding: 40px;
+    color: #E08A9F;
+    font-size: 30px;
+}
+
+.main{
+    width: 100%;
+    height: 100%;
+    display: flex;
+}
+
+.main-content {
+    background-color: white;
+    height: 1123px;
+    width: 682px;
+    border-radius: 50px;
+    padding: 56px 83px;
+    position: relative;
+}
+
+.weather-img {
+    position: absolute;
+    height: 60px;
+    left: 325px;
+    top: -10px;
+}
+
+.top-date {
+    display: flex;
+    position: relative;
+    font-family: "systFont";
+}
+
+.user-info {
+    display: flex;
+    margin-top: 65px;
+}
+
+.user-info-ava {
+    position: relative;
+
+}
+
+.ava-img {
+    height: 250px;
+    border-radius: 50%;
+    overflow: hidden;
+    display: inline-block;
+    border: 2px solid #E0899E;
+}
+
+.user-info-data {
+    margin-left: 30px;
+}
+
+.nickname {
+    position: absolute;
+    width: 140px;
+    left: 50%;
+    bottom: -27px;
+    transform: translate(-50%, -50%);
+    background-color: #E0899E;
+    color: white;
+    padding: 5px 10px;
+    border-radius: 15px;
+    text-align: center;
+}
+
+.user-des {
+    margin-top: 60px; 
+    font-size: 35px;
+    position: relative;
+    height: 710px;
+}
+
+.des-img {
+    height: 430px;
+    position: absolute;
+    bottom: -28px;
+    left: 85px;
+}
+
+.tag-img-content {
+    height: 120px;
+    width: 75px;
+    background-color: #E8BB88;
+    position: absolute;
+    top: 0px;
+    left: 120px;
+}
+
+.tag-img-test {
+    border-left: 37px solid transparent;
+    border-right: 38px solid transparent;
+    border-bottom: 54px solid white;
+    width: 0;
+    height: 68px;
+}
+
+.menu {
+    position: absolute;
+    right: 0px;
+    height: 496px;
+    top: 175px;
+}
+
+.menu-item {
+    writing-mode: vertical-rl; /* 从右向左垂直排列 */
+    color: #754E43;
+    height: 190px;
+    width: 65px;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    margin-bottom: 30px;
+    border-top-left-radius: 30px;
+    border-bottom-left-radius: 30px;
+    gap: 20px;
+}
+
+.main-img {
+    position: absolute;
+    height: 200px;
+    right: 150px;
+    top: 10px;
+}
+
+.sign-data {
+    margin-top: 105px;
+}
+
+.base-title {
+    font-size: 35px;
+}
+
+.sign-level {
+    border: 2px solid #E08A9F;
+    padding: 7px 3px;
+    font-size: 28px;
+}
+
+.line {
+    border: 1px solid #E08A9F;
+    margin-top: 30px;
+}
+
+.text-item {
+    display: flex;
+}
+
+
+.test-icon {
+    height: 50px;
+    margin-right: 10px;
+}
+
+.test-content {
+    display: flex;
+    align-items: center;
+    margin-top: 30px;
+}
+
+.test-title {
+    display: flex;
+    align-items: center;
+    margin-bottom: 10px;
+}
+
+.text-chart {
+    margin-top: 20px;
+    background-color: #E0899E;
+    color: white;
+    padding: 30px;
+    border-radius: 30px;
+    height: 560px;
+}
+
+.chart {
+    height: 490px;
+    width: 622px;
+    background-color: white;
+}
+
+.select {
+    background-color: #E0899E;
+    color: white;
+}
+
+.uname {
+    display: -webkit-box;
+    -webkit-line-clamp: 1; /* 显示的最大行数 */
+    -webkit-box-orient: vertical;
+    overflow: hidden; /* 隐藏溢出内容 */
+    text-overflow: ellipsis; /* 溢出部分显示为省略号 */
+}
@@ -0,0 +1,177 @@
+<!DOCTYPE html>
+<html lang="zh-cn">
+
+<head>
+    <meta charset="UTF-8">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+    <script src="https://cdn.bootcss.com/echarts/4.2.1/echarts.min.js"></script>
+    <title>test</title>
+    <!-- <link rel="stylesheet" href="./res/font-awesome/css/font-awesome.min.css"> -->
+    <link rel="stylesheet" href="main.css">
+</head>
+
+<body>
+    <div class="wrapper">
+        <div class="main">
+            <div class="main-content">
+                <div class="top-date">{{data.date}}......
+                    <img src="./res/img/{{data.weather}}.png" alt="sun" class="weather-img" />
+                    <span style="margin-left: 180px;">24℃</span>
+                </div>
+                <div class="user-info">
+                    <div class="user-info-ava">
+                        <img src="{{data.ava_url}}" alt="test" class="ava-img" />
+                        <div class="nickname">{{data.title}}</div>
+                    </div>
+                    <div class="user-info-data">
+                        <div class="uname">
+                            <span style="font-size: 35px;">姓名:</span>
+                            <span>{{data.nickname}}</span>
+                        </div>
+                        <div style="margin-top: 15px;">
+                            <span style="font-size: 35px;">种族:</span>
+                            <span>{{data.race}}</span>
+                        </div>
+                        <div style="margin-top: 15px;">
+                            <span style="font-size: 35px;">性别:</span>
+                            <span>{{data.sex}}</span>
+                        </div>
+                        <div style="margin-top: 15px;">
+                            <span style="font-size: 35px;">职业:</span>
+                            <span>{{data.occ}}</span>
+                        </div>
+                        <div style="margin-top: 15px;">
+                            <span style="font-size: 35px;">UID:</span>
+                            <span>{{data.uid}}</span>
+                        </div>
+                    </div>
+                </div>
+                <div class="user-des">
+                    <p>个人简介:</p>
+                    <div style="line-height: 60px;">
+                        {{data.description}}
+                    </div>
+                    <img src="./res/img/1.png" class="des-img" />
+                </div>
+            </div>
+            <div style="width: 50px;"></div>
+            <div class="main-content">
+                <div class="menu">
+                    <div class="menu-item" style="background-color: #E8BC89;">我的信息</div>
+                    <div class="menu-item" style="background-color: #EDCCC3;">我的道具</div>
+                    <div class="menu-item" style="background-color: #F0DAC6;">我的卡组</div>
+                    <div class="menu-item" style="background-color: #F7E5E4;">我的设置</div>
+                </div>
+                <div class="tag-img">
+                    <div class="tag-img-content">
+                        <div class="tag-img-test"></div>
+                    </div>
+                </div>
+                <img src="./res/img/2.png" class="main-img" />
+                <div class="sign-data">
+                    <p class="base-title">好感度等级: {{data.sign_level}}级</p>
+                    <div>
+                        <span class="sign-level {{data.select_index[0]}}">路人</span>
+                        <span class="sign-level {{data.select_index[1]}}">陌生</span>
+                        <span class="sign-level {{data.select_index[2]}}">初识</span>
+                        <span class="sign-level {{data.select_index[3]}}">普通</span>
+                        <span class="sign-level {{data.select_index[4]}}">熟悉</span>
+                        <span class="sign-level {{data.select_index[5]}}">信赖</span>
+                        <span class="sign-level {{data.select_index[6]}}">相知</span>
+                        <span class="sign-level {{data.select_index[7]}}">厚谊</span>
+                        <span class="sign-level {{data.select_index[8]}}">亲密</span>
+                    </div>
+                </div>
+                <div class="line"></div>
+                <div class="test-content" style="margin-top: 30px">
+                    <img src="./res/img/level.png" class="test-icon" />
+                    权限等级: {{data.level}}
+                </div>
+                <div>
+                    <div class="text-item">
+                        <div class="test-content" style="width: 50%;">
+                            <img src="./res/img/gold.png" class="test-icon" />
+                            金币数量: {{data.gold}}
+                        </div>
+                        <div class="test-content">
+                            <img src="./res/img/prop.png" class="test-icon" />
+                            道具数量: {{data.prop}}
+                        </div>
+                    </div>
+                    <div class="text-item">
+                        <div class="test-content" style="width: 50%;">
+                            <img src="./res/img/call.png" class="test-icon" />
+                            调用次数: {{data.call}}
+                        </div>
+                        <div class="test-content">
+                            <img src="./res/img/say.png" class="test-icon" />
+                            发言统计: {{data.say}}
+                        </div>
+                    </div>
+                    <!-- <div class="line"></div> -->
+                    <div class="text-chart">
+                        <div class="test-title">
+                            <img src="./res/img/xian.png" class="test-icon" />
+                            发言趋势图
+                        </div>
+                        <div id="chart" class="chart"></div>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+    <script type="text/javascript">
+        // 基于准备好的dom，初始化echarts实例
+        var myChart = echarts.init(document.getElementById('chart'));
+        // 指定图表的配置项和数据
+        var option = {
+            backgroundColor: "#E0899E",
+            animation: false,
+            xAxis: {
+                type: "category",
+                data: {{data.chart_date|tojson}},
+                axisLabel: {
+                    color: "#fff",
+                    fontSize: 20,
+                },
+            },
+            yAxis: {
+                type: "value",
+                axisLabel: {
+                    color: "#fff",
+                    fontSize: 20,
+                },
+            },
+            series: [{
+                	data: {{data.count_list|tojson}},
+                	type: "line",
+                	smooth: true,
+			        lineStyle: {
+                        // 设置线条颜色
+                        color: '#fff',
+                        // 可选：设置线条宽度
+                        width: 2
+                    },
+                    label: {
+                        normal: {
+                        show: true,
+                        position: 'top',
+                        textStyle: {
+                            fontSize: 20,
+                                color: '#fff'
+                            }
+                        }         
+                     }
+            }, ],
+        };
+
+
+        // 使用刚指定的配置项和数据显示图表。
+        myChart.setOption(option);
+    </script>
+</body>
+<script type="text/javascript" src="main.js">
+</script>
+
+</html>
@@ -0,0 +1,32 @@
+// var chartDom = document.getElementById("chart")
+// var myChart = echarts.init(chartDom)
+// var option
+
+// option = {
+//   backgroundColor: "#E0899E",
+//   animation: false,
+//   xAxis: {
+//     type: "category",
+//     data: ["Mon", "Tue", "Wed", "Thu", "Fri", "Sat", "Sun"],
+//     axisLabel: {
+//       color: "#fff",
+//       fontSize: 20,
+//     },
+//   },
+//   yAxis: {
+//     type: "value",
+//     axisLabel: {
+//       color: "#fff",
+//       fontSize: 20,
+//     },
+//   },
+//   series: [
+//     {
+//       data: [820, 932, 901, 934, 1290, 1330, 1320],
+//       type: "line",
+//       smooth: true,
+//     },
+//   ],
+// }
+
+// option && myChart.setOption(option)
@@ -0,0 +1,130 @@
+<!DOCTYPE html>
+<html lang="zh-cn">
+
+<head>
+    <meta charset="UTF-8">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+    <script src="https://cdn.jsdelivr.net/npm/echarts@latest/dist/echarts.min.js"></script>
+    <title>test</title>
+    <!-- <link rel="stylesheet" href="./res/font-awesome/css/font-awesome.min.css"> -->
+    <link rel="stylesheet" href="main.css">
+</head>
+
+<body>
+    <div class="wrapper">
+        <div class="main">
+            <div class="main-content">
+                <div class="top-date">2024/08/14......
+                    <img src="./res/img/sun.png" alt="sun" class="weather-img" />
+                    <span style="margin-left: 180px;">24℃</span>
+                </div>
+                <div class="user-info">
+                    <div class="user-info-ava">
+                        <img src="./res/img/test.jpg" alt="test" class="ava-img" />
+                        <div class="nickname">勇 者</div>
+                    </div>
+                    <div class="user-info-data">
+                        <div>
+                            <span style="font-size: 35px;">姓名:</span>
+                            <span>副驾驶啦啦啦</span>
+                        </div>
+                        <div style="margin-top: 15px;">
+                            <span style="font-size: 35px;">种族:</span>
+                            <span>人类</span>
+                        </div>
+                        <div style="margin-top: 15px;">
+                            <span style="font-size: 35px;">性别:</span>
+                            <span>男</span>
+                        </div>
+                        <div style="margin-top: 15px;">
+                            <span style="font-size: 35px;">生日:</span>
+                            <span>2021/10/01</span>
+                        </div>
+                        <div style="margin-top: 15px;">
+                            <span style="font-size: 35px;">UID:</span>
+                            <span>0021</span>
+                        </div>
+                    </div>
+                </div>
+                <div class="user-des">
+                    <p>个人简介:</p>
+                    <div style="line-height: 60px;">
+                        这是人类勇者的传奇在这片古老而神秘的土地上，
+                        每当黑暗的力量威胁到和平与正义之时总会有一位英雄挺身而出。
+                        他们不仅拥有超凡的力量更重要的是更重要的是更重要的是
+                    </div>
+                    <img src="./res/img/1.png" class="des-img" />
+                </div>
+            </div>
+            <div style="width: 50px;"></div>
+            <div class="main-content">
+                <div class="menu">
+                    <div class="menu-item" style="background-color: #E8BC89;">信息</div>
+                    <div class="menu-item" style="background-color: #EDCCC3;">仓库</div>
+                    <div class="menu-item" style="background-color: #F0DAC6;">卡组</div>
+                    <div class="menu-item" style="background-color: #F7E5E4;">设置</div>
+                </div>
+                <div class="tag-img">
+                    <div class="tag-img-content">
+                        <div class="tag-img-test"></div>
+                    </div>
+                </div>
+                <img src="./res/img/2.png" class="main-img" />
+                <div class="sign-data">
+                    <p class="base-title">好感度等级: 5级</p>
+                    <div>
+                        <span class="sign-level">路人</span>
+                        <span class="sign-level">陌生</span>
+                        <span class="sign-level">初识</span>
+                        <span class="sign-level select">普通</span>
+                        <span class="sign-level">熟悉</span>
+                        <span class="sign-level">信赖</span>
+                        <span class="sign-level">相知</span>
+                        <span class="sign-level">厚谊</span>
+                        <span class="sign-level">亲密</span>
+                    </div>
+                </div>
+                <div class="line"></div>
+                <div class="test-content" style="margin-top: 30px">
+                    <img src="./res/img/level.png" class="test-icon" />
+                    权限等级: 9
+                </div>
+                <div>
+                    <div class="text-item">
+                        <div class="test-content" style="width: 50%;">
+                            <img src="./res/img/gold.png" class="test-icon" />
+                            金币数量: 999
+                        </div>
+                        <div class="test-content">
+                            <img src="./res/img/prop.png" class="test-icon" />
+                            道具数量: 933
+                        </div>
+                    </div>
+                    <div class="text-item">
+                        <div class="test-content" style="width: 50%;">
+                            <img src="./res/img/call.png" class="test-icon" />
+                            调用次数: 6443
+                        </div>
+                        <div class="test-content">
+                            <img src="./res/img/say.png" class="test-icon" />
+                            发言统计: 233
+                        </div>
+                    </div>
+                    <!-- <div class="line"></div> -->
+                    <div class="text-chart">
+                        <div class="test-title">
+                            <img src="./res/img/xian.png" class="test-icon" />
+                            发言趋势图
+                        </div>
+                        <div id="chart" class="chart"></div>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+</body>
+<script type="text/javascript" src="main.js">
+</script>
+
+</html>
@@ -34,11 +34,6 @@
    src: url("./res/font/jcyt.ttf");
 }

-@font-face {
-    font-family: yshsFont;
-    /* 导入的字体文件 */
-    src: url("/resources/font/YSHaoShenTi-2.ttf");
-}

 body {
    position: absolute;
@@ -79,10 +74,17 @@ body {
    margin-top: 43px;
    margin-left: 30px;
    font-size: 47px;
-    height: 57px;
-    align-items: center;
-    justify-content: center;
-    display: flex
+    /* align-items: center;
+    justify-content: center; */
+    /* display: flex; */
+    width: 275px;
+    height: 67px;
+    display: -webkit-box;
+    -webkit-line-clamp: 2;
+    -webkit-box-orient: vertical;
+    overflow: hidden;
+    text-overflow: ellipsis;
+    white-space: normal;
 }

 .uid {
@@ -122,6 +124,7 @@ body {
    position: absolute;
    top: 72px;
    left: 130px;
+    width: 200px;
 }

 .sign-content{
@@ -1,7 +1,7 @@
-
 </html>
 <!DOCTYPE html>
 <html lang="zh-cn">
+
 <head>
    <meta charset="UTF-8">
    <meta http-equiv="X-UA-Compatible" content="IE=edge">
@@ -10,12 +10,13 @@
    <!-- <link rel="stylesheet" href="./res/font-awesome/css/font-awesome.min.css"> -->
    <link rel="stylesheet" href="main.css">
 </head>
+
 <body>
    <div class="wrapper">
        <div class="top-head">
            <div style="display: flex;">
                <div class="avatar">
-                    <img class="avatar-img" src="{{data.ava}}" alt="">
+                    <img class="avatar-img" src="{{data.ava_url}}" alt="">
                </div>
                <div style="position: relative;">
                    <p class="nickname" style="font-size: {{ data.font_size }}px;">{{data.name}}</p>
@@ -40,20 +41,21 @@
                <p class="gift">{{data.impression}}</p>
            </div>
            <div class="abs-text" style="top: 83px;">
-                <p class="gift">{{data.gold}}</p></div>
-             <div class="abs-text" style="top: 123px;">
+                <p class="gift">{{data.gold}}</p>
+            </div>
+            <div class="abs-text" style="top: 123px;">
                <p class="gift">{{data.gift}}</p>
-             </div>
+            </div>
        </div>
        <div class="line"></div>
        <div class="bottom-foot">
            <p class="cur-text">当前好感度: {{data.cur_impression}}</p>
            <div class="heart-list">
                {% for i in data.heart2 %}
-                    <img class="heart-img" src="res/img/h2.png" alt=""/>
+                <img class="heart-img" src="res/img/h2.png" alt="" />
                {% endfor %}
                {% for i in data.heart1 %}
-                    <img class="heart-img" src="res/img/h1.png" alt=""/>
+                <img class="heart-img" src="res/img/h1.png" alt="" />
                {% endfor %}
            </div>
            <div class="bot-text">
@@ -61,11 +63,11 @@
                <p style="position: absolute; top: 58px">{{data.attitude}}</p>
                <p style="position: absolute; top: 111px"">距离升级还差{{data.interpolation}}好感度</p>
            </div>
-            <div class="progress-border">
-                <div class="progress-bar" style="width: {{ data.process }}%;"></div>
+            <div class=" progress-border">
+                    <div class="progress-bar" style="width: {{ data.process }}%;"></div>
            </div>
            <img class="weather-img" src="res/img/weather/0.png" alt="">
-            <p class="wd" >28℃</p>
+            <p class="wd">28℃</p>
            <img class="mbl-img" src="res/img/2.png" alt="">
            <div class="date">
                {{data.date}}
@@ -75,4 +77,5 @@
 </body>
 <script type="text/javascript" src="main.js">
 </script>
+
 </html>
@@ -3,19 +3,19 @@
@font-face {
    font-family: fzrzFont;
    /* 导入的字体文件 */
-    src: url("./res/font/fzrzExtraBold.ttf");
+    src: url("../../font/fzrzExtraBold.ttf");
 }

@font-face {
    font-family: syhtFont;
    /* 导入的字体文件 */
-    src: url("./res/font/syht.otf");
+    src: url("../../font/syht.otf");
 }

@font-face {
    font-family: systFont;
    /* 导入的字体文件 */
-    src: url("./res/font/syst.otf");
+    src: url("../../font/syst.otf");
 }