chao 4 years ago
parent
commit
498e7fcbb5

+ 22 - 0
src/main/java/com/caimei365/user/controller/ApiTest.java

@@ -0,0 +1,22 @@
+package com.caimei365.user.controller;
+
+import org.springframework.http.MediaType;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RestController;
+import reactor.core.publisher.Flux;
+
+import java.time.Duration;
+
+/**
+ * 测试
+ *
+ * @author : Charles
+ * @date : 2021/3/12
+ */
+@RestController
+public class ApiTest {
+    @GetMapping(value = "/test/sse", produces = MediaType.TEXT_EVENT_STREAM_VALUE)
+    private Flux<String> flux() {
+        return Flux.interval(Duration.ofMillis(1000)).map(i -> " -> " +i);
+    }
+}

+ 5 - 2
src/main/java/com/caimei365/user/controller/LoginApi.java

@@ -3,12 +3,16 @@ package com.caimei365.user.controller;
 import com.caimei365.user.model.ResponseJson;
 import com.caimei365.user.model.ResponseJson;
 import com.caimei365.user.model.vo.UserLoginVo;
 import com.caimei365.user.model.vo.UserLoginVo;
 import com.caimei365.user.service.LoginService;
 import com.caimei365.user.service.LoginService;
-import com.google.common.base.Verify;
 import lombok.RequiredArgsConstructor;
 import lombok.RequiredArgsConstructor;
 import org.springframework.http.HttpHeaders;
 import org.springframework.http.HttpHeaders;
+import org.springframework.http.MediaType;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.bind.annotation.*;
+import reactor.core.publisher.Flux;
 
 
+import java.time.Duration;
 import java.util.Map;
 import java.util.Map;
+import java.util.concurrent.TimeUnit;
+import java.util.stream.IntStream;
 
 
 /**
 /**
  * 登录API
  * 登录API
@@ -126,5 +130,4 @@ public class LoginApi {
         return loginService.checkScanAuthResult(state);
         return loginService.checkScanAuthResult(state);
     }
     }
 
 
-
 }
 }

+ 2 - 5
src/main/java/com/caimei365/user/controller/RegisterApi.java

@@ -8,11 +8,8 @@ import com.caimei365.user.model.dto.ShopRegisterDto;
 import com.caimei365.user.model.po.ClubPo;
 import com.caimei365.user.model.po.ClubPo;
 import com.caimei365.user.model.po.ShopPo;
 import com.caimei365.user.model.po.ShopPo;
 import com.caimei365.user.service.RegisterService;
 import com.caimei365.user.service.RegisterService;
-import io.swagger.annotations.ApiImplicitParam;
-import io.swagger.annotations.ApiOperation;
 import lombok.RequiredArgsConstructor;
 import lombok.RequiredArgsConstructor;
 import org.springframework.http.HttpHeaders;
 import org.springframework.http.HttpHeaders;
-import org.springframework.http.server.reactive.ServerHttpRequest;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestHeader;
 import org.springframework.web.bind.annotation.RequestHeader;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -51,7 +48,7 @@ public class RegisterApi {
      * @param headers         HttpHeaders
      * @param headers         HttpHeaders
      * @return ClubPo
      * @return ClubPo
      */
      */
-    @Idempotent(prefix="idempotent_club", keys={"#baseUser"}, expire=5)
+    @Idempotent(prefix="idempotent_club", keys={"#clubRegisterDto"}, expire=5)
     @PostMapping("/club")
     @PostMapping("/club")
     public ResponseJson<ClubPo> clubRegister(ClubRegisterDto clubRegisterDto,
     public ResponseJson<ClubPo> clubRegister(ClubRegisterDto clubRegisterDto,
                                              String passWordConfirm,
                                              String passWordConfirm,
@@ -127,7 +124,7 @@ public class RegisterApi {
      * @param headers         HttpHeaders
      * @param headers         HttpHeaders
      * @return ShopPo
      * @return ShopPo
      */
      */
-    @Idempotent(prefix="idempotent_club", keys={"#baseUser"}, expire=5)
+    @Idempotent(prefix="idempotent_shop", keys={"#shopRegisterDto"}, expire=5)
     @PostMapping("/shop/pc")
     @PostMapping("/shop/pc")
     public ResponseJson<ShopPo> shopPcRegister(ShopRegisterDto shopRegisterDto,
     public ResponseJson<ShopPo> shopPcRegister(ShopRegisterDto shopRegisterDto,
                                                String passWordConfirm,
                                                String passWordConfirm,

+ 1 - 1
src/main/java/com/caimei365/user/service/impl/LoginServiceImpl.java

@@ -323,7 +323,7 @@ public class LoginServiceImpl implements LoginService {
         log.info(">>>>>>pc商城unionId:" + unionId + " ,openid:" + openId);
         log.info(">>>>>>pc商城unionId:" + unionId + " ,openid:" + openId);
         // 用户数据存入Redis,key前缀:wxInfo:website:
         // 用户数据存入Redis,key前缀:wxInfo:website:
         String infoDataStr = JSON.toJSONString(infoData);
         String infoDataStr = JSON.toJSONString(infoData);
-        Map<String, Object> infoDataMap = (Map<String, Object>) JSON.parseObject(infoDataStr);
+        Map<String, Object> infoDataMap = JSON.parseObject(infoDataStr);
         redisService.setMap("wxInfo:website:" + unionId, infoDataMap);
         redisService.setMap("wxInfo:website:" + unionId, infoDataMap);
         log.info("微信扫码登录,用户数据存入Redis,key:wxInfo:website:" + unionId);
         log.info("微信扫码登录,用户数据存入Redis,key:wxInfo:website:" + unionId);
         // 运营人员授权登录
         // 运营人员授权登录