Merge pull request #13 from xianyanglin/hango-master

fix pluginManager enable NPE

Author: trickMin

common-infra/src/main/java/org/hango/cloud/common/infra/gateway/service/impl/GatewayServiceImpl.java

@@ -114,6 +114,7 @@ public List<GatewayDto> findByName(String name, long offset, long limit) {
     @Override
     public GatewayDto getByClusterName(String clusterName) {
         HashMap<String,Object> param = Maps.newHashMap();
+        param.put("gwClusterName",clusterName);
         List<Gateway> recordsByField = gatewayDao.getRecordsByField(param);
         if (CollectionUtils.isEmpty(recordsByField)) {
             return null;

envoy-infra/src/main/java/org/hango/cloud/envoy/infra/pluginmanager/service/impl/PluginManagerServiceImpl.java

@@ -232,7 +232,7 @@ private PluginOrderDto buildPluginOrder(VirtualGatewayDto virtualGatewayDto) {
      */
     public PluginManagerDto toPluginManagerDto(PluginOrderItemDto item) {
         PluginManagerDto pluginManagerDto = new PluginManagerDto();
-        pluginManagerDto.setEnable(item.getEnable());
+        pluginManagerDto.setEnable(item.getEnable() != null && item.getEnable());
         pluginManagerDto.setName(item.getName());
         pluginManagerDto.setDisplayName(item.getName());
         return pluginManagerDto;

envoy-infra/src/main/resources/schema.sql

@@ -986,7 +986,7 @@ CREATE TABLE `hango_service_proxy` (
   `version` bigint(20) DEFAULT '0' COMMENT '版本号',
   `description` varchar(255) DEFAULT NULL COMMENT '备注',
   PRIMARY KEY (`id`)
-) ENGINE=InnoDB AUTO_INCREMENT=0 DEFAULT CHARSET=utf8 COMMENT='服务发布表';
+) ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET=utf8 COMMENT='服务发布表';