记得上下班打卡 | git大法好,push需谨慎
Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
L
liquidnet-bus-v1
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
董敬伟
liquidnet-bus-v1
Commits
4a9caa95
Commit
4a9caa95
authored
Sep 08, 2021
by
anjiabin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
提交chime社交相关
parent
2f318375
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
38 additions
and
10 deletions
+38
-10
ChimeUserRegisterRespDto.java
...liquidnet/service/chime/dto/ChimeUserRegisterRespDto.java
+21
-0
IChimeUserService.java
...om/liquidnet/service/chime/service/IChimeUserService.java
+2
-2
liquidnet-service-chime-dev.yml
...s-config/liquidnet-config/liquidnet-service-chime-dev.yml
+1
-1
ChimeUserController.java
...quidnet/service/chime/controller/ChimeUserController.java
+9
-2
ChimeUserServiceImpl.java
...dnet/service/chime/service/impl/ChimeUserServiceImpl.java
+5
-5
No files found.
liquidnet-bus-api/liquidnet-service-chime-api/src/main/java/com/liquidnet/service/chime/dto/ChimeUserRegisterRespDto.java
View file @
4a9caa95
package
com
.
liquidnet
.
service
.
chime
.
dto
;
package
com
.
liquidnet
.
service
.
chime
.
dto
;
import
com.alibaba.fastjson.JSONObject
;
import
com.fasterxml.jackson.annotation.JsonFormat
;
import
com.liquidnet.commons.lang.util.JsonUtils
;
import
com.liquidnet.commons.lang.util.JsonUtils
;
import
io.swagger.annotations.ApiModelProperty
;
import
lombok.Data
;
import
lombok.Data
;
import
java.time.LocalDateTime
;
import
java.time.LocalDateTime
;
...
@@ -18,8 +21,19 @@ import java.time.LocalDateTime;
...
@@ -18,8 +21,19 @@ import java.time.LocalDateTime;
public
class
ChimeUserRegisterRespDto
{
public
class
ChimeUserRegisterRespDto
{
private
String
uuid
;
private
String
uuid
;
private
String
type
;
private
String
type
;
@ApiModelProperty
(
value
=
"创建时间"
)
// @JsonDeserialize(using = LocalDateTimeDeserializer.class)
// @JsonSerialize(using = LocalDateTimeSerializer.class)
@JsonFormat
(
pattern
=
"yyyy-MM-dd HH:mm:ss.SSS"
,
timezone
=
"GMT+8"
)
private
LocalDateTime
created
;
//1630929604985
private
LocalDateTime
created
;
//1630929604985
@ApiModelProperty
(
value
=
"修改时间"
)
// @JsonDeserialize(using = LocalDateTimeDeserializer.class)
// @JsonSerialize(using = LocalDateTimeSerializer.class)
@JsonFormat
(
pattern
=
"yyyy-MM-dd HH:mm:ss.SSS"
,
timezone
=
"GMT+8"
)
private
LocalDateTime
modified
;
private
LocalDateTime
modified
;
private
String
username
;
private
String
username
;
private
Boolean
activated
;
private
Boolean
activated
;
private
String
nickname
;
private
String
nickname
;
...
@@ -38,4 +52,11 @@ public class ChimeUserRegisterRespDto {
...
@@ -38,4 +52,11 @@ public class ChimeUserRegisterRespDto {
return
new
ChimeUserRegisterRespDto
();
return
new
ChimeUserRegisterRespDto
();
}
}
}
}
public
static
void
main
(
String
[]
args
)
{
String
ss
=
"{\"uuid\":\"3f6a2b20-1085-11ec-9941-bd3851758eda\",\"type\":\"user\",\"created\":1631092502233,\"modified\":1631092502233,\"username\":\"anjiabin5\",\"activated\":true,\"nickname\":\"anjiabin5-nickname\"}"
;
// ChimeUserRegisterRespDto respDto = JsonUtils.fromJson(ss,ChimeUserRegisterRespDto.class);
ChimeUserRegisterRespDto
respDto
=
JSONObject
.
parseObject
(
ss
,
ChimeUserRegisterRespDto
.
class
);
System
.
out
.
println
(
"ChimeUserRegisterRespDto==="
+
respDto
.
toString
());
}
}
}
liquidnet-bus-api/liquidnet-service-chime-api/src/main/java/com/liquidnet/service/chime/service/IChimeUserService.java
View file @
4a9caa95
package
com
.
liquidnet
.
service
.
chime
.
service
;
package
com
.
liquidnet
.
service
.
chime
.
service
;
import
com.alibaba.fastjson.JSONObject
;
import
com.liquidnet.service.chime.dto.ChimeUserRegisterReqDto
;
import
com.liquidnet.service.chime.dto.ChimeUserRegisterReqDto
;
import
com.liquidnet.service.chime.dto.ChimeUserRegisterRespDto
;
/**
/**
* @author AnJiabin <anjiabin@zhengzai.tv>
* @author AnJiabin <anjiabin@zhengzai.tv>
...
@@ -18,5 +18,5 @@ public interface IChimeUserService {
...
@@ -18,5 +18,5 @@ public interface IChimeUserService {
* @param reqDto
* @param reqDto
* @return
* @return
*/
*/
ChimeUserRegisterRespDto
register
(
ChimeUserRegisterReqDto
reqDto
);
JSONObject
register
(
ChimeUserRegisterReqDto
reqDto
);
}
}
liquidnet-bus-config/liquidnet-config/liquidnet-service-chime-dev.yml
View file @
4a9caa95
...
@@ -14,7 +14,7 @@ liquidnet:
...
@@ -14,7 +14,7 @@ liquidnet:
pattern-file
:
'
%d{yyyy-MM-dd
HH:mm:ss.SSS}
[
%-5level]
%thread
[%logger{96}:%line]
-
%msg%n'
pattern-file
:
'
%d{yyyy-MM-dd
HH:mm:ss.SSS}
[
%-5level]
%thread
[%logger{96}:%line]
-
%msg%n'
pattern-console
:
'
%d{yyyy-MM-dd
HH:mm:ss.SSS}
[
%-5level]
%thread
[%logger{96}:%line]
-
%msg%n'
pattern-console
:
'
%d{yyyy-MM-dd
HH:mm:ss.SSS}
[
%-5level]
%thread
[%logger{96}:%line]
-
%msg%n'
pattern-rolling-file-name
:
${liquidnet.logfile.path}/${liquidnet.logfile.name}-%d{yyyy-MM-dd}.%i.log
pattern-rolling-file-name
:
${liquidnet.logfile.path}/${liquidnet.logfile.name}-%d{yyyy-MM-dd}.%i.log
level
:
debug
level
:
info
mongodb
:
mongodb
:
sslEnabled
:
false
sslEnabled
:
false
database
:
dev_ln_scene
database
:
dev_ln_scene
liquidnet-bus-service/liquidnet-service-chime/liquidnet-service-chime-impl/src/main/java/com/liquidnet/service/chime/controller/ChimeUserController.java
View file @
4a9caa95
package
com
.
liquidnet
.
service
.
chime
.
controller
;
package
com
.
liquidnet
.
service
.
chime
.
controller
;
import
com.alibaba.fastjson.JSONObject
;
import
com.github.xiaoymin.knife4j.annotations.ApiOperationSupport
;
import
com.github.xiaoymin.knife4j.annotations.ApiOperationSupport
;
import
com.liquidnet.commons.lang.util.StringUtil
;
import
com.liquidnet.service.base.ResponseDto
;
import
com.liquidnet.service.base.ResponseDto
;
import
com.liquidnet.service.chime.dto.ChimeUserRegisterReqDto
;
import
com.liquidnet.service.chime.dto.ChimeUserRegisterReqDto
;
import
com.liquidnet.service.chime.dto.ChimeUserRegisterRespDto
;
import
com.liquidnet.service.chime.dto.ChimeUserRegisterRespDto
;
...
@@ -54,7 +56,12 @@ public class ChimeUserController {
...
@@ -54,7 +56,12 @@ public class ChimeUserController {
reqDto
.
setSex
(
sex
);
reqDto
.
setSex
(
sex
);
reqDto
.
setTags
(
tags
);
reqDto
.
setTags
(
tags
);
//获取等前登陆用户 CurrentUtil.getCurrentUid()
//获取等前登陆用户 CurrentUtil.getCurrentUid()
ChimeUserRegisterRespDto
vo
=
chimeUserService
.
register
(
reqDto
);
JSONObject
jsonObject
=
chimeUserService
.
register
(
reqDto
);
return
ResponseDto
.
success
(
vo
);
if
(
StringUtil
.
isNotNull
(
jsonObject
.
get
(
"error"
))){
return
ResponseDto
.
failure
(
jsonObject
.
get
(
"error"
).
toString
());
}
ChimeUserRegisterRespDto
respDto
=
ChimeUserRegisterRespDto
.
getNew
();
respDto
=
JSONObject
.
parseObject
(
jsonObject
.
toJSONString
(),
ChimeUserRegisterRespDto
.
class
);
return
ResponseDto
.
success
(
respDto
);
}
}
}
}
liquidnet-bus-service/liquidnet-service-chime/liquidnet-service-chime-impl/src/main/java/com/liquidnet/service/chime/service/impl/ChimeUserServiceImpl.java
View file @
4a9caa95
package
com
.
liquidnet
.
service
.
chime
.
service
.
impl
;
package
com
.
liquidnet
.
service
.
chime
.
service
.
impl
;
import
com.alibaba.fastjson.JSONObject
;
import
com.liquidnet.common.third.easemob.util.EasemobUtil
;
import
com.liquidnet.common.third.easemob.util.EasemobUtil
;
import
com.liquidnet.service.chime.dto.ChimeUserRegisterReqDto
;
import
com.liquidnet.service.chime.dto.ChimeUserRegisterReqDto
;
import
com.liquidnet.service.chime.dto.ChimeUserRegisterRespDto
;
import
com.liquidnet.service.chime.service.IChimeUserService
;
import
com.liquidnet.service.chime.service.IChimeUserService
;
import
lombok.extern.slf4j.Slf4j
;
import
lombok.extern.slf4j.Slf4j
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.beans.factory.annotation.Autowired
;
...
@@ -23,10 +23,10 @@ public class ChimeUserServiceImpl implements IChimeUserService {
...
@@ -23,10 +23,10 @@ public class ChimeUserServiceImpl implements IChimeUserService {
@Autowired
@Autowired
private
EasemobUtil
easemobUtil
;
private
EasemobUtil
easemobUtil
;
@Override
@Override
public
ChimeUserRegisterRespDto
register
(
ChimeUserRegisterReqDto
reqDto
)
{
public
JSONObject
register
(
ChimeUserRegisterReqDto
reqDto
)
{
String
result
=
easemobUtil
.
createUser
(
reqDto
.
getUserId
(),
"123456"
,
reqDto
.
getNickName
());
String
result
=
easemobUtil
.
createUser
(
reqDto
.
getUserId
(),
"123456"
,
reqDto
.
getNickName
());
log
.
info
(
"chime easemobUtil.createUser res
"
);
log
.
info
(
"chime easemobUtil.createUser res
ult:{}"
,
result
);
ChimeUserRegisterRespDto
respDto
=
ChimeUserRegisterRespDto
.
getNew
(
);
JSONObject
jsonObject
=
JSONObject
.
parseObject
(
result
);
return
respDto
;
return
jsonObject
;
}
}
}
}
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment