⚡ 优化流程设计器

blade-ops/blade-flowdesign/src/main/java/org/springblade/flowable/config/FlowableAutoConfiguration.java

@@ -1,3 +1,19 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
 package org.springblade.flowable.config;
 
 import org.flowable.common.engine.impl.cfg.IdGenerator;
@@ -29,14 +45,14 @@ import java.io.IOException;
  */
 @Configuration
 @EnableConfigurationProperties(FlowableProperties.class)
-public class FlowAutoConfiguration extends ProcessEngineAutoConfiguration {
+public class FlowableAutoConfiguration extends ProcessEngineAutoConfiguration {
 
 	@Autowired
 	private FlowableProperties flowableProperties;
 
-	public FlowAutoConfiguration(FlowableProperties flowableProperties,
+	public FlowableAutoConfiguration(FlowableProperties flowableProperties,
-								 FlowableProcessProperties processProperties, FlowableAppProperties appProperties, FlowableIdmProperties idmProperties,
+									 FlowableProcessProperties processProperties, FlowableAppProperties appProperties, FlowableIdmProperties idmProperties,
-								 FlowableMailProperties mailProperties) {
+									 FlowableMailProperties mailProperties) {
 		super(flowableProperties, processProperties, appProperties, idmProperties, mailProperties);
 	}
 
@@ -46,12 +62,10 @@ public class FlowAutoConfiguration extends ProcessEngineAutoConfiguration {
 																			 ObjectProvider<IdGenerator> globalIdGenerator,
 																			 @ProcessAsync ObjectProvider<AsyncExecutor> asyncExecutorProvider,
 																			 @ProcessAsyncHistory ObjectProvider<AsyncExecutor> asyncHistoryExecutorProvider) throws IOException {
-
 		SpringProcessEngineConfiguration conf = super.springProcessEngineConfiguration(dataSource, platformTransactionManager, processIdGenerator, globalIdGenerator, asyncExecutorProvider, asyncHistoryExecutorProvider);
 		conf.setActivityFontName(flowableProperties.getActivityFontName());
 		conf.setLabelFontName(flowableProperties.getLabelFontName());
 		conf.setAnnotationFontName(flowableProperties.getAnnotationFontName());
-
 		return conf;
 	}
 

blade-ops/blade-flowdesign/src/main/java/org/springblade/flowable/config/FlowableBeanConfiguration.java

@@ -1,3 +1,19 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
 package org.springblade.flowable.config;
 
 import liquibase.Liquibase;
@@ -18,7 +34,7 @@ import javax.sql.DataSource;
  * @author Chill
  */
 @Configuration
-public class FlowableBeanConfig {
+public class FlowableBeanConfiguration {
 
 	protected static final String LIQUIBASE_CHANGELOG_PREFIX = "ACT_DE_";
 

blade-ops/blade-flowdesign/src/main/java/org/springblade/flowable/config/SqlSessionConfiguration.java

@@ -1,3 +1,19 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
 package org.springblade.flowable.config;
 
 import org.apache.ibatis.session.SqlSessionFactory;
@@ -18,7 +34,7 @@ import javax.sql.DataSource;
  * @author Chill
  */
 @Configuration
-public class CommonConfig {
+public class SqlSessionConfiguration {
 
 	@Primary
 	@Bean(name = "sqlSessionFactory")

blade-ops/blade-flowdesign/src/main/java/org/springblade/flowable/config/StaticResourceConfig.java

@@ -1,7 +1,23 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
 package org.springblade.flowable.config;
 
 import lombok.AllArgsConstructor;
-import org.springblade.flowable.filter.CustomHandlerInterceptor;
+import org.springblade.flowable.filter.UserHandlerInterceptor;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.web.servlet.config.annotation.EnableWebMvc;
 import org.springframework.web.servlet.config.annotation.InterceptorRegistry;
@@ -18,7 +34,7 @@ import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
 @AllArgsConstructor
 public class StaticResourceConfig implements WebMvcConfigurer {
 
-	private CustomHandlerInterceptor baseInterceptor;
+	private UserHandlerInterceptor baseInterceptor;
 
 	@Override
 	public void addInterceptors(InterceptorRegistry registry) {

blade-ops/blade-flowdesign/src/main/java/org/springblade/flowable/constant/FlowableConstant.java

@@ -1,3 +1,19 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
 package org.springblade.flowable.constant;
 
 /**

blade-ops/blade-flowdesign/src/main/java/org/springblade/flowable/controller/RemoteAccountController.java

@@ -13,6 +13,6 @@ import org.springframework.web.bind.annotation.RestController;
 public class RemoteAccountController {
 	@RequestMapping(value = "/rest/account")
 	public String getAccount() {
-		return "{\"id\":\"admin\",\"firstName\":\"Test\",\"lastName\":\"Administrator\",\"email\":\"admin@flowable.org\",\"fullName\":\"Test Administrator\",\"groups\":[],\"privileges\":[\"access-idm\",\"access-task\",\"access-modeler\",\"access-admin\"]}\n";
+		return "{\"id\":\"admin\",\"firstName\":\"BladeX\",\"lastName\":\"Flowable\",\"email\":\"admin@flowable.org\",\"fullName\":\"BladeX Flowable\",\"groups\":[],\"privileges\":[\"access-idm\",\"access-task\",\"access-modeler\",\"access-admin\"]}\n";
 	}
 }

blade-ops/blade-flowdesign/src/main/java/org/springblade/flowable/filter/UserHandlerInterceptor.java

@@ -1,3 +1,19 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
 package org.springblade.flowable.filter;
 
 import org.flowable.idm.api.User;
@@ -18,7 +34,7 @@ import static org.springblade.flowable.constant.FlowableConstant.*;
  * @author Chill
  */
 @Component
-public class CustomHandlerInterceptor implements HandlerInterceptor {
+public class UserHandlerInterceptor implements HandlerInterceptor {
 
 	@Override
 	public boolean preHandle(HttpServletRequest request, HttpServletResponse response, Object handler) {

blade-ops/blade-flowdesign/src/main/resources/banner.txt

@@ -5,4 +5,4 @@ ${AnsiColor.BLUE}            | ___ \| | / _` | / _` | / _ \   > <
 ${AnsiColor.BLUE}            | |_/ /| || (_| || (_| ||  __/ /  .  \
 ${AnsiColor.BLUE}            \____/ |_| \__,_| \__,_| \___|/__/ \__\
 
-${AnsiColor.BLUE}:: BladeX :: ${spring.application.name}:${AnsiColor.RED}${spring.profiles.active}${AnsiColor.BLUE} :: Running SpringBoot ${spring-boot.version} :: ${AnsiColor.BRIGHT_BLACK}
+${AnsiColor.BLUE}:: BladeX :: ${spring.application.name}:${AnsiColor.RED}${blade.env}${AnsiColor.BLUE} :: Running SpringBoot ${spring-boot.version} :: ${AnsiColor.BRIGHT_BLACK}

blade-ops/blade-flowdesign/src/main/resources/static/modeler/index.html

@@ -10,7 +10,7 @@
 <head>
     <meta charset="utf-8">
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
-    <title>Flowable Modeler</title>
+    <title>BladeX 流程设计器</title>
     <link rel="icon" type="image/ico" href="favicon.ico">
     <meta name="description" content="">
     <meta name="viewport"
@@ -48,7 +48,8 @@
         <div class="fixed-container">
             <div class="navbar-header">
                 <a ng-click="backToLanding()" class="landing-logo" ng-if="account != null && account != undefined" title="{{'GENERAL.MAIN-TITLE' | translate}}">
-                    <img ng-src="{{appResourceRoot}}images/flowable-logo.png" ng-srcset="{{appResourceRoot}}images/flowable-logo.png 1x, {{appResourceRoot}}images/flowable-logo@2x.png 2x">
+                    <span style="color: #fff;font-size: 18px">BladeX 流程设计器</span>
+                    <!--<img ng-src="{{appResourceRoot}}images/flowable-logo.png" ng-srcset="{{appResourceRoot}}images/flowable-logo.png 1x, {{appResourceRoot}}images/flowable-logo@2x.png 2x">-->
                 </a>
                 <ul class="nav navbar-nav" id="main-nav" ng-show="authenticated">
                     <li ng-class="{'active' : item.id == mainPage.id}" ng-repeat="item in mainNavigation">