Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
F
fzm-joying
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
JIRA
JIRA
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
lei
fzm-joying
Commits
2438b614
Commit
2438b614
authored
Mar 08, 2022
by
33
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix BUG
parent
ca2f25d2
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
10 additions
and
3 deletions
+10
-3
Dockerfile
file/Dockerfile
+1
-1
CopyrightApplyServiceImpl.java
...om/fzm/common/service/impl/CopyrightApplyServiceImpl.java
+8
-1
update.sql
sql/update.sql
+1
-1
No files found.
file/Dockerfile
View file @
2438b614
...
...
@@ -4,7 +4,7 @@ FROM java:8
COPY
localtime /etc/
RUN
echo
'Asia/Shanghai'
>
/etc/timezone
ADD
joying-portal-1.
0
.0.jar app.jar
ADD
joying-portal-1.
1
.0.jar app.jar
EXPOSE
8001
# -Dspring.profiles.active=sit 等号后面表示使用application-sit.yml,修改该项使用其他配置文件
ENTRYPOINT
["java", "-Djava.security.egd=file:/dev/./urandom", "-Dspring.profiles.active=sit", "-jar", "/app.jar"]
joying-common/src/main/java/com/fzm/common/service/impl/CopyrightApplyServiceImpl.java
View file @
2438b614
...
...
@@ -80,6 +80,9 @@ public class CopyrightApplyServiceImpl extends ServiceImpl<CopyrightApplyMapper,
private
UserService
userService
;
@Resource
private
AuthPersonService
authPersonService
;
@Resource
private
NftService
nftService
;
@Resource
...
...
@@ -118,6 +121,10 @@ public class CopyrightApplyServiceImpl extends ServiceImpl<CopyrightApplyMapper,
if
(
nft
==
null
||
!
nft
.
getUserId
().
equals
(
user
.
getId
()))
{
throw
GlobalException
.
newException
(
ResultCode
.
FAILED
,
"请先确认此nft的有效性"
);
}
AuthPerson
authPerson
=
authPersonService
.
getByUserId
(
user
.
getId
());
if
(
authPerson
==
null
)
{
throw
GlobalException
.
newException
(
ResultCode
.
UNAUTHORIZED
,
"申请人尚未实名认证"
);
}
// 如果发表状态是已发表的话,需要传入首次发表日期和省市
if
(
SystemConstant
.
BOOLEAN_DATA_TRUE
.
equals
(
copyrightDTO
.
getPublishState
())
&&
(
copyrightDTO
.
getFirstPublishDate
()
==
null
||
...
...
@@ -128,7 +135,7 @@ public class CopyrightApplyServiceImpl extends ServiceImpl<CopyrightApplyMapper,
// 首次提交,登记状态为待支付
copyrightApply
.
setRegisterState
(
CopyrightApplyState
.
TO_BE_PAY
.
getCode
());
copyrightApply
.
setUserId
(
user
.
getId
());
copyrightApply
.
setApplyName
(
user
.
getAuthPerson
()
.
getName
());
copyrightApply
.
setApplyName
(
authPerson
.
getName
());
copyrightApply
.
setApplyTime
(
new
Date
());
try
{
save
(
copyrightApply
);
...
...
sql/update.sql
View file @
2438b614
...
...
@@ -43,7 +43,7 @@ ALTER TABLE `tb_copyright_apply`
ADD
COLUMN
`register_owner`
varchar
(
32
)
CHARACTER
SET
utf8mb4
COLLATE
utf8mb4_general_ci
NULL
DEFAULT
''
COMMENT
'登记证书人名称,在版权登记审核通过后生成'
AFTER
`register_code`
;
ALTER
TABLE
`tb_copyright_apply`
ADD
COLUMN
`register_time`
datetime
NULL
DEFAULT
NULL
COMMENT
'登记证书时间,在版权登记审核通过后生成'
AFTER
`register_owner`
;
ADD
COLUMN
`register_time`
varchar
(
16
)
CHARACTER
SET
utf8mb4
COLLATE
utf8mb4_general_ci
NULL
DEFAULT
''
COMMENT
'登记证书时间,在版权登记审核通过后生成'
AFTER
`register_owner`
;
ALTER
TABLE
`tb_copyright_apply_owner_relation`
CHARACTER
SET
=
utf8mb4
,
...
...
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