BMP
/
IntegralManager
mirror of https://gitee.com/bmpandlcm/IntegralManager.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

解决餐饮预约核销成功之后，前端通过websocket没有收到消息的问题

Browse Source
master
bmpandlcm 11 months ago
parent f2c4fc89c4
commit 3b737e3f89
3 changed files with 87 additions and 61 deletions
Show Stats Download Patch File Download Diff File

143
.idea/workspace.xml
Unescape Escape View File

@ -9,13 +9,10 @@
<option name="autoReloadType" value="SELECTIVE" /> <option name="autoReloadType" value="SELECTIVE" />
</component> </component>
<component name="ChangeListManager"> <component name="ChangeListManager">
<list default="true" id="29bcb86b-1634-41e0-a498-79481163cba8" name="Changes" comment="附件上传，按照日期存放"> <list default="true" id="29bcb86b-1634-41e0-a498-79481163cba8" name="Changes" comment="解决餐饮预约核销成功之后，前端通过websocket没有收到消息的问题">
<change afterPath="$PROJECT_DIR$/src/main/java/com/nmgs/controller/LoginController.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" /> <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/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/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/util/main.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/nmgs/util/main.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" />
</list> </list>
<option name="SHOW_DIALOG" value="false" /> <option name="SHOW_DIALOG" value="false" />
<option name="HIGHLIGHT_CONFLICTS" value="true" /> <option name="HIGHLIGHT_CONFLICTS" value="true" />
@ -72,58 +69,58 @@
<component name="ProjectViewState"> <component name="ProjectViewState">
<option name="showLibraryContents" value="true" /> <option name="showLibraryContents" value="true" />
</component> </component>
<component name="PropertiesComponent"><![CDATA[{ <component name="PropertiesComponent">{
"keyToString": { &quot;keyToString&quot;: {
"Application.DivPassDataImpl.executor": "Run", &quot;Application.DivPassDataImpl.executor&quot;: &quot;Run&quot;,
"Application.ImageUtils.executor": "Run", &quot;Application.ImageUtils.executor&quot;: &quot;Run&quot;,
"Application.PubTools.executor": "Run", &quot;Application.PubTools.executor&quot;: &quot;Run&quot;,
"Application.QCodeInfoServiceImpl.executor": "Debug", &quot;Application.QCodeInfoServiceImpl.executor&quot;: &quot;Debug&quot;,
"Application.SensitiveFilter.executor": "Run", &quot;Application.SensitiveFilter.executor&quot;: &quot;Run&quot;,
"Application.main.executor": "Debug", &quot;Application.main.executor&quot;: &quot;Debug&quot;,
"Application.redisConfigUtil.executor": "Debug", &quot;Application.redisConfigUtil.executor&quot;: &quot;Debug&quot;,
"Maven.IntegraManager [clean].executor": "Run", &quot;Maven.IntegraManager [clean].executor&quot;: &quot;Run&quot;,
"Maven.IntegraManager [install].executor": "Run", &quot;Maven.IntegraManager [install].executor&quot;: &quot;Run&quot;,
"Maven.IntegralManager [clean].executor": "Run", &quot;Maven.IntegralManager [clean].executor&quot;: &quot;Run&quot;,
"Maven.IntegralManager [install].executor": "Run", &quot;Maven.IntegralManager [install].executor&quot;: &quot;Run&quot;,
"Maven.IntegralManager [validate].executor": "Run", &quot;Maven.IntegralManager [validate].executor&quot;: &quot;Run&quot;,
"Maven.IntegralManagerSys [clean].executor": "Run", &quot;Maven.IntegralManagerSys [clean].executor&quot;: &quot;Run&quot;,
"Maven.IntegralManagerSys [install].executor": "Run", &quot;Maven.IntegralManagerSys [install].executor&quot;: &quot;Run&quot;,
"Maven.devProject [clean].executor": "Run", &quot;Maven.devProject [clean].executor&quot;: &quot;Run&quot;,
"Maven.devProject [install].executor": "Run", &quot;Maven.devProject [install].executor&quot;: &quot;Run&quot;,
"Maven.dev_project [clean].executor": "Run", &quot;Maven.dev_project [clean].executor&quot;: &quot;Run&quot;,
"Maven.dev_project [install].executor": "Run", &quot;Maven.dev_project [install].executor&quot;: &quot;Run&quot;,
"Maven.special_event [clean].executor": "Run", &quot;Maven.special_event [clean].executor&quot;: &quot;Run&quot;,
"Maven.special_event [install].executor": "Run", &quot;Maven.special_event [install].executor&quot;: &quot;Run&quot;,
"Maven.special_event [org.apache.maven.plugins:maven-assembly-plugin:3.3.0:single].executor": "Run", &quot;Maven.special_event [org.apache.maven.plugins:maven-assembly-plugin:3.3.0:single].executor&quot;: &quot;Run&quot;,
"Maven.special_event [org.springframework.boot:spring-boot-maven-plugin:2.7.11:repackage].executor": "Run", &quot;Maven.special_event [org.springframework.boot:spring-boot-maven-plugin:2.7.11:repackage].executor&quot;: &quot;Run&quot;,
"Maven.special_event [package].executor": "Run", &quot;Maven.special_event [package].executor&quot;: &quot;Run&quot;,
"Maven.special_event [validate].executor": "Run", &quot;Maven.special_event [validate].executor&quot;: &quot;Run&quot;,
"RunOnceActivity.OpenProjectViewOnStart": "true", &quot;RunOnceActivity.OpenProjectViewOnStart&quot;: &quot;true&quot;,
"RunOnceActivity.ShowReadmeOnStart": "true", &quot;RunOnceActivity.ShowReadmeOnStart&quot;: &quot;true&quot;,
"SHARE_PROJECT_CONFIGURATION_FILES": "true", &quot;SHARE_PROJECT_CONFIGURATION_FILES&quot;: &quot;true&quot;,
"TomEE Server.special_event.executor": "Debug", &quot;TomEE Server.special_event.executor&quot;: &quot;Debug&quot;,
"Tomcat Server.Tomcat 9.0.80.executor": "Debug", &quot;Tomcat Server.Tomcat 9.0.80.executor&quot;: &quot;Debug&quot;,
"deletionFromPopupRequiresConfirmation": "false", &quot;deletionFromPopupRequiresConfirmation&quot;: &quot;false&quot;,
"git-widget-placeholder": "master", &quot;git-widget-placeholder&quot;: &quot;master&quot;,
"kotlin-language-version-configured": "true", &quot;kotlin-language-version-configured&quot;: &quot;true&quot;,
"last_opened_file_path": "E:/work/TGGLT-WorkSpace/IntegralManager", &quot;last_opened_file_path&quot;: &quot;E:/work/TGGLT-WorkSpace/springcloud_mybatisplus&quot;,
"node.js.detected.package.eslint": "true", &quot;node.js.detected.package.eslint&quot;: &quot;true&quot;,
"node.js.detected.package.tslint": "true", &quot;node.js.detected.package.tslint&quot;: &quot;true&quot;,
"node.js.selected.package.eslint": "(autodetect)", &quot;node.js.selected.package.eslint&quot;: &quot;(autodetect)&quot;,
"node.js.selected.package.tslint": "(autodetect)", &quot;node.js.selected.package.tslint&quot;: &quot;(autodetect)&quot;,
"nodejs_package_manager_path": "npm", &quot;nodejs_package_manager_path&quot;: &quot;npm&quot;,
"project.structure.last.edited": "Modules", &quot;project.structure.last.edited&quot;: &quot;Modules&quot;,
"project.structure.proportion": "0.15", &quot;project.structure.proportion&quot;: &quot;0.15&quot;,
"project.structure.side.proportion": "0.37169158", &quot;project.structure.side.proportion&quot;: &quot;0.37169158&quot;,
"settings.editor.selected.configurable": "vcs.Git", &quot;settings.editor.selected.configurable&quot;: &quot;vcs.Git&quot;,
"vue.rearranger.settings.migration": "true" &quot;vue.rearranger.settings.migration&quot;: &quot;true&quot;
}, },
"keyToStringList": { &quot;keyToStringList&quot;: {
"DatabaseDriversLRU": [ &quot;DatabaseDriversLRU&quot;: [
"oracle" &quot;oracle&quot;
] ]
} }
}]]></component> }</component>
<component name="ReactorSettings"> <component name="ReactorSettings">
<option name="notificationShown" value="true" /> <option name="notificationShown" value="true" />
</component> </component>
@ -146,7 +143,20 @@
<recent name="com.nmgs.entity" /> <recent name="com.nmgs.entity" />
</key> </key>
</component> </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"> <configuration default="true" type="JetRunConfigurationType">
<module name="IntegraManager" /> <module name="IntegraManager" />
<method v="2"> <method v="2">
@ -358,6 +368,11 @@
<option name="Make" enabled="true" /> <option name="Make" enabled="true" />
</method> </method>
</configuration> </configuration>
<recent_temporary>
<list>
<item itemvalue="Application.main" />
</list>
</recent_temporary>
</component> </component>
<component name="SharedIndexes"> <component name="SharedIndexes">
<attachedChunks> <attachedChunks>
@ -527,7 +542,8 @@
<workItem from="1733884773221" duration="2380000" /> <workItem from="1733884773221" duration="2380000" />
<workItem from="1733902595732" duration="639000" /> <workItem from="1733902595732" duration="639000" />
<workItem from="1733964297677" duration="4644000" /> <workItem from="1733964297677" duration="4644000" />
<workItem from="1733994734948" duration="5074000" /> <workItem from="1733994734948" duration="8894000" />
<workItem from="1734079178237" duration="1988000" />
</task> </task>
<task id="LOCAL-00001" summary="特请处理"> <task id="LOCAL-00001" summary="特请处理">
<option name="closed" value="true" /> <option name="closed" value="true" />
@ -681,7 +697,15 @@
<option name="project" value="LOCAL" /> <option name="project" value="LOCAL" />
<updated>1733293115770</updated> <updated>1733293115770</updated>
</task> </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 /> <servers />
</component> </component>
<component name="TypeScriptGeneratedFilesManager"> <component name="TypeScriptGeneratedFilesManager">
@ -712,7 +736,8 @@
<MESSAGE value="新增附件上传接口" /> <MESSAGE value="新增附件上传接口" />
<MESSAGE value="附件上传接口修改" /> <MESSAGE value="附件上传接口修改" />
<MESSAGE value="附件上传，按照日期存放" /> <MESSAGE value="附件上传，按照日期存放" />
<option name="LAST_COMMIT_MESSAGE" value="附件上传，按照日期存放" /> <MESSAGE value="解决餐饮预约核销成功之后，前端通过websocket没有收到消息的问题" />
<option name="LAST_COMMIT_MESSAGE" value="解决餐饮预约核销成功之后，前端通过websocket没有收到消息的问题" />
</component> </component>
<component name="XDebuggerManager"> <component name="XDebuggerManager">
<breakpoint-manager> <breakpoint-manager>

4
src/main/java/com/nmgs/controller/QcodeInfoController.java
Unescape Escape View File

@ -68,7 +68,7 @@ public class QcodeInfoController {
String retStr= retStrJSON.get("ret").toString(); String retStr= retStrJSON.get("ret").toString();
String openId= PubTools.isEmpty(retStrJSON.get("openId"))?"":retStrJSON.get("openId").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(); JSONArray ja=new JSONArray();
ja.add(retStrJSON); ja.add(retStrJSON);
if("1".equals(retStr)){ if("1".equals(retStr)){
@ -276,7 +276,7 @@ public class QcodeInfoController {
method = {RequestMethod.POST} method = {RequestMethod.POST}
) )
@ApiOperation(value="用户没有进行核销，关闭二维码",httpMethod = "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); String retStr = qCodeInfoServiceImpl.removeContent(content);
return ResultData.success(1,"取消成功"); return ResultData.success(1,"取消成功");
} }

1
src/main/java/com/nmgs/util/main.java
Unescape Escape View File

@ -79,6 +79,7 @@ public class main {
// System.out.println(Long.parseLong(memo,16)); // System.out.println(Long.parseLong(memo,16));
System.out.println(PassWordUtils.encrypt("2zhLmcL")); System.out.println(PassWordUtils.encrypt("2zhLmcL"));
System.out.println(PassWordUtils.encrypt("123456")); System.out.println(PassWordUtils.encrypt("123456"));
System.out.println(PassWordUtils.decrypt("am5odi5AdTBvdGVIdEI3aHNyYms8ZD1C"));
// System.out.println("  蒙K972X3 ".replace(" ","").trim()); // System.out.println("  蒙K972X3 ".replace(" ","").trim());
// String str = "蒙蒙蒙蒙123456625"; // String str = "蒙蒙蒙蒙123456625";
// System.out.println(CRCUtil.CRC_AddData(10L,str)); // System.out.println(CRCUtil.CRC_AddData(10L,str));

Write Preview
Loading…
Cancel
Save