From 599f08b6171a59b70ca7615652871d6bdbbeed46 Mon Sep 17 00:00:00 2001 From: "Ken.xu" Date: Sun, 12 Mar 2023 21:26:04 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E5=AF=B9ThreadLocal=E8=BF=9B=E8=A1=8C?= =?UTF-8?q?=E5=A4=9A=E7=BA=BF=E7=A8=8B=E4=BC=98=E5=8C=96=EF=BC=8C=E8=A7=A3?= =?UTF-8?q?=E5=86=B3=E9=AB=98=E5=B9=B6=E5=8F=91=E4=B8=8Bput=E5=AF=B9?= =?UTF-8?q?=E8=B1=A1=E5=88=9B=E5=BB=BA=E5=A4=9A=E6=AC=A1=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 --- .../com/mdd/admin/LikeAdminThreadLocal.java | 36 ++++++++++--------- 1 file changed, 20 insertions(+), 16 deletions(-) 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 f827b858..f47121b2 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,20 +20,23 @@ 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); - } + /** + * 写入本地线程 + */ + public static void put(String key, Object val) { + 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); + } /** * 获取本地线程 -- Gitee From 1782a6807b684f5df9fb4675a544c98265c81690 Mon Sep 17 00:00:00 2001 From: "Ken.xu" Date: Sun, 12 Mar 2023 21:29:57 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E6=A0=BC=E5=BC=8F?= =?UTF-8?q?=E5=8C=96=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/mdd/admin/LikeAdminThreadLocal.java | 24 +++++++++---------- 1 file changed, 12 insertions(+), 12 deletions(-) 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 f47121b2..f2243079 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 @@ -22,21 +22,21 @@ public class LikeAdminThreadLocal { */ private static final java.lang.ThreadLocal> MY_LOCAL = new java.lang.ThreadLocal<>(); - /** - * 写入本地线程 - */ - public static void put(String key, Object val) { - Map map = MY_LOCAL.get(); + /** + * 写入本地线程 + */ + public static void put(String key, Object val) { + Map map = MY_LOCAL.get(); + if (map == null) { + synchronized (MY_LOCAL) { if (map == null) { - synchronized (MY_LOCAL) { - if (map == null) { - map = new ConcurrentSkipListMap<>(); - } - } + map = new ConcurrentSkipListMap<>(); } - map.put(key, val); - MY_LOCAL.set(map); + } } + map.put(key, val); + MY_LOCAL.set(map); + } /** * 获取本地线程 -- Gitee From ab115a76cf51960dc9b3c1bbdd09c7fa06cbf341 Mon Sep 17 00:00:00 2001 From: "Ken.xu" Date: Sun, 12 Mar 2023 21:37:43 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E5=BF=BD=E7=95=A5=E5=90=84=E7=A7=8D?= =?UTF-8?q?=E5=BC=80=E5=8F=91=E5=B7=A5=E5=85=B7=E7=94=9F=E6=88=90=E7=9A=84?= =?UTF-8?q?=E4=B8=B4=E6=97=B6=E6=96=87=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- server/.gitignore | 37 ++++++++++++++++++++++++++++++++++--- 1 file changed, 34 insertions(+), 3 deletions(-) diff --git a/server/.gitignore b/server/.gitignore index 1207ff5f..ec4f62b4 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 -- Gitee