From 521f00d3f07453dd8e65cc501babc8b551c22ec4 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期三, 05 八月 2020 10:59:41 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/core/ThreadHandler.java | 4 ++++
src/main/java/com/zy/core/cache/CrnConnection.java | 4 ----
src/main/java/com/zy/core/thread/CrnThread.java | 15 ++++++++++++++-
src/main/java/com/zy/core/thread/DevpThread.java | 16 ++++++++++++++--
src/main/resources/application.yml | 4 ++--
src/main/java/com/zy/core/ServerBootstrap.java | 17 +++++++++--------
6 files changed, 43 insertions(+), 17 deletions(-)
diff --git a/src/main/java/com/zy/core/ServerBootstrap.java b/src/main/java/com/zy/core/ServerBootstrap.java
index 0163c15..60b9ec3 100644
--- a/src/main/java/com/zy/core/ServerBootstrap.java
+++ b/src/main/java/com/zy/core/ServerBootstrap.java
@@ -37,16 +37,17 @@
for (Slave crn : slaveProperties.getCrn()) {
CrnThread crnThread = new CrnThread(crn);
new Thread(crnThread).start();
- CrnConnection.put(crn.getId());
+ CrnConnection.put(ThreadHandler.CRN_PREFIX + crn.getId(), crnThread);
}
}
-// // 鍒濆鍖栫珯鐐圭嚎绋�
-// if (!Cools.isEmpty(slaveProperties.getDevp())) {
-// for (Slave devo : slaveProperties.getDevp()) {
-// DevpThread devpThread = new DevpThread(crn);
-// new Thread(devpThread).start();
-// }
-// }
+
+ // 鍒濆鍖栫珯鐐圭嚎绋�
+ if (!Cools.isEmpty(slaveProperties.getDevp())) {
+ for (Slave devo : slaveProperties.getDevp()) {
+ DevpThread devpThread = new DevpThread(devo);
+ new Thread(devpThread).start();
+ }
+ }
}
diff --git a/src/main/java/com/zy/core/ThreadHandler.java b/src/main/java/com/zy/core/ThreadHandler.java
index c4911f4..ccdfe7e 100644
--- a/src/main/java/com/zy/core/ThreadHandler.java
+++ b/src/main/java/com/zy/core/ThreadHandler.java
@@ -2,6 +2,10 @@
public interface ThreadHandler {
+ String CRN_PREFIX = "CRN_";
+
+ String DEVP_PREFIX = "DEVP_";
+
void close();
}
diff --git a/src/main/java/com/zy/core/cache/CrnConnection.java b/src/main/java/com/zy/core/cache/CrnConnection.java
index 48f3d26..1123216 100644
--- a/src/main/java/com/zy/core/cache/CrnConnection.java
+++ b/src/main/java/com/zy/core/cache/CrnConnection.java
@@ -10,10 +10,6 @@
*/
public class CrnConnection {
- public static final String CRN_PREFIX = "CRN_";
-
- public static final String DEVP_PREFIX = "DEVP_";
-
private static Map<String, ThreadHandler> conContain = new ConcurrentHashMap<>();
public static void put(String key, ThreadHandler threadHandler) {
diff --git a/src/main/java/com/zy/core/thread/CrnThread.java b/src/main/java/com/zy/core/thread/CrnThread.java
index 3013dfe..a8f07c3 100644
--- a/src/main/java/com/zy/core/thread/CrnThread.java
+++ b/src/main/java/com/zy/core/thread/CrnThread.java
@@ -15,12 +15,25 @@
}
@Override
+ @SuppressWarnings("InfiniteLoopStatement")
public void run() {
+ while (true) {
+ try {
+ System.out.println("绾跨▼"+slave.getId()+"姝ｅ湪杩愯");
+
+
+
+
+ Thread.sleep(1000);
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+
+ }
}
@Override
public void close() {
-
}
}
diff --git a/src/main/java/com/zy/core/thread/DevpThread.java b/src/main/java/com/zy/core/thread/DevpThread.java
index 8f99511..8e1ee03 100644
--- a/src/main/java/com/zy/core/thread/DevpThread.java
+++ b/src/main/java/com/zy/core/thread/DevpThread.java
@@ -1,13 +1,25 @@
package com.zy.core.thread;
+import com.zy.core.Slave;
+import com.zy.core.ThreadHandler;
+
/**
* Created by vincent on 2020/8/4
*/
-public class DevpThread implements Runnable {
+public class DevpThread implements Runnable, ThreadHandler {
+
+ private Slave slave;
+
+ public DevpThread(Slave slave) {
+ this.slave = slave;
+ }
@Override
public void run() {
-
}
+ @Override
+ public void close() {
+
+ }
}
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index b43be08..41f79b8 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -41,11 +41,11 @@
ip: 192.168.1.1
port: 8888
crn[1]:
- id: 1
+ id: 2
ip: 192.168.1.1
port: 8888
crn[2]:
- id: 1
+ id: 3
ip: 192.168.1.1
port: 8888
# 绔欑偣
--
Gitblit v1.9.1