feat(*): 优化项目

- 优化项目

feat(*): 优化项目
- 优化项目
张志伟
1 parent fc32b320
Showing 25 changed files with 268 additions and 382 deletions
fw-hermes-common/src/main/java/cn/fw/hermes/common/utils/RobotHelper.java
fw-hermes-common/src/main/java/cn/fw/hermes/common/utils/TemplateHelper.java
fw-hermes-common/src/main/java/cn/fw/hermes/common/utils/ThreadPoolUtil.java
fw-hermes-common/src/main/java/cn/fw/hermes/common/utils/UUIDUtils.java
fw-hermes-common/src/main/kotlin/cn/fw/hermes/common/utils/RobotHelper.kt
fw-hermes-common/src/main/kotlin/cn/fw/hermes/common/utils/TemplateHelper.kt
fw-hermes-common/src/main/kotlin/cn/fw/hermes/common/utils/ThreadPoolUtil.kt
fw-hermes-common/src/main/kotlin/cn/fw/hermes/common/utils/UUIDUtils.kt
fw-hermes-common/src/test/java/cn/fw/hermes/common/utils/Tests.kt
fw-hermes-rpc/src/main/java/cn/fw/hermes/rpc/ehr/EhrRpcService.java
fw-hermes-rpc/src/main/java/cn/fw/hermes/rpc/member/MemberRpcService.java
fw-hermes-rpc/src/main/java/cn/fw/hermes/rpc/member/dto/MemberUserDTO.java
fw-hermes-rpc/src/main/java/cn/fw/hermes/rpc/member/dto/MemberUserLevelDTO.java
fw-hermes-rpc/src/main/kotlin/cn/fw/hermes/rpc/member/MemberRpcService.kt
fw-hermes-rpc/src/main/kotlin/cn/fw/hermes/rpc/member/dto/MemberUserDTO.kt
fw-hermes-server/src/main/java/cn/fw/hermes/task/MessageSaveTask.kt
fw-hermes-server/src/main/java/cn/fw/hermes/HermesServer.kt → fw-hermes-server/src/main/kotlin/cn/fw/hermes/HermesServer.kt
fw-hermes-server/src/main/java/cn/fw/hermes/controller/erp/XinGeDebugController.kt → fw-hermes-server/src/main/kotlin/cn/fw/hermes/controller/common/XinGeDebugController.kt
fw-hermes-service/src/main/java/cn/fw/hermes/service/biz/AccountBizService.java
fw-hermes-service/src/main/java/cn/fw/hermes/service/biz/BeanTransfer.java
-package cn.fw.hermes.common.utils;
-
-import cn.hutool.http.HttpRequest;
-import cn.hutool.http.HttpUtil;
-import cn.hutool.json.JSONUtil;
-import org.apache.commons.codec.binary.Base64;
-
-import javax.crypto.Mac;
-import javax.crypto.spec.SecretKeySpec;
-import java.net.URLEncoder;
-import java.nio.charset.StandardCharsets;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.Map;
-
-/**
- * 机器人工具
- *
- * @author : kurisu
- * @version : 2.0
- * @desc : 机器人工具
- * @date : 2023-09-08 14:40
- */
-public class RobotHelper {
-    private static final String DING_TALK_ROBOT_API = "https://oapi.dingtalk.com/robot/send";
-
-    public static String sendEarlyWarning(String accessToken, String secret) throws Exception {
-        Long timestamp = System.currentTimeMillis();
-        String sign = createSign(timestamp, secret);
-        String url = String.format("%s?access_token=%s&timestamp=%s&sign=%s", DING_TALK_ROBOT_API, accessToken, timestamp, sign);
-
-        Map<String, String> markdown = new HashMap<>();
-        markdown.put("title", "预警信息");
-        markdown.put("text", "### MQTT服务断开连接 \n" +
-            " ##### 重连次数超过10次\n" +
-            " ###### " + DateUtil.getFormatString(new Date(), "MM月dd日 HH点mm分") +
-            " 发布  \n");
-
-        Map<String, Object> params = new HashMap<>();
-        params.put("msgtype", "markdown");
-        params.put("markdown", markdown);
-        HttpRequest post = HttpUtil.createPost(url);
-        post.body(JSONUtil.toJsonStr(params), "application/json");
-
-        return post.setConnectionTimeout(-1).execute().body();
-    }
-
-    public static void main(String[] args) throws Exception {
-        String res = sendEarlyWarning("31a16df234bc4b78a29c5a4cc35a7421fc90a87cc339dbb545117b6966d2ca32", "SEC509e8cd6d0c3969563acf9e33c177c49cf2a365cd60ddc841d4eb728afcd6940");
-        System.out.println(res);
-    }
-
-    private static String createSign(Long timestamp, String secret) throws Exception {
-        String stringToSign = timestamp + "\n" + secret;
-        Mac mac = Mac.getInstance("HmacSHA256");
-        mac.init(new SecretKeySpec(secret.getBytes(StandardCharsets.UTF_8), "HmacSHA256"));
-        byte[] signData = mac.doFinal(stringToSign.getBytes(StandardCharsets.UTF_8));
-        return URLEncoder.encode(new String(Base64.encodeBase64(signData)), "UTF-8");
-    }
-}
-package cn.fw.hermes.common.utils;
-
-import cn.hutool.core.lang.Dict;
-import cn.hutool.extra.template.Template;
-import cn.hutool.extra.template.TemplateConfig;
-import cn.hutool.extra.template.TemplateEngine;
-import cn.hutool.extra.template.TemplateUtil;
-
-import java.util.Objects;
-
-/**
- * 模板字符工具类
- *
- * @author : kurisu
- * @version : 2.0
- * @desc : 模板字符工具类
- * @date : 2023-06-25 16:15
- */
-public final class TemplateHelper {
-    private static volatile TemplateHelper INSTANCE;
-    private final TemplateEngine engine;
-
-    private TemplateHelper() {
-        this.engine = TemplateUtil.createEngine(new TemplateConfig());
-    }
-
-    public static TemplateHelper getInstance() {
-        if (INSTANCE == null) {
-            synchronized (ThreadPoolUtil.class) {
-                if (INSTANCE == null) {
-                    INSTANCE = new TemplateHelper();
-                }
-            }
-        }
-        return INSTANCE;
-    }
-
-    public TemplateEngine getEngine() {
-        return engine;
-    }
-
-    /**
-     * 渲染模板
-     *
-     * @param template 模板字符串
-     * @param dict     字典值
-     * @return res
-     */
-    public String render(String template, Dict dict) {
-        try {
-            if (StringUtils.isEmpty(template) || Objects.isNull(dict)) {
-                return template;
-            }
-            Template engineTemplate = engine.getTemplate(template);
-            return engineTemplate.render(dict);
-        } catch (Exception e) {
-            return null;
-        }
-    }
-
-    public static void main(String[] args) {
-        TemplateHelper helper = getInstance();
-        Dict dict = Dict.create();
-        dict.set("identifier", "b0123");
-        dict.set("platform", "89b3f3ef");
-        dict.set("groupId", "89");
-        String render = helper.render("platform/${identifier}/${platform}", dict);
-        System.out.println(render);
-    }
-}
-package cn.fw.hermes.common.utils;
-
-import cn.hutool.core.thread.ExecutorBuilder;
-import cn.hutool.core.thread.NamedThreadFactory;
-
-import java.util.concurrent.ExecutorService;
-
-/**
- * ThreadPoolUtil
- *
- * @author : kurisu
- * @version : 2.0
- * @className : ThreadPoolUtil
- * @description : ThreadPoolUtil
- * @date : 2023-04-19 17:31
- */
-public class ThreadPoolUtil {
-    private static volatile ThreadPoolUtil INSTANCE;
-    private final ExecutorService executor;
-
-    private ThreadPoolUtil() {
-        this.executor = ExecutorBuilder.create()
-            .setCorePoolSize(2 << 5)
-            .setMaxPoolSize(2 << 6)
-            .setThreadFactory(new NamedThreadFactory("Hermes-Custom-", false))
-            .setAllowCoreThreadTimeOut(true)
-            .useArrayBlockingQueue(2 << 10)
-            .build();
-    }
-
-    public static ThreadPoolUtil getInstance() {
-        if (INSTANCE == null) {
-            synchronized (ThreadPoolUtil.class) {
-                if (INSTANCE == null) {
-                    INSTANCE = new ThreadPoolUtil();
-                }
-            }
-        }
-        return INSTANCE;
-    }
-
-    public ExecutorService getExecutor() {
-        return executor;
-    }
-}
-package cn.fw.hermes.common.utils;
-
-import java.util.UUID;
-
-
-public final class UUIDUtils {
-  public static String newRandomUUid(){
-    return UUID.randomUUID().toString().replaceAll("-","");
-  }
-
-  public static String newStaffIdentifier(Long userId){
-    return String.format("b0%s", userId);
-  }
-
-  public static String newMemberIdentifier(Long userId){
-    return String.format("c0%s", userId);
-  }
-
-}
+package cn.fw.hermes.common.utils
+
+import cn.hutool.http.HttpUtil
+import cn.hutool.json.JSONUtil
+import org.apache.commons.codec.binary.Base64
+import java.net.URLEncoder
+import java.nio.charset.StandardCharsets
+import java.util.*
+import javax.crypto.Mac
+import javax.crypto.spec.SecretKeySpec
+
+/**
+ * 机器人工具
+ *
+ * @author : kurisu
+ * @version : 2.0
+ * @desc : 机器人工具
+ * @date : 2023-09-08 14:40
+ */
+object RobotHelper {
+    private const val DING_TALK_ROBOT_API = "https://oapi.dingtalk.com/robot/send"
+
+    @Throws(Exception::class)
+    fun sendEarlyWarning(accessToken: String?, secret: String?): String {
+        val timestamp = System.currentTimeMillis()
+        val sign = createSign(timestamp, secret ?: "")
+        val url = String.format("%s?access_token=%s&timestamp=%s&sign=%s", DING_TALK_ROBOT_API, accessToken, timestamp, sign)
+
+        val markdown: MutableMap<String, String> = HashMap()
+        markdown["title"] = "预警信息"
+        markdown["text"] = """### MQTT服务断开连接
+ ##### 重连次数超过10次
+ ###### ${DateUtil.getFormatString(Date(), "MM月dd日 HH点mm分")} 发布
+"""
+
+        val params: MutableMap<String, Any> = HashMap()
+        params["msgtype"] = "markdown"
+        params["markdown"] = markdown
+        val post = HttpUtil.createPost(url)
+        post.body(JSONUtil.toJsonStr(params), "application/json")
+
+        return post.setConnectionTimeout(-1).execute().body()
+    }
+
+    @Throws(Exception::class)
+    private fun createSign(timestamp: Long, secret: String): String {
+        val stringToSign = """
+            $timestamp
+            $secret
+            """.trimIndent()
+        val mac = Mac.getInstance("HmacSHA256")
+        mac.init(SecretKeySpec(secret.toByteArray(StandardCharsets.UTF_8), "HmacSHA256"))
+        val signData = mac.doFinal(stringToSign.toByteArray(StandardCharsets.UTF_8))
+        return URLEncoder.encode(String(Base64.encodeBase64(signData)), "UTF-8")
+    }
+}
+package cn.fw.hermes.common.utils
+
+import cn.hutool.core.lang.Dict
+import cn.hutool.extra.template.TemplateConfig
+import cn.hutool.extra.template.TemplateEngine
+import cn.hutool.extra.template.TemplateUtil
+import java.util.*
+
+/**
+ * 模板字符工具类
+ *
+ * @author : kurisu
+ * @version : 2.0
+ * @desc : 模板字符工具类
+ * @date : 2023-06-25 16:15
+ */
+object TemplateHelper {
+    val engine: TemplateEngine = TemplateUtil.createEngine(TemplateConfig())
+
+    /**
+     * 渲染模板
+     *
+     * @param template 模板字符串
+     * @param dict     字典值
+     * @return res
+     */
+    fun render(template: String?, dict: Dict?): String? {
+        try {
+            if (StringUtils.isEmpty(template) || Objects.isNull(dict)) {
+                return template
+            }
+            val engineTemplate = engine.getTemplate(template)
+            return engineTemplate.render(dict)
+        } catch (e: Exception) {
+            return null
+        }
+    }
+}
+package cn.fw.hermes.common.utils
+
+import cn.hutool.core.thread.ExecutorBuilder
+import cn.hutool.core.thread.NamedThreadFactory
+import java.util.concurrent.ExecutorService
+
+/**
+ * ThreadPoolUtil
+ *
+ * @author : kurisu
+ * @version : 2.0
+ * @className : ThreadPoolUtil
+ * @description : ThreadPoolUtil
+ * @date : 2023-04-19 17:31
+ */
+object ThreadPoolUtil {
+    val executor: ExecutorService
+        get() = ExecutorBuilder.create()
+            .setCorePoolSize(2 shl 5)
+            .setMaxPoolSize(2 shl 6)
+            .setThreadFactory(NamedThreadFactory("Hermes-Custom-", false))
+            .setAllowCoreThreadTimeOut(true)
+            .useArrayBlockingQueue(2 shl 10)
+            .build()
+
+}
+package cn.fw.hermes.common.utils
+
+import java.util.*
+
+object UUIDUtils {
+    fun newRandomUUid(): String {
+        return UUID.randomUUID().toString().replace("-".toRegex(), "")
+    }
+
+    fun newStaffIdentifier(userId: Long?): String {
+        return String.format("b0%s", userId)
+    }
+
+    fun newMemberIdentifier(userId: Long?): String {
+        return String.format("c0%s", userId)
+    }
+}
+package cn.fw.hermes.common.utils
+
+import cn.hutool.core.lang.Dict
+import org.junit.Test
+
+/**
+ * 测试工具
+ *
+ * @author : kurisu
+ * @version : 1.0
+ * @desc : 测试工具
+ * @date : 2024-01-05 16:59
+ */
+class Tests {
+
+    @Test
+    fun testUUID() {
+        println(UUIDUtils.newRandomUUid())
+    }
+
+    @Test
+    fun testTemplate() {
+        val dict = Dict.create()
+        dict["identifier"] = "b0123"
+        dict["platform"] = "89b3f3ef"
+        dict["groupId"] = "89"
+        val render: String? = TemplateHelper.render("platform/\${identifier}/\${platform}", dict)
+        println(render)
+    }
+}
@@ -49,7 +49,7 @@ public class EhrRpcService {
                 return staffInfoDTO;
             }
         } catch (Exception e) {
-            e.printStackTrace();
+            log.error("queryStaffInfo 失败", e);
         }
         return null;
     }
@@ -74,7 +74,7 @@ public class EhrRpcService {
                 return staffInfoDTO;
             }
         } catch (Exception e) {
-            e.printStackTrace();
+            log.error("queryStaffInfoByMobile 失败", e);
         }
         return null;
     }
-package cn.fw.hermes.rpc.member;
-
-import cn.fw.common.util.MobileUtil;
-import cn.fw.data.base.domain.common.Message;
-import cn.fw.hermes.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;
-
-/**
- * 会员服务
- *
- * @author kurisu
- */
-@Slf4j
-@Service
-public 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;
-    }
-
-    /**
-     * 根据会员ID获取会员信息
-     *
-     * @param userId 会员ID
-     * @return 会员信息
-     */
-    public MemberUserDTO user(final Long userId) {
-        if (userId == null) {
-            return null;
-        }
-        try {
-            final Message<MemberInfoVo> msg = memberApi.getMemberById(userId);
-            if (!msg.isSuccess()) {
-                log.warn("调用Member[根据会员ID[{}]获取会员信息]系统失败, 原因：{}", userId, msg.getResult());
-                return null;
-            }
-            final MemberInfoVo user = msg.getData();
-            if (user != null) {
-                final MemberUserDTO userDTO = new MemberUserDTO();
-                BeanUtils.copyProperties(user, userDTO);
-                return userDTO;
-            }
-        } catch (Exception e) {
-            log.error("调用Member[根据会员ID[{}]获取会员信息]系统失败", userId, e);
-        }
-        return null;
-    }
-
-    /**
-     * 查询手机号归属地
-     *
-     * @param mobile
-     * @return
-     */
-    @Cacheable(cacheNames = "mobile:attribution", key = "#mobile", unless = "#result.isEmpty()")
-    public String attribution(final String mobile) {
-        if (StringUtils.isBlank(mobile)) {
-            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 "";
-    }
-
-}
-package cn.fw.hermes.rpc.member.dto;
-
-import lombok.Data;
-
-import java.io.Serializable;
-import java.util.Date;
-
-/**
- * 会员信息
- * <p>
- * create at 2019-05-09
- *
- * @author kurisu
- */
-@Data
-public class MemberUserDTO implements Serializable {
-    private Long id;
-    private Long latestAccountId;
-    /**
-     * 真实姓名
-     */
-    private String realName;
-
-    /**
-     * 证件类型
-     */
-    private Integer credentType;
-
-    /**
-     * 证件号码
-     */
-    private String credentNo;
-
-    /**
-     * 生日
-     */
-    private Date birthday;
-
-    public Long getUserId() {
-        return id;
-    }
-
-    public Long getMemberId() {
-        return id;
-    }
-
-    public Long getAccountId() {
-        return id;
-    }
-}
-package cn.fw.hermes.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;
-}
+package cn.fw.hermes.rpc.member
+
+import cn.fw.common.util.logError
+import cn.fw.common.util.logInfo
+import cn.fw.hermes.rpc.member.dto.MemberUserDTO
+import cn.fw.member.sdk.api.MemberApi
+import org.springframework.stereotype.Service
+
+/**
+ * 会员服务
+ *
+ * @author kurisu
+ */
+@Service
+class MemberRpcService(
+    private val memberApi: MemberApi
+) {
+    /**
+     * 根据会员ID获取会员信息
+     *
+     * @param userId 会员ID
+     * @return 会员信息
+     */
+    fun user(userId: Long?): MemberUserDTO? {
+        try {
+            userId?.let {
+                memberApi.getMemberById(userId)?.takeIf {
+                    logInfo("调用Member系统[根据会员ID[{}]获取会员信息] --> res:{}  data:{}", userId, it.result, it.data)
+                    it.isSuccess
+                }?.run {
+                    data?.let {
+                        MemberUserDTO(
+                            latestAccountId = data.latestAccountId,
+                            realName = data.realName,
+                            credentType = data.credentType,
+                            credentNo = data.credentNo,
+                            birthday = data.birthDate,
+                            accountId = data.latestAccountId,
+                        )
+                    }
+                }
+            }
+        } catch (e: Exception) {
+            logError("调用Member[根据会员ID[{}]获取会员信息]系统失败", userId, e)
+        }
+        return null
+    }
+}
+package cn.fw.hermes.rpc.member.dto
+
+import java.util.*
+
+/**
+ * 会员信息
+ *
+ *
+ * create at 2019-05-09
+ *
+ * @author kurisu
+ */
+data class MemberUserDTO(
+    val latestAccountId: Long?,
+
+    /**
+     * 真实姓名
+     */
+    val realName: String?,
+
+    /**
+     * 证件类型
+     */
+    val credentType: Int?,
+
+    /**
+     * 证件号码
+     */
+    val credentNo: String?,
+
+    /**
+     * 生日
+     */
+    val birthday: Date?,
+    /**
+     * 账号id
+     */
+    val accountId: Long?,
+)
@@ -69,7 +69,7 @@ class MessageSaveTask(
             if (Objects.isNull(dto)) {
                 continue
             }
-            val executor = ThreadPoolUtil.getInstance().executor
+            val executor = ThreadPoolUtil.executor
             val future = CompletableFuture.runAsync({
                 try {
                     msgPrepareBizService.saveMsg(dto)
-package cn.fw.hermes.controller.erp
+package cn.fw.hermes.controller.common
+
  
 import cn.fw.common.web.annotation.ControllerMethod
 import cn.fw.common.web.util.ResultBuilder.success
@@ -152,7 +152,7 @@ public class AccountBizService {
  
     private Hermes genHermes(Long userId, String userName, AccountTypeEnum accountTypeEnum) {
         Hermes hermes = new Hermes();
-        hermes.setIdentifier(UUIDUtils.newStaffIdentifier(userId));
+        hermes.setIdentifier(UUIDUtils.INSTANCE.newStaffIdentifier(userId));
         hermes.setUserId(userId);
         hermes.setNickName(userName);
         hermes.setAccountType(accountTypeEnum);
@@ -162,7 +162,7 @@ public class AccountBizService {
     }
  
     private void renderTopics(AccountResultVO vo, String platform) {
-        final TemplateHelper helper = TemplateHelper.getInstance();
+        final TemplateHelper helper = TemplateHelper.INSTANCE;
         final Dict dict = Dict.create();
         dict.set("identifier", vo.getIdentifier());
         dict.set("platform", platform);
@@ -282,7 +282,7 @@ public final class BeanTransfer {
     }
  
     public static String renderTopic(String format, String identifier, String platformCode) {
-        final TemplateHelper helper = TemplateHelper.getInstance();
+        final TemplateHelper helper = TemplateHelper.INSTANCE;
         final Dict dict = Dict.create();
         dict.set("identifier", identifier);
         dict.set("platform", platformCode);
@@ -223,7 +223,7 @@ class MqttService(
                 } catch (ignored: InterruptedException) {
                 }
                 messageHistoryService.sendCallback(id, true, Constant.SUCCESS_MSG)
-            }, ThreadPoolUtil.getInstance().executor)
+            }, ThreadPoolUtil.executor)
         }
     }
  
@@ -233,7 +233,7 @@ class MqttService(
      * @return
      */
     fun sendWarningMsg() {
-        val robot = mqttProperty!!.robot
+        val robot = mqttProperty.robot
         logInfo("机器人配置信息：[{}]", robot)
         if (Objects.nonNull(robot) && robot!!.enabled) {
             try {
@@ -212,6 +212,10 @@
                 <groupId>org.codehaus.mojo</groupId>
                 <artifactId>versions-maven-plugin</artifactId>
             </plugin>
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>build-helper-maven-plugin</artifactId>
+            </plugin>
         </plugins>
     </build>