diff --git a/blog/font/blog/package-lock.json b/blog/font/blog/package-lock.json
index ca018d7..232b682 100644
--- a/blog/font/blog/package-lock.json
+++ b/blog/font/blog/package-lock.json
@@ -13,7 +13,8 @@
         "marked": "^15.0.3",
         "pinia": "^2.2.6",
         "vue": "^3.5.13",
-        "vue-router": "^4.0.13"
+        "vue-router": "^4.0.13",
+        "vue-toastification": "^2.0.0-rc.5"
       },
       "devDependencies": {
         "@tsconfig/node22": "^22.0.0",
@@ -3425,6 +3426,15 @@
         "vue": "^3.2.0"
       }
     },
+    "node_modules/vue-toastification": {
+      "version": "2.0.0-rc.5",
+      "resolved": "https://registry.npmmirror.com/vue-toastification/-/vue-toastification-2.0.0-rc.5.tgz",
+      "integrity": "sha512-q73e5jy6gucEO/U+P48hqX+/qyXDozAGmaGgLFm5tXX4wJBcVsnGp4e/iJqlm9xzHETYOilUuwOUje2Qg1JdwA==",
+      "license": "MIT",
+      "peerDependencies": {
+        "vue": "^3.0.2"
+      }
+    },
     "node_modules/vue-tsc": {
       "version": "2.1.10",
       "resolved": "https://registry.npmmirror.com/vue-tsc/-/vue-tsc-2.1.10.tgz",
diff --git a/blog/font/blog/package.json b/blog/font/blog/package.json
index 0acce60..82c63be 100644
--- a/blog/font/blog/package.json
+++ b/blog/font/blog/package.json
@@ -16,7 +16,8 @@
     "marked": "^15.0.3",
     "pinia": "^2.2.6",
     "vue": "^3.5.13",
-    "vue-router": "^4.0.13"
+    "vue-router": "^4.0.13",
+    "vue-toastification": "^2.0.0-rc.5"
   },
   "devDependencies": {
     "@tsconfig/node22": "^22.0.0",
diff --git a/blog/font/blog/src/App.vue b/blog/font/blog/src/App.vue
index ada0794..8df73ba 100644
--- a/blog/font/blog/src/App.vue
+++ b/blog/font/blog/src/App.vue
@@ -12,8 +12,8 @@
   
   <div>
     <!-- 跳转路由 跳转到登录 或者个人页面-->
-    <RouterLink :to="loginRoute">
-      <img src="./assets/img/deLogin.png" alt="点击登录">
+    <RouterLink to="/personalSpace">
+      <img :src="imgUrl" alt="点击登录">
     </RouterLink>
   </div>
   
@@ -30,18 +30,29 @@
   
 <script lang="ts" setup name="App">
   import { RouterView,RouterLink } from 'vue-router';
-  import { ref } from 'vue';
-  import { useLoginStore } from './stores/login';
+  import { onMounted, ref } from 'vue';
+  import { useLoginStore } from './stores/Login';
+  // 导入图片
+  import deLogin from './assets/img/deLogin.png'
+  import Login from './assets/img/defaultAvatar.png'
   //定义登录路由Personal space & login
-  const loginStore = useLoginStore();
   const loginRoute = ref({path: '/login'});
+  const loginStore = useLoginStore();
+  const imgUrl = ref(deLogin)
+  // 判断已经登录
+ console.log('App.vue')
+  console.log(loginStore.userInfo.avatarurl);
+  onMounted(() => {
+    if(loginStore.userInfo.token!=null&&loginStore.userInfo.token!=""){
 
-  if(loginStore.isLogin){
     loginRoute.value = {path: '/personalSpace'}
-  }
-
-  console.log('App.vue')
-  console.log(loginStore.userInfo.avatarurl);
+    imgUrl.value = Login
+    console.log('已经登录',imgUrl.value)
+    }
+    else{
+      console.log('未登录')
+    }
+  });
 </script>
 
 
diff --git a/blog/font/blog/src/components/login/PersonalSpace.vue b/blog/font/blog/src/components/login/PersonalSpace.vue
index b6bbcf1..326f26e 100644
--- a/blog/font/blog/src/components/login/PersonalSpace.vue
+++ b/blog/font/blog/src/components/login/PersonalSpace.vue
@@ -1,55 +1,243 @@
 <template>
-    
-      <h2>个人空间</h2>
-      <div class="profile-info">
-        <img src="" alt="Avatar" class="avatar" />
-        <p><strong>用户名:</strong> Le</p>
-        <p><strong>ID:</strong> 001</p>
-        
-      </div>
-      <button @click="">登出</button>
-
-  </template>
+  <div class="user-profile">
+    <h2>个人空间</h2>
+    <div class="profile-info">
+      <img src="../../assets/img/defaultAvatar.png" alt="Avatar" class="avatar" />
+      <p><strong>用户名:</strong> {{ loginStore.userInfo.username }}</p>
+      
+    </div>
+    <button @click="logout">登出</button>
+    <button @click="showEditDialog = true">修改信息</button>
+  </div>
+<!-- 文章展示区域 -->
+  <div class="articles">
+    <div class="articles-header">
+    <b class="articles-title">您的全部文章</b>
+    以
+    <select v-model="selectedOption" class="dropdown-select">
+      <option value="byLike">最受欢迎</option>
+      <option value="byData">发布日期</option>
+    </select>
+    排序
+    <button class="confirm-button" @click="">确认</button>
+    </div>
+        <div class="article">
+          <!-- 文章内容 -->
+           <div v-for="(p,index) in postOverviewList" :key="p.post_id">
+            <Article :post_id="p.post_id" :user_id="p.user_id" :username="p.username" :title="p.title" :updated_at="p.updated_at" :Likes="p.Likes" :showButtons="true" 
+            @destroy="handleDestroy(index)"/>
+           </div>
+        </div>
+        <!-- 更多文章可以继续添加 -->
+  </div>
   
-  <script lang="ts" setup>
-  import { useLoginStore } from '@/stores/login';
-  import { useRouter } from 'vue-router';
-  
-  
-  </script>
-  
-  <style scoped>
-  .user-profile {
-    text-align: center;
-    padding: 20px;
-  }
-  
-  .profile-info {
-    margin-bottom: 20px;
-  }
-  
-  .avatar {
-    width: 100px;
-    height: 100px;
-    border-radius: 50%;
-    object-fit: cover;
-  }
-  
-  .login-prompt {
-    text-align: center;
-    padding: 20px;
-  }
-  
-  button {
-    padding: 10px 20px;
-    background-color: #007bff;
-    color: white;
-    border: none;
-    border-radius: 5px;
-    cursor: pointer;
-  }
-  
-  button:hover {
-    background-color: #0056b3;
-  }
-  </style>
\ No newline at end of file
+  <div >
+    <el-dialog v-model="showEditDialog" title="修改信息">
+      <el-form :model="form" label-width="80px">
+        <el-form-item label="用户名">
+          <el-input v-model="form.username"></el-input>
+        </el-form-item>
+        <el-form-item label="密码">
+          <el-input
+            v-model="form.password"
+            :type="passwordType"
+            placeholder="请输入新密码"
+          >
+            <template #suffix>
+              <i
+                class="el-input__icon el-icon-view"
+                @click="togglePasswordVisibility"
+              ></i>
+            </template>
+          </el-input>
+        </el-form-item>
+      </el-form>
+      <template #footer>
+        <span class="dialog-footer">
+          <el-button @click="showEditDialog = false">取消</el-button>
+          <el-button type="primary" @click="handleSubmit">确认</el-button>
+        </span>
+      </template>
+    </el-dialog>
+
+  </div>
+
+</template>
+
+<script lang="ts" setup>
+import { defineComponent, ref, reactive, onMounted } from 'vue';
+import Article from '@/components/utils/Article.vue'
+import { useLoginStore } from '@/stores/Login';
+import { useRouter } from 'vue-router';
+import { ElDialog, ElForm, ElFormItem, ElInput, ElButton, ElMessageBox } from 'element-plus';
+import axios from 'axios';
+//引入吐司
+import { useToast } from 'vue-toastification' 
+const toast = useToast();
+const router = useRouter();
+const loginStore = useLoginStore();
+// 文章列表
+interface postOverview{
+  post_id: number;
+  user_id: number;
+  Likes: number;
+  username: string;
+  title: string;
+  updated_at: string;
+}
+let postOverviewList = reactive<postOverview[]>([]);
+const showEditDialog = ref(false);
+const passwordType = ref('password');
+// 下拉选择框的选项值
+const selectedOption = ref('byData'); // 默认值为选项1
+
+// 定义并初始化 articles 变量
+const articles = ref<postOverview[]>([]);
+const form = reactive({
+  username: loginStore.userInfo.username,
+  password: '',
+});
+
+const togglePasswordVisibility = () => {
+  passwordType.value = passwordType.value === 'password' ? 'text' : 'password';
+};
+
+function handleDestroy(index: number) {
+  articles.value.splice(index, 1); // 移除指定索引的文章
+  postOverviewList.splice(index, 1);
+}
+
+function getAll(by: string) {
+  axios.get('http://localhost:8080/post/overview', {
+    params: { by: by },
+    headers: { token: loginStore.userInfo.token }
+  })
+  .then(res => {
+    // 使用扩展运算符来保持响应性
+    postOverviewList.splice(0, postOverviewList.length)
+    postOverviewList.push(...res.data.data)
+    console.log("获取文章概览数据成功", res.data.data);
+  })
+  .catch(error => console.error('There was an error fetchingthe data!', error))
+}
+
+const handleSubmit = () => {
+  // 处理表单提交逻辑
+  console.log(form);
+  showEditDialog.value = false;
+  //axios向后端发起请求
+  console.log("-------------",passwordType.value,'-------------',loginStore.userInfo.token)
+  axios.put('http://localhost:8080/user/revise',{
+    username: form.username,
+    password: form.password,
+    token: loginStore.userInfo.token
+  })
+  .then(response => {
+    // 处理成功响应
+    console.log('Response:', response.data);
+    toast.success("修改成功，请重新登陆");
+    // 调用登出，然后重新登陆
+    logout();
+  })
+  .catch(error => {
+    // 处理错误
+    console.error('Error:', error);
+  })
+
+  toast.success("信息修改成功");
+};
+
+
+const logout = () => {
+  // 清除 useLoginStore 中的所有内容
+  loginStore.userInfo = {        id: '',
+        // 头像，默认值是未登录
+        avatarurl: '../../assets/img/deLogin.png',
+        username: '',
+        token: ''
+};
+  toast.success("退出登录成功");
+  // 跳转到主页
+  router.push('/');
+};
+
+onMounted(() => {
+  // 在组件挂载后调用 getAll 函数
+  getAll(selectedOption.value);
+});
+</script>
+
+
+<style scoped>
+.user-profile {
+  text-align: center;
+  padding: 40px;
+  background-color: #f9f9f9;
+  border-radius: 8px;
+  box-shadow: 0 4px 8px rgba(0, 0, 0, 0.1);
+  max-width: 400px;
+  margin: 0 auto;
+}
+
+.profile-info {
+  margin-bottom: 20px;
+}
+
+.avatar {
+  width: 150px;
+  height: 150px;
+  border-radius: 50%;
+  object-fit: cover;
+  margin-bottom: 20px;
+}
+
+button {
+  padding: 12px 24px;
+  background-color: #007bff;
+  color: white;
+  border: none;
+  border-radius: 6px;
+  cursor: pointer;
+  font-size: 16px;
+  transition: background-color 0.3s ease;
+  margin-right: 10px; /* 添加间距 */
+}
+
+button:hover {
+  background-color: #0056b3;
+}
+.articles {
+  flex: 1; /* 占据剩余空间 */
+  padding: 20px;
+  overflow-y: auto; /* 滚动条 */
+  display: flex;
+  flex-direction: column;
+  align-items: center; /* 水平居中 */
+  justify-content: flex-start; /* 垂直方向从顶部开始 */
+}
+
+/* 单篇文章样式 */
+.article {
+  margin-bottom: 20px;
+  background-color: white;
+  padding: 20px;
+  border-radius: 5px;
+  box-shadow: 0 2px 5px rgba(0, 0, 0, 0.1);
+  width: 100%;
+}
+/* 文章标题样式 */
+.articles-title {
+  font-size: 24px;
+  color: #333; 
+  font-weight: bold;
+  margin-bottom: 10px;
+}
+
+/* 下拉选择框样式 */
+.dropdown-select {
+  margin-left: 10px;
+  padding: 5px;
+  border: 1px solid #ccc;
+  border-radius: 4px;
+}
+</style>
\ No newline at end of file
diff --git a/blog/font/blog/src/components/login/Registered.vue b/blog/font/blog/src/components/login/Registered.vue
index cb39584..0ebf597 100644
--- a/blog/font/blog/src/components/login/Registered.vue
+++ b/blog/font/blog/src/components/login/Registered.vue
@@ -14,6 +14,9 @@
           <label for="password">密码</label>
           <input type="password" id="password" v-model="password" required />
         </div>
+        <div>
+          您提交之后，管理员会进行审核。审核通过后，我们会向您发送邮件告知。
+        </div>
         <button type="submit">注册</button>
       </form>
     </div>
@@ -22,7 +25,9 @@
   <script lang="ts" setup>
   import { ref } from 'vue';
   import { useRouter } from 'vue-router';
-  
+  import axios from 'axios';
+  import { useToast } from 'vue-toastification' 
+  const toast = useToast()
   const router = useRouter();
   const username = ref('');
   const email = ref('');
@@ -33,7 +38,28 @@
     console.log('用户名:', username.value);
     console.log('邮箱:', email.value);
     console.log('密码:', password.value);
-  
+    axios.post('http://localhost:8080/user/registered', {
+      username: username.value,
+      email: email.value,
+      password: password.value
+    })
+    .then(response => {
+      if(response.data.code==1)
+      {
+        // 处理成功响应
+        console.log('Response:', response.data);
+        toast.success("注册成功，请等待管理员审核");
+      }
+      else{
+        toast.success("注册失败，此邮箱已被注册");
+      }
+    })
+    .catch(error => {
+      // 处理错误
+      console.error('Error:', error);
+    });
+
+
     // 假设注册成功，重定向到登录页面
     router.push('/login');
   };
diff --git a/blog/font/blog/src/components/login/RetrievePassword.vue b/blog/font/blog/src/components/login/RetrievePassword.vue
index fab3837..12c89ec 100644
--- a/blog/font/blog/src/components/login/RetrievePassword.vue
+++ b/blog/font/blog/src/components/login/RetrievePassword.vue
@@ -6,6 +6,7 @@
           <label for="email">邮箱</label>
           <input type="email" id="email" v-model="email" required />
         </div>
+        <div>请输入您的邮箱。稍后，我们会将您的密码发给您</div>
         <button type="submit">发送重置链接</button>
       </form>
     </div>
@@ -14,16 +15,34 @@
 <script lang="ts" setup>
   import { ref } from 'vue';
   import { useRouter } from 'vue-router';
-  
+  import axios from 'axios';
+  import { useToast } from 'vue-toastification' 
+  const toast = useToast()
   const router = useRouter();
   const email = ref('');
   
   const handleSubmit = () => {
     // 这里可以添加找回密码逻辑，例如调用 API 发送重置链接
     console.log('邮箱:', email.value);
-  
-    // 假设操作成功，重定向到登录页面
-    router.push('/login');
+    // 使用 Axios 发送 POST 请求
+  axios.post(`http://127.0.0.1:8080/user/findpassword/${encodeURIComponent(email.value)}`)
+  .then(function (response) {
+    if(response.data.code==1)
+    {
+          // 处理成功响应
+      console.log('Response:', response.data);
+      toast.success("密码已经发送到您的邮箱，请注意查收");
+      router.push('/login');
+    }
+    else{
+      toast.error("邮箱不存在，请重新输入");
+    }
+  })
+  .catch(function (error) {
+    // 处理错误
+    console.error('Error:', error);
+  });
+
   };
 </script>
   
diff --git a/blog/font/blog/src/components/utils/Article.vue b/blog/font/blog/src/components/utils/Article.vue
index 5105227..0dac113 100644
--- a/blog/font/blog/src/components/utils/Article.vue
+++ b/blog/font/blog/src/components/utils/Article.vue
@@ -1,14 +1,18 @@
 <!-- 文章概览 -->
 <template>
-  <div class="article-overview" @click="handleClick">
+  <div class="article-overview" @click="handleClick(post_id)">
     <div class="article-header">
       <div class="article-title-author">
-        <div class="article-title">文章名称</div>
-        <div class="article-author">作者</div>
+        <div class="article-title">{{title}}</div>
+        <div class="article-author">{{ username }}</div>
       </div>
       <div class="article-details">
-        <div class="article-likes">点赞数: 1000</div>
-        <div class="article-published-date">发布时间: 2024年12月12日16:22:05</div>
+        <div class="article-buttons" v-if="showButtons">
+          <button class="edit-button" @click.stop="handleEdit">修改</button>
+          <button class="delete-button" @click.stop="handleDelete">删除</button>
+        </div>
+        <div class="article-likes">点赞数: {{ Likes }}</div>
+        <div class="article-published-date">发布时间: {{ updated_at }}</div>
       </div>
     </div>
   </div>
@@ -16,15 +20,48 @@
 
 <script lang="ts" setup name="Article">
 import { useRouter } from 'vue-router';
-import { defineProps } from 'vue';
+import { defineProps, defineEmits ,ref, reactive, onMounted } from 'vue';
+import { ElMessageBox } from 'element-plus'; // 引入 ElMessageBox
+import axios from 'axios';
+import { useToast } from 'vue-toastification';
+const toast = useToast()
 const router = useRouter();
-function handleClick() {
-  // 点击之后，先执行后端请求操作，然后写入pinia再执行跳转
 
-  
+const emit = defineEmits(['destroy']);
+const props = defineProps(['post_id','user_id','username','title','updated_at','Likes','showButtons'])
 
-  router.push('/paper');
+
+function handleDelete() {
+  ElMessageBox.confirm('您确定要删除这篇文章吗?', '提示', {
+    confirmButtonText: '确定',
+    cancelButtonText: '取消',
+    type: 'warning'
+  }).then(() => {
+    // 用户点击确定
+    axios.delete('http://localhost:8080/post/delete',{
+      params: {
+        post_id: props.post_id, // 传递 post_id 参数
+      }
+    })
+    toast.success("删除成功");
+    emit('destroy');
+  }).catch(() => {
+    // 用户点击取消
+   console.log('要删除的文章id是',props.post_id)
+  });
 }
+
+function handleEdit() {
+
+}
+
+function handleClick(post_id:number) {
+  // 点击之后，执行跳转
+
+
+  router.push({ name: 'Paper', params: { id: post_id } });
+}
+
 </script>
 
 
diff --git a/blog/font/blog/src/components/utils/Paper.vue b/blog/font/blog/src/components/utils/Paper.vue
index 67fc6e9..913ed4a 100644
--- a/blog/font/blog/src/components/utils/Paper.vue
+++ b/blog/font/blog/src/components/utils/Paper.vue
@@ -1,12 +1,12 @@
 <template>
   <div class="paper-container">
-    <h1>{{ paperStore.paper.title }}</h1>
-    <p><strong>作者:</strong> {{ paperStore.paper.writer }}</p>
-    <p><strong>发布时间:</strong> {{ paperStore.paper.publishedDate }}</p>
+    <h1>{{ paper.title }}</h1>
+    <p><strong>作者:</strong> {{ paper.writer }}</p>
+    <p><strong>发布时间:</strong> {{ paper.updated_at }}</p>
     <div class="interaction-buttons">
       <button @click="toggleLike" :class="{ active: isLiked }">
         <img :src="likeIconSrc" alt="Like" class="icon">
-        点赞数
+        点赞数{{ paper.Likes }}
       </button>
       <button @click="toggleDislike" :class="{ active: isDisliked }">
         <img :src="dislikeIconSrc" alt="Dislike" class="icon">
@@ -22,18 +22,36 @@
 </template>
 
 <script lang="ts" setup>
-import { computed, ref } from 'vue';
+import { computed, onMounted, ref,reactive } from 'vue';
 import { marked } from 'marked';
-import { usePaperStore } from '@/stores/paper';
+import axios from 'axios';
+import { useRoute } from 'vue-router';
 import likeIcon from '@/assets/img/like.svg';
 import delikeIcon from '@/assets/img/delike.svg';
 import abhorIcon from '@/assets/img/abhor.svg';
 import deabhorIcon from '@/assets/img/deabhor.svg';
 
-const paperStore = usePaperStore();
+//引入吐司
+import { useToast } from 'vue-toastification' 
+const toast = useToast();
+console.log()
+
+const route = useRoute();
+// 从路由中获取post_id
+const post_id = route.params.id;
+
+const paper = reactive({
+  id: '',
+  user_id: '',
+  title: '',
+  writer: '',
+  updated_at: '',
+  content: '',
+  Likes:'0'
+});
 
 const compiledMarkdown = computed(() => {
-  return marked(paperStore.paper.text);
+  return marked(paper.content);
 });
 
 const isLiked = ref(false);
@@ -42,6 +60,22 @@ const isDisliked = ref(false);
 const likeIconSrc = computed(() => isLiked.value ? likeIcon : delikeIcon);
 const dislikeIconSrc = computed(() => isDisliked.value ? abhorIcon : deabhorIcon);
 
+function getpaper(){
+  
+  axios.get('/api/post/essay',{ params: {post_id:post_id}})
+    .then(res => {
+      console.log("获取文章详情数据成功", res.data.data);
+      console.log("传入对象");
+      paper.id = res.data.data.post_id
+      paper.title = res.data.data.title
+      paper.content = res.data.data.content
+      paper.writer = res.data.data.username
+      paper.updated_at = res.data.data.updated_at  
+
+    })
+}
+
+
 const toggleLike = () => {
   isLiked.value = !isLiked.value;
   isDisliked.value = false;
@@ -55,8 +89,20 @@ const toggleDislike = () => {
 };
 
 const handleShare = () => {
+  const currentUrl = window.location.href;
+  navigator.clipboard.writeText(currentUrl)
+    .then(() => {
+      toast.success("链接已复制到剪贴板");
+    })
+    .catch(err => {
+      console.error('无法复制到剪贴板', err);
+      toast.error("复制失败，请手动复制链接");
+    });
   // 执行转发逻辑
 };
+onMounted(() => {
+  getpaper();
+});
 </script>
 
 <style scoped>
diff --git a/blog/font/blog/src/components/writeBlog/Writing.vue b/blog/font/blog/src/components/writeBlog/Writing.vue
index 11921e7..fd618be 100644
--- a/blog/font/blog/src/components/writeBlog/Writing.vue
+++ b/blog/font/blog/src/components/writeBlog/Writing.vue
@@ -1,100 +1,203 @@
-<!-- writing.vue 写作页面-->
 <template>
   <div class="writing-container">
-    <div class="editor-container">
-      <textarea v-model="markdownContent" class="markdown-editor" placeholder="输入 Markdown 内容..."></textarea>
-    </div>
-    <div class="preview-container">
-      <h2>实时预览</h2>
-      <div class="preview-content" v-html="compiledMarkdown"></div>
+    <!-- 标题输入框 -->
+    <input v-model="title" class="title-input" placeholder="请输入文章标题" />
+    <!-- 编辑器与预览容器 -->
+    <div class="content-container">
+      <div class="editor-container">
+        <textarea
+          id="markdown-editor"
+          v-model="markdownContent"
+          class="markdown-editor"
+          placeholder="输入 Markdown 内容..."
+          @input="resizeTextarea"
+        ></textarea>
+      </div>
+      <div class="preview-container">
+        <h2>实时预览</h2>
+        <div class="preview-content" v-html="compiledMarkdown"></div>
+      </div>
     </div>
+    <!-- 保存并发布按钮 -->
     <button class="scroll-to-top" @click="scrollToTop">保存并发布</button>
-
   </div>
 </template>
 
 <script lang="ts" setup>
-import { ref, computed } from 'vue';
+import { ref, computed, onMounted } from 'vue';
 import { marked } from 'marked';
-
+import axios from 'axios';
+import { useLoginStore } from '@/stores/Login'; 
+//引入吐司
+import { useToast } from 'vue-toastification' 
 // 定义一个响应式变量来存储 Markdown 内容
 const markdownContent = ref('');
-
+const title = ref('');
+const loginStore = useLoginStore();
+const toast = useToast()
 // 使用 marked 库将 Markdown 内容转换为 HTML
 const compiledMarkdown = computed(() => {
-  return marked(markdownContent.value);
+  return marked.parse(markdownContent.value, { breaks: true });
 });
 
+// 在组件挂载后获取 DOM 元素
+onMounted(() => {
+  const editor = document.getElementById('markdown-editor');
+  if (editor) {
+    // 初始化时调整高度
+    resizeTextarea();
+  }
+});
+
+// 动态调整 textarea 的高度
+const resizeTextarea = () => {
+  const editor = document.getElementById('markdown-editor') as HTMLTextAreaElement;
+  if (editor) {
+    editor.style.height = 'auto'; // 重置高度以计算实际内容高度
+    editor.style.height = `${editor.scrollHeight}px`; // 设置为滚动高度
+  }
+};
 
 const scrollToTop = () => {
-  
+  //保存发布按钮按下后的逻辑
+  console.log("正在发布中")
+  //
+  console.log(title.value,'id',loginStore.userInfo.id)
+  axios.post('http://localhost:8080/post/new', {
+    token: loginStore.userInfo.token,
+    title: title.value,
+    content: markdownContent.value
+  })
+  .then(response => {
+    // 处理成功响应
+    console.log(response.data);
+    toast.success("发布成功");
+  })
+  .catch(error => {
+    // 处理错误
+    console.error(error);
+    
+  });
 };
 </script>
 
 <style scoped>
+/* 全局样式 */
 html, body {
   height: 100%;
   margin: 0;
   padding: 0;
+  font-family: 'Arial', sans-serif; /* 设置默认字体 */
 }
 
 body {
   display: flex;
   justify-content: center;
-  align-items: center;
+  align-items: stretch; /* 让子元素拉伸以填充父容器 */
   min-height: 100vh;
-  background-color: #f0f0f0; /* 可以根据需要调整背景颜色 */
+  background-color: #f9f9f9; /* 更柔和的背景颜色 */
+}
+
+/* 内容容器 */
+.content-container {
+  display: flex;
+  flex: 1; /* 占据剩余的空间 */
+  margin-top: 70px; /* 避开标题输入框 */
+  width: 100%;
+  height: 100%; /* 确保内容容器占据整个高度 */
+}
+
+.editor-container,
+.preview-container {
+  width: 50%; /* 平分左右空间 */
+  height: 100%;
+  box-sizing: border-box;
+  padding: 20px;
+  border-radius: 8px;
 }
 
 .writing-container {
   display: flex;
-  flex-direction: row;
-  justify-content: space-between;
+  flex-direction: column; /* 改为列布局 */
+  width: 100%; /* 留出一点边缘空间 */
+  height: 100%; /* 占据整个高度 */
+  box-shadow: 0 4px 8px rgba(0, 0, 0, 0.1);
+  background-color: #fff;
+  border-radius: 8px;
+  position: relative;
+  overflow: auto; /* 使用浏览器自带的滚动条 */
   padding: 20px;
-  width: 100%;
-  height: 100vh;
   box-sizing: border-box;
-  position: relative; /* 添加相对定位，以便子元素绝对定位 */
 }
 
+/* 标题输入框 */
+.title-input {
+  position: absolute;
+  top: 0;
+  left: 50%;
+  transform: translateX(-50%);
+  width: 60%; /* 调整宽度 */
+  padding: 10px;
+  font-size: 18px; /* 减小字体大小 */
+  margin-bottom: 20px;
+  border: none;
+  border-bottom: 2px solid #ccc;
+  outline: none;
+  text-align: center;
+  transition: border-color 0.3s ease-in-out;
+  z-index: 10;
+}
+
+.title-input:focus {
+  border-color: #007bff;
+}
+
+/* 编辑器容器 */
 .editor-container {
-  width: 48%;
+  background-color: #f7f7f7;
   height: 100%;
   box-sizing: border-box;
+  padding: 20px;
+  overflow: hidden; /* 确保内容不会溢出 */
 }
 
+/* 预览容器 */
 .preview-container {
-  width: 48%;
-  height: 100%;
+  background-color: #fff;
   border-left: 1px solid #ccc;
-  padding-left: 20px;
+  height: 100%;
   box-sizing: border-box;
+  padding: 20px;
+  overflow: auto; /* 使用内部滚动条 */
 }
 
+/* Markdown 编辑器 */
 .markdown-editor {
   width: 100%;
-  height: calc(100% - 40px); /* 减去 padding 的高度 */
-  padding: 10px;
-  box-sizing: border-box;
-  font-family: monospace;
-  border: 1px solid #ccc;
-  border-radius: 5px;
-  resize: vertical; /* 允许垂直调整大小 */
+  height: 100%;
+  border: none;
+  outline: none;
+  resize: none; /* 取消内部滚动条 */
+  font-size: 16px;
+  font-family: 'Arial', sans-serif;
+  background-color: transparent;
+  color: #333;
+  overflow: hidden; /* 隐藏滚动条 */
 }
 
+/* 预览内容 */
 .preview-content {
-  height: calc(100% - 60px); /* 减去 h2 的高度和 padding */
-  overflow-y: auto;
-  white-space: pre-wrap;
-  word-wrap: break-word;
-  padding: 10px;
-  box-sizing: border-box;
+  height: 100%;
+  overflow: auto; /* 使用内部滚动条 */
+  font-size: 16px;
+  line-height: 1.6;
+  color: #333;
 }
 
-/* 按钮样式 */
+/* 保存并发布按钮 */
 .scroll-to-top {
-  position: absolute; /* 使用绝对定位 */
-  bottom: 100px;
+  position: fixed;
+  bottom: 20px;
   right: 20px;
   padding: 10px 20px;
   background-color: #007bff;
@@ -106,7 +209,6 @@ body {
   z-index: 1000; /* 确保按钮在最上层 */
 }
 
-/* 按钮悬停效果 */
 .scroll-to-top:hover {
   background-color: #0056b3;
 }
diff --git a/blog/font/blog/src/main.ts b/blog/font/blog/src/main.ts
index 0c2429d..4a11ca7 100644
--- a/blog/font/blog/src/main.ts
+++ b/blog/font/blog/src/main.ts
@@ -3,13 +3,32 @@ import App from './App.vue';
 
 import { createPinia } from 'pinia';
 import ElementPlus from 'element-plus';
+import Toast from "vue-toastification";
+import "vue-toastification/dist/index.css";
 import 'element-plus/dist/index.css';
 // 引入路由器
 import router from './router/index'
 
 const app = createApp(App);
-
+const options = {
+    transition: 'Vue-Toastification__bounce',
+    maxToasts: 3,
+    newestOnTop: true,
+    position: 'top-left',
+    timeout: 2000,
+    closeOnClick: true,
+    pauseOnFocusLoss: true,
+    pauseOnHover: false,
+    draggable: true,
+    draggablePercent: 0.7,
+    showCloseButtonOnHover: false,
+    hideProgressBar: true,
+    closeButton: 'button',
+    icon: true,
+    rtl: false
+};
 //使用路由
+app.use(Toast, options);
 app.use(router)
 app.use(createPinia());
 app.use(ElementPlus);
diff --git a/blog/font/blog/src/page/Announcement.vue b/blog/font/blog/src/page/Announcement.vue
index f9e1022..1e53ef3 100644
--- a/blog/font/blog/src/page/Announcement.vue
+++ b/blog/font/blog/src/page/Announcement.vue
@@ -2,29 +2,45 @@
  <!-- Announcement.vue -->
 <template>
     <div class="announcement-container">
-      <div v-for="(announcement, index) in announcements" :key="index" class="announcement-item">
-        <h3>{{ announcement.title }}</h3>
-        <p class="announcement-time">{{ announcement.time }}</p>
-        <div v-html="announcement.content" class="announcement-content"></div>
+      <div v-for="a in announcements" :key="a.announcement_id" class="announcement-item">
+        <h3>{{ a.title }}</h3>
+        <p class="announcement-time">{{ a.updated_at }}</p>
+        <div v-html="a.content" class="announcement-content"></div>
       </div>
     </div>
   </template>
   
   <script lang="ts" setup>
-  import { ref } from 'vue';
-  
-  const announcements = ref([
-    {
-      title: '公告一',
-      time: '2023-10-01 12:00',
-      content: `<p>这是第一条公告的内容。</p>`
-    },
-    {
-      title: '公告二',
-      time: '2023-10-02 14:30',
-      content: `<p>这是第二条公告的内容，支持 <strong>HTML</strong> 格式。</p>`
-    }
-  ]);
+  import { ref, reactive,onMounted } from 'vue';
+  import axios from 'axios';
+
+  interface Announcement {
+  announcement_id: number;
+  title: string;
+  updated_at: string;
+  content: string;
+  }
+
+  let announcements = reactive<Announcement[]>([]);
+
+  //调用axios获取公告
+// 查找全部的方法api
+function getAll() {
+    axios.get('/api/announcements')
+        .then(res => {
+            // 使用扩展运算符来保持响应性
+            console.log("开始存放",res.data)
+            announcements.splice(0, announcements.length)
+            announcements.push(...res.data.data)
+            console.log("获取公告数据成功", res.data.data);
+        })
+        .catch(error => console.error('There was an error fetching the data!', error))
+}
+
+  onMounted(() => {
+    console.log("组件已挂载，开始请求公告数据");
+    getAll();
+  });
   </script>
   
 <style scoped>
diff --git a/blog/font/blog/src/page/Home.vue b/blog/font/blog/src/page/Home.vue
index 7190a3b..f54bf92 100644
--- a/blog/font/blog/src/page/Home.vue
+++ b/blog/font/blog/src/page/Home.vue
@@ -28,7 +28,9 @@
 
         <div class="article">
           <!-- 文章内容 -->
-          <Article v-for="(item,index) in Array(20)"></Article>
+           <div v-for="p in postOverviewList" :key="p.post_id">
+            <Article :post_id="p.post_id" :user_id="p.user_id" :username="p.username" :title="p.title" :updated_at="p.updated_at" :Likes="p.Likes" :showButtons="false" />
+           </div>
         </div>
         <!-- 更多文章可以继续添加 -->
       </div>
@@ -41,7 +43,8 @@
 </template>
 
 <script lang="ts" setup>
-import { ref } from 'vue';
+import { ref,reactive,onMounted } from 'vue';
+import axios from 'axios';
 // 引入宣传图片组件
 import Publicity from '../components/home/Publicity.vue';
 // 引入文章概览
@@ -51,9 +54,35 @@ import Announcement from './Announcement.vue';
 //引入开始写作按钮
 import StartWriting from '@/components/utils/StartWriting.vue';
 console.log('home');
+// -----------------------------------------
+interface postOverview{
+  post_id: number;
+  user_id: number;
+  Likes: number;
+  username: string;
+  title: string;
+  updated_at: string;
+}
+let postOverviewList = reactive<postOverview[]>([]);
+
+// 获取文章概览列表
+function getAll(by: string) {
+  axios.get('/api/post/overview', {
+    params: { by: by },
+    headers: { token: '' }
+  })
+  .then(res => {
+    // 使用扩展运算符来保持响应性
+    postOverviewList.splice(0, postOverviewList.length)
+    postOverviewList.push(...res.data.data)
+    console.log("获取文章概览数据成功", res.data.data);
+  })
+  .catch(error => console.error('There was an error fetchingthe data!', error))
+}
 
+//---------------------------------------
 // 下拉选择框的选项值
-const selectedOption = ref('byLike'); // 默认值为选项1
+const selectedOption = ref('byData'); // 默认值为选项1
 // 回到顶部方法
 const scrollToTop = () => {
   window.scrollTo({ top: 0, behavior: 'smooth' });
@@ -61,8 +90,12 @@ const scrollToTop = () => {
 // 处理选择确认按钮点击事件的方法
 const handleConfirm = () => {
   console.log('选择的选项是:', selectedOption.value);
+  getAll(selectedOption.value)
   // 在这里可以添加更多的逻辑来处理选择确认的操作
 };
+onMounted(()=>{
+  getAll(selectedOption.value)
+})
 </script>
 
 
diff --git a/blog/font/blog/src/page/Login.vue b/blog/font/blog/src/page/Login.vue
index 05e9175..8adbba4 100644
--- a/blog/font/blog/src/page/Login.vue
+++ b/blog/font/blog/src/page/Login.vue
@@ -20,25 +20,55 @@
 </template>
 
 <script lang="ts" setup>
-import { ref } from 'vue';
+import { h, ref } from 'vue';
 import { useRouter } from 'vue-router';
+import { useLoginStore } from '@/stores/Login';
+import axios from 'axios';
 
 const router = useRouter();
 const username = ref('');
 const password = ref('');
-
-const handleLogin = () => {
+const store = useLoginStore();
+const handleLogin = async () => {
   // 这里可以添加登录逻辑，例如调用 API 进行验证
   console.log('用户名:', username.value);
   console.log('密码:', password.value);
+  
+  try {
+    // 后端检查账号密码是否正确
+    const response = await axios.post('http://localhost:8080/user/login', {
+      username: username.value,
+      password: password.value
+    }, {
+      headers: {
+        'Content-Type': 'application/json',
+      }
+    });
+
+    // 根据返回值确认是否登录成功
+    console.log(response.data.code);
+    if (response.data.code === 1) {
+      // 登录成功
+      console.log('登录成功');
+      store.userInfo.token = response.data.data;
+      store.userInfo.username = username.value;
+      router.push('/home');
+      console
+      return;
+    } else {
+      // 登录失败
+      alert('用户名或密码错误');
+    }
+  } catch (error) {
+    console.error('登录请求失败:', error);
+    // 处理登录失败的逻辑
+  }
 
   // 假设登录成功，重定向到主页
-  console.log('登录成功');
-  
-  router.push('/home');
+  // 注释掉这行，因为实际登录成功后会通过 then 语句处理
+  // router.push('/home');
 };
 
-
 const handleForgotPassword = () => {
   // 处理找回密码逻辑
   console.log('找回密码');
@@ -52,9 +82,7 @@ const handleRegister = () => {
   // 例如重定向到注册页面
   router.push('/registered');
 };
-
 </script>
-
 <style scoped>
 html, body {
   height: 100%;
diff --git a/blog/font/blog/src/router/index.ts b/blog/font/blog/src/router/index.ts
index 341ed2b..744831a 100644
--- a/blog/font/blog/src/router/index.ts
+++ b/blog/font/blog/src/router/index.ts
@@ -7,12 +7,15 @@ import Home from '@/page/Home.vue'
 // 引入登录页
 import Login from '@/page/Login.vue'
 // 引入文章详情页
-import Paper from '@/components/utils/paper.vue'
+import Paper from '@/components/utils/Paper.vue'
 // 引入书写页面
 import Writing from '@/components/writeBlog/Writing.vue'
 // 引入找回密码和注册
 import RetrievePassword from '@/components/login/RetrievePassword.vue'
 import Registered from '@/components/login/Registered.vue'
+import  PersonalSpace from '@/components/login/PersonalSpace.vue'
+// 引入全局数据Login
+import { useLoginStore } from '@/stores/Login'
 // 创建路由
 
 const router = createRouter({
@@ -31,7 +34,8 @@ const router = createRouter({
         },
         // 文章详情页
         {
-            path:'/paper',
+            path:'/paper/:id',
+            name: 'Paper',
             component:Paper
         },
         // 书写页面
@@ -53,7 +57,7 @@ const router = createRouter({
         //个人空间
         {
             path:'/personalSpace',
-            component:()=>import('@/components/login/PersonalSpace.vue')
+            component: PersonalSpace
         },
         
 
@@ -64,16 +68,26 @@ const router = createRouter({
         } 
 
     ]
-})
-
-
-
-
 
 
+});
 
+// 添加全局前置守卫
+router.beforeEach((to, from, next) => {
+  const loginStore = useLoginStore(); // 获取 login store 实例
+  const isAuthenticated = !!loginStore.userInfo.token; // 检查 token 是否存在
 
+  // 只拦截 /writing 路径
+  if ((to.path === '/writing'||to.path === '/personalSpace') && !isAuthenticated) {
+    
+    next('/login'); // 如果未认证，重定向到登录页面
+    // window.alert('请先登录');
+    } 
+    else {
+        next(); // 否则继续导航
+    }
 
+});
 
 
 // 暴露出去
diff --git a/blog/font/blog/src/stores/paper.ts b/blog/font/blog/src/stores/paper.ts
deleted file mode 100644
index 690a6a7..0000000
--- a/blog/font/blog/src/stores/paper.ts
+++ /dev/null
@@ -1,106 +0,0 @@
-import { defineStore } from 'pinia';
-
-export const usePaperStore = defineStore('paper', {
-  state() {
-    return {
-      paper: {
-        id: '000',
-        title: '示例标题',
-        writer: 'LeJingS',
-        text: `## 标题
-
-Markdown支持六级标题，使用`+"#"+`号表示，后面跟一个空格和标题文本。例如：
-
-# 一级标题
-
-## 二级标题
-
-### 三级标题
-
-#### 四级标题
-
-##### 五级标题
-
-###### 六级标题
-
-## 强调文本
-
-*斜体文本* 或者 *斜体文本*
-
-**粗体文本** 或者 **粗体文本**
-
-***粗斜体文本*** 或者 ***粗斜体文本***
-
-## 列表
-
-### 无序列表
-
-- 使用减号
-- 使用加号
-- 使用星号
-
-### 有序列表
-
-1. 第一项
-2. 第二项
-3. 第三项
-
-可以嵌套列表：
-
-1. 第一项
-   - 嵌套子项
-   - 另一个子项
-2. 第二项
-
-## 链接
-
-[链接文本](https://example.com/) 是Markdown中创建超链接的方式。
-
-## 图片
-
-![示例图片](https://via.placeholder.com/150)
-
-## 代码
-
-内联代码使用反引号：\`var example = "code";\`
-
-多行代码或代码块使用三个反引号，并可指定语言以启用语法高亮：
-
-\`\`\`javascript
-function helloWorld() {
-    console.log("Hello, world!");
-}
-\`\`\`
-
-## 表格
-
-| 表头   | 表头   |
-| ------ | ------ |
-| 单元格 | 单元格 |
-| 单元格 | 单元格 |
-
-还可以定义对齐方式：
-
-| 左对齐 | 居中对齐 | 右对齐 |
-| :----- | :------: | -----: |
-| 数据   |   数据   |   数据 |
-| 数据   |   数据   |   数据 |
-
-## 水平线
-
-使用三个或更多个星号、减号或底线字符创建水平线：
-
-------
-------
-------
-
-## 引用
-
-> 这是一个引用。
-> 它可以跨越多个段落。
-
-> > 也可以嵌套引用。`
-      } as Record<string, any>
-    };
-  }
-});
\ No newline at end of file
diff --git a/blog/font/blog/vite.config.ts b/blog/font/blog/vite.config.ts
index 786e6b8..c13434b 100644
--- a/blog/font/blog/vite.config.ts
+++ b/blog/font/blog/vite.config.ts
@@ -11,8 +11,15 @@ export default defineConfig({
     vueDevTools(),
   ],
   server:{
-    port:80, // 设置为你想要的端口号
+    port:82, // 设置为你想要的端口号
     host: '0.0.0.0', // 监听所有网络接口
+    proxy: {
+      '/api': {
+        target: 'http://localhost:8080', // 将此替换为你的后端API服务器地址
+        changeOrigin: true,
+        rewrite: (path) => path.replace(/^\/api/, ''),
+      },
+    },
   },
   resolve: {
     alias: {
diff --git a/blog/server/demo/.idea/dataSources.xml b/blog/server/demo/.idea/dataSources.xml
index de12319..82bbda8 100644
--- a/blog/server/demo/.idea/dataSources.xml
+++ b/blog/server/demo/.idea/dataSources.xml
@@ -13,5 +13,19 @@
       </jdbc-additional-properties>
       <working-dir>$ProjectFileDir$</working-dir>
     </data-source>
+    <data-source source="LOCAL" name="blog@localhost" uuid="4094ca86-b2a8-4044-a5f6-01018a901176">
+      <driver-ref>mysql.8</driver-ref>
+      <synchronize>true</synchronize>
+      <imported>true</imported>
+      <remarks>$PROJECT_DIR$/src/main/resources/application.properties</remarks>
+      <jdbc-driver>com.mysql.cj.jdbc.Driver</jdbc-driver>
+      <jdbc-url>jdbc:mysql://localhost:3306/blog</jdbc-url>
+      <jdbc-additional-properties>
+        <property name="com.intellij.clouds.kubernetes.db.host.port" />
+        <property name="com.intellij.clouds.kubernetes.db.enabled" value="false" />
+        <property name="com.intellij.clouds.kubernetes.db.container.port" />
+      </jdbc-additional-properties>
+      <working-dir>$ProjectFileDir$</working-dir>
+    </data-source>
   </component>
 </project>
\ No newline at end of file
diff --git a/blog/server/demo/pom.xml b/blog/server/demo/pom.xml
index 9950a6d..c952905 100644
--- a/blog/server/demo/pom.xml
+++ b/blog/server/demo/pom.xml
@@ -48,9 +48,10 @@
         <dependency>
             <groupId>org.projectlombok</groupId>
             <artifactId>lombok</artifactId>
-            <version>1.18.24</version> <!-- 确保使用最新版本 -->
+            <version>1.18.8</version> <!-- 确保使用最新版本 -->
             <scope>provided</scope> <!-- 如果是用于编译期处理，可以使用 provided -->
         </dependency>
+
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-test</artifactId>
@@ -62,6 +63,27 @@
             <version>3.0.4</version>
             <scope>test</scope>
         </dependency>
+        <!-- JWP令牌依赖 -->
+        <dependency>
+            <groupId>io.jsonwebtoken</groupId>
+            <artifactId>jjwt</artifactId>
+            <version>0.9.1</version>
+        </dependency>
+        <dependency>
+            <groupId>javax.xml.bind</groupId>
+            <artifactId>jaxb-api</artifactId>
+            <version>2.3.1</version>
+        </dependency>
+        <dependency>
+            <groupId>org.glassfish.jaxb</groupId>
+            <artifactId>jaxb-runtime</artifactId>
+            <version>2.3.1</version>
+        </dependency>
+        <!--   邮件发送     -->
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-mail</artifactId>
+        </dependency>
     </dependencies>
 
     <build>
diff --git a/blog/server/demo/src/main/java/top/lejings/demo/DemoApplication.java b/blog/server/demo/src/main/java/top/lejings/demo/DemoApplication.java
index 67398e0..57f0ed0 100644
--- a/blog/server/demo/src/main/java/top/lejings/demo/DemoApplication.java
+++ b/blog/server/demo/src/main/java/top/lejings/demo/DemoApplication.java
@@ -2,6 +2,9 @@ package top.lejings.demo;
 
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.web.servlet.config.annotation.CorsRegistry;
+import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
 
 @SpringBootApplication
 public class DemoApplication {
@@ -10,4 +13,16 @@ public class DemoApplication {
         SpringApplication.run(DemoApplication.class, args);
     }
 
+    @Configuration
+    public class WebConfig implements WebMvcConfigurer {
+
+        @Override
+        public void addCorsMappings(CorsRegistry registry) {
+            registry.addMapping("/**")
+                    .allowedOrigins("http://localhost:82")
+                    .allowedMethods("GET", "POST", "PUT", "DELETE", "OPTIONS")
+                    .allowedHeaders("*")
+                    .allowCredentials(true);
+        }
+    }
 }
diff --git a/blog/server/demo/src/main/java/top/lejings/demo/controller/AnnouncementsController.java b/blog/server/demo/src/main/java/top/lejings/demo/controller/AnnouncementsController.java
index 7b14119..a2c5e7c 100644
--- a/blog/server/demo/src/main/java/top/lejings/demo/controller/AnnouncementsController.java
+++ b/blog/server/demo/src/main/java/top/lejings/demo/controller/AnnouncementsController.java
@@ -3,6 +3,7 @@ package top.lejings.demo.controller;
 
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.CrossOrigin;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RestController;
 import top.lejings.demo.pojo.Announcements;
diff --git a/blog/server/demo/src/main/java/top/lejings/demo/controller/PostsController.java b/blog/server/demo/src/main/java/top/lejings/demo/controller/PostsController.java
index e6f8403..6b5eb8a 100644
--- a/blog/server/demo/src/main/java/top/lejings/demo/controller/PostsController.java
+++ b/blog/server/demo/src/main/java/top/lejings/demo/controller/PostsController.java
@@ -18,27 +18,37 @@ public class PostsController {
 
     //概览 Overview
     @GetMapping("/overview")
-    public Result PostsOverview() {
+    public Result PostsOverview(@RequestParam(defaultValue = "byLike") String by,@RequestHeader String token) {
         log.info("查询文章所有概览");
-        List<Posts> postsOverviewList = postsService.postsOverview();
+        List<Posts> postsOverviewList = postsService.postsOverview(by,token);
+        System.out.println(postsOverviewList);
         return Result.success(postsOverviewList);
     }
     //具体文章，接收参数 文章id essay
     //请求url:127.0.0.1:8080/post/essay/4
-    @GetMapping("/essay/{post_id}")
-    public Result PostsEssay(@PathVariable Integer post_id){
+    @GetMapping("/essay")
+    public Result PostsEssay(Integer post_id){
         log.info("查询id为{}的文章",post_id);
         Posts posts = postsService.postsEssay(post_id);
         return Result.success(posts);
     }
 
-    //新建文章,前端传来user_id,title,content
+    //新建文章,前端传来token,title,content。修改和创建时间由数据库完成
     @PostMapping("/new")
+    @CrossOrigin(origins = "http://localhost:82")
     public Result PostsNew(@RequestBody Posts posts){
         log.info("新建文章");
-
+        postsService.postsNew(posts);
         return Result.success();
     }
 
+    // 删除文章,接收参数 文章id post_id
+    // 请求url:127.0.0.1:8080/post/delete?post_id=4
+    @DeleteMapping("/delete")
+    public Result deletePost(@RequestParam Integer post_id) {
+        log.info("删除id为{}的文章", post_id);
+        postsService.deletePost(post_id);
+        return Result.success();
+    }
 
 }
diff --git a/blog/server/demo/src/main/java/top/lejings/demo/controller/UsersController.java b/blog/server/demo/src/main/java/top/lejings/demo/controller/UsersController.java
new file mode 100644
index 0000000..80453dc
--- /dev/null
+++ b/blog/server/demo/src/main/java/top/lejings/demo/controller/UsersController.java
@@ -0,0 +1,88 @@
+package top.lejings.demo.controller;
+
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+import top.lejings.demo.pojo.Result;
+import top.lejings.demo.pojo.Users;
+import top.lejings.demo.service.UsersService;
+import top.lejings.demo.utils.JwtUtils;
+
+import java.util.HashMap;
+import java.util.Map;
+
+/*
+* 登录响应
+*
+* */
+@Slf4j
+@RestController
+@RequestMapping("/user")
+public class UsersController {
+
+    @Autowired UsersService usersService;
+
+    /*
+    * 接收前端传来的用户对象，目前只传递用户名和密码
+    * */
+    @PostMapping("/login")
+    @CrossOrigin(origins = "http://localhost:82")
+    public Result login(@RequestBody Users users){
+        log.info("正在进行登录。用户名是：{}",users.getUsername());
+        Users u = usersService.login(users);
+        //登录成功逻辑
+        if(u != null){
+            log.info("登录成功，下发jwt令牌");
+            Map<String,Object> claims = new HashMap<>();
+            claims.put("user_id",u.getUser_id());
+            claims.put("username",u.getUsername());
+            claims.put("email",u.getEmail());
+            String jwt = JwtUtils.generateJwt(claims);//jwt包含了当前员工信息
+
+            return Result.success(jwt);
+        }
+        //登录失败，返回错误信息
+
+        return Result.error("用户名或密码错误");
+    }
+
+    //注册后自动登录
+    @PostMapping("/registered")
+    @CrossOrigin(origins = "http://localhost:82")
+    public Result register(@RequestBody Users users){
+        log.info("正在进行注册操作。用户名为{}，邮箱为{}",users.getUsername(),users.getEmail());
+        boolean f = usersService.registered(users);
+        if(f){
+            return Result.success("注册成功！");
+        }
+        else{
+            //注册失败，用户名或者邮箱已被注册
+            return Result.error("此邮箱已被注册");
+        }
+
+    }
+
+    @PostMapping("/findpassword/{email}")
+    @CrossOrigin(origins = "http://localhost:82")
+    public Result findPassword(@PathVariable String email){
+        log.info("邮箱为{}",email);
+        boolean f  = usersService.findPassword(email);
+        if(f){
+
+            return Result.success("密码已经发送");
+        }
+        else{
+            return Result.error("这个邮箱尚未被注册");
+        }
+    }
+
+    //用户修改个人信息，根据用户id，修改用户名，密码
+    @PutMapping("/revise")
+    public Result update(@RequestBody Users users){
+        usersService.revise(users);
+        return Result.success();
+    }
+
+
+
+}
diff --git a/blog/server/demo/src/main/java/top/lejings/demo/filter/LoginCheckFilter.java b/blog/server/demo/src/main/java/top/lejings/demo/filter/LoginCheckFilter.java
new file mode 100644
index 0000000..3117c36
--- /dev/null
+++ b/blog/server/demo/src/main/java/top/lejings/demo/filter/LoginCheckFilter.java
@@ -0,0 +1,9 @@
+package top.lejings.demo.filter;
+
+
+/*
+* 监听需要登录的行为
+* */
+public class LoginCheckFilter {
+
+}
diff --git a/blog/server/demo/src/main/java/top/lejings/demo/mapper/PostsMapper.java b/blog/server/demo/src/main/java/top/lejings/demo/mapper/PostsMapper.java
index 7cdb34b..c36724e 100644
--- a/blog/server/demo/src/main/java/top/lejings/demo/mapper/PostsMapper.java
+++ b/blog/server/demo/src/main/java/top/lejings/demo/mapper/PostsMapper.java
@@ -1,5 +1,6 @@
 package top.lejings.demo.mapper;
 
+import org.apache.ibatis.annotations.Delete;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Select;
 import top.lejings.demo.pojo.Posts;
@@ -8,8 +9,15 @@ import java.util.List;
 @Mapper
 public interface PostsMapper {
 
-    List<Posts> postsOverview();
+    List<Posts> postsOverview(String by);
 
 
     Posts postsEssay(Integer post_id);
+
+    void postsNew(Posts posts);
+    @Select("SELECT p.post_id,p.user_id,COUNT(CASE WHEN r.type = 'like' THEN 1 END) AS Likes,u.username,p.title,p.updated_at FROM posts p JOIN users u ON p.user_id = u.user_id LEFT JOIN reactions r ON p.post_id = r.post_id AND r.type = 'like' WHERE u.user_id = ${user_id} GROUP BY p.post_id, p.user_id, u.username, p.title, p.updated_at, p.priority ORDER BY ${by} DESC;")
+    List<Posts> postsOverviewAndId(String by, Integer user_id);
+
+    @Delete("DELETE FROM posts WHERE post_id = #{post_id}")
+    void deletePost(Integer post_id);
 }
diff --git a/blog/server/demo/src/main/java/top/lejings/demo/mapper/UsersMapper.java b/blog/server/demo/src/main/java/top/lejings/demo/mapper/UsersMapper.java
new file mode 100644
index 0000000..82b3a29
--- /dev/null
+++ b/blog/server/demo/src/main/java/top/lejings/demo/mapper/UsersMapper.java
@@ -0,0 +1,25 @@
+package top.lejings.demo.mapper;
+
+import org.apache.ibatis.annotations.Insert;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Select;
+import org.apache.ibatis.annotations.Update;
+import top.lejings.demo.pojo.Users;
+
+@Mapper
+public interface UsersMapper {
+    @Select("select * from Users where username=#{username} and password=#{password}")
+    Users getByUsernameAndPassword(Users users) ;
+
+    @Select("select username,password from users where email=#{email}")
+    Users findPassword(String email);
+
+    @Select("select * from users where email=#{email}")
+    Users findById(Users users);
+
+    @Insert("INSERT INTO users (username, email, password) VALUES (#{username}, #{email}, #{password})")
+    void registered(Users users);
+
+    @Update("UPDATE users SET username = #{username},password = #{password} where user_id = #{user_id}")
+    void revise(Users users);
+}
diff --git a/blog/server/demo/src/main/java/top/lejings/demo/pojo/Posts.java b/blog/server/demo/src/main/java/top/lejings/demo/pojo/Posts.java
index a675e9c..b62aa37 100644
--- a/blog/server/demo/src/main/java/top/lejings/demo/pojo/Posts.java
+++ b/blog/server/demo/src/main/java/top/lejings/demo/pojo/Posts.java
@@ -12,9 +12,13 @@ import java.time.LocalDateTime;
 public class Posts {
     private Integer post_id;
     private Integer user_id;
+//    点赞数
+    private Integer Likes;
+    private String username;
     private String title;
     private String content;
+    private String token;
     private LocalDateTime updated_at; //修改时间
-    private Integer priority;//优先级
+//    private Integer priority;//优先级
 
 }
diff --git a/blog/server/demo/src/main/java/top/lejings/demo/pojo/Users.java b/blog/server/demo/src/main/java/top/lejings/demo/pojo/Users.java
index e2da33d..21d7f28 100644
--- a/blog/server/demo/src/main/java/top/lejings/demo/pojo/Users.java
+++ b/blog/server/demo/src/main/java/top/lejings/demo/pojo/Users.java
@@ -14,6 +14,7 @@ public class Users {
     private String username;
     private String email;
     private String password;
+    private String token;
     private String status;//账号状态：
     private LocalDateTime created_at;
     private LocalDateTime updated_at; //修改时间
diff --git a/blog/server/demo/src/main/java/top/lejings/demo/service/PostsService.java b/blog/server/demo/src/main/java/top/lejings/demo/service/PostsService.java
index a4752d9..07ecaf6 100644
--- a/blog/server/demo/src/main/java/top/lejings/demo/service/PostsService.java
+++ b/blog/server/demo/src/main/java/top/lejings/demo/service/PostsService.java
@@ -5,7 +5,11 @@ import top.lejings.demo.pojo.Posts;
 import java.util.List;
 
 public interface PostsService {
-    List<Posts> postsOverview();
+    List<Posts> postsOverview(String by,String token);
 
     Posts postsEssay(Integer post_id);
+
+    void postsNew(Posts posts);
+
+    void deletePost(Integer postId);
 }
diff --git a/blog/server/demo/src/main/java/top/lejings/demo/service/UsersService.java b/blog/server/demo/src/main/java/top/lejings/demo/service/UsersService.java
new file mode 100644
index 0000000..f48affa
--- /dev/null
+++ b/blog/server/demo/src/main/java/top/lejings/demo/service/UsersService.java
@@ -0,0 +1,13 @@
+package top.lejings.demo.service;
+
+import top.lejings.demo.pojo.Users;
+
+public interface UsersService {
+    Users login(Users users) ;
+
+    boolean registered(Users users);
+
+    boolean findPassword(String email);
+
+    void revise(Users users);
+}
diff --git a/blog/server/demo/src/main/java/top/lejings/demo/service/impl/PostsServiceImpl.java b/blog/server/demo/src/main/java/top/lejings/demo/service/impl/PostsServiceImpl.java
index 861f21b..41dca76 100644
--- a/blog/server/demo/src/main/java/top/lejings/demo/service/impl/PostsServiceImpl.java
+++ b/blog/server/demo/src/main/java/top/lejings/demo/service/impl/PostsServiceImpl.java
@@ -1,12 +1,16 @@
 package top.lejings.demo.service.impl;
 
+import io.jsonwebtoken.Claims;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import top.lejings.demo.mapper.PostsMapper;
 import top.lejings.demo.pojo.Posts;
 import top.lejings.demo.service.PostsService;
+import top.lejings.demo.utils.JwtUtils;
 
 import java.util.List;
+@Slf4j
 @Service
 public class PostsServiceImpl implements PostsService {
 
@@ -14,8 +18,44 @@ public class PostsServiceImpl implements PostsService {
     private PostsMapper postsMapper;
 
     @Override
-    public List<Posts> postsOverview() {return postsMapper.postsOverview();}
+    public List<Posts> postsOverview(String by,String token) {
+        if(by.equals("byLike"))by="p.priority";
+        else by="p.updated_at";
+        log.info("根据{}查询",by);
+        if(token == null || token.equals("")){
+            return postsMapper.postsOverview(by);
+        }
+        else{
+            //解析令牌，返回user_id
+            Claims claims = JwtUtils.parseJWT(token);
+            Integer user_id = claims.get("user_id", Integer.class); // 假设 user_id 是字符串类型
+            log.info("id为{}",user_id);
+            return postsMapper.postsOverviewAndId(by,user_id);
+        }
+    }
 
     @Override
     public Posts postsEssay(Integer post_id) {return postsMapper.postsEssay(post_id);}
+
+    //新建文章，在这里解析token，得到写作者的id
+    @Override
+    public void postsNew(Posts posts) {
+        // 解析 token 获取 user_id
+        String token = posts.getToken();
+        if (token != null) {
+            Claims claims = JwtUtils.parseJWT(token);
+            Integer userId = (Integer) claims.get("user_id");
+            posts.setUser_id(userId);
+        } else {
+            throw new IllegalArgumentException("Token cannot be null");
+        }
+
+
+        postsMapper.postsNew(posts);
+    }
+
+    @Override
+    public void deletePost(Integer postId) {
+        postsMapper.deletePost(postId);
+    }
 }
diff --git a/blog/server/demo/src/main/java/top/lejings/demo/service/impl/UsersServiceImpl.java b/blog/server/demo/src/main/java/top/lejings/demo/service/impl/UsersServiceImpl.java
new file mode 100644
index 0000000..5adee6b
--- /dev/null
+++ b/blog/server/demo/src/main/java/top/lejings/demo/service/impl/UsersServiceImpl.java
@@ -0,0 +1,67 @@
+package top.lejings.demo.service.impl;
+
+import io.jsonwebtoken.Claims;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.mail.javamail.JavaMailSender;
+import org.springframework.stereotype.Service;
+import top.lejings.demo.mapper.UsersMapper;
+import top.lejings.demo.pojo.Users;
+import top.lejings.demo.service.UsersService;
+import top.lejings.demo.utils.Email;
+import top.lejings.demo.utils.JwtUtils;
+@Slf4j
+@Service
+public class UsersServiceImpl implements UsersService {
+
+    @Autowired UsersMapper usersMapper;
+
+    @Autowired
+    private JavaMailSender javaMailSender;
+    public Users login(Users users){return usersMapper.getByUsernameAndPassword(users) ;}
+
+    @Override
+    public boolean registered(Users users) {
+       if(usersMapper.findById(users)==null){
+           Email email = new Email(javaMailSender);
+           email.SendSimpleMail(users.getEmail(),users.getUsername()+",您好。","恭喜您，注册成功");
+           usersMapper.registered(users);
+           return true;
+       }
+       else{
+           return false;
+       }
+
+    }
+
+    @Override
+    public boolean findPassword(String email) {
+
+        Users users = usersMapper.findPassword(email);
+        if(users == null)
+        {
+            return false;
+        }
+        else{
+            Email sendEmail = new Email(javaMailSender);
+            sendEmail.SendSimpleMail(email,users.getUsername()+"您好！请尽快查看您的密码","您的密码为："+users.getPassword());
+            return true;
+        }
+
+    }
+
+    @Override
+    public void revise(Users users) {
+
+        //根据token解析出id，原用户名，原密码来
+        Claims claims = JwtUtils.parseJWT(users.getToken());
+
+        Integer user_id = claims.get("user_id", Integer.class); // 假设 user_id 是字符串类型
+        log.info("id为{}",user_id);
+        String username = claims.get("username", String.class);
+        users.setUser_id(user_id);
+        log.info("用户修改信息id为{},将用户名{}修改为{},修改密码为{}",user_id,username,users.getUsername(),users.getPassword());
+        usersMapper.revise(users);
+    }
+
+}
diff --git a/blog/server/demo/src/main/java/top/lejings/demo/utils/Email.java b/blog/server/demo/src/main/java/top/lejings/demo/utils/Email.java
new file mode 100644
index 0000000..c304bd9
--- /dev/null
+++ b/blog/server/demo/src/main/java/top/lejings/demo/utils/Email.java
@@ -0,0 +1,26 @@
+package top.lejings.demo.utils;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.mail.SimpleMailMessage;
+import org.springframework.mail.javamail.JavaMailSender;
+import org.springframework.stereotype.Component;
+
+@Component
+public class Email {
+
+    private final JavaMailSender sender;
+
+    @Autowired
+    public Email(JavaMailSender sender) {
+        this.sender = sender;
+    }
+
+    public void SendSimpleMail(String to, String subject, String text) {
+        SimpleMailMessage message = new SimpleMailMessage();
+        message.setFrom("bloglejingstop@126.com");
+        message.setTo(to);
+        message.setSubject(subject);
+        message.setText(text);
+        sender.send(message);
+    }
+}
diff --git a/blog/server/demo/src/main/java/top/lejings/demo/utils/JwtUtils.java b/blog/server/demo/src/main/java/top/lejings/demo/utils/JwtUtils.java
new file mode 100644
index 0000000..5d1cf05
--- /dev/null
+++ b/blog/server/demo/src/main/java/top/lejings/demo/utils/JwtUtils.java
@@ -0,0 +1,41 @@
+package top.lejings.demo.utils;
+
+import io.jsonwebtoken.Claims;
+import io.jsonwebtoken.Jwts;
+import io.jsonwebtoken.SignatureAlgorithm;
+import java.util.Date;
+import java.util.Map;
+
+public class JwtUtils {
+
+    //签名秘钥 和 过期时间
+    private static String signKey = "lejings";
+    private static Long expire = 43200000L;
+
+    /**
+     * 生成JWT令牌
+     * @param claims JWT第二部分负载 payload 中存储的内容
+     * @return
+     */
+    public static String generateJwt(Map<String, Object> claims){
+        String jwt = Jwts.builder()
+                .addClaims(claims)
+                .signWith(SignatureAlgorithm.HS256, signKey)
+                .setExpiration(new Date(System.currentTimeMillis() + expire))
+                .compact();
+        return jwt;
+    }
+
+    /**
+     * 解析JWT令牌
+     * @param jwt JWT令牌
+     * @return JWT第二部分负载 payload 中存储的内容
+     */
+    public static Claims parseJWT(String jwt){
+        Claims claims = Jwts.parser()
+                .setSigningKey(signKey)
+                .parseClaimsJws(jwt)
+                .getBody();
+        return claims;
+    }
+}
diff --git a/blog/server/demo/src/main/resources/application.properties b/blog/server/demo/src/main/resources/application.properties
index 4db5496..86052b6 100644
--- a/blog/server/demo/src/main/resources/application.properties
+++ b/blog/server/demo/src/main/resources/application.properties
@@ -1,3 +1,4 @@
+spring.application.name=blog
 
 spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver
 
@@ -10,5 +11,17 @@ spring.datasource.password=123456
 
 mybatis.configuration.log-impl=org.apache.ibatis.logging.stdout.StdOutImpl
 
-mybatis.configuration.map-underscore-to-camel-case=true
+//????
+# ???????
+spring.mail.host=smtp.126.com
+spring.mail.username=bloglejingstop@126.com
+#GHVrH3BhNv9h82wy  ???
+spring.mail.password=GHVrH3BhNv9h82wy
+
+
+
+spring.mvc.cors.allowed-origins=http://localhost:8080
+spring.mvc.cors.allowed-methods=GET,POST,PUT,DELETE,OPTIONS
+spring.mvc.cors.allowed-headers=*
+spring.mvc.cors.allow-credentials=true
 
diff --git a/blog/server/demo/src/main/resources/top/lejings/demo/mapper/PostsMapper.xml b/blog/server/demo/src/main/resources/top/lejings/demo/mapper/PostsMapper.xml
index 0903f3d..78db882 100644
--- a/blog/server/demo/src/main/resources/top/lejings/demo/mapper/PostsMapper.xml
+++ b/blog/server/demo/src/main/resources/top/lejings/demo/mapper/PostsMapper.xml
@@ -7,35 +7,36 @@
     <select id="postsOverview" resultType="top.lejings.demo.pojo.Posts">
         SELECT
         p.post_id,
+        p.user_id,
+        COUNT(CASE WHEN r.type = 'like' THEN 1 END) AS Likes,
+        u.username,
         p.title,
-        u.username AS author,
-        (
-        SELECT COUNT(*)
-        FROM reactions r
-        WHERE r.post_id = p.post_id AND r.type = 'like'
-        ) AS like_count,
-        p.priority,
-        p.updated_at AS last_updated
-
+        p.updated_at
         FROM
         posts p
         JOIN
         users u ON p.user_id = u.user_id
-
+        LEFT JOIN
+        reactions r ON p.post_id = r.post_id AND r.type = 'like'
+        GROUP BY
+        p.post_id, p.user_id, u.username, p.title, p.content, p.updated_at, p.priority
         ORDER BY
-        p.updated_at DESC;
+        ${by} DESC;
     </select>
     <select id="postsEssay" resultType="top.lejings.demo.pojo.Posts">
         SELECT
         p.post_id,
-        p.user_id AS author_id,
+        p.user_id,
+        u.username,
         p.title,
         p.content,
-        p.updated_at AS last_updated,
-        r.like_count,
-        GROUP_CONCAT(r.user_id) AS like_user_ids
+        p.updated_at,
+        COALESCE(r.like_count, 0) AS like_count, -- 使用 COALESCE 处理 NULL 值
+        GROUP_CONCAT(DISTINCT r.user_id) AS like_user_ids -- 确保 user_id 不重复
         FROM
         posts p
+        JOIN
+        users u ON p.user_id = u.user_id -- 加入 users 表以获取用户名
         LEFT JOIN
         (SELECT
         post_id,
@@ -49,8 +50,13 @@
         post_id) r ON p.post_id = r.post_id
         WHERE
         p.post_id = #{post_id}
-        AND p.user_id IN (SELECT user_id FROM users WHERE status IN ('normal', 'admin'))
+        AND u.status IN ('normal', 'admin') -- 修改这里的条件以直接使用 u.status
         GROUP BY
-        p.post_id, p.user_id, p.title, p.content, p.updated_at, r.like_count;
+        p.post_id, p.user_id, u.username, p.title, p.content, p.updated_at, r.like_count;
+
     </select>
+    <insert id="postsNew">
+        INSERT INTO posts (user_id, title, content,  priority)
+        VALUES (#{user_id}, #{title}, #{content}, 0);
+    </insert>
 </mapper>
\ No newline at end of file
diff --git a/blog/server/demo/src/test/java/top/lejings/demo/DemoApplicationTests.java b/blog/server/demo/src/test/java/top/lejings/demo/DemoApplicationTests.java
index 31c7233..aa20c03 100644
--- a/blog/server/demo/src/test/java/top/lejings/demo/DemoApplicationTests.java
+++ b/blog/server/demo/src/test/java/top/lejings/demo/DemoApplicationTests.java
@@ -3,11 +3,13 @@ package top.lejings.demo;
 import org.junit.jupiter.api.Test;
 import org.springframework.boot.test.context.SpringBootTest;
 
+
 @SpringBootTest
 class DemoApplicationTests {
 
     @Test
     void contextLoads() {
+
     }
 
 }
diff --git a/blog/server/demo/target/classes/application.properties b/blog/server/demo/target/classes/application.properties
index 4db5496..86052b6 100644
--- a/blog/server/demo/target/classes/application.properties
+++ b/blog/server/demo/target/classes/application.properties
@@ -1,3 +1,4 @@
+spring.application.name=blog
 
 spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver
 
@@ -10,5 +11,17 @@ spring.datasource.password=123456
 
 mybatis.configuration.log-impl=org.apache.ibatis.logging.stdout.StdOutImpl
 
-mybatis.configuration.map-underscore-to-camel-case=true
+//????
+# ???????
+spring.mail.host=smtp.126.com
+spring.mail.username=bloglejingstop@126.com
+#GHVrH3BhNv9h82wy  ???
+spring.mail.password=GHVrH3BhNv9h82wy
+
+
+
+spring.mvc.cors.allowed-origins=http://localhost:8080
+spring.mvc.cors.allowed-methods=GET,POST,PUT,DELETE,OPTIONS
+spring.mvc.cors.allowed-headers=*
+spring.mvc.cors.allow-credentials=true
 
diff --git a/blog/server/demo/target/classes/top/lejings/demo/DemoApplication$WebConfig.class b/blog/server/demo/target/classes/top/lejings/demo/DemoApplication$WebConfig.class
new file mode 100644
index 0000000..6bdd910
Binary files /dev/null and b/blog/server/demo/target/classes/top/lejings/demo/DemoApplication$WebConfig.class differ
diff --git a/blog/server/demo/target/classes/top/lejings/demo/DemoApplication.class b/blog/server/demo/target/classes/top/lejings/demo/DemoApplication.class
index 9bf5ac6..f3aa3b3 100644
Binary files a/blog/server/demo/target/classes/top/lejings/demo/DemoApplication.class and b/blog/server/demo/target/classes/top/lejings/demo/DemoApplication.class differ
diff --git a/blog/server/demo/target/classes/top/lejings/demo/controller/AnnouncementsController.class b/blog/server/demo/target/classes/top/lejings/demo/controller/AnnouncementsController.class
index f2279bc..7c7a390 100644
Binary files a/blog/server/demo/target/classes/top/lejings/demo/controller/AnnouncementsController.class and b/blog/server/demo/target/classes/top/lejings/demo/controller/AnnouncementsController.class differ
diff --git a/blog/server/demo/target/classes/top/lejings/demo/controller/PostsController.class b/blog/server/demo/target/classes/top/lejings/demo/controller/PostsController.class
index 9442bdb..20e516a 100644
Binary files a/blog/server/demo/target/classes/top/lejings/demo/controller/PostsController.class and b/blog/server/demo/target/classes/top/lejings/demo/controller/PostsController.class differ
diff --git a/blog/server/demo/target/classes/top/lejings/demo/controller/UsersController.class b/blog/server/demo/target/classes/top/lejings/demo/controller/UsersController.class
new file mode 100644
index 0000000..5b17be7
Binary files /dev/null and b/blog/server/demo/target/classes/top/lejings/demo/controller/UsersController.class differ
diff --git a/blog/server/demo/target/classes/top/lejings/demo/filter/LoginCheckFilter.class b/blog/server/demo/target/classes/top/lejings/demo/filter/LoginCheckFilter.class
new file mode 100644
index 0000000..6d5e335
Binary files /dev/null and b/blog/server/demo/target/classes/top/lejings/demo/filter/LoginCheckFilter.class differ
diff --git a/blog/server/demo/target/classes/top/lejings/demo/mapper/PostsMapper.class b/blog/server/demo/target/classes/top/lejings/demo/mapper/PostsMapper.class
index d6da53b..b9d827c 100644
Binary files a/blog/server/demo/target/classes/top/lejings/demo/mapper/PostsMapper.class and b/blog/server/demo/target/classes/top/lejings/demo/mapper/PostsMapper.class differ
diff --git a/blog/server/demo/target/classes/top/lejings/demo/mapper/PostsMapper.xml b/blog/server/demo/target/classes/top/lejings/demo/mapper/PostsMapper.xml
index 0903f3d..78db882 100644
--- a/blog/server/demo/target/classes/top/lejings/demo/mapper/PostsMapper.xml
+++ b/blog/server/demo/target/classes/top/lejings/demo/mapper/PostsMapper.xml
@@ -7,35 +7,36 @@
     <select id="postsOverview" resultType="top.lejings.demo.pojo.Posts">
         SELECT
         p.post_id,
+        p.user_id,
+        COUNT(CASE WHEN r.type = 'like' THEN 1 END) AS Likes,
+        u.username,
         p.title,
-        u.username AS author,
-        (
-        SELECT COUNT(*)
-        FROM reactions r
-        WHERE r.post_id = p.post_id AND r.type = 'like'
-        ) AS like_count,
-        p.priority,
-        p.updated_at AS last_updated
-
+        p.updated_at
         FROM
         posts p
         JOIN
         users u ON p.user_id = u.user_id
-
+        LEFT JOIN
+        reactions r ON p.post_id = r.post_id AND r.type = 'like'
+        GROUP BY
+        p.post_id, p.user_id, u.username, p.title, p.content, p.updated_at, p.priority
         ORDER BY
-        p.updated_at DESC;
+        ${by} DESC;
     </select>
     <select id="postsEssay" resultType="top.lejings.demo.pojo.Posts">
         SELECT
         p.post_id,
-        p.user_id AS author_id,
+        p.user_id,
+        u.username,
         p.title,
         p.content,
-        p.updated_at AS last_updated,
-        r.like_count,
-        GROUP_CONCAT(r.user_id) AS like_user_ids
+        p.updated_at,
+        COALESCE(r.like_count, 0) AS like_count, -- 使用 COALESCE 处理 NULL 值
+        GROUP_CONCAT(DISTINCT r.user_id) AS like_user_ids -- 确保 user_id 不重复
         FROM
         posts p
+        JOIN
+        users u ON p.user_id = u.user_id -- 加入 users 表以获取用户名
         LEFT JOIN
         (SELECT
         post_id,
@@ -49,8 +50,13 @@
         post_id) r ON p.post_id = r.post_id
         WHERE
         p.post_id = #{post_id}
-        AND p.user_id IN (SELECT user_id FROM users WHERE status IN ('normal', 'admin'))
+        AND u.status IN ('normal', 'admin') -- 修改这里的条件以直接使用 u.status
         GROUP BY
-        p.post_id, p.user_id, p.title, p.content, p.updated_at, r.like_count;
+        p.post_id, p.user_id, u.username, p.title, p.content, p.updated_at, r.like_count;
+
     </select>
+    <insert id="postsNew">
+        INSERT INTO posts (user_id, title, content,  priority)
+        VALUES (#{user_id}, #{title}, #{content}, 0);
+    </insert>
 </mapper>
\ No newline at end of file
diff --git a/blog/server/demo/target/classes/top/lejings/demo/mapper/UsersMapper.class b/blog/server/demo/target/classes/top/lejings/demo/mapper/UsersMapper.class
new file mode 100644
index 0000000..c31563e
Binary files /dev/null and b/blog/server/demo/target/classes/top/lejings/demo/mapper/UsersMapper.class differ
diff --git a/blog/server/demo/target/classes/top/lejings/demo/pojo/Posts.class b/blog/server/demo/target/classes/top/lejings/demo/pojo/Posts.class
index 8430029..266bf0a 100644
Binary files a/blog/server/demo/target/classes/top/lejings/demo/pojo/Posts.class and b/blog/server/demo/target/classes/top/lejings/demo/pojo/Posts.class differ
diff --git a/blog/server/demo/target/classes/top/lejings/demo/pojo/Users.class b/blog/server/demo/target/classes/top/lejings/demo/pojo/Users.class
index 9576612..f2ac77d 100644
Binary files a/blog/server/demo/target/classes/top/lejings/demo/pojo/Users.class and b/blog/server/demo/target/classes/top/lejings/demo/pojo/Users.class differ
diff --git a/blog/server/demo/target/classes/top/lejings/demo/service/PostsService.class b/blog/server/demo/target/classes/top/lejings/demo/service/PostsService.class
index 2146b1a..976d610 100644
Binary files a/blog/server/demo/target/classes/top/lejings/demo/service/PostsService.class and b/blog/server/demo/target/classes/top/lejings/demo/service/PostsService.class differ
diff --git a/blog/server/demo/target/classes/top/lejings/demo/service/UsersService.class b/blog/server/demo/target/classes/top/lejings/demo/service/UsersService.class
new file mode 100644
index 0000000..46cb0b2
Binary files /dev/null and b/blog/server/demo/target/classes/top/lejings/demo/service/UsersService.class differ
diff --git a/blog/server/demo/target/classes/top/lejings/demo/service/impl/PostsServiceImpl.class b/blog/server/demo/target/classes/top/lejings/demo/service/impl/PostsServiceImpl.class
index b2a736e..31eb265 100644
Binary files a/blog/server/demo/target/classes/top/lejings/demo/service/impl/PostsServiceImpl.class and b/blog/server/demo/target/classes/top/lejings/demo/service/impl/PostsServiceImpl.class differ
diff --git a/blog/server/demo/target/classes/top/lejings/demo/service/impl/UsersServiceImpl.class b/blog/server/demo/target/classes/top/lejings/demo/service/impl/UsersServiceImpl.class
new file mode 100644
index 0000000..925b9ba
Binary files /dev/null and b/blog/server/demo/target/classes/top/lejings/demo/service/impl/UsersServiceImpl.class differ
diff --git a/blog/server/demo/target/classes/top/lejings/demo/utils/Email.class b/blog/server/demo/target/classes/top/lejings/demo/utils/Email.class
new file mode 100644
index 0000000..788f7ba
Binary files /dev/null and b/blog/server/demo/target/classes/top/lejings/demo/utils/Email.class differ
diff --git a/blog/server/demo/target/classes/top/lejings/demo/utils/JwtUtils.class b/blog/server/demo/target/classes/top/lejings/demo/utils/JwtUtils.class
new file mode 100644
index 0000000..efce300
Binary files /dev/null and b/blog/server/demo/target/classes/top/lejings/demo/utils/JwtUtils.class differ
diff --git a/javaweb_word/server/DB/.idea/misc.xml b/javaweb_word/server/DB/.idea/misc.xml
index 208ffd8..001e756 100644
--- a/javaweb_word/server/DB/.idea/misc.xml
+++ b/javaweb_word/server/DB/.idea/misc.xml
@@ -8,7 +8,7 @@
       </list>
     </option>
   </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_X" default="true" project-jdk-name="23" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_23" default="true" project-jdk-name="23" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/out" />
   </component>
 </project>
\ No newline at end of file