From ddba4a7cf40f92173cb1e94b779218935006a8db Mon Sep 17 00:00:00 2001
From: liujiang <569804566@qq.com>
Date: Thu, 17 Jul 2025 22:44:35 +0800
Subject: [PATCH] =?UTF-8?q?master=EF=BC=9A=E6=84=8F=E8=A7=81=E5=8F=8D?=
 =?UTF-8?q?=E9=A6=88=E8=B0=83=E4=BC=98=EF=BC=9B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/ruoyi/web/controller/xkt/FeedbackController.java     | 2 +-
 .../java/com/ruoyi/web/controller/xkt/NoticeController.java  | 2 +-
 .../ruoyi/web/controller/xkt/vo/feedback/FeedbackResVO.java  | 2 +-
 .../com/ruoyi/web/controller/xkt/vo/feedback/FeedbackVO.java | 5 ++++-
 .../main/java/com/ruoyi/xkt/dto/feedback/FeedbackResDTO.java | 2 +-
 5 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/FeedbackController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/FeedbackController.java
index 6b77e221e..d06886966 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/FeedbackController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/FeedbackController.java
@@ -49,7 +49,7 @@ public class FeedbackController extends XktBaseController {
         return R.ok(feedbackService.page(BeanUtil.toBean(pageVO, FeedbackPageDTO.class)));
     }
 
-    @ApiOperation(value = "意见反馈详情", httpMethod = "PUT", response = R.class)
+    @ApiOperation(value = "意见反馈详情", httpMethod = "GET", response = R.class)
     @GetMapping("/{id}")
     public R<FeedbackResVO> getInfo(@PathVariable Long id) {
         return R.ok(BeanUtil.toBean(feedbackService.getInfo(id), FeedbackResVO.class));
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/NoticeController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/NoticeController.java
index 6be0a69c5..5beaf88a2 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/NoticeController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/NoticeController.java
@@ -47,7 +47,7 @@ public class NoticeController extends BaseController {
         return R.ok(noticeService.edit(BeanUtil.toBean(editVO, NoticeEditDTO.class)));
     }
 
-    @ApiOperation(value = "公告详情（档口公告、系统公告）", httpMethod = "PUT", response = R.class)
+    @ApiOperation(value = "公告详情（档口公告、系统公告）", httpMethod = "GET", response = R.class)
     @GetMapping("/{noticeId}")
     public R<NoticeResVO> getInfo(@PathVariable Long noticeId) {
         return R.ok(BeanUtil.toBean(noticeService.getInfo(noticeId), NoticeResVO.class));
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/feedback/FeedbackResVO.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/feedback/FeedbackResVO.java
index 4841b617b..b209e263e 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/feedback/FeedbackResVO.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/feedback/FeedbackResVO.java
@@ -20,6 +20,6 @@ public class FeedbackResVO {
     @ApiModelProperty(value = "内容")
     private String content;
     @ApiModelProperty(value = "联系方式")
-    private String contract;
+    private String contact;
 
 }
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/feedback/FeedbackVO.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/feedback/FeedbackVO.java
index c4af24154..688dc5245 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/feedback/FeedbackVO.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/feedback/FeedbackVO.java
@@ -1,6 +1,7 @@
 package com.ruoyi.web.controller.xkt.vo.feedback;
 
 import com.fasterxml.jackson.annotation.JsonInclude;
+import com.ruoyi.common.xss.Xss;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -20,13 +21,15 @@ import javax.validation.constraints.Size;
 public class FeedbackVO {
 
     @ApiModelProperty(value = "用户反馈内容", required = true)
-    @Size(max = 200, message = "反馈内容不能超过200个字!")
+    @Size(max = 200, message = "反馈内容不能超过180个字!")
     @NotBlank(message = "反馈内容不能为空!")
+    @Xss
     private String content;
     @ApiModelProperty(value = "用户反馈联系方式", required = true)
     @Size(max = 20, message = "联系方式不能超过20个字!")
     @NotBlank(message = "联系方式不能为空!")
     @Pattern(regexp = "^1[3-9]\\d{9}$", message = "联系电话格式不正确，请输入有效的中国大陆手机号")
+    @Xss
     private String contact;
 
 }
diff --git a/xkt/src/main/java/com/ruoyi/xkt/dto/feedback/FeedbackResDTO.java b/xkt/src/main/java/com/ruoyi/xkt/dto/feedback/FeedbackResDTO.java
index 1d3cf8043..0cac82fd7 100644
--- a/xkt/src/main/java/com/ruoyi/xkt/dto/feedback/FeedbackResDTO.java
+++ b/xkt/src/main/java/com/ruoyi/xkt/dto/feedback/FeedbackResDTO.java
@@ -20,6 +20,6 @@ public class FeedbackResDTO {
     @ApiModelProperty(value = "内容")
     private String content;
     @ApiModelProperty(value = "联系方式")
-    private String contract;
+    private String contact;
 
 }