From 1a3f292810edb5c73afa667bad0b674f6e31c753 Mon Sep 17 00:00:00 2001
From: xjs <1294405880@qq.com>
Date: Sat, 26 Feb 2022 15:35:20 +0800
Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E6=9F=90=E4=BA=9B=E7=B1=BB=E8=A1=A5?=
 =?UTF-8?q?=E9=BD=90=E6=B3=A8=E9=87=8A=202=E3=80=81=E4=BF=AE=E6=94=B9pom?=
 =?UTF-8?q?=E4=BE=9D=E8=B5=96=E7=BB=93=E6=9E=84=E6=9B=B4=E6=B8=85=E6=99=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pom.xml                                       | 52 +++++++++++++++++++
 ruoyi-ui/src/views/index.vue                  | 10 +++-
 xjs-business/pom.xml                          |  5 +-
 xjs-business/xjs-business-blog/pom.xml        |  1 -
 xjs-business/xjs-business-english/pom.xml     |  1 -
 xjs-business/xjs-business-log/pom.xml         |  1 -
 xjs-business/xjs-business-monitor/pom.xml     |  2 -
 .../redismonitor/RedisCacheController.java    |  1 +
 .../controller/ServiceMonitorController.java  |  5 +-
 xjs-business/xjs-business-openapi/pom.xml     |  1 -
 xjs-business/xjs-business-statistics/pom.xml  |  1 -
 xjs-business/xjs-business-warning/pom.xml     |  1 -
 xjs-business/xjs-business-webmagic/pom.xml    |  3 --
 13 files changed, 65 insertions(+), 19 deletions(-)

diff --git a/pom.xml b/pom.xml
index 504b6fb5..f10ccfc1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -49,6 +49,8 @@
         <commonsNet.version>3.6</commonsNet.version>
         <aliyunoss.version>3.14.0</aliyunoss.version>
         <bean-searcher.version>3.5.1</bean-searcher.version>
+        <oshi.version>5.7.1</oshi.version>
+        <webmagic.version>0.7.5</webmagic.version>
 
     </properties>
 
@@ -56,6 +58,56 @@
     <dependencyManagement>
         <dependencies>
 
+            <!--///////////////////////////business///////////////////////////////-->
+            <!--爬虫-->
+            <dependency>
+                <groupId>us.codecraft</groupId>
+                <artifactId>webmagic-core</artifactId>
+                <version>${webmagic.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>us.codecraft</groupId>
+                <artifactId>webmagic-extension</artifactId>
+                <version>${webmagic.version}</version>
+            </dependency>
+
+
+            <!-- 获取系统信息 -->
+            <dependency>
+                <groupId>com.github.oshi</groupId>
+                <artifactId>oshi-core</artifactId>
+                <version>${oshi.version}</version>
+            </dependency>
+
+            <!--mp-->
+            <dependency>
+                <groupId>com.baomidou</groupId>
+                <artifactId>mybatis-plus-boot-starter</artifactId>
+                <version>${mybatisplus.version}</version>
+            </dependency>
+
+            <!--工具类-->
+            <dependency>
+                <groupId>cn.hutool</groupId>
+                <artifactId>hutool-all</artifactId>
+                <version>${hutool.version}</version>
+            </dependency>
+
+            <!--比 MyBatis 效率快 100 倍的条件检索引擎，天生支持联表，使一行代码实现复杂列表检索成为可能！-->
+            <dependency>
+                <groupId>com.ejlchina</groupId>
+                <artifactId>bean-searcher-boot-starter</artifactId>
+                <version>${bean-searcher.version}</version>
+            </dependency>
+
+            <dependency>
+                <groupId>com.xjs</groupId>
+                <artifactId>xjs-business-common</artifactId>
+                <version>${ruoyi.version}</version>
+            </dependency>
+
+            <!--////////////////////////////////////////////////////////////////////////////////////-->
+
             <!-- SpringCloud 微服务 -->
             <dependency>
                 <groupId>org.springframework.cloud</groupId>
diff --git a/ruoyi-ui/src/views/index.vue b/ruoyi-ui/src/views/index.vue
index 5c198710..b77d4fa3 100644
--- a/ruoyi-ui/src/views/index.vue
+++ b/ruoyi-ui/src/views/index.vue
@@ -25,6 +25,8 @@
                 style="width: 92%"
                 v-model="searchContent"
                 @input="getAssociation()"
+                @keydown.enter.n.native="toRescue"
+                clearable
                 @select="handleSelect"
                 :fetch-suggestions="querySearchAsync"
                 placeholder="请输入你想要搜索的内容"></el-autocomplete>
@@ -78,7 +80,7 @@ export default {
       baiduLogo,
 
       //百度输入框内容
-      searchContent: null,
+      searchContent: '',
 
       //联想词汇
       associationList: [],
@@ -192,13 +194,17 @@ export default {
 
       let list = []
 
+      if (restaurants === null || restaurants === undefined || restaurants === []) {
+        return list
+      }
+
       restaurants.forEach(s => {
         let obj = {};
         let key = "value"
         var value = s
         obj[key] = value
         list.push(obj)
-      })
+      });
 
       return list;
     },
diff --git a/xjs-business/pom.xml b/xjs-business/pom.xml
index fcb6d4ce..48242b88 100644
--- a/xjs-business/pom.xml
+++ b/xjs-business/pom.xml
@@ -93,10 +93,11 @@
         </dependency>
 
         <!--/////////////////////本模块专属依赖/////////////////////////-->
+
+
         <dependency>
             <groupId>com.baomidou</groupId>
             <artifactId>mybatis-plus-boot-starter</artifactId>
-            <version>${mybatisplus.version}</version>
         </dependency>
 
         <!--lombok-->
@@ -115,14 +116,12 @@
         <dependency>
             <groupId>cn.hutool</groupId>
             <artifactId>hutool-all</artifactId>
-            <version>${hutool.version}</version>
         </dependency>
 
         <!--比 MyBatis 效率快 100 倍的条件检索引擎，天生支持联表，使一行代码实现复杂列表检索成为可能！-->
         <dependency>
             <groupId>com.ejlchina</groupId>
             <artifactId>bean-searcher-boot-starter</artifactId>
-            <version>${bean-searcher.version}</version>
         </dependency>
 
 
diff --git a/xjs-business/xjs-business-blog/pom.xml b/xjs-business/xjs-business-blog/pom.xml
index 3f30221a..95233d41 100644
--- a/xjs-business/xjs-business-blog/pom.xml
+++ b/xjs-business/xjs-business-blog/pom.xml
@@ -21,7 +21,6 @@
         <dependency>
             <groupId>com.xjs</groupId>
             <artifactId>xjs-business-common</artifactId>
-            <version>3.3.0</version>
         </dependency>
     </dependencies>
 
diff --git a/xjs-business/xjs-business-english/pom.xml b/xjs-business/xjs-business-english/pom.xml
index 74ab043b..186c3496 100644
--- a/xjs-business/xjs-business-english/pom.xml
+++ b/xjs-business/xjs-business-english/pom.xml
@@ -16,7 +16,6 @@
         <dependency>
             <groupId>com.xjs</groupId>
             <artifactId>xjs-business-common</artifactId>
-            <version>3.3.0</version>
         </dependency>
     </dependencies>
 
diff --git a/xjs-business/xjs-business-log/pom.xml b/xjs-business/xjs-business-log/pom.xml
index c02b79a5..68b3cebb 100644
--- a/xjs-business/xjs-business-log/pom.xml
+++ b/xjs-business/xjs-business-log/pom.xml
@@ -22,7 +22,6 @@
         <dependency>
             <groupId>com.xjs</groupId>
             <artifactId>xjs-business-common</artifactId>
-            <version>3.3.0</version>
         </dependency>
     </dependencies>
 
diff --git a/xjs-business/xjs-business-monitor/pom.xml b/xjs-business/xjs-business-monitor/pom.xml
index 25be15d1..146bfabf 100644
--- a/xjs-business/xjs-business-monitor/pom.xml
+++ b/xjs-business/xjs-business-monitor/pom.xml
@@ -22,13 +22,11 @@
         <dependency>
             <groupId>com.github.oshi</groupId>
             <artifactId>oshi-core</artifactId>
-            <version>5.7.1</version>
         </dependency>
 
         <dependency>
             <groupId>com.xjs</groupId>
             <artifactId>xjs-business-common</artifactId>
-            <version>3.3.0</version>
         </dependency>
     </dependencies>
 
diff --git a/xjs-business/xjs-business-monitor/src/main/java/com/xjs/redismonitor/RedisCacheController.java b/xjs-business/xjs-business-monitor/src/main/java/com/xjs/redismonitor/RedisCacheController.java
index 2febe874..b96fbdd7 100644
--- a/xjs-business/xjs-business-monitor/src/main/java/com/xjs/redismonitor/RedisCacheController.java
+++ b/xjs-business/xjs-business-monitor/src/main/java/com/xjs/redismonitor/RedisCacheController.java
@@ -15,6 +15,7 @@ import org.springframework.web.bind.annotation.RestController;
 import java.util.*;
 
 /**
+ * redis监控controller
  * @author xiejs
  * @since 2022-01-12
  */
diff --git a/xjs-business/xjs-business-monitor/src/main/java/com/xjs/servicemonitor/controller/ServiceMonitorController.java b/xjs-business/xjs-business-monitor/src/main/java/com/xjs/servicemonitor/controller/ServiceMonitorController.java
index 13fb661d..7ec7f70f 100644
--- a/xjs-business/xjs-business-monitor/src/main/java/com/xjs/servicemonitor/controller/ServiceMonitorController.java
+++ b/xjs-business/xjs-business-monitor/src/main/java/com/xjs/servicemonitor/controller/ServiceMonitorController.java
@@ -14,10 +14,9 @@ import org.springframework.web.bind.annotation.RestController;
 
 import javax.servlet.http.HttpServletRequest;
 
-/**
+/** 业务监控控制器
  * @author xiejs
- * @desc  业务监控控制器
- * @create 2022-01-02
+ * @since  2022-01-02
  */
 @RestController
 @RequestMapping("servicemonitor")
diff --git a/xjs-business/xjs-business-openapi/pom.xml b/xjs-business/xjs-business-openapi/pom.xml
index 2491dfd7..4fc0a29d 100644
--- a/xjs-business/xjs-business-openapi/pom.xml
+++ b/xjs-business/xjs-business-openapi/pom.xml
@@ -22,7 +22,6 @@
         <dependency>
             <groupId>com.xjs</groupId>
             <artifactId>xjs-business-common</artifactId>
-            <version>3.3.0</version>
         </dependency>
     </dependencies>
 
diff --git a/xjs-business/xjs-business-statistics/pom.xml b/xjs-business/xjs-business-statistics/pom.xml
index 730c1247..836da6e1 100644
--- a/xjs-business/xjs-business-statistics/pom.xml
+++ b/xjs-business/xjs-business-statistics/pom.xml
@@ -21,7 +21,6 @@
         <dependency>
             <groupId>com.xjs</groupId>
             <artifactId>xjs-business-common</artifactId>
-            <version>3.3.0</version>
         </dependency>
     </dependencies>
 
diff --git a/xjs-business/xjs-business-warning/pom.xml b/xjs-business/xjs-business-warning/pom.xml
index b8d64745..041a5de9 100644
--- a/xjs-business/xjs-business-warning/pom.xml
+++ b/xjs-business/xjs-business-warning/pom.xml
@@ -21,7 +21,6 @@
         <dependency>
             <groupId>com.xjs</groupId>
             <artifactId>xjs-business-common</artifactId>
-            <version>3.3.0</version>
         </dependency>
 
         <!-- websocket -->
diff --git a/xjs-business/xjs-business-webmagic/pom.xml b/xjs-business/xjs-business-webmagic/pom.xml
index 1aa06f5d..21e2f215 100644
--- a/xjs-business/xjs-business-webmagic/pom.xml
+++ b/xjs-business/xjs-business-webmagic/pom.xml
@@ -21,14 +21,12 @@
         <dependency>
             <groupId>com.xjs</groupId>
             <artifactId>xjs-business-common</artifactId>
-            <version>3.3.0</version>
         </dependency>
 
         <!--爬虫-->
         <dependency>
             <groupId>us.codecraft</groupId>
             <artifactId>webmagic-core</artifactId>
-            <version>0.7.5</version>
             <exclusions>
                 <exclusion>
                     <groupId>org.slf4j</groupId>
@@ -39,7 +37,6 @@
         <dependency>
             <groupId>us.codecraft</groupId>
             <artifactId>webmagic-extension</artifactId>
-            <version>0.7.5</version>
         </dependency>
     </dependencies>