1111

pom.xml

@@ -37,7 +37,7 @@
     <dependencies>
         <dependency>
             <groupId>com.fdkankan</groupId>
-            <artifactId>4dkankan-common</artifactId>
+            <artifactId>4dkankan-common-web</artifactId>
             <version>2.0.0-SNAPSHOT</version>
         </dependency>
 

src/main/java/com/fdkankan/scene/aop/CheckCurrenUserAspect.java

@@ -2,8 +2,6 @@ package com.fdkankan.scene.aop;
 
 import com.fdkankan.common.constant.ErrorCode;
 import com.fdkankan.common.exception.BusinessException;
-import com.fdkankan.common.model.SSOUser;
-import com.fdkankan.common.user.SSOLoginHelper;
 import com.fdkankan.scene.annotation.CheckCurrentUser;
 import com.fdkankan.scene.entity.Camera;
 import com.fdkankan.scene.entity.SceneCooperation;
@@ -11,6 +9,8 @@ import com.fdkankan.scene.entity.ScenePro;
 import com.fdkankan.scene.service.ICameraService;
 import com.fdkankan.scene.service.ISceneCooperationService;
 import com.fdkankan.scene.service.ISceneProService;
+import com.fdkankan.web.model.SSOUser;
+import com.fdkankan.web.user.SSOLoginHelper;
 import java.io.IOException;
 import java.lang.reflect.Method;
 import java.util.Objects;

src/main/java/com/fdkankan/scene/aop/SystemLogAspect.java

@@ -1,12 +1,12 @@
 package com.fdkankan.scene.aop;
 
 import com.alibaba.fastjson.JSONObject;
-import com.fdkankan.common.model.SSOUser;
-import com.fdkankan.common.user.SSOLoginHelper;
 import com.fdkankan.scene.annotation.SystemControllerLog;
 import com.fdkankan.scene.annotation.SystemServiceLog;
 import com.fdkankan.scene.entity.Log;
 import com.fdkankan.scene.service.ILogService;
+import com.fdkankan.web.model.SSOUser;
+import com.fdkankan.web.user.SSOLoginHelper;
 import java.io.IOException;
 import java.lang.reflect.Method;
 import java.util.Date;

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

@@ -1,36 +1,22 @@
 package com.fdkankan.scene.controller;
 
 import cn.hutool.core.util.StrUtil;
-import com.alibaba.fastjson.JSONArray;
-import com.alibaba.fastjson.JSONObject;
-import com.fdkankan.common.constant.ConstantFilePath;
 import com.fdkankan.common.constant.ErrorCode;
-import com.fdkankan.common.controller.BaseController;
 import com.fdkankan.common.exception.BusinessException;
-import com.fdkankan.common.model.SSOUser;
 import com.fdkankan.common.response.ResultData;
-import com.fdkankan.common.util.CreateObjUtil;
-import com.fdkankan.common.util.FileUtils;
-import com.fdkankan.common.util.JwtUtil;
-import com.fdkankan.fyun.oss.UploadToOssUtil;
 import com.fdkankan.scene.bean.RequestRebuildVedioScene;
 import com.fdkankan.scene.bean.RequestSceneCooperation;
 import com.fdkankan.scene.bean.ResponseVideoSceneProgress;
-import com.fdkankan.scene.entity.Scene;
 import com.fdkankan.scene.entity.ScenePro;
 import com.fdkankan.scene.service.IPicSceneProgressService;
 import com.fdkankan.scene.service.ISceneProService;
 import com.fdkankan.scene.service.ISceneService;
 import com.fdkankan.scene.service.IVideoSceneProgressService;
-import java.io.File;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.Map;
+import com.fdkankan.web.controller.BaseController;
 import javax.servlet.http.HttpServletRequest;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.util.ObjectUtils;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;

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

@@ -1,12 +1,7 @@
 package com.fdkankan.scene.controller;
 
 
-import com.fdkankan.common.model.SSOUser;
-import com.fdkankan.common.util.JwtUtil;
-import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
-
-import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RestController;
 
 /**

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

@@ -1,20 +1,15 @@
 package com.fdkankan.scene.controller;
 
-import com.fdkankan.common.constant.ErrorCode;
-import com.fdkankan.common.controller.BaseController;
-import com.fdkankan.common.exception.BusinessException;
 import com.fdkankan.common.response.ResultData;
 import com.fdkankan.fyun.oss.UploadToOssUtil;
 import com.fdkankan.scene.annotation.CheckCurrentUser;
 import com.fdkankan.scene.annotation.SystemControllerLog;
 import com.fdkankan.scene.bean.RequestSceneEdit;
 import com.fdkankan.scene.service.ISceneProService;
-import java.util.HashMap;
-import java.util.Map;
+import com.fdkankan.web.controller.BaseController;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;

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

@@ -1,11 +1,10 @@
 package com.fdkankan.scene.service;
 
-import com.fdkankan.common.model.SSOUser;
 import com.fdkankan.common.response.ResultData;
 import com.fdkankan.scene.bean.RequestRebuildVedioScene;
 import com.fdkankan.scene.bean.RequestSceneCooperation;
 import com.fdkankan.scene.entity.Scene;
-import javax.servlet.http.HttpServletRequest;
+import com.fdkankan.web.model.SSOUser;
 import org.springframework.web.bind.annotation.RequestBody;
 
 /**

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

@@ -8,13 +8,10 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.fdkankan.common.constant.ConstantFilePath;
 import com.fdkankan.common.constant.ErrorCode;
 import com.fdkankan.common.exception.BusinessException;
-import com.fdkankan.common.model.SSOUser;
 import com.fdkankan.common.response.ResultData;
-import com.fdkankan.common.user.SSOLoginHelper;
 import com.fdkankan.common.util.CreateObjUtil;
 import com.fdkankan.common.util.DateUtil;
 import com.fdkankan.common.util.FileUtils;
-import com.fdkankan.common.util.JwtUtil;
 import com.fdkankan.fyun.oss.UploadToOssUtil;
 import com.fdkankan.rabbitmq.util.RabbitMqProducer;
 import com.fdkankan.redis.constant.RedisKey;
@@ -37,7 +34,6 @@ import com.fdkankan.scene.entity.User;
 import com.fdkankan.scene.entity.UserIncrement;
 import com.fdkankan.scene.entity.VideoSceneProgress;
 import com.fdkankan.scene.mapper.ISceneMapper;
-import com.fdkankan.scene.mapper.ISceneProMapper;
 import com.fdkankan.scene.service.ICameraDetailService;
 import com.fdkankan.scene.service.ICameraService;
 import com.fdkankan.scene.service.IPicSceneProgressService;
@@ -51,6 +47,7 @@ import com.fdkankan.scene.service.ISceneService;
 import com.fdkankan.scene.service.IUserIncrementService;
 import com.fdkankan.scene.service.IUserService;
 import com.fdkankan.scene.service.IVideoSceneProgressService;
+import com.fdkankan.web.model.SSOUser;
 import java.io.File;
 import java.util.ArrayList;
 import java.util.Date;
@@ -58,8 +55,6 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.Objects;
-import java.util.concurrent.ConcurrentHashMap;
-import javax.servlet.http.HttpServletRequest;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;

src/main/resources/logback-spring.xml

@@ -270,55 +270,6 @@
 		</root>
 	</springProfile>
 
-<!--	<springProfile name="dev">-->
-<!--		<root level="info">-->
-<!--			<appender-ref ref="CONSOLE" />-->
-<!--			<appender-ref ref="DEBUG_FILE" />-->
-<!--			<appender-ref ref="INFO_FILE" />-->
-<!--			<appender-ref ref="WARN_FILE" />-->
-<!--			<appender-ref ref="ERROR_FILE" />-->
-<!--			<appender-ref ref="ALL_FILE" />-->
-<!--		</root>-->
-<!--		&lt;!&ndash; <logger name="com.xusanduo.demo" level="debug"/>开发环境, 指定某包日志为debug级 &ndash;&gt;-->
-<!--	</springProfile>-->
-
-<!--	<springProfile name="test">-->
-<!--		<root level="info">-->
-<!--			<appender-ref ref="CONSOLE" />-->
-<!--			<appender-ref ref="DEBUG_FILE" />-->
-<!--			<appender-ref ref="INFO_FILE" />-->
-<!--			<appender-ref ref="WARN_FILE" />-->
-<!--			<appender-ref ref="ERROR_FILE" />-->
-<!--			<appender-ref ref="ALL_FILE" />-->
-<!--		</root>-->
-<!--		&lt;!&ndash; <logger name="com.xusanduo.demo" level="info"/> 测试环境, 指定某包日志为info级 &ndash;&gt;-->
-<!--	</springProfile>-->
-
-<!--	<springProfile name="pro">-->
-<!--		<root level="error">-->
-<!--			&lt;!&ndash; 生产环境最好不配置console写文件 &ndash;&gt;-->
-<!--			<appender-ref ref="CONSOLE" />-->
-<!--			<appender-ref ref="DEBUG_FILE" />-->
-<!--			<appender-ref ref="INFO_FILE" />-->
-<!--			<appender-ref ref="WARN_FILE" />-->
-<!--			<appender-ref ref="ERROR_FILE" />-->
-<!--			<appender-ref ref="ALL_FILE" />-->
-<!--		</root>-->
-<!--		&lt;!&ndash; <logger name="com.xusanduo.demo" level="warn"/> 生产环境, 指定某包日志为warn级 &ndash;&gt;-->
-<!--		&lt;!&ndash; <logger name="com.xusanduo.demo.MyApplication" level="info"/> 特定某个类打印info日志, 比如application启动成功后的提示语 &ndash;&gt;-->
-<!--	</springProfile>-->
-
-	<!--生产环境:输出到文件 -->
-	<!--<springProfile name="pro"> -->
-	<!--<root level="info"> -->
-	<!--<appender-ref ref="CONSOLE" /> -->
-	<!--<appender-ref ref="DEBUG_FILE" /> -->
-	<!--<appender-ref ref="INFO_FILE" /> -->
-	<!--<appender-ref ref="ERROR_FILE" /> -->
-	<!--<appender-ref ref="WARN_FILE" /> -->
-	<!--</root> -->
-	<!--</springProfile> -->
-
 </configuration>