diff --git a/server/.gitignore b/server/.gitignore index 1207ff5f450a9aed5803b285b9c5f0ed58827040..ec4f62b498d1eec6613043576cbc5c505035b097 100644 --- a/server/.gitignore +++ b/server/.gitignore @@ -1,4 +1,35 @@ -/.idea -/.vscode +HELP.md /target/ -/likeadmin-java.iml +/**/target/ +!.mvn/wrapper/maven-wrapper.jar + +### STS ### +.apt_generated +.classpath +.factorypath +.project +.settings +.springBeans +.sts4-cache + +### IntelliJ IDEA ### +.idea +*.iws +*.iml +*.ipr + +### NetBeans ### +/nbproject/private/ +/nbbuild/ +/dist/ +/nbdist/ +/.nb-gradle/ +/build/ + +### VS Code ### +.vscode/ +rebel-remote.xml +rebel.xml + +### customize ### +/likeadmin-java.iml \ No newline at end of file diff --git a/server/like-admin/src/main/java/com/mdd/admin/LikeAdminThreadLocal.java b/server/like-admin/src/main/java/com/mdd/admin/LikeAdminThreadLocal.java index f827b858e918ef16c52005593fc57a6a8e495034..f224307978220b84ff187d0d980389bdd947dfd1 100644 --- a/server/like-admin/src/main/java/com/mdd/admin/LikeAdminThreadLocal.java +++ b/server/like-admin/src/main/java/com/mdd/admin/LikeAdminThreadLocal.java @@ -1,10 +1,11 @@ package com.mdd.admin; -import com.mdd.common.util.ArrayUtils; - import java.util.Collections; -import java.util.LinkedHashMap; import java.util.List; +import java.util.Map; +import java.util.concurrent.ConcurrentSkipListMap; + +import com.mdd.common.util.ArrayUtils; /** * 本地线程 @@ -19,19 +20,22 @@ public class LikeAdminThreadLocal { /** * 取得本地线程对象 */ - private static final java.lang.ThreadLocal> MY_LOCAL = new java.lang.ThreadLocal<>(); + private static final java.lang.ThreadLocal> MY_LOCAL = new java.lang.ThreadLocal<>(); /** * 写入本地线程 */ public static void put(String key, Object val) { - LinkedHashMap map = MY_LOCAL.get(); - if (map == null) { - map = new LinkedHashMap<>(); - } - - map.put(key, val); - MY_LOCAL.set(map); + Map map = MY_LOCAL.get(); + if (map == null) { + synchronized (MY_LOCAL) { + if (map == null) { + map = new ConcurrentSkipListMap<>(); + } + } + } + map.put(key, val); + MY_LOCAL.set(map); } /**