forked from lilishop/lilishop
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'master' of gitee.com:beijing_hongye_huicheng/lilishop i…
…nto feature/pg
- Loading branch information
Showing
159 changed files
with
198,535 additions
and
1,002 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Large diffs are not rendered by default.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,2 @@ | ||
| /** 店铺--默认页面是否开启**/ | ||
| ALTER TABLE li_store ADD page_show bit(1) DEFAULT NULL COMMENT '默认页面是否开启'; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Large diffs are not rendered by default.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -16,5 +16,6 @@ [email protected] | |
| spring.mail.password=abcdefg123456!@#$%^ | ||
| # 日志文件路径 | ||
| logging.file.path=lili-logs/admin | ||
| lili.data.logstash.server=106.124.130.167:4560 | ||
| # 文件格式 | ||
| logging.pattern.file=%clr(%d{yyyy-MM-dd HH:mm:ss.SSS}){faint} %clr(%5p) %clr(${PID}){magenta} %clr(---){faint} %clr([%15.15t]){faint} %clr(%-40.40logger{39}){cyan} %clr(:){faint} %m%n%wEx | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Empty file modified
0
buyer-api/src/main/java/cn/lili/security/BuyerAuthenticationFilter.java
100755 → 100644
Empty file.
86 changes: 43 additions & 43 deletions
86
common-api/src/main/java/cn/lili/controller/common/SliderImageController.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,43 +1,43 @@ | ||
| package cn.lili.controller.common; | ||
|
|
||
| import cn.lili.cache.limit.annotation.LimitPoint; | ||
| import cn.lili.common.enums.ResultUtil; | ||
| import cn.lili.common.vo.ResultMessage; | ||
| import cn.lili.modules.verification.entity.enums.VerificationEnums; | ||
| import cn.lili.modules.verification.service.VerificationService; | ||
| import io.swagger.annotations.Api; | ||
| import io.swagger.annotations.ApiOperation; | ||
| import lombok.extern.slf4j.Slf4j; | ||
| import org.springframework.beans.factory.annotation.Autowired; | ||
| import org.springframework.web.bind.annotation.*; | ||
|
|
||
| /** | ||
| * 滑块验证码接口 | ||
| * | ||
| * @author Chopper | ||
| * @since 2020/11/26 15:41 | ||
| */ | ||
| @Slf4j | ||
| @RestController | ||
| @RequestMapping("/common/common/slider") | ||
| @Api(tags = "滑块验证码接口") | ||
| public class SliderImageController { | ||
|
|
||
| @Autowired | ||
| private VerificationService verificationService; | ||
|
|
||
| @LimitPoint(name = "slider_image", key = "verification") | ||
| @GetMapping("/{verificationEnums}") | ||
| @ApiOperation(value = "获取校验接口,一分钟同一个ip请求10次") | ||
| public ResultMessage getSliderImage(@RequestHeader String uuid, @PathVariable VerificationEnums verificationEnums) { | ||
| return ResultUtil.data(verificationService.createVerification(verificationEnums, uuid)); | ||
|
|
||
| } | ||
|
|
||
| @LimitPoint(name = "slider_image", key = "verification_pre_check", limit = 600) | ||
| @PostMapping("/{verificationEnums}") | ||
| @ApiOperation(value = "验证码预校验") | ||
| public ResultMessage verificationImage(Integer xPos, @RequestHeader String uuid, @PathVariable VerificationEnums verificationEnums) { | ||
| return ResultUtil.data(verificationService.preCheck(xPos, uuid, verificationEnums)); | ||
| } | ||
| } | ||
| package cn.lili.controller.common; | ||
|
|
||
| import cn.lili.cache.limit.annotation.LimitPoint; | ||
| import cn.lili.common.enums.ResultUtil; | ||
| import cn.lili.common.vo.ResultMessage; | ||
| import cn.lili.modules.verification.entity.enums.VerificationEnums; | ||
| import cn.lili.modules.verification.service.VerificationService; | ||
| import io.swagger.annotations.Api; | ||
| import io.swagger.annotations.ApiOperation; | ||
| import lombok.extern.slf4j.Slf4j; | ||
| import org.springframework.beans.factory.annotation.Autowired; | ||
| import org.springframework.web.bind.annotation.*; | ||
|
|
||
| /** | ||
| * 滑块验证码接口 | ||
| * | ||
| * @author Chopper | ||
| * @since 2020/11/26 15:41 | ||
| */ | ||
| @Slf4j | ||
| @RestController | ||
| @RequestMapping("/common/common/slider") | ||
| @Api(tags = "滑块验证码接口") | ||
| public class SliderImageController { | ||
|
|
||
| @Autowired | ||
| private VerificationService verificationService; | ||
|
|
||
| @LimitPoint(name = "slider_image", key = "verification") | ||
| @GetMapping("/{verificationEnums}") | ||
| @ApiOperation(value = "获取校验接口,一分钟同一个ip请求10次") | ||
| public ResultMessage getSliderImage(@RequestHeader String uuid, @PathVariable VerificationEnums verificationEnums) { | ||
| return ResultUtil.data(verificationService.createVerification(verificationEnums, uuid)); | ||
|
|
||
| } | ||
|
|
||
| @LimitPoint(name = "slider_image", key = "verification_pre_check", limit = 600) | ||
| @PostMapping("/{verificationEnums}") | ||
| @ApiOperation(value = "验证码预校验") | ||
| public ResultMessage verificationImage(Integer xPos, @RequestHeader String uuid, @PathVariable VerificationEnums verificationEnums) { | ||
| return ResultUtil.data(verificationService.preCheck(xPos, uuid, verificationEnums)); | ||
| } | ||
| } |
96 changes: 48 additions & 48 deletions
96
common-api/src/main/java/cn/lili/controller/common/SmsController.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,48 +1,48 @@ | ||
| package cn.lili.controller.common; | ||
|
|
||
| import cn.lili.cache.limit.annotation.LimitPoint; | ||
| import cn.lili.common.enums.ResultCode; | ||
| import cn.lili.common.enums.ResultUtil; | ||
| import cn.lili.common.vo.ResultMessage; | ||
| import cn.lili.modules.sms.SmsUtil; | ||
| import cn.lili.modules.verification.entity.enums.VerificationEnums; | ||
| import cn.lili.modules.verification.service.VerificationService; | ||
| import io.swagger.annotations.Api; | ||
| import io.swagger.annotations.ApiImplicitParam; | ||
| import io.swagger.annotations.ApiImplicitParams; | ||
| import io.swagger.annotations.ApiOperation; | ||
| import org.springframework.beans.factory.annotation.Autowired; | ||
| import org.springframework.web.bind.annotation.*; | ||
|
|
||
| /** | ||
| * 短信验证码接口 | ||
| * | ||
| * @author Chopper | ||
| * @since 2020/11/26 15:41 | ||
| */ | ||
| @RestController | ||
| @Api(tags = "短信验证码接口") | ||
| @RequestMapping("/common/common/sms") | ||
| public class SmsController { | ||
|
|
||
| @Autowired | ||
| private SmsUtil smsUtil; | ||
| @Autowired | ||
| private VerificationService verificationService; | ||
|
|
||
| @LimitPoint(name = "sms_send", key = "sms") | ||
| @ApiImplicitParams({ | ||
| @ApiImplicitParam(paramType = "path", dataType = "String", name = "mobile", value = "手机号"), | ||
| @ApiImplicitParam(paramType = "header", dataType = "String", name = "uuid", value = "uuid"), | ||
| }) | ||
| @GetMapping("/{verificationEnums}/{mobile}") | ||
| @ApiOperation(value = "发送短信验证码,一分钟同一个ip请求1次") | ||
| public ResultMessage getSmsCode( | ||
| @RequestHeader String uuid, | ||
| @PathVariable String mobile, | ||
| @PathVariable VerificationEnums verificationEnums) { | ||
| verificationService.check(uuid, verificationEnums); | ||
| smsUtil.sendSmsCode(mobile, verificationEnums, uuid); | ||
| return ResultUtil.success(ResultCode.VERIFICATION_SEND_SUCCESS); | ||
| } | ||
| } | ||
| package cn.lili.controller.common; | ||
|
|
||
| import cn.lili.cache.limit.annotation.LimitPoint; | ||
| import cn.lili.common.enums.ResultCode; | ||
| import cn.lili.common.enums.ResultUtil; | ||
| import cn.lili.common.vo.ResultMessage; | ||
| import cn.lili.modules.sms.SmsUtil; | ||
| import cn.lili.modules.verification.entity.enums.VerificationEnums; | ||
| import cn.lili.modules.verification.service.VerificationService; | ||
| import io.swagger.annotations.Api; | ||
| import io.swagger.annotations.ApiImplicitParam; | ||
| import io.swagger.annotations.ApiImplicitParams; | ||
| import io.swagger.annotations.ApiOperation; | ||
| import org.springframework.beans.factory.annotation.Autowired; | ||
| import org.springframework.web.bind.annotation.*; | ||
|
|
||
| /** | ||
| * 短信验证码接口 | ||
| * | ||
| * @author Chopper | ||
| * @since 2020/11/26 15:41 | ||
| */ | ||
| @RestController | ||
| @Api(tags = "短信验证码接口") | ||
| @RequestMapping("/common/common/sms") | ||
| public class SmsController { | ||
|
|
||
| @Autowired | ||
| private SmsUtil smsUtil; | ||
| @Autowired | ||
| private VerificationService verificationService; | ||
|
|
||
| @LimitPoint(name = "sms_send", key = "sms") | ||
| @ApiImplicitParams({ | ||
| @ApiImplicitParam(paramType = "path", dataType = "String", name = "mobile", value = "手机号"), | ||
| @ApiImplicitParam(paramType = "header", dataType = "String", name = "uuid", value = "uuid"), | ||
| }) | ||
| @GetMapping("/{verificationEnums}/{mobile}") | ||
| @ApiOperation(value = "发送短信验证码,一分钟同一个ip请求1次") | ||
| public ResultMessage getSmsCode( | ||
| @RequestHeader String uuid, | ||
| @PathVariable String mobile, | ||
| @PathVariable VerificationEnums verificationEnums) { | ||
| verificationService.check(uuid, verificationEnums); | ||
| smsUtil.sendSmsCode(mobile, verificationEnums, uuid); | ||
| return ResultUtil.success(ResultCode.VERIFICATION_SEND_SUCCESS); | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.