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

secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/oactrip/OaCtrip.java

@@ -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 appKey = configProp.getWeaver_secondev_htctripmt_appkey();
-		String appsecurity = configProp.getAppsecurity();
+		String appsecurity = configProp.getWeaver_secondev_htctripmt_appsecurity();
 
 		TicketResponse ticketResponse = CorpTicketService.getOrderAuditTicket(appKey, appsecurity, "1.0");
 		rtInfo[1] = ticketResponse.getStatus().getMessage();

secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/prop/ConfigProp.java

@@ -31,9 +31,8 @@ public class ConfigProp {
 //    @Value("${appkey}")
 //    private String appkey;
 
-
+    @Value("${weaver-secondev-htctripmt-appsecurity}")
-    @Value("${appsecurity}")
+    private String weaver_secondev_htctripmt_appsecurity;
-    private String 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;
 
 
 }

secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/srmoa/OaSrmVendorPropmtionServiceServiceStub.java

@@ -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;

secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/srmoa/VdDlvApplyHandlerServiceServiceStub.java

@@ -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;

secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/srmoa/VenMatExtHandlerServiceServiceStub.java

@@ -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());
                 
     }
 

secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/srmoa/VenMatExtsHandlerServiceServiceStub.java

@@ -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());
                 
     }
 

secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/DoTheActionNew.java

@@ -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