2 커밋

5개의 변경된 파일6개의 추가작업 그리고 28개의 파일을 삭제
분할 보기
  1. +0
    -22
      suimangCApi/src/main/java/com/iformall/controller/ProductOrderController.java
  2. +2
    -2
      suimangCApi/src/main/resources/application-dev.yml
  3. +1
    -1
      suimangCApi/src/main/resources/application-prod.yml
  4. +2
    -2
      suimangSchedule/src/main/resources/application-dev.yml
  5. +1
    -1
      suimangSchedule/src/main/resources/application-prod.yml

+ 0
- 22
suimangCApi/src/main/java/com/iformall/controller/ProductOrderController.java 파일 보기

@@ -1,31 +1,15 @@
package com.iformall.controller;

import com.github.pagehelper.PageInfo;
import com.iformall.annotation.AuthIgnore;
import com.iformall.annotation.TenantIgnore;
import com.iformall.common.ErrorCode;
import com.iformall.common.Result;
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.base.BaseEntity;
import com.iformall.domain.po.sm.PersonPhoto;
import com.iformall.enums.*;
import com.iformall.exception.MallinkException;
import com.iformall.service.*;
import com.iformall.service.pay.PayServiceFactory;
import com.iformall.service.pay.entity.PayExtraParam;
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.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
import org.apache.commons.lang3.StringUtils;
import org.slf4j.Logger;
@@ -33,12 +17,6 @@ import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
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
@RequestMapping("/api/productOrder")


+ 2
- 2
suimangCApi/src/main/resources/application-dev.yml 파일 보기

@@ -192,6 +192,6 @@ suimang:
oral_broadcasting: http://111.198.0.15:22266
photo_speak: http://111.198.0.15:22299
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
callbackUrl: https://test.metavatar.cc/C
callbackUrl: https://mtest.metavatar.cc/C

+ 1
- 1
suimangCApi/src/main/resources/application-prod.yml 파일 보기

@@ -147,6 +147,6 @@ suimang:
oral_broadcasting: http://111.198.0.15:22266
photo_speak: http://111.198.0.15:22299
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
callbackUrl: https://metavatar.cc/C

+ 2
- 2
suimangSchedule/src/main/resources/application-dev.yml 파일 보기

@@ -195,6 +195,6 @@ suimang:
oral_broadcasting: http://nas.pucao.cn:2001
photo_speak: http://111.198.0.15:22299
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
callbackUrl: https://test.metavatar.cc/C
callbackUrl: https://mtest.metavatar.cc/C

+ 1
- 1
suimangSchedule/src/main/resources/application-prod.yml 파일 보기

@@ -151,6 +151,6 @@ suimang:
oral_broadcasting: http://111.198.0.15:22266
photo_speak: http://111.198.0.15:22299
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
callbackUrl: https://metavatar.cc/C

불러오는 중...
취소
저장