diff --git a/pom.xml b/pom.xml
index 30b52b51..28e97e6b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -31,11 +31,32 @@
2.13.0
4.1.2
2.3
+ 5.8.22
+ 3.0.3
+
+
+ cn.hutool
+ hutool-all
+ ${hutool.version}
+
+
+
+
+ com.github.xiaoymin
+ knife4j-spring-boot-starter
+ ${knife4j.version}
+
+
+
+ com.github.xiaoymin
+ knife4j-micro-spring-boot-starter
+ ${knife4j.version}
+
diff --git a/ruoyi-admin/pom.xml b/ruoyi-admin/pom.xml
index 2e28443e..eaeda96f 100644
--- a/ruoyi-admin/pom.xml
+++ b/ruoyi-admin/pom.xml
@@ -23,6 +23,11 @@
spring-boot-starter-thymeleaf
+
+ com.github.xiaoymin
+ knife4j-spring-boot-starter
+
+
org.springframework.boot
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/app/LoginController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/app/LoginController.java
new file mode 100644
index 00000000..27a2e1c7
--- /dev/null
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/app/LoginController.java
@@ -0,0 +1,31 @@
+package com.ruoyi.web.controller.app;
+
+import com.ruoyi.common.core.domain.AjaxResult;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * 登陆相关接口
+ * @author clunt
+ */
+@Api(value = "App*登陆接口")
+@RestController
+@RequestMapping(value = "/app/login")
+public class LoginController {
+
+ //密码登陆
+ @ResponseBody
+ @PostMapping(value = "/loginByPhone")
+ @ApiOperation(value = "手机号登陆")
+ public AjaxResult loginByPhone(){
+
+ return AjaxResult.success();
+ }
+
+ // 手机号验证码登陆
+
+}
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/tool/SwaggerController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/tool/SwaggerController.java
index 079d7d2a..2c76784a 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/tool/SwaggerController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/tool/SwaggerController.java
@@ -15,10 +15,9 @@ import com.ruoyi.common.core.controller.BaseController;
@RequestMapping("/tool/swagger")
public class SwaggerController extends BaseController
{
- @RequiresPermissions("tool:swagger:view")
@GetMapping()
public String index()
{
- return redirect("/swagger-ui/index.html");
+ return redirect("/doc.html");
}
}
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/core/config/SwaggerConfig.java b/ruoyi-admin/src/main/java/com/ruoyi/web/core/config/SwaggerConfig.java
index 0cfbfbad..58018585 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/core/config/SwaggerConfig.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/core/config/SwaggerConfig.java
@@ -55,13 +55,13 @@ public class SwaggerConfig
// 用ApiInfoBuilder进行定制
return new ApiInfoBuilder()
// 设置标题
- .title("标题:若依管理系统_接口文档")
+ .title("标题:全民脱单_接口文档")
// 描述
- .description("描述:用于管理集团旗下公司的人员信息,具体包括XXX,XXX模块...")
+ .description("描述:全民脱单接口对接...")
// 作者信息
.contact(new Contact(RuoYiConfig.getName(), null, null))
// 版本
- .version("版本号:" + RuoYiConfig.getVersion())
+ .version("版本号:v1.0.0")
.build();
}
}
diff --git a/ruoyi-common/pom.xml b/ruoyi-common/pom.xml
index 3f77d517..ecc50476 100644
--- a/ruoyi-common/pom.xml
+++ b/ruoyi-common/pom.xml
@@ -17,6 +17,17 @@
+
+ cn.hutool
+ hutool-all
+
+
+
+
+ com.github.xiaoymin
+ knife4j-micro-spring-boot-starter
+
+
org.springframework
diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/ShiroConfig.java b/ruoyi-framework/src/main/java/com/ruoyi/framework/config/ShiroConfig.java
index e14a3b47..e25bd1e3 100644
--- a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/ShiroConfig.java
+++ b/ruoyi-framework/src/main/java/com/ruoyi/framework/config/ShiroConfig.java
@@ -294,6 +294,11 @@ public class ShiroConfig
filterChainDefinitionMap.put("/login", "anon,captchaValidate");
// 注册相关
filterChainDefinitionMap.put("/register", "anon,captchaValidate");
+ // 接口文档
+ filterChainDefinitionMap.put("/tool/swagger", "anon");
+ filterChainDefinitionMap.put("/tool/swagger/**", "anon");
+ // app登陆接口
+ filterChainDefinitionMap.put("/app/login/**", "anon");
// 系统权限列表
// filterChainDefinitionMap.putAll(SpringUtils.getBean(IMenuService.class).selectPermsAll());