Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
M
mall-server
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
yimu
mall-server
Commits
9a01504e
Commit
9a01504e
authored
Dec 28, 2021
by
wp
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
放开杭州接口
parent
3913d63a
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
28 additions
and
10 deletions
+28
-10
SlcRechargeTask.java
...m/mall/server/admin/block_chain/task/SlcRechargeTask.java
+0
-1
ExternalTokenServiceImpl.java
...n/goods_center/service/impl/ExternalTokenServiceImpl.java
+13
-2
application-dev.yml
mall-server-admin/src/main/resources/application-dev.yml
+15
-7
No files found.
mall-server-admin/src/main/java/com/fzm/mall/server/admin/block_chain/task/SlcRechargeTask.java
View file @
9a01504e
...
@@ -289,7 +289,6 @@ public class SlcRechargeTask {
...
@@ -289,7 +289,6 @@ public class SlcRechargeTask {
if
(
txDetail
==
null
)
{
if
(
txDetail
==
null
)
{
continue
;
continue
;
}
}
log
.
info
(
"【平行链充值程序】-txDetail:"
+
txDetail
);
// 获取执行器
// 获取执行器
String
execer
=
txDetail
.
getExecer
();
String
execer
=
txDetail
.
getExecer
();
...
...
mall-server-admin/src/main/java/com/fzm/mall/server/admin/goods_center/service/impl/ExternalTokenServiceImpl.java
View file @
9a01504e
...
@@ -117,18 +117,29 @@ public class ExternalTokenServiceImpl extends ServiceImpl<ExternalTokenMapper, E
...
@@ -117,18 +117,29 @@ public class ExternalTokenServiceImpl extends ServiceImpl<ExternalTokenMapper, E
externalToken
.
setPublishTime
(
publishTime
);
externalToken
.
setPublishTime
(
publishTime
);
externalToken
.
setPublisher
(
publisher
);
externalToken
.
setPublisher
(
publisher
);
/*
Map<String, Object> map = new HashMap<>();
Map
<
String
,
Object
>
map
=
new
HashMap
<>();
map
.
put
(
"tokenId"
,
tokenId
);
map
.
put
(
"tokenId"
,
tokenId
);
String
httpGet
=
HttpUtil
.
httpGet
(
url
,
map
);
String
httpGet
=
HttpUtil
.
httpGet
(
url
,
map
);
JSONObject
json
=
JSONObject
.
parseObject
(
httpGet
);
JSONObject
json
=
JSONObject
.
parseObject
(
httpGet
);
if
(
json
.
getString
(
"code"
).
equals
(
"200"
))
{
if
(
json
.
getString
(
"code"
).
equals
(
"200"
))
{
externalToken
.
setHash
(
json
.
getString
(
"data"
));
externalToken
.
setHash
(
json
.
getString
(
"data"
));
}
*/
}
//TODO 唐拓接口
//TODO 唐拓接口
save
(
externalToken
);
save
(
externalToken
);
}
}
}
}
public
static
void
main
(
String
[]
args
)
{
Map
<
String
,
Object
>
map
=
new
HashMap
<>();
map
.
put
(
"tokenId"
,
1475715277122572288L
);
String
httpGet
=
HttpUtil
.
httpGet
(
"http://146.56.218.121:12100/open/nft/hash"
,
map
);
JSONObject
json
=
JSONObject
.
parseObject
(
httpGet
);
if
(
json
.
getString
(
"code"
).
equals
(
"200"
))
{
System
.
err
.
println
(
json
.
getString
(
"data"
));
}
}
@Override
@Override
public
ExternalToken
queryByLabelNameAndMerchantId
(
String
coin
,
String
merchantId
)
{
public
ExternalToken
queryByLabelNameAndMerchantId
(
String
coin
,
String
merchantId
)
{
LambdaQueryWrapper
<
ExternalToken
>
qw
=
new
LambdaQueryWrapper
<>();
LambdaQueryWrapper
<
ExternalToken
>
qw
=
new
LambdaQueryWrapper
<>();
...
...
mall-server-admin/src/main/resources/application-dev.yml
View file @
9a01504e
...
@@ -52,14 +52,22 @@ chain:
...
@@ -52,14 +52,22 @@ chain:
token-manager
:
1N2ABERwHgxGhebVw6fVSwaQ5uLAysmGEu
token-manager
:
1N2ABERwHgxGhebVw6fVSwaQ5uLAysmGEu
token-manager-key
:
0x4e92bda2477ded0e7c07a9e3acd2370de8d7401c68cc83ee8376806db3121e77
token-manager-key
:
0x4e92bda2477ded0e7c07a9e3acd2370de8d7401c68cc83ee8376806db3121e77
para
:
para
:
rpc-url
:
http://1
72.22.20.100:890
1
rpc-url
:
http://1
46.56.197.42:1202
1
withhold
:
1417K9fd5vt4zYW86xinWiCbAkNP794aNy
withhold
:
1417K9fd5vt4zYW86xinWiCbAkNP794aNy
withhold-key
:
19d78691584930407e63cd35ac6e67fae6113894b41812e65847d4a365a802a0
withhold-key
:
19d78691584930407e63cd35ac6e67fae6113894b41812e65847d4a365a802a0
token-manager
:
1N2ABERwHgxGhebVw6fVSwaQ5uLAysmGEu
token-manager
:
1KEBcdmMPfUV2suAqgkyDpdm4brZbYmdfF
token-manager-key
:
4e92bda2477ded0e7c07a9e3acd2370de8d7401c68cc83ee8376806db3121e77
token-manager-key
:
5d872407fb2769854dcca6203d70696feced7099c588a6d9146a122025585e41
title
:
user.p.nftChain.
title
:
user.p.mall.
cName
:
user.evm.0x72b80fbf7312e4ddefbfb235754f11915d10b88cefd0e0e96b4d7f66b99cce05
cName
:
user.evm.0xb3ae98ac253679602d54d1513aa9cad7d1b10d5f5117d5ce999c1bf67906ba99
cAddr
:
1BzfFBFf99DRhqfunEXhPsZRDgPwUWjab6
cAddr
:
15DtbSyS4eVFxdF87jmrcAdXMSAwXEHVLW
# rpc-url: http://172.22.20.100:8901
# withhold: 1417K9fd5vt4zYW86xinWiCbAkNP794aNy
# withhold-key: 19d78691584930407e63cd35ac6e67fae6113894b41812e65847d4a365a802a0
# token-manager: 1N2ABERwHgxGhebVw6fVSwaQ5uLAysmGEu
# token-manager-key: 4e92bda2477ded0e7c07a9e3acd2370de8d7401c68cc83ee8376806db3121e77
# title: user.p.nftChain.
# cName: user.evm.0x72b80fbf7312e4ddefbfb235754f11915d10b88cefd0e0e96b4d7f66b99cce05
# cAddr: 1BzfFBFf99DRhqfunEXhPsZRDgPwUWjab6
type
:
para
type
:
para
# 系统账户配置
# 系统账户配置
...
@@ -67,7 +75,7 @@ sys:
...
@@ -67,7 +75,7 @@ sys:
admin
:
admin
:
addr
:
1N2ABERwHgxGhebVw6fVSwaQ5uLAysmGEu
addr
:
1N2ABERwHgxGhebVw6fVSwaQ5uLAysmGEu
priv-key
:
4e92bda2477ded0e7c07a9e3acd2370de8d7401c68cc83ee8376806db3121e77
priv-key
:
4e92bda2477ded0e7c07a9e3acd2370de8d7401c68cc83ee8376806db3121e77
title
:
user.p.
nftChain
.
title
:
user.p.
mall
.
#支付宝支付配置
#支付宝支付配置
...
...
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