Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
D
device-new-platform
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
赵啸非
device-new-platform
Commits
bf9d3490
Commit
bf9d3490
authored
Dec 15, 2023
by
赵啸非
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
调整pom文件
parent
de537b2e
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
8 additions
and
10 deletions
+8
-10
device-manager/src/main/bin/deploy.sh
device-manager/src/main/bin/deploy.sh
+6
-6
device-manager/src/main/java/com/mortals/xhx/base/system/message/impl/MessageServiceImpl.java
...tals/xhx/base/system/message/impl/MessageServiceImpl.java
+1
-2
device-manager/src/main/java/com/mortals/xhx/thread/SendThirdPartyThread.java
...ain/java/com/mortals/xhx/thread/SendThirdPartyThread.java
+1
-2
No files found.
device-manager/src/main/bin/deploy.sh
View file @
bf9d3490
...
@@ -39,18 +39,18 @@ clear_deploy() {
...
@@ -39,18 +39,18 @@ clear_deploy() {
#清理执行文件目录
#清理执行文件目录
# mv /home/publish/portal-manager /home/publish/backup/portal-manager
# mv /home/publish/portal-manager /home/publish/backup/portal-manager
writelog
"mv
${
EXECPATH
}
${
PUBLISH_PATH
}
/backup/
${
PROJECT_NAME
}
"
#
writelog "mv ${EXECPATH} ${PUBLISH_PATH}/backup/${PROJECT_NAME}"
mv
${
EXECPATH
}
${
PUBLISH_PATH
}
/backup/
${
PROJECT_NAME
}
#
mv ${EXECPATH} ${PUBLISH_PATH}/backup/${PROJECT_NAME}
#
rm -rf ${EXECPATH}
rm
-rf
${
EXECPATH
}
}
}
#清理ui
#清理ui
clear_ui_deploy
()
{
clear_ui_deploy
()
{
EXEC_UI_PATH
=
$1
EXEC_UI_PATH
=
$1
#
rm -rf ${EXEC_UI_PATH}
rm
-rf
${
EXEC_UI_PATH
}
# mv /home/publish/portal-manager /home/publish/backup/portal-manager
# mv /home/publish/portal-manager /home/publish/backup/portal-manager
writelog
"mv
${
PUBLISH_PATH
}
/
${
PROJECT_NAME
}
-ui
${
PUBLISH_PATH
}
/backup/
${
PROJECT_NAME
}
-ui"
#
writelog "mv ${PUBLISH_PATH}/${PROJECT_NAME}-ui ${PUBLISH_PATH}/backup/${PROJECT_NAME}-ui"
mv
${
EXEC_UI_PATH
}
${
PUBLISH_PATH
}
/backup/
${
PROJECT_NAME
}
-ui
#
mv ${EXEC_UI_PATH} ${PUBLISH_PATH}/backup/${PROJECT_NAME}-ui
mkdir
-p
${
EXEC_UI_PATH
}
mkdir
-p
${
EXEC_UI_PATH
}
}
}
...
...
device-manager/src/main/java/com/mortals/xhx/base/system/message/impl/MessageServiceImpl.java
View file @
bf9d3490
...
@@ -11,7 +11,6 @@ import com.mortals.framework.util.HttpUtil;
...
@@ -11,7 +11,6 @@ import com.mortals.framework.util.HttpUtil;
import
com.mortals.xhx.base.system.message.MessageService
;
import
com.mortals.xhx.base.system.message.MessageService
;
import
com.mortals.xhx.busiz.req.ApiThirdPartyReq
;
import
com.mortals.xhx.busiz.req.ApiThirdPartyReq
;
import
com.mortals.xhx.busiz.rsp.ApiResp
;
import
com.mortals.xhx.busiz.rsp.ApiResp
;
import
com.mortals.xhx.common.code.DeviceMethodEnum
;
import
com.mortals.xhx.common.code.MessageTypeEnum
;
import
com.mortals.xhx.common.code.MessageTypeEnum
;
import
com.mortals.xhx.common.code.YesNoEnum
;
import
com.mortals.xhx.common.code.YesNoEnum
;
import
com.mortals.xhx.common.key.Constant
;
import
com.mortals.xhx.common.key.Constant
;
...
@@ -150,7 +149,7 @@ public class MessageServiceImpl implements MessageService{
...
@@ -150,7 +149,7 @@ public class MessageServiceImpl implements MessageService{
try
{
try
{
Map
<
String
,
String
>
header
=
new
HashMap
<>();
Map
<
String
,
String
>
header
=
new
HashMap
<>();
header
.
put
(
HEADER_CONTENT_TYPE
,
"application/json"
);
header
.
put
(
HEADER_CONTENT_TYPE
,
"application/json"
);
log
.
info
(
"\n thirdPartyUrl=>{} \n reqbody=>{} \n type=>{}"
,
sendUrl
,
JSON
.
toJSONString
(
deviceReqApiReq
,
SerializerFeature
.
WriteMapNullValue
),
DeviceMethodEnum
.
getByValue
(
deviceReq
.
getDeviceStatus
()).
getDesc
());
//
log.info("\n thirdPartyUrl=>{} \n reqbody=>{} \n type=>{}", sendUrl, JSON.toJSONString(deviceReqApiReq, SerializerFeature.WriteMapNullValue), DeviceMethodEnum.getByValue(deviceReq.getDeviceStatus()).getDesc());
resp
=
HttpUtil
.
doPost
(
sendUrl
,
header
,
JSON
.
toJSONString
(
deviceReqApiReq
,
SerializerFeature
.
WriteMapNullValue
),
"UTF-8"
,
10000
);
resp
=
HttpUtil
.
doPost
(
sendUrl
,
header
,
JSON
.
toJSONString
(
deviceReqApiReq
,
SerializerFeature
.
WriteMapNullValue
),
"UTF-8"
,
10000
);
return
JSON
.
parseObject
(
resp
,
ApiResp
.
class
);
return
JSON
.
parseObject
(
resp
,
ApiResp
.
class
);
}
catch
(
Exception
e
)
{
}
catch
(
Exception
e
)
{
...
...
device-manager/src/main/java/com/mortals/xhx/thread/SendThirdPartyThread.java
View file @
bf9d3490
...
@@ -2,7 +2,6 @@ package com.mortals.xhx.thread;
...
@@ -2,7 +2,6 @@ package com.mortals.xhx.thread;
import
cn.hutool.core.net.url.UrlBuilder
;
import
cn.hutool.core.net.url.UrlBuilder
;
import
com.alibaba.fastjson.JSON
;
import
com.mortals.framework.ap.GlobalSysInfo
;
import
com.mortals.framework.ap.GlobalSysInfo
;
import
com.mortals.framework.service.ICacheService
;
import
com.mortals.framework.service.ICacheService
;
import
com.mortals.framework.util.AbstractThread
;
import
com.mortals.framework.util.AbstractThread
;
...
@@ -50,7 +49,7 @@ public class SendThirdPartyThread extends AbstractThread {
...
@@ -50,7 +49,7 @@ public class SendThirdPartyThread extends AbstractThread {
if
(!
ObjectUtils
.
isEmpty
(
deviceReq
))
{
if
(!
ObjectUtils
.
isEmpty
(
deviceReq
))
{
String
phpInUrl
=
GlobalSysInfo
.
getParamValue
(
PARAM_SERVER_PHP_IN_HTTP_URL
,
"http://127.0.0.1:11078/zwfw_api"
);
String
phpInUrl
=
GlobalSysInfo
.
getParamValue
(
PARAM_SERVER_PHP_IN_HTTP_URL
,
"http://127.0.0.1:11078/zwfw_api"
);
ApiResp
<
String
>
resp
=
messageService
.
sendThirdParty
(
UrlBuilder
.
of
(
phpInUrl
).
addPath
(
thirdPartyPath
).
build
(),
deviceReq
);
ApiResp
<
String
>
resp
=
messageService
.
sendThirdParty
(
UrlBuilder
.
of
(
phpInUrl
).
addPath
(
thirdPartyPath
).
build
(),
deviceReq
);
log
.
info
(
"sendThirty resp ==>{}"
,
JSON
.
toJSONString
(
resp
));
//
log.info("sendThirty resp ==>{}", JSON.toJSONString(resp));
}
}
}
}
...
...
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