MOD: update console backend

didi · Dec 30, 2018 · d5b4b89 · d5b4b89
1 parent 35addef
commit d5b4b89
Show file tree

Hide file tree

Showing 27 changed files with 64 additions and 571 deletions.
diff --git a/carrera-console/carrera-console/pom.xml b/carrera-console/carrera-console/pom.xml
@@ -15,12 +15,11 @@
         <project.build.jdk>1.8</project.build.jdk>
         <plugin.maven-compiler>3.6.1</plugin.maven-compiler>
 
-        <junit-version>4.9</junit-version>
         <mybatis-generator-version>1.3.2</mybatis-generator-version>
         <druid-version>1.0.31</druid-version>
         <mybatis-version>3.4.1</mybatis-version>
         <mybatis-spring-version>1.3.0</mybatis-spring-version>
-        <spring-version>4.2.1.RELEASE</spring-version>
+        <spring-version>4.3.18.RELEASE</spring-version>
         <servlet-api-version>7.0.30</servlet-api-version>
         <mysql-connector-version>5.1.44</mysql-connector-version>
         <httpclient.version>4.2.5</httpclient.version>
@@ -30,12 +29,6 @@
     </properties>
 
     <dependencies>
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <version>${junit-version}</version>
-            <scope>test</scope>
-        </dependency>
         <dependency>
             <groupId>com.alibaba</groupId>
             <artifactId>druid</artifactId>
@@ -165,7 +158,7 @@
         <dependency>
             <groupId>com.fasterxml.jackson.core</groupId>
             <artifactId>jackson-databind</artifactId>
-            <version>2.8.0</version>
+            <version>2.8.11.1</version>
         </dependency>
         <dependency>
             <groupId>com.fasterxml.jackson.core</groupId>
@@ -195,31 +188,19 @@
                     <groupId>org.apache.logging.log4j</groupId>
                     <artifactId>log4j-slf4j-impl</artifactId>
                 </exclusion>
-                <exclusion>
-                    <groupId>io.netty</groupId>
-                    <artifactId>netty-all</artifactId>
-                </exclusion>
             </exclusions>
         </dependency>
 
+        <dependency>
+            <groupId>commons-fileupload</groupId>
+            <artifactId>commons-fileupload</artifactId>
+            <version>1.3.3</version>
+            </dependency>
         <dependency>
             <groupId>org.yaml</groupId>
             <artifactId>snakeyaml</artifactId>
             <version>1.17</version>
         </dependency>
-
-        <dependency>
-            <groupId>org.apache.zookeeper</groupId>
-            <artifactId>zookeeper</artifactId>
-            <version>3.4.9</version>
-            <exclusions>
-                <exclusion>
-                    <groupId>org.slf4j</groupId>
-                    <artifactId>slf4j-log4j12</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>
-
         <dependency>
             <groupId>com.google.guava</groupId>
             <artifactId>guava</artifactId>
@@ -230,52 +211,17 @@
             <artifactId>commons-collections4</artifactId>
             <version>4.1</version>
         </dependency>
-
         <dependency>
             <groupId>org.hibernate</groupId>
             <artifactId>hibernate-validator</artifactId>
             <version>5.0.2.Final</version>
         </dependency>
-
-        <dependency>
-            <groupId>commons-fileupload</groupId>
-            <artifactId>commons-fileupload</artifactId>
-            <version>1.2.2</version>
-        </dependency>
-
         <dependency>
             <groupId>com.alibaba</groupId>
             <artifactId>fastjson</artifactId>
             <version>1.2.36</version>
         </dependency>
 
-        <!-- dependency for http -->
-        <dependency>
-            <groupId>org.apache.httpcomponents</groupId>
-            <artifactId>httpclient</artifactId>
-            <version>${httpclient.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.httpcomponents</groupId>
-            <artifactId>httpcore</artifactId>
-            <version>${httpclient.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.httpcomponents</groupId>
-            <artifactId>httpmime</artifactId>
-            <version>${httpclient.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.httpcomponents</groupId>
-            <artifactId>httpclient-cache</artifactId>
-            <version>${httpclient.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.httpcomponents</groupId>
-            <artifactId>fluent-hc</artifactId>
-            <version>${httpclient.version}</version>
-        </dependency>
-
         <!-- LOGGING begin -->
         <!-- slf4j -->
         <dependency>
@@ -327,12 +273,6 @@
             <scope>runtime</scope>
         </dependency>
         <!-- LOGGING end -->
-
-        <dependency>
-            <groupId>org.asynchttpclient</groupId>
-            <artifactId>async-http-client</artifactId>
-            <version>2.0.32</version>
-        </dependency>
     </dependencies>
 
     <profiles>

diff --git a/...era-console/carrera-console/src/main/java/com/didi/carrera/console/dao/dict/NodeType.java b/...era-console/carrera-console/src/main/java/com/didi/carrera/console/dao/dict/NodeType.java
@@ -5,7 +5,6 @@
 
 
 public enum NodeType {
-    DEFAULT((byte)0, "default"),
 
     ROCKETMQ_BROKER_MASTER((byte)1, "rocketmq broker master"),
 
@@ -15,8 +14,6 @@ public enum NodeType {
 
     CONSUMER_PROXY((byte)4, "consumer proxy"),
 
-    CONSUME_HTTP_PROXY((byte)8, "consume http proxy"),
-
     ROCKETMQ_BROKER_SLAVE((byte)9, "rocketmq broker slave");
 
     private byte index;

diff --git a/...onsole/carrera-console/src/main/java/com/didi/carrera/console/service/ClusterService.java b/...onsole/carrera-console/src/main/java/com/didi/carrera/console/service/ClusterService.java
@@ -1,7 +1,6 @@
 package com.didi.carrera.console.service;
 
 import com.didi.carrera.console.dao.model.Cluster;
-import com.didi.carrera.console.web.ConsoleBaseResponse;
 
 import java.util.List;
 import java.util.Map;
@@ -15,9 +14,5 @@ public interface ClusterService {
 
     List<Cluster> findAll();
 
-    void updateIdcName(Long idcId, String idcName);
-
     Map<Long, Cluster> findMap();
-
-    ConsoleBaseResponse<?> initIdc() throws Exception;
 }
diff --git a/...e/carrera-console/src/main/java/com/didi/carrera/console/service/ConsumeGroupService.java b/...e/carrera-console/src/main/java/com/didi/carrera/console/service/ConsumeGroupService.java
@@ -41,8 +41,6 @@ public interface ConsumeGroupService {
 
     ConsoleBaseResponse<?> delete(String user, Long groupId) throws Exception;
 
-    boolean isHttpCluster(ConsumeGroup groupInfo);
-
     void insertOrUpdate(ConsumeGroup group);
 
 }
diff --git a/...ra-console/src/main/java/com/didi/carrera/console/service/ConsumeSubscriptionService.java b/...ra-console/src/main/java/com/didi/carrera/console/service/ConsumeSubscriptionService.java
@@ -4,6 +4,7 @@
 import com.didi.carrera.console.dao.model.custom.CustomConsumeSubscription;
 import com.didi.carrera.console.dao.model.custom.CustomSubscriptionStateCount;
 import com.didi.carrera.console.service.bean.PageModel;
+import com.didi.carrera.console.service.exception.ZkConfigException;
 import com.didi.carrera.console.service.vo.SearchItemVo;
 import com.didi.carrera.console.service.vo.SubscriptionOrderListVo;
 import com.didi.carrera.console.web.ConsoleBaseResponse;
@@ -52,8 +53,6 @@ public interface ConsumeSubscriptionService {
 
     ConsoleBaseResponse<List<SearchItemVo>> findMsgPushType(String user);
 
-    void initConsumeSubscriptionConfig() throws Exception;
-
     List<ConsumeSubscription> findAll();
 
     ConsoleBaseResponse<?> addCProxy(String clusterName, String host) throws Exception;

diff --git a/...ra-console/carrera-console/src/main/java/com/didi/carrera/console/service/IdcService.java b/...ra-console/carrera-console/src/main/java/com/didi/carrera/console/service/IdcService.java
@@ -1,21 +1,11 @@
 package com.didi.carrera.console.service;
 
-import java.util.List;
-import java.util.Map;
-
 import com.didi.carrera.console.dao.model.Idc;
-import com.didi.carrera.console.web.ConsoleBaseResponse;
-import com.didi.carrera.console.web.controller.bo.IdcBo;
 
+import java.util.Map;
 
-public interface IdcService {
-    Idc findById(Long id);
-
-    Idc findByName(String name);
-
-    List<Idc> findAll();
 
-    ConsoleBaseResponse<Long> create(IdcBo idcBo) throws Exception;
+public interface IdcService {
 
     Map<Long, Idc> findMap();
 

diff --git a/...a-console/carrera-console/src/main/java/com/didi/carrera/console/service/NodeService.java b/...a-console/carrera-console/src/main/java/com/didi/carrera/console/service/NodeService.java
@@ -16,17 +16,12 @@ public interface NodeService {
 
     List<Node> findByClusterIdNodeType(Long clusterId, NodeType nodeType);
 
-    List<Node> findByClusterIdNodeType(Long clusterId, List<NodeType> nodeType);
-
     List<Node> findByHostNodeType(String host, NodeType nodeType);
 
     List<Node> findByClusterHostNodeType(Long clusterId, String host, NodeType nodeType);
 
-    List<Node> findByHostNodeType(String host, List<NodeType> nodeTypes);
-
     ConsoleBaseResponse<?> create(NodeBo bo) throws Exception;
 
     List<Node> findAll();
 
-    boolean isSupportHttpCluster(Long clusterId);
 }
diff --git a/...sole/carrera-console/src/main/java/com/didi/carrera/console/service/TopicConfService.java b/...sole/carrera-console/src/main/java/com/didi/carrera/console/service/TopicConfService.java
@@ -24,8 +24,6 @@ public interface TopicConfService {
 
     boolean deleteByIds(List<Long> configIds);
 
-    void updateIdcName(Long idcId, String idcName);
-
     List<TopicConf> findAll();
 
     List<Long> findTopicByClusterIdWithDeleted(Long clusterId);

diff --git a/...-console/carrera-console/src/main/java/com/didi/carrera/console/service/TopicService.java b/...-console/carrera-console/src/main/java/com/didi/carrera/console/service/TopicService.java
@@ -44,8 +44,6 @@ public interface TopicService {
     ConsoleBaseResponse<TopicMessageVo> findMessage(String user, Long topicId, Long clusterId);
 
     ConsoleBaseResponse<TopicOrderVo> findVoById(Long topicId);
-
-    void initTopicConfIdc() throws Exception;
 
     ConsoleBaseResponse<?> addPProxy(String clusterName, String host) throws Exception;
     ConsoleBaseResponse<?> addPProxy(String topicName, String clusterName, String host) throws Exception;

diff --git a/...ole/carrera-console/src/main/java/com/didi/carrera/console/service/ZKV4ConfigService.java b/...ole/carrera-console/src/main/java/com/didi/carrera/console/service/ZKV4ConfigService.java
@@ -3,6 +3,7 @@
 import java.util.Set;
 
 import com.didi.carrera.console.dao.model.ConsumeSubscription;
+import com.didi.carrera.console.service.exception.ZkConfigException;
 import com.didi.carrera.console.web.ConsoleBaseResponse;
 import com.xiaojukeji.carrera.config.v4.GroupConfig;
 import com.xiaojukeji.carrera.config.v4.cproxy.UpstreamTopic;

diff --git a/...console/service/ConvertDataException.java → ...rvice/exception/ConvertDataException.java b/...console/service/ConvertDataException.java → ...rvice/exception/ConvertDataException.java
@@ -1,4 +1,4 @@
-package com.didi.carrera.console.service;
+package com.didi.carrera.console.service.exception;
 
 
 public class ConvertDataException extends Exception {

diff --git a/.../carrera/console/service/MqException.java → ...onsole/service/exception/MqException.java b/.../carrera/console/service/MqException.java → ...onsole/service/exception/MqException.java
@@ -1,4 +1,4 @@
-package com.didi.carrera.console.service;
+package com.didi.carrera.console.service.exception;
 
 
 public class MqException extends Exception {

diff --git a/...ra/console/service/ZkConfigException.java → .../service/exception/ZkConfigException.java b/...ra/console/service/ZkConfigException.java → .../service/exception/ZkConfigException.java
@@ -1,4 +1,4 @@
-package com.didi.carrera.console.service;
+package com.didi.carrera.console.service.exception;
 
 
 public class ZkConfigException extends Exception {

diff --git a/...rrera-console/src/main/java/com/didi/carrera/console/service/impl/ClusterServiceImpl.java b/...rrera-console/src/main/java/com/didi/carrera/console/service/impl/ClusterServiceImpl.java
@@ -4,18 +4,11 @@
 import com.didi.carrera.console.dao.mapper.ClusterMapper;
 import com.didi.carrera.console.dao.model.Cluster;
 import com.didi.carrera.console.dao.model.ClusterCriteria;
-import com.didi.carrera.console.dao.model.Idc;
 import com.didi.carrera.console.service.ClusterService;
-import com.didi.carrera.console.service.IdcService;
-import com.didi.carrera.console.web.ConsoleBaseResponse;
-import com.didi.carrera.console.web.controller.bo.IdcBo;
 import com.google.common.collect.Maps;
 import org.apache.commons.collections.CollectionUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Isolation;
-import org.springframework.transaction.annotation.Propagation;
-import org.springframework.transaction.annotation.Transactional;
 
 import java.util.List;
 import java.util.Map;
@@ -27,20 +20,11 @@ public class ClusterServiceImpl implements ClusterService {
     @Autowired
     private ClusterMapper clusterMapper;
 
-    @Autowired
-    private IdcService idcService;
-
     @Override
     public Cluster findById(Long clusterId) {
         return clusterMapper.selectByPrimaryKey(clusterId);
     }
 
-    private List<Cluster> findByIdcId(Long idcId) {
-        ClusterCriteria cc = new ClusterCriteria();
-        cc.createCriteria().andIdcIdEqualTo(idcId).andIsDeleteEqualTo(IsDelete.NO.getIndex());
-        return clusterMapper.selectByExample(cc);
-    }
-
     @Override
     public Cluster findByClusterName(String clusterName) {
         ClusterCriteria cc = new ClusterCriteria();
@@ -67,41 +51,4 @@ public Map<Long, Cluster> findMap() {
         findAll().forEach(cluster -> map.put(cluster.getId(), cluster));
         return map;
     }
-
-    @Override
-    @Transactional(isolation = Isolation.SERIALIZABLE, propagation = Propagation.REQUIRED, rollbackFor = Exception.class)
-    public ConsoleBaseResponse<?> initIdc() throws Exception {
-        List<Cluster> clusterList = findAll();
-        for (Cluster cluster : clusterList) {
-            Long idcId;
-            Idc idc = idcService.findByName(cluster.getIdc());
-            if (idc == null) {
-                IdcBo bo = new IdcBo(null, cluster.getIdc(), "");
-                ConsoleBaseResponse<Long> ret = idcService.create(bo);
-                if (!ret.isSuccess()) {
-                    return ret;
-                }
-                idcId = ret.getData();
-            } else {
-                idcId = idc.getId();
-            }
-
-            cluster.setIdcId(idcId);
-            clusterMapper.updateByPrimaryKeySelective(cluster);
-        }
-
-        return ConsoleBaseResponse.success();
-    }
-
-    @Override
-    public void updateIdcName(Long idcId, String idcName) {
-        List<Cluster> clusters = findByIdcId(idcId);
-        if (CollectionUtils.isEmpty(clusters)) {
-            return;
-        }
-        for (Cluster cluster : clusters) {
-            cluster.setIdc(idcName);
-            clusterMapper.updateByPrimaryKeySelective(cluster);
-        }
-    }
 }