diff --git a/smtweb-framework/pom.xml b/smtweb-framework/pom.xml
index 7eed8ef..868264d 100644
--- a/smtweb-framework/pom.xml
+++ b/smtweb-framework/pom.xml
@@ -26,6 +26,6 @@
sw-framework-core
- ../smtweb-system/sw-system-bpm
+ sw-system-bpm
diff --git a/smtweb-framework/sw-framework-core/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst b/smtweb-framework/sw-framework-core/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst
index e69de29..a60fe75 100644
--- a/smtweb-framework/sw-framework-core/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst
+++ b/smtweb-framework/sw-framework-core/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst
@@ -0,0 +1,296 @@
+cc\smtweb\framework\core\common\SwEnum$DatasetType.class
+cc\smtweb\framework\core\common\SwEnum$DataType.class
+cc\smtweb\framework\core\db\impl\DefaultDatabaseInfoImpl$1.class
+cc\smtweb\framework\core\common\SwEnum$OptType.class
+cc\smtweb\framework\core\mvc\controller\scan\ScanContext.class
+cc\smtweb\framework\core\mvc\controller\access\SingletonFieldAccess.class
+cc\smtweb\framework\core\common\SwEnum$EditorType.class
+cc\smtweb\framework\core\db\cache\ModelTableCache$1.class
+cc\smtweb\framework\core\db\cache\ModelTableCache.class
+cc\smtweb\framework\core\util\jackson\LongDeserializer.class
+cc\smtweb\framework\core\mvc\service\IWorker.class
+cc\smtweb\framework\core\systask\TaskStartEvent.class
+cc\smtweb\framework\core\cache\AbstractCache$IGetBeanKeys.class
+cc\smtweb\framework\core\mvc\controller\binder\bean\UserSessionEditor.class
+cc\smtweb\framework\core\cache\redis\RedisSysTask.class
+cc\smtweb\framework\core\db\jdbc\BaseBeanPropertyRowMapper.class
+cc\smtweb\framework\core\util\jackson\NullSerializer.class
+com\serotonin\timer\sync\Synchronizer$TaskWrapper.class
+cc\smtweb\framework\core\common\AbstractEnum$IntEnumBean.class
+cc\smtweb\framework\core\mvc\controller\access\ControllerAccess.class
+cc\smtweb\framework\core\common\SwEnum$TableType.class
+cc\smtweb\framework\core\mvc\scheduler\job\GroupJobQueue.class
+cc\smtweb\framework\core\util\jackson\DateSerializer.class
+cc\smtweb\framework\core\CoreApplicationStartedListener.class
+cc\smtweb\framework\core\mvc\controller\binder\param\AbstractRequestEditor.class
+cc\smtweb\framework\core\mvc\controller\MethodAccessManager.class
+cc\smtweb\framework\core\mvc\controller\binder\param\CharEditor.class
+cc\smtweb\framework\core\common\SwEnum.class
+cc\smtweb\framework\core\db\cache\EntityCache.class
+cc\smtweb\framework\core\mvc\scheduler\job\SimpleJob.class
+com\serotonin\timer\OneTimeTrigger.class
+cc\smtweb\framework\core\mvc\variable\SwVariable.class
+cc\smtweb\framework\core\util\kryo\KryoTool.class
+cc\smtweb\framework\core\mvc\controller\scan\IScanActionBuilder.class
+cc\smtweb\framework\core\mvc\realm\exception\AuthorizationException.class
+cc\smtweb\framework\core\mvc\service\AbstractSaveHandler$1.class
+cc\smtweb\framework\core\mvc\controller\binder\BeanContext.class
+cc\smtweb\framework\core\mvc\service\AbstractCompProvider.class
+cc\smtweb\framework\core\db\vo\ModelCache.class
+cc\smtweb\framework\core\mvc\controller\access\MethodParamAccess.class
+cc\smtweb\framework\core\db\sqlbuilder\InsertSqlBuilder.class
+cc\smtweb\framework\core\mvc\service\DefaultSaveHandler.class
+com\serotonin\timer\NonConcurrentTask.class
+cc\smtweb\framework\core\mvc\controller\scan\PackageScanner.class
+cc\smtweb\framework\core\common\AbstractEnum$EnumBean.class
+cc\smtweb\framework\core\mvc\scheduler\job\SimpleJobQueue.class
+com\serotonin\timer\TimeoutTask.class
+cc\smtweb\framework\core\mvc\service\AbstractLoadHandler.class
+cc\smtweb\framework\core\mvc\service\DefaultDelHandler.class
+cc\smtweb\framework\core\util\NumberUtil.class
+cc\smtweb\framework\core\db\jdbc\IdGenerator.class
+com\serotonin\timer\TimerThread.class
+cc\smtweb\framework\core\mvc\controller\access\IMethodAccess.class
+com\serotonin\timer\sync\Synchronizer$TestTask.class
+cc\smtweb\framework\core\exception\BindBeanException.class
+cc\smtweb\framework\core\mvc\controller\binder\param\LongEditor.class
+cc\smtweb\framework\core\CoreAutoConfiguration.class
+cc\smtweb\framework\core\session\SessionManager.class
+com\serotonin\timer\ScheduledRunnable.class
+cc\smtweb\framework\core\mvc\controller\access\FieldAccess.class
+com\serotonin\timer\ModelTimeoutTask.class
+cc\smtweb\framework\core\db\vo\ModelIndex.class
+cc\smtweb\framework\core\mvc\controller\binder\bean\HttpServletRequestEditor.class
+cc\smtweb\framework\core\mvc\realm\service\PermChecker.class
+com\serotonin\timer\TimerTrigger.class
+cc\smtweb\framework\core\db\sqlbuilder\SelectSqlBuilder.class
+cc\smtweb\framework\core\util\jackson\LongSerializer.class
+com\serotonin\timer\SimulationTimer.class
+cc\smtweb\framework\core\annotation\SwAction.class
+cc\smtweb\framework\core\systask\WebStartedEvent.class
+com\serotonin\timer\AbstractTimer.class
+cc\smtweb\framework\core\cache\CacheManager.class
+cc\smtweb\framework\core\systask\ISysTask.class
+com\serotonin\timer\SystemTimeSource.class
+cc\smtweb\framework\core\mvc\config\GlobalExceptionHandler.class
+cc\smtweb\framework\core\db\jdbc\SwMapPropertyRowMapper.class
+cc\smtweb\framework\core\util\IpAddrUtil.class
+cc\smtweb\framework\core\util\MapUtil.class
+cc\smtweb\framework\core\mvc\service\AbstractCompService.class
+cc\smtweb\framework\core\mvc\controller\binder\param\DoubleEditor.class
+cc\smtweb\framework\core\mvc\service\SwListData.class
+cc\smtweb\framework\core\mvc\controller\binder\param\FloatEditor.class
+cc\smtweb\framework\core\common\SwEnum$DataTypeBean.class
+cc\smtweb\framework\core\mvc\scheduler\job\GroupJob.class
+cc\smtweb\framework\core\db\DbEngine.class
+cc\smtweb\framework\core\db\impl\UtilTime.class
+cc\smtweb\framework\core\annotation\SwTable.class
+cc\smtweb\framework\core\db\sqlbuilder\DirectSelectSqlBuilder.class
+cc\smtweb\framework\core\cache\ISwCache.class
+cc\smtweb\framework\core\db\cache\ModelDatabaseCache.class
+cc\smtweb\framework\core\db\sqlbuilder\SqlBuilder.class
+cc\smtweb\framework\core\session\SessionUtil.class
+cc\smtweb\framework\core\util\jackson\TimestampDeserializer.class
+cc\smtweb\framework\core\util\DateUtil.class
+cc\smtweb\framework\core\exception\JsonParseException.class
+cc\smtweb\framework\core\mvc\controller\binder\param\ShortEditor.class
+cc\smtweb\framework\core\mvc\scheduler\AbstractJobExecutor.class
+cc\smtweb\framework\core\mvc\service\AbstractDelHandler$1.class
+cc\smtweb\framework\core\db\EntityHelper.class
+cc\smtweb\framework\core\db\EntityDao.class
+cc\smtweb\framework\core\db\vo\ModelDatabase.class
+cc\smtweb\framework\core\cache\AbstractEntityCache.class
+cc\smtweb\framework\core\common\AbstractEnum$IEnumWorker.class
+com\serotonin\timer\sync\AsyncJobSink.class
+cc\smtweb\framework\core\mvc\service\AbstractDelHandler.class
+cc\smtweb\framework\core\mvc\controller\binder\bean\BeanEditor.class
+cc\smtweb\framework\core\mvc\SchedulerManager.class
+cc\smtweb\framework\core\cache\AbstractCache.class
+cc\smtweb\framework\core\db\jdbc\JdbcTrans.class
+com\serotonin\timer\ValueSet.class
+cc\smtweb\framework\core\mvc\controller\DefaultPageController.class
+cc\smtweb\framework\core\db\impl\DefaultDatabaseInfoImpl$2.class
+cc\smtweb\framework\core\cache\redis\RedisManager.class
+cc\smtweb\framework\core\mvc\controller\ApiController.class
+cc\smtweb\framework\core\common\SwEnum$FieldType.class
+cc\smtweb\framework\core\mvc\controller\binder\param\BeanTypeEditor.class
+cc\smtweb\framework\core\annotation\SwService.class
+cc\smtweb\framework\core\common\SwEnum$FieldTypeBean.class
+cc\smtweb\framework\core\annotation\SwConstruct.class
+com\serotonin\timer\TaskQueue.class
+com\serotonin\timer\TimerTask.class
+cc\smtweb\framework\core\db\config\DbEngineConfiguration.class
+cc\smtweb\framework\core\util\VariableUtil.class
+cc\smtweb\framework\core\mvc\realm\exception\AuthenticationException.class
+cc\smtweb\framework\core\db\impl\IDatabaseInfo$TableCheckInfo.class
+cc\smtweb\framework\core\annotation\SwHeaderParam.class
+cc\smtweb\framework\core\db\sqlbuilder\AbstractUpdateSqlBuilder.class
+cc\smtweb\framework\core\common\SwEnum$IndexType.class
+cc\smtweb\framework\core\annotation\SwAttr.class
+cc\smtweb\framework\core\db\impl\DefaultDatabaseInfoImpl.class
+cc\smtweb\framework\core\cache\SessionCache.class
+cc\smtweb\framework\core\common\SwEnum$SummaryType.class
+cc\smtweb\framework\core\db\jdbc\AbsDbWorker.class
+cc\smtweb\framework\core\mvc\controller\access\SchedulerMethodAccess.class
+cc\smtweb\framework\core\mvc\controller\scan\UrlMaker.class
+cc\smtweb\framework\core\exception\BindParamException.class
+cc\smtweb\framework\core\exception\ExceptionMessage.class
+cc\smtweb\framework\core\mvc\controller\binder\bean\SwIpAddrEditor.class
+cc\smtweb\framework\core\CoreApplication.class
+cc\smtweb\framework\core\mvc\service\IDataProvider.class
+cc\smtweb\framework\core\db\sqlbuilder\UpdateSqlBuilder.class
+cc\smtweb\framework\core\mvc\controller\scan\BeanManager.class
+cc\smtweb\framework\core\util\jackson\BaseBeanSerializer.class
+cc\smtweb\framework\core\db\sqlbuilder\SqlWhereValue.class
+cc\smtweb\framework\core\util\SqlUtil.class
+cc\smtweb\framework\core\common\AbstractEnum$StrEnumBean.class
+cc\smtweb\framework\core\mvc\controller\binder\param\TimestampEditor.class
+cc\smtweb\framework\core\common\SwConsts.class
+cc\smtweb\framework\core\annotation\SwPerm.class
+cc\smtweb\framework\core\mvc\controller\binder\path\PathParamEditor.class
+com\serotonin\timer\TimerThread$1.class
+cc\smtweb\framework\core\mvc\variable\ICalcVar.class
+cc\smtweb\framework\core\mvc\controller\binder\body\BeanUtil.class
+cc\smtweb\framework\core\mvc\controller\binder\body\SwMapBodyEditor.class
+cc\smtweb\framework\core\mvc\scheduler\CronTimerTask.class
+cc\smtweb\framework\core\mvc\scheduler\AbstractJob.class
+cc\smtweb\framework\core\mvc\ISchedulerWakeup.class
+cc\smtweb\framework\core\db\sqlbuilder\DeleteSqlBuilder.class
+cc\smtweb\framework\core\db\impl\DefaultEntity.class
+cc\smtweb\framework\core\util\SpringUtil.class
+cc\smtweb\framework\core\mvc\service\AbstractSaveHandler.class
+cc\smtweb\framework\core\mvc\service\DefaultLoadHandler.class
+cc\smtweb\framework\core\mvc\scheduler\job\RedisJobExecutor.class
+cc\smtweb\framework\core\mvc\service\SqlPara.class
+cc\smtweb\framework\core\mvc\scheduler\FixedTimerTask.class
+cc\smtweb\framework\core\common\AbstractEnum.class
+cc\smtweb\framework\core\mvc\config\SettingsEnvironmentPostProcessor.class
+cc\smtweb\framework\core\cache\redis\RedisSysTask$1.class
+cc\smtweb\framework\core\db\vo\ModelField.class
+com\serotonin\timer\AbstractTimerTrigger.class
+com\serotonin\timer\RealTimeTimer.class
+cc\smtweb\framework\core\db\impl\DatabaseUtil.class
+cc\smtweb\framework\core\common\SwEnum$FilterType.class
+cc\smtweb\framework\core\mvc\controller\binder\attr\BeanAttrEditor.class
+cc\smtweb\framework\core\mvc\controller\access\MethodAccess.class
+com\serotonin\timer\TimeSource.class
+cc\smtweb\framework\core\annotation\SwBody.class
+cc\smtweb\framework\core\mvc\scheduler\SchedulerPoint.class
+cc\smtweb\framework\core\mvc\controller\access\IBeanAccess.class
+cc\smtweb\framework\core\common\IntEnum.class
+cc\smtweb\framework\core\cache\redis\config\RedisConfig.class
+cc\smtweb\framework\core\mvc\service\AbstractHandler.class
+com\serotonin\timer\FixedRateTrigger.class
+cc\smtweb\framework\core\mvc\realm\exception\UnauthenticatedException.class
+cc\smtweb\framework\core\cache\redis\RedisBroadcastEvent.class
+cc\smtweb\framework\core\mvc\realm\interceptor\AuthorizationInterceptor.class
+cc\smtweb\framework\core\mvc\scheduler\job\LocalJobExecutor.class
+com\serotonin\timer\NamedRunnable.class
+cc\smtweb\framework\core\mvc\controller\ApiConfigBean.class
+cc\smtweb\framework\core\exception\DbException.class
+cc\smtweb\framework\core\mvc\realm\exception\UnknownAccountException.class
+com\serotonin\timer\ScheduledNamedRunnable.class
+cc\smtweb\framework\core\mvc\controller\IBeanContext.class
+cc\smtweb\framework\core\db\DbEngine$1.class
+cc\smtweb\framework\core\db\sqlbuilder\SqlJoinField.class
+cc\smtweb\framework\core\mvc\controller\binder\param\BooleanEditor.class
+cc\smtweb\framework\core\exception\SwException.class
+cc\smtweb\framework\core\systask\SysTaskManager.class
+cc\smtweb\framework\core\util\CommUtil.class
+cc\smtweb\framework\core\common\R.class
+cc\smtweb\framework\core\db\jdbc\IDbWorker.class
+com\serotonin\timer\sync\Synchronizer.class
+cc\smtweb\framework\core\annotation\SwBean.class
+cc\smtweb\framework\core\db\impl\IDatabaseInfo$ColumnCheckInfo.class
+cc\smtweb\framework\core\annotation\SwCache.class
+com\serotonin\timer\sync\SingleExecutorSingleWaiter$TaskWrapper.class
+cc\smtweb\framework\core\db\sqlbuilder\SqlFieldValue.class
+cc\smtweb\framework\core\mvc\service\AbstractListHandler.class
+com\serotonin\timer\ModelTimeoutClient.class
+cc\smtweb\framework\core\mvc\controller\scan\ApplicationScanner.class
+cc\smtweb\framework\core\mvc\service\DefaultSaveHandler$1.class
+cc\smtweb\framework\core\db\sqlbuilder\SqlJoinTable.class
+cc\smtweb\framework\core\util\jackson\DateDeserializer.class
+cc\smtweb\framework\core\mvc\controller\binder\param\DateEditor.class
+cc\smtweb\framework\core\annotation\SwColumnForeign.class
+com\serotonin\timer\sync\AsyncJobSink$Event.class
+cc\smtweb\framework\core\mvc\controller\scan\ClassParser.class
+cc\smtweb\framework\core\mvc\realm\IRealmLoader.class
+cc\smtweb\framework\core\mvc\controller\binder\param\TimeEditor.class
+cc\smtweb\framework\core\util\jackson\TimeSerializer.class
+cc\smtweb\framework\core\db\dao\AbstractEntityDao.class
+cc\smtweb\framework\core\db\sqlbuilder\AbstractSelectSqlBuilder.class
+cc\smtweb\framework\core\db\vo\ModelProject.class
+cc\smtweb\framework\core\mvc\controller\scan\MethodParser.class
+cc\smtweb\framework\core\mvc\realm\exception\ForbiddenException.class
+cc\smtweb\framework\core\mvc\service\DefaultComboHandler.class
+com\serotonin\timer\FixedDelayTrigger.class
+cc\smtweb\framework\core\annotation\SwColumn$Type.class
+cc\smtweb\framework\core\annotation\SwPathParam.class
+cc\smtweb\framework\core\common\SwIpAddr.class
+cc\smtweb\framework\core\db\jdbc\JdbcEngine.class
+cc\smtweb\framework\core\mvc\controller\binder\body\StringBodyEditor.class
+cc\smtweb\framework\core\mvc\controller\binder\param\AbstractParameterEditor.class
+cc\smtweb\framework\core\db\dao\EntityColumnForeign.class
+cc\smtweb\framework\core\mvc\controller\binder\param\IntegerEditor.class
+cc\smtweb\framework\core\db\config\YamlPropertyLoaderFactory.class
+cc\smtweb\framework\core\mvc\service\SqlNamedPara.class
+cc\smtweb\framework\core\mvc\service\DefaultListHandler.class
+cc\smtweb\framework\core\mvc\controller\binder\param\StringEditor.class
+cc\smtweb\framework\core\mvc\scheduler\SchedulerTaskManager.class
+com\serotonin\timer\CronExpression.class
+cc\smtweb\framework\core\cache\redis\RedisConnection.class
+cc\smtweb\framework\core\mvc\controller\binder\param\AbstractNumberEditor.class
+cc\smtweb\framework\core\mvc\controller\IActionManager.class
+cc\smtweb\framework\core\db\impl\BaseBean.class
+cc\smtweb\framework\core\mvc\config\ControllerConfig.class
+com\serotonin\timer\SimulationTimer$1.class
+cc\smtweb\framework\core\mvc\variable\SwVariableFactory.class
+cc\smtweb\framework\core\util\JsonUtil.class
+com\serotonin\timer\ExecutionRejectedException.class
+cc\smtweb\framework\core\mvc\controller\binder\CacheEditor.class
+cc\smtweb\framework\core\cache\AbstractCache$IGetBeanKey.class
+cc\smtweb\framework\core\cache\SessionCacheFactory.class
+cc\smtweb\framework\core\mvc\controller\binder\param\ByteEditor.class
+cc\smtweb\framework\core\annotation\SwScheduling.class
+cc\smtweb\framework\core\mvc\controller\binder\param\IEditorValue.class
+cc\smtweb\framework\core\mvc\controller\binder\WebDataBinder.class
+cc\smtweb\framework\core\db\vo\ModelLinkName.class
+cc\smtweb\framework\core\mvc\service\TreeHelper.class
+cc\smtweb\framework\core\common\SwEnum$IndexTypeBean.class
+cc\smtweb\framework\core\common\SwEnum$FormType.class
+cc\smtweb\framework\core\common\SwEnum$WidgetType.class
+com\serotonin\timer\sync\SingleExecutorSingleWaiter.class
+cc\smtweb\framework\core\mvc\service\AbstractTreeHandler.class
+cc\smtweb\framework\core\mvc\controller\binder\body\BeanBodyEditor.class
+cc\smtweb\framework\core\mvc\realm\interceptor\PermInterceptor.class
+com\serotonin\timer\CronTimerTrigger.class
+cc\smtweb\framework\core\mvc\service\DefaultProvider.class
+cc\smtweb\framework\core\db\vo\ModelCatalog.class
+cc\smtweb\framework\core\mvc\controller\scan\IScanAction.class
+cc\smtweb\framework\core\mvc\controller\access\BindFieldAccess.class
+cc\smtweb\framework\core\mvc\controller\scan\BeanManager$OrderMethodAccess.class
+cc\smtweb\framework\core\db\jdbc\MapPropertyRowMapper.class
+cc\smtweb\framework\core\common\SwMap.class
+cc\smtweb\framework\core\mvc\controller\IEditor.class
+cc\smtweb\framework\core\mvc\controller\binder\ParamEditor.class
+cc\smtweb\framework\core\session\UserSession.class
+cc\smtweb\framework\core\mvc\controller\binder\bean\NullEditor.class
+cc\smtweb\framework\core\db\dao\EntityColumn.class
+cc\smtweb\framework\core\cache\redis\RedisPooledObjectFactory.class
+cc\smtweb\framework\core\db\vo\ModelTable.class
+cc\smtweb\framework\core\mvc\realm\service\PermCheckItem.class
+com\serotonin\timer\SimulationTimeSource.class
+cc\smtweb\framework\core\annotation\SwDestroy.class
+cc\smtweb\framework\core\mvc\controller\binder\attr\AbstractAttrEditor.class
+cc\smtweb\framework\core\mvc\scheduler\AbstractJobQueue.class
+cc\smtweb\framework\core\db\impl\IDatabaseInfo.class
+cc\smtweb\framework\core\mvc\realm\interceptor\AbstractPermInterceptor.class
+cc\smtweb\framework\core\annotation\SwColumn.class
+cc\smtweb\framework\core\exception\BizException.class
+cc\smtweb\framework\core\mvc\controller\binder\bean\AbstractContextEditor.class
+cc\smtweb\framework\core\annotation\SwParam.class
+cc\smtweb\framework\core\mvc\service\list\FooterField.class
+cc\smtweb\framework\core\common\StrEnum.class
+cc\smtweb\framework\core\mvc\config\WebMvcConfig.class
+cc\smtweb\framework\core\session\UserSessionArgumentResolver.class
diff --git a/smtweb-system/sw-system-bpm/.gitignore b/smtweb-framework/sw-system-bpm/.gitignore
similarity index 100%
rename from smtweb-system/sw-system-bpm/.gitignore
rename to smtweb-framework/sw-system-bpm/.gitignore
diff --git a/smtweb-system/sw-system-bpm/doc/SwBody.puml b/smtweb-framework/sw-system-bpm/doc/SwBody.puml
similarity index 100%
rename from smtweb-system/sw-system-bpm/doc/SwBody.puml
rename to smtweb-framework/sw-system-bpm/doc/SwBody.puml
diff --git a/smtweb-system/sw-system-bpm/doc/TODO.md b/smtweb-framework/sw-system-bpm/doc/TODO.md
similarity index 100%
rename from smtweb-system/sw-system-bpm/doc/TODO.md
rename to smtweb-framework/sw-system-bpm/doc/TODO.md
diff --git a/smtweb-system/sw-system-bpm/doc/TODO20210714.md b/smtweb-framework/sw-system-bpm/doc/TODO20210714.md
similarity index 100%
rename from smtweb-system/sw-system-bpm/doc/TODO20210714.md
rename to smtweb-framework/sw-system-bpm/doc/TODO20210714.md
diff --git a/smtweb-system/sw-system-bpm/doc/smt_asp20201229.txt b/smtweb-framework/sw-system-bpm/doc/smt_asp20201229.txt
similarity index 100%
rename from smtweb-system/sw-system-bpm/doc/smt_asp20201229.txt
rename to smtweb-framework/sw-system-bpm/doc/smt_asp20201229.txt
diff --git a/smtweb-system/sw-system-bpm/doc/trans.sql b/smtweb-framework/sw-system-bpm/doc/trans.sql
similarity index 100%
rename from smtweb-system/sw-system-bpm/doc/trans.sql
rename to smtweb-framework/sw-system-bpm/doc/trans.sql
diff --git a/smtweb-system/sw-system-bpm/doc/update20210907.sql b/smtweb-framework/sw-system-bpm/doc/update20210907.sql
similarity index 100%
rename from smtweb-system/sw-system-bpm/doc/update20210907.sql
rename to smtweb-framework/sw-system-bpm/doc/update20210907.sql
diff --git a/smtweb-system/sw-system-bpm/doc/update20211122.sql b/smtweb-framework/sw-system-bpm/doc/update20211122.sql
similarity index 100%
rename from smtweb-system/sw-system-bpm/doc/update20211122.sql
rename to smtweb-framework/sw-system-bpm/doc/update20211122.sql
diff --git a/smtweb-system/sw-system-bpm/doc/版本修改说明.md b/smtweb-framework/sw-system-bpm/doc/版本修改说明.md
similarity index 100%
rename from smtweb-system/sw-system-bpm/doc/版本修改说明.md
rename to smtweb-framework/sw-system-bpm/doc/版本修改说明.md
diff --git a/smtweb-system/sw-system-bpm/pom.xml b/smtweb-framework/sw-system-bpm/pom.xml
similarity index 100%
rename from smtweb-system/sw-system-bpm/pom.xml
rename to smtweb-framework/sw-system-bpm/pom.xml
diff --git a/smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/spring/BpmApplication.java b/smtweb-framework/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/spring/BpmApplication.java
similarity index 100%
rename from smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/spring/BpmApplication.java
rename to smtweb-framework/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/spring/BpmApplication.java
diff --git a/smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/spring/BpmAutoConfiguration.java b/smtweb-framework/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/spring/BpmAutoConfiguration.java
similarity index 100%
rename from smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/spring/BpmAutoConfiguration.java
rename to smtweb-framework/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/spring/BpmAutoConfiguration.java
diff --git a/smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/spring/BpmConfigBean.java b/smtweb-framework/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/spring/BpmConfigBean.java
similarity index 100%
rename from smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/spring/BpmConfigBean.java
rename to smtweb-framework/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/spring/BpmConfigBean.java
diff --git a/smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/spring/config/FileConfig.java b/smtweb-framework/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/spring/config/FileConfig.java
similarity index 100%
rename from smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/spring/config/FileConfig.java
rename to smtweb-framework/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/spring/config/FileConfig.java
diff --git a/smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/spring/controller/FileDownloadController.java b/smtweb-framework/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/spring/controller/FileDownloadController.java
similarity index 100%
rename from smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/spring/controller/FileDownloadController.java
rename to smtweb-framework/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/spring/controller/FileDownloadController.java
diff --git a/smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/spring/controller/FileUploadController.java b/smtweb-framework/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/spring/controller/FileUploadController.java
similarity index 100%
rename from smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/spring/controller/FileUploadController.java
rename to smtweb-framework/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/spring/controller/FileUploadController.java
diff --git a/smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/spring/dao/ImageAttachDao.java b/smtweb-framework/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/spring/dao/ImageAttachDao.java
similarity index 100%
rename from smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/spring/dao/ImageAttachDao.java
rename to smtweb-framework/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/spring/dao/ImageAttachDao.java
diff --git a/smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/spring/dao/SysAttachDao.java b/smtweb-framework/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/spring/dao/SysAttachDao.java
similarity index 100%
rename from smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/spring/dao/SysAttachDao.java
rename to smtweb-framework/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/spring/dao/SysAttachDao.java
diff --git a/smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/spring/entity/AttachPathPO.java b/smtweb-framework/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/spring/entity/AttachPathPO.java
similarity index 100%
rename from smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/spring/entity/AttachPathPO.java
rename to smtweb-framework/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/spring/entity/AttachPathPO.java
diff --git a/smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/spring/entity/FileDataVO.java b/smtweb-framework/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/spring/entity/FileDataVO.java
similarity index 100%
rename from smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/spring/entity/FileDataVO.java
rename to smtweb-framework/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/spring/entity/FileDataVO.java
diff --git a/smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/spring/entity/UploadDataVO.java b/smtweb-framework/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/spring/entity/UploadDataVO.java
similarity index 100%
rename from smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/spring/entity/UploadDataVO.java
rename to smtweb-framework/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/spring/entity/UploadDataVO.java
diff --git a/smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/util/BeanUtil.java b/smtweb-framework/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/util/BeanUtil.java
similarity index 100%
rename from smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/util/BeanUtil.java
rename to smtweb-framework/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/util/BeanUtil.java
diff --git a/smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/util/CodeGenUtil.java b/smtweb-framework/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/util/CodeGenUtil.java
similarity index 100%
rename from smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/util/CodeGenUtil.java
rename to smtweb-framework/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/util/CodeGenUtil.java
diff --git a/smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/util/CodeGenerator.java b/smtweb-framework/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/util/CodeGenerator.java
similarity index 100%
rename from smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/util/CodeGenerator.java
rename to smtweb-framework/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/util/CodeGenerator.java
diff --git a/smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/util/FileDynPath.java b/smtweb-framework/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/util/FileDynPath.java
similarity index 100%
rename from smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/util/FileDynPath.java
rename to smtweb-framework/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/util/FileDynPath.java
diff --git a/smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/util/FileFixPath.java b/smtweb-framework/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/util/FileFixPath.java
similarity index 100%
rename from smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/util/FileFixPath.java
rename to smtweb-framework/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/util/FileFixPath.java
diff --git a/smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/util/FilePathGenerator.java b/smtweb-framework/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/util/FilePathGenerator.java
similarity index 100%
rename from smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/util/FilePathGenerator.java
rename to smtweb-framework/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/util/FilePathGenerator.java
diff --git a/smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/util/FilePathInfo.java b/smtweb-framework/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/util/FilePathInfo.java
similarity index 100%
rename from smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/util/FilePathInfo.java
rename to smtweb-framework/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/util/FilePathInfo.java
diff --git a/smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/util/ITreeDataHandler.java b/smtweb-framework/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/util/ITreeDataHandler.java
similarity index 100%
rename from smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/util/ITreeDataHandler.java
rename to smtweb-framework/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/util/ITreeDataHandler.java
diff --git a/smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/util/ITreeDataLevelHandler.java b/smtweb-framework/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/util/ITreeDataLevelHandler.java
similarity index 100%
rename from smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/util/ITreeDataLevelHandler.java
rename to smtweb-framework/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/util/ITreeDataLevelHandler.java
diff --git a/smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/util/IdeaUtil.java b/smtweb-framework/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/util/IdeaUtil.java
similarity index 100%
rename from smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/util/IdeaUtil.java
rename to smtweb-framework/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/util/IdeaUtil.java
diff --git a/smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/util/MemMultipartFile.java b/smtweb-framework/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/util/MemMultipartFile.java
similarity index 100%
rename from smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/util/MemMultipartFile.java
rename to smtweb-framework/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/util/MemMultipartFile.java
diff --git a/smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/util/ThumbImage.java b/smtweb-framework/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/util/ThumbImage.java
similarity index 100%
rename from smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/util/ThumbImage.java
rename to smtweb-framework/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/util/ThumbImage.java
diff --git a/smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/util/TreeDataUtil.java b/smtweb-framework/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/util/TreeDataUtil.java
similarity index 100%
rename from smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/util/TreeDataUtil.java
rename to smtweb-framework/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/util/TreeDataUtil.java
diff --git a/smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/util/XmlUtil.java b/smtweb-framework/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/util/XmlUtil.java
similarity index 100%
rename from smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/util/XmlUtil.java
rename to smtweb-framework/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/util/XmlUtil.java
diff --git a/smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/util/YamlUtil.java b/smtweb-framework/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/util/YamlUtil.java
similarity index 100%
rename from smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/util/YamlUtil.java
rename to smtweb-framework/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/util/YamlUtil.java
diff --git a/smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/web/design/db/ModelCatalogCache.java b/smtweb-framework/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/web/design/db/ModelCatalogCache.java
similarity index 100%
rename from smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/web/design/db/ModelCatalogCache.java
rename to smtweb-framework/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/web/design/db/ModelCatalogCache.java
diff --git a/smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/web/design/db/ModelCatalogService.java b/smtweb-framework/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/web/design/db/ModelCatalogService.java
similarity index 100%
rename from smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/web/design/db/ModelCatalogService.java
rename to smtweb-framework/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/web/design/db/ModelCatalogService.java
diff --git a/smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/web/design/db/ModelCatalogTreeHandler.java b/smtweb-framework/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/web/design/db/ModelCatalogTreeHandler.java
similarity index 100%
rename from smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/web/design/db/ModelCatalogTreeHandler.java
rename to smtweb-framework/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/web/design/db/ModelCatalogTreeHandler.java
diff --git a/smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/web/design/db/ModelCatalogTreeHelper.java b/smtweb-framework/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/web/design/db/ModelCatalogTreeHelper.java
similarity index 100%
rename from smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/web/design/db/ModelCatalogTreeHelper.java
rename to smtweb-framework/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/web/design/db/ModelCatalogTreeHelper.java
diff --git a/smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/web/design/db/ModelDatabaseComboHandler.java b/smtweb-framework/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/web/design/db/ModelDatabaseComboHandler.java
similarity index 100%
rename from smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/web/design/db/ModelDatabaseComboHandler.java
rename to smtweb-framework/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/web/design/db/ModelDatabaseComboHandler.java
diff --git a/smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/web/design/db/ModelDatabaseService.java b/smtweb-framework/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/web/design/db/ModelDatabaseService.java
similarity index 100%
rename from smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/web/design/db/ModelDatabaseService.java
rename to smtweb-framework/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/web/design/db/ModelDatabaseService.java
diff --git a/smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/web/design/db/ModelProjectCache.java b/smtweb-framework/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/web/design/db/ModelProjectCache.java
similarity index 100%
rename from smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/web/design/db/ModelProjectCache.java
rename to smtweb-framework/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/web/design/db/ModelProjectCache.java
diff --git a/smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/web/design/db/ModelProjectService.java b/smtweb-framework/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/web/design/db/ModelProjectService.java
similarity index 100%
rename from smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/web/design/db/ModelProjectService.java
rename to smtweb-framework/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/web/design/db/ModelProjectService.java
diff --git a/smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/web/design/db/ModelTableComboHandler.java b/smtweb-framework/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/web/design/db/ModelTableComboHandler.java
similarity index 100%
rename from smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/web/design/db/ModelTableComboHandler.java
rename to smtweb-framework/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/web/design/db/ModelTableComboHandler.java
diff --git a/smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/web/design/db/ModelTableSaveHanlder.java b/smtweb-framework/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/web/design/db/ModelTableSaveHanlder.java
similarity index 100%
rename from smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/web/design/db/ModelTableSaveHanlder.java
rename to smtweb-framework/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/web/design/db/ModelTableSaveHanlder.java
diff --git a/smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/web/design/db/ModelTableService.java b/smtweb-framework/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/web/design/db/ModelTableService.java
similarity index 100%
rename from smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/web/design/db/ModelTableService.java
rename to smtweb-framework/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/web/design/db/ModelTableService.java
diff --git a/smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/web/design/flow/FlowConst.java b/smtweb-framework/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/web/design/flow/FlowConst.java
similarity index 100%
rename from smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/web/design/flow/FlowConst.java
rename to smtweb-framework/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/web/design/flow/FlowConst.java
diff --git a/smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/web/design/flow/ModelProc.java b/smtweb-framework/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/web/design/flow/ModelProc.java
similarity index 100%
rename from smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/web/design/flow/ModelProc.java
rename to smtweb-framework/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/web/design/flow/ModelProc.java
diff --git a/smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/web/design/flow/ModelProcCache.java b/smtweb-framework/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/web/design/flow/ModelProcCache.java
similarity index 100%
rename from smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/web/design/flow/ModelProcCache.java
rename to smtweb-framework/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/web/design/flow/ModelProcCache.java
diff --git a/smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/web/design/flow/ModelProcService.java b/smtweb-framework/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/web/design/flow/ModelProcService.java
similarity index 100%
rename from smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/web/design/flow/ModelProcService.java
rename to smtweb-framework/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/web/design/flow/ModelProcService.java
diff --git a/smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/web/design/flow/define/ActivityInfo.java b/smtweb-framework/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/web/design/flow/define/ActivityInfo.java
similarity index 100%
rename from smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/web/design/flow/define/ActivityInfo.java
rename to smtweb-framework/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/web/design/flow/define/ActivityInfo.java
diff --git a/smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/web/design/flow/define/HandlerInfo.java b/smtweb-framework/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/web/design/flow/define/HandlerInfo.java
similarity index 100%
rename from smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/web/design/flow/define/HandlerInfo.java
rename to smtweb-framework/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/web/design/flow/define/HandlerInfo.java
diff --git a/smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/web/design/flow/define/ProcInfo.java b/smtweb-framework/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/web/design/flow/define/ProcInfo.java
similarity index 100%
rename from smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/web/design/flow/define/ProcInfo.java
rename to smtweb-framework/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/web/design/flow/define/ProcInfo.java
diff --git a/smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/web/design/flow/define/SignInfo.java b/smtweb-framework/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/web/design/flow/define/SignInfo.java
similarity index 100%
rename from smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/web/design/flow/define/SignInfo.java
rename to smtweb-framework/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/web/design/flow/define/SignInfo.java
diff --git a/smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/web/design/flow/define/TransInfo.java b/smtweb-framework/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/web/design/flow/define/TransInfo.java
similarity index 100%
rename from smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/web/design/flow/define/TransInfo.java
rename to smtweb-framework/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/web/design/flow/define/TransInfo.java
diff --git a/smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/web/design/form/CodeBuildHandler.java b/smtweb-framework/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/web/design/form/CodeBuildHandler.java
similarity index 100%
rename from smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/web/design/form/CodeBuildHandler.java
rename to smtweb-framework/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/web/design/form/CodeBuildHandler.java
diff --git a/smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/web/design/form/ModelForm.java b/smtweb-framework/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/web/design/form/ModelForm.java
similarity index 100%
rename from smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/web/design/form/ModelForm.java
rename to smtweb-framework/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/web/design/form/ModelForm.java
diff --git a/smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/web/design/form/ModelFormCache.java b/smtweb-framework/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/web/design/form/ModelFormCache.java
similarity index 100%
rename from smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/web/design/form/ModelFormCache.java
rename to smtweb-framework/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/web/design/form/ModelFormCache.java
diff --git a/smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/web/design/form/ModelFormHelper.java b/smtweb-framework/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/web/design/form/ModelFormHelper.java
similarity index 100%
rename from smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/web/design/form/ModelFormHelper.java
rename to smtweb-framework/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/web/design/form/ModelFormHelper.java
diff --git a/smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/web/design/form/ModelFormLoadHandler.java b/smtweb-framework/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/web/design/form/ModelFormLoadHandler.java
similarity index 100%
rename from smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/web/design/form/ModelFormLoadHandler.java
rename to smtweb-framework/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/web/design/form/ModelFormLoadHandler.java
diff --git a/smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/web/design/form/ModelFormSaveHandler.java b/smtweb-framework/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/web/design/form/ModelFormSaveHandler.java
similarity index 100%
rename from smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/web/design/form/ModelFormSaveHandler.java
rename to smtweb-framework/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/web/design/form/ModelFormSaveHandler.java
diff --git a/smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/web/design/form/ModelFormService.java b/smtweb-framework/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/web/design/form/ModelFormService.java
similarity index 100%
rename from smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/web/design/form/ModelFormService.java
rename to smtweb-framework/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/web/design/form/ModelFormService.java
diff --git a/smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/web/design/form/define/PageDataset.java b/smtweb-framework/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/web/design/form/define/PageDataset.java
similarity index 100%
rename from smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/web/design/form/define/PageDataset.java
rename to smtweb-framework/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/web/design/form/define/PageDataset.java
diff --git a/smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/web/design/form/define/PageDatasetDynCond.java b/smtweb-framework/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/web/design/form/define/PageDatasetDynCond.java
similarity index 100%
rename from smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/web/design/form/define/PageDatasetDynCond.java
rename to smtweb-framework/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/web/design/form/define/PageDatasetDynCond.java
diff --git a/smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/web/design/form/define/PageDatasetEnumData.java b/smtweb-framework/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/web/design/form/define/PageDatasetEnumData.java
similarity index 100%
rename from smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/web/design/form/define/PageDatasetEnumData.java
rename to smtweb-framework/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/web/design/form/define/PageDatasetEnumData.java
diff --git a/smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/web/design/form/define/PageDatasetField.java b/smtweb-framework/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/web/design/form/define/PageDatasetField.java
similarity index 100%
rename from smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/web/design/form/define/PageDatasetField.java
rename to smtweb-framework/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/web/design/form/define/PageDatasetField.java
diff --git a/smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/web/design/form/define/PageDatasetFilter.java b/smtweb-framework/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/web/design/form/define/PageDatasetFilter.java
similarity index 100%
rename from smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/web/design/form/define/PageDatasetFilter.java
rename to smtweb-framework/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/web/design/form/define/PageDatasetFilter.java
diff --git a/smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/web/design/form/define/PageDatasetSortField.java b/smtweb-framework/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/web/design/form/define/PageDatasetSortField.java
similarity index 100%
rename from smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/web/design/form/define/PageDatasetSortField.java
rename to smtweb-framework/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/web/design/form/define/PageDatasetSortField.java
diff --git a/smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/web/design/form/define/PageDatasets.java b/smtweb-framework/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/web/design/form/define/PageDatasets.java
similarity index 100%
rename from smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/web/design/form/define/PageDatasets.java
rename to smtweb-framework/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/web/design/form/define/PageDatasets.java
diff --git a/smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/web/design/form/define/PageModel.java b/smtweb-framework/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/web/design/form/define/PageModel.java
similarity index 100%
rename from smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/web/design/form/define/PageModel.java
rename to smtweb-framework/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/web/design/form/define/PageModel.java
diff --git a/smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/web/design/preview/MenuVO.java b/smtweb-framework/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/web/design/preview/MenuVO.java
similarity index 100%
rename from smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/web/design/preview/MenuVO.java
rename to smtweb-framework/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/web/design/preview/MenuVO.java
diff --git a/smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/web/design/preview/PreviewMenuTreeService.java b/smtweb-framework/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/web/design/preview/PreviewMenuTreeService.java
similarity index 100%
rename from smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/web/design/preview/PreviewMenuTreeService.java
rename to smtweb-framework/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/web/design/preview/PreviewMenuTreeService.java
diff --git a/smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/web/engine/dynPage/AbstractDynPageHandler.java b/smtweb-framework/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/web/engine/dynPage/AbstractDynPageHandler.java
similarity index 100%
rename from smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/web/engine/dynPage/AbstractDynPageHandler.java
rename to smtweb-framework/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/web/engine/dynPage/AbstractDynPageHandler.java
diff --git a/smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/web/engine/dynPage/DynPageDelHandler.java b/smtweb-framework/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/web/engine/dynPage/DynPageDelHandler.java
similarity index 100%
rename from smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/web/engine/dynPage/DynPageDelHandler.java
rename to smtweb-framework/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/web/engine/dynPage/DynPageDelHandler.java
diff --git a/smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/web/engine/dynPage/DynPageHelper.java b/smtweb-framework/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/web/engine/dynPage/DynPageHelper.java
similarity index 100%
rename from smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/web/engine/dynPage/DynPageHelper.java
rename to smtweb-framework/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/web/engine/dynPage/DynPageHelper.java
diff --git a/smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/web/engine/dynPage/DynPageListHandler.java b/smtweb-framework/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/web/engine/dynPage/DynPageListHandler.java
similarity index 100%
rename from smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/web/engine/dynPage/DynPageListHandler.java
rename to smtweb-framework/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/web/engine/dynPage/DynPageListHandler.java
diff --git a/smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/web/engine/dynPage/DynPageLoadHandler.java b/smtweb-framework/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/web/engine/dynPage/DynPageLoadHandler.java
similarity index 100%
rename from smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/web/engine/dynPage/DynPageLoadHandler.java
rename to smtweb-framework/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/web/engine/dynPage/DynPageLoadHandler.java
diff --git a/smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/web/engine/dynPage/DynPageProvider.java b/smtweb-framework/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/web/engine/dynPage/DynPageProvider.java
similarity index 100%
rename from smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/web/engine/dynPage/DynPageProvider.java
rename to smtweb-framework/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/web/engine/dynPage/DynPageProvider.java
diff --git a/smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/web/engine/dynPage/DynPageSaveHandler.java b/smtweb-framework/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/web/engine/dynPage/DynPageSaveHandler.java
similarity index 100%
rename from smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/web/engine/dynPage/DynPageSaveHandler.java
rename to smtweb-framework/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/web/engine/dynPage/DynPageSaveHandler.java
diff --git a/smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/web/engine/dynPage/DynPageService.java b/smtweb-framework/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/web/engine/dynPage/DynPageService.java
similarity index 100%
rename from smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/web/engine/dynPage/DynPageService.java
rename to smtweb-framework/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/web/engine/dynPage/DynPageService.java
diff --git a/smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/web/engine/dynPage/DynRetBean.java b/smtweb-framework/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/web/engine/dynPage/DynRetBean.java
similarity index 100%
rename from smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/web/engine/dynPage/DynRetBean.java
rename to smtweb-framework/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/web/engine/dynPage/DynRetBean.java
diff --git a/smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/web/engine/flow/FlowInstance.java b/smtweb-framework/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/web/engine/flow/FlowInstance.java
similarity index 100%
rename from smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/web/engine/flow/FlowInstance.java
rename to smtweb-framework/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/web/engine/flow/FlowInstance.java
diff --git a/smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/web/engine/flow/FlowService.java b/smtweb-framework/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/web/engine/flow/FlowService.java
similarity index 100%
rename from smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/web/engine/flow/FlowService.java
rename to smtweb-framework/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/web/engine/flow/FlowService.java
diff --git a/smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/web/engine/flow/define/CandidateEntity.java b/smtweb-framework/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/web/engine/flow/define/CandidateEntity.java
similarity index 100%
rename from smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/web/engine/flow/define/CandidateEntity.java
rename to smtweb-framework/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/web/engine/flow/define/CandidateEntity.java
diff --git a/smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/web/engine/flow/define/CareEntity.java b/smtweb-framework/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/web/engine/flow/define/CareEntity.java
similarity index 100%
rename from smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/web/engine/flow/define/CareEntity.java
rename to smtweb-framework/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/web/engine/flow/define/CareEntity.java
diff --git a/smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/web/engine/flow/define/CommentEntity.java b/smtweb-framework/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/web/engine/flow/define/CommentEntity.java
similarity index 100%
rename from smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/web/engine/flow/define/CommentEntity.java
rename to smtweb-framework/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/web/engine/flow/define/CommentEntity.java
diff --git a/smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/web/engine/flow/define/ProcinstEntity.java b/smtweb-framework/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/web/engine/flow/define/ProcinstEntity.java
similarity index 100%
rename from smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/web/engine/flow/define/ProcinstEntity.java
rename to smtweb-framework/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/web/engine/flow/define/ProcinstEntity.java
diff --git a/smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/web/engine/flow/define/SignEntity.java b/smtweb-framework/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/web/engine/flow/define/SignEntity.java
similarity index 100%
rename from smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/web/engine/flow/define/SignEntity.java
rename to smtweb-framework/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/web/engine/flow/define/SignEntity.java
diff --git a/smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/web/engine/flow/define/TaskEntity.java b/smtweb-framework/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/web/engine/flow/define/TaskEntity.java
similarity index 100%
rename from smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/web/engine/flow/define/TaskEntity.java
rename to smtweb-framework/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/web/engine/flow/define/TaskEntity.java
diff --git a/smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/web/engine/flow/define/TaskRelEntity.java b/smtweb-framework/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/web/engine/flow/define/TaskRelEntity.java
similarity index 100%
rename from smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/web/engine/flow/define/TaskRelEntity.java
rename to smtweb-framework/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/web/engine/flow/define/TaskRelEntity.java
diff --git a/smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/web/sys/user/area/Area.java b/smtweb-framework/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/web/sys/user/area/Area.java
similarity index 100%
rename from smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/web/sys/user/area/Area.java
rename to smtweb-framework/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/web/sys/user/area/Area.java
diff --git a/smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/web/sys/user/area/AreaCache.java b/smtweb-framework/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/web/sys/user/area/AreaCache.java
similarity index 100%
rename from smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/web/sys/user/area/AreaCache.java
rename to smtweb-framework/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/web/sys/user/area/AreaCache.java
diff --git a/smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/web/sys/user/area/AreaService.java b/smtweb-framework/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/web/sys/user/area/AreaService.java
similarity index 100%
rename from smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/web/sys/user/area/AreaService.java
rename to smtweb-framework/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/web/sys/user/area/AreaService.java
diff --git a/smtweb-system/sw-system-bpm/src/main/resources/META-INF/spring.factories b/smtweb-framework/sw-system-bpm/src/main/resources/META-INF/spring.factories
similarity index 100%
rename from smtweb-system/sw-system-bpm/src/main/resources/META-INF/spring.factories
rename to smtweb-framework/sw-system-bpm/src/main/resources/META-INF/spring.factories
diff --git a/smtweb-system/sw-system-bpm/src/main/resources/codegen/ts/dataset.ts b/smtweb-framework/sw-system-bpm/src/main/resources/codegen/ts/dataset.ts
similarity index 100%
rename from smtweb-system/sw-system-bpm/src/main/resources/codegen/ts/dataset.ts
rename to smtweb-framework/sw-system-bpm/src/main/resources/codegen/ts/dataset.ts
diff --git a/smtweb-system/sw-system-bpm/src/main/resources/codegen/ts/events.ts b/smtweb-framework/sw-system-bpm/src/main/resources/codegen/ts/events.ts
similarity index 100%
rename from smtweb-system/sw-system-bpm/src/main/resources/codegen/ts/events.ts
rename to smtweb-framework/sw-system-bpm/src/main/resources/codegen/ts/events.ts
diff --git a/smtweb-system/sw-system-bpm/src/main/resources/codegen/ts/formatter.ts b/smtweb-framework/sw-system-bpm/src/main/resources/codegen/ts/formatter.ts
similarity index 100%
rename from smtweb-system/sw-system-bpm/src/main/resources/codegen/ts/formatter.ts
rename to smtweb-framework/sw-system-bpm/src/main/resources/codegen/ts/formatter.ts
diff --git a/smtweb-system/sw-system-bpm/src/main/resources/codegen/ts/page.less b/smtweb-framework/sw-system-bpm/src/main/resources/codegen/ts/page.less
similarity index 100%
rename from smtweb-system/sw-system-bpm/src/main/resources/codegen/ts/page.less
rename to smtweb-framework/sw-system-bpm/src/main/resources/codegen/ts/page.less
diff --git a/smtweb-system/sw-system-bpm/src/main/resources/codegen/ts/page.types.ts b/smtweb-framework/sw-system-bpm/src/main/resources/codegen/ts/page.types.ts
similarity index 100%
rename from smtweb-system/sw-system-bpm/src/main/resources/codegen/ts/page.types.ts
rename to smtweb-framework/sw-system-bpm/src/main/resources/codegen/ts/page.types.ts
diff --git a/smtweb-system/sw-system-bpm/src/main/resources/codegen/vm/dataset.ts.vm b/smtweb-framework/sw-system-bpm/src/main/resources/codegen/vm/dataset.ts.vm
similarity index 100%
rename from smtweb-system/sw-system-bpm/src/main/resources/codegen/vm/dataset.ts.vm
rename to smtweb-framework/sw-system-bpm/src/main/resources/codegen/vm/dataset.ts.vm
diff --git a/smtweb-system/sw-system-bpm/src/main/resources/codegen/vm/events.ts.vm b/smtweb-framework/sw-system-bpm/src/main/resources/codegen/vm/events.ts.vm
similarity index 100%
rename from smtweb-system/sw-system-bpm/src/main/resources/codegen/vm/events.ts.vm
rename to smtweb-framework/sw-system-bpm/src/main/resources/codegen/vm/events.ts.vm
diff --git a/smtweb-system/sw-system-bpm/src/main/resources/codegen/vm/index.vue.vm b/smtweb-framework/sw-system-bpm/src/main/resources/codegen/vm/index.vue.vm
similarity index 100%
rename from smtweb-system/sw-system-bpm/src/main/resources/codegen/vm/index.vue.vm
rename to smtweb-framework/sw-system-bpm/src/main/resources/codegen/vm/index.vue.vm
diff --git a/smtweb-system/sw-system-bpm/src/main/resources/codegen/vm/router.ts.vm b/smtweb-framework/sw-system-bpm/src/main/resources/codegen/vm/router.ts.vm
similarity index 100%
rename from smtweb-system/sw-system-bpm/src/main/resources/codegen/vm/router.ts.vm
rename to smtweb-framework/sw-system-bpm/src/main/resources/codegen/vm/router.ts.vm
diff --git a/smtweb-system/sw-system-bpm/src/main/resources/codegen/vm/server/CardService.java.vm b/smtweb-framework/sw-system-bpm/src/main/resources/codegen/vm/server/CardService.java.vm
similarity index 100%
rename from smtweb-system/sw-system-bpm/src/main/resources/codegen/vm/server/CardService.java.vm
rename to smtweb-framework/sw-system-bpm/src/main/resources/codegen/vm/server/CardService.java.vm
diff --git a/smtweb-system/sw-system-bpm/src/main/resources/codegen/vm/server/ListService.java.vm b/smtweb-framework/sw-system-bpm/src/main/resources/codegen/vm/server/ListService.java.vm
similarity index 100%
rename from smtweb-system/sw-system-bpm/src/main/resources/codegen/vm/server/ListService.java.vm
rename to smtweb-framework/sw-system-bpm/src/main/resources/codegen/vm/server/ListService.java.vm
diff --git a/smtweb-system/sw-system-bpm/src/main/resources/codegen/vm/server/TreeService.java.vm b/smtweb-framework/sw-system-bpm/src/main/resources/codegen/vm/server/TreeService.java.vm
similarity index 100%
rename from smtweb-system/sw-system-bpm/src/main/resources/codegen/vm/server/TreeService.java.vm
rename to smtweb-framework/sw-system-bpm/src/main/resources/codegen/vm/server/TreeService.java.vm
diff --git a/smtweb-system/sw-system-bpm/src/main/resources/codegen/vm/server/entity.java.vm b/smtweb-framework/sw-system-bpm/src/main/resources/codegen/vm/server/entity.java.vm
similarity index 100%
rename from smtweb-system/sw-system-bpm/src/main/resources/codegen/vm/server/entity.java.vm
rename to smtweb-framework/sw-system-bpm/src/main/resources/codegen/vm/server/entity.java.vm
diff --git a/smtweb-system/sw-system-bpm/src/main/resources/codegen/vm/server/event.js.vm b/smtweb-framework/sw-system-bpm/src/main/resources/codegen/vm/server/event.js.vm
similarity index 100%
rename from smtweb-system/sw-system-bpm/src/main/resources/codegen/vm/server/event.js.vm
rename to smtweb-framework/sw-system-bpm/src/main/resources/codegen/vm/server/event.js.vm
diff --git a/smtweb-system/sw-system-bpm/src/main/resources/config/application-dev.yaml b/smtweb-framework/sw-system-bpm/src/main/resources/config/application-dev.yaml
similarity index 100%
rename from smtweb-system/sw-system-bpm/src/main/resources/config/application-dev.yaml
rename to smtweb-framework/sw-system-bpm/src/main/resources/config/application-dev.yaml
diff --git a/smtweb-system/sw-system-bpm/src/main/resources/config/application-prod.yaml b/smtweb-framework/sw-system-bpm/src/main/resources/config/application-prod.yaml
similarity index 100%
rename from smtweb-system/sw-system-bpm/src/main/resources/config/application-prod.yaml
rename to smtweb-framework/sw-system-bpm/src/main/resources/config/application-prod.yaml
diff --git a/smtweb-system/sw-system-bpm/src/main/resources/config/application.yaml b/smtweb-framework/sw-system-bpm/src/main/resources/config/application.yaml
similarity index 100%
rename from smtweb-system/sw-system-bpm/src/main/resources/config/application.yaml
rename to smtweb-framework/sw-system-bpm/src/main/resources/config/application.yaml
diff --git a/smtweb-system/sw-system-bpm/src/main/resources/config/logback.xml b/smtweb-framework/sw-system-bpm/src/main/resources/config/logback.xml
similarity index 100%
rename from smtweb-system/sw-system-bpm/src/main/resources/config/logback.xml
rename to smtweb-framework/sw-system-bpm/src/main/resources/config/logback.xml
diff --git a/smtweb-system/sw-system-bpm/src/main/resources/static/event/defaultEvent.js b/smtweb-framework/sw-system-bpm/src/main/resources/static/event/defaultEvent.js
similarity index 100%
rename from smtweb-system/sw-system-bpm/src/main/resources/static/event/defaultEvent.js
rename to smtweb-framework/sw-system-bpm/src/main/resources/static/event/defaultEvent.js
diff --git a/smtweb-framework/sw-system-bpm/src/main/resources/static/template/demo.ftl b/smtweb-framework/sw-system-bpm/src/main/resources/static/template/demo.ftl
new file mode 100644
index 0000000..f29f6b9
--- /dev/null
+++ b/smtweb-framework/sw-system-bpm/src/main/resources/static/template/demo.ftl
@@ -0,0 +1,5 @@
+{
+ "form": [
+ {
+ "page": {
+ "id": "p
\ No newline at end of file
diff --git a/smtweb-system/sw-system-bpm/src/main/resources/static/template/incModel/inc_filter.ftl b/smtweb-framework/sw-system-bpm/src/main/resources/static/template/incModel/inc_filter.ftl
similarity index 100%
rename from smtweb-system/sw-system-bpm/src/main/resources/static/template/incModel/inc_filter.ftl
rename to smtweb-framework/sw-system-bpm/src/main/resources/static/template/incModel/inc_filter.ftl
diff --git a/smtweb-system/sw-system-bpm/src/main/resources/static/template/incModel/inc_form.ftl b/smtweb-framework/sw-system-bpm/src/main/resources/static/template/incModel/inc_form.ftl
similarity index 100%
rename from smtweb-system/sw-system-bpm/src/main/resources/static/template/incModel/inc_form.ftl
rename to smtweb-framework/sw-system-bpm/src/main/resources/static/template/incModel/inc_form.ftl
diff --git a/smtweb-system/sw-system-bpm/src/main/resources/static/template/incModel/inc_grid_opt.ftl b/smtweb-framework/sw-system-bpm/src/main/resources/static/template/incModel/inc_grid_opt.ftl
similarity index 100%
rename from smtweb-system/sw-system-bpm/src/main/resources/static/template/incModel/inc_grid_opt.ftl
rename to smtweb-framework/sw-system-bpm/src/main/resources/static/template/incModel/inc_grid_opt.ftl
diff --git a/smtweb-system/sw-system-bpm/src/main/resources/static/template/incModel/inc_model.ftl b/smtweb-framework/sw-system-bpm/src/main/resources/static/template/incModel/inc_model.ftl
similarity index 100%
rename from smtweb-system/sw-system-bpm/src/main/resources/static/template/incModel/inc_model.ftl
rename to smtweb-framework/sw-system-bpm/src/main/resources/static/template/incModel/inc_model.ftl
diff --git a/smtweb-system/sw-system-bpm/src/main/resources/static/template/index.yaml b/smtweb-framework/sw-system-bpm/src/main/resources/static/template/index.yaml
similarity index 100%
rename from smtweb-system/sw-system-bpm/src/main/resources/static/template/index.yaml
rename to smtweb-framework/sw-system-bpm/src/main/resources/static/template/index.yaml
diff --git a/smtweb-system/sw-system-bpm/src/main/resources/static/template/java_bean.ftl b/smtweb-framework/sw-system-bpm/src/main/resources/static/template/java_bean.ftl
similarity index 100%
rename from smtweb-system/sw-system-bpm/src/main/resources/static/template/java_bean.ftl
rename to smtweb-framework/sw-system-bpm/src/main/resources/static/template/java_bean.ftl
diff --git a/smtweb-system/sw-system-bpm/src/main/resources/static/template/java_cache.ftl b/smtweb-framework/sw-system-bpm/src/main/resources/static/template/java_cache.ftl
similarity index 100%
rename from smtweb-system/sw-system-bpm/src/main/resources/static/template/java_cache.ftl
rename to smtweb-framework/sw-system-bpm/src/main/resources/static/template/java_cache.ftl
diff --git a/smtweb-system/sw-system-bpm/src/main/resources/static/template/java_service.ftl b/smtweb-framework/sw-system-bpm/src/main/resources/static/template/java_service.ftl
similarity index 100%
rename from smtweb-system/sw-system-bpm/src/main/resources/static/template/java_service.ftl
rename to smtweb-framework/sw-system-bpm/src/main/resources/static/template/java_service.ftl
diff --git a/smtweb-system/sw-system-bpm/src/main/resources/static/template/js_event.ftl b/smtweb-framework/sw-system-bpm/src/main/resources/static/template/js_event.ftl
similarity index 100%
rename from smtweb-system/sw-system-bpm/src/main/resources/static/template/js_event.ftl
rename to smtweb-framework/sw-system-bpm/src/main/resources/static/template/js_event.ftl
diff --git a/smtweb-system/sw-system-bpm/src/main/resources/static/template/model_card.ftl b/smtweb-framework/sw-system-bpm/src/main/resources/static/template/model_card.ftl
similarity index 100%
rename from smtweb-system/sw-system-bpm/src/main/resources/static/template/model_card.ftl
rename to smtweb-framework/sw-system-bpm/src/main/resources/static/template/model_card.ftl
diff --git a/smtweb-system/sw-system-bpm/src/main/resources/static/template/model_list.ftl b/smtweb-framework/sw-system-bpm/src/main/resources/static/template/model_list.ftl
similarity index 100%
rename from smtweb-system/sw-system-bpm/src/main/resources/static/template/model_list.ftl
rename to smtweb-framework/sw-system-bpm/src/main/resources/static/template/model_list.ftl
diff --git a/smtweb-system/sw-system-bpm/src/main/resources/static/template/model_list1.ftl b/smtweb-framework/sw-system-bpm/src/main/resources/static/template/model_list1.ftl
similarity index 100%
rename from smtweb-system/sw-system-bpm/src/main/resources/static/template/model_list1.ftl
rename to smtweb-framework/sw-system-bpm/src/main/resources/static/template/model_list1.ftl
diff --git a/smtweb-system/sw-system-bpm/src/main/resources/static/template/model_simple.ftl b/smtweb-framework/sw-system-bpm/src/main/resources/static/template/model_simple.ftl
similarity index 100%
rename from smtweb-system/sw-system-bpm/src/main/resources/static/template/model_simple.ftl
rename to smtweb-framework/sw-system-bpm/src/main/resources/static/template/model_simple.ftl
diff --git a/smtweb-system/sw-system-bpm/src/test/java/cc/smtweb/system/bpm/test/BpmTest.java b/smtweb-framework/sw-system-bpm/src/test/java/cc/smtweb/system/bpm/test/BpmTest.java
similarity index 100%
rename from smtweb-system/sw-system-bpm/src/test/java/cc/smtweb/system/bpm/test/BpmTest.java
rename to smtweb-framework/sw-system-bpm/src/test/java/cc/smtweb/system/bpm/test/BpmTest.java
diff --git a/smtweb-system/sw-system-bpm/src/test/java/cc/smtweb/system/bpm/test/BuildJavaBean.java b/smtweb-framework/sw-system-bpm/src/test/java/cc/smtweb/system/bpm/test/BuildJavaBean.java
similarity index 100%
rename from smtweb-system/sw-system-bpm/src/test/java/cc/smtweb/system/bpm/test/BuildJavaBean.java
rename to smtweb-framework/sw-system-bpm/src/test/java/cc/smtweb/system/bpm/test/BuildJavaBean.java
diff --git a/smtweb-system/sw-system-bpm/src/test/java/cc/smtweb/system/bpm/test/HexTest.java b/smtweb-framework/sw-system-bpm/src/test/java/cc/smtweb/system/bpm/test/HexTest.java
similarity index 100%
rename from smtweb-system/sw-system-bpm/src/test/java/cc/smtweb/system/bpm/test/HexTest.java
rename to smtweb-framework/sw-system-bpm/src/test/java/cc/smtweb/system/bpm/test/HexTest.java
diff --git a/smtweb-system/sw-system-bpm/src/test/java/cc/smtweb/system/bpm/test/ModelFormTest.java b/smtweb-framework/sw-system-bpm/src/test/java/cc/smtweb/system/bpm/test/ModelFormTest.java
similarity index 100%
rename from smtweb-system/sw-system-bpm/src/test/java/cc/smtweb/system/bpm/test/ModelFormTest.java
rename to smtweb-framework/sw-system-bpm/src/test/java/cc/smtweb/system/bpm/test/ModelFormTest.java
diff --git a/smtweb-system/sw-system-bpm/src/test/java/cc/smtweb/system/bpm/test/SpelTest.java b/smtweb-framework/sw-system-bpm/src/test/java/cc/smtweb/system/bpm/test/SpelTest.java
similarity index 100%
rename from smtweb-system/sw-system-bpm/src/test/java/cc/smtweb/system/bpm/test/SpelTest.java
rename to smtweb-framework/sw-system-bpm/src/test/java/cc/smtweb/system/bpm/test/SpelTest.java
diff --git a/smtweb-framework/sw-system-bpm/src/test/java/cc/smtweb/system/bpm/test/TestMain.java b/smtweb-framework/sw-system-bpm/src/test/java/cc/smtweb/system/bpm/test/TestMain.java
new file mode 100644
index 0000000..606cd02
--- /dev/null
+++ b/smtweb-framework/sw-system-bpm/src/test/java/cc/smtweb/system/bpm/test/TestMain.java
@@ -0,0 +1,18 @@
+package cc.smtweb.system.bpm.test;
+
+import cc.smtweb.framework.core.util.JsonUtil;
+import cc.smtweb.system.bpm.web.design.form.ModelFormHelper;
+import cc.smtweb.system.bpm.web.design.form.define.PageDatasetDynCond;
+
+/**
+ * Created by Akmm at 2021/12/25 22:21
+ */
+public class TestMain {
+
+ public static void main(String[] args) throws Exception {
+ PageDatasetDynCond dc = new PageDatasetDynCond();
+ dc.opt = "and";
+ dc.param = "f1";
+ System.out.println(JsonUtil.encodeString(dc));
+ }
+}
diff --git a/smtweb-system/sw-system-bpm/src/test/java/cc/smtweb/system/bpm/test/ToolTest.java b/smtweb-framework/sw-system-bpm/src/test/java/cc/smtweb/system/bpm/test/ToolTest.java
similarity index 100%
rename from smtweb-system/sw-system-bpm/src/test/java/cc/smtweb/system/bpm/test/ToolTest.java
rename to smtweb-framework/sw-system-bpm/src/test/java/cc/smtweb/system/bpm/test/ToolTest.java
diff --git a/smtweb-system/sw-system-bpm/src/test/java/cc/smtweb/system/bpm/test/TreeDataBuilderTest.java b/smtweb-framework/sw-system-bpm/src/test/java/cc/smtweb/system/bpm/test/TreeDataBuilderTest.java
similarity index 100%
rename from smtweb-system/sw-system-bpm/src/test/java/cc/smtweb/system/bpm/test/TreeDataBuilderTest.java
rename to smtweb-framework/sw-system-bpm/src/test/java/cc/smtweb/system/bpm/test/TreeDataBuilderTest.java
diff --git a/smtweb-system/sw-system-bpm/src/test/resources/code/index.vue b/smtweb-framework/sw-system-bpm/src/test/resources/code/index.vue
similarity index 100%
rename from smtweb-system/sw-system-bpm/src/test/resources/code/index.vue
rename to smtweb-framework/sw-system-bpm/src/test/resources/code/index.vue
diff --git a/smtweb-system/sw-system-bpm/src/test/resources/code/index.vue.tmp b/smtweb-framework/sw-system-bpm/src/test/resources/code/index.vue.tmp
similarity index 100%
rename from smtweb-system/sw-system-bpm/src/test/resources/code/index.vue.tmp
rename to smtweb-framework/sw-system-bpm/src/test/resources/code/index.vue.tmp
diff --git a/smtweb-system/sw-system-bpm/src/test/resources/code/list.xml b/smtweb-framework/sw-system-bpm/src/test/resources/code/list.xml
similarity index 100%
rename from smtweb-system/sw-system-bpm/src/test/resources/code/list.xml
rename to smtweb-framework/sw-system-bpm/src/test/resources/code/list.xml
diff --git a/smtweb-system/sw-system-bpm/src/test/resources/db/smt_uc.json b/smtweb-framework/sw-system-bpm/src/test/resources/db/smt_uc.json
similarity index 100%
rename from smtweb-system/sw-system-bpm/src/test/resources/db/smt_uc.json
rename to smtweb-framework/sw-system-bpm/src/test/resources/db/smt_uc.json
diff --git a/smtweb-system/sw-system-bpm/src/test/resources/template/index.vm b/smtweb-framework/sw-system-bpm/src/test/resources/template/index.vm
similarity index 100%
rename from smtweb-system/sw-system-bpm/src/test/resources/template/index.vm
rename to smtweb-framework/sw-system-bpm/src/test/resources/template/index.vm
diff --git a/smtweb-system/sw-system-bpm/src/test/resources/ui/508660168293093376.json b/smtweb-framework/sw-system-bpm/src/test/resources/ui/508660168293093376.json
similarity index 100%
rename from smtweb-system/sw-system-bpm/src/test/resources/ui/508660168293093376.json
rename to smtweb-framework/sw-system-bpm/src/test/resources/ui/508660168293093376.json
diff --git a/smtweb-system/.gitignore b/smtweb-system/.gitignore
deleted file mode 100644
index c7a782d..0000000
--- a/smtweb-system/.gitignore
+++ /dev/null
@@ -1,27 +0,0 @@
-# ---> Java
-# Compiled class file
-*.class
-
-# Log file
-*.log
-
-# BlueJ files
-*.ctxt
-
-# Mobile Tools for Java (J2ME)
-.mtj.tmp/
-
-# Package Files #
-*.jar
-*.war
-*.nar
-*.ear
-*.zip
-*.tar.gz
-*.rar
-
-# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
-hs_err_pid*
-
-.idea/
-*.iml
diff --git a/smtweb-system/pom.xml b/smtweb-system/pom.xml
deleted file mode 100644
index 123832b..0000000
--- a/smtweb-system/pom.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-
-
- 4.0.0
-
- cc.smtweb
- smtweb-system
- pom
- 2.1.0-SNAPSHOT
-
-
- org.springframework.boot
- spring-boot-starter-parent
- 2.3.1.RELEASE
-
-
-
- UTF-8
- UTF-8
- 1.8
- 1.8
- 1.8
-
-
-
- sw-system-bpm
- sw-system-bpm-vue
-
-