diff --git a/src/main/java/com/ai/da/common/enums/ProductEnum.java b/src/main/java/com/ai/da/common/enums/ProductEnum.java index 11237ffe..ec01b9c9 100644 --- a/src/main/java/com/ai/da/common/enums/ProductEnum.java +++ b/src/main/java/com/ai/da/common/enums/ProductEnum.java @@ -13,7 +13,7 @@ public enum ProductEnum { // 月度订阅 MonthlySubscription("AiDA Monthly Subscription", 500L), // 测试 - DailySubscription("AiDA Daily Subscription", 5L), + DailySubscription("AiDA Daily Subscription", 10L), ; /** diff --git a/src/main/java/com/ai/da/common/utils/SendEmailUtil.java b/src/main/java/com/ai/da/common/utils/SendEmailUtil.java index 877f728c..461995a5 100644 --- a/src/main/java/com/ai/da/common/utils/SendEmailUtil.java +++ b/src/main/java/com/ai/da/common/utils/SendEmailUtil.java @@ -827,9 +827,12 @@ public class SendEmailUtil { // private final static Long NEW_MERCHANT_EN = 130721L; // private final static Long NEW_USER_EN = 130722L; // private final static Long NEW_USER_CN = 130723L; - private final static Long NEW_MERCHANT_EN = 135190L; - private final static Long NEW_USER_EN = 135189L; - private final static Long NEW_USER_CN = 135186L; + private final static Long NEW_MERCHANT_EN = 140335L; +// private final static Long NEW_MERCHANT_EN = 135190L; +// private final static Long NEW_USER_EN = 135189L; +// private final static Long NEW_USER_CN = 135186L; + private final static Long NEW_USER_EN = 140316L; + private final static Long NEW_USER_CN = 140317L; private final static Long RENEWAL_MERCHANT_EN = 130724L; private final static Long RENEWAL_USER_EN = 130725L; private final static Long RENEWAL_USER_CN = 130726L; @@ -844,7 +847,7 @@ public class SendEmailUtil { try { String merchantEmail = "kimwong@code-create.com.hk"; String developer = "xupei3360@163.com"; - String[] receiverEmail = {merchantEmail, developer}; + String[] receiverEmail = {/*merchantEmail, */developer}; Credential cred = new Credential(SECRET_ID, SECRET_KEy); // 实例化一个http选项,可选的,没有特殊需求可以跳过 HttpProfile httpProfile = new HttpProfile(); @@ -1014,7 +1017,7 @@ public class SendEmailUtil { req.setFromEmailAddress(SEND_ADDRESS); String merchantEmail = "kimwong@code-create.com.hk"; String developerEmail = "xupei@code-create.com.hk"; - req.setDestination(new String[]{merchantEmail, developerEmail}); + req.setDestination(new String[]{/*merchantEmail, */developerEmail}); Template template = new Template(); req.setSubject("New Credit Purchase Order"); template.setTemplateID(CREDITS_PURCHASE_MERCHANT); diff --git a/src/main/java/com/ai/da/service/impl/CollectionElementServiceImpl.java b/src/main/java/com/ai/da/service/impl/CollectionElementServiceImpl.java index 8635bca0..cd508e42 100644 --- a/src/main/java/com/ai/da/service/impl/CollectionElementServiceImpl.java +++ b/src/main/java/com/ai/da/service/impl/CollectionElementServiceImpl.java @@ -18,7 +18,7 @@ import com.ai.da.model.enums.StyleEnum; import com.ai.da.model.vo.*; import com.ai.da.python.PythonService; import com.ai.da.python.vo.DesignPythonItem; -import com.ai.da.python.vo.ImageSegmentation; +//import com.ai.da.python.vo.ImageSegmentation; import com.ai.da.service.*; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; @@ -971,7 +971,8 @@ public class CollectionElementServiceImpl extends ServiceImpl selectedImageSeg(List files, Long id, String type) { + // todo 图像分割 开发分支代码 暂时以注释形式存在 + /*public List selectedImageSeg(List files, Long id, String type) { Long accountId = UserContext.getUserHolder().getId(); List resp = new ArrayList<>(); List imageDates = new ArrayList<>(); @@ -1061,6 +1062,6 @@ public class CollectionElementServiceImpl extends ServiceImpl