配置文件修复

flow-app/src/main/resources/application-dev.yml

@@ -10,7 +10,7 @@ spring:
     driver-class-name: com.mysql.cj.jdbc.Driver # mysql驱动包
     #driver-class-name: dm.jdbc.driver.DmDriver # 达梦驱动包
     type: com.zaxxer.hikari.HikariDataSource
-    url: jdbc:mysql://usky-cloud-mysql:13307/flow?characterEncoding=utf8&useUnicode=true&serverTimezone=Asia/Shanghai&nullCatalogMeansCurrent=true
+    url: jdbc:mysql://47.111.81.118:13307/flow?characterEncoding=utf8&useUnicode=true&serverTimezone=Asia/Shanghai&nullCatalogMeansCurrent=true
     #url: jdbc:dm://127.0.0.1:30236?compatibleMode=oracle
     username: usky
     password: Yt#75Usky
@@ -36,9 +36,9 @@ spring:
   redis:
     timeout: 10000
     database: 0      #Redis数据库索引（默认为0）
-    host: usky-cloud-redis #Redis服务器地址
+    host: 120.26.164.249 #Redis服务器地址
     port: 6379       #Redis服务器连接端口
-    password: 123456
+#    password: 123456
     lettuce:
       shutdown-timeout: 100ms
       pool:
@@ -100,12 +100,12 @@ flowable:
     enabled: false
 
   # 默认邮箱配置
-  mail:
-    server:
-      host: ${spring.mail.host}
-      username: ${spring.mail.username}
-      password: ${spring.mail.password}
-      default-from: ${spring.mail.username}
+#  mail:
+#    server:
+#      host: ${spring.mail.host}
+#      username: ${spring.mail.username}
+#      password: ${spring.mail.password}
+#      default-from: ${spring.mail.username}
 
 
 mybatis-plus:

flow-app/src/main/resources/application-test.yml

@@ -47,21 +47,21 @@ spring:
         max-idle: 8
         min-idle: 0
 
-  mail:
-    host: smtp.163.com
-    port: 465
-    protocol: smtps
-    default-encoding: UTF-8
-    username: 15606613391@163.com
-    password: WVTAADOTQFDLHUHM
-    test-connection: true
-    properties:
-      mail:
-        smtp:
-          auth: true
-          starttls:
-            enable: true
-            required: true
+#  mail:
+#    host: smtp.163.com
+#    port: 465
+#    protocol: smtps
+#    default-encoding: UTF-8
+#    username: 15606613391@163.com
+#    password: WVTAADOTQFDLHUHM
+#    test-connection: true
+#    properties:
+#      mail:
+#        smtp:
+#          auth: true
+#          starttls:
+#            enable: true
+#            required: true
 
 flowable:
   #关闭定时任务JOB
@@ -100,12 +100,12 @@ flowable:
     enabled: false
 
   # 默认邮箱配置
-  mail:
-    server:
-      host: ${spring.mail.host}
-      username: ${spring.mail.username}
-      password: ${spring.mail.password}
-      default-from: ${spring.mail.username}
+#  mail:
+#    server:
+#      host: ${spring.mail.host}
+#      username: ${spring.mail.username}
+#      password: ${spring.mail.password}
+#      default-from: ${spring.mail.username}
 
 mybatis-plus:
   mapper-locations: classpath*:/mapper/**/*.xml

flow-im/flow-im-biz/src/main/java/com/flow/service/impl/EmailNotificationStrategy.java

@@ -1,32 +1,32 @@
-package com.flow.service.impl;
-
-import com.flow.service.NotificationStrategy;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.mail.SimpleMailMessage;
-import org.springframework.mail.javamail.JavaMailSender;
-import org.springframework.stereotype.Service;
-
-@Service
-public class EmailNotificationStrategy implements NotificationStrategy {
-    @Autowired
-    private JavaMailSender mailSender;
-    @Value("${spring.mail.username}")
-    private String from;
-
-    @Override
-    public void send(String receiver, String subject, String content) {
-        SimpleMailMessage message = new SimpleMailMessage();
-        message.setFrom(this.from);
-        message.setTo(receiver);
-        message.setSubject(subject);
-        message.setText(content);
-        mailSender.send(message);
-    }
-
-
-    @Override
-    public String getType() {
-        return "email";
-    }
-}
+// package com.flow.service.impl;
+//
+// import com.flow.service.NotificationStrategy;
+// import org.springframework.beans.factory.annotation.Autowired;
+// import org.springframework.beans.factory.annotation.Value;
+// import org.springframework.mail.SimpleMailMessage;
+// import org.springframework.mail.javamail.JavaMailSender;
+// import org.springframework.stereotype.Service;
+//
+// @Service
+// public class EmailNotificationStrategy implements NotificationStrategy {
+//     @Autowired
+//     private JavaMailSender mailSender;
+//     @Value("${spring.mail.username}")
+//     private String from;
+//
+//     @Override
+//     public void send(String receiver, String subject, String content) {
+//         SimpleMailMessage message = new SimpleMailMessage();
+//         message.setFrom(this.from);
+//         message.setTo(receiver);
+//         message.setSubject(subject);
+//         message.setText(content);
+//         mailSender.send(message);
+//     }
+//
+//
+//     @Override
+//     public String getType() {
+//         return "email";
+//     }
+// }

flow-im/flow-im-entity/src/main/java/com/flow/entity/ToEmail.java

@@ -1,26 +1,26 @@
-package com.flow.entity;
-
-import lombok.AllArgsConstructor;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-import java.io.Serializable;
-import java.util.List;
-
-@Data
-@NoArgsConstructor
-@AllArgsConstructor
-public class ToEmail implements Serializable {
-    /**
-     * 邮件接收方，可多人
-     */
-    private List<String> tos;
-    /**
-     * 邮件主题
-     */
-    private String subject;
-    /**
-     * 邮件内容
-     */
-    private String content;
-}
+// package com.flow.entity;
+//
+// import lombok.AllArgsConstructor;
+// import lombok.Data;
+// import lombok.NoArgsConstructor;
+//
+// import java.io.Serializable;
+// import java.util.List;
+//
+// @Data
+// @NoArgsConstructor
+// @AllArgsConstructor
+// public class ToEmail implements Serializable {
+//     /**
+//      * 邮件接收方，可多人
+//      */
+//     private List<String> tos;
+//     /**
+//      * 邮件主题
+//      */
+//     private String subject;
+//     /**
+//      * 邮件内容
+//      */
+//     private String content;
+// }

flow-workflow/flow-workflow-biz/src/main/java/com/flow/delegate/MailNotifyDelegate.java

@@ -1,56 +1,56 @@
-package com.flow.delegate;
-
-import com.flow.entity.User;
-import com.flow.flowable.utils.ProcessElementUtil;
-import com.flow.service.UserService;
-import lombok.extern.slf4j.Slf4j;
-import org.flowable.bpmn.model.MultiInstanceLoopCharacteristics;
-import org.flowable.bpmn.model.ServiceTask;
-import org.flowable.common.engine.impl.el.ExpressionManager;
-import org.flowable.engine.delegate.DelegateExecution;
-import org.flowable.engine.delegate.JavaDelegate;
-import org.flowable.engine.impl.cfg.ProcessEngineConfigurationImpl;
-import org.flowable.http.common.impl.ExpressionUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.mail.SimpleMailMessage;
-import org.springframework.mail.javamail.JavaMailSender;
-import org.springframework.stereotype.Component;
-
-import java.util.Objects;
-
-@Slf4j
-@Component
-public class MailNotifyDelegate implements JavaDelegate {
-    @Autowired
-    private UserService userService;
-    @Autowired
-    private JavaMailSender mailSender;
-    @Value("${spring.mail.username}")
-    private String from;
-    @Autowired
-    private ProcessEngineConfigurationImpl processEngineConfiguration;
-
-    @Override
-    public void execute(DelegateExecution execution) {
-        ServiceTask serviceTask = (ServiceTask) execution.getCurrentFlowElement();
-        MultiInstanceLoopCharacteristics loopCharacteristics = serviceTask.getLoopCharacteristics();
-        String receiver = execution.getVariableLocal(loopCharacteristics.getElementVariable(), String.class);
-        ExpressionManager expressionManager = processEngineConfiguration.getExpressionManager();
-        String subject = ProcessElementUtil.getFieldExtensionExpression(serviceTask, "subject");
-        String content = ProcessElementUtil.getFieldExtensionExpression(serviceTask, "content");
-        subject = ExpressionUtils.getStringFromField(expressionManager.createExpression(subject), execution);
-        content = ExpressionUtils.getStringFromField(expressionManager.createExpression(content), execution);
-        User user = userService.getByUsername(receiver);
-        if (Objects.isNull(user)) {
-            return;
-        }
-        log.info("发送邮件：{}", content);
-        SimpleMailMessage message = new SimpleMailMessage();
-        message.setFrom(this.from);
-        message.setTo(user.getEmail());
-        message.setSubject(subject);
-        message.setText(content);
-        mailSender.send(message);
-    }
-}
+// package com.flow.delegate;
+//
+// import com.flow.entity.User;
+// import com.flow.flowable.utils.ProcessElementUtil;
+// import com.flow.service.UserService;
+// import lombok.extern.slf4j.Slf4j;
+// import org.flowable.bpmn.model.MultiInstanceLoopCharacteristics;
+// import org.flowable.bpmn.model.ServiceTask;
+// import org.flowable.common.engine.impl.el.ExpressionManager;
+// import org.flowable.engine.delegate.DelegateExecution;
+// import org.flowable.engine.delegate.JavaDelegate;
+// import org.flowable.engine.impl.cfg.ProcessEngineConfigurationImpl;
+// import org.flowable.http.common.impl.ExpressionUtils;
+// import org.springframework.beans.factory.annotation.Autowired;
+// import org.springframework.beans.factory.annotation.Value;
+// import org.springframework.mail.SimpleMailMessage;
+// import org.springframework.mail.javamail.JavaMailSender;
+// import org.springframework.stereotype.Component;
+//
+// import java.util.Objects;
+//
+// @Slf4j
+// @Component
+// public class MailNotifyDelegate implements JavaDelegate {
+//     @Autowired
+//     private UserService userService;
+//     @Autowired
+//     private JavaMailSender mailSender;
+//     @Value("${spring.mail.username}")
+//     private String from;
+//     @Autowired
+//     private ProcessEngineConfigurationImpl processEngineConfiguration;
+//
+//     @Override
+//     public void execute(DelegateExecution execution) {
+//         ServiceTask serviceTask = (ServiceTask) execution.getCurrentFlowElement();
+//         MultiInstanceLoopCharacteristics loopCharacteristics = serviceTask.getLoopCharacteristics();
+//         String receiver = execution.getVariableLocal(loopCharacteristics.getElementVariable(), String.class);
+//         ExpressionManager expressionManager = processEngineConfiguration.getExpressionManager();
+//         String subject = ProcessElementUtil.getFieldExtensionExpression(serviceTask, "subject");
+//         String content = ProcessElementUtil.getFieldExtensionExpression(serviceTask, "content");
+//         subject = ExpressionUtils.getStringFromField(expressionManager.createExpression(subject), execution);
+//         content = ExpressionUtils.getStringFromField(expressionManager.createExpression(content), execution);
+//         User user = userService.getByUsername(receiver);
+//         if (Objects.isNull(user)) {
+//             return;
+//         }
+//         log.info("发送邮件：{}", content);
+//         SimpleMailMessage message = new SimpleMailMessage();
+//         message.setFrom(this.from);
+//         message.setTo(user.getEmail());
+//         message.setSubject(subject);
+//         message.setText(content);
+//         mailSender.send(message);
+//     }
+// }

flow-workflow/flow-workflow-biz/src/main/java/com/flow/delegate/NotifyDelegate.java

@@ -17,8 +17,8 @@ import org.springframework.stereotype.Component;
 public class NotifyDelegate implements JavaDelegate {
     @Autowired
     private SiteNotifyDelegate siteNotifyDelegate;
-    @Autowired
-    private MailNotifyDelegate mailNotifyDelegate;
+    // @Autowired
+    // private MailNotifyDelegate mailNotifyDelegate;
 
     @Override
     public void execute(DelegateExecution execution) {
@@ -37,7 +37,7 @@ public class NotifyDelegate implements JavaDelegate {
                     break;
                 case EMAIL:
                     // 邮件通知
-                    mailNotifyDelegate.execute(execution);
+                    //mailNotifyDelegate.execute(execution);
                     break;
                 default:
                     break;