给后端服务提供的websocket，进行消息内容修改

.idea/workspace.xml

@@ -11,7 +11,11 @@
   <component name="ChangeListManager">
     <list default="true" id="29bcb86b-1634-41e0-a498-79481163cba8" name="Changes" comment="人员认证加了一个校验">
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/nmgs/service/impl/UserTableServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/nmgs/service/impl/UserTableServiceImpl.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/nmgs/config/SubscribeListener.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/nmgs/config/SubscribeListener.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/nmgs/controller/UserController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/nmgs/controller/UserController.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/nmgs/controller/UserVehicleController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/nmgs/controller/UserVehicleController.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/nmgs/controller/WebSocketRedis.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/nmgs/controller/WebSocketRedis.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/resources/static/Sensitive.txt" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/static/Sensitive.txt" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -516,7 +520,15 @@
       <workItem from="1729670758397" duration="403000" />
       <workItem from="1729671204167" duration="1421000" />
       <workItem from="1729818658998" duration="1163000" />
-      <workItem from="1729821059331" duration="4484000" />
+      <workItem from="1729821059331" duration="4536000" />
+      <workItem from="1729846619226" duration="2510000" />
+      <workItem from="1730074494288" duration="7120000" />
+      <workItem from="1730247222398" duration="12555000" />
+      <workItem from="1730333966419" duration="1898000" />
+      <workItem from="1730769307912" duration="1589000" />
+      <workItem from="1730798249931" duration="969000" />
+      <workItem from="1730799271800" duration="752000" />
+      <workItem from="1730875183642" duration="901000" />
     </task>
     <task id="LOCAL-00001" summary="特请处理">
       <option name="closed" value="true" />
@@ -598,7 +610,15 @@
       <option name="project" value="LOCAL" />
       <updated>1729670812322</updated>
     </task>
-    <option name="localTasksCounter" value="11" />
+    <task id="LOCAL-00011" summary="人员认证加了一个校验">
+      <option name="closed" value="true" />
+      <created>1729842478482</created>
+      <option name="number" value="00011" />
+      <option name="presentableId" value="LOCAL-00011" />
+      <option name="project" value="LOCAL" />
+      <updated>1729842478482</updated>
+    </task>
+    <option name="localTasksCounter" value="12" />
     <servers />
   </component>
   <component name="TypeScriptGeneratedFilesManager">
@@ -629,11 +649,6 @@
           <line>111</line>
           <option name="timeStamp" value="34" />
         </line-breakpoint>
-        <line-breakpoint enabled="true" type="java-line">
-          <url>file://$PROJECT_DIR$/src/main/java/com/nmgs/controller/UserVehicleController.java</url>
-          <line>143</line>
-          <option name="timeStamp" value="35" />
-        </line-breakpoint>
       </breakpoints>
     </breakpoint-manager>
   </component>

src/main/java/com/nmgs/config/SubscribeListener.java

@@ -13,6 +13,7 @@ import org.springframework.stereotype.Component;
 
 import javax.websocket.Session;
 import java.io.IOException;
+import java.io.UnsupportedEncodingException;
 
 @Component
 public class SubscribeListener implements MessageListener {
@@ -37,7 +38,16 @@ public class SubscribeListener implements MessageListener {
             SpringUtil.getBean(RedisMessageListenerContainer.class);
     @Override
     public void onMessage(Message message, byte[] pattern) {
-        String msg = new String(message.getBody());
+        byte[] body = message.getBody();
+        String msg = null;
+        try {
+            msg = new String(body, "UTF-8");
+        } catch (UnsupportedEncodingException e) {
+            throw new RuntimeException(e);
+        }
+        if (msg.contains("\"")) {
+            msg = msg.replace("\"", "");
+        }
         if (ObjectUtil.isNotEmpty(session) && session.isOpen()) {
             try {
                 if(msg.contains("unSubscribe")){

src/main/java/com/nmgs/controller/UserController.java

@@ -34,6 +34,7 @@ public class UserController {
     )
     @ApiOperation(value="用户初始化注册",httpMethod = "POST")
     public ResultData<String> oathuUser(@RequestParam("openId") String openId,@RequestParam(value = "wxName",required = false) String wxName){
+        LogUtil.WriteLog_Info("用户注册开始====" + PubTools.getCurrentDate() + "====" + openId, "UserController");
         List userByOpenId = userTableService.getUserByOpenId(openId);
        if(userByOpenId != null && userByOpenId.size()>0 ){
            return ResultData.success(2,"人员已经存在");
@@ -68,7 +69,7 @@ public class UserController {
             return ResultData.fail("认证失败");
         }else if(i>0){
             //WebsocketUtil.sendCheckMessageForAll("user");
-            redisConfigUtil.publish(Consistant.USER + USERID, "user");
+            redisConfigUtil.publish("USER", "user");
             //测试取消订阅
             // redisConfigUtil.publish(Consistant.USER + USERID, "unSubscribe_" + USERID);
             return ResultData.success(1,"已提交");

src/main/java/com/nmgs/controller/UserVehicleController.java

@@ -168,8 +168,8 @@ public class UserVehicleController {
         }
         int ret = this.userVehicleService.updateUserVehicle(USERID,ACARNO,CHECKUSERNAME,CHECKUSERNUMBER,LICENSEPIC,PERMITPIC,VEHICLEPIC,CERTIFICATION,REFERRERCODE);
         if(ret >0){
-            WebsocketUtil.sendCheckMessageForAll("car");
+            // WebsocketUtil.sendCheckMessageForAll("car");
-          //  redisConfigUtil.publish(Consistant.USER + "aeb2ae994c834fd19816595c03bd08fe", "car");
+            redisConfigUtil.publish("CAR", "car");
             return ResultData.success("更新成功");
         }else{
             return ResultData.fail("更新车牌信息出错");

src/main/java/com/nmgs/controller/WebSocketRedis.java

@@ -59,7 +59,7 @@ public class WebSocketRedis {
      * @param session 可选的参数。session为与某个客户端的连接会话，需要通过它来给客户端发送数据
      */
     @OnOpen
-    public void onOpen(@PathParam("userId") String userId, Session session) {
+    public void onOpen(@PathParam("userId") String userId, Session session) throws IOException {
         System.out.println("连接websocket的人员======"+userId);
         this.session = session;
         //加入set中
@@ -70,13 +70,17 @@ public class WebSocketRedis {
         subscribeListener = new SubscribeListener();
         subscribeListener.setSession(session);
         //设置订阅topic
+       /* redisMessageListenerContainer.addMessageListener(
+                subscribeListener, new ChannelTopic(Consistant.USER + userId));*/
         redisMessageListenerContainer.addMessageListener(
-                subscribeListener, new ChannelTopic(Consistant.USER + userId));
+                subscribeListener, new ChannelTopic("USER"));
+        redisMessageListenerContainer.addMessageListener(
+                subscribeListener, new ChannelTopic("CAR"));
         JSONObject retJo=new JSONObject();
         retJo.put("code",1);
         retJo.put("msg","连接成功");
         retJo.put("data","");
-        redisConfigUtil.publish(Consistant.USER + userId,JSONObject.toJSONString(retJo));
+        this.sendMessage(session, retJo.toJSONString());
     }
 
     /**

src/main/resources/static/Sensitive.txt

@@ -1102,4 +1102,3 @@
 做爱小
 做原子弹
 做证件
-发票