Merge remote-tracking branch 'origin/master'

cms/src/main/resources/application.yml

@@ -5,6 +5,8 @@ eureka:
   client:
     serviceUrl:
       defaultZone: http://admin:admin123@localhost:8761/eureka/eureka/
+    instance: 
+      lease-renewal-interval-in-seconds: 5
 
 spring:
   application:

mec-auth/mec-auth-server/pom.xml

@@ -70,11 +70,17 @@
 			<artifactId>kaptcha</artifactId>
 			<version>2.3.2</version>
 		</dependency>
+		
         <dependency>
             <groupId>com.ym</groupId>
             <artifactId>mec-client-api</artifactId>
         </dependency>
 
+			<dependency>
+				<groupId>org.apache.commons</groupId>
+				<artifactId>commons-pool2</artifactId>
+			</dependency>
+
     </dependencies>
 	
 	<build>

mec-auth/mec-auth-server/src/main/resources/application.yml

@@ -5,6 +5,8 @@ eureka:
   client:
     serviceUrl:
       defaultZone: http://admin:admin123@localhost:8761/eureka/eureka/
+    instance: 
+      lease-renewal-interval-in-seconds: 5
 
 spring:
   application:
@@ -39,15 +41,16 @@ spring:
     database: 0
     #连接超时时间（毫秒）
     timeout: 10000
-    pool:
-      #连接池最大连接数（使用负值表示没有限制）
-      max-active: 10
-      #连接池最大阻塞等待时间（使用负值表示没有限制）
-      max-wait: -1
-      #连接池中的最大空闲连接
-      max-idle: 10
-      #连接池中的最小空闲连接
-      min-idle: 0
+    lettuce:
+      pool:
+        #连接池最大连接数（使用负值表示没有限制）
+        max-active: 10
+        #连接池最大阻塞等待时间（使用负值表示没有限制）
+        max-wait: -1
+        #连接池中的最大空闲连接
+        max-idle: 10
+        #连接池中的最小空闲连接
+        min-idle: 0
 
 mybatis:
     mapperLocations: classpath:config/mybatis/*.xml

mec-gateway/mec-gateway-web/src/main/resources/application.yml

@@ -7,8 +7,11 @@ spring:
 
 eureka:
   client:
+    registry-fetch-interval-seconds: 5
     serviceUrl:
       defaultZone: http://admin:admin123@localhost:8761/eureka/eureka/
+    instance: 
+      lease-renewal-interval-in-seconds: 5
 
 ribbon:
   eureka:

mec-monitor/src/main/resources/application.yml

@@ -6,6 +6,8 @@ eureka:
     serviceUrl:
       ###配置中心的  用户名:密码@主机ip:端口/应用上下文/地址
       defaultZone: http://admin:admin123@localhost:8761/eureka/eureka/
+    instance: 
+      lease-renewal-interval-in-seconds: 5
 
 spring:
   application:

mec-student/src/main/resources/application.yml

@@ -5,6 +5,8 @@ eureka:
   client:
     serviceUrl:
       defaultZone: http://admin:admin123@localhost:8761/eureka/eureka/
+    instance: 
+      lease-renewal-interval-in-seconds: 5
 
 spring:
   application:

mec-task/src/main/resources/application.yml

@@ -5,6 +5,8 @@ eureka:
   client:
     serviceUrl:
       defaultZone: http://admin:admin123@localhost:8761/eureka/eureka/
+    instance: 
+      lease-renewal-interval-in-seconds: 5
 
 spring:
   application:

mec-teacher/src/main/resources/application.yml

@@ -5,6 +5,8 @@ eureka:
   client:
     serviceUrl:
       defaultZone: http://admin:admin123@localhost:8761/eureka/eureka/
+    instance: 
+      lease-renewal-interval-in-seconds: 5
 
 spring:
   application:

mec-web/src/main/resources/application.yml

@@ -5,6 +5,8 @@ eureka:
   client:
     serviceUrl:
       defaultZone: http://admin:admin123@localhost:8761/eureka/eureka/
+    instance: 
+      lease-renewal-interval-in-seconds: 5
 
 spring:
   servlet:

mec-workflow/src/main/java/com/ym/mec/workfow/controller/flow/OrderController.java

@@ -60,7 +60,7 @@ public class OrderController extends BaseController {
 		return succeed();
 	}
 
-	@GetMapping(value = "json")
+	@GetMapping(value = "detail")
 	@ResponseBody
 	public Object json(String processId, String orderId) {
 		Process process = snakerEngine.process().getProcessById(processId);

mec-workflow/src/main/resources/application.yml

@@ -5,6 +5,8 @@ eureka:
   client:
     serviceUrl:
       defaultZone: http://admin:admin123@localhost:8761/eureka/eureka/
+    instance: 
+      lease-renewal-interval-in-seconds: 5
 
 spring:
   application:

mec-workflow/src/main/resources/flows/leave.snaker

@@ -4,17 +4,17 @@
 <transition g="" name="transition1" offset="0,0" to="apply"/>
 </start>
 <end displayName="end1" layout="570,124,-1,-1" name="end1"/>
-<task assignee="${applyer}" displayName="请假申请" layout="117,122,-1,-1" name="apply" performType="ANY">
+<task assignee="applyer" displayName="请假申请" layout="117,122,-1,-1" name="apply" performType="ANY">
 <transition g="" name="transition2" offset="0,0" to="approveDept"/>
 </task>
-<task assignee="${deptManager}" displayName="部门经理审批" layout="272,122,-1,-1" name="approveDept" performType="ANY">
+<task assignee="deptManager" displayName="部门经理审批" layout="272,122,-1,-1" name="approveDept" performType="ANY">
 <transition g="" name="transition3" offset="0,0" to="decision1"/>
 </task>
 <decision displayName="decision1" layout="426,124,-1,-1" name="decision1">
-<transition displayName="&lt;=5天" expr="${days &lt;= 5}" g="" name="transition4" offset="0,0" to="end1"/>
-<transition displayName="&gt;5天" expr="${days &gt; 5}" g="" name="transition5" offset="0,0" to="approveBoss"/>
+<transition displayName="&lt;=5天" expr="${days} &lt;= 5" g="" name="transition4" offset="0,0" to="end1"/>
+<transition displayName="&gt;5天" expr="${days} &gt; 5" g="" name="transition5" offset="0,0" to="approveBoss"/>
 </decision>
-<task assignee="${boss}" displayName="总经理审批" layout="404,231,-1,-1" name="approveBoss" performType="ANY">
+<task assignee="boss" displayName="总经理审批" layout="404,231,-1,-1" name="approveBoss" performType="ANY">
 <transition g="" name="transition6" offset="0,0" to="end1"/>
 </task>
 </process>

mec-zipkin/src/main/resources/application.yml

@@ -5,6 +5,8 @@ eureka:
   client:
     serviceUrl:
       defaultZone: http://admin:admin123@localhost:8761/eureka/eureka/
+    instance: 
+      lease-renewal-interval-in-seconds: 5
 
 spring:
   application:

pom.xml

@@ -68,7 +68,7 @@
 			<dependency>
 				<groupId>com.ym</groupId>
 				<artifactId>mec-client-api</artifactId>
-					<version>1.0</version>
+				<version>1.0</version>
 			</dependency>
 
 			<dependency>
@@ -177,6 +177,12 @@
 				<version>${google.zxing.version}</version>
 			</dependency>
 
+			<dependency>
+				<groupId>org.apache.commons</groupId>
+				<artifactId>commons-pool2</artifactId>
+				<version>2.6.2</version>
+			</dependency>
+
 		</dependencies>
 	</dependencyManagement>
 
@@ -228,12 +234,12 @@
 			<groupId>org.springframework.boot</groupId>
 			<artifactId>spring-boot-starter-web</artifactId>
 		</dependency>
-		
+
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
 			<artifactId>spring-boot-starter-actuator</artifactId>
 		</dependency>
-		
+
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
 			<artifactId>spring-boot-starter-test</artifactId>

workflowy/src/main/java/org/snaker/SnakerFlowyApplication.java

@@ -5,10 +5,13 @@ import javax.sql.DataSource;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.boot.autoconfigure.jdbc.DataSourceProperties;
+import org.springframework.boot.autoconfigure.transaction.TransactionManagerCustomizers;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.ComponentScan;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.jdbc.core.JdbcTemplate;
+import org.springframework.jdbc.datasource.DataSourceTransactionManager;
 
 @SpringBootApplication
 @ComponentScan(basePackages = "org.snaker")
@@ -17,6 +20,8 @@ public class SnakerFlowyApplication {
 
 	@Autowired
 	private DataSource dataSource;
+	
+	private TransactionManagerCustomizers transactionManagerCustomizers;
 
 	public static void main(String[] args) {
 		SpringApplication.run(SnakerFlowyApplication.class, args);
@@ -26,4 +31,13 @@ public class SnakerFlowyApplication {
 	public JdbcTemplate getJdbcTemplate() {
 		return new JdbcTemplate(dataSource);
 	}
+
+	@Bean
+	public DataSourceTransactionManager transactionManager(DataSourceProperties properties) {
+		DataSourceTransactionManager transactionManager = new DataSourceTransactionManager(this.dataSource);
+		if (this.transactionManagerCustomizers != null) {
+			this.transactionManagerCustomizers.customize(transactionManager);
+		}
+		return transactionManager;
+	}
 }

workflowy/src/main/java/org/snaker/engine/model/ProcessModel.java

@@ -22,6 +22,8 @@ import org.snaker.engine.helper.ClassHelper;
 import org.snaker.engine.helper.StringHelper;
 import org.snaker.engine.impl.DefaultNoGenerator;
 
+import com.fasterxml.jackson.annotation.JsonIgnore;
+
 /**
  * 流程定义process元素
  * @author yuqs
@@ -36,6 +38,8 @@ public class ProcessModel extends BaseModel {
 	 * 节点元素集合
 	 */
 	private List<NodeModel> nodes = new ArrayList<NodeModel>();
+	
+	@JsonIgnore
     private List<TaskModel> taskModels = new ArrayList<TaskModel>();
 	/**
 	 * 流程实例启动url

workflowy/src/main/java/org/snaker/engine/model/TaskModel.java

@@ -22,6 +22,8 @@ import org.snaker.engine.helper.ClassHelper;
 import org.snaker.engine.helper.StringHelper;
 import org.snaker.engine.scheduling.JobCallback;
 
+import com.fasterxml.jackson.annotation.JsonIgnore;
+
 import java.util.ArrayList;
 import java.util.List;
 
@@ -246,6 +248,7 @@ public class TaskModel extends WorkModel {
      * @return 模型集合
      * @deprecated
      */
+    @JsonIgnore
     public List<TaskModel> getNextTaskModels() {
         List<TaskModel> models = new ArrayList<TaskModel>();
         for(TransitionModel tm : this.getOutputs()) {