From babccfd39f2bd712b957d6e46d32f32acd483d4c Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Fri, 12 Nov 2021 11:12:12 +0800
Subject: [PATCH] Merge branch 'ty_fix' into alpha
---
zq-erp/src/main/java/com/matrix/system/app/action/ApiUsersAction.java | 4 ++--
zq-erp/src/main/java/com/matrix/config/MvcCoreConfig.java | 1 +
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/zq-erp/src/main/java/com/matrix/config/MvcCoreConfig.java b/zq-erp/src/main/java/com/matrix/config/MvcCoreConfig.java
index 8bb1c0b..c3067f7 100644
--- a/zq-erp/src/main/java/com/matrix/config/MvcCoreConfig.java
+++ b/zq-erp/src/main/java/com/matrix/config/MvcCoreConfig.java
@@ -74,6 +74,7 @@
registry.addInterceptor(hostInterceptor).addPathPatterns("/**/wxapi/**")
.addPathPatterns("/api/common/wxLogin/**")
.addPathPatterns("/api/common/bindUser")
+ .addPathPatterns("/api/user/xcxloginOut/**")
.excludePathPatterns("/wxCommon/wxapi/wxpayCallback")
.excludePathPatterns("/wxCommon/wxapi/rechargeCallBack");
}
diff --git a/zq-erp/src/main/java/com/matrix/system/app/action/ApiUsersAction.java b/zq-erp/src/main/java/com/matrix/system/app/action/ApiUsersAction.java
index 7547ff6..04652c9 100644
--- a/zq-erp/src/main/java/com/matrix/system/app/action/ApiUsersAction.java
+++ b/zq-erp/src/main/java/com/matrix/system/app/action/ApiUsersAction.java
@@ -112,8 +112,8 @@
}
@ApiOperation(value = "小程序退出登陆", notes = "小程序退出登陆")
- @GetMapping(value = "/loginOut/{code}")
- public AjaxResult loginOut(HttpServletRequest request, String code) {
+ @GetMapping(value = "/xcxloginOut/{code}")
+ public AjaxResult xcxloginOut(HttpServletRequest request, String code) {
SysUsers hasBind = sysUsersService.findByOpenId(code, HostInterceptor.getCompanyId());
if (hasBind != null) {
if(StrUtil.isNotBlank(hasBind.getOpenIds())) {
--
Gitblit v1.9.1