Merge remote-tracking branch 'origin/bingx' into bingx

zj

2025-05-02 01830e44921b187b448d8cce9c9a46b9ad55af43

 src/main/java/project/web/api/NewOnlineChatController.java

@@ -1,11 +1,8 @@
package project.web.api;

import java.net.URLDecoder;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.text.SimpleDateFormat;
import java.util.*;

import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;
@@ -88,7 +85,10 @@
               content = Constants.WEB_URL + "/public/showimg!showImg.action?imagePath=" + content;
            }
            map.put("content", content);
            map.put("createtime", DateUtils.format(list.get(i).getCreateTime(), "MM-dd HH:mm"));
//            map.put("createtime", DateUtils.format(list.get(i).getCreateTime(), "MM-dd HH:mm"));
            SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
            sdf.setTimeZone(TimeZone.getTimeZone("Asia/Shanghai"));
            map.put("createtime", sdf.format(list.get(i).getCreateTime()));
            map.put("delete_status", list.get(i).getDelete_status());
            data.add(map);
         }