Skip to content

G
gogirl-miniapp-backend
Commit 61d082d5 by huluobin
Options

代码调整 

日志调整
parent baa344a5
Showing with 214 additions and 291 deletions
src/main/java/com/gogirl/application/order/mall/impl/MallRefundOrderServiceImpl.java
......@@ -31,7 +31,7 @@ import java.util.stream.Collectors;
@Service
@AllArgsConstructor
@Slf4j
@Transactional
@Transactional(rollbackFor = Exception.class)
public class MallRefundOrderServiceImpl extends ServiceImpl<MallRefundOrderMapper, MallRefundOrder> implements MallRefundOrderService {
private final MallOrderService mallOrderService;
......
src/main/java/com/gogirl/infrastructure/common/annotation/AuthIgnore.java 0 → 100644
package com.gogirl.infrastructure.common.annotation;
import java.lang.annotation.*;
/**
* <p>
* 忽略授权校验
* </p>
*
* @author robbendev
* @since 2020/7/23 11:54 上午
*/
@Target(ElementType.METHOD)
@Retention(RetentionPolicy.RUNTIME)
@Documented
public @interface AuthIgnore {
}
src/main/java/com/gogirl/infrastructure/common/annotation/DictTransfer.java deleted 100644 → 0
package com.gogirl.infrastructure.common.annotation;
import java.lang.annotation.*;
@Target(value = {ElementType.METHOD})
@Retention(RetentionPolicy.RUNTIME)
@Documented
public @interface DictTransfer {
}
src/main/java/com/gogirl/infrastructure/common/annotation/LoginIgnore.java 0 → 100644
package com.gogirl.infrastructure.common.annotation;
import java.lang.annotation.*;
/**
* <p>
* 忽略登陆校验
* </p>
*
* @author robbendev
* @since 2020/7/23 11:43 上午
*/
@Target(ElementType.METHOD)
@Retention(RetentionPolicy.RUNTIME)
@Documented
public @interface LoginIgnore {
}
src/main/java/com/gogirl/infrastructure/common/aspect/DictTransferAspect.java
......@@ -54,7 +54,9 @@ public class DictTransferAspect {
private void dictTransfer(Object result) throws NoSuchFieldException, IllegalAccessException {
if (result instanceof List) {
if (result == null) {
return;
} else if (result instanceof List) {
for (Object object : (List) result) {
this.dictTransferObject(object);
}
......
src/main/java/com/gogirl/infrastructure/common/filter/RequestBakFilter.java
......@@ -16,7 +16,7 @@ import java.io.IOException;
*/
@Component
@ServletComponentScan
@WebFilter(urlPatterns = "/*", filterName = "requestBakFilter")
@WebFilter(urlPatterns = {"/customer/*", "/technician/*"}, filterName = "requestBakFilter")
public class RequestBakFilter implements Filter {
@Override
......
src/main/java/com/gogirl/infrastructure/common/filter/RequestLogFilter.java 0 → 100644
package com.gogirl.infrastructure.common.filter;
import com.baomidou.mybatisplus.core.toolkit.IdWorker;
import org.springframework.boot.web.servlet.ServletComponentScan;
import org.springframework.stereotype.Component;
import javax.servlet.*;
import javax.servlet.annotation.WebFilter;
import java.io.IOException;
/**
* 日志traceId
*
* @author robbendev
*/
@Component
@ServletComponentScan
@WebFilter(urlPatterns = {"/customer/*", "/technician/*"}, filterName = "requestLogFilter")
public class RequestLogFilter implements Filter {
@Override
public void init(FilterConfig filterConfig) throws ServletException {
}
@Override
public void doFilter(ServletRequest request, ServletResponse response, FilterChain chain) throws IOException, ServletException {
request.setAttribute("logTraceId", IdWorker.getIdStr());
chain.doFilter(request, response);
}
@Override
public void destroy() {
}
}
src/main/java/com/gogirl/infrastructure/config/config/MvcInterceptorConfig.java
package com.gogirl.infrastructure.config.config;
import com.gogirl.infrastructure.interceptor.AuthHandlerInterceptor;
import com.gogirl.infrastructure.interceptor.LogHandlerInterceptor;
import com.gogirl.infrastructure.interceptor.LoginHandlerInterceptor;
import com.gogirl.infrastructure.interceptor.SessionHandlerInterceptor;
import lombok.AllArgsConstructor;
......@@ -14,117 +15,27 @@ import org.springframework.web.servlet.config.annotation.WebMvcConfigurationSupp
public class MvcInterceptorConfig extends WebMvcConfigurationSupport {
private final LoginHandlerInterceptor loginHandlerInterceptor;
// private final LogHandlerInterceptor logHandlerInterceptor;
private final LogHandlerInterceptor logHandlerInterceptor;
private final SessionHandlerInterceptor sessionHandlerInterceptor;
private final AuthHandlerInterceptor authHandlerInterceptor;
@Override
protected void addInterceptors(InterceptorRegistry registry) {
/*多个拦截器组成一个拦截器链*/
/*addPathPatterns 用于添加拦截规则*/
/* **表示拦截所有请求*/
/*excludePathPatterns 用户排除拦截*/
registry.addInterceptor(loginHandlerInterceptor)
.addPathPatterns("/**")
.excludePathPatterns("/swagger-resources/**", "/webjars/**", "/v2/**", "/swagger-ui.html/**", "/error")
.excludePathPatterns("/doc.html")
//登陆
.excludePathPatterns("/customer/message/pageIn")
.excludePathPatterns("/customer/message/pageOut")
.excludePathPatterns("/customer/message/logoutLog")
.excludePathPatterns("/customer/leisure/queryMinDiscount")
.excludePathPatterns("/customer/xcx/login")
.excludePathPatterns("/customer/csrf")
.excludePathPatterns("/customer/mallCategory/getCategoryTree")
.excludePathPatterns("/customer/mallCategory/getCategoryList")
.excludePathPatterns("/customer/mallProduct/queryPageProduct")
.excludePathPatterns("/customer/mallProduct/queryProduct")
.excludePathPatterns("/customer/serve/no_queryNewServePage")
.excludePathPatterns("/customer/serve/queryServeForPage")
.excludePathPatterns("/customer/broadcast/queryBroadcast")
.excludePathPatterns("/customer/shop/queryShopEnvironmentPhotos")
//回调
.excludePathPatterns("/customer/pay/notifyTimesCard")
.excludePathPatterns("/customer/pay/notifyCharge")
.excludePathPatterns("/customer/mallOrderPay/notifyMallOrder")
.excludePathPatterns("/customer/pay/notifyOrder")
.excludePathPatterns("/customer/pay/notifyBalanceWxPay")
.excludePathPatterns("/customer/xcx/authorized1")
.excludePathPatterns("/customer/xcx/authorizedPhone")
.excludePathPatterns("/customer/message/queryPageMessage")
//退款
.excludePathPatterns("/customer/mallOrderPay/refund/*")
.excludePathPatterns("/customer/xcx/upload")
.excludePathPatterns("/technician/xcx/login")
.excludePathPatterns("/csrf")
.excludePathPatterns("/technician/xcx/login_t")
.excludePathPatterns("/technician/phone/bindPhone_t")
.excludePathPatterns("/technician/phone/getBindCode")
.excludePathPatterns("/technician/xcx/upload")
.excludePathPatterns("/technician/xcx/getUserInfo_t")
.excludePathPatterns("/technician/xcx/choseStore")
.excludePathPatterns("/technician/xcx/getTechnicianShopList")
;
// registry.addInterceptor(logHandlerInterceptor);
registry.addInterceptor(logHandlerInterceptor);
registry.addInterceptor(sessionHandlerInterceptor);
registry.addInterceptor(authHandlerInterceptor)
.addPathPatterns("/**")
.excludePathPatterns("/swagger-resources/**", "/webjars/**", "/v2/**", "/swagger-ui.html/**", "/error")
.excludePathPatterns("/doc.html")
//登陆
.excludePathPatterns("/customer/message/loginLog")
.excludePathPatterns("/customer/message/pageIn")
.excludePathPatterns("/customer/message/pageOut")
.excludePathPatterns("/customer/message/logoutLog")
.excludePathPatterns("/customer/leisure/queryMinDiscount")
.excludePathPatterns("/customer/xcx/login")
.excludePathPatterns("/customer/csrf")
.excludePathPatterns("/customer/mallCategory/getCategoryTree")
.excludePathPatterns("/customer/mallCategory/getCategoryList")
.excludePathPatterns("/customer/mallProduct/queryPageProduct")
.excludePathPatterns("/customer/mallProduct/queryProduct")
.excludePathPatterns("/customer/serve/no_queryNewServePage")
.excludePathPatterns("/customer/serve/queryServeForPage")
.excludePathPatterns("/customer/broadcast/queryBroadcast")
.excludePathPatterns("/customer/shop/queryShopEnvironmentPhotos")
//回调
.excludePathPatterns("/customer/pay/notifyTimesCard")
.excludePathPatterns("/customer/pay/notifyCharge")
.excludePathPatterns("/customer/mallOrderPay/notifyMallOrder")
.excludePathPatterns("/customer/pay/notifyOrder")
.excludePathPatterns("/customer/pay/notifyBalanceWxPay")
.excludePathPatterns("/customer/xcx/authorized1")
.excludePathPatterns("/customer/xcx/authorizedPhone")
.excludePathPatterns("/customer/message/queryPageMessage")
//退款
.excludePathPatterns("/customer/mallOrderPay/refund/*")
.excludePathPatterns("/customer/xcx/upload")
.excludePathPatterns("/technician/xcx/login")
.excludePathPatterns("/csrf")
.excludePathPatterns("/technician/xcx/login_t")
.excludePathPatterns("/technician/phone/bindPhone_t")
.excludePathPatterns("/technician/phone/getBindCode")
.excludePathPatterns("/technician/xcx/upload")
.excludePathPatterns("/technician/xcx/getUserInfo_t")
.excludePathPatterns("/technician/xcx/choseStore")
.excludePathPatterns("/technician/xcx/getTechnicianShopList")
.excludePathPatterns("/customer/produce/queryProduceDetail")
.excludePathPatterns("/customer/shop/queryShopForPage")
.excludePathPatterns("/customer/mallCart/listMallShoppingCart")
// .excludePathPatterns("/customer/queryPageLeisureScheduleServe")
.excludePathPatterns("/customer/getMyCoupon")
.excludePathPatterns("/customer/timescard/getMyTimesCardList")
.excludePathPatterns("/customer/selectAllDiscount")
.excludePathPatterns("/customer/xcx/getUserInfo")
;
super.addInterceptors(registry);
......@@ -141,28 +52,12 @@ public class MvcInterceptorConfig extends WebMvcConfigurationSupport {
registry.addResourceHandler("/webjars/**")
.addResourceLocations("classpath:/META-INF/resources/webjars/");
registry.addResourceHandler("/doc.html").addResourceLocations("classpath:/META-INF/resources/");
registry.addResourceHandler("/webjars/**").addResourceLocations("classpath:/META-INF/resources/webjars/");
registry.addResourceHandler("/doc.html")
.addResourceLocations("classpath:/META-INF/resources/");
registry.addResourceHandler("/webjars/**")
.addResourceLocations("classpath:/META-INF/resources/webjars/");
}
// @Bean
// public ObjectMapper jacksonObjectMapperCustomization() {
// SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
// TimeZone timeZone = TimeZone.getTimeZone("Asia/Shanghai");
// format.setTimeZone(timeZone);
//
// Jackson2ObjectMapperBuilder builder = new Jackson2ObjectMapperBuilder()
// .timeZone(timeZone)
// .dateFormat(format);
//
// return builder.build();
// }
//
// @Override
// public void configureMessageConverters(List<HttpMessageConverter<?>> converters) {
// converters.removeIf(c -> c instanceof MappingJackson2HttpMessageConverter);
// converters.add(new MappingJackson2HttpMessageConverter(jacksonObjectMapperCustomization()));
// }
}
......
src/main/java/com/gogirl/infrastructure/interceptor/AuthHandlerInterceptor.java
......@@ -3,17 +3,23 @@ package com.gogirl.infrastructure.interceptor;
import com.gogirl.application.common.xcx.GogirlTokenService;
import com.gogirl.domain.common.xcx.GogirlToken;
import com.gogirl.domain.user.customer.Customer;
import com.gogirl.infrastructure.common.annotation.AuthIgnore;
import com.gogirl.infrastructure.common.exception.RRException;
import com.gogirl.infrastructure.common.util.StringUtils;
import com.gogirl.infrastructure.mapper.user.customer.CustomerMapper;
import lombok.AllArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Component;
import org.springframework.web.method.HandlerMethod;
import org.springframework.web.servlet.HandlerInterceptor;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import java.lang.reflect.Method;
/**
* 权限拦截器
*/
@AllArgsConstructor
@Component
@Slf4j
......@@ -25,6 +31,16 @@ public class AuthHandlerInterceptor implements HandlerInterceptor {
@Override
public boolean preHandle(HttpServletRequest request, HttpServletResponse response, Object handler) throws Exception {
if (!(handler instanceof HandlerMethod)) {
return true;
}
HandlerMethod handlerMethod = (HandlerMethod) handler;
Method method = handlerMethod.getMethod();
if (method.isAnnotationPresent(AuthIgnore.class)) {
return true;
}
String token = request.getHeader("token");
if (request.getRequestURI().contains("no_")) {
......
src/main/java/com/gogirl/infrastructure/interceptor/LogAspect.java deleted 100644 → 0
package com.gogirl.infrastructure.interceptor;
import com.gogirl.infrastructure.common.base.JsonResult;
import com.gogirl.infrastructure.common.util.JsonUtilByFsJson;
import com.gogirl.infrastructure.util.ParamsUtils;
import org.apache.commons.lang3.StringUtils;
import org.aspectj.lang.JoinPoint;
import org.aspectj.lang.ProceedingJoinPoint;
import org.aspectj.lang.annotation.*;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.stereotype.Component;
import org.springframework.web.context.request.RequestContextHolder;
import org.springframework.web.context.request.ServletRequestAttributes;
import javax.servlet.http.HttpServletRequest;
import java.util.LinkedHashMap;
import java.util.Map;
/**
* @Description:日志切面
* @Author:Kevin
* @Date:2018-12-07 15:09
*/
//@Profile({"dev", "test"})
@Component
@Aspect
public class LogAspect {
private final Logger logger = LoggerFactory.getLogger(LogAspect.class);
/**
* 定义一个公共的方法，实现切入点
* 拦截Controller下面的所有方法 任何参数(..表示拦截任何参数)
* 以@RestController注解作为切入点 可切入其他业务模块的方法
*
* @within和@target针对类的注解,
* @annotation是针对方法的注解，为自定义注解
*/
@Pointcut("@within(org.springframework.web.bind.annotation.RestController)")
public void point() {
}
/**
* 拦截方法之前的一段业务逻辑
*
* @param joinPoint
*/
@Before("point()")
public void doBefore(JoinPoint joinPoint) {
ServletRequestAttributes attributes = (ServletRequestAttributes) RequestContextHolder.getRequestAttributes();
HttpServletRequest request = attributes.getRequest();
Map<String, Object> params = new LinkedHashMap<>(10);
params.put("uri", request.getRequestURI()); // 获取请求的url
//params.put( "method", request.getMethod() ); // 获取请求的方式
params.put("args", joinPoint.getArgs()); // 请求参数
//params.put( "className", joinPoint.getSignature().getDeclaringTypeName() + "." + joinPoint.getSignature().getName() ); // 获取类名和获取类方法
params.put("ip", getClientIp(request)); // 获取请求的ip地址
// 输出格式化后的json字符串
String paramsJson = JsonUtilByFsJson.beanToJson(params);
logger.info("params:{}", JsonUtilByFsJson.beanToJson(paramsJson));
ParamsUtils.setParams(paramsJson);
}
/**
* 获取响应返回值 方法执行return之后
*/
@AfterReturning(returning = "object", pointcut = "point()")
public void doAfterReturning(Object object) {
ServletRequestAttributes attributes = (ServletRequestAttributes) RequestContextHolder.getRequestAttributes();
HttpServletRequest request = attributes.getRequest();
// 会打印出一个对象，想打印出具体内容需要在定义模型处加上toString()
//logger.info( "result:{}", object.toString() );
}
/**
* 环绕通知 在方法的调用前、后执行
*/
@Around("point()")
public Object doAround(ProceedingJoinPoint joinPoint) throws Throwable {
//方法环绕proceed结果
Object obj = joinPoint.proceed();
try {
//开始时间
long begin = System.currentTimeMillis();
//结束时间
long end = System.currentTimeMillis();
//时间差
long timeDiff = (end - begin);
ServletRequestAttributes attributes = (ServletRequestAttributes) RequestContextHolder.getRequestAttributes();
HttpServletRequest request = attributes.getRequest();
String uri = request.getRequestURI();
if (timeDiff < 200) {
logger.info("{}:方法性能分析: 执行耗时 {}毫秒，" + "\uD83D\uDE02", uri, timeDiff);
} else {
logger.warn("{}:方法性能分析: 执行耗时 {}毫秒，" + "\uD83D\uDE31", uri, timeDiff);
}
Map<String, Object> params = new LinkedHashMap<>(10);
params.put("uri", request.getRequestURI()); // 获取请求的url
//params.put( "method", request.getMethod() ); // 获取请求的方式
params.put("args", joinPoint.getArgs()); // 请求参数
//params.put( "className", joinPoint.getSignature().getDeclaringTypeName() + "." + joinPoint.getSignature().getName() ); // 获取类名和获取类方法
params.put("ip", getClientIp(request)); // 获取请求的ip地址
// 输出格式化后的json字符串
if (obj instanceof JsonResult) {
//统一异常那里打印堆栈
// if (((JsonResult) obj).getCode() != 200) {
// logger.error("************************异常开始*******************************");
// logger.error("exception param:{}", paramsJson);
// }
}
} catch (Exception ignore) {
}
return obj;
}
/**
* 拦截方法之后的一段业务逻辑
*/
@After("point()")
public void doAfter() {
ParamsUtils.removeParams();
}
public String getClientIp(HttpServletRequest request) {
String ip = request.getHeader("x-forwarded-for");
logger.debug("x-forwarded-for = {}", ip);
if (ip == null || ip.length() == 0 || "unknown".equalsIgnoreCase(ip)) {
ip = request.getHeader("Proxy-Client-IP");
logger.debug("Proxy-Client-IP = {}", ip);
}
if (ip == null || ip.length() == 0 || "unknown".equalsIgnoreCase(ip)) {
ip = request.getHeader("WL-Proxy-Client-IP");
logger.debug("WL-Proxy-Client-IP = {}", ip);
}
if (ip == null || ip.length() == 0 || "unknown".equalsIgnoreCase(ip)) {
ip = request.getRemoteAddr();
logger.debug("RemoteAddr-IP = {}", ip);
}
if (StringUtils.isNotBlank(ip)) {
ip = ip.split(",")[0];
}
return ip;
}
}
src/main/java/com/gogirl/infrastructure/interceptor/LoginHandlerInterceptor.java
......@@ -3,16 +3,19 @@ package com.gogirl.infrastructure.interceptor;
import com.gogirl.application.common.xcx.GogirlTokenService;
import com.gogirl.domain.common.xcx.GogirlToken;
import com.gogirl.domain.store.store.StoreManage;
import com.gogirl.infrastructure.common.annotation.LoginIgnore;
import com.gogirl.infrastructure.common.exception.RRException;
import com.gogirl.infrastructure.common.util.ListUtil;
import com.gogirl.infrastructure.mapper.store.store.StoreManageMapper;
import lombok.AllArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Component;
import org.springframework.web.method.HandlerMethod;
import org.springframework.web.servlet.HandlerInterceptor;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import java.lang.reflect.Method;
import java.util.List;
@Component
......@@ -26,6 +29,16 @@ public class LoginHandlerInterceptor implements HandlerInterceptor {
@Override
public boolean preHandle(HttpServletRequest request, HttpServletResponse response, Object handler) throws Exception {
if (!(handler instanceof HandlerMethod)) {
return true;
}
HandlerMethod handlerMethod = (HandlerMethod) handler;
Method method = handlerMethod.getMethod();
if (method.isAnnotationPresent(LoginIgnore.class)) {
return true;
}
String token = request.getHeader("token");
if (request.getRequestURI().contains("no_")) {
......
src/main/java/com/gogirl/interfaces/common/FileController.java
package com.gogirl.interfaces.common;
import com.gogirl.infrastructure.common.annotation.AuthIgnore;
import com.gogirl.infrastructure.common.annotation.LoginIgnore;
import com.gogirl.infrastructure.common.base.JsonResult;
import com.gogirl.infrastructure.common.exception.RRException;
import com.gogirl.infrastructure.service.file.FileService;
......@@ -22,6 +24,8 @@ public class FileController {
@Resource
FileService fileService;
@LoginIgnore
@AuthIgnore
@ApiOperation(value = "图片上传")
@PostMapping("/customer/xcx/upload")
public JsonResult<String> upload(MultipartFile file) throws Exception {
......
src/main/java/com/gogirl/interfaces/common/LogController.java
......@@ -2,6 +2,8 @@ package com.gogirl.interfaces.common;
import com.gogirl.application.common.xcx.VisitLogService;
import com.gogirl.domain.common.sys.VisitsLog;
import com.gogirl.infrastructure.common.annotation.AuthIgnore;
import com.gogirl.infrastructure.common.annotation.LoginIgnore;
import com.gogirl.infrastructure.common.base.JsonResult;
import com.gogirl.infrastructure.util.SessionUtils;
import io.swagger.annotations.Api;
......@@ -28,6 +30,7 @@ public class LogController {
private VisitLogService visitLogService;
@AuthIgnore
@ApiOperation(value = "小程序登入记录")
@PostMapping("/customer/message/loginLog")
public JsonResult<Integer> loginLog() {
......@@ -35,6 +38,8 @@ public class LogController {
return JsonResult.success(visitsLog.getId());
}
@LoginIgnore
@AuthIgnore
@ApiOperation(value = "小程序登出记录")
@PostMapping("/customer/message/logoutLog")
public JsonResult<Void> logoutLog(@RequestParam Integer visitsId) {
......@@ -51,6 +56,8 @@ public class LogController {
}
@LoginIgnore
@AuthIgnore
@ApiOperation(value = "页面登入记录", notes = "参数直接传过来")
@PostMapping("/customer/message/pageIn")
public JsonResult<Integer> pageIn(@RequestParam(required = false) Integer type,
......@@ -68,6 +75,8 @@ public class LogController {
}
@LoginIgnore
@AuthIgnore
@ApiOperation(value = "页面登出记录")
@PostMapping("/customer/message/pageOut")
public JsonResult<Void> pageOut(@RequestParam Integer visitsId) {
......
src/main/java/com/gogirl/interfaces/common/MessageController.java
......@@ -5,6 +5,8 @@ import com.gogirl.application.common.xcx.CustomerMessageService;
import com.gogirl.application.common.xcx.MessageService;
import com.gogirl.domain.store.store.Message;
import com.gogirl.domain.user.customer.CustomerMessage;
import com.gogirl.infrastructure.common.annotation.AuthIgnore;
import com.gogirl.infrastructure.common.annotation.LoginIgnore;
import com.gogirl.infrastructure.common.base.JsonResult;
import com.gogirl.shared.user.CustomerMessagePageQuery;
import com.gogirl.shared.user.ReadMessageCommand;
......@@ -36,7 +38,8 @@ public class MessageController {
}
/*query接口开始*/
@LoginIgnore
@AuthIgnore
@ApiModelProperty("我的消息")
@PostMapping("/customer/message/queryPageMessage")
public JsonResult<Page<CustomerMessage>> queryPageMessage(@RequestHeader String token,
......
src/main/java/com/gogirl/interfaces/customer/CustomerController.java
......@@ -3,6 +3,8 @@ package com.gogirl.interfaces.customer;
import com.gogirl.application.common.xcx.GogirlTokenService;
import com.gogirl.application.user.customer.CustomerService;
import com.gogirl.domain.user.customer.Customer;
import com.gogirl.infrastructure.common.annotation.AuthIgnore;
import com.gogirl.infrastructure.common.annotation.LoginIgnore;
import com.gogirl.infrastructure.common.base.JsonResult;
import com.gogirl.shared.member.CustomerOrderDetail;
import com.gogirl.shared.user.CustomerQuery;
......@@ -38,6 +40,8 @@ public class CustomerController {
return JsonResult.success();
}
@LoginIgnore
@AuthIgnore
@ApiOperation(value = "小程序用户登录")
@GetMapping("/customer/xcx/login")
public JsonResult<String> login(@RequestParam String code) {
......@@ -45,6 +49,8 @@ public class CustomerController {
return JsonResult.success(token);
}
@LoginIgnore
@AuthIgnore
@ApiOperation(value = "客户授权后绑定个人信息")
@RequestMapping(method = {RequestMethod.GET, RequestMethod.POST}, value = "/customer/xcx/authorized1")
public JsonResult<Customer> authorized1(@RequestParam(name = "token", required = false) String token,
......@@ -70,6 +76,8 @@ public class CustomerController {
}
@AuthIgnore
@LoginIgnore
@ApiOperation(value = "客户授权手机号码")
@PostMapping("/customer/xcx/authorizedPhone")
public JsonResult<Customer> authorizedPhone(@RequestHeader String token,
......@@ -79,6 +87,7 @@ public class CustomerController {
return JsonResult.success(customer);
}
@AuthIgnore
@ApiOperation(value = "客户根据token获取用户信息")
@GetMapping("/customer/xcx/getUserInfo")
public JsonResult<Customer> getUserInfo(@RequestParam String token) throws Exception {
......@@ -140,6 +149,8 @@ public class CustomerController {
return JsonResult.success();
}
@LoginIgnore
@AuthIgnore
@ApiOperation(value = "获取验证码，用于绑定手机号码")
@PostMapping("/technician//phone/getBindCode")
public JsonResult<String> techGetBindCode(@RequestParam String phone) {
......@@ -148,6 +159,8 @@ public class CustomerController {
}
@LoginIgnore
@AuthIgnore
@ApiOperation(value = "美甲师根据验证码绑定手机号码")
@PostMapping("/technician/phone/bindPhone_t")
public JsonResult<Void> bindPhone_t(@RequestParam String phone,
......
src/main/java/com/gogirl/interfaces/market/coupon/CouponCustomerRelevanceController.java
......@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
import com.gogirl.application.market.coupon.CouponCustomerRelevanceService;
import com.gogirl.application.market.coupon.MarketService;
import com.gogirl.domain.market.coupon.CouponCustomerRelevance;
import com.gogirl.infrastructure.common.annotation.AuthIgnore;
import com.gogirl.infrastructure.common.base.JsonResult;
import com.gogirl.infrastructure.common.util.StringUtils;
import com.gogirl.infrastructure.util.SessionUtils;
......@@ -39,6 +40,7 @@ public class CouponCustomerRelevanceController {
return JsonResult.success(list);
}
@AuthIgnore
@ApiOperation(value = "我的优惠券列表")
@GetMapping("/customer/getMyCoupon")
public JsonResult<IPage<CouponCustomerRelevance>> getMyCoupon(@RequestParam(required = false, defaultValue = "1") Integer pageNum,
......
src/main/java/com/gogirl/interfaces/market/discount/DiscountConfigController.java
......@@ -2,6 +2,7 @@ package com.gogirl.interfaces.market.discount;
import com.gogirl.application.market.discount.DiscountConfigService;
import com.gogirl.domain.market.discount.DiscountConfig;
import com.gogirl.infrastructure.common.annotation.AuthIgnore;
import com.gogirl.infrastructure.common.base.JsonResult;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
......@@ -22,6 +23,7 @@ public class DiscountConfigController {
private final DiscountConfigService discountConfigService;
@AuthIgnore
@ApiOperation(value = "查询充送信息")
@GetMapping("/customer/selectAllDiscount")
public JsonResult<Map<String, Object>> selectAllDiscount() {
......
src/main/java/com/gogirl/interfaces/market/discount/LeisureConfigController.java
......@@ -2,6 +2,8 @@ package com.gogirl.interfaces.market.discount;
import com.gogirl.application.market.discount.LeisureDiscountConfigService;
import com.gogirl.domain.market.discount.LeisureDiscountConfig;
import com.gogirl.infrastructure.common.annotation.AuthIgnore;
import com.gogirl.infrastructure.common.annotation.LoginIgnore;
import com.gogirl.infrastructure.common.base.JsonResult;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
......@@ -18,6 +20,8 @@ public class LeisureConfigController {
private final LeisureDiscountConfigService leisureDiscountConfigService;
@LoginIgnore
@AuthIgnore
@ApiOperation("用户端-获取最小闲时折扣")
@GetMapping("/customer/leisure/queryMinDiscount")
public JsonResult<LeisureDiscountConfig> queryMinDiscount() {
......
src/main/java/com/gogirl/interfaces/market/timescard/TimesCardController.java
......@@ -14,6 +14,7 @@ import com.gogirl.domain.market.timescard.TimesCardType;
import com.gogirl.domain.market.timescard.TimesCardTypeContent;
import com.gogirl.domain.market.timescard.TimesCardUsedRecord;
import com.gogirl.domain.order.serve.OrderServe;
import com.gogirl.infrastructure.common.annotation.AuthIgnore;
import com.gogirl.infrastructure.common.base.JsonResult;
import com.gogirl.infrastructure.common.exception.RRException;
import com.gogirl.infrastructure.common.util.ListUtil;
......@@ -108,6 +109,7 @@ public class TimesCardController {
return JsonResult.success(result);
}
@AuthIgnore
@ApiOperation(value = "查询我的次卡列表")
@GetMapping("/customer/timescard/getMyTimesCardList")
public JsonResult<List<TimesCardCustomerRelevance>> getMyTimesCardList(@RequestHeader String token) {
......
src/main/java/com/gogirl/interfaces/order/mall/MallOrderPayController.java
......@@ -7,6 +7,8 @@ import com.github.binarywang.wxpay.bean.order.WxPayMpOrderResult;
import com.github.binarywang.wxpay.exception.WxPayException;
import com.gogirl.application.order.mall.MallOrderPayService;
import com.gogirl.application.order.mall.MallRefundOrderService;
import com.gogirl.infrastructure.common.annotation.AuthIgnore;
import com.gogirl.infrastructure.common.annotation.LoginIgnore;
import com.gogirl.infrastructure.common.base.JsonResult;
import com.gogirl.infrastructure.util.SessionUtils;
import io.swagger.annotations.Api;
......@@ -14,7 +16,6 @@ import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
import lombok.AllArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.*;
import java.net.UnknownHostException;
......@@ -40,6 +41,8 @@ public class MallOrderPayController {
return JsonResult.success(result);
}
@LoginIgnore
@AuthIgnore
@ApiOperation(value = "用户端微信支付回调")
@PostMapping("/customer/mallOrderPay/notifyMallOrder")
public String notifyOrder(@RequestBody String xmlData) {
......@@ -83,9 +86,11 @@ public class MallOrderPayController {
return JsonResult.success();
}
@AuthIgnore
@LoginIgnore
@ApiOperation(("/确认退款"))
@GetMapping("/customer/mallOrderPay/refund/{orderDetailId}")
@Transactional(timeout = 10000)
public JsonResult<Void> refund(@PathVariable Long orderDetailId) throws WxPayException {
mallRefundOrderService.refund(orderDetailId);
return JsonResult.success();
......
src/main/java/com/gogirl/interfaces/order/serve/WxCallbackController.java
......@@ -5,11 +5,16 @@ import com.github.binarywang.wxpay.bean.notify.WxPayOrderNotifyResult;
import com.gogirl.application.order.market.ITimesCardOrderService;
import com.gogirl.application.order.member.IChargeOrderService;
import com.gogirl.application.order.serve.OrderManageService;
import com.gogirl.infrastructure.common.annotation.AuthIgnore;
import com.gogirl.infrastructure.common.annotation.LoginIgnore;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.AllArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
/**
* @Author robbendev
......@@ -27,6 +32,8 @@ public class WxCallbackController {
private final IChargeOrderService chargeOrderService;
private final ITimesCardOrderService timesCardOrderService;
@LoginIgnore
@AuthIgnore
@ApiOperation(value = "预约订单微信支付回调")
@PostMapping("/customer/pay/notifyOrder")
public String notifyWxPayOrder(@RequestBody String xmlData) {
......@@ -38,8 +45,10 @@ public class WxCallbackController {
return WxPayNotifyResponse.success("成功");
}
@LoginIgnore
@AuthIgnore
@ApiOperation(value = "预约订单(微信+余额)支付回调")
@RequestMapping(method = RequestMethod.POST, value = "/customer/pay/notifyBalanceWxPay")
@PostMapping("/customer/pay/notifyBalanceWxPay")
public String notifyBalanceWxPayOrder(@RequestBody String xmlData) {
log.info("支付回调参数xmlData:" + xmlData);
WxPayOrderNotifyResult result = WxPayOrderNotifyResult.fromXML(xmlData);
......@@ -49,6 +58,8 @@ public class WxCallbackController {
return WxPayNotifyResponse.success("成功");
}
@LoginIgnore
@AuthIgnore
@ApiOperation(value = "充值订单微信支付回调")
@RequestMapping("/customer/pay/notifyCharge")
public String notifyChargeOrder(@RequestBody String xmlData) {
......@@ -60,6 +71,8 @@ public class WxCallbackController {
return WxPayNotifyResponse.success("成功");
}
@LoginIgnore
@AuthIgnore
@ApiOperation(value = "次卡订单微信支付回调")
@RequestMapping("/customer/pay/notifyTimesCard")
public String notifyTimesCardOrder(@RequestBody String xmlData) {
......
src/main/java/com/gogirl/interfaces/product/mall/MallCategoryController.java
......@@ -2,6 +2,8 @@ package com.gogirl.interfaces.product.mall;
import com.gogirl.application.product.mall.MallCategoryService;
import com.gogirl.domain.product.mall.MallCategory;
import com.gogirl.infrastructure.common.annotation.AuthIgnore;
import com.gogirl.infrastructure.common.annotation.LoginIgnore;
import com.gogirl.infrastructure.common.base.JsonResult;
import com.gogirl.infrastructure.common.util.CloneUtil;
import com.gogirl.infrastructure.common.util.ListUtil;
......@@ -24,6 +26,8 @@ public class MallCategoryController {
private final MallCategoryService mallCategoryService;
@LoginIgnore
@AuthIgnore
@ApiOperation("获取分类")
@GetMapping("/customer/mallCategory/getCategoryTree")
public JsonResult<List<MallCategory>> getCategoryTree() {
......@@ -33,6 +37,8 @@ public class MallCategoryController {
return JsonResult.success(data);
}
@LoginIgnore
@AuthIgnore
@ApiOperation("根据父节点分类id获取子分类列表")
@GetMapping("/customer/mallCategory/getCategoryList/{categoryId}")
public JsonResult<List<MallCategory>> getCategoryList(@PathVariable Long categoryId) {
......
src/main/java/com/gogirl/interfaces/product/mall/MallProductController.java
......@@ -4,6 +4,8 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.gogirl.application.product.mall.MallProductService;
import com.gogirl.domain.product.mall.MallProduct;
import com.gogirl.infrastructure.common.annotation.AuthIgnore;
import com.gogirl.infrastructure.common.annotation.LoginIgnore;
import com.gogirl.infrastructure.common.base.JsonResult;
import com.gogirl.shared.product.ProductQuery;
import io.swagger.annotations.Api;
......@@ -18,6 +20,8 @@ public class MallProductController {
private final MallProductService mallProductService;
@LoginIgnore
@AuthIgnore
@ApiOperation("分页查询商城产品列表")
@PostMapping("/customer/mallProduct/queryPageProduct")
public JsonResult<Page<MallProduct>> queryPageProduct(@RequestBody ProductQuery qry) {
......@@ -26,6 +30,8 @@ public class MallProductController {
return JsonResult.success((Page<MallProduct>) page);
}
@LoginIgnore
@AuthIgnore
@ApiOperation("查询商城产品详情")
@GetMapping("/customer/mallProduct/queryProduct")
public JsonResult<MallProduct> queryProduct(@RequestParam Long mallProductId) {
......
src/main/java/com/gogirl/interfaces/product/mall/MallShoppingCartController.java
......@@ -2,6 +2,7 @@ package com.gogirl.interfaces.product.mall;
import com.gogirl.application.product.mall.MallShoppingCartCmdService;
import com.gogirl.application.product.mall.MallShoppingCartQryService;
import com.gogirl.infrastructure.common.annotation.AuthIgnore;
import com.gogirl.infrastructure.common.base.JsonResult;
import com.gogirl.infrastructure.util.SessionUtils;
import com.gogirl.shared.product.*;
......@@ -35,6 +36,7 @@ public class MallShoppingCartController {
return JsonResult.success();
}
@AuthIgnore
@ApiOperation("查看我的购物车")
@PostMapping("/customer/mallCart/listMallShoppingCart")
public JsonResult<MyMallShoppingCartDTO> listMallShoppingCart() {
......
src/main/java/com/gogirl/interfaces/product/serve/BroadcastController.java
......@@ -2,6 +2,8 @@ package com.gogirl.interfaces.product.serve;
import com.gogirl.application.product.serve.BaseBroadcastService;
import com.gogirl.domain.product.serve.BaseBroadcast;
import com.gogirl.infrastructure.common.annotation.AuthIgnore;
import com.gogirl.infrastructure.common.annotation.LoginIgnore;
import com.gogirl.infrastructure.common.base.JsonResult;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
......@@ -25,6 +27,8 @@ public class BroadcastController {
this.baseBroadcastService = baseBroadcastService;
}
@LoginIgnore
@AuthIgnore
@ApiOperation(value = "1.查询轮播图列表", notes = "查询轮播图列表")
@GetMapping("/customer/broadcast/queryBroadcast")
public JsonResult<List<BaseBroadcast>> queryBroadcast(@RequestParam(required = false) Integer positionType) {
......
src/main/java/com/gogirl/interfaces/product/serve/ProduceController.java
......@@ -3,6 +3,7 @@ package com.gogirl.interfaces.product.serve;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.gogirl.application.product.serve.BaseProduceService;
import com.gogirl.domain.product.serve.BaseProduce;
import com.gogirl.infrastructure.common.annotation.AuthIgnore;
import com.gogirl.infrastructure.common.base.JsonResult;
import com.gogirl.shared.product.QueryProduceDetailResp;
import com.gogirl.shared.product.serve.QueryProducePageRequest;
......@@ -37,6 +38,7 @@ public class ProduceController {
@ApiOperation(value = "查询款式详情", notes = "查询款式详情")
@AuthIgnore
@GetMapping("/customer/produce/queryProduceDetail")
public JsonResult<BaseProduce> queryProduceDetail(Integer id) {
BaseProduce baseProduce = baseProduceService.getProduceForDetail(id);
......
src/main/java/com/gogirl/interfaces/product/serve/ServeController.java
......@@ -4,6 +4,8 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.gogirl.application.product.serve.BaseServeService;
import com.gogirl.domain.product.serve.BaseServe;
import com.gogirl.infrastructure.common.annotation.AuthIgnore;
import com.gogirl.infrastructure.common.annotation.LoginIgnore;
import com.gogirl.infrastructure.common.base.JsonResult;
import com.gogirl.infrastructure.common.util.DateUtils;
import com.gogirl.infrastructure.common.util.StringUtils;
......@@ -34,6 +36,8 @@ public class ServeController {
@ApiOperation(value = "查看服务列表")
@GetMapping("/customer/serve/no_queryServeForPage")
@Deprecated
@LoginIgnore
@AuthIgnore
public JsonResult<IPage<BaseServe>> no_queryServeForPage(BaseServe param,
Integer pageNum,
Integer pageSize,
......
src/main/java/com/gogirl/interfaces/store/shop/ShopManageController.java
......@@ -4,6 +4,8 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.gogirl.application.store.store.StoreManageService;
import com.gogirl.domain.store.store.StoreManage;
import com.gogirl.infrastructure.common.annotation.AuthIgnore;
import com.gogirl.infrastructure.common.annotation.LoginIgnore;
import com.gogirl.infrastructure.common.base.JsonResult;
import com.gogirl.infrastructure.util.MapDistanceUtils;
import com.google.common.collect.Lists;
......@@ -32,6 +34,8 @@ public class ShopManageController {
private final StoreManageService storeManageService;
@LoginIgnore
@AuthIgnore
@ApiOperation(value = "获取美甲师绑定的店铺")
@GetMapping("/technician/xcx/getTechnicianShopList")
public JsonResult<List<StoreManage>> getTechnicianShopList(@RequestHeader String token) {
......@@ -40,6 +44,7 @@ public class ShopManageController {
}
@AuthIgnore
@ApiOperation(value = "查询店铺列表，longitude,latitude和页码都是可选参数")
@GetMapping("/customer/shop/queryShopForPage")
public JsonResult<IPage<StoreManage>> queryShopForPage(@RequestParam(required = false) String longitude,
......@@ -77,6 +82,8 @@ public class ShopManageController {
return JsonResult.success(storeManage);
}
@LoginIgnore
@AuthIgnore
@ApiOperation(value = "查询店照，不传departmentId则查全部店铺的店照")
@GetMapping("/customer/shop/queryShopEnvironmentPhotos")
public JsonResult<List<String>> queryShopEnvironmentPhotos(@RequestParam(required = false) Integer departmentId,
......
src/main/java/com/gogirl/interfaces/store/technician/StoreTechnicianController.java
......@@ -4,6 +4,8 @@ import com.gogirl.application.store.store.StoreTechnicianService;
import com.gogirl.application.store.store.StoreUserService;
import com.gogirl.domain.store.store.StoreTechnician;
import com.gogirl.domain.store.store.StoreUser;
import com.gogirl.infrastructure.common.annotation.AuthIgnore;
import com.gogirl.infrastructure.common.annotation.LoginIgnore;
import com.gogirl.infrastructure.common.base.JsonResult;
import com.gogirl.infrastructure.service.file.FileService;
import com.gogirl.infrastructure.util.SessionUtils;
......@@ -59,6 +61,8 @@ public class StoreTechnicianController {
}
@LoginIgnore
@AuthIgnore
@ApiOperation(value = "美甲师根据code获取token")
@GetMapping(value = "/technician/xcx/login_t")
public JsonResult<String> technicianLogin(@RequestParam String code) {
......@@ -67,6 +71,8 @@ public class StoreTechnicianController {
return JsonResult.success(token);
}
@LoginIgnore
@AuthIgnore
@ApiOperation(value = "美甲师根据token获取美甲师信息")
@GetMapping("/technician/xcx/getUserInfo_t")
public JsonResult<StoreTechnician> getTechnician(@RequestHeader String token) {
......@@ -76,6 +82,8 @@ public class StoreTechnicianController {
}
@LoginIgnore
@AuthIgnore
@ApiOperation(value = "美甲师选择多门店的账号")
@PostMapping("/technician/xcx/choseStore")
public JsonResult<Void> choseStore(@RequestParam Integer departmentId) {
......@@ -84,6 +92,8 @@ public class StoreTechnicianController {
return JsonResult.success();
}
@LoginIgnore
@AuthIgnore
@ApiOperation(value = "图片上传")
@RequestMapping("/technician/xcx/upload")
public JsonResult<String> techUpload(MultipartFile file) throws Exception {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment