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

Merge branch 'release_real_202008' of https://git.youlane.cn/server/formallProject into release_real_202008

release_toaliyun_real
xiaohanzi 5 лет назад
Родитель
Сommit
d085eb0ac8
11 измененных файлов: 68 добавлений и 8 удалений
  1. +3
    -0
      mallinkAdmin/src/main/java/com/iformall/tenant/TenantInfoImpl.java
  2. +1
    -1
      mallinkAdmin/src/main/resources/db/migration/V202007311200__FOR_MEMBER_ONLY_001.sql
  3. +3
    -0
      mallinkBApi/src/main/java/com/iformall/tenant/TenantInfoImpl.java
  4. +11
    -0
      mallinkCApi/src/main/java/com/iformall/controller/BaseController.java
  5. +6
    -0
      mallinkCApi/src/main/java/com/iformall/controller/WxMsgValidationcodeController.java
  6. +8
    -0
      mallinkCApi/src/main/java/com/iformall/controller/WxUserGrantController.java
  7. +3
    -0
      mallinkCApi/src/main/java/com/iformall/tenant/TenantInfoImpl.java
  8. +25
    -1
      mallinkService/src/main/java/com/iformall/service/impl/WxCUserServiceImpl.java
  9. +3
    -4
      mallinkService/src/main/java/com/iformall/service/impl/WxCUserTokenServiceImpl.java
  10. +3
    -2
      mallinkService/src/main/java/com/iformall/service/impl/WxChartServiceImpl.java
  11. +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)) {
return true;
}
if ("wx_score_rules".equals(tableName)) {
return true;
}
return false;
}



+ 1
- 1
mallinkAdmin/src/main/resources/db/migration/V202007311200__FOR_MEMBER_ONLY_001.sql Просмотреть файл

@@ -20,7 +20,7 @@ ADD COLUMN `login_count` int(11) DEFAULT 0 COMMENT '登陆次数' AFTER `active
update wx_c_user_basic_info wcubi set wcubi.login_count = (select wcu.login_count from wx_c_user wcu where wcu.id=wcubi.id);

ALTER TABLE `wx_c_user_basic_info`
ADD COLUMN `avatar_url` int(11) DEFAULT 0 COMMENT '头像地址' AFTER `nick_name`;
ADD COLUMN `avatar_url` VARCHAR(225) DEFAULT 0 COMMENT '头像地址' AFTER `nick_name`;

update wx_c_user_basic_info wcubi set wcubi.avatar_url = (select wcu.avatar_url from wx_c_user wcu where wcu.id=wcubi.id);



+ 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)) {
return true;
}
if ("wx_score_rules".equals(tableName)) {
return true;
}
// wx_profit_sharing_receiver
// wx_profit_sharing_result
return false;


+ 11
- 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 org.apache.commons.lang3.StringUtils;
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.annotation.InitBinder;
import org.springframework.web.bind.annotation.RestController;
@@ -47,6 +49,10 @@ public class BaseController {
@Autowired
private WxCUserBasicInfoService wxCUserBasicInfoService;

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

@InitBinder
public void InitBinder(WebDataBinder dataBinder) {
dataBinder.registerCustomEditor(Date.class, new PropertyEditorSupport() {
@@ -211,6 +217,7 @@ public class BaseController {
basicInfo = new WxCUserBasicInfo();
basicInfo.setId(user.getId());
basicInfo.updateTenantInfo(tenantEntity);
basicInfo.undateFinalTenantId(tenantEntity);
basicInfo.setPhone(phone);
basicInfo.setNickName(user.getNickName());
basicInfo.setAvatarUrl(user.getAvatarUrl());
@@ -223,6 +230,10 @@ public class BaseController {
user.setUserId(basicInfo.getId());
wxCUserService.updateUserId(user);
}
String key = Constant.tokenPrev + user.getOpenId();
if(cUserTokenRedisTemplate.hasKey(key)){
cUserTokenRedisTemplate.delete(key);
}
}

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.enums.EnumAssignTagsTrigger;
import com.iformall.service.*;
import com.iformall.utils.Constant;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
@@ -76,6 +77,11 @@ public class WxMsgValidationcodeController extends BaseController {
// 更新到basicinfo
saveToBasicInfo(user);
wxCUserTagsService.triggerAssignTags(EnumAssignTagsTrigger.ASSIGN_TAGS_TRIGGER_PHONE,user);

String key = Constant.tokenPrev + user.getOpenId();
if(cUserTokenRedisTemplate.hasKey(key)){
cUserTokenRedisTemplate.delete(key);
}
}
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.LoggerFactory;
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.context.request.RequestContextHolder;
import org.springframework.web.context.request.ServletRequestAttributes;
@@ -98,6 +100,7 @@ public class WxUserGrantController extends BaseController {
@Autowired
WxMallService mallService;


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

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

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)) {
return true;
}
if ("wx_score_rules".equals(tableName)) {
return true;
}
// wx_profit_sharing_receiver
// wx_profit_sharing_result
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.mq.MqBaseProducer;
import com.iformall.service.*;
import com.iformall.utils.Constant;
import me.chanjar.weixin.mp.bean.result.WxMpUser;
import org.apache.commons.lang3.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
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 java.util.Date;
@@ -48,6 +51,10 @@ public class WxCUserServiceImpl implements WxCUserService {
@Autowired
private MqBaseProducer mqBaseProducer;

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

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

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

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

@@ -318,4 +340,6 @@ public class WxCUserServiceImpl implements WxCUserService {
public void updateUserId(WxCUser 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.service.WxCUserTokenService;
import com.iformall.service.WxScoreRulesService;
import com.iformall.utils.Constant;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
@@ -23,8 +24,6 @@ import java.util.concurrent.TimeUnit;
public class WxCUserTokenServiceImpl implements WxCUserTokenService {
private final Logger logger = LoggerFactory.getLogger(this.getClass());

private String tokenPrev = "weapp:token:";

@Autowired
WxCUserMapper wxCUserMapper;

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

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


+ 3
- 2
mallinkService/src/main/java/com/iformall/service/impl/WxChartServiceImpl.java Просмотреть файл

@@ -669,7 +669,8 @@ public class WxChartServiceImpl implements WxChartDataService {
// get all
WxShop query = new WxShop();
query.updateTenantInfo(tenantEntity);
List<WxShop> allList = wxShopMapper.findList(query);
Long total = wxShopMapper.getCountByWxShop(query);
// List<WxShop> allList = wxShopMapper.findList(query);

List<Map<String,Object>> mapList = wxShopMapper.rentRateHistory(queryMap);
if(CollectionUtils.isNotEmpty(mapList)){
@@ -681,7 +682,7 @@ public class WxChartServiceImpl implements WxChartDataService {
map.put((String)m.get( "xTime"),(Long)m.get("xCount"));
}

double all = allList.size();
double all = total;
Map<String,String> resultMap = new LinkedMap();
double rentTotal = 0;
for (String key : map.keySet()) {


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

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

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


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