添加TableName注解,Db模块更改返回类型

zyplayer-doc-api/src/main/java/com/zyplayer/doc/api/service/SwaggerHttpRequestService.java

@@ -6,7 +6,6 @@ import cn.hutool.http.HttpRequest;
 import cn.hutool.http.HttpResponse;
 import cn.hutool.http.HttpUtil;
 import cn.hutool.http.Method;
-import com.zyplayer.doc.api.controller.ApiPoxyRequestController;
 import com.zyplayer.doc.api.controller.param.ProxyRequestParam;
 import com.zyplayer.doc.api.controller.vo.HttpCookieVo;
 import com.zyplayer.doc.api.controller.vo.HttpHeaderVo;
@@ -195,9 +194,9 @@ public class SwaggerHttpRequestService {
 			httpRequest.body(requestParam.getBodyParam());
 		}
 		// 强制设置类型，貌似不用刻意设置，如果写的application/json，参数是表单，传过去收不到值，先注释这个
-//			if (StringUtils.isNotBlank(requestParam.getContentType())) {
+		//			if (StringUtils.isNotBlank(requestParam.getContentType())) {
-//				httpRequest.contentType(requestParam.getContentType());
+		//				httpRequest.contentType(requestParam.getContentType());
-//			}
+		//			}
 		// 执行请求
 		return httpRequest.timeout(10000).execute();
 	}

zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/config/security/DocUserDetails.java

@@ -39,15 +39,4 @@ public class DocUserDetails {
 		this.enabled = enabled;
 		this.userAuthList = userAuthList;
 	}
-
-	@Override
-	public String toString() {
-		return "DocUserDetails{" +
-				"userId=" + userId +
-				", username='" + username + '\'' +
-				", password='" + password + '\'' +
-				", enabled=" + enabled +
-				", userAuthList=" + userAuthList +
-				'}';
-	}
 }

zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/repository/manage/entity/ApiCustomNode.java

@@ -20,8 +20,6 @@ import java.util.Date;
 @TableName("api_custom_node")
 public class ApiCustomNode implements Serializable {
 
-    private static final long serialVersionUID = 1L;
-
     /**
      * 主键自增ID
      */

zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/repository/manage/entity/ApiCustomParams.java

@@ -20,8 +20,6 @@ import java.util.Date;
 @TableName("api_custom_params")
 public class ApiCustomParams implements Serializable {
 
-    private static final long serialVersionUID = 1L;
-
     /**
      * 主键自增ID
      */

zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/repository/manage/entity/ApiCustomRequest.java

@@ -20,8 +20,6 @@ import java.util.Date;
 @TableName("api_custom_request")
 public class ApiCustomRequest implements Serializable {
 
-    private static final long serialVersionUID = 1L;
-
     /**
      * 主键自增ID
      */

zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/repository/manage/entity/ApiRequestParam.java

@@ -20,8 +20,6 @@ import java.util.Date;
 @TableName("api_request_param")
 public class ApiRequestParam implements Serializable {
 
-    private static final long serialVersionUID = 1L;
-
     /**
      * 主键自增ID
      */

zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/repository/manage/entity/AuthInfo.java

@@ -2,6 +2,7 @@ package com.zyplayer.doc.data.repository.manage.entity;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
 
 import java.io.Serializable;
@@ -16,6 +17,7 @@ import java.util.Date;
  * @since 2018-12-05
  */
 @Data
+@TableName("auth_info")
 public class AuthInfo implements Serializable {
 
     /**

zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/repository/manage/entity/DbDatasource.java

@@ -2,20 +2,20 @@ package com.zyplayer.doc.data.repository.manage.entity;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
 
 import java.io.Serializable;
 import java.util.Date;
 
 /**
- * <p>
+ * 数据源对象
- *
- * </p>
  *
  * @author 暮光：城中城
  * @since 2019-07-04
  */
 @Data
+@TableName("db_datasource")
 public class DbDatasource implements Serializable {
 
     /**

zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/repository/manage/entity/DbFavorite.java

@@ -2,6 +2,7 @@ package com.zyplayer.doc.data.repository.manage.entity;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
 
 import java.io.Serializable;
@@ -16,6 +17,7 @@ import java.util.Date;
  * @since 2019-08-21
  */
 @Data
+@TableName("db_favorite")
 public class DbFavorite implements Serializable {
 
     /**

zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/repository/manage/entity/DbHistory.java

@@ -2,6 +2,7 @@ package com.zyplayer.doc.data.repository.manage.entity;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
 
 import java.io.Serializable;
@@ -16,6 +17,7 @@ import java.util.Date;
  * @since 2019-08-21
  */
 @Data
+@TableName("db_history")
 public class DbHistory implements Serializable {
 
     /**

zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/repository/manage/entity/DbProcLog.java

@@ -2,6 +2,7 @@ package com.zyplayer.doc.data.repository.manage.entity;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
 
 import java.io.Serializable;
@@ -16,6 +17,7 @@ import java.util.Date;
  * @since 2021-04-26
  */
 @Data
+@TableName("db_proc_log")
 public class DbProcLog implements Serializable {
 
     /**

zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/repository/manage/entity/DbTableRelation.java

@@ -2,6 +2,7 @@ package com.zyplayer.doc.data.repository.manage.entity;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
 
 import java.io.Serializable;
@@ -16,6 +17,7 @@ import java.util.Date;
  * @since 2021-06-07
  */
 @Data
+@TableName("db_table_relation")
 public class DbTableRelation implements Serializable {
 
     /**

zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/repository/manage/entity/DbTransferTask.java

@@ -2,6 +2,7 @@ package com.zyplayer.doc.data.repository.manage.entity;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
 
 import java.io.Serializable;
@@ -16,6 +17,7 @@ import java.util.Date;
  * @since 2019-09-30
  */
 @Data
+@TableName("db_transfer_task")
 public class DbTransferTask implements Serializable {
 
     /**

zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/repository/manage/entity/EsDatasource.java

@@ -2,6 +2,7 @@ package com.zyplayer.doc.data.repository.manage.entity;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
 
 import java.io.Serializable;
@@ -16,6 +17,7 @@ import java.util.Date;
  * @since 2019-07-27
  */
 @Data
+@TableName("es_datasource")
 public class EsDatasource implements Serializable {
 
     /**

zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/repository/manage/entity/UserAuth.java

@@ -2,6 +2,7 @@ package com.zyplayer.doc.data.repository.manage.entity;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
 
 import java.io.Serializable;
@@ -16,6 +17,7 @@ import java.util.Date;
  * @since 2019-05-31
  */
 @Data
+@TableName("user_auth")
 public class UserAuth implements Serializable {
 
     /**

zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/repository/manage/entity/UserGroup.java

@@ -2,6 +2,7 @@ package com.zyplayer.doc.data.repository.manage.entity;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
 
 import java.io.Serializable;
@@ -16,6 +17,7 @@ import java.util.Date;
  * @since 2021-02-08
  */
 @Data
+@TableName("user_group")
 public class UserGroup implements Serializable {
 
     /**

zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/repository/manage/entity/UserGroupAuth.java

@@ -2,6 +2,7 @@ package com.zyplayer.doc.data.repository.manage.entity;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
 
 import java.io.Serializable;
@@ -16,6 +17,7 @@ import java.util.Date;
  * @since 2021-02-09
  */
 @Data
+@TableName("user_group_auth")
 public class UserGroupAuth implements Serializable {
 
     /**

zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/repository/manage/entity/UserGroupRelation.java

@@ -2,6 +2,7 @@ package com.zyplayer.doc.data.repository.manage.entity;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
 
 import java.io.Serializable;
@@ -16,6 +17,7 @@ import java.util.Date;
  * @since 2021-02-08
  */
 @Data
+@TableName("user_group_relation")
 public class UserGroupRelation implements Serializable {
 
     /**

zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/repository/manage/entity/UserInfo.java

@@ -2,6 +2,7 @@ package com.zyplayer.doc.data.repository.manage.entity;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
 
 import java.io.Serializable;
@@ -16,6 +17,7 @@ import java.util.Date;
  * @since 2018-12-05
  */
 @Data
+@TableName("user_info")
 public class UserInfo implements Serializable {
 
     /**

zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/repository/manage/entity/UserMessage.java

@@ -2,6 +2,7 @@ package com.zyplayer.doc.data.repository.manage.entity;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
 
 import java.io.Serializable;
@@ -16,6 +17,7 @@ import java.util.Date;
  * @since 2020-06-23
  */
 @Data
+@TableName("user_message")
 public class UserMessage implements Serializable {
 
     /**

zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/repository/manage/entity/UserSetting.java

@@ -2,6 +2,7 @@ package com.zyplayer.doc.data.repository.manage.entity;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
 
 import java.io.Serializable;
@@ -16,6 +17,7 @@ import java.util.Date;
  * @since 2021-02-09
  */
 @Data
+@TableName("user_setting")
 public class UserSetting implements Serializable {
 
     /**

zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/repository/manage/entity/WikiPage.java

@@ -2,6 +2,7 @@ package com.zyplayer.doc.data.repository.manage.entity;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
 
 import java.io.Serializable;
@@ -16,6 +17,7 @@ import java.util.Date;
  * @since 2019-06-06
  */
 @Data
+@TableName("wiki_page")
 public class WikiPage implements Serializable {
 
     /**

zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/repository/manage/entity/WikiPageComment.java

@@ -2,6 +2,7 @@ package com.zyplayer.doc.data.repository.manage.entity;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
 
 import java.io.Serializable;
@@ -16,6 +17,7 @@ import java.util.Date;
  * @since 2019-02-24
  */
 @Data
+@TableName("wiki_page_comment")
 public class WikiPageComment implements Serializable {
 
     /**

zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/repository/manage/entity/WikiPageContent.java

@@ -2,6 +2,7 @@ package com.zyplayer.doc.data.repository.manage.entity;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
 
 import java.io.Serializable;
@@ -16,6 +17,7 @@ import java.util.Date;
  * @since 2019-02-24
  */
 @Data
+@TableName("wiki_page_content")
 public class WikiPageContent implements Serializable {
 
     /**

zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/repository/manage/entity/WikiPageFile.java

@@ -2,6 +2,7 @@ package com.zyplayer.doc.data.repository.manage.entity;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
 
 import java.io.Serializable;
@@ -16,6 +17,7 @@ import java.util.Date;
  * @since 2019-03-06
  */
 @Data
+@TableName("wiki_page_file")
 public class WikiPageFile implements Serializable {
 
     /**

zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/repository/manage/entity/WikiPageHistory.java

@@ -2,6 +2,7 @@ package com.zyplayer.doc.data.repository.manage.entity;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
 
 import java.io.Serializable;
@@ -16,6 +17,7 @@ import java.util.Date;
  * @since 2020-09-05
  */
 @Data
+@TableName("wiki_page_history")
 public class WikiPageHistory implements Serializable {
 
     /**

zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/repository/manage/entity/WikiPageZan.java

@@ -2,6 +2,7 @@ package com.zyplayer.doc.data.repository.manage.entity;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
 
 import java.io.Serializable;
@@ -16,6 +17,7 @@ import java.util.Date;
  * @since 2019-03-05
  */
 @Data
+@TableName("wiki_page_zan")
 public class WikiPageZan implements Serializable {
 
     /**

zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/repository/manage/entity/WikiSpace.java

@@ -2,6 +2,7 @@ package com.zyplayer.doc.data.repository.manage.entity;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
 
 import java.io.Serializable;
@@ -16,6 +17,7 @@ import java.util.Date;
  * @since 2019-03-11
  */
 @Data
+@TableName("wiki_space")
 public class WikiSpace implements Serializable {
 
     /**

zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/repository/manage/entity/WikiSpaceFavorite.java

@@ -2,6 +2,7 @@ package com.zyplayer.doc.data.repository.manage.entity;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
 
 import java.io.Serializable;
@@ -16,6 +17,7 @@ import java.util.Date;
  * @since 2021-02-09
  */
 @Data
+@TableName("wiki_space_favorite")
 public class WikiSpaceFavorite implements Serializable {
 
     /**

zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/repository/manage/entity/ZyplayerStorage.java

@@ -2,6 +2,7 @@ package com.zyplayer.doc.data.repository.manage.entity;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
 
 import java.io.Serializable;
@@ -16,6 +17,7 @@ import java.util.Date;
  * @since 2018-11-27
  */
 @Data
+@TableName("zyplayer_storage")
 public class ZyplayerStorage implements Serializable {
 
 	@TableId(value = "id", type = IdType.AUTO)

zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/service/manage/DbDatasourceService.java

@@ -1,16 +1,21 @@
 package com.zyplayer.doc.data.service.manage;
 
-import com.zyplayer.doc.data.repository.manage.entity.DbDatasource;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.zyplayer.doc.data.repository.manage.entity.DbDatasource;
+
+import java.util.List;
 
 /**
- * <p>
+ * 数据源业务接口
- *  服务类
- * </p>
  *
  * @author 暮光：城中城
  * @since 2019-07-04
  */
 public interface DbDatasourceService extends IService<DbDatasource> {
 
+	/**
+	 * 获取数据源列表(管理员返回所有数据源,用户返回有权限的数据源)
+	 * @return List<DbDatasource>
+	 */
+	List<DbDatasource> getDataSourceList();
 }

zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/service/manage/impl/DbDatasourceServiceImpl.java

@@ -1,11 +1,24 @@
 package com.zyplayer.doc.data.service.manage.impl;
 
-import com.zyplayer.doc.data.repository.manage.entity.DbDatasource;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.zyplayer.doc.data.repository.manage.mapper.DbDatasourceMapper;
-import com.zyplayer.doc.data.service.manage.DbDatasourceService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.zyplayer.doc.data.config.security.DocUserDetails;
+import com.zyplayer.doc.data.config.security.DocUserUtil;
+import com.zyplayer.doc.data.repository.manage.entity.DbDatasource;
+import com.zyplayer.doc.data.repository.manage.entity.UserAuth;
+import com.zyplayer.doc.data.repository.manage.mapper.DbDatasourceMapper;
+import com.zyplayer.doc.data.repository.support.consts.DocAuthConst;
+import com.zyplayer.doc.data.repository.support.consts.DocSysModuleType;
+import com.zyplayer.doc.data.repository.support.consts.DocSysType;
+import com.zyplayer.doc.data.service.manage.DbDatasourceService;
+import com.zyplayer.doc.data.service.manage.UserAuthService;
 import org.springframework.stereotype.Service;
 
+import javax.annotation.Resource;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.stream.Collectors;
+
 /**
  * <p>
  * 服务实现类
@@ -17,4 +30,31 @@ import org.springframework.stereotype.Service;
 @Service
 public class DbDatasourceServiceImpl extends ServiceImpl<DbDatasourceMapper, DbDatasource> implements DbDatasourceService {
 
+	@Resource
+	UserAuthService userAuthService;
+
+	@Override
+	public List<DbDatasource> getDataSourceList() {
+		DocUserDetails currentUser = DocUserUtil.getCurrentUser();
+		QueryWrapper<DbDatasource> wrapper = new QueryWrapper<>();
+		wrapper.eq("yn", 1);
+		// 没管理权限只返回有权限的数据源
+		if (!DocUserUtil.haveAuth(DocAuthConst.DB_DATASOURCE_MANAGE)) {
+			QueryWrapper<UserAuth> updateWrapper = new QueryWrapper<>();
+			updateWrapper.eq("sys_type", DocSysType.DB.getType());
+			updateWrapper.eq("sys_module_type", DocSysModuleType.Db.DATASOURCE.getType());
+			updateWrapper.eq("del_flag", 0);
+			updateWrapper.eq("user_id", currentUser.getUserId());
+			List<UserAuth> userAuthList = userAuthService.list(updateWrapper);
+			if (userAuthList == null || userAuthList.isEmpty()) {
+				return new ArrayList<>();
+			}
+			List<Long> userAuthDbIds = userAuthList.stream()
+					.map(UserAuth::getSysModuleId)
+					.collect(Collectors.toList());
+			wrapper.in("id", userAuthDbIds);
+		}
+		wrapper.select("id", "name", "group_name");
+		return list(wrapper);
+	}
 }

zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/controller/DatabaseDocController.java

@@ -1,18 +1,13 @@
 package com.zyplayer.doc.db.controller;
 
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.zyplayer.doc.core.annotation.AuthMan;
 import com.zyplayer.doc.core.exception.ConfirmException;
-import com.zyplayer.doc.core.json.ResponseJson;
-import com.zyplayer.doc.data.config.security.DocUserDetails;
 import com.zyplayer.doc.data.config.security.DocUserUtil;
 import com.zyplayer.doc.data.repository.manage.entity.DbDatasource;
-import com.zyplayer.doc.data.repository.manage.entity.UserAuth;
 import com.zyplayer.doc.data.repository.support.consts.DocAuthConst;
 import com.zyplayer.doc.data.repository.support.consts.DocSysModuleType;
 import com.zyplayer.doc.data.repository.support.consts.DocSysType;
 import com.zyplayer.doc.data.service.manage.DbDatasourceService;
-import com.zyplayer.doc.data.service.manage.UserAuthService;
 import com.zyplayer.doc.db.controller.vo.DatabaseExportVo;
 import com.zyplayer.doc.db.controller.vo.TableColumnVo;
 import com.zyplayer.doc.db.controller.vo.TableColumnVo.TableInfoVo;
@@ -28,7 +23,6 @@ import com.zyplayer.doc.db.framework.utils.PoiUtil;
 import com.zyplayer.doc.db.service.database.DatabaseServiceFactory;
 import com.zyplayer.doc.db.service.database.DbBaseService;
 import org.apache.commons.lang3.StringUtils;
-import org.apache.commons.lang3.math.NumberUtils;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
@@ -55,32 +49,16 @@ public class DatabaseDocController {
 	@Resource
 	DbDatasourceService dbDatasourceService;
 	@Resource
-	UserAuthService userAuthService;
-	@Resource
 	DatabaseServiceFactory databaseServiceFactory;
 
-	@PostMapping(value = "/getDataSourceList")
+	/**
-	public ResponseJson getDataSourceList() {
+	 * 获取数据源列表(管理员返回所有数据源,用户返回有权限的数据源)
-		DocUserDetails currentUser = DocUserUtil.getCurrentUser();
+	 * @return ResponseJson
-		QueryWrapper<DbDatasource> wrapper = new QueryWrapper<>();
+	 */
-		wrapper.eq("yn", 1);
+	@PostMapping("/getDataSourceList")
-		// 没管理权限只返回有权限的数据源
+	public DocDbResponseJson getDataSourceList() {
-		if (!DocUserUtil.haveAuth(DocAuthConst.DB_DATASOURCE_MANAGE)) {
+		List<DbDatasource> dataSourceList = dbDatasourceService.getDataSourceList();
-			QueryWrapper<UserAuth> updateWrapper = new QueryWrapper<>();
+		return DocDbResponseJson.ok(dataSourceList);
-			updateWrapper.eq("sys_type", DocSysType.DB.getType());
-			updateWrapper.eq("sys_module_type", DocSysModuleType.Db.DATASOURCE.getType());
-			updateWrapper.eq("del_flag", 0);
-			updateWrapper.eq("user_id", currentUser.getUserId());
-			List<UserAuth> userAuthList = userAuthService.list(updateWrapper);
-			if (userAuthList == null || userAuthList.isEmpty()) {
-				return DocDbResponseJson.ok();
-			}
-			List<Long> userAuthDbIds = userAuthList.stream().map(UserAuth::getSysModuleId).collect(Collectors.toList());
-			wrapper.in("id", userAuthDbIds);
-		}
-		wrapper.select("id", "name", "group_name");
-		List<DbDatasource> datasourceList = dbDatasourceService.list(wrapper);
-		return DocDbResponseJson.ok(datasourceList);
 	}
 
 	/**
@@ -90,7 +68,7 @@ public class DatabaseDocController {
 	 * @return 基本信息
 	 */
 	@PostMapping(value = "/getSourceBaseInfo")
-	public ResponseJson getSourceBaseInfo(Long sourceId) {
+	public DocDbResponseJson getSourceBaseInfo(Long sourceId) {
 		DbBaseService dbBaseService = databaseServiceFactory.getDbBaseService(sourceId);
 		Map<String, Object> dbResultMap = new HashMap<>();
 		dbResultMap.put("product", dbBaseService.getDatabaseProduct().name().toLowerCase());
@@ -98,42 +76,42 @@ public class DatabaseDocController {
 	}
 
 	@PostMapping(value = "/getTableDdl")
-	public ResponseJson getTableDdl(Long sourceId, String dbName, String tableName) {
+	public DocDbResponseJson getTableDdl(Long sourceId, String dbName, String tableName) {
 		DbBaseService dbBaseService = databaseServiceFactory.getDbBaseService(sourceId);
 		TableDdlVo tableDdlVo = dbBaseService.getTableDdl(sourceId, dbName, tableName);
 		return DocDbResponseJson.ok(tableDdlVo);
 	}
 
 	@PostMapping(value = "/getDatabaseList")
-	public ResponseJson getDatabaseList(Long sourceId) {
+	public DocDbResponseJson getDatabaseList(Long sourceId) {
 		DbBaseService dbBaseService = databaseServiceFactory.getDbBaseService(sourceId);
 		List<DatabaseInfoDto> databaseList = dbBaseService.getDatabaseList(sourceId);
 		return DocDbResponseJson.ok(databaseList);
 	}
 
 	@PostMapping(value = "/getTableStatus")
-	public ResponseJson getTableStatus(Long sourceId, String dbName, String tableName) {
+	public DocDbResponseJson getTableStatus(Long sourceId, String dbName, String tableName) {
 		DbBaseService dbBaseService = databaseServiceFactory.getDbBaseService(sourceId);
 		TableStatusVo tableStatusVo = dbBaseService.getTableStatus(sourceId, dbName, tableName);
 		return DocDbResponseJson.ok(tableStatusVo);
 	}
 
 	@PostMapping(value = "/getTableList")
-	public ResponseJson getTableList(Long sourceId, String dbName) {
+	public DocDbResponseJson getTableList(Long sourceId, String dbName) {
 		DbBaseService dbBaseService = databaseServiceFactory.getDbBaseService(sourceId);
 		List<TableInfoDto> tableList = dbBaseService.getTableList(sourceId, dbName);
 		return DocDbResponseJson.ok(tableList);
 	}
 
 	@PostMapping(value = "/getTableColumnList")
-	public ResponseJson getTableColumnList(Long sourceId, String dbName, String tableName) {
+	public DocDbResponseJson getTableColumnList(Long sourceId, String dbName, String tableName) {
 		DbBaseService dbBaseService = databaseServiceFactory.getDbBaseService(sourceId);
 		TableColumnVo tableColumnVo = dbBaseService.getTableColumnList(sourceId, dbName, tableName);
 		return DocDbResponseJson.ok(tableColumnVo);
 	}
 
 	@PostMapping(value = "/getTableAndColumnBySearch")
-	public ResponseJson getTableAndColumnBySearch(Long sourceId, String dbName, String searchText) {
+	public DocDbResponseJson getTableAndColumnBySearch(Long sourceId, String dbName, String searchText) {
 		if (StringUtils.isBlank(searchText)) {
 			return DocDbResponseJson.ok();
 		}
@@ -143,14 +121,14 @@ public class DatabaseDocController {
 	}
 
 	@PostMapping(value = "/getTableDescList")
-	public ResponseJson getTableDescList(Long sourceId, String dbName, String tableName) {
+	public DocDbResponseJson getTableDescList(Long sourceId, String dbName, String tableName) {
 		DbBaseService dbBaseService = databaseServiceFactory.getDbBaseService(sourceId);
 		List<TableDescDto> tableDescList = dbBaseService.getTableDescList(sourceId, dbName, tableName);
 		return DocDbResponseJson.ok(tableDescList);
 	}
 
 	@PostMapping(value = "/updateTableDesc")
-	public ResponseJson updateTableDesc(Long sourceId, String dbName, String tableName, String newDesc) {
+	public DocDbResponseJson updateTableDesc(Long sourceId, String dbName, String tableName, String newDesc) {
 		this.judgeAuth(sourceId, DbAuthType.DESC_EDIT.getName(), "没有修改该表注释的权限");
 		DbBaseService dbBaseService = databaseServiceFactory.getDbBaseService(sourceId);
 		dbBaseService.updateTableDesc(sourceId, dbName, tableName, newDesc);
@@ -158,7 +136,7 @@ public class DatabaseDocController {
 	}
 
 	@PostMapping(value = "/updateTableColumnDesc")
-	public ResponseJson updateTableColumnDesc(Long sourceId, String dbName, String tableName, String columnName, String newDesc) {
+	public DocDbResponseJson updateTableColumnDesc(Long sourceId, String dbName, String tableName, String columnName, String newDesc) {
 		this.judgeAuth(sourceId, DbAuthType.DESC_EDIT.getName(), "没有修改该表字段注释的权限");
 		DbBaseService dbBaseService = databaseServiceFactory.getDbBaseService(sourceId);
 		dbBaseService.updateTableColumnDesc(sourceId, dbName, tableName, columnName, newDesc);
@@ -166,7 +144,7 @@ public class DatabaseDocController {
 	}
 
 	@PostMapping(value = "/exportDatabase")
-	public ResponseJson exportDatabase(HttpServletResponse response, Long sourceId, String dbName, String tableNames, Integer exportType, Integer exportFormat) {
+	public DocDbResponseJson exportDatabase(HttpServletResponse response, Long sourceId, String dbName, String tableNames, Integer exportType, Integer exportFormat) {
 		if (StringUtils.isBlank(tableNames)) {
 			return DocDbResponseJson.warn("请选择需要导出的表");
 		}
@@ -235,4 +213,3 @@ public class DatabaseDocController {
 		}
 	}
 }
-

zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/controller/DbDataViewController.java

@@ -6,7 +6,6 @@ import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.serializer.SerializerFeature;
 import com.alibaba.fastjson.util.TypeUtils;
 import com.zyplayer.doc.core.annotation.AuthMan;
-import com.zyplayer.doc.core.json.ResponseJson;
 import com.zyplayer.doc.db.controller.download.FormatDownloadConst;
 import com.zyplayer.doc.db.controller.download.FormatDownloadService;
 import com.zyplayer.doc.db.controller.param.DataViewParam;
@@ -65,7 +64,7 @@ public class DbDataViewController {
 	 * @since 2021-08-14
 	 */
 	@PostMapping(value = "/query")
-	public ResponseJson query(DataViewParam param) {
+	public DocDbResponseJson query(DataViewParam param) {
 		// 数据查询
 		ExecuteType executeType = executeAuthService.getExecuteType(param.getSourceId());
 		DbBaseService dbBaseService = databaseServiceFactory.getDbBaseService(param.getSourceId());
@@ -91,7 +90,7 @@ public class DbDataViewController {
 	 * @author 暮光：城中城
 	 */
 	@PostMapping(value = "/deleteTableLineData")
-	public ResponseJson deleteTableLineData(Long sourceId, String dbName, String tableName, String lineJson) {
+	public DocDbResponseJson deleteTableLineData(Long sourceId, String dbName, String tableName, String lineJson) {
 		JSONArray lineJsonArr = JSON.parseArray(lineJson);
 		DbBaseService dbBaseService = databaseServiceFactory.getDbBaseService(sourceId);
 		dbBaseService.deleteTableLineData(sourceId, dbName, tableName, lineJsonArr);
@@ -107,7 +106,7 @@ public class DbDataViewController {
 	 * @author 暮光：城中城
 	 */
 	@PostMapping(value = "/downloadMultiple")
-	public ResponseJson downloadMultiple(HttpServletResponse response, DataViewParam param) {
+	public DocDbResponseJson downloadMultiple(HttpServletResponse response, DataViewParam param) {
 		if (StringUtils.isBlank(param.getTableNames())) {
 			return DocDbResponseJson.warn("请选择导出的表");
 		}
@@ -174,4 +173,3 @@ public class DbDataViewController {
 		}
 	}
 }
-

zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/controller/DbDatasourceController.java

@@ -5,7 +5,6 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.zyplayer.doc.core.annotation.AuthMan;
 import com.zyplayer.doc.core.exception.ConfirmException;
-import com.zyplayer.doc.core.json.ResponseJson;
 import com.zyplayer.doc.data.config.security.DocUserDetails;
 import com.zyplayer.doc.data.config.security.DocUserUtil;
 import com.zyplayer.doc.data.repository.manage.entity.DbDatasource;
@@ -43,7 +42,7 @@ public class DbDatasourceController {
 	DbDatasourceService dbDatasourceService;
 
 	@PostMapping(value = "/list")
-	public ResponseJson list(Integer pageNum, Integer pageSize, String name, String groupName) {
+	public DocDbResponseJson list(Integer pageNum, Integer pageSize, String name, String groupName) {
 		QueryWrapper<DbDatasource> wrapper = new QueryWrapper<>();
 		wrapper.eq("yn", 1);
 		wrapper.eq(StringUtils.isNotBlank(groupName), "group_name", groupName);
@@ -57,7 +56,7 @@ public class DbDatasourceController {
 	}
 
 	@PostMapping(value = "/groups")
-	public ResponseJson groups() {
+	public DocDbResponseJson groups() {
 		QueryWrapper<DbDatasource> wrapper = new QueryWrapper<>();
 		wrapper.eq("yn", 1);
 		wrapper.isNotNull("group_name");
@@ -72,7 +71,7 @@ public class DbDatasourceController {
 	}
 
 	@PostMapping(value = "/test")
-	public ResponseJson test(DbDatasource dbDatasource) {
+	public DocDbResponseJson test(DbDatasource dbDatasource) {
 		// 验证新的数据源
 		try {
 			// 获取原始密码
@@ -94,7 +93,7 @@ public class DbDatasourceController {
 	}
 
 	@PostMapping(value = "/update")
-	public ResponseJson update(DbDatasource dbDatasource) {
+	public DocDbResponseJson update(DbDatasource dbDatasource) {
 		if (StringUtils.isBlank(dbDatasource.getName())) {
 			return DocDbResponseJson.warn("名字必填");
 		} else if (StringUtils.isBlank(dbDatasource.getDriverClassName())) {
@@ -129,4 +128,3 @@ public class DbDatasourceController {
 		return DocDbResponseJson.ok();
 	}
 }
-

zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/controller/DbProcedureController.java

@@ -5,7 +5,6 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.zyplayer.doc.core.annotation.AuthMan;
 import com.zyplayer.doc.core.exception.ConfirmException;
-import com.zyplayer.doc.core.json.ResponseJson;
 import com.zyplayer.doc.data.config.security.DocUserDetails;
 import com.zyplayer.doc.data.config.security.DocUserUtil;
 import com.zyplayer.doc.data.repository.manage.entity.DbProcLog;
@@ -55,7 +54,7 @@ public class DbProcedureController {
 	 * @return 列表
 	 */
 	@PostMapping(value = "/list")
-	public ResponseJson list(ProcedureListParam procedureParam) {
+	public DocDbResponseJson list(ProcedureListParam procedureParam) {
 		try {
 			DbBaseService dbBaseService = databaseServiceFactory.getDbBaseService(procedureParam.getSourceId());
 			procedureParam.setOffset((procedureParam.getPageNum() - 1) * procedureParam.getPageSize());
@@ -81,7 +80,7 @@ public class DbProcedureController {
 	 * @return 详情
 	 */
 	@PostMapping(value = "/detail")
-	public ResponseJson detail(Long sourceId, String dbName, String typeName, String procName) {
+	public DocDbResponseJson detail(Long sourceId, String dbName, String typeName, String procName) {
 		DbBaseService dbBaseService = databaseServiceFactory.getDbBaseService(sourceId);
 		try {
 			ProcedureDto procedureDto = dbBaseService.getProcedureDetail(sourceId, dbName, typeName, procName);
@@ -102,7 +101,7 @@ public class DbProcedureController {
 	 * @return 结果
 	 */
 	@PostMapping(value = "/delete")
-	public ResponseJson delete(Long sourceId, String dbName, String typeName, String procName) {
+	public DocDbResponseJson delete(Long sourceId, String dbName, String typeName, String procName) {
 		this.judgeAuth(sourceId, DbAuthType.PROC_EDIT.getName(), "没有修改该库函数的权限");
 		DbProcLog dbProcLog = this.createDbProcLog(sourceId, dbName, typeName, procName, "删除函数操作");
 		try {
@@ -129,7 +128,7 @@ public class DbProcedureController {
 	 * @return 结果
 	 */
 	@PostMapping(value = "/save")
-	public ResponseJson save(Long sourceId, String dbName, String typeName, String procName, String procSql) {
+	public DocDbResponseJson save(Long sourceId, String dbName, String typeName, String procName, String procSql) {
 		this.judgeAuth(sourceId, DbAuthType.PROC_EDIT.getName(), "没有修改该库函数的权限");
 		DbProcLog dbProcLog = this.createDbProcLog(sourceId, dbName, typeName, procName, procSql);
 		try {
@@ -158,7 +157,7 @@ public class DbProcedureController {
 	 * @return 列表
 	 */
 	@PostMapping(value = "/log/list")
-	public ResponseJson logList(Integer pageNum, Integer pageSize, Long sourceId, String dbName, String typeName, String procName) {
+	public DocDbResponseJson logList(Integer pageNum, Integer pageSize, Long sourceId, String dbName, String typeName, String procName) {
 		QueryWrapper<DbProcLog> wrapper = new QueryWrapper<>();
 		wrapper.eq("datasource_id", sourceId);
 		wrapper.eq("proc_db", dbName);
@@ -178,7 +177,7 @@ public class DbProcedureController {
 	 * @return 详情
 	 */
 	@PostMapping(value = "/log/detail")
-	public ResponseJson logDetail(Long logId) {
+	public DocDbResponseJson logDetail(Long logId) {
 		DbProcLog dbProcLog = dbProcLogService.getById(logId);
 		return DocDbResponseJson.ok(dbProcLog);
 	}
@@ -220,4 +219,3 @@ public class DbProcedureController {
 		return dbProcLog;
 	}
 }
-

zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/controller/DbSqlExecutorController.java

@@ -4,7 +4,6 @@ import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.serializer.SerializerFeature;
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.zyplayer.doc.core.annotation.AuthMan;
-import com.zyplayer.doc.core.json.ResponseJson;
 import com.zyplayer.doc.data.config.security.DocUserDetails;
 import com.zyplayer.doc.data.config.security.DocUserUtil;
 import com.zyplayer.doc.data.repository.manage.entity.DbFavorite;
@@ -57,7 +56,7 @@ public class DbSqlExecutorController {
 	DatabaseServiceFactory databaseServiceFactory;
 
 	@PostMapping(value = "/execute")
-	public ResponseJson execute(Long sourceId, String executeId, String dbName, String sql, String params) {
+	public DocDbResponseJson execute(Long sourceId, String executeId, String dbName, String sql, String params) {
 		if (StringUtils.isBlank(sql)) {
 			return DocDbResponseJson.warn("执行的SQL不能为空");
 		}
@@ -109,13 +108,13 @@ public class DbSqlExecutorController {
 	}
 
 	@PostMapping(value = "/cancel")
-	public ResponseJson cancel(String executeId) {
+	public DocDbResponseJson cancel(String executeId) {
 		sqlExecutor.cancel(executeId);
 		return DocDbResponseJson.ok();
 	}
 
 	@PostMapping(value = "/history/list")
-	public ResponseJson historyList(Long sourceId) {
+	public DocDbResponseJson historyList(Long sourceId) {
 		UpdateWrapper<DbHistory> wrapper = new UpdateWrapper<>();
 		wrapper.eq(sourceId != null, "datasource_id", sourceId);
 		wrapper.orderByDesc("id");
@@ -124,7 +123,7 @@ public class DbSqlExecutorController {
 	}
 
 	@PostMapping(value = "/favorite/list")
-	public ResponseJson favoriteList(Long sourceId) {
+	public DocDbResponseJson favoriteList(Long sourceId) {
 		DocUserDetails currentUser = DocUserUtil.getCurrentUser();
 		UpdateWrapper<DbFavorite> wrapper = new UpdateWrapper<>();
 		wrapper.eq(sourceId != null, "datasource_id", sourceId);
@@ -136,7 +135,7 @@ public class DbSqlExecutorController {
 	}
 
 	@PostMapping(value = "/favorite/add")
-	public ResponseJson addFavorite(DbFavorite dbFavorite) {
+	public DocDbResponseJson addFavorite(DbFavorite dbFavorite) {
 		Integer yn = Optional.ofNullable(dbFavorite.getYn()).orElse(1);
 		if (yn == 1) {
 			if (StringUtils.isBlank(dbFavorite.getContent())) {
@@ -158,4 +157,3 @@ public class DbSqlExecutorController {
 	}
 
 }
-

zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/controller/DbTableRelationController.java

@@ -2,7 +2,6 @@ package com.zyplayer.doc.db.controller;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.zyplayer.doc.core.annotation.AuthMan;
-import com.zyplayer.doc.core.json.ResponseJson;
 import com.zyplayer.doc.data.repository.manage.entity.DbTableRelation;
 import com.zyplayer.doc.data.repository.manage.param.TableRelationParam;
 import com.zyplayer.doc.data.repository.manage.vo.TableRelationVo;
@@ -41,7 +40,7 @@ public class DbTableRelationController {
 	DbTableRelationService dbTableRelationService;
 
 	@PostMapping(value = "/update")
-	public ResponseJson update(TableRelationParam param) {
+	public DocDbResponseJson update(TableRelationParam param) {
 		DbBaseService dbBaseService = databaseServiceFactory.getDbBaseService(param.getSourceId());
 		dbBaseService.judgeAuth(param.getSourceId(), DbAuthType.UPDATE.getName(), "没有该库的执行权限");
 		dbTableRelationService.update(param);
@@ -49,7 +48,7 @@ public class DbTableRelationController {
 	}
 
 	@PostMapping(value = "/getRelation")
-	public ResponseJson getRelation(TableRelationParam param) {
+	public DocDbResponseJson getRelation(TableRelationParam param) {
 		TableRelationVo relationVo = new TableRelationVo();
 		relationVo.setDbName(param.getDbName());
 		relationVo.setName(param.getTableName());
@@ -137,4 +136,3 @@ public class DbTableRelationController {
 		return resultRelationList;
 	}
 }
-

zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/controller/DbTransferDataController.java

@@ -2,7 +2,6 @@ package com.zyplayer.doc.db.controller;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.zyplayer.doc.core.annotation.AuthMan;
-import com.zyplayer.doc.core.json.ResponseJson;
 import com.zyplayer.doc.data.config.security.DocUserDetails;
 import com.zyplayer.doc.data.config.security.DocUserUtil;
 import com.zyplayer.doc.data.repository.manage.entity.DbTransferTask;
@@ -35,19 +34,19 @@ public class DbTransferDataController {
 	DbTransferTaskService dbTransferTaskService;
 
 	@PostMapping(value = "/start")
-	public ResponseJson doTransfer(Long id) {
+	public DocDbResponseJson doTransfer(Long id) {
 		transferDataServer.transferData(id);
 		return DocDbResponseJson.ok();
 	}
 
 	@PostMapping(value = "/cancel")
-	public ResponseJson cancel(Long id) {
+	public DocDbResponseJson cancel(Long id) {
 		transferDataServer.cancel(id);
 		return DocDbResponseJson.ok();
 	}
 
 	@PostMapping(value = "/list")
-	public ResponseJson list() {
+	public DocDbResponseJson list() {
 		QueryWrapper<DbTransferTask> queryWrapper = new QueryWrapper<>();
 		queryWrapper.eq("del_flag", 0);
 		queryWrapper.select(
@@ -59,13 +58,13 @@ public class DbTransferDataController {
 	}
 
 	@PostMapping(value = "/detail")
-	public ResponseJson detail(Long id) {
+	public DocDbResponseJson detail(Long id) {
 		DbTransferTask transferTask = dbTransferTaskService.getById(id);
 		return DocDbResponseJson.ok(transferTask);
 	}
 
 	@PostMapping(value = "/update")
-	public ResponseJson update(DbTransferTask transferTask) {
+	public DocDbResponseJson update(DbTransferTask transferTask) {
 		DbTransferTask transferTaskUp = new DbTransferTask();
 		if (transferTask.getId() == null) {
 			DocUserDetails currentUser = DocUserUtil.getCurrentUser();
@@ -88,7 +87,7 @@ public class DbTransferDataController {
 	}
 
 	@PostMapping("/sqlColumns")
-	public ResponseJson sqlColumns(String sql) {
+	public DocDbResponseJson sqlColumns(String sql) {
 		List<String> selectNames = SqlParseUtil.getSelectNames(sql);
 		return DocDbResponseJson.ok(selectNames);
 	}

zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/framework/json/DocDbResponseJson.java

@@ -4,7 +4,6 @@ import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.serializer.SerializeConfig;
 import com.alibaba.fastjson.serializer.SimpleDateFormatSerializer;
 import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.zyplayer.doc.core.json.ResponseJson;
 import lombok.Data;
 
 import javax.servlet.http.HttpServletResponse;
@@ -18,7 +17,7 @@ import java.util.Date;
  * @since 2018年8月8日
  */
 @Data
-public class DocDbResponseJson implements ResponseJson {
+public class DocDbResponseJson {
 	private static SerializeConfig mapping = new SerializeConfig();
 	static {
 		mapping.put(Date.class, new SimpleDateFormatSerializer("yyyy-MM-dd HH:mm:ss"));