修改猜词的音符异常

删除热点资源，主页样式优化

src/main/java/com/quinn/controller/SourceController.java

@@ -57,6 +57,8 @@ public class SourceController extends BaseModelController {
         model.addAttribute("sourceList",sourceList);
         model.addAttribute("pageParam",myPageParam);
 
+        sourceHotPot(model);
+
         // 分类信息
         List<SourceCategory> categoryList = sourceCategoryService.list(null);
         model.addAttribute("categoryList",categoryList);
@@ -80,10 +82,8 @@ public class SourceController extends BaseModelController {
         return "source/list::s_table_refresh";
     }
 
-    // 列表展示
+    private void sourceHotPot(Model model){
-    @GetMapping("/hotspot")
+        Page<Source> pageParam = new Page<>(1, 10);
-    public String sourceHotPot(Model model){
-        Page<Source> pageParam = new Page<>(1, 21);
         QueryWrapper<Source> sourceQuery = new QueryWrapper<>();
         sourceQuery.orderByDesc("down_record");
         sourceService.page(pageParam,sourceQuery);
@@ -95,8 +95,7 @@ public class SourceController extends BaseModelController {
                 x.setSourceContent(QuinnConstant.GUN);
             });
         }
-        model.addAttribute("sourceList",sourceList);
+        model.addAttribute("topSourceList",sourceList);
-        return "source/hotspot";
     }
 
 

src/main/java/com/quinn/intergration/BucketImage.java

@@ -5,9 +5,11 @@ import com.quinn.common.ExpBucket;
 import com.quinn.utils.JsonUtils;
 import com.quinn.vo.MyPageParam;
 import org.springframework.beans.factory.InitializingBean;
+import org.springframework.core.io.Resource;
+import org.springframework.core.io.support.PathMatchingResourcePatternResolver;
+import org.springframework.core.io.support.ResourcePatternResolver;
 import org.springframework.stereotype.Component;
 import org.springframework.util.CollectionUtils;
-import org.springframework.util.ResourceUtils;
 import org.springframework.util.StringUtils;
 
 import java.io.*;
@@ -49,9 +51,12 @@ public class BucketImage implements InitializingBean {
     }
 
     private void makeDictionary() throws IOException {
-        File file = ResourceUtils.getFile("classpath:bqb/image.json");
+        ResourcePatternResolver resolver = new PathMatchingResourcePatternResolver();
+        Resource[] resources = resolver.getResources("bqb/image.json");
+        Resource resource = resources[0];
+        InputStream  is = resource.getInputStream();
         InputStreamReader insReader = new InputStreamReader(
-                new FileInputStream(file), "UTF-8");
+                is, "UTF-8");
         BufferedReader bufReader = new BufferedReader(insReader);
         String json = bufReader.readLine();
         bufReader.close();

src/main/java/com/quinn/intergration/TodayLove.java

@@ -5,9 +5,11 @@ import com.quinn.common.QuinnConstant;
 import com.quinn.utils.JsonUtils;
 import com.quinn.utils.QuinnUtils;
 import org.springframework.beans.factory.InitializingBean;
+import org.springframework.core.io.Resource;
+import org.springframework.core.io.support.PathMatchingResourcePatternResolver;
+import org.springframework.core.io.support.ResourcePatternResolver;
 import org.springframework.stereotype.Component;
 import org.springframework.util.CollectionUtils;
-import org.springframework.util.ResourceUtils;
 
 import java.io.*;
 import java.util.*;
@@ -34,9 +36,12 @@ public class TodayLove implements InitializingBean {
     }
 
     private void makeDictionary() throws IOException {
-        File file = ResourceUtils.getFile("classpath:bqb/love.json");
+        ResourcePatternResolver resolver = new PathMatchingResourcePatternResolver();
+        Resource[] resources = resolver.getResources("bqb/love.json");
+        Resource resource = resources[0];
+        InputStream  is = resource.getInputStream();
         InputStreamReader insReader = new InputStreamReader(
-                new FileInputStream(file), "UTF-8");
+                is, "UTF-8");
         BufferedReader bufReader = new BufferedReader(insReader);
         String json = bufReader.readLine();
         bufReader.close();

src/main/resources/templates/blog/list.html

@@ -113,7 +113,7 @@
                 <ul class="list-unstyled small" th:each="topBlog:${topBlogList}">
                     <li>
                     <a class="text-dark text-decoration-none" th:href="@{'/blog/read/'+${topBlog.getBid()}}">
-                        <span class="badge badge-dark">
+                        <span class="badge badge-warning">
                             <svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="currentColor" class="bi bi-balloon-fill" viewBox="0 0 16 16">
                                 <path fill-rule="evenodd" d="M8.48 10.901C11.211 10.227 13 7.837 13 5A5 5 0 0 0 3 5c0 2.837 1.789 5.227 4.52 5.901l-.244.487a.25.25 0 1 0 .448.224l.04-.08c.009.17.024.315.051.45.068.344.208.622.448 1.102l.013.028c.212.422.182.85.05 1.246-.135.402-.366.751-.534 1.003a.25.25 0 0 0 .416.278l.004-.007c.166-.248.431-.646.588-1.115.16-.479.212-1.051-.076-1.629-.258-.515-.365-.732-.419-1.004a2.376 2.376 0 0 1-.037-.289l.008.017a.25.25 0 1 0 .448-.224l-.244-.487ZM4.352 3.356a4.004 4.004 0 0 1 3.15-2.325C7.774.997 8 1.224 8 1.5c0 .276-.226.496-.498.542-.95.162-1.749.78-2.173 1.617a.595.595 0 0 1-.52.341c-.346 0-.599-.329-.457-.644Z"/>
                             </svg>

src/main/resources/templates/cimi/guess.html

@@ -4,12 +4,12 @@
   <meta charset="UTF-8">
   <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
   <title>Quinn-词谜</title>
-  <script type="module" crossorigin src="./assets/index.a6696717.js"></script>
+  <script type="module" crossorigin src="./assets/index.62e94f3e.js"></script>
   <link rel="modulepreload" th:href="@{/assets/vendor.e8eab7c4.js}">
   <link rel="modulepreload" th:href="@{/assets/polyphones.f3f0c057.js}">
   <link rel="modulepreload" th:href="@{/assets/idioms.a01375e9.js}">
   <link rel="modulepreload" th:href="@{/assets/locale.6dea3a1e.js}">
-  <link rel="stylesheet" th:href="@{/assets/index.de3d343a.css}">
+  <link rel="stylesheet" th:href="@{/assets/index.cc1a4ca9.css}">
 </head>
 <body>
 <div id="app"></div>

src/main/resources/templates/common/header.html

@@ -26,9 +26,6 @@
                 <li th:class="${activeUrl=='blog'?'nav-item active':'nav-item'}">
                     <a class="nav-link" th:href="@{/blog}">论坛</a>
                 </li>
-                <li th:class="${activeUrl=='hotspot'?'nav-item active':'nav-item'}">
-                    <a class="nav-link" th:href="@{/hotspot}">热点资源</a>
-                </li>
                 <li th:class="${activeUrl=='source'?'nav-item active':'nav-item'}">
                     <a class="nav-link" th:href="@{/source}">资源</a>
                 </li>

src/main/resources/templates/index.html

@@ -6,6 +6,7 @@
     <title>首页-Quinn</title>
     <link rel="stylesheet" th:href="@{/bootstrap/css/bootstrap.min.css}">
     <link rel="stylesheet" th:href="@{/css/backgroud.css}">
+    <script src="https://cdn.bootcss.com/typed.js/2.0.5/typed.js"></script>
 </head>
 <style>
     #register{
@@ -20,6 +21,27 @@
     #fastLink{
         font-size: 20px;
     }
+    .typed-cursor{
+        opacity: 1;
+        -webkit-animation: blink 0.7s infinite;
+        -moz-animation: blink 0.7s infinite;
+        animation: blink 0.7s infinite;
+    }
+    @keyframes blink{
+        0% { opacity:1; }
+        50% { opacity:0; }
+        100% { opacity:1; }
+    }
+    @-webkit-keyframes blink{
+        0% { opacity:1; }
+        50% { opacity:0; }
+        100% { opacity:1; }
+    }
+    @-moz-keyframes blink{
+        0% { opacity:1; }
+        50% { opacity:0; }
+        100% { opacity:1; }
+    }
 </style>
 <body>
 
@@ -44,12 +66,14 @@
                 </p>
                 <br/>
                 <div class="lead invertedContent">
-                    <p>欢迎访问</p>
                     <p><svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="currentColor" class="bi bi-lightbulb-fill" viewBox="0 0 16 16">
                         <path d="M2 6a6 6 0 1 1 10.174 4.31c-.203.196-.359.4-.453.619l-.762 1.769A.5.5 0 0 1 10.5 13h-5a.5.5 0 0 1-.46-.302l-.761-1.77a1.964 1.964 0 0 0-.453-.618A5.984 5.984 0 0 1 2 6zm3 8.5a.5.5 0 0 1 .5-.5h5a.5.5 0 0 1 0 1l-.224.447a1 1 0 0 1-.894.553H6.618a1 1 0 0 1-.894-.553L5.5 15a.5.5 0 0 1-.5-.5z"/>
-                    </svg>
+                    </svg>欢迎访问</p>
-                        Quinn 包含资源推荐，资源分享，论坛交流模块</p>
+                    <div class="row">
-                    <p>戳下方了解详情↓↓↓</p>
+                        <div class="col-md-3"></div>
+                        <span class="element"></span>
+                        <div class="col-md-3"></div>
+                    </div>
                 </div>
                 <div id="fastLink" class="row">
                     <div class="col-md-3"></div>
@@ -110,5 +134,12 @@
 <script th:src="@{/js/toTop.js}"></script>
 <script th:src="@{/js/jquery-ui.min.js}"></script>
 <script th:src="@{/live/js/addlive2d.js}"></script>
+<script>
+    var typed = new Typed('.element', {
+        strings: ["从前有座山，山里有座庙，庙里有个老和尚给小和尚讲故事...", "Quinn的注册流程，技术博客，交流反馈。可点击下方了解详情↓"], //输入内容, 支持html标签
+        typeSpeed: 120, //打字速度
+        backSpeed: 50 //回退速度
+    });
+</script>
 </body>
 </html>

src/main/resources/templates/source/hotspot.html

@@ -1,63 +0,0 @@
-<!doctype html>
-<html lang="en" xmlns:th="http://www.thymeleaf.org">
-<head>
-    <meta charset="UTF-8">
-    <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="@{/css/backgroud.css}">
-<style>
-    #maxLength {
-        max-width: 500px;
-        white-space: nowrap; /* 不换行 */
-        overflow: hidden; /* 超出部分不显示 */
-        text-overflow: ellipsis; /* 超出部分显示为... */
-    }
-</style>
-</head>
-<body>
-
-<div th:replace="~{common/header::header(activeUrl='hotspot')}"></div>
-
-<main role="main" class="mt-3">
-    <div class="container">
-        <div class="alert alert-primary" role="alert">
-            大佬需要什么资料请提交论坛或者关注公众号反馈。
-        </div>
-
-        <div class="row row-cols-md-3 text-center">
-            <div class="col mb-3" th:each="source:${sourceList}">
-                <div class="card">
-                    <div class="card-header">
-                        <a class="text-dark font-weight-bold text-decoration-none" th:href="@{'/source/view/'+${source.getSid()}}">
-                        <h5 class="font-weight-normal d-inline">
-                            <svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="currentColor" class="bi bi-lightning-fill" viewBox="0 0 16 16">
-                                <path d="M5.52.359A.5.5 0 0 1 6 0h4a.5.5 0 0 1 .474.658L8.694 6H12.5a.5.5 0 0 1 .395.807l-7 9a.5.5 0 0 1-.873-.454L6.823 9.5H3.5a.5.5 0 0 1-.48-.641l2.5-8.5z"/>
-                            </svg>
-                            [[${source.getSourceName()}]]
-                        </h5>
-                        <span class="badge badge-pill badge-warning">
-                            [[${source.getCategoryName()}]]
-                        </span>
-                        </a>
-                    </div>
-                    <div class="card-body">
-                        <p id="maxLength" th:text="${source.getDetail()}"></p>
-                    </div>
-                </div>
-            </div>
-        </div>
-    </div>
-</main>
-
-<div th:replace="~{common/footer::footer}"></div>
-
-<a class="to-top badge badge-light">返回顶部</a>
-<script th:src="@{/js/jquery-3.5.1.min.js}"></script>
-<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/addlive2d.js}"></script>
-
-</body>
-</html>

src/main/resources/templates/source/list.html

@@ -116,6 +116,18 @@
                     </div>
                 </form>
             </div>
+            <div class="p-4 my-3 bg-white rounded">
+                <h4 class="pb-1">推荐</h4>
+                <ul class="list-unstyled small" th:each="topSource:${topSourceList}">
+                    <li>
+                        <a class="text-dark text-decoration-none" th:href="@{'/source/view/'+${topSource.getSid()}}">
+                            <span class="badge badge-pill badge-warning">
+                                [[${topSource.getCategoryName()}]]
+                            </span>
+                            [[${topSource.getSourceName()}]]
+                        </a></li>
+                </ul>
+            </div>
         </aside>
     </div>
 </main>