Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
梦境迷离
Sim
提交
7c9d3595
S
Sim
项目概览
梦境迷离
/
Sim
9 个月 前同步成功
通知
3
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
S
Sim
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
前往新版Gitcode,体验更适合开发者的 AI 搜索 >>
未验证
提交
7c9d3595
编写于
12月 12, 2021
作者:
梦境迷离
提交者:
GitHub
12月 12, 2021
浏览文件
操作
浏览文件
下载
差异文件
Merge pull request #10 from jxnu-liguobin/up-tools
upgrade macro version
上级
3aa2b477
a2df81d4
变更
19
显示空白变更内容
内联
并排
Showing
19 changed file
with
44 addition
and
45 deletion
+44
-45
build.gradle
build.gradle
+7
-7
src/main/scala/io/github/dreamylost/config/CacheConfig.scala
src/main/scala/io/github/dreamylost/config/CacheConfig.scala
+2
-2
src/main/scala/io/github/dreamylost/config/CustomErrorController.scala
...a/io/github/dreamylost/config/CustomErrorController.scala
+2
-2
src/main/scala/io/github/dreamylost/config/MybatisConfig.scala
...ain/scala/io/github/dreamylost/config/MybatisConfig.scala
+2
-2
src/main/scala/io/github/dreamylost/config/RedisConfig.scala
src/main/scala/io/github/dreamylost/config/RedisConfig.scala
+2
-2
src/main/scala/io/github/dreamylost/config/SpringMVCConfig.scala
...n/scala/io/github/dreamylost/config/SpringMVCConfig.scala
+1
-1
src/main/scala/io/github/dreamylost/config/Swagger2Config.scala
...in/scala/io/github/dreamylost/config/Swagger2Config.scala
+6
-7
src/main/scala/io/github/dreamylost/config/SystemHandlerInterceptor.scala
...o/github/dreamylost/config/SystemHandlerInterceptor.scala
+2
-2
src/main/scala/io/github/dreamylost/controller/UserController.scala
...cala/io/github/dreamylost/controller/UserController.scala
+2
-2
src/main/scala/io/github/dreamylost/model/FriendAndGroupInfo.scala
...scala/io/github/dreamylost/model/FriendAndGroupInfo.scala
+1
-1
src/main/scala/io/github/dreamylost/model/domains.scala
src/main/scala/io/github/dreamylost/model/domains.scala
+1
-1
src/main/scala/io/github/dreamylost/model/entities.scala
src/main/scala/io/github/dreamylost/model/entities.scala
+1
-1
src/main/scala/io/github/dreamylost/service/CookieService.scala
...in/scala/io/github/dreamylost/service/CookieService.scala
+3
-3
src/main/scala/io/github/dreamylost/service/MailService.scala
...main/scala/io/github/dreamylost/service/MailService.scala
+2
-2
src/main/scala/io/github/dreamylost/service/UserService.scala
...main/scala/io/github/dreamylost/service/UserService.scala
+2
-2
src/main/scala/io/github/dreamylost/websocket/RedisService.scala
...n/scala/io/github/dreamylost/websocket/RedisService.scala
+2
-2
src/main/scala/io/github/dreamylost/websocket/WebSocketProvider.scala
...la/io/github/dreamylost/websocket/WebSocketProvider.scala
+2
-2
src/main/scala/io/github/dreamylost/websocket/WebSocketServer.scala
...cala/io/github/dreamylost/websocket/WebSocketServer.scala
+2
-2
src/main/scala/io/github/dreamylost/websocket/WebSocketService.scala
...ala/io/github/dreamylost/websocket/WebSocketService.scala
+2
-2
未找到文件。
build.gradle
浏览文件 @
7c9d3595
...
@@ -86,16 +86,16 @@ dependencies {
...
@@ -86,16 +86,16 @@ dependencies {
compile
(
"org.apache.taglibs:taglibs-standard-impl:1.2.5"
)
compile
(
"org.apache.taglibs:taglibs-standard-impl:1.2.5"
)
//akka http
//akka http
compile
group:
'com.typesafe.akka'
,
name:
'akka-actor_2.13'
,
version:
'
2.5.32'
compile
'com.typesafe.akka:akka-actor_2.13:
2.5.32'
compile
group:
'com.typesafe.akka'
,
name:
'akka-http_2.13'
,
version:
'
10.1.10'
compile
'com.typesafe.akka:akka-http_2.13:
10.1.10'
compile
group:
'com.typesafe.akka'
,
name:
'akka-slf4j_2.13'
,
version:
'
2.5.32'
compile
'com.typesafe.akka:akka-slf4j_2.13:
2.5.32'
compile
group:
'com.typesafe.akka'
,
name:
'akka-stream_2.13'
,
version:
'
2.5.32'
compile
'com.typesafe.akka:akka-stream_2.13:
2.5.32'
//publish
//publish
compile
group:
'org.reactivestreams'
,
name:
'reactive-streams'
,
version:
'
1.0.0'
compile
'org.reactivestreams:reactive-streams:
1.0.0'
//config
//config
compile
group:
'com.typesafe'
,
name:
'config'
,
version:
'
1.2.1'
compile
'com.typesafe:config:
1.2.1'
// scala 序列化
// scala 序列化
compile
'com.fasterxml.jackson.core:jackson-databind:2.13.0'
compile
'com.fasterxml.jackson.core:jackson-databind:2.13.0'
...
@@ -105,7 +105,7 @@ dependencies {
...
@@ -105,7 +105,7 @@ dependencies {
compile
'com.fasterxml.jackson.module:jackson-modules-java8:2.13.0'
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
//test
testCompile
(
"org.springframework.boot:spring-boot-starter-test"
)
testCompile
(
"org.springframework.boot:spring-boot-starter-test"
)
...
...
src/main/scala/io/github/dreamylost/config/CacheConfig.scala
浏览文件 @
7c9d3595
...
@@ -9,8 +9,8 @@ import com.fasterxml.jackson.databind.SerializationFeature
...
@@ -9,8 +9,8 @@ import com.fasterxml.jackson.databind.SerializationFeature
import
com.fasterxml.jackson.databind.jsontype.impl.LaissezFaireSubTypeValidator
import
com.fasterxml.jackson.databind.jsontype.impl.LaissezFaireSubTypeValidator
import
com.fasterxml.jackson.module.scala.DefaultScalaModule
import
com.fasterxml.jackson.module.scala.DefaultScalaModule
import
com.fasterxml.jackson.module.scala.ScalaObjectMapper
import
com.fasterxml.jackson.module.scala.ScalaObjectMapper
import
io.github.dreamylost
.log
import
org.bitlap.tools
.log
import
io.github.dreamylost
.logs.LogType
import
org.bitlap.tools
.logs.LogType
import
org.springframework.beans.factory.annotation.Value
import
org.springframework.beans.factory.annotation.Value
import
org.springframework.cache.CacheManager
import
org.springframework.cache.CacheManager
import
org.springframework.cache.annotation.CachingConfigurerSupport
import
org.springframework.cache.annotation.CachingConfigurerSupport
...
...
src/main/scala/io/github/dreamylost/config/CustomErrorController.scala
浏览文件 @
7c9d3595
package
io.github.dreamylost.config
package
io.github.dreamylost.config
import
io.github.dreamylost
.log
import
org.bitlap.tools
.log
import
io.github.dreamylost
.logs.LogType
import
org.bitlap.tools
.logs.LogType
import
org.springframework.boot.autoconfigure.web.ErrorController
import
org.springframework.boot.autoconfigure.web.ErrorController
import
org.springframework.stereotype.Controller
import
org.springframework.stereotype.Controller
import
org.springframework.web.bind.annotation.RequestMapping
import
org.springframework.web.bind.annotation.RequestMapping
...
...
src/main/scala/io/github/dreamylost/config/MybatisConfig.scala
浏览文件 @
7c9d3595
package
io.github.dreamylost.config
package
io.github.dreamylost.config
import
com.github.pagehelper.PageHelper
import
com.github.pagehelper.PageHelper
import
io.github.dreamylost
.log
import
org.bitlap.tools
.log
import
io.github.dreamylost
.logs.LogType
import
org.bitlap.tools
.logs.LogType
import
org.springframework.context.annotation.Bean
import
org.springframework.context.annotation.Bean
import
org.springframework.context.annotation.Configuration
import
org.springframework.context.annotation.Configuration
...
...
src/main/scala/io/github/dreamylost/config/RedisConfig.scala
浏览文件 @
7c9d3595
package
io.github.dreamylost.config
package
io.github.dreamylost.config
import
io.github.dreamylost
.log
import
org.bitlap.tools
.log
import
io.github.dreamylost
.logs.LogType
import
org.bitlap.tools
.logs.LogType
import
org.springframework.beans.factory.annotation.Value
import
org.springframework.beans.factory.annotation.Value
import
org.springframework.context.annotation.Bean
import
org.springframework.context.annotation.Bean
import
org.springframework.context.annotation.Configuration
import
org.springframework.context.annotation.Configuration
...
...
src/main/scala/io/github/dreamylost/config/SpringMVCConfig.scala
浏览文件 @
7c9d3595
...
@@ -55,7 +55,7 @@ class SpringMVCConfig extends WebMvcConfigurerAdapter {
...
@@ -55,7 +55,7 @@ class SpringMVCConfig extends WebMvcConfigurerAdapter {
*
*
* @param registry
* @param registry
*/
*/
override
def
addResourceHandlers
(
registry
:
ResourceHandlerRegistry
)
{
override
def
addResourceHandlers
(
registry
:
ResourceHandlerRegistry
)
:
Unit
=
{
registry
registry
.
addResourceHandler
(
"swagger-ui.html"
)
.
addResourceHandler
(
"swagger-ui.html"
)
.
addResourceLocations
(
"classpath:/META-INF/resources/"
)
.
addResourceLocations
(
"classpath:/META-INF/resources/"
)
...
...
src/main/scala/io/github/dreamylost/config/Swagger2Config.scala
浏览文件 @
7c9d3595
...
@@ -30,17 +30,16 @@ class Swagger2Config {
...
@@ -30,17 +30,16 @@ class Swagger2Config {
.
paths
(
PathSelectors
.
any
())
.
paths
(
PathSelectors
.
any
())
.
build
()
.
build
()
private
lazy
val
apiInfo
:
()
=>
ApiInfo
=
()
=>
private
lazy
val
apiInfo
:
()
=>
ApiInfo
=
()
=>
{
new
ApiInfoBuilder
()
new
ApiInfoBuilder
()
// 页面标题
// 页面标题
.
title
(
"Sim"
)
.
title
(
"Sim"
)
// 创建人
// 创建人
.
description
(
"梦境迷离:https://github.com/jxnu-liguobin"
)
.
description
(
"Scala即时通讯系统"
)
.
termsOfServiceUrl
(
"https://github.com/jxnu-liguobin"
)
.
termsOfServiceUrl
(
"https://github.com/jxnu-liguobin/Sim"
)
// 创建人
.
contact
(
"dreamylost@outlook.com"
)
.
contact
(
"梦境迷离"
)
// 版本号
// 版本号
.
version
(
"1.3"
)
.
version
(
"1.3
.1
"
)
.
build
()
.
build
()
}
}
}
src/main/scala/io/github/dreamylost/config/SystemHandlerInterceptor.scala
浏览文件 @
7c9d3595
package
io.github.dreamylost.config
package
io.github.dreamylost.config
import
io.github.dreamylost
.log
import
org.bitlap.tools
.log
import
io.github.dreamylost
.logs.LogType
import
org.bitlap.tools
.logs.LogType
import
org.springframework.web.servlet.HandlerInterceptor
import
org.springframework.web.servlet.HandlerInterceptor
import
org.springframework.web.servlet.ModelAndView
import
org.springframework.web.servlet.ModelAndView
...
...
src/main/scala/io/github/dreamylost/controller/UserController.scala
浏览文件 @
7c9d3595
...
@@ -2,7 +2,7 @@ package io.github.dreamylost.controller
...
@@ -2,7 +2,7 @@ package io.github.dreamylost.controller
import
com.github.pagehelper.PageHelper
import
com.github.pagehelper.PageHelper
import
io.github.dreamylost.constant.SystemConstant
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._
import
io.github.dreamylost.model.domains.UserVo
import
io.github.dreamylost.model.domains.UserVo
import
io.github.dreamylost.model.domains._
import
io.github.dreamylost.model.domains._
...
@@ -15,7 +15,7 @@ import io.github.dreamylost.util.FileUtil
...
@@ -15,7 +15,7 @@ import io.github.dreamylost.util.FileUtil
import
io.github.dreamylost.util.SecurityUtil
import
io.github.dreamylost.util.SecurityUtil
import
io.github.dreamylost.ResultPageSet
import
io.github.dreamylost.ResultPageSet
import
io.github.dreamylost.ResultSet
import
io.github.dreamylost.ResultSet
import
io.github.dreamylost
.log
import
org.bitlap.tools
.log
import
io.swagger.annotations.Api
import
io.swagger.annotations.Api
import
io.swagger.annotations.ApiOperation
import
io.swagger.annotations.ApiOperation
import
org.springframework.beans.factory.annotation.Autowired
import
org.springframework.beans.factory.annotation.Autowired
...
...
src/main/scala/io/github/dreamylost/model/FriendAndGroupInfo.scala
浏览文件 @
7c9d3595
package
io.github.dreamylost.model
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.domains.FriendList
import
io.github.dreamylost.model.entities.GroupList
import
io.github.dreamylost.model.entities.GroupList
import
io.github.dreamylost.model.entities.User
import
io.github.dreamylost.model.entities.User
...
...
src/main/scala/io/github/dreamylost/model/domains.scala
浏览文件 @
7c9d3595
package
io.github.dreamylost.model
package
io.github.dreamylost.model
import
io.github.dreamylost.model.entities.User
import
io.github.dreamylost.model.entities.User
import
io.github.dreamylost
.JavaCompatible
import
org.bitlap.tools
.JavaCompatible
/** @author 梦境迷离
/** @author 梦境迷离
* @since 2021/11/21
* @since 2021/11/21
...
...
src/main/scala/io/github/dreamylost/model/entities.scala
浏览文件 @
7c9d3595
package
io.github.dreamylost.model
package
io.github.dreamylost.model
import
io.github.dreamylost
.JavaCompatible
import
org.bitlap.tools
.JavaCompatible
import
java.util.Date
import
java.util.Date
...
...
src/main/scala/io/github/dreamylost/service/CookieService.scala
浏览文件 @
7c9d3595
package
io.github.dreamylost.service
package
io.github.dreamylost.service
import
io.github.dreamylost
.log
import
org.bitlap.tools
.log
import
io.github.dreamylost
.logs.LogType
import
org.bitlap.tools
.logs.LogType
import
io.github.dreamylost.model.entities.User
import
io.github.dreamylost.model.entities.User
import
org.springframework.stereotype.Service
import
org.springframework.stereotype.Service
...
@@ -19,7 +19,7 @@ import javax.servlet.http.HttpServletResponse
...
@@ -19,7 +19,7 @@ import javax.servlet.http.HttpServletResponse
@log
(
logType
=
LogType
.
Slf4j
)
@log
(
logType
=
LogType
.
Slf4j
)
class
CookieService
{
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
baseE
:
Base64.Encoder
=
Base64
.
getEncoder
val
baseD
:
Base64.Decoder
=
Base64
.
getDecoder
val
baseD
:
Base64.Decoder
=
Base64
.
getDecoder
//记住用户名、密码功能(注意:cookie存放密码会存在安全隐患)
//记住用户名、密码功能(注意:cookie存放密码会存在安全隐患)
...
...
src/main/scala/io/github/dreamylost/service/MailService.scala
浏览文件 @
7c9d3595
package
io.github.dreamylost.service
package
io.github.dreamylost.service
import
io.github.dreamylost
.log
import
org.bitlap.tools
.log
import
io.github.dreamylost
.logs.LogType
import
org.bitlap.tools
.logs.LogType
import
org.springframework.beans.factory.annotation.Autowired
import
org.springframework.beans.factory.annotation.Autowired
import
org.springframework.beans.factory.annotation.Value
import
org.springframework.beans.factory.annotation.Value
import
org.springframework.core.io.FileSystemResource
import
org.springframework.core.io.FileSystemResource
...
...
src/main/scala/io/github/dreamylost/service/UserService.scala
浏览文件 @
7c9d3595
package
io.github.dreamylost.service
package
io.github.dreamylost.service
import
io.github.dreamylost.constant.SystemConstant
import
io.github.dreamylost.constant.SystemConstant
import
io.github.dreamylost
.log
import
org.bitlap.tools
.log
import
io.github.dreamylost
.logs.LogType
import
org.bitlap.tools
.logs.LogType
import
io.github.dreamylost.model.domains._
import
io.github.dreamylost.model.domains._
import
io.github.dreamylost.model.entities._
import
io.github.dreamylost.model.entities._
import
io.github.dreamylost.repository.UserRepository
import
io.github.dreamylost.repository.UserRepository
...
...
src/main/scala/io/github/dreamylost/websocket/RedisService.scala
浏览文件 @
7c9d3595
package
io.github.dreamylost.websocket
package
io.github.dreamylost.websocket
import
io.github.dreamylost
.log
import
org.bitlap.tools
.log
import
io.github.dreamylost
.logs.LogType
import
org.bitlap.tools
.logs.LogType
import
org.springframework.beans.factory.annotation.Autowired
import
org.springframework.beans.factory.annotation.Autowired
import
org.springframework.data.redis.core.RedisTemplate
import
org.springframework.data.redis.core.RedisTemplate
import
org.springframework.stereotype.Service
import
org.springframework.stereotype.Service
...
...
src/main/scala/io/github/dreamylost/websocket/WebSocketProvider.scala
浏览文件 @
7c9d3595
...
@@ -15,8 +15,8 @@ import akka.stream.scaladsl.Keep
...
@@ -15,8 +15,8 @@ import akka.stream.scaladsl.Keep
import
akka.stream.scaladsl.Sink
import
akka.stream.scaladsl.Sink
import
akka.stream.scaladsl.Source
import
akka.stream.scaladsl.Source
import
io.github.dreamylost.constant.SystemConstant
import
io.github.dreamylost.constant.SystemConstant
import
io.github.dreamylost
.log
import
org.bitlap.tools
.log
import
io.github.dreamylost
.logs.LogType
import
org.bitlap.tools
.logs.LogType
import
io.github.dreamylost.model.entities.
{
Message
=>
IMMessage
}
import
io.github.dreamylost.model.entities.
{
Message
=>
IMMessage
}
import
io.github.dreamylost.util.Jackson
import
io.github.dreamylost.util.Jackson
import
io.github.dreamylost.websocket.Protocols._
import
io.github.dreamylost.websocket.Protocols._
...
...
src/main/scala/io/github/dreamylost/websocket/WebSocketServer.scala
浏览文件 @
7c9d3595
...
@@ -6,8 +6,8 @@ import akka.http.scaladsl.server.Directives
...
@@ -6,8 +6,8 @@ import akka.http.scaladsl.server.Directives
import
akka.http.scaladsl.settings.ServerSettings
import
akka.http.scaladsl.settings.ServerSettings
import
akka.util.ByteString
import
akka.util.ByteString
import
com.typesafe.config.ConfigFactory
import
com.typesafe.config.ConfigFactory
import
io.github.dreamylost
.log
import
org.bitlap.tools
.log
import
io.github.dreamylost
.logs.LogType
import
org.bitlap.tools
.logs.LogType
import
org.springframework.beans.factory.annotation.Autowired
import
org.springframework.beans.factory.annotation.Autowired
import
org.springframework.stereotype.Component
import
org.springframework.stereotype.Component
...
...
src/main/scala/io/github/dreamylost/websocket/WebSocketService.scala
浏览文件 @
7c9d3595
...
@@ -4,8 +4,8 @@ import akka.actor.ActorRef
...
@@ -4,8 +4,8 @@ import akka.actor.ActorRef
import
com.fasterxml.jackson.databind.ObjectMapper
import
com.fasterxml.jackson.databind.ObjectMapper
import
com.fasterxml.jackson.module.scala.ScalaObjectMapper
import
com.fasterxml.jackson.module.scala.ScalaObjectMapper
import
io.github.dreamylost.constant.SystemConstant
import
io.github.dreamylost.constant.SystemConstant
import
io.github.dreamylost
.log
import
org.bitlap.tools
.log
import
io.github.dreamylost
.logs.LogType
import
org.bitlap.tools
.logs.LogType
import
io.github.dreamylost.model.domains.Add
import
io.github.dreamylost.model.domains.Add
import
io.github.dreamylost.model.domains.Receive
import
io.github.dreamylost.model.domains.Receive
import
io.github.dreamylost.model.entities.AddMessage
import
io.github.dreamylost.model.entities.AddMessage
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录