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

Merge tag 'refs/tags/jenkins-back-end-597' into release

develop
release_toaliyun_real
Stormeye Wu 7 лет назад
Родитель
Сommit
d9728a81a5
4 измененных файлов: 8 добавлений и 8 удалений
  1. +4
    -5
      mallinkAdmin/src/main/java/com/iformall/controller/WxCUserBasicInfoController.java
  2. +1
    -1
      mallinkAdmin/src/main/java/com/iformall/tenant/TenantInfoImpl.java
  3. +1
    -1
      mallinkCApi/src/main/java/com/iformall/tenant/TenantInfoImpl.java
  4. +2
    -1
      mallinkService/src/main/java/com/iformall/utils/Constant.java

+ 4
- 5
mallinkAdmin/src/main/java/com/iformall/controller/WxCUserBasicInfoController.java Просмотреть файл

@@ -11,6 +11,7 @@ import com.iformall.domain.po.*;
import com.iformall.enums.EnumAssignTagsTrigger; import com.iformall.enums.EnumAssignTagsTrigger;
import com.iformall.exception.MallinkException; import com.iformall.exception.MallinkException;
import com.iformall.service.*; import com.iformall.service.*;
import com.iformall.utils.Constant;
import io.swagger.annotations.Api; import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams; import io.swagger.annotations.ApiImplicitParams;
@@ -43,8 +44,6 @@ import static com.iformall.domain.po.WxCouponOrder.Field.CreateDate_DESC;
public class WxCUserBasicInfoController extends BaseController { public class WxCUserBasicInfoController extends BaseController {
private final Logger logger = LoggerFactory.getLogger(this.getClass()); private final Logger logger = LoggerFactory.getLogger(this.getClass());


private String importMemPrev = "importmem/";

@Autowired @Autowired
private WxCUserBasicInfoService wxCUserBasicInfoService; private WxCUserBasicInfoService wxCUserBasicInfoService;


@@ -280,7 +279,7 @@ public class WxCUserBasicInfoController extends BaseController {
//得到当前用户ID //得到当前用户ID
final MallUserInfo user = getUser(); final MallUserInfo user = getUser();
String userId = "" + user.getId(); String userId = "" + user.getId();
String importKey = importMemPrev + userId;
String importKey = Constant.importMemPrev + userId;
final String tenantId = getTenantId(); final String tenantId = getTenantId();


//查询当前用户得到的值是否为空,为空继续,不为空,返回模板正在导入 //查询当前用户得到的值是否为空,为空继续,不为空,返回模板正在导入
@@ -295,7 +294,7 @@ public class WxCUserBasicInfoController extends BaseController {
stringRedisTemplate.opsForHash().putIfAbsent(importKey, "processCount", ""); stringRedisTemplate.opsForHash().putIfAbsent(importKey, "processCount", "");
stringRedisTemplate.opsForHash().putIfAbsent(importKey, "failCount", ""); stringRedisTemplate.opsForHash().putIfAbsent(importKey, "failCount", "");


String fpath = "./upload/";
String fpath = Constant.fileDirectory;
File targetFile = new File(fpath); File targetFile = new File(fpath);
if (!targetFile.exists()) { if (!targetFile.exists()) {
targetFile.mkdirs(); targetFile.mkdirs();
@@ -357,7 +356,7 @@ public class WxCUserBasicInfoController extends BaseController {


@GetMapping("/queryTemplateCount") @GetMapping("/queryTemplateCount")
public ResultData queryTemplateCount() { public ResultData queryTemplateCount() {
String importKey = importMemPrev + getUser().getId();
String importKey = Constant.importMemPrev + getUser().getId();
Map entries = stringRedisTemplate.opsForHash().entries(importKey); Map entries = stringRedisTemplate.opsForHash().entries(importKey);
logger.info(JSONArray.toJSONString(entries) + ">>>>>>>>>>>>>>>>>>>>>1"); logger.info(JSONArray.toJSONString(entries) + ">>>>>>>>>>>>>>>>>>>>>1");
if (entries.size() < 4) { if (entries.size() < 4) {


+ 1
- 1
mallinkAdmin/src/main/java/com/iformall/tenant/TenantInfoImpl.java Просмотреть файл

@@ -13,7 +13,7 @@ public class TenantInfoImpl implements TenantInfo {


@Override @Override
public String getTenantId() { public String getTenantId() {
String tenantId = "";
String tenantId = null;
try { try {
tenantId = (String) SecurityUtils.getSubject().getSession().getAttribute(UserSession.tenantId); tenantId = (String) SecurityUtils.getSubject().getSession().getAttribute(UserSession.tenantId);
} catch (InvalidSessionException e) { } catch (InvalidSessionException e) {


+ 1
- 1
mallinkCApi/src/main/java/com/iformall/tenant/TenantInfoImpl.java Просмотреть файл

@@ -15,7 +15,7 @@ public class TenantInfoImpl implements TenantInfo {


@Override @Override
public String getTenantId() { public String getTenantId() {
String tenantId = "";
String tenantId = null;
try { try {
HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest(); HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest();
tenantId = (String) request.getAttribute(AuthorizationInterceptor.TENANT_ID); tenantId = (String) request.getAttribute(AuthorizationInterceptor.TENANT_ID);


+ 2
- 1
mallinkService/src/main/java/com/iformall/utils/Constant.java Просмотреть файл

@@ -2,5 +2,6 @@ package com.iformall.utils;


public class Constant { public class Constant {


public static final String fileDirectory="./uploads/";
public static final String fileDirectory = "./uploads/";
public static final String importMemPrev = "importmem/";
} }

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