From d9adbadd9fa14cb7174f6167c438a45e8176fd26 Mon Sep 17 00:00:00 2001
From: SZH <szh_hello@163.com>
Date: 星期四, 23 二月 2023 15:22:04 +0800
Subject: [PATCH] 数据库连接池移除druid atomikos分布式事务使用com.mysql.cj.jdbc.MysqlXADataSource
---
equipment/equipment-rpc-provider/src/main/java/com/gkhy/safePlatform/equipment/rpc/provider/EquipmentRpcProvider.java | 16 +++++++++-------
1 files changed, 9 insertions(+), 7 deletions(-)
diff --git a/equipment/equipment-rpc-provider/src/main/java/com/gkhy/safePlatform/equipment/rpc/provider/EquipmentRpcProvider.java b/equipment/equipment-rpc-provider/src/main/java/com/gkhy/safePlatform/equipment/rpc/provider/EquipmentRpcProvider.java
index ca71dc0..e98d15e 100644
--- a/equipment/equipment-rpc-provider/src/main/java/com/gkhy/safePlatform/equipment/rpc/provider/EquipmentRpcProvider.java
+++ b/equipment/equipment-rpc-provider/src/main/java/com/gkhy/safePlatform/equipment/rpc/provider/EquipmentRpcProvider.java
@@ -88,7 +88,7 @@
resultVO.setMsg(e.getMessage());
}catch (Exception e){
resultVO.setCode(ResultCodes.SERVER_ERROR.getCode());
- resultVO.setCode(ResultCodes.SERVER_ERROR.getDesc());
+ resultVO.setMsg(ResultCodes.SERVER_ERROR.getDesc());
}
return resultVO;
@@ -108,7 +108,7 @@
resultVO.setMsg(e.getMessage());
}catch (Exception e){
resultVO.setCode(ResultCodes.SERVER_ERROR.getCode());
- resultVO.setCode(ResultCodes.SERVER_ERROR.getDesc());
+ resultVO.setMsg(ResultCodes.SERVER_ERROR.getDesc());
}
return resultVO;
@@ -131,7 +131,7 @@
resultVO.setMsg(e.getMessage());
}catch (Exception e){
resultVO.setCode(ResultCodes.SERVER_ERROR.getCode());
- resultVO.setCode(ResultCodes.SERVER_ERROR.getDesc());
+ resultVO.setMsg(ResultCodes.SERVER_ERROR.getDesc());
}
return resultVO;
@@ -154,7 +154,7 @@
resultVO.setMsg(e.getMessage());
}catch (Exception e){
resultVO.setCode(ResultCodes.SERVER_ERROR.getCode());
- resultVO.setCode(ResultCodes.SERVER_ERROR.getDesc());
+ resultVO.setMsg(ResultCodes.SERVER_ERROR.getDesc());
}
return resultVO;
@@ -183,7 +183,7 @@
resultVO.setMsg(e.getMessage());
}catch (Exception e){
resultVO.setCode(ResultCodes.SERVER_ERROR.getCode());
- resultVO.setCode(ResultCodes.SERVER_ERROR.getDesc());
+ resultVO.setMsg(ResultCodes.SERVER_ERROR.getDesc());
}
return resultVO;
}
@@ -202,7 +202,7 @@
resultVO.setMsg(e.getMessage());
}catch (Exception e){
resultVO.setCode(ResultCodes.SERVER_ERROR.getCode());
- resultVO.setCode(ResultCodes.SERVER_ERROR.getDesc());
+ resultVO.setMsg(ResultCodes.SERVER_ERROR.getDesc());
}
return resultVO;
@@ -227,11 +227,13 @@
resultVO.setData(materialReceiveRecordsRPCRespDtos);
}
}catch (EquipmentException e){
+ e.printStackTrace();
resultVO.setCode(e.getCode());
resultVO.setMsg(e.getMessage());
}catch (Exception e){
+ e.printStackTrace();
resultVO.setCode(ResultCodes.SERVER_ERROR.getCode());
- resultVO.setCode(ResultCodes.SERVER_ERROR.getDesc());
+ resultVO.setMsg(ResultCodes.SERVER_ERROR.getDesc());
}
return resultVO;
--
Gitblit v1.9.2