diff --git a/.git-blame-ignore-revs b/.git-blame-ignore-revs index 0de85c5c..6e80ad79 100644 --- a/.git-blame-ignore-revs +++ b/.git-blame-ignore-revs @@ -1,2 +1,5 @@ # Scala Steward: Reformat with scalafmt 3.5.9 0816c7f40fb103a987855105bc1620a18e0fbaae + +# Scala Steward: Reformat with scalafmt 3.8.4 +fa5b1430ba2bce3c807146b22887ff85feac440f diff --git a/.scalafmt.conf b/.scalafmt.conf index 588fd31a..0e402e7c 100644 --- a/.scalafmt.conf +++ b/.scalafmt.conf @@ -1,4 +1,4 @@ -version = "3.8.3" +version = "3.8.4" runner.dialect = scala213 maxColumn = 120 align.preset = more diff --git a/modules/zim-api/src/main/scala/org/bitlap/zim/api/ApiJsonCodec.scala b/modules/zim-api/src/main/scala/org/bitlap/zim/api/ApiJsonCodec.scala index 6f241438..d8a9b7ea 100644 --- a/modules/zim-api/src/main/scala/org/bitlap/zim/api/ApiJsonCodec.scala +++ b/modules/zim-api/src/main/scala/org/bitlap/zim/api/ApiJsonCodec.scala @@ -146,7 +146,7 @@ trait ApiJsonCodec { * @return */ def buildFlowResponse[T <: Product] - : stream.Stream[Throwable, T] => Future[Either[ZimError, Source[ByteString, Any]]] = respStream => { + : stream.Stream[Throwable, T] => Future[Either[ZimError, Source[ByteString, Any]]] = respStream => { val resp = (for { list <- respStream.runCollect resp = ResultSet[List[T]](data = list.toList).asJson.noSpaces @@ -170,7 +170,7 @@ trait ApiJsonCodec { * @return */ def buildMonoResponse[T <: Product]( - returnError: Boolean = false + returnError: Boolean = false ): stream.Stream[Throwable, T] => Future[Either[ZimError, Source[ByteString, Any]]] = respStream => { val resp = (for { ret <- respStream.runHead.map(_.getOrElse(null.asInstanceOf[T])) @@ -190,9 +190,9 @@ trait ApiJsonCodec { } def buildIntMonoResponse( - returnError: Boolean = true, - code: Int = SystemConstant.ERROR, - msg: String = SystemConstant.ERROR_MESSAGE + returnError: Boolean = true, + code: Int = SystemConstant.ERROR, + msg: String = SystemConstant.ERROR_MESSAGE ): stream.Stream[Throwable, Int] => Future[Either[ZimError, Source[ByteString, Any]]] = respStream => { val resp = (for { resp <- respStream.runHead.map(_.getOrElse(0)) @@ -208,9 +208,9 @@ trait ApiJsonCodec { } def buildBooleanMonoResponse( - returnError: Boolean = true, - code: Int = SystemConstant.ERROR, - msg: String = SystemConstant.ERROR_MESSAGE + returnError: Boolean = true, + code: Int = SystemConstant.ERROR, + msg: String = SystemConstant.ERROR_MESSAGE ): stream.Stream[Throwable, Boolean] => Future[Either[ZimError, Source[ByteString, Any]]] = respStream => { val resp = (for { resp <- respStream.runHead.map(_.getOrElse(false)) @@ -226,7 +226,7 @@ trait ApiJsonCodec { } def buildPagesResponse[T <: Product] - : IO[Throwable, ResultPageSet[T]] => Future[Either[ZimError, Source[ByteString, Any]]] = + : IO[Throwable, ResultPageSet[T]] => Future[Either[ZimError, Source[ByteString, Any]]] = respIO => { val resp: ZIO[Any, Throwable, Publisher[ByteString]] = (for { resp <- respIO diff --git a/modules/zim-api/src/main/scala/org/bitlap/zim/api/UserEndpoint.scala b/modules/zim-api/src/main/scala/org/bitlap/zim/api/UserEndpoint.scala index ec628959..0412a562 100644 --- a/modules/zim-api/src/main/scala/org/bitlap/zim/api/UserEndpoint.scala +++ b/modules/zim-api/src/main/scala/org/bitlap/zim/api/UserEndpoint.scala @@ -317,8 +317,13 @@ trait UserEndpoint extends ApiErrorMapping { .errorOut(errorOut) .errorOutVariants[ZimError](errorOutVar.head, errorOutVar.tail: _*) - lazy val loginEndpoint - : Endpoint[Unit, UserSecurityInfo, ZimError, (CookieValueWithMeta, Source[ByteString, Any]), Any with AkkaStreams] = + lazy val loginEndpoint: Endpoint[ + Unit, + UserSecurityInfo, + ZimError, + (CookieValueWithMeta, Source[ByteString, Any]), + Any with AkkaStreams + ] = endpoint.post .in(userResource / "login") .in(jsonBody[UserSecurityInfo]) diff --git a/modules/zim-api/src/main/scala/org/bitlap/zim/api/WsEndpoint.scala b/modules/zim-api/src/main/scala/org/bitlap/zim/api/WsEndpoint.scala index abc9016a..3401fa14 100644 --- a/modules/zim-api/src/main/scala/org/bitlap/zim/api/WsEndpoint.scala +++ b/modules/zim-api/src/main/scala/org/bitlap/zim/api/WsEndpoint.scala @@ -37,7 +37,7 @@ trait WsEndpoint { // TODO typed ws lazy val wsEndpoint - : PublicEndpoint[Int, Unit, Pipe[TextMessage.Strict, String], Any with AkkaStreams with WebSockets] = + : PublicEndpoint[Int, Unit, Pipe[TextMessage.Strict, String], Any with AkkaStreams with WebSockets] = endpoint .in("websocket" / query[Int]("uid")) .description("Websocket Endpoint") diff --git a/modules/zim-auth/src/main/scala/org/bitlap/zim/auth/CookieAuthority.scala b/modules/zim-auth/src/main/scala/org/bitlap/zim/auth/CookieAuthority.scala index 42feb0cd..2099c3dd 100644 --- a/modules/zim-auth/src/main/scala/org/bitlap/zim/auth/CookieAuthority.scala +++ b/modules/zim-auth/src/main/scala/org/bitlap/zim/auth/CookieAuthority.scala @@ -42,9 +42,9 @@ trait CookieAuthority { * @return */ def authenticate( - token: UserToken + token: UserToken )( - authorityFunction: AuthorityFunction + authorityFunction: AuthorityFunction )(implicit ec: ExecutionContext): Future[Either[Unauthorized, UserSecurityInfo]] = Future { val tk = if (token.cookie.trim.contains(" ")) token.cookie.trim.split(" ")(1) else token.cookie diff --git a/modules/zim-cache-api/src/main/scala/org/bitlap/zim/cache/RedisService.scala b/modules/zim-cache-api/src/main/scala/org/bitlap/zim/cache/RedisService.scala index bb49afa2..805a2a18 100644 --- a/modules/zim-cache-api/src/main/scala/org/bitlap/zim/cache/RedisService.scala +++ b/modules/zim-cache-api/src/main/scala/org/bitlap/zim/cache/RedisService.scala @@ -62,7 +62,7 @@ trait RedisService[F[_]] { * Boolean */ def set[T](k: String, v: T, expireTime: JavaDuration = java.time.Duration.ofMinutes(30))(implicit - encoder: Encoder[T] + encoder: Encoder[T] ): F[Boolean] /** 根据key获取value diff --git a/modules/zim-cache-redis4cats/src/main/scala/org/bitlap/zim/cache/redis4cats/CatsRedisServiceLive.scala b/modules/zim-cache-redis4cats/src/main/scala/org/bitlap/zim/cache/redis4cats/CatsRedisServiceLive.scala index 68734bc9..d3cb561e 100644 --- a/modules/zim-cache-redis4cats/src/main/scala/org/bitlap/zim/cache/redis4cats/CatsRedisServiceLive.scala +++ b/modules/zim-cache-redis4cats/src/main/scala/org/bitlap/zim/cache/redis4cats/CatsRedisServiceLive.scala @@ -75,7 +75,7 @@ object CatsRedisServiceLive { } final case class CatsRedisServiceLive(redis: Resource[IO, RedisCommands[IO, String, String]])(implicit - logger: Logger[IO] + logger: Logger[IO] ) extends RedisService[IO] { override def getSets(k: String): IO[List[String]] = @@ -94,7 +94,7 @@ final case class CatsRedisServiceLive(redis: Resource[IO, RedisCommands[IO, Stri } override def set[T](k: String, v: T, expireTime: JavaDuration = java.time.Duration.ofMinutes(30))(implicit - encoder: Encoder[T] + encoder: Encoder[T] ): IO[Boolean] = logger.info(s"Redis set command: $k, $v, $expireTime") *> redis.use { redis => redis diff --git a/modules/zim-cache-redis4zio/src/main/scala/org/bitlap/zim/cache/redis4zio/ZioRedisServiceLive.scala b/modules/zim-cache-redis4zio/src/main/scala/org/bitlap/zim/cache/redis4zio/ZioRedisServiceLive.scala index 9644179e..32bd582e 100644 --- a/modules/zim-cache-redis4zio/src/main/scala/org/bitlap/zim/cache/redis4zio/ZioRedisServiceLive.scala +++ b/modules/zim-cache-redis4zio/src/main/scala/org/bitlap/zim/cache/redis4zio/ZioRedisServiceLive.scala @@ -62,7 +62,7 @@ final case class ZioRedisServiceLive(private val rs: Redis) extends RedisService rs.sAdd(k, m) override def set[T](k: String, v: T, expireTime: JavaDuration = java.time.Duration.ofMinutes(30))(implicit - encoder: Encoder[T] + encoder: Encoder[T] ): Task[Boolean] = rs.set[String, String](k, v.asJson.noSpaces, expireTime = Some(expireTime)) diff --git a/modules/zim-domain/src/main/scala/org/bitlap/zim/domain/AddInfo.scala b/modules/zim-domain/src/main/scala/org/bitlap/zim/domain/AddInfo.scala index 72f0c5f8..8dbb9a8b 100644 --- a/modules/zim-domain/src/main/scala/org/bitlap/zim/domain/AddInfo.scala +++ b/modules/zim-domain/src/main/scala/org/bitlap/zim/domain/AddInfo.scala @@ -48,17 +48,17 @@ import io.circe.generic.semiauto._ * 消息发送者 */ final case class AddInfo( - id: Int, - uid: Int, - content: String, - from: Int, - from_group: Int, - `type`: Int, - remark: String, - href: String, - read: Int, - time: ZonedDateTime, - user: User + id: Int, + uid: Int, + content: String, + from: Int, + from_group: Int, + `type`: Int, + remark: String, + href: String, + read: Int, + time: ZonedDateTime, + user: User ) object AddInfo { diff --git a/modules/zim-domain/src/main/scala/org/bitlap/zim/domain/ChatHistory.scala b/modules/zim-domain/src/main/scala/org/bitlap/zim/domain/ChatHistory.scala index 0eb3c6b8..30357ce0 100644 --- a/modules/zim-domain/src/main/scala/org/bitlap/zim/domain/ChatHistory.scala +++ b/modules/zim-domain/src/main/scala/org/bitlap/zim/domain/ChatHistory.scala @@ -33,11 +33,11 @@ import io.circe.generic.semiauto._ * 时间 */ final case class ChatHistory( - id: Int, - username: String, - avatar: String, - content: String, - timestamp: Long + id: Int, + username: String, + avatar: String, + content: String, + timestamp: Long ) object ChatHistory { diff --git a/modules/zim-domain/src/main/scala/org/bitlap/zim/domain/FriendAndGroupInfo.scala b/modules/zim-domain/src/main/scala/org/bitlap/zim/domain/FriendAndGroupInfo.scala index 61da070c..a08656d3 100644 --- a/modules/zim-domain/src/main/scala/org/bitlap/zim/domain/FriendAndGroupInfo.scala +++ b/modules/zim-domain/src/main/scala/org/bitlap/zim/domain/FriendAndGroupInfo.scala @@ -33,9 +33,9 @@ import zio.schema._ * 群组信息列表 */ final case class FriendAndGroupInfo( - mine: User, - friend: List[FriendList], - group: List[GroupList] + mine: User, + friend: List[FriendList], + group: List[GroupList] ) object FriendAndGroupInfo { diff --git a/modules/zim-domain/src/main/scala/org/bitlap/zim/domain/ResultSet.scala b/modules/zim-domain/src/main/scala/org/bitlap/zim/domain/ResultSet.scala index 650d4ed8..0a91f1ed 100644 --- a/modules/zim-domain/src/main/scala/org/bitlap/zim/domain/ResultSet.scala +++ b/modules/zim-domain/src/main/scala/org/bitlap/zim/domain/ResultSet.scala @@ -27,16 +27,16 @@ package org.bitlap.zim.domain * 梦境迷离 */ class ResultSet[T]( - val data: T, - val code: Int = SystemConstant.SUCCESS, - val msg: String = SystemConstant.SUCCESS_MESSAGE + val data: T, + val code: Int = SystemConstant.SUCCESS, + val msg: String = SystemConstant.SUCCESS_MESSAGE ) object ResultSet { def apply[T]( - data: T = null, - code: Int = SystemConstant.SUCCESS, - msg: String = SystemConstant.SUCCESS_MESSAGE + data: T = null, + code: Int = SystemConstant.SUCCESS, + msg: String = SystemConstant.SUCCESS_MESSAGE ): ResultSet[T] = new ResultSet(data, code, msg) } diff --git a/modules/zim-domain/src/main/scala/org/bitlap/zim/domain/To.scala b/modules/zim-domain/src/main/scala/org/bitlap/zim/domain/To.scala index d93f3e13..7e92012d 100644 --- a/modules/zim-domain/src/main/scala/org/bitlap/zim/domain/To.scala +++ b/modules/zim-domain/src/main/scala/org/bitlap/zim/domain/To.scala @@ -34,12 +34,12 @@ import io.circe._ * 聊天类型，一般分friend和group两种，group即群聊 */ final case class To( - id: Int, - username: String, - sign: String, - avatar: String, - status: String, - `type`: String + id: Int, + username: String, + sign: String, + avatar: String, + status: String, + `type`: String ) object To { diff --git a/modules/zim-domain/src/main/scala/org/bitlap/zim/domain/ZimError.scala b/modules/zim-domain/src/main/scala/org/bitlap/zim/domain/ZimError.scala index a3171b18..c9eb72ce 100644 --- a/modules/zim-domain/src/main/scala/org/bitlap/zim/domain/ZimError.scala +++ b/modules/zim-domain/src/main/scala/org/bitlap/zim/domain/ZimError.scala @@ -31,12 +31,12 @@ sealed trait ZimError extends Throwable with Product { object ZimError { case class BusinessException( - override val code: Int = SystemConstant.ERROR, - override val msg: String = SystemConstant.ERROR_MESSAGE + override val code: Int = SystemConstant.ERROR, + override val msg: String = SystemConstant.ERROR_MESSAGE ) extends ZimError case class Unauthorized( - override val code: Int = SystemConstant.ERROR, - override val msg: String = SystemConstant.NOT_LOGIN + override val code: Int = SystemConstant.ERROR, + override val msg: String = SystemConstant.NOT_LOGIN ) extends ZimError } diff --git a/modules/zim-domain/src/main/scala/org/bitlap/zim/domain/input/RegisterUserInput.scala b/modules/zim-domain/src/main/scala/org/bitlap/zim/domain/input/RegisterUserInput.scala index 858c5695..6c1df4e0 100644 --- a/modules/zim-domain/src/main/scala/org/bitlap/zim/domain/input/RegisterUserInput.scala +++ b/modules/zim-domain/src/main/scala/org/bitlap/zim/domain/input/RegisterUserInput.scala @@ -29,9 +29,9 @@ import io.circe.generic.semiauto._ * 密码 */ final case class RegisterUserInput( - username: String, - password: String, - email: String + username: String, + password: String, + email: String ) object RegisterUserInput { diff --git a/modules/zim-domain/src/main/scala/org/bitlap/zim/domain/input/UpdateUserInput.scala b/modules/zim-domain/src/main/scala/org/bitlap/zim/domain/input/UpdateUserInput.scala index 744a3dfd..84ad7668 100644 --- a/modules/zim-domain/src/main/scala/org/bitlap/zim/domain/input/UpdateUserInput.scala +++ b/modules/zim-domain/src/main/scala/org/bitlap/zim/domain/input/UpdateUserInput.scala @@ -34,12 +34,12 @@ import io.circe.generic.semiauto._ * 性别 */ final case class UpdateUserInput( - id: Int, - username: String, - password: Option[String], - oldpwd: Option[String], - sign: String, - sex: String + id: Int, + username: String, + password: Option[String], + oldpwd: Option[String], + sign: String, + sex: String ) object UpdateUserInput { diff --git a/modules/zim-domain/src/main/scala/org/bitlap/zim/domain/model/AddMessage.scala b/modules/zim-domain/src/main/scala/org/bitlap/zim/domain/model/AddMessage.scala index 8aa2140f..68ec3e9e 100644 --- a/modules/zim-domain/src/main/scala/org/bitlap/zim/domain/model/AddMessage.scala +++ b/modules/zim-domain/src/main/scala/org/bitlap/zim/domain/model/AddMessage.scala @@ -45,14 +45,14 @@ import scalikejdbc.{WrappedResultSet, _} * 申请时间 */ final case class AddMessage( - id: Int, - fromUid: Int, - toUid: Int, - groupId: Int, - remark: String, - agree: Int, - `type`: Int, - time: ZonedDateTime + id: Int, + fromUid: Int, + toUid: Int, + groupId: Int, + remark: String, + agree: Int, + `type`: Int, + time: ZonedDateTime ) object AddMessage extends BaseModel[AddMessage] { @@ -82,12 +82,12 @@ object AddMessage extends BaseModel[AddMessage] { ) def apply( - fromUid: Int, - toUid: Int, - groupId: Int, - remark: String, - `type`: Int, - time: ZonedDateTime = ZonedDateTime.now() + fromUid: Int, + toUid: Int, + groupId: Int, + remark: String, + `type`: Int, + time: ZonedDateTime = ZonedDateTime.now() ): AddMessage = AddMessage(0, fromUid, toUid, groupId, remark, 0, `type`, time) } diff --git a/modules/zim-domain/src/main/scala/org/bitlap/zim/domain/model/GroupList.scala b/modules/zim-domain/src/main/scala/org/bitlap/zim/domain/model/GroupList.scala index 160dea90..e73c4f84 100644 --- a/modules/zim-domain/src/main/scala/org/bitlap/zim/domain/model/GroupList.scala +++ b/modules/zim-domain/src/main/scala/org/bitlap/zim/domain/model/GroupList.scala @@ -38,10 +38,10 @@ import zio.schema._ * 创建人ID */ final case class GroupList( - override val id: Int, - override val groupName: String, - avatar: String, - createId: Int + override val id: Int, + override val groupName: String, + avatar: String, + createId: Int ) extends Group(id, groupName) object GroupList extends BaseModel[GroupList] { diff --git a/modules/zim-domain/src/main/scala/org/bitlap/zim/domain/model/Receive.scala b/modules/zim-domain/src/main/scala/org/bitlap/zim/domain/model/Receive.scala index d9db06d5..450b80a2 100644 --- a/modules/zim-domain/src/main/scala/org/bitlap/zim/domain/model/Receive.scala +++ b/modules/zim-domain/src/main/scala/org/bitlap/zim/domain/model/Receive.scala @@ -48,17 +48,17 @@ import scalikejdbc.{WrappedResultSet, _} * 消息的状态 */ final case class Receive( - toid: Int, - mid: Int, - username: String, - avatar: String, - `type`: String, - content: String, - cid: Int, - mine: Boolean, - fromid: Int, - timestamp: Long, - status: Int + toid: Int, + mid: Int, + username: String, + avatar: String, + `type`: String, + content: String, + cid: Int, + mine: Boolean, + fromid: Int, + timestamp: Long, + status: Int ) object Receive extends SQLSyntaxSupport[Receive] { diff --git a/modules/zim-domain/src/main/scala/org/bitlap/zim/domain/model/User.scala b/modules/zim-domain/src/main/scala/org/bitlap/zim/domain/model/User.scala index 9e9a1442..cf64ab73 100644 --- a/modules/zim-domain/src/main/scala/org/bitlap/zim/domain/model/User.scala +++ b/modules/zim-domain/src/main/scala/org/bitlap/zim/domain/model/User.scala @@ -49,16 +49,16 @@ import zio.schema._ * 激活码 */ final case class User( - id: Int, - username: String, - password: String, - sign: String, // TODO use `Option[String]` - avatar: String, - email: String, - createDate: ZonedDateTime, - sex: Int, - status: String, - active: String + id: Int, + username: String, + password: String, + sign: String, // TODO use `Option[String]` + avatar: String, + email: String, + createDate: ZonedDateTime, + sex: Int, + status: String, + active: String ) object User extends BaseModel[User] { diff --git a/modules/zim-domain/src/main/scala/org/bitlap/zim/domain/ws/protocol/Command.scala b/modules/zim-domain/src/main/scala/org/bitlap/zim/domain/ws/protocol/Command.scala index 4aa237cd..44c89b8c 100644 --- a/modules/zim-domain/src/main/scala/org/bitlap/zim/domain/ws/protocol/Command.scala +++ b/modules/zim-domain/src/main/scala/org/bitlap/zim/domain/ws/protocol/Command.scala @@ -34,9 +34,9 @@ sealed trait Command[+T] * The message comes from user, who send message to server flow by akka. */ final case class TransmitMessageProxy( - uId: Int, - msg: String, - originActorRef: Option[ActorRef] + uId: Int, + msg: String, + originActorRef: Option[ActorRef] ) extends Command[String] { def getMessage: Message = decode[Message](msg).getOrElse(null) diff --git a/modules/zim-infra/src/main/scala/org/bitlap/zim/infrastructure/properties/MailConfigurationProperties.scala b/modules/zim-infra/src/main/scala/org/bitlap/zim/infrastructure/properties/MailConfigurationProperties.scala index 27f55807..6912d7b5 100644 --- a/modules/zim-infra/src/main/scala/org/bitlap/zim/infrastructure/properties/MailConfigurationProperties.scala +++ b/modules/zim-infra/src/main/scala/org/bitlap/zim/infrastructure/properties/MailConfigurationProperties.scala @@ -34,14 +34,14 @@ import zio._ * @version 1.0 */ final case class MailConfigurationProperties( - host: String, - username: String, - password: String, - sender: String, - port: Int, - threadPoolSize: Int, - connectionPoolCoreSize: Int, - debug: Boolean + host: String, + username: String, + password: String, + sender: String, + port: Int, + threadPoolSize: Int, + connectionPoolCoreSize: Int, + debug: Boolean ) { def toProperties: Properties = { diff --git a/modules/zim-infra/src/main/scala/org/bitlap/zim/infrastructure/properties/MysqlConfigurationProperties.scala b/modules/zim-infra/src/main/scala/org/bitlap/zim/infrastructure/properties/MysqlConfigurationProperties.scala index 182149ec..1d76cbb9 100644 --- a/modules/zim-infra/src/main/scala/org/bitlap/zim/infrastructure/properties/MysqlConfigurationProperties.scala +++ b/modules/zim-infra/src/main/scala/org/bitlap/zim/infrastructure/properties/MysqlConfigurationProperties.scala @@ -26,15 +26,15 @@ import com.typesafe.config._ * @version 1.0 */ final case class MysqlConfigurationProperties( - url: String, - user: String, - password: String, - databaseName: String, - initialSize: Integer, - maxSize: Integer, - connectionTimeoutMillis: Long, - validationQuery: String, - driverName: String + url: String, + user: String, + password: String, + databaseName: String, + initialSize: Integer, + maxSize: Integer, + connectionTimeoutMillis: Long, + validationQuery: String, + driverName: String ) object MysqlConfigurationProperties { diff --git a/modules/zim-infra/src/main/scala/org/bitlap/zim/infrastructure/properties/ZimConfigurationProperties.scala b/modules/zim-infra/src/main/scala/org/bitlap/zim/infrastructure/properties/ZimConfigurationProperties.scala index 0d388666..82d6e12e 100644 --- a/modules/zim-infra/src/main/scala/org/bitlap/zim/infrastructure/properties/ZimConfigurationProperties.scala +++ b/modules/zim-infra/src/main/scala/org/bitlap/zim/infrastructure/properties/ZimConfigurationProperties.scala @@ -28,10 +28,10 @@ import zio._ * @version 1.0 */ final case class ZimConfigurationProperties( - name: String, - interface: String, - port: Int, - webHost: String + name: String, + interface: String, + port: Int, + webHost: String ) object ZimConfigurationProperties { diff --git a/modules/zim-infra/src/main/scala/org/bitlap/zim/infrastructure/repository/TangibleReceiveRepository.scala b/modules/zim-infra/src/main/scala/org/bitlap/zim/infrastructure/repository/TangibleReceiveRepository.scala index a4dde8c1..d03e270a 100644 --- a/modules/zim-infra/src/main/scala/org/bitlap/zim/infrastructure/repository/TangibleReceiveRepository.scala +++ b/modules/zim-infra/src/main/scala/org/bitlap/zim/infrastructure/repository/TangibleReceiveRepository.scala @@ -40,16 +40,16 @@ private final class TangibleReceiveRepository(databaseName: String) extends Rece _findOffLineMessage(uid, status).toStreamOperation override def findHistoryMessage( - uid: Option[Int], - mid: Option[Int], - typ: Option[String] + uid: Option[Int], + mid: Option[Int], + typ: Option[String] ): RStream[Receive] = _findHistoryMessage(uid, mid, typ).toStreamOperation override def countHistoryMessage( - uid: Option[Int], - mid: Option[Int], - typ: Option[String] + uid: Option[Int], + mid: Option[Int], + typ: Option[String] ): RStream[Int] = _countHistoryMessage(uid, mid, typ).toStreamOperation @@ -72,16 +72,16 @@ object TangibleReceiveRepository { stream.ZStream.environmentWithStream(_.get.findOffLineMessage(uid, status)) def findHistoryMessage( - uid: Option[Int], - mid: Option[Int], - typ: Option[String] + uid: Option[Int], + mid: Option[Int], + typ: Option[String] ): ZStream[ReceiveRepository[RStream], Throwable, Receive] = stream.ZStream.environmentWithStream(_.get.findHistoryMessage(uid, mid, typ)) def countHistoryMessage( - uid: Option[Int], - mid: Option[Int], - typ: Option[String] + uid: Option[Int], + mid: Option[Int], + typ: Option[String] ): ZStream[ReceiveRepository[RStream], Throwable, Int] = stream.ZStream.environmentWithStream(_.get.countHistoryMessage(uid, mid, typ)) diff --git a/modules/zim-infra/src/main/scala/org/bitlap/zim/infrastructure/repository/TangibleUserRepository.scala b/modules/zim-infra/src/main/scala/org/bitlap/zim/infrastructure/repository/TangibleUserRepository.scala index 3772d596..2b7c1c88 100644 --- a/modules/zim-infra/src/main/scala/org/bitlap/zim/infrastructure/repository/TangibleUserRepository.scala +++ b/modules/zim-infra/src/main/scala/org/bitlap/zim/infrastructure/repository/TangibleUserRepository.scala @@ -96,8 +96,8 @@ object TangibleUserRepository { stream.ZStream.environmentWithStream(_.get.countUser(username, sex)) def findUsers( - username: Option[String], - sex: Option[Int] + username: Option[String], + sex: Option[Int] ): stream.ZStream[UserRepository[RStream], Throwable, model.User] = stream.ZStream.environmentWithStream(_.get.findUsers(username, sex)) diff --git a/modules/zim-infra/src/main/scala/org/bitlap/zim/infrastructure/repository/package.scala b/modules/zim-infra/src/main/scala/org/bitlap/zim/infrastructure/repository/package.scala index 4f3f1b25..412e5246 100644 --- a/modules/zim-infra/src/main/scala/org/bitlap/zim/infrastructure/repository/package.scala +++ b/modules/zim-infra/src/main/scala/org/bitlap/zim/infrastructure/repository/package.scala @@ -90,7 +90,7 @@ package object repository { } implicit final class SQLSyntaxStringArrow[T](private val self: String)(implicit - val sp: QuerySQLSyntaxProvider[SQLSyntaxSupport[T], T] + val sp: QuerySQLSyntaxProvider[SQLSyntaxSupport[T], T] ) { import org.bitlap.zim.api.repository.Condition._ @@ -278,7 +278,7 @@ package object repository { * @return */ private[repository] def _findGroupsById( - uid: Int + uid: Int ): StreamReadySQL[GroupList] = sql"select ${g.result.*} from ${GroupList as g} where id in(select distinct ${gm.gid} from ${GroupMember as gm} where uid = $uid);" .map(rs => GroupList(rs)) @@ -304,8 +304,8 @@ package object repository { * @return */ private[repository] def _findOffLineMessage( - uid: Int, - status: Int + uid: Int, + status: Int ): StreamReadySQL[Receive] = sql"select ${r.result.*} from ${Receive as r} where toid = $uid and status = $status;" .map(rs => Receive(rs)) @@ -323,9 +323,9 @@ package object repository { * @return */ private[repository] def _findHistoryMessage( - uid: Option[Int], - mid: Option[Int], - typ: Option[String] + uid: Option[Int], + mid: Option[Int], + typ: Option[String] ): StreamReadySQL[Receive] = withSQL { select @@ -366,9 +366,9 @@ package object repository { * @return */ private[repository] def _countHistoryMessage( - uid: Option[Int], - mid: Option[Int], - typ: Option[String] + uid: Option[Int], + mid: Option[Int], + typ: Option[String] ): StreamReadySQL[Int] = withSQL { select(count(r.mid)) @@ -459,8 +459,8 @@ package object repository { * 我的id */ private[repository] def _findUserGroup( - uId: Int, - mId: Int + uId: Int, + mId: Int ): StreamReadySQL[Int] = sql"select id from ${AddFriend.table} where fgid in (select id from ${FriendGroup.table} where uid = $mId) and uid = $uId".list .map(rs => rs.int(1)) diff --git a/modules/zim-server/src/main/scala/org/bitlap/zim/server/module/AkkaHttpModule.scala b/modules/zim-server/src/main/scala/org/bitlap/zim/server/module/AkkaHttpModule.scala index feb0d025..158f95e8 100644 --- a/modules/zim-server/src/main/scala/org/bitlap/zim/server/module/AkkaHttpModule.scala +++ b/modules/zim-server/src/main/scala/org/bitlap/zim/server/module/AkkaHttpModule.scala @@ -43,8 +43,9 @@ import zio._ */ final class AkkaHttpModule { - def httpServer() - : ZIO[ActorSystem[Nothing] with ApiService[RStream, Task] with ZimConfigurationProperties with Scope, Throwable, Unit] = + def httpServer(): ZIO[ActorSystem[ + Nothing + ] with ApiService[RStream, Task] with ZimConfigurationProperties with Scope, Throwable, Unit] = for { actorSystem <- ZIO.service[ActorSystem[Nothing]] imServerSettings <- { diff --git a/modules/zim-server/src/main/scala/org/bitlap/zim/server/route/ZimUserApi.scala b/modules/zim-server/src/main/scala/org/bitlap/zim/server/route/ZimUserApi.scala index 9ea89c2e..59194c7a 100644 --- a/modules/zim-server/src/main/scala/org/bitlap/zim/server/route/ZimUserApi.scala +++ b/modules/zim-server/src/main/scala/org/bitlap/zim/server/route/ZimUserApi.scala @@ -53,7 +53,7 @@ import zio.stream._ * @version 2.0 */ final class ZimUserApi(apiService: ApiService[RStream, Task])(implicit - materializer: Materializer + materializer: Materializer ) extends ApiJsonCodec with ApiErrorMapping { diff --git a/modules/zim-server/src/main/scala/org/bitlap/zim/server/route/ZimUserEndpoint.scala b/modules/zim-server/src/main/scala/org/bitlap/zim/server/route/ZimUserEndpoint.scala index aaad3ffe..65dc9172 100644 --- a/modules/zim-server/src/main/scala/org/bitlap/zim/server/route/ZimUserEndpoint.scala +++ b/modules/zim-server/src/main/scala/org/bitlap/zim/server/route/ZimUserEndpoint.scala @@ -69,7 +69,7 @@ trait ZimUserEndpoint extends ApiErrorMapping with CookieAuthority with UserEndp } yield check -> user override val secureEndpoint - : PartialServerEndpoint[UserToken, UserSecurityInfo, Unit, Unauthorized, Unit, Any, Future] = endpoint + : PartialServerEndpoint[UserToken, UserSecurityInfo, Unit, Unauthorized, Unit, Any, Future] = endpoint .securityIn(cookie[String](Authorization).mapTo[UserToken]) .errorOut(customCodecJsonBody[Unauthorized]) .serverSecurityLogic(token => authenticate(token)(authorityCacheFunction)) diff --git a/modules/zim-server/src/main/scala/org/bitlap/zim/server/service/ApiServiceImpl.scala b/modules/zim-server/src/main/scala/org/bitlap/zim/server/service/ApiServiceImpl.scala index 0019a742..d2d8a85d 100644 --- a/modules/zim-server/src/main/scala/org/bitlap/zim/server/service/ApiServiceImpl.scala +++ b/modules/zim-server/src/main/scala/org/bitlap/zim/server/service/ApiServiceImpl.scala @@ -190,11 +190,11 @@ final class ApiServiceImpl(userService: UserService[RStream]) extends ApiService userService.refuseAddFriend(messageBoxId, username, to) override def agreeFriend( - uid: Int, - fromGroup: Int, - group: Int, - messageBoxId: Int, - mid: Int + uid: Int, + fromGroup: Int, + group: Int, + messageBoxId: Int, + mid: Int ): RStream[Boolean] = userService.addFriend(mid, group, uid, fromGroup, messageBoxId) diff --git a/modules/zim-server/src/main/scala/org/bitlap/zim/server/service/RedisCache.scala b/modules/zim-server/src/main/scala/org/bitlap/zim/server/service/RedisCache.scala index 449221ab..57be8e0c 100644 --- a/modules/zim-server/src/main/scala/org/bitlap/zim/server/service/RedisCache.scala +++ b/modules/zim-server/src/main/scala/org/bitlap/zim/server/service/RedisCache.scala @@ -56,8 +56,8 @@ object RedisCache { } def set[T: Schema](key: String, value: T)(implicit - cacheType: CacheType, - encoder: Encoder[T] + cacheType: CacheType, + encoder: Encoder[T] ): Task[Boolean] = cacheType match { case ZioCache => @@ -70,8 +70,8 @@ object RedisCache { // zio-redis没有真正使用Schema，因为存在cats redis def get[T: Schema](key: String)(implicit - cacheType: CacheType, - decoder: Decoder[T] + cacheType: CacheType, + decoder: Decoder[T] ): zio.Task[Option[T]] = cacheType match { case ZioCache => ZIO.serviceWithZIO[ZRedis](_.get[T](key)).provideLayer(ZioRedisServiceLive.live) diff --git a/modules/zim-server/src/main/scala/org/bitlap/zim/server/service/UserServiceImpl.scala b/modules/zim-server/src/main/scala/org/bitlap/zim/server/service/UserServiceImpl.scala index 7e93113b..e5999e4b 100644 --- a/modules/zim-server/src/main/scala/org/bitlap/zim/server/service/UserServiceImpl.scala +++ b/modules/zim-server/src/main/scala/org/bitlap/zim/server/service/UserServiceImpl.scala @@ -41,13 +41,13 @@ import zio.stream._ * @version 1.0 */ final class UserServiceImpl( - userRepository: UserRepository[RStream], - groupRepository: GroupRepository[RStream], - receiveRepository: ReceiveRepository[RStream], - friendGroupRepository: FriendGroupRepository[RStream], - friendGroupFriendRepository: FriendGroupFriendRepository[RStream], - groupMemberRepository: GroupMemberRepository[RStream], - addMessageRepository: AddMessageRepository[RStream] + userRepository: UserRepository[RStream], + groupRepository: GroupRepository[RStream], + receiveRepository: ReceiveRepository[RStream], + friendGroupRepository: FriendGroupRepository[RStream], + friendGroupFriendRepository: FriendGroupFriendRepository[RStream], + groupMemberRepository: GroupMemberRepository[RStream], + addMessageRepository: AddMessageRepository[RStream] ) extends UserService[RStream] { override def leaveOutGroup(gid: Int, uid: Int): RStream[Boolean] = @@ -110,11 +110,11 @@ final class UserServiceImpl( } override def addFriend( - mid: Int, - mgid: Int, - tid: Int, - tgid: Int, - messageBoxId: Int + mid: Int, + mgid: Int, + tid: Int, + tgid: Int, + messageBoxId: Int ): RStream[Boolean] = if (mid == tid) { ZStream.succeed(false) @@ -198,9 +198,9 @@ final class UserServiceImpl( } override def findHistoryMessage( - user: User, - mid: Int, - `type`: String + user: User, + mid: Int, + `type`: String ): RStream[domain.ChatHistory] = { def userHistory(): RStream[ChatHistory] = // 单人聊天记录 diff --git a/modules/zim-server/src/main/scala/org/bitlap/zim/server/service/ws/WsService.scala b/modules/zim-server/src/main/scala/org/bitlap/zim/server/service/ws/WsService.scala index a65275cf..a076a9f4 100644 --- a/modules/zim-server/src/main/scala/org/bitlap/zim/server/service/ws/WsService.scala +++ b/modules/zim-server/src/main/scala/org/bitlap/zim/server/service/ws/WsService.scala @@ -170,7 +170,7 @@ object WsService { * @return */ def openConnection( - uId: Int + uId: Int )(implicit m: Materializer): ZIO[Any, Throwable, Flow[Message, String, NotUsed]] = { implicit val ec = m.executionContext // closeConnection(uId) diff --git a/modules/zim-server/src/main/scala/org/bitlap/zim/server/service/ws/package.scala b/modules/zim-server/src/main/scala/org/bitlap/zim/server/service/ws/package.scala index f8c06f23..efab2dfc 100644 --- a/modules/zim-server/src/main/scala/org/bitlap/zim/server/service/ws/package.scala +++ b/modules/zim-server/src/main/scala/org/bitlap/zim/server/service/ws/package.scala @@ -107,7 +107,7 @@ package object ws { } private[ws] def agreeAddGroupHandler( - userService: UserService[RStream] + userService: UserService[RStream] )(agree: RefuseOrAgreeMessage): IO[Throwable, Unit] = userService.addGroupMember(agree.groupId, agree.toUid, agree.messageBoxId).runHead.map { f => userService @@ -131,7 +131,7 @@ package object ws { } private[ws] def refuseAddFriendHandler( - userService: UserService[RStream] + userService: UserService[RStream] )(messageBoxId: Int, username: String, to: Int): IO[Throwable, Boolean] = userService.updateAgree(messageBoxId, 2).runHead.flatMap { r => r.fold(ZIO.attempt(false)) { ret => @@ -144,7 +144,7 @@ package object ws { } private[ws] def readOfflineMessageHandler( - userService: UserService[RStream] + userService: UserService[RStream] )(message: Message): IO[Throwable, Unit] = userService .findOffLineMessage(message.mine.id, 0) @@ -162,7 +162,7 @@ package object ws { .unit private[ws] def changeOnlineHandler( - userService: UserService[RStream] + userService: UserService[RStream] )(uId: Int, status: String): IO[Throwable, Boolean] = { val isOnline = SystemConstant.status.ONLINE.equals(status) val beforeChange =