diff --git a/.idea/.name b/.idea/.name index a9959d6..a76aba2 100644 --- a/.idea/.name +++ b/.idea/.name @@ -1 +1 @@ -decode-web-service \ No newline at end of file +irext-private-server \ No newline at end of file diff --git a/decode-service.iml b/decode-service.iml index ab7c2ef..18f7f8d 100644 --- a/decode-service.iml +++ b/decode-service.iml @@ -25,83 +25,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/package/irext-decode-service-0.2.0.jar b/package/irext-decode-service-0.2.0.jar deleted file mode 100644 index a1a721e..0000000 Binary files a/package/irext-decode-service-0.2.0.jar and /dev/null differ diff --git a/pom.xml b/pom.xml index 85d4fd1..aee9282 100644 --- a/pom.xml +++ b/pom.xml @@ -3,12 +3,12 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - net.irext.decoder - irext-decode-service - 0.2.0 + net.irext.server + irext-private-server + 0.2.1 jar - IRext Decode Service + IRext Private Server Decoding IR binaries online diff --git a/src/main/java/net/irext/decode/sdk/IRDecode.java b/src/main/java/net/irext/server/sdk/IRDecode.java similarity index 94% rename from src/main/java/net/irext/decode/sdk/IRDecode.java rename to src/main/java/net/irext/server/sdk/IRDecode.java index 2ca60a7..3c8149e 100644 --- a/src/main/java/net/irext/decode/sdk/IRDecode.java +++ b/src/main/java/net/irext/server/sdk/IRDecode.java @@ -1,9 +1,9 @@ -package net.irext.decode.sdk; +package net.irext.server.sdk; -import net.irext.decode.sdk.bean.ACStatus; -import net.irext.decode.sdk.bean.TemperatureRange; -import net.irext.decode.sdk.utils.Constants; -import net.irext.decode.service.utils.LoggerUtil; +import net.irext.server.sdk.bean.ACStatus; +import net.irext.server.sdk.bean.TemperatureRange; +import net.irext.server.sdk.utils.Constants; +import net.irext.server.service.utils.LoggerUtil; import org.springframework.beans.factory.annotation.Autowired; import javax.servlet.ServletContext; @@ -13,7 +13,7 @@ import javax.servlet.ServletContext; * Revised: Date: 2017-04-22 * Revision: Revision: 1.0 *

- * Description: Wrapper-sdk of IR decode + * Description: Wrapper-sdk of IR server *

* Revision log: * 2017-04-23: created by strawmanbobi @@ -59,7 +59,7 @@ public class IRDecode { private IRDecode() { String libPath = "/data/irext/libirda_decoder.so"; - System.out.println("loading decode library " + libPath); + System.out.println("loading server library " + libPath); System.load(libPath); } diff --git a/src/main/java/net/irext/decode/sdk/bean/ACStatus.java b/src/main/java/net/irext/server/sdk/bean/ACStatus.java similarity index 96% rename from src/main/java/net/irext/decode/sdk/bean/ACStatus.java rename to src/main/java/net/irext/server/sdk/bean/ACStatus.java index 9756e59..895baad 100644 --- a/src/main/java/net/irext/decode/sdk/bean/ACStatus.java +++ b/src/main/java/net/irext/server/sdk/bean/ACStatus.java @@ -1,6 +1,6 @@ -package net.irext.decode.sdk.bean; +package net.irext.server.sdk.bean; -import net.irext.decode.sdk.utils.Constants; +import net.irext.server.sdk.utils.Constants; /** * Filename: ACStatus.java diff --git a/src/main/java/net/irext/decode/sdk/bean/TemperatureRange.java b/src/main/java/net/irext/server/sdk/bean/TemperatureRange.java similarity index 96% rename from src/main/java/net/irext/decode/sdk/bean/TemperatureRange.java rename to src/main/java/net/irext/server/sdk/bean/TemperatureRange.java index d7a848a..791a673 100644 --- a/src/main/java/net/irext/decode/sdk/bean/TemperatureRange.java +++ b/src/main/java/net/irext/server/sdk/bean/TemperatureRange.java @@ -1,4 +1,4 @@ -package net.irext.decode.sdk.bean; +package net.irext.server.sdk.bean; /** * Filename: TemperatureRange.java diff --git a/src/main/java/net/irext/decode/sdk/libs/libirda_decoder.so b/src/main/java/net/irext/server/sdk/libs/libirda_decoder.so similarity index 100% rename from src/main/java/net/irext/decode/sdk/libs/libirda_decoder.so rename to src/main/java/net/irext/server/sdk/libs/libirda_decoder.so diff --git a/src/main/java/net/irext/decode/sdk/utils/Constants.java b/src/main/java/net/irext/server/sdk/utils/Constants.java similarity index 98% rename from src/main/java/net/irext/decode/sdk/utils/Constants.java rename to src/main/java/net/irext/server/sdk/utils/Constants.java index a0ec40b..3403dc5 100644 --- a/src/main/java/net/irext/decode/sdk/utils/Constants.java +++ b/src/main/java/net/irext/server/sdk/utils/Constants.java @@ -1,4 +1,4 @@ -package net.irext.decode.sdk.utils; +package net.irext.server.sdk.utils; /** * Filename: Constants.java @@ -31,7 +31,7 @@ public class Constants { public static final String ERROR_CODE_INVALID_BRAND_TEXT = "invalid brand"; public static final String ERROR_CODE_INVALID_PARAMETER_TEXT = "invalid parameter"; - public static final String ERROR_CODE_INVALID_SESSION_TEXT = "invalid decode session"; + public static final String ERROR_CODE_INVALID_SESSION_TEXT = "invalid server session"; public enum CategoryID { AIR_CONDITIONER(1), diff --git a/src/main/java/net/irext/decode/service/Constants.java b/src/main/java/net/irext/server/service/Constants.java similarity index 99% rename from src/main/java/net/irext/decode/service/Constants.java rename to src/main/java/net/irext/server/service/Constants.java index afcb297..4d8dc08 100644 --- a/src/main/java/net/irext/decode/service/Constants.java +++ b/src/main/java/net/irext/server/service/Constants.java @@ -1,4 +1,4 @@ -package net.irext.decode.service; +package net.irext.server.service; /** * Filename: Constants.java diff --git a/src/main/java/net/irext/decode/service/IRDecoderApplication.java b/src/main/java/net/irext/server/service/IRDecoderApplication.java similarity index 89% rename from src/main/java/net/irext/decode/service/IRDecoderApplication.java rename to src/main/java/net/irext/server/service/IRDecoderApplication.java index 2552f7a..8d960b7 100644 --- a/src/main/java/net/irext/decode/service/IRDecoderApplication.java +++ b/src/main/java/net/irext/server/service/IRDecoderApplication.java @@ -1,6 +1,6 @@ -package net.irext.decode.service; +package net.irext.server.service; -import net.irext.decode.service.model.RemoteIndex; +import net.irext.server.service.model.RemoteIndex; import org.apache.ibatis.type.MappedTypes; import org.mybatis.spring.annotation.MapperScan; import org.springframework.boot.SpringApplication; diff --git a/src/main/java/net/irext/decode/service/RedisConfig.java b/src/main/java/net/irext/server/service/RedisConfig.java similarity index 90% rename from src/main/java/net/irext/decode/service/RedisConfig.java rename to src/main/java/net/irext/server/service/RedisConfig.java index 6f35546..b47b933 100644 --- a/src/main/java/net/irext/decode/service/RedisConfig.java +++ b/src/main/java/net/irext/server/service/RedisConfig.java @@ -1,8 +1,8 @@ -package net.irext.decode.service; +package net.irext.server.service; -import net.irext.decode.service.queue.MessagePublisher; -import net.irext.decode.service.queue.MessagePublisherImpl; -import net.irext.decode.service.queue.MessageSubscriber; +import net.irext.server.service.queue.MessagePublisher; +import net.irext.server.service.queue.MessagePublisherImpl; +import net.irext.server.service.queue.MessageSubscriber; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.ComponentScan; import org.springframework.context.annotation.Configuration; diff --git a/src/main/java/net/irext/decode/service/businesslogic/DecodeLogic.java b/src/main/java/net/irext/server/service/businesslogic/DecodeLogic.java similarity index 94% rename from src/main/java/net/irext/decode/service/businesslogic/DecodeLogic.java rename to src/main/java/net/irext/server/service/businesslogic/DecodeLogic.java index fba464e..2b8210b 100644 --- a/src/main/java/net/irext/decode/service/businesslogic/DecodeLogic.java +++ b/src/main/java/net/irext/server/service/businesslogic/DecodeLogic.java @@ -1,18 +1,17 @@ -package net.irext.decode.service.businesslogic; +package net.irext.server.service.businesslogic; import com.squareup.okhttp.*; -import net.irext.decode.sdk.bean.TemperatureRange; -import net.irext.decode.service.cache.IDecodeSessionRepository; -import net.irext.decode.service.cache.IIRBinaryRepository; -import net.irext.decode.service.model.ACParameters; -import net.irext.decode.service.model.RemoteIndex; -import net.irext.decode.service.utils.FileUtil; -import net.irext.decode.service.utils.LoggerUtil; -import net.irext.decode.service.utils.MD5Util; -import net.irext.decode.sdk.IRDecode; -import net.irext.decode.sdk.bean.ACStatus; +import net.irext.server.sdk.bean.TemperatureRange; +import net.irext.server.service.cache.IDecodeSessionRepository; +import net.irext.server.service.cache.IIRBinaryRepository; +import net.irext.server.service.model.ACParameters; +import net.irext.server.service.model.RemoteIndex; +import net.irext.server.service.utils.FileUtil; +import net.irext.server.service.utils.LoggerUtil; +import net.irext.server.service.utils.MD5Util; +import net.irext.server.sdk.IRDecode; +import net.irext.server.sdk.bean.ACStatus; import org.apache.commons.io.IOUtils; -import org.springframework.scheduling.annotation.Async; import javax.servlet.ServletContext; import java.io.File; diff --git a/src/main/java/net/irext/decode/service/businesslogic/IndexLogic.java b/src/main/java/net/irext/server/service/businesslogic/IndexLogic.java similarity index 87% rename from src/main/java/net/irext/decode/service/businesslogic/IndexLogic.java rename to src/main/java/net/irext/server/service/businesslogic/IndexLogic.java index 8e15e9f..51d4b73 100644 --- a/src/main/java/net/irext/decode/service/businesslogic/IndexLogic.java +++ b/src/main/java/net/irext/server/service/businesslogic/IndexLogic.java @@ -1,7 +1,7 @@ -package net.irext.decode.service.businesslogic; +package net.irext.server.service.businesslogic; -import net.irext.decode.service.mapper.RemoteIndexMapper; -import net.irext.decode.service.model.RemoteIndex; +import net.irext.server.service.mapper.RemoteIndexMapper; +import net.irext.server.service.model.RemoteIndex; import org.springframework.stereotype.Controller; import java.util.List; diff --git a/src/main/java/net/irext/decode/service/cache/IDecodeSessionRepository.java b/src/main/java/net/irext/server/service/cache/IDecodeSessionRepository.java similarity index 92% rename from src/main/java/net/irext/decode/service/cache/IDecodeSessionRepository.java rename to src/main/java/net/irext/server/service/cache/IDecodeSessionRepository.java index 93f68b5..bd531f2 100644 --- a/src/main/java/net/irext/decode/service/cache/IDecodeSessionRepository.java +++ b/src/main/java/net/irext/server/service/cache/IDecodeSessionRepository.java @@ -1,4 +1,4 @@ -package net.irext.decode.service.cache; +package net.irext.server.service.cache; import java.util.Map; diff --git a/src/main/java/net/irext/decode/service/cache/IIRBinaryRepository.java b/src/main/java/net/irext/server/service/cache/IIRBinaryRepository.java similarity index 84% rename from src/main/java/net/irext/decode/service/cache/IIRBinaryRepository.java rename to src/main/java/net/irext/server/service/cache/IIRBinaryRepository.java index 4ff28ad..01f999c 100644 --- a/src/main/java/net/irext/decode/service/cache/IIRBinaryRepository.java +++ b/src/main/java/net/irext/server/service/cache/IIRBinaryRepository.java @@ -1,6 +1,6 @@ -package net.irext.decode.service.cache; +package net.irext.server.service.cache; -import net.irext.decode.service.model.RemoteIndex; +import net.irext.server.service.model.RemoteIndex; import java.util.Map; diff --git a/src/main/java/net/irext/decode/service/cache/impl/DecodeSessionRepositoryImpl.java b/src/main/java/net/irext/server/service/cache/impl/DecodeSessionRepositoryImpl.java similarity index 93% rename from src/main/java/net/irext/decode/service/cache/impl/DecodeSessionRepositoryImpl.java rename to src/main/java/net/irext/server/service/cache/impl/DecodeSessionRepositoryImpl.java index 25a1921..0e06c30 100644 --- a/src/main/java/net/irext/decode/service/cache/impl/DecodeSessionRepositoryImpl.java +++ b/src/main/java/net/irext/server/service/cache/impl/DecodeSessionRepositoryImpl.java @@ -1,6 +1,6 @@ -package net.irext.decode.service.cache.impl; +package net.irext.server.service.cache.impl; -import net.irext.decode.service.cache.IDecodeSessionRepository; +import net.irext.server.service.cache.IDecodeSessionRepository; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.data.redis.core.HashOperations; import org.springframework.data.redis.core.RedisTemplate; diff --git a/src/main/java/net/irext/decode/service/cache/impl/IRBinaryRepositoryImpl.java b/src/main/java/net/irext/server/service/cache/impl/IRBinaryRepositoryImpl.java similarity index 90% rename from src/main/java/net/irext/decode/service/cache/impl/IRBinaryRepositoryImpl.java rename to src/main/java/net/irext/server/service/cache/impl/IRBinaryRepositoryImpl.java index 19964ca..e4719f5 100644 --- a/src/main/java/net/irext/decode/service/cache/impl/IRBinaryRepositoryImpl.java +++ b/src/main/java/net/irext/server/service/cache/impl/IRBinaryRepositoryImpl.java @@ -1,7 +1,7 @@ -package net.irext.decode.service.cache.impl; +package net.irext.server.service.cache.impl; -import net.irext.decode.service.cache.IIRBinaryRepository; -import net.irext.decode.service.model.RemoteIndex; +import net.irext.server.service.cache.IIRBinaryRepository; +import net.irext.server.service.model.RemoteIndex; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.data.redis.core.HashOperations; import org.springframework.data.redis.core.RedisTemplate; diff --git a/src/main/java/net/irext/decode/service/mapper/RemoteIndexMapper.java b/src/main/java/net/irext/server/service/mapper/RemoteIndexMapper.java similarity index 86% rename from src/main/java/net/irext/decode/service/mapper/RemoteIndexMapper.java rename to src/main/java/net/irext/server/service/mapper/RemoteIndexMapper.java index 56750c2..9e0eb07 100644 --- a/src/main/java/net/irext/decode/service/mapper/RemoteIndexMapper.java +++ b/src/main/java/net/irext/server/service/mapper/RemoteIndexMapper.java @@ -1,6 +1,6 @@ -package net.irext.decode.service.mapper; +package net.irext.server.service.mapper; -import net.irext.decode.service.model.RemoteIndex; +import net.irext.server.service.model.RemoteIndex; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.ResultMap; import org.apache.ibatis.annotations.Select; diff --git a/src/main/java/net/irext/decode/service/model/ACParameters.java b/src/main/java/net/irext/server/service/model/ACParameters.java similarity index 98% rename from src/main/java/net/irext/decode/service/model/ACParameters.java rename to src/main/java/net/irext/server/service/model/ACParameters.java index d12a29e..c4872e0 100644 --- a/src/main/java/net/irext/decode/service/model/ACParameters.java +++ b/src/main/java/net/irext/server/service/model/ACParameters.java @@ -1,4 +1,4 @@ -package net.irext.decode.service.model; +package net.irext.server.service.model; /** * Filename: ACParameters.java diff --git a/src/main/java/net/irext/decode/service/model/DecodeSession.java b/src/main/java/net/irext/server/service/model/DecodeSession.java similarity index 95% rename from src/main/java/net/irext/decode/service/model/DecodeSession.java rename to src/main/java/net/irext/server/service/model/DecodeSession.java index 0540b5a..6928273 100644 --- a/src/main/java/net/irext/decode/service/model/DecodeSession.java +++ b/src/main/java/net/irext/server/service/model/DecodeSession.java @@ -1,4 +1,4 @@ -package net.irext.decode.service.model; +package net.irext.server.service.model; /** * Filename: DecodeSession.java diff --git a/src/main/java/net/irext/decode/service/model/IRBinary.java b/src/main/java/net/irext/server/service/model/IRBinary.java similarity index 94% rename from src/main/java/net/irext/decode/service/model/IRBinary.java rename to src/main/java/net/irext/server/service/model/IRBinary.java index 6aabe66..78c7b29 100644 --- a/src/main/java/net/irext/decode/service/model/IRBinary.java +++ b/src/main/java/net/irext/server/service/model/IRBinary.java @@ -1,4 +1,4 @@ -package net.irext.decode.service.model; +package net.irext.server.service.model; /** * Filename: IRBinary.java diff --git a/src/main/java/net/irext/decode/service/model/RemoteIndex.java b/src/main/java/net/irext/server/service/model/RemoteIndex.java similarity index 99% rename from src/main/java/net/irext/decode/service/model/RemoteIndex.java rename to src/main/java/net/irext/server/service/model/RemoteIndex.java index a655c39..e3d0471 100644 --- a/src/main/java/net/irext/decode/service/model/RemoteIndex.java +++ b/src/main/java/net/irext/server/service/model/RemoteIndex.java @@ -1,4 +1,4 @@ -package net.irext.decode.service.model; +package net.irext.server.service.model; import java.io.Serializable; diff --git a/src/main/java/net/irext/decode/service/queue/MessagePublisher.java b/src/main/java/net/irext/server/service/queue/MessagePublisher.java similarity index 88% rename from src/main/java/net/irext/decode/service/queue/MessagePublisher.java rename to src/main/java/net/irext/server/service/queue/MessagePublisher.java index ce06f08..9ed84fc 100644 --- a/src/main/java/net/irext/decode/service/queue/MessagePublisher.java +++ b/src/main/java/net/irext/server/service/queue/MessagePublisher.java @@ -1,4 +1,4 @@ -package net.irext.decode.service.queue; +package net.irext.server.service.queue; /** * Filename: MessagePublisher.java diff --git a/src/main/java/net/irext/decode/service/queue/MessagePublisherImpl.java b/src/main/java/net/irext/server/service/queue/MessagePublisherImpl.java similarity index 96% rename from src/main/java/net/irext/decode/service/queue/MessagePublisherImpl.java rename to src/main/java/net/irext/server/service/queue/MessagePublisherImpl.java index c1df8c5..177f89e 100644 --- a/src/main/java/net/irext/decode/service/queue/MessagePublisherImpl.java +++ b/src/main/java/net/irext/server/service/queue/MessagePublisherImpl.java @@ -1,4 +1,4 @@ -package net.irext.decode.service.queue; +package net.irext.server.service.queue; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.data.redis.core.RedisTemplate; diff --git a/src/main/java/net/irext/decode/service/queue/MessageSubscriber.java b/src/main/java/net/irext/server/service/queue/MessageSubscriber.java similarity index 95% rename from src/main/java/net/irext/decode/service/queue/MessageSubscriber.java rename to src/main/java/net/irext/server/service/queue/MessageSubscriber.java index ecdce73..0badd8f 100644 --- a/src/main/java/net/irext/decode/service/queue/MessageSubscriber.java +++ b/src/main/java/net/irext/server/service/queue/MessageSubscriber.java @@ -1,4 +1,4 @@ -package net.irext.decode.service.queue; +package net.irext.server.service.queue; import org.springframework.data.redis.connection.Message; import org.springframework.data.redis.connection.MessageListener; diff --git a/src/main/java/net/irext/decode/service/request/CloseRequest.java b/src/main/java/net/irext/server/service/request/CloseRequest.java similarity index 86% rename from src/main/java/net/irext/decode/service/request/CloseRequest.java rename to src/main/java/net/irext/server/service/request/CloseRequest.java index 9839fbe..f24729e 100644 --- a/src/main/java/net/irext/decode/service/request/CloseRequest.java +++ b/src/main/java/net/irext/server/service/request/CloseRequest.java @@ -1,11 +1,11 @@ -package net.irext.decode.service.request; +package net.irext.server.service.request; /** * Filename: CloseRequest.java * Revised: Date: 2018-12-18 * Revision: Revision: 1.0 *

- * Description: HTTP decode online + * Description: HTTP server online *

* Revision log: * 2018-12-18: created by strawmanbobi diff --git a/src/main/java/net/irext/decode/service/request/DecodeRequest.java b/src/main/java/net/irext/server/service/request/DecodeRequest.java similarity index 92% rename from src/main/java/net/irext/decode/service/request/DecodeRequest.java rename to src/main/java/net/irext/server/service/request/DecodeRequest.java index 38a0c37..8cdbb71 100644 --- a/src/main/java/net/irext/decode/service/request/DecodeRequest.java +++ b/src/main/java/net/irext/server/service/request/DecodeRequest.java @@ -1,13 +1,13 @@ -package net.irext.decode.service.request; +package net.irext.server.service.request; -import net.irext.decode.sdk.bean.ACStatus; +import net.irext.server.sdk.bean.ACStatus; /** * Filename: DecodeRequest.java * Revised: Date: 2017-05-16 * Revision: Revision: 1.0 *

- * Description: HTTP decode online + * Description: HTTP server online *

* Revision log: * 2017-05-16: created by strawmanbobi diff --git a/src/main/java/net/irext/decode/service/request/DownloadBinaryRequest.java b/src/main/java/net/irext/server/service/request/DownloadBinaryRequest.java similarity index 88% rename from src/main/java/net/irext/decode/service/request/DownloadBinaryRequest.java rename to src/main/java/net/irext/server/service/request/DownloadBinaryRequest.java index 85403bc..dfad5d8 100755 --- a/src/main/java/net/irext/decode/service/request/DownloadBinaryRequest.java +++ b/src/main/java/net/irext/server/service/request/DownloadBinaryRequest.java @@ -1,4 +1,4 @@ -package net.irext.decode.service.request; +package net.irext.server.service.request; /** * Filename: DownloadBinaryRequest.java diff --git a/src/main/java/net/irext/decode/service/request/GetACParametersRequest.java b/src/main/java/net/irext/server/service/request/GetACParametersRequest.java similarity index 92% rename from src/main/java/net/irext/decode/service/request/GetACParametersRequest.java rename to src/main/java/net/irext/server/service/request/GetACParametersRequest.java index 11c2880..7685980 100644 --- a/src/main/java/net/irext/decode/service/request/GetACParametersRequest.java +++ b/src/main/java/net/irext/server/service/request/GetACParametersRequest.java @@ -1,11 +1,11 @@ -package net.irext.decode.service.request; +package net.irext.server.service.request; /** * Filename: GetACParametersRequest.java * Revised: Date: 2017-05-16 * Revision: Revision: 1.0 *

- * Description: HTTP decode online + * Description: HTTP server online *

* Revision log: * 2019-02-14: created by strawmanbobi diff --git a/src/main/java/net/irext/decode/service/request/OpenRequest.java b/src/main/java/net/irext/server/service/request/OpenRequest.java similarity index 87% rename from src/main/java/net/irext/decode/service/request/OpenRequest.java rename to src/main/java/net/irext/server/service/request/OpenRequest.java index b4339eb..f081ae2 100644 --- a/src/main/java/net/irext/decode/service/request/OpenRequest.java +++ b/src/main/java/net/irext/server/service/request/OpenRequest.java @@ -1,11 +1,11 @@ -package net.irext.decode.service.request; +package net.irext.server.service.request; /** * Filename: OpenRequest.java * Revised: Date: 2018-12-18 * Revision: Revision: 1.0 *

- * Description: HTTP decode online + * Description: HTTP server online *

* Revision log: * 2018-12-18: created by strawmanbobi diff --git a/src/main/java/net/irext/decode/service/response/ACParametersResponse.java b/src/main/java/net/irext/server/service/response/ACParametersResponse.java similarity index 88% rename from src/main/java/net/irext/decode/service/response/ACParametersResponse.java rename to src/main/java/net/irext/server/service/response/ACParametersResponse.java index 7278458..3e21639 100644 --- a/src/main/java/net/irext/decode/service/response/ACParametersResponse.java +++ b/src/main/java/net/irext/server/service/response/ACParametersResponse.java @@ -1,6 +1,6 @@ -package net.irext.decode.service.response; +package net.irext.server.service.response; -import net.irext.decode.service.model.ACParameters; +import net.irext.server.service.model.ACParameters; /** * Filename: ACParametersResponse.java diff --git a/src/main/java/net/irext/decode/service/response/DecodeResponse.java b/src/main/java/net/irext/server/service/response/DecodeResponse.java similarity index 87% rename from src/main/java/net/irext/decode/service/response/DecodeResponse.java rename to src/main/java/net/irext/server/service/response/DecodeResponse.java index 10a4be5..50ecfb5 100644 --- a/src/main/java/net/irext/decode/service/response/DecodeResponse.java +++ b/src/main/java/net/irext/server/service/response/DecodeResponse.java @@ -1,11 +1,11 @@ -package net.irext.decode.service.response; +package net.irext.server.service.response; /** * Filename: DecodeResponse.java * Revised: Date: 2017-05-16 * Revision: Revision: 1.0 *

- * Description: Online decode response + * Description: Online server response *

* Revision log: * 2017-05-16: created by strawmanbobi diff --git a/src/main/java/net/irext/decode/service/response/ServiceResponse.java b/src/main/java/net/irext/server/service/response/ServiceResponse.java similarity index 92% rename from src/main/java/net/irext/decode/service/response/ServiceResponse.java rename to src/main/java/net/irext/server/service/response/ServiceResponse.java index 5d41ae6..fe3a129 100644 --- a/src/main/java/net/irext/decode/service/response/ServiceResponse.java +++ b/src/main/java/net/irext/server/service/response/ServiceResponse.java @@ -1,4 +1,4 @@ -package net.irext.decode.service.response; +package net.irext.server.service.response; /** * Filename: ServiceResponse.java diff --git a/src/main/java/net/irext/decode/service/response/Status.java b/src/main/java/net/irext/server/service/response/Status.java similarity index 89% rename from src/main/java/net/irext/decode/service/response/Status.java rename to src/main/java/net/irext/server/service/response/Status.java index 0fe4ce5..1b71503 100644 --- a/src/main/java/net/irext/decode/service/response/Status.java +++ b/src/main/java/net/irext/server/service/response/Status.java @@ -1,6 +1,6 @@ -package net.irext.decode.service.response; +package net.irext.server.service.response; -import net.irext.decode.service.Constants; +import net.irext.server.service.Constants; /** * Filename: Status.java diff --git a/src/main/java/net/irext/decode/service/response/StringResponse.java b/src/main/java/net/irext/server/service/response/StringResponse.java similarity index 93% rename from src/main/java/net/irext/decode/service/response/StringResponse.java rename to src/main/java/net/irext/server/service/response/StringResponse.java index 662d9b8..425dba3 100644 --- a/src/main/java/net/irext/decode/service/response/StringResponse.java +++ b/src/main/java/net/irext/server/service/response/StringResponse.java @@ -1,4 +1,4 @@ -package net.irext.decode.service.response; +package net.irext.server.service.response; /** * Filename: StringResponse.java diff --git a/src/main/java/net/irext/decode/service/restapi/IRDecodeService.java b/src/main/java/net/irext/server/service/restapi/IRDecodeService.java similarity index 88% rename from src/main/java/net/irext/decode/service/restapi/IRDecodeService.java rename to src/main/java/net/irext/server/service/restapi/IRDecodeService.java index c1f89db..cc0dc2e 100644 --- a/src/main/java/net/irext/decode/service/restapi/IRDecodeService.java +++ b/src/main/java/net/irext/server/service/restapi/IRDecodeService.java @@ -1,23 +1,23 @@ -package net.irext.decode.service.restapi; +package net.irext.server.service.restapi; -import net.irext.decode.service.businesslogic.DecodeLogic; -import net.irext.decode.service.cache.IDecodeSessionRepository; -import net.irext.decode.service.cache.IIRBinaryRepository; -import net.irext.decode.service.mapper.RemoteIndexMapper; -import net.irext.decode.service.model.ACParameters; -import net.irext.decode.service.model.DecodeSession; -import net.irext.decode.service.model.RemoteIndex; -import net.irext.decode.service.request.CloseRequest; -import net.irext.decode.service.request.DecodeRequest; -import net.irext.decode.service.request.GetACParametersRequest; -import net.irext.decode.service.request.OpenRequest; -import net.irext.decode.service.response.*; -import net.irext.decode.service.utils.LoggerUtil; -import net.irext.decode.service.utils.MD5Util; -import net.irext.decode.service.businesslogic.IndexLogic; -import net.irext.decode.service.restapi.base.AbstractBaseService; -import net.irext.decode.sdk.bean.ACStatus; -import net.irext.decode.sdk.utils.Constants; +import net.irext.server.service.businesslogic.DecodeLogic; +import net.irext.server.service.cache.IDecodeSessionRepository; +import net.irext.server.service.cache.IIRBinaryRepository; +import net.irext.server.service.mapper.RemoteIndexMapper; +import net.irext.server.service.model.ACParameters; +import net.irext.server.service.model.DecodeSession; +import net.irext.server.service.model.RemoteIndex; +import net.irext.server.service.request.CloseRequest; +import net.irext.server.service.request.DecodeRequest; +import net.irext.server.service.request.GetACParametersRequest; +import net.irext.server.service.request.OpenRequest; +import net.irext.server.service.response.*; +import net.irext.server.service.utils.LoggerUtil; +import net.irext.server.service.utils.MD5Util; +import net.irext.server.service.businesslogic.IndexLogic; +import net.irext.server.service.restapi.base.AbstractBaseService; +import net.irext.server.sdk.bean.ACStatus; +import net.irext.server.sdk.utils.Constants; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.web.bind.annotation.PostMapping; diff --git a/src/main/java/net/irext/decode/service/restapi/base/AbstractBaseService.java b/src/main/java/net/irext/server/service/restapi/base/AbstractBaseService.java similarity index 86% rename from src/main/java/net/irext/decode/service/restapi/base/AbstractBaseService.java rename to src/main/java/net/irext/server/service/restapi/base/AbstractBaseService.java index 4b7027e..f6b9963 100644 --- a/src/main/java/net/irext/decode/service/restapi/base/AbstractBaseService.java +++ b/src/main/java/net/irext/server/service/restapi/base/AbstractBaseService.java @@ -1,8 +1,8 @@ -package net.irext.decode.service.restapi.base; +package net.irext.server.service.restapi.base; -import net.irext.decode.service.Constants; -import net.irext.decode.service.response.ServiceResponse; -import net.irext.decode.service.response.Status; +import net.irext.server.service.Constants; +import net.irext.server.service.response.ServiceResponse; +import net.irext.server.service.response.Status; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; diff --git a/src/main/java/net/irext/decode/service/utils/FileUtil.java b/src/main/java/net/irext/server/service/utils/FileUtil.java similarity index 98% rename from src/main/java/net/irext/decode/service/utils/FileUtil.java rename to src/main/java/net/irext/server/service/utils/FileUtil.java index 5354da7..10cbfab 100644 --- a/src/main/java/net/irext/decode/service/utils/FileUtil.java +++ b/src/main/java/net/irext/server/service/utils/FileUtil.java @@ -1,4 +1,4 @@ -package net.irext.decode.service.utils; +package net.irext.server.service.utils; import java.io.*; diff --git a/src/main/java/net/irext/decode/service/utils/LoggerUtil.java b/src/main/java/net/irext/server/service/utils/LoggerUtil.java similarity index 95% rename from src/main/java/net/irext/decode/service/utils/LoggerUtil.java rename to src/main/java/net/irext/server/service/utils/LoggerUtil.java index 28aea64..e8e48c3 100644 --- a/src/main/java/net/irext/decode/service/utils/LoggerUtil.java +++ b/src/main/java/net/irext/server/service/utils/LoggerUtil.java @@ -1,4 +1,4 @@ -package net.irext.decode.service.utils; +package net.irext.server.service.utils; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/src/main/java/net/irext/decode/service/utils/MD5Util.java b/src/main/java/net/irext/server/service/utils/MD5Util.java similarity index 97% rename from src/main/java/net/irext/decode/service/utils/MD5Util.java rename to src/main/java/net/irext/server/service/utils/MD5Util.java index a2ecb88..d5775d8 100644 --- a/src/main/java/net/irext/decode/service/utils/MD5Util.java +++ b/src/main/java/net/irext/server/service/utils/MD5Util.java @@ -1,4 +1,4 @@ -package net.irext.decode.service.utils; +package net.irext.server.service.utils; import java.security.MessageDigest; diff --git a/src/main/resources/net/irext/decode/service/mapper/RemoteIndexMapper.xml b/src/main/resources/net/irext/server/service/mapper/RemoteIndexMapper.xml similarity index 94% rename from src/main/resources/net/irext/decode/service/mapper/RemoteIndexMapper.xml rename to src/main/resources/net/irext/server/service/mapper/RemoteIndexMapper.xml index fef5e82..adbc2c4 100644 --- a/src/main/resources/net/irext/decode/service/mapper/RemoteIndexMapper.xml +++ b/src/main/resources/net/irext/server/service/mapper/RemoteIndexMapper.xml @@ -1,7 +1,7 @@ - - + +