Commit bf9d3490 authored by 赵啸非's avatar 赵啸非

调整pom文件

parent de537b2e
......@@ -39,18 +39,18 @@ clear_deploy() {
#清理执行文件目录
# mv /home/publish/portal-manager /home/publish/backup/portal-manager
writelog "mv ${EXECPATH} ${PUBLISH_PATH}/backup/${PROJECT_NAME}"
mv ${EXECPATH} ${PUBLISH_PATH}/backup/${PROJECT_NAME}
#rm -rf ${EXECPATH}
#writelog "mv ${EXECPATH} ${PUBLISH_PATH}/backup/${PROJECT_NAME}"
#mv ${EXECPATH} ${PUBLISH_PATH}/backup/${PROJECT_NAME}
rm -rf ${EXECPATH}
}
#清理ui
clear_ui_deploy() {
EXEC_UI_PATH=$1
#rm -rf ${EXEC_UI_PATH}
rm -rf ${EXEC_UI_PATH}
# mv /home/publish/portal-manager /home/publish/backup/portal-manager
writelog "mv ${PUBLISH_PATH}/${PROJECT_NAME}-ui ${PUBLISH_PATH}/backup/${PROJECT_NAME}-ui"
mv ${EXEC_UI_PATH} ${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
mkdir -p ${EXEC_UI_PATH}
}
......
......@@ -11,7 +11,6 @@ import com.mortals.framework.util.HttpUtil;
import com.mortals.xhx.base.system.message.MessageService;
import com.mortals.xhx.busiz.req.ApiThirdPartyReq;
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.YesNoEnum;
import com.mortals.xhx.common.key.Constant;
......@@ -150,7 +149,7 @@ public class MessageServiceImpl implements MessageService{
try {
Map<String, String> header = new HashMap<>();
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);
return JSON.parseObject(resp, ApiResp.class);
} catch (Exception e) {
......
......@@ -2,7 +2,6 @@ package com.mortals.xhx.thread;
import cn.hutool.core.net.url.UrlBuilder;
import com.alibaba.fastjson.JSON;
import com.mortals.framework.ap.GlobalSysInfo;
import com.mortals.framework.service.ICacheService;
import com.mortals.framework.util.AbstractThread;
......@@ -50,7 +49,7 @@ public class SendThirdPartyThread extends AbstractThread {
if (!ObjectUtils.isEmpty(deviceReq)) {
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);
log.info("sendThirty resp ==>{}", JSON.toJSONString(resp));
// log.info("sendThirty resp ==>{}", JSON.toJSONString(resp));
}
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment