v1.3.1

.gitignore

@@ -35,3 +35,5 @@ build/
 local/
 
 .DS_Store
+
+.metadata/

LICENSE.txt

@@ -195,4 +195,28 @@ COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
 IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION 
 WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
+>>> bootstrap table:
+
+(The MIT License)
+
+Copyright (c) 2012-2019 Zhixin Wen <[email protected]>
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
+
 ===============================================================================

NOTICE.txt

@@ -54,3 +54,37 @@ https://github.com/Activiti/Activiti/blob/develop/LICENSE.txt
 
 >>> Joda:
 https://www.joda.org/joda-time/licenses.html
+
+>>> HikariCP:
+https://github.com/brettwooldridge/HikariCP/blob/dev/LICENSE
+
+>>> log4j:
+https://github.com/apache/logging-log4j2/blob/2.x/LICENSE.txt
+
+>>> attoparser:
+https://www.attoparser.org/license.html
+
+>>> tomcat:
+https://github.com/apache/tomcat/blob/main/LICENSE
+
+>>> mybatis:
+https://github.com/mybatis/mybatis-3/blob/master/LICENSE
+
+>>> thymeleaf:
+https://github.com/thymeleaf/thymeleaf/blob/3.1-master/LICENSE.txt
+
+>>> Spring Boot:
+https://github.com/spring-projects/spring-boot/blob/main/LICENSE.txt
+
+>>> unbescapse:
+https://www.unbescape.org/license.html
+
+>>> aspectj:
+https://github.com/eclipse-aspectj/aspectj/blob/master/LICENSE
+
+>>> snakeyml:
+https://github.com/snakeyaml/snakeyaml/blob/master/LICENSE.txt
+
+
+
+

easyflow-flow-bpmn/BPMNDesigner.html

@@ -17,7 +17,7 @@
 <link rel="stylesheet" href="./static/plugins/flow/flow.css" />
 <style>
 body {margin-top: 5px}
-.j-bpmn-pannel-normal {
+.j-bpmn-panel-normal {
 height: 600px}
 </style>
 </head>

easyflow-flow-bpmn/pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <artifactId>easyflow-parent</artifactId>
         <groupId>com.jd.easyflow</groupId>
-        <version>1.3.0</version>
+        <version>1.3.1</version>
     </parent>
     <artifactId>easyflow-flow-bpmn</artifactId>
     <name>easyflow-flow-bpmn</name>

easyflow-flow-bpmn/static/plugins/flow/flow.css

@@ -1,14 +1,14 @@
-/**BPMN pannel*/
-.j-bpmn-pannel {
+/**BPMN panel*/
+.j-bpmn-panel {
     background-color: white
 }
 
-.j-bpmn-pannel-normal {
+.j-bpmn-panel-normal {
     position:relative;
     height:500px;   
 }
 
-.j-bpmn-pannel-fullscreen {
+.j-bpmn-panel-fullscreen {
     position:fixed;
     top:0;
     bottom:0;
@@ -27,8 +27,8 @@
     bottom:0;
 
 }
-/**info pannel*/
-.infoPannel {
+/**info panel*/
+.infoPanel {
     padding:4px;
     position: absolute;
     right: 0;
@@ -39,20 +39,20 @@
     border: 1px solid #ccc;
 }
 
-.infoPannel-up {
+.infoPanel-up {
 	bottom:auto;
 	overflow:hidden;
 }
 
-.infoPannel form {
+.infoPanel form {
 	width:300px;
 }
-.infoPannel .col {
+.infoPanel .col {
     padding-left:0px;
     padding-right: 0px;
 }
 
-.infoPannel textarea.form-control {
+.infoPanel textarea.form-control {
     height:30px;
 }
 

easyflow-flow-bpmn/static/plugins/flow/flow.js

@@ -1,6 +1,6 @@
 (function (J) {
     /**
-     * Define pannel control
+     * Define panel control
      */
     J.FlowControl = function (cfg) {
         /**
@@ -65,31 +65,31 @@
             $flowContainer.find('[name="format"]').change(function() {_self._renderTabs();});
             // Show tab
             this._renderTabs();
-            // Render BPMN pannel
-            await this._renderBpmnPannel();
+            // Render BPMN panel
+            await this._renderBpmnPanel();
             $(function(){
             $flowContainer.find(".bpmnContainer").addClass(" tab-pane");
             });
-            // Render JSON Pannel
-            this._renderJsonPannel();
+            // Render JSON Panel
+            this._renderJsonPanel();
             return this;
         }
         this.init(cfg);
         return this;
     }
 
     /**
-     * Render BPMN Pannel
+     * Render BPMN Panel
      */
-    J.FlowControl.prototype._renderBpmnPannel = function () {
+    J.FlowControl.prototype._renderBpmnPanel = function () {
         var $bpmnContainer = this.$flowContainer.find(".bpmnContainer");
         this.bpmnControl.render($bpmnContainer);
     }
 
     /**
-     * Render JSON Pannel
+     * Render JSON Panel
      */
-    J.FlowControl.prototype._renderJsonPannel = function () {
+    J.FlowControl.prototype._renderJsonPanel = function () {
         this._renderJsonDataContainer();
         var _self = this;
         this.$flowContainer.find(".jsonContainer").find(".j-json-def").click(function () {
@@ -144,7 +144,7 @@
             return;
         }
         var def = JSON.parse(jsonData);
-        // Node pannel
+        // Node panel
         var table = '<table class="table table-striped table-bordered"><thead><tr><th>' + J.msg['flow.id'] + '</th><th>' + J.msg['flow.nodeId'] + '</th><th>' + J.msg['flow.nodeName'] + '</th></tr></thead>';
         var format = this.$flowContainer.find("[name='format']").val();
         ;

easyflow-flow-bpmn/static/plugins/std-common/common.js

@@ -183,18 +183,18 @@ $.fn.jTabs=function(option, extOption) {
             var tabId = (extOption.id).replace(/\./g,"");
             var $tabs = this.find(".nav-tabs");
             var $content = this.find(".tab-content");
-            var pannelId = "pannel_" + tabId;
+            var panelId = "panel_" + tabId;
             if ($("#"+tabId).length==0) {
                 var tabName = extOption.name ? extOption.name : extOption.id;
                 var closeBtn = extOption.closeable!==false ? "<button type='button' class='close'><span>&times;</span></button>":"";
-                $tabs.append("<li class='nav-item'><a class='nav-link' id='" + tabId +"' data-toggle='tab' href='#" + pannelId +  "' role='tab'>"+tabName+closeBtn + "</a></li>");
-                $content.append("<div class='tab-pane' id='" +  pannelId + "' role='tabpanel'></div>");
+                $tabs.append("<li class='nav-item'><a class='nav-link' id='" + tabId +"' data-toggle='tab' href='#" + panelId +  "' role='tab'>"+tabName+closeBtn + "</a></li>");
+                $content.append("<div class='tab-pane' id='" +  panelId + "' role='tabpanel'></div>");
                 // element is jquery type.
                 if (extOption.element != null) {
-                    $("#"+pannelId).append(extOption.element);
+                    $("#"+panelId).append(extOption.element);
                 // ajax url type
                 } else {
-                $("#"+pannelId).load(extOption.url);
+                $("#"+panelId).load(extOption.url);
                 }
             }
             if ($tabs.children(".nav-item").length>1) {
@@ -210,11 +210,11 @@ $.fn.jTabs=function(option, extOption) {
 $(function(){
     $("body").on("click", ".nav-tabs .close", function(){
     var tab = $(this).parent().parent();
-    var pannel = $($(this).parent().attr("href"));
+    var panel = $($(this).parent().attr("href"));
     var tabs = tab.parent();
     var active = $(this).parent().hasClass("active");
     tab.remove();
-    pannel.remove();
+    panel.remove();
     if (active) {
         tabs.find("[role='tab']:eq(0)").tab("show");
     }

easyflow-flow-bpmn/static/plugins/std-common/messages_default.js

@@ -154,7 +154,7 @@ if (!window.J) {
     "bpmn.zoomOut":"Zoom Out",
     "bpmn.fullScreen":"Full Screen",
     "bpmn.node":"Node",
-    "bpmn.infoPannel":"Information Pannel",
+    "bpmn.infoPanel":"Information Panel",
     "bpmn.flowBpmnDefinition":"Flow BPMN Definition",
     "bpmn.renderFlowDiagram":"Render Flow Diagram",
     "bpmn.viewFlowDefinition":"View EasyFlow Definition",

easyflow-flow-bpmn/static/plugins/std-common/messages_zh.js

@@ -142,7 +142,7 @@ $.extend(J.msg, {
     "bpmn.zoomOut":"放大",
     "bpmn.fullScreen":"全屏",
     "bpmn.node":"节点",
-    "bpmn.infoPannel":"信息面板",
+    "bpmn.infoPanel":"信息面板",
     "bpmn.flowBpmnDefinition":"流程BPMN定义",
     "bpmn.renderFlowDiagram":"渲染流程图",
     "bpmn.viewFlowDefinition":"查看EasyFlow定义",

easyflow-flow-extension/pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <artifactId>easyflow-parent</artifactId>
         <groupId>com.jd.easyflow</groupId>
-        <version>1.3.0</version>
+        <version>1.3.1</version>
     </parent>
     <artifactId>easyflow-flow-extension</artifactId>
     <name>easyflow-flow-extension</name>

easyflow-flow/pom.xml

@@ -6,7 +6,7 @@
 	<parent>
 		<artifactId>easyflow-parent</artifactId>
 		<groupId>com.jd.easyflow</groupId>
-		<version>1.3.0</version>
+		<version>1.3.1</version>
 	</parent>
 	<artifactId>easyflow-flow</artifactId>
 	<name>easyflow-flow</name>

easyflow-fsm/pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <artifactId>easyflow-parent</artifactId>
         <groupId>com.jd.easyflow</groupId>
-        <version>1.3.0</version>
+        <version>1.3.1</version>
     </parent>
     <artifactId>easyflow-fsm</artifactId>
     <name>easyflow-fsm</name>

pom.xml

@@ -6,7 +6,7 @@
 
 	<groupId>com.jd.easyflow</groupId>
 	<artifactId>easyflow-parent</artifactId>
-	<version>1.3.0</version>
+	<version>1.3.1</version>
 	<name>easyflow-parent</name>
 	<packaging>pom</packaging>
 	<description>JDEasyFlow is a general flow orchestration component</description>
@@ -23,7 +23,7 @@
 	<properties>
 		<java.version>1.8</java.version>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-		<spring.version>5.3.30</spring.version>
+		<spring.version>5.3.39</spring.version>
 		<logback.version>1.2.13</logback.version>
 		<slf4j.version>1.7.30</slf4j.version>
 		<jackson.version>2.15.3</jackson.version>