Merge remote-tracking branch 'origin/develop' into develop

pdf-tech-core/src/main/java/cn/kdan/pdf/tech/core/service/impl/VppLicenseCodeServiceImpl.java

@@ -278,12 +278,10 @@ public class VppLicenseCodeServiceImpl implements VppLicenseCodeService {
         // 解绑激活设备
         vppDeviceService.unBindByMemberId(null, Collections.singletonList(vppLicenseCode.getCdkey()));
         // 发送邮件
-        log.info(new Date().toString());
         ThreadPoolSingleUtil.getInstance().excute(() -> {
             String text = String.format(CaptchaActionEnum.CANCEL_LICENSE_ASSIGN.text(), vppMember.getEmail(), products.getName(), products.getName(), user.getEmail()) + CommonConstant.signHtml;
             emailUtils.sendMail(CaptchaActionEnum.CANCEL_LICENSE_ASSIGN.subject(), text, Collections.singletonList(vppMember.getEmail()));
         });
-        log.info(new Date().toString());
     }
 
     @Override

pdf-tech-core/src/main/resources/bootstrap.properties

@@ -1,7 +1,10 @@
 server.servlet.context-path= /pdf-tech
 spring.application.name= pdf-tech
 spring.profiles.active=@spring.profiles.active@
-spring.cloud.nacos.config.server-addr=http://106.55.99.175:8848
+# dev
+#spring.cloud.nacos.config.server-addr=http://106.55.99.175:8848
+# pro
+spring.cloud.nacos.config.server-addr=http://35.188.251.105:28858
 spring.cloud.nacos.config.username=nacos
 spring.cloud.nacos.config.password=Nacos@123!
 spring.cloud.nacos.config.file-extension=yml