Преглед на файлове

bug

release_toaliyun_real
xhxu преди 5 години
родител
ревизия
299605fb6c
променени са 9 файла, в които са добавени 63 реда и са изтрити 5 реда
  1. +3
    -0
      mallinkAdmin/src/main/java/com/iformall/tenant/TenantInfoImpl.java
  2. +3
    -0
      mallinkBApi/src/main/java/com/iformall/tenant/TenantInfoImpl.java
  3. +10
    -0
      mallinkCApi/src/main/java/com/iformall/controller/BaseController.java
  4. +6
    -0
      mallinkCApi/src/main/java/com/iformall/controller/WxMsgValidationcodeController.java
  5. +8
    -0
      mallinkCApi/src/main/java/com/iformall/controller/WxUserGrantController.java
  6. +3
    -0
      mallinkCApi/src/main/java/com/iformall/tenant/TenantInfoImpl.java
  7. +25
    -1
      mallinkService/src/main/java/com/iformall/service/impl/WxCUserServiceImpl.java
  8. +3
    -4
      mallinkService/src/main/java/com/iformall/service/impl/WxCUserTokenServiceImpl.java
  9. +2
    -0
      mallinkService/src/main/java/com/iformall/utils/Constant.java

+ 3
- 0
mallinkAdmin/src/main/java/com/iformall/tenant/TenantInfoImpl.java Целия файл

@@ -98,6 +98,9 @@ public class TenantInfoImpl implements TenantInfo {
if ("wx_logic_permission".equals(tableName)) { if ("wx_logic_permission".equals(tableName)) {
return true; return true;
} }
if ("wx_score_rules".equals(tableName)) {
return true;
}
return false; return false;
} }




+ 3
- 0
mallinkBApi/src/main/java/com/iformall/tenant/TenantInfoImpl.java Целия файл

@@ -86,6 +86,9 @@ public class TenantInfoImpl implements TenantInfo {
if ("wx_user_channel".equals(tableName)) { if ("wx_user_channel".equals(tableName)) {
return true; return true;
} }
if ("wx_score_rules".equals(tableName)) {
return true;
}
// wx_profit_sharing_receiver // wx_profit_sharing_receiver
// wx_profit_sharing_result // wx_profit_sharing_result
return false; return false;


+ 10
- 0
mallinkCApi/src/main/java/com/iformall/controller/BaseController.java Целия файл

@@ -16,6 +16,8 @@ import com.iformall.utils.IPUtil;
import com.iformall.utils.MaUtil; import com.iformall.utils.MaUtil;
import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Qualifier;
import org.springframework.data.redis.core.RedisTemplate;
import org.springframework.web.bind.WebDataBinder; import org.springframework.web.bind.WebDataBinder;
import org.springframework.web.bind.annotation.InitBinder; import org.springframework.web.bind.annotation.InitBinder;
import org.springframework.web.bind.annotation.RestController; import org.springframework.web.bind.annotation.RestController;
@@ -47,6 +49,10 @@ public class BaseController {
@Autowired @Autowired
private WxCUserBasicInfoService wxCUserBasicInfoService; private WxCUserBasicInfoService wxCUserBasicInfoService;


@Autowired
@Qualifier("cuserTokenRedisTemplate")
RedisTemplate<String, WxCUser> cUserTokenRedisTemplate;

@InitBinder @InitBinder
public void InitBinder(WebDataBinder dataBinder) { public void InitBinder(WebDataBinder dataBinder) {
dataBinder.registerCustomEditor(Date.class, new PropertyEditorSupport() { dataBinder.registerCustomEditor(Date.class, new PropertyEditorSupport() {
@@ -224,6 +230,10 @@ public class BaseController {
user.setUserId(basicInfo.getId()); user.setUserId(basicInfo.getId());
wxCUserService.updateUserId(user); wxCUserService.updateUserId(user);
} }
String key = Constant.tokenPrev + user.getOpenId();
if(cUserTokenRedisTemplate.hasKey(key)){
cUserTokenRedisTemplate.delete(key);
}
} }


public String getIpAddr() { public String getIpAddr() {


+ 6
- 0
mallinkCApi/src/main/java/com/iformall/controller/WxMsgValidationcodeController.java Целия файл

@@ -6,6 +6,7 @@ import com.iformall.domain.po.WxCUser;
import com.iformall.domain.po.WxMsgValidationcode; import com.iformall.domain.po.WxMsgValidationcode;
import com.iformall.enums.EnumAssignTagsTrigger; import com.iformall.enums.EnumAssignTagsTrigger;
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;
@@ -76,6 +77,11 @@ public class WxMsgValidationcodeController extends BaseController {
// 更新到basicinfo // 更新到basicinfo
saveToBasicInfo(user); saveToBasicInfo(user);
wxCUserTagsService.triggerAssignTags(EnumAssignTagsTrigger.ASSIGN_TAGS_TRIGGER_PHONE,user); wxCUserTagsService.triggerAssignTags(EnumAssignTagsTrigger.ASSIGN_TAGS_TRIGGER_PHONE,user);

String key = Constant.tokenPrev + user.getOpenId();
if(cUserTokenRedisTemplate.hasKey(key)){
cUserTokenRedisTemplate.delete(key);
}
} }
return rd; return rd;
} }


+ 8
- 0
mallinkCApi/src/main/java/com/iformall/controller/WxUserGrantController.java Целия файл

@@ -29,6 +29,8 @@ import org.apache.commons.lang3.StringUtils;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Qualifier;
import org.springframework.data.redis.core.RedisTemplate;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
import org.springframework.web.context.request.RequestContextHolder; import org.springframework.web.context.request.RequestContextHolder;
import org.springframework.web.context.request.ServletRequestAttributes; import org.springframework.web.context.request.ServletRequestAttributes;
@@ -98,6 +100,7 @@ public class WxUserGrantController extends BaseController {
@Autowired @Autowired
WxMallService mallService; WxMallService mallService;



/** /**
* 微信消息服务验证 * 微信消息服务验证
* *
@@ -557,6 +560,11 @@ public class WxUserGrantController extends BaseController {
user.setLanguage(userInfo.getLanguage()); user.setLanguage(userInfo.getLanguage());
wxCUserService.saveOrUpdate(updateUser); wxCUserService.saveOrUpdate(updateUser);


String key = Constant.tokenPrev + user.getOpenId();
if(cUserTokenRedisTemplate.hasKey(key)){
cUserTokenRedisTemplate.delete(key);
}

if(bFirstNickName) { if(bFirstNickName) {
// 首次获取昵称 // 首次获取昵称
// 成长值 // 成长值


+ 3
- 0
mallinkCApi/src/main/java/com/iformall/tenant/TenantInfoImpl.java Целия файл

@@ -86,6 +86,9 @@ public class TenantInfoImpl implements TenantInfo {
if ("wx_user_channel".equals(tableName)) { if ("wx_user_channel".equals(tableName)) {
return true; return true;
} }
if ("wx_score_rules".equals(tableName)) {
return true;
}
// wx_profit_sharing_receiver // wx_profit_sharing_receiver
// wx_profit_sharing_result // wx_profit_sharing_result
return false; return false;


+ 25
- 1
mallinkService/src/main/java/com/iformall/service/impl/WxCUserServiceImpl.java Целия файл

@@ -16,11 +16,14 @@ import com.iformall.exception.MallinkException;
import com.iformall.mapper.WxCUserMapper; import com.iformall.mapper.WxCUserMapper;
import com.iformall.mq.MqBaseProducer; import com.iformall.mq.MqBaseProducer;
import com.iformall.service.*; import com.iformall.service.*;
import com.iformall.utils.Constant;
import me.chanjar.weixin.mp.bean.result.WxMpUser; import me.chanjar.weixin.mp.bean.result.WxMpUser;
import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.StringUtils;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Qualifier;
import org.springframework.data.redis.core.RedisTemplate;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;


import java.util.Date; import java.util.Date;
@@ -48,6 +51,10 @@ public class WxCUserServiceImpl implements WxCUserService {
@Autowired @Autowired
private MqBaseProducer mqBaseProducer; private MqBaseProducer mqBaseProducer;


@Autowired
@Qualifier("cuserTokenRedisTemplate")
RedisTemplate<String, WxCUser> cUserTokenRedisTemplate;

@Override @Override
public PageInfo<WxCUser> listAsPage(WxCUser record, Integer pageIndex, Integer pageSize) { public PageInfo<WxCUser> listAsPage(WxCUser record, Integer pageIndex, Integer pageSize) {
return PageHelper.startPage(pageIndex, pageSize).doSelectPageInfo(() -> wxCUserMapper.findList(record)); return PageHelper.startPage(pageIndex, pageSize).doSelectPageInfo(() -> wxCUserMapper.findList(record));
@@ -171,6 +178,10 @@ public class WxCUserServiceImpl implements WxCUserService {
userL.setScene(record.getScene()); userL.setScene(record.getScene());
userL.setUpdateDate(curr); userL.setUpdateDate(curr);
int ret = wxCUserMapper.updateById(userL); int ret = wxCUserMapper.updateById(userL);
String key = Constant.tokenPrev + record.getOpenId();
if(cUserTokenRedisTemplate.hasKey(key)){
cUserTokenRedisTemplate.delete(key);
}
return ret; return ret;
} }


@@ -183,6 +194,10 @@ public class WxCUserServiceImpl implements WxCUserService {
userL.setLatitude(record.getLatitude()); userL.setLatitude(record.getLatitude());
userL.setUpdateDate(curr); userL.setUpdateDate(curr);
int ret = wxCUserMapper.updateById(userL); int ret = wxCUserMapper.updateById(userL);
String key = Constant.tokenPrev + record.getOpenId();
if(cUserTokenRedisTemplate.hasKey(key)){
cUserTokenRedisTemplate.delete(key);
}
return ret; return ret;
} }


@@ -194,6 +209,10 @@ public class WxCUserServiceImpl implements WxCUserService {
userL.setExtraInfo(record.getExtraInfo()); userL.setExtraInfo(record.getExtraInfo());
userL.setUpdateDate(curr); userL.setUpdateDate(curr);
int ret = wxCUserMapper.updateById(userL); int ret = wxCUserMapper.updateById(userL);
String key = Constant.tokenPrev + record.getOpenId();
if(cUserTokenRedisTemplate.hasKey(key)){
cUserTokenRedisTemplate.delete(key);
}
return ret; return ret;
} }


@@ -291,7 +310,10 @@ public class WxCUserServiceImpl implements WxCUserService {
} }
} }
} }

String key = Constant.tokenPrev + user.getOpenId();
if(cUserTokenRedisTemplate.hasKey(key)){
cUserTokenRedisTemplate.delete(key);
}
return score; return score;
} }


@@ -318,4 +340,6 @@ public class WxCUserServiceImpl implements WxCUserService {
public void updateUserId(WxCUser user) { public void updateUserId(WxCUser user) {
wxCUserMapper.updateUserId(user); wxCUserMapper.updateUserId(user);
} }


} }

+ 3
- 4
mallinkService/src/main/java/com/iformall/service/impl/WxCUserTokenServiceImpl.java Целия файл

@@ -8,6 +8,7 @@ import com.iformall.mapper.WxScoreHistoryMapper;
import com.iformall.mapper.WxScoreRulesMapper; import com.iformall.mapper.WxScoreRulesMapper;
import com.iformall.service.WxCUserTokenService; import com.iformall.service.WxCUserTokenService;
import com.iformall.service.WxScoreRulesService; import com.iformall.service.WxScoreRulesService;
import com.iformall.utils.Constant;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
@@ -23,8 +24,6 @@ import java.util.concurrent.TimeUnit;
public class WxCUserTokenServiceImpl implements WxCUserTokenService { public class WxCUserTokenServiceImpl implements WxCUserTokenService {
private final Logger logger = LoggerFactory.getLogger(this.getClass()); private final Logger logger = LoggerFactory.getLogger(this.getClass());


private String tokenPrev = "weapp:token:";

@Autowired @Autowired
WxCUserMapper wxCUserMapper; WxCUserMapper wxCUserMapper;


@@ -35,7 +34,7 @@ public class WxCUserTokenServiceImpl implements WxCUserTokenService {
@Override @Override
public WxCUser getByToken(String token) { public WxCUser getByToken(String token) {
logger.info("获取用户信息start ..." + token); logger.info("获取用户信息start ..." + token);
String key = tokenPrev + token;
String key = Constant.tokenPrev + token;
ValueOperations<String, WxCUser> operations = cUserTokenRedisTemplate.opsForValue(); ValueOperations<String, WxCUser> operations = cUserTokenRedisTemplate.opsForValue();


// 缓存 // 缓存
@@ -69,7 +68,7 @@ public class WxCUserTokenServiceImpl implements WxCUserTokenService {
user.setUpdateDate(curr); user.setUpdateDate(curr);
ret = wxCUserMapper.updateById(user); ret = wxCUserMapper.updateById(user);
} }
String key = tokenPrev + user.getToken();
String key = Constant.tokenPrev + user.getToken();
// 缓存已存在,删除 // 缓存已存在,删除
boolean hasKey = cUserTokenRedisTemplate.hasKey(key); boolean hasKey = cUserTokenRedisTemplate.hasKey(key);
if(hasKey) { if(hasKey) {


+ 2
- 0
mallinkService/src/main/java/com/iformall/utils/Constant.java Целия файл

@@ -22,6 +22,8 @@ public class Constant {
public final static int EXPIRE = H_EXPIRE * 24; public final static int EXPIRE = H_EXPIRE * 24;


// C端token // C端token
public static final String tokenPrev = "weapp:token:";

public static final String LOGIN_USER_KEY = "LOGIN_USER_KEY"; public static final String LOGIN_USER_KEY = "LOGIN_USER_KEY";
public static final String LOGIN_MEMBER_KEY = "LOGIN_MEMBER_KEY"; public static final String LOGIN_MEMBER_KEY = "LOGIN_MEMBER_KEY";
public static final String TENANT_ID = "TENANT_ID"; public static final String TENANT_ID = "TENANT_ID";


Зареждане…
Отказ
Запис