diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 8309a0f..bee8d93 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -9,13 +9,10 @@
     <option name="autoReloadType" value="SELECTIVE" />
   </component>
   <component name="ChangeListManager">
-    <list default="true" id="29bcb86b-1634-41e0-a498-79481163cba8" name="Changes" comment="附件上传，按照日期存放">
-      <change afterPath="$PROJECT_DIR$/src/main/java/com/nmgs/controller/LoginController.java" afterDir="false" />
+    <list default="true" id="29bcb86b-1634-41e0-a498-79481163cba8" name="Changes" comment="解决餐饮预约核销成功之后，前端通过websocket没有收到消息的问题">
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/pom.xml" beforeDir="false" afterPath="$PROJECT_DIR$/pom.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/nmgs/controller/WebSocket.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/nmgs/controller/WebSocket.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/nmgs/service/impl/QCodeInfoServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/nmgs/service/impl/QCodeInfoServiceImpl.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/nmgs/util/WebsocketUtil.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/nmgs/util/WebsocketUtil.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/nmgs/controller/QcodeInfoController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/nmgs/controller/QcodeInfoController.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/nmgs/util/main.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/nmgs/util/main.java" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -72,58 +69,58 @@
   <component name="ProjectViewState">
     <option name="showLibraryContents" value="true" />
   </component>
-  <component name="PropertiesComponent"><![CDATA[{
-  "keyToString": {
-    "Application.DivPassDataImpl.executor": "Run",
-    "Application.ImageUtils.executor": "Run",
-    "Application.PubTools.executor": "Run",
-    "Application.QCodeInfoServiceImpl.executor": "Debug",
-    "Application.SensitiveFilter.executor": "Run",
-    "Application.main.executor": "Debug",
-    "Application.redisConfigUtil.executor": "Debug",
-    "Maven.IntegraManager [clean].executor": "Run",
-    "Maven.IntegraManager [install].executor": "Run",
-    "Maven.IntegralManager [clean].executor": "Run",
-    "Maven.IntegralManager [install].executor": "Run",
-    "Maven.IntegralManager [validate].executor": "Run",
-    "Maven.IntegralManagerSys [clean].executor": "Run",
-    "Maven.IntegralManagerSys [install].executor": "Run",
-    "Maven.devProject [clean].executor": "Run",
-    "Maven.devProject [install].executor": "Run",
-    "Maven.dev_project [clean].executor": "Run",
-    "Maven.dev_project [install].executor": "Run",
-    "Maven.special_event [clean].executor": "Run",
-    "Maven.special_event [install].executor": "Run",
-    "Maven.special_event [org.apache.maven.plugins:maven-assembly-plugin:3.3.0:single].executor": "Run",
-    "Maven.special_event [org.springframework.boot:spring-boot-maven-plugin:2.7.11:repackage].executor": "Run",
-    "Maven.special_event [package].executor": "Run",
-    "Maven.special_event [validate].executor": "Run",
-    "RunOnceActivity.OpenProjectViewOnStart": "true",
-    "RunOnceActivity.ShowReadmeOnStart": "true",
-    "SHARE_PROJECT_CONFIGURATION_FILES": "true",
-    "TomEE Server.special_event.executor": "Debug",
-    "Tomcat Server.Tomcat 9.0.80.executor": "Debug",
-    "deletionFromPopupRequiresConfirmation": "false",
-    "git-widget-placeholder": "master",
-    "kotlin-language-version-configured": "true",
-    "last_opened_file_path": "E:/work/TGGLT-WorkSpace/IntegralManager",
-    "node.js.detected.package.eslint": "true",
-    "node.js.detected.package.tslint": "true",
-    "node.js.selected.package.eslint": "(autodetect)",
-    "node.js.selected.package.tslint": "(autodetect)",
-    "nodejs_package_manager_path": "npm",
-    "project.structure.last.edited": "Modules",
-    "project.structure.proportion": "0.15",
-    "project.structure.side.proportion": "0.37169158",
-    "settings.editor.selected.configurable": "vcs.Git",
-    "vue.rearranger.settings.migration": "true"
+  <component name="PropertiesComponent">{
+  &quot;keyToString&quot;: {
+    &quot;Application.DivPassDataImpl.executor&quot;: &quot;Run&quot;,
+    &quot;Application.ImageUtils.executor&quot;: &quot;Run&quot;,
+    &quot;Application.PubTools.executor&quot;: &quot;Run&quot;,
+    &quot;Application.QCodeInfoServiceImpl.executor&quot;: &quot;Debug&quot;,
+    &quot;Application.SensitiveFilter.executor&quot;: &quot;Run&quot;,
+    &quot;Application.main.executor&quot;: &quot;Debug&quot;,
+    &quot;Application.redisConfigUtil.executor&quot;: &quot;Debug&quot;,
+    &quot;Maven.IntegraManager [clean].executor&quot;: &quot;Run&quot;,
+    &quot;Maven.IntegraManager [install].executor&quot;: &quot;Run&quot;,
+    &quot;Maven.IntegralManager [clean].executor&quot;: &quot;Run&quot;,
+    &quot;Maven.IntegralManager [install].executor&quot;: &quot;Run&quot;,
+    &quot;Maven.IntegralManager [validate].executor&quot;: &quot;Run&quot;,
+    &quot;Maven.IntegralManagerSys [clean].executor&quot;: &quot;Run&quot;,
+    &quot;Maven.IntegralManagerSys [install].executor&quot;: &quot;Run&quot;,
+    &quot;Maven.devProject [clean].executor&quot;: &quot;Run&quot;,
+    &quot;Maven.devProject [install].executor&quot;: &quot;Run&quot;,
+    &quot;Maven.dev_project [clean].executor&quot;: &quot;Run&quot;,
+    &quot;Maven.dev_project [install].executor&quot;: &quot;Run&quot;,
+    &quot;Maven.special_event [clean].executor&quot;: &quot;Run&quot;,
+    &quot;Maven.special_event [install].executor&quot;: &quot;Run&quot;,
+    &quot;Maven.special_event [org.apache.maven.plugins:maven-assembly-plugin:3.3.0:single].executor&quot;: &quot;Run&quot;,
+    &quot;Maven.special_event [org.springframework.boot:spring-boot-maven-plugin:2.7.11:repackage].executor&quot;: &quot;Run&quot;,
+    &quot;Maven.special_event [package].executor&quot;: &quot;Run&quot;,
+    &quot;Maven.special_event [validate].executor&quot;: &quot;Run&quot;,
+    &quot;RunOnceActivity.OpenProjectViewOnStart&quot;: &quot;true&quot;,
+    &quot;RunOnceActivity.ShowReadmeOnStart&quot;: &quot;true&quot;,
+    &quot;SHARE_PROJECT_CONFIGURATION_FILES&quot;: &quot;true&quot;,
+    &quot;TomEE Server.special_event.executor&quot;: &quot;Debug&quot;,
+    &quot;Tomcat Server.Tomcat 9.0.80.executor&quot;: &quot;Debug&quot;,
+    &quot;deletionFromPopupRequiresConfirmation&quot;: &quot;false&quot;,
+    &quot;git-widget-placeholder&quot;: &quot;master&quot;,
+    &quot;kotlin-language-version-configured&quot;: &quot;true&quot;,
+    &quot;last_opened_file_path&quot;: &quot;E:/work/TGGLT-WorkSpace/springcloud_mybatisplus&quot;,
+    &quot;node.js.detected.package.eslint&quot;: &quot;true&quot;,
+    &quot;node.js.detected.package.tslint&quot;: &quot;true&quot;,
+    &quot;node.js.selected.package.eslint&quot;: &quot;(autodetect)&quot;,
+    &quot;node.js.selected.package.tslint&quot;: &quot;(autodetect)&quot;,
+    &quot;nodejs_package_manager_path&quot;: &quot;npm&quot;,
+    &quot;project.structure.last.edited&quot;: &quot;Modules&quot;,
+    &quot;project.structure.proportion&quot;: &quot;0.15&quot;,
+    &quot;project.structure.side.proportion&quot;: &quot;0.37169158&quot;,
+    &quot;settings.editor.selected.configurable&quot;: &quot;vcs.Git&quot;,
+    &quot;vue.rearranger.settings.migration&quot;: &quot;true&quot;
   },
-  "keyToStringList": {
-    "DatabaseDriversLRU": [
-      "oracle"
+  &quot;keyToStringList&quot;: {
+    &quot;DatabaseDriversLRU&quot;: [
+      &quot;oracle&quot;
     ]
   }
-}]]></component>
+}</component>
   <component name="ReactorSettings">
     <option name="notificationShown" value="true" />
   </component>
@@ -146,7 +143,20 @@
       <recent name="com.nmgs.entity" />
     </key>
   </component>
-  <component name="RunManager">
+  <component name="RunManager" selected="Application.main">
+    <configuration name="main" type="Application" factoryName="Application" temporary="true" nameIsGenerated="true">
+      <option name="MAIN_CLASS_NAME" value="com.nmgs.util.main" />
+      <module name="IntegralManager" />
+      <extension name="coverage">
+        <pattern>
+          <option name="PATTERN" value="com.nmgs.util.*" />
+          <option name="ENABLED" value="true" />
+        </pattern>
+      </extension>
+      <method v="2">
+        <option name="Make" enabled="true" />
+      </method>
+    </configuration>
     <configuration default="true" type="JetRunConfigurationType">
       <module name="IntegraManager" />
       <method v="2">
@@ -358,6 +368,11 @@
         <option name="Make" enabled="true" />
       </method>
     </configuration>
+    <recent_temporary>
+      <list>
+        <item itemvalue="Application.main" />
+      </list>
+    </recent_temporary>
   </component>
   <component name="SharedIndexes">
     <attachedChunks>
@@ -527,7 +542,8 @@
       <workItem from="1733884773221" duration="2380000" />
       <workItem from="1733902595732" duration="639000" />
       <workItem from="1733964297677" duration="4644000" />
-      <workItem from="1733994734948" duration="5074000" />
+      <workItem from="1733994734948" duration="8894000" />
+      <workItem from="1734079178237" duration="1988000" />
     </task>
     <task id="LOCAL-00001" summary="特请处理">
       <option name="closed" value="true" />
@@ -681,7 +697,15 @@
       <option name="project" value="LOCAL" />
       <updated>1733293115770</updated>
     </task>
-    <option name="localTasksCounter" value="20" />
+    <task id="LOCAL-00020" summary="解决餐饮预约核销成功之后，前端通过websocket没有收到消息的问题">
+      <option name="closed" value="true" />
+      <created>1734053883415</created>
+      <option name="number" value="00020" />
+      <option name="presentableId" value="LOCAL-00020" />
+      <option name="project" value="LOCAL" />
+      <updated>1734053883415</updated>
+    </task>
+    <option name="localTasksCounter" value="21" />
     <servers />
   </component>
   <component name="TypeScriptGeneratedFilesManager">
@@ -712,7 +736,8 @@
     <MESSAGE value="新增附件上传接口" />
     <MESSAGE value="附件上传接口修改" />
     <MESSAGE value="附件上传，按照日期存放" />
-    <option name="LAST_COMMIT_MESSAGE" value="附件上传，按照日期存放" />
+    <MESSAGE value="解决餐饮预约核销成功之后，前端通过websocket没有收到消息的问题" />
+    <option name="LAST_COMMIT_MESSAGE" value="解决餐饮预约核销成功之后，前端通过websocket没有收到消息的问题" />
   </component>
   <component name="XDebuggerManager">
     <breakpoint-manager>
diff --git a/src/main/java/com/nmgs/controller/QcodeInfoController.java b/src/main/java/com/nmgs/controller/QcodeInfoController.java
index d6a3e8a..761b068 100644
--- a/src/main/java/com/nmgs/controller/QcodeInfoController.java
+++ b/src/main/java/com/nmgs/controller/QcodeInfoController.java
@@ -68,7 +68,7 @@ public class QcodeInfoController {
 
         String retStr= retStrJSON.get("ret").toString();
        String openId= PubTools.isEmpty(retStrJSON.get("openId"))?"":retStrJSON.get("openId").toString();
-        LogUtil.WriteLog_Info("积分核销结果==="+PubTools.getCurrentDate()+"==="+retStrJSON.toString(),"QcodeInfoController");
+        LogUtil.WriteLog_Info("积分核销结果===" + PubTools.getCurrentDate() + "===" + retStrJSON, "QcodeInfoController");
        JSONArray ja=new JSONArray();
        ja.add(retStrJSON);
         if("1".equals(retStr)){
@@ -276,7 +276,7 @@ public class QcodeInfoController {
             method = {RequestMethod.POST}
     )
     @ApiOperation(value="用户没有进行核销，关闭二维码",httpMethod = "POST")
-    public ResultData<List> removeContent(@RequestParam("content") String content){
+    public ResultData<String> removeContent(@RequestParam("content") String content) {
         String retStr = qCodeInfoServiceImpl.removeContent(content);
         return ResultData.success(1,"取消成功");
     }
diff --git a/src/main/java/com/nmgs/util/main.java b/src/main/java/com/nmgs/util/main.java
index 32e6a06..e86c583 100644
--- a/src/main/java/com/nmgs/util/main.java
+++ b/src/main/java/com/nmgs/util/main.java
@@ -79,6 +79,7 @@ public class main {
 //        System.out.println(Long.parseLong(memo,16));
         System.out.println(PassWordUtils.encrypt("2zhLmcL"));
         System.out.println(PassWordUtils.encrypt("123456"));
+        System.out.println(PassWordUtils.decrypt("am5odi5AdTBvdGVIdEI3aHNyYms8ZD1C"));
 //        System.out.println("  蒙K972X3  ".replace(" ","").trim());
 //        String str = "蒙蒙蒙蒙123456625";
 //        System.out.println(CRCUtil.CRC_AddData(10L,str));