Skip to content

Z
zion
提交 6476a0d0 authored 作者: zhengfg's avatar zhengfg
浏览文件
操作

1、删除多余文件 

2、加入项目文档说明
3、暂时去除汇率
4、修复一些bug
上级 f233dc7e
隐藏空白字符变更
内嵌 并排
正在显示 包含 20 行增加 和 594 行删除
README.md
浏览文件 @ 6476a0d0
...@@ -13,7 +13,7 @@ ...@@ -13,7 +13,7 @@
1. master这个包下面放的是项目通用的类，比如项目模块配置类、异常处理、spring security相关的东西。 1. master这个包下面放的是项目通用的类，比如项目模块配置类、异常处理、spring security相关的东西。
* base 放的是基类 * base 放的是基类
* bo 业务用到的封装类 * bo 业务用到的封装类
* captcha 邮箱发送验证码相关的类 * captcha 邮箱发送验证码相关的类，源邮箱需要开启 SMTP、POP3服务
* common 公用的功能类，比如redis、管理token相关的类 * common 公用的功能类，比如redis、管理token相关的类
* config 项目模块注册的配置类。比如redis、mysql扫描、freemarker（生成邮件模板）、swagger文档等等 * config 项目模块注册的配置类。比如redis、mysql扫描、freemarker（生成邮件模板）、swagger文档等等
* dao 数据访问基类 * dao 数据访问基类
...@@ -53,5 +53,5 @@ ...@@ -53,5 +53,5 @@
* logback-spring.xml 日志配置文件 * logback-spring.xml 日志配置文件
4. test 包 4. test 包
* 略 * 略
#接口文档地址 # 接口文档地址
[http://localhost:8083/zion/swagger-ui.html](http://localhost:8083/zion/swagger-ui.html) [http://localhost:8083/zion/swagger-ui.html](http://localhost:8083/zion/swagger-ui.html)
\ No newline at end of file
src/main/java/com/diaoyun/zion/chinafrica/client/ClientFilter.java deleted 100644 → 0
浏览文件 @ f233dc7e
package com.diaoyun.zion.chinafrica.client;
import org.springframework.http.HttpStatus;
import javax.servlet.*;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import java.io.IOException;
import java.io.PrintWriter;
/**
* Filter基类
*
* @author Joe
*/
public abstract class ClientFilter extends ParamFilter implements Filter {
public abstract boolean isAccessAllowed(HttpServletRequest request, HttpServletResponse response)
throws IOException;
protected boolean isAjaxRequest(HttpServletRequest request) {
String requestedWith = request.getHeader("X-Requested-With");
return requestedWith != null ? "XMLHttpRequest".equals(requestedWith) : false;
}
protected void responseJson(HttpServletResponse response, int code, String message) throws IOException {
response.setContentType("application/json;charset=UTF-8");
response.setStatus(HttpStatus.OK.value());
PrintWriter writer = response.getWriter();
writer.write(new StringBuilder().append("{\"code\":").append(code).append(",\"message\":\"").append(message)
.append("\"}").toString());
writer.flush();
writer.close();
}
@Override
public void init(FilterConfig filterConfig) throws ServletException {
}
@Override
public void doFilter(ServletRequest request, ServletResponse response, FilterChain chain)
throws IOException {
}
@Override
public void destroy() {
}
}
\ No newline at end of file
src/main/java/com/diaoyun/zion/chinafrica/client/ParamFilter.java deleted 100644 → 0
浏览文件 @ f233dc7e
package com.diaoyun.zion.chinafrica.client;
import com.diaoyun.zion.chinafrica.rpc.AuthenticationRpcService;
/**
* 参数注入Filter
*
* @author Joe
*/
public class ParamFilter {
// 单点登录服务端URL TODO 改为配置
protected String ssoServerUrl="/zion";
// 单点登录服务端提供的RPC服务，由Spring容器注入
protected AuthenticationRpcService authenticationRpcService;
public void setSsoServerUrl(String ssoServerUrl) {
this.ssoServerUrl = ssoServerUrl;
}
public String getSsoServerUrl() {
return ssoServerUrl;
}
public void setAuthenticationRpcService(AuthenticationRpcService authenticationRpcService) {
this.authenticationRpcService = authenticationRpcService;
}
public AuthenticationRpcService getAuthenticationRpcService() {
return authenticationRpcService;
}
}
\ No newline at end of file
src/main/java/com/diaoyun/zion/chinafrica/client/SessionUser.java deleted 100644 → 0
浏览文件 @ f233dc7e
package com.diaoyun.zion.chinafrica.client;
import java.io.Serializable;
/**
* 已登录用户信息
*
* @author Joe
*/
public class SessionUser implements Serializable {
private static final long serialVersionUID = 1764365572138947234L;
// 登录用户访问Token
private String token;
// 登录名
private String account;
public SessionUser() {
super();
}
public SessionUser(String token, String account) {
super();
this.token = token;
this.account = account;
}
public String getToken() {
return token;
}
public void setToken(String token) {
this.token = token;
}
public String getAccount() {
return account;
}
public void setAccount(String account) {
this.account = account;
}
}
src/main/java/com/diaoyun/zion/chinafrica/client/SessionUtils.java deleted 100644 → 0
浏览文件 @ f233dc7e
package com.diaoyun.zion.chinafrica.client;
import org.springframework.web.util.WebUtils;
import javax.servlet.http.HttpServletRequest;
/**
* 当前已登录用户Session工具
*
* @author Joe
*/
public class SessionUtils {
/**
* 用户信息
*/
public static final String SESSION_USER = "_sessionUser";
/**
* 用户权限
*/
public static final String SESSION_USER_PERMISSION = "_sessionUserPermission";
public static SessionUser getSessionUser(HttpServletRequest request) {
return (SessionUser) WebUtils.getSessionAttribute(request, SESSION_USER);
}
public static void setSessionUser(HttpServletRequest request, SessionUser sessionUser) {
WebUtils.setSessionAttribute(request, SESSION_USER, sessionUser);
}
/*public static SessionPermission getSessionPermission(HttpServletRequest request) {
return (SessionPermission) WebUtils.getSessionAttribute(request, SESSION_USER_PERMISSION);
}*/
/*public static void setSessionPermission(HttpServletRequest request, SessionPermission sessionPermission) {
WebUtils.setSessionAttribute(request, SESSION_USER_PERMISSION, sessionPermission);
}*/
public static void invalidate(HttpServletRequest request){
setSessionUser(request, null);
//setSessionPermission(request, null);
}
}
\ No newline at end of file
src/main/java/com/diaoyun/zion/chinafrica/client/SsoFilter.java deleted 100644 → 0
浏览文件 @ f233dc7e
package com.diaoyun.zion.chinafrica.client;
import org.apache.http.Consts;
import javax.servlet.*;
import javax.servlet.annotation.WebFilter;
import javax.servlet.annotation.WebInitParam;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import java.io.IOException;
import java.net.URLEncoder;
/**
* 登录及Token验证Filter
* 没做完，暂时不开启
* @author Joe
*/
/*@WebFilter(filterName = "SsoFilter",urlPatterns = {"/*"})*/
public class SsoFilter extends ClientFilter {
// sso授权回调参数token名称
public static final String SSO_TOKEN_NAME = "__vt_param__";
@Override
public boolean isAccessAllowed(HttpServletRequest request, HttpServletResponse response) throws IOException {
String token = getLocalToken(request);
if (token == null) {
token = request.getParameter(SSO_TOKEN_NAME);
if (token != null) {
invokeAuthInfoInSession(request, token);
// 再跳转一次当前URL，以便去掉URL中token参数
response.sendRedirect(getRemoveTokenBackUrl(request));
return false;
}
}
else if (authenticationRpcService.validate(token)) {// 验证token是否有效
return true;
}
redirectLogin(request, response);
return false;
}
/**
* 获取Session中token
*
* @param request
* @return
*/
private String getLocalToken(HttpServletRequest request) {
SessionUser sessionUser = SessionUtils.getSessionUser(request);
return sessionUser == null ? null : sessionUser.getToken();
}
/**
* 存储sessionUser
*
* @param request
* @return
* @throws IOException
*/
private void invokeAuthInfoInSession(HttpServletRequest request, String token) throws IOException {
SessionUser sessionUser = authenticationRpcService.findAuthInfo(token);
if (sessionUser != null) {
SessionUtils.setSessionUser(request, new SessionUser(token, sessionUser.getAccount()));
}
}
/**
* 跳转登录
*
* @param request
* @param response
* @throws IOException
*/
private void
redirectLogin(HttpServletRequest request, HttpServletResponse response) throws IOException {
if (isAjaxRequest(request)) {
responseJson(response, SsoResultCode.SSO_TOKEN_ERROR, "未登录或已超时");
}
else {
SessionUtils.invalidate(request);
String backUrl=getBackUrl(request);
String ssoLoginUrl = new StringBuilder().append(ssoServerUrl)
.append("/login?backUrl=").append(URLEncoder.encode(backUrl, Consts.UTF_8.name())).toString();
response.sendRedirect(ssoLoginUrl);
}
}
/**
* 去除返回地址中的token参数
* @param request
* @return
*/
private String getRemoveTokenBackUrl(HttpServletRequest request) {
String backUrl = getBackUrl(request);
return backUrl.substring(0, backUrl.indexOf(SSO_TOKEN_NAME) - 1);
}
/**
* 返回地址
* @param request
* @return
*/
private String getBackUrl(HttpServletRequest request) {
return new StringBuilder().append(request.getRequestURL())
.append(request.getQueryString() == null ? "" : "?" + request.getQueryString()).toString();
}
@Override
public void init(FilterConfig filterConfig) throws ServletException {
}
@Override
public void doFilter(ServletRequest request, ServletResponse response, FilterChain chain)
throws IOException {
HttpServletRequest httpRequest = (HttpServletRequest) request;
HttpServletResponse httpResponse = (HttpServletResponse) response;
String path = ((HttpServletRequest) request).getRequestURI();
if (path.contains("/login")||path.contains("/css/")||path.contains("/js/")) {
try {
chain.doFilter(request, response); // 排除的url
} catch (ServletException e) {
e.printStackTrace();
}
} else {
isAccessAllowed(httpRequest,httpResponse);
}
}
@Override
public void destroy() {
}
}
\ No newline at end of file
src/main/java/com/diaoyun/zion/chinafrica/client/SsoResultCode.java deleted 100644 → 0
浏览文件 @ f233dc7e
package com.diaoyun.zion.chinafrica.client;
/**
* 单点登录权限返回码
*
* @author Joe
*/
public class SsoResultCode {
// SSO 用户授权出错
public final static int SSO_TOKEN_ERROR = 1001; // TOKEN未授权或已过期
public final static int SSO_PERMISSION_ERROR = 1002; // 没有访问权限
}
src/main/java/com/diaoyun/zion/chinafrica/controller/LoginController.java
浏览文件 @ 6476a0d0
...@@ -57,6 +57,8 @@ public class LoginController extends BaseController { ...@@ -57,6 +57,8 @@ public class LoginController extends BaseController {
@ApiOperation("第三方登录") @ApiOperation("第三方登录")
@PostMapping("/thirdParty") @PostMapping("/thirdParty")
// TODO
@Deprecated
public Result<TbCfUserInfoVo> loginByThirdParty(@ApiParam("第三方账号") @RequestParam(required = false) String amount, public Result<TbCfUserInfoVo> loginByThirdParty(@ApiParam("第三方账号") @RequestParam(required = false) String amount,
@ApiParam("用户昵称 url编码") @RequestParam(required = false) String nick, @ApiParam("用户昵称 url编码") @RequestParam(required = false) String nick,
@ApiParam("账号类型") @RequestParam(required = false) String userType) throws UnsupportedEncodingException { @ApiParam("账号类型") @RequestParam(required = false) String userType) throws UnsupportedEncodingException {
......
src/main/java/com/diaoyun/zion/chinafrica/controller/TbCfCategoryHsController.java
浏览文件 @ 6476a0d0
...@@ -25,6 +25,7 @@ import java.util.Map; ...@@ -25,6 +25,7 @@ import java.util.Map;
@Api(tags = "报关类型") @Api(tags = "报关类型")
@RestController @RestController
@RequestMapping("categoryhs") @RequestMapping("categoryhs")
@Deprecated
public class TbCfCategoryHsController { public class TbCfCategoryHsController {
@Autowired @Autowired
private TbCfCategoryHsService tbCfCategoryHsService; private TbCfCategoryHsService tbCfCategoryHsService;
......
src/main/java/com/diaoyun/zion/chinafrica/controller/TbCfCouponUseController.java deleted 100644 → 0
浏览文件 @ f233dc7e
package com.diaoyun.zion.chinafrica.controller;
import com.diaoyun.zion.chinafrica.service.TbCfCouponUseService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.RestController;
import org.springframework.web.bind.annotation.RequestMapping;
/**
* 使用优惠券记录Controller
*
* @author G
* @date 2019-08-14 09:11:47
*/
@RestController
@RequestMapping("tbcfcouponUse")
public class TbCfCouponUseController {
@Autowired
private TbCfCouponUseService tbCfCouponUseService;
}
src/main/java/com/diaoyun/zion/chinafrica/controller/TbCfFeeController.java deleted 100644 → 0
浏览文件 @ f233dc7e
package com.diaoyun.zion.chinafrica.controller;
import com.diaoyun.zion.chinafrica.service.TbCfFeeService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.RestController;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.ResponseBody;
import java.util.List;
import java.util.Map;
/**
* 手续费Controller
*
* @author G
* @date 2019-08-14 09:11:48
*/
@RestController
@RequestMapping("fee")
public class TbCfFeeController {
@Autowired
private TbCfFeeService tbCfFeeService;
}
src/main/java/com/diaoyun/zion/chinafrica/controller/TbCfFinanceController.java deleted 100644 → 0
浏览文件 @ f233dc7e
package com.diaoyun.zion.chinafrica.controller;
import com.diaoyun.zion.chinafrica.service.TbCfFinanceService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.RestController;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.ResponseBody;
import java.util.List;
import java.util.Map;
/**
* 财务明细Controller
*
* @author G
* @date 2019-08-14 09:11:48
*/
@RestController
@RequestMapping("tbcffinance")
public class TbCfFinanceController {
@Autowired
private TbCfFinanceService tbCfFinanceService;
}
src/main/java/com/diaoyun/zion/chinafrica/controller/TbCfItemOrderRController.java deleted 100644 → 0
浏览文件 @ f233dc7e
package com.diaoyun.zion.chinafrica.controller;
import com.diaoyun.zion.chinafrica.service.TbCfItemOrderRService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.RestController;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.ResponseBody;
import java.util.List;
import java.util.Map;
/**
* 订单商品对应表Controller
*
* @author G
* @date 2019-08-14 09:11:48
*/
@RestController
@RequestMapping("tbcfitemorderr")
public class TbCfItemOrderRController {
@Autowired
private TbCfItemOrderRService tbCfItemOrderRService;
}
src/main/java/com/diaoyun/zion/chinafrica/controller/TbCfPlatformOrderController.java deleted 100644 → 0
浏览文件 @ f233dc7e
package com.diaoyun.zion.chinafrica.controller;
import com.diaoyun.zion.chinafrica.service.TbCfPlatformOrderService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.RestController;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.ResponseBody;
import java.util.List;
import java.util.Map;
/**
* 第三方平台对应订单信息Controller
*
* @author G
* @date 2019-08-14 09:11:48
*/
@RestController
@RequestMapping("tbcfplatformorder")
public class TbCfPlatformOrderController {
@Autowired
private TbCfPlatformOrderService tbCfPlatformOrderService;
}
src/main/java/com/diaoyun/zion/chinafrica/controller/TbCfTakeCouponController.java deleted 100644 → 0
浏览文件 @ f233dc7e
package com.diaoyun.zion.chinafrica.controller;
import com.diaoyun.zion.chinafrica.service.TbCfTakeCouponService;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.RestController;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
/**
* 用户领取优惠券列表Controller
*
* @author lipengjun
* @date 2019-08-29 11:33:33
*/
@RestController
@RequestMapping("tbcftakecoupon")
public class TbCfTakeCouponController {
@Autowired
private TbCfTakeCouponService tbCfTakeCouponService;
}
src/main/java/com/diaoyun/zion/chinafrica/controller/TbCfTaxController.java deleted 100644 → 0
浏览文件 @ f233dc7e
package com.diaoyun.zion.chinafrica.controller;
import com.diaoyun.zion.chinafrica.service.TbCfTaxService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.RestController;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.ResponseBody;
import java.util.List;
import java.util.Map;
/**
* 税费管理Controller
*
* @author G
* @date 2019-08-14 09:11:48
*/
@RestController
@RequestMapping("tbcftax")
public class TbCfTaxController {
@Autowired
private TbCfTaxService tbCfTaxService;
}
src/main/java/com/diaoyun/zion/chinafrica/dao/TbCfStationItemDao.java
浏览文件 @ 6476a0d0
...@@ -18,5 +18,5 @@ public interface TbCfStationItemDao extends BaseDao<TbCfStationItemEntity> { ...@@ -18,5 +18,5 @@ public interface TbCfStationItemDao extends BaseDao<TbCfStationItemEntity> {
* 获取商品独立站 * 获取商品独立站
* @return * @return
*/ */
List<TbCfPlatformEntity> getItemStationList(); List<TbCfStationItemEntity> getItemStationList();
} }
src/main/java/com/diaoyun/zion/chinafrica/dao/TbCfStoreDao.java
浏览文件 @ 6476a0d0
...@@ -18,5 +18,5 @@ public interface TbCfStoreDao extends BaseDao<TbCfStoreEntity> { ...@@ -18,5 +18,5 @@ public interface TbCfStoreDao extends BaseDao<TbCfStoreEntity> {
* 获取店铺独立站 * 获取店铺独立站
* @return * @return
*/ */
List<TbCfPlatformEntity> getStoreStationList(); List<TbCfStoreEntity> getStoreStationList();
} }
src/main/java/com/diaoyun/zion/chinafrica/entity/TbCfCouponEntity.java
浏览文件 @ 6476a0d0
...@@ -46,7 +46,7 @@ public class TbCfCouponEntity implements Serializable { ...@@ -46,7 +46,7 @@ public class TbCfCouponEntity implements Serializable {
/** /**
* 那些站点可以使用,1111为全部 * 那些站点可以使用,1111为全部
*/ */
@ApiModelProperty("那些站点可以使用（暂无用）") @ApiModelProperty("哪些站点可以使用（暂无用）")
private String withStationId; private String withStationId;
/** /**
* 满多少金额可以使用 * 满多少金额可以使用
...@@ -96,7 +96,7 @@ public class TbCfCouponEntity implements Serializable { ...@@ -96,7 +96,7 @@ public class TbCfCouponEntity implements Serializable {
/** /**
* 有效标志,0无效,1生效,2过期 * 有效标志,0无效,1生效,2过期
*/ */
@ApiModelProperty("有效标志,0无效,1生效,2过期") @ApiModelProperty("有效标志,0无效,1生效,2过期,暂没完全使用")
private Integer status; private Integer status;
/** /**
* 创建人 * 创建人
......
src/main/java/com/diaoyun/zion/chinafrica/entity/TbCfHomePageEntity.java
浏览文件 @ 6476a0d0
...@@ -34,7 +34,7 @@ public class TbCfHomePageEntity implements Serializable { ...@@ -34,7 +34,7 @@ public class TbCfHomePageEntity implements Serializable {
*/ */
private String imgUrl; private String imgUrl;
/** /**
* 是否支持浏览 * 是否支持浏览,1支持，0不支持
*/ */
private Integer scanFlag; private Integer scanFlag;
/** /**
......
src/main/java/com/diaoyun/zion/chinafrica/rpc/AuthenticationRpcService.java deleted 100644 → 0
浏览文件 @ f233dc7e
package com.diaoyun.zion.chinafrica.rpc;
import com.diaoyun.zion.chinafrica.client.SessionUser;
import com.diaoyun.zion.chinafrica.vo.TbCfUserInfoVo;
import java.util.List;
/**
* 身份认证授权服务接口
*
* @author Joe
*/
public interface AuthenticationRpcService {
/**
* 验证是否已经登录
*
* @param token
* 授权码
* @return
*/
boolean validate(String token);
/**
* 根据登录的Token和应用编码获取授权用户信息
*
* @param token
* 授权码
* @return
*/
SessionUser findAuthInfo(String token);
}
src/main/java/com/diaoyun/zion/chinafrica/rpc/impl/AuthenticationRpcServiceImpl.java deleted 100644 → 0
浏览文件 @ f233dc7e
package com.diaoyun.zion.chinafrica.rpc.impl;
import com.diaoyun.zion.chinafrica.client.SessionUser;
import com.diaoyun.zion.chinafrica.rpc.AuthenticationRpcService;
import com.diaoyun.zion.chinafrica.vo.TbCfUserInfoVo;
import com.diaoyun.zion.master.common.TokenManager;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
@Service("authenticationRpcService")
public class AuthenticationRpcServiceImpl implements AuthenticationRpcService {
@Resource(name="redisTokenManager")
private TokenManager tokenManager;
@Override
public boolean validate(String token) {
return tokenManager.validate(token) != null;
}
@Override
public SessionUser findAuthInfo(String token) {
TbCfUserInfoVo user = tokenManager.validate(token);
if (user != null) {
return new SessionUser(token,user.getAccount());
}
return null;
}
}
src/main/java/com/diaoyun/zion/chinafrica/service/impl/TbCfOrderServiceImpl.java
浏览文件 @ 6476a0d0
...@@ -632,8 +632,8 @@ public class TbCfOrderServiceImpl implements TbCfOrderService { ...@@ -632,8 +632,8 @@ public class TbCfOrderServiceImpl implements TbCfOrderService {
expressCost = expressCost.multiply(itemNum); expressCost = expressCost.multiply(itemNum);
totalExpressCost = totalExpressCost.add(expressCost); totalExpressCost = totalExpressCost.add(expressCost);
} }
/*获取人民币汇率 1美元换取人民币*/ /*获取人民币汇率 1美元换取人民币 TODO 汇率接口出问题，暂设置为1 */
BigDecimal rate = spiderService.getExchangeRate(null); BigDecimal rate = new BigDecimal(1);//spiderService.getExchangeRate(null);
itemsPrice = itemsPrice.divide(rate, 2, BigDecimal.ROUND_UP); itemsPrice = itemsPrice.divide(rate, 2, BigDecimal.ROUND_UP);
//计算手续费 //计算手续费
BigDecimal fee = countFee(itemsPrice); BigDecimal fee = countFee(itemsPrice);
......
src/main/java/com/diaoyun/zion/chinafrica/service/impl/TbCfStationItemServiceImpl.java
浏览文件 @ 6476a0d0
...@@ -66,8 +66,8 @@ public class TbCfStationItemServiceImpl implements TbCfStationItemService { ...@@ -66,8 +66,8 @@ public class TbCfStationItemServiceImpl implements TbCfStationItemService {
public Result getItemStationList(Integer pageNum, Integer pageSize) { public Result getItemStationList(Integer pageNum, Integer pageSize) {
Result<PageInfo> result = new Result<>(); Result<PageInfo> result = new Result<>();
startPage(pageNum,pageSize); startPage(pageNum,pageSize);
List<TbCfPlatformEntity> tbCfPlatformList=tbCfStationItemDao.getItemStationList(); List<TbCfStationItemEntity> tbCfStationItemList=tbCfStationItemDao.getItemStationList();
PageInfo<TbCfPlatformEntity> pageInfo = new PageInfo<>(tbCfPlatformList); PageInfo<TbCfStationItemEntity> pageInfo = new PageInfo<>(tbCfStationItemList);
result.setData(pageInfo); result.setData(pageInfo);
return result; return result;
} }
......
src/main/java/com/diaoyun/zion/chinafrica/service/impl/TbCfStoreServiceImpl.java
浏览文件 @ 6476a0d0
...@@ -65,8 +65,8 @@ public class TbCfStoreServiceImpl implements TbCfStoreService { ...@@ -65,8 +65,8 @@ public class TbCfStoreServiceImpl implements TbCfStoreService {
public Result getStoreStationList(Integer pageNum, Integer pageSize) { public Result getStoreStationList(Integer pageNum, Integer pageSize) {
Result<PageInfo> result = new Result<>(); Result<PageInfo> result = new Result<>();
startPage(pageNum,pageSize); startPage(pageNum,pageSize);
List<TbCfPlatformEntity> tbCfPlatformList=tbCfStoreDao.getStoreStationList(); List<TbCfStoreEntity> tbCfStoreList=tbCfStoreDao.getStoreStationList();
PageInfo<TbCfPlatformEntity> pageInfo = new PageInfo<>(tbCfPlatformList); PageInfo<TbCfStoreEntity> pageInfo = new PageInfo<>(tbCfStoreList);
result.setData(pageInfo); result.setData(pageInfo);
return result; return result;
} }
......
src/main/java/com/diaoyun/zion/chinafrica/service/impl/TbCfUserInfoServiceImpl.java
浏览文件 @ 6476a0d0
package com.diaoyun.zion.chinafrica.service.impl; package com.diaoyun.zion.chinafrica.service.impl;
import com.diaoyun.zion.chinafrica.client.SessionUser;
import com.diaoyun.zion.chinafrica.client.SessionUtils;
import com.diaoyun.zion.chinafrica.constant.EmailTemplateConstant; import com.diaoyun.zion.chinafrica.constant.EmailTemplateConstant;
import com.diaoyun.zion.chinafrica.constant.KeyConstant; import com.diaoyun.zion.chinafrica.constant.KeyConstant;
import com.diaoyun.zion.chinafrica.dao.TbCfCouponDao; import com.diaoyun.zion.chinafrica.dao.TbCfCouponDao;
...@@ -20,33 +18,25 @@ import com.diaoyun.zion.master.common.TokenManager; ...@@ -20,33 +18,25 @@ import com.diaoyun.zion.master.common.TokenManager;
import com.diaoyun.zion.master.config.DomainProperties; import com.diaoyun.zion.master.config.DomainProperties;
import com.diaoyun.zion.master.enums.ResultCodeEnum; import com.diaoyun.zion.master.enums.ResultCodeEnum;
import com.diaoyun.zion.master.enums.SexEnum; import com.diaoyun.zion.master.enums.SexEnum;
import com.diaoyun.zion.master.enums.TrueFalseEnum;
import com.diaoyun.zion.master.enums.UserTypeEnum; import com.diaoyun.zion.master.enums.UserTypeEnum;
import com.diaoyun.zion.master.exception.ApplicationException; import com.diaoyun.zion.master.exception.ApplicationException;
import com.diaoyun.zion.master.exception.ValidateException;
import com.diaoyun.zion.master.security.JwtTokenProvider; import com.diaoyun.zion.master.security.JwtTokenProvider;
import com.diaoyun.zion.master.util.*; import com.diaoyun.zion.master.util.*;
import com.diaoyun.zion.master.validator.Validator;
import freemarker.template.TemplateException; import freemarker.template.TemplateException;
import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.StringUtils;
import org.apache.commons.mail.EmailException; import org.apache.commons.mail.EmailException;
import org.apache.http.Consts;
import org.springframework.beans.BeanUtils; import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.HttpStatus;
import org.springframework.security.authentication.AuthenticationManager; import org.springframework.security.authentication.AuthenticationManager;
import org.springframework.security.authentication.UsernamePasswordAuthenticationToken; import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;
import org.springframework.security.core.AuthenticationException; import org.springframework.security.core.AuthenticationException;
import org.springframework.security.crypto.password.PasswordEncoder; import org.springframework.security.crypto.password.PasswordEncoder;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import javax.annotation.Resource; import javax.annotation.Resource;
import javax.servlet.http.Cookie;
import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
import java.io.IOException; import java.io.IOException;
import java.io.UnsupportedEncodingException; import java.io.UnsupportedEncodingException;
import java.net.URLDecoder;
import java.util.Date; import java.util.Date;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
...@@ -357,6 +347,8 @@ public class TbCfUserInfoServiceImpl implements TbCfUserInfoService { ...@@ -357,6 +347,8 @@ public class TbCfUserInfoServiceImpl implements TbCfUserInfoService {
result.setCode(ResultCodeEnum.VALIDATE_ERROR.getCode()); result.setCode(ResultCodeEnum.VALIDATE_ERROR.getCode());
result.setMessage("Verification code error"); result.setMessage("Verification code error");
} else { } else {
Integer randomCode = RandomCodeHelper.producedRandomCode(6);
captchaRedisCache.set(KeyConstant.CAPTCHA + account, randomCode, 1800);
//authenticationManager.authenticate(new UsernamePasswordAuthenticationToken(loginUser.getAccount(), oldPassword)); //authenticationManager.authenticate(new UsernamePasswordAuthenticationToken(loginUser.getAccount(), oldPassword));
TbCfUserInfoEntity existUser = findByAccount(account); TbCfUserInfoEntity existUser = findByAccount(account);
String userId = existUser.getUserId(); String userId = existUser.getUserId();
......
src/main/resources/mapper/TbCfUserInfoDao.xml
浏览文件 @ 6476a0d0
...@@ -154,9 +154,7 @@ ...@@ -154,9 +154,7 @@
<update id="update" parameterType="com.diaoyun.zion.chinafrica.entity.TbCfUserInfoEntity"> <update id="update" parameterType="com.diaoyun.zion.chinafrica.entity.TbCfUserInfoEntity">
update tb_cf_user_info update tb_cf_user_info
<set> <set>
<if test="userNo != null">`user_no` = #{userNo},</if>
<if test="userType != null">`user_type` = #{userType},</if>
<if test="account != null">`account` = #{account},</if>
<if test="avatar != null">`avatar` = #{avatar},</if> <if test="avatar != null">`avatar` = #{avatar},</if>
<if test="nick != null">`nick` = #{nick},</if> <if test="nick != null">`nick` = #{nick},</if>
<if test="phone != null">`phone` = #{phone},</if> <if test="phone != null">`phone` = #{phone},</if>
...@@ -167,7 +165,7 @@ ...@@ -167,7 +165,7 @@
<if test="loginCount != null">`login_count` = #{loginCount},</if> <if test="loginCount != null">`login_count` = #{loginCount},</if>
<if test="email != null">`email` = #{email},</if> <if test="email != null">`email` = #{email},</if>
<if test="facebook != null">`facebook` = #{facebook},</if> <if test="facebook != null">`facebook` = #{facebook},</if>
<if test="createTime != null">`create_time` = #{createTime},</if>
<if test="sex != null">`sex` = #{sex},</if> <if test="sex != null">`sex` = #{sex},</if>
<if test="defaultAddressId != null">`default_address_id` = #{defaultAddressId},</if> <if test="defaultAddressId != null">`default_address_id` = #{defaultAddressId},</if>
<if test="invitedUserId != null">`invited_user_id` = #{invitedUserId},</if> <if test="invitedUserId != null">`invited_user_id` = #{invitedUserId},</if>
......
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论