From 7f84c9964fbeb20183188e371fde97e12f087fd9 Mon Sep 17 00:00:00 2001
From: xjs <1294405880@qq.com>
Date: Fri, 25 Mar 2022 21:26:55 +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                                       | 17 +++++++----
 .../views/business/english/article/index.vue  |  2 +-
 .../resources/mapper/log/ApiLogMapper.xml     | 10 +++----
 .../xjs-project-mall/mall-search/pom.xml      | 28 +++++++++++++++++++
 .../src/main/resources/bootstrap.yml          |  4 +--
 .../src/main/resources/logback.xml            |  6 ++--
 .../mall-search/src/main/resources/rebel.xml  | 16 +++++++++++
 xjs-business/xjs-project-mall/pom.xml         |  3 +-
 8 files changed, 69 insertions(+), 17 deletions(-)
 create mode 100644 xjs-business/xjs-project-mall/mall-search/pom.xml
 rename xjs-business/xjs-project-mall/{mall-ware => mall-search}/src/main/resources/bootstrap.yml (94%)
 rename xjs-business/xjs-project-mall/{mall-ware => mall-search}/src/main/resources/logback.xml (97%)
 create mode 100644 xjs-business/xjs-project-mall/mall-search/src/main/resources/rebel.xml

diff --git a/pom.xml b/pom.xml
index 5b8319b2..9cc51b47 100644
--- a/pom.xml
+++ b/pom.xml
@@ -51,6 +51,7 @@
         <oshi.version>5.7.1</oshi.version>
         <webmagic.version>0.7.5</webmagic.version>
         <spring-cloud-alicloud-oss.version>2.2.0.RELEASE</spring-cloud-alicloud-oss.version>
+        <elasticsearch.version>7.2.0</elasticsearch.version>
 
     </properties>
 
@@ -106,6 +107,12 @@
                 <version>${bean-searcher.version}</version>
             </dependency>
 
+            <dependency>
+                <groupId>org.elasticsearch.client</groupId>
+                <artifactId>elasticsearch-rest-high-level-client</artifactId>
+                <version>${elasticsearch.version}</version>
+            </dependency>
+
             <dependency>
                 <groupId>com.xjs</groupId>
                 <artifactId>xjs-business-common</artifactId>
@@ -230,9 +237,9 @@
             </dependency>
 
             <!-- Collection 增强Java集合框架 -->
-            <dependency> 
-                <groupId>commons-collections</groupId> 
-                <artifactId>commons-collections</artifactId> 
+            <dependency>
+                <groupId>commons-collections</groupId>
+                <artifactId>commons-collections</artifactId>
                 <version>${commons-collections.version}</version>
             </dependency>
 
@@ -270,7 +277,7 @@
                 <artifactId>log4j-api</artifactId>
                 <version>${log4j2.version}</version>
             </dependency>
-            
+
             <dependency>
                 <groupId>org.apache.logging.log4j</groupId>
                 <artifactId>log4j-to-slf4j</artifactId>
@@ -370,4 +377,4 @@
         </plugins>
     </build>
 
-</project>
\ No newline at end of file
+</project>
diff --git a/ruoyi-ui/src/views/business/english/article/index.vue b/ruoyi-ui/src/views/business/english/article/index.vue
index 9412470d..e882901f 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="article in articleList">
+      <el-timeline v-for="(index,article) in articleList">
         <el-timeline-item :timestamp=article.createTime placement="top">
 
           <el-button type="text"
diff --git a/xjs-business/xjs-business-log/src/main/resources/mapper/log/ApiLogMapper.xml b/xjs-business/xjs-business-log/src/main/resources/mapper/log/ApiLogMapper.xml
index 8cb792fd..b03a5f26 100644
--- a/xjs-business/xjs-business-log/src/main/resources/mapper/log/ApiLogMapper.xml
+++ b/xjs-business/xjs-business-log/src/main/resources/mapper/log/ApiLogMapper.xml
@@ -3,7 +3,7 @@
 PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.xjs.apilog.mapper.ApiLogMapper">
-    
+
     <resultMap type="com.xjs.apilog.domain.ApiLog" id="ApiLogResult">
         <result property="id"    column="id"    />
         <result property="apiName"    column="api_name"    />
@@ -29,9 +29,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="isSuccess != null "> and is_success = #{isSuccess}</if>
             <if test="createTime != null and endCreateTime != null"> and create_time between #{createTime} and #{endCreateTime}</if>
         </where>
-        order by id desc
+        order by create_time desc
     </select>
-    
+
     <select id="selectApiLogById" parameterType="Long" resultMap="ApiLogResult">
         <include refid="selectApiLogVo"/>
         where id = #{id}
@@ -42,9 +42,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </delete>
 
     <delete id="deleteApiLogByIds" parameterType="Long">
-        delete from api_log where id in 
+        delete from api_log where id in
         <foreach item="id" collection="array" open="(" separator="," close=")">
             #{id}
         </foreach>
     </delete>
-</mapper>
\ No newline at end of file
+</mapper>
diff --git a/xjs-business/xjs-project-mall/mall-search/pom.xml b/xjs-business/xjs-project-mall/mall-search/pom.xml
new file mode 100644
index 00000000..bd0bffd6
--- /dev/null
+++ b/xjs-business/xjs-project-mall/mall-search/pom.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <artifactId>xjs-project-mall</artifactId>
+        <groupId>com.xjs</groupId>
+        <version>3.3.0</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+    <name>检索服务</name>
+    <description>elasticsearch检索服务</description>
+
+    <artifactId>mall-search</artifactId>
+
+    <properties>
+        <maven.compiler.source>11</maven.compiler.source>
+        <maven.compiler.target>11</maven.compiler.target>
+    </properties>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.elasticsearch.client</groupId>
+            <artifactId>elasticsearch-rest-high-level-client</artifactId>
+        </dependency>
+    </dependencies>
+
+</project>
diff --git a/xjs-business/xjs-project-mall/mall-ware/src/main/resources/bootstrap.yml b/xjs-business/xjs-project-mall/mall-search/src/main/resources/bootstrap.yml
similarity index 94%
rename from xjs-business/xjs-project-mall/mall-ware/src/main/resources/bootstrap.yml
rename to xjs-business/xjs-project-mall/mall-search/src/main/resources/bootstrap.yml
index cc857b09..54ce3c9c 100644
--- a/xjs-business/xjs-project-mall/mall-ware/src/main/resources/bootstrap.yml
+++ b/xjs-business/xjs-project-mall/mall-search/src/main/resources/bootstrap.yml
@@ -3,10 +3,10 @@ server:
   port: 9980
 
 # Spring
-spring: 
+spring:
   application:
     # 应用名称
-    name: xjs-mall-ware
+    name: xjs-mall-search
   profiles:
     # 环境配置
     active: dev
diff --git a/xjs-business/xjs-project-mall/mall-ware/src/main/resources/logback.xml b/xjs-business/xjs-project-mall/mall-search/src/main/resources/logback.xml
similarity index 97%
rename from xjs-business/xjs-project-mall/mall-ware/src/main/resources/logback.xml
rename to xjs-business/xjs-project-mall/mall-search/src/main/resources/logback.xml
index e4f9aed1..40a51704 100644
--- a/xjs-business/xjs-project-mall/mall-ware/src/main/resources/logback.xml
+++ b/xjs-business/xjs-project-mall/mall-search/src/main/resources/logback.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <configuration scan="true" scanPeriod="60 seconds" debug="false">
     <!-- 日志存放路径 -->
-	<property name="log.path" value="logs/xjs-mall/ware"/>
+	<property name="log.path" value="logs/xjs-mall/search"/>
    <!-- 日志输出格式 -->
 	<property name="log.pattern" value="%d{HH:mm:ss.SSS} [%thread] %-5level %logger{20} - [%method,%line] - %msg%n" />
 
@@ -72,10 +72,10 @@
 	<root level="info">
 		<appender-ref ref="console" />
 	</root>
-	
+
 	<!--系统操作日志-->
     <root level="info">
         <appender-ref ref="file_info" />
         <appender-ref ref="file_error" />
     </root>
-</configuration>
\ No newline at end of file
+</configuration>
diff --git a/xjs-business/xjs-project-mall/mall-search/src/main/resources/rebel.xml b/xjs-business/xjs-project-mall/mall-search/src/main/resources/rebel.xml
new file mode 100644
index 00000000..0ea94d7e
--- /dev/null
+++ b/xjs-business/xjs-project-mall/mall-search/src/main/resources/rebel.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+  This is the JRebel configuration file. It maps the running application to your IDE workspace, enabling JRebel reloading for this project.
+  Refer to https://manuals.jrebel.com/jrebel/standalone/config.html for more information.
+-->
+<application generated-by="intellij" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://www.zeroturnaround.com" xsi:schemaLocation="http://www.zeroturnaround.com http://update.zeroturnaround.com/jrebel/rebel-2_3.xsd">
+
+	<id>mall-search</id>
+
+	<classpath>
+		<dir name="D:/Dev/IdeaPerject/GitHub/Cloud/xjs-business/xjs-project-mall/mall-search/target/classes">
+		</dir>
+	</classpath>
+
+</application>
diff --git a/xjs-business/xjs-project-mall/pom.xml b/xjs-business/xjs-project-mall/pom.xml
index 7f72ac09..ca6da920 100644
--- a/xjs-business/xjs-project-mall/pom.xml
+++ b/xjs-business/xjs-project-mall/pom.xml
@@ -16,6 +16,7 @@
         <module>mall-member</module>
         <module>mall-coupon</module>
         <module>renren-generator</module>
+        <module>mall-search</module>
     </modules>
     <packaging>pom</packaging>
 
@@ -33,4 +34,4 @@
         <maven.compiler.target>11</maven.compiler.target>
     </properties>
 
-</project>
\ No newline at end of file
+</project>