From 2031d81029253927c901a547f0a407b68a964d12 Mon Sep 17 00:00:00 2001 From: cuizhibin Date: Tue, 22 Apr 2025 09:19:27 +0800 Subject: [PATCH] =?UTF-8?q?1.=E4=BC=98=E5=8C=96=E6=A8=A1=E5=9D=97=E7=BB=93?= =?UTF-8?q?=E6=9E=84=202.=E8=A7=86=E9=A2=91=E7=9B=91=E6=8E=A7=E8=B0=83?= =?UTF-8?q?=E8=AF=95=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitignore | 1 + {demo => core}/pom.xml | 6 ++ .../com/dite/znpt/aspect/HttpLogAspect.java | 0 .../znpt/config/BeanPostProcessorConfig.java | 0 .../config/FastJson2JsonRedisSerializer.java | 52 +++++++++++++++ .../dite/znpt/config/GlobalCorsConfig.java | 0 .../com/dite/znpt/config/JacksonConfig.java | 0 .../com/dite/znpt/config/RedisConfig.java | 63 ++++++++++++++++++ .../dite/znpt/config/SaTokenConfigure.java | 0 .../com/dite/znpt/config/SwaggerConfig.java | 0 .../com/dite/znpt/config/WebMvcConfig.java | 0 .../com/dite/znpt/domain/AuditableEntity.java | 0 .../java/com/dite/znpt/domain/Constants.java | 0 .../java/com/dite/znpt/domain/PageResult.java | 0 .../java/com/dite/znpt/domain/Result.java | 0 .../domain/entity/CombinedDictEntity.java | 0 .../dite/znpt/domain/entity/CrewEntity.java | 0 .../dite/znpt/domain/entity/DefectEntity.java | 0 .../znpt/domain/entity/FileInfoEntity.java | 0 .../dite/znpt/domain/entity/PartEntity.java | 0 .../znpt/domain/entity/PersonnelEntity.java | 0 .../domain/entity/ProjectCompanyEntity.java | 0 .../znpt/domain/entity/ProjectEntity.java | 0 .../znpt/domain/entity/TCompanyEntity.java | 0 .../domain/entity/TConstructionEntity.java | 0 .../znpt/domain/entity/TurbineEntity.java | 0 .../znpt/domain/entity/WeatherTypeEntity.java | 0 .../com/dite/znpt/domain/page/PageDomain.java | 0 .../dite/znpt/domain/page/TableSupport.java | 0 .../znpt/domain/vo/CombinedDictListReq.java | 0 .../dite/znpt/domain/vo/CombinedDictResp.java | 0 .../com/dite/znpt/domain/vo/CrewListReq.java | 0 .../com/dite/znpt/domain/vo/CrewResp.java | 0 .../dite/znpt/domain/vo/DefectListReq.java | 0 .../com/dite/znpt/domain/vo/DefectResp.java | 0 .../dite/znpt/domain/vo/FileInfoListReq.java | 0 .../com/dite/znpt/domain/vo/FileInfoResp.java | 0 .../com/dite/znpt/domain/vo/PartListReq.java | 0 .../com/dite/znpt/domain/vo/PartResp.java | 0 .../dite/znpt/domain/vo/PersonnelListReq.java | 0 .../dite/znpt/domain/vo/PersonnelResp.java | 0 .../znpt/domain/vo/ProjectCompanyListReq.java | 0 .../znpt/domain/vo/ProjectCompanyResp.java | 0 .../dite/znpt/domain/vo/ProjectListReq.java | 0 .../com/dite/znpt/domain/vo/ProjectResp.java | 0 .../dite/znpt/domain/vo/TCompanyListReq.java | 0 .../com/dite/znpt/domain/vo/TCompanyResp.java | 0 .../znpt/domain/vo/TConstructionListReq.java | 0 .../znpt/domain/vo/TConstructionResp.java | 0 .../dite/znpt/domain/vo/TurbineListReq.java | 0 .../com/dite/znpt/domain/vo/TurbineResp.java | 0 .../znpt/domain/vo/WeatherTypeListReq.java | 0 .../dite/znpt/domain/vo/WeatherTypeResp.java | 0 .../RestResponseEntityExceptionHandler.java | 0 .../dite/znpt/exception/ServiceException.java | 0 .../dite/znpt/mapper/CombinedDictMapper.java | 0 .../java/com/dite/znpt/mapper/CrewMapper.java | 0 .../com/dite/znpt/mapper/DefectMapper.java | 0 .../com/dite/znpt/mapper/FileInfoMapper.java | 0 .../java/com/dite/znpt/mapper/PartMapper.java | 0 .../com/dite/znpt/mapper/PersonnelMapper.java | 0 .../znpt/mapper/ProjectCompanyMapper.java | 0 .../com/dite/znpt/mapper/ProjectMapper.java | 0 .../com/dite/znpt/mapper/TCompanyMapper.java | 0 .../dite/znpt/mapper/TConstructionMapper.java | 0 .../com/dite/znpt/mapper/TurbineMapper.java | 0 .../dite/znpt/mapper/WeatherTypeMapper.java | 0 .../znpt/service/CombinedDictService.java | 0 .../com/dite/znpt/service/CrewService.java | 0 .../com/dite/znpt/service/DefectService.java | 0 .../dite/znpt/service/FileInfoService.java | 0 .../com/dite/znpt/service/PartService.java | 0 .../dite/znpt/service/PersonnelService.java | 0 .../znpt/service/ProjectCompanyService.java | 0 .../com/dite/znpt/service/ProjectService.java | 0 .../com/dite/znpt/service/RedisService.java | 7 ++ .../dite/znpt/service/TCompanyService.java | 0 .../znpt/service/TConstructionService.java | 0 .../com/dite/znpt/service/TurbineService.java | 0 .../dite/znpt/service/WeatherTypeService.java | 0 .../service/impl/CombinedDictServiceImpl.java | 0 .../znpt/service/impl/CrewServiceImpl.java | 0 .../znpt/service/impl/DefectServiceImpl.java | 0 .../service/impl/FileInfoServiceImpl.java | 0 .../znpt/service/impl/PartServiceImpl.java | 0 .../service/impl/PersonnelServiceImpl.java | 0 .../impl/ProjectCompanyServiceImpl.java | 0 .../znpt/service/impl/ProjectServiceImpl.java | 0 .../service/impl/TCompanyServiceImpl.java | 0 .../impl/TConstructionServiceImpl.java | 0 .../znpt/service/impl/TurbineServiceImpl.java | 0 .../service/impl/WeatherTypeServiceImpl.java | 0 .../java/com/dite/znpt/util/PageUtil.java | 0 .../java/com/dite/znpt/util/PasswordUtil.java | 0 .../main/java/com/dite/znpt/util/SqlUtil.java | 0 .../resources/mapper/CombinedDictMapper.xml | 0 .../src/main/resources/mapper/CrewMapper.xml | 0 .../main/resources/mapper/DefectMapper.xml | 0 .../main/resources/mapper/FileInfoMapper.xml | 0 .../src/main/resources/mapper/PartMapper.xml | 0 .../main/resources/mapper/PersonnelMapper.xml | 0 .../resources/mapper/ProjectCompanyMapper.xml | 0 .../main/resources/mapper/ProjectMapper.xml | 0 .../main/resources/mapper/TCompanyMapper.xml | 0 .../resources/mapper/TConstructionMapper.xml | 0 .../main/resources/mapper/TurbineMapper.xml | 0 .../resources/mapper/WeatherTypeMapper.xml | 0 .../example/demo/DiteApplicationTests.java | 13 ---- pom.xml | 2 +- sip/pom.xml | 5 -- .../media/zlm/cache/MediaServerCache.java | 2 - .../znpt/monitor/media/zlm/dto/MediaItem.java | 1 + .../monitor/media/zlm/dto/ServerItem.java | 2 + .../monitor/media/zlm/dto/resp/MediaResp.java | 5 +- .../media/zlm/dto/resp/OriginSock.java | 6 +- .../monitor/media/zlm/dto/resp/Track.java | 5 +- .../monitor/media/zlm/impl/ZlmApiImpl.java | 10 ++- .../com/dite/znpt/monitor/sip/SipLayer.java | 10 +-- .../media/zlm/cache/MediaServerCache.class | Bin 1947 -> 0 bytes .../monitor/media/zlm/dto/MediaItem.class | Bin 12581 -> 0 bytes .../monitor/media/zlm/dto/ServerItem.class | Bin 9053 -> 0 bytes .../media/zlm/dto/resp/MediaResp.class | Bin 6433 -> 0 bytes .../media/zlm/dto/resp/OriginSock.class | Bin 3501 -> 0 bytes .../monitor/media/zlm/dto/resp/Track.class | Bin 5811 -> 0 bytes .../monitor/media/zlm/impl/ZlmApiImpl.class | Bin 13644 -> 0 bytes .../com/dite/znpt/monitor/sip/SipLayer.class | Bin 4231 -> 0 bytes .../znpt/web/controller/VideoController.java | 5 +- 127 files changed, 153 insertions(+), 42 deletions(-) rename {demo => core}/pom.xml (96%) rename {demo => core}/src/main/java/com/dite/znpt/aspect/HttpLogAspect.java (100%) rename {demo => core}/src/main/java/com/dite/znpt/config/BeanPostProcessorConfig.java (100%) create mode 100644 core/src/main/java/com/dite/znpt/config/FastJson2JsonRedisSerializer.java rename {demo => core}/src/main/java/com/dite/znpt/config/GlobalCorsConfig.java (100%) rename {demo => core}/src/main/java/com/dite/znpt/config/JacksonConfig.java (100%) create mode 100644 core/src/main/java/com/dite/znpt/config/RedisConfig.java rename {demo => core}/src/main/java/com/dite/znpt/config/SaTokenConfigure.java (100%) rename {demo => core}/src/main/java/com/dite/znpt/config/SwaggerConfig.java (100%) rename {demo => core}/src/main/java/com/dite/znpt/config/WebMvcConfig.java (100%) rename {demo => core}/src/main/java/com/dite/znpt/domain/AuditableEntity.java (100%) rename {demo => core}/src/main/java/com/dite/znpt/domain/Constants.java (100%) rename {demo => core}/src/main/java/com/dite/znpt/domain/PageResult.java (100%) rename {demo => core}/src/main/java/com/dite/znpt/domain/Result.java (100%) rename {demo => core}/src/main/java/com/dite/znpt/domain/entity/CombinedDictEntity.java (100%) rename {demo => core}/src/main/java/com/dite/znpt/domain/entity/CrewEntity.java (100%) rename {demo => core}/src/main/java/com/dite/znpt/domain/entity/DefectEntity.java (100%) rename {demo => core}/src/main/java/com/dite/znpt/domain/entity/FileInfoEntity.java (100%) rename {demo => core}/src/main/java/com/dite/znpt/domain/entity/PartEntity.java (100%) rename {demo => core}/src/main/java/com/dite/znpt/domain/entity/PersonnelEntity.java (100%) rename {demo => core}/src/main/java/com/dite/znpt/domain/entity/ProjectCompanyEntity.java (100%) rename {demo => core}/src/main/java/com/dite/znpt/domain/entity/ProjectEntity.java (100%) rename {demo => core}/src/main/java/com/dite/znpt/domain/entity/TCompanyEntity.java (100%) rename {demo => core}/src/main/java/com/dite/znpt/domain/entity/TConstructionEntity.java (100%) rename {demo => core}/src/main/java/com/dite/znpt/domain/entity/TurbineEntity.java (100%) rename {demo => core}/src/main/java/com/dite/znpt/domain/entity/WeatherTypeEntity.java (100%) rename {demo => core}/src/main/java/com/dite/znpt/domain/page/PageDomain.java (100%) rename {demo => core}/src/main/java/com/dite/znpt/domain/page/TableSupport.java (100%) rename {demo => core}/src/main/java/com/dite/znpt/domain/vo/CombinedDictListReq.java (100%) rename {demo => core}/src/main/java/com/dite/znpt/domain/vo/CombinedDictResp.java (100%) rename {demo => core}/src/main/java/com/dite/znpt/domain/vo/CrewListReq.java (100%) rename {demo => core}/src/main/java/com/dite/znpt/domain/vo/CrewResp.java (100%) rename {demo => core}/src/main/java/com/dite/znpt/domain/vo/DefectListReq.java (100%) rename {demo => core}/src/main/java/com/dite/znpt/domain/vo/DefectResp.java (100%) rename {demo => core}/src/main/java/com/dite/znpt/domain/vo/FileInfoListReq.java (100%) rename {demo => core}/src/main/java/com/dite/znpt/domain/vo/FileInfoResp.java (100%) rename {demo => core}/src/main/java/com/dite/znpt/domain/vo/PartListReq.java (100%) rename {demo => core}/src/main/java/com/dite/znpt/domain/vo/PartResp.java (100%) rename {demo => core}/src/main/java/com/dite/znpt/domain/vo/PersonnelListReq.java (100%) rename {demo => core}/src/main/java/com/dite/znpt/domain/vo/PersonnelResp.java (100%) rename {demo => core}/src/main/java/com/dite/znpt/domain/vo/ProjectCompanyListReq.java (100%) rename {demo => core}/src/main/java/com/dite/znpt/domain/vo/ProjectCompanyResp.java (100%) rename {demo => core}/src/main/java/com/dite/znpt/domain/vo/ProjectListReq.java (100%) rename {demo => core}/src/main/java/com/dite/znpt/domain/vo/ProjectResp.java (100%) rename {demo => core}/src/main/java/com/dite/znpt/domain/vo/TCompanyListReq.java (100%) rename {demo => core}/src/main/java/com/dite/znpt/domain/vo/TCompanyResp.java (100%) rename {demo => core}/src/main/java/com/dite/znpt/domain/vo/TConstructionListReq.java (100%) rename {demo => core}/src/main/java/com/dite/znpt/domain/vo/TConstructionResp.java (100%) rename {demo => core}/src/main/java/com/dite/znpt/domain/vo/TurbineListReq.java (100%) rename {demo => core}/src/main/java/com/dite/znpt/domain/vo/TurbineResp.java (100%) rename {demo => core}/src/main/java/com/dite/znpt/domain/vo/WeatherTypeListReq.java (100%) rename {demo => core}/src/main/java/com/dite/znpt/domain/vo/WeatherTypeResp.java (100%) rename {demo => core}/src/main/java/com/dite/znpt/exception/RestResponseEntityExceptionHandler.java (100%) rename {demo => core}/src/main/java/com/dite/znpt/exception/ServiceException.java (100%) rename {demo => core}/src/main/java/com/dite/znpt/mapper/CombinedDictMapper.java (100%) rename {demo => core}/src/main/java/com/dite/znpt/mapper/CrewMapper.java (100%) rename {demo => core}/src/main/java/com/dite/znpt/mapper/DefectMapper.java (100%) rename {demo => core}/src/main/java/com/dite/znpt/mapper/FileInfoMapper.java (100%) rename {demo => core}/src/main/java/com/dite/znpt/mapper/PartMapper.java (100%) rename {demo => core}/src/main/java/com/dite/znpt/mapper/PersonnelMapper.java (100%) rename {demo => core}/src/main/java/com/dite/znpt/mapper/ProjectCompanyMapper.java (100%) rename {demo => core}/src/main/java/com/dite/znpt/mapper/ProjectMapper.java (100%) rename {demo => core}/src/main/java/com/dite/znpt/mapper/TCompanyMapper.java (100%) rename {demo => core}/src/main/java/com/dite/znpt/mapper/TConstructionMapper.java (100%) rename {demo => core}/src/main/java/com/dite/znpt/mapper/TurbineMapper.java (100%) rename {demo => core}/src/main/java/com/dite/znpt/mapper/WeatherTypeMapper.java (100%) rename {demo => core}/src/main/java/com/dite/znpt/service/CombinedDictService.java (100%) rename {demo => core}/src/main/java/com/dite/znpt/service/CrewService.java (100%) rename {demo => core}/src/main/java/com/dite/znpt/service/DefectService.java (100%) rename {demo => core}/src/main/java/com/dite/znpt/service/FileInfoService.java (100%) rename {demo => core}/src/main/java/com/dite/znpt/service/PartService.java (100%) rename {demo => core}/src/main/java/com/dite/znpt/service/PersonnelService.java (100%) rename {demo => core}/src/main/java/com/dite/znpt/service/ProjectCompanyService.java (100%) rename {demo => core}/src/main/java/com/dite/znpt/service/ProjectService.java (100%) rename {demo => core}/src/main/java/com/dite/znpt/service/RedisService.java (95%) rename {demo => core}/src/main/java/com/dite/znpt/service/TCompanyService.java (100%) rename {demo => core}/src/main/java/com/dite/znpt/service/TConstructionService.java (100%) rename {demo => core}/src/main/java/com/dite/znpt/service/TurbineService.java (100%) rename {demo => core}/src/main/java/com/dite/znpt/service/WeatherTypeService.java (100%) rename {demo => core}/src/main/java/com/dite/znpt/service/impl/CombinedDictServiceImpl.java (100%) rename {demo => core}/src/main/java/com/dite/znpt/service/impl/CrewServiceImpl.java (100%) rename {demo => core}/src/main/java/com/dite/znpt/service/impl/DefectServiceImpl.java (100%) rename {demo => core}/src/main/java/com/dite/znpt/service/impl/FileInfoServiceImpl.java (100%) rename {demo => core}/src/main/java/com/dite/znpt/service/impl/PartServiceImpl.java (100%) rename {demo => core}/src/main/java/com/dite/znpt/service/impl/PersonnelServiceImpl.java (100%) rename {demo => core}/src/main/java/com/dite/znpt/service/impl/ProjectCompanyServiceImpl.java (100%) rename {demo => core}/src/main/java/com/dite/znpt/service/impl/ProjectServiceImpl.java (100%) rename {demo => core}/src/main/java/com/dite/znpt/service/impl/TCompanyServiceImpl.java (100%) rename {demo => core}/src/main/java/com/dite/znpt/service/impl/TConstructionServiceImpl.java (100%) rename {demo => core}/src/main/java/com/dite/znpt/service/impl/TurbineServiceImpl.java (100%) rename {demo => core}/src/main/java/com/dite/znpt/service/impl/WeatherTypeServiceImpl.java (100%) rename {demo => core}/src/main/java/com/dite/znpt/util/PageUtil.java (100%) rename {demo => core}/src/main/java/com/dite/znpt/util/PasswordUtil.java (100%) rename {demo => core}/src/main/java/com/dite/znpt/util/SqlUtil.java (100%) rename {demo => core}/src/main/resources/mapper/CombinedDictMapper.xml (100%) rename {demo => core}/src/main/resources/mapper/CrewMapper.xml (100%) rename {demo => core}/src/main/resources/mapper/DefectMapper.xml (100%) rename {demo => core}/src/main/resources/mapper/FileInfoMapper.xml (100%) rename {demo => core}/src/main/resources/mapper/PartMapper.xml (100%) rename {demo => core}/src/main/resources/mapper/PersonnelMapper.xml (100%) rename {demo => core}/src/main/resources/mapper/ProjectCompanyMapper.xml (100%) rename {demo => core}/src/main/resources/mapper/ProjectMapper.xml (100%) rename {demo => core}/src/main/resources/mapper/TCompanyMapper.xml (100%) rename {demo => core}/src/main/resources/mapper/TConstructionMapper.xml (100%) rename {demo => core}/src/main/resources/mapper/TurbineMapper.xml (100%) rename {demo => core}/src/main/resources/mapper/WeatherTypeMapper.xml (100%) delete mode 100644 demo/src/test/java/com/example/demo/DiteApplicationTests.java delete mode 100644 sip/target/classes/com/dite/znpt/monitor/media/zlm/cache/MediaServerCache.class delete mode 100644 sip/target/classes/com/dite/znpt/monitor/media/zlm/dto/MediaItem.class delete mode 100644 sip/target/classes/com/dite/znpt/monitor/media/zlm/dto/ServerItem.class delete mode 100644 sip/target/classes/com/dite/znpt/monitor/media/zlm/dto/resp/MediaResp.class delete mode 100644 sip/target/classes/com/dite/znpt/monitor/media/zlm/dto/resp/OriginSock.class delete mode 100644 sip/target/classes/com/dite/znpt/monitor/media/zlm/dto/resp/Track.class delete mode 100644 sip/target/classes/com/dite/znpt/monitor/media/zlm/impl/ZlmApiImpl.class delete mode 100644 sip/target/classes/com/dite/znpt/monitor/sip/SipLayer.class diff --git a/.gitignore b/.gitignore index 38c0237..0180830 100644 --- a/.gitignore +++ b/.gitignore @@ -31,3 +31,4 @@ build/ ### VS Code ### .vscode/ +target/ \ No newline at end of file diff --git a/demo/pom.xml b/core/pom.xml similarity index 96% rename from demo/pom.xml rename to core/pom.xml index 37d8c80..0442ebb 100644 --- a/demo/pom.xml +++ b/core/pom.xml @@ -129,6 +129,12 @@ redisson 3.16.0 + + + com.alibaba + fastjson + 1.2.83 + diff --git a/demo/src/main/java/com/dite/znpt/aspect/HttpLogAspect.java b/core/src/main/java/com/dite/znpt/aspect/HttpLogAspect.java similarity index 100% rename from demo/src/main/java/com/dite/znpt/aspect/HttpLogAspect.java rename to core/src/main/java/com/dite/znpt/aspect/HttpLogAspect.java diff --git a/demo/src/main/java/com/dite/znpt/config/BeanPostProcessorConfig.java b/core/src/main/java/com/dite/znpt/config/BeanPostProcessorConfig.java similarity index 100% rename from demo/src/main/java/com/dite/znpt/config/BeanPostProcessorConfig.java rename to core/src/main/java/com/dite/znpt/config/BeanPostProcessorConfig.java diff --git a/core/src/main/java/com/dite/znpt/config/FastJson2JsonRedisSerializer.java b/core/src/main/java/com/dite/znpt/config/FastJson2JsonRedisSerializer.java new file mode 100644 index 0000000..2f97761 --- /dev/null +++ b/core/src/main/java/com/dite/znpt/config/FastJson2JsonRedisSerializer.java @@ -0,0 +1,52 @@ +package com.dite.znpt.config; + + +import com.alibaba.fastjson.JSON; +import com.alibaba.fastjson.parser.ParserConfig; +import com.alibaba.fastjson.serializer.SerializerFeature; +import com.fasterxml.jackson.databind.JavaType; +import com.fasterxml.jackson.databind.ObjectMapper; +import com.fasterxml.jackson.databind.type.TypeFactory; +import org.springframework.data.redis.serializer.RedisSerializer; +import org.springframework.data.redis.serializer.SerializationException; +import org.springframework.util.Assert; + +import java.nio.charset.Charset; +import java.nio.charset.StandardCharsets; + +public class FastJson2JsonRedisSerializer implements RedisSerializer { + private ObjectMapper objectMapper = new ObjectMapper(); + public static final Charset DEFAULT_CHARSET; + private Class clazz; + + public FastJson2JsonRedisSerializer(Class clazz) { + this.clazz = clazz; + } + + public byte[] serialize(T t) throws SerializationException { + return t == null ? new byte[0] : JSON.toJSONString(t, new SerializerFeature[]{SerializerFeature.WriteClassName}).getBytes(DEFAULT_CHARSET); + } + + public T deserialize(byte[] bytes) throws SerializationException { + if (bytes != null && bytes.length > 0) { + String str = new String(bytes, DEFAULT_CHARSET); + return JSON.parseObject(str, this.clazz); + } else { + return null; + } + } + + public void setObjectMapper(ObjectMapper objectMapper) { + Assert.notNull(objectMapper, "'objectMapper' must not be null"); + this.objectMapper = objectMapper; + } + + protected JavaType getJavaType(Class clazz) { + return TypeFactory.defaultInstance().constructType(clazz); + } + + static { + DEFAULT_CHARSET = StandardCharsets.UTF_8; + ParserConfig.getGlobalInstance().setAutoTypeSupport(true); + } +} \ No newline at end of file diff --git a/demo/src/main/java/com/dite/znpt/config/GlobalCorsConfig.java b/core/src/main/java/com/dite/znpt/config/GlobalCorsConfig.java similarity index 100% rename from demo/src/main/java/com/dite/znpt/config/GlobalCorsConfig.java rename to core/src/main/java/com/dite/znpt/config/GlobalCorsConfig.java diff --git a/demo/src/main/java/com/dite/znpt/config/JacksonConfig.java b/core/src/main/java/com/dite/znpt/config/JacksonConfig.java similarity index 100% rename from demo/src/main/java/com/dite/znpt/config/JacksonConfig.java rename to core/src/main/java/com/dite/znpt/config/JacksonConfig.java diff --git a/core/src/main/java/com/dite/znpt/config/RedisConfig.java b/core/src/main/java/com/dite/znpt/config/RedisConfig.java new file mode 100644 index 0000000..11d1cbf --- /dev/null +++ b/core/src/main/java/com/dite/znpt/config/RedisConfig.java @@ -0,0 +1,63 @@ +package com.dite.znpt.config; + +import com.fasterxml.jackson.annotation.JsonAutoDetect; +import com.fasterxml.jackson.annotation.JsonTypeInfo; +import com.fasterxml.jackson.annotation.PropertyAccessor; +import com.fasterxml.jackson.databind.ObjectMapper; +import com.fasterxml.jackson.databind.jsontype.impl.LaissezFaireSubTypeValidator; +import org.springframework.beans.factory.annotation.Value; +import org.springframework.cache.annotation.CachingConfigurerSupport; +import org.springframework.cache.annotation.EnableCaching; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; +import org.springframework.context.annotation.Primary; +import org.springframework.data.redis.cache.RedisCacheConfiguration; +import org.springframework.data.redis.cache.RedisCacheManager; +import org.springframework.data.redis.cache.RedisCacheWriter; +import org.springframework.data.redis.connection.RedisConnectionFactory; +import org.springframework.data.redis.core.RedisTemplate; +import org.springframework.data.redis.core.script.DefaultRedisScript; +import org.springframework.data.redis.serializer.Jackson2JsonRedisSerializer; +import org.springframework.data.redis.serializer.RedisSerializationContext; +import org.springframework.data.redis.serializer.StringRedisSerializer; +import org.springframework.stereotype.Component; + +import java.util.Objects; + +@Configuration +@EnableCaching +public class RedisConfig extends CachingConfigurerSupport { + + public RedisConfig() { + } + + @Bean + @Primary + public RedisTemplate redisTemplate(RedisConnectionFactory connectionFactory) { + RedisTemplate template = new RedisTemplate(); + template.setConnectionFactory(connectionFactory); + FastJson2JsonRedisSerializer serializer = new FastJson2JsonRedisSerializer(Object.class); + ObjectMapper mapper = new ObjectMapper(); + mapper.setVisibility(PropertyAccessor.ALL, JsonAutoDetect.Visibility.ANY); + mapper.activateDefaultTyping(LaissezFaireSubTypeValidator.instance, ObjectMapper.DefaultTyping.NON_FINAL, JsonTypeInfo.As.PROPERTY); + serializer.setObjectMapper(mapper); + template.setKeySerializer(new StringRedisSerializer()); + template.setValueSerializer(serializer); + template.setHashKeySerializer(new StringRedisSerializer()); + template.setHashValueSerializer(serializer); + template.afterPropertiesSet(); + return template; + } + + @Bean + public DefaultRedisScript limitScript() { + DefaultRedisScript redisScript = new DefaultRedisScript(); + redisScript.setScriptText(this.limitScriptText()); + redisScript.setResultType(Long.class); + return redisScript; + } + + private String limitScriptText() { + return "local key = KEYS[1]\nlocal count = tonumber(ARGV[1])\nlocal time = tonumber(ARGV[2])\nlocal current = redis.call('get', key);\nif current and tonumber(current) > count then\n return tonumber(current);\nend\ncurrent = redis.call('incr', key)\nif tonumber(current) == 1 then\n redis.call('expire', key, time)\nend\nreturn tonumber(current);"; + } +} diff --git a/demo/src/main/java/com/dite/znpt/config/SaTokenConfigure.java b/core/src/main/java/com/dite/znpt/config/SaTokenConfigure.java similarity index 100% rename from demo/src/main/java/com/dite/znpt/config/SaTokenConfigure.java rename to core/src/main/java/com/dite/znpt/config/SaTokenConfigure.java diff --git a/demo/src/main/java/com/dite/znpt/config/SwaggerConfig.java b/core/src/main/java/com/dite/znpt/config/SwaggerConfig.java similarity index 100% rename from demo/src/main/java/com/dite/znpt/config/SwaggerConfig.java rename to core/src/main/java/com/dite/znpt/config/SwaggerConfig.java diff --git a/demo/src/main/java/com/dite/znpt/config/WebMvcConfig.java b/core/src/main/java/com/dite/znpt/config/WebMvcConfig.java similarity index 100% rename from demo/src/main/java/com/dite/znpt/config/WebMvcConfig.java rename to core/src/main/java/com/dite/znpt/config/WebMvcConfig.java diff --git a/demo/src/main/java/com/dite/znpt/domain/AuditableEntity.java b/core/src/main/java/com/dite/znpt/domain/AuditableEntity.java similarity index 100% rename from demo/src/main/java/com/dite/znpt/domain/AuditableEntity.java rename to core/src/main/java/com/dite/znpt/domain/AuditableEntity.java diff --git a/demo/src/main/java/com/dite/znpt/domain/Constants.java b/core/src/main/java/com/dite/znpt/domain/Constants.java similarity index 100% rename from demo/src/main/java/com/dite/znpt/domain/Constants.java rename to core/src/main/java/com/dite/znpt/domain/Constants.java diff --git a/demo/src/main/java/com/dite/znpt/domain/PageResult.java b/core/src/main/java/com/dite/znpt/domain/PageResult.java similarity index 100% rename from demo/src/main/java/com/dite/znpt/domain/PageResult.java rename to core/src/main/java/com/dite/znpt/domain/PageResult.java diff --git a/demo/src/main/java/com/dite/znpt/domain/Result.java b/core/src/main/java/com/dite/znpt/domain/Result.java similarity index 100% rename from demo/src/main/java/com/dite/znpt/domain/Result.java rename to core/src/main/java/com/dite/znpt/domain/Result.java diff --git a/demo/src/main/java/com/dite/znpt/domain/entity/CombinedDictEntity.java b/core/src/main/java/com/dite/znpt/domain/entity/CombinedDictEntity.java similarity index 100% rename from demo/src/main/java/com/dite/znpt/domain/entity/CombinedDictEntity.java rename to core/src/main/java/com/dite/znpt/domain/entity/CombinedDictEntity.java diff --git a/demo/src/main/java/com/dite/znpt/domain/entity/CrewEntity.java b/core/src/main/java/com/dite/znpt/domain/entity/CrewEntity.java similarity index 100% rename from demo/src/main/java/com/dite/znpt/domain/entity/CrewEntity.java rename to core/src/main/java/com/dite/znpt/domain/entity/CrewEntity.java diff --git a/demo/src/main/java/com/dite/znpt/domain/entity/DefectEntity.java b/core/src/main/java/com/dite/znpt/domain/entity/DefectEntity.java similarity index 100% rename from demo/src/main/java/com/dite/znpt/domain/entity/DefectEntity.java rename to core/src/main/java/com/dite/znpt/domain/entity/DefectEntity.java diff --git a/demo/src/main/java/com/dite/znpt/domain/entity/FileInfoEntity.java b/core/src/main/java/com/dite/znpt/domain/entity/FileInfoEntity.java similarity index 100% rename from demo/src/main/java/com/dite/znpt/domain/entity/FileInfoEntity.java rename to core/src/main/java/com/dite/znpt/domain/entity/FileInfoEntity.java diff --git a/demo/src/main/java/com/dite/znpt/domain/entity/PartEntity.java b/core/src/main/java/com/dite/znpt/domain/entity/PartEntity.java similarity index 100% rename from demo/src/main/java/com/dite/znpt/domain/entity/PartEntity.java rename to core/src/main/java/com/dite/znpt/domain/entity/PartEntity.java diff --git a/demo/src/main/java/com/dite/znpt/domain/entity/PersonnelEntity.java b/core/src/main/java/com/dite/znpt/domain/entity/PersonnelEntity.java similarity index 100% rename from demo/src/main/java/com/dite/znpt/domain/entity/PersonnelEntity.java rename to core/src/main/java/com/dite/znpt/domain/entity/PersonnelEntity.java diff --git a/demo/src/main/java/com/dite/znpt/domain/entity/ProjectCompanyEntity.java b/core/src/main/java/com/dite/znpt/domain/entity/ProjectCompanyEntity.java similarity index 100% rename from demo/src/main/java/com/dite/znpt/domain/entity/ProjectCompanyEntity.java rename to core/src/main/java/com/dite/znpt/domain/entity/ProjectCompanyEntity.java diff --git a/demo/src/main/java/com/dite/znpt/domain/entity/ProjectEntity.java b/core/src/main/java/com/dite/znpt/domain/entity/ProjectEntity.java similarity index 100% rename from demo/src/main/java/com/dite/znpt/domain/entity/ProjectEntity.java rename to core/src/main/java/com/dite/znpt/domain/entity/ProjectEntity.java diff --git a/demo/src/main/java/com/dite/znpt/domain/entity/TCompanyEntity.java b/core/src/main/java/com/dite/znpt/domain/entity/TCompanyEntity.java similarity index 100% rename from demo/src/main/java/com/dite/znpt/domain/entity/TCompanyEntity.java rename to core/src/main/java/com/dite/znpt/domain/entity/TCompanyEntity.java diff --git a/demo/src/main/java/com/dite/znpt/domain/entity/TConstructionEntity.java b/core/src/main/java/com/dite/znpt/domain/entity/TConstructionEntity.java similarity index 100% rename from demo/src/main/java/com/dite/znpt/domain/entity/TConstructionEntity.java rename to core/src/main/java/com/dite/znpt/domain/entity/TConstructionEntity.java diff --git a/demo/src/main/java/com/dite/znpt/domain/entity/TurbineEntity.java b/core/src/main/java/com/dite/znpt/domain/entity/TurbineEntity.java similarity index 100% rename from demo/src/main/java/com/dite/znpt/domain/entity/TurbineEntity.java rename to core/src/main/java/com/dite/znpt/domain/entity/TurbineEntity.java diff --git a/demo/src/main/java/com/dite/znpt/domain/entity/WeatherTypeEntity.java b/core/src/main/java/com/dite/znpt/domain/entity/WeatherTypeEntity.java similarity index 100% rename from demo/src/main/java/com/dite/znpt/domain/entity/WeatherTypeEntity.java rename to core/src/main/java/com/dite/znpt/domain/entity/WeatherTypeEntity.java diff --git a/demo/src/main/java/com/dite/znpt/domain/page/PageDomain.java b/core/src/main/java/com/dite/znpt/domain/page/PageDomain.java similarity index 100% rename from demo/src/main/java/com/dite/znpt/domain/page/PageDomain.java rename to core/src/main/java/com/dite/znpt/domain/page/PageDomain.java diff --git a/demo/src/main/java/com/dite/znpt/domain/page/TableSupport.java b/core/src/main/java/com/dite/znpt/domain/page/TableSupport.java similarity index 100% rename from demo/src/main/java/com/dite/znpt/domain/page/TableSupport.java rename to core/src/main/java/com/dite/znpt/domain/page/TableSupport.java diff --git a/demo/src/main/java/com/dite/znpt/domain/vo/CombinedDictListReq.java b/core/src/main/java/com/dite/znpt/domain/vo/CombinedDictListReq.java similarity index 100% rename from demo/src/main/java/com/dite/znpt/domain/vo/CombinedDictListReq.java rename to core/src/main/java/com/dite/znpt/domain/vo/CombinedDictListReq.java diff --git a/demo/src/main/java/com/dite/znpt/domain/vo/CombinedDictResp.java b/core/src/main/java/com/dite/znpt/domain/vo/CombinedDictResp.java similarity index 100% rename from demo/src/main/java/com/dite/znpt/domain/vo/CombinedDictResp.java rename to core/src/main/java/com/dite/znpt/domain/vo/CombinedDictResp.java diff --git a/demo/src/main/java/com/dite/znpt/domain/vo/CrewListReq.java b/core/src/main/java/com/dite/znpt/domain/vo/CrewListReq.java similarity index 100% rename from demo/src/main/java/com/dite/znpt/domain/vo/CrewListReq.java rename to core/src/main/java/com/dite/znpt/domain/vo/CrewListReq.java diff --git a/demo/src/main/java/com/dite/znpt/domain/vo/CrewResp.java b/core/src/main/java/com/dite/znpt/domain/vo/CrewResp.java similarity index 100% rename from demo/src/main/java/com/dite/znpt/domain/vo/CrewResp.java rename to core/src/main/java/com/dite/znpt/domain/vo/CrewResp.java diff --git a/demo/src/main/java/com/dite/znpt/domain/vo/DefectListReq.java b/core/src/main/java/com/dite/znpt/domain/vo/DefectListReq.java similarity index 100% rename from demo/src/main/java/com/dite/znpt/domain/vo/DefectListReq.java rename to core/src/main/java/com/dite/znpt/domain/vo/DefectListReq.java diff --git a/demo/src/main/java/com/dite/znpt/domain/vo/DefectResp.java b/core/src/main/java/com/dite/znpt/domain/vo/DefectResp.java similarity index 100% rename from demo/src/main/java/com/dite/znpt/domain/vo/DefectResp.java rename to core/src/main/java/com/dite/znpt/domain/vo/DefectResp.java diff --git a/demo/src/main/java/com/dite/znpt/domain/vo/FileInfoListReq.java b/core/src/main/java/com/dite/znpt/domain/vo/FileInfoListReq.java similarity index 100% rename from demo/src/main/java/com/dite/znpt/domain/vo/FileInfoListReq.java rename to core/src/main/java/com/dite/znpt/domain/vo/FileInfoListReq.java diff --git a/demo/src/main/java/com/dite/znpt/domain/vo/FileInfoResp.java b/core/src/main/java/com/dite/znpt/domain/vo/FileInfoResp.java similarity index 100% rename from demo/src/main/java/com/dite/znpt/domain/vo/FileInfoResp.java rename to core/src/main/java/com/dite/znpt/domain/vo/FileInfoResp.java diff --git a/demo/src/main/java/com/dite/znpt/domain/vo/PartListReq.java b/core/src/main/java/com/dite/znpt/domain/vo/PartListReq.java similarity index 100% rename from demo/src/main/java/com/dite/znpt/domain/vo/PartListReq.java rename to core/src/main/java/com/dite/znpt/domain/vo/PartListReq.java diff --git a/demo/src/main/java/com/dite/znpt/domain/vo/PartResp.java b/core/src/main/java/com/dite/znpt/domain/vo/PartResp.java similarity index 100% rename from demo/src/main/java/com/dite/znpt/domain/vo/PartResp.java rename to core/src/main/java/com/dite/znpt/domain/vo/PartResp.java diff --git a/demo/src/main/java/com/dite/znpt/domain/vo/PersonnelListReq.java b/core/src/main/java/com/dite/znpt/domain/vo/PersonnelListReq.java similarity index 100% rename from demo/src/main/java/com/dite/znpt/domain/vo/PersonnelListReq.java rename to core/src/main/java/com/dite/znpt/domain/vo/PersonnelListReq.java diff --git a/demo/src/main/java/com/dite/znpt/domain/vo/PersonnelResp.java b/core/src/main/java/com/dite/znpt/domain/vo/PersonnelResp.java similarity index 100% rename from demo/src/main/java/com/dite/znpt/domain/vo/PersonnelResp.java rename to core/src/main/java/com/dite/znpt/domain/vo/PersonnelResp.java diff --git a/demo/src/main/java/com/dite/znpt/domain/vo/ProjectCompanyListReq.java b/core/src/main/java/com/dite/znpt/domain/vo/ProjectCompanyListReq.java similarity index 100% rename from demo/src/main/java/com/dite/znpt/domain/vo/ProjectCompanyListReq.java rename to core/src/main/java/com/dite/znpt/domain/vo/ProjectCompanyListReq.java diff --git a/demo/src/main/java/com/dite/znpt/domain/vo/ProjectCompanyResp.java b/core/src/main/java/com/dite/znpt/domain/vo/ProjectCompanyResp.java similarity index 100% rename from demo/src/main/java/com/dite/znpt/domain/vo/ProjectCompanyResp.java rename to core/src/main/java/com/dite/znpt/domain/vo/ProjectCompanyResp.java diff --git a/demo/src/main/java/com/dite/znpt/domain/vo/ProjectListReq.java b/core/src/main/java/com/dite/znpt/domain/vo/ProjectListReq.java similarity index 100% rename from demo/src/main/java/com/dite/znpt/domain/vo/ProjectListReq.java rename to core/src/main/java/com/dite/znpt/domain/vo/ProjectListReq.java diff --git a/demo/src/main/java/com/dite/znpt/domain/vo/ProjectResp.java b/core/src/main/java/com/dite/znpt/domain/vo/ProjectResp.java similarity index 100% rename from demo/src/main/java/com/dite/znpt/domain/vo/ProjectResp.java rename to core/src/main/java/com/dite/znpt/domain/vo/ProjectResp.java diff --git a/demo/src/main/java/com/dite/znpt/domain/vo/TCompanyListReq.java b/core/src/main/java/com/dite/znpt/domain/vo/TCompanyListReq.java similarity index 100% rename from demo/src/main/java/com/dite/znpt/domain/vo/TCompanyListReq.java rename to core/src/main/java/com/dite/znpt/domain/vo/TCompanyListReq.java diff --git a/demo/src/main/java/com/dite/znpt/domain/vo/TCompanyResp.java b/core/src/main/java/com/dite/znpt/domain/vo/TCompanyResp.java similarity index 100% rename from demo/src/main/java/com/dite/znpt/domain/vo/TCompanyResp.java rename to core/src/main/java/com/dite/znpt/domain/vo/TCompanyResp.java diff --git a/demo/src/main/java/com/dite/znpt/domain/vo/TConstructionListReq.java b/core/src/main/java/com/dite/znpt/domain/vo/TConstructionListReq.java similarity index 100% rename from demo/src/main/java/com/dite/znpt/domain/vo/TConstructionListReq.java rename to core/src/main/java/com/dite/znpt/domain/vo/TConstructionListReq.java diff --git a/demo/src/main/java/com/dite/znpt/domain/vo/TConstructionResp.java b/core/src/main/java/com/dite/znpt/domain/vo/TConstructionResp.java similarity index 100% rename from demo/src/main/java/com/dite/znpt/domain/vo/TConstructionResp.java rename to core/src/main/java/com/dite/znpt/domain/vo/TConstructionResp.java diff --git a/demo/src/main/java/com/dite/znpt/domain/vo/TurbineListReq.java b/core/src/main/java/com/dite/znpt/domain/vo/TurbineListReq.java similarity index 100% rename from demo/src/main/java/com/dite/znpt/domain/vo/TurbineListReq.java rename to core/src/main/java/com/dite/znpt/domain/vo/TurbineListReq.java diff --git a/demo/src/main/java/com/dite/znpt/domain/vo/TurbineResp.java b/core/src/main/java/com/dite/znpt/domain/vo/TurbineResp.java similarity index 100% rename from demo/src/main/java/com/dite/znpt/domain/vo/TurbineResp.java rename to core/src/main/java/com/dite/znpt/domain/vo/TurbineResp.java diff --git a/demo/src/main/java/com/dite/znpt/domain/vo/WeatherTypeListReq.java b/core/src/main/java/com/dite/znpt/domain/vo/WeatherTypeListReq.java similarity index 100% rename from demo/src/main/java/com/dite/znpt/domain/vo/WeatherTypeListReq.java rename to core/src/main/java/com/dite/znpt/domain/vo/WeatherTypeListReq.java diff --git a/demo/src/main/java/com/dite/znpt/domain/vo/WeatherTypeResp.java b/core/src/main/java/com/dite/znpt/domain/vo/WeatherTypeResp.java similarity index 100% rename from demo/src/main/java/com/dite/znpt/domain/vo/WeatherTypeResp.java rename to core/src/main/java/com/dite/znpt/domain/vo/WeatherTypeResp.java diff --git a/demo/src/main/java/com/dite/znpt/exception/RestResponseEntityExceptionHandler.java b/core/src/main/java/com/dite/znpt/exception/RestResponseEntityExceptionHandler.java similarity index 100% rename from demo/src/main/java/com/dite/znpt/exception/RestResponseEntityExceptionHandler.java rename to core/src/main/java/com/dite/znpt/exception/RestResponseEntityExceptionHandler.java diff --git a/demo/src/main/java/com/dite/znpt/exception/ServiceException.java b/core/src/main/java/com/dite/znpt/exception/ServiceException.java similarity index 100% rename from demo/src/main/java/com/dite/znpt/exception/ServiceException.java rename to core/src/main/java/com/dite/znpt/exception/ServiceException.java diff --git a/demo/src/main/java/com/dite/znpt/mapper/CombinedDictMapper.java b/core/src/main/java/com/dite/znpt/mapper/CombinedDictMapper.java similarity index 100% rename from demo/src/main/java/com/dite/znpt/mapper/CombinedDictMapper.java rename to core/src/main/java/com/dite/znpt/mapper/CombinedDictMapper.java diff --git a/demo/src/main/java/com/dite/znpt/mapper/CrewMapper.java b/core/src/main/java/com/dite/znpt/mapper/CrewMapper.java similarity index 100% rename from demo/src/main/java/com/dite/znpt/mapper/CrewMapper.java rename to core/src/main/java/com/dite/znpt/mapper/CrewMapper.java diff --git a/demo/src/main/java/com/dite/znpt/mapper/DefectMapper.java b/core/src/main/java/com/dite/znpt/mapper/DefectMapper.java similarity index 100% rename from demo/src/main/java/com/dite/znpt/mapper/DefectMapper.java rename to core/src/main/java/com/dite/znpt/mapper/DefectMapper.java diff --git a/demo/src/main/java/com/dite/znpt/mapper/FileInfoMapper.java b/core/src/main/java/com/dite/znpt/mapper/FileInfoMapper.java similarity index 100% rename from demo/src/main/java/com/dite/znpt/mapper/FileInfoMapper.java rename to core/src/main/java/com/dite/znpt/mapper/FileInfoMapper.java diff --git a/demo/src/main/java/com/dite/znpt/mapper/PartMapper.java b/core/src/main/java/com/dite/znpt/mapper/PartMapper.java similarity index 100% rename from demo/src/main/java/com/dite/znpt/mapper/PartMapper.java rename to core/src/main/java/com/dite/znpt/mapper/PartMapper.java diff --git a/demo/src/main/java/com/dite/znpt/mapper/PersonnelMapper.java b/core/src/main/java/com/dite/znpt/mapper/PersonnelMapper.java similarity index 100% rename from demo/src/main/java/com/dite/znpt/mapper/PersonnelMapper.java rename to core/src/main/java/com/dite/znpt/mapper/PersonnelMapper.java diff --git a/demo/src/main/java/com/dite/znpt/mapper/ProjectCompanyMapper.java b/core/src/main/java/com/dite/znpt/mapper/ProjectCompanyMapper.java similarity index 100% rename from demo/src/main/java/com/dite/znpt/mapper/ProjectCompanyMapper.java rename to core/src/main/java/com/dite/znpt/mapper/ProjectCompanyMapper.java diff --git a/demo/src/main/java/com/dite/znpt/mapper/ProjectMapper.java b/core/src/main/java/com/dite/znpt/mapper/ProjectMapper.java similarity index 100% rename from demo/src/main/java/com/dite/znpt/mapper/ProjectMapper.java rename to core/src/main/java/com/dite/znpt/mapper/ProjectMapper.java diff --git a/demo/src/main/java/com/dite/znpt/mapper/TCompanyMapper.java b/core/src/main/java/com/dite/znpt/mapper/TCompanyMapper.java similarity index 100% rename from demo/src/main/java/com/dite/znpt/mapper/TCompanyMapper.java rename to core/src/main/java/com/dite/znpt/mapper/TCompanyMapper.java diff --git a/demo/src/main/java/com/dite/znpt/mapper/TConstructionMapper.java b/core/src/main/java/com/dite/znpt/mapper/TConstructionMapper.java similarity index 100% rename from demo/src/main/java/com/dite/znpt/mapper/TConstructionMapper.java rename to core/src/main/java/com/dite/znpt/mapper/TConstructionMapper.java diff --git a/demo/src/main/java/com/dite/znpt/mapper/TurbineMapper.java b/core/src/main/java/com/dite/znpt/mapper/TurbineMapper.java similarity index 100% rename from demo/src/main/java/com/dite/znpt/mapper/TurbineMapper.java rename to core/src/main/java/com/dite/znpt/mapper/TurbineMapper.java diff --git a/demo/src/main/java/com/dite/znpt/mapper/WeatherTypeMapper.java b/core/src/main/java/com/dite/znpt/mapper/WeatherTypeMapper.java similarity index 100% rename from demo/src/main/java/com/dite/znpt/mapper/WeatherTypeMapper.java rename to core/src/main/java/com/dite/znpt/mapper/WeatherTypeMapper.java diff --git a/demo/src/main/java/com/dite/znpt/service/CombinedDictService.java b/core/src/main/java/com/dite/znpt/service/CombinedDictService.java similarity index 100% rename from demo/src/main/java/com/dite/znpt/service/CombinedDictService.java rename to core/src/main/java/com/dite/znpt/service/CombinedDictService.java diff --git a/demo/src/main/java/com/dite/znpt/service/CrewService.java b/core/src/main/java/com/dite/znpt/service/CrewService.java similarity index 100% rename from demo/src/main/java/com/dite/znpt/service/CrewService.java rename to core/src/main/java/com/dite/znpt/service/CrewService.java diff --git a/demo/src/main/java/com/dite/znpt/service/DefectService.java b/core/src/main/java/com/dite/znpt/service/DefectService.java similarity index 100% rename from demo/src/main/java/com/dite/znpt/service/DefectService.java rename to core/src/main/java/com/dite/znpt/service/DefectService.java diff --git a/demo/src/main/java/com/dite/znpt/service/FileInfoService.java b/core/src/main/java/com/dite/znpt/service/FileInfoService.java similarity index 100% rename from demo/src/main/java/com/dite/znpt/service/FileInfoService.java rename to core/src/main/java/com/dite/znpt/service/FileInfoService.java diff --git a/demo/src/main/java/com/dite/znpt/service/PartService.java b/core/src/main/java/com/dite/znpt/service/PartService.java similarity index 100% rename from demo/src/main/java/com/dite/znpt/service/PartService.java rename to core/src/main/java/com/dite/znpt/service/PartService.java diff --git a/demo/src/main/java/com/dite/znpt/service/PersonnelService.java b/core/src/main/java/com/dite/znpt/service/PersonnelService.java similarity index 100% rename from demo/src/main/java/com/dite/znpt/service/PersonnelService.java rename to core/src/main/java/com/dite/znpt/service/PersonnelService.java diff --git a/demo/src/main/java/com/dite/znpt/service/ProjectCompanyService.java b/core/src/main/java/com/dite/znpt/service/ProjectCompanyService.java similarity index 100% rename from demo/src/main/java/com/dite/znpt/service/ProjectCompanyService.java rename to core/src/main/java/com/dite/znpt/service/ProjectCompanyService.java diff --git a/demo/src/main/java/com/dite/znpt/service/ProjectService.java b/core/src/main/java/com/dite/znpt/service/ProjectService.java similarity index 100% rename from demo/src/main/java/com/dite/znpt/service/ProjectService.java rename to core/src/main/java/com/dite/znpt/service/ProjectService.java diff --git a/demo/src/main/java/com/dite/znpt/service/RedisService.java b/core/src/main/java/com/dite/znpt/service/RedisService.java similarity index 95% rename from demo/src/main/java/com/dite/znpt/service/RedisService.java rename to core/src/main/java/com/dite/znpt/service/RedisService.java index 35aba12..485ba3d 100644 --- a/demo/src/main/java/com/dite/znpt/service/RedisService.java +++ b/core/src/main/java/com/dite/znpt/service/RedisService.java @@ -1,10 +1,17 @@ package com.dite.znpt.service; +import com.fasterxml.jackson.annotation.JsonAutoDetect; +import com.fasterxml.jackson.annotation.PropertyAccessor; +import com.fasterxml.jackson.databind.ObjectMapper; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.context.annotation.Bean; +import org.springframework.data.redis.connection.RedisConnectionFactory; import org.springframework.data.redis.core.BoundSetOperations; import org.springframework.data.redis.core.HashOperations; import org.springframework.data.redis.core.RedisTemplate; import org.springframework.data.redis.core.ValueOperations; +import org.springframework.data.redis.serializer.Jackson2JsonRedisSerializer; +import org.springframework.data.redis.serializer.StringRedisSerializer; import org.springframework.stereotype.Component; import java.util.*; diff --git a/demo/src/main/java/com/dite/znpt/service/TCompanyService.java b/core/src/main/java/com/dite/znpt/service/TCompanyService.java similarity index 100% rename from demo/src/main/java/com/dite/znpt/service/TCompanyService.java rename to core/src/main/java/com/dite/znpt/service/TCompanyService.java diff --git a/demo/src/main/java/com/dite/znpt/service/TConstructionService.java b/core/src/main/java/com/dite/znpt/service/TConstructionService.java similarity index 100% rename from demo/src/main/java/com/dite/znpt/service/TConstructionService.java rename to core/src/main/java/com/dite/znpt/service/TConstructionService.java diff --git a/demo/src/main/java/com/dite/znpt/service/TurbineService.java b/core/src/main/java/com/dite/znpt/service/TurbineService.java similarity index 100% rename from demo/src/main/java/com/dite/znpt/service/TurbineService.java rename to core/src/main/java/com/dite/znpt/service/TurbineService.java diff --git a/demo/src/main/java/com/dite/znpt/service/WeatherTypeService.java b/core/src/main/java/com/dite/znpt/service/WeatherTypeService.java similarity index 100% rename from demo/src/main/java/com/dite/znpt/service/WeatherTypeService.java rename to core/src/main/java/com/dite/znpt/service/WeatherTypeService.java diff --git a/demo/src/main/java/com/dite/znpt/service/impl/CombinedDictServiceImpl.java b/core/src/main/java/com/dite/znpt/service/impl/CombinedDictServiceImpl.java similarity index 100% rename from demo/src/main/java/com/dite/znpt/service/impl/CombinedDictServiceImpl.java rename to core/src/main/java/com/dite/znpt/service/impl/CombinedDictServiceImpl.java diff --git a/demo/src/main/java/com/dite/znpt/service/impl/CrewServiceImpl.java b/core/src/main/java/com/dite/znpt/service/impl/CrewServiceImpl.java similarity index 100% rename from demo/src/main/java/com/dite/znpt/service/impl/CrewServiceImpl.java rename to core/src/main/java/com/dite/znpt/service/impl/CrewServiceImpl.java diff --git a/demo/src/main/java/com/dite/znpt/service/impl/DefectServiceImpl.java b/core/src/main/java/com/dite/znpt/service/impl/DefectServiceImpl.java similarity index 100% rename from demo/src/main/java/com/dite/znpt/service/impl/DefectServiceImpl.java rename to core/src/main/java/com/dite/znpt/service/impl/DefectServiceImpl.java diff --git a/demo/src/main/java/com/dite/znpt/service/impl/FileInfoServiceImpl.java b/core/src/main/java/com/dite/znpt/service/impl/FileInfoServiceImpl.java similarity index 100% rename from demo/src/main/java/com/dite/znpt/service/impl/FileInfoServiceImpl.java rename to core/src/main/java/com/dite/znpt/service/impl/FileInfoServiceImpl.java diff --git a/demo/src/main/java/com/dite/znpt/service/impl/PartServiceImpl.java b/core/src/main/java/com/dite/znpt/service/impl/PartServiceImpl.java similarity index 100% rename from demo/src/main/java/com/dite/znpt/service/impl/PartServiceImpl.java rename to core/src/main/java/com/dite/znpt/service/impl/PartServiceImpl.java diff --git a/demo/src/main/java/com/dite/znpt/service/impl/PersonnelServiceImpl.java b/core/src/main/java/com/dite/znpt/service/impl/PersonnelServiceImpl.java similarity index 100% rename from demo/src/main/java/com/dite/znpt/service/impl/PersonnelServiceImpl.java rename to core/src/main/java/com/dite/znpt/service/impl/PersonnelServiceImpl.java diff --git a/demo/src/main/java/com/dite/znpt/service/impl/ProjectCompanyServiceImpl.java b/core/src/main/java/com/dite/znpt/service/impl/ProjectCompanyServiceImpl.java similarity index 100% rename from demo/src/main/java/com/dite/znpt/service/impl/ProjectCompanyServiceImpl.java rename to core/src/main/java/com/dite/znpt/service/impl/ProjectCompanyServiceImpl.java diff --git a/demo/src/main/java/com/dite/znpt/service/impl/ProjectServiceImpl.java b/core/src/main/java/com/dite/znpt/service/impl/ProjectServiceImpl.java similarity index 100% rename from demo/src/main/java/com/dite/znpt/service/impl/ProjectServiceImpl.java rename to core/src/main/java/com/dite/znpt/service/impl/ProjectServiceImpl.java diff --git a/demo/src/main/java/com/dite/znpt/service/impl/TCompanyServiceImpl.java b/core/src/main/java/com/dite/znpt/service/impl/TCompanyServiceImpl.java similarity index 100% rename from demo/src/main/java/com/dite/znpt/service/impl/TCompanyServiceImpl.java rename to core/src/main/java/com/dite/znpt/service/impl/TCompanyServiceImpl.java diff --git a/demo/src/main/java/com/dite/znpt/service/impl/TConstructionServiceImpl.java b/core/src/main/java/com/dite/znpt/service/impl/TConstructionServiceImpl.java similarity index 100% rename from demo/src/main/java/com/dite/znpt/service/impl/TConstructionServiceImpl.java rename to core/src/main/java/com/dite/znpt/service/impl/TConstructionServiceImpl.java diff --git a/demo/src/main/java/com/dite/znpt/service/impl/TurbineServiceImpl.java b/core/src/main/java/com/dite/znpt/service/impl/TurbineServiceImpl.java similarity index 100% rename from demo/src/main/java/com/dite/znpt/service/impl/TurbineServiceImpl.java rename to core/src/main/java/com/dite/znpt/service/impl/TurbineServiceImpl.java diff --git a/demo/src/main/java/com/dite/znpt/service/impl/WeatherTypeServiceImpl.java b/core/src/main/java/com/dite/znpt/service/impl/WeatherTypeServiceImpl.java similarity index 100% rename from demo/src/main/java/com/dite/znpt/service/impl/WeatherTypeServiceImpl.java rename to core/src/main/java/com/dite/znpt/service/impl/WeatherTypeServiceImpl.java diff --git a/demo/src/main/java/com/dite/znpt/util/PageUtil.java b/core/src/main/java/com/dite/znpt/util/PageUtil.java similarity index 100% rename from demo/src/main/java/com/dite/znpt/util/PageUtil.java rename to core/src/main/java/com/dite/znpt/util/PageUtil.java diff --git a/demo/src/main/java/com/dite/znpt/util/PasswordUtil.java b/core/src/main/java/com/dite/znpt/util/PasswordUtil.java similarity index 100% rename from demo/src/main/java/com/dite/znpt/util/PasswordUtil.java rename to core/src/main/java/com/dite/znpt/util/PasswordUtil.java diff --git a/demo/src/main/java/com/dite/znpt/util/SqlUtil.java b/core/src/main/java/com/dite/znpt/util/SqlUtil.java similarity index 100% rename from demo/src/main/java/com/dite/znpt/util/SqlUtil.java rename to core/src/main/java/com/dite/znpt/util/SqlUtil.java diff --git a/demo/src/main/resources/mapper/CombinedDictMapper.xml b/core/src/main/resources/mapper/CombinedDictMapper.xml similarity index 100% rename from demo/src/main/resources/mapper/CombinedDictMapper.xml rename to core/src/main/resources/mapper/CombinedDictMapper.xml diff --git a/demo/src/main/resources/mapper/CrewMapper.xml b/core/src/main/resources/mapper/CrewMapper.xml similarity index 100% rename from demo/src/main/resources/mapper/CrewMapper.xml rename to core/src/main/resources/mapper/CrewMapper.xml diff --git a/demo/src/main/resources/mapper/DefectMapper.xml b/core/src/main/resources/mapper/DefectMapper.xml similarity index 100% rename from demo/src/main/resources/mapper/DefectMapper.xml rename to core/src/main/resources/mapper/DefectMapper.xml diff --git a/demo/src/main/resources/mapper/FileInfoMapper.xml b/core/src/main/resources/mapper/FileInfoMapper.xml similarity index 100% rename from demo/src/main/resources/mapper/FileInfoMapper.xml rename to core/src/main/resources/mapper/FileInfoMapper.xml diff --git a/demo/src/main/resources/mapper/PartMapper.xml b/core/src/main/resources/mapper/PartMapper.xml similarity index 100% rename from demo/src/main/resources/mapper/PartMapper.xml rename to core/src/main/resources/mapper/PartMapper.xml diff --git a/demo/src/main/resources/mapper/PersonnelMapper.xml b/core/src/main/resources/mapper/PersonnelMapper.xml similarity index 100% rename from demo/src/main/resources/mapper/PersonnelMapper.xml rename to core/src/main/resources/mapper/PersonnelMapper.xml diff --git a/demo/src/main/resources/mapper/ProjectCompanyMapper.xml b/core/src/main/resources/mapper/ProjectCompanyMapper.xml similarity index 100% rename from demo/src/main/resources/mapper/ProjectCompanyMapper.xml rename to core/src/main/resources/mapper/ProjectCompanyMapper.xml diff --git a/demo/src/main/resources/mapper/ProjectMapper.xml b/core/src/main/resources/mapper/ProjectMapper.xml similarity index 100% rename from demo/src/main/resources/mapper/ProjectMapper.xml rename to core/src/main/resources/mapper/ProjectMapper.xml diff --git a/demo/src/main/resources/mapper/TCompanyMapper.xml b/core/src/main/resources/mapper/TCompanyMapper.xml similarity index 100% rename from demo/src/main/resources/mapper/TCompanyMapper.xml rename to core/src/main/resources/mapper/TCompanyMapper.xml diff --git a/demo/src/main/resources/mapper/TConstructionMapper.xml b/core/src/main/resources/mapper/TConstructionMapper.xml similarity index 100% rename from demo/src/main/resources/mapper/TConstructionMapper.xml rename to core/src/main/resources/mapper/TConstructionMapper.xml diff --git a/demo/src/main/resources/mapper/TurbineMapper.xml b/core/src/main/resources/mapper/TurbineMapper.xml similarity index 100% rename from demo/src/main/resources/mapper/TurbineMapper.xml rename to core/src/main/resources/mapper/TurbineMapper.xml diff --git a/demo/src/main/resources/mapper/WeatherTypeMapper.xml b/core/src/main/resources/mapper/WeatherTypeMapper.xml similarity index 100% rename from demo/src/main/resources/mapper/WeatherTypeMapper.xml rename to core/src/main/resources/mapper/WeatherTypeMapper.xml diff --git a/demo/src/test/java/com/example/demo/DiteApplicationTests.java b/demo/src/test/java/com/example/demo/DiteApplicationTests.java deleted file mode 100644 index 5ef0a95..0000000 --- a/demo/src/test/java/com/example/demo/DiteApplicationTests.java +++ /dev/null @@ -1,13 +0,0 @@ -package com.example.demo; - -import org.junit.jupiter.api.Test; -import org.springframework.boot.test.context.SpringBootTest; - -@SpringBootTest -class DiteApplicationTests { - - @Test - void contextLoads() { - } - -} diff --git a/pom.xml b/pom.xml index 514a2ed..2eb257b 100644 --- a/pom.xml +++ b/pom.xml @@ -11,7 +11,7 @@ 17 - demo + core sip web diff --git a/sip/pom.xml b/sip/pom.xml index 55a957b..5072c7a 100644 --- a/sip/pom.xml +++ b/sip/pom.xml @@ -43,11 +43,6 @@ dom4j 2.1.3 - - com.alibaba - fastjson - 1.2.83 - org.slf4j log4j-over-slf4j diff --git a/sip/src/main/java/com/dite/znpt/monitor/media/zlm/cache/MediaServerCache.java b/sip/src/main/java/com/dite/znpt/monitor/media/zlm/cache/MediaServerCache.java index 430a48b..f4b8237 100644 --- a/sip/src/main/java/com/dite/znpt/monitor/media/zlm/cache/MediaServerCache.java +++ b/sip/src/main/java/com/dite/znpt/monitor/media/zlm/cache/MediaServerCache.java @@ -16,8 +16,6 @@ import org.springframework.stereotype.Component; @RequiredArgsConstructor(onConstructor = @__(@Autowired)) public class MediaServerCache { private final RedisService redisService; - public final RedisTemplate redisTemplate; - private final String zlm_key = "zlm_media_server"; diff --git a/sip/src/main/java/com/dite/znpt/monitor/media/zlm/dto/MediaItem.java b/sip/src/main/java/com/dite/znpt/monitor/media/zlm/dto/MediaItem.java index c422090..a39c8c4 100644 --- a/sip/src/main/java/com/dite/znpt/monitor/media/zlm/dto/MediaItem.java +++ b/sip/src/main/java/com/dite/znpt/monitor/media/zlm/dto/MediaItem.java @@ -19,6 +19,7 @@ import java.util.List; @NoArgsConstructor @Accessors(chain = true) public class MediaItem implements Serializable { + private static final long serialVersionUID = -6679610697837602559L; /** * 设备编码 */ diff --git a/sip/src/main/java/com/dite/znpt/monitor/media/zlm/dto/ServerItem.java b/sip/src/main/java/com/dite/znpt/monitor/media/zlm/dto/ServerItem.java index 96bf6d6..d590d3f 100644 --- a/sip/src/main/java/com/dite/znpt/monitor/media/zlm/dto/ServerItem.java +++ b/sip/src/main/java/com/dite/znpt/monitor/media/zlm/dto/ServerItem.java @@ -23,6 +23,8 @@ import java.util.Set; @Data @NoArgsConstructor public class ServerItem implements Serializable { + + private static final long serialVersionUID = 2460404295026548536L; /** * 播流最大并发个数 */ diff --git a/sip/src/main/java/com/dite/znpt/monitor/media/zlm/dto/resp/MediaResp.java b/sip/src/main/java/com/dite/znpt/monitor/media/zlm/dto/resp/MediaResp.java index a425cf0..942b099 100644 --- a/sip/src/main/java/com/dite/znpt/monitor/media/zlm/dto/resp/MediaResp.java +++ b/sip/src/main/java/com/dite/znpt/monitor/media/zlm/dto/resp/MediaResp.java @@ -4,6 +4,7 @@ import com.dite.znpt.monitor.media.zlm.dto.event.BaseEventReq; import lombok.Data; import lombok.EqualsAndHashCode; +import java.io.Serializable; import java.util.List; /** @@ -13,7 +14,9 @@ import java.util.List; */ @EqualsAndHashCode(callSuper = true) @Data -public class MediaResp extends BaseEventReq { +public class MediaResp extends BaseEventReq implements Serializable { + private static final long serialVersionUID = -8710934021370904914L; + /** * 本协议观看人数 */ diff --git a/sip/src/main/java/com/dite/znpt/monitor/media/zlm/dto/resp/OriginSock.java b/sip/src/main/java/com/dite/znpt/monitor/media/zlm/dto/resp/OriginSock.java index 37168cc..5ca64f3 100644 --- a/sip/src/main/java/com/dite/znpt/monitor/media/zlm/dto/resp/OriginSock.java +++ b/sip/src/main/java/com/dite/znpt/monitor/media/zlm/dto/resp/OriginSock.java @@ -3,13 +3,17 @@ package com.dite.znpt.monitor.media.zlm.dto.resp; import com.alibaba.fastjson.annotation.JSONField; import lombok.Data; +import java.io.Serializable; + /** * @Author: huise23 * @Date: 2022/8/29 11:20 * @Description: */ @Data -public class OriginSock { +public class OriginSock implements Serializable { + private static final long serialVersionUID = 5628294142872524316L; + private String identifier; @JSONField(name = "local_ip") private String localIp; diff --git a/sip/src/main/java/com/dite/znpt/monitor/media/zlm/dto/resp/Track.java b/sip/src/main/java/com/dite/znpt/monitor/media/zlm/dto/resp/Track.java index 3cdd362..e7307aa 100644 --- a/sip/src/main/java/com/dite/znpt/monitor/media/zlm/dto/resp/Track.java +++ b/sip/src/main/java/com/dite/znpt/monitor/media/zlm/dto/resp/Track.java @@ -3,13 +3,16 @@ package com.dite.znpt.monitor.media.zlm.dto.resp; import com.alibaba.fastjson.annotation.JSONField; import lombok.Data; +import java.io.Serializable; + /** * @Author: huise23 * @Date: 2022/8/29 11:25 * @Description: */ @Data -public class Track { +public class Track implements Serializable { + private static final long serialVersionUID = 5317048895056912057L; /** * 音频通道数 */ diff --git a/sip/src/main/java/com/dite/znpt/monitor/media/zlm/impl/ZlmApiImpl.java b/sip/src/main/java/com/dite/znpt/monitor/media/zlm/impl/ZlmApiImpl.java index 8fb1977..f1e20ce 100644 --- a/sip/src/main/java/com/dite/znpt/monitor/media/zlm/impl/ZlmApiImpl.java +++ b/sip/src/main/java/com/dite/znpt/monitor/media/zlm/impl/ZlmApiImpl.java @@ -1,12 +1,10 @@ package com.dite.znpt.monitor.media.zlm.impl; -import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.lang.Dict; -import cn.hutool.core.map.MapUtil; import cn.hutool.core.util.BooleanUtil; import cn.hutool.core.util.StrUtil; import cn.hutool.http.HttpUtil; -import cn.hutool.json.JSONUtil; +import com.alibaba.fastjson.JSON; import com.dite.znpt.monitor.media.zlm.ZlmApi; import com.dite.znpt.monitor.media.zlm.dto.ServerConfig; import com.dite.znpt.monitor.media.zlm.dto.ServerInfo; @@ -37,8 +35,8 @@ public class ZlmApiImpl implements ZlmApi { log.info("ZLM:" + url); log.info("REQ:" + req); req.setSecret(server.getSecretKey()); - String respStr = HttpUtil.post(url, JSONUtil.toJsonStr(req)); - V resp = JSONUtil.toBean(respStr, clazz); + String respStr = HttpUtil.post(url, JSON.toJSONString(req)); + V resp = JSON.parseObject(respStr, clazz); if (resp.isSuccess()) { return resp; } @@ -173,7 +171,7 @@ public class ZlmApiImpl implements ZlmApi { public void getSnap(ServerInfo server, SnapReq req) throws IOException { String url = StrUtil.format("http://{}:{}/index/api/getSnap", server.getApiHost(), server.getApiPort()); req.setSecret(server.getSecretKey()); - url += "?" + HttpUtil.toParams(BeanUtil.beanToMap(req)); + url += "?" + HttpUtil.toParams(JSON.parseObject(JSON.toJSONString(req))); HttpUtil.download(url, response.getOutputStream(), true); } diff --git a/sip/src/main/java/com/dite/znpt/monitor/sip/SipLayer.java b/sip/src/main/java/com/dite/znpt/monitor/sip/SipLayer.java index f2786fe..ed5874e 100644 --- a/sip/src/main/java/com/dite/znpt/monitor/sip/SipLayer.java +++ b/sip/src/main/java/com/dite/znpt/monitor/sip/SipLayer.java @@ -34,12 +34,6 @@ public class SipLayer { private SipFactory sipFactory; - @PostConstruct - public void initLogging() { - SLF4JBridgeHandler.removeHandlersForRootLogger(); - SLF4JBridgeHandler.install(); - } - @Bean("sipFactory") SipFactory createSipFactory() { sipFactory = SipFactory.getInstance(); @@ -52,7 +46,6 @@ public class SipLayer { SipStack createSipStack() throws PeerUnavailableException { Properties properties = new Properties(); properties.setProperty("javax.sip.STACK_NAME", "GB28181_SIP"); - properties.setProperty("gov.nist.javax.sip.PATH_NAME", "gov.nist"); properties.setProperty("javax.sip.IP_ADDRESS", sipConfig.getIp()); /** * 完整配置参考 gov.nist.javax.sip.SipStackImpl，需要下载源码 @@ -78,8 +71,7 @@ public class SipLayer { if (log.isDebugEnabled()) { properties.setProperty("gov.nist.javax.sip.TRACE_LEVEL", "DEBUG"); } - properties.setProperty("gov.nist.javax.sip.TRACE_LEVEL", "INFO"); -// properties.setProperty("gov.nist.javax.sip.STACK_LOGGER", "gov.nist.core.CommonLoggerSlf4j"); // 通过 SLF4J 桥接 + properties.setProperty("gov.nist.javax.sip.TRACE_LEVEL", "WARN"); sipStack = sipFactory.createSipStack(properties); return sipStack; diff --git a/sip/target/classes/com/dite/znpt/monitor/media/zlm/cache/MediaServerCache.class b/sip/target/classes/com/dite/znpt/monitor/media/zlm/cache/MediaServerCache.class deleted file mode 100644 index 2748741cb857d1bd3e6973f57d34d1d3ebf5e41f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1947 zcmcIlTW=Fb6#m9GapG()I5=%6myqUSZ_-RkS}t`61WQOrhDsP&A}`ToJ(vaWjx{?5 zg{S_cR%(L81LCWC`vB) zvp%irFoqc>33VsN-?2(k7f`@x9*%=Cj5Exg4a6`WNfR6L=k9Ci8HS~D{k3>2ct?b7 z-Z0t^+tofvqE@XmE!m`lizpIE`vl110FcUQlsqmmtR6S>bl_S>@g!o8jSLDD_Gt${ z;75i$@z#}SG2ARyPQ>jjoN576xa{C3Twxg1vLi(#8a%2Ow(i) zR~-C;Rfe&+s-DZB+YyG!YQ3&>n@3%n&zD*R@}1IecuN?;V@>WUEt4WUd{ku^Y546> zn4Ttt7w1RV=(8~`oYRs`;u)){Fft-EP0{HQSFWa7v`p0fP(JMiyHY&g?I zrqI4Ur^1|hc(m=Mp7}n0jIbMlcV-0fbEktF|dcvA5Q8z zhUw!G*y|of;jiz+`i)7nw#_{2g~ktL(~o>g&sG>JBaBbEwb>a|fV)zJ5q~K>nw5K8 z96jJ$J)_?FRGKzB4b{`0eB|2-D4m?3tG0a@+=2L!ky zSrqN?rrkx`HDKVh&tQ$@)NXYCH9pgnr#*E(eQ%PaMlUn8j=KMX74ypn82KkwT&J&{ z6Tl3um+3bFOed=N9k=L2k8m4z2#DDkmIB@;9Y%L!3E%-HK4a={5@cW@hvLiG7|ux) zQ#fYlR|>LC+F8<`bPp&>D`eG-yK;c5Urj5LAHY2Myg=qHVggGs=4|rr$izw9jlI7> z#{NOZTH_W_B`xcHkn)t=54hnL^ZQtGm-oTkm3=H*vTSVhcnX?B$^I((h)PF9r8xZ7 l^HQ9E3^r(=xM(G7M3toE9yaO52I4-g89a!;TSwA|!2gx4089V? diff --git a/sip/target/classes/com/dite/znpt/monitor/media/zlm/dto/MediaItem.class b/sip/target/classes/com/dite/znpt/monitor/media/zlm/dto/MediaItem.class deleted file mode 100644 index 9be430e6aa019a99b75cee3a02e914c8bf88cc26..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 12581 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 diff --git a/sip/target/classes/com/dite/znpt/monitor/media/zlm/dto/resp/OriginSock.class b/sip/target/classes/com/dite/znpt/monitor/media/zlm/dto/resp/OriginSock.class deleted file mode 100644 index e9eca6c111348d21713d98f7f2cb756f35b8efc3..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3501 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 diff --git a/sip/target/classes/com/dite/znpt/monitor/media/zlm/impl/ZlmApiImpl.class b/sip/target/classes/com/dite/znpt/monitor/media/zlm/impl/ZlmApiImpl.class deleted file mode 100644 index 8b44e9ae408457820ed45ccfc4641af78240afe1..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 13644 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 MvpPQJfgC6Le@c?IWB>pF diff --git a/sip/target/classes/com/dite/znpt/monitor/sip/SipLayer.class b/sip/target/classes/com/dite/znpt/monitor/sip/SipLayer.class deleted file mode 100644 index 2f7b7aa34fb670fc2519de6af691453687b62638..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 4231 zcma)A`Fj)B6+L52B#U8Fz$7N5h9tyb@BkrfBDAtJHVU#NB-xZu5Mya92BaBvX5^Sq zn(j?$OX=P;ZPUH!l4iv$>GpH~5BgX1>(}#Uw4+k^VCKzx_uY5Txy!rapZ~f0Hvs$b z_YelKB7i{|EAfbgbr-coO{r*RSxL`d)Qhf!M~)h%;U1H)Vr<7;2tf=55R$PGxWw}YKT-I%&aJ7sz zLR-Kv9apPVLRg3O0fc2diVYGr2%DA^$EYbeqc)`#UCX{KVO3do6Jmo|)FnJNwjh(T>9%X= zP6%7EB8X?2xF=}KL@pnVohYQDGinge@`UNheTViQ+FQsaGD3cbjGY*7oa}2NL5KRB z+{c!VDc|LhAa+Z5q6uxnqt!Db6U`rQSfO;;m&g>N@px9vj9|4n?+lM&AKr6VCcj{^Z5lyL}$CG33otrAv>u&B|xMnH5CFRY8mIEoh-&J~Mx zg_G?N_9HT~3LnQO0*K0(M2soXD3#r*;vJg*1X-yC_5+?d6$f`*-no|o|bxO^ushFB8A~ls3$#zD@r*M|8DB8N_>WrP7s}(OX&>B(S zlU9+Q^598(#i1bMJT&GqqqU)9LwCyivLYypGD=`l2N+}-%Vu@l*cE08)74qj7{Fy* z2*8kW5wvN2yQ(%Mc${Inb6TZNZ7i&bAgUbXW0_U3Pz&JGGHf`E&#t1@w9f~fWZ}_G z7L<%dWfG!&56_)iNzQRlK3@1l(y1l5|XGiJM(R(-Exp(cYf4z3&-nBPJuUtKH<*KMLugUlt zt}&(!bHQRl_3>VZ^BT4J{uy!VHyAs!@k|icdynUApW{Qgfo})!9U0%n_atoUEpaUh zhZyL7S(NZhr-8AG<~U5M-klK%k7w(qYgF|)!!cMMqo!%O^qplgoHsXOPisvoS>3Vf zc2Vcf!I)KIKCDd|rk<)-=XEH0a%HpF*ha?rhCQ03DP@UrlZxYDV6mFQvw z6y}SB(fjSlSdPp4$6-}2y4l_R%-wcsY^w@<}n(;@0eWeoXY6BJ!`UG zGAe?pmY{@v4{Li|ujyvVNeck$99Og5e6b_?w-d|%PiF32?>4u!E7VAXc89%OPx)Y? zaRVLJtO>%i4{=Zc?{+beFiE;mirVFRRX5!h0|C4*VXVzmUKD^DYk10XbM=}S>7@?o z4|zAWrTy$nn6pls(*Ty4Z9>NPS>Cc{H1l$^P&h4R3~bZu1${baOC5BsuQ$KiEUn>O z7ZJgu#Y&?I59PdMnKDFLtZv4)*Q2pf>g!`(61Hx+mutEbv#K@ABrOqkjl*pH!M1-y z^g|pCh^`G1zR&R^eE-0kV|~4Ej`yXv#*Uir0N45BfzKcEOW|AMd*#ksklypee#EC( z23zpg`ILPD{1|WWOTtgMI^b^= zjMoDXcK1#A!Q zG=Ocx-G>Brw+mPhA9+bFa(*i*5`Tum!?*FR4{$^zuH;3XpZA-{++R31fWNlN3;zS+ EzjrHuH~;_u diff --git a/web/src/main/java/com/dite/znpt/web/controller/VideoController.java b/web/src/main/java/com/dite/znpt/web/controller/VideoController.java index b732b96..2eef147 100644 --- a/web/src/main/java/com/dite/znpt/web/controller/VideoController.java +++ b/web/src/main/java/com/dite/znpt/web/controller/VideoController.java @@ -61,14 +61,13 @@ public class VideoController { @ApiOperation(value = "获取信令服务器配置信息", notes = "iot:video:sip:view", httpMethod = "GET") @GetMapping("/sipServerConfig") public Result getSipServerConfig(){ - return Result.ok(sipConfig); + return Result.ok(BeanUtil.copyProperties(sipConfig, SipConfig.class)); } @ApiOperation(value = "获取流媒体服务配置信息", notes = "iot:video:media:view", httpMethod = "GET") @GetMapping("/streamMediaServerConfig") public Result getStreamMediaServerConfig(){ - //streamMediaServerConfigService.getStreamMediaServerConfig() - return Result.ok(streamMediaServerConfigService); + return Result.ok(BeanUtil.copyProperties(streamMediaServerConfigService, StreamMediaServerConfig.class)); } @ApiOperation(value = "查询监控IP配置列表", notes = "iot:config:list", httpMethod = "GET")