diff --git a/pom.xml b/pom.xml
index 504b6fb5..f10ccfc1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -49,6 +49,8 @@
3.6
3.14.0
3.5.1
+ 5.7.1
+ 0.7.5
@@ -56,6 +58,56 @@
+
+
+
+ us.codecraft
+ webmagic-core
+ ${webmagic.version}
+
+
+ us.codecraft
+ webmagic-extension
+ ${webmagic.version}
+
+
+
+
+
+ com.github.oshi
+ oshi-core
+ ${oshi.version}
+
+
+
+
+ com.baomidou
+ mybatis-plus-boot-starter
+ ${mybatisplus.version}
+
+
+
+
+ cn.hutool
+ hutool-all
+ ${hutool.version}
+
+
+
+
+ com.ejlchina
+ bean-searcher-boot-starter
+ ${bean-searcher.version}
+
+
+
+ com.xjs
+ xjs-business-common
+ ${ruoyi.version}
+
+
+
+
org.springframework.cloud
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="请输入你想要搜索的内容">
@@ -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 @@
+
+
com.baomidou
mybatis-plus-boot-starter
- ${mybatisplus.version}
@@ -115,14 +116,12 @@
cn.hutool
hutool-all
- ${hutool.version}
com.ejlchina
bean-searcher-boot-starter
- ${bean-searcher.version}
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 @@
com.xjs
xjs-business-common
- 3.3.0
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 @@
com.xjs
xjs-business-common
- 3.3.0
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 @@
com.xjs
xjs-business-common
- 3.3.0
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 @@
com.github.oshi
oshi-core
- 5.7.1
com.xjs
xjs-business-common
- 3.3.0
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 @@
com.xjs
xjs-business-common
- 3.3.0
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 @@
com.xjs
xjs-business-common
- 3.3.0
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 @@
com.xjs
xjs-business-common
- 3.3.0
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 @@
com.xjs
xjs-business-common
- 3.3.0
us.codecraft
webmagic-core
- 0.7.5
org.slf4j
@@ -39,7 +37,6 @@
us.codecraft
webmagic-extension
- 0.7.5