moliparty/peko-java
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修正工具类错别字

Browse Source
This commit is contained in:
liaozetao
2023-08-29 17:47:49 +08:00
parent d6cb74b955
commit 8c16ffb467
94 changed files with 220 additions and 253 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/record/OfficialGoldRecordService.java
View File

@@ -24,7 +24,7 @@ import com.accompany.common.status.BusiStatus;
import com.accompany.common.utils.BlankUtil;
import com.accompany.common.utils.DateTimeUtil;
import com.accompany.common.utils.StringUtils;
import com.accompany.common.utils.UUIDUitl;
import com.accompany.common.utils.UUIDUtil;
import com.accompany.core.enumeration.BillObjTypeEnum;
import com.accompany.core.exception.ServiceException;
import com.accompany.core.model.Users;
@@ -245,7 +245,7 @@ public class OfficialGoldRecordService extends BaseService {
if (actualAmount != null) {//如果是打款至公账充值金币，则amount存实际付款金额
amountLong = new BigDecimal(actualAmount).multiply(Constant.HUNDRED).longValue();
}
String chargeRecordId = UUIDUitl.get();
String chargeRecordId = UUIDUtil.get();
addChargeRecord(chargeRecordId, users.getUid(), num, amountLong);
// try {
// // 去除分成红包

4
accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/user/ChargeRecordAdminService.java
View File

@@ -10,7 +10,7 @@ import com.accompany.common.constant.Constant;
import com.accompany.common.status.BusiStatus;
import com.accompany.common.utils.BlankUtil;
import com.accompany.common.utils.DateTimeUtil;
import com.accompany.common.utils.UUIDUitl;
import com.accompany.common.utils.UUIDUtil;
import com.accompany.core.exception.ServiceException;
import com.accompany.core.model.Users;
import com.accompany.core.service.user.UsersBaseService;
@@ -322,7 +322,7 @@ public class ChargeRecordAdminService extends BaseService {
public void addManualChargeRecord(String account, Long uid, String channel,
String country, String localCurrencyCode, Long localAmount, Long totalGold, Byte status) {
ChargeRecord chargeRecord = new ChargeRecord();
chargeRecord.setChargeRecordId(UUIDUitl.get());
chargeRecord.setChargeRecordId(UUIDUtil.get());
chargeRecord.setChargeApp(account);
chargeRecord.setUid(uid);
chargeRecord.setChannel(channel);

2
accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/withdraw/RoomFlowPayAdminService.java
View File

@@ -185,7 +185,7 @@ public class RoomFlowPayAdminService {
Integer amount = transferPayAmount+sponserPayAmout;
//BatchTransferDTO dto = this.pingxxTransferService.buildBatchTransferDTO(UUIDUitl.get(),amount, PaymentConstant.TransferType.B2C,
//BatchTransferDTO dto = this.pingxxTransferService.buildBatchTransferDTO(UUIDUtil.get(),amount, PaymentConstant.TransferType.B2C,
// recipientList, description);
try {

6
accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/system/LoginController.java
View File

@@ -12,7 +12,7 @@ import com.accompany.admin.service.system.AdminUserService;
import com.accompany.admin.util.StringUtil;
import com.accompany.core.exception.ServiceException;
import com.accompany.core.service.common.JedisService;
import com.accompany.common.utils.IPUitls;
import com.accompany.common.utils.IPUtils;
import com.accompany.common.redis.RedisKey;
import com.accompany.common.result.BusiResult;
import com.accompany.common.status.BusiStatus;
@@ -65,7 +65,7 @@ public class LoginController extends BaseController {
@RequestMapping("/login/login")
@ResponseBody
public void login(String account, String password, String authCode, HttpServletRequest request) throws UnsupportedEncodingException {
logger.info("admin login account:{},ip:{}",account, IPUitls.getRealIpAddress(request));
logger.info("admin login account:{},ip:{}",account, IPUtils.getRealIpAddress(request));
BusiResult result = validateData(account, password, authCode);
if (result.getCode() == 200) { //参数验证成功
AdminUser adminUser = adminUserService.getAdminUser(account, password);
@@ -204,7 +204,7 @@ public class LoginController extends BaseController {
@RequestMapping("/login/sendSmsCode")
@ResponseBody
public BusiResult<Void> sendSmsCode(String account, HttpServletRequest request) throws UnsupportedEncodingException, ClientException {
String realIpAddress = IPUitls.getRealIpAddress(request);
String realIpAddress = IPUtils.getRealIpAddress(request);
logger.info("admin getSmsCode account:{},ip:{}", account, realIpAddress);
if (BlankUtil.isBlank(accountFilter(account))) {
return new BusiResult<>(BusiStatus.ALERT_PARAMETER_ILLEGAL);

4
accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/interceptor/LoggerInterceptor.java
View File

@@ -1,7 +1,7 @@
package com.accompany.admin.interceptor;
import com.accompany.admin.common.AdminConstants;
import com.accompany.common.utils.IPUitls;
import com.accompany.common.utils.IPUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.web.servlet.HandlerInterceptor;
@@ -21,7 +21,7 @@ public class LoggerInterceptor implements HandlerInterceptor {
Object admin = request.getSession().getAttribute(AdminConstants.ADMIN_ID);
String adminId = admin == null ? null : admin.toString();
String path = request.getRequestURI() + "?" + request.getQueryString();
String ip = IPUitls.getRealIpAddress(request);
String ip = IPUtils.getRealIpAddress(request);
logger.info("request path is: {}, adminId is: {}, ip is: {}", path, adminId, ip);
return true;
}

4
accompany-admin/accompany-flow-team-admin-web/src/main/java/com/accompany/flowteam/admin/controller/system/LoginController.java
View File

@@ -61,7 +61,7 @@ public class LoginController extends BaseController {
@RequestMapping("/login/login")
@ResponseBody
public void login(String account, String authCode, HttpServletRequest request) throws UnsupportedEncodingException {
logger.info("admin login account:{},ip:{}",account, IPUitls.getRealIpAddress(request));
logger.info("admin login account:{},ip:{}",account, IPUtils.getRealIpAddress(request));
BusiResult result = validateData(account, authCode);
if (result.getCode() == 200) { //参数验证成功
List<FlowTeamMemberDetailVO> flowTeamMembers = flowTeamAdminUserService.listMemberUsersDetailByPhone(account);
@@ -201,7 +201,7 @@ public class LoginController extends BaseController {
@RequestMapping("/login/sendSmsCode")
@ResponseBody
public BusiResult sendSmsCode(String phone, HttpServletRequest request) throws UnsupportedEncodingException, ClientException {
String realIpAddress = IPUitls.getRealIpAddress(request);
String realIpAddress = IPUtils.getRealIpAddress(request);
logger.info("flow team admin getSmsCode phone:{},ip:{}", phone, realIpAddress);
if (BlankUtil.isBlank(accountFilter(phone))) {
return new BusiResult(BusiStatus.ALERT_PARAMETER_ILLEGAL);

4
accompany-admin/accompany-flow-team-admin-web/src/main/java/com/accompany/flowteam/admin/interceptor/LoggerInterceptor.java
View File

@@ -1,6 +1,6 @@
package com.accompany.flowteam.admin.interceptor;
import com.accompany.common.utils.IPUitls;
import com.accompany.common.utils.IPUtils;
import com.accompany.flowteam.admin.common.FlowTeamAdminConstants;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -21,7 +21,7 @@ public class LoggerInterceptor implements HandlerInterceptor {
Object admin = request.getSession().getAttribute(FlowTeamAdminConstants.ADMIN_ID);
String adminId = admin == null ? null : admin.toString();
String path = request.getRequestURI() + "?" + request.getQueryString();
String ip = IPUitls.getRealIpAddress(request);
String ip = IPUtils.getRealIpAddress(request);
logger.info("request path is: {}, adminId is: {}, ip is: {}", path, adminId, ip);
return true;
}

4
accompany-base/accompany-basic/accompany-basic-service/src/main/java/com/accompany/core/service/account/AccountService.java
View File

@@ -7,7 +7,7 @@ import com.accompany.common.redis.RedisKey;
import com.accompany.common.utils.BlankUtil;
import com.accompany.common.utils.CommonUtil;
import com.accompany.common.utils.GetTimeUtils;
import com.accompany.common.utils.UUIDUitl;
import com.accompany.common.utils.UUIDUtil;
import com.accompany.core.model.Account;
import com.accompany.core.mybatismapper.AccountMapper;
import com.accompany.core.service.common.JedisService;
@@ -78,7 +78,7 @@ public class AccountService extends ServiceImpl<AccountMapper, Account> {
public Account initAccount(String weixin_unionid, String ipAddress) throws Exception {
Date date = new Date();
Account account = new Account();
account.setNeteaseToken(UUIDUitl.get());
account.setNeteaseToken(UUIDUtil.get());
account.setLastLoginTime(date);
account.setUpdateTime(date);
account.setRegisterIp(ipAddress);

2
accompany-base/accompany-common/src/main/java/com/accompany/common/utils/EncrytcUtil.java → accompany-base/accompany-common/src/main/java/com/accompany/common/utils/EncryptUtil.java
View File

@@ -14,7 +14,7 @@ import java.security.NoSuchAlgorithmException;
* @introduce
* 加密算法工具类
*/
public class EncrytcUtil {
public class EncryptUtil {
/**
* 用MD5算法进行加密

2
accompany-base/accompany-common/src/main/java/com/accompany/common/utils/IPUitls.java → accompany-base/accompany-common/src/main/java/com/accompany/common/utils/IPUtils.java
View File

@@ -5,7 +5,7 @@ import javax.servlet.http.HttpServletRequest;
/**
* Created by liuguofu on 2017/10/24.
*/
public class IPUitls {
public class IPUtils {
public static String getRealIpAddress(HttpServletRequest request) {
String ip = request.getHeader("x-forwarded-for");
if (ip == null || ip.length() == 0 || "unknown".equalsIgnoreCase(ip)) {

2
accompany-base/accompany-common/src/main/java/com/accompany/common/utils/UUIDUitl.java → accompany-base/accompany-common/src/main/java/com/accompany/common/utils/UUIDUtil.java
View File

@@ -5,7 +5,7 @@ import java.util.UUID;
/**
* Created by liuguofu on 2017/4/28.
*/
public class UUIDUitl {
public class UUIDUtil {
public static String get(){
return UUID.randomUUID().toString().replace("-","");
}

3
accompany-base/accompany-core/src/main/java/com/accompany/core/vo/BaseRequestVO.kt
View File

@@ -1,5 +1,6 @@
package com.accompany.core.vo
import com.accompany.common.utils.IPUtils
import com.accompany.core.enumeration.PublicHeaderParamEnum
import io.swagger.annotations.ApiModel
import io.swagger.annotations.ApiModelProperty
@@ -69,7 +70,7 @@ open class BaseRequestVO {
val myTicket: String? = httpServletRequest?.getHeader(PublicHeaderParamEnum.PUB_TICKET.value)
@get: ApiModelProperty("公共参数-当前用户 ip", hidden = true)
val ip: String? = httpServletRequest?.let { com.accompany.common.utils.IPUitls.getRealIpAddress(it) }.orEmpty()
val ip: String? = httpServletRequest?.let { IPUtils.getRealIpAddress(it) }.orEmpty()
@get:ApiModelProperty("公共参数-客户端来源", hidden = true)
val client: String? = httpServletRequest?.getHeader(PublicHeaderParamEnum.CLIENT.value).orEmpty()

4
accompany-base/accompany-payment/accompany-payment-service/src/main/java/com/accompany/payment/iospay/IOSPayPlaService.java
View File

@@ -9,7 +9,7 @@ import com.accompany.common.redis.RedisKey;
import com.accompany.common.result.BusiResult;
import com.accompany.common.status.BusiStatus;
import com.accompany.common.utils.DateTimeUtil;
import com.accompany.common.utils.UUIDUitl;
import com.accompany.common.utils.UUIDUtil;
import com.accompany.core.exception.ServiceException;
import com.accompany.core.model.Users;
import com.accompany.core.service.SysConfService;
@@ -78,7 +78,7 @@ public class IOSPayPlaService extends BaseService {
//保存充值记录
//1.创建订单号
//UUID不会重复，所以不需要判断是否生成重复的订单号
String chargeRecordId = UUIDUitl.get();
String chargeRecordId = UUIDUtil.get();
ChargeRecord chargeRecord = new ChargeRecord();
chargeRecord.setChargeRecordId(chargeRecordId);
chargeRecord.setChargeProdId(chargeProdId);

6
accompany-base/accompany-payment/accompany-payment-service/src/main/java/com/accompany/payment/service/PayCenterService.java
View File

@@ -6,7 +6,7 @@ import com.accompany.common.exception.ApiException;
import com.accompany.common.redis.RedisKey;
import com.accompany.common.status.BusiStatus;
import com.accompany.common.utils.EnvComponent;
import com.accompany.common.utils.UUIDUitl;
import com.accompany.common.utils.UUIDUtil;
import com.accompany.core.enumeration.BusinessStatusCodeEnum;
import com.accompany.core.exception.ServiceException;
import com.accompany.core.service.SysConfService;
@@ -118,7 +118,7 @@ public class PayCenterService {
public ChargeRecord buildChargeRecord(Byte type, Long uid, ChargeProd chargeProd, String channel, String clientIp, DeviceInfo deviceInfo,
String openId, String paymentType, String countryCode){
String chargeRecordId = UUIDUitl.get();
String chargeRecordId = UUIDUtil.get();
ChargeRecord chargeRecord = new ChargeRecord();
chargeRecord.setChargeRecordId(chargeRecordId);
chargeRecord.setChargeProdId(chargeProd.getChargeProdId());
@@ -285,7 +285,7 @@ public class PayCenterService {
*/
public ChargeRecord buildChargeRecord(Long uid, LuckyTarotRecord luckyTarotRecord, String channel, String clientIp,
ChargeProd chargeProd, DeviceInfo deviceInfo){
String chargeRecordId = UUIDUitl.get();
String chargeRecordId = UUIDUtil.get();
ChargeRecord chargeRecord = new ChargeRecord();
chargeRecord.setChargeRecordId(chargeRecordId);
chargeRecord.setChargeProdId(luckyTarotRecord.getChargeProdId());

4
accompany-business/accompany-business-service/src/main/java/com/accompany/business/config/ExecutorConfig.java
View File

@@ -3,7 +3,7 @@ package com.accompany.business.config;
import cn.hippo4j.core.executor.DynamicThreadPool;
import cn.hippo4j.core.executor.support.ThreadPoolBuilder;
import cn.hippo4j.core.toolkit.ExecutorTraceContextUtil;
import com.accompany.common.utils.UUIDUitl;
import com.accompany.common.utils.UUIDUtil;
import com.accompany.core.util.StringUtils;
import org.jetbrains.annotations.NotNull;
import org.springframework.aop.interceptor.AsyncExecutionAspectSupport;
@@ -53,7 +53,7 @@ public class ExecutorConfig {
@Override
public Runnable decorate(@NotNull Runnable runnable) {
String executeTimeoutTrace = ExecutorTraceContextUtil.getAndRemoveTimeoutTrace();
String traceId = StringUtils.isBlank(executeTimeoutTrace)? UUIDUitl.get(): executeTimeoutTrace;
String traceId = StringUtils.isBlank(executeTimeoutTrace)? UUIDUtil.get(): executeTimeoutTrace;
return () -> {
ExecutorTraceContextUtil.putTimeoutTrace(traceId);
runnable.run();

4
accompany-business/accompany-business-service/src/main/java/com/accompany/business/event/listener/room/UserInRoomAutoChatListener.java
View File

@@ -16,7 +16,7 @@ import com.accompany.common.constant.Constant;
import com.accompany.common.redis.RedisKey;
import com.accompany.common.utils.RandomUtil;
import com.accompany.common.utils.StringUtils;
import com.accompany.common.utils.UUIDUitl;
import com.accompany.common.utils.UUIDUtil;
import com.accompany.core.model.Room;
import com.accompany.core.model.Users;
import com.accompany.core.service.SysConfService;
@@ -219,7 +219,7 @@ public class UserInRoomAutoChatListener implements ApplicationListener<UserInRoo
roomChatContent = roomChatContent.replaceAll("\\$\\{nick\\}\\$", toUserNick);
String userExtInfo = buildUserExtInfo(fromUid);
log.info("[UserInToRoomAutoChat] userExtInfo {} ", userExtInfo);
erBanNetEaseService.sendChatRoomMsg(roomId, UUIDUitl.get(), fromUid.toString(), 0, roomChatContent, userExtInfo);
erBanNetEaseService.sendChatRoomMsg(roomId, UUIDUtil.get(), fromUid.toString(), 0, roomChatContent, userExtInfo);
log.info("[UserInToRoomAutoChat] autoChat end 。fromUid{}, toUid {} , roomId{}, priContent {}, roomChatContent {}",
fromUid, toUid, roomId, priContent, roomChatContent);
}

10
accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/AutoGenRobotService.java
View File

@@ -15,7 +15,7 @@ import com.accompany.common.redis.RedisKey;
import com.accompany.common.utils.CommonUtil;
import com.accompany.common.utils.DESUtils;
import com.accompany.common.utils.RandomUtil;
import com.accompany.common.utils.UUIDUitl;
import com.accompany.common.utils.UUIDUtil;
import com.accompany.core.model.Account;
import com.accompany.core.model.Users;
import com.accompany.core.mybatismapper.AccountMapper;
@@ -138,7 +138,7 @@ public class AutoGenRobotService extends BaseService {
logger.info("start create robot account, erbanNo: {}", erbanNo);
account.setPhone(CommonUtil.genSpecialPhoneForInitAccount(erbanNo.toString()));
account.setPassword(encryptPassword(password));
account.setNeteaseToken(UUIDUitl.get());
account.setNeteaseToken(UUIDUtil.get());
account.setLastLoginTime(date);
account.setUpdateTime(date);
account.setSignTime(date);
@@ -215,7 +215,7 @@ public class AutoGenRobotService extends BaseService {
Account account = new Account();
account.setPhone(CommonUtil.genSpecialPhoneForInitAccount(erbanNo.toString()));
account.setPassword(encryptPassword(password));
account.setNeteaseToken(UUIDUitl.get());
account.setNeteaseToken(UUIDUtil.get());
account.setLastLoginTime(date);
account.setUpdateTime(date);
account.setSignTime(date);
@@ -270,7 +270,7 @@ public class AutoGenRobotService extends BaseService {
Account account = new Account();
account.setPhone(CommonUtil.genSpecialPhoneForInitAccount(erbanNo.toString()));
account.setPassword(encryptPassword(password));
account.setNeteaseToken(UUIDUitl.get());
account.setNeteaseToken(UUIDUtil.get());
account.setLastLoginTime(date);
account.setUpdateTime(date);
account.setSignTime(date);
@@ -309,7 +309,7 @@ public class AutoGenRobotService extends BaseService {
Account account = new Account();
account.setPhone(req.getPhone());
account.setPassword(encryptPassword(password));
account.setNeteaseToken(UUIDUitl.get());
account.setNeteaseToken(UUIDUtil.get());
account.setLastLoginTime(date);
account.setUpdateTime(date);
account.setSignTime(date);

4
accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/ChargeRecordUpdateService.java
View File

@@ -13,7 +13,7 @@ import com.accompany.common.result.BusiResult;
import com.accompany.common.status.BusiStatus;
import com.accompany.common.utils.BlankUtil;
import com.accompany.common.utils.DateTimeUtil;
import com.accompany.common.utils.UUIDUitl;
import com.accompany.common.utils.UUIDUtil;
import com.accompany.core.enumeration.BillObjTypeEnum;
import com.accompany.core.exception.ServiceException;
import com.accompany.core.model.Users;
@@ -348,7 +348,7 @@ public class ChargeRecordUpdateService extends BaseService {
*/
private void sendToMQ(ChargeRecord chargeRecord) {
PayFinishMessage message = new PayFinishMessage();
message.setMessId(UUIDUitl.get());
message.setMessId(UUIDUtil.get());
message.setMessTime(System.currentTimeMillis());
//保存一份到redis中
jedisService.hwrite(RedisKey.mq_pay_finish_status.getKey(), message.getMessId(), gson.toJson(chargeRecord));

4
accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/ChargeService.java
View File

@@ -21,7 +21,7 @@ import com.accompany.common.device.DeviceInfo;
import com.accompany.common.exception.BusinessException;
import com.accompany.common.redis.RedisKey;
import com.accompany.common.status.BusiStatus;
import com.accompany.common.utils.UUIDUitl;
import com.accompany.common.utils.UUIDUtil;
import com.accompany.core.enumeration.BillObjTypeEnum;
import com.accompany.core.exception.ServiceException;
import com.accompany.core.model.Users;
@@ -417,7 +417,7 @@ public class ChargeService extends BaseService {
*/
private void sendToMQ(ChargeRecord chargeRecord) {
PayFinishMessage message = new PayFinishMessage();
message.setMessId(UUIDUitl.get());
message.setMessId(UUIDUtil.get());
message.setMessTime(System.currentTimeMillis());
//保存一份到redis中
jedisService.hwrite(RedisKey.mq_pay_finish_status.getKey(), message.getMessId(), gson.toJson(chargeRecord));

6
accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/DepositService.java
View File

@@ -5,11 +5,9 @@ import com.accompany.business.model.DepositExample;
import com.accompany.business.model.UserPurse;
import com.accompany.business.mybatismapper.DepositMapper;
import com.accompany.business.service.purse.UserPurseService;
import com.accompany.common.utils.UUIDUitl;
import com.accompany.common.utils.UUIDUtil;
import com.accompany.common.constant.Constant;
import org.apache.commons.collections.CollectionUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@@ -76,7 +74,7 @@ public class DepositService {
}
if(insertDepositFlag){
currentDeposit=new Deposit();
currentDeposit.setDid(UUIDUitl.get());
currentDeposit.setDid(UUIDUtil.get());
currentDeposit.setGoldNum(depositGoldMoneyNum);//支付需要交的预扣款
currentDeposit.setObjId(objId);
currentDeposit.setUseType(useType);

4
accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/FeedbackService.java
View File

@@ -5,7 +5,7 @@ import com.accompany.business.mybatismapper.FeedbackMapper;
import com.accompany.business.service.user.UsersService;
import com.accompany.common.result.BusiResult;
import com.accompany.common.status.BusiStatus;
import com.accompany.common.utils.UUIDUitl;
import com.accompany.common.utils.UUIDUtil;
import com.accompany.core.vo.UserVo;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -37,7 +37,7 @@ public class FeedbackService {
return new BusiResult( BusiStatus.USERNOTEXISTS);
}
//创建feedbackID
String feedbackId = UUIDUitl.get ();
String feedbackId = UUIDUtil.get ();
//写入feedback相关信息
Feedback feedback = new Feedback ();
feedback.setFeedbackDesc ( feedbackDesc );

4
accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/PacketWithDrawRecordService.java
View File

@@ -6,7 +6,7 @@ import com.accompany.business.service.user.UsersService;
import com.accompany.common.constant.Constant;
import com.accompany.common.status.BusiStatus;
import com.accompany.common.utils.DateTimeUtil;
import com.accompany.common.utils.UUIDUitl;
import com.accompany.common.utils.UUIDUtil;
import com.accompany.core.exception.ServiceException;
import com.accompany.core.model.Users;
import com.accompany.core.service.SysConfService;
@@ -35,7 +35,7 @@ public class PacketWithDrawRecordService {
throw new ServiceException(BusiStatus.USERNOTEXISTS);
}
PacketWithdrawRecord packetWithdrawRecord = new PacketWithdrawRecord();
packetWithdrawRecord.setRecordId(UUIDUitl.get());
packetWithdrawRecord.setRecordId(UUIDUtil.get());
packetWithdrawRecord.setCreateTime(new Date());
packetWithdrawRecord.setUid(uid);
packetWithdrawRecord.setPacketProdCashId(packetId);

6
accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/SendChatRoomMsgService.java
View File

@@ -4,7 +4,7 @@ import com.accompany.business.service.room.RoomQueryService;
import com.accompany.common.constant.Attach;
import com.accompany.common.constant.Constant;
import com.accompany.common.netease.neteaseacc.result.RubbishRet;
import com.accompany.common.utils.UUIDUitl;
import com.accompany.common.utils.UUIDUtil;
import com.accompany.core.model.Room;
import com.google.gson.Gson;
import lombok.extern.slf4j.Slf4j;
@@ -44,7 +44,7 @@ public class SendChatRoomMsgService {
attach.setData(data);
String attachStr=gson.toJson(attach);
logger.info("attachStr="+attachStr);
String msgId= UUIDUitl.get();
String msgId= UUIDUtil.get();
RubbishRet rubbishRet=erBanNetEaseService.sendChatRoomMsg(roomId,msgId,fromAccid,defMsgType,attachStr, null);
if(rubbishRet.getCode()!=200){
@@ -104,7 +104,7 @@ public class SendChatRoomMsgService {
for (Room room : rooms) {
bizExecutor.execute(() -> {
try {
erBanNetEaseService.sendChatRoomMsg(room.getRoomId(), UUIDUitl.get(), sender.toString(), Constant.DefineProtocol.CUSTOM_MESS_DEFINE, msg);
erBanNetEaseService.sendChatRoomMsg(room.getRoomId(), UUIDUtil.get(), sender.toString(), Constant.DefineProtocol.CUSTOM_MESS_DEFINE, msg);
} catch (Exception e) {
log.error("批量发送房间消息失败[room={}, message={}]", gson.toJson(room), msg, e);
}

2
accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/SendSysMsgService.java
View File

@@ -312,7 +312,7 @@ public class SendSysMsgService extends BaseService {
// array.add("android");
GroupMsg group = new GroupMsg();
group.setBody(body);
// group.setBroadcastId(UUIDUitl.get());
// group.setBroadcastId(UUIDUtil.get());
// group.setCreateTime(new Date());
// group.setOffline(true);
// group.setExpireTime(new Date(System.currentTimeMillis()+60*1000*60*24));

4
accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/activities/ActivitiesTurnTableMsgService.java
View File

@@ -1,5 +1,6 @@
package com.accompany.business.service.activities;
import com.accompany.common.utils.UUIDUtil;
import com.alibaba.fastjson.JSON;
import com.accompany.business.constant.activities.ActivitiesDrawTypeEnum;
import com.accompany.core.model.Room;
@@ -7,7 +8,6 @@ import com.accompany.business.service.ErBanNetEaseService;
import com.accompany.core.service.base.BaseService;
import com.accompany.business.service.room.RoomService;
import com.accompany.business.vo.activities.TurnTableRunawayMsg;
import com.accompany.common.utils.UUIDUitl;
import com.accompany.common.constant.Attach;
import com.accompany.common.constant.Constant;
import org.springframework.beans.factory.annotation.Autowired;
@@ -53,7 +53,7 @@ public class ActivitiesTurnTableMsgService extends BaseService {
attach.setFirst(Constant.DefineProtocol.CUSTOM_TURNTABLE_RUNAWAY);
attach.setSecond(Constant.DefineProtocol.CUSTOM_TURNTABLE_RUNAWAY_TIME);
attach.setData(msg);
erBanNetEaseService.sendChatRoomMsgNoResend(room.getRoomId(), UUIDUitl.get(), roomUid.toString(),
erBanNetEaseService.sendChatRoomMsgNoResend(room.getRoomId(), UUIDUtil.get(), roomUid.toString(),
Constant.DefineProtocol.CUSTOM_MESS_DEFINE, JSON.toJSONString(attach));
} catch (Exception e) {
logger.error("sendRunawayMsg() failed!", e);

8
accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/activities/luckySea/impl/LuckySeaPushMsgService.java
View File

@@ -13,7 +13,7 @@ import com.accompany.business.vo.activities.LuckySeaPushMsg;
import com.accompany.common.config.SystemConfig;
import com.accompany.common.constant.Attach;
import com.accompany.common.constant.Constant;
import com.accompany.common.utils.UUIDUitl;
import com.accompany.common.utils.UUIDUtil;
import com.accompany.core.model.Room;
import com.accompany.core.model.Users;
import com.accompany.core.service.SysConfService;
@@ -115,7 +115,7 @@ public class LuckySeaPushMsgService {
if (null != room){
bizExecutor.execute(() -> {
try {
erBanNetEaseService.sendChatRoomMsg(room.getRoomId(), UUIDUitl.get(), room.getUid().toString(), Constant.DefineProtocol.CUSTOM_MESS_DEFINE, JSON.toJSONString(attach), null);
erBanNetEaseService.sendChatRoomMsg(room.getRoomId(), UUIDUtil.get(), room.getUid().toString(), Constant.DefineProtocol.CUSTOM_MESS_DEFINE, JSON.toJSONString(attach), null);
} catch (Exception e) {
log.error("批量发送房间消息失败[room={}, message={}]", JSON.toJSONString(room), msg, e);
}
@@ -139,7 +139,7 @@ public class LuckySeaPushMsgService {
for (Room room : validRooms) {
bizExecutor.execute(() -> {
try {
this.erBanNetEaseService.sendChatRoomMsg(room.getRoomId(), UUIDUitl.get(), room.getUid().toString(), Constant.DefineProtocol.CUSTOM_MESS_DEFINE, msg, null);
this.erBanNetEaseService.sendChatRoomMsg(room.getRoomId(), UUIDUtil.get(), room.getUid().toString(), Constant.DefineProtocol.CUSTOM_MESS_DEFINE, msg, null);
} catch (Exception e) {
log.error("批量发送房间消息失败[room={}, message={}]", JSON.toJSONString(room), msg, e);
}
@@ -169,7 +169,7 @@ public class LuckySeaPushMsgService {
for (Room room : validRooms) {
bizExecutor.execute(() -> {
try {
this.erBanNetEaseService.sendChatRoomMsg(room.getRoomId(), UUIDUitl.get(), room.getUid().toString(), Constant.DefineProtocol.CUSTOM_MESS_DEFINE, msg, null);
this.erBanNetEaseService.sendChatRoomMsg(room.getRoomId(), UUIDUtil.get(), room.getUid().toString(), Constant.DefineProtocol.CUSTOM_MESS_DEFINE, msg, null);
} catch (Exception e) {
log.error("批量发送房间消息失败[room={}, message={}]", JSON.toJSONString(room), msg, e);
}

4
accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/activity/ActivityPackService.java
View File

@@ -20,7 +20,7 @@ import com.accompany.common.redis.RedisKey;
import com.accompany.common.status.BusiStatus;
import com.accompany.common.support.BeanSelfAware;
import com.accompany.common.utils.DateTimeUtil;
import com.accompany.common.utils.UUIDUitl;
import com.accompany.common.utils.UUIDUtil;
import com.accompany.core.base.BeanMapper;
import com.accompany.core.enumeration.BillObjTypeEnum;
import com.accompany.core.exception.ServiceException;
@@ -335,7 +335,7 @@ public class ActivityPackService implements InitializingBean, BeanSelfAware {
private void sendPackMessage2MQ(long uid, long totalPrice, int packId, String packName, int packNum, long packPrice,
Integer ticketNum, Byte packType){
ActivityPackMessage message = new ActivityPackMessage();
message.setMessId(UUIDUitl.get());
message.setMessId(UUIDUtil.get());
message.setMessTime(System.currentTimeMillis());
message.setUid(uid);
message.setPackId(packId);

7
accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/anchor/impl/AnchorFansTeamAudioRecordServiceImpl.java
View File

@@ -10,7 +10,6 @@ import com.accompany.business.service.anchor.*;
import com.accompany.business.service.netease.YidunCheckUtil;
import com.accompany.business.service.room.RoomService;
import com.accompany.business.service.user.UsersService;
import com.accompany.business.vo.anchor.AnchorFansMemberVo;
import com.accompany.business.vo.anchor.AnchorFansTeamAudioRecordVo;
import com.accompany.business.vo.anchor.AnchorFansTeamMessageVo;
import com.accompany.common.config.SystemConfig;
@@ -18,7 +17,7 @@ import com.accompany.common.constant.Attach;
import com.accompany.common.constant.Constant;
import com.accompany.common.redis.RedisKey;
import com.accompany.common.status.BusiStatus;
import com.accompany.common.utils.UUIDUitl;
import com.accompany.common.utils.UUIDUtil;
import com.accompany.core.exception.ServiceException;
import com.accompany.core.model.Room;
import com.accompany.core.model.Users;
@@ -33,13 +32,11 @@ import com.google.gson.Gson;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.test.autoconfigure.restdocs.AutoConfigureRestDocs;
import org.springframework.context.annotation.Lazy;
import org.springframework.scheduling.annotation.Async;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import java.io.IOException;
import java.util.Date;
import java.util.List;
import java.util.Map;
@@ -283,7 +280,7 @@ public class AnchorFansTeamAudioRecordServiceImpl extends ServiceImpl<AnchorFans
* @throws Exception
*/
private void sendSingleRoomMsg(Long roomId, Long roomUid, final String msg) throws Exception {
erBanNetEaseService.sendChatRoomMsg(roomId, UUIDUitl.get(), roomUid.toString(), Constant.DefineProtocol.CUSTOM_MESS_DEFINE, msg);
erBanNetEaseService.sendChatRoomMsg(roomId, UUIDUtil.get(), roomUid.toString(), Constant.DefineProtocol.CUSTOM_MESS_DEFINE, msg);
}
@Async

2
accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/anchor/impl/AnchorFansTeamServiceImpl.java
View File

@@ -1300,7 +1300,7 @@ public class AnchorFansTeamServiceImpl extends ServiceImpl<AnchorFansTeamMapper,
* @throws Exception
*/
private void sendSingleRoomMsg(Long roomId, Long roomUid, final String msg) throws Exception {
erBanNetEaseService.sendChatRoomMsg(roomId, UUIDUitl.get(), roomUid.toString(), Constant.DefineProtocol.CUSTOM_MESS_DEFINE, msg);
erBanNetEaseService.sendChatRoomMsg(roomId, UUIDUtil.get(), roomUid.toString(), Constant.DefineProtocol.CUSTOM_MESS_DEFINE, msg);
}
@Override

8
accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/api/QinniuService.java
View File

@@ -3,11 +3,10 @@ package com.accompany.business.service.api;
import com.accompany.business.dto.QiniuReturnBodyDTO;
import com.accompany.common.config.QiNiuConfig;
import com.accompany.common.utils.FileUtils;
import com.accompany.common.utils.UUIDUitl;
import com.accompany.common.utils.UUIDUtil;
import com.alibaba.fastjson.JSON;
import com.google.gson.Gson;
import com.qiniu.common.QiniuException;
import com.qiniu.common.Zone;
import com.qiniu.http.Response;
import com.qiniu.storage.Configuration;
import com.qiniu.storage.Region;
@@ -16,11 +15,8 @@ import com.qiniu.storage.model.DefaultPutRet;
import com.qiniu.util.Auth;
import com.qiniu.util.StringMap;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.InitializingBean;
import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
import org.springframework.context.annotation.DependsOn;
import org.springframework.stereotype.Service;
import org.springframework.util.Assert;
import javax.annotation.PostConstruct;
import java.io.InputStream;
@@ -234,7 +230,7 @@ public class QinniuService{
* @return
*/
public Map<String, String> getUploadToken() {
String key = UUIDUitl.get();
String key = UUIDUtil.get();
StringMap policy = buildUploadPolicy(key);
String token = auth.uploadToken(QiNiuConfig.bucket, key, QiNiuConfig.expireSecond, policy);
Map<String, String> data = new HashMap<>();

4
accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/box/BoxPrizeMessageService.java
View File

@@ -9,6 +9,7 @@ import com.accompany.business.model.Prize;
import com.accompany.business.model.box.NormalBigPrizeConfig;
import com.accompany.business.param.neteasepush.Payload;
import com.accompany.business.service.ErBanNetEaseService;
import com.accompany.common.utils.UUIDUtil;
import com.accompany.core.base.SpringContextHolder;
import com.accompany.common.config.WebSecurityConfig;
import com.accompany.common.push.MarkdownMessage;
@@ -25,7 +26,6 @@ import com.accompany.common.netease.neteaseacc.result.RubbishRet;
import com.accompany.common.redis.RedisKey;
import com.accompany.common.utils.DateTimeUtil;
import com.accompany.common.utils.HttpUtils;
import com.accompany.common.utils.UUIDUitl;
import com.accompany.core.model.Room;
import com.accompany.core.model.Users;
import com.accompany.core.service.SysConfService;
@@ -328,7 +328,7 @@ public class BoxPrizeMessageService {
* @throws Exception
*/
private void sendRoomMsg(final Long roomId, final Long sender, final String msg) throws Exception {
this.erBanNetEaseService.sendChatRoomMsg(roomId, UUIDUitl.get(), sender.toString(), Constant.DefineProtocol.CUSTOM_MESS_DEFINE, msg, null);
this.erBanNetEaseService.sendChatRoomMsg(roomId, UUIDUtil.get(), sender.toString(), Constant.DefineProtocol.CUSTOM_MESS_DEFINE, msg, null);
}
/**

6
accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/box/OpenBoxService.java
View File

@@ -35,7 +35,7 @@ import com.accompany.common.redis.RedisKey;
import com.accompany.common.status.BusiStatus;
import com.accompany.common.utils.BlankUtil;
import com.accompany.common.utils.DateTimeUtil;
import com.accompany.common.utils.UUIDUitl;
import com.accompany.common.utils.UUIDUtil;
import com.accompany.core.enumeration.BillObjTypeEnum;
import com.accompany.core.exception.ServiceException;
import com.accompany.core.service.SysConfService;
@@ -365,7 +365,7 @@ public abstract class OpenBoxService extends BaseService implements Initializing
final Boolean sendMessage, final Integer deviation, final Date openBoxTime) {
BoxPrizeMessage[] messages = new BoxPrizeMessage[6];
BoxPrizeMessage msg = new BoxPrizeMessage();
msg.setMessId(UUIDUitl.get());
msg.setMessId(UUIDUtil.get());
msg.setMessTime(openBoxTime.getTime());
msg.setUid(uid);
msg.setRoomUid(roomUid);
@@ -418,7 +418,7 @@ public abstract class OpenBoxService extends BaseService implements Initializing
BoxPrizeMessage msg = messages[idx];
if (msg == null) {
msg = new BoxPrizeMessage();
msg.setMessId(UUIDUitl.get());
msg.setMessId(UUIDUtil.get());
msg.setMessTime(openBoxTime.getTime());
msg.setUid(uid);
msg.setRoomUid(roomUid);

2
accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/charge/LuckyTarotChargeService.java
View File

@@ -167,7 +167,7 @@ public class LuckyTarotChargeService extends BaseService {
private LuckyTarotRecord buildLuckyTarotRecord(Long uid, Long roomUid, List<String> cardNo, Long chargeAmount,
String chargeProdId){
LuckyTarotRecord luckyTarotRecord = new LuckyTarotRecord();
luckyTarotRecord.setRecordId(UUIDUitl.get());
luckyTarotRecord.setRecordId(UUIDUtil.get());
luckyTarotRecord.setUid(uid);
luckyTarotRecord.setRoomUid(roomUid);
luckyTarotRecord.setSelectdNo(gson.toJson(cardNo));

4
accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/charge/RedeemCodeService.java
View File

@@ -18,7 +18,7 @@ import com.accompany.common.result.BusiResult;
import com.accompany.common.status.BusiStatus;
import com.accompany.common.utils.OrderNoUtil;
import com.accompany.common.utils.StringUtils;
import com.accompany.common.utils.UUIDUitl;
import com.accompany.common.utils.UUIDUtil;
import com.accompany.core.exception.ServiceException;
import com.accompany.core.model.Users;
import com.accompany.core.service.base.BaseService;
@@ -128,7 +128,7 @@ public class RedeemCodeService extends BaseService {
* @param redeemCode
*/
public String saveRedeemCodeRecord(RedeemCode redeemCode) {
String recordId = UUIDUitl.get();
String recordId = UUIDUtil.get();
RedeemCodeRecord redeemCodeRecord = new RedeemCodeRecord();
redeemCodeRecord.setRecordId(recordId);
redeemCodeRecord.setAmount(redeemCode.getAmount());

4
accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/clan/impl/ClanAccountAssociateServiceImpl.java
View File

@@ -9,7 +9,7 @@ import com.accompany.business.service.user.UsersService;
import com.accompany.business.util.ReplaceDomainUtil;
import com.accompany.business.vo.clan.ClanAssociateRoomVo;
import com.accompany.common.constant.Constant;
import com.accompany.common.utils.EncrytcUtil;
import com.accompany.common.utils.EncryptUtil;
import com.accompany.core.model.Room;
import com.accompany.core.model.Users;
import com.accompany.core.mybatismapper.PrettyNumberMapper;
@@ -73,7 +73,7 @@ public class ClanAccountAssociateServiceImpl extends ServiceImpl<ClanAccountAsso
clanAssociateRoomVo.setRoomTitle(room.getTitle());
Long newRoomUid = room.getUid() + encodeNum;
clanAssociateRoomVo.setCodes(EncrytcUtil.encodeBase64String(Long.toHexString(newRoomUid)));
clanAssociateRoomVo.setCodes(EncryptUtil.encodeBase64String(Long.toHexString(newRoomUid)));
if (Constant.PermitType.PERMIT_ROOM.equals(room.getIsPermitRoom())) {
clanAssociateRoomVo.setType(1);

4
accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/findlove/FindLoveMsgService.java
View File

@@ -21,7 +21,7 @@ import com.accompany.common.constant.Attach;
import com.accompany.common.constant.Constant;
import com.accompany.common.push.MarkdownMessage;
import com.accompany.common.utils.DateTimeUtil;
import com.accompany.common.utils.UUIDUitl;
import com.accompany.common.utils.UUIDUtil;
import com.accompany.core.model.Room;
import com.accompany.core.model.Users;
import com.accompany.core.service.SysConfService;
@@ -321,7 +321,7 @@ public class FindLoveMsgService {
* @throws Exception
*/
private void sendRoomMsg(final Long roomId, final Long sender, final String msg) throws Exception {
this.erBanNetEaseService.sendChatRoomMsg(roomId, UUIDUitl.get(), sender.toString(), Constant.DefineProtocol.CUSTOM_MESS_DEFINE, msg, null);
this.erBanNetEaseService.sendChatRoomMsg(roomId, UUIDUtil.get(), sender.toString(), Constant.DefineProtocol.CUSTOM_MESS_DEFINE, msg, null);
}
/**

4
accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/follow/FansService.java
View File

@@ -16,6 +16,7 @@ import com.accompany.business.service.room.RoomService;
import com.accompany.business.service.user.UserInRoomService;
import com.accompany.business.service.user.UsersService;
import com.accompany.business.util.ReplaceDomainUtil;
import com.accompany.common.utils.UUIDUtil;
import com.accompany.core.base.SpringContextHolder;
import com.accompany.business.util.VipUtil;
import com.accompany.business.vo.RoomVo;
@@ -36,7 +37,6 @@ import com.accompany.common.result.BusiResult;
import com.accompany.common.status.BusiStatus;
import com.accompany.common.utils.AppVersionUtil;
import com.accompany.common.utils.DateTimeUtil;
import com.accompany.common.utils.UUIDUitl;
import com.accompany.core.exception.ServiceException;
import com.accompany.core.model.NobleUsers;
import com.accompany.core.model.Room;
@@ -459,7 +459,7 @@ public class FansService extends ServiceImpl<FansMapper,Fans> {
fans.setLikeUid(likeUid);
fans.setLikedUid(likedUid);
fans.setCreateTime(date);
UUIDUitl.get();
UUIDUtil.get();
save(fans);
return fans;
}

4
accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/gift/GiftCompoundService.java
View File

@@ -18,7 +18,7 @@ import com.accompany.common.constant.Attach;
import com.accompany.common.constant.Constant;
import com.accompany.common.redis.RedisKey;
import com.accompany.common.status.BusiStatus;
import com.accompany.common.utils.UUIDUitl;
import com.accompany.common.utils.UUIDUtil;
import com.accompany.core.exception.ServiceException;
import com.accompany.core.model.Room;
import com.accompany.core.model.Users;
@@ -282,6 +282,6 @@ public class GiftCompoundService {
}
private void sendRoomMsg(final Long roomId, final Long sender, final String msg) throws Exception {
this.erBanNetEaseService.sendChatRoomMsg(roomId, UUIDUitl.get(), sender.toString(), Constant.DefineProtocol.CUSTOM_MESS_DEFINE, msg, null);
this.erBanNetEaseService.sendChatRoomMsg(roomId, UUIDUtil.get(), sender.toString(), Constant.DefineProtocol.CUSTOM_MESS_DEFINE, msg, null);
}
}

4
accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/gift/GiftSendService.java
View File

@@ -39,7 +39,7 @@ import com.accompany.common.status.BusiStatus;
import com.accompany.common.utils.BeanUtil;
import com.accompany.common.utils.DateTimeUtil;
import com.accompany.common.utils.GetTimeUtils;
import com.accompany.common.utils.UUIDUitl;
import com.accompany.common.utils.UUIDUtil;
import com.accompany.core.enumeration.BillObjTypeEnum;
import com.accompany.core.exception.ServiceException;
import com.accompany.core.model.Room;
@@ -525,7 +525,7 @@ public class GiftSendService extends BaseService {
message.setGoldNum(Constant.GiftConsumeType.ROOM_FREE_GIFT != giftConsumeType ? goldNum : 0L);
message.setRoomType(roomType);
message.setSendType(sendType);
message.setMessId(UUIDUitl.get());
message.setMessId(UUIDUtil.get());
message.setMessTime(System.currentTimeMillis());
message.setMsg(msg);
message.setGiftSource(giftSource);

6
accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/gift/LuckyBagSendService.java
View File

@@ -17,7 +17,7 @@ import com.accompany.common.config.SystemConfig;
import com.accompany.common.constant.Attach;
import com.accompany.common.constant.Constant;
import com.accompany.common.utils.DateTimeUtil;
import com.accompany.common.utils.UUIDUitl;
import com.accompany.common.utils.UUIDUtil;
import com.accompany.core.model.Room;
import com.accompany.core.model.Users;
import com.accompany.core.service.base.BaseService;
@@ -148,7 +148,7 @@ public class LuckyBagSendService extends BaseService {
@Async
public void batchSendRoomMessage(Room room, String msg) {
try {
erBanNetEaseService.sendChatRoomMsg(room.getRoomId(), UUIDUitl.get(), room.getUid().toString(),
erBanNetEaseService.sendChatRoomMsg(room.getRoomId(), UUIDUtil.get(), room.getUid().toString(),
Constant.DefineProtocol.CUSTOM_MESS_DEFINE, msg, msg);
} catch (Exception e) {
log.error("批量发送房间消息失败[room={}, message={}]", gson.toJson(room), msg, e);
@@ -173,7 +173,7 @@ public class LuckyBagSendService extends BaseService {
Integer luckyBagId,Integer giftId,Integer totalGoldNum,Date date,
Integer drawGiftPrice){
LuckyBagMessage luckyBagMessage = new LuckyBagMessage();
luckyBagMessage.setMessId(UUIDUitl.get());
luckyBagMessage.setMessId(UUIDUtil.get());
luckyBagMessage.setUid(sendUid);
luckyBagMessage.setReceiveUid(recvUid);
luckyBagMessage.setRoomUid(roomUid);

4
accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/gift/RadishSendService.java
View File

@@ -13,7 +13,7 @@ import com.accompany.business.vo.user.BasicUserVo;
import com.accompany.common.constant.Constant;
import com.accompany.common.redis.RedisKey;
import com.accompany.common.status.BusiStatus;
import com.accompany.common.utils.UUIDUitl;
import com.accompany.common.utils.UUIDUtil;
import com.accompany.core.exception.ServiceException;
import com.accompany.core.model.Room;
import com.accompany.core.model.Users;
@@ -135,7 +135,7 @@ public class RadishSendService extends BaseService {
message.setGiftNum(giftNum);
message.setRoomType(roomType);
message.setSendType(sendType);
message.setMessId(UUIDUitl.get());
message.setMessId(UUIDUtil.get());
message.setMessTime(System.currentTimeMillis());
message.setMsg(msg);
message.setGiftSource(giftSource);

8
accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/ktv/UserChooseMusicService.java
View File

@@ -9,7 +9,7 @@ import com.accompany.business.service.room.RoomService;
import com.accompany.business.service.user.UsersService;
import com.accompany.business.util.ReplaceDomainUtil;
import com.accompany.business.vo.UserChooseMusicVo;
import com.accompany.common.utils.UUIDUitl;
import com.accompany.common.utils.UUIDUtil;
import com.accompany.common.constant.Attach;
import com.accompany.common.constant.Constant;
import com.accompany.common.redis.RedisKey;
@@ -310,7 +310,7 @@ public class UserChooseMusicService extends BaseService {
attach.setSecond(Constant.DefineProtocol.CUSTOM_MESS_HEAD_SWITCH_MUSIC_SINGLE_ROOM);
attach.setData(userChooseMusicVo);
logger.info("sendSwitchMusicMessage. roomUid:{},attach:{}", roomUid, gson.toJson(attach));
erBanNetEaseService.sendChatRoomMsg(roomId, UUIDUitl.get(), roomUid.toString(),
erBanNetEaseService.sendChatRoomMsg(roomId, UUIDUtil.get(), roomUid.toString(),
Constant.DefineProtocol.CUSTOM_MESS_DEFINE, gson.toJson(attach), null);
}
@@ -321,7 +321,7 @@ public class UserChooseMusicService extends BaseService {
//给null前端接收不到通知
attach.setData(new UserChooseMusicVo());
logger.info("sendChooseMusicListIsEmptyMessage. roomUid:{}", roomUid);
erBanNetEaseService.sendChatRoomMsg(roomId, UUIDUitl.get(), roomUid.toString(),
erBanNetEaseService.sendChatRoomMsg(roomId, UUIDUtil.get(), roomUid.toString(),
Constant.DefineProtocol.CUSTOM_MESS_DEFINE, gson.toJson(attach), null);
}
@@ -427,7 +427,7 @@ public class UserChooseMusicService extends BaseService {
*/
private void sendCleanMusicDelayMessage2MQ(Long roomUid, Long uid){
CleanMusicDelayMessage message = new CleanMusicDelayMessage();
String messId = UUIDUitl.get();
String messId = UUIDUtil.get();
message.setMessId(messId);
message.setMessTime(System.currentTimeMillis());
message.setRoomUid(roomUid);

4
accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/linearlypool/LinearlyPoolPrizeMessageService.java
View File

@@ -21,7 +21,7 @@ import com.accompany.common.netease.neteaseacc.result.RubbishRet;
import com.accompany.common.redis.RedisKey;
import com.accompany.common.utils.DateTimeUtil;
import com.accompany.common.utils.HttpUtils;
import com.accompany.common.utils.UUIDUitl;
import com.accompany.common.utils.UUIDUtil;
import com.accompany.core.model.Room;
import com.accompany.core.model.Users;
import com.accompany.core.service.common.JedisService;
@@ -255,7 +255,7 @@ public class LinearlyPoolPrizeMessageService {
* @throws Exception
*/
private void sendRoomMsg(final Long roomId, final Long sender, final String msg) throws Exception {
this.erBanNetEaseService.sendChatRoomMsg(roomId, UUIDUitl.get(), sender.toString(), Constant.DefineProtocol.CUSTOM_MESS_DEFINE, msg);
this.erBanNetEaseService.sendChatRoomMsg(roomId, UUIDUtil.get(), sender.toString(), Constant.DefineProtocol.CUSTOM_MESS_DEFINE, msg);
}
/**

4
accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/linearlypool/LinearlyPrizePoolService.java
View File

@@ -21,6 +21,7 @@ import com.accompany.business.model.user.UserActPropertyInfoV2;
import com.accompany.business.mybatismapper.PrizeMapper;
import com.accompany.business.service.box.PrizeService;
import com.accompany.business.service.level.LevelService;
import com.accompany.common.utils.UUIDUtil;
import com.accompany.core.service.message.MessageRobotPushService;
import com.accompany.business.service.user.UserActPropertyInfoV2Service;
import com.accompany.business.util.ReplaceDomainUtil;
@@ -37,7 +38,6 @@ import com.accompany.common.status.BusiStatus;
import com.accompany.common.utils.BlankUtil;
import com.accompany.common.utils.DateTimeUtil;
import com.accompany.common.utils.StringUtils;
import com.accompany.common.utils.UUIDUitl;
import com.accompany.core.exception.ServiceException;
import com.accompany.core.service.SysConfService;
import com.accompany.core.service.common.JedisLockService;
@@ -693,7 +693,7 @@ public class LinearlyPrizePoolService {
LinearlyPoolPrizeMessage msg = messages[idx];
if (msg == null) {
msg = new LinearlyPoolPrizeMessage();
msg.setMessId(UUIDUitl.get());
msg.setMessId(UUIDUtil.get());
msg.setMessTime(drawTime.getTime());
msg.setUid(uid);
msg.setRoomUid(roomUid);

7
accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/miniGame/impl/MiniGameInviteRecordServiceImpl.java
View File

@@ -1,7 +1,6 @@
package com.accompany.business.service.miniGame.impl;
import cn.hutool.core.util.ObjectUtil;
import com.accompany.business.event.listener.CrossRoomPKDenyJob;
import com.accompany.business.event.listener.MiniGameDenyJob;
import com.accompany.business.model.miniGame.MiniGameInviteRecord;
import com.accompany.business.model.miniGame.MiniGameRoom;
@@ -12,6 +11,7 @@ import com.accompany.business.service.miniGame.MiniGameInviteRecordService;
import com.accompany.business.service.miniGame.MiniGameRoomService;
import com.accompany.business.service.room.CrossRoomPkRoundService;
import com.accompany.business.service.room.RoomService;
import com.accompany.common.utils.UUIDUtil;
import com.accompany.core.base.SpringContextHolder;
import com.accompany.business.vo.hall.ClanSuperManageListVO;
import com.accompany.common.constant.Attach;
@@ -19,7 +19,6 @@ import com.accompany.common.constant.Constant;
import com.accompany.common.netease.neteaseacc.result.RubbishRet;
import com.accompany.common.redis.RedisKey;
import com.accompany.common.utils.DateTimeUtil;
import com.accompany.common.utils.UUIDUitl;
import com.accompany.core.exception.ServiceException;
import com.accompany.core.model.Room;
import com.accompany.core.model.Users;
@@ -227,7 +226,7 @@ public class MiniGameInviteRecordServiceImpl extends ServiceImpl<MiniGameInviteR
attach.setData(jsonObject);
String attachStr=gson.toJson(attach);
log.info("小游戏邀请attachStr={}", attachStr);
String msgId= UUIDUitl.get();
String msgId= UUIDUtil.get();
RubbishRet rubbishRet=erBanNetEaseService.sendChatRoomMsg(room.getRoomId(), msgId, String.valueOf(miniGameInviteRecord.getInviteUid()),Constant.DefineProtocol.CUSTOM_MESS_DEFINE,attachStr, 1);
if(rubbishRet.getCode()!=200){
@@ -271,7 +270,7 @@ public class MiniGameInviteRecordServiceImpl extends ServiceImpl<MiniGameInviteR
attach.setData(jsonObject);
String attachStr = gson.toJson(attach);
log.info("小游戏回复邀请attachStr={}", attachStr);
String msgId = UUIDUitl.get();
String msgId = UUIDUtil.get();
RubbishRet rubbishRet = erBanNetEaseService.sendChatRoomMsg(roomId, msgId, String.valueOf(fromUid), Constant.DefineProtocol.CUSTOM_MESS_DEFINE, attachStr, 1);
if (rubbishRet.getCode() != 200) {

5
accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/netease/ReceiveNeteaseService.java
View File

@@ -11,7 +11,6 @@ import com.accompany.business.param.LeftChatRoomParam;
import com.accompany.business.param.MicQueueParam;
import com.accompany.business.service.mq.RocketMQService;
import com.accompany.business.service.room.*;
import com.accompany.business.service.user.UserInRoomService;
import com.accompany.business.service.useronline.UserOnlineService;
import com.accompany.business.vo.home.PlayRoomVo;
import com.accompany.common.constant.Constant;
@@ -19,7 +18,7 @@ import com.accompany.common.netease.util.NetEaseConstant;
import com.accompany.common.redis.RedisKey;
import com.accompany.common.status.BusiStatus;
import com.accompany.common.utils.StringUtils;
import com.accompany.common.utils.UUIDUitl;
import com.accompany.common.utils.UUIDUtil;
import com.accompany.core.exception.ServiceException;
import com.accompany.core.model.Room;
import com.accompany.core.service.base.BaseService;
@@ -277,7 +276,7 @@ public class ReceiveNeteaseService extends BaseService {
@NotNull
protected YidunIMAntiMessage buildYidunAntiMqMsg(IMChatMsgBaseDTO chatMsg) {
YidunIMAntiMessage msg = new YidunIMAntiMessage();
msg.setMessId(UUIDUitl.get());
msg.setMessId(UUIDUtil.get());
msg.setMessTime(System.currentTimeMillis());
msg.setChatMsg(chatMsg);
return msg;

5
accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/netease/YidunCheckUtil.java
View File

@@ -18,13 +18,12 @@ import com.accompany.business.sensitvienew.SensitiveConstant;
import com.accompany.business.sensitvienew.SensitiveFilterUtil;
import com.accompany.common.config.YidunCheckConfig;
import com.accompany.common.constant.Constant;
import com.accompany.common.utils.UUIDUitl;
import com.accompany.common.utils.UUIDUtil;
import com.accompany.core.util.HttpClient4Utils;
import com.accompany.core.util.YidunGeneralUtils;
import com.alibaba.fastjson.JSON;
import lombok.extern.slf4j.Slf4j;
import org.apache.http.Consts;
import org.springframework.http.HttpStatus;
import org.springframework.stereotype.Service;
import java.util.ArrayList;
@@ -124,7 +123,7 @@ public class YidunCheckUtil {
private static YidunCheckRes requestTextCheck(String checkText) {
Map<String, String> params = YidunGeneralUtils.getCommonParams(YidunCheckConfig.secretId, YidunCheckConfig.businessId,
"v5.1", "MD5");
params.put("dataId", UUIDUitl.get());
params.put("dataId", UUIDUtil.get());
params.put("content", checkText);
params.put("version", "v5.1");
YidunGeneralUtils.sign(params, YidunCheckConfig.secretKey);

4
accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/purse/UserWalletService.java
View File

@@ -14,7 +14,7 @@ import com.accompany.common.constant.Constant;
import com.accompany.common.redis.RedisKey;
import com.accompany.common.status.BusiStatus;
import com.accompany.common.utils.BlankUtil;
import com.accompany.common.utils.UUIDUitl;
import com.accompany.common.utils.UUIDUtil;
import com.accompany.core.exception.ServiceException;
import com.accompany.core.service.base.BaseService;
import com.accompany.core.service.common.JedisLockService;
@@ -206,7 +206,7 @@ public class UserWalletService extends BaseService {
Long updateAmount, Long afterAmount, String billId, byte updateType) {
Date now = new Date();
UserWalletWater walletWater = new UserWalletWater();
walletWater.setRecordId(UUIDUitl.get());
walletWater.setRecordId(UUIDUtil.get());
walletWater.setUid(uid);
walletWater.setCurrencyType(currencyType);
walletWater.setBeforeAmount(beforeAmount);

4
accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/radish/RadishBillService.java
View File

@@ -8,7 +8,7 @@ import com.accompany.core.service.base.BaseService;
import com.accompany.business.vo.radish.RadishBillRecordVo;
import com.google.common.collect.Lists;
import com.google.common.collect.Maps;
import com.accompany.common.utils.UUIDUitl;
import com.accompany.common.utils.UUIDUtil;
import com.accompany.common.constant.Constant;
import com.accompany.common.utils.DateTimeUtil;
import org.apache.commons.collections.CollectionUtils;
@@ -116,7 +116,7 @@ public class RadishBillService extends BaseService {
public RadishBill insertRadishBillRecord(Long uid, Long targetUid, Long roomUid, byte billType, Long amount,
byte currencyType, Integer giftId, Integer giftNum, String objId) {
RadishBill radishBill = new RadishBill();
radishBill.setBillId(UUIDUitl.get());
radishBill.setBillId(UUIDUtil.get());
radishBill.setUid(uid);
radishBill.setTargetUid(targetUid);
radishBill.setRoomUid(roomUid);

4
accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/rank/PermitRoomTaskService.java
View File

@@ -6,7 +6,7 @@ import com.accompany.business.service.room.RoomService;
import com.accompany.common.constant.Attach;
import com.accompany.common.constant.Constant;
import com.accompany.common.utils.DateTimeUtil;
import com.accompany.common.utils.UUIDUitl;
import com.accompany.common.utils.UUIDUtil;
import com.accompany.core.model.Room;
import com.accompany.core.service.common.JedisService;
import com.alibaba.fastjson.JSON;
@@ -125,6 +125,6 @@ public class PermitRoomTaskService {
}
private void sendRoomMsg(final Long roomId, final Long sender, final String msg) throws Exception {
erBanNetEaseService.sendChatRoomMsg(roomId, UUIDUitl.get(), sender.toString(), Constant.DefineProtocol.CUSTOM_MESS_DEFINE, msg, null);
erBanNetEaseService.sendChatRoomMsg(roomId, UUIDUtil.get(), sender.toString(), Constant.DefineProtocol.CUSTOM_MESS_DEFINE, msg, null);
}
}

4
accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/record/BillRecordService.java
View File

@@ -16,7 +16,7 @@ import com.accompany.business.vo.BillSearchVo;
import com.accompany.common.constant.Constant;
import com.accompany.common.utils.DateTimeUtil;
import com.accompany.common.utils.StringUtils;
import com.accompany.common.utils.UUIDUitl;
import com.accompany.common.utils.UUIDUtil;
import com.accompany.core.enumeration.BillObjTypeEnum;
import com.accompany.core.enumeration.BillSearchTypeEnum;
import com.accompany.core.enumeration.BillTypeEnum;
@@ -154,7 +154,7 @@ public class BillRecordService extends ServiceImpl<BillRecordMapper,BillRecord>
rmbA = -rmbA;
}
BillRecord billRecord = new BillRecord();
billRecord.setBillId(UUIDUitl.get());
billRecord.setBillId(UUIDUtil.get());
billRecord.setBillType(billType.getValue());
billRecord.setUid(uid);
billRecord.setTargetUid(targetUid);

4
accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/record/ExchangeDiamondGoldRecordService.java
View File

@@ -12,7 +12,7 @@ import com.accompany.common.status.BusiStatus;
import com.accompany.common.utils.BlankUtil;
import com.accompany.common.utils.DateTimeUtil;
import com.accompany.common.utils.GetTimeUtils;
import com.accompany.common.utils.UUIDUitl;
import com.accompany.common.utils.UUIDUtil;
import com.accompany.core.enumeration.ExchangeTypeEnum;
import com.accompany.core.exception.ServiceException;
import com.accompany.core.model.Users;
@@ -94,7 +94,7 @@ public class ExchangeDiamondGoldRecordService {
}
// 扣钱无误时更新相关记录
String reocrdId = UUIDUitl.get();
String reocrdId = UUIDUtil.get();
saveExchageRecord(reocrdId, uid, changeNum, changeType);
// 添加累计兑换数额
this.increaseExchangeGold(exGoldNum);

4
accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/room/RoomFreeGiftService.java
View File

@@ -13,7 +13,7 @@ import com.accompany.common.constant.Attach;
import com.accompany.common.constant.Constant;
import com.accompany.common.redis.RedisKey;
import com.accompany.common.status.BusiStatus;
import com.accompany.common.utils.UUIDUitl;
import com.accompany.common.utils.UUIDUtil;
import com.accompany.core.exception.ServiceException;
import com.accompany.core.model.Room;
import com.accompany.core.service.SysConfService;
@@ -357,7 +357,7 @@ public class RoomFreeGiftService implements InitializingBean, ApplicationListene
for (Room room : validRooms) {
bizExecutor.execute(() -> {
try {
this.erBanNetEaseService.sendChatRoomMsg(room.getRoomId(), UUIDUitl.get(), room.getUid().toString(), Constant.DefineProtocol.CUSTOM_MESS_DEFINE, msg, null);
this.erBanNetEaseService.sendChatRoomMsg(room.getRoomId(), UUIDUtil.get(), room.getUid().toString(), Constant.DefineProtocol.CUSTOM_MESS_DEFINE, msg, null);
} catch (Exception e) {
log.error("批量发送房间消息失败[room={}, message={}]", JSON.toJSONString(room), msg, e);
}

4
accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/room/RoomGiftValueService.java
View File

@@ -20,7 +20,7 @@ import com.accompany.common.constant.Constant;
import com.accompany.common.netease.neteaseacc.result.RoomRet;
import com.accompany.common.redis.RedisKey;
import com.accompany.common.result.BusiResult;
import com.accompany.common.utils.UUIDUitl;
import com.accompany.common.utils.UUIDUtil;
import com.accompany.core.model.Room;
import com.accompany.core.model.Users;
import com.accompany.core.mybatismapper.RoomMapper;
@@ -259,7 +259,7 @@ public class RoomGiftValueService extends BaseService {
try {
erBanNetEaseService.sendChatRoomMsg(
roomService.getRoomByUid(roomUid).getRoomId(),
UUIDUitl.get(),
UUIDUtil.get(),
roomUid.toString(),
Constant.DefineProtocol.CUSTOM_MESS_DEFINE,
gson.toJson(attach), null);

7
accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/room/RoomMicService.java
View File

@@ -1,6 +1,5 @@
package com.accompany.business.service.room;
import com.accompany.business.model.miniGame.MiniGame;
import com.accompany.business.model.redis.RoomMic;
import com.accompany.business.param.QueueMicroParam;
import com.accompany.business.service.ErBanNetEaseService;
@@ -12,7 +11,7 @@ import com.accompany.common.constant.Constant;
import com.accompany.common.redis.RedisKey;
import com.accompany.common.status.BusiStatus;
import com.accompany.common.utils.BlankUtil;
import com.accompany.common.utils.UUIDUitl;
import com.accompany.common.utils.UUIDUtil;
import com.accompany.core.exception.ServiceException;
import com.accompany.core.model.Room;
import com.accompany.core.model.Users;;
@@ -222,7 +221,7 @@ public class RoomMicService extends BaseService {
jsonObject.put(Constant.RoomMic.KEY_INVITEUID, micUid);
jsonObject.put(Constant.RoomMic.KEY_POSITION, position);
attach.setData(jsonObject);
return erBanNetEaseService.sendChatRoomMsg(roomId, UUIDUitl.get(), roomUid.toString()
return erBanNetEaseService.sendChatRoomMsg(roomId, UUIDUtil.get(), roomUid.toString()
, Constant.DefineProtocol.CUSTOM_MESS_DEFINE, gson.toJson(attach), null).getCode();
}
@@ -237,7 +236,7 @@ public class RoomMicService extends BaseService {
attach.setFirst(Constant.DefineProtocol.CUSTOM_MESS_HEAD_QUEUE);
attach.setSecond(Constant.DefineProtocol.CUSTOM_MESS_SUB_KICKIT);
attach.setData("你已被房主或管理员踢下麦");
return erBanNetEaseService.sendChatRoomMsg(roomId, UUIDUitl.get(), roomUid.toString()
return erBanNetEaseService.sendChatRoomMsg(roomId, UUIDUtil.get(), roomUid.toString()
, Constant.DefineProtocol.CUSTOM_MESS_DEFINE, gson.toJson(attach), null).getCode();
}

6
accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/room/RoomPKService.java
View File

@@ -20,7 +20,7 @@ import com.accompany.common.netease.neteaseacc.result.RoomRet;
import com.accompany.common.redis.RedisKey;
import com.accompany.common.status.BusiStatus;
import com.accompany.common.utils.DateTimeUtil;
import com.accompany.common.utils.UUIDUitl;
import com.accompany.common.utils.UUIDUtil;
import com.accompany.core.exception.ServiceException;
import com.accompany.core.model.Room;
import com.accompany.core.model.Users;
@@ -138,7 +138,7 @@ public class RoomPKService extends BaseService {
public RoomPK createPkAct(Long roomUid, Long operUid, Byte PkMode, Byte voteMode, Long duration) {
Integer second = forceFinish(roomUid);
RoomPK roomPk = new RoomPK();
roomPk.setPkId(UUIDUitl.get());
roomPk.setPkId(UUIDUtil.get());
roomPk.setPkStatus(Constant.RoomPKStatus.NOT_BEGIN);
roomPk.setRoomUid(roomUid);
roomPk.setOperUid(operUid);
@@ -774,7 +774,7 @@ public class RoomPKService extends BaseService {
attach.setFirst(first);
attach.setSecond(second);
attach.setData(object);
this.erBanNetEaseService.sendChatRoomMsgNoResend(roomId, UUIDUitl.get(), sender, Constant.DefineProtocol.CUSTOM_MESS_DEFINE, gson.toJson(attach));
this.erBanNetEaseService.sendChatRoomMsgNoResend(roomId, UUIDUtil.get(), sender, Constant.DefineProtocol.CUSTOM_MESS_DEFINE, gson.toJson(attach));
}catch(Exception e){
logger.error("pk sendChatRoomMsg error",e);
}

4
accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/room/RoomQueueMicroService.java
View File

@@ -15,7 +15,7 @@ import com.accompany.common.constant.Constant;
import com.accompany.common.netease.neteaseacc.result.RoomRet;
import com.accompany.common.redis.RedisKey;
import com.accompany.common.status.BusiStatus;
import com.accompany.common.utils.UUIDUitl;
import com.accompany.common.utils.UUIDUtil;
import com.accompany.core.exception.ServiceException;
import com.accompany.core.model.Room;
import com.accompany.core.model.Users;
@@ -366,7 +366,7 @@ public class RoomQueueMicroService extends BaseService {
attach.setFirst(first);
attach.setSecond(second);
attach.setData(queueMicroParam);
this.erBanNetEaseService.sendChatRoomMsg(roomId,UUIDUitl.get(),sender,Constant.DefineProtocol.CUSTOM_MESS_DEFINE,gson.toJson(attach), sender);
this.erBanNetEaseService.sendChatRoomMsg(roomId, UUIDUtil.get(),sender,Constant.DefineProtocol.CUSTOM_MESS_DEFINE,gson.toJson(attach), sender);
}
/**

4
accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/room/RoomRewardService.java
View File

@@ -1,13 +1,13 @@
package com.accompany.business.service.room;
import com.accompany.business.model.RoomReward;
import com.accompany.common.utils.UUIDUtil;
import com.accompany.core.mybatismapper.RoomMapper;
import com.accompany.business.mybatismapper.RoomRewardMapper;
import com.accompany.business.service.ErBanNetEaseService;
import com.accompany.business.service.follow.FansService;
import com.accompany.business.service.user.UsersService;
import com.accompany.business.vo.RoomRewardVo;
import com.accompany.common.utils.UUIDUitl;
import com.accompany.common.result.BusiResult;
import com.accompany.common.status.BusiStatus;
import org.slf4j.Logger;
@@ -41,7 +41,7 @@ public class RoomRewardService {
public BusiResult<RoomRewardVo> saveRoomReward(Long uid,Long rewardMoney,int servDura){
BusiResult<RoomRewardVo> busiResult=new BusiResult<RoomRewardVo>(BusiStatus.SUCCESS);
servDura=defaultServDura;
String rewardId= UUIDUitl.get();
String rewardId= UUIDUtil.get();
Date date=new Date();
RoomReward roomReward=new RoomReward();
roomReward.setRewardId(rewardId);

12
accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/room/RoomService.java
View File

@@ -1104,7 +1104,7 @@ public class RoomService extends BaseService {
Date date = new Date();
Date openTime = room.getOpenTime();
RoomOpenHist roomOpenHist = new RoomOpenHist();
roomOpenHist.setHistId(UUIDUitl.get());
roomOpenHist.setHistId(UUIDUtil.get());
roomOpenHist.setMeetingName(room.getMeetingName());
roomOpenHist.setRoomId(room.getUid());
roomOpenHist.setUid(room.getUid());
@@ -1119,7 +1119,7 @@ public class RoomService extends BaseService {
room.setUpdateTime(date);
room.setOpenTime(date);
room.setIsExceptionClose(false);
room.setMeetingName(UUIDUitl.get());
room.setMeetingName(UUIDUtil.get());
Room roomDb = getRoomByUid(room.getUid());
@@ -1552,7 +1552,7 @@ public class RoomService extends BaseService {
Date date = new Date();
room.setValid(true);
room.setIsPermitRoom((byte) 2); // 非牌照房
room.setMeetingName(UUIDUitl.get());
room.setMeetingName(UUIDUtil.get());
room.setOperatorStatus(Constant.RoomOptStatus.in);
room.setOpenTime(date);
room.setCreateTime(date);
@@ -2152,7 +2152,7 @@ public class RoomService extends BaseService {
public String getRoomUidEncode(Long roomUid) {
Long newRoomUid = roomUid + encodeNum;
String newRoomUidStr = Long.toHexString(newRoomUid);
String encodeStr = EncrytcUtil.encodeBase64String(newRoomUidStr);
String encodeStr = EncryptUtil.encodeBase64String(newRoomUidStr);
return encodeStr;
}
@@ -2163,7 +2163,7 @@ public class RoomService extends BaseService {
* @return
*/
public Long getRoomUidDecode(String encodeStr) throws Exception {
encodeStr = EncrytcUtil.decodeBase64String(encodeStr);
encodeStr = EncryptUtil.decodeBase64String(encodeStr);
if (BlankUtil.isBlank(encodeStr)) {
throw new ServiceException(BusiStatus.PARAMERROR);
}
@@ -3670,7 +3670,7 @@ public class RoomService extends BaseService {
attach.setData(jsonObject);
String attachStr = gson.toJson(attach);
log.info("sendCleanRoomhistoryRecordMsg attachStr={}", attachStr);
String msgId = UUIDUitl.get();
String msgId = UUIDUtil.get();
RubbishRet rubbishRet = erBanNetEaseService.sendChatRoomMsg(roomId, msgId, String.valueOf(uid), Constant.DefineProtocol.CUSTOM_MESS_DEFINE, attachStr, 1);
if (rubbishRet.getCode() != 200) {
log.info("sendCleanRoomhistoryRecordMsg，失败code=" + rubbishRet.getCode());

4
accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/room/impl/BlindDateServiceImpl.kt
View File

@@ -18,7 +18,7 @@ import com.accompany.common.constant.Attach
import com.accompany.common.constant.Constant
import com.accompany.common.redis.RedisKey
import com.accompany.common.status.BusiStatus
import com.accompany.common.utils.UUIDUitl
import com.accompany.common.utils.UUIDUtil
import com.accompany.core.annotation.LogTime
import com.accompany.core.exception.ServiceException
import com.accompany.core.model.Room
@@ -250,7 +250,7 @@ open class BlindDateServiceImpl : BlindDateService {
private fun publishBlindDateNotifyMsg(room : Room, oneUserNick : String, anotherUserNick : String, blindDateJoinHandDTO: BlindDateJoinHandDTO?) {
val message = BlindDateNotifyMessage()
message.messId = UUIDUitl.get()
message.messId = UUIDUtil.get()
message.messTime = System.currentTimeMillis()
message.oneUserNick = oneUserNick
message.anotherUserNick = anotherUserNick

16
accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/room/impl/CrossRoomPkRoundServiceImpl.java
View File

@@ -23,6 +23,7 @@ import com.accompany.business.service.netease.YidunCheckUtil;
import com.accompany.business.service.room.*;
import com.accompany.business.service.user.UsersService;
import com.accompany.business.util.ReplaceDomainUtil;
import com.accompany.common.utils.UUIDUtil;
import com.accompany.core.base.SpringContextHolder;
import com.accompany.business.vo.RoomNotifyVo;
import com.accompany.business.vo.hall.ClanSuperManageListVO;
@@ -35,7 +36,6 @@ import com.accompany.common.redis.RedisKey;
import com.accompany.common.status.BusiStatus;
import com.accompany.common.utils.DateTimeUtil;
import com.accompany.common.utils.StringUtils;
import com.accompany.common.utils.UUIDUitl;
import com.accompany.core.exception.ServiceException;
import com.accompany.core.model.Room;
import com.accompany.core.model.Users;
@@ -871,7 +871,7 @@ public class CrossRoomPkRoundServiceImpl extends ServiceImpl<CrossRoomPkRoundMap
attach.setData(jsonObject);
String attachStr = gson.toJson(attach);
log.info("跨房PK邀请attachStr={}", attachStr);
String msgId = UUIDUitl.get();
String msgId = UUIDUtil.get();
RubbishRet rubbishRet = erBanNetEaseService.sendChatRoomMsg(inviteRoomId, msgId, String.valueOf(fromUid), Constant.DefineProtocol.CUSTOM_MESS_DEFINE, attachStr, 1);
if (rubbishRet.getCode() != 200) {
@@ -912,7 +912,7 @@ public class CrossRoomPkRoundServiceImpl extends ServiceImpl<CrossRoomPkRoundMap
attach.setData(panelDto);
String attachStr = gson.toJson(attach);
log.info("跨房PK邀请attachStr={}", attachStr);
String msgId = UUIDUitl.get();
String msgId = UUIDUtil.get();
RubbishRet rubbishRet = erBanNetEaseService.sendChatRoomMsg(roomId, msgId, String.valueOf(fromUid), Constant.DefineProtocol.CUSTOM_MESS_DEFINE, attachStr, 1);
if (rubbishRet.getCode() != 200) {
@@ -934,7 +934,7 @@ public class CrossRoomPkRoundServiceImpl extends ServiceImpl<CrossRoomPkRoundMap
attach.setData(panelDto);
String attachStr = gson.toJson(attach);
log.info("跨房PK邀请attachStr={}", attachStr);
String msgId = UUIDUitl.get();
String msgId = UUIDUtil.get();
RubbishRet rubbishRet = erBanNetEaseService.sendChatRoomMsg(roomId, msgId, String.valueOf(fromUid), Constant.DefineProtocol.CUSTOM_MESS_DEFINE, attachStr, 1);
if (rubbishRet.getCode() != 200) {
@@ -971,7 +971,7 @@ public class CrossRoomPkRoundServiceImpl extends ServiceImpl<CrossRoomPkRoundMap
attach.setData(jsonObject);
String attachStr = gson.toJson(attach);
log.info("跨房PK邀请attachStr={}", attachStr);
String msgId = UUIDUitl.get();
String msgId = UUIDUtil.get();
RubbishRet rubbishRet = erBanNetEaseService.sendChatRoomMsg(roomId, msgId, String.valueOf(roomParam.getInviteUid()), Constant.DefineProtocol.CUSTOM_MESS_DEFINE, attachStr, 1);
if (rubbishRet.getCode() != 200) {
@@ -1259,7 +1259,7 @@ public class CrossRoomPkRoundServiceImpl extends ServiceImpl<CrossRoomPkRoundMap
String attachStr = gson.toJson(attach);
erBanNetEaseService.sendChatRoomMsg(room.getRoomId(), UUIDUitl.get(), room.getUid().toString(), Constant.DefineProtocol.CUSTOM_MESS_DEFINE, attachStr, 1);
erBanNetEaseService.sendChatRoomMsg(room.getRoomId(), UUIDUtil.get(), room.getUid().toString(), Constant.DefineProtocol.CUSTOM_MESS_DEFINE, attachStr, 1);
} catch (Exception e) {
log.error("批量发送房间消息失败[room={}, message={}]", gson.toJson(room), msg, e);
}
@@ -1324,7 +1324,7 @@ public class CrossRoomPkRoundServiceImpl extends ServiceImpl<CrossRoomPkRoundMap
attach.setData(jsonObject);
String attachStr = gson.toJson(attach);
log.info("跨房PK邀请attachStr={}", attachStr);
String msgId = UUIDUitl.get();
String msgId = UUIDUtil.get();
RubbishRet rubbishRet = erBanNetEaseService.sendChatRoomMsg(roomId, msgId, String.valueOf(SystemConfig.secretaryUid),
Constant.DefineProtocol.CUSTOM_MESS_DEFINE, attachStr, 1);
@@ -1427,7 +1427,7 @@ public class CrossRoomPkRoundServiceImpl extends ServiceImpl<CrossRoomPkRoundMap
Room roomByUid = roomService.getRoomByUid(record.getRoomUid());
// 发送消息
log.info("发送消息{}", attachStr);
rubbishRet = erBanNetEaseService.sendChatRoomMsg(roomByUid.getRoomId(), UUIDUitl.get(), String.valueOf(SystemConfig.secretaryUid)
rubbishRet = erBanNetEaseService.sendChatRoomMsg(roomByUid.getRoomId(), UUIDUtil.get(), String.valueOf(SystemConfig.secretaryUid)
, Constant.DefineProtocol.CUSTOM_MESS_DEFINE, attachStr, 1);
} catch (Exception e) {
log.error("跨房PK发送聊天室消息失败", e);

8
accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/seekelfin/impl/SeekElfinServiceImpl.java
View File

@@ -25,18 +25,16 @@ import com.accompany.business.service.seekelfin.SeekElfinProdService;
import com.accompany.business.service.seekelfin.SeekElfinService;
import com.accompany.business.service.user.UserBackpackService;
import com.accompany.business.service.user.UsersService;
import com.accompany.common.utils.UUIDUtil;
import com.accompany.core.base.SpringContextHolder;
import com.accompany.business.util.seekelfin.SeekElfinUtil;
import com.accompany.business.vo.seekelfin.SeekElfinHeadwearVo;
import com.accompany.business.vo.seekelfin.SeekElfinRoomMessage;
import com.accompany.common.constant.AppEnum;
import com.accompany.common.constant.Constant;
import com.accompany.common.device.DeviceInfo;
import com.accompany.common.redis.RedisKey;
import com.accompany.common.status.BusiStatus;
import com.accompany.common.utils.AppVersionUtil;
import com.accompany.common.utils.DateTimeUtil;
import com.accompany.common.utils.UUIDUitl;
import com.accompany.core.enumeration.BillObjTypeEnum;
import com.accompany.core.enumeration.CurrencyEnum;
import com.accompany.core.exception.ServiceException;
@@ -441,7 +439,7 @@ public class SeekElfinServiceImpl extends BaseService implements SeekElfinServic
private List<BillRecord> buildBillRecordList(SeekElfinResultReqDTO reqDTO, Long totalCostGold, Long objId, boolean win, Long receiveGoldNum) {
List<BillRecord> billRecordList = new ArrayList<>();
BillRecord outBillRecord = new BillRecord();
outBillRecord.setBillId(UUIDUitl.get());
outBillRecord.setBillId(UUIDUtil.get());
outBillRecord.setUid(reqDTO.getUid());
outBillRecord.setTargetUid(reqDTO.getUid());
outBillRecord.setRoomUid(reqDTO.getRoomUid() != null ? reqDTO.getRoomUid() : 0);
@@ -461,7 +459,7 @@ public class SeekElfinServiceImpl extends BaseService implements SeekElfinServic
if (win && receiveGoldNum > 0L) {
BillRecord inBillRecord = new BillRecord();
inBillRecord.setBillId(UUIDUitl.get());
inBillRecord.setBillId(UUIDUtil.get());
inBillRecord.setUid(reqDTO.getUid());
inBillRecord.setTargetUid(reqDTO.getUid());
inBillRecord.setRoomUid(reqDTO.getRoomUid() != null ? reqDTO.getRoomUid() : 0);

4
accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/signweb/SignDrawGoldService.java
View File

@@ -18,7 +18,7 @@ import com.accompany.common.redis.RedisKey;
import com.accompany.common.result.BusiResult;
import com.accompany.common.status.BusiStatus;
import com.accompany.common.utils.BlankUtil;
import com.accompany.common.utils.UUIDUitl;
import com.accompany.common.utils.UUIDUtil;
import com.accompany.core.enumeration.BillObjTypeEnum;
import com.accompany.core.exception.ServiceException;
import com.accompany.core.model.Users;
@@ -333,7 +333,7 @@ public class SignDrawGoldService extends BaseService {
*/
public SignDrawGoldMessage buildDrawGoldMessage(final Long uid,final DrawGoldRecord drawGoldRecord) {
SignDrawGoldMessage msg = new SignDrawGoldMessage();
msg.setMessId(UUIDUitl.get());
msg.setMessId(UUIDUtil.get());
msg.setUid(uid);
msg.setMessTime(System.currentTimeMillis());
msg.setDrawGoldRecord(drawGoldRecord);

4
accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/signweb/SignService.java
View File

@@ -1,6 +1,7 @@
package com.accompany.business.service.signweb;
import com.accompany.business.service.mq.RocketMQService;
import com.accompany.common.utils.UUIDUtil;
import com.alibaba.fastjson.JSON;
import com.accompany.business.constant.PrizeTypeEnum;
import com.accompany.business.constant.RadishBillTypeEnum;
@@ -12,7 +13,6 @@ import com.accompany.core.service.base.BaseService;
import com.accompany.business.service.box.BoxPrizeContext;
import com.accompany.business.service.box.BoxPrizeStrategyFactory;
import com.accompany.business.util.ExceptionUtils;
import com.accompany.common.utils.UUIDUitl;
import com.accompany.common.constant.Constant;
import com.accompany.common.redis.RedisKey;
import com.accompany.common.status.BusiStatus;
@@ -186,7 +186,7 @@ public class SignService extends BaseService {
*/
public SignMessage buildSignMessage(final Long uid,Byte signType) {
SignMessage msg = new SignMessage();
msg.setMessId(UUIDUitl.get());
msg.setMessId(UUIDUtil.get());
msg.setUid(uid);
msg.setMessTime(System.currentTimeMillis());
msg.setSignType(signType);

4
accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/singleroom/SingleRoomTaskService.java
View File

@@ -18,7 +18,7 @@ import com.accompany.business.service.user.UsersService;
import com.accompany.common.constant.Attach;
import com.accompany.common.constant.Constant;
import com.accompany.common.utils.DateTimeUtil;
import com.accompany.common.utils.UUIDUitl;
import com.accompany.common.utils.UUIDUtil;
import com.accompany.core.model.Users;
import com.accompany.core.service.common.JedisService;
import com.alibaba.fastjson.JSON;
@@ -148,6 +148,6 @@ public class SingleRoomTaskService {
}
private void sendRoomMsg(final Long roomId, final Long sender, final String msg) throws Exception {
erBanNetEaseService.sendChatRoomMsg(roomId, UUIDUitl.get(), sender.toString(), Constant.DefineProtocol.CUSTOM_MESS_DEFINE, msg, null);
erBanNetEaseService.sendChatRoomMsg(roomId, UUIDUtil.get(), sender.toString(), Constant.DefineProtocol.CUSTOM_MESS_DEFINE, msg, null);
}
}

6
accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/statis/StatPacketRegisterService.java
View File

@@ -3,9 +3,7 @@ package com.accompany.business.service.statis;
import com.accompany.business.model.StatPacketRegister;
import com.accompany.business.model.StatPacketRegisterExample;
import com.accompany.business.mybatismapper.StatPacketRegisterMapper;
import com.accompany.business.mybatismapper.UserPacketRecordExpand;
import com.accompany.business.mybatismapper.UserPacketRecordMapper;
import com.accompany.common.utils.UUIDUitl;
import com.accompany.common.utils.UUIDUtil;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.util.CollectionUtils;
@@ -28,7 +26,7 @@ public class StatPacketRegisterService {
List<StatPacketRegister> statPacketRegisterList=statPacketRegisterMapper.selectByExample(statPacketRegisterExample);
if(CollectionUtils.isEmpty(statPacketRegisterList)){
StatPacketRegister statPacketRegister=new StatPacketRegister();
statPacketRegister.setRegisterId(UUIDUitl.get());
statPacketRegister.setRegisterId(UUIDUtil.get());
statPacketRegister.setUid(uid);
statPacketRegister.setRegisterUid(registerUid);
statPacketRegister.setCreateTime(new Date());

4
accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/statis/StatisService.java
View File

@@ -2,7 +2,7 @@ package com.accompany.business.service.statis;
import com.accompany.business.model.Statis;
import com.accompany.business.mybatismapper.StatisMapper;
import com.accompany.common.utils.UUIDUitl;
import com.accompany.common.utils.UUIDUtil;
import com.accompany.common.result.BusiResult;
import com.accompany.common.status.BusiStatus;
import org.springframework.beans.factory.annotation.Autowired;
@@ -19,7 +19,7 @@ public class StatisService {
private StatisMapper statisMapper;
public BusiResult saveLoginInfoStatic(Long uid,String url){
Statis statis=new Statis();
statis.setStatisId(UUIDUitl.get());
statis.setStatisId(UUIDUtil.get());
statis.setUid(uid);
statis.setFromLoginUrl(url);
statis.setCreateTime(new Date());

6
accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/user/UserPacketRecordService.java
View File

@@ -3,7 +3,7 @@ package com.accompany.business.service.user;
import com.accompany.business.model.UserPacketRecord;
import com.accompany.business.mybatismapper.UserPacketRecordExpand;
import com.accompany.business.mybatismapper.UserPacketRecordMapper;
import com.accompany.common.utils.UUIDUitl;
import com.accompany.common.utils.UUIDUtil;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -24,7 +24,7 @@ public class UserPacketRecordService {
public void insertInPacketRecord(Long uid, Double money, Byte withDraw, Byte create) {
UserPacketRecord userPacketRecord = new UserPacketRecord();
userPacketRecord.setPacketId(UUIDUitl.get());
userPacketRecord.setPacketId(UUIDUtil.get());
userPacketRecord.setCreateTime(new Date());
userPacketRecord.setPacketNum(money);
userPacketRecord.setPacketStatus(create);
@@ -44,7 +44,7 @@ public class UserPacketRecordService {
public void savePacketRecordByAction(Long uid,Byte type,double randomPacketNum,String objId,Long srcUid){
Date date=new Date();
UserPacketRecord userPacketRecord=new UserPacketRecord();
userPacketRecord.setPacketId(UUIDUitl.get());
userPacketRecord.setPacketId(UUIDUtil.get());
userPacketRecord.setPacketNum(randomPacketNum);
userPacketRecord.setUid(uid);
userPacketRecord.setObjId(objId);

10
accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/user/UserShareRecordService.java
View File

@@ -19,7 +19,7 @@ import com.accompany.common.status.BusiStatus;
import com.accompany.common.utils.DateTimeUtil;
import com.accompany.common.utils.GetTimeUtils;
import com.accompany.common.utils.StringUtils;
import com.accompany.common.utils.UUIDUitl;
import com.accompany.common.utils.UUIDUtil;
import com.accompany.core.service.common.JedisService;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.collections.CollectionUtils;
@@ -66,11 +66,11 @@ public class UserShareRecordService {
public BusiResult saveUserShareRecord(Long uid, String shareType, int sharePageId, Long targetUid, String shareUrl, String ip, String deviceId) {
Date date = new Date();
BusiResult busiResult = new BusiResult(BusiStatus.SUCCESS);
String shareId = UUIDUitl.get();
String shareId = UUIDUtil.get();
UserShareRecord userShareRecord = new UserShareRecord();
userShareRecord.setShareId(shareId);
userShareRecord.setUid(uid);
userShareRecord.setShareId(UUIDUitl.get());
userShareRecord.setShareId(UUIDUtil.get());
userShareRecord.setSharePageId(sharePageId);
userShareRecord.setShareType(new Byte(shareType));
userShareRecord.setTargetUid(targetUid);
@@ -102,7 +102,7 @@ public class UserShareRecordService {
public BusiResult saveUserShareRecordTest(Long uid, String shareType, int sharePageId, Long targetUid) {
Date date = new Date();
BusiResult busiResult = new BusiResult(BusiStatus.SUCCESS);
String shareId = UUIDUitl.get();
String shareId = UUIDUtil.get();
Double result = jedisService.zincrby(RedisKey.user_sharing_days.getKey(uid.toString()), 1.0, DateTimeUtil.getTodayStr());
@@ -127,7 +127,7 @@ public class UserShareRecordService {
UserShareRecord userShareRecord = new UserShareRecord();
userShareRecord.setShareId(shareId);
userShareRecord.setUid(uid);
userShareRecord.setShareId(UUIDUitl.get());
userShareRecord.setShareId(UUIDUtil.get());
userShareRecord.setSharePageId(sharePageId);
userShareRecord.setShareType(new Byte(shareType));
userShareRecord.setTargetUid(targetUid);

7
accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/vip/VipBizService.java
View File

@@ -13,11 +13,9 @@ package com.accompany.business.service.vip;
import cn.hutool.core.util.StrUtil;
import com.accompany.business.constant.nameplate.NameplateStyleTypeEnum;
import com.accompany.business.dto.vip.VipOldDressDTO;
import com.accompany.business.model.Nameplate;
import com.accompany.business.model.NameplateAuditRecord;
import com.accompany.business.model.vip.VipAuthInfo;
import com.accompany.business.model.vip.VipAuthItem;
import com.accompany.business.model.vip.VipCustomNameplate;
import com.accompany.business.model.vip.VipInfo;
import com.accompany.business.mybatismapper.NameplateAuditRecordMapper;
import com.accompany.business.mybatismapper.vip.VipInfoMapper;
@@ -42,7 +40,7 @@ import com.accompany.common.redis.RedisKey;
import com.accompany.common.status.BusiStatus;
import com.accompany.common.utils.DateTimeUtil;
import com.accompany.common.utils.StringUtils;
import com.accompany.common.utils.UUIDUitl;
import com.accompany.common.utils.UUIDUtil;
import com.accompany.core.exception.ServiceException;
import com.accompany.core.model.Room;
import com.accompany.core.model.Users;
@@ -53,7 +51,6 @@ import com.accompany.payment.model.UserVipInfo;
import com.accompany.payment.service.UserVipInfoService;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.collections.CollectionUtils;
import org.springframework.beans.factory.annotation.Autowired;
@@ -284,7 +281,7 @@ public class VipBizService {
jsonObject.put("vipLogo", userBaseVipInfo.getVipLogo());
jsonObject.put("content", content);
attach.setData(jsonObject);
erBanNetEaseService.sendChatRoomMsg(room.getRoomId(), UUIDUitl.get(), roomUid.toString(), Constant.DefineProtocol.CUSTOM_MESS_DEFINE, JSON.toJSONString(attach));
erBanNetEaseService.sendChatRoomMsg(room.getRoomId(), UUIDUtil.get(), roomUid.toString(), Constant.DefineProtocol.CUSTOM_MESS_DEFINE, JSON.toJSONString(attach));
// 缓存最近一次时间
String feild = new StringBuilder(uid.toString()).append("-").append(roomUid).toString();
jedisService.hset(RedisKey.vip_user_room_horn_last_sendtime.getKey(), feild, String.valueOf(System.currentTimeMillis()));

4
accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/vip/VipMessageService.java
View File

@@ -25,7 +25,7 @@ import com.accompany.business.vo.vip.VipMessageVO;
import com.accompany.common.config.SystemConfig;
import com.accompany.common.constant.Attach;
import com.accompany.common.constant.Constant;
import com.accompany.common.utils.UUIDUitl;
import com.accompany.common.utils.UUIDUtil;
import com.accompany.core.model.Room;
import com.accompany.core.model.Users;
import com.alibaba.fastjson.JSON;
@@ -391,7 +391,7 @@ public class VipMessageService {
* @throws Exception
*/
private void sendSingleRoomMsg(Long roomId, Long roomUid, final String msg) throws Exception {
erBanNetEaseService.sendChatRoomMsg(roomId, UUIDUitl.get(), roomUid.toString(), Constant.DefineProtocol.CUSTOM_MESS_DEFINE, msg);
erBanNetEaseService.sendChatRoomMsg(roomId, UUIDUtil.get(), roomUid.toString(), Constant.DefineProtocol.CUSTOM_MESS_DEFINE, msg);
}
/**

8
accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/voice/VoiceService.java
View File

@@ -24,7 +24,7 @@ import com.accompany.common.redis.RedisKey;
import com.accompany.common.result.BusiResult;
import com.accompany.common.status.BusiStatus;
import com.accompany.common.utils.GetTimeUtils;
import com.accompany.common.utils.UUIDUitl;
import com.accompany.common.utils.UUIDUtil;
import com.accompany.core.base.BeanMapper;
import com.accompany.core.exception.ServiceException;
import com.accompany.core.model.Users;
@@ -135,11 +135,11 @@ public class VoiceService extends BaseService {
if(length!=null && length>=100){
logger.info("likeVoice temp_voice_like_record >100,uid={},voiceId={},type={}",uid,voiceId,type);
// 超过100个待入库的记录改用同步处理
handleDb(uid,voiceId,UUIDUitl.get(),type);
handleDb(uid,voiceId, UUIDUtil.get(),type);
}else{
// 异步处理
VoiceLikeMessage message = new VoiceLikeMessage();
message.setMessId(UUIDUitl.get());
message.setMessId(UUIDUtil.get());
message.setUid(uid);
message.setVoiceId(voiceId);
message.setLike(type);
@@ -416,7 +416,7 @@ public class VoiceService extends BaseService {
if(count > 0){
// 增加播放记录 recordId,Long uid,Long voiceId,Long voiceUid
voiceUid = voiceUid!=null?voiceUid:this.getUserVoiceById(voiceId).getUid();
insertVoicePlayRecord(UUIDUitl.get(),uid,voiceId,voiceUid);
insertVoicePlayRecord(UUIDUtil.get(),uid,voiceId,voiceUid);
}
logger.info("voice-bottle updatePlayCount end,uid={},voiceUid={},voiceId={}",uid,voiceUid,voiceId);
}

4
accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/world/WorldMessageService.java
View File

@@ -15,7 +15,7 @@ import com.accompany.common.constant.Constant;
import com.accompany.common.constant.MessageConstant;
import com.accompany.common.utils.DateTimeUtil;
import com.accompany.common.utils.StringUtils;
import com.accompany.common.utils.UUIDUitl;
import com.accompany.common.utils.UUIDUtil;
import com.accompany.core.model.Room;
import com.accompany.core.model.Users;
import com.accompany.core.service.base.BaseService;
@@ -429,7 +429,7 @@ public class WorldMessageService extends BaseService {
try {
logger.info("sendJoinSuccessChatRoomMsg notifyVo:{}",gson.toJson(notifyVo));
erBanNetEaseService.sendChatRoomMsg(room.getRoomId(),
UUIDUitl.get(), room.getUid().toString(), Constant.DefineProtocol.CUSTOM_MESS_DEFINE, gson.toJson(attach), null);
UUIDUtil.get(), room.getUid().toString(), Constant.DefineProtocol.CUSTOM_MESS_DEFINE, gson.toJson(attach), null);
} catch (Exception e) {
// 报错不做处理
logger.error("sendJoinSuccessChatRoomMsg error.roomUid:{},uid:{},world:{}",roomUid,uid,gson.toJson(world));

14
accompany-business/accompany-business-web/src/main/java/com/accompany/business/controller/ChargeController.java
View File

@@ -3,27 +3,20 @@ package com.accompany.business.controller;
import com.accompany.business.common.BaseController;
import com.accompany.business.service.ChargeAreaService;
import com.accompany.business.service.ChargeService;
import com.accompany.business.vo.WeChatMiniAppPayResponseVO;
import com.accompany.common.constant.Constant;
import com.accompany.common.device.DeviceInfo;
import com.accompany.common.result.BusiResult;
import com.accompany.common.status.BusiStatus;
import com.accompany.common.utils.AppUtils;
import com.accompany.common.utils.CommonUtil;
import com.accompany.common.utils.IPUitls;
import com.accompany.common.utils.IPUtils;
import com.accompany.core.exception.ServiceException;
import com.accompany.core.model.Users;
import com.accompany.core.service.SysConfService;
import com.accompany.core.service.user.UsersBaseService;
import com.accompany.payment.vo.ChargeAreaInfoVO;
import com.accompany.payment.vo.ChargePageVO;
import io.swagger.annotations.Api;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.util.StringUtils;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
import javax.servlet.http.HttpServletRequest;
@@ -31,9 +24,6 @@ import javax.validation.constraints.NotBlank;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.Objects;
import static com.accompany.common.constant.Constant.SysConfId.*;
/**
* Created by liuguofu on 2017/6/27.
@@ -112,7 +102,7 @@ public class ChargeController extends BaseController {
log.info("applyCharge3,uid:{},chargeProdId:{},payChannel:{}, roomUid:{}, paymentType:{}, countryCode:{}",
uid,chargeProdId,payChannel, roomUid, paymentType, countryCode);
DeviceInfo deviceInfo = getDeviceInfo(request);
String clientIp = IPUitls.getRealIpAddress(request);
String clientIp = IPUtils.getRealIpAddress(request);
Object result = chargeService.applyChargeV4(uid, chargeProdId, payChannel, clientIp, successUrl, openId, deviceInfo, roomUid, chargeMoney, paymentType, countryCode);
return new BusiResult<>(result);
}

4
accompany-business/accompany-business-web/src/main/java/com/accompany/business/controller/SmsController.java
View File

@@ -7,7 +7,7 @@ import com.accompany.common.device.DeviceInfo;
import com.accompany.common.result.BusiResult;
import com.accompany.common.status.BusiStatus;
import com.accompany.common.utils.CommonUtil;
import com.accompany.common.utils.IPUitls;
import com.accompany.common.utils.IPUtils;
import com.accompany.core.exception.ServiceException;
import com.accompany.core.model.Users;
import com.accompany.core.model.phone.PhoneAuthApplyRecord;
@@ -59,7 +59,7 @@ public class SmsController extends BaseController {
public BusiResult getCode(@RequestParam("mobile") String mobile,String phoneAreaCode,
@RequestParam("type") Integer type, HttpServletRequest request) {
mobile = decryptSensitiveInfo(request, mobile);
String ip = IPUitls.getRealIpAddress(request);
String ip = IPUtils.getRealIpAddress(request);
DeviceInfo deviceInfo = getDeviceInfo(request);
Long uid = getUid(request);
logger.info("sendSmsCode1, mobile:{}, type:{}, uid:{}", mobile, type, uid);

4
accompany-business/accompany-business-web/src/main/java/com/accompany/business/controller/activity/ChargeActivityVisitLogController.java
View File

@@ -3,7 +3,7 @@ package com.accompany.business.controller.activity;
import com.accompany.business.constant.OsEnum;
import com.accompany.business.model.ChargeActivityVisitLog;
import com.accompany.business.service.activity.ChargeActivityVisitLogService;
import com.accompany.common.utils.IPUitls;
import com.accompany.common.utils.IPUtils;
import com.accompany.business.common.BaseController;
import com.accompany.common.result.BusiResult;
import com.accompany.common.status.BusiStatus;
@@ -44,7 +44,7 @@ public class ChargeActivityVisitLogController extends BaseController {
ChargeActivityVisitLog record = new ChargeActivityVisitLog();
record.setActId(actId);
record.setDeviceId(deviceId);
record.setIp(IPUitls.getRealIpAddress(request));
record.setIp(IPUtils.getRealIpAddress(request));
record.setPlatform(OsEnum.getByName(os).getType());
record.setType(type);
record.setUid(uid);

6
accompany-business/accompany-business-web/src/main/java/com/accompany/business/controller/apppay/GooglePlayBillingChargeController.java
View File

@@ -1,12 +1,10 @@
package com.accompany.business.controller.apppay;
import com.accompany.business.common.BaseController;
import com.accompany.business.service.ChargeService;
import com.accompany.common.annotation.Authorization;
import com.accompany.common.device.DeviceInfo;
import com.accompany.common.utils.IPUitls;
import com.accompany.common.utils.IPUtils;
import com.accompany.core.enumeration.BusinessStatusCodeEnum;
import com.accompany.core.vo.BaseRequestVO;
import com.accompany.core.vo.BaseResponseVO;
import com.accompany.payment.dto.AppInnerPayRecordDTO;
import com.accompany.business.service.payment.GooglePlayBillingService;
@@ -34,7 +32,7 @@ public class GooglePlayBillingChargeController extends BaseController {
//@Authorization
public BaseResponseVO<AppInnerPayRecordDTO> placeOrder(String chargeProdId, HttpServletRequest request) {
Long uid = getUid(request);
String clientIp = IPUitls.getRealIpAddress(request);
String clientIp = IPUtils.getRealIpAddress(request);
DeviceInfo deviceInfo = getDeviceInfo(request);
AppInnerPayRecordDTO appInnerPayRecordDTO = googlePlayBillingService.placeOrder(uid, chargeProdId, clientIp, deviceInfo);

6
accompany-business/accompany-business-web/src/main/java/com/accompany/business/controller/certification/UserCertificationController.java
View File

@@ -2,7 +2,7 @@ package com.accompany.business.controller.certification;
import com.accompany.business.common.BaseController;
import com.accompany.common.utils.DESUtils;
import com.accompany.common.utils.IPUitls;
import com.accompany.common.utils.IPUtils;
import com.accompany.core.util.KeyStore;
import com.aliyuncs.exceptions.ClientException;
import com.accompany.core.exception.ServiceException;
@@ -63,7 +63,7 @@ public class UserCertificationController extends BaseController {
return new BusiResult(BusiStatus.SERVER_BUSY);
}
String ip = IPUitls.getRealIpAddress(request);
String ip = IPUtils.getRealIpAddress(request);
try{
this.twoFactorCertifyService.sendCertificationCode(phone, uid, ip, deviceInfo);
}catch (ServiceException e){
@@ -131,7 +131,7 @@ public class UserCertificationController extends BaseController {
}
Map<String, String> data = Maps.newHashMap();
DeviceInfo deviceInfo = getDeviceInfo(request);
String ip = IPUitls.getRealIpAddress(request);
String ip = IPUtils.getRealIpAddress(request);
try{
data.put("token", this.realPeopleCertifyService.getAliyunRPBioOnlyToken(uid, username, identityNumber, phone, code, deviceInfo, ip));

4
accompany-business/accompany-business-web/src/main/java/com/accompany/business/controller/charge/LuckyTarotChargeController.java
View File

@@ -6,7 +6,7 @@ import com.accompany.common.annotation.Authorization;
import com.accompany.common.constant.Constant;
import com.accompany.common.device.DeviceInfo;
import com.accompany.common.utils.AppVersionUtil;
import com.accompany.common.utils.IPUitls;
import com.accompany.common.utils.IPUtils;
import com.accompany.common.utils.StringUtils;
import com.accompany.core.enumeration.BusinessStatusCodeEnum;
import com.accompany.core.vo.BaseRequestVO;
@@ -54,7 +54,7 @@ public class LuckyTarotChargeController extends BaseController {
if (AppVersionUtil.compareVersion(Constant.LUCKY_TAROT_LIMIT_APP_VERSION, appVersion) > 0) {
return new BaseResponseVO(BusinessStatusCodeEnum.VERSIONTOLOW);
}
String clientIp = IPUitls.getRealIpAddress(request);
String clientIp = IPUtils.getRealIpAddress(request);
luckyTarotChargeService.checkLuckyTarotIsOpen();
return luckyTarotChargeService.tarotCharge(uid,roomUid,cardList,chargeProdId,
Constant.ChargeChannel.lucky_tarot,clientIp, successUrl, deviceInfo);

4
accompany-business/accompany-business-web/src/main/java/com/accompany/business/controller/charge/RedeemCodeController.java
View File

@@ -2,7 +2,7 @@ package com.accompany.business.controller.charge;
import com.accompany.business.model.RedeemCode;
import com.accompany.business.service.charge.RedeemCodeService;
import com.accompany.common.utils.IPUitls;
import com.accompany.common.utils.IPUtils;
import com.accompany.core.service.common.JedisService;
import com.accompany.business.common.BaseController;
import com.google.common.collect.Lists;
@@ -56,7 +56,7 @@ public class RedeemCodeController extends BaseController {
}
// 限制同一IP的访问次数
String clientIp = IPUitls.getRealIpAddress(request);
String clientIp = IPUtils.getRealIpAddress(request);
String ipCountKey = RedisKey.redeem_code_ip.getKey(DateTimeUtil.getTodayStr() + "_" + clientIp);
Long ipCount = jedisService.incr(ipCountKey);
if (ipCount != null && ipCount > 1000) {

6
accompany-business/accompany-business-web/src/main/java/com/accompany/business/controller/home/ClientController.java
View File

@@ -21,12 +21,10 @@ import com.accompany.business.vo.PropVo;
import com.accompany.common.annotation.Authorization;
import com.accompany.common.config.SystemConfig;
import com.accompany.common.config.TencentTRCTConfig;
import com.accompany.common.constant.ApplicationConstant;
import com.accompany.common.constant.Constant;
import com.accompany.common.device.DeviceInfo;
import com.accompany.common.result.BusiResult;
import com.accompany.common.status.BusiStatus;
import com.accompany.common.utils.IPUitls;
import com.accompany.common.utils.IPUtils;
import com.accompany.core.model.Users;
import com.accompany.core.service.SysConfService;
import com.accompany.core.vo.SplashVo;
@@ -261,7 +259,7 @@ public class ClientController extends BaseController {
record.setInitTime(date);
record.setUpdateTime(date);
String ipAddress = IPUitls.getRealIpAddress(request);
String ipAddress = IPUtils.getRealIpAddress(request);
record.setInitIp(ipAddress);
//todo--需要定时清理(三个月)

4
accompany-business/accompany-business-web/src/main/java/com/accompany/business/controller/juliang/JuLiangAdController.java
View File

@@ -17,7 +17,7 @@ import com.accompany.business.service.ad.AdPlatformStrategyFactory;
import com.accompany.business.service.ad.IAdPlatformStrategy;
import com.accompany.business.service.juliang.JuLiangService;
import com.accompany.business.util.AdPlatformUtil;
import com.accompany.common.utils.IPUitls;
import com.accompany.common.utils.IPUtils;
import com.accompany.core.enumeration.BusinessStatusCodeEnum;
import com.accompany.core.enumeration.PublicHeaderParamEnum;
import com.accompany.core.vo.BaseResponseVO;
@@ -76,7 +76,7 @@ public class JuLiangAdController extends BaseController {
params.setAndroidId(androidId);
params.setOaId(oaid);
params.setIdfa(idfa);
params.setIp(IPUitls.getRealIpAddress(request));
params.setIp(IPUtils.getRealIpAddress(request));
IAdPlatformStrategy strategy = adPlatfromStategyFactory.getInstance(channel);
strategy.activeTrack(params);
return new BaseResponseVO(BusinessStatusCodeEnum.SUCCESS);

4
accompany-business/accompany-business-web/src/main/java/com/accompany/business/controller/user/UserShareRecordController.java
View File

@@ -5,7 +5,7 @@ import com.accompany.business.service.user.UserShareRecordService;
import com.accompany.common.device.DeviceInfo;
import com.accompany.common.result.BusiResult;
import com.accompany.common.status.BusiStatus;
import com.accompany.common.utils.IPUitls;
import com.accompany.common.utils.IPUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
@@ -48,7 +48,7 @@ public class UserShareRecordController {
busiResult.setMessage("参数异常");
return busiResult;
}
String ip = IPUitls.getRealIpAddress(request);
String ip = IPUtils.getRealIpAddress(request);
busiResult=userShareRecordService.saveUserShareRecord(uid,shareType,sharePageId,targetUid, shareUrl,ip,deviceInfo==null?null:deviceInfo.getDeviceId());
return busiResult;
}

4
accompany-business/accompany-business-web/src/main/java/com/accompany/business/interceptor/SecurityInterceptor.java
View File

@@ -2,7 +2,7 @@ package com.accompany.business.interceptor;
import com.accompany.common.constant.ApplicationConstant;
import com.accompany.common.redis.RedisKey;
import com.accompany.common.utils.IPUitls;
import com.accompany.common.utils.IPUtils;
import com.accompany.core.service.common.JedisService;
import com.accompany.core.util.KeyStore;
import com.accompany.core.util.MD5;
@@ -42,7 +42,7 @@ public class SecurityInterceptor extends BasicInterceptor {
}
// 检查 IP 是否被封禁
String ip = IPUitls.getRealIpAddress(request);
String ip = IPUtils.getRealIpAddress(request);
if (this.jedisService.sismember(RedisKey.global_block_ip.getKey(), ip)) {
logger.warn("IP {} 被封禁，不允许访问", ip);
return false;

6
accompany-business/accompany-business-web/src/test/java/servicetest/CrossRoomPkTest.java
View File

@@ -27,7 +27,7 @@ import com.accompany.common.device.DeviceInfo;
import com.accompany.common.netease.neteaseacc.result.RoomRet;
import com.accompany.common.redis.RedisKey;
import com.accompany.common.utils.DateTimeUtil;
import com.accompany.common.utils.UUIDUitl;
import com.accompany.common.utils.UUIDUtil;
import com.accompany.core.exception.ServiceException;
import com.accompany.core.model.Account;
import com.accompany.core.model.Room;
@@ -178,9 +178,9 @@ public class CrossRoomPkTest extends CommonTest {
String attachStr=gson.toJson(attach);
erBanNetEaseService.sendChatRoomMsg(room.getRoomId(), UUIDUitl.get(), room.getUid().toString(), Constant.DefineProtocol.CUSTOM_MESS_DEFINE, attachStr, 1);
erBanNetEaseService.sendChatRoomMsg(room.getRoomId(), UUIDUtil.get(), room.getUid().toString(), Constant.DefineProtocol.CUSTOM_MESS_DEFINE, attachStr, 1);
//room = roomService.getRoomByUid(938286l);
//erBanNetEaseService.sendChatRoomMsg(room.getRoomId(), UUIDUitl.get(), room.getUid().toString(), Constant.DefineProtocol.CUSTOM_MESS_DEFINE, attachStr, 1);
//erBanNetEaseService.sendChatRoomMsg(room.getRoomId(), UUIDUtil.get(), room.getUid().toString(), Constant.DefineProtocol.CUSTOM_MESS_DEFINE, attachStr, 1);
System.out.println("结束测试...");

6
accompany-oauth2/accompany-oauth2-service/src/main/java/com/accompany/oauth2/service/account/AccountH5LoginService.java
View File

@@ -8,7 +8,7 @@ import com.accompany.common.exception.BusinessException;
import com.accompany.common.redis.RedisKey;
import com.accompany.common.status.BusiStatus;
import com.accompany.common.utils.CommonUtil;
import com.accompany.common.utils.UUIDUitl;
import com.accompany.common.utils.UUIDUtil;
import com.accompany.core.base.SpringContextHolder;
import com.accompany.core.exception.ServiceException;
import com.accompany.core.model.Account;
@@ -81,7 +81,7 @@ public class AccountH5LoginService {
//获取授权码
public String getAuthCode() {
String code = UUIDUitl.get();
String code = UUIDUtil.get();
// 设置code至缓存且设置有效期
jedisService.write(RedisKey.h5_login_code.getKey(code), "null", CODE_EXPIRE_TIME);
return code;
@@ -108,7 +108,7 @@ public class AccountH5LoginService {
* @param uid
*/
public void h5AuthLogin(String code, Long uid, String ip, String os, String appVersion, String deviceId) throws Exception {
String loginToken = UUIDUitl.get();
String loginToken = UUIDUtil.get();
jedisService.set(RedisKey.h5_login_code.getKey(code), loginToken);
jedisService.write(RedisKey.h5_login_token.getKey(loginToken), uid.toString(), CODE_EXPIRE_TIME);
AccountH5LoginRecord accountH5LoginRecord = this.buildRecord(uid, Constant.LoginAppType.ExchangeSys, ip, os, appVersion, deviceId);

8
accompany-oauth2/accompany-oauth2-service/src/main/java/com/accompany/oauth2/service/account/AccountManageService.java
View File

@@ -10,7 +10,7 @@ import com.accompany.common.status.BusiStatus;
import com.accompany.common.utils.BlankUtil;
import com.accompany.common.utils.CommonUtil;
import com.accompany.common.utils.DateTimeUtil;
import com.accompany.common.utils.UUIDUitl;
import com.accompany.common.utils.UUIDUtil;
import com.accompany.core.constant.BlockTypeEnum;
import com.accompany.core.exception.ServiceException;
import com.accompany.core.model.Account;
@@ -134,7 +134,7 @@ public class AccountManageService {
Date date = new Date();
account = new Account();
account.setNeteaseToken(UUIDUitl.get());
account.setNeteaseToken(UUIDUtil.get());
account.setLastLoginTime(date);
account.setUpdateTime(date);
account.setRegisterIp(ipAddress);
@@ -228,7 +228,7 @@ public class AccountManageService {
if(!StringUtils.isEmpty(password)){
account.setPassword(encryptPassword(password));
}
account.setNeteaseToken(UUIDUitl.get());
account.setNeteaseToken(UUIDUtil.get());
account.setLastLoginTime(date);
account.setUpdateTime(date);
account.setRegisterIp(ipAddress);
@@ -283,7 +283,7 @@ public class AccountManageService {
Account account = new Account();
account.setErbanNo(Constant.Visitor.visitorErbanNo);
account.setPassword(encryptPassword(password));
account.setNeteaseToken(UUIDUitl.get());
account.setNeteaseToken(UUIDUtil.get());
account.setLastLoginTime(date);
account.setUpdateTime(date);
account.setSignTime(date);

4
accompany-oauth2/accompany-oauth2-web/src/main/java/com/accompany/oauth2/controller/AccountController.java
View File

@@ -139,7 +139,7 @@ public class AccountController extends BaseController {
String verifyCode, DeviceInfo deviceInfo, HttpServletRequest request, String token,
Double gpsLongitude, Double gpsLatitude, String phoneAreaCode) {
phone = decryptSensitiveInfo(request, phone);
String ipAddress = IPUitls.getRealIpAddress(request);
String ipAddress = IPUtils.getRealIpAddress(request);
accountManageService.checkSystemBlock(phone, deviceInfo.getDeviceId(), ipAddress);
// 加入密码DES解密
@@ -364,7 +364,7 @@ public class AccountController extends BaseController {
if (StringUtils.isEmpty(openid) || type == 0) {
throw new RuntimeException("参数异常");
}
String ipAddress= IPUitls.getRealIpAddress(request);
String ipAddress= IPUtils.getRealIpAddress(request);
UserDetails userDetails = myUserDetailsService.loadUserByOpenId(openid, type.byteValue(), deviceInfo, ipAddress, unionId);
myUserDetailsService.login(null, userDetails, LoginTypeEnum.get(type), deviceInfo, ipAddress, openid, unionId,null);

6
accompany-oauth2/accompany-oauth2-web/src/main/java/com/accompany/oauth2/controller/H5LoginController.java
View File

@@ -6,7 +6,7 @@ import com.accompany.common.exception.ApiException;
import com.accompany.common.exception.BusinessException;
import com.accompany.common.result.BusiResult;
import com.accompany.common.status.BusiStatus;
import com.accompany.common.utils.IPUitls;
import com.accompany.common.utils.IPUtils;
import com.accompany.common.utils.StringUtils;
import com.accompany.oauth2.common.BaseController;
import com.accompany.oauth2.exception.CustomOAuth2Exception;
@@ -48,7 +48,7 @@ public class H5LoginController extends BaseController {
public BusiResult<Void> loginAuthorizedByH5(HttpServletRequest request, @RequestParam String code, @RequestParam Long uid, @RequestBody DeviceInfo deviceInfo) {
log.info("h5 authorized login params is: code={},uid={},deviceInfo={}", code, uid, JSONObject.toJSON(deviceInfo));
try {
String ip = IPUitls.getRealIpAddress(request);
String ip = IPUtils.getRealIpAddress(request);
this.accountH5LoginService.h5AuthLogin(code, uid, ip, deviceInfo.getOs(), deviceInfo.getAppVersion(), deviceInfo.getDeviceId());
return new BusiResult<>(BusiStatus.SUCCESS);
} catch (CustomOAuth2Exception e) {
@@ -142,7 +142,7 @@ public class H5LoginController extends BaseController {
public BusiResult<Void> registerByPhone(String phoneAreaCode, String mobile, String code, String inviteCode, Long inviteUid, HttpServletRequest request) {
log.info("h5 registerByPhone, mobile:{}, code:{}, inviteCode: {}", mobile, code, inviteCode);
DeviceInfo deviceInfo = getDeviceInfo(request);
String ipAddress = IPUitls.getRealIpAddress(request);
String ipAddress = IPUtils.getRealIpAddress(request);
accountH5LoginService.register(mobile, code, inviteCode, inviteUid, deviceInfo, ipAddress, phoneAreaCode);
return new BusiResult<>(BusiStatus.SUCCESS);
}

4
accompany-oauth2/accompany-oauth2-web/src/main/java/com/accompany/oauth2/controller/TicketController.java
View File

@@ -5,7 +5,7 @@ import com.accompany.common.device.DeviceInfo;
import com.accompany.common.result.BusiResult;
import com.accompany.common.status.BusiStatus;
import com.accompany.common.utils.AppVersionUtil;
import com.accompany.common.utils.IPUitls;
import com.accompany.common.utils.IPUtils;
import com.accompany.core.exception.ServiceException;
import com.accompany.core.model.Account;
import com.accompany.core.model.AccountLoginRecord;
@@ -68,7 +68,7 @@ public class TicketController extends BaseController {
ticketRes.setAccid((String) ticketsMap.get("accid"));
ticketRes.setNetEaseToken((String) ticketsMap.get("netEaseToken"));
ticketRes.setUid((Long) ticketsMap.get("uid"));
String ipAddress = IPUitls.getRealIpAddress(request);
String ipAddress = IPUtils.getRealIpAddress(request);
saveLoginRecord((Long) ticketsMap.get("uid"), ipAddress, deviceInfo);
return new BusiResult<>(ticketRes);
}

4
accompany-oauth2/accompany-oauth2-web/src/main/java/com/accompany/oauth2/interceptor/SecurityInterceptor.java
View File

@@ -2,7 +2,7 @@ package com.accompany.oauth2.interceptor;
import com.accompany.common.constant.ApplicationConstant;
import com.accompany.common.redis.RedisKey;
import com.accompany.common.utils.IPUitls;
import com.accompany.common.utils.IPUtils;
import com.accompany.common.utils.StringUtils;
import com.accompany.core.service.common.JedisService;
import com.accompany.core.util.KeyStore;
@@ -42,7 +42,7 @@ public class SecurityInterceptor extends BasicInterceptor {
}
// 检查 IP 是否被封禁
String ip = IPUitls.getRealIpAddress(request);
String ip = IPUtils.getRealIpAddress(request);
if (this.jedisService.sismember(RedisKey.global_block_ip.getKey(), ip)){
logger.warn("IP {} 被封禁，不允许访问", ip);
return false;

4
xuanyin-game-match/xuanyin-game-match-service/src/main/java/com/xuanyin/gamematch/service/impl/GameManageBillRecordServiceImpl.java
View File

@@ -2,7 +2,7 @@ package com.xuanyin.gamematch.service.impl;
import com.accompany.common.constant.Constant;
import com.accompany.common.utils.StringUtils;
import com.accompany.common.utils.UUIDUitl;
import com.accompany.common.utils.UUIDUtil;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -37,7 +37,7 @@ public class GameManageBillRecordServiceImpl extends ServiceImpl<GameManageBillR
@Override
public String addBillRecord(Long uid, Long targetUid, GameBillTypeEnum billType, String objId, GameBillObjTypeEnum billObjType, BigDecimal amount, GameManageCurrencyEnum currency, String remark) {
GameManageBillRecord billRecord = new GameManageBillRecord();
billRecord.setBillId(UUIDUitl.get());
billRecord.setBillId(UUIDUtil.get());
billRecord.setUid(uid);
billRecord.setTargetUid(targetUid);
billRecord.setBillType(billType.getValue());

6
xuanyin-game-match/xuanyin-game-match-service/src/main/java/com/xuanyin/gamematch/service/impl/GameManageTicketServiceImpl.java
View File

@@ -4,7 +4,7 @@ import com.accompany.common.constant.Constant;
import com.accompany.common.redis.RedisKey;
import com.accompany.common.status.BusiStatus;
import com.accompany.common.utils.StringUtils;
import com.accompany.common.utils.UUIDUitl;
import com.accompany.common.utils.UUIDUtil;
import com.accompany.core.exception.ServiceException;
import com.accompany.core.service.common.JedisLockService;
import com.accompany.core.service.common.JedisService;
@@ -185,7 +185,7 @@ public class GameManageTicketServiceImpl extends ServiceImpl<GameManageTicketMap
private GameTicketBuyRecord doPreOrder(BuyTicketReqParams params, GameManageTicket onSaleTicket) {
GameTicketBuyRecord record = new GameTicketBuyRecord();
record.setRecordId(UUIDUitl.get());
record.setRecordId(UUIDUtil.get());
record.setUid(params.getUid());
record.setTicketId(onSaleTicket.getTicketId());
record.setTicketType(GameTicketTypeEnum.GAME_TICKET.getValue());
@@ -322,7 +322,7 @@ public class GameManageTicketServiceImpl extends ServiceImpl<GameManageTicketMap
private void addUserBillRecord(GameTicketBuyRecord buyRecord, String remark) {
GameManageBillRecord billRecord = new GameManageBillRecord();
billRecord.setBillId(UUIDUitl.get());
billRecord.setBillId(UUIDUtil.get());
billRecord.setUid(buyRecord.getUid());
billRecord.setTargetUid(buyRecord.getUid());
billRecord.setBillType(GameBillTypeEnum.OUT.getValue());

4
xuanyin-game-match/xuanyin-game-match-service/src/main/java/com/xuanyin/gamematch/service/impl/GameManageWithdrawServiceImpl.java
View File

@@ -4,7 +4,7 @@ import com.accompany.common.redis.RedisKey;
import com.accompany.common.status.BusiStatus;
import com.accompany.common.utils.DateTimeUtil;
import com.accompany.common.utils.GetTimeUtils;
import com.accompany.common.utils.UUIDUitl;
import com.accompany.common.utils.UUIDUtil;
import com.accompany.core.exception.ServiceException;
import com.accompany.core.service.common.JedisLockService;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -105,7 +105,7 @@ public class GameManageWithdrawServiceImpl implements GameManageWithdrawService
private GameManageWithdrawRecord insertWithdraw(WithdrawReqParams params, BigDecimal cashNum) {
Date current = Calendar.getInstance().getTime();
GameManageWithdrawRecord withdraw = new GameManageWithdrawRecord();
withdraw.setId(UUIDUitl.get());
withdraw.setId(UUIDUtil.get());
withdraw.setUid(params.getUid());
withdraw.setPlatformNo(params.getPlatformNo());
withdraw.setNick(params.getNick());