Compare commits

..

No commits in common. "master" and "v1.1" have entirely different histories.
master ... v1.1

5 changed files with 13 additions and 52 deletions

View File

@ -37,11 +37,6 @@
<artifactId>sharding-jdbc-spring-boot-starter</artifactId>
<version>4.1.1</version>
</dependency>
<dependency>
<groupId>com.github.xiaoymin</groupId>
<artifactId>knife4j-spring-boot-starter</artifactId>
<version>3.0.3</version>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-test</artifactId>

View File

@ -1,20 +1,11 @@
package cn.czyx007.reggie.config;
import cn.czyx007.reggie.common.JacksonObjectMapper;
import com.github.xiaoymin.knife4j.spring.annotations.EnableKnife4j;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.http.converter.HttpMessageConverter;
import org.springframework.http.converter.json.MappingJackson2HttpMessageConverter;
import org.springframework.web.servlet.config.annotation.ResourceHandlerRegistry;
import org.springframework.web.servlet.config.annotation.WebMvcConfigurationSupport;
import springfox.documentation.builders.ApiInfoBuilder;
import springfox.documentation.builders.PathSelectors;
import springfox.documentation.builders.RequestHandlerSelectors;
import springfox.documentation.service.ApiInfo;
import springfox.documentation.spi.DocumentationType;
import springfox.documentation.spring.web.plugins.Docket;
import springfox.documentation.swagger2.annotations.EnableSwagger2;
import java.util.List;
@ -23,36 +14,13 @@ import java.util.List;
* @createTime : 2022/12/20 - 19:54
*/
@Configuration
@EnableSwagger2
@EnableKnife4j
public class WebMvcConfig extends WebMvcConfigurationSupport {
private ApiInfo apiInfo(){
return new ApiInfoBuilder()
.title("瑞吉外卖")
.version("1.0")
.description("瑞吉外卖接口文档")
.build();
}
@Bean
public Docket createRestApi(){
//文档类型
return new Docket(DocumentationType.SWAGGER_2)
.apiInfo(apiInfo())
.select()
.apis(RequestHandlerSelectors.basePackage("cn.czyx007.reggie.controller"))
.paths(PathSelectors.any())
.build();
}
/**
* 设置静态资源映射
* @param registry
*/
@Override
protected void addResourceHandlers(ResourceHandlerRegistry registry) {
registry.addResourceHandler("doc.html").addResourceLocations("classpath:/META-INF/resources/");
registry.addResourceHandler("/webjars/**").addResourceLocations("classpath:/META-INF/resources/webjars/");
registry.addResourceHandler("/backend/**").addResourceLocations("classpath:/static/backend/");
registry.addResourceHandler("/front/**").addResourceLocations("classpath:/static/front/");
}

View File

@ -3,8 +3,6 @@ package cn.czyx007.reggie.controller;
import cn.czyx007.reggie.bean.User;
import cn.czyx007.reggie.common.R;
import cn.czyx007.reggie.service.UserService;
import cn.czyx007.reggie.utils.SendEmailUtils;
import cn.czyx007.reggie.utils.ValidateCodeUtils;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.redis.core.StringRedisTemplate;
@ -41,12 +39,12 @@ public class UserController {
String phone = user.getPhone();
if (StringUtils.hasLength(phone)) {
//生成随机的4位验证码
String code = ValidateCodeUtils.generateValidateCode4String(4);
//String code = ValidateCodeUtils.generateValidateCode4String(4);
//发送邮件验证码
SendEmailUtils.sendAuthCodeEmail(phone, code);
//SendEmailUtils.sendAuthCodeEmail(phone, code);
//将生成的验证码保存到Redis用于校验并且设置有效期为5分钟
redisTemplate.opsForValue().set(phone, code, 5, TimeUnit.MINUTES);
// redisTemplate.opsForValue().set(phone, "1234", 5, TimeUnit.MINUTES);
// redisTemplate.opsForValue().set(phone, code, 5, TimeUnit.MINUTES);
redisTemplate.opsForValue().set(phone, "1234", 5, TimeUnit.MINUTES);
return R.success("验证码发送成功");
}
return R.error("验证码发送失败");
@ -61,7 +59,7 @@ public class UserController {
//从Redis中获取保存的验证码
String codeInRedis = redisTemplate.opsForValue().get(phone);
//codeInRedis = "1234";
codeInRedis = "1234";
//将两个验证码进行比对
if(StringUtils.hasLength(codeInRedis) && codeInRedis.equals(code)){

View File

@ -1,6 +1,10 @@
package cn.czyx007.reggie.filter;
import cn.czyx007.reggie.bean.Employee;
import cn.czyx007.reggie.common.BaseContext;
import cn.czyx007.reggie.common.R;
import com.alibaba.fastjson.JSON;
import org.springframework.boot.json.JacksonJsonParser;
import org.springframework.util.AntPathMatcher;
import javax.servlet.*;
@ -17,8 +21,8 @@ import java.io.IOException;
@WebFilter(filterName = "loginCheckFilter", urlPatterns = "/*")
public class LoginCheckFilter implements Filter {
private static final AntPathMatcher PATH_MATCHER = new AntPathMatcher();
private static final String[] urls = {"/employee/login", "/employee/logout", "/backend/**", "/front/**",
"/user/sendMsg", "/user/login", "/doc.html", "/webjars/**", "/swagger-resources", "/v2/api-docs"};
public static final String[] urls = {"/employee/login", "/employee/logout", "/backend/**", "/front/**",
"/user/sendMsg", "/user/login"};
@Override
public void doFilter(ServletRequest servletRequest, ServletResponse servletResponse, FilterChain chain) throws IOException, ServletException {
@ -55,10 +59,6 @@ public class LoginCheckFilter implements Filter {
return;
}
// response.getWriter().write(JSON.toJSONString(R.error("NOTLOGIN")));
response.setContentType("text/html;charset=UTF-8");
response.getWriter().write("未登录!请先跳转以下页面登录<br>\n" +
"<a href=\"http://reggie.czyx007.cn/backend/page/login/login.html\">后台页面跳转</a><br>\n" +
"<a href=\"http://reggie.czyx007.cn/front/page/login.html\">用户页面跳转</a>");
response.getWriter().write(JSON.toJSONString(R.error("NOTLOGIN")));
}
}

View File

@ -65,7 +65,7 @@
if (regex.test(this.form.phone)) {
this.msgFlag = false
//this.form.code = (Math.random()*1000000).toFixed(0)
//this.form.code = '1234'
this.form.code = '1234'
sendMsgApi({phone:this.form.phone})
}else{
this.msgFlag = true