更新项目名为cnf，调整代码结构

bishe-weixingsim/pom.xml → apps/cnf-app-demo/pom.xml

@@ -3,22 +3,14 @@
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
-        <artifactId>bishe</artifactId>
+        <artifactId>cnf</artifactId>
         <groupId>top.ninwoo</groupId>
         <version>1.0-SNAPSHOT</version>
+        <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
-    <artifactId>bishe-weixingsim</artifactId>
+    <artifactId>cnf-app-demo</artifactId>
 
-    <dependencies>
-        <!-- https://mvnrepository.com/artifact/org.projectlombok/lombok -->
-        <dependency>
-            <groupId>org.projectlombok</groupId>
-            <artifactId>lombok</artifactId>
-            <version>1.18.10</version>
-            <scope>provided</scope>
-        </dependency>
-    </dependencies>
 
 </project>
\ No newline at end of file

bishe-case-dis/pom.xml → apps/cnf-case-dis/pom.xml

@@ -3,13 +3,14 @@
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
-        <artifactId>bishe</artifactId>
+        <artifactId>cnf</artifactId>
         <groupId>top.ninwoo</groupId>
         <version>1.0-SNAPSHOT</version>
+        <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
-    <artifactId>bishe-case-dis</artifactId>
+    <artifactId>cnf-case-dis</artifactId>
 
     <dependencies>
         <dependency>
@@ -19,7 +20,7 @@
         </dependency>
         <dependency>
             <groupId>top.ninwoo</groupId>
-            <artifactId>bishe-client-starter</artifactId>
+            <artifactId>cnf-client-starter</artifactId>
             <version>1.0-SNAPSHOT</version>
         </dependency>
 

apps/cnf-weixingsim/pom.xml

+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <artifactId>cnf</artifactId>
+        <groupId>top.ninwoo</groupId>
+        <version>1.0-SNAPSHOT</version>
+        <relativePath>../../pom.xml</relativePath>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>cnf-weixingsim</artifactId>
+
+    <dependencies>
+        <!-- https://mvnrepository.com/artifact/org.projectlombok/lombok -->
+        <dependency>
+            <groupId>org.projectlombok</groupId>
+            <artifactId>lombok</artifactId>
+            <version>1.18.10</version>
+            <scope>provided</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-web</artifactId>
+            <version>2.1.2.RELEASE</version>
+        </dependency>
+        <dependency>
+            <groupId>top.ninwoo</groupId>
+            <artifactId>cnf-client-starter</artifactId>
+            <version>1.0-SNAPSHOT</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-test</artifactId>
+            <version>2.1.2.RELEASE</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.influxdb</groupId>
+            <artifactId>influxdb-java</artifactId>
+            <version>2.9</version>
+        </dependency>
+    </dependencies>
+
+</project>
\ No newline at end of file

apps/cnf-weixingsim/src/main/java/top/ninwoo/weixingsim/WxMain.java

+package top.ninwoo.weixingsim;
+
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+
+@SpringBootApplication
+public class WxMain {
+    public static void main(String[] args) {
+        SpringApplication.run(WxMain.class, args);
+    }
+}

apps/cnf-weixingsim/src/test/top/ninwoo/WxTests.java

+package top.ninwoo;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.test.context.junit4.SpringRunner;
+import top.ninwoo.bishe.starter.entity.ContainerMonitor;
+import top.ninwoo.bishe.starter.service.ClusterService;
+import top.ninwoo.bishe.starter.service.NetworkService;
+import top.ninwoo.common.entity.*;
+import top.ninwoo.weixingsim.WxMain;
+import top.ninwoo.weixingsim.entity.SimData;
+import top.ninwoo.weixingsim.entity.WeiXingData;
+import top.ninwoo.weixingsim.service.impl.ToponetImpl;
+import top.ninwoo.weixingsim.service.impl.WeixingImpl;
+
+import javax.annotation.Resource;
+import java.io.File;
+import java.util.ArrayList;
+import java.util.List;
+
+@RunWith(SpringRunner.class)
+@SpringBootTest(classes = WxMain.class)
+public class WxTests {
+
+    @Autowired
+    private ClusterService clusterService;
+
+    @Resource
+    private NetworkService networkService;
+
+    @Test
+    public void testSendSeparateConfig() {
+        ArrayList<SeparatedClusterConfig> clusterConfigs = new ArrayList<>();
+        SeparatedClusterConfig separatedClusterConfig = new SeparatedClusterConfig();
+        // TODO: 这个ID应该是从借口获取的
+        separatedClusterConfig.setEdgeNodeId("192.168.190.135:8081");
+        ClusterConfig clusterConfig = new ClusterConfig();
+        clusterConfig.setId(11111l);
+        clusterConfig.setOwner("joliu");
+        ContainerDescription containerDescription = new ContainerDescription();
+        containerDescription.setMode("normal");
+        containerDescription.setReplicas(2);
+        DockerContainer container = new DockerContainer();
+        container.setName("Run");
+        container.setCommand("sh");
+        container.setImage("joliu/networktest");
+        containerDescription.setDockerContainer(container);
+
+        List<ContainerDescription> cds = new ArrayList<>();
+        cds.add(containerDescription);
+
+        ContainerDescription containerDescription1 = new ContainerDescription();
+        containerDescription1.setMode("normal");
+        containerDescription1.setReplicas(3);
+        DockerContainer container1 = new DockerContainer();
+        container1.setName("APP");
+        container1.setCommand("sh");
+        container1.setImage("joliu/networktest");
+        containerDescription1.setDockerContainer(container1);
+
+        cds.add(containerDescription1);
+
+        clusterConfig.setDockers(cds);
+        NetworkTopology topo = new NetworkTopology();
+        topo.setAppNames(new String[]{"Run", "APP", "br:ovs1"});
+        // 这个参数好像没啥用
+        topo.setTopologyId(11);
+        topo.setTopology(new int[][]{{0,0,0},{0,0,0},{1,1,0}});
+        clusterConfig.setTopology(topo);
+        separatedClusterConfig.setClusterConfig(clusterConfig);
+        clusterConfigs.add(separatedClusterConfig);
+
+        clusterService.sendClusterConfigToEdgeNode(clusterConfigs);
+    }
+
+    @Test
+    public void removeClusterFromEdgeNodeTest() {
+        clusterService.removeClusterFromEdgeNode(11111L);
+    }
+
+    @Test
+    public void getLogicalNetworkTopologyTest() {
+        NetworkTopology logicalNetworkTopology = networkService.getLogicalNetworkTopology(11111L);
+        System.out.println(logicalNetworkTopology);
+    }
+
+    @Test
+    public void getIpListByAppNameTest() {
+        List<String> ipList = networkService.getIpListByAppName(11111L, "Run");
+        System.out.println(ipList);
+    }
+
+    @Test
+    public void enableNetworkMonitorTest() throws InterruptedException {
+        String res = networkService.enableNetworkMonitor(11111L, "Run");
+        System.out.println(res);
+    }
+
+    @Test
+    public void cancelNetworkMonitorTest() {
+        String run = networkService.cancelNetworkMonitor(11111L, "Run");
+        System.out.println(run);
+    }
+
+    @Test
+    public void getNetworkMonitorTest() throws InterruptedException {
+        List<ContainerMonitor> run = networkService.getContainerMonitors(11111L, "Run");
+        int i = 0;
+        while(i < 10) {
+            run.forEach(c -> {
+                System.out.println(c.getContainerInfo());
+            });
+            Thread.sleep(500);
+            i++;
+        }
+    }
+
+    //改变集群拓扑配置
+    private boolean adjustCluster(List<SeparatedClusterConfig> configs) {
+        boolean b = clusterService.adjustClusterToEdgeNode(configs);
+        return b;
+    }
+
+    //测试逻辑网路
+    @Test
+    public void test1() {
+        ArrayList<SeparatedClusterConfig> clusterConfigs = new ArrayList<>();
+        SeparatedClusterConfig separatedClusterConfig = new SeparatedClusterConfig();
+        //需修改为下发的IP地址
+        separatedClusterConfig.setEdgeNodeId("192.168.190.135:8081");
+
+        ClusterConfig clusterConfig = new ClusterConfig();
+        clusterConfig.setId(11111l);
+        clusterConfig.setOwner("joliu");
+        ContainerDescription containerDescription = new ContainerDescription();
+        containerDescription.setMode("normal");
+        containerDescription.setReplicas(1);
+        DockerContainer container = new DockerContainer();
+        container.setName("D1");
+        container.setCommand("sh");
+        container.setImage("test2");
+        containerDescription.setDockerContainer(container);
+
+        List<ContainerDescription> cds = new ArrayList<>();
+        cds.add(containerDescription);
+
+        ContainerDescription dis = new ContainerDescription();
+        dis.setMode("normal");
+        dis.setReplicas(1);
+        DockerContainer disContainer = new DockerContainer();
+        disContainer.setName("D2");
+        disContainer.setCommand("sh");
+        disContainer.setImage("test2");
+        dis.setDockerContainer(disContainer);
+        cds.add(dis);
+
+        ContainerDescription dis2 = new ContainerDescription();
+        dis2.setMode("normal");
+        dis2.setReplicas(1);
+        DockerContainer disContainer2 = new DockerContainer();
+        disContainer2.setName("D3");
+        disContainer2.setCommand("sh");
+        disContainer2.setImage("test2");
+        dis2.setDockerContainer(disContainer2);
+        cds.add(dis2);
+
+        String[] appnames = new String[]{"D1", "D2", "D3", "br:ovs"};
+        int[][] topology = new int[][]{
+                {0, 0, 0 ,0},
+                {1, 0, 0 ,0},
+                {0, 1, 0 ,0},
+                {1, 1, 1 ,0}};
+
+        clusterConfig.setDockers(cds);
+        NetworkTopology topo = new NetworkTopology();
+        topo.setAppNames(appnames);
+        // 这个参数好像没啥用
+        topo.setTopologyId(11);
+        topo.setTopology(topology);
+        clusterConfig.setTopology(topo);
+        separatedClusterConfig.setClusterConfig(clusterConfig);
+        clusterConfigs.add(separatedClusterConfig);
+
+        clusterService.sendClusterConfigToEdgeNode(clusterConfigs);
+
+        //下发逻辑拓扑
+        clusterService.sendLogicTopoToEdgeNode(clusterConfigs);
+
+        /*
+        //改变逻辑拓扑
+        int[][] newtopology = new int[][]{
+                {0, 0, 0, 0 },
+                {1, 0, 0, 0 },
+                {1, 1, 0, 0 },
+                {1, 1, 1, 0 }};
+        topo.setTopology(newtopology);
+
+        //下发修改后的逻辑拓扑
+        clusterService.adjustLogicTopoToEdgeNode(clusterConfigs);
+
+        */
+
+    }
+
+    // 测试初始化设置
+    @Test
+    public void test2() throws IllegalAccessException, InterruptedException {
+        //从文本中获取卫星的数据
+        WeixingImpl wx = new WeixingImpl();
+        ToponetImpl tp = new ToponetImpl();
+        SimData sd = new SimData();
+
+        File file = new File("C:\\WorkSpace\\test\\topusim_1.txt");
+        List<WeiXingData> wxData = wx.iniTopo(file);
+        int[][] toponet = tp.getTopology(wxData,sd);
+
+
+        ArrayList<SeparatedClusterConfig> clusterConfigs = new ArrayList<>();
+        SeparatedClusterConfig separatedClusterConfig = new SeparatedClusterConfig();
+        List<ContainerDescription> cds = new ArrayList<>();
+        // TODO: 这个ID应该是从借口获取的
+        separatedClusterConfig.setEdgeNodeId("192.168.190.135:8081");
+        ClusterConfig clusterConfig = new ClusterConfig();
+        clusterConfig.setId(11111l);
+        clusterConfig.setOwner("joliu");
+
+        //创建容器
+        for (int k = 0; k < wxData.size(); k++) {
+            ContainerDescription containerDescription = new ContainerDescription();
+            containerDescription.setMode("normal");
+            containerDescription.setReplicas(1);
+
+            DockerContainer container = new DockerContainer();
+            container.setName(wxData.get(k).getName());
+            container.setCommand("sh");
+            container.setImage("joliu/networktest");
+
+            containerDescription.setDockerContainer(container);
+            cds.add(containerDescription);
+        }
+
+        clusterConfig.setDockers(cds);
+        NetworkTopology topo = new NetworkTopology();
+        topo.setAppNames(tp.getAppNames(wxData));
+        // 这个参数好像没啥用
+        topo.setTopologyId(11);
+        topo.setTopology(toponet);
+        clusterConfig.setTopology(topo);
+        separatedClusterConfig.setClusterConfig(clusterConfig);
+        clusterConfigs.add(separatedClusterConfig);
+
+        clusterService.sendClusterConfigToEdgeNode(clusterConfigs);
+
+        //下发逻辑拓扑
+        clusterService.sendLogicTopoToEdgeNode(clusterConfigs);
+    }
+
+    //测试连续传输
+    @Test
+    public void test3() throws IllegalAccessException, InterruptedException {
+        ArrayList<SeparatedClusterConfig> clusterConfigs = new ArrayList<>();
+        SeparatedClusterConfig separatedClusterConfig = new SeparatedClusterConfig();
+        List<ContainerDescription> cds = new ArrayList<>();
+        // TODO: 这个ID应该是从借口获取的
+        separatedClusterConfig.setEdgeNodeId("192.168.190.135:8081");
+        ClusterConfig clusterConfig = new ClusterConfig();
+        clusterConfig.setId(11111l);
+        clusterConfig.setOwner("joliu");
+
+        //从文本中获取卫星的数据
+        WeixingImpl wx = new WeixingImpl();
+        ToponetImpl tp = new ToponetImpl();
+        SimData sd = new SimData();
+        //tp.delHistory();
+        File file = new File("C:\\WorkSpace\\test\\topusim_1.txt");
+        List<WeiXingData> wxData = wx.iniTopo(file);
+        int[][] toponet = tp.getTopology(wxData,sd);
+
+
+        //创建容器
+        for (int k = 0; k < wxData.size(); k++) {
+            ContainerDescription containerDescription = new ContainerDescription();
+            containerDescription.setMode("normal");
+            containerDescription.setReplicas(1);
+
+            DockerContainer container = new DockerContainer();
+            container.setName(wxData.get(k).getName());
+            container.setCommand("sh");
+            container.setImage("joliu/networktest");
+
+            containerDescription.setDockerContainer(container);
+            cds.add(containerDescription);
+        }
+
+        clusterConfig.setDockers(cds);
+        NetworkTopology topo = new NetworkTopology();
+        topo.setAppNames(tp.getAppNames(wxData));
+        // 这个参数好像没啥用
+        topo.setTopologyId(11);
+        topo.setTopology(toponet);
+        clusterConfig.setTopology(topo);
+        separatedClusterConfig.setClusterConfig(clusterConfig);
+        clusterConfigs.add(separatedClusterConfig);
+
+        clusterService.sendClusterConfigToEdgeNode(clusterConfigs);
+
+        //下发逻辑拓扑
+        clusterService.sendLogicTopoToEdgeNode(clusterConfigs);
+
+        for (int i = 1; ; i++) {
+            Thread.sleep(2000);
+            int time = i * sd.getJiange();
+            List<WeiXingData> changetp = wx.changeTopo(wxData,time);
+
+            topo.setTopology(tp.getTopology(changetp,sd));
+
+            //下发修改后逻辑拓扑
+            clusterService.adjustLogicTopoToEdgeNode(clusterConfigs);
+
+        }
+    }
+
+    //测试历史功能，需要提前定义好输出文本地址
+    @Test
+    public void test4() throws IllegalAccessException, InterruptedException {
+        ArrayList<SeparatedClusterConfig> clusterConfigs = new ArrayList<>();
+        SeparatedClusterConfig separatedClusterConfig = new SeparatedClusterConfig();
+        List<ContainerDescription> cds = new ArrayList<>();
+        // TODO: 这个ID应该是从借口获取的
+        separatedClusterConfig.setEdgeNodeId("192.168.190.135:8081");
+        ClusterConfig clusterConfig = new ClusterConfig();
+        clusterConfig.setId(11111l);
+        clusterConfig.setOwner("joliu");
+
+        //从文本中获取卫星的数据
+        WeixingImpl wx = new WeixingImpl();
+        ToponetImpl tp = new ToponetImpl();
+        SimData sd = new SimData();
+        tp.delHistory();
+        File file = new File("C:\\WorkSpace\\test\\topusim_1.txt");
+        List<WeiXingData> wxData = wx.iniTopo(file);
+        int[][] toponet = tp.getTopology(wxData,sd);
+
+
+        //创建容器
+        for (int k = 0; k < wxData.size(); k++) {
+            ContainerDescription containerDescription = new ContainerDescription();
+            containerDescription.setMode("normal");
+            containerDescription.setReplicas(1);
+
+            DockerContainer container = new DockerContainer();
+            container.setName(wxData.get(k).getName());
+            container.setCommand("sh");
+            container.setImage("joliu/networktest");
+
+            containerDescription.setDockerContainer(container);
+            cds.add(containerDescription);
+        }
+
+        clusterConfig.setDockers(cds);
+        NetworkTopology topo = new NetworkTopology();
+        topo.setAppNames(tp.getAppNames(wxData));
+        // 这个参数好像没啥用
+        topo.setTopologyId(11);
+        topo.setTopology(toponet);
+        clusterConfig.setTopology(topo);
+        separatedClusterConfig.setClusterConfig(clusterConfig);
+        clusterConfigs.add(separatedClusterConfig);
+
+        clusterService.sendClusterConfigToEdgeNode(clusterConfigs);
+
+        //下发逻辑拓扑
+        clusterService.sendLogicTopoToEdgeNode(clusterConfigs);
+
+        for (int i = 1; ; i++) {
+            Thread.sleep(2000);
+            int time = i * sd.getJiange();
+            List<WeiXingData> changetp = wx.changeTopo(wxData,time);
+
+            topo.setTopology(tp.getTopology(changetp,sd));
+
+            tp.history(topo.getAppNames(),topo.getTopology());
+            //下发修改后逻辑拓扑
+            clusterService.adjustLogicTopoToEdgeNode(clusterConfigs);
+
+        }
+    }
+
+    //测试容器运行程序
+    @Test
+    public void test5() {
+        ArrayList<SeparatedClusterConfig> clusterConfigs = new ArrayList<>();
+        SeparatedClusterConfig separatedClusterConfig = new SeparatedClusterConfig();
+        //需修改为下发的IP地址
+        separatedClusterConfig.setEdgeNodeId("192.168.190.135:8081");
+
+        ClusterConfig clusterConfig = new ClusterConfig();
+        clusterConfig.setId(11111l);
+        clusterConfig.setOwner("joliu");
+        ContainerDescription containerDescription = new ContainerDescription();
+        containerDescription.setMode("normal");
+        containerDescription.setReplicas(1);
+        DockerContainer container = new DockerContainer();
+        container.setName("D1");
+        container.setCommand("-e PARAMS=\"--name=" +container.getName()+"\"");
+        container.setImage("joliu/networktest");
+        containerDescription.setDockerContainer(container);
+
+        List<ContainerDescription> cds = new ArrayList<>();
+        cds.add(containerDescription);
+
+        ContainerDescription dis = new ContainerDescription();
+        dis.setMode("normal");
+        dis.setReplicas(1);
+        DockerContainer disContainer = new DockerContainer();
+        disContainer.setName("D2");
+        disContainer.setCommand("-e PARAMS=\"--name=" +disContainer.getName()+"\"");
+        disContainer.setImage("joliu/networktest");
+        dis.setDockerContainer(disContainer);
+        cds.add(dis);
+
+        ContainerDescription dis2 = new ContainerDescription();
+        dis2.setMode("normal");
+        dis2.setReplicas(1);
+        DockerContainer disContainer2 = new DockerContainer();
+        disContainer2.setName("D3");
+        disContainer2.setCommand("-e PARAMS=\"--name=" +disContainer2.getName()+"\"");
+        disContainer2.setImage("joliu/networktest");
+        dis2.setDockerContainer(disContainer2);
+        cds.add(dis2);
+
+        String[] appnames = new String[]{"D1", "D2", "D3", "br:ovs"};
+        int[][] topology = new int[][]{
+                {0, 0, 0 ,0},
+                {1, 0, 0 ,0},
+                {0, 1, 0 ,0},
+                {1, 1, 1 ,0}};
+
+        clusterConfig.setDockers(cds);
+        NetworkTopology topo = new NetworkTopology();
+        topo.setAppNames(appnames);
+        // 这个参数好像没啥用
+        topo.setTopologyId(11);
+        topo.setTopology(topology);
+        clusterConfig.setTopology(topo);
+        separatedClusterConfig.setClusterConfig(clusterConfig);
+        clusterConfigs.add(separatedClusterConfig);
+
+        clusterService.sendClusterConfigToEdgeNode(clusterConfigs);
+
+        //下发逻辑拓扑
+        clusterService.sendLogicTopoToEdgeNode(clusterConfigs);
+
+        /*
+        //改变逻辑拓扑
+        int[][] newtopology = new int[][]{
+                {0, 0, 0, 0 },
+                {1, 0, 0, 0 },
+                {1, 1, 0, 0 },
+                {1, 1, 1, 0 }};
+        topo.setTopology(newtopology);
+
+        //下发修改后的逻辑拓扑
+        clusterService.adjustLogicTopoToEdgeNode(clusterConfigs);
+
+        */
+
+    }
+}

bishe-client-starter/pom.xml → cnf-client-starter/pom.xml

@@ -3,13 +3,13 @@
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
-        <artifactId>bishe</artifactId>
+        <artifactId>cnf</artifactId>
         <groupId>top.ninwoo</groupId>
         <version>1.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
-    <artifactId>bishe-client-starter</artifactId>
+    <artifactId>cnf-client-starter</artifactId>
     <properties>
         <dubbo.version>2.7.4.1</dubbo.version>
     </properties>
@@ -35,7 +35,7 @@
 
         <dependency>
             <groupId>top.ninwoo</groupId>
-            <artifactId>bishe-common-api</artifactId>
+            <artifactId>cnf-common-api</artifactId>
             <version>1.0-SNAPSHOT</version>
         </dependency>
         <dependency>

bishe-cloud-center/pom.xml → cnf-cloud-center/pom.xml

@@ -3,13 +3,14 @@
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
-        <artifactId>bishe</artifactId>
+        <artifactId>cnf</artifactId>
         <groupId>top.ninwoo</groupId>
         <version>1.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
-    <artifactId>bishe-cloud-center</artifactId>
+    <artifactId>cnf-cloud-center</artifactId>
+    <packaging>jar</packaging>
 
     <description>用作集群工的汇总</description>
 
@@ -47,13 +48,13 @@
         </dependency>
         <dependency>
             <groupId>top.ninwoo</groupId>
-            <artifactId>bishe-utils</artifactId>
+            <artifactId>cnf-utils</artifactId>
             <version>1.0-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>top.ninwoo</groupId>
-            <artifactId>bishe-common-api</artifactId>
+            <artifactId>cnf-common-api</artifactId>
             <version>1.0-SNAPSHOT</version>
         </dependency>
 

bishe-cloud-ipservice/pom.xml → cnf-cloud-ipservice/pom.xml

@@ -3,19 +3,18 @@
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
-        <artifactId>bishe</artifactId>
+        <artifactId>cnf</artifactId>
         <groupId>top.ninwoo</groupId>
         <version>1.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
-    <artifactId>bishe-cloud-ipservice</artifactId>
+    <artifactId>cnf-cloud-ipservice</artifactId>
 
     <dependencies>
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-web</artifactId>
-            <version>2.1.2.RELEASE</version>
         </dependency>
     </dependencies>
 

bishe-common-api/pom.xml → cnf-common-api/pom.xml

@@ -3,13 +3,13 @@
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
-        <artifactId>bishe</artifactId>
+        <artifactId>cnf</artifactId>
         <groupId>top.ninwoo</groupId>
         <version>1.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
-    <artifactId>bishe-common-api</artifactId>
+    <artifactId>cnf-common-api</artifactId>
 
     <packaging>jar</packaging>
     <dependencies>
@@ -17,7 +17,6 @@
         <dependency>
             <groupId>org.projectlombok</groupId>
             <artifactId>lombok</artifactId>
-            <version>1.18.10</version>
             <scope>provided</scope>
         </dependency>
     </dependencies>

bishe-edge-center/pom.xml → cnf-edge-center/pom.xml

@@ -3,13 +3,13 @@
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
-        <artifactId>bishe</artifactId>
+        <artifactId>cnf</artifactId>
         <groupId>top.ninwoo</groupId>
         <version>1.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
-    <artifactId>bishe-edge-center</artifactId>
+    <artifactId>cnf-edge-center</artifactId>
 
     <dependencies>
         <dependency>
@@ -55,18 +55,16 @@
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-test</artifactId>
-            <version>2.1.2.RELEASE</version>
             <scope>test</scope>
         </dependency>
 
         <dependency>
             <groupId>top.ninwoo</groupId>
-            <artifactId>bishe-utils</artifactId>
-            <version>1.0-SNAPSHOT</version>
+            <artifactId>cnf-utils</artifactId>
         </dependency>
         <dependency>
             <groupId>top.ninwoo</groupId>
-            <artifactId>bishe-common-api</artifactId>
+            <artifactId>cnf-common-api</artifactId>
             <version>1.0-SNAPSHOT</version>
         </dependency>
 
@@ -74,27 +72,22 @@
         <dependency>
             <groupId>org.projectlombok</groupId>
             <artifactId>lombok</artifactId>
-            <version>1.18.10</version>
-            <scope>provided</scope>
         </dependency>
 
         <!-- 对zookeeper的底层api的一些封装 -->
         <dependency>
             <groupId>org.apache.curator</groupId>
             <artifactId>curator-framework</artifactId>
-            <version>2.12.0</version>
         </dependency>
         <!-- 封装了一些高级特性，如：Cache事件监听、选举、分布式锁、分布式Barrier -->
         <dependency>
             <groupId>org.apache.curator</groupId>
             <artifactId>curator-recipes</artifactId>
-            <version>2.12.0</version>
         </dependency>
 
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-actuator</artifactId>
-            <version>2.1.2.RELEASE</version>
         </dependency>
 
     </dependencies>

bishe-test/pom.xml → cnf-test/pom.xml

@@ -3,13 +3,13 @@
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
-        <artifactId>bishe</artifactId>
+        <artifactId>cnf</artifactId>
         <groupId>top.ninwoo</groupId>
         <version>1.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
-    <artifactId>bishe-test</artifactId>
+    <artifactId>cnf-test</artifactId>
 
 
     <dependencies>
@@ -20,7 +20,7 @@
         </dependency>
         <dependency>
             <groupId>top.ninwoo</groupId>
-            <artifactId>bishe-client-starter</artifactId>
+            <artifactId>cnf-client-starter</artifactId>
             <version>1.0-SNAPSHOT</version>
         </dependency>
 
@@ -37,7 +37,7 @@
         </dependency>
         <dependency>
             <groupId>top.ninwoo</groupId>
-            <artifactId>bishe-weixingsim</artifactId>
+            <artifactId>cnf-weixingsim</artifactId>
             <version>1.0-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>

bishe-utils/pom.xml → cnf-utils/pom.xml

@@ -3,13 +3,13 @@
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
-        <artifactId>bishe</artifactId>
+        <artifactId>cnf</artifactId>
         <groupId>top.ninwoo</groupId>
         <version>1.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
-    <artifactId>bishe-utils</artifactId>
+    <artifactId>cnf-utils</artifactId>
 
     <packaging>jar</packaging>
 
@@ -48,8 +48,7 @@
 
         <dependency>
             <groupId>top.ninwoo</groupId>
-            <artifactId>bishe-common-api</artifactId>
-            <version>1.0-SNAPSHOT</version>
+            <artifactId>cnf-common-api</artifactId>
         </dependency>
     </dependencies>
 

pom.xml

@@ -5,22 +5,76 @@
     <modelVersion>4.0.0</modelVersion>
 
     <groupId>top.ninwoo</groupId>
-    <artifactId>bishe</artifactId>
+    <artifactId>cnf</artifactId>
     <packaging>pom</packaging>
     <version>1.0-SNAPSHOT</version>
     <modules>
-        <module>bishe-edge-center</module>
-        <module>bishe-utils</module>
-        <module>bishe-cloud-center</module>
-        <module>bishe-common-api</module>
-        <module>bishe-cloud-ipservice</module>
-        <module>bishe-client-starter</module>
-        <module>bishe-test</module>
-        <module>bishe-case-dis</module>
-        <module>bishe-weixingsim</module>
+
+        <module>cnf-utils</module>
+        <module>cnf-common-api</module>
+        <module>cnf-cloud-ipservice</module>
+        <module>cnf-cloud-center</module>
+        <module>cnf-test</module>
+        <module>cnf-edge-center</module>
+        <module>cnf-client-starter</module>
+        <module>apps/cnf-case-dis</module>
+        <module>apps/cnf-weixingsim</module>
+        <module>apps/cnf-app-demo</module>
     </modules>
 
 
+    <properties>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+    </properties>
+
+    <dependencyManagement>
+        <dependencies>
+            <dependency>
+                <groupId>top.ninwoo</groupId>
+                <artifactId>cnf-utils</artifactId>
+                <version>1.0-SNAPSHOT</version>
+            </dependency>
+            <dependency>
+                <groupId>top.ninwoo</groupId>
+                <artifactId>cnf-common-api</artifactId>
+                <version>1.0-SNAPSHOT</version>
+            </dependency>
+
+            <dependency>
+                <groupId>org.springframework.boot</groupId>
+                <artifactId>spring-boot-starter-web</artifactId>
+                <version>2.1.2.RELEASE</version>
+            </dependency>
+            <dependency>
+                <groupId>org.springframework.boot</groupId>
+                <artifactId>spring-boot-starter-actuator</artifactId>
+                <version>2.1.2.RELEASE</version>
+            </dependency>
+            <dependency>
+                <groupId>org.springframework.boot</groupId>
+                <artifactId>spring-boot-starter-test</artifactId>
+                <version>2.1.2.RELEASE</version>
+                <scope>test</scope>
+            </dependency>
+            <dependency>
+                <groupId>org.projectlombok</groupId>
+                <artifactId>lombok</artifactId>
+                <version>1.18.10</version>
+            </dependency>
+
+            <dependency>
+                <groupId>org.apache.curator</groupId>
+                <artifactId>curator-framework</artifactId>
+                <version>2.12.0</version>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.curator</groupId>
+                <artifactId>curator-recipes</artifactId>
+                <version>2.12.0</version>
+            </dependency>
+        </dependencies>
+    </dependencyManagement>
+
     <build>
         <plugins>
             <plugin>
@@ -40,7 +94,5 @@
         </plugins>
     </build>
 
-    <properties>
-        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    </properties>
+
 </project>
\ No newline at end of file