Browse Source

换一下邀请页数据

master
nili 4 months ago
parent
commit
5690b8adf6
  1. 31
      game-service/src/main/java/awesome/group/game/service/bo/citrus/InviteInfo.java
  2. 5
      game-service/src/main/java/awesome/group/game/service/citrus/RegisterService.java
  3. 2
      game-web/src/main/java/awesome/group/game/web/controller/AppController.java
  4. 2
      game-web/src/main/java/awesome/group/game/web/controller/LoginController.java
  5. 2
      game-web/src/main/java/awesome/group/game/web/controller/MatrixController.java
  6. 2
      game-web/src/main/java/awesome/group/game/web/rest/citrus/CitrusAppController.java
  7. 25
      game-web/src/main/java/awesome/group/game/web/rest/citrus/OpenController.java
  8. 2
      game-web/src/main/java/awesome/group/game/web/rest/citrus/UserController.java
  9. 2
      game-web/src/main/java/awesome/group/game/web/rest/matrix/AdminController.java
  10. 2
      game-web/src/main/java/awesome/group/game/web/rest/matrix/DeviceController.java
  11. 2
      game-web/src/main/java/awesome/group/game/web/rest/matrix/MatrixAppConfigController.java
  12. 2
      game-web/src/main/java/awesome/group/game/web/rest/matrix/MatrixMoneyController.java
  13. 2
      game-web/src/main/java/awesome/group/game/web/rest/matrix/MatrixUserController.java

31
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;
}
}
}

5
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.MatrixAppMapper;
import awesome.group.game.dao.mapper.MatrixUserMapper; import awesome.group.game.dao.mapper.MatrixUserMapper;
import awesome.group.game.service.SmsService; 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.matrix.MatrixAppBo;
import awesome.group.game.service.bo.RegisterBo; import awesome.group.game.service.bo.RegisterBo;
import awesome.group.game.service.common.exception.PaganiException; import awesome.group.game.service.common.exception.PaganiException;
@ -27,14 +28,14 @@ public class RegisterService {
@Autowired @Autowired
private SmsService smsService; private SmsService smsService;
public MatrixAppBo getApp(String inviteCode) { public InviteInfo getApp(String inviteCode) {
MatrixUser user = userMapper.selectByInviteCode(inviteCode); MatrixUser user = userMapper.selectByInviteCode(inviteCode);
if (user == null) { if (user == null) {
throw new PaganiException(PaganiExceptionCode.GENERAL_ERROR, "邀请码非法"); throw new PaganiException(PaganiExceptionCode.GENERAL_ERROR, "邀请码非法");
} }
int appId = user.getAppId(); int appId = user.getAppId();
MatrixApp app = appMapper.selectById(appId); MatrixApp app = appMapper.selectById(appId);
return new MatrixAppBo(app); return new InviteInfo(app, user);
} }
public MatrixAppBo getAppByAppCode(String appCode) { public MatrixAppBo getAppByAppCode(String appCode) {

2
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.AppService;
import awesome.group.game.service.bo.AppInfo; import awesome.group.game.service.bo.AppInfo;
import awesome.group.game.service.common.response.R; import awesome.group.game.service.common.response.R;
import io.swagger.v3.oas.annotations.Hidden;
import jakarta.annotation.Resource; import jakarta.annotation.Resource;
import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMapping;
@ -12,6 +13,7 @@ import org.springframework.web.bind.annotation.RestController;
@RestController @RestController
@RequestMapping("/api/game/app") @RequestMapping("/api/game/app")
@Hidden
public class AppController { public class AppController {
@Resource @Resource

2
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.WxService;
import awesome.group.game.service.bo.*; import awesome.group.game.service.bo.*;
import awesome.group.game.service.common.response.R; import awesome.group.game.service.common.response.R;
import io.swagger.v3.oas.annotations.Hidden;
import jakarta.annotation.Resource; import jakarta.annotation.Resource;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
@RestController @RestController
@RequestMapping("/api/game/auth") @RequestMapping("/api/game/auth")
@Hidden
public class LoginController { public class LoginController {
@Resource @Resource

2
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.MatrixService;
import awesome.group.game.service.bo.MatrixAdvRecordEditBo; import awesome.group.game.service.bo.MatrixAdvRecordEditBo;
import awesome.group.game.service.common.response.R; import awesome.group.game.service.common.response.R;
import io.swagger.v3.oas.annotations.Hidden;
import jakarta.annotation.Resource; import jakarta.annotation.Resource;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
@ -14,6 +15,7 @@ import java.util.List;
@RestController @RestController
@RequestMapping("/api/game/matrix") @RequestMapping("/api/game/matrix")
@Hidden
public class MatrixController { public class MatrixController {
@Resource @Resource
private MatrixService matrixService; private MatrixService matrixService;

2
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.citrus.CitrusAppService;
import awesome.group.game.service.common.response.R; import awesome.group.game.service.common.response.R;
import awesome.group.game.web.aop.RestApi; import awesome.group.game.web.aop.RestApi;
import io.swagger.v3.oas.annotations.Hidden;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMapping;
@ -12,6 +13,7 @@ import org.springframework.web.bind.annotation.RestController;
@RestController @RestController
@RequestMapping("/api/citrus/app") @RequestMapping("/api/citrus/app")
@Hidden
public class CitrusAppController { public class CitrusAppController {
@Autowired @Autowired
private CitrusAppService appService; private CitrusAppService appService;

25
game-web/src/main/java/awesome/group/game/web/rest/citrus/OpenController.java

@ -1,23 +1,23 @@
package awesome.group.game.web.rest.citrus; package awesome.group.game.web.rest.citrus;
import awesome.group.game.dao.bean.MatrixUser; 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.bo.citrus.LoginReq;
import awesome.group.game.service.citrus.RegisterService; 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.citrus.UserService;
import awesome.group.game.service.common.response.R; import awesome.group.game.service.common.response.R;
import awesome.group.game.service.util.JwtUtils; import awesome.group.game.service.util.JwtUtils;
import awesome.group.game.web.RequestContext; import awesome.group.game.web.RequestContext;
import awesome.group.game.web.aop.RestApi; import awesome.group.game.web.aop.RestApi;
import io.swagger.v3.oas.annotations.Hidden;
import jakarta.servlet.http.Cookie; import jakarta.servlet.http.Cookie;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.util.StringUtils;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
@RestController @RestController
@RequestMapping("/api/citrus") @RequestMapping("/api/citrus")
@Hidden
public class OpenController { public class OpenController {
@Autowired @Autowired
@ -38,21 +38,8 @@ public class OpenController {
@GetMapping("/register/getApp") @GetMapping("/register/getApp")
@RestApi @RestApi
public R<MatrixAppBo> getApp(@RequestParam(required = false) String inviteCode, @RequestParam(required = false) String appCode) { public R<InviteInfo> getApp(@RequestParam String inviteCode) {
if (StringUtils.hasText(appCode)) { return new R<>(registerService.getApp(inviteCode));
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<Void> submitRegister(@RequestBody RegisterBo bo) {
registerService.register(bo);
return new R<>(null);
} }
@PostMapping("/loginByPwd") @PostMapping("/loginByPwd")

2
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.service.common.response.R;
import awesome.group.game.web.RequestContext; import awesome.group.game.web.RequestContext;
import awesome.group.game.web.aop.RestApi; import awesome.group.game.web.aop.RestApi;
import io.swagger.v3.oas.annotations.Hidden;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
@ -16,6 +17,7 @@ import java.util.List;
@RestController @RestController
@RequestMapping("/api/citrus/user") @RequestMapping("/api/citrus/user")
@Hidden
public class UserController { public class UserController {
@Autowired @Autowired

2
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.service.util.JwtUtils;
import awesome.group.game.web.RequestContext; import awesome.group.game.web.RequestContext;
import awesome.group.game.web.aop.RestApi; import awesome.group.game.web.aop.RestApi;
import io.swagger.v3.oas.annotations.Hidden;
import io.swagger.v3.oas.annotations.tags.Tag; import io.swagger.v3.oas.annotations.tags.Tag;
import jakarta.annotation.Resource; import jakarta.annotation.Resource;
import jakarta.servlet.http.Cookie; import jakarta.servlet.http.Cookie;
@ -23,6 +24,7 @@ import java.util.List;
@RestController @RestController
@RequestMapping("/api/admin") @RequestMapping("/api/admin")
@Tag(name = "admin") @Tag(name = "admin")
@Hidden
public class AdminController { public class AdminController {
@Resource @Resource

2
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.service.common.response.R;
import awesome.group.game.web.RequestContext; import awesome.group.game.web.RequestContext;
import awesome.group.game.web.aop.RestApi; import awesome.group.game.web.aop.RestApi;
import io.swagger.v3.oas.annotations.Hidden;
import io.swagger.v3.oas.annotations.tags.Tag; import io.swagger.v3.oas.annotations.tags.Tag;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
@ -17,6 +18,7 @@ import java.util.List;
@RestController @RestController
@RequestMapping("/api/admin/device") @RequestMapping("/api/admin/device")
@Tag(name = "device") @Tag(name = "device")
@Hidden
public class DeviceController { public class DeviceController {
@Autowired @Autowired

2
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.common.response.R;
import awesome.group.game.service.matrix.MatrixAppConfigService; import awesome.group.game.service.matrix.MatrixAppConfigService;
import awesome.group.game.web.aop.RestApi; import awesome.group.game.web.aop.RestApi;
import io.swagger.v3.oas.annotations.Hidden;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
@RestController @RestController
@RequestMapping("/api/admin/app") @RequestMapping("/api/admin/app")
@Hidden
public class MatrixAppConfigController { public class MatrixAppConfigController {
@Autowired @Autowired

2
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.service.matrix.MatrixMoneyService;
import awesome.group.game.web.RequestContext; import awesome.group.game.web.RequestContext;
import awesome.group.game.web.aop.RestApi; import awesome.group.game.web.aop.RestApi;
import io.swagger.v3.oas.annotations.Hidden;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestBody;
@ -15,6 +16,7 @@ import org.springframework.web.bind.annotation.RestController;
@RestController @RestController
@RequestMapping("/api/admin/money") @RequestMapping("/api/admin/money")
@Hidden
public class MatrixMoneyController { public class MatrixMoneyController {
@Autowired @Autowired
private MatrixMoneyService matrixMoneyService; private MatrixMoneyService matrixMoneyService;

2
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.common.response.R;
import awesome.group.game.service.matrix.MatrixUserService; import awesome.group.game.service.matrix.MatrixUserService;
import awesome.group.game.web.aop.RestApi; import awesome.group.game.web.aop.RestApi;
import io.swagger.v3.oas.annotations.Hidden;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
@RestController @RestController
@RequestMapping("/api/admin/user") @RequestMapping("/api/admin/user")
@Hidden
public class MatrixUserController { public class MatrixUserController {
@Autowired @Autowired
private MatrixUserService userService; private MatrixUserService userService;

Loading…
Cancel
Save