diff --git a/parent/center.manager/src/main/resources/xml/app-timer.xml b/parent/center.manager/src/main/resources/xml/app-timer.xml
index b588b51..e5bc983 100644
--- a/parent/center.manager/src/main/resources/xml/app-timer.xml
+++ b/parent/center.manager/src/main/resources/xml/app-timer.xml
@@ -14,7 +14,7 @@
-
+
diff --git a/parent/center.manager/src/test/java/center/manager/test/user/WorkTest.java b/parent/center.manager/src/test/java/center/manager/test/user/WorkTest.java
index de85451..61c8cf8 100644
--- a/parent/center.manager/src/test/java/center/manager/test/user/WorkTest.java
+++ b/parent/center.manager/src/test/java/center/manager/test/user/WorkTest.java
@@ -4,6 +4,7 @@ import org.apache.commons.lang3.builder.ToStringBuilder;
import org.junit.Test;
import org.springframework.beans.factory.annotation.Autowired;
+import com.lyms.sync.ParamsAdpter;
import com.lyms.sync.SyncCallback;
import com.lyms.sync.SyncCenter;
import com.lyms.sync.channel.ChannelData;
@@ -32,7 +33,7 @@ public class WorkTest extends BaseTest {
@Test
public void pushFix() {
String id = StrUtils.uuid();
- String remote = "http://127.0.0.1:9090/hospital.web/remote/sycn";
+ String remote = "http://127.0.0.1:8080/hospital.web/remote/sycn";
String remoteClazz = "com.lyms.hospital.service.sys.impl.SyncDataBasicServiceImpl";
String remoteMethod = "selectOne";
center.pushFix(id, remote, remoteClazz, remoteMethod, null);
@@ -55,6 +56,7 @@ public class WorkTest extends BaseTest {
// 参数构建如下注释方式
// ParamsAdpter adpter =
// ParamsAdpter.builder().push(null).push(null).push(null);;
+ //ParamsAdpter adpter = ParamsAdpter.builder().push("ddd").push(User)
center.pushFix(id, remote, remoteClazz, remoteMethod, null);
}
diff --git a/parent/core.sdk/src/main/java/com/lyms/sync/SyncCenter.java b/parent/core.sdk/src/main/java/com/lyms/sync/SyncCenter.java
index 18f3ef3..5a9889c 100644
--- a/parent/core.sdk/src/main/java/com/lyms/sync/SyncCenter.java
+++ b/parent/core.sdk/src/main/java/com/lyms/sync/SyncCenter.java
@@ -54,7 +54,7 @@ public class SyncCenter {
*
修改时间:
*/
public boolean pushFix(String id, String remote, String remoteClazz, String remoteMethod, ParamsAdpter adpter) {
- ChannelData data = new ChannelData(id, remote, remoteClazz, remoteMethod, adpter.toJsonString(), true);
+ ChannelData data = new ChannelData(id, remote, remoteClazz, remoteMethod, adpter ==null ? null :adpter.toJsonString(), true);
int tag = 0;
@@ -202,6 +202,7 @@ public class SyncCenter {
* 修改时间:
*/
public void backPressure() {
+ //TODO tag++ >>handl
if (data == null)
return;
this.push(data, new SyncCallback() {
diff --git a/parent/core.sdk/src/main/java/com/lyms/sync/SyncHandler.java b/parent/core.sdk/src/main/java/com/lyms/sync/SyncHandler.java
index 61b809c..30bb992 100644
--- a/parent/core.sdk/src/main/java/com/lyms/sync/SyncHandler.java
+++ b/parent/core.sdk/src/main/java/com/lyms/sync/SyncHandler.java
@@ -90,6 +90,7 @@ public class SyncHandler {
}
}
+ //userService.addUser(null,id,User user);
// System.out.println(ToStringBuilder.reflectionToString(objs));
return method.invoke(object, objs);
diff --git a/parent/core.sdk/src/main/java/com/lyms/sync/queue/SyncQueue.java b/parent/core.sdk/src/main/java/com/lyms/sync/queue/SyncQueue.java
index d022e3c..1e82d3a 100644
--- a/parent/core.sdk/src/main/java/com/lyms/sync/queue/SyncQueue.java
+++ b/parent/core.sdk/src/main/java/com/lyms/sync/queue/SyncQueue.java
@@ -81,6 +81,7 @@ public class SyncQueue {
// 添加锁
try {
if (Fix_Lock.acquireLock(LOCK_FIXATION_NAME, WAIT_LOCK_TIME)) {
+ //renwu
ChannelData obj = (ChannelData) template.opsForList().rightPopAndLeftPush(FIXATION_WORK, FIXATION_WORK);
return obj;
}