diff --git a/src/main/java/com/chinaunicom/mall/ebtp/extend/crypconfigure/controller/CrypConfigureController.java b/src/main/java/com/chinaunicom/mall/ebtp/extend/crypconfigure/controller/CrypConfigureController.java index ab9ac23..743c569 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/extend/crypconfigure/controller/CrypConfigureController.java +++ b/src/main/java/com/chinaunicom/mall/ebtp/extend/crypconfigure/controller/CrypConfigureController.java @@ -9,6 +9,9 @@ import com.chinaunicom.mall.ebtp.extend.blockchain.entity.BlockChainLogVo; import com.chinaunicom.mall.ebtp.extend.crypconfigure.entity.CrypBean; import com.chinaunicom.mall.ebtp.extend.crypconfigure.entity.CrypConfigure; import com.chinaunicom.mall.ebtp.extend.crypconfigure.service.ICrypConfigureService; +import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.apache.poi.ss.formula.functions.T; import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.PostMapping; @@ -21,8 +24,10 @@ import javax.annotation.Resource; import javax.validation.Valid; import java.util.List; +@Slf4j @RestController @Api(value = "区块链参数配置表") +@RequiredArgsConstructor @RequestMapping("/v1/crypconfigure") public class CrypConfigureController{ @@ -129,8 +134,10 @@ public class CrypConfigureController{ @ApiOperation("调用天擎接口") @PostMapping("/callUniInterfaceJson") public BaseResponse callUniInterfaceJson(@RequestBody CrypBean bean) { - - return BaseResponse.success(this.iCrypConfigureService.callUniInterfaceJson(bean)); + String str = this.iCrypConfigureService.callUniInterfaceJson(bean); + log.info("----调用天擎接口---callUniInterfaceJson-------:"+str); + System.out.println("----调用天擎接口---callUniInterfaceJson-------:"+str); + return BaseResponse.success(str); } /** diff --git a/src/main/java/com/chinaunicom/mall/ebtp/extend/crypconfigure/entity/CrypBean.java b/src/main/java/com/chinaunicom/mall/ebtp/extend/crypconfigure/entity/CrypBean.java index 10a6833..37bb055 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/extend/crypconfigure/entity/CrypBean.java +++ b/src/main/java/com/chinaunicom/mall/ebtp/extend/crypconfigure/entity/CrypBean.java @@ -31,5 +31,15 @@ public class CrypBean { */ @ApiModelProperty(value = "天擎接口地址") public String url; + /** + * 中信支付使用ClientId + */ + @ApiModelProperty(value = "clientId") + public String clientId; + /** + * 中信支付使用OperationCode + */ + @ApiModelProperty(value = "operationCode") + public String operationCode; } diff --git a/src/main/java/com/chinaunicom/mall/ebtp/extend/crypconfigure/service/impl/CrypConfigureServiceImpl.java b/src/main/java/com/chinaunicom/mall/ebtp/extend/crypconfigure/service/impl/CrypConfigureServiceImpl.java index ba1a6a8..80d22ba 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/extend/crypconfigure/service/impl/CrypConfigureServiceImpl.java +++ b/src/main/java/com/chinaunicom/mall/ebtp/extend/crypconfigure/service/impl/CrypConfigureServiceImpl.java @@ -28,6 +28,7 @@ import com.chinaunicom.mall.ebtp.extend.crypconfigure.dao.CrypConfigureMapper; import com.chinaunicom.mall.ebtp.extend.crypconfigure.entity.CrypBean; import com.chinaunicom.mall.ebtp.extend.crypconfigure.entity.CrypConfigure; import com.chinaunicom.mall.ebtp.extend.crypconfigure.service.ICrypConfigureService; +import com.chinaunicom.mall.ebtp.extend.crypconfigure.util.SslUtil; import com.chinaunicom.mall.ebtp.extend.uniBss.UniBssUtil; import lombok.extern.slf4j.Slf4j; import org.apache.commons.io.IOUtils; @@ -36,8 +37,9 @@ import org.springframework.beans.factory.annotation.Value; import org.springframework.scheduling.annotation.Async; import org.springframework.stereotype.Service; -import java.io.InputStream; -import java.io.UnsupportedEncodingException; +import java.io.*; +import java.net.HttpURLConnection; +import java.net.URL; import java.text.SimpleDateFormat; import java.util.*; @@ -113,9 +115,10 @@ public class CrypConfigureServiceImpl extends BaseServiceImpl true; + trustAllHttpsCertificates(); + HttpsURLConnection.setDefaultHostnameVerifier(hv); + } +}