记得上下班打卡 | git大法好，push需谨慎

Skip to content

L
liquidnet-bus-v1
Commit 4f42f5ab authored by jiangxiulong's avatar jiangxiulong
Browse files
Options

Merge branch 'pre' into jxl_apply_push_1122

parents 13326af8 fef2639d
Show whitespace changes
Inline Side-by-side
Showing with 244 additions and 186 deletions
docu/dev_stone.sql
View file @ 4f42f5ab
......@@ -10,9 +10,12 @@ create table stone_score_logs
overdue_at datetime comment '过期时间',
created_at datetime ,
updated_at datetime ,
comment text
comment text,
KEY `stone_score_logs_uid_index` (`uid`),
KEY `stone_score_logs_logsId_index` (`logs_id`)
) engine = InnoDB comment '积分日志表';
drop table if exists stone_score_items;
create table stone_score_items
(
......@@ -34,7 +37,10 @@ create table stone_score_items
end_time datetime NULL COMMENT '定时下架-时间',
created_at datetime ,
updated_at datetime ,
comment text
comment text,
KEY `stone_score_items_item_id_index` (`item_id`),
KEY `stone_score_items_target_id_index` (`target_id`),
KEY `stone_score_items_status_index` (`status`)
) engine = InnoDB comment '积分物品表';
drop table if exists stone_score_user;
......@@ -46,7 +52,8 @@ create table stone_score_user
status int default 1 comment '状态[1-正常|2-冻结]',
created_at datetime ,
updated_at datetime ,
comment text
comment text,
KEY `stone_score_user_uid_index` (`uid`)
) engine = InnoDB comment '积分用户表';
drop table if exists stone_score_order;
......@@ -74,7 +81,9 @@ create table stone_score_order
pay_status tinyint NOT NULL DEFAULT 0 COMMENT '支付状态[0-未支付|1-已支付|2-支付失败]',
created_at datetime ,
updated_at datetime ,
comment text
comment text,
KEY `stone_score_order_uid_index` (`uid`),
KEY `stone_score_order_status_index` (`status`),
) engine = InnoDB comment '积分订单表';
......
liquidnet-bus-common/liquidnet-common-third/liquidnet-common-third-easemob/src/main/java/com/liquidnet/common/third/easemob/util/EasemobUtil.java
View file @ 4f42f5ab
......@@ -12,6 +12,7 @@ import com.liquidnet.commons.lang.util.HttpUtil;
import com.liquidnet.commons.lang.util.JsonUtils;
import com.liquidnet.commons.lang.util.StringUtil;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
import org.springframework.util.LinkedMultiValueMap;
......@@ -98,21 +99,20 @@ public class EasemobUtil{
// ObjectNode objectNode = JsonUtils.OM().createObjectNode();
try {
response = HttpUtil.postJson(requestUrl,json.toString(),commonHeader);
}
catch(HttpClientErrorException e){
} catch(HttpClientErrorException e) {
log.error("createUser error", e);
if(e.getRawStatusCode() == 400){
JSONObject jsonObject = JsonUtils.fromJson(e.getResponseBodyAsString(), new TypeReference<JSONObject>() {});
log.info("createUser error : {}",jsonObject.get("error"));
log.info("createUser error_description : {}",jsonObject.get("error_description"));
return jsonObject.toJSONString();
}
}catch (Exception e) {
e.printStackTrace();
log.error("createUser error : {}",e);
log.error("createUser error",e);
}
log.info("createUsers--->>> response : {} ",response);
if (StringUtils.isEmpty(response)) {
return response;
}
ObjectNode jsonObject = JsonUtils.fromJson(response,ObjectNode.class);
ArrayNode arrayNode = (ArrayNode)jsonObject.get("entities");
response = arrayNode.get(0).toString();
......
liquidnet-bus-config/liquidnet-config/application-test.yml
View file @ 4f42f5ab
......@@ -52,15 +52,15 @@ liquidnet:
adam:
database: 255
dbs: 0,256
host: r-2ze3sf1ll8er966uuc.redis.rds.aliyuncs.com
host: r-2ze7002ckw5u75fguk.redis.rds.aliyuncs.com
port: 6380
password: Qwer1234
password: PO@B!Iud32
candy:
database: 255
dbs: 0,256
host: r-2zem98z0tongsw3fpc.redis.rds.aliyuncs.com
host: r-2ze7002ckw5u75fguk.redis.rds.aliyuncs.com
port: 6380
password: Qwer1234
password: PO@B!Iud32
mongodb:
host: 39.107.71.112:27017
port: 27017
......
liquidnet-bus-config/liquidnet-config/liquidnet-service-platform.yml
View file @ 4f42f5ab
......@@ -3,7 +3,7 @@ server:
tomcat:
uri-encoding: UTF-8
maxThreads: 2000 #默认200
minSpareThreads: 2000 #默认10
minSpareThreads: 200 #默认10
maxConnections: 20000 #默认10000
acceptCount: 5000 #默认100
processorCache: 5000 #默认200
......
liquidnet-bus-config/liquidnet-config/liquidnet-service-sweet.yml
View file @ 4f42f5ab
......@@ -58,7 +58,7 @@ info:
version: '@project.version@'
# -----------------------------------------------------------
mybatis-plus:
mapper-locations: classpath:com.liquidnet.service.*.mapper/*Mapper.xml,classpath:com.liquidnet.service.kylin.mapper/*Mapper.xml
mapper-locations: classpath*:com.liquidnet.service.*.mapper/*Mapper.xml
# -----------------------------------------------------------
spring:
application:
......
liquidnet-bus-do/liquidnet-service-stone-do/src/main/java/com/liquidnet/service/stone/entity/StoneScoreUser.java
View file @ 4f42f5ab
......@@ -4,6 +4,8 @@ import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import java.time.LocalDateTime;
import java.io.Serializable;
import com.liquidnet.service.stone.dto.StoneScoreListDto;
import lombok.Data;
import lombok.EqualsAndHashCode;
......@@ -17,7 +19,7 @@ import lombok.EqualsAndHashCode;
*/
@Data
@EqualsAndHashCode(callSuper = false)
public class StoneScoreUser implements Serializable {
public class StoneScoreUser implements Serializable,Cloneable {
private static final long serialVersionUID = 1L;
......@@ -46,4 +48,14 @@ public class StoneScoreUser implements Serializable {
private String comment;
private static final StoneScoreUser obj = new StoneScoreUser();
public static StoneScoreUser getNew() {
try {
return (StoneScoreUser) obj.clone();
} catch (CloneNotSupportedException e) {
e.printStackTrace();
}
return new StoneScoreUser();
}
}
liquidnet-bus-service/liquidnet-service-adam/liquidnet-service-adam-impl/src/main/java/com/liquidnet/service/adam/service/impl/AdamUserInfoServiceImpl.java
View file @ 4f42f5ab
......@@ -83,7 +83,7 @@ public class AdamUserInfoServiceImpl implements IAdamUserInfoService {
JSONObject jsonObject = null;
try {
// 138cef91a62088bd3ef329fa3a6176cb18a > 138CEF91A62088BD3EF329FA3A6176CB18A > IM@zhengzai
String result = easemobUtil.createUser(existUserInfoVo.getUid(), ppwd, existUserInfoVo.getNickname());
String result = easemobUtil.createUser(existUserInfoVo.getUid(), ppwd, parameter.getNickname());
jsonObject = JSONObject.parseObject(result);
} catch (Exception e) {
log.error("###编辑资料:注册IM异常[uid:{},mobile:{}]", existUserInfoVo.getUid(), existUserInfoVo.getMobile());
......
liquidnet-bus-service/liquidnet-service-notify/liquidnet-service-notify-impl/src/main/java/com/liquidnet/service/ServiceNotifyApplication.java
View file @ 4f42f5ab
......@@ -5,12 +5,14 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.CommandLineRunner;
import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication;
import org.springframework.cloud.openfeign.EnableFeignClients;
import org.springframework.core.env.Environment;
import java.net.InetAddress;
import java.util.Arrays;
@Slf4j
@EnableFeignClients(basePackages = {"com.liquidnet"})
@SpringBootApplication(scanBasePackages = {"com.liquidnet"})
public class ServiceNotifyApplication implements CommandLineRunner {
@Autowired
......
liquidnet-bus-service/liquidnet-service-platform/liquidnet-service-platform-impl/src/main/java/com/liquidnet/service/platform/service/impl/kylin/DataImpl.java
View file @ 4f42f5ab
......@@ -9,6 +9,7 @@ import com.liquidnet.service.adam.constant.AdamRedisConst;
import com.liquidnet.service.adam.dto.vo.AdamUserInfoVo;
import com.liquidnet.service.adam.entity.AdamUser;
import com.liquidnet.service.adam.mapper.AdamUserMapper;
import com.liquidnet.service.feign.stone.api.FeignStoneIntegralClient;
import com.liquidnet.service.kylin.dto.vo.mongo.KylinPerformanceVo;
import com.liquidnet.service.kylin.mapper.*;
import com.liquidnet.service.stone.constant.StoneConstant;
......@@ -59,15 +60,22 @@ public class DataImpl {
StoneScoreUserMapper stoneScoreUserMapper;
@Autowired
StoneScoreLogsMapper stoneScoreLogsMapper;
@Autowired
FeignStoneIntegralClient stoneIntegralClient;
public boolean initScore(int page, int size) {
try {
long adamUserListCount = userMapper.selectCount(Wrappers.lambdaQuery(AdamUser.class).eq(AdamUser::getState, 1)
.lt(AdamUser::getMid, 2753314)
.select(AdamUser::getUid).orderByAsc(AdamUser::getMid));
int number = page;
int fount = 5000;
while (adamUserListCount > 0) {
//查询全部用户
List<AdamUser> adamUserList = userMapper.selectList(Wrappers.lambdaQuery(AdamUser.class).eq(AdamUser::getState, 1)
.select(AdamUser::getUid).last("limit " + ((page - 1) * size) + "," + ((page) * size)));
log.info("AdamUserSize = " + adamUserList.size());
int finishCount = 0;
.lt(AdamUser::getMid, 2753314)
.select(AdamUser::getUid).orderByAsc(AdamUser::getMid).last("limit " + ((number - 1) * fount) + "," + ((number) * fount)));
for (AdamUser item : adamUserList) {
//获取用户相关信息
String uid = item.getUid();
......@@ -80,10 +88,22 @@ public class DataImpl {
continue;
}
int score = 0;
//生成用户积分日志
int isLog = stoneScoreLogsMapper.selectCount(Wrappers.lambdaQuery(StoneScoreLogs.class).eq(StoneScoreLogs::getUid, uid).eq(StoneScoreLogs::getContent, "历史积分"));
if (isLog > 0) {
continue;
// MultiValueMap<String, String> params = CollectionUtil.linkedMultiValueMapStringString();
// params.add("uid", uid);
// params.add("score", (score >= 12000 ? 12000 : score) + "");
// params.add("content", "历史积分");
// HttpUtil.post(stoneUrl + "/user/logs/in2111", params);
}
//创建 用户积分数据
int isExists = stoneScoreUserMapper.selectCount(Wrappers.lambdaQuery(StoneScoreUser.class).eq(StoneScoreUser::getUid, uid));
if (isExists <= 0) {
StoneScoreUser data = new StoneScoreUser();
StoneScoreUser data = StoneScoreUser.getNew();
data.setStatus(1);
data.setScoreId(IDGenerator.nextTimeId2());
data.setUid(uid);
......@@ -97,37 +117,40 @@ public class DataImpl {
}
//获取演出每日任务积分
Integer performancePrice = orderTicketsMapper.getOrderScore(uid);
score += (performancePrice.intValue() / 100);
score += (performancePrice.intValue());
//获取商品每日任务积分
String resultData = HttpUtil.get("http://devmall.zhengzai.tv/admin/sumUserCost?user_id=" + 1, null);
int goodsPrice = (int) JSONObject.parseObject(resultData).get("cost");
try {
score += (goodsPrice / 100);
}catch (Exception e){
String resultData = HttpUtil.get("http://mall.zhengzai.tv/admin/sumUserCost?user_id=" + uid, null);
int goodsPrice = (int) JSONObject.parseObject(resultData).get("cost");
score += (goodsPrice);
} catch (Exception e) {
}
//获取 关注摩登天空服务号
if (getUnionIdByPhone(mobile) != null) {
MultiValueMap<String, String> params = CollectionUtil.linkedMultiValueMapStringString();
params.add("uid", uid);
params.add("taskId", 4 + "");
HttpUtil.post(stoneUrl + "/user/inner/doTask", params);
stoneIntegralClient.doTask(4, uid);
// MultiValueMap<String, String> params = CollectionUtil.linkedMultiValueMapStringString();
// params.add("uid", uid);
// params.add("taskId", 4 + "");
// HttpUtil.post(stoneUrl + "/user/inner/doTask", params);
}
//获取用户相关信息
if (null != userInfoVo.getSex()) {
//获取 完善个人信息
MultiValueMap<String, String> params = CollectionUtil.linkedMultiValueMapStringString();
params.add("uid", uid);
params.add("taskId", 5 + "");
HttpUtil.post(stoneUrl + "/user/inner/doTask", params);
stoneIntegralClient.doTask(5, uid);
// MultiValueMap<String, String> params = CollectionUtil.linkedMultiValueMapStringString();
// params.add("uid", uid);
// params.add("taskId", 5 + "");
// HttpUtil.post(stoneUrl + "/user/inner/doTask", params);
}
if (StringUtils.isNotBlank(userInfoVo.getBackground()) && !defaultBackgroundList.contains(userInfoVo.getBackground())) {
//获取 完善个人照片
MultiValueMap<String, String> params = CollectionUtil.linkedMultiValueMapStringString();
params.add("uid", uid);
params.add("taskId", 6 + "");
HttpUtil.post(stoneUrl + "/user/inner/doTask", params);
stoneIntegralClient.doTask(6, uid);
// MultiValueMap<String, String> params = CollectionUtil.linkedMultiValueMapStringString();
// params.add("uid", uid);
// params.add("taskId", 6 + "");
// HttpUtil.post(stoneUrl + "/user/inner/doTask", params);
}
// if (userInfoVo.getIsComplete() == 11) {
// //获取 首次体验在场
......@@ -136,18 +159,14 @@ public class DataImpl {
// params.add("taskId", 8 + "");
// HttpUtil.post(stoneUrl + "/user/inner/doTask", params);
// }
//生成用户积分日志
int isLog = stoneScoreLogsMapper.selectCount(Wrappers.lambdaQuery(StoneScoreLogs.class).eq(StoneScoreLogs::getUid, uid).eq(StoneScoreLogs::getContent, "历史积分"));
if (isLog <= 0) {
MultiValueMap<String, String> params = CollectionUtil.linkedMultiValueMapStringString();
params.add("uid", uid);
params.add("score", score + "");
params.add("content", "历史积分");
HttpUtil.post(stoneUrl + "/user/logs/in2111", params);
stoneIntegralClient.in2111(uid, score, "历史积分");
log.error("[ TASK INIT UID ] uid = " + uid);
}
finishCount += 1;
log.error("[ TASK INIT NUMBER ] number = " + number);
adamUserListCount -= fount;
number += 1;
}
log.info("完成次数 = " + finishCount);
log.error("[ TASK INIT SCORE ] FINISH ");
} catch (Exception e) {
log.info("异常 : {} ", e);
e.printStackTrace();
......@@ -160,18 +179,29 @@ public class DataImpl {
try {
//获取用户相关信息
AdamUserInfoVo userInfoVo = (AdamUserInfoVo) redisDataSourceUtil.getRedisAdamUtil().get(AdamRedisConst.INFO_USER.concat(uid));
int score = 0;
String mobile = userInfoVo.getMobile();
int score = 0;
//生成用户积分日志
int isLog = stoneScoreLogsMapper.selectCount(Wrappers.lambdaQuery(StoneScoreLogs.class).eq(StoneScoreLogs::getUid, uid).eq(StoneScoreLogs::getContent, "历史积分"));
if (isLog > 0) {
return true;
// MultiValueMap<String, String> params = CollectionUtil.linkedMultiValueMapStringString();
// params.add("uid", uid);
// params.add("score", (score >= 12000 ? 12000 : score) + "");
// params.add("content", "历史积分");
// HttpUtil.post(stoneUrl + "/user/logs/in2111", params);
}
//创建 用户积分数据
int isExists = stoneScoreUserMapper.selectCount(Wrappers.lambdaQuery(StoneScoreUser.class).eq(StoneScoreUser::getUid, uid));
if (isExists <= 0) {
StoneScoreUser data = new StoneScoreUser();
StoneScoreUser data = StoneScoreUser.getNew();
data.setStatus(1);
data.setScoreId(IDGenerator.nextTimeId2());
data.setUid(uid);
data.setCreatedAt(LocalDateTime.now());
stoneScoreUserMapper.insert(data);
StoneUserVo userTaskVo = StoneUserVo.getNew();
userTaskVo.getTask();
userTaskVo.setUid(uid);
......@@ -180,33 +210,40 @@ public class DataImpl {
}
//获取演出每日任务积分
Integer performancePrice = orderTicketsMapper.getOrderScore(uid);
score += performancePrice.intValue() / 100;
score += (performancePrice.intValue());
//获取商品每日任务积分
String resultData = HttpUtil.get("http://devmall.zhengzai.tv/admin/sumUserCost?user_id=" + 1, null);
try {
String resultData = HttpUtil.get("http://mall.zhengzai.tv/admin/sumUserCost?user_id=" + uid, null);
int goodsPrice = (int) JSONObject.parseObject(resultData).get("cost");
score += goodsPrice / 100;
score += (goodsPrice);
} catch (Exception e) {
}
//获取 关注摩登天空服务号
if (getUnionIdByPhone(mobile) != null) {
MultiValueMap<String, String> params = CollectionUtil.linkedMultiValueMapStringString();
params.add("uid", uid);
params.add("taskId", 4 + "");
HttpUtil.post(stoneUrl + "/user/inner/doTask", params);
stoneIntegralClient.doTask(4, uid);
// MultiValueMap<String, String> params = CollectionUtil.linkedMultiValueMapStringString();
// params.add("uid", uid);
// params.add("taskId", 4 + "");
// HttpUtil.post(stoneUrl + "/user/inner/doTask", params);
}
//获取用户相关信息
if (null != userInfoVo.getSex()) {
//获取 完善个人信息
MultiValueMap<String, String> params = CollectionUtil.linkedMultiValueMapStringString();
params.add("uid", uid);
params.add("taskId", 5 + "");
HttpUtil.post(stoneUrl + "/user/inner/doTask", params);
stoneIntegralClient.doTask(5, uid);
// MultiValueMap<String, String> params = CollectionUtil.linkedMultiValueMapStringString();
// params.add("uid", uid);
// params.add("taskId", 5 + "");
// HttpUtil.post(stoneUrl + "/user/inner/doTask", params);
}
if (StringUtils.isNotBlank(userInfoVo.getBackground()) && !defaultBackgroundList.contains(userInfoVo.getBackground())) {
//获取 完善个人照片
MultiValueMap<String, String> params = CollectionUtil.linkedMultiValueMapStringString();
params.add("uid", uid);
params.add("taskId", 6 + "");
HttpUtil.post(stoneUrl + "/user/inner/doTask", params);
stoneIntegralClient.doTask(6, uid);
// MultiValueMap<String, String> params = CollectionUtil.linkedMultiValueMapStringString();
// params.add("uid", uid);
// params.add("taskId", 6 + "");
// HttpUtil.post(stoneUrl + "/user/inner/doTask", params);
}
// if (userInfoVo.getIsComplete() == 11) {
// //获取 首次体验在场
......@@ -215,16 +252,11 @@ public class DataImpl {
// params.add("taskId", 8 + "");
// HttpUtil.post(stoneUrl + "/user/inner/doTask", params);
// }
//生成用户积分日志
int isLog = stoneScoreLogsMapper.selectCount(Wrappers.lambdaQuery(StoneScoreLogs.class).eq(StoneScoreLogs::getUid, uid).eq(StoneScoreLogs::getContent, "历史积分"));
if (isLog <= 0) {
MultiValueMap<String, String> params = CollectionUtil.linkedMultiValueMapStringString();
params.add("uid", uid);
params.add("score", score + "");
params.add("content", "历史积分");
HttpUtil.post(stoneUrl + "/user/logs/in2111", params);
}
stoneIntegralClient.in2111(uid, score, "历史积分");
log.error("[ TASK INIT UID ] uid = " + uid);
log.error("[ TASK INIT SCORE ] FINISH ");
} catch (Exception e) {
log.info("异常 : {} ", e);
e.printStackTrace();
return false;
}
......@@ -240,7 +272,7 @@ public class DataImpl {
int scoreUse = 0;
for (StoneScoreLogs item : list) {
//初始化 mongo
StoneScoreLogs logs = new StoneScoreLogs();
StoneScoreLogs logs = StoneScoreLogs.getNew();
logs.setLogsId(item.getLogsId());
logs.setContent(item.getContent());
logs.setReason(item.getReason());
......
liquidnet-bus-service/liquidnet-service-stone/liquidnet-service-stone-impl/docu/mongo_db.sql
View file @ 4f42f5ab
......@@ -18,9 +18,9 @@ db.StoneUserVo.createIndex({uid:"hashed"});
#创建分片
sh.enableSharding("prod_ln_scene");
sh.shardCollection("prod_ln_scene.StoneOrderListVo",{"orderId":"hashed"});
sh.shardCollection("prod_ln_scene.StoneOrderListVo",{"uid":"hashed"});
sh.shardCollection("prod_ln_scene.StoneScoreItems",{"itemId":"hashed"});
sh.shardCollection("prod_ln_scene.StoneScoreLogs",{"logsId":"hashed"});
sh.shardCollection("prod_ln_scene.StoneScoreLogs",{"uid":"hashed"});
sh.shardCollection("prod_ln_scene.StoneUserVo",{"uid":"hashed"});
liquidnet-bus-service/liquidnet-service-sweet/src/main/java/com/liquidnet/service/sweet/controller/syncRedis/RedisDataController.java
View file @ 4f42f5ab
......@@ -29,7 +29,7 @@ public class RedisDataController {
* basicServices
* @return
*/
@PostMapping("basicServices/versions")
/*@PostMapping("basicServices/versions")
@ApiOperation("basicServices版本控制数据迁移-可以通过后台编辑")
public ResponseDto<Boolean> basicServicesVersions() {
Boolean result = redisDataService.basicServicesVersions();
......@@ -43,10 +43,10 @@ public class RedisDataController {
return ResponseDto.success(result);
}
/**
*//**
* kylin
* @return
*/
*//*
@PostMapping("kylin/banner")
@ApiOperation("kylin-banner数据迁移-可以通过后台编辑")
public ResponseDto<Boolean> kylinBanner() {
......@@ -54,10 +54,10 @@ public class RedisDataController {
return ResponseDto.success(result);
}
/**
*//**
* sweet
* @return
*/
*//*
@PostMapping("sweet/accessToken")
@ApiOperation("sweet-AccessToken数据迁移-可不迁可自动生成")
public ResponseDto<Boolean> sweetAccessToken() {
......@@ -91,7 +91,7 @@ public class RedisDataController {
public ResponseDto<Boolean> sweetUnionIdStr() {
Boolean result = redisDataService.sweetUnionIdStr();
return ResponseDto.success(result);
}
}*/
@PostMapping("sweet/cityVote3")
@ApiOperation("sweet-cityVote3数据迁移")
......
liquidnet-bus-service/liquidnet-service-sweet/src/main/java/com/liquidnet/service/sweet/service/impl/syncRedis/RedisDataServiceImpl.java
View file @ 4f42f5ab
......@@ -12,6 +12,7 @@ import com.liquidnet.service.kylin.constant.KylinRedisConst;
import com.liquidnet.service.kylin.dto.vo.admin.ZhengzaiAppVersionsVo;
import com.liquidnet.service.kylin.entity.KylinBanners;
import com.liquidnet.service.sweet.entity.SweetWechatUser;
import com.liquidnet.service.sweet.param.SweetCityVoteParam;
import com.liquidnet.service.sweet.vo.SweetAnswerVo;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
......@@ -31,7 +32,7 @@ public class RedisDataServiceImpl {
@Autowired
private RedisUtil redisUtil;
private static final JedisPool jedisPool;
/*private static final JedisPool jedisPool;
private static final ObjectMapper toObjMapper;
static {
......@@ -49,7 +50,7 @@ public class RedisDataServiceImpl {
private Jedis getRedis() {
Jedis resource = jedisPool.getResource();
resource.auth("NBs$%6hW"); // 线上
resource.auth("java:1ICjLqCyMPk7"); // 线上
// resource.auth("PO@B!Iud32"); // test
resource.select(15);
return resource;
......@@ -212,24 +213,22 @@ public class RedisDataServiceImpl {
log.error("kylinBannerError", e);
return false;
}
}
}*/
public Boolean cityVote3() {
try {
Jedis redis = getRedis();
String redisKey = "sweet:cityVote3:cityCode*";
Set<String> keys = redis.keys(redisKey);
Set<String> keys = redisUtil.getRedisTemplateByDb(15).keys(redisKey);
for (String key : keys) {
String value = redis.get(key);
Integer value = (Integer) redisUtil.getDB15RedisGet(key);
redisUtil.set(key, value);
}
String redisKey2 = "sweet:cityVote3:user*";
Set<String> keys2 = redis.keys(redisKey2);
Set<String> keys2 = redisUtil.getRedisTemplateByDb(15).keys(redisKey2);
for (String key : keys2) {
String value = redis.get(key);
SweetCityVoteParam value = (SweetCityVoteParam) redisUtil.getDB15RedisGet(key);
redisUtil.set(key, value);
}
......@@ -242,20 +241,18 @@ public class RedisDataServiceImpl {
public Boolean cityVote4() {
try {
Jedis redis = getRedis();
String redisKey = "sweet:cityVote4:cityCode*";
Set<String> keys = redis.keys(redisKey);
Set<String> keys = redisUtil.getRedisTemplateByDb(15).keys(redisKey);
for (String key : keys) {
String value = redis.get(key);
Integer value = (Integer) redisUtil.getDB15RedisGet(key);
redisUtil.set(key, value);
}
String redisKey2 = "sweet:cityVote4:user*";
Set<String> keys2 = redis.keys(redisKey2);
Set<String> keys2 = redisUtil.getRedisTemplateByDb(15).keys(redisKey2);
for (String key : keys2) {
String value = redis.get(key);
SweetCityVoteParam value = (SweetCityVoteParam) redisUtil.getDB15RedisGet(key);
redisUtil.set(key, value);
}
......
liquidnet-bus-service/liquidnet-service-sweet/src/main/java/com/liquidnet/service/sweet/service/impl/syncRedis/UserDataServiceImpl.java
View file @ 4f42f5ab
......@@ -11,6 +11,8 @@ import com.liquidnet.service.base.constant.MQConst;
import com.liquidnet.service.feign.adam.api.FeignAdamBaseClient;
import com.liquidnet.service.sweet.config.WechatMpConfigure;
import com.liquidnet.service.sweet.entity.SweetAppletUser;
import com.liquidnet.service.sweet.entity.SweetAppletUsers;
import com.liquidnet.service.sweet.entity.SweetWechatUsers;
import com.liquidnet.service.sweet.mapper.SweetAppletUserMapper;
import com.liquidnet.service.sweet.mapper.SweetAppletUsersMapper;
import com.liquidnet.service.sweet.mapper.SweetWechatUsersMapper;
......@@ -203,6 +205,7 @@ public class UserDataServiceImpl {
for (SweetAppletUser info : sweetAppletUsers) {
SweetAppletUsersVo oldInfo = redisUtils.getSweetAppletUsersOfPhone(info.getGetPurePhoneNumber());
if (null == oldInfo) {
try {
ResponseDto<AdamUserInfoVo> userInfoVo = feignAdamBaseClient.registerByMobile(info.getGetPurePhoneNumber());
AdamUserInfoVo userInfoVoData = userInfoVo.getData();
String userId = userInfoVoData.getUid();
......@@ -237,6 +240,9 @@ public class UserDataServiceImpl {
sweetAppletUsersVo.setCountryCode(info.getGetCountryCode());
sweetAppletUsersVo.setType(info.getType());
redisUtils.setSweetAppletUsers(sweetAppletUsersVo);
} catch (Exception e) {
log.error("feignAdamBaseClientException phone:{}, e:{}", info.getGetPurePhoneNumber(), e);
}
}
}
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment