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 2748741..0000000 Binary files a/sip/target/classes/com/dite/znpt/monitor/media/zlm/cache/MediaServerCache.class and /dev/null differ 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 9be430e..0000000 Binary files a/sip/target/classes/com/dite/znpt/monitor/media/zlm/dto/MediaItem.class and /dev/null differ diff --git a/sip/target/classes/com/dite/znpt/monitor/media/zlm/dto/ServerItem.class b/sip/target/classes/com/dite/znpt/monitor/media/zlm/dto/ServerItem.class deleted file mode 100644 index 4ed591e..0000000 Binary files a/sip/target/classes/com/dite/znpt/monitor/media/zlm/dto/ServerItem.class and /dev/null differ diff --git a/sip/target/classes/com/dite/znpt/monitor/media/zlm/dto/resp/MediaResp.class b/sip/target/classes/com/dite/znpt/monitor/media/zlm/dto/resp/MediaResp.class deleted file mode 100644 index f2d3fdb..0000000 Binary files a/sip/target/classes/com/dite/znpt/monitor/media/zlm/dto/resp/MediaResp.class and /dev/null differ 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 e9eca6c..0000000 Binary files a/sip/target/classes/com/dite/znpt/monitor/media/zlm/dto/resp/OriginSock.class and /dev/null differ diff --git a/sip/target/classes/com/dite/znpt/monitor/media/zlm/dto/resp/Track.class b/sip/target/classes/com/dite/znpt/monitor/media/zlm/dto/resp/Track.class deleted file mode 100644 index dd64cdc..0000000 Binary files a/sip/target/classes/com/dite/znpt/monitor/media/zlm/dto/resp/Track.class and /dev/null differ 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 8b44e9a..0000000 Binary files a/sip/target/classes/com/dite/znpt/monitor/media/zlm/impl/ZlmApiImpl.class and /dev/null differ 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 2f7b7aa..0000000 Binary files a/sip/target/classes/com/dite/znpt/monitor/sip/SipLayer.class and /dev/null differ 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")