Skip to content

O
OpenXG-WIC-Cnf
Commit 16b2a979 authored by joliu's avatar joliu
Browse files
Options

Merge branch 'feature-cnf' into 'master' 

Feature cnf

See merge request xidiancos/cnf!7
parents b1cf359b 3c8e74e7
Pipeline #109 passed with stage
    in 0 seconds
    Expand all Hide whitespace changes
    Inline Side-by-side
    Showing with 897 additions and 261 deletions
    README.md
    View file @ 16b2a979
    ......@@ -17,4 +17,10 @@
    * 谢建斌
    * 王一鸣
    * 刘建瓯
    * 张夏童
    \ No newline at end of file
    * 张夏童
    ## 更新说明
    1. 使用域名替换配置中的IP，防止多人多次修改配置类并进行提交，避免合并分支时出现冲突的问题。
    如果有需要在自己的电脑上进行部署，需要通过修改本机host的方式来修改对应节点的IP。
    2. 测试代码
    \ No newline at end of file
    apps/cnf-app-demo/README.md 0 → 100644
    View file @ 16b2a979
    # 范例项目说明
    ## 注意
    这是一个范例项目，请勿在此项目中添加新的业务代码
    ## 平台应用创建流程
    1. 当需要创建一个平台应用时，需要在apps目录中创建对应的module,以便进行应用的管理。
    2. 新建module中必须包含以下依赖：
    ```xml
    <dependencies>
    <dependency>
    <groupId>org.springframework.boot</groupId>
    <artifactId>spring-boot-starter-web</artifactId>
    </dependency>
    <dependency>
    <groupId>top.ninwoo</groupId>
    <artifactId>cnf-client-starter</artifactId>
    </dependency>
    <dependency>
    <groupId>org.springframework.boot</groupId>
    <artifactId>spring-boot-starter-test</artifactId>
    <scope>test</scope>
    </dependency>
    </dependencies>
    ```
    其中的`spring-boot-starter-web`可以变更为`spring-boot-starter`，具体根据是否有web应用需求而定。
    3. 新建module必须包含以下plugin，以防止打Jar包时出现找不到主类的问题：
    ```xml
    <build>
    <plugins>
    <plugin>
    <groupId>org.springframework.boot</groupId>
    <artifactId>spring-boot-maven-plugin</artifactId>
    <version>${springboot.version}</version>
    <executions>
    <execution>
    <goals>
    <goal>repackage</goal>
    </goals>
    </execution>
    </executions>
    </plugin>
    </plugins>
    </build>
    ```
    4. 应用中必须有主类，主类应该符合SpringBoot项目的主类编写方式。
    ## 警告
    * 所有的应用禁止引用除starter之外的平台Jar包，包括：
    * cnf-cloud-center
    * cnf-edge-center
    * cnf-test
    * cnf-cloud-ipservice
    * 其他基础工具包
    apps/cnf-app-demo/pom.xml 0 → 100644
    View file @ 16b2a979
    <?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-app-demo</artifactId>
    <dependencies>
    <dependency>
    <groupId>org.springframework.boot</groupId>
    <artifactId>spring-boot-starter-web</artifactId>
    </dependency>
    <dependency>
    <groupId>top.ninwoo</groupId>
    <artifactId>cnf-client-starter</artifactId>
    </dependency>
    <dependency>
    <groupId>org.springframework.boot</groupId>
    <artifactId>spring-boot-starter-test</artifactId>
    <scope>test</scope>
    </dependency>
    </dependencies>
    <build>
    <plugins>
    <plugin>
    <groupId>org.springframework.boot</groupId>
    <artifactId>spring-boot-maven-plugin</artifactId>
    <version>${springboot.version}</version>
    <executions>
    <execution>
    <goals>
    <goal>repackage</goal>
    </goals>
    </execution>
    </executions>
    </plugin>
    </plugins>
    </build>
    </project>
    \ No newline at end of file
    apps/cnf-app-demo/src/main/java/top/ninwoo/cnf/demo/DemoMain.java 0 → 100644
    View file @ 16b2a979
    package top.ninwoo.cnf.demo;
    import org.springframework.boot.SpringApplication;
    import org.springframework.boot.autoconfigure.SpringBootApplication;
    @SpringBootApplication
    public class DemoMain {
    public static void main(String[] args) {
    SpringApplication.run(DemoMain.class, args);
    }
    }
    bishe-case-dis/pom.xml → apps/cnf-case-dis/pom.xml
    View file @ 16b2a979
    ......@@ -3,59 +3,38 @@
    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>
    <groupId>org.springframework.boot</groupId>
    <artifactId>spring-boot-starter-web</artifactId>
    <version>2.1.2.RELEASE</version>
    </dependency>
    <dependency>
    <groupId>top.ninwoo</groupId>
    <artifactId>bishe-client-starter</artifactId>
    <version>1.0-SNAPSHOT</version>
    <artifactId>cnf-client-starter</artifactId>
    </dependency>
    <dependency>
    <groupId>org.springframework.boot</groupId>
    <artifactId>spring-boot-starter-test</artifactId>
    <version>2.1.2.RELEASE</version>
    <scope>test</scope>
    </dependency>
    </dependencies>
    <build>
    <plugins>
    <plugin>
    <groupId>org.apache.maven.plugins</groupId>
    <artifactId>maven-shade-plugin</artifactId>
    <version>3.2.3</version>
    <executions>
    <execution>
    <phase>package</phase>
    <goals>
    <goal>shade</goal>
    </goals>
    <configuration>
    <transformers>
    <transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
    <mainClass>top.ninwoo.BisheTestMain</mainClass>
    </transformer>
    </transformers>
    </configuration>
    </execution>
    </executions>
    </plugin>
    <plugin>
    <groupId>org.springframework.boot</groupId>
    <artifactId>spring-boot-maven-plugin</artifactId>
    <version>${springboot.version}</version>
    <executions>
    <execution>
    <goals>
    ......
    apps/cnf-weixingsim/pom.xml 0 → 100644
    View file @ 16b2a979
    <?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>
    <scope>provided</scope>
    </dependency>
    <dependency>
    <groupId>org.springframework.boot</groupId>
    <artifactId>spring-boot-starter-web</artifactId>
    </dependency>
    <dependency>
    <groupId>top.ninwoo</groupId>
    <artifactId>cnf-client-starter</artifactId>
    </dependency>
    <dependency>
    <groupId>org.springframework.boot</groupId>
    <artifactId>spring-boot-starter-test</artifactId>
    <scope>test</scope>
    </dependency>
    <dependency>
    <groupId>org.influxdb</groupId>
    <artifactId>influxdb-java</artifactId>
    </dependency>
    </dependencies>
    <build>
    <plugins>
    <plugin>
    <groupId>org.springframework.boot</groupId>
    <artifactId>spring-boot-maven-plugin</artifactId>
    <version>${springboot.version}</version>
    <executions>
    <execution>
    <goals>
    <goal>repackage</goal>
    </goals>
    </execution>
    </executions>
    </plugin>
    </plugins>
    </build>
    </project>
    \ No newline at end of file
    apps/cnf-weixingsim/src/main/java/top/ninwoo/weixingsim/WxMain.java 0 → 100644
    View file @ 16b2a979
    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);
    }
    }
    bishe-test/src/test/java/top/ninwoo/BisheTests.java → apps/cnf-weixingsim/src/test/java/top/ninwoo/WxTests.java
    View file @ 16b2a979
    ......@@ -9,7 +9,7 @@ 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.client.BisheTestMain;
    import top.ninwoo.weixingsim.WxMain;
    import top.ninwoo.weixingsim.entity.SimData;
    import top.ninwoo.weixingsim.entity.WeiXingData;
    import top.ninwoo.weixingsim.service.impl.ToponetImpl;
    ......@@ -21,8 +21,8 @@ import java.util.ArrayList;
    import java.util.List;
    @RunWith(SpringRunner.class)
    @SpringBootTest(classes = BisheTestMain.class)
    public class BisheTests {
    @SpringBootTest(classes = WxMain.class)
    public class WxTests {
    @Autowired
    private ClusterService clusterService;
    ......
    bishe-utils/src/test/java/top/ninwoo/utils/EntityTests.java deleted 100644 → 0
    View file @ b1cf359b
    package top.ninwoo.utils;
    /**
    * @Author joliu
    * @Description
    * @Date　Create in 下午10:50 2019/10/27
    */
    public class EntityTests {
    }
    bishe-utils/src/test/java/top/ninwoo/utils/IptablesServiceTests.java deleted 100644 → 0
    View file @ b1cf359b
    package top.ninwoo.utils;
    import org.junit.runner.RunWith;
    import org.springframework.beans.factory.annotation.Autowired;
    import org.springframework.test.context.ContextConfiguration;
    import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
    import top.ninwoo.utils.config.DockerConfig;
    import top.ninwoo.utils.service.IptablesService;
    /**
    * @Author joliu
    * @Description
    * @Date　Create in 下午3:15 2019/10/30
    */
    @RunWith(SpringJUnit4ClassRunner.class)
    @ContextConfiguration(classes = DockerConfig.class)
    public class IptablesServiceTests {
    @Autowired
    IptablesService iptablesService;
    }
    bishe-utils/src/test/java/top/ninwoo/utils/SpringMain.java deleted 100644 → 0
    View file @ b1cf359b
    package top.ninwoo.utils;
    import org.springframework.context.annotation.AnnotationConfigApplicationContext;
    import top.ninwoo.utils.config.DockerConfig;
    public class SpringMain {
    public static void main(String[] args) {
    AnnotationConfigApplicationContext context =
    new AnnotationConfigApplicationContext(DockerConfig.class);
    }
    }
    bishe-utils/src/test/java/top/ninwoo/utils/TcUtilsTests.java deleted 100644 → 0
    View file @ b1cf359b
    package top.ninwoo.utils;
    import org.junit.Before;
    import org.junit.runner.RunWith;
    import org.springframework.beans.factory.annotation.Autowired;
    import org.springframework.test.context.ContextConfiguration;
    import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
    import top.ninwoo.utils.config.DockerConfig;
    import top.ninwoo.utils.util.DockerUtils;
    /**
    * @Author joliu
    * @Description 这个测试迁移到集群服务中
    * @Date　Create in 下午4:06 2019/10/30
    */
    @RunWith(SpringJUnit4ClassRunner.class)
    @ContextConfiguration(classes = DockerConfig.class)
    public class TcUtilsTests {
    @Autowired
    DockerUtils dockerUtils;
    @Before
    public void init() {
    // 创建两个容器
    // 创建一个ovs网桥
    }
    }
    bishe-weixingsim/pom.xml deleted 100644 → 0
    View file @ b1cf359b
    <?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>bishe</artifactId>
    <groupId>top.ninwoo</groupId>
    <version>1.0-SNAPSHOT</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>
    <artifactId>bishe-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>
    </dependencies>
    </project>
    \ No newline at end of file
    bishe-client-starter/pom.xml → cnf-client-starter/pom.xml
    View file @ 16b2a979
    ......@@ -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>
    <packaging>jar</packaging>
    <artifactId>bishe-client-starter</artifactId>
    <artifactId>cnf-client-starter</artifactId>
    <properties>
    <dubbo.version>2.7.4.1</dubbo.version>
    </properties>
    ......@@ -17,31 +18,26 @@
    <dependency>
    <groupId>org.springframework.boot</groupId>
    <artifactId>spring-boot-starter</artifactId>
    <version>2.1.2.RELEASE</version>
    </dependency>
    <dependency>
    <groupId>org.projectlombok</groupId>
    <artifactId>lombok</artifactId>
    <version>1.16.18</version>
    </dependency>
    <dependency>
    <groupId>org.springframework.boot</groupId>
    <artifactId>spring-boot-configuration-processor</artifactId>
    <version>2.1.2.RELEASE</version>
    <optional>true</optional>
    </dependency>
    <dependency>
    <groupId>top.ninwoo</groupId>
    <artifactId>bishe-common-api</artifactId>
    <version>1.0-SNAPSHOT</version>
    <artifactId>cnf-common-api</artifactId>
    </dependency>
    <dependency>
    <groupId>org.springframework</groupId>
    <artifactId>spring-web</artifactId>
    <version>5.2.0.RELEASE</version>
    <scope>compile</scope>
    </dependency>
    </dependencies>
    ......
    bishe-cloud-center/pom.xml → cnf-cloud-center/pom.xml
    View file @ 16b2a979
    ......@@ -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>
    ......@@ -17,7 +18,6 @@
    <dependency>
    <groupId>org.springframework.boot</groupId>
    <artifactId>spring-boot-starter-web</artifactId>
    <version>2.1.2.RELEASE</version>
    <exclusions>
    <exclusion>
    <groupId>org.springframework.boot</groupId>
    ......@@ -30,38 +30,64 @@
    <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-log4j2</artifactId>
    <version>2.1.2.RELEASE</version>
    </dependency>
    <dependency>
    <groupId>top.ninwoo</groupId>
    <artifactId>bishe-utils</artifactId>
    <version>1.0-SNAPSHOT</version>
    <artifactId>cnf-utils</artifactId>
    <exclusions>
    <exclusion>
    <groupId>org.springframework.boot</groupId>
    <artifactId>spring-boot-starter-test</artifactId>
    </exclusion>
    </exclusions>
    </dependency>
    <dependency>
    <groupId>top.ninwoo</groupId>
    <artifactId>bishe-common-api</artifactId>
    <version>1.0-SNAPSHOT</version>
    <artifactId>cnf-common-api</artifactId>
    </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>io.springfox</groupId>
    <artifactId>springfox-swagger2</artifactId>
    </dependency>
    <dependency>
    <groupId>io.springfox</groupId>
    <artifactId>springfox-swagger-ui</artifactId>
    </dependency>
    </dependencies>
    <build>
    <plugins>
    <plugin>
    <groupId>org.springframework.boot</groupId>
    <artifactId>spring-boot-maven-plugin</artifactId>
    <version>${springboot.version}</version>
    <executions>
    <execution>
    <goals>
    <goal>repackage</goal>
    </goals>
    </execution>
    </executions>
    </plugin>
    </plugins>
    </build>
    </project>
    \ No newline at end of file
    cnf-cloud-center/src/main/java/top/ninwoo/cloudcenter/config/SwaggerConfig.java 0 → 100644
    View file @ 16b2a979
    package top.ninwoo.cloudcenter.config;
    import org.springframework.context.annotation.Bean;
    import org.springframework.context.annotation.Configuration;
    import springfox.documentation.builders.ApiInfoBuilder;
    import springfox.documentation.builders.PathSelectors;
    import springfox.documentation.builders.RequestHandlerSelectors;
    import springfox.documentation.service.Contact;
    import springfox.documentation.spi.DocumentationType;
    import springfox.documentation.spring.web.plugins.Docket;
    import springfox.documentation.swagger2.annotations.EnableSwagger2;
    @Configuration
    @EnableSwagger2
    public class SwaggerConfig {
    @Bean
    public Docket createRestApi() {
    return new Docket(DocumentationType.SWAGGER_2)
    .pathMapping("/")
    .select()
    .apis(RequestHandlerSelectors.basePackage("top.ninwoo.cloudcenter.controller"))
    .paths(PathSelectors.any())
    .build().apiInfo(new ApiInfoBuilder().title("CNF云平台Swagger文档")
    .description("由Swagger自动生成，仅限测试环境使用")
    .version("1.0")
    .contact(new Contact("joliu", "opengn.org", "ljo0412@live.com"))
    .license("The Apache License")
    .licenseUrl("http://git.opensource5g.org/xidiancos/cnf/-/blob/master/LICENSE")
    .build());
    }
    }
    bishe-cloud-center/src/main/java/top/ninwoo/cloudcenter/controller/ClusterController.java → cnf-cloud-center/src/main/java/top/ninwoo/cloudcenter/controller/ClusterController.java
    View file @ 16b2a979
    package top.ninwoo.cloudcenter.controller;
    import io.swagger.annotations.*;
    import org.springframework.web.bind.annotation.*;
    import top.ninwoo.cloudcenter.service.CloudService;
    import top.ninwoo.common.entity.NetworkTopology;
    ......@@ -9,19 +10,24 @@ import javax.annotation.Resource;
    import java.util.List;
    @RestController
    @Api(tags = "容器集群管理相关接口")
    @RequestMapping("/cluster")
    public class ClusterController {
    @Resource
    CloudService cloudService;
    @RequestMapping(value = "/sendClusterConfigToEdgeNode", method = RequestMethod.POST)
    @ApiOperation("下发集群配置")
    @ApiImplicitParam(name = "clusterConfigs", value = "集群配置类", defaultValue = "", dataType = "List" ,required = true)
    @PostMapping(value = "/sendClusterConfigToEdgeNode")
    public List<SeparatedClusterConfig> sendClusterConfigToEdgeNode(@RequestBody List<SeparatedClusterConfig> clusterConfigs) {
    // return cloudService.sendClusterConfigToEdgeNode(clusterConfigs);
    return cloudService.sendClusterConfigToEdgeNodeByThreads(clusterConfigs);
    }
    @RequestMapping(value = "/removeClusterFromEdgeNode")
    @ApiOperation("删除集群")
    @ApiImplicitParam(name = "clusterId", value = "容器集群ID", defaultValue = "11111", required = true)
    @GetMapping(value = "/removeClusterFromEdgeNode")
    public String removeClusterFromEdgeNode(Long clusterId) {
    boolean res = cloudService.deleteClusterFromEdgeNode(clusterId);
    if(res) {
    ......@@ -30,22 +36,29 @@ public class ClusterController {
    return "fail";
    }
    @RequestMapping(value = "/getEdgeNodeIds")
    @ApiOperation("获取边缘节点")
    @GetMapping(value = "/getEdgeNodeIds")
    public List<String> getEdgeNodeIds() {
    return cloudService.getEdgeNodeIds();
    }
    @RequestMapping(value = "/adjustCluster", method = RequestMethod.POST)
    @ApiOperation("调整容器集群")
    @ApiImplicitParam(name = "clusterConfigs", value = "集群配置类", defaultValue = "", required = true)
    @PostMapping(value = "/adjustCluster")
    public Boolean adjustClusterToEdgeNode(@RequestBody List<SeparatedClusterConfig> clusterConfigs) {
    return cloudService.adjustCluster(clusterConfigs);
    }
    @RequestMapping(value = "/sendLogicTopo", method = RequestMethod.POST)
    @ApiOperation("下发容器逻辑拓扑")
    @ApiImplicitParam(name = "clusterConfigs", value = "集群配置类", defaultValue = "", required = true)
    @PostMapping(value = "/sendLogicTopo")
    public Boolean sendLogicTopoToEdgeNode(@RequestBody List<SeparatedClusterConfig> clusterConfigs) {
    return cloudService.sendLogicTopo(clusterConfigs);
    }
    @RequestMapping(value = "/adjustLogicTopo", method = RequestMethod.POST)
    @ApiOperation("调整容器逻辑拓扑")
    @ApiImplicitParam(name = "clusterConfigs", value = "集群配置类", defaultValue = "", required = true)
    @PostMapping(value = "/adjustLogicTopo")
    public Boolean adjustLogicTopoToEdgeNode(@RequestBody List<SeparatedClusterConfig> clusterConfigs) {
    return cloudService.adjustLogicTopo(clusterConfigs);
    }
    ......
    bishe-cloud-center/src/main/resources/application.yml → cnf-cloud-center/src/main/resources/application.yml
    View file @ 16b2a979
    ......@@ -2,10 +2,10 @@ server:
    port: 9091
    zookeeper:
    url: 192.168.31.156:2181
    url: zk.cnf.org:2181
    bs:
    cloudcenter:
    name: my-bs-cloud-center
    ipservice:
    url: 192.168.31.156:23333
    \ No newline at end of file
    url: ipservice.cnf.org:23333
    \ No newline at end of file
    bishe-cloud-ipservice/pom.xml → cnf-cloud-ipservice/pom.xml
    View file @ 16b2a979
    ......@@ -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>
    ......@@ -24,10 +23,7 @@
    <plugin>
    <groupId>org.springframework.boot</groupId>
    <artifactId>spring-boot-maven-plugin</artifactId>
    <!--这里写上main方法所在类的路径-->
    <configuration>
    <mainClass>top.ninwoo.cloud.ipservice.IpServiceMainApp</mainClass>
    </configuration>
    <version>${springboot.version}</version>
    <executions>
    <execution>
    <goals>
    ......
    bishe-common-api/pom.xml → cnf-common-api/pom.xml
    View file @ 16b2a979
    ......@@ -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,8 +17,11 @@
    <dependency>
    <groupId>org.projectlombok</groupId>
    <artifactId>lombok</artifactId>
    <version>1.18.10</version>
    <scope>provided</scope>
    </dependency>
    <dependency>
    <groupId>io.springfox</groupId>
    <artifactId>springfox-swagger2</artifactId>
    </dependency>
    </dependencies>
    </project>
    \ No newline at end of file
    bishe-common-api/src/main/java/top/ninwoo/common/entity/SeparatedClusterConfig.java → cnf-common-api/src/main/java/top/ninwoo/common/entity/SeparatedClusterConfig.java
    View file @ 16b2a979
    package top.ninwoo.common.entity;
    import io.swagger.annotations.ApiModelProperty;
    import lombok.Data;
    @Data
    public class SeparatedClusterConfig {
    @ApiModelProperty
    private ClusterConfig clusterConfig;
    @ApiModelProperty
    private String edgeNodeId;
    }
    cnf-edge-center/README.md 0 → 100644
    View file @ 16b2a979
    # 边缘承载节点
    该Module为
    \ No newline at end of file
    bishe-edge-center/pom.xml → cnf-edge-center/pom.xml
    View file @ 16b2a979
    ......@@ -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-edge-center</artifactId>
    <artifactId>cnf-edge-center</artifactId>
    <dependencies>
    <dependency>
    <groupId>org.springframework.boot</groupId>
    <artifactId>spring-boot-starter-web</artifactId>
    <version>2.1.2.RELEASE</version>
    <exclusions>
    <exclusion>
    <groupId>org.springframework.boot</groupId>
    ......@@ -26,75 +25,62 @@
    <dependency>
    <groupId>org.influxdb</groupId>
    <artifactId>influxdb-java</artifactId>
    <version>2.9</version>
    </dependency>
    <!--日志模块-->
    <dependency>
    <groupId>org.springframework.boot</groupId>
    <artifactId>spring-boot-starter-log4j2</artifactId>
    <version>2.1.2.RELEASE</version>
    </dependency>
    <dependency>
    <groupId>org.springframework.boot</groupId>
    <artifactId>spring-boot-starter-jdbc</artifactId>
    <version>2.1.2.RELEASE</version>
    </dependency>
    <dependency>
    <groupId>org.mybatis.spring.boot</groupId>
    <artifactId>mybatis-spring-boot-starter</artifactId>
    <version>1.3.5</version>
    </dependency>
    <dependency>
    <groupId>mysql</groupId>
    <artifactId>mysql-connector-java</artifactId>
    <version>8.0.11</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>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>
    <version>1.0-SNAPSHOT</version>
    <artifactId>cnf-common-api</artifactId>
    </dependency>
    <!-- https://mvnrepository.com/artifact/org.projectlombok/lombok -->
    <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>
    ......@@ -104,10 +90,7 @@
    <plugin>
    <groupId>org.springframework.boot</groupId>
    <artifactId>spring-boot-maven-plugin</artifactId>
    <!--这里写上main方法所在类的路径-->
    <configuration>
    <mainClass>top.ninwoo.edgecenter.EdgeCenterApp</mainClass>
    </configuration>
    <version>${springboot.version}</version>
    <executions>
    <execution>
    <goals>
    ......
    bishe-edge-center/src/main/java/top/ninwoo/edgecenter/check/ClusterServiceCheck.java → cnf-edge-center/src/main/java/top/ninwoo/edgecenter/check/ClusterServiceCheck.java
    View file @ 16b2a979
    ......@@ -90,11 +90,16 @@ public class ClusterServiceCheck {
    log.info("创建自检容器集群【Test1_0,Test1_1,Test2】");
    try {
    clusterService.initContainers(clusterConfig);
    topologyService.createTopo(clusterConfig.getId(), clusterConfig.getTopology());
    } catch (Exception e) {
    log.error("容器启动失败");
    throw new RuntimeException("容器启动失败");
    }
    try {
    topologyService.createTopo(clusterConfig.getId(), clusterConfig.getTopology());
    } catch (Exception e) {
    log.error("容器网络初始化失败", e);
    throw new RuntimeException("容器网络初始化失败");
    }
    if(!clusterService.getClusterIds().contains(CLUSTERID)) {
    log.error("集群创建失败%", CLUSTERID);
    }
    ......
    bishe-edge-center/src/main/java/top/ninwoo/edgecenter/config/ZookeeperConfiguration.java → cnf-edge-center/src/main/java/top/ninwoo/edgecenter/config/ZookeeperConfiguration.java
    View file @ 16b2a979
    package top.ninwoo.edgecenter.config;
    import javafx.scene.control.cell.TextFieldListCell;
    import lombok.extern.slf4j.Slf4j;
    import org.apache.curator.framework.CuratorFramework;
    import org.apache.curator.framework.CuratorFrameworkFactory;
    ......@@ -14,11 +13,9 @@ import org.springframework.context.ApplicationContext;
    import org.springframework.context.ApplicationContextAware;
    import org.springframework.context.annotation.Bean;
    import org.springframework.context.annotation.Configuration;
    import org.springframework.web.context.support.WebApplicationContextUtils;
    import top.ninwoo.edgecenter.check.ClusterServiceCheck;
    import top.ninwoo.edgecenter.register.EdgeNodeRegister;
    import javax.annotation.Resource;
    @Slf4j
    @Configuration
    public class ZookeeperConfiguration implements ApplicationContextAware {
    ......
    bishe-edge-center/src/main/resources/application.yaml → cnf-edge-center/src/main/resources/application.yaml
    View file @ 16b2a979
    ......@@ -6,7 +6,7 @@ spring:
    username: root
    password: Vudo3423ljo
    influx:
    url: http://127.0.0.1:8086
    url: http://influxdb.cnf.org:8086
    user: admin
    password: admin
    mybatis:
    ......@@ -17,7 +17,7 @@ debug: false
    #边缘节点的端口
    server:
    port: 8081
    port: 18088
    bs:
    cloudcenter:
    ......@@ -26,9 +26,12 @@ bs:
    name: random
    ip-prefix: 192.168.31
    ipservice:
    ip: 192.168.31.238:23333
    ip: ipservice.cnf.org:23333
    sdn-controller:
    host: 127.0.0.1
    host: sdn.cnf.org
    port: 6653
    zookeeper:
    url: 192.168.31.238:2181
    url: zk.cnf.org:2181
    cnf:
    passwd: Vudo3423
    bishe-test/pom.xml → cnf-test/pom.xml
    View file @ 16b2a979
    ......@@ -3,50 +3,49 @@
    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>
    <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>bishe-client-starter</artifactId>
    <version>1.0-SNAPSHOT</version>
    <artifactId>cnf-client-starter</artifactId>
    </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>
    <dependency>
    <groupId>top.ninwoo</groupId>
    <artifactId>bishe-weixingsim</artifactId>
    <version>1.0-SNAPSHOT</version>
    <scope>test</scope>
    </dependency>
    </dependencies>
    <build>
    <plugins>
    <plugin>
    <groupId>org.springframework.boot</groupId>
    <artifactId>spring-boot-maven-plugin</artifactId>
    <version>${springboot.version}</version>
    <executions>
    <execution>
    <goals>
    <goal>repackage</goal>
    </goals>
    </execution>
    </executions>
    </plugin>
    </plugins>
    </build>
    ......
    cnf-test/src/test/java/top/ninwoo/BisheTests.java 0 → 100644
    View file @ 16b2a979
    This diff is collapsed.
    bishe-utils/pom.xml → cnf-utils/pom.xml
    View file @ 16b2a979
    This diff is collapsed.
    pom.xml
    View file @ 16b2a979
    This diff is collapsed.
    Markdown is supported
    0% or
    You are about to add 0 people to the discussion. Proceed with caution.
    Finish editing this message first!
    Please register or to comment