elasticsearch相关的放入同一个package中

pom.xml

@@ -105,16 +105,6 @@
 		    <optional>true</optional> <!-- 这个需要为 true 热部署才有效 -->
 		</dependency>
 		
-		<!-- <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-data-elasticsearch</artifactId>
-        </dependency>
-        <dependency>
-		    <groupId>org.springframework.data</groupId>
-		    <artifactId>spring-data-elasticsearch</artifactId>
-		    <version>3.1.2.RELEASE</version>
-		</dependency>  -->
-		
 		<!-- https://mvnrepository.com/artifact/org.elasticsearch/elasticsearch -->
         <dependency>
             <groupId>org.elasticsearch</groupId>

src/main/java/com/gzzn/omms/adminapi/controller/settings/UISettingsController.java

@@ -20,16 +20,16 @@ import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
 import com.alibaba.fastjson.JSONObject;
-import com.gzzn.omms.adminapi.domain.elasticsearch.UserOptLog;
 import com.gzzn.omms.adminapi.domain.primary.dao.settings.UisettingsDao;
 import com.gzzn.omms.adminapi.domain.primary.entity.settings.Uisettings;
 import com.gzzn.omms.adminapi.dto.ResponseDto;
 import com.gzzn.omms.adminapi.dto.settings.UisettingsDto;
 import com.gzzn.omms.adminapi.dto.settings.convert.UisettingsConvert;
-import com.gzzn.omms.adminapi.enums.CommCode;
+import com.gzzn.omms.adminapi.elasticsearch.CommCode;
+import com.gzzn.omms.adminapi.elasticsearch.ElasticsearchUtil;
+import com.gzzn.omms.adminapi.elasticsearch.UserOptLog;
 import com.gzzn.omms.adminapi.service.IUserService;
 import com.gzzn.omms.adminapi.utils.CommonUtils;
-import com.gzzn.omms.adminapi.utils.ElasticsearchUtil;
 import com.gzzn.omms.adminapi.utils.JsonUtil;
 
 @RestController

src/main/java/com/gzzn/omms/adminapi/elasticsearch/CommCode.java

@@ -1,4 +1,4 @@
-package com.gzzn.omms.adminapi.enums;
+package com.gzzn.omms.adminapi.elasticsearch;
 
 public class CommCode {
 	/**

src/main/java/com/gzzn/omms/adminapi/elasticsearch/ElasticsearchConfig.java

@@ -1,4 +1,4 @@
-package com.gzzn.omms.adminapi.config;
+package com.gzzn.omms.adminapi.elasticsearch;
 
 import java.net.InetAddress;
 

src/main/java/com/gzzn/omms/adminapi/elasticsearch/ElasticsearchUtil.java

@@ -1,8 +1,9 @@
-package com.gzzn.omms.adminapi.utils;
+package com.gzzn.omms.adminapi.elasticsearch;
 
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
+import java.util.UUID;
 
 import javax.annotation.PostConstruct;
 
@@ -31,7 +32,6 @@ import org.springframework.stereotype.Component;
 import org.springframework.util.StringUtils;
 
 import com.alibaba.fastjson.JSONObject;
-import com.gzzn.omms.adminapi.dto.EsPage;
 
 @Component
 public class ElasticsearchUtil {
@@ -136,7 +136,7 @@ public class ElasticsearchUtil {
      * @return
      */
     public static String addData(JSONObject jsonObject, String index, String type) {
-        return addData(jsonObject, index, type, CommonUtils.getUUID32());
+        return addData(jsonObject, index, type, ElasticsearchUtil.getUUID32());
     }
 
     /**
@@ -361,4 +361,9 @@ public class ElasticsearchUtil {
         }
         return sourceList;
     }
+    
+    private static String getUUID32(){
+	    String uuid = UUID.randomUUID().toString().replace("-", "").toLowerCase();
+	    return uuid;
+	}
 }

src/main/java/com/gzzn/omms/adminapi/elasticsearch/EsPage.java

@@ -1,4 +1,4 @@
-package com.gzzn.omms.adminapi.dto;
+package com.gzzn.omms.adminapi.elasticsearch;
 
 import java.util.List;
 import java.util.Map;

src/main/java/com/gzzn/omms/adminapi/elasticsearch/UserOptLog.java

@@ -1,4 +1,4 @@
-package com.gzzn.omms.adminapi.domain.elasticsearch;
+package com.gzzn.omms.adminapi.elasticsearch;
 
 import lombok.Data;
 import lombok.NoArgsConstructor;