From 68376fdc2aa276edbc0a8ccd90fbdf9895a02706 Mon Sep 17 00:00:00 2001 From: Stormeye Wu Date: Fri, 1 Nov 2019 11:04:29 +0800 Subject: [PATCH] =?UTF-8?q?[=E9=9B=86=E5=9B=A2=E7=89=88][=E4=BF=AE?= =?UTF-8?q?=E6=94=B9]:=E9=9B=86=E5=9B=A2=E7=89=88=E9=A2=84=E5=A4=84?= =?UTF-8?q?=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../iformall/service/impl/WxMallServiceImpl.java | 5 +---- .../controller/sys/MallUserInfoController.java | 2 +- .../iformall/controller/sys/UploadController.java | 1 + .../controller/sys/WxAdminLogController.java | 7 +------ .../com/iformall/controller/BaseController.java | 15 +++++++++++++++ 5 files changed, 19 insertions(+), 11 deletions(-) diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxMallServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxMallServiceImpl.java index f395a2ebb..876260ee9 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxMallServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxMallServiceImpl.java @@ -134,12 +134,9 @@ public class WxMallServiceImpl implements WxMallService { return mall; } // 不存在,从数据库中获取 - WxMall q = new WxMall() {{ - setTenantId(tenantEntity.getTenantId()); - }}; WxMall mall = null; try { - mall = wxMallMapper.selectOne(new QueryWrapper<>(q)); + mall = wxMallMapper.getByTenantId(tenantEntity.getTenantId()); } catch (Exception e) { logger.error(e.getMessage()); } diff --git a/mallinkSysAdmin/src/main/java/com/iformall/controller/sys/MallUserInfoController.java b/mallinkSysAdmin/src/main/java/com/iformall/controller/sys/MallUserInfoController.java index 13a09ffcb..2655afec4 100644 --- a/mallinkSysAdmin/src/main/java/com/iformall/controller/sys/MallUserInfoController.java +++ b/mallinkSysAdmin/src/main/java/com/iformall/controller/sys/MallUserInfoController.java @@ -336,7 +336,7 @@ public class MallUserInfoController extends BaseController { } WxMsgValidationcode wxMsgValidationcode = new WxMsgValidationcode(); - wxMsgValidationcode.setTenantId(user.getTenantId()); + wxMsgValidationcode.updateTenantInfo(getTenantInfo()); wxMsgValidationcode.setPhone(user.getPhone()); wxMsgValidationcode.setType(type); return wxMsgValidationcodeService.sendvalidationcode(wxMsgValidationcode); diff --git a/mallinkSysAdmin/src/main/java/com/iformall/controller/sys/UploadController.java b/mallinkSysAdmin/src/main/java/com/iformall/controller/sys/UploadController.java index 4a84c9237..f59d94a42 100644 --- a/mallinkSysAdmin/src/main/java/com/iformall/controller/sys/UploadController.java +++ b/mallinkSysAdmin/src/main/java/com/iformall/controller/sys/UploadController.java @@ -13,6 +13,7 @@ import com.iformall.common.ResultData; import com.iformall.config.AwsProperty; import com.iformall.controller.base.BaseController; import com.iformall.domain.po.MallResource; +import com.iformall.domain.po.base.TenantEntity; import com.iformall.service.MallResourceService; import com.iformall.utils.Constant; import com.iformall.utils.ImgUtil; diff --git a/mallinkSysAdmin/src/main/java/com/iformall/controller/sys/WxAdminLogController.java b/mallinkSysAdmin/src/main/java/com/iformall/controller/sys/WxAdminLogController.java index 34528e993..68e9ca110 100644 --- a/mallinkSysAdmin/src/main/java/com/iformall/controller/sys/WxAdminLogController.java +++ b/mallinkSysAdmin/src/main/java/com/iformall/controller/sys/WxAdminLogController.java @@ -1,13 +1,9 @@ package com.iformall.controller.sys; -import com.github.pagehelper.PageInfo; -import com.iformall.common.Result; import com.iformall.common.ResultData; import com.iformall.controller.base.BaseController; import com.iformall.domain.po.WxAdminLog; import com.iformall.service.WxAdminLogService; -import io.swagger.annotations.ApiImplicitParam; -import io.swagger.annotations.ApiImplicitParams; import io.swagger.annotations.ApiOperation; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -26,8 +22,7 @@ public class WxAdminLogController extends BaseController { @PostMapping("pvlog") public ResultData pvLog(@RequestBody WxAdminLog wxAdminLog) { logger.debug("[" + getIpAddr() + "] WxAdminLogController::pvLog"); - String tenantId = getTenantId(); - wxAdminLog.setTenantId(tenantId); + wxAdminLog.updateTenantInfo(getTenantInfo()); wxAdminLogService.saveLogCount(wxAdminLog); return new ResultData(); } diff --git a/mallinkWebSocketServer/src/main/java/com/iformall/controller/BaseController.java b/mallinkWebSocketServer/src/main/java/com/iformall/controller/BaseController.java index 9d64c38ec..3595c45ac 100644 --- a/mallinkWebSocketServer/src/main/java/com/iformall/controller/BaseController.java +++ b/mallinkWebSocketServer/src/main/java/com/iformall/controller/BaseController.java @@ -82,12 +82,27 @@ public class BaseController { return user; } + @Deprecated public String getTenantId() { HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest(); String tenantId = (String) request.getAttribute(AuthHandshakeInterceptor.TENANT_ID); return tenantId; } + /** + * 返回租户信息 + * @return + */ + public TenantEntity getTenantInfo(){ + HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest(); + String tenantId = (String)request.getAttribute(AuthHandshakeInterceptor.TENANT_ID); + + TenantEntity tenantEntity = new TenantEntity(){{ + setTenantId(tenantId); + }}; + return tenantEntity; + } + public WxAppinfo getAppInfo(String appId) { return wxAppinfoService.getByAppId(appId); }