Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
X
xyqb-user2
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
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
head_group
xyqb-user2
Commits
08008b9c
Commit
08008b9c
authored
Jan 11, 2023
by
王亮
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix a bug.
parent
7d8ce47c
Changes
3
Expand all
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
1666 additions
and
1520 deletions
+1666
-1520
HttpConfig.java
src/main/java/cn/quantgroup/xyqb/config/http/HttpConfig.java
+5
-6
InnerController.java
...tgroup/xyqb/controller/internal/user/InnerController.java
+1621
-1514
UserDisableRecordModel.java
...java/cn/quantgroup/xyqb/model/UserDisableRecordModel.java
+40
-0
No files found.
src/main/java/cn/quantgroup/xyqb/config/http/HttpConfig.java
View file @
08008b9c
...
...
@@ -73,14 +73,13 @@ public class HttpConfig {
public
Jackson2ObjectMapperBuilder
jacksonBuilder
()
{
Jackson2ObjectMapperBuilder
builder
=
new
Jackson2ObjectMapperBuilder
();
builder
.
indentOutput
(
false
)
.
dateFormat
(
new
SimpleDateFormat
(
"yyyy-MM-dd HH:mm:ss
"
))
.
dateFormat
(
new
SimpleDateFormat
(
"yyyy-MM-dd
"
))
.
defaultViewInclusion
(
false
)
.
serializationInclusion
(
JsonInclude
.
Include
.
NON_NULL
)
.
featuresToEnable
(
SerializationFeature
.
WRITE_ENUMS_USING_INDEX
,
DeserializationFeature
.
ACCEPT_EMPTY_STRING_AS_NULL_OBJECT
);
return
builder
;
}
@Bean
public
ConverterRegistry
defaultConversionService
()
{
FormattingConversionService
conversionService
=
new
DefaultFormattingConversionService
();
...
...
src/main/java/cn/quantgroup/xyqb/controller/internal/user/InnerController.java
View file @
08008b9c
This diff is collapsed.
Click to expand it.
src/main/java/cn/quantgroup/xyqb/model/UserDisableRecordModel.java
0 → 100644
View file @
08008b9c
package
cn
.
quantgroup
.
xyqb
.
model
;
import
cn.quantgroup.xyqb.entity.UserDisableRecord
;
import
java.time.format.DateTimeFormatter
;
import
lombok.Data
;
/**
* 只是为了兼容时间格式化问题,后续用户中心升级后,该model不需要
*/
@Data
public
class
UserDisableRecordModel
{
private
Long
id
;
private
Long
userId
;
private
short
operation_type
;
private
String
reason
;
private
String
createdBy
;
private
String
updatedBy
;
private
String
createdAt
;
private
String
updatedAt
;
public
static
UserDisableRecordModel
from
(
UserDisableRecord
userDisableRecord
){
UserDisableRecordModel
userDisableRecordModel
=
new
UserDisableRecordModel
();
userDisableRecordModel
.
setUserId
(
userDisableRecord
.
getUserId
());
userDisableRecordModel
.
setId
(
userDisableRecord
.
getId
());
userDisableRecordModel
.
setReason
(
userDisableRecord
.
getReason
());
userDisableRecordModel
.
setCreatedAt
(
userDisableRecord
.
getCreatedAt
().
toLocalDateTime
().
format
(
DateTimeFormatter
.
ofPattern
(
"yyyy-MM-dd HH:mm:ss"
)));
userDisableRecordModel
.
setUpdatedAt
(
userDisableRecord
.
getUpdatedAt
().
toLocalDateTime
().
format
(
DateTimeFormatter
.
ofPattern
(
"yyyy-MM-dd HH:mm:ss"
)));
userDisableRecordModel
.
setCreatedBy
(
userDisableRecord
.
getCreatedBy
());
userDisableRecordModel
.
setUpdatedBy
(
userDisableRecord
.
getUpdatedBy
());
return
userDisableRecordModel
;
}
}
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