v4.2.5
This commit is contained in:
@@ -2,17 +2,17 @@ package cn.lili.controller.other;
|
||||
|
||||
import cn.lili.common.enums.ResultUtil;
|
||||
import cn.lili.common.vo.ResultMessage;
|
||||
import cn.lili.modules.page.entity.dos.PageData;
|
||||
import cn.lili.modules.page.entity.dto.PageDataDTO;
|
||||
import cn.lili.modules.page.entity.enums.PageEnum;
|
||||
import cn.lili.modules.page.entity.vos.PageDataVO;
|
||||
import cn.lili.modules.page.service.PageDataService;
|
||||
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
||||
import io.swagger.annotations.Api;
|
||||
import io.swagger.annotations.ApiImplicitParam;
|
||||
import io.swagger.annotations.ApiOperation;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.web.bind.annotation.GetMapping;
|
||||
import org.springframework.web.bind.annotation.RequestMapping;
|
||||
import org.springframework.web.bind.annotation.RequestParam;
|
||||
import org.springframework.web.bind.annotation.RestController;
|
||||
import org.springframework.web.bind.annotation.*;
|
||||
|
||||
/**
|
||||
* 买家端,页面接口
|
||||
@@ -36,12 +36,53 @@ public class PageBuyerController {
|
||||
public ResultMessage<PageDataVO> getIndex(@RequestParam String clientType) {
|
||||
PageDataDTO pageDataDTO = new PageDataDTO(PageEnum.INDEX.name());
|
||||
pageDataDTO.setPageClientType(clientType);
|
||||
return ResultUtil.data(pageService.getPageData(pageDataDTO));
|
||||
PageDataVO pageDataVO=pageService.getPageData(pageDataDTO);
|
||||
return ResultUtil.data(pageDataVO);
|
||||
}
|
||||
|
||||
@ApiOperation(value = "获取页面数据")
|
||||
@GetMapping
|
||||
public ResultMessage<PageDataVO> get(PageDataDTO pageDataDTO) {
|
||||
return ResultUtil.data(pageService.getPageData(pageDataDTO));
|
||||
PageDataVO pageDataVO=pageService.getPageData(pageDataDTO);
|
||||
return ResultUtil.data(pageDataVO);
|
||||
}
|
||||
|
||||
@ApiOperation(value = "获取页面数据")
|
||||
@ApiImplicitParam(name = "id", value = "id", required = true, dataType = "String", paramType = "path")
|
||||
@GetMapping("/get/{id}")
|
||||
public ResultMessage<PageData> getPage(@PathVariable("id") String id) {
|
||||
return ResultUtil.data(pageService.getSpecial(id));
|
||||
}
|
||||
|
||||
@ApiOperation(value = "获取专题页面数据(根据消息内容得知)")
|
||||
@GetMapping("/getSpecial")
|
||||
public ResultMessage<PageData> getSpecial(@RequestParam String body) {
|
||||
String name = "";
|
||||
if (body.indexOf("』") >= 0 && body.indexOf("『") >= 0) {
|
||||
name = body.substring(body.indexOf("『") + 1, body.lastIndexOf("』"));
|
||||
} else if (body.indexOf("〉") >= 0 && body.indexOf("〈") >= 0) {
|
||||
name = body.substring(body.indexOf("〈") + 1, body.lastIndexOf("〉"));
|
||||
} else if (body.indexOf("」") >= 0 && body.indexOf("「") >= 0) {
|
||||
name = body.substring(body.indexOf("「") + 1, body.lastIndexOf("」"));
|
||||
} else if (body.indexOf("》") >= 0 && body.indexOf("《") >= 0) {
|
||||
name = body.substring(body.indexOf("《") + 1, body.lastIndexOf("》"));
|
||||
} else if (body.indexOf(")") >= 0 && body.indexOf("(") >= 0) {
|
||||
name = body.substring(body.indexOf("(") + 1, body.lastIndexOf(")"));
|
||||
} else if (body.indexOf("】") >= 0 && body.indexOf("【") >= 0) {
|
||||
name = body.substring(body.indexOf("【") + 1, body.lastIndexOf("】"));
|
||||
} else if (body.indexOf("}") >= 0 && body.indexOf("{") >= 0) {
|
||||
name = body.substring(body.indexOf("{") + 1, body.lastIndexOf("}"));
|
||||
} else if (body.indexOf("!") >= 0) {
|
||||
name = body.substring(body.indexOf("!") + 1, body.lastIndexOf("!"));
|
||||
} else if (body.indexOf("|") >= 0) {
|
||||
name = body.substring(body.indexOf("|") + 1, body.lastIndexOf("|"));
|
||||
}
|
||||
|
||||
PageData pageData = pageService.getOne(
|
||||
new LambdaQueryWrapper<PageData>()
|
||||
.eq(PageData::getPageType, PageEnum.SPECIAL.name())
|
||||
.eq(PageData::getName, name));
|
||||
return ResultUtil.data(pageData);
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,8 +1,12 @@
|
||||
package cn.lili.controller.passport;
|
||||
|
||||
import cn.lili.cache.Cache;
|
||||
import cn.lili.cache.CachePrefix;
|
||||
import cn.lili.common.enums.ResultCode;
|
||||
import cn.lili.common.enums.ResultUtil;
|
||||
import cn.lili.common.exception.ServiceException;
|
||||
import cn.lili.common.security.AuthUser;
|
||||
import cn.lili.common.security.context.UserContext;
|
||||
import cn.lili.common.security.enums.UserEnums;
|
||||
import cn.lili.common.vo.ResultMessage;
|
||||
import cn.lili.modules.member.entity.dos.Member;
|
||||
@@ -48,6 +52,18 @@ public class MemberBuyerController {
|
||||
private SmsUtil smsUtil;
|
||||
@Autowired
|
||||
private VerificationService verificationService;
|
||||
@Autowired
|
||||
private Cache cache;
|
||||
|
||||
|
||||
@ApiOperation(value = "手机号登录")
|
||||
@ApiImplicitParams({
|
||||
@ApiImplicitParam(name = "mobile", value = "手机号", required = true, paramType = "query")
|
||||
})
|
||||
@PostMapping("/phoneLogin")
|
||||
public ResultMessage<Object> phoneLogin(@NotNull(message = "手机号为空") @RequestParam String mobile) {
|
||||
return ResultUtil.data(memberService.mobilePhoneLogin(mobile));
|
||||
}
|
||||
|
||||
|
||||
@ApiOperation(value = "web-获取登录二维码")
|
||||
@@ -194,8 +210,13 @@ public class MemberBuyerController {
|
||||
//校验短信验证码是否正确
|
||||
if (smsUtil.verifyCode(mobile, VerificationEnums.FIND_USER, uuid, code)) {
|
||||
//校验是否通过手机号可获取会员,存在则将会员信息存入缓存,有效时间3分钟
|
||||
memberService.findByMobile(uuid, mobile);
|
||||
Member member = memberService.findByMobile(mobile);
|
||||
if (member == null) {
|
||||
throw new ServiceException(ResultCode.USER_NOT_PHONE);
|
||||
}
|
||||
cache.put(CachePrefix.FIND_MOBILE + uuid, mobile, 300L);
|
||||
return ResultUtil.success();
|
||||
|
||||
} else {
|
||||
throw new ServiceException(ResultCode.VERIFICATION_SMS_CHECKED_ERROR);
|
||||
}
|
||||
@@ -226,7 +247,11 @@ public class MemberBuyerController {
|
||||
@PutMapping("/modifyPass")
|
||||
public ResultMessage<Member> modifyPass(@NotNull(message = "旧密码不能为空") @RequestParam String password,
|
||||
@NotNull(message = "新密码不能为空") @RequestParam String newPassword) {
|
||||
return ResultUtil.data(memberService.modifyPass(password, newPassword));
|
||||
AuthUser tokenUser = UserContext.getCurrentUser();
|
||||
if (tokenUser == null) {
|
||||
throw new ServiceException(ResultCode.USER_NOT_LOGIN);
|
||||
}
|
||||
return ResultUtil.data(memberService.modifyPass(tokenUser.getId(), password, newPassword));
|
||||
}
|
||||
|
||||
@ApiOperation(value = "初始设置密码")
|
||||
|
||||
0
buyer-api/src/main/java/cn/lili/security/BuyerAuthenticationFilter.java
Executable file → Normal file
0
buyer-api/src/main/java/cn/lili/security/BuyerAuthenticationFilter.java
Executable file → Normal file
Reference in New Issue
Block a user