fix : 优化修改

game-module/game-module-sdk/src/main/java/com/zanxiang/game/module/sdk/enums/LoginTypeEnum.java

@@ -12,15 +12,20 @@ import lombok.Getter;
 @AllArgsConstructor
 public enum LoginTypeEnum {
 
+    /**
+     * 注册
+     */
+    LOGIN_REG(0, "注册"),
+
     /**
      * 登录
      */
-    LOGIN_IN(0, "登录"),
+    LOGIN_IN(1, "登录"),
 
     /**
      * 退出
      */
-    LOGIN_OUT(1, "退出");
+    LOGIN_OUT(2, "退出");
 
     /**
      * 登录类型

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

@@ -56,8 +56,7 @@ public class GameUserRoleServiceImpl extends ServiceImpl<GameUserRoleMapper, Gam
         Integer dataType = param.getDataType();
         //选择服务器
         if (Objects.equals(dataType, DataTypeEnum.TYPE_SELECT_SERVER.getDateType())) {
-            User user = userService.getById(userData.getUserId());
-            return userLoginLogService.createUserLoginLog(user, LoginTypeEnum.LOGIN_IN.getLoginType(), userData.getDeviceType());
+            return userLoginLogService.createRoleLoginLog(userData, param.getRoleId(), param.getRoleName(), LoginTypeEnum.LOGIN_IN.getLoginType());
         }
         //创建角色
         if (Objects.equals(dataType, DataTypeEnum.TYPE_CREATE_ROLE.getDateType())) {
@@ -92,10 +91,10 @@ public class GameUserRoleServiceImpl extends ServiceImpl<GameUserRoleMapper, Gam
         return Boolean.FALSE;
     }
 
-    private Boolean createRoleUpdate(GameUserRoleUpdateParam param, UserData userData) {
+    private void createRoleUpdate(GameUserRoleUpdateParam param, UserData userData) {
         //上锁
         if (!distributedLockComponent.doLock(RedisKeyConstant.ROLE_UPDATE_KEY + "_" + userData.getUserId(), 0L, 1L, TimeUnit.MINUTES)) {
-            return Boolean.FALSE;
+            return;
         }
         //查询玩家信息
         GameUser gameUser = gameUserService.getOne(new LambdaQueryWrapper<GameUser>().eq(GameUser::getGameId, userData.getGameId())
@@ -105,7 +104,9 @@ public class GameUserRoleServiceImpl extends ServiceImpl<GameUserRoleMapper, Gam
                 .eq(GameUserRole::getGameId, userData.getGameId())
                 .eq(GameUserRole::getRoleId, param.getRoleId()));
         if (userRole != null) {
-            return Boolean.TRUE;
+            //释放锁
+            distributedLockComponent.unlock(RedisKeyConstant.ROLE_UPDATE_KEY + "_" + userData.getUserId());
+            return;
         }
         userRole = GameUserRole.builder()
                 .userId(userData.getUserId())
@@ -136,7 +137,5 @@ public class GameUserRoleServiceImpl extends ServiceImpl<GameUserRoleMapper, Gam
                 .eq(User::getId, gameUser.getUserId()));
         //释放锁
         distributedLockComponent.unlock(RedisKeyConstant.ROLE_UPDATE_KEY + "_" + userData.getUserId());
-        //返回
-        return Boolean.TRUE;
     }
 }

game-module/game-module-sdk/src/main/java/com/zanxiang/game/module/sdk/service/impl/LoginServiceImpl.java

@@ -252,7 +252,7 @@ public class LoginServiceImpl implements IRegisterLoginService {
         //获取token
         String userToken = userTokenService.getUserToken(user.getId(), userData.getDeviceType());
         //插入用户登录记录
-        userLoginLogService.createUserLoginLog(user, LoginTypeEnum.LOGIN_IN.getLoginType(), userData.getDeviceType());
+        userLoginLogService.createUserLoginLog(user, LoginTypeEnum.LOGIN_REG.getLoginType(), userData.getDeviceType());
         //查询用户实名信息
         UserCard userCard = userCardService.getOne(new LambdaQueryWrapper<UserCard>().eq(UserCard::getUserId, user.getId()));
         //查询游戏