Merge pull request #10 from jxnu-liguobin/up-tools

upgrade macro version

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")

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

src/main/scala/io/github/dreamylost/config/CustomErrorController.scala

 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

src/main/scala/io/github/dreamylost/config/MybatisConfig.scala

 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
 

src/main/scala/io/github/dreamylost/config/RedisConfig.scala

 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

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/")

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()
-
+  }
 }

src/main/scala/io/github/dreamylost/config/SystemHandlerInterceptor.scala

 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
 

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

src/main/scala/io/github/dreamylost/model/FriendAndGroupInfo.scala

 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

src/main/scala/io/github/dreamylost/model/domains.scala

 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

src/main/scala/io/github/dreamylost/model/entities.scala

 package io.github.dreamylost.model
 
-import io.github.dreamylost.JavaCompatible
+import org.bitlap.tools.JavaCompatible
 
 import java.util.Date
 

src/main/scala/io/github/dreamylost/service/CookieService.scala

 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存放密码会存在安全隐患)

src/main/scala/io/github/dreamylost/service/MailService.scala

 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

src/main/scala/io/github/dreamylost/service/UserService.scala

 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

src/main/scala/io/github/dreamylost/websocket/RedisService.scala

 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

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._

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
 

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