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

secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/k3/GiftQtyService.java

@@ -21,9 +21,10 @@ public class GiftQtyService extends BaseBean {
 	private ConfigProp configProp;
 	public Map<String, String> call(ArrayOfGiftStockDt param) {
 //		String url = Util.null2String(I18nContextUtil.getBean(Environment.class).getProperty("htk3oasync.lplysl_url")).trim();
+		logger_a44d19bf.info(String.valueOf("param" + param.toString()));
 		String url = configProp.getLplysl_url();
 		logger_a44d19bf.info(String.valueOf("configProp htk3oasync.lplysl_url" + url));
-		logger_a44d19bf.info(String.valueOf("param" + param.toString()));
+
 		Map<String, String> map = new HashMap<String, String>();
 		try {
 			logger_a44d19bf.info(String.valueOf("GiftQtyService--start"));

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

@@ -9,6 +9,7 @@ import com.weaver.ebuilder.form.client.ebform.data.EbFormDataDubboService;
 import com.weaver.esb.api.rpc.EsbServerlessRpcRemoteInterface;
 import com.weaver.framework.client.annotation.WeaverConfigCenter;
 import com.weaver.framework.rpc.annotation.RpcReference;
+import com.weaver.seconddev.interfaces.prop.ConfigProp;
 import com.weaver.seconddev.interfaces.workflow.action.prop.TestProp;
 import com.weaver.seconddev.interfaces.workflow.util.CommonDevUtil;
 import com.weaver.teams.domain.user.SimpleEmployee;
@@ -44,6 +45,8 @@ public class CustomTeAction extends BaseBean implements Action, EsbServerlessRpc
     @Autowired
     private TestProp testProp;
 
+    @Autowired
+    private ConfigProp configProp;
     @RpcReference(group = "ebuilderform")
     private EbFormDataDubboService ebFormDataDubboService;
 
@@ -55,7 +58,8 @@ public class CustomTeAction extends BaseBean implements Action, EsbServerlessRpc
     @Override
     public WeaResult<Map<String, Object>> execute(Map<String, Object> params) {
         logger.error("start CustomTeAction");
-        logger.error("srmbacklisturl == " + testProp.getSrmbacklisturl());
+        logger.error("srmbacklisturl == " + configProp.getSrmbacklisturl());
+        logger.error("Lplysl_url == " + configProp.getLplysl_url());
         logger.error("basePackage == " + basePackage);
         logger.error("params = " + JSON.toJSONString(params));