diff --git a/center.manager/src/test/java/center/manager/test/user/DeadLockTest.java b/center.manager/src/test/java/center/manager/test/user/DeadLockTest.java new file mode 100644 index 0000000..d402197 --- /dev/null +++ b/center.manager/src/test/java/center/manager/test/user/DeadLockTest.java @@ -0,0 +1,43 @@ +package center.manager.test.user; +public class DeadLockTest implements Runnable { + private int flag; + static Object o1 = new Object(), o2 = new Object(); // 静态的对象,被DeadLockTest的所有实例对象所公用 + + public void run() { + + System.out.println(flag); + if (flag == 0) { + synchronized (o1) { + try { + Thread.sleep(500); + } catch (Exception e) { + e.printStackTrace(); + } + synchronized (o2) { + } + } + } + if (flag == 1) { + synchronized (o2) { + try { + Thread.sleep(500); + } catch (Exception e) { + e.printStackTrace(); + } + synchronized (o1) { + } + } + } + } + + public static void main(String[] args) { + DeadLockTest test1 = new DeadLockTest(); + DeadLockTest test2 = new DeadLockTest(); + test1.flag = 1; + test2.flag = 0; + Thread thread1 = new Thread(test1); + Thread thread2 = new Thread(test2); + thread1.start(); + thread2.start(); + } +} \ No newline at end of file diff --git a/core.sdk/src/main/java/com/lyms/sycn/channel/ChannelData.java b/core.sdk/src/main/java/com/lyms/sycn/channel/ChannelData.java index 8ac9cf1..fa0d710 100644 --- a/core.sdk/src/main/java/com/lyms/sycn/channel/ChannelData.java +++ b/core.sdk/src/main/java/com/lyms/sycn/channel/ChannelData.java @@ -86,6 +86,7 @@ public class ChannelData implements Serializable { * @param remoteClazz * @param remoteMethod * @param data + * {@link ChannelData#toJsonString()} * @param loop */ public ChannelData(String id, String remote, String remoteClazz, String remoteMethod, String data, boolean loop) { diff --git a/hospital.web/src/main/java/com/lyms/hospital/service/sys/SyncDataBasicService.java b/hospital.web/src/main/java/com/lyms/hospital/service/sys/SyncDataBasicService.java index bd9a98a..67c20f9 100644 --- a/hospital.web/src/main/java/com/lyms/hospital/service/sys/SyncDataBasicService.java +++ b/hospital.web/src/main/java/com/lyms/hospital/service/sys/SyncDataBasicService.java @@ -47,4 +47,5 @@ public interface SyncDataBasicService extends BaseService { public ChannelData selectOne(); public Boolean updateBasic(Serializable id); + }