kouchengxing пре 4 година
родитељ
комит
4da188de61

+ 7 - 9
dgtis-modules/dgtis-modules-data/pom.xml

@@ -46,11 +46,6 @@
             <version>${swagger.fox.version}</version>
         </dependency>
 
-        <!-- Mysql Connector -->
-        <dependency>
-            <groupId>mysql</groupId>
-            <artifactId>mysql-connector-java</artifactId>
-        </dependency>
 
         <!-- dgtis Common Security -->
         <dependency>
@@ -82,13 +77,16 @@
             <artifactId>dgtis-common-redis</artifactId>
         </dependency>
 
+
         <dependency>
-            <groupId>com.dgtis</groupId>
-            <artifactId>jar</artifactId>
-            <scope>system</scope>
-            <systemPath>${project.basedir}/src/main/lib/inceptor-driver-5.2.3.jar</systemPath>
+            <groupId>org.elasticsearch.client</groupId>
+            <artifactId>transport</artifactId>
+            <version>7.6.2</version>
         </dependency>
 
+
+
+
     </dependencies>
 
     <build>

+ 4 - 2
dgtis-modules/dgtis-modules-data/src/main/java/com/dgtis/data/DgtisDataApplication.java

@@ -4,17 +4,19 @@ import com.dgtis.common.security.annotation.EnableCustomConfig;
 import com.dgtis.common.security.annotation.EnableRyFeignClients;
 import com.dgtis.common.swagger.annotation.EnableCustomSwagger2;
 import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration;
 import org.springframework.cloud.client.SpringCloudApplication;
+import org.springframework.cloud.client.discovery.EnableDiscoveryClient;
 
 /**
  * 数据模块
  *
  * @author dgtis
  */
-@EnableCustomConfig
 @EnableCustomSwagger2
 @EnableRyFeignClients
-@SpringCloudApplication
+@SpringBootApplication(exclude = {DataSourceAutoConfiguration.class })
 public class DgtisDataApplication {
     public static void main(String[] args)
     {

+ 48 - 0
dgtis-modules/dgtis-modules-data/src/main/java/com/dgtis/data/api/DocumentApiController.java

@@ -0,0 +1,48 @@
+package com.dgtis.data.api;
+
+import com.dgtis.common.core.web.controller.BaseController;
+import com.dgtis.common.core.web.domain.AjaxResult;
+
+import com.fasterxml.jackson.databind.ObjectMapper;
+import org.elasticsearch.action.get.GetResponse;
+import org.elasticsearch.client.transport.TransportClient;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.ResponseBody;
+
+
+/**
+ * @author koucx
+ * @version 1.0
+ * @descption: TODO
+ * @company 神州数码通用软件(洛阳)有限公司
+ * @copyright (c) 2019 LuoYang DGT Co'Ltd Inc. All rights reserved.
+ * @date 2021-01-21
+ * @since JDK1.8
+ */
+@Controller
+@RequestMapping("/api")
+public class DocumentApiController extends BaseController {
+
+    @Autowired
+    private TransportClient transportClient;
+
+    @Autowired
+    private ObjectMapper objectMapper;
+
+    @GetMapping("/getIndex")
+    @ResponseBody
+    public AjaxResult getIndex() {
+
+        GetResponse response = transportClient.prepareGet("shanglifeecif.individual","default_type_", "1").get();
+        String result = response.getSourceAsString();
+        return AjaxResult.success(result);
+    }
+
+
+
+
+
+}

+ 53 - 0
dgtis-modules/dgtis-modules-data/src/main/java/com/dgtis/data/config/ElasticSearchConfig.java

@@ -0,0 +1,53 @@
+package com.dgtis.data.config;
+
+
+import org.elasticsearch.client.transport.TransportClient;
+import org.elasticsearch.common.settings.Settings;
+import org.elasticsearch.common.transport.TransportAddress;
+import org.elasticsearch.transport.client.PreBuiltTransportClient;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+
+import java.net.InetAddress;
+import java.net.UnknownHostException;
+
+/**
+ * @author koucx
+ * @version 1.0
+ * @descption: TODO
+ * @company 神州数码通用软件(洛阳)有限公司
+ * @copyright (c) 2019 LuoYang DGT Co'Ltd Inc. All rights reserved.
+ * @date 2021-01-21
+ * @since JDK1.8
+ */
+@Configuration
+public class ElasticSearchConfig {
+
+    @Value("${elasticsearch.host}")
+    private String esHost;
+
+    @Value("${elasticsearch.port}")
+    private int esPort;
+
+    @Value("${elasticsearch.cluster.name}")
+    private String esName;
+
+    @Bean
+    public TransportClient esClient() throws UnknownHostException {
+        TransportClient client = null;
+        try {
+            Settings settings = Settings.builder()
+                    .put("client.transport.sniff", true)
+                    .put("cluster.name", this.esName)
+                    .build();
+
+            TransportAddress master = new TransportAddress(InetAddress.getByName(esHost), esPort);
+
+            client = new PreBuiltTransportClient(settings).addTransportAddress(master);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return client;
+    }
+}

+ 6 - 0
dgtis-modules/dgtis-modules-data/src/main/resources/bootstrap.yml

@@ -5,6 +5,12 @@ dgtis:
 server:
   port: 19204
 
+elasticsearch:
+  cluster:
+    name: cluster
+  host: 10.32.2.230
+  port: 9200
+
 # Spring
 spring: 
   application: