解决2d姑娘跨域的问题

2022-05-02 22:11:21 +08:00
parent 3d9ef9ebca
commit f44f36356d
27 changed files with 213 additions and 77 deletions
--- a/src/main/resources/static/favicon.ico
+++ b/src/main/resources/static/favicon.ico
--- a/src/main/resources/static/images/logo/logo.png
+++ b/src/main/resources/static/images/logo/logo.png
--- a/src/main/resources/static/images/logo/logo7272.jpg
+++ b/src/main/resources/static/images/logo/logo7272.jpg
--- a/src/main/resources/static/live/css/flat-ui-icons-regular.ttf
+++ b/src/main/resources/static/live/css/flat-ui-icons-regular.ttf
--- a/src/main/resources/static/live/css/flat-ui-icons-regular.woff
+++ b/src/main/resources/static/live/css/flat-ui-icons-regular.woff
--- a/src/main/resources/static/live/js/addlive2d.js
+++ b/src/main/resources/static/live/js/addlive2d.js
@@ -0,0 +1,138 @@
+try {
+    $("<link>").attr({
+        // href: url+"assets/1.4.2/waifu.min.css",
+        href: "/live/css/waifu.min.css",
+        rel: "stylesheet",
+        type: "text/css"
+    }).appendTo('head');
+    $('body').append('<div class="waifu"><div class="waifu-tips"></div><canvas id="live2d" class="live2d"></canvas><div class="waifu-tool"><span class="fui-home"></span> <span class="fui-chat"></span> <span class="fui-eye"></span> <span class="fui-user"></span> <span class="fui-photo"></span> <span class="fui-info-circle"></span> <span class="fui-cross"></span></div></div>');
+    $.ajax({
+        url: '/live/js/waifu-tips.min.js',
+        dataType: "script",
+        cache: true,
+        success: function () {
+            $.ajax({
+                url: '/live/js/live2d.min.js',
+                dataType: "script",
+                cache: true,
+                success: function () {
+
+                    let modelJson =
+                        {
+                            "waifu": {
+                                "console_open_msg": ["哈哈，你打开了控制台，是想要看看我的秘密吗？"],
+                                "copy_message": ["你都复制了些什么呀，转载要记得加上出处哦"],
+                                "screenshot_message": ["照好了嘛，是不是很可爱呢？"],
+                                "hidden_message": ["我们还能再见面的吧…"],
+                                "load_rand_textures": ["我还没有其他衣服呢", "我的新衣服好看嘛"],
+                                "hour_tips": {
+                                    "t5-7": ["早上好！一日之计在于晨，美好的一天就要开始了"],
+                                    "t7-11": ["上午好！工作顺利嘛，不要久坐，多起来走动走动哦！"],
+                                    "t11-14": ["中午了，工作了一个上午，现在是午餐时间！"],
+                                    "t14-17": ["午后很容易犯困呢，今天的运动目标完成了吗？"],
+                                    "t17-19": ["傍晚了！窗外夕阳的景色很美丽呢，最美不过夕阳红~"],
+                                    "t19-21": ["晚上好，今天过得怎么样？"],
+                                    "t21-23": ["已经这么晚了呀，早点休息吧，晚安~"],
+                                    "t23-5": ["你是夜猫子呀？这么晚还不睡觉，明天起的来嘛"],
+                                    "default": ["嗨~ 快来逗我玩吧！"]
+                                },
+                                "referrer_message": {
+                                    "localhost": ["欢迎大佬审阅<span style=\"color:#0099cc;\">『", "』</span>", " - "],
+                                    "baidu": ["Hello! 来自 百度搜索 的朋友<br>你是搜索 <span style=\"color:#0099cc;\">", "</span> 找到的我吗？"],
+                                    "so": ["Hello! 来自 360搜索 的朋友<br>你是搜索 <span style=\"color:#0099cc;\">", "</span> 找到的我吗？"],
+                                    "google": ["Hello! 来自 谷歌搜索 的朋友<br>欢迎阅读<span style=\"color:#0099cc;\">『", "』</span>", " - "],
+                                    "default": ["Hello! 来自 <span style=\"color:#0099cc;\">", "</span> 的朋友"],
+                                    "none": ["欢迎阅读<span style=\"color:#0099cc;\">『", "』</span>", " - "]
+                                },
+                                "referrer_hostname": {
+                                    "example.com": ["示例网站"],
+                                    "www.fghrsh.net": ["FGHRSH 的博客"]
+                                },
+                                "model_message": {
+                                    "1": ["来自 Potion Maker 的 Pio 酱 ~"],
+                                    "2": ["来自 Potion Maker 的 Tia 酱 ~"]
+                                },
+                                "hitokoto_api_message": {
+                                    "lwl12.com": ["干了这碗鸡汤，再来一碗？"],
+                                    "fghrsh.net": ["干了这碗鸡汤，再来一碗？"],
+                                    "jinrishici.com": ["干了这碗鸡汤，再来一碗？"],
+                                    "hitokoto.cn": ["干了这碗鸡汤，再来一碗？"]
+                                }
+                            },
+                            "mouseover": [
+                                { "selector": ".container a[href^='http']", "text": ["要看看 <span style=\"color:#0099cc;\">{text}</span> 么？"] },
+                                { "selector": ".fui-home", "text": ["点击前往首页，想回到上一页可以使用浏览器的后退功能哦"] },
+                                { "selector": ".fui-chat", "text": ["一言一语，一颦一笑。一字一句，一颗赛艇。"] },
+                                { "selector": ".fui-eye", "text": ["嗯··· 要切换 看板娘 吗？"] },
+                                { "selector": ".fui-user", "text": ["喜欢换装 Play 吗？"] },
+                                { "selector": ".fui-photo", "text": ["要拍张纪念照片吗？"] },
+                                { "selector": ".fui-info-circle", "text": ["这里有关于我的信息呢"] },
+                                { "selector": ".fui-cross", "text": ["你不喜欢我了吗..."] },
+                                { "selector": "#tor_show", "text": ["翻页比较麻烦吗，点击可以显示这篇文章的目录呢"] },
+                                { "selector": "#comment_go", "text": ["想要去评论些什么吗？"] },
+                                { "selector": "#night_mode", "text": ["深夜时要爱护眼睛呀"] },
+                                { "selector": "#qrcode", "text": ["手机扫一下有惊喜嗷"] },
+                                { "selector": ".comment_reply", "text": ["要吐槽些什么呢"] },
+                                { "selector": "#back-to-top", "text": ["回到开始的地方吧"] },
+                                { "selector": "#author", "text": ["该怎么称呼你呢"] },
+                                { "selector": "#mail", "text": ["留下你的邮箱，不然就是无头像人士了"] },
+                                { "selector": "#url", "text": ["你的家在哪里呢，好让我去参观参观"] },
+                                { "selector": "#textarea", "text": ["认真填写哦，垃圾评论是禁止事项"] },
+                                { "selector": ".OwO-logo", "text": ["要插入一个表情吗"] },
+                                { "selector": "#csubmit", "text": ["要[提交]^(Commit)了吗，首次评论需要审核，请耐心等待~"] },
+                                { "selector": ".ImageBox", "text": ["点击图片可以放大呢"] },
+                                { "selector": "input[name=s]", "text": ["找不到想看的内容？搜索看看吧"] },
+                                { "selector": ".previous", "text": ["去上一页看看吧"] },
+                                { "selector": ".next", "text": ["去下一页看看吧"] },
+                                { "selector": ".dropdown-toggle", "text": ["这里是菜单"] },
+                                { "selector": "c-player a.play-icon", "text": ["想要听点音乐吗"] },
+                                { "selector": "c-player div.time", "text": ["在这里可以调整<span style=\"color:#0099cc;\">播放进度</span>呢"] },
+                                { "selector": "c-player div.volume", "text": ["在这里可以调整<span style=\"color:#0099cc;\">音量</span>呢"] },
+                                { "selector": "c-player div.list-button", "text": ["<span style=\"color:#0099cc;\">播放列表</span>里都有什么呢"] },
+                                { "selector": "c-player div.lyric-button", "text": ["有<span style=\"color:#0099cc;\">歌词</span>的话就能跟着一起唱呢"] },
+                                { "selector": ".waifu #live2d", "text": ["干嘛呢你，快把手拿开", "鼠…鼠标放错地方了！"] }
+                            ],
+                            "click": [
+                                {
+                                    "selector": ".waifu #live2d",
+                                    "text": [
+                                        "是…是不小心碰到了吧",
+                                        "萝莉控是什么呀",
+                                        "你看到我的小熊了吗",
+                                        "再摸的话我可要报警了！⌇●﹏●⌇",
+                                        "110吗，这里有个变态一直在摸我(ó﹏ò｡)"
+                                    ]
+                                }
+                            ],
+                            "seasons": [
+                                { "date": "01/01", "text": ["<span style=\"color:#0099cc;\">元旦</span>了呢，新的一年又开始了，今年是{year}年~"] },
+                                { "date": "02/14", "text": ["又是一年<span style=\"color:#0099cc;\">情人节</span>，{year}年找到对象了嘛~"] },
+                                { "date": "03/08", "text": ["今天是<span style=\"color:#0099cc;\">妇女节</span>！"] },
+                                { "date": "03/12", "text": ["今天是<span style=\"color:#0099cc;\">植树节</span>，要保护环境呀"] },
+                                { "date": "04/01", "text": ["悄悄告诉你一个秘密~<span style=\"background-color:#34495e;\">今天是愚人节，不要被骗了哦~</span>"] },
+                                { "date": "05/01", "text": ["今天是<span style=\"color:#0099cc;\">五一劳动节</span>，计划好假期去哪里了吗~"] },
+                                { "date": "05/21", "text": ["今天是<span style=\"color:#0099cc;\">我和老婆的领证纪念日</span>，祝我们百年好合！"] },
+                                { "date": "06/01", "text": ["<span style=\"color:#0099cc;\">儿童节</span>了呢，快活的时光总是短暂，要是永远长不大该多好啊…"] },
+                                { "date": "09/03", "text": ["<span style=\"color:#0099cc;\">中国人民抗日战争胜利纪念日</span>，铭记历史、缅怀先烈、珍爱和平、开创未来。"] },
+                                { "date": "09/10", "text": ["<span style=\"color:#0099cc;\">教师节</span>，在学校要给老师问声好呀~"] },
+                                { "date": "10/01", "text": ["<span style=\"color:#0099cc;\">国庆节</span>，新中国已经成立69年了呢"] },
+                                { "date": "10/03", "text": ["今天是<span style=\"color:#0099cc;\">和老婆的结婚纪念日</span>，繁花似锦，一路有你！"] },
+                                { "date": "11/05-11/12", "text": ["今年的<span style=\"color:#0099cc;\">双十一</span>是和谁一起过的呢~"] },
+                                { "date": "12/20-12/31", "text": ["这几天是<span style=\"color:#0099cc;\">圣诞节</span>，主人肯定又去剁手买买买了~"] }
+                            ]
+                        }
+                    ;
+
+                    live2d_settings['hitokotoAPI'] = 'hitokoto.cn';
+                    live2d_settings['modelId'] = 5;
+                    live2d_settings['modelTexturesId'] = 1;
+                    live2d_settings['modelStorage'] = false;
+                    live2d_settings['canTurnToAboutPage'] = false;
+                    initModel(modelJson);
+                }
+            });
+        }
+    });
+} catch (err) {
+    console.log('[Error] JQuery is not defined.')
+}
--- a/src/main/resources/static/live/js/live2d.min.js
+++ b/src/main/resources/static/live/js/live2d.min.js
--- a/src/main/resources/static/live/js/waifu-tips.min.js
+++ b/src/main/resources/static/live/js/waifu-tips.min.js
--- a/src/main/resources/templates/blog/editor.html
+++ b/src/main/resources/templates/blog/editor.html
@@ -3,10 +3,10 @@
 <head>
    <meta charset="UTF-8">
    <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
-    <title>问答-Quinn</title>
+    <title>博客-Quinn</title>
    <link rel="stylesheet" th:href="@{/bootstrap/css/bootstrap.min.css}">
    <link rel="stylesheet" th:href="@{/editormd/css/editormd.css}"/>
-    <link rel="stylesheet" th:href="@{/live/css/waifu.min.css}">
+
    <style>
        .nav-underline .nav-link {
            padding-top: .75rem;
@@ -70,9 +70,7 @@
 <script th:src="@{/bootstrap/js/bootstrap.bundle.min.js}"></script>
 <script th:src="@{/js/toTop.js}"></script>
 <script th:src="@{/js/jquery-ui.min.js}"></script>
-<script th:src="@{/live/js/live2d.js}"></script>
-<script th:src="@{/js/jquery-ui.min.js}"></script>
-<script th:src="@{/live/js/live2d.js}"></script>
+<script th:src="@{/live/js/addlive2d.js}"></script>
 <script th:src="@{/editormd/editormd.js}"></script>
 <script type="text/javascript">
    var testEditor;
--- a/src/main/resources/templates/blog/list.html
+++ b/src/main/resources/templates/blog/list.html
@@ -5,7 +5,7 @@
    <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
    <title>问答-Quinn</title>
    <link rel="stylesheet" th:href="@{/bootstrap/css/bootstrap.min.css}">
-    <link rel="stylesheet" th:href="@{/live/css/waifu.min.css}">
+
 </head>
 <body style="background: #f2f2f2;">

@@ -115,9 +115,7 @@
 <script th:src="@{/bootstrap/js/bootstrap.bundle.min.js}"></script>
 <script th:src="@{/js/toTop.js}"></script>
 <script th:src="@{/js/jquery-ui.min.js}"></script>
-<script th:src="@{/live/js/live2d.js}"></script>
-<script th:src="@{/js/jquery-ui.min.js}"></script>
-<script th:src="@{/live/js/live2d.js}"></script>
+<script th:src="@{/live/js/addlive2d.js}"></script>

 <script>

--- a/src/main/resources/templates/blog/read.html
+++ b/src/main/resources/templates/blog/read.html
@@ -5,7 +5,7 @@
    <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
    <title>问答-Quinn</title>
    <link rel="stylesheet" th:href="@{/bootstrap/css/bootstrap.min.css}">
-    <link rel="stylesheet" th:href="@{/live/css/waifu.min.css}">
+
    <style>
        .nav-underline .nav-link {
            padding-top: .75rem;
@@ -119,7 +119,7 @@
 <script th:src="@{/bootstrap/js/bootstrap.bundle.min.js}"></script>
 <script th:src="@{/js/toTop.js}"></script>
 <script th:src="@{/js/jquery-ui.min.js}"></script>
-<script th:src="@{/live/js/live2d.js}"></script>
+<script th:src="@{/live/js/addlive2d.js}"></script>

 <link rel="stylesheet" th:href="@{/editormd/css/editormd.preview.css}" />
 <script th:src="@{/editormd/lib/marked.min.js}"></script>
--- a/src/main/resources/templates/blog/write.html
+++ b/src/main/resources/templates/blog/write.html
@@ -6,7 +6,7 @@
    <title>问答-Quinn</title>
    <link rel="stylesheet" th:href="@{/bootstrap/css/bootstrap.min.css}">
    <link rel="stylesheet" th:href="@{/editormd/css/editormd.css}"/>
-    <link rel="stylesheet" th:href="@{/live/css/waifu.min.css}">
+
    <style>
        .nav-underline .nav-link {
            padding-top: .75rem;
@@ -71,7 +71,7 @@
 <script th:src="@{/bootstrap/js/bootstrap.bundle.min.js}"></script>
 <script th:src="@{/js/toTop.js}"></script>
 <script th:src="@{/js/jquery-ui.min.js}"></script>
-<script th:src="@{/live/js/live2d.js}"></script>
+<script th:src="@{/live/js/addlive2d.js}"></script>

 <script th:src="@{/editormd/editormd.js}"></script>
 <script type="text/javascript">
--- a/src/main/resources/templates/index.html
+++ b/src/main/resources/templates/index.html
@@ -5,7 +5,6 @@
    <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
    <title>首页-Quinn</title>
    <link rel="stylesheet" th:href="@{/bootstrap/css/bootstrap.min.css}">
-    <link rel="stylesheet" th:href="@{/live/css/waifu.min.css}">
 </head>
 <body>

@@ -66,6 +65,6 @@
 <script th:src="@{/bootstrap/js/bootstrap.bundle.min.js}"></script>
 <script th:src="@{/js/toTop.js}"></script>
 <script th:src="@{/js/jquery-ui.min.js}"></script>
-<script th:src="@{/live/js/live2d.js}"></script>
+<script th:src="@{/live/js/addlive2d.js}"></script>
 </body>
 </html>
--- a/src/main/resources/templates/login.html
+++ b/src/main/resources/templates/login.html
@@ -11,7 +11,7 @@

 <form class="form-signin" th:action="@{/login}" method="post">

-    <img class="mb-4" th:src="@{/images/logo/logo7272.jpg}" alt="" width="72" height="72">
+    <img class="mb-4" th:src="@{/images/logo/logo.png}" alt="" width="72" height="72">
    <h1 class="h3 mb-3 font-weight-normal">登录</h1>

    <input name="username" class="form-control" placeholder="用户名" required="">
--- a/src/main/resources/templates/page/about.html
+++ b/src/main/resources/templates/page/about.html
@@ -6,54 +6,50 @@
    <title>关于我们-Quinn</title>
    <link rel="stylesheet" th:href="@{/bootstrap/css/bootstrap.min.css}">
    <link rel="stylesheet" th:href="@{/css/timeline.css}">
-    <link rel="stylesheet" th:href="@{/live/css/waifu.min.css}">
+
 </head>
 <body>

 <div th:replace="~{common/header::header(activeUrl='about')}"></div>

 <main role="main">
-
-    <div class="container">
-
-        <div th:if="${session.loginUser.getRoleId()==1}"
-             class="col-md-12 blog-main" style="margin-top: 20px">
-            <form th:action="@{'/about/'+${session.loginUser.getRoleId()}}" method="post">
-                <div class="col-md-12 mb-3">
-                    <label>标题</label>
-                    <input type="text" name="title" class="form-control" value="" required>
-                </div>
-                <div class="col-md-12 mb-3">
-                    <label>内容</label>
-                    <div id="blog-content">
-                        <textarea required name="content" rows="3" class="form-control"> </textarea>
+    <div id="carouselExampleCaptions" class="carousel slide" data-ride="carousel">
+        <ol class="carousel-indicators">
+            <li data-target="#carouselExampleCaptions" data-slide-to="0" class="active"></li>
+            <li data-target="#carouselExampleCaptions" data-slide-to="1"></li>
+            <li data-target="#carouselExampleCaptions" data-slide-to="2"></li>
+        </ol>
+        <div class="carousel-inner">
+            <div class="carousel-item active">
+                <img th:src="@{/images/menu/t1.jpg}" class="d-block w-100" alt="...">
+                <div class="carousel-caption d-none d-md-block">
+                    <h5>First slide label</h5>
+                    <p>Some representative placeholder content for the first slide.</p>
                </div>
            </div>
-                <div class="col-md-12 mb-3">
-                    <button type="submit" class="btn btn-primary btn-sm btn-block">发布闲记</button>
-                </div>
-            </form>
-        </div>
-
-        <!-- 主要内容部分 -->
-        <div class="timeline-small">
-            <div class="timeline-small-body">
-                <ul>
-                    <li th:each="about:${aboutList}">
-                        <div class="bullet green"></div>
-                        <div class="desc">
-                            <h3>
-                                [[${about.getTitle()}]]
-                                <small class="float-right" th:text="${#dates.format(about.getGmtCreate(),'yyyy-MM-dd')}"></small>
-                            </h3>
-                            <h4 th:utext="${about.getContent()}"></h4>
-                        </div>
-                    </li>
-                </ul>
-                <p class="text-center" style="color: #1F4661"> ...... </p>
+            <div class="carousel-item">
+                <img th:src="@{/images/menu/t2.jpg}" class="d-block w-100" alt="...">
+                <div class="carousel-caption d-none d-md-block">
+                    <h5>Second slide label</h5>
+                    <p>Some representative placeholder content for the second slide.</p>
                </div>
            </div>
-
+            <div class="carousel-item">
+                <img th:src="@{/images/menu/t3.jpg}" class="d-block w-100" alt="...">
+                <div class="carousel-caption d-none d-md-block">
+                    <h5>Third slide label</h5>
+                    <p>Some representative placeholder content for the third slide.</p>
+                </div>
+            </div>
+        </div>
+        <button class="carousel-control-prev" type="button" data-target="#carouselExampleCaptions" data-slide="prev">
+            <span class="carousel-control-prev-icon" aria-hidden="true"></span>
+            <span class="sr-only">Previous</span>
+        </button>
+        <button class="carousel-control-next" type="button" data-target="#carouselExampleCaptions" data-slide="next">
+            <span class="carousel-control-next-icon" aria-hidden="true"></span>
+            <span class="sr-only">Next</span>
+        </button>
    </div>
 </main>

@@ -64,7 +60,7 @@
 <script th:src="@{/bootstrap/js/bootstrap.bundle.min.js}"></script>
 <script th:src="@{/js/toTop.js}"></script>
 <script th:src="@{/js/jquery-ui.min.js}"></script>
-<script th:src="@{/live/js/live2d.js}"></script>
+<script th:src="@{/live/js/addlive2d.js}"></script>

 </body>
 </html>
--- a/src/main/resources/templates/page/download.html
+++ b/src/main/resources/templates/page/download.html
@@ -6,7 +6,7 @@
    <title>资源库-Quinn</title>
    <link rel="stylesheet" th:href="@{/bootstrap/css/bootstrap.min.css}">
    <link rel="stylesheet" th:href="@{/css/download.css}">
-    <link rel="stylesheet" th:href="@{/live/css/waifu.min.css}">
+
 </head>
 <body>

@@ -40,7 +40,7 @@
 <script th:src="@{/bootstrap/js/bootstrap.bundle.min.js}"></script>
 <script th:src="@{/js/toTop.js}"></script>
 <script th:src="@{/js/jquery-ui.min.js}"></script>
-<script th:src="@{/live/js/live2d.js}"></script>
+<script th:src="@{/live/js/addlive2d.js}"></script>

 </body>
 </html>
--- a/src/main/resources/templates/page/say.html
+++ b/src/main/resources/templates/page/say.html
@@ -6,7 +6,7 @@
    <title>公告-Quinn</title>
    <link rel="stylesheet" th:href="@{/bootstrap/css/bootstrap.min.css}">
    <link rel="stylesheet" th:href="@{/css/timeline.css}">
-    <link rel="stylesheet" th:href="@{/live/css/waifu.min.css}">
+
 </head>
 <body>

@@ -64,7 +64,7 @@
 <script th:src="@{/bootstrap/js/bootstrap.bundle.min.js}"></script>
 <script th:src="@{/js/toTop.js}"></script>
 <script th:src="@{/js/jquery-ui.min.js}"></script>
-<script th:src="@{/live/js/live2d.js}"></script>
+<script th:src="@{/live/js/addlive2d.js}"></script>

 </body>
 </html>
--- a/src/main/resources/templates/question/editor.html
+++ b/src/main/resources/templates/question/editor.html
@@ -6,7 +6,7 @@
    <title>问答-Quinn</title>
    <link rel="stylesheet" th:href="@{/bootstrap/css/bootstrap.min.css}">
    <link rel="stylesheet" th:href="@{/editormd/css/editormd.css}"/>
-    <link rel="stylesheet" th:href="@{/live/css/waifu.min.css}">
+
    <style>
        .nav-underline .nav-link {
            padding-top: .75rem;
@@ -70,7 +70,7 @@
 <script th:src="@{/bootstrap/js/bootstrap.bundle.min.js}"></script>
 <script th:src="@{/js/toTop.js}"></script>
 <script th:src="@{/js/jquery-ui.min.js}"></script>
-<script th:src="@{/live/js/live2d.js}"></script>
+<script th:src="@{/live/js/addlive2d.js}"></script>

 <script th:src="@{/editormd/editormd.js}"></script>
 <script type="text/javascript">
--- a/src/main/resources/templates/question/list.html
+++ b/src/main/resources/templates/question/list.html
@@ -5,7 +5,7 @@
    <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
    <title>问答-Quinn</title>
    <link rel="stylesheet" th:href="@{/bootstrap/css/bootstrap.min.css}">
-    <link rel="stylesheet" th:href="@{/live/css/waifu.min.css}">
+
 </head>
 <body style="background: #f2f2f2;">

@@ -119,7 +119,7 @@
 <script th:src="@{/bootstrap/js/bootstrap.bundle.min.js}"></script>
 <script th:src="@{/js/toTop.js}"></script>
 <script th:src="@{/js/jquery-ui.min.js}"></script>
-<script th:src="@{/live/js/live2d.js}"></script>
+<script th:src="@{/live/js/addlive2d.js}"></script>
 <script>

 </script>
--- a/src/main/resources/templates/question/read.html
+++ b/src/main/resources/templates/question/read.html
@@ -5,7 +5,7 @@
    <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
    <title>问答-Quinn</title>
    <link rel="stylesheet" th:href="@{/bootstrap/css/bootstrap.min.css}">
-    <link rel="stylesheet" th:href="@{/live/css/waifu.min.css}">
+
    <style>
        .nav-underline .nav-link {
            padding-top: .75rem;
@@ -119,7 +119,7 @@
 <script th:src="@{/bootstrap/js/bootstrap.bundle.min.js}"></script>
 <script th:src="@{/js/toTop.js}"></script>
 <script th:src="@{/js/jquery-ui.min.js}"></script>
-<script th:src="@{/live/js/live2d.js}"></script>
+<script th:src="@{/live/js/addlive2d.js}"></script>

 <link rel="stylesheet" th:href="@{/editormd/css/editormd.preview.css}" />
 <script th:src="@{/editormd/lib/marked.min.js}"></script>
--- a/src/main/resources/templates/question/write.html
+++ b/src/main/resources/templates/question/write.html
@@ -6,7 +6,7 @@
    <title>问答-Quinn</title>
    <link rel="stylesheet" th:href="@{/bootstrap/css/bootstrap.min.css}">
    <link rel="stylesheet" th:href="@{/editormd/css/editormd.css}"/>
-    <link rel="stylesheet" th:href="@{/live/css/waifu.min.css}">
+
    <style>
        .nav-underline .nav-link {
            padding-top: .75rem;
@@ -71,7 +71,7 @@
 <script th:src="@{/bootstrap/js/bootstrap.bundle.min.js}"></script>
 <script th:src="@{/js/toTop.js}"></script>
 <script th:src="@{/js/jquery-ui.min.js}"></script>
-<script th:src="@{/live/js/live2d.js}"></script>
+<script th:src="@{/live/js/addlive2d.js}"></script>

 <script th:src="@{/editormd/editormd.js}"></script>
 <script type="text/javascript">
--- a/src/main/resources/templates/register.html
+++ b/src/main/resources/templates/register.html
@@ -10,7 +10,7 @@
 <body class="text-center">

 <form class="form-signin" th:action="@{/register}" method="post">
-    <img class="mb-4" th:src="@{/images/logo/logo7272.jpg}" alt="" width="72" height="72">
+    <img class="mb-4" th:src="@{/images/logo/logo.png}" alt="" width="72" height="72">
    <h1 class="h3 mb-3 font-weight-normal">注册</h1>

    <p th:text="${registerMsg}" style="color: red"></p>
--- a/src/main/resources/templates/user/index.html
+++ b/src/main/resources/templates/user/index.html
@@ -5,7 +5,7 @@
    <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
    <title>用户中心-Quinn</title>
    <link rel="stylesheet" th:href="@{/bootstrap/css/bootstrap.min.css}">
-    <link rel="stylesheet" th:href="@{/live/css/waifu.min.css}">
+
    <style>
        #table-title tr th{
            border: none;
@@ -163,7 +163,7 @@
 <script th:src="@{/bootstrap/js/bootstrap.bundle.min.js}"></script>
 <script th:src="@{/js/toTop.js}"></script>
 <script th:src="@{/js/jquery-ui.min.js}"></script>
-<script th:src="@{/live/js/live2d.js}"></script>
+<script th:src="@{/live/js/addlive2d.js}"></script>

 <!-- layer 赞赏码 -->
 <script th:src="@{/layer/layer.js}"></script>
--- a/src/main/resources/templates/user/settings.html
+++ b/src/main/resources/templates/user/settings.html
@@ -5,7 +5,7 @@
    <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
    <title>用户中心-Quinn</title>
    <link rel="stylesheet" th:href="@{/bootstrap/css/bootstrap.min.css}">
-    <link rel="stylesheet" th:href="@{/live/css/waifu.min.css}">
+
    <style>
        #table-title tr th{
            border: none;
@@ -103,7 +103,7 @@
 <script th:src="@{/bootstrap/js/bootstrap.bundle.min.js}"></script>
 <script th:src="@{/js/toTop.js}"></script>
 <script th:src="@{/js/jquery-ui.min.js}"></script>
-<script th:src="@{/live/js/live2d.js}"></script>
+<script th:src="@{/live/js/addlive2d.js}"></script>

 <!-- layer 赞赏码 -->
 <script th:src="@{/layer/layer.js}"></script>
--- a/src/main/resources/templates/user/update-avatar.html
+++ b/src/main/resources/templates/user/update-avatar.html
@@ -5,7 +5,7 @@
    <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
    <title>头像修改-Quinn</title>
    <link rel="stylesheet" th:href="@{/bootstrap/css/bootstrap.min.css}">
-    <link rel="stylesheet" th:href="@{/live/css/waifu.min.css}">
+
 </head>

 <body style="background: #f2f2f2;">
@@ -35,7 +35,7 @@
 <script th:src="@{/bootstrap/js/bootstrap.bundle.min.js}"></script>
 <script th:src="@{/js/toTop.js}"></script>
 <script th:src="@{/js/jquery-ui.min.js}"></script>
-<script th:src="@{/live/js/live2d.js}"></script>
+<script th:src="@{/live/js/addlive2d.js}"></script>

 <!-- layer 赞赏码 -->
 <script th:src="@{/layer/layer.js}"></script>
--- a/src/main/resources/templates/user/user-comment.html
+++ b/src/main/resources/templates/user/user-comment.html
@@ -5,7 +5,7 @@
    <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
    <title>用户中心-Quinn</title>
    <link rel="stylesheet" th:href="@{/bootstrap/css/bootstrap.min.css}">
-    <link rel="stylesheet" th:href="@{/live/css/waifu.min.css}">
+
    <style>
        #table-title tr th{
            border: none;
@@ -120,7 +120,7 @@
 <script th:src="@{/bootstrap/js/bootstrap.bundle.min.js}"></script>
 <script th:src="@{/js/toTop.js}"></script>
 <script th:src="@{/js/jquery-ui.min.js}"></script>
-<script th:src="@{/live/js/live2d.js}"></script>
+<script th:src="@{/live/js/addlive2d.js}"></script>

 <!-- layer 赞赏码 -->
 <script th:src="@{/layer/layer.js}"></script>
--- a/src/main/resources/templates/user/user-question.html
+++ b/src/main/resources/templates/user/user-question.html
@@ -5,7 +5,7 @@
    <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
    <title>用户中心-Quinn</title>
    <link rel="stylesheet" th:href="@{/bootstrap/css/bootstrap.min.css}">
-    <link rel="stylesheet" th:href="@{/live/css/waifu.min.css}">
+
    <style>
        #table-title tr th{
            border: none;
@@ -113,7 +113,7 @@
 <script th:src="@{/bootstrap/js/bootstrap.bundle.min.js}"></script>
 <script th:src="@{/js/toTop.js}"></script>
 <script th:src="@{/js/jquery-ui.min.js}"></script>
-<script th:src="@{/live/js/live2d.js}"></script>
+<script th:src="@{/live/js/addlive2d.js}"></script>

 <!-- layer 赞赏码 -->
 <script th:src="@{/layer/layer.js}"></script>