Merge branch 'master' of http://118.89.139.230:10101/r/fg_v2.0

lxw

2023-05-23 d41ac4dcfd8254bc5db6add5b12c2fb72ccc0c39

 src/main/java/com/whyc/webSocket/taskPersonalWebSocket.java

@@ -57,9 +57,9 @@

    @OnMessage
    public void onMessage(Session session, String message) {
        //UserInf user = (UserInf) this.httpSession.getAttribute("user");
        //final int userId = user.getUId().intValue();
        final int userId = 1090;
        UserInf user = (UserInf) this.httpSession.getAttribute("user");
        final int userId = user.getUId().intValue();
        //final int userId = 1090;
        FaultUpload upload = ActionUtil.getGson().fromJson(message, FaultUpload.class);
        thread = new Thread("Thread_TaskPersonal") {
            @Override