diff --git a/pom.xml b/pom.xml
index 5cd5f048..6a12a5fe 100644
--- a/pom.xml
+++ b/pom.xml
@@ -77,10 +77,6 @@
mybatis-spring-boot-starter
2.1.4
-
- org.springframework.boot
- spring-boot-starter-security
-
redis.clients
diff --git a/src/main/java/com/genersoft/iot/vmp/VManageBootstrap.java b/src/main/java/com/genersoft/iot/vmp/VManageBootstrap.java
index 56038bd5..7fe62ecc 100644
--- a/src/main/java/com/genersoft/iot/vmp/VManageBootstrap.java
+++ b/src/main/java/com/genersoft/iot/vmp/VManageBootstrap.java
@@ -1,7 +1,5 @@
package com.genersoft.iot.vmp;
-import java.util.logging.LogManager;
-
import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication;
import org.springframework.boot.web.servlet.ServletComponentScan;
@@ -9,9 +7,8 @@ import org.springframework.context.ConfigurableApplicationContext;
import org.springframework.scheduling.annotation.EnableScheduling;
import springfox.documentation.oas.annotations.EnableOpenApi;
-/**
- *
- */
+import java.util.logging.LogManager;
+
@ServletComponentScan("com.genersoft.iot.vmp.conf")
@SpringBootApplication
@EnableScheduling
diff --git a/src/main/java/com/genersoft/iot/vmp/common/MyPageInfo.java b/src/main/java/com/genersoft/iot/vmp/common/MyPageInfo.java
new file mode 100644
index 00000000..54fb71b5
--- /dev/null
+++ b/src/main/java/com/genersoft/iot/vmp/common/MyPageInfo.java
@@ -0,0 +1,95 @@
+package com.genersoft.iot.vmp.common;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class MyPageInfo {
+ //当前页
+ private int pageNo;
+ //每页的数量
+ private int pageSize;
+ //当前页的数量
+ private int size;
+ //总页数
+ private int pages;
+ //总数
+ private int total;
+
+ private List resultData;
+
+ private List list;
+
+ public MyPageInfo(List resultData) {
+ this.resultData = resultData;
+ }
+
+ public void startPage(int page, int count) {
+ if (page <= 0) page = 1;
+ this.pageNo = page;
+ this.pageSize = count;
+ this.total = resultData.size();
+
+ this.pages = total%count == 0 ? total/count : total/count + 1;
+ int fromIndx = (page - 1) * count;
+ if ( fromIndx > this.total - 1) {
+ this.list = new ArrayList<>();
+ this.size = 0;
+ return;
+ }
+
+ int toIndx = page * count;
+ if (toIndx > this.total) {
+ toIndx = this.total;
+ }
+ this.list = this.resultData.subList(fromIndx, toIndx);
+ this.size = this.list.size();
+ }
+
+ public int getPageNo() {
+ return pageNo;
+ }
+
+ public void setPageNo(int pageNo) {
+ this.pageNo = pageNo;
+ }
+
+ public int getPageSize() {
+ return pageSize;
+ }
+
+ public void setPageSize(int pageSize) {
+ this.pageSize = pageSize;
+ }
+
+ public int getSize() {
+ return size;
+ }
+
+ public void setSize(int size) {
+ this.size = size;
+ }
+
+ public int getPages() {
+ return pages;
+ }
+
+ public void setPages(int pages) {
+ this.pages = pages;
+ }
+
+ public int getTotal() {
+ return total;
+ }
+
+ public void setTotal(int total) {
+ this.total = total;
+ }
+
+ public List getList() {
+ return list;
+ }
+
+ public void setList(List list) {
+ this.list = list;
+ }
+}
diff --git a/src/main/java/com/genersoft/iot/vmp/common/Page.java b/src/main/java/com/genersoft/iot/vmp/common/Page.java
new file mode 100644
index 00000000..c43bfcee
--- /dev/null
+++ b/src/main/java/com/genersoft/iot/vmp/common/Page.java
@@ -0,0 +1,95 @@
+package com.genersoft.iot.vmp.common;
+
+import com.github.pagehelper.PageInfo;
+
+import java.util.List;
+
+public class Page {
+
+ private Integer pageSize;
+
+ private Integer pageNo;
+
+ private Integer totalPage;
+
+ private Long totalCount;
+
+ private List data;
+
+ public Page() {
+ }
+
+ public Page(Integer pageSize, Integer pageNo, Integer totalPage, Long totalCount, List data) {
+ this.pageSize = pageSize;
+ this.pageNo = pageNo;
+ this.totalPage = totalPage;
+ this.totalCount = totalCount;
+ this.data = data;
+ }
+
+ public Page(PageInfo pageInfo) {
+ Integer pageNo = pageInfo.getPageNum();
+ Integer pageSize = pageInfo.getPageSize();
+ Integer totalPage = pageInfo.getPages();
+ Long totalCount = pageInfo.getTotal();
+ List data = pageInfo.getList();
+ setPageNo(pageNo);
+ setPageSize(pageSize);
+ setTotalPage(totalPage);
+ setTotalCount(totalCount);
+ setData(data);
+ }
+
+ public Page(MyPageInfo myPageInfo){
+ Integer pageNo = myPageInfo.getPageNo();
+ Integer pageSize = myPageInfo.getPageSize();
+ Integer totalPage = myPageInfo.getPages();
+ int totalCount = myPageInfo.getTotal();
+ List data = myPageInfo.getList();
+ setPageNo(pageNo);
+ setPageSize(pageSize);
+ setTotalPage(totalPage);
+ setTotalCount((long) totalCount);
+ setData(data);
+ }
+
+ public Integer getPageSize() {
+ return pageSize;
+ }
+
+ public void setPageSize(Integer pageSize) {
+ this.pageSize = pageSize;
+ }
+
+ public Integer getPageNo() {
+ return pageNo;
+ }
+
+ public void setPageNo(Integer pageNo) {
+ this.pageNo = pageNo;
+ }
+
+ public Integer getTotalPage() {
+ return totalPage;
+ }
+
+ public void setTotalPage(Integer totalPage) {
+ this.totalPage = totalPage;
+ }
+
+ public Long getTotalCount() {
+ return totalCount;
+ }
+
+ public void setTotalCount(Long totalCount) {
+ this.totalCount = totalCount;
+ }
+
+ public List getData() {
+ return data;
+ }
+
+ public void setData(List data) {
+ this.data = data;
+ }
+}
diff --git a/src/main/java/com/genersoft/iot/vmp/common/VersionPo.java b/src/main/java/com/genersoft/iot/vmp/common/VersionPo.java
deleted file mode 100644
index a7d8ce67..00000000
--- a/src/main/java/com/genersoft/iot/vmp/common/VersionPo.java
+++ /dev/null
@@ -1,136 +0,0 @@
-package com.genersoft.iot.vmp.common;
-
-import com.alibaba.fastjson.annotation.JSONField;
-
-public class VersionPo {
- /**
- * git的全版本号
- */
- @JSONField(name="GIT-Revision")
- private String GIT_Revision;
- /**
- * maven版本
- */
- @JSONField(name = "Create-By")
- private String Create_By;
- /**
- * git的分支
- */
- @JSONField(name = "GIT-BRANCH")
- private String GIT_BRANCH;
- /**
- * git的url
- */
- @JSONField(name = "GIT-URL")
- private String GIT_URL;
- /**
- * 构建日期
- */
- @JSONField(name = "BUILD-DATE")
- private String BUILD_DATE;
- /**
- * 项目名称 配合pom使用
- */
- @JSONField(name = "artifactId")
- private String artifactId;
- /**
- * git局部版本号
- */
- @JSONField(name = "GIT-Revision-SHORT")
- private String GIT_Revision_SHORT;
- /**
- * 项目的版本如2.0.1.0 配合pom使用
- */
- @JSONField(name = "version")
- private String version;
- /**
- * 子系统名称
- */
- @JSONField(name = "project")
- private String project;
- /**
- * jdk版本
- */
- @JSONField(name="Build_Jdk")
- private String Build_Jdk;
-
- public void setGIT_Revision(String GIT_Revision) {
- this.GIT_Revision = GIT_Revision;
- }
-
- public void setCreate_By(String create_By) {
- Create_By = create_By;
- }
-
- public void setGIT_BRANCH(String GIT_BRANCH) {
- this.GIT_BRANCH = GIT_BRANCH;
- }
-
- public void setGIT_URL(String GIT_URL) {
- this.GIT_URL = GIT_URL;
- }
-
- public void setBUILD_DATE(String BUILD_DATE) {
- this.BUILD_DATE = BUILD_DATE;
- }
-
- public void setArtifactId(String artifactId) {
- this.artifactId = artifactId;
- }
-
- public void setGIT_Revision_SHORT(String GIT_Revision_SHORT) {
- this.GIT_Revision_SHORT = GIT_Revision_SHORT;
- }
-
- public void setVersion(String version) {
- this.version = version;
- }
-
- public void setProject(String project) {
- this.project = project;
- }
-
- public void setBuild_Jdk(String build_Jdk) {
- Build_Jdk = build_Jdk;
- }
-
- public String getGIT_Revision() {
- return GIT_Revision;
- }
-
- public String getCreate_By() {
- return Create_By;
- }
-
- public String getGIT_BRANCH() {
- return GIT_BRANCH;
- }
-
- public String getGIT_URL() {
- return GIT_URL;
- }
-
- public String getBUILD_DATE() {
- return BUILD_DATE;
- }
-
- public String getArtifactId() {
- return artifactId;
- }
-
- public String getGIT_Revision_SHORT() {
- return GIT_Revision_SHORT;
- }
-
- public String getVersion() {
- return version;
- }
-
- public String getProject() {
- return project;
- }
-
- public String getBuild_Jdk() {
- return Build_Jdk;
- }
-}
diff --git a/src/main/java/com/genersoft/iot/vmp/common/VideoManagerConstants.java b/src/main/java/com/genersoft/iot/vmp/common/VideoManagerConstants.java
index 5fd9c772..89d87125 100644
--- a/src/main/java/com/genersoft/iot/vmp/common/VideoManagerConstants.java
+++ b/src/main/java/com/genersoft/iot/vmp/common/VideoManagerConstants.java
@@ -1,10 +1,7 @@
package com.genersoft.iot.vmp.common;
/**
- * @description: 定义常量
- * @author: swwheihei
- * @date: 2019年5月30日 下午3:04:04
- *
+ * 定义常量
*/
public class VideoManagerConstants {
diff --git a/src/main/java/com/genersoft/iot/vmp/common/reponse/ErrorResponseData.java b/src/main/java/com/genersoft/iot/vmp/common/reponse/ErrorResponseData.java
new file mode 100644
index 00000000..c99f91e9
--- /dev/null
+++ b/src/main/java/com/genersoft/iot/vmp/common/reponse/ErrorResponseData.java
@@ -0,0 +1,28 @@
+package com.genersoft.iot.vmp.common.reponse;
+
+public class ErrorResponseData extends ResponseData{
+ /**
+ * 异常的具体类名称
+ */
+ private String exceptionClazz;
+
+ public String getExceptionClazz() {
+ return exceptionClazz;
+ }
+
+ public void setExceptionClazz(String exceptionClazz) {
+ this.exceptionClazz = exceptionClazz;
+ }
+
+ ErrorResponseData(String message) {
+ super(false, DEFAULT_ERROR_CODE, message, null);
+ }
+
+ public ErrorResponseData(Integer code, String message) {
+ super(false, code, message, null);
+ }
+
+ ErrorResponseData(Integer code, String message, Object object) {
+ super(false, code, message, object);
+ }
+}
diff --git a/src/main/java/com/genersoft/iot/vmp/common/reponse/ResponseData.java b/src/main/java/com/genersoft/iot/vmp/common/reponse/ResponseData.java
new file mode 100644
index 00000000..fe3d6034
--- /dev/null
+++ b/src/main/java/com/genersoft/iot/vmp/common/reponse/ResponseData.java
@@ -0,0 +1,98 @@
+package com.genersoft.iot.vmp.common.reponse;
+
+public class ResponseData {
+
+ public static final String DEFAULT_SUCCESS_MESSAGE = "请求成功";
+
+ public static final String DEFAULT_ERROR_MESSAGE = "网络异常";
+
+ public static final Integer DEFAULT_SUCCESS_CODE = 200;
+
+ public static final Integer DEFAULT_ERROR_CODE = 500;
+
+ /**
+ * 请求是否成功
+ */
+ private Boolean success;
+
+ /**
+ * 响应状态码
+ */
+ private Integer code;
+
+ /**
+ * 响应信息
+ */
+ private String message;
+
+ /**
+ * 响应对象
+ */
+ private Object data;
+
+ public ResponseData() {
+ }
+
+ public ResponseData(Boolean success, Integer code, String message, Object data) {
+ this.success = success;
+ this.code = code;
+ this.message = message;
+ this.data = data;
+ }
+
+ public static SuccessResponseData success() {
+ return new SuccessResponseData();
+ }
+
+ public static SuccessResponseData success(Object object) {
+ return new SuccessResponseData(object);
+ }
+
+ public static SuccessResponseData success(Integer code, String message, Object object) {
+ return new SuccessResponseData(code, message, object);
+ }
+
+ public static ErrorResponseData error(String message) {
+ return new ErrorResponseData(message);
+ }
+
+ public static ErrorResponseData error(Integer code, String message) {
+ return new ErrorResponseData(code, message);
+ }
+
+ public static ErrorResponseData error(Integer code, String message, Object object) {
+ return new ErrorResponseData(code, message, object);
+ }
+
+ public Boolean getSuccess() {
+ return success;
+ }
+
+ public void setSuccess(Boolean success) {
+ this.success = success;
+ }
+
+ public Integer getCode() {
+ return code;
+ }
+
+ public void setCode(Integer code) {
+ this.code = code;
+ }
+
+ public String getMessage() {
+ return message;
+ }
+
+ public void setMessage(String message) {
+ this.message = message;
+ }
+
+ public Object getData() {
+ return data;
+ }
+
+ public void setData(Object data) {
+ this.data = data;
+ }
+}
diff --git a/src/main/java/com/genersoft/iot/vmp/common/reponse/SuccessResponseData.java b/src/main/java/com/genersoft/iot/vmp/common/reponse/SuccessResponseData.java
new file mode 100644
index 00000000..c8fa1755
--- /dev/null
+++ b/src/main/java/com/genersoft/iot/vmp/common/reponse/SuccessResponseData.java
@@ -0,0 +1,15 @@
+package com.genersoft.iot.vmp.common.reponse;
+
+public class SuccessResponseData extends ResponseData {
+ public SuccessResponseData() {
+ super(true, DEFAULT_SUCCESS_CODE, DEFAULT_SUCCESS_MESSAGE, null);
+ }
+
+ public SuccessResponseData(Object object) {
+ super(true, DEFAULT_SUCCESS_CODE, DEFAULT_SUCCESS_MESSAGE, object);
+ }
+
+ public SuccessResponseData(Integer code, String message, Object object) {
+ super(true, code, message, object);
+ }
+}
diff --git a/src/main/java/com/genersoft/iot/vmp/conf/ApiAccessFilter.java b/src/main/java/com/genersoft/iot/vmp/conf/ApiAccessFilter.java
index 08d030a8..4e3ee4d9 100644
--- a/src/main/java/com/genersoft/iot/vmp/conf/ApiAccessFilter.java
+++ b/src/main/java/com/genersoft/iot/vmp/conf/ApiAccessFilter.java
@@ -1,7 +1,6 @@
package com.genersoft.iot.vmp.conf;
import com.genersoft.iot.vmp.common.ApiSaveConstant;
-import com.genersoft.iot.vmp.conf.security.SecurityUtils;
import com.genersoft.iot.vmp.service.ILogService;
import com.genersoft.iot.vmp.storager.dao.dto.LogDto;
import org.apache.commons.lang3.StringUtils;
@@ -18,14 +17,9 @@ import javax.servlet.http.HttpServletResponse;
import java.io.IOException;
import java.text.SimpleDateFormat;
-/**
- * @author lin
- */
-@WebFilter(filterName = "ApiAccessFilter", urlPatterns = "/api/*", asyncSupported=true)
+@WebFilter(filterName = "ApiAccessFilter", urlPatterns = "/api/*", asyncSupported = true)
public class ApiAccessFilter extends OncePerRequestFilter {
- private final static Logger logger = LoggerFactory.getLogger(ApiAccessFilter.class);
-
private final SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
@Autowired
@@ -34,25 +28,14 @@ public class ApiAccessFilter extends OncePerRequestFilter {
@Autowired
private ILogService logService;
-
@Override
protected void doFilterInternal(HttpServletRequest servletRequest, HttpServletResponse servletResponse, FilterChain filterChain) throws ServletException, IOException {
- String username = null;
- if (SecurityUtils.getUserInfo() == null) {
- username = servletRequest.getParameter("username");
- }else {
- username = SecurityUtils.getUserInfo().getUsername();
- }
long start = System.currentTimeMillis(); // 请求进入时间
String uriName = ApiSaveConstant.getVal(servletRequest.getRequestURI());
-
filterChain.doFilter(servletRequest, servletResponse);
-
if (uriName != null && userSetup.getLogInDatebase()) {
-
LogDto logDto = new LogDto();
logDto.setName(uriName);
- logDto.setUsername(username);
logDto.setAddress(servletRequest.getRemoteAddr());
logDto.setResult(HttpStatus.valueOf(servletResponse.getStatus()).toString());
logDto.setTiming(System.currentTimeMillis() - start);
@@ -60,10 +43,6 @@ public class ApiAccessFilter extends OncePerRequestFilter {
logDto.setUri(servletRequest.getRequestURI());
logDto.setCreateTime(format.format(System.currentTimeMillis()));
logService.add(logDto);
-// logger.warn("[Api Access] [{}] [{}] [{}] [{}] [{}] {}ms",
-// uriName, servletRequest.getMethod(), servletRequest.getRequestURI(), servletRequest.getRemoteAddr(), HttpStatus.valueOf(servletResponse.getStatus()),
-// System.currentTimeMillis() - start);
-
}
}
diff --git a/src/main/java/com/genersoft/iot/vmp/conf/ProxyServletConfig.java b/src/main/java/com/genersoft/iot/vmp/conf/ProxyServletConfig.java
index 5d8acce9..5cf69db1 100644
--- a/src/main/java/com/genersoft/iot/vmp/conf/ProxyServletConfig.java
+++ b/src/main/java/com/genersoft/iot/vmp/conf/ProxyServletConfig.java
@@ -21,9 +21,6 @@ import javax.servlet.http.HttpServletRequest;
import java.io.IOException;
import java.net.ConnectException;
-/**
- * @author lin
- */
@SuppressWarnings(value = {"rawtypes", "unchecked"})
@Configuration
public class ProxyServletConfig {
diff --git a/src/main/java/com/genersoft/iot/vmp/conf/RedisConfig.java b/src/main/java/com/genersoft/iot/vmp/conf/RedisConfig.java
index dcb0e811..a01c1838 100644
--- a/src/main/java/com/genersoft/iot/vmp/conf/RedisConfig.java
+++ b/src/main/java/com/genersoft/iot/vmp/conf/RedisConfig.java
@@ -16,73 +16,66 @@ import redis.clients.jedis.JedisPool;
import redis.clients.jedis.JedisPoolConfig;
/**
- * @description:Redis中间件配置类，使用spring-data-redis集成，自动从application.yml中加载redis配置
- * @author: swwheihei
- * @date: 2019年5月30日 上午10:58:25
- *
+ * 中间件配置类，使用spring-data-redis集成，自动从application.yml中加载redis配置
*/
@Configuration
public class RedisConfig extends CachingConfigurerSupport {
- @Value("${spring.redis.host}")
- private String host;
- @Value("${spring.redis.port}")
- private int port;
- @Value("${spring.redis.database}")
- private int database;
- @Value("${spring.redis.password}")
- private String password;
- @Value("${spring.redis.timeout}")
- private int timeout;
- @Value("${spring.redis.poolMaxTotal:1000}")
- private int poolMaxTotal;
- @Value("${spring.redis.poolMaxIdle:500}")
- private int poolMaxIdle;
- @Value("${spring.redis.poolMaxWait:5}")
- private int poolMaxWait;
+ @Value("${spring.redis.host}")
+ private String host;
+ @Value("${spring.redis.port}")
+ private int port;
+ @Value("${spring.redis.database}")
+ private int database;
+ @Value("${spring.redis.password}")
+ private String password;
+ @Value("${spring.redis.timeout}")
+ private int timeout;
+ @Value("${spring.redis.poolMaxTotal:1000}")
+ private int poolMaxTotal;
+ @Value("${spring.redis.poolMaxIdle:500}")
+ private int poolMaxIdle;
+ @Value("${spring.redis.poolMaxWait:5}")
+ private int poolMaxWait;
- @Bean
- public JedisPool jedisPool() {
- if (StringUtils.isBlank(password)) {
- password = null;
- }
- JedisPoolConfig poolConfig = new JedisPoolConfig();
- poolConfig.setMaxIdle(poolMaxIdle);
- poolConfig.setMaxTotal(poolMaxTotal);
- // 秒转毫秒
- poolConfig.setMaxWaitMillis(poolMaxWait * 1000L);
- JedisPool jp = new JedisPool(poolConfig, host, port, timeout * 1000, password, database);
- return jp;
- }
-
- @Bean("redisTemplate")
- public RedisTemplate redisTemplate(RedisConnectionFactory redisConnectionFactory) {
- RedisTemplate template = new RedisTemplate<>();
- template.setConnectionFactory(redisConnectionFactory);
- // 使用fastjson进行序列化处理，提高解析效率
- FastJsonRedisSerializer