diff --git a/server/pom.xml b/server/pom.xml index f371e6b..1b96d85 100644 --- a/server/pom.xml +++ b/server/pom.xml @@ -54,7 +54,7 @@ mysql mysql-connector-java - 8.0.16 + 8.0.28 org.mybatis.spring.boot @@ -64,7 +64,7 @@ commons-io commons-io - 2.6 + 2.14.0 redis.clients @@ -78,12 +78,12 @@ com.squareup.okio okio - 2.2.2 + 3.4.0 com.google.code.gson gson - 2.6.2 + 2.8.9 javax.ws.rs diff --git a/server/src/main/java/net/irext/decode/sdk/IRDecode.java b/server/src/main/java/net/irext/decode/sdk/IRDecode.java index 23c2c6a..1099d7a 100644 --- a/server/src/main/java/net/irext/decode/sdk/IRDecode.java +++ b/server/src/main/java/net/irext/decode/sdk/IRDecode.java @@ -3,7 +3,7 @@ package net.irext.decode.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.server.service.utils.LoggerUtil; +import net.irext.server.utils.LoggerUtil; /** * Filename: IRDecode.java diff --git a/server/src/main/java/net/irext/server/service/IRPrivateServerApplication.java b/server/src/main/java/net/irext/server/IRPrivateServerApplication.java similarity index 88% rename from server/src/main/java/net/irext/server/service/IRPrivateServerApplication.java rename to server/src/main/java/net/irext/server/IRPrivateServerApplication.java index 3686423..3df4880 100644 --- a/server/src/main/java/net/irext/server/service/IRPrivateServerApplication.java +++ b/server/src/main/java/net/irext/server/IRPrivateServerApplication.java @@ -1,4 +1,4 @@ -package net.irext.server.service; +package net.irext.server; import org.mybatis.spring.annotation.MapperScan; import org.springframework.boot.SpringApplication; @@ -15,7 +15,7 @@ import org.springframework.boot.autoconfigure.SpringBootApplication; * 2019-06-10: created by strawmanbobi */ -@MapperScan("net.irext.server.service.mapper") +@MapperScan("net.irext.server.mapper") @SpringBootApplication public class IRPrivateServerApplication { public static void main(String[] args) { diff --git a/server/src/main/java/net/irext/server/service/RedisConfig.java b/server/src/main/java/net/irext/server/RedisConfig.java similarity index 90% rename from server/src/main/java/net/irext/server/service/RedisConfig.java rename to server/src/main/java/net/irext/server/RedisConfig.java index b47b933..15fa591 100644 --- a/server/src/main/java/net/irext/server/service/RedisConfig.java +++ b/server/src/main/java/net/irext/server/RedisConfig.java @@ -1,8 +1,8 @@ -package net.irext.server.service; +package net.irext.server; -import net.irext.server.service.queue.MessagePublisher; -import net.irext.server.service.queue.MessagePublisherImpl; -import net.irext.server.service.queue.MessageSubscriber; +import net.irext.server.queue.MessagePublisher; +import net.irext.server.queue.MessagePublisherImpl; +import net.irext.server.queue.MessageSubscriber; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.ComponentScan; import org.springframework.context.annotation.Configuration; diff --git a/server/src/main/java/net/irext/server/service/aspect/TokenValidation.java b/server/src/main/java/net/irext/server/aspect/TokenValidation.java similarity index 82% rename from server/src/main/java/net/irext/server/service/aspect/TokenValidation.java rename to server/src/main/java/net/irext/server/aspect/TokenValidation.java index 7a04f07..96e3042 100644 --- a/server/src/main/java/net/irext/server/service/aspect/TokenValidation.java +++ b/server/src/main/java/net/irext/server/aspect/TokenValidation.java @@ -1,6 +1,6 @@ -package net.irext.server.service.aspect; +package net.irext.server.aspect; -import net.irext.server.service.response.ServiceResponse; +import net.irext.server.response.ServiceResponse; /** * Filename: TokenValidation.java diff --git a/server/src/main/java/net/irext/server/service/businesslogic/IndexingLogic.java b/server/src/main/java/net/irext/server/businesslogic/IndexingLogic.java similarity index 53% rename from server/src/main/java/net/irext/server/service/businesslogic/IndexingLogic.java rename to server/src/main/java/net/irext/server/businesslogic/IndexingLogic.java index ae1dea3..cda993e 100644 --- a/server/src/main/java/net/irext/server/service/businesslogic/IndexingLogic.java +++ b/server/src/main/java/net/irext/server/businesslogic/IndexingLogic.java @@ -1,10 +1,11 @@ -package net.irext.server.service.businesslogic; +package net.irext.server.businesslogic; import com.google.gson.Gson; import com.squareup.okhttp.*; -import net.irext.server.service.Constants; -import net.irext.server.service.mapper.*; -import net.irext.server.service.model.*; +import net.irext.server.request.CreateRemoteReferenceRequest; +import net.irext.server.utils.Constants; +import net.irext.server.mapper.*; +import net.irext.server.model.*; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; @@ -159,43 +160,60 @@ public class IndexingLogic { return remoteIndexList; } - public String statRemoteRef(int remoteIndexId) { + public String statRemoteRef(int remoteIndexId, int id, String token) { List remoteIndexList = remoteIndexMapper.getRemoteIndexById(remoteIndexId); if (null != remoteIndexList && remoteIndexList.size() > 0) { - return statRemoteRef(remoteIndexList.get(0)); + return statRemoteRef(remoteIndexList.get(0), id, token); } return null; } - public String statRemoteRef(RemoteIndex remoteIndex) { + public String statRemoteRef(RemoteIndex remoteIndex, int id, String token) { try { - String url = "http://site.irext.net:8300/irext/stat/stat_remotes"; + String url = Constants.REMOTE_REF_URL; MediaType JSON = MediaType.parse("application/json; charset=utf-8"); OkHttpClient client = new OkHttpClient(); + List categoryList; + List brandList; + String categoryName = null; + String brandName = null; + + categoryList = categoryMapper.getCategoryById(remoteIndex.getCategoryId()); + if (null == categoryList || categoryList.size() <= 0) { + return null; + } + categoryName = categoryList.get(0).getName(); + brandList = brandMapper.getBrandById(remoteIndex.getBrandId()); + if (null == brandList || brandList.size() <= 0) { + return null; + } + brandName = brandList.get(0).getName(); + RemoteRef remoteRef = new RemoteRef(); - remoteRef.setCategory_id(remoteIndex.getCategoryId()); - remoteRef.setCategory_name(remoteIndex.getCategoryName()); - remoteRef.setBrand_id(remoteIndex.getBrandId()); - remoteRef.setBrand_name(remoteIndex.getBrandName()); - remoteRef.setCity_code(remoteIndex.getCityCode()); - remoteRef.setOperator_id(remoteIndex.getOperatorId()); - remoteRef.setRemote_code(remoteIndex.getId().toString()); + remoteRef.setCategoryId(remoteIndex.getCategoryId()); + remoteRef.setCategoryName(categoryName); + remoteRef.setBrandId(remoteIndex.getBrandId()); + remoteRef.setBrandName(brandName); + remoteRef.setCityCode(remoteIndex.getCityCode()); + remoteRef.setOperatorId(remoteIndex.getOperatorId()); + remoteRef.setRemoteCode(remoteIndex.getId().toString()); remoteRef.setRemote(remoteIndex.getRemote()); remoteRef.setProtocol(remoteIndex.getProtocol()); - remoteRef.setRemote_map(remoteIndex.getRemoteMap()); - remoteRef.setStatus(1); - remoteRef.setSub_cate(remoteIndex.getSubCate()); - if (remoteRef.getCategory_id() != Constants.CategoryID.STB.getValue()) { - remoteRef.setName(remoteIndex.getCategoryName() + remoteIndex.getBrandName()); + remoteRef.setRemoteMap(remoteIndex.getRemoteMap()); + remoteRef.setStatus((byte) Constants.STATUS_VALID); + remoteRef.setSubCate(remoteIndex.getSubCate()); + if (remoteRef.getCategoryId() != Constants.CategoryID.STB.getValue()) { + remoteRef.setName(remoteIndex.getBrandName() + categoryName); } else { - remoteRef.setName(remoteIndex.getCategoryName() + remoteIndex.getOperatorName()); + remoteRef.setName(remoteIndex.getOperatorName() + categoryName); } - remoteRef.setCreate_type(1); + remoteRef.setCreateType((byte) Constants.CREATE_TYPE_SOURCE); + CreateRemoteReferenceRequest createRemoteRefRequest = new CreateRemoteReferenceRequest(id, token, remoteRef); - String remoteRefBody = new Gson().toJson(remoteRef); + String remoteRefBody = new Gson().toJson(createRemoteRefRequest); RequestBody body = RequestBody.create(JSON, remoteRefBody); Request request = new Request.Builder() @@ -209,167 +227,4 @@ public class IndexingLogic { } return null; } - - private static class RemoteRef { - String name; - int category_id; - String category_name; - int brand_id; - String brand_name; - String city_code; - String operator_id; - int status; - String remote_code; - int create_type; - String update_time; - int sub_cate; - String protocol; - String remote; - String remote_map; - - public void remoteRef() { - } - - public void remoteRef(String name, - int category_id, String category_name, int brand_id, String brand_name, - String city_code, String operator_id, - int status, String remote_code, int create_type, String update_time, - int sub_cate, String protocol, String remote, String remote_map) { - this.name = name; - this.category_id = category_id; - this.category_name = category_name; - this.brand_id = brand_id; - this.brand_name = brand_name; - this.city_code = city_code; - this.operator_id = operator_id; - this.status = status; - this.remote_code = remote_code; - this.create_type = create_type; - this.update_time = update_time; - this.sub_cate = sub_cate; - this.protocol = protocol; - this.remote = remote; - this.remote_map = remote_map; - } - - public String getName() { - return name; - } - - public void setName(String name) { - this.name = name; - } - - public int getCategory_id() { - return category_id; - } - - public void setCategory_id(int category_id) { - this.category_id = category_id; - } - - public String getCategory_name() { - return category_name; - } - - public void setCategory_name(String category_name) { - this.category_name = category_name; - } - - public int getBrand_id() { - return brand_id; - } - - public void setBrand_id(int brand_id) { - this.brand_id = brand_id; - } - - public String getBrand_name() { - return brand_name; - } - - public void setBrand_name(String brand_name) { - this.brand_name = brand_name; - } - - public String getCity_code() { - return city_code; - } - - public void setCity_code(String city_code) { - this.city_code = city_code; - } - - public String getOperator_id() { - return operator_id; - } - - public void setOperator_id(String operator_id) { - this.operator_id = operator_id; - } - - public int getStatus() { - return status; - } - - public void setStatus(int status) { - this.status = status; - } - - public String getRemote_code() { - return remote_code; - } - - public void setRemote_code(String remote_code) { - this.remote_code = remote_code; - } - - public int getCreate_type() { - return create_type; - } - - public void setCreate_type(int create_type) { - this.create_type = create_type; - } - - public String getUpdate_time() { - return update_time; - } - - public void setUpdate_time(String update_time) { - this.update_time = update_time; - } - - public int getSub_cate() { - return sub_cate; - } - - public void setSub_cate(int sub_cate) { - this.sub_cate = sub_cate; - } - - public String getProtocol() { - return protocol; - } - - public void setProtocol(String protocol) { - this.protocol = protocol; - } - - public String getRemote() { - return remote; - } - - public void setRemote(String remote) { - this.remote = remote; - } - - public String getRemote_map() { - return remote_map; - } - - public void setRemote_map(String remote_map) { - this.remote_map = remote_map; - } - } } diff --git a/server/src/main/java/net/irext/server/service/businesslogic/OperationLogic.java b/server/src/main/java/net/irext/server/businesslogic/OperationLogic.java similarity index 94% rename from server/src/main/java/net/irext/server/service/businesslogic/OperationLogic.java rename to server/src/main/java/net/irext/server/businesslogic/OperationLogic.java index 34dc3db..4d444c0 100644 --- a/server/src/main/java/net/irext/server/service/businesslogic/OperationLogic.java +++ b/server/src/main/java/net/irext/server/businesslogic/OperationLogic.java @@ -1,18 +1,18 @@ -package net.irext.server.service.businesslogic; +package net.irext.server.businesslogic; import com.squareup.okhttp.*; import jakarta.servlet.ServletContext; import net.irext.decode.sdk.bean.TemperatureRange; -import net.irext.server.service.mapper.CollectKeyMapper; -import net.irext.server.service.mapper.DecodeRemoteMapper; -import net.irext.server.service.mapper.RemoteIndexMapper; -import net.irext.server.service.model.ACParameters; -import net.irext.server.service.model.CollectKey; -import net.irext.server.service.model.DecodeRemote; -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.mapper.CollectKeyMapper; +import net.irext.server.mapper.DecodeRemoteMapper; +import net.irext.server.mapper.RemoteIndexMapper; +import net.irext.server.model.ACParameters; +import net.irext.server.model.CollectKey; +import net.irext.server.model.DecodeRemote; +import net.irext.server.model.RemoteIndex; +import net.irext.server.utils.FileUtil; +import net.irext.server.utils.LoggerUtil; +import net.irext.server.utils.MD5Util; import net.irext.decode.sdk.IRDecode; import net.irext.decode.sdk.bean.ACStatus; import org.apache.commons.io.IOUtils; @@ -46,7 +46,7 @@ public class OperationLogic { private static final String IR_BIN_FILE_PREFIX = "irda_"; private static final String IR_BIN_FILE_SUFFIX = ".bin"; - private static final String IR_BIN_DOWNLOAD_PREFIX = "http://irext-debug.oss-cn-hangzhou.aliyuncs.com/"; + private static final String IR_BIN_DOWNLOAD_PREFIX = "https://irext-release.oss-cn-hangzhou.aliyuncs.com/"; private static OperationLogic operationLogic; diff --git a/server/src/main/java/net/irext/server/service/businesslogic/UserLoginLogic.java b/server/src/main/java/net/irext/server/businesslogic/UserLoginLogic.java similarity index 86% rename from server/src/main/java/net/irext/server/service/businesslogic/UserLoginLogic.java rename to server/src/main/java/net/irext/server/businesslogic/UserLoginLogic.java index 6880592..f1bcca7 100644 --- a/server/src/main/java/net/irext/server/service/businesslogic/UserLoginLogic.java +++ b/server/src/main/java/net/irext/server/businesslogic/UserLoginLogic.java @@ -1,10 +1,10 @@ -package net.irext.server.service.businesslogic; +package net.irext.server.businesslogic; import com.google.gson.Gson; import com.squareup.okhttp.*; -import net.irext.server.service.model.UserApp; -import net.irext.server.service.request.AppSignInRequest; -import net.irext.server.service.response.LoginResponse; +import net.irext.server.model.UserApp; +import net.irext.server.request.AppSignInRequest; +import net.irext.server.response.LoginResponse; import org.springframework.stereotype.Controller; /** diff --git a/server/src/main/java/net/irext/server/service/cache/IDecodeSessionRepository.java b/server/src/main/java/net/irext/server/cache/IDecodeSessionRepository.java similarity index 92% rename from server/src/main/java/net/irext/server/service/cache/IDecodeSessionRepository.java rename to server/src/main/java/net/irext/server/cache/IDecodeSessionRepository.java index bd531f2..9be54d3 100644 --- a/server/src/main/java/net/irext/server/service/cache/IDecodeSessionRepository.java +++ b/server/src/main/java/net/irext/server/cache/IDecodeSessionRepository.java @@ -1,4 +1,4 @@ -package net.irext.server.service.cache; +package net.irext.server.cache; import java.util.Map; diff --git a/server/src/main/java/net/irext/server/service/cache/IIRBinaryRepository.java b/server/src/main/java/net/irext/server/cache/IIRBinaryRepository.java similarity index 84% rename from server/src/main/java/net/irext/server/service/cache/IIRBinaryRepository.java rename to server/src/main/java/net/irext/server/cache/IIRBinaryRepository.java index 01f999c..3f5b049 100644 --- a/server/src/main/java/net/irext/server/service/cache/IIRBinaryRepository.java +++ b/server/src/main/java/net/irext/server/cache/IIRBinaryRepository.java @@ -1,6 +1,6 @@ -package net.irext.server.service.cache; +package net.irext.server.cache; -import net.irext.server.service.model.RemoteIndex; +import net.irext.server.model.RemoteIndex; import java.util.Map; diff --git a/server/src/main/java/net/irext/server/service/cache/IUserAppRepository.java b/server/src/main/java/net/irext/server/cache/IUserAppRepository.java similarity index 90% rename from server/src/main/java/net/irext/server/service/cache/IUserAppRepository.java rename to server/src/main/java/net/irext/server/cache/IUserAppRepository.java index d8618c8..66f10e0 100644 --- a/server/src/main/java/net/irext/server/service/cache/IUserAppRepository.java +++ b/server/src/main/java/net/irext/server/cache/IUserAppRepository.java @@ -1,4 +1,4 @@ -package net.irext.server.service.cache; +package net.irext.server.cache; /** * Filename: IUserAppRepository.java diff --git a/server/src/main/java/net/irext/server/service/cache/impl/DecodeSessionRepositoryImpl.java b/server/src/main/java/net/irext/server/cache/impl/DecodeSessionRepositoryImpl.java similarity index 93% rename from server/src/main/java/net/irext/server/service/cache/impl/DecodeSessionRepositoryImpl.java rename to server/src/main/java/net/irext/server/cache/impl/DecodeSessionRepositoryImpl.java index fa16f48..50a8832 100644 --- a/server/src/main/java/net/irext/server/service/cache/impl/DecodeSessionRepositoryImpl.java +++ b/server/src/main/java/net/irext/server/cache/impl/DecodeSessionRepositoryImpl.java @@ -1,7 +1,7 @@ -package net.irext.server.service.cache.impl; +package net.irext.server.cache.impl; import jakarta.annotation.PostConstruct; -import net.irext.server.service.cache.IDecodeSessionRepository; +import net.irext.server.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/server/src/main/java/net/irext/server/service/cache/impl/IRBinaryRepositoryImpl.java b/server/src/main/java/net/irext/server/cache/impl/IRBinaryRepositoryImpl.java similarity index 91% rename from server/src/main/java/net/irext/server/service/cache/impl/IRBinaryRepositoryImpl.java rename to server/src/main/java/net/irext/server/cache/impl/IRBinaryRepositoryImpl.java index 86ffedd..f086386 100644 --- a/server/src/main/java/net/irext/server/service/cache/impl/IRBinaryRepositoryImpl.java +++ b/server/src/main/java/net/irext/server/cache/impl/IRBinaryRepositoryImpl.java @@ -1,9 +1,9 @@ -package net.irext.server.service.cache.impl; +package net.irext.server.cache.impl; import jakarta.annotation.PostConstruct; import jakarta.annotation.Resource; -import net.irext.server.service.cache.IIRBinaryRepository; -import net.irext.server.service.model.RemoteIndex; +import net.irext.server.cache.IIRBinaryRepository; +import net.irext.server.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/server/src/main/java/net/irext/server/service/cache/impl/UserAppRepositoryImpl.java b/server/src/main/java/net/irext/server/cache/impl/UserAppRepositoryImpl.java similarity index 93% rename from server/src/main/java/net/irext/server/service/cache/impl/UserAppRepositoryImpl.java rename to server/src/main/java/net/irext/server/cache/impl/UserAppRepositoryImpl.java index 2743ab8..80ec536 100644 --- a/server/src/main/java/net/irext/server/service/cache/impl/UserAppRepositoryImpl.java +++ b/server/src/main/java/net/irext/server/cache/impl/UserAppRepositoryImpl.java @@ -1,8 +1,8 @@ -package net.irext.server.service.cache.impl; +package net.irext.server.cache.impl; import jakarta.annotation.PostConstruct; import jakarta.annotation.Resource; -import net.irext.server.service.cache.IUserAppRepository; +import net.irext.server.cache.IUserAppRepository; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.data.redis.core.HashOperations; import org.springframework.data.redis.core.RedisTemplate; diff --git a/server/src/main/java/net/irext/server/service/mapper/BrandMapper.java b/server/src/main/java/net/irext/server/mapper/BrandMapper.java similarity index 77% rename from server/src/main/java/net/irext/server/service/mapper/BrandMapper.java rename to server/src/main/java/net/irext/server/mapper/BrandMapper.java index 13833d2..8f2984a 100644 --- a/server/src/main/java/net/irext/server/service/mapper/BrandMapper.java +++ b/server/src/main/java/net/irext/server/mapper/BrandMapper.java @@ -1,6 +1,6 @@ -package net.irext.server.service.mapper; +package net.irext.server.mapper; -import net.irext.server.service.model.Brand; +import net.irext.server.model.Brand; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.ResultMap; import org.apache.ibatis.annotations.Select; @@ -24,4 +24,8 @@ public interface BrandMapper { @Select("SELECT * FROM brand WHERE status = 1 AND category_id = #{categoryId} ORDER BY priority LIMIT #{from}, #{count}") @ResultMap("BaseResultMap") List listBrands(int categoryId, int from, int count); + + @Select("SELECT * FROM brand WHERE id = #{id} AND status = 1") + @ResultMap("BaseResultMap") + List getBrandById(int id); } diff --git a/server/src/main/java/net/irext/server/service/mapper/CategoryMapper.java b/server/src/main/java/net/irext/server/mapper/CategoryMapper.java similarity index 75% rename from server/src/main/java/net/irext/server/service/mapper/CategoryMapper.java rename to server/src/main/java/net/irext/server/mapper/CategoryMapper.java index f71dec5..da6d11f 100644 --- a/server/src/main/java/net/irext/server/service/mapper/CategoryMapper.java +++ b/server/src/main/java/net/irext/server/mapper/CategoryMapper.java @@ -1,6 +1,6 @@ -package net.irext.server.service.mapper; +package net.irext.server.mapper; -import net.irext.server.service.model.Category; +import net.irext.server.model.Category; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.ResultMap; import org.apache.ibatis.annotations.Select; @@ -24,4 +24,8 @@ public interface CategoryMapper { @Select("SELECT * FROM category WHERE status = 1 ORDER BY id LIMIT #{from}, #{count}") @ResultMap("BaseResultMap") List listCategories(int from, int count); + + @Select("SELECT * FROM category WHERE id = #{id} AND status = 1") + @ResultMap("BaseResultMap") + List getCategoryById(int id); } diff --git a/server/src/main/java/net/irext/server/service/mapper/CityMapper.java b/server/src/main/java/net/irext/server/mapper/CityMapper.java similarity index 90% rename from server/src/main/java/net/irext/server/service/mapper/CityMapper.java rename to server/src/main/java/net/irext/server/mapper/CityMapper.java index 8755093..832f913 100644 --- a/server/src/main/java/net/irext/server/service/mapper/CityMapper.java +++ b/server/src/main/java/net/irext/server/mapper/CityMapper.java @@ -1,6 +1,6 @@ -package net.irext.server.service.mapper; +package net.irext.server.mapper; -import net.irext.server.service.model.City; +import net.irext.server.model.City; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.ResultMap; import org.apache.ibatis.annotations.Select; diff --git a/server/src/main/java/net/irext/server/service/mapper/CollectKeyMapper.java b/server/src/main/java/net/irext/server/mapper/CollectKeyMapper.java similarity index 88% rename from server/src/main/java/net/irext/server/service/mapper/CollectKeyMapper.java rename to server/src/main/java/net/irext/server/mapper/CollectKeyMapper.java index b1ea3f7..ef922f9 100644 --- a/server/src/main/java/net/irext/server/service/mapper/CollectKeyMapper.java +++ b/server/src/main/java/net/irext/server/mapper/CollectKeyMapper.java @@ -1,6 +1,6 @@ -package net.irext.server.service.mapper; +package net.irext.server.mapper; -import net.irext.server.service.model.CollectKey; +import net.irext.server.model.CollectKey; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.ResultMap; import org.apache.ibatis.annotations.Select; diff --git a/server/src/main/java/net/irext/server/service/mapper/CollectRemoteMapper.java b/server/src/main/java/net/irext/server/mapper/CollectRemoteMapper.java similarity index 91% rename from server/src/main/java/net/irext/server/service/mapper/CollectRemoteMapper.java rename to server/src/main/java/net/irext/server/mapper/CollectRemoteMapper.java index 5acb68d..6b3dc73 100644 --- a/server/src/main/java/net/irext/server/service/mapper/CollectRemoteMapper.java +++ b/server/src/main/java/net/irext/server/mapper/CollectRemoteMapper.java @@ -1,6 +1,6 @@ -package net.irext.server.service.mapper; +package net.irext.server.mapper; -import net.irext.server.service.model.CollectRemote; +import net.irext.server.model.CollectRemote; import org.apache.ibatis.annotations.*; import org.springframework.stereotype.Controller; diff --git a/server/src/main/java/net/irext/server/service/mapper/DecodeRemoteMapper.java b/server/src/main/java/net/irext/server/mapper/DecodeRemoteMapper.java similarity index 88% rename from server/src/main/java/net/irext/server/service/mapper/DecodeRemoteMapper.java rename to server/src/main/java/net/irext/server/mapper/DecodeRemoteMapper.java index 41d0e6a..73b032b 100644 --- a/server/src/main/java/net/irext/server/service/mapper/DecodeRemoteMapper.java +++ b/server/src/main/java/net/irext/server/mapper/DecodeRemoteMapper.java @@ -1,6 +1,6 @@ -package net.irext.server.service.mapper; +package net.irext.server.mapper; -import net.irext.server.service.model.DecodeRemote; +import net.irext.server.model.DecodeRemote; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.ResultMap; import org.apache.ibatis.annotations.Select; diff --git a/server/src/main/java/net/irext/server/service/mapper/RemoteIndexMapper.java b/server/src/main/java/net/irext/server/mapper/RemoteIndexMapper.java similarity index 92% rename from server/src/main/java/net/irext/server/service/mapper/RemoteIndexMapper.java rename to server/src/main/java/net/irext/server/mapper/RemoteIndexMapper.java index fa27e88..b68dc0c 100644 --- a/server/src/main/java/net/irext/server/service/mapper/RemoteIndexMapper.java +++ b/server/src/main/java/net/irext/server/mapper/RemoteIndexMapper.java @@ -1,6 +1,6 @@ -package net.irext.server.service.mapper; +package net.irext.server.mapper; -import net.irext.server.service.model.RemoteIndex; +import net.irext.server.model.RemoteIndex; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.ResultMap; import org.apache.ibatis.annotations.Select; diff --git a/server/src/main/java/net/irext/server/service/mapper/StbOperatorMapper.java b/server/src/main/java/net/irext/server/mapper/StbOperatorMapper.java similarity index 87% rename from server/src/main/java/net/irext/server/service/mapper/StbOperatorMapper.java rename to server/src/main/java/net/irext/server/mapper/StbOperatorMapper.java index 4e1484f..2b05fc9 100644 --- a/server/src/main/java/net/irext/server/service/mapper/StbOperatorMapper.java +++ b/server/src/main/java/net/irext/server/mapper/StbOperatorMapper.java @@ -1,6 +1,6 @@ -package net.irext.server.service.mapper; +package net.irext.server.mapper; -import net.irext.server.service.model.StbOperator; +import net.irext.server.model.StbOperator; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.ResultMap; import org.apache.ibatis.annotations.Select; diff --git a/server/src/main/java/net/irext/server/service/model/ACParameters.java b/server/src/main/java/net/irext/server/model/ACParameters.java similarity index 98% rename from server/src/main/java/net/irext/server/service/model/ACParameters.java rename to server/src/main/java/net/irext/server/model/ACParameters.java index c4872e0..bf56635 100644 --- a/server/src/main/java/net/irext/server/service/model/ACParameters.java +++ b/server/src/main/java/net/irext/server/model/ACParameters.java @@ -1,4 +1,4 @@ -package net.irext.server.service.model; +package net.irext.server.model; /** * Filename: ACParameters.java diff --git a/server/src/main/java/net/irext/server/service/model/Brand.java b/server/src/main/java/net/irext/server/model/Brand.java similarity index 97% rename from server/src/main/java/net/irext/server/service/model/Brand.java rename to server/src/main/java/net/irext/server/model/Brand.java index 0809499..3ade9d8 100644 --- a/server/src/main/java/net/irext/server/service/model/Brand.java +++ b/server/src/main/java/net/irext/server/model/Brand.java @@ -1,4 +1,4 @@ -package net.irext.server.service.model; +package net.irext.server.model; public class Brand { private Integer id; diff --git a/server/src/main/java/net/irext/server/service/model/Category.java b/server/src/main/java/net/irext/server/model/Category.java similarity index 96% rename from server/src/main/java/net/irext/server/service/model/Category.java rename to server/src/main/java/net/irext/server/model/Category.java index 83fbf59..f12261c 100644 --- a/server/src/main/java/net/irext/server/service/model/Category.java +++ b/server/src/main/java/net/irext/server/model/Category.java @@ -1,4 +1,4 @@ -package net.irext.server.service.model; +package net.irext.server.model; public class Category { private Integer id; diff --git a/server/src/main/java/net/irext/server/service/model/City.java b/server/src/main/java/net/irext/server/model/City.java similarity index 96% rename from server/src/main/java/net/irext/server/service/model/City.java rename to server/src/main/java/net/irext/server/model/City.java index 7a11747..4575087 100644 --- a/server/src/main/java/net/irext/server/service/model/City.java +++ b/server/src/main/java/net/irext/server/model/City.java @@ -1,4 +1,4 @@ -package net.irext.server.service.model; +package net.irext.server.model; public class City { private Integer id; diff --git a/server/src/main/java/net/irext/server/service/model/CollectKey.java b/server/src/main/java/net/irext/server/model/CollectKey.java similarity index 97% rename from server/src/main/java/net/irext/server/service/model/CollectKey.java rename to server/src/main/java/net/irext/server/model/CollectKey.java index ce0f2c3..8defe96 100644 --- a/server/src/main/java/net/irext/server/service/model/CollectKey.java +++ b/server/src/main/java/net/irext/server/model/CollectKey.java @@ -1,4 +1,4 @@ -package net.irext.server.service.model; +package net.irext.server.model; /** * Filename: CollectKey.java diff --git a/server/src/main/java/net/irext/server/service/model/CollectRemote.java b/server/src/main/java/net/irext/server/model/CollectRemote.java similarity index 98% rename from server/src/main/java/net/irext/server/service/model/CollectRemote.java rename to server/src/main/java/net/irext/server/model/CollectRemote.java index 3d5eb43..33426e9 100644 --- a/server/src/main/java/net/irext/server/service/model/CollectRemote.java +++ b/server/src/main/java/net/irext/server/model/CollectRemote.java @@ -1,4 +1,4 @@ -package net.irext.server.service.model; +package net.irext.server.model; public class CollectRemote { diff --git a/server/src/main/java/net/irext/server/service/model/DecodeRemote.java b/server/src/main/java/net/irext/server/model/DecodeRemote.java similarity index 98% rename from server/src/main/java/net/irext/server/service/model/DecodeRemote.java rename to server/src/main/java/net/irext/server/model/DecodeRemote.java index ad58567..f2ce94f 100644 --- a/server/src/main/java/net/irext/server/service/model/DecodeRemote.java +++ b/server/src/main/java/net/irext/server/model/DecodeRemote.java @@ -1,4 +1,4 @@ -package net.irext.server.service.model; +package net.irext.server.model; public class DecodeRemote { diff --git a/server/src/main/java/net/irext/server/service/model/RemoteIndex.java b/server/src/main/java/net/irext/server/model/RemoteIndex.java similarity index 99% rename from server/src/main/java/net/irext/server/service/model/RemoteIndex.java rename to server/src/main/java/net/irext/server/model/RemoteIndex.java index e3d0471..f6753b5 100644 --- a/server/src/main/java/net/irext/server/service/model/RemoteIndex.java +++ b/server/src/main/java/net/irext/server/model/RemoteIndex.java @@ -1,4 +1,4 @@ -package net.irext.server.service.model; +package net.irext.server.model; import java.io.Serializable; diff --git a/server/src/main/java/net/irext/server/model/RemoteRef.java b/server/src/main/java/net/irext/server/model/RemoteRef.java new file mode 100644 index 0000000..746851a --- /dev/null +++ b/server/src/main/java/net/irext/server/model/RemoteRef.java @@ -0,0 +1,163 @@ +package net.irext.server.model; + +public class RemoteRef { + private Integer id; + + private String name; + + private Integer categoryId; + + private String categoryName; + + private Integer brandId; + + private String brandName; + + private String cityCode; + + private String operatorId; + + private Byte status; + + private Byte createType; + + private String updateTime; + + private Byte subCate; + + private String protocol; + + private String remote; + + private String remoteMap; + + private String remoteCode; + + public Integer getId() { + return id; + } + + public void setId(Integer id) { + this.id = id; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public Integer getCategoryId() { + return categoryId; + } + + public void setCategoryId(Integer categoryId) { + this.categoryId = categoryId; + } + + public String getCategoryName() { + return categoryName; + } + + public void setCategoryName(String categoryName) { + this.categoryName = categoryName; + } + + public Integer getBrandId() { + return brandId; + } + + public void setBrandId(Integer brandId) { + this.brandId = brandId; + } + + public String getBrandName() { + return brandName; + } + + public void setBrandName(String brandName) { + this.brandName = brandName; + } + + public String getCityCode() { + return cityCode; + } + + public void setCityCode(String cityCode) { + this.cityCode = cityCode; + } + + public String getOperatorId() { + return operatorId; + } + + public void setOperatorId(String operatorId) { + this.operatorId = operatorId; + } + + public Byte getStatus() { + return status; + } + + public void setStatus(Byte status) { + this.status = status; + } + + public Byte getCreateType() { + return createType; + } + + public void setCreateType(Byte createType) { + this.createType = createType; + } + + public String getUpdateTime() { + return updateTime; + } + + public void setUpdateTime(String updateTime) { + this.updateTime = updateTime; + } + + public Byte getSubCate() { + return subCate; + } + + public void setSubCate(Byte subCate) { + this.subCate = subCate; + } + + public String getProtocol() { + return protocol; + } + + public void setProtocol(String protocol) { + this.protocol = protocol; + } + + public String getRemote() { + return remote; + } + + public void setRemote(String remote) { + this.remote = remote; + } + + public String getRemoteMap() { + return remoteMap; + } + + public void setRemoteMap(String remoteMap) { + this.remoteMap = remoteMap; + } + + public String getRemoteCode() { + return remoteCode; + } + + public void setRemoteCode(String remoteCode) { + this.remoteCode = remoteCode; + } +} \ No newline at end of file diff --git a/server/src/main/java/net/irext/server/service/model/StbOperator.java b/server/src/main/java/net/irext/server/model/StbOperator.java similarity index 97% rename from server/src/main/java/net/irext/server/service/model/StbOperator.java rename to server/src/main/java/net/irext/server/model/StbOperator.java index daacdcf..361889a 100644 --- a/server/src/main/java/net/irext/server/service/model/StbOperator.java +++ b/server/src/main/java/net/irext/server/model/StbOperator.java @@ -1,4 +1,4 @@ -package net.irext.server.service.model; +package net.irext.server.model; public class StbOperator { private Integer id; diff --git a/server/src/main/java/net/irext/server/service/model/UserApp.java b/server/src/main/java/net/irext/server/model/UserApp.java similarity index 98% rename from server/src/main/java/net/irext/server/service/model/UserApp.java rename to server/src/main/java/net/irext/server/model/UserApp.java index c987147..4301e6f 100644 --- a/server/src/main/java/net/irext/server/service/model/UserApp.java +++ b/server/src/main/java/net/irext/server/model/UserApp.java @@ -1,4 +1,4 @@ -package net.irext.server.service.model; +package net.irext.server.model; public class UserApp { diff --git a/server/src/main/java/net/irext/server/service/queue/MessagePublisher.java b/server/src/main/java/net/irext/server/queue/MessagePublisher.java similarity index 88% rename from server/src/main/java/net/irext/server/service/queue/MessagePublisher.java rename to server/src/main/java/net/irext/server/queue/MessagePublisher.java index 9ed84fc..1f36aaf 100644 --- a/server/src/main/java/net/irext/server/service/queue/MessagePublisher.java +++ b/server/src/main/java/net/irext/server/queue/MessagePublisher.java @@ -1,4 +1,4 @@ -package net.irext.server.service.queue; +package net.irext.server.queue; /** * Filename: MessagePublisher.java diff --git a/server/src/main/java/net/irext/server/service/queue/MessagePublisherImpl.java b/server/src/main/java/net/irext/server/queue/MessagePublisherImpl.java similarity index 96% rename from server/src/main/java/net/irext/server/service/queue/MessagePublisherImpl.java rename to server/src/main/java/net/irext/server/queue/MessagePublisherImpl.java index 177f89e..c969c71 100644 --- a/server/src/main/java/net/irext/server/service/queue/MessagePublisherImpl.java +++ b/server/src/main/java/net/irext/server/queue/MessagePublisherImpl.java @@ -1,4 +1,4 @@ -package net.irext.server.service.queue; +package net.irext.server.queue; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.data.redis.core.RedisTemplate; diff --git a/server/src/main/java/net/irext/server/service/queue/MessageSubscriber.java b/server/src/main/java/net/irext/server/queue/MessageSubscriber.java similarity index 95% rename from server/src/main/java/net/irext/server/service/queue/MessageSubscriber.java rename to server/src/main/java/net/irext/server/queue/MessageSubscriber.java index 0badd8f..3951f2a 100644 --- a/server/src/main/java/net/irext/server/service/queue/MessageSubscriber.java +++ b/server/src/main/java/net/irext/server/queue/MessageSubscriber.java @@ -1,4 +1,4 @@ -package net.irext.server.service.queue; +package net.irext.server.queue; import org.springframework.data.redis.connection.Message; import org.springframework.data.redis.connection.MessageListener; diff --git a/server/src/main/java/net/irext/server/service/request/AppSignInRequest.java b/server/src/main/java/net/irext/server/request/AppSignInRequest.java similarity index 97% rename from server/src/main/java/net/irext/server/service/request/AppSignInRequest.java rename to server/src/main/java/net/irext/server/request/AppSignInRequest.java index 637dc96..64f26f6 100644 --- a/server/src/main/java/net/irext/server/service/request/AppSignInRequest.java +++ b/server/src/main/java/net/irext/server/request/AppSignInRequest.java @@ -1,4 +1,4 @@ -package net.irext.server.service.request; +package net.irext.server.request; /** * Filename: AppSignInRequest.java diff --git a/server/src/main/java/net/irext/server/service/request/BaseRequest.java b/server/src/main/java/net/irext/server/request/BaseRequest.java similarity index 95% rename from server/src/main/java/net/irext/server/service/request/BaseRequest.java rename to server/src/main/java/net/irext/server/request/BaseRequest.java index 1f06e9b..5739aa4 100644 --- a/server/src/main/java/net/irext/server/service/request/BaseRequest.java +++ b/server/src/main/java/net/irext/server/request/BaseRequest.java @@ -1,4 +1,4 @@ -package net.irext.server.service.request; +package net.irext.server.request; import com.google.gson.Gson; diff --git a/server/src/main/java/net/irext/server/service/request/CloseRequest.java b/server/src/main/java/net/irext/server/request/CloseRequest.java similarity index 93% rename from server/src/main/java/net/irext/server/service/request/CloseRequest.java rename to server/src/main/java/net/irext/server/request/CloseRequest.java index c821099..98f3924 100644 --- a/server/src/main/java/net/irext/server/service/request/CloseRequest.java +++ b/server/src/main/java/net/irext/server/request/CloseRequest.java @@ -1,4 +1,4 @@ -package net.irext.server.service.request; +package net.irext.server.request; /** * Filename: CloseRequest.java diff --git a/server/src/main/java/net/irext/server/request/CreateRemoteReferenceRequest.java b/server/src/main/java/net/irext/server/request/CreateRemoteReferenceRequest.java new file mode 100644 index 0000000..f95b5f9 --- /dev/null +++ b/server/src/main/java/net/irext/server/request/CreateRemoteReferenceRequest.java @@ -0,0 +1,31 @@ +package net.irext.server.request; + +import net.irext.server.model.RemoteRef; + +/** + * Filename: CreateRemoteReferenceRequest.java + * Revised: Date: 2025-10-24 + * Revision: Revision: 1.0 + *

+ * Description: HTTP API for adding remote reference + *

+ * Revision log: + * 2025-10-24: created by strawmanbobi + */ +public class CreateRemoteReferenceRequest extends BaseRequest { + RemoteRef remoteRef; + + public CreateRemoteReferenceRequest(int id, String token, RemoteRef remoteRef) { + super(id, token); + this.remoteRef = remoteRef; + } + + public CreateRemoteReferenceRequest() { + + } + + public void setRemoteRef(RemoteRef remoteRef) { + this.remoteRef = remoteRef; + } + +} \ No newline at end of file diff --git a/server/src/main/java/net/irext/server/service/request/DecodeRequest.java b/server/src/main/java/net/irext/server/request/DecodeRequest.java similarity index 97% rename from server/src/main/java/net/irext/server/service/request/DecodeRequest.java rename to server/src/main/java/net/irext/server/request/DecodeRequest.java index 24b3d9b..83a22b8 100644 --- a/server/src/main/java/net/irext/server/service/request/DecodeRequest.java +++ b/server/src/main/java/net/irext/server/request/DecodeRequest.java @@ -1,4 +1,4 @@ -package net.irext.server.service.request; +package net.irext.server.request; import net.irext.decode.sdk.bean.ACStatus; diff --git a/server/src/main/java/net/irext/server/service/request/DownloadBinaryRequest.java b/server/src/main/java/net/irext/server/request/DownloadBinaryRequest.java similarity index 93% rename from server/src/main/java/net/irext/server/service/request/DownloadBinaryRequest.java rename to server/src/main/java/net/irext/server/request/DownloadBinaryRequest.java index f8c0663..a01f609 100644 --- a/server/src/main/java/net/irext/server/service/request/DownloadBinaryRequest.java +++ b/server/src/main/java/net/irext/server/request/DownloadBinaryRequest.java @@ -1,4 +1,4 @@ -package net.irext.server.service.request; +package net.irext.server.request; /** * Filename: DownloadBinaryRequest.java diff --git a/server/src/main/java/net/irext/server/service/request/GetACParametersRequest.java b/server/src/main/java/net/irext/server/request/GetACParametersRequest.java similarity index 94% rename from server/src/main/java/net/irext/server/service/request/GetACParametersRequest.java rename to server/src/main/java/net/irext/server/request/GetACParametersRequest.java index 9dacef7..6715a81 100644 --- a/server/src/main/java/net/irext/server/service/request/GetACParametersRequest.java +++ b/server/src/main/java/net/irext/server/request/GetACParametersRequest.java @@ -1,4 +1,4 @@ -package net.irext.server.service.request; +package net.irext.server.request; /** * Filename: GetACParametersRequest.java diff --git a/server/src/main/java/net/irext/server/service/request/ListBrandsRequest.java b/server/src/main/java/net/irext/server/request/ListBrandsRequest.java similarity index 95% rename from server/src/main/java/net/irext/server/service/request/ListBrandsRequest.java rename to server/src/main/java/net/irext/server/request/ListBrandsRequest.java index bf24ec8..0483916 100644 --- a/server/src/main/java/net/irext/server/service/request/ListBrandsRequest.java +++ b/server/src/main/java/net/irext/server/request/ListBrandsRequest.java @@ -1,4 +1,4 @@ -package net.irext.server.service.request; +package net.irext.server.request; /** * Filename: ListBrandsRequest.java diff --git a/server/src/main/java/net/irext/server/service/request/ListCategoriesRequest.java b/server/src/main/java/net/irext/server/request/ListCategoriesRequest.java similarity index 94% rename from server/src/main/java/net/irext/server/service/request/ListCategoriesRequest.java rename to server/src/main/java/net/irext/server/request/ListCategoriesRequest.java index c49644c..0051a34 100644 --- a/server/src/main/java/net/irext/server/service/request/ListCategoriesRequest.java +++ b/server/src/main/java/net/irext/server/request/ListCategoriesRequest.java @@ -1,4 +1,4 @@ -package net.irext.server.service.request; +package net.irext.server.request; /** * Filename: ListCategoriesRequest.java diff --git a/server/src/main/java/net/irext/server/service/request/ListCitiesRequest.java b/server/src/main/java/net/irext/server/request/ListCitiesRequest.java similarity index 94% rename from server/src/main/java/net/irext/server/service/request/ListCitiesRequest.java rename to server/src/main/java/net/irext/server/request/ListCitiesRequest.java index c8754e2..08823e4 100644 --- a/server/src/main/java/net/irext/server/service/request/ListCitiesRequest.java +++ b/server/src/main/java/net/irext/server/request/ListCitiesRequest.java @@ -1,4 +1,4 @@ -package net.irext.server.service.request; +package net.irext.server.request; /** * Filename: ListCitiesRequest.java diff --git a/server/src/main/java/net/irext/server/service/request/ListIndexesRequest.java b/server/src/main/java/net/irext/server/request/ListIndexesRequest.java similarity index 97% rename from server/src/main/java/net/irext/server/service/request/ListIndexesRequest.java rename to server/src/main/java/net/irext/server/request/ListIndexesRequest.java index b38d8ad..6faa1f9 100644 --- a/server/src/main/java/net/irext/server/service/request/ListIndexesRequest.java +++ b/server/src/main/java/net/irext/server/request/ListIndexesRequest.java @@ -1,4 +1,4 @@ -package net.irext.server.service.request; +package net.irext.server.request; /** * Filename: ListIndexesRequest.java diff --git a/server/src/main/java/net/irext/server/service/request/ListOperatorsRequest.java b/server/src/main/java/net/irext/server/request/ListOperatorsRequest.java similarity index 95% rename from server/src/main/java/net/irext/server/service/request/ListOperatorsRequest.java rename to server/src/main/java/net/irext/server/request/ListOperatorsRequest.java index 6bac22e..2d08677 100644 --- a/server/src/main/java/net/irext/server/service/request/ListOperatorsRequest.java +++ b/server/src/main/java/net/irext/server/request/ListOperatorsRequest.java @@ -1,4 +1,4 @@ -package net.irext.server.service.request; +package net.irext.server.request; /** * Filename: ListOperatorsRequest.java diff --git a/server/src/main/java/net/irext/server/service/request/OpenRequest.java b/server/src/main/java/net/irext/server/request/OpenRequest.java similarity index 93% rename from server/src/main/java/net/irext/server/service/request/OpenRequest.java rename to server/src/main/java/net/irext/server/request/OpenRequest.java index f081ae2..3fc7b3c 100644 --- a/server/src/main/java/net/irext/server/service/request/OpenRequest.java +++ b/server/src/main/java/net/irext/server/request/OpenRequest.java @@ -1,4 +1,4 @@ -package net.irext.server.service.request; +package net.irext.server.request; /** * Filename: OpenRequest.java diff --git a/server/src/main/java/net/irext/server/service/response/ACParametersResponse.java b/server/src/main/java/net/irext/server/response/ACParametersResponse.java similarity index 88% rename from server/src/main/java/net/irext/server/service/response/ACParametersResponse.java rename to server/src/main/java/net/irext/server/response/ACParametersResponse.java index c433478..00b3526 100644 --- a/server/src/main/java/net/irext/server/service/response/ACParametersResponse.java +++ b/server/src/main/java/net/irext/server/response/ACParametersResponse.java @@ -1,6 +1,6 @@ -package net.irext.server.service.response; +package net.irext.server.response; -import net.irext.server.service.model.ACParameters; +import net.irext.server.model.ACParameters; /** * Filename: ACParametersResponse.java diff --git a/server/src/main/java/net/irext/server/service/response/BrandsResponse.java b/server/src/main/java/net/irext/server/response/BrandsResponse.java similarity index 88% rename from server/src/main/java/net/irext/server/service/response/BrandsResponse.java rename to server/src/main/java/net/irext/server/response/BrandsResponse.java index 1e36c4e..c71bc54 100644 --- a/server/src/main/java/net/irext/server/service/response/BrandsResponse.java +++ b/server/src/main/java/net/irext/server/response/BrandsResponse.java @@ -1,6 +1,6 @@ -package net.irext.server.service.response; +package net.irext.server.response; -import net.irext.server.service.model.Brand; +import net.irext.server.model.Brand; import java.util.List; diff --git a/server/src/main/java/net/irext/server/service/response/CategoriesResponse.java b/server/src/main/java/net/irext/server/response/CategoriesResponse.java similarity index 88% rename from server/src/main/java/net/irext/server/service/response/CategoriesResponse.java rename to server/src/main/java/net/irext/server/response/CategoriesResponse.java index 3fddcdd..733b686 100644 --- a/server/src/main/java/net/irext/server/service/response/CategoriesResponse.java +++ b/server/src/main/java/net/irext/server/response/CategoriesResponse.java @@ -1,6 +1,6 @@ -package net.irext.server.service.response; +package net.irext.server.response; -import net.irext.server.service.model.Category; +import net.irext.server.model.Category; import java.util.List; diff --git a/server/src/main/java/net/irext/server/service/response/CitiesResponse.java b/server/src/main/java/net/irext/server/response/CitiesResponse.java similarity index 88% rename from server/src/main/java/net/irext/server/service/response/CitiesResponse.java rename to server/src/main/java/net/irext/server/response/CitiesResponse.java index 94ffbe7..5de3d0f 100644 --- a/server/src/main/java/net/irext/server/service/response/CitiesResponse.java +++ b/server/src/main/java/net/irext/server/response/CitiesResponse.java @@ -1,6 +1,6 @@ -package net.irext.server.service.response; +package net.irext.server.response; -import net.irext.server.service.model.City; +import net.irext.server.model.City; import java.util.List; diff --git a/server/src/main/java/net/irext/server/service/response/DecodeResponse.java b/server/src/main/java/net/irext/server/response/DecodeResponse.java similarity index 93% rename from server/src/main/java/net/irext/server/service/response/DecodeResponse.java rename to server/src/main/java/net/irext/server/response/DecodeResponse.java index 50ecfb5..40b8f30 100644 --- a/server/src/main/java/net/irext/server/service/response/DecodeResponse.java +++ b/server/src/main/java/net/irext/server/response/DecodeResponse.java @@ -1,4 +1,4 @@ -package net.irext.server.service.response; +package net.irext.server.response; /** * Filename: DecodeResponse.java diff --git a/server/src/main/java/net/irext/server/service/response/IndexesResponse.java b/server/src/main/java/net/irext/server/response/IndexesResponse.java similarity index 88% rename from server/src/main/java/net/irext/server/service/response/IndexesResponse.java rename to server/src/main/java/net/irext/server/response/IndexesResponse.java index 46e12d9..6dbbf64 100644 --- a/server/src/main/java/net/irext/server/service/response/IndexesResponse.java +++ b/server/src/main/java/net/irext/server/response/IndexesResponse.java @@ -1,6 +1,6 @@ -package net.irext.server.service.response; +package net.irext.server.response; -import net.irext.server.service.model.RemoteIndex; +import net.irext.server.model.RemoteIndex; import java.util.List; diff --git a/server/src/main/java/net/irext/server/service/response/LoginResponse.java b/server/src/main/java/net/irext/server/response/LoginResponse.java similarity index 87% rename from server/src/main/java/net/irext/server/service/response/LoginResponse.java rename to server/src/main/java/net/irext/server/response/LoginResponse.java index 2fcefa1..ef10e5e 100644 --- a/server/src/main/java/net/irext/server/service/response/LoginResponse.java +++ b/server/src/main/java/net/irext/server/response/LoginResponse.java @@ -1,6 +1,6 @@ -package net.irext.server.service.response; +package net.irext.server.response; -import net.irext.server.service.model.UserApp; +import net.irext.server.model.UserApp; /** * Filename: LoginResponse.java diff --git a/server/src/main/java/net/irext/server/service/response/OperatorsResponse.java b/server/src/main/java/net/irext/server/response/OperatorsResponse.java similarity index 88% rename from server/src/main/java/net/irext/server/service/response/OperatorsResponse.java rename to server/src/main/java/net/irext/server/response/OperatorsResponse.java index 40286bc..e17de98 100644 --- a/server/src/main/java/net/irext/server/service/response/OperatorsResponse.java +++ b/server/src/main/java/net/irext/server/response/OperatorsResponse.java @@ -1,6 +1,6 @@ -package net.irext.server.service.response; +package net.irext.server.response; -import net.irext.server.service.model.StbOperator; +import net.irext.server.model.StbOperator; import java.util.List; diff --git a/server/src/main/java/net/irext/server/service/response/ServiceResponse.java b/server/src/main/java/net/irext/server/response/ServiceResponse.java similarity index 92% rename from server/src/main/java/net/irext/server/service/response/ServiceResponse.java rename to server/src/main/java/net/irext/server/response/ServiceResponse.java index fe3a129..642984c 100644 --- a/server/src/main/java/net/irext/server/service/response/ServiceResponse.java +++ b/server/src/main/java/net/irext/server/response/ServiceResponse.java @@ -1,4 +1,4 @@ -package net.irext.server.service.response; +package net.irext.server.response; /** * Filename: ServiceResponse.java diff --git a/server/src/main/java/net/irext/server/service/response/Status.java b/server/src/main/java/net/irext/server/response/Status.java similarity index 89% rename from server/src/main/java/net/irext/server/service/response/Status.java rename to server/src/main/java/net/irext/server/response/Status.java index 1b71503..9d40d7a 100644 --- a/server/src/main/java/net/irext/server/service/response/Status.java +++ b/server/src/main/java/net/irext/server/response/Status.java @@ -1,6 +1,6 @@ -package net.irext.server.service.response; +package net.irext.server.response; -import net.irext.server.service.Constants; +import net.irext.server.utils.Constants; /** * Filename: Status.java diff --git a/server/src/main/java/net/irext/server/service/response/StringResponse.java b/server/src/main/java/net/irext/server/response/StringResponse.java similarity index 93% rename from server/src/main/java/net/irext/server/service/response/StringResponse.java rename to server/src/main/java/net/irext/server/response/StringResponse.java index 425dba3..fa60ba6 100644 --- a/server/src/main/java/net/irext/server/service/response/StringResponse.java +++ b/server/src/main/java/net/irext/server/response/StringResponse.java @@ -1,4 +1,4 @@ -package net.irext.server.service.response; +package net.irext.server.response; /** * Filename: StringResponse.java diff --git a/server/src/main/java/net/irext/server/service/restapi/IRIndexingService.java b/server/src/main/java/net/irext/server/restapi/IRIndexingService.java similarity index 96% rename from server/src/main/java/net/irext/server/service/restapi/IRIndexingService.java rename to server/src/main/java/net/irext/server/restapi/IRIndexingService.java index 9bfc787..55f8d2f 100644 --- a/server/src/main/java/net/irext/server/service/restapi/IRIndexingService.java +++ b/server/src/main/java/net/irext/server/restapi/IRIndexingService.java @@ -1,13 +1,13 @@ -package net.irext.server.service.restapi; +package net.irext.server.restapi; import jakarta.servlet.ServletContext; import jakarta.servlet.http.HttpServletRequest; -import net.irext.server.service.Constants; -import net.irext.server.service.businesslogic.IndexingLogic; -import net.irext.server.service.model.*; -import net.irext.server.service.request.*; -import net.irext.server.service.response.*; -import net.irext.server.service.restapi.base.AbstractBaseService; +import net.irext.server.utils.Constants; +import net.irext.server.businesslogic.IndexingLogic; +import net.irext.server.model.*; +import net.irext.server.request.*; +import net.irext.server.response.*; +import net.irext.server.restapi.base.AbstractBaseService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.web.bind.annotation.PostMapping; @@ -23,7 +23,7 @@ import java.util.List; * Revised: Date: 2019-06-08 * Revision: Revision: 1.0 *

- * Description: IRext indexing service + * Description: IRext indexing server *

* Revision log: * 2019-06-08: created by strawmanbobi diff --git a/server/src/main/java/net/irext/server/service/restapi/IROperationService.java b/server/src/main/java/net/irext/server/restapi/IROperationService.java similarity index 88% rename from server/src/main/java/net/irext/server/service/restapi/IROperationService.java rename to server/src/main/java/net/irext/server/restapi/IROperationService.java index 5b534ce..ea5a87c 100644 --- a/server/src/main/java/net/irext/server/service/restapi/IROperationService.java +++ b/server/src/main/java/net/irext/server/restapi/IROperationService.java @@ -1,17 +1,17 @@ -package net.irext.server.service.restapi; +package net.irext.server.restapi; import com.google.gson.Gson; import jakarta.servlet.ServletContext; -import net.irext.server.service.businesslogic.OperationLogic; -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.request.*; -import net.irext.server.service.response.*; -import net.irext.server.service.utils.LoggerUtil; -import net.irext.server.service.businesslogic.IndexingLogic; -import net.irext.server.service.restapi.base.AbstractBaseService; +import net.irext.server.businesslogic.OperationLogic; +import net.irext.server.cache.IDecodeSessionRepository; +import net.irext.server.cache.IIRBinaryRepository; +import net.irext.server.model.ACParameters; +import net.irext.server.model.RemoteIndex; +import net.irext.server.request.*; +import net.irext.server.response.*; +import net.irext.server.utils.LoggerUtil; +import net.irext.server.businesslogic.IndexingLogic; +import net.irext.server.restapi.base.AbstractBaseService; import net.irext.decode.sdk.bean.ACStatus; import net.irext.decode.sdk.utils.Constants; import org.springframework.beans.factory.annotation.Autowired; @@ -33,7 +33,7 @@ import java.io.IOException; * Revised: Date: 2018-12-16 * Revision: Revision: 1.0 *

- * Description: IRext operation service + * Description: IRext operation server *

* Revision log: * 2018-12-16: created by strawmanbobi @@ -91,7 +91,7 @@ public class IROperationService extends AbstractBaseService { File downloadFile = operationLogic.getDownloadFile(context, indexId); ServiceResponse response = validateToken(id, token, ServiceResponse.class); - if (response.getStatus().getCode() == net.irext.server.service.Constants.ERROR_CODE_AUTH_FAILURE) { + if (response.getStatus().getCode() == net.irext.server.utils.Constants.ERROR_CODE_AUTH_FAILURE) { return null; } if (null == downloadFile) { @@ -101,7 +101,7 @@ public class IROperationService extends AbstractBaseService { InputStreamResource resource = new InputStreamResource(new FileInputStream(downloadFile)); String fileName = downloadFile.getName(); long fileLength = downloadFile.length(); - indexingLogic.statRemoteRef(indexId); + indexingLogic.statRemoteRef(indexId, id, token); return ResponseEntity.ok() // Content-Disposition .header(HttpHeaders.CONTENT_DISPOSITION, "attachment;filename=" + fileName) @@ -115,7 +115,7 @@ public class IROperationService extends AbstractBaseService { int id = getACParametersRequest.getId(); String token = getACParametersRequest.getToken(); ACParametersResponse response = validateToken(id, token, ACParametersResponse.class); - if (response.getStatus().getCode() == net.irext.server.service.Constants.ERROR_CODE_AUTH_FAILURE) { + if (response.getStatus().getCode() == net.irext.server.utils.Constants.ERROR_CODE_AUTH_FAILURE) { return response; } @@ -140,7 +140,7 @@ public class IROperationService extends AbstractBaseService { int id = decodeRequest.getId(); String token = decodeRequest.getToken(); DecodeResponse response = validateToken(id, token, DecodeResponse.class); - if (response.getStatus().getCode() == net.irext.server.service.Constants.ERROR_CODE_AUTH_FAILURE) { + if (response.getStatus().getCode() == net.irext.server.utils.Constants.ERROR_CODE_AUTH_FAILURE) { return response; } try { @@ -192,7 +192,7 @@ public class IROperationService extends AbstractBaseService { } response.setEntity(decoded); if (null != remoteIndex) { - indexingLogic.statRemoteRef(remoteIndex); + indexingLogic.statRemoteRef(remoteIndex, id, token); } return response; } catch (Exception e) { diff --git a/server/src/main/java/net/irext/server/service/restapi/SignInService.java b/server/src/main/java/net/irext/server/restapi/SignInService.java similarity index 81% rename from server/src/main/java/net/irext/server/service/restapi/SignInService.java rename to server/src/main/java/net/irext/server/restapi/SignInService.java index 835721e..bb0a3d5 100644 --- a/server/src/main/java/net/irext/server/service/restapi/SignInService.java +++ b/server/src/main/java/net/irext/server/restapi/SignInService.java @@ -1,16 +1,16 @@ -package net.irext.server.service.restapi; +package net.irext.server.restapi; import jakarta.servlet.http.HttpServletRequest; -import net.irext.server.service.Constants; -import net.irext.server.service.businesslogic.UserLoginLogic; -import net.irext.server.service.cache.IUserAppRepository; -import net.irext.server.service.model.UserApp; -import net.irext.server.service.request.AppSignInRequest; -import net.irext.server.service.response.LoginResponse; -import net.irext.server.service.response.Status; -import net.irext.server.service.restapi.base.AbstractBaseService; -import net.irext.server.service.utils.MD5Util; -import net.irext.server.service.utils.VeDate; +import net.irext.server.utils.Constants; +import net.irext.server.businesslogic.UserLoginLogic; +import net.irext.server.cache.IUserAppRepository; +import net.irext.server.model.UserApp; +import net.irext.server.request.AppSignInRequest; +import net.irext.server.response.LoginResponse; +import net.irext.server.response.Status; +import net.irext.server.restapi.base.AbstractBaseService; +import net.irext.server.utils.MD5Util; +import net.irext.server.utils.VeDate; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.util.StringUtils; @@ -24,7 +24,7 @@ import org.springframework.web.bind.annotation.RestController; * Revised: Date: 2017-04-27 * Revision: Revision: 1.0 *

- * Description: User app login service + * Description: User app login server *

* Revision log: * 2017-04-27: created by strawmanbobi diff --git a/server/src/main/java/net/irext/server/service/restapi/base/AbstractBaseService.java b/server/src/main/java/net/irext/server/restapi/base/AbstractBaseService.java similarity index 90% rename from server/src/main/java/net/irext/server/service/restapi/base/AbstractBaseService.java rename to server/src/main/java/net/irext/server/restapi/base/AbstractBaseService.java index 222d40d..1814229 100644 --- a/server/src/main/java/net/irext/server/service/restapi/base/AbstractBaseService.java +++ b/server/src/main/java/net/irext/server/restapi/base/AbstractBaseService.java @@ -1,10 +1,10 @@ -package net.irext.server.service.restapi.base; +package net.irext.server.restapi.base; -import net.irext.server.service.Constants; -import net.irext.server.service.aspect.TokenValidation; -import net.irext.server.service.cache.IUserAppRepository; -import net.irext.server.service.response.ServiceResponse; -import net.irext.server.service.response.Status; +import net.irext.server.utils.Constants; +import net.irext.server.aspect.TokenValidation; +import net.irext.server.cache.IUserAppRepository; +import net.irext.server.response.ServiceResponse; +import net.irext.server.response.Status; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.springframework.beans.factory.annotation.Autowired; diff --git a/server/src/main/java/net/irext/server/service/Constants.java b/server/src/main/java/net/irext/server/utils/Constants.java similarity index 91% rename from server/src/main/java/net/irext/server/service/Constants.java rename to server/src/main/java/net/irext/server/utils/Constants.java index 640d1dc..9b28c07 100644 --- a/server/src/main/java/net/irext/server/service/Constants.java +++ b/server/src/main/java/net/irext/server/utils/Constants.java @@ -1,4 +1,4 @@ -package net.irext.server.service; +package net.irext.server.utils; /** * Filename: Constants.java @@ -12,6 +12,11 @@ package net.irext.server.service; */ public class Constants { + public static final int CREATE_TYPE_LEGACY = 0; + public static final int CREATE_TYPE_DOWNLOAD = 1; + public static final int CREATE_TYPE_COLLECT = 2; + public static final int CREATE_TYPE_SOURCE = 3; + public static final int ERROR_CODE_SUCCESS = 0; public static final int ERROR_CODE_NETWORK_ERROR = -1; public static final int ERROR_CODE_AUTH_FAILURE = 1; @@ -27,6 +32,8 @@ public class Constants { public static final int STATUS_INVALID = 0; public static final int STATUS_PARA_DATA = 15; + public static final String REMOTE_REF_URL = "http://192.168.75.128:8083/irext-server/remote_ref/create_remote_ref"; + public enum CategoryID { AIR_CONDITIONER(1), TV(2), diff --git a/server/src/main/java/net/irext/server/service/utils/FileUtil.java b/server/src/main/java/net/irext/server/utils/FileUtil.java similarity index 98% rename from server/src/main/java/net/irext/server/service/utils/FileUtil.java rename to server/src/main/java/net/irext/server/utils/FileUtil.java index 35425c9..ed710d5 100644 --- a/server/src/main/java/net/irext/server/service/utils/FileUtil.java +++ b/server/src/main/java/net/irext/server/utils/FileUtil.java @@ -1,4 +1,4 @@ -package net.irext.server.service.utils; +package net.irext.server.utils; import java.io.*; diff --git a/server/src/main/java/net/irext/server/service/utils/LoggerUtil.java b/server/src/main/java/net/irext/server/utils/LoggerUtil.java similarity index 95% rename from server/src/main/java/net/irext/server/service/utils/LoggerUtil.java rename to server/src/main/java/net/irext/server/utils/LoggerUtil.java index 64b73c3..aa53b02 100644 --- a/server/src/main/java/net/irext/server/service/utils/LoggerUtil.java +++ b/server/src/main/java/net/irext/server/utils/LoggerUtil.java @@ -1,4 +1,4 @@ -package net.irext.server.service.utils; +package net.irext.server.utils; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/server/src/main/java/net/irext/server/service/utils/MD5Util.java b/server/src/main/java/net/irext/server/utils/MD5Util.java similarity index 97% rename from server/src/main/java/net/irext/server/service/utils/MD5Util.java rename to server/src/main/java/net/irext/server/utils/MD5Util.java index 04ccb43..389ad1c 100644 --- a/server/src/main/java/net/irext/server/service/utils/MD5Util.java +++ b/server/src/main/java/net/irext/server/utils/MD5Util.java @@ -1,4 +1,4 @@ -package net.irext.server.service.utils; +package net.irext.server.utils; import java.security.MessageDigest; diff --git a/server/src/main/java/net/irext/server/service/utils/VeDate.java b/server/src/main/java/net/irext/server/utils/VeDate.java similarity index 99% rename from server/src/main/java/net/irext/server/service/utils/VeDate.java rename to server/src/main/java/net/irext/server/utils/VeDate.java index c4b1435..6a125bc 100644 --- a/server/src/main/java/net/irext/server/service/utils/VeDate.java +++ b/server/src/main/java/net/irext/server/utils/VeDate.java @@ -1,4 +1,4 @@ -package net.irext.server.service.utils; +package net.irext.server.utils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; diff --git a/server/src/main/resources/application.properties b/server/src/main/resources/application.properties index bf338ae..b5ba99e 100644 --- a/server/src/main/resources/application.properties +++ b/server/src/main/resources/application.properties @@ -7,6 +7,6 @@ spring.redis.port=6379 spring.datasource.url=jdbc:mysql://localhost:3306/irext?useUnicode=true&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=UTC spring.datasource.username=root -spring.datasource.password=root +spring.datasource.password=421aWill. user.data.basedir=/data/ \ No newline at end of file diff --git a/server/src/main/resources/net/irext/server/service/mapper/BrandMapper.xml b/server/src/main/resources/net/irext/server/mapper/BrandMapper.xml similarity index 87% rename from server/src/main/resources/net/irext/server/service/mapper/BrandMapper.xml rename to server/src/main/resources/net/irext/server/mapper/BrandMapper.xml index ca5e5b5..d69e7a4 100644 --- a/server/src/main/resources/net/irext/server/service/mapper/BrandMapper.xml +++ b/server/src/main/resources/net/irext/server/mapper/BrandMapper.xml @@ -1,7 +1,7 @@ - - + +