Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
P
patzn-cloud-service-hmhj
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
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
wangweidong
patzn-cloud-service-hmhj
Commits
d0e45b25
Commit
d0e45b25
authored
Feb 21, 2023
by
lijingjing
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
token更新;后续采取动态获取token;
parent
1d9fc87f
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
5 additions
and
5 deletions
+5
-5
EntrustSampleItemServiceImpl.java
.../lims/hmhj/service/impl/EntrustSampleItemServiceImpl.java
+4
-5
application-hmhj.yml
src/main/resources/application-hmhj.yml
+1
-0
No files found.
src/main/java/com/patzn/cloud/service/lims/hmhj/service/impl/EntrustSampleItemServiceImpl.java
View file @
d0e45b25
...
@@ -40,7 +40,6 @@ import com.patzn.cloud.service.lims.common.service.IExportService;
...
@@ -40,7 +40,6 @@ import com.patzn.cloud.service.lims.common.service.IExportService;
import
com.patzn.cloud.service.lims.hmhj.common.HSSFWorkbookUtil
;
import
com.patzn.cloud.service.lims.hmhj.common.HSSFWorkbookUtil
;
import
com.patzn.cloud.service.lims.hmhj.common.LabreOfficeUtil
;
import
com.patzn.cloud.service.lims.hmhj.common.LabreOfficeUtil
;
import
com.patzn.cloud.service.lims.hmhj.common.OkHttpUtils
;
import
com.patzn.cloud.service.lims.hmhj.common.OkHttpUtils
;
import
com.patzn.cloud.service.lims.hmhj.common.consts.HttpConst
;
import
com.patzn.cloud.service.lims.hmhj.mapper.EntrustSampleItemMapper
;
import
com.patzn.cloud.service.lims.hmhj.mapper.EntrustSampleItemMapper
;
import
com.patzn.cloud.service.lims.hmhj.original.Operation
;
import
com.patzn.cloud.service.lims.hmhj.original.Operation
;
import
com.patzn.cloud.service.lims.hmhj.original.OriginalFactory
;
import
com.patzn.cloud.service.lims.hmhj.original.OriginalFactory
;
...
@@ -149,6 +148,9 @@ public class EntrustSampleItemServiceImpl extends BaseServiceImpl<EntrustSampleI
...
@@ -149,6 +148,9 @@ public class EntrustSampleItemServiceImpl extends BaseServiceImpl<EntrustSampleI
@Value
(
"${service.erp-url}"
)
@Value
(
"${service.erp-url}"
)
private
String
erpUrl
;
private
String
erpUrl
;
@Value
(
"${service.erp-token}"
)
private
String
erpToken
;
@Autowired
@Autowired
private
ILmsOriginalRecordInfoService
originalRecordInfoService
;
private
ILmsOriginalRecordInfoService
originalRecordInfoService
;
...
@@ -159,9 +161,6 @@ public class EntrustSampleItemServiceImpl extends BaseServiceImpl<EntrustSampleI
...
@@ -159,9 +161,6 @@ public class EntrustSampleItemServiceImpl extends BaseServiceImpl<EntrustSampleI
private
IContractSampleItemService
contractSampleItemService
;
private
IContractSampleItemService
contractSampleItemService
;
@Autowired
@Autowired
private
IUserTestStatisticsService
userTestStatisticsService
;
@Autowired
private
IItemComparisonService
itemComparisonService
;
private
IItemComparisonService
itemComparisonService
;
@Override
@Override
...
@@ -1606,7 +1605,7 @@ public class EntrustSampleItemServiceImpl extends BaseServiceImpl<EntrustSampleI
...
@@ -1606,7 +1605,7 @@ public class EntrustSampleItemServiceImpl extends BaseServiceImpl<EntrustSampleI
for
(
Map
<
String
,
Object
>
data
:
dataList
)
{
for
(
Map
<
String
,
Object
>
data
:
dataList
)
{
String
json
=
JSONObject
.
toJSONString
(
data
);
String
json
=
JSONObject
.
toJSONString
(
data
);
log
(
"要发送的样品数据为:"
+
json
);
log
(
"要发送的样品数据为:"
+
json
);
String
result
=
OkHttpUtils
.
sendByPostJson
(
erpUrl
,
HttpConst
.
ERP_TOKEN
,
json
);
String
result
=
OkHttpUtils
.
sendByPostJson
(
erpUrl
,
erpToken
,
json
);
log
(
"发送结果:"
+
result
);
log
(
"发送结果:"
+
result
);
if
(
StringUtils
.
isNotBlank
(
result
))
{
if
(
StringUtils
.
isNotBlank
(
result
))
{
JSONObject
jsonObject
=
JSON
.
parseObject
(
result
);
JSONObject
jsonObject
=
JSON
.
parseObject
(
result
);
...
...
src/main/resources/application-hmhj.yml
View file @
d0e45b25
...
@@ -14,6 +14,7 @@ service:
...
@@ -14,6 +14,7 @@ service:
soffice
:
/opt/libreoffice6.2/program/soffice
soffice
:
/opt/libreoffice6.2/program/soffice
static-url
:
static.hmlims.com:9000
static-url
:
static.hmlims.com:9000
erp-url
:
http://192.168.0.19:5050/api/LimsData/SaveData
erp-url
:
http://192.168.0.19:5050/api/LimsData/SaveData
erp-token
:
VkI+Gi2pizx9uaX+xP+nXAgJKfcBevaruxijYtXXQdU577BLv3jdoLpnQ13BZ5hdPTD90jLmvlr7ygxh18kuLdD9Ha9MdTXIxWJKbNbBn6fnrHU/9lsXBnOVyOEB1DIXW0VQniyjuobU5qolBr2Y99NTQ/l9giZlXGVXAE+1WvY=
spring
:
spring
:
datasource
:
datasource
:
type
:
com.zaxxer.hikari.HikariDataSource
type
:
com.zaxxer.hikari.HikariDataSource
...
...
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