Merge remote-tracking branch 'origin/ht' into ht

webservice
calyrex 4 months ago
commit 59ddc3698d

@ -66,12 +66,12 @@ public class OaCtrip extends BaseBean {
// 接口验证
// 测试环境测试完成后注释账号密码
// TicketResponse ticketResponse=CorpTicketService.getOrderAuditTicket("","", "1.0");
//TODO config
// String appKey = I18nContextUtil.getBean(Environment.class).getProperty("htctripmt.appkey");
// String appsecurity = I18nContextUtil.getBean(Environment.class).getProperty("htctripmt.appsecurity");
String appKey = "";
String appsecurity = configProp.getAppsecurity();
String appKey = configProp.getWeaver_secondev_htctripmt_appkey();
String appsecurity = configProp.getWeaver_secondev_htctripmt_appsecurity();
TicketResponse ticketResponse = CorpTicketService.getOrderAuditTicket(appKey, appsecurity, "1.0");
rtInfo[1] = ticketResponse.getStatus().getMessage();

@ -31,9 +31,8 @@ public class ConfigProp {
// @Value("${appkey}")
// private String appkey;
@Value("${appsecurity}")
private String appsecurity;
@Value("${weaver-secondev-htctripmt-appsecurity}")
private String weaver_secondev_htctripmt_appsecurity;
@Value("${isneedxzsl}")
private String isneedxzsl;
@ -242,6 +241,8 @@ public class ConfigProp {
@Value("${htsrm_oa_venmatsextnew}")
private String htsrm_oa_venmatsextnew;
@Value("${weaver-secondev-htctripmt-appkey}")
private String weaver_secondev_htctripmt_appkey;
}

@ -19,7 +19,9 @@
import com.weaver.seconddev.interfaces.prop.ConfigProp;
import com.weaver.seconddev.interfaces.workflow.action.prop.TestProp;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
@Component
public class OaSrmVendorPropmtionServiceServiceStub extends org.apache.axis2.client.Stub
{
protected org.apache.axis2.description.AxisOperation[] _operations;

@ -18,7 +18,9 @@
import com.weaver.seconddev.interfaces.prop.ConfigProp;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
@Component
public class VdDlvApplyHandlerServiceServiceStub extends org.apache.axis2.client.Stub
{
protected org.apache.axis2.description.AxisOperation[] _operations;

@ -18,7 +18,9 @@
import com.weaver.seconddev.interfaces.prop.ConfigProp;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
@Component
public class VenMatExtHandlerServiceServiceStub extends org.apache.axis2.client.Stub
{
protected org.apache.axis2.description.AxisOperation[] _operations;
@ -111,11 +113,13 @@ public class VenMatExtHandlerServiceServiceStub extends org.apache.axis2.client.
* Default Constructor
*/
//TODO config
// public VenMatExtHandlerServiceServiceStub(org.apache.axis2.context.ConfigurationContext configurationContext) throws org.apache.axis2.AxisFault {
//
public VenMatExtHandlerServiceServiceStub(org.apache.axis2.context.ConfigurationContext configurationContext) throws org.apache.axis2.AxisFault {
// this(configurationContext, Prop.getPropValue("htsrmoasync","SrmVenMatExtnew") );
//
// }
this(configProp.getSrmVenMatExtnew());
}
/**
* Default Constructor
@ -123,6 +127,7 @@ public class VenMatExtHandlerServiceServiceStub extends org.apache.axis2.client.
public VenMatExtHandlerServiceServiceStub() throws org.apache.axis2.AxisFault {
//TODO config
// this(Prop.getPropValue("htsrmoasync","SrmVenMatExtnew") );
this(configProp.getSrmVenMatExtnew());
}

@ -18,7 +18,9 @@
import com.weaver.seconddev.interfaces.prop.ConfigProp;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
@Component
public class VenMatExtsHandlerServiceServiceStub extends org.apache.axis2.client.Stub
{
protected org.apache.axis2.description.AxisOperation[] _operations;
@ -110,11 +112,11 @@ public class VenMatExtsHandlerServiceServiceStub extends org.apache.axis2.client
* Default Constructor
*/
//TODO config
// public VenMatExtsHandlerServiceServiceStub(org.apache.axis2.context.ConfigurationContext configurationContext) throws org.apache.axis2.AxisFault {
//
public VenMatExtsHandlerServiceServiceStub(org.apache.axis2.context.ConfigurationContext configurationContext) throws org.apache.axis2.AxisFault {
// this(configurationContext, Prop.getPropValue("htsrmoasync","htsrm_oa_venmatsextnew") );
//
// }
this(configProp.getHtsrm_oa_venmatsextnew());
}
/**
* Default Constructor
@ -123,6 +125,7 @@ public class VenMatExtsHandlerServiceServiceStub extends org.apache.axis2.client
public VenMatExtsHandlerServiceServiceStub() throws org.apache.axis2.AxisFault {
// this(Prop.getPropValue("htsrmoasync","htsrm_oa_venmatsextnew") );
this(configProp.getHtsrm_oa_venmatsextnew());
}

@ -326,7 +326,7 @@ public class DoTheAction {
// TODO config
// String requestid = WorkflowServicePortTypeProxy.doCreateWorkflowRequest(wri, 1);
String requestid ="";
this.log.info("流程触发:" + requestid);
this.log.info("流程触发:" + requestid);
}
public void qxRw(String mxid, String ksrq, String jsrq) {

@ -115,7 +115,7 @@ public class DoTheActionNew {
while (rs3.next()) {
// id
//TODO config
Long id = (long) rs3.getInt("id");
Long id = Long.parseLong(rs3.getString("id"));
/* TODO :tbr e9:int e10:long
TODO :97 e9:int e10:long
TODO :id e9:int e10:long

Loading…
Cancel
Save