Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
Z
zhichan
Overview
Overview
Details
Activity
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
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
蒋勇
zhichan
Commits
669beb76
Commit
669beb76
authored
Dec 13, 2019
by
王昆
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
gsb
parent
f87fc522
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
42 additions
and
32 deletions
+42
-32
bpo-web/app/base/controller/impl/dkcompanyCtl.js
+2
-1
bpo-web/app/base/controller/impl/dkcontractCtl.js
+1
-1
bpo-web/app/base/controller/impl/econtractCtl.js
+1
-1
bpo-web/app/base/service/impl/econtractSve.js
+3
-3
bpo-web/app/config/localsettings.js
+19
-20
bpo-web/app/config/settings.js
+16
-6
No files found.
bpo-web/app/base/controller/impl/dkcompanyCtl.js
View file @
669beb76
...
@@ -41,7 +41,8 @@ class DKcompanyCtl extends CtlBase {
...
@@ -41,7 +41,8 @@ class DKcompanyCtl extends CtlBase {
if
(
isCreateSealKey
||
!
dkcompany
.
sealFileKey
)
{
if
(
isCreateSealKey
||
!
dkcompany
.
sealFileKey
)
{
// 创建企业印章fileKey
// 创建企业印章fileKey
// var accountId = "740b19e0799a4d7abacfa1a31fb72b1e"; // 测试
// var accountId = "740b19e0799a4d7abacfa1a31fb72b1e"; // 测试
var
accountId
=
"f50d8f8cdd8d4bcda6b1aaad1d4b14bf"
;
// 生产
// var accountId = "f50d8f8cdd8d4bcda6b1aaad1d4b14bf"; // 生产
var
accountId
=
settings
.
apiconfig
.
companyAccountId
();
// 生产
var
aliasName
=
dkcompany
.
id
+
"-"
+
uuidv4
();
var
aliasName
=
dkcompany
.
id
+
"-"
+
uuidv4
();
var
rs
=
await
this
.
utilesignbaoSve
.
createEntSeal
(
dkcompany
.
sealUrl
,
accountId
,
aliasName
,
"dkcompanyCtl"
);
var
rs
=
await
this
.
utilesignbaoSve
.
createEntSeal
(
dkcompany
.
sealUrl
,
accountId
,
aliasName
,
"dkcompanyCtl"
);
if
(
rs
.
code
==
1
)
{
if
(
rs
.
code
==
1
)
{
...
...
bpo-web/app/base/controller/impl/dkcontractCtl.js
View file @
669beb76
...
@@ -268,7 +268,7 @@ class DKcontractCtl extends CtlBase {
...
@@ -268,7 +268,7 @@ class DKcontractCtl extends CtlBase {
var
sealId
=
""
;
var
sealId
=
""
;
if
(
!
eseal
)
{
if
(
!
eseal
)
{
var
rs
=
await
this
.
utilesignbaoSve
.
creatEntSignet
(
"f50d8f8cdd8d4bcda6b1aaad1d4b14bf"
,
nameA
+
"alias"
,
nameA
,
""
,
""
,
"econtractCtl"
);
var
rs
=
await
this
.
utilesignbaoSve
.
creatEntSignet
(
settings
.
apiconfig
.
companyAccountId
()
,
nameA
+
"alias"
,
nameA
,
""
,
""
,
"econtractCtl"
);
if
(
rs
&&
rs
.
code
==
1
)
{
if
(
rs
&&
rs
.
code
==
1
)
{
sealId
=
rs
.
data
.
sealId
;
sealId
=
rs
.
data
.
sealId
;
await
this
.
esealSve
.
create
({
await
this
.
esealSve
.
create
({
...
...
bpo-web/app/base/controller/impl/econtractCtl.js
View file @
669beb76
...
@@ -302,7 +302,7 @@ class EcontractCtl extends CtlBase {
...
@@ -302,7 +302,7 @@ class EcontractCtl extends CtlBase {
var
sealId
=
""
;
var
sealId
=
""
;
if
(
!
eseal
)
{
if
(
!
eseal
)
{
var
rs
=
await
this
.
utilesignbaoSve
.
creatEntSignet
(
"f50d8f8cdd8d4bcda6b1aaad1d4b14bf"
,
nameA
+
"alias"
,
nameA
,
""
,
""
,
"econtractCtl"
);
var
rs
=
await
this
.
utilesignbaoSve
.
creatEntSignet
(
settings
.
apiconfig
.
companyAccountId
()
,
nameA
+
"alias"
,
nameA
,
""
,
""
,
"econtractCtl"
);
if
(
rs
&&
rs
.
code
==
1
)
{
if
(
rs
&&
rs
.
code
==
1
)
{
sealId
=
rs
.
data
.
sealId
;
sealId
=
rs
.
data
.
sealId
;
await
this
.
esealSve
.
create
({
await
this
.
esealSve
.
create
({
...
...
bpo-web/app/base/service/impl/econtractSve.js
View file @
669beb76
...
@@ -222,7 +222,7 @@ class EcontractService extends ServiceBase {
...
@@ -222,7 +222,7 @@ class EcontractService extends ServiceBase {
});
});
// TODO 生产环境需要打开
// TODO 生产环境需要打开
if
(
!
eseal
)
{
if
(
!
eseal
)
{
var
rs
=
await
this
.
utilesignbaoSve
.
creatEntSignet
(
"f50d8f8cdd8d4bcda6b1aaad1d4b14bf"
,
etemplate
.
nameA
+
"alias"
,
etemplate
.
nameA
,
""
,
""
,
"econtractSve"
);
var
rs
=
await
this
.
utilesignbaoSve
.
creatEntSignet
(
settings
.
apiconfig
.
companyAccountId
()
,
etemplate
.
nameA
+
"alias"
,
etemplate
.
nameA
,
""
,
""
,
"econtractSve"
);
if
(
rs
&&
rs
.
code
==
1
)
{
if
(
rs
&&
rs
.
code
==
1
)
{
sealId
=
rs
.
data
.
sealId
;
sealId
=
rs
.
data
.
sealId
;
await
this
.
esealSve
.
create
({
await
this
.
esealSve
.
create
({
...
@@ -1342,7 +1342,7 @@ class EcontractService extends ServiceBase {
...
@@ -1342,7 +1342,7 @@ class EcontractService extends ServiceBase {
if
(
!
eseal
)
{
if
(
!
eseal
)
{
// var accountId = ""; // 测试
// var accountId = ""; // 测试
var
rs
=
await
this
.
utilesignbaoSve
.
creatEntSignet
(
"f50d8f8cdd8d4bcda6b1aaad1d4b14bf"
,
etemplate
.
nameA
+
"alias"
,
etemplate
.
nameA
,
""
,
""
,
"econtractSve"
);
var
rs
=
await
this
.
utilesignbaoSve
.
creatEntSignet
(
settings
.
apiconfig
.
companyAccountId
()
,
etemplate
.
nameA
+
"alias"
,
etemplate
.
nameA
,
""
,
""
,
"econtractSve"
);
// var rs = await this.utilesignbaoSve.creatEntSignet("740b19e0799a4d7abacfa1a31fb72b1e", etemplate.nameA + "alias", etemplate.nameA, "", "", "econtractSve");
// var rs = await this.utilesignbaoSve.creatEntSignet("740b19e0799a4d7abacfa1a31fb72b1e", etemplate.nameA + "alias", etemplate.nameA, "", "", "econtractSve");
if
(
rs
&&
rs
.
code
==
1
)
{
if
(
rs
&&
rs
.
code
==
1
)
{
sealId
=
rs
.
data
.
sealId
;
sealId
=
rs
.
data
.
sealId
;
...
@@ -1526,7 +1526,7 @@ class EcontractService extends ServiceBase {
...
@@ -1526,7 +1526,7 @@ class EcontractService extends ServiceBase {
if
(
!
eseal
)
{
if
(
!
eseal
)
{
// var accountId = ""; // 测试
// var accountId = ""; // 测试
var
rs
=
await
this
.
utilesignbaoSve
.
creatEntSignet
(
"f50d8f8cdd8d4bcda6b1aaad1d4b14bf"
,
etemplate
.
nameA
+
"alias"
,
etemplate
.
nameA
,
""
,
""
,
"econtractSve"
);
var
rs
=
await
this
.
utilesignbaoSve
.
creatEntSignet
(
settings
.
apiconfig
.
companyAccountId
()
,
etemplate
.
nameA
+
"alias"
,
etemplate
.
nameA
,
""
,
""
,
"econtractSve"
);
// var rs = await this.utilesignbaoSve.creatEntSignet("740b19e0799a4d7abacfa1a31fb72b1e", etemplate.nameA + "alias", etemplate.nameA, "", "", "econtractSve");
// var rs = await this.utilesignbaoSve.creatEntSignet("740b19e0799a4d7abacfa1a31fb72b1e", etemplate.nameA + "alias", etemplate.nameA, "", "", "econtractSve");
if
(
rs
&&
rs
.
code
==
1
)
{
if
(
rs
&&
rs
.
code
==
1
)
{
sealId
=
rs
.
data
.
sealId
;
sealId
=
rs
.
data
.
sealId
;
...
...
bpo-web/app/config/localsettings.js
View file @
669beb76
...
@@ -6,26 +6,25 @@ var settings = {
...
@@ -6,26 +6,25 @@ var settings = {
db
:
11
,
db
:
11
,
},
},
database
:
{
database
:
{
dbname
:
"bpo"
,
dbname
:
"bpo"
,
user
:
"write"
,
user
:
"root"
,
password
:
"write"
,
password
:
"root"
,
config
:
{
config
:
{
host
:
'192.168.18.237'
,
host
:
'192.168.18.110'
,
port
:
3306
,
dialect
:
'mysql'
,
dialect
:
'mysql'
,
operatorsAliases
:
false
,
operatorsAliases
:
false
,
pool
:
{
pool
:
{
max
:
5
,
max
:
5
,
min
:
0
,
min
:
0
,
acquire
:
90000000
,
acquire
:
90000000
,
idle
:
1000000
idle
:
1000000
},
},
logging
:
true
,
logging
:
true
,
debug
:
true
,
debug
:
true
,
dialectOptions
:{
dialectOptions
:
{
requestTimeout
:
999999
,
requestTimeout
:
999999
,
// instanceName:'DEV'
// instanceName:'DEV'
}
//设置MSSQL超时时间
}
//设置MSSQL超时时间
},
},
},
},
reqEsDevUrl
:
"http://192.168.4.249:9200/"
,
reqEsDevUrl
:
"http://192.168.4.249:9200/"
,
...
...
bpo-web/app/config/settings.js
View file @
669beb76
...
@@ -48,7 +48,8 @@ var settings = {
...
@@ -48,7 +48,8 @@ var settings = {
//e签宝接口Url
//e签宝接口Url
eSignBaoUrl
:
function
()
{
eSignBaoUrl
:
function
()
{
if
(
settings
.
env
==
"dev"
)
{
if
(
settings
.
env
==
"dev"
)
{
return
"https://smlo.tsign.cn/opentreaty-service"
;
// return "https://smlo.tsign.cn/opentreaty-service";
return
"https://o.tsign.cn/opentreaty-service"
;
}
else
{
}
else
{
return
"https://o.tsign.cn/opentreaty-service"
;
return
"https://o.tsign.cn/opentreaty-service"
;
}
}
...
@@ -56,7 +57,8 @@ var settings = {
...
@@ -56,7 +57,8 @@ var settings = {
//e签宝银行验证接口Url
//e签宝银行验证接口Url
eSignBaoBankVerifyUrl
:
function
()
{
eSignBaoBankVerifyUrl
:
function
()
{
if
(
settings
.
env
==
"dev"
)
{
if
(
settings
.
env
==
"dev"
)
{
return
"https://smlo.tsign.cn/openrealname-service"
;
// return "https://smlo.tsign.cn/openrealname-service";
return
"https://o.tsign.cn/openrealname-service"
;
}
else
{
}
else
{
return
"https://o.tsign.cn/openrealname-service"
;
return
"https://o.tsign.cn/openrealname-service"
;
}
}
...
@@ -64,19 +66,27 @@ var settings = {
...
@@ -64,19 +66,27 @@ var settings = {
//e签宝appId
//e签宝appId
eSignBaoAppId
:
function
()
{
eSignBaoAppId
:
function
()
{
if
(
settings
.
env
==
"dev"
)
{
if
(
settings
.
env
==
"dev"
)
{
return
"4438757581"
;
// return "4438757581";
return
"5111588557"
;
}
else
{
}
else
{
return
"5111566617"
// return "5111566617"
return
"5111588557"
}
}
},
},
//e签宝appKey
//e签宝appKey
eSignBaoAppKey
:
function
()
{
eSignBaoAppKey
:
function
()
{
if
(
settings
.
env
==
"dev"
)
{
if
(
settings
.
env
==
"dev"
)
{
return
"0d798cdf01ecb31bf9949f319f8d77db"
;
// return "0d798cdf01ecb31bf9949f319f8d77db";
return
"1595787e8d5b7d19f7b6798f16f41fc2"
;
}
else
{
}
else
{
return
"ea386dfd9063b3669b38b78ed36792cc"
// return "ea386dfd9063b3669b38b78ed36792cc"
return
"1595787e8d5b7d19f7b6798f16f41fc2"
}
}
},
},
// e签宝企业accountId
companyAccountId
:
function
()
{
return
"5c25eb4ee3b448da90babec3ce8d1144"
;
},
},
},
reqEsDevUrl
:
"http://192.168.4.249:9200/"
,
reqEsDevUrl
:
"http://192.168.4.249:9200/"
,
domain
:
function
()
{
domain
:
function
()
{
...
...
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