zhou.xiaoning 5 years ago
parent
commit
a406172790
2 changed files with 3 additions and 3 deletions
  1. 2 2
      config/config.xml
  2. 1 1
      controllers/erms2/erms2.go

+ 2 - 2
config/config.xml

@@ -16,12 +16,12 @@
         <DbAddress value="192.168.31.117"/>
         <DbName    value="orcl"/>
         <DbPort    value="1521"/>
-        <DbUser    value="mtp2_test82"/>
+        <DbUser    value="mtp2_test16"/>
         <DbPwd     value="muchinfo"/>
     </DbSetting>
 
     <RedisSetting>
-        <Address   value="192.168.30.182"/>
+        <Address   value="192.168.30.213"/>
         <Port      value="5007"/>
         <Timeout   value="3"/>
         <ConnNum   value="1"/>

+ 1 - 1
controllers/erms2/erms2.go

@@ -110,7 +110,7 @@ func QueryInnerTradeDetail(c *gin.Context) {
 						from Hedge_InnerTradeDetail t
 						left join ERMS2_ASTradeDetails ast on t.relatedouttradeid = OutTradeID
 						left join ERMS2_ArbitrageStrategy asd on ast.asapplyid = asd.asapplyid
-						left join ERMS2_SpotContract sc on ast.spotcontractid = sc.spotcontractid
+						left join ERMS3_SpotContract sc on ast.spotcontractid = sc.spotcontractid
 						left join goods g on t.goodsid = g.goodsid
 						left join enumdicitem e on g.goodunitid = e.enumitemname and e.enumdiccode = 'goodsunit'
 						left join goodsgroup gg on g.goodsgroupid = gg.goodsgroupid