Просмотр исходного кода

[集团版][修改]:集团版预处理

release_toaliyun_real
Stormeye Wu 6 лет назад
Родитель
Сommit
68376fdc2a
5 измененных файлов: 19 добавлений и 11 удалений
  1. +1
    -4
      mallinkService/src/main/java/com/iformall/service/impl/WxMallServiceImpl.java
  2. +1
    -1
      mallinkSysAdmin/src/main/java/com/iformall/controller/sys/MallUserInfoController.java
  3. +1
    -0
      mallinkSysAdmin/src/main/java/com/iformall/controller/sys/UploadController.java
  4. +1
    -6
      mallinkSysAdmin/src/main/java/com/iformall/controller/sys/WxAdminLogController.java
  5. +15
    -0
      mallinkWebSocketServer/src/main/java/com/iformall/controller/BaseController.java

+ 1
- 4
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());
}


+ 1
- 1
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);


+ 1
- 0
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;


+ 1
- 6
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();
}


+ 15
- 0
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);
}


Загрузка…
Отмена
Сохранить