From 3d91786862a46e990c8a02c49c2890c917419ffb Mon Sep 17 00:00:00 2001 From: smallchill Date: Wed, 10 Apr 2019 09:40:14 +0800 Subject: [PATCH] =?UTF-8?q?:zap:=20=E4=BC=98=E5=8C=96=E6=B5=81=E7=A8=8B?= =?UTF-8?q?=E8=AE=BE=E8=AE=A1=E5=99=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...on.java => FlowableAutoConfiguration.java} | 26 ++++++++++++++----- ...ig.java => FlowableBeanConfiguration.java} | 18 ++++++++++++- ...nfig.java => SqlSessionConfiguration.java} | 18 ++++++++++++- .../flowable/config/StaticResourceConfig.java | 20 ++++++++++++-- .../flowable/constant/FlowableConstant.java | 16 ++++++++++++ .../controller/RemoteAccountController.java | 2 +- ...eptor.java => UserHandlerInterceptor.java} | 18 ++++++++++++- .../src/main/resources/banner.txt | 2 +- .../main/resources/static/modeler/index.html | 5 ++-- 9 files changed, 110 insertions(+), 15 deletions(-) rename blade-ops/blade-flowdesign/src/main/java/org/springblade/flowable/config/{FlowAutoConfiguration.java => FlowableAutoConfiguration.java} (67%) rename blade-ops/blade-flowdesign/src/main/java/org/springblade/flowable/config/{FlowableBeanConfig.java => FlowableBeanConfiguration.java} (64%) rename blade-ops/blade-flowdesign/src/main/java/org/springblade/flowable/config/{CommonConfig.java => SqlSessionConfiguration.java} (60%) rename blade-ops/blade-flowdesign/src/main/java/org/springblade/flowable/filter/{CustomHandlerInterceptor.java => UserHandlerInterceptor.java} (63%) diff --git a/blade-ops/blade-flowdesign/src/main/java/org/springblade/flowable/config/FlowAutoConfiguration.java b/blade-ops/blade-flowdesign/src/main/java/org/springblade/flowable/config/FlowableAutoConfiguration.java similarity index 67% rename from blade-ops/blade-flowdesign/src/main/java/org/springblade/flowable/config/FlowAutoConfiguration.java rename to blade-ops/blade-flowdesign/src/main/java/org/springblade/flowable/config/FlowableAutoConfiguration.java index fef15b47..c33ab38d 100644 --- a/blade-ops/blade-flowdesign/src/main/java/org/springblade/flowable/config/FlowAutoConfiguration.java +++ b/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, - FlowableProcessProperties processProperties, FlowableAppProperties appProperties, FlowableIdmProperties idmProperties, - FlowableMailProperties mailProperties) { + public FlowableAutoConfiguration(FlowableProperties flowableProperties, + FlowableProcessProperties processProperties, FlowableAppProperties appProperties, FlowableIdmProperties idmProperties, + FlowableMailProperties mailProperties) { super(flowableProperties, processProperties, appProperties, idmProperties, mailProperties); } @@ -46,12 +62,10 @@ public class FlowAutoConfiguration extends ProcessEngineAutoConfiguration { ObjectProvider globalIdGenerator, @ProcessAsync ObjectProvider asyncExecutorProvider, @ProcessAsyncHistory ObjectProvider 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; } diff --git a/blade-ops/blade-flowdesign/src/main/java/org/springblade/flowable/config/FlowableBeanConfig.java b/blade-ops/blade-flowdesign/src/main/java/org/springblade/flowable/config/FlowableBeanConfiguration.java similarity index 64% rename from blade-ops/blade-flowdesign/src/main/java/org/springblade/flowable/config/FlowableBeanConfig.java rename to blade-ops/blade-flowdesign/src/main/java/org/springblade/flowable/config/FlowableBeanConfiguration.java index 7005c7ed..5f9226f3 100644 --- a/blade-ops/blade-flowdesign/src/main/java/org/springblade/flowable/config/FlowableBeanConfig.java +++ b/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_"; diff --git a/blade-ops/blade-flowdesign/src/main/java/org/springblade/flowable/config/CommonConfig.java b/blade-ops/blade-flowdesign/src/main/java/org/springblade/flowable/config/SqlSessionConfiguration.java similarity index 60% rename from blade-ops/blade-flowdesign/src/main/java/org/springblade/flowable/config/CommonConfig.java rename to blade-ops/blade-flowdesign/src/main/java/org/springblade/flowable/config/SqlSessionConfiguration.java index 42456a8b..68c1ceb9 100644 --- a/blade-ops/blade-flowdesign/src/main/java/org/springblade/flowable/config/CommonConfig.java +++ b/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") diff --git a/blade-ops/blade-flowdesign/src/main/java/org/springblade/flowable/config/StaticResourceConfig.java b/blade-ops/blade-flowdesign/src/main/java/org/springblade/flowable/config/StaticResourceConfig.java index d619e518..0cebd6a5 100644 --- a/blade-ops/blade-flowdesign/src/main/java/org/springblade/flowable/config/StaticResourceConfig.java +++ b/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) { diff --git a/blade-ops/blade-flowdesign/src/main/java/org/springblade/flowable/constant/FlowableConstant.java b/blade-ops/blade-flowdesign/src/main/java/org/springblade/flowable/constant/FlowableConstant.java index 102900fc..0c1d5834 100644 --- a/blade-ops/blade-flowdesign/src/main/java/org/springblade/flowable/constant/FlowableConstant.java +++ b/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; /** diff --git a/blade-ops/blade-flowdesign/src/main/java/org/springblade/flowable/controller/RemoteAccountController.java b/blade-ops/blade-flowdesign/src/main/java/org/springblade/flowable/controller/RemoteAccountController.java index e3c7995d..1913d0fd 100644 --- a/blade-ops/blade-flowdesign/src/main/java/org/springblade/flowable/controller/RemoteAccountController.java +++ b/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"; } } diff --git a/blade-ops/blade-flowdesign/src/main/java/org/springblade/flowable/filter/CustomHandlerInterceptor.java b/blade-ops/blade-flowdesign/src/main/java/org/springblade/flowable/filter/UserHandlerInterceptor.java similarity index 63% rename from blade-ops/blade-flowdesign/src/main/java/org/springblade/flowable/filter/CustomHandlerInterceptor.java rename to blade-ops/blade-flowdesign/src/main/java/org/springblade/flowable/filter/UserHandlerInterceptor.java index f71c78f4..18273dd2 100644 --- a/blade-ops/blade-flowdesign/src/main/java/org/springblade/flowable/filter/CustomHandlerInterceptor.java +++ b/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) { diff --git a/blade-ops/blade-flowdesign/src/main/resources/banner.txt b/blade-ops/blade-flowdesign/src/main/resources/banner.txt index 259e519f..9cc3783c 100644 --- a/blade-ops/blade-flowdesign/src/main/resources/banner.txt +++ b/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} diff --git a/blade-ops/blade-flowdesign/src/main/resources/static/modeler/index.html b/blade-ops/blade-flowdesign/src/main/resources/static/modeler/index.html index 849ad97e..b5edeb5e 100644 --- a/blade-ops/blade-flowdesign/src/main/resources/static/modeler/index.html +++ b/blade-ops/blade-flowdesign/src/main/resources/static/modeler/index.html @@ -10,7 +10,7 @@ - Flowable Modeler + BladeX 流程设计器