diff --git a/bonus-cust-auth/src/main/java/com/bonus/auth/constant/CustLoginTypeEnum.java b/bonus-common-biz/src/main/java/net/xnzn/constant/CustLoginTypeEnum.java similarity index 98% rename from bonus-cust-auth/src/main/java/com/bonus/auth/constant/CustLoginTypeEnum.java rename to bonus-common-biz/src/main/java/net/xnzn/constant/CustLoginTypeEnum.java index e6871fa3..5933ca75 100644 --- a/bonus-cust-auth/src/main/java/com/bonus/auth/constant/CustLoginTypeEnum.java +++ b/bonus-common-biz/src/main/java/net/xnzn/constant/CustLoginTypeEnum.java @@ -1,4 +1,4 @@ -package com.bonus.auth.constant; +package net.xnzn.constant; import java.util.HashMap; import java.util.Map; diff --git a/bonus-cust-auth/src/main/java/com/bonus/auth/constant/DelFlagEnum.java b/bonus-common-biz/src/main/java/net/xnzn/constant/DelFlagEnum.java similarity index 91% rename from bonus-cust-auth/src/main/java/com/bonus/auth/constant/DelFlagEnum.java rename to bonus-common-biz/src/main/java/net/xnzn/constant/DelFlagEnum.java index d3376e39..7d0d16f0 100644 --- a/bonus-cust-auth/src/main/java/com/bonus/auth/constant/DelFlagEnum.java +++ b/bonus-common-biz/src/main/java/net/xnzn/constant/DelFlagEnum.java @@ -1,4 +1,4 @@ -package com.bonus.auth.constant; +package net.xnzn.constant; public enum DelFlagEnum { DEL_TRUE(1, "删除"), diff --git a/bonus-cust-auth/src/main/java/com/bonus/auth/domain/CustCasual.java b/bonus-common-biz/src/main/java/net/xnzn/domain/CustCasual.java similarity index 99% rename from bonus-cust-auth/src/main/java/com/bonus/auth/domain/CustCasual.java rename to bonus-common-biz/src/main/java/net/xnzn/domain/CustCasual.java index 6faef957..088ed3be 100644 --- a/bonus-cust-auth/src/main/java/com/bonus/auth/domain/CustCasual.java +++ b/bonus-common-biz/src/main/java/net/xnzn/domain/CustCasual.java @@ -1,4 +1,4 @@ -package com.bonus.auth.domain; +package net.xnzn.domain; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; diff --git a/bonus-cust-auth/src/main/java/com/bonus/auth/domain/CustCasualModel.java b/bonus-common-biz/src/main/java/net/xnzn/domain/CustCasualModel.java similarity index 93% rename from bonus-cust-auth/src/main/java/com/bonus/auth/domain/CustCasualModel.java rename to bonus-common-biz/src/main/java/net/xnzn/domain/CustCasualModel.java index 98bf9fad..fca22053 100644 --- a/bonus-cust-auth/src/main/java/com/bonus/auth/domain/CustCasualModel.java +++ b/bonus-common-biz/src/main/java/net/xnzn/domain/CustCasualModel.java @@ -1,4 +1,4 @@ -package com.bonus.auth.domain; +package net.xnzn.domain; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/bonus-cust-auth/src/main/java/com/bonus/auth/domain/CustInfo.java b/bonus-common-biz/src/main/java/net/xnzn/domain/CustInfo.java similarity index 99% rename from bonus-cust-auth/src/main/java/com/bonus/auth/domain/CustInfo.java rename to bonus-common-biz/src/main/java/net/xnzn/domain/CustInfo.java index 2b6d3997..72953e00 100644 --- a/bonus-cust-auth/src/main/java/com/bonus/auth/domain/CustInfo.java +++ b/bonus-common-biz/src/main/java/net/xnzn/domain/CustInfo.java @@ -1,4 +1,4 @@ -package com.bonus.auth.domain; +package net.xnzn.domain; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; diff --git a/bonus-cust-auth/src/main/java/com/bonus/auth/domain/CustInfoAppIdLoginDTO.java b/bonus-common-biz/src/main/java/net/xnzn/domain/CustInfoAppIdLoginDTO.java similarity index 95% rename from bonus-cust-auth/src/main/java/com/bonus/auth/domain/CustInfoAppIdLoginDTO.java rename to bonus-common-biz/src/main/java/net/xnzn/domain/CustInfoAppIdLoginDTO.java index 8e802100..422a91e3 100644 --- a/bonus-cust-auth/src/main/java/com/bonus/auth/domain/CustInfoAppIdLoginDTO.java +++ b/bonus-common-biz/src/main/java/net/xnzn/domain/CustInfoAppIdLoginDTO.java @@ -1,4 +1,4 @@ -package com.bonus.auth.domain; +package net.xnzn.domain; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/bonus-common-biz/src/main/java/net/xnzn/utils/LeRequest.java b/bonus-common-biz/src/main/java/net/xnzn/utils/LeRequest.java index 554ec094..f4a54158 100644 --- a/bonus-common-biz/src/main/java/net/xnzn/utils/LeRequest.java +++ b/bonus-common-biz/src/main/java/net/xnzn/utils/LeRequest.java @@ -1,68 +1,68 @@ -package net.xnzn.utils; - -import io.swagger.annotations.ApiModelProperty; - -import javax.validation.Valid; - -public class LeRequest { - @ApiModelProperty("版本控制") - private String version; - @ApiModelProperty("随机字符串") - private String nonceStr; - @ApiModelProperty("时间戳") - private String timestamp; - @ApiModelProperty("签名类型") - private String signType; - @ApiModelProperty("业务参数") - private @Valid T content; - @ApiModelProperty("签名") - private String sign; - - public String getVersion() { - return this.version; - } - - public String getNonceStr() { - return this.nonceStr; - } - - public String getTimestamp() { - return this.timestamp; - } - - public String getSignType() { - return this.signType; - } - - public T getContent() { - return this.content; - } - - public String getSign() { - return this.sign; - } - - public void setVersion(final String version) { - this.version = version; - } - - public void setNonceStr(final String nonceStr) { - this.nonceStr = nonceStr; - } - - public void setTimestamp(final String timestamp) { - this.timestamp = timestamp; - } - - public void setSignType(final String signType) { - this.signType = signType; - } - - public void setContent(final T content) { - this.content = content; - } - - public void setSign(final String sign) { - this.sign = sign; - } -} +//package net.xnzn.utils; +// +//import io.swagger.annotations.ApiModelProperty; +// +//import javax.validation.Valid; +// +//public class LeRequest { +// @ApiModelProperty("版本控制") +// private String version; +// @ApiModelProperty("随机字符串") +// private String nonceStr; +// @ApiModelProperty("时间戳") +// private String timestamp; +// @ApiModelProperty("签名类型") +// private String signType; +// @ApiModelProperty("业务参数") +// private @Valid T content; +// @ApiModelProperty("签名") +// private String sign; +// +// public String getVersion() { +// return this.version; +// } +// +// public String getNonceStr() { +// return this.nonceStr; +// } +// +// public String getTimestamp() { +// return this.timestamp; +// } +// +// public String getSignType() { +// return this.signType; +// } +// +// public T getContent() { +// return this.content; +// } +// +// public String getSign() { +// return this.sign; +// } +// +// public void setVersion(final String version) { +// this.version = version; +// } +// +// public void setNonceStr(final String nonceStr) { +// this.nonceStr = nonceStr; +// } +// +// public void setTimestamp(final String timestamp) { +// this.timestamp = timestamp; +// } +// +// public void setSignType(final String signType) { +// this.signType = signType; +// } +// +// public void setContent(final T content) { +// this.content = content; +// } +// +// public void setSign(final String sign) { +// this.sign = sign; +// } +//} diff --git a/bonus-common-biz/src/main/java/net/xnzn/utils/LeResponse.java b/bonus-common-biz/src/main/java/net/xnzn/utils/LeResponse.java index a2fce79b..ba0bb39b 100644 --- a/bonus-common-biz/src/main/java/net/xnzn/utils/LeResponse.java +++ b/bonus-common-biz/src/main/java/net/xnzn/utils/LeResponse.java @@ -1,70 +1,70 @@ -package net.xnzn.utils; - -import io.swagger.annotations.ApiModel; -import net.xnzn.framework.config.response.ResponseWrapper; - -@ApiModel( - description = "响应数据" -) -public class LeResponse extends ResponseWrapper { - public static LeResponse succ() { - return (LeResponse) restResult(RetCodeEnum.SUCC.getKey(), RetCodeEnum.SUCC.getDesc(), (Object)null); - } - - public static LeResponse succ(T returnData) { - return restResult(RetCodeEnum.SUCC.getKey(), RetCodeEnum.SUCC.getDesc(), returnData); - } - - public static LeResponse succ(String msg, T returnData) { - return restResult(RetCodeEnum.SUCC.getKey(), msg, returnData); - } - - public static LeResponse succ(RetCodeEnum retCodeEnum) { - return (LeResponse) restResult(retCodeEnum.getKey(), retCodeEnum.getDesc(), (Object)null); - } - - public static LeResponse succ(Integer code, String msg) { - return (LeResponse) restResult(code, msg, (Object)null); - } - - public static LeResponse fail() { - return (LeResponse) restResult(RetCodeEnum.FAIL.getKey(), RetCodeEnum.FAIL.getDesc(), (Object)null); - } - - public static LeResponse fail(String errorMsg) { - return (LeResponse) restResult(RetCodeEnum.FAIL.getKey(), errorMsg, (Object)null); - } - - public static LeResponse fail(RetCodeEnum retCodeEnum, String errorMsg) { - return (LeResponse) restResult(retCodeEnum.getKey(), errorMsg, (Object)null); - } - - public static LeResponse fail(Integer code, String errorMsg) { - return (LeResponse) restResult(code, errorMsg, (Object)null); - } - - public static LeResponse fail(RetCodeEnum retCodeEnum, T returnData) { - return restResult(retCodeEnum.getKey(), retCodeEnum.getDesc(), returnData); - } - - public static LeResponse fail(Integer code, T returnData) { - return restResult(code, (String)null, returnData); - } - - public static LeResponse fail(RetCodeEnum retCodeEnum, String errorMsg, T returnData) { - return restResult(retCodeEnum.getKey(), errorMsg, returnData); - } - - public static LeResponse fail(Integer code, String errorMsg, T returnData) { - return restResult(code, errorMsg, returnData); - } - - private static LeResponse restResult(Integer code, String msg, T returnData) { - LeResponse apiResult = new LeResponse(); - apiResult.setCode(code); - apiResult.setMsg(msg); - apiResult.setData(returnData); - return apiResult; - } - -} +//package net.xnzn.utils; +// +//import io.swagger.annotations.ApiModel; +//import net.xnzn.framework.config.response.ResponseWrapper; +// +//@ApiModel( +// description = "响应数据" +//) +//public class LeResponse extends ResponseWrapper { +// public static LeResponse succ() { +// return (LeResponse) restResult(RetCodeEnum.SUCC.getKey(), RetCodeEnum.SUCC.getDesc(), (Object)null); +// } +// +// public static LeResponse succ(T returnData) { +// return restResult(RetCodeEnum.SUCC.getKey(), RetCodeEnum.SUCC.getDesc(), returnData); +// } +// +// public static LeResponse succ(String msg, T returnData) { +// return restResult(RetCodeEnum.SUCC.getKey(), msg, returnData); +// } +// +// public static LeResponse succ(RetCodeEnum retCodeEnum) { +// return (LeResponse) restResult(retCodeEnum.getKey(), retCodeEnum.getDesc(), (Object)null); +// } +// +// public static LeResponse succ(Integer code, String msg) { +// return (LeResponse) restResult(code, msg, (Object)null); +// } +// +// public static LeResponse fail() { +// return (LeResponse) restResult(RetCodeEnum.FAIL.getKey(), RetCodeEnum.FAIL.getDesc(), (Object)null); +// } +// +// public static LeResponse fail(String errorMsg) { +// return (LeResponse) restResult(RetCodeEnum.FAIL.getKey(), errorMsg, (Object)null); +// } +// +// public static LeResponse fail(RetCodeEnum retCodeEnum, String errorMsg) { +// return (LeResponse) restResult(retCodeEnum.getKey(), errorMsg, (Object)null); +// } +// +// public static LeResponse fail(Integer code, String errorMsg) { +// return (LeResponse) restResult(code, errorMsg, (Object)null); +// } +// +// public static LeResponse fail(RetCodeEnum retCodeEnum, T returnData) { +// return restResult(retCodeEnum.getKey(), retCodeEnum.getDesc(), returnData); +// } +// +// public static LeResponse fail(Integer code, T returnData) { +// return restResult(code, (String)null, returnData); +// } +// +// public static LeResponse fail(RetCodeEnum retCodeEnum, String errorMsg, T returnData) { +// return restResult(retCodeEnum.getKey(), errorMsg, returnData); +// } +// +// public static LeResponse fail(Integer code, String errorMsg, T returnData) { +// return restResult(code, errorMsg, returnData); +// } +// +// private static LeResponse restResult(Integer code, String msg, T returnData) { +// LeResponse apiResult = new LeResponse(); +// apiResult.setCode(code); +// apiResult.setMsg(msg); +// apiResult.setData(returnData); +// return apiResult; +// } +// +//} diff --git a/bonus-cust-auth/src/main/java/com/bonus/auth/controller/TokenController.java b/bonus-cust-auth/src/main/java/com/bonus/auth/controller/TokenController.java index cd7000fc..1267de54 100644 --- a/bonus-cust-auth/src/main/java/com/bonus/auth/controller/TokenController.java +++ b/bonus-cust-auth/src/main/java/com/bonus/auth/controller/TokenController.java @@ -2,10 +2,10 @@ package com.bonus.auth.controller; import cn.hutool.core.text.CharSequenceUtil; import cn.hutool.core.util.IdUtil; -import com.bonus.auth.constant.CustLoginTypeEnum; -import com.bonus.auth.constant.DelFlagEnum; -import com.bonus.auth.domain.CustCasual; -import com.bonus.auth.domain.CustInfo; +import net.xnzn.constant.CustLoginTypeEnum; +import net.xnzn.constant.DelFlagEnum; +import net.xnzn.domain.CustCasual; +import net.xnzn.domain.CustInfo; import net.xnzn.domain.CustInfoAppIdLoginVO; import com.bonus.auth.factory.LoginStrategyFactory; import com.bonus.auth.form.LoginBody; @@ -26,7 +26,6 @@ import com.bonus.common.security.utils.SecurityUtils; import com.bonus.config.SystemConfig; import com.bonus.system.api.RemoteConfigService; import com.bonus.system.api.RemoteUserService; -import com.bonus.system.api.model.LoginUser; import lombok.extern.slf4j.Slf4j; import net.xnzn.service.TokenService; import org.springframework.beans.factory.annotation.Autowired; diff --git a/bonus-cust-auth/src/main/java/com/bonus/auth/mapper/CustCasualMapper.java b/bonus-cust-auth/src/main/java/com/bonus/auth/mapper/CustCasualMapper.java index 08f5afd1..89f39f79 100644 --- a/bonus-cust-auth/src/main/java/com/bonus/auth/mapper/CustCasualMapper.java +++ b/bonus-cust-auth/src/main/java/com/bonus/auth/mapper/CustCasualMapper.java @@ -1,10 +1,9 @@ package com.bonus.auth.mapper; -import com.bonus.auth.domain.CustCasual; -import com.bonus.auth.domain.CustCasualModel; +import net.xnzn.domain.CustCasual; +import net.xnzn.domain.CustCasualModel; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; -import org.apache.ibatis.annotations.Select; import java.util.List; diff --git a/bonus-cust-auth/src/main/java/com/bonus/auth/mapper/CustInfoMapper.java b/bonus-cust-auth/src/main/java/com/bonus/auth/mapper/CustInfoMapper.java index ed061e18..5233dc89 100644 --- a/bonus-cust-auth/src/main/java/com/bonus/auth/mapper/CustInfoMapper.java +++ b/bonus-cust-auth/src/main/java/com/bonus/auth/mapper/CustInfoMapper.java @@ -1,6 +1,6 @@ package com.bonus.auth.mapper; -import com.bonus.auth.domain.CustInfo; +import net.xnzn.domain.CustInfo; import net.xnzn.domain.CustInfoAppIdLoginVO; import org.apache.ibatis.annotations.Mapper; diff --git a/bonus-cust-auth/src/main/resources/mapper/CustCasualMapper.xml b/bonus-cust-auth/src/main/resources/mapper/CustCasualMapper.xml index d52d3aeb..5802f9d7 100644 --- a/bonus-cust-auth/src/main/resources/mapper/CustCasualMapper.xml +++ b/bonus-cust-auth/src/main/resources/mapper/CustCasualMapper.xml @@ -2,7 +2,7 @@ - + @@ -21,7 +21,7 @@ + type="net.xnzn.domain.CustCasualModel"> @@ -29,7 +29,7 @@ - select casual_id, openid from cust_casual where cust_id = #{custId} and source_type = #{sourceType} and if_del = #{ifDel}