更新api文档

README.md

@@ -28,6 +28,9 @@ http:loacalhost:8082/data/aa.jpg
 数据管理平台：
 http://47.107.252.54:8082/back
 
+47.107.252.54 
+    tomcat:/data/tomcat_cesium_8082
+
 service tomcat: 
 
 

pom.xml

@@ -45,15 +45,22 @@
         </dependency>
 
         <!--swagger2核心包和swagger-ui界面包-->
+        <!--<dependency>-->
+            <!--<groupId>io.springfox</groupId>-->
+            <!--<artifactId>springfox-swagger2</artifactId>-->
+            <!--<version>${swagger2.version}</version>-->
+        <!--</dependency>-->
+        <!--<dependency>-->
+            <!--<groupId>io.springfox</groupId>-->
+            <!--<artifactId>springfox-swagger-ui</artifactId>-->
+            <!--<version>${swagger2.version}</version>-->
+        <!--</dependency>-->
+
+        <!-- knife4j aip 包-->
         <dependency>
-            <groupId>io.springfox</groupId>
-            <artifactId>springfox-swagger2</artifactId>
-            <version>${swagger2.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>io.springfox</groupId>
-            <artifactId>springfox-swagger-ui</artifactId>
-            <version>${swagger2.version}</version>
+            <groupId>com.github.xiaoymin</groupId>
+            <artifactId>knife4j-spring-boot-starter</artifactId>
+            <version>2.0.2</version>
         </dependency>
 
 

src/main/java/com/fd/GisCesiumApplication.java

@@ -1,14 +1,28 @@
 package com.fd;
 
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.boot.web.servlet.support.SpringBootServletInitializer;
 
+@Slf4j
 @SpringBootApplication
 public class GisCesiumApplication extends SpringBootServletInitializer {
 
     public static void main(String[] args) {
         SpringApplication.run(GisCesiumApplication.class, args);
+
+
+        log.info("(♥◠‿◠)ﾉﾞ  Gis 江门启动成功   ლ(´ڡ`ლ)ﾞ  \n" +
+                " .-------.       ____     __        \n" +
+                " |  _ _   \\      \\   \\   /  /    \n" +
+                " | ( ' )  |       \\  _. /  '       \n" +
+                " |(_ o _) /        _( )_ .'         \n" +
+                " | (_,_).' __  ___(_ o _)'          \n" +
+                " |  |\\ \\  |  ||   |(_,_)'         \n" +
+                " |  | \\ `'   /|   `-'  /           \n" +
+                " |  |  \\    /  \\      /           \n" +
+                " ''-'   `'-'    `-..-'              ");
     }
 
 }

src/main/java/com/fd/config/CommonInterceptor.java

@@ -0,0 +1,63 @@
+package com.fd.config;
+
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.stereotype.Component;
+import org.springframework.web.servlet.HandlerInterceptor;
+import org.springframework.web.servlet.ModelAndView;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+@Slf4j
+@Component
+public class CommonInterceptor implements HandlerInterceptor {
+
+    @Value("${spring.profiles.active}")
+    private String active;
+
+    @Override
+    public boolean preHandle(HttpServletRequest request,
+                             HttpServletResponse response, Object handler) throws Exception {
+        if(!request.getRequestURI().contains("/static/")
+                && !request.getRequestURI().contains("/sendUserInfo")
+                && !request.getRequestURI().contains(".json")
+                && !request.getRequestURI().contains(".png")
+                && !request.getRequestURI().contains(".html")
+                && !request.getRequestURI().contains(".mp3")
+                ){
+            log.warn("start ： {}", request.getRequestURI());
+        }
+
+
+        // uat环境禁止访问api文档
+        if (active.equals("uat")) {
+            log.info("访问api文档拦截");
+            return !request.getRequestURI().contains("doc.html");
+        }
+
+        return true;
+    }
+
+    @Override
+    public void postHandle(HttpServletRequest request,
+                           HttpServletResponse response, Object handler,
+                           ModelAndView modelAndView) throws Exception {
+        request.setAttribute("ctx", request.getContextPath());
+    }
+
+    @Override
+    public void afterCompletion(HttpServletRequest request,
+                                HttpServletResponse response, Object handler, Exception ex)
+            throws Exception {
+        if(!request.getRequestURI().contains("/static/") && !request.getRequestURI().contains("/sendUserInfo")
+                && !request.getRequestURI().contains(".json") && !request.getRequestURI().contains(".png")
+                && !request.getRequestURI().contains(".html") && !request.getRequestURI().contains(".mp3")){
+            log.warn("end ： {}", request.getRequestURI());
+        }
+    }
+
+
+
+
+}

src/main/java/com/fd/config/RedisConfig.java

@@ -1,4 +1,4 @@
-package com.dist.config;
+package com.fd.config;
 
 import com.fasterxml.jackson.annotation.JsonAutoDetect;
 import com.fasterxml.jackson.annotation.PropertyAccessor;

src/main/java/com/fd/config/Swagger2.java

@@ -48,7 +48,7 @@ public class Swagger2 {
 
     private ApiInfo apiInfo() {
         return new ApiInfoBuilder()
-                .title("xx项目 RESTful APIs")
+                .title("GIS 江门")
                 .description("xx项目后台api接口文档")
                 .version("1.0")
                 .build();

src/main/java/com/fd/config/WebMvcConfig.java

@@ -1,5 +1,6 @@
 package com.fd.config;
 
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.web.servlet.config.annotation.CorsRegistry;
@@ -12,6 +13,9 @@ import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
 @Configuration
 public class WebMvcConfig implements WebMvcConfigurer {
 
+    @Autowired
+    private CommonInterceptor commonInterceptor;
+
 
 //    @Bean
 //    public MyInterceptor myInterceptor(){
@@ -43,4 +47,13 @@ public class WebMvcConfig implements WebMvcConfigurer {
                 .allowedMethods("GET", "POST", "DELETE", "PUT", "OPTIONS")
                 .maxAge(3600);
     }
+
+
+    /**
+     * 添加拦截器
+     */
+    @Override
+    public void addInterceptors(InterceptorRegistry registry) {
+        registry.addInterceptor(commonInterceptor).addPathPatterns("/**");
+    }
 }

src/main/java/com/fd/controller/ConvertController.java

@@ -6,6 +6,7 @@ import com.fd.dto.PageDto;
 import com.fd.server.ConvertServer;
 import com.fd.util.FileUtils;
 import com.fd.util.R;
+import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.log4j.Log4j2;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -22,6 +23,7 @@ import javax.servlet.http.HttpServletResponse;
  * <p>
  * GWS84 转 CGCS2000 坐标系
  */
+@Api(tags = "坐标转换模块")
 @Log4j2
 @RequestMapping("api/convert")
 @RestController

src/main/java/com/fd/controller/DemController.java

@@ -7,6 +7,7 @@ import com.fd.dto.PageDto;
 import com.fd.entity.OutputFileEntity;
 import com.fd.server.DemServer;
 import com.fd.util.R;
+import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.log4j.Log4j2;
 import org.apache.shiro.authz.annotation.RequiresRoles;
@@ -23,6 +24,7 @@ import javax.servlet.http.HttpServletRequest;
  * <p>
  * 地形数据
  */
+@Api(tags = "地形模块")
 @Log4j2
 @RequestMapping("api/dem")
 @RestController

src/main/java/com/fd/controller/ExceptionController.java

@@ -1,22 +1,26 @@
 package com.fd.controller;
 
 import com.fd.util.R;
+import lombok.extern.slf4j.Slf4j;
 import org.apache.shiro.ShiroException;
 import org.apache.shiro.authc.AuthenticationException;
 import org.apache.shiro.authc.IncorrectCredentialsException;
 import org.apache.shiro.authc.UnknownAccountException;
 import org.apache.shiro.authz.UnauthorizedException;
 import org.springframework.http.HttpStatus;
+import org.springframework.web.bind.MethodArgumentNotValidException;
 import org.springframework.web.bind.annotation.ExceptionHandler;
 import org.springframework.web.bind.annotation.ResponseStatus;
 import org.springframework.web.bind.annotation.RestControllerAdvice;
 
 import javax.servlet.http.HttpServletRequest;
+import javax.validation.ValidationException;
 
 /**
  * 统一捕捉异常，自定义返回参数
  * 这里只可以捕获controller层的异常。
  */
+@Slf4j
 @RestControllerAdvice
 public class ExceptionController {
 
@@ -51,6 +55,25 @@ public class ExceptionController {
         return HttpStatus.valueOf(statusCode);
     }
 
+    /**
+     * 方法参数校验
+     *
+     * 注解验证异常
+     */
+    @ExceptionHandler(MethodArgumentNotValidException.class)
+    public R handleMethodArgumentNotValidException(MethodArgumentNotValidException e) {
+        return new R(60001, e.getBindingResult().getFieldError().getDefaultMessage());
+    }
+
+    /**
+     * ValidationException
+     */
+    @ExceptionHandler(ValidationException.class)
+    public R handleValidationException(ValidationException e) {
+        log.error(e.getMessage(), e);
+        return new R(60002, e.getCause().getMessage());
+    }
+
 
 //    @ResponseStatus(HttpStatus.INTERNAL_SERVER_ERROR)
 //    @ExceptionHandler(AuthenticationException.class)

src/main/java/com/fd/controller/HeatMapController.java

@@ -9,6 +9,7 @@ import com.fd.repository.HeatMapRepository;
 import com.fd.server.HeatMapServer;
 import com.fd.util.FileUtils;
 import com.fd.util.R;
+import io.swagger.annotations.Api;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.Page;
 import org.springframework.web.bind.annotation.*;
@@ -21,6 +22,7 @@ import java.util.List;
  *
  * 热力图
  */
+@Api(tags = "热力图模块")
 @RequestMapping("manage/heatmap")
 @RestController
 public class HeatMapController {

src/main/java/com/fd/controller/ModelController.java

@@ -12,6 +12,7 @@ import com.fd.thread.AsyncTask;
 import com.fd.util.FileUtils;
 import com.fd.util.R;
 import com.fd.util.RegexUtils;
+import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.log4j.Log4j2;
 import org.apache.commons.lang3.StringUtils;
@@ -38,6 +39,7 @@ import java.util.concurrent.atomic.AtomicInteger;
  * <p>
  * 3D模型数据
  */
+@Api(tags = "模型模块")
 @Log4j2
 @RequestMapping("api/fdModel")
 @RestController

src/main/java/com/fd/controller/RasterController.java

@@ -12,6 +12,7 @@ import com.fd.thread.AsyncTask;
 import com.fd.util.FileUtils;
 import com.fd.util.R;
 import com.fd.util.RegexUtils;
+import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.log4j.Log4j2;
 import org.apache.commons.lang3.StringUtils;
@@ -37,6 +38,7 @@ import java.util.concurrent.atomic.AtomicInteger;
  *
  * 栅格数据
  */
+@Api(tags = "栅格模块")
 @Log4j2
 @RequestMapping("api/raster")
 @RestController

src/main/java/com/fd/controller/UserController.java

@@ -1,20 +1,18 @@
 package com.fd.controller;
 
 import com.fd.constant.MsgCode;
-import com.fd.entity.User;
+import com.fd.entity.UserEntity;
 import com.fd.repository.UserRepository;
-import com.fd.shiro.JWTToken;
 import com.fd.shiro.JWTUtil;
 import com.fd.util.R;
+import io.swagger.annotations.Api;
 import lombok.extern.log4j.Log4j2;
 import org.apache.shiro.SecurityUtils;
-import org.apache.shiro.authc.UsernamePasswordToken;
 import org.apache.shiro.authz.UnauthorizedException;
 import org.apache.shiro.authz.annotation.Logical;
 import org.apache.shiro.authz.annotation.RequiresAuthentication;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.apache.shiro.authz.annotation.RequiresRoles;
-import org.apache.shiro.mgt.SecurityManager;
 import org.apache.shiro.subject.Subject;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.redis.core.RedisTemplate;
@@ -29,6 +27,7 @@ import java.util.concurrent.TimeUnit;
 /**
  * Created by Owen on 2019/11/11 0011 16:50
  */
+@Api(tags = "用户模块")
 @Log4j2
 @RestController
 public class UserController {
@@ -45,7 +44,7 @@ public class UserController {
     public R login(@RequestParam("username") String username,
                    @RequestParam("password") String password) {
         log.warn("run login , username:{}, password:{}", username, password);
-        User user = userRepository.findByUsername(username);
+        UserEntity user = userRepository.findByUsername(username);
         if (user == null) {
             return new R(53000, MsgCode.U53000);
         }

src/main/java/com/fd/controller/VectorController.java

@@ -15,6 +15,7 @@ import com.fd.thread.AsyncTask;
 import com.fd.util.FileUtils;
 import com.fd.util.R;
 import com.fd.util.RegexUtils;
+import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.log4j.Log4j2;
 import org.apache.commons.lang3.StringUtils;
@@ -41,6 +42,7 @@ import java.util.concurrent.atomic.AtomicInteger;
  * <p>
  * 矢量数据
  */
+@Api(tags = "矢量模块")
 @Log4j2
 @RequestMapping("api/vector")
 @RestController

src/main/java/com/fd/controller/WfsController.java

@@ -2,6 +2,7 @@ package com.fd.controller;
 
 import com.fd.server.WfsServer;
 import com.fd.util.R;
+import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
@@ -14,6 +15,7 @@ import org.springframework.web.bind.annotation.*;
  * manage：是不需要登录的
  */
 //@CrossOrigin(origins = "*", maxAge = 3600)
+@Api(tags = "要素模块")
 @RequestMapping("manage/wfs")
 @RestController
 public class WfsController {

src/main/java/com/fd/entity/User.java

@@ -11,7 +11,7 @@ import java.io.Serializable;
 @Data
 @Entity
 @Table(name = "t_user")
-public class User extends BaseEntity implements Serializable {
+public class UserEntity extends BaseEntity implements Serializable {
 
     @Column
     private String username;

src/main/java/com/fd/repository/UserRepository.java

@@ -1,6 +1,6 @@
 package com.fd.repository;
 
-import com.fd.entity.User;
+import com.fd.entity.UserEntity;
 import org.springframework.data.jpa.repository.JpaRepository;
 
 /**
@@ -8,7 +8,7 @@ import org.springframework.data.jpa.repository.JpaRepository;
  *
  * JpaSpecificationExecutor 条件分页查询
  */
-public interface UserRepository extends JpaRepository<User, Long> {
+public interface UserRepository extends JpaRepository<UserEntity, Long> {
 
-    User findByUsername(String username);
+    UserEntity findByUsername(String username);
 }

src/main/java/com/fd/server/impl/BaseServerImpl.java

@@ -1,12 +1,11 @@
 package com.fd.server.impl;
 
 import com.fd.constant.MsgCode;
-import com.fd.constant.TypeCode;
 import com.fd.constant.UserCode;
 import com.fd.dto.PageDto;
 import com.fd.entity.FileEntity;
 import com.fd.entity.OutputFileEntity;
-import com.fd.entity.User;
+import com.fd.entity.UserEntity;
 import com.fd.repository.FileRepository;
 import com.fd.repository.OutputFileRepository;
 import com.fd.repository.StyleRepository;
@@ -46,7 +45,7 @@ public class BaseServerImpl implements BaseServer {
         String username = JWTUtil.getUsername(token);
 
         // 根据用户名查找用户
-        User user = userRepository.findByUsername(username);
+        UserEntity user = userRepository.findByUsername(username);
 
         // 判断用户角色
 

src/main/java/com/fd/server/impl/DemServerImpl.java

@@ -12,18 +12,16 @@ import com.fd.dto.ConfigJsonDto;
 import com.fd.entity.FileEntity;
 import com.fd.entity.OutputFileEntity;
 import com.fd.entity.StyleEntity;
-import com.fd.entity.User;
+import com.fd.entity.UserEntity;
 import com.fd.repository.FileRepository;
 import com.fd.repository.OutputFileRepository;
 import com.fd.repository.StyleRepository;
 import com.fd.repository.UserRepository;
 import com.fd.server.DemServer;
-import com.fd.server.ModelServer;
 import com.fd.shiro.JWTUtil;
 import com.fd.thread.AsyncTask;
 import com.fd.util.*;
 import lombok.extern.log4j.Log4j2;
-import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
@@ -31,11 +29,8 @@ import org.springframework.web.multipart.MultipartFile;
 
 import javax.annotation.PostConstruct;
 import javax.servlet.http.HttpServletRequest;
-import java.io.BufferedReader;
 import java.io.IOException;
-import java.io.InputStreamReader;
 import java.util.Date;
-import java.util.List;
 import java.util.Optional;
 import java.util.concurrent.BlockingQueue;
 import java.util.concurrent.LinkedBlockingQueue;
@@ -145,7 +140,7 @@ public class DemServerImpl extends BaseServerImpl implements DemServer {
             String username = JWTUtil.getUsername(token);
 
             // 根据用户名查找用户
-            User user = userRepository.findByUsername(username);
+            UserEntity user = userRepository.findByUsername(username);
 
             // 保存信息
             OutputFileEntity outputFile = new OutputFileEntity();

src/main/java/com/fd/server/impl/ModelServerImpl.java

@@ -9,7 +9,7 @@ import com.fd.dto.ConfigJsonDto;
 import com.fd.entity.FileEntity;
 import com.fd.entity.OutputFileEntity;
 import com.fd.entity.StyleEntity;
-import com.fd.entity.User;
+import com.fd.entity.UserEntity;
 import com.fd.repository.FileRepository;
 import com.fd.repository.OutputFileRepository;
 import com.fd.repository.StyleRepository;
@@ -297,7 +297,7 @@ public class ModelServerImpl extends BaseServerImpl implements ModelServer  {
         String username = JWTUtil.getUsername(token);
 
         // 根据用户名查找用户
-        User user = userRepository.findByUsername(username);
+        UserEntity user = userRepository.findByUsername(username);
 
         // 保存信息到db
         FileEntity entity = new FileEntity();

src/main/java/com/fd/server/impl/RasterServerImpl.java

@@ -11,13 +11,12 @@ import com.fd.entity.FileEntity;
 //import com.fd.entity.LayerEntity;
 import com.fd.entity.OutputFileEntity;
 import com.fd.entity.StyleEntity;
-import com.fd.entity.User;
+import com.fd.entity.UserEntity;
 import com.fd.repository.FileRepository;
 //import com.fd.repository.LayerRepository;
 import com.fd.repository.OutputFileRepository;
 import com.fd.repository.StyleRepository;
 import com.fd.repository.UserRepository;
-import com.fd.server.CmdServer;
 import com.fd.server.RasterServer;
 import com.fd.shiro.JWTUtil;
 import com.fd.util.FileUtils;
@@ -239,7 +238,7 @@ public class RasterServerImpl extends BaseServerImpl implements RasterServer {
         String username = JWTUtil.getUsername(token);
 
         // 根据用户名查找用户
-        User user = userRepository.findByUsername(username);
+        UserEntity user = userRepository.findByUsername(username);
 
         // 保存信息到db
         FileEntity entity = new FileEntity();

src/main/java/com/fd/server/impl/VectorServerImpl.java

@@ -1,11 +1,8 @@
 package com.fd.server.impl;
 
-import cn.hutool.core.date.DateTime;
-import cn.hutool.core.date.DateUtil;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
-import com.fd.constant.Command;
 import com.fd.constant.MsgCode;
 import com.fd.constant.TypeCode;
 import com.fd.dto.ConfigJsonDto;
@@ -14,14 +11,13 @@ import com.fd.dto.StyleDto;
 import com.fd.entity.FileEntity;
 import com.fd.entity.OutputFileEntity;
 import com.fd.entity.StyleEntity;
-import com.fd.entity.User;
+import com.fd.entity.UserEntity;
 import com.fd.repository.FileRepository;
 import com.fd.repository.OutputFileRepository;
 import com.fd.repository.StyleRepository;
 import com.fd.repository.UserRepository;
 import com.fd.server.VectorServer;
 import com.fd.shiro.JWTUtil;
-import com.fd.util.CmdUtil;
 import com.fd.util.FileUtils;
 import com.fd.util.R;
 import com.fd.util.RegexUtils;
@@ -278,7 +274,7 @@ public class VectorServerImpl extends BaseServerImpl implements VectorServer {
         String username = JWTUtil.getUsername(token);
 
         // 根据用户名查找用户
-        User user = userRepository.findByUsername(username);
+        UserEntity user = userRepository.findByUsername(username);
 
         OutputFileEntity outputFile = new OutputFileEntity();
         if (shpFlag) {

src/main/java/com/fd/server/impl/WfsServerImpl.java

@@ -2,41 +2,21 @@ package com.fd.server.impl;
 
 import cn.hutool.core.date.DateTime;
 import cn.hutool.core.date.DateUtil;
-import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.JSONArray;
-import com.alibaba.fastjson.JSONObject;
 import com.fd.constant.Command;
 import com.fd.constant.MsgCode;
-import com.fd.constant.TypeCode;
-import com.fd.dto.ConfigJsonDto;
-import com.fd.entity.FileEntity;
 import com.fd.entity.OutputFileEntity;
-import com.fd.entity.StyleEntity;
-import com.fd.entity.User;
-import com.fd.repository.FileRepository;
 import com.fd.repository.OutputFileRepository;
-import com.fd.repository.StyleRepository;
-import com.fd.repository.UserRepository;
-import com.fd.server.DemServer;
 import com.fd.server.WfsServer;
-import com.fd.shiro.JWTUtil;
-import com.fd.thread.AsyncTask;
 import com.fd.util.*;
 import lombok.extern.log4j.Log4j2;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
-import org.springframework.web.multipart.MultipartFile;
 
 import javax.annotation.PostConstruct;
-import javax.servlet.http.HttpServletRequest;
 import java.io.*;
 import java.util.*;
-import java.util.concurrent.BlockingQueue;
-import java.util.concurrent.LinkedBlockingQueue;
-import java.util.concurrent.TimeUnit;
-import java.util.concurrent.atomic.AtomicInteger;
 
 
 /**

src/main/java/com/fd/shiro/MyRealm.java

@@ -1,6 +1,6 @@
 package com.fd.shiro;
 
-import com.fd.entity.User;
+import com.fd.entity.UserEntity;
 import com.fd.repository.UserRepository;
 import lombok.extern.log4j.Log4j2;
 import org.apache.shiro.authc.AuthenticationException;
@@ -51,7 +51,7 @@ public class MyRealm extends AuthorizingRealm {
     @Override
     protected AuthorizationInfo doGetAuthorizationInfo(PrincipalCollection principals) {
         String username = JWTUtil.getUsername(principals.toString());
-        User user = userRepository.findByUsername(username);
+        UserEntity user = userRepository.findByUsername(username);
         SimpleAuthorizationInfo simpleAuthorizationInfo = new SimpleAuthorizationInfo();
         simpleAuthorizationInfo.addRole(user.getRole());
 
@@ -77,7 +77,7 @@ public class MyRealm extends AuthorizingRealm {
             throw new AuthenticationException("token invalid");
         }
 
-        User user = userRepository.findByUsername(username);
+        UserEntity user = userRepository.findByUsername(username);
         if (user == null) {
             log.info("error token user");
             throw new AuthenticationException("User didn't existed!");

src/main/java/com/fd/util/R.java

@@ -5,6 +5,7 @@ import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonInclude.Include;
+import io.swagger.annotations.ApiModelProperty;
 
 import java.io.Serializable;
 import java.util.Calendar;
@@ -16,20 +17,22 @@ public class R implements Serializable {
 
 	private static final long serialVersionUID = 2719931935414658118L;
 
+	@ApiModelProperty(value = "处理状态：2000: 成功, 其他数字: 失败", name = "status")
 	private final Integer status;
 
+	@ApiModelProperty(value = "消息", name = "message")
 	private final String message;
 
-//	@JsonIgnoreProperties(value = { "hibernateLazyInitializer", "handler" })
-//	@JsonInclude(value = Include.NON_NULL)
 
+	@ApiModelProperty(value = "返回数据", name = "data")
 	private final Object data;
 
+	@ApiModelProperty(value = "异常信息", name = "exceptions")
 	@JsonInclude(value = Include.NON_EMPTY)
-//	@JsonInclude(value = Include.NON_NULL)
 	@JSONField(serialize = false)
 	private final String[] exceptions;
 
+	@ApiModelProperty(value = "返回时间", name = "timestamp")
 	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
 	private final Date timestamp;
 
@@ -142,7 +145,7 @@ public class R implements Serializable {
 
 	public Date addTime(){
 		Calendar nowTime= Calendar.getInstance();
-        nowTime.add(Calendar.MINUTE,15);
+//        nowTime.add(Calendar.MINUTE,15);
         Date time = nowTime.getTime();
         return time;
 	}

src/main/resources/application.properties

@@ -1,7 +1,7 @@
 server.port=8082
 
 # file multipart
-spring.profiles.active=uat
+spring.profiles.active=dev
 spring.servlet.multipart.enabled=true
 spring.servlet.multipart.max-file-size=51200MB
 spring.servlet.multipart.max-request-size=51200MB