diff --git a/index/.keep b/index/.keep
deleted file mode 100644
index e69de29bb..000000000
diff --git a/pom.xml b/pom.xml
index cb9ecfbb2..db8776354 100644
--- a/pom.xml
+++ b/pom.xml
@@ -90,11 +90,15 @@
+
io.springfox
springfox-swagger-ui
${swagger.version}
+
+
+
@@ -183,6 +187,7 @@
ruoyi-quartz
ruoyi-generator
ruoyi-common
+ ruoyi-index
pom
diff --git a/ruoyi-admin/pom.xml b/ruoyi-admin/pom.xml
index 1ed741f4f..06ce18ada 100644
--- a/ruoyi-admin/pom.xml
+++ b/ruoyi-admin/pom.xml
@@ -24,30 +24,6 @@
true
-
-
- io.springfox
- springfox-swagger2
-
-
-
-
- io.swagger
- swagger-annotations
- 1.5.21
-
-
-
- io.swagger
- swagger-models
- 1.5.21
-
-
-
-
- io.springfox
- springfox-swagger-ui
-
diff --git a/ruoyi-admin/src/main/resources/application-druid.yml b/ruoyi-admin/src/main/resources/application-druid.yml
index cdfb3390b..cb9c5bf7c 100644
--- a/ruoyi-admin/src/main/resources/application-druid.yml
+++ b/ruoyi-admin/src/main/resources/application-druid.yml
@@ -6,9 +6,9 @@ spring:
druid:
# 主库数据源
master:
- url: jdbc:mysql://localhost:3306/ry-vue?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
+ url: jdbc:mysql://localhost:3306/p-search?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
username: root
- password: password
+ password: 123456
# 从库数据源
slave:
# 从数据源开关/默认关闭
diff --git a/ruoyi-admin/src/main/resources/application.yml b/ruoyi-admin/src/main/resources/application.yml
index c87725a42..ac37b6a53 100644
--- a/ruoyi-admin/src/main/resources/application.yml
+++ b/ruoyi-admin/src/main/resources/application.yml
@@ -9,7 +9,7 @@ ruoyi:
# 实例演示开关
demoEnabled: true
# 文件路径 示例( Windows配置D:/ruoyi/uploadPath,Linux配置 /home/ruoyi/uploadPath)
- profile: D:/ruoyi/uploadPath
+ profile: /Users/wuwei/work/p-workspace/ruoyi/uploadPath
# 获取ip地址开关
addressEnabled: false
@@ -63,7 +63,7 @@ spring:
# 密码
password:
# 连接超时时间
- timeout: 10s
+ timeout: 100s
lettuce:
pool:
# 连接池中的最小空闲连接
diff --git a/ruoyi-admin/src/main/resources/banner.txt b/ruoyi-admin/src/main/resources/banner.txt
index 94662592f..6c290bc25 100644
--- a/ruoyi-admin/src/main/resources/banner.txt
+++ b/ruoyi-admin/src/main/resources/banner.txt
@@ -20,5 +20,5 @@ Spring Boot Version: ${spring-boot.version}
// ========`-.____`-.___\_____/___.-`____.-'======== //
// `=---=' //
// ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ //
-// 佛祖保佑 永不宕机 永无BUG //
+// 佛祖保佑 永不宕机 永无BUG //
////////////////////////////////////////////////////////////////////
\ No newline at end of file
diff --git a/ruoyi-admin/src/main/resources/logback.xml b/ruoyi-admin/src/main/resources/logback.xml
index d69a57207..2d95cea2a 100644
--- a/ruoyi-admin/src/main/resources/logback.xml
+++ b/ruoyi-admin/src/main/resources/logback.xml
@@ -1,7 +1,7 @@
-
+
diff --git a/ruoyi-common/pom.xml b/ruoyi-common/pom.xml
index e4c677a2a..c64f87fec 100644
--- a/ruoyi-common/pom.xml
+++ b/ruoyi-common/pom.xml
@@ -17,6 +17,38 @@
+
+
+ io.springfox
+ springfox-swagger2
+
+
+
+
+ io.swagger
+ swagger-annotations
+ 1.5.21
+
+
+
+ io.swagger
+ swagger-models
+ 1.5.21
+
+
+
+
+ io.springfox
+ springfox-swagger-ui
+
+
+ com.github.xiaoymin
+ knife4j-spring-ui
+ 2.0.4
+
+
+
+
org.springframework
diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/SecurityConfig.java b/ruoyi-framework/src/main/java/com/ruoyi/framework/config/SecurityConfig.java
index b27b16551..fe42ef044 100644
--- a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/SecurityConfig.java
+++ b/ruoyi-framework/src/main/java/com/ruoyi/framework/config/SecurityConfig.java
@@ -105,6 +105,7 @@ public class SecurityConfig extends WebSecurityConfigurerAdapter
.antMatchers("/webjars/**").anonymous()
.antMatchers("/*/api-docs").anonymous()
.antMatchers("/druid/**").anonymous()
+ .antMatchers("/doc.html").anonymous()
// 除上面外的所有请求全部需要鉴权认证
.anyRequest().authenticated()
.and()
diff --git a/ruoyi-index/pom.xml b/ruoyi-index/pom.xml
new file mode 100644
index 000000000..7ccfb7d0b
--- /dev/null
+++ b/ruoyi-index/pom.xml
@@ -0,0 +1,15 @@
+
+
+
+ ruoyi
+ com.ruoyi
+ 3.0.0
+
+ 4.0.0
+
+ ruoyi-index
+
+
+
\ No newline at end of file