From 8fed82d72b082f374f275fc98e60b86eb8c6817f Mon Sep 17 00:00:00 2001 From: xhxu Date: Thu, 24 Aug 2023 16:01:41 +0800 Subject: [PATCH] // --- .../main/java/com/iformall/controller/BaiduController.java | 1 + .../java/com/iformall/controller/MiniAppUserController.java | 3 +-- .../com/iformall/controller/UserBasicImageController.java | 6 ++++-- .../controller/UserDigitalAvatarPhotoController.java | 2 +- .../com/iformall/domain/po/sm/UserDigitalAvatarOrder.java | 1 + suimangService/src/main/java/com/iformall/utils/MaUtil.java | 4 ++-- 6 files changed, 10 insertions(+), 7 deletions(-) diff --git a/suimangCApi/src/main/java/com/iformall/controller/BaiduController.java b/suimangCApi/src/main/java/com/iformall/controller/BaiduController.java index 3419d7f..8a68a7b 100644 --- a/suimangCApi/src/main/java/com/iformall/controller/BaiduController.java +++ b/suimangCApi/src/main/java/com/iformall/controller/BaiduController.java @@ -31,6 +31,7 @@ public class BaiduController extends BaseController { private final Logger logger = LoggerFactory.getLogger(this.getClass()); + @AuthIgnore @ApiOperation("百度图片审核接口") @PostMapping(value = "checkPhoto", consumes = "multipart/*", headers = "content-type=multipart/form-data") @ApiImplicitParam(name = "file", value = "file", dataType = "MultipartFile", paramType = "query", required = true) diff --git a/suimangCApi/src/main/java/com/iformall/controller/MiniAppUserController.java b/suimangCApi/src/main/java/com/iformall/controller/MiniAppUserController.java index c163d71..600c73e 100644 --- a/suimangCApi/src/main/java/com/iformall/controller/MiniAppUserController.java +++ b/suimangCApi/src/main/java/com/iformall/controller/MiniAppUserController.java @@ -211,7 +211,6 @@ public class MiniAppUserController extends BaseController { } - Map resultMap = new HashMap(); try { @@ -221,7 +220,7 @@ public class MiniAppUserController extends BaseController { } // logger.info("ceshi "+user.getAppPlat()+"======"+user.getClass()); // 解密 并注册 - WxCUserBasicInfo basicInfo = cuserFactory.getCUserService(user.getAppPlat()).decryptPhoneNoInfo(encryptedData, iv, user, wxAppinfo, false,from); + WxCUserBasicInfo basicInfo = cuserFactory.getCUserService(appPlat).decryptPhoneNoInfo(encryptedData, iv, user, wxAppinfo, false,from); wxCUserBasicInfoService.handleLoginUser(basicInfo); resultMap.put("token", basicInfo.getToken()); diff --git a/suimangCApi/src/main/java/com/iformall/controller/UserBasicImageController.java b/suimangCApi/src/main/java/com/iformall/controller/UserBasicImageController.java index eadcee8..f5c0844 100644 --- a/suimangCApi/src/main/java/com/iformall/controller/UserBasicImageController.java +++ b/suimangCApi/src/main/java/com/iformall/controller/UserBasicImageController.java @@ -14,6 +14,7 @@ import com.iformall.service.ProductService; import com.iformall.service.UserBasicImageService; import com.iformall.sm.AiCheckPhotoParam; import com.iformall.sm.AiCheckPhotoResult; +import com.iformall.sm.AiDigitalAvatarHelper; import com.iformall.sm.AiVideoHelper; import com.iformall.utils.Base64Util; import io.swagger.annotations.Api; @@ -58,11 +59,12 @@ public class UserBasicImageController extends BaseController { return new ResultData(); } + @AuthIgnore @ApiOperation("图片人脸检测") @PostMapping(value = "checkPhoto", consumes = "multipart/*", headers = "content-type=multipart/form-data") @ApiImplicitParam(name = "file", value = "file", dataType = "MultipartFile", paramType = "query", required = true) public ResultData checkPhoto(@RequestPart("file") MultipartFile file) { - logger.debug("[" + getIpAddr() + "] PersonPhotoController::checkPhoto"); + logger.debug("[" + getIpAddr() + "] UserBasicImageController::checkPhoto"); if (ObjectUtils.isEmpty(file) || file.getSize() <= 0) { return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(), "素材为空"); } @@ -71,7 +73,7 @@ public class UserBasicImageController extends BaseController { String imgStr = Base64Util.encode(fileBytes); AiCheckPhotoParam param = new AiCheckPhotoParam(); param.setImg(imgStr); - AiCheckPhotoResult result = AiVideoHelper.checkPhoto(param); + AiCheckPhotoResult result = AiDigitalAvatarHelper.checkPhoto(param); if (result.isSuccess()) { return new ResultData(); } diff --git a/suimangCApi/src/main/java/com/iformall/controller/UserDigitalAvatarPhotoController.java b/suimangCApi/src/main/java/com/iformall/controller/UserDigitalAvatarPhotoController.java index e74eb7f..2a0f878 100644 --- a/suimangCApi/src/main/java/com/iformall/controller/UserDigitalAvatarPhotoController.java +++ b/suimangCApi/src/main/java/com/iformall/controller/UserDigitalAvatarPhotoController.java @@ -139,7 +139,7 @@ public class UserDigitalAvatarPhotoController extends BaseController { return userDigitalAvatarPhotoService.createPhotoSupper(userDigitalAvatarPhoto); } - @ApiOperation("获取视频是否生成成功") + @ApiOperation("获取照片是否超分成功") @GetMapping("/getPhoto") @ApiImplicitParam(name = "id", value = "id", dataType = "Long", paramType = "query", required = true) public ResultData getPhoto(Long id) { diff --git a/suimangService/src/main/java/com/iformall/domain/po/sm/UserDigitalAvatarOrder.java b/suimangService/src/main/java/com/iformall/domain/po/sm/UserDigitalAvatarOrder.java index c18e985..9c1ad7a 100644 --- a/suimangService/src/main/java/com/iformall/domain/po/sm/UserDigitalAvatarOrder.java +++ b/suimangService/src/main/java/com/iformall/domain/po/sm/UserDigitalAvatarOrder.java @@ -81,6 +81,7 @@ public class UserDigitalAvatarOrder extends TenantEntity { @io.swagger.annotations.ApiModelProperty(value="更新时间",name="updateDate") private Date updateDate; + @TableField(exist = false) private List photoList; } diff --git a/suimangService/src/main/java/com/iformall/utils/MaUtil.java b/suimangService/src/main/java/com/iformall/utils/MaUtil.java index 599e1b1..1a3092e 100644 --- a/suimangService/src/main/java/com/iformall/utils/MaUtil.java +++ b/suimangService/src/main/java/com/iformall/utils/MaUtil.java @@ -128,8 +128,8 @@ public class MaUtil { config.setAppId(appinfo.getAppId()); config.setMchId(payAccount.getSubMchId()); config.setMchKey(payAccount.getMerchantApiKey()); - config.setSubAppId(appinfo.getAppId()); - config.setSubMchId(payAccount.getSubMchId()); +// config.setSubAppId(appinfo.getAppId()); +// config.setSubMchId(payAccount.getSubMchId()); config.setKeyPath(payAccount.getMerchantCertPath()); config.setPrivateKeyPath(payAccount.getMerchantKeyPath()); config.setPrivateCertPath(payAccount.getMerchantCertPemPath());