Autor | SHA1 | Mensagem | Data |
---|---|---|---|
|
11e81e720b | Merge branch 'photo' of https://git.malls.iformall.com/suimang/suimangServer into photo | 1 ano atrás |
|
a8ca9a090e | //yml | 1 ano atrás |
@@ -1,31 +1,15 @@ | |||||
package com.iformall.controller; | package com.iformall.controller; | ||||
import com.github.pagehelper.PageInfo; | |||||
import com.iformall.annotation.AuthIgnore; | import com.iformall.annotation.AuthIgnore; | ||||
import com.iformall.annotation.TenantIgnore; | |||||
import com.iformall.common.ErrorCode; | import com.iformall.common.ErrorCode; | ||||
import com.iformall.common.Result; | |||||
import com.iformall.common.ResultData; | import com.iformall.common.ResultData; | ||||
import com.iformall.domain.dto.OrderComposeSaveDto; | |||||
import com.iformall.domain.dto.OrderSaveDto; | |||||
import com.iformall.domain.po.*; | import com.iformall.domain.po.*; | ||||
import com.iformall.domain.po.base.BaseEntity; | |||||
import com.iformall.domain.po.sm.PersonPhoto; | |||||
import com.iformall.enums.*; | import com.iformall.enums.*; | ||||
import com.iformall.exception.MallinkException; | |||||
import com.iformall.service.*; | import com.iformall.service.*; | ||||
import com.iformall.service.pay.PayServiceFactory; | import com.iformall.service.pay.PayServiceFactory; | ||||
import com.iformall.service.pay.entity.PayExtraParam; | |||||
import com.iformall.service.pay.service.pay.PayAdapterService; | import com.iformall.service.pay.service.pay.PayAdapterService; | ||||
import com.iformall.sm.AiDigitalAvatarHelper; | |||||
import com.iformall.sm.ShareImgParam; | |||||
import com.iformall.sm.ShareImgResult; | |||||
import com.iformall.utils.Base64Util; | |||||
import com.iformall.utils.Constant; | |||||
import com.iformall.utils.DateUtils; | |||||
import io.swagger.annotations.Api; | import io.swagger.annotations.Api; | ||||
import io.swagger.annotations.ApiImplicitParam; | import io.swagger.annotations.ApiImplicitParam; | ||||
import io.swagger.annotations.ApiImplicitParams; | |||||
import io.swagger.annotations.ApiOperation; | import io.swagger.annotations.ApiOperation; | ||||
import org.apache.commons.lang3.StringUtils; | import org.apache.commons.lang3.StringUtils; | ||||
import org.slf4j.Logger; | import org.slf4j.Logger; | ||||
@@ -33,12 +17,6 @@ import org.slf4j.LoggerFactory; | |||||
import org.springframework.beans.factory.annotation.Autowired; | import org.springframework.beans.factory.annotation.Autowired; | ||||
import org.springframework.web.bind.annotation.*; | import org.springframework.web.bind.annotation.*; | ||||
import javax.servlet.http.HttpServletRequest; | |||||
import java.util.ArrayList; | |||||
import java.util.Date; | |||||
import java.util.List; | |||||
import java.util.Map; | |||||
@RestController | @RestController | ||||
@RequestMapping("/api/productOrder") | @RequestMapping("/api/productOrder") | ||||
@@ -192,6 +192,6 @@ suimang: | |||||
oral_broadcasting: http://111.198.0.15:22266 | oral_broadcasting: http://111.198.0.15:22266 | ||||
photo_speak: http://111.198.0.15:22299 | photo_speak: http://111.198.0.15:22299 | ||||
photo_speak_hy: http://111.198.0.15:22288 | photo_speak_hy: http://111.198.0.15:22288 | ||||
digital_avatar: http://111.198.0.15:22200 | |||||
digital_avatar: http://nas.pucao.cn:2005 | |||||
digital_avatar_hy: http://nas.pucao.cn:2003 | digital_avatar_hy: http://nas.pucao.cn:2003 | ||||
callbackUrl: https://test.metavatar.cc/C | |||||
callbackUrl: https://mtest.metavatar.cc/C |
@@ -147,6 +147,6 @@ suimang: | |||||
oral_broadcasting: http://111.198.0.15:22266 | oral_broadcasting: http://111.198.0.15:22266 | ||||
photo_speak: http://111.198.0.15:22299 | photo_speak: http://111.198.0.15:22299 | ||||
photo_speak_hy: http://111.198.0.15:22288 | photo_speak_hy: http://111.198.0.15:22288 | ||||
digital_avatar: http://111.198.0.15:22200 | |||||
digital_avatar: http://nas.pucao.cn:2005 | |||||
digital_avatar_hy: http://nas.pucao.cn:2003 | digital_avatar_hy: http://nas.pucao.cn:2003 | ||||
callbackUrl: https://metavatar.cc/C | callbackUrl: https://metavatar.cc/C |
@@ -195,6 +195,6 @@ suimang: | |||||
oral_broadcasting: http://nas.pucao.cn:2001 | oral_broadcasting: http://nas.pucao.cn:2001 | ||||
photo_speak: http://111.198.0.15:22299 | photo_speak: http://111.198.0.15:22299 | ||||
photo_speak_hy: http://111.198.0.15:22288 | photo_speak_hy: http://111.198.0.15:22288 | ||||
digital_avatar: http://111.198.0.15:22200 | |||||
digital_avatar: http://nas.pucao.cn:2005 | |||||
digital_avatar_hy: http://nas.pucao.cn:2003 | digital_avatar_hy: http://nas.pucao.cn:2003 | ||||
callbackUrl: https://test.metavatar.cc/C | |||||
callbackUrl: https://mtest.metavatar.cc/C |
@@ -151,6 +151,6 @@ suimang: | |||||
oral_broadcasting: http://111.198.0.15:22266 | oral_broadcasting: http://111.198.0.15:22266 | ||||
photo_speak: http://111.198.0.15:22299 | photo_speak: http://111.198.0.15:22299 | ||||
photo_speak_hy: http://111.198.0.15:22288 | photo_speak_hy: http://111.198.0.15:22288 | ||||
digital_avatar: http://111.198.0.15:22200 | |||||
digital_avatar: http://nas.pucao.cn:2005 | |||||
digital_avatar_hy: http://nas.pucao.cn:2003 | digital_avatar_hy: http://nas.pucao.cn:2003 | ||||
callbackUrl: https://metavatar.cc/C | callbackUrl: https://metavatar.cc/C |