Merge pull request '同步dev分支进度，可以开始2.0开发了' (#2) from dev into main

Reviewed-on: #2

my-project-backend/src/main/java/com/example/filter/FlowLimitingFilter.java

@@ -45,7 +45,7 @@ public class FlowLimitingFilter extends HttpFilter {
     @Override
     protected void doFilter(HttpServletRequest request, HttpServletResponse response, FilterChain chain) throws IOException, ServletException {
         String address = request.getRemoteAddr();
-        if (!tryCount(address))
+        if (!"OPTIONS".equals(request.getMethod()) && !tryCount(address))
             this.writeBlockMessage(response);
         else
             chain.doFilter(request, response);
@@ -72,9 +72,9 @@ public class FlowLimitingFilter extends HttpFilter {
      * @throws IOException 可能的异常
      */
     private void writeBlockMessage(HttpServletResponse response) throws IOException {
-        response.setStatus(HttpServletResponse.SC_FORBIDDEN);
+        response.setStatus(429);
         response.setContentType("application/json;charset=utf-8");
         PrintWriter writer = response.getWriter();
-        writer.write(RestBean.forbidden("操作频繁，请稍后再试").asJsonString());
+        writer.write(RestBean.failure(429, "请求频率过快，请稍后再试").asJsonString());
     }
 }

my-project-frontend/src/components/TopicEditor.vue

@@ -146,7 +146,6 @@ const editorOption = {
 </script>
 
 <template>
-    <div>
   <el-drawer direction="btt" :model-value="show"
              :size="650" @open="initEditor"
              @close="emit('close')"
@@ -184,7 +183,6 @@ const editorOption = {
       </div>
     </div>
   </el-drawer>
-    </div>
 </template>
 
 <style lang="less" scoped>

my-project-frontend/src/net/index.js

@@ -1,5 +1,6 @@
 import axios from "axios";
 import {ElMessage} from "element-plus";
+import router from "@/router";
 
 const authItemName = "authorize"
 
@@ -11,8 +12,13 @@ const accessHeader = () => {
 
 const defaultError = (error) => {
     console.error(error)
+    const status = error.response.status
+     if (status === 429) {
+        ElMessage.error(error.response.data.message)
+    } else {
         ElMessage.error('发生了一些错误，请联系管理员')
     }
+}
 
 const defaultFailure = (message, status, url) => {
     console.warn(`请求地址: ${url}, 状态码: ${status}, 错误信息: ${message}`)
@@ -43,26 +49,37 @@ function storeAccessToken(remember, token, expire){
         sessionStorage.setItem(authItemName, str)
 }
 
-function deleteAccessToken() {
+function deleteAccessToken(redirect = false) {
     localStorage.removeItem(authItemName)
     sessionStorage.removeItem(authItemName)
+    if(redirect) {
+        router.push({ name: 'welcome-login' })
+    }
 }
 
 function internalPost(url, data, headers, success, failure, error = defaultError){
     axios.post(url, data, { headers: headers }).then(({data}) => {
-        if(data.code === 200)
+        if(data.code === 200) {
             success(data.data)
-        else
+        } else if(data.code === 401) {
+            failure('登录状态已过期，请重新登录！')
+            deleteAccessToken(true)
+        } else {
             failure(data.message, data.code, url)
+        }
     }).catch(err => error(err))
 }
 
 function internalGet(url, headers, success, failure, error = defaultError){
     axios.get(url, { headers: headers }).then(({data}) => {
-        if(data.code === 200)
+        if(data.code === 200) {
             success(data.data)
-        else
+        } else if(data.code === 401) {
+            failure('登录状态已过期，请重新登录！')
+            deleteAccessToken(true)
+        } else {
             failure(data.message, data.code, url)
+        }
     }).catch(err => error(err))
 }
 

my-project-frontend/src/views/forum/TopicList.vue

@@ -18,7 +18,6 @@ import {get} from "@/net";
 import {ElMessage} from "element-plus";
 import TopicEditor from "@/components/TopicEditor.vue";
 import {useStore} from "@/store";
-import axios from "axios";
 import router from "@/router";
 import TopicCollectList from "@/components/TopicCollectList.vue";
 import TopicTag from "@/components/TopicTag.vue";
@@ -95,7 +94,7 @@ navigator.geolocation.getCurrentPosition(position => {
 </script>
 
 <template>
-    <div style="display: flex;margin: 20px auto;gap: 20px;max-width: 1000px">
+    <div style="display: flex;margin: 20px auto;gap: 20px;max-width: 1000px;padding: 0 20px">
         <div style="flex: 1">
             <light-card>
                 <div class="edit-topic">
@@ -222,9 +221,6 @@ navigator.geolocation.getCurrentPosition(position => {
                     <div class="friend-link">
                         <el-image src="https://element-plus.org/images/vform-banner.png" style="height: 100%"/>
                     </div>
-                    <div class="friend-link">
-                        <el-image src="https://element-plus.org/images/sponsors/jnpfsoft.jpg" style="height: 100%"/>
-                    </div>
                 </div>
             </div>
         </div>