Merge branch 'dev' of GameCenter/game-center into master

game-module/game-module-base/src/main/java/com/zanxiang/game/module/base/pojo/enums/HttpStatusEnum.java

@@ -65,27 +65,27 @@ public enum HttpStatusEnum {
     /**
      * 用户名太短
      */
-    USERNAME_TOO_SHORT(41105, "用户名太短"),
+    USERNAME_TOO_SHORT(41105, "用户名太短, 用户名需数字与字母组合,长度为:8-16"),
 
     /**
      * 用户名太长
      */
-    USERNAME_TOO_LONG(41106, "用户名太长"),
+    USERNAME_TOO_LONG(41106, "用户名太长, 用户名需数字与字母组合,长度为:8-16"),
 
     /**
      * 用户名必须为数字字母组合
      */
-    USERNAME_BAD_CHAR(41107, "用户名必须为数字字母组合"),
+    USERNAME_BAD_CHAR(41107, "用户名必须为数字字母组合,长度为:8-16"),
 
     /**
      * 账号停用
      */
-    ACCOUNT_HALT(41108, "账号停用"),
+    ACCOUNT_HALT(41108, "账号停用, 请联系客服"),
 
     /**
      * ip封禁
      */
-    IP_HALT(41109, "ip封禁"),
+    IP_HALT(41109, "ip封禁, 请联系客服"),
 
     /**
      * 账户未绑定手机
@@ -105,17 +105,17 @@ public enum HttpStatusEnum {
     /**
      * 密码必须为数字字母组合
      */
-    PASSWORD_BAD_CHAR(41202, "密码必须为数字字母组合"),
+    PASSWORD_BAD_CHAR(41202, "密码必须为数字字母组合,长度为:6-24"),
 
     /**
      * 密码太长
      */
-    PASSWORD_TOO_LONG(41203, "密码太长"),
+    PASSWORD_TOO_LONG(41203, "密码太长, 密码需数字与字母组合,长度为:6-24"),
 
     /**
      * 密码太短
      */
-    PASSWORD_TOO_SHORT(41204, "密码太短"),
+    PASSWORD_TOO_SHORT(41204, "密码太短, 密码需数字与字母组合,长度为:6-24"),
 
     /**
      * 密码错误

game-module/game-module-manage/src/main/java/com/zanxiang/game/module/manage/pojo/vo/UserVO.java

@@ -111,6 +111,12 @@ public class UserVO {
     @ApiModelProperty(notes = "注册游戏")
     private String regGame;
 
+    /**
+     * 游戏类型名称
+     */
+    @ApiModelProperty(notes = "游戏类型名称")
+    private String categoryName;
+
     /**
      * 用户状态, 0 : 为正常状态, 1 : 为冻结状态
      */

game-module/game-module-manage/src/main/java/com/zanxiang/game/module/manage/service/impl/GameUserRoleServiceImpl.java

@@ -107,7 +107,7 @@ public class GameUserRoleServiceImpl extends ServiceImpl<GameUserRoleMapper, Gam
         //渠道id
         List<Long> agentIdList = agentDTOList.stream().map(AgentDTO::getId).collect(Collectors.toList());
         //管理员可见自然量数据
-        if (SecurityUtil.isManager()) {
+        if (SecurityUtil.isManager() && param.getChannelId() != null) {
             agentIdList.add(Agent.DEFAULT_AGENT);
         }
         //玩家条件处理

game-module/game-module-manage/src/main/java/com/zanxiang/game/module/manage/service/impl/GameUserServiceImpl.java

@@ -15,10 +15,12 @@ import com.zanxiang.game.module.manage.pojo.params.GameUserListParam;
 import com.zanxiang.game.module.manage.pojo.vo.GameUserListVO;
 import com.zanxiang.game.module.manage.pojo.vo.GameUserVO;
 import com.zanxiang.game.module.manage.service.*;
+import com.zanxiang.game.module.mybatis.entity.Agent;
 import com.zanxiang.game.module.mybatis.entity.GameUser;
 import com.zanxiang.game.module.mybatis.mapper.GameUserMapper;
 import com.zanxiang.module.util.bean.BeanUtil;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.logging.log4j.util.Strings;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -69,8 +71,9 @@ public class GameUserServiceImpl extends ServiceImpl<GameUserMapper, GameUser> i
         //渠道id
         List<Long> agentIdList = agentDTOList.stream().map(AgentDTO::getId).collect(Collectors.toList());
         //管理员可见自然量数据
-        if (SecurityUtil.isManager()) {
-            agentIdList.add(0L);
+        if (SecurityUtil.isManager() && Strings.isBlank(param.getAccountId())
+                && Strings.isBlank(param.getPitcherId()) && param.getChannelId() != null) {
+            agentIdList.add(Agent.DEFAULT_AGENT);
         }
         //玩家条件处理
         Map<Long, UserDTO> userMap = userService.userCondition(param.getUserId(), agentIdList, param.getUserName(),

game-module/game-module-manage/src/main/java/com/zanxiang/game/module/manage/service/impl/OrderServiceImpl.java

@@ -14,6 +14,7 @@ import com.zanxiang.game.module.manage.pojo.vo.OrderListVO;
 import com.zanxiang.game.module.manage.pojo.vo.OrderVO;
 import com.zanxiang.game.module.manage.pojo.vo.UserOrderListVO;
 import com.zanxiang.game.module.manage.service.*;
+import com.zanxiang.game.module.mybatis.entity.Agent;
 import com.zanxiang.game.module.mybatis.entity.Order;
 import com.zanxiang.game.module.mybatis.entity.User;
 import com.zanxiang.game.module.mybatis.mapper.OrderMapper;
@@ -102,8 +103,9 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
         //渠道id列表
         List<Long> agentIds = agentDTOList.stream().map(AgentDTO::getId).collect(Collectors.toList());
         //管理员可见自然量数据
-        if (SecurityUtil.isManager()) {
-            agentIds.add(0L);
+        if (SecurityUtil.isManager() && Strings.isBlank(param.getAccountId())
+                && Strings.isBlank(param.getPitcherId()) && param.getChannelId() != null) {
+            agentIds.add(Agent.DEFAULT_AGENT);
         }
         //查询用户id和名字条件
         List<Long> userIds = null;

game-module/game-module-manage/src/main/java/com/zanxiang/game/module/manage/service/impl/UserCardServiceImpl.java

@@ -14,6 +14,7 @@ import com.zanxiang.game.module.manage.pojo.vo.UserCardVO;
 import com.zanxiang.game.module.manage.service.IAgentService;
 import com.zanxiang.game.module.manage.service.IUserCardService;
 import com.zanxiang.game.module.manage.service.IUserService;
+import com.zanxiang.game.module.mybatis.entity.Agent;
 import com.zanxiang.game.module.mybatis.entity.UserCard;
 import com.zanxiang.game.module.mybatis.mapper.UserCardMapper;
 import com.zanxiang.module.util.bean.BeanUtil;
@@ -57,7 +58,7 @@ public class UserCardServiceImpl extends ServiceImpl<UserCardMapper, UserCard> i
         List<Long> agentIdList = agentDTOList.stream().map(AgentDTO::getId).collect(Collectors.toList());
         //管理员可见自然量数据
         if (SecurityUtil.isManager()) {
-            agentIdList.add(0L);
+            agentIdList.add(Agent.DEFAULT_AGENT);
         }
         //玩家条件处理
         Map<Long, UserDTO> userMap = userService.userCondition(param.getUserId(), agentIdList, param.getUserName(),

game-module/game-module-manage/src/main/java/com/zanxiang/game/module/manage/service/impl/UserServiceImpl.java

@@ -78,8 +78,9 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements IU
         //渠道id列表
         List<Long> agentIdList = agentDTOList.stream().map(AgentDTO::getId).collect(Collectors.toList());
         //管理员可见自然量数据
-        if (SecurityUtil.isManager()) {
-            agentIdList.add(0L);
+        if (SecurityUtil.isManager() && Strings.isBlank(param.getAccountId())
+                && Strings.isBlank(param.getPitcherId()) && param.getChannelId() != null) {
+            agentIdList.add(Agent.DEFAULT_AGENT);
         }
         Map<Long, CpDTO> cpMap = cpService.cpMap();
         Map<Long, AgentDTO> agentMap = agentDTOList.stream().collect(Collectors.toMap(AgentDTO::getId, Function.identity()));
@@ -181,6 +182,7 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements IU
         GameDTO gameDTO = gameService.getById(user.getGameId());
         if (gameDTO != null) {
             userVO.setRegGame(gameDTO.getName());
+            userVO.setCategoryName(GameCategoryEnum.getNameByCategory(gameDTO.getCategory()));
         }
         //渠道
         Agent agent = agentService.getById(user.getAgentId());

game-module/game-module-sdk/src/main/java/com/zanxiang/game/module/sdk/service/pay/AliPayService.java

@@ -133,7 +133,6 @@ public class AliPayService extends PayBaseService {
 
     @Override
     public String notify(HttpServletRequest request, HttpServletResponse response) {
-        log.error("支付宝异步回调 -------start----->");
         //解密回调参数
         Map<String, String> params = new HashMap<>(26);
         Enumeration<String> parameterNames = request.getParameterNames();
@@ -174,7 +173,6 @@ public class AliPayService extends PayBaseService {
                     .eq(Order::getOrderId, orderNo));
         }
         //返回消息接收成功
-        log.error("支付宝异步回调 -------end----->");
         return HttpStatusEnum.SUCCESS.getMsg();
     }
 

game-module/game-module-sdk/src/main/java/com/zanxiang/game/module/sdk/service/pay/WxPayService.java

@@ -144,10 +144,7 @@ public class WxPayService extends PayBaseService {
         String requestStr = IOUtils.toString(inputStream, StandardCharsets.UTF_8);
         // 解析xml成map
         Map<String, String> packageParams = XmlUtil.xmlToMap(requestStr);
-
-        log.error("微信支付回调参数, packageParams : {}", JsonUtil.toString(packageParams));
-
-
+        log.error("微信支付回调参数, packageParams : {}, config : {}", JsonUtil.toString(packageParams), JsonUtil.toString(config));
         //获取订单信息
         String attachStr = packageParams.get("attach");
         ProductPayAttachParamDTO attachBO = JsonUtil.toObj(attachStr, ProductPayAttachParamDTO.class);
@@ -159,11 +156,6 @@ public class WxPayService extends PayBaseService {
             return null;
         }
         configInit(gamePayWayService.getById(attachBO.getGamePayWayId()));
-
-
-        log.error("微信支付回调参数, config : {}", JsonUtil.toString(config));
-
-
         // 账号信息
         String key = config.getApiKey();
         // 判断签名是否正确
@@ -250,10 +242,6 @@ public class WxPayService extends PayBaseService {
             }
             //下单
             Map<String, String> successMap = this.unifiedOrder(product, WX_PAY_JSAPI, openId);
-
-
-            log.error("-------------- 1111 --------------> ");
-
             // 支付参数
             String prepayId = successMap.get("prepay_id");
             // 随机字符串

game-module/game-module-sdk/src/main/java/com/zanxiang/game/module/sdk/util/RegisterUtil.java

@@ -19,12 +19,12 @@ public class RegisterUtil {
     /**
      * 用户名最小长度
      */
-    private static final int USER_NAME_LENGTH_MIN = 4;
+    private static final int USER_NAME_LENGTH_MIN = 8;
 
     /**
      * 用户名最大长度
      */
-    private static final int USER_NAME_LENGTH_MAX = 32;
+    private static final int USER_NAME_LENGTH_MAX = 16;
 
     /**
      * 密码最小长度
@@ -34,7 +34,7 @@ public class RegisterUtil {
     /**
      * 密码最大长度
      */
-    private static final int PASSWORD_LENGTH_MAX = 32;
+    private static final int PASSWORD_LENGTH_MAX = 24;
 
     /**
      * 用户名合规检测