From 139e84ba409723662af51e04b7b2cd81806a8a7f Mon Sep 17 00:00:00 2001 From: rongchao Date: Wed, 27 Nov 2019 10:14:23 +0800 Subject: [PATCH] =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=BA=93=E8=84=9A=E6=9C=AC?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../branch/dev_1118/db/esua_epdc_events.sql | 38 + .../doc/branch/dev_1118/db/esua_epdc_news.sql | 43 + esua-epdc/doc/db/newupdate.sql | 4 +- .../epdc-module/epdc-activiti/db/mysql.sql | 0 .../epdc-module/epdc-activiti/db/oracle.sql | 0 .../epdc-activiti/db/postgresql.sql | 0 .../epdc-activiti/db/sqlserver.sql | 0 .../epdc-activiti-client/pom.xml | 9 +- .../com/elink/esua/epdc/dto/ModelDTO.java | 0 .../epdc-activiti-server/pom.xml | 79 +- .../epdc-activiti-server/processon/demo1.bpmn | 69 -- .../epdc-activiti-server/processon/yishi.bpmn | 50 - .../elink/esua/epdc/ActivitiApplication.java | 8 +- .../esua/epdc/config/ModuleConfigImpl.java | 0 .../esua/epdc/config/ProcessEngineConfig.java | 0 .../elink/esua/epdc/config/SwaggerConfig.java | 0 .../esua/epdc/controller/ActIdController.java | 66 -- .../epdc/controller/ActModelController.java | 92 ++ .../epdc/controller/ActProcessController.java | 18 +- .../epdc/controller/ActRunningController.java | 0 .../esua/epdc/dto/form/ActGroupFormDto.java | 23 - .../esua/epdc/dto/form/ActUserFormDto.java | 23 - .../editor/main/StencilsetRestResource.java | 38 + .../model/ModelEditorJsonRestResource.java | 69 ++ .../editor/model/ModelSaveRestResource.java | 90 ++ .../esua/epdc/exception/ModuleErrorCode.java | 1 + .../elink/esua/epdc/service/ActIdService.java | 45 - .../esua/epdc/service/ActModelService.java | 180 +-- .../esua/epdc/service/ActProcessService.java | 130 +- .../esua/epdc/service/ActRunningService.java | 26 +- .../service/ActWorkflowCommonService.java | 24 - .../epdc/service/impl/ActIdServiceImpl.java | 37 - .../impl/ActWorkflowCommonServiceImpl.java | 50 - .../elink/esua/epdc/utils/ModuleConstant.java | 0 .../src/main/resources/application.yml | 38 +- .../main/resources/i18n/messages.properties | 0 .../resources/i18n/messages_en_US.properties | 0 .../resources/i18n/messages_zh_CN.properties | 0 .../resources/i18n/messages_zh_TW.properties | 0 .../main/resources/i18n/validation.properties | 0 .../i18n/validation_en_US.properties | 0 .../i18n/validation_zh_CN.properties | 0 .../i18n/validation_zh_TW.properties | 0 .../src/main/resources/logback-spring.xml | 0 .../src/main/resources/processes/favicon.ico | Bin 4286 -> 0 bytes .../public/diagram-viewer/images/bg.png | Bin .../diagram-viewer/images/breadcrumbs.png | Bin .../diagram-viewer/images/checker-bg.png | Bin .../images/deployer/blue/message_catch.png | Bin .../images/deployer/business_rule.png | Bin .../images/deployer/error_catch.png | Bin .../images/deployer/error_throw.png | Bin .../diagram-viewer/images/deployer/manual.png | Bin .../images/deployer/message_catch.png | Bin .../images/deployer/message_throw.png | Bin .../images/deployer/receive.png | Bin .../diagram-viewer/images/deployer/script.png | Bin .../diagram-viewer/images/deployer/send.png | Bin .../images/deployer/service.png | Bin .../images/deployer/signal_catch.png | Bin .../images/deployer/signal_throw.png | Bin .../diagram-viewer/images/deployer/timer.png | Bin .../diagram-viewer/images/deployer/user.png | Bin .../public/diagram-viewer/index.html | 0 .../public/diagram-viewer/js/ActivitiRest.js | 0 .../public/diagram-viewer/js/ActivityImpl.js | 0 .../public/diagram-viewer/js/Color.js | 0 .../diagram-viewer/js/LineBreakMeasurer.js | 0 .../public/diagram-viewer/js/Polyline.js | 0 .../diagram-viewer/js/ProcessDiagramCanvas.js | 0 .../js/ProcessDiagramGenerator.js | 0 .../js/jquery/jquery.asyncqueue.js | 0 .../public/diagram-viewer/js/jquery/jquery.js | 0 .../js/jquery/jquery.progressbar.js | 0 .../public/diagram-viewer/js/jstools.js | 0 .../public/diagram-viewer/js/raphael.2.1.1.js | 0 .../public/diagram-viewer/js/raphael.js | 0 .../diagram-viewer/js/raphael_uncompressed.js | 0 .../public/diagram-viewer/js/textlayout.js | 0 .../resources/public/diagram-viewer/style.css | 0 .../resources/public/editor-app/app-cfg.js | 0 .../main/resources/public/editor-app/app.js | 0 .../properties-assignment-controller.js | 0 ...perties-condition-expression-controller.js | 0 .../properties-custom-controllers.js | 0 .../properties-default-controllers.js | 0 .../properties-event-listeners-controller.js | 0 ...operties-execution-listeners-controller.js | 0 .../properties-fields-controller.js | 0 .../properties-form-properties-controller.js | 0 .../properties-in-parameters-controller.js | 0 ...operties-message-definitions-controller.js | 0 .../properties-message-scope-controller.js | 0 .../properties-multiinstance-controller.js | 0 .../properties-out-parameters-controller.js | 0 ...roperties-sequenceflow-order-controller.js | 0 ...roperties-signal-definitions-controller.js | 0 .../properties-signal-scope-controller.js | 0 .../properties-task-listeners-controller.js | 0 .../editor-app/configuration/properties.js | 0 .../assignment-display-template.html | 0 .../properties/assignment-popup.html | 0 .../properties/assignment-write-template.html | 0 .../properties/boolean-property-template.html | 0 ...condition-expression-display-template.html | 0 .../condition-expression-popup.html | 0 .../condition-expression-write-template.html | 0 .../default-value-display-template.html | 0 .../event-listeners-display-template.html | 0 .../properties/event-listeners-popup.html | 0 .../event-listeners-write-template.html | 0 .../execution-listeners-display-template.html | 0 .../properties/execution-listeners-popup.html | 0 .../execution-listeners-write-template.html | 0 .../properties/feedback-popup.html | 0 .../properties/fields-display-template.html | 0 .../properties/fields-popup.html | 0 .../properties/fields-write-template.html | 0 .../form-properties-display-template.html | 0 .../properties/form-properties-popup.html | 0 .../form-properties-write-template.html | 0 .../in-parameters-display-template.html | 0 .../properties/in-parameters-popup.html | 0 .../in-parameters-write-template.html | 0 .../message-definitions-display-template.html | 0 .../properties/message-definitions-popup.html | 0 .../message-definitions-write-template.html | 0 .../message-property-write-template.html | 0 ...multiinstance-property-write-template.html | 0 .../out-parameters-display-template.html | 0 .../properties/out-parameters-popup.html | 0 .../out-parameters-write-template.html | 0 .../sequenceflow-order-display-template.html | 0 .../properties/sequenceflow-order-popup.html | 0 .../sequenceflow-order-write-template.html | 0 .../signal-definitions-display-template.html | 0 .../properties/signal-definitions-popup.html | 0 .../signal-definitions-write-template.html | 0 .../signal-property-write-template.html | 0 .../string-property-write-mode-template.html | 0 ...subprocess-reference-display-template.html | 0 .../subprocess-reference-popup.html | 0 .../subprocess-reference-write-template.html | 0 .../task-listeners-display-template.html | 0 .../properties/task-listeners-popup.html | 0 .../task-listeners-write-template.html | 0 .../configuration/properties/text-popup.html | 0 .../text-property-write-template.html | 0 .../configuration/toolbar-custom-actions.js | 0 .../configuration/toolbar-default-actions.js | 0 .../editor-app/configuration/toolbar.js | 0 .../editor-app/configuration/url-config.js | 0 .../public/editor-app/css/style-common.css | 0 .../public/editor-app/css/style-editor.css | 0 .../resources/public/editor-app/css/style.css | 0 .../public/editor-app/editor-config.js | 0 .../public/editor-app/editor-controller.js | 0 .../public/editor-app/editor-utils.js | 0 .../resources/public/editor-app/editor.html | 0 .../public/editor-app/editor/css/editor.css | 0 .../editor-app/editor/i18n/translation_de.js | 0 .../editor/i18n/translation_en_us.js | 0 .../editor/i18n/translation_signavio_de.js | 0 .../editor/i18n/translation_signavio_en_us.js | 0 .../public/editor-app/editor/oryx.debug.js | 0 .../public/editor-app/editor/oryx.js | 0 .../resources/public/editor-app/eventbus.js | 0 .../fonts/activiti-admin-webfont.eot | Bin .../fonts/activiti-admin-webfont.svg | 0 .../fonts/activiti-admin-webfont.ttf | Bin .../fonts/activiti-admin-webfont.woff | Bin .../fonts/glyphicons-halflings-regular.eot | Bin .../fonts/glyphicons-halflings-regular.svg | 0 .../fonts/glyphicons-halflings-regular.ttf | Bin .../fonts/glyphicons-halflings-regular.woff | Bin .../public/editor-app/header-controller.js | 0 .../resources/public/editor-app/i18n/en.json | 0 .../public/editor-app/images/bpmn-error.png | Bin .../public/editor-app/images/bpmn-warning.png | Bin .../editor-app/images/datadefinition.png | Bin .../public/editor-app/images/delete.png | Bin .../public/editor-app/images/loading.gif | Bin .../public/editor-app/images/logo-2x.png | Bin .../public/editor-app/images/logo.png | Bin .../editor-app/images/nw-handle-dark.gif | Bin .../editor-app/images/se-handle-dark.gif | Bin .../editor-app/images/shapemenu_highlight.png | Bin .../public/editor-app/images/wrench.png | Bin .../angular-cookies.min.js | 0 .../angular-cookies.min.js.map | 0 .../libs/angular-dragdrop.min-1.0.3.js | 0 .../angular-dragdrop.min.js | 0 .../angular-mocks_1.2.13/angular-mocks.js | 0 .../angular-resource.js | 0 .../angular-resource.min.js | 0 .../angular-resource.min.js.map | 0 .../angular-route_1.2.13/angular-route.js | 0 .../angular-route_1.2.13/angular-route.min.js | 0 .../angular-route.min.js.map | 0 .../angular-sanitize.js | 0 .../angular-sanitize.min.js | 0 .../angular-sanitize.min.js.map | 0 .../angular-scroll.min.js | 0 .../angular-strap_2.0.5/angular-strap.min.js | 0 .../angular-strap.tpl.min.js | 0 .../.bower.json | 0 .../angular-translate-loader-static-files.js | 0 ...gular-translate-loader-static-files.min.js | 0 .../.bower.json | 0 .../angular-translate-storage-cookie.js | 0 .../angular-translate-storage-cookie.min.js | 0 .../angular-translate.js | 0 .../angular-translate.min.js | 0 .../angular_1.2.13/angular-animate.min.js | 0 .../libs/angular_1.2.13/angular.min.js | 0 .../daterangepicker-bs3.css | 0 .../daterangepicker.js | 0 .../bootstrap_3.1.1/css/bootstrap-theme.css | 0 .../css/bootstrap-theme.css.map | 0 .../css/bootstrap-theme.min.css | 0 .../libs/bootstrap_3.1.1/css/bootstrap.css | 0 .../bootstrap_3.1.1/css/bootstrap.css.map | 0 .../bootstrap_3.1.1/css/bootstrap.min.css | 0 .../fonts/glyphicons-halflings-regular.eot | Bin .../fonts/glyphicons-halflings-regular.svg | 0 .../fonts/glyphicons-halflings-regular.ttf | Bin .../fonts/glyphicons-halflings-regular.woff | Bin .../libs/bootstrap_3.1.1/js/bootstrap.js | 0 .../libs/bootstrap_3.1.1/js/bootstrap.min.js | 0 .../libs/es5-shim-15.3.4.5/.bower.json | 0 .../libs/es5-shim-15.3.4.5/.gitignore | 0 .../editor-app/libs/es5-shim-15.3.4.5/CHANGES | 0 .../libs/es5-shim-15.3.4.5/CONTRIBUTORS.md | 0 .../editor-app/libs/es5-shim-15.3.4.5/LICENSE | 0 .../libs/es5-shim-15.3.4.5/README.md | 0 .../libs/es5-shim-15.3.4.5/es5-sham.js | 0 .../libs/es5-shim-15.3.4.5/es5-sham.map | 0 .../libs/es5-shim-15.3.4.5/es5-sham.min.js | 0 .../libs/es5-shim-15.3.4.5/es5-shim.js | 0 .../libs/es5-shim-15.3.4.5/es5-shim.map | 0 .../libs/es5-shim-15.3.4.5/es5-shim.min.js | 0 .../libs/es5-shim-15.3.4.5/package.json | 0 .../es5-shim-15.3.4.5/tests/helpers/h-kill.js | 0 .../tests/helpers/h-matchers.js | 0 .../libs/es5-shim-15.3.4.5/tests/helpers/h.js | 0 .../libs/es5-shim-15.3.4.5/tests/index.html | 0 .../es5-shim-15.3.4.5/tests/index.min.html | 0 .../tests/lib/jasmine-html.js | 0 .../es5-shim-15.3.4.5/tests/lib/jasmine.css | 0 .../es5-shim-15.3.4.5/tests/lib/jasmine.js | 0 .../tests/lib/jasmine_favicon.png | Bin .../libs/es5-shim-15.3.4.5/tests/lib/json2.js | 0 .../es5-shim-15.3.4.5/tests/spec/s-array.js | 0 .../es5-shim-15.3.4.5/tests/spec/s-date.js | 0 .../tests/spec/s-function.js | 0 .../es5-shim-15.3.4.5/tests/spec/s-number.js | 0 .../es5-shim-15.3.4.5/tests/spec/s-object.js | 0 .../es5-shim-15.3.4.5/tests/spec/s-string.js | 0 .../libs/jquery-ui-1.10.3.custom.min.js | 0 .../libs/jquery.autogrow-textarea.js | 0 .../editor-app/libs/jquery_1.11.0/jquery.js | 0 .../libs/jquery_1.11.0/jquery.min.js | 0 .../libs/jquery_1.11.0/jquery.min.map | 0 .../editor-app/libs/json3_3.2.6/LICENSE | 0 .../editor-app/libs/json3_3.2.6/lib/json3.js | 0 .../libs/json3_3.2.6/lib/json3.min.js | 0 .../libs/momentjs_2.5.1/momentjs.min.js | 0 .../editor-app/libs/mousetrap-1.4.5.min.js | 0 .../editor-app/libs/ng-grid-2.0.7-min.js | 0 .../editor-app/libs/ng-grid-2.0.7.min.css | 0 .../public/editor-app/libs/path_parser.js | 0 .../public/editor-app/libs/prototype-1.5.1.js | 0 .../editor-app/libs/ui-utils.min-0.0.4.js | 0 .../partials/root-stencil-item-template.html | 0 .../partials/stencil-item-template.html | 0 .../resources/public/editor-app/plugins.xml | 0 .../editor-app/popups/icon-template.html | 0 .../public/editor-app/popups/save-model.html | 0 .../editor-app/popups/select-shape.html | 0 .../editor-app/popups/unsaved-changes.html | 0 .../editor-app/select-shape-controller.js | 0 .../public/editor-app/stencil-controller.js | 0 .../activity/event.subprocess.collapsed.png | Bin .../icons/activity/event.subprocess.png | Bin .../icons/activity/expanded.subprocess.png | Bin .../activity/list/type.business.rule.png | Bin .../icons/activity/list/type.camel.png | Bin .../icons/activity/list/type.manual.png | Bin .../bpmn2.0/icons/activity/list/type.mule.png | Bin .../icons/activity/list/type.receive.png | Bin .../icons/activity/list/type.script.png | Bin .../bpmn2.0/icons/activity/list/type.send.png | Bin .../icons/activity/list/type.service.png | Bin .../icons/activity/list/type.shell.png | Bin .../bpmn2.0/icons/activity/list/type.user.png | Bin .../bpmn2.0/icons/activity/subprocess.png | Bin .../bpmn2.0/icons/activity/task.png | Bin .../icons/artifact/text.annotation.png | Bin .../bpmn2.0/icons/catching/cancel.png | Bin .../bpmn2.0/icons/catching/compensation.png | Bin .../bpmn2.0/icons/catching/error.png | Bin .../bpmn2.0/icons/catching/message.png | Bin .../bpmn2.0/icons/catching/signal.png | Bin .../bpmn2.0/icons/catching/timer.png | Bin .../connector/association.undirected.png | Bin .../connector/association.unidirectional.png | Bin .../bpmn2.0/icons/connector/messageflow.png | Bin .../bpmn2.0/icons/connector/sequenceflow.png | Bin .../bpmn2.0/icons/dataobject/data.store.png | Bin .../stencilsets/bpmn2.0/icons/diagram.png | Bin .../bpmn2.0/icons/endevent/cancel.png | Bin .../bpmn2.0/icons/endevent/error.png | Bin .../bpmn2.0/icons/endevent/none.png | Bin .../bpmn2.0/icons/endevent/terminate.png | Bin .../bpmn2.0/icons/gateway/eventbased.png | Bin .../icons/gateway/exclusive.databased.png | Bin .../bpmn2.0/icons/gateway/inclusive.png | Bin .../bpmn2.0/icons/gateway/parallel.png | Bin .../bpmn2.0/icons/startevent/error.png | Bin .../bpmn2.0/icons/startevent/message.png | Bin .../bpmn2.0/icons/startevent/none.png | Bin .../bpmn2.0/icons/startevent/signal.png | Bin .../bpmn2.0/icons/startevent/timer.png | Bin .../bpmn2.0/icons/swimlane/lane.png | Bin .../bpmn2.0/icons/swimlane/pool.png | Bin .../bpmn2.0/icons/throwing/none.png | Bin .../bpmn2.0/icons/throwing/signal.png | Bin .../public/editor-app/toolbar-controller.js | 0 .../src/main/resources/public/favicon.ico | Bin .../src/main/resources/public/modeler.html | 0 .../src/main/resources/registry.conf | 21 - .../src/main/resources/stencilset.json | 0 .../com/elink/esua/epdc/ActivitiTest.java | 110 -- esua-epdc/epdc-module/epdc-activiti/pom.xml | 28 +- .../epdc-demo/epdc-demo-server/pom.xml | 35 +- .../db/esua_epdc_events.pdman.json | 1051 +++++------------ esua-epdc/pom.xml | 20 +- 337 files changed, 985 insertions(+), 1530 deletions(-) create mode 100644 esua-epdc/doc/branch/dev_1118/db/esua_epdc_news.sql mode change 100644 => 100755 esua-epdc/epdc-module/epdc-activiti/db/mysql.sql mode change 100644 => 100755 esua-epdc/epdc-module/epdc-activiti/db/oracle.sql mode change 100644 => 100755 esua-epdc/epdc-module/epdc-activiti/db/postgresql.sql mode change 100644 => 100755 esua-epdc/epdc-module/epdc-activiti/db/sqlserver.sql mode change 100644 => 100755 esua-epdc/epdc-module/epdc-activiti/epdc-activiti-client/pom.xml mode change 100644 => 100755 esua-epdc/epdc-module/epdc-activiti/epdc-activiti-client/src/main/java/com/elink/esua/epdc/dto/ModelDTO.java mode change 100644 => 100755 esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/pom.xml delete mode 100644 esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/processon/demo1.bpmn delete mode 100644 esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/processon/yishi.bpmn mode change 100644 => 100755 esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/java/com/elink/esua/epdc/ActivitiApplication.java mode change 100644 => 100755 esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/java/com/elink/esua/epdc/config/ModuleConfigImpl.java mode change 100644 => 100755 esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/java/com/elink/esua/epdc/config/ProcessEngineConfig.java mode change 100644 => 100755 esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/java/com/elink/esua/epdc/config/SwaggerConfig.java delete mode 100644 esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/java/com/elink/esua/epdc/controller/ActIdController.java create mode 100755 esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/java/com/elink/esua/epdc/controller/ActModelController.java mode change 100644 => 100755 esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/java/com/elink/esua/epdc/controller/ActProcessController.java mode change 100644 => 100755 esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/java/com/elink/esua/epdc/controller/ActRunningController.java delete mode 100644 esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/java/com/elink/esua/epdc/dto/form/ActGroupFormDto.java delete mode 100644 esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/java/com/elink/esua/epdc/dto/form/ActUserFormDto.java create mode 100755 esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/java/com/elink/esua/epdc/editor/main/StencilsetRestResource.java create mode 100755 esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/java/com/elink/esua/epdc/editor/model/ModelEditorJsonRestResource.java create mode 100755 esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/java/com/elink/esua/epdc/editor/model/ModelSaveRestResource.java mode change 100644 => 100755 esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/java/com/elink/esua/epdc/exception/ModuleErrorCode.java delete mode 100644 esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/java/com/elink/esua/epdc/service/ActIdService.java mode change 100644 => 100755 esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/java/com/elink/esua/epdc/service/ActModelService.java mode change 100644 => 100755 esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/java/com/elink/esua/epdc/service/ActProcessService.java mode change 100644 => 100755 esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/java/com/elink/esua/epdc/service/ActRunningService.java delete mode 100644 esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/java/com/elink/esua/epdc/service/ActWorkflowCommonService.java delete mode 100644 esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/java/com/elink/esua/epdc/service/impl/ActIdServiceImpl.java delete mode 100644 esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/java/com/elink/esua/epdc/service/impl/ActWorkflowCommonServiceImpl.java mode change 100644 => 100755 esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/java/com/elink/esua/epdc/utils/ModuleConstant.java mode change 100644 => 100755 esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/application.yml mode change 100644 => 100755 esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/i18n/messages.properties mode change 100644 => 100755 esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/i18n/messages_en_US.properties mode change 100644 => 100755 esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/i18n/messages_zh_CN.properties mode change 100644 => 100755 esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/i18n/messages_zh_TW.properties mode change 100644 => 100755 esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/i18n/validation.properties mode change 100644 => 100755 esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/i18n/validation_en_US.properties mode change 100644 => 100755 esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/i18n/validation_zh_CN.properties mode change 100644 => 100755 esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/i18n/validation_zh_TW.properties mode change 100644 => 100755 esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/logback-spring.xml delete mode 100644 esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/processes/favicon.ico mode change 100644 => 100755 esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/diagram-viewer/images/bg.png mode change 100644 => 100755 esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/diagram-viewer/images/breadcrumbs.png mode change 100644 => 100755 esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/diagram-viewer/images/checker-bg.png mode change 100644 => 100755 esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/diagram-viewer/images/deployer/blue/message_catch.png mode change 100644 => 100755 esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/diagram-viewer/images/deployer/business_rule.png mode change 100644 => 100755 esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/diagram-viewer/images/deployer/error_catch.png mode change 100644 => 100755 esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/diagram-viewer/images/deployer/error_throw.png mode change 100644 => 100755 esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/diagram-viewer/images/deployer/manual.png mode change 100644 => 100755 esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/diagram-viewer/images/deployer/message_catch.png mode change 100644 => 100755 esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/diagram-viewer/images/deployer/message_throw.png mode change 100644 => 100755 esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/diagram-viewer/images/deployer/receive.png mode change 100644 => 100755 esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/diagram-viewer/images/deployer/script.png mode change 100644 => 100755 esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/diagram-viewer/images/deployer/send.png mode change 100644 => 100755 esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/diagram-viewer/images/deployer/service.png mode change 100644 => 100755 esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/diagram-viewer/images/deployer/signal_catch.png mode change 100644 => 100755 esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/diagram-viewer/images/deployer/signal_throw.png mode change 100644 => 100755 esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/diagram-viewer/images/deployer/timer.png mode change 100644 => 100755 esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/diagram-viewer/images/deployer/user.png mode change 100644 => 100755 esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/diagram-viewer/index.html mode change 100644 => 100755 esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/diagram-viewer/js/ActivitiRest.js mode change 100644 => 100755 esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/diagram-viewer/js/ActivityImpl.js mode change 100644 => 100755 esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/diagram-viewer/js/Color.js mode change 100644 => 100755 esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/diagram-viewer/js/LineBreakMeasurer.js mode change 100644 => 100755 esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/diagram-viewer/js/Polyline.js mode change 100644 => 100755 esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/diagram-viewer/js/ProcessDiagramCanvas.js mode change 100644 => 100755 esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/diagram-viewer/js/ProcessDiagramGenerator.js mode change 100644 => 100755 esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/diagram-viewer/js/jquery/jquery.asyncqueue.js mode change 100644 => 100755 esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/diagram-viewer/js/jquery/jquery.js mode change 100644 => 100755 esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/diagram-viewer/js/jquery/jquery.progressbar.js mode change 100644 => 100755 esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/diagram-viewer/js/jstools.js mode change 100644 => 100755 esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/diagram-viewer/js/raphael.2.1.1.js mode change 100644 => 100755 esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/diagram-viewer/js/raphael.js mode change 100644 => 100755 esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/diagram-viewer/js/raphael_uncompressed.js mode change 100644 => 100755 esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/diagram-viewer/js/textlayout.js mode change 100644 => 100755 esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/diagram-viewer/style.css mode change 100644 => 100755 esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/app-cfg.js mode change 100644 => 100755 esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/app.js mode change 100644 => 100755 esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/configuration/properties-assignment-controller.js mode change 100644 => 100755 esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/configuration/properties-condition-expression-controller.js mode change 100644 => 100755 esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/configuration/properties-custom-controllers.js mode change 100644 => 100755 esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/configuration/properties-default-controllers.js mode change 100644 => 100755 esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/configuration/properties-event-listeners-controller.js mode change 100644 => 100755 esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/configuration/properties-execution-listeners-controller.js mode change 100644 => 100755 esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/configuration/properties-fields-controller.js mode change 100644 => 100755 esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/configuration/properties-form-properties-controller.js mode change 100644 => 100755 esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/configuration/properties-in-parameters-controller.js mode change 100644 => 100755 esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/configuration/properties-message-definitions-controller.js mode change 100644 => 100755 esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/configuration/properties-message-scope-controller.js mode change 100644 => 100755 esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/configuration/properties-multiinstance-controller.js mode change 100644 => 100755 esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/configuration/properties-out-parameters-controller.js mode change 100644 => 100755 esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/configuration/properties-sequenceflow-order-controller.js mode change 100644 => 100755 esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/configuration/properties-signal-definitions-controller.js mode change 100644 => 100755 esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/configuration/properties-signal-scope-controller.js mode change 100644 => 100755 esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/configuration/properties-task-listeners-controller.js mode change 100644 => 100755 esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/configuration/properties.js mode change 100644 => 100755 esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/configuration/properties/assignment-display-template.html mode change 100644 => 100755 esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/configuration/properties/assignment-popup.html mode change 100644 => 100755 esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/configuration/properties/assignment-write-template.html mode change 100644 => 100755 esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/configuration/properties/boolean-property-template.html mode change 100644 => 100755 esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/configuration/properties/condition-expression-display-template.html mode change 100644 => 100755 esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/configuration/properties/condition-expression-popup.html mode change 100644 => 100755 esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/configuration/properties/condition-expression-write-template.html mode change 100644 => 100755 esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/configuration/properties/default-value-display-template.html mode change 100644 => 100755 esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/configuration/properties/event-listeners-display-template.html mode change 100644 => 100755 esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/configuration/properties/event-listeners-popup.html mode change 100644 => 100755 esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/configuration/properties/event-listeners-write-template.html mode change 100644 => 100755 esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/configuration/properties/execution-listeners-display-template.html mode change 100644 => 100755 esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/configuration/properties/execution-listeners-popup.html mode change 100644 => 100755 esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/configuration/properties/execution-listeners-write-template.html mode change 100644 => 100755 esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/configuration/properties/feedback-popup.html mode change 100644 => 100755 esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/configuration/properties/fields-display-template.html mode change 100644 => 100755 esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/configuration/properties/fields-popup.html mode change 100644 => 100755 esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/configuration/properties/fields-write-template.html mode change 100644 => 100755 esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/configuration/properties/form-properties-display-template.html mode change 100644 => 100755 esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/configuration/properties/form-properties-popup.html mode change 100644 => 100755 esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/configuration/properties/form-properties-write-template.html mode change 100644 => 100755 esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/configuration/properties/in-parameters-display-template.html mode change 100644 => 100755 esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/configuration/properties/in-parameters-popup.html mode change 100644 => 100755 esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/configuration/properties/in-parameters-write-template.html mode change 100644 => 100755 esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/configuration/properties/message-definitions-display-template.html mode change 100644 => 100755 esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/configuration/properties/message-definitions-popup.html mode change 100644 => 100755 esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/configuration/properties/message-definitions-write-template.html mode change 100644 => 100755 esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/configuration/properties/message-property-write-template.html mode change 100644 => 100755 esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/configuration/properties/multiinstance-property-write-template.html mode change 100644 => 100755 esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/configuration/properties/out-parameters-display-template.html mode change 100644 => 100755 esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/configuration/properties/out-parameters-popup.html mode change 100644 => 100755 esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/configuration/properties/out-parameters-write-template.html mode change 100644 => 100755 esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/configuration/properties/sequenceflow-order-display-template.html mode change 100644 => 100755 esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/configuration/properties/sequenceflow-order-popup.html mode change 100644 => 100755 esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/configuration/properties/sequenceflow-order-write-template.html mode change 100644 => 100755 esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/configuration/properties/signal-definitions-display-template.html mode change 100644 => 100755 esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/configuration/properties/signal-definitions-popup.html mode change 100644 => 100755 esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/configuration/properties/signal-definitions-write-template.html mode change 100644 => 100755 esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/configuration/properties/signal-property-write-template.html mode change 100644 => 100755 esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/configuration/properties/string-property-write-mode-template.html mode change 100644 => 100755 esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/configuration/properties/subprocess-reference-display-template.html mode change 100644 => 100755 esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/configuration/properties/subprocess-reference-popup.html mode change 100644 => 100755 esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/configuration/properties/subprocess-reference-write-template.html mode change 100644 => 100755 esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/configuration/properties/task-listeners-display-template.html mode change 100644 => 100755 esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/configuration/properties/task-listeners-popup.html mode change 100644 => 100755 esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/configuration/properties/task-listeners-write-template.html mode change 100644 => 100755 esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/configuration/properties/text-popup.html mode change 100644 => 100755 esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/configuration/properties/text-property-write-template.html mode change 100644 => 100755 esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/configuration/toolbar-custom-actions.js mode change 100644 => 100755 esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/configuration/toolbar-default-actions.js mode change 100644 => 100755 esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/configuration/toolbar.js mode change 100644 => 100755 esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/configuration/url-config.js mode change 100644 => 100755 esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/css/style-common.css mode change 100644 => 100755 esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/css/style-editor.css mode change 100644 => 100755 esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/css/style.css mode change 100644 => 100755 esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/editor-config.js mode change 100644 => 100755 esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/editor-controller.js mode change 100644 => 100755 esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/editor-utils.js mode change 100644 => 100755 esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/editor.html mode change 100644 => 100755 esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/editor/css/editor.css mode change 100644 => 100755 esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/editor/i18n/translation_de.js mode change 100644 => 100755 esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/editor/i18n/translation_en_us.js mode change 100644 => 100755 esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/editor/i18n/translation_signavio_de.js mode change 100644 => 100755 esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/editor/i18n/translation_signavio_en_us.js mode change 100644 => 100755 esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/editor/oryx.debug.js mode change 100644 => 100755 esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/editor/oryx.js mode change 100644 => 100755 esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/eventbus.js mode change 100644 => 100755 esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/fonts/activiti-admin-webfont.eot mode change 100644 => 100755 esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/fonts/activiti-admin-webfont.svg mode change 100644 => 100755 esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/fonts/activiti-admin-webfont.ttf mode change 100644 => 100755 esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/fonts/activiti-admin-webfont.woff mode change 100644 => 100755 esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/fonts/glyphicons-halflings-regular.eot mode change 100644 => 100755 esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/fonts/glyphicons-halflings-regular.svg mode change 100644 => 100755 esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/fonts/glyphicons-halflings-regular.ttf mode change 100644 => 100755 esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/fonts/glyphicons-halflings-regular.woff mode change 100644 => 100755 esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/header-controller.js mode change 100644 => 100755 esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/i18n/en.json mode change 100644 => 100755 esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/images/bpmn-error.png mode change 100644 => 100755 esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/images/bpmn-warning.png mode change 100644 => 100755 esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/images/datadefinition.png mode change 100644 => 100755 esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/images/delete.png mode change 100644 => 100755 esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/images/loading.gif mode change 100644 => 100755 esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/images/logo-2x.png mode change 100644 => 100755 esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/images/logo.png mode change 100644 => 100755 esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/images/nw-handle-dark.gif mode change 100644 => 100755 esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/images/se-handle-dark.gif mode change 100644 => 100755 esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/images/shapemenu_highlight.png mode change 100644 => 100755 esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/images/wrench.png mode change 100644 => 100755 esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/libs/angular-cookies_1.2.13/angular-cookies.min.js mode change 100644 => 100755 esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/libs/angular-cookies_1.2.13/angular-cookies.min.js.map mode change 100644 => 100755 esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/libs/angular-dragdrop.min-1.0.3.js mode change 100644 => 100755 esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/libs/angular-dragdrop_1.0.7/angular-dragdrop.min.js mode change 100644 => 100755 esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/libs/angular-mocks_1.2.13/angular-mocks.js mode change 100644 => 100755 esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/libs/angular-resource_1.2.13/angular-resource.js mode change 100644 => 100755 esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/libs/angular-resource_1.2.13/angular-resource.min.js mode change 100644 => 100755 esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/libs/angular-resource_1.2.13/angular-resource.min.js.map mode change 100644 => 100755 esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/libs/angular-route_1.2.13/angular-route.js mode change 100644 => 100755 esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/libs/angular-route_1.2.13/angular-route.min.js mode change 100644 => 100755 esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/libs/angular-route_1.2.13/angular-route.min.js.map mode change 100644 => 100755 esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/libs/angular-sanitize_1.2.13/angular-sanitize.js mode change 100644 => 100755 esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/libs/angular-sanitize_1.2.13/angular-sanitize.min.js mode change 100644 => 100755 esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/libs/angular-sanitize_1.2.13/angular-sanitize.min.js.map mode change 100644 => 100755 esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/libs/angular-scroll_0.5.7/angular-scroll.min.js mode change 100644 => 100755 esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/libs/angular-strap_2.0.5/angular-strap.min.js mode change 100644 => 100755 esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/libs/angular-strap_2.0.5/angular-strap.tpl.min.js mode change 100644 => 100755 esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/libs/angular-translate-loader-static-files/.bower.json mode change 100644 => 100755 esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/libs/angular-translate-loader-static-files/angular-translate-loader-static-files.js mode change 100644 => 100755 esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/libs/angular-translate-loader-static-files/angular-translate-loader-static-files.min.js mode change 100644 => 100755 esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/libs/angular-translate-storage-cookie/.bower.json mode change 100644 => 100755 esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/libs/angular-translate-storage-cookie/angular-translate-storage-cookie.js mode change 100644 => 100755 esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/libs/angular-translate-storage-cookie/angular-translate-storage-cookie.min.js mode change 100644 => 100755 esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/libs/angular-translate_2.4.2/angular-translate.js mode change 100644 => 100755 esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/libs/angular-translate_2.4.2/angular-translate.min.js mode change 100644 => 100755 esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/libs/angular_1.2.13/angular-animate.min.js mode change 100644 => 100755 esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/libs/angular_1.2.13/angular.min.js mode change 100644 => 100755 esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/libs/bootstrap-daterangepicker_1.3.7/daterangepicker-bs3.css mode change 100644 => 100755 esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/libs/bootstrap-daterangepicker_1.3.7/daterangepicker.js mode change 100644 => 100755 esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/libs/bootstrap_3.1.1/css/bootstrap-theme.css mode change 100644 => 100755 esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/libs/bootstrap_3.1.1/css/bootstrap-theme.css.map mode change 100644 => 100755 esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/libs/bootstrap_3.1.1/css/bootstrap-theme.min.css mode change 100644 => 100755 esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/libs/bootstrap_3.1.1/css/bootstrap.css mode change 100644 => 100755 esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/libs/bootstrap_3.1.1/css/bootstrap.css.map mode change 100644 => 100755 esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/libs/bootstrap_3.1.1/css/bootstrap.min.css mode change 100644 => 100755 esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/libs/bootstrap_3.1.1/fonts/glyphicons-halflings-regular.eot mode change 100644 => 100755 esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/libs/bootstrap_3.1.1/fonts/glyphicons-halflings-regular.svg mode change 100644 => 100755 esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/libs/bootstrap_3.1.1/fonts/glyphicons-halflings-regular.ttf mode change 100644 => 100755 esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/libs/bootstrap_3.1.1/fonts/glyphicons-halflings-regular.woff mode change 100644 => 100755 esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/libs/bootstrap_3.1.1/js/bootstrap.js mode change 100644 => 100755 esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/libs/bootstrap_3.1.1/js/bootstrap.min.js mode change 100644 => 100755 esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/libs/es5-shim-15.3.4.5/.bower.json mode change 100644 => 100755 esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/libs/es5-shim-15.3.4.5/.gitignore mode change 100644 => 100755 esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/libs/es5-shim-15.3.4.5/CHANGES mode change 100644 => 100755 esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/libs/es5-shim-15.3.4.5/CONTRIBUTORS.md mode change 100644 => 100755 esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/libs/es5-shim-15.3.4.5/LICENSE mode change 100644 => 100755 esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/libs/es5-shim-15.3.4.5/README.md mode change 100644 => 100755 esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/libs/es5-shim-15.3.4.5/es5-sham.js mode change 100644 => 100755 esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/libs/es5-shim-15.3.4.5/es5-sham.map mode change 100644 => 100755 esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/libs/es5-shim-15.3.4.5/es5-sham.min.js mode change 100644 => 100755 esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/libs/es5-shim-15.3.4.5/es5-shim.js mode change 100644 => 100755 esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/libs/es5-shim-15.3.4.5/es5-shim.map mode change 100644 => 100755 esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/libs/es5-shim-15.3.4.5/es5-shim.min.js mode change 100644 => 100755 esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/libs/es5-shim-15.3.4.5/package.json mode change 100644 => 100755 esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/libs/es5-shim-15.3.4.5/tests/helpers/h-kill.js mode change 100644 => 100755 esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/libs/es5-shim-15.3.4.5/tests/helpers/h-matchers.js mode change 100644 => 100755 esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/libs/es5-shim-15.3.4.5/tests/helpers/h.js mode change 100644 => 100755 esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/libs/es5-shim-15.3.4.5/tests/index.html mode change 100644 => 100755 esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/libs/es5-shim-15.3.4.5/tests/index.min.html mode change 100644 => 100755 esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/libs/es5-shim-15.3.4.5/tests/lib/jasmine-html.js mode change 100644 => 100755 esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/libs/es5-shim-15.3.4.5/tests/lib/jasmine.css mode change 100644 => 100755 esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/libs/es5-shim-15.3.4.5/tests/lib/jasmine.js mode change 100644 => 100755 esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/libs/es5-shim-15.3.4.5/tests/lib/jasmine_favicon.png mode change 100644 => 100755 esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/libs/es5-shim-15.3.4.5/tests/lib/json2.js mode change 100644 => 100755 esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/libs/es5-shim-15.3.4.5/tests/spec/s-array.js mode change 100644 => 100755 esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/libs/es5-shim-15.3.4.5/tests/spec/s-date.js mode change 100644 => 100755 esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/libs/es5-shim-15.3.4.5/tests/spec/s-function.js mode change 100644 => 100755 esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/libs/es5-shim-15.3.4.5/tests/spec/s-number.js mode change 100644 => 100755 esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/libs/es5-shim-15.3.4.5/tests/spec/s-object.js mode change 100644 => 100755 esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/libs/es5-shim-15.3.4.5/tests/spec/s-string.js mode change 100644 => 100755 esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/libs/jquery-ui-1.10.3.custom.min.js mode change 100644 => 100755 esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/libs/jquery.autogrow-textarea.js mode change 100644 => 100755 esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/libs/jquery_1.11.0/jquery.js mode change 100644 => 100755 esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/libs/jquery_1.11.0/jquery.min.js mode change 100644 => 100755 esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/libs/jquery_1.11.0/jquery.min.map mode change 100644 => 100755 esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/libs/json3_3.2.6/LICENSE mode change 100644 => 100755 esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/libs/json3_3.2.6/lib/json3.js mode change 100644 => 100755 esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/libs/json3_3.2.6/lib/json3.min.js mode change 100644 => 100755 esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/libs/momentjs_2.5.1/momentjs.min.js mode change 100644 => 100755 esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/libs/mousetrap-1.4.5.min.js mode change 100644 => 100755 esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/libs/ng-grid-2.0.7-min.js mode change 100644 => 100755 esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/libs/ng-grid-2.0.7.min.css mode change 100644 => 100755 esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/libs/path_parser.js mode change 100644 => 100755 esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/libs/prototype-1.5.1.js mode change 100644 => 100755 esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/libs/ui-utils.min-0.0.4.js mode change 100644 => 100755 esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/partials/root-stencil-item-template.html mode change 100644 => 100755 esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/partials/stencil-item-template.html mode change 100644 => 100755 esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/plugins.xml mode change 100644 => 100755 esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/popups/icon-template.html mode change 100644 => 100755 esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/popups/save-model.html mode change 100644 => 100755 esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/popups/select-shape.html mode change 100644 => 100755 esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/popups/unsaved-changes.html mode change 100644 => 100755 esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/select-shape-controller.js mode change 100644 => 100755 esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/stencil-controller.js mode change 100644 => 100755 esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/stencilsets/bpmn2.0/icons/activity/event.subprocess.collapsed.png mode change 100644 => 100755 esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/stencilsets/bpmn2.0/icons/activity/event.subprocess.png mode change 100644 => 100755 esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/stencilsets/bpmn2.0/icons/activity/expanded.subprocess.png mode change 100644 => 100755 esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/stencilsets/bpmn2.0/icons/activity/list/type.business.rule.png mode change 100644 => 100755 esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/stencilsets/bpmn2.0/icons/activity/list/type.camel.png mode change 100644 => 100755 esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/stencilsets/bpmn2.0/icons/activity/list/type.manual.png mode change 100644 => 100755 esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/stencilsets/bpmn2.0/icons/activity/list/type.mule.png mode change 100644 => 100755 esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/stencilsets/bpmn2.0/icons/activity/list/type.receive.png mode change 100644 => 100755 esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/stencilsets/bpmn2.0/icons/activity/list/type.script.png mode change 100644 => 100755 esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/stencilsets/bpmn2.0/icons/activity/list/type.send.png mode change 100644 => 100755 esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/stencilsets/bpmn2.0/icons/activity/list/type.service.png mode change 100644 => 100755 esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/stencilsets/bpmn2.0/icons/activity/list/type.shell.png mode change 100644 => 100755 esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/stencilsets/bpmn2.0/icons/activity/list/type.user.png mode change 100644 => 100755 esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/stencilsets/bpmn2.0/icons/activity/subprocess.png mode change 100644 => 100755 esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/stencilsets/bpmn2.0/icons/activity/task.png mode change 100644 => 100755 esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/stencilsets/bpmn2.0/icons/artifact/text.annotation.png mode change 100644 => 100755 esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/stencilsets/bpmn2.0/icons/catching/cancel.png mode change 100644 => 100755 esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/stencilsets/bpmn2.0/icons/catching/compensation.png mode change 100644 => 100755 esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/stencilsets/bpmn2.0/icons/catching/error.png mode change 100644 => 100755 esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/stencilsets/bpmn2.0/icons/catching/message.png mode change 100644 => 100755 esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/stencilsets/bpmn2.0/icons/catching/signal.png mode change 100644 => 100755 esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/stencilsets/bpmn2.0/icons/catching/timer.png mode change 100644 => 100755 esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/stencilsets/bpmn2.0/icons/connector/association.undirected.png mode change 100644 => 100755 esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/stencilsets/bpmn2.0/icons/connector/association.unidirectional.png mode change 100644 => 100755 esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/stencilsets/bpmn2.0/icons/connector/messageflow.png mode change 100644 => 100755 esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/stencilsets/bpmn2.0/icons/connector/sequenceflow.png mode change 100644 => 100755 esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/stencilsets/bpmn2.0/icons/dataobject/data.store.png mode change 100644 => 100755 esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/stencilsets/bpmn2.0/icons/diagram.png mode change 100644 => 100755 esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/stencilsets/bpmn2.0/icons/endevent/cancel.png mode change 100644 => 100755 esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/stencilsets/bpmn2.0/icons/endevent/error.png mode change 100644 => 100755 esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/stencilsets/bpmn2.0/icons/endevent/none.png mode change 100644 => 100755 esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/stencilsets/bpmn2.0/icons/endevent/terminate.png mode change 100644 => 100755 esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/stencilsets/bpmn2.0/icons/gateway/eventbased.png mode change 100644 => 100755 esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/stencilsets/bpmn2.0/icons/gateway/exclusive.databased.png mode change 100644 => 100755 esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/stencilsets/bpmn2.0/icons/gateway/inclusive.png mode change 100644 => 100755 esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/stencilsets/bpmn2.0/icons/gateway/parallel.png mode change 100644 => 100755 esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/stencilsets/bpmn2.0/icons/startevent/error.png mode change 100644 => 100755 esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/stencilsets/bpmn2.0/icons/startevent/message.png mode change 100644 => 100755 esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/stencilsets/bpmn2.0/icons/startevent/none.png mode change 100644 => 100755 esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/stencilsets/bpmn2.0/icons/startevent/signal.png mode change 100644 => 100755 esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/stencilsets/bpmn2.0/icons/startevent/timer.png mode change 100644 => 100755 esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/stencilsets/bpmn2.0/icons/swimlane/lane.png mode change 100644 => 100755 esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/stencilsets/bpmn2.0/icons/swimlane/pool.png mode change 100644 => 100755 esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/stencilsets/bpmn2.0/icons/throwing/none.png mode change 100644 => 100755 esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/stencilsets/bpmn2.0/icons/throwing/signal.png mode change 100644 => 100755 esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/toolbar-controller.js mode change 100644 => 100755 esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/favicon.ico mode change 100644 => 100755 esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/modeler.html delete mode 100644 esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/registry.conf mode change 100644 => 100755 esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/stencilset.json delete mode 100644 esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/test/java/com/elink/esua/epdc/ActivitiTest.java mode change 100644 => 100755 esua-epdc/epdc-module/epdc-activiti/pom.xml diff --git a/esua-epdc/doc/branch/dev_1118/db/esua_epdc_events.sql b/esua-epdc/doc/branch/dev_1118/db/esua_epdc_events.sql index 18a433a21..b85157381 100644 --- a/esua-epdc/doc/branch/dev_1118/db/esua_epdc_events.sql +++ b/esua-epdc/doc/branch/dev_1118/db/esua_epdc_events.sql @@ -70,3 +70,41 @@ ALTER TABLE epdc_item ADD ALL_DEPT_NAMES varchar(512) NULL COMMENT '所有部门 ALTER TABLE epdc_issue_handle ADD MOBILE varchar(20) NULL COMMENT '操作人联系方式'; ------------------------------------------2019-11-26----------------------------------------------- + +------------------------------------------2019-11-27------------------------------------------------ +DROP TABLE esua_epdc_events.epdc_dept_kpi_config; +DROP TABLE esua_epdc_events.epdc_dept_respond_log; +DROP TABLE esua_epdc_events.epdc_dept_respond_time_config; +DROP TABLE esua_epdc_events.epdc_grid_work_score; +DROP TABLE esua_epdc_events.pdman_db_version; + +ALTER TABLE esua_epdc_events.epdc_events DROP COLUMN `AREA`; +ALTER TABLE esua_epdc_events.epdc_events DROP COLUMN `AREA_ID`; +ALTER TABLE esua_epdc_events.epdc_events DROP COLUMN `STREET`; +ALTER TABLE esua_epdc_events.epdc_events DROP COLUMN `STREET_ID`; +ALTER TABLE esua_epdc_events.epdc_events DROP COLUMN `COMMUNITY`; +ALTER TABLE esua_epdc_events.epdc_events DROP COLUMN `COMMUNITY_ID`; + +ALTER TABLE esua_epdc_events.epdc_events ADD PARENT_DEPT_IDS VARCHAR(1024) NULL COMMENT '父所有部门'; +ALTER TABLE esua_epdc_events.epdc_events ADD PARENT_DEPT_NAMES VARCHAR(1024) NULL COMMENT '父所有部门'; + +ALTER TABLE esua_epdc_events.epdc_issue DROP COLUMN `AREA`; +ALTER TABLE esua_epdc_events.epdc_issue DROP COLUMN `AREA_ID`; +ALTER TABLE esua_epdc_events.epdc_issue DROP COLUMN `STREET`; +ALTER TABLE esua_epdc_events.epdc_issue DROP COLUMN `STREET_ID`; +ALTER TABLE esua_epdc_events.epdc_issue DROP COLUMN `COMMUNITY`; +ALTER TABLE esua_epdc_events.epdc_issue DROP COLUMN `COMMUNITY_ID`; + +ALTER TABLE esua_epdc_events.epdc_issue ADD PARENT_DEPT_IDS VARCHAR(1024) NULL COMMENT '父所有部门'; +ALTER TABLE esua_epdc_events.epdc_issue ADD PARENT_DEPT_NAMES VARCHAR(1024) NULL COMMENT '父所有部门'; + +ALTER TABLE esua_epdc_events.epdc_item DROP COLUMN `AREA`; +ALTER TABLE esua_epdc_events.epdc_item DROP COLUMN `AREA_ID`; +ALTER TABLE esua_epdc_events.epdc_item DROP COLUMN `STREET`; +ALTER TABLE esua_epdc_events.epdc_item DROP COLUMN `STREET_ID`; +ALTER TABLE esua_epdc_events.epdc_item DROP COLUMN `COMMUNITY`; +ALTER TABLE esua_epdc_events.epdc_item DROP COLUMN `COMMUNITY_ID`; + +ALTER TABLE esua_epdc_events.epdc_item ADD PARENT_DEPT_IDS VARCHAR(1024) NULL COMMENT '父所有部门'; +ALTER TABLE esua_epdc_events.epdc_item ADD PARENT_DEPT_NAMES VARCHAR(1024) NULL COMMENT '父所有部门'; +------------------------------------------2019-11-27------------------------------------------------ diff --git a/esua-epdc/doc/branch/dev_1118/db/esua_epdc_news.sql b/esua-epdc/doc/branch/dev_1118/db/esua_epdc_news.sql new file mode 100644 index 000000000..dc8f34470 --- /dev/null +++ b/esua-epdc/doc/branch/dev_1118/db/esua_epdc_news.sql @@ -0,0 +1,43 @@ +------------------------------------------2019-11-27----------------------------------------------- +ALTER TABLE esua_epdc_news.epdc_banner DROP COLUMN `STREET`; +ALTER TABLE esua_epdc_news.epdc_banner DROP COLUMN `STREET_ID`; +ALTER TABLE esua_epdc_news.epdc_banner DROP COLUMN `COMMUNITY`; +ALTER TABLE esua_epdc_news.epdc_banner DROP COLUMN `COMMUNITY_ID`; +ALTER TABLE esua_epdc_news.epdc_banner DROP COLUMN `GRID`; +ALTER TABLE esua_epdc_news.epdc_banner DROP COLUMN `GRID_ID`; +ALTER TABLE esua_epdc_news.epdc_banner ADD PARENT_DEPT_IDS VARCHAR(1024) NULL COMMENT '父所有部门'; +ALTER TABLE esua_epdc_news.epdc_banner ADD PARENT_DEPT_NAMES VARCHAR(1024) NULL COMMENT '父所有部门'; +ALTER TABLE esua_epdc_news.epdc_banner ADD ALL_DEPT_IDS varchar(512) NULL COMMENT '所有部门ID'; +ALTER TABLE esua_epdc_news.epdc_banner ADD ALL_DEPT_NAMES varchar(512) NULL COMMENT '所有部门名称'; + + +ALTER TABLE esua_epdc_news.epdc_news DROP COLUMN `STREET`; +ALTER TABLE esua_epdc_news.epdc_news DROP COLUMN `STREET_ID`; +ALTER TABLE esua_epdc_news.epdc_news DROP COLUMN `COMMUNITY`; +ALTER TABLE esua_epdc_news.epdc_news DROP COLUMN `COMMUNITY_ID`; +ALTER TABLE esua_epdc_news.epdc_news DROP COLUMN `GRID`; +ALTER TABLE esua_epdc_news.epdc_news DROP COLUMN `GRID_ID`; +ALTER TABLE esua_epdc_news.epdc_news ADD PARENT_DEPT_IDS VARCHAR(1024) NULL COMMENT '父所有部门'; +ALTER TABLE esua_epdc_news.epdc_news ADD PARENT_DEPT_NAMES VARCHAR(1024) NULL COMMENT '父所有部门'; +ALTER TABLE esua_epdc_news.epdc_news ADD ALL_DEPT_IDS varchar(512) NULL COMMENT '所有部门ID'; +ALTER TABLE esua_epdc_news.epdc_news ADD ALL_DEPT_NAMES varchar(512) NULL COMMENT '所有部门名称'; + +ALTER TABLE esua_epdc_news.epdc_news_statistics DROP COLUMN `STREET_ID`; +ALTER TABLE esua_epdc_news.epdc_news_statistics DROP COLUMN `COMMUNITY_ID`; +ALTER TABLE esua_epdc_news.epdc_news_statistics ADD PARENT_DEPT_IDS VARCHAR(1024) NULL COMMENT '父所有部门'; +ALTER TABLE esua_epdc_news.epdc_news_statistics ADD PARENT_DEPT_NAMES VARCHAR(1024) NULL COMMENT '父所有部门'; +ALTER TABLE esua_epdc_news.epdc_news_statistics ADD ALL_DEPT_IDS varchar(512) NULL COMMENT '所有部门ID'; +ALTER TABLE esua_epdc_news.epdc_news_statistics ADD ALL_DEPT_NAMES varchar(512) NULL COMMENT '所有部门名称'; + +ALTER TABLE esua_epdc_news.epdc_notice DROP COLUMN `STREET`; +ALTER TABLE esua_epdc_news.epdc_notice DROP COLUMN `STREET_ID`; +ALTER TABLE esua_epdc_news.epdc_notice DROP COLUMN `COMMUNITY`; +ALTER TABLE esua_epdc_news.epdc_notice DROP COLUMN `COMMUNITY_ID`; +ALTER TABLE esua_epdc_news.epdc_notice DROP COLUMN `GRID`; +ALTER TABLE esua_epdc_news.epdc_notice DROP COLUMN `GRID_ID`; +ALTER TABLE esua_epdc_news.epdc_notice ADD PARENT_DEPT_IDS VARCHAR(1024) NULL COMMENT '父所有部门'; +ALTER TABLE esua_epdc_news.epdc_notice ADD PARENT_DEPT_NAMES VARCHAR(1024) NULL COMMENT '父所有部门'; +ALTER TABLE esua_epdc_news.epdc_notice ADD ALL_DEPT_IDS varchar(512) NULL COMMENT '所有部门ID'; +ALTER TABLE esua_epdc_news.epdc_notice ADD ALL_DEPT_NAMES varchar(512) NULL COMMENT '所有部门名称'; + +------------------------------------------2019-11-27----------------------------------------------- diff --git a/esua-epdc/doc/db/newupdate.sql b/esua-epdc/doc/db/newupdate.sql index 72631d3f1..f26e4f39a 100644 --- a/esua-epdc/doc/db/newupdate.sql +++ b/esua-epdc/doc/db/newupdate.sql @@ -5,4 +5,6 @@ ALTER TABLE esua_epdc_admin.sys_dept ADD type_key varchar(50) NULL COMMENT '机 ALTER TABLE sys_dept ADD party_code varchar(50) ------------- 2019-09-24 -------------------- -ALTER TABLE epdc_user ADD REMARK VARCHAR(255) NULL COMMENT '审核备注' +ALTER TABLE epdc_user ADD REMARK VARCHAR(255) NULL COMMENT '审核备注'; + + diff --git a/esua-epdc/epdc-module/epdc-activiti/db/mysql.sql b/esua-epdc/epdc-module/epdc-activiti/db/mysql.sql old mode 100644 new mode 100755 diff --git a/esua-epdc/epdc-module/epdc-activiti/db/oracle.sql b/esua-epdc/epdc-module/epdc-activiti/db/oracle.sql old mode 100644 new mode 100755 diff --git a/esua-epdc/epdc-module/epdc-activiti/db/postgresql.sql b/esua-epdc/epdc-module/epdc-activiti/db/postgresql.sql old mode 100644 new mode 100755 diff --git a/esua-epdc/epdc-module/epdc-activiti/db/sqlserver.sql b/esua-epdc/epdc-module/epdc-activiti/db/sqlserver.sql old mode 100644 new mode 100755 diff --git a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-client/pom.xml b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-client/pom.xml old mode 100644 new mode 100755 index 1f14ad2f7..4f321fb52 --- a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-client/pom.xml +++ b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-client/pom.xml @@ -12,26 +12,21 @@ epdc-activiti-client jar - - 2.7.0 - - com.esua.epdc epdc-commons-tools 1.0.0 - io.springfox springfox-swagger2 - ${swagger.version} + 2.7.0 io.springfox springfox-swagger-ui - ${swagger.version} + 2.7.0 diff --git a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-client/src/main/java/com/elink/esua/epdc/dto/ModelDTO.java b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-client/src/main/java/com/elink/esua/epdc/dto/ModelDTO.java old mode 100644 new mode 100755 diff --git a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/pom.xml b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/pom.xml old mode 100644 new mode 100755 index f04b78fe4..8ec0a37fa --- a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/pom.xml +++ b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/pom.xml @@ -13,7 +13,7 @@ jar - 6.0.0 + 5.22.0 @@ -41,8 +41,8 @@ spring-context-support - com.alibaba.cloud - spring-cloud-starter-alibaba-nacos-discovery + org.springframework.cloud + spring-cloud-starter-netflix-eureka-client de.codecentric @@ -60,48 +60,41 @@ + + org.activiti + activiti-explorer + ${activiti.version} + + + vaadin + com.vaadin + + + dcharts-widget + org.vaadin.addons + + + activiti-simple-workflow + org.activiti + + + slf4j-log4j12 + org.slf4j + + + + + org.activiti + activiti-diagram-rest + ${activiti.version} + + + org.activiti + activiti-modeler + ${activiti.version} + - - - - dev - - true - - - 9057 - dev - - - true - 47.104.224.45:8848 - - - - test - - 9057 - test - - - true - 47.104.224.45:8848 - - - - prod - - 9057 - prod - - - true - 47.104.224.45:8848 - - - - ${project.artifactId} diff --git a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/processon/demo1.bpmn b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/processon/demo1.bpmn deleted file mode 100644 index f860f8979..000000000 --- a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/processon/demo1.bpmn +++ /dev/null @@ -1,69 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/processon/yishi.bpmn b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/processon/yishi.bpmn deleted file mode 100644 index 152a2efff..000000000 --- a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/processon/yishi.bpmn +++ /dev/null @@ -1,50 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/java/com/elink/esua/epdc/ActivitiApplication.java b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/java/com/elink/esua/epdc/ActivitiApplication.java old mode 100644 new mode 100755 index c8bcbea4c..3ff8e300a --- a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/java/com/elink/esua/epdc/ActivitiApplication.java +++ b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/java/com/elink/esua/epdc/ActivitiApplication.java @@ -1,8 +1,8 @@ /** * Copyright (c) 2018 人人开源 All rights reserved. - *

+ * * https://www.renren.io - *

+ * * 版权所有，侵权必究！ */ @@ -20,8 +20,8 @@ import org.springframework.cloud.openfeign.EnableFeignClients; * @since 1.1.0 */ @SpringBootApplication(exclude = { - org.activiti.spring.boot.SecurityAutoConfiguration.class, - org.springframework.boot.autoconfigure.security.servlet.SecurityAutoConfiguration.class + org.activiti.spring.boot.SecurityAutoConfiguration.class, + org.springframework.boot.autoconfigure.security.servlet.SecurityAutoConfiguration.class }) @EnableDiscoveryClient @EnableFeignClients diff --git a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/java/com/elink/esua/epdc/config/ModuleConfigImpl.java b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/java/com/elink/esua/epdc/config/ModuleConfigImpl.java old mode 100644 new mode 100755 diff --git a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/java/com/elink/esua/epdc/config/ProcessEngineConfig.java b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/java/com/elink/esua/epdc/config/ProcessEngineConfig.java old mode 100644 new mode 100755 diff --git a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/java/com/elink/esua/epdc/config/SwaggerConfig.java b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/java/com/elink/esua/epdc/config/SwaggerConfig.java old mode 100644 new mode 100755 diff --git a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/java/com/elink/esua/epdc/controller/ActIdController.java b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/java/com/elink/esua/epdc/controller/ActIdController.java deleted file mode 100644 index 2b036e118..000000000 --- a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/java/com/elink/esua/epdc/controller/ActIdController.java +++ /dev/null @@ -1,66 +0,0 @@ -package com.elink.esua.epdc.controller; - -import com.elink.esua.epdc.commons.tools.annotation.LogOperation; -import com.elink.esua.epdc.commons.tools.constant.Constant; -import com.elink.esua.epdc.commons.tools.page.PageData; -import com.elink.esua.epdc.commons.tools.utils.Result; -import com.elink.esua.epdc.dto.form.ActGroupFormDto; -import com.elink.esua.epdc.dto.form.ActUserFormDto; -import com.elink.esua.epdc.exception.ModuleErrorCode; -import com.elink.esua.epdc.service.ActIdService; -import com.elink.esua.epdc.service.ActProcessService; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiImplicitParam; -import io.swagger.annotations.ApiImplicitParams; -import io.swagger.annotations.ApiOperation; -import org.apache.commons.io.IOUtils; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.*; -import org.springframework.web.multipart.MultipartFile; -import springfox.documentation.annotations.ApiIgnore; - -import javax.servlet.http.HttpServletResponse; -import java.io.IOException; -import java.io.InputStream; -import java.util.Map; - -/** - * 用户和用户组控制类 - * - * @author rongchao - * @Date 19-9-6 - */ -@RestController -@RequestMapping("actId") -public class ActIdController { - - @Autowired - private ActIdService actIdService; - - /** - * 添加流程用户 - * - * @param actUserFormDto - * @return com.elink.esua.epdc.commons.tools.utils.Result - * @author rongchao - * @since 2019-09-06 - */ - @PostMapping("addUser") - public Result addUser(ActUserFormDto actUserFormDto) { - return actIdService.saveUser(actUserFormDto); - } - - /** - * 添加用户组 - * - * @param actGroupFormDto - * @return com.elink.esua.epdc.commons.tools.utils.Result - * @author rongchao - * @since 2019-09-06 - */ - @PostMapping("addGroup") - public Result addGroup(ActGroupFormDto actGroupFormDto) { - return actIdService.saveGroup(actGroupFormDto); - } - -} diff --git a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/java/com/elink/esua/epdc/controller/ActModelController.java b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/java/com/elink/esua/epdc/controller/ActModelController.java new file mode 100755 index 000000000..918fa9e83 --- /dev/null +++ b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/java/com/elink/esua/epdc/controller/ActModelController.java @@ -0,0 +1,92 @@ +/** + * Copyright (c) 2018 人人开源 All rights reserved. + * + * https://www.renren.io + * + * 版权所有，侵权必究！ + */ + +package com.elink.esua.epdc.controller; + +import com.elink.esua.epdc.commons.tools.annotation.LogOperation; +import com.elink.esua.epdc.commons.tools.constant.Constant; +import com.elink.esua.epdc.commons.tools.page.PageData; +import com.elink.esua.epdc.commons.tools.utils.Result; +import com.elink.esua.epdc.commons.tools.validator.ValidatorUtils; +import com.elink.esua.epdc.dto.ModelDTO; +import com.elink.esua.epdc.service.ActModelService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiImplicitParam; +import io.swagger.annotations.ApiImplicitParams; +import io.swagger.annotations.ApiOperation; +import org.activiti.engine.repository.Model; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; +import springfox.documentation.annotations.ApiIgnore; + +import javax.servlet.http.HttpServletResponse; +import java.util.Map; + +/** + * 模型管理 + * + * @author Mark sunlightcs@gmail.com + */ +@RestController +@RequestMapping("model") +@Api(tags="模型管理") +public class ActModelController { + @Autowired + private ActModelService actModelService; + + @GetMapping("page") + @ApiOperation("分页") + @ApiImplicitParams({ + @ApiImplicitParam(name = Constant.PAGE, value = "当前页码，从1开始", paramType = "query", required = true, dataType="int") , + @ApiImplicitParam(name = Constant.LIMIT, value = "每页显示记录数", paramType = "query",required = true, dataType="int") , + @ApiImplicitParam(name = "key", value = "key", paramType = "query", dataType="String"), + @ApiImplicitParam(name = "name", value = "name", paramType = "query", dataType="String") + }) + public Result> page(@ApiIgnore @RequestParam Map params){ + PageData page = actModelService.page(params); + + return new Result>().ok(page); + } + + @PostMapping + @ApiOperation("新增模型") + @LogOperation("新增模型") + public Result save(@RequestBody ModelDTO dto) throws Exception{ + //效验数据 + ValidatorUtils.validateEntity(dto); + + actModelService.save(dto.getName(), dto.getKey(), dto.getDescription()); + + return new Result(); + } + + @PostMapping("deploy/{id}") + @ApiOperation("部署") + @LogOperation("部署") + public Result deploy(@PathVariable("id") String id) { + actModelService.deploy(id); + return new Result(); + } + + @GetMapping("export/{id}") + @ApiOperation("导出") + @LogOperation("导出") + public void export(@PathVariable("id") String id, @ApiIgnore HttpServletResponse response) { + actModelService.export(id, response); + } + + @DeleteMapping + @ApiOperation("删除") + @LogOperation("删除") + public Result delete(@RequestBody String[] ids) { + for(String id : ids) { + actModelService.delete(id); + } + return new Result(); + } +} diff --git a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/java/com/elink/esua/epdc/controller/ActProcessController.java b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/java/com/elink/esua/epdc/controller/ActProcessController.java old mode 100644 new mode 100755 index 03028bc13..d336e4456 --- a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/java/com/elink/esua/epdc/controller/ActProcessController.java +++ b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/java/com/elink/esua/epdc/controller/ActProcessController.java @@ -88,15 +88,15 @@ public class ActProcessController { return new Result(); } -// @PostMapping("convertToModel/{id}") -// @ApiOperation("将部署的流程转换为模型") -// @LogOperation("将部署的流程转换为模型") -// @ApiImplicitParam(name = "id", value = "流程ID", paramType = "query", dataType="String") -// public Result convertToModel(@PathVariable("id") String id) throws Exception { -// actProcessService.convertToModel(id); -// -// return new Result(); -// } + @PostMapping("convertToModel/{id}") + @ApiOperation("将部署的流程转换为模型") + @LogOperation("将部署的流程转换为模型") + @ApiImplicitParam(name = "id", value = "流程ID", paramType = "query", dataType="String") + public Result convertToModel(@PathVariable("id") String id) throws Exception { + actProcessService.convertToModel(id); + + return new Result(); + } @DeleteMapping @ApiOperation("删除流程") diff --git a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/java/com/elink/esua/epdc/controller/ActRunningController.java b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/java/com/elink/esua/epdc/controller/ActRunningController.java old mode 100644 new mode 100755 diff --git a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/java/com/elink/esua/epdc/dto/form/ActGroupFormDto.java b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/java/com/elink/esua/epdc/dto/form/ActGroupFormDto.java deleted file mode 100644 index 292093c57..000000000 --- a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/java/com/elink/esua/epdc/dto/form/ActGroupFormDto.java +++ /dev/null @@ -1,23 +0,0 @@ -package com.elink.esua.epdc.dto.form; - -import lombok.Data; - -/** - * 流程用户组表单DTO - * - * @author rongchao - * @Date 19-9-6 - */ -@Data -public class ActGroupFormDto { - - /** - * 用户组ID - */ - private long groupId; - - /** - * 用户组名 - */ - private String groupName; -} diff --git a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/java/com/elink/esua/epdc/dto/form/ActUserFormDto.java b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/java/com/elink/esua/epdc/dto/form/ActUserFormDto.java deleted file mode 100644 index 099f7d267..000000000 --- a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/java/com/elink/esua/epdc/dto/form/ActUserFormDto.java +++ /dev/null @@ -1,23 +0,0 @@ -package com.elink.esua.epdc.dto.form; - -import lombok.Data; - -/** - * 流程用户表单DTO - * - * @author rongchao - * @Date 19-9-6 - */ -@Data -public class ActUserFormDto { - - /** - * 用户ID - */ - private long userId; - - /** - * 用户名 - */ - private String userName; -} diff --git a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/java/com/elink/esua/epdc/editor/main/StencilsetRestResource.java b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/java/com/elink/esua/epdc/editor/main/StencilsetRestResource.java new file mode 100755 index 000000000..191edb780 --- /dev/null +++ b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/java/com/elink/esua/epdc/editor/main/StencilsetRestResource.java @@ -0,0 +1,38 @@ +/** + * Copyright (c) 2018 人人开源 All rights reserved. + * + * https://www.renren.io + * + * 版权所有，侵权必究！ + */ + +package com.elink.esua.epdc.editor.main; + +import org.activiti.engine.ActivitiException; +import org.apache.commons.io.IOUtils; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestMethod; +import org.springframework.web.bind.annotation.ResponseBody; +import org.springframework.web.bind.annotation.RestController; + +import java.io.InputStream; + +/** + * Stencilset + * + * @author Mark sunlightcs@gmail.com + */ +@RestController +@RequestMapping("service") +public class StencilsetRestResource { + + @RequestMapping(value="/editor/stencilset", method = RequestMethod.GET, produces = "application/json;charset=utf-8") + public @ResponseBody String getStencilset() { + InputStream stencilsetStream = this.getClass().getClassLoader().getResourceAsStream("stencilset.json"); + try { + return IOUtils.toString(stencilsetStream, "utf-8"); + } catch (Exception e) { + throw new ActivitiException("Error while loading stencil set", e); + } + } +} diff --git a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/java/com/elink/esua/epdc/editor/model/ModelEditorJsonRestResource.java b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/java/com/elink/esua/epdc/editor/model/ModelEditorJsonRestResource.java new file mode 100755 index 000000000..67e0cbb56 --- /dev/null +++ b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/java/com/elink/esua/epdc/editor/model/ModelEditorJsonRestResource.java @@ -0,0 +1,69 @@ +/** + * Copyright (c) 2018 人人开源 All rights reserved. + *

+ * https://www.renren.io + *

+ * 版权所有，侵权必究！ + */ + +package com.elink.esua.epdc.editor.model; + +import com.fasterxml.jackson.databind.ObjectMapper; +import com.fasterxml.jackson.databind.node.ObjectNode; +import org.activiti.editor.constants.ModelDataJsonConstants; +import org.activiti.engine.ActivitiException; +import org.activiti.engine.RepositoryService; +import org.activiti.engine.repository.Model; +import org.apache.commons.lang3.StringUtils; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestMethod; +import org.springframework.web.bind.annotation.RestController; + +/** + * Model Editor + * + * @author Mark sunlightcs@gmail.com + */ +@RestController +@RequestMapping("service") +public class ModelEditorJsonRestResource implements ModelDataJsonConstants { + + protected static final Logger LOGGER = LoggerFactory.getLogger(ModelEditorJsonRestResource.class); + + @Autowired + private RepositoryService repositoryService; + + @Autowired + private ObjectMapper objectMapper; + + @RequestMapping(value = "/model/{modelId}/json", method = RequestMethod.GET, produces = "application/json") + public ObjectNode getEditorJson(@PathVariable String modelId) { + ObjectNode modelNode = null; + + Model model = repositoryService.getModel(modelId); + + if (model != null) { + try { + if (StringUtils.isNotEmpty(model.getMetaInfo())) { + modelNode = (ObjectNode) objectMapper.readTree(model.getMetaInfo()); + } else { + modelNode = objectMapper.createObjectNode(); + modelNode.put(MODEL_NAME, model.getName()); + } + modelNode.put(MODEL_ID, model.getId()); + ObjectNode editorJsonNode = (ObjectNode) objectMapper.readTree( + new String(repositoryService.getModelEditorSource(model.getId()), "utf-8")); + modelNode.set("model", editorJsonNode); + + } catch (Exception e) { + LOGGER.error("Error creating model JSON", e); + throw new ActivitiException("Error creating model JSON", e); + } + } + return modelNode; + } +} diff --git a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/java/com/elink/esua/epdc/editor/model/ModelSaveRestResource.java b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/java/com/elink/esua/epdc/editor/model/ModelSaveRestResource.java new file mode 100755 index 000000000..cac6f0136 --- /dev/null +++ b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/java/com/elink/esua/epdc/editor/model/ModelSaveRestResource.java @@ -0,0 +1,90 @@ +/** + * Copyright (c) 2018 人人开源 All rights reserved. + *

+ * https://www.renren.io + *

+ * 版权所有，侵权必究！ + */ + +package com.elink.esua.epdc.editor.model; + +import com.elink.esua.epdc.commons.tools.xss.XssHttpServletRequestWrapper; +import com.fasterxml.jackson.databind.ObjectMapper; +import com.fasterxml.jackson.databind.node.ObjectNode; +import org.activiti.editor.constants.ModelDataJsonConstants; +import org.activiti.engine.ActivitiException; +import org.activiti.engine.RepositoryService; +import org.activiti.engine.repository.Model; +import org.apache.batik.transcoder.TranscoderInput; +import org.apache.batik.transcoder.TranscoderOutput; +import org.apache.batik.transcoder.image.PNGTranscoder; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.http.HttpStatus; +import org.springframework.web.bind.annotation.*; + +import javax.servlet.http.HttpServletRequest; +import java.io.ByteArrayInputStream; +import java.io.ByteArrayOutputStream; +import java.io.InputStream; + +/** + * Model Rest + * + * @author Mark sunlightcs@gmail.com + */ +@RestController +@RequestMapping("service") +public class ModelSaveRestResource implements ModelDataJsonConstants { + protected static final Logger LOGGER = LoggerFactory.getLogger(ModelSaveRestResource.class); + + @Autowired + private RepositoryService repositoryService; + @Autowired + private ObjectMapper objectMapper; + + @RequestMapping(value = "/model/{modelId}/save", method = RequestMethod.PUT) + @ResponseStatus(value = HttpStatus.OK) + public void saveModel(@PathVariable String modelId, HttpServletRequest request) { + try { + HttpServletRequest orgRequest = XssHttpServletRequestWrapper.getOrgRequest(request); + String name = orgRequest.getParameter("name"); + String description = orgRequest.getParameter("description"); + String jsonXml = orgRequest.getParameter("json_xml"); + String svgXml = orgRequest.getParameter("svg_xml"); + + Model model = repositoryService.getModel(modelId); + + ObjectNode modelJson = (ObjectNode) objectMapper.readTree(model.getMetaInfo()); + + modelJson.put(MODEL_NAME, name); + modelJson.put(MODEL_DESCRIPTION, description); + model.setMetaInfo(modelJson.toString()); + model.setName(name); + + repositoryService.saveModel(model); + + repositoryService.addModelEditorSource(model.getId(), jsonXml.getBytes("utf-8")); + + InputStream svgStream = new ByteArrayInputStream(svgXml.getBytes("utf-8")); + TranscoderInput input = new TranscoderInput(svgStream); + + PNGTranscoder transcoder = new PNGTranscoder(); + // Setup output + ByteArrayOutputStream outStream = new ByteArrayOutputStream(); + TranscoderOutput output = new TranscoderOutput(outStream); + + // Do the transformation + transcoder.transcode(input, output); + final byte[] result = outStream.toByteArray(); + repositoryService.addModelEditorSourceExtra(model.getId(), result); + outStream.close(); + + } catch (Exception e) { + LOGGER.error("Error saving model", e); + throw new ActivitiException("Error saving model", e); + } + } + +} diff --git a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/java/com/elink/esua/epdc/exception/ModuleErrorCode.java b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/java/com/elink/esua/epdc/exception/ModuleErrorCode.java old mode 100644 new mode 100755 index 007ab2b18..97988f469 --- a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/java/com/elink/esua/epdc/exception/ModuleErrorCode.java +++ b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/java/com/elink/esua/epdc/exception/ModuleErrorCode.java @@ -8,6 +8,7 @@ package com.elink.esua.epdc.exception; + import com.elink.esua.epdc.commons.tools.exception.ErrorCode; /** diff --git a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/java/com/elink/esua/epdc/service/ActIdService.java b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/java/com/elink/esua/epdc/service/ActIdService.java deleted file mode 100644 index a6dc85598..000000000 --- a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/java/com/elink/esua/epdc/service/ActIdService.java +++ /dev/null @@ -1,45 +0,0 @@ -package com.elink.esua.epdc.service; - -import com.elink.esua.epdc.commons.tools.utils.Result; -import com.elink.esua.epdc.dto.form.ActGroupFormDto; -import com.elink.esua.epdc.dto.form.ActUserFormDto; - -/** - * 流程用户服务接口类 - * - * @author rongchao - * @Date 19-9-6 - */ -public interface ActIdService { - - /** - * 添加用户 - * - * @param actUserFormDto 用户名 - * @return boolean - * @author rongchao - * @since 2019-09-06 - */ - Result saveUser(ActUserFormDto actUserFormDto); - - /** - * 添加用户组 - * - * @param actGroupFormDto 用户组名 - * @return boolean - * @author rongchao - * @since 2019-09-06 - */ - Result saveGroup(ActGroupFormDto actGroupFormDto); - - /** - * 修改用户组名 - * - * @param newGroupName - * @return boolean - * @author rongchao - * @since 2019-09-06 - */ - Result modifyGroupName(String newGroupName); - -} diff --git a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/java/com/elink/esua/epdc/service/ActModelService.java b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/java/com/elink/esua/epdc/service/ActModelService.java old mode 100644 new mode 100755 index 580774e44..2e3bd7483 --- a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/java/com/elink/esua/epdc/service/ActModelService.java +++ b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/java/com/elink/esua/epdc/service/ActModelService.java @@ -1,23 +1,37 @@ /** * Copyright (c) 2018 人人开源 All rights reserved. - * + *

* https://www.renren.io - * + *

* 版权所有，侵权必究！ */ package com.elink.esua.epdc.service; import com.elink.esua.epdc.commons.tools.constant.Constant; +import com.elink.esua.epdc.commons.tools.exception.RenException; import com.elink.esua.epdc.commons.tools.page.PageData; +import com.elink.esua.epdc.exception.ModuleErrorCode; +import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.ObjectMapper; +import com.fasterxml.jackson.databind.node.ObjectNode; +import org.activiti.bpmn.converter.BpmnXMLConverter; +import org.activiti.bpmn.model.BpmnModel; +import org.activiti.editor.constants.ModelDataJsonConstants; +import org.activiti.editor.language.json.converter.BpmnJsonConverter; import org.activiti.engine.RepositoryService; +import org.activiti.engine.repository.Deployment; import org.activiti.engine.repository.Model; import org.activiti.engine.repository.ModelQuery; +import org.activiti.engine.repository.ProcessDefinition; +import org.apache.commons.io.IOUtils; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import javax.servlet.http.HttpServletResponse; +import java.io.ByteArrayInputStream; +import java.io.UnsupportedEncodingException; import java.util.List; import java.util.Map; @@ -34,104 +48,104 @@ public class ActModelService { private ObjectMapper objectMapper; public PageData page(Map params) { - String key = (String)params.get("key"); - String name = (String)params.get("name"); + String key = (String) params.get("key"); + String name = (String) params.get("name"); //分页参数 Integer curPage = 1; Integer limit = 10; - if(params.get(Constant.PAGE) != null){ - curPage = Integer.parseInt((String)params.get(Constant.PAGE)); + if (params.get(Constant.PAGE) != null) { + curPage = Integer.parseInt((String) params.get(Constant.PAGE)); } - if(params.get(Constant.LIMIT) != null){ - limit = Integer.parseInt((String)params.get(Constant.LIMIT)); + if (params.get(Constant.LIMIT) != null) { + limit = Integer.parseInt((String) params.get(Constant.LIMIT)); } ModelQuery modelQuery = repositoryService.createModelQuery().latestVersion().orderByLastUpdateTime().desc(); - if(StringUtils.isNotEmpty(key)){ + if (StringUtils.isNotEmpty(key)) { modelQuery.modelKey(key); } - if(StringUtils.isNotEmpty(name)){ + if (StringUtils.isNotEmpty(name)) { modelQuery.modelName(name); } List list = modelQuery.listPage((curPage - 1) * limit, limit); - return new PageData<>(list, (int)modelQuery.count()); + return new PageData<>(list, (int) modelQuery.count()); + } + + public void save(String name, String key, String description) throws UnsupportedEncodingException { + //新建一个空模型 + Model model = repositoryService.newModel(); + + //metaInfo信息 + ObjectNode metaInfo = objectMapper.createObjectNode(); + metaInfo.put(ModelDataJsonConstants.MODEL_NAME, name); + metaInfo.put(ModelDataJsonConstants.MODEL_DESCRIPTION, description); + metaInfo.put(ModelDataJsonConstants.MODEL_REVISION, model.getVersion()); + + model.setKey(key); + model.setName(name); + model.setMetaInfo(metaInfo.toString()); + + repositoryService.saveModel(model); + + ObjectNode editorNode = objectMapper.createObjectNode(); + editorNode.put("id", "canvas"); + editorNode.put("resourceId", "canvas"); + ObjectNode stencilset = objectMapper.createObjectNode(); + stencilset.put("namespace", "http://b3mn.org/stencilset/bpmn2.0#"); + editorNode.set("stencilset", stencilset); + repositoryService.addModelEditorSource(model.getId(), editorNode.toString().getBytes("utf-8")); } -// public void save(String name, String key, String description) throws UnsupportedEncodingException { -// //新建一个空模型 -// Model model = repositoryService.newModel(); -// -// //metaInfo信息 -// ObjectNode metaInfo = objectMapper.createObjectNode(); -// metaInfo.put(ModelDataJsonConstants.MODEL_NAME, name); -// metaInfo.put(ModelDataJsonConstants.MODEL_DESCRIPTION, description); -// metaInfo.put(ModelDataJsonConstants.MODEL_REVISION, model.getVersion()); -// -// model.setKey(key); -// model.setName(name); -// model.setMetaInfo(metaInfo.toString()); -// -// repositoryService.saveModel(model); -// -// ObjectNode editorNode = objectMapper.createObjectNode(); -// editorNode.put("id", "canvas"); -// editorNode.put("resourceId", "canvas"); -// ObjectNode stencilset = objectMapper.createObjectNode(); -// stencilset.put("namespace", "http://b3mn.org/stencilset/bpmn2.0#"); -// editorNode.set("stencilset", stencilset); -// repositoryService.addModelEditorSource(model.getId(), editorNode.toString().getBytes("utf-8")); -// } -// -// public void deploy(String id) { -// try { -// Model model = repositoryService.getModel(id); -// BpmnJsonConverter jsonConverter = new BpmnJsonConverter(); -// JsonNode editorNode = new ObjectMapper().readTree(repositoryService.getModelEditorSource(model.getId())); -// BpmnModel bpmnModel = jsonConverter.convertToBpmnModel(editorNode); -// BpmnXMLConverter xmlConverter = new BpmnXMLConverter(); -// byte[] bpmnBytes = xmlConverter.convertToXML(bpmnModel); -// -// String processName = model.getName(); -// if (!StringUtils.endsWith(processName, ".bpmn20.xml")){ -// processName += ".bpmn20.xml"; -// } -// -// ByteArrayInputStream in = new ByteArrayInputStream(bpmnBytes); -// Deployment deployment = repositoryService.createDeployment().name(model.getName()).addInputStream(processName, in).deploy(); -// -// List list = repositoryService.createProcessDefinitionQuery().deploymentId(deployment.getId()).list(); -// if (list.size() == 0){ -// throw new RenException(ModuleErrorCode.ACT_DEPLOY_ERROR); -// } -// } catch (Exception e) { -// throw new RenException(ModuleErrorCode.ACT_MODEL_IMG_ERROR, e); -// } -// } -// -// /** -// * 导出模型 -// */ -// public void export(String id, HttpServletResponse response) { -// try { -// Model model = repositoryService.getModel(id); -// BpmnJsonConverter jsonConverter = new BpmnJsonConverter(); -// JsonNode editorNode = new ObjectMapper().readTree(repositoryService.getModelEditorSource(model.getId())); -// BpmnModel bpmnModel = jsonConverter.convertToBpmnModel(editorNode); -// BpmnXMLConverter xmlConverter = new BpmnXMLConverter(); -// byte[] bpmnBytes = xmlConverter.convertToXML(bpmnModel); -// -// ByteArrayInputStream in = new ByteArrayInputStream(bpmnBytes); -// IOUtils.copy(in, response.getOutputStream()); -// String filename = bpmnModel.getMainProcess().getId() + ".bpmn20.xml"; -// response.setHeader("Content-Disposition", "attachment; filename=" + filename); -// response.flushBuffer(); -// } catch (Exception e) { -// throw new RenException(ModuleErrorCode.ACT_MODEL_EXPORT_ERROR, id); -// } -// } + public void deploy(String id) { + try { + Model model = repositoryService.getModel(id); + BpmnJsonConverter jsonConverter = new BpmnJsonConverter(); + JsonNode editorNode = new ObjectMapper().readTree(repositoryService.getModelEditorSource(model.getId())); + BpmnModel bpmnModel = jsonConverter.convertToBpmnModel(editorNode); + BpmnXMLConverter xmlConverter = new BpmnXMLConverter(); + byte[] bpmnBytes = xmlConverter.convertToXML(bpmnModel); + + String processName = model.getName(); + if (!StringUtils.endsWith(processName, ".bpmn20.xml")) { + processName += ".bpmn20.xml"; + } + + ByteArrayInputStream in = new ByteArrayInputStream(bpmnBytes); + Deployment deployment = repositoryService.createDeployment().name(model.getName()).addInputStream(processName, in).deploy(); + + List list = repositoryService.createProcessDefinitionQuery().deploymentId(deployment.getId()).list(); + if (list.size() == 0) { + throw new RenException(ModuleErrorCode.ACT_DEPLOY_ERROR); + } + } catch (Exception e) { + throw new RenException(ModuleErrorCode.ACT_MODEL_IMG_ERROR, e); + } + } + + /** + * 导出模型 + */ + public void export(String id, HttpServletResponse response) { + try { + Model model = repositoryService.getModel(id); + BpmnJsonConverter jsonConverter = new BpmnJsonConverter(); + JsonNode editorNode = new ObjectMapper().readTree(repositoryService.getModelEditorSource(model.getId())); + BpmnModel bpmnModel = jsonConverter.convertToBpmnModel(editorNode); + BpmnXMLConverter xmlConverter = new BpmnXMLConverter(); + byte[] bpmnBytes = xmlConverter.convertToXML(bpmnModel); + + ByteArrayInputStream in = new ByteArrayInputStream(bpmnBytes); + IOUtils.copy(in, response.getOutputStream()); + String filename = bpmnModel.getMainProcess().getId() + ".bpmn20.xml"; + response.setHeader("Content-Disposition", "attachment; filename=" + filename); + response.flushBuffer(); + } catch (Exception e) { + throw new RenException(ModuleErrorCode.ACT_MODEL_EXPORT_ERROR, id); + } + } /** * 删除模型 diff --git a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/java/com/elink/esua/epdc/service/ActProcessService.java b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/java/com/elink/esua/epdc/service/ActProcessService.java old mode 100644 new mode 100755 index 00dd945b2..0976c1a44 --- a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/java/com/elink/esua/epdc/service/ActProcessService.java +++ b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/java/com/elink/esua/epdc/service/ActProcessService.java @@ -1,8 +1,8 @@ /** * Copyright (c) 2018 人人开源 All rights reserved. - *

+ * * https://www.renren.io - *

+ * * 版权所有，侵权必究！ */ @@ -12,8 +12,15 @@ import com.elink.esua.epdc.commons.tools.constant.Constant; import com.elink.esua.epdc.commons.tools.exception.RenException; import com.elink.esua.epdc.commons.tools.page.PageData; import com.elink.esua.epdc.exception.ModuleErrorCode; +import com.fasterxml.jackson.databind.ObjectMapper; +import com.fasterxml.jackson.databind.node.ObjectNode; +import org.activiti.bpmn.converter.BpmnXMLConverter; +import org.activiti.bpmn.model.BpmnModel; +import org.activiti.editor.constants.ModelDataJsonConstants; +import org.activiti.editor.language.json.converter.BpmnJsonConverter; import org.activiti.engine.RepositoryService; import org.activiti.engine.repository.Deployment; +import org.activiti.engine.repository.Model; import org.activiti.engine.repository.ProcessDefinition; import org.activiti.engine.repository.ProcessDefinitionQuery; import org.apache.commons.io.FilenameUtils; @@ -22,8 +29,13 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.web.multipart.MultipartFile; +import javax.xml.stream.XMLInputFactory; +import javax.xml.stream.XMLStreamException; +import javax.xml.stream.XMLStreamReader; import java.io.IOException; import java.io.InputStream; +import java.io.InputStreamReader; +import java.io.UnsupportedEncodingException; import java.util.ArrayList; import java.util.HashMap; import java.util.List; @@ -42,31 +54,28 @@ public class ActProcessService { /** * 流程列表 - * - * @param params - * @return */ public PageData> page(Map params) { - String key = (String) params.get("key"); - String processName = (String) params.get("processName"); + String key = (String)params.get("key"); + String processName = (String)params.get("processName"); //分页参数 Integer curPage = 1; Integer limit = 10; - if (params.get(Constant.PAGE) != null) { - curPage = Integer.parseInt((String) params.get(Constant.PAGE)); + if(params.get(Constant.PAGE) != null){ + curPage = Integer.parseInt((String)params.get(Constant.PAGE)); } - if (params.get(Constant.LIMIT) != null) { - limit = Integer.parseInt((String) params.get(Constant.LIMIT)); + if(params.get(Constant.LIMIT) != null){ + limit = Integer.parseInt((String)params.get(Constant.LIMIT)); } ProcessDefinitionQuery processDefinitionQuery = repositoryService.createProcessDefinitionQuery().latestVersion() - .orderByProcessDefinitionId().desc().orderByProcessDefinitionKey().desc(); + .orderByProcessDefinitionId().desc().orderByProcessDefinitionKey().desc(); - if (StringUtils.isNotEmpty(key)) { + if(StringUtils.isNotEmpty(key)){ processDefinitionQuery.processDefinitionKeyLike(key); } - if (StringUtils.isNotEmpty(processName)) { + if(StringUtils.isNotEmpty(processName)){ processDefinitionQuery.processDefinitionNameLike(processName); } @@ -77,7 +86,7 @@ public class ActProcessService { objectList.add(processDefinitionConvert(processDefinition)); } - return new PageData<>(objectList, (int) processDefinitionQuery.count()); + return new PageData<>(objectList, (int)processDefinitionQuery.count()); } @@ -104,90 +113,85 @@ public class ActProcessService { /** * 部署 - * * @param file 文件 */ public void deploy(MultipartFile file) throws IOException { String fileName = file.getOriginalFilename(); String extension = FilenameUtils.getExtension(fileName); - if ("zip".equalsIgnoreCase(extension) || "bar".equalsIgnoreCase(extension)) { + if("zip".equalsIgnoreCase(extension) || "bar".equalsIgnoreCase(extension)) { ZipInputStream zip = new ZipInputStream(file.getInputStream()); repositoryService.createDeployment().addZipInputStream(zip).deploy(); - } else if (fileName.indexOf("bpmn20.xml") != -1) { + }else if(fileName.indexOf("bpmn20.xml") != -1){ repositoryService.createDeployment().addInputStream(fileName, file.getInputStream()).deploy(); - } else if ("bpmn".equalsIgnoreCase(extension)) { + }else if("bpmn".equalsIgnoreCase(extension)){ repositoryService.createDeployment().addInputStream(fileName, file.getInputStream()).deploy(); - } else { + }else{ throw new RenException(ModuleErrorCode.ACT_DEPLOY_FORMAT_ERROR); } } /** * 激活流程 - * * @param id 流程ID */ - public void active(String id) { + public void active(String id){ repositoryService.activateProcessDefinitionById(id, true, null); } /** * 挂起流程 - * * @param id 流程ID */ - public void suspend(String id) { + public void suspend(String id){ repositoryService.suspendProcessDefinitionById(id, true, null); } -// /** -// * 将部署的流程转换为模型 -// * @param id 流程ID -// */ -// public Model convertToModel(String id) throws UnsupportedEncodingException, XMLStreamException { -// ProcessDefinition processDefinition = repositoryService.createProcessDefinitionQuery().processDefinitionId(id).singleResult(); -// InputStream bpmnStream = repositoryService.getResourceAsStream(processDefinition.getDeploymentId(), -// processDefinition.getResourceName()); -// XMLInputFactory xif = XMLInputFactory.newInstance(); -// InputStreamReader in = new InputStreamReader(bpmnStream, "UTF-8"); -// XMLStreamReader xtr = xif.createXMLStreamReader(in); -// BpmnModel bpmnModel = new BpmnXMLConverter().convertToBpmnModel(xtr); -// -// BpmnJsonConverter converter = new BpmnJsonConverter(); -// ObjectNode modelNode = converter.convertToJson(bpmnModel); -// Model modelData = repositoryService.newModel(); -// modelData.setKey(processDefinition.getKey()); -// modelData.setName(processDefinition.getResourceName()); -// modelData.setCategory(processDefinition.getCategory()); -// modelData.setDeploymentId(processDefinition.getDeploymentId()); -// modelData.setVersion(Integer.parseInt(String.valueOf(repositoryService.createModelQuery().modelKey(modelData.getKey()).count()+1))); -// -// ObjectNode modelObjectNode = new ObjectMapper().createObjectNode(); -// modelObjectNode.put(ModelDataJsonConstants.MODEL_NAME, processDefinition.getName()); -// modelObjectNode.put(ModelDataJsonConstants.MODEL_REVISION, modelData.getVersion()); -// modelObjectNode.put(ModelDataJsonConstants.MODEL_DESCRIPTION, processDefinition.getDescription()); -// modelData.setMetaInfo(modelObjectNode.toString()); -// -// repositoryService.saveModel(modelData); -// -// repositoryService.addModelEditorSource(modelData.getId(), modelNode.toString().getBytes("utf-8")); -// -// return modelData; -// } + /** + * 将部署的流程转换为模型 + * @param id 流程ID + */ + public Model convertToModel(String id) throws UnsupportedEncodingException, XMLStreamException { + ProcessDefinition processDefinition = repositoryService.createProcessDefinitionQuery().processDefinitionId(id).singleResult(); + InputStream bpmnStream = repositoryService.getResourceAsStream(processDefinition.getDeploymentId(), + processDefinition.getResourceName()); + XMLInputFactory xif = XMLInputFactory.newInstance(); + InputStreamReader in = new InputStreamReader(bpmnStream, "UTF-8"); + XMLStreamReader xtr = xif.createXMLStreamReader(in); + BpmnModel bpmnModel = new BpmnXMLConverter().convertToBpmnModel(xtr); + + BpmnJsonConverter converter = new BpmnJsonConverter(); + ObjectNode modelNode = converter.convertToJson(bpmnModel); + Model modelData = repositoryService.newModel(); + modelData.setKey(processDefinition.getKey()); + modelData.setName(processDefinition.getResourceName()); + modelData.setCategory(processDefinition.getCategory()); + modelData.setDeploymentId(processDefinition.getDeploymentId()); + modelData.setVersion(Integer.parseInt(String.valueOf(repositoryService.createModelQuery().modelKey(modelData.getKey()).count()+1))); + + ObjectNode modelObjectNode = new ObjectMapper().createObjectNode(); + modelObjectNode.put(ModelDataJsonConstants.MODEL_NAME, processDefinition.getName()); + modelObjectNode.put(ModelDataJsonConstants.MODEL_REVISION, modelData.getVersion()); + modelObjectNode.put(ModelDataJsonConstants.MODEL_DESCRIPTION, processDefinition.getDescription()); + modelData.setMetaInfo(modelObjectNode.toString()); + + repositoryService.saveModel(modelData); + + repositoryService.addModelEditorSource(modelData.getId(), modelNode.toString().getBytes("utf-8")); + + return modelData; + } /** * 删除部署 - * - * @param deploymentId 部署ID + * @param deploymentId 部署ID */ - public void deleteDeployment(String deploymentId) { + public void deleteDeployment(String deploymentId){ repositoryService.deleteDeployment(deploymentId, true); } /** * 获取资源文件 - * - * @param deploymentId 部署ID + * @param deploymentId 部署ID * @param resourceName 资源名称 */ public InputStream getResourceAsStream(String deploymentId, String resourceName) { diff --git a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/java/com/elink/esua/epdc/service/ActRunningService.java b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/java/com/elink/esua/epdc/service/ActRunningService.java old mode 100644 new mode 100755 index 4ea48bab6..000500ce6 --- a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/java/com/elink/esua/epdc/service/ActRunningService.java +++ b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/java/com/elink/esua/epdc/service/ActRunningService.java @@ -1,8 +1,8 @@ /** * Copyright (c) 2018 人人开源 All rights reserved. - * + *

* https://www.renren.io - * + *

* 版权所有，侵权必究！ */ @@ -37,24 +37,24 @@ public class ActRunningService { * 流程定义列表 */ public PageData> page(Map params) { - String id = (String)params.get("id"); - String definitionKey = (String)params.get("definitionKey"); + String id = (String) params.get("id"); + String definitionKey = (String) params.get("definitionKey"); //分页参数 Integer curPage = 1; Integer limit = 10; - if(params.get(Constant.PAGE) != null){ - curPage = Integer.parseInt((String)params.get(Constant.PAGE)); + if (params.get(Constant.PAGE) != null) { + curPage = Integer.parseInt((String) params.get(Constant.PAGE)); } - if(params.get(Constant.LIMIT) != null){ - limit = Integer.parseInt((String)params.get(Constant.LIMIT)); + if (params.get(Constant.LIMIT) != null) { + limit = Integer.parseInt((String) params.get(Constant.LIMIT)); } ProcessInstanceQuery processInstanceQuery = runtimeService.createProcessInstanceQuery(); - if (StringUtils.isNotBlank(id)){ + if (StringUtils.isNotBlank(id)) { processInstanceQuery.processInstanceId(id); } - if (StringUtils.isNotBlank(definitionKey)){ + if (StringUtils.isNotBlank(definitionKey)) { processInstanceQuery.processDefinitionKey(definitionKey); } @@ -63,7 +63,7 @@ public class ActRunningService { for (ProcessInstance processInstance : processInstanceList) { objectList.add(processInstanceConvert(processInstance)); } - return new PageData<>(objectList, (int)processInstanceQuery.count()); + return new PageData<>(objectList, (int) processInstanceQuery.count()); } /** @@ -86,7 +86,7 @@ public class ActRunningService { * 删除实例 * @param id 实例ID */ - public void delete(String id){ + public void delete(String id) { runtimeService.deleteProcessInstance(id, null); } @@ -94,7 +94,7 @@ public class ActRunningService { * 启动流程实例 * @param key 流程定义标识key */ - public void startProcess(String key){ + public void startProcess(String key) { runtimeService.startProcessInstanceByKey(key); } } diff --git a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/java/com/elink/esua/epdc/service/ActWorkflowCommonService.java b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/java/com/elink/esua/epdc/service/ActWorkflowCommonService.java deleted file mode 100644 index 2db005979..000000000 --- a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/java/com/elink/esua/epdc/service/ActWorkflowCommonService.java +++ /dev/null @@ -1,24 +0,0 @@ -package com.elink.esua.epdc.service; - -/** - * activiti工作流 - * - * @author yujintao - * @email yujintao@elink-cn.com - * @date 2019/9/3 11:18 - */ -public interface ActWorkflowCommonService { - - /** - * 启动流程并绑定任务 - * - * @param processKey 流程ID - * @param businessKey 任务ID - * @param deptId 部门ID（通过部门ID，判断是否有权限审核任务） - * @return boolean - * @author yujintao - * @date 2019/9/3 13:58 - */ - boolean startProcess(String processKey, String businessKey, String deptId); - -} diff --git a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/java/com/elink/esua/epdc/service/impl/ActIdServiceImpl.java b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/java/com/elink/esua/epdc/service/impl/ActIdServiceImpl.java deleted file mode 100644 index b98189d60..000000000 --- a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/java/com/elink/esua/epdc/service/impl/ActIdServiceImpl.java +++ /dev/null @@ -1,37 +0,0 @@ -package com.elink.esua.epdc.service.impl; - -import com.elink.esua.epdc.commons.tools.utils.Result; -import com.elink.esua.epdc.dto.form.ActGroupFormDto; -import com.elink.esua.epdc.dto.form.ActUserFormDto; -import com.elink.esua.epdc.service.ActIdService; -import org.activiti.engine.IdentityService; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - -/** - * 流程用户服务实现类 - * - * @author rongchao - * @Date 19-9-6 - */ -@Service -public class ActIdServiceImpl implements ActIdService { - - @Autowired - private IdentityService identityService; - - @Override - public Result saveUser(ActUserFormDto actUserFormDto) { - return null; - } - - @Override - public Result saveGroup(ActGroupFormDto actGroupFormDto) { - return null; - } - - @Override - public Result modifyGroupName(String newGroupName) { - return new Result().ok("success"); - } -} diff --git a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/java/com/elink/esua/epdc/service/impl/ActWorkflowCommonServiceImpl.java b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/java/com/elink/esua/epdc/service/impl/ActWorkflowCommonServiceImpl.java deleted file mode 100644 index 8c1dee237..000000000 --- a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/java/com/elink/esua/epdc/service/impl/ActWorkflowCommonServiceImpl.java +++ /dev/null @@ -1,50 +0,0 @@ -package com.elink.esua.epdc.service.impl; - -import com.elink.esua.epdc.service.ActWorkflowCommonService; -import com.google.common.collect.Maps; -import org.activiti.engine.HistoryService; -import org.activiti.engine.RepositoryService; -import org.activiti.engine.RuntimeService; -import org.activiti.engine.TaskService; -import org.activiti.engine.runtime.ProcessInstance; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import org.springframework.web.context.ContextLoader; -import org.springframework.web.context.WebApplicationContext; - -import java.util.HashMap; -import java.util.Map; - - -/** - * @author yujintao - * @email yujintao@elink-cn.com - * @date 2019/9/3 11:19 - */ -@Service -public class ActWorkflowCommonServiceImpl implements ActWorkflowCommonService { - - @Autowired - private RepositoryService repositoryService; - - @Autowired - private RuntimeService runtimeService; - - @Autowired - private TaskService taskService; - - @Autowired - private HistoryService historyService; - - @Override - public boolean startProcess(String processKey, String businessKey, String deptId) { - Map map = Maps.newHashMap(); - map.put("deptId", deptId); - map.put("activityId", "_2"); - //使用正在执行对象表中的一个字段BUSINESS_KEY(Activiti提供的一个字段)，让启动的流程（流程实例）关联业务 - runtimeService.startProcessInstanceByKey(processKey, businessKey, map); - return true; - } - - -} diff --git a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/java/com/elink/esua/epdc/utils/ModuleConstant.java b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/java/com/elink/esua/epdc/utils/ModuleConstant.java old mode 100644 new mode 100755 diff --git a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/application.yml b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/application.yml old mode 100644 new mode 100755 index 71c68d4ea..8aaea7dc4 --- a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/application.yml +++ b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/application.yml @@ -1,5 +1,5 @@ server: - port: @server.port@ + port: 8106 servlet: context-path: /activiti @@ -16,11 +16,10 @@ spring: time-zone: GMT+8 date-format: yyyy-MM-dd HH:mm:ss activiti: - check-process-definitions: true - database-schema-update: false - process-definition-location-prefix: classpath:/processes/ + check-process-definitions: false + database-schema-update: true redis: - database: 2 + database: 0 host: 47.104.224.45 timeout: 30s port: 6379 @@ -28,27 +27,24 @@ spring: datasource: druid: driver-class-name: com.mysql.cj.jdbc.Driver - url: jdbc:mysql://47.104.224.45:3308/epdc_activiti?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai - username: root - password: shibei@888 + url: jdbc:mysql://47.104.224.45:3308/esua_epdc_activiti?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false + username: epdc + password: elink833066 cloud: nacos: discovery: - server-addr: @nacos.server-addr@ - register-enabled: @nacos.register-enabled@ - alibaba: - seata: - tx-service-group: epdc-activiti-server-fescar-service-group + server-addr: 47.104.224.45:8848 + register-enabled: true #Oracle - # driver-class-name: oracle.jdbc.OracleDriver - # url: jdbc:oracle:thin:@localhost:1521:xe - # username: renren_cloud - # password: 123456 +# driver-class-name: oracle.jdbc.OracleDriver +# url: jdbc:oracle:thin:@localhost:1521:xe +# username: renren_cloud +# password: 123456 #SQLServer - # driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver - # url: jdbc:sqlserver://localhost:1433;DatabaseName=renren_cloud - # username: sa - # password: 123456 +# driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver +# url: jdbc:sqlserver://localhost:1433;DatabaseName=renren_cloud +# username: sa +# password: 123456 #postgresql # driver-class-name: org.postgresql.Driver # url: jdbc:postgresql://localhost:5432/renren_cloud diff --git a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/i18n/messages.properties b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/i18n/messages.properties old mode 100644 new mode 100755 diff --git a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/i18n/messages_en_US.properties b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/i18n/messages_en_US.properties old mode 100644 new mode 100755 diff --git a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/i18n/messages_zh_CN.properties b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/i18n/messages_zh_CN.properties old mode 100644 new mode 100755 diff --git a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/i18n/messages_zh_TW.properties b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/i18n/messages_zh_TW.properties old mode 100644 new mode 100755 diff --git a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/i18n/validation.properties b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/i18n/validation.properties old mode 100644 new mode 100755 diff --git a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/i18n/validation_en_US.properties b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/i18n/validation_en_US.properties old mode 100644 new mode 100755 diff --git a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/i18n/validation_zh_CN.properties b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/i18n/validation_zh_CN.properties old mode 100644 new mode 100755 diff --git a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/i18n/validation_zh_TW.properties b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/i18n/validation_zh_TW.properties old mode 100644 new mode 100755 diff --git a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/logback-spring.xml b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/logback-spring.xml old mode 100644 new mode 100755 diff --git a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/processes/favicon.ico b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/processes/favicon.ico deleted file mode 100644 index 2bd581cea17fd10bf80730efcf0563e634494a91..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 4286 zcmd6rTTc@~6vxLWUw!hKM?Z!i0Bu2TsS-6cTx^U+gVA^?F$OhFG%>~~61Dn5)V9zS zY^l%`s1Q@d(qdYKrfW;@ug1sYITNQ@=mITfcWrYzvpZ+c?>{qVXLrijKKwQ{G5Ter z2N*lZ7(0Z9r`TaMI?q4Yw%y03kaEKVvYz zHV4wmIE+Mwq08G|!|3%{xo^2#hCsp(XZ^i3KK10uu`v^8RVo!wv-R8>^!s{LW1o<^ zz!iH3q@h?Uf^+F5P`rA$!spHMXbm@+O~UIXCtUh?0a`pqca1j~x&fI&hR0bLH$23(i+)GtZ*XhYj?5!6T=)jE_JGE==8Sn93wx{U=Lka_1hZ1p5uY(i%=*PxQ5vu zA=R;*_%8AGY%vSuUr*ddeCWOub2=P(vMK)k1qW{{l=5&jczIJ>BaGdAgR9e=lSfXU z?+oYAoac%;o^wO4vvHtXa`&Z2P$uFgRFcq=T+QLgD(XmvQ`C zbl2eg`l31p_riB{=hONsaxjrifJN%iRm08DwJM)<*ztL(^}VNzPiru7={>;{cQ^cw zpp3Pbx^?mtJpTNMKOgsUz4989@$cV8?>`LNf8jjveJGZ??>~vTWe=>|{u^_yy8liy Twto=+A|O-h(XuXhX=MKaRZyEC diff --git a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/diagram-viewer/images/bg.png b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/diagram-viewer/images/bg.png old mode 100644 new mode 100755 diff --git a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/diagram-viewer/images/breadcrumbs.png b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/diagram-viewer/images/breadcrumbs.png old mode 100644 new mode 100755 diff --git a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/diagram-viewer/images/checker-bg.png b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/diagram-viewer/images/checker-bg.png old mode 100644 new mode 100755 diff --git a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/diagram-viewer/images/deployer/blue/message_catch.png b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/diagram-viewer/images/deployer/blue/message_catch.png old mode 100644 new mode 100755 diff --git a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/diagram-viewer/images/deployer/business_rule.png b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/diagram-viewer/images/deployer/business_rule.png old mode 100644 new mode 100755 diff --git a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/diagram-viewer/images/deployer/error_catch.png b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/diagram-viewer/images/deployer/error_catch.png old mode 100644 new mode 100755 diff --git a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/diagram-viewer/images/deployer/error_throw.png b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/diagram-viewer/images/deployer/error_throw.png old mode 100644 new mode 100755 diff --git a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/diagram-viewer/images/deployer/manual.png b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/diagram-viewer/images/deployer/manual.png old mode 100644 new mode 100755 diff --git a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/diagram-viewer/images/deployer/message_catch.png b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/diagram-viewer/images/deployer/message_catch.png old mode 100644 new mode 100755 diff --git a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/diagram-viewer/images/deployer/message_throw.png b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/diagram-viewer/images/deployer/message_throw.png old mode 100644 new mode 100755 diff --git a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/diagram-viewer/images/deployer/receive.png b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/diagram-viewer/images/deployer/receive.png old mode 100644 new mode 100755 diff --git a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/diagram-viewer/images/deployer/script.png b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/diagram-viewer/images/deployer/script.png old mode 100644 new mode 100755 diff --git a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/diagram-viewer/images/deployer/send.png b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/diagram-viewer/images/deployer/send.png old mode 100644 new mode 100755 diff --git a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/diagram-viewer/images/deployer/service.png b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/diagram-viewer/images/deployer/service.png old mode 100644 new mode 100755 diff --git a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/diagram-viewer/images/deployer/signal_catch.png b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/diagram-viewer/images/deployer/signal_catch.png old mode 100644 new mode 100755 diff --git a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/diagram-viewer/images/deployer/signal_throw.png b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/diagram-viewer/images/deployer/signal_throw.png old mode 100644 new mode 100755 diff --git a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/diagram-viewer/images/deployer/timer.png b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/diagram-viewer/images/deployer/timer.png old mode 100644 new mode 100755 diff --git a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/diagram-viewer/images/deployer/user.png b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/diagram-viewer/images/deployer/user.png old mode 100644 new mode 100755 diff --git a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/diagram-viewer/index.html b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/diagram-viewer/index.html old mode 100644 new mode 100755 diff --git a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/diagram-viewer/js/ActivitiRest.js b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/diagram-viewer/js/ActivitiRest.js old mode 100644 new mode 100755 diff --git a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/diagram-viewer/js/ActivityImpl.js b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/diagram-viewer/js/ActivityImpl.js old mode 100644 new mode 100755 diff --git a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/diagram-viewer/js/Color.js b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/diagram-viewer/js/Color.js old mode 100644 new mode 100755 diff --git a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/diagram-viewer/js/LineBreakMeasurer.js b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/diagram-viewer/js/LineBreakMeasurer.js old mode 100644 new mode 100755 diff --git a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/diagram-viewer/js/Polyline.js b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/diagram-viewer/js/Polyline.js old mode 100644 new mode 100755 diff --git a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/diagram-viewer/js/ProcessDiagramCanvas.js b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/diagram-viewer/js/ProcessDiagramCanvas.js old mode 100644 new mode 100755 diff --git a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/diagram-viewer/js/ProcessDiagramGenerator.js b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/diagram-viewer/js/ProcessDiagramGenerator.js old mode 100644 new mode 100755 diff --git a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/diagram-viewer/js/jquery/jquery.asyncqueue.js b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/diagram-viewer/js/jquery/jquery.asyncqueue.js old mode 100644 new mode 100755 diff --git a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/diagram-viewer/js/jquery/jquery.js b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/diagram-viewer/js/jquery/jquery.js old mode 100644 new mode 100755 diff --git a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/diagram-viewer/js/jquery/jquery.progressbar.js b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/diagram-viewer/js/jquery/jquery.progressbar.js old mode 100644 new mode 100755 diff --git a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/diagram-viewer/js/jstools.js b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/diagram-viewer/js/jstools.js old mode 100644 new mode 100755 diff --git a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/diagram-viewer/js/raphael.2.1.1.js b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/diagram-viewer/js/raphael.2.1.1.js old mode 100644 new mode 100755 diff --git a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/diagram-viewer/js/raphael.js b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/diagram-viewer/js/raphael.js old mode 100644 new mode 100755 diff --git a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/diagram-viewer/js/raphael_uncompressed.js b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/diagram-viewer/js/raphael_uncompressed.js old mode 100644 new mode 100755 diff --git a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/diagram-viewer/js/textlayout.js b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/diagram-viewer/js/textlayout.js old mode 100644 new mode 100755 diff --git a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/diagram-viewer/style.css b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/diagram-viewer/style.css old mode 100644 new mode 100755 diff --git a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/app-cfg.js b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/app-cfg.js old mode 100644 new mode 100755 diff --git a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/app.js b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/app.js old mode 100644 new mode 100755 diff --git a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/configuration/properties-assignment-controller.js b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/configuration/properties-assignment-controller.js old mode 100644 new mode 100755 diff --git a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/configuration/properties-condition-expression-controller.js b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/configuration/properties-condition-expression-controller.js old mode 100644 new mode 100755 diff --git a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/configuration/properties-custom-controllers.js b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/configuration/properties-custom-controllers.js old mode 100644 new mode 100755 diff --git a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/configuration/properties-default-controllers.js b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/configuration/properties-default-controllers.js old mode 100644 new mode 100755 diff --git a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/configuration/properties-event-listeners-controller.js b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/configuration/properties-event-listeners-controller.js old mode 100644 new mode 100755 diff --git a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/configuration/properties-execution-listeners-controller.js b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/configuration/properties-execution-listeners-controller.js old mode 100644 new mode 100755 diff --git a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/configuration/properties-fields-controller.js b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/configuration/properties-fields-controller.js old mode 100644 new mode 100755 diff --git a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/configuration/properties-form-properties-controller.js b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/configuration/properties-form-properties-controller.js old mode 100644 new mode 100755 diff --git a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/configuration/properties-in-parameters-controller.js b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/configuration/properties-in-parameters-controller.js old mode 100644 new mode 100755 diff --git a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/configuration/properties-message-definitions-controller.js b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/configuration/properties-message-definitions-controller.js old mode 100644 new mode 100755 diff --git a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/configuration/properties-message-scope-controller.js b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/configuration/properties-message-scope-controller.js old mode 100644 new mode 100755 diff --git a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/configuration/properties-multiinstance-controller.js b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/configuration/properties-multiinstance-controller.js old mode 100644 new mode 100755 diff --git a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/configuration/properties-out-parameters-controller.js b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/configuration/properties-out-parameters-controller.js old mode 100644 new mode 100755 diff --git a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/configuration/properties-sequenceflow-order-controller.js b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/configuration/properties-sequenceflow-order-controller.js old mode 100644 new mode 100755 diff --git a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/configuration/properties-signal-definitions-controller.js b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/configuration/properties-signal-definitions-controller.js old mode 100644 new mode 100755 diff --git a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/configuration/properties-signal-scope-controller.js b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/configuration/properties-signal-scope-controller.js old mode 100644 new mode 100755 diff --git a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/configuration/properties-task-listeners-controller.js b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/configuration/properties-task-listeners-controller.js old mode 100644 new mode 100755 diff --git a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/configuration/properties.js b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/configuration/properties.js old mode 100644 new mode 100755 diff --git a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/configuration/properties/assignment-display-template.html b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/configuration/properties/assignment-display-template.html old mode 100644 new mode 100755 diff --git a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/configuration/properties/assignment-popup.html b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/configuration/properties/assignment-popup.html old mode 100644 new mode 100755 diff --git a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/configuration/properties/assignment-write-template.html b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/configuration/properties/assignment-write-template.html old mode 100644 new mode 100755 diff --git a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/configuration/properties/boolean-property-template.html b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/configuration/properties/boolean-property-template.html old mode 100644 new mode 100755 diff --git a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/configuration/properties/condition-expression-display-template.html b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/configuration/properties/condition-expression-display-template.html old mode 100644 new mode 100755 diff --git a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/configuration/properties/condition-expression-popup.html b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/configuration/properties/condition-expression-popup.html old mode 100644 new mode 100755 diff --git a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/configuration/properties/condition-expression-write-template.html b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/configuration/properties/condition-expression-write-template.html old mode 100644 new mode 100755 diff --git a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/configuration/properties/default-value-display-template.html b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/configuration/properties/default-value-display-template.html old mode 100644 new mode 100755 diff --git a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/configuration/properties/event-listeners-display-template.html b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/configuration/properties/event-listeners-display-template.html old mode 100644 new mode 100755 diff --git a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/configuration/properties/event-listeners-popup.html b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/configuration/properties/event-listeners-popup.html old mode 100644 new mode 100755 diff --git a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/configuration/properties/event-listeners-write-template.html b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/configuration/properties/event-listeners-write-template.html old mode 100644 new mode 100755 diff --git a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/configuration/properties/execution-listeners-display-template.html b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/configuration/properties/execution-listeners-display-template.html old mode 100644 new mode 100755 diff --git a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/configuration/properties/execution-listeners-popup.html b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/configuration/properties/execution-listeners-popup.html old mode 100644 new mode 100755 diff --git a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/configuration/properties/execution-listeners-write-template.html b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/configuration/properties/execution-listeners-write-template.html old mode 100644 new mode 100755 diff --git a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/configuration/properties/feedback-popup.html b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/configuration/properties/feedback-popup.html old mode 100644 new mode 100755 diff --git a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/configuration/properties/fields-display-template.html b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/configuration/properties/fields-display-template.html old mode 100644 new mode 100755 diff --git a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/configuration/properties/fields-popup.html b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/configuration/properties/fields-popup.html old mode 100644 new mode 100755 diff --git a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/configuration/properties/fields-write-template.html b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/configuration/properties/fields-write-template.html old mode 100644 new mode 100755 diff --git a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/configuration/properties/form-properties-display-template.html b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/configuration/properties/form-properties-display-template.html old mode 100644 new mode 100755 diff --git a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/configuration/properties/form-properties-popup.html b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/configuration/properties/form-properties-popup.html old mode 100644 new mode 100755 diff --git a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/configuration/properties/form-properties-write-template.html b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/configuration/properties/form-properties-write-template.html old mode 100644 new mode 100755 diff --git a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/configuration/properties/in-parameters-display-template.html b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/configuration/properties/in-parameters-display-template.html old mode 100644 new mode 100755 diff --git a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/configuration/properties/in-parameters-popup.html b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/configuration/properties/in-parameters-popup.html old mode 100644 new mode 100755 diff --git a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/configuration/properties/in-parameters-write-template.html b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/configuration/properties/in-parameters-write-template.html old mode 100644 new mode 100755 diff --git a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/configuration/properties/message-definitions-display-template.html b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/configuration/properties/message-definitions-display-template.html old mode 100644 new mode 100755 diff --git a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/configuration/properties/message-definitions-popup.html b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/configuration/properties/message-definitions-popup.html old mode 100644 new mode 100755 diff --git a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/configuration/properties/message-definitions-write-template.html b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/configuration/properties/message-definitions-write-template.html old mode 100644 new mode 100755 diff --git a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/configuration/properties/message-property-write-template.html b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/configuration/properties/message-property-write-template.html old mode 100644 new mode 100755 diff --git a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/configuration/properties/multiinstance-property-write-template.html b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/configuration/properties/multiinstance-property-write-template.html old mode 100644 new mode 100755 diff --git a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/configuration/properties/out-parameters-display-template.html b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/configuration/properties/out-parameters-display-template.html old mode 100644 new mode 100755 diff --git a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/configuration/properties/out-parameters-popup.html b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/configuration/properties/out-parameters-popup.html old mode 100644 new mode 100755 diff --git a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/configuration/properties/out-parameters-write-template.html b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/configuration/properties/out-parameters-write-template.html old mode 100644 new mode 100755 diff --git a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/configuration/properties/sequenceflow-order-display-template.html b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/configuration/properties/sequenceflow-order-display-template.html old mode 100644 new mode 100755 diff --git a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/configuration/properties/sequenceflow-order-popup.html b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/configuration/properties/sequenceflow-order-popup.html old mode 100644 new mode 100755 diff --git a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/configuration/properties/sequenceflow-order-write-template.html b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/configuration/properties/sequenceflow-order-write-template.html old mode 100644 new mode 100755 diff --git a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/configuration/properties/signal-definitions-display-template.html b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/configuration/properties/signal-definitions-display-template.html old mode 100644 new mode 100755 diff --git a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/configuration/properties/signal-definitions-popup.html b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/configuration/properties/signal-definitions-popup.html old mode 100644 new mode 100755 diff --git a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/configuration/properties/signal-definitions-write-template.html b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/configuration/properties/signal-definitions-write-template.html old mode 100644 new mode 100755 diff --git a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/configuration/properties/signal-property-write-template.html b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/configuration/properties/signal-property-write-template.html old mode 100644 new mode 100755 diff --git a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/configuration/properties/string-property-write-mode-template.html b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/configuration/properties/string-property-write-mode-template.html old mode 100644 new mode 100755 diff --git a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/configuration/properties/subprocess-reference-display-template.html b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/configuration/properties/subprocess-reference-display-template.html old mode 100644 new mode 100755 diff --git a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/configuration/properties/subprocess-reference-popup.html b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/configuration/properties/subprocess-reference-popup.html old mode 100644 new mode 100755 diff --git a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/configuration/properties/subprocess-reference-write-template.html b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/configuration/properties/subprocess-reference-write-template.html old mode 100644 new mode 100755 diff --git a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/configuration/properties/task-listeners-display-template.html b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/configuration/properties/task-listeners-display-template.html old mode 100644 new mode 100755 diff --git a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/configuration/properties/task-listeners-popup.html b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/configuration/properties/task-listeners-popup.html old mode 100644 new mode 100755 diff --git a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/configuration/properties/task-listeners-write-template.html b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/configuration/properties/task-listeners-write-template.html old mode 100644 new mode 100755 diff --git a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/configuration/properties/text-popup.html b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/configuration/properties/text-popup.html old mode 100644 new mode 100755 diff --git a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/configuration/properties/text-property-write-template.html b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/configuration/properties/text-property-write-template.html old mode 100644 new mode 100755 diff --git a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/configuration/toolbar-custom-actions.js b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/configuration/toolbar-custom-actions.js old mode 100644 new mode 100755 diff --git a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/configuration/toolbar-default-actions.js b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/configuration/toolbar-default-actions.js old mode 100644 new mode 100755 diff --git a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/configuration/toolbar.js b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/configuration/toolbar.js old mode 100644 new mode 100755 diff --git a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/configuration/url-config.js b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/configuration/url-config.js old mode 100644 new mode 100755 diff --git a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/css/style-common.css b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/css/style-common.css old mode 100644 new mode 100755 diff --git a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/css/style-editor.css b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/css/style-editor.css old mode 100644 new mode 100755 diff --git a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/css/style.css b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/css/style.css old mode 100644 new mode 100755 diff --git a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/editor-config.js b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/editor-config.js old mode 100644 new mode 100755 diff --git a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/editor-controller.js b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/editor-controller.js old mode 100644 new mode 100755 diff --git a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/editor-utils.js b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/editor-utils.js old mode 100644 new mode 100755 diff --git a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/editor.html b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/editor.html old mode 100644 new mode 100755 diff --git a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/editor/css/editor.css b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/editor/css/editor.css old mode 100644 new mode 100755 diff --git a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/editor/i18n/translation_de.js b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/editor/i18n/translation_de.js old mode 100644 new mode 100755 diff --git a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/editor/i18n/translation_en_us.js b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/editor/i18n/translation_en_us.js old mode 100644 new mode 100755 diff --git a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/editor/i18n/translation_signavio_de.js b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/editor/i18n/translation_signavio_de.js old mode 100644 new mode 100755 diff --git a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/editor/i18n/translation_signavio_en_us.js b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/editor/i18n/translation_signavio_en_us.js old mode 100644 new mode 100755 diff --git a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/editor/oryx.debug.js b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/editor/oryx.debug.js old mode 100644 new mode 100755 diff --git a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/editor/oryx.js b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/editor/oryx.js old mode 100644 new mode 100755 diff --git a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/eventbus.js b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/eventbus.js old mode 100644 new mode 100755 diff --git a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/fonts/activiti-admin-webfont.eot b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/fonts/activiti-admin-webfont.eot old mode 100644 new mode 100755 diff --git a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/fonts/activiti-admin-webfont.svg b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/fonts/activiti-admin-webfont.svg old mode 100644 new mode 100755 diff --git a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/fonts/activiti-admin-webfont.ttf b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/fonts/activiti-admin-webfont.ttf old mode 100644 new mode 100755 diff --git a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/fonts/activiti-admin-webfont.woff b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/fonts/activiti-admin-webfont.woff old mode 100644 new mode 100755 diff --git a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/fonts/glyphicons-halflings-regular.eot b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/fonts/glyphicons-halflings-regular.eot old mode 100644 new mode 100755 diff --git a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/fonts/glyphicons-halflings-regular.svg b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/fonts/glyphicons-halflings-regular.svg old mode 100644 new mode 100755 diff --git a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/fonts/glyphicons-halflings-regular.ttf b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/fonts/glyphicons-halflings-regular.ttf old mode 100644 new mode 100755 diff --git a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/fonts/glyphicons-halflings-regular.woff b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/fonts/glyphicons-halflings-regular.woff old mode 100644 new mode 100755 diff --git a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/header-controller.js b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/header-controller.js old mode 100644 new mode 100755 diff --git a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/i18n/en.json b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/i18n/en.json old mode 100644 new mode 100755 diff --git a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/images/bpmn-error.png b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/images/bpmn-error.png old mode 100644 new mode 100755 diff --git a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/images/bpmn-warning.png b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/images/bpmn-warning.png old mode 100644 new mode 100755 diff --git a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/images/datadefinition.png b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/images/datadefinition.png old mode 100644 new mode 100755 diff --git a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/images/delete.png b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/images/delete.png old mode 100644 new mode 100755 diff --git a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/images/loading.gif b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/images/loading.gif old mode 100644 new mode 100755 diff --git a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/images/logo-2x.png b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/images/logo-2x.png old mode 100644 new mode 100755 diff --git a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/images/logo.png b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/images/logo.png old mode 100644 new mode 100755 diff --git a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/images/nw-handle-dark.gif b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/images/nw-handle-dark.gif old mode 100644 new mode 100755 diff --git a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/images/se-handle-dark.gif b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/images/se-handle-dark.gif old mode 100644 new mode 100755 diff --git a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/images/shapemenu_highlight.png b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/images/shapemenu_highlight.png old mode 100644 new mode 100755 diff --git a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/images/wrench.png b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/images/wrench.png old mode 100644 new mode 100755 diff --git a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/libs/angular-cookies_1.2.13/angular-cookies.min.js b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/libs/angular-cookies_1.2.13/angular-cookies.min.js old mode 100644 new mode 100755 diff --git a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/libs/angular-cookies_1.2.13/angular-cookies.min.js.map b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/libs/angular-cookies_1.2.13/angular-cookies.min.js.map old mode 100644 new mode 100755 diff --git a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/libs/angular-dragdrop.min-1.0.3.js b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/libs/angular-dragdrop.min-1.0.3.js old mode 100644 new mode 100755 diff --git a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/libs/angular-dragdrop_1.0.7/angular-dragdrop.min.js b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/libs/angular-dragdrop_1.0.7/angular-dragdrop.min.js old mode 100644 new mode 100755 diff --git a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/libs/angular-mocks_1.2.13/angular-mocks.js b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/libs/angular-mocks_1.2.13/angular-mocks.js old mode 100644 new mode 100755 diff --git a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/libs/angular-resource_1.2.13/angular-resource.js b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/libs/angular-resource_1.2.13/angular-resource.js old mode 100644 new mode 100755 diff --git a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/libs/angular-resource_1.2.13/angular-resource.min.js b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/libs/angular-resource_1.2.13/angular-resource.min.js old mode 100644 new mode 100755 diff --git a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/libs/angular-resource_1.2.13/angular-resource.min.js.map b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/libs/angular-resource_1.2.13/angular-resource.min.js.map old mode 100644 new mode 100755 diff --git a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/libs/angular-route_1.2.13/angular-route.js b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/libs/angular-route_1.2.13/angular-route.js old mode 100644 new mode 100755 diff --git a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/libs/angular-route_1.2.13/angular-route.min.js b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/libs/angular-route_1.2.13/angular-route.min.js old mode 100644 new mode 100755 diff --git a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/libs/angular-route_1.2.13/angular-route.min.js.map b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/libs/angular-route_1.2.13/angular-route.min.js.map old mode 100644 new mode 100755 diff --git a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/libs/angular-sanitize_1.2.13/angular-sanitize.js b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/libs/angular-sanitize_1.2.13/angular-sanitize.js old mode 100644 new mode 100755 diff --git a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/libs/angular-sanitize_1.2.13/angular-sanitize.min.js b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/libs/angular-sanitize_1.2.13/angular-sanitize.min.js old mode 100644 new mode 100755 diff --git a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/libs/angular-sanitize_1.2.13/angular-sanitize.min.js.map b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/libs/angular-sanitize_1.2.13/angular-sanitize.min.js.map old mode 100644 new mode 100755 diff --git a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/libs/angular-scroll_0.5.7/angular-scroll.min.js b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/libs/angular-scroll_0.5.7/angular-scroll.min.js old mode 100644 new mode 100755 diff --git a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/libs/angular-strap_2.0.5/angular-strap.min.js b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/libs/angular-strap_2.0.5/angular-strap.min.js old mode 100644 new mode 100755 diff --git a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/libs/angular-strap_2.0.5/angular-strap.tpl.min.js b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/libs/angular-strap_2.0.5/angular-strap.tpl.min.js old mode 100644 new mode 100755 diff --git a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/libs/angular-translate-loader-static-files/.bower.json b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/libs/angular-translate-loader-static-files/.bower.json old mode 100644 new mode 100755 diff --git a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/libs/angular-translate-loader-static-files/angular-translate-loader-static-files.js b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/libs/angular-translate-loader-static-files/angular-translate-loader-static-files.js old mode 100644 new mode 100755 diff --git a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/libs/angular-translate-loader-static-files/angular-translate-loader-static-files.min.js b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/libs/angular-translate-loader-static-files/angular-translate-loader-static-files.min.js old mode 100644 new mode 100755 diff --git a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/libs/angular-translate-storage-cookie/.bower.json b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/libs/angular-translate-storage-cookie/.bower.json old mode 100644 new mode 100755 diff --git a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/libs/angular-translate-storage-cookie/angular-translate-storage-cookie.js b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/libs/angular-translate-storage-cookie/angular-translate-storage-cookie.js old mode 100644 new mode 100755 diff --git a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/libs/angular-translate-storage-cookie/angular-translate-storage-cookie.min.js b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/libs/angular-translate-storage-cookie/angular-translate-storage-cookie.min.js old mode 100644 new mode 100755 diff --git a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/libs/angular-translate_2.4.2/angular-translate.js b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/libs/angular-translate_2.4.2/angular-translate.js old mode 100644 new mode 100755 diff --git a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/libs/angular-translate_2.4.2/angular-translate.min.js b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/libs/angular-translate_2.4.2/angular-translate.min.js old mode 100644 new mode 100755 diff --git a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/libs/angular_1.2.13/angular-animate.min.js b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/libs/angular_1.2.13/angular-animate.min.js old mode 100644 new mode 100755 diff --git a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/libs/angular_1.2.13/angular.min.js b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/libs/angular_1.2.13/angular.min.js old mode 100644 new mode 100755 diff --git a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/libs/bootstrap-daterangepicker_1.3.7/daterangepicker-bs3.css b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/libs/bootstrap-daterangepicker_1.3.7/daterangepicker-bs3.css old mode 100644 new mode 100755 diff --git a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/libs/bootstrap-daterangepicker_1.3.7/daterangepicker.js b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/libs/bootstrap-daterangepicker_1.3.7/daterangepicker.js old mode 100644 new mode 100755 diff --git a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/libs/bootstrap_3.1.1/css/bootstrap-theme.css b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/libs/bootstrap_3.1.1/css/bootstrap-theme.css old mode 100644 new mode 100755 diff --git a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/libs/bootstrap_3.1.1/css/bootstrap-theme.css.map b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/libs/bootstrap_3.1.1/css/bootstrap-theme.css.map old mode 100644 new mode 100755 diff --git a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/libs/bootstrap_3.1.1/css/bootstrap-theme.min.css b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/libs/bootstrap_3.1.1/css/bootstrap-theme.min.css old mode 100644 new mode 100755 diff --git a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/libs/bootstrap_3.1.1/css/bootstrap.css b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/libs/bootstrap_3.1.1/css/bootstrap.css old mode 100644 new mode 100755 diff --git a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/libs/bootstrap_3.1.1/css/bootstrap.css.map b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/libs/bootstrap_3.1.1/css/bootstrap.css.map old mode 100644 new mode 100755 diff --git a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/libs/bootstrap_3.1.1/css/bootstrap.min.css b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/libs/bootstrap_3.1.1/css/bootstrap.min.css old mode 100644 new mode 100755 diff --git a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/libs/bootstrap_3.1.1/fonts/glyphicons-halflings-regular.eot b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/libs/bootstrap_3.1.1/fonts/glyphicons-halflings-regular.eot old mode 100644 new mode 100755 diff --git a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/libs/bootstrap_3.1.1/fonts/glyphicons-halflings-regular.svg b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/libs/bootstrap_3.1.1/fonts/glyphicons-halflings-regular.svg old mode 100644 new mode 100755 diff --git a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/libs/bootstrap_3.1.1/fonts/glyphicons-halflings-regular.ttf b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/libs/bootstrap_3.1.1/fonts/glyphicons-halflings-regular.ttf old mode 100644 new mode 100755 diff --git a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/libs/bootstrap_3.1.1/fonts/glyphicons-halflings-regular.woff b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/libs/bootstrap_3.1.1/fonts/glyphicons-halflings-regular.woff old mode 100644 new mode 100755 diff --git a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/libs/bootstrap_3.1.1/js/bootstrap.js b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/libs/bootstrap_3.1.1/js/bootstrap.js old mode 100644 new mode 100755 diff --git a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/libs/bootstrap_3.1.1/js/bootstrap.min.js b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/libs/bootstrap_3.1.1/js/bootstrap.min.js old mode 100644 new mode 100755 diff --git a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/libs/es5-shim-15.3.4.5/.bower.json b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/libs/es5-shim-15.3.4.5/.bower.json old mode 100644 new mode 100755 diff --git a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/libs/es5-shim-15.3.4.5/.gitignore b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/libs/es5-shim-15.3.4.5/.gitignore old mode 100644 new mode 100755 diff --git a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/libs/es5-shim-15.3.4.5/CHANGES b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/libs/es5-shim-15.3.4.5/CHANGES old mode 100644 new mode 100755 diff --git a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/libs/es5-shim-15.3.4.5/CONTRIBUTORS.md b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/libs/es5-shim-15.3.4.5/CONTRIBUTORS.md old mode 100644 new mode 100755 diff --git a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/libs/es5-shim-15.3.4.5/LICENSE b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/libs/es5-shim-15.3.4.5/LICENSE old mode 100644 new mode 100755 diff --git a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/libs/es5-shim-15.3.4.5/README.md b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/libs/es5-shim-15.3.4.5/README.md old mode 100644 new mode 100755 diff --git a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/libs/es5-shim-15.3.4.5/es5-sham.js b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/libs/es5-shim-15.3.4.5/es5-sham.js old mode 100644 new mode 100755 diff --git a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/libs/es5-shim-15.3.4.5/es5-sham.map b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/libs/es5-shim-15.3.4.5/es5-sham.map old mode 100644 new mode 100755 diff --git a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/libs/es5-shim-15.3.4.5/es5-sham.min.js b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/libs/es5-shim-15.3.4.5/es5-sham.min.js old mode 100644 new mode 100755 diff --git a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/libs/es5-shim-15.3.4.5/es5-shim.js b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/libs/es5-shim-15.3.4.5/es5-shim.js old mode 100644 new mode 100755 diff --git a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/libs/es5-shim-15.3.4.5/es5-shim.map b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/libs/es5-shim-15.3.4.5/es5-shim.map old mode 100644 new mode 100755 diff --git a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/libs/es5-shim-15.3.4.5/es5-shim.min.js b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/libs/es5-shim-15.3.4.5/es5-shim.min.js old mode 100644 new mode 100755 diff --git a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/libs/es5-shim-15.3.4.5/package.json b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/libs/es5-shim-15.3.4.5/package.json old mode 100644 new mode 100755 diff --git a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/libs/es5-shim-15.3.4.5/tests/helpers/h-kill.js b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/libs/es5-shim-15.3.4.5/tests/helpers/h-kill.js old mode 100644 new mode 100755 diff --git a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/libs/es5-shim-15.3.4.5/tests/helpers/h-matchers.js b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/libs/es5-shim-15.3.4.5/tests/helpers/h-matchers.js old mode 100644 new mode 100755 diff --git a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/libs/es5-shim-15.3.4.5/tests/helpers/h.js b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/libs/es5-shim-15.3.4.5/tests/helpers/h.js old mode 100644 new mode 100755 diff --git a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/libs/es5-shim-15.3.4.5/tests/index.html b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/libs/es5-shim-15.3.4.5/tests/index.html old mode 100644 new mode 100755 diff --git a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/libs/es5-shim-15.3.4.5/tests/index.min.html b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/libs/es5-shim-15.3.4.5/tests/index.min.html old mode 100644 new mode 100755 diff --git a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/libs/es5-shim-15.3.4.5/tests/lib/jasmine-html.js b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/libs/es5-shim-15.3.4.5/tests/lib/jasmine-html.js old mode 100644 new mode 100755 diff --git a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/libs/es5-shim-15.3.4.5/tests/lib/jasmine.css b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/libs/es5-shim-15.3.4.5/tests/lib/jasmine.css old mode 100644 new mode 100755 diff --git a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/libs/es5-shim-15.3.4.5/tests/lib/jasmine.js b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/libs/es5-shim-15.3.4.5/tests/lib/jasmine.js old mode 100644 new mode 100755 diff --git a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/libs/es5-shim-15.3.4.5/tests/lib/jasmine_favicon.png b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/libs/es5-shim-15.3.4.5/tests/lib/jasmine_favicon.png old mode 100644 new mode 100755 diff --git a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/libs/es5-shim-15.3.4.5/tests/lib/json2.js b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/libs/es5-shim-15.3.4.5/tests/lib/json2.js old mode 100644 new mode 100755 diff --git a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/libs/es5-shim-15.3.4.5/tests/spec/s-array.js b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/libs/es5-shim-15.3.4.5/tests/spec/s-array.js old mode 100644 new mode 100755 diff --git a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/libs/es5-shim-15.3.4.5/tests/spec/s-date.js b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/libs/es5-shim-15.3.4.5/tests/spec/s-date.js old mode 100644 new mode 100755 diff --git a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/libs/es5-shim-15.3.4.5/tests/spec/s-function.js b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/libs/es5-shim-15.3.4.5/tests/spec/s-function.js old mode 100644 new mode 100755 diff --git a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/libs/es5-shim-15.3.4.5/tests/spec/s-number.js b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/libs/es5-shim-15.3.4.5/tests/spec/s-number.js old mode 100644 new mode 100755 diff --git a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/libs/es5-shim-15.3.4.5/tests/spec/s-object.js b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/libs/es5-shim-15.3.4.5/tests/spec/s-object.js old mode 100644 new mode 100755 diff --git a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/libs/es5-shim-15.3.4.5/tests/spec/s-string.js b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/libs/es5-shim-15.3.4.5/tests/spec/s-string.js old mode 100644 new mode 100755 diff --git a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/libs/jquery-ui-1.10.3.custom.min.js b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/libs/jquery-ui-1.10.3.custom.min.js old mode 100644 new mode 100755 diff --git a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/libs/jquery.autogrow-textarea.js b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/libs/jquery.autogrow-textarea.js old mode 100644 new mode 100755 diff --git a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/libs/jquery_1.11.0/jquery.js b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/libs/jquery_1.11.0/jquery.js old mode 100644 new mode 100755 diff --git a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/libs/jquery_1.11.0/jquery.min.js b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/libs/jquery_1.11.0/jquery.min.js old mode 100644 new mode 100755 diff --git a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/libs/jquery_1.11.0/jquery.min.map b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/libs/jquery_1.11.0/jquery.min.map old mode 100644 new mode 100755 diff --git a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/libs/json3_3.2.6/LICENSE b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/libs/json3_3.2.6/LICENSE old mode 100644 new mode 100755 diff --git a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/libs/json3_3.2.6/lib/json3.js b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/libs/json3_3.2.6/lib/json3.js old mode 100644 new mode 100755 diff --git a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/libs/json3_3.2.6/lib/json3.min.js b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/libs/json3_3.2.6/lib/json3.min.js old mode 100644 new mode 100755 diff --git a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/libs/momentjs_2.5.1/momentjs.min.js b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/libs/momentjs_2.5.1/momentjs.min.js old mode 100644 new mode 100755 diff --git a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/libs/mousetrap-1.4.5.min.js b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/libs/mousetrap-1.4.5.min.js old mode 100644 new mode 100755 diff --git a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/libs/ng-grid-2.0.7-min.js b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/libs/ng-grid-2.0.7-min.js old mode 100644 new mode 100755 diff --git a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/libs/ng-grid-2.0.7.min.css b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/libs/ng-grid-2.0.7.min.css old mode 100644 new mode 100755 diff --git a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/libs/path_parser.js b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/libs/path_parser.js old mode 100644 new mode 100755 diff --git a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/libs/prototype-1.5.1.js b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/libs/prototype-1.5.1.js old mode 100644 new mode 100755 diff --git a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/libs/ui-utils.min-0.0.4.js b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/libs/ui-utils.min-0.0.4.js old mode 100644 new mode 100755 diff --git a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/partials/root-stencil-item-template.html b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/partials/root-stencil-item-template.html old mode 100644 new mode 100755 diff --git a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/partials/stencil-item-template.html b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/partials/stencil-item-template.html old mode 100644 new mode 100755 diff --git a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/plugins.xml b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/plugins.xml old mode 100644 new mode 100755 diff --git a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/popups/icon-template.html b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/popups/icon-template.html old mode 100644 new mode 100755 diff --git a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/popups/save-model.html b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/popups/save-model.html old mode 100644 new mode 100755 diff --git a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/popups/select-shape.html b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/popups/select-shape.html old mode 100644 new mode 100755 diff --git a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/popups/unsaved-changes.html b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/popups/unsaved-changes.html old mode 100644 new mode 100755 diff --git a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/select-shape-controller.js b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/select-shape-controller.js old mode 100644 new mode 100755 diff --git a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/stencil-controller.js b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/stencil-controller.js old mode 100644 new mode 100755 diff --git a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/stencilsets/bpmn2.0/icons/activity/event.subprocess.collapsed.png b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/stencilsets/bpmn2.0/icons/activity/event.subprocess.collapsed.png old mode 100644 new mode 100755 diff --git a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/stencilsets/bpmn2.0/icons/activity/event.subprocess.png b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/stencilsets/bpmn2.0/icons/activity/event.subprocess.png old mode 100644 new mode 100755 diff --git a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/stencilsets/bpmn2.0/icons/activity/expanded.subprocess.png b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/stencilsets/bpmn2.0/icons/activity/expanded.subprocess.png old mode 100644 new mode 100755 diff --git a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/stencilsets/bpmn2.0/icons/activity/list/type.business.rule.png b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/stencilsets/bpmn2.0/icons/activity/list/type.business.rule.png old mode 100644 new mode 100755 diff --git a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/stencilsets/bpmn2.0/icons/activity/list/type.camel.png b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/stencilsets/bpmn2.0/icons/activity/list/type.camel.png old mode 100644 new mode 100755 diff --git a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/stencilsets/bpmn2.0/icons/activity/list/type.manual.png b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/stencilsets/bpmn2.0/icons/activity/list/type.manual.png old mode 100644 new mode 100755 diff --git a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/stencilsets/bpmn2.0/icons/activity/list/type.mule.png b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/stencilsets/bpmn2.0/icons/activity/list/type.mule.png old mode 100644 new mode 100755 diff --git a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/stencilsets/bpmn2.0/icons/activity/list/type.receive.png b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/stencilsets/bpmn2.0/icons/activity/list/type.receive.png old mode 100644 new mode 100755 diff --git a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/stencilsets/bpmn2.0/icons/activity/list/type.script.png b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/stencilsets/bpmn2.0/icons/activity/list/type.script.png old mode 100644 new mode 100755 diff --git a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/stencilsets/bpmn2.0/icons/activity/list/type.send.png b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/stencilsets/bpmn2.0/icons/activity/list/type.send.png old mode 100644 new mode 100755 diff --git a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/stencilsets/bpmn2.0/icons/activity/list/type.service.png b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/stencilsets/bpmn2.0/icons/activity/list/type.service.png old mode 100644 new mode 100755 diff --git a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/stencilsets/bpmn2.0/icons/activity/list/type.shell.png b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/stencilsets/bpmn2.0/icons/activity/list/type.shell.png old mode 100644 new mode 100755 diff --git a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/stencilsets/bpmn2.0/icons/activity/list/type.user.png b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/stencilsets/bpmn2.0/icons/activity/list/type.user.png old mode 100644 new mode 100755 diff --git a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/stencilsets/bpmn2.0/icons/activity/subprocess.png b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/stencilsets/bpmn2.0/icons/activity/subprocess.png old mode 100644 new mode 100755 diff --git a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/stencilsets/bpmn2.0/icons/activity/task.png b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/stencilsets/bpmn2.0/icons/activity/task.png old mode 100644 new mode 100755 diff --git a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/stencilsets/bpmn2.0/icons/artifact/text.annotation.png b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/stencilsets/bpmn2.0/icons/artifact/text.annotation.png old mode 100644 new mode 100755 diff --git a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/stencilsets/bpmn2.0/icons/catching/cancel.png b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/stencilsets/bpmn2.0/icons/catching/cancel.png old mode 100644 new mode 100755 diff --git a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/stencilsets/bpmn2.0/icons/catching/compensation.png b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/stencilsets/bpmn2.0/icons/catching/compensation.png old mode 100644 new mode 100755 diff --git a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/stencilsets/bpmn2.0/icons/catching/error.png b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/stencilsets/bpmn2.0/icons/catching/error.png old mode 100644 new mode 100755 diff --git a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/stencilsets/bpmn2.0/icons/catching/message.png b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/stencilsets/bpmn2.0/icons/catching/message.png old mode 100644 new mode 100755 diff --git a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/stencilsets/bpmn2.0/icons/catching/signal.png b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/stencilsets/bpmn2.0/icons/catching/signal.png old mode 100644 new mode 100755 diff --git a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/stencilsets/bpmn2.0/icons/catching/timer.png b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/stencilsets/bpmn2.0/icons/catching/timer.png old mode 100644 new mode 100755 diff --git a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/stencilsets/bpmn2.0/icons/connector/association.undirected.png b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/stencilsets/bpmn2.0/icons/connector/association.undirected.png old mode 100644 new mode 100755 diff --git a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/stencilsets/bpmn2.0/icons/connector/association.unidirectional.png b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/stencilsets/bpmn2.0/icons/connector/association.unidirectional.png old mode 100644 new mode 100755 diff --git a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/stencilsets/bpmn2.0/icons/connector/messageflow.png b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/stencilsets/bpmn2.0/icons/connector/messageflow.png old mode 100644 new mode 100755 diff --git a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/stencilsets/bpmn2.0/icons/connector/sequenceflow.png b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/stencilsets/bpmn2.0/icons/connector/sequenceflow.png old mode 100644 new mode 100755 diff --git a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/stencilsets/bpmn2.0/icons/dataobject/data.store.png b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/stencilsets/bpmn2.0/icons/dataobject/data.store.png old mode 100644 new mode 100755 diff --git a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/stencilsets/bpmn2.0/icons/diagram.png b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/stencilsets/bpmn2.0/icons/diagram.png old mode 100644 new mode 100755 diff --git a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/stencilsets/bpmn2.0/icons/endevent/cancel.png b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/stencilsets/bpmn2.0/icons/endevent/cancel.png old mode 100644 new mode 100755 diff --git a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/stencilsets/bpmn2.0/icons/endevent/error.png b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/stencilsets/bpmn2.0/icons/endevent/error.png old mode 100644 new mode 100755 diff --git a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/stencilsets/bpmn2.0/icons/endevent/none.png b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/stencilsets/bpmn2.0/icons/endevent/none.png old mode 100644 new mode 100755 diff --git a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/stencilsets/bpmn2.0/icons/endevent/terminate.png b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/stencilsets/bpmn2.0/icons/endevent/terminate.png old mode 100644 new mode 100755 diff --git a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/stencilsets/bpmn2.0/icons/gateway/eventbased.png b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/stencilsets/bpmn2.0/icons/gateway/eventbased.png old mode 100644 new mode 100755 diff --git a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/stencilsets/bpmn2.0/icons/gateway/exclusive.databased.png b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/stencilsets/bpmn2.0/icons/gateway/exclusive.databased.png old mode 100644 new mode 100755 diff --git a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/stencilsets/bpmn2.0/icons/gateway/inclusive.png b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/stencilsets/bpmn2.0/icons/gateway/inclusive.png old mode 100644 new mode 100755 diff --git a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/stencilsets/bpmn2.0/icons/gateway/parallel.png b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/stencilsets/bpmn2.0/icons/gateway/parallel.png old mode 100644 new mode 100755 diff --git a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/stencilsets/bpmn2.0/icons/startevent/error.png b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/stencilsets/bpmn2.0/icons/startevent/error.png old mode 100644 new mode 100755 diff --git a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/stencilsets/bpmn2.0/icons/startevent/message.png b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/stencilsets/bpmn2.0/icons/startevent/message.png old mode 100644 new mode 100755 diff --git a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/stencilsets/bpmn2.0/icons/startevent/none.png b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/stencilsets/bpmn2.0/icons/startevent/none.png old mode 100644 new mode 100755 diff --git a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/stencilsets/bpmn2.0/icons/startevent/signal.png b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/stencilsets/bpmn2.0/icons/startevent/signal.png old mode 100644 new mode 100755 diff --git a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/stencilsets/bpmn2.0/icons/startevent/timer.png b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/stencilsets/bpmn2.0/icons/startevent/timer.png old mode 100644 new mode 100755 diff --git a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/stencilsets/bpmn2.0/icons/swimlane/lane.png b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/stencilsets/bpmn2.0/icons/swimlane/lane.png old mode 100644 new mode 100755 diff --git a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/stencilsets/bpmn2.0/icons/swimlane/pool.png b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/stencilsets/bpmn2.0/icons/swimlane/pool.png old mode 100644 new mode 100755 diff --git a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/stencilsets/bpmn2.0/icons/throwing/none.png b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/stencilsets/bpmn2.0/icons/throwing/none.png old mode 100644 new mode 100755 diff --git a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/stencilsets/bpmn2.0/icons/throwing/signal.png b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/stencilsets/bpmn2.0/icons/throwing/signal.png old mode 100644 new mode 100755 diff --git a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/toolbar-controller.js b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/editor-app/toolbar-controller.js old mode 100644 new mode 100755 diff --git a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/favicon.ico b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/favicon.ico old mode 100644 new mode 100755 diff --git a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/modeler.html b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/public/modeler.html old mode 100644 new mode 100755 diff --git a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/registry.conf b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/registry.conf deleted file mode 100644 index 9cfedf9cc..000000000 --- a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/registry.conf +++ /dev/null @@ -1,21 +0,0 @@ -registry { - # file 、nacos 、eureka、redis、zk、consul、etcd3、sofa - type = "nacos" - - nacos { - serverAddr = "47.104.224.45" - namespace = "public" - cluster = "default" - } -} - -config { - # file、nacos 、apollo、zk、consul、etcd3 - type = "nacos" - - nacos { - serverAddr = "47.104.224.45" - namespace = "public" - cluster = "default" - } -} diff --git a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/stencilset.json b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/stencilset.json old mode 100644 new mode 100755 diff --git a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/test/java/com/elink/esua/epdc/ActivitiTest.java b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/test/java/com/elink/esua/epdc/ActivitiTest.java deleted file mode 100644 index 5594c95e7..000000000 --- a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/test/java/com/elink/esua/epdc/ActivitiTest.java +++ /dev/null @@ -1,110 +0,0 @@ -package com.elink.esua.epdc; - -import com.elink.esua.epdc.service.ActWorkflowCommonService; -import com.google.common.collect.Maps; -import org.activiti.engine.RuntimeService; -import org.activiti.engine.TaskService; -import org.activiti.engine.runtime.ProcessInstance; -import org.activiti.engine.task.Task; -import org.activiti.engine.task.TaskQuery; -import org.junit.Test; -import org.junit.runner.RunWith; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.boot.test.context.SpringBootTest; -import org.springframework.test.context.junit4.SpringRunner; - -import java.util.List; -import java.util.Map; - -/** - * @author yujintao - * @email yujintao@elink-cn.com - * @date 2019/9/3 10:06 - */ -@RunWith(SpringRunner.class) -@SpringBootTest -public class ActivitiTest { - - @Autowired - private ActWorkflowCommonService actWorkflowCommonService; - - @Autowired - private TaskService taskService; - - @Autowired - private RuntimeService runtimeService; - - @Test - public void test() { - String processId = "demoTask"; - // 启动一个任务流程 - actWorkflowCommonService.startProcess(processId, "testBusinessKey3", "testDeptId"); - } - - @Test - public void test2() { - String processId = "demoTask"; - String deptId = "testDeptId"; - this.queryTask(processId, deptId); - /* - 关联业务id：testBusinessKey - 流程实例id：5001 - 任务id：5006 - 任务标识：_4 - 任务负责人：testDeptId - 任务名称：初次审核 - 任务创建时间：Tue Sep 03 14:26:50 CST 2019 - */ - } - - @Test - public void test3() { - Map map = Maps.newHashMap(); - map.put("deptId", "testDeptId2"); - taskService.complete("5006", map); - } - - @Test - public void test4() { - String processId = "demoTask"; - String deptId = "testDeptId2"; - this.queryTask(processId, deptId); - /* - 关联业务id：testBusinessKey - 流程实例id：5001 - 任务id：7502 - 任务标识：_5 - 任务负责人：testDeptId2 - 任务名称：二次审核 - 任务创建时间：Tue Sep 03 14:49:29 CST 2019 - */ - } - - - private void queryTask(String processId, String deptId) { - //创建查询对象 - TaskQuery taskQuery = taskService.createTaskQuery().taskAssignee(deptId).processDefinitionKey(processId); - //获取查询列表 - List list = taskQuery.list(); - - for (Task task : list) { - //流程实例id - String processInstanceId = task.getProcessInstanceId(); - //根据流程实例id找到流程实例对象 - ProcessInstance processInstance = runtimeService - .createProcessInstanceQuery() - .processInstanceId(processInstanceId) - .singleResult(); - //从流程实例对象获取bussinesskey - String businessKey = processInstance.getBusinessKey(); - //根据businessKey查询业务系统，获取相关的业务信息 - System.out.println("关联业务id：" + businessKey); - System.out.println("流程实例id：" + task.getProcessInstanceId()); - System.out.println("任务id：" + task.getId()); - System.out.println("任务标识：" + task.getTaskDefinitionKey()); - System.out.println("任务负责人：" + task.getAssignee()); - System.out.println("任务名称：" + task.getName()); - System.out.println("任务创建时间：" + task.getCreateTime()); - } - } -} diff --git a/esua-epdc/epdc-module/epdc-activiti/pom.xml b/esua-epdc/epdc-module/epdc-activiti/pom.xml old mode 100644 new mode 100755 index 8ff2c9453..84f4583be --- a/esua-epdc/epdc-module/epdc-activiti/pom.xml +++ b/esua-epdc/epdc-module/epdc-activiti/pom.xml @@ -1,21 +1,21 @@ - 4.0.0 + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + 4.0.0 - - com.esua.epdc - epdc-module - 1.0.0 - + + com.esua.epdc + epdc-module + 1.0.0 + - com.esua.epdc - epdc-activiti - pom + com.esua.epdc + epdc-activiti + pom - - epdc-activiti-client - epdc-activiti-server - + + epdc-activiti-client + epdc-activiti-server + diff --git a/esua-epdc/epdc-module/epdc-demo/epdc-demo-server/pom.xml b/esua-epdc/epdc-module/epdc-demo/epdc-demo-server/pom.xml index ad41b113f..74a2db545 100644 --- a/esua-epdc/epdc-module/epdc-demo/epdc-demo-server/pom.xml +++ b/esua-epdc/epdc-module/epdc-demo/epdc-demo-server/pom.xml @@ -12,6 +12,11 @@ epdc-demo-server jar + + 47.104.85.99:9003 + 1.4.13 + + com.esua.epdc @@ -79,9 +84,37 @@ true + + org.apache.maven.plugins + maven-deploy-plugin + + true + + com.spotify - docker-maven-plugin + dockerfile-maven-plugin + ${dockerfile-maven-plugin.version} + + + default + + + build + push + + + + + admin + elink888 + 47.104.85.99:9002/repository/docker-private/ + latest + + + target/${project.build.finalName}.jar + + diff --git a/esua-epdc/epdc-module/epdc-events/db/esua_epdc_events.pdman.json b/esua-epdc/epdc-module/epdc-events/db/esua_epdc_events.pdman.json index 63dbb148a..65fe84ba5 100644 --- a/esua-epdc/epdc-module/epdc-events/db/esua_epdc_events.pdman.json +++ b/esua-epdc/epdc-module/epdc-events/db/esua_epdc_events.pdman.json @@ -5,119 +5,13 @@ "chnname": "逆向解析_MYSQL", "entities": [ { - "title": "EPDC_DEPT_KPI_CONFIG", - "chnname": "计分规则配置", + "title": "EPDC_CATEGORY", + "chnname": "分类管理", "fields": [ { "name": "ID", - "type": "VARCHAR_32", - "chnname": "ID", - "remark": "", - "pk": true, - "notNull": true, - "autoIncrement": false, - "defaultValue": "" - }, - { - "name": "KPI_ITEM_CODE", - "type": "VARCHAR_32", - "chnname": "绩效指标编码", - "remark": "", - "pk": false, - "notNull": true, - "autoIncrement": false, - "defaultValue": "" - }, - { - "name": "KPI_ITEM_VALUE", - "type": "INT_10", - "chnname": "绩效指标值", - "remark": "", - "pk": false, - "notNull": true, - "autoIncrement": false, - "defaultValue": "" - }, - { - "name": "KPI_ITEM_DESC", - "type": "VARCHAR_32", - "chnname": "绩效指标描述", - "remark": "", - "pk": false, - "notNull": true, - "autoIncrement": false, - "defaultValue": "" - }, - { - "name": "DEL_FLAG", - "type": "VARCHAR_2", - "chnname": "删除标识 0：未删除，1：删除", - "remark": "", - "pk": false, - "notNull": true, - "autoIncrement": false, - "defaultValue": "" - }, - { - "name": "REVISION", - "type": "INT_10", - "chnname": "乐观锁", - "remark": "", - "pk": false, - "notNull": false, - "autoIncrement": false, - "defaultValue": "" - }, - { - "name": "CREATED_BY", - "type": "VARCHAR_32", - "chnname": "创建人", - "remark": "", - "pk": false, - "notNull": true, - "autoIncrement": false, - "defaultValue": "" - }, - { - "name": "CREATED_TIME", - "type": "DATETIME", - "chnname": "创建时间", - "remark": "", - "pk": false, - "notNull": true, - "autoIncrement": false, - "defaultValue": "" - }, - { - "name": "UPDATED_BY", - "type": "VARCHAR_32", - "chnname": "更新人", - "remark": "", - "pk": false, - "notNull": true, - "autoIncrement": false, - "defaultValue": "" - }, - { - "name": "UPDATED_TIME", - "type": "DATETIME", - "chnname": "更新时间", - "remark": "", - "pk": false, - "notNull": true, - "autoIncrement": false, - "defaultValue": "" - } - ] - }, - { - "title": "EPDC_DEPT_RESPOND_LOG", - "chnname": "部门响应记录", - "fields": [ - { - "name": "ID", - "type": "VARCHAR_32", - "chnname": "ID", + "type": "BIGINT_19", + "chnname": "id", "remark": "", "pk": true, "notNull": true, @@ -125,39 +19,9 @@ "defaultValue": "" }, { - "name": "REFERENCE_ID", - "type": "VARCHAR_32", - "chnname": "引用ID", - "remark": "", - "pk": false, - "notNull": true, - "autoIncrement": false, - "defaultValue": "" - }, - { - "name": "REFERENCE_TYPE", - "type": "VARCHAR_32", - "chnname": "引用类型 issue或item或event", - "remark": "", - "pk": false, - "notNull": true, - "autoIncrement": false, - "defaultValue": "" - }, - { - "name": "RESPOND_DEPT_ID", + "name": "PID", "type": "BIGINT_19", - "chnname": "响应部门的id（被呼叫的部门即审核部门）", - "remark": "", - "pk": false, - "notNull": true, - "autoIncrement": false, - "defaultValue": "" - }, - { - "name": "RESPOND_TIME", - "type": "DATETIME", - "chnname": "响应时间即审核时间", + "chnname": "上级分类ID", "remark": "", "pk": false, "notNull": false, @@ -165,9 +29,9 @@ "defaultValue": "" }, { - "name": "RESPOND_TYPE", - "type": "INT_10", - "chnname": "响应类型，参考枚举类DeptRespondTypeEnum", + "name": "PIDS", + "type": "VARCHAR_500", + "chnname": "所有上级分类ID，用逗号分开", "remark": "", "pk": false, "notNull": false, @@ -175,19 +39,9 @@ "defaultValue": "" }, { - "name": "DEL_FLAG", - "type": "VARCHAR_2", - "chnname": "删除标识 0：未删除，1：删除", - "remark": "", - "pk": false, - "notNull": true, - "autoIncrement": false, - "defaultValue": "" - }, - { - "name": "REVISION", - "type": "INT_10", - "chnname": "乐观锁", + "name": "CATEGORY_NAME", + "type": "VARCHAR_50", + "chnname": "分类名称", "remark": "", "pk": false, "notNull": false, @@ -195,85 +49,19 @@ "defaultValue": "" }, { - "name": "CREATED_BY", - "type": "VARCHAR_32", - "chnname": "创建人", - "remark": "", - "pk": false, - "notNull": true, - "autoIncrement": false, - "defaultValue": "" - }, - { - "name": "CREATED_TIME", - "type": "DATETIME", - "chnname": "创建时间", - "remark": "", - "pk": false, - "notNull": true, - "autoIncrement": false, - "defaultValue": "" - }, - { - "name": "UPDATED_BY", - "type": "VARCHAR_32", - "chnname": "更新人", - "remark": "", - "pk": false, - "notNull": true, - "autoIncrement": false, - "defaultValue": "" - }, - { - "name": "UPDATED_TIME", - "type": "DATETIME", - "chnname": "更新时间", - "remark": "", - "pk": false, - "notNull": true, - "autoIncrement": false, - "defaultValue": "" - }, - { - "name": "RESPOND_FLAG", - "type": "VARCHAR_1", - "chnname": "是否被响应 0 否 1是", + "name": "CATEGORY_CODE", + "type": "VARCHAR_255", + "chnname": "分类编码", "remark": "", "pk": false, "notNull": false, "autoIncrement": false, "defaultValue": "" - } - ] - }, - { - "title": "EPDC_DEPT_RESPOND_TIME_CONFIG", - "chnname": "绩效考核时间规则表", - "fields": [ - { - "name": "ID", - "type": "VARCHAR_32", - "chnname": "ID", - "remark": "", - "pk": true, - "notNull": true, - "autoIncrement": false, - "defaultValue": "" - }, - { - "name": "CATEGORY_ID", - "type": "VARCHAR_32", - "chnname": "议题或项目类别ID(不可重复)", - "remark": "", - "pk": false, - "notNull": true, - "autoIncrement": false, - "defaultValue": "" }, { - "name": "CATEGORY_NAME", - "type": "VARCHAR_32", - "chnname": "类别名称", + "name": "CATEGORY_TYPE", + "type": "VARCHAR_50", + "chnname": "分类类别", "remark": "", "pk": false, "notNull": false, @@ -281,109 +69,19 @@ "defaultValue": "" }, { - "name": "GRID_VALID_RESP_LIMIT_HOUR", - "type": "INT_10", - "chnname": "网格长在多少小时内响应算是有效响应", - "remark": "", - "pk": false, - "notNull": true, - "autoIncrement": false, - "defaultValue": "" - }, - { - "name": "GRID_VALID_CLOSE_LIMIT_HOUR", - "type": "INT_10", - "chnname": "网格长在多少小时内关闭算是有效关闭", - "remark": "", - "pk": false, - "notNull": true, - "autoIncrement": false, - "defaultValue": "" - }, - { - "name": "COMM_VALID_RESP_LIMIT_HOUR", - "type": "INT_10", - "chnname": "社区在多少小时内响应算是有效响应", - "remark": "", - "pk": false, - "notNull": true, - "autoIncrement": false, - "defaultValue": "" - }, - { - "name": "STREET_VALID_RESP_LIMIT_HOUR", - "type": "INT_10", - "chnname": "街道在多少小时内响应算是有效响应", - "remark": "", - "pk": false, - "notNull": true, - "autoIncrement": false, - "defaultValue": "" - }, - { - "name": "DISTRICT_VALID_RESP_LIMIT_HOUR", - "type": "INT_10", - "chnname": "区直在多少小时内响应算是有效响应", - "remark": "", - "pk": false, - "notNull": true, - "autoIncrement": false, - "defaultValue": "" - }, - { - "name": "INVALID_RESP_LIMIT_HOUR", - "type": "INT_10", - "chnname": "超过多少小时响应算是无效响应。此值应大于各部门的有效响应值。若响应发生在有效响应与无效响应之间，为超时响应。", - "remark": "", - "pk": false, - "notNull": true, - "autoIncrement": false, - "defaultValue": "" - }, - { - "name": "VALID_RESP_COEFFICIENT", - "type": "DECIMAL_5_1", - "chnname": "有效响应系数", - "remark": "", - "pk": false, - "notNull": true, - "autoIncrement": false, - "defaultValue": "" - }, - { - "name": "OVERTIME_RESP_COEFFICIENT", - "type": "DECIMAL_5_1", - "chnname": "超时响应系数", - "remark": "", - "pk": false, - "notNull": true, - "autoIncrement": false, - "defaultValue": "" - }, - { - "name": "INVALID_RESP_COEFFICIENT", - "type": "DECIMAL_5_1", - "chnname": "无效响应系数", + "name": "SORT", + "type": "INT UNSIGNED_10", + "chnname": "排序", "remark": "", "pk": false, - "notNull": true, + "notNull": false, "autoIncrement": false, "defaultValue": "" }, { "name": "DEL_FLAG", - "type": "VARCHAR_2", - "chnname": "删除标识 0：未删除，1：删除", - "remark": "", - "pk": false, - "notNull": true, - "autoIncrement": false, - "defaultValue": "" - }, - { - "name": "REVISION", - "type": "INT_10", - "chnname": "乐观锁", + "type": "TINYINT UNSIGNED_3", + "chnname": "删除标识 0：未删除 1：删除", "remark": "", "pk": false, "notNull": false, @@ -391,42 +89,42 @@ "defaultValue": "" }, { - "name": "CREATED_BY", - "type": "VARCHAR_32", - "chnname": "创建人", + "name": "CREATOR", + "type": "BIGINT_19", + "chnname": "创建者", "remark": "", "pk": false, - "notNull": true, + "notNull": false, "autoIncrement": false, "defaultValue": "" }, { - "name": "CREATED_TIME", + "name": "CREATE_DATE", "type": "DATETIME", "chnname": "创建时间", "remark": "", "pk": false, - "notNull": true, + "notNull": false, "autoIncrement": false, "defaultValue": "" }, { - "name": "UPDATED_BY", - "type": "VARCHAR_32", - "chnname": "更新人", + "name": "UPDATER", + "type": "BIGINT_19", + "chnname": "更新者", "remark": "", "pk": false, - "notNull": true, + "notNull": false, "autoIncrement": false, "defaultValue": "" }, { - "name": "UPDATED_TIME", + "name": "UPDATE_DATE", "type": "DATETIME", "chnname": "更新时间", "remark": "", "pk": false, - "notNull": true, + "notNull": false, "autoIncrement": false, "defaultValue": "" } @@ -506,66 +204,6 @@ "autoIncrement": false, "defaultValue": "" }, - { - "name": "AREA", - "type": "VARCHAR_128", - "chnname": "区", - "remark": "", - "pk": false, - "notNull": true, - "autoIncrement": false, - "defaultValue": "" - }, - { - "name": "AREA_ID", - "type": "BIGINT_19", - "chnname": "区ID", - "remark": "", - "pk": false, - "notNull": true, - "autoIncrement": false, - "defaultValue": "" - }, - { - "name": "STREET", - "type": "VARCHAR_128", - "chnname": "街道", - "remark": "", - "pk": false, - "notNull": true, - "autoIncrement": false, - "defaultValue": "" - }, - { - "name": "STREET_ID", - "type": "BIGINT_19", - "chnname": "街道ID", - "remark": "", - "pk": false, - "notNull": true, - "autoIncrement": false, - "defaultValue": "" - }, - { - "name": "COMMUNITY", - "type": "VARCHAR_128", - "chnname": "社区", - "remark": "", - "pk": false, - "notNull": true, - "autoIncrement": false, - "defaultValue": "" - }, - { - "name": "COMMUNITY_ID", - "type": "BIGINT_19", - "chnname": "社区ID", - "remark": "", - "pk": false, - "notNull": true, - "autoIncrement": false, - "defaultValue": "" - }, { "name": "GRID", "type": "VARCHAR_128", @@ -777,9 +415,29 @@ "defaultValue": "" }, { - "name": "TOPIC_ID", - "type": "VARCHAR_32", - "chnname": "话题ID", + "name": "TOPIC_ID", + "type": "VARCHAR_32", + "chnname": "话题ID", + "remark": "", + "pk": false, + "notNull": false, + "autoIncrement": false, + "defaultValue": "" + }, + { + "name": "FRIENDLY_COMMUNITY_ID", + "type": "VARCHAR_32", + "chnname": "", + "remark": "", + "pk": false, + "notNull": false, + "autoIncrement": false, + "defaultValue": "" + }, + { + "name": "PARENT_DEPT_IDS", + "type": "VARCHAR_1024", + "chnname": "父所有部门", "remark": "", "pk": false, "notNull": false, @@ -787,9 +445,9 @@ "defaultValue": "" }, { - "name": "FRIENDLY_COMMUNITY_ID", - "type": "VARCHAR_32", - "chnname": "", + "name": "PARENT_DEPT_NAMES", + "type": "VARCHAR_1024", + "chnname": "父所有部门", "remark": "", "pk": false, "notNull": false, @@ -1352,222 +1010,6 @@ } ] }, - { - "title": "EPDC_GRID_WORK_SCORE", - "chnname": "履行抓基层党建工作职责得分", - "fields": [ - { - "name": "ID", - "type": "VARCHAR_32", - "chnname": "ID", - "remark": "", - "pk": true, - "notNull": true, - "autoIncrement": false, - "defaultValue": "" - }, - { - "name": "USER_ID", - "type": "VARCHAR_32", - "chnname": "用户ID", - "remark": "", - "pk": false, - "notNull": true, - "autoIncrement": false, - "defaultValue": "" - }, - { - "name": "NICK_NAME", - "type": "VARCHAR_128", - "chnname": "用户昵称", - "remark": "", - "pk": false, - "notNull": false, - "autoIncrement": false, - "defaultValue": "" - }, - { - "name": "USER_FACE", - "type": "VARCHAR_128", - "chnname": "用户头像", - "remark": "", - "pk": false, - "notNull": false, - "autoIncrement": false, - "defaultValue": "" - }, - { - "name": "IS_PARTY_MEMBER", - "type": "INT_10", - "chnname": "党员标识 0：否，1：是", - "remark": "", - "pk": false, - "notNull": true, - "autoIncrement": false, - "defaultValue": "" - }, - { - "name": "DISTRICT", - "type": "VARCHAR_128", - "chnname": "区", - "remark": "", - "pk": false, - "notNull": true, - "autoIncrement": false, - "defaultValue": "" - }, - { - "name": "DISTRICT_ID", - "type": "BIGINT_19", - "chnname": "区ID", - "remark": "", - "pk": false, - "notNull": true, - "autoIncrement": false, - "defaultValue": "" - }, - { - "name": "STREET", - "type": "VARCHAR_128", - "chnname": "街道", - "remark": "", - "pk": false, - "notNull": true, - "autoIncrement": false, - "defaultValue": "" - }, - { - "name": "STREET_ID", - "type": "BIGINT_19", - "chnname": "街道ID", - "remark": "", - "pk": false, - "notNull": true, - "autoIncrement": false, - "defaultValue": "" - }, - { - "name": "COMMUNITY", - "type": "VARCHAR_128", - "chnname": "社区", - "remark": "", - "pk": false, - "notNull": true, - "autoIncrement": false, - "defaultValue": "" - }, - { - "name": "COMMUNITY_ID", - "type": "BIGINT_19", - "chnname": "社区ID", - "remark": "", - "pk": false, - "notNull": true, - "autoIncrement": false, - "defaultValue": "" - }, - { - "name": "GRID", - "type": "VARCHAR_128", - "chnname": "网格", - "remark": "", - "pk": false, - "notNull": true, - "autoIncrement": false, - "defaultValue": "" - }, - { - "name": "GRID_ID", - "type": "BIGINT_19", - "chnname": "网格ID", - "remark": "", - "pk": false, - "notNull": true, - "autoIncrement": false, - "defaultValue": "" - }, - { - "name": "SCORING_TIME", - "type": "DATETIME", - "chnname": "打分时间", - "remark": "", - "pk": false, - "notNull": false, - "autoIncrement": false, - "defaultValue": "" - }, - { - "name": "SCORE", - "type": "INT_10", - "chnname": "分值", - "remark": "", - "pk": false, - "notNull": true, - "autoIncrement": false, - "defaultValue": "" - }, - { - "name": "DEL_FLAG", - "type": "VARCHAR_32", - "chnname": "删除标识 0：未删除，1：已删除", - "remark": "", - "pk": false, - "notNull": true, - "autoIncrement": false, - "defaultValue": "" - }, - { - "name": "REVISION", - "type": "INT_10", - "chnname": "乐观锁", - "remark": "", - "pk": false, - "notNull": true, - "autoIncrement": false, - "defaultValue": "" - }, - { - "name": "CREATED_BY", - "type": "VARCHAR_32", - "chnname": "创建人", - "remark": "", - "pk": false, - "notNull": true, - "autoIncrement": false, - "defaultValue": "" - }, - { - "name": "CREATED_TIME", - "type": "DATETIME", - "chnname": "创建时间", - "remark": "", - "pk": false, - "notNull": true, - "autoIncrement": false, - "defaultValue": "" - }, - { - "name": "UPDATED_BY", - "type": "VARCHAR_32", - "chnname": "更新人", - "remark": "", - "pk": false, - "notNull": true, - "autoIncrement": false, - "defaultValue": "" - }, - { - "name": "UPDATED_TIME", - "type": "DATETIME", - "chnname": "更新时间", - "remark": "", - "pk": false, - "notNull": true, - "autoIncrement": false, - "defaultValue": "" - } - ] - }, { "title": "EPDC_IMG", "chnname": "党建系统图片表 党建系统图片表", @@ -1897,67 +1339,7 @@ { "name": "DISTRIBUTE_TIME", "type": "DATETIME", - "chnname": "发布时间", - "remark": "", - "pk": false, - "notNull": true, - "autoIncrement": false, - "defaultValue": "" - }, - { - "name": "AREA", - "type": "VARCHAR_128", - "chnname": "区", - "remark": "", - "pk": false, - "notNull": true, - "autoIncrement": false, - "defaultValue": "" - }, - { - "name": "AREA_ID", - "type": "BIGINT_19", - "chnname": "区ID", - "remark": "", - "pk": false, - "notNull": true, - "autoIncrement": false, - "defaultValue": "" - }, - { - "name": "STREET", - "type": "VARCHAR_128", - "chnname": "街道", - "remark": "", - "pk": false, - "notNull": true, - "autoIncrement": false, - "defaultValue": "" - }, - { - "name": "STREET_ID", - "type": "BIGINT_19", - "chnname": "街道ID", - "remark": "", - "pk": false, - "notNull": true, - "autoIncrement": false, - "defaultValue": "" - }, - { - "name": "COMMUNITY", - "type": "VARCHAR_128", - "chnname": "社区", - "remark": "", - "pk": false, - "notNull": true, - "autoIncrement": false, - "defaultValue": "" - }, - { - "name": "COMMUNITY_ID", - "type": "BIGINT_19", - "chnname": "社区ID", + "chnname": "发布时间", "remark": "", "pk": false, "notNull": true, @@ -2143,6 +1525,26 @@ "notNull": false, "autoIncrement": false, "defaultValue": "" + }, + { + "name": "PARENT_DEPT_IDS", + "type": "VARCHAR_1024", + "chnname": "父所有部门", + "remark": "", + "pk": false, + "notNull": false, + "autoIncrement": false, + "defaultValue": "" + }, + { + "name": "PARENT_DEPT_NAMES", + "type": "VARCHAR_1024", + "chnname": "父所有部门", + "remark": "", + "pk": false, + "notNull": false, + "autoIncrement": false, + "defaultValue": "" } ] }, @@ -2173,7 +1575,7 @@ { "name": "STATE", "type": "INT_10", - "chnname": "状态 0-审核通过，1-反馈，2-关闭", + "chnname": "状态 0-审核通过，1-反馈，2-关闭, 3-话题转议题", "remark": "", "pk": true, "notNull": true, @@ -2376,66 +1778,6 @@ "autoIncrement": false, "defaultValue": "" }, - { - "name": "AREA", - "type": "VARCHAR_128", - "chnname": "区", - "remark": "", - "pk": false, - "notNull": true, - "autoIncrement": false, - "defaultValue": "" - }, - { - "name": "AREA_ID", - "type": "BIGINT_19", - "chnname": "区ID", - "remark": "", - "pk": false, - "notNull": true, - "autoIncrement": false, - "defaultValue": "" - }, - { - "name": "STREET", - "type": "VARCHAR_128", - "chnname": "街道", - "remark": "", - "pk": false, - "notNull": true, - "autoIncrement": false, - "defaultValue": "" - }, - { - "name": "STREET_ID", - "type": "BIGINT_19", - "chnname": "街道ID", - "remark": "", - "pk": false, - "notNull": true, - "autoIncrement": false, - "defaultValue": "" - }, - { - "name": "COMMUNITY", - "type": "VARCHAR_128", - "chnname": "社区", - "remark": "", - "pk": false, - "notNull": true, - "autoIncrement": false, - "defaultValue": "" - }, - { - "name": "COMMUNITY_ID", - "type": "BIGINT_19", - "chnname": "社区ID", - "remark": "", - "pk": false, - "notNull": true, - "autoIncrement": false, - "defaultValue": "" - }, { "name": "GRID", "type": "VARCHAR_128", @@ -2655,6 +1997,26 @@ "notNull": false, "autoIncrement": false, "defaultValue": "" + }, + { + "name": "PARENT_DEPT_IDS", + "type": "VARCHAR_1024", + "chnname": "父所有部门", + "remark": "", + "pk": false, + "notNull": false, + "autoIncrement": false, + "defaultValue": "" + }, + { + "name": "PARENT_DEPT_NAMES", + "type": "VARCHAR_1024", + "chnname": "父所有部门", + "remark": "", + "pk": false, + "notNull": false, + "autoIncrement": false, + "defaultValue": "" } ] }, @@ -2831,7 +2193,7 @@ { "name": "EVALUATION_LEVEL", "type": "INT_10", - "chnname": "评价满意度", + "chnname": "评价结果：0-不满意，1-基本满意，2-非常满意", "remark": "", "pk": false, "notNull": true, @@ -3046,6 +2408,182 @@ } ] }, + { + "title": "EPDC_ITEM_INFORMATION", + "chnname": " ", + "fields": [ + { + "name": "ID", + "type": "VARCHAR_32", + "chnname": "主键", + "remark": "", + "pk": true, + "notNull": true, + "autoIncrement": false, + "defaultValue": "" + }, + { + "name": "DEPT_ID", + "type": "VARCHAR_32", + "chnname": "通知部门ID", + "remark": "", + "pk": false, + "notNull": true, + "autoIncrement": false, + "defaultValue": "" + }, + { + "name": "TYPE", + "type": "INT_10", + "chnname": "消息类型 0-项目", + "remark": "", + "pk": false, + "notNull": true, + "autoIncrement": false, + "defaultValue": "" + }, + { + "name": "BUSINESS_TYPE", + "type": "INT_10", + "chnname": "消息所属业务类型 0 -回应，1 -吹哨，5 -关闭，10- 结案", + "remark": "", + "pk": false, + "notNull": true, + "autoIncrement": false, + "defaultValue": "" + }, + { + "name": "ASSOCIATED_BUSINESS_ID", + "type": "VARCHAR_32", + "chnname": "消息关联业务ID", + "remark": "", + "pk": false, + "notNull": true, + "autoIncrement": false, + "defaultValue": "" + }, + { + "name": "ASSOCIATED_BUSINESS_CONTENT", + "type": "VARCHAR_2000", + "chnname": "消息关联业务内容", + "remark": "", + "pk": false, + "notNull": true, + "autoIncrement": false, + "defaultValue": "" + }, + { + "name": "HANDLE_DEPT_ID", + "type": "BIGINT_19", + "chnname": "处理部门ID", + "remark": "", + "pk": false, + "notNull": true, + "autoIncrement": false, + "defaultValue": "" + }, + { + "name": "HANDLE_DEPT", + "type": "VARCHAR_128", + "chnname": "处理部门", + "remark": "", + "pk": false, + "notNull": true, + "autoIncrement": false, + "defaultValue": "" + }, + { + "name": "HANDLE_ADVICE", + "type": "VARCHAR_500", + "chnname": "处理意见", + "remark": "", + "pk": false, + "notNull": true, + "autoIncrement": false, + "defaultValue": "" + }, + { + "name": "WHISTLE_DEPT", + "type": "VARCHAR_1024", + "chnname": "被吹哨部门（多个以逗号分隔）", + "remark": "", + "pk": false, + "notNull": false, + "autoIncrement": false, + "defaultValue": "" + }, + { + "name": "READ_FLAG", + "type": "VARCHAR_1", + "chnname": "是否已读 0-否，1-是", + "remark": "", + "pk": false, + "notNull": true, + "autoIncrement": false, + "defaultValue": "" + }, + { + "name": "REVISION", + "type": "INT_10", + "chnname": "乐观锁", + "remark": "", + "pk": false, + "notNull": false, + "autoIncrement": false, + "defaultValue": "" + }, + { + "name": "CREATED_BY", + "type": "VARCHAR_32", + "chnname": "创建人", + "remark": "", + "pk": false, + "notNull": true, + "autoIncrement": false, + "defaultValue": "" + }, + { + "name": "CREATED_TIME", + "type": "DATETIME", + "chnname": "创建时间", + "remark": "", + "pk": false, + "notNull": true, + "autoIncrement": false, + "defaultValue": "" + }, + { + "name": "UPDATED_BY", + "type": "VARCHAR_32", + "chnname": "更新人", + "remark": "", + "pk": false, + "notNull": true, + "autoIncrement": false, + "defaultValue": "" + }, + { + "name": "UPDATED_TIME", + "type": "DATETIME", + "chnname": "更新时间", + "remark": "", + "pk": false, + "notNull": true, + "autoIncrement": false, + "defaultValue": "" + }, + { + "name": "DEL_FLAG", + "type": "VARCHAR_1", + "chnname": "删除标记 0-否，1-是", + "remark": "", + "pk": false, + "notNull": true, + "autoIncrement": false, + "defaultValue": "" + } + ] + }, { "title": "UNDO_LOG", "chnname": "", @@ -3734,6 +3272,33 @@ "type": "VARCHAR(64)" } } + }, + { + "name": "INT UNSIGNED_10", + "code": "INT UNSIGNED_10", + "apply": { + "MYSQL": { + "type": "INT UNSIGNED(10)" + } + } + }, + { + "name": "TINYINT UNSIGNED_3", + "code": "TINYINT UNSIGNED_3", + "apply": { + "MYSQL": { + "type": "TINYINT UNSIGNED(3)" + } + } + }, + { + "name": "VARCHAR_50", + "code": "VARCHAR_50", + "apply": { + "MYSQL": { + "type": "VARCHAR(50)" + } + } } ], "database": [ diff --git a/esua-epdc/pom.xml b/esua-epdc/pom.xml index 9caf6bf03..3668dc3b2 100644 --- a/esua-epdc/pom.xml +++ b/esua-epdc/pom.xml @@ -96,19 +96,19 @@ public aliyun nexus - http://47.104.224.45:9002/repository/maven-public/ - - true - - - - elink-release - aliyun nexus - http://47.104.224.45:9002/repository/elink-release/ + http://47.104.85.99:9002/repository/maven-public/ true + + + + + + + + sonatype sonatype nexus @@ -122,7 +122,7 @@ public aliyun nexus - http://47.104.224.45:9002/repository/maven-public/ + http://47.104.85.99:9002/repository/maven-public/ true