feat : 接口修改代码提交

game-module/game-common/src/main/java/com/zanxiang/common/enums/DeviceTypeEnum.java

@@ -3,6 +3,8 @@ package com.zanxiang.common.enums;
 import lombok.AllArgsConstructor;
 import lombok.Getter;
 
+import java.util.Objects;
+
 /**
  * @author : lingfeng
  * @time : 2022-06-07
@@ -41,4 +43,13 @@ public enum DeviceTypeEnum {
      * 描述
      */
     private String describe;
+
+    public static DeviceTypeEnum getByDeviceType(Integer deviceType) {
+        for (DeviceTypeEnum deviceTypeEnum : DeviceTypeEnum.values()) {
+            if (Objects.equals(deviceTypeEnum.getDeviceType(), deviceType)) {
+                return deviceTypeEnum;
+            }
+        }
+        return null;
+    }
 }

game-module/game-mybatis/src/main/java/com/zanxiang/mybatis/entity/GameKey.java

@@ -49,6 +49,31 @@ public class GameKey implements Serializable {
      */
     private String payKey;
 
+    /**
+     * 客服手机
+     */
+    private String customerPhone;
+
+    /**
+     * 客服QQ
+     */
+    private String customerQq;
+
+    /**
+     * 公众号id
+     */
+    private String mpAppId;
+
+    /**
+     * 公众号名字
+     */
+    private String mpAppName;
+
+    /**
+     * 公众号二维码图片地址
+     */
+    private String mpCode;
+
     /**
      * 创建时间
      */

game-module/game-sdk/src/main/java/com/zanxiang/sdk/adapter/ArgumentAdapter.java

@@ -2,6 +2,7 @@ package com.zanxiang.sdk.adapter;
 
 import com.zanxiang.common.enums.HttpStatusEnum;
 import com.zanxiang.common.exception.CustomException;
+import com.zanxiang.common.utils.IpUtils;
 import com.zanxiang.common.utils.StringUtils;
 import com.zanxiang.sdk.annotation.ValidLogin;
 import com.zanxiang.sdk.domain.dto.UserTokenDTO;
@@ -54,7 +55,8 @@ public class ArgumentAdapter implements HandlerMethodArgumentResolver {
         String os = request.getHeader("os");
         Integer deviceType = Integer.valueOf(request.getHeader("deviceType"));
         Long gameId = Long.valueOf(request.getHeader("gameId"));
-        UserData data = UserData.builder().gameId(gameId).deviceType(deviceType).deviceSystem(os).build();
+        String ip = IpUtils.getRealIp(request);
+        UserData data = UserData.builder().gameId(gameId).deviceType(deviceType).deviceSystem(os).ip(ip).build();
         //不需要登录, token不存在
         if (StringUtils.isEmpty(token)) {
             return data;

game-module/game-sdk/src/main/java/com/zanxiang/sdk/adapter/WebHandlerAdapter.java

@@ -1,5 +1,6 @@
 package com.zanxiang.sdk.adapter;
 
+import com.zanxiang.common.enums.DeviceTypeEnum;
 import com.zanxiang.common.enums.HttpStatusEnum;
 import com.zanxiang.common.exception.CustomException;
 import com.zanxiang.common.utils.StringUtils;
@@ -56,6 +57,11 @@ public class WebHandlerAdapter implements HandlerInterceptor {
             log.error("非法参数, 请求头中缺少必传参数");
             throw new CustomException(HttpStatusEnum.INVALID_PARAMS);
         }
+        //前端类型检测
+        DeviceTypeEnum deviceTypeEnum = DeviceTypeEnum.getByDeviceType(Integer.valueOf(deviceType));
+        if (deviceTypeEnum == null) {
+            throw new CustomException(HttpStatusEnum.INVALID_PARAMS);
+        }
         //签名验证
         GameKey gameKey = gameKeyService.getByGameId(Long.valueOf(gameId));
         if (gameKey == null || Strings.isBlank(gameKey.getAppKey())) {

game-module/game-sdk/src/main/java/com/zanxiang/sdk/controller/LoginController.java

@@ -4,6 +4,7 @@ import com.zanxiang.common.domain.ResultVO;
 import com.zanxiang.sdk.annotation.UnSignCheck;
 import com.zanxiang.sdk.domain.params.LoginMobileParam;
 import com.zanxiang.sdk.domain.params.LoginPasswordParam;
+import com.zanxiang.sdk.domain.params.UserData;
 import com.zanxiang.sdk.domain.vo.UserLoginVO;
 import com.zanxiang.sdk.service.RegisterLoginService;
 import com.zanxiang.sdk.service.UserTokenService;
@@ -15,8 +16,6 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
-import javax.servlet.http.HttpServletRequest;
-
 /**
  * @author : lingfeng
  * @time : 2022-06-21
@@ -37,22 +36,23 @@ public class LoginController {
     @GetMapping("/token/check")
     @UnSignCheck
     @ApiResponses(value = {@ApiResponse(code = 200, message = "成功", response = Long.class)})
-    public ResultVO userTokenCheck(@RequestParam Long gameId, @RequestParam Long userId, @RequestParam String token, @RequestParam String sign) {
+    public ResultVO userTokenCheck(@RequestParam Long gameId, @RequestParam Long userId, @RequestParam String token,
+                                   @RequestParam String sign) {
         return userTokenService.userTokenCheck(gameId, userId, token, sign);
     }
 
     @ApiOperation(value = "用户账号注册/登录")
     @PostMapping("/password")
     @ApiResponses(value = {@ApiResponse(code = 200, message = "成功", response = UserLoginVO.class)})
-    public ResultVO<UserLoginVO> loginPassword(@Validated @RequestBody LoginPasswordParam param, HttpServletRequest request) {
-        return registerPassword.loginPassword(param, request);
+    public ResultVO<UserLoginVO> loginPassword(@Validated @RequestBody LoginPasswordParam param, UserData userData) {
+        return registerPassword.loginPassword(param, userData);
     }
 
     @ApiOperation(value = "用户手机号注册/登录")
     @PostMapping("/mobile")
     @ApiResponses(value = {@ApiResponse(code = 200, message = "成功", response = UserLoginVO.class)})
-    public ResultVO<UserLoginVO> loginMobile(@Validated @RequestBody LoginMobileParam param, HttpServletRequest request) {
-        return registerPassword.loginMobile(param, request);
+    public ResultVO<UserLoginVO> loginMobile(@Validated @RequestBody LoginMobileParam param, UserData userData) {
+        return registerPassword.loginMobile(param, userData);
     }
 
     @ApiOperation(value = "用户退出")

game-module/game-sdk/src/main/java/com/zanxiang/sdk/controller/UserController.java

@@ -61,39 +61,19 @@ public class UserController {
         return userCardService.userAuthentication(param, userData);
     }
 
-    @ApiOperation(value = "用户获取信息详情")
+    @ApiOperation(value = "获取用户信息")
     @PostMapping("/get/user/detail")
     @ApiResponses(value = {@ApiResponse(code = 200, message = "成功", response = UserLoginVO.class)})
     public ResultVO getUserDetail(@Validated @RequestBody UserDetailParam userDetailParam, UserData userData) {
         return userService.getUserDetail(userDetailParam, userData);
     }
 
-//    @ApiOperation(value = "更新用户授权信息")
-//    @PostMapping("/update/user/Oauth")
-//    @ApiResponses(value = {@ApiResponse(code = 200, message = "成功", response = Boolean.class)})
-//    public ResultVO updateUserOauth(@Validated @RequestBody UserOauthlUpdateParam param, @ValidLogin UserData userData) {
-//        return userOauthService.updateUserOauth(param, userData);
-//    }
-//
-//    @ApiOperation(value = "创建/更新游戏用户")
-//    @PostMapping("/update/game/user")
-//    @ApiResponses(value = {@ApiResponse(code = 200, message = "成功", response = Boolean.class)})
-//    public ResultVO updateGameUser(@Validated @RequestBody GameUserUpdateParam param, @ValidLogin UserData userData) {
-//        return ResultVO.ok(gameUserService.updateGameUser(param, userData));
-//    }
-//
-//    @ApiOperation(value = "上传角色信息")
-//    @PostMapping("/update/game/role")
-//    @ApiResponses(value = {@ApiResponse(code = 200, message = "成功", response = UserLoginVO.class)})
-//    public ResultVO updateUserGameRole(@Validated @RequestBody GameUserRoleUpdateParam param, @ValidLogin UserData userData) {
-//        return ResultVO.ok(gameUserRoleService.updateUserGameRole(param, userData));
-//    }
-//
-//    @ApiOperation(value = "用户信息检测")
-//    @PostMapping("/check")
-//    @ApiResponses(value = {@ApiResponse(code = 200, message = "成功", response = UserLoginVO.class)})
-//    public ResultVO upUserGameRole(@Validated @RequestBody UserCheckParam param, @ValidLogin UserData userData) {
-//        return ResultVO.ok(userService.userCheck(param, userData));
-//    }
+    @ApiOperation(value = "上传角色信息")
+    @PostMapping("/update/game/role")
+    @ApiResponses(value = {@ApiResponse(code = 200, message = "成功", response = UserLoginVO.class)})
+    public ResultVO updateUserGameRole(@Validated @RequestBody GameUserRoleUpdateParam param, @ValidLogin UserData userData) {
+//       return ResultVO.ok(gameUserRoleService.updateUserGameRole(param, userData));
+        return null;
+    }
 
 }

game-module/game-sdk/src/main/java/com/zanxiang/sdk/domain/params/UserData.java

@@ -31,12 +31,17 @@ public class UserData implements Serializable {
     private Long gameId;
 
     /**
-     * 设备类型;
+     * 客户端类型, 1:安卓app, 2: 苹果iosApp, 3: h5网页, 4 : 小程序(小游戏)
      */
     private Integer deviceType;
 
     /**
-     * 设备类型(android / ios)
+     * 客户端操作系统, android, ios, windows, mac
      */
     private String deviceSystem;
+
+    /**
+     * 客户端ip
+     */
+    private String ip;
 }

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

@@ -2,8 +2,6 @@ package com.zanxiang.sdk.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.zanxiang.mybatis.entity.GameUser;
-import com.zanxiang.sdk.domain.params.GameUserUpdateParam;
-import com.zanxiang.sdk.domain.params.UserData;
 
 /**
  * @author : xufeng
@@ -11,12 +9,4 @@ import com.zanxiang.sdk.domain.params.UserData;
  * @description : 玩家游戏
  */
 public interface GameUserService extends IService<GameUser> {
-
-    /**
-     * 更新/创建游戏用户
-     * 12312
-     *
-     * @return
-     */
-    Boolean updateGameUser(GameUserUpdateParam param, UserData userData);
 }

game-module/game-sdk/src/main/java/com/zanxiang/sdk/service/Impl/GameUserImpl.java

@@ -1,53 +0,0 @@
-package com.zanxiang.sdk.service.Impl;
-
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.zanxiang.common.exception.ParamNullException;
-import com.zanxiang.common.utils.StringUtils;
-import com.zanxiang.common.utils.bean.BeanUtils;
-import com.zanxiang.mybatis.entity.GameUser;
-import com.zanxiang.mybatis.mapper.GameUserMapper;
-import com.zanxiang.sdk.domain.params.GameUserUpdateParam;
-import com.zanxiang.sdk.domain.params.UserData;
-import com.zanxiang.sdk.service.GameUserService;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.stereotype.Service;
-
-import java.util.Objects;
-
-/**
- * @author : xufeng
- * @time : 2022-07-06
- */
-@Slf4j
-@Service
-public class GameUserImpl extends ServiceImpl<GameUserMapper, GameUser> implements GameUserService {
-
-    @Override
-    public Boolean updateGameUser(GameUserUpdateParam param, UserData userData) {
-        if (StringUtils.isEmpty(param.getGameId())) {
-            throw new ParamNullException("GameId");
-        }
-        Long gameId = Long.valueOf(param.getGameId());
-        GameUser where = new GameUser();
-        where.setUserId(userData.getUserId());
-        where.setGameId(gameId);
-
-        GameUser one = super.getOne(new LambdaQueryWrapper<GameUser>()
-                .setEntity(where)
-                .last("limit 1")
-        );
-        GameUser GameUserData = BeanUtils.copy(param, GameUser.class);
-        GameUserData.setUserId(userData.getUserId());
-        GameUserData.setGameId(gameId);
-        if (Objects.isNull(one)) {
-            //新增
-            super.save(GameUserData);
-        } else {
-            //更新
-            super.update(GameUserData, new UpdateWrapper<GameUser>().setEntity(where));
-        }
-        return true;
-    }
-}

game-module/game-sdk/src/main/java/com/zanxiang/sdk/service/Impl/GameUserServiceImpl.java

@@ -0,0 +1,18 @@
+package com.zanxiang.sdk.service.Impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.zanxiang.mybatis.entity.GameUser;
+import com.zanxiang.mybatis.mapper.GameUserMapper;
+import com.zanxiang.sdk.service.GameUserService;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Service;
+
+/**
+ * @author : xufeng
+ * @time : 2022-07-06
+ */
+@Slf4j
+@Service
+public class GameUserServiceImpl extends ServiceImpl<GameUserMapper, GameUser> implements GameUserService {
+
+}

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

@@ -3,7 +3,6 @@ package com.zanxiang.sdk.service.Impl;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.zanxiang.common.domain.ResultVO;
 import com.zanxiang.common.enums.AccountStatusEnum;
-import com.zanxiang.common.enums.DeviceTypeEnum;
 import com.zanxiang.common.enums.HttpStatusEnum;
 import com.zanxiang.common.enums.SmsTypeEnum;
 import com.zanxiang.common.exception.BaseException;
@@ -89,16 +88,17 @@ public class LoginServiceImpl implements RegisterLoginService {
     /**
      * 用户名注册或者登录
      *
-     * @param param   : 注册登录参数
-     * @param request : 请求信息
+     * @param param    : 注册登录参数
+     * @param userData : 用户信息
      * @return : 返回用户登录信息
      */
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public ResultVO<UserLoginVO> loginPassword(LoginPasswordParam param, HttpServletRequest request) {
+    public ResultVO<UserLoginVO> loginPassword(LoginPasswordParam param, UserData userData) {
         String username = param.getUsername();
         String password = param.getPassword();
-        Long gameId = Long.valueOf(request.getHeader("gameId"));
+        Long gameId = userData.getGameId();
+        Integer deviceType = userData.getDeviceType();
         Integer type = param.getType();
         //用户信息
         User user;
@@ -128,7 +128,7 @@ public class LoginServiceImpl implements RegisterLoginService {
                     .gameId(gameId)
                     .username(username)
                     .password(RegisterUtil.cmfPassword(password))
-                    .deviceType(DeviceTypeEnum.DEVICE_TYPE_ANDROID.getDeviceType())
+                    .deviceType(deviceType)
                     .status(AccountStatusEnum.NORMAL_STATUS.getStatus())
                     .authentication(0)
                     .createTime(LocalDateTime.now())
@@ -136,12 +136,10 @@ public class LoginServiceImpl implements RegisterLoginService {
                     .build();
             userService.save(user);
         }
-        //登录的ip
-        String realIp = IpUtils.getRealIp(request);
         //插入用户登录记录
-        userLoginLogService.addUserLoginLog(realIp, user, gameId, 0);
+        userLoginLogService.addUserLoginLog(userData.getIp(), user, gameId, 0);
         //验证通过, 获取token
-        String userToken = userTokenService.getUserToken(user.getId(), DeviceTypeEnum.DEVICE_TYPE_ANDROID.getDeviceType());
+        String userToken = userTokenService.getUserToken(user.getId(), deviceType);
         //构造用户登录信息
         UserLoginVO userLoginVO = UserLoginVO.builder()
                 .userId(user.getId())
@@ -157,16 +155,17 @@ public class LoginServiceImpl implements RegisterLoginService {
     /**
      * 手机号登录
      *
-     * @param param   : 手机号登录参数
-     * @param request : 请求信息
+     * @param param    : 手机号登录参数
+     * @param userData : 用户信息
      * @return : 返回登录信息
      */
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public ResultVO<UserLoginVO> loginMobile(LoginMobileParam param, HttpServletRequest request) {
+    public ResultVO<UserLoginVO> loginMobile(LoginMobileParam param, UserData userData) {
         String mobile = param.getMobile();
         String code = param.getCode();
-        Long gameId = Long.valueOf(request.getHeader("gameId"));
+        Long gameId = userData.getGameId();
+        Integer deviceType = userData.getDeviceType();
         //验证码校验
         HttpStatusEnum httpStatusEnum = smsService.smsCheck(SmsTypeEnum.SMS_REG.getType(), mobile, code);
         //验证不通过, 返回
@@ -180,7 +179,7 @@ public class LoginServiceImpl implements RegisterLoginService {
             user = User.builder()
                     .gameId(gameId)
                     .mobile(mobile)
-                    .deviceType(DeviceTypeEnum.DEVICE_TYPE_ANDROID.getDeviceType())
+                    .deviceType(deviceType)
                     .status(AccountStatusEnum.NORMAL_STATUS.getStatus())
                     .authentication(0)
                     .createTime(LocalDateTime.now())
@@ -194,11 +193,9 @@ public class LoginServiceImpl implements RegisterLoginService {
             }
         }
         //验证通过, 获取token
-        String userToken = userTokenService.getUserToken(user.getId(), DeviceTypeEnum.DEVICE_TYPE_ANDROID.getDeviceType());
-        //登录的ip
-        String realIp = IpUtils.getRealIp(request);
+        String userToken = userTokenService.getUserToken(user.getId(), deviceType);
         //插入用户登录记录
-        userLoginLogService.addUserLoginLog(realIp, user, gameId, 0);
+        userLoginLogService.addUserLoginLog(userData.getIp(), user, gameId, 0);
         //构造用户登录信息
         UserLoginVO userLoginVO = UserLoginVO.builder()
                 .userId(user.getId())

game-module/game-sdk/src/main/java/com/zanxiang/sdk/service/Impl/UserOauthServiceImpl.java

@@ -75,22 +75,4 @@ public class UserOauthServiceImpl extends ServiceImpl<UserOauthMapper, UserOauth
         super.save(userOauth);
         return BeanUtils.copy(userOauth, UserOauthDTO.class);
     }
-
-    @Override
-    public ResultVO<UserVO> updateUserOauth(UserOauthlUpdateParam param, UserData userData) {
-        UserOauthDTO userOauth = getUserOauthByOpenId(param.getUnionId());
-        if (Objects.isNull(userOauth)) {
-            return ResultVO.fail("授权登录不存在");
-        }
-        UserOauth data = BeanUtils.copy(param, UserOauth.class);
-        data.setUserId(userData.getUserId());
-        data.setId(userOauth.getId());
-        super.updateById(data);
-        User user = userService.getById(userData.getUserId());
-        if (Objects.isNull(user)) {
-            return ResultVO.fail("获取用户信息失败");
-        }
-        Semaphore semaphore = new Semaphore(10);
-        return ResultVO.ok(BeanUtils.copy(user, UserVO.class));
-    }
 }

game-module/game-sdk/src/main/java/com/zanxiang/sdk/service/Impl/UserServiceImpl.java

@@ -6,12 +6,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.zanxiang.common.domain.ResultVO;
 import com.zanxiang.common.enums.HttpStatusEnum;
 import com.zanxiang.common.enums.SmsTypeEnum;
-import com.zanxiang.common.exception.CustomException;
-import com.zanxiang.common.exception.ParamNullException;
-import com.zanxiang.common.utils.GameSignUtil;
-import com.zanxiang.common.utils.StringUtils;
 import com.zanxiang.common.utils.bean.BeanUtils;
-import com.zanxiang.mybatis.entity.Game;
 import com.zanxiang.mybatis.entity.User;
 import com.zanxiang.mybatis.mapper.UserMapper;
 import com.zanxiang.sdk.domain.dto.UserDTO;
@@ -31,8 +26,6 @@ import org.springframework.transaction.annotation.Transactional;
 
 import java.time.LocalDateTime;
 import java.util.Objects;
-import java.util.SortedMap;
-import java.util.TreeMap;
 
 /**
  * @author : lingfeng
@@ -198,25 +191,4 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements Us
         User user = super.getOne(new LambdaQueryWrapper<User>().eq(User::getMobile, mobile));
         return BeanUtils.copy(user, UserDTO.class);
     }
-
-    @Override
-    public Boolean userCheck(UserCheckParam param, UserData userData) {
-        if (StringUtils.isEmpty(param.getSign())) {
-            throw new ParamNullException("Sign");
-        }
-        //查询gameUserId
-        if (StringUtils.isEmpty(param.getGameId())) {
-            throw new ParamNullException("GameId");
-        }
-        Game gameData = gameService.getById(param.getGameId());
-        if (Objects.isNull(gameData)) {
-            throw new CustomException(HttpStatusEnum.GAME_UN_FUND);
-        }
-        SortedMap<String, String> map = new TreeMap<>();
-        map.put("sign", param.getSign());
-        map.put("gameId", param.getGameId());
-        map.put("userId", String.valueOf(userData.getUserId()));
-        return GameSignUtil.verify(map, gameData.getAppKey());
-    }
-
 }

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

@@ -20,20 +20,20 @@ public interface RegisterLoginService {
     /**
      * 用户名注册或者登录
      *
-     * @param param   : 注册登录参数
-     * @param request : 请求信息
+     * @param param    : 注册登录参数
+     * @param userData : 用户信息
      * @return : 返回用户登录信息
      */
-    ResultVO<UserLoginVO> loginPassword(LoginPasswordParam param, HttpServletRequest request);
+    ResultVO<UserLoginVO> loginPassword(LoginPasswordParam param, UserData userData);
 
     /**
      * 手机号登录
      *
      * @param param   : 手机号登录参数
-     * @param request : HttpServletRequest
+     * @param userData : 用户信息
      * @return : 返回登录信息
      */
-    ResultVO<UserLoginVO> loginMobile(LoginMobileParam param, HttpServletRequest request);
+    ResultVO<UserLoginVO> loginMobile(LoginMobileParam param, UserData userData);
 
     /**
      * QQ授权登录

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

@@ -1,11 +1,7 @@
 package com.zanxiang.sdk.service;
 
-import com.zanxiang.common.domain.ResultVO;
 import com.zanxiang.mybatis.entity.User;
 import com.zanxiang.sdk.domain.dto.UserOauthDTO;
-import com.zanxiang.sdk.domain.params.UserData;
-import com.zanxiang.sdk.domain.params.UserOauthlUpdateParam;
-import com.zanxiang.sdk.domain.vo.UserVO;
 
 import java.util.Map;
 
@@ -32,13 +28,4 @@ public interface UserOauthService {
      * @return : 返回用户授权信息
      */
     UserOauthDTO createUserOauth(User user, Map<String, String> map);
-
-    /**
-     * 更新用户授权信息
-     *
-     * @param param
-     * @param userData
-     * @return
-     */
-    ResultVO<UserVO> updateUserOauth(UserOauthlUpdateParam param, UserData userData);
 }

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

@@ -57,14 +57,4 @@ public interface UserService extends IService<User> {
      */
     UserDTO getUserInfoByMobile(String mobile);
 
-
-    /**
-     * cp用户登录检测
-     *
-     * @param param    检测参数
-     * @param userData userData
-     * @return boolean
-     */
-    Boolean userCheck(UserCheckParam param, UserData userData);
-
 }