冲突解决

hos-arbiter/src/main/java/com/yihu/hos/arbiter/configuration/ArbiterServerConfiguration.java

@@ -15,8 +15,6 @@ import java.io.IOException;
public class ArbiterServerConfiguration {
    @Value("${arbiter.central.url}")
    private String centralUrl;
    @Value("${arbiter.terminal.url}")
    private String terminalUrl;
    @Value("${arbiter.tenant.name}")
    private String tenant;
@@ -28,9 +26,6 @@ public class ArbiterServerConfiguration {
        return centralUrl;
    }
    public String getTerminalUrl() {
        return terminalUrl;
    }
    public String getTenant() {
        return tenant;

hos-arbiter/src/main/java/com/yihu/hos/arbiter/listener/ApplicationStartListener.java

@@ -6,9 +6,7 @@ import org.apache.log4j.Logger;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.ApplicationListener;
import org.springframework.context.event.ContextRefreshedEvent;
import org.springframework.stereotype.Component;
@Component
public class ApplicationStartListener implements ApplicationListener<ContextRefreshedEvent> {
    private static Logger logger = LogManager.getLogger(ApplicationStartListener.class);

hos-arbiter/src/main/java/com/yihu/hos/arbiter/services/ArbiterServerService.java

@@ -35,15 +35,6 @@ public class ArbiterServerService {
        this.configuration = configuration;
    }
    public void start() {
        ArbiterServer arbiterServer = new ArbiterServer();
        arbiterServer.setTenant(configuration.getTenant());
        arbiterServer.setUrl(configuration.getTerminalUrl());
        this.save(arbiterServer);
    }
    public void save(ArbiterServer arbiterServer) {
        Query query = new Query();
        query.addCriteria(Criteria.where("tenant").is(arbiterServer.getTenant()));

hos-arbiter/src/main/resources/META-INF/additional-spring-configuration-metadata.json

@@ -10,11 +10,6 @@
      "type": "java.lang.String",
      "description": "Description for arbiter.central.url."
    },
    {
      "name": "arbiter.terminal.url",
      "type": "java.lang.String",
      "description": "Description for arbiter.terminal.url."
    },
    {
      "name": "arbiter.tenant.name",
      "type": "java.lang.String",