diff --git a/user-service/src/main/java/com/hp/user/service/controller/AreaController.java b/user-service/src/main/java/com/hp/user/service/controller/AreaController.java index b73af58..02669d2 100644 --- a/user-service/src/main/java/com/hp/user/service/controller/AreaController.java +++ b/user-service/src/main/java/com/hp/user/service/controller/AreaController.java @@ -1,10 +1,12 @@ package com.hp.user.service.controller; import com.hp.user.client.entity.AreaVO; -import com.hp.user.utils.HttpResult; + import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import com.hp.user.client.service.UserAreaService; +import com.hp.user.service.utils.HttpResult; + import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; diff --git a/user-service/src/main/java/com/hp/user/service/controller/CompanyController.java b/user-service/src/main/java/com/hp/user/service/controller/CompanyController.java index 3c06fa4..7c587d3 100644 --- a/user-service/src/main/java/com/hp/user/service/controller/CompanyController.java +++ b/user-service/src/main/java/com/hp/user/service/controller/CompanyController.java @@ -3,8 +3,9 @@ package com.hp.user.service.controller; import com.hp.user.client.entity.CompanyPage; import com.hp.user.client.entity.CustomerCompanyVO; import com.hp.user.client.service.CustomerCompanyService; -import com.hp.user.util.IdWorker; -import com.hp.user.utils.HttpResult; +import com.hp.user.service.utils.HttpResult; +import com.hp.user.service.utils.IdWorker; + import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; diff --git a/user-service/src/main/java/com/hp/user/service/controller/MessageController.java b/user-service/src/main/java/com/hp/user/service/controller/MessageController.java index 1ae2b3b..a661fd2 100644 --- a/user-service/src/main/java/com/hp/user/service/controller/MessageController.java +++ b/user-service/src/main/java/com/hp/user/service/controller/MessageController.java @@ -5,7 +5,7 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; import com.hp.user.client.service.MessageService; -import com.hp.user.service.util.SendSmsUtil; +import com.hp.user.service.utils.SendSmsUtil; import io.swagger.annotations.Api; diff --git a/user-service/src/main/java/com/hp/user/service/controller/StationController.java b/user-service/src/main/java/com/hp/user/service/controller/StationController.java index 1fa1400..776d47f 100644 --- a/user-service/src/main/java/com/hp/user/service/controller/StationController.java +++ b/user-service/src/main/java/com/hp/user/service/controller/StationController.java @@ -3,8 +3,9 @@ package com.hp.user.service.controller; import com.hp.user.client.entity.StationPage; import com.hp.user.client.entity.StationVO; import com.hp.user.client.service.StationService; -import com.hp.user.util.IdWorker; -import com.hp.user.utils.HttpResult; +import com.hp.user.service.utils.HttpResult; +import com.hp.user.service.utils.IdWorker; + import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; diff --git a/user-service/src/main/java/com/hp/user/service/impl/CustomerCompanyServiceImpl.java b/user-service/src/main/java/com/hp/user/service/impl/CustomerCompanyServiceImpl.java index 784d06d..3fec9da 100644 --- a/user-service/src/main/java/com/hp/user/service/impl/CustomerCompanyServiceImpl.java +++ b/user-service/src/main/java/com/hp/user/service/impl/CustomerCompanyServiceImpl.java @@ -11,7 +11,6 @@ import com.hp.user.service.dao.CustomerCompanyMapper; import com.hp.user.service.dao.CustomerServiceProviderEnterpriseMapper; import com.hp.user.service.entity.CustomerCompany; import com.hp.user.service.entity.CustomerServiceProviderEnterprise; -import com.hp.user.util.IdWorker; import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; diff --git a/user-service/src/main/java/com/hp/user/service/impl/MessageServiceImpl.java b/user-service/src/main/java/com/hp/user/service/impl/MessageServiceImpl.java index 12adc45..1823ec4 100644 --- a/user-service/src/main/java/com/hp/user/service/impl/MessageServiceImpl.java +++ b/user-service/src/main/java/com/hp/user/service/impl/MessageServiceImpl.java @@ -9,7 +9,7 @@ import org.springframework.stereotype.Service; import com.hp.user.client.service.MessageService; import com.hp.user.service.constants.UserConstants; import com.hp.user.service.redis.RedisOperation; -import com.hp.user.service.util.SendSmsUtil; +import com.hp.user.service.utils.SendSmsUtil; import redis.clients.jedis.Jedis; diff --git a/user-service/src/main/java/com/hp/user/service/impl/StationServiceImpl.java b/user-service/src/main/java/com/hp/user/service/impl/StationServiceImpl.java index 2386e02..9be8144 100644 --- a/user-service/src/main/java/com/hp/user/service/impl/StationServiceImpl.java +++ b/user-service/src/main/java/com/hp/user/service/impl/StationServiceImpl.java @@ -9,7 +9,6 @@ import com.hp.user.client.entity.StationVO; import com.hp.user.client.service.StationService; import com.hp.user.service.dao.StationMapper; import com.hp.user.service.entity.Station; -import com.hp.user.util.IdWorker; import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; diff --git a/user-service/src/main/java/com/hp/user/utils/HttpResult.java b/user-service/src/main/java/com/hp/user/service/utils/HttpResult.java similarity index 97% rename from user-service/src/main/java/com/hp/user/utils/HttpResult.java rename to user-service/src/main/java/com/hp/user/service/utils/HttpResult.java index 8507ca9..62c5e18 100644 --- a/user-service/src/main/java/com/hp/user/utils/HttpResult.java +++ b/user-service/src/main/java/com/hp/user/service/utils/HttpResult.java @@ -1,4 +1,4 @@ -package com.hp.user.utils; +package com.hp.user.service.utils; import java.io.Serializable; public class HttpResult implements Serializable{ diff --git a/user-service/src/main/java/com/hp/user/service/util/IdWorker.java b/user-service/src/main/java/com/hp/user/service/utils/IdWorker.java similarity index 99% rename from user-service/src/main/java/com/hp/user/service/util/IdWorker.java rename to user-service/src/main/java/com/hp/user/service/utils/IdWorker.java index de3ff64..570887a 100644 --- a/user-service/src/main/java/com/hp/user/service/util/IdWorker.java +++ b/user-service/src/main/java/com/hp/user/service/utils/IdWorker.java @@ -1,4 +1,4 @@ -package com.hp.user.service.util; +package com.hp.user.service.utils; /** * Id生成器 diff --git a/user-service/src/main/java/com/hp/user/service/util/SendSmsUtil.java b/user-service/src/main/java/com/hp/user/service/utils/SendSmsUtil.java similarity index 98% rename from user-service/src/main/java/com/hp/user/service/util/SendSmsUtil.java rename to user-service/src/main/java/com/hp/user/service/utils/SendSmsUtil.java index cefc85c..7e0c821 100644 --- a/user-service/src/main/java/com/hp/user/service/util/SendSmsUtil.java +++ b/user-service/src/main/java/com/hp/user/service/utils/SendSmsUtil.java @@ -1,4 +1,4 @@ -package com.hp.user.service.util; +package com.hp.user.service.utils; import java.util.Map; import org.springframework.beans.factory.annotation.Value;