feat(*): 引入kotlin

- 引入kotlin

feat(*): 引入kotlin
- 引入kotlin
张志伟
1 parent 1ea85480
Showing 129 changed files with 74 additions and 58 deletions
.gitignore
fw-hermes-common/src/main/java/cn/fw/hermes/common/constant/Constant.java → fw-hermes-common/src/main/java+kotlin/cn/fw/hermes/common/constant/Constant.java
fw-hermes-common/src/main/java/cn/fw/hermes/common/utils/DateUtil.java → fw-hermes-common/src/main/java+kotlin/cn/fw/hermes/common/utils/DateUtil.java
fw-hermes-common/src/main/java/cn/fw/hermes/common/utils/RobotHelper.java → fw-hermes-common/src/main/java+kotlin/cn/fw/hermes/common/utils/RobotHelper.java
fw-hermes-common/src/main/java/cn/fw/hermes/common/utils/StringUtils.java → fw-hermes-common/src/main/java+kotlin/cn/fw/hermes/common/utils/StringUtils.java
fw-hermes-common/src/main/java/cn/fw/hermes/common/utils/TemplateHelper.java → fw-hermes-common/src/main/java+kotlin/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+kotlin/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/java+kotlin/cn/fw/hermes/common/utils/UUIDUtils.java
fw-hermes-dao/src/main/java/cn/fw/hermes/dao/mapper/AppUpdateMsgMapper.java → fw-hermes-dao/src/main/java+kotlin/cn/fw/hermes/dao/mapper/AppUpdateMsgMapper.java
fw-hermes-dao/src/main/java/cn/fw/hermes/dao/mapper/DisturbSettingMapper.java → fw-hermes-dao/src/main/java+kotlin/cn/fw/hermes/dao/mapper/DisturbSettingMapper.java
fw-hermes-dao/src/main/java/cn/fw/hermes/dao/mapper/GroupInfoMapper.java → fw-hermes-dao/src/main/java+kotlin/cn/fw/hermes/dao/mapper/GroupInfoMapper.java
fw-hermes-dao/src/main/java/cn/fw/hermes/dao/mapper/GroupUserMapper.java → fw-hermes-dao/src/main/java+kotlin/cn/fw/hermes/dao/mapper/GroupUserMapper.java
fw-hermes-dao/src/main/java/cn/fw/hermes/dao/mapper/HermesMapper.java → fw-hermes-dao/src/main/java+kotlin/cn/fw/hermes/dao/mapper/HermesMapper.java
fw-hermes-dao/src/main/java/cn/fw/hermes/dao/mapper/MessageBusinessTypeMapper.java → fw-hermes-dao/src/main/java+kotlin/cn/fw/hermes/dao/mapper/MessageBusinessTypeMapper.java
fw-hermes-dao/src/main/java/cn/fw/hermes/dao/mapper/MessageDataMapper.java → fw-hermes-dao/src/main/java+kotlin/cn/fw/hermes/dao/mapper/MessageDataMapper.java
fw-hermes-dao/src/main/java/cn/fw/hermes/dao/mapper/MessageHistoryMapper.java → fw-hermes-dao/src/main/java+kotlin/cn/fw/hermes/dao/mapper/MessageHistoryMapper.java
fw-hermes-dao/src/main/java/cn/fw/hermes/dao/mapper/SysPlatformMapper.java → fw-hermes-dao/src/main/java+kotlin/cn/fw/hermes/dao/mapper/SysPlatformMapper.java
fw-hermes-dao/src/main/java/cn/fw/hermes/dao/mapper/SysTopicMapper.java → fw-hermes-dao/src/main/java+kotlin/cn/fw/hermes/dao/mapper/SysTopicMapper.java
fw-hermes-dao/src/main/resources/mapper/DisturbSettingMapper.xml
fw-hermes-dao/src/main/resources/mapper/GroupInfoMapper.xml
@@ -31,3 +31,4 @@ target
 **/.factorypath
 **/test.html
 **/.fleet
+**/rebel.xml
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="cn.fw.hermes.dao.mapper.DisturbSettingMapper">
-
-</mapper>
 \ No newline at end of file
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="cn.fw.hermes.dao.mapper.GroupInfoMapper">
-
-</mapper>
 \ No newline at end of file
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="cn.fw.hermes.dao.mapper.GroupUserMapper">
-
-</mapper>
 \ No newline at end of file
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="cn.fw.hermes.dao.mapper.HermesMapper">
-
-</mapper>
 \ No newline at end of file
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="cn.fw.hermes.dao.mapper.MessageBusinessTypeMapper">
-
-</mapper>
 \ No newline at end of file
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="cn.fw.hermes.dao.mapper.MessageDataMapper">
-
-</mapper>
 \ No newline at end of file
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="cn.fw.hermes.dao.mapper.MessageHistoryMapper">
-
-</mapper>
 \ No newline at end of file
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="cn.fw.hermes.dao.mapper.SysPlatformMapper">
-
-</mapper>
 \ No newline at end of file
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="cn.fw.hermes.dao.mapper.SysTopicMapper">
-
-</mapper>
 \ No newline at end of file
@@ -42,9 +42,5 @@
             <groupId>cn.fw</groupId>
             <artifactId>fw-common-cache</artifactId>
         </dependency>
-        <dependency>
-            <groupId>org.jetbrains.kotlinx</groupId>
-            <artifactId>kotlinx-coroutines-core</artifactId>
-        </dependency>
     </dependencies>
 </project>
@@ -5,6 +5,7 @@ import cn.fw.hermes.service.property.MqttProperty
 import cn.fw.hermes.service.property.SettingProperty
 import cn.fw.hermes.service.property.XinGeProperty
 import cn.hutool.core.util.IdUtil
+import com.tencent.xinge.XingeApp
 import org.eclipse.paho.client.mqttv3.MqttAsyncClient
 import org.eclipse.paho.client.mqttv3.MqttException
 import org.eclipse.paho.client.mqttv3.persist.MemoryPersistence
@@ -21,7 +22,7 @@ import org.springframework.context.annotation.Configuration
 @RefreshScope
 @Configuration
 @EnableConfigurationProperties(MqttProperty::class, SettingProperty::class, XinGeProperty::class)
-class AutoConfiguration(private val mqttProperty: MqttProperty) {
+class AutoConfiguration(private val mqttProperty: MqttProperty, private val xinGeProperty: XinGeProperty) {
     @get:Throws(MqttException::class)
     @get:Bean
     val mqttClient: MqttAsyncClient
@@ -34,4 +35,15 @@ class AutoConfiguration(private val mqttProperty: MqttProperty) {
             logInfo("mqtt client initialize : {}", url)
             return MqttAsyncClient(url, clientId, MemoryPersistence())
         }
+
+    @get:Bean
+    val xingeClient: XingeApp
+        get() {
+            return XingeApp.Builder()
+                .appId(xinGeProperty.appId)
+                .secretKey(xinGeProperty.secretKey)
+                .domainUrl(xinGeProperty.domainUrl)
+                .build()
+
+        }
 }
@@ -4,6 +4,7 @@ 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.hermes.domain.xinge.XinGeProfile
+import cn.fw.hermes.service.biz.XgPushBizService
 import cn.fw.hermes.service.property.XinGeProperty
 import cn.fw.security.auth.client.annotation.Authorization
 import cn.fw.security.auth.client.enums.AuthType
@@ -24,13 +25,19 @@ import org.springframework.web.bind.annotation.RestController
 @RestController
 @RequestMapping("/debug/xinge")
 @Authorization(AuthType.NONE)
-class XinGeDebugController(private val xinGeProperty: XinGeProperty) {
-    @ControllerMethod("获取信鸽相关配置")
-    @GetMapping("/property/domain")
-    fun getTopics(): Message<XinGeProfile> {
-        val profile = xinGeProperty.run {
-            XinGeProfile(appId, secretKey, connectTimeOut, readTimeOut, domainUrl)
-        }
-        return success(profile)
+class XinGeDebugController(private val xinGeProperty: XinGeProperty, private val xgPushBizService: XgPushBizService) {
+    @ControllerMethod("信鸽推送测试消息")
+    @GetMapping("/send/msg")
+    fun sendMsg(): Message<Void> {
+        xgPushBizService.sendData()
+        return success()
     }
+
+
+    @get:ControllerMethod("获取信鸽相关配置")
+    @get:GetMapping("/property/domain")
+    val topics: Message<XinGeProfile>
+        get() = success(xinGeProperty.run {
+            XinGeProfile(appId, secretKey, connectTimeOut, readTimeOut, domainUrl)
+        })
 }