lidongze 3 yıl önce
ebeveyn
işleme
3a8e8e1daf

+ 17 - 0
src/main/java/com/izouma/nineth/dto/TouristDTO.java

@@ -0,0 +1,17 @@
+package com.izouma.nineth.dto;
+
+import lombok.Data;
+import org.apache.commons.lang3.RandomStringUtils;
+
+@Data
+public class TouristDTO {
+
+    private String nickName;
+
+    private Long userId;
+
+    public TouristDTO() {
+        this.nickName = "游客-" + RandomStringUtils.randomAlphabetic(8);
+        this.userId = 999999L;
+    }
+}

+ 1 - 1
src/main/java/com/izouma/nineth/listener/RegisterListener.java

@@ -40,7 +40,7 @@ public class RegisterListener implements RocketMQListener<RegisterEvent> {
             User user = userService.phoneRegister(registerEvent.getPhone(), registerEvent.getCode(),
                     registerEvent.getPassword(), registerEvent.getInviteCode(),
                     registerEvent.getInvitor(), registerEvent.getCollectionId(),
-                    registerEvent.getShowroomId(), InviteType.NORMAL);
+                    registerEvent.getShowroomId(), InviteType.NORMAL, null);
             map.put("status", "success");
             map.put("data", user);
             map.put("token", jwtTokenUtil.generateToken(JwtUserFactory.create(user)));

+ 4 - 2
src/main/java/com/izouma/nineth/service/UserService.java

@@ -268,8 +268,10 @@ public class UserService {
     }
 
     public User phoneRegister(String phone, String code, String password, String inviteCode, Long invitor,
-                              Long collectionId, Long showroomId, InviteType inviteType) {
-        String name = "0x" + RandomStringUtils.randomAlphabetic(8);
+                              Long collectionId, Long showroomId, InviteType inviteType, String name) {
+        if (StringUtils.isBlank(name)) {
+            name = "0x" + RandomStringUtils.randomAlphabetic(8);
+        }
         Invite invite = null;
         if (StringUtils.isNotBlank(inviteCode)) {
             invite = inviteRepo.findFirstByCode(inviteCode).orElse(null);

+ 16 - 1
src/main/java/com/izouma/nineth/web/AuthenticationController.java

@@ -3,6 +3,7 @@ package com.izouma.nineth.web;
 import com.izouma.nineth.domain.User;
 import com.izouma.nineth.dto.MetaRestResult;
 import com.izouma.nineth.dto.MetaUserDTO;
+import com.izouma.nineth.dto.TouristDTO;
 import com.izouma.nineth.enums.AuthorityName;
 import com.izouma.nineth.enums.InviteType;
 import com.izouma.nineth.exception.AuthenticationException;
@@ -104,7 +105,16 @@ public class AuthenticationController {
     public String phonePwdLogin(String phone, String code, String password, String inviteCode, Long invitor,
                                 Long collectionId, Long showroomId, InviteType inviteType) {
         User user = userService
-                .phoneRegister(phone, code, password, inviteCode, invitor, collectionId, showroomId, inviteType);
+                .phoneRegister(phone, code, password, inviteCode, invitor, collectionId, showroomId, inviteType, null);
+        return jwtTokenUtil.generateToken(JwtUserFactory.create(user));
+    }
+
+    @PostMapping("/meta/phoneRegister")
+    @ApiOperation(value = "元宇宙手机号密码注册")
+    public String metaPhonePwdLogin(String phone, String code, String password, String inviteCode, Long invitor,
+                                Long collectionId, Long showroomId, InviteType inviteType, String name) {
+        User user = userService
+                .phoneRegister(phone, code, password, inviteCode, invitor, collectionId, showroomId, inviteType, name);
         return jwtTokenUtil.generateToken(JwtUserFactory.create(user));
     }
 
@@ -165,4 +175,9 @@ public class AuthenticationController {
         User user = userService.oneKeyLogin(umengKey, token);
         return jwtTokenUtil.generateToken(JwtUserFactory.create(user));
     }
+
+    @GetMapping("/touristLogin")
+    public TouristDTO touristLogin() {
+        return new TouristDTO();
+    }
 }

+ 5 - 6
src/test/java/com/izouma/nineth/service/UserServiceTest.java

@@ -6,9 +6,9 @@ import com.huifu.adapay.core.exception.BaseAdaPayException;
 import com.izouma.nineth.ApplicationTests;
 import com.izouma.nineth.config.Constants;
 import com.izouma.nineth.domain.IdentityAuth;
+import com.izouma.nineth.domain.User;
 import com.izouma.nineth.domain.netease.NeteaseMessage;
 import com.izouma.nineth.domain.netease.Team;
-import com.izouma.nineth.domain.User;
 import com.izouma.nineth.dto.BankValidate;
 import com.izouma.nineth.dto.PageQuery;
 import com.izouma.nineth.dto.UserBankCard;
@@ -27,7 +27,10 @@ import com.izouma.nineth.utils.BankUtils;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.test.context.junit.jupiter.SpringExtension;
 
 import java.io.IOException;
 import java.util.ArrayList;
@@ -36,10 +39,6 @@ import java.util.List;
 import java.util.Map;
 import java.util.regex.Pattern;
 
-import org.springframework.boot.test.context.SpringBootTest;
-import org.junit.jupiter.api.extension.ExtendWith;
-import org.springframework.test.context.junit.jupiter.SpringExtension;
-
 @Slf4j
 @ExtendWith(SpringExtension.class)
 @SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT)
@@ -142,7 +141,7 @@ public class UserServiceTest extends ApplicationTests {
     @Test
     public void phoneRegister() {
         userService.phoneRegister("18100004444", "1234", "123456", null, 9972L,
-                206925L, null, InviteType.NORMAL);
+                206925L, null, InviteType.NORMAL, null);
     }
 
     @Test