解决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/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 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 class="col-md-12 mb-3">
-                    <label>内容</label>
-                    <div id="blog-content">
-                        <textarea required name="content" rows="3" class="form-control"> </textarea>
-                    </div>
+            </div>
+            <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 class="col-md-12 mb-3">
-                    <button type="submit" class="btn btn-primary btn-sm btn-block">发布闲记</button>
+            </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>
-            </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>
        </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>