diff --git a/game-service/src/main/java/awesome/group/game/service/bo/citrus/InviteInfo.java b/game-service/src/main/java/awesome/group/game/service/bo/citrus/InviteInfo.java new file mode 100644 index 0000000..79e625a --- /dev/null +++ b/game-service/src/main/java/awesome/group/game/service/bo/citrus/InviteInfo.java @@ -0,0 +1,31 @@ +package awesome.group.game.service.bo.citrus; + +import awesome.group.game.dao.bean.MatrixApp; +import awesome.group.game.dao.bean.MatrixUser; +import awesome.group.game.service.bo.matrix.UmengConfigBo; +import com.google.gson.Gson; +import org.springframework.util.StringUtils; + +public class InviteInfo { + public String name; + public String code; + public String img; + public String url; + public String linkId; + + public InviteInfo() { + } + + public InviteInfo(MatrixApp app, MatrixUser user) { + this.name = app.getName(); + this.code = app.getCode(); + this.img = app.getImg(); + this.url = app.getUrl(); + if (StringUtils.hasText(app.getUmeng())) { + Gson gson = new Gson(); + UmengConfigBo umengConfigBo = gson.fromJson(app.getUmeng(), UmengConfigBo.class); + this.linkId = umengConfigBo.linkId; + + } + } +} diff --git a/game-service/src/main/java/awesome/group/game/service/citrus/RegisterService.java b/game-service/src/main/java/awesome/group/game/service/citrus/RegisterService.java index fe57891..3797036 100644 --- a/game-service/src/main/java/awesome/group/game/service/citrus/RegisterService.java +++ b/game-service/src/main/java/awesome/group/game/service/citrus/RegisterService.java @@ -5,6 +5,7 @@ import awesome.group.game.dao.bean.MatrixUser; import awesome.group.game.dao.mapper.MatrixAppMapper; import awesome.group.game.dao.mapper.MatrixUserMapper; import awesome.group.game.service.SmsService; +import awesome.group.game.service.bo.citrus.InviteInfo; import awesome.group.game.service.bo.matrix.MatrixAppBo; import awesome.group.game.service.bo.RegisterBo; import awesome.group.game.service.common.exception.PaganiException; @@ -27,14 +28,14 @@ public class RegisterService { @Autowired private SmsService smsService; - public MatrixAppBo getApp(String inviteCode) { + public InviteInfo getApp(String inviteCode) { MatrixUser user = userMapper.selectByInviteCode(inviteCode); if (user == null) { throw new PaganiException(PaganiExceptionCode.GENERAL_ERROR, "邀请码非法"); } int appId = user.getAppId(); MatrixApp app = appMapper.selectById(appId); - return new MatrixAppBo(app); + return new InviteInfo(app, user); } public MatrixAppBo getAppByAppCode(String appCode) { diff --git a/game-web/src/main/java/awesome/group/game/web/controller/AppController.java b/game-web/src/main/java/awesome/group/game/web/controller/AppController.java index b3c4a73..b5dc5ee 100644 --- a/game-web/src/main/java/awesome/group/game/web/controller/AppController.java +++ b/game-web/src/main/java/awesome/group/game/web/controller/AppController.java @@ -4,6 +4,7 @@ import awesome.group.game.web.aop.RestApi; import awesome.group.game.service.AppService; import awesome.group.game.service.bo.AppInfo; import awesome.group.game.service.common.response.R; +import io.swagger.v3.oas.annotations.Hidden; import jakarta.annotation.Resource; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; @@ -12,6 +13,7 @@ import org.springframework.web.bind.annotation.RestController; @RestController @RequestMapping("/api/game/app") +@Hidden public class AppController { @Resource diff --git a/game-web/src/main/java/awesome/group/game/web/controller/LoginController.java b/game-web/src/main/java/awesome/group/game/web/controller/LoginController.java index 09d5553..e193612 100644 --- a/game-web/src/main/java/awesome/group/game/web/controller/LoginController.java +++ b/game-web/src/main/java/awesome/group/game/web/controller/LoginController.java @@ -5,11 +5,13 @@ import awesome.group.game.web.aop.RestApi; import awesome.group.game.service.WxService; import awesome.group.game.service.bo.*; import awesome.group.game.service.common.response.R; +import io.swagger.v3.oas.annotations.Hidden; import jakarta.annotation.Resource; import org.springframework.web.bind.annotation.*; @RestController @RequestMapping("/api/game/auth") +@Hidden public class LoginController { @Resource diff --git a/game-web/src/main/java/awesome/group/game/web/controller/MatrixController.java b/game-web/src/main/java/awesome/group/game/web/controller/MatrixController.java index b4c6e88..ff3f62e 100644 --- a/game-web/src/main/java/awesome/group/game/web/controller/MatrixController.java +++ b/game-web/src/main/java/awesome/group/game/web/controller/MatrixController.java @@ -7,6 +7,7 @@ import awesome.group.game.web.aop.RestApi; import awesome.group.game.service.MatrixService; import awesome.group.game.service.bo.MatrixAdvRecordEditBo; import awesome.group.game.service.common.response.R; +import io.swagger.v3.oas.annotations.Hidden; import jakarta.annotation.Resource; import org.springframework.web.bind.annotation.*; @@ -14,6 +15,7 @@ import java.util.List; @RestController @RequestMapping("/api/game/matrix") +@Hidden public class MatrixController { @Resource private MatrixService matrixService; diff --git a/game-web/src/main/java/awesome/group/game/web/rest/citrus/CitrusAppController.java b/game-web/src/main/java/awesome/group/game/web/rest/citrus/CitrusAppController.java index dd2ed95..b850224 100644 --- a/game-web/src/main/java/awesome/group/game/web/rest/citrus/CitrusAppController.java +++ b/game-web/src/main/java/awesome/group/game/web/rest/citrus/CitrusAppController.java @@ -4,6 +4,7 @@ import awesome.group.game.service.bo.citrus.AppCashConfig; import awesome.group.game.service.citrus.CitrusAppService; import awesome.group.game.service.common.response.R; import awesome.group.game.web.aop.RestApi; +import io.swagger.v3.oas.annotations.Hidden; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; @@ -12,6 +13,7 @@ import org.springframework.web.bind.annotation.RestController; @RestController @RequestMapping("/api/citrus/app") +@Hidden public class CitrusAppController { @Autowired private CitrusAppService appService; diff --git a/game-web/src/main/java/awesome/group/game/web/rest/citrus/OpenController.java b/game-web/src/main/java/awesome/group/game/web/rest/citrus/OpenController.java index 033342d..0fe582a 100644 --- a/game-web/src/main/java/awesome/group/game/web/rest/citrus/OpenController.java +++ b/game-web/src/main/java/awesome/group/game/web/rest/citrus/OpenController.java @@ -1,23 +1,23 @@ package awesome.group.game.web.rest.citrus; import awesome.group.game.dao.bean.MatrixUser; +import awesome.group.game.service.SmsService; +import awesome.group.game.service.bo.citrus.InviteInfo; import awesome.group.game.service.bo.citrus.LoginReq; import awesome.group.game.service.citrus.RegisterService; -import awesome.group.game.service.SmsService; -import awesome.group.game.service.bo.matrix.MatrixAppBo; -import awesome.group.game.service.bo.RegisterBo; import awesome.group.game.service.citrus.UserService; import awesome.group.game.service.common.response.R; import awesome.group.game.service.util.JwtUtils; import awesome.group.game.web.RequestContext; import awesome.group.game.web.aop.RestApi; +import io.swagger.v3.oas.annotations.Hidden; import jakarta.servlet.http.Cookie; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.util.StringUtils; import org.springframework.web.bind.annotation.*; @RestController @RequestMapping("/api/citrus") +@Hidden public class OpenController { @Autowired @@ -38,21 +38,8 @@ public class OpenController { @GetMapping("/register/getApp") @RestApi - public R getApp(@RequestParam(required = false) String inviteCode, @RequestParam(required = false) String appCode) { - if (StringUtils.hasText(appCode)) { - return new R<>(registerService.getAppByAppCode(appCode)); - } - if (StringUtils.hasText(inviteCode)) { - return new R<>(registerService.getApp(inviteCode)); - } - return new R<>(null); - } - - @PostMapping("/register/submitRegister") - @RestApi - public R submitRegister(@RequestBody RegisterBo bo) { - registerService.register(bo); - return new R<>(null); + public R getApp(@RequestParam String inviteCode) { + return new R<>(registerService.getApp(inviteCode)); } @PostMapping("/loginByPwd") diff --git a/game-web/src/main/java/awesome/group/game/web/rest/citrus/UserController.java b/game-web/src/main/java/awesome/group/game/web/rest/citrus/UserController.java index fa6255d..6883da6 100644 --- a/game-web/src/main/java/awesome/group/game/web/rest/citrus/UserController.java +++ b/game-web/src/main/java/awesome/group/game/web/rest/citrus/UserController.java @@ -9,6 +9,7 @@ import awesome.group.game.service.citrus.WeiXinService; import awesome.group.game.service.common.response.R; import awesome.group.game.web.RequestContext; import awesome.group.game.web.aop.RestApi; +import io.swagger.v3.oas.annotations.Hidden; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -16,6 +17,7 @@ import java.util.List; @RestController @RequestMapping("/api/citrus/user") +@Hidden public class UserController { @Autowired diff --git a/game-web/src/main/java/awesome/group/game/web/rest/matrix/AdminController.java b/game-web/src/main/java/awesome/group/game/web/rest/matrix/AdminController.java index 9c8ac07..332ad61 100644 --- a/game-web/src/main/java/awesome/group/game/web/rest/matrix/AdminController.java +++ b/game-web/src/main/java/awesome/group/game/web/rest/matrix/AdminController.java @@ -13,6 +13,7 @@ import awesome.group.game.service.common.response.R; import awesome.group.game.service.util.JwtUtils; import awesome.group.game.web.RequestContext; import awesome.group.game.web.aop.RestApi; +import io.swagger.v3.oas.annotations.Hidden; import io.swagger.v3.oas.annotations.tags.Tag; import jakarta.annotation.Resource; import jakarta.servlet.http.Cookie; @@ -23,6 +24,7 @@ import java.util.List; @RestController @RequestMapping("/api/admin") @Tag(name = "admin") +@Hidden public class AdminController { @Resource diff --git a/game-web/src/main/java/awesome/group/game/web/rest/matrix/DeviceController.java b/game-web/src/main/java/awesome/group/game/web/rest/matrix/DeviceController.java index 8e15003..3cea5c3 100644 --- a/game-web/src/main/java/awesome/group/game/web/rest/matrix/DeviceController.java +++ b/game-web/src/main/java/awesome/group/game/web/rest/matrix/DeviceController.java @@ -8,6 +8,7 @@ import awesome.group.game.service.bo.OverviewBo; import awesome.group.game.service.common.response.R; import awesome.group.game.web.RequestContext; import awesome.group.game.web.aop.RestApi; +import io.swagger.v3.oas.annotations.Hidden; import io.swagger.v3.oas.annotations.tags.Tag; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -17,6 +18,7 @@ import java.util.List; @RestController @RequestMapping("/api/admin/device") @Tag(name = "device") +@Hidden public class DeviceController { @Autowired diff --git a/game-web/src/main/java/awesome/group/game/web/rest/matrix/MatrixAppConfigController.java b/game-web/src/main/java/awesome/group/game/web/rest/matrix/MatrixAppConfigController.java index dff6f63..7ca0bf1 100644 --- a/game-web/src/main/java/awesome/group/game/web/rest/matrix/MatrixAppConfigController.java +++ b/game-web/src/main/java/awesome/group/game/web/rest/matrix/MatrixAppConfigController.java @@ -4,11 +4,13 @@ import awesome.group.game.service.bo.matrix.*; import awesome.group.game.service.common.response.R; import awesome.group.game.service.matrix.MatrixAppConfigService; import awesome.group.game.web.aop.RestApi; +import io.swagger.v3.oas.annotations.Hidden; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @RestController @RequestMapping("/api/admin/app") +@Hidden public class MatrixAppConfigController { @Autowired diff --git a/game-web/src/main/java/awesome/group/game/web/rest/matrix/MatrixMoneyController.java b/game-web/src/main/java/awesome/group/game/web/rest/matrix/MatrixMoneyController.java index a193b6c..c5cf14b 100644 --- a/game-web/src/main/java/awesome/group/game/web/rest/matrix/MatrixMoneyController.java +++ b/game-web/src/main/java/awesome/group/game/web/rest/matrix/MatrixMoneyController.java @@ -7,6 +7,7 @@ import awesome.group.game.service.common.response.R; import awesome.group.game.service.matrix.MatrixMoneyService; import awesome.group.game.web.RequestContext; import awesome.group.game.web.aop.RestApi; +import io.swagger.v3.oas.annotations.Hidden; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; @@ -15,6 +16,7 @@ import org.springframework.web.bind.annotation.RestController; @RestController @RequestMapping("/api/admin/money") +@Hidden public class MatrixMoneyController { @Autowired private MatrixMoneyService matrixMoneyService; diff --git a/game-web/src/main/java/awesome/group/game/web/rest/matrix/MatrixUserController.java b/game-web/src/main/java/awesome/group/game/web/rest/matrix/MatrixUserController.java index f186988..d4fe0a3 100644 --- a/game-web/src/main/java/awesome/group/game/web/rest/matrix/MatrixUserController.java +++ b/game-web/src/main/java/awesome/group/game/web/rest/matrix/MatrixUserController.java @@ -6,11 +6,13 @@ import awesome.group.game.service.bo.matrix.UserQuery; import awesome.group.game.service.common.response.R; import awesome.group.game.service.matrix.MatrixUserService; import awesome.group.game.web.aop.RestApi; +import io.swagger.v3.oas.annotations.Hidden; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @RestController @RequestMapping("/api/admin/user") +@Hidden public class MatrixUserController { @Autowired private MatrixUserService userService;