Skip to content

D
dataease
Unverified 提交 81ee2455 authored 作者: fit2cloud-chenyw's avatar fit2cloud-chenyw 提交者： GitHub
浏览文件
操作

Merge pull request #454 from dataease/feat_完善api

fix: 删除无用代码 增加knife4j api文档
上级 084aab5e b3d0b32e
全部展开 隐藏空白字符变更
内嵌 并排
正在显示 包含 20 行增加 和 244 行删除
backend/pom.xml
浏览文件 @ 81ee2455
......@@ -152,12 +152,6 @@
<version>${jwt.version}</version>
</dependency>
<!-- openapi -->
<dependency>
<groupId>org.springdoc</groupId>
<artifactId>springdoc-openapi-ui</artifactId>
<version>1.2.32</version>
</dependency>
......@@ -205,20 +199,11 @@
<version>0.0.7</version>
</dependency>
<!-- swagger2 解析 -->
<dependency>
<groupId>io.swagger</groupId>
<artifactId>swagger-parser</artifactId>
<version>1.0.51</version>
</dependency>
<!-- swagger3 解析 最新版本会有swagger-core版本冲突 -->
<dependency>
<groupId>io.swagger.parser.v3</groupId>
<artifactId>swagger-parser</artifactId>
<version>2.0.18</version>
<groupId>com.github.xiaoymin</groupId>
<artifactId>knife4j-spring-boot-starter</artifactId>
<version>3.0.3</version>
</dependency>
<!-- 执行 js 代码依赖 -->
<dependency>
<groupId>org.graalvm.sdk</groupId>
......
backend/src/main/java/io/dataease/auth/api/AuthApi.java
浏览文件 @ 81ee2455
......@@ -3,6 +3,7 @@ package io.dataease.auth.api;
import io.dataease.auth.api.dto.CurrentUserDto;
import io.dataease.auth.api.dto.LoginDto;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestMapping;
......@@ -15,19 +16,26 @@ import java.util.Map;
public interface AuthApi {
@ApiOperation("登录")
@PostMapping("/login")
Object login(LoginDto loginDto) throws Exception;
@ApiOperation("获取用户信息")
@PostMapping("/userInfo")
CurrentUserDto userInfo();
@GetMapping("/isLogin")
Boolean isLogin();
/*@GetMapping("/isLogin")
Boolean isLogin();*/
@ApiOperation("登出")
@PostMapping("/logout")
String logout();
@ApiOperation("验证账号")
@PostMapping("/validateName")
Boolean validateName(Map<String, String> nameDto);
......
backend/src/main/java/io/dataease/auth/api/dto/LoginDto.java
浏览文件 @ 81ee2455
package io.dataease.auth.api.dto;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.io.Serializable;
......@@ -7,7 +8,9 @@ import java.io.Serializable;
@Data
public class LoginDto implements Serializable {
@ApiModelProperty(value = "账号", required = true)
private String username;
@ApiModelProperty(value = "密码", required = true)
private String password;
}
backend/src/main/java/io/dataease/auth/server/AuthServer.java
浏览文件 @ 81ee2455
......@@ -98,10 +98,10 @@ public class AuthServer implements AuthApi {
return true;
}
@Override
/*@Override
public Boolean isLogin() {
return null;
}
}*/
}
backend/src/main/java/io/dataease/auth/service/impl/ShiroServiceImpl.java
浏览文件 @ 81ee2455
......@@ -20,6 +20,7 @@ public class ShiroServiceImpl implements ShiroService {
// 配置过滤:不会被拦截的链接 -> 放行 start ----------------------------------------------------------
// 放行Swagger2页面，需要放行这些
filterChainDefinitionMap.put("/doc.html",ANON);
filterChainDefinitionMap.put("/swagger-ui.html",ANON);
filterChainDefinitionMap.put("/swagger-ui/**",ANON);
filterChainDefinitionMap.put("/swagger/**",ANON);
......@@ -27,6 +28,7 @@ public class ShiroServiceImpl implements ShiroService {
filterChainDefinitionMap.put("/swagger-resources/**",ANON);
filterChainDefinitionMap.put("/v2/**",ANON);
filterChainDefinitionMap.put("/v3/**",ANON);
filterChainDefinitionMap.put("/static/**", ANON);
filterChainDefinitionMap.put("/css/**", ANON);
filterChainDefinitionMap.put("/js/**", ANON);
......
backend/src/main/java/io/dataease/base/domain/Issues.java deleted 100644 → 0
浏览文件 @ 084aab5e
package io.dataease.base.domain;
import java.io.Serializable;
import lombok.Data;
@Data
public class Issues implements Serializable {
private String id;
private String title;
private String status;
private Long createTime;
private Long updateTime;
private String reporter;
private String lastmodify;
private String platform;
private String description;
private String model;
private String projectName;
private String currentOwner;
private static final long serialVersionUID = 1L;
}
backend/src/main/java/io/dataease/base/domain/JarConfig.java deleted 100644 → 0
浏览文件 @ 084aab5e
package io.dataease.base.domain;
import java.io.Serializable;
import lombok.Data;
@Data
public class JarConfig implements Serializable {
private String id;
private String name;
private String fileName;
private String creator;
private String modifier;
private String path;
private Boolean enable;
private String description;
private Long createTime;
private Long updateTime;
private static final long serialVersionUID = 1L;
}
backend/src/main/java/io/dataease/base/domain/MessageTask.java deleted 100644 → 0
浏览文件 @ 084aab5e
package io.dataease.base.domain;
import lombok.Data;
import java.io.Serializable;
@Data
public class MessageTask implements Serializable {
private String id;
private String type;
private String event;
private String userId;
private String taskType;
private String webhook;
private String identification;
private Boolean isSet;
private String organizationId;
private String testId;
private Long createTime;
private String template;
private static final long serialVersionUID = 1L;
}
backend/src/main/java/io/dataease/base/domain/Organization.java deleted 100644 → 0
浏览文件 @ 084aab5e
package io.dataease.base.domain;
import lombok.Data;
import java.io.Serializable;
@Data
public class Organization implements Serializable {
private String id;
private String name;
private String description;
private Long createTime;
private Long updateTime;
private static final long serialVersionUID = 1L;
}
backend/src/main/java/io/dataease/base/domain/ServiceIntegration.java deleted 100644 → 0
浏览文件 @ 084aab5e
package io.dataease.base.domain;
import java.io.Serializable;
import lombok.Data;
@Data
public class ServiceIntegration implements Serializable {
private String id;
private String organizationId;
private String platform;
private String configuration;
private static final long serialVersionUID = 1L;
}
backend/src/main/java/io/dataease/base/domain/SwaggerUrlProject.java deleted 100644 → 0
浏览文件 @ 084aab5e
package io.dataease.base.domain;
import lombok.Data;
import java.io.Serializable;
@Data
public class SwaggerUrlProject implements Serializable {
private String id;
private String projectId;
private String swaggerUrl;
private String moduleId;
private String modulePath;
private String modeId;
private static final long serialVersionUID = 1L;
}
backend/src/main/java/io/dataease/base/mapper/IssuesMapper.java deleted 100644 → 0
浏览文件 @ 084aab5e
package io.dataease.base.mapper;
import io.dataease.base.domain.Issues;
import io.dataease.base.domain.IssuesExample;
import java.util.List;
import org.apache.ibatis.annotations.Param;
public interface IssuesMapper {
long countByExample(IssuesExample example);
int deleteByExample(IssuesExample example);
int deleteByPrimaryKey(String id);
int insert(Issues record);
int insertSelective(Issues record);
List<Issues> selectByExampleWithBLOBs(IssuesExample example);
List<Issues> selectByExample(IssuesExample example);
Issues selectByPrimaryKey(String id);
int updateByExampleSelective(@Param("record") Issues record, @Param("example") IssuesExample example);
int updateByExampleWithBLOBs(@Param("record") Issues record, @Param("example") IssuesExample example);
int updateByExample(@Param("record") Issues record, @Param("example") IssuesExample example);
int updateByPrimaryKeySelective(Issues record);
int updateByPrimaryKeyWithBLOBs(Issues record);
int updateByPrimaryKey(Issues record);
}
backend/src/main/java/io/dataease/base/mapper/JarConfigMapper.java deleted 100644 → 0
浏览文件 @ 084aab5e
package io.dataease.base.mapper;
import io.dataease.base.domain.JarConfig;
import io.dataease.base.domain.JarConfigExample;
import java.util.List;
import org.apache.ibatis.annotations.Param;
public interface JarConfigMapper {
long countByExample(JarConfigExample example);
int deleteByExample(JarConfigExample example);
int deleteByPrimaryKey(String id);
int insert(JarConfig record);
int insertSelective(JarConfig record);
List<JarConfig> selectByExample(JarConfigExample example);
JarConfig selectByPrimaryKey(String id);
int updateByExampleSelective(@Param("record") JarConfig record, @Param("example") JarConfigExample example);
int updateByExample(@Param("record") JarConfig record, @Param("example") JarConfigExample example);
int updateByPrimaryKeySelective(JarConfig record);
int updateByPrimaryKey(JarConfig record);
}
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论