feat(*): 加入协程

- 加入协程

feat(*): 加入协程
- 加入协程
Kurisu
1 parent 3d8b2ff6
Showing 7 changed files with 126 additions and 131 deletions
fw-hestia-rpc/pom.xml
fw-hestia-rpc/src/main/java/cn/fw/hestia/rpc/member/MemberRpcService.kt
fw-hestia-rpc/src/main/java/cn/fw/hestia/rpc/member/dto/MemberUserDTO.kt
fw-hestia-rpc/src/main/java/cn/fw/hestia/rpc/member/dto/MemberUserLevelDTO.java
fw-hestia-server/src/main/java/cn/fw/hestia/server/controller/common/CommonController.kt
fw-hestia-server/src/main/resources/logfile.xml
fw-hestia-service/pom.xml
@@ -42,6 +42,10 @@
             <artifactId>spring-data-redis</artifactId>
             <optional>true</optional>
         </dependency>
+        <dependency>
+            <groupId>org.jetbrains.kotlinx</groupId>
+            <artifactId>kotlinx-coroutines-core</artifactId>
+        </dependency>
     </dependencies>
  
 </project>
 \ No newline at end of file
-package cn.fw.hestia.rpc.member;
+package cn.fw.hestia.rpc.member
  
-import cn.fw.common.util.MobileUtil;
-import cn.fw.data.base.domain.common.Message;
-import cn.fw.hestia.common.constant.Constant;
-import cn.fw.hestia.rpc.member.dto.MemberUserDTO;
-import cn.fw.member.sdk.api.FunctionApi;
-import cn.fw.member.sdk.api.MemberApi;
-import cn.fw.member.sdk.vo.MemberInfoVo;
-import cn.fw.member.sdk.vo.MobileLocation;
-import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.lang3.StringUtils;
-import org.springframework.beans.BeanUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.cache.annotation.Cacheable;
-import org.springframework.stereotype.Service;
-
-import java.util.Objects;
+import cn.fw.common.util.MobileUtil
+import cn.fw.hestia.common.constant.Constant
+import cn.fw.hestia.rpc.member.dto.MemberUserDTO
+import cn.fw.member.sdk.api.FunctionApi
+import cn.fw.member.sdk.api.MemberApi
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.async
+import kotlinx.coroutines.runBlocking
+import kotlinx.coroutines.selects.select
+import kotlinx.coroutines.supervisorScope
+import org.slf4j.LoggerFactory
+import org.springframework.cache.annotation.Cacheable
+import org.springframework.stereotype.Service
  
 /**
  * 会员服务
  *
  * @author kurisu
  */
-@Slf4j
+
 @Service
-public class MemberRpcService {
+class MemberRpcService
+    (
     /**
      * 会员服务
      */
-    private final MemberApi memberApi;
-    private final FunctionApi functionApi;
-
-    /**
-     * 默认构造器
-     */
-    @Autowired
-    public MemberRpcService(final MemberApi memberApi,
-                            final FunctionApi functionApi) {
-        this.memberApi = memberApi;
-        this.functionApi = functionApi;
-    }
+    private val memberApi: MemberApi,
+    private val functionApi: FunctionApi
+) {
+    val logger = LoggerFactory.getLogger(this.javaClass)
  
     /**
      * 根据会员ID获取会员信息
@@ -47,27 +37,28 @@ public class MemberRpcService {
      * @param userId 会员ID
      * @return 会员信息
      */
-    @Cacheable(cacheNames = Constant.MEMBER_INFO_CACHE, key = "#userId", unless = "#result == null ")
-    public MemberUserDTO user(final Long userId) {
-        if (userId == null) {
-            return null;
-        }
+    @Cacheable(cacheNames = [Constant.MEMBER_INFO_CACHE], key = "#userId", unless = "#result == null ")
+    fun user(userId: Long?): MemberUserDTO? {
         try {
-            final Message<MemberInfoVo> msg = memberApi.getMemberById(userId);
-            if (!msg.isSuccess()) {
-                log.warn("调用Member[根据会员ID[{}]获取会员信息]系统失败, 原因：{}", userId, msg.getResult());
-                return null;
+            val msg = memberApi.getMemberById(userId)
+            if (!msg.isSuccess) {
+                logger.warn("调用Member[根据会员ID[{}]获取会员信息]系统失败, 原因：{}", userId, msg.result)
+                return null
             }
-            final MemberInfoVo user = msg.getData();
-            if (user != null) {
-                final MemberUserDTO userDTO = new MemberUserDTO();
-                BeanUtils.copyProperties(user, userDTO);
-                return userDTO;
+            return msg.data?.run {
+                MemberUserDTO(
+                    id,
+                    latestAccountId,
+                    realName,
+                    credentType,
+                    credentNo,
+                    birthday = birthDate
+                )
             }
-        } catch (Exception e) {
-            log.error("调用Member[根据会员ID[{}]获取会员信息]系统失败", userId, e);
+        } catch (e: Exception) {
+            logger.error("调用Member[根据会员ID[{}]获取会员信息]系统失败", userId, e)
+            return null
         }
-        return null;
     }
  
  
@@ -77,37 +68,55 @@ public class MemberRpcService {
      * @param mobile
      * @return
      */
-    @Cacheable(cacheNames = "mobile:attribution", key = "#mobile", unless = "#result.isEmpty()")
-    public String attribution(final String mobile) {
-        if (StringUtils.isBlank(mobile)) {
-            return "";
+    @Cacheable(cacheNames = ["mobile:attribution"], key = "#mobile", unless = "#result.isEmpty()")
+    fun attribution(mobile: String?): String {
+        if (mobile.isNullOrEmpty()) {
+            return ""
         }
-        try {
-            MobileUtil.Result result = MobileUtil.attribution(mobile);
-            String att = "";
-            if (Objects.nonNull(result)) {
-                att = result.getProvince().concat(" ").concat(result.getCity());
-            }
-
-            if (!StringUtils.isBlank(att.trim())) {
-                return att.trim();
-            }
-
-            Message<MobileLocation> msg = functionApi.queryMobileLocation(mobile);
-            if (!msg.isSuccess()) {
-                return "";
-            }
-            MobileLocation data = msg.getData();
-            if (data != null) {
-                String province = data.getProvince();
-                String city = data.getCity();
-                att = province.concat(" ").concat(city);
-            }
-            return att.trim();
-        } catch (Exception e) {
-            log.warn("查询手机号归属地失败：", e);
+        return runBlocking(Dispatchers.IO) {
+            supervisorScope {
+                val j1 = async {
+                    try {
+                        val result = MobileUtil.attribution(mobile)
+                        result?.run {
+                            "$province $city"
+                        }
+                    } catch (ex: Exception) {
+                        logger.error("查询号码归属地失败:", ex)
+                        ""
+                    }
+                }
+                val j2 = async {
+                    try {
+                        val msg = functionApi.queryMobileLocation(mobile)
+                        if (msg.isSuccess) {
+                            logger.info("调用会员系统查询手机号归属地: {}", msg.data)
+                            msg.data?.run {
+                                "$province $city"
+                            }
+                        } else ""
+                    } catch (ex: Exception) {
+                        logger.error("调用会员系统查询手机号归属地失败:", ex)
+                        ""
+                    }
+                }
+                select {
+                    j1.onAwait {
+                        println(it)
+                        if (!it.isNullOrEmpty()) {
+                            j2.cancel()
+                        }
+                        it
+                    }
+                    j2.onAwait {
+                        println(it)
+                        if (!it.isNullOrEmpty()) {
+                            j1.cancel()
+                        }
+                        it
+                    }
+                }
+            } ?: ""
         }
-        return "";
     }
-
-}
+}
 \ No newline at end of file
-package cn.fw.hestia.rpc.member.dto;
+package cn.fw.hestia.rpc.member.dto
  
-import lombok.Data;
-
-import java.io.Serializable;
-import java.util.Date;
+import java.util.*
  
 /**
  * 会员信息
- * <p>
+ *
+ *
  * create at 2019-05-09
  *
  * @author kurisu
  */
-@Data
-public class MemberUserDTO implements Serializable {
+data class MemberUserDTO(
     /**
      * 用户Id
      */
-    private Long id;
+    val id: Long,
+
     /**
      * 最后一个账号id
      */
-    private Long latestAccountId;
+    val latestAccountId: Long? = null,
+
     /**
      * 真实姓名
      */
-    private String realName;
+    val realName: String? = null,
  
     /**
      * 证件类型
      */
-    private Integer credentType;
+    val credentType: Int? = null,
  
     /**
      * 证件号码
      */
-    private String credentNo;
+    val credentNo: String? = null,
  
     /**
      * 生日
      */
-    private Date birthday;
-
-    public Long getUserId() {
-        return id;
-    }
-
-    public Long getMemberId() {
-        return id;
-    }
-}
+    val birthday: Date? = null
+) {
+    val userId: Long
+        get() = id
+    val memberId: Long
+        get() = id
+
+}
 \ No newline at end of file
-package cn.fw.hestia.rpc.member.dto;
-
-import lombok.Data;
-
-/**
- * 客户level
- * <p>
- * create at 2019-05-16
- *
- * @author kurisu
- */
-@Data
-public class MemberUserLevelDTO {
-    private Long cusId;
-    private Integer levelType;
-    private Integer growth;
-    private String cusName;
-    private String phone;
-}
@@ -3,14 +3,12 @@ package cn.fw.hestia.server.controller.common
 import cn.fw.common.web.annotation.ControllerMethod
 import cn.fw.common.web.util.ResultBuilder.success
 import cn.fw.data.base.domain.common.Message
+import cn.fw.hestia.rpc.member.MemberRpcService
 import cn.fw.hestia.service.buz.MessageCenterBizService
 import cn.fw.security.auth.client.annotation.Authorization
 import cn.fw.security.auth.client.enums.AuthType
 import org.springframework.validation.annotation.Validated
-import org.springframework.web.bind.annotation.GetMapping
-import org.springframework.web.bind.annotation.PostMapping
-import org.springframework.web.bind.annotation.RequestMapping
-import org.springframework.web.bind.annotation.RestController
+import org.springframework.web.bind.annotation.*
 import javax.validation.constraints.NotNull
  
 /**
@@ -23,7 +21,10 @@ import javax.validation.constraints.NotNull
 @RestController
 @Authorization(AuthType.NONE)
 @RequestMapping("/common/message")
-class CommonController(private val messageCenterBizService: MessageCenterBizService) {
+class CommonController(
+    private val messageCenterBizService: MessageCenterBizService,
+    private val memberRpcService: MemberRpcService
+) {
     @PostMapping("/send")
     @ControllerMethod("手动发送消息")
     fun manualSend(sceneToken: @NotNull(message = "sceneToken不能为空") Long?): Message<String> {
@@ -34,4 +35,9 @@ class CommonController(private val messageCenterBizService: MessageCenterBizServ
     @get:GetMapping("/query/code")
     val code: Message<String>
         get() = success(messageCenterBizService.rdsTemplateCode)
+
+    @ControllerMethod("查询手机号归属地")
+    @GetMapping("/query/mobile")
+    fun mobileAttr(@RequestParam(value = "mobile") mobile: String): Message<String> =
+        success(memberRpcService.attribution(mobile))
 }
 \ No newline at end of file
@@ -55,7 +55,9 @@
  
     <appender name="CONSOLE" class="ch.qos.logback.core.ConsoleAppender">
         <encoder>
-            <pattern>%highlight([%-1p]) %highlight(%d{yyyy-MM-dd HH:mm:ss} [%X{X-APP}/%X{X-IP}/%X{X-TRACE-ID}]) %green([%thread]) %boldMagenta(%logger) %cyan(%msg%n)</pattern>
+            <pattern>%highlight([%-1p]) %highlight(%d{yyyy-MM-dd HH:mm:ss.SSS} [%X{X-APP}/%X{X-IP}/%X{X-TRACE-ID}])
+                %green([%thread]) %boldMagenta(%logger) %cyan(%msg%n)
+            </pattern>
             <charset>${charSet}</charset>
         </encoder>
     </appender>
@@ -94,10 +94,6 @@
             <groupId>org.redisson</groupId>
             <artifactId>redisson</artifactId>
         </dependency>
-        <dependency>
-            <groupId>org.jetbrains.kotlinx</groupId>
-            <artifactId>kotlinx-coroutines-core</artifactId>
-        </dependency>
     </dependencies>
  
     <build>