refactor (#294)

Author: jxnu-liguobin

modules/zim-api/src/main/scala/org/bitlap/zim/api/service/WsService.scala

@@ -16,12 +16,12 @@
 
 package org.bitlap.zim.domain
 
+import java.time.ZonedDateTime
+
 import io.circe._
 import io.circe.generic.semiauto._
 import org.bitlap.zim.domain.model.User
 
-import java.time.ZonedDateTime
-
 /** 返回添加好友、群组消息
  *
  *  @param id

modules/zim-domain/src/main/scala/org/bitlap/zim/domain/AddInfo.scala

@@ -16,13 +16,14 @@
 
 package org.bitlap.zim
 
-import io.circe._
-import zio.schema._
-
 import java.time.ZonedDateTime
 import java.time.format.DateTimeFormatter
+
 import scala.util.Try
 
+import io.circe._
+import zio.schema._
+
 /** @author
  *    梦境迷离
  *  @since 2022/2/2

modules/zim-domain/src/main/scala/org/bitlap/zim/domain/package.scala

@@ -75,37 +75,7 @@ final class InfrastructureConfiguration {
 /** infrastructure dependencies
  */
 object InfrastructureConfiguration {
-  def apply(): InfrastructureConfiguration = new InfrastructureConfiguration()
-  // ==================================system configuration============================================
-  val mysqlConfigurationProperties: URIO[InfrastructureConfiguration, MysqlConfigurationProperties] =
-    ZIO.environmentWith(_.get.mysqlConfigurationProperties)
-
-  val zimConfigurationProperties: UIO[ZimConfigurationProperties] =
-    ZimConfigurationProperties.make
-
-  val mailConfigurationProperties: UIO[MailConfigurationProperties] =
-    MailConfigurationProperties.make
-
-  // ==================================数据库============================================
-  val userRepository: URIO[InfrastructureConfiguration, UserRepository[RStream]] =
-    ZIO.environmentWith(_.get.userRepository)
-
-  val groupRepository: URIO[InfrastructureConfiguration, GroupRepository[RStream]] =
-    ZIO.environmentWith(_.get.groupRepository)
-
-  val receiveRepository: URIO[InfrastructureConfiguration, ReceiveRepository[RStream]] =
-    ZIO.environmentWith(_.get.receiveRepository)
-
-  val friendGroupFriendRepository: URIO[InfrastructureConfiguration, FriendGroupFriendRepository[RStream]] =
-    ZIO.environmentWith(_.get.friendGroupFriendRepository)
-
-  val groupMemberRepository: URIO[InfrastructureConfiguration, GroupMemberRepository[RStream]] =
-    ZIO.environmentWith(_.get.groupMemberRepository)
-
-  val addMessageRepository: URIO[InfrastructureConfiguration, AddMessageRepository[RStream]] =
-    ZIO.environmentWith(_.get.addMessageRepository)
-
-  lazy val layer: ULayer[InfrastructureConfiguration] =
-    ZLayer.succeed[InfrastructureConfiguration](InfrastructureConfiguration())
+  lazy val live: ULayer[InfrastructureConfiguration] =
+    ZLayer.succeed[InfrastructureConfiguration](new InfrastructureConfiguration())
 
 }

modules/zim-infra/src/main/scala/org/bitlap/zim/infrastructure/InfrastructureConfiguration.scala

@@ -55,7 +55,7 @@ object MailConfigurationProperties {
 
   private lazy val config: Config = ConfigFactory.load().getConfig("infrastructure.javamail")
 
-  def make: UIO[MailConfigurationProperties] = ZIO.succeed(MailConfigurationProperties(config))
+  lazy val live: ULayer[MailConfigurationProperties] = ZLayer.succeed(MailConfigurationProperties(config))
 
   def apply(config: Config = config): MailConfigurationProperties =
     MailConfigurationProperties(

modules/zim-infra/src/main/scala/org/bitlap/zim/infrastructure/properties/MailConfigurationProperties.scala

@@ -37,7 +37,7 @@ object ZimConfigurationProperties {
 
   lazy val config: Config = ConfigFactory.load().getConfig("application")
 
-  def make: UIO[ZimConfigurationProperties] = ZIO.succeed(ZimConfigurationProperties(config))
+  lazy val live: ULayer[ZimConfigurationProperties] = ZLayer.succeed(ZimConfigurationProperties(config))
 
   def apply(config: Config = config): ZimConfigurationProperties =
     ZimConfigurationProperties(

modules/zim-infra/src/main/scala/org/bitlap/zim/infrastructure/properties/ZimConfigurationProperties.scala

@@ -16,10 +16,10 @@
 
 package org.bitlap.zim.infrastructure.util
 
-import zio._
-
 import java.util.UUID
 
+import zio._
+
 /** UUID工具
  *
  *  @since 2021年12月31日

modules/zim-infra/src/main/scala/org/bitlap/zim/infrastructure/util/UuidUtil.scala

@@ -16,7 +16,9 @@
 
 package org.bitlap.zim.server
 
-import org.bitlap.zim.server.configuration._
+import org.bitlap.zim.infrastructure.InfrastructureConfiguration
+import org.bitlap.zim.infrastructure.properties.ZimConfigurationProperties
+import org.bitlap.zim.server.module._
 import zio._
 
 /** main方法
@@ -25,9 +27,8 @@ import zio._
  *    梦境迷离
  *  @version 1.0,2021/12/24
  */
-object ZimServer extends ZimServiceConfiguration with zio.ZIOAppDefault {
+object ZimServer extends zio.ZIOAppDefault {
   override def run: ZIO[Any, Throwable, Unit] = (for {
-    routes <- ApiConfiguration.routes
     _ <- Console.printLine("""
                              |                                 ____
                              |                ,--,           ,'  , `.
@@ -41,7 +42,14 @@ object ZimServer extends ZimServiceConfiguration with zio.ZIOAppDefault {
                              | ./__;     .' |  | '.'||   | |`-'
                              | ;   |  .'    ;  :    ;|   ;/
                              | `---'        |  ,   / '---'""".stripMargin)
-    _ <- AkkaHttpConfiguration.httpServer(routes)
-  } yield ()).provideLayer(AkkaActorSystemConfiguration.live >>> apiConfigurationLayer)
-
+    _ <- ZIO.environmentWithZIO[AkkaHttpModule](_.get.httpServer())
+    _ <- ZIO.never
+  } yield ()).provide(
+    AkkaModule.live,
+    AkkaHttpModule.live,
+    ServiceModule.live,
+    InfrastructureConfiguration.live,
+    ZimConfigurationProperties.live,
+    Scope.default
+  )
 }