|  | @@ -1,5 +1,6 @@
 | 
	
		
			
				|  |  |  package com.ym.mec.web.controller;
 | 
	
		
			
				|  |  |  
 | 
	
		
			
				|  |  | +import com.alibaba.fastjson.JSONObject;
 | 
	
		
			
				|  |  |  import com.huifu.adapay.Adapay;
 | 
	
		
			
				|  |  |  import com.huifu.adapay.model.MerConfig;
 | 
	
		
			
				|  |  |  import com.ym.mec.biz.service.HfMerchantConfigService;
 | 
	
	
		
			
				|  | @@ -10,6 +11,8 @@ import com.ym.mec.common.page.QueryInfo;
 | 
	
		
			
				|  |  |  import com.ym.mec.thirdparty.adapay.entity.HfMerchantConfig;
 | 
	
		
			
				|  |  |  import io.swagger.annotations.ApiOperation;
 | 
	
		
			
				|  |  |  import io.swagger.annotations.ApiParam;
 | 
	
		
			
				|  |  | +import org.slf4j.Logger;
 | 
	
		
			
				|  |  | +import org.slf4j.LoggerFactory;
 | 
	
		
			
				|  |  |  import org.springframework.web.bind.annotation.*;
 | 
	
		
			
				|  |  |  
 | 
	
		
			
				|  |  |  import javax.annotation.Resource;
 | 
	
	
		
			
				|  | @@ -23,6 +26,7 @@ import javax.annotation.Resource;
 | 
	
		
			
				|  |  |  @RestController
 | 
	
		
			
				|  |  |  @RequestMapping("/hfMerchantConfig")
 | 
	
		
			
				|  |  |  public class HfMerchantConfigController extends BaseController {
 | 
	
		
			
				|  |  | +    private static final Logger log = LoggerFactory.getLogger(HfMerchantConfigController.class);
 | 
	
		
			
				|  |  |      /**
 | 
	
		
			
				|  |  |       * 服务对象
 | 
	
		
			
				|  |  |       */
 | 
	
	
		
			
				|  | @@ -39,6 +43,8 @@ public class HfMerchantConfigController extends BaseController {
 | 
	
		
			
				|  |  |              merConfig.setApiMockKey(dto.getMockApiKey());
 | 
	
		
			
				|  |  |              merConfig.setRSAPrivateKey(dto.getRsaPrivateKey());
 | 
	
		
			
				|  |  |              Adapay.addMerConfig(merConfig, dto.getMerKey());
 | 
	
		
			
				|  |  | +            MerConfig config = Adapay.getConfig(dto.getMerKey());
 | 
	
		
			
				|  |  | +            log.info("HfMerchantConfig in config:{}", JSONObject.toJSONString(config));
 | 
	
		
			
				|  |  |              return succeed();
 | 
	
		
			
				|  |  |          }
 | 
	
		
			
				|  |  |          return failed("添加失败");
 | 
	
	
		
			
				|  | @@ -54,6 +60,8 @@ public class HfMerchantConfigController extends BaseController {
 | 
	
		
			
				|  |  |              merConfig.setApiMockKey(dto.getMockApiKey());
 | 
	
		
			
				|  |  |              merConfig.setRSAPrivateKey(dto.getRsaPrivateKey());
 | 
	
		
			
				|  |  |              Adapay.addMerConfig(merConfig, dto.getMerKey());
 | 
	
		
			
				|  |  | +            MerConfig config = Adapay.getConfig(dto.getMerKey());
 | 
	
		
			
				|  |  | +            log.info("HfMerchantConfig up config:{}", JSONObject.toJSONString(config));
 | 
	
		
			
				|  |  |              return succeed();
 | 
	
		
			
				|  |  |          }
 | 
	
		
			
				|  |  |          return failed("修改失败");
 |