修改commom pom

4dkankan-center-platform/src/main/java/com/fdkankan/agent/controller/AgentController.java

@@ -5,9 +5,7 @@ import com.auth0.jwt.JWT;
 import com.fdkankan.agent.dto.AgentDto;
 import com.fdkankan.agent.entity.Agent;
 import com.fdkankan.agent.service.IAgentService;
-import com.fdkankan.common.base.JsonResult;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
+import com.fdkankan.common.response.ResultData;
 import lombok.extern.log4j.Log4j2;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -19,7 +17,6 @@ import javax.servlet.http.HttpServletRequest;
 import java.util.LinkedHashMap;
 
 @Log4j2
-@Api(tags = "代理商模块")
 @RestController
 @RequestMapping("/api/agent")
 public class AgentController {
@@ -29,13 +26,12 @@ public class AgentController {
     IAgentService agentService;
 
     @Autowired
-    JsonResult jsonResult;
+    ResultData resultData;
 
     /**
      * 获取代理商信息
      * @return
      */
-    @ApiOperation("获取代理商信息")
     @RequestMapping(value = {"/detail"}, method = RequestMethod.POST)
     public String detail(HttpServletRequest request ) throws Exception {
         String userName = JWT.decode( request.getHeader("token")).getClaim("userName").asString();
@@ -46,7 +42,7 @@ public class AgentController {
         Agent one = agentService.getOne(queryMap);
         AgentDto agentDto = new AgentDto();
         BeanUtils.copyProperties(one, agentDto);
-        return jsonResult.ok(agentDto);
+        return resultData.ok(agentDto);
     }
 
 }

4dkankan-center-platform/src/main/java/com/fdkankan/common/base/AbstractService.java

@@ -1,164 +0,0 @@
-package com.fdkankan.common.base;
-
-import java.io.Serializable;
-import java.util.LinkedHashMap;
-import java.util.List;
-
-public abstract class AbstractService<T extends Serializable> implements IServiceOperations<T> {
-
-	protected abstract IOperations<T> getMapper();
-	
-	protected String tableName = "";
-
-	public abstract void setTableName(String tableName);
-	
-	protected String getTableName() {
-		return this.tableName;
-	}
-	
-	@Override
-	public void insert(T entity) {
-		getMapper().insert(entity, this.getTableName());
-	}
-
-	@Override
-	public int insertByBatch(List<T> list) {
-		return getMapper().insertByBatch(list, this.getTableName());
-	}
-
-	@Override
-	public int update(List<T> list) {
-		return getMapper().update(list, this.getTableName());
-	}
-	
-	@Override
-	public int updateByBatch(LinkedHashMap<String, String> condition, String field) {
-		return getMapper().updateByBatch(condition, field, this.getTableName());
-	}
-
-	@Override
-	public T getById(int id) {
-		return getMapper().getById(id, this.getTableName());
-	}
-
-	@Override
-	public T getOne(LinkedHashMap<String, String> condition) {
-		String field = null;
-		return this.getOne(condition, field, this.getTableName());
-	}
-
-	@Override
-	public T getOne(LinkedHashMap<String, String> condition, String field) {
-		return getMapper().getOne(condition, field, this.getTableName());
-	}
-
-	@Override
-	public int getCount(LinkedHashMap<String, String> condition, String field) {
-		return getMapper().getCount(condition, field, this.getTableName());
-	}
-
-	@Override
-	public List<T> getList(LinkedHashMap<String, String> condition, int pageNo, int pageSize, String order, String field) {
-		int offset = (pageNo - 1) * pageSize;
-		int limit = pageSize;
-		return getMapper().getList(condition, offset, limit, order, field, this.getTableName());
-	}
-	
-	@Override
-	public List<T> getAllList(LinkedHashMap<String, String> condition) {
-		return this.getAllList(condition, null);
-	}
-	
-	@Override
-	public List<T> getAllList(LinkedHashMap<String, String> condition, String order) {
-		if(order == null || order.trim().length() == 0) {
-			order = null;
-		}
-		return getMapper().getList(condition, 0, 0, order, null, this.getTableName());
-	}
-
-	@Override
-	public List<T> getList(int pageNo, int pageSize) {
-		String order = null;
-		return this.getList(pageNo, pageSize, order);
-	}
-
-	@Override
-	public List<T> getList(int pageNo, int pageSize, String order) {
-		String field = null;
-		return this.getList(pageNo, pageSize, order, field);
-	}
-
-	@Override
-	public List<T> getList(int pageNo, int pageSize, String order, String field) {
-		LinkedHashMap<String, String> condition = new LinkedHashMap<String, String>();
-		return this.getList(condition, pageNo, pageSize, order, field);
-	}
-
-	@Override
-	public List<T> getList(LinkedHashMap<String, String> condition, int pageNo, int pageSize) {
-		String order = null;
-		return this.getList(condition, pageNo, pageSize, order);
-	}
-
-	@Override
-	public List<T> getList(LinkedHashMap<String, String> condition, int pageNo, int pageSize, String order) {
-		String field = null;
-		return this.getList(condition, pageNo, pageSize, order, field);
-	}
-
-	@Override
-	public int existTable(String tableName) {
-		return getMapper().existTable(tableName);
-	}
-
-	@Override
-	public int createTable(String tableName) {
-		return getMapper().createTable(tableName);
-	}
-
-	// 以下暂时没有场景用到，留在这里，需要时候根据实际情况进行修改即可。
-	@Override
-	public void insert(T entity, String tableName) {
-		this.getMapper().insert(entity, tableName);
-	}
-
-	@Override
-	public int insertByBatch(List<T> list, String tableName) {
-		return this.getMapper().insertByBatch(list, tableName);
-	}
-
-	@Override
-	public int update(List<T> list, String tableName) {
-		return this.update(list, tableName);
-	}
-	
-	@Override
-	public int updateByBatch(LinkedHashMap<String, String> condition, String field, String tableName) {
-		return this.getMapper().updateByBatch(condition, field, this.getTableName());
-	}
-
-	@Override
-	public T getById(int id, String tableName) {
-		return this.getMapper().getById(id, tableName);
-	}
-
-	@Override
-	public T getOne(LinkedHashMap<String, String> condition, String field, String tableName) {
-		return this.getMapper().getOne(condition, field, tableName);
-	}
-
-	@Override
-	public int getCount(LinkedHashMap<String, String> condition, String field, String tableName) {
-		return this.getMapper().getCount(condition, field, tableName);
-	}
-
-	@Override
-	public List<T> getList(LinkedHashMap<String, String> condition, int offset, int limit, String order, String field, String tableName) {
-		return this.getMapper().getList(condition, offset, limit, order, field, tableName);
-	}
-
-}
-
-
-

4dkankan-center-platform/src/main/java/com/fdkankan/common/base/Config.java

@@ -1,8 +0,0 @@
-package com.fdkankan.common.base;
-
-import org.springframework.context.annotation.Configuration;
-
-@Configuration
-public class Config {
-    public static String VERSION = "V1.0.0";
-}

4dkankan-center-platform/src/main/java/com/fdkankan/common/base/IOperations.java

@@ -1,38 +0,0 @@
-package com.fdkankan.common.base;
-
-
-import org.apache.ibatis.annotations.Param;
-
-import java.io.Serializable;
-import java.util.LinkedHashMap;
-import java.util.List;
-
-public interface IOperations<T extends Serializable> {
-
-	void insert(@Param("entity") final T entity, @Param("tableName") String tableName);
-
-	int insertByBatch(@Param("list") List<T> list, @Param("tableName") String tableName);
-
-	int update(@Param("list") List<T> list, @Param("tableName") String tableName);
-	
-	int updateByBatch(@Param("condition") LinkedHashMap<String, String> condition, @Param("field") String field, @Param("tableName") String tableName);
-
-	T getById(@Param("id") final int id, @Param("tableName") String tableName);
-
-	T getOne(@Param("condition") LinkedHashMap<String, String> condition, @Param("field") String field, @Param("tableName") String tableName);
-
-	int getCount(@Param("condition") LinkedHashMap<String, String> condition, @Param("field") String field, @Param("tableName") String tableName);
-
-	List<T> getList(@Param("condition") LinkedHashMap<String, String> condition, @Param("offset") int offset, @Param("limit") int limit, @Param("order") String order,
-			@Param("field") String field, @Param("tableName") String tableName);
-
-	// 以下方法特殊，为判断表是否存在，批量和创建表
-
-	int existTable(@Param("tableName") String tableName);
-
-	int createTable(@Param("tableName") String tableName);
-
-}
-
-
-

4dkankan-center-platform/src/main/java/com/fdkankan/common/base/IServiceOperations.java

@@ -1,45 +0,0 @@
-package com.fdkankan.common.base;
-
-import java.io.Serializable;
-import java.util.LinkedHashMap;
-import java.util.List;
-
-public interface IServiceOperations<T extends Serializable> extends IOperations<T> {
-
-	void setTableName(String tableName);
-	
-	void insert(final T entity);
-	
-	int insertByBatch(List<T> list);
-
-	int update(List<T> list);
-	
-	int updateByBatch(LinkedHashMap<String, String> condition, String field);
-
-	T getById(final int id);
-
-	T getOne(LinkedHashMap<String, String> condition, String field);
-
-	int getCount(LinkedHashMap<String, String> condition, String field);
-
-	List<T> getList(int pageNo, int pageSize);
-
-	List<T> getList(int pageNo, int pageSize, String order);
-
-	List<T> getList(int pageNo, int pageSize, String order, String field);
-
-	List<T> getList(LinkedHashMap<String, String> condition, int pageNo, int pageSize);
-
-	List<T> getList(LinkedHashMap<String, String> condition, int pageNo, int pageSize, String order);
-	
-	public List<T> getAllList(LinkedHashMap<String, String> condition);
-	
-	public List<T> getAllList(LinkedHashMap<String, String> condition, String order);
-
-	T getOne(LinkedHashMap<String, String> condition);
-
-	List<T> getList(LinkedHashMap<String, String> condition, int pageNo, int pageSize, String order, String field);
-}
-
-
-

4dkankan-center-platform/src/main/java/com/fdkankan/common/base/JsonResult.java

@@ -1,114 +0,0 @@
-package com.fdkankan.common.base;
-
-import com.alibaba.fastjson.JSON;
-import org.springframework.stereotype.Component;
-
-import java.util.Map;
-
-
-@Component("jsonResult")
-public class JsonResult {
-	
-	private String VERSION = Config.VERSION;
-	private Integer statusCode;
-	private String statusMsg;
-	private String version;
-	private String token;
-	private Object data;
-	
-	public JsonResult() {
-		this.setVersion(VERSION);
-	}
-	
-	public Integer getStatusCode() {
-		return statusCode;
-	}
-
-	public void setStatusCode(Integer statusCode) {
-		this.statusCode = statusCode;
-	}
-
-	public String getStatusMsg() {
-		return statusMsg;
-	}
-
-	public void setStatusMsg(String statusMsg) {
-		this.statusMsg = statusMsg;
-	}
-
-	public String getVersion() {
-		return version;
-	}
-
-	public void setVersion(String version) {
-		this.version = version;
-	}
-
-	public String getToken() {
-		return token;
-	}
-
-	public void setToken(String token) {
-		this.token = token;
-	}
-	
-	public Object getData() {
-		return data;
-	}
-
-	public void setData(Object data) {
-		this.data = data;
-	}
-	
-	public String ok() {
-		return this.ok("");
-	}
-	
-	public String ok(Object data) {
-		return this.ok("", data);
-	}
-	public String ok(String msg, Object data) {
-		return this.base(200, msg, data);
-	}
-	
-	public String parameterError(String msg, Map<String, Object> paramMap) {		
-		return this.base(203, msg, paramMap);
-	}
-
-	public String error(int code, String msg) {
-		return this.error(code, msg, "");
-	}
-	
-	public String error(int code, String msg, Object data) {
-		return this.base(code, msg, data);
-	}
-	
-	public String noRecord() {
-		return this.base(202, "没有记录 !!!");
-	}
-	
-	public String notLoggedIn() {
-		return this.base(201, " 请登录 !!!");
-	}
-	public String notLoggedIn(Object data) {
-		return this.base(201, " 请登录 !!!", data);
-	}
-	
-	public String noPower() {
-		return this.base(206, "没有权限！！！");
-	}
-	
-	private String base(int code, String msg) {
-		return this.base(code, msg, "");
-	}
-	
-	private String base(int code, String msg, Object data) {
-		JsonResult jd = new JsonResult();
-		jd.setStatusCode(code);
-		jd.setStatusMsg(msg);
-		jd.setData(data);
-		return JSON.toJSONString(jd);
-	}
-	
-}
-

4dkankan-center-platform/src/main/java/com/fdkankan/common/base/Swagger2.java

@@ -1,50 +0,0 @@
-package com.fdkankan.common.base;
-
-import com.github.xiaoymin.swaggerbootstrapui.annotations.EnableSwaggerBootstrapUI;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-import springfox.documentation.builders.ApiInfoBuilder;
-import springfox.documentation.builders.PathSelectors;
-import springfox.documentation.builders.RequestHandlerSelectors;
-import springfox.documentation.service.ApiInfo;
-import springfox.documentation.spi.DocumentationType;
-import springfox.documentation.spring.web.plugins.Docket;
-import springfox.documentation.swagger2.annotations.EnableSwagger2;
-
-@EnableSwagger2
-@EnableSwaggerBootstrapUI
-@Configuration
-public class Swagger2 {
-	
-	  @Bean
-	  public Docket baseApi() {
-		return new Docket(DocumentationType.SWAGGER_2).groupName("模板接口").apiInfo(apiBaseInfo()).select().apis(RequestHandlerSelectors.basePackage("com.fdkankan"))
-			.paths(PathSelectors.regex(".*/base/.*")).build();
-	  }
-
-	  private ApiInfo apiBaseInfo() {
-		return new ApiInfoBuilder().title("模板接口文档").description("模板接口文档").termsOfServiceUrl("").version("1.0").build();
-	  }
-
-	  @Bean
-	  public Docket createRestApi() {
-		return new Docket(DocumentationType.SWAGGER_2).groupName("API管理接口").apiInfo(apiInfo()).select().apis(RequestHandlerSelectors.basePackage("com.fdkankan"))
-			.paths(PathSelectors.regex(".*/.*")).build();
-	  }
-
-	  private ApiInfo apiInfo() {
-		return new ApiInfoBuilder().title("API文档").description("API文档").termsOfServiceUrl("").version("1.0").build();
-	  }
-
-	  @Bean
-	  public Docket backApi() {
-		return new Docket(DocumentationType.SWAGGER_2).groupName("后台管理接口").apiInfo(apiBackInfo()).select().apis(RequestHandlerSelectors.basePackage("com.fdkankan"))
-			.paths(PathSelectors.regex(".*/back/.*")).build();
-	  }
-
-	  private ApiInfo apiBackInfo() {
-		return new ApiInfoBuilder().title("后台管理接口").description("后台管理接口实现的文档").termsOfServiceUrl("").version("1.0").build();
-	  }
-
-}
-

4dkankan-common/pom.xml

@@ -14,11 +14,10 @@
     <artifactId>4dkankan-common</artifactId>
 
     <dependencies>
-
         <dependency>
-            <groupId>com.fdkankan</groupId>
-            <artifactId>4dkankan-pom</artifactId>
-            <version>2.0.0</version>
+            <groupId>org.mybatis.spring.boot</groupId>
+            <artifactId>mybatis-spring-boot-starter</artifactId>
+            <version>1.3.2</version>
         </dependency>
         <dependency>
             <groupId>org.projectlombok</groupId>

4dkankan-pom/pom.xml

@@ -85,16 +85,7 @@
             <artifactId>druid</artifactId>
             <version>1.1.17</version>
         </dependency>
-        <dependency>
-            <groupId>io.springfox</groupId>
-            <artifactId>springfox-swagger2</artifactId>
-            <version>2.9.2</version>
-        </dependency>
-        <dependency>
-            <groupId>io.springfox</groupId>
-            <artifactId>springfox-swagger-ui</artifactId>
-            <version>2.9.2</version>
-        </dependency>
+
         <dependency>
             <groupId>org.springframework.plugin</groupId>
             <artifactId>spring-plugin-core</artifactId>
@@ -105,11 +96,21 @@
             <artifactId>spring-plugin-metadata</artifactId>
             <version>1.2.0.RELEASE</version>
         </dependency>
-        <dependency>
-            <groupId>com.github.xiaoymin</groupId>
-            <artifactId>swagger-bootstrap-ui</artifactId>
-            <version>1.9.4</version>
-        </dependency>
+<!--        <dependency>-->
+<!--            <groupId>io.springfox</groupId>-->
+<!--            <artifactId>springfox-swagger2</artifactId>-->
+<!--            <version>2.9.2</version>-->
+<!--        </dependency>-->
+<!--        <dependency>-->
+<!--            <groupId>io.springfox</groupId>-->
+<!--            <artifactId>springfox-swagger-ui</artifactId>-->
+<!--            <version>2.9.2</version>-->
+<!--        </dependency>-->
+<!--        <dependency>-->
+<!--            <groupId>com.github.xiaoymin</groupId>-->
+<!--            <artifactId>swagger-bootstrap-ui</artifactId>-->
+<!--            <version>1.9.4</version>-->
+<!--        </dependency>-->
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-aop</artifactId>