From 4fee749c0cbd34ffc8e8c68bf1cd481c9eb93247 Mon Sep 17 00:00:00 2001 From: qijirenjian Date: Mon, 10 Mar 2025 11:22:03 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8D=95=E4=BD=8D=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/weaver/seconddev/interfaces/swfa/BillFieldUtil.java | 3 ++- .../seconddev/interfaces/swfa/sl/CallDTtripService.java | 4 +++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/swfa/BillFieldUtil.java b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/swfa/BillFieldUtil.java index 5485ecf..83e17fe 100644 --- a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/swfa/BillFieldUtil.java +++ b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/swfa/BillFieldUtil.java @@ -237,7 +237,8 @@ public class BillFieldUtil { logger_6c507bbc.error("unitid----------- " + unitid); String unitno = ""; RecordSet rs = I18nContextUtil.getBean(RecordSet.class); - String poolname_rg = CONN_TYPE.workflow.getType(); +// String poolname_rg = CONN_TYPE.workflow.getType(); + String poolname_rg = "E10JTZH"; // TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源 //TODO custom 已处理 int类型转string String sql = "select id,dwnm from e10_common.dbo.formtable_main_286 where id='" + unitid+"'"; diff --git a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/swfa/sl/CallDTtripService.java b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/swfa/sl/CallDTtripService.java index d4c419a..9f301bb 100644 --- a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/swfa/sl/CallDTtripService.java +++ b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/swfa/sl/CallDTtripService.java @@ -5,6 +5,7 @@ import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; import com.weaver.common.cache.base.BaseCache; +import com.weaver.mc.util.StringUtils; import com.weaver.seconddev.interfaces.htjt.util.TransUtil; import com.weaver.seconddev.interfaces.prop.ConfigProp; import org.apache.http.client.methods.CloseableHttpResponse; @@ -114,9 +115,10 @@ public class CallDTtripService extends BaseBean { } public String getToken(JSONObject jsonObject,String account,String password){ + logger_a99d9846.error("getToken"); // String token = (String) Util_DataCache.getObjVal("DTtrip_token"); String token = ""; - if (token == null) { + if (StringUtils.isEmpty(token)) { String result = ""; // String url = Util.null2String(I18nContextUtilcus.getBean(Environment.class).getProperty("htsloasync.dttrip_tokenUrl")).trim(); // String account = Util.null2String(I18nContextUtilcus.getBean(Environment.class).getProperty("htsloasync.dttrip_account")).trim();