From 3b737e3f89a77f336b04acdfbf26c4b1a56308ed Mon Sep 17 00:00:00 2001
From: bmpandlcm <1102247926@qq.com>
Date: Mon, 16 Dec 2024 10:08:32 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E9=A4=90=E9=A5=AE=E9=A2=84?=
=?UTF-8?q?=E7=BA=A6=E6=A0=B8=E9=94=80=E6=88=90=E5=8A=9F=E4=B9=8B=E5=90=8E?=
=?UTF-8?q?=EF=BC=8C=E5=89=8D=E7=AB=AF=E9=80=9A=E8=BF=87websocket=E6=B2=A1?=
=?UTF-8?q?=E6=9C=89=E6=94=B6=E5=88=B0=E6=B6=88=E6=81=AF=E7=9A=84=E9=97=AE?=
=?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.idea/workspace.xml | 143 ++++++++++--------
.../nmgs/controller/QcodeInfoController.java | 4 +-
src/main/java/com/nmgs/util/main.java | 1 +
3 files changed, 87 insertions(+), 61 deletions(-)
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 @@
-
-
+
-
-
-
-
+
+
@@ -72,58 +69,58 @@
- {
+ "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/springcloud_mybatisplus",
+ "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"
},
- "keyToStringList": {
- "DatabaseDriversLRU": [
- "oracle"
+ "keyToStringList": {
+ "DatabaseDriversLRU": [
+ "oracle"
]
}
-}]]>
+}
@@ -146,7 +143,20 @@
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -358,6 +368,11 @@
+
+
+
+
@@ -527,7 +542,8 @@
-
+
+
@@ -681,7 +697,15 @@
1733293115770
-
+
+
+ 1734053883415
+
+
+
+ 1734053883415
+
+
@@ -712,7 +736,8 @@
-
+
+
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 removeContent(@RequestParam("content") String content){
+ public ResultData 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));