Alawn/springboot-payment
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

merge

Browse Source
This commit is contained in:
xiangwb
2017-11-17 11:33:07 +08:00
parent abeab7ca1c
commit 20372cdc21
36 changed files with 528 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files
boot-web/src/main/java/com/xwbing/controller/TestControl.java
+27 -3
View File
@@ -1,15 +1,20 @@
package com.xwbing.controller;
import com.alibaba.fastjson.JSONObject;
import com.xwbing.annotation.LogInfo;
import com.xwbing.entity.ExpressInfo;
import com.xwbing.entity.vo.ExpressInfoVo;
import com.xwbing.redis.RedisService;
import com.xwbing.service.ExpressDeliveryService;
import com.xwbing.util.JSONObjResult;
import io.swagger.annotations.Api;
import org.apache.commons.lang3.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
import java.util.List;
/**
* 说明: 测试控制层
@@ -23,6 +28,8 @@ import javax.annotation.Resource;
public class TestControl {
@Resource
private RedisService redisService;
@Resource
private ExpressDeliveryService expressDeliveryService;
private final Logger logger = LoggerFactory.getLogger(TestControl.class);
@LogInfo("redis功能测试")
@@ -39,4 +46,21 @@ public class TestControl {
logger.info("info test");
logger.error("error test");
}
@LogInfo("获取快递列表")
@GetMapping("listShipperCode")
public JSONObject listShipperCode() {
List<JSONObject> list = expressDeliveryService.listShipperCode();
return JSONObjResult.toJSONObj(list, true, "");
}
@LogInfo("快递查询")
@PostMapping("expressInfo")
public JSONObject getExpressInfo(@RequestBody ExpressInfo info) {
if (StringUtils.isEmpty(info.getLogisticCode()) || StringUtils.isEmpty(info.getShipperCode()))
return JSONObjResult.toJSONObj("快递公司或物流单号不能为空");
ExpressInfoVo infoVo = expressDeliveryService.queryOrderTraces(info);
return JSONObjResult.toJSONObj(infoVo, true, "查询快递信息成功");
}
}
boot-web/src/main/java/com/xwbing/controller/sys/SysAuthorityControl.java
+1 -1
View File
@@ -5,7 +5,7 @@ import com.alibaba.fastjson.JSONObject;
import com.xwbing.annotation.LogInfo;
import com.xwbing.constant.CommonConstant;
import com.xwbing.constant.CommonEnum;
import com.xwbing.entity.SysAuthority;
import com.xwbing.entity.sys.SysAuthority;
import com.xwbing.entity.vo.SysAuthVo;
import com.xwbing.redis.RedisService;
import com.xwbing.service.sys.SysAuthorityService;
boot-web/src/main/java/com/xwbing/controller/sys/SysConfigControl.java
+1 -1
View File
@@ -1,7 +1,7 @@
package com.xwbing.controller.sys;
import com.alibaba.fastjson.JSONObject;
import com.xwbing.entity.SysConfig;
import com.xwbing.entity.sys.SysConfig;
import com.xwbing.service.sys.SysConfigService;
import com.xwbing.util.JSONObjResult;
import com.xwbing.util.RestMessage;
boot-web/src/main/java/com/xwbing/controller/sys/SysRoleControl.java
+3 -3
View File
@@ -2,9 +2,9 @@ package com.xwbing.controller.sys;
import com.alibaba.fastjson.JSONObject;
import com.xwbing.annotation.LogInfo;
import com.xwbing.entity.SysAuthority;
import com.xwbing.entity.SysRole;
import com.xwbing.entity.SysRoleAuthority;
import com.xwbing.entity.sys.SysAuthority;
import com.xwbing.entity.sys.SysRole;
import com.xwbing.entity.sys.SysRoleAuthority;
import com.xwbing.service.sys.SysAuthorityService;
import com.xwbing.service.sys.SysRoleAuthorityService;
import com.xwbing.service.sys.SysRoleService;
boot-web/src/main/java/com/xwbing/controller/sys/SysUserControl.java
+4 -4
View File
@@ -4,10 +4,10 @@ import com.alibaba.fastjson.JSONObject;
import com.xwbing.annotation.LogInfo;
import com.xwbing.constant.CommonConstant;
import com.xwbing.constant.CommonEnum;
import com.xwbing.entity.SysAuthority;
import com.xwbing.entity.SysRole;
import com.xwbing.entity.SysUser;
import com.xwbing.entity.SysUserRole;
import com.xwbing.entity.sys.SysAuthority;
import com.xwbing.entity.sys.SysRole;
import com.xwbing.entity.sys.SysUser;
import com.xwbing.entity.sys.SysUserRole;
import com.xwbing.service.sys.SysAuthorityService;
import com.xwbing.service.sys.SysRoleService;
import com.xwbing.service.sys.SysUserRoleService;
boot-web/src/main/java/com/xwbing/controller/sys/SysUserLoginInOutControl.java
+1 -1
View File
@@ -2,7 +2,7 @@ package com.xwbing.controller.sys;
import com.alibaba.fastjson.JSONObject;
import com.xwbing.annotation.LogInfo;
import com.xwbing.entity.SysUserLoginInOut;
import com.xwbing.entity.sys.SysUserLoginInOut;
import com.xwbing.service.sys.SysUserLoginInOutService;
import com.xwbing.util.JSONObjResult;
import io.swagger.annotations.Api;