From 212aa4ae1f54fe4d3e51b9695224f9f86cd1bd22 Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期二, 11 七月 2023 10:58:48 +0800
Subject: [PATCH] Merge branch 'master' of http://git.homecommunity.cn/supervip/MicroCommunity
---
java110-core/src/main/java/com/java110/core/smo/impl/SaveTransactionLogSMOImpl.java | 22 ++++++++++++++++------
1 files changed, 16 insertions(+), 6 deletions(-)
diff --git a/java110-core/src/main/java/com/java110/core/smo/impl/SaveTransactionLogSMOImpl.java b/java110-core/src/main/java/com/java110/core/smo/impl/SaveTransactionLogSMOImpl.java
index 4bcdb86..0dbdfe1 100755
--- a/java110-core/src/main/java/com/java110/core/smo/impl/SaveTransactionLogSMOImpl.java
+++ b/java110-core/src/main/java/com/java110/core/smo/impl/SaveTransactionLogSMOImpl.java
@@ -1,20 +1,20 @@
package com.java110.core.smo.impl;
import com.alibaba.fastjson.JSONObject;
-import com.java110.core.client.RestTemplate;
+import com.java110.core.context.Environment;
import com.java110.core.context.IPageData;
import com.java110.core.context.PageData;
import com.java110.core.factory.CallApiServiceFactory;
import com.java110.core.smo.ISaveTransactionLogSMO;
import com.java110.dto.app.AppDto;
-import com.java110.dto.assetImportLog.AssetImportLogDto;
+import com.java110.dto.log.AssetImportLogDto;
import com.java110.intf.common.ITransactionLogInnerServiceSMO;
-import com.java110.po.transactionLog.TransactionLogPo;
-import com.java110.utils.constant.ServiceConstant;
+import com.java110.po.log.TransactionLogPo;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.HttpMethod;
import org.springframework.scheduling.annotation.Async;
import org.springframework.stereotype.Service;
+import org.springframework.web.client.RestTemplate;
/**
* @ClassName SaveTransactionLogSMOImpl
@@ -33,6 +33,9 @@
@Autowired(required = false)
private RestTemplate restTemplate;
+ @Autowired(required = false)
+ private RestTemplate outRestTemplate;
+
@Override
@Async
public void saveLog(TransactionLogPo transactionLogPo) {
@@ -42,10 +45,17 @@
@Override
@Async
public void saveAssetImportLog(AssetImportLogDto assetImportLogDto) {
- String apiUrl = ServiceConstant.SERVICE_API_URL + "/api/assetImportLog/saveAssetImportLog";
+
+ String apiUrl = "http://api-service/api/assetImportLog/saveAssetImportLog";
+ RestTemplate tmpRestTemplate = restTemplate;
+ if (Environment.isStartBootWay()) {
+ apiUrl = "http://127.0.0.1:8008/api/assetImportLog/saveAssetImportLog";
+ tmpRestTemplate = outRestTemplate;
+ }
IPageData newPd = PageData.newInstance().builder("-1", "鎵归噺鏃ュ織", "", "",
"", "", apiUrl, "",
AppDto.WEB_APP_ID);
- CallApiServiceFactory.callCenterService(restTemplate, newPd, JSONObject.toJSONString(assetImportLogDto), apiUrl, HttpMethod.POST);
+
+ CallApiServiceFactory.callCenterService(tmpRestTemplate, newPd, JSONObject.toJSONString(assetImportLogDto), apiUrl, HttpMethod.POST);
}
}
--
Gitblit v1.8.0