From 5e5cd016a78409fac698eca3e5f79ffbb4eb6d78 Mon Sep 17 00:00:00 2001
From: fanghongchao <601470458@qq.com>
Date: Wed, 28 Nov 2018 11:30:48 +0800
Subject: [PATCH] =?UTF-8?q?elasticsearch=E7=9B=B8=E5=85=B3=E7=9A=84?=
 =?UTF-8?q?=E6=94=BE=E5=85=A5=E5=90=8C=E4=B8=80=E4=B8=AApackage=E4=B8=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pom.xml                                               | 10 ----------
 .../controller/settings/UISettingsController.java     |  6 +++---
 .../adminapi/{enums => elasticsearch}/CommCode.java   |  2 +-
 .../ElasticsearchConfig.java                          |  2 +-
 .../{utils => elasticsearch}/ElasticsearchUtil.java   | 11 ++++++++---
 .../omms/adminapi/{dto => elasticsearch}/EsPage.java  |  2 +-
 .../{domain => }/elasticsearch/UserOptLog.java        |  2 +-
 7 files changed, 15 insertions(+), 20 deletions(-)
 rename src/main/java/com/gzzn/omms/adminapi/{enums => elasticsearch}/CommCode.java (88%)
 rename src/main/java/com/gzzn/omms/adminapi/{config => elasticsearch}/ElasticsearchConfig.java (94%)
 rename src/main/java/com/gzzn/omms/adminapi/{utils => elasticsearch}/ElasticsearchUtil.java (95%)
 rename src/main/java/com/gzzn/omms/adminapi/{dto => elasticsearch}/EsPage.java (94%)
 rename src/main/java/com/gzzn/omms/adminapi/{domain => }/elasticsearch/UserOptLog.java (93%)

diff --git a/pom.xml b/pom.xml
index f46decb..d53ccc1 100644
--- a/pom.xml
+++ b/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>
diff --git a/src/main/java/com/gzzn/omms/adminapi/controller/settings/UISettingsController.java b/src/main/java/com/gzzn/omms/adminapi/controller/settings/UISettingsController.java
index e41f542..9da962c 100644
--- a/src/main/java/com/gzzn/omms/adminapi/controller/settings/UISettingsController.java
+++ b/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
diff --git a/src/main/java/com/gzzn/omms/adminapi/enums/CommCode.java b/src/main/java/com/gzzn/omms/adminapi/elasticsearch/CommCode.java
similarity index 88%
rename from src/main/java/com/gzzn/omms/adminapi/enums/CommCode.java
rename to src/main/java/com/gzzn/omms/adminapi/elasticsearch/CommCode.java
index 46a19ff..c06ccaf 100644
--- a/src/main/java/com/gzzn/omms/adminapi/enums/CommCode.java
+++ b/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 {
 	/**
diff --git a/src/main/java/com/gzzn/omms/adminapi/config/ElasticsearchConfig.java b/src/main/java/com/gzzn/omms/adminapi/elasticsearch/ElasticsearchConfig.java
similarity index 94%
rename from src/main/java/com/gzzn/omms/adminapi/config/ElasticsearchConfig.java
rename to src/main/java/com/gzzn/omms/adminapi/elasticsearch/ElasticsearchConfig.java
index 46c4244..e8554e7 100644
--- a/src/main/java/com/gzzn/omms/adminapi/config/ElasticsearchConfig.java
+++ b/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;
 
diff --git a/src/main/java/com/gzzn/omms/adminapi/utils/ElasticsearchUtil.java b/src/main/java/com/gzzn/omms/adminapi/elasticsearch/ElasticsearchUtil.java
similarity index 95%
rename from src/main/java/com/gzzn/omms/adminapi/utils/ElasticsearchUtil.java
rename to src/main/java/com/gzzn/omms/adminapi/elasticsearch/ElasticsearchUtil.java
index 77c11de..ec36955 100644
--- a/src/main/java/com/gzzn/omms/adminapi/utils/ElasticsearchUtil.java
+++ b/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;
+	}
 }
diff --git a/src/main/java/com/gzzn/omms/adminapi/dto/EsPage.java b/src/main/java/com/gzzn/omms/adminapi/elasticsearch/EsPage.java
similarity index 94%
rename from src/main/java/com/gzzn/omms/adminapi/dto/EsPage.java
rename to src/main/java/com/gzzn/omms/adminapi/elasticsearch/EsPage.java
index 2b68678..6ef4e57 100644
--- a/src/main/java/com/gzzn/omms/adminapi/dto/EsPage.java
+++ b/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;
diff --git a/src/main/java/com/gzzn/omms/adminapi/domain/elasticsearch/UserOptLog.java b/src/main/java/com/gzzn/omms/adminapi/elasticsearch/UserOptLog.java
similarity index 93%
rename from src/main/java/com/gzzn/omms/adminapi/domain/elasticsearch/UserOptLog.java
rename to src/main/java/com/gzzn/omms/adminapi/elasticsearch/UserOptLog.java
index 539f383..1143f43 100644
--- a/src/main/java/com/gzzn/omms/adminapi/domain/elasticsearch/UserOptLog.java
+++ b/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;