杨杰 6 роки тому
батько
коміт
77ba15be93
25 змінених файлів з 47 додано та 47 видалено
  1. 1 1
      src/main/java/com/llisoft/pay/Application.java
  2. 1 1
      src/main/java/com/llisoft/pay/config/ErrorConfig.java
  3. 1 1
      src/main/java/com/llisoft/pay/config/ExceptionConfig.java
  4. 1 1
      src/main/java/com/llisoft/pay/config/SpringMvcConfig.java
  5. 1 1
      src/main/java/com/llisoft/pay/config/SwaggerConfig.java
  6. 2 2
      src/main/java/com/llisoft/pay/controller/AliPayController.java
  7. 8 8
      src/main/java/com/llisoft/pay/controller/OrderController.java
  8. 1 1
      src/main/java/com/llisoft/pay/controller/WxPayController.java
  9. 2 2
      src/main/java/com/llisoft/pay/dao/AppDao.java
  10. 2 2
      src/main/java/com/llisoft/pay/dao/ItemDao.java
  11. 2 2
      src/main/java/com/llisoft/pay/dao/OrderDao.java
  12. 1 1
      src/main/java/com/llisoft/pay/entity/App.java
  13. 1 1
      src/main/java/com/llisoft/pay/entity/Item.java
  14. 1 1
      src/main/java/com/llisoft/pay/entity/Order.java
  15. 1 1
      src/main/java/com/llisoft/pay/service/AliPayService.java
  16. 3 3
      src/main/java/com/llisoft/pay/service/AppService.java
  17. 7 7
      src/main/java/com/llisoft/pay/service/OrderService.java
  18. 4 4
      src/main/java/com/llisoft/pay/service/PayService.java
  19. 1 1
      src/main/java/com/llisoft/pay/vo/OrderAddRequestVo.java
  20. 1 1
      src/main/java/com/llisoft/pay/vo/OrderAddResponseVo.java
  21. 1 1
      src/main/java/com/llisoft/pay/vo/OrderInfoRequestVo.java
  22. 1 1
      src/main/java/com/llisoft/pay/vo/OrderInfoResponseVo.java
  23. 1 1
      src/main/java/com/llisoft/pay/vo/OrderPayRequestVo.java
  24. 1 1
      src/main/java/com/llisoft/pay/vo/OrderPayResponseVo.java
  25. 1 1
      src/test/java/com/llisoft/pay/ServiceTest.java

+ 1 - 1
src/main/java/com/llisoft/service/pay/Application.java → src/main/java/com/llisoft/pay/Application.java

@@ -1,4 +1,4 @@
-package com.llisoft.service.pay;
+package com.llisoft.pay;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

+ 1 - 1
src/main/java/com/llisoft/service/pay/config/ErrorConfig.java → src/main/java/com/llisoft/pay/config/ErrorConfig.java

@@ -1,4 +1,4 @@
-package com.llisoft.service.pay.config;
+package com.llisoft.pay.config;
 
 import java.util.Objects;
 

+ 1 - 1
src/main/java/com/llisoft/service/pay/config/ExceptionConfig.java → src/main/java/com/llisoft/pay/config/ExceptionConfig.java

@@ -1,4 +1,4 @@
-package com.llisoft.service.pay.config;
+package com.llisoft.pay.config;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

+ 1 - 1
src/main/java/com/llisoft/service/pay/config/SpringMvcConfig.java → src/main/java/com/llisoft/pay/config/SpringMvcConfig.java

@@ -1,4 +1,4 @@
-package com.llisoft.service.pay.config;
+package com.llisoft.pay.config;
 
 import org.springframework.context.annotation.Configuration;
 import org.springframework.web.servlet.config.annotation.ViewControllerRegistry;

+ 1 - 1
src/main/java/com/llisoft/service/pay/config/SwaggerConfig.java → src/main/java/com/llisoft/pay/config/SwaggerConfig.java

@@ -1,4 +1,4 @@
-package com.llisoft.service.pay.config;
+package com.llisoft.pay.config;
 
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.context.annotation.Bean;

+ 2 - 2
src/main/java/com/llisoft/service/pay/controller/AliPayController.java → src/main/java/com/llisoft/pay/controller/AliPayController.java

@@ -1,4 +1,4 @@
-package com.llisoft.service.pay.controller;
+package com.llisoft.pay.controller;
 
 import java.util.HashMap;
 import java.util.Map;
@@ -15,7 +15,7 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.ResponseBody;
 
 import com.llisoft.common.exception.MtaException;
-import com.llisoft.service.pay.service.AliPayService;
+import com.llisoft.pay.service.AliPayService;
 
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;

+ 8 - 8
src/main/java/com/llisoft/service/pay/controller/OrderController.java → src/main/java/com/llisoft/pay/controller/OrderController.java

@@ -1,4 +1,4 @@
-package com.llisoft.service.pay.controller;
+package com.llisoft.pay.controller;
 
 import javax.validation.Valid;
 
@@ -12,13 +12,13 @@ import org.springframework.web.bind.annotation.RestController;
 
 import com.llisoft.common.util.JsonUtil;
 import com.llisoft.common.vo.ResponseVo;
-import com.llisoft.service.pay.service.OrderService;
-import com.llisoft.service.pay.vo.OrderAddRequestVo;
-import com.llisoft.service.pay.vo.OrderAddResponseVo;
-import com.llisoft.service.pay.vo.OrderInfoRequestVo;
-import com.llisoft.service.pay.vo.OrderInfoResponseVo;
-import com.llisoft.service.pay.vo.OrderPayRequestVo;
-import com.llisoft.service.pay.vo.OrderPayResponseVo;
+import com.llisoft.pay.service.OrderService;
+import com.llisoft.pay.vo.OrderAddRequestVo;
+import com.llisoft.pay.vo.OrderAddResponseVo;
+import com.llisoft.pay.vo.OrderInfoRequestVo;
+import com.llisoft.pay.vo.OrderInfoResponseVo;
+import com.llisoft.pay.vo.OrderPayRequestVo;
+import com.llisoft.pay.vo.OrderPayResponseVo;
 
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;

+ 1 - 1
src/main/java/com/llisoft/service/pay/controller/WxPayController.java → src/main/java/com/llisoft/pay/controller/WxPayController.java

@@ -1,4 +1,4 @@
-package com.llisoft.service.pay.controller;
+package com.llisoft.pay.controller;
 
 import java.util.HashMap;
 import java.util.Map;

+ 2 - 2
src/main/java/com/llisoft/service/pay/dao/AppDao.java → src/main/java/com/llisoft/pay/dao/AppDao.java

@@ -1,9 +1,9 @@
-package com.llisoft.service.pay.dao;
+package com.llisoft.pay.dao;
 
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Select;
 
-import com.llisoft.service.pay.entity.App;
+import com.llisoft.pay.entity.App;
 
 @Mapper
 public interface AppDao {

+ 2 - 2
src/main/java/com/llisoft/service/pay/dao/ItemDao.java → src/main/java/com/llisoft/pay/dao/ItemDao.java

@@ -1,4 +1,4 @@
-package com.llisoft.service.pay.dao;
+package com.llisoft.pay.dao;
 
 import org.apache.ibatis.annotations.Insert;
 import org.apache.ibatis.annotations.Mapper;
@@ -7,7 +7,7 @@ import org.apache.ibatis.annotations.Select;
 import org.apache.ibatis.annotations.SelectKey;
 import org.apache.ibatis.annotations.Update;
 
-import com.llisoft.service.pay.entity.Item;
+import com.llisoft.pay.entity.Item;
 
 @Mapper
 public interface ItemDao {

+ 2 - 2
src/main/java/com/llisoft/service/pay/dao/OrderDao.java → src/main/java/com/llisoft/pay/dao/OrderDao.java

@@ -1,4 +1,4 @@
-package com.llisoft.service.pay.dao;
+package com.llisoft.pay.dao;
 
 import org.apache.ibatis.annotations.Insert;
 import org.apache.ibatis.annotations.Mapper;
@@ -7,7 +7,7 @@ import org.apache.ibatis.annotations.Select;
 import org.apache.ibatis.annotations.SelectKey;
 import org.apache.ibatis.annotations.Update;
 
-import com.llisoft.service.pay.entity.Order;
+import com.llisoft.pay.entity.Order;
 
 @Mapper
 public interface OrderDao {

+ 1 - 1
src/main/java/com/llisoft/service/pay/entity/App.java → src/main/java/com/llisoft/pay/entity/App.java

@@ -1,4 +1,4 @@
-package com.llisoft.service.pay.entity;
+package com.llisoft.pay.entity;
 
 import java.util.Date;
 

+ 1 - 1
src/main/java/com/llisoft/service/pay/entity/Item.java → src/main/java/com/llisoft/pay/entity/Item.java

@@ -1,4 +1,4 @@
-package com.llisoft.service.pay.entity;
+package com.llisoft.pay.entity;
 
 import java.util.Date;
 

+ 1 - 1
src/main/java/com/llisoft/service/pay/entity/Order.java → src/main/java/com/llisoft/pay/entity/Order.java

@@ -1,4 +1,4 @@
-package com.llisoft.service.pay.entity;
+package com.llisoft.pay.entity;
 
 import java.util.Date;
 

+ 1 - 1
src/main/java/com/llisoft/service/pay/service/AliPayService.java → src/main/java/com/llisoft/pay/service/AliPayService.java

@@ -1,4 +1,4 @@
-package com.llisoft.service.pay.service;
+package com.llisoft.pay.service;
 
 import java.util.HashMap;
 import java.util.Map;

+ 3 - 3
src/main/java/com/llisoft/service/pay/service/AppService.java → src/main/java/com/llisoft/pay/service/AppService.java

@@ -1,4 +1,4 @@
-package com.llisoft.service.pay.service;
+package com.llisoft.pay.service;
 
 import java.util.Objects;
 
@@ -6,8 +6,8 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import com.llisoft.common.exception.MtaException;
-import com.llisoft.service.pay.dao.AppDao;
-import com.llisoft.service.pay.entity.App;
+import com.llisoft.pay.dao.AppDao;
+import com.llisoft.pay.entity.App;
 
 @Service
 public class AppService {

+ 7 - 7
src/main/java/com/llisoft/service/pay/service/OrderService.java → src/main/java/com/llisoft/pay/service/OrderService.java

@@ -1,4 +1,4 @@
-package com.llisoft.service.pay.service;
+package com.llisoft.pay.service;
 
 import java.util.Objects;
 
@@ -12,12 +12,12 @@ import com.llisoft.common.util.BeanUtil;
 import com.llisoft.common.util.CodeUtil;
 import com.llisoft.common.util.HttpUtil;
 import com.llisoft.common.util.JsonUtil;
-import com.llisoft.service.pay.dao.OrderDao;
-import com.llisoft.service.pay.entity.App;
-import com.llisoft.service.pay.entity.Order;
-import com.llisoft.service.pay.vo.OrderAddResponseVo;
-import com.llisoft.service.pay.vo.OrderInfoResponseVo;
-import com.llisoft.service.pay.vo.OrderPayResponseVo;
+import com.llisoft.pay.dao.OrderDao;
+import com.llisoft.pay.entity.App;
+import com.llisoft.pay.entity.Order;
+import com.llisoft.pay.vo.OrderAddResponseVo;
+import com.llisoft.pay.vo.OrderInfoResponseVo;
+import com.llisoft.pay.vo.OrderPayResponseVo;
 
 
 @Service

+ 4 - 4
src/main/java/com/llisoft/service/pay/service/PayService.java → src/main/java/com/llisoft/pay/service/PayService.java

@@ -1,4 +1,4 @@
-package com.llisoft.service.pay.service;
+package com.llisoft.pay.service;
 
 import java.util.Objects;
 
@@ -10,9 +10,9 @@ import org.springframework.transaction.annotation.Transactional;
 
 import com.llisoft.common.exception.MtaException;
 import com.llisoft.common.util.CodeUtil;
-import com.llisoft.service.pay.dao.ItemDao;
-import com.llisoft.service.pay.entity.Item;
-import com.llisoft.service.pay.entity.Order;
+import com.llisoft.pay.dao.ItemDao;
+import com.llisoft.pay.entity.Item;
+import com.llisoft.pay.entity.Order;
 
 @Service
 public class PayService {

+ 1 - 1
src/main/java/com/llisoft/service/pay/vo/OrderAddRequestVo.java → src/main/java/com/llisoft/pay/vo/OrderAddRequestVo.java

@@ -1,4 +1,4 @@
-package com.llisoft.service.pay.vo;
+package com.llisoft.pay.vo;
 
 import javax.validation.constraints.NotBlank;
 

+ 1 - 1
src/main/java/com/llisoft/service/pay/vo/OrderAddResponseVo.java → src/main/java/com/llisoft/pay/vo/OrderAddResponseVo.java

@@ -1,4 +1,4 @@
-package com.llisoft.service.pay.vo;
+package com.llisoft.pay.vo;
 
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;

+ 1 - 1
src/main/java/com/llisoft/service/pay/vo/OrderInfoRequestVo.java → src/main/java/com/llisoft/pay/vo/OrderInfoRequestVo.java

@@ -1,4 +1,4 @@
-package com.llisoft.service.pay.vo;
+package com.llisoft.pay.vo;
 
 import javax.validation.constraints.NotBlank;
 

+ 1 - 1
src/main/java/com/llisoft/service/pay/vo/OrderInfoResponseVo.java → src/main/java/com/llisoft/pay/vo/OrderInfoResponseVo.java

@@ -1,4 +1,4 @@
-package com.llisoft.service.pay.vo;
+package com.llisoft.pay.vo;
 
 import java.util.Date;
 

+ 1 - 1
src/main/java/com/llisoft/service/pay/vo/OrderPayRequestVo.java → src/main/java/com/llisoft/pay/vo/OrderPayRequestVo.java

@@ -1,4 +1,4 @@
-package com.llisoft.service.pay.vo;
+package com.llisoft.pay.vo;
 
 import javax.validation.constraints.NotBlank;
 

+ 1 - 1
src/main/java/com/llisoft/service/pay/vo/OrderPayResponseVo.java → src/main/java/com/llisoft/pay/vo/OrderPayResponseVo.java

@@ -1,4 +1,4 @@
-package com.llisoft.service.pay.vo;
+package com.llisoft.pay.vo;
 
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;

+ 1 - 1
src/test/java/com/llisoft/service/pay/ServiceTest.java → src/test/java/com/llisoft/pay/ServiceTest.java

@@ -1,4 +1,4 @@
-package com.llisoft.service.pay;
+package com.llisoft.pay;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;