diff --git a/game-dao/src/main/java/awesome/group/game/dao/mapper/MatrixAdvRecordMapper.java b/game-dao/src/main/java/awesome/group/game/dao/mapper/MatrixAdvRecordMapper.java index d87551e..5fc34bb 100644 --- a/game-dao/src/main/java/awesome/group/game/dao/mapper/MatrixAdvRecordMapper.java +++ b/game-dao/src/main/java/awesome/group/game/dao/mapper/MatrixAdvRecordMapper.java @@ -4,8 +4,13 @@ import awesome.group.game.dao.bean.MatrixAdvRecord; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Select; +import java.util.List; + public interface MatrixAdvRecordMapper extends BaseMapper { @Select("select id from matrix_app where code = #{code}") Integer queryAppId(String code); + + @Select("select device_id from matrix_white_device") + List queryWhitelist(); } diff --git a/game-service/src/main/java/awesome/group/game/service/MatrixService.java b/game-service/src/main/java/awesome/group/game/service/MatrixService.java index 4a612b5..452c5fb 100644 --- a/game-service/src/main/java/awesome/group/game/service/MatrixService.java +++ b/game-service/src/main/java/awesome/group/game/service/MatrixService.java @@ -8,6 +8,8 @@ import org.springframework.stereotype.Service; import org.springframework.util.Assert; import org.springframework.util.StringUtils; +import java.util.List; + @Service public class MatrixService { @@ -31,4 +33,8 @@ public class MatrixService { record.setIp(ip); mapper.insert(record); } + + public List whiteList() { + return mapper.queryWhitelist(); + } } diff --git a/game-web/src/main/java/awesome/group/controller/MatrixController.java b/game-web/src/main/java/awesome/group/controller/MatrixController.java index 28a2b4d..a42b6c7 100644 --- a/game-web/src/main/java/awesome/group/controller/MatrixController.java +++ b/game-web/src/main/java/awesome/group/controller/MatrixController.java @@ -6,10 +6,9 @@ import awesome.group.game.service.MatrixService; import awesome.group.game.service.bo.MatrixAdvRecordEditBo; import awesome.group.game.service.common.response.R; import jakarta.annotation.Resource; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.bind.annotation.*; + +import java.util.List; @RestController @RequestMapping("/api/game/matrix") @@ -23,4 +22,10 @@ public class MatrixController { matrixService.saveRecord(bo, RequestContext.getIpAddr(RequestContext.getRequest())); return new R<>(R.CODE_SUCCESS, "ok", null); } + + @GetMapping("/whiteList") + @RestApi + public R> whiteList(){ + return new R<>(R.CODE_SUCCESS, "ok", matrixService.whiteList()); + } } diff --git a/game-web/src/main/java/awesome/group/filter/LoginFilter.java b/game-web/src/main/java/awesome/group/filter/LoginFilter.java index 963a0ac..e52a54e 100644 --- a/game-web/src/main/java/awesome/group/filter/LoginFilter.java +++ b/game-web/src/main/java/awesome/group/filter/LoginFilter.java @@ -39,6 +39,7 @@ public class LoginFilter implements Filter { "/api/game/auth/loginV2", "/api/game/auth/loginV3", "/api/game/matrix/saveAdvRecord", + "/api/game/matrix/whiteList", "/api/game/auth/test"); boolean pass = false; Integer userId = null;