!290 更新cookie策略

Merge pull request !290 from 德仔/develop
This commit is contained in:
德仔 2021-06-22 10:33:05 +00:00 committed by Gitee
commit 65e23a5f41
2 changed files with 28 additions and 17 deletions

View File

@ -153,8 +153,6 @@ public class SysWapController extends BaseController {
String tokenStr = phone + "_" + new Date().getTime() + "_" + RandomStringUtils.random(8); String tokenStr = phone + "_" + new Date().getTime() + "_" + RandomStringUtils.random(8);
Cookie cookie = new Cookie("token", AesUtils.encrypt(tokenStr)); Cookie cookie = new Cookie("token", AesUtils.encrypt(tokenStr));
cookie.setMaxAge(24 * 60 * 60); cookie.setMaxAge(24 * 60 * 60);
cookie.setSecure(true);
cookie.setHttpOnly(true);
cookie.setPath("/"); cookie.setPath("/");
response.addCookie(cookie); response.addCookie(cookie);

View File

@ -20,7 +20,9 @@ import com.stdiet.custom.utils.CookieUtils;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
import javax.servlet.http.Cookie;
import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import java.util.List; import java.util.List;
@ -41,27 +43,38 @@ public class VideoWebInterfaceController extends BaseController {
* 查询视频分类目录列表 * 查询视频分类目录列表
*/ */
@GetMapping("/getAllClassify") @GetMapping("/getAllClassify")
public TableDataInfo getClassifyAndVideo(SysVideoClassify sysVideoClassify, HttpServletRequest request) { public TableDataInfo getClassifyAndVideo(SysVideoClassify sysVideoClassify, HttpServletRequest request, HttpServletResponse response) {
JSONObject result = CookieUtils.checkCookieValida(request, "token"); JSONObject result = CookieUtils.checkCookieValida(request, "token");
if (result.getInteger("code") != 200) { if (result.getInteger("code") != 200) {
TableDataInfo errInfo = new TableDataInfo(); // TableDataInfo errInfo = new TableDataInfo();
errInfo.setCode(result.getInteger("code")); // errInfo.setCode(result.getInteger("code"));
errInfo.setMsg(result.getString("msg")); // errInfo.setMsg(result.getString("msg"));
return errInfo; // return errInfo;
}
Cookie cookie = new Cookie("token", "");
cookie.setMaxAge(24 * 60 * 60);
cookie.setPath("/");
response.addCookie(cookie);
}
String phone = result.getString("phone");
int payed = 0;
if (StringUtils.isNotNull(phone)) {
// 检查是否已消费 // 检查是否已消费
SysOrder order = new SysOrder(); SysOrder order = new SysOrder();
order.setPhone(result.getString("phone")); order.setPhone(result.getString("phone"));
List<SysOrder> orders = iSysOrderService.selectSysOrderList(order); List<SysOrder> orders = iSysOrderService.selectSysOrderList(order);
if (orders.size() > 0) {
payed = 1;
}
}
//不分页则不需要传pageNumpageSize参数 //不分页则不需要传pageNumpageSize参数
startPage(); startPage();
//父级分类ID 0表示主分类 //父级分类ID 0表示主分类
sysVideoClassify.setParentId(sysVideoClassify.getParentId() == null ? 0L : sysVideoClassify.getParentId()); sysVideoClassify.setParentId(sysVideoClassify.getParentId() == null ? 0L : sysVideoClassify.getParentId());
//客户类型 0未付费客户-playLevel根据上传的标记 1已付费客户-playLevel全为0 //客户类型 0未付费客户-playLevel根据上传的标记 1已付费客户-playLevel全为0
sysVideoClassify.setUserType(orders.size() > 0 ? 1 : 0); sysVideoClassify.setUserType(payed);
List<VideoClassifyResponse> list = sysVideoClassifyService.getAllClassifyAndVideo(sysVideoClassify); List<VideoClassifyResponse> list = sysVideoClassifyService.getAllClassifyAndVideo(sysVideoClassify);
return getDataTable(list); return getDataTable(list);
} }
@ -75,10 +88,10 @@ public class VideoWebInterfaceController extends BaseController {
*/ */
@GetMapping("/getVideoDetail/{videoId}") @GetMapping("/getVideoDetail/{videoId}")
public AjaxResult getVideoDetail(@PathVariable("videoId") String videoId, HttpServletRequest request) { public AjaxResult getVideoDetail(@PathVariable("videoId") String videoId, HttpServletRequest request) {
JSONObject result = CookieUtils.checkCookieValida(request, "token"); // JSONObject result = CookieUtils.checkCookieValida(request, "token");
if (result.getInteger("code") != 200) { // if (result.getInteger("code") != 200) {
return AjaxResult.error(result.getInteger("code"), result.getString("msg")); // return AjaxResult.error(result.getInteger("code"), result.getString("msg"));
} // }
if (StringUtils.isEmpty(videoId)) { if (StringUtils.isEmpty(videoId)) {
return AjaxResult.error("视频加载失败"); return AjaxResult.error("视频加载失败");