权限基本完成

src/main/java/com/fd/constant/Command.java

@@ -7,7 +7,7 @@ package com.fd.constant;
  */
 public class Command {
 
-    public static String DOCKER_GDAL = "docker run --rm -v /root/gis/data:/root/gis/data osgeo/gdal:latest";
+    public static String DOCKER_GDAL = "docker run --rm -v /root/gis/data:/root/gis/data osgeo/gdal:latest ";
 
     /**
      * 输入目录：/root/gis/cesium/input/@fileName fileName：是目录名

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

@@ -2,6 +2,7 @@ package com.fd.controller;
 
 import com.fd.util.R;
 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;
@@ -48,5 +49,12 @@ public class ExceptionController {
         }
         return HttpStatus.valueOf(statusCode);
     }
+
+
+//    @ResponseStatus(HttpStatus.UNAUTHORIZED)
+//    @ExceptionHandler(AuthenticationException.class)
+//    public R handle40001() {
+//        return new R(40005, "Unauthorized");
+//    }
 }
 

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

@@ -19,9 +19,11 @@ import org.apache.shiro.authz.annotation.RequiresAuthentication;
 import org.apache.shiro.authz.annotation.RequiresRoles;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
+import org.springframework.data.domain.Page;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 
+import javax.servlet.http.HttpServletRequest;
 import java.io.File;
 import java.util.Date;
 import java.util.List;
@@ -90,9 +92,9 @@ public class ModelController {
 
     @ApiOperation("上传3D模型数据，只能上传zip文件")
     @PostMapping(value = "upload", consumes = {"multipart/form-data"})
-    public R upload(@RequestParam("file") MultipartFile file) {
+    public R upload(@RequestParam("file") MultipartFile file, HttpServletRequest req) {
         log.info("run upload");
-
+        String token = req.getHeader("Authorization");
 
         // 文件名全名
         String fileName = file.getOriginalFilename();
@@ -111,7 +113,7 @@ public class ModelController {
         if (list.size() > 0) {
             return new R(51006, MsgCode.E51006);
         }
-        return modelServer.uploadBigFile(file);
+        return modelServer.uploadBigFile(file, token);
     }
 
 
@@ -143,15 +145,13 @@ public class ModelController {
         return new R(200, entity);
     }
 
-//    @RequiresAuthentication
-//    @RequiresRoles("admin")
     @ApiOperation("获取3D模型数据列表")
     @PostMapping(value = "list")
-//    @RequiresAuthentication
-    public R list(@RequestBody PageDto param) {
-        log.warn("run list");
-//        System.out.println("11111111111");
-        return modelServer.findByType(TypeCode.FILE_TYPE_MODEL, param);
+    public R list(@RequestBody PageDto param, HttpServletRequest req) {
+        String token = req.getHeader("Authorization");
+
+        Page<OutputFileEntity> page = modelServer.findByList(TypeCode.FILE_TYPE_MODEL, param, token);
+        return new R(200, page);
     }
 
 

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

@@ -17,9 +17,11 @@ 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.data.domain.Page;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 
+import javax.servlet.http.HttpServletRequest;
 import java.io.File;
 import java.util.Arrays;
 import java.util.Date;
@@ -94,11 +96,12 @@ public class RasterController {
 
     @ApiOperation("上传栅格数据，只能上传tif文件")
     @PostMapping(value = "upload", consumes = { "multipart/form-data" })
-    public R upload(@RequestParam("file") MultipartFile file, @RequestParam(value = "coord",required = false) String[] coord){
+    public R upload(@RequestParam("file") MultipartFile file, @RequestParam(value = "coord",required = false) String[] coord, HttpServletRequest req){
         log.info("run upload");
         log.info("coord: {}", Arrays.toString(coord));
         String strCoord = Arrays.toString(coord);
 
+        String token = req.getHeader("Authorization");
 
         // 文件名全名
         String fileName = file.getOriginalFilename();
@@ -119,7 +122,7 @@ public class RasterController {
         }
 
 
-        R r = rasterServer.uploadBigFile(file, strCoord);
+        R r = rasterServer.uploadBigFile(file, strCoord, token);
 
         OutputFileEntity entity = (OutputFileEntity) r.getData();
 
@@ -166,8 +169,11 @@ public class RasterController {
 
     @ApiOperation("获取栅格数据列表")
     @PostMapping(value = "list")
-    public R list(@RequestBody PageDto param){
-        return rasterServer.findByType(TypeCode.FILE_TYPE_RASTER, param);
+    public R list(@RequestBody PageDto param, HttpServletRequest req){
+        String token = req.getHeader("Authorization");
+        Page<OutputFileEntity> page = rasterServer.findByList(TypeCode.FILE_TYPE_RASTER, param, token);
+        return new R(200, page);
+//        return rasterServer.findByType(TypeCode.FILE_TYPE_RASTER, param);
     }
 
 

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

@@ -22,6 +22,7 @@ import org.springframework.http.HttpStatus;
 import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.HttpServletRequest;
+import java.util.HashMap;
 import java.util.concurrent.TimeUnit;
 
 /**
@@ -52,26 +53,17 @@ public class UserController {
             throw new UnauthorizedException("error");
         }
 
-
-//        // 判断用户是否在redis存在的代码可以删除
-//        boolean hasKey = redisTemplate.hasKey(user.getUsername());
-//
-//        log.info("hasKey: {}", hasKey);
-//
-//        // 存在
-//        if (hasKey) {
-//            //踢出上一个登录用户，注销用户
-////            String oldToken = (String) redisTemplate.opsForValue().get(user.getUsername());
-//            log.info("before user is out");
-//        }
-
         // 创建新token
         String token = JWTUtil.sign(username, password);
 
-        // 更新到 redis, 有效期30min, 旧token无效
-        redisTemplate.opsForValue().set(user.getUsername(), token, Long.parseLong("30"), TimeUnit.MINUTES);
+        // 更新到 redis, 有效期24, 旧token无效
+        redisTemplate.opsForValue().set(user.getUsername(), token, Long.parseLong("24"), TimeUnit.HOURS);
         log.info("token: {}", token);
 
+        HashMap<Object, Object> resultMap = new HashMap<>();
+        resultMap.put("token", token);
+        resultMap.put("userName", username);
+
         log.warn("end login");
         return new R(200, (Object) token);
     }
@@ -83,7 +75,12 @@ public class UserController {
 
         String token = request.getHeader("Authorization");
         String username = JWTUtil.getUsername(token);
-        redisTemplate.delete(username);
+
+        String redisToken = (String) redisTemplate.opsForValue().get(username);
+        // token username 一致，代表没有被踢出
+        if (username.equals(redisToken)) {
+            redisTemplate.delete(username);
+        }
 
         log.info("end logout");
         return new R(200, MsgCode.SUCCESS);

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

@@ -190,8 +190,7 @@ public class VectorController {
     @PostMapping(value = "list")
     public R list(@RequestBody PageDto param, HttpServletRequest req) {
         String token = req.getHeader("Authorization");
-//        return vectorServer.findByType(TypeCode.FILE_TYPE_VECTOR, param);
-        Page<OutputFileEntity> list = vectorServer.findByList(param, token);
+        Page<OutputFileEntity> list = vectorServer.findByList(TypeCode.FILE_TYPE_VECTOR, param, token);
         return new R(200, list);
     }
 

src/main/java/com/fd/server/ModelServer.java

@@ -1,7 +1,6 @@
 package com.fd.server;
 
 import com.fd.dto.ConfigJsonDto;
-import com.fd.dto.PageDto;
 import com.fd.entity.FileEntity;
 import com.fd.entity.OutputFileEntity;
 import com.fd.util.R;
@@ -15,7 +14,7 @@ import java.util.List;
 public interface ModelServer extends BaseServer {
 
     // 大文件上传
-    R uploadBigFile(MultipartFile file);
+    R uploadBigFile(MultipartFile file, String token);
 
     OutputFileEntity findByUploadId(Long uploadId);
 

src/main/java/com/fd/server/RasterServer.java

@@ -13,12 +13,12 @@ import java.util.List;
 /**
  * Created by Owen on 2019/11/21 0021 15:29
  */
-public interface RasterServer {
+public interface RasterServer extends BaseServer {
 
 
     R moveFileToServer(Long fileId, ConfigJsonDto param);
 
-    R uploadBigFile(MultipartFile file, String strCoord);
+    R uploadBigFile(MultipartFile file, String strCoord, String token);
 
     R findByType(String fileTypeRaster, PageDto param);
 

src/main/java/com/fd/server/VectorServer.java

@@ -16,7 +16,7 @@ import java.util.Map;
 /**
  * Created by Owen on 2019/11/21 0021 15:29
  */
-public interface VectorServer {
+public interface VectorServer extends BaseServer {
 
 //    R uploadDirectoryFile(MultipartFile file, String directoryName, String coord);
 
@@ -77,11 +77,11 @@ public interface VectorServer {
 
     Integer exeCmd(String cmd);
 
-    /**
-     * 根据用户权限查询
-     * @param param
-     * @param token
-     * @return
-     */
-    Page<OutputFileEntity> findByList(PageDto param, String token);
+//    /**
+//     * 根据用户权限查询
+//     * @param param
+//     * @param token
+//     * @return
+//     */
+//    Page<OutputFileEntity> findByList(PageDto param, String token);
 }

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

@@ -6,23 +6,22 @@ import com.alibaba.fastjson.JSONObject;
 import com.fd.constant.MsgCode;
 import com.fd.constant.TypeCode;
 import com.fd.dto.ConfigJsonDto;
-import com.fd.dto.PageDto;
 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.ModelServer;
+import com.fd.shiro.JWTUtil;
 import com.fd.util.FileUtils;
 import com.fd.util.R;
 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.data.domain.Page;
-import org.springframework.data.domain.PageRequest;
-import org.springframework.data.domain.Sort;
 import org.springframework.stereotype.Service;
 import org.springframework.web.multipart.MultipartFile;
 
@@ -70,6 +69,10 @@ public class ModelServerImpl extends BaseServerImpl implements ModelServer  {
     @Autowired
     private StyleRepository styleRepository;
 
+
+    @Autowired
+    private UserRepository userRepository;
+
     @Override
     public R deleteById(Long fileId) {
         // 删除服务器文件
@@ -259,7 +262,7 @@ public class ModelServerImpl extends BaseServerImpl implements ModelServer  {
 
 
     @Override
-    public R uploadBigFile(MultipartFile file) {
+    public R uploadBigFile(MultipartFile file, String token) {
         log.warn("run uploadBigFile");
         long start = System.currentTimeMillis();
         if (file.isEmpty() || file.getSize() <= 0) {
@@ -289,6 +292,12 @@ public class ModelServerImpl extends BaseServerImpl implements ModelServer  {
         }
         log.info("filePath: {}", filePath);
 
+
+        String username = JWTUtil.getUsername(token);
+
+        // 根据用户名查找用户
+        User user = userRepository.findByUsername(username);
+
         // 保存信息到db
         FileEntity entity = new FileEntity();
         entity.setFileName(fileName);
@@ -312,6 +321,10 @@ public class ModelServerImpl extends BaseServerImpl implements ModelServer  {
         outputFile.setCreateTime(new Date());
         outputFile.setUpdateTime(new Date());
 
+        // 添加分组
+        outputFile.setUserId(user.getId());
+        outputFile.setUserGroup(user.getUserGroup());
+
         outputFile = outputFileRepository.save(outputFile);
 
 

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

@@ -3,7 +3,6 @@ package com.fd.server.impl;
 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;
@@ -12,12 +11,15 @@ 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.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;
 import com.fd.util.R;
 import lombok.extern.log4j.Log4j2;
@@ -31,7 +33,6 @@ import org.springframework.stereotype.Service;
 import org.springframework.web.multipart.MultipartFile;
 
 import java.io.BufferedReader;
-import java.io.File;
 import java.io.IOException;
 import java.io.InputStreamReader;
 import java.util.Date;
@@ -44,7 +45,7 @@ import java.util.Optional;
  */
 @Log4j2
 @Service
-public class RasterServerImpl implements RasterServer {
+public class RasterServerImpl extends BaseServerImpl implements RasterServer {
 
     @Value("${input.file.path.raster}")
     private String INPUT_FILE_PATH;
@@ -79,6 +80,9 @@ public class RasterServerImpl implements RasterServer {
     @Autowired
     private StyleRepository styleRepository;
 
+    @Autowired
+    private UserRepository userRepository;
+
     @Override
     public R deleteById(Long fileId) {
         // 删除服务器文件
@@ -208,7 +212,7 @@ public class RasterServerImpl implements RasterServer {
     }
 
     @Override
-    public R uploadBigFile(MultipartFile file, String strCoord) {
+    public R uploadBigFile(MultipartFile file, String strCoord, String token) {
         long start = System.currentTimeMillis();
         if (file.isEmpty() || file.getSize() <= 0) {
             log.info("文件为空");
@@ -238,6 +242,11 @@ public class RasterServerImpl implements RasterServer {
         }
         log.info("filePath: {}", filePath);
 
+        String username = JWTUtil.getUsername(token);
+
+        // 根据用户名查找用户
+        User user = userRepository.findByUsername(username);
+
         // 保存信息到db
         FileEntity entity = new FileEntity();
         entity.setFileName(fileName);
@@ -261,6 +270,10 @@ public class RasterServerImpl implements RasterServer {
         outputFile.setCreateTime(new Date());
         outputFile.setUpdateTime(new Date());
 
+        // 添加分组
+        outputFile.setUserId(user.getId());
+        outputFile.setUserGroup(user.getUserGroup());
+
         outputFile = outputFileRepository.save(outputFile);
         long end = System.currentTimeMillis();
         log.info("end uploadBigFile, total time: {} s", (end - start)/1000);

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

@@ -46,7 +46,7 @@ import java.util.*;
 @Log4j2
 @Service
 //@Transactional
-public class VectorServerImpl implements VectorServer {
+public class VectorServerImpl extends BaseServerImpl implements VectorServer {
 
     @Value("${input.file.path.vector}")
     private String INPUT_FILE_PATH;
@@ -582,41 +582,41 @@ public class VectorServerImpl implements VectorServer {
         return isCmd;
     }
 
-    /**
-     * 根据用户查询
-     * @param param
-     * @param token
-     * @return
-     */
-    @Override
-    public Page<OutputFileEntity> findByList(PageDto param, String token) {
-
-        String username = JWTUtil.getUsername(token);
-
-        // 根据用户名查找用户
-        User user = userRepository.findByUsername(username);
-
-        // 判断用户角色
-
-        Page<OutputFileEntity> page = null;
-
-        // 部门经理
-        if (UserCode.USER_ROLE_ROOT.equals(user.getRole())) {
-            page = outputFileRepository.findByTypeAndUserGroup(TypeCode.FILE_TYPE_VECTOR, user.getUserGroup(), PageRequest.of(param.getPageNum(), param.getPageSize(), Sort.by("createTime").descending()));
-
-            //普通用户
-        } else if (UserCode.USER_ROLE_USER.equals(user.getRole())) {
-            page = outputFileRepository.findByTypeAndUserId(TypeCode.FILE_TYPE_VECTOR, user.getId(), PageRequest.of(param.getPageNum(), param.getPageSize(), Sort.by("createTime").descending()));
-
-            // 管理员用户
-        } else {
-            page = outputFileRepository.findByTypeAndResStatus(TypeCode.FILE_TYPE_VECTOR, 0, PageRequest.of(param.getPageNum(), param.getPageSize(), Sort.by("createTime").descending()));
-
-        }
-
-
-        return page;
-    }
+//    /**
+//     * 根据用户查询
+//     * @param param
+//     * @param token
+//     * @return
+//     */
+//    @Override
+//    public Page<OutputFileEntity> findByList(PageDto param, String token) {
+//
+//        String username = JWTUtil.getUsername(token);
+//
+//        // 根据用户名查找用户
+//        User user = userRepository.findByUsername(username);
+//
+//        // 判断用户角色
+//
+//        Page<OutputFileEntity> page = null;
+//
+//        // 部门经理
+//        if (UserCode.USER_ROLE_ROOT.equals(user.getRole())) {
+//            page = outputFileRepository.findByTypeAndUserGroup(TypeCode.FILE_TYPE_VECTOR, user.getUserGroup(), PageRequest.of(param.getPageNum(), param.getPageSize(), Sort.by("createTime").descending()));
+//
+//            //普通用户
+//        } else if (UserCode.USER_ROLE_USER.equals(user.getRole())) {
+//            page = outputFileRepository.findByTypeAndUserId(TypeCode.FILE_TYPE_VECTOR, user.getId(), PageRequest.of(param.getPageNum(), param.getPageSize(), Sort.by("createTime").descending()));
+//
+//            // 管理员用户
+//        } else {
+//            page = outputFileRepository.findByTypeAndResStatus(TypeCode.FILE_TYPE_VECTOR, 0, PageRequest.of(param.getPageNum(), param.getPageSize(), Sort.by("createTime").descending()));
+//
+//        }
+//
+//
+//        return page;
+//    }
 
     private Integer exeCmdSingle(String commandStr) {
 

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

@@ -1,16 +1,9 @@
 package com.fd.shiro;
 
-import com.fd.entity.User;
-import org.apache.shiro.SecurityUtils;
-import org.apache.shiro.cache.Cache;
-import org.apache.shiro.cache.CacheManager;
-import org.apache.shiro.session.Session;
-import org.apache.shiro.session.mgt.DefaultSessionKey;
-import org.apache.shiro.session.mgt.SessionManager;
-import org.apache.shiro.subject.Subject;
+import lombok.extern.log4j.Log4j2;
+import org.apache.commons.lang3.StringUtils;
+import org.apache.shiro.authc.AuthenticationException;
 import org.apache.shiro.web.filter.authc.BasicHttpAuthenticationFilter;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 import org.springframework.http.HttpStatus;
 import org.springframework.web.bind.annotation.RequestMethod;
 
@@ -19,17 +12,14 @@ import javax.servlet.ServletResponse;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
-import java.io.Serializable;
-import java.util.Deque;
-import java.util.LinkedList;
 
 
 /**
  * 自定义拦截规则
  */
+@Log4j2
 public class JWTFilter extends BasicHttpAuthenticationFilter {
 
-    private Logger LOGGER = LoggerFactory.getLogger(this.getClass());
 
 
     /**
@@ -38,10 +28,18 @@ public class JWTFilter extends BasicHttpAuthenticationFilter {
      */
     @Override
     protected boolean isLoginAttempt(ServletRequest request, ServletResponse response) {
-//        LOGGER.warn("run isLoginAttempt");
         HttpServletRequest req = (HttpServletRequest) request;
         String authorization = req.getHeader("Authorization");
-        return authorization != null;
+
+        if (StringUtils.isEmpty(authorization)) {
+            log.info("error Authorization is null");
+
+            // 先这样抛出异常，这个种不是接口的形式
+            throw new AuthenticationException("Authorization is null ");
+        }
+
+        return true;
+
     }
 
 
@@ -50,7 +48,7 @@ public class JWTFilter extends BasicHttpAuthenticationFilter {
      * 执行登录验证
      */
     @Override
-    protected boolean executeLogin(ServletRequest request, ServletResponse response) throws Exception {
+    protected boolean executeLogin(ServletRequest request, ServletResponse response) {
 //        LOGGER.warn("run executeLogin");
         HttpServletRequest httpServletRequest = (HttpServletRequest) request;
         String authorization = httpServletRequest.getHeader("Authorization");
@@ -91,6 +89,7 @@ public class JWTFilter extends BasicHttpAuthenticationFilter {
                 response401(request, response);
             }
         }
+        // return false 前端没有响应，接收不到异常
         return true;
     }
 
@@ -120,7 +119,7 @@ public class JWTFilter extends BasicHttpAuthenticationFilter {
             HttpServletResponse httpServletResponse = (HttpServletResponse) resp;
             httpServletResponse.sendRedirect("/401");
         } catch (IOException e) {
-            LOGGER.error(e.getMessage());
+            log.error(e.getMessage());
         }
     }
 }

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

@@ -14,8 +14,8 @@ import java.util.Date;
 @Log4j2
 public class JWTUtil {
 
-    // 过期时间30分钟
-    private static final long EXPIRE_TIME = 30*60*1000;
+    // 过期时间24小时
+    private static final long EXPIRE_TIME = 24*60*60*1000;
 
 
     /**

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

@@ -69,26 +69,30 @@ public class MyRealm extends AuthorizingRealm {
     protected AuthenticationInfo doGetAuthenticationInfo(AuthenticationToken auth) throws AuthenticationException {
 //        log.warn("run doGetAuthenticationInfo");
         String token = (String) auth.getCredentials();
-        log.warn("token: {}", token);
+//        log.warn("token: {}", token);
         // 解密获得username，用于和数据库进行对比
         String username = JWTUtil.getUsername(token);
         if (username == null) {
+            log.info("error token username");
             throw new AuthenticationException("token invalid");
         }
 
         User user = userRepository.findByUsername(username);
         if (user == null) {
+            log.info("error token user");
             throw new AuthenticationException("User didn't existed!");
         }
 
         // 校验请求token是否跟redis token一致
         String redisToken = (String) redisTemplate.opsForValue().get(user.getUsername());
         if (!token.equals(redisToken)) {
+            log.info("error token redis");
             throw new AuthenticationException("token invalid");
         }
 
 
         if (! JWTUtil.verify(token, username, user.getPassword())) {
+            log.info("error token username or password");
             throw new AuthenticationException("token invalid");
         }
 

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

@@ -91,7 +91,7 @@ public class ShiroConfig {
 
 
         // 所有请求通过我们自己的JWT Filter
-        filterRuleMap.put("/**", "jwt");
+        filterRuleMap.put("/api/**", "jwt");
 
 
         // 访问401和404页面不通过我们的Filter

src/main/resources/application-uat.properties

@@ -36,7 +36,8 @@ spring.datasource.druid.stat-view-servlet.enabled=true
 
 # Redis数据库索引（默认为0）
 spring.redis.database=0
-spring.redis.host=127.0.0.1
+#spring.redis.host=127.0.0.1
+spring.redis.host=47.107.252.54
 spring.redis.port=6379
 spring.redis.password=4dage
 # 连接超时时间 单位 ms（毫秒）
@@ -70,7 +71,7 @@ copy.file.path.raster=/var/www/html/data/
 copy.file.path.vector=/var/www/html/data/
 
 #config.json 位置
-config.path=/var/www/html/3dmap/config.json
+config.path=/usr/share/nginx/html/3dmap/config.json
 
 #config.json的 teileset 的相对路径
 config.tileset=../data/wuyidaxue/tileset.json

src/main/resources/application.properties

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