diff --git a/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/RoomAddPersonService.java b/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/RoomAddPersonService.java index bd0288b30..e0e225167 100644 --- a/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/RoomAddPersonService.java +++ b/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/RoomAddPersonService.java @@ -1,6 +1,5 @@ package com.accompany.admin.service; -import com.beust.jcommander.internal.Lists; import com.accompany.core.model.Room; import com.accompany.core.model.Users; import com.accompany.core.mybatismapper.RoomMapper; @@ -8,6 +7,7 @@ import com.accompany.business.service.ErBanNetEaseService; import com.accompany.core.service.common.JedisService; import com.accompany.core.service.user.UsersBaseService; import com.accompany.business.service.user.UsersService; +import com.google.common.collect.Lists; import com.google.common.reflect.TypeToken; import com.google.gson.Gson; import com.accompany.common.constant.Constant; @@ -21,8 +21,6 @@ import java.util.Map; @Service public class RoomAddPersonService { - @Autowired - private UsersService usersService; @Autowired private UsersBaseService usersBaseService; @Autowired diff --git a/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/activity/impl/ActCallBattleAdminServiceImpl.java b/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/activity/impl/ActCallBattleAdminServiceImpl.java index 148b36582..f60c9ecc2 100644 --- a/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/activity/impl/ActCallBattleAdminServiceImpl.java +++ b/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/activity/impl/ActCallBattleAdminServiceImpl.java @@ -10,6 +10,7 @@ */ package com.accompany.admin.service.activity.impl; +import cn.hutool.core.collection.CollectionUtil; import com.accompany.admin.mapper.callbattle.ActCallBattleAdminMapper; import com.accompany.admin.params.ActCallBattleItemSaveReqParams; import com.accompany.admin.service.activity.ActCallBattleAdminService; @@ -35,8 +36,7 @@ import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import org.springframework.util.CollectionUtils; -import org.springside.modules.utils.collection.CollectionUtil; +import org.springframework.util.CollectionUtils;; import java.util.*; import java.util.regex.Matcher; diff --git a/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/activity/impl/LuckySeaActAdminServiceImpl.java b/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/activity/impl/LuckySeaActAdminServiceImpl.java index 02adcda27..c644456d6 100644 --- a/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/activity/impl/LuckySeaActAdminServiceImpl.java +++ b/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/activity/impl/LuckySeaActAdminServiceImpl.java @@ -10,6 +10,7 @@ */ package com.accompany.admin.service.activity.impl; +import cn.hutool.core.collection.CollectionUtil; import com.accompany.admin.mapper.LuckySeaActAdminMapper; import com.accompany.admin.params.LuckySeaItemSaveReqParams; import com.accompany.admin.service.activity.LuckySeaActAdminService; @@ -38,7 +39,6 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import org.springframework.util.CollectionUtils; -import org.springside.modules.utils.collection.CollectionUtil; import java.util.*; import java.util.regex.Matcher; diff --git a/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/gamemanage/GameBillRecordAdminService.java b/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/gamemanage/GameBillRecordAdminService.java index e06a503de..a46f1658e 100644 --- a/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/gamemanage/GameBillRecordAdminService.java +++ b/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/gamemanage/GameBillRecordAdminService.java @@ -3,13 +3,12 @@ package com.accompany.admin.service.gamemanage; import com.accompany.admin.vo.gamemanage.GameBillRecordVO; import com.accompany.common.utils.BlankUtil; import com.accompany.common.utils.DateTimeUtil; -import com.accompany.core.enumeration.BillObjTypeEnum; import com.accompany.core.model.Users; import com.accompany.core.service.user.UsersBaseService; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.beust.jcommander.internal.Lists; +import com.google.common.collect.Lists; import com.xuanyin.gamematch.constants.GameBillObjTypeEnum; import com.xuanyin.gamematch.constants.GameBillTypeEnum; import com.xuanyin.gamematch.constants.GameManageCurrencyEnum; diff --git a/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/gamemanage/GameManageQuickGameAdminService.java b/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/gamemanage/GameManageQuickGameAdminService.java index a98292001..38e5b433f 100644 --- a/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/gamemanage/GameManageQuickGameAdminService.java +++ b/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/gamemanage/GameManageQuickGameAdminService.java @@ -28,7 +28,6 @@ import com.accompany.core.model.UsersExample; import com.accompany.core.mybatismapper.UsersMapper; import com.accompany.core.service.user.UsersBaseService; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.beust.jcommander.internal.Lists; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; import com.xuanyin.gamematch.constants.GameManageInfoStatusEnum; diff --git a/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/linearly/LinearlyPoolDataAdminService.java b/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/linearly/LinearlyPoolDataAdminService.java index 05c61e197..10c2ad029 100644 --- a/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/linearly/LinearlyPoolDataAdminService.java +++ b/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/linearly/LinearlyPoolDataAdminService.java @@ -186,7 +186,7 @@ public class LinearlyPoolDataAdminService extends BaseService { return res; } - List list = com.beust.jcommander.internal.Lists.newArrayList(); + List list = Lists.newArrayList(); List dateList = DateTimeUtil.getBetweenDates(startDate,endDate,false); // 通过截取的日期区间进行分页功能 int startIndex = (params.getPageNum() - 1) * params.getPageSize(); diff --git a/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/nameplate/NameplateAdminService.java b/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/nameplate/NameplateAdminService.java index b45522c34..a47ba929b 100644 --- a/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/nameplate/NameplateAdminService.java +++ b/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/nameplate/NameplateAdminService.java @@ -46,7 +46,6 @@ import org.springframework.core.io.ClassPathResource; import org.springframework.stereotype.Service; import org.springframework.util.CollectionUtils; import org.springframework.util.StopWatch; -import org.springside.modules.utils.collection.CollectionUtil; import javax.imageio.ImageIO; import javax.imageio.stream.ImageOutputStream; @@ -61,7 +60,6 @@ import java.util.*; import java.util.concurrent.CountDownLatch; import java.util.concurrent.ExecutorService; import java.util.concurrent.Executors; -import java.util.stream.Collectors; /** * Created By LeeNana on 2020/3/17. diff --git a/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/prize/DrawLotteryRecordAdminService.java b/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/prize/DrawLotteryRecordAdminService.java index e31df2b54..6eba352ce 100644 --- a/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/prize/DrawLotteryRecordAdminService.java +++ b/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/prize/DrawLotteryRecordAdminService.java @@ -2,7 +2,6 @@ package com.accompany.admin.service.prize; import com.accompany.core.model.Users; import com.accompany.core.service.user.UsersBaseService; -import com.beust.jcommander.internal.Lists; import com.accompany.admin.dto.DrawLotteryRecordDto; import com.accompany.admin.mapper.DrawLotteryRecordMapperExpand; import com.accompany.admin.service.base.BaseService; @@ -10,6 +9,7 @@ import com.accompany.admin.vo.DrawLotteryRecordStatisVo; import com.accompany.business.service.box.OpenDiamondBoxService; import com.accompany.business.service.box.OpenNormalBoxService; import com.accompany.common.utils.DateTimeUtil; +import com.google.common.collect.Lists; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; diff --git a/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/room/template/ResetRoomTemplateAbstract.java b/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/room/template/ResetRoomTemplateAbstract.java index df3821cdb..1dd8b43bd 100644 --- a/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/room/template/ResetRoomTemplateAbstract.java +++ b/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/room/template/ResetRoomTemplateAbstract.java @@ -30,7 +30,7 @@ import com.accompany.core.service.common.JedisService; import com.accompany.core.util.StringUtils; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; -import com.beust.jcommander.internal.Lists; +import com.google.common.collect.Lists; import com.google.gson.Gson; import org.apache.commons.collections.CollectionUtils; import org.slf4j.Logger; @@ -331,7 +331,7 @@ public abstract class ResetRoomTemplateAbstract implements ResetRoomTeamplateHoo List auths = getHallAuths(roles,null); if (!CollectionUtils.isEmpty(auths)) { - List memberAuths = Lists.newArrayList(auths.size()); + List memberAuths = Lists.newArrayList(); auths.stream().forEach(auth -> { HallMemberAuth memberAuth = hallAuthService.converToHallMemberAuth(auth, uid, Constant.HallAuthStatus.AUTH_EXISTS); memberAuths.add(memberAuth); @@ -440,7 +440,7 @@ public abstract class ResetRoomTemplateAbstract implements ResetRoomTeamplateHoo return getHallAuths(auths,roles,isNeedSet); } else { - List auths = Lists.newArrayList(authsCache.size()); + List auths = Lists.newArrayList(); authsCache.stream().forEach(auth -> { auths.add(JSON.parseObject(auth, HallAuth.class)); }); diff --git a/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/seekelfin/SeekElfinAdminService.java b/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/seekelfin/SeekElfinAdminService.java index cc46e2ac9..940b15066 100644 --- a/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/seekelfin/SeekElfinAdminService.java +++ b/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/seekelfin/SeekElfinAdminService.java @@ -1,5 +1,6 @@ package com.accompany.admin.service.seekelfin; +import cn.hutool.core.collection.CollectionUtil; import com.accompany.admin.mapper.SeekElfinAdminMapper; import com.accompany.admin.vo.seekelfin.SeekElfinAdminPlatformStatVo; import com.accompany.admin.vo.seekelfin.SeekElfinAdminProdVo; @@ -25,7 +26,6 @@ import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; import org.springframework.util.CollectionUtils; -import org.springside.modules.utils.collection.CollectionUtil; import java.util.*; import java.util.stream.Collectors; diff --git a/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/user/BillRecordAdminService.java b/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/user/BillRecordAdminService.java index 80930f063..4ae7fbe76 100644 --- a/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/user/BillRecordAdminService.java +++ b/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/user/BillRecordAdminService.java @@ -21,7 +21,7 @@ import com.accompany.sharding.vo.BillRecordGroupVo; import com.alibaba.excel.EasyExcel; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.beust.jcommander.internal.Lists; +import com.google.common.collect.Lists; import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; diff --git a/accompany-admin/accompany-admin-web/src/main/resources/application-native.yml b/accompany-admin/accompany-admin-web/src/main/resources/application-native.yml index 41fa78170..7ab834cc8 100644 --- a/accompany-admin/accompany-admin-web/src/main/resources/application-native.yml +++ b/accompany-admin/accompany-admin-web/src/main/resources/application-native.yml @@ -10,8 +10,7 @@ spring: minimum-idle: 10 maximum-pool-size: 20 connection-test-query: select 1 - max-lifetime: 0 - connection-timeout: 30000 + data: mongodb: host: 118.194.255.128 port: 27017 diff --git a/accompany-admin/accompany-flow-team-admin-web/src/main/resources/application-native.yml b/accompany-admin/accompany-flow-team-admin-web/src/main/resources/application-native.yml index c6fad9f10..4227bcb18 100644 --- a/accompany-admin/accompany-flow-team-admin-web/src/main/resources/application-native.yml +++ b/accompany-admin/accompany-flow-team-admin-web/src/main/resources/application-native.yml @@ -5,22 +5,6 @@ spring: username: root password: anan@dev## driver-class-name: com.mysql.cj.jdbc.Driver - druid: - initial-size: 5 - max-active: 120 - min-idle: 5 - max-wait: 60000 - time-between-eviction-runs-millis: 60000 - min-evictable-idle-time-millis: 300000 - validation-query: SELECT 1 FROM DUAL - test-while-idle: true - test-on-borrow: false - test-on-return: false - pool-prepared-statements: true - max-pool-prepared-statement-per-connection-size: 50 - filters: stat,wall - connection-properties=druid.stat.mergeSql: true;druid.stat.slowSqlMillis=500 - use-global-data-source-stat: true hikari: minimum-idle: 10 maximum-pool-size: 20 diff --git a/accompany-base/accompany-common/src/main/java/com/accompany/common/utils/RegexUtil.java b/accompany-base/accompany-common/src/main/java/com/accompany/common/utils/RegexUtil.java index 40258135d..445f0f43e 100644 --- a/accompany-base/accompany-common/src/main/java/com/accompany/common/utils/RegexUtil.java +++ b/accompany-base/accompany-common/src/main/java/com/accompany/common/utils/RegexUtil.java @@ -1,6 +1,6 @@ package com.accompany.common.utils; -import com.beust.jcommander.internal.Lists; +import com.google.common.collect.Lists; import org.apache.oro.text.regex.*; import java.util.Iterator; @@ -16,7 +16,7 @@ public class RegexUtil { private static PatternMatcher matcher = new Perl5Matcher(); private static Pattern pattern ; - private static List levitPatterns=Lists.newArrayList(); + private static List levitPatterns= Lists.newArrayList(); static { // 手机号、生日号、跟公司业务相关的号码 levitPatterns.add("^(0|13|15|18|168|400|800)[0-9]*$"); diff --git a/accompany-base/accompany-core/src/main/java/com/accompany/core/service/account/NetEaseService.java b/accompany-base/accompany-core/src/main/java/com/accompany/core/service/account/NetEaseService.java index 29e58bde2..b398b7337 100644 --- a/accompany-base/accompany-core/src/main/java/com/accompany/core/service/account/NetEaseService.java +++ b/accompany-base/accompany-core/src/main/java/com/accompany/core/service/account/NetEaseService.java @@ -5,7 +5,7 @@ import com.accompany.common.netease.neteaseacc.NetEaseBaseClient; import com.accompany.common.netease.neteaseacc.result.SmsRet; import com.accompany.common.netease.neteaseacc.result.TokenRet; import com.accompany.common.netease.util.NetEaseConstant; -import com.beust.jcommander.internal.Maps; +import com.google.common.collect.Maps; import com.google.gson.Gson; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; diff --git a/accompany-base/accompany-core/src/main/java/com/accompany/core/service/user/UsersBaseService.java b/accompany-base/accompany-core/src/main/java/com/accompany/core/service/user/UsersBaseService.java index d8c408c52..6938b5892 100644 --- a/accompany-base/accompany-core/src/main/java/com/accompany/core/service/user/UsersBaseService.java +++ b/accompany-base/accompany-core/src/main/java/com/accompany/core/service/user/UsersBaseService.java @@ -13,8 +13,7 @@ import com.accompany.core.service.SysConfService; import com.accompany.core.service.account.AccountService; import com.accompany.core.service.base.BaseService; import com.accompany.core.service.common.JedisService; -import com.alibaba.fastjson.JSONObject; -import com.beust.jcommander.internal.Lists; +import com.google.common.collect.Lists; import com.google.gson.reflect.TypeToken; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; diff --git a/accompany-base/accompany-core/src/main/java/com/accompany/core/util/ExcelUtils.java b/accompany-base/accompany-core/src/main/java/com/accompany/core/util/ExcelUtils.java index 049d8c93c..a411950a7 100644 --- a/accompany-base/accompany-core/src/main/java/com/accompany/core/util/ExcelUtils.java +++ b/accompany-base/accompany-core/src/main/java/com/accompany/core/util/ExcelUtils.java @@ -1,12 +1,12 @@ package com.accompany.core.util; +import cn.hutool.core.collection.CollectionUtil; import com.accompany.common.annotation.FieldComment; import com.accompany.common.utils.DateTimeUtil; import com.accompany.core.vo.BaseVo; import org.apache.poi.xssf.usermodel.XSSFRow; import org.apache.poi.xssf.usermodel.XSSFSheet; import org.apache.poi.xssf.usermodel.XSSFWorkbook; -import org.springside.modules.utils.collection.CollectionUtil; import javax.servlet.http.HttpServletResponse; import java.io.OutputStream; diff --git a/accompany-base/accompany-payment/src/main/java/com/accompany/payment/service/ChargeProdService.java b/accompany-base/accompany-payment/src/main/java/com/accompany/payment/service/ChargeProdService.java index 556e34c46..8ddacf77f 100644 --- a/accompany-base/accompany-payment/src/main/java/com/accompany/payment/service/ChargeProdService.java +++ b/accompany-base/accompany-payment/src/main/java/com/accompany/payment/service/ChargeProdService.java @@ -76,7 +76,7 @@ public class ChargeProdService { * @return */ private List getAvailableChargeProdStatus(){ - List status = com.beust.jcommander.internal.Lists.newArrayList(); + List status = Lists.newArrayList(); status.add(Constant.ChargeProdStatus.using); status.add(Constant.ChargeProdStatus.audit); return status; diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/elasticsearch/ElasticsearchRestClient.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/elasticsearch/ElasticsearchRestClient.java index 72c7f59ce..135ca403d 100644 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/elasticsearch/ElasticsearchRestClient.java +++ b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/elasticsearch/ElasticsearchRestClient.java @@ -1,9 +1,9 @@ package com.accompany.business.elasticsearch; import com.alibaba.fastjson.JSONObject; -import com.beust.jcommander.internal.Maps; import com.accompany.business.config.ElasticsearchConfig; import com.google.common.collect.Lists; +import com.google.common.collect.Maps; import com.google.gson.Gson; import com.google.gson.GsonBuilder; import org.apache.commons.lang3.StringUtils; @@ -137,7 +137,11 @@ public class ElasticsearchRestClient { StringBuilder builder = new StringBuilder(); dataList.forEach(data -> { String id = idFunction.apply(data); - builder.append(gson.toJson(Maps.newHashMap(ElasticsearchBulkAction.INDEX, Maps.newHashMap("_id", id))) + ES_LINE_BREAK); + Map map1 = Maps.newHashMap(); + map1.put("_id", id); + Map map2 = Maps.newHashMap(); + map2.put(ElasticsearchBulkAction.INDEX, map1); + builder.append(gson.toJson(map2) + ES_LINE_BREAK); builder.append(gson.toJson(data) + ES_LINE_BREAK); }); return builder.toString(); diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/AddRobotClient.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/AddRobotClient.java index 6247f0aaa..9d75b36a2 100644 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/AddRobotClient.java +++ b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/AddRobotClient.java @@ -1,6 +1,6 @@ package com.accompany.business.service; -import com.beust.jcommander.internal.Lists; +import com.google.common.collect.Lists; import com.google.gson.Gson; import java.util.List; diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/AppVersionUpdateConfService.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/AppVersionUpdateConfService.java index 7c8ea165e..fe70a4191 100644 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/AppVersionUpdateConfService.java +++ b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/AppVersionUpdateConfService.java @@ -6,7 +6,7 @@ import com.accompany.business.mybatismapper.AppVersionUpdateConfMapper; import com.accompany.common.redis.RedisKey; import com.accompany.core.service.common.JedisService; import com.accompany.core.util.StringUtils; -import com.beust.jcommander.internal.Lists; +import com.google.common.collect.Lists; import com.google.gson.Gson; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -41,7 +41,7 @@ public class AppVersionUpdateConfService { return appVersionUpdateConfList; } private List getAllAppVersionUpdateConfList() { - List appVersionUpdateConfList =Lists.newArrayList(); + List appVersionUpdateConfList = Lists.newArrayList(); Map appVersionUpdateConfMap = jedisService.hgetAllBykey(RedisKey.app_version_update.getKey()); if (appVersionUpdateConfMap == null || appVersionUpdateConfMap.size() == 0) { return appVersionUpdateConfList; diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/BannerService.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/BannerService.java index 0b8146f98..c19180bd9 100644 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/BannerService.java +++ b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/BannerService.java @@ -11,8 +11,8 @@ import com.accompany.common.redis.RedisKey; import com.accompany.common.utils.BlankUtil; import com.accompany.core.service.SysConfService; import com.accompany.core.service.base.BaseService; -import com.beust.jcommander.internal.Lists; import com.google.common.cache.*; +import com.google.common.collect.Lists; import com.google.gson.reflect.TypeToken; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/ErBanNetEaseService.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/ErBanNetEaseService.java index 85c362471..190868a9e 100644 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/ErBanNetEaseService.java +++ b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/ErBanNetEaseService.java @@ -14,7 +14,7 @@ import com.accompany.core.service.SysConfService; import com.accompany.core.service.base.BaseService; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONArray; -import com.beust.jcommander.internal.Maps; +import com.google.common.collect.Maps; import com.google.gson.Gson; import com.google.gson.reflect.TypeToken; import lombok.extern.slf4j.Slf4j; diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/HomeHotManualRecommService.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/HomeHotManualRecommService.java index bc4f19860..ae733eddb 100644 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/HomeHotManualRecommService.java +++ b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/HomeHotManualRecommService.java @@ -14,7 +14,7 @@ import com.accompany.core.model.Users; import com.accompany.core.service.base.BaseService; import com.accompany.core.util.StringUtils; import com.accompany.core.vo.UserVo; -import com.beust.jcommander.internal.Lists; +import com.google.common.collect.Lists; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.util.CollectionUtils; diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/MasterApprenticeService.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/MasterApprenticeService.java index 29247f468..35129a008 100644 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/MasterApprenticeService.java +++ b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/MasterApprenticeService.java @@ -32,7 +32,7 @@ import com.accompany.core.service.base.BaseService; import com.accompany.core.vo.UserLevelVo; import com.accompany.core.vo.UserVo; import com.alibaba.fastjson.JSONObject; -import com.beust.jcommander.internal.Lists; +import com.google.common.collect.Lists; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/PanelService.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/PanelService.java index c6af60bf1..72fd94305 100644 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/PanelService.java +++ b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/PanelService.java @@ -1,6 +1,5 @@ package com.accompany.business.service; -import com.beust.jcommander.internal.Lists; import com.accompany.core.base.BeanMapper; import com.accompany.business.model.Panel; import com.accompany.business.model.PanelExample; @@ -9,6 +8,7 @@ import com.accompany.core.service.base.BaseService; import com.accompany.business.vo.PanelVo; import com.accompany.common.constant.Constant; import com.accompany.common.redis.RedisKey; +import com.google.common.collect.Lists; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/RobotService.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/RobotService.java index cd83e658b..9eab1779d 100644 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/RobotService.java +++ b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/RobotService.java @@ -12,7 +12,7 @@ import com.accompany.common.result.BusiResult; import com.accompany.common.status.BusiStatus; import com.accompany.core.model.Room; import com.accompany.core.model.Users; -import com.beust.jcommander.internal.Lists; +import com.google.common.collect.Lists; import com.google.gson.Gson; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/RoomFlowPayRecordService.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/RoomFlowPayRecordService.java index 50e783649..6fe229a50 100644 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/RoomFlowPayRecordService.java +++ b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/RoomFlowPayRecordService.java @@ -1,11 +1,11 @@ package com.accompany.business.service; -import com.beust.jcommander.internal.Lists; import com.accompany.business.model.RoomFlowPayRecord; import com.accompany.business.model.RoomFlowPayRecordExample; import com.accompany.business.mybatismapper.RoomFlowPayRecordMapper; import com.accompany.core.service.base.BaseService; import com.accompany.common.constant.Constant; +import com.google.common.collect.Lists; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/TestService.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/TestService.java index 960521e7b..7b142efa7 100644 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/TestService.java +++ b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/TestService.java @@ -1,11 +1,11 @@ package com.accompany.business.service; -import com.beust.jcommander.internal.Lists; -import com.beust.jcommander.internal.Maps; import com.accompany.business.param.neteasepush.Body; import com.accompany.business.param.neteasepush.NeteaseSendMsgBatchParam; import com.accompany.business.param.neteasepush.Payload; import com.accompany.business.vo.OrderServVo; +import com.google.common.collect.Lists; +import com.google.common.collect.Maps; import com.google.gson.Gson; import com.accompany.common.constant.Constant; import com.accompany.common.result.BusiResult; diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/WeekListService.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/WeekListService.java index a564e654c..0bd1056aa 100644 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/WeekListService.java +++ b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/WeekListService.java @@ -10,7 +10,7 @@ import com.accompany.common.redis.RedisKey; import com.accompany.common.utils.GetTimeUtils; import com.accompany.common.utils.StringUtils; import com.accompany.core.service.common.JedisService; -import com.beust.jcommander.internal.Lists; +import com.google.common.collect.Lists; import com.google.common.reflect.TypeToken; import com.google.gson.Gson; import org.apache.commons.collections.CollectionUtils; @@ -39,7 +39,7 @@ public class WeekListService { public List queryList(Long roomUid) { String str = jedisService.hget(RedisKey.week_list.getKey(), roomUid.toString()); - List weekLists = Lists.newArrayList(); + List weekLists; if (StringUtils.isNotBlank(str)) { Type type = new TypeToken>() { }.getType(); diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/activity/ActivityService.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/activity/ActivityService.java index 2c0c5731f..b91daeadf 100644 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/activity/ActivityService.java +++ b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/activity/ActivityService.java @@ -1,12 +1,12 @@ package com.accompany.business.service.activity; -import com.beust.jcommander.internal.Lists; import com.accompany.business.model.AppActivity; import com.accompany.business.model.AppActivityExample; import com.accompany.business.mybatismapper.AppActivityMapper; import com.accompany.core.service.common.JedisService; import com.accompany.business.util.ReplaceDomainUtil; import com.accompany.business.vo.ActVo; +import com.google.common.collect.Lists; import com.google.gson.Gson; import com.google.gson.reflect.TypeToken; import com.accompany.common.constant.Constant; diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/box/BoxPrizeMessageService.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/box/BoxPrizeMessageService.java index 851acb45f..38fc23307 100644 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/box/BoxPrizeMessageService.java +++ b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/box/BoxPrizeMessageService.java @@ -29,7 +29,7 @@ import com.accompany.core.service.common.JedisService; import com.accompany.core.util.StringUtils; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; -import com.beust.jcommander.internal.Lists; +import com.google.common.collect.Lists; import com.google.gson.Gson; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; @@ -409,8 +409,7 @@ public class BoxPrizeMessageService { // 七天内登陆过的用户 Date endTime = new Date(); Date beginTime = DateTimeUtil.getNextDay(endTime, -7); - List activeUids = - Lists.newArrayList( + List activeUids = Lists.newArrayList( jedisService.zrangeByScore( RedisKey.active_user_sortset.getKey(), beginTime.getTime(), endTime.getTime())); return activeUids.stream().map(Long::parseLong).collect(Collectors.toList()); diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/box/DrawLotteryRecordService.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/box/DrawLotteryRecordService.java index b6e689169..9b9aeba3a 100644 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/box/DrawLotteryRecordService.java +++ b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/box/DrawLotteryRecordService.java @@ -1,6 +1,5 @@ package com.accompany.business.service.box; -import com.beust.jcommander.internal.Lists; import com.accompany.business.model.DrawLotteryRecord; import com.accompany.business.model.DrawLotteryRecordExample; import com.accompany.business.mybatismapper.DrawLotteryRecordMapper; @@ -10,6 +9,7 @@ import com.accompany.business.vo.openbox.DrawPrizeItemVo; import com.google.common.collect.ArrayListMultimap; import com.accompany.common.constant.Constant; import com.accompany.common.utils.DateTimeUtil; +import com.google.common.collect.Lists; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.scheduling.annotation.Async; import org.springframework.stereotype.Service; diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/broad/impl/BroadRecordServiceImpl.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/broad/impl/BroadRecordServiceImpl.java index 014a26087..356343da2 100644 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/broad/impl/BroadRecordServiceImpl.java +++ b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/broad/impl/BroadRecordServiceImpl.java @@ -7,25 +7,19 @@ import com.accompany.business.service.broad.BroadRecordService; import com.accompany.business.service.room.RoomService; import com.accompany.business.vo.RoomVo; import com.accompany.business.vo.broad.BroadModelVo; -import com.accompany.common.constant.ApplicationConstant; import com.accompany.common.constant.Constant; import com.accompany.common.redis.RedisKey; import com.accompany.common.utils.DateTimeUtil; import com.accompany.common.utils.StringUtils; import com.accompany.core.service.SysConfService; import com.accompany.core.service.common.JedisService; -import com.accompany.core.util.DateUtil; import com.alibaba.fastjson.JSONObject; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.beust.jcommander.internal.Maps; import com.google.gson.Gson; -import org.apache.commons.collections.CollectionUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import java.util.*; -import java.util.stream.Collectors; @Service public class BroadRecordServiceImpl extends ServiceImpl implements BroadRecordService { diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/drawprize/UserDrawService.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/drawprize/UserDrawService.java index 9e68fd3c0..2c8fdb009 100644 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/drawprize/UserDrawService.java +++ b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/drawprize/UserDrawService.java @@ -41,7 +41,7 @@ import com.accompany.core.service.SysConfService; import com.accompany.core.service.common.JedisLockService; import com.accompany.core.service.common.JedisService; import com.accompany.core.vo.UserVo; -import com.beust.jcommander.internal.Lists; +import com.google.common.collect.Lists; import com.google.gson.Gson; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; @@ -502,7 +502,7 @@ public class UserDrawService { return Lists.newArrayList(); } - List userDrawRecordVoList=Lists.newArrayList(); + List userDrawRecordVoList= Lists.newArrayList(); for(UserDrawRecord userDrawRecord:userDrawRecordList){ UserDrawRecordVo userDrawRecordVo=new UserDrawRecordVo(); Long uid=userDrawRecord.getUid(); diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/family/FamilyCharmService.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/family/FamilyCharmService.java index 6d288fab0..ce59e6cd5 100644 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/family/FamilyCharmService.java +++ b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/family/FamilyCharmService.java @@ -19,7 +19,7 @@ import com.accompany.common.utils.StringUtils; import com.accompany.common.utils.WeekUtil; import com.accompany.core.base.BeanMapper; import com.accompany.core.service.base.BaseService; -import com.beust.jcommander.internal.Lists; +import com.google.common.collect.Lists; import com.google.common.collect.Maps; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -32,8 +32,6 @@ import java.util.*; @Service public class FamilyCharmService extends BaseService { - private static final Logger logger = LoggerFactory.getLogger(FamilyCharmService.class); - @Autowired private FamilyCharmRecordMapper familyCharmRecordMapper; @Autowired diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/follow/FansService.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/follow/FansService.java index bc621c93b..463e7ebf4 100644 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/follow/FansService.java +++ b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/follow/FansService.java @@ -53,8 +53,8 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.beust.jcommander.internal.Lists; -import com.beust.jcommander.internal.Maps; +import com.google.common.collect.Lists; +import com.google.common.collect.Maps; import com.google.gson.Gson; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/gamemange/GameManageBizService.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/gamemange/GameManageBizService.java index 45dbc8354..faa874ab3 100644 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/gamemange/GameManageBizService.java +++ b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/gamemange/GameManageBizService.java @@ -1,5 +1,6 @@ package com.accompany.business.service.gamemange; +import cn.hutool.core.collection.CollectionUtil; import com.accompany.business.dto.gamemanage.GameMsgDTO; import com.accompany.business.model.UserBankAccount; import com.accompany.business.param.neteasepush.Body; @@ -45,7 +46,6 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.scheduling.annotation.Async; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import org.springside.modules.utils.collection.CollectionUtil; import java.math.BigDecimal; import java.util.*; diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/gift/GiftSendService.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/gift/GiftSendService.java index a801d75b8..25feb5b0d 100644 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/gift/GiftSendService.java +++ b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/gift/GiftSendService.java @@ -48,8 +48,8 @@ import com.accompany.core.util.StringUtils; import com.accompany.core.vo.vip.VipBaseInfoVO; import com.alibaba.fastjson.JSON; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.beust.jcommander.internal.Maps; import com.google.common.collect.Lists; +import com.google.common.collect.Maps; import lombok.extern.slf4j.Slf4j; import org.apache.commons.collections.CollectionUtils; import org.springframework.beans.BeanUtils; diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/gift/GiftService.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/gift/GiftService.java index 18e41b9b4..c84c14f83 100644 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/gift/GiftService.java +++ b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/gift/GiftService.java @@ -27,36 +27,22 @@ 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.core.enumeration.BillObjTypeEnum; -import com.accompany.core.model.Room; -import com.accompany.core.model.SysConf; -import com.accompany.core.model.Users; -import com.accompany.core.service.SysConfService; import com.accompany.core.service.base.BaseService; -import com.accompany.core.service.common.JedisLockService; import com.accompany.core.service.common.JedisService; import com.accompany.core.vo.vip.VipBaseInfoVO; -import com.beust.jcommander.internal.Lists; -import com.beust.jcommander.internal.Maps; -import org.apache.activemq.command.ActiveMQMapMessage; +import com.google.common.collect.Lists; +import com.google.common.collect.Maps; import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Qualifier; -import org.springframework.context.annotation.Lazy; import org.springframework.jms.core.JmsTemplate; -import org.springframework.jms.core.MessageCreator; import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; import org.springframework.util.Assert; import org.springframework.util.CollectionUtils; -import javax.jms.JMSException; -import javax.jms.MapMessage; -import javax.jms.Message; -import javax.jms.Session; import java.util.*; import java.util.stream.Collectors; diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/hall/HallAuthService.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/hall/HallAuthService.java index b069d58f9..7367a647e 100644 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/hall/HallAuthService.java +++ b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/hall/HallAuthService.java @@ -19,7 +19,7 @@ import com.accompany.core.util.StringUtils; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.beust.jcommander.internal.Lists; +import com.google.common.collect.Lists; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; @@ -37,8 +37,6 @@ import java.util.stream.Stream; @Service public class HallAuthService extends BaseService { - private static final Logger logger = LoggerFactory.getLogger(HallAuthService.class); - @Autowired private HallMemberAuthMapper hallMemberAuthMapper; @Autowired @@ -96,7 +94,7 @@ public class HallAuthService extends BaseService { this.jedisService.expire(RedisKey.hall_member_menus.getKey(uid.toString()), Constant.HallKeySaveDate.hall_member_menus); return authVoList; } else { - List authVoList = Lists.newArrayList(menus.size()); + List authVoList = Lists.newArrayList(); menus.stream().forEach(menu -> authVoList.add(JSON.parseObject(menu, HallMemberAuthVo.class))); return authVoList; } @@ -249,7 +247,6 @@ public class HallAuthService extends BaseService { setMemberAuthIsNull(hallId,authSets,managerUid); return BusiStatus.SUCCESS.value(); } - List managerAuthVoList = null; byte[] roles = {Constant.HallAuthRoleType.OWNER_MANAGER,Constant.HallAuthRoleType.MANAGER, Constant.HallAuthRoleType.CLAN_ELDER_OWNER_MANAGER}; List auths = getHallAuths(roles,null); @@ -270,7 +267,7 @@ public class HallAuthService extends BaseService { Map memberAuthMap = authSets.stream().collect(Collectors.toMap(String::toString, a -> a, (k1, k2) -> k1)); Map sortSetMap = new HashMap(); List memberAuths = Lists.newArrayList(); - List setMemberAuths = Lists.newArrayList(authSets.size()); + List setMemberAuths = Lists.newArrayList(); //只有权限表里有的权限,才能进行设置 auths.stream().forEach(auth -> { HallMemberAuth memberAuth = converToHallMemberAuth(auth, managerUid, Constant.HallAuthStatus.AUTH_EXISTS); @@ -522,7 +519,7 @@ public class HallAuthService extends BaseService { @Transactional(rollbackFor = Exception.class) public List addHallManagerAuthListVos(List auths, List memberAuths, Long managerUid, int defaultStatus) { - List managerAuthVoList = Lists.newArrayList(auths.size()); + List managerAuthVoList = Lists.newArrayList(); if (CollectionUtils.isEmpty(memberAuths)) { auths.stream().forEach(auth -> { managerAuthVoList.add(converToHallManagerAuthVo(auth, defaultStatus)); @@ -541,7 +538,7 @@ public class HallAuthService extends BaseService { } public List addHallManagerAuthSetVos(List auths, String managerAuths, int defaultStatus) { - List managerAuthVoList = Lists.newArrayList(auths.size()); + List managerAuthVoList = Lists.newArrayList(); if (StringUtils.isEmpty(managerAuths)) { auths.stream().forEach(auth -> { managerAuthVoList.add(converToHallManagerAuthVo(auth, defaultStatus)); @@ -688,7 +685,6 @@ public class HallAuthService extends BaseService { public List getHallAuths(byte[] roles, Byte isNeedSet) { Set authsCache = this.jedisService.zrangeMembers(RedisKey.hall_auths.getKey(), 0, -1); - System.out.println(JSON.toJSONString(authsCache)); if (CollectionUtils.isEmpty(authsCache)) { List auths = this.hallAuthMapper.selectByExample(null); if (CollectionUtils.isEmpty(auths)) { @@ -704,7 +700,7 @@ public class HallAuthService extends BaseService { return getHallAuths(auths,roles,isNeedSet); } else { - List auths = Lists.newArrayList(authsCache.size()); + List auths = Lists.newArrayList(); authsCache.stream().forEach(auth -> { auths.add(JSON.parseObject(auth, HallAuth.class)); }); diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/hall/HallIncomeService.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/hall/HallIncomeService.java index 348719c1d..e235488c4 100644 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/hall/HallIncomeService.java +++ b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/hall/HallIncomeService.java @@ -18,15 +18,12 @@ import com.accompany.business.vo.clan.ClanIncomeVO; import com.accompany.business.vo.hall.HallSingleRoomIncomeVO; import com.accompany.business.vo.hall.HallVo; import com.accompany.common.constant.Constant; -import com.accompany.common.redis.RedisKey; import com.accompany.common.status.BusiStatus; import com.accompany.common.utils.DateTimeUtil; import com.accompany.core.exception.ServiceException; import com.accompany.core.service.base.BaseService; import com.accompany.core.service.common.JedisService; import com.accompany.core.util.StringUtils; -import com.alibaba.fastjson.JSON; -import com.beust.jcommander.internal.Lists; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.util.CollectionUtils; diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/hall/HallService.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/hall/HallService.java index 5eaa94b65..13079df96 100644 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/hall/HallService.java +++ b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/hall/HallService.java @@ -29,7 +29,7 @@ import com.accompany.core.service.base.BaseService; import com.accompany.core.util.StringUtils; import com.accompany.core.vo.UserLevelVo; import com.alibaba.fastjson.JSONObject; -import com.beust.jcommander.internal.Lists; +import com.google.common.collect.Lists; import lombok.NonNull; import org.apache.commons.collections.CollectionUtils; import org.springframework.beans.factory.annotation.Autowired; @@ -183,7 +183,7 @@ public class HallService extends BaseService { List auths = hallAuthService.getHallAuths(roles,null); if (!CollectionUtils.isEmpty(auths)) { - List memberAuths = Lists.newArrayList(auths.size()); + List memberAuths = Lists.newArrayList(); auths.stream().forEach(auth -> { HallMemberAuth memberAuth = hallAuthService.converToHallMemberAuth(auth, uid, Constant.HallAuthStatus.AUTH_EXISTS); memberAuths.add(memberAuth); diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/ktv/MusicLibraryService.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/ktv/MusicLibraryService.java index bed3060f6..2355a468a 100644 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/ktv/MusicLibraryService.java +++ b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/ktv/MusicLibraryService.java @@ -103,16 +103,6 @@ public class MusicLibraryService extends BaseService { } private List getMusicLibraryVosByESRecordMap(List> recordList) throws Exception{ - //TODO 先不处理日期 - ConvertUtils.register(new Converter() { - @Override - public T convert(Class aClass, Object o) { - if (aClass == Date.class){ - return null; - } - return null; - } - }, Date.class); List musicLibraries = Lists.newArrayListWithCapacity(recordList.size()); for (Map record : recordList){ MusicLibrary musicLibrary = new MusicLibrary(); diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/linearlypool/LinearlyPoolPrizeMessageService.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/linearlypool/LinearlyPoolPrizeMessageService.java index e49f991e2..316ed92e3 100644 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/linearlypool/LinearlyPoolPrizeMessageService.java +++ b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/linearlypool/LinearlyPoolPrizeMessageService.java @@ -28,7 +28,7 @@ import com.accompany.core.service.common.JedisService; import com.accompany.core.util.StringUtils; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; -import com.beust.jcommander.internal.Lists; +import com.google.common.collect.Lists; import com.google.gson.Gson; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; @@ -369,8 +369,7 @@ public class LinearlyPoolPrizeMessageService { // 七天内登陆过的用户 Date endTime = new Date(); Date beginTime = DateTimeUtil.getNextDay(endTime, -7); - List activeUids = - Lists.newArrayList( + List activeUids = Lists.newArrayList( jedisService.zrangeByScore( RedisKey.active_user_sortset.getKey(), beginTime.getTime(), endTime.getTime())); return activeUids.stream().map(Long::parseLong).collect(Collectors.toList()); diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/linearlypool/LinearlyPrizePoolService.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/linearlypool/LinearlyPrizePoolService.java index daf0a9576..3a5a26beb 100644 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/linearlypool/LinearlyPrizePoolService.java +++ b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/linearlypool/LinearlyPrizePoolService.java @@ -48,8 +48,8 @@ import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.beust.jcommander.internal.Lists; import com.google.common.collect.ArrayListMultimap; +import com.google.common.collect.Lists; import lombok.Data; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/music/MusicService.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/music/MusicService.java index 4fada2b2f..ec2340caf 100644 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/music/MusicService.java +++ b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/music/MusicService.java @@ -99,16 +99,6 @@ public class MusicService extends BaseService { } private List getMusicListByESRecordMap(List> recordList) throws Exception{ - //TODO 先不处理日期 - ConvertUtils.register(new Converter() { - @Override - public T convert(Class aClass, Object o) { - if (aClass == Date.class){ - return null; - } - return null; - } - }, Date.class); List musicList = Lists.newArrayListWithCapacity(recordList.size()); for (Map record : recordList){ Music music = new Music(); diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/nameplate/UserNameplateService.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/nameplate/UserNameplateService.java index 7c9b4a0ec..d1e24b86e 100644 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/nameplate/UserNameplateService.java +++ b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/nameplate/UserNameplateService.java @@ -36,9 +36,9 @@ import com.accompany.core.vo.vip.VipBaseInfoVO; import com.accompany.payment.model.UserVipInfo; import com.accompany.payment.service.UserVipInfoService; import com.alibaba.fastjson.JSONObject; -import com.beust.jcommander.internal.Maps; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; +import com.google.common.collect.Maps; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.Lazy; diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/room/MicroSeqService.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/room/MicroSeqService.java index 828a0a822..d9bb9dd35 100644 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/room/MicroSeqService.java +++ b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/room/MicroSeqService.java @@ -1,8 +1,5 @@ package com.accompany.business.service.room; -import com.beust.jcommander.internal.Lists; -import com.beust.jcommander.internal.Maps; -import com.beust.jcommander.internal.Sets; import com.accompany.core.model.Room; import com.accompany.business.model.redis.MicroSeqModel; import com.accompany.business.service.ErBanNetEaseService; @@ -10,6 +7,9 @@ import com.accompany.business.service.SendChatRoomMsgService; import com.accompany.core.service.common.JedisService; import com.accompany.business.vo.MicroSeqListVo; import com.accompany.business.vo.SeqVo; +import com.google.common.collect.Lists; +import com.google.common.collect.Maps; +import com.google.common.collect.Sets; import com.google.gson.Gson; import com.google.gson.reflect.TypeToken; import com.accompany.common.constant.Constant; @@ -30,7 +30,6 @@ import java.util.*; */ @Service public class MicroSeqService { - private static final Logger logger = LoggerFactory.getLogger(MicroSeqService.class); @Autowired private JedisService jedisService; @Autowired @@ -47,7 +46,7 @@ public class MicroSeqService { Room room=roomService.getRoomByUid(roomUid); List microSeqListList =getMicroSeqListCache(roomUid); if(CollectionUtils.isEmpty(microSeqListList)){ - microSeqListList=Lists.newArrayList(); + microSeqListList= Lists.newArrayList(); }else{ microSeqListList=removeMicroSeqModelByUid(microSeqListList,uid); for(MicroSeqModel microSeqModel:microSeqListList){ @@ -64,7 +63,7 @@ public class MicroSeqService { microSeqModel.setSeqNo(seqNo); microSeqListList.add(microSeqModel); saveMicroSeqCache(roomUid,microSeqListList); - Map data=Maps.newHashMap(); + Map data= Maps.newHashMap(); data.put("uid",uid); data.put("data",getMicroVos(roomUid)); if(!uid.equals(roomUid)){ @@ -333,7 +332,7 @@ public class MicroSeqService { MicroSeqService MicroSeqService=new MicroSeqService(); // MicroSeqService.getMicroSeqListCache(0L); MicroSeqListVo seqListVo=new MicroSeqListVo(); - Set sets=Sets.newHashSet(); + Set sets= Sets.newHashSet(); MicroSeqModel m1=new MicroSeqModel(); m1.setSeqNo(1); m1.setUid(1L); diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/room/MicroSeqV2Service.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/room/MicroSeqV2Service.java index 1426b452c..8aa7b3939 100644 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/room/MicroSeqV2Service.java +++ b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/room/MicroSeqV2Service.java @@ -14,12 +14,10 @@ import com.accompany.core.model.Room; import com.accompany.core.model.Users; import com.accompany.core.service.common.JedisService; import com.accompany.core.util.StringUtils; -import com.beust.jcommander.internal.Lists; -import com.beust.jcommander.internal.Maps; +import com.google.common.collect.Lists; +import com.google.common.collect.Maps; import com.google.gson.Gson; import com.google.gson.reflect.TypeToken; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.util.CollectionUtils; @@ -38,7 +36,6 @@ import static com.accompany.common.constant.Constant.MicroHandleStatus.invited; */ @Service public class MicroSeqV2Service { - private static final Logger logger = LoggerFactory.getLogger(MicroSeqV2Service.class); @Autowired private JedisService jedisService; @@ -143,7 +140,7 @@ public class MicroSeqV2Service { */ private List updateMicroSeqToTop(List microSeqList,MicroSeqModelV2 curMicroSeqModel){ microSeqList.remove(curMicroSeqModel); - List newMicroSeqList=Lists.newArrayList(); + List newMicroSeqList= Lists.newArrayList(); for(MicroSeqModelV2 microSeqModel:microSeqList){ if(microSeqModel.getStatus()==inmicro){ int seqNo=microSeqModel.getSeqNo(); diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/room/RoomHotService.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/room/RoomHotService.java index 6bc782289..55ea76cf1 100644 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/room/RoomHotService.java +++ b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/room/RoomHotService.java @@ -1,6 +1,5 @@ package com.accompany.business.service.room; -import com.beust.jcommander.internal.Lists; import com.accompany.business.model.KeepAliveRoom; import com.accompany.business.model.KeepAliveRoomExample; import com.accompany.business.model.RoomHot; @@ -10,6 +9,7 @@ import com.accompany.business.mybatismapper.RoomHotMapper; import com.accompany.core.service.common.JedisService; import com.accompany.core.util.StringUtils; import com.accompany.business.vo.RoomHotVo; +import com.google.common.collect.Lists; import com.google.common.reflect.TypeToken; import com.google.gson.Gson; import com.accompany.common.redis.RedisKey; diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/room/RoomPKService.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/room/RoomPKService.java index 2a719421a..430d0ee7b 100644 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/room/RoomPKService.java +++ b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/room/RoomPKService.java @@ -25,7 +25,7 @@ import com.accompany.core.model.Room; import com.accompany.core.model.Users; import com.accompany.core.service.base.BaseService; import com.accompany.core.util.StringUtils; -import com.beust.jcommander.internal.Lists; +import com.google.common.collect.Lists; import com.google.common.collect.Maps; import com.google.common.util.concurrent.RateLimiter; import com.google.gson.reflect.TypeToken; diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/room/RoomQueueMicroService.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/room/RoomQueueMicroService.java index 6e307f129..1f4544a19 100644 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/room/RoomQueueMicroService.java +++ b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/room/RoomQueueMicroService.java @@ -23,7 +23,7 @@ import com.accompany.core.mybatismapper.RoomMapper; import com.accompany.core.service.base.BaseService; import com.accompany.core.util.StringUtils; import com.alibaba.fastjson.JSON; -import com.beust.jcommander.internal.Lists; +import com.google.common.collect.Lists; import com.google.common.util.concurrent.RateLimiter; import com.google.gson.reflect.TypeToken; import org.springframework.beans.factory.annotation.Autowired; @@ -52,8 +52,6 @@ public class RoomQueueMicroService extends BaseService { private ErBanNetEaseService erBanNetEaseService; @Autowired private RoomPlayTypeService roomPlayTypeService; - @Autowired - private QueryRoomService queryRoomService; /** * 开启/关闭排麦模式 diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/room/RoomQueueService.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/room/RoomQueueService.java index f19cbff4a..a907b73aa 100644 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/room/RoomQueueService.java +++ b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/room/RoomQueueService.java @@ -1,7 +1,7 @@ package com.accompany.business.service.room; -import com.beust.jcommander.internal.Lists; import com.accompany.business.service.ErBanNetEaseService; +import com.google.common.collect.Lists; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -18,7 +18,7 @@ public class RoomQueueService { ErBanNetEaseService erBanNetEaseService =new ErBanNetEaseService(); // List roomList=buildRooIdList(); - List roomList=Lists.newArrayList(); + List roomList= Lists.newArrayList(); roomList.add(11174048l); for(int i=0;i param = com.beust.jcommander.internal.Maps.newHashMap(); + Map param = Maps.newHashMap(); param.put("roomid", newRoom.getRoomId()); String[] uids = new String[]{adminUid + ""}; param.put("accids", JSONObject.toJSONString(uids)); diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/statis/StatRoomCtrbSumService.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/statis/StatRoomCtrbSumService.java index ebffa1bb8..50e3d4099 100644 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/statis/StatRoomCtrbSumService.java +++ b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/statis/StatRoomCtrbSumService.java @@ -14,7 +14,7 @@ import com.accompany.core.model.NobleUsers; import com.accompany.core.model.Users; import com.accompany.core.service.base.BaseService; import com.accompany.core.vo.UserLevelVo; -import com.beust.jcommander.internal.Lists; +import com.google.common.collect.Lists; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; @@ -64,7 +64,7 @@ public class StatRoomCtrbSumService extends BaseService{ } private List convertStatRoomCtrbSumListToVo(List statRoomoCtrbSumList){ - List statRoomCtrbSumVos=Lists.newArrayList(); + List statRoomCtrbSumVos= Lists.newArrayList(); if(CollectionUtils.isEmpty(statRoomoCtrbSumList)){ return statRoomCtrbSumVos; } diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/statis/StatRoomCtrbSumTotalService.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/statis/StatRoomCtrbSumTotalService.java index 99c3fb832..fc93df4de 100644 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/statis/StatRoomCtrbSumTotalService.java +++ b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/statis/StatRoomCtrbSumTotalService.java @@ -1,18 +1,16 @@ package com.accompany.business.service.statis; -import com.beust.jcommander.internal.Maps; import com.accompany.business.model.*; import com.accompany.business.mybatismapper.StatRoomCtrbSumTotalMapper; import com.accompany.business.mybatismapper.StatRoomCtrbSumTotalMapperMgr; import com.accompany.core.service.base.BaseService; +import com.google.common.collect.Maps; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.util.CollectionUtils; -import java.util.Date; -import java.util.HashMap; import java.util.List; import java.util.Map; diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/user/FaceService.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/user/FaceService.java index 967e65183..bd31e79bb 100644 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/user/FaceService.java +++ b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/user/FaceService.java @@ -12,7 +12,7 @@ import com.accompany.common.result.BusiResult; import com.accompany.common.status.BusiStatus; import com.accompany.core.service.SysConfService; import com.accompany.core.service.common.JedisService; -import com.beust.jcommander.internal.Lists; +import com.google.common.collect.Lists; import com.google.gson.Gson; import com.google.gson.reflect.TypeToken; import org.springframework.beans.factory.annotation.Autowired; @@ -45,7 +45,7 @@ public class FaceService { faceDefExample.createCriteria().andFaceStatusEqualTo(Constant.FaceStatus.using).andFaceIdNotEqualTo(1); faceDefExample.setOrderByClause(" seq_no asc"); List faceList = faceMapper.selectByExample(faceDefExample); - List faceVoListRela=Lists.newArrayList(); + List faceVoListRela= Lists.newArrayList(); if (!CollectionUtils.isEmpty(faceList)) { faceVoList=convertFaceToVo(faceList); for(FaceVo faceVo:faceVoList){ diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/user/PrivatePhotoService.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/user/PrivatePhotoService.java index 2e1c49758..c1ef68f66 100644 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/user/PrivatePhotoService.java +++ b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/user/PrivatePhotoService.java @@ -15,7 +15,7 @@ import com.accompany.core.service.base.BaseService; import com.accompany.core.util.HttpClient4Utils; import com.accompany.core.util.YidunGeneralUtils; import com.accompany.core.vo.PrivatePhotoVo; -import com.beust.jcommander.internal.Lists; +import com.google.common.collect.Lists; import com.google.gson.JsonArray; import com.google.gson.JsonElement; import com.google.gson.JsonObject; diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/user/UserGiftWallService.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/user/UserGiftWallService.java index 2ecba84de..fce089acf 100644 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/user/UserGiftWallService.java +++ b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/user/UserGiftWallService.java @@ -17,7 +17,7 @@ import com.accompany.common.utils.BlankUtil; import com.accompany.core.service.SysConfService; import com.accompany.core.service.base.BaseService; import com.accompany.core.util.StringUtils; -import com.beust.jcommander.internal.Lists; +import com.google.common.collect.Lists; import com.google.gson.reflect.TypeToken; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.scheduling.annotation.Async; @@ -41,8 +41,6 @@ public class UserGiftWallService extends BaseService { @Autowired private UserGiftWallMapper userGiftWallMapper; @Autowired - private GiftAchievementMapper giftAchievementMapper; - @Autowired private UserRadishGiftWallMapper userRadishGiftWallMapper; @Autowired private GiftAchievementTypeMapper giftAchievementTypeMapper; diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/user/UserInRoomService.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/user/UserInRoomService.java index d75fa1707..47592c2a2 100644 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/user/UserInRoomService.java +++ b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/user/UserInRoomService.java @@ -36,8 +36,8 @@ import com.accompany.core.service.common.JedisService; import com.accompany.core.service.user.UsersBaseService; import com.accompany.core.util.StringUtils; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.beust.jcommander.internal.Maps; import com.github.pagehelper.PageHelper; +import com.google.common.collect.Maps; import org.apache.commons.collections.CollectionUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.ApplicationContext; diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/user/UsersService.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/user/UsersService.java index e93a9402f..5527430e6 100644 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/user/UsersService.java +++ b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/user/UsersService.java @@ -86,8 +86,8 @@ import com.accompany.sms.service.SmsService; import com.alibaba.fastjson.JSONObject; import com.aliyuncs.exceptions.ClientException; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.beust.jcommander.internal.Lists; -import com.beust.jcommander.internal.Maps; +import com.google.common.collect.Lists; +import com.google.common.collect.Maps; import com.google.gson.JsonArray; import com.google.gson.JsonElement; import com.google.gson.JsonObject; diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/world/WorldService.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/world/WorldService.java index 680fab310..082feff13 100644 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/world/WorldService.java +++ b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/world/WorldService.java @@ -3,19 +3,16 @@ package com.accompany.business.service.world; import com.accompany.business.sensitvienew.SensitiveFilterUtil; import com.accompany.business.service.user.UsersService; import com.accompany.business.util.ReplaceDomainUtil; -import com.accompany.common.constant.Constant; import com.accompany.common.constant.MessageConstant; import com.accompany.common.redis.RedisKey; import com.accompany.common.status.BusiStatus; import com.accompany.common.utils.DateTimeUtil; import com.accompany.core.exception.ServiceException; import com.accompany.core.model.Users; -import com.accompany.core.service.SysConfService; import com.accompany.core.service.base.BaseService; import com.accompany.world.bo.WorldBo; import com.accompany.world.common.ParamUtils; import com.accompany.world.common.WorldException; -import com.accompany.world.config.WorldConfig; import com.accompany.world.constant.WorldConstant; import com.accompany.world.entity.*; import com.accompany.world.query.WorldGroupChatQuery; @@ -75,15 +72,7 @@ public class WorldService extends BaseService { @Autowired private WorldMessageService messageService; @Autowired - private SysConfService sysConfService; - @Autowired - private WorldShareService worldShareService; - @Autowired - private WorldConfig worldConfig; - @Autowired private IWorldPreCleanRecordService iWorldPreCleanRecordService; - @Autowired - private IWorldGroupChatMemberService iWorldGroupChatMemberService; @Resource(name = "bizExecutor") private TaskExecutor bizExecutor; @@ -629,28 +618,6 @@ public class WorldService extends BaseService { return false; } - /** - * 获取分享图片链接 - * @param worldId - * @param uid - * @return - */ - public String getShareImgUrl(Long worldId,Long uid,String app,String accessUrl,String bucket) { - World world = getByIdFromCache(worldId); - ParamUtils.isNotTrue(null == world || world.getStatus() != WorldConstant.STATUS_VALID, - "未查到世界信息，或世界已解散"); - Users user = usersService.getUsersByUid(uid); - ParamUtils.isNotTrue(null == user,"参数异常"); - StringBuffer codeUrl = new StringBuffer(worldConfig.getWorldShareH5()); - logger.info("getShareImgUrl info:{}",worldConfig.getWorldShareH5()); - codeUrl.append("?worldId="); - codeUrl.append(worldId); - codeUrl.append("&uid="); - codeUrl.append(uid); - return worldShareService.getShareImgUrl(world.getName(),world.getIcon(), - world.getDescription(),user.getNick(),user.getAvatar(),codeUrl.toString(),app,accessUrl,bucket); - } - /** * 重建hot标签缓存 */ diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/world/WorldShareService.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/world/WorldShareService.java deleted file mode 100644 index 6111fa062..000000000 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/world/WorldShareService.java +++ /dev/null @@ -1,185 +0,0 @@ -package com.accompany.business.service.world; - -import com.accompany.business.model.AdminPicture; -import com.accompany.business.model.AdminPictureExample; -import com.accompany.business.mybatismapper.AdminPictureMapper; -import com.accompany.business.service.api.QinniuService; -import com.accompany.core.service.base.BaseService; -import com.accompany.business.util.PictureUtil; -import com.accompany.business.util.QRCodeGenerator; -import com.accompany.common.utils.BlankUtil; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - -import javax.imageio.ImageIO; -import java.awt.*; -import java.awt.image.BufferedImage; -import java.io.*; -import java.net.URL; -import java.util.List; - -/** - * @Author: chucheng - * @Date: 2019/7/11 14:51 - * @Description: - */ -@Service -public class WorldShareService extends BaseService { - - @Autowired - private AdminPictureMapper pictureMapper; - - @Autowired - private QinniuService qinniuService; - - /* 要放置的用户头像半径 */ - public static final int USER_AVATAR_SIZE = 194; - - /* 要放置的世界头像半径 */ - public static final int WORLD_AVATAR_SIZE = 225; - - /* 要放置的世界二维码宽度 */ - public static final int QRCODE_WIDTH = 171; - - /** - * 合成分享图片 - * @param worldName - * @param worldIcon - * @param worldDesc - * @param userNick - * @param userAvatar - * @return - */ - public String getShareImgUrl(String worldName,String worldIcon,String worldDesc,String userNick,String userAvatar, - String codeUrl ,String app,String accessUrl,String bucket) { - AdminPictureExample example = new AdminPictureExample(); - example.createCriteria().andTypeEqualTo(3).andStateEqualTo(1).andAppIdEqualTo(app); - List adminPictures = pictureMapper.selectByExample(example); - AdminPicture adminPicture = adminPictures.get(0); - String imgUrl = adminPicture.getImgUrl(); - String url = buildSharePic(worldName, worldIcon, worldDesc, userNick,userAvatar,imgUrl,codeUrl,accessUrl,bucket); - return url; - } - - private String buildSharePic(String worldName,String worldIcon,String worldDesc,String userNick,String userAvatar, - String imgUrl,String codeUrl,String accessUrl,String bucket) { - logger.info("buildSharePic worldName:{},worldIcon:{},worldDesc:{},userNick:{},userAvatar:{}", - worldName, worldIcon, worldDesc, userNick,userAvatar); - URL url; - String picUrl = ""; - InputStream is = null; - ByteArrayOutputStream os = null; - if (userNick.length() > 6) { - userNick = userNick.substring(0, 6) + "..."; - } - if (worldName.length() > 9) { - worldName = worldName.substring(0, 9) + "..."; - } - String worldDescLine1 = worldDesc; - String worldDescLine2 = ""; - if (worldDesc.length() > 14) { - worldDescLine1 = worldDesc.substring(0, 14); - if(worldDesc.length()>27){ - worldDescLine2 = worldDesc.substring(14, 27) + "..."; - }else{ - worldDescLine2 = worldDesc.substring(14, worldDesc.length()); - } - } - try { - url = new URL(imgUrl); - BufferedImage image = ImageIO.read(url); - //裁剪为圆形用户头像 - BufferedImage roundedImage = PictureUtil.createRoundedImage(userAvatar, USER_AVATAR_SIZE); - //裁剪为圆角正方形世界头像 - BufferedImage roundedRectangleImage = PictureUtil.createRoundedRectangleImage(worldIcon, WORLD_AVATAR_SIZE,90f,90f); - // 生成二维码 - BufferedImage qrCodeImage = QRCodeGenerator.generateQRCodeImage(codeUrl,QRCODE_WIDTH,QRCODE_WIDTH); - - BufferedImage mergeImage = mergePicture(image, roundedImage,roundedRectangleImage,qrCodeImage); - mergeImage = drawString(mergeImage,Font.PLAIN,40,332, 1152,userNick); - mergeImage = drawString(mergeImage,Font.BOLD,55,422, 693,worldName); - mergeImage = drawString(mergeImage,Font.PLAIN,38,422, 766,worldDescLine1); - mergeImage = drawString(mergeImage,Font.PLAIN,38,422, 819,worldDescLine2); - os = new ByteArrayOutputStream(); - ImageIO.write(mergeImage, "png", os); - is = new ByteArrayInputStream(os.toByteArray()); - try { - String filepath = qinniuService.uploadUnInterceptByStream(is,bucket); - if (!BlankUtil.isBlank(filepath)) { - picUrl = qinniuService.mergeUrlAndSlim(filepath,accessUrl); - } - } catch (Exception e) { - logger.error("图片上传失败: e:{}", e); - } - } catch (Exception e) { - logger.error("buildSharePic error worldName:{},worldIcon:{},worldDesc:{},userNick:{},userAvatar:{}", - worldName, worldIcon, worldDesc, userNick,userAvatar, e); - } finally { - try { - if (is != null) { - is.close(); - } - if (os != null) { - os.close(); - } - } catch (IOException e) { - e.printStackTrace(); - } - } - return picUrl; - } - - /** - * 合并图片及文字 - * @param baseImage - * @param userImage - * @param worldImage - * @param qrCodeImage - * @return - * @throws IOException - */ - private BufferedImage mergePicture(BufferedImage baseImage, BufferedImage userImage, BufferedImage worldImage,BufferedImage qrCodeImage) throws IOException { - int width = baseImage.getWidth(null); //底图的宽度 - int height = baseImage.getHeight(null); //底图的高度 - // 按照底图的宽高生成新的图片 - Graphics g = baseImage.createGraphics(); - g.drawImage(baseImage, 0, 0, width, height, null); - - // 设置上层图片放置的位置的坐标及大小 用户头像 - g.drawImage(userImage, 89, 1039, USER_AVATAR_SIZE, USER_AVATAR_SIZE, null); - - // 设置上层图片放置的位置的坐标及大小 世界头像 - g.drawImage(worldImage, 154, 627, WORLD_AVATAR_SIZE, WORLD_AVATAR_SIZE, null); - - // 设置上层图片放置的位置的坐标及大小 二维码 - g.drawImage(qrCodeImage, 93, 1705, QRCODE_WIDTH, QRCODE_WIDTH, null); - - g.dispose(); - - return baseImage; - } - - /** - * 填充文字 - * @param baseImage - * @param fontSize - * @param x - * @param y - * @param str - * @return - */ - private BufferedImage drawString(BufferedImage baseImage,int fontStyle,int fontSize,int x,int y,String str){ - int width = baseImage.getWidth(null); //底图的宽度 - int height = baseImage.getHeight(null); //底图的高度 - Graphics g = baseImage.createGraphics(); - g.drawImage(baseImage, 0, 0, width, height, null); - // 普通字体 - // 文字长度和放置的位置 - g.setFont(new Font("微软雅黑",fontStyle, fontSize)); - g.setColor(Color.white); - g.drawString(str, x, y); - g.dispose(); - - return baseImage; - } -} diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/wujie/WujieService.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/wujie/WujieService.java index af2f2f1e9..715749c22 100644 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/wujie/WujieService.java +++ b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/wujie/WujieService.java @@ -10,7 +10,7 @@ import com.accompany.common.wujie.result.WujieBaseRet; import com.accompany.core.exception.ServiceException; import com.accompany.core.service.common.JedisService; import com.alibaba.fastjson.JSONObject; -import com.beust.jcommander.internal.Maps; +import com.google.common.collect.Maps; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/util/PictureUtil.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/util/PictureUtil.java deleted file mode 100644 index d66c3c73a..000000000 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/util/PictureUtil.java +++ /dev/null @@ -1,203 +0,0 @@ -package com.accompany.business.util; - -import javax.imageio.ImageIO; -import javax.imageio.ImageReadParam; -import javax.imageio.ImageReader; -import javax.imageio.stream.ImageInputStream; -import java.awt.*; -import java.awt.geom.Area; -import java.awt.geom.RoundRectangle2D; -import java.awt.image.BufferedImage; -import java.io.ByteArrayInputStream; -import java.io.ByteArrayOutputStream; -import java.io.IOException; -import java.io.InputStream; -import java.net.URL; -import java.util.Iterator; - -/** - * Created by liuyang on 2019/2/25. - */ -public class PictureUtil { - - /** - * 对头像处理 - * - * @param image the image - * @param radius the radius 半径 - * @return the buffered image - * @throws Exception the exception - */ - public static BufferedImage createRoundedImage(String image, int radius) throws Exception { - URL url = new URL(image); - BufferedImage img = ImageIO.read(url); - // 1. 按原比例缩减 - BufferedImage fixedImg = getScaledImage(img, radius, 2); - // 2. 居中裁剪 - fixedImg = cutPicture(fixedImg, radius, radius); - // 3. 把正方形生成圆形 - BufferedImage bufferedImage = convertRoundedImage(fixedImg, radius); - return bufferedImage; - } - - /** - * 画圆角正方形 - * @param image - * @param radius 半径 - * @param arcw 圆角宽度 - * @param arch 圆角高度 - * @return - * @throws Exception - */ - public static BufferedImage createRoundedRectangleImage(String image,int radius,float arcw, float arch) throws Exception { - URL url = new URL(image); - BufferedImage img = ImageIO.read(url); - // 1. 按原比例缩减 - BufferedImage fixedImg = getScaledImage(img, radius, 2); - // 2. 居中裁剪 - fixedImg = cutPicture(fixedImg, radius, radius); - // 3. 把正方形生成圆角矩形 - BufferedImage bufferedImage = convertRoundedRectangleImage(fixedImg,arcw,arch); - return bufferedImage; - } - - /** - * 图像等比例缩放 - * - * @param img the img - * @param maxSize the max size - * @param type the type - * @return the scaled image - */ - private static BufferedImage getScaledImage(BufferedImage img, int maxSize, int type) { - int w0 = img.getWidth(); - int h0 = img.getHeight(); - int w = w0; - int h = h0; - // 头像如果是长方形： - // 1:高度与宽度的最大值为maxSize进行等比缩放, - // 2:高度与宽度的最小值为maxSize进行等比缩放 - if (type == 1) { - w = w0 > h0 ? maxSize : (maxSize * w0 / h0); - h = w0 > h0 ? (maxSize * h0 / w0) : maxSize; - } else if (type == 2) { - w = w0 > h0 ? (maxSize * w0 / h0) : maxSize; - h = w0 > h0 ? maxSize : (maxSize * h0 / w0); - } - Image schedImage = img.getScaledInstance(w, h, Image.SCALE_SMOOTH); - BufferedImage bufferedImage = new BufferedImage(w, h, BufferedImage.TYPE_INT_ARGB); - Graphics2D g = bufferedImage.createGraphics(); - g.drawImage(schedImage, 0, 0, null); - return bufferedImage; - } - - /** - * 裁剪图片 - * - * @param img the img - * @param originWidth the origin width - * @param originHeight the origin height - * @return the buffered image - * @throws Exception the exception - */ - public static BufferedImage cutPicture(BufferedImage img, int originWidth, int originHeight) throws IOException { - int width = img.getWidth(); // 原图的宽度 - int height = img.getHeight(); //原图的高度 - - int newImage_x = 0; // 要截图的坐标 - int newImage_y = 0; // 要截图的坐标 - if (width > originWidth) { - newImage_x = (width - originWidth) / 2; - } - if (height > originHeight) { - newImage_y = height - originHeight; - } - return cutJPG(img, newImage_x, newImage_y, originWidth, originHeight); - } - - /** - * 方形转为圆形 - * - * @param img the img - * @param radius the radius 半径 - * @return the buffered image - * @throws Exception the exception - */ - public static BufferedImage convertRoundedImage(BufferedImage img, int radius) throws IOException { - BufferedImage result = new BufferedImage(radius, radius, BufferedImage.TYPE_INT_ARGB); - Graphics2D g = result.createGraphics(); - //在适当的位置画图 - g.drawImage(img, (radius - img.getWidth(null)) / 2, (radius - img.getHeight(null)) / 2, null); - - //圆角 - RoundRectangle2D round = new RoundRectangle2D.Double(0, 0, radius, radius, radius * 2, radius * 2); - Area clear = new Area(new Rectangle(0, 0, radius, radius)); - clear.subtract(new Area(round)); - g.setComposite(AlphaComposite.Clear); - - //抗锯齿 - g.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_ON); - g.fill(clear); - g.dispose(); - - return result; - } - - /** - * 进行裁剪操作 - * - * @param originalImage the original image - * @param x the x - * @param y the y - * @param width the width - * @param height the height - * @return the buffered image - * @throws IOException the io exception - */ - public static BufferedImage cutJPG(BufferedImage originalImage, int x, int y, int width, int height) throws IOException { - Iterator iterator = ImageIO.getImageReadersByFormatName("jpg"); - ImageReader reader = (ImageReader) iterator.next(); - // 转换成字节流 - ByteArrayOutputStream outputStream = new ByteArrayOutputStream(); - ImageIO.write(originalImage, "jpg", outputStream); - InputStream is = new ByteArrayInputStream(outputStream.toByteArray()); - - ImageInputStream iis = ImageIO.createImageInputStream(is); - reader.setInput(iis, true); - ImageReadParam param = reader.getDefaultReadParam(); - Rectangle rect = new Rectangle(x, y, width, height); - param.setSourceRegion(rect); - BufferedImage bi = reader.read(0, param); - return bi; - } - - /** - * 矩形画圆角 - * @param image - * @return - * @throws IOException - */ - private static BufferedImage convertRoundedRectangleImage(BufferedImage image,float arcw, float arch)throws IOException { - int w = image.getWidth(); - int h = image.getHeight(); - BufferedImage output = new BufferedImage(w, h, - BufferedImage.TYPE_INT_ARGB); - Graphics2D g2 = output.createGraphics(); - /**用全透明颜色**/ - g2.setColor(new Color(0,0,0,0)); - /**覆盖整个画布**/ - g2.fillRect(0,0,w,h); - - g2.setComposite(AlphaComposite.SrcOut); - g2.setRenderingHint(RenderingHints.KEY_ANTIALIASING, - RenderingHints.VALUE_ANTIALIAS_ON); - g2.setColor(new Color(0,0,0)); - g2.setBackground(Color.black); - g2.setPaint(new Color(0,0,0)); - g2.fill(new RoundRectangle2D.Float(0, 0, w, h, arcw,arch)); - g2.setComposite(AlphaComposite.SrcAtop); - g2.drawImage(image, 0, 0, null); - g2.dispose(); - return output; - } -} diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/util/QRCodeGenerator.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/util/QRCodeGenerator.java deleted file mode 100644 index 0f1ed48a6..000000000 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/util/QRCodeGenerator.java +++ /dev/null @@ -1,59 +0,0 @@ -package com.accompany.business.util; - -import com.google.zxing.BarcodeFormat; -import com.google.zxing.EncodeHintType; -import com.google.zxing.MultiFormatWriter; -import com.google.zxing.WriterException; -import com.google.zxing.common.BitMatrix; -import com.google.zxing.qrcode.decoder.ErrorCorrectionLevel; - -import java.awt.image.BufferedImage; -import java.util.Hashtable; - -import static com.google.zxing.client.j2se.MatrixToImageConfig.BLACK; -import static com.google.zxing.client.j2se.MatrixToImageConfig.WHITE; - -/** - * @Author: chucheng - * @Date: 2019/7/11 19:10 - * @Description: 二维码生成器 - */ - -public class QRCodeGenerator { - - public static BufferedImage generateQRCodeImage(String content,int width, int height) throws WriterException { - Hashtable hints = new Hashtable(); - hints.put(EncodeHintType.ERROR_CORRECTION, ErrorCorrectionLevel.H); - hints.put(EncodeHintType.CHARACTER_SET, "utf-8"); - hints.put(EncodeHintType.MARGIN, 1); - BitMatrix bitMatrix = new MultiFormatWriter().encode(content, - BarcodeFormat.QR_CODE, width, height, hints); - //调用去除白边方法 - bitMatrix = deleteWhite(bitMatrix); - int w = bitMatrix.getWidth(); - int h = bitMatrix.getHeight(); - BufferedImage image = new BufferedImage(w, h,BufferedImage.TYPE_INT_RGB); - for (int x = 0; x < w; x++) { - for (int y = 0; y < h; y++) { - image.setRGB(x, y, bitMatrix.get(x, y) ? BLACK: WHITE); - } - } - return image; - } - - private static BitMatrix deleteWhite(BitMatrix matrix) { - int[] rec = matrix.getEnclosingRectangle(); - int resWidth = rec[2] + 1; - int resHeight = rec[3] + 1; - - BitMatrix resMatrix = new BitMatrix(resWidth, resHeight); - resMatrix.clear(); - for (int i = 0; i < resWidth; i++) { - for (int j = 0; j < resHeight; j++) { - if (matrix.get(i + rec[0], j + rec[1])) - resMatrix.set(i, j); - } - } - return resMatrix; - } -} diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/vo/FollowVo.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/vo/FollowVo.java index c4fab02cb..400a21d4d 100644 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/vo/FollowVo.java +++ b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/vo/FollowVo.java @@ -1,8 +1,7 @@ package com.accompany.business.vo; -import com.beust.jcommander.internal.Lists; +import com.google.common.collect.Lists; -import java.util.Collection; import java.util.Collections; import java.util.List; diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/vo/GiftVo.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/vo/GiftVo.java index e93182016..59d46e2c9 100644 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/vo/GiftVo.java +++ b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/vo/GiftVo.java @@ -3,7 +3,7 @@ package com.accompany.business.vo; import com.accompany.core.vo.vip.VipBaseInfoVO; import com.accompany.common.annotation.ReplaceDomain; import com.accompany.common.utils.ReplaceDomainInterface; -import com.beust.jcommander.internal.Lists; +import com.google.common.collect.Lists; import java.util.Collections; import java.util.List; diff --git a/accompany-business/accompany-business-web/src/main/java/com/accompany/business/controller/box/OpenBoxController.java b/accompany-business/accompany-business-web/src/main/java/com/accompany/business/controller/box/OpenBoxController.java index 730e4fd17..778bbabc5 100644 --- a/accompany-business/accompany-business-web/src/main/java/com/accompany/business/controller/box/OpenBoxController.java +++ b/accompany-business/accompany-business-web/src/main/java/com/accompany/business/controller/box/OpenBoxController.java @@ -90,7 +90,7 @@ public class OpenBoxController extends BaseController { Assert.isTrue(keyNum < 10000,"单次许愿不能大于9999"); OpenBoxResult openBoxResult = boxServiceFactory.getInstance(boxType) .draw(uid, roomUid, sendMessage, keyNum, deviceId); - Map map = com.beust.jcommander.internal.Maps.newHashMap(); + Map map = Maps.newHashMap(); map.put("prizeItemList", openBoxResult.getPrizeItemVoList()); map.put("remainKeyNum", openBoxResult.getRemainKeyNum()); map.put("goldNum", userPurseService.queryUserPurse(uid).getDiamonds()); diff --git a/accompany-business/accompany-business-web/src/main/java/com/accompany/business/controller/drawprize/PrizeCalc.java b/accompany-business/accompany-business-web/src/main/java/com/accompany/business/controller/drawprize/PrizeCalc.java deleted file mode 100644 index f1be804dd..000000000 --- a/accompany-business/accompany-business-web/src/main/java/com/accompany/business/controller/drawprize/PrizeCalc.java +++ /dev/null @@ -1,94 +0,0 @@ -package com.accompany.business.controller.drawprize; - -import com.beust.jcommander.internal.Lists; -import com.beust.jcommander.internal.Maps; - -import java.text.DecimalFormat; -import java.util.List; -import java.util.Map; - -/** - * Created by liuguofu on 2017/12/15. - */ -public class PrizeCalc { - private static DecimalFormat doubleFormat = new DecimalFormat("0.0000"); -// A:再抽一次，B:5金币，C:30金币，D:100金币，E:300金币，F:1000金币， -// G:3000金币，H:8888金币，I:六位靓号（价值10 000金币）J：四位靓号（价值15000金币） - - /** - * 2. 充值48只能抽BCD，期望为22.5金币 1,6,20 赔率 - 3. 充值98只能抽BCDE，期望为46金币 1,6,20,60 - 4. 充值198只能抽CDEF，期望为93金币 3,10,30,100 - 5. 充值498只能抽CDEFGHIJ,期望为245金币 3,10,30,100,300,888,100,150 - 6. 充值998只能抽DEFGHIJ，期望为492金币 1,3,10,30,888,100,150 - 7. 充值4998只能抽EFGHIJ,期望为2480金币 3,10,30,888,100,150 - 8. 充值9999只能抽FGHIJ，期望为5000金币 10,30,888,100,150 - * - */ - private static Map data= Maps.newHashMap(); - private static List prizeTimes= Lists.newArrayList(); -// private static int [] prize8={1,6,20}; -// private static int [] prize48={1,6,20}; -// private static int [] prize98={1,6,20,60}; -// private static int [] prize198={3,10,30,100}; -// private static int [] prize498={3,10,30,100,300,88,100,150}; -// private static int [] prize998={1,3,10,30,88,100,150}; -// private static int [] prize4998={3,10,30,88,100,150}; -// private static int [] prize9999={10,30,88,100,150}; - - private static int [] prize8={5,30,100}; - private static int [] prize48={5,30,100}; - private static int [] prize98={5,30,100,300}; - private static int [] prize198={30,100,300,1000}; - private static int [] prize498={30,100,300,1000,3000,8888,10000,15000}; - private static int [] prize998={100,300,1000,3000,8888,10000,15000}; - private static int [] prize4998={300,1000,3000,8888,10000,15000}; - private static int [] prize9999={1000,3000,8888,10000,15000}; - - private static int bb=1; - - private static String prizeName[]={"充值8元","充值48元","充值98元","充值198元","充值498元","充值998元", - "充值4998元","充值9999元"}; - - - public static void main(String args[]){ - calc(); - - } - public static void calc(){ - List list=Lists.newArrayList(); - list.add(prize8); - list.add(prize48); - list.add(prize98); - list.add(prize198); - list.add(prize498); - list.add(prize998); - list.add(prize4998); - list.add(prize9999); - String str=""; - for(int i=0;i1.8 ${basedir}/target - 3.3.0 + 3.9.0 3.1 3.2.9.RELEASE 3.2.5.RELEASE @@ -43,12 +43,9 @@ 2.3.2 3.1.0 4.5 - 1.7.21 - 1.2.16 - 28.0-jre + 31.1-jre 1.2.83 4.12 - 5.0.0-RC1 3.12.0 2.11.1 2.0.8 @@ -63,12 +60,8 @@ 2.5.0 3.2.2 2.11.0 - 1.9.4 - 3.2.1 2.7.18 2.0 - 3.4 - 1.6.1 5.5.1 1.0 6.0.17.Final @@ -79,9 +72,7 @@ 3.4.0 1.2.1 2.4.2 - 1.2 1.9.13 - 1.72.0 5.1.8 3.15 1.10.2 @@ -89,7 +80,6 @@ 1.1.0 1.1.8 1.3 - 1.4.9 1.0.5 7.10.0 5.5.3 @@ -261,12 +251,6 @@ ${fastjson.version} - - io.springside - springside-utils - ${springside.version} - - oro oro @@ -279,22 +263,6 @@ ${commons-io.version} - - commons-beanutils - commons-beanutils - ${commons-beanutils.version} - - - - com.google.zxing - core - ${com.google.zxing.version} - - - com.google.zxing - javase - ${com.google.zxing.version} - org.apache.cxf cxf-api @@ -306,17 +274,6 @@ ${commons-math.version} - - - dom4j - dom4j - ${dom4j.version} - - net.sf.dozer dozer @@ -394,22 +351,12 @@ - - com.thoughtworks.xstream - xstream - ${xstream.version} - com.aliyun.openservices ons-client ${ons-client.version} - - org.glassfish.web - jstl-impl - ${jstl-impl.version} - commons-fileupload commons-fileupload @@ -461,11 +408,6 @@ aliyun-sdk-mns ${aliyun-sdk-mns.version} - - net.bull.javamelody - javamelody-core - ${javamelody-core.version} - com.github.pagehelper pagehelper @@ -492,11 +434,6 @@ spring-security-oauth2-autoconfigure ${spring-security-oauth2-autoconfigure.version} - - - - - com.aliyun aliyun-java-sdk-cloudauth @@ -575,10 +512,6 @@ com.alibaba fastjson - - io.springside - springside-utils - oro oro @@ -591,44 +524,19 @@ commons-io commons-io - - commons-beanutils - commons-beanutils - org.projectlombok lombok - - - - - - - - - - - - - - org.springframework spring-context-support - - com.google.zxing - core - + org.yaml snakeyaml - - com.google.zxing - javase - org.apache.commons commons-lang3 @@ -641,33 +549,6 @@ org.apache.commons commons-math - - - org.glassfish.jersey.core - jersey-client - - - org.glassfish.jersey.media - jersey-media-json-jackson - - - org.glassfish.jersey.media - jersey-media-multipart - - - - - dom4j - dom4j - - - - net.sf.dozer - dozer - net.sourceforge.jchardet @@ -771,25 +652,6 @@ sitemesh runtime - - - org.glassfish.web - jstl-impl - - - servlet-api - javax.servlet - - - jsp-api - javax.servlet.jsp - - - jstl-api - javax.servlet.jsp.jstl - - - @@ -801,17 +663,11 @@ micrometer-registry-prometheus - org.springframework.boot spring-boot-starter-test - - net.bull.javamelody - javamelody-core - - org.springframework.cloud spring-cloud-starter-alibaba-nacos-config @@ -1002,10 +858,6 @@ org.springframework.cloud spring-cloud-starter-openfeign - - org.springframework.cloud - spring-cloud-starter-netflix-hystrix - org.springframework.cloud spring-cloud-starter-netflix-ribbon diff --git a/xuanyin-game-match/src/main/java/com/xuanyin/gamematch/service/impl/GameManageServiceImpl.java b/xuanyin-game-match/src/main/java/com/xuanyin/gamematch/service/impl/GameManageServiceImpl.java index 26bd18a1d..82ea793f7 100644 --- a/xuanyin-game-match/src/main/java/com/xuanyin/gamematch/service/impl/GameManageServiceImpl.java +++ b/xuanyin-game-match/src/main/java/com/xuanyin/gamematch/service/impl/GameManageServiceImpl.java @@ -1,5 +1,6 @@ package com.xuanyin.gamematch.service.impl; +import cn.hutool.core.collection.CollectionUtil; import com.accompany.common.constant.Constant; import com.accompany.common.redis.RedisKey; import com.accompany.common.status.BusiStatus; @@ -28,7 +29,6 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.ApplicationContext; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import org.springside.modules.utils.collection.CollectionUtil; import java.util.ArrayList; import java.util.Arrays; diff --git a/xuanyin-game-match/src/test/resources/application-native.yml b/xuanyin-game-match/src/test/resources/application-native.yml index 8c6948e7d..dd62c2cb3 100644 --- a/xuanyin-game-match/src/test/resources/application-native.yml +++ b/xuanyin-game-match/src/test/resources/application-native.yml @@ -5,28 +5,11 @@ spring: username: root password: anan@dev## driver-class-name: com.mysql.jdbc.Driver - druid: - initial-size: 5 - max-active: 120 - min-idle: 5 - max-wait: 60000 - time-between-eviction-runs-millis: 60000 - min-evictable-idle-time-millis: 300000 - validation-query: SELECT 1 FROM DUAL - test-while-idle: true - test-on-borrow: false - test-on-return: false - pool-prepared-statements: true - max-pool-prepared-statement-per-connection-size: 50 - filters: stat,wall - connection-properties=druid.stat.mergeSql: true;druid.stat.slowSqlMillis=500 - use-global-data-source-stat: true + type: com.zaxxer.hikari.HikariDataSource hikari: minimum-idle: 10 maximum-pool-size: 20 connection-test-query: select 1 - max-lifetime: 0 - connection-timeout: 30000 data: mongodb: host: 118.194.255.128