diff --git a/build.gradle b/build.gradle
index a4aa5bcbbffcec9da4ea7b3e3f62c0a49fb8c438..18f491c62881f1d7c6ce9f9b794ac7f735c1e0c3 100644
--- a/build.gradle
+++ b/build.gradle
@@ -86,16 +86,16 @@ dependencies {
     compile("org.apache.taglibs:taglibs-standard-impl:1.2.5")
 
     //akka http
-    compile group: 'com.typesafe.akka', name: 'akka-actor_2.13', version: '2.5.32'
-    compile group: 'com.typesafe.akka', name: 'akka-http_2.13', version: '10.1.10'
-    compile group: 'com.typesafe.akka', name: 'akka-slf4j_2.13', version: '2.5.32'
-    compile group: 'com.typesafe.akka', name: 'akka-stream_2.13', version: '2.5.32'
+    compile 'com.typesafe.akka:akka-actor_2.13:2.5.32'
+    compile 'com.typesafe.akka:akka-http_2.13:10.1.10'
+    compile 'com.typesafe.akka:akka-slf4j_2.13:2.5.32'
+    compile 'com.typesafe.akka:akka-stream_2.13:2.5.32'
 
     //publish
-    compile group: 'org.reactivestreams', name: 'reactive-streams', version: '1.0.0'
+    compile 'org.reactivestreams:reactive-streams:1.0.0'
 
     //config
-    compile group: 'com.typesafe', name: 'config', version: '1.2.1'
+    compile 'com.typesafe:config:1.2.1'
 
     // scala 序列化
     compile 'com.fasterxml.jackson.core:jackson-databind:2.13.0'
@@ -105,7 +105,7 @@ dependencies {
     compile 'com.fasterxml.jackson.module:jackson-modules-java8:2.13.0'
 
     //  自己写的的工具
-    compile 'io.github.jxnu-liguobin:scala-macro-tools_2.13:0.3.2'
+    compile 'org.bitlap:scala-macro-tools_2.13:0.3.4'
 
     //test
     testCompile("org.springframework.boot:spring-boot-starter-test")
diff --git a/src/main/scala/io/github/dreamylost/config/CacheConfig.scala b/src/main/scala/io/github/dreamylost/config/CacheConfig.scala
index 0ec76185490f42ef1f343b471837099c86fe9c6b..08abd87044d602ca0b4ab4c661fa6d54f7729ffe 100644
--- a/src/main/scala/io/github/dreamylost/config/CacheConfig.scala
+++ b/src/main/scala/io/github/dreamylost/config/CacheConfig.scala
@@ -9,8 +9,8 @@ import com.fasterxml.jackson.databind.SerializationFeature
 import com.fasterxml.jackson.databind.jsontype.impl.LaissezFaireSubTypeValidator
 import com.fasterxml.jackson.module.scala.DefaultScalaModule
 import com.fasterxml.jackson.module.scala.ScalaObjectMapper
-import io.github.dreamylost.log
-import io.github.dreamylost.logs.LogType
+import org.bitlap.tools.log
+import org.bitlap.tools.logs.LogType
 import org.springframework.beans.factory.annotation.Value
 import org.springframework.cache.CacheManager
 import org.springframework.cache.annotation.CachingConfigurerSupport
diff --git a/src/main/scala/io/github/dreamylost/config/CustomErrorController.scala b/src/main/scala/io/github/dreamylost/config/CustomErrorController.scala
index 1b07223d690aaf92978e85a96bc302aa1050537a..d00d37febd01551a2d3f124d8ba54d89892eeb71 100644
--- a/src/main/scala/io/github/dreamylost/config/CustomErrorController.scala
+++ b/src/main/scala/io/github/dreamylost/config/CustomErrorController.scala
@@ -1,7 +1,7 @@
 package io.github.dreamylost.config
 
-import io.github.dreamylost.log
-import io.github.dreamylost.logs.LogType
+import org.bitlap.tools.log
+import org.bitlap.tools.logs.LogType
 import org.springframework.boot.autoconfigure.web.ErrorController
 import org.springframework.stereotype.Controller
 import org.springframework.web.bind.annotation.RequestMapping
diff --git a/src/main/scala/io/github/dreamylost/config/MybatisConfig.scala b/src/main/scala/io/github/dreamylost/config/MybatisConfig.scala
index d8b2d101dd19f20bbdb68e7d9078d56db1b7e29b..7b1c7b7a373bcecb65d5d61b97cb3e3bf3ce2d4b 100644
--- a/src/main/scala/io/github/dreamylost/config/MybatisConfig.scala
+++ b/src/main/scala/io/github/dreamylost/config/MybatisConfig.scala
@@ -1,8 +1,8 @@
 package io.github.dreamylost.config
 
 import com.github.pagehelper.PageHelper
-import io.github.dreamylost.log
-import io.github.dreamylost.logs.LogType
+import org.bitlap.tools.log
+import org.bitlap.tools.logs.LogType
 import org.springframework.context.annotation.Bean
 import org.springframework.context.annotation.Configuration
 
diff --git a/src/main/scala/io/github/dreamylost/config/RedisConfig.scala b/src/main/scala/io/github/dreamylost/config/RedisConfig.scala
index 1d917101bdd4b47f50577f5814cbcdd7e680da9d..c2f430bfd9771480d2f72ec2dd2206dd01739d2a 100644
--- a/src/main/scala/io/github/dreamylost/config/RedisConfig.scala
+++ b/src/main/scala/io/github/dreamylost/config/RedisConfig.scala
@@ -1,7 +1,7 @@
 package io.github.dreamylost.config
 
-import io.github.dreamylost.log
-import io.github.dreamylost.logs.LogType
+import org.bitlap.tools.log
+import org.bitlap.tools.logs.LogType
 import org.springframework.beans.factory.annotation.Value
 import org.springframework.context.annotation.Bean
 import org.springframework.context.annotation.Configuration
diff --git a/src/main/scala/io/github/dreamylost/config/SpringMVCConfig.scala b/src/main/scala/io/github/dreamylost/config/SpringMVCConfig.scala
index c8a38ed681a35c56b4463d7d75cf71d8871050ab..18c48132a56f01fcfd7c3bd71f177011c2030fad 100644
--- a/src/main/scala/io/github/dreamylost/config/SpringMVCConfig.scala
+++ b/src/main/scala/io/github/dreamylost/config/SpringMVCConfig.scala
@@ -55,7 +55,7 @@ class SpringMVCConfig extends WebMvcConfigurerAdapter {
     *
     * @param registry
     */
-  override def addResourceHandlers(registry: ResourceHandlerRegistry) {
+  override def addResourceHandlers(registry: ResourceHandlerRegistry): Unit = {
     registry
       .addResourceHandler("swagger-ui.html")
       .addResourceLocations("classpath:/META-INF/resources/")
diff --git a/src/main/scala/io/github/dreamylost/config/Swagger2Config.scala b/src/main/scala/io/github/dreamylost/config/Swagger2Config.scala
index 930d4688cd66827f266cea97d99b000507b1b806..d6105998e4b29a280a09d3622f09ee639ab8840d 100644
--- a/src/main/scala/io/github/dreamylost/config/Swagger2Config.scala
+++ b/src/main/scala/io/github/dreamylost/config/Swagger2Config.scala
@@ -30,17 +30,16 @@ class Swagger2Config {
       .paths(PathSelectors.any())
       .build()
 
-  private lazy val apiInfo: () => ApiInfo = () =>
+  private lazy val apiInfo: () => ApiInfo = () => {
     new ApiInfoBuilder()
       // 页面标题
       .title("Sim")
       // 创建人
-      .description("梦境迷离：https://github.com/jxnu-liguobin")
-      .termsOfServiceUrl("https://github.com/jxnu-liguobin")
-      // 创建人
-      .contact("梦境迷离")
+      .description("Scala即时通讯系统")
+      .termsOfServiceUrl("https://github.com/jxnu-liguobin/Sim")
+      .contact("dreamylost@outlook.com")
       // 版本号
-      .version("1.3")
+      .version("1.3.1")
       .build()
-
+  }
 }
diff --git a/src/main/scala/io/github/dreamylost/config/SystemHandlerInterceptor.scala b/src/main/scala/io/github/dreamylost/config/SystemHandlerInterceptor.scala
index 7a8411109b784cb2b9695787e3ef8f94e3ca14dd..f6c5047bcbf02c4372ed07c0a98b205c650e04f0 100644
--- a/src/main/scala/io/github/dreamylost/config/SystemHandlerInterceptor.scala
+++ b/src/main/scala/io/github/dreamylost/config/SystemHandlerInterceptor.scala
@@ -1,7 +1,7 @@
 package io.github.dreamylost.config
 
-import io.github.dreamylost.log
-import io.github.dreamylost.logs.LogType
+import org.bitlap.tools.log
+import org.bitlap.tools.logs.LogType
 import org.springframework.web.servlet.HandlerInterceptor
 import org.springframework.web.servlet.ModelAndView
 
diff --git a/src/main/scala/io/github/dreamylost/controller/UserController.scala b/src/main/scala/io/github/dreamylost/controller/UserController.scala
index 941f801971795cf18122d037196d5466f23e4805..0651c8e9c889d58c726b3ec1fd5951183720dee9 100644
--- a/src/main/scala/io/github/dreamylost/controller/UserController.scala
+++ b/src/main/scala/io/github/dreamylost/controller/UserController.scala
@@ -2,7 +2,7 @@ package io.github.dreamylost.controller
 
 import com.github.pagehelper.PageHelper
 import io.github.dreamylost.constant.SystemConstant
-import io.github.dreamylost.logs.LogType
+import org.bitlap.tools.logs.LogType
 import io.github.dreamylost.model._
 import io.github.dreamylost.model.domains.UserVo
 import io.github.dreamylost.model.domains._
@@ -15,7 +15,7 @@ import io.github.dreamylost.util.FileUtil
 import io.github.dreamylost.util.SecurityUtil
 import io.github.dreamylost.ResultPageSet
 import io.github.dreamylost.ResultSet
-import io.github.dreamylost.log
+import org.bitlap.tools.log
 import io.swagger.annotations.Api
 import io.swagger.annotations.ApiOperation
 import org.springframework.beans.factory.annotation.Autowired
diff --git a/src/main/scala/io/github/dreamylost/model/FriendAndGroupInfo.scala b/src/main/scala/io/github/dreamylost/model/FriendAndGroupInfo.scala
index 5e0502bacc7dbabc5594a7ce0d264ca6b63a13cf..c90c95d30c18315faa0aee004503ae48be8aa237 100644
--- a/src/main/scala/io/github/dreamylost/model/FriendAndGroupInfo.scala
+++ b/src/main/scala/io/github/dreamylost/model/FriendAndGroupInfo.scala
@@ -1,6 +1,6 @@
 package io.github.dreamylost.model
 
-import io.github.dreamylost.JavaCompatible
+import org.bitlap.tools.JavaCompatible
 import io.github.dreamylost.model.domains.FriendList
 import io.github.dreamylost.model.entities.GroupList
 import io.github.dreamylost.model.entities.User
diff --git a/src/main/scala/io/github/dreamylost/model/domains.scala b/src/main/scala/io/github/dreamylost/model/domains.scala
index b5496294302b31e9b9ff706d57aa77d5f0ad1014..2d883d979ef2740c3d157efcee35a7fe921adbff 100644
--- a/src/main/scala/io/github/dreamylost/model/domains.scala
+++ b/src/main/scala/io/github/dreamylost/model/domains.scala
@@ -1,7 +1,7 @@
 package io.github.dreamylost.model
 
 import io.github.dreamylost.model.entities.User
-import io.github.dreamylost.JavaCompatible
+import org.bitlap.tools.JavaCompatible
 
 /** @author 梦境迷离
   * @since 2021/11/21
diff --git a/src/main/scala/io/github/dreamylost/model/entities.scala b/src/main/scala/io/github/dreamylost/model/entities.scala
index c304aad24a6cdc1aaa4cc015624f903e5adc3d9b..b7d4f63b5c01a0f1829f711c3e2e57efda420dc2 100644
--- a/src/main/scala/io/github/dreamylost/model/entities.scala
+++ b/src/main/scala/io/github/dreamylost/model/entities.scala
@@ -1,6 +1,6 @@
 package io.github.dreamylost.model
 
-import io.github.dreamylost.JavaCompatible
+import org.bitlap.tools.JavaCompatible
 
 import java.util.Date
 
diff --git a/src/main/scala/io/github/dreamylost/service/CookieService.scala b/src/main/scala/io/github/dreamylost/service/CookieService.scala
index 064482d4bf387f7b4a247ecba7eec1a417b3f650..e2b8acabb56b68e8af0f4daaf975c3f753e45934 100644
--- a/src/main/scala/io/github/dreamylost/service/CookieService.scala
+++ b/src/main/scala/io/github/dreamylost/service/CookieService.scala
@@ -1,7 +1,7 @@
 package io.github.dreamylost.service
 
-import io.github.dreamylost.log
-import io.github.dreamylost.logs.LogType
+import org.bitlap.tools.log
+import org.bitlap.tools.logs.LogType
 import io.github.dreamylost.model.entities.User
 import org.springframework.stereotype.Service
 
@@ -19,7 +19,7 @@ import javax.servlet.http.HttpServletResponse
 @log(logType = LogType.Slf4j)
 class CookieService {
 
-  def addCookie(user: User, request: HttpServletRequest, response: HttpServletResponse) {
+  def addCookie(user: User, request: HttpServletRequest, response: HttpServletResponse): Unit = {
     val baseE: Base64.Encoder = Base64.getEncoder
     val baseD: Base64.Decoder = Base64.getDecoder
     //记住用户名、密码功能(注意：cookie存放密码会存在安全隐患)
diff --git a/src/main/scala/io/github/dreamylost/service/MailService.scala b/src/main/scala/io/github/dreamylost/service/MailService.scala
index c22f9a155464c5c4cd69729d2427034a57eae6b6..d0b4249691fce0e1909ecb1ec906c33a8687a03b 100644
--- a/src/main/scala/io/github/dreamylost/service/MailService.scala
+++ b/src/main/scala/io/github/dreamylost/service/MailService.scala
@@ -1,7 +1,7 @@
 package io.github.dreamylost.service
 
-import io.github.dreamylost.log
-import io.github.dreamylost.logs.LogType
+import org.bitlap.tools.log
+import org.bitlap.tools.logs.LogType
 import org.springframework.beans.factory.annotation.Autowired
 import org.springframework.beans.factory.annotation.Value
 import org.springframework.core.io.FileSystemResource
diff --git a/src/main/scala/io/github/dreamylost/service/UserService.scala b/src/main/scala/io/github/dreamylost/service/UserService.scala
index 678ad21d4e4a6de3c8e7ffebd6025de8b4e38bcd..bef5a21600643c7228161305cfdc2c3c5bfba4e7 100644
--- a/src/main/scala/io/github/dreamylost/service/UserService.scala
+++ b/src/main/scala/io/github/dreamylost/service/UserService.scala
@@ -1,8 +1,8 @@
 package io.github.dreamylost.service
 
 import io.github.dreamylost.constant.SystemConstant
-import io.github.dreamylost.log
-import io.github.dreamylost.logs.LogType
+import org.bitlap.tools.log
+import org.bitlap.tools.logs.LogType
 import io.github.dreamylost.model.domains._
 import io.github.dreamylost.model.entities._
 import io.github.dreamylost.repository.UserRepository
diff --git a/src/main/scala/io/github/dreamylost/websocket/RedisService.scala b/src/main/scala/io/github/dreamylost/websocket/RedisService.scala
index 30886884d4a078981b86ad92cbd5fe85de656c0b..544d6e9ec21eb15bf3fc4caa73dd64ffab6228ef 100644
--- a/src/main/scala/io/github/dreamylost/websocket/RedisService.scala
+++ b/src/main/scala/io/github/dreamylost/websocket/RedisService.scala
@@ -1,7 +1,7 @@
 package io.github.dreamylost.websocket
 
-import io.github.dreamylost.log
-import io.github.dreamylost.logs.LogType
+import org.bitlap.tools.log
+import org.bitlap.tools.logs.LogType
 import org.springframework.beans.factory.annotation.Autowired
 import org.springframework.data.redis.core.RedisTemplate
 import org.springframework.stereotype.Service
diff --git a/src/main/scala/io/github/dreamylost/websocket/WebSocketProvider.scala b/src/main/scala/io/github/dreamylost/websocket/WebSocketProvider.scala
index c7207df181ef1a40e3a84176e9f08ebb98c82429..186b7491575bb84b56bff1b4cb795a658e0cdcc7 100644
--- a/src/main/scala/io/github/dreamylost/websocket/WebSocketProvider.scala
+++ b/src/main/scala/io/github/dreamylost/websocket/WebSocketProvider.scala
@@ -15,8 +15,8 @@ import akka.stream.scaladsl.Keep
 import akka.stream.scaladsl.Sink
 import akka.stream.scaladsl.Source
 import io.github.dreamylost.constant.SystemConstant
-import io.github.dreamylost.log
-import io.github.dreamylost.logs.LogType
+import org.bitlap.tools.log
+import org.bitlap.tools.logs.LogType
 import io.github.dreamylost.model.entities.{ Message => IMMessage }
 import io.github.dreamylost.util.Jackson
 import io.github.dreamylost.websocket.Protocols._
diff --git a/src/main/scala/io/github/dreamylost/websocket/WebSocketServer.scala b/src/main/scala/io/github/dreamylost/websocket/WebSocketServer.scala
index 88f303679f019e8c483addad20608e0e2792cadf..7878eb2c69a39607ce4bfcd135e603b55ba1bc60 100644
--- a/src/main/scala/io/github/dreamylost/websocket/WebSocketServer.scala
+++ b/src/main/scala/io/github/dreamylost/websocket/WebSocketServer.scala
@@ -6,8 +6,8 @@ import akka.http.scaladsl.server.Directives
 import akka.http.scaladsl.settings.ServerSettings
 import akka.util.ByteString
 import com.typesafe.config.ConfigFactory
-import io.github.dreamylost.log
-import io.github.dreamylost.logs.LogType
+import org.bitlap.tools.log
+import org.bitlap.tools.logs.LogType
 import org.springframework.beans.factory.annotation.Autowired
 import org.springframework.stereotype.Component
 
diff --git a/src/main/scala/io/github/dreamylost/websocket/WebSocketService.scala b/src/main/scala/io/github/dreamylost/websocket/WebSocketService.scala
index 69219c32a69a78239073cd027ba71a208ada3000..1d106787bbb2956c371b4a11ce34f93657796cb2 100644
--- a/src/main/scala/io/github/dreamylost/websocket/WebSocketService.scala
+++ b/src/main/scala/io/github/dreamylost/websocket/WebSocketService.scala
@@ -4,8 +4,8 @@ import akka.actor.ActorRef
 import com.fasterxml.jackson.databind.ObjectMapper
 import com.fasterxml.jackson.module.scala.ScalaObjectMapper
 import io.github.dreamylost.constant.SystemConstant
-import io.github.dreamylost.log
-import io.github.dreamylost.logs.LogType
+import org.bitlap.tools.log
+import org.bitlap.tools.logs.LogType
 import io.github.dreamylost.model.domains.Add
 import io.github.dreamylost.model.domains.Receive
 import io.github.dreamylost.model.entities.AddMessage