v4编辑器本地版

pom.xml

@@ -70,40 +70,16 @@
 
         <dependency>
             <groupId>com.fdkankan</groupId>
-            <artifactId>4dkankan-utils-fyun-oss</artifactId>
-            <version>3.0.0-SNAPSHOT</version>
-        </dependency>
-
-        <dependency>
-            <groupId>com.fdkankan</groupId>
-            <artifactId>4dkankan-utils-fyun-s3</artifactId>
-            <version>3.0.0-SNAPSHOT</version>
-        </dependency>
-
-        <dependency>
-            <groupId>com.fdkankan</groupId>
             <artifactId>4dkankan-utils-model</artifactId>
             <version>3.0.0-SNAPSHOT</version>
         </dependency>
 
         <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-test</artifactId>
-            <scope>test</scope>
-        </dependency>
-
-        <dependency>
             <groupId>org.projectlombok</groupId>
             <artifactId>lombok</artifactId>
         </dependency>
 
         <dependency>
-            <groupId>com.alibaba.csp</groupId>
-            <artifactId>sentinel-datasource-nacos</artifactId>
-            <version>1.7.2</version>
-        </dependency>
-
-        <dependency>
             <groupId>com.yomahub</groupId>
             <artifactId>tlog-web-spring-boot-starter</artifactId>
             <version>1.3.6</version>
@@ -115,13 +91,6 @@
             <version>1.3.6</version>
         </dependency>
 
-        <!--        htt请求工具-->
-        <dependency>
-            <groupId>com.dtflys.forest</groupId>
-            <artifactId>forest-spring-boot-starter</artifactId>
-            <version>1.5.19</version>
-        </dependency>
-
         <dependency>
             <groupId>com.google.firebase</groupId>
             <artifactId>firebase-admin</artifactId>

src/main/java/com/fdkankan/scene/Interceptor/CheckPermitAspect.java

@@ -1,106 +1,106 @@
-package com.fdkankan.scene.Interceptor;
-
-import cn.hutool.core.util.StrUtil;
-import com.fdkankan.common.constant.CommonStatus;
-import com.fdkankan.common.constant.ErrorCode;
-import com.fdkankan.common.constant.SceneStatus;
-import com.fdkankan.common.exception.BusinessException;
-import com.fdkankan.redis.constant.RedisKey;
-import com.fdkankan.redis.util.RedisUtil;
-import com.fdkankan.scene.entity.ScenePlus;
-import com.fdkankan.scene.service.IScenePlusService;
-import com.fdkankan.web.user.SSOLoginHelper;
-import com.fdkankan.web.user.SSOUser;
-import com.fdkankan.web.util.WebUtil;
-import java.io.IOException;
-import java.util.Objects;
-import javax.servlet.http.HttpServletRequest;
-import lombok.extern.log4j.Log4j2;
-import org.aspectj.lang.JoinPoint;
-import org.aspectj.lang.annotation.Aspect;
-import org.aspectj.lang.annotation.Before;
-import org.aspectj.lang.annotation.Pointcut;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.core.annotation.Order;
-import org.springframework.stereotype.Component;
-import org.springframework.web.context.request.RequestContextHolder;
-import org.springframework.web.context.request.ServletRequestAttributes;
-
-@Log4j2
-@Aspect
-@Component
-@Order(101)
-public class CheckPermitAspect {
-
-	@Autowired
-	private SSOLoginHelper ssoLoginHelper;
-	@Autowired
-	private RedisUtil redisUtil;
-	@Autowired
-	private IScenePlusService scenePlusService;
-
-
-	@Pointcut("@annotation(com.fdkankan.scene.annotation.CheckPermit)")
-	public void checkCooperationPermit() {
-	}
-
-	/**
-	 * 前置通知 用于判断用户协作场景是否有协作权限
-	 *
-	 * @param joinPoint
-	 *            切点
-	 * @throws IOException
-	 */
-	@Before("checkCooperationPermit()")
-	public void doBefore(JoinPoint joinPoint) throws Exception {
-		HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest();
-		// 读取session中的用户
-		SSOUser user = ssoLoginHelper.getSsoUser(request.getHeader("token"));
-		if(Objects.isNull(user)){
-			throw new BusinessException(ErrorCode.TOKEN_NOT_FOUND);
-		}
-		String num = WebUtil.getParameter("num", joinPoint, request);
-		if(StrUtil.isEmpty(num)){
-			throw new BusinessException(ErrorCode.PARAM_REQUIRED);
-		}
-
-        ScenePlus scenePlus= scenePlusService.getScenePlusByNum(num);
-		if(Objects.isNull(scenePlus)){
-			throw new BusinessException(ErrorCode.FAILURE_CODE_5005);
-		}
-		//如果是计算中或者计算出错，返回计算中
-		if(SceneStatus.wait.code().equals(scenePlus.getSceneStatus())
-			|| SceneStatus.FAILD.code().equals(scenePlus.getSceneStatus())){
-			throw new BusinessException(ErrorCode.FAILURE_CODE_5033);
-		}
-
-		//判断是否相机登录，是否场景的相机id和相机登录的相机id是否相等，如果都满足，则放行,否则判定为用户登录
-		if(Objects.nonNull(user.getCameraLogin())
-			&& CommonStatus.YES.code().byteValue() == user.getCameraLogin().intValue()){
-			if(scenePlus.getCameraId().equals(user.getCameraId())){
-				return;
-			}else{
-				throw new BusinessException(ErrorCode.FAILURE_CODE_5014);
-			}
-		}
-
-		//走到这里代表是用户账号密码登录，如果查到的场景的userid是空，证明相机解绑了，需要返回无权操作
-		if(Objects.isNull(scenePlus.getUserId())){
-			throw new BusinessException(ErrorCode.FAILURE_CODE_5014);
-		}
-
-        if(scenePlus.getUserId().equals(user.getId())){
-            return;
-        }
-
-        //如果不是用户自己的场景，判断是否有协作权限
-        String userId = redisUtil.hget(RedisKey.SCENE_COOPERATION_NUM_USERID, num);
-        if(StrUtil.isEmpty(userId)){
-            throw new BusinessException(ErrorCode.FAILURE_CODE_5014);
-        }
-        if(!userId.equals(String.valueOf(user.getId()))){
-            throw new BusinessException(ErrorCode.FAILURE_CODE_5014);
-        }
-	}
-
-}
+//package com.fdkankan.scene.Interceptor;
+//
+//import cn.hutool.core.util.StrUtil;
+//import com.fdkankan.common.constant.CommonStatus;
+//import com.fdkankan.common.constant.ErrorCode;
+//import com.fdkankan.common.constant.SceneStatus;
+//import com.fdkankan.common.exception.BusinessException;
+//import com.fdkankan.redis.constant.RedisKey;
+//import com.fdkankan.redis.util.RedisUtil;
+//import com.fdkankan.scene.entity.ScenePlus;
+//import com.fdkankan.scene.service.IScenePlusService;
+//import com.fdkankan.web.user.SSOLoginHelper;
+//import com.fdkankan.web.user.SSOUser;
+//import com.fdkankan.web.util.WebUtil;
+//import java.io.IOException;
+//import java.util.Objects;
+//import javax.servlet.http.HttpServletRequest;
+//import lombok.extern.log4j.Log4j2;
+//import org.aspectj.lang.JoinPoint;
+//import org.aspectj.lang.annotation.Aspect;
+//import org.aspectj.lang.annotation.Before;
+//import org.aspectj.lang.annotation.Pointcut;
+//import org.springframework.beans.factory.annotation.Autowired;
+//import org.springframework.core.annotation.Order;
+//import org.springframework.stereotype.Component;
+//import org.springframework.web.context.request.RequestContextHolder;
+//import org.springframework.web.context.request.ServletRequestAttributes;
+//
+//@Log4j2
+//@Aspect
+//@Component
+//@Order(101)
+//public class CheckPermitAspect {
+//
+//	@Autowired
+//	private SSOLoginHelper ssoLoginHelper;
+//	@Autowired
+//	private RedisUtil redisUtil;
+//	@Autowired
+//	private IScenePlusService scenePlusService;
+//
+//
+//	@Pointcut("@annotation(com.fdkankan.scene.annotation.CheckPermit)")
+//	public void checkCooperationPermit() {
+//	}
+//
+//	/**
+//	 * 前置通知 用于判断用户协作场景是否有协作权限
+//	 *
+//	 * @param joinPoint
+//	 *            切点
+//	 * @throws IOException
+//	 */
+//	@Before("checkCooperationPermit()")
+//	public void doBefore(JoinPoint joinPoint) throws Exception {
+//		HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest();
+//		// 读取session中的用户
+//		SSOUser user = ssoLoginHelper.getSsoUser(request.getHeader("token"));
+//		if(Objects.isNull(user)){
+//			throw new BusinessException(ErrorCode.TOKEN_NOT_FOUND);
+//		}
+//		String num = WebUtil.getParameter("num", joinPoint, request);
+//		if(StrUtil.isEmpty(num)){
+//			throw new BusinessException(ErrorCode.PARAM_REQUIRED);
+//		}
+//
+//        ScenePlus scenePlus= scenePlusService.getScenePlusByNum(num);
+//		if(Objects.isNull(scenePlus)){
+//			throw new BusinessException(ErrorCode.FAILURE_CODE_5005);
+//		}
+//		//如果是计算中或者计算出错，返回计算中
+//		if(SceneStatus.wait.code().equals(scenePlus.getSceneStatus())
+//			|| SceneStatus.FAILD.code().equals(scenePlus.getSceneStatus())){
+//			throw new BusinessException(ErrorCode.FAILURE_CODE_5033);
+//		}
+//
+//		//判断是否相机登录，是否场景的相机id和相机登录的相机id是否相等，如果都满足，则放行,否则判定为用户登录
+//		if(Objects.nonNull(user.getCameraLogin())
+//			&& CommonStatus.YES.code().byteValue() == user.getCameraLogin().intValue()){
+//			if(scenePlus.getCameraId().equals(user.getCameraId())){
+//				return;
+//			}else{
+//				throw new BusinessException(ErrorCode.FAILURE_CODE_5014);
+//			}
+//		}
+//
+//		//走到这里代表是用户账号密码登录，如果查到的场景的userid是空，证明相机解绑了，需要返回无权操作
+//		if(Objects.isNull(scenePlus.getUserId())){
+//			throw new BusinessException(ErrorCode.FAILURE_CODE_5014);
+//		}
+//
+//        if(scenePlus.getUserId().equals(user.getId())){
+//            return;
+//        }
+//
+//        //如果不是用户自己的场景，判断是否有协作权限
+//        String userId = redisUtil.hget(RedisKey.SCENE_COOPERATION_NUM_USERID, num);
+//        if(StrUtil.isEmpty(userId)){
+//            throw new BusinessException(ErrorCode.FAILURE_CODE_5014);
+//        }
+//        if(!userId.equals(String.valueOf(user.getId()))){
+//            throw new BusinessException(ErrorCode.FAILURE_CODE_5014);
+//        }
+//	}
+//
+//}

src/main/java/com/fdkankan/scene/SceneApplication.java

@@ -1,21 +1,15 @@
 package com.fdkankan.scene;
 
-import com.dtflys.forest.springboot.annotation.ForestScan;
 import org.mybatis.spring.annotation.MapperScan;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
-import org.springframework.cloud.client.discovery.EnableDiscoveryClient;
 import org.springframework.context.annotation.ComponentScan;
-import org.springframework.scheduling.annotation.EnableScheduling;
 import org.springframework.transaction.annotation.EnableTransactionManagement;
 
 @SpringBootApplication
 @EnableTransactionManagement//开启事务
-@EnableDiscoveryClient
-@EnableScheduling
 @ComponentScan(basePackages = {"com.fdkankan.*"})
 @MapperScan("com.fdkankan.**.mapper")
-@ForestScan(basePackages = "com.fdkankan.scene.httpclient")
 public class SceneApplication {
     public static void main(String[] args) {
         SpringApplication.run(SceneApplication.class, args);

src/main/java/com/fdkankan/scene/bean/BoxPhotoBean.java

@@ -8,7 +8,7 @@ import lombok.NoArgsConstructor;
 
 /**
  * <p>
- * TODO
+ * 空间贴图参数
  * </p>
  *
  * @author dengsixing

src/main/java/com/fdkankan/scene/bean/IconBean.java

@@ -7,7 +7,7 @@ import lombok.NoArgsConstructor;
 
 /**
  * <p>
- * TODO
+ * -
  * </p>
  *
  * @author dengsixing

src/main/java/com/fdkankan/scene/bean/PointBean.java

@@ -10,7 +10,7 @@ import lombok.ToString;
 
 /**
  * <p>
- * TODO
+ * -
  * </p>
  *
  * @author dengsixing

src/main/java/com/fdkankan/scene/bean/RequestSceneProV4.java

@@ -8,7 +8,7 @@ import lombok.NoArgsConstructor;
 
 /**
  * <p>
- * TODO
+ * -
  * </p>
  *
  * @author dengsixing

src/main/java/com/fdkankan/scene/bean/SegmentBean.java

@@ -4,7 +4,7 @@ import lombok.Data;
 
 /**
  * <p>
- * TODO
+ * -
  * </p>
  *
  * @author dengsixing

src/main/java/com/fdkankan/scene/bean/StyleBean.java

@@ -8,7 +8,7 @@ import lombok.NoArgsConstructor;
 
 /**
  * <p>
- * TODO
+ * -
  * </p>
  *
  * @author dengsixing

src/main/java/com/fdkankan/scene/bean/TagBean.java

@@ -8,7 +8,7 @@ import lombok.NoArgsConstructor;
 
 /**
  * <p>
- * TODO
+ * -
  * </p>
  *
  * @author dengsixing

src/main/java/com/fdkankan/scene/bean/UpgradeBean.java

@@ -7,7 +7,7 @@ import lombok.NoArgsConstructor;
 
 /**
  * <p>
- * TODO
+ * -
  * </p>
  *
  * @author dengsixing

src/main/java/com/fdkankan/scene/bean/VertexBean.java

@@ -4,7 +4,7 @@ import lombok.Data;
 
 /**
  * <p>
- * TODO
+ * -
  * </p>
  *
  * @author dengsixing

src/main/java/com/fdkankan/scene/bean/WallBean.java

@@ -9,7 +9,7 @@ import lombok.ToString;
 
 /**
  * <p>
- * TODO
+ * -
  * </p>
  *
  * @author dengsixing

src/main/java/com/fdkankan/scene/callback/FdkkMiniReqErrorCallback.java

@@ -1,41 +0,0 @@
-package com.fdkankan.scene.callback;
-
-import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.JSONObject;
-import com.dtflys.forest.callback.OnError;
-import com.dtflys.forest.exceptions.ForestRuntimeException;
-import com.dtflys.forest.http.ForestRequest;
-import com.dtflys.forest.http.ForestResponse;
-import com.fdkankan.common.constant.ServerCode;
-import com.fdkankan.common.exception.BusinessException;
-import com.fdkankan.web.response.Result;
-import lombok.extern.slf4j.Slf4j;
-
-/**
- * <p>
- * TODO
- * </p>
- *
- * @author dengsixing
- * @since 2022/4/25
- **/
-@Slf4j
-public class FdkkMiniReqErrorCallback implements OnError {
-
-    @Override
-    public void onError(ForestRuntimeException e, ForestRequest forestRequest,
-        ForestResponse forestResponse) {
-        JSONObject jsonObject = JSON.parseObject(forestResponse.getContent());
-        Integer status = jsonObject.getInteger("status");
-        if(status != null && status == 500){
-            log.error("v3接口报错,status:{},error:{}", status, jsonObject.getString("error"));
-            throw new BusinessException(ServerCode.SYSTEM_ERROR);
-        }
-        Result result = JSON.parseObject(forestResponse.getContent(), Result.class);
-        if(result.getCode() != ServerCode.SUCCESS.code()){
-            throw new BusinessException(result.getCode(), result.getMsg());
-        }
-        log.error("跨服务请求失败！", e);
-        throw new BusinessException(ServerCode.FEIGN_REQUEST_FAILD);
-    }
-}

src/main/java/com/fdkankan/scene/callback/FdkkMiniReqSuccessCallback.java

@@ -1,25 +0,0 @@
-package com.fdkankan.scene.callback;
-
-import com.dtflys.forest.callback.OnSuccess;
-import com.dtflys.forest.http.ForestRequest;
-import com.dtflys.forest.http.ForestResponse;
-import com.fdkankan.web.response.Result;
-import lombok.extern.slf4j.Slf4j;
-
-/**
- * <p>
- * TODO
- * </p>
- *
- * @author dengsixing
- * @since 2022/4/25
- **/
-@Slf4j
-public class FdkkMiniReqSuccessCallback implements OnSuccess<Result> {
-
-    @Override
-    public void onSuccess(Result result, ForestRequest forestRequest,
-        ForestResponse forestResponse) {
-        log.info("请求v3成功，url:{},result:{}", forestRequest.getUrl(), forestResponse.getContent());
-    }
-}

src/main/java/com/fdkankan/scene/callback/FdkkMiniReqSuccessCondition.java

@@ -1,50 +0,0 @@
-package com.fdkankan.scene.callback;
-
-import cn.hutool.core.util.StrUtil;
-import com.alibaba.fastjson.JSON;
-import com.dtflys.forest.callback.SuccessWhen;
-import com.dtflys.forest.http.ForestRequest;
-import com.dtflys.forest.http.ForestResponse;
-import com.fdkankan.common.constant.ServerCode;
-import com.fdkankan.web.response.Result;
-
-/**
- * <p>
- *  自定义成功/失败条件实现类
- *  需要实现 SuccessWhen 接口
- * </p>
- *
- * @author dengsixing
- * @since 2022/4/25
- **/
-
-public class FdkkMiniReqSuccessCondition implements SuccessWhen {
-
-    /**
-     * 请求成功条件
-     * @param req Forest请求对象
-     * @param res Forest响应对象
-     * @return 是否成功，true: 请求成功，false: 请求失败
-     */
-    @Override
-    public boolean successWhen(ForestRequest req, ForestResponse res) {
-        boolean reqStatus = res.noException() &&   // 请求过程没有异常
-            res.statusOk() &&     // 并且状态码在 100 ~ 399 范围内
-            res.statusIsNot(203);
-        if(!reqStatus){
-            return reqStatus;
-        }
-
-        String content = res.getContent();
-        if(StrUtil.isEmpty(content)){
-            reqStatus = false;
-            return reqStatus;
-        }
-        Result result = JSON.parseObject(content, Result.class);
-        if(result.getCode() != ServerCode.SUCCESS.code()){
-            reqStatus = false;
-            return reqStatus;
-        }
-        return true;
-    }
-}

src/main/java/com/fdkankan/scene/config/DataSourceInitFunc.java

@@ -18,7 +18,7 @@ package com.fdkankan.scene.config;//package com.fdkankan.scene.config;
 //
 ///**
 // * <p>
-// * TODO
+// * -
 // * </p>
 // *
 // * @author dengsixing

src/main/java/com/fdkankan/scene/controller/FileConvertController.java

@@ -12,7 +12,7 @@ import org.springframework.web.multipart.MultipartFile;
 
 /**
  * <p>
- * TODO
+ * -
  * </p>
  *
  * @author dengsixing
@@ -27,7 +27,7 @@ public class FileConvertController extends BaseController {
 
     /**
      * <p>
-            TODO
+            -
      * </p>      
      * @author dengsixing
      * @date 2022/8/1
@@ -42,7 +42,7 @@ public class FileConvertController extends BaseController {
 
     /**
      * <p>
-            TODO
+            -
      * </p>      
      * @author dengsixing
      * @date 2022/8/1 
@@ -55,7 +55,7 @@ public class FileConvertController extends BaseController {
 
     /**
      * <p>
-            TODO
+            -
      * </p>      
      * @author dengsixing
      * @date 2022/8/1 

src/main/java/com/fdkankan/scene/controller/SceneEditController.java

@@ -65,8 +65,6 @@ public class SceneEditController extends BaseController {
     private ISceneUploadService sceneUploadService;
     @Autowired
     private ISceneEditService sceneEditService;
-    @Value("${spring.profiles.active}")
-    private String env;
 
     /**
      * <p>
@@ -202,58 +200,58 @@ public class SceneEditController extends BaseController {
         return sceneProService.saveTagsVisible(param);
     }
 
-    /**
-     * <p>
-            下载模型
-     * </p>
-     * @author dengsixing
-     * @date 2022/8/1
-     * @param num
-     * @return com.fdkankan.web.response.ResultData
-     **/
-    @CheckPermit
-    @PostMapping(value = "/downloadModel")
-    public ResultData downloadTexData(@RequestParam("num") String num) throws Exception {
-        return sceneProService.downloadTexData(num);
-    }
-
-    /**
-     * <p>
-            上传模型
-     * </p>
-     * @author dengsixing
-     * @date 2022/8/1
-     * @param num
-     * @param file
-     * @return com.fdkankan.web.response.ResultData
-     **/
-    @CheckPermit
-    @PostMapping(value = "/uploadModel")
-    public ResultData uploadObjAndImg(@RequestParam("num") String num, @RequestParam("file") MultipartFile file) throws Exception {
-        return sceneProService.uploadObjAndImg(num, file);
-    }
-
-    /**
-     * <p>
-     保存关联全景图
-     * </p>      
-     * @author dengsixing
-     * @date 2022/8/1 
-     * @param num
-     * @param sid
-     * @param fileName
-     * @param file 
-     * @return com.fdkankan.web.response.ResultData
-     **/
-    @CheckPermit
-    @PostMapping(value = "/linkPan/upload")
-    public ResultData uploadLinkPan(
-        @RequestParam(value = "num") String num,
-        @RequestParam(value = "sid") String sid,
-        @RequestParam(value = "fileName") String fileName,
-        @RequestParam("file") MultipartFile file) throws Exception{
-        return sceneEditInfoService.uploadLinkPan(num, sid, fileName, file);
-    }
+//    /**
+//     * <p>
+//            下载模型
+//     * </p>
+//     * @author dengsixing
+//     * @date 2022/8/1
+//     * @param num
+//     * @return com.fdkankan.web.response.ResultData
+//     **/
+//    @CheckPermit
+//    @PostMapping(value = "/downloadModel")
+//    public ResultData downloadTexData(@RequestParam("num") String num) throws Exception {
+//        return sceneProService.downloadTexData(num);
+//    }
+
+//    /**
+//     * <p>
+//            上传模型
+//     * </p>
+//     * @author dengsixing
+//     * @date 2022/8/1
+//     * @param num
+//     * @param file
+//     * @return com.fdkankan.web.response.ResultData
+//     **/
+//    @CheckPermit
+//    @PostMapping(value = "/uploadModel")
+//    public ResultData uploadObjAndImg(@RequestParam("num") String num, @RequestParam("file") MultipartFile file) throws Exception {
+//        return sceneProService.uploadObjAndImg(num, file);
+//    }
+
+//    /**
+//     * <p>
+//     保存关联全景图
+//     * </p>
+//     * @author dengsixing
+//     * @date 2022/8/1
+//     * @param num
+//     * @param sid
+//     * @param fileName
+//     * @param file
+//     * @return com.fdkankan.web.response.ResultData
+//     **/
+//    @CheckPermit
+//    @PostMapping(value = "/linkPan/upload")
+//    public ResultData uploadLinkPan(
+//        @RequestParam(value = "num") String num,
+//        @RequestParam(value = "sid") String sid,
+//        @RequestParam(value = "fileName") String fileName,
+//        @RequestParam("file") MultipartFile file) throws Exception{
+//        return sceneEditInfoService.uploadLinkPan(num, sid, fileName, file);
+//    }
 
     /**
      * <p>
@@ -374,36 +372,36 @@ public class SceneEditController extends BaseController {
         return sceneEditInfoService.getSceneInfo(param);
     }
 
-    /**
-     * <p>
-            上传全景图
-     * </p>
-     * @author dengsixing
-     * @date 2022/2/16
-     * @param num
-     * @param file
-     * @return java.util.List<java.lang.String>
-     **/
-    @CheckPermit
-    @PostMapping(value = "/uploadPanorama")
-    public ResultData uploadPanorama(@RequestParam(value = "num") String num,
-        @RequestParam("file") MultipartFile file) throws Exception {
-        return sceneEditInfoService.uploadPanorama(num, file);
-    }
-
-    /**
-     * <p>
-            下载全景图
-     * </p>
-     * @author dengsixing
-     * @date 2022/2/16
-     * @return java.util.List<java.lang.String>
-     **/
-    @CheckPermit
-    @PostMapping(value = "/downloadPanorama")
-    public ResultData downloadPanorama(@RequestBody @Validated FileParamVO param) throws Exception {
-        return sceneEditInfoService.downloadPanorama(param);
-    }
+//    /**
+//     * <p>
+//            上传全景图
+//     * </p>
+//     * @author dengsixing
+//     * @date 2022/2/16
+//     * @param num
+//     * @param file
+//     * @return java.util.List<java.lang.String>
+//     **/
+//    @CheckPermit
+//    @PostMapping(value = "/uploadPanorama")
+//    public ResultData uploadPanorama(@RequestParam(value = "num") String num,
+//        @RequestParam("file") MultipartFile file) throws Exception {
+//        return sceneEditInfoService.uploadPanorama(num, file);
+//    }
+
+//    /**
+//     * <p>
+//            下载全景图
+//     * </p>
+//     * @author dengsixing
+//     * @date 2022/2/16
+//     * @return java.util.List<java.lang.String>
+//     **/
+//    @CheckPermit
+//    @PostMapping(value = "/downloadPanorama")
+//    public ResultData downloadPanorama(@RequestBody @Validated FileParamVO param) throws Exception {
+//        return sceneEditInfoService.downloadPanorama(param);
+//    }
 
     /**
      * <p>
@@ -528,19 +526,19 @@ public class SceneEditController extends BaseController {
         return sceneUploadService.uploads(base64,fileName,bizType,files,num,type,getToken(),uploadPath);
     }
 
-    /**
-     * <p>
-     用户自定义上传文本内容上传
-     * </p>
-     * @author dengsixing
-     * @date 2022/8/1
-     * @param param
-     * @return java.lang.String
-     **/
-    @RequestMapping(value = "/upload/content", method = RequestMethod.POST)
-    public String uploadContent(@RequestBody @Validated UploadContentParamVO param) throws Exception {
-        return sceneUploadService.uploadContent(param);
-    }
+//    /**
+//     * <p>
+//     用户自定义上传文本内容上传
+//     * </p>
+//     * @author dengsixing
+//     * @date 2022/8/1
+//     * @param param
+//     * @return java.lang.String
+//     **/
+//    @RequestMapping(value = "/upload/content", method = RequestMethod.POST)
+//    public String uploadContent(@RequestBody @Validated UploadContentParamVO param) throws Exception {
+//        return sceneUploadService.uploadContent(param);
+//    }
 
     /**
      * <p>
@@ -557,31 +555,31 @@ public class SceneEditController extends BaseController {
         return sceneUploadService.delete(paramVO);
     }
 
-    /**
-     * <p>
-     场景同步
-     * </p>
-     * @author dengsixing
-     * @date 2022/8/1
-     * @param num
-     * @param type
-     * @param floorPlanJson
-     * @param ajkJson
-     * @param cameraJson
-     * @param files
-     * @return com.fdkankan.web.response.ResultData
-     **/
-    @CheckPermit
-    @PostMapping(value = "/sceneSync")
-    public ResultData sceneSync(
-        @RequestParam("num") String num,
-        @RequestParam(value = "type", defaultValue = "ajk") String type,
-        @RequestParam("floorPlanJson") String floorPlanJson,
-        @RequestParam("ajkJson") String ajkJson,
-        @RequestParam("cameraJson") String cameraJson,
-        @RequestParam("files") MultipartFile[] files) throws Exception{
-        return sceneEditInfoService.sceneSync(num, type, floorPlanJson, ajkJson, cameraJson, files);
-    }
+//    /**
+//     * <p>
+//     场景同步
+//     * </p>
+//     * @author dengsixing
+//     * @date 2022/8/1
+//     * @param num
+//     * @param type
+//     * @param floorPlanJson
+//     * @param ajkJson
+//     * @param cameraJson
+//     * @param files
+//     * @return com.fdkankan.web.response.ResultData
+//     **/
+//    @CheckPermit
+//    @PostMapping(value = "/sceneSync")
+//    public ResultData sceneSync(
+//        @RequestParam("num") String num,
+//        @RequestParam(value = "type", defaultValue = "ajk") String type,
+//        @RequestParam("floorPlanJson") String floorPlanJson,
+//        @RequestParam("ajkJson") String ajkJson,
+//        @RequestParam("cameraJson") String cameraJson,
+//        @RequestParam("files") MultipartFile[] files) throws Exception{
+//        return sceneEditInfoService.sceneSync(num, type, floorPlanJson, ajkJson, cameraJson, files);
+//    }
 
     /**
      * <p>
@@ -598,22 +596,22 @@ public class SceneEditController extends BaseController {
         return sceneEditService.getAuth(num, this.getSsoUser());
     }
 
-    /**
-     * <p>
-            上传国际化文件
-     * </p>
-     * @author dengsixing
-     * @date 2022/4/11
-     * @param param
-     * @return com.fdkankan.web.response.ResultData
-     **/
-    @PostMapping(value = "/locales")
-    public ResultData locales(@RequestBody @Validated LocalesParamVO param) throws Exception {
-        if("pro".equals(env)){
-            throw new BusinessException(ErrorCode.HAVE_NO_RIGHT);
-        }
-        return sceneEditService.locales(param);
-    }
+//    /**
+//     * <p>
+//            上传国际化文件
+//     * </p>
+//     * @author dengsixing
+//     * @date 2022/4/11
+//     * @param param
+//     * @return com.fdkankan.web.response.ResultData
+//     **/
+//    @PostMapping(value = "/locales")
+//    public ResultData locales(@RequestBody @Validated LocalesParamVO param) throws Exception {
+//        if("pro".equals(env)){
+//            throw new BusinessException(ErrorCode.HAVE_NO_RIGHT);
+//        }
+//        return sceneEditService.locales(param);
+//    }
 
     /**
      * <p>

src/main/java/com/fdkankan/scene/controller/TestController.java

@@ -1,31 +0,0 @@
-package com.fdkankan.scene.controller;
-
-import com.fdkankan.web.response.ResultData;
-import com.fdkankan.fyun.face.FYunFileServiceInterface;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-/**
- * <p>
- * TODO
- * </p>
- *
- * @author dengsixing
- * @since 2022/8/17
- **/
-@RestController
-@RequestMapping("/test")
-public class TestController {
-
-    @Autowired
-    private FYunFileServiceInterface fYunFileServiceInterface;
-
-    @GetMapping("/test")
-    public ResultData test(){
-        fYunFileServiceInterface.uploadFile("4dkankan", "F:\\test\\vision.json", "test_dsx/vision.json");
-        return ResultData.ok();
-    }
-
-}

src/main/java/com/fdkankan/scene/controller/V3Controller.java

@@ -3,7 +3,6 @@ package com.fdkankan.scene.controller;
 import com.fdkankan.web.response.ResultData;
 import com.fdkankan.scene.service.ISceneEditInfoService;
 import com.fdkankan.scene.service.IScenePlusService;
-import com.fdkankan.scene.service.ISceneUpgradeToV4Service;
 import com.fdkankan.scene.vo.MoveSceneParamVO;
 import com.fdkankan.scene.vo.UnbindOrBindCameraParamVO;
 import com.fdkankan.scene.vo.UpgradeToV4ParamVO;
@@ -19,7 +18,7 @@ import org.springframework.web.bind.annotation.RestController;
 
 /**
  * <p>
- * TODO
+ * -
  * </p>
  *
  * @author dengsixing
@@ -30,8 +29,6 @@ import org.springframework.web.bind.annotation.RestController;
 public class V3Controller extends BaseController {
 
     @Autowired
-    private ISceneUpgradeToV4Service sceneUpgradeToV4Service;
-    @Autowired
     private ISceneEditInfoService sceneEditInfoService;
     @Autowired
     private IScenePlusService scenePlusService;
@@ -51,34 +48,34 @@ public class V3Controller extends BaseController {
 //        return resultData;
 //    }
 
-    /**
-     * <p>
-     场景升级进度查询
-     此接口用于V3\V4系统并存过渡期，场景升级v4做数据迁移用，待V3关闭可以删除
-     * </p>
-     * @author dengsixing
-     * @date 2022/4/21
-     * @return com.fdkankan.web.response.ResultData
-     **/
-    @GetMapping(value = "/getUpgradeToV4Progress")
-    public ResultData getUpgradeToV4Progress(@RequestParam(value = "num") String num){
-        ResultData resultData = sceneUpgradeToV4Service.getUpgradeToV4Progress(num);
-        return resultData;
-    }
+//    /**
+//     * <p>
+//     场景升级进度查询
+//     此接口用于V3\V4系统并存过渡期，场景升级v4做数据迁移用，待V3关闭可以删除
+//     * </p>
+//     * @author dengsixing
+//     * @date 2022/4/21
+//     * @return com.fdkankan.web.response.ResultData
+//     **/
+//    @GetMapping(value = "/getUpgradeToV4Progress")
+//    public ResultData getUpgradeToV4Progress(@RequestParam(value = "num") String num){
+//        ResultData resultData = sceneUpgradeToV4Service.getUpgradeToV4Progress(num);
+//        return resultData;
+//    }
 
-    /**
-     * <p>
-     查询场景scenejson
-     此接口用于V3\V4系统并存过渡期，待V3关闭可以删除
-     * </p>
-     * @author dengsixing
-     * @date 2022/4/21
-     * @return com.fdkankan.web.response.ResultData
-     **/
-    @GetMapping(value = "/getSceneViewInfo")
-    public ResultData getSceneViewInfo(@RequestParam(value = "num") String num){
-        return sceneUpgradeToV4Service.getSceneViewInfo(num);
-    }
+//    /**
+//     * <p>
+//     查询场景scenejson
+//     此接口用于V3\V4系统并存过渡期，待V3关闭可以删除
+//     * </p>
+//     * @author dengsixing
+//     * @date 2022/4/21
+//     * @return com.fdkankan.web.response.ResultData
+//     **/
+//    @GetMapping(value = "/getSceneViewInfo")
+//    public ResultData getSceneViewInfo(@RequestParam(value = "num") String num){
+//        return sceneUpgradeToV4Service.getSceneViewInfo(num);
+//    }
 
     /**
      * <p>

src/main/java/com/fdkankan/scene/httpclient/FdkankanMiniClient.java

@@ -16,7 +16,7 @@
 //
 ///**
 // * <p>
-// * TODO
+// * -
 // * </p>
 // *
 // * @author dengsixing

src/main/java/com/fdkankan/scene/listener/RabbitMqListener.java

@@ -1,131 +0,0 @@
-package com.fdkankan.scene.listener;//package com.fdkankan.scene.listener;
-//
-//import com.alibaba.fastjson.JSONObject;
-//import com.fdkankan.rabbitmq.bean.BuildSceneCallMessage;
-//import com.fdkankan.rabbitmq.bean.BuildSceneFailDTMqMessage;
-//import com.fdkankan.rabbitmq.bean.BuildSceneResultMqMessage;
-//import com.fdkankan.scene.service.IBuildSceneDTService;
-//import com.fdkankan.scene.service.IBuildScenePostService;
-//import com.fdkankan.scene.service.IBuildScenePreService;
-//import com.fdkankan.scene.service.impl.BuildSceneDTServiceImpl;
-//import com.rabbitmq.client.Channel;
-//import java.nio.charset.StandardCharsets;
-//import lombok.extern.slf4j.Slf4j;
-//import org.springframework.amqp.core.Message;
-//import org.springframework.amqp.rabbit.annotation.Queue;
-//import org.springframework.amqp.rabbit.annotation.RabbitListener;
-//import org.springframework.beans.factory.annotation.Autowired;
-//import org.springframework.beans.factory.annotation.Value;
-//import org.springframework.stereotype.Component;
-//
-///**
-// * <p>
-// * TODO
-// * </p>
-// *
-// * @author dengsixing
-// * @since 2022/4/19
-// **/
-//@Slf4j
-//@Component
-//public class RabbitMqListener {
-//    @Value("${queue.modeling.modeling-pre}")
-//    private String queueModelingPre;
-//    @Value("${queue.modeling.modeling-post}")
-//    private String queueModelingPost;
-//    @Value("${queue.modeling.modeling-dt}")
-//    private String queueModelingDt;
-//
-//    @Autowired
-//    IBuildScenePreService buildScenePreService;
-//    @Autowired
-//    IBuildScenePostService buildScenePostService;
-//    @Autowired
-//    IBuildSceneDTService buildSceneDTService;
-//
-//
-//
-//    /**
-//     * 开启了手动确认模式，如果没有手动确认，消费者不会重试，当服务重启时会再次消费，因为rabbitmq认为你还没有处理完你的业务
-//     * queuesToDeclare = @Queue("${queue.modeling.modeling-test}"),  如果队列不不存在会自动创建队列
-//     * concurrency = "3"    设置消费线程数，每个线程每次只拉取一条消息消费
-//     */
-////    @RabbitListener(
-////        queuesToDeclare = @Queue("${queue.modeling.modeling-test}"),
-////        concurrency = "1"
-////    )
-////    public void receiveMessageDsx(Channel channel, Message message) throws Exception {
-////        channel.queueDeclare();
-////        String msg = new String(message.getBody(), StandardCharsets.UTF_8);
-////        log.info("开始消费消息-" + msg + "-" + Thread.currentThread().getId());
-////        Thread.sleep(5000L);
-////        channel.basicAck(message.getMessageProperties().getDeliveryTag(), false);
-////        log.info("结束消息-" + Thread.currentThread().getId());
-////    }
-//
-//
-//    /**
-//     * 场景计算前置资源准备处理
-//     * @param channel
-//     * @param message
-//     * @throws Exception
-//     */
-//    @RabbitListener(
-//        queuesToDeclare = @Queue("${queue.modeling.modeling-pre}"),
-//        concurrency = "${maxThread.modeling.modeling-pre}"
-//    )
-//    public void buildScenePreHandler(Channel channel, Message message) throws Exception {
-//        Object correlation = message.getMessageProperties().getHeader("spring_returned_message_correlation");
-//        String correlationId = (String) correlation;
-//        String msg = new String(message.getBody(), StandardCharsets.UTF_8);
-//        log.info("场景计算资源准备开始，队列名：{}，id：{},消息体:{}", queueModelingPre, correlationId, msg);
-//        BuildSceneCallMessage buildSceneMessage = JSONObject.parseObject(msg, BuildSceneCallMessage.class);
-//        Thread.sleep(2000L);
-//        buildScenePreService.buildScenePre(buildSceneMessage);
-//        channel.basicAck(message.getMessageProperties().getDeliveryTag(), false);
-//    }
-//
-//    /**
-//     * 场景计算后置结果处理
-//     * @param channel
-//     * @param message
-//     * @throws Exception
-//     */
-//    @RabbitListener(
-//        queuesToDeclare = @Queue("${queue.modeling.modeling-post}"),
-//        concurrency = "${maxThread.modeling.modeling-post}"
-//    )
-//    public void buildScenePostHandler(Channel channel, Message message) throws Exception {
-//        Object correlation = message.getMessageProperties().getHeader("spring_returned_message_correlation");
-//        String correlationId = (String) correlation;
-//        String msg = new String(message.getBody(), StandardCharsets.UTF_8);
-//        log.info("场景计算结果处理开始,队列名：{},id:{},消息体:{}", queueModelingPost, correlationId, msg);
-//        BuildSceneResultMqMessage resultMessage = JSONObject.parseObject(msg, BuildSceneResultMqMessage.class);
-//        Thread.sleep(2000L);
-//        buildScenePostService.buildScenePost(resultMessage);
-//        channel.basicAck(message.getMessageProperties().getDeliveryTag(), false);
-//    }
-//
-//    /**
-//     * 场景计算发送钉钉消息
-//     * @param channel
-//     * @param message
-//     * @throws Exception
-//     */
-//    @RabbitListener(
-//        queuesToDeclare = @Queue("${queue.modeling.modeling-dt}"),
-//        concurrency = "${maxThread.modeling.modeling-dt}"
-//    )
-//    public void buildSceneDTHandler(Channel channel, Message message) throws Exception {
-//        Object correlation = message.getMessageProperties().getHeader("spring_returned_message_correlation");
-//        String correlationId = (String) correlation;
-//        String msg = new String(message.getBody(), StandardCharsets.UTF_8);
-//        log.info("发送钉钉消息处理，队列名：{}，id：{},消息体:{}", queueModelingDt, correlationId, msg);
-//        BuildSceneFailDTMqMessage dtMessage = JSONObject.parseObject(msg, BuildSceneFailDTMqMessage.class);
-//        buildSceneDTService.handFail(dtMessage.getReason(), dtMessage.getServerPath(),
-//            dtMessage.getNum(), dtMessage.getHostName(), BuildSceneDTServiceImpl.contentExt);
-//        channel.basicAck(message.getMessageProperties().getDeliveryTag(), false);
-//    }
-//
-//
-//}

src/main/java/com/fdkankan/scene/service/IFileConvertService.java

@@ -5,7 +5,7 @@ import org.springframework.web.multipart.MultipartFile;
 
 /**
  * <p>
- * TODO
+ * -
  * </p>
  *
  * @author dengsixing

src/main/java/com/fdkankan/scene/service/ISceneEditInfoService.java

@@ -59,9 +59,9 @@ public interface ISceneEditInfoService extends IService<SceneEditInfo> {
 
     void upgradeSceneJsonVersion(String num, int version, Integer imgVersion, String bucket) throws IOException ;
 
-    ResultData uploadPanorama(String num, MultipartFile file) throws Exception;
+//    ResultData uploadPanorama(String num, MultipartFile file) throws Exception;
 
-    ResultData downloadPanorama(FileParamVO param) throws Exception;
+//    ResultData downloadPanorama(FileParamVO param) throws Exception;
 
     void saveTagsToSceneEditInfo(String num, SceneEditInfo sceneEditInfo);
 
@@ -79,13 +79,13 @@ public interface ISceneEditInfoService extends IService<SceneEditInfo> {
 
     void upgradeVersionToSceneJson(String num, String bucket) throws Exception;
 
-    ResultData sceneSync(String num, String type, String floorPlanJson, String ajkJson, String cameraJson, MultipartFile[] files) throws Exception;
+//    ResultData sceneSync(String num, String type, String floorPlanJson, String ajkJson, String cameraJson, MultipartFile[] files) throws Exception;
 
     ResultData checkKey(SceneCheckKeyParamVO param) throws Exception;
 
     ResultData addMosaics(BaseDataParamVO param) throws Exception;
 
-    ResultData uploadLinkPan(String num, String sid, String fileName, MultipartFile file) throws Exception;
+//    ResultData uploadLinkPan(String num, String sid, String fileName, MultipartFile file) throws Exception;
 
     ResultData saveLinkPan(SaveLinkPanParamVO param) throws Exception;
 

src/main/java/com/fdkankan/scene/service/ISceneProService.java

@@ -43,8 +43,8 @@ public interface ISceneProService extends IService<ScenePro> {
 
     void updateUserIdByCameraId(Long userId, Long cameraId);
 
-    ResultData uploadObjAndImg(String num, MultipartFile file) throws Exception;
+//    ResultData uploadObjAndImg(String num, MultipartFile file) throws Exception;
 
-    ResultData downloadTexData(String num) throws Exception;
+//    ResultData downloadTexData(String num) throws Exception;
 
 }

src/main/java/com/fdkankan/scene/service/ISceneUpgradeToV4Service.java

@@ -1,20 +0,0 @@
-package com.fdkankan.scene.service;
-
-import com.fdkankan.web.response.ResultData;
-import com.fdkankan.scene.vo.UpgradeToV4ParamVO;
-
-/**
- * <p>
- * TODO
- * </p>
- *
- * @author dengsixing
- * @since 2022/4/21
- **/
-public interface ISceneUpgradeToV4Service {
-
-    ResultData getUpgradeToV4Progress(String num);
-
-    ResultData getSceneViewInfo(String num);
-
-}

src/main/java/com/fdkankan/scene/service/ISceneUploadService.java

@@ -22,5 +22,5 @@ public interface ISceneUploadService extends IService<SceneUpload> {
 
     ResultData delete(DeleteFileParamVO param) throws Exception;
 
-    String uploadContent(UploadContentParamVO param) throws Exception;
+//    String uploadContent(UploadContentParamVO param) throws Exception;
 }

src/main/java/com/fdkankan/scene/service/impl/FileConvertServiceImpl.java

@@ -20,7 +20,7 @@ import org.springframework.web.multipart.MultipartFile;
 
 /**
  * <p>
- * TODO
+ * -
  * </p>
  *
  * @author dengsixing

src/main/java/com/fdkankan/scene/service/impl/SceneEditServiceImpl.java

@@ -9,11 +9,9 @@ import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.fdkankan.common.constant.CommonStatus;
 import com.fdkankan.common.constant.ErrorCode;
-import com.fdkankan.model.constants.UploadFilePath;
 import com.fdkankan.common.exception.BusinessException;
-import com.fdkankan.web.response.ResultData;
 import com.fdkankan.common.util.DateExtUtil;
-import com.fdkankan.fyun.face.FYunFileServiceInterface;
+import com.fdkankan.model.constants.UploadFilePath;
 import com.fdkankan.scene.entity.Camera;
 import com.fdkankan.scene.entity.CameraDetail;
 import com.fdkankan.scene.entity.SceneCooperation;
@@ -39,22 +37,20 @@ import com.fdkankan.scene.vo.BaseSceneParamVO;
 import com.fdkankan.scene.vo.DeleteFileParamVO;
 import com.fdkankan.scene.vo.LocalesParamVO;
 import com.fdkankan.scene.vo.SceneAuthVO;
+import com.fdkankan.web.response.ResultData;
 import com.fdkankan.web.user.SSOUser;
 import java.io.IOException;
-import java.nio.charset.StandardCharsets;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
 import java.util.Objects;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.cloud.context.config.annotation.RefreshScope;
 import org.springframework.stereotype.Service;
 
 /**
  * <p>
- * TODO
+ * -
  * </p>
  *
  * @author dengsixing
@@ -62,7 +58,6 @@ import org.springframework.stereotype.Service;
  **/
 @Slf4j
 @Service
-@RefreshScope
 public class SceneEditServiceImpl implements ISceneEditService {
 
     @Autowired
@@ -70,8 +65,6 @@ public class SceneEditServiceImpl implements ISceneEditService {
     @Autowired
     IScenePlusService scenePlusService;
     @Autowired
-    private FYunFileServiceInterface fYunFileService;
-    @Autowired
     private ISceneUploadService sceneUploadService;
     @Autowired
     private ISceneEditInfoExtService sceneEditInfoExtService;
@@ -81,8 +74,6 @@ public class SceneEditServiceImpl implements ISceneEditService {
     private ICameraService cameraService;
     @Autowired
     private IUserIncrementService userIncrementService;
-    @Value("${expected.time}")
-    private String expectedTime;
     @Autowired
     private IUserService userService;
     @Autowired
@@ -149,8 +140,6 @@ public class SceneEditServiceImpl implements ISceneEditService {
         sceneAuthVO.setIsVip(isVip);
 
         //判断过期时间
-        Date date = DateUtil.parse(expectedTime, DateExtUtil.dateStyle);
-
         if(camera != null){
             if(!scenePlus.getCameraId().equals(camera.getId())){
                 throw new BusinessException(ErrorCode.FAILURE_CODE_5014);
@@ -219,7 +208,8 @@ public class SceneEditServiceImpl implements ISceneEditService {
     @Override
     public ResultData locales(LocalesParamVO param) throws Exception {
         String key = "v4/www/locales/" + param.getFile();
-        fYunFileService.uploadFile(JSON.toJSONBytes(param.getData()), key);
+// TODO: 2022/8/22  
+        //        fYunFileService.uploadFile(JSON.toJSONBytes(param.getData()), key);
         return ResultData.ok();
     }
 
@@ -231,7 +221,8 @@ public class SceneEditServiceImpl implements ISceneEditService {
         }
         ScenePlusExt scenePlusExt = scenePlusExtService.getScenePlusExtByPlusId(scenePlus.getId());
         String key = String.format(UploadFilePath.USER_EDIT_PATH, param.getNum()) + "tour.json";
-        fYunFileService.uploadFile(scenePlusExt.getYunFileBucket(), param.getData().getBytes(StandardCharsets.UTF_8), key);
+// TODO: 2022/8/22  
+        //        fYunFileService.uploadFile(scenePlusExt.getYunFileBucket(), param.getData().getBytes(StandardCharsets.UTF_8), key);
 
         sceneEditInfoExtService.updateToursByNum(
             param.getNum(), Integer.valueOf(CommonStatus.YES.code()));
@@ -248,7 +239,9 @@ public class SceneEditServiceImpl implements ISceneEditService {
         ScenePlusExt scenePlusExt = scenePlusExtService.getScenePlusExtByPlusId(scenePlus.getId());
         String userEditPath = String.format(UploadFilePath.USER_EDIT_PATH, param.getNum());
         String tourJsonPath = userEditPath + "tour.json";
-        String tourJson = fYunFileService.getFileContent(scenePlusExt.getYunFileBucket(), tourJsonPath);
+// TODO: 2022/8/22  
+        String tourJson = null;
+            //String tourJson = fYunFileService.getFileContent(scenePlusExt.getYunFileBucket(), tourJsonPath);
         JSONArray tours = JSON.parseArray(tourJson);
         if(CollUtil.isNotEmpty(tours)){
             List<String> fileNames = new ArrayList<>();
@@ -286,7 +279,8 @@ public class SceneEditServiceImpl implements ISceneEditService {
             }
         }
         //删除tour.json文件
-        fYunFileService.deleteFile(scenePlusExt.getYunFileBucket(), tourJsonPath);
+        // TODO: 2022/8/22  
+//        fYunFileService.deleteFile(scenePlusExt.getYunFileBucket(), tourJsonPath);
 
         sceneEditInfoExtService.updateToursByNum(
             param.getNum(), Integer.valueOf(CommonStatus.NO.code()));

src/main/java/com/fdkankan/scene/service/impl/SceneProServiceImpl.java

@@ -2,28 +2,21 @@ package com.fdkankan.scene.service.impl;
 
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.util.StrUtil;
-import cn.hutool.core.util.ZipUtil;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.fdkankan.common.constant.CommonStatus;
-import com.fdkankan.model.constants.ConstantFileName;
-import com.fdkankan.model.constants.ConstantFilePath;
 import com.fdkankan.common.constant.ErrorCode;
 import com.fdkankan.common.constant.FileBizType;
-import com.fdkankan.common.constant.ServerCode;
-import com.fdkankan.model.constants.UploadFilePath;
 import com.fdkankan.common.exception.BusinessException;
-import com.fdkankan.web.response.ResultData;
+import com.fdkankan.common.util.FileUtils;
+import com.fdkankan.model.constants.ConstantFileName;
+import com.fdkankan.model.constants.ConstantFilePath;
+import com.fdkankan.model.constants.UploadFilePath;
 import com.fdkankan.model.utils.ComputerUtil;
 import com.fdkankan.model.utils.ConvertUtils;
 import com.fdkankan.model.utils.CreateObjUtil;
-import com.fdkankan.common.util.FileUtils;
-import com.fdkankan.common.util.OkHttpUtils;
-import com.fdkankan.fyun.constant.FYunTypeEnum;
-import com.fdkankan.fyun.face.FYunFileServiceInterface;
 import com.fdkankan.redis.constant.RedisKey;
 import com.fdkankan.redis.constant.RedisLockKey;
 import com.fdkankan.redis.util.RedisLockUtil;
@@ -50,6 +43,7 @@ import com.fdkankan.scene.vo.FileNameAndDataParamVO;
 import com.fdkankan.scene.vo.HotParamVO;
 import com.fdkankan.scene.vo.SaveTagsParamVO;
 import com.fdkankan.scene.vo.SaveTagsVisibleParamVO;
+import com.fdkankan.web.response.ResultData;
 import com.google.common.collect.Lists;
 import com.google.common.collect.Sets;
 import java.io.File;
@@ -66,7 +60,6 @@ import java.util.Set;
 import java.util.stream.Collectors;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -84,14 +77,6 @@ import org.springframework.web.multipart.MultipartFile;
 @Service
 public class SceneProServiceImpl extends ServiceImpl<ISceneProMapper, ScenePro> implements ISceneProService {
 
-    @Value("${fyun.host}")
-    private String ossUrlPrefix;
-    @Value("${fyun.type}")
-    private String fyunType;
-    @Value("${hot.domain.list}")
-    private String hotDomainList;
-    @Value("${hot.delete}")
-    private String hotDelete;
     @Value("${main.url}")
     private String mainUrl;
     @Value("${scene.url}")
@@ -104,14 +89,8 @@ public class SceneProServiceImpl extends ServiceImpl<ISceneProMapper, ScenePro>
     private int maxCheckTimes;
     @Value("${ecs.checkFile.waitTime:5000}")
     private int waitTime;
-    @Value("${http.host.4dkankanMini}")
-    private String fkankanMiniHost;
-    @Value("${http.api-v4.upgradeToV4ResultSync}")
-    private String URL_UPGRADE_TO_V4_RESULT_SYNC;
 
     @Autowired
-    private FYunFileServiceInterface fYunFileService;
-    @Autowired
     private RedisLockUtil redisLockUtil;
     @Autowired
     private RedisUtil redisUtil;
@@ -141,8 +120,9 @@ public class SceneProServiceImpl extends ServiceImpl<ISceneProMapper, ScenePro>
         ScenePlusExt scenePlusExt = scenePlusExtService.getScenePlusExtByPlusId(scenePlus.getId());
 
         //更新缩略图url
-        String thumbUrl = this.ossUrlPrefix + String.format(UploadFilePath.USER_EDIT_PATH, param.getNum()) + param.getFileName();
-        scenePlusExt.setThumb(thumbUrl);
+        // TODO: 2022/8/22
+//        String thumbUrl = this.ossUrlPrefix + String.format(UploadFilePath.USER_EDIT_PATH, param.getNum()) + param.getFileName();
+//        scenePlusExt.setThumb(thumbUrl);
         scenePlusExtService.updateById(scenePlusExt);
 
         SceneEditInfo sceneEditInfo = sceneEditInfoService.getByScenePlusId(scenePlus.getId());
@@ -517,30 +497,18 @@ public class SceneProServiceImpl extends ServiceImpl<ISceneProMapper, ScenePro>
                 String fileType = jsonObject.getString("media");
                 if(fileType.contains("photo"))
                 {
-                    fYunFileService.deleteFile(bucket,userDataPath + "hot"+sid+".jpg");
+                    // TODO: 2022/8/22
+//                    fYunFileService.deleteFile(bucket,userDataPath + "hot"+sid+".jpg");
                 }
                 if(fileType.contains("audio") || fileType.contains("voice"))
                 {
-                    fYunFileService.deleteFile(bucket,userDataPath + "hot"+sid+".mp3");
+                    // TODO: 2022/8/22
+//                    fYunFileService.deleteFile(bucket,userDataPath + "hot"+sid+".mp3");
                 }
                 if(fileType.contains("video"))
                 {
-                    fYunFileService.deleteFile(bucket,userDataPath + "hot"+sid+".mp4");
-                }
-            }
-            if(!FYunTypeEnum.AWS.code().equals(this.fyunType)){
-                JSONObject paramData = new JSONObject();
-                paramData.put("hotId", sid);
-                JSONObject hotListJson = JSONObject.parseObject(OkHttpUtils.httpGet(hotDomainList));
-                if(hotListJson != null){
-                    JSONArray hotListArray = hotListJson.getJSONArray("data");
-                    if(hotListArray != null){
-                        for(int l = 0, len = hotListArray.size(); l < len; l++){
-                            OkHttpUtils.httpPostJson(hotListArray.getString(l) + hotDelete + "?hotId=" + sid
-                                , paramData.toJSONString());
-                        }
-
-                    }
+                    // TODO: 2022/8/22
+//                    fYunFileService.deleteFile(bucket,userDataPath + "hot"+sid+".mp4");
                 }
             }
         }
@@ -625,11 +593,9 @@ public class SceneProServiceImpl extends ServiceImpl<ISceneProMapper, ScenePro>
         if (!directory.exists()) {
             directory.mkdirs();
         }
-        String viewImagesPath = String.format(UploadFilePath.IMG_VIEW_PATH, param.getNum());
-        String modeldataUrl = ossUrlPrefix + viewImagesPath + "vision.modeldata?t=" + System.currentTimeMillis();
-
         //如果是云存储，将vision.modeldata下载到本地，如果是本地存储，场景计算完就已经将这个文件拷贝到编辑目录了存在这个文件了，不需要再下载
-        fYunFileService.downloadFile(bucket, viewImagesPath + "vision.modeldata", localDataPath + "vision.modeldata");
+        // TODO: 2022/8/22
+//        fYunFileService.downloadFile(bucket, viewImagesPath + "vision.modeldata", localDataPath + "vision.modeldata");
 
         //检查vision.modeldata本地是否存在，不存在抛出异常
         File file = new File(localDataPath + "vision.modeldata");
@@ -659,7 +625,8 @@ public class SceneProServiceImpl extends ServiceImpl<ISceneProMapper, ScenePro>
         FileUtils.deleteFile(localDataPath + "vision.modeldata");
         FileUtils.writeFile(localDataPath + "vision.json", json.toString());
         ConvertUtils.convertTxtToVisionModelData(localDataPath + "vision.json", localDataPath + "vision.modeldata");
-        fYunFileService.uploadFile(bucket, localDataPath + "vision.modeldata", viewImagesPath + "vision.modeldata");
+// TODO: 2022/8/22
+        //        fYunFileService.uploadFile(bucket, localDataPath + "vision.modeldata", viewImagesPath + "vision.modeldata");
 
         //更新版本号
         SceneEditInfo editInfo = sceneEditInfoService.getByScenePlusId(scenePlus.getId());
@@ -686,68 +653,68 @@ public class SceneProServiceImpl extends ServiceImpl<ISceneProMapper, ScenePro>
                 .set(ScenePro::getUserId, userId));
     }
 
-    @Override
-    public ResultData uploadObjAndImg(String num, MultipartFile file) throws Exception{
-        if(StrUtil.isEmpty(num)){
-            throw new BusinessException(ServerCode.PARAM_REQUIRED, "num");
-        }
-        if(!file.getOriginalFilename().endsWith(".zip")){
-            throw new BusinessException(ErrorCode.FAILURE_CODE_7015);
-        }
-
-        ScenePlus scenePlus = scenePlusService.getScenePlusByNum(num);
-        if(scenePlus == null){
-            throw new BusinessException(ErrorCode.FAILURE_CODE_5005);
-        }
-        ScenePlusExt scenePlusExt = scenePlusExtService.getScenePlusExtByPlusId(scenePlus.getId());
-        String bucket = scenePlusExt.getYunFileBucket();
-
-        //文件上传的位置可以自定义
-        String path = scenePlusExt.getDataSource() + "_obj2txt";
-        String zipPath = path + "/zip/";
-        String filePath =  path + "/extras/";
-        String resultPath = path + "/results/";
-
-        //压缩文件处理：解压缩，解压缩后复制等操作
-        this.objAndImgFileHandler(resultPath, filePath, zipPath, file);
-
-        //创建data.json
-        this.writeDataJson(path);
-
-        //调用算法,不同的类型调用不同的算法
-        if("V2".equals(scenePlusExt.getBuildType())){
-            CreateObjUtil.objToTxt(path , "1");
-        }
-        if("V3".equals(scenePlusExt.getBuildType())){
-            CreateObjUtil.build3dModel(path , "1");
-        }
-
-        //算法计算完后，生成压缩文件，上传到oss
-        this.uploadFileofterRebuildPanoram(path, num, bucket);
-
-        //更新版本信息
-        SceneEditInfo sceneEditInfo = sceneEditInfoService.getByScenePlusId(scenePlus.getId());
-        if(Objects.isNull(sceneEditInfo)){
-            sceneEditInfo = new SceneEditInfo();
-            sceneEditInfo.setScenePlusId(scenePlus.getId());
-            sceneEditInfo.setFloorPublishVer(1);
-            sceneEditInfo.setFloorEditVer(1);
-            sceneEditInfo.setIsUploadObj(CommonStatus.YES.code());
-            sceneEditInfoService.save(sceneEditInfo);
-        }else{
-            sceneEditInfoService.update(
-                new LambdaUpdateWrapper<SceneEditInfo>()
-                    .setSql("version = version + 1")
-                    .setSql("floor_edit_ver = floor_edit_ver + 1")
-                    .setSql("floor_publish_ver = floor_publish_ver + 1")
-                    .setSql("img_version = img_version + 1")
-                    .set(SceneEditInfo::getIsUploadObj, CommonStatus.YES.code())
-                    .eq(SceneEditInfo::getId, sceneEditInfo.getId()));
-
-            sceneEditInfoService.upgradeSceneJsonVersion(num, sceneEditInfo.getVersion() + 1, sceneEditInfo.getImgVersion() + 1, bucket);        }
-
-        return ResultData.ok();
-    }
+//    @Override
+//    public ResultData uploadObjAndImg(String num, MultipartFile file) throws Exception{
+//        if(StrUtil.isEmpty(num)){
+//            throw new BusinessException(ServerCode.PARAM_REQUIRED, "num");
+//        }
+//        if(!file.getOriginalFilename().endsWith(".zip")){
+//            throw new BusinessException(ErrorCode.FAILURE_CODE_7015);
+//        }
+//
+//        ScenePlus scenePlus = scenePlusService.getScenePlusByNum(num);
+//        if(scenePlus == null){
+//            throw new BusinessException(ErrorCode.FAILURE_CODE_5005);
+//        }
+//        ScenePlusExt scenePlusExt = scenePlusExtService.getScenePlusExtByPlusId(scenePlus.getId());
+//        String bucket = scenePlusExt.getYunFileBucket();
+//
+//        //文件上传的位置可以自定义
+//        String path = scenePlusExt.getDataSource() + "_obj2txt";
+//        String zipPath = path + "/zip/";
+//        String filePath =  path + "/extras/";
+//        String resultPath = path + "/results/";
+//
+//        //压缩文件处理：解压缩，解压缩后复制等操作
+//        this.objAndImgFileHandler(resultPath, filePath, zipPath, file);
+//
+//        //创建data.json
+//        this.writeDataJson(path);
+//
+//        //调用算法,不同的类型调用不同的算法
+//        if("V2".equals(scenePlusExt.getBuildType())){
+//            CreateObjUtil.objToTxt(path , "1");
+//        }
+//        if("V3".equals(scenePlusExt.getBuildType())){
+//            CreateObjUtil.build3dModel(path , "1");
+//        }
+//
+//        //算法计算完后，生成压缩文件，上传到oss
+//        this.uploadFileofterRebuildPanoram(path, num, bucket);
+//
+//        //更新版本信息
+//        SceneEditInfo sceneEditInfo = sceneEditInfoService.getByScenePlusId(scenePlus.getId());
+//        if(Objects.isNull(sceneEditInfo)){
+//            sceneEditInfo = new SceneEditInfo();
+//            sceneEditInfo.setScenePlusId(scenePlus.getId());
+//            sceneEditInfo.setFloorPublishVer(1);
+//            sceneEditInfo.setFloorEditVer(1);
+//            sceneEditInfo.setIsUploadObj(CommonStatus.YES.code());
+//            sceneEditInfoService.save(sceneEditInfo);
+//        }else{
+//            sceneEditInfoService.update(
+//                new LambdaUpdateWrapper<SceneEditInfo>()
+//                    .setSql("version = version + 1")
+//                    .setSql("floor_edit_ver = floor_edit_ver + 1")
+//                    .setSql("floor_publish_ver = floor_publish_ver + 1")
+//                    .setSql("img_version = img_version + 1")
+//                    .set(SceneEditInfo::getIsUploadObj, CommonStatus.YES.code())
+//                    .eq(SceneEditInfo::getId, sceneEditInfo.getId()));
+//
+//            sceneEditInfoService.upgradeSceneJsonVersion(num, sceneEditInfo.getVersion() + 1, sceneEditInfo.getImgVersion() + 1, bucket);        }
+//
+//        return ResultData.ok();
+//    }
 
     private void uploadFileofterRebuildPanoram(String path, String sceneNum, String bucket) throws Exception {
         //因为共享目录有延迟，这里循环检测算法是否计算完毕3次，每次隔五秒
@@ -790,7 +757,8 @@ public class SceneProServiceImpl extends ServiceImpl<ISceneProMapper, ScenePro>
         map.put(path + File.separator + "results" +File.separator+ConstantFileName.modelUUID+"_50k.dam.lzma", imgViewPath +ConstantFileName.modelUUID+"_50k.dam.lzma");
         map.put(path + File.separator + "results" +File.separator+ConstantFileName.modelUUID+"_50k.dam", imgViewPath+ConstantFileName.modelUUID+"_50k.dam");
 
-        fYunFileService.uploadMulFiles(bucket, map);
+// TODO: 2022/8/22
+        //        fYunFileService.uploadMulFiles(bucket, map);
     }
 
     private void writeDataJson(String path) throws IOException {
@@ -900,133 +868,137 @@ public class SceneProServiceImpl extends ServiceImpl<ISceneProMapper, ScenePro>
         }
     }
 
-    public ResultData downloadTexData(String num) throws Exception {
-
-        if(StrUtil.isEmpty(num)){
-            throw new BusinessException(ErrorCode.PARAM_REQUIRED);
-        }
-        ScenePlus scenePlus = scenePlusService.getScenePlusByNum(num);
-        if(scenePlus == null){
-            throw new BusinessException(ErrorCode.FAILURE_CODE_5005);
-        }
-        ScenePlusExt scenePlusExt = scenePlusExtService.getScenePlusExtByPlusId(scenePlus.getId());
-        String bucket = scenePlusExt.getYunFileBucket();
-
-        SceneEditInfo sceneEditInfo = sceneEditInfoService.getByScenePlusId(scenePlus.getId());
-
-        String localImagePath = String.format(ConstantFilePath.IMAGESBUFFER_FORMAT, num);
-        if(!new File(localImagePath).exists()){
-            new File(localImagePath).mkdirs();
-        }
-
-
-        String newData =  scenePlusExt.getDataSource() + "_obj2txt/extras";
-        String newResultData = scenePlusExt.getDataSource() + "_obj2txt/results/upload.json";
-        String zipName = num + "_extras.zip";
-        String zipPath = localImagePath + zipName;
-        //如果用户上传过模型，就打包上传到oss，直接返回
-        if(CommonStatus.YES.code().equals(sceneEditInfo.getIsUploadObj())
-            && new File(newData).exists()
-            && new File(newResultData).exists()){
-            //打包
-            ZipUtil.zip(newData, zipPath);
-            //上传压缩包
-            fYunFileService.uploadFile(bucket, zipPath, "downloads/extras/" + zipName);
-            String url = ossUrlPrefix + "downloads/extras/" + zipName + "?t=" + Calendar.getInstance().getTimeInMillis();
-            return ResultData.ok(url);
-        }
-
-
-        String buildType = scenePlusExt.getBuildType();
-        if("V3".equals(buildType)){
-            String dataViewPath = String.format(UploadFilePath.DATA_VIEW_PATH, num);
-            //V3版本去oss下载2048模型
-            String meshPath =  String.format(ConstantFilePath.DATABUFFER_FORMAT, num) + "mesh";
-            FileUtils.deleteDirectory(meshPath);
-            CreateObjUtil.ossUtilCp(dataViewPath + "mesh", meshPath);
-            log.info("meshPath="+meshPath);
-            if(!new File(meshPath).exists()){
-                throw new BusinessException(ErrorCode.FAILURE_CODE_7006);
-            }
-            log.info(new File(meshPath).listFiles().toString());
-            if(new File(meshPath).listFiles().length > 0){
-                for(File file : new File(meshPath).listFiles()){
-                    if(file.isDirectory()){
-                        for (File item : file.listFiles()) {
-                            if(item.getName().endsWith(".obj") && !"output.house.obj".equals(item.getName()) &&
-                                !"mesh.obj".equals(item.getName())){
-                                item.delete();
-                            }
-                            if(item.getName().endsWith(".mtl") && !"output.house.mtl".equals(item.getName()) &&
-                                !"mesh.mtl".equals(item.getName())){
-                                item.delete();
-                            }
-                        }
-                        continue;
-                    }
-                    if(file.getName().endsWith(".obj") && !"output.house.obj".equals(file.getName()) &&
-                            !"mesh.obj".equals(file.getName())){
-                        file.delete();
-                    }
-                    if(file.getName().endsWith(".mtl") && !"output.house.mtl".equals(file.getName()) &&
-                            !"mesh.mtl".equals(file.getName())){
-                        file.delete();
-                    }
-                }
-                //打包
-                ZipUtil.zip(meshPath, zipPath);
-                //上传压缩包
-                fYunFileService.uploadFile(bucket, zipPath, "downloads/extras/" + zipName);
-                String url = ossUrlPrefix + "downloads/extras/" + zipName + "?t=" + Calendar.getInstance().getTimeInMillis();
-//                FileUtil.del(zipPath);
-                return ResultData.ok(url);
-            }
-        }
-
-        //V2版本在本地获取模型资源
-        //修改过的资源
-        String editData =  scenePlusExt.getDataSource() + "_edit/caches/tex";
-        String results = scenePlusExt.getDataSource() + "_edit/results";
-        if (new File(editData).exists() && new File(results).exists()){
-            for(File file : new File(editData).listFiles()){
-                if(file.getName().endsWith(".obj") && !"output.house.obj".equals(file.getName()) &&
-                        !"mesh.obj".equals(file.getName())){
-                    file.delete();
-                }
-                if(file.getName().endsWith(".mtl") && !"output.house.mtl".equals(file.getName()) &&
-                        !"mesh.mtl".equals(file.getName())){
-                    file.delete();
-                }
-            }
-
-            ZipUtil.zip(editData, zipPath);
-            //上传压缩包
-            fYunFileService.uploadFile(bucket, zipPath, "downloads/extras/" + zipName);
-            String url = ossUrlPrefix + "downloads/extras/" + zipName + "?t=" + Calendar.getInstance().getTimeInMillis();
-            return ResultData.ok(url);
-        }
-
-        //没上传过返回源资源
-        String dataPath = scenePlusExt.getDataSource() + "/caches/tex";
-        File dataFile = new File(dataPath);
-        if(!dataFile.exists()){
-            throw new BusinessException(ErrorCode.FAILURE_CODE_3018);
-        }
-        for(File file : dataFile.listFiles()){
-            if(file.getName().endsWith(".obj") && !"output.house.obj".equals(file.getName()) &&
-                    !"mesh.obj".equals(file.getName())){
-                file.delete();
-            }
-            if(file.getName().endsWith(".mtl") && !"output.house.mtl".equals(file.getName()) &&
-                    !"mesh.mtl".equals(file.getName())){
-                file.delete();
-            }
-        }
-
-        ZipUtil.zip(dataPath, zipPath);
-        //上传压缩包
-        fYunFileService.uploadFile(bucket, zipPath, "downloads/extras/" + zipName);
-        String url = ossUrlPrefix + "downloads/extras/" + zipName + "?t=" + Calendar.getInstance().getTimeInMillis();
-        return ResultData.ok(url);
-    }
+//    public ResultData downloadTexData(String num) throws Exception {
+//
+//        if(StrUtil.isEmpty(num)){
+//            throw new BusinessException(ErrorCode.PARAM_REQUIRED);
+//        }
+//        ScenePlus scenePlus = scenePlusService.getScenePlusByNum(num);
+//        if(scenePlus == null){
+//            throw new BusinessException(ErrorCode.FAILURE_CODE_5005);
+//        }
+//        ScenePlusExt scenePlusExt = scenePlusExtService.getScenePlusExtByPlusId(scenePlus.getId());
+//        String bucket = scenePlusExt.getYunFileBucket();
+//
+//        SceneEditInfo sceneEditInfo = sceneEditInfoService.getByScenePlusId(scenePlus.getId());
+//
+//        String localImagePath = String.format(ConstantFilePath.IMAGESBUFFER_FORMAT, num);
+//        if(!new File(localImagePath).exists()){
+//            new File(localImagePath).mkdirs();
+//        }
+//
+//
+//        String newData =  scenePlusExt.getDataSource() + "_obj2txt/extras";
+//        String newResultData = scenePlusExt.getDataSource() + "_obj2txt/results/upload.json";
+//        String zipName = num + "_extras.zip";
+//        String zipPath = localImagePath + zipName;
+//        //如果用户上传过模型，就打包上传到oss，直接返回
+//        if(CommonStatus.YES.code().equals(sceneEditInfo.getIsUploadObj())
+//            && new File(newData).exists()
+//            && new File(newResultData).exists()){
+//            //打包
+//            ZipUtil.zip(newData, zipPath);
+//            //上传压缩包
+//// TODO: 2022/8/22
+////            fYunFileService.uploadFile(bucket, zipPath, "downloads/extras/" + zipName);
+//            String url = ossUrlPrefix + "downloads/extras/" + zipName + "?t=" + Calendar.getInstance().getTimeInMillis();
+//            return ResultData.ok(url);
+//        }
+//
+//
+//        String buildType = scenePlusExt.getBuildType();
+//        if("V3".equals(buildType)){
+//            String dataViewPath = String.format(UploadFilePath.DATA_VIEW_PATH, num);
+//            //V3版本去oss下载2048模型
+//            String meshPath =  String.format(ConstantFilePath.DATABUFFER_FORMAT, num) + "mesh";
+//            FileUtils.deleteDirectory(meshPath);
+//            CreateObjUtil.ossUtilCp(dataViewPath + "mesh", meshPath);
+//            log.info("meshPath="+meshPath);
+//            if(!new File(meshPath).exists()){
+//                throw new BusinessException(ErrorCode.FAILURE_CODE_7006);
+//            }
+//            log.info(new File(meshPath).listFiles().toString());
+//            if(new File(meshPath).listFiles().length > 0){
+//                for(File file : new File(meshPath).listFiles()){
+//                    if(file.isDirectory()){
+//                        for (File item : file.listFiles()) {
+//                            if(item.getName().endsWith(".obj") && !"output.house.obj".equals(item.getName()) &&
+//                                !"mesh.obj".equals(item.getName())){
+//                                item.delete();
+//                            }
+//                            if(item.getName().endsWith(".mtl") && !"output.house.mtl".equals(item.getName()) &&
+//                                !"mesh.mtl".equals(item.getName())){
+//                                item.delete();
+//                            }
+//                        }
+//                        continue;
+//                    }
+//                    if(file.getName().endsWith(".obj") && !"output.house.obj".equals(file.getName()) &&
+//                            !"mesh.obj".equals(file.getName())){
+//                        file.delete();
+//                    }
+//                    if(file.getName().endsWith(".mtl") && !"output.house.mtl".equals(file.getName()) &&
+//                            !"mesh.mtl".equals(file.getName())){
+//                        file.delete();
+//                    }
+//                }
+//                //打包
+//                ZipUtil.zip(meshPath, zipPath);
+//                //上传压缩包
+//// TODO: 2022/8/22
+////                fYunFileService.uploadFile(bucket, zipPath, "downloads/extras/" + zipName);
+//                String url = ossUrlPrefix + "downloads/extras/" + zipName + "?t=" + Calendar.getInstance().getTimeInMillis();
+////                FileUtil.del(zipPath);
+//                return ResultData.ok(url);
+//            }
+//        }
+//
+//        //V2版本在本地获取模型资源
+//        //修改过的资源
+//        String editData =  scenePlusExt.getDataSource() + "_edit/caches/tex";
+//        String results = scenePlusExt.getDataSource() + "_edit/results";
+//        if (new File(editData).exists() && new File(results).exists()){
+//            for(File file : new File(editData).listFiles()){
+//                if(file.getName().endsWith(".obj") && !"output.house.obj".equals(file.getName()) &&
+//                        !"mesh.obj".equals(file.getName())){
+//                    file.delete();
+//                }
+//                if(file.getName().endsWith(".mtl") && !"output.house.mtl".equals(file.getName()) &&
+//                        !"mesh.mtl".equals(file.getName())){
+//                    file.delete();
+//                }
+//            }
+//
+//            ZipUtil.zip(editData, zipPath);
+//            //上传压缩包
+//// TODO: 2022/8/22
+////            fYunFileService.uploadFile(bucket, zipPath, "downloads/extras/" + zipName);
+//            String url = ossUrlPrefix + "downloads/extras/" + zipName + "?t=" + Calendar.getInstance().getTimeInMillis();
+//            return ResultData.ok(url);
+//        }
+//
+//        //没上传过返回源资源
+//        String dataPath = scenePlusExt.getDataSource() + "/caches/tex";
+//        File dataFile = new File(dataPath);
+//        if(!dataFile.exists()){
+//            throw new BusinessException(ErrorCode.FAILURE_CODE_3018);
+//        }
+//        for(File file : dataFile.listFiles()){
+//            if(file.getName().endsWith(".obj") && !"output.house.obj".equals(file.getName()) &&
+//                    !"mesh.obj".equals(file.getName())){
+//                file.delete();
+//            }
+//            if(file.getName().endsWith(".mtl") && !"output.house.mtl".equals(file.getName()) &&
+//                    !"mesh.mtl".equals(file.getName())){
+//                file.delete();
+//            }
+//        }
+//
+//        ZipUtil.zip(dataPath, zipPath);
+//        //上传压缩包
+//// TODO: 2022/8/22
+//        // fYunFileService.uploadFile(bucket, zipPath, "downloads/extras/" + zipName);
+//        String url = ossUrlPrefix + "downloads/extras/" + zipName + "?t=" + Calendar.getInstance().getTimeInMillis();
+//        return ResultData.ok(url);
+//    }
 }

src/main/java/com/fdkankan/scene/service/impl/SceneUpgradeToV4Service.java

@@ -1,113 +0,0 @@
-package com.fdkankan.scene.service.impl;
-
-import cn.hutool.core.util.StrUtil;
-import com.alibaba.fastjson.JSON;
-import com.fdkankan.model.constants.ConstantFilePath;
-import com.fdkankan.web.response.ResultData;
-import com.fdkankan.fyun.face.FYunFileServiceInterface;
-import com.fdkankan.redis.constant.RedisKey;
-import com.fdkankan.redis.util.RedisUtil;
-import com.fdkankan.scene.bean.SceneUpgradeProgressBean;
-import com.fdkankan.scene.entity.ScenePlus;
-import com.fdkankan.scene.entity.ScenePlusExt;
-import com.fdkankan.scene.entity.SceneRepairLog;
-import com.fdkankan.scene.service.IScenePlusExtService;
-import com.fdkankan.scene.service.IScenePlusService;
-import com.fdkankan.scene.service.ISceneProService;
-import com.fdkankan.scene.service.ISceneRepairLogService;
-import com.fdkankan.scene.service.ISceneUpgradeToV4Service;
-import com.fdkankan.scene.vo.SceneInfoVO;
-import java.util.Calendar;
-import java.util.Objects;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-/**
- * <p>
- * TODO
- * </p>
- *
- * @author dengsixing
- * @since 2022/4/21
- **/
-@Slf4j
-@Service
-public class SceneUpgradeToV4Service implements ISceneUpgradeToV4Service {
-
-    @Autowired
-    private ISceneRepairLogService sceneRepairLogService;
-    @Autowired
-    private RedisUtil redisUtil;
-    @Autowired
-    private ISceneProService sceneProService;
-    @Autowired
-    private IScenePlusService scenePlusService;
-    @Autowired
-    private IScenePlusExtService scenePlusExtService;
-    @Autowired
-    private FYunFileServiceInterface fYunFileService;
-
-    private void upgradeLog(SceneRepairLog sceneRepairLog, String num, int status, String reason){
-        //写入升级日志
-        if(Objects.isNull(sceneRepairLog)){
-            sceneRepairLog = new SceneRepairLog();
-            sceneRepairLog.setNum(num);
-        }
-        sceneRepairLog.setState(status);
-        sceneRepairLog.setReason(reason);
-        sceneRepairLog.setCreateTime(Calendar.getInstance().getTime());
-        sceneRepairLogService.saveOrUpdate(sceneRepairLog);
-    }
-
-    @Override
-    public ResultData getUpgradeToV4Progress(String num) {
-
-        String key = String.format(RedisKey.scene_upgrade_progress_num, num);
-        String progress = redisUtil.get(key);
-        SceneUpgradeProgressBean progressBean = null;
-        if(StrUtil.isNotEmpty(progress)){
-            progressBean = JSON.parseObject(progress, SceneUpgradeProgressBean.class);
-        }else{
-            progressBean = SceneUpgradeProgressBean.builder().num(num).status(0).progress(0).build();
-        }
-        return ResultData.ok(progressBean);
-    }
-
-    @Override
-    public ResultData getSceneViewInfo(String num) {
-        ScenePlus scenePlus = scenePlusService.getScenePlusByNum(num);
-        ScenePlusExt scenePlusExt = scenePlusExtService.getScenePlusExtByPlusId(scenePlus.getId());
-        String bucket = scenePlusExt.getYunFileBucket();
-        String key = String.format(RedisKey.SCENE_JSON, num);
-        String sceneJson = redisUtil.get(key);
-        SceneInfoVO sceneInfoVO = null;
-        //先查询redis
-        if(StrUtil.isNotEmpty(sceneJson)) {
-            sceneInfoVO = JSON.parseObject(sceneJson, SceneInfoVO.class);
-            sceneInfoVO.setScenePassword(null);
-            if(Objects.isNull(sceneInfoVO.getFloorPlanAngle())){
-                sceneInfoVO.setFloorPlanAngle(0f);
-            }
-            if(Objects.isNull(sceneInfoVO.getFloorPlanCompass())){
-                sceneInfoVO.setFloorPlanCompass(0f);
-            }
-            return ResultData.ok(sceneInfoVO);
-        }
-
-        //如果redis没找到，从scene.json中获取
-        String objectName = String.format(ConstantFilePath.SCENE_VIEW_DATA_DATA_SCENEJSON, num);
-        String objectContent = fYunFileService.getFileContent(bucket, objectName);
-        if(StrUtil.isEmpty(objectContent))
-            return ResultData.ok();
-        sceneInfoVO = JSON.parseObject(objectContent, SceneInfoVO.class);
-        sceneInfoVO.setScenePassword(null);
-        if(Objects.isNull(sceneInfoVO.getFloorPlanAngle())){
-            sceneInfoVO.setFloorPlanAngle(0f);
-        }
-        if(Objects.isNull(sceneInfoVO.getFloorPlanCompass())){
-            sceneInfoVO.setFloorPlanCompass(0f);
-        }
-        return ResultData.ok(sceneInfoVO);
-    }
-}

src/main/java/com/fdkankan/scene/service/impl/SceneUploadServiceImpl.java

@@ -13,7 +13,6 @@ import com.fdkankan.model.constants.UploadFilePath;
 import com.fdkankan.common.exception.BusinessException;
 import com.fdkankan.web.response.ResultData;
 import com.fdkankan.web.util.BASE64DecodedMultipartFile;
-import com.fdkankan.fyun.face.FYunFileServiceInterface;
 import com.fdkankan.scene.entity.ScenePlus;
 import com.fdkankan.scene.entity.ScenePlusExt;
 import com.fdkankan.scene.entity.SceneUpload;
@@ -52,11 +51,7 @@ import org.springframework.web.multipart.MultipartFile;
 @Service
 public class SceneUploadServiceImpl extends ServiceImpl<ISceneUploadMapper, SceneUpload> implements ISceneUploadService {
 
-    @Value("${fyun.host}")
-    private String ossUrlPrefix;
-
     @Resource
-    private FYunFileServiceInterface fYunFileService;
     @Autowired
     private SSOLoginHelper ssoLoginHelper;
     @Autowired
@@ -99,7 +94,8 @@ public class SceneUploadServiceImpl extends ServiceImpl<ISceneUploadMapper, Scen
             hasDelete.add(fileName);
             String key = userEditPath + fileName;
             filePaths.add(key);
-            fYunFileService.deleteFile(scenePlusExt.getYunFileBucket(), key);
+// TODO: 2022/8/22
+            //            fYunFileService.deleteFile(scenePlusExt.getYunFileBucket(), key);
         }
 
         this.update(new LambdaUpdateWrapper<SceneUpload>()
@@ -146,7 +142,8 @@ public class SceneUploadServiceImpl extends ServiceImpl<ISceneUploadMapper, Scen
 
             String ossPath = StrUtil.isNotBlank(uploadPath) ? uploadPath : (String.format(UploadFilePath.USER_EDIT_PATH ,num) + realFileName);
             try {
-                fYunFileService.uploadFile(bucket, newFile.getPath(), ossPath);
+// TODO: 2022/8/22
+                //                fYunFileService.uploadFile(bucket, newFile.getPath(), ossPath);
             }catch (Exception e){
                 log.error(ossPath+"上传文件失败"+e);
                 throw new BusinessException(ErrorCode.FAILURE_CODE_7013);
@@ -176,7 +173,8 @@ public class SceneUploadServiceImpl extends ServiceImpl<ISceneUploadMapper, Scen
         if(list != null && list.size() >0){
             for (SceneUpload sceneUpload : list) {
                 try {
-                    fYunFileService.deleteFile(bucket, sceneUpload.getFilePath());
+// TODO: 2022/8/22
+                    //                    fYunFileService.deleteFile(bucket, sceneUpload.getFilePath());
                     this.removeEntity(sceneUpload);
                 }catch (Exception e){
                     log.error(sceneUpload.getFilePath()+"删除oss文件失败",e);
@@ -199,24 +197,25 @@ public class SceneUploadServiceImpl extends ServiceImpl<ISceneUploadMapper, Scen
         this.save(sceneUpload);
     }
 
-    @Override
-    public String uploadContent(UploadContentParamVO param) throws Exception {
-
-        String ossPath = param.getOssPath();
-        String fileName = ossPath.substring(ossPath.lastIndexOf("/") + 1);
-        if(StrUtil.isEmpty(fileName)){
-            throw new BusinessException(ErrorCode.FAILURE_CODE_7012);
-        }
-        String suffix = fileName.substring(fileName.lastIndexOf("."));
-        if(StrUtil.isEmpty(suffix)){
-            throw new BusinessException(ErrorCode.FAILURE_CODE_7012);
-        }
-
-        File tempFile = File.createTempFile(UUID.randomUUID().toString(), suffix);
-        cn.hutool.core.io.FileUtil.writeString(param.getContent(), tempFile, StandardCharsets.UTF_8);
-        fYunFileService.uploadFile(param.getBucket(), tempFile.getPath(), param.getOssPath());
-        tempFile.deleteOnExit();
-
-        return this.ossUrlPrefix + param.getOssPath();
-    }
+//    @Override
+//    public String uploadContent(UploadContentParamVO param) throws Exception {
+//
+//        String ossPath = param.getOssPath();
+//        String fileName = ossPath.substring(ossPath.lastIndexOf("/") + 1);
+//        if(StrUtil.isEmpty(fileName)){
+//            throw new BusinessException(ErrorCode.FAILURE_CODE_7012);
+//        }
+//        String suffix = fileName.substring(fileName.lastIndexOf("."));
+//        if(StrUtil.isEmpty(suffix)){
+//            throw new BusinessException(ErrorCode.FAILURE_CODE_7012);
+//        }
+//
+//        File tempFile = File.createTempFile(UUID.randomUUID().toString(), suffix);
+//        cn.hutool.core.io.FileUtil.writeString(param.getContent(), tempFile, StandardCharsets.UTF_8);
+//// TODO: 2022/8/22
+//        //        fYunFileService.uploadFile(param.getBucket(), tempFile.getPath(), param.getOssPath());
+//        tempFile.deleteOnExit();
+//
+//        return this.ossUrlPrefix + param.getOssPath();
+//    }
 }

src/main/java/com/fdkankan/scene/vo/BallScreenVideoParamVO.java

@@ -4,7 +4,7 @@ import lombok.Data;
 
 /**
  * <p>
- * TODO
+ * -
  * </p>
  *
  * @author dengsixing

src/main/java/com/fdkankan/scene/vo/BaseFileParamVO.java

@@ -5,7 +5,7 @@ import lombok.Data;
 
 /**
  * <p>
- * TODO
+ * -
  * </p>
  *
  * @author dengsixing

src/main/java/com/fdkankan/scene/vo/BaseSceneParamVO.java

@@ -5,7 +5,7 @@ import lombok.Data;
 
 /**
  * <p>
- * TODO
+ * 场景基础参数
  * </p>
  *
  * @author dengsixing

src/main/java/com/fdkankan/scene/vo/CooperationSceneVO.java

@@ -6,7 +6,7 @@ import lombok.Data;
 
 /**
  * <p>
- * TODO
+ * -
  * </p>
  *
  * @author dengsixing

src/main/java/com/fdkankan/scene/vo/CopySceneParamVO.java

@@ -6,7 +6,7 @@ import javax.validation.constraints.NotNull;
 
 /**
  * <p>
- * TODO
+ * -
  * </p>
  *
  * @author dengsixing

src/main/java/com/fdkankan/scene/vo/DeleteFileParamVO.java

@@ -10,7 +10,7 @@ import lombok.NoArgsConstructor;
 
 /**
  * <p>
- * TODO
+ * -
  * </p>
  *
  * @author dengsixing

src/main/java/com/fdkankan/scene/vo/DeleteSidParamVO.java

@@ -5,7 +5,7 @@ import lombok.Data;
 
 /**
  * <p>
- * TODO
+ * -
  * </p>
  *
  * @author dengsixing

src/main/java/com/fdkankan/scene/vo/FileNameAndDataParamVO.java

@@ -5,7 +5,7 @@ import lombok.Data;
 
 /**
  * <p>
- * TODO
+ * -
  * </p>
  *
  * @author dengsixing

src/main/java/com/fdkankan/scene/vo/HotParamVO.java

@@ -5,7 +5,7 @@ import lombok.Data;
 
 /**
  * <p>
- * TODO
+ * -
  * </p>
  *
  * @author dengsixing

src/main/java/com/fdkankan/scene/vo/LocalesParamVO.java

@@ -11,7 +11,7 @@ import lombok.NoArgsConstructor;
 
 /**
  * <p>
- * TODO
+ * -
  * </p>
  *
  * @author dengsixing

src/main/java/com/fdkankan/scene/vo/MoveSceneParamVO.java

@@ -6,7 +6,7 @@ import lombok.Data;
 
 /**
  * <p>
- * TODO
+ * -
  * </p>
  *
  * @author dengsixing

src/main/java/com/fdkankan/scene/vo/RenameCadParamVO.java

@@ -8,7 +8,7 @@ import lombok.Data;
 
 /**
  * <p>
- * TODO
+ * -
  * </p>
  *
  * @author dengsixing

src/main/java/com/fdkankan/scene/vo/SaveUploadParamVO.java

@@ -9,7 +9,7 @@ import javax.validation.constraints.NotBlank;
 
 /**
  * <p>
- * TODO
+ * -
  * </p>
  *
  * @author dengsixing

src/main/java/com/fdkankan/scene/vo/SceneAuthVO.java

@@ -8,7 +8,7 @@ import lombok.Setter;
 
 /**
  * <p>
- * TODO
+ * 场景权限视图
  * </p>
  *
  * @author dengsixing

src/main/java/com/fdkankan/scene/vo/SceneCheckKeyParamVO.java

@@ -5,7 +5,7 @@ import lombok.Data;
 
 /**
  * <p>
- * TODO
+ * -
  * </p>
  *
  * @author dengsixing

src/main/java/com/fdkankan/scene/vo/SceneDownloadParamVO.java

@@ -5,7 +5,7 @@ import lombok.Data;
 
 /**
  * <p>
- * TODO
+ * -
  * </p>
  *
  * @author dengsixing

src/main/java/com/fdkankan/scene/vo/SceneEditControlsParamVO.java

@@ -9,7 +9,7 @@ import java.io.Serializable;
 
 /**
  * <p>
- * TODO
+ * -
  * </p>
  *
  * @author dengsixing

src/main/java/com/fdkankan/scene/vo/SceneEditControlsVO.java

@@ -9,7 +9,7 @@ import java.io.Serializable;
 
 /**
  * <p>
- * TODO
+ * -
  * </p>
  *
  * @author dengsixing

src/main/java/com/fdkankan/scene/vo/SceneInfoParamVO.java

@@ -9,7 +9,7 @@ import javax.validation.constraints.NotBlank;
 
 /**
  * <p>
- * TODO
+ * -
  * </p>
  *
  * @author dengsixing

src/main/java/com/fdkankan/scene/vo/SceneInfoVO.java

@@ -11,7 +11,7 @@ import java.util.Date;
 
 /**
  * <p>
- * TODO
+ * -
  * </p>
  *
  * @author dengsixing

src/main/java/com/fdkankan/scene/vo/ScenePlusVO.java

@@ -4,7 +4,7 @@ import lombok.Data;
 
 /**
  * <p>
- * TODO
+ * 场景主表视图
  * </p>
  *
  * @author dengsixing

src/main/java/com/fdkankan/scene/vo/UnbindOrBindCameraParamVO.java

@@ -6,7 +6,7 @@ import lombok.Data;
 
 /**
  * <p>
- * TODO
+ * -
  * </p>
  *
  * @author dengsixing

src/main/java/com/fdkankan/scene/vo/UpgradeToV4ParamVO.java

@@ -5,7 +5,7 @@ import lombok.Data;
 
 /**
  * <p>
- * TODO
+ * -
  * </p>
  *
  * @author dengsixing

src/main/java/com/fdkankan/scene/vo/UploadContentParamVO.java

@@ -5,7 +5,7 @@ import lombok.Data;
 
 /**
  * <p>
- * TODO
+ * 上传文件参数
  * </p>
  *
  * @author dengsixing

src/main/resources/application.yml

@@ -0,0 +1,63 @@
+server:
+  port: 8085
+  servlet:
+    context-path: /scene
+  tomcat:
+    max-http-form-post-size: -1
+spring:
+  jackson:
+    serialization:
+      #关闭jackson转换 实体属性空值校验
+      FAIL_ON_EMPTY_BEANS: false
+      # write-dates-as-timestamps: true    ##开启时间转换为时间戳，默认true
+    date-format: yyyy-MM-dd HH:mm:ss
+    time-zone: GMT+8
+  datasource:
+    name: druidDataSource
+    type: com.alibaba.druid.pool.DruidDataSource
+    druid:
+      druid:
+      url: jdbc:mysql://120.24.144.164:3306/4dkankan_v4?useUnicode=true&characterEncoding=utf-8&useSSL=false&serverTimezone=Asia/Shanghai&allowMultiQueries=true
+      username: root
+      password: 4Dage@4Dage#@168
+      driver-class-name: com.mysql.cj.jdbc.Driver
+      filters: stat,wall,config
+      max-active: 100
+      initial-size: 2
+      max-wait: 60000
+      min-idle: 1
+      time-between-eviction-runs-millis: 60000
+      min-evictable-idle-time-millis: 300000
+      validation-query: select 'x'
+      test-while-idle: true
+      test-on-borrow: false
+      test-on-return: false
+      pool-prepared-statements: true
+      max-open-prepared-statements: 50
+      max-pool-prepared-statement-per-connection-size: 20
+  redis:
+    host: 120.24.144.164
+    port: 6379
+    timeout: 6000ms
+    jedis:
+      pool:
+        max-active: 10  #连接池最大连接数（使用负值表示没有限制）
+        max-idle: 10 # 连接池中的最大空闲连接
+        min-idle: 5 # 连接池中的最小空闲连接
+        max-wait: -1 # 连接池最大阻塞等待时间（使用负值表示没有限制）
+    lettuce:
+      shutdown-timeout: 0ms
+logging:
+  config: classpath:logback-spring.xml
+  path: /mnt/4Dkankan/v4/logs
+
+main:
+  url: https://test.4dkankan.com
+scene:
+  url: show.html?m=
+  pro:
+    url: showProMobile.html?m=
+    new:
+      url: smg.html?m=
+
+

src/main/resources/bootstrap-dev-eur.yml

@@ -1,72 +0,0 @@
-spring:
-  application:
-    name: 4dkankan-center-scene
-  cloud:
-    nacos:
-      config:
-        server-addr: 192.168.0.47:8848
-        file-extension: yaml
-        namespace: 4dkankan-dev
-        extension-configs:
-          - data-id: 4dkankan-center-scene.yaml
-            group: DEFAULT_GROUP
-            refresh: true
-        shared-configs:
-          - data-id: common-db-config.yaml
-            group: DEFAULT_GROUP
-            refresh: true
-
-          - data-id: common-redis-config.yaml
-            group: DEFAULT_GROUP
-            refresh: true
-
-          - data-id: other-config.yaml
-            group: DEFAULT_GROUP
-            refresh: true
-
-          - data-id: common-upload-config.yaml
-            group: DEFAULT_GROUP
-            refresh: true
-      discovery:
-        server-addr: 192.168.0.47:8848
-        namespace: 4dkankan-dev
-    sentinel:
-      transport:
-        dashboard: 192.168.0.47:8888
-        heartbeat-interval-ms: 500
-        port: 8719
-      eager: true #取消sentinel控制台懒加载
-      #sentinel配置持久化nacos
-      datasource:
-        #流控规则
-        flow:
-          nacos:
-            server-addr: ${spring.cloud.nacos.config.server-addr}
-            dataId: ${spring.application.name}-flow-rules
-            groupId: SENTINEL_GROUP
-            namespace: 4dkankan-dev
-            rule-type: flow
-        #熔断规则
-        degrade:
-          nacos:
-            server-addr: ${spring.cloud.nacos.config.server-addr}
-            dataId: ${spring.application.name}-degrade-rules
-            groupId: SENTINEL_GROUP
-            namespace: 4dkankan-dev
-            rule-type: degrade
-#      log:
-#        dir: ./logs # 默认值${home}/logs/csp/
-#        switch-pid: true # 日志带上线程id
-
-#开启feign熔断降级，如果没有开启，feign调用链路不会显示再sentinel控制中
-#feign:
-#  sentinel:
-#    enabled: true
-
-feign:
-  httpclient:
-    connection-timeout: 200000
-
-
-
-

src/main/resources/bootstrap-dev.yml

@@ -1,36 +0,0 @@
-spring:
-  application:
-    name: 4dkankan-center-scene
-  cloud:
-    nacos:
-      config:
-        server-addr: 120.24.144.164:8848
-        file-extension: yaml
-        namespace: 4dkankan-v4
-        extension-configs:
-          - data-id: 4dkankan-center-scene.yaml
-            group: DEFAULT_GROUP
-            refresh: true
-        shared-configs:
-          - data-id: common-db-config.yaml
-            group: DEFAULT_GROUP
-            refresh: true
-
-          - data-id: common-redis-config.yaml
-            group: DEFAULT_GROUP
-            refresh: true
-
-          - data-id: other-config.yaml
-            group: DEFAULT_GROUP
-            refresh: true
-
-          - data-id: common-upload-config.yaml
-            group: DEFAULT_GROUP
-            refresh: true
-      discovery:
-        server-addr: ${spring.cloud.nacos.config.server-addr}
-        namespace: 4dkankan-v4
-
-
-
-

src/main/resources/bootstrap-pro-eur.yml

@@ -1,73 +0,0 @@
-spring:
-  application:
-    name: 4dkankan-center-scene
-  cloud:
-    nacos:
-      config:
-        server-addr: 172.31.42.151:8848
-        file-extension: yaml
-        namespace: 4dkankan-pro-eur
-        extension-configs:
-          - data-id: 4dkankan-center-scene.yaml
-            group: DEFAULT_GROUP
-            refresh: true
-        shared-configs:
-          - data-id: common-db-config.yaml
-            group: DEFAULT_GROUP
-            refresh: true
-
-          - data-id: common-redis-config.yaml
-            group: DEFAULT_GROUP
-            refresh: true
-
-          - data-id: other-config.yaml
-            group: DEFAULT_GROUP
-            refresh: true
-
-          - data-id: common-upload-config.yaml
-            group: DEFAULT_GROUP
-            refresh: true
-      discovery:
-        server-addr: 172.31.42.151:8848
-        namespace: 4dkankan-pro-eur
-    sentinel:
-      transport:
-        dashboard: 172.31.42.151:8888
-#        dashboard: localhost:8888
-        heartbeat-interval-ms: 500
-        port: 8719
-      eager: true #取消sentinel控制台懒加载
-      #sentinel配置持久化nacos
-      datasource:
-        #流控规则
-        flow:
-          nacos:
-            server-addr: ${spring.cloud.nacos.config.server-addr}
-            dataId: ${spring.application.name}-flow-rules
-            groupId: SENTINEL_GROUP
-            namespace: 4dkankan-pro
-            rule-type: flow
-        #熔断规则
-        degrade:
-          nacos:
-            server-addr: ${spring.cloud.nacos.config.server-addr}
-            dataId: ${spring.application.name}-degrade-rules
-            groupId: SENTINEL_GROUP
-            namespace: 4dkankan-pro
-            rule-type: degrade
-#      log:
-#        dir: ./logs # 默认值${home}/logs/csp/
-#        switch-pid: true # 日志带上线程id
-
-#开启feign熔断降级，如果没有开启，feign调用链路不会显示再sentinel控制中
-#feign:
-#  sentinel:
-#    enabled: true
-
-feign:
-  httpclient:
-    connection-timeout: 200000
-
-
-
-

src/main/resources/bootstrap-pro.yml

@@ -1,72 +0,0 @@
-spring:
-  application:
-    name: 4dkankan-center-scene
-  cloud:
-    nacos:
-      config:
-        server-addr: 172.18.157.42:8848
-        file-extension: yaml
-        namespace: 4dkankan-pro
-        extension-configs:
-          - data-id: 4dkankan-center-scene.yaml
-            group: DEFAULT_GROUP
-            refresh: true
-        shared-configs:
-          - data-id: common-db-config.yaml
-            group: DEFAULT_GROUP
-            refresh: true
-
-          - data-id: common-redis-config.yaml
-            group: DEFAULT_GROUP
-            refresh: true
-
-          - data-id: other-config.yaml
-            group: DEFAULT_GROUP
-            refresh: true
-
-          - data-id: common-upload-config.yaml
-            group: DEFAULT_GROUP
-            refresh: true
-      discovery:
-        server-addr: 172.18.157.42:8848
-        namespace: 4dkankan-pro
-#    sentinel:
-#      transport:
-#        dashboard: 8.129.209.131:8888
-#        heartbeat-interval-ms: 500
-#        port: 8719
-#      eager: true #取消sentinel控制台懒加载
-#      #sentinel配置持久化nacos
-#      datasource:
-#        #流控规则
-#        flow:
-#          nacos:
-#            server-addr: ${spring.cloud.nacos.config.server-addr}
-#            dataId: ${spring.application.name}-flow-rules
-#            groupId: SENTINEL_GROUP
-#            namespace: 4dkankan-pro
-#            rule-type: flow
-#        #熔断规则
-#        degrade:
-#          nacos:
-#            server-addr: ${spring.cloud.nacos.config.server-addr}
-#            dataId: ${spring.application.name}-degrade-rules
-#            groupId: SENTINEL_GROUP
-#            namespace: 4dkankan-pro
-#            rule-type: degrade
-#      log:
-#        dir: ./logs # 默认值${home}/logs/csp/
-#        switch-pid: true # 日志带上线程id
-
-#开启feign熔断降级，如果没有开启，feign调用链路不会显示再sentinel控制中
-#feign:
-#  sentinel:
-#    enabled: true
-
-feign:
-  httpclient:
-    connection-timeout: 200000
-
-
-
-

src/main/resources/bootstrap-test-eur.yml

@@ -1,84 +0,0 @@
-spring:
-  application:
-    name: 4dkankan-center-scene
-  cloud:
-    nacos:
-      config:
-        server-addr: 120.24.144.164:8848
-        file-extension: yaml
-        namespace: 4dkankan-test-eur
-        extension-configs:
-          - data-id: 4dkankan-center-scene.yaml
-            group: DEFAULT_GROUP
-            refresh: true
-        shared-configs:
-          - data-id: common-db-config.yaml
-            group: DEFAULT_GROUP
-            refresh: true
-
-          - data-id: common-redis-config.yaml
-            group: DEFAULT_GROUP
-            refresh: true
-
-          - data-id: other-config.yaml
-            group: DEFAULT_GROUP
-            refresh: true
-
-          - data-id: common-upload-config.yaml
-            group: DEFAULT_GROUP
-            refresh: true
-      discovery:
-        server-addr: 120.24.144.164:8848
-        namespace: 4dkankan-test-eur
-#    sentinel:
-#      transport:
-#        dashboard: 120.24.144.164:8888
-#        heartbeat-interval-ms: 500
-#        port: 8719
-#      eager: true #取消sentinel控制台懒加载
-#      #sentinel配置持久化nacos
-#      datasource:
-#        #流控规则
-#        flow:
-#          nacos:
-#            server-addr: ${spring.cloud.nacos.config.server-addr}
-#            dataId: ${spring.application.name}-flow-rules
-#            groupId: SENTINEL_GROUP
-#            namespace: 4dkankan-test
-#            rule-type: flow
-#        #熔断规则
-#        degrade:
-#          nacos:
-#            server-addr: ${spring.cloud.nacos.config.server-addr}
-#            dataId: ${spring.application.name}-degrade-rules
-#            groupId: SENTINEL_GROUP
-#            namespace: 4dkankan-test
-#            rule-type: degrade
-#      log:
-#        dir: ./logs # 默认值${home}/logs/csp/
-#        switch-pid: true # 日志带上线程id
-
-#开启feign熔断降级，如果没有开启，feign调用链路不会显示再sentinel控制中
-#feign:
-#  sentinel:
-#    enabled: true
-
-feign:
-  httpclient:
-    connection-timeout: 200000
-
-server:
-  tomcat:
-    threads:
-      min-spare: 100  #最小工作线程数
-      max: 1000       #最大工作线程数，建议配置为cpu核心数的200~250倍
-    accept-count: 1000   #能够接受的最大等待数，默认100。如果等待队列也被放满了，新的请求会被tomcat拒绝（connection refused）
-    max-connections: 2000   #同一时间，tomcat能够接受的最大连接数。一般这个值要大于(max-threads)+(accept-count)
-    connection-timeout: 3000  #连接建立超时时间
-
-
-
-
-
-
-

src/main/resources/bootstrap-test.yml

@@ -1,84 +0,0 @@
-spring:
-  application:
-    name: 4dkankan-center-scene
-  cloud:
-    nacos:
-      config:
-        server-addr: 120.24.144.164:8848
-        file-extension: yaml
-        namespace: 4dkankan-v4
-        extension-configs:
-          - data-id: 4dkankan-center-scene.yaml
-            group: DEFAULT_GROUP
-            refresh: true
-        shared-configs:
-          - data-id: common-db-config.yaml
-            group: DEFAULT_GROUP
-            refresh: true
-
-          - data-id: common-redis-config.yaml
-            group: DEFAULT_GROUP
-            refresh: true
-
-          - data-id: other-config.yaml
-            group: DEFAULT_GROUP
-            refresh: true
-
-          - data-id: common-fyun-config.yaml
-            group: DEFAULT_GROUP
-            refresh: true
-      discovery:
-        server-addr: 120.24.144.164:8848
-        namespace: 4dkankan-v4
-#    sentinel:
-#      transport:
-#        dashboard: 120.24.144.164:8888
-#        heartbeat-interval-ms: 500
-#        port: 8719
-#      eager: true #取消sentinel控制台懒加载
-#      #sentinel配置持久化nacos
-#      datasource:
-#        #流控规则
-#        flow:
-#          nacos:
-#            server-addr: ${spring.cloud.nacos.config.server-addr}
-#            dataId: ${spring.application.name}-flow-rules
-#            groupId: SENTINEL_GROUP
-#            namespace: 4dkankan-test
-#            rule-type: flow
-#        #熔断规则
-#        degrade:
-#          nacos:
-#            server-addr: ${spring.cloud.nacos.config.server-addr}
-#            dataId: ${spring.application.name}-degrade-rules
-#            groupId: SENTINEL_GROUP
-#            namespace: 4dkankan-test
-#            rule-type: degrade
-#      log:
-#        dir: ./logs # 默认值${home}/logs/csp/
-#        switch-pid: true # 日志带上线程id
-
-#开启feign熔断降级，如果没有开启，feign调用链路不会显示再sentinel控制中
-#feign:
-#  sentinel:
-#    enabled: true
-
-#feign:
-#  httpclient:
-#    connection-timeout: 200000
-
-server:
-  tomcat:
-    threads:
-      min-spare: 100  #最小工作线程数
-      max: 1000       #最大工作线程数，建议配置为cpu核心数的200~250倍
-    accept-count: 1000   #能够接受的最大等待数，默认100。如果等待队列也被放满了，新的请求会被tomcat拒绝（connection refused）
-    max-connections: 2000   #同一时间，tomcat能够接受的最大连接数。一般这个值要大于(max-threads)+(accept-count)
-    connection-timeout: 3000  #连接建立超时时间
-
-
-
-
-
-
-

src/main/resources/bootstrap.yml

@@ -1,3 +0,0 @@
-spring:
-  profiles:
-    active: dev

src/main/resources/logback-spring.xml

@@ -6,7 +6,6 @@
 <configuration scan="true" scanPeriod="10 seconds">
 
 	<springProperty scope="context" name="LOG_PATH" source="logging.path"/>
-	<define name="hostName" class = "com.fdkankan.web.config.LogPathHostNameProperty"/>
 
 	<contextName>logback</contextName>
 	<!-- name的值是变量的名称，value的值时变量定义的值。通过定义的值会被插入到logger上下文中。定义变量后，可以使“${}”来使用变量。 -->

src/test/java/com/fdkankan/scene/SceneApplicationTests.java

@@ -1,23 +0,0 @@
-package com.fdkankan.scene;
-
-import org.junit.jupiter.api.Test;
-import org.springframework.boot.test.context.SpringBootTest;
-
-@SpringBootTest
-class ApplicationTests {
-
-    @Test
-    void contextLoads() {
-    }
-
-
-
-    @Test
-    public String test2() throws Exception {
-
-
-        return "123";
-
-    }
-
-}