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-20 16:19:48 +08:00
parent 27cbdcd8b5
commit 5f1fcea677
37 changed files with 69 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files
boot-service/src/main/java/com/xwbing/entity/ExpressInfo.java → boot-service/src/main/java/com/xwbing/domain/entity/ExpressInfo.java
+1 -1
View File
@@ -1,4 +1,4 @@
package com.xwbing.entity;
package com.xwbing.domain.entity;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
boot-service/src/main/java/com/xwbing/entity/ExpressTrace.java → boot-service/src/main/java/com/xwbing/domain/entity/ExpressTrace.java
+1 -1
View File
@@ -1,4 +1,4 @@
package com.xwbing.entity;
package com.xwbing.domain.entity;
import lombok.Data;
boot-service/src/main/java/com/xwbing/entity/model/EmailModel.java → boot-service/src/main/java/com/xwbing/domain/entity/model/EmailModel.java
+1 -1
View File
@@ -1,4 +1,4 @@
package com.xwbing.entity.model;
package com.xwbing.domain.entity.model;
import java.util.Date;
boot-service/src/main/java/com/xwbing/entity/model/ValidateModel.java → boot-service/src/main/java/com/xwbing/domain/entity/model/ValidateModel.java
+1 -1
View File
@@ -1,4 +1,4 @@
package com.xwbing.entity.model;
package com.xwbing.domain.entity.model;
import lombok.Data;
import org.hibernate.validator.constraints.Email;
boot-service/src/main/java/com/xwbing/entity/sys/BaseEntity.java → boot-service/src/main/java/com/xwbing/domain/entity/sys/BaseEntity.java
+1 -1
View File
@@ -1,4 +1,4 @@
package com.xwbing.entity.sys;
package com.xwbing.domain.entity.sys;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
boot-service/src/main/java/com/xwbing/entity/sys/SysAuthority.java → boot-service/src/main/java/com/xwbing/domain/entity/sys/SysAuthority.java
+1 -1
View File
@@ -1,4 +1,4 @@
package com.xwbing.entity.sys;
package com.xwbing.domain.entity.sys;
import lombok.Data;
import lombok.EqualsAndHashCode;
boot-service/src/main/java/com/xwbing/entity/sys/SysConfig.java → boot-service/src/main/java/com/xwbing/domain/entity/sys/SysConfig.java
+1 -1
View File
@@ -1,4 +1,4 @@
package com.xwbing.entity.sys;
package com.xwbing.domain.entity.sys;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
boot-service/src/main/java/com/xwbing/entity/sys/SysRole.java → boot-service/src/main/java/com/xwbing/domain/entity/sys/SysRole.java
+1 -1
View File
@@ -1,4 +1,4 @@
package com.xwbing.entity.sys;
package com.xwbing.domain.entity.sys;
import lombok.Data;
import lombok.EqualsAndHashCode;
boot-service/src/main/java/com/xwbing/entity/sys/SysRoleAuthority.java → boot-service/src/main/java/com/xwbing/domain/entity/sys/SysRoleAuthority.java
+1 -1
View File
@@ -1,4 +1,4 @@
package com.xwbing.entity.sys;
package com.xwbing.domain.entity.sys;
import lombok.Data;
import lombok.EqualsAndHashCode;
boot-service/src/main/java/com/xwbing/entity/sys/SysUser.java → boot-service/src/main/java/com/xwbing/domain/entity/sys/SysUser.java
+1 -1
View File
@@ -1,4 +1,4 @@
package com.xwbing.entity.sys;
package com.xwbing.domain.entity.sys;
import lombok.Data;
import lombok.EqualsAndHashCode;
boot-service/src/main/java/com/xwbing/entity/sys/SysUserLoginInOut.java → boot-service/src/main/java/com/xwbing/domain/entity/sys/SysUserLoginInOut.java
+1 -1
View File
@@ -1,4 +1,4 @@
package com.xwbing.entity.sys;
package com.xwbing.domain.entity.sys;
import lombok.Data;
import lombok.EqualsAndHashCode;
boot-service/src/main/java/com/xwbing/entity/sys/SysUserRole.java → boot-service/src/main/java/com/xwbing/domain/entity/sys/SysUserRole.java
+1 -1
View File
@@ -1,4 +1,4 @@
package com.xwbing.entity.sys;
package com.xwbing.domain.entity.sys;
import lombok.Data;
import lombok.EqualsAndHashCode;
boot-service/src/main/java/com/xwbing/entity/vo/ExpressInfoVo.java → boot-service/src/main/java/com/xwbing/domain/entity/vo/ExpressInfoVo.java
+3 -3
View File
@@ -1,6 +1,6 @@
package com.xwbing.entity.vo;
package com.xwbing.domain.entity.vo;
import com.xwbing.entity.ExpressTrace;
import com.xwbing.domain.entity.ExpressTrace;
import lombok.Data;
import java.util.List;
@@ -29,7 +29,7 @@ public class ExpressInfoVo {
/**
* 物流信息
*/
private List<ExpressTrace> expressTraces;
private List<ExpressTrace> traces;
/**
* 描述
*/
boot-service/src/main/java/com/xwbing/entity/vo/SysAuthVo.java → boot-service/src/main/java/com/xwbing/domain/entity/vo/SysAuthVo.java
+2 -2
View File
@@ -1,6 +1,6 @@
package com.xwbing.entity.vo;
package com.xwbing.domain.entity.vo;
import com.xwbing.entity.sys.SysAuthority;
import com.xwbing.domain.entity.sys.SysAuthority;
import lombok.Data;
import org.apache.commons.beanutils.BeanUtils;
boot-service/src/main/java/com/xwbing/repository/sys/SysAuthorityRepository.java → boot-service/src/main/java/com/xwbing/domain/repository/sys/SysAuthorityRepository.java
+2 -2
View File
@@ -1,6 +1,6 @@
package com.xwbing.repository.sys;
package com.xwbing.domain.repository.sys;
import com.xwbing.entity.sys.SysAuthority;
import com.xwbing.domain.entity.sys.SysAuthority;
import org.springframework.data.jpa.repository.JpaRepository;
import java.util.List;
boot-service/src/main/java/com/xwbing/repository/sys/SysConfigRepository.java → boot-service/src/main/java/com/xwbing/domain/repository/sys/SysConfigRepository.java
+2 -2
View File
@@ -1,6 +1,6 @@
package com.xwbing.repository.sys;
package com.xwbing.domain.repository.sys;
import com.xwbing.entity.sys.SysConfig;
import com.xwbing.domain.entity.sys.SysConfig;
import org.springframework.data.jpa.repository.JpaRepository;
import java.util.List;
boot-service/src/main/java/com/xwbing/repository/sys/SysRoleAuthorityRepository.java → boot-service/src/main/java/com/xwbing/domain/repository/sys/SysRoleAuthorityRepository.java
+2 -2
View File
@@ -1,6 +1,6 @@
package com.xwbing.repository.sys;
package com.xwbing.domain.repository.sys;
import com.xwbing.entity.sys.SysRoleAuthority;
import com.xwbing.domain.entity.sys.SysRoleAuthority;
import org.springframework.data.jpa.repository.JpaRepository;
import java.util.List;
boot-service/src/main/java/com/xwbing/repository/sys/SysRoleRepository.java → boot-service/src/main/java/com/xwbing/domain/repository/sys/SysRoleRepository.java
+2 -2
View File
@@ -1,6 +1,6 @@
package com.xwbing.repository.sys;
package com.xwbing.domain.repository.sys;
import com.xwbing.entity.sys.SysRole;
import com.xwbing.domain.entity.sys.SysRole;
import org.springframework.data.jpa.repository.JpaRepository;
import java.util.List;
boot-service/src/main/java/com/xwbing/repository/sys/SysUserLoginInOutRepository.java → boot-service/src/main/java/com/xwbing/domain/repository/sys/SysUserLoginInOutRepository.java
+2 -2
View File
@@ -1,6 +1,6 @@
package com.xwbing.repository.sys;
package com.xwbing.domain.repository.sys;
import com.xwbing.entity.sys.SysUserLoginInOut;
import com.xwbing.domain.entity.sys.SysUserLoginInOut;
import org.springframework.data.jpa.repository.JpaRepository;
import java.util.List;
boot-service/src/main/java/com/xwbing/repository/sys/SysUserRepository.java → boot-service/src/main/java/com/xwbing/domain/repository/sys/SysUserRepository.java
+2 -2
View File
@@ -1,6 +1,6 @@
package com.xwbing.repository.sys;
package com.xwbing.domain.repository.sys;
import com.xwbing.entity.sys.SysUser;
import com.xwbing.domain.entity.sys.SysUser;
import org.springframework.data.jpa.repository.JpaRepository;
/**
* 说明:
boot-service/src/main/java/com/xwbing/repository/sys/SysUserRoleRepository.java → boot-service/src/main/java/com/xwbing/domain/repository/sys/SysUserRoleRepository.java
+2 -2
View File
@@ -1,6 +1,6 @@
package com.xwbing.repository.sys;
package com.xwbing.domain.repository.sys;
import com.xwbing.entity.sys.SysUserRole;
import com.xwbing.domain.entity.sys.SysUserRole;
import org.springframework.data.jpa.repository.JpaRepository;
import java.util.List;
boot-service/src/main/java/com/xwbing/service/ExpressDeliveryService.java
+2 -2
View File
@@ -2,8 +2,8 @@ package com.xwbing.service;
import com.alibaba.fastjson.JSONObject;
import com.xwbing.constant.CommonEnum;
import com.xwbing.entity.ExpressInfo;
import com.xwbing.entity.vo.ExpressInfoVo;
import com.xwbing.domain.entity.ExpressInfo;
import com.xwbing.domain.entity.vo.ExpressInfoVo;
import com.xwbing.exception.BusinessException;
import com.xwbing.util.KdniaoUtil;
import org.apache.commons.lang3.StringUtils;
boot-service/src/main/java/com/xwbing/service/sys/SysAuthorityService.java
+4 -4
View File
@@ -1,11 +1,11 @@
package com.xwbing.service.sys;
import com.xwbing.constant.CommonConstant;
import com.xwbing.entity.sys.SysAuthority;
import com.xwbing.entity.sys.SysRoleAuthority;
import com.xwbing.entity.vo.SysAuthVo;
import com.xwbing.domain.entity.sys.SysAuthority;
import com.xwbing.domain.entity.sys.SysRoleAuthority;
import com.xwbing.domain.entity.vo.SysAuthVo;
import com.xwbing.exception.BusinessException;
import com.xwbing.repository.sys.SysAuthorityRepository;
import com.xwbing.domain.repository.sys.SysAuthorityRepository;
import com.xwbing.util.PassWordUtil;
import com.xwbing.util.RestMessage;
import org.apache.commons.collections.CollectionUtils;
boot-service/src/main/java/com/xwbing/service/sys/SysConfigService.java
+2 -2
View File
@@ -1,8 +1,8 @@
package com.xwbing.service.sys;
import com.xwbing.entity.sys.SysConfig;
import com.xwbing.domain.entity.sys.SysConfig;
import com.xwbing.exception.BusinessException;
import com.xwbing.repository.sys.SysConfigRepository;
import com.xwbing.domain.repository.sys.SysConfigRepository;
import com.xwbing.util.PassWordUtil;
import com.xwbing.util.RestMessage;
import org.slf4j.Logger;
boot-service/src/main/java/com/xwbing/service/sys/SysRoleAuthorityService.java
+2 -2
View File
@@ -1,7 +1,7 @@
package com.xwbing.service.sys;
import com.xwbing.entity.sys.SysRoleAuthority;
import com.xwbing.repository.sys.SysRoleAuthorityRepository;
import com.xwbing.domain.entity.sys.SysRoleAuthority;
import com.xwbing.domain.repository.sys.SysRoleAuthorityRepository;
import com.xwbing.util.PassWordUtil;
import com.xwbing.util.RestMessage;
import org.apache.commons.collections.CollectionUtils;
boot-service/src/main/java/com/xwbing/service/sys/SysRoleService.java
+4 -4
View File
@@ -1,10 +1,10 @@
package com.xwbing.service.sys;
import com.xwbing.entity.sys.SysRole;
import com.xwbing.entity.sys.SysRoleAuthority;
import com.xwbing.entity.sys.SysUserRole;
import com.xwbing.domain.entity.sys.SysRole;
import com.xwbing.domain.entity.sys.SysRoleAuthority;
import com.xwbing.domain.entity.sys.SysUserRole;
import com.xwbing.exception.BusinessException;
import com.xwbing.repository.sys.SysRoleRepository;
import com.xwbing.domain.repository.sys.SysRoleRepository;
import com.xwbing.util.PassWordUtil;
import com.xwbing.util.RestMessage;
import org.apache.commons.collections.CollectionUtils;
boot-service/src/main/java/com/xwbing/service/sys/SysUserLoginInOutService.java
+3 -3
View File
@@ -1,9 +1,9 @@
package com.xwbing.service.sys;
import com.xwbing.constant.CommonEnum;
import com.xwbing.entity.sys.SysUser;
import com.xwbing.entity.sys.SysUserLoginInOut;
import com.xwbing.repository.sys.SysUserLoginInOutRepository;
import com.xwbing.domain.entity.sys.SysUser;
import com.xwbing.domain.entity.sys.SysUserLoginInOut;
import com.xwbing.domain.repository.sys.SysUserLoginInOutRepository;
import com.xwbing.util.DateUtil2;
import com.xwbing.util.PassWordUtil;
import com.xwbing.util.RestMessage;
boot-service/src/main/java/com/xwbing/service/sys/SysUserRoleService.java
+2 -2
View File
@@ -1,7 +1,7 @@
package com.xwbing.service.sys;
import com.xwbing.entity.sys.SysUserRole;
import com.xwbing.repository.sys.SysUserRoleRepository;
import com.xwbing.domain.entity.sys.SysUserRole;
import com.xwbing.domain.repository.sys.SysUserRoleRepository;
import com.xwbing.util.PassWordUtil;
import com.xwbing.util.RestMessage;
import org.apache.commons.collections.CollectionUtils;
boot-service/src/main/java/com/xwbing/service/sys/SysUserService.java
+3 -3
View File
@@ -3,10 +3,10 @@ package com.xwbing.service.sys;
import com.alibaba.fastjson.JSONObject;
import com.xwbing.constant.CommonConstant;
import com.xwbing.constant.CommonEnum;
import com.xwbing.entity.model.EmailModel;
import com.xwbing.entity.sys.*;
import com.xwbing.domain.entity.model.EmailModel;
import com.xwbing.domain.entity.sys.*;
import com.xwbing.exception.BusinessException;
import com.xwbing.repository.sys.SysUserRepository;
import com.xwbing.domain.repository.sys.SysUserRepository;
import com.xwbing.util.*;
import org.apache.commons.collections.CollectionUtils;
import org.springframework.stereotype.Service;
boot-service/src/main/java/com/xwbing/util/EmailUtil.java
+1 -1
View File
@@ -1,7 +1,7 @@
package com.xwbing.util;
import com.xwbing.entity.model.EmailModel;
import com.xwbing.domain.entity.model.EmailModel;
import com.xwbing.exception.BusinessException;
import org.apache.commons.lang3.StringUtils;
boot-web/src/main/java/com/xwbing/controller/TestControl.java
+2 -2
View File
@@ -2,8 +2,8 @@ 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.domain.entity.ExpressInfo;
import com.xwbing.domain.entity.vo.ExpressInfoVo;
import com.xwbing.redis.RedisService;
import com.xwbing.service.ExpressDeliveryService;
import com.xwbing.service.QRCodeZipService;
boot-web/src/main/java/com/xwbing/controller/sys/SysAuthorityControl.java
+2 -2
View File
@@ -5,8 +5,8 @@ import com.alibaba.fastjson.JSONObject;
import com.xwbing.annotation.LogInfo;
import com.xwbing.constant.CommonConstant;
import com.xwbing.constant.CommonEnum;
import com.xwbing.entity.sys.SysAuthority;
import com.xwbing.entity.vo.SysAuthVo;
import com.xwbing.domain.entity.sys.SysAuthority;
import com.xwbing.domain.entity.vo.SysAuthVo;
import com.xwbing.redis.RedisService;
import com.xwbing.service.sys.SysAuthorityService;
import com.xwbing.util.JSONObjResult;
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.sys.SysConfig;
import com.xwbing.domain.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.sys.SysAuthority;
import com.xwbing.entity.sys.SysRole;
import com.xwbing.entity.sys.SysRoleAuthority;
import com.xwbing.domain.entity.sys.SysAuthority;
import com.xwbing.domain.entity.sys.SysRole;
import com.xwbing.domain.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.sys.SysAuthority;
import com.xwbing.entity.sys.SysRole;
import com.xwbing.entity.sys.SysUser;
import com.xwbing.entity.sys.SysUserRole;
import com.xwbing.domain.entity.sys.SysAuthority;
import com.xwbing.domain.entity.sys.SysRole;
import com.xwbing.domain.entity.sys.SysUser;
import com.xwbing.domain.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.sys.SysUserLoginInOut;
import com.xwbing.domain.entity.sys.SysUserLoginInOut;
import com.xwbing.service.sys.SysUserLoginInOutService;
import com.xwbing.util.JSONObjResult;
import io.swagger.annotations.Api;
pom.xml
+2 -1
View File
@@ -38,6 +38,7 @@
<fileUpLoad.version>1.3.1</fileUpLoad.version>
<lombok.version>1.16.16</lombok.version>
<zxing.version>3.2.1</zxing.version>
<fastjson.veersion>1.2.20</fastjson.veersion>
<!-- 打包跳过单元测试 -->
<skipTests>true</skipTests>
<swagger2.version>2.4.0</swagger2.version>
@@ -67,7 +68,7 @@
<dependency>
<groupId>com.alibaba</groupId>
<artifactId>fastjson</artifactId>
<version>1.2.20</version>
<version>${fastjson.veersion}</version>
</dependency>
<dependency>
<groupId>com.google.code.gson</groupId>