From 771c524ae6514b4c9e1830fabbe422c142088c0b Mon Sep 17 00:00:00 2001
From: xjs <1294405880@qq.com>
Date: Mon, 28 Mar 2022 12:54:17 +0800
Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E6=96=B0=E5=A2=9E=E6=A3=80=E7=B4=A2?=
 =?UTF-8?q?=E6=9C=8D=E5=8A=A1=202=E3=80=81=E4=BC=98=E5=8C=96pom=E6=96=87?=
 =?UTF-8?q?=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pom.xml                                       |  1 +
 .../views/business/english/article/index.vue  |  2 +-
 .../com/xjs/mall/search/MallSearchApp.java    | 27 +++++++++
 .../search/config/ElasticsearchConfig.java    | 58 +++++++++++++++++++
 .../search/controller/TestController.java     | 44 ++++++++++++++
 .../src/main/resources/bootstrap.yml          |  2 +-
 .../mall/search/ElasticsearchConfigTest.java  | 40 +++++++++++++
 .../src/main/resources/bootstrap.yml          | 29 ++++++++++
 8 files changed, 201 insertions(+), 2 deletions(-)
 create mode 100644 xjs-business/xjs-project-mall/mall-search/src/main/java/com/xjs/mall/search/MallSearchApp.java
 create mode 100644 xjs-business/xjs-project-mall/mall-search/src/main/java/com/xjs/mall/search/config/ElasticsearchConfig.java
 create mode 100644 xjs-business/xjs-project-mall/mall-search/src/main/java/com/xjs/mall/search/controller/TestController.java
 create mode 100644 xjs-business/xjs-project-mall/mall-search/src/test/java/com/xjs/mall/search/ElasticsearchConfigTest.java
 create mode 100644 xjs-business/xjs-project-mall/mall-ware/src/main/resources/bootstrap.yml

diff --git a/pom.xml b/pom.xml
index 9cc51b47..8ba66956 100644
--- a/pom.xml
+++ b/pom.xml
@@ -107,6 +107,7 @@
                 <version>${bean-searcher.version}</version>
             </dependency>
 
+            <!--elasticsearch客户端-->
             <dependency>
                 <groupId>org.elasticsearch.client</groupId>
                 <artifactId>elasticsearch-rest-high-level-client</artifactId>
diff --git a/ruoyi-ui/src/views/business/english/article/index.vue b/ruoyi-ui/src/views/business/english/article/index.vue
index e882901f..49d987df 100644
--- a/ruoyi-ui/src/views/business/english/article/index.vue
+++ b/ruoyi-ui/src/views/business/english/article/index.vue
@@ -44,7 +44,7 @@
 
 
     <div v-loading="loading">
-      <el-timeline v-for="(index,article) in articleList">
+      <el-timeline v-for="(article,index) in articleList">
         <el-timeline-item :timestamp=article.createTime placement="top">
 
           <el-button type="text"
diff --git a/xjs-business/xjs-project-mall/mall-search/src/main/java/com/xjs/mall/search/MallSearchApp.java b/xjs-business/xjs-project-mall/mall-search/src/main/java/com/xjs/mall/search/MallSearchApp.java
new file mode 100644
index 00000000..866c4b05
--- /dev/null
+++ b/xjs-business/xjs-project-mall/mall-search/src/main/java/com/xjs/mall/search/MallSearchApp.java
@@ -0,0 +1,27 @@
+package com.xjs.mall.search;
+
+import com.ruoyi.common.security.annotation.EnableCustomConfig;
+import com.ruoyi.common.security.annotation.EnableRyFeignClients;
+import com.ruoyi.common.swagger.annotation.EnableCustomSwagger2;
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.context.ConfigurableApplicationContext;
+
+/**
+ * 商城Search启动器
+ * @author xiejs
+ * @since 2022-03-25
+ */
+@SpringBootApplication
+@EnableCustomConfig
+@EnableCustomSwagger2
+@EnableRyFeignClients
+public class MallSearchApp {
+    public static void main(String[] args) {
+        ConfigurableApplicationContext run = SpringApplication.run(MallSearchApp.class, args);
+        //String[] beanDefinitionNames = run.getBeanDefinitionNames();
+        //for (String beanDefinitionName : beanDefinitionNames) {
+        //    System.out.println("beanDefinitionName:"+beanDefinitionName);
+        //}
+    }
+}
diff --git a/xjs-business/xjs-project-mall/mall-search/src/main/java/com/xjs/mall/search/config/ElasticsearchConfig.java b/xjs-business/xjs-project-mall/mall-search/src/main/java/com/xjs/mall/search/config/ElasticsearchConfig.java
new file mode 100644
index 00000000..1751fc7b
--- /dev/null
+++ b/xjs-business/xjs-project-mall/mall-search/src/main/java/com/xjs/mall/search/config/ElasticsearchConfig.java
@@ -0,0 +1,58 @@
+package com.xjs.mall.search.config;
+
+import lombok.Data;
+import org.apache.http.HttpHost;
+import org.elasticsearch.client.RequestOptions;
+import org.elasticsearch.client.RestClient;
+import org.elasticsearch.client.RestClientBuilder;
+import org.elasticsearch.client.RestHighLevelClient;
+import org.springframework.boot.context.properties.ConfigurationProperties;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+
+/**
+ * Elasticsearcn配置类
+ *
+ * @author xiejs
+ * @since 2022-03-25
+ */
+@Configuration
+@ConfigurationProperties(prefix = "elasticsearch")
+@Data
+public class ElasticsearchConfig {
+
+    /**
+     * es的ip
+     */
+    private String ip;
+
+    /**
+     * 端口
+     */
+    private Integer port;
+
+    /**
+     * 协议
+     */
+    private String scheme;
+
+
+    public static final RequestOptions COMMON_OPTIONS;
+
+    static {
+        RequestOptions.Builder builder = RequestOptions.DEFAULT.toBuilder();
+
+        //配置项.......
+
+        COMMON_OPTIONS = builder.build();
+    }
+
+
+    @Bean
+    public RestHighLevelClient restHighLevelClient() {
+        RestClientBuilder builder = RestClient.builder(new HttpHost(ip, port, scheme));
+        RestHighLevelClient restHighLevelClient = new RestHighLevelClient(builder);
+        return restHighLevelClient;
+    }
+
+}
diff --git a/xjs-business/xjs-project-mall/mall-search/src/main/java/com/xjs/mall/search/controller/TestController.java b/xjs-business/xjs-project-mall/mall-search/src/main/java/com/xjs/mall/search/controller/TestController.java
new file mode 100644
index 00000000..0f395ee8
--- /dev/null
+++ b/xjs-business/xjs-project-mall/mall-search/src/main/java/com/xjs/mall/search/controller/TestController.java
@@ -0,0 +1,44 @@
+package com.xjs.mall.search.controller;
+
+import com.xjs.mall.other.R;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.elasticsearch.action.index.IndexRequest;
+import org.elasticsearch.action.index.IndexResponse;
+import org.elasticsearch.client.RestHighLevelClient;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.io.IOException;
+
+import static com.xjs.mall.search.config.ElasticsearchConfig.COMMON_OPTIONS;
+
+/**
+ * @author xiejs
+ * @since 2022-03-26
+ */
+@RequestMapping("test")
+@Api(tags = "test")
+@RestController
+public class TestController {
+
+    @Autowired
+    private RestHighLevelClient restHighLevelClient;
+
+
+    @GetMapping
+    @ApiOperation("测试")
+    public R test() throws IOException {
+        IndexRequest indexRequest = new IndexRequest("users");
+        indexRequest.id("1");
+        indexRequest.source("userName", "zs", "age", 18);
+
+        IndexResponse index = restHighLevelClient.index(indexRequest, COMMON_OPTIONS);
+
+        System.out.println(index.toString());
+
+        return R.ok();
+    }
+}
diff --git a/xjs-business/xjs-project-mall/mall-search/src/main/resources/bootstrap.yml b/xjs-business/xjs-project-mall/mall-search/src/main/resources/bootstrap.yml
index 54ce3c9c..5f232431 100644
--- a/xjs-business/xjs-project-mall/mall-search/src/main/resources/bootstrap.yml
+++ b/xjs-business/xjs-project-mall/mall-search/src/main/resources/bootstrap.yml
@@ -1,6 +1,6 @@
 # Tomcat
 server:
-  port: 9980
+  port: 9986
 
 # Spring
 spring:
diff --git a/xjs-business/xjs-project-mall/mall-search/src/test/java/com/xjs/mall/search/ElasticsearchConfigTest.java b/xjs-business/xjs-project-mall/mall-search/src/test/java/com/xjs/mall/search/ElasticsearchConfigTest.java
new file mode 100644
index 00000000..1807550e
--- /dev/null
+++ b/xjs-business/xjs-project-mall/mall-search/src/test/java/com/xjs/mall/search/ElasticsearchConfigTest.java
@@ -0,0 +1,40 @@
+package com.xjs.mall.search;
+
+import org.elasticsearch.action.index.IndexRequest;
+import org.elasticsearch.action.index.IndexResponse;
+import org.elasticsearch.client.RestHighLevelClient;
+import org.junit.jupiter.api.Test;
+import org.springframework.boot.test.context.SpringBootTest;
+
+import javax.annotation.Resource;
+import java.io.IOException;
+
+import static com.xjs.mall.search.config.ElasticsearchConfig.COMMON_OPTIONS;
+
+/**
+ * @author xiejs
+ * @since 2022-03-25
+ */
+@SpringBootTest(classes = MallSearchApp.class)
+class ElasticsearchConfigTest {
+
+    @Resource
+    private RestHighLevelClient restHighLevelClient;
+
+    @Test
+    /**
+     * 测试存储数据到es
+     */
+    public void indexData() throws IOException {
+        IndexRequest indexRequest = new IndexRequest("users");
+        indexRequest.id("1");
+        indexRequest.source("userName", "zs", "age", 18);
+
+        IndexResponse index = restHighLevelClient.index(indexRequest, COMMON_OPTIONS);
+
+        System.out.println(index.toString());
+
+
+    }
+
+}
diff --git a/xjs-business/xjs-project-mall/mall-ware/src/main/resources/bootstrap.yml b/xjs-business/xjs-project-mall/mall-ware/src/main/resources/bootstrap.yml
new file mode 100644
index 00000000..ea45e82d
--- /dev/null
+++ b/xjs-business/xjs-project-mall/mall-ware/src/main/resources/bootstrap.yml
@@ -0,0 +1,29 @@
+# Tomcat
+server:
+  port: 9980
+
+# Spring
+spring:
+  application:
+    # 应用名称
+    name: xjs-mall-ware
+  profiles:
+    # 环境配置
+    active: dev
+  cloud:
+    nacos:
+      discovery:
+        # 服务注册地址
+        server-addr: 127.0.0.1:8848
+      config:
+        # 配置中心地址
+        server-addr: 127.0.0.1:8848
+        # 配置文件格式
+        file-extension: yml
+        # 共享配置
+        shared-configs:
+          - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension}
+        #配置组
+        group: xjs
+        #命名空间
+        namespace: xjs-666