From 8f02a476da08a5513f4e91761c4409e5d020ec49 Mon Sep 17 00:00:00 2001 From: Ludo Mikula Date: Wed, 10 May 2023 23:15:02 +0200 Subject: [PATCH 01/21] rebrand API server --- deploy/docker/Dockerfile | 8 +- .../pom.xml | 41 ++----- .../domain/application/ApplicationUtil.java | 2 +- .../domain/application/model/Application.java | 16 +-- .../model/ApplicationHistorySnapshot.java | 5 +- .../application/model/ApplicationStatus.java | 2 +- .../application/model/ApplicationType.java | 2 +- .../domain/application/model/UiItem.java | 2 +- .../ApplicationHistorySnapshotRepository.java | 5 +- .../repository/ApplicationRepository.java | 7 +- .../CustomApplicationRepository.java | 4 +- .../CustomApplicationRepositoryImpl.java | 5 +- .../ApplicationHistorySnapshotService.java | 5 +- .../service/ApplicationService.java | 26 ++--- ...ApplicationHistorySnapshotServiceImpl.java | 17 ++- .../lowcoder}/domain/asset/model/Asset.java | 4 +- .../domain/asset/service/AssetRepository.java | 5 +- .../domain/asset/service/AssetService.java | 5 +- .../asset/service/AssetServiceImpl.java | 13 +-- .../authentication/AuthenticationService.java | 8 +- .../AuthenticationServiceImpl.java | 17 ++- .../domain/authentication/FindAuthConfig.java | 9 ++ .../context/AuthRequestContext.java | 4 +- .../context/FormAuthRequestContext.java | 2 +- .../domain/configurations/MongoConfig.java | 12 +- .../configurations/Pf4jConfiguration.java | 2 +- .../domain/configurations/RedisConfig.java | 2 +- .../RedisRateLimiterConfig.java | 2 +- ...ClientBasedDatasourceConnectionHolder.java | 4 +- .../domain/datasource/model/Datasource.java | 52 ++++----- .../model/DatasourceConnectionHolder.java | 2 +- .../model/DatasourceCreationSource.java | 4 +- .../domain/datasource/model/DatasourceDO.java | 4 +- .../datasource/model/DatasourceStatus.java | 2 +- .../model/DatasourceStructureDO.java | 6 +- .../StatelessDatasourceConnectionHolder.java | 2 +- .../model/TokenBasedConnection.java | 6 +- .../model/TokenBasedConnectionDO.java | 5 +- .../model/TokenBasedConnectionHolder.java | 2 +- .../repository/DatasourceDORepository.java | 5 +- .../repository/DatasourceRepository.java | 33 +++--- .../DatasourceStructureRepository.java | 5 +- .../TokenBasedConnectionDORepository.java | 5 +- .../TokenBasedConnectionRepository.java | 19 ++- .../service/DatasourceConnectionPool.java | 6 +- .../datasource/service/DatasourceService.java | 6 +- .../service/DatasourceStructureService.java | 4 +- .../service/JsDatasourceHelper.java | 13 +-- .../impl/ClientBasedConnectionPool.java | 46 ++++---- .../impl/DatasourceConnectionPoolFacade.java | 25 ++-- .../service/impl/DatasourceServiceImpl.java | 46 ++++---- .../impl/DatasourceStructureServiceImpl.java | 39 +++---- .../service/impl/StatelessConnectionPool.java | 11 +- .../impl/TokenBasedConnectionPool.java | 33 +++--- .../domain/encryption/EncryptionService.java | 2 +- .../encryption/EncryptionServiceImpl.java | 7 +- .../domain/folder/model/ElementType.java | 2 +- .../lowcoder}/domain/folder/model/Folder.java | 5 +- .../domain/folder/model/FolderElement.java | 2 +- .../folder/repository/FolderRepository.java | 5 +- .../domain/folder/service/ElementNode.java | 2 +- .../service/FolderElementRelationService.java | 11 +- .../domain/folder/service/FolderNode.java | 2 +- .../domain/folder/service/FolderService.java | 17 ++- .../lowcoder}/domain/folder/service/Node.java | 2 +- .../lowcoder}/domain/folder/service/Tree.java | 2 +- .../domain/group/event/GroupDeletedEvent.java | 2 +- .../lowcoder}/domain/group/model/Group.java | 6 +- .../domain/group/model/GroupMember.java | 6 +- .../group/repository/GroupRepository.java | 5 +- .../group/service/GroupMemberService.java | 10 +- .../group/service/GroupMemberServiceImpl.java | 19 ++- .../domain/group/service/GroupService.java | 6 +- .../group/service/GroupServiceImpl.java | 23 ++-- .../domain/group/util/SystemGroups.java | 4 +- .../UserApplicationInteraction.java | 6 +- .../UserApplicationInteractionService.java | 9 +- .../interaction/UserFolderInteraction.java | 6 +- .../UserFolderInteractionService.java | 9 +- .../domain/invitation/model/Invitation.java | 5 +- .../CustomInvitationRepository.java | 2 +- .../CustomInvitationRepositoryImpl.java | 10 +- .../repository/InvitationRepository.java | 5 +- .../invitation/service/InvitationService.java | 11 +- .../domain/material/model/MaterialMeta.java | 5 +- .../domain/material/model/MaterialType.java | 2 +- .../repository/MaterialMateRepository.java | 7 +- .../service/meta/MaterialMetaService.java | 4 +- .../service/meta/MaterialMetaServiceImpl.java | 13 +-- .../storage/GridFsStorageServiceImpl.java | 5 +- .../storage/MaterialStorageService.java | 5 +- .../domain/mongodb/AfterMongodbRead.java | 2 +- .../domain/mongodb/BeforeMongodbWrite.java | 2 +- .../domain/mongodb/MongodbEventListener.java | 9 +- .../mongodb/MongodbInterceptorContext.java | 6 + .../organization/event/OrgDeletedEvent.java | 2 +- .../event/OrgMemberLeftEvent.java | 2 +- .../model/EnterpriseConnectionConfig.java | 4 +- .../domain/organization/model/MemberRole.java | 2 +- .../domain/organization/model/OrgMember.java | 4 +- .../organization/model/OrgMemberState.java | 2 +- .../organization/model/Organization.java | 14 +-- .../model/OrganizationDomain.java | 10 +- .../organization/model/OrganizationState.java | 2 +- .../repository/OrganizationRepository.java | 7 +- .../service/OrgMemberService.java | 8 +- .../service/OrgMemberServiceImpl.java | 37 +++--- .../service/OrganizationService.java | 13 +-- .../service/OrganizationServiceImpl.java | 69 ++++++----- .../permission/config/PermissionConst.java | 2 +- .../permission/model/ResourceAction.java | 2 +- .../permission/model/ResourceHolder.java | 4 +- .../permission/model/ResourcePermission.java | 10 +- .../domain/permission/model/ResourceRole.java | 4 +- .../domain/permission/model/ResourceType.java | 6 +- .../model/UserPermissionOnResourceStatus.java | 2 +- .../service/ApplicationPermissionHandler.java | 23 ++-- .../service/DatasourcePermissionHandler.java | 18 +-- .../service/ResourcePermissionHandler.java | 20 ++-- .../service/ResourcePermissionRepository.java | 13 ++- .../service/ResourcePermissionService.java | 28 ++--- .../ResourcePermissionRepositoryImpl.java | 22 ++-- .../solution/SuggestAppAdminSolution.java | 17 ++- .../domain/plugin/DatasourceMetaInfo.java | 5 +- .../plugin/DatasourceMetaInfoConstants.java | 4 +- .../plugin/client/DatasourcePluginClient.java | 21 ++-- .../dto/DatasourcePluginDefinition.java | 2 +- .../dto/GetPluginDynamicConfigRequestDTO.java | 2 +- .../service/DatasourceMetaInfoService.java | 12 +- .../impl/DatasourceMetaInfoServiceImpl.java | 43 ++++--- .../domain/query/model/ApplicationQuery.java | 2 +- .../query/model/ApplicationQueryContext.java | 6 +- .../domain/query/model/BaseQuery.java | 2 +- .../domain/query/model/LibraryQuery.java | 6 +- .../query/model/LibraryQueryCombineId.java | 2 +- .../query/model/LibraryQueryRecord.java | 6 +- .../domain/query/model/QueryContext.java | 4 +- .../LibraryQueryRecordRepository.java | 5 +- .../repository/LibraryQueryRepository.java | 5 +- .../service/LibraryQueryRecordService.java | 11 +- .../query/service/LibraryQueryService.java | 17 ++- .../query/service/QueryExecutionService.java | 31 +++-- .../domain/query/util/QueryTimeoutUtils.java | 10 +- .../domain/solutions/TemplateSolution.java | 39 +++---- .../domain/template/model/Template.java | 5 +- .../repository/TemplateRepository.java | 5 +- .../template/service/TemplateService.java | 7 +- .../domain/user/constant/UserStatusType.java | 2 +- .../domain/user/model/AuthToken.java | 2 +- .../lowcoder}/domain/user/model/AuthUser.java | 5 +- .../domain/user/model/Connection.java | 4 +- .../user/model/ConnectionAuthToken.java | 2 +- .../domain/user/model/InviteUser.java | 2 +- .../org/lowcoder}/domain/user/model/User.java | 6 +- .../domain/user/model/UserDetail.java | 2 +- .../domain/user/model/UserState.java | 2 +- .../domain/user/model/UserStatus.java | 4 +- .../user/repository/UserRepository.java | 5 +- .../user/repository/UserStatusRepository.java | 5 +- .../domain/user/service/UserService.java | 15 ++- .../domain/user/service/UserServiceImpl.java | 67 ++++++----- .../user/service/UserStatusService.java | 11 +- .../lowcoder}/domain/util/QueryDslUtils.java | 2 +- .../lowcoder}/domain/ServerApplication.java | 4 +- .../service/OrgMemberServiceTest.java | 10 +- .../impl/ClientBasedConnectionPoolTest.java | 28 ++--- .../lowcoder}/impl/mock/MockConnection.java | 2 +- .../mock/MockDatasourceConnectionConfig.java | 6 +- .../impl/mock/MockDatasourceConnector.java | 10 +- .../mock/MockDatasourceMetaInfoService.java | 14 +-- .../src/test/resources/application.yml | 6 +- .../{openblocks-ee => lowcoder-ee}/pom.xml | 6 +- .../pom.xml | 35 ++---- .../infra/annotation/NonEmptyMono.java | 2 +- .../infra/annotation/PossibleEmptyMono.java | 2 +- .../infra/birelation/BiRelation.java | 4 +- .../infra/birelation/BiRelationBizType.java | 2 +- .../birelation/BiRelationRepository.java | 2 +- .../infra/birelation/BiRelationService.java | 4 +- .../ConditionalOnPropertyNotBlank.java | 5 +- .../infra/config/AutoReloadConfImpl.java | 5 +- .../infra/config/AutoReloadConfigFactory.java | 11 +- .../config/AutoReloadConfigInstanceImpl.java | 9 +- .../infra/config/ConfigCenterImpl.java | 9 +- .../infra/config/model/ServerConfig.java | 4 +- .../CustomServerConfigRepository.java | 4 +- .../CustomServerConfigRepositoryImpl.java | 7 +- .../repository/ServerConfigRepository.java | 4 +- .../org/lowcoder}/infra/constant/NewUrl.java | 2 +- .../org/lowcoder}/infra/constant/Url.java | 2 +- .../lowcoder}/infra/event/AbstractEvent.java | 2 +- .../infra/event/ApplicationCommonEvent.java | 2 +- .../java/org/lowcoder}/infra/event/Event.java | 2 +- .../org/lowcoder}/infra/event/EventType.java | 4 +- .../infra/event/FolderCommonEvent.java | 2 +- .../infra/event/LibraryQueryEvent.java | 2 +- .../infra/event/QueryExecutionEvent.java | 2 +- .../event/datasource/DatasourceEvent.java | 6 +- .../datasource/DatasourcePermissionEvent.java | 6 +- .../infra/event/group/BaseGroupEvent.java | 4 +- .../infra/event/group/GroupCreateEvent.java | 4 +- .../infra/event/group/GroupDeleteEvent.java | 4 +- .../infra/event/group/GroupUpdateEvent.java | 4 +- .../groupmember/BaseGroupMemberEvent.java | 4 +- .../groupmember/GroupMemberAddEvent.java | 4 +- .../groupmember/GroupMemberLeaveEvent.java | 4 +- .../groupmember/GroupMemberRemoveEvent.java | 4 +- .../GroupMemberRoleUpdateEvent.java | 4 +- .../infra/event/user/UserLoginEvent.java | 6 +- .../infra/event/user/UserLogoutEvent.java | 6 +- .../lowcoder}/infra/eventlog/EventLog.java | 2 +- .../lowcoder}/infra/js/NodeServerClient.java | 2 +- .../lowcoder}/infra/js/NodeServerHelper.java | 5 +- .../infra/localcache/CaffeineCacheUtils.java | 2 +- .../infra/localcache/ReloadableCache.java | 5 +- .../infra/mongo/MongoUpsertHelper.java | 10 +- .../org/lowcoder}/infra/perf/PerfEvent.java | 2 +- .../org/lowcoder}/infra/perf/PerfHelper.java | 2 +- .../lowcoder}/infra/serverlog/ServerLog.java | 2 +- .../infra/serverlog/ServerLogRepository.java | 2 +- .../infra/serverlog/ServerLogService.java | 7 +- .../org/lowcoder}/infra/util/AssetUtils.java | 5 +- .../org/lowcoder}/infra/util/FluxHelper.java | 2 +- .../org/lowcoder}/infra/util/LogUtils.java | 2 +- .../org/lowcoder}/infra/util/MonoUtils.java | 2 +- .../lowcoder}/infra/util/NetworkUtils.java | 5 +- .../org/lowcoder}/infra/util/RSAUtils.java | 2 +- .../lowcoder}/infra/util/RateLimitHelper.java | 2 +- .../org/lowcoder}/infra/util/TupleUtils.java | 2 +- .../AutoReloadConfigInstanceImplTest.java | 11 +- .../AutoReloadConfigInstanceImplTest.json | 0 .../clickHousePlugin/plugin.properties | 5 + .../clickHousePlugin/pom.xml | 8 +- .../clickhouse/ClickHouseConnector.java | 20 ++-- .../plugin/clickhouse/ClickHousePlugin.java | 2 +- .../clickhouse/ClickHouseQueryExecutor.java | 56 ++++----- .../model/ClickHouseDatasourceConfig.java | 12 +- .../model/ClickHouseQueryConfig.java | 10 +- .../utils/ClickHouseStructureParser.java | 8 +- .../elasticSearchPlugin/plugin.properties | 5 + .../elasticSearchPlugin/pom.xml | 8 +- .../org/lowcoder}/plugin/es/EsConnector.java | 36 +++--- .../java/org/lowcoder/plugin/es/EsError.java | 9 ++ .../org/lowcoder}/plugin/es/EsPlugin.java | 2 +- .../lowcoder}/plugin/es/EsQueryExecutor.java | 28 ++--- .../plugin/es/ReactorRestClientAdaptor.java | 2 +- .../plugin/es/model/EsConnection.java | 5 +- .../plugin/es/model/EsDatasourceConfig.java | 10 +- .../plugin/es/model/EsQueryConfig.java | 2 +- .../es/model/EsQueryExecutionContext.java | 5 +- .../googleSheetsPlugin/plugin.properties | 5 + .../googleSheetsPlugin/pom.xml | 10 +- .../plugin/googlesheets/GoogleSheetError.java | 4 +- .../googlesheets/GoogleSheetsPlugin.java | 54 ++++----- .../googlesheets/constants/FieldName.java | 2 +- .../model/GoogleSheetsActionRequest.java | 2 +- .../model/GoogleSheetsAppendDataRequest.java | 9 +- .../model/GoogleSheetsClearDataRequst.java | 9 +- .../model/GoogleSheetsDatasourceConfig.java | 15 +-- .../model/GoogleSheetsDeleteDataRequest.java | 9 +- .../GoogleSheetsQueryExecutionContext.java | 5 +- .../model/GoogleSheetsReadDataRequest.java | 4 +- .../model/GoogleSheetsUpdateDataRequest.java | 13 +-- .../model/ServiceAccountJsonUtils.java | 4 +- .../GoogleSheetsActionHandler.java | 6 +- .../GoogleSheetsActionHandlerFactory.java | 7 +- .../GoogleSheetsAppendDataHandler.java | 17 +-- .../GoogleSheetsClearDataHandler.java | 11 +- .../GoogleSheetsDeleteDataHandler.java | 11 +- .../GoogleSheetsGetPreParameters.java | 17 +-- .../GoogleSheetsReadDataHandler.java | 13 ++- .../GoogleSheetsUpdateDataHandler.java | 21 ++-- .../graphqlPlugin/plugin.properties | 5 + .../graphqlPlugin/pom.xml | 10 +- .../plugin/graphql/GraphQLConnector.java | 9 +- .../lowcoder/plugin/graphql/GraphQLError.java | 7 ++ .../plugin/graphql/GraphQLExecutor.java | 72 ++++++------ .../plugin/graphql/GraphQLPlugin.java | 2 +- .../graphql/constants/ResponseDataType.java | 2 +- .../plugin/graphql/helpers/AuthHelper.java | 4 +- .../graphql}/helpers/BufferingFilter.java | 2 +- .../graphql/model/GraphQLQueryConfig.java | 12 +- .../model/GraphQLQueryExecutionContext.java | 8 +- .../graphql/utils/GraphQLBodyUtils.java | 5 +- .../lowcoderApiPlugin/plugin.properties | 5 + .../lowcoderApiPlugin}/pom.xml | 14 +-- .../lowcoder/plugin/LowcoderApiConnector.java | 47 ++++++++ .../lowcoder/plugin/LowcoderApiExecutor.java} | 49 ++++---- .../lowcoder/plugin/LowcoderApiPlugin.java | 11 ++ .../plugin/LowcoderApiPluginError.java | 9 ++ .../LowcoderApiQueryExecutionContext.java} | 7 +- .../mongoPlugin/plugin.properties | 5 + .../mongoPlugin/pom.xml | 8 +- .../lowcoder}/plugin/mongo/MongoPlugin.java | 90 +++++++------- .../plugin/mongo/MongoPluginError.java | 4 +- .../plugin/mongo/commands/Aggregate.java | 14 +-- .../plugin/mongo/commands/Count.java | 10 +- .../plugin/mongo/commands/Delete.java | 13 +-- .../plugin/mongo/commands/Distinct.java | 13 +-- .../lowcoder}/plugin/mongo/commands/Find.java | 25 ++-- .../plugin/mongo/commands/Insert.java | 15 ++- .../plugin/mongo/commands/MongoCommand.java | 10 +- .../plugin/mongo/commands/UpdateMany.java | 15 ++- .../mongo/constants/MongoFieldName.java | 2 +- .../constants/MongoSpecialDataTypes.java | 2 +- .../mongo/model/MongoAuthMechanism.java | 2 +- .../plugin/mongo/model/MongoConnection.java | 2 +- .../mongo/model/MongoConnectionUriParser.java | 6 +- .../mongo/model/MongoDatasourceConfig.java | 24 ++-- .../model/MongoQueryExecutionContext.java | 5 +- .../plugin/mongo/utils/MongoQueryUtils.java | 30 ++--- .../mssqlPlugin/plugin.properties | 5 + .../mssqlPlugin/pom.xml | 10 +- .../plugin/mssql/MssqlConnector.java | 6 +- .../lowcoder}/plugin/mssql/MssqlPlugin.java | 2 +- .../plugin/mssql/MssqlQueryExecutor.java | 35 +++--- .../plugin/mssql/gui/GuiConstants.java | 2 +- .../mssql/gui/MssqlBulkInsertCommand.java | 14 +-- .../mssql/gui/MssqlBulkUpdateCommand.java | 16 +-- .../plugin/mssql/gui/MssqlDeleteCommand.java | 14 +-- .../plugin/mssql/gui/MssqlInsertCommand.java | 11 +- .../plugin/mssql/gui/MssqlUpdateCommand.java | 13 ++- .../mssql/model/MssqlDatasourceConfig.java | 12 +- .../plugin/mssql/model/MssqlQueryConfig.java | 10 +- .../plugin/mssql/util/MssqlResultParser.java | 4 +- .../mssql/util/MssqlStructureParser.java | 8 +- .../mysqlPlugin/plugin.properties | 5 + .../mysqlPlugin/pom.xml | 10 +- .../plugin/mysql/MysqlConnector.java | 6 +- .../lowcoder}/plugin/mysql/MysqlPlugin.java | 2 +- .../plugin/mysql/MysqlQueryExecutor.java | 37 +++--- .../plugin/mysql/model/MysqlQueryConfig.java | 10 +- .../plugin/mysql/utils/MysqlResultParser.java | 10 +- .../mysql/utils/MysqlStructureParser.java | 14 +-- .../src/main/resources/locale.properties | 0 .../src/main/resources/locale_en.properties | 0 .../oraclePlugin/plugin.properties | 5 + .../oraclePlugin/pom.xml | 12 +- .../plugin/oracle/OracleConnector.java | 6 +- .../lowcoder}/plugin/oracle/OraclePlugin.java | 2 +- .../plugin/oracle/OracleQueryExecutor.java | 35 +++--- .../plugin/oracle/gui/GuiConstants.java | 2 +- .../oracle/gui/OracleBulkInsertCommand.java | 12 +- .../oracle/gui/OracleBulkUpdateCommand.java | 14 +-- .../oracle/gui/OracleDeleteCommand.java | 14 +-- .../oracle/gui/OracleInsertCommand.java | 9 +- .../oracle/gui/OracleUpdateCommand.java | 13 ++- .../oracle/model/OracleDatasourceConfig.java | 10 +- .../pom.xml | 16 +-- .../postgresPlugin/plugin.properties | 5 + .../postgresPlugin/pom.xml | 10 +- .../plugin/postgres/PostgresConnector.java | 6 +- .../plugin/postgres/PostgresExecutor.java | 42 +++---- .../plugin/postgres/PostgresPlugin.java | 2 +- .../plugin/postgres/model/DataType.java | 2 +- .../model/PostgresDatasourceConfig.java | 13 ++- .../postgres/model/PostgresQueryConfig.java | 10 +- .../postgres/utils/PostgresDataTypeUtils.java | 38 +++--- .../postgres/utils/PostgresResultParser.java | 10 +- .../redisPlugin/plugin.properties | 5 + .../redisPlugin/pom.xml | 8 +- .../lowcoder}/plugin/redis/RedisError.java | 4 +- .../lowcoder}/plugin/redis/RedisPlugin.java | 53 +++++---- .../plugin/redis/commands/RedisCommand.java | 40 +++---- .../redis/constants/RedisConstants.java | 2 +- .../redis/constants/RedisFieldName.java | 2 +- .../redis/model/RedisDatasourceConfig.java | 19 +-- .../model/RedisQueryExecutionContext.java | 4 +- .../plugin/redis/utils/RedisQueryUtils.java | 94 +++++++++++++++ .../plugin/redis/utils/RedisUriUtils.java | 5 +- .../restApiPlugin/plugin.properties | 5 + .../restApiPlugin/pom.xml | 8 +- .../plugin/restapi/RestApiConnector.java | 9 +- .../plugin/restapi/RestApiError.java | 4 +- .../plugin/restapi/RestApiExecutor.java | 82 ++++++------- .../plugin/restapi/RestApiPlugin.java | 2 +- .../restapi/constants/ResponseDataType.java | 2 +- .../plugin/restapi/helpers/AuthHelper.java | 4 +- .../restapi}/helpers/BufferingFilter.java | 2 +- .../restapi/helpers/ContentTypeHelper.java | 2 +- .../plugin/restapi/model/QueryBody.java | 2 +- .../restapi/model/RestApiQueryConfig.java | 12 +- .../model/RestApiQueryExecutionContext.java | 11 +- .../plugin/restapi/AuthConfigTest.java | 21 ++-- .../plugin/restapi/RestApiEngineTest.java | 26 +++-- .../plugin/restapi/RestApiUriBuilderTest.java | 17 ++- .../smtpPlugin/plugin.properties | 5 + .../smtpPlugin/pom.xml | 8 +- .../plugins/SmtpDatasourceConfig.java | 7 +- .../org/lowcoder}/plugins/SmtpPlugin.java | 43 ++++--- .../plugins/SmtpQueryExecutionContext.java | 4 +- .../snowflakePlugin/plugin.properties | 5 + .../snowflakePlugin/pom.xml | 12 +- .../plugin/snowflake/SnowflakeConnector.java | 4 +- .../snowflake/SnowflakeDatasourceConfig.java | 4 +- .../plugin/snowflake/SnowflakePlugin.java | 2 +- .../snowflake/SnowflakeQueryExecutor.java | 27 +++-- .../sqlBasedPlugin/pom.xml | 6 +- .../plugin/sql/GeneralSqlExecutor.java | 31 +++-- .../plugin/sql/SqlBasedConnector.java | 14 +-- .../plugin/sql/SqlBasedQueryExecutor.java | 34 +++--- .../lowcoder}/plugin/sql/SqlQueryConfig.java | 10 +- .../{openblocks-sdk => lowcoder-sdk}/pom.xml | 8 +- .../sdk/auth/AbstractAuthConfig.java | 2 +- .../lowcoder}/sdk/auth/EmailAuthConfig.java | 6 +- .../sdk/auth/Oauth2SimpleAuthConfig.java | 8 +- .../sdk/auth/constants/AuthTypeConstants.java | 4 +- .../sdk/auth/constants/Oauth2Constants.java | 2 +- .../lowcoder}/sdk/config/AuthProperties.java | 21 ++-- .../lowcoder}/sdk/config/CommonConfig.java | 5 +- .../sdk/config/CommonConfigHelper.java | 7 +- .../sdk/config/MaterialProperties.java | 2 +- .../lowcoder}/sdk/config/SerializeConfig.java | 4 +- .../lowcoder}/sdk/config/dynamic/Conf.java | 2 +- .../sdk/config/dynamic/ConfigCenter.java | 2 +- .../config/dynamic/ConfigCenterForTest.java | 2 +- .../sdk/config/dynamic/ConfigInstance.java | 2 +- .../config/dynamic/ConfigInstanceHelper.java | 2 +- .../sdk/config/dynamic/StaticConf.java | 2 +- .../dynamic/StaticConfigInstanceImpl.java | 2 +- .../sdk/constants/AuthSourceConstants.java | 4 +- .../sdk/constants/Authentication.java | 2 +- .../lowcoder}/sdk/constants/ConfigTypes.java | 2 +- .../lowcoder}/sdk/constants/DslConstants.java | 2 +- .../lowcoder}/sdk/constants/FieldName.java | 2 +- .../sdk/constants/GlobalContext.java | 2 +- .../sdk/constants/WorkspaceMode.java | 2 +- .../sdk/destructor/DestructorUtil.java | 2 +- .../lowcoder}/sdk/event/BeforeSaveEvent.java | 2 +- .../sdk/exception/BaseException.java | 2 +- .../org/lowcoder}/sdk/exception/BizError.java | 9 +- .../lowcoder}/sdk/exception/BizException.java | 4 +- .../lowcoder}/sdk/exception/ErrorLogType.java | 2 +- .../InvalidHikariDatasourceException.java | 4 +- .../sdk/exception/PluginCommonError.java | 2 +- .../lowcoder}/sdk/exception/PluginError.java | 2 +- .../sdk/exception/PluginException.java | 5 +- .../sdk/exception/ServerException.java | 2 +- .../models/DatasourceConnectionConfig.java | 2 +- .../sdk/models/DatasourceStructure.java | 2 +- .../sdk/models/DatasourceTestResult.java | 6 +- .../org/lowcoder}/sdk/models/Encrypt.java | 2 +- .../org/lowcoder}/sdk/models/Endpoint.java | 2 +- .../sdk/models/HasIdAndAuditing.java | 2 +- .../models/JsDatasourceConnectionConfig.java | 6 +- .../lowcoder}/sdk/models/LocaleMessage.java | 2 +- .../java/org/lowcoder}/sdk/models/Param.java | 2 +- .../org/lowcoder}/sdk/models/Property.java | 5 +- .../sdk/models/QueryExecutionResult.java | 6 +- .../sdk/models/RestBodyFormFileData.java | 6 +- .../models/TokenBasedConnectionDetail.java | 2 +- .../lowcoder}/sdk/models/VersionedModel.java | 2 +- .../common/BlockingDatasourceConnector.java | 8 +- .../plugin/common/BlockingQueryExecutor.java | 12 +- .../plugin/common/DatasourceConnector.java | 22 ++-- .../plugin/common/DatasourceQueryEngine.java | 6 +- .../plugin/common/QueryExecutionUtils.java | 2 +- .../sdk/plugin/common/QueryExecutor.java | 29 +++-- .../sdk/plugin/common/RestApiUriBuilder.java | 11 +- .../sdk/plugin/common/SqlQueryUtils.java | 2 +- .../sdk/plugin/common/constant/Constants.java | 2 +- .../plugin/common/sql/HikariPerfWrapper.java | 2 +- .../plugin/common/sql/ResultSetParser.java | 4 +- .../SqlBasedDatasourceConnectionConfig.java | 12 +- .../sql/SqlBasedQueryExecutionContext.java | 6 +- .../plugin/common/sql/StructureParser.java | 8 +- .../common/ssl/DisableVerifySslConfig.java | 2 +- .../common/ssl/SslCertVerificationType.java | 2 +- .../sdk/plugin/common/ssl/SslConfig.java | 5 +- .../sdk/plugin/common/ssl/SslHelper.java | 7 +- .../common/ssl/VerifyCACertSslConfig.java | 2 +- .../ssl/VerifySelfSignedCertSslConfig.java | 4 +- .../graphql/GraphQLDatasourceConfig.java | 22 ++-- .../sdk/plugin/http/RawHttpHandlerHelper.java | 7 +- .../sdk/plugin/http/RawHttpRequest.java | 9 +- .../LowcoderApiDatasourceConfig.java | 13 +++ .../plugin/mysql/MysqlDatasourceConfig.java | 13 ++- .../sdk/plugin/restapi/DataUtils.java | 16 +-- .../sdk/plugin/restapi/MultipartFormData.java | 2 +- .../restapi/RestApiDatasourceConfig.java | 24 ++-- .../sdk/plugin/restapi/auth/AuthConfig.java | 5 +- .../plugin/restapi/auth/BasicAuthConfig.java | 4 +- .../restapi/auth/DefaultAuthConfig.java | 2 +- .../plugin/restapi/auth/NoneAuthConfig.java | 2 +- .../plugin/restapi/auth/RestApiAuthType.java | 2 +- .../changeset/SheetBulkObjectChangeSet.java | 11 +- .../sheet/changeset/SheetChangeSet.java | 17 ++- .../sheet/changeset/SheetChangeSetItem.java | 2 +- .../sheet/changeset/SheetChangeSetRow.java | 9 +- .../sheet/changeset/SheetChangeSetRows.java | 7 +- .../changeset/SheetKeyValuePairChangeSet.java | 11 +- .../sheet/changeset/SheetObjectChangeSet.java | 11 +- .../sdk/plugin/sqlcommand/GuiSqlCommand.java | 13 +-- .../changeset/BulkObjectChangeSet.java | 13 ++- .../sqlcommand/changeset/ChangeSet.java | 17 ++- .../sqlcommand/changeset/ChangeSetItem.java | 6 + .../sqlcommand/changeset/ChangeSetRow.java | 9 +- .../sqlcommand/changeset/ChangeSetRows.java | 7 +- .../changeset/KeyValuePairChangeSet.java | 14 +-- .../sqlcommand/changeset/ObjectChangeSet.java | 9 +- .../sqlcommand/command/BulkInsertCommand.java | 19 +-- .../sqlcommand/command/BulkUpdateCommand.java | 16 +-- .../sqlcommand/command/DeleteCommand.java | 8 +- .../sqlcommand/command/GuiConstants.java | 2 +- .../sqlcommand/command/InsertCommand.java | 21 ++-- .../sqlcommand/command/UpdateCommand.java | 21 ++-- ...dateOrDeleteSingleCommandRenderResult.java | 4 +- .../sqlcommand/command/UpsertCommand.java | 13 ++- .../command/mysql/MysqlBulkInsertCommand.java | 12 +- .../command/mysql/MysqlBulkUpdateCommand.java | 14 +-- .../command/mysql/MysqlDeleteCommand.java | 12 +- .../command/mysql/MysqlInsertCommand.java | 9 +- .../command/mysql/MysqlUpdateCommand.java | 11 +- .../command/mysql/MysqlUpsertCommand.java | 27 ++--- .../postgres/PostgresBulkInsertCommand.java | 16 +-- .../postgres/PostgresBulkUpdateCommand.java | 18 +-- .../postgres/PostgresDeleteCommand.java | 20 ++-- .../postgres/PostgresInsertCommand.java | 13 ++- .../postgres/PostgresUpdateCommand.java | 25 ++-- .../plugin/sqlcommand/filter/FilterSet.java | 22 ++-- .../sdk/query/QueryExecutionContext.java | 2 +- .../sdk/query/QueryVisitorContext.java | 5 +- .../lowcoder}/sdk/test/JsonFileReader.java | 4 +- .../org/lowcoder}/sdk/util/CookieHelper.java | 11 +- .../org/lowcoder}/sdk/util/DateTimeUtils.java | 2 +- .../lowcoder}/sdk/util/EnterpriseEdition.java | 2 +- .../org/lowcoder}/sdk/util/EnumUtils.java | 2 +- .../lowcoder}/sdk/util/ExceptionUtils.java | 12 +- .../org/lowcoder}/sdk/util/HashUtils.java | 2 +- .../org/lowcoder}/sdk/util/HttpUtils.java | 2 +- .../java/org/lowcoder}/sdk/util/IDUtils.java | 2 +- .../org/lowcoder}/sdk/util/JsonUtils.java | 13 ++- .../org/lowcoder}/sdk/util/LocaleUtils.java | 7 +- .../lowcoder}/sdk/util/MediaTypeUtils.java | 2 +- .../org/lowcoder}/sdk/util/MoreMapUtils.java | 2 +- .../lowcoder}/sdk/util/MustacheHelper.java | 10 +- .../org/lowcoder}/sdk/util/Preconditions.java | 10 +- .../sdk/util/RjsonMustacheParser.java | 24 ++-- .../org/lowcoder}/sdk/util/RjsonParser.java | 2 +- .../org/lowcoder}/sdk/util/SqlGuiUtils.java | 8 +- .../org/lowcoder}/sdk/util/StreamUtils.java | 2 +- .../java/org/lowcoder}/sdk/util/UriUtils.java | 4 +- .../sdk/webclient/SafeHostResolverGroup.java | 2 +- .../sdk/webclient/WebClientBuildHelper.java | 11 +- .../lowcoder}/sdk/webclient/WebClients.java | 2 +- .../src/main/resources/locale_en.properties | 10 +- .../src/main/resources/logback-spring.xml | 4 +- .../sdk/helpers/MustacheHelperTest.java | 12 +- .../command/mysql/MysqlGuiCommandTest.java | 17 ++- .../command/postgres/PostgresCommandTest.java | 23 ++-- .../pom.xml | 43 ++----- .../org/lowcoder}/api/ServerApplication.java | 7 +- .../application/ApplicationApiService.java | 110 +++++++++--------- .../application/ApplicationController.java | 46 ++++---- .../ApplicationHistorySnapshotController.java | 28 ++--- .../CompoundApplicationDslFilter.java | 22 ++-- .../application/view/ApplicationInfoView.java | 9 +- .../view/ApplicationPermissionView.java | 4 +- .../api/application/view/ApplicationView.java | 2 +- .../view/HistorySnapshotDslView.java | 2 +- .../AuthenticationController.java | 30 ++--- .../authentication/dto/AuthConfigRequest.java | 4 +- .../dto/AuthUserBindEndMessage.java | 2 +- .../dto/OrganizationDomainCheckResult.java | 9 +- .../api/authentication/dto/RedirectView.java | 2 +- .../dto/UserLoginEndMessage.java | 4 +- .../request/AbstractBlockedAuthRequest.java | 8 +- .../authentication/request/AuthException.java | 2 +- .../authentication/request/AuthRequest.java | 8 +- .../request/AuthRequestFactory.java | 6 +- .../request/AuthRequestFactoryFacade.java | 9 +- .../request/form/FormAuthRequest.java | 31 +++-- .../request/form/FormAuthRequestFactory.java | 11 +- .../request/oauth2/OAuth2RequestContext.java | 4 +- .../oauth2/Oauth2AuthRequestFactory.java | 19 ++- .../request/oauth2/Oauth2DefaultSource.java | 2 +- .../request/oauth2/Oauth2Source.java | 2 +- .../oauth2/request/AbstractOauth2Request.java | 28 ++--- .../request/oauth2/request/GithubRequest.java | 19 ++- .../request/oauth2/request/GoogleRequest.java | 19 ++- .../service/AuthenticationApiService.java | 7 +- .../service/AuthenticationApiServiceImpl.java | 69 ++++++----- .../service/factory/AuthConfigFactory.java | 6 +- .../factory/AuthConfigFactoryFacade.java | 7 +- .../factory/AuthConfigFactoryImpl.java | 21 ++-- .../util/AuthenticationUtils.java | 4 +- .../util/SmsVerificationUtils.java | 2 +- .../AbstractBizThresholdChecker.java | 25 ++-- .../api/bizthreshold/BizThresholdChecker.java | 9 +- .../api/config/ConfigController.java | 22 ++-- .../org/lowcoder}/api/config/ConfigView.java | 7 +- .../api/datasource/DatasourceApiService.java | 77 ++++++------ .../api/datasource/DatasourceController.java | 50 ++++---- .../api/datasource/DatasourceView.java | 4 +- .../datasource/UpsertDatasourceRequest.java | 2 +- .../UpsertDatasourceRequestMapper.java | 15 ++- .../api/framework/StateController.java | 15 ++- .../ComponentScanConfiguration.java | 6 +- .../framework/exception/ApiPerfHelper.java | 11 +- .../CustomErrorWebExceptionHandler.java | 14 +-- .../exception/GlobalExceptionHandler.java | 25 ++-- .../ResourceWebPropertiesConfig.java | 2 +- .../api/framework/filter/FilterOrder.java | 6 +- .../framework/filter/GlobalContextFilter.java | 47 ++++---- .../QueryExecuteHttpBodySizeFilter.java | 21 ++-- .../framework/filter/RequestCostFilter.java | 4 +- .../framework/filter/ThrottlingFilter.java | 10 +- .../api/framework/filter/UserBanFilter.java | 17 ++- .../filter/UserSessionPersistenceFilter.java | 9 +- .../security/AccessDeniedHandler.java | 2 +- .../security/AuthenticationEntryPoint.java | 2 +- .../framework/security/SecurityConfig.java | 45 ++++--- .../service/GlobalContextService.java | 2 +- .../service/GlobalContextServiceImpl.java | 2 +- .../api/framework/view/PageResponseView.java | 2 +- .../api/framework/view/ResponseView.java | 5 +- .../api/framework/warmup/WarmupHelper.java | 5 +- .../lowcoder}/api/home/FolderApiService.java | 73 ++++++------ .../lowcoder}/api/home/FolderController.java | 27 +++-- .../lowcoder}/api/home/FolderInfoView.java | 4 +- .../api/home/SessionUserService.java | 8 +- .../api/home/SessionUserServiceImpl.java | 29 +++-- .../api/home/UserHomeApiService.java | 13 +-- .../api/home/UserHomeApiServiceImpl.java | 55 +++++---- .../lowcoder}/api/home/UserHomepageView.java | 8 +- .../api/material/AssetController.java | 9 +- .../api/material/MaterialApiService.java | 9 +- .../api/material/MaterialApiServiceImpl.java | 29 +++-- .../api/material/MaterialController.java | 17 ++- .../api/misc/JsLibraryController.java | 12 +- .../api/permission/PermissionHelper.java | 19 ++- .../permission/view/CommonPermissionView.java | 2 +- .../permission/view/PermissionItemView.java | 6 +- .../api/query/ApplicationQueryApiService.java | 57 +++++---- .../api/query/LibraryQueryApiService.java | 73 ++++++------ .../api/query/LibraryQueryController.java | 25 ++-- .../query/LibraryQueryRecordApiService.java | 29 +++-- .../query/LibraryQueryRecordController.java | 11 +- .../lowcoder}/api/query/QueryController.java | 31 +++-- .../query/view/LibraryQueryAggregateView.java | 9 +- .../api/query/view/LibraryQueryMetaView.java | 6 +- .../view/LibraryQueryPublishRequest.java | 2 +- .../view/LibraryQueryRecordMetaView.java | 6 +- .../query/view/LibraryQueryRequestFromJs.java | 7 +- .../api/query/view/LibraryQueryView.java | 6 +- .../api/query/view/QueryExecutionRequest.java | 9 +- .../api/query/view/QueryResultView.java | 7 +- .../query/view/UpsertLibraryQueryRequest.java | 2 +- .../api/usermanagement/GroupApiService.java | 55 +++++---- .../api/usermanagement/GroupController.java | 35 +++--- .../usermanagement/InvitationApiService.java | 35 +++--- .../usermanagement/InvitationController.java | 17 ++- .../api/usermanagement/OrgApiService.java | 23 ++-- .../api/usermanagement/OrgApiServiceImpl.java | 73 ++++++------ .../api/usermanagement/OrgDevChecker.java | 13 +-- .../OrganizationController.java | 29 +++-- .../api/usermanagement/UserApiService.java | 21 ++-- .../api/usermanagement/UserController.java | 37 +++--- .../usermanagement/view/AddMemberRequest.java | 2 +- .../view/CreateGroupRequest.java | 2 +- .../view/GroupMemberAggregateView.java | 2 +- .../usermanagement/view/GroupMemberView.java | 6 +- .../api/usermanagement/view/GroupView.java | 6 +- .../api/usermanagement/view/InvitationVO.java | 8 +- .../view/OrgAndVisitorRoleView.java | 4 +- .../view/OrgMemberListView.java | 2 +- .../api/usermanagement/view/OrgView.java | 4 +- .../view/UpdateGroupRequest.java | 2 +- .../usermanagement/view/UpdateOrgRequest.java | 2 +- .../view/UpdateRoleRequest.java | 2 +- .../view/UpdateUserRequest.java | 2 +- .../usermanagement/view/UserProfileView.java | 5 +- .../api/util/BusinessEventPublisher.java | 79 +++++++------ .../org/lowcoder}/api/util/Pagination.java | 7 +- .../org/lowcoder}/api/util/ViewBuilder.java | 8 +- .../eventlistener/AppEventListener.java | 5 +- .../OrgAndGroupEventListener.java | 22 ++-- .../lowcoder}/runner/hook/ShutdownHook.java | 5 +- .../runner/migrations/DatabaseChangelog.java | 44 +++---- .../migrations/job/CompleteAuthType.java | 2 +- .../migrations/job/CompleteAuthTypeImpl.java | 13 +-- .../migrations/job/MigrateAuthConfigJob.java | 2 +- .../job/MigrateAuthConfigJobImpl.java | 21 ++-- .../runner/task/IoHeartBeatTask.java | 7 +- .../main/resources/application-lowcoder.yml} | 12 +- .../resources/recommendedJsLibraries.json | 0 .../selfhost/ce/application-selfhost.yml | 8 +- .../resources/selfhost/ce/application.yml | 8 +- .../test/java/org/lowcoder}/api/TreeTest.java | 11 +- .../ApplicationApiServiceTest.java | 40 +++---- .../CompoundApplicationDslFilterTest.java | 10 +- .../CompoundApplicationDslFilterTest.json | 0 .../AuthenticationControllerTest.java | 41 +++---- .../GoogleAuthenticateTest.java | 25 ++-- .../MockGoogleOauth2AuthRequestFactory.java | 11 +- .../service/AuthenticationApiServiceTest.java | 7 +- .../org/lowcoder}/api/common/InitData.java | 13 +-- .../api/common/RedisConfiguration.java | 2 +- .../common/SessionUserServiceImplTest.java | 7 +- .../SpringPluginManagerConfiguration.java | 4 +- .../api/common/TestRedisConfiguration.java | 2 +- .../api/common/json/application.json | 2 +- .../org/lowcoder}/api/common/json/folder.json | 2 +- .../org/lowcoder}/api/common/json/group.json | 2 +- .../api/common/json/group_member.json | 2 +- .../lowcoder}/api/common/json/org_member.json | 2 +- .../api/common/json/organization.json | 2 +- .../org/lowcoder}/api/common/json/user.json | 2 +- .../WithMockSecurityContextFactory.java | 5 +- .../api/common/mockuser/WithMockUser.java | 2 +- .../configurations/SecurityTestConfig.java | 2 +- .../api/configurations/SeedMongoData.java | 9 +- .../controller/DatasourceControllerTest.json | 0 .../datasource/DatasourceApiServiceTest.java | 27 ++--- .../api/infra/ServerConfigRepositoryTest.java | 10 +- .../api/query/LibraryQueryApiServiceTest.java | 16 +-- .../api/service/FolderApiServiceTest.java | 19 ++- ...ApplicationHistorySnapshotServiceTest.java | 8 +- .../src/test/resources/application.yml | 0 .../src/test/resources/users.ldif | 0 .../domain/authentication/FindAuthConfig.java | 9 -- .../mongodb/MongodbInterceptorContext.java | 6 - .../clickHousePlugin/plugin.properties | 5 - .../elasticSearchPlugin/plugin.properties | 5 - .../com/openblocks/plugin/es/EsError.java | 9 -- .../googleSheetsPlugin/plugin.properties | 5 - .../graphqlPlugin/plugin.properties | 5 - .../plugin/graphql/GraphQLError.java | 7 -- .../mongoPlugin/plugin.properties | 5 - .../mssqlPlugin/plugin.properties | 5 - .../mysqlPlugin/plugin.properties | 5 - .../openblocksApiPlugin/plugin.properties | 5 - .../plugin/OpenblocksApiConnector.java | 48 -------- .../plugin/OpenblocksApiPlugin.java | 11 -- .../plugin/OpenblocksApiPluginError.java | 10 -- .../oraclePlugin/plugin.properties | 5 - .../postgresPlugin/plugin.properties | 5 - .../redisPlugin/plugin.properties | 5 - .../plugin/redis/utils/RedisQueryUtils.java | 94 --------------- .../restApiPlugin/plugin.properties | 5 - .../smtpPlugin/plugin.properties | 5 - .../snowflakePlugin/plugin.properties | 5 - .../OpenblocksApiDatasourceConfig.java | 13 --- .../sqlcommand/changeset/ChangeSetItem.java | 6 - server/api-service/pom.xml | 20 ++-- 745 files changed, 4031 insertions(+), 4204 deletions(-) rename server/api-service/{openblocks-domain => lowcoder-domain}/pom.xml (89%) rename server/api-service/{openblocks-domain/src/main/java/com/openblocks => lowcoder-domain/src/main/java/org/lowcoder}/domain/application/ApplicationUtil.java (97%) rename server/api-service/{openblocks-domain/src/main/java/com/openblocks => lowcoder-domain/src/main/java/org/lowcoder}/domain/application/model/Application.java (90%) rename server/api-service/{openblocks-domain/src/main/java/com/openblocks => lowcoder-domain/src/main/java/org/lowcoder}/domain/application/model/ApplicationHistorySnapshot.java (79%) rename server/api-service/{openblocks-domain/src/main/java/com/openblocks => lowcoder-domain/src/main/java/org/lowcoder}/domain/application/model/ApplicationStatus.java (63%) rename server/api-service/{openblocks-domain/src/main/java/com/openblocks => lowcoder-domain/src/main/java/org/lowcoder}/domain/application/model/ApplicationType.java (90%) rename server/api-service/{openblocks-domain/src/main/java/com/openblocks => lowcoder-domain/src/main/java/org/lowcoder}/domain/application/model/UiItem.java (89%) rename server/api-service/{openblocks-domain/src/main/java/com/openblocks => lowcoder-domain/src/main/java/org/lowcoder}/domain/application/repository/ApplicationHistorySnapshotRepository.java (84%) rename server/api-service/{openblocks-domain/src/main/java/com/openblocks => lowcoder-domain/src/main/java/org/lowcoder}/domain/application/repository/ApplicationRepository.java (87%) rename server/api-service/{openblocks-domain/src/main/java/com/openblocks => lowcoder-domain/src/main/java/org/lowcoder}/domain/application/repository/CustomApplicationRepository.java (69%) rename server/api-service/{openblocks-domain/src/main/java/com/openblocks => lowcoder-domain/src/main/java/org/lowcoder}/domain/application/repository/CustomApplicationRepositoryImpl.java (89%) rename server/api-service/{openblocks-domain/src/main/java/com/openblocks => lowcoder-domain/src/main/java/org/lowcoder}/domain/application/service/ApplicationHistorySnapshotService.java (82%) rename server/api-service/{openblocks-domain/src/main/java/com/openblocks => lowcoder-domain/src/main/java/org/lowcoder}/domain/application/service/ApplicationService.java (88%) rename server/api-service/{openblocks-domain/src/main/java/com/openblocks => lowcoder-domain/src/main/java/org/lowcoder}/domain/application/service/impl/ApplicationHistorySnapshotServiceImpl.java (79%) rename server/api-service/{openblocks-domain/src/main/java/com/openblocks => lowcoder-domain/src/main/java/org/lowcoder}/domain/asset/model/Asset.java (88%) rename server/api-service/{openblocks-domain/src/main/java/com/openblocks => lowcoder-domain/src/main/java/org/lowcoder}/domain/asset/service/AssetRepository.java (63%) rename server/api-service/{openblocks-domain/src/main/java/com/openblocks => lowcoder-domain/src/main/java/org/lowcoder}/domain/asset/service/AssetService.java (81%) rename server/api-service/{openblocks-domain/src/main/java/com/openblocks => lowcoder-domain/src/main/java/org/lowcoder}/domain/asset/service/AssetServiceImpl.java (94%) rename server/api-service/{openblocks-domain/src/main/java/com/openblocks => lowcoder-domain/src/main/java/org/lowcoder}/domain/authentication/AuthenticationService.java (73%) rename server/api-service/{openblocks-domain/src/main/java/com/openblocks => lowcoder-domain/src/main/java/org/lowcoder}/domain/authentication/AuthenticationServiceImpl.java (87%) create mode 100644 server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/authentication/FindAuthConfig.java rename server/api-service/{openblocks-domain/src/main/java/com/openblocks => lowcoder-domain/src/main/java/org/lowcoder}/domain/authentication/context/AuthRequestContext.java (70%) rename server/api-service/{openblocks-domain/src/main/java/com/openblocks => lowcoder-domain/src/main/java/org/lowcoder}/domain/authentication/context/FormAuthRequestContext.java (89%) rename server/api-service/{openblocks-domain/src/main/java/com/openblocks => lowcoder-domain/src/main/java/org/lowcoder}/domain/configurations/MongoConfig.java (91%) rename server/api-service/{openblocks-domain/src/main/java/com/openblocks => lowcoder-domain/src/main/java/org/lowcoder}/domain/configurations/Pf4jConfiguration.java (87%) rename server/api-service/{openblocks-domain/src/main/java/com/openblocks => lowcoder-domain/src/main/java/org/lowcoder}/domain/configurations/RedisConfig.java (96%) rename server/api-service/{openblocks-domain/src/main/java/com/openblocks => lowcoder-domain/src/main/java/org/lowcoder}/domain/configurations/RedisRateLimiterConfig.java (91%) rename server/api-service/{openblocks-domain/src/main/java/com/openblocks => lowcoder-domain/src/main/java/org/lowcoder}/domain/datasource/model/ClientBasedDatasourceConnectionHolder.java (86%) rename server/api-service/{openblocks-domain/src/main/java/com/openblocks => lowcoder-domain/src/main/java/org/lowcoder}/domain/datasource/model/Datasource.java (71%) rename server/api-service/{openblocks-domain/src/main/java/com/openblocks => lowcoder-domain/src/main/java/org/lowcoder}/domain/datasource/model/DatasourceConnectionHolder.java (80%) rename server/api-service/{openblocks-domain/src/main/java/com/openblocks => lowcoder-domain/src/main/java/org/lowcoder}/domain/datasource/model/DatasourceCreationSource.java (79%) rename server/api-service/{openblocks-domain/src/main/java/com/openblocks => lowcoder-domain/src/main/java/org/lowcoder}/domain/datasource/model/DatasourceDO.java (83%) rename server/api-service/{openblocks-domain/src/main/java/com/openblocks => lowcoder-domain/src/main/java/org/lowcoder}/domain/datasource/model/DatasourceStatus.java (55%) rename server/api-service/{openblocks-domain/src/main/java/com/openblocks => lowcoder-domain/src/main/java/org/lowcoder}/domain/datasource/model/DatasourceStructureDO.java (81%) rename server/api-service/{openblocks-domain/src/main/java/com/openblocks => lowcoder-domain/src/main/java/org/lowcoder}/domain/datasource/model/StatelessDatasourceConnectionHolder.java (86%) rename server/api-service/{openblocks-domain/src/main/java/com/openblocks => lowcoder-domain/src/main/java/org/lowcoder}/domain/datasource/model/TokenBasedConnection.java (69%) rename server/api-service/{openblocks-domain/src/main/java/com/openblocks => lowcoder-domain/src/main/java/org/lowcoder}/domain/datasource/model/TokenBasedConnectionDO.java (80%) rename server/api-service/{openblocks-domain/src/main/java/com/openblocks => lowcoder-domain/src/main/java/org/lowcoder}/domain/datasource/model/TokenBasedConnectionHolder.java (95%) rename server/api-service/{openblocks-domain/src/main/java/com/openblocks => lowcoder-domain/src/main/java/org/lowcoder}/domain/datasource/repository/DatasourceDORepository.java (81%) rename server/api-service/{openblocks-domain/src/main/java/com/openblocks => lowcoder-domain/src/main/java/org/lowcoder}/domain/datasource/repository/DatasourceRepository.java (88%) rename server/api-service/{openblocks-domain/src/main/java/com/openblocks => lowcoder-domain/src/main/java/org/lowcoder}/domain/datasource/repository/DatasourceStructureRepository.java (71%) rename server/api-service/{openblocks-domain/src/main/java/com/openblocks => lowcoder-domain/src/main/java/org/lowcoder}/domain/datasource/repository/TokenBasedConnectionDORepository.java (71%) rename server/api-service/{openblocks-domain/src/main/java/com/openblocks => lowcoder-domain/src/main/java/org/lowcoder}/domain/datasource/repository/TokenBasedConnectionRepository.java (84%) rename server/api-service/{openblocks-domain/src/main/java/com/openblocks => lowcoder-domain/src/main/java/org/lowcoder}/domain/datasource/service/DatasourceConnectionPool.java (59%) rename server/api-service/{openblocks-domain/src/main/java/com/openblocks => lowcoder-domain/src/main/java/org/lowcoder}/domain/datasource/service/DatasourceService.java (83%) rename server/api-service/{openblocks-domain/src/main/java/com/openblocks => lowcoder-domain/src/main/java/org/lowcoder}/domain/datasource/service/DatasourceStructureService.java (62%) rename server/api-service/{openblocks-domain/src/main/java/com/openblocks => lowcoder-domain/src/main/java/org/lowcoder}/domain/datasource/service/JsDatasourceHelper.java (92%) rename server/api-service/{openblocks-domain/src/main/java/com/openblocks => lowcoder-domain/src/main/java/org/lowcoder}/domain/datasource/service/impl/ClientBasedConnectionPool.java (86%) rename server/api-service/{openblocks-domain/src/main/java/com/openblocks => lowcoder-domain/src/main/java/org/lowcoder}/domain/datasource/service/impl/DatasourceConnectionPoolFacade.java (79%) rename server/api-service/{openblocks-domain/src/main/java/com/openblocks => lowcoder-domain/src/main/java/org/lowcoder}/domain/datasource/service/impl/DatasourceServiceImpl.java (86%) rename server/api-service/{openblocks-domain/src/main/java/com/openblocks => lowcoder-domain/src/main/java/org/lowcoder}/domain/datasource/service/impl/DatasourceStructureServiceImpl.java (78%) rename server/api-service/{openblocks-domain/src/main/java/com/openblocks => lowcoder-domain/src/main/java/org/lowcoder}/domain/datasource/service/impl/StatelessConnectionPool.java (60%) rename server/api-service/{openblocks-domain/src/main/java/com/openblocks => lowcoder-domain/src/main/java/org/lowcoder}/domain/datasource/service/impl/TokenBasedConnectionPool.java (69%) rename server/api-service/{openblocks-domain/src/main/java/com/openblocks => lowcoder-domain/src/main/java/org/lowcoder}/domain/encryption/EncryptionService.java (85%) rename server/api-service/{openblocks-domain/src/main/java/com/openblocks => lowcoder-domain/src/main/java/org/lowcoder}/domain/encryption/EncryptionServiceImpl.java (92%) rename server/api-service/{openblocks-domain/src/main/java/com/openblocks => lowcoder-domain/src/main/java/org/lowcoder}/domain/folder/model/ElementType.java (57%) rename server/api-service/{openblocks-domain/src/main/java/com/openblocks => lowcoder-domain/src/main/java/org/lowcoder}/domain/folder/model/Folder.java (79%) rename server/api-service/{openblocks-domain/src/main/java/com/openblocks => lowcoder-domain/src/main/java/org/lowcoder}/domain/folder/model/FolderElement.java (60%) rename server/api-service/{openblocks-domain/src/main/java/com/openblocks => lowcoder-domain/src/main/java/org/lowcoder}/domain/folder/repository/FolderRepository.java (76%) rename server/api-service/{openblocks-domain/src/main/java/com/openblocks => lowcoder-domain/src/main/java/org/lowcoder}/domain/folder/service/ElementNode.java (94%) rename server/api-service/{openblocks-domain/src/main/java/com/openblocks => lowcoder-domain/src/main/java/org/lowcoder}/domain/folder/service/FolderElementRelationService.java (79%) rename server/api-service/{openblocks-domain/src/main/java/com/openblocks => lowcoder-domain/src/main/java/org/lowcoder}/domain/folder/service/FolderNode.java (98%) rename server/api-service/{openblocks-domain/src/main/java/com/openblocks => lowcoder-domain/src/main/java/org/lowcoder}/domain/folder/service/FolderService.java (80%) rename server/api-service/{openblocks-domain/src/main/java/com/openblocks => lowcoder-domain/src/main/java/org/lowcoder}/domain/folder/service/Node.java (69%) rename server/api-service/{openblocks-domain/src/main/java/com/openblocks => lowcoder-domain/src/main/java/org/lowcoder}/domain/folder/service/Tree.java (98%) rename server/api-service/{openblocks-domain/src/main/java/com/openblocks => lowcoder-domain/src/main/java/org/lowcoder}/domain/group/event/GroupDeletedEvent.java (74%) rename server/api-service/{openblocks-domain/src/main/java/com/openblocks => lowcoder-domain/src/main/java/org/lowcoder}/domain/group/model/Group.java (94%) rename server/api-service/{openblocks-domain/src/main/java/com/openblocks => lowcoder-domain/src/main/java/org/lowcoder}/domain/group/model/GroupMember.java (91%) rename server/api-service/{openblocks-domain/src/main/java/com/openblocks => lowcoder-domain/src/main/java/org/lowcoder}/domain/group/repository/GroupRepository.java (89%) rename server/api-service/{openblocks-domain/src/main/java/com/openblocks => lowcoder-domain/src/main/java/org/lowcoder}/domain/group/service/GroupMemberService.java (82%) rename server/api-service/{openblocks-domain/src/main/java/com/openblocks => lowcoder-domain/src/main/java/org/lowcoder}/domain/group/service/GroupMemberServiceImpl.java (89%) rename server/api-service/{openblocks-domain/src/main/java/com/openblocks => lowcoder-domain/src/main/java/org/lowcoder}/domain/group/service/GroupService.java (85%) rename server/api-service/{openblocks-domain/src/main/java/com/openblocks => lowcoder-domain/src/main/java/org/lowcoder}/domain/group/service/GroupServiceImpl.java (84%) rename server/api-service/{openblocks-domain/src/main/java/com/openblocks => lowcoder-domain/src/main/java/org/lowcoder}/domain/group/util/SystemGroups.java (88%) rename server/api-service/{openblocks-domain/src/main/java/com/openblocks => lowcoder-domain/src/main/java/org/lowcoder}/domain/interaction/UserApplicationInteraction.java (85%) rename server/api-service/{openblocks-domain/src/main/java/com/openblocks => lowcoder-domain/src/main/java/org/lowcoder}/domain/interaction/UserApplicationInteractionService.java (79%) rename server/api-service/{openblocks-domain/src/main/java/com/openblocks => lowcoder-domain/src/main/java/org/lowcoder}/domain/interaction/UserFolderInteraction.java (82%) rename server/api-service/{openblocks-domain/src/main/java/com/openblocks => lowcoder-domain/src/main/java/org/lowcoder}/domain/interaction/UserFolderInteractionService.java (80%) rename server/api-service/{openblocks-domain/src/main/java/com/openblocks => lowcoder-domain/src/main/java/org/lowcoder}/domain/invitation/model/Invitation.java (82%) rename server/api-service/{openblocks-domain/src/main/java/com/openblocks => lowcoder-domain/src/main/java/org/lowcoder}/domain/invitation/repository/CustomInvitationRepository.java (79%) rename server/api-service/{openblocks-domain/src/main/java/com/openblocks => lowcoder-domain/src/main/java/org/lowcoder}/domain/invitation/repository/CustomInvitationRepositoryImpl.java (77%) rename server/api-service/{openblocks-domain/src/main/java/com/openblocks => lowcoder-domain/src/main/java/org/lowcoder}/domain/invitation/repository/InvitationRepository.java (64%) rename server/api-service/{openblocks-domain/src/main/java/com/openblocks => lowcoder-domain/src/main/java/org/lowcoder}/domain/invitation/service/InvitationService.java (73%) rename server/api-service/{openblocks-domain/src/main/java/com/openblocks => lowcoder-domain/src/main/java/org/lowcoder}/domain/material/model/MaterialMeta.java (76%) rename server/api-service/{openblocks-domain/src/main/java/com/openblocks => lowcoder-domain/src/main/java/org/lowcoder}/domain/material/model/MaterialType.java (55%) rename server/api-service/{openblocks-domain/src/main/java/com/openblocks => lowcoder-domain/src/main/java/org/lowcoder}/domain/material/repository/MaterialMateRepository.java (78%) rename server/api-service/{openblocks-domain/src/main/java/com/openblocks => lowcoder-domain/src/main/java/org/lowcoder}/domain/material/service/meta/MaterialMetaService.java (79%) rename server/api-service/{openblocks-domain/src/main/java/com/openblocks => lowcoder-domain/src/main/java/org/lowcoder}/domain/material/service/meta/MaterialMetaServiceImpl.java (87%) rename server/api-service/{openblocks-domain/src/main/java/com/openblocks => lowcoder-domain/src/main/java/org/lowcoder}/domain/material/service/storage/GridFsStorageServiceImpl.java (94%) rename server/api-service/{openblocks-domain/src/main/java/com/openblocks => lowcoder-domain/src/main/java/org/lowcoder}/domain/material/service/storage/MaterialStorageService.java (83%) rename server/api-service/{openblocks-domain/src/main/java/com/openblocks => lowcoder-domain/src/main/java/org/lowcoder}/domain/mongodb/AfterMongodbRead.java (72%) rename server/api-service/{openblocks-domain/src/main/java/com/openblocks => lowcoder-domain/src/main/java/org/lowcoder}/domain/mongodb/BeforeMongodbWrite.java (73%) rename server/api-service/{openblocks-domain/src/main/java/com/openblocks => lowcoder-domain/src/main/java/org/lowcoder}/domain/mongodb/MongodbEventListener.java (88%) create mode 100644 server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/mongodb/MongodbInterceptorContext.java rename server/api-service/{openblocks-domain/src/main/java/com/openblocks => lowcoder-domain/src/main/java/org/lowcoder}/domain/organization/event/OrgDeletedEvent.java (71%) rename server/api-service/{openblocks-domain/src/main/java/com/openblocks => lowcoder-domain/src/main/java/org/lowcoder}/domain/organization/event/OrgMemberLeftEvent.java (83%) rename server/api-service/{openblocks-domain/src/main/java/com/openblocks => lowcoder-domain/src/main/java/org/lowcoder}/domain/organization/model/EnterpriseConnectionConfig.java (53%) rename server/api-service/{openblocks-domain/src/main/java/com/openblocks => lowcoder-domain/src/main/java/org/lowcoder}/domain/organization/model/MemberRole.java (93%) rename server/api-service/{openblocks-domain/src/main/java/com/openblocks => lowcoder-domain/src/main/java/org/lowcoder}/domain/organization/model/OrgMember.java (94%) rename server/api-service/{openblocks-domain/src/main/java/com/openblocks => lowcoder-domain/src/main/java/org/lowcoder}/domain/organization/model/OrgMemberState.java (84%) rename server/api-service/{openblocks-domain/src/main/java/com/openblocks => lowcoder-domain/src/main/java/org/lowcoder}/domain/organization/model/Organization.java (87%) rename server/api-service/{openblocks-domain/src/main/java/com/openblocks => lowcoder-domain/src/main/java/org/lowcoder}/domain/organization/model/OrganizationDomain.java (82%) rename server/api-service/{openblocks-domain/src/main/java/com/openblocks => lowcoder-domain/src/main/java/org/lowcoder}/domain/organization/model/OrganizationState.java (54%) rename server/api-service/{openblocks-domain/src/main/java/com/openblocks => lowcoder-domain/src/main/java/org/lowcoder}/domain/organization/repository/OrganizationRepository.java (82%) rename server/api-service/{openblocks-domain/src/main/java/com/openblocks => lowcoder-domain/src/main/java/org/lowcoder}/domain/organization/service/OrgMemberService.java (87%) rename server/api-service/{openblocks-domain/src/main/java/com/openblocks => lowcoder-domain/src/main/java/org/lowcoder}/domain/organization/service/OrgMemberServiceImpl.java (90%) rename server/api-service/{openblocks-domain/src/main/java/com/openblocks => lowcoder-domain/src/main/java/org/lowcoder}/domain/organization/service/OrganizationService.java (74%) rename server/api-service/{openblocks-domain/src/main/java/com/openblocks => lowcoder-domain/src/main/java/org/lowcoder}/domain/organization/service/OrganizationServiceImpl.java (82%) rename server/api-service/{openblocks-domain/src/main/java/com/openblocks => lowcoder-domain/src/main/java/org/lowcoder}/domain/permission/config/PermissionConst.java (65%) rename server/api-service/{openblocks-domain/src/main/java/com/openblocks => lowcoder-domain/src/main/java/org/lowcoder}/domain/permission/model/ResourceAction.java (97%) rename server/api-service/{openblocks-domain/src/main/java/com/openblocks => lowcoder-domain/src/main/java/org/lowcoder}/domain/permission/model/ResourceHolder.java (82%) rename server/api-service/{openblocks-domain/src/main/java/com/openblocks => lowcoder-domain/src/main/java/org/lowcoder}/domain/permission/model/ResourcePermission.java (90%) rename server/api-service/{openblocks-domain/src/main/java/com/openblocks => lowcoder-domain/src/main/java/org/lowcoder}/domain/permission/model/ResourceRole.java (96%) rename server/api-service/{openblocks-domain/src/main/java/com/openblocks => lowcoder-domain/src/main/java/org/lowcoder}/domain/permission/model/ResourceType.java (74%) rename server/api-service/{openblocks-domain/src/main/java/com/openblocks => lowcoder-domain/src/main/java/org/lowcoder}/domain/permission/model/UserPermissionOnResourceStatus.java (97%) rename server/api-service/{openblocks-domain/src/main/java/com/openblocks => lowcoder-domain/src/main/java/org/lowcoder}/domain/permission/service/ApplicationPermissionHandler.java (76%) rename server/api-service/{openblocks-domain/src/main/java/com/openblocks => lowcoder-domain/src/main/java/org/lowcoder}/domain/permission/service/DatasourcePermissionHandler.java (84%) rename server/api-service/{openblocks-domain/src/main/java/com/openblocks => lowcoder-domain/src/main/java/org/lowcoder}/domain/permission/service/ResourcePermissionHandler.java (92%) rename server/api-service/{openblocks-domain/src/main/java/com/openblocks => lowcoder-domain/src/main/java/org/lowcoder}/domain/permission/service/ResourcePermissionRepository.java (79%) rename server/api-service/{openblocks-domain/src/main/java/com/openblocks => lowcoder-domain/src/main/java/org/lowcoder}/domain/permission/service/ResourcePermissionService.java (91%) rename server/api-service/{openblocks-domain/src/main/java/com/openblocks => lowcoder-domain/src/main/java/org/lowcoder}/domain/permission/service/impl/ResourcePermissionRepositoryImpl.java (87%) rename server/api-service/{openblocks-domain/src/main/java/com/openblocks => lowcoder-domain/src/main/java/org/lowcoder}/domain/permission/solution/SuggestAppAdminSolution.java (86%) rename server/api-service/{openblocks-domain/src/main/java/com/openblocks => lowcoder-domain/src/main/java/org/lowcoder}/domain/plugin/DatasourceMetaInfo.java (91%) rename server/api-service/{openblocks-domain/src/main/java/com/openblocks => lowcoder-domain/src/main/java/org/lowcoder}/domain/plugin/DatasourceMetaInfoConstants.java (71%) rename server/api-service/{openblocks-domain/src/main/java/com/openblocks => lowcoder-domain/src/main/java/org/lowcoder}/domain/plugin/client/DatasourcePluginClient.java (93%) rename server/api-service/{openblocks-domain/src/main/java/com/openblocks => lowcoder-domain/src/main/java/org/lowcoder}/domain/plugin/client/dto/DatasourcePluginDefinition.java (95%) rename server/api-service/{openblocks-domain/src/main/java/com/openblocks => lowcoder-domain/src/main/java/org/lowcoder}/domain/plugin/client/dto/GetPluginDynamicConfigRequestDTO.java (84%) rename server/api-service/{openblocks-domain/src/main/java/com/openblocks => lowcoder-domain/src/main/java/org/lowcoder}/domain/plugin/service/DatasourceMetaInfoService.java (73%) rename server/api-service/{openblocks-domain/src/main/java/com/openblocks => lowcoder-domain/src/main/java/org/lowcoder}/domain/plugin/service/impl/DatasourceMetaInfoServiceImpl.java (87%) rename server/api-service/{openblocks-domain/src/main/java/com/openblocks => lowcoder-domain/src/main/java/org/lowcoder}/domain/query/model/ApplicationQuery.java (97%) rename server/api-service/{openblocks-domain/src/main/java/com/openblocks => lowcoder-domain/src/main/java/org/lowcoder}/domain/query/model/ApplicationQueryContext.java (78%) rename server/api-service/{openblocks-domain/src/main/java/com/openblocks => lowcoder-domain/src/main/java/org/lowcoder}/domain/query/model/BaseQuery.java (94%) rename server/api-service/{openblocks-domain/src/main/java/com/openblocks => lowcoder-domain/src/main/java/org/lowcoder}/domain/query/model/LibraryQuery.java (90%) rename server/api-service/{openblocks-domain/src/main/java/com/openblocks => lowcoder-domain/src/main/java/org/lowcoder}/domain/query/model/LibraryQueryCombineId.java (90%) rename server/api-service/{openblocks-domain/src/main/java/com/openblocks => lowcoder-domain/src/main/java/org/lowcoder}/domain/query/model/LibraryQueryRecord.java (91%) rename server/api-service/{openblocks-domain/src/main/java/com/openblocks => lowcoder-domain/src/main/java/org/lowcoder}/domain/query/model/QueryContext.java (79%) rename server/api-service/{openblocks-domain/src/main/java/com/openblocks => lowcoder-domain/src/main/java/org/lowcoder}/domain/query/repository/LibraryQueryRecordRepository.java (85%) rename server/api-service/{openblocks-domain/src/main/java/com/openblocks => lowcoder-domain/src/main/java/org/lowcoder}/domain/query/repository/LibraryQueryRepository.java (80%) rename server/api-service/{openblocks-domain/src/main/java/com/openblocks => lowcoder-domain/src/main/java/org/lowcoder}/domain/query/service/LibraryQueryRecordService.java (86%) rename server/api-service/{openblocks-domain/src/main/java/com/openblocks => lowcoder-domain/src/main/java/org/lowcoder}/domain/query/service/LibraryQueryService.java (83%) rename server/api-service/{openblocks-domain/src/main/java/com/openblocks => lowcoder-domain/src/main/java/org/lowcoder}/domain/query/service/QueryExecutionService.java (78%) rename server/api-service/{openblocks-domain/src/main/java/com/openblocks => lowcoder-domain/src/main/java/org/lowcoder}/domain/query/util/QueryTimeoutUtils.java (86%) rename server/api-service/{openblocks-domain/src/main/java/com/openblocks => lowcoder-domain/src/main/java/org/lowcoder}/domain/solutions/TemplateSolution.java (83%) rename server/api-service/{openblocks-domain/src/main/java/com/openblocks => lowcoder-domain/src/main/java/org/lowcoder}/domain/template/model/Template.java (73%) rename server/api-service/{openblocks-domain/src/main/java/com/openblocks => lowcoder-domain/src/main/java/org/lowcoder}/domain/template/repository/TemplateRepository.java (84%) rename server/api-service/{openblocks-domain/src/main/java/com/openblocks => lowcoder-domain/src/main/java/org/lowcoder}/domain/template/service/TemplateService.java (82%) rename server/api-service/{openblocks-domain/src/main/java/com/openblocks => lowcoder-domain/src/main/java/org/lowcoder}/domain/user/constant/UserStatusType.java (94%) rename server/api-service/{openblocks-domain/src/main/java/com/openblocks => lowcoder-domain/src/main/java/org/lowcoder}/domain/user/model/AuthToken.java (87%) rename server/api-service/{openblocks-domain/src/main/java/com/openblocks => lowcoder-domain/src/main/java/org/lowcoder}/domain/user/model/AuthUser.java (92%) rename server/api-service/{openblocks-domain/src/main/java/com/openblocks => lowcoder-domain/src/main/java/org/lowcoder}/domain/user/model/Connection.java (97%) rename server/api-service/{openblocks-domain/src/main/java/com/openblocks => lowcoder-domain/src/main/java/org/lowcoder}/domain/user/model/ConnectionAuthToken.java (96%) rename server/api-service/{openblocks-domain/src/main/java/com/openblocks => lowcoder-domain/src/main/java/org/lowcoder}/domain/user/model/InviteUser.java (84%) rename server/api-service/{openblocks-domain/src/main/java/com/openblocks => lowcoder-domain/src/main/java/org/lowcoder}/domain/user/model/User.java (94%) rename server/api-service/{openblocks-domain/src/main/java/com/openblocks => lowcoder-domain/src/main/java/org/lowcoder}/domain/user/model/UserDetail.java (94%) rename server/api-service/{openblocks-domain/src/main/java/com/openblocks => lowcoder-domain/src/main/java/org/lowcoder}/domain/user/model/UserState.java (73%) rename server/api-service/{openblocks-domain/src/main/java/com/openblocks => lowcoder-domain/src/main/java/org/lowcoder}/domain/user/model/UserStatus.java (92%) rename server/api-service/{openblocks-domain/src/main/java/com/openblocks => lowcoder-domain/src/main/java/org/lowcoder}/domain/user/repository/UserRepository.java (85%) rename server/api-service/{openblocks-domain/src/main/java/com/openblocks => lowcoder-domain/src/main/java/org/lowcoder}/domain/user/repository/UserStatusRepository.java (70%) rename server/api-service/{openblocks-domain/src/main/java/com/openblocks => lowcoder-domain/src/main/java/org/lowcoder}/domain/user/service/UserService.java (81%) rename server/api-service/{openblocks-domain/src/main/java/com/openblocks => lowcoder-domain/src/main/java/org/lowcoder}/domain/user/service/UserServiceImpl.java (87%) rename server/api-service/{openblocks-domain/src/main/java/com/openblocks => lowcoder-domain/src/main/java/org/lowcoder}/domain/user/service/UserStatusService.java (81%) rename server/api-service/{openblocks-domain/src/main/java/com/openblocks => lowcoder-domain/src/main/java/org/lowcoder}/domain/util/QueryDslUtils.java (84%) rename server/api-service/{openblocks-domain/src/test/java/com/openblocks => lowcoder-domain/src/test/java/org/lowcoder}/domain/ServerApplication.java (86%) rename server/api-service/{openblocks-domain/src/test/java/com/openblocks => lowcoder-domain/src/test/java/org/lowcoder}/domain/organization/service/OrgMemberServiceTest.java (84%) rename server/api-service/{openblocks-domain/src/test/java/com/openblocks => lowcoder-domain/src/test/java/org/lowcoder}/impl/ClientBasedConnectionPoolTest.java (86%) rename server/api-service/{openblocks-domain/src/test/java/com/openblocks => lowcoder-domain/src/test/java/org/lowcoder}/impl/mock/MockConnection.java (84%) rename server/api-service/{openblocks-domain/src/test/java/com/openblocks => lowcoder-domain/src/test/java/org/lowcoder}/impl/mock/MockDatasourceConnectionConfig.java (65%) rename server/api-service/{openblocks-domain/src/test/java/com/openblocks => lowcoder-domain/src/test/java/org/lowcoder}/impl/mock/MockDatasourceConnector.java (87%) rename server/api-service/{openblocks-domain/src/test/java/com/openblocks => lowcoder-domain/src/test/java/org/lowcoder}/impl/mock/MockDatasourceMetaInfoService.java (80%) rename server/api-service/{openblocks-domain => lowcoder-domain}/src/test/resources/application.yml (88%) rename server/api-service/{openblocks-ee => lowcoder-ee}/pom.xml (82%) rename server/api-service/{openblocks-infra => lowcoder-infra}/pom.xml (81%) rename server/api-service/{openblocks-infra/src/main/java/com/openblocks => lowcoder-infra/src/main/java/org/lowcoder}/infra/annotation/NonEmptyMono.java (77%) rename server/api-service/{openblocks-infra/src/main/java/com/openblocks => lowcoder-infra/src/main/java/org/lowcoder}/infra/annotation/PossibleEmptyMono.java (78%) rename server/api-service/{openblocks-infra/src/main/java/com/openblocks => lowcoder-infra/src/main/java/org/lowcoder}/infra/birelation/BiRelation.java (96%) rename server/api-service/{openblocks-infra/src/main/java/com/openblocks => lowcoder-infra/src/main/java/org/lowcoder}/infra/birelation/BiRelationBizType.java (79%) rename server/api-service/{openblocks-infra/src/main/java/com/openblocks => lowcoder-infra/src/main/java/org/lowcoder}/infra/birelation/BiRelationRepository.java (97%) rename server/api-service/{openblocks-infra/src/main/java/com/openblocks => lowcoder-infra/src/main/java/org/lowcoder}/infra/birelation/BiRelationService.java (98%) rename server/api-service/{openblocks-infra/src/main/java/com/openblocks => lowcoder-infra/src/main/java/org/lowcoder}/infra/conditional/ConditionalOnPropertyNotBlank.java (93%) rename server/api-service/{openblocks-infra/src/main/java/com/openblocks => lowcoder-infra/src/main/java/org/lowcoder}/infra/config/AutoReloadConfImpl.java (94%) rename server/api-service/{openblocks-infra/src/main/java/com/openblocks => lowcoder-infra/src/main/java/org/lowcoder}/infra/config/AutoReloadConfigFactory.java (83%) rename server/api-service/{openblocks-infra/src/main/java/com/openblocks => lowcoder-infra/src/main/java/org/lowcoder}/infra/config/AutoReloadConfigInstanceImpl.java (94%) rename server/api-service/{openblocks-infra/src/main/java/com/openblocks => lowcoder-infra/src/main/java/org/lowcoder}/infra/config/ConfigCenterImpl.java (95%) rename server/api-service/{openblocks-infra/src/main/java/com/openblocks => lowcoder-infra/src/main/java/org/lowcoder}/infra/config/model/ServerConfig.java (84%) rename server/api-service/{openblocks-infra/src/main/java/com/openblocks => lowcoder-infra/src/main/java/org/lowcoder}/infra/config/repository/CustomServerConfigRepository.java (57%) rename server/api-service/{openblocks-infra/src/main/java/com/openblocks => lowcoder-infra/src/main/java/org/lowcoder}/infra/config/repository/CustomServerConfigRepositoryImpl.java (79%) rename server/api-service/{openblocks-infra/src/main/java/com/openblocks => lowcoder-infra/src/main/java/org/lowcoder}/infra/config/repository/ServerConfigRepository.java (78%) rename server/api-service/{openblocks-infra/src/main/java/com/openblocks => lowcoder-infra/src/main/java/org/lowcoder}/infra/constant/NewUrl.java (97%) rename server/api-service/{openblocks-infra/src/main/java/com/openblocks => lowcoder-infra/src/main/java/org/lowcoder}/infra/constant/Url.java (96%) rename server/api-service/{openblocks-infra/src/main/java/com/openblocks => lowcoder-infra/src/main/java/org/lowcoder}/infra/event/AbstractEvent.java (85%) rename server/api-service/{openblocks-infra/src/main/java/com/openblocks => lowcoder-infra/src/main/java/org/lowcoder}/infra/event/ApplicationCommonEvent.java (93%) rename server/api-service/{openblocks-infra/src/main/java/com/openblocks => lowcoder-infra/src/main/java/org/lowcoder}/infra/event/Event.java (62%) rename server/api-service/{openblocks-infra/src/main/java/com/openblocks => lowcoder-infra/src/main/java/org/lowcoder}/infra/event/EventType.java (96%) rename server/api-service/{openblocks-infra/src/main/java/com/openblocks => lowcoder-infra/src/main/java/org/lowcoder}/infra/event/FolderCommonEvent.java (89%) rename server/api-service/{openblocks-infra/src/main/java/com/openblocks => lowcoder-infra/src/main/java/org/lowcoder}/infra/event/LibraryQueryEvent.java (89%) rename server/api-service/{openblocks-infra/src/main/java/com/openblocks => lowcoder-infra/src/main/java/org/lowcoder}/infra/event/QueryExecutionEvent.java (89%) rename server/api-service/{openblocks-infra/src/main/java/com/openblocks => lowcoder-infra/src/main/java/org/lowcoder}/infra/event/datasource/DatasourceEvent.java (66%) rename server/api-service/{openblocks-infra/src/main/java/com/openblocks => lowcoder-infra/src/main/java/org/lowcoder}/infra/event/datasource/DatasourcePermissionEvent.java (76%) rename server/api-service/{openblocks-infra/src/main/java/com/openblocks => lowcoder-infra/src/main/java/org/lowcoder}/infra/event/group/BaseGroupEvent.java (70%) rename server/api-service/{openblocks-infra/src/main/java/com/openblocks => lowcoder-infra/src/main/java/org/lowcoder}/infra/event/group/GroupCreateEvent.java (71%) rename server/api-service/{openblocks-infra/src/main/java/com/openblocks => lowcoder-infra/src/main/java/org/lowcoder}/infra/event/group/GroupDeleteEvent.java (71%) rename server/api-service/{openblocks-infra/src/main/java/com/openblocks => lowcoder-infra/src/main/java/org/lowcoder}/infra/event/group/GroupUpdateEvent.java (71%) rename server/api-service/{openblocks-infra/src/main/java/com/openblocks => lowcoder-infra/src/main/java/org/lowcoder}/infra/event/groupmember/BaseGroupMemberEvent.java (77%) rename server/api-service/{openblocks-infra/src/main/java/com/openblocks => lowcoder-infra/src/main/java/org/lowcoder}/infra/event/groupmember/GroupMemberAddEvent.java (70%) rename server/api-service/{openblocks-infra/src/main/java/com/openblocks => lowcoder-infra/src/main/java/org/lowcoder}/infra/event/groupmember/GroupMemberLeaveEvent.java (71%) rename server/api-service/{openblocks-infra/src/main/java/com/openblocks => lowcoder-infra/src/main/java/org/lowcoder}/infra/event/groupmember/GroupMemberRemoveEvent.java (71%) rename server/api-service/{openblocks-infra/src/main/java/com/openblocks => lowcoder-infra/src/main/java/org/lowcoder}/infra/event/groupmember/GroupMemberRoleUpdateEvent.java (72%) rename server/api-service/{openblocks-infra/src/main/java/com/openblocks => lowcoder-infra/src/main/java/org/lowcoder}/infra/event/user/UserLoginEvent.java (66%) rename server/api-service/{openblocks-infra/src/main/java/com/openblocks => lowcoder-infra/src/main/java/org/lowcoder}/infra/event/user/UserLogoutEvent.java (60%) rename server/api-service/{openblocks-infra/src/main/java/com/openblocks => lowcoder-infra/src/main/java/org/lowcoder}/infra/eventlog/EventLog.java (78%) rename server/api-service/{openblocks-infra/src/main/java/com/openblocks => lowcoder-infra/src/main/java/org/lowcoder}/infra/js/NodeServerClient.java (54%) rename server/api-service/{openblocks-infra/src/main/java/com/openblocks => lowcoder-infra/src/main/java/org/lowcoder}/infra/js/NodeServerHelper.java (89%) rename server/api-service/{openblocks-infra/src/main/java/com/openblocks => lowcoder-infra/src/main/java/org/lowcoder}/infra/localcache/CaffeineCacheUtils.java (94%) rename server/api-service/{openblocks-infra/src/main/java/com/openblocks => lowcoder-infra/src/main/java/org/lowcoder}/infra/localcache/ReloadableCache.java (97%) rename server/api-service/{openblocks-infra/src/main/java/com/openblocks => lowcoder-infra/src/main/java/org/lowcoder}/infra/mongo/MongoUpsertHelper.java (97%) rename server/api-service/{openblocks-infra/src/main/java/com/openblocks => lowcoder-infra/src/main/java/org/lowcoder}/infra/perf/PerfEvent.java (93%) rename server/api-service/{openblocks-infra/src/main/java/com/openblocks => lowcoder-infra/src/main/java/org/lowcoder}/infra/perf/PerfHelper.java (98%) rename server/api-service/{openblocks-infra/src/main/java/com/openblocks => lowcoder-infra/src/main/java/org/lowcoder}/infra/serverlog/ServerLog.java (95%) rename server/api-service/{openblocks-infra/src/main/java/com/openblocks => lowcoder-infra/src/main/java/org/lowcoder}/infra/serverlog/ServerLogRepository.java (81%) rename server/api-service/{openblocks-infra/src/main/java/com/openblocks => lowcoder-infra/src/main/java/org/lowcoder}/infra/serverlog/ServerLogService.java (88%) rename server/api-service/{openblocks-infra/src/main/java/com/openblocks => lowcoder-infra/src/main/java/org/lowcoder}/infra/util/AssetUtils.java (74%) rename server/api-service/{openblocks-infra/src/main/java/com/openblocks => lowcoder-infra/src/main/java/org/lowcoder}/infra/util/FluxHelper.java (95%) rename server/api-service/{openblocks-infra/src/main/java/com/openblocks => lowcoder-infra/src/main/java/org/lowcoder}/infra/util/LogUtils.java (98%) rename server/api-service/{openblocks-infra/src/main/java/com/openblocks => lowcoder-infra/src/main/java/org/lowcoder}/infra/util/MonoUtils.java (93%) rename server/api-service/{openblocks-infra/src/main/java/com/openblocks => lowcoder-infra/src/main/java/org/lowcoder}/infra/util/NetworkUtils.java (93%) rename server/api-service/{openblocks-infra/src/main/java/com/openblocks => lowcoder-infra/src/main/java/org/lowcoder}/infra/util/RSAUtils.java (97%) rename server/api-service/{openblocks-infra/src/main/java/com/openblocks => lowcoder-infra/src/main/java/org/lowcoder}/infra/util/RateLimitHelper.java (96%) rename server/api-service/{openblocks-infra/src/main/java/com/openblocks => lowcoder-infra/src/main/java/org/lowcoder}/infra/util/TupleUtils.java (97%) rename server/api-service/{openblocks-infra/src/test/java/com/openblocks => lowcoder-infra/src/test/java/org/lowcoder}/infra/config/AutoReloadConfigInstanceImplTest.java (90%) rename server/api-service/{openblocks-infra/src/test/java/com/openblocks => lowcoder-infra/src/test/java/org/lowcoder}/infra/config/AutoReloadConfigInstanceImplTest.json (100%) create mode 100644 server/api-service/lowcoder-plugins/clickHousePlugin/plugin.properties rename server/api-service/{openblocks-plugins => lowcoder-plugins}/clickHousePlugin/pom.xml (94%) rename server/api-service/{openblocks-plugins/clickHousePlugin/src/main/java/com/openblocks => lowcoder-plugins/clickHousePlugin/src/main/java/org/lowcoder}/plugin/clickhouse/ClickHouseConnector.java (90%) rename server/api-service/{openblocks-plugins/clickHousePlugin/src/main/java/com/openblocks => lowcoder-plugins/clickHousePlugin/src/main/java/org/lowcoder}/plugin/clickhouse/ClickHousePlugin.java (81%) rename server/api-service/{openblocks-plugins/clickHousePlugin/src/main/java/com/openblocks => lowcoder-plugins/clickHousePlugin/src/main/java/org/lowcoder}/plugin/clickhouse/ClickHouseQueryExecutor.java (84%) rename server/api-service/{openblocks-plugins/clickHousePlugin/src/main/java/com/openblocks => lowcoder-plugins/clickHousePlugin/src/main/java/org/lowcoder}/plugin/clickhouse/model/ClickHouseDatasourceConfig.java (73%) rename server/api-service/{openblocks-plugins/clickHousePlugin/src/main/java/com/openblocks => lowcoder-plugins/clickHousePlugin/src/main/java/org/lowcoder}/plugin/clickhouse/model/ClickHouseQueryConfig.java (78%) rename server/api-service/{openblocks-plugins/clickHousePlugin/src/main/java/com/openblocks => lowcoder-plugins/clickHousePlugin/src/main/java/org/lowcoder}/plugin/clickhouse/utils/ClickHouseStructureParser.java (89%) create mode 100644 server/api-service/lowcoder-plugins/elasticSearchPlugin/plugin.properties rename server/api-service/{openblocks-plugins => lowcoder-plugins}/elasticSearchPlugin/pom.xml (94%) rename server/api-service/{openblocks-plugins/elasticSearchPlugin/src/main/java/com/openblocks => lowcoder-plugins/elasticSearchPlugin/src/main/java/org/lowcoder}/plugin/es/EsConnector.java (90%) create mode 100644 server/api-service/lowcoder-plugins/elasticSearchPlugin/src/main/java/org/lowcoder/plugin/es/EsError.java rename server/api-service/{openblocks-plugins/elasticSearchPlugin/src/main/java/com/openblocks => lowcoder-plugins/elasticSearchPlugin/src/main/java/org/lowcoder}/plugin/es/EsPlugin.java (86%) rename server/api-service/{openblocks-plugins/elasticSearchPlugin/src/main/java/com/openblocks => lowcoder-plugins/elasticSearchPlugin/src/main/java/org/lowcoder}/plugin/es/EsQueryExecutor.java (81%) rename server/api-service/{openblocks-plugins/elasticSearchPlugin/src/main/java/com/openblocks => lowcoder-plugins/elasticSearchPlugin/src/main/java/org/lowcoder}/plugin/es/ReactorRestClientAdaptor.java (97%) rename server/api-service/{openblocks-plugins/elasticSearchPlugin/src/main/java/com/openblocks => lowcoder-plugins/elasticSearchPlugin/src/main/java/org/lowcoder}/plugin/es/model/EsConnection.java (86%) rename server/api-service/{openblocks-plugins/elasticSearchPlugin/src/main/java/com/openblocks => lowcoder-plugins/elasticSearchPlugin/src/main/java/org/lowcoder}/plugin/es/model/EsDatasourceConfig.java (85%) rename server/api-service/{openblocks-plugins/elasticSearchPlugin/src/main/java/com/openblocks => lowcoder-plugins/elasticSearchPlugin/src/main/java/org/lowcoder}/plugin/es/model/EsQueryConfig.java (96%) rename server/api-service/{openblocks-plugins/elasticSearchPlugin/src/main/java/com/openblocks => lowcoder-plugins/elasticSearchPlugin/src/main/java/org/lowcoder}/plugin/es/model/EsQueryExecutionContext.java (87%) create mode 100644 server/api-service/lowcoder-plugins/googleSheetsPlugin/plugin.properties rename server/api-service/{openblocks-plugins => lowcoder-plugins}/googleSheetsPlugin/pom.xml (94%) rename server/api-service/{openblocks-plugins/googleSheetsPlugin/src/main/java/com/openblocks => lowcoder-plugins/googleSheetsPlugin/src/main/java/org/lowcoder}/plugin/googlesheets/GoogleSheetError.java (63%) rename server/api-service/{openblocks-plugins/googleSheetsPlugin/src/main/java/com/openblocks => lowcoder-plugins/googleSheetsPlugin/src/main/java/org/lowcoder}/plugin/googlesheets/GoogleSheetsPlugin.java (74%) rename server/api-service/{openblocks-plugins/googleSheetsPlugin/src/main/java/com/openblocks => lowcoder-plugins/googleSheetsPlugin/src/main/java/org/lowcoder}/plugin/googlesheets/constants/FieldName.java (60%) rename server/api-service/{openblocks-plugins/googleSheetsPlugin/src/main/java/com/openblocks => lowcoder-plugins/googleSheetsPlugin/src/main/java/org/lowcoder}/plugin/googlesheets/model/GoogleSheetsActionRequest.java (75%) rename server/api-service/{openblocks-plugins/googleSheetsPlugin/src/main/java/com/openblocks => lowcoder-plugins/googleSheetsPlugin/src/main/java/org/lowcoder}/plugin/googlesheets/model/GoogleSheetsAppendDataRequest.java (85%) rename server/api-service/{openblocks-plugins/googleSheetsPlugin/src/main/java/com/openblocks => lowcoder-plugins/googleSheetsPlugin/src/main/java/org/lowcoder}/plugin/googlesheets/model/GoogleSheetsClearDataRequst.java (78%) rename server/api-service/{openblocks-plugins/googleSheetsPlugin/src/main/java/com/openblocks => lowcoder-plugins/googleSheetsPlugin/src/main/java/org/lowcoder}/plugin/googlesheets/model/GoogleSheetsDatasourceConfig.java (84%) rename server/api-service/{openblocks-plugins/googleSheetsPlugin/src/main/java/com/openblocks => lowcoder-plugins/googleSheetsPlugin/src/main/java/org/lowcoder}/plugin/googlesheets/model/GoogleSheetsDeleteDataRequest.java (78%) rename server/api-service/{openblocks-plugins/googleSheetsPlugin/src/main/java/com/openblocks => lowcoder-plugins/googleSheetsPlugin/src/main/java/org/lowcoder}/plugin/googlesheets/model/GoogleSheetsQueryExecutionContext.java (88%) rename server/api-service/{openblocks-plugins/googleSheetsPlugin/src/main/java/com/openblocks => lowcoder-plugins/googleSheetsPlugin/src/main/java/org/lowcoder}/plugin/googlesheets/model/GoogleSheetsReadDataRequest.java (85%) rename server/api-service/{openblocks-plugins/googleSheetsPlugin/src/main/java/com/openblocks => lowcoder-plugins/googleSheetsPlugin/src/main/java/org/lowcoder}/plugin/googlesheets/model/GoogleSheetsUpdateDataRequest.java (83%) rename server/api-service/{openblocks-plugins/googleSheetsPlugin/src/main/java/com/openblocks => lowcoder-plugins/googleSheetsPlugin/src/main/java/org/lowcoder}/plugin/googlesheets/model/ServiceAccountJsonUtils.java (91%) rename server/api-service/{openblocks-plugins/googleSheetsPlugin/src/main/java/com/openblocks => lowcoder-plugins/googleSheetsPlugin/src/main/java/org/lowcoder}/plugin/googlesheets/queryhandler/GoogleSheetsActionHandler.java (73%) rename server/api-service/{openblocks-plugins/googleSheetsPlugin/src/main/java/com/openblocks => lowcoder-plugins/googleSheetsPlugin/src/main/java/org/lowcoder}/plugin/googlesheets/queryhandler/GoogleSheetsActionHandlerFactory.java (85%) rename server/api-service/{openblocks-plugins/googleSheetsPlugin/src/main/java/com/openblocks => lowcoder-plugins/googleSheetsPlugin/src/main/java/org/lowcoder}/plugin/googlesheets/queryhandler/GoogleSheetsAppendDataHandler.java (87%) rename server/api-service/{openblocks-plugins/googleSheetsPlugin/src/main/java/com/openblocks => lowcoder-plugins/googleSheetsPlugin/src/main/java/org/lowcoder}/plugin/googlesheets/queryhandler/GoogleSheetsClearDataHandler.java (81%) rename server/api-service/{openblocks-plugins/googleSheetsPlugin/src/main/java/com/openblocks => lowcoder-plugins/googleSheetsPlugin/src/main/java/org/lowcoder}/plugin/googlesheets/queryhandler/GoogleSheetsDeleteDataHandler.java (89%) rename server/api-service/{openblocks-plugins/googleSheetsPlugin/src/main/java/com/openblocks => lowcoder-plugins/googleSheetsPlugin/src/main/java/org/lowcoder}/plugin/googlesheets/queryhandler/GoogleSheetsGetPreParameters.java (77%) rename server/api-service/{openblocks-plugins/googleSheetsPlugin/src/main/java/com/openblocks => lowcoder-plugins/googleSheetsPlugin/src/main/java/org/lowcoder}/plugin/googlesheets/queryhandler/GoogleSheetsReadDataHandler.java (91%) rename server/api-service/{openblocks-plugins/googleSheetsPlugin/src/main/java/com/openblocks => lowcoder-plugins/googleSheetsPlugin/src/main/java/org/lowcoder}/plugin/googlesheets/queryhandler/GoogleSheetsUpdateDataHandler.java (87%) create mode 100644 server/api-service/lowcoder-plugins/graphqlPlugin/plugin.properties rename server/api-service/{openblocks-plugins => lowcoder-plugins}/graphqlPlugin/pom.xml (96%) rename server/api-service/{openblocks-plugins/graphqlPlugin/src/main/java/com/openblocks => lowcoder-plugins/graphqlPlugin/src/main/java/org/lowcoder}/plugin/graphql/GraphQLConnector.java (82%) create mode 100644 server/api-service/lowcoder-plugins/graphqlPlugin/src/main/java/org/lowcoder/plugin/graphql/GraphQLError.java rename server/api-service/{openblocks-plugins/graphqlPlugin/src/main/java/com/openblocks => lowcoder-plugins/graphqlPlugin/src/main/java/org/lowcoder}/plugin/graphql/GraphQLExecutor.java (89%) rename server/api-service/{openblocks-plugins/graphqlPlugin/src/main/java/com/openblocks => lowcoder-plugins/graphqlPlugin/src/main/java/org/lowcoder}/plugin/graphql/GraphQLPlugin.java (82%) rename server/api-service/{openblocks-plugins/graphqlPlugin/src/main/java/com/openblocks => lowcoder-plugins/graphqlPlugin/src/main/java/org/lowcoder}/plugin/graphql/constants/ResponseDataType.java (60%) rename server/api-service/{openblocks-plugins/graphqlPlugin/src/main/java/com/openblocks => lowcoder-plugins/graphqlPlugin/src/main/java/org/lowcoder}/plugin/graphql/helpers/AuthHelper.java (94%) rename server/api-service/{openblocks-plugins/restApiPlugin/src/main/java/com/openblocks/plugin/restapi => lowcoder-plugins/graphqlPlugin/src/main/java/org/lowcoder/plugin/graphql}/helpers/BufferingFilter.java (97%) rename server/api-service/{openblocks-plugins/graphqlPlugin/src/main/java/com/openblocks => lowcoder-plugins/graphqlPlugin/src/main/java/org/lowcoder}/plugin/graphql/model/GraphQLQueryConfig.java (82%) rename server/api-service/{openblocks-plugins/graphqlPlugin/src/main/java/com/openblocks => lowcoder-plugins/graphqlPlugin/src/main/java/org/lowcoder}/plugin/graphql/model/GraphQLQueryExecutionContext.java (91%) rename server/api-service/{openblocks-plugins/graphqlPlugin/src/main/java/com/openblocks => lowcoder-plugins/graphqlPlugin/src/main/java/org/lowcoder}/plugin/graphql/utils/GraphQLBodyUtils.java (86%) create mode 100644 server/api-service/lowcoder-plugins/lowcoderApiPlugin/plugin.properties rename server/api-service/{openblocks-plugins/openblocksApiPlugin => lowcoder-plugins/lowcoderApiPlugin}/pom.xml (86%) create mode 100644 server/api-service/lowcoder-plugins/lowcoderApiPlugin/src/main/java/org/lowcoder/plugin/LowcoderApiConnector.java rename server/api-service/{openblocks-plugins/openblocksApiPlugin/src/main/java/com/openblocks/plugin/OpenblocksApiExecutor.java => lowcoder-plugins/lowcoderApiPlugin/src/main/java/org/lowcoder/plugin/LowcoderApiExecutor.java} (65%) create mode 100644 server/api-service/lowcoder-plugins/lowcoderApiPlugin/src/main/java/org/lowcoder/plugin/LowcoderApiPlugin.java create mode 100644 server/api-service/lowcoder-plugins/lowcoderApiPlugin/src/main/java/org/lowcoder/plugin/LowcoderApiPluginError.java rename server/api-service/{openblocks-plugins/openblocksApiPlugin/src/main/java/com/openblocks/plugin/OpenblocksApiQueryExecutionContext.java => lowcoder-plugins/lowcoderApiPlugin/src/main/java/org/lowcoder/plugin/LowcoderApiQueryExecutionContext.java} (67%) create mode 100644 server/api-service/lowcoder-plugins/mongoPlugin/plugin.properties rename server/api-service/{openblocks-plugins => lowcoder-plugins}/mongoPlugin/pom.xml (92%) rename server/api-service/{openblocks-plugins/mongoPlugin/src/main/java/com/openblocks => lowcoder-plugins/mongoPlugin/src/main/java/org/lowcoder}/plugin/mongo/MongoPlugin.java (85%) rename server/api-service/{openblocks-plugins/mongoPlugin/src/main/java/com/openblocks => lowcoder-plugins/mongoPlugin/src/main/java/org/lowcoder}/plugin/mongo/MongoPluginError.java (59%) rename server/api-service/{openblocks-plugins/mongoPlugin/src/main/java/com/openblocks => lowcoder-plugins/mongoPlugin/src/main/java/org/lowcoder}/plugin/mongo/commands/Aggregate.java (85%) rename server/api-service/{openblocks-plugins/mongoPlugin/src/main/java/com/openblocks => lowcoder-plugins/mongoPlugin/src/main/java/org/lowcoder}/plugin/mongo/commands/Count.java (77%) rename server/api-service/{openblocks-plugins/mongoPlugin/src/main/java/com/openblocks => lowcoder-plugins/mongoPlugin/src/main/java/org/lowcoder}/plugin/mongo/commands/Delete.java (84%) rename server/api-service/{openblocks-plugins/mongoPlugin/src/main/java/com/openblocks => lowcoder-plugins/mongoPlugin/src/main/java/org/lowcoder}/plugin/mongo/commands/Distinct.java (80%) rename server/api-service/{openblocks-plugins/mongoPlugin/src/main/java/com/openblocks => lowcoder-plugins/mongoPlugin/src/main/java/org/lowcoder}/plugin/mongo/commands/Find.java (79%) rename server/api-service/{openblocks-plugins/mongoPlugin/src/main/java/com/openblocks => lowcoder-plugins/mongoPlugin/src/main/java/org/lowcoder}/plugin/mongo/commands/Insert.java (83%) rename server/api-service/{openblocks-plugins/mongoPlugin/src/main/java/com/openblocks => lowcoder-plugins/mongoPlugin/src/main/java/org/lowcoder}/plugin/mongo/commands/MongoCommand.java (87%) rename server/api-service/{openblocks-plugins/mongoPlugin/src/main/java/com/openblocks => lowcoder-plugins/mongoPlugin/src/main/java/org/lowcoder}/plugin/mongo/commands/UpdateMany.java (84%) rename server/api-service/{openblocks-plugins/mongoPlugin/src/main/java/com/openblocks => lowcoder-plugins/mongoPlugin/src/main/java/org/lowcoder}/plugin/mongo/constants/MongoFieldName.java (97%) rename server/api-service/{openblocks-plugins/mongoPlugin/src/main/java/com/openblocks => lowcoder-plugins/mongoPlugin/src/main/java/org/lowcoder}/plugin/mongo/constants/MongoSpecialDataTypes.java (98%) rename server/api-service/{openblocks-plugins/mongoPlugin/src/main/java/com/openblocks => lowcoder-plugins/mongoPlugin/src/main/java/org/lowcoder}/plugin/mongo/model/MongoAuthMechanism.java (87%) rename server/api-service/{openblocks-plugins/mongoPlugin/src/main/java/com/openblocks => lowcoder-plugins/mongoPlugin/src/main/java/org/lowcoder}/plugin/mongo/model/MongoConnection.java (95%) rename server/api-service/{openblocks-plugins/mongoPlugin/src/main/java/com/openblocks => lowcoder-plugins/mongoPlugin/src/main/java/org/lowcoder}/plugin/mongo/model/MongoConnectionUriParser.java (93%) rename server/api-service/{openblocks-plugins/mongoPlugin/src/main/java/com/openblocks => lowcoder-plugins/mongoPlugin/src/main/java/org/lowcoder}/plugin/mongo/model/MongoDatasourceConfig.java (87%) rename server/api-service/{openblocks-plugins/mongoPlugin/src/main/java/com/openblocks => lowcoder-plugins/mongoPlugin/src/main/java/org/lowcoder}/plugin/mongo/model/MongoQueryExecutionContext.java (77%) rename server/api-service/{openblocks-plugins/mongoPlugin/src/main/java/com/openblocks => lowcoder-plugins/mongoPlugin/src/main/java/org/lowcoder}/plugin/mongo/utils/MongoQueryUtils.java (91%) create mode 100644 server/api-service/lowcoder-plugins/mssqlPlugin/plugin.properties rename server/api-service/{openblocks-plugins => lowcoder-plugins}/mssqlPlugin/pom.xml (94%) rename server/api-service/{openblocks-plugins/mssqlPlugin/src/main/java/com/openblocks => lowcoder-plugins/mssqlPlugin/src/main/java/org/lowcoder}/plugin/mssql/MssqlConnector.java (94%) rename server/api-service/{openblocks-plugins/mssqlPlugin/src/main/java/com/openblocks => lowcoder-plugins/mssqlPlugin/src/main/java/org/lowcoder}/plugin/mssql/MssqlPlugin.java (82%) rename server/api-service/{openblocks-plugins/mssqlPlugin/src/main/java/com/openblocks => lowcoder-plugins/mssqlPlugin/src/main/java/org/lowcoder}/plugin/mssql/MssqlQueryExecutor.java (70%) rename server/api-service/{openblocks-plugins/mssqlPlugin/src/main/java/com/openblocks => lowcoder-plugins/mssqlPlugin/src/main/java/org/lowcoder}/plugin/mssql/gui/GuiConstants.java (80%) rename server/api-service/{openblocks-plugins/mssqlPlugin/src/main/java/com/openblocks => lowcoder-plugins/mssqlPlugin/src/main/java/org/lowcoder}/plugin/mssql/gui/MssqlBulkInsertCommand.java (55%) rename server/api-service/{openblocks-plugins/mssqlPlugin/src/main/java/com/openblocks => lowcoder-plugins/mssqlPlugin/src/main/java/org/lowcoder}/plugin/mssql/gui/MssqlBulkUpdateCommand.java (52%) rename server/api-service/{openblocks-plugins/mssqlPlugin/src/main/java/com/openblocks => lowcoder-plugins/mssqlPlugin/src/main/java/org/lowcoder}/plugin/mssql/gui/MssqlDeleteCommand.java (70%) rename server/api-service/{openblocks-plugins/mssqlPlugin/src/main/java/com/openblocks => lowcoder-plugins/mssqlPlugin/src/main/java/org/lowcoder}/plugin/mssql/gui/MssqlInsertCommand.java (64%) rename server/api-service/{openblocks-plugins/mssqlPlugin/src/main/java/com/openblocks => lowcoder-plugins/mssqlPlugin/src/main/java/org/lowcoder}/plugin/mssql/gui/MssqlUpdateCommand.java (71%) rename server/api-service/{openblocks-plugins/mssqlPlugin/src/main/java/com/openblocks => lowcoder-plugins/mssqlPlugin/src/main/java/org/lowcoder}/plugin/mssql/model/MssqlDatasourceConfig.java (74%) rename server/api-service/{openblocks-plugins/mssqlPlugin/src/main/java/com/openblocks => lowcoder-plugins/mssqlPlugin/src/main/java/org/lowcoder}/plugin/mssql/model/MssqlQueryConfig.java (84%) rename server/api-service/{openblocks-plugins/mssqlPlugin/src/main/java/com/openblocks => lowcoder-plugins/mssqlPlugin/src/main/java/org/lowcoder}/plugin/mssql/util/MssqlResultParser.java (93%) rename server/api-service/{openblocks-plugins/mssqlPlugin/src/main/java/com/openblocks => lowcoder-plugins/mssqlPlugin/src/main/java/org/lowcoder}/plugin/mssql/util/MssqlStructureParser.java (92%) create mode 100644 server/api-service/lowcoder-plugins/mysqlPlugin/plugin.properties rename server/api-service/{openblocks-plugins => lowcoder-plugins}/mysqlPlugin/pom.xml (93%) rename server/api-service/{openblocks-plugins/mysqlPlugin/src/main/java/com/openblocks => lowcoder-plugins/mysqlPlugin/src/main/java/org/lowcoder}/plugin/mysql/MysqlConnector.java (92%) rename server/api-service/{openblocks-plugins/mysqlPlugin/src/main/java/com/openblocks => lowcoder-plugins/mysqlPlugin/src/main/java/org/lowcoder}/plugin/mysql/MysqlPlugin.java (83%) rename server/api-service/{openblocks-plugins/mysqlPlugin/src/main/java/com/openblocks => lowcoder-plugins/mysqlPlugin/src/main/java/org/lowcoder}/plugin/mysql/MysqlQueryExecutor.java (61%) rename server/api-service/{openblocks-plugins/mysqlPlugin/src/main/java/com/openblocks => lowcoder-plugins/mysqlPlugin/src/main/java/org/lowcoder}/plugin/mysql/model/MysqlQueryConfig.java (84%) rename server/api-service/{openblocks-plugins/mysqlPlugin/src/main/java/com/openblocks => lowcoder-plugins/mysqlPlugin/src/main/java/org/lowcoder}/plugin/mysql/utils/MysqlResultParser.java (79%) rename server/api-service/{openblocks-plugins/mysqlPlugin/src/main/java/com/openblocks => lowcoder-plugins/mysqlPlugin/src/main/java/org/lowcoder}/plugin/mysql/utils/MysqlStructureParser.java (95%) rename server/api-service/{openblocks-plugins => lowcoder-plugins}/mysqlPlugin/src/main/resources/locale.properties (100%) rename server/api-service/{openblocks-plugins => lowcoder-plugins}/mysqlPlugin/src/main/resources/locale_en.properties (100%) create mode 100644 server/api-service/lowcoder-plugins/oraclePlugin/plugin.properties rename server/api-service/{openblocks-plugins => lowcoder-plugins}/oraclePlugin/pom.xml (92%) rename server/api-service/{openblocks-plugins/oraclePlugin/src/main/java/com/openblocks => lowcoder-plugins/oraclePlugin/src/main/java/org/lowcoder}/plugin/oracle/OracleConnector.java (91%) rename server/api-service/{openblocks-plugins/oraclePlugin/src/main/java/com/openblocks => lowcoder-plugins/oraclePlugin/src/main/java/org/lowcoder}/plugin/oracle/OraclePlugin.java (82%) rename server/api-service/{openblocks-plugins/oraclePlugin/src/main/java/com/openblocks => lowcoder-plugins/oraclePlugin/src/main/java/org/lowcoder}/plugin/oracle/OracleQueryExecutor.java (60%) rename server/api-service/{openblocks-plugins/oraclePlugin/src/main/java/com/openblocks => lowcoder-plugins/oraclePlugin/src/main/java/org/lowcoder}/plugin/oracle/gui/GuiConstants.java (70%) rename server/api-service/{openblocks-plugins/oraclePlugin/src/main/java/com/openblocks => lowcoder-plugins/oraclePlugin/src/main/java/org/lowcoder}/plugin/oracle/gui/OracleBulkInsertCommand.java (59%) rename server/api-service/{openblocks-plugins/oraclePlugin/src/main/java/com/openblocks => lowcoder-plugins/oraclePlugin/src/main/java/org/lowcoder}/plugin/oracle/gui/OracleBulkUpdateCommand.java (55%) rename server/api-service/{openblocks-plugins/oraclePlugin/src/main/java/com/openblocks => lowcoder-plugins/oraclePlugin/src/main/java/org/lowcoder}/plugin/oracle/gui/OracleDeleteCommand.java (67%) rename server/api-service/{openblocks-plugins/oraclePlugin/src/main/java/com/openblocks => lowcoder-plugins/oraclePlugin/src/main/java/org/lowcoder}/plugin/oracle/gui/OracleInsertCommand.java (69%) rename server/api-service/{openblocks-plugins/oraclePlugin/src/main/java/com/openblocks => lowcoder-plugins/oraclePlugin/src/main/java/org/lowcoder}/plugin/oracle/gui/OracleUpdateCommand.java (72%) rename server/api-service/{openblocks-plugins/oraclePlugin/src/main/java/com/openblocks => lowcoder-plugins/oraclePlugin/src/main/java/org/lowcoder}/plugin/oracle/model/OracleDatasourceConfig.java (88%) rename server/api-service/{openblocks-plugins => lowcoder-plugins}/pom.xml (90%) create mode 100644 server/api-service/lowcoder-plugins/postgresPlugin/plugin.properties rename server/api-service/{openblocks-plugins => lowcoder-plugins}/postgresPlugin/pom.xml (93%) rename server/api-service/{openblocks-plugins/postgresPlugin/src/main/java/com/openblocks => lowcoder-plugins/postgresPlugin/src/main/java/org/lowcoder}/plugin/postgres/PostgresConnector.java (91%) rename server/api-service/{openblocks-plugins/postgresPlugin/src/main/java/com/openblocks => lowcoder-plugins/postgresPlugin/src/main/java/org/lowcoder}/plugin/postgres/PostgresExecutor.java (73%) rename server/api-service/{openblocks-plugins/postgresPlugin/src/main/java/com/openblocks => lowcoder-plugins/postgresPlugin/src/main/java/org/lowcoder}/plugin/postgres/PostgresPlugin.java (85%) rename server/api-service/{openblocks-plugins/postgresPlugin/src/main/java/com/openblocks => lowcoder-plugins/postgresPlugin/src/main/java/org/lowcoder}/plugin/postgres/model/DataType.java (94%) rename server/api-service/{openblocks-plugins/postgresPlugin/src/main/java/com/openblocks => lowcoder-plugins/postgresPlugin/src/main/java/org/lowcoder}/plugin/postgres/model/PostgresDatasourceConfig.java (81%) rename server/api-service/{openblocks-plugins/postgresPlugin/src/main/java/com/openblocks => lowcoder-plugins/postgresPlugin/src/main/java/org/lowcoder}/plugin/postgres/model/PostgresQueryConfig.java (83%) rename server/api-service/{openblocks-plugins/postgresPlugin/src/main/java/com/openblocks => lowcoder-plugins/postgresPlugin/src/main/java/org/lowcoder}/plugin/postgres/utils/PostgresDataTypeUtils.java (84%) rename server/api-service/{openblocks-plugins/postgresPlugin/src/main/java/com/openblocks => lowcoder-plugins/postgresPlugin/src/main/java/org/lowcoder}/plugin/postgres/utils/PostgresResultParser.java (97%) create mode 100644 server/api-service/lowcoder-plugins/redisPlugin/plugin.properties rename server/api-service/{openblocks-plugins => lowcoder-plugins}/redisPlugin/pom.xml (94%) rename server/api-service/{openblocks-plugins/redisPlugin/src/main/java/com/openblocks => lowcoder-plugins/redisPlugin/src/main/java/org/lowcoder}/plugin/redis/RedisError.java (57%) rename server/api-service/{openblocks-plugins/redisPlugin/src/main/java/com/openblocks => lowcoder-plugins/redisPlugin/src/main/java/org/lowcoder}/plugin/redis/RedisPlugin.java (86%) rename server/api-service/{openblocks-plugins/redisPlugin/src/main/java/com/openblocks => lowcoder-plugins/redisPlugin/src/main/java/org/lowcoder}/plugin/redis/commands/RedisCommand.java (87%) rename server/api-service/{openblocks-plugins/redisPlugin/src/main/java/com/openblocks => lowcoder-plugins/redisPlugin/src/main/java/org/lowcoder}/plugin/redis/constants/RedisConstants.java (89%) rename server/api-service/{openblocks-plugins/redisPlugin/src/main/java/com/openblocks => lowcoder-plugins/redisPlugin/src/main/java/org/lowcoder}/plugin/redis/constants/RedisFieldName.java (96%) rename server/api-service/{openblocks-plugins/redisPlugin/src/main/java/com/openblocks => lowcoder-plugins/redisPlugin/src/main/java/org/lowcoder}/plugin/redis/model/RedisDatasourceConfig.java (84%) rename server/api-service/{openblocks-plugins/redisPlugin/src/main/java/com/openblocks => lowcoder-plugins/redisPlugin/src/main/java/org/lowcoder}/plugin/redis/model/RedisQueryExecutionContext.java (71%) create mode 100644 server/api-service/lowcoder-plugins/redisPlugin/src/main/java/org/lowcoder/plugin/redis/utils/RedisQueryUtils.java rename server/api-service/{openblocks-plugins/redisPlugin/src/main/java/com/openblocks => lowcoder-plugins/redisPlugin/src/main/java/org/lowcoder}/plugin/redis/utils/RedisUriUtils.java (94%) create mode 100644 server/api-service/lowcoder-plugins/restApiPlugin/plugin.properties rename server/api-service/{openblocks-plugins => lowcoder-plugins}/restApiPlugin/pom.xml (96%) rename server/api-service/{openblocks-plugins/restApiPlugin/src/main/java/com/openblocks => lowcoder-plugins/restApiPlugin/src/main/java/org/lowcoder}/plugin/restapi/RestApiConnector.java (82%) rename server/api-service/{openblocks-plugins/restApiPlugin/src/main/java/com/openblocks => lowcoder-plugins/restApiPlugin/src/main/java/org/lowcoder}/plugin/restapi/RestApiError.java (53%) rename server/api-service/{openblocks-plugins/restApiPlugin/src/main/java/com/openblocks => lowcoder-plugins/restApiPlugin/src/main/java/org/lowcoder}/plugin/restapi/RestApiExecutor.java (88%) rename server/api-service/{openblocks-plugins/restApiPlugin/src/main/java/com/openblocks => lowcoder-plugins/restApiPlugin/src/main/java/org/lowcoder}/plugin/restapi/RestApiPlugin.java (82%) rename server/api-service/{openblocks-plugins/restApiPlugin/src/main/java/com/openblocks => lowcoder-plugins/restApiPlugin/src/main/java/org/lowcoder}/plugin/restapi/constants/ResponseDataType.java (60%) rename server/api-service/{openblocks-plugins/restApiPlugin/src/main/java/com/openblocks => lowcoder-plugins/restApiPlugin/src/main/java/org/lowcoder}/plugin/restapi/helpers/AuthHelper.java (94%) rename server/api-service/{openblocks-plugins/graphqlPlugin/src/main/java/com/openblocks/plugin/graphql => lowcoder-plugins/restApiPlugin/src/main/java/org/lowcoder/plugin/restapi}/helpers/BufferingFilter.java (97%) rename server/api-service/{openblocks-plugins/restApiPlugin/src/main/java/com/openblocks => lowcoder-plugins/restApiPlugin/src/main/java/org/lowcoder}/plugin/restapi/helpers/ContentTypeHelper.java (98%) rename server/api-service/{openblocks-plugins/restApiPlugin/src/main/java/com/openblocks => lowcoder-plugins/restApiPlugin/src/main/java/org/lowcoder}/plugin/restapi/model/QueryBody.java (85%) rename server/api-service/{openblocks-plugins/restApiPlugin/src/main/java/com/openblocks => lowcoder-plugins/restApiPlugin/src/main/java/org/lowcoder}/plugin/restapi/model/RestApiQueryConfig.java (84%) rename server/api-service/{openblocks-plugins/restApiPlugin/src/main/java/com/openblocks => lowcoder-plugins/restApiPlugin/src/main/java/org/lowcoder}/plugin/restapi/model/RestApiQueryExecutionContext.java (88%) rename server/api-service/{openblocks-plugins/restApiPlugin/src/test/java/com/openblocks => lowcoder-plugins/restApiPlugin/src/test/java/org/lowcoder}/plugin/restapi/AuthConfigTest.java (85%) rename server/api-service/{openblocks-plugins/restApiPlugin/src/test/java/com/openblocks => lowcoder-plugins/restApiPlugin/src/test/java/org/lowcoder}/plugin/restapi/RestApiEngineTest.java (97%) rename server/api-service/{openblocks-plugins/restApiPlugin/src/test/java/com/openblocks => lowcoder-plugins/restApiPlugin/src/test/java/org/lowcoder}/plugin/restapi/RestApiUriBuilderTest.java (55%) create mode 100644 server/api-service/lowcoder-plugins/smtpPlugin/plugin.properties rename server/api-service/{openblocks-plugins => lowcoder-plugins}/smtpPlugin/pom.xml (94%) rename server/api-service/{openblocks-plugins/smtpPlugin/src/main/java/com/openblocks => lowcoder-plugins/smtpPlugin/src/main/java/org/lowcoder}/plugins/SmtpDatasourceConfig.java (91%) rename server/api-service/{openblocks-plugins/smtpPlugin/src/main/java/com/openblocks => lowcoder-plugins/smtpPlugin/src/main/java/org/lowcoder}/plugins/SmtpPlugin.java (88%) rename server/api-service/{openblocks-plugins/smtpPlugin/src/main/java/com/openblocks => lowcoder-plugins/smtpPlugin/src/main/java/org/lowcoder}/plugins/SmtpQueryExecutionContext.java (88%) create mode 100644 server/api-service/lowcoder-plugins/snowflakePlugin/plugin.properties rename server/api-service/{openblocks-plugins => lowcoder-plugins}/snowflakePlugin/pom.xml (92%) rename server/api-service/{openblocks-plugins/snowflakePlugin/src/main/java/com/openblocks => lowcoder-plugins/snowflakePlugin/src/main/java/org/lowcoder}/plugin/snowflake/SnowflakeConnector.java (91%) rename server/api-service/{openblocks-plugins/snowflakePlugin/src/main/java/com/openblocks => lowcoder-plugins/snowflakePlugin/src/main/java/org/lowcoder}/plugin/snowflake/SnowflakeDatasourceConfig.java (85%) rename server/api-service/{openblocks-plugins/snowflakePlugin/src/main/java/com/openblocks => lowcoder-plugins/snowflakePlugin/src/main/java/org/lowcoder}/plugin/snowflake/SnowflakePlugin.java (82%) rename server/api-service/{openblocks-plugins/snowflakePlugin/src/main/java/com/openblocks => lowcoder-plugins/snowflakePlugin/src/main/java/org/lowcoder}/plugin/snowflake/SnowflakeQueryExecutor.java (83%) rename server/api-service/{openblocks-plugins => lowcoder-plugins}/sqlBasedPlugin/pom.xml (91%) rename server/api-service/{openblocks-plugins/sqlBasedPlugin/src/main/java/com/openblocks => lowcoder-plugins/sqlBasedPlugin/src/main/java/org/lowcoder}/plugin/sql/GeneralSqlExecutor.java (92%) rename server/api-service/{openblocks-plugins/sqlBasedPlugin/src/main/java/com/openblocks => lowcoder-plugins/sqlBasedPlugin/src/main/java/org/lowcoder}/plugin/sql/SqlBasedConnector.java (90%) rename server/api-service/{openblocks-plugins/sqlBasedPlugin/src/main/java/com/openblocks => lowcoder-plugins/sqlBasedPlugin/src/main/java/org/lowcoder}/plugin/sql/SqlBasedQueryExecutor.java (83%) rename server/api-service/{openblocks-plugins/sqlBasedPlugin/src/main/java/com/openblocks => lowcoder-plugins/sqlBasedPlugin/src/main/java/org/lowcoder}/plugin/sql/SqlQueryConfig.java (84%) rename server/api-service/{openblocks-sdk => lowcoder-sdk}/pom.xml (97%) rename server/api-service/{openblocks-sdk/src/main/java/com/openblocks => lowcoder-sdk/src/main/java/org/lowcoder}/sdk/auth/AbstractAuthConfig.java (98%) rename server/api-service/{openblocks-sdk/src/main/java/com/openblocks => lowcoder-sdk/src/main/java/org/lowcoder}/sdk/auth/EmailAuthConfig.java (67%) rename server/api-service/{openblocks-sdk/src/main/java/com/openblocks => lowcoder-sdk/src/main/java/org/lowcoder}/sdk/auth/Oauth2SimpleAuthConfig.java (90%) rename server/api-service/{openblocks-sdk/src/main/java/com/openblocks => lowcoder-sdk/src/main/java/org/lowcoder}/sdk/auth/constants/AuthTypeConstants.java (65%) rename server/api-service/{openblocks-sdk/src/main/java/com/openblocks => lowcoder-sdk/src/main/java/org/lowcoder}/sdk/auth/constants/Oauth2Constants.java (95%) rename server/api-service/{openblocks-sdk/src/main/java/com/openblocks => lowcoder-sdk/src/main/java/org/lowcoder}/sdk/config/AuthProperties.java (79%) rename server/api-service/{openblocks-sdk/src/main/java/com/openblocks => lowcoder-sdk/src/main/java/org/lowcoder}/sdk/config/CommonConfig.java (96%) rename server/api-service/{openblocks-sdk/src/main/java/com/openblocks => lowcoder-sdk/src/main/java/org/lowcoder}/sdk/config/CommonConfigHelper.java (78%) rename server/api-service/{openblocks-sdk/src/main/java/com/openblocks => lowcoder-sdk/src/main/java/org/lowcoder}/sdk/config/MaterialProperties.java (92%) rename server/api-service/{openblocks-sdk/src/main/java/com/openblocks => lowcoder-sdk/src/main/java/org/lowcoder}/sdk/config/SerializeConfig.java (85%) rename server/api-service/{openblocks-sdk/src/main/java/com/openblocks => lowcoder-sdk/src/main/java/org/lowcoder}/sdk/config/dynamic/Conf.java (84%) rename server/api-service/{openblocks-sdk/src/main/java/com/openblocks => lowcoder-sdk/src/main/java/org/lowcoder}/sdk/config/dynamic/ConfigCenter.java (91%) rename server/api-service/{openblocks-sdk/src/main/java/com/openblocks => lowcoder-sdk/src/main/java/org/lowcoder}/sdk/config/dynamic/ConfigCenterForTest.java (97%) rename server/api-service/{openblocks-sdk/src/main/java/com/openblocks => lowcoder-sdk/src/main/java/org/lowcoder}/sdk/config/dynamic/ConfigInstance.java (94%) rename server/api-service/{openblocks-sdk/src/main/java/com/openblocks => lowcoder-sdk/src/main/java/org/lowcoder}/sdk/config/dynamic/ConfigInstanceHelper.java (97%) rename server/api-service/{openblocks-sdk/src/main/java/com/openblocks => lowcoder-sdk/src/main/java/org/lowcoder}/sdk/config/dynamic/StaticConf.java (93%) rename server/api-service/{openblocks-sdk/src/main/java/com/openblocks => lowcoder-sdk/src/main/java/org/lowcoder}/sdk/config/dynamic/StaticConfigInstanceImpl.java (97%) rename server/api-service/{openblocks-sdk/src/main/java/com/openblocks => lowcoder-sdk/src/main/java/org/lowcoder}/sdk/constants/AuthSourceConstants.java (85%) rename server/api-service/{openblocks-sdk/src/main/java/com/openblocks => lowcoder-sdk/src/main/java/org/lowcoder}/sdk/constants/Authentication.java (90%) rename server/api-service/{openblocks-sdk/src/main/java/com/openblocks => lowcoder-sdk/src/main/java/org/lowcoder}/sdk/constants/ConfigTypes.java (86%) rename server/api-service/{openblocks-sdk/src/main/java/com/openblocks => lowcoder-sdk/src/main/java/org/lowcoder}/sdk/constants/DslConstants.java (92%) rename server/api-service/{openblocks-sdk/src/main/java/com/openblocks => lowcoder-sdk/src/main/java/org/lowcoder}/sdk/constants/FieldName.java (89%) rename server/api-service/{openblocks-sdk/src/main/java/com/openblocks => lowcoder-sdk/src/main/java/org/lowcoder}/sdk/constants/GlobalContext.java (94%) rename server/api-service/{openblocks-sdk/src/main/java/com/openblocks => lowcoder-sdk/src/main/java/org/lowcoder}/sdk/constants/WorkspaceMode.java (60%) rename server/api-service/{openblocks-sdk/src/main/java/com/openblocks => lowcoder-sdk/src/main/java/org/lowcoder}/sdk/destructor/DestructorUtil.java (95%) rename server/api-service/{openblocks-sdk/src/main/java/com/openblocks => lowcoder-sdk/src/main/java/org/lowcoder}/sdk/event/BeforeSaveEvent.java (58%) rename server/api-service/{openblocks-sdk/src/main/java/com/openblocks => lowcoder-sdk/src/main/java/org/lowcoder}/sdk/exception/BaseException.java (80%) rename server/api-service/{openblocks-sdk/src/main/java/com/openblocks => lowcoder-sdk/src/main/java/org/lowcoder}/sdk/exception/BizError.java (95%) rename server/api-service/{openblocks-sdk/src/main/java/com/openblocks => lowcoder-sdk/src/main/java/org/lowcoder}/sdk/exception/BizException.java (92%) rename server/api-service/{openblocks-sdk/src/main/java/com/openblocks => lowcoder-sdk/src/main/java/org/lowcoder}/sdk/exception/ErrorLogType.java (59%) rename server/api-service/{openblocks-sdk/src/main/java/com/openblocks => lowcoder-sdk/src/main/java/org/lowcoder}/sdk/exception/InvalidHikariDatasourceException.java (64%) rename server/api-service/{openblocks-sdk/src/main/java/com/openblocks => lowcoder-sdk/src/main/java/org/lowcoder}/sdk/exception/PluginCommonError.java (96%) rename server/api-service/{openblocks-sdk/src/main/java/com/openblocks => lowcoder-sdk/src/main/java/org/lowcoder}/sdk/exception/PluginError.java (81%) rename server/api-service/{openblocks-sdk/src/main/java/com/openblocks => lowcoder-sdk/src/main/java/org/lowcoder}/sdk/exception/PluginException.java (91%) rename server/api-service/{openblocks-sdk/src/main/java/com/openblocks => lowcoder-sdk/src/main/java/org/lowcoder}/sdk/exception/ServerException.java (88%) rename server/api-service/{openblocks-sdk/src/main/java/com/openblocks => lowcoder-sdk/src/main/java/org/lowcoder}/sdk/models/DatasourceConnectionConfig.java (92%) rename server/api-service/{openblocks-sdk/src/main/java/com/openblocks => lowcoder-sdk/src/main/java/org/lowcoder}/sdk/models/DatasourceStructure.java (99%) rename server/api-service/{openblocks-sdk/src/main/java/com/openblocks => lowcoder-sdk/src/main/java/org/lowcoder}/sdk/models/DatasourceTestResult.java (92%) rename server/api-service/{openblocks-sdk/src/main/java/com/openblocks => lowcoder-sdk/src/main/java/org/lowcoder}/sdk/models/Encrypt.java (86%) rename server/api-service/{openblocks-sdk/src/main/java/com/openblocks => lowcoder-sdk/src/main/java/org/lowcoder}/sdk/models/Endpoint.java (94%) rename server/api-service/{openblocks-sdk/src/main/java/com/openblocks => lowcoder-sdk/src/main/java/org/lowcoder}/sdk/models/HasIdAndAuditing.java (97%) rename server/api-service/{openblocks-sdk/src/main/java/com/openblocks => lowcoder-sdk/src/main/java/org/lowcoder}/sdk/models/JsDatasourceConnectionConfig.java (97%) rename server/api-service/{openblocks-sdk/src/main/java/com/openblocks => lowcoder-sdk/src/main/java/org/lowcoder}/sdk/models/LocaleMessage.java (82%) rename server/api-service/{openblocks-sdk/src/main/java/com/openblocks => lowcoder-sdk/src/main/java/org/lowcoder}/sdk/models/Param.java (93%) rename server/api-service/{openblocks-sdk/src/main/java/com/openblocks => lowcoder-sdk/src/main/java/org/lowcoder}/sdk/models/Property.java (88%) rename server/api-service/{openblocks-sdk/src/main/java/com/openblocks => lowcoder-sdk/src/main/java/org/lowcoder}/sdk/models/QueryExecutionResult.java (95%) rename server/api-service/{openblocks-sdk/src/main/java/com/openblocks => lowcoder-sdk/src/main/java/org/lowcoder}/sdk/models/RestBodyFormFileData.java (78%) rename server/api-service/{openblocks-sdk/src/main/java/com/openblocks => lowcoder-sdk/src/main/java/org/lowcoder}/sdk/models/TokenBasedConnectionDetail.java (86%) rename server/api-service/{openblocks-sdk/src/main/java/com/openblocks => lowcoder-sdk/src/main/java/org/lowcoder}/sdk/models/VersionedModel.java (74%) rename server/api-service/{openblocks-sdk/src/main/java/com/openblocks => lowcoder-sdk/src/main/java/org/lowcoder}/sdk/plugin/common/BlockingDatasourceConnector.java (84%) rename server/api-service/{openblocks-sdk/src/main/java/com/openblocks => lowcoder-sdk/src/main/java/org/lowcoder}/sdk/plugin/common/BlockingQueryExecutor.java (77%) rename server/api-service/{openblocks-sdk/src/main/java/com/openblocks => lowcoder-sdk/src/main/java/org/lowcoder}/sdk/plugin/common/DatasourceConnector.java (83%) rename server/api-service/{openblocks-sdk/src/main/java/com/openblocks => lowcoder-sdk/src/main/java/org/lowcoder}/sdk/plugin/common/DatasourceQueryEngine.java (76%) rename server/api-service/{openblocks-sdk/src/main/java/com/openblocks => lowcoder-sdk/src/main/java/org/lowcoder}/sdk/plugin/common/QueryExecutionUtils.java (98%) rename server/api-service/{openblocks-sdk/src/main/java/com/openblocks => lowcoder-sdk/src/main/java/org/lowcoder}/sdk/plugin/common/QueryExecutor.java (86%) rename server/api-service/{openblocks-sdk/src/main/java/com/openblocks => lowcoder-sdk/src/main/java/org/lowcoder}/sdk/plugin/common/RestApiUriBuilder.java (85%) rename server/api-service/{openblocks-sdk/src/main/java/com/openblocks => lowcoder-sdk/src/main/java/org/lowcoder}/sdk/plugin/common/SqlQueryUtils.java (97%) rename server/api-service/{openblocks-sdk/src/main/java/com/openblocks => lowcoder-sdk/src/main/java/org/lowcoder}/sdk/plugin/common/constant/Constants.java (93%) rename server/api-service/{openblocks-sdk/src/main/java/com/openblocks => lowcoder-sdk/src/main/java/org/lowcoder}/sdk/plugin/common/sql/HikariPerfWrapper.java (98%) rename server/api-service/{openblocks-sdk/src/main/java/com/openblocks => lowcoder-sdk/src/main/java/org/lowcoder}/sdk/plugin/common/sql/ResultSetParser.java (97%) rename server/api-service/{openblocks-sdk/src/main/java/com/openblocks => lowcoder-sdk/src/main/java/org/lowcoder}/sdk/plugin/common/sql/SqlBasedDatasourceConnectionConfig.java (93%) rename server/api-service/{openblocks-sdk/src/main/java/com/openblocks => lowcoder-sdk/src/main/java/org/lowcoder}/sdk/plugin/common/sql/SqlBasedQueryExecutionContext.java (88%) rename server/api-service/{openblocks-sdk/src/main/java/com/openblocks => lowcoder-sdk/src/main/java/org/lowcoder}/sdk/plugin/common/sql/StructureParser.java (86%) rename server/api-service/{openblocks-sdk/src/main/java/com/openblocks => lowcoder-sdk/src/main/java/org/lowcoder}/sdk/plugin/common/ssl/DisableVerifySslConfig.java (85%) rename server/api-service/{openblocks-sdk/src/main/java/com/openblocks => lowcoder-sdk/src/main/java/org/lowcoder}/sdk/plugin/common/ssl/SslCertVerificationType.java (69%) rename server/api-service/{openblocks-sdk/src/main/java/com/openblocks => lowcoder-sdk/src/main/java/org/lowcoder}/sdk/plugin/common/ssl/SslConfig.java (91%) rename server/api-service/{openblocks-sdk/src/main/java/com/openblocks => lowcoder-sdk/src/main/java/org/lowcoder}/sdk/plugin/common/ssl/SslHelper.java (87%) rename server/api-service/{openblocks-sdk/src/main/java/com/openblocks => lowcoder-sdk/src/main/java/org/lowcoder}/sdk/plugin/common/ssl/VerifyCACertSslConfig.java (84%) rename server/api-service/{openblocks-sdk/src/main/java/com/openblocks => lowcoder-sdk/src/main/java/org/lowcoder}/sdk/plugin/common/ssl/VerifySelfSignedCertSslConfig.java (93%) rename server/api-service/{openblocks-sdk/src/main/java/com/openblocks => lowcoder-sdk/src/main/java/org/lowcoder}/sdk/plugin/graphql/GraphQLDatasourceConfig.java (85%) rename server/api-service/{openblocks-sdk/src/main/java/com/openblocks => lowcoder-sdk/src/main/java/org/lowcoder}/sdk/plugin/http/RawHttpHandlerHelper.java (96%) rename server/api-service/{openblocks-sdk/src/main/java/com/openblocks => lowcoder-sdk/src/main/java/org/lowcoder}/sdk/plugin/http/RawHttpRequest.java (88%) create mode 100644 server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/plugin/lowcoderapi/LowcoderApiDatasourceConfig.java rename server/api-service/{openblocks-sdk/src/main/java/com/openblocks => lowcoder-sdk/src/main/java/org/lowcoder}/sdk/plugin/mysql/MysqlDatasourceConfig.java (81%) rename server/api-service/{openblocks-sdk/src/main/java/com/openblocks => lowcoder-sdk/src/main/java/org/lowcoder}/sdk/plugin/restapi/DataUtils.java (94%) rename server/api-service/{openblocks-sdk/src/main/java/com/openblocks => lowcoder-sdk/src/main/java/org/lowcoder}/sdk/plugin/restapi/MultipartFormData.java (87%) rename server/api-service/{openblocks-sdk/src/main/java/com/openblocks => lowcoder-sdk/src/main/java/org/lowcoder}/sdk/plugin/restapi/RestApiDatasourceConfig.java (86%) rename server/api-service/{openblocks-sdk/src/main/java/com/openblocks => lowcoder-sdk/src/main/java/org/lowcoder}/sdk/plugin/restapi/auth/AuthConfig.java (91%) rename server/api-service/{openblocks-sdk/src/main/java/com/openblocks => lowcoder-sdk/src/main/java/org/lowcoder}/sdk/plugin/restapi/auth/BasicAuthConfig.java (93%) rename server/api-service/{openblocks-sdk/src/main/java/com/openblocks => lowcoder-sdk/src/main/java/org/lowcoder}/sdk/plugin/restapi/auth/DefaultAuthConfig.java (81%) rename server/api-service/{openblocks-sdk/src/main/java/com/openblocks => lowcoder-sdk/src/main/java/org/lowcoder}/sdk/plugin/restapi/auth/NoneAuthConfig.java (80%) rename server/api-service/{openblocks-sdk/src/main/java/com/openblocks => lowcoder-sdk/src/main/java/org/lowcoder}/sdk/plugin/restapi/auth/RestApiAuthType.java (75%) rename server/api-service/{openblocks-sdk/src/main/java/com/openblocks => lowcoder-sdk/src/main/java/org/lowcoder}/sdk/plugin/sheet/changeset/SheetBulkObjectChangeSet.java (75%) rename server/api-service/{openblocks-sdk/src/main/java/com/openblocks => lowcoder-sdk/src/main/java/org/lowcoder}/sdk/plugin/sheet/changeset/SheetChangeSet.java (73%) rename server/api-service/{openblocks-sdk/src/main/java/com/openblocks => lowcoder-sdk/src/main/java/org/lowcoder}/sdk/plugin/sheet/changeset/SheetChangeSetItem.java (59%) rename server/api-service/{openblocks-sdk/src/main/java/com/openblocks => lowcoder-sdk/src/main/java/org/lowcoder}/sdk/plugin/sheet/changeset/SheetChangeSetRow.java (89%) rename server/api-service/{openblocks-sdk/src/main/java/com/openblocks => lowcoder-sdk/src/main/java/org/lowcoder}/sdk/plugin/sheet/changeset/SheetChangeSetRows.java (84%) rename server/api-service/{openblocks-sdk/src/main/java/com/openblocks => lowcoder-sdk/src/main/java/org/lowcoder}/sdk/plugin/sheet/changeset/SheetKeyValuePairChangeSet.java (85%) rename server/api-service/{openblocks-sdk/src/main/java/com/openblocks => lowcoder-sdk/src/main/java/org/lowcoder}/sdk/plugin/sheet/changeset/SheetObjectChangeSet.java (65%) rename server/api-service/{openblocks-sdk/src/main/java/com/openblocks => lowcoder-sdk/src/main/java/org/lowcoder}/sdk/plugin/sqlcommand/GuiSqlCommand.java (78%) rename server/api-service/{openblocks-sdk/src/main/java/com/openblocks => lowcoder-sdk/src/main/java/org/lowcoder}/sdk/plugin/sqlcommand/changeset/BulkObjectChangeSet.java (76%) rename server/api-service/{openblocks-sdk/src/main/java/com/openblocks => lowcoder-sdk/src/main/java/org/lowcoder}/sdk/plugin/sqlcommand/changeset/ChangeSet.java (74%) create mode 100644 server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/plugin/sqlcommand/changeset/ChangeSetItem.java rename server/api-service/{openblocks-sdk/src/main/java/com/openblocks => lowcoder-sdk/src/main/java/org/lowcoder}/sdk/plugin/sqlcommand/changeset/ChangeSetRow.java (89%) rename server/api-service/{openblocks-sdk/src/main/java/com/openblocks => lowcoder-sdk/src/main/java/org/lowcoder}/sdk/plugin/sqlcommand/changeset/ChangeSetRows.java (91%) rename server/api-service/{openblocks-sdk/src/main/java/com/openblocks => lowcoder-sdk/src/main/java/org/lowcoder}/sdk/plugin/sqlcommand/changeset/KeyValuePairChangeSet.java (87%) rename server/api-service/{openblocks-sdk/src/main/java/com/openblocks => lowcoder-sdk/src/main/java/org/lowcoder}/sdk/plugin/sqlcommand/changeset/ObjectChangeSet.java (76%) rename server/api-service/{openblocks-sdk/src/main/java/com/openblocks => lowcoder-sdk/src/main/java/org/lowcoder}/sdk/plugin/sqlcommand/command/BulkInsertCommand.java (85%) rename server/api-service/{openblocks-sdk/src/main/java/com/openblocks => lowcoder-sdk/src/main/java/org/lowcoder}/sdk/plugin/sqlcommand/command/BulkUpdateCommand.java (92%) rename server/api-service/{openblocks-sdk/src/main/java/com/openblocks => lowcoder-sdk/src/main/java/org/lowcoder}/sdk/plugin/sqlcommand/command/DeleteCommand.java (90%) rename server/api-service/{openblocks-sdk/src/main/java/com/openblocks => lowcoder-sdk/src/main/java/org/lowcoder}/sdk/plugin/sqlcommand/command/GuiConstants.java (78%) rename server/api-service/{openblocks-sdk/src/main/java/com/openblocks => lowcoder-sdk/src/main/java/org/lowcoder}/sdk/plugin/sqlcommand/command/InsertCommand.java (86%) rename server/api-service/{openblocks-sdk/src/main/java/com/openblocks => lowcoder-sdk/src/main/java/org/lowcoder}/sdk/plugin/sqlcommand/command/UpdateCommand.java (86%) rename server/api-service/{openblocks-sdk/src/main/java/com/openblocks => lowcoder-sdk/src/main/java/org/lowcoder}/sdk/plugin/sqlcommand/command/UpdateOrDeleteSingleCommandRenderResult.java (83%) rename server/api-service/{openblocks-sdk/src/main/java/com/openblocks => lowcoder-sdk/src/main/java/org/lowcoder}/sdk/plugin/sqlcommand/command/UpsertCommand.java (88%) rename server/api-service/{openblocks-sdk/src/main/java/com/openblocks => lowcoder-sdk/src/main/java/org/lowcoder}/sdk/plugin/sqlcommand/command/mysql/MysqlBulkInsertCommand.java (58%) rename server/api-service/{openblocks-sdk/src/main/java/com/openblocks => lowcoder-sdk/src/main/java/org/lowcoder}/sdk/plugin/sqlcommand/command/mysql/MysqlBulkUpdateCommand.java (55%) rename server/api-service/{openblocks-sdk/src/main/java/com/openblocks => lowcoder-sdk/src/main/java/org/lowcoder}/sdk/plugin/sqlcommand/command/mysql/MysqlDeleteCommand.java (60%) rename server/api-service/{openblocks-sdk/src/main/java/com/openblocks => lowcoder-sdk/src/main/java/org/lowcoder}/sdk/plugin/sqlcommand/command/mysql/MysqlInsertCommand.java (67%) rename server/api-service/{openblocks-sdk/src/main/java/com/openblocks => lowcoder-sdk/src/main/java/org/lowcoder}/sdk/plugin/sqlcommand/command/mysql/MysqlUpdateCommand.java (66%) rename server/api-service/{openblocks-sdk/src/main/java/com/openblocks => lowcoder-sdk/src/main/java/org/lowcoder}/sdk/plugin/sqlcommand/command/mysql/MysqlUpsertCommand.java (68%) rename server/api-service/{openblocks-sdk/src/main/java/com/openblocks => lowcoder-sdk/src/main/java/org/lowcoder}/sdk/plugin/sqlcommand/command/postgres/PostgresBulkInsertCommand.java (58%) rename server/api-service/{openblocks-sdk/src/main/java/com/openblocks => lowcoder-sdk/src/main/java/org/lowcoder}/sdk/plugin/sqlcommand/command/postgres/PostgresBulkUpdateCommand.java (56%) rename server/api-service/{openblocks-sdk/src/main/java/com/openblocks => lowcoder-sdk/src/main/java/org/lowcoder}/sdk/plugin/sqlcommand/command/postgres/PostgresDeleteCommand.java (75%) rename server/api-service/{openblocks-sdk/src/main/java/com/openblocks => lowcoder-sdk/src/main/java/org/lowcoder}/sdk/plugin/sqlcommand/command/postgres/PostgresInsertCommand.java (64%) rename server/api-service/{openblocks-sdk/src/main/java/com/openblocks => lowcoder-sdk/src/main/java/org/lowcoder}/sdk/plugin/sqlcommand/command/postgres/PostgresUpdateCommand.java (72%) rename server/api-service/{openblocks-sdk/src/main/java/com/openblocks => lowcoder-sdk/src/main/java/org/lowcoder}/sdk/plugin/sqlcommand/filter/FilterSet.java (91%) rename server/api-service/{openblocks-sdk/src/main/java/com/openblocks => lowcoder-sdk/src/main/java/org/lowcoder}/sdk/query/QueryExecutionContext.java (87%) rename server/api-service/{openblocks-sdk/src/main/java/com/openblocks => lowcoder-sdk/src/main/java/org/lowcoder}/sdk/query/QueryVisitorContext.java (92%) rename server/api-service/{openblocks-sdk/src/main/java/com/openblocks => lowcoder-sdk/src/main/java/org/lowcoder}/sdk/test/JsonFileReader.java (96%) rename server/api-service/{openblocks-sdk/src/main/java/com/openblocks => lowcoder-sdk/src/main/java/org/lowcoder}/sdk/util/CookieHelper.java (90%) rename server/api-service/{openblocks-sdk/src/main/java/com/openblocks => lowcoder-sdk/src/main/java/org/lowcoder}/sdk/util/DateTimeUtils.java (95%) rename server/api-service/{openblocks-sdk/src/main/java/com/openblocks => lowcoder-sdk/src/main/java/org/lowcoder}/sdk/util/EnterpriseEdition.java (88%) rename server/api-service/{openblocks-sdk/src/main/java/com/openblocks => lowcoder-sdk/src/main/java/org/lowcoder}/sdk/util/EnumUtils.java (93%) rename server/api-service/{openblocks-sdk/src/main/java/com/openblocks => lowcoder-sdk/src/main/java/org/lowcoder}/sdk/util/ExceptionUtils.java (90%) rename server/api-service/{openblocks-sdk/src/main/java/com/openblocks => lowcoder-sdk/src/main/java/org/lowcoder}/sdk/util/HashUtils.java (87%) rename server/api-service/{openblocks-sdk/src/main/java/com/openblocks => lowcoder-sdk/src/main/java/org/lowcoder}/sdk/util/HttpUtils.java (99%) rename server/api-service/{openblocks-sdk/src/main/java/com/openblocks => lowcoder-sdk/src/main/java/org/lowcoder}/sdk/util/IDUtils.java (82%) rename server/api-service/{openblocks-sdk/src/main/java/com/openblocks => lowcoder-sdk/src/main/java/org/lowcoder}/sdk/util/JsonUtils.java (94%) rename server/api-service/{openblocks-sdk/src/main/java/com/openblocks => lowcoder-sdk/src/main/java/org/lowcoder}/sdk/util/LocaleUtils.java (92%) rename server/api-service/{openblocks-sdk/src/main/java/com/openblocks => lowcoder-sdk/src/main/java/org/lowcoder}/sdk/util/MediaTypeUtils.java (98%) rename server/api-service/{openblocks-sdk/src/main/java/com/openblocks => lowcoder-sdk/src/main/java/org/lowcoder}/sdk/util/MoreMapUtils.java (97%) rename server/api-service/{openblocks-sdk/src/main/java/com/openblocks => lowcoder-sdk/src/main/java/org/lowcoder}/sdk/util/MustacheHelper.java (98%) rename server/api-service/{openblocks-sdk/src/main/java/com/openblocks => lowcoder-sdk/src/main/java/org/lowcoder}/sdk/util/Preconditions.java (66%) rename server/api-service/{openblocks-sdk/src/main/java/com/openblocks => lowcoder-sdk/src/main/java/org/lowcoder}/sdk/util/RjsonMustacheParser.java (92%) rename server/api-service/{openblocks-sdk/src/main/java/com/openblocks => lowcoder-sdk/src/main/java/org/lowcoder}/sdk/util/RjsonParser.java (94%) rename server/api-service/{openblocks-sdk/src/main/java/com/openblocks => lowcoder-sdk/src/main/java/org/lowcoder}/sdk/util/SqlGuiUtils.java (92%) rename server/api-service/{openblocks-sdk/src/main/java/com/openblocks => lowcoder-sdk/src/main/java/org/lowcoder}/sdk/util/StreamUtils.java (98%) rename server/api-service/{openblocks-sdk/src/main/java/com/openblocks => lowcoder-sdk/src/main/java/org/lowcoder}/sdk/util/UriUtils.java (95%) rename server/api-service/{openblocks-sdk/src/main/java/com/openblocks => lowcoder-sdk/src/main/java/org/lowcoder}/sdk/webclient/SafeHostResolverGroup.java (98%) rename server/api-service/{openblocks-sdk/src/main/java/com/openblocks => lowcoder-sdk/src/main/java/org/lowcoder}/sdk/webclient/WebClientBuildHelper.java (93%) rename server/api-service/{openblocks-sdk/src/main/java/com/openblocks => lowcoder-sdk/src/main/java/org/lowcoder}/sdk/webclient/WebClients.java (86%) rename server/api-service/{openblocks-sdk => lowcoder-sdk}/src/main/resources/locale_en.properties (98%) rename server/api-service/{openblocks-sdk => lowcoder-sdk}/src/main/resources/logback-spring.xml (97%) rename server/api-service/{openblocks-sdk/src/test/java/com/openblocks => lowcoder-sdk/src/test/java/org/lowcoder}/sdk/helpers/MustacheHelperTest.java (98%) rename server/api-service/{openblocks-sdk/src/test/java/com/openblocks => lowcoder-sdk/src/test/java/org/lowcoder}/sdk/plugin/sqlcommand/command/mysql/MysqlGuiCommandTest.java (92%) rename server/api-service/{openblocks-sdk/src/test/java/com/openblocks => lowcoder-sdk/src/test/java/org/lowcoder}/sdk/plugin/sqlcommand/command/postgres/PostgresCommandTest.java (88%) rename server/api-service/{openblocks-server => lowcoder-server}/pom.xml (84%) rename server/api-service/{openblocks-server/src/main/java/com/openblocks => lowcoder-server/src/main/java/org/lowcoder}/api/ServerApplication.java (90%) rename server/api-service/{openblocks-server/src/main/java/com/openblocks => lowcoder-server/src/main/java/org/lowcoder}/api/application/ApplicationApiService.java (88%) rename server/api-service/{openblocks-server/src/main/java/com/openblocks => lowcoder-server/src/main/java/org/lowcoder}/api/application/ApplicationController.java (87%) rename server/api-service/{openblocks-server/src/main/java/com/openblocks => lowcoder-server/src/main/java/org/lowcoder}/api/application/ApplicationHistorySnapshotController.java (87%) rename server/api-service/{openblocks-server/src/main/java/com/openblocks => lowcoder-server/src/main/java/org/lowcoder}/api/application/CompoundApplicationDslFilter.java (86%) rename server/api-service/{openblocks-server/src/main/java/com/openblocks => lowcoder-server/src/main/java/org/lowcoder}/api/application/view/ApplicationInfoView.java (85%) rename server/api-service/{openblocks-server/src/main/java/com/openblocks => lowcoder-server/src/main/java/org/lowcoder}/api/application/view/ApplicationPermissionView.java (68%) rename server/api-service/{openblocks-server/src/main/java/com/openblocks => lowcoder-server/src/main/java/org/lowcoder}/api/application/view/ApplicationView.java (89%) rename server/api-service/{openblocks-server/src/main/java/com/openblocks => lowcoder-server/src/main/java/org/lowcoder}/api/application/view/HistorySnapshotDslView.java (84%) rename server/api-service/{openblocks-server/src/main/java/com/openblocks => lowcoder-server/src/main/java/org/lowcoder}/api/authentication/AuthenticationController.java (83%) rename server/api-service/{openblocks-server/src/main/java/com/openblocks => lowcoder-server/src/main/java/org/lowcoder}/api/authentication/dto/AuthConfigRequest.java (93%) rename server/api-service/{openblocks-server/src/main/java/com/openblocks => lowcoder-server/src/main/java/org/lowcoder}/api/authentication/dto/AuthUserBindEndMessage.java (77%) rename server/api-service/{openblocks-server/src/main/java/com/openblocks => lowcoder-server/src/main/java/org/lowcoder}/api/authentication/dto/OrganizationDomainCheckResult.java (85%) rename server/api-service/{openblocks-server/src/main/java/com/openblocks => lowcoder-server/src/main/java/org/lowcoder}/api/authentication/dto/RedirectView.java (72%) rename server/api-service/{openblocks-server/src/main/java/com/openblocks => lowcoder-server/src/main/java/org/lowcoder}/api/authentication/dto/UserLoginEndMessage.java (73%) rename server/api-service/{openblocks-server/src/main/java/com/openblocks => lowcoder-server/src/main/java/org/lowcoder}/api/authentication/request/AbstractBlockedAuthRequest.java (60%) rename server/api-service/{openblocks-server/src/main/java/com/openblocks => lowcoder-server/src/main/java/org/lowcoder}/api/authentication/request/AuthException.java (68%) rename server/api-service/{openblocks-server/src/main/java/com/openblocks => lowcoder-server/src/main/java/org/lowcoder}/api/authentication/request/AuthRequest.java (57%) rename server/api-service/{openblocks-server/src/main/java/com/openblocks => lowcoder-server/src/main/java/org/lowcoder}/api/authentication/request/AuthRequestFactory.java (63%) rename server/api-service/{openblocks-server/src/main/java/com/openblocks => lowcoder-server/src/main/java/org/lowcoder}/api/authentication/request/AuthRequestFactoryFacade.java (89%) rename server/api-service/{openblocks-server/src/main/java/com/openblocks => lowcoder-server/src/main/java/org/lowcoder}/api/authentication/request/form/FormAuthRequest.java (75%) rename server/api-service/{openblocks-server/src/main/java/com/openblocks => lowcoder-server/src/main/java/org/lowcoder}/api/authentication/request/form/FormAuthRequestFactory.java (64%) rename server/api-service/{openblocks-server/src/main/java/com/openblocks => lowcoder-server/src/main/java/org/lowcoder}/api/authentication/request/oauth2/OAuth2RequestContext.java (70%) rename server/api-service/{openblocks-server/src/main/java/com/openblocks => lowcoder-server/src/main/java/org/lowcoder}/api/authentication/request/oauth2/Oauth2AuthRequestFactory.java (60%) rename server/api-service/{openblocks-server/src/main/java/com/openblocks => lowcoder-server/src/main/java/org/lowcoder}/api/authentication/request/oauth2/Oauth2DefaultSource.java (87%) rename server/api-service/{openblocks-server/src/main/java/com/openblocks => lowcoder-server/src/main/java/org/lowcoder}/api/authentication/request/oauth2/Oauth2Source.java (82%) rename server/api-service/{openblocks-server/src/main/java/com/openblocks => lowcoder-server/src/main/java/org/lowcoder}/api/authentication/request/oauth2/request/AbstractOauth2Request.java (57%) rename server/api-service/{openblocks-server/src/main/java/com/openblocks => lowcoder-server/src/main/java/org/lowcoder}/api/authentication/request/oauth2/request/GithubRequest.java (84%) rename server/api-service/{openblocks-server/src/main/java/com/openblocks => lowcoder-server/src/main/java/org/lowcoder}/api/authentication/request/oauth2/request/GoogleRequest.java (83%) rename server/api-service/{openblocks-server/src/main/java/com/openblocks => lowcoder-server/src/main/java/org/lowcoder}/api/authentication/service/AuthenticationApiService.java (78%) rename server/api-service/{openblocks-server/src/main/java/com/openblocks => lowcoder-server/src/main/java/org/lowcoder}/api/authentication/service/AuthenticationApiServiceImpl.java (86%) rename server/api-service/{openblocks-server/src/main/java/com/openblocks => lowcoder-server/src/main/java/org/lowcoder}/api/authentication/service/factory/AuthConfigFactory.java (51%) rename server/api-service/{openblocks-server/src/main/java/com/openblocks => lowcoder-server/src/main/java/org/lowcoder}/api/authentication/service/factory/AuthConfigFactoryFacade.java (88%) rename server/api-service/{openblocks-server/src/main/java/com/openblocks => lowcoder-server/src/main/java/org/lowcoder}/api/authentication/service/factory/AuthConfigFactoryImpl.java (75%) rename server/api-service/{openblocks-server/src/main/java/com/openblocks => lowcoder-server/src/main/java/org/lowcoder}/api/authentication/util/AuthenticationUtils.java (94%) rename server/api-service/{openblocks-server/src/main/java/com/openblocks => lowcoder-server/src/main/java/org/lowcoder}/api/authentication/util/SmsVerificationUtils.java (92%) rename server/api-service/{openblocks-server/src/main/java/com/openblocks => lowcoder-server/src/main/java/org/lowcoder}/api/bizthreshold/AbstractBizThresholdChecker.java (85%) rename server/api-service/{openblocks-server/src/main/java/com/openblocks => lowcoder-server/src/main/java/org/lowcoder}/api/bizthreshold/BizThresholdChecker.java (92%) rename server/api-service/{openblocks-server/src/main/java/com/openblocks => lowcoder-server/src/main/java/org/lowcoder}/api/config/ConfigController.java (79%) rename server/api-service/{openblocks-server/src/main/java/com/openblocks => lowcoder-server/src/main/java/org/lowcoder}/api/config/ConfigView.java (76%) rename server/api-service/{openblocks-server/src/main/java/com/openblocks => lowcoder-server/src/main/java/org/lowcoder}/api/datasource/DatasourceApiService.java (84%) rename server/api-service/{openblocks-server/src/main/java/com/openblocks => lowcoder-server/src/main/java/org/lowcoder}/api/datasource/DatasourceController.java (87%) rename server/api-service/{openblocks-server/src/main/java/com/openblocks => lowcoder-server/src/main/java/org/lowcoder}/api/datasource/DatasourceView.java (67%) rename server/api-service/{openblocks-server/src/main/java/com/openblocks => lowcoder-server/src/main/java/org/lowcoder}/api/datasource/UpsertDatasourceRequest.java (88%) rename server/api-service/{openblocks-server/src/main/java/com/openblocks => lowcoder-server/src/main/java/org/lowcoder}/api/datasource/UpsertDatasourceRequestMapper.java (77%) rename server/api-service/{openblocks-server/src/main/java/com/openblocks => lowcoder-server/src/main/java/org/lowcoder}/api/framework/StateController.java (71%) rename server/api-service/{openblocks-server/src/main/java/com/openblocks => lowcoder-server/src/main/java/org/lowcoder}/api/framework/configuration/ComponentScanConfiguration.java (56%) rename server/api-service/{openblocks-server/src/main/java/com/openblocks => lowcoder-server/src/main/java/org/lowcoder}/api/framework/exception/ApiPerfHelper.java (83%) rename server/api-service/{openblocks-server/src/main/java/com/openblocks => lowcoder-server/src/main/java/org/lowcoder}/api/framework/exception/CustomErrorWebExceptionHandler.java (93%) rename server/api-service/{openblocks-server/src/main/java/com/openblocks => lowcoder-server/src/main/java/org/lowcoder}/api/framework/exception/GlobalExceptionHandler.java (91%) rename server/api-service/{openblocks-server/src/main/java/com/openblocks => lowcoder-server/src/main/java/org/lowcoder}/api/framework/exception/ResourceWebPropertiesConfig.java (88%) rename server/api-service/{openblocks-server/src/main/java/com/openblocks => lowcoder-server/src/main/java/org/lowcoder}/api/framework/filter/FilterOrder.java (86%) rename server/api-service/{openblocks-server/src/main/java/com/openblocks => lowcoder-server/src/main/java/org/lowcoder}/api/framework/filter/GlobalContextFilter.java (76%) rename server/api-service/{openblocks-server/src/main/java/com/openblocks => lowcoder-server/src/main/java/org/lowcoder}/api/framework/filter/QueryExecuteHttpBodySizeFilter.java (88%) rename server/api-service/{openblocks-server/src/main/java/com/openblocks => lowcoder-server/src/main/java/org/lowcoder}/api/framework/filter/RequestCostFilter.java (90%) rename server/api-service/{openblocks-server/src/main/java/com/openblocks => lowcoder-server/src/main/java/org/lowcoder}/api/framework/filter/ThrottlingFilter.java (92%) rename server/api-service/{openblocks-server/src/main/java/com/openblocks => lowcoder-server/src/main/java/org/lowcoder}/api/framework/filter/UserBanFilter.java (76%) rename server/api-service/{openblocks-server/src/main/java/com/openblocks => lowcoder-server/src/main/java/org/lowcoder}/api/framework/filter/UserSessionPersistenceFilter.java (84%) rename server/api-service/{openblocks-server/src/main/java/com/openblocks => lowcoder-server/src/main/java/org/lowcoder}/api/framework/security/AccessDeniedHandler.java (94%) rename server/api-service/{openblocks-server/src/main/java/com/openblocks => lowcoder-server/src/main/java/org/lowcoder}/api/framework/security/AuthenticationEntryPoint.java (94%) rename server/api-service/{openblocks-server/src/main/java/com/openblocks => lowcoder-server/src/main/java/org/lowcoder}/api/framework/security/SecurityConfig.java (89%) rename server/api-service/{openblocks-server/src/main/java/com/openblocks => lowcoder-server/src/main/java/org/lowcoder}/api/framework/service/GlobalContextService.java (87%) rename server/api-service/{openblocks-server/src/main/java/com/openblocks => lowcoder-server/src/main/java/org/lowcoder}/api/framework/service/GlobalContextServiceImpl.java (96%) rename server/api-service/{openblocks-server/src/main/java/com/openblocks => lowcoder-server/src/main/java/org/lowcoder}/api/framework/view/PageResponseView.java (95%) rename server/api-service/{openblocks-server/src/main/java/com/openblocks => lowcoder-server/src/main/java/org/lowcoder}/api/framework/view/ResponseView.java (92%) rename server/api-service/{openblocks-server/src/main/java/com/openblocks => lowcoder-server/src/main/java/org/lowcoder}/api/framework/warmup/WarmupHelper.java (89%) rename server/api-service/{openblocks-server/src/main/java/com/openblocks => lowcoder-server/src/main/java/org/lowcoder}/api/home/FolderApiService.java (90%) rename server/api-service/{openblocks-server/src/main/java/com/openblocks => lowcoder-server/src/main/java/org/lowcoder}/api/home/FolderController.java (88%) rename server/api-service/{openblocks-server/src/main/java/com/openblocks => lowcoder-server/src/main/java/org/lowcoder}/api/home/FolderInfoView.java (91%) rename server/api-service/{openblocks-server/src/main/java/com/openblocks => lowcoder-server/src/main/java/org/lowcoder}/api/home/SessionUserService.java (76%) rename server/api-service/{openblocks-server/src/main/java/com/openblocks => lowcoder-server/src/main/java/org/lowcoder}/api/home/SessionUserServiceImpl.java (84%) rename server/api-service/{openblocks-server/src/main/java/com/openblocks => lowcoder-server/src/main/java/org/lowcoder}/api/home/UserHomeApiService.java (65%) rename server/api-service/{openblocks-server/src/main/java/com/openblocks => lowcoder-server/src/main/java/org/lowcoder}/api/home/UserHomeApiServiceImpl.java (88%) rename server/api-service/{openblocks-server/src/main/java/com/openblocks => lowcoder-server/src/main/java/org/lowcoder}/api/home/UserHomepageView.java (83%) rename server/api-service/{openblocks-server/src/main/java/com/openblocks => lowcoder-server/src/main/java/org/lowcoder}/api/material/AssetController.java (83%) rename server/api-service/{openblocks-server/src/main/java/com/openblocks => lowcoder-server/src/main/java/org/lowcoder}/api/material/MaterialApiService.java (67%) rename server/api-service/{openblocks-server/src/main/java/com/openblocks => lowcoder-server/src/main/java/org/lowcoder}/api/material/MaterialApiServiceImpl.java (89%) rename server/api-service/{openblocks-server/src/main/java/com/openblocks => lowcoder-server/src/main/java/org/lowcoder}/api/material/MaterialController.java (90%) rename server/api-service/{openblocks-server/src/main/java/com/openblocks => lowcoder-server/src/main/java/org/lowcoder}/api/misc/JsLibraryController.java (96%) rename server/api-service/{openblocks-server/src/main/java/com/openblocks => lowcoder-server/src/main/java/org/lowcoder}/api/permission/PermissionHelper.java (83%) rename server/api-service/{openblocks-server/src/main/java/com/openblocks => lowcoder-server/src/main/java/org/lowcoder}/api/permission/view/CommonPermissionView.java (93%) rename server/api-service/{openblocks-server/src/main/java/com/openblocks => lowcoder-server/src/main/java/org/lowcoder}/api/permission/view/PermissionItemView.java (71%) rename server/api-service/{openblocks-server/src/main/java/com/openblocks => lowcoder-server/src/main/java/org/lowcoder}/api/query/ApplicationQueryApiService.java (81%) rename server/api-service/{openblocks-server/src/main/java/com/openblocks => lowcoder-server/src/main/java/org/lowcoder}/api/query/LibraryQueryApiService.java (87%) rename server/api-service/{openblocks-server/src/main/java/com/openblocks => lowcoder-server/src/main/java/org/lowcoder}/api/query/LibraryQueryController.java (82%) rename server/api-service/{openblocks-server/src/main/java/com/openblocks => lowcoder-server/src/main/java/org/lowcoder}/api/query/LibraryQueryRecordApiService.java (82%) rename server/api-service/{openblocks-server/src/main/java/com/openblocks => lowcoder-server/src/main/java/org/lowcoder}/api/query/LibraryQueryRecordController.java (85%) rename server/api-service/{openblocks-server/src/main/java/com/openblocks => lowcoder-server/src/main/java/org/lowcoder}/api/query/QueryController.java (80%) rename server/api-service/{openblocks-server/src/main/java/com/openblocks => lowcoder-server/src/main/java/org/lowcoder}/api/query/view/LibraryQueryAggregateView.java (85%) rename server/api-service/{openblocks-server/src/main/java/com/openblocks => lowcoder-server/src/main/java/org/lowcoder}/api/query/view/LibraryQueryMetaView.java (83%) rename server/api-service/{openblocks-server/src/main/java/com/openblocks => lowcoder-server/src/main/java/org/lowcoder}/api/query/view/LibraryQueryPublishRequest.java (67%) rename server/api-service/{openblocks-server/src/main/java/com/openblocks => lowcoder-server/src/main/java/org/lowcoder}/api/query/view/LibraryQueryRecordMetaView.java (90%) rename server/api-service/{openblocks-server/src/main/java/com/openblocks => lowcoder-server/src/main/java/org/lowcoder}/api/query/view/LibraryQueryRequestFromJs.java (81%) rename server/api-service/{openblocks-server/src/main/java/com/openblocks => lowcoder-server/src/main/java/org/lowcoder}/api/query/view/LibraryQueryView.java (83%) rename server/api-service/{openblocks-server/src/main/java/com/openblocks => lowcoder-server/src/main/java/org/lowcoder}/api/query/view/QueryExecutionRequest.java (85%) rename server/api-service/{openblocks-server/src/main/java/com/openblocks => lowcoder-server/src/main/java/org/lowcoder}/api/query/view/QueryResultView.java (90%) rename server/api-service/{openblocks-server/src/main/java/com/openblocks => lowcoder-server/src/main/java/org/lowcoder}/api/query/view/UpsertLibraryQueryRequest.java (83%) rename server/api-service/{openblocks-server/src/main/java/com/openblocks => lowcoder-server/src/main/java/org/lowcoder}/api/usermanagement/GroupApiService.java (87%) rename server/api-service/{openblocks-server/src/main/java/com/openblocks => lowcoder-server/src/main/java/org/lowcoder}/api/usermanagement/GroupController.java (86%) rename server/api-service/{openblocks-server/src/main/java/com/openblocks => lowcoder-server/src/main/java/org/lowcoder}/api/usermanagement/InvitationApiService.java (81%) rename server/api-service/{openblocks-server/src/main/java/com/openblocks => lowcoder-server/src/main/java/org/lowcoder}/api/usermanagement/InvitationController.java (81%) rename server/api-service/{openblocks-server/src/main/java/com/openblocks => lowcoder-server/src/main/java/org/lowcoder}/api/usermanagement/OrgApiService.java (64%) rename server/api-service/{openblocks-server/src/main/java/com/openblocks => lowcoder-server/src/main/java/org/lowcoder}/api/usermanagement/OrgApiServiceImpl.java (87%) rename server/api-service/{openblocks-server/src/main/java/com/openblocks => lowcoder-server/src/main/java/org/lowcoder}/api/usermanagement/OrgDevChecker.java (82%) rename server/api-service/{openblocks-server/src/main/java/com/openblocks => lowcoder-server/src/main/java/org/lowcoder}/api/usermanagement/OrganizationController.java (86%) rename server/api-service/{openblocks-server/src/main/java/com/openblocks => lowcoder-server/src/main/java/org/lowcoder}/api/usermanagement/UserApiService.java (88%) rename server/api-service/{openblocks-server/src/main/java/com/openblocks => lowcoder-server/src/main/java/org/lowcoder}/api/usermanagement/UserController.java (87%) rename server/api-service/{openblocks-server/src/main/java/com/openblocks => lowcoder-server/src/main/java/org/lowcoder}/api/usermanagement/view/AddMemberRequest.java (82%) rename server/api-service/{openblocks-server/src/main/java/com/openblocks => lowcoder-server/src/main/java/org/lowcoder}/api/usermanagement/view/CreateGroupRequest.java (90%) rename server/api-service/{openblocks-server/src/main/java/com/openblocks => lowcoder-server/src/main/java/org/lowcoder}/api/usermanagement/view/GroupMemberAggregateView.java (81%) rename server/api-service/{openblocks-server/src/main/java/com/openblocks => lowcoder-server/src/main/java/org/lowcoder}/api/usermanagement/view/GroupMemberView.java (84%) rename server/api-service/{openblocks-server/src/main/java/com/openblocks => lowcoder-server/src/main/java/org/lowcoder}/api/usermanagement/view/GroupView.java (89%) rename server/api-service/{openblocks-server/src/main/java/com/openblocks => lowcoder-server/src/main/java/org/lowcoder}/api/usermanagement/view/InvitationVO.java (73%) rename server/api-service/{openblocks-server/src/main/java/com/openblocks => lowcoder-server/src/main/java/org/lowcoder}/api/usermanagement/view/OrgAndVisitorRoleView.java (76%) rename server/api-service/{openblocks-server/src/main/java/com/openblocks => lowcoder-server/src/main/java/org/lowcoder}/api/usermanagement/view/OrgMemberListView.java (92%) rename server/api-service/{openblocks-server/src/main/java/com/openblocks => lowcoder-server/src/main/java/org/lowcoder}/api/usermanagement/view/OrgView.java (77%) rename server/api-service/{openblocks-server/src/main/java/com/openblocks => lowcoder-server/src/main/java/org/lowcoder}/api/usermanagement/view/UpdateGroupRequest.java (90%) rename server/api-service/{openblocks-server/src/main/java/com/openblocks => lowcoder-server/src/main/java/org/lowcoder}/api/usermanagement/view/UpdateOrgRequest.java (94%) rename server/api-service/{openblocks-server/src/main/java/com/openblocks => lowcoder-server/src/main/java/org/lowcoder}/api/usermanagement/view/UpdateRoleRequest.java (82%) rename server/api-service/{openblocks-server/src/main/java/com/openblocks => lowcoder-server/src/main/java/org/lowcoder}/api/usermanagement/view/UpdateUserRequest.java (80%) rename server/api-service/{openblocks-server/src/main/java/com/openblocks => lowcoder-server/src/main/java/org/lowcoder}/api/usermanagement/view/UserProfileView.java (89%) rename server/api-service/{openblocks-server/src/main/java/com/openblocks => lowcoder-server/src/main/java/org/lowcoder}/api/util/BusinessEventPublisher.java (90%) rename server/api-service/{openblocks-server/src/main/java/com/openblocks => lowcoder-server/src/main/java/org/lowcoder}/api/util/Pagination.java (89%) rename server/api-service/{openblocks-server/src/main/java/com/openblocks => lowcoder-server/src/main/java/org/lowcoder}/api/util/ViewBuilder.java (91%) rename server/api-service/{openblocks-server/src/main/java/com/openblocks => lowcoder-server/src/main/java/org/lowcoder}/runner/eventlistener/AppEventListener.java (95%) rename server/api-service/{openblocks-server/src/main/java/com/openblocks => lowcoder-server/src/main/java/org/lowcoder}/runner/eventlistener/OrgAndGroupEventListener.java (84%) rename server/api-service/{openblocks-server/src/main/java/com/openblocks => lowcoder-server/src/main/java/org/lowcoder}/runner/hook/ShutdownHook.java (78%) rename server/api-service/{openblocks-server/src/main/java/com/openblocks => lowcoder-server/src/main/java/org/lowcoder}/runner/migrations/DatabaseChangelog.java (86%) rename server/api-service/{openblocks-server/src/main/java/com/openblocks => lowcoder-server/src/main/java/org/lowcoder}/runner/migrations/job/CompleteAuthType.java (57%) rename server/api-service/{openblocks-server/src/main/java/com/openblocks => lowcoder-server/src/main/java/org/lowcoder}/runner/migrations/job/CompleteAuthTypeImpl.java (79%) rename server/api-service/{openblocks-server/src/main/java/com/openblocks => lowcoder-server/src/main/java/org/lowcoder}/runner/migrations/job/MigrateAuthConfigJob.java (91%) rename server/api-service/{openblocks-server/src/main/java/com/openblocks => lowcoder-server/src/main/java/org/lowcoder}/runner/migrations/job/MigrateAuthConfigJobImpl.java (79%) rename server/api-service/{openblocks-server/src/main/java/com/openblocks => lowcoder-server/src/main/java/org/lowcoder}/runner/task/IoHeartBeatTask.java (87%) rename server/api-service/{openblocks-server/src/main/resources/application-openblocks.yml => lowcoder-server/src/main/resources/application-lowcoder.yml} (74%) rename server/api-service/{openblocks-server => lowcoder-server}/src/main/resources/recommendedJsLibraries.json (100%) rename server/api-service/{openblocks-server => lowcoder-server}/src/main/resources/selfhost/ce/application-selfhost.yml (54%) rename server/api-service/{openblocks-server => lowcoder-server}/src/main/resources/selfhost/ce/application.yml (84%) rename server/api-service/{openblocks-server/src/test/java/com/openblocks => lowcoder-server/src/test/java/org/lowcoder}/api/TreeTest.java (93%) rename server/api-service/{openblocks-server/src/test/java/com/openblocks => lowcoder-server/src/test/java/org/lowcoder}/api/application/ApplicationApiServiceTest.java (93%) rename server/api-service/{openblocks-server/src/test/java/com/openblocks => lowcoder-server/src/test/java/org/lowcoder}/api/application/CompoundApplicationDslFilterTest.java (89%) rename server/api-service/{openblocks-server/src/test/java/com/openblocks => lowcoder-server/src/test/java/org/lowcoder}/api/application/CompoundApplicationDslFilterTest.json (100%) rename server/api-service/{openblocks-server/src/test/java/com/openblocks => lowcoder-server/src/test/java/org/lowcoder}/api/authentication/AuthenticationControllerTest.java (89%) rename server/api-service/{openblocks-server/src/test/java/com/openblocks => lowcoder-server/src/test/java/org/lowcoder}/api/authentication/GoogleAuthenticateTest.java (85%) rename server/api-service/{openblocks-server/src/test/java/com/openblocks => lowcoder-server/src/test/java/org/lowcoder}/api/authentication/mock/MockGoogleOauth2AuthRequestFactory.java (73%) rename server/api-service/{openblocks-server/src/test/java/com/openblocks => lowcoder-server/src/test/java/org/lowcoder}/api/authentication/service/AuthenticationApiServiceTest.java (84%) rename server/api-service/{openblocks-server/src/test/java/com/openblocks => lowcoder-server/src/test/java/org/lowcoder}/api/common/InitData.java (89%) rename server/api-service/{openblocks-server/src/test/java/com/openblocks => lowcoder-server/src/test/java/org/lowcoder}/api/common/RedisConfiguration.java (96%) rename server/api-service/{openblocks-server/src/test/java/com/openblocks => lowcoder-server/src/test/java/org/lowcoder}/api/common/SessionUserServiceImplTest.java (70%) rename server/api-service/{openblocks-server/src/test/java/com/openblocks => lowcoder-server/src/test/java/org/lowcoder}/api/common/SpringPluginManagerConfiguration.java (87%) rename server/api-service/{openblocks-server/src/test/java/com/openblocks => lowcoder-server/src/test/java/org/lowcoder}/api/common/TestRedisConfiguration.java (97%) rename server/api-service/{openblocks-server/src/test/java/com/openblocks => lowcoder-server/src/test/java/org/lowcoder}/api/common/json/application.json (95%) rename server/api-service/{openblocks-server/src/test/java/com/openblocks => lowcoder-server/src/test/java/org/lowcoder}/api/common/json/folder.json (86%) rename server/api-service/{openblocks-server/src/test/java/com/openblocks => lowcoder-server/src/test/java/org/lowcoder}/api/common/json/group.json (83%) rename server/api-service/{openblocks-server/src/test/java/com/openblocks => lowcoder-server/src/test/java/org/lowcoder}/api/common/json/group_member.json (87%) rename server/api-service/{openblocks-server/src/test/java/com/openblocks => lowcoder-server/src/test/java/org/lowcoder}/api/common/json/org_member.json (90%) rename server/api-service/{openblocks-server/src/test/java/com/openblocks => lowcoder-server/src/test/java/org/lowcoder}/api/common/json/organization.json (75%) rename server/api-service/{openblocks-server/src/test/java/com/openblocks => lowcoder-server/src/test/java/org/lowcoder}/api/common/json/user.json (94%) rename server/api-service/{openblocks-server/src/test/java/com/openblocks => lowcoder-server/src/test/java/org/lowcoder}/api/common/mockuser/WithMockSecurityContextFactory.java (92%) rename server/api-service/{openblocks-server/src/test/java/com/openblocks => lowcoder-server/src/test/java/org/lowcoder}/api/common/mockuser/WithMockUser.java (92%) rename server/api-service/{openblocks-server/src/test/java/com/openblocks => lowcoder-server/src/test/java/org/lowcoder}/api/configurations/SecurityTestConfig.java (93%) rename server/api-service/{openblocks-server/src/test/java/com/openblocks => lowcoder-server/src/test/java/org/lowcoder}/api/configurations/SeedMongoData.java (70%) rename server/api-service/{openblocks-server/src/test/java/com/openblocks => lowcoder-server/src/test/java/org/lowcoder}/api/controller/DatasourceControllerTest.json (100%) rename server/api-service/{openblocks-server/src/test/java/com/openblocks => lowcoder-server/src/test/java/org/lowcoder}/api/datasource/DatasourceApiServiceTest.java (90%) rename server/api-service/{openblocks-server/src/test/java/com/openblocks => lowcoder-server/src/test/java/org/lowcoder}/api/infra/ServerConfigRepositoryTest.java (89%) rename server/api-service/{openblocks-server/src/test/java/com/openblocks => lowcoder-server/src/test/java/org/lowcoder}/api/query/LibraryQueryApiServiceTest.java (81%) rename server/api-service/{openblocks-server/src/test/java/com/openblocks => lowcoder-server/src/test/java/org/lowcoder}/api/service/FolderApiServiceTest.java (87%) rename server/api-service/{openblocks-server/src/test/java/com/openblocks => lowcoder-server/src/test/java/org/lowcoder}/api/service/impl/ApplicationHistorySnapshotServiceTest.java (93%) rename server/api-service/{openblocks-server => lowcoder-server}/src/test/resources/application.yml (100%) rename server/api-service/{openblocks-server => lowcoder-server}/src/test/resources/users.ldif (100%) delete mode 100644 server/api-service/openblocks-domain/src/main/java/com/openblocks/domain/authentication/FindAuthConfig.java delete mode 100644 server/api-service/openblocks-domain/src/main/java/com/openblocks/domain/mongodb/MongodbInterceptorContext.java delete mode 100644 server/api-service/openblocks-plugins/clickHousePlugin/plugin.properties delete mode 100644 server/api-service/openblocks-plugins/elasticSearchPlugin/plugin.properties delete mode 100644 server/api-service/openblocks-plugins/elasticSearchPlugin/src/main/java/com/openblocks/plugin/es/EsError.java delete mode 100644 server/api-service/openblocks-plugins/googleSheetsPlugin/plugin.properties delete mode 100644 server/api-service/openblocks-plugins/graphqlPlugin/plugin.properties delete mode 100644 server/api-service/openblocks-plugins/graphqlPlugin/src/main/java/com/openblocks/plugin/graphql/GraphQLError.java delete mode 100644 server/api-service/openblocks-plugins/mongoPlugin/plugin.properties delete mode 100644 server/api-service/openblocks-plugins/mssqlPlugin/plugin.properties delete mode 100644 server/api-service/openblocks-plugins/mysqlPlugin/plugin.properties delete mode 100644 server/api-service/openblocks-plugins/openblocksApiPlugin/plugin.properties delete mode 100644 server/api-service/openblocks-plugins/openblocksApiPlugin/src/main/java/com/openblocks/plugin/OpenblocksApiConnector.java delete mode 100644 server/api-service/openblocks-plugins/openblocksApiPlugin/src/main/java/com/openblocks/plugin/OpenblocksApiPlugin.java delete mode 100644 server/api-service/openblocks-plugins/openblocksApiPlugin/src/main/java/com/openblocks/plugin/OpenblocksApiPluginError.java delete mode 100644 server/api-service/openblocks-plugins/oraclePlugin/plugin.properties delete mode 100644 server/api-service/openblocks-plugins/postgresPlugin/plugin.properties delete mode 100644 server/api-service/openblocks-plugins/redisPlugin/plugin.properties delete mode 100644 server/api-service/openblocks-plugins/redisPlugin/src/main/java/com/openblocks/plugin/redis/utils/RedisQueryUtils.java delete mode 100644 server/api-service/openblocks-plugins/restApiPlugin/plugin.properties delete mode 100644 server/api-service/openblocks-plugins/smtpPlugin/plugin.properties delete mode 100644 server/api-service/openblocks-plugins/snowflakePlugin/plugin.properties delete mode 100644 server/api-service/openblocks-sdk/src/main/java/com/openblocks/sdk/plugin/openblocksapi/OpenblocksApiDatasourceConfig.java delete mode 100644 server/api-service/openblocks-sdk/src/main/java/com/openblocks/sdk/plugin/sqlcommand/changeset/ChangeSetItem.java diff --git a/deploy/docker/Dockerfile b/deploy/docker/Dockerfile index ce917da37..95a1683aa 100644 --- a/deploy/docker/Dockerfile +++ b/deploy/docker/Dockerfile @@ -20,8 +20,8 @@ RUN --mount=type=cache,target=/root/.m2 mvn -f pom.xml clean package -DskipTests RUN mkdir -p /lowcoder/api-service/plugins /lowcoder/api-service/config /lowcoder/api-service/logs # Define lowcoder main jar and plugin jars -ARG JAR_FILE=/lowcoder-server/openblocks-server/target/openblocks-server-1.0-SNAPSHOT.jar -ARG PLUGIN_JARS=/lowcoder-server/openblocks-plugins/*/target/*.jar +ARG JAR_FILE=/lowcoder-server/lowcoder-server/target/lowcoder-server-1.0-SNAPSHOT.jar +ARG PLUGIN_JARS=/lowcoder-server/lowcoder-plugins/*/target/*.jar # Copy Java runtime for running server COPY --from=jre-build /build/jre /lowcoder/api-service/jre @@ -31,8 +31,8 @@ RUN cp ${JAR_FILE} /lowcoder/api-service/server.jar \ && cp ${PLUGIN_JARS} /lowcoder/api-service/plugins/ # Copy lowcoder server configuration -COPY server/api-service/openblocks-server/src/main/resources/selfhost/ce/application.yml /lowcoder/api-service/config/ -COPY server/api-service/openblocks-server/src/main/resources/selfhost/ce/application-selfhost.yml /lowcoder/api-service/config/ +COPY server/api-service/lowcoder-server/src/main/resources/selfhost/ce/application.yml /lowcoder/api-service/config/ +COPY server/api-service/lowcoder-server/src/main/resources/selfhost/ce/application-selfhost.yml /lowcoder/api-service/config/ # Add bootstrapfile COPY deploy/docker/api-service/entrypoint.sh /lowcoder/api-service/entrypoint.sh diff --git a/server/api-service/openblocks-domain/pom.xml b/server/api-service/lowcoder-domain/pom.xml similarity index 89% rename from server/api-service/openblocks-domain/pom.xml rename to server/api-service/lowcoder-domain/pom.xml index 13418b88b..1c85a4906 100644 --- a/server/api-service/openblocks-domain/pom.xml +++ b/server/api-service/lowcoder-domain/pom.xml @@ -3,20 +3,20 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - openblocks-root - com.openblocks + lowcoder-root + org.lowcoder 1.0-SNAPSHOT 4.0.0 - openblocks-domain + lowcoder-domain 1.0-SNAPSHOT - openblocks-domain + lowcoder-domain - com.openblocks - openblocks-ee + org.lowcoder + lowcoder-ee pom 1.0-SNAPSHOT @@ -50,13 +50,13 @@ - com.openblocks - openblocks-sdk + org.lowcoder + lowcoder-sdk 1.0-SNAPSHOT - com.openblocks - openblocks-infra + org.lowcoder + lowcoder-infra 1.0-SNAPSHOT @@ -271,25 +271,6 @@ - - - selfhost-openblocks - - - - org.apache.maven.plugins - maven-compiler-plugin - - - **/*MajiangVersion.java - - - - - - - - UTF-8 17 @@ -297,4 +278,4 @@ 17 - \ No newline at end of file + diff --git a/server/api-service/openblocks-domain/src/main/java/com/openblocks/domain/application/ApplicationUtil.java b/server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/application/ApplicationUtil.java similarity index 97% rename from server/api-service/openblocks-domain/src/main/java/com/openblocks/domain/application/ApplicationUtil.java rename to server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/application/ApplicationUtil.java index c1d03459e..c74b186c5 100644 --- a/server/api-service/openblocks-domain/src/main/java/com/openblocks/domain/application/ApplicationUtil.java +++ b/server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/application/ApplicationUtil.java @@ -1,4 +1,4 @@ -package com.openblocks.domain.application; +package org.lowcoder.domain.application; import java.util.Collections; import java.util.List; diff --git a/server/api-service/openblocks-domain/src/main/java/com/openblocks/domain/application/model/Application.java b/server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/application/model/Application.java similarity index 90% rename from server/api-service/openblocks-domain/src/main/java/com/openblocks/domain/application/model/Application.java rename to server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/application/model/Application.java index f2d6fb4a5..1c5863f9b 100644 --- a/server/api-service/openblocks-domain/src/main/java/com/openblocks/domain/application/model/Application.java +++ b/server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/application/model/Application.java @@ -1,10 +1,10 @@ -package com.openblocks.domain.application.model; +package org.lowcoder.domain.application.model; import static com.google.common.base.Suppliers.memoize; -import static com.openblocks.domain.application.ApplicationUtil.getContainerSizeFromDSL; -import static com.openblocks.domain.application.ApplicationUtil.getDependentModulesFromDsl; import static java.util.Optional.ofNullable; +import static org.lowcoder.domain.application.ApplicationUtil.getContainerSizeFromDSL; +import static org.lowcoder.domain.application.ApplicationUtil.getDependentModulesFromDsl; import java.util.Collections; import java.util.Map; @@ -14,17 +14,17 @@ import org.apache.commons.collections4.MapUtils; import org.apache.commons.lang3.BooleanUtils; +import org.lowcoder.domain.query.model.ApplicationQuery; +import org.lowcoder.sdk.exception.BizError; +import org.lowcoder.sdk.exception.BizException; +import org.lowcoder.sdk.models.HasIdAndAuditing; +import org.lowcoder.sdk.util.JsonUtils; import org.springframework.data.annotation.Transient; import org.springframework.data.mongodb.core.mapping.Document; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonProperty; -import com.openblocks.domain.query.model.ApplicationQuery; -import com.openblocks.sdk.exception.BizError; -import com.openblocks.sdk.exception.BizException; -import com.openblocks.sdk.models.HasIdAndAuditing; -import com.openblocks.sdk.util.JsonUtils; import lombok.Builder; diff --git a/server/api-service/openblocks-domain/src/main/java/com/openblocks/domain/application/model/ApplicationHistorySnapshot.java b/server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/application/model/ApplicationHistorySnapshot.java similarity index 79% rename from server/api-service/openblocks-domain/src/main/java/com/openblocks/domain/application/model/ApplicationHistorySnapshot.java rename to server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/application/model/ApplicationHistorySnapshot.java index d42561066..040e77cf5 100644 --- a/server/api-service/openblocks-domain/src/main/java/com/openblocks/domain/application/model/ApplicationHistorySnapshot.java +++ b/server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/application/model/ApplicationHistorySnapshot.java @@ -1,11 +1,10 @@ -package com.openblocks.domain.application.model; +package org.lowcoder.domain.application.model; import java.util.Map; +import org.lowcoder.sdk.models.HasIdAndAuditing; import org.springframework.data.mongodb.core.mapping.Document; -import com.openblocks.sdk.models.HasIdAndAuditing; - import lombok.Getter; import lombok.Setter; import lombok.ToString; diff --git a/server/api-service/openblocks-domain/src/main/java/com/openblocks/domain/application/model/ApplicationStatus.java b/server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/application/model/ApplicationStatus.java similarity index 63% rename from server/api-service/openblocks-domain/src/main/java/com/openblocks/domain/application/model/ApplicationStatus.java rename to server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/application/model/ApplicationStatus.java index c38f27250..13a932062 100644 --- a/server/api-service/openblocks-domain/src/main/java/com/openblocks/domain/application/model/ApplicationStatus.java +++ b/server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/application/model/ApplicationStatus.java @@ -1,4 +1,4 @@ -package com.openblocks.domain.application.model; +package org.lowcoder.domain.application.model; public enum ApplicationStatus { diff --git a/server/api-service/openblocks-domain/src/main/java/com/openblocks/domain/application/model/ApplicationType.java b/server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/application/model/ApplicationType.java similarity index 90% rename from server/api-service/openblocks-domain/src/main/java/com/openblocks/domain/application/model/ApplicationType.java rename to server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/application/model/ApplicationType.java index b1cb8ba2d..bdda2ed11 100644 --- a/server/api-service/openblocks-domain/src/main/java/com/openblocks/domain/application/model/ApplicationType.java +++ b/server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/application/model/ApplicationType.java @@ -1,4 +1,4 @@ -package com.openblocks.domain.application.model; +package org.lowcoder.domain.application.model; import java.util.Arrays; diff --git a/server/api-service/openblocks-domain/src/main/java/com/openblocks/domain/application/model/UiItem.java b/server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/application/model/UiItem.java similarity index 89% rename from server/api-service/openblocks-domain/src/main/java/com/openblocks/domain/application/model/UiItem.java rename to server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/application/model/UiItem.java index 09b085f6f..3c2858d21 100644 --- a/server/api-service/openblocks-domain/src/main/java/com/openblocks/domain/application/model/UiItem.java +++ b/server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/application/model/UiItem.java @@ -1,4 +1,4 @@ -package com.openblocks.domain.application.model; +package org.lowcoder.domain.application.model; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/server/api-service/openblocks-domain/src/main/java/com/openblocks/domain/application/repository/ApplicationHistorySnapshotRepository.java b/server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/application/repository/ApplicationHistorySnapshotRepository.java similarity index 84% rename from server/api-service/openblocks-domain/src/main/java/com/openblocks/domain/application/repository/ApplicationHistorySnapshotRepository.java rename to server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/application/repository/ApplicationHistorySnapshotRepository.java index 16f6105c9..a8e9f3d02 100644 --- a/server/api-service/openblocks-domain/src/main/java/com/openblocks/domain/application/repository/ApplicationHistorySnapshotRepository.java +++ b/server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/application/repository/ApplicationHistorySnapshotRepository.java @@ -1,12 +1,11 @@ -package com.openblocks.domain.application.repository; +package org.lowcoder.domain.application.repository; +import org.lowcoder.domain.application.model.ApplicationHistorySnapshot; import org.springframework.data.domain.Pageable; import org.springframework.data.mongodb.repository.Query; import org.springframework.data.mongodb.repository.ReactiveMongoRepository; import org.springframework.stereotype.Repository; -import com.openblocks.domain.application.model.ApplicationHistorySnapshot; - import reactor.core.publisher.Flux; import reactor.core.publisher.Mono; diff --git a/server/api-service/openblocks-domain/src/main/java/com/openblocks/domain/application/repository/ApplicationRepository.java b/server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/application/repository/ApplicationRepository.java similarity index 87% rename from server/api-service/openblocks-domain/src/main/java/com/openblocks/domain/application/repository/ApplicationRepository.java rename to server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/application/repository/ApplicationRepository.java index e2fe05fac..f520fe037 100644 --- a/server/api-service/openblocks-domain/src/main/java/com/openblocks/domain/application/repository/ApplicationRepository.java +++ b/server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/application/repository/ApplicationRepository.java @@ -1,4 +1,4 @@ -package com.openblocks.domain.application.repository; +package org.lowcoder.domain.application.repository; import java.util.Collection; @@ -6,13 +6,12 @@ import javax.annotation.Nonnull; +import org.lowcoder.domain.application.model.Application; +import org.lowcoder.domain.application.model.ApplicationStatus; import org.springframework.data.mongodb.repository.Query; import org.springframework.data.mongodb.repository.ReactiveMongoRepository; import org.springframework.stereotype.Repository; -import com.openblocks.domain.application.model.Application; -import com.openblocks.domain.application.model.ApplicationStatus; - import reactor.core.publisher.Flux; import reactor.core.publisher.Mono; diff --git a/server/api-service/openblocks-domain/src/main/java/com/openblocks/domain/application/repository/CustomApplicationRepository.java b/server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/application/repository/CustomApplicationRepository.java similarity index 69% rename from server/api-service/openblocks-domain/src/main/java/com/openblocks/domain/application/repository/CustomApplicationRepository.java rename to server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/application/repository/CustomApplicationRepository.java index 46ebcb19d..5735c95ce 100644 --- a/server/api-service/openblocks-domain/src/main/java/com/openblocks/domain/application/repository/CustomApplicationRepository.java +++ b/server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/application/repository/CustomApplicationRepository.java @@ -1,6 +1,6 @@ -package com.openblocks.domain.application.repository; +package org.lowcoder.domain.application.repository; -import com.openblocks.domain.application.model.Application; +import org.lowcoder.domain.application.model.Application; import reactor.core.publisher.Flux; import reactor.core.publisher.Mono; diff --git a/server/api-service/openblocks-domain/src/main/java/com/openblocks/domain/application/repository/CustomApplicationRepositoryImpl.java b/server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/application/repository/CustomApplicationRepositoryImpl.java similarity index 89% rename from server/api-service/openblocks-domain/src/main/java/com/openblocks/domain/application/repository/CustomApplicationRepositoryImpl.java rename to server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/application/repository/CustomApplicationRepositoryImpl.java index bf111ade4..e03f3cee1 100644 --- a/server/api-service/openblocks-domain/src/main/java/com/openblocks/domain/application/repository/CustomApplicationRepositoryImpl.java +++ b/server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/application/repository/CustomApplicationRepositoryImpl.java @@ -1,13 +1,12 @@ -package com.openblocks.domain.application.repository; +package org.lowcoder.domain.application.repository; +import org.lowcoder.domain.application.model.Application; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.data.mongodb.core.ReactiveMongoTemplate; import org.springframework.data.mongodb.core.query.Criteria; import org.springframework.data.mongodb.core.query.Query; import org.springframework.stereotype.Repository; -import com.openblocks.domain.application.model.Application; - import reactor.core.publisher.Flux; import reactor.core.publisher.Mono; diff --git a/server/api-service/openblocks-domain/src/main/java/com/openblocks/domain/application/service/ApplicationHistorySnapshotService.java b/server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/application/service/ApplicationHistorySnapshotService.java similarity index 82% rename from server/api-service/openblocks-domain/src/main/java/com/openblocks/domain/application/service/ApplicationHistorySnapshotService.java rename to server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/application/service/ApplicationHistorySnapshotService.java index 890e8f508..6e65f19e5 100644 --- a/server/api-service/openblocks-domain/src/main/java/com/openblocks/domain/application/service/ApplicationHistorySnapshotService.java +++ b/server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/application/service/ApplicationHistorySnapshotService.java @@ -1,12 +1,11 @@ -package com.openblocks.domain.application.service; +package org.lowcoder.domain.application.service; import java.util.List; import java.util.Map; +import org.lowcoder.domain.application.model.ApplicationHistorySnapshot; import org.springframework.data.domain.PageRequest; -import com.openblocks.domain.application.model.ApplicationHistorySnapshot; - import reactor.core.publisher.Mono; public interface ApplicationHistorySnapshotService { diff --git a/server/api-service/openblocks-domain/src/main/java/com/openblocks/domain/application/service/ApplicationService.java b/server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/application/service/ApplicationService.java similarity index 88% rename from server/api-service/openblocks-domain/src/main/java/com/openblocks/domain/application/service/ApplicationService.java rename to server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/application/service/ApplicationService.java index f897d49ab..79acb2619 100644 --- a/server/api-service/openblocks-domain/src/main/java/com/openblocks/domain/application/service/ApplicationService.java +++ b/server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/application/service/ApplicationService.java @@ -1,7 +1,7 @@ -package com.openblocks.domain.application.service; +package org.lowcoder.domain.application.service; -import static com.openblocks.domain.application.ApplicationUtil.getDependentModulesFromDsl; +import static org.lowcoder.domain.application.ApplicationUtil.getDependentModulesFromDsl; import java.util.Collection; import java.util.List; @@ -9,23 +9,23 @@ import java.util.Set; import java.util.stream.Collectors; +import org.lowcoder.domain.application.model.Application; +import org.lowcoder.domain.application.model.ApplicationStatus; +import org.lowcoder.domain.application.repository.ApplicationRepository; +import org.lowcoder.domain.permission.model.ResourceRole; +import org.lowcoder.domain.permission.service.ResourcePermissionService; +import org.lowcoder.infra.annotation.NonEmptyMono; +import org.lowcoder.infra.mongo.MongoUpsertHelper; +import org.lowcoder.sdk.constants.FieldName; +import org.lowcoder.sdk.exception.BizError; +import org.lowcoder.sdk.exception.BizException; +import org.lowcoder.sdk.models.HasIdAndAuditing; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Service; import com.google.common.collect.Lists; import com.google.common.collect.Sets; -import com.openblocks.domain.application.model.Application; -import com.openblocks.domain.application.model.ApplicationStatus; -import com.openblocks.domain.application.repository.ApplicationRepository; -import com.openblocks.domain.permission.model.ResourceRole; -import com.openblocks.domain.permission.service.ResourcePermissionService; -import com.openblocks.infra.annotation.NonEmptyMono; -import com.openblocks.infra.mongo.MongoUpsertHelper; -import com.openblocks.sdk.constants.FieldName; -import com.openblocks.sdk.exception.BizError; -import com.openblocks.sdk.exception.BizException; -import com.openblocks.sdk.models.HasIdAndAuditing; import lombok.extern.slf4j.Slf4j; import reactor.core.publisher.Flux; diff --git a/server/api-service/openblocks-domain/src/main/java/com/openblocks/domain/application/service/impl/ApplicationHistorySnapshotServiceImpl.java b/server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/application/service/impl/ApplicationHistorySnapshotServiceImpl.java similarity index 79% rename from server/api-service/openblocks-domain/src/main/java/com/openblocks/domain/application/service/impl/ApplicationHistorySnapshotServiceImpl.java rename to server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/application/service/impl/ApplicationHistorySnapshotServiceImpl.java index 0e396b48c..81e56adc1 100644 --- a/server/api-service/openblocks-domain/src/main/java/com/openblocks/domain/application/service/impl/ApplicationHistorySnapshotServiceImpl.java +++ b/server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/application/service/impl/ApplicationHistorySnapshotServiceImpl.java @@ -1,23 +1,22 @@ -package com.openblocks.domain.application.service.impl; +package org.lowcoder.domain.application.service.impl; -import static com.openblocks.sdk.exception.BizError.INVALID_HISTORY_SNAPSHOT; -import static com.openblocks.sdk.util.ExceptionUtils.deferredError; -import static com.openblocks.sdk.util.ExceptionUtils.ofException; +import static org.lowcoder.sdk.exception.BizError.INVALID_HISTORY_SNAPSHOT; +import static org.lowcoder.sdk.util.ExceptionUtils.deferredError; +import static org.lowcoder.sdk.util.ExceptionUtils.ofException; import java.util.List; import java.util.Map; +import org.lowcoder.domain.application.model.ApplicationHistorySnapshot; +import org.lowcoder.domain.application.repository.ApplicationHistorySnapshotRepository; +import org.lowcoder.domain.application.service.ApplicationHistorySnapshotService; +import org.lowcoder.sdk.exception.BizError; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.Lazy; import org.springframework.data.domain.PageRequest; import org.springframework.data.domain.Sort.Direction; import org.springframework.stereotype.Service; -import com.openblocks.domain.application.model.ApplicationHistorySnapshot; -import com.openblocks.domain.application.repository.ApplicationHistorySnapshotRepository; -import com.openblocks.domain.application.service.ApplicationHistorySnapshotService; -import com.openblocks.sdk.exception.BizError; - import reactor.core.publisher.Mono; @Lazy diff --git a/server/api-service/openblocks-domain/src/main/java/com/openblocks/domain/asset/model/Asset.java b/server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/asset/model/Asset.java similarity index 88% rename from server/api-service/openblocks-domain/src/main/java/com/openblocks/domain/asset/model/Asset.java rename to server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/asset/model/Asset.java index d30e20656..ee275226e 100644 --- a/server/api-service/openblocks-domain/src/main/java/com/openblocks/domain/asset/model/Asset.java +++ b/server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/asset/model/Asset.java @@ -1,10 +1,10 @@ -package com.openblocks.domain.asset.model; +package org.lowcoder.domain.asset.model; +import org.lowcoder.sdk.models.HasIdAndAuditing; import org.springframework.data.mongodb.core.mapping.Document; import org.springframework.http.MediaType; import com.fasterxml.jackson.annotation.JsonCreator; -import com.openblocks.sdk.models.HasIdAndAuditing; @Document public class Asset extends HasIdAndAuditing { diff --git a/server/api-service/openblocks-domain/src/main/java/com/openblocks/domain/asset/service/AssetRepository.java b/server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/asset/service/AssetRepository.java similarity index 63% rename from server/api-service/openblocks-domain/src/main/java/com/openblocks/domain/asset/service/AssetRepository.java rename to server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/asset/service/AssetRepository.java index a8fb24187..5b5726202 100644 --- a/server/api-service/openblocks-domain/src/main/java/com/openblocks/domain/asset/service/AssetRepository.java +++ b/server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/asset/service/AssetRepository.java @@ -1,8 +1,7 @@ -package com.openblocks.domain.asset.service; +package org.lowcoder.domain.asset.service; +import org.lowcoder.domain.asset.model.Asset; import org.springframework.data.mongodb.repository.ReactiveMongoRepository; -import com.openblocks.domain.asset.model.Asset; - public interface AssetRepository extends ReactiveMongoRepository { } diff --git a/server/api-service/openblocks-domain/src/main/java/com/openblocks/domain/asset/service/AssetService.java b/server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/asset/service/AssetService.java similarity index 81% rename from server/api-service/openblocks-domain/src/main/java/com/openblocks/domain/asset/service/AssetService.java rename to server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/asset/service/AssetService.java index 993e0c9d1..833d0189c 100644 --- a/server/api-service/openblocks-domain/src/main/java/com/openblocks/domain/asset/service/AssetService.java +++ b/server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/asset/service/AssetService.java @@ -1,10 +1,9 @@ -package com.openblocks.domain.asset.service; +package org.lowcoder.domain.asset.service; +import org.lowcoder.domain.asset.model.Asset; import org.springframework.http.codec.multipart.Part; import org.springframework.web.server.ServerWebExchange; -import com.openblocks.domain.asset.model.Asset; - import reactor.core.publisher.Mono; public interface AssetService { diff --git a/server/api-service/openblocks-domain/src/main/java/com/openblocks/domain/asset/service/AssetServiceImpl.java b/server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/asset/service/AssetServiceImpl.java similarity index 94% rename from server/api-service/openblocks-domain/src/main/java/com/openblocks/domain/asset/service/AssetServiceImpl.java rename to server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/asset/service/AssetServiceImpl.java index 51a3be562..d4387cb73 100644 --- a/server/api-service/openblocks-domain/src/main/java/com/openblocks/domain/asset/service/AssetServiceImpl.java +++ b/server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/asset/service/AssetServiceImpl.java @@ -1,4 +1,4 @@ -package com.openblocks.domain.asset.service; +package org.lowcoder.domain.asset.service; import java.awt.Color; import java.awt.Image; @@ -9,6 +9,11 @@ import javax.imageio.ImageIO; +import org.lowcoder.domain.asset.model.Asset; +import org.lowcoder.sdk.config.dynamic.Conf; +import org.lowcoder.sdk.config.dynamic.ConfigCenter; +import org.lowcoder.sdk.exception.BizError; +import org.lowcoder.sdk.exception.BizException; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.core.io.buffer.DataBuffer; import org.springframework.core.io.buffer.DataBufferUtils; @@ -21,12 +26,6 @@ import org.springframework.stereotype.Service; import org.springframework.web.server.ServerWebExchange; -import com.openblocks.domain.asset.model.Asset; -import com.openblocks.sdk.config.dynamic.Conf; -import com.openblocks.sdk.config.dynamic.ConfigCenter; -import com.openblocks.sdk.exception.BizError; -import com.openblocks.sdk.exception.BizException; - import lombok.extern.slf4j.Slf4j; import reactor.core.publisher.Flux; import reactor.core.publisher.Mono; diff --git a/server/api-service/openblocks-domain/src/main/java/com/openblocks/domain/authentication/AuthenticationService.java b/server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/authentication/AuthenticationService.java similarity index 73% rename from server/api-service/openblocks-domain/src/main/java/com/openblocks/domain/authentication/AuthenticationService.java rename to server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/authentication/AuthenticationService.java index 30b4e2153..19b337922 100644 --- a/server/api-service/openblocks-domain/src/main/java/com/openblocks/domain/authentication/AuthenticationService.java +++ b/server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/authentication/AuthenticationService.java @@ -1,11 +1,11 @@ -package com.openblocks.domain.authentication; +package org.lowcoder.domain.authentication; + +import org.lowcoder.sdk.auth.EmailAuthConfig; +import org.lowcoder.sdk.constants.AuthSourceConstants; import reactor.core.publisher.Flux; import reactor.core.publisher.Mono; -import com.openblocks.sdk.auth.EmailAuthConfig; -import com.openblocks.sdk.constants.AuthSourceConstants; - public interface AuthenticationService { EmailAuthConfig DEFAULT_AUTH_CONFIG = new EmailAuthConfig(AuthSourceConstants.EMAIL, true, true); diff --git a/server/api-service/openblocks-domain/src/main/java/com/openblocks/domain/authentication/AuthenticationServiceImpl.java b/server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/authentication/AuthenticationServiceImpl.java similarity index 87% rename from server/api-service/openblocks-domain/src/main/java/com/openblocks/domain/authentication/AuthenticationServiceImpl.java rename to server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/authentication/AuthenticationServiceImpl.java index 0a363f260..6345558d4 100644 --- a/server/api-service/openblocks-domain/src/main/java/com/openblocks/domain/authentication/AuthenticationServiceImpl.java +++ b/server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/authentication/AuthenticationServiceImpl.java @@ -1,21 +1,20 @@ -package com.openblocks.domain.authentication; +package org.lowcoder.domain.authentication; -import static com.openblocks.sdk.exception.BizError.LOG_IN_SOURCE_NOT_SUPPORTED; -import static com.openblocks.sdk.util.ExceptionUtils.ofError; +import static org.lowcoder.sdk.exception.BizError.LOG_IN_SOURCE_NOT_SUPPORTED; +import static org.lowcoder.sdk.util.ExceptionUtils.ofError; import java.util.Objects; import java.util.function.Function; import java.util.stream.Collectors; +import org.lowcoder.domain.organization.service.OrganizationService; +import org.lowcoder.sdk.auth.AbstractAuthConfig; +import org.lowcoder.sdk.config.AuthProperties; +import org.lowcoder.sdk.config.CommonConfig; +import org.lowcoder.sdk.constants.WorkspaceMode; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import com.openblocks.domain.organization.service.OrganizationService; -import com.openblocks.sdk.auth.AbstractAuthConfig; -import com.openblocks.sdk.config.AuthProperties; -import com.openblocks.sdk.config.CommonConfig; -import com.openblocks.sdk.constants.WorkspaceMode; - import lombok.extern.slf4j.Slf4j; import reactor.core.publisher.Flux; import reactor.core.publisher.Mono; diff --git a/server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/authentication/FindAuthConfig.java b/server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/authentication/FindAuthConfig.java new file mode 100644 index 000000000..fa569922f --- /dev/null +++ b/server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/authentication/FindAuthConfig.java @@ -0,0 +1,9 @@ +package org.lowcoder.domain.authentication; + +import javax.annotation.Nullable; + +import org.lowcoder.domain.organization.model.Organization; +import org.lowcoder.sdk.auth.AbstractAuthConfig; + +public record FindAuthConfig(AbstractAuthConfig authConfig, @Nullable Organization organization) { +} \ No newline at end of file diff --git a/server/api-service/openblocks-domain/src/main/java/com/openblocks/domain/authentication/context/AuthRequestContext.java b/server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/authentication/context/AuthRequestContext.java similarity index 70% rename from server/api-service/openblocks-domain/src/main/java/com/openblocks/domain/authentication/context/AuthRequestContext.java rename to server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/authentication/context/AuthRequestContext.java index 50e5812b9..c10e218f4 100644 --- a/server/api-service/openblocks-domain/src/main/java/com/openblocks/domain/authentication/context/AuthRequestContext.java +++ b/server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/authentication/context/AuthRequestContext.java @@ -1,8 +1,8 @@ -package com.openblocks.domain.authentication.context; +package org.lowcoder.domain.authentication.context; import javax.annotation.Nullable; -import com.openblocks.sdk.auth.AbstractAuthConfig; +import org.lowcoder.sdk.auth.AbstractAuthConfig; import lombok.Getter; import lombok.Setter; diff --git a/server/api-service/openblocks-domain/src/main/java/com/openblocks/domain/authentication/context/FormAuthRequestContext.java b/server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/authentication/context/FormAuthRequestContext.java similarity index 89% rename from server/api-service/openblocks-domain/src/main/java/com/openblocks/domain/authentication/context/FormAuthRequestContext.java rename to server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/authentication/context/FormAuthRequestContext.java index a8b95cca1..c4d51866e 100644 --- a/server/api-service/openblocks-domain/src/main/java/com/openblocks/domain/authentication/context/FormAuthRequestContext.java +++ b/server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/authentication/context/FormAuthRequestContext.java @@ -1,4 +1,4 @@ -package com.openblocks.domain.authentication.context; +package org.lowcoder.domain.authentication.context; import lombok.Getter; diff --git a/server/api-service/openblocks-domain/src/main/java/com/openblocks/domain/configurations/MongoConfig.java b/server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/configurations/MongoConfig.java similarity index 91% rename from server/api-service/openblocks-domain/src/main/java/com/openblocks/domain/configurations/MongoConfig.java rename to server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/configurations/MongoConfig.java index 5ef3c9ba7..6fd11c760 100644 --- a/server/api-service/openblocks-domain/src/main/java/com/openblocks/domain/configurations/MongoConfig.java +++ b/server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/configurations/MongoConfig.java @@ -1,9 +1,12 @@ -package com.openblocks.domain.configurations; +package org.lowcoder.domain.configurations; import java.util.List; import javax.annotation.PostConstruct; +import org.lowcoder.domain.user.model.User; +import org.lowcoder.sdk.config.MaterialProperties; +import org.lowcoder.sdk.models.HasIdAndAuditing; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.ApplicationContext; import org.springframework.context.annotation.Bean; @@ -25,16 +28,13 @@ import com.mongodb.ReadConcern; import com.mongodb.ReadPreference; import com.mongodb.WriteConcern; -import com.openblocks.domain.user.model.User; -import com.openblocks.sdk.config.MaterialProperties; -import com.openblocks.sdk.models.HasIdAndAuditing; import lombok.extern.slf4j.Slf4j; @Slf4j @Configuration @EnableReactiveMongoAuditing -@EnableReactiveMongoRepositories(basePackages = {"com.openblocks.infra", "com.openblocks.domain"}) +@EnableReactiveMongoRepositories(basePackages = {"org.lowcoder.infra", "org.lowcoder.domain"}) public class MongoConfig { @Autowired @@ -56,7 +56,7 @@ public MongockSpring5.MongockApplicationRunner mongockApplicationRunner(Applicat return MongockSpring5.builder() .setDriver(springDataMongoV3Driver) - .addChangeLogsScanPackages(List.of("com.openblocks.runner.migrations")) + .addChangeLogsScanPackages(List.of("org.lowcoder.runner.migrations")) .setSpringContext(springContext) .buildApplicationRunner(); } diff --git a/server/api-service/openblocks-domain/src/main/java/com/openblocks/domain/configurations/Pf4jConfiguration.java b/server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/configurations/Pf4jConfiguration.java similarity index 87% rename from server/api-service/openblocks-domain/src/main/java/com/openblocks/domain/configurations/Pf4jConfiguration.java rename to server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/configurations/Pf4jConfiguration.java index 81d422d6e..18d73fdf5 100644 --- a/server/api-service/openblocks-domain/src/main/java/com/openblocks/domain/configurations/Pf4jConfiguration.java +++ b/server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/configurations/Pf4jConfiguration.java @@ -1,4 +1,4 @@ -package com.openblocks.domain.configurations; +package org.lowcoder.domain.configurations; import org.pf4j.spring.SpringPluginManager; import org.springframework.context.annotation.Bean; diff --git a/server/api-service/openblocks-domain/src/main/java/com/openblocks/domain/configurations/RedisConfig.java b/server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/configurations/RedisConfig.java similarity index 96% rename from server/api-service/openblocks-domain/src/main/java/com/openblocks/domain/configurations/RedisConfig.java rename to server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/configurations/RedisConfig.java index 2443b1b1a..0b61a3843 100644 --- a/server/api-service/openblocks-domain/src/main/java/com/openblocks/domain/configurations/RedisConfig.java +++ b/server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/configurations/RedisConfig.java @@ -1,4 +1,4 @@ -package com.openblocks.domain.configurations; +package org.lowcoder.domain.configurations; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; diff --git a/server/api-service/openblocks-domain/src/main/java/com/openblocks/domain/configurations/RedisRateLimiterConfig.java b/server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/configurations/RedisRateLimiterConfig.java similarity index 91% rename from server/api-service/openblocks-domain/src/main/java/com/openblocks/domain/configurations/RedisRateLimiterConfig.java rename to server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/configurations/RedisRateLimiterConfig.java index 44417e2c2..0da2b7c46 100644 --- a/server/api-service/openblocks-domain/src/main/java/com/openblocks/domain/configurations/RedisRateLimiterConfig.java +++ b/server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/configurations/RedisRateLimiterConfig.java @@ -1,4 +1,4 @@ -package com.openblocks.domain.configurations; +package org.lowcoder.domain.configurations; import org.springframework.beans.factory.annotation.Value; import org.springframework.context.annotation.Bean; diff --git a/server/api-service/openblocks-domain/src/main/java/com/openblocks/domain/datasource/model/ClientBasedDatasourceConnectionHolder.java b/server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/datasource/model/ClientBasedDatasourceConnectionHolder.java similarity index 86% rename from server/api-service/openblocks-domain/src/main/java/com/openblocks/domain/datasource/model/ClientBasedDatasourceConnectionHolder.java rename to server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/datasource/model/ClientBasedDatasourceConnectionHolder.java index 253c5895b..1fb721553 100644 --- a/server/api-service/openblocks-domain/src/main/java/com/openblocks/domain/datasource/model/ClientBasedDatasourceConnectionHolder.java +++ b/server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/datasource/model/ClientBasedDatasourceConnectionHolder.java @@ -1,6 +1,6 @@ -package com.openblocks.domain.datasource.model; +package org.lowcoder.domain.datasource.model; -import com.openblocks.sdk.exception.InvalidHikariDatasourceException; +import org.lowcoder.sdk.exception.InvalidHikariDatasourceException; import lombok.extern.slf4j.Slf4j; diff --git a/server/api-service/openblocks-domain/src/main/java/com/openblocks/domain/datasource/model/Datasource.java b/server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/datasource/model/Datasource.java similarity index 71% rename from server/api-service/openblocks-domain/src/main/java/com/openblocks/domain/datasource/model/Datasource.java rename to server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/datasource/model/Datasource.java index 41ae40f73..51e7c33b1 100644 --- a/server/api-service/openblocks-domain/src/main/java/com/openblocks/domain/datasource/model/Datasource.java +++ b/server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/datasource/model/Datasource.java @@ -1,9 +1,9 @@ -package com.openblocks.domain.datasource.model; +package org.lowcoder.domain.datasource.model; -import static com.openblocks.domain.datasource.model.DatasourceCreationSource.LEGACY_WORKSPACE_PREDEFINED; -import static com.openblocks.domain.datasource.model.DatasourceCreationSource.SYSTEM_STATIC; -import static com.openblocks.domain.plugin.DatasourceMetaInfoConstants.GRAPHQL_API; -import static com.openblocks.domain.plugin.DatasourceMetaInfoConstants.REST_API; +import static org.lowcoder.domain.datasource.model.DatasourceCreationSource.LEGACY_WORKSPACE_PREDEFINED; +import static org.lowcoder.domain.datasource.model.DatasourceCreationSource.SYSTEM_STATIC; +import static org.lowcoder.domain.plugin.DatasourceMetaInfoConstants.GRAPHQL_API; +import static org.lowcoder.domain.plugin.DatasourceMetaInfoConstants.REST_API; import java.util.Locale; import java.util.Optional; @@ -12,19 +12,19 @@ import javax.annotation.Nullable; import org.apache.commons.lang3.ObjectUtils; +import org.lowcoder.domain.plugin.DatasourceMetaInfoConstants; +import org.lowcoder.domain.plugin.client.dto.DatasourcePluginDefinition; +import org.lowcoder.sdk.models.DatasourceConnectionConfig; +import org.lowcoder.sdk.models.HasIdAndAuditing; +import org.lowcoder.sdk.models.JsDatasourceConnectionConfig; +import org.lowcoder.sdk.plugin.graphql.GraphQLDatasourceConfig; +import org.lowcoder.sdk.plugin.lowcoderapi.LowcoderApiDatasourceConfig; +import org.lowcoder.sdk.plugin.restapi.RestApiDatasourceConfig; +import org.lowcoder.sdk.util.LocaleUtils; import org.springframework.data.annotation.Transient; import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonProperty; -import com.openblocks.domain.plugin.DatasourceMetaInfoConstants; -import com.openblocks.domain.plugin.client.dto.DatasourcePluginDefinition; -import com.openblocks.sdk.models.DatasourceConnectionConfig; -import com.openblocks.sdk.models.HasIdAndAuditing; -import com.openblocks.sdk.models.JsDatasourceConnectionConfig; -import com.openblocks.sdk.plugin.graphql.GraphQLDatasourceConfig; -import com.openblocks.sdk.plugin.openblocksapi.OpenblocksApiDatasourceConfig; -import com.openblocks.sdk.plugin.restapi.RestApiDatasourceConfig; -import com.openblocks.sdk.util.LocaleUtils; import lombok.Getter; import lombok.Setter; @@ -36,14 +36,14 @@ public class Datasource extends HasIdAndAuditing { private static final DatasourceStatus DEFAULT_STATUS = DatasourceStatus.NORMAL; public static final String QUICK_REST_API_ID = "#QUICK_REST_API"; public static final String QUICK_GRAPHQL_ID = "#QUICK_GRAPHQL"; - public static final String OPENBLOCKS_API_ID = "#OPENBLOCKS_API"; + public static final String LOWCODER_API_ID = "#LOWCODER_API"; private static final Set SYSTEM_STATIC_IDS = Set.of(QUICK_REST_API_ID, - QUICK_GRAPHQL_ID, OPENBLOCKS_API_ID); + QUICK_GRAPHQL_ID, LOWCODER_API_ID); public static final Datasource QUICK_REST_API; public static final Datasource QUICK_GRAPHQL_API; - public static final Datasource OPENBLOCKS_API; + public static final Datasource LOWCODER_API; static { QUICK_REST_API = new Datasource(); @@ -60,12 +60,12 @@ public class Datasource extends HasIdAndAuditing { QUICK_GRAPHQL_API.setCreationSource(SYSTEM_STATIC.getValue()); QUICK_GRAPHQL_API.setDetailConfig(GraphQLDatasourceConfig.EMPTY_CONFIG); - OPENBLOCKS_API = new Datasource(); - OPENBLOCKS_API.setId(OPENBLOCKS_API_ID); - OPENBLOCKS_API.setName("Openblocks API"); - OPENBLOCKS_API.setType(DatasourceMetaInfoConstants.OPENBLOCKS_API); - OPENBLOCKS_API.setCreationSource(SYSTEM_STATIC.getValue()); - OPENBLOCKS_API.setDetailConfig(OpenblocksApiDatasourceConfig.INSTANCE); + LOWCODER_API = new Datasource(); + LOWCODER_API.setId(LOWCODER_API_ID); + LOWCODER_API.setName("Lowcoder API"); + LOWCODER_API.setType(DatasourceMetaInfoConstants.LOWCODER_API); + LOWCODER_API.setCreationSource(SYSTEM_STATIC.getValue()); + LOWCODER_API.setDetailConfig(LowcoderApiDatasourceConfig.INSTANCE); } private String name; @@ -110,8 +110,8 @@ public static String getDisplayName(String datasourceId, Locale locale) { return LocaleUtils.getMessage(locale, "QUICK_GRAPHQL_DATASOURCE_NAME"); } - if (OPENBLOCKS_API_ID.equals(datasourceId)) { - return LocaleUtils.getMessage(locale, "OPENBLOCKS_DATASOURCE_NAME"); + if (LOWCODER_API_ID.equals(datasourceId)) { + return LocaleUtils.getMessage(locale, "LOWCODER_DATASOURCE_NAME"); } return ""; } @@ -122,7 +122,7 @@ public boolean isLegacyQuickRestApi() { } @JsonIgnore - public boolean isLegacyOpenblocksApi() { + public boolean isLegacyLowcoderApi() { return !REST_API.equals(type) && creationSource == LEGACY_WORKSPACE_PREDEFINED.getValue(); } diff --git a/server/api-service/openblocks-domain/src/main/java/com/openblocks/domain/datasource/model/DatasourceConnectionHolder.java b/server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/datasource/model/DatasourceConnectionHolder.java similarity index 80% rename from server/api-service/openblocks-domain/src/main/java/com/openblocks/domain/datasource/model/DatasourceConnectionHolder.java rename to server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/datasource/model/DatasourceConnectionHolder.java index 4f4e99cb4..ed2149e6b 100644 --- a/server/api-service/openblocks-domain/src/main/java/com/openblocks/domain/datasource/model/DatasourceConnectionHolder.java +++ b/server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/datasource/model/DatasourceConnectionHolder.java @@ -1,4 +1,4 @@ -package com.openblocks.domain.datasource.model; +package org.lowcoder.domain.datasource.model; public interface DatasourceConnectionHolder { diff --git a/server/api-service/openblocks-domain/src/main/java/com/openblocks/domain/datasource/model/DatasourceCreationSource.java b/server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/datasource/model/DatasourceCreationSource.java similarity index 79% rename from server/api-service/openblocks-domain/src/main/java/com/openblocks/domain/datasource/model/DatasourceCreationSource.java rename to server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/datasource/model/DatasourceCreationSource.java index eccbe0023..425f3254c 100644 --- a/server/api-service/openblocks-domain/src/main/java/com/openblocks/domain/datasource/model/DatasourceCreationSource.java +++ b/server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/datasource/model/DatasourceCreationSource.java @@ -1,4 +1,4 @@ -package com.openblocks.domain.datasource.model; +package org.lowcoder.domain.datasource.model; import java.util.Arrays; @@ -9,7 +9,7 @@ public enum DatasourceCreationSource { USER_CREATED(0), CLONE_FROM_TEMPLATE(1), // e.g. onboard datasource/template datasource, and user can update it later @Deprecated - LEGACY_WORKSPACE_PREDEFINED(2), // e.g. openblocks api, automatically created with creation of a workspace, cannot be modified + LEGACY_WORKSPACE_PREDEFINED(2), // e.g. lowcoder api, automatically created with creation of a workspace, cannot be modified SYSTEM_STATIC(3), // e.g. rest api/graphQL quick data source, only exist in memory and doesn't store in DB ; diff --git a/server/api-service/openblocks-domain/src/main/java/com/openblocks/domain/datasource/model/DatasourceDO.java b/server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/datasource/model/DatasourceDO.java similarity index 83% rename from server/api-service/openblocks-domain/src/main/java/com/openblocks/domain/datasource/model/DatasourceDO.java rename to server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/datasource/model/DatasourceDO.java index 8644d2845..05874c9cc 100644 --- a/server/api-service/openblocks-domain/src/main/java/com/openblocks/domain/datasource/model/DatasourceDO.java +++ b/server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/datasource/model/DatasourceDO.java @@ -1,10 +1,10 @@ -package com.openblocks.domain.datasource.model; +package org.lowcoder.domain.datasource.model; import java.util.Map; +import org.lowcoder.sdk.models.HasIdAndAuditing; import org.springframework.data.mongodb.core.mapping.Document; -import com.openblocks.sdk.models.HasIdAndAuditing; import com.querydsl.core.annotations.QueryExclude; import lombok.Getter; diff --git a/server/api-service/openblocks-domain/src/main/java/com/openblocks/domain/datasource/model/DatasourceStatus.java b/server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/datasource/model/DatasourceStatus.java similarity index 55% rename from server/api-service/openblocks-domain/src/main/java/com/openblocks/domain/datasource/model/DatasourceStatus.java rename to server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/datasource/model/DatasourceStatus.java index f19b4cf54..5fb5ca13a 100644 --- a/server/api-service/openblocks-domain/src/main/java/com/openblocks/domain/datasource/model/DatasourceStatus.java +++ b/server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/datasource/model/DatasourceStatus.java @@ -1,4 +1,4 @@ -package com.openblocks.domain.datasource.model; +package org.lowcoder.domain.datasource.model; public enum DatasourceStatus { diff --git a/server/api-service/openblocks-domain/src/main/java/com/openblocks/domain/datasource/model/DatasourceStructureDO.java b/server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/datasource/model/DatasourceStructureDO.java similarity index 81% rename from server/api-service/openblocks-domain/src/main/java/com/openblocks/domain/datasource/model/DatasourceStructureDO.java rename to server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/datasource/model/DatasourceStructureDO.java index 6e8a85fb7..96c19850c 100644 --- a/server/api-service/openblocks-domain/src/main/java/com/openblocks/domain/datasource/model/DatasourceStructureDO.java +++ b/server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/datasource/model/DatasourceStructureDO.java @@ -1,10 +1,10 @@ -package com.openblocks.domain.datasource.model; +package org.lowcoder.domain.datasource.model; +import org.lowcoder.sdk.models.DatasourceStructure; +import org.lowcoder.sdk.models.HasIdAndAuditing; import org.springframework.data.mongodb.core.mapping.Document; -import com.openblocks.sdk.models.DatasourceStructure; -import com.openblocks.sdk.models.HasIdAndAuditing; import com.querydsl.core.annotations.QueryExclude; @QueryExclude diff --git a/server/api-service/openblocks-domain/src/main/java/com/openblocks/domain/datasource/model/StatelessDatasourceConnectionHolder.java b/server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/datasource/model/StatelessDatasourceConnectionHolder.java similarity index 86% rename from server/api-service/openblocks-domain/src/main/java/com/openblocks/domain/datasource/model/StatelessDatasourceConnectionHolder.java rename to server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/datasource/model/StatelessDatasourceConnectionHolder.java index d6d60d4c0..3fd53e8c3 100644 --- a/server/api-service/openblocks-domain/src/main/java/com/openblocks/domain/datasource/model/StatelessDatasourceConnectionHolder.java +++ b/server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/datasource/model/StatelessDatasourceConnectionHolder.java @@ -1,4 +1,4 @@ -package com.openblocks.domain.datasource.model; +package org.lowcoder.domain.datasource.model; public class StatelessDatasourceConnectionHolder implements DatasourceConnectionHolder { diff --git a/server/api-service/openblocks-domain/src/main/java/com/openblocks/domain/datasource/model/TokenBasedConnection.java b/server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/datasource/model/TokenBasedConnection.java similarity index 69% rename from server/api-service/openblocks-domain/src/main/java/com/openblocks/domain/datasource/model/TokenBasedConnection.java rename to server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/datasource/model/TokenBasedConnection.java index 8303d3142..8fd5ea671 100644 --- a/server/api-service/openblocks-domain/src/main/java/com/openblocks/domain/datasource/model/TokenBasedConnection.java +++ b/server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/datasource/model/TokenBasedConnection.java @@ -1,7 +1,7 @@ -package com.openblocks.domain.datasource.model; +package org.lowcoder.domain.datasource.model; -import com.openblocks.sdk.models.HasIdAndAuditing; -import com.openblocks.sdk.models.TokenBasedConnectionDetail; +import org.lowcoder.sdk.models.HasIdAndAuditing; +import org.lowcoder.sdk.models.TokenBasedConnectionDetail; import lombok.Getter; import lombok.Setter; diff --git a/server/api-service/openblocks-domain/src/main/java/com/openblocks/domain/datasource/model/TokenBasedConnectionDO.java b/server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/datasource/model/TokenBasedConnectionDO.java similarity index 80% rename from server/api-service/openblocks-domain/src/main/java/com/openblocks/domain/datasource/model/TokenBasedConnectionDO.java rename to server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/datasource/model/TokenBasedConnectionDO.java index 605d91e38..41b6c1369 100644 --- a/server/api-service/openblocks-domain/src/main/java/com/openblocks/domain/datasource/model/TokenBasedConnectionDO.java +++ b/server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/datasource/model/TokenBasedConnectionDO.java @@ -1,11 +1,10 @@ -package com.openblocks.domain.datasource.model; +package org.lowcoder.domain.datasource.model; import java.util.Map; +import org.lowcoder.sdk.models.HasIdAndAuditing; import org.springframework.data.mongodb.core.mapping.Document; -import com.openblocks.sdk.models.HasIdAndAuditing; - import lombok.Getter; import lombok.Setter; diff --git a/server/api-service/openblocks-domain/src/main/java/com/openblocks/domain/datasource/model/TokenBasedConnectionHolder.java b/server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/datasource/model/TokenBasedConnectionHolder.java similarity index 95% rename from server/api-service/openblocks-domain/src/main/java/com/openblocks/domain/datasource/model/TokenBasedConnectionHolder.java rename to server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/datasource/model/TokenBasedConnectionHolder.java index 89d441fcc..e6a6ad078 100644 --- a/server/api-service/openblocks-domain/src/main/java/com/openblocks/domain/datasource/model/TokenBasedConnectionHolder.java +++ b/server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/datasource/model/TokenBasedConnectionHolder.java @@ -1,4 +1,4 @@ -package com.openblocks.domain.datasource.model; +package org.lowcoder.domain.datasource.model; import java.time.Instant; diff --git a/server/api-service/openblocks-domain/src/main/java/com/openblocks/domain/datasource/repository/DatasourceDORepository.java b/server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/datasource/repository/DatasourceDORepository.java similarity index 81% rename from server/api-service/openblocks-domain/src/main/java/com/openblocks/domain/datasource/repository/DatasourceDORepository.java rename to server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/datasource/repository/DatasourceDORepository.java index 6b9d4a9f0..bd40fff27 100644 --- a/server/api-service/openblocks-domain/src/main/java/com/openblocks/domain/datasource/repository/DatasourceDORepository.java +++ b/server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/datasource/repository/DatasourceDORepository.java @@ -1,9 +1,8 @@ -package com.openblocks.domain.datasource.repository; +package org.lowcoder.domain.datasource.repository; +import org.lowcoder.domain.datasource.model.DatasourceDO; import org.springframework.data.mongodb.repository.ReactiveMongoRepository; -import com.openblocks.domain.datasource.model.DatasourceDO; - import reactor.core.publisher.Flux; import reactor.core.publisher.Mono; diff --git a/server/api-service/openblocks-domain/src/main/java/com/openblocks/domain/datasource/repository/DatasourceRepository.java b/server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/datasource/repository/DatasourceRepository.java similarity index 88% rename from server/api-service/openblocks-domain/src/main/java/com/openblocks/domain/datasource/repository/DatasourceRepository.java rename to server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/datasource/repository/DatasourceRepository.java index b2e9652f5..d2f573b80 100644 --- a/server/api-service/openblocks-domain/src/main/java/com/openblocks/domain/datasource/repository/DatasourceRepository.java +++ b/server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/datasource/repository/DatasourceRepository.java @@ -1,7 +1,7 @@ -package com.openblocks.domain.datasource.repository; +package org.lowcoder.domain.datasource.repository; -import static com.openblocks.sdk.util.JsonUtils.fromJsonMap; -import static com.openblocks.sdk.util.JsonUtils.toJson; +import static org.lowcoder.sdk.util.JsonUtils.fromJsonMap; +import static org.lowcoder.sdk.util.JsonUtils.toJson; import java.util.Collection; import java.util.HashSet; @@ -9,23 +9,22 @@ import java.util.function.Function; import org.apache.commons.collections4.CollectionUtils; +import org.lowcoder.domain.datasource.model.Datasource; +import org.lowcoder.domain.datasource.model.DatasourceCreationSource; +import org.lowcoder.domain.datasource.model.DatasourceDO; +import org.lowcoder.domain.datasource.model.DatasourceStatus; +import org.lowcoder.domain.datasource.service.JsDatasourceHelper; +import org.lowcoder.domain.encryption.EncryptionService; +import org.lowcoder.domain.plugin.client.DatasourcePluginClient; +import org.lowcoder.domain.plugin.service.DatasourceMetaInfoService; +import org.lowcoder.infra.mongo.MongoUpsertHelper; +import org.lowcoder.sdk.models.DatasourceConnectionConfig; +import org.lowcoder.sdk.models.HasIdAndAuditing; +import org.lowcoder.sdk.models.JsDatasourceConnectionConfig; +import org.lowcoder.sdk.util.JsonUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Repository; -import com.openblocks.domain.datasource.model.Datasource; -import com.openblocks.domain.datasource.model.DatasourceCreationSource; -import com.openblocks.domain.datasource.model.DatasourceDO; -import com.openblocks.domain.datasource.model.DatasourceStatus; -import com.openblocks.domain.datasource.service.JsDatasourceHelper; -import com.openblocks.domain.encryption.EncryptionService; -import com.openblocks.domain.plugin.client.DatasourcePluginClient; -import com.openblocks.domain.plugin.service.DatasourceMetaInfoService; -import com.openblocks.infra.mongo.MongoUpsertHelper; -import com.openblocks.sdk.models.DatasourceConnectionConfig; -import com.openblocks.sdk.models.HasIdAndAuditing; -import com.openblocks.sdk.models.JsDatasourceConnectionConfig; -import com.openblocks.sdk.util.JsonUtils; - import lombok.extern.slf4j.Slf4j; import reactor.core.publisher.Flux; import reactor.core.publisher.Mono; diff --git a/server/api-service/openblocks-domain/src/main/java/com/openblocks/domain/datasource/repository/DatasourceStructureRepository.java b/server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/datasource/repository/DatasourceStructureRepository.java similarity index 71% rename from server/api-service/openblocks-domain/src/main/java/com/openblocks/domain/datasource/repository/DatasourceStructureRepository.java rename to server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/datasource/repository/DatasourceStructureRepository.java index 2cc3419ac..aa1286a09 100644 --- a/server/api-service/openblocks-domain/src/main/java/com/openblocks/domain/datasource/repository/DatasourceStructureRepository.java +++ b/server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/datasource/repository/DatasourceStructureRepository.java @@ -1,10 +1,9 @@ -package com.openblocks.domain.datasource.repository; +package org.lowcoder.domain.datasource.repository; +import org.lowcoder.domain.datasource.model.DatasourceStructureDO; import org.springframework.data.mongodb.repository.ReactiveMongoRepository; -import com.openblocks.domain.datasource.model.DatasourceStructureDO; - import reactor.core.publisher.Mono; public interface DatasourceStructureRepository extends ReactiveMongoRepository { diff --git a/server/api-service/openblocks-domain/src/main/java/com/openblocks/domain/datasource/repository/TokenBasedConnectionDORepository.java b/server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/datasource/repository/TokenBasedConnectionDORepository.java similarity index 71% rename from server/api-service/openblocks-domain/src/main/java/com/openblocks/domain/datasource/repository/TokenBasedConnectionDORepository.java rename to server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/datasource/repository/TokenBasedConnectionDORepository.java index a3b9fcfc7..ecc4e128c 100644 --- a/server/api-service/openblocks-domain/src/main/java/com/openblocks/domain/datasource/repository/TokenBasedConnectionDORepository.java +++ b/server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/datasource/repository/TokenBasedConnectionDORepository.java @@ -1,9 +1,8 @@ -package com.openblocks.domain.datasource.repository; +package org.lowcoder.domain.datasource.repository; +import org.lowcoder.domain.datasource.model.TokenBasedConnectionDO; import org.springframework.data.mongodb.repository.ReactiveMongoRepository; -import com.openblocks.domain.datasource.model.TokenBasedConnectionDO; - import reactor.core.publisher.Mono; diff --git a/server/api-service/openblocks-domain/src/main/java/com/openblocks/domain/datasource/repository/TokenBasedConnectionRepository.java b/server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/datasource/repository/TokenBasedConnectionRepository.java similarity index 84% rename from server/api-service/openblocks-domain/src/main/java/com/openblocks/domain/datasource/repository/TokenBasedConnectionRepository.java rename to server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/datasource/repository/TokenBasedConnectionRepository.java index b26be3030..2cb45443b 100644 --- a/server/api-service/openblocks-domain/src/main/java/com/openblocks/domain/datasource/repository/TokenBasedConnectionRepository.java +++ b/server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/datasource/repository/TokenBasedConnectionRepository.java @@ -1,19 +1,18 @@ -package com.openblocks.domain.datasource.repository; +package org.lowcoder.domain.datasource.repository; import java.util.Map; +import org.lowcoder.domain.datasource.model.TokenBasedConnection; +import org.lowcoder.domain.datasource.model.TokenBasedConnectionDO; +import org.lowcoder.domain.encryption.EncryptionService; +import org.lowcoder.domain.plugin.service.DatasourceMetaInfoService; +import org.lowcoder.infra.mongo.MongoUpsertHelper; +import org.lowcoder.sdk.models.DatasourceConnectionConfig; +import org.lowcoder.sdk.models.TokenBasedConnectionDetail; +import org.lowcoder.sdk.plugin.common.DatasourceConnector; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Repository; -import com.openblocks.domain.datasource.model.TokenBasedConnection; -import com.openblocks.domain.datasource.model.TokenBasedConnectionDO; -import com.openblocks.domain.encryption.EncryptionService; -import com.openblocks.domain.plugin.service.DatasourceMetaInfoService; -import com.openblocks.infra.mongo.MongoUpsertHelper; -import com.openblocks.sdk.models.DatasourceConnectionConfig; -import com.openblocks.sdk.models.TokenBasedConnectionDetail; -import com.openblocks.sdk.plugin.common.DatasourceConnector; - import reactor.core.publisher.Mono; @Repository diff --git a/server/api-service/openblocks-domain/src/main/java/com/openblocks/domain/datasource/service/DatasourceConnectionPool.java b/server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/datasource/service/DatasourceConnectionPool.java similarity index 59% rename from server/api-service/openblocks-domain/src/main/java/com/openblocks/domain/datasource/service/DatasourceConnectionPool.java rename to server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/datasource/service/DatasourceConnectionPool.java index 6a9368603..7f7a34db9 100644 --- a/server/api-service/openblocks-domain/src/main/java/com/openblocks/domain/datasource/service/DatasourceConnectionPool.java +++ b/server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/datasource/service/DatasourceConnectionPool.java @@ -1,9 +1,9 @@ -package com.openblocks.domain.datasource.service; +package org.lowcoder.domain.datasource.service; import javax.annotation.Nullable; -import com.openblocks.domain.datasource.model.Datasource; -import com.openblocks.domain.datasource.model.DatasourceConnectionHolder; +import org.lowcoder.domain.datasource.model.Datasource; +import org.lowcoder.domain.datasource.model.DatasourceConnectionHolder; import reactor.core.publisher.Mono; diff --git a/server/api-service/openblocks-domain/src/main/java/com/openblocks/domain/datasource/service/DatasourceService.java b/server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/datasource/service/DatasourceService.java similarity index 83% rename from server/api-service/openblocks-domain/src/main/java/com/openblocks/domain/datasource/service/DatasourceService.java rename to server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/datasource/service/DatasourceService.java index 7ae68da2a..8f25eab8e 100644 --- a/server/api-service/openblocks-domain/src/main/java/com/openblocks/domain/datasource/service/DatasourceService.java +++ b/server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/datasource/service/DatasourceService.java @@ -1,9 +1,9 @@ -package com.openblocks.domain.datasource.service; +package org.lowcoder.domain.datasource.service; import java.util.Collection; -import com.openblocks.domain.datasource.model.Datasource; -import com.openblocks.sdk.models.DatasourceTestResult; +import org.lowcoder.domain.datasource.model.Datasource; +import org.lowcoder.sdk.models.DatasourceTestResult; import reactor.core.publisher.Flux; import reactor.core.publisher.Mono; diff --git a/server/api-service/openblocks-domain/src/main/java/com/openblocks/domain/datasource/service/DatasourceStructureService.java b/server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/datasource/service/DatasourceStructureService.java similarity index 62% rename from server/api-service/openblocks-domain/src/main/java/com/openblocks/domain/datasource/service/DatasourceStructureService.java rename to server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/datasource/service/DatasourceStructureService.java index 5e436d5d0..7b768633e 100644 --- a/server/api-service/openblocks-domain/src/main/java/com/openblocks/domain/datasource/service/DatasourceStructureService.java +++ b/server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/datasource/service/DatasourceStructureService.java @@ -1,6 +1,6 @@ -package com.openblocks.domain.datasource.service; +package org.lowcoder.domain.datasource.service; -import com.openblocks.sdk.models.DatasourceStructure; +import org.lowcoder.sdk.models.DatasourceStructure; import reactor.core.publisher.Mono; diff --git a/server/api-service/openblocks-domain/src/main/java/com/openblocks/domain/datasource/service/JsDatasourceHelper.java b/server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/datasource/service/JsDatasourceHelper.java similarity index 92% rename from server/api-service/openblocks-domain/src/main/java/com/openblocks/domain/datasource/service/JsDatasourceHelper.java rename to server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/datasource/service/JsDatasourceHelper.java index 61f8d9e29..097ac586c 100644 --- a/server/api-service/openblocks-domain/src/main/java/com/openblocks/domain/datasource/service/JsDatasourceHelper.java +++ b/server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/datasource/service/JsDatasourceHelper.java @@ -1,17 +1,16 @@ -package com.openblocks.domain.datasource.service; +package org.lowcoder.domain.datasource.service; import java.util.List; import org.apache.commons.lang3.ObjectUtils; +import org.lowcoder.domain.datasource.model.Datasource; +import org.lowcoder.domain.plugin.client.DatasourcePluginClient; +import org.lowcoder.domain.plugin.client.dto.GetPluginDynamicConfigRequestDTO; +import org.lowcoder.domain.plugin.service.DatasourceMetaInfoService; +import org.lowcoder.sdk.models.JsDatasourceConnectionConfig; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; -import com.openblocks.domain.datasource.model.Datasource; -import com.openblocks.domain.plugin.client.DatasourcePluginClient; -import com.openblocks.domain.plugin.client.dto.GetPluginDynamicConfigRequestDTO; -import com.openblocks.domain.plugin.service.DatasourceMetaInfoService; -import com.openblocks.sdk.models.JsDatasourceConnectionConfig; - import reactor.core.publisher.Mono; @Component diff --git a/server/api-service/openblocks-domain/src/main/java/com/openblocks/domain/datasource/service/impl/ClientBasedConnectionPool.java b/server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/datasource/service/impl/ClientBasedConnectionPool.java similarity index 86% rename from server/api-service/openblocks-domain/src/main/java/com/openblocks/domain/datasource/service/impl/ClientBasedConnectionPool.java rename to server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/datasource/service/impl/ClientBasedConnectionPool.java index 2f8da636a..3dc661df6 100644 --- a/server/api-service/openblocks-domain/src/main/java/com/openblocks/domain/datasource/service/impl/ClientBasedConnectionPool.java +++ b/server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/datasource/service/impl/ClientBasedConnectionPool.java @@ -1,14 +1,14 @@ -package com.openblocks.domain.datasource.service.impl; - -import static com.openblocks.infra.perf.PerfEvent.CLIENT_BASED_CONNECTION_CREATE; -import static com.openblocks.infra.perf.PerfEvent.CLIENT_BASED_CONNECTION_REMOVE; -import static com.openblocks.infra.perf.PerfEvent.CLIENT_BASED_CONNECTION_SIZE; -import static com.openblocks.infra.perf.PerfEvent.HIKARI_POOL_ACTIVE_CONNECTIONS; -import static com.openblocks.infra.perf.PerfEvent.HIKARI_POOL_IDLE_CONNECTIONS; -import static com.openblocks.infra.perf.PerfEvent.HIKARI_POOL_TOTAL_CONNECTIONS; -import static com.openblocks.infra.perf.PerfEvent.HIKARI_POOL_WAITING_CONNECTIONS; -import static com.openblocks.sdk.exception.BizError.PLUGIN_CREATE_CONNECTION_FAILED; -import static com.openblocks.sdk.plugin.common.QueryExecutionUtils.querySharedScheduler; +package org.lowcoder.domain.datasource.service.impl; + +import static org.lowcoder.infra.perf.PerfEvent.CLIENT_BASED_CONNECTION_CREATE; +import static org.lowcoder.infra.perf.PerfEvent.CLIENT_BASED_CONNECTION_REMOVE; +import static org.lowcoder.infra.perf.PerfEvent.CLIENT_BASED_CONNECTION_SIZE; +import static org.lowcoder.infra.perf.PerfEvent.HIKARI_POOL_ACTIVE_CONNECTIONS; +import static org.lowcoder.infra.perf.PerfEvent.HIKARI_POOL_IDLE_CONNECTIONS; +import static org.lowcoder.infra.perf.PerfEvent.HIKARI_POOL_TOTAL_CONNECTIONS; +import static org.lowcoder.infra.perf.PerfEvent.HIKARI_POOL_WAITING_CONNECTIONS; +import static org.lowcoder.sdk.exception.BizError.PLUGIN_CREATE_CONNECTION_FAILED; +import static org.lowcoder.sdk.plugin.common.QueryExecutionUtils.querySharedScheduler; import java.time.Duration; import java.time.Instant; @@ -24,6 +24,18 @@ import javax.annotation.PostConstruct; import org.apache.commons.lang3.StringUtils; +import org.lowcoder.domain.datasource.model.ClientBasedDatasourceConnectionHolder; +import org.lowcoder.domain.datasource.model.Datasource; +import org.lowcoder.domain.datasource.model.DatasourceConnectionHolder; +import org.lowcoder.domain.datasource.service.DatasourceConnectionPool; +import org.lowcoder.domain.plugin.DatasourceMetaInfo; +import org.lowcoder.domain.plugin.service.DatasourceMetaInfoService; +import org.lowcoder.infra.perf.PerfEvent; +import org.lowcoder.infra.perf.PerfHelper; +import org.lowcoder.sdk.exception.BaseException; +import org.lowcoder.sdk.exception.BizException; +import org.lowcoder.sdk.plugin.common.QueryExecutionUtils; +import org.lowcoder.sdk.plugin.common.sql.HikariPerfWrapper; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -33,18 +45,6 @@ import com.google.common.cache.RemovalListener; import com.google.common.cache.RemovalNotification; import com.google.common.collect.ImmutableList; -import com.openblocks.domain.datasource.model.ClientBasedDatasourceConnectionHolder; -import com.openblocks.domain.datasource.model.Datasource; -import com.openblocks.domain.datasource.model.DatasourceConnectionHolder; -import com.openblocks.domain.datasource.service.DatasourceConnectionPool; -import com.openblocks.domain.plugin.DatasourceMetaInfo; -import com.openblocks.domain.plugin.service.DatasourceMetaInfoService; -import com.openblocks.infra.perf.PerfEvent; -import com.openblocks.infra.perf.PerfHelper; -import com.openblocks.sdk.exception.BaseException; -import com.openblocks.sdk.exception.BizException; -import com.openblocks.sdk.plugin.common.QueryExecutionUtils; -import com.openblocks.sdk.plugin.common.sql.HikariPerfWrapper; import io.micrometer.core.instrument.Tags; import lombok.extern.slf4j.Slf4j; diff --git a/server/api-service/openblocks-domain/src/main/java/com/openblocks/domain/datasource/service/impl/DatasourceConnectionPoolFacade.java b/server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/datasource/service/impl/DatasourceConnectionPoolFacade.java similarity index 79% rename from server/api-service/openblocks-domain/src/main/java/com/openblocks/domain/datasource/service/impl/DatasourceConnectionPoolFacade.java rename to server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/datasource/service/impl/DatasourceConnectionPoolFacade.java index 4efd75800..cfe9d7ddd 100644 --- a/server/api-service/openblocks-domain/src/main/java/com/openblocks/domain/datasource/service/impl/DatasourceConnectionPoolFacade.java +++ b/server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/datasource/service/impl/DatasourceConnectionPoolFacade.java @@ -1,6 +1,6 @@ -package com.openblocks.domain.datasource.service.impl; +package org.lowcoder.domain.datasource.service.impl; -import static com.openblocks.domain.plugin.DatasourceMetaInfoConstants.REST_API; +import static org.lowcoder.domain.plugin.DatasourceMetaInfoConstants.REST_API; import java.util.List; import java.util.Map; @@ -9,21 +9,20 @@ import javax.annotation.PostConstruct; +import org.lowcoder.domain.datasource.model.Datasource; +import org.lowcoder.domain.datasource.model.DatasourceConnectionHolder; +import org.lowcoder.domain.datasource.service.DatasourceConnectionPool; +import org.lowcoder.domain.plugin.DatasourceMetaInfo; +import org.lowcoder.domain.plugin.service.DatasourceMetaInfoService; +import org.lowcoder.sdk.exception.BizError; +import org.lowcoder.sdk.exception.BizException; +import org.lowcoder.sdk.models.DatasourceConnectionConfig; +import org.lowcoder.sdk.plugin.restapi.RestApiDatasourceConfig; +import org.lowcoder.sdk.plugin.restapi.auth.RestApiAuthType; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.Primary; import org.springframework.stereotype.Service; -import com.openblocks.domain.datasource.model.Datasource; -import com.openblocks.domain.datasource.model.DatasourceConnectionHolder; -import com.openblocks.domain.datasource.service.DatasourceConnectionPool; -import com.openblocks.domain.plugin.DatasourceMetaInfo; -import com.openblocks.domain.plugin.service.DatasourceMetaInfoService; -import com.openblocks.sdk.exception.BizError; -import com.openblocks.sdk.exception.BizException; -import com.openblocks.sdk.models.DatasourceConnectionConfig; -import com.openblocks.sdk.plugin.restapi.RestApiDatasourceConfig; -import com.openblocks.sdk.plugin.restapi.auth.RestApiAuthType; - import lombok.extern.slf4j.Slf4j; import reactor.core.publisher.Mono; diff --git a/server/api-service/openblocks-domain/src/main/java/com/openblocks/domain/datasource/service/impl/DatasourceServiceImpl.java b/server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/datasource/service/impl/DatasourceServiceImpl.java similarity index 86% rename from server/api-service/openblocks-domain/src/main/java/com/openblocks/domain/datasource/service/impl/DatasourceServiceImpl.java rename to server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/datasource/service/impl/DatasourceServiceImpl.java index 9e817261e..60a4f79f8 100644 --- a/server/api-service/openblocks-domain/src/main/java/com/openblocks/domain/datasource/service/impl/DatasourceServiceImpl.java +++ b/server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/datasource/service/impl/DatasourceServiceImpl.java @@ -1,9 +1,9 @@ -package com.openblocks.domain.datasource.service.impl; +package org.lowcoder.domain.datasource.service.impl; -import static com.openblocks.sdk.util.ExceptionUtils.deferredError; -import static com.openblocks.sdk.util.ExceptionUtils.ofError; -import static com.openblocks.sdk.util.LocaleUtils.getLocale; import static org.apache.commons.collections4.CollectionUtils.isNotEmpty; +import static org.lowcoder.sdk.util.ExceptionUtils.deferredError; +import static org.lowcoder.sdk.util.ExceptionUtils.ofError; +import static org.lowcoder.sdk.util.LocaleUtils.getLocale; import java.time.Duration; import java.util.Collection; @@ -15,28 +15,28 @@ import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang3.StringUtils; +import org.lowcoder.domain.application.model.ApplicationStatus; +import org.lowcoder.domain.application.repository.ApplicationRepository; +import org.lowcoder.domain.datasource.model.Datasource; +import org.lowcoder.domain.datasource.repository.DatasourceRepository; +import org.lowcoder.domain.datasource.service.DatasourceService; +import org.lowcoder.domain.datasource.service.JsDatasourceHelper; +import org.lowcoder.domain.permission.model.ResourceRole; +import org.lowcoder.domain.permission.service.ResourcePermissionService; +import org.lowcoder.domain.plugin.client.DatasourcePluginClient; +import org.lowcoder.domain.plugin.service.DatasourceMetaInfoService; +import org.lowcoder.sdk.constants.FieldName; +import org.lowcoder.sdk.exception.BizError; +import org.lowcoder.sdk.exception.BizException; +import org.lowcoder.sdk.models.DatasourceConnectionConfig; +import org.lowcoder.sdk.models.DatasourceTestResult; +import org.lowcoder.sdk.models.JsDatasourceConnectionConfig; +import org.lowcoder.sdk.util.LocaleUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.dao.DuplicateKeyException; import org.springframework.stereotype.Service; import com.google.common.base.Joiner; -import com.openblocks.domain.application.model.ApplicationStatus; -import com.openblocks.domain.application.repository.ApplicationRepository; -import com.openblocks.domain.datasource.model.Datasource; -import com.openblocks.domain.datasource.repository.DatasourceRepository; -import com.openblocks.domain.datasource.service.DatasourceService; -import com.openblocks.domain.datasource.service.JsDatasourceHelper; -import com.openblocks.domain.permission.model.ResourceRole; -import com.openblocks.domain.permission.service.ResourcePermissionService; -import com.openblocks.domain.plugin.client.DatasourcePluginClient; -import com.openblocks.domain.plugin.service.DatasourceMetaInfoService; -import com.openblocks.sdk.constants.FieldName; -import com.openblocks.sdk.exception.BizError; -import com.openblocks.sdk.exception.BizException; -import com.openblocks.sdk.models.DatasourceConnectionConfig; -import com.openblocks.sdk.models.DatasourceTestResult; -import com.openblocks.sdk.models.JsDatasourceConnectionConfig; -import com.openblocks.sdk.util.LocaleUtils; import lombok.extern.slf4j.Slf4j; import reactor.core.publisher.Flux; @@ -100,8 +100,8 @@ public Mono getById(String id) { return Mono.just(Datasource.QUICK_GRAPHQL_API); } - if (StringUtils.equals(id, Datasource.OPENBLOCKS_API_ID)) { - return Mono.just(Datasource.OPENBLOCKS_API); + if (StringUtils.equals(id, Datasource.LOWCODER_API_ID)) { + return Mono.just(Datasource.LOWCODER_API); } return repository.findById(id); diff --git a/server/api-service/openblocks-domain/src/main/java/com/openblocks/domain/datasource/service/impl/DatasourceStructureServiceImpl.java b/server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/datasource/service/impl/DatasourceStructureServiceImpl.java similarity index 78% rename from server/api-service/openblocks-domain/src/main/java/com/openblocks/domain/datasource/service/impl/DatasourceStructureServiceImpl.java rename to server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/datasource/service/impl/DatasourceStructureServiceImpl.java index 78d0bac1c..32de57110 100644 --- a/server/api-service/openblocks-domain/src/main/java/com/openblocks/domain/datasource/service/impl/DatasourceStructureServiceImpl.java +++ b/server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/datasource/service/impl/DatasourceStructureServiceImpl.java @@ -1,31 +1,30 @@ -package com.openblocks.domain.datasource.service.impl; +package org.lowcoder.domain.datasource.service.impl; -import static com.openblocks.sdk.exception.PluginCommonError.DATASOURCE_GET_STRUCTURE_ERROR; +import static org.lowcoder.sdk.exception.PluginCommonError.DATASOURCE_GET_STRUCTURE_ERROR; import java.time.Duration; import java.util.concurrent.TimeoutException; +import org.lowcoder.domain.datasource.model.Datasource; +import org.lowcoder.domain.datasource.model.DatasourceStructureDO; +import org.lowcoder.domain.datasource.repository.DatasourceStructureRepository; +import org.lowcoder.domain.datasource.service.DatasourceConnectionPool; +import org.lowcoder.domain.datasource.service.DatasourceService; +import org.lowcoder.domain.datasource.service.DatasourceStructureService; +import org.lowcoder.domain.plugin.DatasourceMetaInfo; +import org.lowcoder.domain.plugin.service.DatasourceMetaInfoService; +import org.lowcoder.infra.mongo.MongoUpsertHelper; +import org.lowcoder.sdk.config.CommonConfig; +import org.lowcoder.sdk.exception.BizError; +import org.lowcoder.sdk.exception.BizException; +import org.lowcoder.sdk.exception.PluginException; +import org.lowcoder.sdk.models.DatasourceConnectionConfig; +import org.lowcoder.sdk.models.DatasourceStructure; +import org.lowcoder.sdk.plugin.common.QueryExecutor; +import org.lowcoder.sdk.query.QueryExecutionContext; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; -import com.openblocks.domain.datasource.model.Datasource; -import com.openblocks.domain.datasource.model.DatasourceStructureDO; -import com.openblocks.domain.datasource.repository.DatasourceStructureRepository; -import com.openblocks.domain.datasource.service.DatasourceConnectionPool; -import com.openblocks.domain.datasource.service.DatasourceService; -import com.openblocks.domain.datasource.service.DatasourceStructureService; -import com.openblocks.domain.plugin.DatasourceMetaInfo; -import com.openblocks.domain.plugin.service.DatasourceMetaInfoService; -import com.openblocks.infra.mongo.MongoUpsertHelper; -import com.openblocks.sdk.config.CommonConfig; -import com.openblocks.sdk.exception.BizError; -import com.openblocks.sdk.exception.BizException; -import com.openblocks.sdk.exception.PluginException; -import com.openblocks.sdk.models.DatasourceConnectionConfig; -import com.openblocks.sdk.models.DatasourceStructure; -import com.openblocks.sdk.plugin.common.QueryExecutor; -import com.openblocks.sdk.query.QueryExecutionContext; - import lombok.extern.slf4j.Slf4j; import reactor.core.publisher.Mono; diff --git a/server/api-service/openblocks-domain/src/main/java/com/openblocks/domain/datasource/service/impl/StatelessConnectionPool.java b/server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/datasource/service/impl/StatelessConnectionPool.java similarity index 60% rename from server/api-service/openblocks-domain/src/main/java/com/openblocks/domain/datasource/service/impl/StatelessConnectionPool.java rename to server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/datasource/service/impl/StatelessConnectionPool.java index 63ece6ac9..df85bf2e9 100644 --- a/server/api-service/openblocks-domain/src/main/java/com/openblocks/domain/datasource/service/impl/StatelessConnectionPool.java +++ b/server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/datasource/service/impl/StatelessConnectionPool.java @@ -1,12 +1,11 @@ -package com.openblocks.domain.datasource.service.impl; +package org.lowcoder.domain.datasource.service.impl; +import org.lowcoder.domain.datasource.model.Datasource; +import org.lowcoder.domain.datasource.model.DatasourceConnectionHolder; +import org.lowcoder.domain.datasource.model.StatelessDatasourceConnectionHolder; +import org.lowcoder.domain.datasource.service.DatasourceConnectionPool; import org.springframework.stereotype.Service; -import com.openblocks.domain.datasource.model.Datasource; -import com.openblocks.domain.datasource.model.DatasourceConnectionHolder; -import com.openblocks.domain.datasource.model.StatelessDatasourceConnectionHolder; -import com.openblocks.domain.datasource.service.DatasourceConnectionPool; - import lombok.extern.slf4j.Slf4j; import reactor.core.publisher.Mono; diff --git a/server/api-service/openblocks-domain/src/main/java/com/openblocks/domain/datasource/service/impl/TokenBasedConnectionPool.java b/server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/datasource/service/impl/TokenBasedConnectionPool.java similarity index 69% rename from server/api-service/openblocks-domain/src/main/java/com/openblocks/domain/datasource/service/impl/TokenBasedConnectionPool.java rename to server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/datasource/service/impl/TokenBasedConnectionPool.java index df4a5a7e6..51442bf49 100644 --- a/server/api-service/openblocks-domain/src/main/java/com/openblocks/domain/datasource/service/impl/TokenBasedConnectionPool.java +++ b/server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/datasource/service/impl/TokenBasedConnectionPool.java @@ -1,23 +1,22 @@ -package com.openblocks.domain.datasource.service.impl; - -import static com.openblocks.domain.datasource.model.TokenBasedConnectionHolder.EMPTY_CONNECTION; -import static com.openblocks.sdk.exception.BizError.DATASOURCE_TYPE_ERROR; -import static com.openblocks.sdk.exception.BizError.PLUGIN_CREATE_CONNECTION_FAILED; -import static com.openblocks.sdk.util.ExceptionUtils.deferredError; - +package org.lowcoder.domain.datasource.service.impl; + +import static org.lowcoder.domain.datasource.model.TokenBasedConnectionHolder.EMPTY_CONNECTION; +import static org.lowcoder.sdk.exception.BizError.DATASOURCE_TYPE_ERROR; +import static org.lowcoder.sdk.exception.BizError.PLUGIN_CREATE_CONNECTION_FAILED; +import static org.lowcoder.sdk.util.ExceptionUtils.deferredError; + +import org.lowcoder.domain.datasource.model.Datasource; +import org.lowcoder.domain.datasource.model.DatasourceConnectionHolder; +import org.lowcoder.domain.datasource.model.TokenBasedConnection; +import org.lowcoder.domain.datasource.model.TokenBasedConnectionHolder; +import org.lowcoder.domain.datasource.repository.TokenBasedConnectionRepository; +import org.lowcoder.domain.datasource.service.DatasourceConnectionPool; +import org.lowcoder.domain.plugin.service.DatasourceMetaInfoService; +import org.lowcoder.sdk.exception.BizException; +import org.lowcoder.sdk.models.TokenBasedConnectionDetail; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import com.openblocks.domain.datasource.model.Datasource; -import com.openblocks.domain.datasource.model.DatasourceConnectionHolder; -import com.openblocks.domain.datasource.model.TokenBasedConnection; -import com.openblocks.domain.datasource.model.TokenBasedConnectionHolder; -import com.openblocks.domain.datasource.repository.TokenBasedConnectionRepository; -import com.openblocks.domain.datasource.service.DatasourceConnectionPool; -import com.openblocks.domain.plugin.service.DatasourceMetaInfoService; -import com.openblocks.sdk.exception.BizException; -import com.openblocks.sdk.models.TokenBasedConnectionDetail; - import lombok.extern.slf4j.Slf4j; import reactor.core.publisher.Mono; diff --git a/server/api-service/openblocks-domain/src/main/java/com/openblocks/domain/encryption/EncryptionService.java b/server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/encryption/EncryptionService.java similarity index 85% rename from server/api-service/openblocks-domain/src/main/java/com/openblocks/domain/encryption/EncryptionService.java rename to server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/encryption/EncryptionService.java index 5f8aed8bd..276f4059d 100644 --- a/server/api-service/openblocks-domain/src/main/java/com/openblocks/domain/encryption/EncryptionService.java +++ b/server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/encryption/EncryptionService.java @@ -1,4 +1,4 @@ -package com.openblocks.domain.encryption; +package org.lowcoder.domain.encryption; public interface EncryptionService { diff --git a/server/api-service/openblocks-domain/src/main/java/com/openblocks/domain/encryption/EncryptionServiceImpl.java b/server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/encryption/EncryptionServiceImpl.java similarity index 92% rename from server/api-service/openblocks-domain/src/main/java/com/openblocks/domain/encryption/EncryptionServiceImpl.java rename to server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/encryption/EncryptionServiceImpl.java index bedd63f67..6524682b6 100644 --- a/server/api-service/openblocks-domain/src/main/java/com/openblocks/domain/encryption/EncryptionServiceImpl.java +++ b/server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/encryption/EncryptionServiceImpl.java @@ -1,16 +1,15 @@ -package com.openblocks.domain.encryption; +package org.lowcoder.domain.encryption; import org.apache.commons.codec.binary.Hex; import org.apache.commons.lang3.StringUtils; +import org.lowcoder.sdk.config.CommonConfig; +import org.lowcoder.sdk.config.CommonConfig.Encrypt; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder; import org.springframework.security.crypto.encrypt.Encryptors; import org.springframework.security.crypto.encrypt.TextEncryptor; import org.springframework.stereotype.Service; -import com.openblocks.sdk.config.CommonConfig; -import com.openblocks.sdk.config.CommonConfig.Encrypt; - @Service public class EncryptionServiceImpl implements EncryptionService { diff --git a/server/api-service/openblocks-domain/src/main/java/com/openblocks/domain/folder/model/ElementType.java b/server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/folder/model/ElementType.java similarity index 57% rename from server/api-service/openblocks-domain/src/main/java/com/openblocks/domain/folder/model/ElementType.java rename to server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/folder/model/ElementType.java index aa31fd0e9..49b321248 100644 --- a/server/api-service/openblocks-domain/src/main/java/com/openblocks/domain/folder/model/ElementType.java +++ b/server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/folder/model/ElementType.java @@ -1,4 +1,4 @@ -package com.openblocks.domain.folder.model; +package org.lowcoder.domain.folder.model; public enum ElementType { diff --git a/server/api-service/openblocks-domain/src/main/java/com/openblocks/domain/folder/model/Folder.java b/server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/folder/model/Folder.java similarity index 79% rename from server/api-service/openblocks-domain/src/main/java/com/openblocks/domain/folder/model/Folder.java rename to server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/folder/model/Folder.java index 4190cb5a1..a254da0f1 100644 --- a/server/api-service/openblocks-domain/src/main/java/com/openblocks/domain/folder/model/Folder.java +++ b/server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/folder/model/Folder.java @@ -1,11 +1,10 @@ -package com.openblocks.domain.folder.model; +package org.lowcoder.domain.folder.model; import javax.annotation.Nullable; +import org.lowcoder.sdk.models.HasIdAndAuditing; import org.springframework.data.mongodb.core.mapping.Document; -import com.openblocks.sdk.models.HasIdAndAuditing; - import lombok.Getter; import lombok.Setter; diff --git a/server/api-service/openblocks-domain/src/main/java/com/openblocks/domain/folder/model/FolderElement.java b/server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/folder/model/FolderElement.java similarity index 60% rename from server/api-service/openblocks-domain/src/main/java/com/openblocks/domain/folder/model/FolderElement.java rename to server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/folder/model/FolderElement.java index e4a9c3eaa..bcf1c7dfd 100644 --- a/server/api-service/openblocks-domain/src/main/java/com/openblocks/domain/folder/model/FolderElement.java +++ b/server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/folder/model/FolderElement.java @@ -1,4 +1,4 @@ -package com.openblocks.domain.folder.model; +package org.lowcoder.domain.folder.model; public record FolderElement(String folderId, String elementId) { } diff --git a/server/api-service/openblocks-domain/src/main/java/com/openblocks/domain/folder/repository/FolderRepository.java b/server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/folder/repository/FolderRepository.java similarity index 76% rename from server/api-service/openblocks-domain/src/main/java/com/openblocks/domain/folder/repository/FolderRepository.java rename to server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/folder/repository/FolderRepository.java index 2d5ec7086..165fb343d 100644 --- a/server/api-service/openblocks-domain/src/main/java/com/openblocks/domain/folder/repository/FolderRepository.java +++ b/server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/folder/repository/FolderRepository.java @@ -1,10 +1,9 @@ -package com.openblocks.domain.folder.repository; +package org.lowcoder.domain.folder.repository; +import org.lowcoder.domain.folder.model.Folder; import org.springframework.data.mongodb.repository.ReactiveMongoRepository; import org.springframework.stereotype.Repository; -import com.openblocks.domain.folder.model.Folder; - import reactor.core.publisher.Flux; @Repository diff --git a/server/api-service/openblocks-domain/src/main/java/com/openblocks/domain/folder/service/ElementNode.java b/server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/folder/service/ElementNode.java similarity index 94% rename from server/api-service/openblocks-domain/src/main/java/com/openblocks/domain/folder/service/ElementNode.java rename to server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/folder/service/ElementNode.java index 8ba478360..591ae8e51 100644 --- a/server/api-service/openblocks-domain/src/main/java/com/openblocks/domain/folder/service/ElementNode.java +++ b/server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/folder/service/ElementNode.java @@ -1,4 +1,4 @@ -package com.openblocks.domain.folder.service; +package org.lowcoder.domain.folder.service; import java.util.function.Function; diff --git a/server/api-service/openblocks-domain/src/main/java/com/openblocks/domain/folder/service/FolderElementRelationService.java b/server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/folder/service/FolderElementRelationService.java similarity index 79% rename from server/api-service/openblocks-domain/src/main/java/com/openblocks/domain/folder/service/FolderElementRelationService.java rename to server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/folder/service/FolderElementRelationService.java index 71e254303..fc8696739 100644 --- a/server/api-service/openblocks-domain/src/main/java/com/openblocks/domain/folder/service/FolderElementRelationService.java +++ b/server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/folder/service/FolderElementRelationService.java @@ -1,16 +1,15 @@ -package com.openblocks.domain.folder.service; +package org.lowcoder.domain.folder.service; -import static com.openblocks.infra.birelation.BiRelationBizType.FOLDER_ELEMENT; +import static org.lowcoder.infra.birelation.BiRelationBizType.FOLDER_ELEMENT; import java.util.List; +import org.lowcoder.domain.folder.model.FolderElement; +import org.lowcoder.infra.birelation.BiRelationBizType; +import org.lowcoder.infra.birelation.BiRelationService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import com.openblocks.domain.folder.model.FolderElement; -import com.openblocks.infra.birelation.BiRelationBizType; -import com.openblocks.infra.birelation.BiRelationService; - import reactor.core.publisher.Flux; import reactor.core.publisher.Mono; diff --git a/server/api-service/openblocks-domain/src/main/java/com/openblocks/domain/folder/service/FolderNode.java b/server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/folder/service/FolderNode.java similarity index 98% rename from server/api-service/openblocks-domain/src/main/java/com/openblocks/domain/folder/service/FolderNode.java rename to server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/folder/service/FolderNode.java index edf5a11a8..6eb09db0e 100644 --- a/server/api-service/openblocks-domain/src/main/java/com/openblocks/domain/folder/service/FolderNode.java +++ b/server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/folder/service/FolderNode.java @@ -1,4 +1,4 @@ -package com.openblocks.domain.folder.service; +package org.lowcoder.domain.folder.service; import java.util.ArrayList; import java.util.Collection; diff --git a/server/api-service/openblocks-domain/src/main/java/com/openblocks/domain/folder/service/FolderService.java b/server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/folder/service/FolderService.java similarity index 80% rename from server/api-service/openblocks-domain/src/main/java/com/openblocks/domain/folder/service/FolderService.java rename to server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/folder/service/FolderService.java index d0240ce3a..c0e9a9bac 100644 --- a/server/api-service/openblocks-domain/src/main/java/com/openblocks/domain/folder/service/FolderService.java +++ b/server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/folder/service/FolderService.java @@ -1,19 +1,18 @@ -package com.openblocks.domain.folder.service; +package org.lowcoder.domain.folder.service; -import static com.openblocks.sdk.exception.BizError.NO_RESOURCE_FOUND; +import static org.lowcoder.sdk.exception.BizError.NO_RESOURCE_FOUND; import java.util.Collection; +import org.lowcoder.domain.folder.model.Folder; +import org.lowcoder.domain.folder.repository.FolderRepository; +import org.lowcoder.infra.mongo.MongoUpsertHelper; +import org.lowcoder.sdk.constants.FieldName; +import org.lowcoder.sdk.exception.BizError; +import org.lowcoder.sdk.exception.BizException; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import com.openblocks.domain.folder.model.Folder; -import com.openblocks.domain.folder.repository.FolderRepository; -import com.openblocks.infra.mongo.MongoUpsertHelper; -import com.openblocks.sdk.constants.FieldName; -import com.openblocks.sdk.exception.BizError; -import com.openblocks.sdk.exception.BizException; - import reactor.core.publisher.Flux; import reactor.core.publisher.Mono; diff --git a/server/api-service/openblocks-domain/src/main/java/com/openblocks/domain/folder/service/Node.java b/server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/folder/service/Node.java similarity index 69% rename from server/api-service/openblocks-domain/src/main/java/com/openblocks/domain/folder/service/Node.java rename to server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/folder/service/Node.java index d83614e5d..0c053e3d9 100644 --- a/server/api-service/openblocks-domain/src/main/java/com/openblocks/domain/folder/service/Node.java +++ b/server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/folder/service/Node.java @@ -1,4 +1,4 @@ -package com.openblocks.domain.folder.service; +package org.lowcoder.domain.folder.service; public interface Node { diff --git a/server/api-service/openblocks-domain/src/main/java/com/openblocks/domain/folder/service/Tree.java b/server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/folder/service/Tree.java similarity index 98% rename from server/api-service/openblocks-domain/src/main/java/com/openblocks/domain/folder/service/Tree.java rename to server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/folder/service/Tree.java index 81c3f6a6c..ec9f2e973 100644 --- a/server/api-service/openblocks-domain/src/main/java/com/openblocks/domain/folder/service/Tree.java +++ b/server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/folder/service/Tree.java @@ -1,4 +1,4 @@ -package com.openblocks.domain.folder.service; +package org.lowcoder.domain.folder.service; import java.util.Collection; import java.util.Comparator; diff --git a/server/api-service/openblocks-domain/src/main/java/com/openblocks/domain/group/event/GroupDeletedEvent.java b/server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/group/event/GroupDeletedEvent.java similarity index 74% rename from server/api-service/openblocks-domain/src/main/java/com/openblocks/domain/group/event/GroupDeletedEvent.java rename to server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/group/event/GroupDeletedEvent.java index 35a537da7..a8927d31e 100644 --- a/server/api-service/openblocks-domain/src/main/java/com/openblocks/domain/group/event/GroupDeletedEvent.java +++ b/server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/group/event/GroupDeletedEvent.java @@ -1,4 +1,4 @@ -package com.openblocks.domain.group.event; +package org.lowcoder.domain.group.event; import lombok.Getter; import lombok.Setter; diff --git a/server/api-service/openblocks-domain/src/main/java/com/openblocks/domain/group/model/Group.java b/server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/group/model/Group.java similarity index 94% rename from server/api-service/openblocks-domain/src/main/java/com/openblocks/domain/group/model/Group.java rename to server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/group/model/Group.java index da4a0712b..5e44801b1 100644 --- a/server/api-service/openblocks-domain/src/main/java/com/openblocks/domain/group/model/Group.java +++ b/server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/group/model/Group.java @@ -1,4 +1,4 @@ -package com.openblocks.domain.group.model; +package org.lowcoder.domain.group.model; import java.beans.Transient; import java.util.Comparator; @@ -9,11 +9,11 @@ import org.apache.commons.lang3.BooleanUtils; import org.apache.commons.lang3.StringUtils; +import org.lowcoder.domain.group.util.SystemGroups; +import org.lowcoder.sdk.models.HasIdAndAuditing; import org.springframework.data.mongodb.core.mapping.Document; import com.fasterxml.jackson.annotation.JsonIgnore; -import com.openblocks.domain.group.util.SystemGroups; -import com.openblocks.sdk.models.HasIdAndAuditing; import lombok.Getter; import lombok.Setter; diff --git a/server/api-service/openblocks-domain/src/main/java/com/openblocks/domain/group/model/GroupMember.java b/server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/group/model/GroupMember.java similarity index 91% rename from server/api-service/openblocks-domain/src/main/java/com/openblocks/domain/group/model/GroupMember.java rename to server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/group/model/GroupMember.java index 3650a22b5..2a754bb6d 100644 --- a/server/api-service/openblocks-domain/src/main/java/com/openblocks/domain/group/model/GroupMember.java +++ b/server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/group/model/GroupMember.java @@ -1,11 +1,11 @@ -package com.openblocks.domain.group.model; +package org.lowcoder.domain.group.model; import org.apache.commons.lang3.StringUtils; +import org.lowcoder.domain.organization.model.MemberRole; +import org.lowcoder.infra.birelation.BiRelation; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonIgnore; -import com.openblocks.domain.organization.model.MemberRole; -import com.openblocks.infra.birelation.BiRelation; public class GroupMember { diff --git a/server/api-service/openblocks-domain/src/main/java/com/openblocks/domain/group/repository/GroupRepository.java b/server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/group/repository/GroupRepository.java similarity index 89% rename from server/api-service/openblocks-domain/src/main/java/com/openblocks/domain/group/repository/GroupRepository.java rename to server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/group/repository/GroupRepository.java index bf2cda0a3..bcf702532 100644 --- a/server/api-service/openblocks-domain/src/main/java/com/openblocks/domain/group/repository/GroupRepository.java +++ b/server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/group/repository/GroupRepository.java @@ -1,14 +1,13 @@ -package com.openblocks.domain.group.repository; +package org.lowcoder.domain.group.repository; import java.util.Collection; import javax.validation.constraints.NotNull; +import org.lowcoder.domain.group.model.Group; import org.springframework.data.mongodb.repository.ReactiveMongoRepository; import org.springframework.stereotype.Repository; -import com.openblocks.domain.group.model.Group; - import reactor.core.publisher.Flux; import reactor.core.publisher.Mono; diff --git a/server/api-service/openblocks-domain/src/main/java/com/openblocks/domain/group/service/GroupMemberService.java b/server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/group/service/GroupMemberService.java similarity index 82% rename from server/api-service/openblocks-domain/src/main/java/com/openblocks/domain/group/service/GroupMemberService.java rename to server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/group/service/GroupMemberService.java index 988073433..796b3e5e5 100644 --- a/server/api-service/openblocks-domain/src/main/java/com/openblocks/domain/group/service/GroupMemberService.java +++ b/server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/group/service/GroupMemberService.java @@ -1,12 +1,12 @@ -package com.openblocks.domain.group.service; +package org.lowcoder.domain.group.service; import java.util.Collection; import java.util.List; -import com.openblocks.domain.group.model.Group; -import com.openblocks.domain.group.model.GroupMember; -import com.openblocks.domain.organization.model.MemberRole; -import com.openblocks.infra.birelation.BiRelation; +import org.lowcoder.domain.group.model.Group; +import org.lowcoder.domain.group.model.GroupMember; +import org.lowcoder.domain.organization.model.MemberRole; +import org.lowcoder.infra.birelation.BiRelation; import reactor.core.publisher.Mono; diff --git a/server/api-service/openblocks-domain/src/main/java/com/openblocks/domain/group/service/GroupMemberServiceImpl.java b/server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/group/service/GroupMemberServiceImpl.java similarity index 89% rename from server/api-service/openblocks-domain/src/main/java/com/openblocks/domain/group/service/GroupMemberServiceImpl.java rename to server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/group/service/GroupMemberServiceImpl.java index 9d37889c4..e653f10ff 100644 --- a/server/api-service/openblocks-domain/src/main/java/com/openblocks/domain/group/service/GroupMemberServiceImpl.java +++ b/server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/group/service/GroupMemberServiceImpl.java @@ -1,6 +1,6 @@ -package com.openblocks.domain.group.service; +package org.lowcoder.domain.group.service; -import static com.openblocks.infra.birelation.BiRelationBizType.GROUP_MEMBER; +import static org.lowcoder.infra.birelation.BiRelationBizType.GROUP_MEMBER; import java.util.Collection; import java.util.List; @@ -8,17 +8,16 @@ import org.apache.commons.lang3.StringUtils; import org.bson.Document; +import org.lowcoder.domain.group.model.Group; +import org.lowcoder.domain.group.model.GroupMember; +import org.lowcoder.domain.organization.model.MemberRole; +import org.lowcoder.domain.organization.model.OrgMemberState; +import org.lowcoder.infra.birelation.BiRelation; +import org.lowcoder.infra.birelation.BiRelationService; +import org.lowcoder.infra.mongo.MongoUpsertHelper; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import com.openblocks.domain.group.model.Group; -import com.openblocks.domain.group.model.GroupMember; -import com.openblocks.domain.organization.model.MemberRole; -import com.openblocks.domain.organization.model.OrgMemberState; -import com.openblocks.infra.birelation.BiRelation; -import com.openblocks.infra.birelation.BiRelationService; -import com.openblocks.infra.mongo.MongoUpsertHelper; - import reactor.core.publisher.Mono; @Service diff --git a/server/api-service/openblocks-domain/src/main/java/com/openblocks/domain/group/service/GroupService.java b/server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/group/service/GroupService.java similarity index 85% rename from server/api-service/openblocks-domain/src/main/java/com/openblocks/domain/group/service/GroupService.java rename to server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/group/service/GroupService.java index 47d7cc9e0..efcb66d4b 100644 --- a/server/api-service/openblocks-domain/src/main/java/com/openblocks/domain/group/service/GroupService.java +++ b/server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/group/service/GroupService.java @@ -1,9 +1,9 @@ -package com.openblocks.domain.group.service; +package org.lowcoder.domain.group.service; import java.util.Collection; -import com.openblocks.domain.group.model.Group; -import com.openblocks.infra.mongo.MongoUpsertHelper.PartialResourceWithId; +import org.lowcoder.domain.group.model.Group; +import org.lowcoder.infra.mongo.MongoUpsertHelper.PartialResourceWithId; import reactor.core.publisher.Flux; import reactor.core.publisher.Mono; diff --git a/server/api-service/openblocks-domain/src/main/java/com/openblocks/domain/group/service/GroupServiceImpl.java b/server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/group/service/GroupServiceImpl.java similarity index 84% rename from server/api-service/openblocks-domain/src/main/java/com/openblocks/domain/group/service/GroupServiceImpl.java rename to server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/group/service/GroupServiceImpl.java index 9cc85b923..89617bd2a 100644 --- a/server/api-service/openblocks-domain/src/main/java/com/openblocks/domain/group/service/GroupServiceImpl.java +++ b/server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/group/service/GroupServiceImpl.java @@ -1,24 +1,23 @@ -package com.openblocks.domain.group.service; +package org.lowcoder.domain.group.service; -import static com.openblocks.domain.group.util.SystemGroups.ALL_USER; -import static com.openblocks.domain.group.util.SystemGroups.DEV; -import static com.openblocks.sdk.util.LocaleUtils.getLocale; +import static org.lowcoder.domain.group.util.SystemGroups.ALL_USER; +import static org.lowcoder.domain.group.util.SystemGroups.DEV; +import static org.lowcoder.sdk.util.LocaleUtils.getLocale; import java.util.Collection; import java.util.Locale; +import org.lowcoder.domain.group.event.GroupDeletedEvent; +import org.lowcoder.domain.group.model.Group; +import org.lowcoder.domain.group.repository.GroupRepository; +import org.lowcoder.domain.group.util.SystemGroups; +import org.lowcoder.domain.organization.model.MemberRole; +import org.lowcoder.infra.mongo.MongoUpsertHelper; +import org.lowcoder.infra.mongo.MongoUpsertHelper.PartialResourceWithId; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.ApplicationContext; import org.springframework.stereotype.Service; -import com.openblocks.domain.group.event.GroupDeletedEvent; -import com.openblocks.domain.group.model.Group; -import com.openblocks.domain.group.repository.GroupRepository; -import com.openblocks.domain.group.util.SystemGroups; -import com.openblocks.domain.organization.model.MemberRole; -import com.openblocks.infra.mongo.MongoUpsertHelper; -import com.openblocks.infra.mongo.MongoUpsertHelper.PartialResourceWithId; - import lombok.extern.slf4j.Slf4j; import reactor.core.publisher.Flux; import reactor.core.publisher.Mono; diff --git a/server/api-service/openblocks-domain/src/main/java/com/openblocks/domain/group/util/SystemGroups.java b/server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/group/util/SystemGroups.java similarity index 88% rename from server/api-service/openblocks-domain/src/main/java/com/openblocks/domain/group/util/SystemGroups.java rename to server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/group/util/SystemGroups.java index 3d446dbe2..86337b0d8 100644 --- a/server/api-service/openblocks-domain/src/main/java/com/openblocks/domain/group/util/SystemGroups.java +++ b/server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/group/util/SystemGroups.java @@ -1,12 +1,12 @@ -package com.openblocks.domain.group.util; +package org.lowcoder.domain.group.util; import java.util.Locale; import java.util.Map; import org.apache.commons.lang3.StringUtils; +import org.lowcoder.sdk.util.LocaleUtils; import com.google.common.collect.ImmutableMap; -import com.openblocks.sdk.util.LocaleUtils; public class SystemGroups { public static String ALL_USER = "all"; diff --git a/server/api-service/openblocks-domain/src/main/java/com/openblocks/domain/interaction/UserApplicationInteraction.java b/server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/interaction/UserApplicationInteraction.java similarity index 85% rename from server/api-service/openblocks-domain/src/main/java/com/openblocks/domain/interaction/UserApplicationInteraction.java rename to server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/interaction/UserApplicationInteraction.java index 34ca19b65..984471326 100644 --- a/server/api-service/openblocks-domain/src/main/java/com/openblocks/domain/interaction/UserApplicationInteraction.java +++ b/server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/interaction/UserApplicationInteraction.java @@ -1,12 +1,12 @@ -package com.openblocks.domain.interaction; +package org.lowcoder.domain.interaction; import java.time.Instant; import org.apache.commons.lang3.math.NumberUtils; +import org.lowcoder.infra.birelation.BiRelation; +import org.lowcoder.infra.birelation.BiRelationBizType; import com.google.common.base.Preconditions; -import com.openblocks.infra.birelation.BiRelation; -import com.openblocks.infra.birelation.BiRelationBizType; public record UserApplicationInteraction(String userId, String applicationId, Instant lastViewTime) { diff --git a/server/api-service/openblocks-domain/src/main/java/com/openblocks/domain/interaction/UserApplicationInteractionService.java b/server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/interaction/UserApplicationInteractionService.java similarity index 79% rename from server/api-service/openblocks-domain/src/main/java/com/openblocks/domain/interaction/UserApplicationInteractionService.java rename to server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/interaction/UserApplicationInteractionService.java index a878008dd..a0b1f884f 100644 --- a/server/api-service/openblocks-domain/src/main/java/com/openblocks/domain/interaction/UserApplicationInteractionService.java +++ b/server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/interaction/UserApplicationInteractionService.java @@ -1,14 +1,13 @@ -package com.openblocks.domain.interaction; +package org.lowcoder.domain.interaction; import java.time.Instant; +import org.lowcoder.infra.birelation.BiRelation; +import org.lowcoder.infra.birelation.BiRelationBizType; +import org.lowcoder.infra.birelation.BiRelationService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import com.openblocks.infra.birelation.BiRelation; -import com.openblocks.infra.birelation.BiRelationBizType; -import com.openblocks.infra.birelation.BiRelationService; - import reactor.core.publisher.Flux; import reactor.core.publisher.Mono; diff --git a/server/api-service/openblocks-domain/src/main/java/com/openblocks/domain/interaction/UserFolderInteraction.java b/server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/interaction/UserFolderInteraction.java similarity index 82% rename from server/api-service/openblocks-domain/src/main/java/com/openblocks/domain/interaction/UserFolderInteraction.java rename to server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/interaction/UserFolderInteraction.java index 472f580a6..db92a9134 100644 --- a/server/api-service/openblocks-domain/src/main/java/com/openblocks/domain/interaction/UserFolderInteraction.java +++ b/server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/interaction/UserFolderInteraction.java @@ -1,13 +1,13 @@ -package com.openblocks.domain.interaction; +package org.lowcoder.domain.interaction; -import static com.openblocks.infra.birelation.BiRelationBizType.USER_FOLDER_INTERACTION; +import static org.lowcoder.infra.birelation.BiRelationBizType.USER_FOLDER_INTERACTION; import java.time.Instant; import org.apache.commons.lang3.math.NumberUtils; +import org.lowcoder.infra.birelation.BiRelation; import com.google.common.base.Preconditions; -import com.openblocks.infra.birelation.BiRelation; public record UserFolderInteraction(String userId, String folderId, Instant lastViewTime) { diff --git a/server/api-service/openblocks-domain/src/main/java/com/openblocks/domain/interaction/UserFolderInteractionService.java b/server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/interaction/UserFolderInteractionService.java similarity index 80% rename from server/api-service/openblocks-domain/src/main/java/com/openblocks/domain/interaction/UserFolderInteractionService.java rename to server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/interaction/UserFolderInteractionService.java index 9ebc0d17c..f339229d9 100644 --- a/server/api-service/openblocks-domain/src/main/java/com/openblocks/domain/interaction/UserFolderInteractionService.java +++ b/server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/interaction/UserFolderInteractionService.java @@ -1,14 +1,13 @@ -package com.openblocks.domain.interaction; +package org.lowcoder.domain.interaction; import java.time.Instant; +import org.lowcoder.infra.birelation.BiRelation; +import org.lowcoder.infra.birelation.BiRelationBizType; +import org.lowcoder.infra.birelation.BiRelationService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import com.openblocks.infra.birelation.BiRelation; -import com.openblocks.infra.birelation.BiRelationBizType; -import com.openblocks.infra.birelation.BiRelationService; - import reactor.core.publisher.Flux; import reactor.core.publisher.Mono; diff --git a/server/api-service/openblocks-domain/src/main/java/com/openblocks/domain/invitation/model/Invitation.java b/server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/invitation/model/Invitation.java similarity index 82% rename from server/api-service/openblocks-domain/src/main/java/com/openblocks/domain/invitation/model/Invitation.java rename to server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/invitation/model/Invitation.java index 29b7ff0ca..3dcd985fd 100644 --- a/server/api-service/openblocks-domain/src/main/java/com/openblocks/domain/invitation/model/Invitation.java +++ b/server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/invitation/model/Invitation.java @@ -1,11 +1,10 @@ -package com.openblocks.domain.invitation.model; +package org.lowcoder.domain.invitation.model; import java.util.Set; +import org.lowcoder.sdk.models.HasIdAndAuditing; import org.springframework.data.mongodb.core.mapping.Document; -import com.openblocks.sdk.models.HasIdAndAuditing; - import lombok.Builder; import lombok.Getter; diff --git a/server/api-service/openblocks-domain/src/main/java/com/openblocks/domain/invitation/repository/CustomInvitationRepository.java b/server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/invitation/repository/CustomInvitationRepository.java similarity index 79% rename from server/api-service/openblocks-domain/src/main/java/com/openblocks/domain/invitation/repository/CustomInvitationRepository.java rename to server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/invitation/repository/CustomInvitationRepository.java index d9ecf9eed..344705845 100644 --- a/server/api-service/openblocks-domain/src/main/java/com/openblocks/domain/invitation/repository/CustomInvitationRepository.java +++ b/server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/invitation/repository/CustomInvitationRepository.java @@ -1,4 +1,4 @@ -package com.openblocks.domain.invitation.repository; +package org.lowcoder.domain.invitation.repository; import com.mongodb.client.result.UpdateResult; diff --git a/server/api-service/openblocks-domain/src/main/java/com/openblocks/domain/invitation/repository/CustomInvitationRepositoryImpl.java b/server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/invitation/repository/CustomInvitationRepositoryImpl.java similarity index 77% rename from server/api-service/openblocks-domain/src/main/java/com/openblocks/domain/invitation/repository/CustomInvitationRepositoryImpl.java rename to server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/invitation/repository/CustomInvitationRepositoryImpl.java index b75c48682..825f6f24d 100644 --- a/server/api-service/openblocks-domain/src/main/java/com/openblocks/domain/invitation/repository/CustomInvitationRepositoryImpl.java +++ b/server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/invitation/repository/CustomInvitationRepositoryImpl.java @@ -1,7 +1,10 @@ -package com.openblocks.domain.invitation.repository; +package org.lowcoder.domain.invitation.repository; -import static com.openblocks.domain.util.QueryDslUtils.fieldName; +import static org.lowcoder.domain.util.QueryDslUtils.fieldName; +import org.lowcoder.domain.invitation.model.Invitation; +import org.lowcoder.domain.invitation.model.QInvitation; +import org.lowcoder.sdk.constants.FieldName; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.data.mongodb.core.ReactiveMongoTemplate; import org.springframework.data.mongodb.core.query.Criteria; @@ -10,9 +13,6 @@ import org.springframework.stereotype.Repository; import com.mongodb.client.result.UpdateResult; -import com.openblocks.domain.invitation.model.Invitation; -import com.openblocks.domain.invitation.model.QInvitation; -import com.openblocks.sdk.constants.FieldName; import reactor.core.publisher.Mono; diff --git a/server/api-service/openblocks-domain/src/main/java/com/openblocks/domain/invitation/repository/InvitationRepository.java b/server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/invitation/repository/InvitationRepository.java similarity index 64% rename from server/api-service/openblocks-domain/src/main/java/com/openblocks/domain/invitation/repository/InvitationRepository.java rename to server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/invitation/repository/InvitationRepository.java index c3e1adbdf..9073470cb 100644 --- a/server/api-service/openblocks-domain/src/main/java/com/openblocks/domain/invitation/repository/InvitationRepository.java +++ b/server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/invitation/repository/InvitationRepository.java @@ -1,9 +1,8 @@ -package com.openblocks.domain.invitation.repository; +package org.lowcoder.domain.invitation.repository; +import org.lowcoder.domain.invitation.model.Invitation; import org.springframework.data.mongodb.repository.ReactiveMongoRepository; -import com.openblocks.domain.invitation.model.Invitation; - public interface InvitationRepository extends ReactiveMongoRepository, CustomInvitationRepository { } diff --git a/server/api-service/openblocks-domain/src/main/java/com/openblocks/domain/invitation/service/InvitationService.java b/server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/invitation/service/InvitationService.java similarity index 73% rename from server/api-service/openblocks-domain/src/main/java/com/openblocks/domain/invitation/service/InvitationService.java rename to server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/invitation/service/InvitationService.java index 1ef26e5f9..04c27276f 100644 --- a/server/api-service/openblocks-domain/src/main/java/com/openblocks/domain/invitation/service/InvitationService.java +++ b/server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/invitation/service/InvitationService.java @@ -1,17 +1,16 @@ -package com.openblocks.domain.invitation.service; +package org.lowcoder.domain.invitation.service; import javax.annotation.Nonnull; +import org.lowcoder.domain.invitation.model.Invitation; +import org.lowcoder.domain.invitation.repository.InvitationRepository; +import org.lowcoder.domain.organization.model.MemberRole; +import org.lowcoder.domain.organization.service.OrgMemberService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Service; -import com.openblocks.domain.invitation.model.Invitation; -import com.openblocks.domain.invitation.repository.InvitationRepository; -import com.openblocks.domain.organization.model.MemberRole; -import com.openblocks.domain.organization.service.OrgMemberService; - import reactor.core.publisher.Mono; @Lazy diff --git a/server/api-service/openblocks-domain/src/main/java/com/openblocks/domain/material/model/MaterialMeta.java b/server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/material/model/MaterialMeta.java similarity index 76% rename from server/api-service/openblocks-domain/src/main/java/com/openblocks/domain/material/model/MaterialMeta.java rename to server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/material/model/MaterialMeta.java index 10cadb41d..a809cb109 100644 --- a/server/api-service/openblocks-domain/src/main/java/com/openblocks/domain/material/model/MaterialMeta.java +++ b/server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/material/model/MaterialMeta.java @@ -1,9 +1,8 @@ -package com.openblocks.domain.material.model; +package org.lowcoder.domain.material.model; +import org.lowcoder.sdk.models.HasIdAndAuditing; import org.springframework.data.mongodb.core.mapping.Document; -import com.openblocks.sdk.models.HasIdAndAuditing; - import lombok.Builder; import lombok.Getter; diff --git a/server/api-service/openblocks-domain/src/main/java/com/openblocks/domain/material/model/MaterialType.java b/server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/material/model/MaterialType.java similarity index 55% rename from server/api-service/openblocks-domain/src/main/java/com/openblocks/domain/material/model/MaterialType.java rename to server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/material/model/MaterialType.java index c53e1a03e..c880de0d5 100644 --- a/server/api-service/openblocks-domain/src/main/java/com/openblocks/domain/material/model/MaterialType.java +++ b/server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/material/model/MaterialType.java @@ -1,4 +1,4 @@ -package com.openblocks.domain.material.model; +package org.lowcoder.domain.material.model; public enum MaterialType { diff --git a/server/api-service/openblocks-domain/src/main/java/com/openblocks/domain/material/repository/MaterialMateRepository.java b/server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/material/repository/MaterialMateRepository.java similarity index 78% rename from server/api-service/openblocks-domain/src/main/java/com/openblocks/domain/material/repository/MaterialMateRepository.java rename to server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/material/repository/MaterialMateRepository.java index e6d4275ac..0061dce7f 100644 --- a/server/api-service/openblocks-domain/src/main/java/com/openblocks/domain/material/repository/MaterialMateRepository.java +++ b/server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/material/repository/MaterialMateRepository.java @@ -1,11 +1,10 @@ -package com.openblocks.domain.material.repository; +package org.lowcoder.domain.material.repository; +import org.lowcoder.domain.material.model.MaterialMeta; +import org.lowcoder.domain.material.model.MaterialType; import org.springframework.data.mongodb.repository.ReactiveMongoRepository; import org.springframework.stereotype.Repository; -import com.openblocks.domain.material.model.MaterialMeta; -import com.openblocks.domain.material.model.MaterialType; - import reactor.core.publisher.Flux; import reactor.core.publisher.Mono; diff --git a/server/api-service/openblocks-domain/src/main/java/com/openblocks/domain/material/service/meta/MaterialMetaService.java b/server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/material/service/meta/MaterialMetaService.java similarity index 79% rename from server/api-service/openblocks-domain/src/main/java/com/openblocks/domain/material/service/meta/MaterialMetaService.java rename to server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/material/service/meta/MaterialMetaService.java index 81df27939..fba2364e0 100644 --- a/server/api-service/openblocks-domain/src/main/java/com/openblocks/domain/material/service/meta/MaterialMetaService.java +++ b/server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/material/service/meta/MaterialMetaService.java @@ -1,6 +1,6 @@ -package com.openblocks.domain.material.service.meta; +package org.lowcoder.domain.material.service.meta; -import com.openblocks.domain.material.model.MaterialMeta; +import org.lowcoder.domain.material.model.MaterialMeta; import reactor.core.publisher.Flux; import reactor.core.publisher.Mono; diff --git a/server/api-service/openblocks-domain/src/main/java/com/openblocks/domain/material/service/meta/MaterialMetaServiceImpl.java b/server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/material/service/meta/MaterialMetaServiceImpl.java similarity index 87% rename from server/api-service/openblocks-domain/src/main/java/com/openblocks/domain/material/service/meta/MaterialMetaServiceImpl.java rename to server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/material/service/meta/MaterialMetaServiceImpl.java index f4cb05fd8..16e23b436 100644 --- a/server/api-service/openblocks-domain/src/main/java/com/openblocks/domain/material/service/meta/MaterialMetaServiceImpl.java +++ b/server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/material/service/meta/MaterialMetaServiceImpl.java @@ -1,8 +1,13 @@ -package com.openblocks.domain.material.service.meta; +package org.lowcoder.domain.material.service.meta; import java.util.Map; import org.apache.commons.collections4.MapUtils; +import org.lowcoder.domain.material.model.MaterialMeta; +import org.lowcoder.domain.material.repository.MaterialMateRepository; +import org.lowcoder.sdk.constants.FieldName; +import org.lowcoder.sdk.exception.BizError; +import org.lowcoder.sdk.exception.BizException; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.data.mongodb.core.ReactiveMongoTemplate; import org.springframework.data.mongodb.core.aggregation.Aggregation; @@ -11,12 +16,6 @@ import org.springframework.data.mongodb.core.query.Criteria; import org.springframework.stereotype.Service; -import com.openblocks.domain.material.model.MaterialMeta; -import com.openblocks.domain.material.repository.MaterialMateRepository; -import com.openblocks.sdk.constants.FieldName; -import com.openblocks.sdk.exception.BizError; -import com.openblocks.sdk.exception.BizException; - import reactor.core.publisher.Flux; import reactor.core.publisher.Mono; diff --git a/server/api-service/openblocks-domain/src/main/java/com/openblocks/domain/material/service/storage/GridFsStorageServiceImpl.java b/server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/material/service/storage/GridFsStorageServiceImpl.java similarity index 94% rename from server/api-service/openblocks-domain/src/main/java/com/openblocks/domain/material/service/storage/GridFsStorageServiceImpl.java rename to server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/material/service/storage/GridFsStorageServiceImpl.java index 27fe0387e..f3e68b012 100644 --- a/server/api-service/openblocks-domain/src/main/java/com/openblocks/domain/material/service/storage/GridFsStorageServiceImpl.java +++ b/server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/material/service/storage/GridFsStorageServiceImpl.java @@ -1,5 +1,6 @@ -package com.openblocks.domain.material.service.storage; +package org.lowcoder.domain.material.service.storage; +import org.lowcoder.domain.material.model.MaterialMeta; import org.reactivestreams.Publisher; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Qualifier; @@ -11,8 +12,6 @@ import org.springframework.data.mongodb.gridfs.ReactiveGridFsTemplate; import org.springframework.stereotype.Service; -import com.openblocks.domain.material.model.MaterialMeta; - import reactor.core.publisher.Mono; @Service diff --git a/server/api-service/openblocks-domain/src/main/java/com/openblocks/domain/material/service/storage/MaterialStorageService.java b/server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/material/service/storage/MaterialStorageService.java similarity index 83% rename from server/api-service/openblocks-domain/src/main/java/com/openblocks/domain/material/service/storage/MaterialStorageService.java rename to server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/material/service/storage/MaterialStorageService.java index 6cd54ee6c..03d17ecfb 100644 --- a/server/api-service/openblocks-domain/src/main/java/com/openblocks/domain/material/service/storage/MaterialStorageService.java +++ b/server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/material/service/storage/MaterialStorageService.java @@ -1,10 +1,9 @@ -package com.openblocks.domain.material.service.storage; +package org.lowcoder.domain.material.service.storage; +import org.lowcoder.domain.material.model.MaterialMeta; import org.reactivestreams.Publisher; import org.springframework.core.io.buffer.DataBuffer; -import com.openblocks.domain.material.model.MaterialMeta; - import reactor.core.publisher.Mono; import reactor.core.scheduler.Scheduler; import reactor.core.scheduler.Schedulers; diff --git a/server/api-service/openblocks-domain/src/main/java/com/openblocks/domain/mongodb/AfterMongodbRead.java b/server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/mongodb/AfterMongodbRead.java similarity index 72% rename from server/api-service/openblocks-domain/src/main/java/com/openblocks/domain/mongodb/AfterMongodbRead.java rename to server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/mongodb/AfterMongodbRead.java index 794487225..349bbd155 100644 --- a/server/api-service/openblocks-domain/src/main/java/com/openblocks/domain/mongodb/AfterMongodbRead.java +++ b/server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/mongodb/AfterMongodbRead.java @@ -1,4 +1,4 @@ -package com.openblocks.domain.mongodb; +package org.lowcoder.domain.mongodb; public interface AfterMongodbRead { diff --git a/server/api-service/openblocks-domain/src/main/java/com/openblocks/domain/mongodb/BeforeMongodbWrite.java b/server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/mongodb/BeforeMongodbWrite.java similarity index 73% rename from server/api-service/openblocks-domain/src/main/java/com/openblocks/domain/mongodb/BeforeMongodbWrite.java rename to server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/mongodb/BeforeMongodbWrite.java index bf943a859..30d514235 100644 --- a/server/api-service/openblocks-domain/src/main/java/com/openblocks/domain/mongodb/BeforeMongodbWrite.java +++ b/server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/mongodb/BeforeMongodbWrite.java @@ -1,4 +1,4 @@ -package com.openblocks.domain.mongodb; +package org.lowcoder.domain.mongodb; public interface BeforeMongodbWrite { diff --git a/server/api-service/openblocks-domain/src/main/java/com/openblocks/domain/mongodb/MongodbEventListener.java b/server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/mongodb/MongodbEventListener.java similarity index 88% rename from server/api-service/openblocks-domain/src/main/java/com/openblocks/domain/mongodb/MongodbEventListener.java rename to server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/mongodb/MongodbEventListener.java index c540167e1..92ca4044b 100644 --- a/server/api-service/openblocks-domain/src/main/java/com/openblocks/domain/mongodb/MongodbEventListener.java +++ b/server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/mongodb/MongodbEventListener.java @@ -1,5 +1,8 @@ -package com.openblocks.domain.mongodb; +package org.lowcoder.domain.mongodb; +import org.lowcoder.domain.encryption.EncryptionService; +import org.lowcoder.infra.mongo.MongoUpsertHelper; +import org.lowcoder.sdk.event.BeforeSaveEvent; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.event.EventListener; import org.springframework.data.mongodb.core.mapping.event.AbstractMongoEventListener; @@ -7,10 +10,6 @@ import org.springframework.data.mongodb.core.mapping.event.BeforeConvertEvent; import org.springframework.stereotype.Component; -import com.openblocks.domain.encryption.EncryptionService; -import com.openblocks.infra.mongo.MongoUpsertHelper; -import com.openblocks.sdk.event.BeforeSaveEvent; - import lombok.extern.slf4j.Slf4j; @Slf4j diff --git a/server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/mongodb/MongodbInterceptorContext.java b/server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/mongodb/MongodbInterceptorContext.java new file mode 100644 index 000000000..51bafed3b --- /dev/null +++ b/server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/mongodb/MongodbInterceptorContext.java @@ -0,0 +1,6 @@ +package org.lowcoder.domain.mongodb; + +import org.lowcoder.domain.encryption.EncryptionService; + +public record MongodbInterceptorContext(EncryptionService encryptionService) { +} diff --git a/server/api-service/openblocks-domain/src/main/java/com/openblocks/domain/organization/event/OrgDeletedEvent.java b/server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/organization/event/OrgDeletedEvent.java similarity index 71% rename from server/api-service/openblocks-domain/src/main/java/com/openblocks/domain/organization/event/OrgDeletedEvent.java rename to server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/organization/event/OrgDeletedEvent.java index 8d31dcab9..02e8b4226 100644 --- a/server/api-service/openblocks-domain/src/main/java/com/openblocks/domain/organization/event/OrgDeletedEvent.java +++ b/server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/organization/event/OrgDeletedEvent.java @@ -1,4 +1,4 @@ -package com.openblocks.domain.organization.event; +package org.lowcoder.domain.organization.event; import lombok.Getter; import lombok.Setter; diff --git a/server/api-service/openblocks-domain/src/main/java/com/openblocks/domain/organization/event/OrgMemberLeftEvent.java b/server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/organization/event/OrgMemberLeftEvent.java similarity index 83% rename from server/api-service/openblocks-domain/src/main/java/com/openblocks/domain/organization/event/OrgMemberLeftEvent.java rename to server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/organization/event/OrgMemberLeftEvent.java index 1142e2024..879765c85 100644 --- a/server/api-service/openblocks-domain/src/main/java/com/openblocks/domain/organization/event/OrgMemberLeftEvent.java +++ b/server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/organization/event/OrgMemberLeftEvent.java @@ -1,4 +1,4 @@ -package com.openblocks.domain.organization.event; +package org.lowcoder.domain.organization.event; import lombok.Getter; diff --git a/server/api-service/openblocks-domain/src/main/java/com/openblocks/domain/organization/model/EnterpriseConnectionConfig.java b/server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/organization/model/EnterpriseConnectionConfig.java similarity index 53% rename from server/api-service/openblocks-domain/src/main/java/com/openblocks/domain/organization/model/EnterpriseConnectionConfig.java rename to server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/organization/model/EnterpriseConnectionConfig.java index 4cc955383..1c82e7a51 100644 --- a/server/api-service/openblocks-domain/src/main/java/com/openblocks/domain/organization/model/EnterpriseConnectionConfig.java +++ b/server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/organization/model/EnterpriseConnectionConfig.java @@ -1,8 +1,8 @@ -package com.openblocks.domain.organization.model; +package org.lowcoder.domain.organization.model; import java.util.List; -import com.openblocks.sdk.auth.AbstractAuthConfig; +import org.lowcoder.sdk.auth.AbstractAuthConfig; public interface EnterpriseConnectionConfig { diff --git a/server/api-service/openblocks-domain/src/main/java/com/openblocks/domain/organization/model/MemberRole.java b/server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/organization/model/MemberRole.java similarity index 93% rename from server/api-service/openblocks-domain/src/main/java/com/openblocks/domain/organization/model/MemberRole.java rename to server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/organization/model/MemberRole.java index 2cd733081..5aefdbae6 100644 --- a/server/api-service/openblocks-domain/src/main/java/com/openblocks/domain/organization/model/MemberRole.java +++ b/server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/organization/model/MemberRole.java @@ -1,4 +1,4 @@ -package com.openblocks.domain.organization.model; +package org.lowcoder.domain.organization.model; import java.util.Arrays; import java.util.Map; diff --git a/server/api-service/openblocks-domain/src/main/java/com/openblocks/domain/organization/model/OrgMember.java b/server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/organization/model/OrgMember.java similarity index 94% rename from server/api-service/openblocks-domain/src/main/java/com/openblocks/domain/organization/model/OrgMember.java rename to server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/organization/model/OrgMember.java index 9cb72ed66..66e83f49e 100644 --- a/server/api-service/openblocks-domain/src/main/java/com/openblocks/domain/organization/model/OrgMember.java +++ b/server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/organization/model/OrgMember.java @@ -1,12 +1,12 @@ -package com.openblocks.domain.organization.model; +package org.lowcoder.domain.organization.model; import static com.google.common.base.Strings.nullToEmpty; import org.apache.commons.lang3.StringUtils; +import org.lowcoder.infra.birelation.BiRelation; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonIgnore; -import com.openblocks.infra.birelation.BiRelation; public class OrgMember { diff --git a/server/api-service/openblocks-domain/src/main/java/com/openblocks/domain/organization/model/OrgMemberState.java b/server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/organization/model/OrgMemberState.java similarity index 84% rename from server/api-service/openblocks-domain/src/main/java/com/openblocks/domain/organization/model/OrgMemberState.java rename to server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/organization/model/OrgMemberState.java index 091091424..dfc1fdf0b 100644 --- a/server/api-service/openblocks-domain/src/main/java/com/openblocks/domain/organization/model/OrgMemberState.java +++ b/server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/organization/model/OrgMemberState.java @@ -1,4 +1,4 @@ -package com.openblocks.domain.organization.model; +package org.lowcoder.domain.organization.model; public enum OrgMemberState { INVITING("inviting"), diff --git a/server/api-service/openblocks-domain/src/main/java/com/openblocks/domain/organization/model/Organization.java b/server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/organization/model/Organization.java similarity index 87% rename from server/api-service/openblocks-domain/src/main/java/com/openblocks/domain/organization/model/Organization.java rename to server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/organization/model/Organization.java index 5ce56c6fc..984788f5a 100644 --- a/server/api-service/openblocks-domain/src/main/java/com/openblocks/domain/organization/model/Organization.java +++ b/server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/organization/model/Organization.java @@ -1,8 +1,8 @@ -package com.openblocks.domain.organization.model; +package org.lowcoder.domain.organization.model; -import static com.openblocks.infra.util.AssetUtils.toAssetPath; import static java.util.Optional.ofNullable; import static org.apache.commons.lang3.ObjectUtils.firstNonNull; +import static org.lowcoder.infra.util.AssetUtils.toAssetPath; import java.util.Collections; import java.util.HashMap; @@ -11,15 +11,15 @@ import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; +import org.lowcoder.domain.mongodb.AfterMongodbRead; +import org.lowcoder.domain.mongodb.BeforeMongodbWrite; +import org.lowcoder.domain.mongodb.MongodbInterceptorContext; +import org.lowcoder.sdk.auth.AbstractAuthConfig; +import org.lowcoder.sdk.models.HasIdAndAuditing; import org.springframework.data.mongodb.core.mapping.Document; import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonProperty; -import com.openblocks.domain.mongodb.AfterMongodbRead; -import com.openblocks.domain.mongodb.BeforeMongodbWrite; -import com.openblocks.domain.mongodb.MongodbInterceptorContext; -import com.openblocks.sdk.auth.AbstractAuthConfig; -import com.openblocks.sdk.models.HasIdAndAuditing; import lombok.Getter; import lombok.NoArgsConstructor; diff --git a/server/api-service/openblocks-domain/src/main/java/com/openblocks/domain/organization/model/OrganizationDomain.java b/server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/organization/model/OrganizationDomain.java similarity index 82% rename from server/api-service/openblocks-domain/src/main/java/com/openblocks/domain/organization/model/OrganizationDomain.java rename to server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/organization/model/OrganizationDomain.java index 7336f8722..1a49f1355 100644 --- a/server/api-service/openblocks-domain/src/main/java/com/openblocks/domain/organization/model/OrganizationDomain.java +++ b/server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/organization/model/OrganizationDomain.java @@ -1,15 +1,15 @@ -package com.openblocks.domain.organization.model; +package org.lowcoder.domain.organization.model; import java.util.ArrayList; import java.util.List; +import org.lowcoder.domain.mongodb.MongodbInterceptorContext; +import org.lowcoder.sdk.auth.AbstractAuthConfig; +import org.lowcoder.sdk.config.SerializeConfig.JsonViews; +import org.lowcoder.sdk.util.JsonUtils; import org.springframework.data.annotation.Transient; import com.fasterxml.jackson.core.type.TypeReference; -import com.openblocks.domain.mongodb.MongodbInterceptorContext; -import com.openblocks.sdk.auth.AbstractAuthConfig; -import com.openblocks.sdk.config.SerializeConfig.JsonViews; -import com.openblocks.sdk.util.JsonUtils; import lombok.Getter; import lombok.Setter; diff --git a/server/api-service/openblocks-domain/src/main/java/com/openblocks/domain/organization/model/OrganizationState.java b/server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/organization/model/OrganizationState.java similarity index 54% rename from server/api-service/openblocks-domain/src/main/java/com/openblocks/domain/organization/model/OrganizationState.java rename to server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/organization/model/OrganizationState.java index 7d248c3fd..237708324 100644 --- a/server/api-service/openblocks-domain/src/main/java/com/openblocks/domain/organization/model/OrganizationState.java +++ b/server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/organization/model/OrganizationState.java @@ -1,4 +1,4 @@ -package com.openblocks.domain.organization.model; +package org.lowcoder.domain.organization.model; public enum OrganizationState { diff --git a/server/api-service/openblocks-domain/src/main/java/com/openblocks/domain/organization/repository/OrganizationRepository.java b/server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/organization/repository/OrganizationRepository.java similarity index 82% rename from server/api-service/openblocks-domain/src/main/java/com/openblocks/domain/organization/repository/OrganizationRepository.java rename to server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/organization/repository/OrganizationRepository.java index e8f00ccdb..3f10444ee 100644 --- a/server/api-service/openblocks-domain/src/main/java/com/openblocks/domain/organization/repository/OrganizationRepository.java +++ b/server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/organization/repository/OrganizationRepository.java @@ -1,13 +1,12 @@ -package com.openblocks.domain.organization.repository; +package org.lowcoder.domain.organization.repository; import java.util.Collection; +import org.lowcoder.domain.organization.model.Organization; +import org.lowcoder.domain.organization.model.OrganizationState; import org.springframework.data.mongodb.repository.ReactiveMongoRepository; import org.springframework.stereotype.Repository; -import com.openblocks.domain.organization.model.Organization; -import com.openblocks.domain.organization.model.OrganizationState; - import reactor.core.publisher.Flux; import reactor.core.publisher.Mono; diff --git a/server/api-service/openblocks-domain/src/main/java/com/openblocks/domain/organization/service/OrgMemberService.java b/server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/organization/service/OrgMemberService.java similarity index 87% rename from server/api-service/openblocks-domain/src/main/java/com/openblocks/domain/organization/service/OrgMemberService.java rename to server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/organization/service/OrgMemberService.java index 073f8b83d..e027efcf6 100644 --- a/server/api-service/openblocks-domain/src/main/java/com/openblocks/domain/organization/service/OrgMemberService.java +++ b/server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/organization/service/OrgMemberService.java @@ -1,12 +1,12 @@ -package com.openblocks.domain.organization.service; +package org.lowcoder.domain.organization.service; import java.util.Collection; import java.util.List; import java.util.Map; -import com.openblocks.domain.organization.model.MemberRole; -import com.openblocks.domain.organization.model.OrgMember; -import com.openblocks.infra.annotation.PossibleEmptyMono; +import org.lowcoder.domain.organization.model.MemberRole; +import org.lowcoder.domain.organization.model.OrgMember; +import org.lowcoder.infra.annotation.PossibleEmptyMono; import reactor.core.publisher.Flux; import reactor.core.publisher.Mono; diff --git a/server/api-service/openblocks-domain/src/main/java/com/openblocks/domain/organization/service/OrgMemberServiceImpl.java b/server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/organization/service/OrgMemberServiceImpl.java similarity index 90% rename from server/api-service/openblocks-domain/src/main/java/com/openblocks/domain/organization/service/OrgMemberServiceImpl.java rename to server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/organization/service/OrgMemberServiceImpl.java index 50a57e403..5d0b4fd08 100644 --- a/server/api-service/openblocks-domain/src/main/java/com/openblocks/domain/organization/service/OrgMemberServiceImpl.java +++ b/server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/organization/service/OrgMemberServiceImpl.java @@ -1,6 +1,6 @@ -package com.openblocks.domain.organization.service; +package org.lowcoder.domain.organization.service; -import static com.openblocks.infra.birelation.BiRelationBizType.ORG_MEMBER; +import static org.lowcoder.infra.birelation.BiRelationBizType.ORG_MEMBER; import java.util.Collection; import java.util.HashSet; @@ -9,27 +9,26 @@ import org.apache.commons.lang3.StringUtils; import org.bson.Document; +import org.lowcoder.domain.group.model.GroupMember; +import org.lowcoder.domain.group.service.GroupMemberService; +import org.lowcoder.domain.group.service.GroupService; +import org.lowcoder.domain.organization.model.MemberRole; +import org.lowcoder.domain.organization.model.OrgMember; +import org.lowcoder.domain.organization.model.OrgMemberState; +import org.lowcoder.domain.organization.model.Organization; +import org.lowcoder.domain.organization.model.OrganizationState; +import org.lowcoder.infra.annotation.PossibleEmptyMono; +import org.lowcoder.infra.birelation.BiRelation; +import org.lowcoder.infra.birelation.BiRelationService; +import org.lowcoder.infra.mongo.MongoUpsertHelper; +import org.lowcoder.infra.util.FluxHelper; +import org.lowcoder.sdk.config.CommonConfig; +import org.lowcoder.sdk.config.CommonConfig.Workspace; +import org.lowcoder.sdk.constants.WorkspaceMode; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.data.domain.PageRequest; import org.springframework.stereotype.Service; -import com.openblocks.domain.group.model.GroupMember; -import com.openblocks.domain.group.service.GroupMemberService; -import com.openblocks.domain.group.service.GroupService; -import com.openblocks.domain.organization.model.MemberRole; -import com.openblocks.domain.organization.model.OrgMember; -import com.openblocks.domain.organization.model.OrgMemberState; -import com.openblocks.domain.organization.model.Organization; -import com.openblocks.domain.organization.model.OrganizationState; -import com.openblocks.infra.annotation.PossibleEmptyMono; -import com.openblocks.infra.birelation.BiRelation; -import com.openblocks.infra.birelation.BiRelationService; -import com.openblocks.infra.mongo.MongoUpsertHelper; -import com.openblocks.infra.util.FluxHelper; -import com.openblocks.sdk.config.CommonConfig; -import com.openblocks.sdk.config.CommonConfig.Workspace; -import com.openblocks.sdk.constants.WorkspaceMode; - import lombok.extern.slf4j.Slf4j; import reactor.core.publisher.Flux; import reactor.core.publisher.Mono; diff --git a/server/api-service/openblocks-domain/src/main/java/com/openblocks/domain/organization/service/OrganizationService.java b/server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/organization/service/OrganizationService.java similarity index 74% rename from server/api-service/openblocks-domain/src/main/java/com/openblocks/domain/organization/service/OrganizationService.java rename to server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/organization/service/OrganizationService.java index e932f019b..4dc918374 100644 --- a/server/api-service/openblocks-domain/src/main/java/com/openblocks/domain/organization/service/OrganizationService.java +++ b/server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/organization/service/OrganizationService.java @@ -1,15 +1,14 @@ -package com.openblocks.domain.organization.service; +package org.lowcoder.domain.organization.service; import java.util.Collection; +import org.lowcoder.domain.organization.model.Organization; +import org.lowcoder.domain.organization.model.Organization.OrganizationCommonSettings; +import org.lowcoder.domain.user.model.User; +import org.lowcoder.infra.annotation.NonEmptyMono; +import org.lowcoder.infra.annotation.PossibleEmptyMono; import org.springframework.http.codec.multipart.Part; -import com.openblocks.domain.organization.model.Organization; -import com.openblocks.domain.organization.model.Organization.OrganizationCommonSettings; -import com.openblocks.domain.user.model.User; -import com.openblocks.infra.annotation.NonEmptyMono; -import com.openblocks.infra.annotation.PossibleEmptyMono; - import reactor.core.publisher.Flux; import reactor.core.publisher.Mono; diff --git a/server/api-service/openblocks-domain/src/main/java/com/openblocks/domain/organization/service/OrganizationServiceImpl.java b/server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/organization/service/OrganizationServiceImpl.java similarity index 82% rename from server/api-service/openblocks-domain/src/main/java/com/openblocks/domain/organization/service/OrganizationServiceImpl.java rename to server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/organization/service/OrganizationServiceImpl.java index 69c73f1af..48e4bc6de 100644 --- a/server/api-service/openblocks-domain/src/main/java/com/openblocks/domain/organization/service/OrganizationServiceImpl.java +++ b/server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/organization/service/OrganizationServiceImpl.java @@ -1,14 +1,14 @@ -package com.openblocks.domain.organization.service; - -import static com.openblocks.domain.authentication.AuthenticationService.DEFAULT_AUTH_CONFIG; -import static com.openblocks.domain.organization.model.OrganizationState.ACTIVE; -import static com.openblocks.domain.organization.model.OrganizationState.DELETED; -import static com.openblocks.domain.util.QueryDslUtils.fieldName; -import static com.openblocks.sdk.exception.BizError.UNABLE_TO_FIND_VALID_ORG; -import static com.openblocks.sdk.util.ExceptionUtils.deferredError; -import static com.openblocks.sdk.util.ExceptionUtils.ofError; -import static com.openblocks.sdk.util.LocaleUtils.getLocale; -import static com.openblocks.sdk.util.LocaleUtils.getMessage; +package org.lowcoder.domain.organization.service; + +import static org.lowcoder.domain.authentication.AuthenticationService.DEFAULT_AUTH_CONFIG; +import static org.lowcoder.domain.organization.model.OrganizationState.ACTIVE; +import static org.lowcoder.domain.organization.model.OrganizationState.DELETED; +import static org.lowcoder.domain.util.QueryDslUtils.fieldName; +import static org.lowcoder.sdk.exception.BizError.UNABLE_TO_FIND_VALID_ORG; +import static org.lowcoder.sdk.util.ExceptionUtils.deferredError; +import static org.lowcoder.sdk.util.ExceptionUtils.ofError; +import static org.lowcoder.sdk.util.LocaleUtils.getLocale; +import static org.lowcoder.sdk.util.LocaleUtils.getMessage; import java.util.Collection; import java.util.List; @@ -17,36 +17,35 @@ import javax.annotation.Nonnull; import org.apache.commons.lang3.StringUtils; +import org.lowcoder.domain.asset.model.Asset; +import org.lowcoder.domain.asset.service.AssetRepository; +import org.lowcoder.domain.asset.service.AssetService; +import org.lowcoder.domain.group.service.GroupService; +import org.lowcoder.domain.organization.event.OrgDeletedEvent; +import org.lowcoder.domain.organization.model.MemberRole; +import org.lowcoder.domain.organization.model.Organization; +import org.lowcoder.domain.organization.model.OrganizationDomain; +import org.lowcoder.domain.organization.model.OrganizationState; +import org.lowcoder.domain.organization.model.QOrganization; +import org.lowcoder.domain.organization.model.Organization.OrganizationCommonSettings; +import org.lowcoder.domain.organization.repository.OrganizationRepository; +import org.lowcoder.domain.user.model.User; +import org.lowcoder.infra.annotation.PossibleEmptyMono; +import org.lowcoder.infra.mongo.MongoUpsertHelper; +import org.lowcoder.sdk.config.CommonConfig; +import org.lowcoder.sdk.config.dynamic.Conf; +import org.lowcoder.sdk.config.dynamic.ConfigCenter; +import org.lowcoder.sdk.constants.FieldName; +import org.lowcoder.sdk.constants.WorkspaceMode; +import org.lowcoder.sdk.exception.BizError; +import org.lowcoder.sdk.exception.BizException; +import org.lowcoder.sdk.util.UriUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.ApplicationContext; import org.springframework.data.mongodb.core.query.Update; import org.springframework.http.codec.multipart.Part; import org.springframework.stereotype.Service; -import com.openblocks.domain.asset.model.Asset; -import com.openblocks.domain.asset.service.AssetRepository; -import com.openblocks.domain.asset.service.AssetService; -import com.openblocks.domain.group.service.GroupService; -import com.openblocks.domain.organization.event.OrgDeletedEvent; -import com.openblocks.domain.organization.model.MemberRole; -import com.openblocks.domain.organization.model.Organization; -import com.openblocks.domain.organization.model.Organization.OrganizationCommonSettings; -import com.openblocks.domain.organization.model.OrganizationDomain; -import com.openblocks.domain.organization.model.OrganizationState; -import com.openblocks.domain.organization.model.QOrganization; -import com.openblocks.domain.organization.repository.OrganizationRepository; -import com.openblocks.domain.user.model.User; -import com.openblocks.infra.annotation.PossibleEmptyMono; -import com.openblocks.infra.mongo.MongoUpsertHelper; -import com.openblocks.sdk.config.CommonConfig; -import com.openblocks.sdk.config.dynamic.Conf; -import com.openblocks.sdk.config.dynamic.ConfigCenter; -import com.openblocks.sdk.constants.FieldName; -import com.openblocks.sdk.constants.WorkspaceMode; -import com.openblocks.sdk.exception.BizError; -import com.openblocks.sdk.exception.BizException; -import com.openblocks.sdk.util.UriUtils; - import lombok.extern.slf4j.Slf4j; import reactor.core.publisher.Flux; import reactor.core.publisher.Mono; diff --git a/server/api-service/openblocks-domain/src/main/java/com/openblocks/domain/permission/config/PermissionConst.java b/server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/permission/config/PermissionConst.java similarity index 65% rename from server/api-service/openblocks-domain/src/main/java/com/openblocks/domain/permission/config/PermissionConst.java rename to server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/permission/config/PermissionConst.java index b39a04866..1f1c82350 100644 --- a/server/api-service/openblocks-domain/src/main/java/com/openblocks/domain/permission/config/PermissionConst.java +++ b/server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/permission/config/PermissionConst.java @@ -1,4 +1,4 @@ -package com.openblocks.domain.permission.config; +package org.lowcoder.domain.permission.config; public final class PermissionConst { diff --git a/server/api-service/openblocks-domain/src/main/java/com/openblocks/domain/permission/model/ResourceAction.java b/server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/permission/model/ResourceAction.java similarity index 97% rename from server/api-service/openblocks-domain/src/main/java/com/openblocks/domain/permission/model/ResourceAction.java rename to server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/permission/model/ResourceAction.java index ae15ad2d1..b6b214990 100644 --- a/server/api-service/openblocks-domain/src/main/java/com/openblocks/domain/permission/model/ResourceAction.java +++ b/server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/permission/model/ResourceAction.java @@ -1,4 +1,4 @@ -package com.openblocks.domain.permission.model; +package org.lowcoder.domain.permission.model; import static com.google.common.collect.Multimaps.toMultimap; import static java.util.Collections.emptySet; diff --git a/server/api-service/openblocks-domain/src/main/java/com/openblocks/domain/permission/model/ResourceHolder.java b/server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/permission/model/ResourceHolder.java similarity index 82% rename from server/api-service/openblocks-domain/src/main/java/com/openblocks/domain/permission/model/ResourceHolder.java rename to server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/permission/model/ResourceHolder.java index 2a69d12c9..8b4d36a84 100644 --- a/server/api-service/openblocks-domain/src/main/java/com/openblocks/domain/permission/model/ResourceHolder.java +++ b/server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/permission/model/ResourceHolder.java @@ -1,6 +1,6 @@ -package com.openblocks.domain.permission.model; +package org.lowcoder.domain.permission.model; -import static com.openblocks.domain.permission.config.PermissionConst.ID_SPLITTER; +import static org.lowcoder.domain.permission.config.PermissionConst.ID_SPLITTER; import java.util.Arrays; diff --git a/server/api-service/openblocks-domain/src/main/java/com/openblocks/domain/permission/model/ResourcePermission.java b/server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/permission/model/ResourcePermission.java similarity index 90% rename from server/api-service/openblocks-domain/src/main/java/com/openblocks/domain/permission/model/ResourcePermission.java rename to server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/permission/model/ResourcePermission.java index ad492e641..273eaefb9 100644 --- a/server/api-service/openblocks-domain/src/main/java/com/openblocks/domain/permission/model/ResourcePermission.java +++ b/server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/permission/model/ResourcePermission.java @@ -1,16 +1,16 @@ -package com.openblocks.domain.permission.model; +package org.lowcoder.domain.permission.model; -import static com.openblocks.domain.permission.config.PermissionConst.ID_SPLITTER; +import static org.lowcoder.domain.permission.config.PermissionConst.ID_SPLITTER; import java.util.List; import java.util.Set; import org.apache.commons.lang3.StringUtils; +import org.lowcoder.infra.birelation.BiRelation; +import org.lowcoder.infra.birelation.BiRelationBizType; +import org.lowcoder.sdk.models.HasIdAndAuditing; import com.google.common.base.Splitter; -import com.openblocks.infra.birelation.BiRelation; -import com.openblocks.infra.birelation.BiRelationBizType; -import com.openblocks.sdk.models.HasIdAndAuditing; import lombok.Builder; import lombok.Getter; diff --git a/server/api-service/openblocks-domain/src/main/java/com/openblocks/domain/permission/model/ResourceRole.java b/server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/permission/model/ResourceRole.java similarity index 96% rename from server/api-service/openblocks-domain/src/main/java/com/openblocks/domain/permission/model/ResourceRole.java rename to server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/permission/model/ResourceRole.java index 4b361a6aa..249fa88bb 100644 --- a/server/api-service/openblocks-domain/src/main/java/com/openblocks/domain/permission/model/ResourceRole.java +++ b/server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/permission/model/ResourceRole.java @@ -1,7 +1,7 @@ -package com.openblocks.domain.permission.model; +package org.lowcoder.domain.permission.model; import static com.google.common.collect.Maps.newHashMap; -import static com.openblocks.sdk.util.StreamUtils.collectMap; +import static org.lowcoder.sdk.util.StreamUtils.collectMap; import java.util.Arrays; import java.util.Collection; diff --git a/server/api-service/openblocks-domain/src/main/java/com/openblocks/domain/permission/model/ResourceType.java b/server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/permission/model/ResourceType.java similarity index 74% rename from server/api-service/openblocks-domain/src/main/java/com/openblocks/domain/permission/model/ResourceType.java rename to server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/permission/model/ResourceType.java index 39eb017a2..5b79d62d7 100644 --- a/server/api-service/openblocks-domain/src/main/java/com/openblocks/domain/permission/model/ResourceType.java +++ b/server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/permission/model/ResourceType.java @@ -1,7 +1,7 @@ -package com.openblocks.domain.permission.model; +package org.lowcoder.domain.permission.model; -import static com.openblocks.domain.permission.config.PermissionConst.ID_SPLITTER; -import static com.openblocks.sdk.util.StreamUtils.collectMap; +import static org.lowcoder.domain.permission.config.PermissionConst.ID_SPLITTER; +import static org.lowcoder.sdk.util.StreamUtils.collectMap; import java.util.Arrays; import java.util.Map; diff --git a/server/api-service/openblocks-domain/src/main/java/com/openblocks/domain/permission/model/UserPermissionOnResourceStatus.java b/server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/permission/model/UserPermissionOnResourceStatus.java similarity index 97% rename from server/api-service/openblocks-domain/src/main/java/com/openblocks/domain/permission/model/UserPermissionOnResourceStatus.java rename to server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/permission/model/UserPermissionOnResourceStatus.java index e79201f54..cc4daca0b 100644 --- a/server/api-service/openblocks-domain/src/main/java/com/openblocks/domain/permission/model/UserPermissionOnResourceStatus.java +++ b/server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/permission/model/UserPermissionOnResourceStatus.java @@ -1,4 +1,4 @@ -package com.openblocks.domain.permission.model; +package org.lowcoder.domain.permission.model; public class UserPermissionOnResourceStatus { private final ResourcePermission permission; diff --git a/server/api-service/openblocks-domain/src/main/java/com/openblocks/domain/permission/service/ApplicationPermissionHandler.java b/server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/permission/service/ApplicationPermissionHandler.java similarity index 76% rename from server/api-service/openblocks-domain/src/main/java/com/openblocks/domain/permission/service/ApplicationPermissionHandler.java rename to server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/permission/service/ApplicationPermissionHandler.java index e8f6c98ad..8ab5c7c49 100644 --- a/server/api-service/openblocks-domain/src/main/java/com/openblocks/domain/permission/service/ApplicationPermissionHandler.java +++ b/server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/permission/service/ApplicationPermissionHandler.java @@ -1,12 +1,12 @@ -package com.openblocks.domain.permission.service; +package org.lowcoder.domain.permission.service; import static com.google.common.collect.Sets.newHashSet; -import static com.openblocks.domain.permission.model.ResourceHolder.USER; -import static com.openblocks.sdk.constants.Authentication.ANONYMOUS_USER_ID; -import static com.openblocks.sdk.util.StreamUtils.collectMap; import static java.util.Collections.emptyMap; import static java.util.function.Function.identity; import static org.apache.commons.collections4.SetUtils.union; +import static org.lowcoder.domain.permission.model.ResourceHolder.USER; +import static org.lowcoder.sdk.constants.Authentication.ANONYMOUS_USER_ID; +import static org.lowcoder.sdk.util.StreamUtils.collectMap; import java.util.Collection; import java.util.Collections; @@ -14,18 +14,17 @@ import java.util.Map; import java.util.Set; +import org.lowcoder.domain.application.model.Application; +import org.lowcoder.domain.application.service.ApplicationService; +import org.lowcoder.domain.permission.model.ResourceAction; +import org.lowcoder.domain.permission.model.ResourcePermission; +import org.lowcoder.domain.permission.model.ResourceRole; +import org.lowcoder.domain.permission.model.ResourceType; +import org.lowcoder.domain.solutions.TemplateSolution; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Component; -import com.openblocks.domain.application.model.Application; -import com.openblocks.domain.application.service.ApplicationService; -import com.openblocks.domain.permission.model.ResourceAction; -import com.openblocks.domain.permission.model.ResourcePermission; -import com.openblocks.domain.permission.model.ResourceRole; -import com.openblocks.domain.permission.model.ResourceType; -import com.openblocks.domain.solutions.TemplateSolution; - import reactor.core.publisher.Mono; @Lazy diff --git a/server/api-service/openblocks-domain/src/main/java/com/openblocks/domain/permission/service/DatasourcePermissionHandler.java b/server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/permission/service/DatasourcePermissionHandler.java similarity index 84% rename from server/api-service/openblocks-domain/src/main/java/com/openblocks/domain/permission/service/DatasourcePermissionHandler.java rename to server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/permission/service/DatasourcePermissionHandler.java index 3c5cfa96a..59be368c7 100644 --- a/server/api-service/openblocks-domain/src/main/java/com/openblocks/domain/permission/service/DatasourcePermissionHandler.java +++ b/server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/permission/service/DatasourcePermissionHandler.java @@ -1,7 +1,7 @@ -package com.openblocks.domain.permission.service; +package org.lowcoder.domain.permission.service; -import static com.openblocks.domain.permission.model.ResourceHolder.USER; -import static com.openblocks.sdk.constants.Authentication.ANONYMOUS_USER_ID; +import static org.lowcoder.domain.permission.model.ResourceHolder.USER; +import static org.lowcoder.sdk.constants.Authentication.ANONYMOUS_USER_ID; import java.util.Collection; import java.util.Collections; @@ -11,17 +11,17 @@ import java.util.stream.Collectors; import org.apache.commons.collections4.CollectionUtils; +import org.lowcoder.domain.datasource.model.Datasource; +import org.lowcoder.domain.datasource.service.DatasourceService; +import org.lowcoder.domain.permission.model.ResourceAction; +import org.lowcoder.domain.permission.model.ResourcePermission; +import org.lowcoder.domain.permission.model.ResourceRole; +import org.lowcoder.domain.permission.model.ResourceType; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Component; import com.google.common.collect.Maps; -import com.openblocks.domain.datasource.model.Datasource; -import com.openblocks.domain.datasource.service.DatasourceService; -import com.openblocks.domain.permission.model.ResourceAction; -import com.openblocks.domain.permission.model.ResourcePermission; -import com.openblocks.domain.permission.model.ResourceRole; -import com.openblocks.domain.permission.model.ResourceType; import reactor.core.publisher.Mono; diff --git a/server/api-service/openblocks-domain/src/main/java/com/openblocks/domain/permission/service/ResourcePermissionHandler.java b/server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/permission/service/ResourcePermissionHandler.java similarity index 92% rename from server/api-service/openblocks-domain/src/main/java/com/openblocks/domain/permission/service/ResourcePermissionHandler.java rename to server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/permission/service/ResourcePermissionHandler.java index 576ef8800..6ad1ccdcc 100644 --- a/server/api-service/openblocks-domain/src/main/java/com/openblocks/domain/permission/service/ResourcePermissionHandler.java +++ b/server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/permission/service/ResourcePermissionHandler.java @@ -1,11 +1,11 @@ -package com.openblocks.domain.permission.service; +package org.lowcoder.domain.permission.service; -import static com.openblocks.sdk.constants.Authentication.isAnonymousUser; import static java.util.Collections.emptyList; import static java.util.Collections.emptyMap; import static java.util.Collections.singletonList; import static java.util.function.Function.identity; import static java.util.stream.Collectors.toMap; +import static org.lowcoder.sdk.constants.Authentication.isAnonymousUser; import java.util.Collection; import java.util.Collections; @@ -18,18 +18,18 @@ import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.collections4.ListUtils; +import org.lowcoder.domain.group.service.GroupMemberService; +import org.lowcoder.domain.organization.service.OrgMemberService; +import org.lowcoder.domain.permission.model.ResourceAction; +import org.lowcoder.domain.permission.model.ResourceHolder; +import org.lowcoder.domain.permission.model.ResourcePermission; +import org.lowcoder.domain.permission.model.ResourceRole; +import org.lowcoder.domain.permission.model.ResourceType; +import org.lowcoder.domain.permission.model.UserPermissionOnResourceStatus; import org.springframework.beans.factory.annotation.Autowired; import com.google.common.collect.Maps; import com.google.common.collect.Sets; -import com.openblocks.domain.group.service.GroupMemberService; -import com.openblocks.domain.organization.service.OrgMemberService; -import com.openblocks.domain.permission.model.ResourceAction; -import com.openblocks.domain.permission.model.ResourceHolder; -import com.openblocks.domain.permission.model.ResourcePermission; -import com.openblocks.domain.permission.model.ResourceRole; -import com.openblocks.domain.permission.model.ResourceType; -import com.openblocks.domain.permission.model.UserPermissionOnResourceStatus; import reactor.core.publisher.Mono; diff --git a/server/api-service/openblocks-domain/src/main/java/com/openblocks/domain/permission/service/ResourcePermissionRepository.java b/server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/permission/service/ResourcePermissionRepository.java similarity index 79% rename from server/api-service/openblocks-domain/src/main/java/com/openblocks/domain/permission/service/ResourcePermissionRepository.java rename to server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/permission/service/ResourcePermissionRepository.java index c26159709..e1988ed07 100644 --- a/server/api-service/openblocks-domain/src/main/java/com/openblocks/domain/permission/service/ResourcePermissionRepository.java +++ b/server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/permission/service/ResourcePermissionRepository.java @@ -1,15 +1,16 @@ -package com.openblocks.domain.permission.service; +package org.lowcoder.domain.permission.service; import java.util.Collection; import java.util.List; import java.util.Map; +import org.lowcoder.domain.permission.model.ResourceHolder; +import org.lowcoder.domain.permission.model.ResourcePermission; +import org.lowcoder.domain.permission.model.ResourceRole; +import org.lowcoder.domain.permission.model.ResourceType; +import org.lowcoder.infra.annotation.NonEmptyMono; + import com.google.common.collect.Multimap; -import com.openblocks.domain.permission.model.ResourceHolder; -import com.openblocks.domain.permission.model.ResourcePermission; -import com.openblocks.domain.permission.model.ResourceRole; -import com.openblocks.domain.permission.model.ResourceType; -import com.openblocks.infra.annotation.NonEmptyMono; import reactor.core.publisher.Mono; diff --git a/server/api-service/openblocks-domain/src/main/java/com/openblocks/domain/permission/service/ResourcePermissionService.java b/server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/permission/service/ResourcePermissionService.java similarity index 91% rename from server/api-service/openblocks-domain/src/main/java/com/openblocks/domain/permission/service/ResourcePermissionService.java rename to server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/permission/service/ResourcePermissionService.java index 8a7cd1116..856559110 100644 --- a/server/api-service/openblocks-domain/src/main/java/com/openblocks/domain/permission/service/ResourcePermissionService.java +++ b/server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/permission/service/ResourcePermissionService.java @@ -1,11 +1,11 @@ -package com.openblocks.domain.permission.service; +package org.lowcoder.domain.permission.service; -import static com.openblocks.sdk.exception.BizError.INVALID_PERMISSION_OPERATION; -import static com.openblocks.sdk.exception.BizError.NOT_AUTHORIZED; -import static com.openblocks.sdk.util.ExceptionUtils.ofError; -import static com.openblocks.sdk.util.ExceptionUtils.ofException; import static java.util.Collections.singleton; import static org.apache.commons.collections4.SetUtils.emptyIfNull; +import static org.lowcoder.sdk.exception.BizError.INVALID_PERMISSION_OPERATION; +import static org.lowcoder.sdk.exception.BizError.NOT_AUTHORIZED; +import static org.lowcoder.sdk.util.ExceptionUtils.ofError; +import static org.lowcoder.sdk.util.ExceptionUtils.ofException; import java.util.Collection; import java.util.Collections; @@ -19,21 +19,21 @@ import javax.validation.constraints.NotNull; import org.apache.commons.collections4.CollectionUtils; +import org.lowcoder.domain.permission.model.ResourceAction; +import org.lowcoder.domain.permission.model.ResourceHolder; +import org.lowcoder.domain.permission.model.ResourcePermission; +import org.lowcoder.domain.permission.model.ResourceRole; +import org.lowcoder.domain.permission.model.ResourceType; +import org.lowcoder.domain.permission.model.UserPermissionOnResourceStatus; +import org.lowcoder.infra.annotation.NonEmptyMono; +import org.lowcoder.infra.annotation.PossibleEmptyMono; +import org.lowcoder.sdk.exception.BizException; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Service; import com.google.common.collect.HashMultimap; import com.google.common.collect.Multimap; -import com.openblocks.domain.permission.model.ResourceAction; -import com.openblocks.domain.permission.model.ResourceHolder; -import com.openblocks.domain.permission.model.ResourcePermission; -import com.openblocks.domain.permission.model.ResourceRole; -import com.openblocks.domain.permission.model.ResourceType; -import com.openblocks.domain.permission.model.UserPermissionOnResourceStatus; -import com.openblocks.infra.annotation.NonEmptyMono; -import com.openblocks.infra.annotation.PossibleEmptyMono; -import com.openblocks.sdk.exception.BizException; import reactor.core.publisher.Flux; import reactor.core.publisher.Mono; diff --git a/server/api-service/openblocks-domain/src/main/java/com/openblocks/domain/permission/service/impl/ResourcePermissionRepositoryImpl.java b/server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/permission/service/impl/ResourcePermissionRepositoryImpl.java similarity index 87% rename from server/api-service/openblocks-domain/src/main/java/com/openblocks/domain/permission/service/impl/ResourcePermissionRepositoryImpl.java rename to server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/permission/service/impl/ResourcePermissionRepositoryImpl.java index f36a5fb20..87bfa85e9 100644 --- a/server/api-service/openblocks-domain/src/main/java/com/openblocks/domain/permission/service/impl/ResourcePermissionRepositoryImpl.java +++ b/server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/permission/service/impl/ResourcePermissionRepositoryImpl.java @@ -1,26 +1,26 @@ -package com.openblocks.domain.permission.service.impl; +package org.lowcoder.domain.permission.service.impl; -import static com.openblocks.infra.birelation.BiRelationBizType.RESOURCE; -import static com.openblocks.sdk.util.StreamUtils.collectList; +import static org.lowcoder.infra.birelation.BiRelationBizType.RESOURCE; +import static org.lowcoder.sdk.util.StreamUtils.collectList; import java.util.Collection; import java.util.List; import java.util.Map; import java.util.stream.Collectors; +import org.lowcoder.domain.permission.model.ResourceHolder; +import org.lowcoder.domain.permission.model.ResourcePermission; +import org.lowcoder.domain.permission.model.ResourceRole; +import org.lowcoder.domain.permission.model.ResourceType; +import org.lowcoder.domain.permission.service.ResourcePermissionRepository; +import org.lowcoder.infra.birelation.BiRelation; +import org.lowcoder.infra.birelation.BiRelationService; +import org.lowcoder.infra.mongo.MongoUpsertHelper; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Service; import com.google.common.collect.Multimap; -import com.openblocks.domain.permission.model.ResourceHolder; -import com.openblocks.domain.permission.model.ResourcePermission; -import com.openblocks.domain.permission.model.ResourceRole; -import com.openblocks.domain.permission.model.ResourceType; -import com.openblocks.domain.permission.service.ResourcePermissionRepository; -import com.openblocks.infra.birelation.BiRelation; -import com.openblocks.infra.birelation.BiRelationService; -import com.openblocks.infra.mongo.MongoUpsertHelper; import lombok.extern.slf4j.Slf4j; import reactor.core.publisher.Mono; diff --git a/server/api-service/openblocks-domain/src/main/java/com/openblocks/domain/permission/solution/SuggestAppAdminSolution.java b/server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/permission/solution/SuggestAppAdminSolution.java similarity index 86% rename from server/api-service/openblocks-domain/src/main/java/com/openblocks/domain/permission/solution/SuggestAppAdminSolution.java rename to server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/permission/solution/SuggestAppAdminSolution.java index b98289944..4b648bf84 100644 --- a/server/api-service/openblocks-domain/src/main/java/com/openblocks/domain/permission/solution/SuggestAppAdminSolution.java +++ b/server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/permission/solution/SuggestAppAdminSolution.java @@ -1,4 +1,4 @@ -package com.openblocks.domain.permission.solution; +package org.lowcoder.domain.permission.solution; import static com.google.common.collect.Lists.newArrayList; import static com.google.common.collect.Sets.newHashSet; @@ -10,17 +10,16 @@ import javax.annotation.Nonnull; +import org.lowcoder.domain.group.model.GroupMember; +import org.lowcoder.domain.group.service.GroupMemberService; +import org.lowcoder.domain.permission.model.ResourcePermission; +import org.lowcoder.domain.permission.model.ResourceRole; +import org.lowcoder.domain.permission.service.ResourcePermissionService; +import org.lowcoder.domain.user.model.User; +import org.lowcoder.domain.user.service.UserService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import com.openblocks.domain.group.model.GroupMember; -import com.openblocks.domain.group.service.GroupMemberService; -import com.openblocks.domain.permission.model.ResourcePermission; -import com.openblocks.domain.permission.model.ResourceRole; -import com.openblocks.domain.permission.service.ResourcePermissionService; -import com.openblocks.domain.user.model.User; -import com.openblocks.domain.user.service.UserService; - import reactor.core.publisher.Flux; import reactor.core.publisher.Mono; diff --git a/server/api-service/openblocks-domain/src/main/java/com/openblocks/domain/plugin/DatasourceMetaInfo.java b/server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/plugin/DatasourceMetaInfo.java similarity index 91% rename from server/api-service/openblocks-domain/src/main/java/com/openblocks/domain/plugin/DatasourceMetaInfo.java rename to server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/plugin/DatasourceMetaInfo.java index ed4e9ec73..d6cfec39a 100644 --- a/server/api-service/openblocks-domain/src/main/java/com/openblocks/domain/plugin/DatasourceMetaInfo.java +++ b/server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/plugin/DatasourceMetaInfo.java @@ -1,10 +1,11 @@ -package com.openblocks.domain.plugin; +package org.lowcoder.domain.plugin; import static org.apache.commons.lang3.StringUtils.firstNonEmpty; +import org.lowcoder.domain.datasource.service.DatasourceConnectionPool; + import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonProperty; -import com.openblocks.domain.datasource.service.DatasourceConnectionPool; import lombok.Builder; import lombok.Getter; diff --git a/server/api-service/openblocks-domain/src/main/java/com/openblocks/domain/plugin/DatasourceMetaInfoConstants.java b/server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/plugin/DatasourceMetaInfoConstants.java similarity index 71% rename from server/api-service/openblocks-domain/src/main/java/com/openblocks/domain/plugin/DatasourceMetaInfoConstants.java rename to server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/plugin/DatasourceMetaInfoConstants.java index f26883cb0..088ee37a0 100644 --- a/server/api-service/openblocks-domain/src/main/java/com/openblocks/domain/plugin/DatasourceMetaInfoConstants.java +++ b/server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/plugin/DatasourceMetaInfoConstants.java @@ -1,11 +1,11 @@ -package com.openblocks.domain.plugin; +package org.lowcoder.domain.plugin; public final class DatasourceMetaInfoConstants { public static final String REST_API = "restApi"; public static final String GRAPHQL_API = "graphql"; public static final String MYSQL = "mysql"; - public static final String OPENBLOCKS_API = "openblocksApi"; + public static final String LOWCODER_API = "lowcoderApi"; private DatasourceMetaInfoConstants() { } diff --git a/server/api-service/openblocks-domain/src/main/java/com/openblocks/domain/plugin/client/DatasourcePluginClient.java b/server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/plugin/client/DatasourcePluginClient.java similarity index 93% rename from server/api-service/openblocks-domain/src/main/java/com/openblocks/domain/plugin/client/DatasourcePluginClient.java rename to server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/plugin/client/DatasourcePluginClient.java index 87ffb5370..101d2986c 100644 --- a/server/api-service/openblocks-domain/src/main/java/com/openblocks/domain/plugin/client/DatasourcePluginClient.java +++ b/server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/plugin/client/DatasourcePluginClient.java @@ -1,6 +1,6 @@ -package com.openblocks.domain.plugin.client; +package org.lowcoder.domain.plugin.client; -import static com.openblocks.sdk.constants.GlobalContext.REQUEST; +import static org.lowcoder.sdk.constants.GlobalContext.REQUEST; import java.time.Duration; import java.util.Collections; @@ -11,6 +11,14 @@ import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.collections4.MapUtils; import org.apache.commons.lang3.StringUtils; +import org.lowcoder.domain.plugin.client.dto.DatasourcePluginDefinition; +import org.lowcoder.domain.plugin.client.dto.GetPluginDynamicConfigRequestDTO; +import org.lowcoder.infra.js.NodeServerClient; +import org.lowcoder.infra.js.NodeServerHelper; +import org.lowcoder.sdk.config.CommonConfigHelper; +import org.lowcoder.sdk.exception.ServerException; +import org.lowcoder.sdk.models.DatasourceTestResult; +import org.lowcoder.sdk.models.QueryExecutionResult; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.core.ParameterizedTypeReference; import org.springframework.http.HttpHeaders; @@ -19,15 +27,6 @@ import org.springframework.web.reactive.function.client.ExchangeStrategies; import org.springframework.web.reactive.function.client.WebClient; -import com.openblocks.domain.plugin.client.dto.DatasourcePluginDefinition; -import com.openblocks.domain.plugin.client.dto.GetPluginDynamicConfigRequestDTO; -import com.openblocks.infra.js.NodeServerClient; -import com.openblocks.infra.js.NodeServerHelper; -import com.openblocks.sdk.config.CommonConfigHelper; -import com.openblocks.sdk.exception.ServerException; -import com.openblocks.sdk.models.DatasourceTestResult; -import com.openblocks.sdk.models.QueryExecutionResult; - import lombok.extern.slf4j.Slf4j; import reactor.core.publisher.Flux; import reactor.core.publisher.Mono; diff --git a/server/api-service/openblocks-domain/src/main/java/com/openblocks/domain/plugin/client/dto/DatasourcePluginDefinition.java b/server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/plugin/client/dto/DatasourcePluginDefinition.java similarity index 95% rename from server/api-service/openblocks-domain/src/main/java/com/openblocks/domain/plugin/client/dto/DatasourcePluginDefinition.java rename to server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/plugin/client/dto/DatasourcePluginDefinition.java index 21823f28b..cab0e2757 100644 --- a/server/api-service/openblocks-domain/src/main/java/com/openblocks/domain/plugin/client/dto/DatasourcePluginDefinition.java +++ b/server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/plugin/client/dto/DatasourcePluginDefinition.java @@ -1,4 +1,4 @@ -package com.openblocks.domain.plugin.client.dto; +package org.lowcoder.domain.plugin.client.dto; import java.util.HashMap; import java.util.Map; diff --git a/server/api-service/openblocks-domain/src/main/java/com/openblocks/domain/plugin/client/dto/GetPluginDynamicConfigRequestDTO.java b/server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/plugin/client/dto/GetPluginDynamicConfigRequestDTO.java similarity index 84% rename from server/api-service/openblocks-domain/src/main/java/com/openblocks/domain/plugin/client/dto/GetPluginDynamicConfigRequestDTO.java rename to server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/plugin/client/dto/GetPluginDynamicConfigRequestDTO.java index 8db10451f..467d2e9be 100644 --- a/server/api-service/openblocks-domain/src/main/java/com/openblocks/domain/plugin/client/dto/GetPluginDynamicConfigRequestDTO.java +++ b/server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/plugin/client/dto/GetPluginDynamicConfigRequestDTO.java @@ -1,4 +1,4 @@ -package com.openblocks.domain.plugin.client.dto; +package org.lowcoder.domain.plugin.client.dto; import java.util.Map; diff --git a/server/api-service/openblocks-domain/src/main/java/com/openblocks/domain/plugin/service/DatasourceMetaInfoService.java b/server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/plugin/service/DatasourceMetaInfoService.java similarity index 73% rename from server/api-service/openblocks-domain/src/main/java/com/openblocks/domain/plugin/service/DatasourceMetaInfoService.java rename to server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/plugin/service/DatasourceMetaInfoService.java index 7b851c6d5..e060a67a3 100644 --- a/server/api-service/openblocks-domain/src/main/java/com/openblocks/domain/plugin/service/DatasourceMetaInfoService.java +++ b/server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/plugin/service/DatasourceMetaInfoService.java @@ -1,13 +1,13 @@ -package com.openblocks.domain.plugin.service; +package org.lowcoder.domain.plugin.service; import java.util.List; import java.util.Map; -import com.openblocks.domain.plugin.DatasourceMetaInfo; -import com.openblocks.sdk.models.DatasourceConnectionConfig; -import com.openblocks.sdk.plugin.common.DatasourceConnector; -import com.openblocks.sdk.plugin.common.QueryExecutor; -import com.openblocks.sdk.query.QueryExecutionContext; +import org.lowcoder.domain.plugin.DatasourceMetaInfo; +import org.lowcoder.sdk.models.DatasourceConnectionConfig; +import org.lowcoder.sdk.plugin.common.DatasourceConnector; +import org.lowcoder.sdk.plugin.common.QueryExecutor; +import org.lowcoder.sdk.query.QueryExecutionContext; import reactor.core.publisher.Flux; diff --git a/server/api-service/openblocks-domain/src/main/java/com/openblocks/domain/plugin/service/impl/DatasourceMetaInfoServiceImpl.java b/server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/plugin/service/impl/DatasourceMetaInfoServiceImpl.java similarity index 87% rename from server/api-service/openblocks-domain/src/main/java/com/openblocks/domain/plugin/service/impl/DatasourceMetaInfoServiceImpl.java rename to server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/plugin/service/impl/DatasourceMetaInfoServiceImpl.java index be0af05e4..8c38373d5 100644 --- a/server/api-service/openblocks-domain/src/main/java/com/openblocks/domain/plugin/service/impl/DatasourceMetaInfoServiceImpl.java +++ b/server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/plugin/service/impl/DatasourceMetaInfoServiceImpl.java @@ -1,6 +1,6 @@ -package com.openblocks.domain.plugin.service.impl; +package org.lowcoder.domain.plugin.service.impl; -import static com.openblocks.sdk.exception.BizError.INVALID_DATASOURCE_TYPE; +import static org.lowcoder.sdk.exception.BizError.INVALID_DATASOURCE_TYPE; import java.lang.reflect.Field; import java.lang.reflect.Modifier; @@ -8,25 +8,24 @@ import java.util.List; import java.util.Map; +import org.lowcoder.domain.datasource.service.impl.ClientBasedConnectionPool; +import org.lowcoder.domain.datasource.service.impl.StatelessConnectionPool; +import org.lowcoder.domain.datasource.service.impl.TokenBasedConnectionPool; +import org.lowcoder.domain.plugin.DatasourceMetaInfo; +import org.lowcoder.domain.plugin.DatasourceMetaInfoConstants; +import org.lowcoder.domain.plugin.client.DatasourcePluginClient; +import org.lowcoder.domain.plugin.service.DatasourceMetaInfoService; +import org.lowcoder.sdk.constants.ConfigTypes; +import org.lowcoder.sdk.exception.BizError; +import org.lowcoder.sdk.exception.BizException; +import org.lowcoder.sdk.models.DatasourceConnectionConfig; +import org.lowcoder.sdk.plugin.common.DatasourceConnector; +import org.lowcoder.sdk.plugin.common.QueryExecutor; +import org.lowcoder.sdk.query.QueryExecutionContext; import org.pf4j.PluginManager; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; -import com.openblocks.domain.datasource.service.impl.ClientBasedConnectionPool; -import com.openblocks.domain.datasource.service.impl.StatelessConnectionPool; -import com.openblocks.domain.datasource.service.impl.TokenBasedConnectionPool; -import com.openblocks.domain.plugin.DatasourceMetaInfo; -import com.openblocks.domain.plugin.DatasourceMetaInfoConstants; -import com.openblocks.domain.plugin.client.DatasourcePluginClient; -import com.openblocks.domain.plugin.service.DatasourceMetaInfoService; -import com.openblocks.sdk.constants.ConfigTypes; -import com.openblocks.sdk.exception.BizError; -import com.openblocks.sdk.exception.BizException; -import com.openblocks.sdk.models.DatasourceConnectionConfig; -import com.openblocks.sdk.plugin.common.DatasourceConnector; -import com.openblocks.sdk.plugin.common.QueryExecutor; -import com.openblocks.sdk.query.QueryExecutionContext; - import reactor.core.publisher.Flux; @SuppressWarnings("unused") @@ -64,10 +63,10 @@ public class DatasourceMetaInfoServiceImpl implements DatasourceMetaInfoService .connectionPool(ClientBasedConnectionPool.class) .build(); - private static final DatasourceMetaInfo OPENBLOCKS_API = DatasourceMetaInfo.builder() - .type(DatasourceMetaInfoConstants.OPENBLOCKS_API) - .displayName("Openblocks API") - .pluginExecutorKey("openblocks-api-plugin") + private static final DatasourceMetaInfo LOWCODER_API = DatasourceMetaInfo.builder() + .type(DatasourceMetaInfoConstants.LOWCODER_API) + .displayName("Lowcoder API") + .pluginExecutorKey("lowcoder-api-plugin") .connectionPool(StatelessConnectionPool.class) .build(); @@ -175,7 +174,7 @@ public List getJavaBasedSupportedDatasourceMetaInfos() { @Override public boolean isJavaDatasourcePlugin(String type) { - return "openblocksApi".equals(type) + return "lowcoderApi".equals(type) || getJavaBasedSupportedDatasourceMetaInfos() .stream() .anyMatch(datasourceMetaInfo -> datasourceMetaInfo.getType().equals(type)); diff --git a/server/api-service/openblocks-domain/src/main/java/com/openblocks/domain/query/model/ApplicationQuery.java b/server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/query/model/ApplicationQuery.java similarity index 97% rename from server/api-service/openblocks-domain/src/main/java/com/openblocks/domain/query/model/ApplicationQuery.java rename to server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/query/model/ApplicationQuery.java index 521e7873c..5edd9b0b8 100644 --- a/server/api-service/openblocks-domain/src/main/java/com/openblocks/domain/query/model/ApplicationQuery.java +++ b/server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/query/model/ApplicationQuery.java @@ -1,4 +1,4 @@ -package com.openblocks.domain.query.model; +package org.lowcoder.domain.query.model; import java.util.Map; diff --git a/server/api-service/openblocks-domain/src/main/java/com/openblocks/domain/query/model/ApplicationQueryContext.java b/server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/query/model/ApplicationQueryContext.java similarity index 78% rename from server/api-service/openblocks-domain/src/main/java/com/openblocks/domain/query/model/ApplicationQueryContext.java rename to server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/query/model/ApplicationQueryContext.java index 2ba51acd7..6eafe89fa 100644 --- a/server/api-service/openblocks-domain/src/main/java/com/openblocks/domain/query/model/ApplicationQueryContext.java +++ b/server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/query/model/ApplicationQueryContext.java @@ -1,7 +1,7 @@ -package com.openblocks.domain.query.model; +package org.lowcoder.domain.query.model; -import com.openblocks.domain.application.model.Application; -import com.openblocks.domain.datasource.model.Datasource; +import org.lowcoder.domain.application.model.Application; +import org.lowcoder.domain.datasource.model.Datasource; import lombok.Getter; import reactor.core.publisher.Mono; diff --git a/server/api-service/openblocks-domain/src/main/java/com/openblocks/domain/query/model/BaseQuery.java b/server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/query/model/BaseQuery.java similarity index 94% rename from server/api-service/openblocks-domain/src/main/java/com/openblocks/domain/query/model/BaseQuery.java rename to server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/query/model/BaseQuery.java index 5fbc95215..7e25691ea 100644 --- a/server/api-service/openblocks-domain/src/main/java/com/openblocks/domain/query/model/BaseQuery.java +++ b/server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/query/model/BaseQuery.java @@ -1,4 +1,4 @@ -package com.openblocks.domain.query.model; +package org.lowcoder.domain.query.model; import java.util.Map; diff --git a/server/api-service/openblocks-domain/src/main/java/com/openblocks/domain/query/model/LibraryQuery.java b/server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/query/model/LibraryQuery.java similarity index 90% rename from server/api-service/openblocks-domain/src/main/java/com/openblocks/domain/query/model/LibraryQuery.java rename to server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/query/model/LibraryQuery.java index a3b9f7579..bff100e12 100644 --- a/server/api-service/openblocks-domain/src/main/java/com/openblocks/domain/query/model/LibraryQuery.java +++ b/server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/query/model/LibraryQuery.java @@ -1,17 +1,17 @@ -package com.openblocks.domain.query.model; +package org.lowcoder.domain.query.model; import static com.google.common.base.Suppliers.memoize; import java.util.Map; import java.util.function.Supplier; +import org.lowcoder.sdk.models.HasIdAndAuditing; +import org.lowcoder.sdk.util.JsonUtils; import org.springframework.data.annotation.Transient; import org.springframework.data.mongodb.core.mapping.Document; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; -import com.openblocks.sdk.models.HasIdAndAuditing; -import com.openblocks.sdk.util.JsonUtils; import lombok.Builder; import lombok.Getter; diff --git a/server/api-service/openblocks-domain/src/main/java/com/openblocks/domain/query/model/LibraryQueryCombineId.java b/server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/query/model/LibraryQueryCombineId.java similarity index 90% rename from server/api-service/openblocks-domain/src/main/java/com/openblocks/domain/query/model/LibraryQueryCombineId.java rename to server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/query/model/LibraryQueryCombineId.java index 33d1945cd..21d1f87c7 100644 --- a/server/api-service/openblocks-domain/src/main/java/com/openblocks/domain/query/model/LibraryQueryCombineId.java +++ b/server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/query/model/LibraryQueryCombineId.java @@ -1,4 +1,4 @@ -package com.openblocks.domain.query.model; +package org.lowcoder.domain.query.model; import org.apache.commons.lang.StringUtils; diff --git a/server/api-service/openblocks-domain/src/main/java/com/openblocks/domain/query/model/LibraryQueryRecord.java b/server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/query/model/LibraryQueryRecord.java similarity index 91% rename from server/api-service/openblocks-domain/src/main/java/com/openblocks/domain/query/model/LibraryQueryRecord.java rename to server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/query/model/LibraryQueryRecord.java index e3f3422d2..6e290227f 100644 --- a/server/api-service/openblocks-domain/src/main/java/com/openblocks/domain/query/model/LibraryQueryRecord.java +++ b/server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/query/model/LibraryQueryRecord.java @@ -1,17 +1,17 @@ -package com.openblocks.domain.query.model; +package org.lowcoder.domain.query.model; import static com.google.common.base.Suppliers.memoize; import java.util.Map; import java.util.function.Supplier; +import org.lowcoder.sdk.models.HasIdAndAuditing; +import org.lowcoder.sdk.util.JsonUtils; import org.springframework.data.annotation.Transient; import org.springframework.data.mongodb.core.mapping.Document; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; -import com.openblocks.sdk.models.HasIdAndAuditing; -import com.openblocks.sdk.util.JsonUtils; import lombok.Builder; import lombok.Getter; diff --git a/server/api-service/openblocks-domain/src/main/java/com/openblocks/domain/query/model/QueryContext.java b/server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/query/model/QueryContext.java similarity index 79% rename from server/api-service/openblocks-domain/src/main/java/com/openblocks/domain/query/model/QueryContext.java rename to server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/query/model/QueryContext.java index e51c1be1f..306d10d77 100644 --- a/server/api-service/openblocks-domain/src/main/java/com/openblocks/domain/query/model/QueryContext.java +++ b/server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/query/model/QueryContext.java @@ -1,6 +1,6 @@ -package com.openblocks.domain.query.model; +package org.lowcoder.domain.query.model; -import com.openblocks.domain.datasource.model.Datasource; +import org.lowcoder.domain.datasource.model.Datasource; import lombok.Getter; import reactor.core.publisher.Mono; diff --git a/server/api-service/openblocks-domain/src/main/java/com/openblocks/domain/query/repository/LibraryQueryRecordRepository.java b/server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/query/repository/LibraryQueryRecordRepository.java similarity index 85% rename from server/api-service/openblocks-domain/src/main/java/com/openblocks/domain/query/repository/LibraryQueryRecordRepository.java rename to server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/query/repository/LibraryQueryRecordRepository.java index 85c558cda..70d33577f 100644 --- a/server/api-service/openblocks-domain/src/main/java/com/openblocks/domain/query/repository/LibraryQueryRecordRepository.java +++ b/server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/query/repository/LibraryQueryRecordRepository.java @@ -1,12 +1,11 @@ -package com.openblocks.domain.query.repository; +package org.lowcoder.domain.query.repository; import java.util.List; +import org.lowcoder.domain.query.model.LibraryQueryRecord; import org.springframework.data.mongodb.repository.ReactiveMongoRepository; import org.springframework.stereotype.Repository; -import com.openblocks.domain.query.model.LibraryQueryRecord; - import reactor.core.publisher.Flux; import reactor.core.publisher.Mono; diff --git a/server/api-service/openblocks-domain/src/main/java/com/openblocks/domain/query/repository/LibraryQueryRepository.java b/server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/query/repository/LibraryQueryRepository.java similarity index 80% rename from server/api-service/openblocks-domain/src/main/java/com/openblocks/domain/query/repository/LibraryQueryRepository.java rename to server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/query/repository/LibraryQueryRepository.java index 1de8f0b79..2e711bea5 100644 --- a/server/api-service/openblocks-domain/src/main/java/com/openblocks/domain/query/repository/LibraryQueryRepository.java +++ b/server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/query/repository/LibraryQueryRepository.java @@ -1,10 +1,9 @@ -package com.openblocks.domain.query.repository; +package org.lowcoder.domain.query.repository; +import org.lowcoder.domain.query.model.LibraryQuery; import org.springframework.data.mongodb.repository.ReactiveMongoRepository; import org.springframework.stereotype.Repository; -import com.openblocks.domain.query.model.LibraryQuery; - import reactor.core.publisher.Flux; import reactor.core.publisher.Mono; diff --git a/server/api-service/openblocks-domain/src/main/java/com/openblocks/domain/query/service/LibraryQueryRecordService.java b/server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/query/service/LibraryQueryRecordService.java similarity index 86% rename from server/api-service/openblocks-domain/src/main/java/com/openblocks/domain/query/service/LibraryQueryRecordService.java rename to server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/query/service/LibraryQueryRecordService.java index 547b1d3f3..816c12b55 100644 --- a/server/api-service/openblocks-domain/src/main/java/com/openblocks/domain/query/service/LibraryQueryRecordService.java +++ b/server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/query/service/LibraryQueryRecordService.java @@ -1,19 +1,18 @@ -package com.openblocks.domain.query.service; +package org.lowcoder.domain.query.service; -import static com.openblocks.sdk.exception.BizError.LIBRARY_QUERY_NOT_FOUND; -import static com.openblocks.sdk.util.ExceptionUtils.deferredError; +import static org.lowcoder.sdk.exception.BizError.LIBRARY_QUERY_NOT_FOUND; +import static org.lowcoder.sdk.util.ExceptionUtils.deferredError; import java.util.Comparator; import java.util.List; import java.util.Map; import java.util.stream.Collectors; +import org.lowcoder.domain.query.model.LibraryQueryRecord; +import org.lowcoder.domain.query.repository.LibraryQueryRecordRepository; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import com.openblocks.domain.query.model.LibraryQueryRecord; -import com.openblocks.domain.query.repository.LibraryQueryRecordRepository; - import reactor.core.publisher.Mono; @Service diff --git a/server/api-service/openblocks-domain/src/main/java/com/openblocks/domain/query/service/LibraryQueryService.java b/server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/query/service/LibraryQueryService.java similarity index 83% rename from server/api-service/openblocks-domain/src/main/java/com/openblocks/domain/query/service/LibraryQueryService.java rename to server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/query/service/LibraryQueryService.java index 9b9eff7f1..8ec5faafe 100644 --- a/server/api-service/openblocks-domain/src/main/java/com/openblocks/domain/query/service/LibraryQueryService.java +++ b/server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/query/service/LibraryQueryService.java @@ -1,19 +1,18 @@ -package com.openblocks.domain.query.service; +package org.lowcoder.domain.query.service; -import static com.openblocks.sdk.exception.BizError.LIBRARY_QUERY_NOT_FOUND; -import static com.openblocks.sdk.util.ExceptionUtils.deferredError; +import static org.lowcoder.sdk.exception.BizError.LIBRARY_QUERY_NOT_FOUND; +import static org.lowcoder.sdk.util.ExceptionUtils.deferredError; import java.util.Map; +import org.lowcoder.domain.query.model.BaseQuery; +import org.lowcoder.domain.query.model.LibraryQuery; +import org.lowcoder.domain.query.model.LibraryQueryRecord; +import org.lowcoder.domain.query.repository.LibraryQueryRepository; +import org.lowcoder.infra.mongo.MongoUpsertHelper; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import com.openblocks.domain.query.model.BaseQuery; -import com.openblocks.domain.query.model.LibraryQuery; -import com.openblocks.domain.query.model.LibraryQueryRecord; -import com.openblocks.domain.query.repository.LibraryQueryRepository; -import com.openblocks.infra.mongo.MongoUpsertHelper; - import reactor.core.publisher.Flux; import reactor.core.publisher.Mono; diff --git a/server/api-service/openblocks-domain/src/main/java/com/openblocks/domain/query/service/QueryExecutionService.java b/server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/query/service/QueryExecutionService.java similarity index 78% rename from server/api-service/openblocks-domain/src/main/java/com/openblocks/domain/query/service/QueryExecutionService.java rename to server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/query/service/QueryExecutionService.java index 4a3a363a9..78a464fcb 100644 --- a/server/api-service/openblocks-domain/src/main/java/com/openblocks/domain/query/service/QueryExecutionService.java +++ b/server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/query/service/QueryExecutionService.java @@ -1,8 +1,8 @@ -package com.openblocks.domain.query.service; +package org.lowcoder.domain.query.service; -import static com.openblocks.sdk.exception.BizError.QUERY_EXECUTION_ERROR; -import static com.openblocks.sdk.exception.PluginCommonError.QUERY_EXECUTION_TIMEOUT; -import static com.openblocks.sdk.util.ExceptionUtils.ofException; +import static org.lowcoder.sdk.exception.BizError.QUERY_EXECUTION_ERROR; +import static org.lowcoder.sdk.exception.PluginCommonError.QUERY_EXECUTION_TIMEOUT; +import static org.lowcoder.sdk.util.ExceptionUtils.ofException; import java.time.Duration; import java.util.List; @@ -10,21 +10,20 @@ import java.util.concurrent.TimeoutException; import java.util.stream.Collectors; +import org.lowcoder.domain.datasource.model.Datasource; +import org.lowcoder.domain.datasource.model.DatasourceConnectionHolder; +import org.lowcoder.domain.datasource.service.DatasourceConnectionPool; +import org.lowcoder.domain.plugin.client.DatasourcePluginClient; +import org.lowcoder.domain.plugin.service.DatasourceMetaInfoService; +import org.lowcoder.domain.query.util.QueryTimeoutUtils; +import org.lowcoder.sdk.exception.BizException; +import org.lowcoder.sdk.exception.PluginException; +import org.lowcoder.sdk.models.QueryExecutionResult; +import org.lowcoder.sdk.query.QueryExecutionContext; +import org.lowcoder.sdk.query.QueryVisitorContext; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import com.openblocks.domain.datasource.model.Datasource; -import com.openblocks.domain.datasource.model.DatasourceConnectionHolder; -import com.openblocks.domain.datasource.service.DatasourceConnectionPool; -import com.openblocks.domain.plugin.client.DatasourcePluginClient; -import com.openblocks.domain.plugin.service.DatasourceMetaInfoService; -import com.openblocks.domain.query.util.QueryTimeoutUtils; -import com.openblocks.sdk.exception.BizException; -import com.openblocks.sdk.exception.PluginException; -import com.openblocks.sdk.models.QueryExecutionResult; -import com.openblocks.sdk.query.QueryExecutionContext; -import com.openblocks.sdk.query.QueryVisitorContext; - import lombok.extern.slf4j.Slf4j; import reactor.core.publisher.Mono; diff --git a/server/api-service/openblocks-domain/src/main/java/com/openblocks/domain/query/util/QueryTimeoutUtils.java b/server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/query/util/QueryTimeoutUtils.java similarity index 86% rename from server/api-service/openblocks-domain/src/main/java/com/openblocks/domain/query/util/QueryTimeoutUtils.java rename to server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/query/util/QueryTimeoutUtils.java index 91f660e54..aaab4c0dc 100644 --- a/server/api-service/openblocks-domain/src/main/java/com/openblocks/domain/query/util/QueryTimeoutUtils.java +++ b/server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/query/util/QueryTimeoutUtils.java @@ -1,8 +1,8 @@ -package com.openblocks.domain.query.util; +package org.lowcoder.domain.query.util; -import static com.openblocks.sdk.exception.PluginCommonError.EXCEED_MAX_QUERY_TIMEOUT; -import static com.openblocks.sdk.exception.PluginCommonError.QUERY_ARGUMENT_ERROR; -import static com.openblocks.sdk.util.MustacheHelper.renderMustacheString; +import static org.lowcoder.sdk.exception.PluginCommonError.EXCEED_MAX_QUERY_TIMEOUT; +import static org.lowcoder.sdk.exception.PluginCommonError.QUERY_ARGUMENT_ERROR; +import static org.lowcoder.sdk.util.MustacheHelper.renderMustacheString; import java.time.Duration; import java.util.Map; @@ -10,9 +10,9 @@ import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.math.NumberUtils; import org.apache.commons.lang3.tuple.Pair; +import org.lowcoder.sdk.exception.PluginException; import com.google.common.annotations.VisibleForTesting; -import com.openblocks.sdk.exception.PluginException; public final class QueryTimeoutUtils { diff --git a/server/api-service/openblocks-domain/src/main/java/com/openblocks/domain/solutions/TemplateSolution.java b/server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/solutions/TemplateSolution.java similarity index 83% rename from server/api-service/openblocks-domain/src/main/java/com/openblocks/domain/solutions/TemplateSolution.java rename to server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/solutions/TemplateSolution.java index 4afe6eed0..85d73b84b 100644 --- a/server/api-service/openblocks-domain/src/main/java/com/openblocks/domain/solutions/TemplateSolution.java +++ b/server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/solutions/TemplateSolution.java @@ -1,10 +1,10 @@ -package com.openblocks.domain.solutions; +package org.lowcoder.domain.solutions; -import static com.openblocks.sdk.exception.BizError.TEMPLATE_NOT_CORRECT; -import static com.openblocks.sdk.exception.BizError.TEMPLATE_NOT_EXIST; -import static com.openblocks.sdk.util.ExceptionUtils.deferredError; -import static com.openblocks.sdk.util.ExceptionUtils.ofError; import static java.util.Objects.isNull; +import static org.lowcoder.sdk.exception.BizError.TEMPLATE_NOT_CORRECT; +import static org.lowcoder.sdk.exception.BizError.TEMPLATE_NOT_EXIST; +import static org.lowcoder.sdk.util.ExceptionUtils.deferredError; +import static org.lowcoder.sdk.util.ExceptionUtils.ofError; import java.util.Collection; import java.util.List; @@ -16,23 +16,22 @@ import org.apache.commons.lang3.RandomStringUtils; import org.apache.commons.lang3.tuple.Pair; +import org.lowcoder.domain.application.model.Application; +import org.lowcoder.domain.application.model.ApplicationStatus; +import org.lowcoder.domain.application.service.ApplicationService; +import org.lowcoder.domain.datasource.model.Datasource; +import org.lowcoder.domain.datasource.model.DatasourceCreationSource; +import org.lowcoder.domain.datasource.service.DatasourceService; +import org.lowcoder.domain.query.model.ApplicationQuery; +import org.lowcoder.domain.template.model.Template; +import org.lowcoder.domain.template.service.TemplateService; +import org.lowcoder.infra.annotation.NonEmptyMono; +import org.lowcoder.infra.util.TupleUtils; +import org.lowcoder.sdk.util.JsonUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Service; -import com.openblocks.domain.application.model.Application; -import com.openblocks.domain.application.model.ApplicationStatus; -import com.openblocks.domain.application.service.ApplicationService; -import com.openblocks.domain.datasource.model.Datasource; -import com.openblocks.domain.datasource.model.DatasourceCreationSource; -import com.openblocks.domain.datasource.service.DatasourceService; -import com.openblocks.domain.query.model.ApplicationQuery; -import com.openblocks.domain.template.model.Template; -import com.openblocks.domain.template.service.TemplateService; -import com.openblocks.infra.annotation.NonEmptyMono; -import com.openblocks.infra.util.TupleUtils; -import com.openblocks.sdk.util.JsonUtils; - import reactor.core.publisher.Flux; import reactor.core.publisher.Mono; @@ -124,8 +123,8 @@ private Mono doCopyDatasource(String organizationId, String datasourceId return Mono.just(Datasource.QUICK_REST_API.getId()); } - if (datasource.isLegacyOpenblocksApi()) { - return Mono.just(Datasource.OPENBLOCKS_API.getId()); + if (datasource.isLegacyLowcoderApi()) { + return Mono.just(Datasource.LOWCODER_API.getId()); } return createNewDatasourceFrom(organizationId, visitorId, datasource); }); diff --git a/server/api-service/openblocks-domain/src/main/java/com/openblocks/domain/template/model/Template.java b/server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/template/model/Template.java similarity index 73% rename from server/api-service/openblocks-domain/src/main/java/com/openblocks/domain/template/model/Template.java rename to server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/template/model/Template.java index 33ee20fc4..b6de06265 100644 --- a/server/api-service/openblocks-domain/src/main/java/com/openblocks/domain/template/model/Template.java +++ b/server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/template/model/Template.java @@ -1,9 +1,8 @@ -package com.openblocks.domain.template.model; +package org.lowcoder.domain.template.model; +import org.lowcoder.sdk.models.HasIdAndAuditing; import org.springframework.data.mongodb.core.mapping.Document; -import com.openblocks.sdk.models.HasIdAndAuditing; - import lombok.Getter; @Document diff --git a/server/api-service/openblocks-domain/src/main/java/com/openblocks/domain/template/repository/TemplateRepository.java b/server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/template/repository/TemplateRepository.java similarity index 84% rename from server/api-service/openblocks-domain/src/main/java/com/openblocks/domain/template/repository/TemplateRepository.java rename to server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/template/repository/TemplateRepository.java index e7fe3e48d..0e6762c3f 100644 --- a/server/api-service/openblocks-domain/src/main/java/com/openblocks/domain/template/repository/TemplateRepository.java +++ b/server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/template/repository/TemplateRepository.java @@ -1,14 +1,13 @@ -package com.openblocks.domain.template.repository; +package org.lowcoder.domain.template.repository; import java.util.Collection; import javax.annotation.Nonnull; +import org.lowcoder.domain.template.model.Template; import org.springframework.data.mongodb.repository.ReactiveMongoRepository; import org.springframework.stereotype.Repository; -import com.openblocks.domain.template.model.Template; - import reactor.core.publisher.Flux; import reactor.core.publisher.Mono; diff --git a/server/api-service/openblocks-domain/src/main/java/com/openblocks/domain/template/service/TemplateService.java b/server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/template/service/TemplateService.java similarity index 82% rename from server/api-service/openblocks-domain/src/main/java/com/openblocks/domain/template/service/TemplateService.java rename to server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/template/service/TemplateService.java index d842bb67a..6e2831f48 100644 --- a/server/api-service/openblocks-domain/src/main/java/com/openblocks/domain/template/service/TemplateService.java +++ b/server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/template/service/TemplateService.java @@ -1,13 +1,12 @@ -package com.openblocks.domain.template.service; +package org.lowcoder.domain.template.service; import java.util.Collection; +import org.lowcoder.domain.template.model.Template; +import org.lowcoder.domain.template.repository.TemplateRepository; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import com.openblocks.domain.template.model.Template; -import com.openblocks.domain.template.repository.TemplateRepository; - import lombok.extern.slf4j.Slf4j; import reactor.core.publisher.Flux; import reactor.core.publisher.Mono; diff --git a/server/api-service/openblocks-domain/src/main/java/com/openblocks/domain/user/constant/UserStatusType.java b/server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/user/constant/UserStatusType.java similarity index 94% rename from server/api-service/openblocks-domain/src/main/java/com/openblocks/domain/user/constant/UserStatusType.java rename to server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/user/constant/UserStatusType.java index 3c704cb32..f5c33fb47 100644 --- a/server/api-service/openblocks-domain/src/main/java/com/openblocks/domain/user/constant/UserStatusType.java +++ b/server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/user/constant/UserStatusType.java @@ -1,4 +1,4 @@ -package com.openblocks.domain.user.constant; +package org.lowcoder.domain.user.constant; import java.util.Arrays; import java.util.Map; diff --git a/server/api-service/openblocks-domain/src/main/java/com/openblocks/domain/user/model/AuthToken.java b/server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/user/model/AuthToken.java similarity index 87% rename from server/api-service/openblocks-domain/src/main/java/com/openblocks/domain/user/model/AuthToken.java rename to server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/user/model/AuthToken.java index 4e5adfd4d..e424447eb 100644 --- a/server/api-service/openblocks-domain/src/main/java/com/openblocks/domain/user/model/AuthToken.java +++ b/server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/user/model/AuthToken.java @@ -1,4 +1,4 @@ -package com.openblocks.domain.user.model; +package org.lowcoder.domain.user.model; import java.io.Serializable; diff --git a/server/api-service/openblocks-domain/src/main/java/com/openblocks/domain/user/model/AuthUser.java b/server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/user/model/AuthUser.java similarity index 92% rename from server/api-service/openblocks-domain/src/main/java/com/openblocks/domain/user/model/AuthUser.java rename to server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/user/model/AuthUser.java index f2a6cf675..94d9f53f4 100644 --- a/server/api-service/openblocks-domain/src/main/java/com/openblocks/domain/user/model/AuthUser.java +++ b/server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/user/model/AuthUser.java @@ -1,4 +1,4 @@ -package com.openblocks.domain.user.model; +package org.lowcoder.domain.user.model; import java.util.Map; import java.util.Optional; @@ -7,8 +7,7 @@ import javax.annotation.Nullable; import org.apache.commons.lang3.StringUtils; - -import com.openblocks.domain.authentication.context.AuthRequestContext; +import org.lowcoder.domain.authentication.context.AuthRequestContext; import lombok.AllArgsConstructor; import lombok.Builder; diff --git a/server/api-service/openblocks-domain/src/main/java/com/openblocks/domain/user/model/Connection.java b/server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/user/model/Connection.java similarity index 97% rename from server/api-service/openblocks-domain/src/main/java/com/openblocks/domain/user/model/Connection.java rename to server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/user/model/Connection.java index 307e74e86..3dbd91e27 100644 --- a/server/api-service/openblocks-domain/src/main/java/com/openblocks/domain/user/model/Connection.java +++ b/server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/user/model/Connection.java @@ -1,4 +1,4 @@ -package com.openblocks.domain.user.model; +package org.lowcoder.domain.user.model; import static org.apache.commons.collections4.MapUtils.emptyIfNull; @@ -12,12 +12,12 @@ import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.collections4.SetUtils; import org.apache.commons.lang3.StringUtils; +import org.lowcoder.sdk.constants.AuthSourceConstants; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonProperty.Access; -import com.openblocks.sdk.constants.AuthSourceConstants; import lombok.Builder; import lombok.Getter; diff --git a/server/api-service/openblocks-domain/src/main/java/com/openblocks/domain/user/model/ConnectionAuthToken.java b/server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/user/model/ConnectionAuthToken.java similarity index 96% rename from server/api-service/openblocks-domain/src/main/java/com/openblocks/domain/user/model/ConnectionAuthToken.java rename to server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/user/model/ConnectionAuthToken.java index 77e3defbd..fb0dc8325 100644 --- a/server/api-service/openblocks-domain/src/main/java/com/openblocks/domain/user/model/ConnectionAuthToken.java +++ b/server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/user/model/ConnectionAuthToken.java @@ -1,4 +1,4 @@ -package com.openblocks.domain.user.model; +package org.lowcoder.domain.user.model; import lombok.Builder; import lombok.Data; diff --git a/server/api-service/openblocks-domain/src/main/java/com/openblocks/domain/user/model/InviteUser.java b/server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/user/model/InviteUser.java similarity index 84% rename from server/api-service/openblocks-domain/src/main/java/com/openblocks/domain/user/model/InviteUser.java rename to server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/user/model/InviteUser.java index a07a8ebec..0b6db9de6 100644 --- a/server/api-service/openblocks-domain/src/main/java/com/openblocks/domain/user/model/InviteUser.java +++ b/server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/user/model/InviteUser.java @@ -1,4 +1,4 @@ -package com.openblocks.domain.user.model; +package org.lowcoder.domain.user.model; import org.springframework.data.mongodb.core.mapping.Document; diff --git a/server/api-service/openblocks-domain/src/main/java/com/openblocks/domain/user/model/User.java b/server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/user/model/User.java similarity index 94% rename from server/api-service/openblocks-domain/src/main/java/com/openblocks/domain/user/model/User.java rename to server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/user/model/User.java index c1020ba67..484b4353b 100644 --- a/server/api-service/openblocks-domain/src/main/java/com/openblocks/domain/user/model/User.java +++ b/server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/user/model/User.java @@ -1,7 +1,7 @@ -package com.openblocks.domain.user.model; +package org.lowcoder.domain.user.model; import static com.google.common.base.Suppliers.memoize; -import static com.openblocks.infra.util.AssetUtils.toAssetPath; +import static org.lowcoder.infra.util.AssetUtils.toAssetPath; import java.util.HashMap; import java.util.HashSet; @@ -11,13 +11,13 @@ import org.apache.commons.collections4.SetUtils; import org.apache.commons.lang3.StringUtils; +import org.lowcoder.sdk.models.HasIdAndAuditing; import org.springframework.data.annotation.Transient; import org.springframework.data.mongodb.core.mapping.Document; import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonProperty; -import com.openblocks.sdk.models.HasIdAndAuditing; import lombok.Getter; import lombok.Setter; diff --git a/server/api-service/openblocks-domain/src/main/java/com/openblocks/domain/user/model/UserDetail.java b/server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/user/model/UserDetail.java similarity index 94% rename from server/api-service/openblocks-domain/src/main/java/com/openblocks/domain/user/model/UserDetail.java rename to server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/user/model/UserDetail.java index dd6728326..87f0fe719 100644 --- a/server/api-service/openblocks-domain/src/main/java/com/openblocks/domain/user/model/UserDetail.java +++ b/server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/user/model/UserDetail.java @@ -1,4 +1,4 @@ -package com.openblocks.domain.user.model; +package org.lowcoder.domain.user.model; import java.util.Collections; import java.util.List; diff --git a/server/api-service/openblocks-domain/src/main/java/com/openblocks/domain/user/model/UserState.java b/server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/user/model/UserState.java similarity index 73% rename from server/api-service/openblocks-domain/src/main/java/com/openblocks/domain/user/model/UserState.java rename to server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/user/model/UserState.java index f53602509..c24930aa4 100644 --- a/server/api-service/openblocks-domain/src/main/java/com/openblocks/domain/user/model/UserState.java +++ b/server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/user/model/UserState.java @@ -1,4 +1,4 @@ -package com.openblocks.domain.user.model; +package org.lowcoder.domain.user.model; public enum UserState { NEW, INVITED, ACTIVATED, diff --git a/server/api-service/openblocks-domain/src/main/java/com/openblocks/domain/user/model/UserStatus.java b/server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/user/model/UserStatus.java similarity index 92% rename from server/api-service/openblocks-domain/src/main/java/com/openblocks/domain/user/model/UserStatus.java rename to server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/user/model/UserStatus.java index 9cc106c6f..5e8e5297d 100644 --- a/server/api-service/openblocks-domain/src/main/java/com/openblocks/domain/user/model/UserStatus.java +++ b/server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/user/model/UserStatus.java @@ -1,8 +1,8 @@ -package com.openblocks.domain.user.model; +package org.lowcoder.domain.user.model; import static com.google.common.collect.Maps.newHashMap; -import static com.openblocks.domain.user.constant.UserStatusType.HAS_SHOW_NEW_USER_GUIDANCE; import static org.apache.commons.lang3.BooleanUtils.isTrue; +import static org.lowcoder.domain.user.constant.UserStatusType.HAS_SHOW_NEW_USER_GUIDANCE; import java.util.Map; diff --git a/server/api-service/openblocks-domain/src/main/java/com/openblocks/domain/user/repository/UserRepository.java b/server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/user/repository/UserRepository.java similarity index 85% rename from server/api-service/openblocks-domain/src/main/java/com/openblocks/domain/user/repository/UserRepository.java rename to server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/user/repository/UserRepository.java index 1c2e29b55..757453909 100644 --- a/server/api-service/openblocks-domain/src/main/java/com/openblocks/domain/user/repository/UserRepository.java +++ b/server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/user/repository/UserRepository.java @@ -1,12 +1,11 @@ -package com.openblocks.domain.user.repository; +package org.lowcoder.domain.user.repository; import java.util.Collection; +import org.lowcoder.domain.user.model.User; import org.springframework.data.mongodb.repository.ReactiveMongoRepository; import org.springframework.stereotype.Repository; -import com.openblocks.domain.user.model.User; - import reactor.core.publisher.Flux; import reactor.core.publisher.Mono; diff --git a/server/api-service/openblocks-domain/src/main/java/com/openblocks/domain/user/repository/UserStatusRepository.java b/server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/user/repository/UserStatusRepository.java similarity index 70% rename from server/api-service/openblocks-domain/src/main/java/com/openblocks/domain/user/repository/UserStatusRepository.java rename to server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/user/repository/UserStatusRepository.java index d6e058187..6a5834dae 100644 --- a/server/api-service/openblocks-domain/src/main/java/com/openblocks/domain/user/repository/UserStatusRepository.java +++ b/server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/user/repository/UserStatusRepository.java @@ -1,10 +1,9 @@ -package com.openblocks.domain.user.repository; +package org.lowcoder.domain.user.repository; +import org.lowcoder.domain.user.model.UserStatus; import org.springframework.data.mongodb.repository.ReactiveMongoRepository; import org.springframework.stereotype.Repository; -import com.openblocks.domain.user.model.UserStatus; - @Repository public interface UserStatusRepository extends ReactiveMongoRepository { diff --git a/server/api-service/openblocks-domain/src/main/java/com/openblocks/domain/user/service/UserService.java b/server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/user/service/UserService.java similarity index 81% rename from server/api-service/openblocks-domain/src/main/java/com/openblocks/domain/user/service/UserService.java rename to server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/user/service/UserService.java index 1d136554c..b93e37594 100644 --- a/server/api-service/openblocks-domain/src/main/java/com/openblocks/domain/user/service/UserService.java +++ b/server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/user/service/UserService.java @@ -1,18 +1,17 @@ -package com.openblocks.domain.user.service; +package org.lowcoder.domain.user.service; import java.util.Collection; import java.util.Map; +import org.lowcoder.domain.user.model.AuthUser; +import org.lowcoder.domain.user.model.Connection; +import org.lowcoder.domain.user.model.User; +import org.lowcoder.domain.user.model.UserDetail; +import org.lowcoder.infra.annotation.NonEmptyMono; +import org.lowcoder.infra.mongo.MongoUpsertHelper.PartialResourceWithId; import org.springframework.http.codec.multipart.Part; import org.springframework.web.server.ServerWebExchange; -import com.openblocks.domain.user.model.AuthUser; -import com.openblocks.domain.user.model.Connection; -import com.openblocks.domain.user.model.User; -import com.openblocks.domain.user.model.UserDetail; -import com.openblocks.infra.annotation.NonEmptyMono; -import com.openblocks.infra.mongo.MongoUpsertHelper.PartialResourceWithId; - import reactor.core.publisher.Flux; import reactor.core.publisher.Mono; diff --git a/server/api-service/openblocks-domain/src/main/java/com/openblocks/domain/user/service/UserServiceImpl.java b/server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/user/service/UserServiceImpl.java similarity index 87% rename from server/api-service/openblocks-domain/src/main/java/com/openblocks/domain/user/service/UserServiceImpl.java rename to server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/user/service/UserServiceImpl.java index 20fa4a063..49f7366c4 100644 --- a/server/api-service/openblocks-domain/src/main/java/com/openblocks/domain/user/service/UserServiceImpl.java +++ b/server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/user/service/UserServiceImpl.java @@ -1,11 +1,11 @@ -package com.openblocks.domain.user.service; +package org.lowcoder.domain.user.service; import static com.google.common.collect.Sets.newHashSet; -import static com.openblocks.domain.user.model.UserDetail.ANONYMOUS_CURRENT_USER; -import static com.openblocks.sdk.constants.GlobalContext.CLIENT_IP; -import static com.openblocks.sdk.util.ExceptionUtils.ofError; -import static com.openblocks.sdk.util.ExceptionUtils.ofException; +import static org.lowcoder.domain.user.model.UserDetail.ANONYMOUS_CURRENT_USER; +import static org.lowcoder.sdk.constants.GlobalContext.CLIENT_IP; +import static org.lowcoder.sdk.util.ExceptionUtils.ofError; +import static org.lowcoder.sdk.util.ExceptionUtils.ofException; import java.security.SecureRandom; import java.util.Collection; @@ -24,41 +24,40 @@ import org.apache.commons.lang3.ObjectUtils; import org.apache.commons.lang3.RandomStringUtils; import org.apache.commons.lang3.StringUtils; +import org.lowcoder.domain.asset.model.Asset; +import org.lowcoder.domain.asset.service.AssetService; +import org.lowcoder.domain.authentication.AuthenticationService; +import org.lowcoder.domain.authentication.context.FormAuthRequestContext; +import org.lowcoder.domain.encryption.EncryptionService; +import org.lowcoder.domain.group.model.Group; +import org.lowcoder.domain.group.service.GroupMemberService; +import org.lowcoder.domain.group.service.GroupService; +import org.lowcoder.domain.organization.model.OrgMember; +import org.lowcoder.domain.organization.service.OrgMemberService; +import org.lowcoder.domain.user.model.AuthUser; +import org.lowcoder.domain.user.model.Connection; +import org.lowcoder.domain.user.model.User; +import org.lowcoder.domain.user.model.UserDetail; +import org.lowcoder.domain.user.model.UserState; +import org.lowcoder.domain.user.model.User.TransformedUserInfo; +import org.lowcoder.domain.user.repository.UserRepository; +import org.lowcoder.infra.mongo.MongoUpsertHelper; +import org.lowcoder.infra.mongo.MongoUpsertHelper.PartialResourceWithId; +import org.lowcoder.sdk.config.CommonConfig; +import org.lowcoder.sdk.config.dynamic.Conf; +import org.lowcoder.sdk.config.dynamic.ConfigCenter; +import org.lowcoder.sdk.constants.AuthSourceConstants; +import org.lowcoder.sdk.constants.FieldName; +import org.lowcoder.sdk.constants.WorkspaceMode; +import org.lowcoder.sdk.exception.BizError; +import org.lowcoder.sdk.exception.BizException; +import org.lowcoder.sdk.util.LocaleUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.dao.DuplicateKeyException; import org.springframework.http.codec.multipart.Part; import org.springframework.stereotype.Service; import org.springframework.web.server.ServerWebExchange; -import com.openblocks.domain.asset.model.Asset; -import com.openblocks.domain.asset.service.AssetService; -import com.openblocks.domain.authentication.AuthenticationService; -import com.openblocks.domain.authentication.context.FormAuthRequestContext; -import com.openblocks.domain.encryption.EncryptionService; -import com.openblocks.domain.group.model.Group; -import com.openblocks.domain.group.service.GroupMemberService; -import com.openblocks.domain.group.service.GroupService; -import com.openblocks.domain.organization.model.OrgMember; -import com.openblocks.domain.organization.service.OrgMemberService; -import com.openblocks.domain.user.model.AuthUser; -import com.openblocks.domain.user.model.Connection; -import com.openblocks.domain.user.model.User; -import com.openblocks.domain.user.model.User.TransformedUserInfo; -import com.openblocks.domain.user.model.UserDetail; -import com.openblocks.domain.user.model.UserState; -import com.openblocks.domain.user.repository.UserRepository; -import com.openblocks.infra.mongo.MongoUpsertHelper; -import com.openblocks.infra.mongo.MongoUpsertHelper.PartialResourceWithId; -import com.openblocks.sdk.config.CommonConfig; -import com.openblocks.sdk.config.dynamic.Conf; -import com.openblocks.sdk.config.dynamic.ConfigCenter; -import com.openblocks.sdk.constants.AuthSourceConstants; -import com.openblocks.sdk.constants.FieldName; -import com.openblocks.sdk.constants.WorkspaceMode; -import com.openblocks.sdk.exception.BizError; -import com.openblocks.sdk.exception.BizException; -import com.openblocks.sdk.util.LocaleUtils; - import lombok.extern.slf4j.Slf4j; import reactor.core.publisher.Flux; import reactor.core.publisher.Mono; diff --git a/server/api-service/openblocks-domain/src/main/java/com/openblocks/domain/user/service/UserStatusService.java b/server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/user/service/UserStatusService.java similarity index 81% rename from server/api-service/openblocks-domain/src/main/java/com/openblocks/domain/user/service/UserStatusService.java rename to server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/user/service/UserStatusService.java index 3ba22f9e2..eafc087dd 100644 --- a/server/api-service/openblocks-domain/src/main/java/com/openblocks/domain/user/service/UserStatusService.java +++ b/server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/user/service/UserStatusService.java @@ -1,15 +1,14 @@ -package com.openblocks.domain.user.service; +package org.lowcoder.domain.user.service; +import org.lowcoder.domain.user.constant.UserStatusType; +import org.lowcoder.domain.user.model.UserStatus; +import org.lowcoder.domain.user.repository.UserStatusRepository; +import org.lowcoder.infra.mongo.MongoUpsertHelper; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.Lazy; import org.springframework.data.mongodb.core.query.Update; import org.springframework.stereotype.Service; -import com.openblocks.domain.user.constant.UserStatusType; -import com.openblocks.domain.user.model.UserStatus; -import com.openblocks.domain.user.repository.UserStatusRepository; -import com.openblocks.infra.mongo.MongoUpsertHelper; - import reactor.core.publisher.Mono; @Lazy diff --git a/server/api-service/openblocks-domain/src/main/java/com/openblocks/domain/util/QueryDslUtils.java b/server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/util/QueryDslUtils.java similarity index 84% rename from server/api-service/openblocks-domain/src/main/java/com/openblocks/domain/util/QueryDslUtils.java rename to server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/util/QueryDslUtils.java index 74f711ad3..dcd83101a 100644 --- a/server/api-service/openblocks-domain/src/main/java/com/openblocks/domain/util/QueryDslUtils.java +++ b/server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/util/QueryDslUtils.java @@ -1,4 +1,4 @@ -package com.openblocks.domain.util; +package org.lowcoder.domain.util; import com.querydsl.core.types.Path; diff --git a/server/api-service/openblocks-domain/src/test/java/com/openblocks/domain/ServerApplication.java b/server/api-service/lowcoder-domain/src/test/java/org/lowcoder/domain/ServerApplication.java similarity index 86% rename from server/api-service/openblocks-domain/src/test/java/com/openblocks/domain/ServerApplication.java rename to server/api-service/lowcoder-domain/src/test/java/org/lowcoder/domain/ServerApplication.java index 6a1e1185c..239e0fc6a 100644 --- a/server/api-service/openblocks-domain/src/test/java/com/openblocks/domain/ServerApplication.java +++ b/server/api-service/lowcoder-domain/src/test/java/org/lowcoder/domain/ServerApplication.java @@ -1,4 +1,4 @@ -package com.openblocks.domain; +package org.lowcoder.domain; import org.springframework.boot.Banner; import org.springframework.boot.autoconfigure.SpringBootApplication; @@ -9,7 +9,7 @@ import reactor.core.scheduler.Schedulers; @Slf4j -@SpringBootApplication(scanBasePackages = "com.openblocks") +@SpringBootApplication(scanBasePackages = "org.lowcoder") public class ServerApplication { public static void main(String[] args) { diff --git a/server/api-service/openblocks-domain/src/test/java/com/openblocks/domain/organization/service/OrgMemberServiceTest.java b/server/api-service/lowcoder-domain/src/test/java/org/lowcoder/domain/organization/service/OrgMemberServiceTest.java similarity index 84% rename from server/api-service/openblocks-domain/src/test/java/com/openblocks/domain/organization/service/OrgMemberServiceTest.java rename to server/api-service/lowcoder-domain/src/test/java/org/lowcoder/domain/organization/service/OrgMemberServiceTest.java index 121cf2c93..04130e148 100644 --- a/server/api-service/openblocks-domain/src/test/java/com/openblocks/domain/organization/service/OrgMemberServiceTest.java +++ b/server/api-service/lowcoder-domain/src/test/java/org/lowcoder/domain/organization/service/OrgMemberServiceTest.java @@ -1,4 +1,4 @@ -package com.openblocks.domain.organization.service; +package org.lowcoder.domain.organization.service; import java.util.HashSet; import java.util.List; @@ -10,14 +10,14 @@ import org.junit.Assert; import org.junit.Test; import org.junit.runner.RunWith; +import org.lowcoder.domain.organization.model.MemberRole; +import org.lowcoder.domain.organization.model.OrgMember; +import org.lowcoder.domain.organization.service.OrgMemberService; +import org.lowcoder.sdk.util.IDUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.test.context.junit4.SpringRunner; -import com.openblocks.domain.organization.model.MemberRole; -import com.openblocks.domain.organization.model.OrgMember; -import com.openblocks.sdk.util.IDUtils; - import reactor.core.publisher.Mono; import reactor.test.StepVerifier; diff --git a/server/api-service/openblocks-domain/src/test/java/com/openblocks/impl/ClientBasedConnectionPoolTest.java b/server/api-service/lowcoder-domain/src/test/java/org/lowcoder/impl/ClientBasedConnectionPoolTest.java similarity index 86% rename from server/api-service/openblocks-domain/src/test/java/com/openblocks/impl/ClientBasedConnectionPoolTest.java rename to server/api-service/lowcoder-domain/src/test/java/org/lowcoder/impl/ClientBasedConnectionPoolTest.java index 0f0a3976a..166c965be 100644 --- a/server/api-service/openblocks-domain/src/test/java/com/openblocks/impl/ClientBasedConnectionPoolTest.java +++ b/server/api-service/lowcoder-domain/src/test/java/org/lowcoder/impl/ClientBasedConnectionPoolTest.java @@ -1,4 +1,4 @@ -package com.openblocks.impl; +package org.lowcoder.impl; import java.lang.reflect.Field; import java.time.Instant; @@ -13,21 +13,21 @@ import org.junit.Assert; import org.junit.BeforeClass; import org.junit.Test; +import org.lowcoder.domain.datasource.model.ClientBasedDatasourceConnectionHolder; +import org.lowcoder.domain.datasource.model.Datasource; +import org.lowcoder.domain.datasource.model.DatasourceConnectionHolder; +import org.lowcoder.domain.datasource.service.impl.ClientBasedConnectionPool; +import org.lowcoder.domain.datasource.service.impl.ClientBasedConnectionPool.ClientBasedDatasourceCacheKey; +import org.lowcoder.impl.mock.MockConnection; +import org.lowcoder.impl.mock.MockDatasourceConnectionConfig; +import org.lowcoder.impl.mock.MockDatasourceConnector; +import org.lowcoder.impl.mock.MockDatasourceMetaInfoService; +import org.lowcoder.infra.perf.PerfEvent; +import org.lowcoder.infra.perf.PerfHelper; +import org.lowcoder.sdk.exception.InvalidHikariDatasourceException; +import org.lowcoder.sdk.plugin.common.DatasourceConnector; import com.google.common.cache.LoadingCache; -import com.openblocks.domain.datasource.model.ClientBasedDatasourceConnectionHolder; -import com.openblocks.domain.datasource.model.Datasource; -import com.openblocks.domain.datasource.model.DatasourceConnectionHolder; -import com.openblocks.domain.datasource.service.impl.ClientBasedConnectionPool; -import com.openblocks.domain.datasource.service.impl.ClientBasedConnectionPool.ClientBasedDatasourceCacheKey; -import com.openblocks.impl.mock.MockConnection; -import com.openblocks.impl.mock.MockDatasourceConnectionConfig; -import com.openblocks.impl.mock.MockDatasourceConnector; -import com.openblocks.impl.mock.MockDatasourceMetaInfoService; -import com.openblocks.infra.perf.PerfEvent; -import com.openblocks.infra.perf.PerfHelper; -import com.openblocks.sdk.exception.InvalidHikariDatasourceException; -import com.openblocks.sdk.plugin.common.DatasourceConnector; import io.micrometer.core.instrument.Tag; import reactor.core.publisher.Mono; diff --git a/server/api-service/openblocks-domain/src/test/java/com/openblocks/impl/mock/MockConnection.java b/server/api-service/lowcoder-domain/src/test/java/org/lowcoder/impl/mock/MockConnection.java similarity index 84% rename from server/api-service/openblocks-domain/src/test/java/com/openblocks/impl/mock/MockConnection.java rename to server/api-service/lowcoder-domain/src/test/java/org/lowcoder/impl/mock/MockConnection.java index f4a461628..aac97be49 100644 --- a/server/api-service/openblocks-domain/src/test/java/com/openblocks/impl/mock/MockConnection.java +++ b/server/api-service/lowcoder-domain/src/test/java/org/lowcoder/impl/mock/MockConnection.java @@ -1,4 +1,4 @@ -package com.openblocks.impl.mock; +package org.lowcoder.impl.mock; public class MockConnection { diff --git a/server/api-service/openblocks-domain/src/test/java/com/openblocks/impl/mock/MockDatasourceConnectionConfig.java b/server/api-service/lowcoder-domain/src/test/java/org/lowcoder/impl/mock/MockDatasourceConnectionConfig.java similarity index 65% rename from server/api-service/openblocks-domain/src/test/java/com/openblocks/impl/mock/MockDatasourceConnectionConfig.java rename to server/api-service/lowcoder-domain/src/test/java/org/lowcoder/impl/mock/MockDatasourceConnectionConfig.java index e8fd0edb8..f5b1385f6 100644 --- a/server/api-service/openblocks-domain/src/test/java/com/openblocks/impl/mock/MockDatasourceConnectionConfig.java +++ b/server/api-service/lowcoder-domain/src/test/java/org/lowcoder/impl/mock/MockDatasourceConnectionConfig.java @@ -1,7 +1,7 @@ -package com.openblocks.impl.mock; +package org.lowcoder.impl.mock; -import com.openblocks.domain.datasource.model.Datasource; -import com.openblocks.sdk.models.DatasourceConnectionConfig; +import org.lowcoder.domain.datasource.model.Datasource; +import org.lowcoder.sdk.models.DatasourceConnectionConfig; public record MockDatasourceConnectionConfig(Datasource datasource) implements DatasourceConnectionConfig { diff --git a/server/api-service/openblocks-domain/src/test/java/com/openblocks/impl/mock/MockDatasourceConnector.java b/server/api-service/lowcoder-domain/src/test/java/org/lowcoder/impl/mock/MockDatasourceConnector.java similarity index 87% rename from server/api-service/openblocks-domain/src/test/java/com/openblocks/impl/mock/MockDatasourceConnector.java rename to server/api-service/lowcoder-domain/src/test/java/org/lowcoder/impl/mock/MockDatasourceConnector.java index 0057bef29..3bf87e155 100644 --- a/server/api-service/openblocks-domain/src/test/java/com/openblocks/impl/mock/MockDatasourceConnector.java +++ b/server/api-service/lowcoder-domain/src/test/java/org/lowcoder/impl/mock/MockDatasourceConnector.java @@ -1,4 +1,4 @@ -package com.openblocks.impl.mock; +package org.lowcoder.impl.mock; import java.util.Collections; import java.util.Map; @@ -8,10 +8,10 @@ import javax.annotation.Nonnull; -import com.openblocks.domain.datasource.service.impl.ClientBasedConnectionPool.ClientBasedDatasourceCacheKey; -import com.openblocks.sdk.models.DatasourceConnectionConfig; -import com.openblocks.sdk.models.DatasourceTestResult; -import com.openblocks.sdk.plugin.common.DatasourceConnector; +import org.lowcoder.domain.datasource.service.impl.ClientBasedConnectionPool.ClientBasedDatasourceCacheKey; +import org.lowcoder.sdk.models.DatasourceConnectionConfig; +import org.lowcoder.sdk.models.DatasourceTestResult; +import org.lowcoder.sdk.plugin.common.DatasourceConnector; import reactor.core.publisher.Mono; diff --git a/server/api-service/openblocks-domain/src/test/java/com/openblocks/impl/mock/MockDatasourceMetaInfoService.java b/server/api-service/lowcoder-domain/src/test/java/org/lowcoder/impl/mock/MockDatasourceMetaInfoService.java similarity index 80% rename from server/api-service/openblocks-domain/src/test/java/com/openblocks/impl/mock/MockDatasourceMetaInfoService.java rename to server/api-service/lowcoder-domain/src/test/java/org/lowcoder/impl/mock/MockDatasourceMetaInfoService.java index d446fc579..b7c7c73d8 100644 --- a/server/api-service/openblocks-domain/src/test/java/com/openblocks/impl/mock/MockDatasourceMetaInfoService.java +++ b/server/api-service/lowcoder-domain/src/test/java/org/lowcoder/impl/mock/MockDatasourceMetaInfoService.java @@ -1,16 +1,16 @@ -package com.openblocks.impl.mock; +package org.lowcoder.impl.mock; import reactor.core.publisher.Flux; import java.util.List; import java.util.Map; -import com.openblocks.domain.plugin.DatasourceMetaInfo; -import com.openblocks.domain.plugin.service.DatasourceMetaInfoService; -import com.openblocks.sdk.models.DatasourceConnectionConfig; -import com.openblocks.sdk.plugin.common.DatasourceConnector; -import com.openblocks.sdk.plugin.common.QueryExecutor; -import com.openblocks.sdk.query.QueryExecutionContext; +import org.lowcoder.domain.plugin.DatasourceMetaInfo; +import org.lowcoder.domain.plugin.service.DatasourceMetaInfoService; +import org.lowcoder.sdk.models.DatasourceConnectionConfig; +import org.lowcoder.sdk.plugin.common.DatasourceConnector; +import org.lowcoder.sdk.plugin.common.QueryExecutor; +import org.lowcoder.sdk.query.QueryExecutionContext; public class MockDatasourceMetaInfoService implements DatasourceMetaInfoService { diff --git a/server/api-service/openblocks-domain/src/test/resources/application.yml b/server/api-service/lowcoder-domain/src/test/resources/application.yml similarity index 88% rename from server/api-service/openblocks-domain/src/test/resources/application.yml rename to server/api-service/lowcoder-domain/src/test/resources/application.yml index de6a8f48e..99029dd02 100644 --- a/server/api-service/openblocks-domain/src/test/resources/application.yml +++ b/server/api-service/lowcoder-domain/src/test/resources/application.yml @@ -20,8 +20,8 @@ common: domain: default-value: skipCheck encrypt: - password: openblocks.dev - salt: openblocks.dev + password: lowcoder.org + salt: lowcoder.org cloud: false security: cors-allowed-domains: @@ -37,4 +37,4 @@ auth: mobile: enable: true email: - enable: true \ No newline at end of file + enable: true diff --git a/server/api-service/openblocks-ee/pom.xml b/server/api-service/lowcoder-ee/pom.xml similarity index 82% rename from server/api-service/openblocks-ee/pom.xml rename to server/api-service/lowcoder-ee/pom.xml index 67c7ed999..78206a57c 100644 --- a/server/api-service/openblocks-ee/pom.xml +++ b/server/api-service/lowcoder-ee/pom.xml @@ -3,13 +3,13 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - openblocks-root - com.openblocks + lowcoder-root + org.lowcoder 1.0-SNAPSHOT 4.0.0 - openblocks-ee + lowcoder-ee 1.0-SNAPSHOT pom diff --git a/server/api-service/openblocks-infra/pom.xml b/server/api-service/lowcoder-infra/pom.xml similarity index 81% rename from server/api-service/openblocks-infra/pom.xml rename to server/api-service/lowcoder-infra/pom.xml index 1b7ef02a1..37bd56454 100644 --- a/server/api-service/openblocks-infra/pom.xml +++ b/server/api-service/lowcoder-infra/pom.xml @@ -3,23 +3,23 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - openblocks-root - com.openblocks + lowcoder-root + org.lowcoder 1.0-SNAPSHOT 4.0.0 - openblocks-infra + lowcoder-infra - com.openblocks - openblocks-sdk + org.lowcoder + lowcoder-sdk 1.0-SNAPSHOT - com.openblocks - openblocks-ee + org.lowcoder + lowcoder-ee pom 1.0-SNAPSHOT @@ -137,25 +137,6 @@ - - - selfhost-openblocks - - - - org.apache.maven.plugins - maven-compiler-plugin - - - **/*MajiangVersion.java - - - - - - - - UTF-8 17 @@ -163,4 +144,4 @@ 17 - \ No newline at end of file + diff --git a/server/api-service/openblocks-infra/src/main/java/com/openblocks/infra/annotation/NonEmptyMono.java b/server/api-service/lowcoder-infra/src/main/java/org/lowcoder/infra/annotation/NonEmptyMono.java similarity index 77% rename from server/api-service/openblocks-infra/src/main/java/com/openblocks/infra/annotation/NonEmptyMono.java rename to server/api-service/lowcoder-infra/src/main/java/org/lowcoder/infra/annotation/NonEmptyMono.java index ab3d40448..b6bca1ed0 100644 --- a/server/api-service/openblocks-infra/src/main/java/com/openblocks/infra/annotation/NonEmptyMono.java +++ b/server/api-service/lowcoder-infra/src/main/java/org/lowcoder/infra/annotation/NonEmptyMono.java @@ -1,4 +1,4 @@ -package com.openblocks.infra.annotation; +package org.lowcoder.infra.annotation; import java.lang.annotation.ElementType; import java.lang.annotation.Target; diff --git a/server/api-service/openblocks-infra/src/main/java/com/openblocks/infra/annotation/PossibleEmptyMono.java b/server/api-service/lowcoder-infra/src/main/java/org/lowcoder/infra/annotation/PossibleEmptyMono.java similarity index 78% rename from server/api-service/openblocks-infra/src/main/java/com/openblocks/infra/annotation/PossibleEmptyMono.java rename to server/api-service/lowcoder-infra/src/main/java/org/lowcoder/infra/annotation/PossibleEmptyMono.java index d806c6de1..f69526361 100644 --- a/server/api-service/openblocks-infra/src/main/java/com/openblocks/infra/annotation/PossibleEmptyMono.java +++ b/server/api-service/lowcoder-infra/src/main/java/org/lowcoder/infra/annotation/PossibleEmptyMono.java @@ -1,4 +1,4 @@ -package com.openblocks.infra.annotation; +package org.lowcoder.infra.annotation; import java.lang.annotation.ElementType; import java.lang.annotation.Target; diff --git a/server/api-service/openblocks-infra/src/main/java/com/openblocks/infra/birelation/BiRelation.java b/server/api-service/lowcoder-infra/src/main/java/org/lowcoder/infra/birelation/BiRelation.java similarity index 96% rename from server/api-service/openblocks-infra/src/main/java/com/openblocks/infra/birelation/BiRelation.java rename to server/api-service/lowcoder-infra/src/main/java/org/lowcoder/infra/birelation/BiRelation.java index 7c482ba36..dc71120f0 100644 --- a/server/api-service/openblocks-infra/src/main/java/com/openblocks/infra/birelation/BiRelation.java +++ b/server/api-service/lowcoder-infra/src/main/java/org/lowcoder/infra/birelation/BiRelation.java @@ -1,10 +1,10 @@ -package com.openblocks.infra.birelation; +package org.lowcoder.infra.birelation; +import org.lowcoder.sdk.models.HasIdAndAuditing; import org.springframework.data.mongodb.core.mapping.Document; import com.fasterxml.jackson.annotation.JsonCreator; import com.google.common.base.MoreObjects; -import com.openblocks.sdk.models.HasIdAndAuditing; import lombok.Builder; diff --git a/server/api-service/openblocks-infra/src/main/java/com/openblocks/infra/birelation/BiRelationBizType.java b/server/api-service/lowcoder-infra/src/main/java/org/lowcoder/infra/birelation/BiRelationBizType.java similarity index 79% rename from server/api-service/openblocks-infra/src/main/java/com/openblocks/infra/birelation/BiRelationBizType.java rename to server/api-service/lowcoder-infra/src/main/java/org/lowcoder/infra/birelation/BiRelationBizType.java index 8d609cf45..edc6e5b72 100644 --- a/server/api-service/openblocks-infra/src/main/java/com/openblocks/infra/birelation/BiRelationBizType.java +++ b/server/api-service/lowcoder-infra/src/main/java/org/lowcoder/infra/birelation/BiRelationBizType.java @@ -1,4 +1,4 @@ -package com.openblocks.infra.birelation; +package org.lowcoder.infra.birelation; public enum BiRelationBizType { ORG_MEMBER, diff --git a/server/api-service/openblocks-infra/src/main/java/com/openblocks/infra/birelation/BiRelationRepository.java b/server/api-service/lowcoder-infra/src/main/java/org/lowcoder/infra/birelation/BiRelationRepository.java similarity index 97% rename from server/api-service/openblocks-infra/src/main/java/com/openblocks/infra/birelation/BiRelationRepository.java rename to server/api-service/lowcoder-infra/src/main/java/org/lowcoder/infra/birelation/BiRelationRepository.java index 6b08235d1..6a3a7c424 100644 --- a/server/api-service/openblocks-infra/src/main/java/com/openblocks/infra/birelation/BiRelationRepository.java +++ b/server/api-service/lowcoder-infra/src/main/java/org/lowcoder/infra/birelation/BiRelationRepository.java @@ -1,4 +1,4 @@ -package com.openblocks.infra.birelation; +package org.lowcoder.infra.birelation; import java.util.Collection; diff --git a/server/api-service/openblocks-infra/src/main/java/com/openblocks/infra/birelation/BiRelationService.java b/server/api-service/lowcoder-infra/src/main/java/org/lowcoder/infra/birelation/BiRelationService.java similarity index 98% rename from server/api-service/openblocks-infra/src/main/java/com/openblocks/infra/birelation/BiRelationService.java rename to server/api-service/lowcoder-infra/src/main/java/org/lowcoder/infra/birelation/BiRelationService.java index 1d04f48cb..43dac65c9 100644 --- a/server/api-service/openblocks-infra/src/main/java/com/openblocks/infra/birelation/BiRelationService.java +++ b/server/api-service/lowcoder-infra/src/main/java/org/lowcoder/infra/birelation/BiRelationService.java @@ -1,4 +1,4 @@ -package com.openblocks.infra.birelation; +package org.lowcoder.infra.birelation; import static com.google.common.base.Strings.nullToEmpty; import static org.apache.commons.lang3.StringUtils.isNotBlank; @@ -7,6 +7,7 @@ import java.util.Collection; import java.util.List; +import org.lowcoder.infra.mongo.MongoUpsertHelper; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.data.domain.Pageable; import org.springframework.data.mongodb.core.query.Criteria; @@ -14,7 +15,6 @@ import org.springframework.stereotype.Service; import com.google.common.base.Preconditions; -import com.openblocks.infra.mongo.MongoUpsertHelper; import reactor.core.publisher.Flux; import reactor.core.publisher.Mono; diff --git a/server/api-service/openblocks-infra/src/main/java/com/openblocks/infra/conditional/ConditionalOnPropertyNotBlank.java b/server/api-service/lowcoder-infra/src/main/java/org/lowcoder/infra/conditional/ConditionalOnPropertyNotBlank.java similarity index 93% rename from server/api-service/openblocks-infra/src/main/java/com/openblocks/infra/conditional/ConditionalOnPropertyNotBlank.java rename to server/api-service/lowcoder-infra/src/main/java/org/lowcoder/infra/conditional/ConditionalOnPropertyNotBlank.java index fab882be5..e4aca0672 100644 --- a/server/api-service/openblocks-infra/src/main/java/com/openblocks/infra/conditional/ConditionalOnPropertyNotBlank.java +++ b/server/api-service/lowcoder-infra/src/main/java/org/lowcoder/infra/conditional/ConditionalOnPropertyNotBlank.java @@ -1,4 +1,4 @@ -package com.openblocks.infra.conditional; +package org.lowcoder.infra.conditional; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; @@ -10,13 +10,12 @@ import javax.validation.constraints.NotBlank; import org.apache.commons.lang3.StringUtils; +import org.lowcoder.infra.conditional.ConditionalOnPropertyNotBlank.OnPropertyNotBlankCondition; import org.springframework.context.annotation.Condition; import org.springframework.context.annotation.ConditionContext; import org.springframework.context.annotation.Conditional; import org.springframework.core.type.AnnotatedTypeMetadata; -import com.openblocks.infra.conditional.ConditionalOnPropertyNotBlank.OnPropertyNotBlankCondition; - @Target({ElementType.TYPE, ElementType.METHOD}) @Retention(RetentionPolicy.RUNTIME) @Conditional(OnPropertyNotBlankCondition.class) diff --git a/server/api-service/openblocks-infra/src/main/java/com/openblocks/infra/config/AutoReloadConfImpl.java b/server/api-service/lowcoder-infra/src/main/java/org/lowcoder/infra/config/AutoReloadConfImpl.java similarity index 94% rename from server/api-service/openblocks-infra/src/main/java/com/openblocks/infra/config/AutoReloadConfImpl.java rename to server/api-service/lowcoder-infra/src/main/java/org/lowcoder/infra/config/AutoReloadConfImpl.java index 8a4037cc9..9c48ada4c 100644 --- a/server/api-service/openblocks-infra/src/main/java/com/openblocks/infra/config/AutoReloadConfImpl.java +++ b/server/api-service/lowcoder-infra/src/main/java/org/lowcoder/infra/config/AutoReloadConfImpl.java @@ -1,12 +1,11 @@ -package com.openblocks.infra.config; +package org.lowcoder.infra.config; import static org.apache.commons.lang3.ObjectUtils.firstNonNull; import java.util.function.Function; import org.apache.commons.lang3.StringUtils; - -import com.openblocks.sdk.config.dynamic.Conf; +import org.lowcoder.sdk.config.dynamic.Conf; class AutoReloadConfImpl implements Conf { diff --git a/server/api-service/openblocks-infra/src/main/java/com/openblocks/infra/config/AutoReloadConfigFactory.java b/server/api-service/lowcoder-infra/src/main/java/org/lowcoder/infra/config/AutoReloadConfigFactory.java similarity index 83% rename from server/api-service/openblocks-infra/src/main/java/com/openblocks/infra/config/AutoReloadConfigFactory.java rename to server/api-service/lowcoder-infra/src/main/java/org/lowcoder/infra/config/AutoReloadConfigFactory.java index 6ec3a38c7..9abce3418 100644 --- a/server/api-service/openblocks-infra/src/main/java/com/openblocks/infra/config/AutoReloadConfigFactory.java +++ b/server/api-service/lowcoder-infra/src/main/java/org/lowcoder/infra/config/AutoReloadConfigFactory.java @@ -1,8 +1,8 @@ -package com.openblocks.infra.config; +package org.lowcoder.infra.config; -import static com.openblocks.sdk.util.JsonUtils.toJson; import static java.util.Collections.emptyMap; import static java.util.stream.Collectors.toUnmodifiableMap; +import static org.lowcoder.sdk.util.JsonUtils.toJson; import java.time.Duration; import java.util.Map; @@ -10,13 +10,12 @@ import javax.annotation.Nullable; import javax.annotation.PostConstruct; +import org.lowcoder.infra.config.model.ServerConfig; +import org.lowcoder.infra.config.repository.ServerConfigRepository; +import org.lowcoder.infra.localcache.ReloadableCache; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; -import com.openblocks.infra.config.model.ServerConfig; -import com.openblocks.infra.config.repository.ServerConfigRepository; -import com.openblocks.infra.localcache.ReloadableCache; - import lombok.extern.slf4j.Slf4j; @Slf4j diff --git a/server/api-service/openblocks-infra/src/main/java/com/openblocks/infra/config/AutoReloadConfigInstanceImpl.java b/server/api-service/lowcoder-infra/src/main/java/org/lowcoder/infra/config/AutoReloadConfigInstanceImpl.java similarity index 94% rename from server/api-service/openblocks-infra/src/main/java/com/openblocks/infra/config/AutoReloadConfigInstanceImpl.java rename to server/api-service/lowcoder-infra/src/main/java/org/lowcoder/infra/config/AutoReloadConfigInstanceImpl.java index 18a4766c8..73e8f1ec4 100644 --- a/server/api-service/openblocks-infra/src/main/java/com/openblocks/infra/config/AutoReloadConfigInstanceImpl.java +++ b/server/api-service/lowcoder-infra/src/main/java/org/lowcoder/infra/config/AutoReloadConfigInstanceImpl.java @@ -1,17 +1,16 @@ -package com.openblocks.infra.config; +package org.lowcoder.infra.config; import java.util.List; import java.util.Map; import java.util.Objects; import java.util.concurrent.ConcurrentHashMap; +import org.lowcoder.sdk.config.dynamic.Conf; +import org.lowcoder.sdk.config.dynamic.ConfigInstance; +import org.lowcoder.sdk.util.JsonUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; -import com.openblocks.sdk.config.dynamic.Conf; -import com.openblocks.sdk.config.dynamic.ConfigInstance; -import com.openblocks.sdk.util.JsonUtils; - @Component @SuppressWarnings("unchecked") public class AutoReloadConfigInstanceImpl implements ConfigInstance { diff --git a/server/api-service/openblocks-infra/src/main/java/com/openblocks/infra/config/ConfigCenterImpl.java b/server/api-service/lowcoder-infra/src/main/java/org/lowcoder/infra/config/ConfigCenterImpl.java similarity index 95% rename from server/api-service/openblocks-infra/src/main/java/com/openblocks/infra/config/ConfigCenterImpl.java rename to server/api-service/lowcoder-infra/src/main/java/org/lowcoder/infra/config/ConfigCenterImpl.java index ffd4a8c90..f79d65ad7 100644 --- a/server/api-service/openblocks-infra/src/main/java/com/openblocks/infra/config/ConfigCenterImpl.java +++ b/server/api-service/lowcoder-infra/src/main/java/org/lowcoder/infra/config/ConfigCenterImpl.java @@ -1,16 +1,15 @@ -package com.openblocks.infra.config; +package org.lowcoder.infra.config; import java.util.List; import java.util.Map; import java.util.concurrent.ConcurrentHashMap; +import org.lowcoder.sdk.config.dynamic.Conf; +import org.lowcoder.sdk.config.dynamic.ConfigCenter; +import org.lowcoder.sdk.config.dynamic.ConfigInstance; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; -import com.openblocks.sdk.config.dynamic.Conf; -import com.openblocks.sdk.config.dynamic.ConfigCenter; -import com.openblocks.sdk.config.dynamic.ConfigInstance; - @Component public class ConfigCenterImpl implements ConfigCenter { diff --git a/server/api-service/openblocks-infra/src/main/java/com/openblocks/infra/config/model/ServerConfig.java b/server/api-service/lowcoder-infra/src/main/java/org/lowcoder/infra/config/model/ServerConfig.java similarity index 84% rename from server/api-service/openblocks-infra/src/main/java/com/openblocks/infra/config/model/ServerConfig.java rename to server/api-service/lowcoder-infra/src/main/java/org/lowcoder/infra/config/model/ServerConfig.java index a546f6aa2..2546f4e08 100644 --- a/server/api-service/openblocks-infra/src/main/java/com/openblocks/infra/config/model/ServerConfig.java +++ b/server/api-service/lowcoder-infra/src/main/java/org/lowcoder/infra/config/model/ServerConfig.java @@ -1,9 +1,9 @@ -package com.openblocks.infra.config.model; +package org.lowcoder.infra.config.model; +import org.lowcoder.sdk.models.HasIdAndAuditing; import org.springframework.data.mongodb.core.mapping.Document; import com.fasterxml.jackson.annotation.JsonCreator; -import com.openblocks.sdk.models.HasIdAndAuditing; import lombok.Builder; diff --git a/server/api-service/openblocks-infra/src/main/java/com/openblocks/infra/config/repository/CustomServerConfigRepository.java b/server/api-service/lowcoder-infra/src/main/java/org/lowcoder/infra/config/repository/CustomServerConfigRepository.java similarity index 57% rename from server/api-service/openblocks-infra/src/main/java/com/openblocks/infra/config/repository/CustomServerConfigRepository.java rename to server/api-service/lowcoder-infra/src/main/java/org/lowcoder/infra/config/repository/CustomServerConfigRepository.java index cfdb03fbc..75c4ea5cc 100644 --- a/server/api-service/openblocks-infra/src/main/java/com/openblocks/infra/config/repository/CustomServerConfigRepository.java +++ b/server/api-service/lowcoder-infra/src/main/java/org/lowcoder/infra/config/repository/CustomServerConfigRepository.java @@ -1,6 +1,6 @@ -package com.openblocks.infra.config.repository; +package org.lowcoder.infra.config.repository; -import com.openblocks.infra.config.model.ServerConfig; +import org.lowcoder.infra.config.model.ServerConfig; import reactor.core.publisher.Mono; diff --git a/server/api-service/openblocks-infra/src/main/java/com/openblocks/infra/config/repository/CustomServerConfigRepositoryImpl.java b/server/api-service/lowcoder-infra/src/main/java/org/lowcoder/infra/config/repository/CustomServerConfigRepositoryImpl.java similarity index 79% rename from server/api-service/openblocks-infra/src/main/java/com/openblocks/infra/config/repository/CustomServerConfigRepositoryImpl.java rename to server/api-service/lowcoder-infra/src/main/java/org/lowcoder/infra/config/repository/CustomServerConfigRepositoryImpl.java index fa160b617..930963292 100644 --- a/server/api-service/openblocks-infra/src/main/java/com/openblocks/infra/config/repository/CustomServerConfigRepositoryImpl.java +++ b/server/api-service/lowcoder-infra/src/main/java/org/lowcoder/infra/config/repository/CustomServerConfigRepositoryImpl.java @@ -1,11 +1,10 @@ -package com.openblocks.infra.config.repository; +package org.lowcoder.infra.config.repository; +import org.lowcoder.infra.config.model.ServerConfig; +import org.lowcoder.infra.mongo.MongoUpsertHelper; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Repository; -import com.openblocks.infra.config.model.ServerConfig; -import com.openblocks.infra.mongo.MongoUpsertHelper; - import reactor.core.publisher.Mono; @Repository diff --git a/server/api-service/openblocks-infra/src/main/java/com/openblocks/infra/config/repository/ServerConfigRepository.java b/server/api-service/lowcoder-infra/src/main/java/org/lowcoder/infra/config/repository/ServerConfigRepository.java similarity index 78% rename from server/api-service/openblocks-infra/src/main/java/com/openblocks/infra/config/repository/ServerConfigRepository.java rename to server/api-service/lowcoder-infra/src/main/java/org/lowcoder/infra/config/repository/ServerConfigRepository.java index fb8f0fab1..e1bafda2c 100644 --- a/server/api-service/openblocks-infra/src/main/java/com/openblocks/infra/config/repository/ServerConfigRepository.java +++ b/server/api-service/lowcoder-infra/src/main/java/org/lowcoder/infra/config/repository/ServerConfigRepository.java @@ -1,9 +1,9 @@ -package com.openblocks.infra.config.repository; +package org.lowcoder.infra.config.repository; +import org.lowcoder.infra.config.model.ServerConfig; import org.springframework.data.mongodb.repository.ReactiveMongoRepository; import com.google.common.annotations.VisibleForTesting; -import com.openblocks.infra.config.model.ServerConfig; import reactor.core.publisher.Mono; diff --git a/server/api-service/openblocks-infra/src/main/java/com/openblocks/infra/constant/NewUrl.java b/server/api-service/lowcoder-infra/src/main/java/org/lowcoder/infra/constant/NewUrl.java similarity index 97% rename from server/api-service/openblocks-infra/src/main/java/com/openblocks/infra/constant/NewUrl.java rename to server/api-service/lowcoder-infra/src/main/java/org/lowcoder/infra/constant/NewUrl.java index 6871c9a50..8a884ce8f 100644 --- a/server/api-service/openblocks-infra/src/main/java/com/openblocks/infra/constant/NewUrl.java +++ b/server/api-service/lowcoder-infra/src/main/java/org/lowcoder/infra/constant/NewUrl.java @@ -1,4 +1,4 @@ -package com.openblocks.infra.constant; +package org.lowcoder.infra.constant; public final class NewUrl { diff --git a/server/api-service/openblocks-infra/src/main/java/com/openblocks/infra/constant/Url.java b/server/api-service/lowcoder-infra/src/main/java/org/lowcoder/infra/constant/Url.java similarity index 96% rename from server/api-service/openblocks-infra/src/main/java/com/openblocks/infra/constant/Url.java rename to server/api-service/lowcoder-infra/src/main/java/org/lowcoder/infra/constant/Url.java index 5d661de72..577f6f633 100644 --- a/server/api-service/openblocks-infra/src/main/java/com/openblocks/infra/constant/Url.java +++ b/server/api-service/lowcoder-infra/src/main/java/org/lowcoder/infra/constant/Url.java @@ -1,4 +1,4 @@ -package com.openblocks.infra.constant; +package org.lowcoder.infra.constant; public final class Url { public static final String BASE_URL = "/api"; diff --git a/server/api-service/openblocks-infra/src/main/java/com/openblocks/infra/event/AbstractEvent.java b/server/api-service/lowcoder-infra/src/main/java/org/lowcoder/infra/event/AbstractEvent.java similarity index 85% rename from server/api-service/openblocks-infra/src/main/java/com/openblocks/infra/event/AbstractEvent.java rename to server/api-service/lowcoder-infra/src/main/java/org/lowcoder/infra/event/AbstractEvent.java index b74d19e14..018ec9894 100644 --- a/server/api-service/openblocks-infra/src/main/java/com/openblocks/infra/event/AbstractEvent.java +++ b/server/api-service/lowcoder-infra/src/main/java/org/lowcoder/infra/event/AbstractEvent.java @@ -1,4 +1,4 @@ -package com.openblocks.infra.event; +package org.lowcoder.infra.event; import lombok.Getter; import lombok.experimental.SuperBuilder; diff --git a/server/api-service/openblocks-infra/src/main/java/com/openblocks/infra/event/ApplicationCommonEvent.java b/server/api-service/lowcoder-infra/src/main/java/org/lowcoder/infra/event/ApplicationCommonEvent.java similarity index 93% rename from server/api-service/openblocks-infra/src/main/java/com/openblocks/infra/event/ApplicationCommonEvent.java rename to server/api-service/lowcoder-infra/src/main/java/org/lowcoder/infra/event/ApplicationCommonEvent.java index 1094ab75d..cf74c1f48 100644 --- a/server/api-service/openblocks-infra/src/main/java/com/openblocks/infra/event/ApplicationCommonEvent.java +++ b/server/api-service/lowcoder-infra/src/main/java/org/lowcoder/infra/event/ApplicationCommonEvent.java @@ -1,4 +1,4 @@ -package com.openblocks.infra.event; +package org.lowcoder.infra.event; import javax.annotation.Nullable; diff --git a/server/api-service/openblocks-infra/src/main/java/com/openblocks/infra/event/Event.java b/server/api-service/lowcoder-infra/src/main/java/org/lowcoder/infra/event/Event.java similarity index 62% rename from server/api-service/openblocks-infra/src/main/java/com/openblocks/infra/event/Event.java rename to server/api-service/lowcoder-infra/src/main/java/org/lowcoder/infra/event/Event.java index 0000c3c3c..29dd3a36c 100644 --- a/server/api-service/openblocks-infra/src/main/java/com/openblocks/infra/event/Event.java +++ b/server/api-service/lowcoder-infra/src/main/java/org/lowcoder/infra/event/Event.java @@ -1,4 +1,4 @@ -package com.openblocks.infra.event; +package org.lowcoder.infra.event; public interface Event { diff --git a/server/api-service/openblocks-infra/src/main/java/com/openblocks/infra/event/EventType.java b/server/api-service/lowcoder-infra/src/main/java/org/lowcoder/infra/event/EventType.java similarity index 96% rename from server/api-service/openblocks-infra/src/main/java/com/openblocks/infra/event/EventType.java rename to server/api-service/lowcoder-infra/src/main/java/org/lowcoder/infra/event/EventType.java index 51c5a97e8..52260736f 100644 --- a/server/api-service/openblocks-infra/src/main/java/com/openblocks/infra/event/EventType.java +++ b/server/api-service/lowcoder-infra/src/main/java/org/lowcoder/infra/event/EventType.java @@ -1,8 +1,8 @@ -package com.openblocks.infra.event; +package org.lowcoder.infra.event; import java.util.Locale; -import com.openblocks.sdk.util.LocaleUtils; +import org.lowcoder.sdk.util.LocaleUtils; public enum EventType { diff --git a/server/api-service/openblocks-infra/src/main/java/com/openblocks/infra/event/FolderCommonEvent.java b/server/api-service/lowcoder-infra/src/main/java/org/lowcoder/infra/event/FolderCommonEvent.java similarity index 89% rename from server/api-service/openblocks-infra/src/main/java/com/openblocks/infra/event/FolderCommonEvent.java rename to server/api-service/lowcoder-infra/src/main/java/org/lowcoder/infra/event/FolderCommonEvent.java index 2c531a5d6..23a4b8d0e 100644 --- a/server/api-service/openblocks-infra/src/main/java/com/openblocks/infra/event/FolderCommonEvent.java +++ b/server/api-service/lowcoder-infra/src/main/java/org/lowcoder/infra/event/FolderCommonEvent.java @@ -1,4 +1,4 @@ -package com.openblocks.infra.event; +package org.lowcoder.infra.event; import lombok.Getter; import lombok.experimental.SuperBuilder; diff --git a/server/api-service/openblocks-infra/src/main/java/com/openblocks/infra/event/LibraryQueryEvent.java b/server/api-service/lowcoder-infra/src/main/java/org/lowcoder/infra/event/LibraryQueryEvent.java similarity index 89% rename from server/api-service/openblocks-infra/src/main/java/com/openblocks/infra/event/LibraryQueryEvent.java rename to server/api-service/lowcoder-infra/src/main/java/org/lowcoder/infra/event/LibraryQueryEvent.java index d3338b523..13b048246 100644 --- a/server/api-service/openblocks-infra/src/main/java/com/openblocks/infra/event/LibraryQueryEvent.java +++ b/server/api-service/lowcoder-infra/src/main/java/org/lowcoder/infra/event/LibraryQueryEvent.java @@ -1,4 +1,4 @@ -package com.openblocks.infra.event; +package org.lowcoder.infra.event; import lombok.Getter; import lombok.experimental.SuperBuilder; diff --git a/server/api-service/openblocks-infra/src/main/java/com/openblocks/infra/event/QueryExecutionEvent.java b/server/api-service/lowcoder-infra/src/main/java/org/lowcoder/infra/event/QueryExecutionEvent.java similarity index 89% rename from server/api-service/openblocks-infra/src/main/java/com/openblocks/infra/event/QueryExecutionEvent.java rename to server/api-service/lowcoder-infra/src/main/java/org/lowcoder/infra/event/QueryExecutionEvent.java index d9fcf1df0..bc1b7f4a8 100644 --- a/server/api-service/openblocks-infra/src/main/java/com/openblocks/infra/event/QueryExecutionEvent.java +++ b/server/api-service/lowcoder-infra/src/main/java/org/lowcoder/infra/event/QueryExecutionEvent.java @@ -1,4 +1,4 @@ -package com.openblocks.infra.event; +package org.lowcoder.infra.event; import java.util.Map; diff --git a/server/api-service/openblocks-infra/src/main/java/com/openblocks/infra/event/datasource/DatasourceEvent.java b/server/api-service/lowcoder-infra/src/main/java/org/lowcoder/infra/event/datasource/DatasourceEvent.java similarity index 66% rename from server/api-service/openblocks-infra/src/main/java/com/openblocks/infra/event/datasource/DatasourceEvent.java rename to server/api-service/lowcoder-infra/src/main/java/org/lowcoder/infra/event/datasource/DatasourceEvent.java index a16f16aec..7c724b68d 100644 --- a/server/api-service/openblocks-infra/src/main/java/com/openblocks/infra/event/datasource/DatasourceEvent.java +++ b/server/api-service/lowcoder-infra/src/main/java/org/lowcoder/infra/event/datasource/DatasourceEvent.java @@ -1,7 +1,7 @@ -package com.openblocks.infra.event.datasource; +package org.lowcoder.infra.event.datasource; -import com.openblocks.infra.event.AbstractEvent; -import com.openblocks.infra.event.EventType; +import org.lowcoder.infra.event.AbstractEvent; +import org.lowcoder.infra.event.EventType; import lombok.Getter; import lombok.experimental.SuperBuilder; diff --git a/server/api-service/openblocks-infra/src/main/java/com/openblocks/infra/event/datasource/DatasourcePermissionEvent.java b/server/api-service/lowcoder-infra/src/main/java/org/lowcoder/infra/event/datasource/DatasourcePermissionEvent.java similarity index 76% rename from server/api-service/openblocks-infra/src/main/java/com/openblocks/infra/event/datasource/DatasourcePermissionEvent.java rename to server/api-service/lowcoder-infra/src/main/java/org/lowcoder/infra/event/datasource/DatasourcePermissionEvent.java index 63ef85b21..9e967e248 100644 --- a/server/api-service/openblocks-infra/src/main/java/com/openblocks/infra/event/datasource/DatasourcePermissionEvent.java +++ b/server/api-service/lowcoder-infra/src/main/java/org/lowcoder/infra/event/datasource/DatasourcePermissionEvent.java @@ -1,9 +1,9 @@ -package com.openblocks.infra.event.datasource; +package org.lowcoder.infra.event.datasource; import java.util.Collection; -import com.openblocks.infra.event.AbstractEvent; -import com.openblocks.infra.event.EventType; +import org.lowcoder.infra.event.AbstractEvent; +import org.lowcoder.infra.event.EventType; import lombok.Getter; import lombok.experimental.SuperBuilder; diff --git a/server/api-service/openblocks-infra/src/main/java/com/openblocks/infra/event/group/BaseGroupEvent.java b/server/api-service/lowcoder-infra/src/main/java/org/lowcoder/infra/event/group/BaseGroupEvent.java similarity index 70% rename from server/api-service/openblocks-infra/src/main/java/com/openblocks/infra/event/group/BaseGroupEvent.java rename to server/api-service/lowcoder-infra/src/main/java/org/lowcoder/infra/event/group/BaseGroupEvent.java index 463b951db..069e97838 100644 --- a/server/api-service/openblocks-infra/src/main/java/com/openblocks/infra/event/group/BaseGroupEvent.java +++ b/server/api-service/lowcoder-infra/src/main/java/org/lowcoder/infra/event/group/BaseGroupEvent.java @@ -1,6 +1,6 @@ -package com.openblocks.infra.event.group; +package org.lowcoder.infra.event.group; -import com.openblocks.infra.event.AbstractEvent; +import org.lowcoder.infra.event.AbstractEvent; import lombok.Getter; import lombok.experimental.SuperBuilder; diff --git a/server/api-service/openblocks-infra/src/main/java/com/openblocks/infra/event/group/GroupCreateEvent.java b/server/api-service/lowcoder-infra/src/main/java/org/lowcoder/infra/event/group/GroupCreateEvent.java similarity index 71% rename from server/api-service/openblocks-infra/src/main/java/com/openblocks/infra/event/group/GroupCreateEvent.java rename to server/api-service/lowcoder-infra/src/main/java/org/lowcoder/infra/event/group/GroupCreateEvent.java index dca73d9c8..d2983a29c 100644 --- a/server/api-service/openblocks-infra/src/main/java/com/openblocks/infra/event/group/GroupCreateEvent.java +++ b/server/api-service/lowcoder-infra/src/main/java/org/lowcoder/infra/event/group/GroupCreateEvent.java @@ -1,6 +1,6 @@ -package com.openblocks.infra.event.group; +package org.lowcoder.infra.event.group; -import com.openblocks.infra.event.EventType; +import org.lowcoder.infra.event.EventType; import lombok.experimental.SuperBuilder; diff --git a/server/api-service/openblocks-infra/src/main/java/com/openblocks/infra/event/group/GroupDeleteEvent.java b/server/api-service/lowcoder-infra/src/main/java/org/lowcoder/infra/event/group/GroupDeleteEvent.java similarity index 71% rename from server/api-service/openblocks-infra/src/main/java/com/openblocks/infra/event/group/GroupDeleteEvent.java rename to server/api-service/lowcoder-infra/src/main/java/org/lowcoder/infra/event/group/GroupDeleteEvent.java index 3460e89e2..4da2b51e3 100644 --- a/server/api-service/openblocks-infra/src/main/java/com/openblocks/infra/event/group/GroupDeleteEvent.java +++ b/server/api-service/lowcoder-infra/src/main/java/org/lowcoder/infra/event/group/GroupDeleteEvent.java @@ -1,6 +1,6 @@ -package com.openblocks.infra.event.group; +package org.lowcoder.infra.event.group; -import com.openblocks.infra.event.EventType; +import org.lowcoder.infra.event.EventType; import lombok.experimental.SuperBuilder; diff --git a/server/api-service/openblocks-infra/src/main/java/com/openblocks/infra/event/group/GroupUpdateEvent.java b/server/api-service/lowcoder-infra/src/main/java/org/lowcoder/infra/event/group/GroupUpdateEvent.java similarity index 71% rename from server/api-service/openblocks-infra/src/main/java/com/openblocks/infra/event/group/GroupUpdateEvent.java rename to server/api-service/lowcoder-infra/src/main/java/org/lowcoder/infra/event/group/GroupUpdateEvent.java index 481461890..ac6ef697d 100644 --- a/server/api-service/openblocks-infra/src/main/java/com/openblocks/infra/event/group/GroupUpdateEvent.java +++ b/server/api-service/lowcoder-infra/src/main/java/org/lowcoder/infra/event/group/GroupUpdateEvent.java @@ -1,6 +1,6 @@ -package com.openblocks.infra.event.group; +package org.lowcoder.infra.event.group; -import com.openblocks.infra.event.EventType; +import org.lowcoder.infra.event.EventType; import lombok.experimental.SuperBuilder; diff --git a/server/api-service/openblocks-infra/src/main/java/com/openblocks/infra/event/groupmember/BaseGroupMemberEvent.java b/server/api-service/lowcoder-infra/src/main/java/org/lowcoder/infra/event/groupmember/BaseGroupMemberEvent.java similarity index 77% rename from server/api-service/openblocks-infra/src/main/java/com/openblocks/infra/event/groupmember/BaseGroupMemberEvent.java rename to server/api-service/lowcoder-infra/src/main/java/org/lowcoder/infra/event/groupmember/BaseGroupMemberEvent.java index 5544c2a72..65b46dda9 100644 --- a/server/api-service/openblocks-infra/src/main/java/com/openblocks/infra/event/groupmember/BaseGroupMemberEvent.java +++ b/server/api-service/lowcoder-infra/src/main/java/org/lowcoder/infra/event/groupmember/BaseGroupMemberEvent.java @@ -1,6 +1,6 @@ -package com.openblocks.infra.event.groupmember; +package org.lowcoder.infra.event.groupmember; -import com.openblocks.infra.event.AbstractEvent; +import org.lowcoder.infra.event.AbstractEvent; import lombok.Getter; import lombok.experimental.SuperBuilder; diff --git a/server/api-service/openblocks-infra/src/main/java/com/openblocks/infra/event/groupmember/GroupMemberAddEvent.java b/server/api-service/lowcoder-infra/src/main/java/org/lowcoder/infra/event/groupmember/GroupMemberAddEvent.java similarity index 70% rename from server/api-service/openblocks-infra/src/main/java/com/openblocks/infra/event/groupmember/GroupMemberAddEvent.java rename to server/api-service/lowcoder-infra/src/main/java/org/lowcoder/infra/event/groupmember/GroupMemberAddEvent.java index ce85d5de6..bf5bcd89f 100644 --- a/server/api-service/openblocks-infra/src/main/java/com/openblocks/infra/event/groupmember/GroupMemberAddEvent.java +++ b/server/api-service/lowcoder-infra/src/main/java/org/lowcoder/infra/event/groupmember/GroupMemberAddEvent.java @@ -1,6 +1,6 @@ -package com.openblocks.infra.event.groupmember; +package org.lowcoder.infra.event.groupmember; -import com.openblocks.infra.event.EventType; +import org.lowcoder.infra.event.EventType; import lombok.experimental.SuperBuilder; diff --git a/server/api-service/openblocks-infra/src/main/java/com/openblocks/infra/event/groupmember/GroupMemberLeaveEvent.java b/server/api-service/lowcoder-infra/src/main/java/org/lowcoder/infra/event/groupmember/GroupMemberLeaveEvent.java similarity index 71% rename from server/api-service/openblocks-infra/src/main/java/com/openblocks/infra/event/groupmember/GroupMemberLeaveEvent.java rename to server/api-service/lowcoder-infra/src/main/java/org/lowcoder/infra/event/groupmember/GroupMemberLeaveEvent.java index db675079b..bd43fa482 100644 --- a/server/api-service/openblocks-infra/src/main/java/com/openblocks/infra/event/groupmember/GroupMemberLeaveEvent.java +++ b/server/api-service/lowcoder-infra/src/main/java/org/lowcoder/infra/event/groupmember/GroupMemberLeaveEvent.java @@ -1,6 +1,6 @@ -package com.openblocks.infra.event.groupmember; +package org.lowcoder.infra.event.groupmember; -import com.openblocks.infra.event.EventType; +import org.lowcoder.infra.event.EventType; import lombok.experimental.SuperBuilder; diff --git a/server/api-service/openblocks-infra/src/main/java/com/openblocks/infra/event/groupmember/GroupMemberRemoveEvent.java b/server/api-service/lowcoder-infra/src/main/java/org/lowcoder/infra/event/groupmember/GroupMemberRemoveEvent.java similarity index 71% rename from server/api-service/openblocks-infra/src/main/java/com/openblocks/infra/event/groupmember/GroupMemberRemoveEvent.java rename to server/api-service/lowcoder-infra/src/main/java/org/lowcoder/infra/event/groupmember/GroupMemberRemoveEvent.java index 2c5449143..888da0aff 100644 --- a/server/api-service/openblocks-infra/src/main/java/com/openblocks/infra/event/groupmember/GroupMemberRemoveEvent.java +++ b/server/api-service/lowcoder-infra/src/main/java/org/lowcoder/infra/event/groupmember/GroupMemberRemoveEvent.java @@ -1,6 +1,6 @@ -package com.openblocks.infra.event.groupmember; +package org.lowcoder.infra.event.groupmember; -import com.openblocks.infra.event.EventType; +import org.lowcoder.infra.event.EventType; import lombok.experimental.SuperBuilder; diff --git a/server/api-service/openblocks-infra/src/main/java/com/openblocks/infra/event/groupmember/GroupMemberRoleUpdateEvent.java b/server/api-service/lowcoder-infra/src/main/java/org/lowcoder/infra/event/groupmember/GroupMemberRoleUpdateEvent.java similarity index 72% rename from server/api-service/openblocks-infra/src/main/java/com/openblocks/infra/event/groupmember/GroupMemberRoleUpdateEvent.java rename to server/api-service/lowcoder-infra/src/main/java/org/lowcoder/infra/event/groupmember/GroupMemberRoleUpdateEvent.java index 235bd0392..62ea39478 100644 --- a/server/api-service/openblocks-infra/src/main/java/com/openblocks/infra/event/groupmember/GroupMemberRoleUpdateEvent.java +++ b/server/api-service/lowcoder-infra/src/main/java/org/lowcoder/infra/event/groupmember/GroupMemberRoleUpdateEvent.java @@ -1,6 +1,6 @@ -package com.openblocks.infra.event.groupmember; +package org.lowcoder.infra.event.groupmember; -import com.openblocks.infra.event.EventType; +import org.lowcoder.infra.event.EventType; import lombok.experimental.SuperBuilder; diff --git a/server/api-service/openblocks-infra/src/main/java/com/openblocks/infra/event/user/UserLoginEvent.java b/server/api-service/lowcoder-infra/src/main/java/org/lowcoder/infra/event/user/UserLoginEvent.java similarity index 66% rename from server/api-service/openblocks-infra/src/main/java/com/openblocks/infra/event/user/UserLoginEvent.java rename to server/api-service/lowcoder-infra/src/main/java/org/lowcoder/infra/event/user/UserLoginEvent.java index 8535d283c..c0e7fafd2 100644 --- a/server/api-service/openblocks-infra/src/main/java/com/openblocks/infra/event/user/UserLoginEvent.java +++ b/server/api-service/lowcoder-infra/src/main/java/org/lowcoder/infra/event/user/UserLoginEvent.java @@ -1,7 +1,7 @@ -package com.openblocks.infra.event.user; +package org.lowcoder.infra.event.user; -import com.openblocks.infra.event.AbstractEvent; -import com.openblocks.infra.event.EventType; +import org.lowcoder.infra.event.AbstractEvent; +import org.lowcoder.infra.event.EventType; import lombok.Getter; import lombok.experimental.SuperBuilder; diff --git a/server/api-service/openblocks-infra/src/main/java/com/openblocks/infra/event/user/UserLogoutEvent.java b/server/api-service/lowcoder-infra/src/main/java/org/lowcoder/infra/event/user/UserLogoutEvent.java similarity index 60% rename from server/api-service/openblocks-infra/src/main/java/com/openblocks/infra/event/user/UserLogoutEvent.java rename to server/api-service/lowcoder-infra/src/main/java/org/lowcoder/infra/event/user/UserLogoutEvent.java index a9f31acaf..8e0a8b073 100644 --- a/server/api-service/openblocks-infra/src/main/java/com/openblocks/infra/event/user/UserLogoutEvent.java +++ b/server/api-service/lowcoder-infra/src/main/java/org/lowcoder/infra/event/user/UserLogoutEvent.java @@ -1,7 +1,7 @@ -package com.openblocks.infra.event.user; +package org.lowcoder.infra.event.user; -import com.openblocks.infra.event.AbstractEvent; -import com.openblocks.infra.event.EventType; +import org.lowcoder.infra.event.AbstractEvent; +import org.lowcoder.infra.event.EventType; import lombok.experimental.SuperBuilder; diff --git a/server/api-service/openblocks-infra/src/main/java/com/openblocks/infra/eventlog/EventLog.java b/server/api-service/lowcoder-infra/src/main/java/org/lowcoder/infra/eventlog/EventLog.java similarity index 78% rename from server/api-service/openblocks-infra/src/main/java/com/openblocks/infra/eventlog/EventLog.java rename to server/api-service/lowcoder-infra/src/main/java/org/lowcoder/infra/eventlog/EventLog.java index 6a720730b..5242daed0 100644 --- a/server/api-service/openblocks-infra/src/main/java/com/openblocks/infra/eventlog/EventLog.java +++ b/server/api-service/lowcoder-infra/src/main/java/org/lowcoder/infra/eventlog/EventLog.java @@ -1,4 +1,4 @@ -package com.openblocks.infra.eventlog; +package org.lowcoder.infra.eventlog; import java.util.Map; diff --git a/server/api-service/openblocks-infra/src/main/java/com/openblocks/infra/js/NodeServerClient.java b/server/api-service/lowcoder-infra/src/main/java/org/lowcoder/infra/js/NodeServerClient.java similarity index 54% rename from server/api-service/openblocks-infra/src/main/java/com/openblocks/infra/js/NodeServerClient.java rename to server/api-service/lowcoder-infra/src/main/java/org/lowcoder/infra/js/NodeServerClient.java index 29360f0af..29788f9bb 100644 --- a/server/api-service/openblocks-infra/src/main/java/com/openblocks/infra/js/NodeServerClient.java +++ b/server/api-service/lowcoder-infra/src/main/java/org/lowcoder/infra/js/NodeServerClient.java @@ -1,4 +1,4 @@ -package com.openblocks.infra.js; +package org.lowcoder.infra.js; public interface NodeServerClient { } diff --git a/server/api-service/openblocks-infra/src/main/java/com/openblocks/infra/js/NodeServerHelper.java b/server/api-service/lowcoder-infra/src/main/java/org/lowcoder/infra/js/NodeServerHelper.java similarity index 89% rename from server/api-service/openblocks-infra/src/main/java/com/openblocks/infra/js/NodeServerHelper.java rename to server/api-service/lowcoder-infra/src/main/java/org/lowcoder/infra/js/NodeServerHelper.java index 0c64880ff..be4eb8c74 100644 --- a/server/api-service/openblocks-infra/src/main/java/com/openblocks/infra/js/NodeServerHelper.java +++ b/server/api-service/lowcoder-infra/src/main/java/org/lowcoder/infra/js/NodeServerHelper.java @@ -1,13 +1,12 @@ -package com.openblocks.infra.js; +package org.lowcoder.infra.js; import java.net.URI; +import org.lowcoder.sdk.config.CommonConfigHelper; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; import org.springframework.web.util.UriComponentsBuilder; -import com.openblocks.sdk.config.CommonConfigHelper; - @Component public class NodeServerHelper { diff --git a/server/api-service/openblocks-infra/src/main/java/com/openblocks/infra/localcache/CaffeineCacheUtils.java b/server/api-service/lowcoder-infra/src/main/java/org/lowcoder/infra/localcache/CaffeineCacheUtils.java similarity index 94% rename from server/api-service/openblocks-infra/src/main/java/com/openblocks/infra/localcache/CaffeineCacheUtils.java rename to server/api-service/lowcoder-infra/src/main/java/org/lowcoder/infra/localcache/CaffeineCacheUtils.java index f711428f4..d3b4e9a10 100644 --- a/server/api-service/openblocks-infra/src/main/java/com/openblocks/infra/localcache/CaffeineCacheUtils.java +++ b/server/api-service/lowcoder-infra/src/main/java/org/lowcoder/infra/localcache/CaffeineCacheUtils.java @@ -1,4 +1,4 @@ -package com.openblocks.infra.localcache; +package org.lowcoder.infra.localcache; import java.util.function.Supplier; diff --git a/server/api-service/openblocks-infra/src/main/java/com/openblocks/infra/localcache/ReloadableCache.java b/server/api-service/lowcoder-infra/src/main/java/org/lowcoder/infra/localcache/ReloadableCache.java similarity index 97% rename from server/api-service/openblocks-infra/src/main/java/com/openblocks/infra/localcache/ReloadableCache.java rename to server/api-service/lowcoder-infra/src/main/java/org/lowcoder/infra/localcache/ReloadableCache.java index 2138d0787..0eb36e585 100644 --- a/server/api-service/openblocks-infra/src/main/java/com/openblocks/infra/localcache/ReloadableCache.java +++ b/server/api-service/lowcoder-infra/src/main/java/org/lowcoder/infra/localcache/ReloadableCache.java @@ -1,4 +1,4 @@ -package com.openblocks.infra.localcache; +package org.lowcoder.infra.localcache; import static com.google.common.base.MoreObjects.firstNonNull; import static java.util.concurrent.Executors.newSingleThreadScheduledExecutor; @@ -10,9 +10,10 @@ import javax.annotation.CheckReturnValue; import javax.annotation.Nonnull; +import org.lowcoder.sdk.destructor.DestructorUtil; + import com.google.common.base.Preconditions; import com.google.common.util.concurrent.MoreExecutors; -import com.openblocks.sdk.destructor.DestructorUtil; import lombok.extern.slf4j.Slf4j; import reactor.core.publisher.Mono; diff --git a/server/api-service/openblocks-infra/src/main/java/com/openblocks/infra/mongo/MongoUpsertHelper.java b/server/api-service/lowcoder-infra/src/main/java/org/lowcoder/infra/mongo/MongoUpsertHelper.java similarity index 97% rename from server/api-service/openblocks-infra/src/main/java/com/openblocks/infra/mongo/MongoUpsertHelper.java rename to server/api-service/lowcoder-infra/src/main/java/org/lowcoder/infra/mongo/MongoUpsertHelper.java index 20d778007..e10755b59 100644 --- a/server/api-service/openblocks-infra/src/main/java/com/openblocks/infra/mongo/MongoUpsertHelper.java +++ b/server/api-service/lowcoder-infra/src/main/java/org/lowcoder/infra/mongo/MongoUpsertHelper.java @@ -1,4 +1,4 @@ -package com.openblocks.infra.mongo; +package org.lowcoder.infra.mongo; import java.time.Instant; import java.util.Collection; @@ -8,6 +8,10 @@ import org.bson.Document; import org.bson.conversions.Bson; import org.bson.types.ObjectId; +import org.lowcoder.sdk.constants.FieldName; +import org.lowcoder.sdk.constants.GlobalContext; +import org.lowcoder.sdk.event.BeforeSaveEvent; +import org.lowcoder.sdk.models.HasIdAndAuditing; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.ApplicationEventPublisher; import org.springframework.data.mongodb.core.ReactiveMongoTemplate; @@ -23,10 +27,6 @@ import com.mongodb.client.model.DeleteOneModel; import com.mongodb.client.model.UpdateOneModel; import com.mongodb.client.model.UpdateOptions; -import com.openblocks.sdk.constants.FieldName; -import com.openblocks.sdk.constants.GlobalContext; -import com.openblocks.sdk.event.BeforeSaveEvent; -import com.openblocks.sdk.models.HasIdAndAuditing; import reactor.core.publisher.Mono; diff --git a/server/api-service/openblocks-infra/src/main/java/com/openblocks/infra/perf/PerfEvent.java b/server/api-service/lowcoder-infra/src/main/java/org/lowcoder/infra/perf/PerfEvent.java similarity index 93% rename from server/api-service/openblocks-infra/src/main/java/com/openblocks/infra/perf/PerfEvent.java rename to server/api-service/lowcoder-infra/src/main/java/org/lowcoder/infra/perf/PerfEvent.java index a3515572b..17c38939f 100644 --- a/server/api-service/openblocks-infra/src/main/java/com/openblocks/infra/perf/PerfEvent.java +++ b/server/api-service/lowcoder-infra/src/main/java/org/lowcoder/infra/perf/PerfEvent.java @@ -1,4 +1,4 @@ -package com.openblocks.infra.perf; +package org.lowcoder.infra.perf; public enum PerfEvent { API_ERROR_CODE, diff --git a/server/api-service/openblocks-infra/src/main/java/com/openblocks/infra/perf/PerfHelper.java b/server/api-service/lowcoder-infra/src/main/java/org/lowcoder/infra/perf/PerfHelper.java similarity index 98% rename from server/api-service/openblocks-infra/src/main/java/com/openblocks/infra/perf/PerfHelper.java rename to server/api-service/lowcoder-infra/src/main/java/org/lowcoder/infra/perf/PerfHelper.java index a5219dd2e..6871587f9 100644 --- a/server/api-service/openblocks-infra/src/main/java/com/openblocks/infra/perf/PerfHelper.java +++ b/server/api-service/lowcoder-infra/src/main/java/org/lowcoder/infra/perf/PerfHelper.java @@ -1,4 +1,4 @@ -package com.openblocks.infra.perf; +package org.lowcoder.infra.perf; import java.time.Duration; import java.util.concurrent.Callable; diff --git a/server/api-service/openblocks-infra/src/main/java/com/openblocks/infra/serverlog/ServerLog.java b/server/api-service/lowcoder-infra/src/main/java/org/lowcoder/infra/serverlog/ServerLog.java similarity index 95% rename from server/api-service/openblocks-infra/src/main/java/com/openblocks/infra/serverlog/ServerLog.java rename to server/api-service/lowcoder-infra/src/main/java/org/lowcoder/infra/serverlog/ServerLog.java index ec1dbfdf5..4ce13d0c4 100644 --- a/server/api-service/openblocks-infra/src/main/java/com/openblocks/infra/serverlog/ServerLog.java +++ b/server/api-service/lowcoder-infra/src/main/java/org/lowcoder/infra/serverlog/ServerLog.java @@ -1,4 +1,4 @@ -package com.openblocks.infra.serverlog; +package org.lowcoder.infra.serverlog; import java.util.Map; diff --git a/server/api-service/openblocks-infra/src/main/java/com/openblocks/infra/serverlog/ServerLogRepository.java b/server/api-service/lowcoder-infra/src/main/java/org/lowcoder/infra/serverlog/ServerLogRepository.java similarity index 81% rename from server/api-service/openblocks-infra/src/main/java/com/openblocks/infra/serverlog/ServerLogRepository.java rename to server/api-service/lowcoder-infra/src/main/java/org/lowcoder/infra/serverlog/ServerLogRepository.java index 02373e60f..bb6ecae8b 100644 --- a/server/api-service/openblocks-infra/src/main/java/com/openblocks/infra/serverlog/ServerLogRepository.java +++ b/server/api-service/lowcoder-infra/src/main/java/org/lowcoder/infra/serverlog/ServerLogRepository.java @@ -1,4 +1,4 @@ -package com.openblocks.infra.serverlog; +package org.lowcoder.infra.serverlog; import org.springframework.data.mongodb.repository.ReactiveMongoRepository; diff --git a/server/api-service/openblocks-infra/src/main/java/com/openblocks/infra/serverlog/ServerLogService.java b/server/api-service/lowcoder-infra/src/main/java/org/lowcoder/infra/serverlog/ServerLogService.java similarity index 88% rename from server/api-service/openblocks-infra/src/main/java/com/openblocks/infra/serverlog/ServerLogService.java rename to server/api-service/lowcoder-infra/src/main/java/org/lowcoder/infra/serverlog/ServerLogService.java index 46a512926..8b9a38c64 100644 --- a/server/api-service/openblocks-infra/src/main/java/com/openblocks/infra/serverlog/ServerLogService.java +++ b/server/api-service/lowcoder-infra/src/main/java/org/lowcoder/infra/serverlog/ServerLogService.java @@ -1,18 +1,17 @@ -package com.openblocks.infra.serverlog; +package org.lowcoder.infra.serverlog; -import static com.openblocks.infra.perf.PerfEvent.SERVER_LOG_BATCH_INSERT; +import static org.lowcoder.infra.perf.PerfEvent.SERVER_LOG_BATCH_INSERT; import java.util.Queue; import java.util.concurrent.ConcurrentLinkedQueue; import java.util.concurrent.TimeUnit; import org.apache.commons.collections4.CollectionUtils; +import org.lowcoder.infra.perf.PerfHelper; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.scheduling.annotation.Scheduled; import org.springframework.stereotype.Service; -import com.openblocks.infra.perf.PerfHelper; - import io.micrometer.core.instrument.Tags; @Service diff --git a/server/api-service/openblocks-infra/src/main/java/com/openblocks/infra/util/AssetUtils.java b/server/api-service/lowcoder-infra/src/main/java/org/lowcoder/infra/util/AssetUtils.java similarity index 74% rename from server/api-service/openblocks-infra/src/main/java/com/openblocks/infra/util/AssetUtils.java rename to server/api-service/lowcoder-infra/src/main/java/org/lowcoder/infra/util/AssetUtils.java index 3699df23e..bd9985031 100644 --- a/server/api-service/openblocks-infra/src/main/java/com/openblocks/infra/util/AssetUtils.java +++ b/server/api-service/lowcoder-infra/src/main/java/org/lowcoder/infra/util/AssetUtils.java @@ -1,8 +1,7 @@ -package com.openblocks.infra.util; +package org.lowcoder.infra.util; import org.apache.commons.lang3.StringUtils; - -import com.openblocks.infra.constant.NewUrl; +import org.lowcoder.infra.constant.NewUrl; public final class AssetUtils { diff --git a/server/api-service/openblocks-infra/src/main/java/com/openblocks/infra/util/FluxHelper.java b/server/api-service/lowcoder-infra/src/main/java/org/lowcoder/infra/util/FluxHelper.java similarity index 95% rename from server/api-service/openblocks-infra/src/main/java/com/openblocks/infra/util/FluxHelper.java rename to server/api-service/lowcoder-infra/src/main/java/org/lowcoder/infra/util/FluxHelper.java index 74842c2cb..2c3fb1f00 100644 --- a/server/api-service/openblocks-infra/src/main/java/com/openblocks/infra/util/FluxHelper.java +++ b/server/api-service/lowcoder-infra/src/main/java/org/lowcoder/infra/util/FluxHelper.java @@ -1,4 +1,4 @@ -package com.openblocks.infra.util; +package org.lowcoder.infra.util; import org.springframework.data.domain.Pageable; diff --git a/server/api-service/openblocks-infra/src/main/java/com/openblocks/infra/util/LogUtils.java b/server/api-service/lowcoder-infra/src/main/java/org/lowcoder/infra/util/LogUtils.java similarity index 98% rename from server/api-service/openblocks-infra/src/main/java/com/openblocks/infra/util/LogUtils.java rename to server/api-service/lowcoder-infra/src/main/java/org/lowcoder/infra/util/LogUtils.java index 4d0435ff3..0be6ebb56 100644 --- a/server/api-service/openblocks-infra/src/main/java/com/openblocks/infra/util/LogUtils.java +++ b/server/api-service/lowcoder-infra/src/main/java/org/lowcoder/infra/util/LogUtils.java @@ -1,4 +1,4 @@ -package com.openblocks.infra.util; +package org.lowcoder.infra.util; import java.util.HashMap; import java.util.Map; diff --git a/server/api-service/openblocks-infra/src/main/java/com/openblocks/infra/util/MonoUtils.java b/server/api-service/lowcoder-infra/src/main/java/org/lowcoder/infra/util/MonoUtils.java similarity index 93% rename from server/api-service/openblocks-infra/src/main/java/com/openblocks/infra/util/MonoUtils.java rename to server/api-service/lowcoder-infra/src/main/java/org/lowcoder/infra/util/MonoUtils.java index 832e4344d..21b831b1b 100644 --- a/server/api-service/openblocks-infra/src/main/java/com/openblocks/infra/util/MonoUtils.java +++ b/server/api-service/lowcoder-infra/src/main/java/org/lowcoder/infra/util/MonoUtils.java @@ -1,4 +1,4 @@ -package com.openblocks.infra.util; +package org.lowcoder.infra.util; import java.util.List; diff --git a/server/api-service/openblocks-infra/src/main/java/com/openblocks/infra/util/NetworkUtils.java b/server/api-service/lowcoder-infra/src/main/java/org/lowcoder/infra/util/NetworkUtils.java similarity index 93% rename from server/api-service/openblocks-infra/src/main/java/com/openblocks/infra/util/NetworkUtils.java rename to server/api-service/lowcoder-infra/src/main/java/org/lowcoder/infra/util/NetworkUtils.java index 0cd1e1f5d..966e42149 100644 --- a/server/api-service/openblocks-infra/src/main/java/com/openblocks/infra/util/NetworkUtils.java +++ b/server/api-service/lowcoder-infra/src/main/java/org/lowcoder/infra/util/NetworkUtils.java @@ -1,16 +1,15 @@ -package com.openblocks.infra.util; +package org.lowcoder.infra.util; import java.net.InetAddress; import java.net.InetSocketAddress; import java.util.Optional; import org.apache.commons.lang3.StringUtils; +import org.lowcoder.sdk.util.JsonUtils; import org.springframework.http.HttpHeaders; import org.springframework.http.server.reactive.ServerHttpRequest; import org.springframework.web.server.ServerWebExchange; -import com.openblocks.sdk.util.JsonUtils; - import lombok.extern.slf4j.Slf4j; @Slf4j diff --git a/server/api-service/openblocks-infra/src/main/java/com/openblocks/infra/util/RSAUtils.java b/server/api-service/lowcoder-infra/src/main/java/org/lowcoder/infra/util/RSAUtils.java similarity index 97% rename from server/api-service/openblocks-infra/src/main/java/com/openblocks/infra/util/RSAUtils.java rename to server/api-service/lowcoder-infra/src/main/java/org/lowcoder/infra/util/RSAUtils.java index ca2db2e50..979e01a9e 100644 --- a/server/api-service/openblocks-infra/src/main/java/com/openblocks/infra/util/RSAUtils.java +++ b/server/api-service/lowcoder-infra/src/main/java/org/lowcoder/infra/util/RSAUtils.java @@ -1,4 +1,4 @@ -package com.openblocks.infra.util; +package org.lowcoder.infra.util; import java.security.Key; import java.security.KeyFactory; diff --git a/server/api-service/openblocks-infra/src/main/java/com/openblocks/infra/util/RateLimitHelper.java b/server/api-service/lowcoder-infra/src/main/java/org/lowcoder/infra/util/RateLimitHelper.java similarity index 96% rename from server/api-service/openblocks-infra/src/main/java/com/openblocks/infra/util/RateLimitHelper.java rename to server/api-service/lowcoder-infra/src/main/java/org/lowcoder/infra/util/RateLimitHelper.java index d858c829b..15f9531bc 100644 --- a/server/api-service/openblocks-infra/src/main/java/com/openblocks/infra/util/RateLimitHelper.java +++ b/server/api-service/lowcoder-infra/src/main/java/org/lowcoder/infra/util/RateLimitHelper.java @@ -1,4 +1,4 @@ -package com.openblocks.infra.util; +package org.lowcoder.infra.util; import java.time.Duration; import java.util.Set; diff --git a/server/api-service/openblocks-infra/src/main/java/com/openblocks/infra/util/TupleUtils.java b/server/api-service/lowcoder-infra/src/main/java/org/lowcoder/infra/util/TupleUtils.java similarity index 97% rename from server/api-service/openblocks-infra/src/main/java/com/openblocks/infra/util/TupleUtils.java rename to server/api-service/lowcoder-infra/src/main/java/org/lowcoder/infra/util/TupleUtils.java index e274f0f3b..11457f1cf 100644 --- a/server/api-service/openblocks-infra/src/main/java/com/openblocks/infra/util/TupleUtils.java +++ b/server/api-service/lowcoder-infra/src/main/java/org/lowcoder/infra/util/TupleUtils.java @@ -1,4 +1,4 @@ -package com.openblocks.infra.util; +package org.lowcoder.infra.util; import reactor.util.function.Tuple2; import reactor.util.function.Tuple3; diff --git a/server/api-service/openblocks-infra/src/test/java/com/openblocks/infra/config/AutoReloadConfigInstanceImplTest.java b/server/api-service/lowcoder-infra/src/test/java/org/lowcoder/infra/config/AutoReloadConfigInstanceImplTest.java similarity index 90% rename from server/api-service/openblocks-infra/src/test/java/com/openblocks/infra/config/AutoReloadConfigInstanceImplTest.java rename to server/api-service/lowcoder-infra/src/test/java/org/lowcoder/infra/config/AutoReloadConfigInstanceImplTest.java index fb7fe1bba..f9e1442fd 100644 --- a/server/api-service/openblocks-infra/src/test/java/com/openblocks/infra/config/AutoReloadConfigInstanceImplTest.java +++ b/server/api-service/lowcoder-infra/src/test/java/org/lowcoder/infra/config/AutoReloadConfigInstanceImplTest.java @@ -1,4 +1,4 @@ -package com.openblocks.infra.config; +package org.lowcoder.infra.config; import java.lang.reflect.Field; import java.util.List; @@ -9,10 +9,11 @@ import org.junit.Assert; import org.junit.BeforeClass; import org.junit.Test; - -import com.openblocks.sdk.config.dynamic.Conf; -import com.openblocks.sdk.test.JsonFileReader; -import com.openblocks.sdk.util.JsonUtils; +import org.lowcoder.infra.config.AutoReloadConfigFactory; +import org.lowcoder.infra.config.AutoReloadConfigInstanceImpl; +import org.lowcoder.sdk.config.dynamic.Conf; +import org.lowcoder.sdk.test.JsonFileReader; +import org.lowcoder.sdk.util.JsonUtils; public class AutoReloadConfigInstanceImplTest { diff --git a/server/api-service/openblocks-infra/src/test/java/com/openblocks/infra/config/AutoReloadConfigInstanceImplTest.json b/server/api-service/lowcoder-infra/src/test/java/org/lowcoder/infra/config/AutoReloadConfigInstanceImplTest.json similarity index 100% rename from server/api-service/openblocks-infra/src/test/java/com/openblocks/infra/config/AutoReloadConfigInstanceImplTest.json rename to server/api-service/lowcoder-infra/src/test/java/org/lowcoder/infra/config/AutoReloadConfigInstanceImplTest.json diff --git a/server/api-service/lowcoder-plugins/clickHousePlugin/plugin.properties b/server/api-service/lowcoder-plugins/clickHousePlugin/plugin.properties new file mode 100644 index 000000000..84e3adae8 --- /dev/null +++ b/server/api-service/lowcoder-plugins/clickHousePlugin/plugin.properties @@ -0,0 +1,5 @@ +plugin.id=clickHouse-plugin +plugin.class=org.lowcoder.plugin.clickhouse.ClickHousePlugin +plugin.version=1.0-SNAPSHOT +plugin.provider=service@lowcoder.org +plugin.dependencies= diff --git a/server/api-service/openblocks-plugins/clickHousePlugin/pom.xml b/server/api-service/lowcoder-plugins/clickHousePlugin/pom.xml similarity index 94% rename from server/api-service/openblocks-plugins/clickHousePlugin/pom.xml rename to server/api-service/lowcoder-plugins/clickHousePlugin/pom.xml index 8847d5a52..2b7c54600 100644 --- a/server/api-service/openblocks-plugins/clickHousePlugin/pom.xml +++ b/server/api-service/lowcoder-plugins/clickHousePlugin/pom.xml @@ -3,8 +3,8 @@ - com.openblocks - openblocks-plugins + org.lowcoder + lowcoder-plugins 1.0-SNAPSHOT @@ -18,9 +18,9 @@ ${java.version} ${java.version} clickHouse-plugin - com.openblocks.plugin.clickhouse.ClickHousePlugin + org.lowcoder.plugin.clickhouse.ClickHousePlugin 1.0-SNAPSHOT - dev@openblocks.dev + service@lowcoder.org diff --git a/server/api-service/openblocks-plugins/clickHousePlugin/src/main/java/com/openblocks/plugin/clickhouse/ClickHouseConnector.java b/server/api-service/lowcoder-plugins/clickHousePlugin/src/main/java/org/lowcoder/plugin/clickhouse/ClickHouseConnector.java similarity index 90% rename from server/api-service/openblocks-plugins/clickHousePlugin/src/main/java/com/openblocks/plugin/clickhouse/ClickHouseConnector.java rename to server/api-service/lowcoder-plugins/clickHousePlugin/src/main/java/org/lowcoder/plugin/clickhouse/ClickHouseConnector.java index 3e8cbad67..20b45d360 100644 --- a/server/api-service/openblocks-plugins/clickHousePlugin/src/main/java/com/openblocks/plugin/clickhouse/ClickHouseConnector.java +++ b/server/api-service/lowcoder-plugins/clickHousePlugin/src/main/java/org/lowcoder/plugin/clickhouse/ClickHouseConnector.java @@ -1,9 +1,9 @@ -package com.openblocks.plugin.clickhouse; +package org.lowcoder.plugin.clickhouse; -import static com.openblocks.sdk.exception.PluginCommonError.DATASOURCE_ARGUMENT_ERROR; -import static com.openblocks.sdk.exception.PluginCommonError.DATASOURCE_TIMEOUT_ERROR; -import static com.openblocks.sdk.exception.PluginCommonError.QUERY_EXECUTION_ERROR; -import static com.openblocks.sdk.plugin.common.QueryExecutionUtils.querySharedScheduler; +import static org.lowcoder.sdk.exception.PluginCommonError.DATASOURCE_ARGUMENT_ERROR; +import static org.lowcoder.sdk.exception.PluginCommonError.DATASOURCE_TIMEOUT_ERROR; +import static org.lowcoder.sdk.exception.PluginCommonError.QUERY_EXECUTION_ERROR; +import static org.lowcoder.sdk.plugin.common.QueryExecutionUtils.querySharedScheduler; import java.time.Duration; import java.util.HashSet; @@ -16,13 +16,13 @@ import javax.annotation.Nonnull; import org.apache.commons.lang3.StringUtils; +import org.lowcoder.plugin.clickhouse.model.ClickHouseDatasourceConfig; +import org.lowcoder.sdk.config.dynamic.ConfigCenter; +import org.lowcoder.sdk.exception.PluginException; +import org.lowcoder.sdk.models.DatasourceTestResult; +import org.lowcoder.sdk.plugin.common.DatasourceConnector; import org.pf4j.Extension; -import com.openblocks.plugin.clickhouse.model.ClickHouseDatasourceConfig; -import com.openblocks.sdk.config.dynamic.ConfigCenter; -import com.openblocks.sdk.exception.PluginException; -import com.openblocks.sdk.models.DatasourceTestResult; -import com.openblocks.sdk.plugin.common.DatasourceConnector; import com.zaxxer.hikari.HikariConfig; import com.zaxxer.hikari.HikariDataSource; import com.zaxxer.hikari.pool.HikariPool.PoolInitializationException; diff --git a/server/api-service/openblocks-plugins/clickHousePlugin/src/main/java/com/openblocks/plugin/clickhouse/ClickHousePlugin.java b/server/api-service/lowcoder-plugins/clickHousePlugin/src/main/java/org/lowcoder/plugin/clickhouse/ClickHousePlugin.java similarity index 81% rename from server/api-service/openblocks-plugins/clickHousePlugin/src/main/java/com/openblocks/plugin/clickhouse/ClickHousePlugin.java rename to server/api-service/lowcoder-plugins/clickHousePlugin/src/main/java/org/lowcoder/plugin/clickhouse/ClickHousePlugin.java index 071532122..bedd799ea 100644 --- a/server/api-service/openblocks-plugins/clickHousePlugin/src/main/java/com/openblocks/plugin/clickhouse/ClickHousePlugin.java +++ b/server/api-service/lowcoder-plugins/clickHousePlugin/src/main/java/org/lowcoder/plugin/clickhouse/ClickHousePlugin.java @@ -1,4 +1,4 @@ -package com.openblocks.plugin.clickhouse; +package org.lowcoder.plugin.clickhouse; import org.pf4j.Plugin; import org.pf4j.PluginWrapper; diff --git a/server/api-service/openblocks-plugins/clickHousePlugin/src/main/java/com/openblocks/plugin/clickhouse/ClickHouseQueryExecutor.java b/server/api-service/lowcoder-plugins/clickHousePlugin/src/main/java/org/lowcoder/plugin/clickhouse/ClickHouseQueryExecutor.java similarity index 84% rename from server/api-service/openblocks-plugins/clickHousePlugin/src/main/java/com/openblocks/plugin/clickhouse/ClickHouseQueryExecutor.java rename to server/api-service/lowcoder-plugins/clickHousePlugin/src/main/java/org/lowcoder/plugin/clickhouse/ClickHouseQueryExecutor.java index c7e80cbc1..86164c014 100644 --- a/server/api-service/openblocks-plugins/clickHousePlugin/src/main/java/com/openblocks/plugin/clickhouse/ClickHouseQueryExecutor.java +++ b/server/api-service/lowcoder-plugins/clickHousePlugin/src/main/java/org/lowcoder/plugin/clickhouse/ClickHouseQueryExecutor.java @@ -1,19 +1,19 @@ -package com.openblocks.plugin.clickhouse; +package org.lowcoder.plugin.clickhouse; import static com.google.common.collect.Maps.newLinkedHashMap; -import static com.openblocks.sdk.exception.PluginCommonError.CONNECTION_ERROR; -import static com.openblocks.sdk.exception.PluginCommonError.DATASOURCE_GET_STRUCTURE_ERROR; -import static com.openblocks.sdk.exception.PluginCommonError.PREPARED_STATEMENT_BIND_PARAMETERS_ERROR; -import static com.openblocks.sdk.exception.PluginCommonError.QUERY_ARGUMENT_ERROR; -import static com.openblocks.sdk.exception.PluginCommonError.QUERY_EXECUTION_ERROR; -import static com.openblocks.sdk.plugin.common.QueryExecutionUtils.getIdenticalColumns; -import static com.openblocks.sdk.plugin.common.QueryExecutionUtils.querySharedScheduler; -import static com.openblocks.sdk.plugin.common.sql.ResultSetParser.parseColumns; -import static com.openblocks.sdk.plugin.common.sql.ResultSetParser.parseRows; -import static com.openblocks.sdk.util.JsonUtils.toJson; -import static com.openblocks.sdk.util.MustacheHelper.doPrepareStatement; -import static com.openblocks.sdk.util.MustacheHelper.extractMustacheKeysInOrder; -import static com.openblocks.sdk.util.MustacheHelper.renderMustacheString; +import static org.lowcoder.sdk.exception.PluginCommonError.CONNECTION_ERROR; +import static org.lowcoder.sdk.exception.PluginCommonError.DATASOURCE_GET_STRUCTURE_ERROR; +import static org.lowcoder.sdk.exception.PluginCommonError.PREPARED_STATEMENT_BIND_PARAMETERS_ERROR; +import static org.lowcoder.sdk.exception.PluginCommonError.QUERY_ARGUMENT_ERROR; +import static org.lowcoder.sdk.exception.PluginCommonError.QUERY_EXECUTION_ERROR; +import static org.lowcoder.sdk.plugin.common.QueryExecutionUtils.getIdenticalColumns; +import static org.lowcoder.sdk.plugin.common.QueryExecutionUtils.querySharedScheduler; +import static org.lowcoder.sdk.plugin.common.sql.ResultSetParser.parseColumns; +import static org.lowcoder.sdk.plugin.common.sql.ResultSetParser.parseRows; +import static org.lowcoder.sdk.util.JsonUtils.toJson; +import static org.lowcoder.sdk.util.MustacheHelper.doPrepareStatement; +import static org.lowcoder.sdk.util.MustacheHelper.extractMustacheKeysInOrder; +import static org.lowcoder.sdk.util.MustacheHelper.renderMustacheString; import java.math.BigDecimal; import java.sql.Connection; @@ -34,22 +34,22 @@ import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang3.StringUtils; +import org.lowcoder.plugin.clickhouse.model.ClickHouseDatasourceConfig; +import org.lowcoder.plugin.clickhouse.model.ClickHouseQueryConfig; +import org.lowcoder.plugin.clickhouse.utils.ClickHouseStructureParser; +import org.lowcoder.sdk.config.dynamic.ConfigCenter; +import org.lowcoder.sdk.exception.InvalidHikariDatasourceException; +import org.lowcoder.sdk.exception.PluginException; +import org.lowcoder.sdk.models.DatasourceStructure; +import org.lowcoder.sdk.models.LocaleMessage; +import org.lowcoder.sdk.models.QueryExecutionResult; +import org.lowcoder.sdk.models.DatasourceStructure.Table; +import org.lowcoder.sdk.plugin.common.QueryExecutor; +import org.lowcoder.sdk.plugin.common.SqlQueryUtils; +import org.lowcoder.sdk.plugin.common.sql.SqlBasedQueryExecutionContext; +import org.lowcoder.sdk.query.QueryVisitorContext; import org.pf4j.Extension; -import com.openblocks.plugin.clickhouse.model.ClickHouseDatasourceConfig; -import com.openblocks.plugin.clickhouse.model.ClickHouseQueryConfig; -import com.openblocks.plugin.clickhouse.utils.ClickHouseStructureParser; -import com.openblocks.sdk.config.dynamic.ConfigCenter; -import com.openblocks.sdk.exception.InvalidHikariDatasourceException; -import com.openblocks.sdk.exception.PluginException; -import com.openblocks.sdk.models.DatasourceStructure; -import com.openblocks.sdk.models.DatasourceStructure.Table; -import com.openblocks.sdk.models.LocaleMessage; -import com.openblocks.sdk.models.QueryExecutionResult; -import com.openblocks.sdk.plugin.common.QueryExecutor; -import com.openblocks.sdk.plugin.common.SqlQueryUtils; -import com.openblocks.sdk.plugin.common.sql.SqlBasedQueryExecutionContext; -import com.openblocks.sdk.query.QueryVisitorContext; import com.zaxxer.hikari.HikariDataSource; import lombok.extern.slf4j.Slf4j; diff --git a/server/api-service/openblocks-plugins/clickHousePlugin/src/main/java/com/openblocks/plugin/clickhouse/model/ClickHouseDatasourceConfig.java b/server/api-service/lowcoder-plugins/clickHousePlugin/src/main/java/org/lowcoder/plugin/clickhouse/model/ClickHouseDatasourceConfig.java similarity index 73% rename from server/api-service/openblocks-plugins/clickHousePlugin/src/main/java/com/openblocks/plugin/clickhouse/model/ClickHouseDatasourceConfig.java rename to server/api-service/lowcoder-plugins/clickHousePlugin/src/main/java/org/lowcoder/plugin/clickhouse/model/ClickHouseDatasourceConfig.java index 89478aaa1..045b92ea8 100644 --- a/server/api-service/openblocks-plugins/clickHousePlugin/src/main/java/com/openblocks/plugin/clickhouse/model/ClickHouseDatasourceConfig.java +++ b/server/api-service/lowcoder-plugins/clickHousePlugin/src/main/java/org/lowcoder/plugin/clickhouse/model/ClickHouseDatasourceConfig.java @@ -1,13 +1,13 @@ -package com.openblocks.plugin.clickhouse.model; +package org.lowcoder.plugin.clickhouse.model; -import static com.openblocks.sdk.exception.PluginCommonError.DATASOURCE_ARGUMENT_ERROR; -import static com.openblocks.sdk.util.ExceptionUtils.ofPluginException; -import static com.openblocks.sdk.util.JsonUtils.fromJson; -import static com.openblocks.sdk.util.JsonUtils.toJson; +import static org.lowcoder.sdk.exception.PluginCommonError.DATASOURCE_ARGUMENT_ERROR; +import static org.lowcoder.sdk.util.ExceptionUtils.ofPluginException; +import static org.lowcoder.sdk.util.JsonUtils.fromJson; +import static org.lowcoder.sdk.util.JsonUtils.toJson; import java.util.Map; -import com.openblocks.sdk.plugin.common.sql.SqlBasedDatasourceConnectionConfig; +import org.lowcoder.sdk.plugin.common.sql.SqlBasedDatasourceConnectionConfig; import lombok.Builder; import lombok.extern.slf4j.Slf4j; diff --git a/server/api-service/openblocks-plugins/clickHousePlugin/src/main/java/com/openblocks/plugin/clickhouse/model/ClickHouseQueryConfig.java b/server/api-service/lowcoder-plugins/clickHousePlugin/src/main/java/org/lowcoder/plugin/clickhouse/model/ClickHouseQueryConfig.java similarity index 78% rename from server/api-service/openblocks-plugins/clickHousePlugin/src/main/java/com/openblocks/plugin/clickhouse/model/ClickHouseQueryConfig.java rename to server/api-service/lowcoder-plugins/clickHousePlugin/src/main/java/org/lowcoder/plugin/clickhouse/model/ClickHouseQueryConfig.java index a664dbf6b..033b76c3c 100644 --- a/server/api-service/openblocks-plugins/clickHousePlugin/src/main/java/com/openblocks/plugin/clickhouse/model/ClickHouseQueryConfig.java +++ b/server/api-service/lowcoder-plugins/clickHousePlugin/src/main/java/org/lowcoder/plugin/clickhouse/model/ClickHouseQueryConfig.java @@ -1,15 +1,15 @@ -package com.openblocks.plugin.clickhouse.model; +package org.lowcoder.plugin.clickhouse.model; -import static com.openblocks.sdk.exception.PluginCommonError.INVALID_QUERY_SETTINGS; -import static com.openblocks.sdk.util.JsonUtils.fromJson; -import static com.openblocks.sdk.util.JsonUtils.toJson; +import static org.lowcoder.sdk.exception.PluginCommonError.INVALID_QUERY_SETTINGS; +import static org.lowcoder.sdk.util.JsonUtils.fromJson; +import static org.lowcoder.sdk.util.JsonUtils.toJson; import java.util.Map; import org.apache.commons.collections4.MapUtils; +import org.lowcoder.sdk.exception.PluginException; import com.fasterxml.jackson.annotation.JsonCreator; -import com.openblocks.sdk.exception.PluginException; import lombok.Getter; diff --git a/server/api-service/openblocks-plugins/clickHousePlugin/src/main/java/com/openblocks/plugin/clickhouse/utils/ClickHouseStructureParser.java b/server/api-service/lowcoder-plugins/clickHousePlugin/src/main/java/org/lowcoder/plugin/clickhouse/utils/ClickHouseStructureParser.java similarity index 89% rename from server/api-service/openblocks-plugins/clickHousePlugin/src/main/java/com/openblocks/plugin/clickhouse/utils/ClickHouseStructureParser.java rename to server/api-service/lowcoder-plugins/clickHousePlugin/src/main/java/org/lowcoder/plugin/clickhouse/utils/ClickHouseStructureParser.java index b6db25a0b..3a86fc501 100644 --- a/server/api-service/openblocks-plugins/clickHousePlugin/src/main/java/com/openblocks/plugin/clickhouse/utils/ClickHouseStructureParser.java +++ b/server/api-service/lowcoder-plugins/clickHousePlugin/src/main/java/org/lowcoder/plugin/clickhouse/utils/ClickHouseStructureParser.java @@ -1,4 +1,4 @@ -package com.openblocks.plugin.clickhouse.utils; +package org.lowcoder.plugin.clickhouse.utils; import java.sql.ResultSet; import java.sql.SQLException; @@ -6,9 +6,9 @@ import java.util.ArrayList; import java.util.Map; -import com.openblocks.sdk.models.DatasourceStructure.Column; -import com.openblocks.sdk.models.DatasourceStructure.Table; -import com.openblocks.sdk.models.DatasourceStructure.TableType; +import org.lowcoder.sdk.models.DatasourceStructure.Column; +import org.lowcoder.sdk.models.DatasourceStructure.Table; +import org.lowcoder.sdk.models.DatasourceStructure.TableType; @SuppressWarnings({"SqlDialectInspection", "SqlNoDataSourceInspection"}) public class ClickHouseStructureParser { diff --git a/server/api-service/lowcoder-plugins/elasticSearchPlugin/plugin.properties b/server/api-service/lowcoder-plugins/elasticSearchPlugin/plugin.properties new file mode 100644 index 000000000..2a5d49dc1 --- /dev/null +++ b/server/api-service/lowcoder-plugins/elasticSearchPlugin/plugin.properties @@ -0,0 +1,5 @@ +plugin.id=es-plugin +plugin.class=org.lowcoder.plugin.es.EsPlugin +plugin.version=1.0-SNAPSHOT +plugin.provider=service@lowcoder.org +plugin.dependencies= diff --git a/server/api-service/openblocks-plugins/elasticSearchPlugin/pom.xml b/server/api-service/lowcoder-plugins/elasticSearchPlugin/pom.xml similarity index 94% rename from server/api-service/openblocks-plugins/elasticSearchPlugin/pom.xml rename to server/api-service/lowcoder-plugins/elasticSearchPlugin/pom.xml index 89c6f2c65..0ab51792f 100644 --- a/server/api-service/openblocks-plugins/elasticSearchPlugin/pom.xml +++ b/server/api-service/lowcoder-plugins/elasticSearchPlugin/pom.xml @@ -3,8 +3,8 @@ - com.openblocks - openblocks-plugins + org.lowcoder + lowcoder-plugins 1.0-SNAPSHOT @@ -20,9 +20,9 @@ ${java.version} ${java.version} es-plugin - com.openblocks.plugin.es.EsPlugin + org.lowcoder.plugin.es.EsPlugin 1.0-SNAPSHOT - dev@openblocks.dev + service@lowcoder.org diff --git a/server/api-service/openblocks-plugins/elasticSearchPlugin/src/main/java/com/openblocks/plugin/es/EsConnector.java b/server/api-service/lowcoder-plugins/elasticSearchPlugin/src/main/java/org/lowcoder/plugin/es/EsConnector.java similarity index 90% rename from server/api-service/openblocks-plugins/elasticSearchPlugin/src/main/java/com/openblocks/plugin/es/EsConnector.java rename to server/api-service/lowcoder-plugins/elasticSearchPlugin/src/main/java/org/lowcoder/plugin/es/EsConnector.java index 8c9b33564..7bc9a5013 100644 --- a/server/api-service/openblocks-plugins/elasticSearchPlugin/src/main/java/com/openblocks/plugin/es/EsConnector.java +++ b/server/api-service/lowcoder-plugins/elasticSearchPlugin/src/main/java/org/lowcoder/plugin/es/EsConnector.java @@ -1,9 +1,9 @@ -package com.openblocks.plugin.es; +package org.lowcoder.plugin.es; -import static com.openblocks.sdk.exception.BizError.DATASOURCE_CLOSE_FAILED; -import static com.openblocks.sdk.exception.PluginCommonError.DATASOURCE_ARGUMENT_ERROR; -import static com.openblocks.sdk.util.ExceptionUtils.ofException; -import static com.openblocks.sdk.util.ExceptionUtils.ofPluginException; +import static org.lowcoder.sdk.exception.BizError.DATASOURCE_CLOSE_FAILED; +import static org.lowcoder.sdk.exception.PluginCommonError.DATASOURCE_ARGUMENT_ERROR; +import static org.lowcoder.sdk.util.ExceptionUtils.ofException; +import static org.lowcoder.sdk.util.ExceptionUtils.ofPluginException; import java.io.IOException; import java.time.Duration; @@ -28,23 +28,23 @@ import org.elasticsearch.client.Response; import org.elasticsearch.client.RestClient; import org.elasticsearch.client.RestClientBuilder; +import org.lowcoder.plugin.es.model.EsConnection; +import org.lowcoder.plugin.es.model.EsDatasourceConfig; +import org.lowcoder.sdk.config.CommonConfig; +import org.lowcoder.sdk.config.dynamic.Conf; +import org.lowcoder.sdk.config.dynamic.ConfigCenter; +import org.lowcoder.sdk.exception.BizError; +import org.lowcoder.sdk.exception.BizException; +import org.lowcoder.sdk.models.DatasourceTestResult; +import org.lowcoder.sdk.plugin.common.DatasourceConnector; +import org.lowcoder.sdk.plugin.common.QueryExecutionUtils; +import org.lowcoder.sdk.util.ExceptionUtils; +import org.lowcoder.sdk.util.JsonUtils; +import org.lowcoder.sdk.util.Preconditions; import org.pf4j.Extension; import org.springframework.http.HttpMethod; import com.google.common.base.Joiner; -import com.openblocks.plugin.es.model.EsConnection; -import com.openblocks.plugin.es.model.EsDatasourceConfig; -import com.openblocks.sdk.config.CommonConfig; -import com.openblocks.sdk.config.dynamic.Conf; -import com.openblocks.sdk.config.dynamic.ConfigCenter; -import com.openblocks.sdk.exception.BizError; -import com.openblocks.sdk.exception.BizException; -import com.openblocks.sdk.models.DatasourceTestResult; -import com.openblocks.sdk.plugin.common.DatasourceConnector; -import com.openblocks.sdk.plugin.common.QueryExecutionUtils; -import com.openblocks.sdk.util.ExceptionUtils; -import com.openblocks.sdk.util.JsonUtils; -import com.openblocks.sdk.util.Preconditions; import lombok.extern.slf4j.Slf4j; import reactor.core.publisher.Mono; diff --git a/server/api-service/lowcoder-plugins/elasticSearchPlugin/src/main/java/org/lowcoder/plugin/es/EsError.java b/server/api-service/lowcoder-plugins/elasticSearchPlugin/src/main/java/org/lowcoder/plugin/es/EsError.java new file mode 100644 index 000000000..d7792fbf7 --- /dev/null +++ b/server/api-service/lowcoder-plugins/elasticSearchPlugin/src/main/java/org/lowcoder/plugin/es/EsError.java @@ -0,0 +1,9 @@ +package org.lowcoder.plugin.es; + +import org.lowcoder.sdk.exception.PluginError; + +public enum EsError implements PluginError { + + ES_EXECUTION_ERROR, + +} diff --git a/server/api-service/openblocks-plugins/elasticSearchPlugin/src/main/java/com/openblocks/plugin/es/EsPlugin.java b/server/api-service/lowcoder-plugins/elasticSearchPlugin/src/main/java/org/lowcoder/plugin/es/EsPlugin.java similarity index 86% rename from server/api-service/openblocks-plugins/elasticSearchPlugin/src/main/java/com/openblocks/plugin/es/EsPlugin.java rename to server/api-service/lowcoder-plugins/elasticSearchPlugin/src/main/java/org/lowcoder/plugin/es/EsPlugin.java index 823b7e28f..19a634020 100644 --- a/server/api-service/openblocks-plugins/elasticSearchPlugin/src/main/java/com/openblocks/plugin/es/EsPlugin.java +++ b/server/api-service/lowcoder-plugins/elasticSearchPlugin/src/main/java/org/lowcoder/plugin/es/EsPlugin.java @@ -1,4 +1,4 @@ -package com.openblocks.plugin.es; +package org.lowcoder.plugin.es; import org.pf4j.Plugin; import org.pf4j.PluginWrapper; diff --git a/server/api-service/openblocks-plugins/elasticSearchPlugin/src/main/java/com/openblocks/plugin/es/EsQueryExecutor.java b/server/api-service/lowcoder-plugins/elasticSearchPlugin/src/main/java/org/lowcoder/plugin/es/EsQueryExecutor.java similarity index 81% rename from server/api-service/openblocks-plugins/elasticSearchPlugin/src/main/java/com/openblocks/plugin/es/EsQueryExecutor.java rename to server/api-service/lowcoder-plugins/elasticSearchPlugin/src/main/java/org/lowcoder/plugin/es/EsQueryExecutor.java index 2427bee91..a27ec6ebf 100644 --- a/server/api-service/openblocks-plugins/elasticSearchPlugin/src/main/java/com/openblocks/plugin/es/EsQueryExecutor.java +++ b/server/api-service/lowcoder-plugins/elasticSearchPlugin/src/main/java/org/lowcoder/plugin/es/EsQueryExecutor.java @@ -1,8 +1,8 @@ -package com.openblocks.plugin.es; +package org.lowcoder.plugin.es; -import static com.openblocks.plugin.es.EsError.ES_EXECUTION_ERROR; -import static com.openblocks.sdk.exception.PluginCommonError.QUERY_ARGUMENT_ERROR; -import static com.openblocks.sdk.exception.PluginCommonError.QUERY_EXECUTION_ERROR; +import static org.lowcoder.plugin.es.EsError.ES_EXECUTION_ERROR; +import static org.lowcoder.sdk.exception.PluginCommonError.QUERY_ARGUMENT_ERROR; +import static org.lowcoder.sdk.exception.PluginCommonError.QUERY_EXECUTION_ERROR; import java.io.IOException; import java.util.List; @@ -14,19 +14,19 @@ import org.apache.commons.lang3.StringUtils; import org.apache.http.util.EntityUtils; import org.elasticsearch.client.Request; +import org.lowcoder.plugin.es.model.EsConnection; +import org.lowcoder.plugin.es.model.EsDatasourceConfig; +import org.lowcoder.plugin.es.model.EsQueryConfig; +import org.lowcoder.plugin.es.model.EsQueryExecutionContext; +import org.lowcoder.sdk.models.QueryExecutionResult; +import org.lowcoder.sdk.plugin.common.QueryExecutor; +import org.lowcoder.sdk.query.QueryVisitorContext; +import org.lowcoder.sdk.util.JsonUtils; +import org.lowcoder.sdk.util.MustacheHelper; +import org.lowcoder.sdk.util.Preconditions; import org.pf4j.Extension; import com.google.common.base.Joiner; -import com.openblocks.plugin.es.model.EsConnection; -import com.openblocks.plugin.es.model.EsDatasourceConfig; -import com.openblocks.plugin.es.model.EsQueryConfig; -import com.openblocks.plugin.es.model.EsQueryExecutionContext; -import com.openblocks.sdk.models.QueryExecutionResult; -import com.openblocks.sdk.plugin.common.QueryExecutor; -import com.openblocks.sdk.query.QueryVisitorContext; -import com.openblocks.sdk.util.JsonUtils; -import com.openblocks.sdk.util.MustacheHelper; -import com.openblocks.sdk.util.Preconditions; import reactor.core.publisher.Mono; diff --git a/server/api-service/openblocks-plugins/elasticSearchPlugin/src/main/java/com/openblocks/plugin/es/ReactorRestClientAdaptor.java b/server/api-service/lowcoder-plugins/elasticSearchPlugin/src/main/java/org/lowcoder/plugin/es/ReactorRestClientAdaptor.java similarity index 97% rename from server/api-service/openblocks-plugins/elasticSearchPlugin/src/main/java/com/openblocks/plugin/es/ReactorRestClientAdaptor.java rename to server/api-service/lowcoder-plugins/elasticSearchPlugin/src/main/java/org/lowcoder/plugin/es/ReactorRestClientAdaptor.java index c3dfebe13..f8fb278d1 100644 --- a/server/api-service/openblocks-plugins/elasticSearchPlugin/src/main/java/com/openblocks/plugin/es/ReactorRestClientAdaptor.java +++ b/server/api-service/lowcoder-plugins/elasticSearchPlugin/src/main/java/org/lowcoder/plugin/es/ReactorRestClientAdaptor.java @@ -1,4 +1,4 @@ -package com.openblocks.plugin.es; +package org.lowcoder.plugin.es; import java.io.Closeable; import java.io.IOException; diff --git a/server/api-service/openblocks-plugins/elasticSearchPlugin/src/main/java/com/openblocks/plugin/es/model/EsConnection.java b/server/api-service/lowcoder-plugins/elasticSearchPlugin/src/main/java/org/lowcoder/plugin/es/model/EsConnection.java similarity index 86% rename from server/api-service/openblocks-plugins/elasticSearchPlugin/src/main/java/com/openblocks/plugin/es/model/EsConnection.java rename to server/api-service/lowcoder-plugins/elasticSearchPlugin/src/main/java/org/lowcoder/plugin/es/model/EsConnection.java index c85d6dbab..713925ae5 100644 --- a/server/api-service/openblocks-plugins/elasticSearchPlugin/src/main/java/com/openblocks/plugin/es/model/EsConnection.java +++ b/server/api-service/lowcoder-plugins/elasticSearchPlugin/src/main/java/org/lowcoder/plugin/es/model/EsConnection.java @@ -1,12 +1,13 @@ -package com.openblocks.plugin.es.model; +package org.lowcoder.plugin.es.model; import java.io.Closeable; import java.io.IOException; import javax.validation.constraints.NotNull; +import org.lowcoder.plugin.es.ReactorRestClientAdaptor; + import com.google.common.base.Preconditions; -import com.openblocks.plugin.es.ReactorRestClientAdaptor; public record EsConnection(@NotNull ReactorRestClientAdaptor reactorRestClientAdaptor) implements Closeable { diff --git a/server/api-service/openblocks-plugins/elasticSearchPlugin/src/main/java/com/openblocks/plugin/es/model/EsDatasourceConfig.java b/server/api-service/lowcoder-plugins/elasticSearchPlugin/src/main/java/org/lowcoder/plugin/es/model/EsDatasourceConfig.java similarity index 85% rename from server/api-service/openblocks-plugins/elasticSearchPlugin/src/main/java/com/openblocks/plugin/es/model/EsDatasourceConfig.java rename to server/api-service/lowcoder-plugins/elasticSearchPlugin/src/main/java/org/lowcoder/plugin/es/model/EsDatasourceConfig.java index 090eaea2f..8c45f5f10 100644 --- a/server/api-service/openblocks-plugins/elasticSearchPlugin/src/main/java/com/openblocks/plugin/es/model/EsDatasourceConfig.java +++ b/server/api-service/lowcoder-plugins/elasticSearchPlugin/src/main/java/org/lowcoder/plugin/es/model/EsDatasourceConfig.java @@ -1,15 +1,15 @@ -package com.openblocks.plugin.es.model; +package org.lowcoder.plugin.es.model; -import static com.openblocks.sdk.exception.BizError.INVALID_DATASOURCE_CONFIG_TYPE; -import static com.openblocks.sdk.util.ExceptionUtils.ofException; +import static org.lowcoder.sdk.exception.BizError.INVALID_DATASOURCE_CONFIG_TYPE; +import static org.lowcoder.sdk.util.ExceptionUtils.ofException; import java.util.function.Function; import org.apache.commons.lang3.ObjectUtils; +import org.lowcoder.sdk.config.SerializeConfig.JsonViews; +import org.lowcoder.sdk.models.DatasourceConnectionConfig; import com.fasterxml.jackson.annotation.JsonView; -import com.openblocks.sdk.config.SerializeConfig.JsonViews; -import com.openblocks.sdk.models.DatasourceConnectionConfig; import lombok.Builder; import lombok.Getter; diff --git a/server/api-service/openblocks-plugins/elasticSearchPlugin/src/main/java/com/openblocks/plugin/es/model/EsQueryConfig.java b/server/api-service/lowcoder-plugins/elasticSearchPlugin/src/main/java/org/lowcoder/plugin/es/model/EsQueryConfig.java similarity index 96% rename from server/api-service/openblocks-plugins/elasticSearchPlugin/src/main/java/com/openblocks/plugin/es/model/EsQueryConfig.java rename to server/api-service/lowcoder-plugins/elasticSearchPlugin/src/main/java/org/lowcoder/plugin/es/model/EsQueryConfig.java index de1411320..054e598b9 100644 --- a/server/api-service/openblocks-plugins/elasticSearchPlugin/src/main/java/com/openblocks/plugin/es/model/EsQueryConfig.java +++ b/server/api-service/lowcoder-plugins/elasticSearchPlugin/src/main/java/org/lowcoder/plugin/es/model/EsQueryConfig.java @@ -1,4 +1,4 @@ -package com.openblocks.plugin.es.model; +package org.lowcoder.plugin.es.model; import org.springframework.http.HttpMethod; diff --git a/server/api-service/openblocks-plugins/elasticSearchPlugin/src/main/java/com/openblocks/plugin/es/model/EsQueryExecutionContext.java b/server/api-service/lowcoder-plugins/elasticSearchPlugin/src/main/java/org/lowcoder/plugin/es/model/EsQueryExecutionContext.java similarity index 87% rename from server/api-service/openblocks-plugins/elasticSearchPlugin/src/main/java/com/openblocks/plugin/es/model/EsQueryExecutionContext.java rename to server/api-service/lowcoder-plugins/elasticSearchPlugin/src/main/java/org/lowcoder/plugin/es/model/EsQueryExecutionContext.java index 714e45fc3..3cb00adf2 100644 --- a/server/api-service/openblocks-plugins/elasticSearchPlugin/src/main/java/com/openblocks/plugin/es/model/EsQueryExecutionContext.java +++ b/server/api-service/lowcoder-plugins/elasticSearchPlugin/src/main/java/org/lowcoder/plugin/es/model/EsQueryExecutionContext.java @@ -1,9 +1,8 @@ -package com.openblocks.plugin.es.model; +package org.lowcoder.plugin.es.model; +import org.lowcoder.sdk.query.QueryExecutionContext; import org.springframework.http.HttpMethod; -import com.openblocks.sdk.query.QueryExecutionContext; - import lombok.Builder; @Builder diff --git a/server/api-service/lowcoder-plugins/googleSheetsPlugin/plugin.properties b/server/api-service/lowcoder-plugins/googleSheetsPlugin/plugin.properties new file mode 100644 index 000000000..95f53fb9f --- /dev/null +++ b/server/api-service/lowcoder-plugins/googleSheetsPlugin/plugin.properties @@ -0,0 +1,5 @@ +plugin.id=googleSheets-plugin +plugin.class=org.lowcoder.plugin.googlesheets.GoogleSheetsPlugin +plugin.version=1.0-SNAPSHOT +plugin.provider=service@lowcoder.org +plugin.dependencies= \ No newline at end of file diff --git a/server/api-service/openblocks-plugins/googleSheetsPlugin/pom.xml b/server/api-service/lowcoder-plugins/googleSheetsPlugin/pom.xml similarity index 94% rename from server/api-service/openblocks-plugins/googleSheetsPlugin/pom.xml rename to server/api-service/lowcoder-plugins/googleSheetsPlugin/pom.xml index b631fb89c..4e556b308 100644 --- a/server/api-service/openblocks-plugins/googleSheetsPlugin/pom.xml +++ b/server/api-service/lowcoder-plugins/googleSheetsPlugin/pom.xml @@ -3,8 +3,8 @@ xmlns="http://maven.apache.org/POM/4.0.0" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - openblocks-plugins - com.openblocks + lowcoder-plugins + org.lowcoder 1.0-SNAPSHOT @@ -20,9 +20,9 @@ ${java.version} ${java.version} googleSheets-plugin - com.openblocks.plugin.googlesheets.GoogleSheetsPlugin + org.lowcoder.plugin.googlesheets.GoogleSheetsPlugin 1.0-SNAPSHOT - dev@openblocks.dev + service@lowcoder.org @@ -123,4 +123,4 @@ - \ No newline at end of file + diff --git a/server/api-service/openblocks-plugins/googleSheetsPlugin/src/main/java/com/openblocks/plugin/googlesheets/GoogleSheetError.java b/server/api-service/lowcoder-plugins/googleSheetsPlugin/src/main/java/org/lowcoder/plugin/googlesheets/GoogleSheetError.java similarity index 63% rename from server/api-service/openblocks-plugins/googleSheetsPlugin/src/main/java/com/openblocks/plugin/googlesheets/GoogleSheetError.java rename to server/api-service/lowcoder-plugins/googleSheetsPlugin/src/main/java/org/lowcoder/plugin/googlesheets/GoogleSheetError.java index 06663efd0..ef6da0890 100644 --- a/server/api-service/openblocks-plugins/googleSheetsPlugin/src/main/java/com/openblocks/plugin/googlesheets/GoogleSheetError.java +++ b/server/api-service/lowcoder-plugins/googleSheetsPlugin/src/main/java/org/lowcoder/plugin/googlesheets/GoogleSheetError.java @@ -1,6 +1,6 @@ -package com.openblocks.plugin.googlesheets; +package org.lowcoder.plugin.googlesheets; -import com.openblocks.sdk.exception.PluginError; +import org.lowcoder.sdk.exception.PluginError; public enum GoogleSheetError implements PluginError { diff --git a/server/api-service/openblocks-plugins/googleSheetsPlugin/src/main/java/com/openblocks/plugin/googlesheets/GoogleSheetsPlugin.java b/server/api-service/lowcoder-plugins/googleSheetsPlugin/src/main/java/org/lowcoder/plugin/googlesheets/GoogleSheetsPlugin.java similarity index 74% rename from server/api-service/openblocks-plugins/googleSheetsPlugin/src/main/java/com/openblocks/plugin/googlesheets/GoogleSheetsPlugin.java rename to server/api-service/lowcoder-plugins/googleSheetsPlugin/src/main/java/org/lowcoder/plugin/googlesheets/GoogleSheetsPlugin.java index d1932c711..bcb2df7ea 100644 --- a/server/api-service/openblocks-plugins/googleSheetsPlugin/src/main/java/com/openblocks/plugin/googlesheets/GoogleSheetsPlugin.java +++ b/server/api-service/lowcoder-plugins/googleSheetsPlugin/src/main/java/org/lowcoder/plugin/googlesheets/GoogleSheetsPlugin.java @@ -1,15 +1,15 @@ -package com.openblocks.plugin.googlesheets; +package org.lowcoder.plugin.googlesheets; -import static com.openblocks.plugin.googlesheets.GoogleSheetError.GOOGLESHEETS_EMPTY_QUERY_PARAM; -import static com.openblocks.plugin.googlesheets.GoogleSheetError.GOOGLESHEETS_REQUEST_ERROR; -import static com.openblocks.plugin.googlesheets.queryhandler.GoogleSheetsActionHandler.APPEND_DATA; -import static com.openblocks.plugin.googlesheets.queryhandler.GoogleSheetsActionHandler.CLEAR_DATA; -import static com.openblocks.plugin.googlesheets.queryhandler.GoogleSheetsActionHandler.DELETE_DATA; -import static com.openblocks.plugin.googlesheets.queryhandler.GoogleSheetsActionHandler.READ_DATA; -import static com.openblocks.plugin.googlesheets.queryhandler.GoogleSheetsActionHandler.UPDATE_DATA; -import static com.openblocks.sdk.util.JsonUtils.fromJson; -import static com.openblocks.sdk.util.JsonUtils.toJson; +import static org.lowcoder.plugin.googlesheets.GoogleSheetError.GOOGLESHEETS_EMPTY_QUERY_PARAM; +import static org.lowcoder.plugin.googlesheets.GoogleSheetError.GOOGLESHEETS_REQUEST_ERROR; +import static org.lowcoder.plugin.googlesheets.queryhandler.GoogleSheetsActionHandler.APPEND_DATA; +import static org.lowcoder.plugin.googlesheets.queryhandler.GoogleSheetsActionHandler.CLEAR_DATA; +import static org.lowcoder.plugin.googlesheets.queryhandler.GoogleSheetsActionHandler.DELETE_DATA; +import static org.lowcoder.plugin.googlesheets.queryhandler.GoogleSheetsActionHandler.READ_DATA; +import static org.lowcoder.plugin.googlesheets.queryhandler.GoogleSheetsActionHandler.UPDATE_DATA; +import static org.lowcoder.sdk.util.JsonUtils.fromJson; +import static org.lowcoder.sdk.util.JsonUtils.toJson; import java.io.IOException; import java.util.HashSet; @@ -20,29 +20,29 @@ import org.apache.commons.collections4.MapUtils; import org.apache.commons.lang3.StringUtils; +import org.lowcoder.plugin.googlesheets.model.GoogleSheetsActionRequest; +import org.lowcoder.plugin.googlesheets.model.GoogleSheetsAppendDataRequest; +import org.lowcoder.plugin.googlesheets.model.GoogleSheetsClearDataRequst; +import org.lowcoder.plugin.googlesheets.model.GoogleSheetsDatasourceConfig; +import org.lowcoder.plugin.googlesheets.model.GoogleSheetsDeleteDataRequest; +import org.lowcoder.plugin.googlesheets.model.GoogleSheetsQueryExecutionContext; +import org.lowcoder.plugin.googlesheets.model.GoogleSheetsReadDataRequest; +import org.lowcoder.plugin.googlesheets.model.GoogleSheetsUpdateDataRequest; +import org.lowcoder.plugin.googlesheets.model.ServiceAccountJsonUtils; +import org.lowcoder.plugin.googlesheets.queryhandler.GoogleSheetsActionHandler; +import org.lowcoder.plugin.googlesheets.queryhandler.GoogleSheetsActionHandlerFactory; +import org.lowcoder.sdk.exception.PluginException; +import org.lowcoder.sdk.models.DatasourceTestResult; +import org.lowcoder.sdk.models.QueryExecutionResult; +import org.lowcoder.sdk.plugin.common.DatasourceQueryEngine; +import org.lowcoder.sdk.plugin.common.QueryExecutionUtils; +import org.lowcoder.sdk.query.QueryVisitorContext; import org.pf4j.Extension; import org.pf4j.Plugin; import org.pf4j.PluginWrapper; import com.google.api.services.sheets.v4.SheetsScopes; import com.google.auth.oauth2.ServiceAccountCredentials; -import com.openblocks.plugin.googlesheets.model.GoogleSheetsActionRequest; -import com.openblocks.plugin.googlesheets.model.GoogleSheetsAppendDataRequest; -import com.openblocks.plugin.googlesheets.model.GoogleSheetsClearDataRequst; -import com.openblocks.plugin.googlesheets.model.GoogleSheetsDatasourceConfig; -import com.openblocks.plugin.googlesheets.model.GoogleSheetsDeleteDataRequest; -import com.openblocks.plugin.googlesheets.model.GoogleSheetsQueryExecutionContext; -import com.openblocks.plugin.googlesheets.model.GoogleSheetsReadDataRequest; -import com.openblocks.plugin.googlesheets.model.GoogleSheetsUpdateDataRequest; -import com.openblocks.plugin.googlesheets.model.ServiceAccountJsonUtils; -import com.openblocks.plugin.googlesheets.queryhandler.GoogleSheetsActionHandler; -import com.openblocks.plugin.googlesheets.queryhandler.GoogleSheetsActionHandlerFactory; -import com.openblocks.sdk.exception.PluginException; -import com.openblocks.sdk.models.DatasourceTestResult; -import com.openblocks.sdk.models.QueryExecutionResult; -import com.openblocks.sdk.plugin.common.DatasourceQueryEngine; -import com.openblocks.sdk.plugin.common.QueryExecutionUtils; -import com.openblocks.sdk.query.QueryVisitorContext; import lombok.extern.slf4j.Slf4j; import reactor.core.publisher.Mono; diff --git a/server/api-service/openblocks-plugins/googleSheetsPlugin/src/main/java/com/openblocks/plugin/googlesheets/constants/FieldName.java b/server/api-service/lowcoder-plugins/googleSheetsPlugin/src/main/java/org/lowcoder/plugin/googlesheets/constants/FieldName.java similarity index 60% rename from server/api-service/openblocks-plugins/googleSheetsPlugin/src/main/java/com/openblocks/plugin/googlesheets/constants/FieldName.java rename to server/api-service/lowcoder-plugins/googleSheetsPlugin/src/main/java/org/lowcoder/plugin/googlesheets/constants/FieldName.java index 352748175..f4e17a0e5 100644 --- a/server/api-service/openblocks-plugins/googleSheetsPlugin/src/main/java/com/openblocks/plugin/googlesheets/constants/FieldName.java +++ b/server/api-service/lowcoder-plugins/googleSheetsPlugin/src/main/java/org/lowcoder/plugin/googlesheets/constants/FieldName.java @@ -1,4 +1,4 @@ -package com.openblocks.plugin.googlesheets.constants; +package org.lowcoder.plugin.googlesheets.constants; public class FieldName { public static final String ROW_INDEX = "rowIndex"; diff --git a/server/api-service/openblocks-plugins/googleSheetsPlugin/src/main/java/com/openblocks/plugin/googlesheets/model/GoogleSheetsActionRequest.java b/server/api-service/lowcoder-plugins/googleSheetsPlugin/src/main/java/org/lowcoder/plugin/googlesheets/model/GoogleSheetsActionRequest.java similarity index 75% rename from server/api-service/openblocks-plugins/googleSheetsPlugin/src/main/java/com/openblocks/plugin/googlesheets/model/GoogleSheetsActionRequest.java rename to server/api-service/lowcoder-plugins/googleSheetsPlugin/src/main/java/org/lowcoder/plugin/googlesheets/model/GoogleSheetsActionRequest.java index a015ef2ab..053907fe6 100644 --- a/server/api-service/openblocks-plugins/googleSheetsPlugin/src/main/java/com/openblocks/plugin/googlesheets/model/GoogleSheetsActionRequest.java +++ b/server/api-service/lowcoder-plugins/googleSheetsPlugin/src/main/java/org/lowcoder/plugin/googlesheets/model/GoogleSheetsActionRequest.java @@ -1,4 +1,4 @@ -package com.openblocks.plugin.googlesheets.model; +package org.lowcoder.plugin.googlesheets.model; import java.util.Map; diff --git a/server/api-service/openblocks-plugins/googleSheetsPlugin/src/main/java/com/openblocks/plugin/googlesheets/model/GoogleSheetsAppendDataRequest.java b/server/api-service/lowcoder-plugins/googleSheetsPlugin/src/main/java/org/lowcoder/plugin/googlesheets/model/GoogleSheetsAppendDataRequest.java similarity index 85% rename from server/api-service/openblocks-plugins/googleSheetsPlugin/src/main/java/com/openblocks/plugin/googlesheets/model/GoogleSheetsAppendDataRequest.java rename to server/api-service/lowcoder-plugins/googleSheetsPlugin/src/main/java/org/lowcoder/plugin/googlesheets/model/GoogleSheetsAppendDataRequest.java index 622f2712f..678a403d0 100644 --- a/server/api-service/openblocks-plugins/googleSheetsPlugin/src/main/java/com/openblocks/plugin/googlesheets/model/GoogleSheetsAppendDataRequest.java +++ b/server/api-service/lowcoder-plugins/googleSheetsPlugin/src/main/java/org/lowcoder/plugin/googlesheets/model/GoogleSheetsAppendDataRequest.java @@ -1,14 +1,13 @@ -package com.openblocks.plugin.googlesheets.model; +package org.lowcoder.plugin.googlesheets.model; -import static com.openblocks.sdk.util.MustacheHelper.renderMustacheString; +import static org.lowcoder.sdk.util.MustacheHelper.renderMustacheString; import java.util.Map; import org.apache.commons.collections4.MapUtils; import org.apache.commons.lang3.StringUtils; - -import com.openblocks.sdk.plugin.sheet.changeset.SheetChangeSet; -import com.openblocks.sdk.plugin.sheet.changeset.SheetChangeSetRow; +import org.lowcoder.sdk.plugin.sheet.changeset.SheetChangeSet; +import org.lowcoder.sdk.plugin.sheet.changeset.SheetChangeSetRow; import lombok.Getter; import lombok.Setter; diff --git a/server/api-service/openblocks-plugins/googleSheetsPlugin/src/main/java/com/openblocks/plugin/googlesheets/model/GoogleSheetsClearDataRequst.java b/server/api-service/lowcoder-plugins/googleSheetsPlugin/src/main/java/org/lowcoder/plugin/googlesheets/model/GoogleSheetsClearDataRequst.java similarity index 78% rename from server/api-service/openblocks-plugins/googleSheetsPlugin/src/main/java/com/openblocks/plugin/googlesheets/model/GoogleSheetsClearDataRequst.java rename to server/api-service/lowcoder-plugins/googleSheetsPlugin/src/main/java/org/lowcoder/plugin/googlesheets/model/GoogleSheetsClearDataRequst.java index 9ebb0de6d..9b227383d 100644 --- a/server/api-service/openblocks-plugins/googleSheetsPlugin/src/main/java/com/openblocks/plugin/googlesheets/model/GoogleSheetsClearDataRequst.java +++ b/server/api-service/lowcoder-plugins/googleSheetsPlugin/src/main/java/org/lowcoder/plugin/googlesheets/model/GoogleSheetsClearDataRequst.java @@ -1,13 +1,12 @@ -package com.openblocks.plugin.googlesheets.model; +package org.lowcoder.plugin.googlesheets.model; -import static com.openblocks.sdk.exception.PluginCommonError.DATASOURCE_ARGUMENT_ERROR; -import static com.openblocks.sdk.util.MustacheHelper.renderMustacheString; +import static org.lowcoder.sdk.exception.PluginCommonError.DATASOURCE_ARGUMENT_ERROR; +import static org.lowcoder.sdk.util.MustacheHelper.renderMustacheString; import java.util.Map; import org.apache.commons.lang3.StringUtils; - -import com.openblocks.sdk.exception.PluginException; +import org.lowcoder.sdk.exception.PluginException; import lombok.Getter; import lombok.Setter; diff --git a/server/api-service/openblocks-plugins/googleSheetsPlugin/src/main/java/com/openblocks/plugin/googlesheets/model/GoogleSheetsDatasourceConfig.java b/server/api-service/lowcoder-plugins/googleSheetsPlugin/src/main/java/org/lowcoder/plugin/googlesheets/model/GoogleSheetsDatasourceConfig.java similarity index 84% rename from server/api-service/openblocks-plugins/googleSheetsPlugin/src/main/java/com/openblocks/plugin/googlesheets/model/GoogleSheetsDatasourceConfig.java rename to server/api-service/lowcoder-plugins/googleSheetsPlugin/src/main/java/org/lowcoder/plugin/googlesheets/model/GoogleSheetsDatasourceConfig.java index d99c9e909..84642061b 100644 --- a/server/api-service/openblocks-plugins/googleSheetsPlugin/src/main/java/com/openblocks/plugin/googlesheets/model/GoogleSheetsDatasourceConfig.java +++ b/server/api-service/lowcoder-plugins/googleSheetsPlugin/src/main/java/org/lowcoder/plugin/googlesheets/model/GoogleSheetsDatasourceConfig.java @@ -1,18 +1,19 @@ -package com.openblocks.plugin.googlesheets.model; +package org.lowcoder.plugin.googlesheets.model; -import static com.openblocks.sdk.util.ExceptionUtils.ofPluginException; -import static com.openblocks.sdk.util.JsonUtils.fromJson; -import static com.openblocks.sdk.util.JsonUtils.toJson; +import static org.lowcoder.sdk.util.ExceptionUtils.ofPluginException; +import static org.lowcoder.sdk.util.JsonUtils.fromJson; +import static org.lowcoder.sdk.util.JsonUtils.toJson; import java.util.Map; import java.util.function.Function; +import org.lowcoder.sdk.config.SerializeConfig.JsonViews; +import org.lowcoder.sdk.exception.PluginCommonError; +import org.lowcoder.sdk.models.DatasourceConnectionConfig; + import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonView; import com.google.common.base.MoreObjects; -import com.openblocks.sdk.config.SerializeConfig.JsonViews; -import com.openblocks.sdk.exception.PluginCommonError; -import com.openblocks.sdk.models.DatasourceConnectionConfig; import lombok.Builder; import lombok.Getter; diff --git a/server/api-service/openblocks-plugins/googleSheetsPlugin/src/main/java/com/openblocks/plugin/googlesheets/model/GoogleSheetsDeleteDataRequest.java b/server/api-service/lowcoder-plugins/googleSheetsPlugin/src/main/java/org/lowcoder/plugin/googlesheets/model/GoogleSheetsDeleteDataRequest.java similarity index 78% rename from server/api-service/openblocks-plugins/googleSheetsPlugin/src/main/java/com/openblocks/plugin/googlesheets/model/GoogleSheetsDeleteDataRequest.java rename to server/api-service/lowcoder-plugins/googleSheetsPlugin/src/main/java/org/lowcoder/plugin/googlesheets/model/GoogleSheetsDeleteDataRequest.java index 3856b659a..296884aeb 100644 --- a/server/api-service/openblocks-plugins/googleSheetsPlugin/src/main/java/com/openblocks/plugin/googlesheets/model/GoogleSheetsDeleteDataRequest.java +++ b/server/api-service/lowcoder-plugins/googleSheetsPlugin/src/main/java/org/lowcoder/plugin/googlesheets/model/GoogleSheetsDeleteDataRequest.java @@ -1,14 +1,13 @@ -package com.openblocks.plugin.googlesheets.model; +package org.lowcoder.plugin.googlesheets.model; -import static com.openblocks.sdk.exception.PluginCommonError.DATASOURCE_ARGUMENT_ERROR; -import static com.openblocks.sdk.util.MustacheHelper.renderMustacheString; +import static org.lowcoder.sdk.exception.PluginCommonError.DATASOURCE_ARGUMENT_ERROR; +import static org.lowcoder.sdk.util.MustacheHelper.renderMustacheString; import java.util.Map; import org.apache.commons.lang3.StringUtils; - -import com.openblocks.sdk.exception.PluginException; +import org.lowcoder.sdk.exception.PluginException; import lombok.Getter; import lombok.Setter; diff --git a/server/api-service/openblocks-plugins/googleSheetsPlugin/src/main/java/com/openblocks/plugin/googlesheets/model/GoogleSheetsQueryExecutionContext.java b/server/api-service/lowcoder-plugins/googleSheetsPlugin/src/main/java/org/lowcoder/plugin/googlesheets/model/GoogleSheetsQueryExecutionContext.java similarity index 88% rename from server/api-service/openblocks-plugins/googleSheetsPlugin/src/main/java/com/openblocks/plugin/googlesheets/model/GoogleSheetsQueryExecutionContext.java rename to server/api-service/lowcoder-plugins/googleSheetsPlugin/src/main/java/org/lowcoder/plugin/googlesheets/model/GoogleSheetsQueryExecutionContext.java index 0b2cce725..1021a3c7e 100644 --- a/server/api-service/openblocks-plugins/googleSheetsPlugin/src/main/java/com/openblocks/plugin/googlesheets/model/GoogleSheetsQueryExecutionContext.java +++ b/server/api-service/lowcoder-plugins/googleSheetsPlugin/src/main/java/org/lowcoder/plugin/googlesheets/model/GoogleSheetsQueryExecutionContext.java @@ -1,7 +1,8 @@ -package com.openblocks.plugin.googlesheets.model; +package org.lowcoder.plugin.googlesheets.model; + +import org.lowcoder.sdk.query.QueryExecutionContext; import com.google.auth.oauth2.ServiceAccountCredentials; -import com.openblocks.sdk.query.QueryExecutionContext; import lombok.Getter; import lombok.Setter; diff --git a/server/api-service/openblocks-plugins/googleSheetsPlugin/src/main/java/com/openblocks/plugin/googlesheets/model/GoogleSheetsReadDataRequest.java b/server/api-service/lowcoder-plugins/googleSheetsPlugin/src/main/java/org/lowcoder/plugin/googlesheets/model/GoogleSheetsReadDataRequest.java similarity index 85% rename from server/api-service/openblocks-plugins/googleSheetsPlugin/src/main/java/com/openblocks/plugin/googlesheets/model/GoogleSheetsReadDataRequest.java rename to server/api-service/lowcoder-plugins/googleSheetsPlugin/src/main/java/org/lowcoder/plugin/googlesheets/model/GoogleSheetsReadDataRequest.java index 5396ca68d..c126a672a 100644 --- a/server/api-service/openblocks-plugins/googleSheetsPlugin/src/main/java/com/openblocks/plugin/googlesheets/model/GoogleSheetsReadDataRequest.java +++ b/server/api-service/lowcoder-plugins/googleSheetsPlugin/src/main/java/org/lowcoder/plugin/googlesheets/model/GoogleSheetsReadDataRequest.java @@ -1,6 +1,6 @@ -package com.openblocks.plugin.googlesheets.model; +package org.lowcoder.plugin.googlesheets.model; -import static com.openblocks.sdk.util.MustacheHelper.renderMustacheString; +import static org.lowcoder.sdk.util.MustacheHelper.renderMustacheString; import java.util.Map; diff --git a/server/api-service/openblocks-plugins/googleSheetsPlugin/src/main/java/com/openblocks/plugin/googlesheets/model/GoogleSheetsUpdateDataRequest.java b/server/api-service/lowcoder-plugins/googleSheetsPlugin/src/main/java/org/lowcoder/plugin/googlesheets/model/GoogleSheetsUpdateDataRequest.java similarity index 83% rename from server/api-service/openblocks-plugins/googleSheetsPlugin/src/main/java/com/openblocks/plugin/googlesheets/model/GoogleSheetsUpdateDataRequest.java rename to server/api-service/lowcoder-plugins/googleSheetsPlugin/src/main/java/org/lowcoder/plugin/googlesheets/model/GoogleSheetsUpdateDataRequest.java index c4de2980c..3b8796e25 100644 --- a/server/api-service/openblocks-plugins/googleSheetsPlugin/src/main/java/com/openblocks/plugin/googlesheets/model/GoogleSheetsUpdateDataRequest.java +++ b/server/api-service/lowcoder-plugins/googleSheetsPlugin/src/main/java/org/lowcoder/plugin/googlesheets/model/GoogleSheetsUpdateDataRequest.java @@ -1,17 +1,16 @@ -package com.openblocks.plugin.googlesheets.model; +package org.lowcoder.plugin.googlesheets.model; -import static com.openblocks.sdk.exception.PluginCommonError.DATASOURCE_ARGUMENT_ERROR; -import static com.openblocks.sdk.util.MustacheHelper.renderMustacheString; +import static org.lowcoder.sdk.exception.PluginCommonError.DATASOURCE_ARGUMENT_ERROR; +import static org.lowcoder.sdk.util.MustacheHelper.renderMustacheString; import java.util.Map; import org.apache.commons.collections4.MapUtils; import org.apache.commons.lang3.StringUtils; - -import com.openblocks.sdk.exception.PluginException; -import com.openblocks.sdk.plugin.sheet.changeset.SheetChangeSet; -import com.openblocks.sdk.plugin.sheet.changeset.SheetChangeSetRow; +import org.lowcoder.sdk.exception.PluginException; +import org.lowcoder.sdk.plugin.sheet.changeset.SheetChangeSet; +import org.lowcoder.sdk.plugin.sheet.changeset.SheetChangeSetRow; import lombok.Getter; import lombok.Setter; diff --git a/server/api-service/openblocks-plugins/googleSheetsPlugin/src/main/java/com/openblocks/plugin/googlesheets/model/ServiceAccountJsonUtils.java b/server/api-service/lowcoder-plugins/googleSheetsPlugin/src/main/java/org/lowcoder/plugin/googlesheets/model/ServiceAccountJsonUtils.java similarity index 91% rename from server/api-service/openblocks-plugins/googleSheetsPlugin/src/main/java/com/openblocks/plugin/googlesheets/model/ServiceAccountJsonUtils.java rename to server/api-service/lowcoder-plugins/googleSheetsPlugin/src/main/java/org/lowcoder/plugin/googlesheets/model/ServiceAccountJsonUtils.java index 78c649b9b..d47c0bc52 100644 --- a/server/api-service/openblocks-plugins/googleSheetsPlugin/src/main/java/com/openblocks/plugin/googlesheets/model/ServiceAccountJsonUtils.java +++ b/server/api-service/lowcoder-plugins/googleSheetsPlugin/src/main/java/org/lowcoder/plugin/googlesheets/model/ServiceAccountJsonUtils.java @@ -1,8 +1,8 @@ -package com.openblocks.plugin.googlesheets.model; +package org.lowcoder.plugin.googlesheets.model; import java.util.Map; -import com.openblocks.sdk.util.JsonUtils; +import org.lowcoder.sdk.util.JsonUtils; import lombok.Getter; import lombok.Setter; diff --git a/server/api-service/openblocks-plugins/googleSheetsPlugin/src/main/java/com/openblocks/plugin/googlesheets/queryhandler/GoogleSheetsActionHandler.java b/server/api-service/lowcoder-plugins/googleSheetsPlugin/src/main/java/org/lowcoder/plugin/googlesheets/queryhandler/GoogleSheetsActionHandler.java similarity index 73% rename from server/api-service/openblocks-plugins/googleSheetsPlugin/src/main/java/com/openblocks/plugin/googlesheets/queryhandler/GoogleSheetsActionHandler.java rename to server/api-service/lowcoder-plugins/googleSheetsPlugin/src/main/java/org/lowcoder/plugin/googlesheets/queryhandler/GoogleSheetsActionHandler.java index 660d9963f..354d262e7 100644 --- a/server/api-service/openblocks-plugins/googleSheetsPlugin/src/main/java/com/openblocks/plugin/googlesheets/queryhandler/GoogleSheetsActionHandler.java +++ b/server/api-service/lowcoder-plugins/googleSheetsPlugin/src/main/java/org/lowcoder/plugin/googlesheets/queryhandler/GoogleSheetsActionHandler.java @@ -1,7 +1,7 @@ -package com.openblocks.plugin.googlesheets.queryhandler; +package org.lowcoder.plugin.googlesheets.queryhandler; -import com.openblocks.plugin.googlesheets.model.GoogleSheetsQueryExecutionContext; -import com.openblocks.sdk.models.QueryExecutionResult; +import org.lowcoder.plugin.googlesheets.model.GoogleSheetsQueryExecutionContext; +import org.lowcoder.sdk.models.QueryExecutionResult; import reactor.core.publisher.Mono; diff --git a/server/api-service/openblocks-plugins/googleSheetsPlugin/src/main/java/com/openblocks/plugin/googlesheets/queryhandler/GoogleSheetsActionHandlerFactory.java b/server/api-service/lowcoder-plugins/googleSheetsPlugin/src/main/java/org/lowcoder/plugin/googlesheets/queryhandler/GoogleSheetsActionHandlerFactory.java similarity index 85% rename from server/api-service/openblocks-plugins/googleSheetsPlugin/src/main/java/com/openblocks/plugin/googlesheets/queryhandler/GoogleSheetsActionHandlerFactory.java rename to server/api-service/lowcoder-plugins/googleSheetsPlugin/src/main/java/org/lowcoder/plugin/googlesheets/queryhandler/GoogleSheetsActionHandlerFactory.java index 90646086b..d4d58f34e 100644 --- a/server/api-service/openblocks-plugins/googleSheetsPlugin/src/main/java/com/openblocks/plugin/googlesheets/queryhandler/GoogleSheetsActionHandlerFactory.java +++ b/server/api-service/lowcoder-plugins/googleSheetsPlugin/src/main/java/org/lowcoder/plugin/googlesheets/queryhandler/GoogleSheetsActionHandlerFactory.java @@ -1,14 +1,15 @@ -package com.openblocks.plugin.googlesheets.queryhandler; +package org.lowcoder.plugin.googlesheets.queryhandler; -import static com.openblocks.sdk.exception.PluginCommonError.QUERY_ARGUMENT_ERROR; +import static org.lowcoder.sdk.exception.PluginCommonError.QUERY_ARGUMENT_ERROR; import java.util.Map; import java.util.function.Function; import java.util.stream.Collectors; +import org.lowcoder.sdk.exception.PluginException; + import com.google.common.collect.Lists; -import com.openblocks.sdk.exception.PluginException; public class GoogleSheetsActionHandlerFactory { private static final Map HANDLER_MAP; diff --git a/server/api-service/openblocks-plugins/googleSheetsPlugin/src/main/java/com/openblocks/plugin/googlesheets/queryhandler/GoogleSheetsAppendDataHandler.java b/server/api-service/lowcoder-plugins/googleSheetsPlugin/src/main/java/org/lowcoder/plugin/googlesheets/queryhandler/GoogleSheetsAppendDataHandler.java similarity index 87% rename from server/api-service/openblocks-plugins/googleSheetsPlugin/src/main/java/com/openblocks/plugin/googlesheets/queryhandler/GoogleSheetsAppendDataHandler.java rename to server/api-service/lowcoder-plugins/googleSheetsPlugin/src/main/java/org/lowcoder/plugin/googlesheets/queryhandler/GoogleSheetsAppendDataHandler.java index d2e057803..e1074372f 100644 --- a/server/api-service/openblocks-plugins/googleSheetsPlugin/src/main/java/com/openblocks/plugin/googlesheets/queryhandler/GoogleSheetsAppendDataHandler.java +++ b/server/api-service/lowcoder-plugins/googleSheetsPlugin/src/main/java/org/lowcoder/plugin/googlesheets/queryhandler/GoogleSheetsAppendDataHandler.java @@ -1,7 +1,7 @@ -package com.openblocks.plugin.googlesheets.queryhandler; +package org.lowcoder.plugin.googlesheets.queryhandler; -import static com.openblocks.plugin.googlesheets.GoogleSheetError.GOOGLESHEETS_EMPTY_QUERY_PARAM; +import static org.lowcoder.plugin.googlesheets.GoogleSheetError.GOOGLESHEETS_EMPTY_QUERY_PARAM; import java.util.LinkedHashMap; import java.util.LinkedList; @@ -9,16 +9,17 @@ import java.util.Map; import java.util.stream.Collectors; +import org.lowcoder.plugin.googlesheets.model.GoogleSheetsAppendDataRequest; +import org.lowcoder.plugin.googlesheets.model.GoogleSheetsQueryExecutionContext; +import org.lowcoder.sdk.exception.PluginException; +import org.lowcoder.sdk.models.QueryExecutionResult; +import org.lowcoder.sdk.plugin.common.QueryExecutionUtils; +import org.lowcoder.sdk.plugin.sheet.changeset.SheetChangeSetRow; + import com.google.api.services.sheets.v4.Sheets; import com.google.api.services.sheets.v4.model.AppendValuesResponse; import com.google.api.services.sheets.v4.model.ValueRange; import com.google.common.collect.Streams; -import com.openblocks.plugin.googlesheets.model.GoogleSheetsAppendDataRequest; -import com.openblocks.plugin.googlesheets.model.GoogleSheetsQueryExecutionContext; -import com.openblocks.sdk.exception.PluginException; -import com.openblocks.sdk.models.QueryExecutionResult; -import com.openblocks.sdk.plugin.common.QueryExecutionUtils; -import com.openblocks.sdk.plugin.sheet.changeset.SheetChangeSetRow; import reactor.core.publisher.Mono; diff --git a/server/api-service/openblocks-plugins/googleSheetsPlugin/src/main/java/com/openblocks/plugin/googlesheets/queryhandler/GoogleSheetsClearDataHandler.java b/server/api-service/lowcoder-plugins/googleSheetsPlugin/src/main/java/org/lowcoder/plugin/googlesheets/queryhandler/GoogleSheetsClearDataHandler.java similarity index 81% rename from server/api-service/openblocks-plugins/googleSheetsPlugin/src/main/java/com/openblocks/plugin/googlesheets/queryhandler/GoogleSheetsClearDataHandler.java rename to server/api-service/lowcoder-plugins/googleSheetsPlugin/src/main/java/org/lowcoder/plugin/googlesheets/queryhandler/GoogleSheetsClearDataHandler.java index 0850932a9..8c4ba4469 100644 --- a/server/api-service/openblocks-plugins/googleSheetsPlugin/src/main/java/com/openblocks/plugin/googlesheets/queryhandler/GoogleSheetsClearDataHandler.java +++ b/server/api-service/lowcoder-plugins/googleSheetsPlugin/src/main/java/org/lowcoder/plugin/googlesheets/queryhandler/GoogleSheetsClearDataHandler.java @@ -1,12 +1,13 @@ -package com.openblocks.plugin.googlesheets.queryhandler; +package org.lowcoder.plugin.googlesheets.queryhandler; + +import org.lowcoder.plugin.googlesheets.model.GoogleSheetsClearDataRequst; +import org.lowcoder.plugin.googlesheets.model.GoogleSheetsQueryExecutionContext; +import org.lowcoder.sdk.models.QueryExecutionResult; +import org.lowcoder.sdk.plugin.common.QueryExecutionUtils; import com.google.api.services.sheets.v4.Sheets; import com.google.api.services.sheets.v4.model.ClearValuesRequest; import com.google.api.services.sheets.v4.model.ClearValuesResponse; -import com.openblocks.plugin.googlesheets.model.GoogleSheetsClearDataRequst; -import com.openblocks.plugin.googlesheets.model.GoogleSheetsQueryExecutionContext; -import com.openblocks.sdk.models.QueryExecutionResult; -import com.openblocks.sdk.plugin.common.QueryExecutionUtils; import reactor.core.publisher.Mono; diff --git a/server/api-service/openblocks-plugins/googleSheetsPlugin/src/main/java/com/openblocks/plugin/googlesheets/queryhandler/GoogleSheetsDeleteDataHandler.java b/server/api-service/lowcoder-plugins/googleSheetsPlugin/src/main/java/org/lowcoder/plugin/googlesheets/queryhandler/GoogleSheetsDeleteDataHandler.java similarity index 89% rename from server/api-service/openblocks-plugins/googleSheetsPlugin/src/main/java/com/openblocks/plugin/googlesheets/queryhandler/GoogleSheetsDeleteDataHandler.java rename to server/api-service/lowcoder-plugins/googleSheetsPlugin/src/main/java/org/lowcoder/plugin/googlesheets/queryhandler/GoogleSheetsDeleteDataHandler.java index dd3244f52..c64a364e2 100644 --- a/server/api-service/openblocks-plugins/googleSheetsPlugin/src/main/java/com/openblocks/plugin/googlesheets/queryhandler/GoogleSheetsDeleteDataHandler.java +++ b/server/api-service/lowcoder-plugins/googleSheetsPlugin/src/main/java/org/lowcoder/plugin/googlesheets/queryhandler/GoogleSheetsDeleteDataHandler.java @@ -1,9 +1,14 @@ -package com.openblocks.plugin.googlesheets.queryhandler; +package org.lowcoder.plugin.googlesheets.queryhandler; import java.util.ArrayList; import java.util.List; +import org.lowcoder.plugin.googlesheets.model.GoogleSheetsDeleteDataRequest; +import org.lowcoder.plugin.googlesheets.model.GoogleSheetsQueryExecutionContext; +import org.lowcoder.sdk.models.QueryExecutionResult; +import org.lowcoder.sdk.plugin.common.QueryExecutionUtils; + import com.google.api.services.sheets.v4.Sheets; import com.google.api.services.sheets.v4.model.BatchUpdateSpreadsheetRequest; import com.google.api.services.sheets.v4.model.BatchUpdateSpreadsheetResponse; @@ -12,10 +17,6 @@ import com.google.api.services.sheets.v4.model.Request; import com.google.api.services.sheets.v4.model.Sheet; import com.google.api.services.sheets.v4.model.SheetProperties; -import com.openblocks.plugin.googlesheets.model.GoogleSheetsDeleteDataRequest; -import com.openblocks.plugin.googlesheets.model.GoogleSheetsQueryExecutionContext; -import com.openblocks.sdk.models.QueryExecutionResult; -import com.openblocks.sdk.plugin.common.QueryExecutionUtils; import reactor.core.publisher.Mono; diff --git a/server/api-service/openblocks-plugins/googleSheetsPlugin/src/main/java/com/openblocks/plugin/googlesheets/queryhandler/GoogleSheetsGetPreParameters.java b/server/api-service/lowcoder-plugins/googleSheetsPlugin/src/main/java/org/lowcoder/plugin/googlesheets/queryhandler/GoogleSheetsGetPreParameters.java similarity index 77% rename from server/api-service/openblocks-plugins/googleSheetsPlugin/src/main/java/com/openblocks/plugin/googlesheets/queryhandler/GoogleSheetsGetPreParameters.java rename to server/api-service/lowcoder-plugins/googleSheetsPlugin/src/main/java/org/lowcoder/plugin/googlesheets/queryhandler/GoogleSheetsGetPreParameters.java index 78032ce09..ff3fb7b8e 100644 --- a/server/api-service/openblocks-plugins/googleSheetsPlugin/src/main/java/com/openblocks/plugin/googlesheets/queryhandler/GoogleSheetsGetPreParameters.java +++ b/server/api-service/lowcoder-plugins/googleSheetsPlugin/src/main/java/org/lowcoder/plugin/googlesheets/queryhandler/GoogleSheetsGetPreParameters.java @@ -1,10 +1,17 @@ -package com.openblocks.plugin.googlesheets.queryhandler; +package org.lowcoder.plugin.googlesheets.queryhandler; -import static com.openblocks.plugin.googlesheets.GoogleSheetError.GOOGLESHEETS_REQUEST_ERROR; +import static org.lowcoder.plugin.googlesheets.GoogleSheetError.GOOGLESHEETS_REQUEST_ERROR; import java.io.IOException; import java.security.GeneralSecurityException; +import org.lowcoder.plugin.googlesheets.model.GoogleSheetsActionRequest; +import org.lowcoder.plugin.googlesheets.model.GoogleSheetsAppendDataRequest; +import org.lowcoder.plugin.googlesheets.model.GoogleSheetsQueryExecutionContext; +import org.lowcoder.plugin.googlesheets.model.GoogleSheetsUpdateDataRequest; +import org.lowcoder.sdk.exception.PluginException; +import org.lowcoder.sdk.plugin.sheet.changeset.SheetChangeSetRow; + import com.google.api.client.googleapis.javanet.GoogleNetHttpTransport; import com.google.api.client.http.HttpRequestInitializer; import com.google.api.client.http.HttpTransport; @@ -14,12 +21,6 @@ import com.google.api.services.sheets.v4.Sheets.Builder; import com.google.auth.http.HttpCredentialsAdapter; import com.google.auth.oauth2.GoogleCredentials; -import com.openblocks.plugin.googlesheets.model.GoogleSheetsActionRequest; -import com.openblocks.plugin.googlesheets.model.GoogleSheetsAppendDataRequest; -import com.openblocks.plugin.googlesheets.model.GoogleSheetsQueryExecutionContext; -import com.openblocks.plugin.googlesheets.model.GoogleSheetsUpdateDataRequest; -import com.openblocks.sdk.exception.PluginException; -import com.openblocks.sdk.plugin.sheet.changeset.SheetChangeSetRow; public class GoogleSheetsGetPreParameters { diff --git a/server/api-service/openblocks-plugins/googleSheetsPlugin/src/main/java/com/openblocks/plugin/googlesheets/queryhandler/GoogleSheetsReadDataHandler.java b/server/api-service/lowcoder-plugins/googleSheetsPlugin/src/main/java/org/lowcoder/plugin/googlesheets/queryhandler/GoogleSheetsReadDataHandler.java similarity index 91% rename from server/api-service/openblocks-plugins/googleSheetsPlugin/src/main/java/com/openblocks/plugin/googlesheets/queryhandler/GoogleSheetsReadDataHandler.java rename to server/api-service/lowcoder-plugins/googleSheetsPlugin/src/main/java/org/lowcoder/plugin/googlesheets/queryhandler/GoogleSheetsReadDataHandler.java index e6f22b536..bf3fb7bdf 100644 --- a/server/api-service/openblocks-plugins/googleSheetsPlugin/src/main/java/com/openblocks/plugin/googlesheets/queryhandler/GoogleSheetsReadDataHandler.java +++ b/server/api-service/lowcoder-plugins/googleSheetsPlugin/src/main/java/org/lowcoder/plugin/googlesheets/queryhandler/GoogleSheetsReadDataHandler.java @@ -1,4 +1,4 @@ -package com.openblocks.plugin.googlesheets.queryhandler; +package org.lowcoder.plugin.googlesheets.queryhandler; import java.util.LinkedHashMap; @@ -10,15 +10,16 @@ import java.util.regex.Matcher; import java.util.regex.Pattern; +import org.lowcoder.plugin.googlesheets.constants.FieldName; +import org.lowcoder.plugin.googlesheets.model.GoogleSheetsQueryExecutionContext; +import org.lowcoder.plugin.googlesheets.model.GoogleSheetsReadDataRequest; +import org.lowcoder.sdk.models.QueryExecutionResult; +import org.lowcoder.sdk.plugin.common.QueryExecutionUtils; + import com.google.api.client.json.JsonFactory; import com.google.api.client.json.gson.GsonFactory; import com.google.api.services.sheets.v4.Sheets; import com.google.api.services.sheets.v4.model.ValueRange; -import com.openblocks.plugin.googlesheets.constants.FieldName; -import com.openblocks.plugin.googlesheets.model.GoogleSheetsQueryExecutionContext; -import com.openblocks.plugin.googlesheets.model.GoogleSheetsReadDataRequest; -import com.openblocks.sdk.models.QueryExecutionResult; -import com.openblocks.sdk.plugin.common.QueryExecutionUtils; import reactor.core.publisher.Mono; diff --git a/server/api-service/openblocks-plugins/googleSheetsPlugin/src/main/java/com/openblocks/plugin/googlesheets/queryhandler/GoogleSheetsUpdateDataHandler.java b/server/api-service/lowcoder-plugins/googleSheetsPlugin/src/main/java/org/lowcoder/plugin/googlesheets/queryhandler/GoogleSheetsUpdateDataHandler.java similarity index 87% rename from server/api-service/openblocks-plugins/googleSheetsPlugin/src/main/java/com/openblocks/plugin/googlesheets/queryhandler/GoogleSheetsUpdateDataHandler.java rename to server/api-service/lowcoder-plugins/googleSheetsPlugin/src/main/java/org/lowcoder/plugin/googlesheets/queryhandler/GoogleSheetsUpdateDataHandler.java index 9911fc140..c6386bb6e 100644 --- a/server/api-service/openblocks-plugins/googleSheetsPlugin/src/main/java/com/openblocks/plugin/googlesheets/queryhandler/GoogleSheetsUpdateDataHandler.java +++ b/server/api-service/lowcoder-plugins/googleSheetsPlugin/src/main/java/org/lowcoder/plugin/googlesheets/queryhandler/GoogleSheetsUpdateDataHandler.java @@ -1,8 +1,8 @@ -package com.openblocks.plugin.googlesheets.queryhandler; +package org.lowcoder.plugin.googlesheets.queryhandler; -import static com.openblocks.plugin.googlesheets.GoogleSheetError.GOOGLESHEETS_EMPTY_QUERY_PARAM; -import static com.openblocks.plugin.googlesheets.GoogleSheetError.GOOGLESHEETS_REQUEST_ERROR; +import static org.lowcoder.plugin.googlesheets.GoogleSheetError.GOOGLESHEETS_EMPTY_QUERY_PARAM; +import static org.lowcoder.plugin.googlesheets.GoogleSheetError.GOOGLESHEETS_REQUEST_ERROR; import java.util.ArrayList; import java.util.LinkedHashMap; @@ -11,18 +11,19 @@ import java.util.Map.Entry; import java.util.stream.Collectors; +import org.lowcoder.plugin.googlesheets.model.GoogleSheetsQueryExecutionContext; +import org.lowcoder.plugin.googlesheets.model.GoogleSheetsUpdateDataRequest; +import org.lowcoder.sdk.exception.PluginException; +import org.lowcoder.sdk.models.QueryExecutionResult; +import org.lowcoder.sdk.plugin.common.QueryExecutionUtils; +import org.lowcoder.sdk.plugin.sheet.changeset.SheetChangeSetItem; +import org.lowcoder.sdk.plugin.sheet.changeset.SheetChangeSetRow; + import com.google.api.services.sheets.v4.Sheets; import com.google.api.services.sheets.v4.Sheets.Spreadsheets.Values.Update; import com.google.api.services.sheets.v4.model.UpdateValuesResponse; import com.google.api.services.sheets.v4.model.ValueRange; import com.google.common.collect.Streams; -import com.openblocks.plugin.googlesheets.model.GoogleSheetsQueryExecutionContext; -import com.openblocks.plugin.googlesheets.model.GoogleSheetsUpdateDataRequest; -import com.openblocks.sdk.exception.PluginException; -import com.openblocks.sdk.models.QueryExecutionResult; -import com.openblocks.sdk.plugin.common.QueryExecutionUtils; -import com.openblocks.sdk.plugin.sheet.changeset.SheetChangeSetItem; -import com.openblocks.sdk.plugin.sheet.changeset.SheetChangeSetRow; import reactor.core.publisher.Mono; diff --git a/server/api-service/lowcoder-plugins/graphqlPlugin/plugin.properties b/server/api-service/lowcoder-plugins/graphqlPlugin/plugin.properties new file mode 100644 index 000000000..0aece45dc --- /dev/null +++ b/server/api-service/lowcoder-plugins/graphqlPlugin/plugin.properties @@ -0,0 +1,5 @@ +plugin.id=graphql-plugin +plugin.class=org.lowcoder.plugin.graphql.GraphQLPlugin +plugin.version=1.0-SNAPSHOT +plugin.provider=service@lowcoder.org +plugin.dependencies= \ No newline at end of file diff --git a/server/api-service/openblocks-plugins/graphqlPlugin/pom.xml b/server/api-service/lowcoder-plugins/graphqlPlugin/pom.xml similarity index 96% rename from server/api-service/openblocks-plugins/graphqlPlugin/pom.xml rename to server/api-service/lowcoder-plugins/graphqlPlugin/pom.xml index 0c4e6db28..9b2154c70 100644 --- a/server/api-service/openblocks-plugins/graphqlPlugin/pom.xml +++ b/server/api-service/lowcoder-plugins/graphqlPlugin/pom.xml @@ -3,13 +3,13 @@ - com.openblocks - openblocks-plugins + org.lowcoder + lowcoder-plugins 1.0-SNAPSHOT 4.0.0 - com.openblocks.plugins + org.lowcoder.plugins graphqlPlugin 1.0-SNAPSHOT @@ -21,9 +21,9 @@ ${java.version} ${java.version} graphql-plugin - com.openblocks.plugin.graphql.GraphQLPlugin + org.lowcoder.plugin.graphql.GraphQLPlugin 1.0-SNAPSHOT - dev@openblocks.dev + service@lowcoder.org diff --git a/server/api-service/openblocks-plugins/graphqlPlugin/src/main/java/com/openblocks/plugin/graphql/GraphQLConnector.java b/server/api-service/lowcoder-plugins/graphqlPlugin/src/main/java/org/lowcoder/plugin/graphql/GraphQLConnector.java similarity index 82% rename from server/api-service/openblocks-plugins/graphqlPlugin/src/main/java/com/openblocks/plugin/graphql/GraphQLConnector.java rename to server/api-service/lowcoder-plugins/graphqlPlugin/src/main/java/org/lowcoder/plugin/graphql/GraphQLConnector.java index 9e8cd364b..03480aa4d 100644 --- a/server/api-service/openblocks-plugins/graphqlPlugin/src/main/java/com/openblocks/plugin/graphql/GraphQLConnector.java +++ b/server/api-service/lowcoder-plugins/graphqlPlugin/src/main/java/org/lowcoder/plugin/graphql/GraphQLConnector.java @@ -1,4 +1,4 @@ -package com.openblocks.plugin.graphql; +package org.lowcoder.plugin.graphql; import static java.util.Collections.emptySet; @@ -7,12 +7,11 @@ import javax.annotation.Nonnull; +import org.lowcoder.sdk.models.DatasourceTestResult; +import org.lowcoder.sdk.plugin.common.DatasourceConnector; +import org.lowcoder.sdk.plugin.graphql.GraphQLDatasourceConfig; import org.pf4j.Extension; -import com.openblocks.sdk.models.DatasourceTestResult; -import com.openblocks.sdk.plugin.common.DatasourceConnector; -import com.openblocks.sdk.plugin.graphql.GraphQLDatasourceConfig; - import reactor.core.publisher.Mono; @Extension diff --git a/server/api-service/lowcoder-plugins/graphqlPlugin/src/main/java/org/lowcoder/plugin/graphql/GraphQLError.java b/server/api-service/lowcoder-plugins/graphqlPlugin/src/main/java/org/lowcoder/plugin/graphql/GraphQLError.java new file mode 100644 index 000000000..34adaba47 --- /dev/null +++ b/server/api-service/lowcoder-plugins/graphqlPlugin/src/main/java/org/lowcoder/plugin/graphql/GraphQLError.java @@ -0,0 +1,7 @@ +package org.lowcoder.plugin.graphql; + +import org.lowcoder.sdk.exception.PluginError; + +public enum GraphQLError implements PluginError { + GRAPHQL_EXECUTION_ERROR, +} diff --git a/server/api-service/openblocks-plugins/graphqlPlugin/src/main/java/com/openblocks/plugin/graphql/GraphQLExecutor.java b/server/api-service/lowcoder-plugins/graphqlPlugin/src/main/java/org/lowcoder/plugin/graphql/GraphQLExecutor.java similarity index 89% rename from server/api-service/openblocks-plugins/graphqlPlugin/src/main/java/com/openblocks/plugin/graphql/GraphQLExecutor.java rename to server/api-service/lowcoder-plugins/graphqlPlugin/src/main/java/org/lowcoder/plugin/graphql/GraphQLExecutor.java index 8e6a4dfc5..bc44ac665 100644 --- a/server/api-service/openblocks-plugins/graphqlPlugin/src/main/java/com/openblocks/plugin/graphql/GraphQLExecutor.java +++ b/server/api-service/lowcoder-plugins/graphqlPlugin/src/main/java/org/lowcoder/plugin/graphql/GraphQLExecutor.java @@ -1,20 +1,20 @@ -package com.openblocks.plugin.graphql; +package org.lowcoder.plugin.graphql; import static com.google.common.base.MoreObjects.firstNonNull; -import static com.openblocks.plugin.graphql.GraphQLError.GRAPHQL_EXECUTION_ERROR; -import static com.openblocks.plugin.graphql.utils.GraphQLBodyUtils.convertToGraphQLBody; -import static com.openblocks.sdk.exception.PluginCommonError.JSON_PARSE_ERROR; -import static com.openblocks.sdk.exception.PluginCommonError.QUERY_ARGUMENT_ERROR; -import static com.openblocks.sdk.exception.PluginCommonError.QUERY_EXECUTION_ERROR; -import static com.openblocks.sdk.exception.PluginCommonError.QUERY_EXECUTION_TIMEOUT; -import static com.openblocks.sdk.plugin.restapi.auth.RestApiAuthType.DIGEST_AUTH; -import static com.openblocks.sdk.util.JsonUtils.readTree; -import static com.openblocks.sdk.util.JsonUtils.toJsonThrows; -import static com.openblocks.sdk.util.MustacheHelper.renderMustacheString; -import static com.openblocks.sdk.util.StreamUtils.collectList; -import static com.openblocks.sdk.util.StreamUtils.distinctByKey; import static org.apache.commons.lang3.StringUtils.firstNonBlank; import static org.apache.commons.lang3.StringUtils.trimToEmpty; +import static org.lowcoder.plugin.graphql.GraphQLError.GRAPHQL_EXECUTION_ERROR; +import static org.lowcoder.plugin.graphql.utils.GraphQLBodyUtils.convertToGraphQLBody; +import static org.lowcoder.sdk.exception.PluginCommonError.JSON_PARSE_ERROR; +import static org.lowcoder.sdk.exception.PluginCommonError.QUERY_ARGUMENT_ERROR; +import static org.lowcoder.sdk.exception.PluginCommonError.QUERY_EXECUTION_ERROR; +import static org.lowcoder.sdk.exception.PluginCommonError.QUERY_EXECUTION_TIMEOUT; +import static org.lowcoder.sdk.plugin.restapi.auth.RestApiAuthType.DIGEST_AUTH; +import static org.lowcoder.sdk.util.JsonUtils.readTree; +import static org.lowcoder.sdk.util.JsonUtils.toJsonThrows; +import static org.lowcoder.sdk.util.MustacheHelper.renderMustacheString; +import static org.lowcoder.sdk.util.StreamUtils.collectList; +import static org.lowcoder.sdk.util.StreamUtils.distinctByKey; import java.io.IOException; import java.net.URI; @@ -36,6 +36,28 @@ import org.apache.commons.lang3.ObjectUtils; import org.apache.commons.lang3.StringUtils; import org.bson.internal.Base64; +import org.lowcoder.plugin.graphql.constants.ResponseDataType; +import org.lowcoder.plugin.graphql.helpers.AuthHelper; +import org.lowcoder.plugin.graphql.helpers.BufferingFilter; +import org.lowcoder.plugin.graphql.model.GraphQLQueryConfig; +import org.lowcoder.plugin.graphql.model.GraphQLQueryExecutionContext; +import org.lowcoder.sdk.config.CommonConfig; +import org.lowcoder.sdk.exception.PluginException; +import org.lowcoder.sdk.models.Property; +import org.lowcoder.sdk.models.QueryExecutionResult; +import org.lowcoder.sdk.plugin.common.QueryExecutionUtils; +import org.lowcoder.sdk.plugin.common.QueryExecutor; +import org.lowcoder.sdk.plugin.common.RestApiUriBuilder; +import org.lowcoder.sdk.plugin.graphql.GraphQLDatasourceConfig; +import org.lowcoder.sdk.plugin.restapi.DataUtils; +import org.lowcoder.sdk.plugin.restapi.auth.AuthConfig; +import org.lowcoder.sdk.plugin.restapi.auth.BasicAuthConfig; +import org.lowcoder.sdk.plugin.restapi.auth.RestApiAuthType; +import org.lowcoder.sdk.query.QueryVisitorContext; +import org.lowcoder.sdk.util.JsonUtils; +import org.lowcoder.sdk.util.MoreMapUtils; +import org.lowcoder.sdk.util.MustacheHelper; +import org.lowcoder.sdk.webclient.WebClientBuildHelper; import org.pf4j.Extension; import org.springframework.http.HttpCookie; import org.springframework.http.HttpHeaders; @@ -55,28 +77,6 @@ import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.node.ObjectNode; -import com.openblocks.plugin.graphql.constants.ResponseDataType; -import com.openblocks.plugin.graphql.helpers.AuthHelper; -import com.openblocks.plugin.graphql.helpers.BufferingFilter; -import com.openblocks.plugin.graphql.model.GraphQLQueryConfig; -import com.openblocks.plugin.graphql.model.GraphQLQueryExecutionContext; -import com.openblocks.sdk.config.CommonConfig; -import com.openblocks.sdk.exception.PluginException; -import com.openblocks.sdk.models.Property; -import com.openblocks.sdk.models.QueryExecutionResult; -import com.openblocks.sdk.plugin.common.QueryExecutionUtils; -import com.openblocks.sdk.plugin.common.QueryExecutor; -import com.openblocks.sdk.plugin.common.RestApiUriBuilder; -import com.openblocks.sdk.plugin.graphql.GraphQLDatasourceConfig; -import com.openblocks.sdk.plugin.restapi.DataUtils; -import com.openblocks.sdk.plugin.restapi.auth.AuthConfig; -import com.openblocks.sdk.plugin.restapi.auth.BasicAuthConfig; -import com.openblocks.sdk.plugin.restapi.auth.RestApiAuthType; -import com.openblocks.sdk.query.QueryVisitorContext; -import com.openblocks.sdk.util.JsonUtils; -import com.openblocks.sdk.util.MoreMapUtils; -import com.openblocks.sdk.util.MustacheHelper; -import com.openblocks.sdk.webclient.WebClientBuildHelper; import lombok.Builder; import lombok.Getter; @@ -85,7 +85,7 @@ @Extension public class GraphQLExecutor implements QueryExecutor { - private static final String RESPONSE_DATA_TYPE = "X-OPENBLOCKS-RESPONSE-DATA-TYPE"; + private static final String RESPONSE_DATA_TYPE = "X-LOWCODER-RESPONSE-DATA-TYPE"; private static final String GRAPHQL_TYPE = "application/graphql"; private static final int MAX_REDIRECTS = 5; private static final Set BINARY_DATA_TYPES = Set.of("application/zip", diff --git a/server/api-service/openblocks-plugins/graphqlPlugin/src/main/java/com/openblocks/plugin/graphql/GraphQLPlugin.java b/server/api-service/lowcoder-plugins/graphqlPlugin/src/main/java/org/lowcoder/plugin/graphql/GraphQLPlugin.java similarity index 82% rename from server/api-service/openblocks-plugins/graphqlPlugin/src/main/java/com/openblocks/plugin/graphql/GraphQLPlugin.java rename to server/api-service/lowcoder-plugins/graphqlPlugin/src/main/java/org/lowcoder/plugin/graphql/GraphQLPlugin.java index c4ad1ef49..7e0967d75 100644 --- a/server/api-service/openblocks-plugins/graphqlPlugin/src/main/java/com/openblocks/plugin/graphql/GraphQLPlugin.java +++ b/server/api-service/lowcoder-plugins/graphqlPlugin/src/main/java/org/lowcoder/plugin/graphql/GraphQLPlugin.java @@ -1,4 +1,4 @@ -package com.openblocks.plugin.graphql; +package org.lowcoder.plugin.graphql; import org.pf4j.Plugin; import org.pf4j.PluginWrapper; diff --git a/server/api-service/openblocks-plugins/graphqlPlugin/src/main/java/com/openblocks/plugin/graphql/constants/ResponseDataType.java b/server/api-service/lowcoder-plugins/graphqlPlugin/src/main/java/org/lowcoder/plugin/graphql/constants/ResponseDataType.java similarity index 60% rename from server/api-service/openblocks-plugins/graphqlPlugin/src/main/java/com/openblocks/plugin/graphql/constants/ResponseDataType.java rename to server/api-service/lowcoder-plugins/graphqlPlugin/src/main/java/org/lowcoder/plugin/graphql/constants/ResponseDataType.java index 1ced78a3f..e492a1930 100644 --- a/server/api-service/openblocks-plugins/graphqlPlugin/src/main/java/com/openblocks/plugin/graphql/constants/ResponseDataType.java +++ b/server/api-service/lowcoder-plugins/graphqlPlugin/src/main/java/org/lowcoder/plugin/graphql/constants/ResponseDataType.java @@ -1,4 +1,4 @@ -package com.openblocks.plugin.graphql.constants; +package org.lowcoder.plugin.graphql.constants; public enum ResponseDataType { BINARY, IMAGE, TEXT, JSON, UNDEFINED diff --git a/server/api-service/openblocks-plugins/graphqlPlugin/src/main/java/com/openblocks/plugin/graphql/helpers/AuthHelper.java b/server/api-service/lowcoder-plugins/graphqlPlugin/src/main/java/org/lowcoder/plugin/graphql/helpers/AuthHelper.java similarity index 94% rename from server/api-service/openblocks-plugins/graphqlPlugin/src/main/java/com/openblocks/plugin/graphql/helpers/AuthHelper.java rename to server/api-service/lowcoder-plugins/graphqlPlugin/src/main/java/org/lowcoder/plugin/graphql/helpers/AuthHelper.java index 0ba480398..5f6d4aa1d 100644 --- a/server/api-service/openblocks-plugins/graphqlPlugin/src/main/java/com/openblocks/plugin/graphql/helpers/AuthHelper.java +++ b/server/api-service/lowcoder-plugins/graphqlPlugin/src/main/java/org/lowcoder/plugin/graphql/helpers/AuthHelper.java @@ -1,4 +1,4 @@ -package com.openblocks.plugin.graphql.helpers; +package org.lowcoder.plugin.graphql.helpers; import static org.springframework.http.HttpHeaders.WWW_AUTHENTICATE; @@ -6,13 +6,13 @@ import java.util.Optional; import java.util.function.Consumer; +import org.lowcoder.sdk.plugin.restapi.auth.BasicAuthConfig; import org.springframework.http.HttpHeaders; import org.springframework.http.HttpMethod; import org.springframework.http.HttpStatus; import org.springframework.web.reactive.function.client.ClientResponse; import com.google.common.collect.Iterables; -import com.openblocks.sdk.plugin.restapi.auth.BasicAuthConfig; import me.vzhilin.auth.DigestAuthenticator; import me.vzhilin.auth.parser.ChallengeResponse; diff --git a/server/api-service/openblocks-plugins/restApiPlugin/src/main/java/com/openblocks/plugin/restapi/helpers/BufferingFilter.java b/server/api-service/lowcoder-plugins/graphqlPlugin/src/main/java/org/lowcoder/plugin/graphql/helpers/BufferingFilter.java similarity index 97% rename from server/api-service/openblocks-plugins/restApiPlugin/src/main/java/com/openblocks/plugin/restapi/helpers/BufferingFilter.java rename to server/api-service/lowcoder-plugins/graphqlPlugin/src/main/java/org/lowcoder/plugin/graphql/helpers/BufferingFilter.java index ded9748e4..11eac871a 100644 --- a/server/api-service/openblocks-plugins/restApiPlugin/src/main/java/com/openblocks/plugin/restapi/helpers/BufferingFilter.java +++ b/server/api-service/lowcoder-plugins/graphqlPlugin/src/main/java/org/lowcoder/plugin/graphql/helpers/BufferingFilter.java @@ -1,4 +1,4 @@ -package com.openblocks.plugin.restapi.helpers; +package org.lowcoder.plugin.graphql.helpers; import org.reactivestreams.Publisher; import org.springframework.core.io.buffer.DataBuffer; diff --git a/server/api-service/openblocks-plugins/graphqlPlugin/src/main/java/com/openblocks/plugin/graphql/model/GraphQLQueryConfig.java b/server/api-service/lowcoder-plugins/graphqlPlugin/src/main/java/org/lowcoder/plugin/graphql/model/GraphQLQueryConfig.java similarity index 82% rename from server/api-service/openblocks-plugins/graphqlPlugin/src/main/java/com/openblocks/plugin/graphql/model/GraphQLQueryConfig.java rename to server/api-service/lowcoder-plugins/graphqlPlugin/src/main/java/org/lowcoder/plugin/graphql/model/GraphQLQueryConfig.java index fc441b152..ec3035c96 100644 --- a/server/api-service/openblocks-plugins/graphqlPlugin/src/main/java/com/openblocks/plugin/graphql/model/GraphQLQueryConfig.java +++ b/server/api-service/lowcoder-plugins/graphqlPlugin/src/main/java/org/lowcoder/plugin/graphql/model/GraphQLQueryConfig.java @@ -1,18 +1,18 @@ -package com.openblocks.plugin.graphql.model; +package org.lowcoder.plugin.graphql.model; -import static com.openblocks.sdk.exception.PluginCommonError.INVALID_QUERY_SETTINGS; -import static com.openblocks.sdk.util.JsonUtils.fromJson; -import static com.openblocks.sdk.util.JsonUtils.toJson; import static org.apache.commons.collections4.ListUtils.emptyIfNull; +import static org.lowcoder.sdk.exception.PluginCommonError.INVALID_QUERY_SETTINGS; +import static org.lowcoder.sdk.util.JsonUtils.fromJson; +import static org.lowcoder.sdk.util.JsonUtils.toJson; import java.util.List; import java.util.Map; +import org.lowcoder.sdk.exception.PluginException; +import org.lowcoder.sdk.models.Property; import org.springframework.http.HttpMethod; import com.fasterxml.jackson.annotation.JsonCreator; -import com.openblocks.sdk.exception.PluginException; -import com.openblocks.sdk.models.Property; import lombok.Getter; diff --git a/server/api-service/openblocks-plugins/graphqlPlugin/src/main/java/com/openblocks/plugin/graphql/model/GraphQLQueryExecutionContext.java b/server/api-service/lowcoder-plugins/graphqlPlugin/src/main/java/org/lowcoder/plugin/graphql/model/GraphQLQueryExecutionContext.java similarity index 91% rename from server/api-service/openblocks-plugins/graphqlPlugin/src/main/java/com/openblocks/plugin/graphql/model/GraphQLQueryExecutionContext.java rename to server/api-service/lowcoder-plugins/graphqlPlugin/src/main/java/org/lowcoder/plugin/graphql/model/GraphQLQueryExecutionContext.java index 902cd0948..ffe875861 100644 --- a/server/api-service/openblocks-plugins/graphqlPlugin/src/main/java/com/openblocks/plugin/graphql/model/GraphQLQueryExecutionContext.java +++ b/server/api-service/lowcoder-plugins/graphqlPlugin/src/main/java/org/lowcoder/plugin/graphql/model/GraphQLQueryExecutionContext.java @@ -1,4 +1,4 @@ -package com.openblocks.plugin.graphql.model; +package org.lowcoder.plugin.graphql.model; import java.util.List; import java.util.Map; @@ -6,14 +6,14 @@ import javax.annotation.Nullable; +import org.lowcoder.sdk.models.Property; +import org.lowcoder.sdk.plugin.restapi.auth.AuthConfig; +import org.lowcoder.sdk.query.QueryExecutionContext; import org.springframework.http.HttpCookie; import org.springframework.http.HttpMethod; import org.springframework.util.MultiValueMap; import com.fasterxml.jackson.databind.JsonNode; -import com.openblocks.sdk.models.Property; -import com.openblocks.sdk.plugin.restapi.auth.AuthConfig; -import com.openblocks.sdk.query.QueryExecutionContext; import lombok.Builder; import lombok.Getter; diff --git a/server/api-service/openblocks-plugins/graphqlPlugin/src/main/java/com/openblocks/plugin/graphql/utils/GraphQLBodyUtils.java b/server/api-service/lowcoder-plugins/graphqlPlugin/src/main/java/org/lowcoder/plugin/graphql/utils/GraphQLBodyUtils.java similarity index 86% rename from server/api-service/openblocks-plugins/graphqlPlugin/src/main/java/com/openblocks/plugin/graphql/utils/GraphQLBodyUtils.java rename to server/api-service/lowcoder-plugins/graphqlPlugin/src/main/java/org/lowcoder/plugin/graphql/utils/GraphQLBodyUtils.java index 77c099c11..b4768334a 100644 --- a/server/api-service/openblocks-plugins/graphqlPlugin/src/main/java/com/openblocks/plugin/graphql/utils/GraphQLBodyUtils.java +++ b/server/api-service/lowcoder-plugins/graphqlPlugin/src/main/java/org/lowcoder/plugin/graphql/utils/GraphQLBodyUtils.java @@ -1,10 +1,11 @@ -package com.openblocks.plugin.graphql.utils; +package org.lowcoder.plugin.graphql.utils; import java.util.HashMap; import java.util.Map; +import org.lowcoder.plugin.graphql.model.GraphQLQueryExecutionContext; + import com.fasterxml.jackson.databind.JsonNode; -import com.openblocks.plugin.graphql.model.GraphQLQueryExecutionContext; public class GraphQLBodyUtils { diff --git a/server/api-service/lowcoder-plugins/lowcoderApiPlugin/plugin.properties b/server/api-service/lowcoder-plugins/lowcoderApiPlugin/plugin.properties new file mode 100644 index 000000000..87a23cabb --- /dev/null +++ b/server/api-service/lowcoder-plugins/lowcoderApiPlugin/plugin.properties @@ -0,0 +1,5 @@ +plugin.id=lowcoder-api-plugin +plugin.class=org.lowcoder.plugin.LowcoderApiPlugin +plugin.version=1.0-SNAPSHOT +plugin.provider=service@lowcoder.org +plugin.dependencies= diff --git a/server/api-service/openblocks-plugins/openblocksApiPlugin/pom.xml b/server/api-service/lowcoder-plugins/lowcoderApiPlugin/pom.xml similarity index 86% rename from server/api-service/openblocks-plugins/openblocksApiPlugin/pom.xml rename to server/api-service/lowcoder-plugins/lowcoderApiPlugin/pom.xml index ac4d62cb6..f86c13f48 100644 --- a/server/api-service/openblocks-plugins/openblocksApiPlugin/pom.xml +++ b/server/api-service/lowcoder-plugins/lowcoderApiPlugin/pom.xml @@ -3,23 +3,23 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - openblocks-plugins - com.openblocks + lowcoder-plugins + org.lowcoder 1.0-SNAPSHOT 4.0.0 - openblocksApiPlugin + lowcoderApiPlugin UTF-8 17 ${java.version} ${java.version} - openblocks-api-plugin - com.openblocks.plugin.OpenblocksApiPlugin + lowcoder-api-plugin + org.lowcoder.plugin.LowcoderApiPlugin 1.0-SNAPSHOT - dev@openblocks.dev + service@lowcoder.org @@ -55,4 +55,4 @@ - \ No newline at end of file + diff --git a/server/api-service/lowcoder-plugins/lowcoderApiPlugin/src/main/java/org/lowcoder/plugin/LowcoderApiConnector.java b/server/api-service/lowcoder-plugins/lowcoderApiPlugin/src/main/java/org/lowcoder/plugin/LowcoderApiConnector.java new file mode 100644 index 000000000..4ce4466a2 --- /dev/null +++ b/server/api-service/lowcoder-plugins/lowcoderApiPlugin/src/main/java/org/lowcoder/plugin/LowcoderApiConnector.java @@ -0,0 +1,47 @@ +package org.lowcoder.plugin; + +import java.util.Collections; +import java.util.Map; +import java.util.Set; + +import javax.annotation.Nonnull; + +import org.lowcoder.sdk.models.DatasourceTestResult; +import org.lowcoder.sdk.plugin.common.DatasourceConnector; +import org.lowcoder.sdk.plugin.lowcoderapi.LowcoderApiDatasourceConfig; +import org.pf4j.Extension; + +import reactor.core.publisher.Mono; + +@Extension +public class LowcoderApiConnector implements DatasourceConnector { + + private static final Object CONNECTION_OBJECT = new Object(); + + @Override + public Mono createConnection(LowcoderApiDatasourceConfig connectionConfig) { + return Mono.just(CONNECTION_OBJECT); + } + + @Override + public Mono destroyConnection(Object o) { + return Mono.empty(); + } + + @Override + public Mono testConnection(LowcoderApiDatasourceConfig connectionConfig) { + return Mono.just(DatasourceTestResult.testSuccess()); + } + + @Nonnull + @Override + public LowcoderApiDatasourceConfig resolveConfig(Map configMap) { + return LowcoderApiDatasourceConfig.INSTANCE; + } + + @Override + public Set validateConfig(LowcoderApiDatasourceConfig connectionConfig) { + return Collections.emptySet(); + } + +} diff --git a/server/api-service/openblocks-plugins/openblocksApiPlugin/src/main/java/com/openblocks/plugin/OpenblocksApiExecutor.java b/server/api-service/lowcoder-plugins/lowcoderApiPlugin/src/main/java/org/lowcoder/plugin/LowcoderApiExecutor.java similarity index 65% rename from server/api-service/openblocks-plugins/openblocksApiPlugin/src/main/java/com/openblocks/plugin/OpenblocksApiExecutor.java rename to server/api-service/lowcoder-plugins/lowcoderApiPlugin/src/main/java/org/lowcoder/plugin/LowcoderApiExecutor.java index 2aed13117..34c8ec975 100644 --- a/server/api-service/openblocks-plugins/openblocksApiPlugin/src/main/java/com/openblocks/plugin/OpenblocksApiExecutor.java +++ b/server/api-service/lowcoder-plugins/lowcoderApiPlugin/src/main/java/org/lowcoder/plugin/LowcoderApiExecutor.java @@ -1,53 +1,52 @@ -package com.openblocks.plugin; +package org.lowcoder.plugin; -import static com.openblocks.sdk.constants.Authentication.isAnonymousUser; -import static com.openblocks.sdk.models.QueryExecutionResult.error; -import static com.openblocks.sdk.models.QueryExecutionResult.success; -import static com.openblocks.sdk.util.StreamUtils.collectList; import static java.util.Collections.emptyList; import static java.util.Optional.ofNullable; +import static org.lowcoder.sdk.constants.Authentication.isAnonymousUser; +import static org.lowcoder.sdk.models.QueryExecutionResult.error; +import static org.lowcoder.sdk.models.QueryExecutionResult.success; +import static org.lowcoder.sdk.util.StreamUtils.collectList; import java.util.List; import java.util.Map; import java.util.function.Consumer; import org.apache.commons.collections4.MapUtils; +import org.lowcoder.sdk.exception.PluginException; +import org.lowcoder.sdk.models.QueryExecutionResult; +import org.lowcoder.sdk.plugin.common.QueryExecutor; +import org.lowcoder.sdk.plugin.lowcoderapi.LowcoderApiDatasourceConfig; +import org.lowcoder.sdk.query.QueryVisitorContext; +import org.lowcoder.sdk.util.CookieHelper; import org.pf4j.Extension; import org.springframework.http.HttpCookie; import org.springframework.http.HttpMethod; import org.springframework.util.MultiValueMap; import org.springframework.web.reactive.function.client.WebClient; -import com.openblocks.sdk.exception.PluginException; -import com.openblocks.sdk.models.QueryExecutionResult; -import com.openblocks.sdk.plugin.common.QueryExecutor; -import com.openblocks.sdk.plugin.openblocksapi.OpenblocksApiDatasourceConfig; -import com.openblocks.sdk.query.QueryVisitorContext; -import com.openblocks.sdk.util.CookieHelper; - import lombok.Getter; import lombok.Setter; import reactor.core.publisher.Mono; @Extension -public class OpenblocksApiExecutor implements QueryExecutor { +public class LowcoderApiExecutor implements QueryExecutor { private static final String QUERY_ORG_USERS = "queryOrgUsers"; private final String cookieName; - public OpenblocksApiExecutor(CookieHelper cookieHelper) { + public LowcoderApiExecutor(CookieHelper cookieHelper) { cookieName = cookieHelper.getCookieName(); } @Override - public OpenblocksApiQueryExecutionContext buildQueryExecutionContext(OpenblocksApiDatasourceConfig datasourceConfig, + public LowcoderApiQueryExecutionContext buildQueryExecutionContext(LowcoderApiDatasourceConfig datasourceConfig, Map queryConfig, Map requestParams, QueryVisitorContext queryVisitorContext) { String actionType = MapUtils.getString(queryConfig, "compType", ""); MultiValueMap cookies = queryVisitorContext.getCookies(); if (actionType.equalsIgnoreCase(QUERY_ORG_USERS)) { - return OpenblocksApiQueryExecutionContext.builder() + return LowcoderApiQueryExecutionContext.builder() .actionType(actionType) .visitorId(queryVisitorContext.getVisitorId()) .applicationOrgId(queryVisitorContext.getApplicationOrgId()) @@ -55,21 +54,21 @@ public OpenblocksApiQueryExecutionContext buildQueryExecutionContext(OpenblocksA .port(queryVisitorContext.getSystemPort()) .build(); } - throw new PluginException(OpenblocksApiPluginError.OPENBLOCKS_API_INVALID_REQUEST_TYPE, "OPENBLOCKS_INTERNAL_INVALID_REQUEST_TYPE"); + throw new PluginException(LowcoderApiPluginError.LOWCODER_API_INVALID_REQUEST_TYPE, "LOWCODER_INTERNAL_INVALID_REQUEST_TYPE"); } @Override - public Mono executeQuery(Object o, OpenblocksApiQueryExecutionContext context) { + public Mono executeQuery(Object o, LowcoderApiQueryExecutionContext context) { String actionType = context.getActionType(); if (actionType.equals(QUERY_ORG_USERS)) { return doListOrgUsers0(context); } - throw new PluginException(OpenblocksApiPluginError.OPENBLOCKS_API_INVALID_REQUEST_TYPE, "OPENBLOCKS_INTERNAL_INVALID_REQUEST_TYPE"); + throw new PluginException(LowcoderApiPluginError.LOWCODER_API_INVALID_REQUEST_TYPE, "LOWCODER_INTERNAL_INVALID_REQUEST_TYPE"); } - private Mono doListOrgUsers0(OpenblocksApiQueryExecutionContext context) { + private Mono doListOrgUsers0(LowcoderApiQueryExecutionContext context) { String visitorId = context.getVisitorId(); if (isAnonymousUser(visitorId)) { @@ -83,7 +82,7 @@ private Mono doListOrgUsers0(OpenblocksApiQueryExecutionCo .build() .method(HttpMethod.GET) .uri(url) - .exchangeToMono(clientResponse -> clientResponse.bodyToMono(OpenblocksResponse.class)) + .exchangeToMono(clientResponse -> clientResponse.bodyToMono(LowcoderResponse.class)) .map(responseView -> { if (responseView.isSuccess()) { return success(ofNullable(responseView.getData()) @@ -91,15 +90,15 @@ private Mono doListOrgUsers0(OpenblocksApiQueryExecutionCo .orElse(emptyList()) ); } - return error(OpenblocksApiPluginError.OPENBLOCKS_API_REQUEST_ERROR, "REQUEST_ERROR", + return error(LowcoderApiPluginError.LOWCODER_API_REQUEST_ERROR, "REQUEST_ERROR", responseView.getCode(), responseView.getMessage()); }) .onErrorResume(e -> Mono.just( - QueryExecutionResult.error(OpenblocksApiPluginError.OPENBLOCKS_API_REQUEST_ERROR, "OPENBLOCKS_INTERNAL_REQUEST_ERROR", + QueryExecutionResult.error(LowcoderApiPluginError.LOWCODER_API_REQUEST_ERROR, "LOWCODER_INTERNAL_REQUEST_ERROR", e.getMessage()))); } - private Consumer> injectCookies(OpenblocksApiQueryExecutionContext request) { + private Consumer> injectCookies(LowcoderApiQueryExecutionContext request) { return currentCookies -> { MultiValueMap requestCookies = request.getRequestCookies(); @@ -116,7 +115,7 @@ private Consumer> injectCookies(OpenblocksApiQuery @Getter @Setter - private static class OpenblocksResponse { + private static class LowcoderResponse { public static final int SUCCESS = 1; private int code; diff --git a/server/api-service/lowcoder-plugins/lowcoderApiPlugin/src/main/java/org/lowcoder/plugin/LowcoderApiPlugin.java b/server/api-service/lowcoder-plugins/lowcoderApiPlugin/src/main/java/org/lowcoder/plugin/LowcoderApiPlugin.java new file mode 100644 index 000000000..ff677f562 --- /dev/null +++ b/server/api-service/lowcoder-plugins/lowcoderApiPlugin/src/main/java/org/lowcoder/plugin/LowcoderApiPlugin.java @@ -0,0 +1,11 @@ +package org.lowcoder.plugin; + +import org.pf4j.Plugin; +import org.pf4j.PluginWrapper; + +public class LowcoderApiPlugin extends Plugin { + + public LowcoderApiPlugin(PluginWrapper wrapper) { + super(wrapper); + } +} diff --git a/server/api-service/lowcoder-plugins/lowcoderApiPlugin/src/main/java/org/lowcoder/plugin/LowcoderApiPluginError.java b/server/api-service/lowcoder-plugins/lowcoderApiPlugin/src/main/java/org/lowcoder/plugin/LowcoderApiPluginError.java new file mode 100644 index 000000000..503f54364 --- /dev/null +++ b/server/api-service/lowcoder-plugins/lowcoderApiPlugin/src/main/java/org/lowcoder/plugin/LowcoderApiPluginError.java @@ -0,0 +1,9 @@ +package org.lowcoder.plugin; + +import org.lowcoder.sdk.exception.PluginError; + +public enum LowcoderApiPluginError implements PluginError { + + LOWCODER_API_REQUEST_ERROR, + LOWCODER_API_INVALID_REQUEST_TYPE, +} diff --git a/server/api-service/openblocks-plugins/openblocksApiPlugin/src/main/java/com/openblocks/plugin/OpenblocksApiQueryExecutionContext.java b/server/api-service/lowcoder-plugins/lowcoderApiPlugin/src/main/java/org/lowcoder/plugin/LowcoderApiQueryExecutionContext.java similarity index 67% rename from server/api-service/openblocks-plugins/openblocksApiPlugin/src/main/java/com/openblocks/plugin/OpenblocksApiQueryExecutionContext.java rename to server/api-service/lowcoder-plugins/lowcoderApiPlugin/src/main/java/org/lowcoder/plugin/LowcoderApiQueryExecutionContext.java index 13044edf4..74b209b74 100644 --- a/server/api-service/openblocks-plugins/openblocksApiPlugin/src/main/java/com/openblocks/plugin/OpenblocksApiQueryExecutionContext.java +++ b/server/api-service/lowcoder-plugins/lowcoderApiPlugin/src/main/java/org/lowcoder/plugin/LowcoderApiQueryExecutionContext.java @@ -1,16 +1,15 @@ -package com.openblocks.plugin; +package org.lowcoder.plugin; +import org.lowcoder.sdk.query.QueryExecutionContext; import org.springframework.http.HttpCookie; import org.springframework.util.MultiValueMap; -import com.openblocks.sdk.query.QueryExecutionContext; - import lombok.Builder; import lombok.Getter; @Builder @Getter -public class OpenblocksApiQueryExecutionContext extends QueryExecutionContext { +public class LowcoderApiQueryExecutionContext extends QueryExecutionContext { private int port; private String actionType; diff --git a/server/api-service/lowcoder-plugins/mongoPlugin/plugin.properties b/server/api-service/lowcoder-plugins/mongoPlugin/plugin.properties new file mode 100644 index 000000000..94a0c2cf4 --- /dev/null +++ b/server/api-service/lowcoder-plugins/mongoPlugin/plugin.properties @@ -0,0 +1,5 @@ +plugin.id=mongo-plugin +plugin.class=org.lowcoder.plugin.mongo.MongoPlugin +plugin.version=1.0-SNAPSHOT +plugin.provider=service@lowcoder.org +plugin.dependencies= diff --git a/server/api-service/openblocks-plugins/mongoPlugin/pom.xml b/server/api-service/lowcoder-plugins/mongoPlugin/pom.xml similarity index 92% rename from server/api-service/openblocks-plugins/mongoPlugin/pom.xml rename to server/api-service/lowcoder-plugins/mongoPlugin/pom.xml index 322ed4ef0..4083d7e19 100644 --- a/server/api-service/openblocks-plugins/mongoPlugin/pom.xml +++ b/server/api-service/lowcoder-plugins/mongoPlugin/pom.xml @@ -3,8 +3,8 @@ - com.openblocks - openblocks-plugins + org.lowcoder + lowcoder-plugins 1.0-SNAPSHOT @@ -20,9 +20,9 @@ ${java.version} ${java.version} mongo-plugin - com.openblocks.plugin.mongo.MongoPlugin + org.lowcoder.plugin.mongo.MongoPlugin 1.0-SNAPSHOT - dev@openblocks.dev + service@lowcoder.org diff --git a/server/api-service/openblocks-plugins/mongoPlugin/src/main/java/com/openblocks/plugin/mongo/MongoPlugin.java b/server/api-service/lowcoder-plugins/mongoPlugin/src/main/java/org/lowcoder/plugin/mongo/MongoPlugin.java similarity index 85% rename from server/api-service/openblocks-plugins/mongoPlugin/src/main/java/com/openblocks/plugin/mongo/MongoPlugin.java rename to server/api-service/lowcoder-plugins/mongoPlugin/src/main/java/org/lowcoder/plugin/mongo/MongoPlugin.java index a97311d4b..9526b9123 100644 --- a/server/api-service/openblocks-plugins/mongoPlugin/src/main/java/com/openblocks/plugin/mongo/MongoPlugin.java +++ b/server/api-service/lowcoder-plugins/mongoPlugin/src/main/java/org/lowcoder/plugin/mongo/MongoPlugin.java @@ -15,38 +15,38 @@ *

*/ // adapted for mongodb queries -package com.openblocks.plugin.mongo; +package org.lowcoder.plugin.mongo; import static com.google.common.collect.Maps.newHashMap; -import static com.openblocks.plugin.mongo.MongoPluginError.MONGO_COMMAND_ERROR; -import static com.openblocks.plugin.mongo.MongoPluginError.MONGO_EXECUTION_ERROR; -import static com.openblocks.plugin.mongo.constants.MongoFieldName.AGGREGATE_PIPELINE; -import static com.openblocks.plugin.mongo.constants.MongoFieldName.COUNT_QUERY; -import static com.openblocks.plugin.mongo.constants.MongoFieldName.DELETE_QUERY; -import static com.openblocks.plugin.mongo.constants.MongoFieldName.DISTINCT_QUERY; -import static com.openblocks.plugin.mongo.constants.MongoFieldName.FIND_PROJECTION; -import static com.openblocks.plugin.mongo.constants.MongoFieldName.FIND_QUERY; -import static com.openblocks.plugin.mongo.constants.MongoFieldName.FIND_SORT; -import static com.openblocks.plugin.mongo.constants.MongoFieldName.INSERT_DOCUMENT; -import static com.openblocks.plugin.mongo.constants.MongoFieldName.RAW_COMMAND; -import static com.openblocks.plugin.mongo.constants.MongoFieldName.UPDATE_OPERATION; -import static com.openblocks.plugin.mongo.constants.MongoFieldName.UPDATE_QUERY; -import static com.openblocks.plugin.mongo.model.MongoConnectionUriParser.extractInfoFromConnectionStringURI; -import static com.openblocks.plugin.mongo.utils.MongoQueryUtils.isRawCommand; -import static com.openblocks.plugin.mongo.utils.MongoQueryUtils.parseResultBody; -import static com.openblocks.sdk.exception.PluginCommonError.CONNECTION_ERROR; -import static com.openblocks.sdk.exception.PluginCommonError.DATASOURCE_ARGUMENT_ERROR; -import static com.openblocks.sdk.exception.PluginCommonError.DATASOURCE_GET_STRUCTURE_ERROR; -import static com.openblocks.sdk.exception.PluginCommonError.DATASOURCE_TIMEOUT_ERROR; -import static com.openblocks.sdk.exception.PluginCommonError.INVALID_QUERY_SETTINGS; -import static com.openblocks.sdk.exception.PluginCommonError.QUERY_ARGUMENT_ERROR; -import static com.openblocks.sdk.exception.PluginCommonError.QUERY_EXECUTION_ERROR; -import static com.openblocks.sdk.exception.PluginCommonError.QUERY_EXECUTION_TIMEOUT; -import static com.openblocks.sdk.plugin.common.QueryExecutionUtils.getValueSafelyFromFormData; -import static com.openblocks.sdk.plugin.common.QueryExecutionUtils.querySharedScheduler; -import static com.openblocks.sdk.util.JsonUtils.toJson; -import static com.openblocks.sdk.util.MustacheHelper.renderMustacheJsonString; -import static com.openblocks.sdk.util.MustacheHelper.renderMustacheString; +import static org.lowcoder.plugin.mongo.MongoPluginError.MONGO_COMMAND_ERROR; +import static org.lowcoder.plugin.mongo.MongoPluginError.MONGO_EXECUTION_ERROR; +import static org.lowcoder.plugin.mongo.constants.MongoFieldName.AGGREGATE_PIPELINE; +import static org.lowcoder.plugin.mongo.constants.MongoFieldName.COUNT_QUERY; +import static org.lowcoder.plugin.mongo.constants.MongoFieldName.DELETE_QUERY; +import static org.lowcoder.plugin.mongo.constants.MongoFieldName.DISTINCT_QUERY; +import static org.lowcoder.plugin.mongo.constants.MongoFieldName.FIND_PROJECTION; +import static org.lowcoder.plugin.mongo.constants.MongoFieldName.FIND_QUERY; +import static org.lowcoder.plugin.mongo.constants.MongoFieldName.FIND_SORT; +import static org.lowcoder.plugin.mongo.constants.MongoFieldName.INSERT_DOCUMENT; +import static org.lowcoder.plugin.mongo.constants.MongoFieldName.RAW_COMMAND; +import static org.lowcoder.plugin.mongo.constants.MongoFieldName.UPDATE_OPERATION; +import static org.lowcoder.plugin.mongo.constants.MongoFieldName.UPDATE_QUERY; +import static org.lowcoder.plugin.mongo.model.MongoConnectionUriParser.extractInfoFromConnectionStringURI; +import static org.lowcoder.plugin.mongo.utils.MongoQueryUtils.isRawCommand; +import static org.lowcoder.plugin.mongo.utils.MongoQueryUtils.parseResultBody; +import static org.lowcoder.sdk.exception.PluginCommonError.CONNECTION_ERROR; +import static org.lowcoder.sdk.exception.PluginCommonError.DATASOURCE_ARGUMENT_ERROR; +import static org.lowcoder.sdk.exception.PluginCommonError.DATASOURCE_GET_STRUCTURE_ERROR; +import static org.lowcoder.sdk.exception.PluginCommonError.DATASOURCE_TIMEOUT_ERROR; +import static org.lowcoder.sdk.exception.PluginCommonError.INVALID_QUERY_SETTINGS; +import static org.lowcoder.sdk.exception.PluginCommonError.QUERY_ARGUMENT_ERROR; +import static org.lowcoder.sdk.exception.PluginCommonError.QUERY_EXECUTION_ERROR; +import static org.lowcoder.sdk.exception.PluginCommonError.QUERY_EXECUTION_TIMEOUT; +import static org.lowcoder.sdk.plugin.common.QueryExecutionUtils.getValueSafelyFromFormData; +import static org.lowcoder.sdk.plugin.common.QueryExecutionUtils.querySharedScheduler; +import static org.lowcoder.sdk.util.JsonUtils.toJson; +import static org.lowcoder.sdk.util.MustacheHelper.renderMustacheJsonString; +import static org.lowcoder.sdk.util.MustacheHelper.renderMustacheString; import java.math.BigInteger; import java.time.Duration; @@ -68,6 +68,21 @@ import org.apache.commons.lang3.StringUtils; import org.bson.Document; import org.json.JSONObject; +import org.lowcoder.plugin.mongo.commands.MongoCommand; +import org.lowcoder.plugin.mongo.constants.MongoSpecialDataTypes; +import org.lowcoder.plugin.mongo.model.MongoConnection; +import org.lowcoder.plugin.mongo.model.MongoConnectionUriParser; +import org.lowcoder.plugin.mongo.model.MongoDatasourceConfig; +import org.lowcoder.plugin.mongo.model.MongoQueryExecutionContext; +import org.lowcoder.plugin.mongo.utils.MongoQueryUtils; +import org.lowcoder.sdk.config.dynamic.Conf; +import org.lowcoder.sdk.config.dynamic.ConfigCenter; +import org.lowcoder.sdk.exception.PluginException; +import org.lowcoder.sdk.models.DatasourceStructure; +import org.lowcoder.sdk.models.DatasourceTestResult; +import org.lowcoder.sdk.models.QueryExecutionResult; +import org.lowcoder.sdk.plugin.common.DatasourceQueryEngine; +import org.lowcoder.sdk.query.QueryVisitorContext; import org.pf4j.Extension; import org.pf4j.Plugin; import org.pf4j.PluginWrapper; @@ -80,21 +95,6 @@ import com.mongodb.MongoTimeoutException; import com.mongodb.reactivestreams.client.MongoClients; import com.mongodb.reactivestreams.client.MongoDatabase; -import com.openblocks.plugin.mongo.commands.MongoCommand; -import com.openblocks.plugin.mongo.constants.MongoSpecialDataTypes; -import com.openblocks.plugin.mongo.model.MongoConnection; -import com.openblocks.plugin.mongo.model.MongoConnectionUriParser; -import com.openblocks.plugin.mongo.model.MongoDatasourceConfig; -import com.openblocks.plugin.mongo.model.MongoQueryExecutionContext; -import com.openblocks.plugin.mongo.utils.MongoQueryUtils; -import com.openblocks.sdk.config.dynamic.Conf; -import com.openblocks.sdk.config.dynamic.ConfigCenter; -import com.openblocks.sdk.exception.PluginException; -import com.openblocks.sdk.models.DatasourceStructure; -import com.openblocks.sdk.models.DatasourceTestResult; -import com.openblocks.sdk.models.QueryExecutionResult; -import com.openblocks.sdk.plugin.common.DatasourceQueryEngine; -import com.openblocks.sdk.query.QueryVisitorContext; import lombok.extern.slf4j.Slf4j; import reactor.core.publisher.Flux; diff --git a/server/api-service/openblocks-plugins/mongoPlugin/src/main/java/com/openblocks/plugin/mongo/MongoPluginError.java b/server/api-service/lowcoder-plugins/mongoPlugin/src/main/java/org/lowcoder/plugin/mongo/MongoPluginError.java similarity index 59% rename from server/api-service/openblocks-plugins/mongoPlugin/src/main/java/com/openblocks/plugin/mongo/MongoPluginError.java rename to server/api-service/lowcoder-plugins/mongoPlugin/src/main/java/org/lowcoder/plugin/mongo/MongoPluginError.java index 00968107a..853d2a84c 100644 --- a/server/api-service/openblocks-plugins/mongoPlugin/src/main/java/com/openblocks/plugin/mongo/MongoPluginError.java +++ b/server/api-service/lowcoder-plugins/mongoPlugin/src/main/java/org/lowcoder/plugin/mongo/MongoPluginError.java @@ -1,6 +1,6 @@ -package com.openblocks.plugin.mongo; +package org.lowcoder.plugin.mongo; -import com.openblocks.sdk.exception.PluginError; +import org.lowcoder.sdk.exception.PluginError; public enum MongoPluginError implements PluginError { diff --git a/server/api-service/openblocks-plugins/mongoPlugin/src/main/java/com/openblocks/plugin/mongo/commands/Aggregate.java b/server/api-service/lowcoder-plugins/mongoPlugin/src/main/java/org/lowcoder/plugin/mongo/commands/Aggregate.java similarity index 85% rename from server/api-service/openblocks-plugins/mongoPlugin/src/main/java/com/openblocks/plugin/mongo/commands/Aggregate.java rename to server/api-service/lowcoder-plugins/mongoPlugin/src/main/java/org/lowcoder/plugin/mongo/commands/Aggregate.java index e396864c1..3a22e9c22 100644 --- a/server/api-service/openblocks-plugins/mongoPlugin/src/main/java/com/openblocks/plugin/mongo/commands/Aggregate.java +++ b/server/api-service/lowcoder-plugins/mongoPlugin/src/main/java/org/lowcoder/plugin/mongo/commands/Aggregate.java @@ -14,14 +14,14 @@ * limitations under the License. *

*/ -package com.openblocks.plugin.mongo.commands; +package org.lowcoder.plugin.mongo.commands; -import static com.openblocks.plugin.mongo.constants.MongoFieldName.AGGREGATE_LIMIT; -import static com.openblocks.plugin.mongo.constants.MongoFieldName.AGGREGATE_PIPELINE; -import static com.openblocks.plugin.mongo.utils.MongoQueryUtils.parseSafely; -import static com.openblocks.sdk.exception.PluginCommonError.QUERY_ARGUMENT_ERROR; -import static com.openblocks.sdk.plugin.common.QueryExecutionUtils.getValueSafelyFromFormData; import static org.apache.commons.lang3.StringUtils.isBlank; +import static org.lowcoder.plugin.mongo.constants.MongoFieldName.AGGREGATE_LIMIT; +import static org.lowcoder.plugin.mongo.constants.MongoFieldName.AGGREGATE_PIPELINE; +import static org.lowcoder.plugin.mongo.utils.MongoQueryUtils.parseSafely; +import static org.lowcoder.sdk.exception.PluginCommonError.QUERY_ARGUMENT_ERROR; +import static org.lowcoder.sdk.plugin.common.QueryExecutionUtils.getValueSafelyFromFormData; import java.util.Map; @@ -29,10 +29,10 @@ import org.bson.BsonArray; import org.bson.Document; import org.bson.json.JsonParseException; +import org.lowcoder.sdk.exception.PluginException; import org.pf4j.util.StringUtils; import com.google.common.collect.ImmutableList; -import com.openblocks.sdk.exception.PluginException; import lombok.Getter; import lombok.Setter; diff --git a/server/api-service/openblocks-plugins/mongoPlugin/src/main/java/com/openblocks/plugin/mongo/commands/Count.java b/server/api-service/lowcoder-plugins/mongoPlugin/src/main/java/org/lowcoder/plugin/mongo/commands/Count.java similarity index 77% rename from server/api-service/openblocks-plugins/mongoPlugin/src/main/java/com/openblocks/plugin/mongo/commands/Count.java rename to server/api-service/lowcoder-plugins/mongoPlugin/src/main/java/org/lowcoder/plugin/mongo/commands/Count.java index 8a3e182d2..8555fd406 100644 --- a/server/api-service/openblocks-plugins/mongoPlugin/src/main/java/com/openblocks/plugin/mongo/commands/Count.java +++ b/server/api-service/lowcoder-plugins/mongoPlugin/src/main/java/org/lowcoder/plugin/mongo/commands/Count.java @@ -14,12 +14,12 @@ * limitations under the License. *

*/ -package com.openblocks.plugin.mongo.commands; +package org.lowcoder.plugin.mongo.commands; -import static com.openblocks.plugin.mongo.constants.MongoFieldName.COUNT_QUERY; -import static com.openblocks.plugin.mongo.utils.MongoQueryUtils.parseSafely; -import static com.openblocks.sdk.plugin.common.QueryExecutionUtils.getValueSafelyFromFormData; -import static com.openblocks.sdk.plugin.common.QueryExecutionUtils.validConfigurationPresentInFormData; +import static org.lowcoder.plugin.mongo.constants.MongoFieldName.COUNT_QUERY; +import static org.lowcoder.plugin.mongo.utils.MongoQueryUtils.parseSafely; +import static org.lowcoder.sdk.plugin.common.QueryExecutionUtils.getValueSafelyFromFormData; +import static org.lowcoder.sdk.plugin.common.QueryExecutionUtils.validConfigurationPresentInFormData; import java.util.Map; diff --git a/server/api-service/openblocks-plugins/mongoPlugin/src/main/java/com/openblocks/plugin/mongo/commands/Delete.java b/server/api-service/lowcoder-plugins/mongoPlugin/src/main/java/org/lowcoder/plugin/mongo/commands/Delete.java similarity index 84% rename from server/api-service/openblocks-plugins/mongoPlugin/src/main/java/com/openblocks/plugin/mongo/commands/Delete.java rename to server/api-service/lowcoder-plugins/mongoPlugin/src/main/java/org/lowcoder/plugin/mongo/commands/Delete.java index b7f6b1e06..55c6f4ef6 100644 --- a/server/api-service/openblocks-plugins/mongoPlugin/src/main/java/com/openblocks/plugin/mongo/commands/Delete.java +++ b/server/api-service/lowcoder-plugins/mongoPlugin/src/main/java/org/lowcoder/plugin/mongo/commands/Delete.java @@ -14,12 +14,12 @@ * limitations under the License. *

*/ -package com.openblocks.plugin.mongo.commands; +package org.lowcoder.plugin.mongo.commands; -import static com.openblocks.plugin.mongo.constants.MongoFieldName.DELETE_LIMIT; -import static com.openblocks.plugin.mongo.constants.MongoFieldName.DELETE_QUERY; -import static com.openblocks.sdk.plugin.common.QueryExecutionUtils.getValueSafelyFromFormData; -import static com.openblocks.sdk.plugin.common.QueryExecutionUtils.validConfigurationPresentInFormData; +import static org.lowcoder.plugin.mongo.constants.MongoFieldName.DELETE_LIMIT; +import static org.lowcoder.plugin.mongo.constants.MongoFieldName.DELETE_QUERY; +import static org.lowcoder.sdk.plugin.common.QueryExecutionUtils.getValueSafelyFromFormData; +import static org.lowcoder.sdk.plugin.common.QueryExecutionUtils.validConfigurationPresentInFormData; import java.util.ArrayList; import java.util.List; @@ -27,8 +27,7 @@ import org.apache.commons.lang3.StringUtils; import org.bson.Document; - -import com.openblocks.plugin.mongo.utils.MongoQueryUtils; +import org.lowcoder.plugin.mongo.utils.MongoQueryUtils; import lombok.Getter; import lombok.NoArgsConstructor; diff --git a/server/api-service/openblocks-plugins/mongoPlugin/src/main/java/com/openblocks/plugin/mongo/commands/Distinct.java b/server/api-service/lowcoder-plugins/mongoPlugin/src/main/java/org/lowcoder/plugin/mongo/commands/Distinct.java similarity index 80% rename from server/api-service/openblocks-plugins/mongoPlugin/src/main/java/com/openblocks/plugin/mongo/commands/Distinct.java rename to server/api-service/lowcoder-plugins/mongoPlugin/src/main/java/org/lowcoder/plugin/mongo/commands/Distinct.java index 81e340edc..6e41eb15c 100644 --- a/server/api-service/openblocks-plugins/mongoPlugin/src/main/java/com/openblocks/plugin/mongo/commands/Distinct.java +++ b/server/api-service/lowcoder-plugins/mongoPlugin/src/main/java/org/lowcoder/plugin/mongo/commands/Distinct.java @@ -14,19 +14,18 @@ * limitations under the License. *

*/ -package com.openblocks.plugin.mongo.commands; +package org.lowcoder.plugin.mongo.commands; -import static com.openblocks.plugin.mongo.constants.MongoFieldName.DISTINCT_QUERY; -import static com.openblocks.plugin.mongo.utils.MongoQueryUtils.parseSafely; -import static com.openblocks.sdk.plugin.common.QueryExecutionUtils.getValueSafelyFromFormData; -import static com.openblocks.sdk.plugin.common.QueryExecutionUtils.validConfigurationPresentInFormData; +import static org.lowcoder.plugin.mongo.constants.MongoFieldName.DISTINCT_QUERY; +import static org.lowcoder.plugin.mongo.utils.MongoQueryUtils.parseSafely; +import static org.lowcoder.sdk.plugin.common.QueryExecutionUtils.getValueSafelyFromFormData; +import static org.lowcoder.sdk.plugin.common.QueryExecutionUtils.validConfigurationPresentInFormData; import java.util.Map; import org.apache.commons.lang3.StringUtils; import org.bson.Document; - -import com.openblocks.plugin.mongo.constants.MongoFieldName; +import org.lowcoder.plugin.mongo.constants.MongoFieldName; import lombok.Getter; import lombok.Setter; diff --git a/server/api-service/openblocks-plugins/mongoPlugin/src/main/java/com/openblocks/plugin/mongo/commands/Find.java b/server/api-service/lowcoder-plugins/mongoPlugin/src/main/java/org/lowcoder/plugin/mongo/commands/Find.java similarity index 79% rename from server/api-service/openblocks-plugins/mongoPlugin/src/main/java/com/openblocks/plugin/mongo/commands/Find.java rename to server/api-service/lowcoder-plugins/mongoPlugin/src/main/java/org/lowcoder/plugin/mongo/commands/Find.java index 79db82e39..de3fe7d05 100644 --- a/server/api-service/openblocks-plugins/mongoPlugin/src/main/java/com/openblocks/plugin/mongo/commands/Find.java +++ b/server/api-service/lowcoder-plugins/mongoPlugin/src/main/java/org/lowcoder/plugin/mongo/commands/Find.java @@ -14,25 +14,24 @@ * limitations under the License. *

*/ -package com.openblocks.plugin.mongo.commands; - -import static com.openblocks.plugin.mongo.constants.MongoFieldName.FIND_LIMIT; -import static com.openblocks.plugin.mongo.constants.MongoFieldName.FIND_PROJECTION; -import static com.openblocks.plugin.mongo.constants.MongoFieldName.FIND_QUERY; -import static com.openblocks.plugin.mongo.constants.MongoFieldName.FIND_SKIP; -import static com.openblocks.plugin.mongo.constants.MongoFieldName.FIND_SORT; -import static com.openblocks.plugin.mongo.utils.MongoQueryUtils.parseSafely; -import static com.openblocks.sdk.exception.PluginCommonError.QUERY_ARGUMENT_ERROR; -import static com.openblocks.sdk.plugin.common.QueryExecutionUtils.getValueSafelyFromFormData; -import static com.openblocks.sdk.plugin.common.QueryExecutionUtils.validConfigurationPresentInFormData; +package org.lowcoder.plugin.mongo.commands; + +import static org.lowcoder.plugin.mongo.constants.MongoFieldName.FIND_LIMIT; +import static org.lowcoder.plugin.mongo.constants.MongoFieldName.FIND_PROJECTION; +import static org.lowcoder.plugin.mongo.constants.MongoFieldName.FIND_QUERY; +import static org.lowcoder.plugin.mongo.constants.MongoFieldName.FIND_SKIP; +import static org.lowcoder.plugin.mongo.constants.MongoFieldName.FIND_SORT; +import static org.lowcoder.plugin.mongo.utils.MongoQueryUtils.parseSafely; +import static org.lowcoder.sdk.exception.PluginCommonError.QUERY_ARGUMENT_ERROR; +import static org.lowcoder.sdk.plugin.common.QueryExecutionUtils.getValueSafelyFromFormData; +import static org.lowcoder.sdk.plugin.common.QueryExecutionUtils.validConfigurationPresentInFormData; import java.util.Map; import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.math.NumberUtils; import org.bson.Document; - -import com.openblocks.sdk.exception.PluginException; +import org.lowcoder.sdk.exception.PluginException; import lombok.Getter; import lombok.NoArgsConstructor; diff --git a/server/api-service/openblocks-plugins/mongoPlugin/src/main/java/com/openblocks/plugin/mongo/commands/Insert.java b/server/api-service/lowcoder-plugins/mongoPlugin/src/main/java/org/lowcoder/plugin/mongo/commands/Insert.java similarity index 83% rename from server/api-service/openblocks-plugins/mongoPlugin/src/main/java/com/openblocks/plugin/mongo/commands/Insert.java rename to server/api-service/lowcoder-plugins/mongoPlugin/src/main/java/org/lowcoder/plugin/mongo/commands/Insert.java index 136399409..f796a5fcf 100644 --- a/server/api-service/openblocks-plugins/mongoPlugin/src/main/java/com/openblocks/plugin/mongo/commands/Insert.java +++ b/server/api-service/lowcoder-plugins/mongoPlugin/src/main/java/org/lowcoder/plugin/mongo/commands/Insert.java @@ -14,12 +14,12 @@ * limitations under the License. *

*/ -package com.openblocks.plugin.mongo.commands; +package org.lowcoder.plugin.mongo.commands; -import static com.openblocks.plugin.mongo.constants.MongoFieldName.INSERT_DOCUMENT; -import static com.openblocks.sdk.exception.PluginCommonError.QUERY_ARGUMENT_ERROR; -import static com.openblocks.sdk.plugin.common.QueryExecutionUtils.getValueSafelyFromFormData; -import static com.openblocks.sdk.plugin.common.QueryExecutionUtils.validConfigurationPresentInFormData; +import static org.lowcoder.plugin.mongo.constants.MongoFieldName.INSERT_DOCUMENT; +import static org.lowcoder.sdk.exception.PluginCommonError.QUERY_ARGUMENT_ERROR; +import static org.lowcoder.sdk.plugin.common.QueryExecutionUtils.getValueSafelyFromFormData; +import static org.lowcoder.sdk.plugin.common.QueryExecutionUtils.validConfigurationPresentInFormData; import java.util.ArrayList; import java.util.Map; @@ -28,9 +28,8 @@ import org.bson.BsonArray; import org.bson.Document; import org.bson.json.JsonParseException; - -import com.openblocks.plugin.mongo.utils.MongoQueryUtils; -import com.openblocks.sdk.exception.PluginException; +import org.lowcoder.plugin.mongo.utils.MongoQueryUtils; +import org.lowcoder.sdk.exception.PluginException; import lombok.Getter; import lombok.NoArgsConstructor; diff --git a/server/api-service/openblocks-plugins/mongoPlugin/src/main/java/com/openblocks/plugin/mongo/commands/MongoCommand.java b/server/api-service/lowcoder-plugins/mongoPlugin/src/main/java/org/lowcoder/plugin/mongo/commands/MongoCommand.java similarity index 87% rename from server/api-service/openblocks-plugins/mongoPlugin/src/main/java/com/openblocks/plugin/mongo/commands/MongoCommand.java rename to server/api-service/lowcoder-plugins/mongoPlugin/src/main/java/org/lowcoder/plugin/mongo/commands/MongoCommand.java index 831dc2787..087b4ae8c 100644 --- a/server/api-service/openblocks-plugins/mongoPlugin/src/main/java/com/openblocks/plugin/mongo/commands/MongoCommand.java +++ b/server/api-service/lowcoder-plugins/mongoPlugin/src/main/java/org/lowcoder/plugin/mongo/commands/MongoCommand.java @@ -14,11 +14,11 @@ * limitations under the License. *

*/ -package com.openblocks.plugin.mongo.commands; +package org.lowcoder.plugin.mongo.commands; -import static com.openblocks.plugin.mongo.constants.MongoFieldName.COLLECTION; -import static com.openblocks.sdk.exception.PluginCommonError.QUERY_EXECUTION_ERROR; -import static com.openblocks.sdk.plugin.common.QueryExecutionUtils.validConfigurationPresentInFormData; +import static org.lowcoder.plugin.mongo.constants.MongoFieldName.COLLECTION; +import static org.lowcoder.sdk.exception.PluginCommonError.QUERY_EXECUTION_ERROR; +import static org.lowcoder.sdk.plugin.common.QueryExecutionUtils.validConfigurationPresentInFormData; import java.util.ArrayList; import java.util.List; @@ -27,9 +27,9 @@ import org.apache.commons.collections4.MapUtils; import org.apache.commons.lang3.StringUtils; import org.bson.Document; +import org.lowcoder.sdk.exception.PluginException; import com.fasterxml.jackson.databind.ObjectMapper; -import com.openblocks.sdk.exception.PluginException; import lombok.Getter; import lombok.NoArgsConstructor; diff --git a/server/api-service/openblocks-plugins/mongoPlugin/src/main/java/com/openblocks/plugin/mongo/commands/UpdateMany.java b/server/api-service/lowcoder-plugins/mongoPlugin/src/main/java/org/lowcoder/plugin/mongo/commands/UpdateMany.java similarity index 84% rename from server/api-service/openblocks-plugins/mongoPlugin/src/main/java/com/openblocks/plugin/mongo/commands/UpdateMany.java rename to server/api-service/lowcoder-plugins/mongoPlugin/src/main/java/org/lowcoder/plugin/mongo/commands/UpdateMany.java index da56b58a3..c9b8125e2 100644 --- a/server/api-service/openblocks-plugins/mongoPlugin/src/main/java/com/openblocks/plugin/mongo/commands/UpdateMany.java +++ b/server/api-service/lowcoder-plugins/mongoPlugin/src/main/java/org/lowcoder/plugin/mongo/commands/UpdateMany.java @@ -14,13 +14,13 @@ * limitations under the License. *

*/ -package com.openblocks.plugin.mongo.commands; +package org.lowcoder.plugin.mongo.commands; -import static com.openblocks.plugin.mongo.constants.MongoFieldName.UPDATE_LIMIT; -import static com.openblocks.plugin.mongo.constants.MongoFieldName.UPDATE_OPERATION; -import static com.openblocks.plugin.mongo.constants.MongoFieldName.UPDATE_QUERY; -import static com.openblocks.sdk.plugin.common.QueryExecutionUtils.getValueSafelyFromFormData; -import static com.openblocks.sdk.plugin.common.QueryExecutionUtils.validConfigurationPresentInFormData; +import static org.lowcoder.plugin.mongo.constants.MongoFieldName.UPDATE_LIMIT; +import static org.lowcoder.plugin.mongo.constants.MongoFieldName.UPDATE_OPERATION; +import static org.lowcoder.plugin.mongo.constants.MongoFieldName.UPDATE_QUERY; +import static org.lowcoder.sdk.plugin.common.QueryExecutionUtils.getValueSafelyFromFormData; +import static org.lowcoder.sdk.plugin.common.QueryExecutionUtils.validConfigurationPresentInFormData; import java.util.ArrayList; import java.util.List; @@ -28,8 +28,7 @@ import org.apache.commons.lang3.StringUtils; import org.bson.Document; - -import com.openblocks.plugin.mongo.utils.MongoQueryUtils; +import org.lowcoder.plugin.mongo.utils.MongoQueryUtils; import lombok.Getter; import lombok.NoArgsConstructor; diff --git a/server/api-service/openblocks-plugins/mongoPlugin/src/main/java/com/openblocks/plugin/mongo/constants/MongoFieldName.java b/server/api-service/lowcoder-plugins/mongoPlugin/src/main/java/org/lowcoder/plugin/mongo/constants/MongoFieldName.java similarity index 97% rename from server/api-service/openblocks-plugins/mongoPlugin/src/main/java/com/openblocks/plugin/mongo/constants/MongoFieldName.java rename to server/api-service/lowcoder-plugins/mongoPlugin/src/main/java/org/lowcoder/plugin/mongo/constants/MongoFieldName.java index e6d01658f..726abfeea 100644 --- a/server/api-service/openblocks-plugins/mongoPlugin/src/main/java/com/openblocks/plugin/mongo/constants/MongoFieldName.java +++ b/server/api-service/lowcoder-plugins/mongoPlugin/src/main/java/org/lowcoder/plugin/mongo/constants/MongoFieldName.java @@ -1,4 +1,4 @@ -package com.openblocks.plugin.mongo.constants; +package org.lowcoder.plugin.mongo.constants; public class MongoFieldName { diff --git a/server/api-service/openblocks-plugins/mongoPlugin/src/main/java/com/openblocks/plugin/mongo/constants/MongoSpecialDataTypes.java b/server/api-service/lowcoder-plugins/mongoPlugin/src/main/java/org/lowcoder/plugin/mongo/constants/MongoSpecialDataTypes.java similarity index 98% rename from server/api-service/openblocks-plugins/mongoPlugin/src/main/java/com/openblocks/plugin/mongo/constants/MongoSpecialDataTypes.java rename to server/api-service/lowcoder-plugins/mongoPlugin/src/main/java/org/lowcoder/plugin/mongo/constants/MongoSpecialDataTypes.java index 8b532c92a..bc7f6a630 100644 --- a/server/api-service/openblocks-plugins/mongoPlugin/src/main/java/com/openblocks/plugin/mongo/constants/MongoSpecialDataTypes.java +++ b/server/api-service/lowcoder-plugins/mongoPlugin/src/main/java/org/lowcoder/plugin/mongo/constants/MongoSpecialDataTypes.java @@ -14,7 +14,7 @@ * limitations under the License. *

*/ -package com.openblocks.plugin.mongo.constants; +package org.lowcoder.plugin.mongo.constants; import java.util.regex.Pattern; diff --git a/server/api-service/openblocks-plugins/mongoPlugin/src/main/java/com/openblocks/plugin/mongo/model/MongoAuthMechanism.java b/server/api-service/lowcoder-plugins/mongoPlugin/src/main/java/org/lowcoder/plugin/mongo/model/MongoAuthMechanism.java similarity index 87% rename from server/api-service/openblocks-plugins/mongoPlugin/src/main/java/com/openblocks/plugin/mongo/model/MongoAuthMechanism.java rename to server/api-service/lowcoder-plugins/mongoPlugin/src/main/java/org/lowcoder/plugin/mongo/model/MongoAuthMechanism.java index a30fada93..ac8473fc0 100644 --- a/server/api-service/openblocks-plugins/mongoPlugin/src/main/java/com/openblocks/plugin/mongo/model/MongoAuthMechanism.java +++ b/server/api-service/lowcoder-plugins/mongoPlugin/src/main/java/org/lowcoder/plugin/mongo/model/MongoAuthMechanism.java @@ -1,4 +1,4 @@ -package com.openblocks.plugin.mongo.model; +package org.lowcoder.plugin.mongo.model; public enum MongoAuthMechanism { SCRAM_SHA_1("SCRAM-SHA-1"), diff --git a/server/api-service/openblocks-plugins/mongoPlugin/src/main/java/com/openblocks/plugin/mongo/model/MongoConnection.java b/server/api-service/lowcoder-plugins/mongoPlugin/src/main/java/org/lowcoder/plugin/mongo/model/MongoConnection.java similarity index 95% rename from server/api-service/openblocks-plugins/mongoPlugin/src/main/java/com/openblocks/plugin/mongo/model/MongoConnection.java rename to server/api-service/lowcoder-plugins/mongoPlugin/src/main/java/org/lowcoder/plugin/mongo/model/MongoConnection.java index 6043c0cfa..6033dd3ef 100644 --- a/server/api-service/openblocks-plugins/mongoPlugin/src/main/java/com/openblocks/plugin/mongo/model/MongoConnection.java +++ b/server/api-service/lowcoder-plugins/mongoPlugin/src/main/java/org/lowcoder/plugin/mongo/model/MongoConnection.java @@ -1,4 +1,4 @@ -package com.openblocks.plugin.mongo.model; +package org.lowcoder.plugin.mongo.model; import org.bson.Document; diff --git a/server/api-service/openblocks-plugins/mongoPlugin/src/main/java/com/openblocks/plugin/mongo/model/MongoConnectionUriParser.java b/server/api-service/lowcoder-plugins/mongoPlugin/src/main/java/org/lowcoder/plugin/mongo/model/MongoConnectionUriParser.java similarity index 93% rename from server/api-service/openblocks-plugins/mongoPlugin/src/main/java/com/openblocks/plugin/mongo/model/MongoConnectionUriParser.java rename to server/api-service/lowcoder-plugins/mongoPlugin/src/main/java/org/lowcoder/plugin/mongo/model/MongoConnectionUriParser.java index c6e0b5005..424b02392 100644 --- a/server/api-service/openblocks-plugins/mongoPlugin/src/main/java/com/openblocks/plugin/mongo/model/MongoConnectionUriParser.java +++ b/server/api-service/lowcoder-plugins/mongoPlugin/src/main/java/org/lowcoder/plugin/mongo/model/MongoConnectionUriParser.java @@ -1,7 +1,7 @@ -package com.openblocks.plugin.mongo.model; +package org.lowcoder.plugin.mongo.model; -import static com.openblocks.sdk.exception.PluginCommonError.DATASOURCE_ARGUMENT_ERROR; -import static com.openblocks.sdk.util.ExceptionUtils.ofPluginException; +import static org.lowcoder.sdk.exception.PluginCommonError.DATASOURCE_ARGUMENT_ERROR; +import static org.lowcoder.sdk.util.ExceptionUtils.ofPluginException; import java.util.HashMap; import java.util.Map; diff --git a/server/api-service/openblocks-plugins/mongoPlugin/src/main/java/com/openblocks/plugin/mongo/model/MongoDatasourceConfig.java b/server/api-service/lowcoder-plugins/mongoPlugin/src/main/java/org/lowcoder/plugin/mongo/model/MongoDatasourceConfig.java similarity index 87% rename from server/api-service/openblocks-plugins/mongoPlugin/src/main/java/com/openblocks/plugin/mongo/model/MongoDatasourceConfig.java rename to server/api-service/lowcoder-plugins/mongoPlugin/src/main/java/org/lowcoder/plugin/mongo/model/MongoDatasourceConfig.java index 82a906d7a..af5ec2704 100644 --- a/server/api-service/openblocks-plugins/mongoPlugin/src/main/java/com/openblocks/plugin/mongo/model/MongoDatasourceConfig.java +++ b/server/api-service/lowcoder-plugins/mongoPlugin/src/main/java/org/lowcoder/plugin/mongo/model/MongoDatasourceConfig.java @@ -1,12 +1,12 @@ -package com.openblocks.plugin.mongo.model; - -import static com.openblocks.plugin.mongo.model.MongoConnectionUriParser.parseDatabaseFrom; -import static com.openblocks.sdk.exception.BizError.INVALID_DATASOURCE_CONFIG_TYPE; -import static com.openblocks.sdk.util.ExceptionUtils.ofException; -import static com.openblocks.sdk.util.ExceptionUtils.ofPluginException; -import static com.openblocks.sdk.util.JsonUtils.fromJson; -import static com.openblocks.sdk.util.JsonUtils.toJson; +package org.lowcoder.plugin.mongo.model; + import static org.apache.commons.lang3.ObjectUtils.firstNonNull; +import static org.lowcoder.plugin.mongo.model.MongoConnectionUriParser.parseDatabaseFrom; +import static org.lowcoder.sdk.exception.BizError.INVALID_DATASOURCE_CONFIG_TYPE; +import static org.lowcoder.sdk.util.ExceptionUtils.ofException; +import static org.lowcoder.sdk.util.ExceptionUtils.ofPluginException; +import static org.lowcoder.sdk.util.JsonUtils.fromJson; +import static org.lowcoder.sdk.util.JsonUtils.toJson; import java.util.List; import java.util.Map; @@ -14,15 +14,15 @@ import org.apache.commons.collections4.ListUtils; import org.apache.commons.lang3.StringUtils; +import org.lowcoder.sdk.config.SerializeConfig.JsonViews; +import org.lowcoder.sdk.exception.PluginCommonError; +import org.lowcoder.sdk.models.DatasourceConnectionConfig; +import org.lowcoder.sdk.models.Endpoint; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonView; import com.google.common.annotations.VisibleForTesting; -import com.openblocks.sdk.config.SerializeConfig.JsonViews; -import com.openblocks.sdk.exception.PluginCommonError; -import com.openblocks.sdk.models.DatasourceConnectionConfig; -import com.openblocks.sdk.models.Endpoint; import lombok.Builder; import lombok.Getter; diff --git a/server/api-service/openblocks-plugins/mongoPlugin/src/main/java/com/openblocks/plugin/mongo/model/MongoQueryExecutionContext.java b/server/api-service/lowcoder-plugins/mongoPlugin/src/main/java/org/lowcoder/plugin/mongo/model/MongoQueryExecutionContext.java similarity index 77% rename from server/api-service/openblocks-plugins/mongoPlugin/src/main/java/com/openblocks/plugin/mongo/model/MongoQueryExecutionContext.java rename to server/api-service/lowcoder-plugins/mongoPlugin/src/main/java/org/lowcoder/plugin/mongo/model/MongoQueryExecutionContext.java index 6e7024ed4..5cde02ccb 100644 --- a/server/api-service/openblocks-plugins/mongoPlugin/src/main/java/com/openblocks/plugin/mongo/model/MongoQueryExecutionContext.java +++ b/server/api-service/lowcoder-plugins/mongoPlugin/src/main/java/org/lowcoder/plugin/mongo/model/MongoQueryExecutionContext.java @@ -1,8 +1,7 @@ -package com.openblocks.plugin.mongo.model; +package org.lowcoder.plugin.mongo.model; import org.bson.Document; - -import com.openblocks.sdk.query.QueryExecutionContext; +import org.lowcoder.sdk.query.QueryExecutionContext; import lombok.Builder; diff --git a/server/api-service/openblocks-plugins/mongoPlugin/src/main/java/com/openblocks/plugin/mongo/utils/MongoQueryUtils.java b/server/api-service/lowcoder-plugins/mongoPlugin/src/main/java/org/lowcoder/plugin/mongo/utils/MongoQueryUtils.java similarity index 91% rename from server/api-service/openblocks-plugins/mongoPlugin/src/main/java/com/openblocks/plugin/mongo/utils/MongoQueryUtils.java rename to server/api-service/lowcoder-plugins/mongoPlugin/src/main/java/org/lowcoder/plugin/mongo/utils/MongoQueryUtils.java index 8d341ee8d..fb640f18d 100644 --- a/server/api-service/openblocks-plugins/mongoPlugin/src/main/java/com/openblocks/plugin/mongo/utils/MongoQueryUtils.java +++ b/server/api-service/lowcoder-plugins/mongoPlugin/src/main/java/org/lowcoder/plugin/mongo/utils/MongoQueryUtils.java @@ -17,12 +17,12 @@ // copied and adapted for mongo result parsing -package com.openblocks.plugin.mongo.utils; +package org.lowcoder.plugin.mongo.utils; -import static com.openblocks.plugin.mongo.constants.MongoFieldName.COMMAND_TYPE; -import static com.openblocks.sdk.exception.PluginCommonError.QUERY_ARGUMENT_ERROR; -import static com.openblocks.sdk.util.JsonUtils.createObjectNode; -import static com.openblocks.sdk.util.JsonUtils.readTree; +import static org.lowcoder.plugin.mongo.constants.MongoFieldName.COMMAND_TYPE; +import static org.lowcoder.sdk.exception.PluginCommonError.QUERY_ARGUMENT_ERROR; +import static org.lowcoder.sdk.util.JsonUtils.createObjectNode; +import static org.lowcoder.sdk.util.JsonUtils.readTree; import java.math.BigDecimal; import java.net.URLEncoder; @@ -43,21 +43,21 @@ import org.bson.types.ObjectId; import org.json.JSONArray; import org.json.JSONObject; +import org.lowcoder.plugin.mongo.commands.Aggregate; +import org.lowcoder.plugin.mongo.commands.Count; +import org.lowcoder.plugin.mongo.commands.Delete; +import org.lowcoder.plugin.mongo.commands.Distinct; +import org.lowcoder.plugin.mongo.commands.Find; +import org.lowcoder.plugin.mongo.commands.Insert; +import org.lowcoder.plugin.mongo.commands.MongoCommand; +import org.lowcoder.plugin.mongo.commands.UpdateMany; +import org.lowcoder.sdk.exception.PluginException; +import org.lowcoder.sdk.models.DatasourceStructure; import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.node.ArrayNode; import com.fasterxml.jackson.databind.node.ObjectNode; -import com.openblocks.plugin.mongo.commands.Aggregate; -import com.openblocks.plugin.mongo.commands.Count; -import com.openblocks.plugin.mongo.commands.Delete; -import com.openblocks.plugin.mongo.commands.Distinct; -import com.openblocks.plugin.mongo.commands.Find; -import com.openblocks.plugin.mongo.commands.Insert; -import com.openblocks.plugin.mongo.commands.MongoCommand; -import com.openblocks.plugin.mongo.commands.UpdateMany; -import com.openblocks.sdk.exception.PluginException; -import com.openblocks.sdk.models.DatasourceStructure; public class MongoQueryUtils { diff --git a/server/api-service/lowcoder-plugins/mssqlPlugin/plugin.properties b/server/api-service/lowcoder-plugins/mssqlPlugin/plugin.properties new file mode 100644 index 000000000..c4605d1b4 --- /dev/null +++ b/server/api-service/lowcoder-plugins/mssqlPlugin/plugin.properties @@ -0,0 +1,5 @@ +plugin.id=mssql-plugin +plugin.class=org.lowcoder.plugin.mssql.MssqlPlugin +plugin.version=1.0-SNAPSHOT +plugin.provider=service@lowcoder.org +plugin.dependencies= diff --git a/server/api-service/openblocks-plugins/mssqlPlugin/pom.xml b/server/api-service/lowcoder-plugins/mssqlPlugin/pom.xml similarity index 94% rename from server/api-service/openblocks-plugins/mssqlPlugin/pom.xml rename to server/api-service/lowcoder-plugins/mssqlPlugin/pom.xml index 047ef54db..b4b20dd54 100644 --- a/server/api-service/openblocks-plugins/mssqlPlugin/pom.xml +++ b/server/api-service/lowcoder-plugins/mssqlPlugin/pom.xml @@ -3,8 +3,8 @@ - com.openblocks - openblocks-plugins + org.lowcoder + lowcoder-plugins 1.0-SNAPSHOT @@ -20,9 +20,9 @@ ${java.version} ${java.version} mssql-plugin - com.openblocks.plugin.mssql.MssqlPlugin + org.lowcoder.plugin.mssql.MssqlPlugin 1.0-SNAPSHOT - dev@openblocks.dev + service@lowcoder.org @@ -34,7 +34,7 @@ 10.2.1.jre11 - com.openblocks + org.lowcoder sqlBasedPlugin 1.0-SNAPSHOT compile diff --git a/server/api-service/openblocks-plugins/mssqlPlugin/src/main/java/com/openblocks/plugin/mssql/MssqlConnector.java b/server/api-service/lowcoder-plugins/mssqlPlugin/src/main/java/org/lowcoder/plugin/mssql/MssqlConnector.java similarity index 94% rename from server/api-service/openblocks-plugins/mssqlPlugin/src/main/java/com/openblocks/plugin/mssql/MssqlConnector.java rename to server/api-service/lowcoder-plugins/mssqlPlugin/src/main/java/org/lowcoder/plugin/mssql/MssqlConnector.java index c133d5843..ee770f098 100644 --- a/server/api-service/openblocks-plugins/mssqlPlugin/src/main/java/com/openblocks/plugin/mssql/MssqlConnector.java +++ b/server/api-service/lowcoder-plugins/mssqlPlugin/src/main/java/org/lowcoder/plugin/mssql/MssqlConnector.java @@ -1,12 +1,12 @@ -package com.openblocks.plugin.mssql; +package org.lowcoder.plugin.mssql; import static org.apache.commons.lang3.StringUtils.isNotBlank; import org.apache.commons.lang3.StringUtils; +import org.lowcoder.plugin.mssql.model.MssqlDatasourceConfig; +import org.lowcoder.plugin.sql.SqlBasedConnector; import org.pf4j.Extension; -import com.openblocks.plugin.mssql.model.MssqlDatasourceConfig; -import com.openblocks.plugin.sql.SqlBasedConnector; import com.zaxxer.hikari.HikariConfig; @Extension diff --git a/server/api-service/openblocks-plugins/mssqlPlugin/src/main/java/com/openblocks/plugin/mssql/MssqlPlugin.java b/server/api-service/lowcoder-plugins/mssqlPlugin/src/main/java/org/lowcoder/plugin/mssql/MssqlPlugin.java similarity index 82% rename from server/api-service/openblocks-plugins/mssqlPlugin/src/main/java/com/openblocks/plugin/mssql/MssqlPlugin.java rename to server/api-service/lowcoder-plugins/mssqlPlugin/src/main/java/org/lowcoder/plugin/mssql/MssqlPlugin.java index 7259ed5e8..fc3b47d59 100644 --- a/server/api-service/openblocks-plugins/mssqlPlugin/src/main/java/com/openblocks/plugin/mssql/MssqlPlugin.java +++ b/server/api-service/lowcoder-plugins/mssqlPlugin/src/main/java/org/lowcoder/plugin/mssql/MssqlPlugin.java @@ -1,4 +1,4 @@ -package com.openblocks.plugin.mssql; +package org.lowcoder.plugin.mssql; import org.pf4j.Plugin; import org.pf4j.PluginWrapper; diff --git a/server/api-service/openblocks-plugins/mssqlPlugin/src/main/java/com/openblocks/plugin/mssql/MssqlQueryExecutor.java b/server/api-service/lowcoder-plugins/mssqlPlugin/src/main/java/org/lowcoder/plugin/mssql/MssqlQueryExecutor.java similarity index 70% rename from server/api-service/openblocks-plugins/mssqlPlugin/src/main/java/com/openblocks/plugin/mssql/MssqlQueryExecutor.java rename to server/api-service/lowcoder-plugins/mssqlPlugin/src/main/java/org/lowcoder/plugin/mssql/MssqlQueryExecutor.java index cd52c75a6..cd08ab22f 100644 --- a/server/api-service/openblocks-plugins/mssqlPlugin/src/main/java/com/openblocks/plugin/mssql/MssqlQueryExecutor.java +++ b/server/api-service/lowcoder-plugins/mssqlPlugin/src/main/java/org/lowcoder/plugin/mssql/MssqlQueryExecutor.java @@ -1,8 +1,8 @@ -package com.openblocks.plugin.mssql; +package org.lowcoder.plugin.mssql; -import static com.openblocks.plugin.mssql.util.MssqlStructureParser.parseTableAndColumns; -import static com.openblocks.sdk.exception.PluginCommonError.DATASOURCE_GET_STRUCTURE_ERROR; -import static com.openblocks.sdk.exception.PluginCommonError.QUERY_ARGUMENT_ERROR; +import static org.lowcoder.plugin.mssql.util.MssqlStructureParser.parseTableAndColumns; +import static org.lowcoder.sdk.exception.PluginCommonError.DATASOURCE_GET_STRUCTURE_ERROR; +import static org.lowcoder.sdk.exception.PluginCommonError.QUERY_ARGUMENT_ERROR; import java.sql.Connection; import java.sql.ResultSet; @@ -15,22 +15,21 @@ import java.util.List; import java.util.Map; +import org.lowcoder.plugin.mssql.gui.MssqlBulkInsertCommand; +import org.lowcoder.plugin.mssql.gui.MssqlBulkUpdateCommand; +import org.lowcoder.plugin.mssql.gui.MssqlDeleteCommand; +import org.lowcoder.plugin.mssql.gui.MssqlInsertCommand; +import org.lowcoder.plugin.mssql.gui.MssqlUpdateCommand; +import org.lowcoder.plugin.mssql.util.MssqlResultParser; +import org.lowcoder.plugin.sql.GeneralSqlExecutor; +import org.lowcoder.plugin.sql.SqlBasedQueryExecutor; +import org.lowcoder.sdk.exception.PluginException; +import org.lowcoder.sdk.models.DatasourceStructure; +import org.lowcoder.sdk.models.DatasourceStructure.Table; +import org.lowcoder.sdk.plugin.common.sql.SqlBasedDatasourceConnectionConfig; +import org.lowcoder.sdk.plugin.sqlcommand.GuiSqlCommand; import org.pf4j.Extension; -import com.openblocks.plugin.mssql.gui.MssqlBulkInsertCommand; -import com.openblocks.plugin.mssql.gui.MssqlBulkUpdateCommand; -import com.openblocks.plugin.mssql.gui.MssqlDeleteCommand; -import com.openblocks.plugin.mssql.gui.MssqlInsertCommand; -import com.openblocks.plugin.mssql.gui.MssqlUpdateCommand; -import com.openblocks.plugin.mssql.util.MssqlResultParser; -import com.openblocks.plugin.sql.GeneralSqlExecutor; -import com.openblocks.plugin.sql.SqlBasedQueryExecutor; -import com.openblocks.sdk.exception.PluginException; -import com.openblocks.sdk.models.DatasourceStructure; -import com.openblocks.sdk.models.DatasourceStructure.Table; -import com.openblocks.sdk.plugin.common.sql.SqlBasedDatasourceConnectionConfig; -import com.openblocks.sdk.plugin.sqlcommand.GuiSqlCommand; - import lombok.extern.slf4j.Slf4j; @Slf4j diff --git a/server/api-service/openblocks-plugins/mssqlPlugin/src/main/java/com/openblocks/plugin/mssql/gui/GuiConstants.java b/server/api-service/lowcoder-plugins/mssqlPlugin/src/main/java/org/lowcoder/plugin/mssql/gui/GuiConstants.java similarity index 80% rename from server/api-service/openblocks-plugins/mssqlPlugin/src/main/java/com/openblocks/plugin/mssql/gui/GuiConstants.java rename to server/api-service/lowcoder-plugins/mssqlPlugin/src/main/java/org/lowcoder/plugin/mssql/gui/GuiConstants.java index e9f07be4f..3acb5b27e 100644 --- a/server/api-service/openblocks-plugins/mssqlPlugin/src/main/java/com/openblocks/plugin/mssql/gui/GuiConstants.java +++ b/server/api-service/lowcoder-plugins/mssqlPlugin/src/main/java/org/lowcoder/plugin/mssql/gui/GuiConstants.java @@ -1,4 +1,4 @@ -package com.openblocks.plugin.mssql.gui; +package org.lowcoder.plugin.mssql.gui; public final class GuiConstants { diff --git a/server/api-service/openblocks-plugins/mssqlPlugin/src/main/java/com/openblocks/plugin/mssql/gui/MssqlBulkInsertCommand.java b/server/api-service/lowcoder-plugins/mssqlPlugin/src/main/java/org/lowcoder/plugin/mssql/gui/MssqlBulkInsertCommand.java similarity index 55% rename from server/api-service/openblocks-plugins/mssqlPlugin/src/main/java/com/openblocks/plugin/mssql/gui/MssqlBulkInsertCommand.java rename to server/api-service/lowcoder-plugins/mssqlPlugin/src/main/java/org/lowcoder/plugin/mssql/gui/MssqlBulkInsertCommand.java index 6a8300b68..6ef2a577e 100644 --- a/server/api-service/openblocks-plugins/mssqlPlugin/src/main/java/com/openblocks/plugin/mssql/gui/MssqlBulkInsertCommand.java +++ b/server/api-service/lowcoder-plugins/mssqlPlugin/src/main/java/org/lowcoder/plugin/mssql/gui/MssqlBulkInsertCommand.java @@ -1,14 +1,14 @@ -package com.openblocks.plugin.mssql.gui; +package org.lowcoder.plugin.mssql.gui; -import static com.openblocks.plugin.mssql.gui.GuiConstants.MSSQL_COLUMN_DELIMITER_BACK; -import static com.openblocks.plugin.mssql.gui.GuiConstants.MSSQL_COLUMN_DELIMITER_FRONT; -import static com.openblocks.sdk.plugin.sqlcommand.changeset.BulkObjectChangeSet.parseBulkRecords; +import static org.lowcoder.plugin.mssql.gui.GuiConstants.MSSQL_COLUMN_DELIMITER_BACK; +import static org.lowcoder.plugin.mssql.gui.GuiConstants.MSSQL_COLUMN_DELIMITER_FRONT; +import static org.lowcoder.sdk.plugin.sqlcommand.changeset.BulkObjectChangeSet.parseBulkRecords; import java.util.Map; -import com.openblocks.sdk.plugin.sqlcommand.GuiSqlCommand; -import com.openblocks.sdk.plugin.sqlcommand.changeset.BulkObjectChangeSet; -import com.openblocks.sdk.plugin.sqlcommand.command.BulkInsertCommand; +import org.lowcoder.sdk.plugin.sqlcommand.GuiSqlCommand; +import org.lowcoder.sdk.plugin.sqlcommand.changeset.BulkObjectChangeSet; +import org.lowcoder.sdk.plugin.sqlcommand.command.BulkInsertCommand; public class MssqlBulkInsertCommand extends BulkInsertCommand { protected MssqlBulkInsertCommand(String table, BulkObjectChangeSet bulkObjectChangeSet) { diff --git a/server/api-service/openblocks-plugins/mssqlPlugin/src/main/java/com/openblocks/plugin/mssql/gui/MssqlBulkUpdateCommand.java b/server/api-service/lowcoder-plugins/mssqlPlugin/src/main/java/org/lowcoder/plugin/mssql/gui/MssqlBulkUpdateCommand.java similarity index 52% rename from server/api-service/openblocks-plugins/mssqlPlugin/src/main/java/com/openblocks/plugin/mssql/gui/MssqlBulkUpdateCommand.java rename to server/api-service/lowcoder-plugins/mssqlPlugin/src/main/java/org/lowcoder/plugin/mssql/gui/MssqlBulkUpdateCommand.java index 43f853001..d379291c5 100644 --- a/server/api-service/openblocks-plugins/mssqlPlugin/src/main/java/com/openblocks/plugin/mssql/gui/MssqlBulkUpdateCommand.java +++ b/server/api-service/lowcoder-plugins/mssqlPlugin/src/main/java/org/lowcoder/plugin/mssql/gui/MssqlBulkUpdateCommand.java @@ -1,15 +1,15 @@ -package com.openblocks.plugin.mssql.gui; +package org.lowcoder.plugin.mssql.gui; -import static com.openblocks.plugin.mssql.gui.GuiConstants.MSSQL_COLUMN_DELIMITER_BACK; -import static com.openblocks.plugin.mssql.gui.GuiConstants.MSSQL_COLUMN_DELIMITER_FRONT; -import static com.openblocks.sdk.plugin.sqlcommand.GuiSqlCommand.parseTable; -import static com.openblocks.sdk.plugin.sqlcommand.changeset.BulkObjectChangeSet.parseBulkRecords; -import static com.openblocks.sdk.plugin.sqlcommand.changeset.BulkObjectChangeSet.parsePrimaryKey; +import static org.lowcoder.plugin.mssql.gui.GuiConstants.MSSQL_COLUMN_DELIMITER_BACK; +import static org.lowcoder.plugin.mssql.gui.GuiConstants.MSSQL_COLUMN_DELIMITER_FRONT; +import static org.lowcoder.sdk.plugin.sqlcommand.GuiSqlCommand.parseTable; +import static org.lowcoder.sdk.plugin.sqlcommand.changeset.BulkObjectChangeSet.parseBulkRecords; +import static org.lowcoder.sdk.plugin.sqlcommand.changeset.BulkObjectChangeSet.parsePrimaryKey; import java.util.Map; -import com.openblocks.sdk.plugin.sqlcommand.changeset.BulkObjectChangeSet; -import com.openblocks.sdk.plugin.sqlcommand.command.BulkUpdateCommand; +import org.lowcoder.sdk.plugin.sqlcommand.changeset.BulkObjectChangeSet; +import org.lowcoder.sdk.plugin.sqlcommand.command.BulkUpdateCommand; public class MssqlBulkUpdateCommand extends BulkUpdateCommand { diff --git a/server/api-service/openblocks-plugins/mssqlPlugin/src/main/java/com/openblocks/plugin/mssql/gui/MssqlDeleteCommand.java b/server/api-service/lowcoder-plugins/mssqlPlugin/src/main/java/org/lowcoder/plugin/mssql/gui/MssqlDeleteCommand.java similarity index 70% rename from server/api-service/openblocks-plugins/mssqlPlugin/src/main/java/com/openblocks/plugin/mssql/gui/MssqlDeleteCommand.java rename to server/api-service/lowcoder-plugins/mssqlPlugin/src/main/java/org/lowcoder/plugin/mssql/gui/MssqlDeleteCommand.java index da9a267cd..24f38f1ec 100644 --- a/server/api-service/openblocks-plugins/mssqlPlugin/src/main/java/com/openblocks/plugin/mssql/gui/MssqlDeleteCommand.java +++ b/server/api-service/lowcoder-plugins/mssqlPlugin/src/main/java/org/lowcoder/plugin/mssql/gui/MssqlDeleteCommand.java @@ -1,14 +1,14 @@ -package com.openblocks.plugin.mssql.gui; +package org.lowcoder.plugin.mssql.gui; -import static com.openblocks.plugin.mssql.gui.GuiConstants.MSSQL_COLUMN_DELIMITER_BACK; -import static com.openblocks.plugin.mssql.gui.GuiConstants.MSSQL_COLUMN_DELIMITER_FRONT; -import static com.openblocks.sdk.plugin.sqlcommand.filter.FilterSet.parseFilterSet; +import static org.lowcoder.plugin.mssql.gui.GuiConstants.MSSQL_COLUMN_DELIMITER_BACK; +import static org.lowcoder.plugin.mssql.gui.GuiConstants.MSSQL_COLUMN_DELIMITER_FRONT; +import static org.lowcoder.sdk.plugin.sqlcommand.filter.FilterSet.parseFilterSet; import java.util.Map; -import com.openblocks.sdk.plugin.sqlcommand.GuiSqlCommand; -import com.openblocks.sdk.plugin.sqlcommand.command.DeleteCommand; -import com.openblocks.sdk.plugin.sqlcommand.filter.FilterSet; +import org.lowcoder.sdk.plugin.sqlcommand.GuiSqlCommand; +import org.lowcoder.sdk.plugin.sqlcommand.command.DeleteCommand; +import org.lowcoder.sdk.plugin.sqlcommand.filter.FilterSet; public class MssqlDeleteCommand extends DeleteCommand { diff --git a/server/api-service/openblocks-plugins/mssqlPlugin/src/main/java/com/openblocks/plugin/mssql/gui/MssqlInsertCommand.java b/server/api-service/lowcoder-plugins/mssqlPlugin/src/main/java/org/lowcoder/plugin/mssql/gui/MssqlInsertCommand.java similarity index 64% rename from server/api-service/openblocks-plugins/mssqlPlugin/src/main/java/com/openblocks/plugin/mssql/gui/MssqlInsertCommand.java rename to server/api-service/lowcoder-plugins/mssqlPlugin/src/main/java/org/lowcoder/plugin/mssql/gui/MssqlInsertCommand.java index 030744c9d..ae9c7b5a8 100644 --- a/server/api-service/openblocks-plugins/mssqlPlugin/src/main/java/com/openblocks/plugin/mssql/gui/MssqlInsertCommand.java +++ b/server/api-service/lowcoder-plugins/mssqlPlugin/src/main/java/org/lowcoder/plugin/mssql/gui/MssqlInsertCommand.java @@ -1,13 +1,14 @@ -package com.openblocks.plugin.mssql.gui; +package org.lowcoder.plugin.mssql.gui; -import static com.openblocks.plugin.mssql.gui.GuiConstants.MSSQL_COLUMN_DELIMITER_BACK; -import static com.openblocks.plugin.mssql.gui.GuiConstants.MSSQL_COLUMN_DELIMITER_FRONT; +import static org.lowcoder.plugin.mssql.gui.GuiConstants.MSSQL_COLUMN_DELIMITER_BACK; +import static org.lowcoder.plugin.mssql.gui.GuiConstants.MSSQL_COLUMN_DELIMITER_FRONT; import java.util.Map; +import org.lowcoder.sdk.plugin.sqlcommand.changeset.ChangeSet; +import org.lowcoder.sdk.plugin.sqlcommand.command.InsertCommand; + import com.google.common.annotations.VisibleForTesting; -import com.openblocks.sdk.plugin.sqlcommand.changeset.ChangeSet; -import com.openblocks.sdk.plugin.sqlcommand.command.InsertCommand; public class MssqlInsertCommand extends InsertCommand { diff --git a/server/api-service/openblocks-plugins/mssqlPlugin/src/main/java/com/openblocks/plugin/mssql/gui/MssqlUpdateCommand.java b/server/api-service/lowcoder-plugins/mssqlPlugin/src/main/java/org/lowcoder/plugin/mssql/gui/MssqlUpdateCommand.java similarity index 71% rename from server/api-service/openblocks-plugins/mssqlPlugin/src/main/java/com/openblocks/plugin/mssql/gui/MssqlUpdateCommand.java rename to server/api-service/lowcoder-plugins/mssqlPlugin/src/main/java/org/lowcoder/plugin/mssql/gui/MssqlUpdateCommand.java index 1ac62c66e..e6073a85c 100644 --- a/server/api-service/openblocks-plugins/mssqlPlugin/src/main/java/com/openblocks/plugin/mssql/gui/MssqlUpdateCommand.java +++ b/server/api-service/lowcoder-plugins/mssqlPlugin/src/main/java/org/lowcoder/plugin/mssql/gui/MssqlUpdateCommand.java @@ -1,14 +1,15 @@ -package com.openblocks.plugin.mssql.gui; +package org.lowcoder.plugin.mssql.gui; -import static com.openblocks.plugin.mssql.gui.GuiConstants.MSSQL_COLUMN_DELIMITER_BACK; -import static com.openblocks.plugin.mssql.gui.GuiConstants.MSSQL_COLUMN_DELIMITER_FRONT; +import static org.lowcoder.plugin.mssql.gui.GuiConstants.MSSQL_COLUMN_DELIMITER_BACK; +import static org.lowcoder.plugin.mssql.gui.GuiConstants.MSSQL_COLUMN_DELIMITER_FRONT; import java.util.Map; +import org.lowcoder.sdk.plugin.sqlcommand.changeset.ChangeSet; +import org.lowcoder.sdk.plugin.sqlcommand.command.UpdateCommand; +import org.lowcoder.sdk.plugin.sqlcommand.filter.FilterSet; + import com.google.common.annotations.VisibleForTesting; -import com.openblocks.sdk.plugin.sqlcommand.changeset.ChangeSet; -import com.openblocks.sdk.plugin.sqlcommand.command.UpdateCommand; -import com.openblocks.sdk.plugin.sqlcommand.filter.FilterSet; public class MssqlUpdateCommand extends UpdateCommand { diff --git a/server/api-service/openblocks-plugins/mssqlPlugin/src/main/java/com/openblocks/plugin/mssql/model/MssqlDatasourceConfig.java b/server/api-service/lowcoder-plugins/mssqlPlugin/src/main/java/org/lowcoder/plugin/mssql/model/MssqlDatasourceConfig.java similarity index 74% rename from server/api-service/openblocks-plugins/mssqlPlugin/src/main/java/com/openblocks/plugin/mssql/model/MssqlDatasourceConfig.java rename to server/api-service/lowcoder-plugins/mssqlPlugin/src/main/java/org/lowcoder/plugin/mssql/model/MssqlDatasourceConfig.java index 1da5ebe8b..6ee603f98 100644 --- a/server/api-service/openblocks-plugins/mssqlPlugin/src/main/java/com/openblocks/plugin/mssql/model/MssqlDatasourceConfig.java +++ b/server/api-service/lowcoder-plugins/mssqlPlugin/src/main/java/org/lowcoder/plugin/mssql/model/MssqlDatasourceConfig.java @@ -1,13 +1,13 @@ -package com.openblocks.plugin.mssql.model; +package org.lowcoder.plugin.mssql.model; -import static com.openblocks.sdk.util.ExceptionUtils.ofPluginException; -import static com.openblocks.sdk.util.JsonUtils.fromJson; -import static com.openblocks.sdk.util.JsonUtils.toJson; +import static org.lowcoder.sdk.util.ExceptionUtils.ofPluginException; +import static org.lowcoder.sdk.util.JsonUtils.fromJson; +import static org.lowcoder.sdk.util.JsonUtils.toJson; import java.util.Map; -import com.openblocks.sdk.exception.PluginCommonError; -import com.openblocks.sdk.plugin.common.sql.SqlBasedDatasourceConnectionConfig; +import org.lowcoder.sdk.exception.PluginCommonError; +import org.lowcoder.sdk.plugin.common.sql.SqlBasedDatasourceConnectionConfig; import lombok.Builder; import lombok.extern.slf4j.Slf4j; diff --git a/server/api-service/openblocks-plugins/mssqlPlugin/src/main/java/com/openblocks/plugin/mssql/model/MssqlQueryConfig.java b/server/api-service/lowcoder-plugins/mssqlPlugin/src/main/java/org/lowcoder/plugin/mssql/model/MssqlQueryConfig.java similarity index 84% rename from server/api-service/openblocks-plugins/mssqlPlugin/src/main/java/com/openblocks/plugin/mssql/model/MssqlQueryConfig.java rename to server/api-service/lowcoder-plugins/mssqlPlugin/src/main/java/org/lowcoder/plugin/mssql/model/MssqlQueryConfig.java index e6d2f0e32..d3862f4c1 100644 --- a/server/api-service/openblocks-plugins/mssqlPlugin/src/main/java/com/openblocks/plugin/mssql/model/MssqlQueryConfig.java +++ b/server/api-service/lowcoder-plugins/mssqlPlugin/src/main/java/org/lowcoder/plugin/mssql/model/MssqlQueryConfig.java @@ -1,16 +1,16 @@ -package com.openblocks.plugin.mssql.model; +package org.lowcoder.plugin.mssql.model; -import static com.openblocks.sdk.exception.PluginCommonError.INVALID_QUERY_SETTINGS; -import static com.openblocks.sdk.util.JsonUtils.fromJson; -import static com.openblocks.sdk.util.JsonUtils.toJson; +import static org.lowcoder.sdk.exception.PluginCommonError.INVALID_QUERY_SETTINGS; +import static org.lowcoder.sdk.util.JsonUtils.fromJson; +import static org.lowcoder.sdk.util.JsonUtils.toJson; import java.util.Map; import org.apache.commons.collections4.MapUtils; +import org.lowcoder.sdk.exception.PluginException; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; -import com.openblocks.sdk.exception.PluginException; import lombok.Getter; diff --git a/server/api-service/openblocks-plugins/mssqlPlugin/src/main/java/com/openblocks/plugin/mssql/util/MssqlResultParser.java b/server/api-service/lowcoder-plugins/mssqlPlugin/src/main/java/org/lowcoder/plugin/mssql/util/MssqlResultParser.java similarity index 93% rename from server/api-service/openblocks-plugins/mssqlPlugin/src/main/java/com/openblocks/plugin/mssql/util/MssqlResultParser.java rename to server/api-service/lowcoder-plugins/mssqlPlugin/src/main/java/org/lowcoder/plugin/mssql/util/MssqlResultParser.java index 352519f3f..21c55a137 100644 --- a/server/api-service/openblocks-plugins/mssqlPlugin/src/main/java/com/openblocks/plugin/mssql/util/MssqlResultParser.java +++ b/server/api-service/lowcoder-plugins/mssqlPlugin/src/main/java/org/lowcoder/plugin/mssql/util/MssqlResultParser.java @@ -1,6 +1,6 @@ -package com.openblocks.plugin.mssql.util; +package org.lowcoder.plugin.mssql.util; -import static com.openblocks.sdk.util.DateTimeUtils.DATE_TIME_FORMAT; +import static org.lowcoder.sdk.util.DateTimeUtils.DATE_TIME_FORMAT; import java.sql.ResultSet; import java.sql.ResultSetMetaData; diff --git a/server/api-service/openblocks-plugins/mssqlPlugin/src/main/java/com/openblocks/plugin/mssql/util/MssqlStructureParser.java b/server/api-service/lowcoder-plugins/mssqlPlugin/src/main/java/org/lowcoder/plugin/mssql/util/MssqlStructureParser.java similarity index 92% rename from server/api-service/openblocks-plugins/mssqlPlugin/src/main/java/com/openblocks/plugin/mssql/util/MssqlStructureParser.java rename to server/api-service/lowcoder-plugins/mssqlPlugin/src/main/java/org/lowcoder/plugin/mssql/util/MssqlStructureParser.java index 9d87479e0..9289b6f1f 100644 --- a/server/api-service/openblocks-plugins/mssqlPlugin/src/main/java/com/openblocks/plugin/mssql/util/MssqlStructureParser.java +++ b/server/api-service/lowcoder-plugins/mssqlPlugin/src/main/java/org/lowcoder/plugin/mssql/util/MssqlStructureParser.java @@ -1,4 +1,4 @@ -package com.openblocks.plugin.mssql.util; +package org.lowcoder.plugin.mssql.util; import java.sql.ResultSet; import java.sql.SQLException; @@ -6,9 +6,9 @@ import java.util.ArrayList; import java.util.Map; -import com.openblocks.sdk.models.DatasourceStructure.Column; -import com.openblocks.sdk.models.DatasourceStructure.Table; -import com.openblocks.sdk.models.DatasourceStructure.TableType; +import org.lowcoder.sdk.models.DatasourceStructure.Column; +import org.lowcoder.sdk.models.DatasourceStructure.Table; +import org.lowcoder.sdk.models.DatasourceStructure.TableType; @SuppressWarnings({"SqlDialectInspection", "SqlNoDataSourceInspection"}) public class MssqlStructureParser { diff --git a/server/api-service/lowcoder-plugins/mysqlPlugin/plugin.properties b/server/api-service/lowcoder-plugins/mysqlPlugin/plugin.properties new file mode 100644 index 000000000..784158662 --- /dev/null +++ b/server/api-service/lowcoder-plugins/mysqlPlugin/plugin.properties @@ -0,0 +1,5 @@ +plugin.id=mysql-plugin +plugin.class=org.lowcoder.plugin.mysql.MysqlPlugin +plugin.version=1.0-SNAPSHOT +plugin.provider=service@lowcoder.org +plugin.dependencies= diff --git a/server/api-service/openblocks-plugins/mysqlPlugin/pom.xml b/server/api-service/lowcoder-plugins/mysqlPlugin/pom.xml similarity index 93% rename from server/api-service/openblocks-plugins/mysqlPlugin/pom.xml rename to server/api-service/lowcoder-plugins/mysqlPlugin/pom.xml index 554c54a95..700751908 100644 --- a/server/api-service/openblocks-plugins/mysqlPlugin/pom.xml +++ b/server/api-service/lowcoder-plugins/mysqlPlugin/pom.xml @@ -3,8 +3,8 @@ - com.openblocks - openblocks-plugins + org.lowcoder + lowcoder-plugins 1.0-SNAPSHOT @@ -20,9 +20,9 @@ ${java.version} ${java.version} mysql-plugin - com.openblocks.plugin.mysql.MysqlPlugin + org.lowcoder.plugin.mysql.MysqlPlugin 1.0-SNAPSHOT - dev@openblocks.dev + service@lowcoder.org @@ -34,7 +34,7 @@ 8.0.30 - com.openblocks + org.lowcoder sqlBasedPlugin 1.0-SNAPSHOT diff --git a/server/api-service/openblocks-plugins/mysqlPlugin/src/main/java/com/openblocks/plugin/mysql/MysqlConnector.java b/server/api-service/lowcoder-plugins/mysqlPlugin/src/main/java/org/lowcoder/plugin/mysql/MysqlConnector.java similarity index 92% rename from server/api-service/openblocks-plugins/mysqlPlugin/src/main/java/com/openblocks/plugin/mysql/MysqlConnector.java rename to server/api-service/lowcoder-plugins/mysqlPlugin/src/main/java/org/lowcoder/plugin/mysql/MysqlConnector.java index 1d5072be3..b73afc319 100644 --- a/server/api-service/openblocks-plugins/mysqlPlugin/src/main/java/com/openblocks/plugin/mysql/MysqlConnector.java +++ b/server/api-service/lowcoder-plugins/mysqlPlugin/src/main/java/org/lowcoder/plugin/mysql/MysqlConnector.java @@ -1,12 +1,12 @@ -package com.openblocks.plugin.mysql; +package org.lowcoder.plugin.mysql; import static org.apache.commons.lang3.StringUtils.isNotBlank; import org.apache.commons.lang3.StringUtils; +import org.lowcoder.plugin.sql.SqlBasedConnector; +import org.lowcoder.sdk.plugin.mysql.MysqlDatasourceConfig; import org.pf4j.Extension; -import com.openblocks.plugin.sql.SqlBasedConnector; -import com.openblocks.sdk.plugin.mysql.MysqlDatasourceConfig; import com.zaxxer.hikari.HikariConfig; @Extension diff --git a/server/api-service/openblocks-plugins/mysqlPlugin/src/main/java/com/openblocks/plugin/mysql/MysqlPlugin.java b/server/api-service/lowcoder-plugins/mysqlPlugin/src/main/java/org/lowcoder/plugin/mysql/MysqlPlugin.java similarity index 83% rename from server/api-service/openblocks-plugins/mysqlPlugin/src/main/java/com/openblocks/plugin/mysql/MysqlPlugin.java rename to server/api-service/lowcoder-plugins/mysqlPlugin/src/main/java/org/lowcoder/plugin/mysql/MysqlPlugin.java index c3f214e12..24012fae1 100644 --- a/server/api-service/openblocks-plugins/mysqlPlugin/src/main/java/com/openblocks/plugin/mysql/MysqlPlugin.java +++ b/server/api-service/lowcoder-plugins/mysqlPlugin/src/main/java/org/lowcoder/plugin/mysql/MysqlPlugin.java @@ -1,4 +1,4 @@ -package com.openblocks.plugin.mysql; +package org.lowcoder.plugin.mysql; import org.pf4j.Plugin; import org.pf4j.PluginWrapper; diff --git a/server/api-service/openblocks-plugins/mysqlPlugin/src/main/java/com/openblocks/plugin/mysql/MysqlQueryExecutor.java b/server/api-service/lowcoder-plugins/mysqlPlugin/src/main/java/org/lowcoder/plugin/mysql/MysqlQueryExecutor.java similarity index 61% rename from server/api-service/openblocks-plugins/mysqlPlugin/src/main/java/com/openblocks/plugin/mysql/MysqlQueryExecutor.java rename to server/api-service/lowcoder-plugins/mysqlPlugin/src/main/java/org/lowcoder/plugin/mysql/MysqlQueryExecutor.java index ef211b4f8..981ecada7 100644 --- a/server/api-service/openblocks-plugins/mysqlPlugin/src/main/java/com/openblocks/plugin/mysql/MysqlQueryExecutor.java +++ b/server/api-service/lowcoder-plugins/mysqlPlugin/src/main/java/org/lowcoder/plugin/mysql/MysqlQueryExecutor.java @@ -1,9 +1,9 @@ -package com.openblocks.plugin.mysql; +package org.lowcoder.plugin.mysql; -import static com.openblocks.plugin.mysql.utils.MysqlStructureParser.parseTableAndColumns; -import static com.openblocks.plugin.mysql.utils.MysqlStructureParser.parseTableKeys; -import static com.openblocks.sdk.exception.PluginCommonError.DATASOURCE_GET_STRUCTURE_ERROR; -import static com.openblocks.sdk.exception.PluginCommonError.QUERY_ARGUMENT_ERROR; +import static org.lowcoder.plugin.mysql.utils.MysqlStructureParser.parseTableAndColumns; +import static org.lowcoder.plugin.mysql.utils.MysqlStructureParser.parseTableKeys; +import static org.lowcoder.sdk.exception.PluginCommonError.DATASOURCE_GET_STRUCTURE_ERROR; +import static org.lowcoder.sdk.exception.PluginCommonError.QUERY_ARGUMENT_ERROR; import java.sql.Connection; import java.sql.SQLException; @@ -15,22 +15,21 @@ import javax.annotation.Nonnull; +import org.lowcoder.plugin.sql.GeneralSqlExecutor; +import org.lowcoder.plugin.sql.SqlBasedQueryExecutor; +import org.lowcoder.sdk.exception.PluginException; +import org.lowcoder.sdk.models.DatasourceStructure; +import org.lowcoder.sdk.models.DatasourceStructure.Table; +import org.lowcoder.sdk.plugin.common.sql.SqlBasedDatasourceConnectionConfig; +import org.lowcoder.sdk.plugin.sqlcommand.GuiSqlCommand; +import org.lowcoder.sdk.plugin.sqlcommand.command.mysql.MysqlBulkInsertCommand; +import org.lowcoder.sdk.plugin.sqlcommand.command.mysql.MysqlBulkUpdateCommand; +import org.lowcoder.sdk.plugin.sqlcommand.command.mysql.MysqlDeleteCommand; +import org.lowcoder.sdk.plugin.sqlcommand.command.mysql.MysqlInsertCommand; +import org.lowcoder.sdk.plugin.sqlcommand.command.mysql.MysqlUpdateCommand; +import org.lowcoder.sdk.plugin.sqlcommand.command.mysql.MysqlUpsertCommand; import org.pf4j.Extension; -import com.openblocks.plugin.sql.GeneralSqlExecutor; -import com.openblocks.plugin.sql.SqlBasedQueryExecutor; -import com.openblocks.sdk.exception.PluginException; -import com.openblocks.sdk.models.DatasourceStructure; -import com.openblocks.sdk.models.DatasourceStructure.Table; -import com.openblocks.sdk.plugin.common.sql.SqlBasedDatasourceConnectionConfig; -import com.openblocks.sdk.plugin.sqlcommand.GuiSqlCommand; -import com.openblocks.sdk.plugin.sqlcommand.command.mysql.MysqlBulkInsertCommand; -import com.openblocks.sdk.plugin.sqlcommand.command.mysql.MysqlBulkUpdateCommand; -import com.openblocks.sdk.plugin.sqlcommand.command.mysql.MysqlDeleteCommand; -import com.openblocks.sdk.plugin.sqlcommand.command.mysql.MysqlInsertCommand; -import com.openblocks.sdk.plugin.sqlcommand.command.mysql.MysqlUpdateCommand; -import com.openblocks.sdk.plugin.sqlcommand.command.mysql.MysqlUpsertCommand; - import lombok.extern.slf4j.Slf4j; @Slf4j diff --git a/server/api-service/openblocks-plugins/mysqlPlugin/src/main/java/com/openblocks/plugin/mysql/model/MysqlQueryConfig.java b/server/api-service/lowcoder-plugins/mysqlPlugin/src/main/java/org/lowcoder/plugin/mysql/model/MysqlQueryConfig.java similarity index 84% rename from server/api-service/openblocks-plugins/mysqlPlugin/src/main/java/com/openblocks/plugin/mysql/model/MysqlQueryConfig.java rename to server/api-service/lowcoder-plugins/mysqlPlugin/src/main/java/org/lowcoder/plugin/mysql/model/MysqlQueryConfig.java index 7b469125a..01245d9b5 100644 --- a/server/api-service/openblocks-plugins/mysqlPlugin/src/main/java/com/openblocks/plugin/mysql/model/MysqlQueryConfig.java +++ b/server/api-service/lowcoder-plugins/mysqlPlugin/src/main/java/org/lowcoder/plugin/mysql/model/MysqlQueryConfig.java @@ -1,16 +1,16 @@ -package com.openblocks.plugin.mysql.model; +package org.lowcoder.plugin.mysql.model; -import static com.openblocks.sdk.exception.PluginCommonError.INVALID_QUERY_SETTINGS; -import static com.openblocks.sdk.util.JsonUtils.fromJson; -import static com.openblocks.sdk.util.JsonUtils.toJson; +import static org.lowcoder.sdk.exception.PluginCommonError.INVALID_QUERY_SETTINGS; +import static org.lowcoder.sdk.util.JsonUtils.fromJson; +import static org.lowcoder.sdk.util.JsonUtils.toJson; import java.util.Map; import org.apache.commons.collections4.MapUtils; +import org.lowcoder.sdk.exception.PluginException; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; -import com.openblocks.sdk.exception.PluginException; import lombok.Getter; diff --git a/server/api-service/openblocks-plugins/mysqlPlugin/src/main/java/com/openblocks/plugin/mysql/utils/MysqlResultParser.java b/server/api-service/lowcoder-plugins/mysqlPlugin/src/main/java/org/lowcoder/plugin/mysql/utils/MysqlResultParser.java similarity index 79% rename from server/api-service/openblocks-plugins/mysqlPlugin/src/main/java/com/openblocks/plugin/mysql/utils/MysqlResultParser.java rename to server/api-service/lowcoder-plugins/mysqlPlugin/src/main/java/org/lowcoder/plugin/mysql/utils/MysqlResultParser.java index e969c0dce..150586c7a 100644 --- a/server/api-service/openblocks-plugins/mysqlPlugin/src/main/java/com/openblocks/plugin/mysql/utils/MysqlResultParser.java +++ b/server/api-service/lowcoder-plugins/mysqlPlugin/src/main/java/org/lowcoder/plugin/mysql/utils/MysqlResultParser.java @@ -1,9 +1,9 @@ -package com.openblocks.plugin.mysql.utils; +package org.lowcoder.plugin.mysql.utils; -import static com.openblocks.plugin.mysql.utils.MysqlStructureParser.DATETIME_COLUMN_TYPE_NAME; -import static com.openblocks.plugin.mysql.utils.MysqlStructureParser.DATE_COLUMN_TYPE_NAME; -import static com.openblocks.plugin.mysql.utils.MysqlStructureParser.TIMESTAMP_COLUMN_TYPE_NAME; -import static com.openblocks.sdk.util.DateTimeUtils.DATE_TIME_FORMAT; +import static org.lowcoder.plugin.mysql.utils.MysqlStructureParser.DATETIME_COLUMN_TYPE_NAME; +import static org.lowcoder.plugin.mysql.utils.MysqlStructureParser.DATE_COLUMN_TYPE_NAME; +import static org.lowcoder.plugin.mysql.utils.MysqlStructureParser.TIMESTAMP_COLUMN_TYPE_NAME; +import static org.lowcoder.sdk.util.DateTimeUtils.DATE_TIME_FORMAT; import java.sql.ResultSet; import java.sql.ResultSetMetaData; diff --git a/server/api-service/openblocks-plugins/mysqlPlugin/src/main/java/com/openblocks/plugin/mysql/utils/MysqlStructureParser.java b/server/api-service/lowcoder-plugins/mysqlPlugin/src/main/java/org/lowcoder/plugin/mysql/utils/MysqlStructureParser.java similarity index 95% rename from server/api-service/openblocks-plugins/mysqlPlugin/src/main/java/com/openblocks/plugin/mysql/utils/MysqlStructureParser.java rename to server/api-service/lowcoder-plugins/mysqlPlugin/src/main/java/org/lowcoder/plugin/mysql/utils/MysqlStructureParser.java index 1cd0d120b..a52ab0e80 100644 --- a/server/api-service/openblocks-plugins/mysqlPlugin/src/main/java/com/openblocks/plugin/mysql/utils/MysqlStructureParser.java +++ b/server/api-service/lowcoder-plugins/mysqlPlugin/src/main/java/org/lowcoder/plugin/mysql/utils/MysqlStructureParser.java @@ -1,4 +1,4 @@ -package com.openblocks.plugin.mysql.utils; +package org.lowcoder.plugin.mysql.utils; import java.sql.ResultSet; import java.sql.SQLException; @@ -7,12 +7,12 @@ import java.util.HashMap; import java.util.Map; -import com.openblocks.sdk.models.DatasourceStructure.Column; -import com.openblocks.sdk.models.DatasourceStructure.ForeignKey; -import com.openblocks.sdk.models.DatasourceStructure.Key; -import com.openblocks.sdk.models.DatasourceStructure.PrimaryKey; -import com.openblocks.sdk.models.DatasourceStructure.Table; -import com.openblocks.sdk.models.DatasourceStructure.TableType; +import org.lowcoder.sdk.models.DatasourceStructure.Column; +import org.lowcoder.sdk.models.DatasourceStructure.ForeignKey; +import org.lowcoder.sdk.models.DatasourceStructure.Key; +import org.lowcoder.sdk.models.DatasourceStructure.PrimaryKey; +import org.lowcoder.sdk.models.DatasourceStructure.Table; +import org.lowcoder.sdk.models.DatasourceStructure.TableType; @SuppressWarnings({"SqlDialectInspection", "SqlNoDataSourceInspection"}) public class MysqlStructureParser { diff --git a/server/api-service/openblocks-plugins/mysqlPlugin/src/main/resources/locale.properties b/server/api-service/lowcoder-plugins/mysqlPlugin/src/main/resources/locale.properties similarity index 100% rename from server/api-service/openblocks-plugins/mysqlPlugin/src/main/resources/locale.properties rename to server/api-service/lowcoder-plugins/mysqlPlugin/src/main/resources/locale.properties diff --git a/server/api-service/openblocks-plugins/mysqlPlugin/src/main/resources/locale_en.properties b/server/api-service/lowcoder-plugins/mysqlPlugin/src/main/resources/locale_en.properties similarity index 100% rename from server/api-service/openblocks-plugins/mysqlPlugin/src/main/resources/locale_en.properties rename to server/api-service/lowcoder-plugins/mysqlPlugin/src/main/resources/locale_en.properties diff --git a/server/api-service/lowcoder-plugins/oraclePlugin/plugin.properties b/server/api-service/lowcoder-plugins/oraclePlugin/plugin.properties new file mode 100644 index 000000000..37036e1a7 --- /dev/null +++ b/server/api-service/lowcoder-plugins/oraclePlugin/plugin.properties @@ -0,0 +1,5 @@ +plugin.id=oracle-plugin +plugin.class=org.lowcoder.plugin.oracle.OraclePlugin +plugin.version=1.0-SNAPSHOT +plugin.provider=service@lowcoder.org +plugin.dependencies= diff --git a/server/api-service/openblocks-plugins/oraclePlugin/pom.xml b/server/api-service/lowcoder-plugins/oraclePlugin/pom.xml similarity index 92% rename from server/api-service/openblocks-plugins/oraclePlugin/pom.xml rename to server/api-service/lowcoder-plugins/oraclePlugin/pom.xml index 1de0d22f8..be8c35fcb 100644 --- a/server/api-service/openblocks-plugins/oraclePlugin/pom.xml +++ b/server/api-service/lowcoder-plugins/oraclePlugin/pom.xml @@ -3,8 +3,8 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - openblocks-plugins - com.openblocks + lowcoder-plugins + org.lowcoder 1.0-SNAPSHOT 4.0.0 @@ -17,9 +17,9 @@ 17 oracle-plugin - com.openblocks.plugin.oracle.OraclePlugin + org.lowcoder.plugin.oracle.OraclePlugin 1.0-SNAPSHOT - dev@openblocks.dev + service@lowcoder.org @@ -37,7 +37,7 @@ test - com.openblocks + org.lowcoder sqlBasedPlugin 1.0-SNAPSHOT @@ -96,4 +96,4 @@ - \ No newline at end of file + diff --git a/server/api-service/openblocks-plugins/oraclePlugin/src/main/java/com/openblocks/plugin/oracle/OracleConnector.java b/server/api-service/lowcoder-plugins/oraclePlugin/src/main/java/org/lowcoder/plugin/oracle/OracleConnector.java similarity index 91% rename from server/api-service/openblocks-plugins/oraclePlugin/src/main/java/com/openblocks/plugin/oracle/OracleConnector.java rename to server/api-service/lowcoder-plugins/oraclePlugin/src/main/java/org/lowcoder/plugin/oracle/OracleConnector.java index 7fd1dec1c..4e3c1cbc9 100644 --- a/server/api-service/openblocks-plugins/oraclePlugin/src/main/java/com/openblocks/plugin/oracle/OracleConnector.java +++ b/server/api-service/lowcoder-plugins/oraclePlugin/src/main/java/org/lowcoder/plugin/oracle/OracleConnector.java @@ -1,4 +1,4 @@ -package com.openblocks.plugin.oracle; +package org.lowcoder.plugin.oracle; import static org.apache.commons.lang3.StringUtils.isAllBlank; import static org.apache.commons.lang3.StringUtils.isBlank; @@ -7,10 +7,10 @@ import java.util.Set; import org.apache.commons.lang3.StringUtils; +import org.lowcoder.plugin.oracle.model.OracleDatasourceConfig; +import org.lowcoder.plugin.sql.SqlBasedConnector; import org.pf4j.Extension; -import com.openblocks.plugin.oracle.model.OracleDatasourceConfig; -import com.openblocks.plugin.sql.SqlBasedConnector; import com.zaxxer.hikari.HikariConfig; @Extension diff --git a/server/api-service/openblocks-plugins/oraclePlugin/src/main/java/com/openblocks/plugin/oracle/OraclePlugin.java b/server/api-service/lowcoder-plugins/oraclePlugin/src/main/java/org/lowcoder/plugin/oracle/OraclePlugin.java similarity index 82% rename from server/api-service/openblocks-plugins/oraclePlugin/src/main/java/com/openblocks/plugin/oracle/OraclePlugin.java rename to server/api-service/lowcoder-plugins/oraclePlugin/src/main/java/org/lowcoder/plugin/oracle/OraclePlugin.java index 378271f96..f89c7af3b 100644 --- a/server/api-service/openblocks-plugins/oraclePlugin/src/main/java/com/openblocks/plugin/oracle/OraclePlugin.java +++ b/server/api-service/lowcoder-plugins/oraclePlugin/src/main/java/org/lowcoder/plugin/oracle/OraclePlugin.java @@ -1,4 +1,4 @@ -package com.openblocks.plugin.oracle; +package org.lowcoder.plugin.oracle; import org.pf4j.Plugin; import org.pf4j.PluginWrapper; diff --git a/server/api-service/openblocks-plugins/oraclePlugin/src/main/java/com/openblocks/plugin/oracle/OracleQueryExecutor.java b/server/api-service/lowcoder-plugins/oraclePlugin/src/main/java/org/lowcoder/plugin/oracle/OracleQueryExecutor.java similarity index 60% rename from server/api-service/openblocks-plugins/oraclePlugin/src/main/java/com/openblocks/plugin/oracle/OracleQueryExecutor.java rename to server/api-service/lowcoder-plugins/oraclePlugin/src/main/java/org/lowcoder/plugin/oracle/OracleQueryExecutor.java index 364fc6e48..7876029ee 100644 --- a/server/api-service/openblocks-plugins/oraclePlugin/src/main/java/com/openblocks/plugin/oracle/OracleQueryExecutor.java +++ b/server/api-service/lowcoder-plugins/oraclePlugin/src/main/java/org/lowcoder/plugin/oracle/OracleQueryExecutor.java @@ -1,8 +1,8 @@ -package com.openblocks.plugin.oracle; +package org.lowcoder.plugin.oracle; -import static com.openblocks.sdk.exception.PluginCommonError.DATASOURCE_GET_STRUCTURE_ERROR; -import static com.openblocks.sdk.exception.PluginCommonError.QUERY_ARGUMENT_ERROR; -import static com.openblocks.sdk.plugin.common.sql.StructureParser.QUERY_STRUCTURE_SQL; +import static org.lowcoder.sdk.exception.PluginCommonError.DATASOURCE_GET_STRUCTURE_ERROR; +import static org.lowcoder.sdk.exception.PluginCommonError.QUERY_ARGUMENT_ERROR; +import static org.lowcoder.sdk.plugin.common.sql.StructureParser.QUERY_STRUCTURE_SQL; import java.sql.Connection; import java.sql.ResultSet; @@ -13,22 +13,21 @@ import javax.annotation.Nonnull; +import org.lowcoder.plugin.oracle.gui.OracleBulkInsertCommand; +import org.lowcoder.plugin.oracle.gui.OracleBulkUpdateCommand; +import org.lowcoder.plugin.oracle.gui.OracleDeleteCommand; +import org.lowcoder.plugin.oracle.gui.OracleInsertCommand; +import org.lowcoder.plugin.oracle.gui.OracleUpdateCommand; +import org.lowcoder.plugin.sql.GeneralSqlExecutor; +import org.lowcoder.plugin.sql.SqlBasedQueryExecutor; +import org.lowcoder.sdk.exception.PluginException; +import org.lowcoder.sdk.models.DatasourceStructure; +import org.lowcoder.sdk.models.DatasourceStructure.Table; +import org.lowcoder.sdk.plugin.common.sql.SqlBasedDatasourceConnectionConfig; +import org.lowcoder.sdk.plugin.common.sql.StructureParser; +import org.lowcoder.sdk.plugin.sqlcommand.GuiSqlCommand; import org.pf4j.Extension; -import com.openblocks.plugin.oracle.gui.OracleBulkInsertCommand; -import com.openblocks.plugin.oracle.gui.OracleBulkUpdateCommand; -import com.openblocks.plugin.oracle.gui.OracleDeleteCommand; -import com.openblocks.plugin.oracle.gui.OracleInsertCommand; -import com.openblocks.plugin.oracle.gui.OracleUpdateCommand; -import com.openblocks.plugin.sql.GeneralSqlExecutor; -import com.openblocks.plugin.sql.SqlBasedQueryExecutor; -import com.openblocks.sdk.exception.PluginException; -import com.openblocks.sdk.models.DatasourceStructure; -import com.openblocks.sdk.models.DatasourceStructure.Table; -import com.openblocks.sdk.plugin.common.sql.SqlBasedDatasourceConnectionConfig; -import com.openblocks.sdk.plugin.common.sql.StructureParser; -import com.openblocks.sdk.plugin.sqlcommand.GuiSqlCommand; - import lombok.extern.slf4j.Slf4j; @Slf4j diff --git a/server/api-service/openblocks-plugins/oraclePlugin/src/main/java/com/openblocks/plugin/oracle/gui/GuiConstants.java b/server/api-service/lowcoder-plugins/oraclePlugin/src/main/java/org/lowcoder/plugin/oracle/gui/GuiConstants.java similarity index 70% rename from server/api-service/openblocks-plugins/oraclePlugin/src/main/java/com/openblocks/plugin/oracle/gui/GuiConstants.java rename to server/api-service/lowcoder-plugins/oraclePlugin/src/main/java/org/lowcoder/plugin/oracle/gui/GuiConstants.java index 64d2dbf64..5fcc4bb21 100644 --- a/server/api-service/openblocks-plugins/oraclePlugin/src/main/java/com/openblocks/plugin/oracle/gui/GuiConstants.java +++ b/server/api-service/lowcoder-plugins/oraclePlugin/src/main/java/org/lowcoder/plugin/oracle/gui/GuiConstants.java @@ -1,4 +1,4 @@ -package com.openblocks.plugin.oracle.gui; +package org.lowcoder.plugin.oracle.gui; public final class GuiConstants { diff --git a/server/api-service/openblocks-plugins/oraclePlugin/src/main/java/com/openblocks/plugin/oracle/gui/OracleBulkInsertCommand.java b/server/api-service/lowcoder-plugins/oraclePlugin/src/main/java/org/lowcoder/plugin/oracle/gui/OracleBulkInsertCommand.java similarity index 59% rename from server/api-service/openblocks-plugins/oraclePlugin/src/main/java/com/openblocks/plugin/oracle/gui/OracleBulkInsertCommand.java rename to server/api-service/lowcoder-plugins/oraclePlugin/src/main/java/org/lowcoder/plugin/oracle/gui/OracleBulkInsertCommand.java index 809f36d6a..841af670f 100644 --- a/server/api-service/openblocks-plugins/oraclePlugin/src/main/java/com/openblocks/plugin/oracle/gui/OracleBulkInsertCommand.java +++ b/server/api-service/lowcoder-plugins/oraclePlugin/src/main/java/org/lowcoder/plugin/oracle/gui/OracleBulkInsertCommand.java @@ -1,13 +1,13 @@ -package com.openblocks.plugin.oracle.gui; +package org.lowcoder.plugin.oracle.gui; -import static com.openblocks.plugin.oracle.gui.GuiConstants.COLUMN_DELIMITER_FRONT; -import static com.openblocks.sdk.plugin.sqlcommand.changeset.BulkObjectChangeSet.parseBulkRecords; +import static org.lowcoder.plugin.oracle.gui.GuiConstants.COLUMN_DELIMITER_FRONT; +import static org.lowcoder.sdk.plugin.sqlcommand.changeset.BulkObjectChangeSet.parseBulkRecords; import java.util.Map; -import com.openblocks.sdk.plugin.sqlcommand.GuiSqlCommand; -import com.openblocks.sdk.plugin.sqlcommand.changeset.BulkObjectChangeSet; -import com.openblocks.sdk.plugin.sqlcommand.command.BulkInsertCommand; +import org.lowcoder.sdk.plugin.sqlcommand.GuiSqlCommand; +import org.lowcoder.sdk.plugin.sqlcommand.changeset.BulkObjectChangeSet; +import org.lowcoder.sdk.plugin.sqlcommand.command.BulkInsertCommand; public class OracleBulkInsertCommand extends BulkInsertCommand { protected OracleBulkInsertCommand(String table, BulkObjectChangeSet bulkObjectChangeSet) { diff --git a/server/api-service/openblocks-plugins/oraclePlugin/src/main/java/com/openblocks/plugin/oracle/gui/OracleBulkUpdateCommand.java b/server/api-service/lowcoder-plugins/oraclePlugin/src/main/java/org/lowcoder/plugin/oracle/gui/OracleBulkUpdateCommand.java similarity index 55% rename from server/api-service/openblocks-plugins/oraclePlugin/src/main/java/com/openblocks/plugin/oracle/gui/OracleBulkUpdateCommand.java rename to server/api-service/lowcoder-plugins/oraclePlugin/src/main/java/org/lowcoder/plugin/oracle/gui/OracleBulkUpdateCommand.java index c2dfb0756..7a3482991 100644 --- a/server/api-service/openblocks-plugins/oraclePlugin/src/main/java/com/openblocks/plugin/oracle/gui/OracleBulkUpdateCommand.java +++ b/server/api-service/lowcoder-plugins/oraclePlugin/src/main/java/org/lowcoder/plugin/oracle/gui/OracleBulkUpdateCommand.java @@ -1,14 +1,14 @@ -package com.openblocks.plugin.oracle.gui; +package org.lowcoder.plugin.oracle.gui; -import static com.openblocks.plugin.oracle.gui.GuiConstants.COLUMN_DELIMITER_FRONT; -import static com.openblocks.sdk.plugin.sqlcommand.GuiSqlCommand.parseTable; -import static com.openblocks.sdk.plugin.sqlcommand.changeset.BulkObjectChangeSet.parseBulkRecords; -import static com.openblocks.sdk.plugin.sqlcommand.changeset.BulkObjectChangeSet.parsePrimaryKey; +import static org.lowcoder.plugin.oracle.gui.GuiConstants.COLUMN_DELIMITER_FRONT; +import static org.lowcoder.sdk.plugin.sqlcommand.GuiSqlCommand.parseTable; +import static org.lowcoder.sdk.plugin.sqlcommand.changeset.BulkObjectChangeSet.parseBulkRecords; +import static org.lowcoder.sdk.plugin.sqlcommand.changeset.BulkObjectChangeSet.parsePrimaryKey; import java.util.Map; -import com.openblocks.sdk.plugin.sqlcommand.changeset.BulkObjectChangeSet; -import com.openblocks.sdk.plugin.sqlcommand.command.BulkUpdateCommand; +import org.lowcoder.sdk.plugin.sqlcommand.changeset.BulkObjectChangeSet; +import org.lowcoder.sdk.plugin.sqlcommand.command.BulkUpdateCommand; public class OracleBulkUpdateCommand extends BulkUpdateCommand { diff --git a/server/api-service/openblocks-plugins/oraclePlugin/src/main/java/com/openblocks/plugin/oracle/gui/OracleDeleteCommand.java b/server/api-service/lowcoder-plugins/oraclePlugin/src/main/java/org/lowcoder/plugin/oracle/gui/OracleDeleteCommand.java similarity index 67% rename from server/api-service/openblocks-plugins/oraclePlugin/src/main/java/com/openblocks/plugin/oracle/gui/OracleDeleteCommand.java rename to server/api-service/lowcoder-plugins/oraclePlugin/src/main/java/org/lowcoder/plugin/oracle/gui/OracleDeleteCommand.java index 156f7cc42..b56d21943 100644 --- a/server/api-service/openblocks-plugins/oraclePlugin/src/main/java/com/openblocks/plugin/oracle/gui/OracleDeleteCommand.java +++ b/server/api-service/lowcoder-plugins/oraclePlugin/src/main/java/org/lowcoder/plugin/oracle/gui/OracleDeleteCommand.java @@ -1,14 +1,14 @@ -package com.openblocks.plugin.oracle.gui; +package org.lowcoder.plugin.oracle.gui; -import static com.openblocks.plugin.oracle.gui.GuiConstants.COLUMN_DELIMITER_FRONT; -import static com.openblocks.sdk.plugin.sqlcommand.filter.FilterSet.parseFilterSet; +import static org.lowcoder.plugin.oracle.gui.GuiConstants.COLUMN_DELIMITER_FRONT; +import static org.lowcoder.sdk.plugin.sqlcommand.filter.FilterSet.parseFilterSet; import java.util.Map; -import com.openblocks.sdk.plugin.sqlcommand.GuiSqlCommand; -import com.openblocks.sdk.plugin.sqlcommand.command.DeleteCommand; -import com.openblocks.sdk.plugin.sqlcommand.filter.FilterSet; -import com.openblocks.sdk.plugin.sqlcommand.filter.FilterSet.RawFilterCondition; +import org.lowcoder.sdk.plugin.sqlcommand.GuiSqlCommand; +import org.lowcoder.sdk.plugin.sqlcommand.command.DeleteCommand; +import org.lowcoder.sdk.plugin.sqlcommand.filter.FilterSet; +import org.lowcoder.sdk.plugin.sqlcommand.filter.FilterSet.RawFilterCondition; public class OracleDeleteCommand extends DeleteCommand { diff --git a/server/api-service/openblocks-plugins/oraclePlugin/src/main/java/com/openblocks/plugin/oracle/gui/OracleInsertCommand.java b/server/api-service/lowcoder-plugins/oraclePlugin/src/main/java/org/lowcoder/plugin/oracle/gui/OracleInsertCommand.java similarity index 69% rename from server/api-service/openblocks-plugins/oraclePlugin/src/main/java/com/openblocks/plugin/oracle/gui/OracleInsertCommand.java rename to server/api-service/lowcoder-plugins/oraclePlugin/src/main/java/org/lowcoder/plugin/oracle/gui/OracleInsertCommand.java index 05a604d6f..4d110f1d2 100644 --- a/server/api-service/openblocks-plugins/oraclePlugin/src/main/java/com/openblocks/plugin/oracle/gui/OracleInsertCommand.java +++ b/server/api-service/lowcoder-plugins/oraclePlugin/src/main/java/org/lowcoder/plugin/oracle/gui/OracleInsertCommand.java @@ -1,12 +1,13 @@ -package com.openblocks.plugin.oracle.gui; +package org.lowcoder.plugin.oracle.gui; -import static com.openblocks.plugin.oracle.gui.GuiConstants.COLUMN_DELIMITER_FRONT; +import static org.lowcoder.plugin.oracle.gui.GuiConstants.COLUMN_DELIMITER_FRONT; import java.util.Map; +import org.lowcoder.sdk.plugin.sqlcommand.changeset.ChangeSet; +import org.lowcoder.sdk.plugin.sqlcommand.command.InsertCommand; + import com.google.common.annotations.VisibleForTesting; -import com.openblocks.sdk.plugin.sqlcommand.changeset.ChangeSet; -import com.openblocks.sdk.plugin.sqlcommand.command.InsertCommand; public class OracleInsertCommand extends InsertCommand { diff --git a/server/api-service/openblocks-plugins/oraclePlugin/src/main/java/com/openblocks/plugin/oracle/gui/OracleUpdateCommand.java b/server/api-service/lowcoder-plugins/oraclePlugin/src/main/java/org/lowcoder/plugin/oracle/gui/OracleUpdateCommand.java similarity index 72% rename from server/api-service/openblocks-plugins/oraclePlugin/src/main/java/com/openblocks/plugin/oracle/gui/OracleUpdateCommand.java rename to server/api-service/lowcoder-plugins/oraclePlugin/src/main/java/org/lowcoder/plugin/oracle/gui/OracleUpdateCommand.java index 83644df37..e56c1f64f 100644 --- a/server/api-service/openblocks-plugins/oraclePlugin/src/main/java/com/openblocks/plugin/oracle/gui/OracleUpdateCommand.java +++ b/server/api-service/lowcoder-plugins/oraclePlugin/src/main/java/org/lowcoder/plugin/oracle/gui/OracleUpdateCommand.java @@ -1,14 +1,15 @@ -package com.openblocks.plugin.oracle.gui; +package org.lowcoder.plugin.oracle.gui; -import static com.openblocks.plugin.oracle.gui.GuiConstants.COLUMN_DELIMITER_FRONT; +import static org.lowcoder.plugin.oracle.gui.GuiConstants.COLUMN_DELIMITER_FRONT; import java.util.Map; +import org.lowcoder.sdk.plugin.sqlcommand.changeset.ChangeSet; +import org.lowcoder.sdk.plugin.sqlcommand.command.UpdateCommand; +import org.lowcoder.sdk.plugin.sqlcommand.filter.FilterSet; +import org.lowcoder.sdk.plugin.sqlcommand.filter.FilterSet.RawFilterCondition; + import com.google.common.annotations.VisibleForTesting; -import com.openblocks.sdk.plugin.sqlcommand.changeset.ChangeSet; -import com.openblocks.sdk.plugin.sqlcommand.command.UpdateCommand; -import com.openblocks.sdk.plugin.sqlcommand.filter.FilterSet; -import com.openblocks.sdk.plugin.sqlcommand.filter.FilterSet.RawFilterCondition; public class OracleUpdateCommand extends UpdateCommand { diff --git a/server/api-service/openblocks-plugins/oraclePlugin/src/main/java/com/openblocks/plugin/oracle/model/OracleDatasourceConfig.java b/server/api-service/lowcoder-plugins/oraclePlugin/src/main/java/org/lowcoder/plugin/oracle/model/OracleDatasourceConfig.java similarity index 88% rename from server/api-service/openblocks-plugins/oraclePlugin/src/main/java/com/openblocks/plugin/oracle/model/OracleDatasourceConfig.java rename to server/api-service/lowcoder-plugins/oraclePlugin/src/main/java/org/lowcoder/plugin/oracle/model/OracleDatasourceConfig.java index 1f49fe476..47cac4c18 100644 --- a/server/api-service/openblocks-plugins/oraclePlugin/src/main/java/com/openblocks/plugin/oracle/model/OracleDatasourceConfig.java +++ b/server/api-service/lowcoder-plugins/oraclePlugin/src/main/java/org/lowcoder/plugin/oracle/model/OracleDatasourceConfig.java @@ -1,16 +1,16 @@ -package com.openblocks.plugin.oracle.model; +package org.lowcoder.plugin.oracle.model; -import static com.openblocks.sdk.exception.BizError.INVALID_DATASOURCE_CONFIG_TYPE; -import static com.openblocks.sdk.util.ExceptionUtils.ofException; +import static org.lowcoder.sdk.exception.BizError.INVALID_DATASOURCE_CONFIG_TYPE; +import static org.lowcoder.sdk.util.ExceptionUtils.ofException; import java.util.Map; import org.apache.commons.lang3.ObjectUtils; import org.apache.commons.lang3.StringUtils; +import org.lowcoder.sdk.models.DatasourceConnectionConfig; +import org.lowcoder.sdk.plugin.common.sql.SqlBasedDatasourceConnectionConfig; import com.fasterxml.jackson.annotation.JsonCreator; -import com.openblocks.sdk.models.DatasourceConnectionConfig; -import com.openblocks.sdk.plugin.common.sql.SqlBasedDatasourceConnectionConfig; import lombok.experimental.SuperBuilder; diff --git a/server/api-service/openblocks-plugins/pom.xml b/server/api-service/lowcoder-plugins/pom.xml similarity index 90% rename from server/api-service/openblocks-plugins/pom.xml rename to server/api-service/lowcoder-plugins/pom.xml index eda882377..1eba89dab 100644 --- a/server/api-service/openblocks-plugins/pom.xml +++ b/server/api-service/lowcoder-plugins/pom.xml @@ -3,14 +3,14 @@ xmlns="http://maven.apache.org/POM/4.0.0" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - com.openblocks - openblocks-root + org.lowcoder + lowcoder-root 1.0-SNAPSHOT 4.0.0 - openblocks-plugins - openblocks-plugins + lowcoder-plugins + lowcoder-plugins 1.0-SNAPSHOT pom @@ -34,8 +34,8 @@ - com.openblocks - openblocks-sdk + org.lowcoder + lowcoder-sdk 1.0-SNAPSHOT provided @@ -84,7 +84,7 @@ restApiPlugin mongoPlugin mysqlPlugin - openblocksApiPlugin + lowcoderApiPlugin elasticSearchPlugin redisPlugin mssqlPlugin @@ -96,4 +96,4 @@ sqlBasedPlugin snowflakePlugin - \ No newline at end of file + diff --git a/server/api-service/lowcoder-plugins/postgresPlugin/plugin.properties b/server/api-service/lowcoder-plugins/postgresPlugin/plugin.properties new file mode 100644 index 000000000..ae27ca539 --- /dev/null +++ b/server/api-service/lowcoder-plugins/postgresPlugin/plugin.properties @@ -0,0 +1,5 @@ +plugin.id=postgres-plugin +plugin.class=org.lowcoder.plugin.postgres.PostgresPlugin +plugin.version=1.0-SNAPSHOT +plugin.provider=service@lowcoder.org +plugin.dependencies= diff --git a/server/api-service/openblocks-plugins/postgresPlugin/pom.xml b/server/api-service/lowcoder-plugins/postgresPlugin/pom.xml similarity index 93% rename from server/api-service/openblocks-plugins/postgresPlugin/pom.xml rename to server/api-service/lowcoder-plugins/postgresPlugin/pom.xml index ada30241f..1df28a7ae 100644 --- a/server/api-service/openblocks-plugins/postgresPlugin/pom.xml +++ b/server/api-service/lowcoder-plugins/postgresPlugin/pom.xml @@ -4,8 +4,8 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - com.openblocks - openblocks-plugins + org.lowcoder + lowcoder-plugins 1.0-SNAPSHOT @@ -21,9 +21,9 @@ ${java.version} ${java.version} postgres-plugin - com.openblocks.plugin.postgres.PostgresPlugin + org.lowcoder.plugin.postgres.PostgresPlugin 1.0-SNAPSHOT - dev@openblocks.dev + service@lowcoder.org @@ -36,7 +36,7 @@ - com.openblocks + org.lowcoder sqlBasedPlugin 1.0-SNAPSHOT diff --git a/server/api-service/openblocks-plugins/postgresPlugin/src/main/java/com/openblocks/plugin/postgres/PostgresConnector.java b/server/api-service/lowcoder-plugins/postgresPlugin/src/main/java/org/lowcoder/plugin/postgres/PostgresConnector.java similarity index 91% rename from server/api-service/openblocks-plugins/postgresPlugin/src/main/java/com/openblocks/plugin/postgres/PostgresConnector.java rename to server/api-service/lowcoder-plugins/postgresPlugin/src/main/java/org/lowcoder/plugin/postgres/PostgresConnector.java index e7a2a57dc..20a54f5e4 100644 --- a/server/api-service/openblocks-plugins/postgresPlugin/src/main/java/com/openblocks/plugin/postgres/PostgresConnector.java +++ b/server/api-service/lowcoder-plugins/postgresPlugin/src/main/java/org/lowcoder/plugin/postgres/PostgresConnector.java @@ -1,12 +1,12 @@ -package com.openblocks.plugin.postgres; +package org.lowcoder.plugin.postgres; import static org.apache.commons.lang3.StringUtils.isNotBlank; import org.apache.commons.lang3.StringUtils; +import org.lowcoder.plugin.postgres.model.PostgresDatasourceConfig; +import org.lowcoder.plugin.sql.SqlBasedConnector; import org.pf4j.Extension; -import com.openblocks.plugin.postgres.model.PostgresDatasourceConfig; -import com.openblocks.plugin.sql.SqlBasedConnector; import com.zaxxer.hikari.HikariConfig; @Extension diff --git a/server/api-service/openblocks-plugins/postgresPlugin/src/main/java/com/openblocks/plugin/postgres/PostgresExecutor.java b/server/api-service/lowcoder-plugins/postgresPlugin/src/main/java/org/lowcoder/plugin/postgres/PostgresExecutor.java similarity index 73% rename from server/api-service/openblocks-plugins/postgresPlugin/src/main/java/com/openblocks/plugin/postgres/PostgresExecutor.java rename to server/api-service/lowcoder-plugins/postgresPlugin/src/main/java/org/lowcoder/plugin/postgres/PostgresExecutor.java index 056c1915e..5917b69b4 100644 --- a/server/api-service/openblocks-plugins/postgresPlugin/src/main/java/com/openblocks/plugin/postgres/PostgresExecutor.java +++ b/server/api-service/lowcoder-plugins/postgresPlugin/src/main/java/org/lowcoder/plugin/postgres/PostgresExecutor.java @@ -1,13 +1,13 @@ -package com.openblocks.plugin.postgres; +package org.lowcoder.plugin.postgres; import static com.google.common.collect.Lists.newArrayList; -import static com.openblocks.plugin.postgres.utils.PostgresDataTypeUtils.castValueWithTargetType; -import static com.openblocks.plugin.postgres.utils.PostgresDataTypeUtils.extractExplicitCasting; -import static com.openblocks.plugin.postgres.utils.PostgresResultParser.parseDatabaseStructure; -import static com.openblocks.sdk.exception.PluginCommonError.QUERY_ARGUMENT_ERROR; -import static com.openblocks.sdk.exception.PluginCommonError.QUERY_EXECUTION_ERROR; -import static com.openblocks.sdk.util.MustacheHelper.doPrepareStatement; -import static com.openblocks.sdk.util.MustacheHelper.extractMustacheKeysInOrder; +import static org.lowcoder.plugin.postgres.utils.PostgresDataTypeUtils.castValueWithTargetType; +import static org.lowcoder.plugin.postgres.utils.PostgresDataTypeUtils.extractExplicitCasting; +import static org.lowcoder.plugin.postgres.utils.PostgresResultParser.parseDatabaseStructure; +import static org.lowcoder.sdk.exception.PluginCommonError.QUERY_ARGUMENT_ERROR; +import static org.lowcoder.sdk.exception.PluginCommonError.QUERY_EXECUTION_ERROR; +import static org.lowcoder.sdk.util.MustacheHelper.doPrepareStatement; +import static org.lowcoder.sdk.util.MustacheHelper.extractMustacheKeysInOrder; import java.sql.Connection; import java.sql.ResultSet; @@ -20,22 +20,22 @@ import java.util.List; import java.util.Map; +import org.lowcoder.plugin.postgres.model.DataType; +import org.lowcoder.plugin.postgres.utils.PostgresResultParser; +import org.lowcoder.plugin.sql.GeneralSqlExecutor; +import org.lowcoder.plugin.sql.SqlBasedQueryExecutor; +import org.lowcoder.sdk.exception.PluginException; +import org.lowcoder.sdk.models.DatasourceStructure; +import org.lowcoder.sdk.plugin.common.sql.SqlBasedDatasourceConnectionConfig; +import org.lowcoder.sdk.plugin.sqlcommand.GuiSqlCommand; +import org.lowcoder.sdk.plugin.sqlcommand.command.postgres.PostgresBulkInsertCommand; +import org.lowcoder.sdk.plugin.sqlcommand.command.postgres.PostgresBulkUpdateCommand; +import org.lowcoder.sdk.plugin.sqlcommand.command.postgres.PostgresDeleteCommand; +import org.lowcoder.sdk.plugin.sqlcommand.command.postgres.PostgresInsertCommand; +import org.lowcoder.sdk.plugin.sqlcommand.command.postgres.PostgresUpdateCommand; import org.pf4j.Extension; import com.fasterxml.jackson.core.JsonProcessingException; -import com.openblocks.plugin.postgres.model.DataType; -import com.openblocks.plugin.postgres.utils.PostgresResultParser; -import com.openblocks.plugin.sql.GeneralSqlExecutor; -import com.openblocks.plugin.sql.SqlBasedQueryExecutor; -import com.openblocks.sdk.exception.PluginException; -import com.openblocks.sdk.models.DatasourceStructure; -import com.openblocks.sdk.plugin.common.sql.SqlBasedDatasourceConnectionConfig; -import com.openblocks.sdk.plugin.sqlcommand.GuiSqlCommand; -import com.openblocks.sdk.plugin.sqlcommand.command.postgres.PostgresBulkInsertCommand; -import com.openblocks.sdk.plugin.sqlcommand.command.postgres.PostgresBulkUpdateCommand; -import com.openblocks.sdk.plugin.sqlcommand.command.postgres.PostgresDeleteCommand; -import com.openblocks.sdk.plugin.sqlcommand.command.postgres.PostgresInsertCommand; -import com.openblocks.sdk.plugin.sqlcommand.command.postgres.PostgresUpdateCommand; import lombok.extern.slf4j.Slf4j; diff --git a/server/api-service/openblocks-plugins/postgresPlugin/src/main/java/com/openblocks/plugin/postgres/PostgresPlugin.java b/server/api-service/lowcoder-plugins/postgresPlugin/src/main/java/org/lowcoder/plugin/postgres/PostgresPlugin.java similarity index 85% rename from server/api-service/openblocks-plugins/postgresPlugin/src/main/java/com/openblocks/plugin/postgres/PostgresPlugin.java rename to server/api-service/lowcoder-plugins/postgresPlugin/src/main/java/org/lowcoder/plugin/postgres/PostgresPlugin.java index 66fe966e3..f06c90f6f 100644 --- a/server/api-service/openblocks-plugins/postgresPlugin/src/main/java/com/openblocks/plugin/postgres/PostgresPlugin.java +++ b/server/api-service/lowcoder-plugins/postgresPlugin/src/main/java/org/lowcoder/plugin/postgres/PostgresPlugin.java @@ -1,4 +1,4 @@ -package com.openblocks.plugin.postgres; +package org.lowcoder.plugin.postgres; import org.pf4j.Plugin; import org.pf4j.PluginWrapper; diff --git a/server/api-service/openblocks-plugins/postgresPlugin/src/main/java/com/openblocks/plugin/postgres/model/DataType.java b/server/api-service/lowcoder-plugins/postgresPlugin/src/main/java/org/lowcoder/plugin/postgres/model/DataType.java similarity index 94% rename from server/api-service/openblocks-plugins/postgresPlugin/src/main/java/com/openblocks/plugin/postgres/model/DataType.java rename to server/api-service/lowcoder-plugins/postgresPlugin/src/main/java/org/lowcoder/plugin/postgres/model/DataType.java index 6eb6498c0..f755dd9e3 100644 --- a/server/api-service/openblocks-plugins/postgresPlugin/src/main/java/com/openblocks/plugin/postgres/model/DataType.java +++ b/server/api-service/lowcoder-plugins/postgresPlugin/src/main/java/org/lowcoder/plugin/postgres/model/DataType.java @@ -14,7 +14,7 @@ * limitations under the License. *

*/ -package com.openblocks.plugin.postgres.model; +package org.lowcoder.plugin.postgres.model; public enum DataType { INTEGER, diff --git a/server/api-service/openblocks-plugins/postgresPlugin/src/main/java/com/openblocks/plugin/postgres/model/PostgresDatasourceConfig.java b/server/api-service/lowcoder-plugins/postgresPlugin/src/main/java/org/lowcoder/plugin/postgres/model/PostgresDatasourceConfig.java similarity index 81% rename from server/api-service/openblocks-plugins/postgresPlugin/src/main/java/com/openblocks/plugin/postgres/model/PostgresDatasourceConfig.java rename to server/api-service/lowcoder-plugins/postgresPlugin/src/main/java/org/lowcoder/plugin/postgres/model/PostgresDatasourceConfig.java index b24b4d203..e80c298d4 100644 --- a/server/api-service/openblocks-plugins/postgresPlugin/src/main/java/com/openblocks/plugin/postgres/model/PostgresDatasourceConfig.java +++ b/server/api-service/lowcoder-plugins/postgresPlugin/src/main/java/org/lowcoder/plugin/postgres/model/PostgresDatasourceConfig.java @@ -1,14 +1,15 @@ -package com.openblocks.plugin.postgres.model; +package org.lowcoder.plugin.postgres.model; -import static com.openblocks.sdk.util.ExceptionUtils.ofPluginException; -import static com.openblocks.sdk.util.JsonUtils.fromJson; -import static com.openblocks.sdk.util.JsonUtils.toJson; +import static org.lowcoder.sdk.util.ExceptionUtils.ofPluginException; +import static org.lowcoder.sdk.util.JsonUtils.fromJson; +import static org.lowcoder.sdk.util.JsonUtils.toJson; import java.util.Map; +import org.lowcoder.sdk.exception.PluginCommonError; +import org.lowcoder.sdk.plugin.common.sql.SqlBasedDatasourceConnectionConfig; + import com.google.common.annotations.VisibleForTesting; -import com.openblocks.sdk.exception.PluginCommonError; -import com.openblocks.sdk.plugin.common.sql.SqlBasedDatasourceConnectionConfig; import lombok.Builder; import lombok.extern.slf4j.Slf4j; diff --git a/server/api-service/openblocks-plugins/postgresPlugin/src/main/java/com/openblocks/plugin/postgres/model/PostgresQueryConfig.java b/server/api-service/lowcoder-plugins/postgresPlugin/src/main/java/org/lowcoder/plugin/postgres/model/PostgresQueryConfig.java similarity index 83% rename from server/api-service/openblocks-plugins/postgresPlugin/src/main/java/com/openblocks/plugin/postgres/model/PostgresQueryConfig.java rename to server/api-service/lowcoder-plugins/postgresPlugin/src/main/java/org/lowcoder/plugin/postgres/model/PostgresQueryConfig.java index edee1326c..74a75ba0a 100644 --- a/server/api-service/openblocks-plugins/postgresPlugin/src/main/java/com/openblocks/plugin/postgres/model/PostgresQueryConfig.java +++ b/server/api-service/lowcoder-plugins/postgresPlugin/src/main/java/org/lowcoder/plugin/postgres/model/PostgresQueryConfig.java @@ -1,16 +1,16 @@ -package com.openblocks.plugin.postgres.model; +package org.lowcoder.plugin.postgres.model; -import static com.openblocks.sdk.exception.PluginCommonError.INVALID_QUERY_SETTINGS; -import static com.openblocks.sdk.util.JsonUtils.fromJson; -import static com.openblocks.sdk.util.JsonUtils.toJson; +import static org.lowcoder.sdk.exception.PluginCommonError.INVALID_QUERY_SETTINGS; +import static org.lowcoder.sdk.util.JsonUtils.fromJson; +import static org.lowcoder.sdk.util.JsonUtils.toJson; import java.util.Map; import org.apache.commons.collections4.MapUtils; +import org.lowcoder.sdk.exception.PluginException; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; -import com.openblocks.sdk.exception.PluginException; import lombok.Getter; diff --git a/server/api-service/openblocks-plugins/postgresPlugin/src/main/java/com/openblocks/plugin/postgres/utils/PostgresDataTypeUtils.java b/server/api-service/lowcoder-plugins/postgresPlugin/src/main/java/org/lowcoder/plugin/postgres/utils/PostgresDataTypeUtils.java similarity index 84% rename from server/api-service/openblocks-plugins/postgresPlugin/src/main/java/com/openblocks/plugin/postgres/utils/PostgresDataTypeUtils.java rename to server/api-service/lowcoder-plugins/postgresPlugin/src/main/java/org/lowcoder/plugin/postgres/utils/PostgresDataTypeUtils.java index db9268a7f..7539b77d8 100644 --- a/server/api-service/openblocks-plugins/postgresPlugin/src/main/java/com/openblocks/plugin/postgres/utils/PostgresDataTypeUtils.java +++ b/server/api-service/lowcoder-plugins/postgresPlugin/src/main/java/org/lowcoder/plugin/postgres/utils/PostgresDataTypeUtils.java @@ -15,24 +15,24 @@ *

*/ // copied for postgres data types -package com.openblocks.plugin.postgres.utils; - -import static com.openblocks.plugin.postgres.model.DataType.BOOLEAN; -import static com.openblocks.plugin.postgres.model.DataType.DOUBLE; -import static com.openblocks.plugin.postgres.model.DataType.FLOAT; -import static com.openblocks.plugin.postgres.model.DataType.INTEGER; -import static com.openblocks.plugin.postgres.model.DataType.LONG; -import static com.openblocks.plugin.postgres.model.DataType.STRING; -import static com.openblocks.plugin.postgres.utils.PostgresDataTypeUtils.PostgresDataType.BOOL; -import static com.openblocks.plugin.postgres.utils.PostgresDataTypeUtils.PostgresDataType.DATE; -import static com.openblocks.plugin.postgres.utils.PostgresDataTypeUtils.PostgresDataType.DECIMAL; -import static com.openblocks.plugin.postgres.utils.PostgresDataTypeUtils.PostgresDataType.FLOAT8; -import static com.openblocks.plugin.postgres.utils.PostgresDataTypeUtils.PostgresDataType.INT; -import static com.openblocks.plugin.postgres.utils.PostgresDataTypeUtils.PostgresDataType.INT4; -import static com.openblocks.plugin.postgres.utils.PostgresDataTypeUtils.PostgresDataType.INT8; -import static com.openblocks.plugin.postgres.utils.PostgresDataTypeUtils.PostgresDataType.TEXT; -import static com.openblocks.plugin.postgres.utils.PostgresDataTypeUtils.PostgresDataType.TIME; -import static com.openblocks.plugin.postgres.utils.PostgresDataTypeUtils.PostgresDataType.VARCHAR; +package org.lowcoder.plugin.postgres.utils; + +import static org.lowcoder.plugin.postgres.model.DataType.BOOLEAN; +import static org.lowcoder.plugin.postgres.model.DataType.DOUBLE; +import static org.lowcoder.plugin.postgres.model.DataType.FLOAT; +import static org.lowcoder.plugin.postgres.model.DataType.INTEGER; +import static org.lowcoder.plugin.postgres.model.DataType.LONG; +import static org.lowcoder.plugin.postgres.model.DataType.STRING; +import static org.lowcoder.plugin.postgres.utils.PostgresDataTypeUtils.PostgresDataType.BOOL; +import static org.lowcoder.plugin.postgres.utils.PostgresDataTypeUtils.PostgresDataType.DATE; +import static org.lowcoder.plugin.postgres.utils.PostgresDataTypeUtils.PostgresDataType.DECIMAL; +import static org.lowcoder.plugin.postgres.utils.PostgresDataTypeUtils.PostgresDataType.FLOAT8; +import static org.lowcoder.plugin.postgres.utils.PostgresDataTypeUtils.PostgresDataType.INT; +import static org.lowcoder.plugin.postgres.utils.PostgresDataTypeUtils.PostgresDataType.INT4; +import static org.lowcoder.plugin.postgres.utils.PostgresDataTypeUtils.PostgresDataType.INT8; +import static org.lowcoder.plugin.postgres.utils.PostgresDataTypeUtils.PostgresDataType.TEXT; +import static org.lowcoder.plugin.postgres.utils.PostgresDataTypeUtils.PostgresDataType.TIME; +import static org.lowcoder.plugin.postgres.utils.PostgresDataTypeUtils.PostgresDataType.VARCHAR; import java.lang.reflect.Field; import java.sql.Date; @@ -48,7 +48,7 @@ import java.util.regex.Matcher; import java.util.regex.Pattern; -import com.openblocks.plugin.postgres.model.DataType; +import org.lowcoder.plugin.postgres.model.DataType; public class PostgresDataTypeUtils { diff --git a/server/api-service/openblocks-plugins/postgresPlugin/src/main/java/com/openblocks/plugin/postgres/utils/PostgresResultParser.java b/server/api-service/lowcoder-plugins/postgresPlugin/src/main/java/org/lowcoder/plugin/postgres/utils/PostgresResultParser.java similarity index 97% rename from server/api-service/openblocks-plugins/postgresPlugin/src/main/java/com/openblocks/plugin/postgres/utils/PostgresResultParser.java rename to server/api-service/lowcoder-plugins/postgresPlugin/src/main/java/org/lowcoder/plugin/postgres/utils/PostgresResultParser.java index 30b3db82b..2d72f26c2 100644 --- a/server/api-service/openblocks-plugins/postgresPlugin/src/main/java/com/openblocks/plugin/postgres/utils/PostgresResultParser.java +++ b/server/api-service/lowcoder-plugins/postgresPlugin/src/main/java/org/lowcoder/plugin/postgres/utils/PostgresResultParser.java @@ -15,10 +15,10 @@ *

*/ // copied for postgres result parsing -package com.openblocks.plugin.postgres.utils; +package org.lowcoder.plugin.postgres.utils; -import static com.openblocks.sdk.util.DateTimeUtils.DATE_TIME_FORMAT; -import static com.openblocks.sdk.util.JsonUtils.readTree; +import static org.lowcoder.sdk.util.DateTimeUtils.DATE_TIME_FORMAT; +import static org.lowcoder.sdk.util.JsonUtils.readTree; import java.sql.ResultSet; import java.sql.ResultSetMetaData; @@ -34,11 +34,11 @@ import java.util.stream.Stream; import org.apache.commons.lang3.StringUtils; +import org.lowcoder.sdk.models.DatasourceStructure; +import org.lowcoder.sdk.models.DatasourceStructure.Table; import org.postgresql.util.PGobject; import com.fasterxml.jackson.core.JsonProcessingException; -import com.openblocks.sdk.models.DatasourceStructure; -import com.openblocks.sdk.models.DatasourceStructure.Table; @SuppressWarnings({"SqlNoDataSourceInspection", "SqlDialectInspection"}) public class PostgresResultParser { diff --git a/server/api-service/lowcoder-plugins/redisPlugin/plugin.properties b/server/api-service/lowcoder-plugins/redisPlugin/plugin.properties new file mode 100644 index 000000000..cecd364a8 --- /dev/null +++ b/server/api-service/lowcoder-plugins/redisPlugin/plugin.properties @@ -0,0 +1,5 @@ +plugin.id=redis-plugin +plugin.class=org.lowcoder.plugin.redis.RedisPlugin +plugin.version=1.0-SNAPSHOT +plugin.provider=service@lowcoder.org +plugin.dependencies= diff --git a/server/api-service/openblocks-plugins/redisPlugin/pom.xml b/server/api-service/lowcoder-plugins/redisPlugin/pom.xml similarity index 94% rename from server/api-service/openblocks-plugins/redisPlugin/pom.xml rename to server/api-service/lowcoder-plugins/redisPlugin/pom.xml index 51695b29e..7826f4b13 100644 --- a/server/api-service/openblocks-plugins/redisPlugin/pom.xml +++ b/server/api-service/lowcoder-plugins/redisPlugin/pom.xml @@ -3,8 +3,8 @@ - com.openblocks - openblocks-plugins + org.lowcoder + lowcoder-plugins 1.0-SNAPSHOT @@ -20,9 +20,9 @@ ${java.version} ${java.version} redis-plugin - com.openblocks.plugin.redis.RedisPlugin + org.lowcoder.plugin.redis.RedisPlugin 1.0-SNAPSHOT - dev@openblocks.dev + service@lowcoder.org diff --git a/server/api-service/openblocks-plugins/redisPlugin/src/main/java/com/openblocks/plugin/redis/RedisError.java b/server/api-service/lowcoder-plugins/redisPlugin/src/main/java/org/lowcoder/plugin/redis/RedisError.java similarity index 57% rename from server/api-service/openblocks-plugins/redisPlugin/src/main/java/com/openblocks/plugin/redis/RedisError.java rename to server/api-service/lowcoder-plugins/redisPlugin/src/main/java/org/lowcoder/plugin/redis/RedisError.java index 0cd7abc97..05625b586 100644 --- a/server/api-service/openblocks-plugins/redisPlugin/src/main/java/com/openblocks/plugin/redis/RedisError.java +++ b/server/api-service/lowcoder-plugins/redisPlugin/src/main/java/org/lowcoder/plugin/redis/RedisError.java @@ -1,6 +1,6 @@ -package com.openblocks.plugin.redis; +package org.lowcoder.plugin.redis; -import com.openblocks.sdk.exception.PluginError; +import org.lowcoder.sdk.exception.PluginError; public enum RedisError implements PluginError { diff --git a/server/api-service/openblocks-plugins/redisPlugin/src/main/java/com/openblocks/plugin/redis/RedisPlugin.java b/server/api-service/lowcoder-plugins/redisPlugin/src/main/java/org/lowcoder/plugin/redis/RedisPlugin.java similarity index 86% rename from server/api-service/openblocks-plugins/redisPlugin/src/main/java/com/openblocks/plugin/redis/RedisPlugin.java rename to server/api-service/lowcoder-plugins/redisPlugin/src/main/java/org/lowcoder/plugin/redis/RedisPlugin.java index 77294592e..670ed32d3 100644 --- a/server/api-service/openblocks-plugins/redisPlugin/src/main/java/com/openblocks/plugin/redis/RedisPlugin.java +++ b/server/api-service/lowcoder-plugins/redisPlugin/src/main/java/org/lowcoder/plugin/redis/RedisPlugin.java @@ -14,24 +14,24 @@ * limitations under the License. *

*/ -package com.openblocks.plugin.redis; +package org.lowcoder.plugin.redis; import static com.google.common.collect.Maps.newHashMap; -import static com.openblocks.plugin.redis.RedisError.REDIS_EXECUTION_ERROR; -import static com.openblocks.plugin.redis.RedisError.REDIS_URI_ERROR; -import static com.openblocks.plugin.redis.constants.RedisConstants.JEDIS_POOL_MAX_IDLE; -import static com.openblocks.plugin.redis.constants.RedisConstants.JEDIS_POOL_MAX_TOTAL; -import static com.openblocks.plugin.redis.constants.RedisConstants.JEDIS_POOL_MIN_EVICTABLE_IDLE_MILLIS; -import static com.openblocks.plugin.redis.constants.RedisConstants.JEDIS_POOL_MIN_IDLE; -import static com.openblocks.plugin.redis.constants.RedisConstants.JEDIS_POOL_TIME_BETWEEN_EVICTION_RUNS_MILLIS; -import static com.openblocks.plugin.redis.constants.RedisConstants.TEST_TIMEOUT_MILLIS; -import static com.openblocks.plugin.redis.constants.RedisFieldName.RAW_COMMAND; -import static com.openblocks.plugin.redis.utils.RedisQueryUtils.convertRedisFormInputToRedisCommand; -import static com.openblocks.sdk.exception.PluginCommonError.QUERY_ARGUMENT_ERROR; -import static com.openblocks.sdk.plugin.common.QueryExecutionUtils.getValueSafelyFromFormData; -import static com.openblocks.sdk.util.MustacheHelper.renderMustacheArrayString; -import static com.openblocks.sdk.util.MustacheHelper.renderMustacheStringWithoutRemoveSurroundedPar; import static java.util.Objects.isNull; +import static org.lowcoder.plugin.redis.RedisError.REDIS_EXECUTION_ERROR; +import static org.lowcoder.plugin.redis.RedisError.REDIS_URI_ERROR; +import static org.lowcoder.plugin.redis.constants.RedisConstants.JEDIS_POOL_MAX_IDLE; +import static org.lowcoder.plugin.redis.constants.RedisConstants.JEDIS_POOL_MAX_TOTAL; +import static org.lowcoder.plugin.redis.constants.RedisConstants.JEDIS_POOL_MIN_EVICTABLE_IDLE_MILLIS; +import static org.lowcoder.plugin.redis.constants.RedisConstants.JEDIS_POOL_MIN_IDLE; +import static org.lowcoder.plugin.redis.constants.RedisConstants.JEDIS_POOL_TIME_BETWEEN_EVICTION_RUNS_MILLIS; +import static org.lowcoder.plugin.redis.constants.RedisConstants.TEST_TIMEOUT_MILLIS; +import static org.lowcoder.plugin.redis.constants.RedisFieldName.RAW_COMMAND; +import static org.lowcoder.plugin.redis.utils.RedisQueryUtils.convertRedisFormInputToRedisCommand; +import static org.lowcoder.sdk.exception.PluginCommonError.QUERY_ARGUMENT_ERROR; +import static org.lowcoder.sdk.plugin.common.QueryExecutionUtils.getValueSafelyFromFormData; +import static org.lowcoder.sdk.util.MustacheHelper.renderMustacheArrayString; +import static org.lowcoder.sdk.util.MustacheHelper.renderMustacheStringWithoutRemoveSurroundedPar; import java.net.URI; import java.time.Duration; @@ -49,22 +49,21 @@ import org.apache.commons.lang.StringUtils; import org.apache.commons.lang3.ArrayUtils; +import org.lowcoder.plugin.redis.commands.RedisCommand; +import org.lowcoder.plugin.redis.model.RedisDatasourceConfig; +import org.lowcoder.plugin.redis.model.RedisQueryExecutionContext; +import org.lowcoder.plugin.redis.utils.RedisQueryUtils; +import org.lowcoder.plugin.redis.utils.RedisUriUtils; +import org.lowcoder.sdk.exception.PluginException; +import org.lowcoder.sdk.models.DatasourceTestResult; +import org.lowcoder.sdk.models.QueryExecutionResult; +import org.lowcoder.sdk.plugin.common.DatasourceQueryEngine; +import org.lowcoder.sdk.plugin.common.QueryExecutionUtils; +import org.lowcoder.sdk.query.QueryVisitorContext; import org.pf4j.Extension; import org.pf4j.Plugin; import org.pf4j.PluginWrapper; -import com.openblocks.plugin.redis.commands.RedisCommand; -import com.openblocks.plugin.redis.model.RedisDatasourceConfig; -import com.openblocks.plugin.redis.model.RedisQueryExecutionContext; -import com.openblocks.plugin.redis.utils.RedisQueryUtils; -import com.openblocks.plugin.redis.utils.RedisUriUtils; -import com.openblocks.sdk.exception.PluginException; -import com.openblocks.sdk.models.DatasourceTestResult; -import com.openblocks.sdk.models.QueryExecutionResult; -import com.openblocks.sdk.plugin.common.DatasourceQueryEngine; -import com.openblocks.sdk.plugin.common.QueryExecutionUtils; -import com.openblocks.sdk.query.QueryVisitorContext; - import lombok.extern.slf4j.Slf4j; import reactor.core.publisher.Mono; import reactor.core.scheduler.Scheduler; diff --git a/server/api-service/openblocks-plugins/redisPlugin/src/main/java/com/openblocks/plugin/redis/commands/RedisCommand.java b/server/api-service/lowcoder-plugins/redisPlugin/src/main/java/org/lowcoder/plugin/redis/commands/RedisCommand.java similarity index 87% rename from server/api-service/openblocks-plugins/redisPlugin/src/main/java/com/openblocks/plugin/redis/commands/RedisCommand.java rename to server/api-service/lowcoder-plugins/redisPlugin/src/main/java/org/lowcoder/plugin/redis/commands/RedisCommand.java index cd5ed3f92..a91518b2d 100644 --- a/server/api-service/openblocks-plugins/redisPlugin/src/main/java/com/openblocks/plugin/redis/commands/RedisCommand.java +++ b/server/api-service/lowcoder-plugins/redisPlugin/src/main/java/org/lowcoder/plugin/redis/commands/RedisCommand.java @@ -1,23 +1,23 @@ -package com.openblocks.plugin.redis.commands; - -import static com.openblocks.plugin.redis.constants.RedisFieldName.COMMAND; -import static com.openblocks.plugin.redis.constants.RedisFieldName.COUNT; -import static com.openblocks.plugin.redis.constants.RedisFieldName.DESTINATION; -import static com.openblocks.plugin.redis.constants.RedisFieldName.FIELD; -import static com.openblocks.plugin.redis.constants.RedisFieldName.FIELDS; -import static com.openblocks.plugin.redis.constants.RedisFieldName.INDEX; -import static com.openblocks.plugin.redis.constants.RedisFieldName.KEY; -import static com.openblocks.plugin.redis.constants.RedisFieldName.KEYS; -import static com.openblocks.plugin.redis.constants.RedisFieldName.MAX; -import static com.openblocks.plugin.redis.constants.RedisFieldName.MEMBER; -import static com.openblocks.plugin.redis.constants.RedisFieldName.MIN; -import static com.openblocks.plugin.redis.constants.RedisFieldName.PATTERN; -import static com.openblocks.plugin.redis.constants.RedisFieldName.SCORE; -import static com.openblocks.plugin.redis.constants.RedisFieldName.SOURCE; -import static com.openblocks.plugin.redis.constants.RedisFieldName.START; -import static com.openblocks.plugin.redis.constants.RedisFieldName.STOP; -import static com.openblocks.plugin.redis.constants.RedisFieldName.VALUE; -import static com.openblocks.sdk.plugin.common.QueryExecutionUtils.getStringValueSafelyFromFormData; +package org.lowcoder.plugin.redis.commands; + +import static org.lowcoder.plugin.redis.constants.RedisFieldName.COMMAND; +import static org.lowcoder.plugin.redis.constants.RedisFieldName.COUNT; +import static org.lowcoder.plugin.redis.constants.RedisFieldName.DESTINATION; +import static org.lowcoder.plugin.redis.constants.RedisFieldName.FIELD; +import static org.lowcoder.plugin.redis.constants.RedisFieldName.FIELDS; +import static org.lowcoder.plugin.redis.constants.RedisFieldName.INDEX; +import static org.lowcoder.plugin.redis.constants.RedisFieldName.KEY; +import static org.lowcoder.plugin.redis.constants.RedisFieldName.KEYS; +import static org.lowcoder.plugin.redis.constants.RedisFieldName.MAX; +import static org.lowcoder.plugin.redis.constants.RedisFieldName.MEMBER; +import static org.lowcoder.plugin.redis.constants.RedisFieldName.MIN; +import static org.lowcoder.plugin.redis.constants.RedisFieldName.PATTERN; +import static org.lowcoder.plugin.redis.constants.RedisFieldName.SCORE; +import static org.lowcoder.plugin.redis.constants.RedisFieldName.SOURCE; +import static org.lowcoder.plugin.redis.constants.RedisFieldName.START; +import static org.lowcoder.plugin.redis.constants.RedisFieldName.STOP; +import static org.lowcoder.plugin.redis.constants.RedisFieldName.VALUE; +import static org.lowcoder.sdk.plugin.common.QueryExecutionUtils.getStringValueSafelyFromFormData; import java.util.List; import java.util.Map; diff --git a/server/api-service/openblocks-plugins/redisPlugin/src/main/java/com/openblocks/plugin/redis/constants/RedisConstants.java b/server/api-service/lowcoder-plugins/redisPlugin/src/main/java/org/lowcoder/plugin/redis/constants/RedisConstants.java similarity index 89% rename from server/api-service/openblocks-plugins/redisPlugin/src/main/java/com/openblocks/plugin/redis/constants/RedisConstants.java rename to server/api-service/lowcoder-plugins/redisPlugin/src/main/java/org/lowcoder/plugin/redis/constants/RedisConstants.java index 574637336..86ef2d04a 100644 --- a/server/api-service/openblocks-plugins/redisPlugin/src/main/java/com/openblocks/plugin/redis/constants/RedisConstants.java +++ b/server/api-service/lowcoder-plugins/redisPlugin/src/main/java/org/lowcoder/plugin/redis/constants/RedisConstants.java @@ -1,4 +1,4 @@ -package com.openblocks.plugin.redis.constants; +package org.lowcoder.plugin.redis.constants; public final class RedisConstants { public static final long TEST_TIMEOUT_MILLIS = 2000; diff --git a/server/api-service/openblocks-plugins/redisPlugin/src/main/java/com/openblocks/plugin/redis/constants/RedisFieldName.java b/server/api-service/lowcoder-plugins/redisPlugin/src/main/java/org/lowcoder/plugin/redis/constants/RedisFieldName.java similarity index 96% rename from server/api-service/openblocks-plugins/redisPlugin/src/main/java/com/openblocks/plugin/redis/constants/RedisFieldName.java rename to server/api-service/lowcoder-plugins/redisPlugin/src/main/java/org/lowcoder/plugin/redis/constants/RedisFieldName.java index f70f1055e..9726b4829 100644 --- a/server/api-service/openblocks-plugins/redisPlugin/src/main/java/com/openblocks/plugin/redis/constants/RedisFieldName.java +++ b/server/api-service/lowcoder-plugins/redisPlugin/src/main/java/org/lowcoder/plugin/redis/constants/RedisFieldName.java @@ -1,4 +1,4 @@ -package com.openblocks.plugin.redis.constants; +package org.lowcoder.plugin.redis.constants; public class RedisFieldName { diff --git a/server/api-service/openblocks-plugins/redisPlugin/src/main/java/com/openblocks/plugin/redis/model/RedisDatasourceConfig.java b/server/api-service/lowcoder-plugins/redisPlugin/src/main/java/org/lowcoder/plugin/redis/model/RedisDatasourceConfig.java similarity index 84% rename from server/api-service/openblocks-plugins/redisPlugin/src/main/java/com/openblocks/plugin/redis/model/RedisDatasourceConfig.java rename to server/api-service/lowcoder-plugins/redisPlugin/src/main/java/org/lowcoder/plugin/redis/model/RedisDatasourceConfig.java index 16c2a529c..db6298b35 100644 --- a/server/api-service/openblocks-plugins/redisPlugin/src/main/java/com/openblocks/plugin/redis/model/RedisDatasourceConfig.java +++ b/server/api-service/lowcoder-plugins/redisPlugin/src/main/java/org/lowcoder/plugin/redis/model/RedisDatasourceConfig.java @@ -1,20 +1,21 @@ -package com.openblocks.plugin.redis.model; +package org.lowcoder.plugin.redis.model; -import static com.openblocks.sdk.exception.BizError.INVALID_DATASOURCE_CONFIG_TYPE; -import static com.openblocks.sdk.exception.PluginCommonError.DATASOURCE_ARGUMENT_ERROR; -import static com.openblocks.sdk.util.ExceptionUtils.ofException; -import static com.openblocks.sdk.util.ExceptionUtils.ofPluginException; -import static com.openblocks.sdk.util.JsonUtils.fromJson; -import static com.openblocks.sdk.util.JsonUtils.toJson; import static org.apache.commons.lang3.ObjectUtils.firstNonNull; +import static org.lowcoder.sdk.exception.BizError.INVALID_DATASOURCE_CONFIG_TYPE; +import static org.lowcoder.sdk.exception.PluginCommonError.DATASOURCE_ARGUMENT_ERROR; +import static org.lowcoder.sdk.util.ExceptionUtils.ofException; +import static org.lowcoder.sdk.util.ExceptionUtils.ofPluginException; +import static org.lowcoder.sdk.util.JsonUtils.fromJson; +import static org.lowcoder.sdk.util.JsonUtils.toJson; import java.util.Map; import java.util.function.Function; +import org.lowcoder.sdk.config.SerializeConfig.JsonViews; +import org.lowcoder.sdk.models.DatasourceConnectionConfig; + import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonView; -import com.openblocks.sdk.config.SerializeConfig.JsonViews; -import com.openblocks.sdk.models.DatasourceConnectionConfig; import lombok.Builder; import lombok.Getter; diff --git a/server/api-service/openblocks-plugins/redisPlugin/src/main/java/com/openblocks/plugin/redis/model/RedisQueryExecutionContext.java b/server/api-service/lowcoder-plugins/redisPlugin/src/main/java/org/lowcoder/plugin/redis/model/RedisQueryExecutionContext.java similarity index 71% rename from server/api-service/openblocks-plugins/redisPlugin/src/main/java/com/openblocks/plugin/redis/model/RedisQueryExecutionContext.java rename to server/api-service/lowcoder-plugins/redisPlugin/src/main/java/org/lowcoder/plugin/redis/model/RedisQueryExecutionContext.java index b57064264..c6ae683cf 100644 --- a/server/api-service/openblocks-plugins/redisPlugin/src/main/java/com/openblocks/plugin/redis/model/RedisQueryExecutionContext.java +++ b/server/api-service/lowcoder-plugins/redisPlugin/src/main/java/org/lowcoder/plugin/redis/model/RedisQueryExecutionContext.java @@ -1,6 +1,6 @@ -package com.openblocks.plugin.redis.model; +package org.lowcoder.plugin.redis.model; -import com.openblocks.sdk.query.QueryExecutionContext; +import org.lowcoder.sdk.query.QueryExecutionContext; import lombok.Builder; import lombok.Getter; diff --git a/server/api-service/lowcoder-plugins/redisPlugin/src/main/java/org/lowcoder/plugin/redis/utils/RedisQueryUtils.java b/server/api-service/lowcoder-plugins/redisPlugin/src/main/java/org/lowcoder/plugin/redis/utils/RedisQueryUtils.java new file mode 100644 index 000000000..a097aab44 --- /dev/null +++ b/server/api-service/lowcoder-plugins/redisPlugin/src/main/java/org/lowcoder/plugin/redis/utils/RedisQueryUtils.java @@ -0,0 +1,94 @@ +package org.lowcoder.plugin.redis.utils; + +import static org.lowcoder.plugin.redis.constants.RedisFieldName.COMMAND; +import static org.lowcoder.sdk.exception.PluginCommonError.QUERY_ARGUMENT_ERROR; + +import java.util.Map; + +import org.lowcoder.plugin.redis.commands.RedisCommand; +import org.lowcoder.plugin.redis.commands.RedisCommand.Del; +import org.lowcoder.plugin.redis.commands.RedisCommand.Get; +import org.lowcoder.plugin.redis.commands.RedisCommand.Hdel; +import org.lowcoder.plugin.redis.commands.RedisCommand.Hget; +import org.lowcoder.plugin.redis.commands.RedisCommand.Hgetall; +import org.lowcoder.plugin.redis.commands.RedisCommand.Hkeys; +import org.lowcoder.plugin.redis.commands.RedisCommand.Hlen; +import org.lowcoder.plugin.redis.commands.RedisCommand.Hmget; +import org.lowcoder.plugin.redis.commands.RedisCommand.Hset; +import org.lowcoder.plugin.redis.commands.RedisCommand.Hsetnx; +import org.lowcoder.plugin.redis.commands.RedisCommand.Hvals; +import org.lowcoder.plugin.redis.commands.RedisCommand.Keys; +import org.lowcoder.plugin.redis.commands.RedisCommand.Lindex; +import org.lowcoder.plugin.redis.commands.RedisCommand.Llen; +import org.lowcoder.plugin.redis.commands.RedisCommand.Lpush; +import org.lowcoder.plugin.redis.commands.RedisCommand.Lrange; +import org.lowcoder.plugin.redis.commands.RedisCommand.Lrem; +import org.lowcoder.plugin.redis.commands.RedisCommand.Mget; +import org.lowcoder.plugin.redis.commands.RedisCommand.Rpoplpush; +import org.lowcoder.plugin.redis.commands.RedisCommand.Sadd; +import org.lowcoder.plugin.redis.commands.RedisCommand.Scard; +import org.lowcoder.plugin.redis.commands.RedisCommand.Set; +import org.lowcoder.plugin.redis.commands.RedisCommand.Sismember; +import org.lowcoder.plugin.redis.commands.RedisCommand.Smembers; +import org.lowcoder.plugin.redis.commands.RedisCommand.Srandmember; +import org.lowcoder.plugin.redis.commands.RedisCommand.Srem; +import org.lowcoder.plugin.redis.commands.RedisCommand.Zadd; +import org.lowcoder.plugin.redis.commands.RedisCommand.Zcard; +import org.lowcoder.plugin.redis.commands.RedisCommand.Zcount; +import org.lowcoder.plugin.redis.commands.RedisCommand.Zrange; +import org.lowcoder.plugin.redis.commands.RedisCommand.Zrangebyscore; +import org.lowcoder.plugin.redis.commands.RedisCommand.Zrank; +import org.lowcoder.plugin.redis.commands.RedisCommand.Zrem; +import org.lowcoder.plugin.redis.commands.RedisCommand.Zscore; +import org.lowcoder.sdk.exception.PluginException; + +public class RedisQueryUtils { + + + public static boolean isRawCommand(Map formData) { + String command = (String) formData.getOrDefault(COMMAND, ""); + return "RAW".equalsIgnoreCase(command); + } + + public static RedisCommand convertRedisFormInputToRedisCommand(Map formData) { + String commandType = (String) formData.getOrDefault(COMMAND, ""); + return switch (commandType.toUpperCase()) { + case "SET" -> new Set(formData); + case "GET" -> new Get(formData); + case "DEL" -> new Del(formData); + case "KEYS" -> new Keys(formData); + case "MGET" -> new Mget(formData); + case "HGET" -> new Hget(formData); + case "HMGET" -> new Hmget(formData); + case "HGETALL" -> new Hgetall(formData); + case "HSET" -> new Hset(formData); + case "HSETNX" -> new Hsetnx(formData); + case "HLEN" -> new Hlen(formData); + case "HDEL" -> new Hdel(formData); + case "HKEYS" -> new Hkeys(formData); + case "HVALS" -> new Hvals(formData); + case "LINDEX" -> new Lindex(formData); + case "LLEN" -> new Llen(formData); + case "LPUSH" -> new Lpush(formData); + case "LREM" -> new Lrem(formData); + case "RPOPLPUSH" -> new Rpoplpush(formData); + case "LRANGE" -> new Lrange(formData); + case "SADD" -> new Sadd(formData); + case "SCARD" -> new Scard(formData); + case "SMEMBERS" -> new Smembers(formData); + case "SISMEMBER" -> new Sismember(formData); + case "SRANDMEMBER" -> new Srandmember(formData); + case "SREM" -> new Srem(formData); + case "ZADD" -> new Zadd(formData); + case "ZCARD" -> new Zcard(formData); + case "ZCOUNT" -> new Zcount(formData); + case "ZRANGE" -> new Zrange(formData); + case "ZRANGEBYSCORE" -> new Zrangebyscore(formData); + case "ZRANK" -> new Zrank(formData); + case "ZREM" -> new Zrem(formData); + case "ZSCORE" -> new Zscore(formData); + default -> throw new PluginException(QUERY_ARGUMENT_ERROR, "INVALID_REDIS_REQUEST", commandType); + }; + } + +} diff --git a/server/api-service/openblocks-plugins/redisPlugin/src/main/java/com/openblocks/plugin/redis/utils/RedisUriUtils.java b/server/api-service/lowcoder-plugins/redisPlugin/src/main/java/org/lowcoder/plugin/redis/utils/RedisUriUtils.java similarity index 94% rename from server/api-service/openblocks-plugins/redisPlugin/src/main/java/com/openblocks/plugin/redis/utils/RedisUriUtils.java rename to server/api-service/lowcoder-plugins/redisPlugin/src/main/java/org/lowcoder/plugin/redis/utils/RedisUriUtils.java index 7c008d98d..91d3c62c5 100644 --- a/server/api-service/openblocks-plugins/redisPlugin/src/main/java/com/openblocks/plugin/redis/utils/RedisUriUtils.java +++ b/server/api-service/lowcoder-plugins/redisPlugin/src/main/java/org/lowcoder/plugin/redis/utils/RedisUriUtils.java @@ -1,4 +1,4 @@ -package com.openblocks.plugin.redis.utils; +package org.lowcoder.plugin.redis.utils; import static org.apache.commons.lang3.ObjectUtils.firstNonNull; @@ -6,8 +6,7 @@ import java.net.URISyntaxException; import org.apache.commons.lang3.StringUtils; - -import com.openblocks.plugin.redis.model.RedisDatasourceConfig; +import org.lowcoder.plugin.redis.model.RedisDatasourceConfig; public class RedisUriUtils { private static final Long DEFAULT_PORT = 6379L; diff --git a/server/api-service/lowcoder-plugins/restApiPlugin/plugin.properties b/server/api-service/lowcoder-plugins/restApiPlugin/plugin.properties new file mode 100644 index 000000000..f32ad0211 --- /dev/null +++ b/server/api-service/lowcoder-plugins/restApiPlugin/plugin.properties @@ -0,0 +1,5 @@ +plugin.id=restapi-plugin +plugin.class=org.lowcoder.plugin.restapi.RestApiPlugin +plugin.version=1.0-SNAPSHOT +plugin.provider=service@lowcoder.org +plugin.dependencies= \ No newline at end of file diff --git a/server/api-service/openblocks-plugins/restApiPlugin/pom.xml b/server/api-service/lowcoder-plugins/restApiPlugin/pom.xml similarity index 96% rename from server/api-service/openblocks-plugins/restApiPlugin/pom.xml rename to server/api-service/lowcoder-plugins/restApiPlugin/pom.xml index f67260c11..c50d009d3 100644 --- a/server/api-service/openblocks-plugins/restApiPlugin/pom.xml +++ b/server/api-service/lowcoder-plugins/restApiPlugin/pom.xml @@ -3,8 +3,8 @@ - com.openblocks - openblocks-plugins + org.lowcoder + lowcoder-plugins 1.0-SNAPSHOT @@ -20,9 +20,9 @@ ${java.version} ${java.version} restapi-plugin - com.openblocks.plugin.restapi.RestApiPlugin + org.lowcoder.plugin.restapi.RestApiPlugin 1.0-SNAPSHOT - dev@openblocks.dev + service@lowcoder.org diff --git a/server/api-service/openblocks-plugins/restApiPlugin/src/main/java/com/openblocks/plugin/restapi/RestApiConnector.java b/server/api-service/lowcoder-plugins/restApiPlugin/src/main/java/org/lowcoder/plugin/restapi/RestApiConnector.java similarity index 82% rename from server/api-service/openblocks-plugins/restApiPlugin/src/main/java/com/openblocks/plugin/restapi/RestApiConnector.java rename to server/api-service/lowcoder-plugins/restApiPlugin/src/main/java/org/lowcoder/plugin/restapi/RestApiConnector.java index 9269ead90..8cf21052e 100644 --- a/server/api-service/openblocks-plugins/restApiPlugin/src/main/java/com/openblocks/plugin/restapi/RestApiConnector.java +++ b/server/api-service/lowcoder-plugins/restApiPlugin/src/main/java/org/lowcoder/plugin/restapi/RestApiConnector.java @@ -1,4 +1,4 @@ -package com.openblocks.plugin.restapi; +package org.lowcoder.plugin.restapi; import static java.util.Collections.emptySet; @@ -7,12 +7,11 @@ import javax.annotation.Nonnull; +import org.lowcoder.sdk.models.DatasourceTestResult; +import org.lowcoder.sdk.plugin.common.DatasourceConnector; +import org.lowcoder.sdk.plugin.restapi.RestApiDatasourceConfig; import org.pf4j.Extension; -import com.openblocks.sdk.models.DatasourceTestResult; -import com.openblocks.sdk.plugin.common.DatasourceConnector; -import com.openblocks.sdk.plugin.restapi.RestApiDatasourceConfig; - import reactor.core.publisher.Mono; @Extension diff --git a/server/api-service/openblocks-plugins/restApiPlugin/src/main/java/com/openblocks/plugin/restapi/RestApiError.java b/server/api-service/lowcoder-plugins/restApiPlugin/src/main/java/org/lowcoder/plugin/restapi/RestApiError.java similarity index 53% rename from server/api-service/openblocks-plugins/restApiPlugin/src/main/java/com/openblocks/plugin/restapi/RestApiError.java rename to server/api-service/lowcoder-plugins/restApiPlugin/src/main/java/org/lowcoder/plugin/restapi/RestApiError.java index c26f89511..063b041f9 100644 --- a/server/api-service/openblocks-plugins/restApiPlugin/src/main/java/com/openblocks/plugin/restapi/RestApiError.java +++ b/server/api-service/lowcoder-plugins/restApiPlugin/src/main/java/org/lowcoder/plugin/restapi/RestApiError.java @@ -1,6 +1,6 @@ -package com.openblocks.plugin.restapi; +package org.lowcoder.plugin.restapi; -import com.openblocks.sdk.exception.PluginError; +import org.lowcoder.sdk.exception.PluginError; public enum RestApiError implements PluginError { diff --git a/server/api-service/openblocks-plugins/restApiPlugin/src/main/java/com/openblocks/plugin/restapi/RestApiExecutor.java b/server/api-service/lowcoder-plugins/restApiPlugin/src/main/java/org/lowcoder/plugin/restapi/RestApiExecutor.java similarity index 88% rename from server/api-service/openblocks-plugins/restApiPlugin/src/main/java/com/openblocks/plugin/restapi/RestApiExecutor.java rename to server/api-service/lowcoder-plugins/restApiPlugin/src/main/java/org/lowcoder/plugin/restapi/RestApiExecutor.java index b5e415acb..60bcbe081 100644 --- a/server/api-service/openblocks-plugins/restApiPlugin/src/main/java/com/openblocks/plugin/restapi/RestApiExecutor.java +++ b/server/api-service/lowcoder-plugins/restApiPlugin/src/main/java/org/lowcoder/plugin/restapi/RestApiExecutor.java @@ -17,30 +17,30 @@ // adapted for rest api queries -package com.openblocks.plugin.restapi; +package org.lowcoder.plugin.restapi; import static com.google.common.base.MoreObjects.firstNonNull; -import static com.openblocks.plugin.restapi.RestApiError.REST_API_EXECUTION_ERROR; -import static com.openblocks.plugin.restapi.helpers.ContentTypeHelper.isBinary; -import static com.openblocks.plugin.restapi.helpers.ContentTypeHelper.isJson; -import static com.openblocks.plugin.restapi.helpers.ContentTypeHelper.isJsonContentType; -import static com.openblocks.plugin.restapi.helpers.ContentTypeHelper.isPicture; -import static com.openblocks.plugin.restapi.helpers.ContentTypeHelper.isValidContentType; -import static com.openblocks.plugin.restapi.helpers.ContentTypeHelper.parseContentType; -import static com.openblocks.sdk.exception.PluginCommonError.JSON_PARSE_ERROR; -import static com.openblocks.sdk.exception.PluginCommonError.QUERY_ARGUMENT_ERROR; -import static com.openblocks.sdk.exception.PluginCommonError.QUERY_EXECUTION_ERROR; -import static com.openblocks.sdk.plugin.restapi.DataUtils.convertToMultiformFileValue; -import static com.openblocks.sdk.plugin.restapi.auth.RestApiAuthType.DIGEST_AUTH; -import static com.openblocks.sdk.plugin.restapi.auth.RestApiAuthType.OAUTH2_INHERIT_FROM_LOGIN; -import static com.openblocks.sdk.util.ExceptionUtils.propagateError; -import static com.openblocks.sdk.util.JsonUtils.readTree; -import static com.openblocks.sdk.util.JsonUtils.toJsonThrows; -import static com.openblocks.sdk.util.MustacheHelper.renderMustacheJson; -import static com.openblocks.sdk.util.MustacheHelper.renderMustacheString; -import static com.openblocks.sdk.util.StreamUtils.collectList; import static org.apache.commons.collections4.MapUtils.emptyIfNull; import static org.apache.commons.lang3.StringUtils.trimToEmpty; +import static org.lowcoder.plugin.restapi.RestApiError.REST_API_EXECUTION_ERROR; +import static org.lowcoder.plugin.restapi.helpers.ContentTypeHelper.isBinary; +import static org.lowcoder.plugin.restapi.helpers.ContentTypeHelper.isJson; +import static org.lowcoder.plugin.restapi.helpers.ContentTypeHelper.isJsonContentType; +import static org.lowcoder.plugin.restapi.helpers.ContentTypeHelper.isPicture; +import static org.lowcoder.plugin.restapi.helpers.ContentTypeHelper.isValidContentType; +import static org.lowcoder.plugin.restapi.helpers.ContentTypeHelper.parseContentType; +import static org.lowcoder.sdk.exception.PluginCommonError.JSON_PARSE_ERROR; +import static org.lowcoder.sdk.exception.PluginCommonError.QUERY_ARGUMENT_ERROR; +import static org.lowcoder.sdk.exception.PluginCommonError.QUERY_EXECUTION_ERROR; +import static org.lowcoder.sdk.plugin.restapi.DataUtils.convertToMultiformFileValue; +import static org.lowcoder.sdk.plugin.restapi.auth.RestApiAuthType.DIGEST_AUTH; +import static org.lowcoder.sdk.plugin.restapi.auth.RestApiAuthType.OAUTH2_INHERIT_FROM_LOGIN; +import static org.lowcoder.sdk.util.ExceptionUtils.propagateError; +import static org.lowcoder.sdk.util.JsonUtils.readTree; +import static org.lowcoder.sdk.util.JsonUtils.toJsonThrows; +import static org.lowcoder.sdk.util.MustacheHelper.renderMustacheJson; +import static org.lowcoder.sdk.util.MustacheHelper.renderMustacheString; +import static org.lowcoder.sdk.util.StreamUtils.collectList; import java.io.IOException; import java.net.URI; @@ -64,6 +64,27 @@ import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.tuple.Pair; import org.bson.internal.Base64; +import org.lowcoder.plugin.restapi.constants.ResponseDataType; +import org.lowcoder.plugin.restapi.helpers.AuthHelper; +import org.lowcoder.plugin.restapi.helpers.BufferingFilter; +import org.lowcoder.plugin.restapi.model.QueryBody; +import org.lowcoder.plugin.restapi.model.RestApiQueryConfig; +import org.lowcoder.plugin.restapi.model.RestApiQueryExecutionContext; +import org.lowcoder.sdk.config.CommonConfig; +import org.lowcoder.sdk.exception.PluginException; +import org.lowcoder.sdk.models.Property; +import org.lowcoder.sdk.models.QueryExecutionResult; +import org.lowcoder.sdk.models.RestBodyFormFileData; +import org.lowcoder.sdk.plugin.common.QueryExecutor; +import org.lowcoder.sdk.plugin.common.RestApiUriBuilder; +import org.lowcoder.sdk.plugin.restapi.DataUtils; +import org.lowcoder.sdk.plugin.restapi.MultipartFormData; +import org.lowcoder.sdk.plugin.restapi.RestApiDatasourceConfig; +import org.lowcoder.sdk.plugin.restapi.auth.AuthConfig; +import org.lowcoder.sdk.plugin.restapi.auth.BasicAuthConfig; +import org.lowcoder.sdk.plugin.restapi.auth.RestApiAuthType; +import org.lowcoder.sdk.query.QueryVisitorContext; +import org.lowcoder.sdk.webclient.WebClientBuildHelper; import org.pf4j.Extension; import org.springframework.http.HttpCookie; import org.springframework.http.HttpHeaders; @@ -82,27 +103,6 @@ import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.node.ObjectNode; import com.google.common.collect.ImmutableMap; -import com.openblocks.plugin.restapi.constants.ResponseDataType; -import com.openblocks.plugin.restapi.helpers.AuthHelper; -import com.openblocks.plugin.restapi.helpers.BufferingFilter; -import com.openblocks.plugin.restapi.model.QueryBody; -import com.openblocks.plugin.restapi.model.RestApiQueryConfig; -import com.openblocks.plugin.restapi.model.RestApiQueryExecutionContext; -import com.openblocks.sdk.config.CommonConfig; -import com.openblocks.sdk.exception.PluginException; -import com.openblocks.sdk.models.Property; -import com.openblocks.sdk.models.QueryExecutionResult; -import com.openblocks.sdk.models.RestBodyFormFileData; -import com.openblocks.sdk.plugin.common.QueryExecutor; -import com.openblocks.sdk.plugin.common.RestApiUriBuilder; -import com.openblocks.sdk.plugin.restapi.DataUtils; -import com.openblocks.sdk.plugin.restapi.MultipartFormData; -import com.openblocks.sdk.plugin.restapi.RestApiDatasourceConfig; -import com.openblocks.sdk.plugin.restapi.auth.AuthConfig; -import com.openblocks.sdk.plugin.restapi.auth.BasicAuthConfig; -import com.openblocks.sdk.plugin.restapi.auth.RestApiAuthType; -import com.openblocks.sdk.query.QueryVisitorContext; -import com.openblocks.sdk.webclient.WebClientBuildHelper; import lombok.Builder; import lombok.Getter; diff --git a/server/api-service/openblocks-plugins/restApiPlugin/src/main/java/com/openblocks/plugin/restapi/RestApiPlugin.java b/server/api-service/lowcoder-plugins/restApiPlugin/src/main/java/org/lowcoder/plugin/restapi/RestApiPlugin.java similarity index 82% rename from server/api-service/openblocks-plugins/restApiPlugin/src/main/java/com/openblocks/plugin/restapi/RestApiPlugin.java rename to server/api-service/lowcoder-plugins/restApiPlugin/src/main/java/org/lowcoder/plugin/restapi/RestApiPlugin.java index cbbea2129..c5469eb68 100644 --- a/server/api-service/openblocks-plugins/restApiPlugin/src/main/java/com/openblocks/plugin/restapi/RestApiPlugin.java +++ b/server/api-service/lowcoder-plugins/restApiPlugin/src/main/java/org/lowcoder/plugin/restapi/RestApiPlugin.java @@ -1,4 +1,4 @@ -package com.openblocks.plugin.restapi; +package org.lowcoder.plugin.restapi; import org.pf4j.Plugin; import org.pf4j.PluginWrapper; diff --git a/server/api-service/openblocks-plugins/restApiPlugin/src/main/java/com/openblocks/plugin/restapi/constants/ResponseDataType.java b/server/api-service/lowcoder-plugins/restApiPlugin/src/main/java/org/lowcoder/plugin/restapi/constants/ResponseDataType.java similarity index 60% rename from server/api-service/openblocks-plugins/restApiPlugin/src/main/java/com/openblocks/plugin/restapi/constants/ResponseDataType.java rename to server/api-service/lowcoder-plugins/restApiPlugin/src/main/java/org/lowcoder/plugin/restapi/constants/ResponseDataType.java index 097ac9cf4..9852e2a29 100644 --- a/server/api-service/openblocks-plugins/restApiPlugin/src/main/java/com/openblocks/plugin/restapi/constants/ResponseDataType.java +++ b/server/api-service/lowcoder-plugins/restApiPlugin/src/main/java/org/lowcoder/plugin/restapi/constants/ResponseDataType.java @@ -1,4 +1,4 @@ -package com.openblocks.plugin.restapi.constants; +package org.lowcoder.plugin.restapi.constants; public enum ResponseDataType { BINARY, IMAGE, TEXT, JSON, UNDEFINED diff --git a/server/api-service/openblocks-plugins/restApiPlugin/src/main/java/com/openblocks/plugin/restapi/helpers/AuthHelper.java b/server/api-service/lowcoder-plugins/restApiPlugin/src/main/java/org/lowcoder/plugin/restapi/helpers/AuthHelper.java similarity index 94% rename from server/api-service/openblocks-plugins/restApiPlugin/src/main/java/com/openblocks/plugin/restapi/helpers/AuthHelper.java rename to server/api-service/lowcoder-plugins/restApiPlugin/src/main/java/org/lowcoder/plugin/restapi/helpers/AuthHelper.java index 3c89754db..fdfc550d8 100644 --- a/server/api-service/openblocks-plugins/restApiPlugin/src/main/java/com/openblocks/plugin/restapi/helpers/AuthHelper.java +++ b/server/api-service/lowcoder-plugins/restApiPlugin/src/main/java/org/lowcoder/plugin/restapi/helpers/AuthHelper.java @@ -1,4 +1,4 @@ -package com.openblocks.plugin.restapi.helpers; +package org.lowcoder.plugin.restapi.helpers; import static org.springframework.http.HttpHeaders.WWW_AUTHENTICATE; @@ -6,13 +6,13 @@ import java.util.Optional; import java.util.function.Consumer; +import org.lowcoder.sdk.plugin.restapi.auth.BasicAuthConfig; import org.springframework.http.HttpHeaders; import org.springframework.http.HttpMethod; import org.springframework.http.HttpStatus; import org.springframework.web.reactive.function.client.ClientResponse; import com.google.common.collect.Iterables; -import com.openblocks.sdk.plugin.restapi.auth.BasicAuthConfig; import me.vzhilin.auth.DigestAuthenticator; import me.vzhilin.auth.parser.ChallengeResponse; diff --git a/server/api-service/openblocks-plugins/graphqlPlugin/src/main/java/com/openblocks/plugin/graphql/helpers/BufferingFilter.java b/server/api-service/lowcoder-plugins/restApiPlugin/src/main/java/org/lowcoder/plugin/restapi/helpers/BufferingFilter.java similarity index 97% rename from server/api-service/openblocks-plugins/graphqlPlugin/src/main/java/com/openblocks/plugin/graphql/helpers/BufferingFilter.java rename to server/api-service/lowcoder-plugins/restApiPlugin/src/main/java/org/lowcoder/plugin/restapi/helpers/BufferingFilter.java index df820388f..2d5a512c7 100644 --- a/server/api-service/openblocks-plugins/graphqlPlugin/src/main/java/com/openblocks/plugin/graphql/helpers/BufferingFilter.java +++ b/server/api-service/lowcoder-plugins/restApiPlugin/src/main/java/org/lowcoder/plugin/restapi/helpers/BufferingFilter.java @@ -1,4 +1,4 @@ -package com.openblocks.plugin.graphql.helpers; +package org.lowcoder.plugin.restapi.helpers; import org.reactivestreams.Publisher; import org.springframework.core.io.buffer.DataBuffer; diff --git a/server/api-service/openblocks-plugins/restApiPlugin/src/main/java/com/openblocks/plugin/restapi/helpers/ContentTypeHelper.java b/server/api-service/lowcoder-plugins/restApiPlugin/src/main/java/org/lowcoder/plugin/restapi/helpers/ContentTypeHelper.java similarity index 98% rename from server/api-service/openblocks-plugins/restApiPlugin/src/main/java/com/openblocks/plugin/restapi/helpers/ContentTypeHelper.java rename to server/api-service/lowcoder-plugins/restApiPlugin/src/main/java/org/lowcoder/plugin/restapi/helpers/ContentTypeHelper.java index d46af88bf..7b07249f3 100644 --- a/server/api-service/openblocks-plugins/restApiPlugin/src/main/java/com/openblocks/plugin/restapi/helpers/ContentTypeHelper.java +++ b/server/api-service/lowcoder-plugins/restApiPlugin/src/main/java/org/lowcoder/plugin/restapi/helpers/ContentTypeHelper.java @@ -1,4 +1,4 @@ -package com.openblocks.plugin.restapi.helpers; +package org.lowcoder.plugin.restapi.helpers; import java.util.Map; import java.util.Map.Entry; diff --git a/server/api-service/openblocks-plugins/restApiPlugin/src/main/java/com/openblocks/plugin/restapi/model/QueryBody.java b/server/api-service/lowcoder-plugins/restApiPlugin/src/main/java/org/lowcoder/plugin/restapi/model/QueryBody.java similarity index 85% rename from server/api-service/openblocks-plugins/restApiPlugin/src/main/java/com/openblocks/plugin/restapi/model/QueryBody.java rename to server/api-service/lowcoder-plugins/restApiPlugin/src/main/java/org/lowcoder/plugin/restapi/model/QueryBody.java index fb73a59be..5417c4ed9 100644 --- a/server/api-service/openblocks-plugins/restApiPlugin/src/main/java/com/openblocks/plugin/restapi/model/QueryBody.java +++ b/server/api-service/lowcoder-plugins/restApiPlugin/src/main/java/org/lowcoder/plugin/restapi/model/QueryBody.java @@ -1,4 +1,4 @@ -package com.openblocks.plugin.restapi.model; +package org.lowcoder.plugin.restapi.model; import com.fasterxml.jackson.databind.JsonNode; diff --git a/server/api-service/openblocks-plugins/restApiPlugin/src/main/java/com/openblocks/plugin/restapi/model/RestApiQueryConfig.java b/server/api-service/lowcoder-plugins/restApiPlugin/src/main/java/org/lowcoder/plugin/restapi/model/RestApiQueryConfig.java similarity index 84% rename from server/api-service/openblocks-plugins/restApiPlugin/src/main/java/com/openblocks/plugin/restapi/model/RestApiQueryConfig.java rename to server/api-service/lowcoder-plugins/restApiPlugin/src/main/java/org/lowcoder/plugin/restapi/model/RestApiQueryConfig.java index fabd6d453..c823f1932 100644 --- a/server/api-service/openblocks-plugins/restApiPlugin/src/main/java/com/openblocks/plugin/restapi/model/RestApiQueryConfig.java +++ b/server/api-service/lowcoder-plugins/restApiPlugin/src/main/java/org/lowcoder/plugin/restapi/model/RestApiQueryConfig.java @@ -1,18 +1,18 @@ -package com.openblocks.plugin.restapi.model; +package org.lowcoder.plugin.restapi.model; -import static com.openblocks.sdk.exception.PluginCommonError.INVALID_QUERY_SETTINGS; -import static com.openblocks.sdk.util.JsonUtils.fromJson; -import static com.openblocks.sdk.util.JsonUtils.toJson; import static org.apache.commons.collections4.ListUtils.emptyIfNull; +import static org.lowcoder.sdk.exception.PluginCommonError.INVALID_QUERY_SETTINGS; +import static org.lowcoder.sdk.util.JsonUtils.fromJson; +import static org.lowcoder.sdk.util.JsonUtils.toJson; import java.util.List; import java.util.Map; +import org.lowcoder.sdk.exception.PluginException; +import org.lowcoder.sdk.models.Property; import org.springframework.http.HttpMethod; import com.fasterxml.jackson.annotation.JsonCreator; -import com.openblocks.sdk.exception.PluginException; -import com.openblocks.sdk.models.Property; import lombok.Builder; import lombok.Getter; diff --git a/server/api-service/openblocks-plugins/restApiPlugin/src/main/java/com/openblocks/plugin/restapi/model/RestApiQueryExecutionContext.java b/server/api-service/lowcoder-plugins/restApiPlugin/src/main/java/org/lowcoder/plugin/restapi/model/RestApiQueryExecutionContext.java similarity index 88% rename from server/api-service/openblocks-plugins/restApiPlugin/src/main/java/com/openblocks/plugin/restapi/model/RestApiQueryExecutionContext.java rename to server/api-service/lowcoder-plugins/restApiPlugin/src/main/java/org/lowcoder/plugin/restapi/model/RestApiQueryExecutionContext.java index 512e3472f..a5ddba1b9 100644 --- a/server/api-service/openblocks-plugins/restApiPlugin/src/main/java/com/openblocks/plugin/restapi/model/RestApiQueryExecutionContext.java +++ b/server/api-service/lowcoder-plugins/restApiPlugin/src/main/java/org/lowcoder/plugin/restapi/model/RestApiQueryExecutionContext.java @@ -1,4 +1,4 @@ -package com.openblocks.plugin.restapi.model; +package org.lowcoder.plugin.restapi.model; import java.net.URI; import java.util.List; @@ -7,15 +7,14 @@ import javax.annotation.Nullable; +import org.lowcoder.sdk.models.Property; +import org.lowcoder.sdk.plugin.common.ssl.SslConfig; +import org.lowcoder.sdk.plugin.restapi.auth.AuthConfig; +import org.lowcoder.sdk.query.QueryExecutionContext; import org.springframework.http.HttpCookie; import org.springframework.http.HttpMethod; import org.springframework.util.MultiValueMap; -import com.openblocks.sdk.models.Property; -import com.openblocks.sdk.plugin.common.ssl.SslConfig; -import com.openblocks.sdk.plugin.restapi.auth.AuthConfig; -import com.openblocks.sdk.query.QueryExecutionContext; - import lombok.Builder; import lombok.Getter; import lombok.Setter; diff --git a/server/api-service/openblocks-plugins/restApiPlugin/src/test/java/com/openblocks/plugin/restapi/AuthConfigTest.java b/server/api-service/lowcoder-plugins/restApiPlugin/src/test/java/org/lowcoder/plugin/restapi/AuthConfigTest.java similarity index 85% rename from server/api-service/openblocks-plugins/restApiPlugin/src/test/java/com/openblocks/plugin/restapi/AuthConfigTest.java rename to server/api-service/lowcoder-plugins/restApiPlugin/src/test/java/org/lowcoder/plugin/restapi/AuthConfigTest.java index c7139c836..75704e137 100644 --- a/server/api-service/openblocks-plugins/restApiPlugin/src/test/java/com/openblocks/plugin/restapi/AuthConfigTest.java +++ b/server/api-service/lowcoder-plugins/restApiPlugin/src/test/java/org/lowcoder/plugin/restapi/AuthConfigTest.java @@ -1,18 +1,17 @@ -package com.openblocks.plugin.restapi; +package org.lowcoder.plugin.restapi; -import static com.openblocks.sdk.plugin.restapi.auth.RestApiAuthType.BASIC_AUTH; -import static com.openblocks.sdk.plugin.restapi.auth.RestApiAuthType.BEARER_TOKEN_AUTH; -import static com.openblocks.sdk.plugin.restapi.auth.RestApiAuthType.DIGEST_AUTH; -import static com.openblocks.sdk.plugin.restapi.auth.RestApiAuthType.NO_AUTH; +import static org.lowcoder.sdk.plugin.restapi.auth.RestApiAuthType.BASIC_AUTH; +import static org.lowcoder.sdk.plugin.restapi.auth.RestApiAuthType.BEARER_TOKEN_AUTH; +import static org.lowcoder.sdk.plugin.restapi.auth.RestApiAuthType.DIGEST_AUTH; +import static org.lowcoder.sdk.plugin.restapi.auth.RestApiAuthType.NO_AUTH; import org.junit.Assert; import org.junit.Test; - -import com.openblocks.sdk.plugin.restapi.RestApiDatasourceConfig; -import com.openblocks.sdk.plugin.restapi.auth.BasicAuthConfig; -import com.openblocks.sdk.plugin.restapi.auth.DefaultAuthConfig; -import com.openblocks.sdk.plugin.restapi.auth.NoneAuthConfig; -import com.openblocks.sdk.util.JsonUtils; +import org.lowcoder.sdk.plugin.restapi.RestApiDatasourceConfig; +import org.lowcoder.sdk.plugin.restapi.auth.BasicAuthConfig; +import org.lowcoder.sdk.plugin.restapi.auth.DefaultAuthConfig; +import org.lowcoder.sdk.plugin.restapi.auth.NoneAuthConfig; +import org.lowcoder.sdk.util.JsonUtils; public class AuthConfigTest { diff --git a/server/api-service/openblocks-plugins/restApiPlugin/src/test/java/com/openblocks/plugin/restapi/RestApiEngineTest.java b/server/api-service/lowcoder-plugins/restApiPlugin/src/test/java/org/lowcoder/plugin/restapi/RestApiEngineTest.java similarity index 97% rename from server/api-service/openblocks-plugins/restApiPlugin/src/test/java/com/openblocks/plugin/restapi/RestApiEngineTest.java rename to server/api-service/lowcoder-plugins/restApiPlugin/src/test/java/org/lowcoder/plugin/restapi/RestApiEngineTest.java index 7012c0877..4e7695b00 100644 --- a/server/api-service/openblocks-plugins/restApiPlugin/src/test/java/com/openblocks/plugin/restapi/RestApiEngineTest.java +++ b/server/api-service/lowcoder-plugins/restApiPlugin/src/test/java/org/lowcoder/plugin/restapi/RestApiEngineTest.java @@ -1,12 +1,12 @@ -package com.openblocks.plugin.restapi; +package org.lowcoder.plugin.restapi; -import static com.openblocks.sdk.plugin.restapi.auth.RestApiAuthType.BASIC_AUTH; -import static com.openblocks.sdk.plugin.restapi.auth.RestApiAuthType.DIGEST_AUTH; import static java.util.Collections.emptyList; import static java.util.Collections.emptyMap; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertTrue; +import static org.lowcoder.sdk.plugin.restapi.auth.RestApiAuthType.BASIC_AUTH; +import static org.lowcoder.sdk.plugin.restapi.auth.RestApiAuthType.DIGEST_AUTH; import java.net.URI; import java.util.List; @@ -14,20 +14,22 @@ import org.junit.Assert; import org.junit.Test; +import org.lowcoder.plugin.restapi.RestApiConnector; +import org.lowcoder.plugin.restapi.RestApiExecutor; +import org.lowcoder.plugin.restapi.model.RestApiQueryExecutionContext; +import org.lowcoder.sdk.config.CommonConfig; +import org.lowcoder.sdk.models.Property; +import org.lowcoder.sdk.models.QueryExecutionResult; +import org.lowcoder.sdk.plugin.common.RestApiUriBuilder; +import org.lowcoder.sdk.plugin.restapi.RestApiDatasourceConfig; +import org.lowcoder.sdk.plugin.restapi.auth.BasicAuthConfig; +import org.lowcoder.sdk.query.QueryExecutionContext; +import org.lowcoder.sdk.query.QueryVisitorContext; import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.node.ObjectNode; import com.fasterxml.jackson.databind.node.TextNode; import com.google.common.collect.ImmutableMap; -import com.openblocks.plugin.restapi.model.RestApiQueryExecutionContext; -import com.openblocks.sdk.config.CommonConfig; -import com.openblocks.sdk.models.Property; -import com.openblocks.sdk.models.QueryExecutionResult; -import com.openblocks.sdk.plugin.common.RestApiUriBuilder; -import com.openblocks.sdk.plugin.restapi.RestApiDatasourceConfig; -import com.openblocks.sdk.plugin.restapi.auth.BasicAuthConfig; -import com.openblocks.sdk.query.QueryExecutionContext; -import com.openblocks.sdk.query.QueryVisitorContext; import reactor.core.publisher.Mono; import reactor.test.StepVerifier; diff --git a/server/api-service/openblocks-plugins/restApiPlugin/src/test/java/com/openblocks/plugin/restapi/RestApiUriBuilderTest.java b/server/api-service/lowcoder-plugins/restApiPlugin/src/test/java/org/lowcoder/plugin/restapi/RestApiUriBuilderTest.java similarity index 55% rename from server/api-service/openblocks-plugins/restApiPlugin/src/test/java/com/openblocks/plugin/restapi/RestApiUriBuilderTest.java rename to server/api-service/lowcoder-plugins/restApiPlugin/src/test/java/org/lowcoder/plugin/restapi/RestApiUriBuilderTest.java index 635eb5ace..5223b6b2b 100644 --- a/server/api-service/openblocks-plugins/restApiPlugin/src/test/java/com/openblocks/plugin/restapi/RestApiUriBuilderTest.java +++ b/server/api-service/lowcoder-plugins/restApiPlugin/src/test/java/org/lowcoder/plugin/restapi/RestApiUriBuilderTest.java @@ -1,4 +1,4 @@ -package com.openblocks.plugin.restapi; +package org.lowcoder.plugin.restapi; import java.net.URI; import java.util.Collections; @@ -6,22 +6,21 @@ import org.junit.Assert; import org.junit.Test; - -import com.openblocks.sdk.exception.PluginException; -import com.openblocks.sdk.plugin.common.RestApiUriBuilder; +import org.lowcoder.sdk.exception.PluginException; +import org.lowcoder.sdk.plugin.common.RestApiUriBuilder; public class RestApiUriBuilderTest { @Test public void testPathConcatenation() { - URI uri = RestApiUriBuilder.buildUri("http://cloud.openblocks.dev", "path?", Collections.emptyMap(), Collections.emptyMap()); - Assert.assertEquals("http://cloud.openblocks.dev/path?", uri.toString()); + URI uri = RestApiUriBuilder.buildUri("http://app.lowcoder.cloud", "path?", Collections.emptyMap(), Collections.emptyMap()); + Assert.assertEquals("http://app.lowcoder.cloud/path?", uri.toString()); } @Test public void testExtraSlashesInPath() { - URI uri = RestApiUriBuilder.buildUri("http://cloud.openblocks.dev//", "/path", Collections.emptyMap(), Collections.emptyMap()); - Assert.assertEquals("http://cloud.openblocks.dev/path", uri.toString()); + URI uri = RestApiUriBuilder.buildUri("http://app.lowcoder.cloud//", "/path", Collections.emptyMap(), Collections.emptyMap()); + Assert.assertEquals("http://app.lowcoder.cloud/path", uri.toString()); } @Test @@ -36,7 +35,7 @@ public void testExceptionCases() { Map paramsMap = Collections.emptyMap(); Map urlParams = Collections.emptyMap(); Assert.assertThrows(PluginException.class, () -> { - URI uri = RestApiUriBuilder.buildUri("8080:cloud.openblocks.dev", "", paramsMap, urlParams); + URI uri = RestApiUriBuilder.buildUri("8080:app.lowcoder.cloud", "", paramsMap, urlParams); }); } } diff --git a/server/api-service/lowcoder-plugins/smtpPlugin/plugin.properties b/server/api-service/lowcoder-plugins/smtpPlugin/plugin.properties new file mode 100644 index 000000000..7ee3cc211 --- /dev/null +++ b/server/api-service/lowcoder-plugins/smtpPlugin/plugin.properties @@ -0,0 +1,5 @@ +plugin.id=smtp-plugin +plugin.class=org.lowcoder.plugins.SmtpPlugin +plugin.version=1.0-SNAPSHOT +plugin.provider=service@lowcoder.org +plugin.dependencies= \ No newline at end of file diff --git a/server/api-service/openblocks-plugins/smtpPlugin/pom.xml b/server/api-service/lowcoder-plugins/smtpPlugin/pom.xml similarity index 94% rename from server/api-service/openblocks-plugins/smtpPlugin/pom.xml rename to server/api-service/lowcoder-plugins/smtpPlugin/pom.xml index 268a36eec..617d2a92c 100644 --- a/server/api-service/openblocks-plugins/smtpPlugin/pom.xml +++ b/server/api-service/lowcoder-plugins/smtpPlugin/pom.xml @@ -3,8 +3,8 @@ - com.openblocks - openblocks-plugins + org.lowcoder + lowcoder-plugins 1.0-SNAPSHOT @@ -20,9 +20,9 @@ ${java.version} ${java.version} smtp-plugin - com.openblocks.plugins.SmtpPlugin + org.lowcoder.plugins.SmtpPlugin 1.0-SNAPSHOT - dev@openblocks.dev + service@lowcoder.org diff --git a/server/api-service/openblocks-plugins/smtpPlugin/src/main/java/com/openblocks/plugins/SmtpDatasourceConfig.java b/server/api-service/lowcoder-plugins/smtpPlugin/src/main/java/org/lowcoder/plugins/SmtpDatasourceConfig.java similarity index 91% rename from server/api-service/openblocks-plugins/smtpPlugin/src/main/java/com/openblocks/plugins/SmtpDatasourceConfig.java rename to server/api-service/lowcoder-plugins/smtpPlugin/src/main/java/org/lowcoder/plugins/SmtpDatasourceConfig.java index f760f5329..55614bf66 100644 --- a/server/api-service/openblocks-plugins/smtpPlugin/src/main/java/com/openblocks/plugins/SmtpDatasourceConfig.java +++ b/server/api-service/lowcoder-plugins/smtpPlugin/src/main/java/org/lowcoder/plugins/SmtpDatasourceConfig.java @@ -1,4 +1,4 @@ -package com.openblocks.plugins; +package org.lowcoder.plugins; import static org.apache.commons.lang3.ObjectUtils.firstNonNull; import static org.apache.commons.lang3.StringUtils.isNotBlank; @@ -7,9 +7,10 @@ import javax.annotation.Nullable; +import org.lowcoder.sdk.config.SerializeConfig.JsonViews; +import org.lowcoder.sdk.models.DatasourceConnectionConfig; + import com.fasterxml.jackson.annotation.JsonView; -import com.openblocks.sdk.config.SerializeConfig.JsonViews; -import com.openblocks.sdk.models.DatasourceConnectionConfig; import lombok.Builder; import lombok.Getter; diff --git a/server/api-service/openblocks-plugins/smtpPlugin/src/main/java/com/openblocks/plugins/SmtpPlugin.java b/server/api-service/lowcoder-plugins/smtpPlugin/src/main/java/org/lowcoder/plugins/SmtpPlugin.java similarity index 88% rename from server/api-service/openblocks-plugins/smtpPlugin/src/main/java/com/openblocks/plugins/SmtpPlugin.java rename to server/api-service/lowcoder-plugins/smtpPlugin/src/main/java/org/lowcoder/plugins/SmtpPlugin.java index 5b3c543a6..186474174 100644 --- a/server/api-service/openblocks-plugins/smtpPlugin/src/main/java/com/openblocks/plugins/SmtpPlugin.java +++ b/server/api-service/lowcoder-plugins/smtpPlugin/src/main/java/org/lowcoder/plugins/SmtpPlugin.java @@ -1,22 +1,22 @@ -package com.openblocks.plugins; - -import static com.openblocks.sdk.exception.BizError.DATASOURCE_CLOSE_FAILED; -import static com.openblocks.sdk.exception.PluginCommonError.DATASOURCE_ARGUMENT_ERROR; -import static com.openblocks.sdk.exception.PluginCommonError.QUERY_ARGUMENT_ERROR; -import static com.openblocks.sdk.exception.PluginCommonError.QUERY_EXECUTION_ERROR; -import static com.openblocks.sdk.plugin.common.QueryExecutionUtils.querySharedScheduler; -import static com.openblocks.sdk.util.ExceptionUtils.ofPluginException; -import static com.openblocks.sdk.util.JsonUtils.fromJsonList; -import static com.openblocks.sdk.util.JsonUtils.toJson; -import static com.openblocks.sdk.util.MustacheHelper.renderMustacheArrayJsonString; -import static com.openblocks.sdk.util.MustacheHelper.renderMustacheJsonString; -import static com.openblocks.sdk.util.MustacheHelper.renderMustacheString; +package org.lowcoder.plugins; + import static javax.mail.Message.RecipientType.BCC; import static javax.mail.Message.RecipientType.CC; import static javax.mail.Message.RecipientType.TO; import static org.apache.commons.collections4.MapUtils.getString; import static org.apache.commons.lang3.ArrayUtils.isNotEmpty; import static org.apache.commons.lang3.StringUtils.isBlank; +import static org.lowcoder.sdk.exception.BizError.DATASOURCE_CLOSE_FAILED; +import static org.lowcoder.sdk.exception.PluginCommonError.DATASOURCE_ARGUMENT_ERROR; +import static org.lowcoder.sdk.exception.PluginCommonError.QUERY_ARGUMENT_ERROR; +import static org.lowcoder.sdk.exception.PluginCommonError.QUERY_EXECUTION_ERROR; +import static org.lowcoder.sdk.plugin.common.QueryExecutionUtils.querySharedScheduler; +import static org.lowcoder.sdk.util.ExceptionUtils.ofPluginException; +import static org.lowcoder.sdk.util.JsonUtils.fromJsonList; +import static org.lowcoder.sdk.util.JsonUtils.toJson; +import static org.lowcoder.sdk.util.MustacheHelper.renderMustacheArrayJsonString; +import static org.lowcoder.sdk.util.MustacheHelper.renderMustacheJsonString; +import static org.lowcoder.sdk.util.MustacheHelper.renderMustacheString; import java.util.Base64; import java.util.Base64.Decoder; @@ -46,19 +46,18 @@ import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang3.StringUtils; +import org.lowcoder.plugins.SmtpQueryExecutionContext.Attachment; +import org.lowcoder.sdk.exception.BizException; +import org.lowcoder.sdk.exception.PluginException; +import org.lowcoder.sdk.models.DatasourceTestResult; +import org.lowcoder.sdk.models.QueryExecutionResult; +import org.lowcoder.sdk.plugin.common.DatasourceQueryEngine; +import org.lowcoder.sdk.query.QueryVisitorContext; +import org.lowcoder.sdk.util.JsonUtils; import org.pf4j.Extension; import org.pf4j.Plugin; import org.pf4j.PluginWrapper; -import com.openblocks.plugins.SmtpQueryExecutionContext.Attachment; -import com.openblocks.sdk.exception.BizException; -import com.openblocks.sdk.exception.PluginException; -import com.openblocks.sdk.models.DatasourceTestResult; -import com.openblocks.sdk.models.QueryExecutionResult; -import com.openblocks.sdk.plugin.common.DatasourceQueryEngine; -import com.openblocks.sdk.query.QueryVisitorContext; -import com.openblocks.sdk.util.JsonUtils; - import lombok.extern.slf4j.Slf4j; import reactor.core.publisher.Mono; diff --git a/server/api-service/openblocks-plugins/smtpPlugin/src/main/java/com/openblocks/plugins/SmtpQueryExecutionContext.java b/server/api-service/lowcoder-plugins/smtpPlugin/src/main/java/org/lowcoder/plugins/SmtpQueryExecutionContext.java similarity index 88% rename from server/api-service/openblocks-plugins/smtpPlugin/src/main/java/com/openblocks/plugins/SmtpQueryExecutionContext.java rename to server/api-service/lowcoder-plugins/smtpPlugin/src/main/java/org/lowcoder/plugins/SmtpQueryExecutionContext.java index 60b5071dd..6000d4f52 100644 --- a/server/api-service/openblocks-plugins/smtpPlugin/src/main/java/com/openblocks/plugins/SmtpQueryExecutionContext.java +++ b/server/api-service/lowcoder-plugins/smtpPlugin/src/main/java/org/lowcoder/plugins/SmtpQueryExecutionContext.java @@ -1,10 +1,10 @@ -package com.openblocks.plugins; +package org.lowcoder.plugins; import java.util.List; import javax.mail.internet.InternetAddress; -import com.openblocks.sdk.query.QueryExecutionContext; +import org.lowcoder.sdk.query.QueryExecutionContext; import lombok.Builder; import lombok.Getter; diff --git a/server/api-service/lowcoder-plugins/snowflakePlugin/plugin.properties b/server/api-service/lowcoder-plugins/snowflakePlugin/plugin.properties new file mode 100644 index 000000000..9075b6ce7 --- /dev/null +++ b/server/api-service/lowcoder-plugins/snowflakePlugin/plugin.properties @@ -0,0 +1,5 @@ +plugin.id=snowflake-plugin +plugin.class=org.lowcoder.plugin.snowflake.SnowflakePlugin +plugin.version=1.0-SNAPSHOT +plugin.provider=service@lowcoder.org +plugin.dependencies= \ No newline at end of file diff --git a/server/api-service/openblocks-plugins/snowflakePlugin/pom.xml b/server/api-service/lowcoder-plugins/snowflakePlugin/pom.xml similarity index 92% rename from server/api-service/openblocks-plugins/snowflakePlugin/pom.xml rename to server/api-service/lowcoder-plugins/snowflakePlugin/pom.xml index 4e5715e32..39f3c708e 100644 --- a/server/api-service/openblocks-plugins/snowflakePlugin/pom.xml +++ b/server/api-service/lowcoder-plugins/snowflakePlugin/pom.xml @@ -4,8 +4,8 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - com.openblocks - openblocks-plugins + org.lowcoder + lowcoder-plugins 1.0-SNAPSHOT @@ -18,9 +18,9 @@ UTF-8 snowflake-plugin - com.openblocks.plugin.snowflake.SnowflakePlugin + org.lowcoder.plugin.snowflake.SnowflakePlugin 1.0-SNAPSHOT - dev@openblocks.dev + service@lowcoder.org @@ -32,7 +32,7 @@ 3.13.30 - com.openblocks + org.lowcoder sqlBasedPlugin 1.0-SNAPSHOT @@ -93,4 +93,4 @@ - \ No newline at end of file + diff --git a/server/api-service/openblocks-plugins/snowflakePlugin/src/main/java/com/openblocks/plugin/snowflake/SnowflakeConnector.java b/server/api-service/lowcoder-plugins/snowflakePlugin/src/main/java/org/lowcoder/plugin/snowflake/SnowflakeConnector.java similarity index 91% rename from server/api-service/openblocks-plugins/snowflakePlugin/src/main/java/com/openblocks/plugin/snowflake/SnowflakeConnector.java rename to server/api-service/lowcoder-plugins/snowflakePlugin/src/main/java/org/lowcoder/plugin/snowflake/SnowflakeConnector.java index 27782cd4d..fc14663fd 100644 --- a/server/api-service/openblocks-plugins/snowflakePlugin/src/main/java/com/openblocks/plugin/snowflake/SnowflakeConnector.java +++ b/server/api-service/lowcoder-plugins/snowflakePlugin/src/main/java/org/lowcoder/plugin/snowflake/SnowflakeConnector.java @@ -1,8 +1,8 @@ -package com.openblocks.plugin.snowflake; +package org.lowcoder.plugin.snowflake; +import org.lowcoder.plugin.sql.SqlBasedConnector; import org.pf4j.Extension; -import com.openblocks.plugin.sql.SqlBasedConnector; import com.zaxxer.hikari.HikariConfig; @Extension diff --git a/server/api-service/openblocks-plugins/snowflakePlugin/src/main/java/com/openblocks/plugin/snowflake/SnowflakeDatasourceConfig.java b/server/api-service/lowcoder-plugins/snowflakePlugin/src/main/java/org/lowcoder/plugin/snowflake/SnowflakeDatasourceConfig.java similarity index 85% rename from server/api-service/openblocks-plugins/snowflakePlugin/src/main/java/com/openblocks/plugin/snowflake/SnowflakeDatasourceConfig.java rename to server/api-service/lowcoder-plugins/snowflakePlugin/src/main/java/org/lowcoder/plugin/snowflake/SnowflakeDatasourceConfig.java index ce949636a..185ad7f3a 100644 --- a/server/api-service/openblocks-plugins/snowflakePlugin/src/main/java/com/openblocks/plugin/snowflake/SnowflakeDatasourceConfig.java +++ b/server/api-service/lowcoder-plugins/snowflakePlugin/src/main/java/org/lowcoder/plugin/snowflake/SnowflakeDatasourceConfig.java @@ -1,8 +1,8 @@ -package com.openblocks.plugin.snowflake; +package org.lowcoder.plugin.snowflake; import java.util.Map; -import com.openblocks.sdk.plugin.common.sql.SqlBasedDatasourceConnectionConfig; +import org.lowcoder.sdk.plugin.common.sql.SqlBasedDatasourceConnectionConfig; import lombok.Builder; import lombok.ToString; diff --git a/server/api-service/openblocks-plugins/snowflakePlugin/src/main/java/com/openblocks/plugin/snowflake/SnowflakePlugin.java b/server/api-service/lowcoder-plugins/snowflakePlugin/src/main/java/org/lowcoder/plugin/snowflake/SnowflakePlugin.java similarity index 82% rename from server/api-service/openblocks-plugins/snowflakePlugin/src/main/java/com/openblocks/plugin/snowflake/SnowflakePlugin.java rename to server/api-service/lowcoder-plugins/snowflakePlugin/src/main/java/org/lowcoder/plugin/snowflake/SnowflakePlugin.java index d38296308..f55d1f112 100644 --- a/server/api-service/openblocks-plugins/snowflakePlugin/src/main/java/com/openblocks/plugin/snowflake/SnowflakePlugin.java +++ b/server/api-service/lowcoder-plugins/snowflakePlugin/src/main/java/org/lowcoder/plugin/snowflake/SnowflakePlugin.java @@ -1,4 +1,4 @@ -package com.openblocks.plugin.snowflake; +package org.lowcoder.plugin.snowflake; import org.pf4j.Plugin; import org.pf4j.PluginWrapper; diff --git a/server/api-service/openblocks-plugins/snowflakePlugin/src/main/java/com/openblocks/plugin/snowflake/SnowflakeQueryExecutor.java b/server/api-service/lowcoder-plugins/snowflakePlugin/src/main/java/org/lowcoder/plugin/snowflake/SnowflakeQueryExecutor.java similarity index 83% rename from server/api-service/openblocks-plugins/snowflakePlugin/src/main/java/com/openblocks/plugin/snowflake/SnowflakeQueryExecutor.java rename to server/api-service/lowcoder-plugins/snowflakePlugin/src/main/java/org/lowcoder/plugin/snowflake/SnowflakeQueryExecutor.java index 19651a2e4..d8ee2952e 100644 --- a/server/api-service/openblocks-plugins/snowflakePlugin/src/main/java/com/openblocks/plugin/snowflake/SnowflakeQueryExecutor.java +++ b/server/api-service/lowcoder-plugins/snowflakePlugin/src/main/java/org/lowcoder/plugin/snowflake/SnowflakeQueryExecutor.java @@ -1,6 +1,6 @@ -package com.openblocks.plugin.snowflake; +package org.lowcoder.plugin.snowflake; -import static com.openblocks.sdk.exception.PluginCommonError.DATASOURCE_GET_STRUCTURE_ERROR; +import static org.lowcoder.sdk.exception.PluginCommonError.DATASOURCE_GET_STRUCTURE_ERROR; import java.sql.Connection; import java.sql.ResultSet; @@ -13,20 +13,19 @@ import javax.annotation.Nonnull; import org.apache.commons.lang3.StringUtils; +import org.lowcoder.plugin.sql.GeneralSqlExecutor; +import org.lowcoder.plugin.sql.SqlBasedQueryExecutor; +import org.lowcoder.sdk.models.DatasourceStructure; +import org.lowcoder.sdk.models.DatasourceStructure.Column; +import org.lowcoder.sdk.models.DatasourceStructure.Table; +import org.lowcoder.sdk.models.DatasourceStructure.TableType; +import org.lowcoder.sdk.plugin.common.sql.SqlBasedDatasourceConnectionConfig; +import org.lowcoder.sdk.plugin.common.sql.SqlBasedQueryExecutionContext; +import org.lowcoder.sdk.plugin.sqlcommand.GuiSqlCommand; +import org.lowcoder.sdk.query.QueryVisitorContext; +import org.lowcoder.sdk.util.ExceptionUtils; import org.pf4j.Extension; -import com.openblocks.plugin.sql.GeneralSqlExecutor; -import com.openblocks.plugin.sql.SqlBasedQueryExecutor; -import com.openblocks.sdk.models.DatasourceStructure; -import com.openblocks.sdk.models.DatasourceStructure.Column; -import com.openblocks.sdk.models.DatasourceStructure.Table; -import com.openblocks.sdk.models.DatasourceStructure.TableType; -import com.openblocks.sdk.plugin.common.sql.SqlBasedDatasourceConnectionConfig; -import com.openblocks.sdk.plugin.common.sql.SqlBasedQueryExecutionContext; -import com.openblocks.sdk.plugin.sqlcommand.GuiSqlCommand; -import com.openblocks.sdk.query.QueryVisitorContext; -import com.openblocks.sdk.util.ExceptionUtils; - import lombok.extern.slf4j.Slf4j; @SuppressWarnings({"SqlDialectInspection", "SqlNoDataSourceInspection"}) diff --git a/server/api-service/openblocks-plugins/sqlBasedPlugin/pom.xml b/server/api-service/lowcoder-plugins/sqlBasedPlugin/pom.xml similarity index 91% rename from server/api-service/openblocks-plugins/sqlBasedPlugin/pom.xml rename to server/api-service/lowcoder-plugins/sqlBasedPlugin/pom.xml index b2158fe82..3b91f732b 100644 --- a/server/api-service/openblocks-plugins/sqlBasedPlugin/pom.xml +++ b/server/api-service/lowcoder-plugins/sqlBasedPlugin/pom.xml @@ -4,8 +4,8 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - com.openblocks - openblocks-plugins + org.lowcoder + lowcoder-plugins 1.0-SNAPSHOT @@ -32,4 +32,4 @@ - \ No newline at end of file + diff --git a/server/api-service/openblocks-plugins/sqlBasedPlugin/src/main/java/com/openblocks/plugin/sql/GeneralSqlExecutor.java b/server/api-service/lowcoder-plugins/sqlBasedPlugin/src/main/java/org/lowcoder/plugin/sql/GeneralSqlExecutor.java similarity index 92% rename from server/api-service/openblocks-plugins/sqlBasedPlugin/src/main/java/com/openblocks/plugin/sql/GeneralSqlExecutor.java rename to server/api-service/lowcoder-plugins/sqlBasedPlugin/src/main/java/org/lowcoder/plugin/sql/GeneralSqlExecutor.java index 3d1dc7b53..4d9fa3ec8 100644 --- a/server/api-service/openblocks-plugins/sqlBasedPlugin/src/main/java/com/openblocks/plugin/sql/GeneralSqlExecutor.java +++ b/server/api-service/lowcoder-plugins/sqlBasedPlugin/src/main/java/org/lowcoder/plugin/sql/GeneralSqlExecutor.java @@ -1,15 +1,15 @@ -package com.openblocks.plugin.sql; +package org.lowcoder.plugin.sql; import static com.google.common.collect.Lists.newArrayList; import static com.google.common.collect.Maps.newHashMapWithExpectedSize; -import static com.openblocks.sdk.exception.PluginCommonError.PREPARED_STATEMENT_BIND_PARAMETERS_ERROR; -import static com.openblocks.sdk.exception.PluginCommonError.QUERY_EXECUTION_ERROR; -import static com.openblocks.sdk.util.ExceptionUtils.wrapException; -import static com.openblocks.sdk.util.JsonUtils.toJson; -import static com.openblocks.sdk.util.MustacheHelper.doPrepareStatement; -import static com.openblocks.sdk.util.MustacheHelper.extractMustacheKeysInOrder; -import static com.openblocks.sdk.util.MustacheHelper.renderMustacheString; import static java.util.Collections.emptyList; +import static org.lowcoder.sdk.exception.PluginCommonError.PREPARED_STATEMENT_BIND_PARAMETERS_ERROR; +import static org.lowcoder.sdk.exception.PluginCommonError.QUERY_EXECUTION_ERROR; +import static org.lowcoder.sdk.util.ExceptionUtils.wrapException; +import static org.lowcoder.sdk.util.JsonUtils.toJson; +import static org.lowcoder.sdk.util.MustacheHelper.doPrepareStatement; +import static org.lowcoder.sdk.util.MustacheHelper.extractMustacheKeysInOrder; +import static org.lowcoder.sdk.util.MustacheHelper.renderMustacheString; import java.math.BigDecimal; import java.sql.Connection; @@ -29,14 +29,13 @@ import javax.annotation.Nonnull; import org.apache.commons.lang3.tuple.Pair; - -import com.openblocks.sdk.exception.PluginException; -import com.openblocks.sdk.models.QueryExecutionResult; -import com.openblocks.sdk.plugin.common.sql.ResultSetParser; -import com.openblocks.sdk.plugin.common.sql.SqlBasedQueryExecutionContext; -import com.openblocks.sdk.plugin.sqlcommand.GuiSqlCommand; -import com.openblocks.sdk.plugin.sqlcommand.GuiSqlCommand.GuiSqlCommandRenderResult; -import com.openblocks.sdk.plugin.sqlcommand.command.UpdateOrDeleteSingleCommandRenderResult; +import org.lowcoder.sdk.exception.PluginException; +import org.lowcoder.sdk.models.QueryExecutionResult; +import org.lowcoder.sdk.plugin.common.sql.ResultSetParser; +import org.lowcoder.sdk.plugin.common.sql.SqlBasedQueryExecutionContext; +import org.lowcoder.sdk.plugin.sqlcommand.GuiSqlCommand; +import org.lowcoder.sdk.plugin.sqlcommand.GuiSqlCommand.GuiSqlCommandRenderResult; +import org.lowcoder.sdk.plugin.sqlcommand.command.UpdateOrDeleteSingleCommandRenderResult; import lombok.extern.slf4j.Slf4j; diff --git a/server/api-service/openblocks-plugins/sqlBasedPlugin/src/main/java/com/openblocks/plugin/sql/SqlBasedConnector.java b/server/api-service/lowcoder-plugins/sqlBasedPlugin/src/main/java/org/lowcoder/plugin/sql/SqlBasedConnector.java similarity index 90% rename from server/api-service/openblocks-plugins/sqlBasedPlugin/src/main/java/com/openblocks/plugin/sql/SqlBasedConnector.java rename to server/api-service/lowcoder-plugins/sqlBasedPlugin/src/main/java/org/lowcoder/plugin/sql/SqlBasedConnector.java index c31945694..54e444ff4 100644 --- a/server/api-service/openblocks-plugins/sqlBasedPlugin/src/main/java/com/openblocks/plugin/sql/SqlBasedConnector.java +++ b/server/api-service/lowcoder-plugins/sqlBasedPlugin/src/main/java/org/lowcoder/plugin/sql/SqlBasedConnector.java @@ -1,6 +1,6 @@ -package com.openblocks.plugin.sql; +package org.lowcoder.plugin.sql; -import static com.openblocks.sdk.exception.PluginCommonError.QUERY_EXECUTION_ERROR; +import static org.lowcoder.sdk.exception.PluginCommonError.QUERY_EXECUTION_ERROR; import java.util.HashSet; import java.util.Set; @@ -9,12 +9,12 @@ import javax.annotation.Nonnull; import org.apache.commons.lang3.StringUtils; +import org.lowcoder.sdk.exception.PluginException; +import org.lowcoder.sdk.models.DatasourceTestResult; +import org.lowcoder.sdk.plugin.common.BlockingDatasourceConnector; +import org.lowcoder.sdk.plugin.common.sql.HikariPerfWrapper; +import org.lowcoder.sdk.plugin.common.sql.SqlBasedDatasourceConnectionConfig; -import com.openblocks.sdk.exception.PluginException; -import com.openblocks.sdk.models.DatasourceTestResult; -import com.openblocks.sdk.plugin.common.BlockingDatasourceConnector; -import com.openblocks.sdk.plugin.common.sql.HikariPerfWrapper; -import com.openblocks.sdk.plugin.common.sql.SqlBasedDatasourceConnectionConfig; import com.zaxxer.hikari.HikariConfig; import com.zaxxer.hikari.HikariDataSource; diff --git a/server/api-service/openblocks-plugins/sqlBasedPlugin/src/main/java/com/openblocks/plugin/sql/SqlBasedQueryExecutor.java b/server/api-service/lowcoder-plugins/sqlBasedPlugin/src/main/java/org/lowcoder/plugin/sql/SqlBasedQueryExecutor.java similarity index 83% rename from server/api-service/openblocks-plugins/sqlBasedPlugin/src/main/java/com/openblocks/plugin/sql/SqlBasedQueryExecutor.java rename to server/api-service/lowcoder-plugins/sqlBasedPlugin/src/main/java/org/lowcoder/plugin/sql/SqlBasedQueryExecutor.java index 04dcba3ca..d7810fadc 100644 --- a/server/api-service/openblocks-plugins/sqlBasedPlugin/src/main/java/com/openblocks/plugin/sql/SqlBasedQueryExecutor.java +++ b/server/api-service/lowcoder-plugins/sqlBasedPlugin/src/main/java/org/lowcoder/plugin/sql/SqlBasedQueryExecutor.java @@ -1,9 +1,9 @@ -package com.openblocks.plugin.sql; +package org.lowcoder.plugin.sql; -import static com.openblocks.sdk.exception.PluginCommonError.CONNECTION_ERROR; -import static com.openblocks.sdk.exception.PluginCommonError.QUERY_ARGUMENT_ERROR; -import static com.openblocks.sdk.exception.PluginCommonError.QUERY_EXECUTION_ERROR; -import static com.openblocks.sdk.util.ExceptionUtils.wrapException; +import static org.lowcoder.sdk.exception.PluginCommonError.CONNECTION_ERROR; +import static org.lowcoder.sdk.exception.PluginCommonError.QUERY_ARGUMENT_ERROR; +import static org.lowcoder.sdk.exception.PluginCommonError.QUERY_EXECUTION_ERROR; +import static org.lowcoder.sdk.util.ExceptionUtils.wrapException; import java.sql.Connection; import java.sql.SQLException; @@ -14,20 +14,20 @@ import org.apache.commons.collections4.MapUtils; import org.apache.commons.lang3.StringUtils; +import org.lowcoder.sdk.exception.InvalidHikariDatasourceException; +import org.lowcoder.sdk.exception.PluginException; +import org.lowcoder.sdk.models.DatasourceStructure; +import org.lowcoder.sdk.models.QueryExecutionResult; +import org.lowcoder.sdk.plugin.common.BlockingQueryExecutor; +import org.lowcoder.sdk.plugin.common.SqlQueryUtils; +import org.lowcoder.sdk.plugin.common.sql.HikariPerfWrapper; +import org.lowcoder.sdk.plugin.common.sql.SqlBasedDatasourceConnectionConfig; +import org.lowcoder.sdk.plugin.common.sql.SqlBasedQueryExecutionContext; +import org.lowcoder.sdk.plugin.sqlcommand.GuiSqlCommand; +import org.lowcoder.sdk.query.QueryVisitorContext; +import org.lowcoder.sdk.util.MustacheHelper; import com.google.common.collect.Maps; -import com.openblocks.sdk.exception.InvalidHikariDatasourceException; -import com.openblocks.sdk.exception.PluginException; -import com.openblocks.sdk.models.DatasourceStructure; -import com.openblocks.sdk.models.QueryExecutionResult; -import com.openblocks.sdk.plugin.common.BlockingQueryExecutor; -import com.openblocks.sdk.plugin.common.SqlQueryUtils; -import com.openblocks.sdk.plugin.common.sql.HikariPerfWrapper; -import com.openblocks.sdk.plugin.common.sql.SqlBasedDatasourceConnectionConfig; -import com.openblocks.sdk.plugin.common.sql.SqlBasedQueryExecutionContext; -import com.openblocks.sdk.plugin.sqlcommand.GuiSqlCommand; -import com.openblocks.sdk.query.QueryVisitorContext; -import com.openblocks.sdk.util.MustacheHelper; import com.zaxxer.hikari.HikariDataSource; import lombok.extern.slf4j.Slf4j; diff --git a/server/api-service/openblocks-plugins/sqlBasedPlugin/src/main/java/com/openblocks/plugin/sql/SqlQueryConfig.java b/server/api-service/lowcoder-plugins/sqlBasedPlugin/src/main/java/org/lowcoder/plugin/sql/SqlQueryConfig.java similarity index 84% rename from server/api-service/openblocks-plugins/sqlBasedPlugin/src/main/java/com/openblocks/plugin/sql/SqlQueryConfig.java rename to server/api-service/lowcoder-plugins/sqlBasedPlugin/src/main/java/org/lowcoder/plugin/sql/SqlQueryConfig.java index 020945ecb..4425b45e2 100644 --- a/server/api-service/openblocks-plugins/sqlBasedPlugin/src/main/java/com/openblocks/plugin/sql/SqlQueryConfig.java +++ b/server/api-service/lowcoder-plugins/sqlBasedPlugin/src/main/java/org/lowcoder/plugin/sql/SqlQueryConfig.java @@ -1,16 +1,16 @@ -package com.openblocks.plugin.sql; +package org.lowcoder.plugin.sql; -import static com.openblocks.sdk.exception.PluginCommonError.INVALID_QUERY_SETTINGS; -import static com.openblocks.sdk.util.JsonUtils.fromJson; -import static com.openblocks.sdk.util.JsonUtils.toJson; +import static org.lowcoder.sdk.exception.PluginCommonError.INVALID_QUERY_SETTINGS; +import static org.lowcoder.sdk.util.JsonUtils.fromJson; +import static org.lowcoder.sdk.util.JsonUtils.toJson; import java.util.Map; import org.apache.commons.collections4.MapUtils; +import org.lowcoder.sdk.exception.PluginException; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; -import com.openblocks.sdk.exception.PluginException; import lombok.Getter; diff --git a/server/api-service/openblocks-sdk/pom.xml b/server/api-service/lowcoder-sdk/pom.xml similarity index 97% rename from server/api-service/openblocks-sdk/pom.xml rename to server/api-service/lowcoder-sdk/pom.xml index 0541a80b5..8b55448db 100644 --- a/server/api-service/openblocks-sdk/pom.xml +++ b/server/api-service/lowcoder-sdk/pom.xml @@ -3,16 +3,16 @@ - com.openblocks - openblocks-root + lowcoder-root + org.lowcoder 1.0-SNAPSHOT 4.0.0 - openblocks-sdk + lowcoder-sdk 1.0-SNAPSHOT - openblocks-sdk + lowcoder-sdk UTF-8 diff --git a/server/api-service/openblocks-sdk/src/main/java/com/openblocks/sdk/auth/AbstractAuthConfig.java b/server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/auth/AbstractAuthConfig.java similarity index 98% rename from server/api-service/openblocks-sdk/src/main/java/com/openblocks/sdk/auth/AbstractAuthConfig.java rename to server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/auth/AbstractAuthConfig.java index 6e8126757..f6cbb651c 100644 --- a/server/api-service/openblocks-sdk/src/main/java/com/openblocks/sdk/auth/AbstractAuthConfig.java +++ b/server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/auth/AbstractAuthConfig.java @@ -1,4 +1,4 @@ -package com.openblocks.sdk.auth; +package org.lowcoder.sdk.auth; import java.util.function.Function; diff --git a/server/api-service/openblocks-sdk/src/main/java/com/openblocks/sdk/auth/EmailAuthConfig.java b/server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/auth/EmailAuthConfig.java similarity index 67% rename from server/api-service/openblocks-sdk/src/main/java/com/openblocks/sdk/auth/EmailAuthConfig.java rename to server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/auth/EmailAuthConfig.java index 7da346146..82dbe96cd 100644 --- a/server/api-service/openblocks-sdk/src/main/java/com/openblocks/sdk/auth/EmailAuthConfig.java +++ b/server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/auth/EmailAuthConfig.java @@ -1,7 +1,7 @@ -package com.openblocks.sdk.auth; +package org.lowcoder.sdk.auth; -import static com.openblocks.sdk.auth.constants.AuthTypeConstants.FORM; -import static com.openblocks.sdk.constants.AuthSourceConstants.EMAIL; +import static org.lowcoder.sdk.auth.constants.AuthTypeConstants.FORM; +import static org.lowcoder.sdk.constants.AuthSourceConstants.EMAIL; import javax.annotation.Nullable; diff --git a/server/api-service/openblocks-sdk/src/main/java/com/openblocks/sdk/auth/Oauth2SimpleAuthConfig.java b/server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/auth/Oauth2SimpleAuthConfig.java similarity index 90% rename from server/api-service/openblocks-sdk/src/main/java/com/openblocks/sdk/auth/Oauth2SimpleAuthConfig.java rename to server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/auth/Oauth2SimpleAuthConfig.java index 2b029c688..c1a56204f 100644 --- a/server/api-service/openblocks-sdk/src/main/java/com/openblocks/sdk/auth/Oauth2SimpleAuthConfig.java +++ b/server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/auth/Oauth2SimpleAuthConfig.java @@ -1,16 +1,16 @@ -package com.openblocks.sdk.auth; +package org.lowcoder.sdk.auth; import java.util.function.Function; import javax.annotation.Nullable; import org.apache.commons.lang3.StringUtils; +import org.lowcoder.sdk.auth.constants.AuthTypeConstants; +import org.lowcoder.sdk.auth.constants.Oauth2Constants; +import org.lowcoder.sdk.config.SerializeConfig.JsonViews; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonView; -import com.openblocks.sdk.auth.constants.AuthTypeConstants; -import com.openblocks.sdk.auth.constants.Oauth2Constants; -import com.openblocks.sdk.config.SerializeConfig.JsonViews; import lombok.Getter; diff --git a/server/api-service/openblocks-sdk/src/main/java/com/openblocks/sdk/auth/constants/AuthTypeConstants.java b/server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/auth/constants/AuthTypeConstants.java similarity index 65% rename from server/api-service/openblocks-sdk/src/main/java/com/openblocks/sdk/auth/constants/AuthTypeConstants.java rename to server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/auth/constants/AuthTypeConstants.java index 303decb3e..495e96aa7 100644 --- a/server/api-service/openblocks-sdk/src/main/java/com/openblocks/sdk/auth/constants/AuthTypeConstants.java +++ b/server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/auth/constants/AuthTypeConstants.java @@ -1,7 +1,7 @@ -package com.openblocks.sdk.auth.constants; +package org.lowcoder.sdk.auth.constants; /** - * @see com.openblocks.sdk.constants.AuthSourceConstants + * @see org.lowcoder.sdk.constants.AuthSourceConstants */ public class AuthTypeConstants { diff --git a/server/api-service/openblocks-sdk/src/main/java/com/openblocks/sdk/auth/constants/Oauth2Constants.java b/server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/auth/constants/Oauth2Constants.java similarity index 95% rename from server/api-service/openblocks-sdk/src/main/java/com/openblocks/sdk/auth/constants/Oauth2Constants.java rename to server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/auth/constants/Oauth2Constants.java index 160fcbb4e..d9522c894 100644 --- a/server/api-service/openblocks-sdk/src/main/java/com/openblocks/sdk/auth/constants/Oauth2Constants.java +++ b/server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/auth/constants/Oauth2Constants.java @@ -1,4 +1,4 @@ -package com.openblocks.sdk.auth.constants; +package org.lowcoder.sdk.auth.constants; public class Oauth2Constants { diff --git a/server/api-service/openblocks-sdk/src/main/java/com/openblocks/sdk/config/AuthProperties.java b/server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/config/AuthProperties.java similarity index 79% rename from server/api-service/openblocks-sdk/src/main/java/com/openblocks/sdk/config/AuthProperties.java rename to server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/config/AuthProperties.java index 2644d7a38..234a965a1 100644 --- a/server/api-service/openblocks-sdk/src/main/java/com/openblocks/sdk/config/AuthProperties.java +++ b/server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/config/AuthProperties.java @@ -1,21 +1,20 @@ -package com.openblocks.sdk.config; +package org.lowcoder.sdk.config; -import static com.openblocks.sdk.constants.AuthSourceConstants.GITHUB; -import static com.openblocks.sdk.constants.AuthSourceConstants.GITHUB_NAME; -import static com.openblocks.sdk.constants.AuthSourceConstants.GOOGLE; -import static com.openblocks.sdk.constants.AuthSourceConstants.GOOGLE_NAME; +import static org.lowcoder.sdk.constants.AuthSourceConstants.GITHUB; +import static org.lowcoder.sdk.constants.AuthSourceConstants.GITHUB_NAME; +import static org.lowcoder.sdk.constants.AuthSourceConstants.GOOGLE; +import static org.lowcoder.sdk.constants.AuthSourceConstants.GOOGLE_NAME; import java.util.ArrayList; import java.util.List; +import org.lowcoder.sdk.auth.AbstractAuthConfig; +import org.lowcoder.sdk.auth.EmailAuthConfig; +import org.lowcoder.sdk.auth.Oauth2SimpleAuthConfig; +import org.lowcoder.sdk.auth.constants.AuthTypeConstants; import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.stereotype.Component; -import com.openblocks.sdk.auth.AbstractAuthConfig; -import com.openblocks.sdk.auth.EmailAuthConfig; -import com.openblocks.sdk.auth.Oauth2SimpleAuthConfig; -import com.openblocks.sdk.auth.constants.AuthTypeConstants; - import lombok.Getter; import lombok.Setter; @@ -55,7 +54,7 @@ public static class Oauth2Simple extends AuthWay { } /** - * For saas mode, such as cloud.openblocks.dev + * For saas mode, such as app.lowcoder.cloud */ public List getAuthConfigs() { List authConfigs = new ArrayList<>(); diff --git a/server/api-service/openblocks-sdk/src/main/java/com/openblocks/sdk/config/CommonConfig.java b/server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/config/CommonConfig.java similarity index 96% rename from server/api-service/openblocks-sdk/src/main/java/com/openblocks/sdk/config/CommonConfig.java rename to server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/config/CommonConfig.java index 4e9b842da..778c24450 100644 --- a/server/api-service/openblocks-sdk/src/main/java/com/openblocks/sdk/config/CommonConfig.java +++ b/server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/config/CommonConfig.java @@ -1,4 +1,4 @@ -package com.openblocks.sdk.config; +package org.lowcoder.sdk.config; import java.time.Duration; import java.util.ArrayList; @@ -9,11 +9,10 @@ import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang3.StringUtils; +import org.lowcoder.sdk.constants.WorkspaceMode; import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.stereotype.Component; -import com.openblocks.sdk.constants.WorkspaceMode; - import lombok.Data; import lombok.Getter; import lombok.Setter; diff --git a/server/api-service/openblocks-sdk/src/main/java/com/openblocks/sdk/config/CommonConfigHelper.java b/server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/config/CommonConfigHelper.java similarity index 78% rename from server/api-service/openblocks-sdk/src/main/java/com/openblocks/sdk/config/CommonConfigHelper.java rename to server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/config/CommonConfigHelper.java index 5fd4b68c3..98104fb38 100644 --- a/server/api-service/openblocks-sdk/src/main/java/com/openblocks/sdk/config/CommonConfigHelper.java +++ b/server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/config/CommonConfigHelper.java @@ -1,10 +1,9 @@ -package com.openblocks.sdk.config; +package org.lowcoder.sdk.config; +import org.lowcoder.sdk.config.dynamic.ConfigCenter; +import org.lowcoder.sdk.config.dynamic.ConfigInstanceHelper; import org.springframework.stereotype.Component; -import com.openblocks.sdk.config.dynamic.ConfigCenter; -import com.openblocks.sdk.config.dynamic.ConfigInstanceHelper; - @Component public class CommonConfigHelper { diff --git a/server/api-service/openblocks-sdk/src/main/java/com/openblocks/sdk/config/MaterialProperties.java b/server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/config/MaterialProperties.java similarity index 92% rename from server/api-service/openblocks-sdk/src/main/java/com/openblocks/sdk/config/MaterialProperties.java rename to server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/config/MaterialProperties.java index 3dd983506..c3aaf598d 100644 --- a/server/api-service/openblocks-sdk/src/main/java/com/openblocks/sdk/config/MaterialProperties.java +++ b/server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/config/MaterialProperties.java @@ -1,4 +1,4 @@ -package com.openblocks.sdk.config; +package org.lowcoder.sdk.config; import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.stereotype.Component; diff --git a/server/api-service/openblocks-sdk/src/main/java/com/openblocks/sdk/config/SerializeConfig.java b/server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/config/SerializeConfig.java similarity index 85% rename from server/api-service/openblocks-sdk/src/main/java/com/openblocks/sdk/config/SerializeConfig.java rename to server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/config/SerializeConfig.java index b136d6cfb..9a3afc3dd 100644 --- a/server/api-service/openblocks-sdk/src/main/java/com/openblocks/sdk/config/SerializeConfig.java +++ b/server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/config/SerializeConfig.java @@ -1,10 +1,10 @@ -package com.openblocks.sdk.config; +package org.lowcoder.sdk.config; +import org.lowcoder.sdk.util.JsonUtils; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import com.fasterxml.jackson.databind.ObjectMapper; -import com.openblocks.sdk.util.JsonUtils; @Configuration public class SerializeConfig { diff --git a/server/api-service/openblocks-sdk/src/main/java/com/openblocks/sdk/config/dynamic/Conf.java b/server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/config/dynamic/Conf.java similarity index 84% rename from server/api-service/openblocks-sdk/src/main/java/com/openblocks/sdk/config/dynamic/Conf.java rename to server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/config/dynamic/Conf.java index 436eadb12..895e3656d 100644 --- a/server/api-service/openblocks-sdk/src/main/java/com/openblocks/sdk/config/dynamic/Conf.java +++ b/server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/config/dynamic/Conf.java @@ -1,4 +1,4 @@ -package com.openblocks.sdk.config.dynamic; +package org.lowcoder.sdk.config.dynamic; import java.util.function.Function; import java.util.function.Supplier; diff --git a/server/api-service/openblocks-sdk/src/main/java/com/openblocks/sdk/config/dynamic/ConfigCenter.java b/server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/config/dynamic/ConfigCenter.java similarity index 91% rename from server/api-service/openblocks-sdk/src/main/java/com/openblocks/sdk/config/dynamic/ConfigCenter.java rename to server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/config/dynamic/ConfigCenter.java index 1737f6501..5461d397e 100644 --- a/server/api-service/openblocks-sdk/src/main/java/com/openblocks/sdk/config/dynamic/ConfigCenter.java +++ b/server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/config/dynamic/ConfigCenter.java @@ -1,4 +1,4 @@ -package com.openblocks.sdk.config.dynamic; +package org.lowcoder.sdk.config.dynamic; public interface ConfigCenter { diff --git a/server/api-service/openblocks-sdk/src/main/java/com/openblocks/sdk/config/dynamic/ConfigCenterForTest.java b/server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/config/dynamic/ConfigCenterForTest.java similarity index 97% rename from server/api-service/openblocks-sdk/src/main/java/com/openblocks/sdk/config/dynamic/ConfigCenterForTest.java rename to server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/config/dynamic/ConfigCenterForTest.java index 23db47755..269be85bd 100644 --- a/server/api-service/openblocks-sdk/src/main/java/com/openblocks/sdk/config/dynamic/ConfigCenterForTest.java +++ b/server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/config/dynamic/ConfigCenterForTest.java @@ -1,4 +1,4 @@ -package com.openblocks.sdk.config.dynamic; +package org.lowcoder.sdk.config.dynamic; import java.util.Collections; import java.util.Map; diff --git a/server/api-service/openblocks-sdk/src/main/java/com/openblocks/sdk/config/dynamic/ConfigInstance.java b/server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/config/dynamic/ConfigInstance.java similarity index 94% rename from server/api-service/openblocks-sdk/src/main/java/com/openblocks/sdk/config/dynamic/ConfigInstance.java rename to server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/config/dynamic/ConfigInstance.java index b2e340264..d94e8e6a1 100644 --- a/server/api-service/openblocks-sdk/src/main/java/com/openblocks/sdk/config/dynamic/ConfigInstance.java +++ b/server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/config/dynamic/ConfigInstance.java @@ -1,4 +1,4 @@ -package com.openblocks.sdk.config.dynamic; +package org.lowcoder.sdk.config.dynamic; import java.util.List; import java.util.Map; diff --git a/server/api-service/openblocks-sdk/src/main/java/com/openblocks/sdk/config/dynamic/ConfigInstanceHelper.java b/server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/config/dynamic/ConfigInstanceHelper.java similarity index 97% rename from server/api-service/openblocks-sdk/src/main/java/com/openblocks/sdk/config/dynamic/ConfigInstanceHelper.java rename to server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/config/dynamic/ConfigInstanceHelper.java index c0c36f51e..90c0675ce 100644 --- a/server/api-service/openblocks-sdk/src/main/java/com/openblocks/sdk/config/dynamic/ConfigInstanceHelper.java +++ b/server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/config/dynamic/ConfigInstanceHelper.java @@ -1,4 +1,4 @@ -package com.openblocks.sdk.config.dynamic; +package org.lowcoder.sdk.config.dynamic; import java.util.List; import java.util.Map; diff --git a/server/api-service/openblocks-sdk/src/main/java/com/openblocks/sdk/config/dynamic/StaticConf.java b/server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/config/dynamic/StaticConf.java similarity index 93% rename from server/api-service/openblocks-sdk/src/main/java/com/openblocks/sdk/config/dynamic/StaticConf.java rename to server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/config/dynamic/StaticConf.java index 663d63032..af317bcf4 100644 --- a/server/api-service/openblocks-sdk/src/main/java/com/openblocks/sdk/config/dynamic/StaticConf.java +++ b/server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/config/dynamic/StaticConf.java @@ -1,4 +1,4 @@ -package com.openblocks.sdk.config.dynamic; +package org.lowcoder.sdk.config.dynamic; import java.util.Map; diff --git a/server/api-service/openblocks-sdk/src/main/java/com/openblocks/sdk/config/dynamic/StaticConfigInstanceImpl.java b/server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/config/dynamic/StaticConfigInstanceImpl.java similarity index 97% rename from server/api-service/openblocks-sdk/src/main/java/com/openblocks/sdk/config/dynamic/StaticConfigInstanceImpl.java rename to server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/config/dynamic/StaticConfigInstanceImpl.java index 29a905dfe..be50c7350 100644 --- a/server/api-service/openblocks-sdk/src/main/java/com/openblocks/sdk/config/dynamic/StaticConfigInstanceImpl.java +++ b/server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/config/dynamic/StaticConfigInstanceImpl.java @@ -1,4 +1,4 @@ -package com.openblocks.sdk.config.dynamic; +package org.lowcoder.sdk.config.dynamic; import java.util.List; import java.util.Map; diff --git a/server/api-service/openblocks-sdk/src/main/java/com/openblocks/sdk/constants/AuthSourceConstants.java b/server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/constants/AuthSourceConstants.java similarity index 85% rename from server/api-service/openblocks-sdk/src/main/java/com/openblocks/sdk/constants/AuthSourceConstants.java rename to server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/constants/AuthSourceConstants.java index ea2e4ea3c..9373c197b 100644 --- a/server/api-service/openblocks-sdk/src/main/java/com/openblocks/sdk/constants/AuthSourceConstants.java +++ b/server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/constants/AuthSourceConstants.java @@ -1,7 +1,7 @@ -package com.openblocks.sdk.constants; +package org.lowcoder.sdk.constants; /** - * @see com.openblocks.sdk.auth.constants.AuthTypeConstants + * @see org.lowcoder.sdk.auth.constants.AuthTypeConstants */ public class AuthSourceConstants { diff --git a/server/api-service/openblocks-sdk/src/main/java/com/openblocks/sdk/constants/Authentication.java b/server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/constants/Authentication.java similarity index 90% rename from server/api-service/openblocks-sdk/src/main/java/com/openblocks/sdk/constants/Authentication.java rename to server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/constants/Authentication.java index 11d6f0af3..a10c2ee03 100644 --- a/server/api-service/openblocks-sdk/src/main/java/com/openblocks/sdk/constants/Authentication.java +++ b/server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/constants/Authentication.java @@ -1,4 +1,4 @@ -package com.openblocks.sdk.constants; +package org.lowcoder.sdk.constants; public class Authentication { diff --git a/server/api-service/openblocks-sdk/src/main/java/com/openblocks/sdk/constants/ConfigTypes.java b/server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/constants/ConfigTypes.java similarity index 86% rename from server/api-service/openblocks-sdk/src/main/java/com/openblocks/sdk/constants/ConfigTypes.java rename to server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/constants/ConfigTypes.java index dfb4378b8..4329ba901 100644 --- a/server/api-service/openblocks-sdk/src/main/java/com/openblocks/sdk/constants/ConfigTypes.java +++ b/server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/constants/ConfigTypes.java @@ -1,4 +1,4 @@ -package com.openblocks.sdk.constants; +package org.lowcoder.sdk.constants; public class ConfigTypes { diff --git a/server/api-service/openblocks-sdk/src/main/java/com/openblocks/sdk/constants/DslConstants.java b/server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/constants/DslConstants.java similarity index 92% rename from server/api-service/openblocks-sdk/src/main/java/com/openblocks/sdk/constants/DslConstants.java rename to server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/constants/DslConstants.java index 8fbab98d8..b92eba3af 100644 --- a/server/api-service/openblocks-sdk/src/main/java/com/openblocks/sdk/constants/DslConstants.java +++ b/server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/constants/DslConstants.java @@ -1,4 +1,4 @@ -package com.openblocks.sdk.constants; +package org.lowcoder.sdk.constants; public class DslConstants { diff --git a/server/api-service/openblocks-sdk/src/main/java/com/openblocks/sdk/constants/FieldName.java b/server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/constants/FieldName.java similarity index 89% rename from server/api-service/openblocks-sdk/src/main/java/com/openblocks/sdk/constants/FieldName.java rename to server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/constants/FieldName.java index e448bf01b..31d86f885 100644 --- a/server/api-service/openblocks-sdk/src/main/java/com/openblocks/sdk/constants/FieldName.java +++ b/server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/constants/FieldName.java @@ -1,4 +1,4 @@ -package com.openblocks.sdk.constants; +package org.lowcoder.sdk.constants; public class FieldName { diff --git a/server/api-service/openblocks-sdk/src/main/java/com/openblocks/sdk/constants/GlobalContext.java b/server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/constants/GlobalContext.java similarity index 94% rename from server/api-service/openblocks-sdk/src/main/java/com/openblocks/sdk/constants/GlobalContext.java rename to server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/constants/GlobalContext.java index bb77af07f..e52624cec 100644 --- a/server/api-service/openblocks-sdk/src/main/java/com/openblocks/sdk/constants/GlobalContext.java +++ b/server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/constants/GlobalContext.java @@ -1,4 +1,4 @@ -package com.openblocks.sdk.constants; +package org.lowcoder.sdk.constants; public class GlobalContext { diff --git a/server/api-service/openblocks-sdk/src/main/java/com/openblocks/sdk/constants/WorkspaceMode.java b/server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/constants/WorkspaceMode.java similarity index 60% rename from server/api-service/openblocks-sdk/src/main/java/com/openblocks/sdk/constants/WorkspaceMode.java rename to server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/constants/WorkspaceMode.java index 4a9fc3f35..d52be8390 100644 --- a/server/api-service/openblocks-sdk/src/main/java/com/openblocks/sdk/constants/WorkspaceMode.java +++ b/server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/constants/WorkspaceMode.java @@ -1,4 +1,4 @@ -package com.openblocks.sdk.constants; +package org.lowcoder.sdk.constants; public enum WorkspaceMode { diff --git a/server/api-service/openblocks-sdk/src/main/java/com/openblocks/sdk/destructor/DestructorUtil.java b/server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/destructor/DestructorUtil.java similarity index 95% rename from server/api-service/openblocks-sdk/src/main/java/com/openblocks/sdk/destructor/DestructorUtil.java rename to server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/destructor/DestructorUtil.java index dcc931efa..7429b17b5 100644 --- a/server/api-service/openblocks-sdk/src/main/java/com/openblocks/sdk/destructor/DestructorUtil.java +++ b/server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/destructor/DestructorUtil.java @@ -1,4 +1,4 @@ -package com.openblocks.sdk.destructor; +package org.lowcoder.sdk.destructor; import java.util.Queue; import java.util.concurrent.LinkedBlockingQueue; diff --git a/server/api-service/openblocks-sdk/src/main/java/com/openblocks/sdk/event/BeforeSaveEvent.java b/server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/event/BeforeSaveEvent.java similarity index 58% rename from server/api-service/openblocks-sdk/src/main/java/com/openblocks/sdk/event/BeforeSaveEvent.java rename to server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/event/BeforeSaveEvent.java index e7c5dc631..0ba75f2c6 100644 --- a/server/api-service/openblocks-sdk/src/main/java/com/openblocks/sdk/event/BeforeSaveEvent.java +++ b/server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/event/BeforeSaveEvent.java @@ -1,4 +1,4 @@ -package com.openblocks.sdk.event; +package org.lowcoder.sdk.event; public record BeforeSaveEvent(T source) { } diff --git a/server/api-service/openblocks-sdk/src/main/java/com/openblocks/sdk/exception/BaseException.java b/server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/exception/BaseException.java similarity index 80% rename from server/api-service/openblocks-sdk/src/main/java/com/openblocks/sdk/exception/BaseException.java rename to server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/exception/BaseException.java index ece4cddd5..1225adf5a 100644 --- a/server/api-service/openblocks-sdk/src/main/java/com/openblocks/sdk/exception/BaseException.java +++ b/server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/exception/BaseException.java @@ -1,4 +1,4 @@ -package com.openblocks.sdk.exception; +package org.lowcoder.sdk.exception; /** * marker interface diff --git a/server/api-service/openblocks-sdk/src/main/java/com/openblocks/sdk/exception/BizError.java b/server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/exception/BizError.java similarity index 95% rename from server/api-service/openblocks-sdk/src/main/java/com/openblocks/sdk/exception/BizError.java rename to server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/exception/BizError.java index 8d8897ab1..2addae787 100644 --- a/server/api-service/openblocks-sdk/src/main/java/com/openblocks/sdk/exception/BizError.java +++ b/server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/exception/BizError.java @@ -1,8 +1,9 @@ -package com.openblocks.sdk.exception; +package org.lowcoder.sdk.exception; + +import static org.lowcoder.sdk.exception.ErrorLogType.SIMPLE; +import static org.lowcoder.sdk.exception.ErrorLogType.VERBOSE; +import static org.lowcoder.sdk.util.EnumUtils.checkDuplicates; -import static com.openblocks.sdk.exception.ErrorLogType.SIMPLE; -import static com.openblocks.sdk.exception.ErrorLogType.VERBOSE; -import static com.openblocks.sdk.util.EnumUtils.checkDuplicates; import lombok.Getter; @Getter diff --git a/server/api-service/openblocks-sdk/src/main/java/com/openblocks/sdk/exception/BizException.java b/server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/exception/BizException.java similarity index 92% rename from server/api-service/openblocks-sdk/src/main/java/com/openblocks/sdk/exception/BizException.java rename to server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/exception/BizException.java index 03e2cca87..1f440e4d3 100644 --- a/server/api-service/openblocks-sdk/src/main/java/com/openblocks/sdk/exception/BizException.java +++ b/server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/exception/BizException.java @@ -1,8 +1,8 @@ -package com.openblocks.sdk.exception; +package org.lowcoder.sdk.exception; import java.util.Locale; -import com.openblocks.sdk.util.LocaleUtils; +import org.lowcoder.sdk.util.LocaleUtils; import lombok.Getter; diff --git a/server/api-service/openblocks-sdk/src/main/java/com/openblocks/sdk/exception/ErrorLogType.java b/server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/exception/ErrorLogType.java similarity index 59% rename from server/api-service/openblocks-sdk/src/main/java/com/openblocks/sdk/exception/ErrorLogType.java rename to server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/exception/ErrorLogType.java index 2cb2ac1a3..b84f97cb4 100644 --- a/server/api-service/openblocks-sdk/src/main/java/com/openblocks/sdk/exception/ErrorLogType.java +++ b/server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/exception/ErrorLogType.java @@ -1,4 +1,4 @@ -package com.openblocks.sdk.exception; +package org.lowcoder.sdk.exception; public enum ErrorLogType { SIMPLE, diff --git a/server/api-service/openblocks-sdk/src/main/java/com/openblocks/sdk/exception/InvalidHikariDatasourceException.java b/server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/exception/InvalidHikariDatasourceException.java similarity index 64% rename from server/api-service/openblocks-sdk/src/main/java/com/openblocks/sdk/exception/InvalidHikariDatasourceException.java rename to server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/exception/InvalidHikariDatasourceException.java index fc09fda71..277423029 100644 --- a/server/api-service/openblocks-sdk/src/main/java/com/openblocks/sdk/exception/InvalidHikariDatasourceException.java +++ b/server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/exception/InvalidHikariDatasourceException.java @@ -1,6 +1,6 @@ -package com.openblocks.sdk.exception; +package org.lowcoder.sdk.exception; -import static com.openblocks.sdk.exception.PluginCommonError.CONNECTION_ERROR; +import static org.lowcoder.sdk.exception.PluginCommonError.CONNECTION_ERROR; public class InvalidHikariDatasourceException extends PluginException { diff --git a/server/api-service/openblocks-sdk/src/main/java/com/openblocks/sdk/exception/PluginCommonError.java b/server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/exception/PluginCommonError.java similarity index 96% rename from server/api-service/openblocks-sdk/src/main/java/com/openblocks/sdk/exception/PluginCommonError.java rename to server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/exception/PluginCommonError.java index eac345a3a..72668994f 100644 --- a/server/api-service/openblocks-sdk/src/main/java/com/openblocks/sdk/exception/PluginCommonError.java +++ b/server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/exception/PluginCommonError.java @@ -1,4 +1,4 @@ -package com.openblocks.sdk.exception; +package org.lowcoder.sdk.exception; public enum PluginCommonError implements PluginError { diff --git a/server/api-service/openblocks-sdk/src/main/java/com/openblocks/sdk/exception/PluginError.java b/server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/exception/PluginError.java similarity index 81% rename from server/api-service/openblocks-sdk/src/main/java/com/openblocks/sdk/exception/PluginError.java rename to server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/exception/PluginError.java index 9d259ace3..39133c0bc 100644 --- a/server/api-service/openblocks-sdk/src/main/java/com/openblocks/sdk/exception/PluginError.java +++ b/server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/exception/PluginError.java @@ -1,4 +1,4 @@ -package com.openblocks.sdk.exception; +package org.lowcoder.sdk.exception; import java.io.Serializable; diff --git a/server/api-service/openblocks-sdk/src/main/java/com/openblocks/sdk/exception/PluginException.java b/server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/exception/PluginException.java similarity index 91% rename from server/api-service/openblocks-sdk/src/main/java/com/openblocks/sdk/exception/PluginException.java rename to server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/exception/PluginException.java index 550de8ee8..c9a99260a 100644 --- a/server/api-service/openblocks-sdk/src/main/java/com/openblocks/sdk/exception/PluginException.java +++ b/server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/exception/PluginException.java @@ -1,9 +1,10 @@ -package com.openblocks.sdk.exception; +package org.lowcoder.sdk.exception; import java.util.Locale; +import org.lowcoder.sdk.util.LocaleUtils; + import com.google.common.base.Preconditions; -import com.openblocks.sdk.util.LocaleUtils; import lombok.Getter; diff --git a/server/api-service/openblocks-sdk/src/main/java/com/openblocks/sdk/exception/ServerException.java b/server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/exception/ServerException.java similarity index 88% rename from server/api-service/openblocks-sdk/src/main/java/com/openblocks/sdk/exception/ServerException.java rename to server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/exception/ServerException.java index 96138db03..d56cef2bb 100644 --- a/server/api-service/openblocks-sdk/src/main/java/com/openblocks/sdk/exception/ServerException.java +++ b/server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/exception/ServerException.java @@ -1,4 +1,4 @@ -package com.openblocks.sdk.exception; +package org.lowcoder.sdk.exception; import org.slf4j.helpers.MessageFormatter; diff --git a/server/api-service/openblocks-sdk/src/main/java/com/openblocks/sdk/models/DatasourceConnectionConfig.java b/server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/models/DatasourceConnectionConfig.java similarity index 92% rename from server/api-service/openblocks-sdk/src/main/java/com/openblocks/sdk/models/DatasourceConnectionConfig.java rename to server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/models/DatasourceConnectionConfig.java index 8e6c83e20..923e1cda8 100644 --- a/server/api-service/openblocks-sdk/src/main/java/com/openblocks/sdk/models/DatasourceConnectionConfig.java +++ b/server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/models/DatasourceConnectionConfig.java @@ -1,4 +1,4 @@ -package com.openblocks.sdk.models; +package org.lowcoder.sdk.models; import java.util.function.Function; diff --git a/server/api-service/openblocks-sdk/src/main/java/com/openblocks/sdk/models/DatasourceStructure.java b/server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/models/DatasourceStructure.java similarity index 99% rename from server/api-service/openblocks-sdk/src/main/java/com/openblocks/sdk/models/DatasourceStructure.java rename to server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/models/DatasourceStructure.java index 6b02b5be6..c64fd41a2 100644 --- a/server/api-service/openblocks-sdk/src/main/java/com/openblocks/sdk/models/DatasourceStructure.java +++ b/server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/models/DatasourceStructure.java @@ -17,7 +17,7 @@ // copied and adapted for datasource meta structure -package com.openblocks.sdk.models; +package org.lowcoder.sdk.models; import java.lang.reflect.Type; import java.util.List; diff --git a/server/api-service/openblocks-sdk/src/main/java/com/openblocks/sdk/models/DatasourceTestResult.java b/server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/models/DatasourceTestResult.java similarity index 92% rename from server/api-service/openblocks-sdk/src/main/java/com/openblocks/sdk/models/DatasourceTestResult.java rename to server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/models/DatasourceTestResult.java index a39636542..37cb5702f 100644 --- a/server/api-service/openblocks-sdk/src/main/java/com/openblocks/sdk/models/DatasourceTestResult.java +++ b/server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/models/DatasourceTestResult.java @@ -1,12 +1,12 @@ -package com.openblocks.sdk.models; +package org.lowcoder.sdk.models; import java.util.Locale; import java.util.concurrent.TimeoutException; import javax.annotation.Nonnull; -import com.openblocks.sdk.exception.PluginException; -import com.openblocks.sdk.util.LocaleUtils; +import org.lowcoder.sdk.exception.PluginException; +import org.lowcoder.sdk.util.LocaleUtils; public class DatasourceTestResult { diff --git a/server/api-service/openblocks-sdk/src/main/java/com/openblocks/sdk/models/Encrypt.java b/server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/models/Encrypt.java similarity index 86% rename from server/api-service/openblocks-sdk/src/main/java/com/openblocks/sdk/models/Encrypt.java rename to server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/models/Encrypt.java index f687960f5..d5a165a0c 100644 --- a/server/api-service/openblocks-sdk/src/main/java/com/openblocks/sdk/models/Encrypt.java +++ b/server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/models/Encrypt.java @@ -1,4 +1,4 @@ -package com.openblocks.sdk.models; +package org.lowcoder.sdk.models; import java.util.function.Function; diff --git a/server/api-service/openblocks-sdk/src/main/java/com/openblocks/sdk/models/Endpoint.java b/server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/models/Endpoint.java similarity index 94% rename from server/api-service/openblocks-sdk/src/main/java/com/openblocks/sdk/models/Endpoint.java rename to server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/models/Endpoint.java index 151f534e8..2f7a40f82 100644 --- a/server/api-service/openblocks-sdk/src/main/java/com/openblocks/sdk/models/Endpoint.java +++ b/server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/models/Endpoint.java @@ -1,4 +1,4 @@ -package com.openblocks.sdk.models; +package org.lowcoder.sdk.models; import org.apache.commons.lang3.StringUtils; diff --git a/server/api-service/openblocks-sdk/src/main/java/com/openblocks/sdk/models/HasIdAndAuditing.java b/server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/models/HasIdAndAuditing.java similarity index 97% rename from server/api-service/openblocks-sdk/src/main/java/com/openblocks/sdk/models/HasIdAndAuditing.java rename to server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/models/HasIdAndAuditing.java index 0c4f4431a..240f72f59 100644 --- a/server/api-service/openblocks-sdk/src/main/java/com/openblocks/sdk/models/HasIdAndAuditing.java +++ b/server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/models/HasIdAndAuditing.java @@ -1,4 +1,4 @@ -package com.openblocks.sdk.models; +package org.lowcoder.sdk.models; import java.time.Instant; diff --git a/server/api-service/openblocks-sdk/src/main/java/com/openblocks/sdk/models/JsDatasourceConnectionConfig.java b/server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/models/JsDatasourceConnectionConfig.java similarity index 97% rename from server/api-service/openblocks-sdk/src/main/java/com/openblocks/sdk/models/JsDatasourceConnectionConfig.java rename to server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/models/JsDatasourceConnectionConfig.java index c4bb7a336..96749d228 100644 --- a/server/api-service/openblocks-sdk/src/main/java/com/openblocks/sdk/models/JsDatasourceConnectionConfig.java +++ b/server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/models/JsDatasourceConnectionConfig.java @@ -1,8 +1,8 @@ -package com.openblocks.sdk.models; +package org.lowcoder.sdk.models; -import static com.openblocks.sdk.exception.BizError.INVALID_DATASOURCE_CONFIG_TYPE; -import static com.openblocks.sdk.util.ExceptionUtils.ofException; import static org.apache.commons.lang3.ObjectUtils.firstNonNull; +import static org.lowcoder.sdk.exception.BizError.INVALID_DATASOURCE_CONFIG_TYPE; +import static org.lowcoder.sdk.util.ExceptionUtils.ofException; import java.util.Collections; import java.util.HashMap; diff --git a/server/api-service/openblocks-sdk/src/main/java/com/openblocks/sdk/models/LocaleMessage.java b/server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/models/LocaleMessage.java similarity index 82% rename from server/api-service/openblocks-sdk/src/main/java/com/openblocks/sdk/models/LocaleMessage.java rename to server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/models/LocaleMessage.java index ba7de4dea..4d66e9d93 100644 --- a/server/api-service/openblocks-sdk/src/main/java/com/openblocks/sdk/models/LocaleMessage.java +++ b/server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/models/LocaleMessage.java @@ -1,4 +1,4 @@ -package com.openblocks.sdk.models; +package org.lowcoder.sdk.models; public record LocaleMessage(String messageKey, Object... args) { diff --git a/server/api-service/openblocks-sdk/src/main/java/com/openblocks/sdk/models/Param.java b/server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/models/Param.java similarity index 93% rename from server/api-service/openblocks-sdk/src/main/java/com/openblocks/sdk/models/Param.java rename to server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/models/Param.java index 57da34b23..8052c6b91 100644 --- a/server/api-service/openblocks-sdk/src/main/java/com/openblocks/sdk/models/Param.java +++ b/server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/models/Param.java @@ -1,4 +1,4 @@ -package com.openblocks.sdk.models; +package org.lowcoder.sdk.models; import java.io.Serializable; diff --git a/server/api-service/openblocks-sdk/src/main/java/com/openblocks/sdk/models/Property.java b/server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/models/Property.java similarity index 88% rename from server/api-service/openblocks-sdk/src/main/java/com/openblocks/sdk/models/Property.java rename to server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/models/Property.java index 1a683e162..9b18bc3d0 100644 --- a/server/api-service/openblocks-sdk/src/main/java/com/openblocks/sdk/models/Property.java +++ b/server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/models/Property.java @@ -1,7 +1,8 @@ -package com.openblocks.sdk.models; +package org.lowcoder.sdk.models; + +import org.lowcoder.sdk.plugin.restapi.DataUtils.MultipartFormDataType; import com.fasterxml.jackson.annotation.JsonCreator; -import com.openblocks.sdk.plugin.restapi.DataUtils.MultipartFormDataType; import lombok.EqualsAndHashCode; import lombok.ToString; diff --git a/server/api-service/openblocks-sdk/src/main/java/com/openblocks/sdk/models/QueryExecutionResult.java b/server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/models/QueryExecutionResult.java similarity index 95% rename from server/api-service/openblocks-sdk/src/main/java/com/openblocks/sdk/models/QueryExecutionResult.java rename to server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/models/QueryExecutionResult.java index 222595563..12351f06b 100644 --- a/server/api-service/openblocks-sdk/src/main/java/com/openblocks/sdk/models/QueryExecutionResult.java +++ b/server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/models/QueryExecutionResult.java @@ -1,16 +1,16 @@ -package com.openblocks.sdk.models; +package org.lowcoder.sdk.models; import java.util.ArrayList; import java.util.List; import org.apache.commons.lang3.StringUtils; +import org.lowcoder.sdk.exception.PluginError; +import org.lowcoder.sdk.exception.PluginException; import org.springframework.http.HttpStatus; import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.databind.JsonNode; -import com.openblocks.sdk.exception.PluginError; -import com.openblocks.sdk.exception.PluginException; import lombok.Getter; diff --git a/server/api-service/openblocks-sdk/src/main/java/com/openblocks/sdk/models/RestBodyFormFileData.java b/server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/models/RestBodyFormFileData.java similarity index 78% rename from server/api-service/openblocks-sdk/src/main/java/com/openblocks/sdk/models/RestBodyFormFileData.java rename to server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/models/RestBodyFormFileData.java index 472b3b563..ade3366ab 100644 --- a/server/api-service/openblocks-sdk/src/main/java/com/openblocks/sdk/models/RestBodyFormFileData.java +++ b/server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/models/RestBodyFormFileData.java @@ -1,9 +1,9 @@ -package com.openblocks.sdk.models; +package org.lowcoder.sdk.models; import java.util.List; -import com.openblocks.sdk.plugin.restapi.DataUtils.MultipartFormDataType; -import com.openblocks.sdk.plugin.restapi.MultipartFormData; +import org.lowcoder.sdk.plugin.restapi.MultipartFormData; +import org.lowcoder.sdk.plugin.restapi.DataUtils.MultipartFormDataType; public class RestBodyFormFileData extends Property { diff --git a/server/api-service/openblocks-sdk/src/main/java/com/openblocks/sdk/models/TokenBasedConnectionDetail.java b/server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/models/TokenBasedConnectionDetail.java similarity index 86% rename from server/api-service/openblocks-sdk/src/main/java/com/openblocks/sdk/models/TokenBasedConnectionDetail.java rename to server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/models/TokenBasedConnectionDetail.java index 4a4b7f6fe..1ae0317e6 100644 --- a/server/api-service/openblocks-sdk/src/main/java/com/openblocks/sdk/models/TokenBasedConnectionDetail.java +++ b/server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/models/TokenBasedConnectionDetail.java @@ -1,4 +1,4 @@ -package com.openblocks.sdk.models; +package org.lowcoder.sdk.models; import java.util.Map; diff --git a/server/api-service/openblocks-sdk/src/main/java/com/openblocks/sdk/models/VersionedModel.java b/server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/models/VersionedModel.java similarity index 74% rename from server/api-service/openblocks-sdk/src/main/java/com/openblocks/sdk/models/VersionedModel.java rename to server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/models/VersionedModel.java index 824d5f871..e2a545c9a 100644 --- a/server/api-service/openblocks-sdk/src/main/java/com/openblocks/sdk/models/VersionedModel.java +++ b/server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/models/VersionedModel.java @@ -1,4 +1,4 @@ -package com.openblocks.sdk.models; +package org.lowcoder.sdk.models; public interface VersionedModel { diff --git a/server/api-service/openblocks-sdk/src/main/java/com/openblocks/sdk/plugin/common/BlockingDatasourceConnector.java b/server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/plugin/common/BlockingDatasourceConnector.java similarity index 84% rename from server/api-service/openblocks-sdk/src/main/java/com/openblocks/sdk/plugin/common/BlockingDatasourceConnector.java rename to server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/plugin/common/BlockingDatasourceConnector.java index 24679016c..5d97f9e58 100644 --- a/server/api-service/openblocks-sdk/src/main/java/com/openblocks/sdk/plugin/common/BlockingDatasourceConnector.java +++ b/server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/plugin/common/BlockingDatasourceConnector.java @@ -1,11 +1,11 @@ -package com.openblocks.sdk.plugin.common; +package org.lowcoder.sdk.plugin.common; -import static com.openblocks.sdk.plugin.common.QueryExecutionUtils.querySharedScheduler; +import static org.lowcoder.sdk.plugin.common.QueryExecutionUtils.querySharedScheduler; import javax.annotation.Nonnull; -import com.openblocks.sdk.models.DatasourceConnectionConfig; -import com.openblocks.sdk.models.DatasourceTestResult; +import org.lowcoder.sdk.models.DatasourceConnectionConfig; +import org.lowcoder.sdk.models.DatasourceTestResult; import reactor.core.publisher.Mono; diff --git a/server/api-service/openblocks-sdk/src/main/java/com/openblocks/sdk/plugin/common/BlockingQueryExecutor.java b/server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/plugin/common/BlockingQueryExecutor.java similarity index 77% rename from server/api-service/openblocks-sdk/src/main/java/com/openblocks/sdk/plugin/common/BlockingQueryExecutor.java rename to server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/plugin/common/BlockingQueryExecutor.java index 70a500249..8a2eee5ea 100644 --- a/server/api-service/openblocks-sdk/src/main/java/com/openblocks/sdk/plugin/common/BlockingQueryExecutor.java +++ b/server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/plugin/common/BlockingQueryExecutor.java @@ -1,13 +1,13 @@ -package com.openblocks.sdk.plugin.common; +package org.lowcoder.sdk.plugin.common; -import static com.openblocks.sdk.plugin.common.QueryExecutionUtils.querySharedScheduler; +import static org.lowcoder.sdk.plugin.common.QueryExecutionUtils.querySharedScheduler; import javax.annotation.Nonnull; -import com.openblocks.sdk.models.DatasourceConnectionConfig; -import com.openblocks.sdk.models.DatasourceStructure; -import com.openblocks.sdk.models.QueryExecutionResult; -import com.openblocks.sdk.query.QueryExecutionContext; +import org.lowcoder.sdk.models.DatasourceConnectionConfig; +import org.lowcoder.sdk.models.DatasourceStructure; +import org.lowcoder.sdk.models.QueryExecutionResult; +import org.lowcoder.sdk.query.QueryExecutionContext; import reactor.core.publisher.Mono; diff --git a/server/api-service/openblocks-sdk/src/main/java/com/openblocks/sdk/plugin/common/DatasourceConnector.java b/server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/plugin/common/DatasourceConnector.java similarity index 83% rename from server/api-service/openblocks-sdk/src/main/java/com/openblocks/sdk/plugin/common/DatasourceConnector.java rename to server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/plugin/common/DatasourceConnector.java index c9919a61b..b974eb1f3 100644 --- a/server/api-service/openblocks-sdk/src/main/java/com/openblocks/sdk/plugin/common/DatasourceConnector.java +++ b/server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/plugin/common/DatasourceConnector.java @@ -1,10 +1,10 @@ -package com.openblocks.sdk.plugin.common; +package org.lowcoder.sdk.plugin.common; -import static com.openblocks.sdk.exception.PluginCommonError.DATASOURCE_TIMEOUT_ERROR; -import static com.openblocks.sdk.exception.PluginCommonError.QUERY_EXECUTION_ERROR; -import static com.openblocks.sdk.util.ExceptionUtils.ofPluginException; -import static com.openblocks.sdk.util.JsonUtils.fromJson; -import static com.openblocks.sdk.util.JsonUtils.toJson; +import static org.lowcoder.sdk.exception.PluginCommonError.DATASOURCE_TIMEOUT_ERROR; +import static org.lowcoder.sdk.exception.PluginCommonError.QUERY_EXECUTION_ERROR; +import static org.lowcoder.sdk.util.ExceptionUtils.ofPluginException; +import static org.lowcoder.sdk.util.JsonUtils.fromJson; +import static org.lowcoder.sdk.util.JsonUtils.toJson; import java.time.Duration; import java.util.Map; @@ -13,14 +13,14 @@ import javax.annotation.Nonnull; +import org.lowcoder.sdk.exception.PluginCommonError; +import org.lowcoder.sdk.exception.PluginException; +import org.lowcoder.sdk.models.DatasourceConnectionConfig; +import org.lowcoder.sdk.models.DatasourceTestResult; +import org.lowcoder.sdk.models.TokenBasedConnectionDetail; import org.pf4j.ExtensionPoint; import com.google.common.reflect.TypeToken; -import com.openblocks.sdk.exception.PluginCommonError; -import com.openblocks.sdk.exception.PluginException; -import com.openblocks.sdk.models.DatasourceConnectionConfig; -import com.openblocks.sdk.models.DatasourceTestResult; -import com.openblocks.sdk.models.TokenBasedConnectionDetail; import reactor.core.publisher.Mono; diff --git a/server/api-service/openblocks-sdk/src/main/java/com/openblocks/sdk/plugin/common/DatasourceQueryEngine.java b/server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/plugin/common/DatasourceQueryEngine.java similarity index 76% rename from server/api-service/openblocks-sdk/src/main/java/com/openblocks/sdk/plugin/common/DatasourceQueryEngine.java rename to server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/plugin/common/DatasourceQueryEngine.java index 317a71b27..13116ceba 100644 --- a/server/api-service/openblocks-sdk/src/main/java/com/openblocks/sdk/plugin/common/DatasourceQueryEngine.java +++ b/server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/plugin/common/DatasourceQueryEngine.java @@ -1,7 +1,7 @@ -package com.openblocks.sdk.plugin.common; +package org.lowcoder.sdk.plugin.common; -import com.openblocks.sdk.models.DatasourceConnectionConfig; -import com.openblocks.sdk.query.QueryExecutionContext; +import org.lowcoder.sdk.models.DatasourceConnectionConfig; +import org.lowcoder.sdk.query.QueryExecutionContext; /** * This interface is responsible for: diff --git a/server/api-service/openblocks-sdk/src/main/java/com/openblocks/sdk/plugin/common/QueryExecutionUtils.java b/server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/plugin/common/QueryExecutionUtils.java similarity index 98% rename from server/api-service/openblocks-sdk/src/main/java/com/openblocks/sdk/plugin/common/QueryExecutionUtils.java rename to server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/plugin/common/QueryExecutionUtils.java index eed08799a..ef61791c0 100644 --- a/server/api-service/openblocks-sdk/src/main/java/com/openblocks/sdk/plugin/common/QueryExecutionUtils.java +++ b/server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/plugin/common/QueryExecutionUtils.java @@ -1,4 +1,4 @@ -package com.openblocks.sdk.plugin.common; +package org.lowcoder.sdk.plugin.common; import java.util.Arrays; import java.util.HashMap; diff --git a/server/api-service/openblocks-sdk/src/main/java/com/openblocks/sdk/plugin/common/QueryExecutor.java b/server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/plugin/common/QueryExecutor.java similarity index 86% rename from server/api-service/openblocks-sdk/src/main/java/com/openblocks/sdk/plugin/common/QueryExecutor.java rename to server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/plugin/common/QueryExecutor.java index 4c58eb7a6..84cfda16c 100644 --- a/server/api-service/openblocks-sdk/src/main/java/com/openblocks/sdk/plugin/common/QueryExecutor.java +++ b/server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/plugin/common/QueryExecutor.java @@ -1,24 +1,23 @@ -package com.openblocks.sdk.plugin.common; +package org.lowcoder.sdk.plugin.common; -import static com.openblocks.sdk.exception.PluginCommonError.QUERY_EXECUTION_ERROR; -import static com.openblocks.sdk.util.ExceptionUtils.ofPluginError; -import static com.openblocks.sdk.util.ExceptionUtils.ofPluginException; -import static com.openblocks.sdk.util.ExceptionUtils.propagateError; +import static org.lowcoder.sdk.exception.PluginCommonError.QUERY_EXECUTION_ERROR; +import static org.lowcoder.sdk.util.ExceptionUtils.ofPluginError; +import static org.lowcoder.sdk.util.ExceptionUtils.ofPluginException; +import static org.lowcoder.sdk.util.ExceptionUtils.propagateError; import java.util.Map; +import org.lowcoder.sdk.exception.BizException; +import org.lowcoder.sdk.exception.PluginCommonError; +import org.lowcoder.sdk.exception.PluginException; +import org.lowcoder.sdk.models.DatasourceConnectionConfig; +import org.lowcoder.sdk.models.DatasourceStructure; +import org.lowcoder.sdk.models.QueryExecutionResult; +import org.lowcoder.sdk.query.QueryExecutionContext; +import org.lowcoder.sdk.query.QueryVisitorContext; +import org.lowcoder.sdk.util.ExceptionUtils; import org.pf4j.ExtensionPoint; -import com.openblocks.sdk.exception.BizException; -import com.openblocks.sdk.exception.PluginCommonError; -import com.openblocks.sdk.exception.PluginException; -import com.openblocks.sdk.models.DatasourceConnectionConfig; -import com.openblocks.sdk.models.DatasourceStructure; -import com.openblocks.sdk.models.QueryExecutionResult; -import com.openblocks.sdk.query.QueryExecutionContext; -import com.openblocks.sdk.query.QueryVisitorContext; -import com.openblocks.sdk.util.ExceptionUtils; - import reactor.core.publisher.Mono; /** diff --git a/server/api-service/openblocks-sdk/src/main/java/com/openblocks/sdk/plugin/common/RestApiUriBuilder.java b/server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/plugin/common/RestApiUriBuilder.java similarity index 85% rename from server/api-service/openblocks-sdk/src/main/java/com/openblocks/sdk/plugin/common/RestApiUriBuilder.java rename to server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/plugin/common/RestApiUriBuilder.java index 92c368d7b..90ac5d4d9 100644 --- a/server/api-service/openblocks-sdk/src/main/java/com/openblocks/sdk/plugin/common/RestApiUriBuilder.java +++ b/server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/plugin/common/RestApiUriBuilder.java @@ -1,8 +1,8 @@ -package com.openblocks.sdk.plugin.common; +package org.lowcoder.sdk.plugin.common; -import static com.openblocks.sdk.exception.PluginCommonError.QUERY_ARGUMENT_ERROR; -import static com.openblocks.sdk.util.ExceptionUtils.wrapException; -import static com.openblocks.sdk.util.MustacheHelper.renderMustacheString; +import static org.lowcoder.sdk.exception.PluginCommonError.QUERY_ARGUMENT_ERROR; +import static org.lowcoder.sdk.util.ExceptionUtils.wrapException; +import static org.lowcoder.sdk.util.MustacheHelper.renderMustacheString; import java.net.URI; import java.net.URISyntaxException; @@ -10,8 +10,7 @@ import org.apache.commons.lang3.StringUtils; import org.apache.http.client.utils.URIBuilder; - -import com.openblocks.sdk.exception.PluginException; +import org.lowcoder.sdk.exception.PluginException; public final class RestApiUriBuilder { diff --git a/server/api-service/openblocks-sdk/src/main/java/com/openblocks/sdk/plugin/common/SqlQueryUtils.java b/server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/plugin/common/SqlQueryUtils.java similarity index 97% rename from server/api-service/openblocks-sdk/src/main/java/com/openblocks/sdk/plugin/common/SqlQueryUtils.java rename to server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/plugin/common/SqlQueryUtils.java index 2627163bc..01bacfee2 100644 --- a/server/api-service/openblocks-sdk/src/main/java/com/openblocks/sdk/plugin/common/SqlQueryUtils.java +++ b/server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/plugin/common/SqlQueryUtils.java @@ -1,4 +1,4 @@ -package com.openblocks.sdk.plugin.common; +package org.lowcoder.sdk.plugin.common; public class SqlQueryUtils { diff --git a/server/api-service/openblocks-sdk/src/main/java/com/openblocks/sdk/plugin/common/constant/Constants.java b/server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/plugin/common/constant/Constants.java similarity index 93% rename from server/api-service/openblocks-sdk/src/main/java/com/openblocks/sdk/plugin/common/constant/Constants.java rename to server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/plugin/common/constant/Constants.java index 3dd1bc529..67f6e6afd 100644 --- a/server/api-service/openblocks-sdk/src/main/java/com/openblocks/sdk/plugin/common/constant/Constants.java +++ b/server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/plugin/common/constant/Constants.java @@ -1,4 +1,4 @@ -package com.openblocks.sdk.plugin.common.constant; +package org.lowcoder.sdk.plugin.common.constant; public final class Constants { diff --git a/server/api-service/openblocks-sdk/src/main/java/com/openblocks/sdk/plugin/common/sql/HikariPerfWrapper.java b/server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/plugin/common/sql/HikariPerfWrapper.java similarity index 98% rename from server/api-service/openblocks-sdk/src/main/java/com/openblocks/sdk/plugin/common/sql/HikariPerfWrapper.java rename to server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/plugin/common/sql/HikariPerfWrapper.java index fb7dee1f5..8989f5ed1 100644 --- a/server/api-service/openblocks-sdk/src/main/java/com/openblocks/sdk/plugin/common/sql/HikariPerfWrapper.java +++ b/server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/plugin/common/sql/HikariPerfWrapper.java @@ -1,4 +1,4 @@ -package com.openblocks.sdk.plugin.common.sql; +package org.lowcoder.sdk.plugin.common.sql; import java.util.Properties; import java.util.function.Supplier; diff --git a/server/api-service/openblocks-sdk/src/main/java/com/openblocks/sdk/plugin/common/sql/ResultSetParser.java b/server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/plugin/common/sql/ResultSetParser.java similarity index 97% rename from server/api-service/openblocks-sdk/src/main/java/com/openblocks/sdk/plugin/common/sql/ResultSetParser.java rename to server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/plugin/common/sql/ResultSetParser.java index cb2f4e16f..32f8d3cd3 100644 --- a/server/api-service/openblocks-sdk/src/main/java/com/openblocks/sdk/plugin/common/sql/ResultSetParser.java +++ b/server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/plugin/common/sql/ResultSetParser.java @@ -1,6 +1,6 @@ -package com.openblocks.sdk.plugin.common.sql; +package org.lowcoder.sdk.plugin.common.sql; -import static com.openblocks.sdk.util.DateTimeUtils.DATE_TIME_FORMAT; +import static org.lowcoder.sdk.util.DateTimeUtils.DATE_TIME_FORMAT; import java.sql.ResultSet; import java.sql.ResultSetMetaData; diff --git a/server/api-service/openblocks-sdk/src/main/java/com/openblocks/sdk/plugin/common/sql/SqlBasedDatasourceConnectionConfig.java b/server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/plugin/common/sql/SqlBasedDatasourceConnectionConfig.java similarity index 93% rename from server/api-service/openblocks-sdk/src/main/java/com/openblocks/sdk/plugin/common/sql/SqlBasedDatasourceConnectionConfig.java rename to server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/plugin/common/sql/SqlBasedDatasourceConnectionConfig.java index b4751979f..6f8dfd292 100644 --- a/server/api-service/openblocks-sdk/src/main/java/com/openblocks/sdk/plugin/common/sql/SqlBasedDatasourceConnectionConfig.java +++ b/server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/plugin/common/sql/SqlBasedDatasourceConnectionConfig.java @@ -1,9 +1,9 @@ -package com.openblocks.sdk.plugin.common.sql; +package org.lowcoder.sdk.plugin.common.sql; -import static com.openblocks.sdk.exception.BizError.INVALID_DATASOURCE_CONFIG_TYPE; -import static com.openblocks.sdk.util.ExceptionUtils.ofException; import static org.apache.commons.collections4.MapUtils.emptyIfNull; import static org.apache.commons.lang3.ObjectUtils.firstNonNull; +import static org.lowcoder.sdk.exception.BizError.INVALID_DATASOURCE_CONFIG_TYPE; +import static org.lowcoder.sdk.util.ExceptionUtils.ofException; import java.lang.reflect.Constructor; import java.lang.reflect.InvocationTargetException; @@ -11,11 +11,11 @@ import java.util.function.Function; import org.apache.commons.lang3.StringUtils; +import org.lowcoder.sdk.config.SerializeConfig.JsonViews; +import org.lowcoder.sdk.exception.ServerException; +import org.lowcoder.sdk.models.DatasourceConnectionConfig; import com.fasterxml.jackson.annotation.JsonView; -import com.openblocks.sdk.config.SerializeConfig.JsonViews; -import com.openblocks.sdk.exception.ServerException; -import com.openblocks.sdk.models.DatasourceConnectionConfig; import lombok.Getter; import lombok.experimental.SuperBuilder; diff --git a/server/api-service/openblocks-sdk/src/main/java/com/openblocks/sdk/plugin/common/sql/SqlBasedQueryExecutionContext.java b/server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/plugin/common/sql/SqlBasedQueryExecutionContext.java similarity index 88% rename from server/api-service/openblocks-sdk/src/main/java/com/openblocks/sdk/plugin/common/sql/SqlBasedQueryExecutionContext.java rename to server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/plugin/common/sql/SqlBasedQueryExecutionContext.java index e8851b491..413f51304 100644 --- a/server/api-service/openblocks-sdk/src/main/java/com/openblocks/sdk/plugin/common/sql/SqlBasedQueryExecutionContext.java +++ b/server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/plugin/common/sql/SqlBasedQueryExecutionContext.java @@ -1,11 +1,11 @@ -package com.openblocks.sdk.plugin.common.sql; +package org.lowcoder.sdk.plugin.common.sql; import static org.apache.commons.collections4.MapUtils.emptyIfNull; import java.util.Map; -import com.openblocks.sdk.plugin.sqlcommand.GuiSqlCommand; -import com.openblocks.sdk.query.QueryExecutionContext; +import org.lowcoder.sdk.plugin.sqlcommand.GuiSqlCommand; +import org.lowcoder.sdk.query.QueryExecutionContext; import lombok.Builder; import lombok.Getter; diff --git a/server/api-service/openblocks-sdk/src/main/java/com/openblocks/sdk/plugin/common/sql/StructureParser.java b/server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/plugin/common/sql/StructureParser.java similarity index 86% rename from server/api-service/openblocks-sdk/src/main/java/com/openblocks/sdk/plugin/common/sql/StructureParser.java rename to server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/plugin/common/sql/StructureParser.java index 84b7ae83b..175c7db63 100644 --- a/server/api-service/openblocks-sdk/src/main/java/com/openblocks/sdk/plugin/common/sql/StructureParser.java +++ b/server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/plugin/common/sql/StructureParser.java @@ -1,4 +1,4 @@ -package com.openblocks.sdk.plugin.common.sql; +package org.lowcoder.sdk.plugin.common.sql; import static java.util.Collections.emptyList; import static org.apache.commons.collections4.MapUtils.getString; @@ -10,9 +10,9 @@ import java.util.List; import java.util.Map; -import com.openblocks.sdk.models.DatasourceStructure.Column; -import com.openblocks.sdk.models.DatasourceStructure.Table; -import com.openblocks.sdk.models.DatasourceStructure.TableType; +import org.lowcoder.sdk.models.DatasourceStructure.Column; +import org.lowcoder.sdk.models.DatasourceStructure.Table; +import org.lowcoder.sdk.models.DatasourceStructure.TableType; public class StructureParser { diff --git a/server/api-service/openblocks-sdk/src/main/java/com/openblocks/sdk/plugin/common/ssl/DisableVerifySslConfig.java b/server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/plugin/common/ssl/DisableVerifySslConfig.java similarity index 85% rename from server/api-service/openblocks-sdk/src/main/java/com/openblocks/sdk/plugin/common/ssl/DisableVerifySslConfig.java rename to server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/plugin/common/ssl/DisableVerifySslConfig.java index 5d7cc3821..b1d9df2cf 100644 --- a/server/api-service/openblocks-sdk/src/main/java/com/openblocks/sdk/plugin/common/ssl/DisableVerifySslConfig.java +++ b/server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/plugin/common/ssl/DisableVerifySslConfig.java @@ -1,4 +1,4 @@ -package com.openblocks.sdk.plugin.common.ssl; +package org.lowcoder.sdk.plugin.common.ssl; import com.fasterxml.jackson.annotation.JsonCreator; diff --git a/server/api-service/openblocks-sdk/src/main/java/com/openblocks/sdk/plugin/common/ssl/SslCertVerificationType.java b/server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/plugin/common/ssl/SslCertVerificationType.java similarity index 69% rename from server/api-service/openblocks-sdk/src/main/java/com/openblocks/sdk/plugin/common/ssl/SslCertVerificationType.java rename to server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/plugin/common/ssl/SslCertVerificationType.java index b4e52c637..1d5c4b631 100644 --- a/server/api-service/openblocks-sdk/src/main/java/com/openblocks/sdk/plugin/common/ssl/SslCertVerificationType.java +++ b/server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/plugin/common/ssl/SslCertVerificationType.java @@ -1,4 +1,4 @@ -package com.openblocks.sdk.plugin.common.ssl; +package org.lowcoder.sdk.plugin.common.ssl; public enum SslCertVerificationType { VERIFY_CA_CERT, diff --git a/server/api-service/openblocks-sdk/src/main/java/com/openblocks/sdk/plugin/common/ssl/SslConfig.java b/server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/plugin/common/ssl/SslConfig.java similarity index 91% rename from server/api-service/openblocks-sdk/src/main/java/com/openblocks/sdk/plugin/common/ssl/SslConfig.java rename to server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/plugin/common/ssl/SslConfig.java index 48a60e4d5..9ad5b9a25 100644 --- a/server/api-service/openblocks-sdk/src/main/java/com/openblocks/sdk/plugin/common/ssl/SslConfig.java +++ b/server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/plugin/common/ssl/SslConfig.java @@ -1,12 +1,13 @@ -package com.openblocks.sdk.plugin.common.ssl; +package org.lowcoder.sdk.plugin.common.ssl; import javax.annotation.Nullable; +import org.lowcoder.sdk.models.Encrypt; + import com.fasterxml.jackson.annotation.JsonSubTypes; import com.fasterxml.jackson.annotation.JsonSubTypes.Type; import com.fasterxml.jackson.annotation.JsonTypeInfo; import com.fasterxml.jackson.annotation.JsonTypeInfo.Id; -import com.openblocks.sdk.models.Encrypt; import lombok.Getter; diff --git a/server/api-service/openblocks-sdk/src/main/java/com/openblocks/sdk/plugin/common/ssl/SslHelper.java b/server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/plugin/common/ssl/SslHelper.java similarity index 87% rename from server/api-service/openblocks-sdk/src/main/java/com/openblocks/sdk/plugin/common/ssl/SslHelper.java rename to server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/plugin/common/ssl/SslHelper.java index 95b42409e..478be03c5 100644 --- a/server/api-service/openblocks-sdk/src/main/java/com/openblocks/sdk/plugin/common/ssl/SslHelper.java +++ b/server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/plugin/common/ssl/SslHelper.java @@ -1,4 +1,4 @@ -package com.openblocks.sdk.plugin.common.ssl; +package org.lowcoder.sdk.plugin.common.ssl; import java.io.ByteArrayInputStream; import java.security.cert.CertificateException; @@ -7,9 +7,8 @@ import java.util.Base64; import org.apache.commons.lang3.StringUtils; - -import com.openblocks.sdk.exception.BizError; -import com.openblocks.sdk.exception.BizException; +import org.lowcoder.sdk.exception.BizError; +import org.lowcoder.sdk.exception.BizException; public class SslHelper { diff --git a/server/api-service/openblocks-sdk/src/main/java/com/openblocks/sdk/plugin/common/ssl/VerifyCACertSslConfig.java b/server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/plugin/common/ssl/VerifyCACertSslConfig.java similarity index 84% rename from server/api-service/openblocks-sdk/src/main/java/com/openblocks/sdk/plugin/common/ssl/VerifyCACertSslConfig.java rename to server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/plugin/common/ssl/VerifyCACertSslConfig.java index d168ee8ac..e6d9150d9 100644 --- a/server/api-service/openblocks-sdk/src/main/java/com/openblocks/sdk/plugin/common/ssl/VerifyCACertSslConfig.java +++ b/server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/plugin/common/ssl/VerifyCACertSslConfig.java @@ -1,4 +1,4 @@ -package com.openblocks.sdk.plugin.common.ssl; +package org.lowcoder.sdk.plugin.common.ssl; import com.fasterxml.jackson.annotation.JsonCreator; diff --git a/server/api-service/openblocks-sdk/src/main/java/com/openblocks/sdk/plugin/common/ssl/VerifySelfSignedCertSslConfig.java b/server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/plugin/common/ssl/VerifySelfSignedCertSslConfig.java similarity index 93% rename from server/api-service/openblocks-sdk/src/main/java/com/openblocks/sdk/plugin/common/ssl/VerifySelfSignedCertSslConfig.java rename to server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/plugin/common/ssl/VerifySelfSignedCertSslConfig.java index 4ec81ebd9..ede15c712 100644 --- a/server/api-service/openblocks-sdk/src/main/java/com/openblocks/sdk/plugin/common/ssl/VerifySelfSignedCertSslConfig.java +++ b/server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/plugin/common/ssl/VerifySelfSignedCertSslConfig.java @@ -1,14 +1,14 @@ -package com.openblocks.sdk.plugin.common.ssl; +package org.lowcoder.sdk.plugin.common.ssl; import static org.apache.commons.lang3.ObjectUtils.firstNonNull; import java.util.function.Function; import org.jetbrains.annotations.Nullable; +import org.lowcoder.sdk.config.SerializeConfig.JsonViews; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonView; -import com.openblocks.sdk.config.SerializeConfig.JsonViews; import lombok.Getter; diff --git a/server/api-service/openblocks-sdk/src/main/java/com/openblocks/sdk/plugin/graphql/GraphQLDatasourceConfig.java b/server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/plugin/graphql/GraphQLDatasourceConfig.java similarity index 85% rename from server/api-service/openblocks-sdk/src/main/java/com/openblocks/sdk/plugin/graphql/GraphQLDatasourceConfig.java rename to server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/plugin/graphql/GraphQLDatasourceConfig.java index 98bdcd31c..3c9d3392e 100644 --- a/server/api-service/openblocks-sdk/src/main/java/com/openblocks/sdk/plugin/graphql/GraphQLDatasourceConfig.java +++ b/server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/plugin/graphql/GraphQLDatasourceConfig.java @@ -1,12 +1,12 @@ -package com.openblocks.sdk.plugin.graphql; +package org.lowcoder.sdk.plugin.graphql; -import static com.openblocks.sdk.exception.BizError.INVALID_DATASOURCE_CONFIG_TYPE; -import static com.openblocks.sdk.util.ExceptionUtils.ofException; -import static com.openblocks.sdk.util.ExceptionUtils.ofPluginException; -import static com.openblocks.sdk.util.JsonUtils.fromJson; -import static com.openblocks.sdk.util.JsonUtils.toJson; import static org.apache.commons.collections4.ListUtils.emptyIfNull; import static org.apache.commons.lang3.StringUtils.trimToEmpty; +import static org.lowcoder.sdk.exception.BizError.INVALID_DATASOURCE_CONFIG_TYPE; +import static org.lowcoder.sdk.util.ExceptionUtils.ofException; +import static org.lowcoder.sdk.util.ExceptionUtils.ofPluginException; +import static org.lowcoder.sdk.util.JsonUtils.fromJson; +import static org.lowcoder.sdk.util.JsonUtils.toJson; import java.util.List; import java.util.Map; @@ -16,13 +16,13 @@ import javax.annotation.Nullable; import org.apache.commons.collections4.SetUtils; +import org.lowcoder.sdk.exception.PluginCommonError; +import org.lowcoder.sdk.models.DatasourceConnectionConfig; +import org.lowcoder.sdk.models.Property; +import org.lowcoder.sdk.plugin.restapi.auth.AuthConfig; +import org.lowcoder.sdk.plugin.restapi.auth.RestApiAuthType; import com.fasterxml.jackson.annotation.JsonCreator; -import com.openblocks.sdk.exception.PluginCommonError; -import com.openblocks.sdk.models.DatasourceConnectionConfig; -import com.openblocks.sdk.models.Property; -import com.openblocks.sdk.plugin.restapi.auth.AuthConfig; -import com.openblocks.sdk.plugin.restapi.auth.RestApiAuthType; import lombok.Builder; import lombok.Getter; diff --git a/server/api-service/openblocks-sdk/src/main/java/com/openblocks/sdk/plugin/http/RawHttpHandlerHelper.java b/server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/plugin/http/RawHttpHandlerHelper.java similarity index 96% rename from server/api-service/openblocks-sdk/src/main/java/com/openblocks/sdk/plugin/http/RawHttpHandlerHelper.java rename to server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/plugin/http/RawHttpHandlerHelper.java index e59802d07..c1c2ba7e7 100644 --- a/server/api-service/openblocks-sdk/src/main/java/com/openblocks/sdk/plugin/http/RawHttpHandlerHelper.java +++ b/server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/plugin/http/RawHttpHandlerHelper.java @@ -1,4 +1,4 @@ -package com.openblocks.sdk.plugin.http; +package org.lowcoder.sdk.plugin.http; import java.net.URI; import java.net.URISyntaxException; @@ -8,6 +8,8 @@ import java.util.stream.Collectors; import org.apache.commons.lang3.StringUtils; +import org.lowcoder.sdk.models.Property; +import org.lowcoder.sdk.plugin.restapi.DataUtils; import org.springframework.http.HttpHeaders; import org.springframework.http.HttpMethod; import org.springframework.http.InvalidMediaTypeException; @@ -17,9 +19,6 @@ import org.springframework.web.reactive.function.BodyInserters; import org.springframework.web.util.UriComponentsBuilder; -import com.openblocks.sdk.models.Property; -import com.openblocks.sdk.plugin.restapi.DataUtils; - public class RawHttpHandlerHelper { private static final DataUtils DATA_UTILS = DataUtils.getInstance(); diff --git a/server/api-service/openblocks-sdk/src/main/java/com/openblocks/sdk/plugin/http/RawHttpRequest.java b/server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/plugin/http/RawHttpRequest.java similarity index 88% rename from server/api-service/openblocks-sdk/src/main/java/com/openblocks/sdk/plugin/http/RawHttpRequest.java rename to server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/plugin/http/RawHttpRequest.java index d79e10c1e..620dc7e03 100644 --- a/server/api-service/openblocks-sdk/src/main/java/com/openblocks/sdk/plugin/http/RawHttpRequest.java +++ b/server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/plugin/http/RawHttpRequest.java @@ -1,17 +1,16 @@ -package com.openblocks.sdk.plugin.http; +package org.lowcoder.sdk.plugin.http; -import static com.openblocks.sdk.util.MustacheHelper.renderMustacheJsonString; -import static com.openblocks.sdk.util.MustacheHelper.renderMustacheString; +import static org.lowcoder.sdk.util.MustacheHelper.renderMustacheJsonString; +import static org.lowcoder.sdk.util.MustacheHelper.renderMustacheString; import java.util.List; import java.util.Map; import org.apache.commons.collections4.ListUtils; import org.apache.commons.lang3.StringUtils; +import org.lowcoder.sdk.models.Property; import org.springframework.http.HttpMethod; -import com.openblocks.sdk.models.Property; - import lombok.Getter; import lombok.Setter; diff --git a/server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/plugin/lowcoderapi/LowcoderApiDatasourceConfig.java b/server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/plugin/lowcoderapi/LowcoderApiDatasourceConfig.java new file mode 100644 index 000000000..9705a0b0c --- /dev/null +++ b/server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/plugin/lowcoderapi/LowcoderApiDatasourceConfig.java @@ -0,0 +1,13 @@ +package org.lowcoder.sdk.plugin.lowcoderapi; + +import org.lowcoder.sdk.models.DatasourceConnectionConfig; + +public class LowcoderApiDatasourceConfig implements DatasourceConnectionConfig { + + public static final LowcoderApiDatasourceConfig INSTANCE = new LowcoderApiDatasourceConfig(); + + @Override + public DatasourceConnectionConfig mergeWithUpdatedConfig(DatasourceConnectionConfig detailConfig) { + return detailConfig; + } +} diff --git a/server/api-service/openblocks-sdk/src/main/java/com/openblocks/sdk/plugin/mysql/MysqlDatasourceConfig.java b/server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/plugin/mysql/MysqlDatasourceConfig.java similarity index 81% rename from server/api-service/openblocks-sdk/src/main/java/com/openblocks/sdk/plugin/mysql/MysqlDatasourceConfig.java rename to server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/plugin/mysql/MysqlDatasourceConfig.java index b175ed30e..c63bb4a2e 100644 --- a/server/api-service/openblocks-sdk/src/main/java/com/openblocks/sdk/plugin/mysql/MysqlDatasourceConfig.java +++ b/server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/plugin/mysql/MysqlDatasourceConfig.java @@ -1,14 +1,15 @@ -package com.openblocks.sdk.plugin.mysql; +package org.lowcoder.sdk.plugin.mysql; -import static com.openblocks.sdk.util.ExceptionUtils.ofPluginException; -import static com.openblocks.sdk.util.JsonUtils.fromJson; -import static com.openblocks.sdk.util.JsonUtils.toJson; +import static org.lowcoder.sdk.util.ExceptionUtils.ofPluginException; +import static org.lowcoder.sdk.util.JsonUtils.fromJson; +import static org.lowcoder.sdk.util.JsonUtils.toJson; import java.util.Map; +import org.lowcoder.sdk.exception.PluginCommonError; +import org.lowcoder.sdk.plugin.common.sql.SqlBasedDatasourceConnectionConfig; + import com.google.common.annotations.VisibleForTesting; -import com.openblocks.sdk.exception.PluginCommonError; -import com.openblocks.sdk.plugin.common.sql.SqlBasedDatasourceConnectionConfig; import lombok.Builder; import lombok.extern.slf4j.Slf4j; diff --git a/server/api-service/openblocks-sdk/src/main/java/com/openblocks/sdk/plugin/restapi/DataUtils.java b/server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/plugin/restapi/DataUtils.java similarity index 94% rename from server/api-service/openblocks-sdk/src/main/java/com/openblocks/sdk/plugin/restapi/DataUtils.java rename to server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/plugin/restapi/DataUtils.java index 703a0033a..f8391fa49 100644 --- a/server/api-service/openblocks-sdk/src/main/java/com/openblocks/sdk/plugin/restapi/DataUtils.java +++ b/server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/plugin/restapi/DataUtils.java @@ -16,10 +16,10 @@ */ // copied and adapted for rest api request -package com.openblocks.sdk.plugin.restapi; +package org.lowcoder.sdk.plugin.restapi; -import static com.openblocks.sdk.exception.PluginCommonError.DATASOURCE_ARGUMENT_ERROR; -import static com.openblocks.sdk.util.MustacheHelper.renderMustacheJson; +import static org.lowcoder.sdk.exception.PluginCommonError.DATASOURCE_ARGUMENT_ERROR; +import static org.lowcoder.sdk.util.MustacheHelper.renderMustacheJson; import java.io.UnsupportedEncodingException; import java.net.URLEncoder; @@ -34,6 +34,11 @@ import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang3.StringUtils; +import org.lowcoder.sdk.exception.PluginException; +import org.lowcoder.sdk.exception.ServerException; +import org.lowcoder.sdk.models.Property; +import org.lowcoder.sdk.models.RestBodyFormFileData; +import org.lowcoder.sdk.util.ExceptionUtils; import org.springframework.http.MediaType; import org.springframework.http.client.MultipartBodyBuilder; import org.springframework.http.client.reactive.ClientHttpRequest; @@ -44,11 +49,6 @@ import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.ObjectMapper; import com.google.common.collect.Streams; -import com.openblocks.sdk.exception.PluginException; -import com.openblocks.sdk.exception.ServerException; -import com.openblocks.sdk.models.Property; -import com.openblocks.sdk.models.RestBodyFormFileData; -import com.openblocks.sdk.util.ExceptionUtils; import reactor.core.publisher.Mono; diff --git a/server/api-service/openblocks-sdk/src/main/java/com/openblocks/sdk/plugin/restapi/MultipartFormData.java b/server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/plugin/restapi/MultipartFormData.java similarity index 87% rename from server/api-service/openblocks-sdk/src/main/java/com/openblocks/sdk/plugin/restapi/MultipartFormData.java rename to server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/plugin/restapi/MultipartFormData.java index 22d35f321..1ce42ec35 100644 --- a/server/api-service/openblocks-sdk/src/main/java/com/openblocks/sdk/plugin/restapi/MultipartFormData.java +++ b/server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/plugin/restapi/MultipartFormData.java @@ -1,4 +1,4 @@ -package com.openblocks.sdk.plugin.restapi; +package org.lowcoder.sdk.plugin.restapi; import static com.google.common.base.Strings.nullToEmpty; import lombok.Setter; diff --git a/server/api-service/openblocks-sdk/src/main/java/com/openblocks/sdk/plugin/restapi/RestApiDatasourceConfig.java b/server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/plugin/restapi/RestApiDatasourceConfig.java similarity index 86% rename from server/api-service/openblocks-sdk/src/main/java/com/openblocks/sdk/plugin/restapi/RestApiDatasourceConfig.java rename to server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/plugin/restapi/RestApiDatasourceConfig.java index 87f04f178..b4924e985 100644 --- a/server/api-service/openblocks-sdk/src/main/java/com/openblocks/sdk/plugin/restapi/RestApiDatasourceConfig.java +++ b/server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/plugin/restapi/RestApiDatasourceConfig.java @@ -1,12 +1,12 @@ -package com.openblocks.sdk.plugin.restapi; +package org.lowcoder.sdk.plugin.restapi; -import static com.openblocks.sdk.exception.BizError.INVALID_DATASOURCE_CONFIG_TYPE; -import static com.openblocks.sdk.util.ExceptionUtils.ofException; -import static com.openblocks.sdk.util.ExceptionUtils.ofPluginException; -import static com.openblocks.sdk.util.JsonUtils.fromJson; -import static com.openblocks.sdk.util.JsonUtils.toJson; import static org.apache.commons.collections4.ListUtils.emptyIfNull; import static org.apache.commons.lang3.StringUtils.trimToEmpty; +import static org.lowcoder.sdk.exception.BizError.INVALID_DATASOURCE_CONFIG_TYPE; +import static org.lowcoder.sdk.util.ExceptionUtils.ofException; +import static org.lowcoder.sdk.util.ExceptionUtils.ofPluginException; +import static org.lowcoder.sdk.util.JsonUtils.fromJson; +import static org.lowcoder.sdk.util.JsonUtils.toJson; import java.util.List; import java.util.Map; @@ -16,14 +16,14 @@ import javax.annotation.Nullable; import org.apache.commons.collections4.SetUtils; +import org.lowcoder.sdk.exception.PluginCommonError; +import org.lowcoder.sdk.models.DatasourceConnectionConfig; +import org.lowcoder.sdk.models.Property; +import org.lowcoder.sdk.plugin.common.ssl.SslConfig; +import org.lowcoder.sdk.plugin.restapi.auth.AuthConfig; +import org.lowcoder.sdk.plugin.restapi.auth.RestApiAuthType; import com.fasterxml.jackson.annotation.JsonCreator; -import com.openblocks.sdk.exception.PluginCommonError; -import com.openblocks.sdk.models.DatasourceConnectionConfig; -import com.openblocks.sdk.models.Property; -import com.openblocks.sdk.plugin.common.ssl.SslConfig; -import com.openblocks.sdk.plugin.restapi.auth.AuthConfig; -import com.openblocks.sdk.plugin.restapi.auth.RestApiAuthType; import lombok.Builder; import lombok.Getter; diff --git a/server/api-service/openblocks-sdk/src/main/java/com/openblocks/sdk/plugin/restapi/auth/AuthConfig.java b/server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/plugin/restapi/auth/AuthConfig.java similarity index 91% rename from server/api-service/openblocks-sdk/src/main/java/com/openblocks/sdk/plugin/restapi/auth/AuthConfig.java rename to server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/plugin/restapi/auth/AuthConfig.java index b937b9979..16b85fd85 100644 --- a/server/api-service/openblocks-sdk/src/main/java/com/openblocks/sdk/plugin/restapi/auth/AuthConfig.java +++ b/server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/plugin/restapi/auth/AuthConfig.java @@ -1,12 +1,13 @@ -package com.openblocks.sdk.plugin.restapi.auth; +package org.lowcoder.sdk.plugin.restapi.auth; import javax.annotation.Nullable; +import org.lowcoder.sdk.models.Encrypt; + import com.fasterxml.jackson.annotation.JsonSubTypes; import com.fasterxml.jackson.annotation.JsonSubTypes.Type; import com.fasterxml.jackson.annotation.JsonTypeInfo; import com.fasterxml.jackson.annotation.JsonTypeInfo.Id; -import com.openblocks.sdk.models.Encrypt; import lombok.Getter; diff --git a/server/api-service/openblocks-sdk/src/main/java/com/openblocks/sdk/plugin/restapi/auth/BasicAuthConfig.java b/server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/plugin/restapi/auth/BasicAuthConfig.java similarity index 93% rename from server/api-service/openblocks-sdk/src/main/java/com/openblocks/sdk/plugin/restapi/auth/BasicAuthConfig.java rename to server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/plugin/restapi/auth/BasicAuthConfig.java index 2d5a3d491..e76e4431a 100644 --- a/server/api-service/openblocks-sdk/src/main/java/com/openblocks/sdk/plugin/restapi/auth/BasicAuthConfig.java +++ b/server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/plugin/restapi/auth/BasicAuthConfig.java @@ -1,14 +1,14 @@ -package com.openblocks.sdk.plugin.restapi.auth; +package org.lowcoder.sdk.plugin.restapi.auth; import java.util.function.Function; import javax.annotation.Nullable; import org.apache.commons.lang3.ObjectUtils; +import org.lowcoder.sdk.config.SerializeConfig.JsonViews; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonView; -import com.openblocks.sdk.config.SerializeConfig.JsonViews; import lombok.Getter; diff --git a/server/api-service/openblocks-sdk/src/main/java/com/openblocks/sdk/plugin/restapi/auth/DefaultAuthConfig.java b/server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/plugin/restapi/auth/DefaultAuthConfig.java similarity index 81% rename from server/api-service/openblocks-sdk/src/main/java/com/openblocks/sdk/plugin/restapi/auth/DefaultAuthConfig.java rename to server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/plugin/restapi/auth/DefaultAuthConfig.java index 9477c4d21..ae0e2a3fe 100644 --- a/server/api-service/openblocks-sdk/src/main/java/com/openblocks/sdk/plugin/restapi/auth/DefaultAuthConfig.java +++ b/server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/plugin/restapi/auth/DefaultAuthConfig.java @@ -1,4 +1,4 @@ -package com.openblocks.sdk.plugin.restapi.auth; +package org.lowcoder.sdk.plugin.restapi.auth; import com.fasterxml.jackson.annotation.JsonCreator; diff --git a/server/api-service/openblocks-sdk/src/main/java/com/openblocks/sdk/plugin/restapi/auth/NoneAuthConfig.java b/server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/plugin/restapi/auth/NoneAuthConfig.java similarity index 80% rename from server/api-service/openblocks-sdk/src/main/java/com/openblocks/sdk/plugin/restapi/auth/NoneAuthConfig.java rename to server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/plugin/restapi/auth/NoneAuthConfig.java index 2e0ebc1a0..da3e2570f 100644 --- a/server/api-service/openblocks-sdk/src/main/java/com/openblocks/sdk/plugin/restapi/auth/NoneAuthConfig.java +++ b/server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/plugin/restapi/auth/NoneAuthConfig.java @@ -1,4 +1,4 @@ -package com.openblocks.sdk.plugin.restapi.auth; +package org.lowcoder.sdk.plugin.restapi.auth; import com.fasterxml.jackson.annotation.JsonCreator; diff --git a/server/api-service/openblocks-sdk/src/main/java/com/openblocks/sdk/plugin/restapi/auth/RestApiAuthType.java b/server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/plugin/restapi/auth/RestApiAuthType.java similarity index 75% rename from server/api-service/openblocks-sdk/src/main/java/com/openblocks/sdk/plugin/restapi/auth/RestApiAuthType.java rename to server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/plugin/restapi/auth/RestApiAuthType.java index 01a0641ea..12603aa7b 100644 --- a/server/api-service/openblocks-sdk/src/main/java/com/openblocks/sdk/plugin/restapi/auth/RestApiAuthType.java +++ b/server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/plugin/restapi/auth/RestApiAuthType.java @@ -1,4 +1,4 @@ -package com.openblocks.sdk.plugin.restapi.auth; +package org.lowcoder.sdk.plugin.restapi.auth; public enum RestApiAuthType { diff --git a/server/api-service/openblocks-sdk/src/main/java/com/openblocks/sdk/plugin/sheet/changeset/SheetBulkObjectChangeSet.java b/server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/plugin/sheet/changeset/SheetBulkObjectChangeSet.java similarity index 75% rename from server/api-service/openblocks-sdk/src/main/java/com/openblocks/sdk/plugin/sheet/changeset/SheetBulkObjectChangeSet.java rename to server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/plugin/sheet/changeset/SheetBulkObjectChangeSet.java index d0e2d59b3..4907e02db 100644 --- a/server/api-service/openblocks-sdk/src/main/java/com/openblocks/sdk/plugin/sheet/changeset/SheetBulkObjectChangeSet.java +++ b/server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/plugin/sheet/changeset/SheetBulkObjectChangeSet.java @@ -1,13 +1,14 @@ -package com.openblocks.sdk.plugin.sheet.changeset; +package org.lowcoder.sdk.plugin.sheet.changeset; -import static com.openblocks.sdk.exception.PluginCommonError.INVALID_GUI_SETTINGS; -import static com.openblocks.sdk.plugin.common.constant.Constants.RECORD_FORM_KEY; +import static org.lowcoder.sdk.exception.PluginCommonError.INVALID_GUI_SETTINGS; +import static org.lowcoder.sdk.plugin.common.constant.Constants.RECORD_FORM_KEY; import java.util.Map; +import org.lowcoder.sdk.exception.PluginException; +import org.lowcoder.sdk.util.MustacheHelper; + import com.fasterxml.jackson.databind.JsonNode; -import com.openblocks.sdk.exception.PluginException; -import com.openblocks.sdk.util.MustacheHelper; public class SheetBulkObjectChangeSet { diff --git a/server/api-service/openblocks-sdk/src/main/java/com/openblocks/sdk/plugin/sheet/changeset/SheetChangeSet.java b/server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/plugin/sheet/changeset/SheetChangeSet.java similarity index 73% rename from server/api-service/openblocks-sdk/src/main/java/com/openblocks/sdk/plugin/sheet/changeset/SheetChangeSet.java rename to server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/plugin/sheet/changeset/SheetChangeSet.java index 87a916188..43c582102 100644 --- a/server/api-service/openblocks-sdk/src/main/java/com/openblocks/sdk/plugin/sheet/changeset/SheetChangeSet.java +++ b/server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/plugin/sheet/changeset/SheetChangeSet.java @@ -1,18 +1,17 @@ -package com.openblocks.sdk.plugin.sheet.changeset; +package org.lowcoder.sdk.plugin.sheet.changeset; -import static com.openblocks.sdk.exception.PluginCommonError.INVALID_GUI_SETTINGS; -import static com.openblocks.sdk.plugin.common.constant.Constants.CHANGE_SET_FORM_KEY; -import static com.openblocks.sdk.plugin.common.constant.Constants.CHANGE_SET_TYPE_KEY_VALUE_PAIRS; -import static com.openblocks.sdk.plugin.common.constant.Constants.CHANGE_SET_TYPE_OBJECT; -import static com.openblocks.sdk.plugin.common.constant.Constants.COMP_KEY; -import static com.openblocks.sdk.plugin.common.constant.Constants.COMP_TYPE_KEY; +import static org.lowcoder.sdk.exception.PluginCommonError.INVALID_GUI_SETTINGS; +import static org.lowcoder.sdk.plugin.common.constant.Constants.CHANGE_SET_FORM_KEY; +import static org.lowcoder.sdk.plugin.common.constant.Constants.CHANGE_SET_TYPE_KEY_VALUE_PAIRS; +import static org.lowcoder.sdk.plugin.common.constant.Constants.CHANGE_SET_TYPE_OBJECT; +import static org.lowcoder.sdk.plugin.common.constant.Constants.COMP_KEY; +import static org.lowcoder.sdk.plugin.common.constant.Constants.COMP_TYPE_KEY; import java.util.Map; import org.apache.commons.collections4.MapUtils; import org.apache.commons.lang3.StringUtils; - -import com.openblocks.sdk.exception.PluginException; +import org.lowcoder.sdk.exception.PluginException; public abstract class SheetChangeSet { diff --git a/server/api-service/openblocks-sdk/src/main/java/com/openblocks/sdk/plugin/sheet/changeset/SheetChangeSetItem.java b/server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/plugin/sheet/changeset/SheetChangeSetItem.java similarity index 59% rename from server/api-service/openblocks-sdk/src/main/java/com/openblocks/sdk/plugin/sheet/changeset/SheetChangeSetItem.java rename to server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/plugin/sheet/changeset/SheetChangeSetItem.java index 65c83997e..e1aeca94e 100644 --- a/server/api-service/openblocks-sdk/src/main/java/com/openblocks/sdk/plugin/sheet/changeset/SheetChangeSetItem.java +++ b/server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/plugin/sheet/changeset/SheetChangeSetItem.java @@ -1,4 +1,4 @@ -package com.openblocks.sdk.plugin.sheet.changeset; +package org.lowcoder.sdk.plugin.sheet.changeset; public record SheetChangeSetItem(String column, Object renderedValue) { } \ No newline at end of file diff --git a/server/api-service/openblocks-sdk/src/main/java/com/openblocks/sdk/plugin/sheet/changeset/SheetChangeSetRow.java b/server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/plugin/sheet/changeset/SheetChangeSetRow.java similarity index 89% rename from server/api-service/openblocks-sdk/src/main/java/com/openblocks/sdk/plugin/sheet/changeset/SheetChangeSetRow.java rename to server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/plugin/sheet/changeset/SheetChangeSetRow.java index 30d301439..792eb82ab 100644 --- a/server/api-service/openblocks-sdk/src/main/java/com/openblocks/sdk/plugin/sheet/changeset/SheetChangeSetRow.java +++ b/server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/plugin/sheet/changeset/SheetChangeSetRow.java @@ -1,6 +1,6 @@ -package com.openblocks.sdk.plugin.sheet.changeset; +package org.lowcoder.sdk.plugin.sheet.changeset; -import static com.openblocks.sdk.exception.PluginCommonError.INVALID_GUI_SETTINGS; +import static org.lowcoder.sdk.exception.PluginCommonError.INVALID_GUI_SETTINGS; import java.util.ArrayList; import java.util.Iterator; @@ -12,10 +12,11 @@ import javax.annotation.Nonnull; +import org.lowcoder.sdk.exception.PluginException; +import org.lowcoder.sdk.util.JsonUtils; + import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.node.ObjectNode; -import com.openblocks.sdk.exception.PluginException; -import com.openblocks.sdk.util.JsonUtils; public class SheetChangeSetRow implements Iterable { diff --git a/server/api-service/openblocks-sdk/src/main/java/com/openblocks/sdk/plugin/sheet/changeset/SheetChangeSetRows.java b/server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/plugin/sheet/changeset/SheetChangeSetRows.java similarity index 84% rename from server/api-service/openblocks-sdk/src/main/java/com/openblocks/sdk/plugin/sheet/changeset/SheetChangeSetRows.java rename to server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/plugin/sheet/changeset/SheetChangeSetRows.java index 2f4841e43..02c1c9b4e 100644 --- a/server/api-service/openblocks-sdk/src/main/java/com/openblocks/sdk/plugin/sheet/changeset/SheetChangeSetRows.java +++ b/server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/plugin/sheet/changeset/SheetChangeSetRows.java @@ -1,17 +1,18 @@ -package com.openblocks.sdk.plugin.sheet.changeset; +package org.lowcoder.sdk.plugin.sheet.changeset; -import static com.openblocks.sdk.exception.PluginCommonError.INVALID_GUI_SETTINGS; +import static org.lowcoder.sdk.exception.PluginCommonError.INVALID_GUI_SETTINGS; import java.util.Iterator; import java.util.List; import javax.annotation.Nonnull; +import org.lowcoder.sdk.exception.PluginException; + import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.node.ArrayNode; import com.google.common.collect.Streams; -import com.openblocks.sdk.exception.PluginException; public record SheetChangeSetRows(List rows) implements Iterable { diff --git a/server/api-service/openblocks-sdk/src/main/java/com/openblocks/sdk/plugin/sheet/changeset/SheetKeyValuePairChangeSet.java b/server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/plugin/sheet/changeset/SheetKeyValuePairChangeSet.java similarity index 85% rename from server/api-service/openblocks-sdk/src/main/java/com/openblocks/sdk/plugin/sheet/changeset/SheetKeyValuePairChangeSet.java rename to server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/plugin/sheet/changeset/SheetKeyValuePairChangeSet.java index 5eec1bea5..8d1b803e3 100644 --- a/server/api-service/openblocks-sdk/src/main/java/com/openblocks/sdk/plugin/sheet/changeset/SheetKeyValuePairChangeSet.java +++ b/server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/plugin/sheet/changeset/SheetKeyValuePairChangeSet.java @@ -1,8 +1,8 @@ -package com.openblocks.sdk.plugin.sheet.changeset; +package org.lowcoder.sdk.plugin.sheet.changeset; -import static com.openblocks.sdk.exception.PluginCommonError.INVALID_GUI_SETTINGS; -import static com.openblocks.sdk.util.MustacheHelper.renderMustacheJson; import static java.util.Collections.emptyMap; +import static org.lowcoder.sdk.exception.PluginCommonError.INVALID_GUI_SETTINGS; +import static org.lowcoder.sdk.util.MustacheHelper.renderMustacheJson; import java.util.ArrayList; import java.util.List; @@ -12,9 +12,8 @@ import org.apache.commons.collections4.MapUtils; import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.tuple.Pair; - -import com.openblocks.sdk.exception.PluginException; -import com.openblocks.sdk.util.JsonUtils; +import org.lowcoder.sdk.exception.PluginException; +import org.lowcoder.sdk.util.JsonUtils; import lombok.extern.slf4j.Slf4j; diff --git a/server/api-service/openblocks-sdk/src/main/java/com/openblocks/sdk/plugin/sheet/changeset/SheetObjectChangeSet.java b/server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/plugin/sheet/changeset/SheetObjectChangeSet.java similarity index 65% rename from server/api-service/openblocks-sdk/src/main/java/com/openblocks/sdk/plugin/sheet/changeset/SheetObjectChangeSet.java rename to server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/plugin/sheet/changeset/SheetObjectChangeSet.java index 3238fd0ee..7713479ed 100644 --- a/server/api-service/openblocks-sdk/src/main/java/com/openblocks/sdk/plugin/sheet/changeset/SheetObjectChangeSet.java +++ b/server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/plugin/sheet/changeset/SheetObjectChangeSet.java @@ -1,14 +1,15 @@ -package com.openblocks.sdk.plugin.sheet.changeset; +package org.lowcoder.sdk.plugin.sheet.changeset; -import static com.openblocks.sdk.exception.PluginCommonError.INVALID_GUI_SETTINGS; -import static com.openblocks.sdk.plugin.sheet.changeset.SheetChangeSetRow.fromJsonNode; +import static org.lowcoder.sdk.exception.PluginCommonError.INVALID_GUI_SETTINGS; +import static org.lowcoder.sdk.plugin.sheet.changeset.SheetChangeSetRow.fromJsonNode; import java.util.Map; +import org.lowcoder.sdk.exception.PluginException; +import org.lowcoder.sdk.util.MustacheHelper; + import com.fasterxml.jackson.databind.JsonNode; -import com.openblocks.sdk.exception.PluginException; -import com.openblocks.sdk.util.MustacheHelper; public class SheetObjectChangeSet extends SheetChangeSet { private final String str; diff --git a/server/api-service/openblocks-sdk/src/main/java/com/openblocks/sdk/plugin/sqlcommand/GuiSqlCommand.java b/server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/plugin/sqlcommand/GuiSqlCommand.java similarity index 78% rename from server/api-service/openblocks-sdk/src/main/java/com/openblocks/sdk/plugin/sqlcommand/GuiSqlCommand.java rename to server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/plugin/sqlcommand/GuiSqlCommand.java index 26edf4441..ab54898b6 100644 --- a/server/api-service/openblocks-sdk/src/main/java/com/openblocks/sdk/plugin/sqlcommand/GuiSqlCommand.java +++ b/server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/plugin/sqlcommand/GuiSqlCommand.java @@ -1,8 +1,8 @@ -package com.openblocks.sdk.plugin.sqlcommand; +package org.lowcoder.sdk.plugin.sqlcommand; -import static com.openblocks.sdk.exception.PluginCommonError.INVALID_GUI_SETTINGS; -import static com.openblocks.sdk.plugin.common.constant.Constants.ALLOW_MULTI_MODIFY_KEY; -import static com.openblocks.sdk.plugin.common.constant.Constants.TABLE_KEY; +import static org.lowcoder.sdk.exception.PluginCommonError.INVALID_GUI_SETTINGS; +import static org.lowcoder.sdk.plugin.common.constant.Constants.ALLOW_MULTI_MODIFY_KEY; +import static org.lowcoder.sdk.plugin.common.constant.Constants.TABLE_KEY; import java.util.List; import java.util.Map; @@ -10,9 +10,8 @@ import org.apache.commons.collections4.MapUtils; import org.apache.commons.lang3.StringUtils; - -import com.openblocks.sdk.exception.PluginException; -import com.openblocks.sdk.util.SqlGuiUtils.GuiSqlValue.EscapeSql; +import org.lowcoder.sdk.exception.PluginException; +import org.lowcoder.sdk.util.SqlGuiUtils.GuiSqlValue.EscapeSql; public interface GuiSqlCommand { diff --git a/server/api-service/openblocks-sdk/src/main/java/com/openblocks/sdk/plugin/sqlcommand/changeset/BulkObjectChangeSet.java b/server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/plugin/sqlcommand/changeset/BulkObjectChangeSet.java similarity index 76% rename from server/api-service/openblocks-sdk/src/main/java/com/openblocks/sdk/plugin/sqlcommand/changeset/BulkObjectChangeSet.java rename to server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/plugin/sqlcommand/changeset/BulkObjectChangeSet.java index 1f7fd1385..ed281a102 100644 --- a/server/api-service/openblocks-sdk/src/main/java/com/openblocks/sdk/plugin/sqlcommand/changeset/BulkObjectChangeSet.java +++ b/server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/plugin/sqlcommand/changeset/BulkObjectChangeSet.java @@ -1,15 +1,16 @@ -package com.openblocks.sdk.plugin.sqlcommand.changeset; +package org.lowcoder.sdk.plugin.sqlcommand.changeset; -import static com.openblocks.sdk.exception.PluginCommonError.INVALID_GUI_SETTINGS; -import static com.openblocks.sdk.plugin.common.constant.Constants.PRIMARY_KEY_FORM_KEY; -import static com.openblocks.sdk.plugin.common.constant.Constants.RECORD_FORM_KEY; +import static org.lowcoder.sdk.exception.PluginCommonError.INVALID_GUI_SETTINGS; +import static org.lowcoder.sdk.plugin.common.constant.Constants.PRIMARY_KEY_FORM_KEY; +import static org.lowcoder.sdk.plugin.common.constant.Constants.RECORD_FORM_KEY; import java.util.Map; import java.util.Set; +import org.lowcoder.sdk.exception.PluginException; +import org.lowcoder.sdk.util.MustacheHelper; + import com.fasterxml.jackson.databind.JsonNode; -import com.openblocks.sdk.exception.PluginException; -import com.openblocks.sdk.util.MustacheHelper; public class BulkObjectChangeSet { private final String str; diff --git a/server/api-service/openblocks-sdk/src/main/java/com/openblocks/sdk/plugin/sqlcommand/changeset/ChangeSet.java b/server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/plugin/sqlcommand/changeset/ChangeSet.java similarity index 74% rename from server/api-service/openblocks-sdk/src/main/java/com/openblocks/sdk/plugin/sqlcommand/changeset/ChangeSet.java rename to server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/plugin/sqlcommand/changeset/ChangeSet.java index 6f5d4b177..52e9b9c3e 100644 --- a/server/api-service/openblocks-sdk/src/main/java/com/openblocks/sdk/plugin/sqlcommand/changeset/ChangeSet.java +++ b/server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/plugin/sqlcommand/changeset/ChangeSet.java @@ -1,19 +1,18 @@ -package com.openblocks.sdk.plugin.sqlcommand.changeset; +package org.lowcoder.sdk.plugin.sqlcommand.changeset; -import static com.openblocks.sdk.exception.PluginCommonError.INVALID_GUI_SETTINGS; -import static com.openblocks.sdk.plugin.common.constant.Constants.CHANGE_SET_FORM_KEY; -import static com.openblocks.sdk.plugin.common.constant.Constants.CHANGE_SET_TYPE_KEY_VALUE_PAIRS; -import static com.openblocks.sdk.plugin.common.constant.Constants.CHANGE_SET_TYPE_OBJECT; -import static com.openblocks.sdk.plugin.common.constant.Constants.COMP_KEY; -import static com.openblocks.sdk.plugin.common.constant.Constants.COMP_TYPE_KEY; +import static org.lowcoder.sdk.exception.PluginCommonError.INVALID_GUI_SETTINGS; +import static org.lowcoder.sdk.plugin.common.constant.Constants.CHANGE_SET_FORM_KEY; +import static org.lowcoder.sdk.plugin.common.constant.Constants.CHANGE_SET_TYPE_KEY_VALUE_PAIRS; +import static org.lowcoder.sdk.plugin.common.constant.Constants.CHANGE_SET_TYPE_OBJECT; +import static org.lowcoder.sdk.plugin.common.constant.Constants.COMP_KEY; +import static org.lowcoder.sdk.plugin.common.constant.Constants.COMP_TYPE_KEY; import java.util.Map; import java.util.Set; import org.apache.commons.collections4.MapUtils; import org.apache.commons.lang3.StringUtils; - -import com.openblocks.sdk.exception.PluginException; +import org.lowcoder.sdk.exception.PluginException; public abstract class ChangeSet { diff --git a/server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/plugin/sqlcommand/changeset/ChangeSetItem.java b/server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/plugin/sqlcommand/changeset/ChangeSetItem.java new file mode 100644 index 000000000..7718c45b9 --- /dev/null +++ b/server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/plugin/sqlcommand/changeset/ChangeSetItem.java @@ -0,0 +1,6 @@ +package org.lowcoder.sdk.plugin.sqlcommand.changeset; + +import org.lowcoder.sdk.util.SqlGuiUtils.GuiSqlValue; + +public record ChangeSetItem(String column, GuiSqlValue guiSqlValue) { +} \ No newline at end of file diff --git a/server/api-service/openblocks-sdk/src/main/java/com/openblocks/sdk/plugin/sqlcommand/changeset/ChangeSetRow.java b/server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/plugin/sqlcommand/changeset/ChangeSetRow.java similarity index 89% rename from server/api-service/openblocks-sdk/src/main/java/com/openblocks/sdk/plugin/sqlcommand/changeset/ChangeSetRow.java rename to server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/plugin/sqlcommand/changeset/ChangeSetRow.java index ab714e864..9f7fefb8b 100644 --- a/server/api-service/openblocks-sdk/src/main/java/com/openblocks/sdk/plugin/sqlcommand/changeset/ChangeSetRow.java +++ b/server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/plugin/sqlcommand/changeset/ChangeSetRow.java @@ -1,6 +1,6 @@ -package com.openblocks.sdk.plugin.sqlcommand.changeset; +package org.lowcoder.sdk.plugin.sqlcommand.changeset; -import static com.openblocks.sdk.exception.PluginCommonError.INVALID_GUI_SETTINGS; +import static org.lowcoder.sdk.exception.PluginCommonError.INVALID_GUI_SETTINGS; import java.util.Iterator; import java.util.LinkedHashMap; @@ -13,11 +13,12 @@ import javax.annotation.Nonnull; +import org.lowcoder.sdk.exception.PluginException; +import org.lowcoder.sdk.util.SqlGuiUtils.GuiSqlValue; + import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.node.ObjectNode; import com.google.common.collect.Streams; -import com.openblocks.sdk.exception.PluginException; -import com.openblocks.sdk.util.SqlGuiUtils.GuiSqlValue; @SuppressWarnings("UnstableApiUsage") public class ChangeSetRow implements Iterable { diff --git a/server/api-service/openblocks-sdk/src/main/java/com/openblocks/sdk/plugin/sqlcommand/changeset/ChangeSetRows.java b/server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/plugin/sqlcommand/changeset/ChangeSetRows.java similarity index 91% rename from server/api-service/openblocks-sdk/src/main/java/com/openblocks/sdk/plugin/sqlcommand/changeset/ChangeSetRows.java rename to server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/plugin/sqlcommand/changeset/ChangeSetRows.java index 6b1a23494..156e30c5b 100644 --- a/server/api-service/openblocks-sdk/src/main/java/com/openblocks/sdk/plugin/sqlcommand/changeset/ChangeSetRows.java +++ b/server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/plugin/sqlcommand/changeset/ChangeSetRows.java @@ -1,7 +1,7 @@ -package com.openblocks.sdk.plugin.sqlcommand.changeset; +package org.lowcoder.sdk.plugin.sqlcommand.changeset; import static com.google.common.collect.Sets.newHashSet; -import static com.openblocks.sdk.exception.PluginCommonError.INVALID_GUI_SETTINGS; +import static org.lowcoder.sdk.exception.PluginCommonError.INVALID_GUI_SETTINGS; import java.util.HashSet; import java.util.Iterator; @@ -12,10 +12,11 @@ import javax.annotation.Nonnull; +import org.lowcoder.sdk.exception.PluginException; + import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.node.ArrayNode; import com.google.common.collect.Streams; -import com.openblocks.sdk.exception.PluginException; public record ChangeSetRows(List rows) implements Iterable { diff --git a/server/api-service/openblocks-sdk/src/main/java/com/openblocks/sdk/plugin/sqlcommand/changeset/KeyValuePairChangeSet.java b/server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/plugin/sqlcommand/changeset/KeyValuePairChangeSet.java similarity index 87% rename from server/api-service/openblocks-sdk/src/main/java/com/openblocks/sdk/plugin/sqlcommand/changeset/KeyValuePairChangeSet.java rename to server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/plugin/sqlcommand/changeset/KeyValuePairChangeSet.java index 631dca694..f032e6169 100644 --- a/server/api-service/openblocks-sdk/src/main/java/com/openblocks/sdk/plugin/sqlcommand/changeset/KeyValuePairChangeSet.java +++ b/server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/plugin/sqlcommand/changeset/KeyValuePairChangeSet.java @@ -1,7 +1,7 @@ -package com.openblocks.sdk.plugin.sqlcommand.changeset; +package org.lowcoder.sdk.plugin.sqlcommand.changeset; -import static com.openblocks.sdk.exception.PluginCommonError.INVALID_GUI_SETTINGS; -import static com.openblocks.sdk.util.JsonUtils.toJson; +import static org.lowcoder.sdk.exception.PluginCommonError.INVALID_GUI_SETTINGS; +import static org.lowcoder.sdk.util.JsonUtils.toJson; import java.util.ArrayList; import java.util.LinkedHashMap; @@ -15,12 +15,12 @@ import org.apache.commons.collections4.MapUtils; import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.tuple.Pair; +import org.lowcoder.sdk.exception.PluginException; +import org.lowcoder.sdk.util.MustacheHelper; +import org.lowcoder.sdk.util.SqlGuiUtils; +import org.lowcoder.sdk.util.SqlGuiUtils.GuiSqlValue; import com.google.common.annotations.VisibleForTesting; -import com.openblocks.sdk.exception.PluginException; -import com.openblocks.sdk.util.MustacheHelper; -import com.openblocks.sdk.util.SqlGuiUtils; -import com.openblocks.sdk.util.SqlGuiUtils.GuiSqlValue; import lombok.extern.slf4j.Slf4j; diff --git a/server/api-service/openblocks-sdk/src/main/java/com/openblocks/sdk/plugin/sqlcommand/changeset/ObjectChangeSet.java b/server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/plugin/sqlcommand/changeset/ObjectChangeSet.java similarity index 76% rename from server/api-service/openblocks-sdk/src/main/java/com/openblocks/sdk/plugin/sqlcommand/changeset/ObjectChangeSet.java rename to server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/plugin/sqlcommand/changeset/ObjectChangeSet.java index 058bd6bc7..d24e2d22d 100644 --- a/server/api-service/openblocks-sdk/src/main/java/com/openblocks/sdk/plugin/sqlcommand/changeset/ObjectChangeSet.java +++ b/server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/plugin/sqlcommand/changeset/ObjectChangeSet.java @@ -1,13 +1,14 @@ -package com.openblocks.sdk.plugin.sqlcommand.changeset; +package org.lowcoder.sdk.plugin.sqlcommand.changeset; -import static com.openblocks.sdk.exception.PluginCommonError.INVALID_GUI_SETTINGS; +import static org.lowcoder.sdk.exception.PluginCommonError.INVALID_GUI_SETTINGS; import java.util.Map; import java.util.Set; +import org.lowcoder.sdk.exception.PluginException; +import org.lowcoder.sdk.util.MustacheHelper; + import com.fasterxml.jackson.databind.JsonNode; -import com.openblocks.sdk.exception.PluginException; -import com.openblocks.sdk.util.MustacheHelper; public class ObjectChangeSet extends ChangeSet { private final String str; diff --git a/server/api-service/openblocks-sdk/src/main/java/com/openblocks/sdk/plugin/sqlcommand/command/BulkInsertCommand.java b/server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/plugin/sqlcommand/command/BulkInsertCommand.java similarity index 85% rename from server/api-service/openblocks-sdk/src/main/java/com/openblocks/sdk/plugin/sqlcommand/command/BulkInsertCommand.java rename to server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/plugin/sqlcommand/command/BulkInsertCommand.java index b46ffa18f..f1b2ceed4 100644 --- a/server/api-service/openblocks-sdk/src/main/java/com/openblocks/sdk/plugin/sqlcommand/command/BulkInsertCommand.java +++ b/server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/plugin/sqlcommand/command/BulkInsertCommand.java @@ -1,21 +1,22 @@ -package com.openblocks.sdk.plugin.sqlcommand.command; +package org.lowcoder.sdk.plugin.sqlcommand.command; import static com.google.common.collect.Lists.newArrayList; -import static com.openblocks.sdk.exception.PluginCommonError.INVALID_INSERT_COMMAND; +import static org.lowcoder.sdk.exception.PluginCommonError.INVALID_INSERT_COMMAND; import java.util.Collections; import java.util.List; import java.util.Map; import java.util.Set; +import org.lowcoder.sdk.exception.PluginException; +import org.lowcoder.sdk.plugin.sqlcommand.GuiSqlCommand; +import org.lowcoder.sdk.plugin.sqlcommand.changeset.BulkObjectChangeSet; +import org.lowcoder.sdk.plugin.sqlcommand.changeset.ChangeSetItem; +import org.lowcoder.sdk.plugin.sqlcommand.changeset.ChangeSetRow; +import org.lowcoder.sdk.plugin.sqlcommand.changeset.ChangeSetRows; +import org.lowcoder.sdk.util.MustacheHelper; + import com.google.common.base.Joiner; -import com.openblocks.sdk.exception.PluginException; -import com.openblocks.sdk.plugin.sqlcommand.GuiSqlCommand; -import com.openblocks.sdk.plugin.sqlcommand.changeset.BulkObjectChangeSet; -import com.openblocks.sdk.plugin.sqlcommand.changeset.ChangeSetItem; -import com.openblocks.sdk.plugin.sqlcommand.changeset.ChangeSetRow; -import com.openblocks.sdk.plugin.sqlcommand.changeset.ChangeSetRows; -import com.openblocks.sdk.util.MustacheHelper; public class BulkInsertCommand implements GuiSqlCommand { diff --git a/server/api-service/openblocks-sdk/src/main/java/com/openblocks/sdk/plugin/sqlcommand/command/BulkUpdateCommand.java b/server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/plugin/sqlcommand/command/BulkUpdateCommand.java similarity index 92% rename from server/api-service/openblocks-sdk/src/main/java/com/openblocks/sdk/plugin/sqlcommand/command/BulkUpdateCommand.java rename to server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/plugin/sqlcommand/command/BulkUpdateCommand.java index bafe186df..0b96f9d1d 100644 --- a/server/api-service/openblocks-sdk/src/main/java/com/openblocks/sdk/plugin/sqlcommand/command/BulkUpdateCommand.java +++ b/server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/plugin/sqlcommand/command/BulkUpdateCommand.java @@ -1,7 +1,7 @@ -package com.openblocks.sdk.plugin.sqlcommand.command; +package org.lowcoder.sdk.plugin.sqlcommand.command; import static com.google.common.collect.Lists.newArrayList; -import static com.openblocks.sdk.exception.PluginCommonError.INVALID_INSERT_COMMAND; +import static org.lowcoder.sdk.exception.PluginCommonError.INVALID_INSERT_COMMAND; import java.util.Collections; import java.util.List; @@ -10,15 +10,15 @@ import java.util.stream.Collectors; import org.apache.commons.lang3.tuple.Pair; +import org.lowcoder.sdk.exception.PluginException; +import org.lowcoder.sdk.plugin.sqlcommand.GuiSqlCommand; +import org.lowcoder.sdk.plugin.sqlcommand.changeset.BulkObjectChangeSet; +import org.lowcoder.sdk.plugin.sqlcommand.changeset.ChangeSetRows; +import org.lowcoder.sdk.util.MustacheHelper; +import org.lowcoder.sdk.util.SqlGuiUtils.GuiSqlValue; import com.google.common.base.Joiner; import com.google.common.collect.ArrayListMultimap; -import com.openblocks.sdk.exception.PluginException; -import com.openblocks.sdk.plugin.sqlcommand.GuiSqlCommand; -import com.openblocks.sdk.plugin.sqlcommand.changeset.BulkObjectChangeSet; -import com.openblocks.sdk.plugin.sqlcommand.changeset.ChangeSetRows; -import com.openblocks.sdk.util.MustacheHelper; -import com.openblocks.sdk.util.SqlGuiUtils.GuiSqlValue; public class BulkUpdateCommand implements GuiSqlCommand { diff --git a/server/api-service/openblocks-sdk/src/main/java/com/openblocks/sdk/plugin/sqlcommand/command/DeleteCommand.java b/server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/plugin/sqlcommand/command/DeleteCommand.java similarity index 90% rename from server/api-service/openblocks-sdk/src/main/java/com/openblocks/sdk/plugin/sqlcommand/command/DeleteCommand.java rename to server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/plugin/sqlcommand/command/DeleteCommand.java index a8d9dc4da..2a7f7fefc 100644 --- a/server/api-service/openblocks-sdk/src/main/java/com/openblocks/sdk/plugin/sqlcommand/command/DeleteCommand.java +++ b/server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/plugin/sqlcommand/command/DeleteCommand.java @@ -1,12 +1,12 @@ -package com.openblocks.sdk.plugin.sqlcommand.command; +package org.lowcoder.sdk.plugin.sqlcommand.command; import java.util.Collections; import java.util.Map; import java.util.Set; -import com.openblocks.sdk.plugin.sqlcommand.GuiSqlCommand; -import com.openblocks.sdk.plugin.sqlcommand.filter.FilterSet; -import com.openblocks.sdk.util.MustacheHelper; +import org.lowcoder.sdk.plugin.sqlcommand.GuiSqlCommand; +import org.lowcoder.sdk.plugin.sqlcommand.filter.FilterSet; +import org.lowcoder.sdk.util.MustacheHelper; public class DeleteCommand implements GuiSqlCommand { diff --git a/server/api-service/openblocks-sdk/src/main/java/com/openblocks/sdk/plugin/sqlcommand/command/GuiConstants.java b/server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/plugin/sqlcommand/command/GuiConstants.java similarity index 78% rename from server/api-service/openblocks-sdk/src/main/java/com/openblocks/sdk/plugin/sqlcommand/command/GuiConstants.java rename to server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/plugin/sqlcommand/command/GuiConstants.java index 806787e77..00b891b44 100644 --- a/server/api-service/openblocks-sdk/src/main/java/com/openblocks/sdk/plugin/sqlcommand/command/GuiConstants.java +++ b/server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/plugin/sqlcommand/command/GuiConstants.java @@ -1,4 +1,4 @@ -package com.openblocks.sdk.plugin.sqlcommand.command; +package org.lowcoder.sdk.plugin.sqlcommand.command; public final class GuiConstants { diff --git a/server/api-service/openblocks-sdk/src/main/java/com/openblocks/sdk/plugin/sqlcommand/command/InsertCommand.java b/server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/plugin/sqlcommand/command/InsertCommand.java similarity index 86% rename from server/api-service/openblocks-sdk/src/main/java/com/openblocks/sdk/plugin/sqlcommand/command/InsertCommand.java rename to server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/plugin/sqlcommand/command/InsertCommand.java index c6f5a0ab4..e65a52cbc 100644 --- a/server/api-service/openblocks-sdk/src/main/java/com/openblocks/sdk/plugin/sqlcommand/command/InsertCommand.java +++ b/server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/plugin/sqlcommand/command/InsertCommand.java @@ -1,7 +1,7 @@ -package com.openblocks.sdk.plugin.sqlcommand.command; +package org.lowcoder.sdk.plugin.sqlcommand.command; -import static com.openblocks.sdk.exception.PluginCommonError.INVALID_INSERT_COMMAND; -import static com.openblocks.sdk.plugin.sqlcommand.changeset.ChangeSet.parseChangeSet; +import static org.lowcoder.sdk.exception.PluginCommonError.INVALID_INSERT_COMMAND; +import static org.lowcoder.sdk.plugin.sqlcommand.changeset.ChangeSet.parseChangeSet; import java.util.Collections; import java.util.List; @@ -11,14 +11,13 @@ import javax.annotation.Nonnull; import org.apache.commons.lang3.StringUtils; - -import com.openblocks.sdk.exception.PluginException; -import com.openblocks.sdk.plugin.sqlcommand.GuiSqlCommand; -import com.openblocks.sdk.plugin.sqlcommand.changeset.ChangeSet; -import com.openblocks.sdk.plugin.sqlcommand.changeset.ChangeSetItem; -import com.openblocks.sdk.plugin.sqlcommand.changeset.ChangeSetRow; -import com.openblocks.sdk.util.MustacheHelper; -import com.openblocks.sdk.util.SqlGuiUtils.GuiSqlValue; +import org.lowcoder.sdk.exception.PluginException; +import org.lowcoder.sdk.plugin.sqlcommand.GuiSqlCommand; +import org.lowcoder.sdk.plugin.sqlcommand.changeset.ChangeSet; +import org.lowcoder.sdk.plugin.sqlcommand.changeset.ChangeSetItem; +import org.lowcoder.sdk.plugin.sqlcommand.changeset.ChangeSetRow; +import org.lowcoder.sdk.util.MustacheHelper; +import org.lowcoder.sdk.util.SqlGuiUtils.GuiSqlValue; public abstract class InsertCommand implements GuiSqlCommand { diff --git a/server/api-service/openblocks-sdk/src/main/java/com/openblocks/sdk/plugin/sqlcommand/command/UpdateCommand.java b/server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/plugin/sqlcommand/command/UpdateCommand.java similarity index 86% rename from server/api-service/openblocks-sdk/src/main/java/com/openblocks/sdk/plugin/sqlcommand/command/UpdateCommand.java rename to server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/plugin/sqlcommand/command/UpdateCommand.java index 65cf02f7e..6262342ac 100644 --- a/server/api-service/openblocks-sdk/src/main/java/com/openblocks/sdk/plugin/sqlcommand/command/UpdateCommand.java +++ b/server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/plugin/sqlcommand/command/UpdateCommand.java @@ -1,21 +1,22 @@ -package com.openblocks.sdk.plugin.sqlcommand.command; +package org.lowcoder.sdk.plugin.sqlcommand.command; import static com.google.common.collect.Lists.newArrayList; -import static com.openblocks.sdk.exception.PluginCommonError.INVALID_UPDATE_COMMAND; -import static com.openblocks.sdk.plugin.sqlcommand.changeset.ChangeSet.parseChangeSet; -import static com.openblocks.sdk.plugin.sqlcommand.filter.FilterSet.parseFilterSet; -import static com.openblocks.sdk.util.MustacheHelper.renderMustacheString; +import static org.lowcoder.sdk.exception.PluginCommonError.INVALID_UPDATE_COMMAND; +import static org.lowcoder.sdk.plugin.sqlcommand.changeset.ChangeSet.parseChangeSet; +import static org.lowcoder.sdk.plugin.sqlcommand.filter.FilterSet.parseFilterSet; +import static org.lowcoder.sdk.util.MustacheHelper.renderMustacheString; import java.util.List; import java.util.Map; import java.util.Set; +import org.lowcoder.sdk.exception.PluginException; +import org.lowcoder.sdk.plugin.sqlcommand.GuiSqlCommand; +import org.lowcoder.sdk.plugin.sqlcommand.changeset.ChangeSet; +import org.lowcoder.sdk.plugin.sqlcommand.changeset.ChangeSetRow; +import org.lowcoder.sdk.plugin.sqlcommand.filter.FilterSet; + import com.google.common.collect.Sets; -import com.openblocks.sdk.exception.PluginException; -import com.openblocks.sdk.plugin.sqlcommand.GuiSqlCommand; -import com.openblocks.sdk.plugin.sqlcommand.changeset.ChangeSet; -import com.openblocks.sdk.plugin.sqlcommand.changeset.ChangeSetRow; -import com.openblocks.sdk.plugin.sqlcommand.filter.FilterSet; @SuppressWarnings("DuplicatedCode") public class UpdateCommand implements GuiSqlCommand { diff --git a/server/api-service/openblocks-sdk/src/main/java/com/openblocks/sdk/plugin/sqlcommand/command/UpdateOrDeleteSingleCommandRenderResult.java b/server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/plugin/sqlcommand/command/UpdateOrDeleteSingleCommandRenderResult.java similarity index 83% rename from server/api-service/openblocks-sdk/src/main/java/com/openblocks/sdk/plugin/sqlcommand/command/UpdateOrDeleteSingleCommandRenderResult.java rename to server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/plugin/sqlcommand/command/UpdateOrDeleteSingleCommandRenderResult.java index 875494895..410d3706a 100644 --- a/server/api-service/openblocks-sdk/src/main/java/com/openblocks/sdk/plugin/sqlcommand/command/UpdateOrDeleteSingleCommandRenderResult.java +++ b/server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/plugin/sqlcommand/command/UpdateOrDeleteSingleCommandRenderResult.java @@ -1,8 +1,8 @@ -package com.openblocks.sdk.plugin.sqlcommand.command; +package org.lowcoder.sdk.plugin.sqlcommand.command; import java.util.List; -import com.openblocks.sdk.plugin.sqlcommand.GuiSqlCommand.GuiSqlCommandRenderResult; +import org.lowcoder.sdk.plugin.sqlcommand.GuiSqlCommand.GuiSqlCommandRenderResult; public class UpdateOrDeleteSingleCommandRenderResult extends GuiSqlCommandRenderResult { private final String selectQuery; diff --git a/server/api-service/openblocks-sdk/src/main/java/com/openblocks/sdk/plugin/sqlcommand/command/UpsertCommand.java b/server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/plugin/sqlcommand/command/UpsertCommand.java similarity index 88% rename from server/api-service/openblocks-sdk/src/main/java/com/openblocks/sdk/plugin/sqlcommand/command/UpsertCommand.java rename to server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/plugin/sqlcommand/command/UpsertCommand.java index ce8d6bc9e..893d7253e 100644 --- a/server/api-service/openblocks-sdk/src/main/java/com/openblocks/sdk/plugin/sqlcommand/command/UpsertCommand.java +++ b/server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/plugin/sqlcommand/command/UpsertCommand.java @@ -1,14 +1,15 @@ -package com.openblocks.sdk.plugin.sqlcommand.command; +package org.lowcoder.sdk.plugin.sqlcommand.command; import java.util.List; import java.util.Set; +import org.lowcoder.sdk.plugin.sqlcommand.GuiSqlCommand; +import org.lowcoder.sdk.plugin.sqlcommand.changeset.ChangeSet; +import org.lowcoder.sdk.plugin.sqlcommand.changeset.ChangeSetItem; +import org.lowcoder.sdk.plugin.sqlcommand.changeset.ChangeSetRow; +import org.lowcoder.sdk.plugin.sqlcommand.filter.FilterSet; + import com.google.common.collect.Sets; -import com.openblocks.sdk.plugin.sqlcommand.GuiSqlCommand; -import com.openblocks.sdk.plugin.sqlcommand.changeset.ChangeSet; -import com.openblocks.sdk.plugin.sqlcommand.changeset.ChangeSetItem; -import com.openblocks.sdk.plugin.sqlcommand.changeset.ChangeSetRow; -import com.openblocks.sdk.plugin.sqlcommand.filter.FilterSet; public abstract class UpsertCommand implements GuiSqlCommand { diff --git a/server/api-service/openblocks-sdk/src/main/java/com/openblocks/sdk/plugin/sqlcommand/command/mysql/MysqlBulkInsertCommand.java b/server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/plugin/sqlcommand/command/mysql/MysqlBulkInsertCommand.java similarity index 58% rename from server/api-service/openblocks-sdk/src/main/java/com/openblocks/sdk/plugin/sqlcommand/command/mysql/MysqlBulkInsertCommand.java rename to server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/plugin/sqlcommand/command/mysql/MysqlBulkInsertCommand.java index d905403e6..c71047b3f 100644 --- a/server/api-service/openblocks-sdk/src/main/java/com/openblocks/sdk/plugin/sqlcommand/command/mysql/MysqlBulkInsertCommand.java +++ b/server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/plugin/sqlcommand/command/mysql/MysqlBulkInsertCommand.java @@ -1,13 +1,13 @@ -package com.openblocks.sdk.plugin.sqlcommand.command.mysql; +package org.lowcoder.sdk.plugin.sqlcommand.command.mysql; -import static com.openblocks.sdk.plugin.sqlcommand.changeset.BulkObjectChangeSet.parseBulkRecords; -import static com.openblocks.sdk.plugin.sqlcommand.command.GuiConstants.MYSQL_COLUMN_DELIMITER; +import static org.lowcoder.sdk.plugin.sqlcommand.changeset.BulkObjectChangeSet.parseBulkRecords; +import static org.lowcoder.sdk.plugin.sqlcommand.command.GuiConstants.MYSQL_COLUMN_DELIMITER; import java.util.Map; -import com.openblocks.sdk.plugin.sqlcommand.GuiSqlCommand; -import com.openblocks.sdk.plugin.sqlcommand.changeset.BulkObjectChangeSet; -import com.openblocks.sdk.plugin.sqlcommand.command.BulkInsertCommand; +import org.lowcoder.sdk.plugin.sqlcommand.GuiSqlCommand; +import org.lowcoder.sdk.plugin.sqlcommand.changeset.BulkObjectChangeSet; +import org.lowcoder.sdk.plugin.sqlcommand.command.BulkInsertCommand; public class MysqlBulkInsertCommand extends BulkInsertCommand { protected MysqlBulkInsertCommand(String table, BulkObjectChangeSet bulkObjectChangeSet) { diff --git a/server/api-service/openblocks-sdk/src/main/java/com/openblocks/sdk/plugin/sqlcommand/command/mysql/MysqlBulkUpdateCommand.java b/server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/plugin/sqlcommand/command/mysql/MysqlBulkUpdateCommand.java similarity index 55% rename from server/api-service/openblocks-sdk/src/main/java/com/openblocks/sdk/plugin/sqlcommand/command/mysql/MysqlBulkUpdateCommand.java rename to server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/plugin/sqlcommand/command/mysql/MysqlBulkUpdateCommand.java index c583bb8f1..df747cc68 100644 --- a/server/api-service/openblocks-sdk/src/main/java/com/openblocks/sdk/plugin/sqlcommand/command/mysql/MysqlBulkUpdateCommand.java +++ b/server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/plugin/sqlcommand/command/mysql/MysqlBulkUpdateCommand.java @@ -1,14 +1,14 @@ -package com.openblocks.sdk.plugin.sqlcommand.command.mysql; +package org.lowcoder.sdk.plugin.sqlcommand.command.mysql; -import static com.openblocks.sdk.plugin.sqlcommand.GuiSqlCommand.parseTable; -import static com.openblocks.sdk.plugin.sqlcommand.changeset.BulkObjectChangeSet.parseBulkRecords; -import static com.openblocks.sdk.plugin.sqlcommand.changeset.BulkObjectChangeSet.parsePrimaryKey; -import static com.openblocks.sdk.plugin.sqlcommand.command.GuiConstants.MYSQL_COLUMN_DELIMITER; +import static org.lowcoder.sdk.plugin.sqlcommand.GuiSqlCommand.parseTable; +import static org.lowcoder.sdk.plugin.sqlcommand.changeset.BulkObjectChangeSet.parseBulkRecords; +import static org.lowcoder.sdk.plugin.sqlcommand.changeset.BulkObjectChangeSet.parsePrimaryKey; +import static org.lowcoder.sdk.plugin.sqlcommand.command.GuiConstants.MYSQL_COLUMN_DELIMITER; import java.util.Map; -import com.openblocks.sdk.plugin.sqlcommand.changeset.BulkObjectChangeSet; -import com.openblocks.sdk.plugin.sqlcommand.command.BulkUpdateCommand; +import org.lowcoder.sdk.plugin.sqlcommand.changeset.BulkObjectChangeSet; +import org.lowcoder.sdk.plugin.sqlcommand.command.BulkUpdateCommand; public class MysqlBulkUpdateCommand extends BulkUpdateCommand { diff --git a/server/api-service/openblocks-sdk/src/main/java/com/openblocks/sdk/plugin/sqlcommand/command/mysql/MysqlDeleteCommand.java b/server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/plugin/sqlcommand/command/mysql/MysqlDeleteCommand.java similarity index 60% rename from server/api-service/openblocks-sdk/src/main/java/com/openblocks/sdk/plugin/sqlcommand/command/mysql/MysqlDeleteCommand.java rename to server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/plugin/sqlcommand/command/mysql/MysqlDeleteCommand.java index 450dee9c6..cb2add94c 100644 --- a/server/api-service/openblocks-sdk/src/main/java/com/openblocks/sdk/plugin/sqlcommand/command/mysql/MysqlDeleteCommand.java +++ b/server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/plugin/sqlcommand/command/mysql/MysqlDeleteCommand.java @@ -1,13 +1,13 @@ -package com.openblocks.sdk.plugin.sqlcommand.command.mysql; +package org.lowcoder.sdk.plugin.sqlcommand.command.mysql; -import static com.openblocks.sdk.plugin.sqlcommand.command.GuiConstants.MYSQL_COLUMN_DELIMITER; -import static com.openblocks.sdk.plugin.sqlcommand.filter.FilterSet.parseFilterSet; +import static org.lowcoder.sdk.plugin.sqlcommand.command.GuiConstants.MYSQL_COLUMN_DELIMITER; +import static org.lowcoder.sdk.plugin.sqlcommand.filter.FilterSet.parseFilterSet; import java.util.Map; -import com.openblocks.sdk.plugin.sqlcommand.GuiSqlCommand; -import com.openblocks.sdk.plugin.sqlcommand.command.DeleteCommand; -import com.openblocks.sdk.plugin.sqlcommand.filter.FilterSet; +import org.lowcoder.sdk.plugin.sqlcommand.GuiSqlCommand; +import org.lowcoder.sdk.plugin.sqlcommand.command.DeleteCommand; +import org.lowcoder.sdk.plugin.sqlcommand.filter.FilterSet; public class MysqlDeleteCommand extends DeleteCommand { diff --git a/server/api-service/openblocks-sdk/src/main/java/com/openblocks/sdk/plugin/sqlcommand/command/mysql/MysqlInsertCommand.java b/server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/plugin/sqlcommand/command/mysql/MysqlInsertCommand.java similarity index 67% rename from server/api-service/openblocks-sdk/src/main/java/com/openblocks/sdk/plugin/sqlcommand/command/mysql/MysqlInsertCommand.java rename to server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/plugin/sqlcommand/command/mysql/MysqlInsertCommand.java index 08d73990f..7bc670886 100644 --- a/server/api-service/openblocks-sdk/src/main/java/com/openblocks/sdk/plugin/sqlcommand/command/mysql/MysqlInsertCommand.java +++ b/server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/plugin/sqlcommand/command/mysql/MysqlInsertCommand.java @@ -1,12 +1,13 @@ -package com.openblocks.sdk.plugin.sqlcommand.command.mysql; +package org.lowcoder.sdk.plugin.sqlcommand.command.mysql; -import static com.openblocks.sdk.plugin.sqlcommand.command.GuiConstants.MYSQL_COLUMN_DELIMITER; +import static org.lowcoder.sdk.plugin.sqlcommand.command.GuiConstants.MYSQL_COLUMN_DELIMITER; import java.util.Map; +import org.lowcoder.sdk.plugin.sqlcommand.changeset.ChangeSet; +import org.lowcoder.sdk.plugin.sqlcommand.command.InsertCommand; + import com.google.common.annotations.VisibleForTesting; -import com.openblocks.sdk.plugin.sqlcommand.changeset.ChangeSet; -import com.openblocks.sdk.plugin.sqlcommand.command.InsertCommand; public class MysqlInsertCommand extends InsertCommand { diff --git a/server/api-service/openblocks-sdk/src/main/java/com/openblocks/sdk/plugin/sqlcommand/command/mysql/MysqlUpdateCommand.java b/server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/plugin/sqlcommand/command/mysql/MysqlUpdateCommand.java similarity index 66% rename from server/api-service/openblocks-sdk/src/main/java/com/openblocks/sdk/plugin/sqlcommand/command/mysql/MysqlUpdateCommand.java rename to server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/plugin/sqlcommand/command/mysql/MysqlUpdateCommand.java index 13f8e77e9..6af4dc893 100644 --- a/server/api-service/openblocks-sdk/src/main/java/com/openblocks/sdk/plugin/sqlcommand/command/mysql/MysqlUpdateCommand.java +++ b/server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/plugin/sqlcommand/command/mysql/MysqlUpdateCommand.java @@ -1,13 +1,14 @@ -package com.openblocks.sdk.plugin.sqlcommand.command.mysql; +package org.lowcoder.sdk.plugin.sqlcommand.command.mysql; -import static com.openblocks.sdk.plugin.sqlcommand.command.GuiConstants.MYSQL_COLUMN_DELIMITER; +import static org.lowcoder.sdk.plugin.sqlcommand.command.GuiConstants.MYSQL_COLUMN_DELIMITER; import java.util.Map; +import org.lowcoder.sdk.plugin.sqlcommand.changeset.ChangeSet; +import org.lowcoder.sdk.plugin.sqlcommand.command.UpdateCommand; +import org.lowcoder.sdk.plugin.sqlcommand.filter.FilterSet; + import com.google.common.annotations.VisibleForTesting; -import com.openblocks.sdk.plugin.sqlcommand.changeset.ChangeSet; -import com.openblocks.sdk.plugin.sqlcommand.command.UpdateCommand; -import com.openblocks.sdk.plugin.sqlcommand.filter.FilterSet; public class MysqlUpdateCommand extends UpdateCommand { diff --git a/server/api-service/openblocks-sdk/src/main/java/com/openblocks/sdk/plugin/sqlcommand/command/mysql/MysqlUpsertCommand.java b/server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/plugin/sqlcommand/command/mysql/MysqlUpsertCommand.java similarity index 68% rename from server/api-service/openblocks-sdk/src/main/java/com/openblocks/sdk/plugin/sqlcommand/command/mysql/MysqlUpsertCommand.java rename to server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/plugin/sqlcommand/command/mysql/MysqlUpsertCommand.java index 5b4672fac..764684484 100644 --- a/server/api-service/openblocks-sdk/src/main/java/com/openblocks/sdk/plugin/sqlcommand/command/mysql/MysqlUpsertCommand.java +++ b/server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/plugin/sqlcommand/command/mysql/MysqlUpsertCommand.java @@ -1,23 +1,24 @@ -package com.openblocks.sdk.plugin.sqlcommand.command.mysql; +package org.lowcoder.sdk.plugin.sqlcommand.command.mysql; import static com.google.common.collect.Lists.newArrayList; -import static com.openblocks.sdk.exception.PluginCommonError.INVALID_UPSERT_COMMAND; -import static com.openblocks.sdk.plugin.common.constant.Constants.INSERT_CHANGE_SET_FORM_KEY; -import static com.openblocks.sdk.plugin.common.constant.Constants.UPDATE_CHANGE_SET_FORM_KEY; -import static com.openblocks.sdk.plugin.sqlcommand.changeset.ChangeSet.parseChangeSet; -import static com.openblocks.sdk.plugin.sqlcommand.command.GuiConstants.MYSQL_COLUMN_DELIMITER; +import static org.lowcoder.sdk.exception.PluginCommonError.INVALID_UPSERT_COMMAND; +import static org.lowcoder.sdk.plugin.common.constant.Constants.INSERT_CHANGE_SET_FORM_KEY; +import static org.lowcoder.sdk.plugin.common.constant.Constants.UPDATE_CHANGE_SET_FORM_KEY; +import static org.lowcoder.sdk.plugin.sqlcommand.changeset.ChangeSet.parseChangeSet; +import static org.lowcoder.sdk.plugin.sqlcommand.command.GuiConstants.MYSQL_COLUMN_DELIMITER; import java.util.List; import java.util.Map; +import org.lowcoder.sdk.exception.PluginException; +import org.lowcoder.sdk.plugin.sqlcommand.GuiSqlCommand; +import org.lowcoder.sdk.plugin.sqlcommand.changeset.ChangeSet; +import org.lowcoder.sdk.plugin.sqlcommand.changeset.ChangeSetRow; +import org.lowcoder.sdk.plugin.sqlcommand.command.UpsertCommand; +import org.lowcoder.sdk.plugin.sqlcommand.filter.FilterSet; +import org.lowcoder.sdk.util.MustacheHelper; + import com.google.common.annotations.VisibleForTesting; -import com.openblocks.sdk.exception.PluginException; -import com.openblocks.sdk.plugin.sqlcommand.GuiSqlCommand; -import com.openblocks.sdk.plugin.sqlcommand.changeset.ChangeSet; -import com.openblocks.sdk.plugin.sqlcommand.changeset.ChangeSetRow; -import com.openblocks.sdk.plugin.sqlcommand.command.UpsertCommand; -import com.openblocks.sdk.plugin.sqlcommand.filter.FilterSet; -import com.openblocks.sdk.util.MustacheHelper; public class MysqlUpsertCommand extends UpsertCommand { diff --git a/server/api-service/openblocks-sdk/src/main/java/com/openblocks/sdk/plugin/sqlcommand/command/postgres/PostgresBulkInsertCommand.java b/server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/plugin/sqlcommand/command/postgres/PostgresBulkInsertCommand.java similarity index 58% rename from server/api-service/openblocks-sdk/src/main/java/com/openblocks/sdk/plugin/sqlcommand/command/postgres/PostgresBulkInsertCommand.java rename to server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/plugin/sqlcommand/command/postgres/PostgresBulkInsertCommand.java index ec41e65ae..1b5ba651d 100644 --- a/server/api-service/openblocks-sdk/src/main/java/com/openblocks/sdk/plugin/sqlcommand/command/postgres/PostgresBulkInsertCommand.java +++ b/server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/plugin/sqlcommand/command/postgres/PostgresBulkInsertCommand.java @@ -1,15 +1,15 @@ -package com.openblocks.sdk.plugin.sqlcommand.command.postgres; +package org.lowcoder.sdk.plugin.sqlcommand.command.postgres; -import static com.openblocks.sdk.plugin.sqlcommand.changeset.BulkObjectChangeSet.parseBulkRecords; -import static com.openblocks.sdk.plugin.sqlcommand.command.GuiConstants.POSTGRES_COLUMN_DELIMITER; -import static com.openblocks.sdk.util.SqlGuiUtils.POSTGRES_SQL_STR_ESCAPE; +import static org.lowcoder.sdk.plugin.sqlcommand.changeset.BulkObjectChangeSet.parseBulkRecords; +import static org.lowcoder.sdk.plugin.sqlcommand.command.GuiConstants.POSTGRES_COLUMN_DELIMITER; +import static org.lowcoder.sdk.util.SqlGuiUtils.POSTGRES_SQL_STR_ESCAPE; import java.util.Map; -import com.openblocks.sdk.plugin.sqlcommand.GuiSqlCommand; -import com.openblocks.sdk.plugin.sqlcommand.changeset.BulkObjectChangeSet; -import com.openblocks.sdk.plugin.sqlcommand.command.BulkInsertCommand; -import com.openblocks.sdk.util.SqlGuiUtils.GuiSqlValue.EscapeSql; +import org.lowcoder.sdk.plugin.sqlcommand.GuiSqlCommand; +import org.lowcoder.sdk.plugin.sqlcommand.changeset.BulkObjectChangeSet; +import org.lowcoder.sdk.plugin.sqlcommand.command.BulkInsertCommand; +import org.lowcoder.sdk.util.SqlGuiUtils.GuiSqlValue.EscapeSql; public class PostgresBulkInsertCommand extends BulkInsertCommand { protected PostgresBulkInsertCommand(String table, BulkObjectChangeSet bulkObjectChangeSet) { diff --git a/server/api-service/openblocks-sdk/src/main/java/com/openblocks/sdk/plugin/sqlcommand/command/postgres/PostgresBulkUpdateCommand.java b/server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/plugin/sqlcommand/command/postgres/PostgresBulkUpdateCommand.java similarity index 56% rename from server/api-service/openblocks-sdk/src/main/java/com/openblocks/sdk/plugin/sqlcommand/command/postgres/PostgresBulkUpdateCommand.java rename to server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/plugin/sqlcommand/command/postgres/PostgresBulkUpdateCommand.java index ef4490ea9..43e00031c 100644 --- a/server/api-service/openblocks-sdk/src/main/java/com/openblocks/sdk/plugin/sqlcommand/command/postgres/PostgresBulkUpdateCommand.java +++ b/server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/plugin/sqlcommand/command/postgres/PostgresBulkUpdateCommand.java @@ -1,16 +1,16 @@ -package com.openblocks.sdk.plugin.sqlcommand.command.postgres; +package org.lowcoder.sdk.plugin.sqlcommand.command.postgres; -import static com.openblocks.sdk.plugin.sqlcommand.changeset.BulkObjectChangeSet.parseBulkRecords; -import static com.openblocks.sdk.plugin.sqlcommand.changeset.BulkObjectChangeSet.parsePrimaryKey; -import static com.openblocks.sdk.plugin.sqlcommand.command.GuiConstants.POSTGRES_COLUMN_DELIMITER; -import static com.openblocks.sdk.util.SqlGuiUtils.POSTGRES_SQL_STR_ESCAPE; +import static org.lowcoder.sdk.plugin.sqlcommand.changeset.BulkObjectChangeSet.parseBulkRecords; +import static org.lowcoder.sdk.plugin.sqlcommand.changeset.BulkObjectChangeSet.parsePrimaryKey; +import static org.lowcoder.sdk.plugin.sqlcommand.command.GuiConstants.POSTGRES_COLUMN_DELIMITER; +import static org.lowcoder.sdk.util.SqlGuiUtils.POSTGRES_SQL_STR_ESCAPE; import java.util.Map; -import com.openblocks.sdk.plugin.sqlcommand.GuiSqlCommand; -import com.openblocks.sdk.plugin.sqlcommand.changeset.BulkObjectChangeSet; -import com.openblocks.sdk.plugin.sqlcommand.command.BulkUpdateCommand; -import com.openblocks.sdk.util.SqlGuiUtils.GuiSqlValue.EscapeSql; +import org.lowcoder.sdk.plugin.sqlcommand.GuiSqlCommand; +import org.lowcoder.sdk.plugin.sqlcommand.changeset.BulkObjectChangeSet; +import org.lowcoder.sdk.plugin.sqlcommand.command.BulkUpdateCommand; +import org.lowcoder.sdk.util.SqlGuiUtils.GuiSqlValue.EscapeSql; public class PostgresBulkUpdateCommand extends BulkUpdateCommand { diff --git a/server/api-service/openblocks-sdk/src/main/java/com/openblocks/sdk/plugin/sqlcommand/command/postgres/PostgresDeleteCommand.java b/server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/plugin/sqlcommand/command/postgres/PostgresDeleteCommand.java similarity index 75% rename from server/api-service/openblocks-sdk/src/main/java/com/openblocks/sdk/plugin/sqlcommand/command/postgres/PostgresDeleteCommand.java rename to server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/plugin/sqlcommand/command/postgres/PostgresDeleteCommand.java index bad96ba9c..875a675a3 100644 --- a/server/api-service/openblocks-sdk/src/main/java/com/openblocks/sdk/plugin/sqlcommand/command/postgres/PostgresDeleteCommand.java +++ b/server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/plugin/sqlcommand/command/postgres/PostgresDeleteCommand.java @@ -1,18 +1,18 @@ -package com.openblocks.sdk.plugin.sqlcommand.command.postgres; +package org.lowcoder.sdk.plugin.sqlcommand.command.postgres; -import static com.openblocks.sdk.plugin.sqlcommand.command.GuiConstants.POSTGRES_COLUMN_DELIMITER; -import static com.openblocks.sdk.plugin.sqlcommand.filter.FilterSet.parseFilterSet; -import static com.openblocks.sdk.util.SqlGuiUtils.POSTGRES_SQL_STR_ESCAPE; import static java.util.Collections.emptyList; +import static org.lowcoder.sdk.plugin.sqlcommand.command.GuiConstants.POSTGRES_COLUMN_DELIMITER; +import static org.lowcoder.sdk.plugin.sqlcommand.filter.FilterSet.parseFilterSet; +import static org.lowcoder.sdk.util.SqlGuiUtils.POSTGRES_SQL_STR_ESCAPE; import java.util.Map; -import com.openblocks.sdk.plugin.sqlcommand.GuiSqlCommand; -import com.openblocks.sdk.plugin.sqlcommand.command.DeleteCommand; -import com.openblocks.sdk.plugin.sqlcommand.command.UpdateOrDeleteSingleCommandRenderResult; -import com.openblocks.sdk.plugin.sqlcommand.filter.FilterSet; -import com.openblocks.sdk.util.MustacheHelper; -import com.openblocks.sdk.util.SqlGuiUtils.GuiSqlValue.EscapeSql; +import org.lowcoder.sdk.plugin.sqlcommand.GuiSqlCommand; +import org.lowcoder.sdk.plugin.sqlcommand.command.DeleteCommand; +import org.lowcoder.sdk.plugin.sqlcommand.command.UpdateOrDeleteSingleCommandRenderResult; +import org.lowcoder.sdk.plugin.sqlcommand.filter.FilterSet; +import org.lowcoder.sdk.util.MustacheHelper; +import org.lowcoder.sdk.util.SqlGuiUtils.GuiSqlValue.EscapeSql; public class PostgresDeleteCommand extends DeleteCommand { diff --git a/server/api-service/openblocks-sdk/src/main/java/com/openblocks/sdk/plugin/sqlcommand/command/postgres/PostgresInsertCommand.java b/server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/plugin/sqlcommand/command/postgres/PostgresInsertCommand.java similarity index 64% rename from server/api-service/openblocks-sdk/src/main/java/com/openblocks/sdk/plugin/sqlcommand/command/postgres/PostgresInsertCommand.java rename to server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/plugin/sqlcommand/command/postgres/PostgresInsertCommand.java index 62cee4c78..413fe169d 100644 --- a/server/api-service/openblocks-sdk/src/main/java/com/openblocks/sdk/plugin/sqlcommand/command/postgres/PostgresInsertCommand.java +++ b/server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/plugin/sqlcommand/command/postgres/PostgresInsertCommand.java @@ -1,14 +1,15 @@ -package com.openblocks.sdk.plugin.sqlcommand.command.postgres; +package org.lowcoder.sdk.plugin.sqlcommand.command.postgres; -import static com.openblocks.sdk.plugin.sqlcommand.command.GuiConstants.POSTGRES_COLUMN_DELIMITER; -import static com.openblocks.sdk.util.SqlGuiUtils.POSTGRES_SQL_STR_ESCAPE; +import static org.lowcoder.sdk.plugin.sqlcommand.command.GuiConstants.POSTGRES_COLUMN_DELIMITER; +import static org.lowcoder.sdk.util.SqlGuiUtils.POSTGRES_SQL_STR_ESCAPE; import java.util.Map; +import org.lowcoder.sdk.plugin.sqlcommand.changeset.ChangeSet; +import org.lowcoder.sdk.plugin.sqlcommand.command.InsertCommand; +import org.lowcoder.sdk.util.SqlGuiUtils.GuiSqlValue.EscapeSql; + import com.google.common.annotations.VisibleForTesting; -import com.openblocks.sdk.plugin.sqlcommand.changeset.ChangeSet; -import com.openblocks.sdk.plugin.sqlcommand.command.InsertCommand; -import com.openblocks.sdk.util.SqlGuiUtils.GuiSqlValue.EscapeSql; public class PostgresInsertCommand extends InsertCommand { diff --git a/server/api-service/openblocks-sdk/src/main/java/com/openblocks/sdk/plugin/sqlcommand/command/postgres/PostgresUpdateCommand.java b/server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/plugin/sqlcommand/command/postgres/PostgresUpdateCommand.java similarity index 72% rename from server/api-service/openblocks-sdk/src/main/java/com/openblocks/sdk/plugin/sqlcommand/command/postgres/PostgresUpdateCommand.java rename to server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/plugin/sqlcommand/command/postgres/PostgresUpdateCommand.java index 6e914494d..e028a2759 100644 --- a/server/api-service/openblocks-sdk/src/main/java/com/openblocks/sdk/plugin/sqlcommand/command/postgres/PostgresUpdateCommand.java +++ b/server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/plugin/sqlcommand/command/postgres/PostgresUpdateCommand.java @@ -1,22 +1,23 @@ -package com.openblocks.sdk.plugin.sqlcommand.command.postgres; +package org.lowcoder.sdk.plugin.sqlcommand.command.postgres; import static com.google.common.collect.Lists.newArrayList; -import static com.openblocks.sdk.exception.PluginCommonError.INVALID_UPDATE_COMMAND; -import static com.openblocks.sdk.plugin.sqlcommand.command.GuiConstants.POSTGRES_COLUMN_DELIMITER; -import static com.openblocks.sdk.util.MustacheHelper.renderMustacheString; -import static com.openblocks.sdk.util.SqlGuiUtils.POSTGRES_SQL_STR_ESCAPE; +import static org.lowcoder.sdk.exception.PluginCommonError.INVALID_UPDATE_COMMAND; +import static org.lowcoder.sdk.plugin.sqlcommand.command.GuiConstants.POSTGRES_COLUMN_DELIMITER; +import static org.lowcoder.sdk.util.MustacheHelper.renderMustacheString; +import static org.lowcoder.sdk.util.SqlGuiUtils.POSTGRES_SQL_STR_ESCAPE; import java.util.List; import java.util.Map; +import org.lowcoder.sdk.exception.PluginException; +import org.lowcoder.sdk.plugin.sqlcommand.changeset.ChangeSet; +import org.lowcoder.sdk.plugin.sqlcommand.changeset.ChangeSetRow; +import org.lowcoder.sdk.plugin.sqlcommand.command.UpdateCommand; +import org.lowcoder.sdk.plugin.sqlcommand.command.UpdateOrDeleteSingleCommandRenderResult; +import org.lowcoder.sdk.plugin.sqlcommand.filter.FilterSet; +import org.lowcoder.sdk.util.SqlGuiUtils.GuiSqlValue.EscapeSql; + import com.google.common.annotations.VisibleForTesting; -import com.openblocks.sdk.exception.PluginException; -import com.openblocks.sdk.plugin.sqlcommand.changeset.ChangeSet; -import com.openblocks.sdk.plugin.sqlcommand.changeset.ChangeSetRow; -import com.openblocks.sdk.plugin.sqlcommand.command.UpdateCommand; -import com.openblocks.sdk.plugin.sqlcommand.command.UpdateOrDeleteSingleCommandRenderResult; -import com.openblocks.sdk.plugin.sqlcommand.filter.FilterSet; -import com.openblocks.sdk.util.SqlGuiUtils.GuiSqlValue.EscapeSql; public class PostgresUpdateCommand extends UpdateCommand { diff --git a/server/api-service/openblocks-sdk/src/main/java/com/openblocks/sdk/plugin/sqlcommand/filter/FilterSet.java b/server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/plugin/sqlcommand/filter/FilterSet.java similarity index 91% rename from server/api-service/openblocks-sdk/src/main/java/com/openblocks/sdk/plugin/sqlcommand/filter/FilterSet.java rename to server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/plugin/sqlcommand/filter/FilterSet.java index bcf5f71bb..61279ce2a 100644 --- a/server/api-service/openblocks-sdk/src/main/java/com/openblocks/sdk/plugin/sqlcommand/filter/FilterSet.java +++ b/server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/plugin/sqlcommand/filter/FilterSet.java @@ -1,10 +1,10 @@ -package com.openblocks.sdk.plugin.sqlcommand.filter; +package org.lowcoder.sdk.plugin.sqlcommand.filter; import static com.google.common.collect.Lists.newArrayList; -import static com.openblocks.sdk.exception.PluginCommonError.INVALID_GUI_SETTINGS; -import static com.openblocks.sdk.exception.PluginCommonError.INVALID_IN_OPERATOR_SETTINGS; -import static com.openblocks.sdk.util.JsonUtils.toJson; import static java.util.Collections.emptyList; +import static org.lowcoder.sdk.exception.PluginCommonError.INVALID_GUI_SETTINGS; +import static org.lowcoder.sdk.exception.PluginCommonError.INVALID_IN_OPERATOR_SETTINGS; +import static org.lowcoder.sdk.util.JsonUtils.toJson; import java.util.ArrayList; import java.util.Collection; @@ -15,15 +15,15 @@ import org.apache.commons.collections4.MapUtils; import org.apache.commons.lang3.StringUtils; +import org.lowcoder.sdk.exception.PluginException; +import org.lowcoder.sdk.plugin.sqlcommand.GuiSqlCommand.GuiSqlCommandRenderResult; +import org.lowcoder.sdk.plugin.sqlcommand.filter.FilterSet.FilterCondition; +import org.lowcoder.sdk.util.MustacheHelper; +import org.lowcoder.sdk.util.SqlGuiUtils; +import org.lowcoder.sdk.util.SqlGuiUtils.GuiSqlValue; +import org.lowcoder.sdk.util.SqlGuiUtils.GuiSqlValue.EscapeSql; import com.google.common.collect.ForwardingList; -import com.openblocks.sdk.exception.PluginException; -import com.openblocks.sdk.plugin.sqlcommand.GuiSqlCommand.GuiSqlCommandRenderResult; -import com.openblocks.sdk.plugin.sqlcommand.filter.FilterSet.FilterCondition; -import com.openblocks.sdk.util.MustacheHelper; -import com.openblocks.sdk.util.SqlGuiUtils; -import com.openblocks.sdk.util.SqlGuiUtils.GuiSqlValue; -import com.openblocks.sdk.util.SqlGuiUtils.GuiSqlValue.EscapeSql; import lombok.Getter; diff --git a/server/api-service/openblocks-sdk/src/main/java/com/openblocks/sdk/query/QueryExecutionContext.java b/server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/query/QueryExecutionContext.java similarity index 87% rename from server/api-service/openblocks-sdk/src/main/java/com/openblocks/sdk/query/QueryExecutionContext.java rename to server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/query/QueryExecutionContext.java index 08982acef..4b0a003b4 100644 --- a/server/api-service/openblocks-sdk/src/main/java/com/openblocks/sdk/query/QueryExecutionContext.java +++ b/server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/query/QueryExecutionContext.java @@ -1,4 +1,4 @@ -package com.openblocks.sdk.query; +package org.lowcoder.sdk.query; public abstract class QueryExecutionContext { diff --git a/server/api-service/openblocks-sdk/src/main/java/com/openblocks/sdk/query/QueryVisitorContext.java b/server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/query/QueryVisitorContext.java similarity index 92% rename from server/api-service/openblocks-sdk/src/main/java/com/openblocks/sdk/query/QueryVisitorContext.java rename to server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/query/QueryVisitorContext.java index bdc8b52a9..129238f5a 100644 --- a/server/api-service/openblocks-sdk/src/main/java/com/openblocks/sdk/query/QueryVisitorContext.java +++ b/server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/query/QueryVisitorContext.java @@ -1,13 +1,12 @@ -package com.openblocks.sdk.query; +package org.lowcoder.sdk.query; import java.util.List; import java.util.Set; +import org.lowcoder.sdk.models.Property; import org.springframework.http.HttpCookie; import org.springframework.util.MultiValueMap; -import com.openblocks.sdk.models.Property; - import lombok.Getter; import reactor.core.publisher.Mono; diff --git a/server/api-service/openblocks-sdk/src/main/java/com/openblocks/sdk/test/JsonFileReader.java b/server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/test/JsonFileReader.java similarity index 96% rename from server/api-service/openblocks-sdk/src/main/java/com/openblocks/sdk/test/JsonFileReader.java rename to server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/test/JsonFileReader.java index 39c7cb780..0f0e2cbbc 100644 --- a/server/api-service/openblocks-sdk/src/main/java/com/openblocks/sdk/test/JsonFileReader.java +++ b/server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/test/JsonFileReader.java @@ -1,4 +1,4 @@ -package com.openblocks.sdk.test; +package org.lowcoder.sdk.test; import java.io.FileReader; import java.io.IOException; @@ -6,10 +6,10 @@ import java.util.Map; import org.apache.commons.io.IOUtils; +import org.lowcoder.sdk.util.JsonUtils; import com.google.common.annotations.VisibleForTesting; import com.jayway.jsonpath.JsonPath; -import com.openblocks.sdk.util.JsonUtils; @SuppressWarnings({"unused"}) @VisibleForTesting diff --git a/server/api-service/openblocks-sdk/src/main/java/com/openblocks/sdk/util/CookieHelper.java b/server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/util/CookieHelper.java similarity index 90% rename from server/api-service/openblocks-sdk/src/main/java/com/openblocks/sdk/util/CookieHelper.java rename to server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/util/CookieHelper.java index 6acc47f07..374c66d12 100644 --- a/server/api-service/openblocks-sdk/src/main/java/com/openblocks/sdk/util/CookieHelper.java +++ b/server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/util/CookieHelper.java @@ -1,13 +1,15 @@ -package com.openblocks.sdk.util; +package org.lowcoder.sdk.util; -import static com.openblocks.sdk.util.IDUtils.generate; -import static com.openblocks.sdk.util.UriUtils.getRefererURI; import static java.util.Optional.ofNullable; +import static org.lowcoder.sdk.util.IDUtils.generate; +import static org.lowcoder.sdk.util.UriUtils.getRefererURI; import java.util.Optional; import javax.annotation.Nullable; +import org.lowcoder.sdk.config.CommonConfig; +import org.lowcoder.sdk.config.CommonConfig.Cookie; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.HttpCookie; import org.springframework.http.ResponseCookie; @@ -16,9 +18,6 @@ import org.springframework.util.MultiValueMap; import org.springframework.web.server.ServerWebExchange; -import com.openblocks.sdk.config.CommonConfig; -import com.openblocks.sdk.config.CommonConfig.Cookie; - import lombok.extern.slf4j.Slf4j; @Component diff --git a/server/api-service/openblocks-sdk/src/main/java/com/openblocks/sdk/util/DateTimeUtils.java b/server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/util/DateTimeUtils.java similarity index 95% rename from server/api-service/openblocks-sdk/src/main/java/com/openblocks/sdk/util/DateTimeUtils.java rename to server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/util/DateTimeUtils.java index 4648604c4..80230c75c 100644 --- a/server/api-service/openblocks-sdk/src/main/java/com/openblocks/sdk/util/DateTimeUtils.java +++ b/server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/util/DateTimeUtils.java @@ -1,4 +1,4 @@ -package com.openblocks.sdk.util; +package org.lowcoder.sdk.util; import java.time.Instant; import java.time.format.DateTimeFormatter; diff --git a/server/api-service/openblocks-sdk/src/main/java/com/openblocks/sdk/util/EnterpriseEdition.java b/server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/util/EnterpriseEdition.java similarity index 88% rename from server/api-service/openblocks-sdk/src/main/java/com/openblocks/sdk/util/EnterpriseEdition.java rename to server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/util/EnterpriseEdition.java index 76cffcb22..80595f15c 100644 --- a/server/api-service/openblocks-sdk/src/main/java/com/openblocks/sdk/util/EnterpriseEdition.java +++ b/server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/util/EnterpriseEdition.java @@ -1,4 +1,4 @@ -package com.openblocks.sdk.util; +package org.lowcoder.sdk.util; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/server/api-service/openblocks-sdk/src/main/java/com/openblocks/sdk/util/EnumUtils.java b/server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/util/EnumUtils.java similarity index 93% rename from server/api-service/openblocks-sdk/src/main/java/com/openblocks/sdk/util/EnumUtils.java rename to server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/util/EnumUtils.java index 49e9b68d4..e732abcbf 100644 --- a/server/api-service/openblocks-sdk/src/main/java/com/openblocks/sdk/util/EnumUtils.java +++ b/server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/util/EnumUtils.java @@ -1,4 +1,4 @@ -package com.openblocks.sdk.util; +package org.lowcoder.sdk.util; import java.util.HashSet; import java.util.Set; diff --git a/server/api-service/openblocks-sdk/src/main/java/com/openblocks/sdk/util/ExceptionUtils.java b/server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/util/ExceptionUtils.java similarity index 90% rename from server/api-service/openblocks-sdk/src/main/java/com/openblocks/sdk/util/ExceptionUtils.java rename to server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/util/ExceptionUtils.java index e8f9b9995..b9f26194d 100644 --- a/server/api-service/openblocks-sdk/src/main/java/com/openblocks/sdk/util/ExceptionUtils.java +++ b/server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/util/ExceptionUtils.java @@ -1,12 +1,12 @@ -package com.openblocks.sdk.util; +package org.lowcoder.sdk.util; import static reactor.core.Exceptions.throwIfFatal; -import com.openblocks.sdk.exception.BaseException; -import com.openblocks.sdk.exception.BizError; -import com.openblocks.sdk.exception.BizException; -import com.openblocks.sdk.exception.PluginError; -import com.openblocks.sdk.exception.PluginException; +import org.lowcoder.sdk.exception.BaseException; +import org.lowcoder.sdk.exception.BizError; +import org.lowcoder.sdk.exception.BizException; +import org.lowcoder.sdk.exception.PluginError; +import org.lowcoder.sdk.exception.PluginException; import reactor.core.publisher.Mono; diff --git a/server/api-service/openblocks-sdk/src/main/java/com/openblocks/sdk/util/HashUtils.java b/server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/util/HashUtils.java similarity index 87% rename from server/api-service/openblocks-sdk/src/main/java/com/openblocks/sdk/util/HashUtils.java rename to server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/util/HashUtils.java index d1c619029..8b591ace8 100644 --- a/server/api-service/openblocks-sdk/src/main/java/com/openblocks/sdk/util/HashUtils.java +++ b/server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/util/HashUtils.java @@ -1,4 +1,4 @@ -package com.openblocks.sdk.util; +package org.lowcoder.sdk.util; import com.google.common.hash.Hashing; diff --git a/server/api-service/openblocks-sdk/src/main/java/com/openblocks/sdk/util/HttpUtils.java b/server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/util/HttpUtils.java similarity index 99% rename from server/api-service/openblocks-sdk/src/main/java/com/openblocks/sdk/util/HttpUtils.java rename to server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/util/HttpUtils.java index 8ac204e72..ea3ad6059 100644 --- a/server/api-service/openblocks-sdk/src/main/java/com/openblocks/sdk/util/HttpUtils.java +++ b/server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/util/HttpUtils.java @@ -1,4 +1,4 @@ -package com.openblocks.sdk.util; +package org.lowcoder.sdk.util; import static org.apache.http.HttpHeaders.CONTENT_TYPE; import static org.springframework.http.MediaType.APPLICATION_FORM_URLENCODED_VALUE; diff --git a/server/api-service/openblocks-sdk/src/main/java/com/openblocks/sdk/util/IDUtils.java b/server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/util/IDUtils.java similarity index 82% rename from server/api-service/openblocks-sdk/src/main/java/com/openblocks/sdk/util/IDUtils.java rename to server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/util/IDUtils.java index 61e113f8c..cb18b3dbc 100644 --- a/server/api-service/openblocks-sdk/src/main/java/com/openblocks/sdk/util/IDUtils.java +++ b/server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/util/IDUtils.java @@ -1,4 +1,4 @@ -package com.openblocks.sdk.util; +package org.lowcoder.sdk.util; import java.util.UUID; diff --git a/server/api-service/openblocks-sdk/src/main/java/com/openblocks/sdk/util/JsonUtils.java b/server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/util/JsonUtils.java similarity index 94% rename from server/api-service/openblocks-sdk/src/main/java/com/openblocks/sdk/util/JsonUtils.java rename to server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/util/JsonUtils.java index 2c31e6ad9..f3c97ee0a 100644 --- a/server/api-service/openblocks-sdk/src/main/java/com/openblocks/sdk/util/JsonUtils.java +++ b/server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/util/JsonUtils.java @@ -1,8 +1,8 @@ -package com.openblocks.sdk.util; +package org.lowcoder.sdk.util; -import static com.openblocks.sdk.auth.constants.AuthTypeConstants.FORM; -import static com.openblocks.sdk.auth.constants.AuthTypeConstants.GITHUB; -import static com.openblocks.sdk.auth.constants.AuthTypeConstants.GOOGLE; +import static org.lowcoder.sdk.auth.constants.AuthTypeConstants.FORM; +import static org.lowcoder.sdk.auth.constants.AuthTypeConstants.GITHUB; +import static org.lowcoder.sdk.auth.constants.AuthTypeConstants.GOOGLE; import java.nio.charset.StandardCharsets; import java.util.List; @@ -11,6 +11,9 @@ import javax.annotation.Nullable; +import org.lowcoder.sdk.auth.EmailAuthConfig; +import org.lowcoder.sdk.auth.Oauth2SimpleAuthConfig; + import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.core.type.TypeReference; @@ -26,8 +29,6 @@ import com.fasterxml.jackson.databind.type.MapType; import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule; import com.fasterxml.jackson.module.paramnames.ParameterNamesModule; -import com.openblocks.sdk.auth.EmailAuthConfig; -import com.openblocks.sdk.auth.Oauth2SimpleAuthConfig; import lombok.extern.slf4j.Slf4j; diff --git a/server/api-service/openblocks-sdk/src/main/java/com/openblocks/sdk/util/LocaleUtils.java b/server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/util/LocaleUtils.java similarity index 92% rename from server/api-service/openblocks-sdk/src/main/java/com/openblocks/sdk/util/LocaleUtils.java rename to server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/util/LocaleUtils.java index 1ff76dc82..eaa41117e 100644 --- a/server/api-service/openblocks-sdk/src/main/java/com/openblocks/sdk/util/LocaleUtils.java +++ b/server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/util/LocaleUtils.java @@ -1,13 +1,12 @@ -package com.openblocks.sdk.util; +package org.lowcoder.sdk.util; import java.text.MessageFormat; import java.util.Locale; import java.util.ResourceBundle; import org.apache.commons.lang3.StringUtils; - -import com.openblocks.sdk.constants.GlobalContext; -import com.openblocks.sdk.models.LocaleMessage; +import org.lowcoder.sdk.constants.GlobalContext; +import org.lowcoder.sdk.models.LocaleMessage; import lombok.extern.slf4j.Slf4j; import reactor.util.context.ContextView; diff --git a/server/api-service/openblocks-sdk/src/main/java/com/openblocks/sdk/util/MediaTypeUtils.java b/server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/util/MediaTypeUtils.java similarity index 98% rename from server/api-service/openblocks-sdk/src/main/java/com/openblocks/sdk/util/MediaTypeUtils.java rename to server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/util/MediaTypeUtils.java index 03f67b3bf..df188e9cb 100644 --- a/server/api-service/openblocks-sdk/src/main/java/com/openblocks/sdk/util/MediaTypeUtils.java +++ b/server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/util/MediaTypeUtils.java @@ -1,4 +1,4 @@ -package com.openblocks.sdk.util; +package org.lowcoder.sdk.util; import static org.springframework.http.MediaType.APPLICATION_OCTET_STREAM; import static org.springframework.http.MediaType.APPLICATION_PDF; diff --git a/server/api-service/openblocks-sdk/src/main/java/com/openblocks/sdk/util/MoreMapUtils.java b/server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/util/MoreMapUtils.java similarity index 97% rename from server/api-service/openblocks-sdk/src/main/java/com/openblocks/sdk/util/MoreMapUtils.java rename to server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/util/MoreMapUtils.java index cc496cbf7..3aa5b3fd3 100644 --- a/server/api-service/openblocks-sdk/src/main/java/com/openblocks/sdk/util/MoreMapUtils.java +++ b/server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/util/MoreMapUtils.java @@ -1,4 +1,4 @@ -package com.openblocks.sdk.util; +package org.lowcoder.sdk.util; import java.util.HashMap; import java.util.List; diff --git a/server/api-service/openblocks-sdk/src/main/java/com/openblocks/sdk/util/MustacheHelper.java b/server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/util/MustacheHelper.java similarity index 98% rename from server/api-service/openblocks-sdk/src/main/java/com/openblocks/sdk/util/MustacheHelper.java rename to server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/util/MustacheHelper.java index a5dc28aec..a6aa48c76 100644 --- a/server/api-service/openblocks-sdk/src/main/java/com/openblocks/sdk/util/MustacheHelper.java +++ b/server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/util/MustacheHelper.java @@ -17,15 +17,15 @@ // copied and adapted for mustache parsing -package com.openblocks.sdk.util; +package org.lowcoder.sdk.util; import static com.google.common.collect.Lists.newArrayList; -import static com.openblocks.sdk.exception.PluginCommonError.SQL_IN_OPERATOR_PARSE_ERROR; -import static com.openblocks.sdk.util.JsonUtils.toJson; -import static com.openblocks.sdk.util.StreamUtils.collectMap; import static org.apache.commons.lang3.ObjectUtils.firstNonNull; import static org.apache.commons.lang3.StringUtils.isBlank; import static org.apache.commons.lang3.StringUtils.substring; +import static org.lowcoder.sdk.exception.PluginCommonError.SQL_IN_OPERATOR_PARSE_ERROR; +import static org.lowcoder.sdk.util.JsonUtils.toJson; +import static org.lowcoder.sdk.util.StreamUtils.collectMap; import java.time.Duration; import java.util.ArrayList; @@ -48,13 +48,13 @@ import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang3.Range; import org.apache.commons.text.StringEscapeUtils; +import org.lowcoder.sdk.exception.PluginException; import com.fasterxml.jackson.databind.JsonNode; import com.github.benmanes.caffeine.cache.Cache; import com.github.benmanes.caffeine.cache.Caffeine; import com.google.common.annotations.VisibleForTesting; import com.google.common.collect.Iterables; -import com.openblocks.sdk.exception.PluginException; import lombok.extern.slf4j.Slf4j; diff --git a/server/api-service/openblocks-sdk/src/main/java/com/openblocks/sdk/util/Preconditions.java b/server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/util/Preconditions.java similarity index 66% rename from server/api-service/openblocks-sdk/src/main/java/com/openblocks/sdk/util/Preconditions.java rename to server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/util/Preconditions.java index 0d7ea81d3..67133d818 100644 --- a/server/api-service/openblocks-sdk/src/main/java/com/openblocks/sdk/util/Preconditions.java +++ b/server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/util/Preconditions.java @@ -1,9 +1,9 @@ -package com.openblocks.sdk.util; +package org.lowcoder.sdk.util; -import com.openblocks.sdk.exception.BizError; -import com.openblocks.sdk.exception.BizException; -import com.openblocks.sdk.exception.PluginError; -import com.openblocks.sdk.exception.PluginException; +import org.lowcoder.sdk.exception.BizError; +import org.lowcoder.sdk.exception.BizException; +import org.lowcoder.sdk.exception.PluginError; +import org.lowcoder.sdk.exception.PluginException; public class Preconditions { diff --git a/server/api-service/openblocks-sdk/src/main/java/com/openblocks/sdk/util/RjsonMustacheParser.java b/server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/util/RjsonMustacheParser.java similarity index 92% rename from server/api-service/openblocks-sdk/src/main/java/com/openblocks/sdk/util/RjsonMustacheParser.java rename to server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/util/RjsonMustacheParser.java index b3d3c5534..ad2f6843b 100644 --- a/server/api-service/openblocks-sdk/src/main/java/com/openblocks/sdk/util/RjsonMustacheParser.java +++ b/server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/util/RjsonMustacheParser.java @@ -1,16 +1,16 @@ -package com.openblocks.sdk.util; - -import static com.openblocks.sdk.exception.PluginCommonError.JSON_PARSE_ERROR; -import static com.openblocks.sdk.util.JsonUtils.EMPTY_JSON_NODE; -import static com.openblocks.sdk.util.JsonUtils.createArrayNode; -import static com.openblocks.sdk.util.JsonUtils.createObjectNode; -import static com.openblocks.sdk.util.JsonUtils.valueToTree; -import static com.openblocks.sdk.util.MustacheHelper.isMustacheToken; -import static com.openblocks.sdk.util.MustacheHelper.removeCurlyBraces; -import static com.openblocks.sdk.util.MustacheHelper.tokenize; -import static com.openblocks.sdk.util.StreamUtils.toMapNullFriendly; +package org.lowcoder.sdk.util; + import static org.apache.commons.lang3.StringUtils.isBlank; import static org.apache.commons.lang3.StringUtils.replace; +import static org.lowcoder.sdk.exception.PluginCommonError.JSON_PARSE_ERROR; +import static org.lowcoder.sdk.util.JsonUtils.EMPTY_JSON_NODE; +import static org.lowcoder.sdk.util.JsonUtils.createArrayNode; +import static org.lowcoder.sdk.util.JsonUtils.createObjectNode; +import static org.lowcoder.sdk.util.JsonUtils.valueToTree; +import static org.lowcoder.sdk.util.MustacheHelper.isMustacheToken; +import static org.lowcoder.sdk.util.MustacheHelper.removeCurlyBraces; +import static org.lowcoder.sdk.util.MustacheHelper.tokenize; +import static org.lowcoder.sdk.util.StreamUtils.toMapNullFriendly; import java.util.Collection; import java.util.HashMap; @@ -24,6 +24,7 @@ import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.math.NumberUtils; +import org.lowcoder.sdk.exception.PluginException; import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.node.ArrayNode; @@ -34,7 +35,6 @@ import com.fasterxml.jackson.databind.node.LongNode; import com.fasterxml.jackson.databind.node.NullNode; import com.fasterxml.jackson.databind.node.TextNode; -import com.openblocks.sdk.exception.PluginException; import tv.twelvetone.json.Json; import tv.twelvetone.json.JsonObject.Member; diff --git a/server/api-service/openblocks-sdk/src/main/java/com/openblocks/sdk/util/RjsonParser.java b/server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/util/RjsonParser.java similarity index 94% rename from server/api-service/openblocks-sdk/src/main/java/com/openblocks/sdk/util/RjsonParser.java rename to server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/util/RjsonParser.java index 0e035ec3e..12d10572b 100644 --- a/server/api-service/openblocks-sdk/src/main/java/com/openblocks/sdk/util/RjsonParser.java +++ b/server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/util/RjsonParser.java @@ -1,4 +1,4 @@ -package com.openblocks.sdk.util; +package org.lowcoder.sdk.util; import javax.annotation.Nonnull; diff --git a/server/api-service/openblocks-sdk/src/main/java/com/openblocks/sdk/util/SqlGuiUtils.java b/server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/util/SqlGuiUtils.java similarity index 92% rename from server/api-service/openblocks-sdk/src/main/java/com/openblocks/sdk/util/SqlGuiUtils.java rename to server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/util/SqlGuiUtils.java index a76190515..19f7151a2 100644 --- a/server/api-service/openblocks-sdk/src/main/java/com/openblocks/sdk/util/SqlGuiUtils.java +++ b/server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/util/SqlGuiUtils.java @@ -1,8 +1,8 @@ -package com.openblocks.sdk.util; +package org.lowcoder.sdk.util; -import static com.openblocks.sdk.util.JsonUtils.jsonNodeToObject; -import static com.openblocks.sdk.util.JsonUtils.toJson; import static org.apache.commons.lang3.StringUtils.isBlank; +import static org.lowcoder.sdk.util.JsonUtils.jsonNodeToObject; +import static org.lowcoder.sdk.util.JsonUtils.toJson; import java.util.Collection; import java.util.Map; @@ -10,9 +10,9 @@ import javax.annotation.Nonnull; import org.apache.commons.lang3.RandomStringUtils; +import org.lowcoder.sdk.util.SqlGuiUtils.GuiSqlValue.EscapeSql; import com.fasterxml.jackson.databind.JsonNode; -import com.openblocks.sdk.util.SqlGuiUtils.GuiSqlValue.EscapeSql; public final class SqlGuiUtils { diff --git a/server/api-service/openblocks-sdk/src/main/java/com/openblocks/sdk/util/StreamUtils.java b/server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/util/StreamUtils.java similarity index 98% rename from server/api-service/openblocks-sdk/src/main/java/com/openblocks/sdk/util/StreamUtils.java rename to server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/util/StreamUtils.java index 0d4d73db8..8a9254273 100644 --- a/server/api-service/openblocks-sdk/src/main/java/com/openblocks/sdk/util/StreamUtils.java +++ b/server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/util/StreamUtils.java @@ -1,4 +1,4 @@ -package com.openblocks.sdk.util; +package org.lowcoder.sdk.util; import static java.util.function.Function.identity; diff --git a/server/api-service/openblocks-sdk/src/main/java/com/openblocks/sdk/util/UriUtils.java b/server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/util/UriUtils.java similarity index 95% rename from server/api-service/openblocks-sdk/src/main/java/com/openblocks/sdk/util/UriUtils.java rename to server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/util/UriUtils.java index 43b36ae80..f28741deb 100644 --- a/server/api-service/openblocks-sdk/src/main/java/com/openblocks/sdk/util/UriUtils.java +++ b/server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/util/UriUtils.java @@ -1,4 +1,4 @@ -package com.openblocks.sdk.util; +package org.lowcoder.sdk.util; import java.net.URI; @@ -7,11 +7,11 @@ import javax.annotation.Nullable; import org.apache.commons.lang3.StringUtils; +import org.lowcoder.sdk.constants.GlobalContext; import org.springframework.http.server.reactive.ServerHttpRequest; import org.springframework.web.server.ServerWebExchange; import com.google.common.net.InternetDomainName; -import com.openblocks.sdk.constants.GlobalContext; import lombok.extern.slf4j.Slf4j; import reactor.core.publisher.Mono; diff --git a/server/api-service/openblocks-sdk/src/main/java/com/openblocks/sdk/webclient/SafeHostResolverGroup.java b/server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/webclient/SafeHostResolverGroup.java similarity index 98% rename from server/api-service/openblocks-sdk/src/main/java/com/openblocks/sdk/webclient/SafeHostResolverGroup.java rename to server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/webclient/SafeHostResolverGroup.java index e63c4e9cf..ec0a9aa6d 100644 --- a/server/api-service/openblocks-sdk/src/main/java/com/openblocks/sdk/webclient/SafeHostResolverGroup.java +++ b/server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/webclient/SafeHostResolverGroup.java @@ -1,4 +1,4 @@ -package com.openblocks.sdk.webclient; +package org.lowcoder.sdk.webclient; import java.net.InetAddress; import java.net.InetSocketAddress; diff --git a/server/api-service/openblocks-sdk/src/main/java/com/openblocks/sdk/webclient/WebClientBuildHelper.java b/server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/webclient/WebClientBuildHelper.java similarity index 93% rename from server/api-service/openblocks-sdk/src/main/java/com/openblocks/sdk/webclient/WebClientBuildHelper.java rename to server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/webclient/WebClientBuildHelper.java index 85afad1e1..02bd35ae5 100644 --- a/server/api-service/openblocks-sdk/src/main/java/com/openblocks/sdk/webclient/WebClientBuildHelper.java +++ b/server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/webclient/WebClientBuildHelper.java @@ -1,4 +1,4 @@ -package com.openblocks.sdk.webclient; +package org.lowcoder.sdk.webclient; import java.security.cert.CertificateException; import java.security.cert.X509Certificate; @@ -8,15 +8,14 @@ import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang3.StringUtils; +import org.lowcoder.sdk.plugin.common.ssl.DisableVerifySslConfig; +import org.lowcoder.sdk.plugin.common.ssl.SslConfig; +import org.lowcoder.sdk.plugin.common.ssl.SslHelper; +import org.lowcoder.sdk.plugin.common.ssl.VerifySelfSignedCertSslConfig; import org.springframework.http.client.reactive.ReactorClientHttpConnector; import org.springframework.web.reactive.function.client.WebClient; import org.springframework.web.reactive.function.client.WebClient.Builder; -import com.openblocks.sdk.plugin.common.ssl.DisableVerifySslConfig; -import com.openblocks.sdk.plugin.common.ssl.SslConfig; -import com.openblocks.sdk.plugin.common.ssl.SslHelper; -import com.openblocks.sdk.plugin.common.ssl.VerifySelfSignedCertSslConfig; - import io.netty.handler.ssl.SslContext; import io.netty.handler.ssl.SslContextBuilder; import io.netty.handler.ssl.util.InsecureTrustManagerFactory; diff --git a/server/api-service/openblocks-sdk/src/main/java/com/openblocks/sdk/webclient/WebClients.java b/server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/webclient/WebClients.java similarity index 86% rename from server/api-service/openblocks-sdk/src/main/java/com/openblocks/sdk/webclient/WebClients.java rename to server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/webclient/WebClients.java index 0adf0ff84..a1a36a6c9 100644 --- a/server/api-service/openblocks-sdk/src/main/java/com/openblocks/sdk/webclient/WebClients.java +++ b/server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/webclient/WebClients.java @@ -1,4 +1,4 @@ -package com.openblocks.sdk.webclient; +package org.lowcoder.sdk.webclient; import org.springframework.web.reactive.function.client.WebClient; diff --git a/server/api-service/openblocks-sdk/src/main/resources/locale_en.properties b/server/api-service/lowcoder-sdk/src/main/resources/locale_en.properties similarity index 98% rename from server/api-service/openblocks-sdk/src/main/resources/locale_en.properties rename to server/api-service/lowcoder-sdk/src/main/resources/locale_en.properties index dd14cb733..1da28be24 100644 --- a/server/api-service/openblocks-sdk/src/main/resources/locale_en.properties +++ b/server/api-service/lowcoder-sdk/src/main/resources/locale_en.properties @@ -130,8 +130,8 @@ MONGODB_COMMAND_ERROR=Illegal MongoDB query: {0} REST_API_EXECUTION_ERROR=REST API execution error: {0}. REDIS_EXECUTION_ERROR=Sorry, Redis execution error: {0}. REDIS_URI_ERROR=The format of the URI error: {0}. Correct format: redis://username:password@my-redis.com: 6379 or redis://:password@my-redis.com: 6379. -OPENBLOCKS_INTERNAL_REQUEST_ERROR=Request failed: {0}. -OPENBLOCKS_INTERNAL_INVALID_REQUEST_TYPE=Invalid Openblocks API request type, please contact the administrator. +LOWCODER_INTERNAL_REQUEST_ERROR=Request failed: {0}. +LOWCODER_INTERNAL_INVALID_REQUEST_TYPE=Invalid Lowcoder API request type, please contact the administrator. ES_EXECUTION_ERROR=Elasticsearch query execution error: {0}. EXECUTION_TIMEOUT=Query execution exception: execution timeout. FAIL_TO_LOAD_CLICKHOUSE_JDBC=Query execution exception: the ClickHouse JDBC loading failed, please contact the administrator. @@ -222,7 +222,7 @@ NO_USER_FOUND=User not found. SYSTEM_GROUP_ALL_USER=All Users SYSTEM_GROUP_DEV=Developers USER_ORG_SUFFIX=''s workspace -OPENBLOCKS_DATASOURCE_NAME=Openblocks API +LOWCODER_DATASOURCE_NAME=Lowcoder API QUICK_REST_DATASOURCE_NAME=REST Query QUICK_GRAPHQL_DATASOURCE_NAME=GraphQL Query ## EVENT @@ -274,6 +274,6 @@ GOOGLESHEETS_DATASOURCE_CONFIG_ERROR=Fail to parse Google Sheets data source con GOOGLESHEETS_EMPTY_ROW=No data found at this row index. Do you want to try inserting something first? APPLICATION_EDIT_ERROR_LACK_OF_DATASOURCE_PERMISSIONS=Current changes of this application will not be saved for lacking of some data sources'' permissions. CERTIFICATE_EMPTY=Certificate is empty. -ORG_DELETED_FOR_ENTERPRISE_MODE=Provided enterpriseOrgId workspace has been deleted, please contact Openblocks team. +ORG_DELETED_FOR_ENTERPRISE_MODE=Provided enterpriseOrgId workspace has been deleted, please contact Lowcoder team. DISABLE_AUTH_CONFIG_FORBIDDEN=Can not disable current administrator''s last identity provider. -USER_NOT_EXIST=User not exist. \ No newline at end of file +USER_NOT_EXIST=User not exist. diff --git a/server/api-service/openblocks-sdk/src/main/resources/logback-spring.xml b/server/api-service/lowcoder-sdk/src/main/resources/logback-spring.xml similarity index 97% rename from server/api-service/openblocks-sdk/src/main/resources/logback-spring.xml rename to server/api-service/lowcoder-sdk/src/main/resources/logback-spring.xml index a425e319d..216b61fc5 100644 --- a/server/api-service/openblocks-sdk/src/main/resources/logback-spring.xml +++ b/server/api-service/lowcoder-sdk/src/main/resources/logback-spring.xml @@ -1,6 +1,6 @@ - openblocks-logback + lowcoder-logback @@ -59,4 +59,4 @@ - \ No newline at end of file + diff --git a/server/api-service/openblocks-sdk/src/test/java/com/openblocks/sdk/helpers/MustacheHelperTest.java b/server/api-service/lowcoder-sdk/src/test/java/org/lowcoder/sdk/helpers/MustacheHelperTest.java similarity index 98% rename from server/api-service/openblocks-sdk/src/test/java/com/openblocks/sdk/helpers/MustacheHelperTest.java rename to server/api-service/lowcoder-sdk/src/test/java/org/lowcoder/sdk/helpers/MustacheHelperTest.java index 7ad480622..45e7718ba 100644 --- a/server/api-service/openblocks-sdk/src/test/java/com/openblocks/sdk/helpers/MustacheHelperTest.java +++ b/server/api-service/lowcoder-sdk/src/test/java/org/lowcoder/sdk/helpers/MustacheHelperTest.java @@ -1,9 +1,9 @@ -package com.openblocks.sdk.helpers; +package org.lowcoder.sdk.helpers; -import static com.openblocks.sdk.util.MustacheHelper.extractMustacheKeys; -import static com.openblocks.sdk.util.MustacheHelper.extractMustacheKeysInOrder; -import static com.openblocks.sdk.util.MustacheHelper.tokenize; import static org.assertj.core.api.Assertions.assertThat; +import static org.lowcoder.sdk.util.MustacheHelper.extractMustacheKeys; +import static org.lowcoder.sdk.util.MustacheHelper.extractMustacheKeysInOrder; +import static org.lowcoder.sdk.util.MustacheHelper.tokenize; import java.util.Arrays; import java.util.Collection; @@ -14,11 +14,11 @@ import org.junit.Assert; import org.junit.Test; +import org.lowcoder.sdk.util.JsonUtils; +import org.lowcoder.sdk.util.MustacheHelper; import com.google.common.collect.ImmutableList; import com.google.common.collect.Lists; -import com.openblocks.sdk.util.JsonUtils; -import com.openblocks.sdk.util.MustacheHelper; @SuppressWarnings( // Disabling this so we may use `Arrays.asList` with single argument, which is easier to refactor, just for tests. diff --git a/server/api-service/openblocks-sdk/src/test/java/com/openblocks/sdk/plugin/sqlcommand/command/mysql/MysqlGuiCommandTest.java b/server/api-service/lowcoder-sdk/src/test/java/org/lowcoder/sdk/plugin/sqlcommand/command/mysql/MysqlGuiCommandTest.java similarity index 92% rename from server/api-service/openblocks-sdk/src/test/java/com/openblocks/sdk/plugin/sqlcommand/command/mysql/MysqlGuiCommandTest.java rename to server/api-service/lowcoder-sdk/src/test/java/org/lowcoder/sdk/plugin/sqlcommand/command/mysql/MysqlGuiCommandTest.java index 3d1f02969..9d831d260 100644 --- a/server/api-service/openblocks-sdk/src/test/java/com/openblocks/sdk/plugin/sqlcommand/command/mysql/MysqlGuiCommandTest.java +++ b/server/api-service/lowcoder-sdk/src/test/java/org/lowcoder/sdk/plugin/sqlcommand/command/mysql/MysqlGuiCommandTest.java @@ -1,7 +1,7 @@ -package com.openblocks.sdk.plugin.sqlcommand.command.mysql; +package org.lowcoder.sdk.plugin.sqlcommand.command.mysql; -import static com.openblocks.sdk.util.JsonUtils.toJson; import static org.assertj.core.api.Assertions.assertThat; +import static org.lowcoder.sdk.util.JsonUtils.toJson; import java.util.ArrayList; import java.util.LinkedHashMap; @@ -11,10 +11,15 @@ import org.junit.Assert; import org.junit.Test; - -import com.openblocks.sdk.plugin.sqlcommand.changeset.BulkObjectChangeSet; -import com.openblocks.sdk.plugin.sqlcommand.changeset.KeyValuePairChangeSet; -import com.openblocks.sdk.plugin.sqlcommand.filter.FilterSet; +import org.lowcoder.sdk.plugin.sqlcommand.changeset.BulkObjectChangeSet; +import org.lowcoder.sdk.plugin.sqlcommand.changeset.KeyValuePairChangeSet; +import org.lowcoder.sdk.plugin.sqlcommand.command.mysql.MysqlBulkInsertCommand; +import org.lowcoder.sdk.plugin.sqlcommand.command.mysql.MysqlBulkUpdateCommand; +import org.lowcoder.sdk.plugin.sqlcommand.command.mysql.MysqlDeleteCommand; +import org.lowcoder.sdk.plugin.sqlcommand.command.mysql.MysqlInsertCommand; +import org.lowcoder.sdk.plugin.sqlcommand.command.mysql.MysqlUpdateCommand; +import org.lowcoder.sdk.plugin.sqlcommand.command.mysql.MysqlUpsertCommand; +import org.lowcoder.sdk.plugin.sqlcommand.filter.FilterSet; public class MysqlGuiCommandTest { diff --git a/server/api-service/openblocks-sdk/src/test/java/com/openblocks/sdk/plugin/sqlcommand/command/postgres/PostgresCommandTest.java b/server/api-service/lowcoder-sdk/src/test/java/org/lowcoder/sdk/plugin/sqlcommand/command/postgres/PostgresCommandTest.java similarity index 88% rename from server/api-service/openblocks-sdk/src/test/java/com/openblocks/sdk/plugin/sqlcommand/command/postgres/PostgresCommandTest.java rename to server/api-service/lowcoder-sdk/src/test/java/org/lowcoder/sdk/plugin/sqlcommand/command/postgres/PostgresCommandTest.java index 54ad1175f..6ce987004 100644 --- a/server/api-service/openblocks-sdk/src/test/java/com/openblocks/sdk/plugin/sqlcommand/command/postgres/PostgresCommandTest.java +++ b/server/api-service/lowcoder-sdk/src/test/java/org/lowcoder/sdk/plugin/sqlcommand/command/postgres/PostgresCommandTest.java @@ -1,6 +1,6 @@ -package com.openblocks.sdk.plugin.sqlcommand.command.postgres; +package org.lowcoder.sdk.plugin.sqlcommand.command.postgres; -import static com.openblocks.sdk.util.JsonUtils.toJson; +import static org.lowcoder.sdk.util.JsonUtils.toJson; import java.util.LinkedHashMap; import java.util.List; @@ -9,14 +9,19 @@ import org.assertj.core.api.Assertions; import org.junit.Assert; import org.junit.Test; +import org.lowcoder.sdk.plugin.sqlcommand.GuiSqlCommand.GuiSqlCommandRenderResult; +import org.lowcoder.sdk.plugin.sqlcommand.changeset.BulkObjectChangeSet; +import org.lowcoder.sdk.plugin.sqlcommand.changeset.KeyValuePairChangeSet; +import org.lowcoder.sdk.plugin.sqlcommand.command.UpdateOrDeleteSingleCommandRenderResult; +import org.lowcoder.sdk.plugin.sqlcommand.command.postgres.PostgresBulkInsertCommand; +import org.lowcoder.sdk.plugin.sqlcommand.command.postgres.PostgresBulkUpdateCommand; +import org.lowcoder.sdk.plugin.sqlcommand.command.postgres.PostgresDeleteCommand; +import org.lowcoder.sdk.plugin.sqlcommand.command.postgres.PostgresInsertCommand; +import org.lowcoder.sdk.plugin.sqlcommand.command.postgres.PostgresUpdateCommand; +import org.lowcoder.sdk.plugin.sqlcommand.filter.FilterSet; +import org.lowcoder.sdk.util.SqlGuiUtils.GuiSqlValue.EscapeSql; import com.google.common.collect.ImmutableMap; -import com.openblocks.sdk.plugin.sqlcommand.GuiSqlCommand.GuiSqlCommandRenderResult; -import com.openblocks.sdk.plugin.sqlcommand.changeset.BulkObjectChangeSet; -import com.openblocks.sdk.plugin.sqlcommand.changeset.KeyValuePairChangeSet; -import com.openblocks.sdk.plugin.sqlcommand.command.UpdateOrDeleteSingleCommandRenderResult; -import com.openblocks.sdk.plugin.sqlcommand.filter.FilterSet; -import com.openblocks.sdk.util.SqlGuiUtils.GuiSqlValue.EscapeSql; public class PostgresCommandTest { @@ -47,7 +52,7 @@ public EscapeSql escapeStrFunc() { GuiSqlCommandRenderResult render = insertCommand.render(Map.of("email", email, "info", infoMap)); Assert.assertEquals(""" - insert into user ("id","name","email","info") values (12312,$$jack$$,$$jack@gmail.com$$,$${"age":35,"job":"sales"}$$)""", + insert into user ("id","name","email","info") values (12312,$$jack$$,$$jack@gmail.com$$,$${"age":35,"job":"sales"}$$);""", render.sql()); Assertions.assertThat(render.bindParams()).isEqualTo(List.of()); diff --git a/server/api-service/openblocks-server/pom.xml b/server/api-service/lowcoder-server/pom.xml similarity index 84% rename from server/api-service/openblocks-server/pom.xml rename to server/api-service/lowcoder-server/pom.xml index 84dcc9c15..4780c490c 100644 --- a/server/api-service/openblocks-server/pom.xml +++ b/server/api-service/lowcoder-server/pom.xml @@ -3,16 +3,16 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - com.openblocks - openblocks-root + lowcoder-root + org.lowcoder 1.0-SNAPSHOT - openblocks-server + lowcoder-server 1.0-SNAPSHOT jar - openblocks-server + lowcoder-server 17 @@ -21,23 +21,23 @@ - com.openblocks - openblocks-sdk + org.lowcoder + lowcoder-sdk 1.0-SNAPSHOT - com.openblocks - openblocks-infra + org.lowcoder + lowcoder-infra 1.0-SNAPSHOT - com.openblocks - openblocks-domain + org.lowcoder + lowcoder-domain 1.0-SNAPSHOT - com.openblocks - openblocks-ee + org.lowcoder + lowcoder-ee pom 1.0-SNAPSHOT @@ -196,23 +196,4 @@ - - - selfhost-openblocks - - - - org.apache.maven.plugins - maven-compiler-plugin - - - **/*MajiangVersion.java - - - - - - - - diff --git a/server/api-service/openblocks-server/src/main/java/com/openblocks/api/ServerApplication.java b/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/ServerApplication.java similarity index 90% rename from server/api-service/openblocks-server/src/main/java/com/openblocks/api/ServerApplication.java rename to server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/ServerApplication.java index 9cbe38da7..775c1f04f 100644 --- a/server/api-service/openblocks-server/src/main/java/com/openblocks/api/ServerApplication.java +++ b/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/ServerApplication.java @@ -1,7 +1,8 @@ -package com.openblocks.api; +package org.lowcoder.api; import javax.annotation.PostConstruct; +import org.lowcoder.sdk.config.CommonConfig; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.Banner; import org.springframework.boot.autoconfigure.SpringBootApplication; @@ -10,8 +11,6 @@ import org.springframework.context.annotation.ComponentScan; import org.springframework.scheduling.annotation.EnableScheduling; -import com.openblocks.sdk.config.CommonConfig; - import lombok.extern.slf4j.Slf4j; import reactor.blockhound.BlockHound; import reactor.core.publisher.Hooks; @@ -20,7 +19,7 @@ @Slf4j @SpringBootApplication -@ComponentScan(basePackages = "com.openblocks.api.framework.configuration") +@ComponentScan(basePackages = "org.lowcoder.api.framework.configuration") @EnableScheduling @EnableConfigurationProperties public class ServerApplication { diff --git a/server/api-service/openblocks-server/src/main/java/com/openblocks/api/application/ApplicationApiService.java b/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/application/ApplicationApiService.java similarity index 88% rename from server/api-service/openblocks-server/src/main/java/com/openblocks/api/application/ApplicationApiService.java rename to server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/application/ApplicationApiService.java index 22b2c4c38..51440c317 100644 --- a/server/api-service/openblocks-server/src/main/java/com/openblocks/api/application/ApplicationApiService.java +++ b/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/application/ApplicationApiService.java @@ -1,18 +1,18 @@ -package com.openblocks.api.application; - -import static com.openblocks.domain.application.model.ApplicationStatus.NORMAL; -import static com.openblocks.domain.permission.model.ResourceAction.EDIT_APPLICATIONS; -import static com.openblocks.domain.permission.model.ResourceAction.MANAGE_APPLICATIONS; -import static com.openblocks.domain.permission.model.ResourceAction.PUBLISH_APPLICATIONS; -import static com.openblocks.domain.permission.model.ResourceAction.READ_APPLICATIONS; -import static com.openblocks.domain.permission.model.ResourceAction.USE_DATASOURCES; -import static com.openblocks.sdk.exception.BizError.ILLEGAL_APPLICATION_PERMISSION_ID; -import static com.openblocks.sdk.exception.BizError.INVALID_PARAMETER; -import static com.openblocks.sdk.exception.BizError.NOT_AUTHORIZED; -import static com.openblocks.sdk.exception.BizError.NO_PERMISSION_TO_REQUEST_APP; -import static com.openblocks.sdk.exception.BizError.USER_NOT_SIGNED_IN; -import static com.openblocks.sdk.util.ExceptionUtils.deferredError; -import static com.openblocks.sdk.util.ExceptionUtils.ofError; +package org.lowcoder.api.application; + +import static org.lowcoder.domain.application.model.ApplicationStatus.NORMAL; +import static org.lowcoder.domain.permission.model.ResourceAction.EDIT_APPLICATIONS; +import static org.lowcoder.domain.permission.model.ResourceAction.MANAGE_APPLICATIONS; +import static org.lowcoder.domain.permission.model.ResourceAction.PUBLISH_APPLICATIONS; +import static org.lowcoder.domain.permission.model.ResourceAction.READ_APPLICATIONS; +import static org.lowcoder.domain.permission.model.ResourceAction.USE_DATASOURCES; +import static org.lowcoder.sdk.exception.BizError.ILLEGAL_APPLICATION_PERMISSION_ID; +import static org.lowcoder.sdk.exception.BizError.INVALID_PARAMETER; +import static org.lowcoder.sdk.exception.BizError.NOT_AUTHORIZED; +import static org.lowcoder.sdk.exception.BizError.NO_PERMISSION_TO_REQUEST_APP; +import static org.lowcoder.sdk.exception.BizError.USER_NOT_SIGNED_IN; +import static org.lowcoder.sdk.util.ExceptionUtils.deferredError; +import static org.lowcoder.sdk.util.ExceptionUtils.ofError; import java.time.Instant; import java.util.HashSet; @@ -27,51 +27,51 @@ import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.collections4.SetUtils; import org.apache.commons.lang3.StringUtils; +import org.lowcoder.api.application.ApplicationController.CreateApplicationRequest; +import org.lowcoder.api.application.view.ApplicationInfoView; +import org.lowcoder.api.application.view.ApplicationPermissionView; +import org.lowcoder.api.application.view.ApplicationView; +import org.lowcoder.api.bizthreshold.AbstractBizThresholdChecker; +import org.lowcoder.api.home.FolderApiService; +import org.lowcoder.api.home.SessionUserService; +import org.lowcoder.api.home.UserHomeApiService; +import org.lowcoder.api.permission.PermissionHelper; +import org.lowcoder.api.permission.view.PermissionItemView; +import org.lowcoder.api.usermanagement.OrgDevChecker; +import org.lowcoder.domain.application.model.Application; +import org.lowcoder.domain.application.model.ApplicationStatus; +import org.lowcoder.domain.application.model.ApplicationType; +import org.lowcoder.domain.application.service.ApplicationService; +import org.lowcoder.domain.datasource.model.Datasource; +import org.lowcoder.domain.datasource.service.DatasourceService; +import org.lowcoder.domain.group.service.GroupService; +import org.lowcoder.domain.interaction.UserApplicationInteractionService; +import org.lowcoder.domain.organization.model.Organization; +import org.lowcoder.domain.organization.service.OrgMemberService; +import org.lowcoder.domain.organization.service.OrganizationService; +import org.lowcoder.domain.permission.model.ResourceAction; +import org.lowcoder.domain.permission.model.ResourceHolder; +import org.lowcoder.domain.permission.model.ResourcePermission; +import org.lowcoder.domain.permission.model.ResourceRole; +import org.lowcoder.domain.permission.model.ResourceType; +import org.lowcoder.domain.permission.service.ResourcePermissionService; +import org.lowcoder.domain.permission.solution.SuggestAppAdminSolution; +import org.lowcoder.domain.plugin.service.DatasourceMetaInfoService; +import org.lowcoder.domain.solutions.TemplateSolution; +import org.lowcoder.domain.template.model.Template; +import org.lowcoder.domain.template.service.TemplateService; +import org.lowcoder.domain.user.service.UserService; +import org.lowcoder.infra.util.TupleUtils; +import org.lowcoder.sdk.constants.Authentication; +import org.lowcoder.sdk.exception.BizError; +import org.lowcoder.sdk.exception.BizException; +import org.lowcoder.sdk.plugin.common.QueryExecutor; +import org.lowcoder.sdk.util.ExceptionUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import com.google.common.collect.Maps; import com.google.common.collect.Sets; -import com.openblocks.api.application.ApplicationController.CreateApplicationRequest; -import com.openblocks.api.application.view.ApplicationInfoView; -import com.openblocks.api.application.view.ApplicationPermissionView; -import com.openblocks.api.application.view.ApplicationView; -import com.openblocks.api.bizthreshold.AbstractBizThresholdChecker; -import com.openblocks.api.home.FolderApiService; -import com.openblocks.api.home.SessionUserService; -import com.openblocks.api.home.UserHomeApiService; -import com.openblocks.api.permission.PermissionHelper; -import com.openblocks.api.permission.view.PermissionItemView; -import com.openblocks.api.usermanagement.OrgDevChecker; -import com.openblocks.domain.application.model.Application; -import com.openblocks.domain.application.model.ApplicationStatus; -import com.openblocks.domain.application.model.ApplicationType; -import com.openblocks.domain.application.service.ApplicationService; -import com.openblocks.domain.datasource.model.Datasource; -import com.openblocks.domain.datasource.service.DatasourceService; -import com.openblocks.domain.group.service.GroupService; -import com.openblocks.domain.interaction.UserApplicationInteractionService; -import com.openblocks.domain.organization.model.Organization; -import com.openblocks.domain.organization.service.OrgMemberService; -import com.openblocks.domain.organization.service.OrganizationService; -import com.openblocks.domain.permission.model.ResourceAction; -import com.openblocks.domain.permission.model.ResourceHolder; -import com.openblocks.domain.permission.model.ResourcePermission; -import com.openblocks.domain.permission.model.ResourceRole; -import com.openblocks.domain.permission.model.ResourceType; -import com.openblocks.domain.permission.service.ResourcePermissionService; -import com.openblocks.domain.permission.solution.SuggestAppAdminSolution; -import com.openblocks.domain.plugin.service.DatasourceMetaInfoService; -import com.openblocks.domain.solutions.TemplateSolution; -import com.openblocks.domain.template.model.Template; -import com.openblocks.domain.template.service.TemplateService; -import com.openblocks.domain.user.service.UserService; -import com.openblocks.infra.util.TupleUtils; -import com.openblocks.sdk.constants.Authentication; -import com.openblocks.sdk.exception.BizError; -import com.openblocks.sdk.exception.BizException; -import com.openblocks.sdk.plugin.common.QueryExecutor; -import com.openblocks.sdk.util.ExceptionUtils; import lombok.extern.slf4j.Slf4j; import reactor.core.publisher.Flux; diff --git a/server/api-service/openblocks-server/src/main/java/com/openblocks/api/application/ApplicationController.java b/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/application/ApplicationController.java similarity index 87% rename from server/api-service/openblocks-server/src/main/java/com/openblocks/api/application/ApplicationController.java rename to server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/application/ApplicationController.java index 13cb556f0..917321ed5 100644 --- a/server/api-service/openblocks-server/src/main/java/com/openblocks/api/application/ApplicationController.java +++ b/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/application/ApplicationController.java @@ -1,14 +1,14 @@ -package com.openblocks.api.application; - -import static com.openblocks.infra.event.EventType.APPLICATION_CREATE; -import static com.openblocks.infra.event.EventType.APPLICATION_DELETE; -import static com.openblocks.infra.event.EventType.APPLICATION_RECYCLED; -import static com.openblocks.infra.event.EventType.APPLICATION_RESTORE; -import static com.openblocks.infra.event.EventType.APPLICATION_UPDATE; -import static com.openblocks.infra.event.EventType.VIEW; -import static com.openblocks.sdk.exception.BizError.INVALID_PARAMETER; -import static com.openblocks.sdk.util.ExceptionUtils.ofError; +package org.lowcoder.api.application; + import static org.apache.commons.collections4.SetUtils.emptyIfNull; +import static org.lowcoder.infra.event.EventType.APPLICATION_CREATE; +import static org.lowcoder.infra.event.EventType.APPLICATION_DELETE; +import static org.lowcoder.infra.event.EventType.APPLICATION_RECYCLED; +import static org.lowcoder.infra.event.EventType.APPLICATION_RESTORE; +import static org.lowcoder.infra.event.EventType.APPLICATION_UPDATE; +import static org.lowcoder.infra.event.EventType.VIEW; +import static org.lowcoder.sdk.exception.BizError.INVALID_PARAMETER; +import static org.lowcoder.sdk.util.ExceptionUtils.ofError; import java.util.List; import java.util.Map; @@ -17,6 +17,19 @@ import javax.annotation.Nullable; import org.apache.commons.lang3.BooleanUtils; +import org.lowcoder.api.application.view.ApplicationInfoView; +import org.lowcoder.api.application.view.ApplicationPermissionView; +import org.lowcoder.api.application.view.ApplicationView; +import org.lowcoder.api.framework.view.ResponseView; +import org.lowcoder.api.home.UserHomeApiService; +import org.lowcoder.api.home.UserHomepageView; +import org.lowcoder.api.util.BusinessEventPublisher; +import org.lowcoder.domain.application.model.Application; +import org.lowcoder.domain.application.model.ApplicationStatus; +import org.lowcoder.domain.application.model.ApplicationType; +import org.lowcoder.domain.permission.model.ResourceRole; +import org.lowcoder.infra.constant.NewUrl; +import org.lowcoder.infra.constant.Url; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.DeleteMapping; import org.springframework.web.bind.annotation.GetMapping; @@ -29,19 +42,6 @@ import org.springframework.web.bind.annotation.RestController; import com.fasterxml.jackson.annotation.JsonProperty; -import com.openblocks.api.application.view.ApplicationInfoView; -import com.openblocks.api.application.view.ApplicationPermissionView; -import com.openblocks.api.application.view.ApplicationView; -import com.openblocks.api.framework.view.ResponseView; -import com.openblocks.api.home.UserHomeApiService; -import com.openblocks.api.home.UserHomepageView; -import com.openblocks.api.util.BusinessEventPublisher; -import com.openblocks.domain.application.model.Application; -import com.openblocks.domain.application.model.ApplicationStatus; -import com.openblocks.domain.application.model.ApplicationType; -import com.openblocks.domain.permission.model.ResourceRole; -import com.openblocks.infra.constant.NewUrl; -import com.openblocks.infra.constant.Url; import lombok.extern.slf4j.Slf4j; import reactor.core.publisher.Mono; diff --git a/server/api-service/openblocks-server/src/main/java/com/openblocks/api/application/ApplicationHistorySnapshotController.java b/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/application/ApplicationHistorySnapshotController.java similarity index 87% rename from server/api-service/openblocks-server/src/main/java/com/openblocks/api/application/ApplicationHistorySnapshotController.java rename to server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/application/ApplicationHistorySnapshotController.java index fa4e51c0f..c24e70912 100644 --- a/server/api-service/openblocks-server/src/main/java/com/openblocks/api/application/ApplicationHistorySnapshotController.java +++ b/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/application/ApplicationHistorySnapshotController.java @@ -1,11 +1,23 @@ -package com.openblocks.api.application; +package org.lowcoder.api.application; -import static com.openblocks.api.util.ViewBuilder.multiBuild; +import static org.lowcoder.api.util.ViewBuilder.multiBuild; import java.util.List; import java.util.Map; import java.util.stream.Collectors; +import org.lowcoder.api.application.view.HistorySnapshotDslView; +import org.lowcoder.api.framework.view.ResponseView; +import org.lowcoder.api.home.SessionUserService; +import org.lowcoder.api.util.Pagination; +import org.lowcoder.domain.application.model.Application; +import org.lowcoder.domain.application.model.ApplicationHistorySnapshot; +import org.lowcoder.domain.application.service.ApplicationHistorySnapshotService; +import org.lowcoder.domain.application.service.ApplicationService; +import org.lowcoder.domain.permission.model.ResourceAction; +import org.lowcoder.domain.permission.service.ResourcePermissionService; +import org.lowcoder.domain.user.service.UserService; +import org.lowcoder.infra.constant.NewUrl; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PathVariable; @@ -16,18 +28,6 @@ import org.springframework.web.bind.annotation.RestController; import com.google.common.collect.ImmutableMap; -import com.openblocks.api.application.view.HistorySnapshotDslView; -import com.openblocks.api.framework.view.ResponseView; -import com.openblocks.api.home.SessionUserService; -import com.openblocks.api.util.Pagination; -import com.openblocks.domain.application.model.Application; -import com.openblocks.domain.application.model.ApplicationHistorySnapshot; -import com.openblocks.domain.application.service.ApplicationHistorySnapshotService; -import com.openblocks.domain.application.service.ApplicationService; -import com.openblocks.domain.permission.model.ResourceAction; -import com.openblocks.domain.permission.service.ResourcePermissionService; -import com.openblocks.domain.user.service.UserService; -import com.openblocks.infra.constant.NewUrl; import lombok.extern.slf4j.Slf4j; import reactor.core.publisher.Mono; diff --git a/server/api-service/openblocks-server/src/main/java/com/openblocks/api/application/CompoundApplicationDslFilter.java b/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/application/CompoundApplicationDslFilter.java similarity index 86% rename from server/api-service/openblocks-server/src/main/java/com/openblocks/api/application/CompoundApplicationDslFilter.java rename to server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/application/CompoundApplicationDslFilter.java index 5819da3d2..8117d02a5 100644 --- a/server/api-service/openblocks-server/src/main/java/com/openblocks/api/application/CompoundApplicationDslFilter.java +++ b/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/application/CompoundApplicationDslFilter.java @@ -1,11 +1,11 @@ -package com.openblocks.api.application; +package org.lowcoder.api.application; -import static com.openblocks.domain.permission.model.ResourceAction.READ_APPLICATIONS; -import static com.openblocks.sdk.constants.DslConstants.CompoundAppDslConstants.ACTION; -import static com.openblocks.sdk.constants.DslConstants.CompoundAppDslConstants.APP; -import static com.openblocks.sdk.constants.DslConstants.CompoundAppDslConstants.APP_ID; -import static com.openblocks.sdk.constants.DslConstants.CompoundAppDslConstants.COMP; -import static com.openblocks.sdk.constants.DslConstants.CompoundAppDslConstants.HIDE_WHEN_NO_PERMISSION; +import static org.lowcoder.domain.permission.model.ResourceAction.READ_APPLICATIONS; +import static org.lowcoder.sdk.constants.DslConstants.CompoundAppDslConstants.ACTION; +import static org.lowcoder.sdk.constants.DslConstants.CompoundAppDslConstants.APP; +import static org.lowcoder.sdk.constants.DslConstants.CompoundAppDslConstants.APP_ID; +import static org.lowcoder.sdk.constants.DslConstants.CompoundAppDslConstants.COMP; +import static org.lowcoder.sdk.constants.DslConstants.CompoundAppDslConstants.HIDE_WHEN_NO_PERMISSION; import java.util.ArrayList; import java.util.Collections; @@ -20,14 +20,14 @@ import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.collections4.MapUtils; import org.apache.commons.lang3.StringUtils; +import org.lowcoder.api.home.SessionUserService; +import org.lowcoder.domain.permission.service.ResourcePermissionService; +import org.lowcoder.sdk.constants.DslConstants.CompoundAppDslConstants; +import org.lowcoder.sdk.util.MoreMapUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; import com.google.common.collect.Sets; -import com.openblocks.api.home.SessionUserService; -import com.openblocks.domain.permission.service.ResourcePermissionService; -import com.openblocks.sdk.constants.DslConstants.CompoundAppDslConstants; -import com.openblocks.sdk.util.MoreMapUtils; import reactor.core.publisher.Mono; diff --git a/server/api-service/openblocks-server/src/main/java/com/openblocks/api/application/view/ApplicationInfoView.java b/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/application/view/ApplicationInfoView.java similarity index 85% rename from server/api-service/openblocks-server/src/main/java/com/openblocks/api/application/view/ApplicationInfoView.java rename to server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/application/view/ApplicationInfoView.java index a6f601134..62cc9258f 100644 --- a/server/api-service/openblocks-server/src/main/java/com/openblocks/api/application/view/ApplicationInfoView.java +++ b/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/application/view/ApplicationInfoView.java @@ -1,13 +1,14 @@ -package com.openblocks.api.application.view; +package org.lowcoder.api.application.view; import java.time.Instant; import javax.annotation.Nullable; +import org.lowcoder.api.home.FolderInfoView; +import org.lowcoder.domain.application.model.ApplicationStatus; + import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonInclude.Include; -import com.openblocks.api.home.FolderInfoView; -import com.openblocks.domain.application.model.ApplicationStatus; import lombok.Builder; import lombok.Getter; @@ -22,7 +23,7 @@ public class ApplicationInfoView { private final String createBy; private final String role; // user's max role for current app /** - * @see com.openblocks.domain.application.model.ApplicationType + * @see org.lowcoder.domain.application.model.ApplicationType */ private final int applicationType; private final ApplicationStatus applicationStatus; diff --git a/server/api-service/openblocks-server/src/main/java/com/openblocks/api/application/view/ApplicationPermissionView.java b/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/application/view/ApplicationPermissionView.java similarity index 68% rename from server/api-service/openblocks-server/src/main/java/com/openblocks/api/application/view/ApplicationPermissionView.java rename to server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/application/view/ApplicationPermissionView.java index ac879971b..64d8b1038 100644 --- a/server/api-service/openblocks-server/src/main/java/com/openblocks/api/application/view/ApplicationPermissionView.java +++ b/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/application/view/ApplicationPermissionView.java @@ -1,6 +1,6 @@ -package com.openblocks.api.application.view; +package org.lowcoder.api.application.view; -import com.openblocks.api.permission.view.CommonPermissionView; +import org.lowcoder.api.permission.view.CommonPermissionView; import lombok.experimental.SuperBuilder; diff --git a/server/api-service/openblocks-server/src/main/java/com/openblocks/api/application/view/ApplicationView.java b/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/application/view/ApplicationView.java similarity index 89% rename from server/api-service/openblocks-server/src/main/java/com/openblocks/api/application/view/ApplicationView.java rename to server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/application/view/ApplicationView.java index ecb73da34..f62afc587 100644 --- a/server/api-service/openblocks-server/src/main/java/com/openblocks/api/application/view/ApplicationView.java +++ b/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/application/view/ApplicationView.java @@ -1,4 +1,4 @@ -package com.openblocks.api.application.view; +package org.lowcoder.api.application.view; import java.util.Map; diff --git a/server/api-service/openblocks-server/src/main/java/com/openblocks/api/application/view/HistorySnapshotDslView.java b/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/application/view/HistorySnapshotDslView.java similarity index 84% rename from server/api-service/openblocks-server/src/main/java/com/openblocks/api/application/view/HistorySnapshotDslView.java rename to server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/application/view/HistorySnapshotDslView.java index 36e488069..fb9601270 100644 --- a/server/api-service/openblocks-server/src/main/java/com/openblocks/api/application/view/HistorySnapshotDslView.java +++ b/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/application/view/HistorySnapshotDslView.java @@ -1,4 +1,4 @@ -package com.openblocks.api.application.view; +package org.lowcoder.api.application.view; import java.util.Map; diff --git a/server/api-service/openblocks-server/src/main/java/com/openblocks/api/authentication/AuthenticationController.java b/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/authentication/AuthenticationController.java similarity index 83% rename from server/api-service/openblocks-server/src/main/java/com/openblocks/api/authentication/AuthenticationController.java rename to server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/authentication/AuthenticationController.java index b3c8ac0f3..8d53db29f 100644 --- a/server/api-service/openblocks-server/src/main/java/com/openblocks/api/authentication/AuthenticationController.java +++ b/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/authentication/AuthenticationController.java @@ -1,7 +1,21 @@ -package com.openblocks.api.authentication; +package org.lowcoder.api.authentication; import java.util.List; +import org.lowcoder.api.authentication.dto.AuthConfigRequest; +import org.lowcoder.api.authentication.service.AuthenticationApiService; +import org.lowcoder.api.framework.view.ResponseView; +import org.lowcoder.api.home.SessionUserService; +import org.lowcoder.api.usermanagement.UserController; +import org.lowcoder.api.usermanagement.UserController.UpdatePasswordRequest; +import org.lowcoder.api.util.BusinessEventPublisher; +import org.lowcoder.domain.authentication.AuthenticationService; +import org.lowcoder.domain.authentication.FindAuthConfig; +import org.lowcoder.infra.constant.NewUrl; +import org.lowcoder.sdk.auth.AbstractAuthConfig; +import org.lowcoder.sdk.config.SerializeConfig.JsonViews; +import org.lowcoder.sdk.constants.AuthSourceConstants; +import org.lowcoder.sdk.util.CookieHelper; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.DeleteMapping; import org.springframework.web.bind.annotation.GetMapping; @@ -14,20 +28,6 @@ import org.springframework.web.server.ServerWebExchange; import com.fasterxml.jackson.annotation.JsonView; -import com.openblocks.api.authentication.dto.AuthConfigRequest; -import com.openblocks.api.authentication.service.AuthenticationApiService; -import com.openblocks.api.framework.view.ResponseView; -import com.openblocks.api.home.SessionUserService; -import com.openblocks.api.usermanagement.UserController; -import com.openblocks.api.usermanagement.UserController.UpdatePasswordRequest; -import com.openblocks.api.util.BusinessEventPublisher; -import com.openblocks.domain.authentication.AuthenticationService; -import com.openblocks.domain.authentication.FindAuthConfig; -import com.openblocks.infra.constant.NewUrl; -import com.openblocks.sdk.auth.AbstractAuthConfig; -import com.openblocks.sdk.config.SerializeConfig.JsonViews; -import com.openblocks.sdk.constants.AuthSourceConstants; -import com.openblocks.sdk.util.CookieHelper; import lombok.extern.slf4j.Slf4j; import reactor.core.publisher.Mono; diff --git a/server/api-service/openblocks-server/src/main/java/com/openblocks/api/authentication/dto/AuthConfigRequest.java b/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/authentication/dto/AuthConfigRequest.java similarity index 93% rename from server/api-service/openblocks-server/src/main/java/com/openblocks/api/authentication/dto/AuthConfigRequest.java rename to server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/authentication/dto/AuthConfigRequest.java index 6018ae734..14a424aea 100644 --- a/server/api-service/openblocks-server/src/main/java/com/openblocks/api/authentication/dto/AuthConfigRequest.java +++ b/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/authentication/dto/AuthConfigRequest.java @@ -1,6 +1,6 @@ -package com.openblocks.api.authentication.dto; +package org.lowcoder.api.authentication.dto; -import static com.openblocks.sdk.util.IDUtils.generate; +import static org.lowcoder.sdk.util.IDUtils.generate; import java.util.HashMap; diff --git a/server/api-service/openblocks-server/src/main/java/com/openblocks/api/authentication/dto/AuthUserBindEndMessage.java b/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/authentication/dto/AuthUserBindEndMessage.java similarity index 77% rename from server/api-service/openblocks-server/src/main/java/com/openblocks/api/authentication/dto/AuthUserBindEndMessage.java rename to server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/authentication/dto/AuthUserBindEndMessage.java index 264a24de3..efe9a3274 100644 --- a/server/api-service/openblocks-server/src/main/java/com/openblocks/api/authentication/dto/AuthUserBindEndMessage.java +++ b/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/authentication/dto/AuthUserBindEndMessage.java @@ -1,4 +1,4 @@ -package com.openblocks.api.authentication.dto; +package org.lowcoder.api.authentication.dto; import lombok.Builder; import lombok.Getter; diff --git a/server/api-service/openblocks-server/src/main/java/com/openblocks/api/authentication/dto/OrganizationDomainCheckResult.java b/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/authentication/dto/OrganizationDomainCheckResult.java similarity index 85% rename from server/api-service/openblocks-server/src/main/java/com/openblocks/api/authentication/dto/OrganizationDomainCheckResult.java rename to server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/authentication/dto/OrganizationDomainCheckResult.java index fbbfdfc28..7cb25b31f 100644 --- a/server/api-service/openblocks-server/src/main/java/com/openblocks/api/authentication/dto/OrganizationDomainCheckResult.java +++ b/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/authentication/dto/OrganizationDomainCheckResult.java @@ -1,11 +1,10 @@ -package com.openblocks.api.authentication.dto; +package org.lowcoder.api.authentication.dto; -import static com.openblocks.sdk.util.ExceptionUtils.ofError; +import static org.lowcoder.sdk.util.ExceptionUtils.ofError; import org.apache.commons.lang.StringUtils; - -import com.openblocks.api.framework.view.ResponseView; -import com.openblocks.sdk.exception.BizError; +import org.lowcoder.api.framework.view.ResponseView; +import org.lowcoder.sdk.exception.BizError; import reactor.core.publisher.Mono; diff --git a/server/api-service/openblocks-server/src/main/java/com/openblocks/api/authentication/dto/RedirectView.java b/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/authentication/dto/RedirectView.java similarity index 72% rename from server/api-service/openblocks-server/src/main/java/com/openblocks/api/authentication/dto/RedirectView.java rename to server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/authentication/dto/RedirectView.java index 10e08a97e..51427b505 100644 --- a/server/api-service/openblocks-server/src/main/java/com/openblocks/api/authentication/dto/RedirectView.java +++ b/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/authentication/dto/RedirectView.java @@ -1,4 +1,4 @@ -package com.openblocks.api.authentication.dto; +package org.lowcoder.api.authentication.dto; import lombok.Builder; import lombok.Getter; diff --git a/server/api-service/openblocks-server/src/main/java/com/openblocks/api/authentication/dto/UserLoginEndMessage.java b/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/authentication/dto/UserLoginEndMessage.java similarity index 73% rename from server/api-service/openblocks-server/src/main/java/com/openblocks/api/authentication/dto/UserLoginEndMessage.java rename to server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/authentication/dto/UserLoginEndMessage.java index 53ac537ff..abde4457f 100644 --- a/server/api-service/openblocks-server/src/main/java/com/openblocks/api/authentication/dto/UserLoginEndMessage.java +++ b/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/authentication/dto/UserLoginEndMessage.java @@ -1,6 +1,6 @@ -package com.openblocks.api.authentication.dto; +package org.lowcoder.api.authentication.dto; -import com.openblocks.domain.user.model.User; +import org.lowcoder.domain.user.model.User; import lombok.Builder; import lombok.Getter; diff --git a/server/api-service/openblocks-server/src/main/java/com/openblocks/api/authentication/request/AbstractBlockedAuthRequest.java b/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/authentication/request/AbstractBlockedAuthRequest.java similarity index 60% rename from server/api-service/openblocks-server/src/main/java/com/openblocks/api/authentication/request/AbstractBlockedAuthRequest.java rename to server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/authentication/request/AbstractBlockedAuthRequest.java index b10af5fbc..fd245a4b0 100644 --- a/server/api-service/openblocks-server/src/main/java/com/openblocks/api/authentication/request/AbstractBlockedAuthRequest.java +++ b/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/authentication/request/AbstractBlockedAuthRequest.java @@ -1,9 +1,9 @@ -package com.openblocks.api.authentication.request; +package org.lowcoder.api.authentication.request; -import static com.openblocks.api.authentication.util.AuthenticationUtils.AUTH_REQUEST_THREAD_POOL; +import static org.lowcoder.api.authentication.util.AuthenticationUtils.AUTH_REQUEST_THREAD_POOL; -import com.openblocks.domain.authentication.context.AuthRequestContext; -import com.openblocks.domain.user.model.AuthUser; +import org.lowcoder.domain.authentication.context.AuthRequestContext; +import org.lowcoder.domain.user.model.AuthUser; import reactor.core.publisher.Mono; diff --git a/server/api-service/openblocks-server/src/main/java/com/openblocks/api/authentication/request/AuthException.java b/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/authentication/request/AuthException.java similarity index 68% rename from server/api-service/openblocks-server/src/main/java/com/openblocks/api/authentication/request/AuthException.java rename to server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/authentication/request/AuthException.java index f0782c8dd..08122ca52 100644 --- a/server/api-service/openblocks-server/src/main/java/com/openblocks/api/authentication/request/AuthException.java +++ b/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/authentication/request/AuthException.java @@ -1,4 +1,4 @@ -package com.openblocks.api.authentication.request; +package org.lowcoder.api.authentication.request; public class AuthException extends RuntimeException { diff --git a/server/api-service/openblocks-server/src/main/java/com/openblocks/api/authentication/request/AuthRequest.java b/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/authentication/request/AuthRequest.java similarity index 57% rename from server/api-service/openblocks-server/src/main/java/com/openblocks/api/authentication/request/AuthRequest.java rename to server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/authentication/request/AuthRequest.java index 83e134494..614bcc621 100644 --- a/server/api-service/openblocks-server/src/main/java/com/openblocks/api/authentication/request/AuthRequest.java +++ b/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/authentication/request/AuthRequest.java @@ -1,8 +1,8 @@ -package com.openblocks.api.authentication.request; +package org.lowcoder.api.authentication.request; -import com.openblocks.domain.authentication.context.AuthRequestContext; -import com.openblocks.domain.user.model.AuthToken; -import com.openblocks.domain.user.model.AuthUser; +import org.lowcoder.domain.authentication.context.AuthRequestContext; +import org.lowcoder.domain.user.model.AuthToken; +import org.lowcoder.domain.user.model.AuthUser; import reactor.core.publisher.Mono; diff --git a/server/api-service/openblocks-server/src/main/java/com/openblocks/api/authentication/request/AuthRequestFactory.java b/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/authentication/request/AuthRequestFactory.java similarity index 63% rename from server/api-service/openblocks-server/src/main/java/com/openblocks/api/authentication/request/AuthRequestFactory.java rename to server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/authentication/request/AuthRequestFactory.java index b8da12ec7..c27ad47da 100644 --- a/server/api-service/openblocks-server/src/main/java/com/openblocks/api/authentication/request/AuthRequestFactory.java +++ b/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/authentication/request/AuthRequestFactory.java @@ -1,10 +1,10 @@ -package com.openblocks.api.authentication.request; +package org.lowcoder.api.authentication.request; import java.util.Set; -import reactor.core.publisher.Mono; +import org.lowcoder.domain.authentication.context.AuthRequestContext; -import com.openblocks.domain.authentication.context.AuthRequestContext; +import reactor.core.publisher.Mono; public interface AuthRequestFactory { diff --git a/server/api-service/openblocks-server/src/main/java/com/openblocks/api/authentication/request/AuthRequestFactoryFacade.java b/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/authentication/request/AuthRequestFactoryFacade.java similarity index 89% rename from server/api-service/openblocks-server/src/main/java/com/openblocks/api/authentication/request/AuthRequestFactoryFacade.java rename to server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/authentication/request/AuthRequestFactoryFacade.java index c25c4c2e2..58b6f1dbc 100644 --- a/server/api-service/openblocks-server/src/main/java/com/openblocks/api/authentication/request/AuthRequestFactoryFacade.java +++ b/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/authentication/request/AuthRequestFactoryFacade.java @@ -1,6 +1,6 @@ -package com.openblocks.api.authentication.request; +package org.lowcoder.api.authentication.request; -import static com.openblocks.sdk.exception.BizError.AUTH_ERROR; +import static org.lowcoder.sdk.exception.BizError.AUTH_ERROR; import java.util.HashMap; import java.util.HashSet; @@ -10,13 +10,12 @@ import javax.annotation.PostConstruct; +import org.lowcoder.domain.authentication.context.AuthRequestContext; +import org.lowcoder.sdk.exception.BizException; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.Primary; import org.springframework.stereotype.Component; -import com.openblocks.domain.authentication.context.AuthRequestContext; -import com.openblocks.sdk.exception.BizException; - import lombok.extern.slf4j.Slf4j; import reactor.core.publisher.Mono; diff --git a/server/api-service/openblocks-server/src/main/java/com/openblocks/api/authentication/request/form/FormAuthRequest.java b/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/authentication/request/form/FormAuthRequest.java similarity index 75% rename from server/api-service/openblocks-server/src/main/java/com/openblocks/api/authentication/request/form/FormAuthRequest.java rename to server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/authentication/request/form/FormAuthRequest.java index 699e62275..7ba33b7e6 100644 --- a/server/api-service/openblocks-server/src/main/java/com/openblocks/api/authentication/request/form/FormAuthRequest.java +++ b/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/authentication/request/form/FormAuthRequest.java @@ -1,22 +1,21 @@ -package com.openblocks.api.authentication.request.form; - -import static com.openblocks.sdk.util.ExceptionUtils.ofError; - +package org.lowcoder.api.authentication.request.form; + +import static org.lowcoder.sdk.util.ExceptionUtils.ofError; + +import org.lowcoder.api.authentication.request.AuthRequest; +import org.lowcoder.domain.authentication.context.AuthRequestContext; +import org.lowcoder.domain.authentication.context.FormAuthRequestContext; +import org.lowcoder.domain.encryption.EncryptionService; +import org.lowcoder.domain.user.model.AuthUser; +import org.lowcoder.domain.user.service.UserService; +import org.lowcoder.sdk.auth.AbstractAuthConfig; +import org.lowcoder.sdk.auth.EmailAuthConfig; +import org.lowcoder.sdk.constants.AuthSourceConstants; +import org.lowcoder.sdk.exception.BizError; +import org.lowcoder.sdk.exception.BizException; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; -import com.openblocks.api.authentication.request.AuthRequest; -import com.openblocks.domain.authentication.context.AuthRequestContext; -import com.openblocks.domain.authentication.context.FormAuthRequestContext; -import com.openblocks.domain.encryption.EncryptionService; -import com.openblocks.domain.user.model.AuthUser; -import com.openblocks.domain.user.service.UserService; -import com.openblocks.sdk.auth.AbstractAuthConfig; -import com.openblocks.sdk.auth.EmailAuthConfig; -import com.openblocks.sdk.constants.AuthSourceConstants; -import com.openblocks.sdk.exception.BizError; -import com.openblocks.sdk.exception.BizException; - import reactor.core.publisher.Mono; @Component diff --git a/server/api-service/openblocks-server/src/main/java/com/openblocks/api/authentication/request/form/FormAuthRequestFactory.java b/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/authentication/request/form/FormAuthRequestFactory.java similarity index 64% rename from server/api-service/openblocks-server/src/main/java/com/openblocks/api/authentication/request/form/FormAuthRequestFactory.java rename to server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/authentication/request/form/FormAuthRequestFactory.java index 2e8459a16..62d2c103a 100644 --- a/server/api-service/openblocks-server/src/main/java/com/openblocks/api/authentication/request/form/FormAuthRequestFactory.java +++ b/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/authentication/request/form/FormAuthRequestFactory.java @@ -1,15 +1,14 @@ -package com.openblocks.api.authentication.request.form; +package org.lowcoder.api.authentication.request.form; import java.util.Set; +import org.lowcoder.api.authentication.request.AuthRequest; +import org.lowcoder.api.authentication.request.AuthRequestFactory; +import org.lowcoder.domain.authentication.context.AuthRequestContext; +import org.lowcoder.sdk.auth.constants.AuthTypeConstants; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; -import com.openblocks.api.authentication.request.AuthRequest; -import com.openblocks.domain.authentication.context.AuthRequestContext; -import com.openblocks.api.authentication.request.AuthRequestFactory; -import com.openblocks.sdk.auth.constants.AuthTypeConstants; - import reactor.core.publisher.Mono; @Component diff --git a/server/api-service/openblocks-server/src/main/java/com/openblocks/api/authentication/request/oauth2/OAuth2RequestContext.java b/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/authentication/request/oauth2/OAuth2RequestContext.java similarity index 70% rename from server/api-service/openblocks-server/src/main/java/com/openblocks/api/authentication/request/oauth2/OAuth2RequestContext.java rename to server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/authentication/request/oauth2/OAuth2RequestContext.java index 4fc7d5d11..c756a1780 100644 --- a/server/api-service/openblocks-server/src/main/java/com/openblocks/api/authentication/request/oauth2/OAuth2RequestContext.java +++ b/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/authentication/request/oauth2/OAuth2RequestContext.java @@ -1,6 +1,6 @@ -package com.openblocks.api.authentication.request.oauth2; +package org.lowcoder.api.authentication.request.oauth2; -import com.openblocks.domain.authentication.context.AuthRequestContext; +import org.lowcoder.domain.authentication.context.AuthRequestContext; import lombok.Getter; diff --git a/server/api-service/openblocks-server/src/main/java/com/openblocks/api/authentication/request/oauth2/Oauth2AuthRequestFactory.java b/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/authentication/request/oauth2/Oauth2AuthRequestFactory.java similarity index 60% rename from server/api-service/openblocks-server/src/main/java/com/openblocks/api/authentication/request/oauth2/Oauth2AuthRequestFactory.java rename to server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/authentication/request/oauth2/Oauth2AuthRequestFactory.java index 15318abeb..607a0fad8 100644 --- a/server/api-service/openblocks-server/src/main/java/com/openblocks/api/authentication/request/oauth2/Oauth2AuthRequestFactory.java +++ b/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/authentication/request/oauth2/Oauth2AuthRequestFactory.java @@ -1,19 +1,18 @@ -package com.openblocks.api.authentication.request.oauth2; +package org.lowcoder.api.authentication.request.oauth2; -import static com.openblocks.sdk.auth.constants.AuthTypeConstants.GITHUB; -import static com.openblocks.sdk.auth.constants.AuthTypeConstants.GOOGLE; +import static org.lowcoder.sdk.auth.constants.AuthTypeConstants.GITHUB; +import static org.lowcoder.sdk.auth.constants.AuthTypeConstants.GOOGLE; import java.util.Set; +import org.lowcoder.api.authentication.request.AuthRequest; +import org.lowcoder.api.authentication.request.AuthRequestFactory; +import org.lowcoder.api.authentication.request.oauth2.request.AbstractOauth2Request; +import org.lowcoder.api.authentication.request.oauth2.request.GithubRequest; +import org.lowcoder.api.authentication.request.oauth2.request.GoogleRequest; +import org.lowcoder.sdk.auth.Oauth2SimpleAuthConfig; import org.springframework.stereotype.Component; -import com.openblocks.api.authentication.request.AuthRequest; -import com.openblocks.api.authentication.request.AuthRequestFactory; -import com.openblocks.api.authentication.request.oauth2.request.AbstractOauth2Request; -import com.openblocks.api.authentication.request.oauth2.request.GithubRequest; -import com.openblocks.api.authentication.request.oauth2.request.GoogleRequest; -import com.openblocks.sdk.auth.Oauth2SimpleAuthConfig; - import reactor.core.publisher.Mono; @Component diff --git a/server/api-service/openblocks-server/src/main/java/com/openblocks/api/authentication/request/oauth2/Oauth2DefaultSource.java b/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/authentication/request/oauth2/Oauth2DefaultSource.java similarity index 87% rename from server/api-service/openblocks-server/src/main/java/com/openblocks/api/authentication/request/oauth2/Oauth2DefaultSource.java rename to server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/authentication/request/oauth2/Oauth2DefaultSource.java index 2ef4df519..fa081d6b5 100644 --- a/server/api-service/openblocks-server/src/main/java/com/openblocks/api/authentication/request/oauth2/Oauth2DefaultSource.java +++ b/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/authentication/request/oauth2/Oauth2DefaultSource.java @@ -1,4 +1,4 @@ -package com.openblocks.api.authentication.request.oauth2; +package org.lowcoder.api.authentication.request.oauth2; public enum Oauth2DefaultSource implements Oauth2Source { diff --git a/server/api-service/openblocks-server/src/main/java/com/openblocks/api/authentication/request/oauth2/Oauth2Source.java b/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/authentication/request/oauth2/Oauth2Source.java similarity index 82% rename from server/api-service/openblocks-server/src/main/java/com/openblocks/api/authentication/request/oauth2/Oauth2Source.java rename to server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/authentication/request/oauth2/Oauth2Source.java index ef7556fc7..8fdf23dc5 100644 --- a/server/api-service/openblocks-server/src/main/java/com/openblocks/api/authentication/request/oauth2/Oauth2Source.java +++ b/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/authentication/request/oauth2/Oauth2Source.java @@ -1,4 +1,4 @@ -package com.openblocks.api.authentication.request.oauth2; +package org.lowcoder.api.authentication.request.oauth2; public interface Oauth2Source { diff --git a/server/api-service/openblocks-server/src/main/java/com/openblocks/api/authentication/request/oauth2/request/AbstractOauth2Request.java b/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/authentication/request/oauth2/request/AbstractOauth2Request.java similarity index 57% rename from server/api-service/openblocks-server/src/main/java/com/openblocks/api/authentication/request/oauth2/request/AbstractOauth2Request.java rename to server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/authentication/request/oauth2/request/AbstractOauth2Request.java index b1e041be6..639294e04 100644 --- a/server/api-service/openblocks-server/src/main/java/com/openblocks/api/authentication/request/oauth2/request/AbstractOauth2Request.java +++ b/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/authentication/request/oauth2/request/AbstractOauth2Request.java @@ -1,17 +1,17 @@ -package com.openblocks.api.authentication.request.oauth2.request; - -import static com.openblocks.api.authentication.util.AuthenticationUtils.AUTH_REQUEST_THREAD_POOL; -import static com.openblocks.sdk.exception.BizError.FAIL_TO_GET_OIDC_INFO; -import static com.openblocks.sdk.util.ExceptionUtils.deferredError; -import static com.openblocks.sdk.util.JsonUtils.toJson; - -import com.openblocks.api.authentication.request.AuthRequest; -import com.openblocks.api.authentication.request.oauth2.OAuth2RequestContext; -import com.openblocks.api.authentication.request.oauth2.Oauth2Source; -import com.openblocks.domain.authentication.context.AuthRequestContext; -import com.openblocks.domain.user.model.AuthToken; -import com.openblocks.domain.user.model.AuthUser; -import com.openblocks.sdk.auth.Oauth2SimpleAuthConfig; +package org.lowcoder.api.authentication.request.oauth2.request; + +import static org.lowcoder.api.authentication.util.AuthenticationUtils.AUTH_REQUEST_THREAD_POOL; +import static org.lowcoder.sdk.exception.BizError.FAIL_TO_GET_OIDC_INFO; +import static org.lowcoder.sdk.util.ExceptionUtils.deferredError; +import static org.lowcoder.sdk.util.JsonUtils.toJson; + +import org.lowcoder.api.authentication.request.AuthRequest; +import org.lowcoder.api.authentication.request.oauth2.OAuth2RequestContext; +import org.lowcoder.api.authentication.request.oauth2.Oauth2Source; +import org.lowcoder.domain.authentication.context.AuthRequestContext; +import org.lowcoder.domain.user.model.AuthToken; +import org.lowcoder.domain.user.model.AuthUser; +import org.lowcoder.sdk.auth.Oauth2SimpleAuthConfig; import lombok.extern.slf4j.Slf4j; import reactor.core.publisher.Mono; diff --git a/server/api-service/openblocks-server/src/main/java/com/openblocks/api/authentication/request/oauth2/request/GithubRequest.java b/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/authentication/request/oauth2/request/GithubRequest.java similarity index 84% rename from server/api-service/openblocks-server/src/main/java/com/openblocks/api/authentication/request/oauth2/request/GithubRequest.java rename to server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/authentication/request/oauth2/request/GithubRequest.java index 1a7e7946d..edd3370ac 100644 --- a/server/api-service/openblocks-server/src/main/java/com/openblocks/api/authentication/request/oauth2/request/GithubRequest.java +++ b/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/authentication/request/oauth2/request/GithubRequest.java @@ -1,4 +1,4 @@ -package com.openblocks.api.authentication.request.oauth2.request; +package org.lowcoder.api.authentication.request.oauth2.request; import static java.net.URLDecoder.decode; import static java.nio.charset.StandardCharsets.UTF_8; @@ -11,17 +11,16 @@ import org.apache.commons.collections4.MapUtils; import org.apache.commons.lang3.StringUtils; import org.apache.http.client.utils.URIBuilder; +import org.lowcoder.api.authentication.request.AuthException; +import org.lowcoder.api.authentication.request.oauth2.OAuth2RequestContext; +import org.lowcoder.api.authentication.request.oauth2.Oauth2DefaultSource; +import org.lowcoder.domain.user.model.AuthToken; +import org.lowcoder.domain.user.model.AuthUser; +import org.lowcoder.sdk.auth.Oauth2SimpleAuthConfig; +import org.lowcoder.sdk.util.JsonUtils; +import org.lowcoder.sdk.webclient.WebClients; import org.springframework.core.ParameterizedTypeReference; -import com.openblocks.api.authentication.request.AuthException; -import com.openblocks.api.authentication.request.oauth2.OAuth2RequestContext; -import com.openblocks.api.authentication.request.oauth2.Oauth2DefaultSource; -import com.openblocks.domain.user.model.AuthToken; -import com.openblocks.domain.user.model.AuthUser; -import com.openblocks.sdk.auth.Oauth2SimpleAuthConfig; -import com.openblocks.sdk.util.JsonUtils; -import com.openblocks.sdk.webclient.WebClients; - import reactor.core.publisher.Mono; public class GithubRequest extends AbstractOauth2Request { diff --git a/server/api-service/openblocks-server/src/main/java/com/openblocks/api/authentication/request/oauth2/request/GoogleRequest.java b/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/authentication/request/oauth2/request/GoogleRequest.java similarity index 83% rename from server/api-service/openblocks-server/src/main/java/com/openblocks/api/authentication/request/oauth2/request/GoogleRequest.java rename to server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/authentication/request/oauth2/request/GoogleRequest.java index 8054d7fba..f9f26f5c3 100644 --- a/server/api-service/openblocks-server/src/main/java/com/openblocks/api/authentication/request/oauth2/request/GoogleRequest.java +++ b/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/authentication/request/oauth2/request/GoogleRequest.java @@ -1,4 +1,4 @@ -package com.openblocks.api.authentication.request.oauth2.request; +package org.lowcoder.api.authentication.request.oauth2.request; import java.net.URI; import java.net.URISyntaxException; @@ -6,17 +6,16 @@ import org.apache.commons.collections4.MapUtils; import org.apache.http.client.utils.URIBuilder; +import org.lowcoder.api.authentication.request.AuthException; +import org.lowcoder.api.authentication.request.oauth2.OAuth2RequestContext; +import org.lowcoder.api.authentication.request.oauth2.Oauth2DefaultSource; +import org.lowcoder.domain.user.model.AuthToken; +import org.lowcoder.domain.user.model.AuthUser; +import org.lowcoder.sdk.auth.Oauth2SimpleAuthConfig; +import org.lowcoder.sdk.util.JsonUtils; +import org.lowcoder.sdk.webclient.WebClientBuildHelper; import org.springframework.core.ParameterizedTypeReference; -import com.openblocks.api.authentication.request.AuthException; -import com.openblocks.api.authentication.request.oauth2.OAuth2RequestContext; -import com.openblocks.api.authentication.request.oauth2.Oauth2DefaultSource; -import com.openblocks.domain.user.model.AuthToken; -import com.openblocks.domain.user.model.AuthUser; -import com.openblocks.sdk.auth.Oauth2SimpleAuthConfig; -import com.openblocks.sdk.util.JsonUtils; -import com.openblocks.sdk.webclient.WebClientBuildHelper; - import reactor.core.publisher.Mono; public class GoogleRequest extends AbstractOauth2Request { diff --git a/server/api-service/openblocks-server/src/main/java/com/openblocks/api/authentication/service/AuthenticationApiService.java b/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/authentication/service/AuthenticationApiService.java similarity index 78% rename from server/api-service/openblocks-server/src/main/java/com/openblocks/api/authentication/service/AuthenticationApiService.java rename to server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/authentication/service/AuthenticationApiService.java index 79a46bc06..70164aa5d 100644 --- a/server/api-service/openblocks-server/src/main/java/com/openblocks/api/authentication/service/AuthenticationApiService.java +++ b/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/authentication/service/AuthenticationApiService.java @@ -1,10 +1,9 @@ -package com.openblocks.api.authentication.service; +package org.lowcoder.api.authentication.service; +import org.lowcoder.api.authentication.dto.AuthConfigRequest; +import org.lowcoder.domain.user.model.AuthUser; import org.springframework.web.server.ServerWebExchange; -import com.openblocks.api.authentication.dto.AuthConfigRequest; -import com.openblocks.domain.user.model.AuthUser; - import reactor.core.publisher.Mono; public interface AuthenticationApiService { diff --git a/server/api-service/openblocks-server/src/main/java/com/openblocks/api/authentication/service/AuthenticationApiServiceImpl.java b/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/authentication/service/AuthenticationApiServiceImpl.java similarity index 86% rename from server/api-service/openblocks-server/src/main/java/com/openblocks/api/authentication/service/AuthenticationApiServiceImpl.java rename to server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/authentication/service/AuthenticationApiServiceImpl.java index 92d21a8a4..6f2c9a07b 100644 --- a/server/api-service/openblocks-server/src/main/java/com/openblocks/api/authentication/service/AuthenticationApiServiceImpl.java +++ b/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/authentication/service/AuthenticationApiServiceImpl.java @@ -1,10 +1,10 @@ -package com.openblocks.api.authentication.service; +package org.lowcoder.api.authentication.service; -import static com.openblocks.sdk.exception.BizError.AUTH_ERROR; -import static com.openblocks.sdk.exception.BizError.DISABLE_AUTH_CONFIG_FORBIDDEN; -import static com.openblocks.sdk.exception.BizError.USER_NOT_EXIST; -import static com.openblocks.sdk.util.ExceptionUtils.deferredError; -import static com.openblocks.sdk.util.ExceptionUtils.ofError; +import static org.lowcoder.sdk.exception.BizError.AUTH_ERROR; +import static org.lowcoder.sdk.exception.BizError.DISABLE_AUTH_CONFIG_FORBIDDEN; +import static org.lowcoder.sdk.exception.BizError.USER_NOT_EXIST; +import static org.lowcoder.sdk.util.ExceptionUtils.deferredError; +import static org.lowcoder.sdk.util.ExceptionUtils.ofError; import java.util.ArrayList; import java.util.Collections; @@ -19,40 +19,39 @@ import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang3.StringUtils; +import org.lowcoder.api.authentication.dto.AuthConfigRequest; +import org.lowcoder.api.authentication.request.AuthRequestFactory; +import org.lowcoder.api.authentication.request.oauth2.OAuth2RequestContext; +import org.lowcoder.api.authentication.service.factory.AuthConfigFactory; +import org.lowcoder.api.authentication.util.AuthenticationUtils; +import org.lowcoder.api.home.SessionUserService; +import org.lowcoder.api.usermanagement.InvitationApiService; +import org.lowcoder.api.usermanagement.OrgApiService; +import org.lowcoder.api.usermanagement.UserApiService; +import org.lowcoder.api.util.BusinessEventPublisher; +import org.lowcoder.domain.authentication.AuthenticationService; +import org.lowcoder.domain.authentication.FindAuthConfig; +import org.lowcoder.domain.authentication.context.AuthRequestContext; +import org.lowcoder.domain.authentication.context.FormAuthRequestContext; +import org.lowcoder.domain.organization.model.OrgMember; +import org.lowcoder.domain.organization.model.Organization; +import org.lowcoder.domain.organization.model.OrganizationDomain; +import org.lowcoder.domain.organization.service.OrgMemberService; +import org.lowcoder.domain.organization.service.OrganizationService; +import org.lowcoder.domain.user.model.AuthUser; +import org.lowcoder.domain.user.model.Connection; +import org.lowcoder.domain.user.model.ConnectionAuthToken; +import org.lowcoder.domain.user.model.User; +import org.lowcoder.domain.user.service.UserService; +import org.lowcoder.sdk.auth.AbstractAuthConfig; +import org.lowcoder.sdk.exception.BizError; +import org.lowcoder.sdk.exception.BizException; +import org.lowcoder.sdk.util.CookieHelper; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.security.core.context.ReactiveSecurityContextHolder; import org.springframework.stereotype.Service; import org.springframework.web.server.ServerWebExchange; -import com.openblocks.api.authentication.dto.AuthConfigRequest; -import com.openblocks.api.authentication.request.AuthRequestFactory; -import com.openblocks.api.authentication.request.oauth2.OAuth2RequestContext; -import com.openblocks.api.authentication.service.factory.AuthConfigFactory; -import com.openblocks.api.authentication.util.AuthenticationUtils; -import com.openblocks.api.home.SessionUserService; -import com.openblocks.api.usermanagement.InvitationApiService; -import com.openblocks.api.usermanagement.OrgApiService; -import com.openblocks.api.usermanagement.UserApiService; -import com.openblocks.api.util.BusinessEventPublisher; -import com.openblocks.domain.authentication.AuthenticationService; -import com.openblocks.domain.authentication.FindAuthConfig; -import com.openblocks.domain.authentication.context.AuthRequestContext; -import com.openblocks.domain.authentication.context.FormAuthRequestContext; -import com.openblocks.domain.organization.model.OrgMember; -import com.openblocks.domain.organization.model.Organization; -import com.openblocks.domain.organization.model.OrganizationDomain; -import com.openblocks.domain.organization.service.OrgMemberService; -import com.openblocks.domain.organization.service.OrganizationService; -import com.openblocks.domain.user.model.AuthUser; -import com.openblocks.domain.user.model.Connection; -import com.openblocks.domain.user.model.ConnectionAuthToken; -import com.openblocks.domain.user.model.User; -import com.openblocks.domain.user.service.UserService; -import com.openblocks.sdk.auth.AbstractAuthConfig; -import com.openblocks.sdk.exception.BizError; -import com.openblocks.sdk.exception.BizException; -import com.openblocks.sdk.util.CookieHelper; - import lombok.extern.slf4j.Slf4j; import reactor.core.publisher.Mono; diff --git a/server/api-service/openblocks-server/src/main/java/com/openblocks/api/authentication/service/factory/AuthConfigFactory.java b/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/authentication/service/factory/AuthConfigFactory.java similarity index 51% rename from server/api-service/openblocks-server/src/main/java/com/openblocks/api/authentication/service/factory/AuthConfigFactory.java rename to server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/authentication/service/factory/AuthConfigFactory.java index bf44f0340..b85603fb1 100644 --- a/server/api-service/openblocks-server/src/main/java/com/openblocks/api/authentication/service/factory/AuthConfigFactory.java +++ b/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/authentication/service/factory/AuthConfigFactory.java @@ -1,9 +1,9 @@ -package com.openblocks.api.authentication.service.factory; +package org.lowcoder.api.authentication.service.factory; import java.util.Set; -import com.openblocks.api.authentication.dto.AuthConfigRequest; -import com.openblocks.sdk.auth.AbstractAuthConfig; +import org.lowcoder.api.authentication.dto.AuthConfigRequest; +import org.lowcoder.sdk.auth.AbstractAuthConfig; public interface AuthConfigFactory { diff --git a/server/api-service/openblocks-server/src/main/java/com/openblocks/api/authentication/service/factory/AuthConfigFactoryFacade.java b/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/authentication/service/factory/AuthConfigFactoryFacade.java similarity index 88% rename from server/api-service/openblocks-server/src/main/java/com/openblocks/api/authentication/service/factory/AuthConfigFactoryFacade.java rename to server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/authentication/service/factory/AuthConfigFactoryFacade.java index 48daa0204..51df70ea1 100644 --- a/server/api-service/openblocks-server/src/main/java/com/openblocks/api/authentication/service/factory/AuthConfigFactoryFacade.java +++ b/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/authentication/service/factory/AuthConfigFactoryFacade.java @@ -1,4 +1,4 @@ -package com.openblocks.api.authentication.service.factory; +package org.lowcoder.api.authentication.service.factory; import java.util.HashMap; import java.util.List; @@ -7,13 +7,12 @@ import javax.annotation.PostConstruct; +import org.lowcoder.api.authentication.dto.AuthConfigRequest; +import org.lowcoder.sdk.auth.AbstractAuthConfig; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.Primary; import org.springframework.stereotype.Component; -import com.openblocks.api.authentication.dto.AuthConfigRequest; -import com.openblocks.sdk.auth.AbstractAuthConfig; - @Primary @Component public class AuthConfigFactoryFacade implements AuthConfigFactory { diff --git a/server/api-service/openblocks-server/src/main/java/com/openblocks/api/authentication/service/factory/AuthConfigFactoryImpl.java b/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/authentication/service/factory/AuthConfigFactoryImpl.java similarity index 75% rename from server/api-service/openblocks-server/src/main/java/com/openblocks/api/authentication/service/factory/AuthConfigFactoryImpl.java rename to server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/authentication/service/factory/AuthConfigFactoryImpl.java index 1a1ebca5d..15122109e 100644 --- a/server/api-service/openblocks-server/src/main/java/com/openblocks/api/authentication/service/factory/AuthConfigFactoryImpl.java +++ b/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/authentication/service/factory/AuthConfigFactoryImpl.java @@ -1,22 +1,21 @@ -package com.openblocks.api.authentication.service.factory; +package org.lowcoder.api.authentication.service.factory; -import static com.openblocks.sdk.constants.AuthSourceConstants.GITHUB; -import static com.openblocks.sdk.constants.AuthSourceConstants.GITHUB_NAME; -import static com.openblocks.sdk.constants.AuthSourceConstants.GOOGLE; -import static com.openblocks.sdk.constants.AuthSourceConstants.GOOGLE_NAME; import static java.util.Objects.requireNonNull; +import static org.lowcoder.sdk.constants.AuthSourceConstants.GITHUB; +import static org.lowcoder.sdk.constants.AuthSourceConstants.GITHUB_NAME; +import static org.lowcoder.sdk.constants.AuthSourceConstants.GOOGLE; +import static org.lowcoder.sdk.constants.AuthSourceConstants.GOOGLE_NAME; import java.util.Set; import org.apache.commons.collections4.MapUtils; +import org.lowcoder.api.authentication.dto.AuthConfigRequest; +import org.lowcoder.sdk.auth.AbstractAuthConfig; +import org.lowcoder.sdk.auth.EmailAuthConfig; +import org.lowcoder.sdk.auth.Oauth2SimpleAuthConfig; +import org.lowcoder.sdk.auth.constants.AuthTypeConstants; import org.springframework.stereotype.Component; -import com.openblocks.api.authentication.dto.AuthConfigRequest; -import com.openblocks.sdk.auth.AbstractAuthConfig; -import com.openblocks.sdk.auth.EmailAuthConfig; -import com.openblocks.sdk.auth.Oauth2SimpleAuthConfig; -import com.openblocks.sdk.auth.constants.AuthTypeConstants; - @Component public class AuthConfigFactoryImpl implements AuthConfigFactory { diff --git a/server/api-service/openblocks-server/src/main/java/com/openblocks/api/authentication/util/AuthenticationUtils.java b/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/authentication/util/AuthenticationUtils.java similarity index 94% rename from server/api-service/openblocks-server/src/main/java/com/openblocks/api/authentication/util/AuthenticationUtils.java rename to server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/authentication/util/AuthenticationUtils.java index a153b3a46..6ef443ac9 100644 --- a/server/api-service/openblocks-server/src/main/java/com/openblocks/api/authentication/util/AuthenticationUtils.java +++ b/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/authentication/util/AuthenticationUtils.java @@ -1,15 +1,15 @@ -package com.openblocks.api.authentication.util; +package org.lowcoder.api.authentication.util; import static java.util.Collections.emptyMap; import static reactor.core.scheduler.Schedulers.newBoundedElastic; import java.util.Collection; +import org.lowcoder.domain.user.model.User; import org.springframework.security.core.Authentication; import org.springframework.security.core.GrantedAuthority; import com.google.common.collect.ImmutableSet; -import com.openblocks.domain.user.model.User; import reactor.core.scheduler.Scheduler; diff --git a/server/api-service/openblocks-server/src/main/java/com/openblocks/api/authentication/util/SmsVerificationUtils.java b/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/authentication/util/SmsVerificationUtils.java similarity index 92% rename from server/api-service/openblocks-server/src/main/java/com/openblocks/api/authentication/util/SmsVerificationUtils.java rename to server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/authentication/util/SmsVerificationUtils.java index 6bce601fb..870ebb199 100644 --- a/server/api-service/openblocks-server/src/main/java/com/openblocks/api/authentication/util/SmsVerificationUtils.java +++ b/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/authentication/util/SmsVerificationUtils.java @@ -1,4 +1,4 @@ -package com.openblocks.api.authentication.util; +package org.lowcoder.api.authentication.util; import java.util.Random; diff --git a/server/api-service/openblocks-server/src/main/java/com/openblocks/api/bizthreshold/AbstractBizThresholdChecker.java b/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/bizthreshold/AbstractBizThresholdChecker.java similarity index 85% rename from server/api-service/openblocks-server/src/main/java/com/openblocks/api/bizthreshold/AbstractBizThresholdChecker.java rename to server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/bizthreshold/AbstractBizThresholdChecker.java index 13dd5104a..63abc0678 100644 --- a/server/api-service/openblocks-server/src/main/java/com/openblocks/api/bizthreshold/AbstractBizThresholdChecker.java +++ b/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/bizthreshold/AbstractBizThresholdChecker.java @@ -1,7 +1,7 @@ -package com.openblocks.api.bizthreshold; +package org.lowcoder.api.bizthreshold; -import static com.openblocks.sdk.util.ExceptionUtils.deferredError; -import static com.openblocks.sdk.util.ExceptionUtils.ofError; +import static org.lowcoder.sdk.util.ExceptionUtils.deferredError; +import static org.lowcoder.sdk.util.ExceptionUtils.ofError; import java.util.List; import java.util.Map; @@ -9,19 +9,18 @@ import java.util.stream.Collectors; import java.util.stream.Stream; +import org.lowcoder.domain.application.model.ApplicationStatus; +import org.lowcoder.domain.application.service.ApplicationService; +import org.lowcoder.domain.group.model.GroupMember; +import org.lowcoder.domain.group.service.GroupMemberService; +import org.lowcoder.domain.group.service.GroupService; +import org.lowcoder.domain.organization.model.OrgMember; +import org.lowcoder.domain.organization.service.OrgMemberService; +import org.lowcoder.infra.util.TupleUtils; +import org.lowcoder.sdk.exception.BizError; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; -import com.openblocks.domain.application.model.ApplicationStatus; -import com.openblocks.domain.application.service.ApplicationService; -import com.openblocks.domain.group.model.GroupMember; -import com.openblocks.domain.group.service.GroupMemberService; -import com.openblocks.domain.group.service.GroupService; -import com.openblocks.domain.organization.model.OrgMember; -import com.openblocks.domain.organization.service.OrgMemberService; -import com.openblocks.infra.util.TupleUtils; -import com.openblocks.sdk.exception.BizError; - import reactor.core.publisher.Mono; @Component diff --git a/server/api-service/openblocks-server/src/main/java/com/openblocks/api/bizthreshold/BizThresholdChecker.java b/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/bizthreshold/BizThresholdChecker.java similarity index 92% rename from server/api-service/openblocks-server/src/main/java/com/openblocks/api/bizthreshold/BizThresholdChecker.java rename to server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/bizthreshold/BizThresholdChecker.java index 72b3c5a77..65d5d7be6 100644 --- a/server/api-service/openblocks-server/src/main/java/com/openblocks/api/bizthreshold/BizThresholdChecker.java +++ b/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/bizthreshold/BizThresholdChecker.java @@ -1,17 +1,16 @@ -package com.openblocks.api.bizthreshold; +package org.lowcoder.api.bizthreshold; import java.util.Collections; import java.util.Map; import javax.annotation.PostConstruct; +import org.lowcoder.sdk.config.dynamic.Conf; +import org.lowcoder.sdk.config.dynamic.ConfigCenter; +import org.lowcoder.sdk.config.dynamic.ConfigInstance; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import com.openblocks.sdk.config.dynamic.Conf; -import com.openblocks.sdk.config.dynamic.ConfigCenter; -import com.openblocks.sdk.config.dynamic.ConfigInstance; - import reactor.core.publisher.Mono; @Service diff --git a/server/api-service/openblocks-server/src/main/java/com/openblocks/api/config/ConfigController.java b/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/config/ConfigController.java similarity index 79% rename from server/api-service/openblocks-server/src/main/java/com/openblocks/api/config/ConfigController.java rename to server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/config/ConfigController.java index fcda0d084..092df855d 100644 --- a/server/api-service/openblocks-server/src/main/java/com/openblocks/api/config/ConfigController.java +++ b/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/config/ConfigController.java @@ -1,7 +1,17 @@ -package com.openblocks.api.config; +package org.lowcoder.api.config; import javax.annotation.PostConstruct; +import org.lowcoder.api.framework.view.ResponseView; +import org.lowcoder.api.usermanagement.OrgApiService; +import org.lowcoder.infra.config.model.ServerConfig; +import org.lowcoder.infra.config.repository.ServerConfigRepository; +import org.lowcoder.infra.constant.NewUrl; +import org.lowcoder.infra.constant.Url; +import org.lowcoder.sdk.config.CommonConfig; +import org.lowcoder.sdk.config.SerializeConfig.JsonViews; +import org.lowcoder.sdk.config.dynamic.Conf; +import org.lowcoder.sdk.config.dynamic.ConfigCenter; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PathVariable; @@ -12,16 +22,6 @@ import org.springframework.web.server.ServerWebExchange; import com.fasterxml.jackson.annotation.JsonView; -import com.openblocks.api.framework.view.ResponseView; -import com.openblocks.api.usermanagement.OrgApiService; -import com.openblocks.infra.config.model.ServerConfig; -import com.openblocks.infra.config.repository.ServerConfigRepository; -import com.openblocks.infra.constant.NewUrl; -import com.openblocks.infra.constant.Url; -import com.openblocks.sdk.config.CommonConfig; -import com.openblocks.sdk.config.SerializeConfig.JsonViews; -import com.openblocks.sdk.config.dynamic.Conf; -import com.openblocks.sdk.config.dynamic.ConfigCenter; import lombok.extern.slf4j.Slf4j; import reactor.core.publisher.Mono; diff --git a/server/api-service/openblocks-server/src/main/java/com/openblocks/api/config/ConfigView.java b/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/config/ConfigView.java similarity index 76% rename from server/api-service/openblocks-server/src/main/java/com/openblocks/api/config/ConfigView.java rename to server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/config/ConfigView.java index f20379f65..97ac62780 100644 --- a/server/api-service/openblocks-server/src/main/java/com/openblocks/api/config/ConfigView.java +++ b/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/config/ConfigView.java @@ -1,12 +1,13 @@ -package com.openblocks.api.config; +package org.lowcoder.api.config; import java.util.List; +import org.lowcoder.sdk.auth.AbstractAuthConfig; +import org.lowcoder.sdk.constants.WorkspaceMode; + import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonInclude.Include; -import com.openblocks.sdk.auth.AbstractAuthConfig; -import com.openblocks.sdk.constants.WorkspaceMode; import lombok.Getter; import lombok.experimental.SuperBuilder; diff --git a/server/api-service/openblocks-server/src/main/java/com/openblocks/api/datasource/DatasourceApiService.java b/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/datasource/DatasourceApiService.java similarity index 84% rename from server/api-service/openblocks-server/src/main/java/com/openblocks/api/datasource/DatasourceApiService.java rename to server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/datasource/DatasourceApiService.java index 3ce300c7d..aa574f157 100644 --- a/server/api-service/openblocks-server/src/main/java/com/openblocks/api/datasource/DatasourceApiService.java +++ b/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/datasource/DatasourceApiService.java @@ -1,10 +1,10 @@ -package com.openblocks.api.datasource; +package org.lowcoder.api.datasource; -import static com.openblocks.domain.permission.model.ResourceAction.MANAGE_DATASOURCES; -import static com.openblocks.domain.permission.model.ResourceAction.READ_APPLICATIONS; -import static com.openblocks.domain.permission.model.ResourceAction.USE_DATASOURCES; -import static com.openblocks.sdk.exception.BizError.NOT_AUTHORIZED; -import static com.openblocks.sdk.util.ExceptionUtils.deferredError; +import static org.lowcoder.domain.permission.model.ResourceAction.MANAGE_DATASOURCES; +import static org.lowcoder.domain.permission.model.ResourceAction.READ_APPLICATIONS; +import static org.lowcoder.domain.permission.model.ResourceAction.USE_DATASOURCES; +import static org.lowcoder.sdk.exception.BizError.NOT_AUTHORIZED; +import static org.lowcoder.sdk.util.ExceptionUtils.deferredError; import java.util.Collections; import java.util.List; @@ -16,42 +16,41 @@ import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang3.StringUtils; +import org.lowcoder.api.application.ApplicationApiService; +import org.lowcoder.api.home.SessionUserService; +import org.lowcoder.api.permission.PermissionHelper; +import org.lowcoder.api.permission.view.CommonPermissionView; +import org.lowcoder.api.permission.view.PermissionItemView; +import org.lowcoder.api.usermanagement.OrgDevChecker; +import org.lowcoder.domain.application.service.ApplicationService; +import org.lowcoder.domain.datasource.model.Datasource; +import org.lowcoder.domain.datasource.model.DatasourceStatus; +import org.lowcoder.domain.datasource.repository.DatasourceRepository; +import org.lowcoder.domain.datasource.service.DatasourceConnectionPool; +import org.lowcoder.domain.datasource.service.DatasourceService; +import org.lowcoder.domain.datasource.service.JsDatasourceHelper; +import org.lowcoder.domain.organization.model.Organization; +import org.lowcoder.domain.organization.service.OrgMemberService; +import org.lowcoder.domain.organization.service.OrganizationService; +import org.lowcoder.domain.permission.model.ResourcePermission; +import org.lowcoder.domain.permission.model.ResourceRole; +import org.lowcoder.domain.permission.model.ResourceType; +import org.lowcoder.domain.permission.service.ResourcePermissionService; +import org.lowcoder.domain.plugin.client.DatasourcePluginClient; +import org.lowcoder.domain.plugin.client.dto.GetPluginDynamicConfigRequestDTO; +import org.lowcoder.domain.plugin.service.DatasourceMetaInfoService; +import org.lowcoder.domain.user.model.User; +import org.lowcoder.domain.user.service.UserService; +import org.lowcoder.sdk.constants.FieldName; +import org.lowcoder.sdk.exception.BizError; +import org.lowcoder.sdk.exception.BizException; +import org.lowcoder.sdk.exception.ServerException; +import org.lowcoder.sdk.models.DatasourceTestResult; +import org.lowcoder.sdk.models.HasIdAndAuditing; +import org.lowcoder.sdk.models.JsDatasourceConnectionConfig; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import com.openblocks.api.application.ApplicationApiService; -import com.openblocks.api.home.SessionUserService; -import com.openblocks.api.permission.PermissionHelper; -import com.openblocks.api.permission.view.CommonPermissionView; -import com.openblocks.api.permission.view.PermissionItemView; -import com.openblocks.api.usermanagement.OrgDevChecker; -import com.openblocks.domain.application.service.ApplicationService; -import com.openblocks.domain.datasource.model.Datasource; -import com.openblocks.domain.datasource.model.DatasourceStatus; -import com.openblocks.domain.datasource.repository.DatasourceRepository; -import com.openblocks.domain.datasource.service.DatasourceConnectionPool; -import com.openblocks.domain.datasource.service.DatasourceService; -import com.openblocks.domain.datasource.service.JsDatasourceHelper; -import com.openblocks.domain.organization.model.Organization; -import com.openblocks.domain.organization.service.OrgMemberService; -import com.openblocks.domain.organization.service.OrganizationService; -import com.openblocks.domain.permission.model.ResourcePermission; -import com.openblocks.domain.permission.model.ResourceRole; -import com.openblocks.domain.permission.model.ResourceType; -import com.openblocks.domain.permission.service.ResourcePermissionService; -import com.openblocks.domain.plugin.client.DatasourcePluginClient; -import com.openblocks.domain.plugin.client.dto.GetPluginDynamicConfigRequestDTO; -import com.openblocks.domain.plugin.service.DatasourceMetaInfoService; -import com.openblocks.domain.user.model.User; -import com.openblocks.domain.user.service.UserService; -import com.openblocks.sdk.constants.FieldName; -import com.openblocks.sdk.exception.BizError; -import com.openblocks.sdk.exception.BizException; -import com.openblocks.sdk.exception.ServerException; -import com.openblocks.sdk.models.DatasourceTestResult; -import com.openblocks.sdk.models.HasIdAndAuditing; -import com.openblocks.sdk.models.JsDatasourceConnectionConfig; - import reactor.core.publisher.Flux; import reactor.core.publisher.Mono; diff --git a/server/api-service/openblocks-server/src/main/java/com/openblocks/api/datasource/DatasourceController.java b/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/datasource/DatasourceController.java similarity index 87% rename from server/api-service/openblocks-server/src/main/java/com/openblocks/api/datasource/DatasourceController.java rename to server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/datasource/DatasourceController.java index aa984f7eb..03f57feda 100644 --- a/server/api-service/openblocks-server/src/main/java/com/openblocks/api/datasource/DatasourceController.java +++ b/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/datasource/DatasourceController.java @@ -1,14 +1,14 @@ -package com.openblocks.api.datasource; +package org.lowcoder.api.datasource; -import static com.openblocks.infra.event.EventType.DATA_SOURCE_CREATE; -import static com.openblocks.infra.event.EventType.DATA_SOURCE_DELETE; -import static com.openblocks.infra.event.EventType.DATA_SOURCE_PERMISSION_DELETE; -import static com.openblocks.infra.event.EventType.DATA_SOURCE_PERMISSION_GRANT; -import static com.openblocks.infra.event.EventType.DATA_SOURCE_PERMISSION_UPDATE; -import static com.openblocks.infra.event.EventType.DATA_SOURCE_UPDATE; -import static com.openblocks.sdk.exception.BizError.INVALID_PARAMETER; -import static com.openblocks.sdk.util.ExceptionUtils.ofError; -import static com.openblocks.sdk.util.LocaleUtils.getLocale; +import static org.lowcoder.infra.event.EventType.DATA_SOURCE_CREATE; +import static org.lowcoder.infra.event.EventType.DATA_SOURCE_DELETE; +import static org.lowcoder.infra.event.EventType.DATA_SOURCE_PERMISSION_DELETE; +import static org.lowcoder.infra.event.EventType.DATA_SOURCE_PERMISSION_GRANT; +import static org.lowcoder.infra.event.EventType.DATA_SOURCE_PERMISSION_UPDATE; +import static org.lowcoder.infra.event.EventType.DATA_SOURCE_UPDATE; +import static org.lowcoder.sdk.exception.BizError.INVALID_PARAMETER; +import static org.lowcoder.sdk.util.ExceptionUtils.ofError; +import static org.lowcoder.sdk.util.LocaleUtils.getLocale; import java.util.Collections; import java.util.List; @@ -21,6 +21,21 @@ import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang3.BooleanUtils; import org.apache.commons.lang3.StringUtils; +import org.lowcoder.api.framework.view.ResponseView; +import org.lowcoder.api.permission.view.CommonPermissionView; +import org.lowcoder.api.util.BusinessEventPublisher; +import org.lowcoder.domain.datasource.model.Datasource; +import org.lowcoder.domain.datasource.service.DatasourceService; +import org.lowcoder.domain.datasource.service.DatasourceStructureService; +import org.lowcoder.domain.permission.model.ResourceRole; +import org.lowcoder.domain.plugin.client.DatasourcePluginClient; +import org.lowcoder.domain.plugin.client.dto.GetPluginDynamicConfigRequestDTO; +import org.lowcoder.infra.constant.NewUrl; +import org.lowcoder.infra.constant.Url; +import org.lowcoder.sdk.config.SerializeConfig.JsonViews; +import org.lowcoder.sdk.exception.BizError; +import org.lowcoder.sdk.models.DatasourceStructure; +import org.lowcoder.sdk.models.DatasourceTestResult; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.HttpStatus; import org.springframework.web.bind.annotation.DeleteMapping; @@ -35,21 +50,6 @@ import org.springframework.web.bind.annotation.RestController; import com.fasterxml.jackson.annotation.JsonView; -import com.openblocks.api.framework.view.ResponseView; -import com.openblocks.api.permission.view.CommonPermissionView; -import com.openblocks.api.util.BusinessEventPublisher; -import com.openblocks.domain.datasource.model.Datasource; -import com.openblocks.domain.datasource.service.DatasourceService; -import com.openblocks.domain.datasource.service.DatasourceStructureService; -import com.openblocks.domain.permission.model.ResourceRole; -import com.openblocks.domain.plugin.client.DatasourcePluginClient; -import com.openblocks.domain.plugin.client.dto.GetPluginDynamicConfigRequestDTO; -import com.openblocks.infra.constant.NewUrl; -import com.openblocks.infra.constant.Url; -import com.openblocks.sdk.config.SerializeConfig.JsonViews; -import com.openblocks.sdk.exception.BizError; -import com.openblocks.sdk.models.DatasourceStructure; -import com.openblocks.sdk.models.DatasourceTestResult; import lombok.extern.slf4j.Slf4j; import reactor.core.publisher.Mono; diff --git a/server/api-service/openblocks-server/src/main/java/com/openblocks/api/datasource/DatasourceView.java b/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/datasource/DatasourceView.java similarity index 67% rename from server/api-service/openblocks-server/src/main/java/com/openblocks/api/datasource/DatasourceView.java rename to server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/datasource/DatasourceView.java index 82a729519..ac6a73424 100644 --- a/server/api-service/openblocks-server/src/main/java/com/openblocks/api/datasource/DatasourceView.java +++ b/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/datasource/DatasourceView.java @@ -1,6 +1,6 @@ -package com.openblocks.api.datasource; +package org.lowcoder.api.datasource; -import com.openblocks.domain.datasource.model.Datasource; +import org.lowcoder.domain.datasource.model.Datasource; public record DatasourceView(Datasource datasource, boolean edit, String creatorName) { diff --git a/server/api-service/openblocks-server/src/main/java/com/openblocks/api/datasource/UpsertDatasourceRequest.java b/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/datasource/UpsertDatasourceRequest.java similarity index 88% rename from server/api-service/openblocks-server/src/main/java/com/openblocks/api/datasource/UpsertDatasourceRequest.java rename to server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/datasource/UpsertDatasourceRequest.java index 3b55a6662..c70f96239 100644 --- a/server/api-service/openblocks-server/src/main/java/com/openblocks/api/datasource/UpsertDatasourceRequest.java +++ b/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/datasource/UpsertDatasourceRequest.java @@ -1,4 +1,4 @@ -package com.openblocks.api.datasource; +package org.lowcoder.api.datasource; import java.util.Map; diff --git a/server/api-service/openblocks-server/src/main/java/com/openblocks/api/datasource/UpsertDatasourceRequestMapper.java b/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/datasource/UpsertDatasourceRequestMapper.java similarity index 77% rename from server/api-service/openblocks-server/src/main/java/com/openblocks/api/datasource/UpsertDatasourceRequestMapper.java rename to server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/datasource/UpsertDatasourceRequestMapper.java index 3aaeab44e..cbb0b6ec6 100644 --- a/server/api-service/openblocks-server/src/main/java/com/openblocks/api/datasource/UpsertDatasourceRequestMapper.java +++ b/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/datasource/UpsertDatasourceRequestMapper.java @@ -1,17 +1,16 @@ -package com.openblocks.api.datasource; +package org.lowcoder.api.datasource; -import static com.openblocks.sdk.exception.BizError.INVALID_DATASOURCE_CONFIGURATION; -import static com.openblocks.sdk.util.ExceptionUtils.ofException; +import static org.lowcoder.sdk.exception.BizError.INVALID_DATASOURCE_CONFIGURATION; +import static org.lowcoder.sdk.util.ExceptionUtils.ofException; import org.apache.commons.lang3.StringUtils; +import org.lowcoder.domain.datasource.model.Datasource; +import org.lowcoder.domain.plugin.service.DatasourceMetaInfoService; +import org.lowcoder.sdk.models.JsDatasourceConnectionConfig; +import org.lowcoder.sdk.util.JsonUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; -import com.openblocks.domain.datasource.model.Datasource; -import com.openblocks.domain.plugin.service.DatasourceMetaInfoService; -import com.openblocks.sdk.models.JsDatasourceConnectionConfig; -import com.openblocks.sdk.util.JsonUtils; - @Component public class UpsertDatasourceRequestMapper { diff --git a/server/api-service/openblocks-server/src/main/java/com/openblocks/api/framework/StateController.java b/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/framework/StateController.java similarity index 71% rename from server/api-service/openblocks-server/src/main/java/com/openblocks/api/framework/StateController.java rename to server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/framework/StateController.java index 84d8364cb..bd56d2a40 100644 --- a/server/api-service/openblocks-server/src/main/java/com/openblocks/api/framework/StateController.java +++ b/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/framework/StateController.java @@ -1,19 +1,18 @@ -package com.openblocks.api.framework; +package org.lowcoder.api.framework; -import static com.openblocks.sdk.exception.BizError.SERVER_NOT_READY; -import static com.openblocks.sdk.util.ExceptionUtils.ofError; +import static org.lowcoder.sdk.exception.BizError.SERVER_NOT_READY; +import static org.lowcoder.sdk.util.ExceptionUtils.ofError; +import org.lowcoder.api.framework.view.ResponseView; +import org.lowcoder.api.framework.warmup.WarmupHelper; +import org.lowcoder.infra.constant.NewUrl; +import org.lowcoder.infra.constant.Url; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMethod; import org.springframework.web.bind.annotation.RestController; -import com.openblocks.api.framework.view.ResponseView; -import com.openblocks.api.framework.warmup.WarmupHelper; -import com.openblocks.infra.constant.NewUrl; -import com.openblocks.infra.constant.Url; - import lombok.extern.slf4j.Slf4j; import reactor.core.publisher.Mono; diff --git a/server/api-service/openblocks-server/src/main/java/com/openblocks/api/framework/configuration/ComponentScanConfiguration.java b/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/framework/configuration/ComponentScanConfiguration.java similarity index 56% rename from server/api-service/openblocks-server/src/main/java/com/openblocks/api/framework/configuration/ComponentScanConfiguration.java rename to server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/framework/configuration/ComponentScanConfiguration.java index aa35ee4a1..8bc4396ed 100644 --- a/server/api-service/openblocks-server/src/main/java/com/openblocks/api/framework/configuration/ComponentScanConfiguration.java +++ b/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/framework/configuration/ComponentScanConfiguration.java @@ -1,12 +1,12 @@ -package com.openblocks.api.framework.configuration; +package org.lowcoder.api.framework.configuration; import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingClass; import org.springframework.context.annotation.ComponentScan; import org.springframework.context.annotation.Configuration; -@ComponentScan(basePackages = "com.openblocks") +@ComponentScan(basePackages = "org.lowcoder") @Configuration -@ConditionalOnMissingClass("com.openblocks.api.framework.configuration.ComponentScanConfigurationEEVersion") +@ConditionalOnMissingClass("org.lowcoder.api.framework.configuration.ComponentScanConfigurationEEVersion") public class ComponentScanConfiguration { } diff --git a/server/api-service/openblocks-server/src/main/java/com/openblocks/api/framework/exception/ApiPerfHelper.java b/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/framework/exception/ApiPerfHelper.java similarity index 83% rename from server/api-service/openblocks-server/src/main/java/com/openblocks/api/framework/exception/ApiPerfHelper.java rename to server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/framework/exception/ApiPerfHelper.java index ba15d199f..fcbc4300b 100644 --- a/server/api-service/openblocks-server/src/main/java/com/openblocks/api/framework/exception/ApiPerfHelper.java +++ b/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/framework/exception/ApiPerfHelper.java @@ -1,17 +1,16 @@ -package com.openblocks.api.framework.exception; +package org.lowcoder.api.framework.exception; import static java.util.Optional.ofNullable; +import org.lowcoder.infra.perf.PerfEvent; +import org.lowcoder.infra.perf.PerfHelper; +import org.lowcoder.sdk.exception.BizError; +import org.lowcoder.sdk.exception.PluginError; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.server.PathContainer; import org.springframework.http.server.RequestPath; import org.springframework.stereotype.Component; -import com.openblocks.infra.perf.PerfEvent; -import com.openblocks.infra.perf.PerfHelper; -import com.openblocks.sdk.exception.BizError; -import com.openblocks.sdk.exception.PluginError; - import io.micrometer.core.instrument.Tags; @Component diff --git a/server/api-service/openblocks-server/src/main/java/com/openblocks/api/framework/exception/CustomErrorWebExceptionHandler.java b/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/framework/exception/CustomErrorWebExceptionHandler.java similarity index 93% rename from server/api-service/openblocks-server/src/main/java/com/openblocks/api/framework/exception/CustomErrorWebExceptionHandler.java rename to server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/framework/exception/CustomErrorWebExceptionHandler.java index a4bf36ed3..07f0785e9 100644 --- a/server/api-service/openblocks-server/src/main/java/com/openblocks/api/framework/exception/CustomErrorWebExceptionHandler.java +++ b/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/framework/exception/CustomErrorWebExceptionHandler.java @@ -1,6 +1,6 @@ -package com.openblocks.api.framework.exception; +package org.lowcoder.api.framework.exception; -import static com.openblocks.sdk.util.ExceptionUtils.ofException; +import static org.lowcoder.sdk.util.ExceptionUtils.ofException; import static org.springframework.web.reactive.function.server.RequestPredicates.all; import static org.springframework.web.reactive.function.server.RouterFunctions.route; @@ -8,6 +8,11 @@ import java.util.Map; import java.util.stream.Collectors; +import org.lowcoder.api.framework.service.GlobalContextService; +import org.lowcoder.api.framework.view.ResponseView; +import org.lowcoder.sdk.exception.BizError; +import org.lowcoder.sdk.exception.BizException; +import org.lowcoder.sdk.util.LocaleUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.ObjectProvider; @@ -32,11 +37,6 @@ import com.mongodb.MongoExecutionTimeoutException; import com.mongodb.MongoSocketReadTimeoutException; import com.mongodb.MongoTimeoutException; -import com.openblocks.api.framework.service.GlobalContextService; -import com.openblocks.api.framework.view.ResponseView; -import com.openblocks.sdk.exception.BizError; -import com.openblocks.sdk.exception.BizException; -import com.openblocks.sdk.util.LocaleUtils; import io.lettuce.core.RedisCommandTimeoutException; import reactor.core.publisher.Mono; diff --git a/server/api-service/openblocks-server/src/main/java/com/openblocks/api/framework/exception/GlobalExceptionHandler.java b/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/framework/exception/GlobalExceptionHandler.java similarity index 91% rename from server/api-service/openblocks-server/src/main/java/com/openblocks/api/framework/exception/GlobalExceptionHandler.java rename to server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/framework/exception/GlobalExceptionHandler.java index f19266698..75bea8ddb 100644 --- a/server/api-service/openblocks-server/src/main/java/com/openblocks/api/framework/exception/GlobalExceptionHandler.java +++ b/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/framework/exception/GlobalExceptionHandler.java @@ -1,13 +1,22 @@ -package com.openblocks.api.framework.exception; +package org.lowcoder.api.framework.exception; -import static com.openblocks.api.framework.view.ResponseView.error; -import static com.openblocks.sdk.util.LocaleUtils.getLocale; +import static org.lowcoder.api.framework.view.ResponseView.error; +import static org.lowcoder.sdk.util.LocaleUtils.getLocale; import java.util.HashMap; import java.util.Locale; import java.util.Map; import java.util.concurrent.TimeoutException; +import org.lowcoder.api.framework.view.ResponseView; +import org.lowcoder.infra.util.LogUtils; +import org.lowcoder.sdk.exception.BaseException; +import org.lowcoder.sdk.exception.BizError; +import org.lowcoder.sdk.exception.BizException; +import org.lowcoder.sdk.exception.PluginError; +import org.lowcoder.sdk.exception.PluginException; +import org.lowcoder.sdk.exception.ServerException; +import org.lowcoder.sdk.util.LocaleUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; @@ -20,16 +29,6 @@ import org.springframework.web.server.ServerWebExchange; import org.springframework.web.server.ServerWebInputException; -import com.openblocks.api.framework.view.ResponseView; -import com.openblocks.infra.util.LogUtils; -import com.openblocks.sdk.exception.BaseException; -import com.openblocks.sdk.exception.BizError; -import com.openblocks.sdk.exception.BizException; -import com.openblocks.sdk.exception.PluginError; -import com.openblocks.sdk.exception.PluginException; -import com.openblocks.sdk.exception.ServerException; -import com.openblocks.sdk.util.LocaleUtils; - import reactor.core.publisher.Mono; import reactor.util.context.ContextView; diff --git a/server/api-service/openblocks-server/src/main/java/com/openblocks/api/framework/exception/ResourceWebPropertiesConfig.java b/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/framework/exception/ResourceWebPropertiesConfig.java similarity index 88% rename from server/api-service/openblocks-server/src/main/java/com/openblocks/api/framework/exception/ResourceWebPropertiesConfig.java rename to server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/framework/exception/ResourceWebPropertiesConfig.java index b44453626..13d66e1e2 100644 --- a/server/api-service/openblocks-server/src/main/java/com/openblocks/api/framework/exception/ResourceWebPropertiesConfig.java +++ b/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/framework/exception/ResourceWebPropertiesConfig.java @@ -1,4 +1,4 @@ -package com.openblocks.api.framework.exception; +package org.lowcoder.api.framework.exception; import org.springframework.boot.autoconfigure.web.WebProperties; import org.springframework.context.annotation.Bean; diff --git a/server/api-service/openblocks-server/src/main/java/com/openblocks/api/framework/filter/FilterOrder.java b/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/framework/filter/FilterOrder.java similarity index 86% rename from server/api-service/openblocks-server/src/main/java/com/openblocks/api/framework/filter/FilterOrder.java rename to server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/framework/filter/FilterOrder.java index d8f827447..8e8c0d9be 100644 --- a/server/api-service/openblocks-server/src/main/java/com/openblocks/api/framework/filter/FilterOrder.java +++ b/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/framework/filter/FilterOrder.java @@ -1,7 +1,7 @@ -package com.openblocks.api.framework.filter; +package org.lowcoder.api.framework.filter; -import static com.openblocks.api.framework.filter.Position.AFTER_PROXY_CHAIN; -import static com.openblocks.api.framework.filter.Position.BEFORE_PROXY_CHAIN; +import static org.lowcoder.api.framework.filter.Position.AFTER_PROXY_CHAIN; +import static org.lowcoder.api.framework.filter.Position.BEFORE_PROXY_CHAIN; import org.springframework.core.PriorityOrdered; diff --git a/server/api-service/openblocks-server/src/main/java/com/openblocks/api/framework/filter/GlobalContextFilter.java b/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/framework/filter/GlobalContextFilter.java similarity index 76% rename from server/api-service/openblocks-server/src/main/java/com/openblocks/api/framework/filter/GlobalContextFilter.java rename to server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/framework/filter/GlobalContextFilter.java index 31425e4e7..3d30f5c89 100644 --- a/server/api-service/openblocks-server/src/main/java/com/openblocks/api/framework/filter/GlobalContextFilter.java +++ b/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/framework/filter/GlobalContextFilter.java @@ -1,20 +1,20 @@ -package com.openblocks.api.framework.filter; - -import static com.openblocks.api.framework.filter.FilterOrder.GLOBAL_CONTEXT; -import static com.openblocks.sdk.constants.Authentication.isAnonymousUser; -import static com.openblocks.sdk.constants.GlobalContext.CLIENT_IP; -import static com.openblocks.sdk.constants.GlobalContext.CLIENT_LOCALE; -import static com.openblocks.sdk.constants.GlobalContext.CURRENT_ORG_MEMBER; -import static com.openblocks.sdk.constants.GlobalContext.DOMAIN; -import static com.openblocks.sdk.constants.GlobalContext.REQUEST; -import static com.openblocks.sdk.constants.GlobalContext.REQUEST_ID_LOG; -import static com.openblocks.sdk.constants.GlobalContext.REQUEST_METHOD; -import static com.openblocks.sdk.constants.GlobalContext.REQUEST_PATH; -import static com.openblocks.sdk.constants.GlobalContext.VISITOR_ID; -import static com.openblocks.sdk.constants.GlobalContext.VISITOR_TOKEN; -import static com.openblocks.sdk.util.IDUtils.generate; +package org.lowcoder.api.framework.filter; + import static java.util.Optional.ofNullable; import static java.util.stream.Collectors.toMap; +import static org.lowcoder.api.framework.filter.FilterOrder.GLOBAL_CONTEXT; +import static org.lowcoder.sdk.constants.Authentication.isAnonymousUser; +import static org.lowcoder.sdk.constants.GlobalContext.CLIENT_IP; +import static org.lowcoder.sdk.constants.GlobalContext.CLIENT_LOCALE; +import static org.lowcoder.sdk.constants.GlobalContext.CURRENT_ORG_MEMBER; +import static org.lowcoder.sdk.constants.GlobalContext.DOMAIN; +import static org.lowcoder.sdk.constants.GlobalContext.REQUEST; +import static org.lowcoder.sdk.constants.GlobalContext.REQUEST_ID_LOG; +import static org.lowcoder.sdk.constants.GlobalContext.REQUEST_METHOD; +import static org.lowcoder.sdk.constants.GlobalContext.REQUEST_PATH; +import static org.lowcoder.sdk.constants.GlobalContext.VISITOR_ID; +import static org.lowcoder.sdk.constants.GlobalContext.VISITOR_TOKEN; +import static org.lowcoder.sdk.util.IDUtils.generate; import java.util.Map; import java.util.Map.Entry; @@ -22,6 +22,14 @@ import javax.annotation.Nonnull; +import org.lowcoder.api.framework.service.GlobalContextService; +import org.lowcoder.api.home.SessionUserService; +import org.lowcoder.domain.organization.service.OrgMemberService; +import org.lowcoder.infra.serverlog.ServerLog; +import org.lowcoder.infra.serverlog.ServerLogService; +import org.lowcoder.infra.util.NetworkUtils; +import org.lowcoder.sdk.util.CookieHelper; +import org.lowcoder.sdk.util.UriUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.core.Ordered; import org.springframework.http.HttpMethod; @@ -31,15 +39,6 @@ import org.springframework.web.server.WebFilter; import org.springframework.web.server.WebFilterChain; -import com.openblocks.api.framework.service.GlobalContextService; -import com.openblocks.api.home.SessionUserService; -import com.openblocks.domain.organization.service.OrgMemberService; -import com.openblocks.infra.serverlog.ServerLog; -import com.openblocks.infra.serverlog.ServerLogService; -import com.openblocks.infra.util.NetworkUtils; -import com.openblocks.sdk.util.CookieHelper; -import com.openblocks.sdk.util.UriUtils; - import lombok.extern.slf4j.Slf4j; import reactor.core.publisher.Mono; diff --git a/server/api-service/openblocks-server/src/main/java/com/openblocks/api/framework/filter/QueryExecuteHttpBodySizeFilter.java b/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/framework/filter/QueryExecuteHttpBodySizeFilter.java similarity index 88% rename from server/api-service/openblocks-server/src/main/java/com/openblocks/api/framework/filter/QueryExecuteHttpBodySizeFilter.java rename to server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/framework/filter/QueryExecuteHttpBodySizeFilter.java index 7dbaf86c2..a760bceb0 100644 --- a/server/api-service/openblocks-server/src/main/java/com/openblocks/api/framework/filter/QueryExecuteHttpBodySizeFilter.java +++ b/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/framework/filter/QueryExecuteHttpBodySizeFilter.java @@ -1,8 +1,8 @@ -package com.openblocks.api.framework.filter; +package org.lowcoder.api.framework.filter; -import static com.openblocks.api.framework.filter.FilterOrder.QUERY_EXECUTE_HTTP_BODY_SIZE; -import static com.openblocks.sdk.exception.BizError.EXCEED_QUERY_REQUEST_SIZE; -import static com.openblocks.sdk.exception.BizError.EXCEED_QUERY_RESPONSE_SIZE; +import static org.lowcoder.api.framework.filter.FilterOrder.QUERY_EXECUTE_HTTP_BODY_SIZE; +import static org.lowcoder.sdk.exception.BizError.EXCEED_QUERY_REQUEST_SIZE; +import static org.lowcoder.sdk.exception.BizError.EXCEED_QUERY_RESPONSE_SIZE; import java.util.concurrent.atomic.AtomicLong; @@ -10,6 +10,12 @@ import javax.annotation.PostConstruct; import org.apache.commons.io.FileUtils; +import org.lowcoder.infra.constant.NewUrl; +import org.lowcoder.infra.constant.Url; +import org.lowcoder.sdk.config.CommonConfig; +import org.lowcoder.sdk.config.dynamic.ConfigCenter; +import org.lowcoder.sdk.config.dynamic.ConfigInstanceHelper; +import org.lowcoder.sdk.exception.BizException; import org.reactivestreams.Publisher; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; @@ -24,13 +30,6 @@ import org.springframework.web.server.WebFilter; import org.springframework.web.server.WebFilterChain; -import com.openblocks.infra.constant.NewUrl; -import com.openblocks.infra.constant.Url; -import com.openblocks.sdk.config.CommonConfig; -import com.openblocks.sdk.config.dynamic.ConfigCenter; -import com.openblocks.sdk.config.dynamic.ConfigInstanceHelper; -import com.openblocks.sdk.exception.BizException; - import lombok.extern.slf4j.Slf4j; import reactor.core.publisher.Flux; import reactor.core.publisher.Mono; diff --git a/server/api-service/openblocks-server/src/main/java/com/openblocks/api/framework/filter/RequestCostFilter.java b/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/framework/filter/RequestCostFilter.java similarity index 90% rename from server/api-service/openblocks-server/src/main/java/com/openblocks/api/framework/filter/RequestCostFilter.java rename to server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/framework/filter/RequestCostFilter.java index 927996a2c..3f002474a 100644 --- a/server/api-service/openblocks-server/src/main/java/com/openblocks/api/framework/filter/RequestCostFilter.java +++ b/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/framework/filter/RequestCostFilter.java @@ -1,6 +1,6 @@ -package com.openblocks.api.framework.filter; +package org.lowcoder.api.framework.filter; -import static com.openblocks.api.framework.filter.FilterOrder.REQUEST_COST; +import static org.lowcoder.api.framework.filter.FilterOrder.REQUEST_COST; import java.time.Duration; diff --git a/server/api-service/openblocks-server/src/main/java/com/openblocks/api/framework/filter/ThrottlingFilter.java b/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/framework/filter/ThrottlingFilter.java similarity index 92% rename from server/api-service/openblocks-server/src/main/java/com/openblocks/api/framework/filter/ThrottlingFilter.java rename to server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/framework/filter/ThrottlingFilter.java index 35ec86180..430636c35 100644 --- a/server/api-service/openblocks-server/src/main/java/com/openblocks/api/framework/filter/ThrottlingFilter.java +++ b/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/framework/filter/ThrottlingFilter.java @@ -1,9 +1,9 @@ -package com.openblocks.api.framework.filter; +package org.lowcoder.api.framework.filter; -import static com.openblocks.api.framework.filter.FilterOrder.THROTTLING; -import static com.openblocks.sdk.exception.BizError.REQUEST_THROTTLED; -import static com.openblocks.sdk.util.ExceptionUtils.ofError; import static java.util.Collections.emptyMap; +import static org.lowcoder.api.framework.filter.FilterOrder.THROTTLING; +import static org.lowcoder.sdk.exception.BizError.REQUEST_THROTTLED; +import static org.lowcoder.sdk.util.ExceptionUtils.ofError; import java.util.Map; import java.util.concurrent.ConcurrentHashMap; @@ -12,6 +12,7 @@ import javax.annotation.Nonnull; import javax.annotation.PostConstruct; +import org.lowcoder.sdk.config.dynamic.ConfigCenter; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.core.Ordered; import org.springframework.http.server.reactive.ServerHttpRequest; @@ -21,7 +22,6 @@ import org.springframework.web.server.WebFilterChain; import com.google.common.util.concurrent.RateLimiter; -import com.openblocks.sdk.config.dynamic.ConfigCenter; import lombok.Getter; import lombok.extern.slf4j.Slf4j; diff --git a/server/api-service/openblocks-server/src/main/java/com/openblocks/api/framework/filter/UserBanFilter.java b/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/framework/filter/UserBanFilter.java similarity index 76% rename from server/api-service/openblocks-server/src/main/java/com/openblocks/api/framework/filter/UserBanFilter.java rename to server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/framework/filter/UserBanFilter.java index 53a69d602..73d6deb6f 100644 --- a/server/api-service/openblocks-server/src/main/java/com/openblocks/api/framework/filter/UserBanFilter.java +++ b/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/framework/filter/UserBanFilter.java @@ -1,12 +1,15 @@ -package com.openblocks.api.framework.filter; +package org.lowcoder.api.framework.filter; -import static com.openblocks.api.framework.filter.FilterOrder.USER_BAN; -import static com.openblocks.sdk.constants.Authentication.isAnonymousUser; -import static com.openblocks.sdk.exception.BizError.USER_BANNED; -import static com.openblocks.sdk.util.ExceptionUtils.ofError; +import static org.lowcoder.api.framework.filter.FilterOrder.USER_BAN; +import static org.lowcoder.sdk.constants.Authentication.isAnonymousUser; +import static org.lowcoder.sdk.exception.BizError.USER_BANNED; +import static org.lowcoder.sdk.util.ExceptionUtils.ofError; import javax.annotation.Nonnull; +import org.lowcoder.api.home.SessionUserService; +import org.lowcoder.domain.user.model.UserStatus; +import org.lowcoder.domain.user.service.UserStatusService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.core.Ordered; import org.springframework.stereotype.Component; @@ -14,10 +17,6 @@ import org.springframework.web.server.WebFilter; import org.springframework.web.server.WebFilterChain; -import com.openblocks.api.home.SessionUserService; -import com.openblocks.domain.user.model.UserStatus; -import com.openblocks.domain.user.service.UserStatusService; - import lombok.extern.slf4j.Slf4j; import reactor.core.publisher.Mono; diff --git a/server/api-service/openblocks-server/src/main/java/com/openblocks/api/framework/filter/UserSessionPersistenceFilter.java b/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/framework/filter/UserSessionPersistenceFilter.java similarity index 84% rename from server/api-service/openblocks-server/src/main/java/com/openblocks/api/framework/filter/UserSessionPersistenceFilter.java rename to server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/framework/filter/UserSessionPersistenceFilter.java index ff10cdbb2..5f106604e 100644 --- a/server/api-service/openblocks-server/src/main/java/com/openblocks/api/framework/filter/UserSessionPersistenceFilter.java +++ b/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/framework/filter/UserSessionPersistenceFilter.java @@ -1,17 +1,16 @@ -package com.openblocks.api.framework.filter; +package org.lowcoder.api.framework.filter; -import static com.openblocks.api.authentication.util.AuthenticationUtils.toAuthentication; +import static org.lowcoder.api.authentication.util.AuthenticationUtils.toAuthentication; import static org.springframework.security.core.context.ReactiveSecurityContextHolder.withAuthentication; import javax.annotation.Nonnull; +import org.lowcoder.api.home.SessionUserService; +import org.lowcoder.sdk.util.CookieHelper; import org.springframework.web.server.ServerWebExchange; import org.springframework.web.server.WebFilter; import org.springframework.web.server.WebFilterChain; -import com.openblocks.api.home.SessionUserService; -import com.openblocks.sdk.util.CookieHelper; - import lombok.extern.slf4j.Slf4j; import reactor.core.publisher.Mono; diff --git a/server/api-service/openblocks-server/src/main/java/com/openblocks/api/framework/security/AccessDeniedHandler.java b/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/framework/security/AccessDeniedHandler.java similarity index 94% rename from server/api-service/openblocks-server/src/main/java/com/openblocks/api/framework/security/AccessDeniedHandler.java rename to server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/framework/security/AccessDeniedHandler.java index ce08ba476..2bce2d45d 100644 --- a/server/api-service/openblocks-server/src/main/java/com/openblocks/api/framework/security/AccessDeniedHandler.java +++ b/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/framework/security/AccessDeniedHandler.java @@ -1,4 +1,4 @@ -package com.openblocks.api.framework.security; +package org.lowcoder.api.framework.security; import org.springframework.http.HttpStatus; import org.springframework.http.server.reactive.ServerHttpResponse; diff --git a/server/api-service/openblocks-server/src/main/java/com/openblocks/api/framework/security/AuthenticationEntryPoint.java b/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/framework/security/AuthenticationEntryPoint.java similarity index 94% rename from server/api-service/openblocks-server/src/main/java/com/openblocks/api/framework/security/AuthenticationEntryPoint.java rename to server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/framework/security/AuthenticationEntryPoint.java index aac6ad605..fdd4328be 100644 --- a/server/api-service/openblocks-server/src/main/java/com/openblocks/api/framework/security/AuthenticationEntryPoint.java +++ b/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/framework/security/AuthenticationEntryPoint.java @@ -1,4 +1,4 @@ -package com.openblocks.api.framework.security; +package org.lowcoder.api.framework.security; import org.springframework.http.HttpStatus; import org.springframework.http.server.reactive.ServerHttpResponse; diff --git a/server/api-service/openblocks-server/src/main/java/com/openblocks/api/framework/security/SecurityConfig.java b/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/framework/security/SecurityConfig.java similarity index 89% rename from server/api-service/openblocks-server/src/main/java/com/openblocks/api/framework/security/SecurityConfig.java rename to server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/framework/security/SecurityConfig.java index af93d9d69..591ced581 100644 --- a/server/api-service/openblocks-server/src/main/java/com/openblocks/api/framework/security/SecurityConfig.java +++ b/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/framework/security/SecurityConfig.java @@ -1,24 +1,30 @@ -package com.openblocks.api.framework.security; - - -import static com.openblocks.infra.constant.NewUrl.GITHUB_STAR; -import static com.openblocks.infra.constant.Url.APPLICATION_URL; -import static com.openblocks.infra.constant.Url.CONFIG_URL; -import static com.openblocks.infra.constant.Url.CUSTOM_AUTH; -import static com.openblocks.infra.constant.Url.DATASOURCE_URL; -import static com.openblocks.infra.constant.Url.GROUP_URL; -import static com.openblocks.infra.constant.Url.INVITATION_URL; -import static com.openblocks.infra.constant.Url.ORGANIZATION_URL; -import static com.openblocks.infra.constant.Url.QUERY_URL; -import static com.openblocks.infra.constant.Url.STATE_URL; -import static com.openblocks.infra.constant.Url.USER_URL; -import static com.openblocks.sdk.constants.Authentication.ANONYMOUS_USER; -import static com.openblocks.sdk.constants.Authentication.ANONYMOUS_USER_ID; +package org.lowcoder.api.framework.security; + + +import static org.lowcoder.infra.constant.NewUrl.GITHUB_STAR; +import static org.lowcoder.infra.constant.Url.APPLICATION_URL; +import static org.lowcoder.infra.constant.Url.CONFIG_URL; +import static org.lowcoder.infra.constant.Url.CUSTOM_AUTH; +import static org.lowcoder.infra.constant.Url.DATASOURCE_URL; +import static org.lowcoder.infra.constant.Url.GROUP_URL; +import static org.lowcoder.infra.constant.Url.INVITATION_URL; +import static org.lowcoder.infra.constant.Url.ORGANIZATION_URL; +import static org.lowcoder.infra.constant.Url.QUERY_URL; +import static org.lowcoder.infra.constant.Url.STATE_URL; +import static org.lowcoder.infra.constant.Url.USER_URL; +import static org.lowcoder.sdk.constants.Authentication.ANONYMOUS_USER; +import static org.lowcoder.sdk.constants.Authentication.ANONYMOUS_USER_ID; import java.util.List; import javax.annotation.Nonnull; +import org.lowcoder.api.framework.filter.UserSessionPersistenceFilter; +import org.lowcoder.api.home.SessionUserService; +import org.lowcoder.domain.user.model.User; +import org.lowcoder.infra.constant.NewUrl; +import org.lowcoder.sdk.config.CommonConfig; +import org.lowcoder.sdk.util.CookieHelper; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.Bean; import org.springframework.http.HttpMethod; @@ -34,13 +40,6 @@ import org.springframework.web.cors.reactive.UrlBasedCorsConfigurationSource; import org.springframework.web.server.adapter.ForwardedHeaderTransformer; -import com.openblocks.api.framework.filter.UserSessionPersistenceFilter; -import com.openblocks.api.home.SessionUserService; -import com.openblocks.domain.user.model.User; -import com.openblocks.infra.constant.NewUrl; -import com.openblocks.sdk.config.CommonConfig; -import com.openblocks.sdk.util.CookieHelper; - @EnableWebFluxSecurity @EnableReactiveMethodSecurity public class SecurityConfig { diff --git a/server/api-service/openblocks-server/src/main/java/com/openblocks/api/framework/service/GlobalContextService.java b/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/framework/service/GlobalContextService.java similarity index 87% rename from server/api-service/openblocks-server/src/main/java/com/openblocks/api/framework/service/GlobalContextService.java rename to server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/framework/service/GlobalContextService.java index e35b9e875..2bae01a2f 100644 --- a/server/api-service/openblocks-server/src/main/java/com/openblocks/api/framework/service/GlobalContextService.java +++ b/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/framework/service/GlobalContextService.java @@ -1,4 +1,4 @@ -package com.openblocks.api.framework.service; +package org.lowcoder.api.framework.service; import java.util.Locale; diff --git a/server/api-service/openblocks-server/src/main/java/com/openblocks/api/framework/service/GlobalContextServiceImpl.java b/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/framework/service/GlobalContextServiceImpl.java similarity index 96% rename from server/api-service/openblocks-server/src/main/java/com/openblocks/api/framework/service/GlobalContextServiceImpl.java rename to server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/framework/service/GlobalContextServiceImpl.java index 2e746a904..9e4d7ed9f 100644 --- a/server/api-service/openblocks-server/src/main/java/com/openblocks/api/framework/service/GlobalContextServiceImpl.java +++ b/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/framework/service/GlobalContextServiceImpl.java @@ -1,4 +1,4 @@ -package com.openblocks.api.framework.service; +package org.lowcoder.api.framework.service; import static java.util.Optional.ofNullable; diff --git a/server/api-service/openblocks-server/src/main/java/com/openblocks/api/framework/view/PageResponseView.java b/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/framework/view/PageResponseView.java similarity index 95% rename from server/api-service/openblocks-server/src/main/java/com/openblocks/api/framework/view/PageResponseView.java rename to server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/framework/view/PageResponseView.java index 9079f3f88..339dfab40 100644 --- a/server/api-service/openblocks-server/src/main/java/com/openblocks/api/framework/view/PageResponseView.java +++ b/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/framework/view/PageResponseView.java @@ -1,4 +1,4 @@ -package com.openblocks.api.framework.view; +package org.lowcoder.api.framework.view; import java.util.Collections; import java.util.List; diff --git a/server/api-service/openblocks-server/src/main/java/com/openblocks/api/framework/view/ResponseView.java b/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/framework/view/ResponseView.java similarity index 92% rename from server/api-service/openblocks-server/src/main/java/com/openblocks/api/framework/view/ResponseView.java rename to server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/framework/view/ResponseView.java index 42a8ced6c..acca0e7f1 100644 --- a/server/api-service/openblocks-server/src/main/java/com/openblocks/api/framework/view/ResponseView.java +++ b/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/framework/view/ResponseView.java @@ -1,7 +1,8 @@ -package com.openblocks.api.framework.view; +package org.lowcoder.api.framework.view; + +import org.lowcoder.sdk.exception.BizError; import com.fasterxml.jackson.annotation.JsonInclude; -import com.openblocks.sdk.exception.BizError; import lombok.Getter; diff --git a/server/api-service/openblocks-server/src/main/java/com/openblocks/api/framework/warmup/WarmupHelper.java b/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/framework/warmup/WarmupHelper.java similarity index 89% rename from server/api-service/openblocks-server/src/main/java/com/openblocks/api/framework/warmup/WarmupHelper.java rename to server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/framework/warmup/WarmupHelper.java index 0f457eb5f..305fc6c9e 100644 --- a/server/api-service/openblocks-server/src/main/java/com/openblocks/api/framework/warmup/WarmupHelper.java +++ b/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/framework/warmup/WarmupHelper.java @@ -1,12 +1,11 @@ -package com.openblocks.api.framework.warmup; +package org.lowcoder.api.framework.warmup; +import org.lowcoder.sdk.config.CommonConfig; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.data.mongodb.core.ReactiveMongoTemplate; import org.springframework.data.redis.core.ReactiveRedisTemplate; import org.springframework.stereotype.Component; -import com.openblocks.sdk.config.CommonConfig; - import reactor.core.publisher.Mono; @Component diff --git a/server/api-service/openblocks-server/src/main/java/com/openblocks/api/home/FolderApiService.java b/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/home/FolderApiService.java similarity index 90% rename from server/api-service/openblocks-server/src/main/java/com/openblocks/api/home/FolderApiService.java rename to server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/home/FolderApiService.java index f96e525b7..69e4517d5 100644 --- a/server/api-service/openblocks-server/src/main/java/com/openblocks/api/home/FolderApiService.java +++ b/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/home/FolderApiService.java @@ -1,11 +1,11 @@ -package com.openblocks.api.home; +package org.lowcoder.api.home; -import static com.openblocks.infra.util.MonoUtils.emptyIfNull; -import static com.openblocks.sdk.exception.BizError.FOLDER_OPERATE_NO_PERMISSION; -import static com.openblocks.sdk.exception.BizError.FOLDER_NOT_EXIST; -import static com.openblocks.sdk.exception.BizError.ILLEGAL_FOLDER_PERMISSION_ID; -import static com.openblocks.sdk.util.ExceptionUtils.ofError; import static org.apache.commons.collections4.CollectionUtils.isNotEmpty; +import static org.lowcoder.infra.util.MonoUtils.emptyIfNull; +import static org.lowcoder.sdk.exception.BizError.FOLDER_NOT_EXIST; +import static org.lowcoder.sdk.exception.BizError.FOLDER_OPERATE_NO_PERMISSION; +import static org.lowcoder.sdk.exception.BizError.ILLEGAL_FOLDER_PERMISSION_ID; +import static org.lowcoder.sdk.util.ExceptionUtils.ofError; import java.time.Instant; import java.util.ArrayList; @@ -22,40 +22,39 @@ import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang3.StringUtils; +import org.lowcoder.api.application.view.ApplicationInfoView; +import org.lowcoder.api.application.view.ApplicationPermissionView; +import org.lowcoder.api.permission.PermissionHelper; +import org.lowcoder.api.permission.view.PermissionItemView; +import org.lowcoder.api.usermanagement.OrgDevChecker; +import org.lowcoder.domain.application.model.ApplicationStatus; +import org.lowcoder.domain.application.model.ApplicationType; +import org.lowcoder.domain.folder.model.Folder; +import org.lowcoder.domain.folder.model.FolderElement; +import org.lowcoder.domain.folder.service.ElementNode; +import org.lowcoder.domain.folder.service.FolderElementRelationService; +import org.lowcoder.domain.folder.service.FolderNode; +import org.lowcoder.domain.folder.service.FolderService; +import org.lowcoder.domain.folder.service.Node; +import org.lowcoder.domain.folder.service.Tree; +import org.lowcoder.domain.group.service.GroupService; +import org.lowcoder.domain.interaction.UserFolderInteraction; +import org.lowcoder.domain.interaction.UserFolderInteractionService; +import org.lowcoder.domain.organization.model.OrgMember; +import org.lowcoder.domain.organization.model.Organization; +import org.lowcoder.domain.organization.service.OrganizationService; +import org.lowcoder.domain.permission.model.ResourceAction; +import org.lowcoder.domain.permission.model.ResourcePermission; +import org.lowcoder.domain.permission.model.ResourceRole; +import org.lowcoder.domain.permission.model.ResourceType; +import org.lowcoder.domain.permission.service.ResourcePermissionService; +import org.lowcoder.domain.user.model.User; +import org.lowcoder.domain.user.service.UserService; +import org.lowcoder.sdk.exception.BizError; +import org.lowcoder.sdk.exception.BizException; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import com.openblocks.api.application.view.ApplicationInfoView; -import com.openblocks.api.application.view.ApplicationPermissionView; -import com.openblocks.api.permission.PermissionHelper; -import com.openblocks.api.permission.view.PermissionItemView; -import com.openblocks.api.usermanagement.OrgDevChecker; -import com.openblocks.domain.application.model.ApplicationStatus; -import com.openblocks.domain.application.model.ApplicationType; -import com.openblocks.domain.folder.model.Folder; -import com.openblocks.domain.folder.model.FolderElement; -import com.openblocks.domain.folder.service.ElementNode; -import com.openblocks.domain.folder.service.FolderElementRelationService; -import com.openblocks.domain.folder.service.FolderNode; -import com.openblocks.domain.folder.service.FolderService; -import com.openblocks.domain.folder.service.Node; -import com.openblocks.domain.folder.service.Tree; -import com.openblocks.domain.group.service.GroupService; -import com.openblocks.domain.interaction.UserFolderInteraction; -import com.openblocks.domain.interaction.UserFolderInteractionService; -import com.openblocks.domain.organization.model.OrgMember; -import com.openblocks.domain.organization.model.Organization; -import com.openblocks.domain.organization.service.OrganizationService; -import com.openblocks.domain.permission.model.ResourceAction; -import com.openblocks.domain.permission.model.ResourcePermission; -import com.openblocks.domain.permission.model.ResourceRole; -import com.openblocks.domain.permission.model.ResourceType; -import com.openblocks.domain.permission.service.ResourcePermissionService; -import com.openblocks.domain.user.model.User; -import com.openblocks.domain.user.service.UserService; -import com.openblocks.sdk.exception.BizError; -import com.openblocks.sdk.exception.BizException; - import reactor.core.publisher.Flux; import reactor.core.publisher.Mono; diff --git a/server/api-service/openblocks-server/src/main/java/com/openblocks/api/home/FolderController.java b/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/home/FolderController.java similarity index 88% rename from server/api-service/openblocks-server/src/main/java/com/openblocks/api/home/FolderController.java rename to server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/home/FolderController.java index 291dc9993..201883cd5 100644 --- a/server/api-service/openblocks-server/src/main/java/com/openblocks/api/home/FolderController.java +++ b/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/home/FolderController.java @@ -1,12 +1,21 @@ -package com.openblocks.api.home; +package org.lowcoder.api.home; -import static com.openblocks.infra.event.EventType.APPLICATION_MOVE; -import static com.openblocks.sdk.exception.BizError.INVALID_PARAMETER; -import static com.openblocks.sdk.util.ExceptionUtils.ofError; +import static org.lowcoder.infra.event.EventType.APPLICATION_MOVE; +import static org.lowcoder.sdk.exception.BizError.INVALID_PARAMETER; +import static org.lowcoder.sdk.util.ExceptionUtils.ofError; import java.util.List; import java.util.Set; +import org.lowcoder.api.application.view.ApplicationPermissionView; +import org.lowcoder.api.framework.view.ResponseView; +import org.lowcoder.api.util.BusinessEventPublisher; +import org.lowcoder.domain.application.model.ApplicationType; +import org.lowcoder.domain.folder.model.Folder; +import org.lowcoder.domain.folder.service.FolderService; +import org.lowcoder.domain.permission.model.ResourceRole; +import org.lowcoder.infra.constant.NewUrl; +import org.lowcoder.infra.event.EventType; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.DeleteMapping; import org.springframework.web.bind.annotation.GetMapping; @@ -18,16 +27,6 @@ import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; -import com.openblocks.api.application.view.ApplicationPermissionView; -import com.openblocks.api.framework.view.ResponseView; -import com.openblocks.api.util.BusinessEventPublisher; -import com.openblocks.domain.application.model.ApplicationType; -import com.openblocks.domain.folder.model.Folder; -import com.openblocks.domain.folder.service.FolderService; -import com.openblocks.domain.permission.model.ResourceRole; -import com.openblocks.infra.constant.NewUrl; -import com.openblocks.infra.event.EventType; - import reactor.core.publisher.Mono; @RestController diff --git a/server/api-service/openblocks-server/src/main/java/com/openblocks/api/home/FolderInfoView.java b/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/home/FolderInfoView.java similarity index 91% rename from server/api-service/openblocks-server/src/main/java/com/openblocks/api/home/FolderInfoView.java rename to server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/home/FolderInfoView.java index 24ce5f2ef..b1abb505f 100644 --- a/server/api-service/openblocks-server/src/main/java/com/openblocks/api/home/FolderInfoView.java +++ b/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/home/FolderInfoView.java @@ -1,9 +1,9 @@ -package com.openblocks.api.home; +package org.lowcoder.api.home; import java.time.Instant; import java.util.List; -import com.openblocks.api.application.view.ApplicationInfoView; +import org.lowcoder.api.application.view.ApplicationInfoView; import lombok.Builder; import lombok.Getter; diff --git a/server/api-service/openblocks-server/src/main/java/com/openblocks/api/home/SessionUserService.java b/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/home/SessionUserService.java similarity index 76% rename from server/api-service/openblocks-server/src/main/java/com/openblocks/api/home/SessionUserService.java rename to server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/home/SessionUserService.java index 4479f8fde..ef2156617 100644 --- a/server/api-service/openblocks-server/src/main/java/com/openblocks/api/home/SessionUserService.java +++ b/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/home/SessionUserService.java @@ -1,8 +1,8 @@ -package com.openblocks.api.home; +package org.lowcoder.api.home; -import com.openblocks.domain.organization.model.OrgMember; -import com.openblocks.domain.user.model.User; -import com.openblocks.infra.annotation.NonEmptyMono; +import org.lowcoder.domain.organization.model.OrgMember; +import org.lowcoder.domain.user.model.User; +import org.lowcoder.infra.annotation.NonEmptyMono; import reactor.core.publisher.Mono; diff --git a/server/api-service/openblocks-server/src/main/java/com/openblocks/api/home/SessionUserServiceImpl.java b/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/home/SessionUserServiceImpl.java similarity index 84% rename from server/api-service/openblocks-server/src/main/java/com/openblocks/api/home/SessionUserServiceImpl.java rename to server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/home/SessionUserServiceImpl.java index 0fc49b991..8101ad491 100644 --- a/server/api-service/openblocks-server/src/main/java/com/openblocks/api/home/SessionUserServiceImpl.java +++ b/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/home/SessionUserServiceImpl.java @@ -1,28 +1,27 @@ -package com.openblocks.api.home; +package org.lowcoder.api.home; -import static com.openblocks.sdk.constants.GlobalContext.CURRENT_ORG_MEMBER; -import static com.openblocks.sdk.exception.BizError.UNABLE_TO_FIND_VALID_ORG; -import static com.openblocks.sdk.util.ExceptionUtils.deferredError; -import static com.openblocks.sdk.util.JsonUtils.fromJsonQuietly; +import static org.lowcoder.sdk.constants.GlobalContext.CURRENT_ORG_MEMBER; +import static org.lowcoder.sdk.exception.BizError.UNABLE_TO_FIND_VALID_ORG; +import static org.lowcoder.sdk.util.ExceptionUtils.deferredError; +import static org.lowcoder.sdk.util.JsonUtils.fromJsonQuietly; import java.time.Duration; import java.util.Objects; import org.apache.commons.lang3.StringUtils; +import org.lowcoder.api.usermanagement.UserApiService; +import org.lowcoder.domain.organization.model.OrgMember; +import org.lowcoder.domain.organization.service.OrgMemberService; +import org.lowcoder.domain.user.model.User; +import org.lowcoder.domain.user.model.UserState; +import org.lowcoder.domain.user.service.UserService; +import org.lowcoder.sdk.config.CommonConfig; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.data.redis.core.ReactiveRedisTemplate; import org.springframework.data.redis.core.ReactiveValueOperations; import org.springframework.security.core.context.ReactiveSecurityContextHolder; import org.springframework.stereotype.Service; -import com.openblocks.api.usermanagement.UserApiService; -import com.openblocks.domain.organization.model.OrgMember; -import com.openblocks.domain.organization.service.OrgMemberService; -import com.openblocks.domain.user.model.User; -import com.openblocks.domain.user.model.UserState; -import com.openblocks.domain.user.service.UserService; -import com.openblocks.sdk.config.CommonConfig; - import lombok.extern.slf4j.Slf4j; import reactor.core.publisher.Mono; @@ -50,7 +49,7 @@ public Mono getVisitorId() { } /** - * @see com.openblocks.api.framework.filter.GlobalContextFilter + * @see org.lowcoder.api.framework.filter.GlobalContextFilter */ @Override public Mono getVisitor() { @@ -59,7 +58,7 @@ public Mono getVisitor() { } /** - * @see com.openblocks.api.framework.filter.GlobalContextFilter + * @see org.lowcoder.api.framework.filter.GlobalContextFilter */ @SuppressWarnings("unchecked") @Override diff --git a/server/api-service/openblocks-server/src/main/java/com/openblocks/api/home/UserHomeApiService.java b/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/home/UserHomeApiService.java similarity index 65% rename from server/api-service/openblocks-server/src/main/java/com/openblocks/api/home/UserHomeApiService.java rename to server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/home/UserHomeApiService.java index 89cb44e4c..ddcfff54c 100644 --- a/server/api-service/openblocks-server/src/main/java/com/openblocks/api/home/UserHomeApiService.java +++ b/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/home/UserHomeApiService.java @@ -1,16 +1,15 @@ -package com.openblocks.api.home; +package org.lowcoder.api.home; import javax.annotation.Nullable; -import com.openblocks.api.application.view.ApplicationInfoView; -import com.openblocks.api.usermanagement.view.UserProfileView; -import com.openblocks.domain.application.model.ApplicationStatus; -import com.openblocks.domain.application.model.ApplicationType; -import com.openblocks.domain.user.model.User; - import reactor.core.publisher.Flux; import reactor.core.publisher.Mono; +import org.lowcoder.api.application.view.ApplicationInfoView; +import org.lowcoder.api.usermanagement.view.UserProfileView; +import org.lowcoder.domain.application.model.ApplicationStatus; +import org.lowcoder.domain.application.model.ApplicationType; +import org.lowcoder.domain.user.model.User; import org.springframework.web.server.ServerWebExchange; public interface UserHomeApiService { diff --git a/server/api-service/openblocks-server/src/main/java/com/openblocks/api/home/UserHomeApiServiceImpl.java b/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/home/UserHomeApiServiceImpl.java similarity index 88% rename from server/api-service/openblocks-server/src/main/java/com/openblocks/api/home/UserHomeApiServiceImpl.java rename to server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/home/UserHomeApiServiceImpl.java index 9369806e2..f08307647 100644 --- a/server/api-service/openblocks-server/src/main/java/com/openblocks/api/home/UserHomeApiServiceImpl.java +++ b/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/home/UserHomeApiServiceImpl.java @@ -1,9 +1,9 @@ -package com.openblocks.api.home; +package org.lowcoder.api.home; -import static com.openblocks.domain.permission.model.ResourceAction.READ_APPLICATIONS; -import static com.openblocks.infra.util.MonoUtils.emptyIfNull; -import static com.openblocks.sdk.util.StreamUtils.collectList; import static java.util.Objects.isNull; +import static org.lowcoder.domain.permission.model.ResourceAction.READ_APPLICATIONS; +import static org.lowcoder.infra.util.MonoUtils.emptyIfNull; +import static org.lowcoder.sdk.util.StreamUtils.collectList; import java.time.Instant; import java.util.List; @@ -16,34 +16,33 @@ import javax.annotation.Nullable; import org.apache.commons.lang3.StringUtils; +import org.lowcoder.api.application.view.ApplicationInfoView; +import org.lowcoder.api.application.view.ApplicationInfoView.ApplicationInfoViewBuilder; +import org.lowcoder.api.usermanagement.OrgDevChecker; +import org.lowcoder.api.usermanagement.view.OrgAndVisitorRoleView; +import org.lowcoder.api.usermanagement.view.UserProfileView; +import org.lowcoder.domain.application.model.Application; +import org.lowcoder.domain.application.model.ApplicationStatus; +import org.lowcoder.domain.application.model.ApplicationType; +import org.lowcoder.domain.application.service.ApplicationService; +import org.lowcoder.domain.interaction.UserApplicationInteraction; +import org.lowcoder.domain.interaction.UserApplicationInteractionService; +import org.lowcoder.domain.organization.model.OrgMember; +import org.lowcoder.domain.organization.model.Organization; +import org.lowcoder.domain.organization.service.OrgMemberService; +import org.lowcoder.domain.organization.service.OrganizationService; +import org.lowcoder.domain.permission.model.ResourcePermission; +import org.lowcoder.domain.permission.model.ResourceRole; +import org.lowcoder.domain.permission.service.ResourcePermissionService; +import org.lowcoder.domain.user.model.User; +import org.lowcoder.domain.user.model.UserStatus; +import org.lowcoder.domain.user.service.UserService; +import org.lowcoder.domain.user.service.UserStatusService; +import org.lowcoder.infra.util.NetworkUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; import org.springframework.web.server.ServerWebExchange; -import com.openblocks.api.application.view.ApplicationInfoView; -import com.openblocks.api.application.view.ApplicationInfoView.ApplicationInfoViewBuilder; -import com.openblocks.api.usermanagement.OrgDevChecker; -import com.openblocks.api.usermanagement.view.OrgAndVisitorRoleView; -import com.openblocks.api.usermanagement.view.UserProfileView; -import com.openblocks.domain.application.model.Application; -import com.openblocks.domain.application.model.ApplicationStatus; -import com.openblocks.domain.application.model.ApplicationType; -import com.openblocks.domain.application.service.ApplicationService; -import com.openblocks.domain.interaction.UserApplicationInteraction; -import com.openblocks.domain.interaction.UserApplicationInteractionService; -import com.openblocks.domain.organization.model.OrgMember; -import com.openblocks.domain.organization.model.Organization; -import com.openblocks.domain.organization.service.OrgMemberService; -import com.openblocks.domain.organization.service.OrganizationService; -import com.openblocks.domain.permission.model.ResourcePermission; -import com.openblocks.domain.permission.model.ResourceRole; -import com.openblocks.domain.permission.service.ResourcePermissionService; -import com.openblocks.domain.user.model.User; -import com.openblocks.domain.user.model.UserStatus; -import com.openblocks.domain.user.service.UserService; -import com.openblocks.domain.user.service.UserStatusService; -import com.openblocks.infra.util.NetworkUtils; - import reactor.core.publisher.Flux; import reactor.core.publisher.Mono; diff --git a/server/api-service/openblocks-server/src/main/java/com/openblocks/api/home/UserHomepageView.java b/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/home/UserHomepageView.java similarity index 83% rename from server/api-service/openblocks-server/src/main/java/com/openblocks/api/home/UserHomepageView.java rename to server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/home/UserHomepageView.java index f5b6d4ab4..2d44581ed 100644 --- a/server/api-service/openblocks-server/src/main/java/com/openblocks/api/home/UserHomepageView.java +++ b/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/home/UserHomepageView.java @@ -1,10 +1,10 @@ -package com.openblocks.api.home; +package org.lowcoder.api.home; import java.util.List; -import com.openblocks.api.application.view.ApplicationInfoView; -import com.openblocks.domain.organization.model.Organization; -import com.openblocks.domain.user.model.User; +import org.lowcoder.api.application.view.ApplicationInfoView; +import org.lowcoder.domain.organization.model.Organization; +import org.lowcoder.domain.user.model.User; public class UserHomepageView { diff --git a/server/api-service/openblocks-server/src/main/java/com/openblocks/api/material/AssetController.java b/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/material/AssetController.java similarity index 83% rename from server/api-service/openblocks-server/src/main/java/com/openblocks/api/material/AssetController.java rename to server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/material/AssetController.java index 00eff52f3..951b5e244 100644 --- a/server/api-service/openblocks-server/src/main/java/com/openblocks/api/material/AssetController.java +++ b/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/material/AssetController.java @@ -1,5 +1,8 @@ -package com.openblocks.api.material; +package org.lowcoder.api.material; +import org.lowcoder.domain.asset.service.AssetService; +import org.lowcoder.infra.constant.NewUrl; +import org.lowcoder.infra.constant.Url; import org.springframework.http.HttpHeaders; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PathVariable; @@ -7,10 +10,6 @@ import org.springframework.web.bind.annotation.RestController; import org.springframework.web.server.ServerWebExchange; -import com.openblocks.domain.asset.service.AssetService; -import com.openblocks.infra.constant.NewUrl; -import com.openblocks.infra.constant.Url; - import reactor.core.publisher.Mono; @RestController diff --git a/server/api-service/openblocks-server/src/main/java/com/openblocks/api/material/MaterialApiService.java b/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/material/MaterialApiService.java similarity index 67% rename from server/api-service/openblocks-server/src/main/java/com/openblocks/api/material/MaterialApiService.java rename to server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/material/MaterialApiService.java index 1d01ce017..f7c29842c 100644 --- a/server/api-service/openblocks-server/src/main/java/com/openblocks/api/material/MaterialApiService.java +++ b/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/material/MaterialApiService.java @@ -1,14 +1,13 @@ -package com.openblocks.api.material; +package org.lowcoder.api.material; import java.util.List; +import org.lowcoder.api.material.MaterialController.MaterialView; +import org.lowcoder.domain.material.model.MaterialMeta; +import org.lowcoder.domain.material.model.MaterialType; import org.reactivestreams.Publisher; import org.springframework.core.io.buffer.DataBuffer; -import com.openblocks.api.material.MaterialController.MaterialView; -import com.openblocks.domain.material.model.MaterialMeta; -import com.openblocks.domain.material.model.MaterialType; - import reactor.core.publisher.Mono; public interface MaterialApiService { diff --git a/server/api-service/openblocks-server/src/main/java/com/openblocks/api/material/MaterialApiServiceImpl.java b/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/material/MaterialApiServiceImpl.java similarity index 89% rename from server/api-service/openblocks-server/src/main/java/com/openblocks/api/material/MaterialApiServiceImpl.java rename to server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/material/MaterialApiServiceImpl.java index 9dcaa511e..ea40911ad 100644 --- a/server/api-service/openblocks-server/src/main/java/com/openblocks/api/material/MaterialApiServiceImpl.java +++ b/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/material/MaterialApiServiceImpl.java @@ -1,4 +1,4 @@ -package com.openblocks.api.material; +package org.lowcoder.api.material; import static org.apache.commons.io.FileUtils.ONE_GB; import static org.apache.commons.io.FileUtils.ONE_MB; @@ -9,25 +9,24 @@ import javax.annotation.PostConstruct; +import org.lowcoder.api.home.SessionUserService; +import org.lowcoder.api.material.MaterialController.MaterialView; +import org.lowcoder.api.usermanagement.OrgDevChecker; +import org.lowcoder.domain.material.model.MaterialMeta; +import org.lowcoder.domain.material.model.MaterialType; +import org.lowcoder.domain.material.repository.MaterialMateRepository; +import org.lowcoder.domain.material.service.meta.MaterialMetaService; +import org.lowcoder.domain.material.service.storage.MaterialStorageService; +import org.lowcoder.sdk.config.CommonConfig; +import org.lowcoder.sdk.config.dynamic.ConfigCenter; +import org.lowcoder.sdk.config.dynamic.ConfigInstanceHelper; +import org.lowcoder.sdk.exception.BizError; +import org.lowcoder.sdk.exception.BizException; import org.reactivestreams.Publisher; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.core.io.buffer.DataBuffer; import org.springframework.stereotype.Service; -import com.openblocks.api.home.SessionUserService; -import com.openblocks.api.material.MaterialController.MaterialView; -import com.openblocks.api.usermanagement.OrgDevChecker; -import com.openblocks.domain.material.model.MaterialMeta; -import com.openblocks.domain.material.model.MaterialType; -import com.openblocks.domain.material.repository.MaterialMateRepository; -import com.openblocks.domain.material.service.meta.MaterialMetaService; -import com.openblocks.domain.material.service.storage.MaterialStorageService; -import com.openblocks.sdk.config.CommonConfig; -import com.openblocks.sdk.config.dynamic.ConfigCenter; -import com.openblocks.sdk.config.dynamic.ConfigInstanceHelper; -import com.openblocks.sdk.exception.BizError; -import com.openblocks.sdk.exception.BizException; - import reactor.core.publisher.Mono; @Service diff --git a/server/api-service/openblocks-server/src/main/java/com/openblocks/api/material/MaterialController.java b/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/material/MaterialController.java similarity index 90% rename from server/api-service/openblocks-server/src/main/java/com/openblocks/api/material/MaterialController.java rename to server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/material/MaterialController.java index f0c220576..4d684dcbe 100644 --- a/server/api-service/openblocks-server/src/main/java/com/openblocks/api/material/MaterialController.java +++ b/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/material/MaterialController.java @@ -1,10 +1,16 @@ -package com.openblocks.api.material; +package org.lowcoder.api.material; -import static com.openblocks.infra.constant.NewUrl.MATERIAL_URL; +import static org.lowcoder.infra.constant.NewUrl.MATERIAL_URL; import java.time.Duration; import java.util.List; +import org.lowcoder.api.framework.view.ResponseView; +import org.lowcoder.domain.material.model.MaterialType; +import org.lowcoder.domain.material.service.meta.MaterialMetaService; +import org.lowcoder.sdk.exception.BizError; +import org.lowcoder.sdk.exception.BizException; +import org.lowcoder.sdk.util.MediaTypeUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.CacheControl; import org.springframework.http.ContentDisposition; @@ -19,13 +25,6 @@ import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; -import com.openblocks.api.framework.view.ResponseView; -import com.openblocks.domain.material.model.MaterialType; -import com.openblocks.domain.material.service.meta.MaterialMetaService; -import com.openblocks.sdk.exception.BizError; -import com.openblocks.sdk.exception.BizException; -import com.openblocks.sdk.util.MediaTypeUtils; - import lombok.Builder; import lombok.Data; import lombok.Getter; diff --git a/server/api-service/openblocks-server/src/main/java/com/openblocks/api/misc/JsLibraryController.java b/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/misc/JsLibraryController.java similarity index 96% rename from server/api-service/openblocks-server/src/main/java/com/openblocks/api/misc/JsLibraryController.java rename to server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/misc/JsLibraryController.java index d575b0066..a0594b505 100644 --- a/server/api-service/openblocks-server/src/main/java/com/openblocks/api/misc/JsLibraryController.java +++ b/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/misc/JsLibraryController.java @@ -1,4 +1,4 @@ -package com.openblocks.api.misc; +package org.lowcoder.api.misc; import java.io.IOException; import java.io.InputStream; @@ -19,6 +19,11 @@ import org.apache.commons.io.IOUtils; import org.apache.commons.lang3.StringUtils; import org.jetbrains.annotations.NotNull; +import org.lowcoder.api.framework.view.ResponseView; +import org.lowcoder.infra.constant.NewUrl; +import org.lowcoder.infra.localcache.ReloadableCache; +import org.lowcoder.sdk.util.JsonUtils; +import org.lowcoder.sdk.webclient.WebClientBuildHelper; import org.springframework.core.ParameterizedTypeReference; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; @@ -30,11 +35,6 @@ import com.google.common.cache.CacheBuilder; import com.google.common.cache.CacheLoader; import com.google.common.cache.LoadingCache; -import com.openblocks.api.framework.view.ResponseView; -import com.openblocks.infra.constant.NewUrl; -import com.openblocks.infra.localcache.ReloadableCache; -import com.openblocks.sdk.util.JsonUtils; -import com.openblocks.sdk.webclient.WebClientBuildHelper; import lombok.Builder; import lombok.Data; diff --git a/server/api-service/openblocks-server/src/main/java/com/openblocks/api/permission/PermissionHelper.java b/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/permission/PermissionHelper.java similarity index 83% rename from server/api-service/openblocks-server/src/main/java/com/openblocks/api/permission/PermissionHelper.java rename to server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/permission/PermissionHelper.java index 2faccd51b..e7373aae9 100644 --- a/server/api-service/openblocks-server/src/main/java/com/openblocks/api/permission/PermissionHelper.java +++ b/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/permission/PermissionHelper.java @@ -1,23 +1,22 @@ -package com.openblocks.api.permission; +package org.lowcoder.api.permission; -import static com.openblocks.api.util.ViewBuilder.multiBuild; +import static org.lowcoder.api.util.ViewBuilder.multiBuild; import java.util.List; import java.util.Locale; import javax.validation.constraints.NotEmpty; +import org.lowcoder.api.permission.view.PermissionItemView; +import org.lowcoder.domain.group.model.Group; +import org.lowcoder.domain.group.service.GroupService; +import org.lowcoder.domain.permission.model.ResourceHolder; +import org.lowcoder.domain.permission.model.ResourcePermission; +import org.lowcoder.domain.user.service.UserService; +import org.lowcoder.sdk.util.LocaleUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; -import com.openblocks.api.permission.view.PermissionItemView; -import com.openblocks.domain.group.model.Group; -import com.openblocks.domain.group.service.GroupService; -import com.openblocks.domain.permission.model.ResourceHolder; -import com.openblocks.domain.permission.model.ResourcePermission; -import com.openblocks.domain.user.service.UserService; -import com.openblocks.sdk.util.LocaleUtils; - import reactor.core.publisher.Flux; import reactor.core.publisher.Mono; diff --git a/server/api-service/openblocks-server/src/main/java/com/openblocks/api/permission/view/CommonPermissionView.java b/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/permission/view/CommonPermissionView.java similarity index 93% rename from server/api-service/openblocks-server/src/main/java/com/openblocks/api/permission/view/CommonPermissionView.java rename to server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/permission/view/CommonPermissionView.java index df71a5ed7..79c89f6d2 100644 --- a/server/api-service/openblocks-server/src/main/java/com/openblocks/api/permission/view/CommonPermissionView.java +++ b/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/permission/view/CommonPermissionView.java @@ -1,4 +1,4 @@ -package com.openblocks.api.permission.view; +package org.lowcoder.api.permission.view; import java.util.ArrayList; import java.util.List; diff --git a/server/api-service/openblocks-server/src/main/java/com/openblocks/api/permission/view/PermissionItemView.java b/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/permission/view/PermissionItemView.java similarity index 71% rename from server/api-service/openblocks-server/src/main/java/com/openblocks/api/permission/view/PermissionItemView.java rename to server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/permission/view/PermissionItemView.java index 161a1b4ee..9f7e01016 100644 --- a/server/api-service/openblocks-server/src/main/java/com/openblocks/api/permission/view/PermissionItemView.java +++ b/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/permission/view/PermissionItemView.java @@ -1,10 +1,10 @@ -package com.openblocks.api.permission.view; +package org.lowcoder.api.permission.view; + +import org.lowcoder.domain.permission.model.ResourceHolder; import lombok.Builder; import lombok.Getter; -import com.openblocks.domain.permission.model.ResourceHolder; - @Builder @Getter public class PermissionItemView { diff --git a/server/api-service/openblocks-server/src/main/java/com/openblocks/api/query/ApplicationQueryApiService.java b/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/query/ApplicationQueryApiService.java similarity index 81% rename from server/api-service/openblocks-server/src/main/java/com/openblocks/api/query/ApplicationQueryApiService.java rename to server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/query/ApplicationQueryApiService.java index 84ca10eb4..2bf1ece3a 100644 --- a/server/api-service/openblocks-server/src/main/java/com/openblocks/api/query/ApplicationQueryApiService.java +++ b/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/query/ApplicationQueryApiService.java @@ -1,10 +1,10 @@ -package com.openblocks.api.query; +package org.lowcoder.api.query; -import static com.openblocks.domain.permission.model.ResourceAction.READ_APPLICATIONS; -import static com.openblocks.sdk.exception.BizError.DATASOURCE_AND_APP_ORG_NOT_MATCH; -import static com.openblocks.sdk.exception.BizError.INVALID_PARAMETER; -import static com.openblocks.sdk.util.ExceptionUtils.deferredError; -import static com.openblocks.sdk.util.ExceptionUtils.ofError; +import static org.lowcoder.domain.permission.model.ResourceAction.READ_APPLICATIONS; +import static org.lowcoder.sdk.exception.BizError.DATASOURCE_AND_APP_ORG_NOT_MATCH; +import static org.lowcoder.sdk.exception.BizError.INVALID_PARAMETER; +import static org.lowcoder.sdk.util.ExceptionUtils.deferredError; +import static org.lowcoder.sdk.util.ExceptionUtils.ofError; import java.util.List; import java.util.stream.Collectors; @@ -13,6 +13,27 @@ import org.apache.commons.lang.ArrayUtils; import org.apache.commons.lang3.StringUtils; +import org.lowcoder.api.home.SessionUserService; +import org.lowcoder.api.query.view.QueryExecutionRequest; +import org.lowcoder.domain.application.model.Application; +import org.lowcoder.domain.application.service.ApplicationService; +import org.lowcoder.domain.datasource.model.Datasource; +import org.lowcoder.domain.datasource.service.DatasourceService; +import org.lowcoder.domain.permission.service.ResourcePermissionService; +import org.lowcoder.domain.query.model.ApplicationQuery; +import org.lowcoder.domain.query.model.BaseQuery; +import org.lowcoder.domain.query.model.LibraryQueryCombineId; +import org.lowcoder.domain.query.model.LibraryQueryRecord; +import org.lowcoder.domain.query.service.LibraryQueryRecordService; +import org.lowcoder.domain.query.service.LibraryQueryService; +import org.lowcoder.domain.query.service.QueryExecutionService; +import org.lowcoder.infra.util.TupleUtils; +import org.lowcoder.sdk.config.CommonConfig; +import org.lowcoder.sdk.exception.BizError; +import org.lowcoder.sdk.models.Property; +import org.lowcoder.sdk.models.QueryExecutionResult; +import org.lowcoder.sdk.query.QueryVisitorContext; +import org.lowcoder.sdk.util.ExceptionUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import org.springframework.http.HttpCookie; @@ -20,28 +41,6 @@ import org.springframework.util.MultiValueMap; import org.springframework.web.server.ServerWebExchange; -import com.openblocks.api.home.SessionUserService; -import com.openblocks.api.query.view.QueryExecutionRequest; -import com.openblocks.domain.application.model.Application; -import com.openblocks.domain.application.service.ApplicationService; -import com.openblocks.domain.datasource.model.Datasource; -import com.openblocks.domain.datasource.service.DatasourceService; -import com.openblocks.domain.permission.service.ResourcePermissionService; -import com.openblocks.domain.query.model.ApplicationQuery; -import com.openblocks.domain.query.model.BaseQuery; -import com.openblocks.domain.query.model.LibraryQueryCombineId; -import com.openblocks.domain.query.model.LibraryQueryRecord; -import com.openblocks.domain.query.service.LibraryQueryRecordService; -import com.openblocks.domain.query.service.LibraryQueryService; -import com.openblocks.domain.query.service.QueryExecutionService; -import com.openblocks.infra.util.TupleUtils; -import com.openblocks.sdk.config.CommonConfig; -import com.openblocks.sdk.exception.BizError; -import com.openblocks.sdk.models.Property; -import com.openblocks.sdk.models.QueryExecutionResult; -import com.openblocks.sdk.query.QueryVisitorContext; -import com.openblocks.sdk.util.ExceptionUtils; - import reactor.core.publisher.Mono; import reactor.core.publisher.Timed; @@ -125,7 +124,7 @@ public Mono executeApplicationQuery(ServerWebExchange exch } private boolean shouldCheckDatasourceOrgMatch(Datasource datasource) { - return !datasource.isSystemStatic() && !datasource.isLegacyQuickRestApi() && !datasource.isLegacyOpenblocksApi(); + return !datasource.isSystemStatic() && !datasource.isLegacyQuickRestApi() && !datasource.isLegacyLowcoderApi(); } protected Mono checkExecutePermission(String userId, String[] path, String appId, boolean viewMode) { diff --git a/server/api-service/openblocks-server/src/main/java/com/openblocks/api/query/LibraryQueryApiService.java b/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/query/LibraryQueryApiService.java similarity index 87% rename from server/api-service/openblocks-server/src/main/java/com/openblocks/api/query/LibraryQueryApiService.java rename to server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/query/LibraryQueryApiService.java index 6375b75f2..52768afbf 100644 --- a/server/api-service/openblocks-server/src/main/java/com/openblocks/api/query/LibraryQueryApiService.java +++ b/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/query/LibraryQueryApiService.java @@ -1,10 +1,10 @@ -package com.openblocks.api.query; +package org.lowcoder.api.query; -import static com.openblocks.domain.organization.model.OrgMember.NOT_EXIST; -import static com.openblocks.sdk.exception.BizError.LIBRARY_QUERY_AND_ORG_NOT_MATCH; -import static com.openblocks.sdk.util.ExceptionUtils.deferredError; -import static com.openblocks.sdk.util.ExceptionUtils.ofError; import static org.apache.commons.lang3.StringUtils.firstNonBlank; +import static org.lowcoder.domain.organization.model.OrgMember.NOT_EXIST; +import static org.lowcoder.sdk.exception.BizError.LIBRARY_QUERY_AND_ORG_NOT_MATCH; +import static org.lowcoder.sdk.util.ExceptionUtils.deferredError; +import static org.lowcoder.sdk.util.ExceptionUtils.ofError; import java.util.HashSet; import java.util.List; @@ -12,6 +12,37 @@ import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang3.StringUtils; +import org.lowcoder.api.home.SessionUserService; +import org.lowcoder.api.query.view.LibraryQueryAggregateView; +import org.lowcoder.api.query.view.LibraryQueryPublishRequest; +import org.lowcoder.api.query.view.LibraryQueryRecordMetaView; +import org.lowcoder.api.query.view.LibraryQueryRequestFromJs; +import org.lowcoder.api.query.view.LibraryQueryView; +import org.lowcoder.api.query.view.QueryExecutionRequest; +import org.lowcoder.api.query.view.UpsertLibraryQueryRequest; +import org.lowcoder.api.usermanagement.OrgDevChecker; +import org.lowcoder.api.util.BusinessEventPublisher; +import org.lowcoder.api.util.ViewBuilder; +import org.lowcoder.domain.datasource.model.Datasource; +import org.lowcoder.domain.datasource.service.DatasourceService; +import org.lowcoder.domain.organization.model.OrgMember; +import org.lowcoder.domain.permission.model.ResourceAction; +import org.lowcoder.domain.permission.service.ResourcePermissionService; +import org.lowcoder.domain.query.model.BaseQuery; +import org.lowcoder.domain.query.model.LibraryQuery; +import org.lowcoder.domain.query.model.LibraryQueryCombineId; +import org.lowcoder.domain.query.model.LibraryQueryRecord; +import org.lowcoder.domain.query.service.LibraryQueryRecordService; +import org.lowcoder.domain.query.service.LibraryQueryService; +import org.lowcoder.domain.query.service.QueryExecutionService; +import org.lowcoder.domain.user.model.User; +import org.lowcoder.domain.user.service.UserService; +import org.lowcoder.sdk.config.CommonConfig; +import org.lowcoder.sdk.exception.BizError; +import org.lowcoder.sdk.exception.PluginCommonError; +import org.lowcoder.sdk.models.Property; +import org.lowcoder.sdk.models.QueryExecutionResult; +import org.lowcoder.sdk.query.QueryVisitorContext; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import org.springframework.http.HttpCookie; @@ -19,38 +50,6 @@ import org.springframework.util.MultiValueMap; import org.springframework.web.server.ServerWebExchange; -import com.openblocks.api.home.SessionUserService; -import com.openblocks.api.query.view.LibraryQueryAggregateView; -import com.openblocks.api.query.view.LibraryQueryPublishRequest; -import com.openblocks.api.query.view.LibraryQueryRecordMetaView; -import com.openblocks.api.query.view.LibraryQueryRequestFromJs; -import com.openblocks.api.query.view.LibraryQueryView; -import com.openblocks.api.query.view.QueryExecutionRequest; -import com.openblocks.api.query.view.UpsertLibraryQueryRequest; -import com.openblocks.api.usermanagement.OrgDevChecker; -import com.openblocks.api.util.BusinessEventPublisher; -import com.openblocks.api.util.ViewBuilder; -import com.openblocks.domain.datasource.model.Datasource; -import com.openblocks.domain.datasource.service.DatasourceService; -import com.openblocks.domain.organization.model.OrgMember; -import com.openblocks.domain.permission.model.ResourceAction; -import com.openblocks.domain.permission.service.ResourcePermissionService; -import com.openblocks.domain.query.model.BaseQuery; -import com.openblocks.domain.query.model.LibraryQuery; -import com.openblocks.domain.query.model.LibraryQueryCombineId; -import com.openblocks.domain.query.model.LibraryQueryRecord; -import com.openblocks.domain.query.service.LibraryQueryRecordService; -import com.openblocks.domain.query.service.LibraryQueryService; -import com.openblocks.domain.query.service.QueryExecutionService; -import com.openblocks.domain.user.model.User; -import com.openblocks.domain.user.service.UserService; -import com.openblocks.sdk.config.CommonConfig; -import com.openblocks.sdk.exception.BizError; -import com.openblocks.sdk.exception.PluginCommonError; -import com.openblocks.sdk.models.Property; -import com.openblocks.sdk.models.QueryExecutionResult; -import com.openblocks.sdk.query.QueryVisitorContext; - import reactor.core.publisher.Flux; import reactor.core.publisher.Mono; import reactor.core.publisher.Timed; diff --git a/server/api-service/openblocks-server/src/main/java/com/openblocks/api/query/LibraryQueryController.java b/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/query/LibraryQueryController.java similarity index 82% rename from server/api-service/openblocks-server/src/main/java/com/openblocks/api/query/LibraryQueryController.java rename to server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/query/LibraryQueryController.java index cc61cf717..59beb6f16 100644 --- a/server/api-service/openblocks-server/src/main/java/com/openblocks/api/query/LibraryQueryController.java +++ b/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/query/LibraryQueryController.java @@ -1,9 +1,19 @@ -package com.openblocks.api.query; +package org.lowcoder.api.query; -import static com.openblocks.infra.constant.NewUrl.LIBRARY_QUERY_URL; +import static org.lowcoder.infra.constant.NewUrl.LIBRARY_QUERY_URL; import java.util.List; +import org.lowcoder.api.framework.view.ResponseView; +import org.lowcoder.api.query.view.LibraryQueryAggregateView; +import org.lowcoder.api.query.view.LibraryQueryPublishRequest; +import org.lowcoder.api.query.view.LibraryQueryRecordMetaView; +import org.lowcoder.api.query.view.LibraryQueryView; +import org.lowcoder.api.query.view.UpsertLibraryQueryRequest; +import org.lowcoder.api.util.BusinessEventPublisher; +import org.lowcoder.domain.query.model.LibraryQuery; +import org.lowcoder.domain.query.service.LibraryQueryService; +import org.lowcoder.infra.event.EventType; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.DeleteMapping; import org.springframework.web.bind.annotation.GetMapping; @@ -14,17 +24,6 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; -import com.openblocks.api.framework.view.ResponseView; -import com.openblocks.api.query.view.LibraryQueryAggregateView; -import com.openblocks.api.query.view.LibraryQueryPublishRequest; -import com.openblocks.api.query.view.LibraryQueryRecordMetaView; -import com.openblocks.api.query.view.LibraryQueryView; -import com.openblocks.api.query.view.UpsertLibraryQueryRequest; -import com.openblocks.api.util.BusinessEventPublisher; -import com.openblocks.domain.query.model.LibraryQuery; -import com.openblocks.domain.query.service.LibraryQueryService; -import com.openblocks.infra.event.EventType; - import reactor.core.publisher.Mono; @RestController diff --git a/server/api-service/openblocks-server/src/main/java/com/openblocks/api/query/LibraryQueryRecordApiService.java b/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/query/LibraryQueryRecordApiService.java similarity index 82% rename from server/api-service/openblocks-server/src/main/java/com/openblocks/api/query/LibraryQueryRecordApiService.java rename to server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/query/LibraryQueryRecordApiService.java index 1e3d8a5cc..eeea0b7a2 100644 --- a/server/api-service/openblocks-server/src/main/java/com/openblocks/api/query/LibraryQueryRecordApiService.java +++ b/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/query/LibraryQueryRecordApiService.java @@ -1,26 +1,25 @@ -package com.openblocks.api.query; +package org.lowcoder.api.query; -import static com.openblocks.api.util.ViewBuilder.multiBuild; -import static com.openblocks.sdk.exception.BizError.LIBRARY_QUERY_AND_ORG_NOT_MATCH; -import static com.openblocks.sdk.util.ExceptionUtils.ofError; +import static org.lowcoder.api.util.ViewBuilder.multiBuild; +import static org.lowcoder.sdk.exception.BizError.LIBRARY_QUERY_AND_ORG_NOT_MATCH; +import static org.lowcoder.sdk.util.ExceptionUtils.ofError; import java.util.List; import java.util.Map; +import org.lowcoder.api.home.SessionUserService; +import org.lowcoder.api.query.view.LibraryQueryRecordMetaView; +import org.lowcoder.api.usermanagement.OrgDevChecker; +import org.lowcoder.domain.organization.model.OrgMember; +import org.lowcoder.domain.query.model.LibraryQuery; +import org.lowcoder.domain.query.model.LibraryQueryCombineId; +import org.lowcoder.domain.query.model.LibraryQueryRecord; +import org.lowcoder.domain.query.service.LibraryQueryRecordService; +import org.lowcoder.domain.query.service.LibraryQueryService; +import org.lowcoder.domain.user.service.UserService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import com.openblocks.api.home.SessionUserService; -import com.openblocks.api.query.view.LibraryQueryRecordMetaView; -import com.openblocks.api.usermanagement.OrgDevChecker; -import com.openblocks.domain.organization.model.OrgMember; -import com.openblocks.domain.query.model.LibraryQuery; -import com.openblocks.domain.query.model.LibraryQueryCombineId; -import com.openblocks.domain.query.model.LibraryQueryRecord; -import com.openblocks.domain.query.service.LibraryQueryRecordService; -import com.openblocks.domain.query.service.LibraryQueryService; -import com.openblocks.domain.user.service.UserService; - import reactor.core.publisher.Mono; @Service diff --git a/server/api-service/openblocks-server/src/main/java/com/openblocks/api/query/LibraryQueryRecordController.java b/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/query/LibraryQueryRecordController.java similarity index 85% rename from server/api-service/openblocks-server/src/main/java/com/openblocks/api/query/LibraryQueryRecordController.java rename to server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/query/LibraryQueryRecordController.java index 9e736be24..efe906b32 100644 --- a/server/api-service/openblocks-server/src/main/java/com/openblocks/api/query/LibraryQueryRecordController.java +++ b/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/query/LibraryQueryRecordController.java @@ -1,10 +1,13 @@ -package com.openblocks.api.query; +package org.lowcoder.api.query; -import static com.openblocks.infra.constant.NewUrl.LIBRARY_QUERY_RECORD_URL; +import static org.lowcoder.infra.constant.NewUrl.LIBRARY_QUERY_RECORD_URL; import java.util.List; import java.util.Map; +import org.lowcoder.api.framework.view.ResponseView; +import org.lowcoder.api.query.view.LibraryQueryRecordMetaView; +import org.lowcoder.domain.query.model.LibraryQueryCombineId; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.DeleteMapping; import org.springframework.web.bind.annotation.GetMapping; @@ -13,10 +16,6 @@ import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; -import com.openblocks.api.framework.view.ResponseView; -import com.openblocks.api.query.view.LibraryQueryRecordMetaView; -import com.openblocks.domain.query.model.LibraryQueryCombineId; - import reactor.core.publisher.Mono; @RestController diff --git a/server/api-service/openblocks-server/src/main/java/com/openblocks/api/query/QueryController.java b/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/query/QueryController.java similarity index 80% rename from server/api-service/openblocks-server/src/main/java/com/openblocks/api/query/QueryController.java rename to server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/query/QueryController.java index cb14d098c..fbcaf00be 100644 --- a/server/api-service/openblocks-server/src/main/java/com/openblocks/api/query/QueryController.java +++ b/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/query/QueryController.java @@ -1,10 +1,22 @@ -package com.openblocks.api.query; +package org.lowcoder.api.query; -import static com.openblocks.sdk.constants.GlobalContext.CLIENT_IP; -import static com.openblocks.sdk.util.ExceptionUtils.ofError; +import static org.lowcoder.sdk.constants.GlobalContext.CLIENT_IP; +import static org.lowcoder.sdk.util.ExceptionUtils.ofError; import java.util.Locale; +import org.lowcoder.api.home.SessionUserService; +import org.lowcoder.api.query.view.LibraryQueryRequestFromJs; +import org.lowcoder.api.query.view.QueryExecutionRequest; +import org.lowcoder.api.query.view.QueryResultView; +import org.lowcoder.api.util.BusinessEventPublisher; +import org.lowcoder.infra.constant.NewUrl; +import org.lowcoder.infra.constant.Url; +import org.lowcoder.sdk.exception.BizError; +import org.lowcoder.sdk.exception.BizException; +import org.lowcoder.sdk.models.QueryExecutionResult; +import org.lowcoder.sdk.util.CookieHelper; +import org.lowcoder.sdk.util.LocaleUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; @@ -12,19 +24,6 @@ import org.springframework.web.bind.annotation.RestController; import org.springframework.web.server.ServerWebExchange; -import com.openblocks.api.home.SessionUserService; -import com.openblocks.api.query.view.LibraryQueryRequestFromJs; -import com.openblocks.api.query.view.QueryExecutionRequest; -import com.openblocks.api.query.view.QueryResultView; -import com.openblocks.api.util.BusinessEventPublisher; -import com.openblocks.infra.constant.NewUrl; -import com.openblocks.infra.constant.Url; -import com.openblocks.sdk.exception.BizError; -import com.openblocks.sdk.exception.BizException; -import com.openblocks.sdk.models.QueryExecutionResult; -import com.openblocks.sdk.util.CookieHelper; -import com.openblocks.sdk.util.LocaleUtils; - import lombok.extern.slf4j.Slf4j; import reactor.core.publisher.Mono; diff --git a/server/api-service/openblocks-server/src/main/java/com/openblocks/api/query/view/LibraryQueryAggregateView.java b/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/query/view/LibraryQueryAggregateView.java similarity index 85% rename from server/api-service/openblocks-server/src/main/java/com/openblocks/api/query/view/LibraryQueryAggregateView.java rename to server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/query/view/LibraryQueryAggregateView.java index d92208f1a..b9518e576 100644 --- a/server/api-service/openblocks-server/src/main/java/com/openblocks/api/query/view/LibraryQueryAggregateView.java +++ b/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/query/view/LibraryQueryAggregateView.java @@ -1,11 +1,12 @@ -package com.openblocks.api.query.view; +package org.lowcoder.api.query.view; import java.util.List; +import org.lowcoder.domain.query.model.LibraryQuery; +import org.lowcoder.domain.query.model.LibraryQueryRecord; +import org.lowcoder.domain.user.model.User; + import com.fasterxml.jackson.annotation.JsonInclude; -import com.openblocks.domain.query.model.LibraryQuery; -import com.openblocks.domain.query.model.LibraryQueryRecord; -import com.openblocks.domain.user.model.User; @JsonInclude(JsonInclude.Include.NON_NULL) public record LibraryQueryAggregateView(LibraryQueryMetaView libraryQueryMetaView, diff --git a/server/api-service/openblocks-server/src/main/java/com/openblocks/api/query/view/LibraryQueryMetaView.java b/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/query/view/LibraryQueryMetaView.java similarity index 83% rename from server/api-service/openblocks-server/src/main/java/com/openblocks/api/query/view/LibraryQueryMetaView.java rename to server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/query/view/LibraryQueryMetaView.java index e575160bc..be046148d 100644 --- a/server/api-service/openblocks-server/src/main/java/com/openblocks/api/query/view/LibraryQueryMetaView.java +++ b/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/query/view/LibraryQueryMetaView.java @@ -1,7 +1,7 @@ -package com.openblocks.api.query.view; +package org.lowcoder.api.query.view; -import com.openblocks.domain.query.model.LibraryQuery; -import com.openblocks.domain.user.model.User; +import org.lowcoder.domain.query.model.LibraryQuery; +import org.lowcoder.domain.user.model.User; public record LibraryQueryMetaView(String id, String datasourceType, diff --git a/server/api-service/openblocks-server/src/main/java/com/openblocks/api/query/view/LibraryQueryPublishRequest.java b/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/query/view/LibraryQueryPublishRequest.java similarity index 67% rename from server/api-service/openblocks-server/src/main/java/com/openblocks/api/query/view/LibraryQueryPublishRequest.java rename to server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/query/view/LibraryQueryPublishRequest.java index 4a4fa620f..819c69839 100644 --- a/server/api-service/openblocks-server/src/main/java/com/openblocks/api/query/view/LibraryQueryPublishRequest.java +++ b/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/query/view/LibraryQueryPublishRequest.java @@ -1,4 +1,4 @@ -package com.openblocks.api.query.view; +package org.lowcoder.api.query.view; public record LibraryQueryPublishRequest(String commitMessage, String tag) { diff --git a/server/api-service/openblocks-server/src/main/java/com/openblocks/api/query/view/LibraryQueryRecordMetaView.java b/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/query/view/LibraryQueryRecordMetaView.java similarity index 90% rename from server/api-service/openblocks-server/src/main/java/com/openblocks/api/query/view/LibraryQueryRecordMetaView.java rename to server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/query/view/LibraryQueryRecordMetaView.java index 6ae4e9042..05914c5d2 100644 --- a/server/api-service/openblocks-server/src/main/java/com/openblocks/api/query/view/LibraryQueryRecordMetaView.java +++ b/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/query/view/LibraryQueryRecordMetaView.java @@ -1,7 +1,7 @@ -package com.openblocks.api.query.view; +package org.lowcoder.api.query.view; -import com.openblocks.domain.query.model.LibraryQueryRecord; -import com.openblocks.domain.user.model.User; +import org.lowcoder.domain.query.model.LibraryQueryRecord; +import org.lowcoder.domain.user.model.User; public record LibraryQueryRecordMetaView(String id, String libraryQueryId, diff --git a/server/api-service/openblocks-server/src/main/java/com/openblocks/api/query/view/LibraryQueryRequestFromJs.java b/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/query/view/LibraryQueryRequestFromJs.java similarity index 81% rename from server/api-service/openblocks-server/src/main/java/com/openblocks/api/query/view/LibraryQueryRequestFromJs.java rename to server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/query/view/LibraryQueryRequestFromJs.java index 7cdc238de..8d518f6b1 100644 --- a/server/api-service/openblocks-server/src/main/java/com/openblocks/api/query/view/LibraryQueryRequestFromJs.java +++ b/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/query/view/LibraryQueryRequestFromJs.java @@ -1,14 +1,13 @@ -package com.openblocks.api.query.view; +package org.lowcoder.api.query.view; -import static com.openblocks.sdk.util.StreamUtils.toMapNullFriendly; import static org.apache.commons.collections4.ListUtils.emptyIfNull; +import static org.lowcoder.sdk.util.StreamUtils.toMapNullFriendly; import java.util.List; import java.util.Map; import org.apache.commons.lang3.StringUtils; - -import com.openblocks.sdk.models.Param; +import org.lowcoder.sdk.models.Param; import lombok.Getter; import lombok.Setter; diff --git a/server/api-service/openblocks-server/src/main/java/com/openblocks/api/query/view/LibraryQueryView.java b/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/query/view/LibraryQueryView.java similarity index 83% rename from server/api-service/openblocks-server/src/main/java/com/openblocks/api/query/view/LibraryQueryView.java rename to server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/query/view/LibraryQueryView.java index 429cca8bf..25332b6a7 100644 --- a/server/api-service/openblocks-server/src/main/java/com/openblocks/api/query/view/LibraryQueryView.java +++ b/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/query/view/LibraryQueryView.java @@ -1,9 +1,9 @@ -package com.openblocks.api.query.view; +package org.lowcoder.api.query.view; import java.util.Map; -import com.openblocks.domain.query.model.LibraryQuery; -import com.openblocks.domain.user.model.User; +import org.lowcoder.domain.query.model.LibraryQuery; +import org.lowcoder.domain.user.model.User; public record LibraryQueryView(String id, String organizationId, diff --git a/server/api-service/openblocks-server/src/main/java/com/openblocks/api/query/view/QueryExecutionRequest.java b/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/query/view/QueryExecutionRequest.java similarity index 85% rename from server/api-service/openblocks-server/src/main/java/com/openblocks/api/query/view/QueryExecutionRequest.java rename to server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/query/view/QueryExecutionRequest.java index 43d2c4164..44cd2feb8 100644 --- a/server/api-service/openblocks-server/src/main/java/com/openblocks/api/query/view/QueryExecutionRequest.java +++ b/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/query/view/QueryExecutionRequest.java @@ -1,15 +1,14 @@ -package com.openblocks.api.query.view; +package org.lowcoder.api.query.view; -import static com.openblocks.sdk.util.StreamUtils.toMapNullFriendly; import static org.apache.commons.collections4.ListUtils.emptyIfNull; +import static org.lowcoder.sdk.util.StreamUtils.toMapNullFriendly; import java.util.List; import java.util.Map; import org.apache.commons.lang3.StringUtils; - -import com.openblocks.domain.query.model.LibraryQueryCombineId; -import com.openblocks.sdk.models.Param; +import org.lowcoder.domain.query.model.LibraryQueryCombineId; +import org.lowcoder.sdk.models.Param; import lombok.Setter; diff --git a/server/api-service/openblocks-server/src/main/java/com/openblocks/api/query/view/QueryResultView.java b/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/query/view/QueryResultView.java similarity index 90% rename from server/api-service/openblocks-server/src/main/java/com/openblocks/api/query/view/QueryResultView.java rename to server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/query/view/QueryResultView.java index bab7221e6..732a7adea 100644 --- a/server/api-service/openblocks-server/src/main/java/com/openblocks/api/query/view/QueryResultView.java +++ b/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/query/view/QueryResultView.java @@ -1,11 +1,12 @@ -package com.openblocks.api.query.view; +package org.lowcoder.api.query.view; import java.util.Collection; import java.util.Locale; +import org.lowcoder.sdk.models.QueryExecutionResult; +import org.lowcoder.sdk.util.LocaleUtils; + import com.fasterxml.jackson.databind.JsonNode; -import com.openblocks.sdk.models.QueryExecutionResult; -import com.openblocks.sdk.util.LocaleUtils; public class QueryResultView { diff --git a/server/api-service/openblocks-server/src/main/java/com/openblocks/api/query/view/UpsertLibraryQueryRequest.java b/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/query/view/UpsertLibraryQueryRequest.java similarity index 83% rename from server/api-service/openblocks-server/src/main/java/com/openblocks/api/query/view/UpsertLibraryQueryRequest.java rename to server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/query/view/UpsertLibraryQueryRequest.java index 8480e8028..f685439a0 100644 --- a/server/api-service/openblocks-server/src/main/java/com/openblocks/api/query/view/UpsertLibraryQueryRequest.java +++ b/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/query/view/UpsertLibraryQueryRequest.java @@ -1,4 +1,4 @@ -package com.openblocks.api.query.view; +package org.lowcoder.api.query.view; import java.util.Map; diff --git a/server/api-service/openblocks-server/src/main/java/com/openblocks/api/usermanagement/GroupApiService.java b/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/usermanagement/GroupApiService.java similarity index 87% rename from server/api-service/openblocks-server/src/main/java/com/openblocks/api/usermanagement/GroupApiService.java rename to server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/usermanagement/GroupApiService.java index 8e9f350a4..c25c78cd4 100644 --- a/server/api-service/openblocks-server/src/main/java/com/openblocks/api/usermanagement/GroupApiService.java +++ b/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/usermanagement/GroupApiService.java @@ -1,40 +1,39 @@ -package com.openblocks.api.usermanagement; - -import static com.openblocks.sdk.exception.BizError.CANNOT_LEAVE_GROUP; -import static com.openblocks.sdk.exception.BizError.CANNOT_REMOVE_MYSELF; -import static com.openblocks.sdk.exception.BizError.INVALID_GROUP_ID; -import static com.openblocks.sdk.util.ExceptionUtils.deferredError; -import static com.openblocks.sdk.util.ExceptionUtils.ofError; -import static com.openblocks.sdk.util.StreamUtils.collectList; -import static com.openblocks.sdk.util.StreamUtils.collectMap; +package org.lowcoder.api.usermanagement; + import static java.util.Collections.emptyList; +import static org.lowcoder.sdk.exception.BizError.CANNOT_LEAVE_GROUP; +import static org.lowcoder.sdk.exception.BizError.CANNOT_REMOVE_MYSELF; +import static org.lowcoder.sdk.exception.BizError.INVALID_GROUP_ID; +import static org.lowcoder.sdk.util.ExceptionUtils.deferredError; +import static org.lowcoder.sdk.util.ExceptionUtils.ofError; +import static org.lowcoder.sdk.util.StreamUtils.collectList; +import static org.lowcoder.sdk.util.StreamUtils.collectMap; import java.util.List; import java.util.Map; import java.util.Objects; +import org.lowcoder.api.bizthreshold.AbstractBizThresholdChecker; +import org.lowcoder.api.home.SessionUserService; +import org.lowcoder.api.usermanagement.view.CreateGroupRequest; +import org.lowcoder.api.usermanagement.view.GroupMemberAggregateView; +import org.lowcoder.api.usermanagement.view.GroupMemberView; +import org.lowcoder.api.usermanagement.view.GroupView; +import org.lowcoder.api.usermanagement.view.UpdateGroupRequest; +import org.lowcoder.api.usermanagement.view.UpdateRoleRequest; +import org.lowcoder.domain.group.model.Group; +import org.lowcoder.domain.group.model.GroupMember; +import org.lowcoder.domain.group.service.GroupMemberService; +import org.lowcoder.domain.group.service.GroupService; +import org.lowcoder.domain.organization.model.MemberRole; +import org.lowcoder.domain.organization.model.OrgMember; +import org.lowcoder.domain.user.model.User; +import org.lowcoder.domain.user.service.UserService; +import org.lowcoder.infra.util.TupleUtils; +import org.lowcoder.sdk.exception.BizError; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import com.openblocks.api.home.SessionUserService; -import com.openblocks.api.usermanagement.view.CreateGroupRequest; -import com.openblocks.api.usermanagement.view.GroupMemberAggregateView; -import com.openblocks.api.usermanagement.view.GroupMemberView; -import com.openblocks.api.usermanagement.view.GroupView; -import com.openblocks.api.usermanagement.view.UpdateGroupRequest; -import com.openblocks.api.usermanagement.view.UpdateRoleRequest; -import com.openblocks.api.bizthreshold.AbstractBizThresholdChecker; -import com.openblocks.domain.group.model.Group; -import com.openblocks.domain.group.model.GroupMember; -import com.openblocks.domain.group.service.GroupMemberService; -import com.openblocks.domain.group.service.GroupService; -import com.openblocks.domain.organization.model.MemberRole; -import com.openblocks.domain.organization.model.OrgMember; -import com.openblocks.domain.user.model.User; -import com.openblocks.domain.user.service.UserService; -import com.openblocks.infra.util.TupleUtils; -import com.openblocks.sdk.exception.BizError; - import reactor.core.publisher.Mono; import reactor.util.function.Tuple2; diff --git a/server/api-service/openblocks-server/src/main/java/com/openblocks/api/usermanagement/GroupController.java b/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/usermanagement/GroupController.java similarity index 86% rename from server/api-service/openblocks-server/src/main/java/com/openblocks/api/usermanagement/GroupController.java rename to server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/usermanagement/GroupController.java index 958f81a3a..a07669daf 100644 --- a/server/api-service/openblocks-server/src/main/java/com/openblocks/api/usermanagement/GroupController.java +++ b/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/usermanagement/GroupController.java @@ -1,12 +1,27 @@ -package com.openblocks.api.usermanagement; +package org.lowcoder.api.usermanagement; -import static com.openblocks.sdk.util.ExceptionUtils.ofError; +import static org.lowcoder.sdk.util.ExceptionUtils.ofError; import java.util.List; import javax.validation.Valid; import org.apache.commons.lang3.StringUtils; +import org.lowcoder.api.framework.view.ResponseView; +import org.lowcoder.api.home.SessionUserService; +import org.lowcoder.api.usermanagement.view.AddMemberRequest; +import org.lowcoder.api.usermanagement.view.CreateGroupRequest; +import org.lowcoder.api.usermanagement.view.GroupMemberAggregateView; +import org.lowcoder.api.usermanagement.view.GroupView; +import org.lowcoder.api.usermanagement.view.UpdateGroupRequest; +import org.lowcoder.api.usermanagement.view.UpdateRoleRequest; +import org.lowcoder.api.util.BusinessEventPublisher; +import org.lowcoder.domain.group.service.GroupMemberService; +import org.lowcoder.domain.group.service.GroupService; +import org.lowcoder.domain.organization.model.MemberRole; +import org.lowcoder.infra.constant.NewUrl; +import org.lowcoder.infra.constant.Url; +import org.lowcoder.sdk.exception.BizError; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.DeleteMapping; import org.springframework.web.bind.annotation.GetMapping; @@ -18,22 +33,6 @@ import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; -import com.openblocks.api.framework.view.ResponseView; -import com.openblocks.api.home.SessionUserService; -import com.openblocks.api.usermanagement.view.AddMemberRequest; -import com.openblocks.api.usermanagement.view.CreateGroupRequest; -import com.openblocks.api.usermanagement.view.GroupMemberAggregateView; -import com.openblocks.api.usermanagement.view.GroupView; -import com.openblocks.api.usermanagement.view.UpdateGroupRequest; -import com.openblocks.api.usermanagement.view.UpdateRoleRequest; -import com.openblocks.api.util.BusinessEventPublisher; -import com.openblocks.domain.group.service.GroupMemberService; -import com.openblocks.domain.group.service.GroupService; -import com.openblocks.domain.organization.model.MemberRole; -import com.openblocks.infra.constant.NewUrl; -import com.openblocks.infra.constant.Url; -import com.openblocks.sdk.exception.BizError; - import lombok.extern.slf4j.Slf4j; import reactor.core.publisher.Mono; import reactor.util.function.Tuple2; diff --git a/server/api-service/openblocks-server/src/main/java/com/openblocks/api/usermanagement/InvitationApiService.java b/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/usermanagement/InvitationApiService.java similarity index 81% rename from server/api-service/openblocks-server/src/main/java/com/openblocks/api/usermanagement/InvitationApiService.java rename to server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/usermanagement/InvitationApiService.java index df8b9fa93..0f2773707 100644 --- a/server/api-service/openblocks-server/src/main/java/com/openblocks/api/usermanagement/InvitationApiService.java +++ b/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/usermanagement/InvitationApiService.java @@ -1,28 +1,27 @@ -package com.openblocks.api.usermanagement; +package org.lowcoder.api.usermanagement; -import static com.openblocks.sdk.exception.BizError.INVITED_ORG_DELETED; -import static com.openblocks.sdk.exception.BizError.INVITER_NOT_FOUND; -import static com.openblocks.sdk.util.ExceptionUtils.deferredError; -import static com.openblocks.sdk.util.ExceptionUtils.ofException; +import static org.lowcoder.sdk.exception.BizError.INVITED_ORG_DELETED; +import static org.lowcoder.sdk.exception.BizError.INVITER_NOT_FOUND; +import static org.lowcoder.sdk.util.ExceptionUtils.deferredError; +import static org.lowcoder.sdk.util.ExceptionUtils.ofException; import javax.annotation.Nonnull; +import org.lowcoder.api.bizthreshold.AbstractBizThresholdChecker; +import org.lowcoder.api.home.SessionUserService; +import org.lowcoder.api.usermanagement.view.InvitationVO; +import org.lowcoder.domain.invitation.model.Invitation; +import org.lowcoder.domain.invitation.service.InvitationService; +import org.lowcoder.domain.organization.model.Organization; +import org.lowcoder.domain.organization.service.OrgMemberService; +import org.lowcoder.domain.organization.service.OrganizationService; +import org.lowcoder.domain.user.model.User; +import org.lowcoder.domain.user.service.UserService; +import org.lowcoder.sdk.exception.BizError; +import org.lowcoder.sdk.exception.BizException; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import com.openblocks.api.home.SessionUserService; -import com.openblocks.api.usermanagement.view.InvitationVO; -import com.openblocks.api.bizthreshold.AbstractBizThresholdChecker; -import com.openblocks.domain.invitation.model.Invitation; -import com.openblocks.domain.invitation.service.InvitationService; -import com.openblocks.domain.organization.model.Organization; -import com.openblocks.domain.organization.service.OrgMemberService; -import com.openblocks.domain.organization.service.OrganizationService; -import com.openblocks.domain.user.model.User; -import com.openblocks.domain.user.service.UserService; -import com.openblocks.sdk.exception.BizError; -import com.openblocks.sdk.exception.BizException; - import reactor.core.publisher.Mono; @Service diff --git a/server/api-service/openblocks-server/src/main/java/com/openblocks/api/usermanagement/InvitationController.java b/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/usermanagement/InvitationController.java similarity index 81% rename from server/api-service/openblocks-server/src/main/java/com/openblocks/api/usermanagement/InvitationController.java rename to server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/usermanagement/InvitationController.java index addcb857a..6c54d200c 100644 --- a/server/api-service/openblocks-server/src/main/java/com/openblocks/api/usermanagement/InvitationController.java +++ b/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/usermanagement/InvitationController.java @@ -1,9 +1,14 @@ -package com.openblocks.api.usermanagement; +package org.lowcoder.api.usermanagement; -import static com.openblocks.sdk.constants.Authentication.isAnonymousUser; -import static com.openblocks.sdk.exception.BizError.INVITED_USER_NOT_LOGIN; +import static org.lowcoder.sdk.constants.Authentication.isAnonymousUser; +import static org.lowcoder.sdk.exception.BizError.INVITED_USER_NOT_LOGIN; +import org.lowcoder.api.framework.view.ResponseView; +import org.lowcoder.api.home.SessionUserService; +import org.lowcoder.api.usermanagement.view.InvitationVO; +import org.lowcoder.infra.constant.NewUrl; +import org.lowcoder.infra.constant.Url; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PathVariable; @@ -12,12 +17,6 @@ import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; -import com.openblocks.api.framework.view.ResponseView; -import com.openblocks.api.home.SessionUserService; -import com.openblocks.api.usermanagement.view.InvitationVO; -import com.openblocks.infra.constant.NewUrl; -import com.openblocks.infra.constant.Url; - import lombok.extern.slf4j.Slf4j; import reactor.core.publisher.Mono; diff --git a/server/api-service/openblocks-server/src/main/java/com/openblocks/api/usermanagement/OrgApiService.java b/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/usermanagement/OrgApiService.java similarity index 64% rename from server/api-service/openblocks-server/src/main/java/com/openblocks/api/usermanagement/OrgApiService.java rename to server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/usermanagement/OrgApiService.java index 16cc4ee37..c748677fa 100644 --- a/server/api-service/openblocks-server/src/main/java/com/openblocks/api/usermanagement/OrgApiService.java +++ b/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/usermanagement/OrgApiService.java @@ -1,17 +1,16 @@ -package com.openblocks.api.usermanagement; - +package org.lowcoder.api.usermanagement; + +import org.lowcoder.api.authentication.dto.OrganizationDomainCheckResult; +import org.lowcoder.api.config.ConfigView; +import org.lowcoder.api.usermanagement.view.OrgMemberListView; +import org.lowcoder.api.usermanagement.view.OrgView; +import org.lowcoder.api.usermanagement.view.UpdateOrgRequest; +import org.lowcoder.api.usermanagement.view.UpdateRoleRequest; +import org.lowcoder.domain.organization.model.Organization; +import org.lowcoder.domain.organization.model.Organization.OrganizationCommonSettings; +import org.lowcoder.infra.annotation.NonEmptyMono; import org.springframework.http.codec.multipart.Part; -import com.openblocks.api.authentication.dto.OrganizationDomainCheckResult; -import com.openblocks.api.config.ConfigView; -import com.openblocks.api.usermanagement.view.OrgMemberListView; -import com.openblocks.api.usermanagement.view.OrgView; -import com.openblocks.api.usermanagement.view.UpdateOrgRequest; -import com.openblocks.api.usermanagement.view.UpdateRoleRequest; -import com.openblocks.domain.organization.model.Organization; -import com.openblocks.domain.organization.model.Organization.OrganizationCommonSettings; -import com.openblocks.infra.annotation.NonEmptyMono; - import reactor.core.publisher.Mono; public interface OrgApiService { diff --git a/server/api-service/openblocks-server/src/main/java/com/openblocks/api/usermanagement/OrgApiServiceImpl.java b/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/usermanagement/OrgApiServiceImpl.java similarity index 87% rename from server/api-service/openblocks-server/src/main/java/com/openblocks/api/usermanagement/OrgApiServiceImpl.java rename to server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/usermanagement/OrgApiServiceImpl.java index 77618648d..6ff6af286 100644 --- a/server/api-service/openblocks-server/src/main/java/com/openblocks/api/usermanagement/OrgApiServiceImpl.java +++ b/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/usermanagement/OrgApiServiceImpl.java @@ -1,10 +1,10 @@ -package com.openblocks.api.usermanagement; +package org.lowcoder.api.usermanagement; -import static com.openblocks.sdk.exception.BizError.LAST_ADMIN_CANNOT_LEAVE_ORG; -import static com.openblocks.sdk.exception.BizError.UNSUPPORTED_OPERATION; -import static com.openblocks.sdk.util.ExceptionUtils.deferredError; -import static com.openblocks.sdk.util.ExceptionUtils.ofError; -import static com.openblocks.sdk.util.StreamUtils.collectSet; +import static org.lowcoder.sdk.exception.BizError.LAST_ADMIN_CANNOT_LEAVE_ORG; +import static org.lowcoder.sdk.exception.BizError.UNSUPPORTED_OPERATION; +import static org.lowcoder.sdk.util.ExceptionUtils.deferredError; +import static org.lowcoder.sdk.util.ExceptionUtils.ofError; +import static org.lowcoder.sdk.util.StreamUtils.collectSet; import java.util.Collections; import java.util.List; @@ -15,42 +15,41 @@ import org.apache.commons.collections4.SetUtils; import org.apache.commons.lang3.StringUtils; +import org.lowcoder.api.authentication.dto.OrganizationDomainCheckResult; +import org.lowcoder.api.bizthreshold.AbstractBizThresholdChecker; +import org.lowcoder.api.config.ConfigView; +import org.lowcoder.api.home.SessionUserService; +import org.lowcoder.api.usermanagement.view.OrgMemberListView; +import org.lowcoder.api.usermanagement.view.OrgView; +import org.lowcoder.api.usermanagement.view.UpdateOrgRequest; +import org.lowcoder.api.usermanagement.view.UpdateRoleRequest; +import org.lowcoder.api.usermanagement.view.OrgMemberListView.OrgMemberView; +import org.lowcoder.domain.authentication.AuthenticationService; +import org.lowcoder.domain.authentication.FindAuthConfig; +import org.lowcoder.domain.group.service.GroupService; +import org.lowcoder.domain.organization.event.OrgMemberLeftEvent; +import org.lowcoder.domain.organization.model.MemberRole; +import org.lowcoder.domain.organization.model.OrgMember; +import org.lowcoder.domain.organization.model.Organization; +import org.lowcoder.domain.organization.model.OrganizationDomain; +import org.lowcoder.domain.organization.model.Organization.OrganizationCommonSettings; +import org.lowcoder.domain.organization.service.OrgMemberService; +import org.lowcoder.domain.organization.service.OrganizationService; +import org.lowcoder.domain.user.model.Connection; +import org.lowcoder.domain.user.model.User; +import org.lowcoder.domain.user.service.UserService; +import org.lowcoder.sdk.auth.AbstractAuthConfig; +import org.lowcoder.sdk.config.CommonConfig; +import org.lowcoder.sdk.config.CommonConfig.Workspace; +import org.lowcoder.sdk.constants.WorkspaceMode; +import org.lowcoder.sdk.exception.BizError; +import org.lowcoder.sdk.exception.BizException; +import org.lowcoder.sdk.util.UriUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.ApplicationContext; import org.springframework.http.codec.multipart.Part; import org.springframework.stereotype.Service; -import com.openblocks.api.authentication.dto.OrganizationDomainCheckResult; -import com.openblocks.api.bizthreshold.AbstractBizThresholdChecker; -import com.openblocks.api.config.ConfigView; -import com.openblocks.api.home.SessionUserService; -import com.openblocks.api.usermanagement.view.OrgMemberListView; -import com.openblocks.api.usermanagement.view.OrgMemberListView.OrgMemberView; -import com.openblocks.api.usermanagement.view.OrgView; -import com.openblocks.api.usermanagement.view.UpdateOrgRequest; -import com.openblocks.api.usermanagement.view.UpdateRoleRequest; -import com.openblocks.domain.authentication.AuthenticationService; -import com.openblocks.domain.authentication.FindAuthConfig; -import com.openblocks.domain.group.service.GroupService; -import com.openblocks.domain.organization.event.OrgMemberLeftEvent; -import com.openblocks.domain.organization.model.MemberRole; -import com.openblocks.domain.organization.model.OrgMember; -import com.openblocks.domain.organization.model.Organization; -import com.openblocks.domain.organization.model.Organization.OrganizationCommonSettings; -import com.openblocks.domain.organization.model.OrganizationDomain; -import com.openblocks.domain.organization.service.OrgMemberService; -import com.openblocks.domain.organization.service.OrganizationService; -import com.openblocks.domain.user.model.Connection; -import com.openblocks.domain.user.model.User; -import com.openblocks.domain.user.service.UserService; -import com.openblocks.sdk.auth.AbstractAuthConfig; -import com.openblocks.sdk.config.CommonConfig; -import com.openblocks.sdk.config.CommonConfig.Workspace; -import com.openblocks.sdk.constants.WorkspaceMode; -import com.openblocks.sdk.exception.BizError; -import com.openblocks.sdk.exception.BizException; -import com.openblocks.sdk.util.UriUtils; - import lombok.extern.slf4j.Slf4j; import reactor.core.publisher.Mono; diff --git a/server/api-service/openblocks-server/src/main/java/com/openblocks/api/usermanagement/OrgDevChecker.java b/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/usermanagement/OrgDevChecker.java similarity index 82% rename from server/api-service/openblocks-server/src/main/java/com/openblocks/api/usermanagement/OrgDevChecker.java rename to server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/usermanagement/OrgDevChecker.java index 8e533fd91..fc247766a 100644 --- a/server/api-service/openblocks-server/src/main/java/com/openblocks/api/usermanagement/OrgDevChecker.java +++ b/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/usermanagement/OrgDevChecker.java @@ -1,17 +1,16 @@ -package com.openblocks.api.usermanagement; +package org.lowcoder.api.usermanagement; -import static com.openblocks.sdk.util.ExceptionUtils.ofError; +import static org.lowcoder.sdk.util.ExceptionUtils.ofError; import javax.annotation.Nonnull; +import org.lowcoder.api.home.SessionUserService; +import org.lowcoder.domain.group.service.GroupMemberService; +import org.lowcoder.domain.group.service.GroupService; +import org.lowcoder.sdk.exception.BizError; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; -import com.openblocks.api.home.SessionUserService; -import com.openblocks.domain.group.service.GroupMemberService; -import com.openblocks.domain.group.service.GroupService; -import com.openblocks.sdk.exception.BizError; - import reactor.core.publisher.Mono; @Component diff --git a/server/api-service/openblocks-server/src/main/java/com/openblocks/api/usermanagement/OrganizationController.java b/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/usermanagement/OrganizationController.java similarity index 86% rename from server/api-service/openblocks-server/src/main/java/com/openblocks/api/usermanagement/OrganizationController.java rename to server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/usermanagement/OrganizationController.java index 0fb5cbb41..d5c566d92 100644 --- a/server/api-service/openblocks-server/src/main/java/com/openblocks/api/usermanagement/OrganizationController.java +++ b/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/usermanagement/OrganizationController.java @@ -1,9 +1,22 @@ -package com.openblocks.api.usermanagement; +package org.lowcoder.api.usermanagement; import java.util.List; import javax.validation.Valid; +import org.lowcoder.api.authentication.dto.OrganizationDomainCheckResult; +import org.lowcoder.api.framework.view.ResponseView; +import org.lowcoder.api.usermanagement.view.OrgMemberListView; +import org.lowcoder.api.usermanagement.view.OrgView; +import org.lowcoder.api.usermanagement.view.UpdateOrgRequest; +import org.lowcoder.api.usermanagement.view.UpdateRoleRequest; +import org.lowcoder.api.util.BusinessEventPublisher; +import org.lowcoder.domain.organization.model.Organization; +import org.lowcoder.domain.organization.model.Organization.OrganizationCommonSettings; +import org.lowcoder.domain.plugin.DatasourceMetaInfo; +import org.lowcoder.domain.plugin.service.DatasourceMetaInfoService; +import org.lowcoder.infra.constant.NewUrl; +import org.lowcoder.infra.constant.Url; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.codec.multipart.Part; import org.springframework.web.bind.annotation.DeleteMapping; @@ -18,20 +31,6 @@ import org.springframework.web.bind.annotation.RestController; import org.springframework.web.server.ServerWebExchange; -import com.openblocks.api.authentication.dto.OrganizationDomainCheckResult; -import com.openblocks.api.framework.view.ResponseView; -import com.openblocks.api.usermanagement.view.OrgMemberListView; -import com.openblocks.api.usermanagement.view.OrgView; -import com.openblocks.api.usermanagement.view.UpdateOrgRequest; -import com.openblocks.api.usermanagement.view.UpdateRoleRequest; -import com.openblocks.api.util.BusinessEventPublisher; -import com.openblocks.domain.organization.model.Organization; -import com.openblocks.domain.organization.model.Organization.OrganizationCommonSettings; -import com.openblocks.domain.plugin.DatasourceMetaInfo; -import com.openblocks.domain.plugin.service.DatasourceMetaInfoService; -import com.openblocks.infra.constant.NewUrl; -import com.openblocks.infra.constant.Url; - import reactor.core.publisher.Mono; @RestController diff --git a/server/api-service/openblocks-server/src/main/java/com/openblocks/api/usermanagement/UserApiService.java b/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/usermanagement/UserApiService.java similarity index 88% rename from server/api-service/openblocks-server/src/main/java/com/openblocks/api/usermanagement/UserApiService.java rename to server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/usermanagement/UserApiService.java index df215e502..42161bd5a 100644 --- a/server/api-service/openblocks-server/src/main/java/com/openblocks/api/usermanagement/UserApiService.java +++ b/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/usermanagement/UserApiService.java @@ -1,23 +1,22 @@ -package com.openblocks.api.usermanagement; +package org.lowcoder.api.usermanagement; -import static com.openblocks.sdk.exception.BizError.UNSUPPORTED_OPERATION; -import static com.openblocks.sdk.util.ExceptionUtils.ofError; +import static org.lowcoder.sdk.exception.BizError.UNSUPPORTED_OPERATION; +import static org.lowcoder.sdk.util.ExceptionUtils.ofError; import java.util.Objects; import java.util.Set; import java.util.stream.Collectors; +import org.lowcoder.api.home.SessionUserService; +import org.lowcoder.domain.organization.service.OrgMemberService; +import org.lowcoder.domain.user.model.Connection; +import org.lowcoder.domain.user.model.User; +import org.lowcoder.domain.user.model.UserDetail; +import org.lowcoder.domain.user.repository.UserRepository; +import org.lowcoder.domain.user.service.UserService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import com.openblocks.api.home.SessionUserService; -import com.openblocks.domain.organization.service.OrgMemberService; -import com.openblocks.domain.user.model.Connection; -import com.openblocks.domain.user.model.User; -import com.openblocks.domain.user.model.UserDetail; -import com.openblocks.domain.user.repository.UserRepository; -import com.openblocks.domain.user.service.UserService; - import lombok.extern.slf4j.Slf4j; import reactor.core.publisher.Flux; import reactor.core.publisher.Mono; diff --git a/server/api-service/openblocks-server/src/main/java/com/openblocks/api/usermanagement/UserController.java b/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/usermanagement/UserController.java similarity index 87% rename from server/api-service/openblocks-server/src/main/java/com/openblocks/api/usermanagement/UserController.java rename to server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/usermanagement/UserController.java index 986e50669..55f4c8333 100644 --- a/server/api-service/openblocks-server/src/main/java/com/openblocks/api/usermanagement/UserController.java +++ b/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/usermanagement/UserController.java @@ -1,9 +1,24 @@ -package com.openblocks.api.usermanagement; +package org.lowcoder.api.usermanagement; -import static com.openblocks.sdk.exception.BizError.INVALID_USER_STATUS; -import static com.openblocks.sdk.util.ExceptionUtils.ofError; +import static org.lowcoder.sdk.exception.BizError.INVALID_USER_STATUS; +import static org.lowcoder.sdk.util.ExceptionUtils.ofError; import org.apache.commons.lang3.StringUtils; +import org.lowcoder.api.authentication.dto.OrganizationDomainCheckResult; +import org.lowcoder.api.framework.view.ResponseView; +import org.lowcoder.api.home.SessionUserService; +import org.lowcoder.api.home.UserHomeApiService; +import org.lowcoder.api.usermanagement.view.UpdateUserRequest; +import org.lowcoder.api.usermanagement.view.UserProfileView; +import org.lowcoder.domain.user.constant.UserStatusType; +import org.lowcoder.domain.user.model.User; +import org.lowcoder.domain.user.model.UserDetail; +import org.lowcoder.domain.user.service.UserService; +import org.lowcoder.domain.user.service.UserStatusService; +import org.lowcoder.infra.constant.NewUrl; +import org.lowcoder.infra.constant.Url; +import org.lowcoder.sdk.config.CommonConfig; +import org.lowcoder.sdk.exception.BizError; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.HttpStatus; import org.springframework.http.MediaType; @@ -20,22 +35,6 @@ import org.springframework.web.bind.annotation.RestController; import org.springframework.web.server.ServerWebExchange; -import com.openblocks.api.authentication.dto.OrganizationDomainCheckResult; -import com.openblocks.api.framework.view.ResponseView; -import com.openblocks.api.home.SessionUserService; -import com.openblocks.api.home.UserHomeApiService; -import com.openblocks.api.usermanagement.view.UpdateUserRequest; -import com.openblocks.api.usermanagement.view.UserProfileView; -import com.openblocks.domain.user.constant.UserStatusType; -import com.openblocks.domain.user.model.User; -import com.openblocks.domain.user.model.UserDetail; -import com.openblocks.domain.user.service.UserService; -import com.openblocks.domain.user.service.UserStatusService; -import com.openblocks.infra.constant.NewUrl; -import com.openblocks.infra.constant.Url; -import com.openblocks.sdk.config.CommonConfig; -import com.openblocks.sdk.exception.BizError; - import lombok.extern.slf4j.Slf4j; import reactor.core.publisher.Mono; diff --git a/server/api-service/openblocks-server/src/main/java/com/openblocks/api/usermanagement/view/AddMemberRequest.java b/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/usermanagement/view/AddMemberRequest.java similarity index 82% rename from server/api-service/openblocks-server/src/main/java/com/openblocks/api/usermanagement/view/AddMemberRequest.java rename to server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/usermanagement/view/AddMemberRequest.java index b784ca015..e20780cf2 100644 --- a/server/api-service/openblocks-server/src/main/java/com/openblocks/api/usermanagement/view/AddMemberRequest.java +++ b/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/usermanagement/view/AddMemberRequest.java @@ -1,4 +1,4 @@ -package com.openblocks.api.usermanagement.view; +package org.lowcoder.api.usermanagement.view; import lombok.Getter; import lombok.NoArgsConstructor; diff --git a/server/api-service/openblocks-server/src/main/java/com/openblocks/api/usermanagement/view/CreateGroupRequest.java b/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/usermanagement/view/CreateGroupRequest.java similarity index 90% rename from server/api-service/openblocks-server/src/main/java/com/openblocks/api/usermanagement/view/CreateGroupRequest.java rename to server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/usermanagement/view/CreateGroupRequest.java index 20be4977f..b831285b5 100644 --- a/server/api-service/openblocks-server/src/main/java/com/openblocks/api/usermanagement/view/CreateGroupRequest.java +++ b/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/usermanagement/view/CreateGroupRequest.java @@ -1,4 +1,4 @@ -package com.openblocks.api.usermanagement.view; +package org.lowcoder.api.usermanagement.view; import javax.validation.constraints.NotNull; diff --git a/server/api-service/openblocks-server/src/main/java/com/openblocks/api/usermanagement/view/GroupMemberAggregateView.java b/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/usermanagement/view/GroupMemberAggregateView.java similarity index 81% rename from server/api-service/openblocks-server/src/main/java/com/openblocks/api/usermanagement/view/GroupMemberAggregateView.java rename to server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/usermanagement/view/GroupMemberAggregateView.java index 87426aa5f..1a3ec72d8 100644 --- a/server/api-service/openblocks-server/src/main/java/com/openblocks/api/usermanagement/view/GroupMemberAggregateView.java +++ b/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/usermanagement/view/GroupMemberAggregateView.java @@ -1,4 +1,4 @@ -package com.openblocks.api.usermanagement.view; +package org.lowcoder.api.usermanagement.view; import java.util.List; diff --git a/server/api-service/openblocks-server/src/main/java/com/openblocks/api/usermanagement/view/GroupMemberView.java b/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/usermanagement/view/GroupMemberView.java similarity index 84% rename from server/api-service/openblocks-server/src/main/java/com/openblocks/api/usermanagement/view/GroupMemberView.java rename to server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/usermanagement/view/GroupMemberView.java index 3fdc82bdf..ad2b4dc4c 100644 --- a/server/api-service/openblocks-server/src/main/java/com/openblocks/api/usermanagement/view/GroupMemberView.java +++ b/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/usermanagement/view/GroupMemberView.java @@ -1,7 +1,7 @@ -package com.openblocks.api.usermanagement.view; +package org.lowcoder.api.usermanagement.view; -import com.openblocks.domain.group.model.GroupMember; -import com.openblocks.domain.user.model.User; +import org.lowcoder.domain.group.model.GroupMember; +import org.lowcoder.domain.user.model.User; public class GroupMemberView { diff --git a/server/api-service/openblocks-server/src/main/java/com/openblocks/api/usermanagement/view/GroupView.java b/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/usermanagement/view/GroupView.java similarity index 89% rename from server/api-service/openblocks-server/src/main/java/com/openblocks/api/usermanagement/view/GroupView.java rename to server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/usermanagement/view/GroupView.java index 0dd42477e..596cd6296 100644 --- a/server/api-service/openblocks-server/src/main/java/com/openblocks/api/usermanagement/view/GroupView.java +++ b/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/usermanagement/view/GroupView.java @@ -1,9 +1,9 @@ -package com.openblocks.api.usermanagement.view; +package org.lowcoder.api.usermanagement.view; import java.util.Locale; -import com.openblocks.domain.group.model.Group; -import com.openblocks.sdk.util.LocaleUtils; +import org.lowcoder.domain.group.model.Group; +import org.lowcoder.sdk.util.LocaleUtils; import lombok.Builder; import lombok.Getter; diff --git a/server/api-service/openblocks-server/src/main/java/com/openblocks/api/usermanagement/view/InvitationVO.java b/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/usermanagement/view/InvitationVO.java similarity index 73% rename from server/api-service/openblocks-server/src/main/java/com/openblocks/api/usermanagement/view/InvitationVO.java rename to server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/usermanagement/view/InvitationVO.java index 5e6d38306..e23d182cf 100644 --- a/server/api-service/openblocks-server/src/main/java/com/openblocks/api/usermanagement/view/InvitationVO.java +++ b/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/usermanagement/view/InvitationVO.java @@ -1,8 +1,8 @@ -package com.openblocks.api.usermanagement.view; +package org.lowcoder.api.usermanagement.view; -import com.openblocks.domain.invitation.model.Invitation; -import com.openblocks.domain.organization.model.Organization; -import com.openblocks.domain.user.model.User; +import org.lowcoder.domain.invitation.model.Invitation; +import org.lowcoder.domain.organization.model.Organization; +import org.lowcoder.domain.user.model.User; import lombok.Builder; import lombok.Getter; diff --git a/server/api-service/openblocks-server/src/main/java/com/openblocks/api/usermanagement/view/OrgAndVisitorRoleView.java b/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/usermanagement/view/OrgAndVisitorRoleView.java similarity index 76% rename from server/api-service/openblocks-server/src/main/java/com/openblocks/api/usermanagement/view/OrgAndVisitorRoleView.java rename to server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/usermanagement/view/OrgAndVisitorRoleView.java index b3531a3b2..c9b9ef3be 100644 --- a/server/api-service/openblocks-server/src/main/java/com/openblocks/api/usermanagement/view/OrgAndVisitorRoleView.java +++ b/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/usermanagement/view/OrgAndVisitorRoleView.java @@ -1,6 +1,6 @@ -package com.openblocks.api.usermanagement.view; +package org.lowcoder.api.usermanagement.view; -import com.openblocks.domain.organization.model.Organization; +import org.lowcoder.domain.organization.model.Organization; public class OrgAndVisitorRoleView { diff --git a/server/api-service/openblocks-server/src/main/java/com/openblocks/api/usermanagement/view/OrgMemberListView.java b/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/usermanagement/view/OrgMemberListView.java similarity index 92% rename from server/api-service/openblocks-server/src/main/java/com/openblocks/api/usermanagement/view/OrgMemberListView.java rename to server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/usermanagement/view/OrgMemberListView.java index dfcf3d262..4da5931e0 100644 --- a/server/api-service/openblocks-server/src/main/java/com/openblocks/api/usermanagement/view/OrgMemberListView.java +++ b/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/usermanagement/view/OrgMemberListView.java @@ -1,4 +1,4 @@ -package com.openblocks.api.usermanagement.view; +package org.lowcoder.api.usermanagement.view; import java.util.List; import java.util.Map; diff --git a/server/api-service/openblocks-server/src/main/java/com/openblocks/api/usermanagement/view/OrgView.java b/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/usermanagement/view/OrgView.java similarity index 77% rename from server/api-service/openblocks-server/src/main/java/com/openblocks/api/usermanagement/view/OrgView.java rename to server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/usermanagement/view/OrgView.java index 283c89c6e..40f1ced57 100644 --- a/server/api-service/openblocks-server/src/main/java/com/openblocks/api/usermanagement/view/OrgView.java +++ b/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/usermanagement/view/OrgView.java @@ -1,8 +1,8 @@ -package com.openblocks.api.usermanagement.view; +package org.lowcoder.api.usermanagement.view; import javax.annotation.Nonnull; -import com.openblocks.domain.organization.model.Organization; +import org.lowcoder.domain.organization.model.Organization; public class OrgView { diff --git a/server/api-service/openblocks-server/src/main/java/com/openblocks/api/usermanagement/view/UpdateGroupRequest.java b/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/usermanagement/view/UpdateGroupRequest.java similarity index 90% rename from server/api-service/openblocks-server/src/main/java/com/openblocks/api/usermanagement/view/UpdateGroupRequest.java rename to server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/usermanagement/view/UpdateGroupRequest.java index 367b67105..983855670 100644 --- a/server/api-service/openblocks-server/src/main/java/com/openblocks/api/usermanagement/view/UpdateGroupRequest.java +++ b/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/usermanagement/view/UpdateGroupRequest.java @@ -1,4 +1,4 @@ -package com.openblocks.api.usermanagement.view; +package org.lowcoder.api.usermanagement.view; public class UpdateGroupRequest { diff --git a/server/api-service/openblocks-server/src/main/java/com/openblocks/api/usermanagement/view/UpdateOrgRequest.java b/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/usermanagement/view/UpdateOrgRequest.java similarity index 94% rename from server/api-service/openblocks-server/src/main/java/com/openblocks/api/usermanagement/view/UpdateOrgRequest.java rename to server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/usermanagement/view/UpdateOrgRequest.java index c66c3a416..156c64408 100644 --- a/server/api-service/openblocks-server/src/main/java/com/openblocks/api/usermanagement/view/UpdateOrgRequest.java +++ b/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/usermanagement/view/UpdateOrgRequest.java @@ -1,4 +1,4 @@ -package com.openblocks.api.usermanagement.view; +package org.lowcoder.api.usermanagement.view; public class UpdateOrgRequest { diff --git a/server/api-service/openblocks-server/src/main/java/com/openblocks/api/usermanagement/view/UpdateRoleRequest.java b/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/usermanagement/view/UpdateRoleRequest.java similarity index 82% rename from server/api-service/openblocks-server/src/main/java/com/openblocks/api/usermanagement/view/UpdateRoleRequest.java rename to server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/usermanagement/view/UpdateRoleRequest.java index 2ae8c0f33..cc162e639 100644 --- a/server/api-service/openblocks-server/src/main/java/com/openblocks/api/usermanagement/view/UpdateRoleRequest.java +++ b/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/usermanagement/view/UpdateRoleRequest.java @@ -1,4 +1,4 @@ -package com.openblocks.api.usermanagement.view; +package org.lowcoder.api.usermanagement.view; import lombok.Getter; import lombok.NoArgsConstructor; diff --git a/server/api-service/openblocks-server/src/main/java/com/openblocks/api/usermanagement/view/UpdateUserRequest.java b/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/usermanagement/view/UpdateUserRequest.java similarity index 80% rename from server/api-service/openblocks-server/src/main/java/com/openblocks/api/usermanagement/view/UpdateUserRequest.java rename to server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/usermanagement/view/UpdateUserRequest.java index 111aa00f4..aa5dccf6d 100644 --- a/server/api-service/openblocks-server/src/main/java/com/openblocks/api/usermanagement/view/UpdateUserRequest.java +++ b/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/usermanagement/view/UpdateUserRequest.java @@ -1,4 +1,4 @@ -package com.openblocks.api.usermanagement.view; +package org.lowcoder.api.usermanagement.view; public class UpdateUserRequest { diff --git a/server/api-service/openblocks-server/src/main/java/com/openblocks/api/usermanagement/view/UserProfileView.java b/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/usermanagement/view/UserProfileView.java similarity index 89% rename from server/api-service/openblocks-server/src/main/java/com/openblocks/api/usermanagement/view/UserProfileView.java rename to server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/usermanagement/view/UserProfileView.java index f9e0b31f3..8f5e01ba3 100644 --- a/server/api-service/openblocks-server/src/main/java/com/openblocks/api/usermanagement/view/UserProfileView.java +++ b/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/usermanagement/view/UserProfileView.java @@ -1,11 +1,12 @@ -package com.openblocks.api.usermanagement.view; +package org.lowcoder.api.usermanagement.view; import java.util.List; import java.util.Map; import java.util.Set; +import org.lowcoder.domain.user.model.Connection; + import com.fasterxml.jackson.annotation.JsonProperty; -import com.openblocks.domain.user.model.Connection; import lombok.Builder; import lombok.Getter; diff --git a/server/api-service/openblocks-server/src/main/java/com/openblocks/api/util/BusinessEventPublisher.java b/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/util/BusinessEventPublisher.java similarity index 90% rename from server/api-service/openblocks-server/src/main/java/com/openblocks/api/util/BusinessEventPublisher.java rename to server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/util/BusinessEventPublisher.java index fa1256b9c..e81f5136c 100644 --- a/server/api-service/openblocks-server/src/main/java/com/openblocks/api/util/BusinessEventPublisher.java +++ b/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/util/BusinessEventPublisher.java @@ -1,6 +1,6 @@ -package com.openblocks.api.util; +package org.lowcoder.api.util; -import static com.openblocks.domain.permission.model.ResourceHolder.USER; +import static org.lowcoder.domain.permission.model.ResourceHolder.USER; import java.util.Collection; import java.util.Collections; @@ -11,48 +11,47 @@ import javax.annotation.Nullable; import org.apache.commons.lang3.StringUtils; +import org.lowcoder.api.application.view.ApplicationInfoView; +import org.lowcoder.api.application.view.ApplicationView; +import org.lowcoder.api.home.SessionUserService; +import org.lowcoder.api.usermanagement.view.AddMemberRequest; +import org.lowcoder.api.usermanagement.view.UpdateRoleRequest; +import org.lowcoder.domain.application.service.ApplicationService; +import org.lowcoder.domain.datasource.model.Datasource; +import org.lowcoder.domain.datasource.service.DatasourceService; +import org.lowcoder.domain.folder.model.Folder; +import org.lowcoder.domain.folder.service.FolderService; +import org.lowcoder.domain.group.model.Group; +import org.lowcoder.domain.group.model.GroupMember; +import org.lowcoder.domain.group.service.GroupService; +import org.lowcoder.domain.organization.model.OrgMember; +import org.lowcoder.domain.permission.model.ResourceHolder; +import org.lowcoder.domain.permission.model.ResourcePermission; +import org.lowcoder.domain.permission.service.ResourcePermissionService; +import org.lowcoder.domain.query.model.LibraryQuery; +import org.lowcoder.domain.user.model.User; +import org.lowcoder.domain.user.service.UserService; +import org.lowcoder.infra.event.ApplicationCommonEvent; +import org.lowcoder.infra.event.EventType; +import org.lowcoder.infra.event.FolderCommonEvent; +import org.lowcoder.infra.event.LibraryQueryEvent; +import org.lowcoder.infra.event.QueryExecutionEvent; +import org.lowcoder.infra.event.datasource.DatasourceEvent; +import org.lowcoder.infra.event.datasource.DatasourcePermissionEvent; +import org.lowcoder.infra.event.group.GroupCreateEvent; +import org.lowcoder.infra.event.group.GroupDeleteEvent; +import org.lowcoder.infra.event.group.GroupUpdateEvent; +import org.lowcoder.infra.event.groupmember.GroupMemberAddEvent; +import org.lowcoder.infra.event.groupmember.GroupMemberLeaveEvent; +import org.lowcoder.infra.event.groupmember.GroupMemberRemoveEvent; +import org.lowcoder.infra.event.groupmember.GroupMemberRoleUpdateEvent; +import org.lowcoder.infra.event.user.UserLoginEvent; +import org.lowcoder.infra.event.user.UserLogoutEvent; +import org.lowcoder.sdk.util.LocaleUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.ApplicationEventPublisher; import org.springframework.stereotype.Component; -import com.openblocks.api.application.view.ApplicationInfoView; -import com.openblocks.api.application.view.ApplicationView; -import com.openblocks.api.home.SessionUserService; -import com.openblocks.api.usermanagement.view.AddMemberRequest; -import com.openblocks.api.usermanagement.view.UpdateRoleRequest; -import com.openblocks.domain.application.service.ApplicationService; -import com.openblocks.domain.datasource.model.Datasource; -import com.openblocks.domain.datasource.service.DatasourceService; -import com.openblocks.domain.folder.model.Folder; -import com.openblocks.domain.folder.service.FolderService; -import com.openblocks.domain.group.model.Group; -import com.openblocks.domain.group.model.GroupMember; -import com.openblocks.domain.group.service.GroupService; -import com.openblocks.domain.organization.model.OrgMember; -import com.openblocks.domain.permission.model.ResourceHolder; -import com.openblocks.domain.permission.model.ResourcePermission; -import com.openblocks.domain.permission.service.ResourcePermissionService; -import com.openblocks.domain.query.model.LibraryQuery; -import com.openblocks.domain.user.model.User; -import com.openblocks.domain.user.service.UserService; -import com.openblocks.infra.event.ApplicationCommonEvent; -import com.openblocks.infra.event.EventType; -import com.openblocks.infra.event.FolderCommonEvent; -import com.openblocks.infra.event.LibraryQueryEvent; -import com.openblocks.infra.event.QueryExecutionEvent; -import com.openblocks.infra.event.datasource.DatasourceEvent; -import com.openblocks.infra.event.datasource.DatasourcePermissionEvent; -import com.openblocks.infra.event.group.GroupCreateEvent; -import com.openblocks.infra.event.group.GroupDeleteEvent; -import com.openblocks.infra.event.group.GroupUpdateEvent; -import com.openblocks.infra.event.groupmember.GroupMemberAddEvent; -import com.openblocks.infra.event.groupmember.GroupMemberLeaveEvent; -import com.openblocks.infra.event.groupmember.GroupMemberRemoveEvent; -import com.openblocks.infra.event.groupmember.GroupMemberRoleUpdateEvent; -import com.openblocks.infra.event.user.UserLoginEvent; -import com.openblocks.infra.event.user.UserLogoutEvent; -import com.openblocks.sdk.util.LocaleUtils; - import lombok.extern.slf4j.Slf4j; import reactor.core.publisher.Mono; diff --git a/server/api-service/openblocks-server/src/main/java/com/openblocks/api/util/Pagination.java b/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/util/Pagination.java similarity index 89% rename from server/api-service/openblocks-server/src/main/java/com/openblocks/api/util/Pagination.java rename to server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/util/Pagination.java index ac2298377..436ac376c 100644 --- a/server/api-service/openblocks-server/src/main/java/com/openblocks/api/util/Pagination.java +++ b/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/util/Pagination.java @@ -1,11 +1,10 @@ -package com.openblocks.api.util; +package org.lowcoder.api.util; -import static com.openblocks.sdk.exception.BizError.INVALID_PARAMETER; +import static org.lowcoder.sdk.exception.BizError.INVALID_PARAMETER; +import org.lowcoder.sdk.exception.BizException; import org.springframework.data.domain.PageRequest; -import com.openblocks.sdk.exception.BizException; - public class Pagination { private static final int MIN_PAGE = 1; diff --git a/server/api-service/openblocks-server/src/main/java/com/openblocks/api/util/ViewBuilder.java b/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/util/ViewBuilder.java similarity index 91% rename from server/api-service/openblocks-server/src/main/java/com/openblocks/api/util/ViewBuilder.java rename to server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/util/ViewBuilder.java index 7c86cdfac..57904be5d 100644 --- a/server/api-service/openblocks-server/src/main/java/com/openblocks/api/util/ViewBuilder.java +++ b/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/util/ViewBuilder.java @@ -1,8 +1,8 @@ -package com.openblocks.api.util; +package org.lowcoder.api.util; -import static com.openblocks.sdk.util.StreamUtils.collectList; -import static com.openblocks.sdk.util.StreamUtils.collectMap; import static java.util.function.Function.identity; +import static org.lowcoder.sdk.util.StreamUtils.collectList; +import static org.lowcoder.sdk.util.StreamUtils.collectMap; import java.util.Collection; import java.util.List; @@ -11,7 +11,7 @@ import java.util.function.BiFunction; import java.util.function.Function; -import com.openblocks.infra.annotation.NonEmptyMono; +import org.lowcoder.infra.annotation.NonEmptyMono; import reactor.core.publisher.Flux; import reactor.core.publisher.Mono; diff --git a/server/api-service/openblocks-server/src/main/java/com/openblocks/runner/eventlistener/AppEventListener.java b/server/api-service/lowcoder-server/src/main/java/org/lowcoder/runner/eventlistener/AppEventListener.java similarity index 95% rename from server/api-service/openblocks-server/src/main/java/com/openblocks/runner/eventlistener/AppEventListener.java rename to server/api-service/lowcoder-server/src/main/java/org/lowcoder/runner/eventlistener/AppEventListener.java index ee3177b15..5b0b944ef 100644 --- a/server/api-service/openblocks-server/src/main/java/com/openblocks/runner/eventlistener/AppEventListener.java +++ b/server/api-service/lowcoder-server/src/main/java/org/lowcoder/runner/eventlistener/AppEventListener.java @@ -1,11 +1,10 @@ -package com.openblocks.runner.eventlistener; +package org.lowcoder.runner.eventlistener; +import org.lowcoder.sdk.exception.BizError; import org.springframework.boot.context.event.ApplicationReadyEvent; import org.springframework.context.event.EventListener; import org.springframework.stereotype.Component; -import com.openblocks.sdk.exception.BizError; - import lombok.extern.slf4j.Slf4j; @Slf4j diff --git a/server/api-service/openblocks-server/src/main/java/com/openblocks/runner/eventlistener/OrgAndGroupEventListener.java b/server/api-service/lowcoder-server/src/main/java/org/lowcoder/runner/eventlistener/OrgAndGroupEventListener.java similarity index 84% rename from server/api-service/openblocks-server/src/main/java/com/openblocks/runner/eventlistener/OrgAndGroupEventListener.java rename to server/api-service/lowcoder-server/src/main/java/org/lowcoder/runner/eventlistener/OrgAndGroupEventListener.java index 70627d383..8bad618b8 100644 --- a/server/api-service/openblocks-server/src/main/java/com/openblocks/runner/eventlistener/OrgAndGroupEventListener.java +++ b/server/api-service/lowcoder-server/src/main/java/org/lowcoder/runner/eventlistener/OrgAndGroupEventListener.java @@ -1,25 +1,25 @@ -package com.openblocks.runner.eventlistener; +package org.lowcoder.runner.eventlistener; -import static com.openblocks.sdk.util.JsonUtils.toJson; +import static org.lowcoder.sdk.util.JsonUtils.toJson; import java.util.List; import java.util.concurrent.ExecutorService; import java.util.concurrent.Executors; +import org.lowcoder.domain.application.service.ApplicationService; +import org.lowcoder.domain.datasource.service.DatasourceService; +import org.lowcoder.domain.group.event.GroupDeletedEvent; +import org.lowcoder.domain.group.service.GroupMemberService; +import org.lowcoder.domain.group.service.GroupService; +import org.lowcoder.domain.organization.event.OrgDeletedEvent; +import org.lowcoder.domain.organization.event.OrgMemberLeftEvent; +import org.lowcoder.domain.organization.service.OrgMemberService; +import org.lowcoder.domain.permission.service.ResourcePermissionService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.event.EventListener; import org.springframework.stereotype.Component; import com.google.common.util.concurrent.ThreadFactoryBuilder; -import com.openblocks.domain.application.service.ApplicationService; -import com.openblocks.domain.datasource.service.DatasourceService; -import com.openblocks.domain.group.event.GroupDeletedEvent; -import com.openblocks.domain.group.service.GroupMemberService; -import com.openblocks.domain.group.service.GroupService; -import com.openblocks.domain.organization.event.OrgDeletedEvent; -import com.openblocks.domain.organization.event.OrgMemberLeftEvent; -import com.openblocks.domain.organization.service.OrgMemberService; -import com.openblocks.domain.permission.service.ResourcePermissionService; import lombok.extern.slf4j.Slf4j; import reactor.core.publisher.Mono; diff --git a/server/api-service/openblocks-server/src/main/java/com/openblocks/runner/hook/ShutdownHook.java b/server/api-service/lowcoder-server/src/main/java/org/lowcoder/runner/hook/ShutdownHook.java similarity index 78% rename from server/api-service/openblocks-server/src/main/java/com/openblocks/runner/hook/ShutdownHook.java rename to server/api-service/lowcoder-server/src/main/java/org/lowcoder/runner/hook/ShutdownHook.java index ab56d0648..f16c943ec 100644 --- a/server/api-service/openblocks-server/src/main/java/com/openblocks/runner/hook/ShutdownHook.java +++ b/server/api-service/lowcoder-server/src/main/java/org/lowcoder/runner/hook/ShutdownHook.java @@ -1,11 +1,10 @@ -package com.openblocks.runner.hook; +package org.lowcoder.runner.hook; import javax.annotation.PreDestroy; +import org.lowcoder.sdk.destructor.DestructorUtil; import org.springframework.stereotype.Component; -import com.openblocks.sdk.destructor.DestructorUtil; - import lombok.extern.slf4j.Slf4j; @Slf4j diff --git a/server/api-service/openblocks-server/src/main/java/com/openblocks/runner/migrations/DatabaseChangelog.java b/server/api-service/lowcoder-server/src/main/java/org/lowcoder/runner/migrations/DatabaseChangelog.java similarity index 86% rename from server/api-service/openblocks-server/src/main/java/com/openblocks/runner/migrations/DatabaseChangelog.java rename to server/api-service/lowcoder-server/src/main/java/org/lowcoder/runner/migrations/DatabaseChangelog.java index 88b4501ff..67d1a0d9f 100644 --- a/server/api-service/openblocks-server/src/main/java/com/openblocks/runner/migrations/DatabaseChangelog.java +++ b/server/api-service/lowcoder-server/src/main/java/org/lowcoder/runner/migrations/DatabaseChangelog.java @@ -1,8 +1,25 @@ -package com.openblocks.runner.migrations; - -import static com.openblocks.domain.util.QueryDslUtils.fieldName; -import static com.openblocks.sdk.util.IDUtils.generate; - +package org.lowcoder.runner.migrations; + +import static org.lowcoder.domain.util.QueryDslUtils.fieldName; +import static org.lowcoder.sdk.util.IDUtils.generate; + +import org.lowcoder.domain.application.model.Application; +import org.lowcoder.domain.datasource.model.Datasource; +import org.lowcoder.domain.datasource.model.DatasourceStructureDO; +import org.lowcoder.domain.datasource.model.TokenBasedConnection; +import org.lowcoder.domain.group.model.Group; +import org.lowcoder.domain.group.model.QGroup; +import org.lowcoder.domain.material.model.MaterialMeta; +import org.lowcoder.domain.organization.model.Organization; +import org.lowcoder.domain.query.model.LibraryQuery; +import org.lowcoder.domain.query.model.LibraryQueryRecord; +import org.lowcoder.domain.user.model.User; +import org.lowcoder.infra.birelation.BiRelation; +import org.lowcoder.infra.config.model.ServerConfig; +import org.lowcoder.infra.eventlog.EventLog; +import org.lowcoder.infra.serverlog.ServerLog; +import org.lowcoder.runner.migrations.job.CompleteAuthType; +import org.lowcoder.runner.migrations.job.MigrateAuthConfigJob; import org.springframework.data.domain.Sort; import org.springframework.data.mongodb.UncategorizedMongoDbException; import org.springframework.data.mongodb.core.index.CompoundIndexDefinition; @@ -12,23 +29,6 @@ import com.github.cloudyrock.mongock.ChangeLog; import com.github.cloudyrock.mongock.ChangeSet; import com.github.cloudyrock.mongock.driver.mongodb.springdata.v3.decorator.impl.MongockTemplate; -import com.openblocks.domain.application.model.Application; -import com.openblocks.domain.datasource.model.Datasource; -import com.openblocks.domain.datasource.model.DatasourceStructureDO; -import com.openblocks.domain.datasource.model.TokenBasedConnection; -import com.openblocks.domain.group.model.Group; -import com.openblocks.domain.group.model.QGroup; -import com.openblocks.domain.material.model.MaterialMeta; -import com.openblocks.domain.organization.model.Organization; -import com.openblocks.domain.query.model.LibraryQuery; -import com.openblocks.domain.query.model.LibraryQueryRecord; -import com.openblocks.domain.user.model.User; -import com.openblocks.infra.birelation.BiRelation; -import com.openblocks.infra.config.model.ServerConfig; -import com.openblocks.infra.eventlog.EventLog; -import com.openblocks.infra.serverlog.ServerLog; -import com.openblocks.runner.migrations.job.CompleteAuthType; -import com.openblocks.runner.migrations.job.MigrateAuthConfigJob; import lombok.extern.slf4j.Slf4j; diff --git a/server/api-service/openblocks-server/src/main/java/com/openblocks/runner/migrations/job/CompleteAuthType.java b/server/api-service/lowcoder-server/src/main/java/org/lowcoder/runner/migrations/job/CompleteAuthType.java similarity index 57% rename from server/api-service/openblocks-server/src/main/java/com/openblocks/runner/migrations/job/CompleteAuthType.java rename to server/api-service/lowcoder-server/src/main/java/org/lowcoder/runner/migrations/job/CompleteAuthType.java index 42eb1a7a5..f213a3059 100644 --- a/server/api-service/openblocks-server/src/main/java/com/openblocks/runner/migrations/job/CompleteAuthType.java +++ b/server/api-service/lowcoder-server/src/main/java/org/lowcoder/runner/migrations/job/CompleteAuthType.java @@ -1,4 +1,4 @@ -package com.openblocks.runner.migrations.job; +package org.lowcoder.runner.migrations.job; public interface CompleteAuthType { diff --git a/server/api-service/openblocks-server/src/main/java/com/openblocks/runner/migrations/job/CompleteAuthTypeImpl.java b/server/api-service/lowcoder-server/src/main/java/org/lowcoder/runner/migrations/job/CompleteAuthTypeImpl.java similarity index 79% rename from server/api-service/openblocks-server/src/main/java/com/openblocks/runner/migrations/job/CompleteAuthTypeImpl.java rename to server/api-service/lowcoder-server/src/main/java/org/lowcoder/runner/migrations/job/CompleteAuthTypeImpl.java index ca3e3d8ca..277707738 100644 --- a/server/api-service/openblocks-server/src/main/java/com/openblocks/runner/migrations/job/CompleteAuthTypeImpl.java +++ b/server/api-service/lowcoder-server/src/main/java/org/lowcoder/runner/migrations/job/CompleteAuthTypeImpl.java @@ -1,18 +1,17 @@ -package com.openblocks.runner.migrations.job; +package org.lowcoder.runner.migrations.job; import org.apache.commons.collections4.CollectionUtils; +import org.lowcoder.domain.organization.model.Organization; +import org.lowcoder.domain.organization.service.OrganizationService; +import org.lowcoder.sdk.auth.AbstractAuthConfig; +import org.lowcoder.sdk.auth.EmailAuthConfig; +import org.lowcoder.sdk.auth.constants.AuthTypeConstants; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.data.mongodb.core.ReactiveMongoTemplate; import org.springframework.data.mongodb.core.query.Criteria; import org.springframework.data.mongodb.core.query.Query; import org.springframework.stereotype.Component; -import com.openblocks.domain.organization.model.Organization; -import com.openblocks.domain.organization.service.OrganizationService; -import com.openblocks.sdk.auth.AbstractAuthConfig; -import com.openblocks.sdk.auth.EmailAuthConfig; -import com.openblocks.sdk.auth.constants.AuthTypeConstants; - @Component public class CompleteAuthTypeImpl implements CompleteAuthType { diff --git a/server/api-service/openblocks-server/src/main/java/com/openblocks/runner/migrations/job/MigrateAuthConfigJob.java b/server/api-service/lowcoder-server/src/main/java/org/lowcoder/runner/migrations/job/MigrateAuthConfigJob.java similarity index 91% rename from server/api-service/openblocks-server/src/main/java/com/openblocks/runner/migrations/job/MigrateAuthConfigJob.java rename to server/api-service/lowcoder-server/src/main/java/org/lowcoder/runner/migrations/job/MigrateAuthConfigJob.java index 2ffc18451..e3da175ff 100644 --- a/server/api-service/openblocks-server/src/main/java/com/openblocks/runner/migrations/job/MigrateAuthConfigJob.java +++ b/server/api-service/lowcoder-server/src/main/java/org/lowcoder/runner/migrations/job/MigrateAuthConfigJob.java @@ -1,4 +1,4 @@ -package com.openblocks.runner.migrations.job; +package org.lowcoder.runner.migrations.job; public interface MigrateAuthConfigJob { diff --git a/server/api-service/openblocks-server/src/main/java/com/openblocks/runner/migrations/job/MigrateAuthConfigJobImpl.java b/server/api-service/lowcoder-server/src/main/java/org/lowcoder/runner/migrations/job/MigrateAuthConfigJobImpl.java similarity index 79% rename from server/api-service/openblocks-server/src/main/java/com/openblocks/runner/migrations/job/MigrateAuthConfigJobImpl.java rename to server/api-service/lowcoder-server/src/main/java/org/lowcoder/runner/migrations/job/MigrateAuthConfigJobImpl.java index b2dd26ce9..ab729e2e7 100644 --- a/server/api-service/openblocks-server/src/main/java/com/openblocks/runner/migrations/job/MigrateAuthConfigJobImpl.java +++ b/server/api-service/lowcoder-server/src/main/java/org/lowcoder/runner/migrations/job/MigrateAuthConfigJobImpl.java @@ -1,21 +1,20 @@ -package com.openblocks.runner.migrations.job; +package org.lowcoder.runner.migrations.job; import java.util.List; import org.apache.commons.collections4.CollectionUtils; +import org.lowcoder.domain.organization.model.Organization; +import org.lowcoder.domain.organization.model.OrganizationDomain; +import org.lowcoder.domain.organization.repository.OrganizationRepository; +import org.lowcoder.domain.organization.service.OrganizationService; +import org.lowcoder.sdk.auth.AbstractAuthConfig; +import org.lowcoder.sdk.config.AuthProperties; +import org.lowcoder.sdk.config.CommonConfig; +import org.lowcoder.sdk.constants.WorkspaceMode; +import org.lowcoder.sdk.util.IDUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; -import com.openblocks.domain.organization.model.Organization; -import com.openblocks.domain.organization.model.OrganizationDomain; -import com.openblocks.domain.organization.repository.OrganizationRepository; -import com.openblocks.domain.organization.service.OrganizationService; -import com.openblocks.sdk.auth.AbstractAuthConfig; -import com.openblocks.sdk.config.AuthProperties; -import com.openblocks.sdk.config.CommonConfig; -import com.openblocks.sdk.constants.WorkspaceMode; -import com.openblocks.sdk.util.IDUtils; - @Component public class MigrateAuthConfigJobImpl implements MigrateAuthConfigJob { diff --git a/server/api-service/openblocks-server/src/main/java/com/openblocks/runner/task/IoHeartBeatTask.java b/server/api-service/lowcoder-server/src/main/java/org/lowcoder/runner/task/IoHeartBeatTask.java similarity index 87% rename from server/api-service/openblocks-server/src/main/java/com/openblocks/runner/task/IoHeartBeatTask.java rename to server/api-service/lowcoder-server/src/main/java/org/lowcoder/runner/task/IoHeartBeatTask.java index ca2d77619..344f3f86c 100644 --- a/server/api-service/openblocks-server/src/main/java/com/openblocks/runner/task/IoHeartBeatTask.java +++ b/server/api-service/lowcoder-server/src/main/java/org/lowcoder/runner/task/IoHeartBeatTask.java @@ -1,17 +1,16 @@ -package com.openblocks.runner.task; +package org.lowcoder.runner.task; -import static com.openblocks.infra.perf.PerfEvent.IO_HEART_BEAT; +import static org.lowcoder.infra.perf.PerfEvent.IO_HEART_BEAT; import java.time.Duration; import java.util.concurrent.TimeUnit; +import org.lowcoder.infra.perf.PerfHelper; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.data.redis.core.ReactiveRedisTemplate; import org.springframework.scheduling.annotation.Scheduled; import org.springframework.stereotype.Component; -import com.openblocks.infra.perf.PerfHelper; - import io.micrometer.core.instrument.Tags; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; diff --git a/server/api-service/openblocks-server/src/main/resources/application-openblocks.yml b/server/api-service/lowcoder-server/src/main/resources/application-lowcoder.yml similarity index 74% rename from server/api-service/openblocks-server/src/main/resources/application-openblocks.yml rename to server/api-service/lowcoder-server/src/main/resources/application-lowcoder.yml index 25f9d3906..3ba6e2c56 100644 --- a/server/api-service/openblocks-server/src/main/resources/application-openblocks.yml +++ b/server/api-service/lowcoder-server/src/main/resources/application-lowcoder.yml @@ -7,7 +7,7 @@ spring: mongodb: authentication-database: admin auto-index-creation: false - uri: mongodb://localhost:27017/openblocks?socketTimeoutMS=5000 + uri: mongodb://localhost:27017/lowcoder?socketTimeoutMS=5000 redis: url: redis://localhost:6379 main: @@ -24,13 +24,13 @@ server: shutdown: graceful common: - cookie-name: LOCAL_OPENBLOCKS_TOKEN - product: openblocks + cookie-name: LOCAL_LOWCODER_TOKEN + product: lowcoder domain: default-value: skipCheck encrypt: - password: openblocks - salt: openblocks + password: lowcoder + salt: lowcoder cloud: true security: cors-allowed-domains: @@ -40,4 +40,4 @@ common: material: mongodb-grid-fs: - bucket-name: material \ No newline at end of file + bucket-name: material diff --git a/server/api-service/openblocks-server/src/main/resources/recommendedJsLibraries.json b/server/api-service/lowcoder-server/src/main/resources/recommendedJsLibraries.json similarity index 100% rename from server/api-service/openblocks-server/src/main/resources/recommendedJsLibraries.json rename to server/api-service/lowcoder-server/src/main/resources/recommendedJsLibraries.json diff --git a/server/api-service/openblocks-server/src/main/resources/selfhost/ce/application-selfhost.yml b/server/api-service/lowcoder-server/src/main/resources/selfhost/ce/application-selfhost.yml similarity index 54% rename from server/api-service/openblocks-server/src/main/resources/selfhost/ce/application-selfhost.yml rename to server/api-service/lowcoder-server/src/main/resources/selfhost/ce/application-selfhost.yml index 3fe5e146d..ae65dec38 100644 --- a/server/api-service/openblocks-server/src/main/resources/selfhost/ce/application-selfhost.yml +++ b/server/api-service/lowcoder-server/src/main/resources/selfhost/ce/application-selfhost.yml @@ -1,7 +1,7 @@ common: encrypt: - password: ${ENCRYPTION_PASSWORD:openblocks.dev} - salt: ${ENCRYPTION_SALT:openblocks.dev} + password: ${ENCRYPTION_PASSWORD:lowcoder.org} + salt: ${ENCRYPTION_SALT:lowcoder.org} security: corsAllowedDomainString: ${CORS_ALLOWED_DOMAINS:*} workspace: @@ -15,6 +15,6 @@ auth: spring: data: mongodb: - uri: ${MONGODB_URI:mongodb://localhost:27017/openblocks?socketTimeoutMS=5000} + uri: ${MONGODB_URI:mongodb://localhost:27017/lowcoder?socketTimeoutMS=5000} redis: - url: ${REDIS_URL:redis://localhost:6379} \ No newline at end of file + url: ${REDIS_URL:redis://localhost:6379} diff --git a/server/api-service/openblocks-server/src/main/resources/selfhost/ce/application.yml b/server/api-service/lowcoder-server/src/main/resources/selfhost/ce/application.yml similarity index 84% rename from server/api-service/openblocks-server/src/main/resources/selfhost/ce/application.yml rename to server/api-service/lowcoder-server/src/main/resources/selfhost/ce/application.yml index cdc116f3b..c234e8cc3 100644 --- a/server/api-service/openblocks-server/src/main/resources/selfhost/ce/application.yml +++ b/server/api-service/lowcoder-server/src/main/resources/selfhost/ce/application.yml @@ -24,10 +24,10 @@ server: shutdown: graceful common: - cookie-name: OPENBLOCKS_CE_SELFHOST_TOKEN - product: openblocks + cookie-name: LOWCODER_CE_SELFHOST_TOKEN + product: lowcoder domain: - default-value: openblocks.dev + default-value: lowcoder.org cloud: false version: 1.1.8 block-hound-enable: false @@ -38,4 +38,4 @@ common: material: mongodb-grid-fs: - bucket-name: material \ No newline at end of file + bucket-name: material diff --git a/server/api-service/openblocks-server/src/test/java/com/openblocks/api/TreeTest.java b/server/api-service/lowcoder-server/src/test/java/org/lowcoder/api/TreeTest.java similarity index 93% rename from server/api-service/openblocks-server/src/test/java/com/openblocks/api/TreeTest.java rename to server/api-service/lowcoder-server/src/test/java/org/lowcoder/api/TreeTest.java index 2f4a4a23b..758999cce 100644 --- a/server/api-service/openblocks-server/src/test/java/com/openblocks/api/TreeTest.java +++ b/server/api-service/lowcoder-server/src/test/java/org/lowcoder/api/TreeTest.java @@ -1,4 +1,4 @@ -package com.openblocks.api; +package org.lowcoder.api; import java.util.ArrayList; import java.util.HashMap; @@ -7,11 +7,10 @@ import org.junit.Assert; import org.junit.Test; - -import com.openblocks.api.application.view.ApplicationInfoView; -import com.openblocks.api.home.FolderInfoView; -import com.openblocks.domain.folder.service.FolderNode; -import com.openblocks.domain.folder.service.Tree; +import org.lowcoder.api.application.view.ApplicationInfoView; +import org.lowcoder.api.home.FolderInfoView; +import org.lowcoder.domain.folder.service.FolderNode; +import org.lowcoder.domain.folder.service.Tree; public class TreeTest { diff --git a/server/api-service/openblocks-server/src/test/java/com/openblocks/api/application/ApplicationApiServiceTest.java b/server/api-service/lowcoder-server/src/test/java/org/lowcoder/api/application/ApplicationApiServiceTest.java similarity index 93% rename from server/api-service/openblocks-server/src/test/java/com/openblocks/api/application/ApplicationApiServiceTest.java rename to server/api-service/lowcoder-server/src/test/java/org/lowcoder/api/application/ApplicationApiServiceTest.java index 64b04aa23..569850ca4 100644 --- a/server/api-service/openblocks-server/src/test/java/com/openblocks/api/application/ApplicationApiServiceTest.java +++ b/server/api-service/lowcoder-server/src/test/java/org/lowcoder/api/application/ApplicationApiServiceTest.java @@ -1,4 +1,4 @@ -package com.openblocks.api.application; +package org.lowcoder.api.application; import java.util.List; @@ -8,29 +8,29 @@ import org.junit.Assert; import org.junit.Test; import org.junit.runner.RunWith; +import org.lowcoder.api.application.ApplicationApiService; +import org.lowcoder.api.application.ApplicationController.CreateApplicationRequest; +import org.lowcoder.api.application.view.ApplicationPermissionView; +import org.lowcoder.api.application.view.ApplicationView; +import org.lowcoder.api.common.mockuser.WithMockUser; +import org.lowcoder.api.datasource.DatasourceApiService; +import org.lowcoder.api.datasource.DatasourceApiServiceTest; +import org.lowcoder.api.home.FolderApiService; +import org.lowcoder.api.permission.view.CommonPermissionView; +import org.lowcoder.api.permission.view.PermissionItemView; +import org.lowcoder.domain.application.model.Application; +import org.lowcoder.domain.application.model.ApplicationStatus; +import org.lowcoder.domain.application.model.ApplicationType; +import org.lowcoder.domain.application.service.ApplicationService; +import org.lowcoder.domain.datasource.model.Datasource; +import org.lowcoder.domain.permission.model.ResourceHolder; +import org.lowcoder.domain.permission.model.ResourceRole; +import org.lowcoder.sdk.exception.BizError; +import org.lowcoder.sdk.exception.BizException; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.test.context.junit4.SpringRunner; -import com.openblocks.api.application.ApplicationController.CreateApplicationRequest; -import com.openblocks.api.application.view.ApplicationPermissionView; -import com.openblocks.api.application.view.ApplicationView; -import com.openblocks.api.common.mockuser.WithMockUser; -import com.openblocks.api.datasource.DatasourceApiService; -import com.openblocks.api.datasource.DatasourceApiServiceTest; -import com.openblocks.api.home.FolderApiService; -import com.openblocks.api.permission.view.CommonPermissionView; -import com.openblocks.api.permission.view.PermissionItemView; -import com.openblocks.domain.application.model.Application; -import com.openblocks.domain.application.model.ApplicationStatus; -import com.openblocks.domain.application.model.ApplicationType; -import com.openblocks.domain.application.service.ApplicationService; -import com.openblocks.domain.datasource.model.Datasource; -import com.openblocks.domain.permission.model.ResourceHolder; -import com.openblocks.domain.permission.model.ResourceRole; -import com.openblocks.sdk.exception.BizError; -import com.openblocks.sdk.exception.BizException; - import reactor.core.publisher.Mono; import reactor.test.StepVerifier; diff --git a/server/api-service/openblocks-server/src/test/java/com/openblocks/api/application/CompoundApplicationDslFilterTest.java b/server/api-service/lowcoder-server/src/test/java/org/lowcoder/api/application/CompoundApplicationDslFilterTest.java similarity index 89% rename from server/api-service/openblocks-server/src/test/java/com/openblocks/api/application/CompoundApplicationDslFilterTest.java rename to server/api-service/lowcoder-server/src/test/java/org/lowcoder/api/application/CompoundApplicationDslFilterTest.java index 55badc3ce..30a974c34 100644 --- a/server/api-service/openblocks-server/src/test/java/com/openblocks/api/application/CompoundApplicationDslFilterTest.java +++ b/server/api-service/lowcoder-server/src/test/java/org/lowcoder/api/application/CompoundApplicationDslFilterTest.java @@ -1,4 +1,4 @@ -package com.openblocks.api.application; +package org.lowcoder.api.application; import java.util.HashMap; import java.util.Map; @@ -8,14 +8,14 @@ import org.junit.Assert; import org.junit.Test; import org.junit.runner.RunWith; +import org.lowcoder.api.application.CompoundApplicationDslFilter; +import org.lowcoder.api.common.mockuser.WithMockUser; +import org.lowcoder.sdk.constants.DslConstants.CompoundAppDslConstants; +import org.lowcoder.sdk.test.JsonFileReader; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.test.context.junit4.SpringRunner; -import com.openblocks.api.common.mockuser.WithMockUser; -import com.openblocks.sdk.constants.DslConstants.CompoundAppDslConstants; -import com.openblocks.sdk.test.JsonFileReader; - @SpringBootTest @RunWith(SpringRunner.class) public class CompoundApplicationDslFilterTest { diff --git a/server/api-service/openblocks-server/src/test/java/com/openblocks/api/application/CompoundApplicationDslFilterTest.json b/server/api-service/lowcoder-server/src/test/java/org/lowcoder/api/application/CompoundApplicationDslFilterTest.json similarity index 100% rename from server/api-service/openblocks-server/src/test/java/com/openblocks/api/application/CompoundApplicationDslFilterTest.json rename to server/api-service/lowcoder-server/src/test/java/org/lowcoder/api/application/CompoundApplicationDslFilterTest.json diff --git a/server/api-service/openblocks-server/src/test/java/com/openblocks/api/authentication/AuthenticationControllerTest.java b/server/api-service/lowcoder-server/src/test/java/org/lowcoder/api/authentication/AuthenticationControllerTest.java similarity index 89% rename from server/api-service/openblocks-server/src/test/java/com/openblocks/api/authentication/AuthenticationControllerTest.java rename to server/api-service/lowcoder-server/src/test/java/org/lowcoder/api/authentication/AuthenticationControllerTest.java index 6746fb3a7..1184ec5cc 100644 --- a/server/api-service/openblocks-server/src/test/java/com/openblocks/api/authentication/AuthenticationControllerTest.java +++ b/server/api-service/lowcoder-server/src/test/java/org/lowcoder/api/authentication/AuthenticationControllerTest.java @@ -1,18 +1,31 @@ -package com.openblocks.api.authentication; +package org.lowcoder.api.authentication; -import static com.openblocks.sdk.exception.BizError.INVALID_PASSWORD; -import static com.openblocks.sdk.exception.BizError.USER_LOGIN_ID_EXIST; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertNull; import static org.junit.Assert.assertTrue; +import static org.lowcoder.sdk.exception.BizError.INVALID_PASSWORD; +import static org.lowcoder.sdk.exception.BizError.USER_LOGIN_ID_EXIST; import java.util.Map; import java.util.Objects; import org.junit.Test; import org.junit.runner.RunWith; +import org.lowcoder.api.authentication.AuthenticationController; +import org.lowcoder.api.authentication.AuthenticationController.FormLoginRequest; +import org.lowcoder.api.framework.view.ResponseView; +import org.lowcoder.domain.authentication.AuthenticationService; +import org.lowcoder.domain.authentication.FindAuthConfig; +import org.lowcoder.domain.encryption.EncryptionService; +import org.lowcoder.domain.user.model.Connection; +import org.lowcoder.domain.user.model.User; +import org.lowcoder.domain.user.model.UserState; +import org.lowcoder.domain.user.repository.UserRepository; +import org.lowcoder.sdk.auth.AbstractAuthConfig; +import org.lowcoder.sdk.constants.AuthSourceConstants; +import org.lowcoder.sdk.exception.BizException; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.http.ResponseCookie; @@ -23,18 +36,6 @@ import org.springframework.util.MultiValueMap; import com.google.common.collect.Iterables; -import com.openblocks.api.authentication.AuthenticationController.FormLoginRequest; -import com.openblocks.api.framework.view.ResponseView; -import com.openblocks.domain.authentication.AuthenticationService; -import com.openblocks.domain.authentication.FindAuthConfig; -import com.openblocks.domain.encryption.EncryptionService; -import com.openblocks.domain.user.model.Connection; -import com.openblocks.domain.user.model.User; -import com.openblocks.domain.user.model.UserState; -import com.openblocks.domain.user.repository.UserRepository; -import com.openblocks.sdk.auth.AbstractAuthConfig; -import com.openblocks.sdk.constants.AuthSourceConstants; -import com.openblocks.sdk.exception.BizException; import reactor.core.publisher.Mono; import reactor.test.StepVerifier; @@ -56,7 +57,7 @@ public class AuthenticationControllerTest { @Test public void testFormRegisterSuccess() { String email = "test_register@ob.dev"; - String password = "openblocks"; + String password = "lowcoder"; String source = AuthSourceConstants.EMAIL; String authId = getEmailAuthConfigId(); @@ -103,7 +104,7 @@ public void testFormRegisterSuccess() { @Test public void testFormLoginSuccess() { String email = "test_login@ob.dev"; - String password = "openblocks"; + String password = "lowcoder"; String source = AuthSourceConstants.EMAIL; String authId = getEmailAuthConfigId(); @@ -157,7 +158,7 @@ public void testFormLoginSuccess() { public void testRegisterFailByLoginIdExist() { String email = "test_register_fail@ob.dev"; - String password = "openblocks"; + String password = "lowcoder"; String source = AuthSourceConstants.EMAIL; FormLoginRequest formLoginRequest = new FormLoginRequest(email, password, true, source, getEmailAuthConfigId()); @@ -178,7 +179,7 @@ public void testRegisterFailByLoginIdExist() { @Test public void testLoginFailByLoginIdNotExist() { String email = "test_login_fail@ob.dev"; - String password = "openblocks"; + String password = "lowcoder"; String source = AuthSourceConstants.EMAIL; FormLoginRequest formLoginRequest = new FormLoginRequest(email, password, false, source, getEmailAuthConfigId()); @@ -205,4 +206,4 @@ private String getEmailAuthConfigId() { @Test public void logout() { } -} \ No newline at end of file +} diff --git a/server/api-service/openblocks-server/src/test/java/com/openblocks/api/authentication/GoogleAuthenticateTest.java b/server/api-service/lowcoder-server/src/test/java/org/lowcoder/api/authentication/GoogleAuthenticateTest.java similarity index 85% rename from server/api-service/openblocks-server/src/test/java/com/openblocks/api/authentication/GoogleAuthenticateTest.java rename to server/api-service/lowcoder-server/src/test/java/org/lowcoder/api/authentication/GoogleAuthenticateTest.java index 137603b4d..d1d39a236 100644 --- a/server/api-service/openblocks-server/src/test/java/com/openblocks/api/authentication/GoogleAuthenticateTest.java +++ b/server/api-service/lowcoder-server/src/test/java/org/lowcoder/api/authentication/GoogleAuthenticateTest.java @@ -1,4 +1,4 @@ -package com.openblocks.api.authentication; +package org.lowcoder.api.authentication; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; @@ -11,6 +11,17 @@ import org.junit.Test; import org.junit.runner.RunWith; +import org.lowcoder.api.authentication.AuthenticationController; +import org.lowcoder.api.authentication.AuthenticationController.FormLoginRequest; +import org.lowcoder.domain.authentication.AuthenticationService; +import org.lowcoder.domain.authentication.FindAuthConfig; +import org.lowcoder.domain.encryption.EncryptionService; +import org.lowcoder.domain.user.model.Connection; +import org.lowcoder.domain.user.model.User; +import org.lowcoder.domain.user.model.UserState; +import org.lowcoder.domain.user.repository.UserRepository; +import org.lowcoder.sdk.auth.AbstractAuthConfig; +import org.lowcoder.sdk.constants.AuthSourceConstants; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.http.ResponseCookie; @@ -20,16 +31,6 @@ import org.springframework.util.MultiValueMap; import com.google.common.collect.Iterables; -import com.openblocks.api.authentication.AuthenticationController.FormLoginRequest; -import com.openblocks.domain.authentication.AuthenticationService; -import com.openblocks.domain.authentication.FindAuthConfig; -import com.openblocks.domain.encryption.EncryptionService; -import com.openblocks.domain.user.model.Connection; -import com.openblocks.domain.user.model.User; -import com.openblocks.domain.user.model.UserState; -import com.openblocks.domain.user.repository.UserRepository; -import com.openblocks.sdk.auth.AbstractAuthConfig; -import com.openblocks.sdk.constants.AuthSourceConstants; import reactor.core.publisher.Mono; import reactor.test.StepVerifier; @@ -50,7 +51,7 @@ public class GoogleAuthenticateTest { @Test public void testGoogleRegisterSuccess() { String email = "test_register@ob.dev"; - String password = "openblocks"; + String password = "lowcoder"; String source = AuthSourceConstants.EMAIL; String authId = getGoogleAuthConfigId(); diff --git a/server/api-service/openblocks-server/src/test/java/com/openblocks/api/authentication/mock/MockGoogleOauth2AuthRequestFactory.java b/server/api-service/lowcoder-server/src/test/java/org/lowcoder/api/authentication/mock/MockGoogleOauth2AuthRequestFactory.java similarity index 73% rename from server/api-service/openblocks-server/src/test/java/com/openblocks/api/authentication/mock/MockGoogleOauth2AuthRequestFactory.java rename to server/api-service/lowcoder-server/src/test/java/org/lowcoder/api/authentication/mock/MockGoogleOauth2AuthRequestFactory.java index f00807a51..a8a01b8d1 100644 --- a/server/api-service/openblocks-server/src/test/java/com/openblocks/api/authentication/mock/MockGoogleOauth2AuthRequestFactory.java +++ b/server/api-service/lowcoder-server/src/test/java/org/lowcoder/api/authentication/mock/MockGoogleOauth2AuthRequestFactory.java @@ -1,12 +1,13 @@ -//package com.openblocks.api.authentication.mock; +package org.lowcoder.api.authentication.mock; +//package org.lowcoder.api.authentication.mock; // -//import static com.openblocks.api.authentication.request.ee.common.JustAuthBasedOAuth2Request.wrap; +//import static org.lowcoder.api.authentication.request.ee.common.JustAuthBasedOAuth2Request.wrap; // //import org.springframework.context.annotation.Primary; // -//import com.openblocks.api.authentication.request.AuthRequest; -//import com.openblocks.api.authentication.request.ee.common.OAuth2RequestContext; -//import com.openblocks.api.authentication.request.ee.google.GoogleOauth2AuthRequestFactory; +//import org.lowcoder.api.authentication.request.AuthRequest; +//import org.lowcoder.api.authentication.request.ee.common.OAuth2RequestContext; +//import org.lowcoder.api.authentication.request.ee.google.GoogleOauth2AuthRequestFactory; // //import me.zhyd.oauth.model.AuthCallback; //import me.zhyd.oauth.model.AuthResponse; diff --git a/server/api-service/openblocks-server/src/test/java/com/openblocks/api/authentication/service/AuthenticationApiServiceTest.java b/server/api-service/lowcoder-server/src/test/java/org/lowcoder/api/authentication/service/AuthenticationApiServiceTest.java similarity index 84% rename from server/api-service/openblocks-server/src/test/java/com/openblocks/api/authentication/service/AuthenticationApiServiceTest.java rename to server/api-service/lowcoder-server/src/test/java/org/lowcoder/api/authentication/service/AuthenticationApiServiceTest.java index 7c7ef3f97..51cadb3a4 100644 --- a/server/api-service/openblocks-server/src/test/java/com/openblocks/api/authentication/service/AuthenticationApiServiceTest.java +++ b/server/api-service/lowcoder-server/src/test/java/org/lowcoder/api/authentication/service/AuthenticationApiServiceTest.java @@ -1,6 +1,7 @@ -//package com.openblocks.api.authentication.service; +package org.lowcoder.api.authentication.service; +//package org.lowcoder.api.authentication.service; // -//import static com.openblocks.sdk.constants.AuthSourceConstants.EMAIL; +//import static org.lowcoder.sdk.constants.AuthSourceConstants.EMAIL; // //import org.junit.Assert; //import org.junit.Test; @@ -9,7 +10,7 @@ //import org.springframework.boot.test.context.SpringBootTest; //import org.springframework.test.context.junit4.SpringRunner; // -//import com.openblocks.domain.user.model.AuthorizedUser; +//import org.lowcoder.domain.user.model.AuthorizedUser; // //import reactor.core.publisher.Mono; //import reactor.test.StepVerifier; diff --git a/server/api-service/openblocks-server/src/test/java/com/openblocks/api/common/InitData.java b/server/api-service/lowcoder-server/src/test/java/org/lowcoder/api/common/InitData.java similarity index 89% rename from server/api-service/openblocks-server/src/test/java/com/openblocks/api/common/InitData.java rename to server/api-service/lowcoder-server/src/test/java/org/lowcoder/api/common/InitData.java index fc13ba715..a6ace52e3 100644 --- a/server/api-service/openblocks-server/src/test/java/com/openblocks/api/common/InitData.java +++ b/server/api-service/lowcoder-server/src/test/java/org/lowcoder/api/common/InitData.java @@ -1,4 +1,4 @@ -package com.openblocks.api.common; +package org.lowcoder.api.common; import java.io.File; import java.io.FileReader; @@ -13,15 +13,14 @@ import org.apache.commons.collections4.MapUtils; import org.apache.commons.io.IOUtils; +import org.lowcoder.sdk.models.HasIdAndAuditing; +import org.lowcoder.sdk.test.JsonFileReader; +import org.lowcoder.sdk.util.JsonUtils; +import org.lowcoder.sdk.util.MoreMapUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.data.mongodb.core.ReactiveMongoTemplate; import org.springframework.stereotype.Component; -import com.openblocks.sdk.util.MoreMapUtils; -import com.openblocks.sdk.models.HasIdAndAuditing; -import com.openblocks.sdk.test.JsonFileReader; -import com.openblocks.sdk.util.JsonUtils; - @Component public class InitData { @@ -58,7 +57,7 @@ public void init() { @SuppressWarnings({"ConstantConditions"}) private void execute() { - String currentDirPath = JsonFileReader.buildPath("com/openblocks/api/common/json"); + String currentDirPath = JsonFileReader.buildPath("com/lowcoder/api/common/json"); File dir = new File(currentDirPath); Stream.of(dir.listFiles()) .filter(file -> file.isFile() && file.getName().endsWith(".json")) diff --git a/server/api-service/openblocks-server/src/test/java/com/openblocks/api/common/RedisConfiguration.java b/server/api-service/lowcoder-server/src/test/java/org/lowcoder/api/common/RedisConfiguration.java similarity index 96% rename from server/api-service/openblocks-server/src/test/java/com/openblocks/api/common/RedisConfiguration.java rename to server/api-service/lowcoder-server/src/test/java/org/lowcoder/api/common/RedisConfiguration.java index 7a3e49e3b..666296b13 100644 --- a/server/api-service/openblocks-server/src/test/java/com/openblocks/api/common/RedisConfiguration.java +++ b/server/api-service/lowcoder-server/src/test/java/org/lowcoder/api/common/RedisConfiguration.java @@ -1,4 +1,4 @@ -package com.openblocks.api.common; +package org.lowcoder.api.common; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; diff --git a/server/api-service/openblocks-server/src/test/java/com/openblocks/api/common/SessionUserServiceImplTest.java b/server/api-service/lowcoder-server/src/test/java/org/lowcoder/api/common/SessionUserServiceImplTest.java similarity index 70% rename from server/api-service/openblocks-server/src/test/java/com/openblocks/api/common/SessionUserServiceImplTest.java rename to server/api-service/lowcoder-server/src/test/java/org/lowcoder/api/common/SessionUserServiceImplTest.java index 6230515f4..70a530a23 100644 --- a/server/api-service/openblocks-server/src/test/java/com/openblocks/api/common/SessionUserServiceImplTest.java +++ b/server/api-service/lowcoder-server/src/test/java/org/lowcoder/api/common/SessionUserServiceImplTest.java @@ -1,11 +1,10 @@ -package com.openblocks.api.common; +package org.lowcoder.api.common; +import org.lowcoder.api.home.SessionUserServiceImpl; +import org.lowcoder.domain.organization.model.OrgMember; import org.springframework.context.annotation.Primary; import org.springframework.stereotype.Service; -import com.openblocks.api.home.SessionUserServiceImpl; -import com.openblocks.domain.organization.model.OrgMember; - import reactor.core.publisher.Mono; @Primary diff --git a/server/api-service/openblocks-server/src/test/java/com/openblocks/api/common/SpringPluginManagerConfiguration.java b/server/api-service/lowcoder-server/src/test/java/org/lowcoder/api/common/SpringPluginManagerConfiguration.java similarity index 87% rename from server/api-service/openblocks-server/src/test/java/com/openblocks/api/common/SpringPluginManagerConfiguration.java rename to server/api-service/lowcoder-server/src/test/java/org/lowcoder/api/common/SpringPluginManagerConfiguration.java index 5dd9eecfb..2a5918fc6 100644 --- a/server/api-service/openblocks-server/src/test/java/com/openblocks/api/common/SpringPluginManagerConfiguration.java +++ b/server/api-service/lowcoder-server/src/test/java/org/lowcoder/api/common/SpringPluginManagerConfiguration.java @@ -1,4 +1,4 @@ -package com.openblocks.api.common; +package org.lowcoder.api.common; import static org.pf4j.AbstractPluginManager.MODE_PROPERTY_NAME; import static org.pf4j.RuntimeMode.DEVELOPMENT; @@ -17,7 +17,7 @@ public class SpringPluginManagerConfiguration { @Primary public SpringPluginManager springPluginManager() { System.setProperty(MODE_PROPERTY_NAME, DEVELOPMENT.toString()); - Path path = Path.of("../openblocks-plugins"); + Path path = Path.of("../lowcoder-plugins"); return new SpringPluginManager(path); } } diff --git a/server/api-service/openblocks-server/src/test/java/com/openblocks/api/common/TestRedisConfiguration.java b/server/api-service/lowcoder-server/src/test/java/org/lowcoder/api/common/TestRedisConfiguration.java similarity index 97% rename from server/api-service/openblocks-server/src/test/java/com/openblocks/api/common/TestRedisConfiguration.java rename to server/api-service/lowcoder-server/src/test/java/org/lowcoder/api/common/TestRedisConfiguration.java index a70b5ba62..130a0e3f4 100644 --- a/server/api-service/openblocks-server/src/test/java/com/openblocks/api/common/TestRedisConfiguration.java +++ b/server/api-service/lowcoder-server/src/test/java/org/lowcoder/api/common/TestRedisConfiguration.java @@ -1,4 +1,4 @@ -package com.openblocks.api.common; +package org.lowcoder.api.common; import java.time.Duration; import java.util.concurrent.atomic.AtomicInteger; diff --git a/server/api-service/openblocks-server/src/test/java/com/openblocks/api/common/json/application.json b/server/api-service/lowcoder-server/src/test/java/org/lowcoder/api/common/json/application.json similarity index 95% rename from server/api-service/openblocks-server/src/test/java/com/openblocks/api/common/json/application.json rename to server/api-service/lowcoder-server/src/test/java/org/lowcoder/api/common/json/application.json index 26f95c211..c25104e3f 100644 --- a/server/api-service/openblocks-server/src/test/java/com/openblocks/api/common/json/application.json +++ b/server/api-service/lowcoder-server/src/test/java/org/lowcoder/api/common/json/application.json @@ -1,5 +1,5 @@ { - "class": "com.openblocks.domain.application.model.Application", + "class": "org.lowcoder.domain.application.model.Application", "data": [ { "id": "app01", diff --git a/server/api-service/openblocks-server/src/test/java/com/openblocks/api/common/json/folder.json b/server/api-service/lowcoder-server/src/test/java/org/lowcoder/api/common/json/folder.json similarity index 86% rename from server/api-service/openblocks-server/src/test/java/com/openblocks/api/common/json/folder.json rename to server/api-service/lowcoder-server/src/test/java/org/lowcoder/api/common/json/folder.json index 1bd09c32d..254093ce0 100644 --- a/server/api-service/openblocks-server/src/test/java/com/openblocks/api/common/json/folder.json +++ b/server/api-service/lowcoder-server/src/test/java/org/lowcoder/api/common/json/folder.json @@ -1,5 +1,5 @@ { - "class": "com.openblocks.domain.folder.model.Folder", + "class": "org.lowcoder.domain.folder.model.Folder", "data": [ { "id": "folder01", diff --git a/server/api-service/openblocks-server/src/test/java/com/openblocks/api/common/json/group.json b/server/api-service/lowcoder-server/src/test/java/org/lowcoder/api/common/json/group.json similarity index 83% rename from server/api-service/openblocks-server/src/test/java/com/openblocks/api/common/json/group.json rename to server/api-service/lowcoder-server/src/test/java/org/lowcoder/api/common/json/group.json index 85ff531a8..45bcb4a68 100644 --- a/server/api-service/openblocks-server/src/test/java/com/openblocks/api/common/json/group.json +++ b/server/api-service/lowcoder-server/src/test/java/org/lowcoder/api/common/json/group.json @@ -1,5 +1,5 @@ { - "class": "com.openblocks.domain.group.model.Group", + "class": "org.lowcoder.domain.group.model.Group", "data": [ { "id": "dev", diff --git a/server/api-service/openblocks-server/src/test/java/com/openblocks/api/common/json/group_member.json b/server/api-service/lowcoder-server/src/test/java/org/lowcoder/api/common/json/group_member.json similarity index 87% rename from server/api-service/openblocks-server/src/test/java/com/openblocks/api/common/json/group_member.json rename to server/api-service/lowcoder-server/src/test/java/org/lowcoder/api/common/json/group_member.json index 16eeaaee5..7cfac07a3 100644 --- a/server/api-service/openblocks-server/src/test/java/com/openblocks/api/common/json/group_member.json +++ b/server/api-service/lowcoder-server/src/test/java/org/lowcoder/api/common/json/group_member.json @@ -1,5 +1,5 @@ { - "class": "com.openblocks.infra.birelation.BiRelation", + "class": "org.lowcoder.infra.birelation.BiRelation", "data": [ { "id": "group_member02", diff --git a/server/api-service/openblocks-server/src/test/java/com/openblocks/api/common/json/org_member.json b/server/api-service/lowcoder-server/src/test/java/org/lowcoder/api/common/json/org_member.json similarity index 90% rename from server/api-service/openblocks-server/src/test/java/com/openblocks/api/common/json/org_member.json rename to server/api-service/lowcoder-server/src/test/java/org/lowcoder/api/common/json/org_member.json index 1d1de76c6..f1f912500 100644 --- a/server/api-service/openblocks-server/src/test/java/com/openblocks/api/common/json/org_member.json +++ b/server/api-service/lowcoder-server/src/test/java/org/lowcoder/api/common/json/org_member.json @@ -1,5 +1,5 @@ { - "class": "com.openblocks.infra.birelation.BiRelation", + "class": "org.lowcoder.infra.birelation.BiRelation", "data": [ { "id": "org_member01", diff --git a/server/api-service/openblocks-server/src/test/java/com/openblocks/api/common/json/organization.json b/server/api-service/lowcoder-server/src/test/java/org/lowcoder/api/common/json/organization.json similarity index 75% rename from server/api-service/openblocks-server/src/test/java/com/openblocks/api/common/json/organization.json rename to server/api-service/lowcoder-server/src/test/java/org/lowcoder/api/common/json/organization.json index 96fe6fec8..6c21aacd3 100644 --- a/server/api-service/openblocks-server/src/test/java/com/openblocks/api/common/json/organization.json +++ b/server/api-service/lowcoder-server/src/test/java/org/lowcoder/api/common/json/organization.json @@ -1,5 +1,5 @@ { - "class": "com.openblocks.domain.organization.model.Organization", + "class": "org.lowcoder.domain.organization.model.Organization", "data": [ { "id": "org01", diff --git a/server/api-service/openblocks-server/src/test/java/com/openblocks/api/common/json/user.json b/server/api-service/lowcoder-server/src/test/java/org/lowcoder/api/common/json/user.json similarity index 94% rename from server/api-service/openblocks-server/src/test/java/com/openblocks/api/common/json/user.json rename to server/api-service/lowcoder-server/src/test/java/org/lowcoder/api/common/json/user.json index a32ec76cf..b7d91bf4b 100644 --- a/server/api-service/openblocks-server/src/test/java/com/openblocks/api/common/json/user.json +++ b/server/api-service/lowcoder-server/src/test/java/org/lowcoder/api/common/json/user.json @@ -1,5 +1,5 @@ { - "class": "com.openblocks.domain.user.model.User", + "class": "org.lowcoder.domain.user.model.User", "data": [ { "id": "user01", diff --git a/server/api-service/openblocks-server/src/test/java/com/openblocks/api/common/mockuser/WithMockSecurityContextFactory.java b/server/api-service/lowcoder-server/src/test/java/org/lowcoder/api/common/mockuser/WithMockSecurityContextFactory.java similarity index 92% rename from server/api-service/openblocks-server/src/test/java/com/openblocks/api/common/mockuser/WithMockSecurityContextFactory.java rename to server/api-service/lowcoder-server/src/test/java/org/lowcoder/api/common/mockuser/WithMockSecurityContextFactory.java index d3bdb5078..872dac005 100644 --- a/server/api-service/openblocks-server/src/test/java/com/openblocks/api/common/mockuser/WithMockSecurityContextFactory.java +++ b/server/api-service/lowcoder-server/src/test/java/org/lowcoder/api/common/mockuser/WithMockSecurityContextFactory.java @@ -1,7 +1,8 @@ -package com.openblocks.api.common.mockuser; +package org.lowcoder.api.common.mockuser; import java.util.Collections; +import org.lowcoder.domain.user.model.User; import org.springframework.security.authentication.UsernamePasswordAuthenticationToken; import org.springframework.security.core.Authentication; import org.springframework.security.core.context.SecurityContext; @@ -9,8 +10,6 @@ import org.springframework.security.test.context.support.WithSecurityContextFactory; import org.springframework.security.test.context.support.WithSecurityContextTestExecutionListener; -import com.openblocks.domain.user.model.User; - /** * @see WithSecurityContextTestExecutionListener */ diff --git a/server/api-service/openblocks-server/src/test/java/com/openblocks/api/common/mockuser/WithMockUser.java b/server/api-service/lowcoder-server/src/test/java/org/lowcoder/api/common/mockuser/WithMockUser.java similarity index 92% rename from server/api-service/openblocks-server/src/test/java/com/openblocks/api/common/mockuser/WithMockUser.java rename to server/api-service/lowcoder-server/src/test/java/org/lowcoder/api/common/mockuser/WithMockUser.java index c60fd4c70..c0a45ebea 100644 --- a/server/api-service/openblocks-server/src/test/java/com/openblocks/api/common/mockuser/WithMockUser.java +++ b/server/api-service/lowcoder-server/src/test/java/org/lowcoder/api/common/mockuser/WithMockUser.java @@ -1,4 +1,4 @@ -package com.openblocks.api.common.mockuser; +package org.lowcoder.api.common.mockuser; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; diff --git a/server/api-service/openblocks-server/src/test/java/com/openblocks/api/configurations/SecurityTestConfig.java b/server/api-service/lowcoder-server/src/test/java/org/lowcoder/api/configurations/SecurityTestConfig.java similarity index 93% rename from server/api-service/openblocks-server/src/test/java/com/openblocks/api/configurations/SecurityTestConfig.java rename to server/api-service/lowcoder-server/src/test/java/org/lowcoder/api/configurations/SecurityTestConfig.java index 764f15c58..b546de673 100644 --- a/server/api-service/openblocks-server/src/test/java/com/openblocks/api/configurations/SecurityTestConfig.java +++ b/server/api-service/lowcoder-server/src/test/java/org/lowcoder/api/configurations/SecurityTestConfig.java @@ -1,4 +1,4 @@ -package com.openblocks.api.configurations; +package org.lowcoder.api.configurations; import org.springframework.context.annotation.Bean; import org.springframework.security.config.annotation.method.configuration.EnableReactiveMethodSecurity; diff --git a/server/api-service/openblocks-server/src/test/java/com/openblocks/api/configurations/SeedMongoData.java b/server/api-service/lowcoder-server/src/test/java/org/lowcoder/api/configurations/SeedMongoData.java similarity index 70% rename from server/api-service/openblocks-server/src/test/java/com/openblocks/api/configurations/SeedMongoData.java rename to server/api-service/lowcoder-server/src/test/java/org/lowcoder/api/configurations/SeedMongoData.java index 697793cb7..ae7e26df9 100644 --- a/server/api-service/openblocks-server/src/test/java/com/openblocks/api/configurations/SeedMongoData.java +++ b/server/api-service/lowcoder-server/src/test/java/org/lowcoder/api/configurations/SeedMongoData.java @@ -1,14 +1,13 @@ -package com.openblocks.api.configurations; +package org.lowcoder.api.configurations; +import org.lowcoder.domain.application.repository.ApplicationRepository; +import org.lowcoder.domain.organization.repository.OrganizationRepository; +import org.lowcoder.domain.user.repository.UserRepository; import org.springframework.boot.ApplicationRunner; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.data.mongodb.core.ReactiveMongoTemplate; -import com.openblocks.domain.application.repository.ApplicationRepository; -import com.openblocks.domain.organization.repository.OrganizationRepository; -import com.openblocks.domain.user.repository.UserRepository; - import lombok.extern.slf4j.Slf4j; @Slf4j diff --git a/server/api-service/openblocks-server/src/test/java/com/openblocks/api/controller/DatasourceControllerTest.json b/server/api-service/lowcoder-server/src/test/java/org/lowcoder/api/controller/DatasourceControllerTest.json similarity index 100% rename from server/api-service/openblocks-server/src/test/java/com/openblocks/api/controller/DatasourceControllerTest.json rename to server/api-service/lowcoder-server/src/test/java/org/lowcoder/api/controller/DatasourceControllerTest.json diff --git a/server/api-service/openblocks-server/src/test/java/com/openblocks/api/datasource/DatasourceApiServiceTest.java b/server/api-service/lowcoder-server/src/test/java/org/lowcoder/api/datasource/DatasourceApiServiceTest.java similarity index 90% rename from server/api-service/openblocks-server/src/test/java/com/openblocks/api/datasource/DatasourceApiServiceTest.java rename to server/api-service/lowcoder-server/src/test/java/org/lowcoder/api/datasource/DatasourceApiServiceTest.java index f4c7873bb..e29616911 100644 --- a/server/api-service/openblocks-server/src/test/java/com/openblocks/api/datasource/DatasourceApiServiceTest.java +++ b/server/api-service/lowcoder-server/src/test/java/org/lowcoder/api/datasource/DatasourceApiServiceTest.java @@ -1,7 +1,7 @@ -package com.openblocks.api.datasource; +package org.lowcoder.api.datasource; -import static com.openblocks.domain.permission.model.ResourceRole.OWNER; -import static com.openblocks.domain.permission.model.ResourceRole.VIEWER; +import static org.lowcoder.domain.permission.model.ResourceRole.OWNER; +import static org.lowcoder.domain.permission.model.ResourceRole.VIEWER; import java.util.Collection; import java.util.List; @@ -10,20 +10,21 @@ import org.junit.Assert; import org.junit.Test; import org.junit.runner.RunWith; +import org.lowcoder.api.common.mockuser.WithMockUser; +import org.lowcoder.api.datasource.DatasourceApiService; +import org.lowcoder.api.datasource.DatasourceView; +import org.lowcoder.api.permission.view.CommonPermissionView; +import org.lowcoder.api.permission.view.PermissionItemView; +import org.lowcoder.domain.datasource.model.Datasource; +import org.lowcoder.domain.datasource.model.DatasourceCreationSource; +import org.lowcoder.domain.datasource.model.DatasourceStatus; +import org.lowcoder.sdk.exception.BizError; +import org.lowcoder.sdk.exception.BizException; +import org.lowcoder.sdk.plugin.mysql.MysqlDatasourceConfig; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.test.context.junit4.SpringRunner; -import com.openblocks.api.common.mockuser.WithMockUser; -import com.openblocks.api.permission.view.CommonPermissionView; -import com.openblocks.api.permission.view.PermissionItemView; -import com.openblocks.domain.datasource.model.Datasource; -import com.openblocks.domain.datasource.model.DatasourceCreationSource; -import com.openblocks.domain.datasource.model.DatasourceStatus; -import com.openblocks.sdk.exception.BizError; -import com.openblocks.sdk.exception.BizException; -import com.openblocks.sdk.plugin.mysql.MysqlDatasourceConfig; - import reactor.core.publisher.Mono; import reactor.test.StepVerifier; diff --git a/server/api-service/openblocks-server/src/test/java/com/openblocks/api/infra/ServerConfigRepositoryTest.java b/server/api-service/lowcoder-server/src/test/java/org/lowcoder/api/infra/ServerConfigRepositoryTest.java similarity index 89% rename from server/api-service/openblocks-server/src/test/java/com/openblocks/api/infra/ServerConfigRepositoryTest.java rename to server/api-service/lowcoder-server/src/test/java/org/lowcoder/api/infra/ServerConfigRepositoryTest.java index 0851aab67..6bbeceb07 100644 --- a/server/api-service/openblocks-server/src/test/java/com/openblocks/api/infra/ServerConfigRepositoryTest.java +++ b/server/api-service/lowcoder-server/src/test/java/org/lowcoder/api/infra/ServerConfigRepositoryTest.java @@ -1,4 +1,4 @@ -package com.openblocks.api.infra; +package org.lowcoder.api.infra; import static org.junit.jupiter.api.Assertions.assertEquals; @@ -7,15 +7,15 @@ import org.junit.Test; import org.junit.runner.RunWith; +import org.lowcoder.infra.config.model.ServerConfig; +import org.lowcoder.infra.config.repository.ServerConfigRepository; +import org.lowcoder.sdk.config.dynamic.Conf; +import org.lowcoder.sdk.config.dynamic.ConfigInstance; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.test.context.junit4.SpringRunner; import com.google.common.collect.ImmutableList; -import com.openblocks.infra.config.model.ServerConfig; -import com.openblocks.infra.config.repository.ServerConfigRepository; -import com.openblocks.sdk.config.dynamic.Conf; -import com.openblocks.sdk.config.dynamic.ConfigInstance; import lombok.extern.slf4j.Slf4j; diff --git a/server/api-service/openblocks-server/src/test/java/com/openblocks/api/query/LibraryQueryApiServiceTest.java b/server/api-service/lowcoder-server/src/test/java/org/lowcoder/api/query/LibraryQueryApiServiceTest.java similarity index 81% rename from server/api-service/openblocks-server/src/test/java/com/openblocks/api/query/LibraryQueryApiServiceTest.java rename to server/api-service/lowcoder-server/src/test/java/org/lowcoder/api/query/LibraryQueryApiServiceTest.java index e323eb230..f4ee83d40 100644 --- a/server/api-service/openblocks-server/src/test/java/com/openblocks/api/query/LibraryQueryApiServiceTest.java +++ b/server/api-service/lowcoder-server/src/test/java/org/lowcoder/api/query/LibraryQueryApiServiceTest.java @@ -1,6 +1,6 @@ -package com.openblocks.api.query; +package org.lowcoder.api.query; -import static com.openblocks.api.common.mockuser.WithMockUser.DEFAULT_CURRENT_ORG_ID; +import static org.lowcoder.api.common.mockuser.WithMockUser.DEFAULT_CURRENT_ORG_ID; import java.util.Collection; import java.util.List; @@ -9,16 +9,16 @@ import org.junit.Assert; import org.junit.Test; import org.junit.runner.RunWith; +import org.lowcoder.api.common.mockuser.WithMockUser; +import org.lowcoder.api.datasource.DatasourceApiService; +import org.lowcoder.api.datasource.DatasourceApiServiceTest; +import org.lowcoder.api.query.LibraryQueryApiService; +import org.lowcoder.api.query.view.LibraryQueryView; +import org.lowcoder.domain.query.model.LibraryQuery; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.test.context.junit4.SpringRunner; -import com.openblocks.api.common.mockuser.WithMockUser; -import com.openblocks.api.datasource.DatasourceApiService; -import com.openblocks.api.datasource.DatasourceApiServiceTest; -import com.openblocks.api.query.view.LibraryQueryView; -import com.openblocks.domain.query.model.LibraryQuery; - import reactor.core.publisher.Mono; import reactor.test.StepVerifier; diff --git a/server/api-service/openblocks-server/src/test/java/com/openblocks/api/service/FolderApiServiceTest.java b/server/api-service/lowcoder-server/src/test/java/org/lowcoder/api/service/FolderApiServiceTest.java similarity index 87% rename from server/api-service/openblocks-server/src/test/java/com/openblocks/api/service/FolderApiServiceTest.java rename to server/api-service/lowcoder-server/src/test/java/org/lowcoder/api/service/FolderApiServiceTest.java index e39c5389d..b984a7145 100644 --- a/server/api-service/openblocks-server/src/test/java/com/openblocks/api/service/FolderApiServiceTest.java +++ b/server/api-service/lowcoder-server/src/test/java/org/lowcoder/api/service/FolderApiServiceTest.java @@ -1,4 +1,4 @@ -package com.openblocks.api.service; +package org.lowcoder.api.service; import static org.junit.Assert.assertEquals; @@ -9,19 +9,18 @@ import org.junit.Assert; import org.junit.Test; import org.junit.runner.RunWith; +import org.lowcoder.api.application.view.ApplicationInfoView; +import org.lowcoder.api.application.view.ApplicationPermissionView; +import org.lowcoder.api.common.mockuser.WithMockUser; +import org.lowcoder.api.home.FolderApiService; +import org.lowcoder.api.permission.view.PermissionItemView; +import org.lowcoder.domain.folder.model.Folder; +import org.lowcoder.domain.folder.service.FolderService; +import org.lowcoder.domain.permission.model.ResourceRole; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.test.context.junit4.SpringRunner; -import com.openblocks.api.application.view.ApplicationInfoView; -import com.openblocks.api.application.view.ApplicationPermissionView; -import com.openblocks.api.common.mockuser.WithMockUser; -import com.openblocks.api.permission.view.PermissionItemView; -import com.openblocks.api.home.FolderApiService; -import com.openblocks.domain.folder.model.Folder; -import com.openblocks.domain.folder.service.FolderService; -import com.openblocks.domain.permission.model.ResourceRole; - import reactor.core.publisher.Mono; import reactor.test.StepVerifier; diff --git a/server/api-service/openblocks-server/src/test/java/com/openblocks/api/service/impl/ApplicationHistorySnapshotServiceTest.java b/server/api-service/lowcoder-server/src/test/java/org/lowcoder/api/service/impl/ApplicationHistorySnapshotServiceTest.java similarity index 93% rename from server/api-service/openblocks-server/src/test/java/com/openblocks/api/service/impl/ApplicationHistorySnapshotServiceTest.java rename to server/api-service/lowcoder-server/src/test/java/org/lowcoder/api/service/impl/ApplicationHistorySnapshotServiceTest.java index df14dc971..2222ec64c 100644 --- a/server/api-service/openblocks-server/src/test/java/com/openblocks/api/service/impl/ApplicationHistorySnapshotServiceTest.java +++ b/server/api-service/lowcoder-server/src/test/java/org/lowcoder/api/service/impl/ApplicationHistorySnapshotServiceTest.java @@ -1,17 +1,17 @@ -package com.openblocks.api.service.impl; +package org.lowcoder.api.service.impl; import org.junit.Test; import org.junit.jupiter.api.Assertions; import org.junit.runner.RunWith; +import org.lowcoder.domain.application.model.ApplicationHistorySnapshot; +import org.lowcoder.domain.application.service.ApplicationHistorySnapshotService; +import org.lowcoder.sdk.models.HasIdAndAuditing; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.data.domain.PageRequest; import org.springframework.test.context.junit4.SpringRunner; import com.google.common.collect.ImmutableMap; -import com.openblocks.domain.application.model.ApplicationHistorySnapshot; -import com.openblocks.domain.application.service.ApplicationHistorySnapshotService; -import com.openblocks.sdk.models.HasIdAndAuditing; import lombok.extern.slf4j.Slf4j; import reactor.test.StepVerifier; diff --git a/server/api-service/openblocks-server/src/test/resources/application.yml b/server/api-service/lowcoder-server/src/test/resources/application.yml similarity index 100% rename from server/api-service/openblocks-server/src/test/resources/application.yml rename to server/api-service/lowcoder-server/src/test/resources/application.yml diff --git a/server/api-service/openblocks-server/src/test/resources/users.ldif b/server/api-service/lowcoder-server/src/test/resources/users.ldif similarity index 100% rename from server/api-service/openblocks-server/src/test/resources/users.ldif rename to server/api-service/lowcoder-server/src/test/resources/users.ldif diff --git a/server/api-service/openblocks-domain/src/main/java/com/openblocks/domain/authentication/FindAuthConfig.java b/server/api-service/openblocks-domain/src/main/java/com/openblocks/domain/authentication/FindAuthConfig.java deleted file mode 100644 index be6c101ad..000000000 --- a/server/api-service/openblocks-domain/src/main/java/com/openblocks/domain/authentication/FindAuthConfig.java +++ /dev/null @@ -1,9 +0,0 @@ -package com.openblocks.domain.authentication; - -import javax.annotation.Nullable; - -import com.openblocks.domain.organization.model.Organization; -import com.openblocks.sdk.auth.AbstractAuthConfig; - -public record FindAuthConfig(AbstractAuthConfig authConfig, @Nullable Organization organization) { -} \ No newline at end of file diff --git a/server/api-service/openblocks-domain/src/main/java/com/openblocks/domain/mongodb/MongodbInterceptorContext.java b/server/api-service/openblocks-domain/src/main/java/com/openblocks/domain/mongodb/MongodbInterceptorContext.java deleted file mode 100644 index 79410919d..000000000 --- a/server/api-service/openblocks-domain/src/main/java/com/openblocks/domain/mongodb/MongodbInterceptorContext.java +++ /dev/null @@ -1,6 +0,0 @@ -package com.openblocks.domain.mongodb; - -import com.openblocks.domain.encryption.EncryptionService; - -public record MongodbInterceptorContext(EncryptionService encryptionService) { -} diff --git a/server/api-service/openblocks-plugins/clickHousePlugin/plugin.properties b/server/api-service/openblocks-plugins/clickHousePlugin/plugin.properties deleted file mode 100644 index 184f8a4bd..000000000 --- a/server/api-service/openblocks-plugins/clickHousePlugin/plugin.properties +++ /dev/null @@ -1,5 +0,0 @@ -plugin.id=clickHouse-plugin -plugin.class=com.openblocks.plugin.clickhouse.ClickHousePlugin -plugin.version=1.0-SNAPSHOT -plugin.provider=dev@openblocks.dev -plugin.dependencies= diff --git a/server/api-service/openblocks-plugins/elasticSearchPlugin/plugin.properties b/server/api-service/openblocks-plugins/elasticSearchPlugin/plugin.properties deleted file mode 100644 index 581d95058..000000000 --- a/server/api-service/openblocks-plugins/elasticSearchPlugin/plugin.properties +++ /dev/null @@ -1,5 +0,0 @@ -plugin.id=es-plugin -plugin.class=com.openblocks.plugin.es.EsPlugin -plugin.version=1.0-SNAPSHOT -plugin.provider=dev@openblocks.dev -plugin.dependencies= diff --git a/server/api-service/openblocks-plugins/elasticSearchPlugin/src/main/java/com/openblocks/plugin/es/EsError.java b/server/api-service/openblocks-plugins/elasticSearchPlugin/src/main/java/com/openblocks/plugin/es/EsError.java deleted file mode 100644 index 92720be8a..000000000 --- a/server/api-service/openblocks-plugins/elasticSearchPlugin/src/main/java/com/openblocks/plugin/es/EsError.java +++ /dev/null @@ -1,9 +0,0 @@ -package com.openblocks.plugin.es; - -import com.openblocks.sdk.exception.PluginError; - -public enum EsError implements PluginError { - - ES_EXECUTION_ERROR, - -} diff --git a/server/api-service/openblocks-plugins/googleSheetsPlugin/plugin.properties b/server/api-service/openblocks-plugins/googleSheetsPlugin/plugin.properties deleted file mode 100644 index 4c13f5ea9..000000000 --- a/server/api-service/openblocks-plugins/googleSheetsPlugin/plugin.properties +++ /dev/null @@ -1,5 +0,0 @@ -plugin.id=googleSheets-plugin -plugin.class=com.openblocks.plugin.googlesheets.GoogleSheetsPlugin -plugin.version=1.0-SNAPSHOT -plugin.provider=dev@openblocks.dev -plugin.dependencies= \ No newline at end of file diff --git a/server/api-service/openblocks-plugins/graphqlPlugin/plugin.properties b/server/api-service/openblocks-plugins/graphqlPlugin/plugin.properties deleted file mode 100644 index 955d1b8ec..000000000 --- a/server/api-service/openblocks-plugins/graphqlPlugin/plugin.properties +++ /dev/null @@ -1,5 +0,0 @@ -plugin.id=graphql-plugin -plugin.class=com.openblocks.plugin.graphql.GraphQLPlugin -plugin.version=1.0-SNAPSHOT -plugin.provider=dev@openblocks.dev -plugin.dependencies= \ No newline at end of file diff --git a/server/api-service/openblocks-plugins/graphqlPlugin/src/main/java/com/openblocks/plugin/graphql/GraphQLError.java b/server/api-service/openblocks-plugins/graphqlPlugin/src/main/java/com/openblocks/plugin/graphql/GraphQLError.java deleted file mode 100644 index ca5639a8e..000000000 --- a/server/api-service/openblocks-plugins/graphqlPlugin/src/main/java/com/openblocks/plugin/graphql/GraphQLError.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.openblocks.plugin.graphql; - -import com.openblocks.sdk.exception.PluginError; - -public enum GraphQLError implements PluginError { - GRAPHQL_EXECUTION_ERROR, -} diff --git a/server/api-service/openblocks-plugins/mongoPlugin/plugin.properties b/server/api-service/openblocks-plugins/mongoPlugin/plugin.properties deleted file mode 100644 index 8707da754..000000000 --- a/server/api-service/openblocks-plugins/mongoPlugin/plugin.properties +++ /dev/null @@ -1,5 +0,0 @@ -plugin.id=mongo-plugin -plugin.class=com.openblocks.plugin.mongo.MongoPlugin -plugin.version=1.0-SNAPSHOT -plugin.provider=dev@openblocks.dev -plugin.dependencies= diff --git a/server/api-service/openblocks-plugins/mssqlPlugin/plugin.properties b/server/api-service/openblocks-plugins/mssqlPlugin/plugin.properties deleted file mode 100644 index abae7db98..000000000 --- a/server/api-service/openblocks-plugins/mssqlPlugin/plugin.properties +++ /dev/null @@ -1,5 +0,0 @@ -plugin.id=mssql-plugin -plugin.class=com.openblocks.plugin.mssql.MssqlPlugin -plugin.version=1.0-SNAPSHOT -plugin.provider=dev@openblocks.dev -plugin.dependencies= diff --git a/server/api-service/openblocks-plugins/mysqlPlugin/plugin.properties b/server/api-service/openblocks-plugins/mysqlPlugin/plugin.properties deleted file mode 100644 index 27fcd82bb..000000000 --- a/server/api-service/openblocks-plugins/mysqlPlugin/plugin.properties +++ /dev/null @@ -1,5 +0,0 @@ -plugin.id=mysql-plugin -plugin.class=com.openblocks.plugin.mysql.MysqlPlugin -plugin.version=1.0-SNAPSHOT -plugin.provider=dev@openblocks.dev -plugin.dependencies= diff --git a/server/api-service/openblocks-plugins/openblocksApiPlugin/plugin.properties b/server/api-service/openblocks-plugins/openblocksApiPlugin/plugin.properties deleted file mode 100644 index e38d27d5e..000000000 --- a/server/api-service/openblocks-plugins/openblocksApiPlugin/plugin.properties +++ /dev/null @@ -1,5 +0,0 @@ -plugin.id=openblocks-api-plugin -plugin.class=com.openblocks.plugin.OpenblocksApiPlugin -plugin.version=1.0-SNAPSHOT -plugin.provider=dev@openblocks.dev -plugin.dependencies= \ No newline at end of file diff --git a/server/api-service/openblocks-plugins/openblocksApiPlugin/src/main/java/com/openblocks/plugin/OpenblocksApiConnector.java b/server/api-service/openblocks-plugins/openblocksApiPlugin/src/main/java/com/openblocks/plugin/OpenblocksApiConnector.java deleted file mode 100644 index 139fc82da..000000000 --- a/server/api-service/openblocks-plugins/openblocksApiPlugin/src/main/java/com/openblocks/plugin/OpenblocksApiConnector.java +++ /dev/null @@ -1,48 +0,0 @@ -package com.openblocks.plugin; - -import java.util.Collections; -import java.util.Map; -import java.util.Set; - -import javax.annotation.Nonnull; - -import org.pf4j.Extension; - -import com.openblocks.sdk.models.DatasourceTestResult; -import com.openblocks.sdk.plugin.common.DatasourceConnector; -import com.openblocks.sdk.plugin.openblocksapi.OpenblocksApiDatasourceConfig; - -import reactor.core.publisher.Mono; - -@Extension -public class OpenblocksApiConnector implements DatasourceConnector { - - private static final Object CONNECTION_OBJECT = new Object(); - - @Override - public Mono createConnection(OpenblocksApiDatasourceConfig connectionConfig) { - return Mono.just(CONNECTION_OBJECT); - } - - @Override - public Mono destroyConnection(Object o) { - return Mono.empty(); - } - - @Override - public Mono testConnection(OpenblocksApiDatasourceConfig connectionConfig) { - return Mono.just(DatasourceTestResult.testSuccess()); - } - - @Nonnull - @Override - public OpenblocksApiDatasourceConfig resolveConfig(Map configMap) { - return OpenblocksApiDatasourceConfig.INSTANCE; - } - - @Override - public Set validateConfig(OpenblocksApiDatasourceConfig connectionConfig) { - return Collections.emptySet(); - } - -} diff --git a/server/api-service/openblocks-plugins/openblocksApiPlugin/src/main/java/com/openblocks/plugin/OpenblocksApiPlugin.java b/server/api-service/openblocks-plugins/openblocksApiPlugin/src/main/java/com/openblocks/plugin/OpenblocksApiPlugin.java deleted file mode 100644 index 4d259f983..000000000 --- a/server/api-service/openblocks-plugins/openblocksApiPlugin/src/main/java/com/openblocks/plugin/OpenblocksApiPlugin.java +++ /dev/null @@ -1,11 +0,0 @@ -package com.openblocks.plugin; - -import org.pf4j.Plugin; -import org.pf4j.PluginWrapper; - -public class OpenblocksApiPlugin extends Plugin { - - public OpenblocksApiPlugin(PluginWrapper wrapper) { - super(wrapper); - } -} diff --git a/server/api-service/openblocks-plugins/openblocksApiPlugin/src/main/java/com/openblocks/plugin/OpenblocksApiPluginError.java b/server/api-service/openblocks-plugins/openblocksApiPlugin/src/main/java/com/openblocks/plugin/OpenblocksApiPluginError.java deleted file mode 100644 index fc9529a00..000000000 --- a/server/api-service/openblocks-plugins/openblocksApiPlugin/src/main/java/com/openblocks/plugin/OpenblocksApiPluginError.java +++ /dev/null @@ -1,10 +0,0 @@ -package com.openblocks.plugin; - -import com.openblocks.sdk.exception.PluginError; - -public enum OpenblocksApiPluginError implements PluginError { - - OPENBLOCKS_API_REQUEST_ERROR, - OPENBLOCKS_API_INVALID_REQUEST_TYPE, - -} diff --git a/server/api-service/openblocks-plugins/oraclePlugin/plugin.properties b/server/api-service/openblocks-plugins/oraclePlugin/plugin.properties deleted file mode 100644 index 80c856f92..000000000 --- a/server/api-service/openblocks-plugins/oraclePlugin/plugin.properties +++ /dev/null @@ -1,5 +0,0 @@ -plugin.id=oracle-plugin -plugin.class=com.openblocks.plugin.oracle.OraclePlugin -plugin.version=1.0-SNAPSHOT -plugin.provider=dev@openblocks.dev -plugin.dependencies= diff --git a/server/api-service/openblocks-plugins/postgresPlugin/plugin.properties b/server/api-service/openblocks-plugins/postgresPlugin/plugin.properties deleted file mode 100644 index c0a29d4ac..000000000 --- a/server/api-service/openblocks-plugins/postgresPlugin/plugin.properties +++ /dev/null @@ -1,5 +0,0 @@ -plugin.id=postgres-plugin -plugin.class=com.openblocks.plugin.postgres.PostgresPlugin -plugin.version=1.0-SNAPSHOT -plugin.provider=dev@openblocks.dev -plugin.dependencies= diff --git a/server/api-service/openblocks-plugins/redisPlugin/plugin.properties b/server/api-service/openblocks-plugins/redisPlugin/plugin.properties deleted file mode 100644 index bbc30298c..000000000 --- a/server/api-service/openblocks-plugins/redisPlugin/plugin.properties +++ /dev/null @@ -1,5 +0,0 @@ -plugin.id=redis-plugin -plugin.class=com.openblocks.plugin.redis.RedisPlugin -plugin.version=1.0-SNAPSHOT -plugin.provider=dev@openblocks.dev -plugin.dependencies= diff --git a/server/api-service/openblocks-plugins/redisPlugin/src/main/java/com/openblocks/plugin/redis/utils/RedisQueryUtils.java b/server/api-service/openblocks-plugins/redisPlugin/src/main/java/com/openblocks/plugin/redis/utils/RedisQueryUtils.java deleted file mode 100644 index a4806353b..000000000 --- a/server/api-service/openblocks-plugins/redisPlugin/src/main/java/com/openblocks/plugin/redis/utils/RedisQueryUtils.java +++ /dev/null @@ -1,94 +0,0 @@ -package com.openblocks.plugin.redis.utils; - -import static com.openblocks.plugin.redis.constants.RedisFieldName.COMMAND; -import static com.openblocks.sdk.exception.PluginCommonError.QUERY_ARGUMENT_ERROR; - -import java.util.Map; - -import com.openblocks.plugin.redis.commands.RedisCommand; -import com.openblocks.plugin.redis.commands.RedisCommand.Del; -import com.openblocks.plugin.redis.commands.RedisCommand.Get; -import com.openblocks.plugin.redis.commands.RedisCommand.Hdel; -import com.openblocks.plugin.redis.commands.RedisCommand.Hget; -import com.openblocks.plugin.redis.commands.RedisCommand.Hgetall; -import com.openblocks.plugin.redis.commands.RedisCommand.Hkeys; -import com.openblocks.plugin.redis.commands.RedisCommand.Hlen; -import com.openblocks.plugin.redis.commands.RedisCommand.Hmget; -import com.openblocks.plugin.redis.commands.RedisCommand.Hset; -import com.openblocks.plugin.redis.commands.RedisCommand.Hsetnx; -import com.openblocks.plugin.redis.commands.RedisCommand.Hvals; -import com.openblocks.plugin.redis.commands.RedisCommand.Keys; -import com.openblocks.plugin.redis.commands.RedisCommand.Lindex; -import com.openblocks.plugin.redis.commands.RedisCommand.Llen; -import com.openblocks.plugin.redis.commands.RedisCommand.Lpush; -import com.openblocks.plugin.redis.commands.RedisCommand.Lrange; -import com.openblocks.plugin.redis.commands.RedisCommand.Lrem; -import com.openblocks.plugin.redis.commands.RedisCommand.Mget; -import com.openblocks.plugin.redis.commands.RedisCommand.Rpoplpush; -import com.openblocks.plugin.redis.commands.RedisCommand.Sadd; -import com.openblocks.plugin.redis.commands.RedisCommand.Scard; -import com.openblocks.plugin.redis.commands.RedisCommand.Set; -import com.openblocks.plugin.redis.commands.RedisCommand.Sismember; -import com.openblocks.plugin.redis.commands.RedisCommand.Smembers; -import com.openblocks.plugin.redis.commands.RedisCommand.Srandmember; -import com.openblocks.plugin.redis.commands.RedisCommand.Srem; -import com.openblocks.plugin.redis.commands.RedisCommand.Zadd; -import com.openblocks.plugin.redis.commands.RedisCommand.Zcard; -import com.openblocks.plugin.redis.commands.RedisCommand.Zcount; -import com.openblocks.plugin.redis.commands.RedisCommand.Zrange; -import com.openblocks.plugin.redis.commands.RedisCommand.Zrangebyscore; -import com.openblocks.plugin.redis.commands.RedisCommand.Zrank; -import com.openblocks.plugin.redis.commands.RedisCommand.Zrem; -import com.openblocks.plugin.redis.commands.RedisCommand.Zscore; -import com.openblocks.sdk.exception.PluginException; - -public class RedisQueryUtils { - - - public static boolean isRawCommand(Map formData) { - String command = (String) formData.getOrDefault(COMMAND, ""); - return "RAW".equalsIgnoreCase(command); - } - - public static RedisCommand convertRedisFormInputToRedisCommand(Map formData) { - String commandType = (String) formData.getOrDefault(COMMAND, ""); - return switch (commandType.toUpperCase()) { - case "SET" -> new Set(formData); - case "GET" -> new Get(formData); - case "DEL" -> new Del(formData); - case "KEYS" -> new Keys(formData); - case "MGET" -> new Mget(formData); - case "HGET" -> new Hget(formData); - case "HMGET" -> new Hmget(formData); - case "HGETALL" -> new Hgetall(formData); - case "HSET" -> new Hset(formData); - case "HSETNX" -> new Hsetnx(formData); - case "HLEN" -> new Hlen(formData); - case "HDEL" -> new Hdel(formData); - case "HKEYS" -> new Hkeys(formData); - case "HVALS" -> new Hvals(formData); - case "LINDEX" -> new Lindex(formData); - case "LLEN" -> new Llen(formData); - case "LPUSH" -> new Lpush(formData); - case "LREM" -> new Lrem(formData); - case "RPOPLPUSH" -> new Rpoplpush(formData); - case "LRANGE" -> new Lrange(formData); - case "SADD" -> new Sadd(formData); - case "SCARD" -> new Scard(formData); - case "SMEMBERS" -> new Smembers(formData); - case "SISMEMBER" -> new Sismember(formData); - case "SRANDMEMBER" -> new Srandmember(formData); - case "SREM" -> new Srem(formData); - case "ZADD" -> new Zadd(formData); - case "ZCARD" -> new Zcard(formData); - case "ZCOUNT" -> new Zcount(formData); - case "ZRANGE" -> new Zrange(formData); - case "ZRANGEBYSCORE" -> new Zrangebyscore(formData); - case "ZRANK" -> new Zrank(formData); - case "ZREM" -> new Zrem(formData); - case "ZSCORE" -> new Zscore(formData); - default -> throw new PluginException(QUERY_ARGUMENT_ERROR, "INVALID_REDIS_REQUEST", commandType); - }; - } - -} diff --git a/server/api-service/openblocks-plugins/restApiPlugin/plugin.properties b/server/api-service/openblocks-plugins/restApiPlugin/plugin.properties deleted file mode 100644 index c052d7fcc..000000000 --- a/server/api-service/openblocks-plugins/restApiPlugin/plugin.properties +++ /dev/null @@ -1,5 +0,0 @@ -plugin.id=restapi-plugin -plugin.class=com.openblocks.plugin.restapi.RestApiPlugin -plugin.version=1.0-SNAPSHOT -plugin.provider=dev@openblocks.dev -plugin.dependencies= \ No newline at end of file diff --git a/server/api-service/openblocks-plugins/smtpPlugin/plugin.properties b/server/api-service/openblocks-plugins/smtpPlugin/plugin.properties deleted file mode 100644 index 85522b06e..000000000 --- a/server/api-service/openblocks-plugins/smtpPlugin/plugin.properties +++ /dev/null @@ -1,5 +0,0 @@ -plugin.id=smtp-plugin -plugin.class=com.openblocks.plugins.SmtpPlugin -plugin.version=1.0-SNAPSHOT -plugin.provider=dev@openblocks.dev -plugin.dependencies= \ No newline at end of file diff --git a/server/api-service/openblocks-plugins/snowflakePlugin/plugin.properties b/server/api-service/openblocks-plugins/snowflakePlugin/plugin.properties deleted file mode 100644 index 836121422..000000000 --- a/server/api-service/openblocks-plugins/snowflakePlugin/plugin.properties +++ /dev/null @@ -1,5 +0,0 @@ -plugin.id=snowflake-plugin -plugin.class=com.openblocks.plugin.snowflake.SnowflakePlugin -plugin.version=1.0-SNAPSHOT -plugin.provider=dev@openblocks.dev -plugin.dependencies= \ No newline at end of file diff --git a/server/api-service/openblocks-sdk/src/main/java/com/openblocks/sdk/plugin/openblocksapi/OpenblocksApiDatasourceConfig.java b/server/api-service/openblocks-sdk/src/main/java/com/openblocks/sdk/plugin/openblocksapi/OpenblocksApiDatasourceConfig.java deleted file mode 100644 index 2840919f0..000000000 --- a/server/api-service/openblocks-sdk/src/main/java/com/openblocks/sdk/plugin/openblocksapi/OpenblocksApiDatasourceConfig.java +++ /dev/null @@ -1,13 +0,0 @@ -package com.openblocks.sdk.plugin.openblocksapi; - -import com.openblocks.sdk.models.DatasourceConnectionConfig; - -public class OpenblocksApiDatasourceConfig implements DatasourceConnectionConfig { - - public static final OpenblocksApiDatasourceConfig INSTANCE = new OpenblocksApiDatasourceConfig(); - - @Override - public DatasourceConnectionConfig mergeWithUpdatedConfig(DatasourceConnectionConfig detailConfig) { - return detailConfig; - } -} diff --git a/server/api-service/openblocks-sdk/src/main/java/com/openblocks/sdk/plugin/sqlcommand/changeset/ChangeSetItem.java b/server/api-service/openblocks-sdk/src/main/java/com/openblocks/sdk/plugin/sqlcommand/changeset/ChangeSetItem.java deleted file mode 100644 index 1a24dd726..000000000 --- a/server/api-service/openblocks-sdk/src/main/java/com/openblocks/sdk/plugin/sqlcommand/changeset/ChangeSetItem.java +++ /dev/null @@ -1,6 +0,0 @@ -package com.openblocks.sdk.plugin.sqlcommand.changeset; - -import com.openblocks.sdk.util.SqlGuiUtils.GuiSqlValue; - -public record ChangeSetItem(String column, GuiSqlValue guiSqlValue) { -} \ No newline at end of file diff --git a/server/api-service/pom.xml b/server/api-service/pom.xml index c1dc1bce5..cb730620d 100644 --- a/server/api-service/pom.xml +++ b/server/api-service/pom.xml @@ -10,18 +10,18 @@ 4.0.0 - com.openblocks - openblocks-root + org.lowcoder + lowcoder-root 1.0-SNAPSHOT pom - openblocks-root + lowcoder-root 17 true true true - com.openblocks + org.lowcoder 1.0-SNAPSHOT true 2.17.0 @@ -275,12 +275,12 @@ - openblocks-sdk - openblocks-infra - openblocks-domain - openblocks-plugins - openblocks-server - openblocks-ee + lowcoder-sdk + lowcoder-infra + lowcoder-domain + lowcoder-plugins + lowcoder-server + lowcoder-ee From ea8885713e2959aeac122c2bb89295e4b5738960 Mon Sep 17 00:00:00 2001 From: Jan Richter Date: Fri, 12 May 2023 01:50:18 +1200 Subject: [PATCH 02/21] refactor: rename openlocks-core to lowcoder-core --- client/jest.config.js | 2 +- client/package.json | 4 ++-- .../openblocks-comps/src/__test__/allComp.test.tsx | 2 +- .../src/comps/chartComp/chartComp.tsx | 2 +- .../chartComp/chartConfigs/cartesianAxisConfig.tsx | 2 +- .../comps/chartComp/chartConfigs/pieChartConfig.tsx | 2 +- .../src/comps/chartComp/chartConstants.tsx | 2 +- .../src/comps/chartComp/chartPropertyView.tsx | 2 +- .../src/comps/chartComp/seriesComp.tsx | 4 ++-- .../src/comps/imageEditorComp/index.tsx | 2 +- .../openblocks-comps/src/i18n/comps/index.tsx | 2 +- client/packages/openblocks-core/README.md | 2 +- client/packages/openblocks-core/package.json | 4 ++-- .../src/components/colorSelect/index.tsx | 2 +- .../openblocks-design/src/components/option.tsx | 2 +- .../openblocks-design/src/i18n/design/index.ts | 2 +- client/packages/openblocks-plugin-demo/package.json | 2 +- client/packages/openblocks/package.json | 2 +- client/packages/openblocks/src/appView/AppView.tsx | 2 +- .../openblocks/src/base/codeEditor/autoFormat.tsx | 6 +++--- .../openblocks/src/base/codeEditor/clickCompName.tsx | 4 ++-- .../src/base/codeEditor/codeEditorTypes.tsx | 2 +- .../src/base/codeEditor/codeEditorUtils.tsx | 2 +- .../completion/exposingCompletionSource.tsx | 2 +- .../openblocks/src/base/codeEditor/extensions.tsx | 2 +- .../codeEditor/extensions/highlightJsExtension.tsx | 2 +- .../base/codeEditor/extensions/highlightSyntax.tsx | 2 +- .../openblocks/src/components/PreviewApp.tsx | 2 +- .../openblocks/src/components/table/EditableCell.tsx | 2 +- .../openblocks/src/comps/comps/allComp.test.tsx | 2 +- .../openblocks/src/comps/comps/appSettingsComp.tsx | 2 +- .../comps/containerBase/containerCompBuilder.tsx | 2 +- .../src/comps/comps/containerBase/iContainer.tsx | 2 +- .../comps/containerBase/simpleContainerComp.tsx | 4 ++-- .../src/comps/comps/containerComp/containerComp.tsx | 2 +- .../src/comps/comps/containerComp/containerView.tsx | 2 +- .../comps/comps/containerComp/flowContainerView.tsx | 2 +- .../src/comps/comps/customComp/customComp.tsx | 4 ++-- .../src/comps/comps/dataChangeResponderComp.tsx | 2 +- .../openblocks/src/comps/comps/dateComp/dateComp.tsx | 2 +- .../openblocks/src/comps/comps/dateComp/timeComp.tsx | 2 +- .../openblocks/src/comps/comps/fileComp/fileComp.tsx | 2 +- .../openblocks/src/comps/comps/formComp/formComp.tsx | 2 +- .../src/comps/comps/formComp/formDataConstants.tsx | 2 +- .../comps/formComp/generate/dataSourceCommon.tsx | 2 +- .../openblocks/src/comps/comps/gridItemComp.tsx | 2 +- .../openblocks/src/comps/comps/imageComp.tsx | 2 +- .../comps/jsonSchemaFormComp/jsonSchemaFormComp.tsx | 2 +- .../src/comps/comps/layout/layoutMenuItemComp.tsx | 2 +- .../src/comps/comps/layout/mobileTabLayout.tsx | 2 +- .../src/comps/comps/listViewComp/listView.tsx | 2 +- .../src/comps/comps/listViewComp/listViewComp.tsx | 2 +- .../src/comps/comps/mediaComp/audioComp.tsx | 2 +- .../src/comps/comps/mediaComp/mediaUtils.tsx | 2 +- .../src/comps/comps/mediaComp/videoComp.tsx | 2 +- .../src/comps/comps/moduleComp/moduleComp.test.tsx | 2 +- .../src/comps/comps/moduleComp/moduleComp.tsx | 2 +- .../src/comps/comps/moduleComp/moduleEventComp.tsx | 8 ++++---- .../src/comps/comps/moduleComp/moduleInputComp.tsx | 8 ++++---- .../moduleContainerComp/ioComp/inputListComp.tsx | 2 +- .../moduleContainerComp/ioComp/inputListItemComp.tsx | 4 ++-- .../moduleContainerComp/moduleEventListItemComp.tsx | 2 +- .../comps/moduleContainerComp/moduleLayoutComp.tsx | 2 +- .../moduleContainerComp/moduleMethodListItemComp.tsx | 2 +- .../moduleMethodParamListComp.tsx | 2 +- .../src/comps/comps/navComp/navItemComp.tsx | 2 +- .../comps/comps/numberInputComp/numberInputComp.tsx | 2 +- .../comps/numberInputComp/sliderCompConstants.tsx | 2 +- .../openblocks/src/comps/comps/preLoadComp.tsx | 2 +- .../openblocks/src/comps/comps/qrCodeComp.tsx | 2 +- .../comps/comps/queryLibrary/queryLibraryComp.tsx | 2 +- .../openblocks/src/comps/comps/refTreeComp.tsx | 2 +- .../src/comps/comps/remoteComp/loaders.tsx | 2 +- .../src/comps/comps/remoteComp/remoteComp.test.tsx | 2 +- .../src/comps/comps/remoteComp/remoteComp.tsx | 2 +- .../openblocks/src/comps/comps/rootComp.test.tsx | 2 +- .../packages/openblocks/src/comps/comps/rootComp.tsx | 2 +- .../comps/comps/selectInputComp/cascaderContants.tsx | 2 +- .../comps/selectInputComp/radioCompConstants.tsx | 2 +- .../src/comps/comps/selectInputComp/selectComp.tsx | 2 +- .../comps/selectInputComp/selectCompConstants.tsx | 2 +- .../comps/selectInputComp/selectInputConstants.tsx | 2 +- .../openblocks/src/comps/comps/signatureComp.tsx | 2 +- .../openblocks/src/comps/comps/simpleNameComp.tsx | 2 +- .../comps/tableComp/column/columnTypeCompBuilder.tsx | 2 +- .../comps/comps/tableComp/column/tableColumnComp.tsx | 2 +- .../comps/tableComp/column/tableColumnListComp.tsx | 2 +- .../src/comps/comps/tableComp/expansionControl.tsx | 2 +- .../src/comps/comps/tableComp/mockTableComp.tsx | 2 +- .../src/comps/comps/tableComp/paginationControl.tsx | 2 +- .../src/comps/comps/tableComp/selectionControl.tsx | 2 +- .../src/comps/comps/tableComp/tableComp.test.tsx | 2 +- .../src/comps/comps/tableComp/tableComp.tsx | 2 +- .../comps/tableComp/tableDynamicColumn.test.tsx | 2 +- .../src/comps/comps/tableComp/tablePropertyView.tsx | 2 +- .../src/comps/comps/tableComp/tableToolbarComp.tsx | 2 +- .../src/comps/comps/tableComp/tableTypes.tsx | 2 +- .../src/comps/comps/tableComp/tableUtils.tsx | 2 +- .../src/comps/comps/tabs/tabbedContainerComp.tsx | 4 ++-- .../comps/comps/textInputComp/textInputConstants.tsx | 2 +- .../src/comps/comps/transformerListComp.tsx | 2 +- .../openblocks/src/comps/comps/treeComp/treeComp.tsx | 2 +- .../src/comps/comps/treeComp/treeSelectComp.tsx | 2 +- .../src/comps/comps/treeComp/treeUtils.tsx | 2 +- .../comps/triContainerComp/triContainerComp.tsx | 4 ++-- .../triContainerComp/triContainerCompBuilder.tsx | 2 +- .../packages/openblocks/src/comps/comps/uiComp.tsx | 2 +- .../actionSelector/actionSelectorControl.test.ts | 2 +- .../actionSelector/actionSelectorControl.tsx | 2 +- .../controls/actionSelector/executeCompAction.tsx | 4 ++-- .../controls/actionSelector/executeQueryAction.tsx | 2 +- .../actionSelector/triggerModuleEventAction.tsx | 2 +- .../openblocks/src/comps/controls/boolControl.tsx | 2 +- .../src/comps/controls/codeControl.test.tsx | 2 +- .../openblocks/src/comps/controls/codeControl.tsx | 2 +- .../src/comps/controls/codeStateControl.test.tsx | 2 +- .../src/comps/controls/codeStateControl.tsx | 2 +- .../src/comps/controls/codeTextControl.tsx | 2 +- .../src/comps/controls/contextCodeControl.tsx | 2 +- .../openblocks/src/comps/controls/controlParams.tsx | 2 +- .../src/comps/controls/dropdownControl.tsx | 2 +- .../comps/controls/dropdownInputSimpleControl.tsx | 2 +- .../src/comps/controls/eventHandlerControl.tsx | 2 +- .../openblocks/src/comps/controls/iconControl.tsx | 2 +- .../src/comps/controls/multiSelectControl.tsx | 2 +- .../src/comps/controls/numberSimpleControl.tsx | 2 +- .../openblocks/src/comps/controls/optionsControl.tsx | 2 +- .../openblocks/src/comps/controls/paramsControl.tsx | 2 +- .../openblocks/src/comps/controls/refControl.tsx | 4 ++-- .../src/comps/controls/simpleStringControl.tsx | 2 +- .../openblocks/src/comps/controls/slotControl.tsx | 2 +- .../src/comps/controls/stringSimpleControl.tsx | 2 +- client/packages/openblocks/src/comps/editorState.tsx | 2 +- .../src/comps/generators/bottomResList.tsx | 2 +- .../src/comps/generators/changeDataType.test.tsx | 2 +- .../src/comps/generators/changeDataType.tsx | 4 ++-- .../src/comps/generators/controlCompBuilder.tsx | 2 +- .../openblocks/src/comps/generators/list.test.tsx | 2 +- .../openblocks/src/comps/generators/list.tsx | 2 +- .../packages/openblocks/src/comps/generators/map.tsx | 2 +- .../openblocks/src/comps/generators/multi.test.tsx | 6 +++--- .../openblocks/src/comps/generators/multi.tsx | 6 +++--- .../openblocks/src/comps/generators/sameTypeMap.tsx | 6 +++--- .../src/comps/generators/simpleGenerators.tsx | 2 +- .../src/comps/generators/uiCompBuilder.tsx | 2 +- .../openblocks/src/comps/generators/withContext.tsx | 4 ++-- .../src/comps/generators/withDispatchHook.tsx | 2 +- .../src/comps/generators/withErrorBoundary.tsx | 2 +- .../src/comps/generators/withExposing.test.tsx | 2 +- .../openblocks/src/comps/generators/withExposing.tsx | 6 +++--- .../src/comps/generators/withIsLoading.test.ts | 2 +- .../src/comps/generators/withIsLoading.tsx | 2 +- .../src/comps/generators/withMethodExposing.test.tsx | 2 +- .../src/comps/generators/withMethodExposing.tsx | 4 ++-- .../src/comps/generators/withMultiContext.test.tsx | 2 +- .../src/comps/generators/withMultiContext.tsx | 2 +- .../openblocks/src/comps/generators/withParams.tsx | 2 +- .../src/comps/generators/withParamsForMap.test.tsx | 2 +- .../src/comps/generators/withParamsForMap.tsx | 2 +- .../comps/generators/withSelectedMultiContext.tsx | 2 +- .../openblocks/src/comps/generators/withType.tsx | 2 +- .../openblocks/src/comps/hooks/drawerComp.tsx | 2 +- .../packages/openblocks/src/comps/hooks/hookComp.tsx | 2 +- .../openblocks/src/comps/hooks/hookListComp.tsx | 2 +- .../openblocks/src/comps/hooks/modalComp.tsx | 2 +- .../openblocks/src/comps/queries/esQuery.tsx | 2 +- .../src/comps/queries/googleSheetsQuery.tsx | 2 +- .../src/comps/queries/httpQuery/httpQuery.tsx | 2 +- .../openblocks/src/comps/queries/libraryQuery.tsx | 2 +- .../openblocks/src/comps/queries/mongoQuery.tsx | 2 +- .../openblocks/src/comps/queries/openBlocksQuery.tsx | 2 +- .../src/comps/queries/pluginQuery/pluginQuery.tsx | 2 +- .../openblocks/src/comps/queries/queryComp.test.tsx | 2 +- .../openblocks/src/comps/queries/queryComp.tsx | 2 +- .../queries/queryComp/queryNotificationControl.tsx | 2 +- .../comps/queries/queryComp/queryPropertyView.tsx | 2 +- .../openblocks/src/comps/queries/queryCompUtils.tsx | 2 +- .../openblocks/src/comps/queries/redisQuery.tsx | 2 +- .../openblocks/src/comps/queries/smtpQuery.tsx | 2 +- .../src/comps/queries/sqlQuery/SQLQuery.tsx | 2 +- .../comps/queries/sqlQuery/columnNameDropdown.tsx | 4 ++-- .../src/comps/queries/sqlQuery/tableNameComp.tsx | 2 +- .../src/comps/utils/exposingTypes.test.tsx | 2 +- .../openblocks/src/comps/utils/exposingTypes.tsx | 2 +- .../openblocks/src/comps/utils/globalExposing.tsx | 2 +- .../openblocks/src/comps/utils/gridCompOperator.ts | 2 +- client/packages/openblocks/src/comps/utils/index.tsx | 8 ++++---- .../openblocks/src/comps/utils/propertyUtils.tsx | 2 +- .../src/comps/utils/useCompInstance.test.tsx | 2 +- .../openblocks/src/comps/utils/useCompInstance.tsx | 2 +- .../openblocks/src/constants/applicationConstants.ts | 2 +- .../openblocks/src/constants/queryConstants.ts | 2 +- client/packages/openblocks/src/debug.tsx | 2 +- client/packages/openblocks/src/i18n/antdLocale.ts | 2 +- client/packages/openblocks/src/i18n/index.tsx | 2 +- .../packages/openblocks/src/ide/CompPlayground.tsx | 2 +- client/packages/openblocks/src/index.sdk.ts | 2 +- .../openblocks/src/pages/ApplicationV2/index.tsx | 2 +- .../src/pages/ComponentDoc/common/Example.tsx | 2 +- .../src/pages/ComponentDoc/common/Exposing.tsx | 2 +- .../src/pages/ComponentPlayground/index.tsx | 2 +- .../src/pages/editor/appEditorInternal.tsx | 2 +- .../openblocks/src/pages/editor/appSnapshot.tsx | 2 +- .../openblocks/src/pages/editor/editorHotKeys.tsx | 2 +- .../src/pages/queryLibrary/QueryLibraryEditor.tsx | 2 +- .../src/pages/setting/advanced/AdvancedSetting.tsx | 2 +- .../src/pages/tutorials/editorTutorials.tsx | 2 +- client/packages/openblocks/src/types/bottomRes.ts | 2 +- client/packages/openblocks/src/types/remoteComp.ts | 2 +- .../src/util/context/QueryLibraryContext.ts | 2 +- .../packages/openblocks/src/util/editoryHistory.ts | 4 ++-- client/packages/openblocks/src/util/promiseUtils.ts | 4 ++-- client/yarn.lock | 12 ++++++------ 213 files changed, 254 insertions(+), 254 deletions(-) diff --git a/client/jest.config.js b/client/jest.config.js index 53ea0fdba..6d89a2a37 100644 --- a/client/jest.config.js +++ b/client/jest.config.js @@ -1,3 +1,3 @@ export default { - projects: ["/packages/openblocks", "/packages/openblocks-core"], + projects: ["/packages/openblocks", "/packages/lowcoder-core"], }; diff --git a/client/package.json b/client/package.json index 7f210c8ef..f06dd1764 100644 --- a/client/package.json +++ b/client/package.json @@ -16,8 +16,8 @@ "build": "yarn node ./scripts/build.js", "test": "jest && yarn workspace openblocks-comps test", "prepare": "yarn workspace openblocks prepare", - "build:core": "yarn workspace openblocks-core build", - "test:core": "yarn workspace openblocks-core test" + "build:core": "yarn workspace lowcoder-core build", + "test:core": "yarn workspace lowcoder-core test" }, "devDependencies": { "@babel/preset-env": "^7.20.2", diff --git a/client/packages/openblocks-comps/src/__test__/allComp.test.tsx b/client/packages/openblocks-comps/src/__test__/allComp.test.tsx index a2b97191b..d2537840e 100644 --- a/client/packages/openblocks-comps/src/__test__/allComp.test.tsx +++ b/client/packages/openblocks-comps/src/__test__/allComp.test.tsx @@ -1,5 +1,5 @@ import _ from "lodash"; -import { CompConstructor, CustomAction } from "openblocks-core"; +import { CompConstructor, CustomAction } from "lowcoder-core"; import { evalAndReduce, isExposingMethodComp } from "openblocks-sdk"; import { ChartCompWithDefault } from "comps/chartComp/chartComp"; import log from "loglevel"; diff --git a/client/packages/openblocks-comps/src/comps/chartComp/chartComp.tsx b/client/packages/openblocks-comps/src/comps/chartComp/chartComp.tsx index c1c533170..d04479350 100644 --- a/client/packages/openblocks-comps/src/comps/chartComp/chartComp.tsx +++ b/client/packages/openblocks-comps/src/comps/chartComp/chartComp.tsx @@ -4,7 +4,7 @@ import { CompAction, CompActionTypes, wrapChildAction, -} from "openblocks-core"; +} from "lowcoder-core"; import { AxisFormatterComp, EchartsAxisType } from "./chartConfigs/cartesianAxisConfig"; import { chartChildrenMap, ChartSize, getDataKeys } from "./chartConstants"; import { chartPropertyView } from "./chartPropertyView"; diff --git a/client/packages/openblocks-comps/src/comps/chartComp/chartConfigs/cartesianAxisConfig.tsx b/client/packages/openblocks-comps/src/comps/chartComp/chartConfigs/cartesianAxisConfig.tsx index 507ad537f..55c58a33d 100644 --- a/client/packages/openblocks-comps/src/comps/chartComp/chartConfigs/cartesianAxisConfig.tsx +++ b/client/packages/openblocks-comps/src/comps/chartComp/chartConfigs/cartesianAxisConfig.tsx @@ -1,6 +1,6 @@ import { XAXisComponentOption, YAXisComponentOption } from "echarts"; import { ChartSize, XAxisDirectionType } from "../chartConstants"; -import { i18n } from "openblocks-core"; +import { i18n } from "lowcoder-core"; import { MultiCompBuilder, withContext, diff --git a/client/packages/openblocks-comps/src/comps/chartComp/chartConfigs/pieChartConfig.tsx b/client/packages/openblocks-comps/src/comps/chartComp/chartConfigs/pieChartConfig.tsx index d692d74ac..41166a927 100644 --- a/client/packages/openblocks-comps/src/comps/chartComp/chartConfigs/pieChartConfig.tsx +++ b/client/packages/openblocks-comps/src/comps/chartComp/chartConfigs/pieChartConfig.tsx @@ -1,7 +1,7 @@ import { MultiCompBuilder } from "openblocks-sdk"; import { PieSeriesOption } from "echarts"; import { dropdownControl } from "openblocks-sdk"; -import { ConstructorToView } from "openblocks-core"; +import { ConstructorToView } from "lowcoder-core"; import { trans } from "i18n/comps"; const BarTypeOptions = [ diff --git a/client/packages/openblocks-comps/src/comps/chartComp/chartConstants.tsx b/client/packages/openblocks-comps/src/comps/chartComp/chartConstants.tsx index 2402eb520..82d8e4116 100644 --- a/client/packages/openblocks-comps/src/comps/chartComp/chartConstants.tsx +++ b/client/packages/openblocks-comps/src/comps/chartComp/chartConstants.tsx @@ -5,7 +5,7 @@ import { eventHandlerControl } from "openblocks-sdk"; import { valueComp, withType } from "openblocks-sdk"; import { ValueFromOption } from "openblocks-sdk"; import { uiChildren } from "openblocks-sdk"; -import { RecordConstructorToComp, RecordConstructorToView } from "openblocks-core"; +import { RecordConstructorToComp, RecordConstructorToView } from "lowcoder-core"; import { BarChartConfig } from "./chartConfigs/barChartConfig"; import { XAxisConfig, YAxisConfig } from "./chartConfigs/cartesianAxisConfig"; import { LegendConfig } from "./chartConfigs/legendConfig"; diff --git a/client/packages/openblocks-comps/src/comps/chartComp/chartPropertyView.tsx b/client/packages/openblocks-comps/src/comps/chartComp/chartPropertyView.tsx index cb208c668..9e6751bd5 100644 --- a/client/packages/openblocks-comps/src/comps/chartComp/chartPropertyView.tsx +++ b/client/packages/openblocks-comps/src/comps/chartComp/chartPropertyView.tsx @@ -1,4 +1,4 @@ -import { changeChildAction, CompAction } from "openblocks-core"; +import { changeChildAction, CompAction } from "lowcoder-core"; import { ChartCompChildrenType, ChartTypeOptions, getDataKeys } from "./chartConstants"; import { newSeries } from "./seriesComp"; import { diff --git a/client/packages/openblocks-comps/src/comps/chartComp/seriesComp.tsx b/client/packages/openblocks-comps/src/comps/chartComp/seriesComp.tsx index 3fb80f697..780d1be15 100644 --- a/client/packages/openblocks-comps/src/comps/chartComp/seriesComp.tsx +++ b/client/packages/openblocks-comps/src/comps/chartComp/seriesComp.tsx @@ -12,8 +12,8 @@ import { } from "openblocks-sdk"; import { trans } from "i18n/comps"; -import { ConstructorToComp, ConstructorToDataType, ConstructorToView } from "openblocks-core"; -import { CompAction, CustomAction, customAction, isMyCustomAction } from "openblocks-core"; +import { ConstructorToComp, ConstructorToDataType, ConstructorToView } from "lowcoder-core"; +import { CompAction, CustomAction, customAction, isMyCustomAction } from "lowcoder-core"; export type SeriesCompType = ConstructorToComp; export type RawSeriesCompType = ConstructorToView; diff --git a/client/packages/openblocks-comps/src/comps/imageEditorComp/index.tsx b/client/packages/openblocks-comps/src/comps/imageEditorComp/index.tsx index 5b87f9f41..a27e29e6e 100644 --- a/client/packages/openblocks-comps/src/comps/imageEditorComp/index.tsx +++ b/client/packages/openblocks-comps/src/comps/imageEditorComp/index.tsx @@ -15,7 +15,7 @@ import { import { useRef } from "react"; import ReactResizeDetector from "react-resize-detector"; import _ from "lodash"; -import { RecordConstructorToView } from "openblocks-core"; +import { RecordConstructorToView } from "lowcoder-core"; import { Container, customTheme, EmbeddedButton, saveEvent } from "./imageEditorConstants"; import { ImageEditor } from "./imageEditorClass"; import { i18nObjs, trans } from "i18n/comps"; diff --git a/client/packages/openblocks-comps/src/i18n/comps/index.tsx b/client/packages/openblocks-comps/src/i18n/comps/index.tsx index 15972f82c..72683c23b 100644 --- a/client/packages/openblocks-comps/src/i18n/comps/index.tsx +++ b/client/packages/openblocks-comps/src/i18n/comps/index.tsx @@ -1,4 +1,4 @@ -import { getI18nObjects, getValueByLocale, Translator } from "openblocks-core"; +import { getI18nObjects, getValueByLocale, Translator } from "lowcoder-core"; import * as localeData from "./locales"; import { I18nObjects } from "./locales/types"; diff --git a/client/packages/openblocks-core/README.md b/client/packages/openblocks-core/README.md index 2d705cc74..0435216da 100644 --- a/client/packages/openblocks-core/README.md +++ b/client/packages/openblocks-core/README.md @@ -1 +1 @@ -this is a README file for openblocks-core. +this is a README file for lowcoder-core. diff --git a/client/packages/openblocks-core/package.json b/client/packages/openblocks-core/package.json index a55a33c2d..6798ef4b0 100644 --- a/client/packages/openblocks-core/package.json +++ b/client/packages/openblocks-core/package.json @@ -1,5 +1,5 @@ { - "name": "openblocks-core", + "name": "lowcoder-core", "version": "0.0.7", "type": "module", "scripts": { @@ -21,7 +21,7 @@ "lodash": "^4.17.21", "lru-cache": "^7.14.1" }, - "description": "openblocks-core is a JavaScript library for building new components in openblocks", + "description": "lowcoder-core is a JavaScript library for building new components in openblocks", "keywords": [ "openblocks", "components" diff --git a/client/packages/openblocks-design/src/components/colorSelect/index.tsx b/client/packages/openblocks-design/src/components/colorSelect/index.tsx index 4816c32d2..ba2f21a46 100644 --- a/client/packages/openblocks-design/src/components/colorSelect/index.tsx +++ b/client/packages/openblocks-design/src/components/colorSelect/index.tsx @@ -10,7 +10,7 @@ import { import styled, { css } from "styled-components"; import { useCallback, useRef, useState } from "react"; import { throttle } from "lodash"; -import { changeValueAction } from "openblocks-core"; +import { changeValueAction } from "lowcoder-core"; interface ColorSelectProps { color: string; diff --git a/client/packages/openblocks-design/src/components/option.tsx b/client/packages/openblocks-design/src/components/option.tsx index 398b262e1..89759b59b 100644 --- a/client/packages/openblocks-design/src/components/option.tsx +++ b/client/packages/openblocks-design/src/components/option.tsx @@ -7,7 +7,7 @@ import { AddLine } from "./eventHandler"; import React, { useState } from "react"; import { CSS } from "@dnd-kit/utilities"; import { SortableContext, useSortable, verticalListSortingStrategy } from "@dnd-kit/sortable"; -import { ConstructorToComp, MultiCompConstructor } from "openblocks-core"; +import { ConstructorToComp, MultiCompConstructor } from "lowcoder-core"; import { ReactComponent as WarnIcon } from "icons/icon-warning-white.svg"; import { DndContext } from "@dnd-kit/core"; import { restrictToVerticalAxis } from "@dnd-kit/modifiers"; diff --git a/client/packages/openblocks-design/src/i18n/design/index.ts b/client/packages/openblocks-design/src/i18n/design/index.ts index 2ef87f7a6..fd1812796 100644 --- a/client/packages/openblocks-design/src/i18n/design/index.ts +++ b/client/packages/openblocks-design/src/i18n/design/index.ts @@ -1,4 +1,4 @@ -import { Translator } from "openblocks-core"; +import { Translator } from "lowcoder-core"; import * as localeData from "./locales"; export const { trans } = new Translator(localeData, REACT_APP_LANGUAGES); diff --git a/client/packages/openblocks-plugin-demo/package.json b/client/packages/openblocks-plugin-demo/package.json index 3392f8b2d..1154e00e5 100644 --- a/client/packages/openblocks-plugin-demo/package.json +++ b/client/packages/openblocks-plugin-demo/package.json @@ -4,7 +4,7 @@ "type": "module", "license": "MIT", "dependencies": { - "openblocks-core": "^0.0.1", + "lowcoder-core": "^0.0.1", "openblocks-design": "^0.0.1", "react": "17", "react-dom": "17" diff --git a/client/packages/openblocks/package.json b/client/packages/openblocks/package.json index 4a9783c5d..88e44828d 100644 --- a/client/packages/openblocks/package.json +++ b/client/packages/openblocks/package.json @@ -54,7 +54,7 @@ "mime": "^3.0.0", "moment": "^2.29.4", "numbro": "^2.3.6", - "openblocks-core": "workspace:^", + "lowcoder-core": "workspace:^", "openblocks-design": "workspace:^", "papaparse": "^5.3.2", "qrcode.react": "^3.1.0", diff --git a/client/packages/openblocks/src/appView/AppView.tsx b/client/packages/openblocks/src/appView/AppView.tsx index a48fc48ab..70806fe07 100644 --- a/client/packages/openblocks/src/appView/AppView.tsx +++ b/client/packages/openblocks/src/appView/AppView.tsx @@ -1,7 +1,7 @@ import { RootComp } from "comps/comps/rootComp"; import { GetContainerParams, useCompInstance } from "comps/utils/useCompInstance"; import { createBrowserHistory } from "history"; -import { CompActionTypes, deferAction } from "openblocks-core"; +import { CompActionTypes, deferAction } from "lowcoder-core"; import { HTMLAttributes, useEffect, useMemo, useRef } from "react"; import { Provider } from "react-redux"; import { Route, Router } from "react-router"; diff --git a/client/packages/openblocks/src/base/codeEditor/autoFormat.tsx b/client/packages/openblocks/src/base/codeEditor/autoFormat.tsx index fe8c24501..809405941 100644 --- a/client/packages/openblocks/src/base/codeEditor/autoFormat.tsx +++ b/client/packages/openblocks/src/base/codeEditor/autoFormat.tsx @@ -1,6 +1,6 @@ -import { CodeType } from "openblocks-core"; -import { relaxedJSONToJSON } from "openblocks-core"; -import { getDynamicStringSegments, isDynamicSegment } from "openblocks-core"; +import { CodeType } from "lowcoder-core"; +import { relaxedJSONToJSON } from "lowcoder-core"; +import { getDynamicStringSegments, isDynamicSegment } from "lowcoder-core"; import { format as formatSQL } from "sql-formatter"; import { Language } from "./codeEditorTypes"; diff --git a/client/packages/openblocks/src/base/codeEditor/clickCompName.tsx b/client/packages/openblocks/src/base/codeEditor/clickCompName.tsx index 2a2f8e614..7a1875e2a 100644 --- a/client/packages/openblocks/src/base/codeEditor/clickCompName.tsx +++ b/client/packages/openblocks/src/base/codeEditor/clickCompName.tsx @@ -1,5 +1,5 @@ -import { CodeType } from "openblocks-core"; -import { getDynamicStringSegments, isDynamicSegment } from "openblocks-core"; +import { CodeType } from "lowcoder-core"; +import { getDynamicStringSegments, isDynamicSegment } from "lowcoder-core"; import { useEffect } from "react"; import { Decoration, DecorationSet, EditorView, StateEffect, StateField } from "./codeMirror"; diff --git a/client/packages/openblocks/src/base/codeEditor/codeEditorTypes.tsx b/client/packages/openblocks/src/base/codeEditor/codeEditorTypes.tsx index 936de5a49..7638103d3 100644 --- a/client/packages/openblocks/src/base/codeEditor/codeEditorTypes.tsx +++ b/client/packages/openblocks/src/base/codeEditor/codeEditorTypes.tsx @@ -1,4 +1,4 @@ -import { CodeType } from "openblocks-core"; +import { CodeType } from "lowcoder-core"; import React, { ReactNode } from "react"; import { EditorState, EditorView } from "./codeMirror"; diff --git a/client/packages/openblocks/src/base/codeEditor/codeEditorUtils.tsx b/client/packages/openblocks/src/base/codeEditor/codeEditorUtils.tsx index 559991af0..e0c33ad19 100644 --- a/client/packages/openblocks/src/base/codeEditor/codeEditorUtils.tsx +++ b/client/packages/openblocks/src/base/codeEditor/codeEditorUtils.tsx @@ -1,5 +1,5 @@ import { CompInfo } from "comps/editorState"; -import { getDynamicStringSegments } from "openblocks-core"; +import { getDynamicStringSegments } from "lowcoder-core"; import _ from "lodash"; import { CompletionContext } from "./codeMirror"; diff --git a/client/packages/openblocks/src/base/codeEditor/completion/exposingCompletionSource.tsx b/client/packages/openblocks/src/base/codeEditor/completion/exposingCompletionSource.tsx index d4ac026a1..056edb7bb 100644 --- a/client/packages/openblocks/src/base/codeEditor/completion/exposingCompletionSource.tsx +++ b/client/packages/openblocks/src/base/codeEditor/completion/exposingCompletionSource.tsx @@ -1,6 +1,6 @@ import { AutocompleteDataType } from "base/codeEditor/completion/ternServer"; import _ from "lodash"; -import { evalScript } from "openblocks-core"; +import { evalScript } from "lowcoder-core"; import { checkCursorInBinding } from "../codeEditorUtils"; import { Completion, CompletionContext, CompletionResult, EditorView } from "../codeMirror"; import { CompletionSource } from "./completion"; diff --git a/client/packages/openblocks/src/base/codeEditor/extensions.tsx b/client/packages/openblocks/src/base/codeEditor/extensions.tsx index 05e221a6b..bfa079efd 100644 --- a/client/packages/openblocks/src/base/codeEditor/extensions.tsx +++ b/client/packages/openblocks/src/base/codeEditor/extensions.tsx @@ -54,7 +54,7 @@ import { import { ExposingCompletionSource } from "./completion/exposingCompletionSource"; import { SQLCompletionSource } from "./completion/sqlCompletionSource"; import { getFormatter } from "./autoFormat"; -import { CodeType } from "openblocks-core"; +import { CodeType } from "lowcoder-core"; import { CompletionSource } from "./completion/completion"; import { message } from "antd"; import { CodeEditorTooltipContainer } from "./codeEditor"; diff --git a/client/packages/openblocks/src/base/codeEditor/extensions/highlightJsExtension.tsx b/client/packages/openblocks/src/base/codeEditor/extensions/highlightJsExtension.tsx index 0426c98fc..0eadccf82 100644 --- a/client/packages/openblocks/src/base/codeEditor/extensions/highlightJsExtension.tsx +++ b/client/packages/openblocks/src/base/codeEditor/extensions/highlightJsExtension.tsx @@ -1,6 +1,6 @@ import { useMemo, useRef } from "react"; import { Decoration, DecorationSet, EditorView, ViewPlugin, ViewUpdate } from "@codemirror/view"; -import { CodeType } from "openblocks-core"; +import { CodeType } from "lowcoder-core"; const successHighlightMark = Decoration.mark({ class: "cm-success-highlight" }); const errorHighlightMark = Decoration.mark({ class: "cm-error-highlight" }); diff --git a/client/packages/openblocks/src/base/codeEditor/extensions/highlightSyntax.tsx b/client/packages/openblocks/src/base/codeEditor/extensions/highlightSyntax.tsx index 8ee8d9ece..22120849d 100644 --- a/client/packages/openblocks/src/base/codeEditor/extensions/highlightSyntax.tsx +++ b/client/packages/openblocks/src/base/codeEditor/extensions/highlightSyntax.tsx @@ -3,7 +3,7 @@ import { Decoration, DecorationSet, EditorView, ViewPlugin, ViewUpdate } from "@ import { defaultHighlightStyle, HighlightStyle, syntaxTree } from "@codemirror/language"; import { highlightTree } from "@lezer/highlight"; import { Tree } from "@lezer/common"; -import { CodeType, getDynamicStringSegments, isDynamicSegment } from "openblocks-core"; +import { CodeType, getDynamicStringSegments, isDynamicSegment } from "lowcoder-core"; import { Language } from "../codeEditorTypes"; const highlighterFacet = Facet.define(); diff --git a/client/packages/openblocks/src/components/PreviewApp.tsx b/client/packages/openblocks/src/components/PreviewApp.tsx index 3b6ad7b43..df700f75d 100644 --- a/client/packages/openblocks/src/components/PreviewApp.tsx +++ b/client/packages/openblocks/src/components/PreviewApp.tsx @@ -1,7 +1,7 @@ import { ThemeDetail } from "api/commonSettingApi"; import React, { CSSProperties, useContext, useEffect, useState } from "react"; import { RootComp } from "comps/comps/rootComp"; -import { Comp } from "openblocks-core"; +import { Comp } from "lowcoder-core"; import { evalAndReduceWithExposing } from "comps/utils"; import { ThemeContext } from "comps/utils/themeContext"; import { ExternalEditorContext } from "util/context/ExternalEditorContext"; diff --git a/client/packages/openblocks/src/components/table/EditableCell.tsx b/client/packages/openblocks/src/components/table/EditableCell.tsx index 645e89837..b110cb330 100644 --- a/client/packages/openblocks/src/components/table/EditableCell.tsx +++ b/client/packages/openblocks/src/components/table/EditableCell.tsx @@ -1,6 +1,6 @@ import { PresetStatusColorType } from "antd/es/_util/colors"; import _ from "lodash"; -import { changeChildAction, DispatchType } from "openblocks-core"; +import { changeChildAction, DispatchType } from "lowcoder-core"; import { constantColors } from "openblocks-design"; import React, { ReactNode, useCallback, useContext, useEffect, useMemo, useState } from "react"; import styled from "styled-components"; diff --git a/client/packages/openblocks/src/comps/comps/allComp.test.tsx b/client/packages/openblocks/src/comps/comps/allComp.test.tsx index 31698509e..051602c90 100644 --- a/client/packages/openblocks/src/comps/comps/allComp.test.tsx +++ b/client/packages/openblocks/src/comps/comps/allComp.test.tsx @@ -13,7 +13,7 @@ import { QueryComp } from "comps/queries"; import { JSQuery } from "comps/queries/jsQuery"; import { evalAndReduce } from "comps/utils"; import _ from "lodash"; -import { CompConstructor } from "openblocks-core"; +import { CompConstructor } from "lowcoder-core"; import { ParamsStringControl } from "../controls/paramsControl"; import { SQLQuery } from "../queries/sqlQuery/SQLQuery"; import { uiCompRegistry } from "../uiCompRegistry"; diff --git a/client/packages/openblocks/src/comps/comps/appSettingsComp.tsx b/client/packages/openblocks/src/comps/comps/appSettingsComp.tsx index 7f0d3f880..2a297e305 100644 --- a/client/packages/openblocks/src/comps/comps/appSettingsComp.tsx +++ b/client/packages/openblocks/src/comps/comps/appSettingsComp.tsx @@ -1,5 +1,5 @@ import { ThemeDetail, ThemeType } from "api/commonSettingApi"; -import { RecordConstructorToComp } from "openblocks-core"; +import { RecordConstructorToComp } from "lowcoder-core"; import { dropdownInputSimpleControl } from "comps/controls/dropdownInputSimpleControl"; import { MultiCompBuilder, valueComp } from "comps/generators"; import { AddIcon, Dropdown } from "openblocks-design"; diff --git a/client/packages/openblocks/src/comps/comps/containerBase/containerCompBuilder.tsx b/client/packages/openblocks/src/comps/comps/containerBase/containerCompBuilder.tsx index f66a29a5d..cfb635157 100644 --- a/client/packages/openblocks/src/comps/comps/containerBase/containerCompBuilder.tsx +++ b/client/packages/openblocks/src/comps/comps/containerBase/containerCompBuilder.tsx @@ -1,5 +1,5 @@ import { JSONValue } from "util/jsonTypes"; -import { Comp, CompParams } from "openblocks-core"; +import { Comp, CompParams } from "lowcoder-core"; import { UICompBuilder } from "comps/generators"; import { PropertyViewFnTypeForComp, diff --git a/client/packages/openblocks/src/comps/comps/containerBase/iContainer.tsx b/client/packages/openblocks/src/comps/comps/containerBase/iContainer.tsx index 92bd39951..05f911203 100644 --- a/client/packages/openblocks/src/comps/comps/containerBase/iContainer.tsx +++ b/client/packages/openblocks/src/comps/comps/containerBase/iContainer.tsx @@ -1,5 +1,5 @@ import { JSONValue } from "util/jsonTypes"; -import { Comp } from "openblocks-core"; +import { Comp } from "lowcoder-core"; import { NameGenerator } from "comps/utils"; import { SimpleContainerComp } from "./simpleContainerComp"; import { CompTree } from "./utils"; diff --git a/client/packages/openblocks/src/comps/comps/containerBase/simpleContainerComp.tsx b/client/packages/openblocks/src/comps/comps/containerBase/simpleContainerComp.tsx index 76271b14d..20f10e268 100644 --- a/client/packages/openblocks/src/comps/comps/containerBase/simpleContainerComp.tsx +++ b/client/packages/openblocks/src/comps/comps/containerBase/simpleContainerComp.tsx @@ -1,6 +1,6 @@ import { JSONValue } from "util/jsonTypes"; -import { changeValueAction, CustomAction, multiChangeAction } from "openblocks-core"; -import { ConstructorToDataType } from "openblocks-core"; +import { changeValueAction, CustomAction, multiChangeAction } from "lowcoder-core"; +import { ConstructorToDataType } from "lowcoder-core"; import { sameTypeMap, stateComp, valueComp } from "comps/generators"; import { MultiCompBuilder } from "comps/generators/multi"; import { addMapChildAction, multiMapAction } from "comps/generators/sameTypeMap"; diff --git a/client/packages/openblocks/src/comps/comps/containerComp/containerComp.tsx b/client/packages/openblocks/src/comps/comps/containerComp/containerComp.tsx index 05018b73f..0b01dd7ff 100644 --- a/client/packages/openblocks/src/comps/comps/containerComp/containerComp.tsx +++ b/client/packages/openblocks/src/comps/comps/containerComp/containerComp.tsx @@ -1,4 +1,4 @@ -import { CompParams } from "openblocks-core"; +import { CompParams } from "lowcoder-core"; import { ToDataType } from "comps/generators/multi"; import { NameConfigHidden, withExposingConfigs } from "comps/generators/withExposing"; import { NameGenerator } from "comps/utils/nameGenerator"; diff --git a/client/packages/openblocks/src/comps/comps/containerComp/containerView.tsx b/client/packages/openblocks/src/comps/comps/containerComp/containerView.tsx index 0e5aafc17..7788862e2 100644 --- a/client/packages/openblocks/src/comps/comps/containerComp/containerView.tsx +++ b/client/packages/openblocks/src/comps/comps/containerComp/containerView.tsx @@ -37,7 +37,7 @@ import { RecordConstructorToView, wrapActionExtraInfo, wrapChildAction, -} from "openblocks-core"; +} from "lowcoder-core"; import React, { DragEvent, HTMLAttributes, diff --git a/client/packages/openblocks/src/comps/comps/containerComp/flowContainerView.tsx b/client/packages/openblocks/src/comps/comps/containerComp/flowContainerView.tsx index 75973627d..186e74bd3 100644 --- a/client/packages/openblocks/src/comps/comps/containerComp/flowContainerView.tsx +++ b/client/packages/openblocks/src/comps/comps/containerComp/flowContainerView.tsx @@ -1,4 +1,4 @@ -import { DispatchType } from "openblocks-core"; +import { DispatchType } from "lowcoder-core"; import { GridItemsType } from "comps/comps/containerComp/containerView"; import _ from "lodash"; import { FlowLayout } from "layout/utils"; diff --git a/client/packages/openblocks/src/comps/comps/customComp/customComp.tsx b/client/packages/openblocks/src/comps/comps/customComp/customComp.tsx index ab26accc8..77141e45e 100644 --- a/client/packages/openblocks/src/comps/comps/customComp/customComp.tsx +++ b/client/packages/openblocks/src/comps/comps/customComp/customComp.tsx @@ -1,5 +1,5 @@ -import { routeByNameAction, executeQueryAction } from "openblocks-core"; -import { CompAction } from "openblocks-core"; +import { routeByNameAction, executeQueryAction } from "lowcoder-core"; +import { CompAction } from "lowcoder-core"; import { StringControl } from "comps/controls/codeControl"; import { jsonObjectStateControl } from "comps/controls/codeStateControl"; import { UICompBuilder, withDefault } from "comps/generators"; diff --git a/client/packages/openblocks/src/comps/comps/dataChangeResponderComp.tsx b/client/packages/openblocks/src/comps/comps/dataChangeResponderComp.tsx index bca4fbcc7..e315be8b7 100644 --- a/client/packages/openblocks/src/comps/comps/dataChangeResponderComp.tsx +++ b/client/packages/openblocks/src/comps/comps/dataChangeResponderComp.tsx @@ -6,7 +6,7 @@ import { bottomResListComp } from "comps/generators/bottomResList"; import { NameConfig, withExposingConfigs } from "comps/generators/withExposing"; import { trans } from "i18n"; import _ from "lodash"; -import { CompAction, CompActionTypes } from "openblocks-core"; +import { CompAction, CompActionTypes } from "lowcoder-core"; import { DocLink, QueryConfigLabel, diff --git a/client/packages/openblocks/src/comps/comps/dateComp/dateComp.tsx b/client/packages/openblocks/src/comps/comps/dateComp/dateComp.tsx index 84ed83766..932bd0211 100644 --- a/client/packages/openblocks/src/comps/comps/dateComp/dateComp.tsx +++ b/client/packages/openblocks/src/comps/comps/dateComp/dateComp.tsx @@ -1,6 +1,6 @@ import _, { noop } from "lodash"; import moment from "moment"; -import { RecordConstructorToComp, RecordConstructorToView } from "openblocks-core"; +import { RecordConstructorToComp, RecordConstructorToView } from "lowcoder-core"; import { BoolCodeControl, CustomRuleControl, diff --git a/client/packages/openblocks/src/comps/comps/dateComp/timeComp.tsx b/client/packages/openblocks/src/comps/comps/dateComp/timeComp.tsx index ee87f7bdc..9c44b7e66 100644 --- a/client/packages/openblocks/src/comps/comps/dateComp/timeComp.tsx +++ b/client/packages/openblocks/src/comps/comps/dateComp/timeComp.tsx @@ -1,6 +1,6 @@ import _ from "lodash"; import moment from "moment"; -import { RecordConstructorToComp, RecordConstructorToView } from "openblocks-core"; +import { RecordConstructorToComp, RecordConstructorToView } from "lowcoder-core"; import { BoolCodeControl, CustomRuleControl, diff --git a/client/packages/openblocks/src/comps/comps/fileComp/fileComp.tsx b/client/packages/openblocks/src/comps/comps/fileComp/fileComp.tsx index 3af6533ef..f26e9f3c3 100644 --- a/client/packages/openblocks/src/comps/comps/fileComp/fileComp.tsx +++ b/client/packages/openblocks/src/comps/comps/fileComp/fileComp.tsx @@ -20,7 +20,7 @@ import { multiChangeAction, RecordConstructorToComp, RecordConstructorToView, -} from "openblocks-core"; +} from "lowcoder-core"; import { UploadRequestOption } from "rc-upload/lib/interface"; import { useEffect, useState } from "react"; import styled, { css } from "styled-components"; diff --git a/client/packages/openblocks/src/comps/comps/formComp/formComp.tsx b/client/packages/openblocks/src/comps/comps/formComp/formComp.tsx index b1e9a79c8..a12b274e9 100644 --- a/client/packages/openblocks/src/comps/comps/formComp/formComp.tsx +++ b/client/packages/openblocks/src/comps/comps/formComp/formComp.tsx @@ -20,7 +20,7 @@ import { RecordConstructorToView, ValueAndMsg, wrapChildAction, -} from "openblocks-core"; +} from "lowcoder-core"; import { NameGenerator } from "comps/utils"; import _ from "lodash"; import { CreateData, CreateForm } from "./createForm"; diff --git a/client/packages/openblocks/src/comps/comps/formComp/formDataConstants.tsx b/client/packages/openblocks/src/comps/comps/formComp/formDataConstants.tsx index 420b0daef..e5c87bec5 100644 --- a/client/packages/openblocks/src/comps/comps/formComp/formDataConstants.tsx +++ b/client/packages/openblocks/src/comps/comps/formComp/formDataConstants.tsx @@ -1,4 +1,4 @@ -import { RecordConstructorToComp } from "openblocks-core"; +import { RecordConstructorToComp } from "lowcoder-core"; import { StringControl } from "comps/controls/codeControl"; import { CompNameContext, EditorContext } from "comps/editorState"; import { Section } from "openblocks-design"; diff --git a/client/packages/openblocks/src/comps/comps/formComp/generate/dataSourceCommon.tsx b/client/packages/openblocks/src/comps/comps/formComp/generate/dataSourceCommon.tsx index e7c1d158d..93f0ed727 100644 --- a/client/packages/openblocks/src/comps/comps/formComp/generate/dataSourceCommon.tsx +++ b/client/packages/openblocks/src/comps/comps/formComp/generate/dataSourceCommon.tsx @@ -1,4 +1,4 @@ -import { ConstructorToDataType } from "openblocks-core"; +import { ConstructorToDataType } from "lowcoder-core"; import { QueryComp } from "comps/queries/queryComp"; import { CompConfig, CompSelection, generateWrapJs } from "./comp"; import { DatasourceType } from "@openblocks-ee/constants/queryConstants"; diff --git a/client/packages/openblocks/src/comps/comps/gridItemComp.tsx b/client/packages/openblocks/src/comps/comps/gridItemComp.tsx index d3b09bec6..24354ed11 100644 --- a/client/packages/openblocks/src/comps/comps/gridItemComp.tsx +++ b/client/packages/openblocks/src/comps/comps/gridItemComp.tsx @@ -16,7 +16,7 @@ import { import { ExposingInfo } from "comps/utils/exposingTypes"; import { getReduceContext, WithParamsContext } from "comps/utils/reduceContext"; import { parseCompType } from "comps/utils/remote"; -import { Comp, CompAction, ConstructorToDataType } from "openblocks-core"; +import { Comp, CompAction, ConstructorToDataType } from "lowcoder-core"; import { ScrollBar, SearchTextContext } from "openblocks-design"; import React, { Profiler, useContext, useEffect, useMemo, useState } from "react"; import { profilerCallback } from "util/cacheUtils"; diff --git a/client/packages/openblocks/src/comps/comps/imageComp.tsx b/client/packages/openblocks/src/comps/comps/imageComp.tsx index 82c8a3c70..64e850f49 100644 --- a/client/packages/openblocks/src/comps/comps/imageComp.tsx +++ b/client/packages/openblocks/src/comps/comps/imageComp.tsx @@ -4,7 +4,7 @@ import { clickEvent, eventHandlerControl } from "../controls/eventHandlerControl import { StringStateControl } from "../controls/codeStateControl"; import { UICompBuilder, withDefault } from "../generators"; import { NameConfig, NameConfigHidden, withExposingConfigs } from "../generators/withExposing"; -import { RecordConstructorToView } from "openblocks-core"; +import { RecordConstructorToView } from "lowcoder-core"; import { useEffect, useRef, useState } from "react"; import _ from "lodash"; import ReactResizeDetector from "react-resize-detector"; diff --git a/client/packages/openblocks/src/comps/comps/jsonSchemaFormComp/jsonSchemaFormComp.tsx b/client/packages/openblocks/src/comps/comps/jsonSchemaFormComp/jsonSchemaFormComp.tsx index ae9a886a1..853828f8c 100644 --- a/client/packages/openblocks/src/comps/comps/jsonSchemaFormComp/jsonSchemaFormComp.tsx +++ b/client/packages/openblocks/src/comps/comps/jsonSchemaFormComp/jsonSchemaFormComp.tsx @@ -7,7 +7,7 @@ import { JsonSchemaFormStyle, JsonSchemaFormStyleType } from "comps/controls/sty import { depsConfig, NameConfigHidden, withExposingConfigs } from "comps/generators/withExposing"; import { withMethodExposing } from "comps/generators/withMethodExposing"; import { ValueFromOption } from "openblocks-design"; -import { i18n } from "openblocks-core"; +import { i18n } from "lowcoder-core"; import { i18nObjs, trans } from "i18n"; import { JSONSchema7 } from "json-schema"; import styled from "styled-components"; diff --git a/client/packages/openblocks/src/comps/comps/layout/layoutMenuItemComp.tsx b/client/packages/openblocks/src/comps/comps/layout/layoutMenuItemComp.tsx index 8bcc15259..62b55a7da 100644 --- a/client/packages/openblocks/src/comps/comps/layout/layoutMenuItemComp.tsx +++ b/client/packages/openblocks/src/comps/comps/layout/layoutMenuItemComp.tsx @@ -1,4 +1,4 @@ -import { MultiBaseComp } from "openblocks-core"; +import { MultiBaseComp } from "lowcoder-core"; import { BoolCodeControl, StringControl } from "comps/controls/codeControl"; import { valueComp } from "comps/generators"; import { list } from "comps/generators/list"; diff --git a/client/packages/openblocks/src/comps/comps/layout/mobileTabLayout.tsx b/client/packages/openblocks/src/comps/comps/layout/mobileTabLayout.tsx index c881c9665..f220fea9e 100644 --- a/client/packages/openblocks/src/comps/comps/layout/mobileTabLayout.tsx +++ b/client/packages/openblocks/src/comps/comps/layout/mobileTabLayout.tsx @@ -9,7 +9,7 @@ import React, { Suspense, useContext, useState } from "react"; import { registerLayoutMap } from "comps/comps/uiComp"; import { AppSelectComp } from "comps/comps/layout/appSelectComp"; import { NameAndExposingInfo } from "comps/utils/exposingTypes"; -import { ConstructorToComp } from "openblocks-core"; +import { ConstructorToComp } from "lowcoder-core"; import { CanvasContainer } from "comps/comps/gridLayoutComp/canvasView"; import { CanvasContainerID } from "constants/domLocators"; import { EditorContainer, EmptyContent } from "pages/common/styledComponent"; diff --git a/client/packages/openblocks/src/comps/comps/listViewComp/listView.tsx b/client/packages/openblocks/src/comps/comps/listViewComp/listView.tsx index 5a2eb0488..0e547eb7d 100644 --- a/client/packages/openblocks/src/comps/comps/listViewComp/listView.tsx +++ b/client/packages/openblocks/src/comps/comps/listViewComp/listView.tsx @@ -2,7 +2,7 @@ import { Pagination } from "antd"; import { EditorContext } from "comps/editorState"; import { BackgroundColorContext } from "comps/utils/backgroundColorContext"; import _ from "lodash"; -import { ConstructorToView, deferAction } from "openblocks-core"; +import { ConstructorToView, deferAction } from "lowcoder-core"; import { HintPlaceHolder, pageItemRender } from "openblocks-design"; import { RefObject, useContext, useEffect, useMemo, useRef } from "react"; import ReactResizeDetector from "react-resize-detector"; diff --git a/client/packages/openblocks/src/comps/comps/listViewComp/listViewComp.tsx b/client/packages/openblocks/src/comps/comps/listViewComp/listViewComp.tsx index a7c39f649..5df6f33f7 100644 --- a/client/packages/openblocks/src/comps/comps/listViewComp/listViewComp.tsx +++ b/client/packages/openblocks/src/comps/comps/listViewComp/listViewComp.tsx @@ -27,7 +27,7 @@ import { Node, withFunction, WrapContextNodeV2, -} from "openblocks-core"; +} from "lowcoder-core"; import { JSONValue } from "util/jsonTypes"; import { depthEqual, lastValueIfEqual, shallowEqual } from "util/objectUtils"; import { CompTree, getAllCompItems, IContainer } from "../containerBase"; diff --git a/client/packages/openblocks/src/comps/comps/mediaComp/audioComp.tsx b/client/packages/openblocks/src/comps/comps/mediaComp/audioComp.tsx index 99c50f216..98ff123f0 100644 --- a/client/packages/openblocks/src/comps/comps/mediaComp/audioComp.tsx +++ b/client/packages/openblocks/src/comps/comps/mediaComp/audioComp.tsx @@ -4,7 +4,7 @@ import { eventHandlerControl } from "../../controls/eventHandlerControl"; import { StringStateControl } from "../../controls/codeStateControl"; import { UICompBuilder } from "../../generators"; import { NameConfig, NameConfigHidden, withExposingConfigs } from "../../generators/withExposing"; -import { RecordConstructorToView } from "openblocks-core"; +import { RecordConstructorToView } from "lowcoder-core"; import { styleControl } from "comps/controls/styleControl"; import { ImageStyle } from "comps/controls/styleControlConstants"; import { TacoAudio } from "openblocks-design"; diff --git a/client/packages/openblocks/src/comps/comps/mediaComp/mediaUtils.tsx b/client/packages/openblocks/src/comps/comps/mediaComp/mediaUtils.tsx index fe7e52ef6..8dc0f0d95 100644 --- a/client/packages/openblocks/src/comps/comps/mediaComp/mediaUtils.tsx +++ b/client/packages/openblocks/src/comps/comps/mediaComp/mediaUtils.tsx @@ -6,7 +6,7 @@ import { refMethods, } from "comps/generators/withMethodExposing"; import { trans } from "i18n"; -import { MultiBaseComp } from "openblocks-core"; +import { MultiBaseComp } from "lowcoder-core"; import ReactPlayer from "react-player"; export const mediaCommonChildren = { diff --git a/client/packages/openblocks/src/comps/comps/mediaComp/videoComp.tsx b/client/packages/openblocks/src/comps/comps/mediaComp/videoComp.tsx index 307804efc..db50e35aa 100644 --- a/client/packages/openblocks/src/comps/comps/mediaComp/videoComp.tsx +++ b/client/packages/openblocks/src/comps/comps/mediaComp/videoComp.tsx @@ -3,7 +3,7 @@ import { eventHandlerControl } from "../../controls/eventHandlerControl"; import { StringStateControl, numberExposingStateControl } from "../../controls/codeStateControl"; import { UICompBuilder } from "../../generators"; import { NameConfig, NameConfigHidden, withExposingConfigs } from "../../generators/withExposing"; -import { RecordConstructorToView } from "openblocks-core"; +import { RecordConstructorToView } from "lowcoder-core"; import { useRef, useState } from "react"; import { styleControl } from "comps/controls/styleControl"; import { ImageStyle } from "comps/controls/styleControlConstants"; diff --git a/client/packages/openblocks/src/comps/comps/moduleComp/moduleComp.test.tsx b/client/packages/openblocks/src/comps/comps/moduleComp/moduleComp.test.tsx index 74a46b3a1..3739d7521 100644 --- a/client/packages/openblocks/src/comps/comps/moduleComp/moduleComp.test.tsx +++ b/client/packages/openblocks/src/comps/comps/moduleComp/moduleComp.test.tsx @@ -9,7 +9,7 @@ import { Node, routeByNameAction, triggerModuleEventAction, -} from "openblocks-core"; +} from "lowcoder-core"; import { getPromiseAfterDispatch } from "util/promiseUtils"; import { RootComp } from "../rootComp"; import { TextComp } from "../textComp"; diff --git a/client/packages/openblocks/src/comps/comps/moduleComp/moduleComp.tsx b/client/packages/openblocks/src/comps/comps/moduleComp/moduleComp.tsx index 070fe3029..acb7f6c8f 100644 --- a/client/packages/openblocks/src/comps/comps/moduleComp/moduleComp.tsx +++ b/client/packages/openblocks/src/comps/comps/moduleComp/moduleComp.tsx @@ -10,7 +10,7 @@ import { WrapNode, CompParams, DispatchType, -} from "openblocks-core"; +} from "lowcoder-core"; import { RootComp } from "comps/comps/rootComp"; import { AutoHeightControl } from "comps/controls/autoHeightControl"; import { valueComp, withViewFn } from "comps/generators"; diff --git a/client/packages/openblocks/src/comps/comps/moduleComp/moduleEventComp.tsx b/client/packages/openblocks/src/comps/comps/moduleComp/moduleEventComp.tsx index 03b15d8a6..6a81ee726 100644 --- a/client/packages/openblocks/src/comps/comps/moduleComp/moduleEventComp.tsx +++ b/client/packages/openblocks/src/comps/comps/moduleComp/moduleEventComp.tsx @@ -1,10 +1,10 @@ -import { routeByNameAction, executeQueryAction } from "openblocks-core"; -import { CompAction, CompActionTypes, RouteByNameAction } from "openblocks-core"; -import { CompParams } from "openblocks-core"; +import { routeByNameAction, executeQueryAction } from "lowcoder-core"; +import { CompAction, CompActionTypes, RouteByNameAction } from "lowcoder-core"; +import { CompParams } from "lowcoder-core"; import { codeControl } from "comps/controls/codeControl"; import QuerySelectControl from "comps/controls/querySelectControl"; import { MultiCompBuilder, parseChildrenFromValueAndChildrenMap } from "comps/generators/multi"; -import { Node } from "openblocks-core"; +import { Node } from "lowcoder-core"; import { Fragment, ReactNode } from "react"; import { setFieldsNoTypeCheck } from "util/objectUtils"; import { inputControls, InputTypeEnum } from "../moduleContainerComp/ioComp/inputListItemComp"; diff --git a/client/packages/openblocks/src/comps/comps/moduleComp/moduleInputComp.tsx b/client/packages/openblocks/src/comps/comps/moduleComp/moduleInputComp.tsx index 3413d0bb6..5230ee96c 100644 --- a/client/packages/openblocks/src/comps/comps/moduleComp/moduleInputComp.tsx +++ b/client/packages/openblocks/src/comps/comps/moduleComp/moduleInputComp.tsx @@ -1,10 +1,10 @@ -import { routeByNameAction, executeQueryAction } from "openblocks-core"; -import { CompAction, CompActionTypes, RouteByNameAction } from "openblocks-core"; -import { CompParams } from "openblocks-core"; +import { routeByNameAction, executeQueryAction } from "lowcoder-core"; +import { CompAction, CompActionTypes, RouteByNameAction } from "lowcoder-core"; +import { CompParams } from "lowcoder-core"; import { codeControl } from "comps/controls/codeControl"; import QuerySelectControl from "comps/controls/querySelectControl"; import { MultiCompBuilder, parseChildrenFromValueAndChildrenMap } from "comps/generators/multi"; -import { Node } from "openblocks-core"; +import { Node } from "lowcoder-core"; import { Fragment, ReactNode } from "react"; import { setFieldsNoTypeCheck } from "util/objectUtils"; import { inputControls, InputTypeEnum } from "../moduleContainerComp/ioComp/inputListItemComp"; diff --git a/client/packages/openblocks/src/comps/comps/moduleContainerComp/ioComp/inputListComp.tsx b/client/packages/openblocks/src/comps/comps/moduleContainerComp/ioComp/inputListComp.tsx index b55628e0f..7db286d0e 100644 --- a/client/packages/openblocks/src/comps/comps/moduleContainerComp/ioComp/inputListComp.tsx +++ b/client/packages/openblocks/src/comps/comps/moduleContainerComp/ioComp/inputListComp.tsx @@ -6,7 +6,7 @@ import { dropdownControl } from "comps/controls/dropdownControl"; import { EditorContext } from "comps/editorState"; import { list } from "comps/generators/list"; import { trans } from "i18n"; -import { multiChangeAction } from "openblocks-core"; +import { multiChangeAction } from "lowcoder-core"; import { controlItem, Section } from "openblocks-design"; import { useContext } from "react"; import InputListItemComp, { getInputOptionLabel, InputTypeEnum } from "./inputListItemComp"; diff --git a/client/packages/openblocks/src/comps/comps/moduleContainerComp/ioComp/inputListItemComp.tsx b/client/packages/openblocks/src/comps/comps/moduleContainerComp/ioComp/inputListItemComp.tsx index ac2e6c1d5..d18668ffc 100644 --- a/client/packages/openblocks/src/comps/comps/moduleContainerComp/ioComp/inputListItemComp.tsx +++ b/client/packages/openblocks/src/comps/comps/moduleContainerComp/ioComp/inputListItemComp.tsx @@ -7,7 +7,7 @@ import { isCustomAction, isMyCustomAction, CustomAction, -} from "openblocks-core"; +} from "lowcoder-core"; import { MethodConfig, ExecuteAction } from "comps/controls/actionSelector/executeCompTypes"; import { JSONValueControl, @@ -24,7 +24,7 @@ import { withType, MultiCompBuilder } from "comps/generators"; import { simpleValueComp } from "comps/generators/hookToComp"; import { withExposingRaw } from "comps/generators/withExposing"; import { getReduceContext } from "comps/utils/reduceContext"; -import { FunctionNode, CodeNode, fromRecord, Node } from "openblocks-core"; +import { FunctionNode, CodeNode, fromRecord, Node } from "lowcoder-core"; import { Fragment, useEffect } from "react"; import { setFieldsNoTypeCheck } from "util/objectUtils"; import { handlePromiseAndDispatch } from "util/promiseUtils"; diff --git a/client/packages/openblocks/src/comps/comps/moduleContainerComp/moduleEventListItemComp.tsx b/client/packages/openblocks/src/comps/comps/moduleContainerComp/moduleEventListItemComp.tsx index 78f80a4e6..e8215f576 100644 --- a/client/packages/openblocks/src/comps/comps/moduleContainerComp/moduleEventListItemComp.tsx +++ b/client/packages/openblocks/src/comps/comps/moduleContainerComp/moduleEventListItemComp.tsx @@ -10,7 +10,7 @@ import { Node, routeByNameAction, triggerModuleEventAction, -} from "openblocks-core"; +} from "lowcoder-core"; import { lastValueIfEqual } from "util/objectUtils"; const childrenMap = { diff --git a/client/packages/openblocks/src/comps/comps/moduleContainerComp/moduleLayoutComp.tsx b/client/packages/openblocks/src/comps/comps/moduleContainerComp/moduleLayoutComp.tsx index 196f6afe8..9d8181383 100644 --- a/client/packages/openblocks/src/comps/comps/moduleContainerComp/moduleLayoutComp.tsx +++ b/client/packages/openblocks/src/comps/comps/moduleContainerComp/moduleLayoutComp.tsx @@ -7,7 +7,7 @@ import { DEFAULT_POSITION_PARAMS, PositionParams } from "layout"; import { ResizeHandleAxis } from "layout/gridLayoutPropTypes"; import { Layout } from "layout/utils"; import _ from "lodash"; -import { CompAction, CompActionTypes } from "openblocks-core"; +import { CompAction, CompActionTypes } from "lowcoder-core"; import { ReactElement, useContext } from "react"; import { ExternalEditorContext } from "util/context/ExternalEditorContext"; import { JSONValue } from "util/jsonTypes"; diff --git a/client/packages/openblocks/src/comps/comps/moduleContainerComp/moduleMethodListItemComp.tsx b/client/packages/openblocks/src/comps/comps/moduleContainerComp/moduleMethodListItemComp.tsx index f0229b107..d808a9718 100644 --- a/client/packages/openblocks/src/comps/comps/moduleContainerComp/moduleMethodListItemComp.tsx +++ b/client/packages/openblocks/src/comps/comps/moduleContainerComp/moduleMethodListItemComp.tsx @@ -2,7 +2,7 @@ import { ActionSelectorControl } from "comps/controls/actionSelector/actionSelec import CompNameControl from "comps/controls/compNameControl"; import { MultiCompBuilder } from "comps/generators"; import { withParams } from "comps/generators/withParams"; -import { CompAction, customAction, isCustomAction } from "openblocks-core"; +import { CompAction, customAction, isCustomAction } from "lowcoder-core"; import { getPromiseAfterDispatch } from "util/promiseUtils"; import ModuleMethodParamListComp from "./moduleMethodParamListComp"; diff --git a/client/packages/openblocks/src/comps/comps/moduleContainerComp/moduleMethodParamListComp.tsx b/client/packages/openblocks/src/comps/comps/moduleContainerComp/moduleMethodParamListComp.tsx index d89609d2f..27f7a55d4 100644 --- a/client/packages/openblocks/src/comps/comps/moduleContainerComp/moduleMethodParamListComp.tsx +++ b/client/packages/openblocks/src/comps/comps/moduleContainerComp/moduleMethodParamListComp.tsx @@ -6,7 +6,7 @@ import { dropdownControl } from "comps/controls/dropdownControl"; import { list } from "comps/generators/list"; import { NameGenerator } from "comps/utils/nameGenerator"; import { trans } from "i18n"; -import { multiChangeAction } from "openblocks-core"; +import { multiChangeAction } from "lowcoder-core"; import { ControlPropertyViewWrapper } from "openblocks-design"; import { useEffect } from "react"; import ParamListItemComp, { diff --git a/client/packages/openblocks/src/comps/comps/navComp/navItemComp.tsx b/client/packages/openblocks/src/comps/comps/navComp/navItemComp.tsx index 8b60e98a6..565013ab4 100644 --- a/client/packages/openblocks/src/comps/comps/navComp/navItemComp.tsx +++ b/client/packages/openblocks/src/comps/comps/navComp/navItemComp.tsx @@ -6,7 +6,7 @@ import { withDefault } from "comps/generators/simpleGenerators"; import { hiddenPropertyView } from "comps/utils/propertyUtils"; import { trans } from "i18n"; import _ from "lodash"; -import { fromRecord, MultiBaseComp, Node, RecordNode, RecordNodeToValue } from "openblocks-core"; +import { fromRecord, MultiBaseComp, Node, RecordNode, RecordNodeToValue } from "lowcoder-core"; import { ReactNode } from "react"; const events = [clickEvent]; diff --git a/client/packages/openblocks/src/comps/comps/numberInputComp/numberInputComp.tsx b/client/packages/openblocks/src/comps/comps/numberInputComp/numberInputComp.tsx index 084799e7f..16ca1fa89 100644 --- a/client/packages/openblocks/src/comps/comps/numberInputComp/numberInputComp.tsx +++ b/client/packages/openblocks/src/comps/comps/numberInputComp/numberInputComp.tsx @@ -23,7 +23,7 @@ import { import { Section, sectionNames, ValueFromOption } from "openblocks-design"; import { useEffect, useRef, useState } from "react"; import styled, { css } from "styled-components"; -import { RecordConstructorToView } from "openblocks-core"; +import { RecordConstructorToView } from "lowcoder-core"; import { InputEventHandlerControl } from "../../controls/eventHandlerControl"; import { UICompBuilder, withDefault } from "../../generators"; import { formDataChildren, FormDataPropertyView } from "../formComp/formDataConstants"; diff --git a/client/packages/openblocks/src/comps/comps/numberInputComp/sliderCompConstants.tsx b/client/packages/openblocks/src/comps/comps/numberInputComp/sliderCompConstants.tsx index 33ff8bbd1..e6abcd14f 100644 --- a/client/packages/openblocks/src/comps/comps/numberInputComp/sliderCompConstants.tsx +++ b/client/packages/openblocks/src/comps/comps/numberInputComp/sliderCompConstants.tsx @@ -3,7 +3,7 @@ import { LabelControl } from "../../controls/labelControl"; import { withDefault } from "../../generators"; import { ChangeEventHandlerControl } from "../../controls/eventHandlerControl"; import { Section, sectionNames } from "openblocks-design"; -import { RecordConstructorToComp } from "openblocks-core"; +import { RecordConstructorToComp } from "lowcoder-core"; import { styleControl } from "comps/controls/styleControl"; import { SliderStyle, SliderStyleType } from "comps/controls/styleControlConstants"; import styled, { css } from "styled-components"; diff --git a/client/packages/openblocks/src/comps/comps/preLoadComp.tsx b/client/packages/openblocks/src/comps/comps/preLoadComp.tsx index e52ed1424..c4a2afabc 100644 --- a/client/packages/openblocks/src/comps/comps/preLoadComp.tsx +++ b/client/packages/openblocks/src/comps/comps/preLoadComp.tsx @@ -8,7 +8,7 @@ import { evalFunc, evalStyle, RecordConstructorToComp, -} from "openblocks-core"; +} from "lowcoder-core"; import { CodeTextControl } from "comps/controls/codeTextControl"; import SimpleStringControl from "comps/controls/simpleStringControl"; import { MultiCompBuilder, withPropertyViewFn } from "comps/generators"; diff --git a/client/packages/openblocks/src/comps/comps/qrCodeComp.tsx b/client/packages/openblocks/src/comps/comps/qrCodeComp.tsx index a032cd130..6908b00d9 100644 --- a/client/packages/openblocks/src/comps/comps/qrCodeComp.tsx +++ b/client/packages/openblocks/src/comps/comps/qrCodeComp.tsx @@ -1,4 +1,4 @@ -import { RecordConstructorToView } from "openblocks-core"; +import { RecordConstructorToView } from "lowcoder-core"; import { BoolControl } from "comps/controls/boolControl"; import { stringExposingStateControl } from "comps/controls/codeStateControl"; import { dropdownControl } from "comps/controls/dropdownControl"; diff --git a/client/packages/openblocks/src/comps/comps/queryLibrary/queryLibraryComp.tsx b/client/packages/openblocks/src/comps/comps/queryLibrary/queryLibraryComp.tsx index 2f40ff890..682e7df60 100644 --- a/client/packages/openblocks/src/comps/comps/queryLibrary/queryLibraryComp.tsx +++ b/client/packages/openblocks/src/comps/comps/queryLibrary/queryLibraryComp.tsx @@ -18,7 +18,7 @@ import { UnfoldWhiteIcon, } from "openblocks-design"; import ReactHotkeys from "../../../util/hotkeys"; -import { executeQueryAction, renameAction } from "openblocks-core"; +import { executeQueryAction, renameAction } from "lowcoder-core"; import { deleteQueryLibrary } from "redux/reduxActions/queryLibraryActions"; import { useDispatch } from "react-redux"; import styled from "styled-components"; diff --git a/client/packages/openblocks/src/comps/comps/refTreeComp.tsx b/client/packages/openblocks/src/comps/comps/refTreeComp.tsx index e18d8ec64..f5740754a 100644 --- a/client/packages/openblocks/src/comps/comps/refTreeComp.tsx +++ b/client/packages/openblocks/src/comps/comps/refTreeComp.tsx @@ -8,7 +8,7 @@ import { MultiCompConstructor, RenameAction, wrapChildAction, -} from "openblocks-core"; +} from "lowcoder-core"; const treeItemComp = (childComp: MultiCompConstructor) => { class TreeItemListComp extends list(childComp) { diff --git a/client/packages/openblocks/src/comps/comps/remoteComp/loaders.tsx b/client/packages/openblocks/src/comps/comps/remoteComp/loaders.tsx index 00aecde19..9c689f781 100644 --- a/client/packages/openblocks/src/comps/comps/remoteComp/loaders.tsx +++ b/client/packages/openblocks/src/comps/comps/remoteComp/loaders.tsx @@ -1,6 +1,6 @@ import { NPM_PLUGIN_ASSETS_BASE_URL } from "constants/npmPlugins"; import { trans } from "i18n"; -import { CompConstructor } from "openblocks-core"; +import { CompConstructor } from "lowcoder-core"; import { RemoteCompInfo, RemoteCompLoader, RemoteCompSource } from "types/remoteComp"; async function npmLoader(remoteInfo: RemoteCompInfo): Promise { diff --git a/client/packages/openblocks/src/comps/comps/remoteComp/remoteComp.test.tsx b/client/packages/openblocks/src/comps/comps/remoteComp/remoteComp.test.tsx index cab638fdf..fc906fca4 100644 --- a/client/packages/openblocks/src/comps/comps/remoteComp/remoteComp.test.tsx +++ b/client/packages/openblocks/src/comps/comps/remoteComp/remoteComp.test.tsx @@ -3,7 +3,7 @@ import { simpleMultiComp, valueComp } from "comps/generators"; import { withSimpleExposing } from "comps/generators/withExposing"; import { withMethodExposing } from "comps/generators/withMethodExposing"; import { evalAndReduce } from "comps/utils"; -import { customAction } from "openblocks-core"; +import { customAction } from "lowcoder-core"; import { RemoteCompInfo } from "types/remoteComp"; import { remoteComp } from "./remoteComp"; diff --git a/client/packages/openblocks/src/comps/comps/remoteComp/remoteComp.tsx b/client/packages/openblocks/src/comps/comps/remoteComp/remoteComp.tsx index 507308ec1..6dc6f71f1 100644 --- a/client/packages/openblocks/src/comps/comps/remoteComp/remoteComp.tsx +++ b/client/packages/openblocks/src/comps/comps/remoteComp/remoteComp.tsx @@ -3,7 +3,7 @@ import { simpleMultiComp } from "comps/generators"; import { withExposingConfigs } from "comps/generators/withExposing"; import { GreyTextColor } from "constants/style"; import log from "loglevel"; -import { Comp, CompAction, CompParams, customAction, isCustomAction } from "openblocks-core"; +import { Comp, CompAction, CompParams, customAction, isCustomAction } from "lowcoder-core"; import { WhiteLoading } from "openblocks-design"; import { useState } from "react"; import { useMount } from "react-use"; diff --git a/client/packages/openblocks/src/comps/comps/rootComp.test.tsx b/client/packages/openblocks/src/comps/comps/rootComp.test.tsx index 5491737fe..c8a37758b 100644 --- a/client/packages/openblocks/src/comps/comps/rootComp.test.tsx +++ b/client/packages/openblocks/src/comps/comps/rootComp.test.tsx @@ -1,4 +1,4 @@ -import { Comp } from "openblocks-core"; +import { Comp } from "lowcoder-core"; import { evalAndReduce } from "comps/utils"; // This file contains the trials that all comps need to pass diff --git a/client/packages/openblocks/src/comps/comps/rootComp.tsx b/client/packages/openblocks/src/comps/comps/rootComp.tsx index 8d1c68c18..35b3d17a6 100644 --- a/client/packages/openblocks/src/comps/comps/rootComp.tsx +++ b/client/packages/openblocks/src/comps/comps/rootComp.tsx @@ -1,4 +1,4 @@ -import { CompAction, CompActionTypes } from "openblocks-core"; +import { CompAction, CompActionTypes } from "lowcoder-core"; import { EditorContext, EditorState } from "comps/editorState"; import { simpleMultiComp } from "comps/generators"; import { HookListComp } from "comps/hooks/hookListComp"; diff --git a/client/packages/openblocks/src/comps/comps/selectInputComp/cascaderContants.tsx b/client/packages/openblocks/src/comps/comps/selectInputComp/cascaderContants.tsx index 732fe7f5a..7267b8b40 100644 --- a/client/packages/openblocks/src/comps/comps/selectInputComp/cascaderContants.tsx +++ b/client/packages/openblocks/src/comps/comps/selectInputComp/cascaderContants.tsx @@ -1,6 +1,6 @@ import { SelectEventHandlerControl } from "../../controls/eventHandlerControl"; import { Section, sectionNames } from "openblocks-design"; -import { RecordConstructorToComp } from "openblocks-core"; +import { RecordConstructorToComp } from "lowcoder-core"; import { BoolCodeControl, JSONObjectArrayControl, StringControl } from "comps/controls/codeControl"; import { arrayStringExposingStateControl } from "comps/controls/codeStateControl"; import { BoolControl } from "comps/controls/boolControl"; diff --git a/client/packages/openblocks/src/comps/comps/selectInputComp/radioCompConstants.tsx b/client/packages/openblocks/src/comps/comps/selectInputComp/radioCompConstants.tsx index 651a4d69e..6a999e40d 100644 --- a/client/packages/openblocks/src/comps/comps/selectInputComp/radioCompConstants.tsx +++ b/client/packages/openblocks/src/comps/comps/selectInputComp/radioCompConstants.tsx @@ -1,4 +1,4 @@ -import { RecordConstructorToComp } from "openblocks-core"; +import { RecordConstructorToComp } from "lowcoder-core"; import { BoolCodeControl } from "../../controls/codeControl"; import { LabelControl } from "../../controls/labelControl"; import { diff --git a/client/packages/openblocks/src/comps/comps/selectInputComp/selectComp.tsx b/client/packages/openblocks/src/comps/comps/selectInputComp/selectComp.tsx index e5291b80e..98c5b8bc8 100644 --- a/client/packages/openblocks/src/comps/comps/selectInputComp/selectComp.tsx +++ b/client/packages/openblocks/src/comps/comps/selectInputComp/selectComp.tsx @@ -16,7 +16,7 @@ import { useSelectInputValidate, } from "./selectInputConstants"; import { useRef } from "react"; -import { RecordConstructorToView } from "openblocks-core"; +import { RecordConstructorToView } from "lowcoder-core"; const SelectBasicComp = (function () { const childrenMap = { diff --git a/client/packages/openblocks/src/comps/comps/selectInputComp/selectCompConstants.tsx b/client/packages/openblocks/src/comps/comps/selectInputComp/selectCompConstants.tsx index e800aa99a..a0d4145ce 100644 --- a/client/packages/openblocks/src/comps/comps/selectInputComp/selectCompConstants.tsx +++ b/client/packages/openblocks/src/comps/comps/selectInputComp/selectCompConstants.tsx @@ -3,7 +3,7 @@ import { DispatchType, RecordConstructorToComp, RecordConstructorToView, -} from "openblocks-core"; +} from "lowcoder-core"; import { BoolControl } from "../../controls/boolControl"; import { LabelControl } from "../../controls/labelControl"; import { BoolCodeControl, StringControl } from "../../controls/codeControl"; diff --git a/client/packages/openblocks/src/comps/comps/selectInputComp/selectInputConstants.tsx b/client/packages/openblocks/src/comps/comps/selectInputComp/selectInputConstants.tsx index ecd468435..3cf6b238d 100644 --- a/client/packages/openblocks/src/comps/comps/selectInputComp/selectInputConstants.tsx +++ b/client/packages/openblocks/src/comps/comps/selectInputComp/selectInputConstants.tsx @@ -3,7 +3,7 @@ import { ChildrenTypeToDepsKeys, depsConfig } from "../../generators/withExposin import { BoolControl } from "../../controls/boolControl"; import { CustomRuleControl } from "../../controls/codeControl"; import { isEmpty } from "lodash"; -import { ConstructorToComp, RecordConstructorToComp } from "openblocks-core"; +import { ConstructorToComp, RecordConstructorToComp } from "lowcoder-core"; import { arrayStringExposingStateControl, jsonExposingStateControl, diff --git a/client/packages/openblocks/src/comps/comps/signatureComp.tsx b/client/packages/openblocks/src/comps/comps/signatureComp.tsx index cbf76feb9..0ad958575 100644 --- a/client/packages/openblocks/src/comps/comps/signatureComp.tsx +++ b/client/packages/openblocks/src/comps/comps/signatureComp.tsx @@ -13,7 +13,7 @@ import { import { stateComp, withDefault } from "comps/generators/simpleGenerators"; import { hiddenPropertyView } from "comps/utils/propertyUtils"; import { trans } from "i18n"; -import { changeValueAction, multiChangeAction } from "openblocks-core"; +import { changeValueAction, multiChangeAction } from "lowcoder-core"; import { Section, sectionNames, UndoIcon } from "openblocks-design"; import React, { Suspense, useState } from "react"; import ReactResizeDetector from "react-resize-detector"; diff --git a/client/packages/openblocks/src/comps/comps/simpleNameComp.tsx b/client/packages/openblocks/src/comps/comps/simpleNameComp.tsx index 016d9c551..efaa6eb87 100644 --- a/client/packages/openblocks/src/comps/comps/simpleNameComp.tsx +++ b/client/packages/openblocks/src/comps/comps/simpleNameComp.tsx @@ -1,4 +1,4 @@ -import { CompAction, CompActionTypes, isBroadcastAction, RenameAction } from "openblocks-core"; +import { CompAction, CompActionTypes, isBroadcastAction, RenameAction } from "lowcoder-core"; import { valueComp } from "../generators"; const ValueComp = valueComp(""); diff --git a/client/packages/openblocks/src/comps/comps/tableComp/column/columnTypeCompBuilder.tsx b/client/packages/openblocks/src/comps/comps/tableComp/column/columnTypeCompBuilder.tsx index 5a2b7d7a7..6edda2acb 100644 --- a/client/packages/openblocks/src/comps/comps/tableComp/column/columnTypeCompBuilder.tsx +++ b/client/packages/openblocks/src/comps/comps/tableComp/column/columnTypeCompBuilder.tsx @@ -19,7 +19,7 @@ import { NodeToValue, RecordConstructorToComp, withFunction, -} from "openblocks-core"; +} from "lowcoder-core"; import { ReactNode } from "react"; import { JSONValue } from "util/jsonTypes"; diff --git a/client/packages/openblocks/src/comps/comps/tableComp/column/tableColumnComp.tsx b/client/packages/openblocks/src/comps/comps/tableComp/column/tableColumnComp.tsx index 85edf4a2a..c9078204b 100644 --- a/client/packages/openblocks/src/comps/comps/tableComp/column/tableColumnComp.tsx +++ b/client/packages/openblocks/src/comps/comps/tableComp/column/tableColumnComp.tsx @@ -18,7 +18,7 @@ import { multiChangeAction, withFunction, wrapChildAction, -} from "openblocks-core"; +} from "lowcoder-core"; import { AlignClose, AlignLeft, AlignRight } from "openblocks-design"; import { ColumnTypeComp, ColumnTypeCompMap } from "./columnTypeComp"; diff --git a/client/packages/openblocks/src/comps/comps/tableComp/column/tableColumnListComp.tsx b/client/packages/openblocks/src/comps/comps/tableComp/column/tableColumnListComp.tsx index 687636685..d186aad0a 100644 --- a/client/packages/openblocks/src/comps/comps/tableComp/column/tableColumnListComp.tsx +++ b/client/packages/openblocks/src/comps/comps/tableComp/column/tableColumnListComp.tsx @@ -13,7 +13,7 @@ import { fromRecord, isMyCustomAction, RecordNode, -} from "openblocks-core"; +} from "lowcoder-core"; import { shallowEqual } from "react-redux"; import { JSONObject, JSONValue } from "util/jsonTypes"; import { lastValueIfEqual } from "util/objectUtils"; diff --git a/client/packages/openblocks/src/comps/comps/tableComp/expansionControl.tsx b/client/packages/openblocks/src/comps/comps/tableComp/expansionControl.tsx index 46e930910..2bf838baf 100644 --- a/client/packages/openblocks/src/comps/comps/tableComp/expansionControl.tsx +++ b/client/packages/openblocks/src/comps/comps/tableComp/expansionControl.tsx @@ -10,7 +10,7 @@ import { ControlItemCompBuilder } from "comps/generators/controlCompBuilder"; import { BackgroundColorContext } from "comps/utils/backgroundColorContext"; import { trans } from "i18n"; import _ from "lodash"; -import { ConstructorToView, wrapChildAction } from "openblocks-core"; +import { ConstructorToView, wrapChildAction } from "lowcoder-core"; import { useContext } from "react"; import { tryToNumber } from "util/convertUtils"; import { SimpleContainerComp } from "../containerBase/simpleContainerComp"; diff --git a/client/packages/openblocks/src/comps/comps/tableComp/mockTableComp.tsx b/client/packages/openblocks/src/comps/comps/tableComp/mockTableComp.tsx index 19e72efb3..54c2fd6ca 100644 --- a/client/packages/openblocks/src/comps/comps/tableComp/mockTableComp.tsx +++ b/client/packages/openblocks/src/comps/comps/tableComp/mockTableComp.tsx @@ -2,7 +2,7 @@ import { withDefault } from "comps/generators"; import { TableComp } from "."; import { newPrimaryColumn } from "comps/comps/tableComp/column/tableColumnComp"; import { NameGenerator } from "../../utils"; -import { ConstructorToDataType } from "openblocks-core"; +import { ConstructorToDataType } from "lowcoder-core"; import { EditorState } from "../../editorState"; import { isArrayLikeObject } from "lodash"; import { i18nObjs } from "i18n"; diff --git a/client/packages/openblocks/src/comps/comps/tableComp/paginationControl.tsx b/client/packages/openblocks/src/comps/comps/tableComp/paginationControl.tsx index 5e38d8a28..eb5b4a0f8 100644 --- a/client/packages/openblocks/src/comps/comps/tableComp/paginationControl.tsx +++ b/client/packages/openblocks/src/comps/comps/tableComp/paginationControl.tsx @@ -4,7 +4,7 @@ import { stateComp, valueComp, withDefault } from "comps/generators"; import { ControlNodeCompBuilder } from "comps/generators/controlCompBuilder"; import { migrateOldData } from "comps/generators/simpleGenerators"; import { trans } from "i18n"; -import { changeChildAction, ConstructorToNodeType } from "openblocks-core"; +import { changeChildAction, ConstructorToNodeType } from "lowcoder-core"; const DEFAULT_PAGE_SIZE = 5; diff --git a/client/packages/openblocks/src/comps/comps/tableComp/selectionControl.tsx b/client/packages/openblocks/src/comps/comps/tableComp/selectionControl.tsx index 79bb14112..07d7e5fc6 100644 --- a/client/packages/openblocks/src/comps/comps/tableComp/selectionControl.tsx +++ b/client/packages/openblocks/src/comps/comps/tableComp/selectionControl.tsx @@ -2,7 +2,7 @@ import { TableRowSelection } from "antd/lib/table/interface"; import { dropdownControl } from "comps/controls/dropdownControl"; import { stateComp } from "comps/generators"; import { trans } from "i18n"; -import { changeChildAction, ConstructorToComp } from "openblocks-core"; +import { changeChildAction, ConstructorToComp } from "lowcoder-core"; import { TableOnEventView } from "./tableTypes"; import { OB_ROW_ORI_INDEX, RecordType } from "comps/comps/tableComp/tableUtils"; import { ControlNodeCompBuilder } from "comps/generators/controlCompBuilder"; diff --git a/client/packages/openblocks/src/comps/comps/tableComp/tableComp.test.tsx b/client/packages/openblocks/src/comps/comps/tableComp/tableComp.test.tsx index 368d64bdc..9146a812f 100644 --- a/client/packages/openblocks/src/comps/comps/tableComp/tableComp.test.tsx +++ b/client/packages/openblocks/src/comps/comps/tableComp/tableComp.test.tsx @@ -1,7 +1,7 @@ import { ColumnComp } from "comps/comps/tableComp/column/tableColumnComp"; import { evalAndReduce } from "comps/utils"; import _ from "lodash"; -import { fromValue } from "openblocks-core"; +import { fromValue } from "lowcoder-core"; import { MemoryRouter } from "react-router-dom"; import { MockTableComp } from "./mockTableComp"; import { TableComp } from "./tableComp"; diff --git a/client/packages/openblocks/src/comps/comps/tableComp/tableComp.tsx b/client/packages/openblocks/src/comps/comps/tableComp/tableComp.tsx index ffa9bdd05..a3a14fd0a 100644 --- a/client/packages/openblocks/src/comps/comps/tableComp/tableComp.tsx +++ b/client/packages/openblocks/src/comps/comps/tableComp/tableComp.tsx @@ -44,7 +44,7 @@ import { routeByNameAction, withFunction, wrapChildAction, -} from "openblocks-core"; +} from "lowcoder-core"; import { saveDataAsFile } from "util/fileUtils"; import { JSONObject, JSONValue } from "util/jsonTypes"; import { lastValueIfEqual, shallowEqual } from "util/objectUtils"; diff --git a/client/packages/openblocks/src/comps/comps/tableComp/tableDynamicColumn.test.tsx b/client/packages/openblocks/src/comps/comps/tableComp/tableDynamicColumn.test.tsx index 1d86740a4..c5e1b65a0 100644 --- a/client/packages/openblocks/src/comps/comps/tableComp/tableDynamicColumn.test.tsx +++ b/client/packages/openblocks/src/comps/comps/tableComp/tableDynamicColumn.test.tsx @@ -3,7 +3,7 @@ import { columnsToAntdFormat } from "comps/comps/tableComp/tableUtils"; import { evalAndReduce } from "comps/utils"; import { reduceInContext } from "comps/utils/reduceContext"; import _ from "lodash"; -import { changeChildAction, fromValue, SimpleNode } from "openblocks-core"; +import { changeChildAction, fromValue, SimpleNode } from "lowcoder-core"; import { JSONObject } from "util/jsonTypes"; const expectColumn = ( diff --git a/client/packages/openblocks/src/comps/comps/tableComp/tablePropertyView.tsx b/client/packages/openblocks/src/comps/comps/tableComp/tablePropertyView.tsx index 537df9390..f0878a0bf 100644 --- a/client/packages/openblocks/src/comps/comps/tableComp/tablePropertyView.tsx +++ b/client/packages/openblocks/src/comps/comps/tableComp/tablePropertyView.tsx @@ -5,7 +5,7 @@ import { } from "comps/comps/tableComp/column/tableColumnComp"; import { hiddenPropertyView, loadingPropertyView } from "comps/utils/propertyUtils"; import { trans } from "i18n"; -import { changeValueAction, deferAction, MultiBaseComp, wrapChildAction } from "openblocks-core"; +import { changeValueAction, deferAction, MultiBaseComp, wrapChildAction } from "lowcoder-core"; import { BluePlusIcon, CheckBox, diff --git a/client/packages/openblocks/src/comps/comps/tableComp/tableToolbarComp.tsx b/client/packages/openblocks/src/comps/comps/tableComp/tableToolbarComp.tsx index 58b33d5c8..f3f9bc2f3 100644 --- a/client/packages/openblocks/src/comps/comps/tableComp/tableToolbarComp.tsx +++ b/client/packages/openblocks/src/comps/comps/tableComp/tableToolbarComp.tsx @@ -12,7 +12,7 @@ import { genRandomKey } from "comps/utils/idGenerator"; import { ThemeContext } from "comps/utils/themeContext"; import { trans } from "i18n"; import _, { isNil } from "lodash"; -import { changeChildAction, ConstructorToView } from "openblocks-core"; +import { changeChildAction, ConstructorToView } from "lowcoder-core"; import { AlignBottom, AlignClose, diff --git a/client/packages/openblocks/src/comps/comps/tableComp/tableTypes.tsx b/client/packages/openblocks/src/comps/comps/tableComp/tableTypes.tsx index e033a6d64..00124c17d 100644 --- a/client/packages/openblocks/src/comps/comps/tableComp/tableTypes.tsx +++ b/client/packages/openblocks/src/comps/comps/tableComp/tableTypes.tsx @@ -26,7 +26,7 @@ import { ConstructorToView, RecordConstructorToComp, RecordConstructorToView, -} from "openblocks-core"; +} from "lowcoder-core"; import { controlItem } from "openblocks-design"; import { JSONObject } from "util/jsonTypes"; import { ExpansionControl } from "./expansionControl"; diff --git a/client/packages/openblocks/src/comps/comps/tableComp/tableUtils.tsx b/client/packages/openblocks/src/comps/comps/tableComp/tableUtils.tsx index 994fc8732..3a8f05a09 100644 --- a/client/packages/openblocks/src/comps/comps/tableComp/tableUtils.tsx +++ b/client/packages/openblocks/src/comps/comps/tableComp/tableUtils.tsx @@ -11,7 +11,7 @@ import { RawColumnType, Render } from "comps/comps/tableComp/column/tableColumnC import { TableFilter, tableFilterOperatorMap } from "comps/comps/tableComp/tableToolbarComp"; import { SortValue, TableOnEventView } from "comps/comps/tableComp/tableTypes"; import _ from "lodash"; -import { changeChildAction, CompAction, NodeToValue } from "openblocks-core"; +import { changeChildAction, CompAction, NodeToValue } from "lowcoder-core"; import { EditableIcon } from "openblocks-design"; import { tryToNumber } from "util/convertUtils"; import { JSONObject, JSONValue } from "util/jsonTypes"; diff --git a/client/packages/openblocks/src/comps/comps/tabs/tabbedContainerComp.tsx b/client/packages/openblocks/src/comps/comps/tabs/tabbedContainerComp.tsx index a73530471..a2d0f20c2 100644 --- a/client/packages/openblocks/src/comps/comps/tabs/tabbedContainerComp.tsx +++ b/client/packages/openblocks/src/comps/comps/tabs/tabbedContainerComp.tsx @@ -1,7 +1,7 @@ import { message, Tabs } from "antd"; import { JSONObject, JSONValue } from "util/jsonTypes"; -import { CompAction, CompActionTypes, deleteCompAction, wrapChildAction } from "openblocks-core"; -import { DispatchType, RecordConstructorToView, wrapDispatch } from "openblocks-core"; +import { CompAction, CompActionTypes, deleteCompAction, wrapChildAction } from "lowcoder-core"; +import { DispatchType, RecordConstructorToView, wrapDispatch } from "lowcoder-core"; import { AutoHeightControl } from "comps/controls/autoHeightControl"; import { stringExposingStateControl } from "comps/controls/codeStateControl"; import { eventHandlerControl } from "comps/controls/eventHandlerControl"; diff --git a/client/packages/openblocks/src/comps/comps/textInputComp/textInputConstants.tsx b/client/packages/openblocks/src/comps/comps/textInputComp/textInputConstants.tsx index 044c7a997..61f20255b 100644 --- a/client/packages/openblocks/src/comps/comps/textInputComp/textInputConstants.tsx +++ b/client/packages/openblocks/src/comps/comps/textInputComp/textInputConstants.tsx @@ -13,7 +13,7 @@ import { Section, sectionNames, ValueFromOption } from "openblocks-design"; import _ from "lodash"; import { css } from "styled-components"; import { EMAIL_PATTERN, URL_PATTERN } from "util/stringUtils"; -import { MultiBaseComp, RecordConstructorToComp, RecordConstructorToView } from "openblocks-core"; +import { MultiBaseComp, RecordConstructorToComp, RecordConstructorToView } from "lowcoder-core"; import { dropdownControl } from "../../controls/dropdownControl"; import { InputEventHandlerControl } from "../../controls/eventHandlerControl"; import { diff --git a/client/packages/openblocks/src/comps/comps/transformerListComp.tsx b/client/packages/openblocks/src/comps/comps/transformerListComp.tsx index 517b69a6e..491c8011c 100644 --- a/client/packages/openblocks/src/comps/comps/transformerListComp.tsx +++ b/client/packages/openblocks/src/comps/comps/transformerListComp.tsx @@ -5,7 +5,7 @@ import { MultiCompBuilder } from "comps/generators"; import { bottomResListComp } from "comps/generators/bottomResList"; import { withExposingRaw } from "comps/generators/withExposing"; import { trans } from "i18n"; -import { fromRecord } from "openblocks-core"; +import { fromRecord } from "lowcoder-core"; import { DocLink } from "openblocks-design"; import { BottomTabs } from "pages/editor/bottom/BottomTabs"; import { ReactNode } from "react"; diff --git a/client/packages/openblocks/src/comps/comps/treeComp/treeComp.tsx b/client/packages/openblocks/src/comps/comps/treeComp/treeComp.tsx index fbf2049a1..558c56efa 100644 --- a/client/packages/openblocks/src/comps/comps/treeComp/treeComp.tsx +++ b/client/packages/openblocks/src/comps/comps/treeComp/treeComp.tsx @@ -1,4 +1,4 @@ -import { RecordConstructorToView } from "openblocks-core"; +import { RecordConstructorToView } from "lowcoder-core"; import { UICompBuilder } from "comps/generators/uiCompBuilder"; import { withExposingConfigs } from "comps/generators/withExposing"; import { Section, sectionNames } from "openblocks-design"; diff --git a/client/packages/openblocks/src/comps/comps/treeComp/treeSelectComp.tsx b/client/packages/openblocks/src/comps/comps/treeComp/treeSelectComp.tsx index 18c9a95c6..b29c4eacf 100644 --- a/client/packages/openblocks/src/comps/comps/treeComp/treeSelectComp.tsx +++ b/client/packages/openblocks/src/comps/comps/treeComp/treeSelectComp.tsx @@ -1,4 +1,4 @@ -import { changeChildAction, DispatchType, RecordConstructorToView } from "openblocks-core"; +import { changeChildAction, DispatchType, RecordConstructorToView } from "lowcoder-core"; import { UICompBuilder } from "comps/generators/uiCompBuilder"; import { NameConfig, withExposingConfigs } from "comps/generators/withExposing"; import { Section, sectionNames, ValueFromOption } from "openblocks-design"; diff --git a/client/packages/openblocks/src/comps/comps/treeComp/treeUtils.tsx b/client/packages/openblocks/src/comps/comps/treeComp/treeUtils.tsx index d7abcb6a1..7a2b021af 100644 --- a/client/packages/openblocks/src/comps/comps/treeComp/treeUtils.tsx +++ b/client/packages/openblocks/src/comps/comps/treeComp/treeUtils.tsx @@ -6,7 +6,7 @@ import { CommonNameConfig, NameConfig } from "comps/generators/withExposing"; import { disabledPropertyView, hiddenPropertyView } from "comps/utils/propertyUtils"; import { ControlNode, Section, sectionNames } from "openblocks-design"; import { trans } from "i18n"; -import { RecordConstructorToComp, RecordConstructorToView } from "openblocks-core"; +import { RecordConstructorToComp, RecordConstructorToView } from "lowcoder-core"; import { ReactNode, useEffect } from "react"; import { check } from "util/convertUtils"; import { formDataChildren, FormDataPropertyView } from "../formComp/formDataConstants"; diff --git a/client/packages/openblocks/src/comps/comps/triContainerComp/triContainerComp.tsx b/client/packages/openblocks/src/comps/comps/triContainerComp/triContainerComp.tsx index b24cb673e..a0bca5fd7 100644 --- a/client/packages/openblocks/src/comps/comps/triContainerComp/triContainerComp.tsx +++ b/client/packages/openblocks/src/comps/comps/triContainerComp/triContainerComp.tsx @@ -6,8 +6,8 @@ import { ContainerStyle } from "comps/controls/styleControlConstants"; import { MultiCompBuilder, sameTypeMap, withDefault } from "comps/generators"; import { migrateOldData } from "comps/generators/simpleGenerators"; import { NameGenerator } from "comps/utils"; -import { fromRecord, Node } from "openblocks-core"; -import { nodeIsRecord } from "openblocks-core"; +import { fromRecord, Node } from "lowcoder-core"; +import { nodeIsRecord } from "lowcoder-core"; import _ from "lodash"; import { ReactNode } from "react"; import { lastValueIfEqual } from "util/objectUtils"; diff --git a/client/packages/openblocks/src/comps/comps/triContainerComp/triContainerCompBuilder.tsx b/client/packages/openblocks/src/comps/comps/triContainerComp/triContainerCompBuilder.tsx index 7aa9c8684..cb0ed48b9 100644 --- a/client/packages/openblocks/src/comps/comps/triContainerComp/triContainerCompBuilder.tsx +++ b/client/packages/openblocks/src/comps/comps/triContainerComp/triContainerCompBuilder.tsx @@ -1,5 +1,5 @@ import { JSONValue } from "util/jsonTypes"; -import { Comp } from "openblocks-core"; +import { Comp } from "lowcoder-core"; import { UICompBuilder } from "comps/generators"; import { PropertyViewFnTypeForComp, diff --git a/client/packages/openblocks/src/comps/comps/uiComp.tsx b/client/packages/openblocks/src/comps/comps/uiComp.tsx index 936d41559..92c69f64a 100644 --- a/client/packages/openblocks/src/comps/comps/uiComp.tsx +++ b/client/packages/openblocks/src/comps/comps/uiComp.tsx @@ -1,4 +1,4 @@ -import { CompConstructor, CompParams } from "openblocks-core"; +import { CompConstructor, CompParams } from "lowcoder-core"; import { withType, withViewFn } from "comps/generators"; import { COMP_DATA_TYPE } from "comps/generators/withType"; import { NameAndExposingInfo } from "comps/utils/exposingTypes"; diff --git a/client/packages/openblocks/src/comps/controls/actionSelector/actionSelectorControl.test.ts b/client/packages/openblocks/src/comps/controls/actionSelector/actionSelectorControl.test.ts index 5eec82760..87b72d09b 100644 --- a/client/packages/openblocks/src/comps/controls/actionSelector/actionSelectorControl.test.ts +++ b/client/packages/openblocks/src/comps/controls/actionSelector/actionSelectorControl.test.ts @@ -2,7 +2,7 @@ import { simpleMultiComp } from "comps/generators/multi"; import { valueComp } from "comps/generators/simpleGenerators"; import { setGlobalSettings } from "comps/utils/globalSettings"; import { evalAndReduce } from "comps/utils"; -import { fromValue } from "openblocks-core"; +import { fromValue } from "lowcoder-core"; import { ActionSelectorControl } from "./actionSelectorControl"; test("action handler always get latest data", async () => { diff --git a/client/packages/openblocks/src/comps/controls/actionSelector/actionSelectorControl.tsx b/client/packages/openblocks/src/comps/controls/actionSelector/actionSelectorControl.tsx index 607f15eea..d2fcfcc80 100644 --- a/client/packages/openblocks/src/comps/controls/actionSelector/actionSelectorControl.tsx +++ b/client/packages/openblocks/src/comps/controls/actionSelector/actionSelectorControl.tsx @@ -16,7 +16,7 @@ import { isCustomAction, isMyCustomAction, UpdateActionContextAction, -} from "openblocks-core"; +} from "lowcoder-core"; import { Dropdown, HighContainer, Treediv } from "openblocks-design"; import { useContext } from "react"; import { limitExecutor, setFieldsNoTypeCheck } from "util/objectUtils"; diff --git a/client/packages/openblocks/src/comps/controls/actionSelector/executeCompAction.tsx b/client/packages/openblocks/src/comps/controls/actionSelector/executeCompAction.tsx index 5666d75f8..2d21b9819 100644 --- a/client/packages/openblocks/src/comps/controls/actionSelector/executeCompAction.tsx +++ b/client/packages/openblocks/src/comps/controls/actionSelector/executeCompAction.tsx @@ -1,5 +1,5 @@ -import { customAction, routeByNameAction } from "openblocks-core"; -import { CompParams, ConstructorToDataType } from "openblocks-core"; +import { customAction, routeByNameAction } from "lowcoder-core"; +import { CompParams, ConstructorToDataType } from "lowcoder-core"; import { GridItemComp } from "comps/comps/gridItemComp"; import { SimpleNameComp } from "comps/comps/simpleNameComp"; import { TemporaryStateItemComp } from "comps/comps/temporaryStateComp"; diff --git a/client/packages/openblocks/src/comps/controls/actionSelector/executeQueryAction.tsx b/client/packages/openblocks/src/comps/controls/actionSelector/executeQueryAction.tsx index 59ad99dac..71a2123ac 100644 --- a/client/packages/openblocks/src/comps/controls/actionSelector/executeQueryAction.tsx +++ b/client/packages/openblocks/src/comps/controls/actionSelector/executeQueryAction.tsx @@ -1,4 +1,4 @@ -import { executeQueryAction, routeByNameAction } from "openblocks-core"; +import { executeQueryAction, routeByNameAction } from "lowcoder-core"; import { InputTypeEnum } from "comps/comps/moduleContainerComp/ioComp/inputListItemComp"; import { SimpleNameComp } from "comps/comps/simpleNameComp"; import { EditorContext, EditorState } from "comps/editorState"; diff --git a/client/packages/openblocks/src/comps/controls/actionSelector/triggerModuleEventAction.tsx b/client/packages/openblocks/src/comps/controls/actionSelector/triggerModuleEventAction.tsx index 185c2c04d..b4ac88bd3 100644 --- a/client/packages/openblocks/src/comps/controls/actionSelector/triggerModuleEventAction.tsx +++ b/client/packages/openblocks/src/comps/controls/actionSelector/triggerModuleEventAction.tsx @@ -1,4 +1,4 @@ -import { triggerModuleEventAction, routeByNameAction } from "openblocks-core"; +import { triggerModuleEventAction, routeByNameAction } from "lowcoder-core"; import { SimpleNameComp } from "comps/comps/simpleNameComp"; import { CompNameContext, EditorContext } from "comps/editorState"; import { MultiCompBuilder } from "comps/generators/multi"; diff --git a/client/packages/openblocks/src/comps/controls/boolControl.tsx b/client/packages/openblocks/src/comps/controls/boolControl.tsx index 53007910d..bd4967a4e 100644 --- a/client/packages/openblocks/src/comps/controls/boolControl.tsx +++ b/client/packages/openblocks/src/comps/controls/boolControl.tsx @@ -9,7 +9,7 @@ import { Node, SimpleComp, ValueAndMsg, -} from "openblocks-core"; +} from "lowcoder-core"; import { CheckBox, controlItem, Switch, SwitchJsIcon, SwitchWrapper } from "openblocks-design"; import { ReactNode } from "react"; import styled from "styled-components"; diff --git a/client/packages/openblocks/src/comps/controls/codeControl.test.tsx b/client/packages/openblocks/src/comps/controls/codeControl.test.tsx index 776b62d1c..2aa68b049 100644 --- a/client/packages/openblocks/src/comps/controls/codeControl.test.tsx +++ b/client/packages/openblocks/src/comps/controls/codeControl.test.tsx @@ -1,5 +1,5 @@ import { evalAndReduce } from "comps/utils"; -import { Comp } from "openblocks-core"; +import { Comp } from "lowcoder-core"; import { NumberControl, StringControl } from "./codeControl"; function serialize(comp: Comp) { diff --git a/client/packages/openblocks/src/comps/controls/codeControl.tsx b/client/packages/openblocks/src/comps/controls/codeControl.tsx index c6c61affb..10c90d461 100644 --- a/client/packages/openblocks/src/comps/controls/codeControl.tsx +++ b/client/packages/openblocks/src/comps/controls/codeControl.tsx @@ -24,7 +24,7 @@ import { transformWrapper, ValueAndMsg, withFunction, -} from "openblocks-core"; +} from "lowcoder-core"; import { ControlPropertyViewWrapper, isValidColor, diff --git a/client/packages/openblocks/src/comps/controls/codeStateControl.test.tsx b/client/packages/openblocks/src/comps/controls/codeStateControl.test.tsx index 57d6435da..029a1bd05 100644 --- a/client/packages/openblocks/src/comps/controls/codeStateControl.test.tsx +++ b/client/packages/openblocks/src/comps/controls/codeStateControl.test.tsx @@ -1,6 +1,6 @@ import { MultiCompBuilder } from "comps/generators"; import { evalAndReduce } from "comps/utils"; -import { fromValue } from "openblocks-core"; +import { fromValue } from "lowcoder-core"; import { NameConfig, withExposingConfigs } from "../generators/withExposing"; import { arrayStringStateControl, StringStateControl } from "./codeStateControl"; diff --git a/client/packages/openblocks/src/comps/controls/codeStateControl.tsx b/client/packages/openblocks/src/comps/controls/codeStateControl.tsx index da69523a1..b9100dc59 100644 --- a/client/packages/openblocks/src/comps/controls/codeStateControl.tsx +++ b/client/packages/openblocks/src/comps/controls/codeStateControl.tsx @@ -25,7 +25,7 @@ import { ConstructorToView, evalNodeOrMinor, updateNodesV2Action, -} from "openblocks-core"; +} from "lowcoder-core"; import { memo } from "util/cacheUtils"; import { toBoolean, diff --git a/client/packages/openblocks/src/comps/controls/codeTextControl.tsx b/client/packages/openblocks/src/comps/controls/codeTextControl.tsx index 0fb8f464b..254306316 100644 --- a/client/packages/openblocks/src/comps/controls/codeTextControl.tsx +++ b/client/packages/openblocks/src/comps/controls/codeTextControl.tsx @@ -1,5 +1,5 @@ import { CodeEditor } from "base/codeEditor/codeEditor"; -import { CompParams } from "openblocks-core"; +import { CompParams } from "lowcoder-core"; import { EditorContext } from "comps/editorState"; import { valueComp } from "comps/generators"; import { CompExposingContext } from "comps/generators/withContext"; diff --git a/client/packages/openblocks/src/comps/controls/contextCodeControl.tsx b/client/packages/openblocks/src/comps/controls/contextCodeControl.tsx index d84cddf78..4e223eb62 100644 --- a/client/packages/openblocks/src/comps/controls/contextCodeControl.tsx +++ b/client/packages/openblocks/src/comps/controls/contextCodeControl.tsx @@ -6,7 +6,7 @@ import { WrapContextFn, wrapChildAction, wrapContext, -} from "openblocks-core"; +} from "lowcoder-core"; import { ReactNode } from "react"; import { lastValueIfEqual } from "util/objectUtils"; import { CodeControlType, JSONValueControl } from "./codeControl"; diff --git a/client/packages/openblocks/src/comps/controls/controlParams.tsx b/client/packages/openblocks/src/comps/controls/controlParams.tsx index 70b9ffdf2..0ee9de8e6 100644 --- a/client/packages/openblocks/src/comps/controls/controlParams.tsx +++ b/client/packages/openblocks/src/comps/controls/controlParams.tsx @@ -1,5 +1,5 @@ import { CodeEditorControlParams } from "base/codeEditor/codeEditorTypes"; -import { Comp } from "openblocks-core"; +import { Comp } from "lowcoder-core"; // import { CodeEditorControlParams } from "../../base/codeEditor/codeEditorTypes"; import { CSSProperties, ReactNode } from "react"; diff --git a/client/packages/openblocks/src/comps/controls/dropdownControl.tsx b/client/packages/openblocks/src/comps/controls/dropdownControl.tsx index 6b4561c77..e8551e672 100644 --- a/client/packages/openblocks/src/comps/controls/dropdownControl.tsx +++ b/client/packages/openblocks/src/comps/controls/dropdownControl.tsx @@ -1,4 +1,4 @@ -import { SimpleAbstractComp } from "openblocks-core"; +import { SimpleAbstractComp } from "lowcoder-core"; import { AlignBottom, AlignCenter, diff --git a/client/packages/openblocks/src/comps/controls/dropdownInputSimpleControl.tsx b/client/packages/openblocks/src/comps/controls/dropdownInputSimpleControl.tsx index 806dbd740..e9f399a8f 100644 --- a/client/packages/openblocks/src/comps/controls/dropdownInputSimpleControl.tsx +++ b/client/packages/openblocks/src/comps/controls/dropdownInputSimpleControl.tsx @@ -1,5 +1,5 @@ import { MultiCompBuilder } from "comps/generators"; -import { CompAction, CompActionTypes } from "openblocks-core"; +import { CompAction, CompActionTypes } from "lowcoder-core"; import { OptionsType, ValueFromOption } from "openblocks-design"; import { ReactNode } from "react"; import { ControlPlacement } from "./controlParams"; diff --git a/client/packages/openblocks/src/comps/controls/eventHandlerControl.tsx b/client/packages/openblocks/src/comps/controls/eventHandlerControl.tsx index b202dcad7..43551ce1b 100644 --- a/client/packages/openblocks/src/comps/controls/eventHandlerControl.tsx +++ b/client/packages/openblocks/src/comps/controls/eventHandlerControl.tsx @@ -3,7 +3,7 @@ import { CustomListAction, list } from "comps/generators/list"; import { simpleMultiComp } from "comps/generators/multi"; import { trans } from "i18n"; import _ from "lodash"; -import { DispatchType } from "openblocks-core"; +import { DispatchType } from "lowcoder-core"; import { AddEventIcon, AddLine, diff --git a/client/packages/openblocks/src/comps/controls/iconControl.tsx b/client/packages/openblocks/src/comps/controls/iconControl.tsx index e5a9fdd44..7ffd0a3b2 100644 --- a/client/packages/openblocks/src/comps/controls/iconControl.tsx +++ b/client/packages/openblocks/src/comps/controls/iconControl.tsx @@ -11,7 +11,7 @@ import { DispatchType, Node, ValueAndMsg, -} from "openblocks-core"; +} from "lowcoder-core"; import { BlockGrayLabel, controlItem, diff --git a/client/packages/openblocks/src/comps/controls/multiSelectControl.tsx b/client/packages/openblocks/src/comps/controls/multiSelectControl.tsx index e131bc165..c996866cb 100644 --- a/client/packages/openblocks/src/comps/controls/multiSelectControl.tsx +++ b/client/packages/openblocks/src/comps/controls/multiSelectControl.tsx @@ -1,5 +1,5 @@ import { DropdownContainer, OptionsType, ValueFromOption } from "components/Dropdown"; -import { SimpleComp } from "openblocks-core"; +import { SimpleComp } from "lowcoder-core"; import { ControlParams, ControlPlacement } from "./controlParams"; import { ReactNode } from "react"; import { Tooltip, ToolTipLabel } from "components/toolTip"; diff --git a/client/packages/openblocks/src/comps/controls/numberSimpleControl.tsx b/client/packages/openblocks/src/comps/controls/numberSimpleControl.tsx index 673f13ae1..a2899b40a 100644 --- a/client/packages/openblocks/src/comps/controls/numberSimpleControl.tsx +++ b/client/packages/openblocks/src/comps/controls/numberSimpleControl.tsx @@ -1,5 +1,5 @@ import { InputNumber } from "antd"; -import { SimpleComp } from "openblocks-core"; +import { SimpleComp } from "lowcoder-core"; import { ControlPropertyViewWrapper } from "openblocks-design"; import React, { ReactNode } from "react"; import styled from "styled-components"; diff --git a/client/packages/openblocks/src/comps/controls/optionsControl.tsx b/client/packages/openblocks/src/comps/controls/optionsControl.tsx index 189dd462d..73e955dbc 100644 --- a/client/packages/openblocks/src/comps/controls/optionsControl.tsx +++ b/client/packages/openblocks/src/comps/controls/optionsControl.tsx @@ -19,7 +19,7 @@ import { fromRecord, MultiBaseComp, withFunction, -} from "openblocks-core"; +} from "lowcoder-core"; import { AutoArea, controlItem, Option } from "openblocks-design"; import styled from "styled-components"; import { lastValueIfEqual } from "util/objectUtils"; diff --git a/client/packages/openblocks/src/comps/controls/paramsControl.tsx b/client/packages/openblocks/src/comps/controls/paramsControl.tsx index 0c0bb4a93..653594f4b 100644 --- a/client/packages/openblocks/src/comps/controls/paramsControl.tsx +++ b/client/packages/openblocks/src/comps/controls/paramsControl.tsx @@ -8,7 +8,7 @@ import { Node, withFunction, wrapChildAction, -} from "openblocks-core"; +} from "lowcoder-core"; import { ReactNode } from "react"; import { lastValueIfEqual } from "util/objectUtils"; import { diff --git a/client/packages/openblocks/src/comps/controls/refControl.tsx b/client/packages/openblocks/src/comps/controls/refControl.tsx index e8e5c5ee2..8df07a212 100644 --- a/client/packages/openblocks/src/comps/controls/refControl.tsx +++ b/client/packages/openblocks/src/comps/controls/refControl.tsx @@ -1,6 +1,6 @@ import { ReactNode } from "react"; -import { CompAction } from "openblocks-core"; -import { AbstractComp, CompParams } from "openblocks-core"; +import { CompAction } from "lowcoder-core"; +import { AbstractComp, CompParams } from "lowcoder-core"; // empty object type EmptyDataType = {}; diff --git a/client/packages/openblocks/src/comps/controls/simpleStringControl.tsx b/client/packages/openblocks/src/comps/controls/simpleStringControl.tsx index e4371cd55..830fb6abc 100644 --- a/client/packages/openblocks/src/comps/controls/simpleStringControl.tsx +++ b/client/packages/openblocks/src/comps/controls/simpleStringControl.tsx @@ -1,5 +1,5 @@ import { Input } from "openblocks-design"; -import { SimpleComp } from "openblocks-core"; +import { SimpleComp } from "lowcoder-core"; import { ControlPropertyViewWrapper } from "openblocks-design"; import { ControlParams } from "./controlParams"; diff --git a/client/packages/openblocks/src/comps/controls/slotControl.tsx b/client/packages/openblocks/src/comps/controls/slotControl.tsx index b50fd1996..c677421db 100644 --- a/client/packages/openblocks/src/comps/controls/slotControl.tsx +++ b/client/packages/openblocks/src/comps/controls/slotControl.tsx @@ -10,7 +10,7 @@ import { BackgroundColorContext } from "comps/utils/backgroundColorContext"; import { CanvasContainerID } from "constants/domLocators"; import { Layers } from "constants/Layers"; import { trans } from "i18n"; -import { changeChildAction, ConstructorToView } from "openblocks-core"; +import { changeChildAction, ConstructorToView } from "lowcoder-core"; import { HintPlaceHolder, TacoButton } from "openblocks-design"; import { createContext, useContext } from "react"; import styled from "styled-components"; diff --git a/client/packages/openblocks/src/comps/controls/stringSimpleControl.tsx b/client/packages/openblocks/src/comps/controls/stringSimpleControl.tsx index bb9a9087b..86e71d415 100644 --- a/client/packages/openblocks/src/comps/controls/stringSimpleControl.tsx +++ b/client/packages/openblocks/src/comps/controls/stringSimpleControl.tsx @@ -1,4 +1,4 @@ -import { SimpleComp } from "openblocks-core"; +import { SimpleComp } from "lowcoder-core"; import { ControlPropertyViewWrapper, Input } from "openblocks-design"; import { ReactNode } from "react"; import { ControlParams } from "./controlParams"; diff --git a/client/packages/openblocks/src/comps/editorState.tsx b/client/packages/openblocks/src/comps/editorState.tsx index c77117f03..f69ffde52 100644 --- a/client/packages/openblocks/src/comps/editorState.tsx +++ b/client/packages/openblocks/src/comps/editorState.tsx @@ -5,7 +5,7 @@ import _ from "lodash"; import React, { ReactNode } from "react"; import { BottomResComp, BottomResListComp, BottomResTypeEnum } from "types/bottomRes"; import { setFields } from "util/objectUtils"; -import { OptionalComp, renameAction } from "openblocks-core"; +import { OptionalComp, renameAction } from "lowcoder-core"; import { GridItemComp } from "./comps/gridItemComp"; import { hookCompCategory, isHookComp } from "./hooks/hookCompTypes"; import { NameGenerator } from "./utils"; diff --git a/client/packages/openblocks/src/comps/generators/bottomResList.tsx b/client/packages/openblocks/src/comps/generators/bottomResList.tsx index ee8aceb54..da66f4b2d 100644 --- a/client/packages/openblocks/src/comps/generators/bottomResList.tsx +++ b/client/packages/openblocks/src/comps/generators/bottomResList.tsx @@ -2,7 +2,7 @@ import { message } from "antd"; import { EditorState } from "comps/editorState"; import { NameAndExposingInfo } from "comps/utils/exposingTypes"; import { trans } from "i18n"; -import { CompParams, MultiBaseComp, wrapActionExtraInfo } from "openblocks-core"; +import { CompParams, MultiBaseComp, wrapActionExtraInfo } from "lowcoder-core"; import { BottomResComp, BottomResListComp, BottomResTypeEnum } from "types/bottomRes"; import { undoKey } from "util/keyUtils"; import { list } from "./list"; diff --git a/client/packages/openblocks/src/comps/generators/changeDataType.test.tsx b/client/packages/openblocks/src/comps/generators/changeDataType.test.tsx index 7cb6e922b..dc934d0df 100644 --- a/client/packages/openblocks/src/comps/generators/changeDataType.test.tsx +++ b/client/packages/openblocks/src/comps/generators/changeDataType.test.tsx @@ -2,7 +2,7 @@ import { NumberControl, StringControl } from "comps/controls/codeControl"; import { changeDataType } from "./changeDataType"; import { MultiCompBuilder } from "./multi"; import { evalAndReduce } from "comps/utils"; -import { Comp } from "openblocks-core"; +import { Comp } from "lowcoder-core"; const childrenMap = { value: StringControl, diff --git a/client/packages/openblocks/src/comps/generators/changeDataType.tsx b/client/packages/openblocks/src/comps/generators/changeDataType.tsx index 172b8e64c..8cd5561c5 100644 --- a/client/packages/openblocks/src/comps/generators/changeDataType.tsx +++ b/client/packages/openblocks/src/comps/generators/changeDataType.tsx @@ -1,6 +1,6 @@ import { JSONValue } from "util/jsonTypes"; -import { Comp, CompParams, ConstructorToNodeType, ConstructorToView } from "openblocks-core"; -import { MultiBaseComp } from "openblocks-core"; +import { Comp, CompParams, ConstructorToNodeType, ConstructorToView } from "lowcoder-core"; +import { MultiBaseComp } from "lowcoder-core"; type GetDataType = T extends new (params: CompParams) => MultiBaseComp ? A diff --git a/client/packages/openblocks/src/comps/generators/controlCompBuilder.tsx b/client/packages/openblocks/src/comps/generators/controlCompBuilder.tsx index 9616cb1b6..de530ec25 100644 --- a/client/packages/openblocks/src/comps/generators/controlCompBuilder.tsx +++ b/client/packages/openblocks/src/comps/generators/controlCompBuilder.tsx @@ -1,4 +1,4 @@ -import { Comp, DispatchType } from "openblocks-core"; +import { Comp, DispatchType } from "lowcoder-core"; import { controlItem, ControlItemData, ControlNode } from "openblocks-design"; import { MultiCompBuilder } from "./multi"; diff --git a/client/packages/openblocks/src/comps/generators/list.test.tsx b/client/packages/openblocks/src/comps/generators/list.test.tsx index 85f3e7fc2..86069c5a7 100644 --- a/client/packages/openblocks/src/comps/generators/list.test.tsx +++ b/client/packages/openblocks/src/comps/generators/list.test.tsx @@ -1,6 +1,6 @@ import { arrayMove } from "comps/utils"; import { valueComp } from "."; -import { ConstructorToComp } from "openblocks-core"; +import { ConstructorToComp } from "lowcoder-core"; import { list } from "./list"; import { MultiCompBuilder } from "./multi"; diff --git a/client/packages/openblocks/src/comps/generators/list.tsx b/client/packages/openblocks/src/comps/generators/list.tsx index 159ba785d..22019d8cd 100644 --- a/client/packages/openblocks/src/comps/generators/list.tsx +++ b/client/packages/openblocks/src/comps/generators/list.tsx @@ -14,7 +14,7 @@ import { Node, withFunction, wrapDispatch, -} from "openblocks-core"; +} from "lowcoder-core"; import { ReactNode } from "react"; import { JSONValue } from "util/jsonTypes"; import { lastValueIfEqual, setFieldsNoTypeCheck } from "util/objectUtils"; diff --git a/client/packages/openblocks/src/comps/generators/map.tsx b/client/packages/openblocks/src/comps/generators/map.tsx index e577cfc27..864d4137e 100644 --- a/client/packages/openblocks/src/comps/generators/map.tsx +++ b/client/packages/openblocks/src/comps/generators/map.tsx @@ -13,7 +13,7 @@ import { Node, NodeToValue, wrapDispatch, -} from "openblocks-core"; +} from "lowcoder-core"; import { ReactNode } from "react"; import { memo } from "util/cacheUtils"; diff --git a/client/packages/openblocks/src/comps/generators/multi.test.tsx b/client/packages/openblocks/src/comps/generators/multi.test.tsx index e6fac895f..df3c2b187 100644 --- a/client/packages/openblocks/src/comps/generators/multi.test.tsx +++ b/client/packages/openblocks/src/comps/generators/multi.test.tsx @@ -4,13 +4,13 @@ import { multiChangeAction, updateNodesV2Action, wrapChildAction, -} from "openblocks-core"; +} from "lowcoder-core"; import { valueComp, withDefault } from "."; -import { Comp } from "openblocks-core"; +import { Comp } from "lowcoder-core"; import { MultiCompBuilder } from "./multi"; import { StringControl } from "comps/controls/codeControl"; import { evalAndReduce } from "comps/utils"; -import { fromRecord, fromValue } from "openblocks-core"; +import { fromRecord, fromValue } from "lowcoder-core"; import { BoolControl } from "comps/controls/boolControl"; const emptyViewFunc = (props: Record) => { diff --git a/client/packages/openblocks/src/comps/generators/multi.tsx b/client/packages/openblocks/src/comps/generators/multi.tsx index e8ecba936..02a2e49b3 100644 --- a/client/packages/openblocks/src/comps/generators/multi.tsx +++ b/client/packages/openblocks/src/comps/generators/multi.tsx @@ -1,9 +1,9 @@ import { JSONObject } from "util/jsonTypes"; -import { NodeToValue, RecordNode } from "openblocks-core"; +import { NodeToValue, RecordNode } from "lowcoder-core"; import _ from "lodash"; import React, { ReactNode } from "react"; -import { CompAction } from "openblocks-core"; -import { Comp, CompParams, MultiBaseComp, wrapDispatch } from "openblocks-core"; +import { CompAction } from "lowcoder-core"; +import { Comp, CompParams, MultiBaseComp, wrapDispatch } from "lowcoder-core"; type ViewFnType = ( childrenType: ChildrenType, diff --git a/client/packages/openblocks/src/comps/generators/sameTypeMap.tsx b/client/packages/openblocks/src/comps/generators/sameTypeMap.tsx index c6fa17463..bca784e29 100644 --- a/client/packages/openblocks/src/comps/generators/sameTypeMap.tsx +++ b/client/packages/openblocks/src/comps/generators/sameTypeMap.tsx @@ -1,9 +1,9 @@ import { JSONValue } from "util/jsonTypes"; -import { Comp, ConstructorToComp, ConstructorToDataType } from "openblocks-core"; +import { Comp, ConstructorToComp, ConstructorToDataType } from "lowcoder-core"; import { ToType } from "comps/utils"; import React from "react"; -import { CompAction, CompActionTypes, customAction, CustomAction } from "openblocks-core"; -import { CompConstructor, CompParams, MultiBaseComp, wrapDispatch } from "openblocks-core"; +import { CompAction, CompActionTypes, customAction, CustomAction } from "lowcoder-core"; +import { CompConstructor, CompParams, MultiBaseComp, wrapDispatch } from "lowcoder-core"; import _ from "lodash"; type MapAction = diff --git a/client/packages/openblocks/src/comps/generators/simpleGenerators.tsx b/client/packages/openblocks/src/comps/generators/simpleGenerators.tsx index 8f379da39..c1b8d12b6 100644 --- a/client/packages/openblocks/src/comps/generators/simpleGenerators.tsx +++ b/client/packages/openblocks/src/comps/generators/simpleGenerators.tsx @@ -9,7 +9,7 @@ import { CompParams, ConstructorToDataType, SimpleComp, -} from "openblocks-core"; +} from "lowcoder-core"; import { ControlPropertyViewWrapper } from "openblocks-design"; import { ReactNode } from "react"; import { JSONValue } from "util/jsonTypes"; diff --git a/client/packages/openblocks/src/comps/generators/uiCompBuilder.tsx b/client/packages/openblocks/src/comps/generators/uiCompBuilder.tsx index 918685e3e..887bb665a 100644 --- a/client/packages/openblocks/src/comps/generators/uiCompBuilder.tsx +++ b/client/packages/openblocks/src/comps/generators/uiCompBuilder.tsx @@ -1,7 +1,7 @@ import { BoolCodeControl } from "comps/controls/codeControl"; import React, { ReactNode, useContext } from "react"; import { ExternalEditorContext } from "util/context/ExternalEditorContext"; -import { Comp, CompParams, MultiBaseComp } from "openblocks-core"; +import { Comp, CompParams, MultiBaseComp } from "lowcoder-core"; import { childrenToProps, parseChildrenFromValueAndChildrenMap, diff --git a/client/packages/openblocks/src/comps/generators/withContext.tsx b/client/packages/openblocks/src/comps/generators/withContext.tsx index f388a5a84..c6f5e58ee 100644 --- a/client/packages/openblocks/src/comps/generators/withContext.tsx +++ b/client/packages/openblocks/src/comps/generators/withContext.tsx @@ -9,8 +9,8 @@ import { updateNodesV2Action, wrapContext, WrapContextFn, -} from "openblocks-core"; -import { ConstructorToNodeType, ConstructorToView, MultiCompConstructor } from "openblocks-core"; +} from "lowcoder-core"; +import { ConstructorToNodeType, ConstructorToView, MultiCompConstructor } from "lowcoder-core"; import React from "react"; import { lastValueIfEqual, setFieldsNoTypeCheck, shallowEqual } from "util/objectUtils"; import _ from "lodash"; diff --git a/client/packages/openblocks/src/comps/generators/withDispatchHook.tsx b/client/packages/openblocks/src/comps/generators/withDispatchHook.tsx index 808b00b83..78b4fe60a 100644 --- a/client/packages/openblocks/src/comps/generators/withDispatchHook.tsx +++ b/client/packages/openblocks/src/comps/generators/withDispatchHook.tsx @@ -1,4 +1,4 @@ -import { CompConstructor, CompParams, DispatchType } from "openblocks-core"; +import { CompConstructor, CompParams, DispatchType } from "lowcoder-core"; /** * Hijack the dispatch method. diff --git a/client/packages/openblocks/src/comps/generators/withErrorBoundary.tsx b/client/packages/openblocks/src/comps/generators/withErrorBoundary.tsx index fe222a507..5062efa34 100644 --- a/client/packages/openblocks/src/comps/generators/withErrorBoundary.tsx +++ b/client/packages/openblocks/src/comps/generators/withErrorBoundary.tsx @@ -1,5 +1,5 @@ import { trans } from "i18n"; -import { CompConstructor } from "openblocks-core"; +import { CompConstructor } from "lowcoder-core"; import React, { ErrorInfo } from "react"; import styled from "styled-components"; diff --git a/client/packages/openblocks/src/comps/generators/withExposing.test.tsx b/client/packages/openblocks/src/comps/generators/withExposing.test.tsx index d7316ff3f..c69787a74 100644 --- a/client/packages/openblocks/src/comps/generators/withExposing.test.tsx +++ b/client/packages/openblocks/src/comps/generators/withExposing.test.tsx @@ -3,7 +3,7 @@ import { BoolControl } from "comps/controls/boolControl"; import { StringControl } from "comps/controls/codeControl"; import { numberExposingStateControl } from "comps/controls/codeStateControl"; import { evalAndReduce } from "comps/utils"; -import { customAction, Node, RecordNode } from "openblocks-core"; +import { customAction, Node, RecordNode } from "lowcoder-core"; import { shallowEqual } from "util/objectUtils"; import { MultiCompBuilder, valueComp } from "."; import { depsConfig, NameConfig, withExposingConfigs } from "./withExposing"; diff --git a/client/packages/openblocks/src/comps/generators/withExposing.tsx b/client/packages/openblocks/src/comps/generators/withExposing.tsx index 13a3864f4..4585d12fc 100644 --- a/client/packages/openblocks/src/comps/generators/withExposing.tsx +++ b/client/packages/openblocks/src/comps/generators/withExposing.tsx @@ -4,14 +4,14 @@ import { mergeExtra, MultiCompConstructor, RecordNodeToValue, -} from "openblocks-core"; +} from "lowcoder-core"; import { ExposingInfo, MethodInfo } from "comps/utils/exposingTypes"; -import { fromRecord, fromValue, Node, withFunction } from "openblocks-core"; +import { fromRecord, fromValue, Node, withFunction } from "lowcoder-core"; import { lastValueIfEqual, shallowEqual } from "util/objectUtils"; import { ExecuteAction, MethodConfig } from "comps/controls/actionSelector/executeCompTypes"; import { ReactNode } from "react"; import { isExposingMethodComp } from "comps/generators/withMethodExposing"; -import { CompAction, customAction, isMyCustomAction, ExtraNodeType } from "openblocks-core"; +import { CompAction, customAction, isMyCustomAction, ExtraNodeType } from "lowcoder-core"; import { getPromiseAfterDispatch } from "util/promiseUtils"; import { trans } from "i18n"; import log from "loglevel"; diff --git a/client/packages/openblocks/src/comps/generators/withIsLoading.test.ts b/client/packages/openblocks/src/comps/generators/withIsLoading.test.ts index 946d51c7b..741ac96a4 100644 --- a/client/packages/openblocks/src/comps/generators/withIsLoading.test.ts +++ b/client/packages/openblocks/src/comps/generators/withIsLoading.test.ts @@ -1,5 +1,5 @@ import { evalAndReduce } from "comps/utils"; -import { customAction, fromRecord, fromValue, RecordNode, SimpleNode } from "openblocks-core"; +import { customAction, fromRecord, fromValue, RecordNode, SimpleNode } from "lowcoder-core"; import { ExecuteAction } from "comps/controls/actionSelector/executeCompTypes"; import { ButtonComp } from "comps/comps/buttonComp/buttonComp"; import { withIsLoading } from "comps/generators/withIsLoading"; diff --git a/client/packages/openblocks/src/comps/generators/withIsLoading.tsx b/client/packages/openblocks/src/comps/generators/withIsLoading.tsx index f8968e17c..5331d251b 100644 --- a/client/packages/openblocks/src/comps/generators/withIsLoading.tsx +++ b/client/packages/openblocks/src/comps/generators/withIsLoading.tsx @@ -7,7 +7,7 @@ import { MultiCompConstructor, CompAction, CompActionTypes, -} from "openblocks-core"; +} from "lowcoder-core"; import styled from "styled-components"; import { codeControl } from "comps/controls/codeControl"; import { setFieldsNoTypeCheck } from "util/objectUtils"; diff --git a/client/packages/openblocks/src/comps/generators/withMethodExposing.test.tsx b/client/packages/openblocks/src/comps/generators/withMethodExposing.test.tsx index 36d4f8f00..e98bcc99f 100644 --- a/client/packages/openblocks/src/comps/generators/withMethodExposing.test.tsx +++ b/client/packages/openblocks/src/comps/generators/withMethodExposing.test.tsx @@ -1,4 +1,4 @@ -import { customAction } from "openblocks-core"; +import { customAction } from "lowcoder-core"; import { NumberControl } from "comps/controls/codeControl"; import { evalAndReduce } from "comps/utils"; import { MultiCompBuilder, withDefault } from "."; diff --git a/client/packages/openblocks/src/comps/generators/withMethodExposing.tsx b/client/packages/openblocks/src/comps/generators/withMethodExposing.tsx index 212f65d61..93fd85d6d 100644 --- a/client/packages/openblocks/src/comps/generators/withMethodExposing.tsx +++ b/client/packages/openblocks/src/comps/generators/withMethodExposing.tsx @@ -1,5 +1,5 @@ -import { CompAction, CustomAction, isMyCustomAction } from "openblocks-core"; -import { AbstractComp, Comp, ConstructorToComp, MultiBaseComp } from "openblocks-core"; +import { CompAction, CustomAction, isMyCustomAction } from "lowcoder-core"; +import { AbstractComp, Comp, ConstructorToComp, MultiBaseComp } from "lowcoder-core"; import { EvalParamType, ExecuteAction, diff --git a/client/packages/openblocks/src/comps/generators/withMultiContext.test.tsx b/client/packages/openblocks/src/comps/generators/withMultiContext.test.tsx index 25d21ad87..2418c9e0e 100644 --- a/client/packages/openblocks/src/comps/generators/withMultiContext.test.tsx +++ b/client/packages/openblocks/src/comps/generators/withMultiContext.test.tsx @@ -1,6 +1,6 @@ import { NumberControl, StringControl } from "comps/controls/codeControl"; import { evalAndReduce } from "comps/utils"; -import { wrapDispatch } from "openblocks-core"; +import { wrapDispatch } from "lowcoder-core"; import { MultiCompBuilder } from "./multi"; import { MAP_KEY, withMultiContext } from "./withMultiContext"; diff --git a/client/packages/openblocks/src/comps/generators/withMultiContext.tsx b/client/packages/openblocks/src/comps/generators/withMultiContext.tsx index 83485c574..84435f9d7 100644 --- a/client/packages/openblocks/src/comps/generators/withMultiContext.tsx +++ b/client/packages/openblocks/src/comps/generators/withMultiContext.tsx @@ -17,7 +17,7 @@ import { unwrapChildAction, wrapChildAction, wrapDispatch, -} from "openblocks-core"; +} from "lowcoder-core"; import { ReactNode } from "react"; import { JSONValue } from "util/jsonTypes"; import { setFieldsNoTypeCheck } from "util/objectUtils"; diff --git a/client/packages/openblocks/src/comps/generators/withParams.tsx b/client/packages/openblocks/src/comps/generators/withParams.tsx index 0054d6e72..a29f63cb3 100644 --- a/client/packages/openblocks/src/comps/generators/withParams.tsx +++ b/client/packages/openblocks/src/comps/generators/withParams.tsx @@ -22,7 +22,7 @@ import { WrapContextFn, WrapContextNodeV2, wrapDispatch, -} from "openblocks-core"; +} from "lowcoder-core"; import { ReactNode } from "react"; import { JSONValue } from "util/jsonTypes"; import { depthEqual, lastValueIfEqual, setFieldsNoTypeCheck } from "util/objectUtils"; diff --git a/client/packages/openblocks/src/comps/generators/withParamsForMap.test.tsx b/client/packages/openblocks/src/comps/generators/withParamsForMap.test.tsx index 809d905fe..09e975413 100644 --- a/client/packages/openblocks/src/comps/generators/withParamsForMap.test.tsx +++ b/client/packages/openblocks/src/comps/generators/withParamsForMap.test.tsx @@ -1,7 +1,7 @@ import { NumberControl, StringControl } from "comps/controls/codeControl"; import { evalAndReduce } from "comps/utils"; import _ from "lodash"; -import { updateNodesV2Action } from "openblocks-core"; +import { updateNodesV2Action } from "lowcoder-core"; import { getObjectId } from "util/objectUtils"; import { cost } from "util/perfUtils"; import { MultiCompBuilder } from "./multi"; diff --git a/client/packages/openblocks/src/comps/generators/withParamsForMap.tsx b/client/packages/openblocks/src/comps/generators/withParamsForMap.tsx index 31749cbcc..6925dd6b9 100644 --- a/client/packages/openblocks/src/comps/generators/withParamsForMap.tsx +++ b/client/packages/openblocks/src/comps/generators/withParamsForMap.tsx @@ -14,7 +14,7 @@ import { NodeToValue, RecordConstructorToComp, wrapDispatch, -} from "openblocks-core"; +} from "lowcoder-core"; import { ReactNode } from "react"; import { JSONValue } from "util/jsonTypes"; import { map } from "./map"; diff --git a/client/packages/openblocks/src/comps/generators/withSelectedMultiContext.tsx b/client/packages/openblocks/src/comps/generators/withSelectedMultiContext.tsx index 8aed42ec5..51bfa1d79 100644 --- a/client/packages/openblocks/src/comps/generators/withSelectedMultiContext.tsx +++ b/client/packages/openblocks/src/comps/generators/withSelectedMultiContext.tsx @@ -6,7 +6,7 @@ import { MultiCompConstructor, wrapChildAction, wrapDispatch, -} from "openblocks-core"; +} from "lowcoder-core"; import { ReactNode } from "react"; import { lastValueIfEqual, setFieldsNoTypeCheck } from "util/objectUtils"; import { COMP_KEY, MAP_KEY, withMultiContext } from "./withMultiContext"; diff --git a/client/packages/openblocks/src/comps/generators/withType.tsx b/client/packages/openblocks/src/comps/generators/withType.tsx index 09a54374a..bf72fcc9a 100644 --- a/client/packages/openblocks/src/comps/generators/withType.tsx +++ b/client/packages/openblocks/src/comps/generators/withType.tsx @@ -7,7 +7,7 @@ import { ConstructorToView, MultiBaseComp, wrapDispatch, -} from "openblocks-core"; +} from "lowcoder-core"; import { parseChildrenFromValueAndChildrenMap, ToConstructor, diff --git a/client/packages/openblocks/src/comps/hooks/drawerComp.tsx b/client/packages/openblocks/src/comps/hooks/drawerComp.tsx index e9aa0d640..0a87ea8be 100644 --- a/client/packages/openblocks/src/comps/hooks/drawerComp.tsx +++ b/client/packages/openblocks/src/comps/hooks/drawerComp.tsx @@ -16,7 +16,7 @@ import { BackgroundColorContext } from "comps/utils/backgroundColorContext"; import { CanvasContainerID } from "constants/domLocators"; import { Layers } from "constants/Layers"; import { trans } from "i18n"; -import { changeChildAction } from "openblocks-core"; +import { changeChildAction } from "lowcoder-core"; import { Drawer, HintPlaceHolder, Section, sectionNames } from "openblocks-design"; import { useCallback } from "react"; import { ResizeHandle } from "react-resizable"; diff --git a/client/packages/openblocks/src/comps/hooks/hookComp.tsx b/client/packages/openblocks/src/comps/hooks/hookComp.tsx index ec6a6bfd3..3cd4f20a8 100644 --- a/client/packages/openblocks/src/comps/hooks/hookComp.tsx +++ b/client/packages/openblocks/src/comps/hooks/hookComp.tsx @@ -18,7 +18,7 @@ import { ModalComp } from "comps/hooks/modalComp"; import { trans } from "i18n"; import _ from "lodash"; import moment from "moment"; -import { ConstructorToComp } from "openblocks-core"; +import { ConstructorToComp } from "lowcoder-core"; import { Section, sectionNames } from "openblocks-design"; import React, { useContext, useEffect, useMemo } from "react"; import { useInterval, useTitle, useWindowSize } from "react-use"; diff --git a/client/packages/openblocks/src/comps/hooks/hookListComp.tsx b/client/packages/openblocks/src/comps/hooks/hookListComp.tsx index f1a73a837..4cccc728c 100644 --- a/client/packages/openblocks/src/comps/hooks/hookListComp.tsx +++ b/client/packages/openblocks/src/comps/hooks/hookListComp.tsx @@ -9,7 +9,7 @@ import { } from "comps/comps/containerBase/utils"; import { HookComp } from "./hookComp"; import { hookCompCategory } from "./hookCompTypes"; -import { CompParams } from "openblocks-core"; +import { CompParams } from "lowcoder-core"; const defaultHookListValue = [ // { compType: "title", name: "title" }, diff --git a/client/packages/openblocks/src/comps/hooks/modalComp.tsx b/client/packages/openblocks/src/comps/hooks/modalComp.tsx index 43859888f..f5e7ad299 100644 --- a/client/packages/openblocks/src/comps/hooks/modalComp.tsx +++ b/client/packages/openblocks/src/comps/hooks/modalComp.tsx @@ -12,7 +12,7 @@ import { CanvasContainerID } from "constants/domLocators"; import { Layers } from "constants/Layers"; import { HintPlaceHolder, Modal, Section, sectionNames } from "openblocks-design"; import { trans } from "i18n"; -import { changeChildAction } from "openblocks-core"; +import { changeChildAction } from "lowcoder-core"; import { CSSProperties, useCallback } from "react"; import { ResizeHandle } from "react-resizable"; import styled, { css } from "styled-components"; diff --git a/client/packages/openblocks/src/comps/queries/esQuery.tsx b/client/packages/openblocks/src/comps/queries/esQuery.tsx index 1cde1f57f..2c06d6928 100644 --- a/client/packages/openblocks/src/comps/queries/esQuery.tsx +++ b/client/packages/openblocks/src/comps/queries/esQuery.tsx @@ -7,7 +7,7 @@ import { DispatchType, MultiBaseComp, multiChangeAction, -} from "openblocks-core"; +} from "lowcoder-core"; import { Dropdown, EllipsisTextCss, diff --git a/client/packages/openblocks/src/comps/queries/googleSheetsQuery.tsx b/client/packages/openblocks/src/comps/queries/googleSheetsQuery.tsx index 86e287f46..a4efe8a7f 100644 --- a/client/packages/openblocks/src/comps/queries/googleSheetsQuery.tsx +++ b/client/packages/openblocks/src/comps/queries/googleSheetsQuery.tsx @@ -1,7 +1,7 @@ import { withTypeAndChildrenAbstract } from "comps/generators/withType"; import { trans } from "i18n"; import _, { includes } from "lodash"; -import { CompAction } from "openblocks-core"; +import { CompAction } from "lowcoder-core"; import { Dropdown, QueryConfigWrapper, diff --git a/client/packages/openblocks/src/comps/queries/httpQuery/httpQuery.tsx b/client/packages/openblocks/src/comps/queries/httpQuery/httpQuery.tsx index 2d4296de6..b4c05231f 100644 --- a/client/packages/openblocks/src/comps/queries/httpQuery/httpQuery.tsx +++ b/client/packages/openblocks/src/comps/queries/httpQuery/httpQuery.tsx @@ -3,7 +3,7 @@ import { QueryConfigItemWrapper, QueryConfigLabel, QueryConfigWrapper } from "co import { valueComp, withDefault } from "comps/generators"; import { trans } from "i18n"; import { includes } from "lodash"; -import { CompAction, MultiBaseComp } from "openblocks-core"; +import { CompAction, MultiBaseComp } from "lowcoder-core"; import { keyValueListControl } from "../../controls/keyValueControl"; import { ParamsJsonControl, ParamsStringControl } from "../../controls/paramsControl"; import { withTypeAndChildrenAbstract } from "../../generators/withType"; diff --git a/client/packages/openblocks/src/comps/queries/libraryQuery.tsx b/client/packages/openblocks/src/comps/queries/libraryQuery.tsx index 518eff39b..b9184b134 100644 --- a/client/packages/openblocks/src/comps/queries/libraryQuery.tsx +++ b/client/packages/openblocks/src/comps/queries/libraryQuery.tsx @@ -10,7 +10,7 @@ import { isMyCustomAction, MultiBaseComp, wrapChildAction, -} from "openblocks-core"; +} from "lowcoder-core"; import { Dropdown, QueryConfigLabel, diff --git a/client/packages/openblocks/src/comps/queries/mongoQuery.tsx b/client/packages/openblocks/src/comps/queries/mongoQuery.tsx index b1d292d37..d23a00680 100644 --- a/client/packages/openblocks/src/comps/queries/mongoQuery.tsx +++ b/client/packages/openblocks/src/comps/queries/mongoQuery.tsx @@ -1,6 +1,6 @@ import { withPropertyViewFn, withTypeAndChildren } from "comps/generators"; import { includes } from "lodash"; -import { CompAction, CompConstructor } from "openblocks-core"; +import { CompAction, CompConstructor } from "lowcoder-core"; import { Dropdown, ValueFromOption } from "openblocks-design"; import { dropdownControl } from "../controls/dropdownControl"; import { diff --git a/client/packages/openblocks/src/comps/queries/openBlocksQuery.tsx b/client/packages/openblocks/src/comps/queries/openBlocksQuery.tsx index ec1c7fc15..f0ae97fd1 100644 --- a/client/packages/openblocks/src/comps/queries/openBlocksQuery.tsx +++ b/client/packages/openblocks/src/comps/queries/openBlocksQuery.tsx @@ -1,6 +1,6 @@ import { withTypeAndChildrenAbstract } from "comps/generators/withType"; import { trans } from "i18n"; -import { CompConstructor } from "openblocks-core"; +import { CompConstructor } from "lowcoder-core"; import { Dropdown, ValueFromOption } from "openblocks-design"; import { buildQueryCommand, FunctionProperty, toQueryView } from "./queryCompUtils"; diff --git a/client/packages/openblocks/src/comps/queries/pluginQuery/pluginQuery.tsx b/client/packages/openblocks/src/comps/queries/pluginQuery/pluginQuery.tsx index 371f896ae..e89f86b79 100644 --- a/client/packages/openblocks/src/comps/queries/pluginQuery/pluginQuery.tsx +++ b/client/packages/openblocks/src/comps/queries/pluginQuery/pluginQuery.tsx @@ -25,7 +25,7 @@ import { } from "openblocks-design"; import React, { ReactNode, useEffect, useState } from "react"; import { FunctionProperty, toQueryView } from "../queryCompUtils"; -import { CompConstructor } from "openblocks-core"; +import { CompConstructor } from "lowcoder-core"; import { dropdownControl } from "comps/controls/dropdownControl"; import { ControlParams, ControlType } from "comps/controls/controlParams"; import MarkdownTooltip from "openblocks-design/src/components/MarkdownTooltip"; diff --git a/client/packages/openblocks/src/comps/queries/queryComp.test.tsx b/client/packages/openblocks/src/comps/queries/queryComp.test.tsx index f9dd6cdff..970287237 100644 --- a/client/packages/openblocks/src/comps/queries/queryComp.test.tsx +++ b/client/packages/openblocks/src/comps/queries/queryComp.test.tsx @@ -1,5 +1,5 @@ import { QueryComp } from "./queryComp"; -import { CompParams } from "openblocks-core"; +import { CompParams } from "lowcoder-core"; // shallow copy all values and methods test("object create", () => { diff --git a/client/packages/openblocks/src/comps/queries/queryComp.tsx b/client/packages/openblocks/src/comps/queries/queryComp.tsx index c157371eb..02fe3380f 100644 --- a/client/packages/openblocks/src/comps/queries/queryComp.tsx +++ b/client/packages/openblocks/src/comps/queries/queryComp.tsx @@ -42,7 +42,7 @@ import { MultiBaseComp, multiChangeAction, wrapActionExtraInfo, -} from "openblocks-core"; +} from "lowcoder-core"; import { ValueFromOption } from "openblocks-design"; import { ReactNode, useEffect } from "react"; import { diff --git a/client/packages/openblocks/src/comps/queries/queryComp/queryNotificationControl.tsx b/client/packages/openblocks/src/comps/queries/queryComp/queryNotificationControl.tsx index a7fe3eded..d8fd3bb2b 100644 --- a/client/packages/openblocks/src/comps/queries/queryComp/queryNotificationControl.tsx +++ b/client/packages/openblocks/src/comps/queries/queryComp/queryNotificationControl.tsx @@ -17,7 +17,7 @@ import { BoolCodeControl, StringControl } from "../../controls/codeControl"; import { BoolPureControl } from "../../controls/boolControl"; import { millisecondsControl } from "../../controls/millisecondControl"; import { trans } from "i18n"; -import { CompAction, customAction, isMyCustomAction } from "openblocks-core"; +import { CompAction, customAction, isMyCustomAction } from "lowcoder-core"; const SuccessMessageAction = new MultiCompBuilder( { diff --git a/client/packages/openblocks/src/comps/queries/queryComp/queryPropertyView.tsx b/client/packages/openblocks/src/comps/queries/queryComp/queryPropertyView.tsx index ef2b8848e..fdb1467b1 100644 --- a/client/packages/openblocks/src/comps/queries/queryComp/queryPropertyView.tsx +++ b/client/packages/openblocks/src/comps/queries/queryComp/queryPropertyView.tsx @@ -10,7 +10,7 @@ import { import { PageType } from "constants/pageConstants"; import { trans } from "i18n"; import { includes, mapValues } from "lodash"; -import { deferAction, executeQueryAction, wrapActionExtraInfo } from "openblocks-core"; +import { deferAction, executeQueryAction, wrapActionExtraInfo } from "lowcoder-core"; import { CustomModal, Dropdown, diff --git a/client/packages/openblocks/src/comps/queries/queryCompUtils.tsx b/client/packages/openblocks/src/comps/queries/queryCompUtils.tsx index d4cabd3c6..4197c6140 100644 --- a/client/packages/openblocks/src/comps/queries/queryCompUtils.tsx +++ b/client/packages/openblocks/src/comps/queries/queryCompUtils.tsx @@ -1,7 +1,7 @@ import _, { isObject } from "lodash"; import { QueryApi, QueryExecuteRequest } from "../../api/queryApi"; import { QueryResult, TriggerType } from "./queryComp"; -import { Comp } from "openblocks-core"; +import { Comp } from "lowcoder-core"; import { MultiCompBuilder, ToConstructor } from "../generators/multi"; import { Fragment } from "react"; import { ParamsControlType, ValueFunction } from "../controls/paramsControl"; diff --git a/client/packages/openblocks/src/comps/queries/redisQuery.tsx b/client/packages/openblocks/src/comps/queries/redisQuery.tsx index 0ed53b13e..79bd96c38 100644 --- a/client/packages/openblocks/src/comps/queries/redisQuery.tsx +++ b/client/packages/openblocks/src/comps/queries/redisQuery.tsx @@ -1,7 +1,7 @@ import { withTypeAndChildrenAbstract } from "comps/generators/withType"; import { trans } from "i18n"; import { includes } from "lodash"; -import { CompAction, CompConstructor } from "openblocks-core"; +import { CompAction, CompConstructor } from "lowcoder-core"; import { Dropdown, QueryConfigWrapper, diff --git a/client/packages/openblocks/src/comps/queries/smtpQuery.tsx b/client/packages/openblocks/src/comps/queries/smtpQuery.tsx index c554b380e..5092ae77e 100644 --- a/client/packages/openblocks/src/comps/queries/smtpQuery.tsx +++ b/client/packages/openblocks/src/comps/queries/smtpQuery.tsx @@ -6,7 +6,7 @@ import { } from "../controls/paramsControl"; import { withTypeAndChildrenAbstract } from "../generators/withType"; import { withPropertyViewFn } from "../generators"; -import { DispatchType, MultiBaseComp } from "openblocks-core"; +import { DispatchType, MultiBaseComp } from "lowcoder-core"; import { isObject } from "lodash"; import { FunctionProperty, toQueryView } from "./queryCompUtils"; import { Property } from "../../types/entities/common"; diff --git a/client/packages/openblocks/src/comps/queries/sqlQuery/SQLQuery.tsx b/client/packages/openblocks/src/comps/queries/sqlQuery/SQLQuery.tsx index ebfe4e3d6..309b1c087 100644 --- a/client/packages/openblocks/src/comps/queries/sqlQuery/SQLQuery.tsx +++ b/client/packages/openblocks/src/comps/queries/sqlQuery/SQLQuery.tsx @@ -6,7 +6,7 @@ import { } from "../../controls/paramsControl"; import { toQueryView } from "../queryCompUtils"; import { withTypeAndChildrenAbstract } from "../../generators/withType"; -import { CompAction } from "openblocks-core"; +import { CompAction } from "lowcoder-core"; import { Dropdown, QueryConfigItemWrapper, diff --git a/client/packages/openblocks/src/comps/queries/sqlQuery/columnNameDropdown.tsx b/client/packages/openblocks/src/comps/queries/sqlQuery/columnNameDropdown.tsx index a3f9fbe6f..8dd5e2021 100644 --- a/client/packages/openblocks/src/comps/queries/sqlQuery/columnNameDropdown.tsx +++ b/client/packages/openblocks/src/comps/queries/sqlQuery/columnNameDropdown.tsx @@ -1,11 +1,11 @@ -import { DispatchType } from "openblocks-core"; +import { DispatchType } from "lowcoder-core"; import { ControlPlacement } from "../../controls/controlParams"; import React, { useContext } from "react"; import { Dropdown, OptionsType } from "openblocks-design"; import { isEmpty, values } from "lodash"; import { useSelector } from "react-redux"; import { getDataSourceStructures } from "../../../redux/selectors/datasourceSelectors"; -import { changeValueAction } from "openblocks-core"; +import { changeValueAction } from "lowcoder-core"; import { QueryContext } from "../../../util/context/QueryContext"; export const ColumnNameDropdown = (props: { diff --git a/client/packages/openblocks/src/comps/queries/sqlQuery/tableNameComp.tsx b/client/packages/openblocks/src/comps/queries/sqlQuery/tableNameComp.tsx index a68bb7fcd..cf139b1a9 100644 --- a/client/packages/openblocks/src/comps/queries/sqlQuery/tableNameComp.tsx +++ b/client/packages/openblocks/src/comps/queries/sqlQuery/tableNameComp.tsx @@ -1,6 +1,6 @@ import { trans } from "i18n"; import { isEmpty } from "lodash"; -import { changeValueAction, DispatchType } from "openblocks-core"; +import { changeValueAction, DispatchType } from "lowcoder-core"; import { Dropdown, OptionsType } from "openblocks-design"; import { useContext } from "react"; import { useSelector } from "react-redux"; diff --git a/client/packages/openblocks/src/comps/utils/exposingTypes.test.tsx b/client/packages/openblocks/src/comps/utils/exposingTypes.test.tsx index ea54f7606..b4fa00a6f 100644 --- a/client/packages/openblocks/src/comps/utils/exposingTypes.test.tsx +++ b/client/packages/openblocks/src/comps/utils/exposingTypes.test.tsx @@ -1,4 +1,4 @@ -import { fromUnevaledValue } from "openblocks-core"; +import { fromUnevaledValue } from "lowcoder-core"; import { exposingDataForAutoComplete, NameAndExposingInfo } from "./exposingTypes"; describe("exposingDataForAutoComplete", () => { diff --git a/client/packages/openblocks/src/comps/utils/exposingTypes.tsx b/client/packages/openblocks/src/comps/utils/exposingTypes.tsx index 62db57f93..83c112f68 100644 --- a/client/packages/openblocks/src/comps/utils/exposingTypes.tsx +++ b/client/packages/openblocks/src/comps/utils/exposingTypes.tsx @@ -1,4 +1,4 @@ -import { Node } from "openblocks-core"; +import { Node } from "lowcoder-core"; import { mapValues } from "lodash"; import { ParamsConfig } from "comps/controls/actionSelector/executeCompTypes"; import { ReactNode } from "react"; diff --git a/client/packages/openblocks/src/comps/utils/globalExposing.tsx b/client/packages/openblocks/src/comps/utils/globalExposing.tsx index fd94cefa8..81d2c839d 100644 --- a/client/packages/openblocks/src/comps/utils/globalExposing.tsx +++ b/client/packages/openblocks/src/comps/utils/globalExposing.tsx @@ -1,4 +1,4 @@ -import { fromValue, Node } from "openblocks-core"; +import { fromValue, Node } from "lowcoder-core"; import _ from "lodash"; import moment from "moment"; import { useCurrentUser } from "util/currentUser"; diff --git a/client/packages/openblocks/src/comps/utils/gridCompOperator.ts b/client/packages/openblocks/src/comps/utils/gridCompOperator.ts index ba36e1abe..4e28fcbed 100644 --- a/client/packages/openblocks/src/comps/utils/gridCompOperator.ts +++ b/client/packages/openblocks/src/comps/utils/gridCompOperator.ts @@ -23,7 +23,7 @@ import { multiChangeAction, replaceCompAction, wrapActionExtraInfo, -} from "openblocks-core"; +} from "lowcoder-core"; import { CustomModal } from "openblocks-design"; import { pasteKey, undoKey } from "util/keyUtils"; import { genRandomKey } from "./idGenerator"; diff --git a/client/packages/openblocks/src/comps/utils/index.tsx b/client/packages/openblocks/src/comps/utils/index.tsx index 90de02994..d0ff1dcb6 100644 --- a/client/packages/openblocks/src/comps/utils/index.tsx +++ b/client/packages/openblocks/src/comps/utils/index.tsx @@ -1,8 +1,8 @@ -import { updateNodesV2Action } from "openblocks-core"; -import { Node } from "openblocks-core"; -import { EvalMethods } from "openblocks-core"; +import { updateNodesV2Action } from "lowcoder-core"; +import { Node } from "lowcoder-core"; +import { EvalMethods } from "lowcoder-core"; import _ from "lodash"; -import { Comp } from "openblocks-core"; +import { Comp } from "lowcoder-core"; import { exposingInfoToNodes, exposingMethods } from "./exposingTypes"; import { ReactNode, ReactElement } from "react"; export * from "./nameGenerator"; diff --git a/client/packages/openblocks/src/comps/utils/propertyUtils.tsx b/client/packages/openblocks/src/comps/utils/propertyUtils.tsx index b2c046405..1cdd712c1 100644 --- a/client/packages/openblocks/src/comps/utils/propertyUtils.tsx +++ b/client/packages/openblocks/src/comps/utils/propertyUtils.tsx @@ -7,7 +7,7 @@ import { StringControl, } from "comps/controls/codeControl"; import { language, trans } from "i18n"; -import { Comp } from "openblocks-core"; +import { Comp } from "lowcoder-core"; import { ReactNode } from "react"; export function isCompWithPropertyView = Comp>( diff --git a/client/packages/openblocks/src/comps/utils/useCompInstance.test.tsx b/client/packages/openblocks/src/comps/utils/useCompInstance.test.tsx index b77c97cd6..59a02fe70 100644 --- a/client/packages/openblocks/src/comps/utils/useCompInstance.test.tsx +++ b/client/packages/openblocks/src/comps/utils/useCompInstance.test.tsx @@ -1,4 +1,4 @@ -import { CompAction, changeValueAction, CompActionTypes } from "openblocks-core"; +import { CompAction, changeValueAction, CompActionTypes } from "lowcoder-core"; import _ from "lodash"; import { actionHandlerGenerator, nestDispatchHandlerGenerator } from "./useCompInstance"; diff --git a/client/packages/openblocks/src/comps/utils/useCompInstance.tsx b/client/packages/openblocks/src/comps/utils/useCompInstance.tsx index 78626832f..82b6a7547 100644 --- a/client/packages/openblocks/src/comps/utils/useCompInstance.tsx +++ b/client/packages/openblocks/src/comps/utils/useCompInstance.tsx @@ -7,7 +7,7 @@ import { } from "constants/perf"; import _ from "lodash"; import log from "loglevel"; -import { CompAction, CompActionTypes, CompConstructor } from "openblocks-core"; +import { CompAction, CompActionTypes, CompConstructor } from "lowcoder-core"; import { useEffect, useMemo, useState } from "react"; import { PriorityQueue, Queue } from "typescript-collections"; import { JSONValue } from "util/jsonTypes"; diff --git a/client/packages/openblocks/src/constants/applicationConstants.ts b/client/packages/openblocks/src/constants/applicationConstants.ts index c8201558f..db0b620da 100644 --- a/client/packages/openblocks/src/constants/applicationConstants.ts +++ b/client/packages/openblocks/src/constants/applicationConstants.ts @@ -1,5 +1,5 @@ import { JSONValue } from "util/jsonTypes"; -import { ExtraActionType } from "openblocks-core"; +import { ExtraActionType } from "lowcoder-core"; import { CommonSettingResponseData } from "api/commonSettingApi"; import { PermissionItem } from "../components/PermissionDialog/PermissionList"; import { UiLayoutType } from "comps/comps/uiComp"; diff --git a/client/packages/openblocks/src/constants/queryConstants.ts b/client/packages/openblocks/src/constants/queryConstants.ts index 49e4908ec..9221edd9a 100644 --- a/client/packages/openblocks/src/constants/queryConstants.ts +++ b/client/packages/openblocks/src/constants/queryConstants.ts @@ -11,7 +11,7 @@ import { ViewQuery } from "../comps/queries/viewQuery"; import { GoogleSheetsQuery } from "../comps/queries/googleSheetsQuery"; import { GraphqlQuery } from "../comps/queries/httpQuery/graphqlQuery"; import { toPluginQuery } from "comps/queries/pluginQuery/pluginQuery"; -import { MultiCompConstructor } from "openblocks-core"; +import { MultiCompConstructor } from "lowcoder-core"; import { DataSourcePluginMeta } from "openblocks-sdk/dataSource"; export type DatasourceType = diff --git a/client/packages/openblocks/src/debug.tsx b/client/packages/openblocks/src/debug.tsx index d00129714..229c8025f 100644 --- a/client/packages/openblocks/src/debug.tsx +++ b/client/packages/openblocks/src/debug.tsx @@ -1,5 +1,5 @@ import { Layout, Menu } from "antd"; -import { Comp } from "openblocks-core"; +import { Comp } from "lowcoder-core"; import { InputComp } from "comps/comps/textInputComp/inputComp"; import { ButtonComp } from "comps/comps/buttonComp/buttonComp"; import { NavLayout } from "comps/comps/layout/navLayout"; diff --git a/client/packages/openblocks/src/i18n/antdLocale.ts b/client/packages/openblocks/src/i18n/antdLocale.ts index 7842afab2..67297737c 100644 --- a/client/packages/openblocks/src/i18n/antdLocale.ts +++ b/client/packages/openblocks/src/i18n/antdLocale.ts @@ -3,7 +3,7 @@ import en_US from "antd/lib/locale/en_US"; import zh_CN from "antd/es/locale/zh_CN"; import zh_HK from "antd/es/locale/zh_HK"; import zh_TW from "antd/es/locale/zh_TW"; -import { getValueByLocale } from "openblocks-core"; +import { getValueByLocale } from "lowcoder-core"; export function getAntdLocale(language?: string) { if (language) { diff --git a/client/packages/openblocks/src/i18n/index.tsx b/client/packages/openblocks/src/i18n/index.tsx index 30ec3c1cc..8fb85b7d4 100644 --- a/client/packages/openblocks/src/i18n/index.tsx +++ b/client/packages/openblocks/src/i18n/index.tsx @@ -1,4 +1,4 @@ -import { getI18nObjects, Translator } from "openblocks-core"; +import { getI18nObjects, Translator } from "lowcoder-core"; import * as localeData from "./locales"; import { I18nObjects } from "./locales/types"; diff --git a/client/packages/openblocks/src/ide/CompPlayground.tsx b/client/packages/openblocks/src/ide/CompPlayground.tsx index 48ae4feda..2dcbf2e8b 100644 --- a/client/packages/openblocks/src/ide/CompPlayground.tsx +++ b/client/packages/openblocks/src/ide/CompPlayground.tsx @@ -1,7 +1,7 @@ import React, { useState, useMemo, ChangeEvent } from "react"; import ReactJson from "react-json-view"; import { UICompLayoutInfo } from "comps/uiCompRegistry"; -import { Comp, customAction } from "openblocks-core"; +import { Comp, customAction } from "lowcoder-core"; import { Button, Space, Input, Form } from "antd"; import styled from "styled-components"; import { useCompInstance, GetContainerParams } from "comps/utils/useCompInstance"; diff --git a/client/packages/openblocks/src/index.sdk.ts b/client/packages/openblocks/src/index.sdk.ts index 53fa3f0f1..b0ee986cc 100644 --- a/client/packages/openblocks/src/index.sdk.ts +++ b/client/packages/openblocks/src/index.sdk.ts @@ -54,7 +54,7 @@ export * from "comps/utils/themeContext"; // design export * from "openblocks-design"; -export * from "openblocks-core"; +export * from "lowcoder-core"; // controls export * from "comps/controls/alignControl"; diff --git a/client/packages/openblocks/src/pages/ApplicationV2/index.tsx b/client/packages/openblocks/src/pages/ApplicationV2/index.tsx index 94b852e20..ab9ceabbd 100644 --- a/client/packages/openblocks/src/pages/ApplicationV2/index.tsx +++ b/client/packages/openblocks/src/pages/ApplicationV2/index.tsx @@ -35,7 +35,7 @@ import React, { useEffect, useState } from "react"; import { fetchAllApplications, fetchHomeData } from "redux/reduxActions/applicationActions"; import { getHomeOrg, normalAppListSelector } from "redux/selectors/applicationSelector"; import { DatasourceHome } from "../datasource"; -import { clearStyleEval, evalStyle } from "openblocks-core"; +import { clearStyleEval, evalStyle } from "lowcoder-core"; import { QueryLibraryEditor } from "../queryLibrary/QueryLibraryEditor"; import { ProductLoading } from "components/ProductLoading"; import { Layout } from "../../components/layout/Layout"; diff --git a/client/packages/openblocks/src/pages/ComponentDoc/common/Example.tsx b/client/packages/openblocks/src/pages/ComponentDoc/common/Example.tsx index b14303565..144e50c0d 100644 --- a/client/packages/openblocks/src/pages/ComponentDoc/common/Example.tsx +++ b/client/packages/openblocks/src/pages/ComponentDoc/common/Example.tsx @@ -1,4 +1,4 @@ -import { Comp } from "openblocks-core"; +import { Comp } from "lowcoder-core"; import { evalAndReduceWithExposing } from "comps/utils"; import _ from "lodash"; import React, { ReactNode, useContext, useEffect, useState } from "react"; diff --git a/client/packages/openblocks/src/pages/ComponentDoc/common/Exposing.tsx b/client/packages/openblocks/src/pages/ComponentDoc/common/Exposing.tsx index 77b4a1830..5d93dfa22 100644 --- a/client/packages/openblocks/src/pages/ComponentDoc/common/Exposing.tsx +++ b/client/packages/openblocks/src/pages/ComponentDoc/common/Exposing.tsx @@ -1,5 +1,5 @@ import { Table } from "antd"; -import { Comp } from "openblocks-core"; +import { Comp } from "lowcoder-core"; import { UICompType } from "comps/uiCompRegistry"; import { EventConfigsType } from "comps/controls/eventHandlerControl"; import { evalAndReduceWithExposing } from "comps/utils"; diff --git a/client/packages/openblocks/src/pages/ComponentPlayground/index.tsx b/client/packages/openblocks/src/pages/ComponentPlayground/index.tsx index 824995d1b..0f06fe645 100644 --- a/client/packages/openblocks/src/pages/ComponentPlayground/index.tsx +++ b/client/packages/openblocks/src/pages/ComponentPlayground/index.tsx @@ -3,7 +3,7 @@ import styled from "styled-components"; import "comps"; import { UICompType, UICompManifest, uiCompRegistry, UICompCategory } from "comps/uiCompRegistry"; import { CompPlayground } from "ide/CompPlayground"; -import { Comp } from "openblocks-core"; +import { Comp } from "lowcoder-core"; import { EditorContext, EditorState } from "comps/editorState"; import { RootComp } from "comps/comps/rootComp"; diff --git a/client/packages/openblocks/src/pages/editor/appEditorInternal.tsx b/client/packages/openblocks/src/pages/editor/appEditorInternal.tsx index 4c0f426fc..b2fb88391 100644 --- a/client/packages/openblocks/src/pages/editor/appEditorInternal.tsx +++ b/client/packages/openblocks/src/pages/editor/appEditorInternal.tsx @@ -10,7 +10,7 @@ import { setEditorExternalStateAction } from "redux/reduxActions/configActions"; import { AppTypeEnum } from "constants/applicationConstants"; import EditorSkeletonView from "pages/editor/editorSkeletonView"; import { useThrottle, useUnmount } from "react-use"; -import { Comp } from "openblocks-core"; +import { Comp } from "lowcoder-core"; import { localEnv } from "util/envUtils"; import { saveMainComp } from "util/localStorageUtil"; import { RootComp } from "comps/comps/rootComp"; diff --git a/client/packages/openblocks/src/pages/editor/appSnapshot.tsx b/client/packages/openblocks/src/pages/editor/appSnapshot.tsx index e1d8c99f1..46c40fe6b 100644 --- a/client/packages/openblocks/src/pages/editor/appSnapshot.tsx +++ b/client/packages/openblocks/src/pages/editor/appSnapshot.tsx @@ -20,7 +20,7 @@ import { import { Skeleton } from "antd"; import { TacoPagination } from "openblocks-design"; import { AppSnapshotContext, AppSnapshotList } from "constants/applicationConstants"; -import { ExtraActionType } from "openblocks-core"; +import { ExtraActionType } from "lowcoder-core"; import { formatString } from "util/stringUtils"; import { getUser } from "redux/selectors/usersSelectors"; import { ScrollBar } from "openblocks-design"; diff --git a/client/packages/openblocks/src/pages/editor/editorHotKeys.tsx b/client/packages/openblocks/src/pages/editor/editorHotKeys.tsx index 2e318a328..350baa2f7 100644 --- a/client/packages/openblocks/src/pages/editor/editorHotKeys.tsx +++ b/client/packages/openblocks/src/pages/editor/editorHotKeys.tsx @@ -3,7 +3,7 @@ import { EditorContext, EditorState } from "comps/editorState"; import { GridCompOperator } from "comps/utils/gridCompOperator"; import { ExternalEditorContext } from "util/context/ExternalEditorContext"; import { EditorHistory } from "util/editoryHistory"; -import { executeQueryAction } from "openblocks-core"; +import { executeQueryAction } from "lowcoder-core"; import { GlobalShortcutsWrapper, modKeyPressed, diff --git a/client/packages/openblocks/src/pages/queryLibrary/QueryLibraryEditor.tsx b/client/packages/openblocks/src/pages/queryLibrary/QueryLibraryEditor.tsx index f7232d24e..92beea73b 100644 --- a/client/packages/openblocks/src/pages/queryLibrary/QueryLibraryEditor.tsx +++ b/client/packages/openblocks/src/pages/queryLibrary/QueryLibraryEditor.tsx @@ -21,7 +21,7 @@ import { BottomResTypeEnum } from "../../types/bottomRes"; import { useCompInstance } from "../../comps/utils/useCompInstance"; import { QueryLibraryComp } from "../../comps/comps/queryLibrary/queryLibraryComp"; import { useSearchParam, useThrottle } from "react-use"; -import { Comp } from "openblocks-core"; +import { Comp } from "lowcoder-core"; import { LibraryQuery } from "../../api/queryLibraryApi"; import { NameGenerator } from "../../comps/utils"; import { QueryLibraryHistoryView } from "./QueryLibraryHistoryView"; diff --git a/client/packages/openblocks/src/pages/setting/advanced/AdvancedSetting.tsx b/client/packages/openblocks/src/pages/setting/advanced/AdvancedSetting.tsx index 920f68502..5de76dfb4 100644 --- a/client/packages/openblocks/src/pages/setting/advanced/AdvancedSetting.tsx +++ b/client/packages/openblocks/src/pages/setting/advanced/AdvancedSetting.tsx @@ -23,7 +23,7 @@ import { JSLibraryModal } from "components/JSLibraryModal"; import { JSLibraryTree } from "components/JSLibraryTree"; import { getGlobalSettings } from "comps/utils/globalSettings"; import { fetchJSLibrary } from "util/jsLibraryUtils"; -import { evalFunc } from "openblocks-core"; +import { evalFunc } from "lowcoder-core"; const AdvancedSettingContent = styled.div` max-width: 840px; diff --git a/client/packages/openblocks/src/pages/tutorials/editorTutorials.tsx b/client/packages/openblocks/src/pages/tutorials/editorTutorials.tsx index bee5c3ed4..922c90a8d 100644 --- a/client/packages/openblocks/src/pages/tutorials/editorTutorials.tsx +++ b/client/packages/openblocks/src/pages/tutorials/editorTutorials.tsx @@ -7,7 +7,7 @@ import { executeQueryAction, multiChangeAction, wrapActionExtraInfo, -} from "openblocks-core"; +} from "lowcoder-core"; import { addMapChildAction } from "comps/generators/sameTypeMap"; import { genQueryId, genRandomKey } from "comps/utils/idGenerator"; import { useDispatch, useSelector } from "react-redux"; diff --git a/client/packages/openblocks/src/types/bottomRes.ts b/client/packages/openblocks/src/types/bottomRes.ts index 0aafe1904..3f9aebe66 100644 --- a/client/packages/openblocks/src/types/bottomRes.ts +++ b/client/packages/openblocks/src/types/bottomRes.ts @@ -1,4 +1,4 @@ -import { Comp } from "openblocks-core"; +import { Comp } from "lowcoder-core"; import { EditorState } from "comps/editorState"; import { ReactNode } from "react"; diff --git a/client/packages/openblocks/src/types/remoteComp.ts b/client/packages/openblocks/src/types/remoteComp.ts index 75c293475..15abb219a 100644 --- a/client/packages/openblocks/src/types/remoteComp.ts +++ b/client/packages/openblocks/src/types/remoteComp.ts @@ -1,5 +1,5 @@ import { UICompManifest } from "comps/uiCompRegistry"; -import { CompConstructor } from "openblocks-core"; +import { CompConstructor } from "lowcoder-core"; export type RemoteCompSource = "npm" | "bundle"; export interface OpenblocksCompMeta extends Omit { diff --git a/client/packages/openblocks/src/util/context/QueryLibraryContext.ts b/client/packages/openblocks/src/util/context/QueryLibraryContext.ts index 1b9681c60..332a8755b 100644 --- a/client/packages/openblocks/src/util/context/QueryLibraryContext.ts +++ b/client/packages/openblocks/src/util/context/QueryLibraryContext.ts @@ -3,7 +3,7 @@ import { NameGenerator } from "../../comps/utils"; import { checkName } from "../../comps/utils/rename"; import React from "react"; import { setFields } from "../objectUtils"; -import { renameAction } from "openblocks-core"; +import { renameAction } from "lowcoder-core"; import { trans } from "i18n"; export class QueryLibraryState { diff --git a/client/packages/openblocks/src/util/editoryHistory.ts b/client/packages/openblocks/src/util/editoryHistory.ts index 8d2c6d4fa..421871c52 100644 --- a/client/packages/openblocks/src/util/editoryHistory.ts +++ b/client/packages/openblocks/src/util/editoryHistory.ts @@ -1,6 +1,6 @@ import { JSONValue } from "util/jsonTypes"; -import { CompAction, CompActionTypes, isBroadcastAction, RenameAction } from "openblocks-core"; -import { Comp } from "openblocks-core"; +import { CompAction, CompActionTypes, isBroadcastAction, RenameAction } from "lowcoder-core"; +import { Comp } from "lowcoder-core"; import { CompContainer } from "comps/utils/useCompInstance"; import { AppSnapshotContext } from "constants/applicationConstants"; import _ from "lodash"; diff --git a/client/packages/openblocks/src/util/promiseUtils.ts b/client/packages/openblocks/src/util/promiseUtils.ts index 80ee49814..117afeafd 100644 --- a/client/packages/openblocks/src/util/promiseUtils.ts +++ b/client/packages/openblocks/src/util/promiseUtils.ts @@ -1,5 +1,5 @@ -import { CompAction } from "openblocks-core"; -import { DispatchType } from "openblocks-core"; +import { CompAction } from "lowcoder-core"; +import { DispatchType } from "lowcoder-core"; export interface PromiseActionOptions { // auto handle after reduce if not handled diff --git a/client/yarn.lock b/client/yarn.lock index bfffb9791..617bfd58f 100644 --- a/client/yarn.lock +++ b/client/yarn.lock @@ -14350,9 +14350,9 @@ __metadata: languageName: unknown linkType: soft -"openblocks-core@npm:^0.0.1": +"lowcoder-core@npm:^0.0.1": version: 0.0.1 - resolution: "openblocks-core@npm:0.0.1" + resolution: "lowcoder-core@npm:0.0.1" dependencies: "@rollup/plugin-commonjs": ^23.0.0 "@rollup/plugin-node-resolve": ^15.0.0 @@ -14363,9 +14363,9 @@ __metadata: languageName: node linkType: hard -"openblocks-core@workspace:^, openblocks-core@workspace:packages/openblocks-core": +"lowcoder-core@workspace:^, lowcoder-core@workspace:packages/lowcoder-core": version: 0.0.0-use.local - resolution: "openblocks-core@workspace:packages/openblocks-core" + resolution: "lowcoder-core@workspace:packages/lowcoder-core" dependencies: "@rollup/plugin-commonjs": ^23.0.0 "@rollup/plugin-node-resolve": ^15.0.0 @@ -14418,7 +14418,7 @@ __metadata: "@types/react": 17 "@types/react-dom": 17 openblocks-cli: "workspace:^" - openblocks-core: ^0.0.1 + lowcoder-core: ^0.0.1 openblocks-design: ^0.0.1 openblocks-sdk: "workspace:^" react: 17 @@ -14520,7 +14520,7 @@ __metadata: mime: ^3.0.0 moment: ^2.29.4 numbro: ^2.3.6 - openblocks-core: "workspace:^" + lowcoder-core: "workspace:^" openblocks-design: "workspace:^" openblocks-dev-utils: "workspace:^" papaparse: ^5.3.2 From 6d89a1350d17682eeb17dd57e61fabe06d6cff9a Mon Sep 17 00:00:00 2001 From: Jan Richter Date: Fri, 12 May 2023 01:51:36 +1200 Subject: [PATCH 03/21] refactor: rename openblocks-dev-utils to lowcoder-dev-utils --- client/config/test/jest.config.js | 4 ++-- client/package.json | 2 +- client/packages/create-openblocks-plugin/index.js | 2 +- .../packages/create-openblocks-plugin/package.json | 2 +- client/packages/openblocks-cli/config/paths.js | 2 +- .../packages/openblocks-cli/config/vite.config.js | 6 +++--- client/packages/openblocks-cli/package.json | 2 +- client/packages/openblocks-dev-utils/package.json | 2 +- client/packages/openblocks-sdk/package.json | 2 +- client/packages/openblocks-sdk/vite.config.mts | 6 +++--- client/packages/openblocks/package.json | 2 +- client/packages/openblocks/vite.config.mts | 6 +++--- client/scripts/build.js | 4 ++-- client/yarn.lock | 14 +++++++------- 14 files changed, 28 insertions(+), 28 deletions(-) diff --git a/client/config/test/jest.config.js b/client/config/test/jest.config.js index 1f1196b72..a086ff40c 100644 --- a/client/config/test/jest.config.js +++ b/client/config/test/jest.config.js @@ -1,6 +1,6 @@ import path from "node:path"; -import { buildVars } from "openblocks-dev-utils/buildVars.js"; -import { currentDirName } from "openblocks-dev-utils/util.js"; +import { buildVars } from "lowcoder-dev-utils/buildVars.js"; +import { currentDirName } from "lowcoder-dev-utils/util.js"; const globals = {}; buildVars.forEach(({ name, defaultValue }) => { diff --git a/client/package.json b/client/package.json index f06dd1764..bb766538a 100644 --- a/client/package.json +++ b/client/package.json @@ -50,7 +50,7 @@ "jest-environment-jsdom": "^29.0.3", "lint-staged": "^13.0.1", "mq-polyfill": "^1.1.8", - "openblocks-dev-utils": "workspace:^", + "lowcoder-dev-utils": "workspace:^", "prettier": "^2.7.0", "rimraf": "^3.0.2", "rollup": "^2.79.0", diff --git a/client/packages/create-openblocks-plugin/index.js b/client/packages/create-openblocks-plugin/index.js index 3229dd890..1f7f1dbfa 100755 --- a/client/packages/create-openblocks-plugin/index.js +++ b/client/packages/create-openblocks-plugin/index.js @@ -5,7 +5,7 @@ import { spawn } from "cross-spawn"; import { writeFileSync, existsSync } from "node:fs"; import chalk from "chalk"; import { createCommand } from "commander"; -import { readJson, currentDirName } from "openblocks-dev-utils/util.js"; +import { readJson, currentDirName } from "lowcoder-dev-utils/util.js"; const currentDir = currentDirName(import.meta.url); const pkg = readJson(path.resolve(currentDir, "./package.json")); diff --git a/client/packages/create-openblocks-plugin/package.json b/client/packages/create-openblocks-plugin/package.json index e4db470c4..9b6c77a0f 100644 --- a/client/packages/create-openblocks-plugin/package.json +++ b/client/packages/create-openblocks-plugin/package.json @@ -8,7 +8,7 @@ "commander": "^9.4.1", "cross-spawn": "^7.0.3", "fs-extra": "^10.1.0", - "openblocks-dev-utils": "workspace:^" + "lowcoder-dev-utils": "workspace:^" }, "license": "MIT", "keywords": [ diff --git a/client/packages/openblocks-cli/config/paths.js b/client/packages/openblocks-cli/config/paths.js index e7c518bf4..0d4ba406c 100644 --- a/client/packages/openblocks-cli/config/paths.js +++ b/client/packages/openblocks-cli/config/paths.js @@ -1,6 +1,6 @@ import path from "node:path"; import fs from "node:fs"; -import { currentDirName } from "openblocks-dev-utils/util.js"; +import { currentDirName } from "lowcoder-dev-utils/util.js"; const currentDir = currentDirName(import.meta.url); const appDirectory = fs.realpathSync(process.cwd()); diff --git a/client/packages/openblocks-cli/config/vite.config.js b/client/packages/openblocks-cli/config/vite.config.js index 7e4a5f60d..c17bb4840 100644 --- a/client/packages/openblocks-cli/config/vite.config.js +++ b/client/packages/openblocks-cli/config/vite.config.js @@ -1,12 +1,12 @@ import react from "@vitejs/plugin-react"; import svgrPlugin from "vite-plugin-svgr"; import global from "rollup-plugin-external-globals"; -import { buildVars } from "openblocks-dev-utils/buildVars.js"; +import { buildVars } from "lowcoder-dev-utils/buildVars.js"; import injectCss from "vite-plugin-css-injected-by-js"; -import { getLibNames, getAllLibGlobalVarNames } from "openblocks-dev-utils/external.js"; +import { getLibNames, getAllLibGlobalVarNames } from "lowcoder-dev-utils/external.js"; import paths from "./paths.js"; import { defineConfig } from "vite"; -import { readJson } from "openblocks-dev-utils/util.js"; +import { readJson } from "lowcoder-dev-utils/util.js"; const isProduction = process.env.NODE_ENV === "production"; const packageJson = readJson(paths.appPackageJson); diff --git a/client/packages/openblocks-cli/package.json b/client/packages/openblocks-cli/package.json index 5e9779aae..90e9db00a 100644 --- a/client/packages/openblocks-cli/package.json +++ b/client/packages/openblocks-cli/package.json @@ -29,7 +29,7 @@ "commander": "^9.4.1", "cross-spawn": "^7.0.3", "fs-extra": "^10.1.0", - "openblocks-dev-utils": "workspace:^", + "lowcoder-dev-utils": "workspace:^", "react": "^17", "react-dom": "^17", "react-json-view": "^1.21.3", diff --git a/client/packages/openblocks-dev-utils/package.json b/client/packages/openblocks-dev-utils/package.json index 5328584c3..50af24c09 100644 --- a/client/packages/openblocks-dev-utils/package.json +++ b/client/packages/openblocks-dev-utils/package.json @@ -1,5 +1,5 @@ { - "name": "openblocks-dev-utils", + "name": "lowcoder-dev-utils", "version": "0.0.5", "license": "MIT", "type": "module", diff --git a/client/packages/openblocks-sdk/package.json b/client/packages/openblocks-sdk/package.json index d7eaca849..b62c516fc 100644 --- a/client/packages/openblocks-sdk/package.json +++ b/client/packages/openblocks-sdk/package.json @@ -35,7 +35,7 @@ "@rollup/plugin-url": "^7.0.0", "@svgr/rollup": "^6.3.1", "@vitejs/plugin-react": "^2.2.0", - "openblocks-dev-utils": "workspace:^", + "lowcoder-dev-utils": "workspace:^", "rollup": "^2", "rollup-plugin-cleaner": "^1.0.0", "rollup-plugin-node-builtins": "^2.1.2", diff --git a/client/packages/openblocks-sdk/vite.config.mts b/client/packages/openblocks-sdk/vite.config.mts index 07875a6f8..3226b36b4 100644 --- a/client/packages/openblocks-sdk/vite.config.mts +++ b/client/packages/openblocks-sdk/vite.config.mts @@ -3,9 +3,9 @@ import react from "@vitejs/plugin-react"; import viteTsconfigPaths from "vite-tsconfig-paths"; import svgrPlugin from "vite-plugin-svgr"; import path from "path"; -import { ensureLastSlash } from "openblocks-dev-utils/util"; -import { buildVars } from "openblocks-dev-utils/buildVars"; -import { globalDepPlugin } from "openblocks-dev-utils/globalDepPlguin"; +import { ensureLastSlash } from "lowcoder-dev-utils/util"; +import { buildVars } from "lowcoder-dev-utils/buildVars"; +import { globalDepPlugin } from "lowcoder-dev-utils/globalDepPlguin"; const define = {}; buildVars.forEach(({ name, defaultValue }) => { diff --git a/client/packages/openblocks/package.json b/client/packages/openblocks/package.json index 88e44828d..37894d6ba 100644 --- a/client/packages/openblocks/package.json +++ b/client/packages/openblocks/package.json @@ -119,7 +119,7 @@ "eslint-config-react-app": "^7.0.1", "eslint-plugin-only-ascii": "^0.0.0", "http-proxy-middleware": "^2.0.6", - "openblocks-dev-utils": "workspace:^", + "lowcoder-dev-utils": "workspace:^", "rollup-plugin-visualizer": "^5.8.3", "typescript": "^4.8.4", "vite": "^3.2.4", diff --git a/client/packages/openblocks/vite.config.mts b/client/packages/openblocks/vite.config.mts index 61dc28905..f0c690edf 100644 --- a/client/packages/openblocks/vite.config.mts +++ b/client/packages/openblocks/vite.config.mts @@ -8,9 +8,9 @@ import { visualizer } from "rollup-plugin-visualizer"; import path from "path"; import chalk from "chalk"; import { createHtmlPlugin } from "vite-plugin-html"; -import { ensureLastSlash } from "openblocks-dev-utils/util"; -import { buildVars } from "openblocks-dev-utils/buildVars"; -import { globalDepPlugin } from "openblocks-dev-utils/globalDepPlguin"; +import { ensureLastSlash } from "lowcoder-dev-utils/util"; +import { buildVars } from "lowcoder-dev-utils/buildVars"; +import { globalDepPlugin } from "lowcoder-dev-utils/globalDepPlguin"; dotenv.config(); diff --git a/client/scripts/build.js b/client/scripts/build.js index 79058a39b..ae820d5fc 100644 --- a/client/scripts/build.js +++ b/client/scripts/build.js @@ -4,8 +4,8 @@ import https from "node:https"; import shell from "shelljs"; import chalk from "chalk"; import axios from "axios"; -import { buildVars } from "openblocks-dev-utils/buildVars.js"; -import { currentDirName, readJson } from "openblocks-dev-utils/util.js"; +import { buildVars } from "lowcoder-dev-utils/buildVars.js"; +import { currentDirName, readJson } from "lowcoder-dev-utils/util.js"; const builtinPlugins = ["openblocks-comps"]; const curDirName = currentDirName(import.meta.url); diff --git a/client/yarn.lock b/client/yarn.lock index 617bfd58f..63c49e8e2 100644 --- a/client/yarn.lock +++ b/client/yarn.lock @@ -7474,7 +7474,7 @@ __metadata: commander: ^9.4.1 cross-spawn: ^7.0.3 fs-extra: ^10.1.0 - openblocks-dev-utils: "workspace:^" + lowcoder-dev-utils: "workspace:^" bin: create-openblocks-plugin: ./index.js languageName: unknown @@ -14308,7 +14308,7 @@ __metadata: commander: ^9.4.1 cross-spawn: ^7.0.3 fs-extra: ^10.1.0 - openblocks-dev-utils: "workspace:^" + lowcoder-dev-utils: "workspace:^" react: ^17 react-dom: ^17 react-json-view: ^1.21.3 @@ -14405,9 +14405,9 @@ __metadata: languageName: unknown linkType: soft -"openblocks-dev-utils@workspace:^, openblocks-dev-utils@workspace:packages/openblocks-dev-utils": +"lowcoder-dev-utils@workspace:^, lowcoder-dev-utils@workspace:packages/lowcoder-dev-utils": version: 0.0.0-use.local - resolution: "openblocks-dev-utils@workspace:packages/openblocks-dev-utils" + resolution: "lowcoder-dev-utils@workspace:packages/lowcoder-dev-utils" languageName: unknown linkType: soft @@ -14439,7 +14439,7 @@ __metadata: "@rollup/plugin-url": ^7.0.0 "@svgr/rollup": ^6.3.1 "@vitejs/plugin-react": ^2.2.0 - openblocks-dev-utils: "workspace:^" + lowcoder-dev-utils: "workspace:^" rollup: ^2 rollup-plugin-cleaner: ^1.0.0 rollup-plugin-node-builtins: ^2.1.2 @@ -14522,7 +14522,7 @@ __metadata: numbro: ^2.3.6 lowcoder-core: "workspace:^" openblocks-design: "workspace:^" - openblocks-dev-utils: "workspace:^" + lowcoder-dev-utils: "workspace:^" papaparse: ^5.3.2 qrcode.react: ^3.1.0 rc-trigger: ^5.3.1 @@ -18376,7 +18376,7 @@ __metadata: lint-staged: ^13.0.1 mq-polyfill: ^1.1.8 number-precision: ^1.6.0 - openblocks-dev-utils: "workspace:^" + lowcoder-dev-utils: "workspace:^" prettier: ^2.7.0 react-player: ^2.11.0 rimraf: ^3.0.2 From e0ecb3338b86225ecb7ddf97ee746fae81c08bcd Mon Sep 17 00:00:00 2001 From: Jan Richter Date: Fri, 12 May 2023 01:52:51 +1200 Subject: [PATCH 04/21] refactor: rename openblocks-design to lowcoder-design --- client/config/test/jest.config.js | 2 +- client/packages/openblocks-design/README.md | 4 ++-- client/packages/openblocks-design/package.json | 2 +- client/packages/openblocks-plugin-demo/package.json | 2 +- client/packages/openblocks-sdk/tsconfig.json | 4 ++-- client/packages/openblocks-sdk/vite.config.mts | 2 +- client/packages/openblocks/package.json | 2 +- .../openblocks/src/base/codeEditor/codeEditor.tsx | 2 +- .../src/base/codeEditor/extensions/iconExtension.tsx | 2 +- .../openblocks/src/components/ApplicationSelect.tsx | 2 +- client/packages/openblocks/src/components/CompName.tsx | 8 ++++---- .../openblocks/src/components/EmptyContent.tsx | 2 +- .../packages/openblocks/src/components/EmptyItem.tsx | 2 +- .../packages/openblocks/src/components/InputList.tsx | 6 +++--- .../openblocks/src/components/KeyValueItemList.tsx | 2 +- .../openblocks/src/components/LinkPlusButton.tsx | 2 +- .../src/components/PermissionDialog/Permission.tsx | 2 +- .../src/components/PermissionDialog/PermissionList.tsx | 2 +- .../components/PermissionDialog/commonComponents.tsx | 2 +- .../openblocks/src/components/ResCreatePanel.tsx | 2 +- .../packages/openblocks/src/components/StepModal.tsx | 4 ++-- .../openblocks/src/components/table/EditableCell.tsx | 2 +- .../openblocks/src/comps/comps/appSettingsComp.tsx | 2 +- .../src/comps/comps/buttonComp/buttonComp.tsx | 2 +- .../src/comps/comps/buttonComp/buttonCompConstants.tsx | 2 +- .../src/comps/comps/buttonComp/dropdownComp.tsx | 2 +- .../openblocks/src/comps/comps/buttonComp/linkComp.tsx | 2 +- .../src/comps/comps/buttonComp/scannerComp.tsx | 2 +- .../src/comps/comps/buttonComp/toggleButtonComp.tsx | 2 +- .../openblocks/src/comps/comps/carouselComp.tsx | 2 +- .../src/comps/comps/containerComp/containerComp.tsx | 2 +- .../src/comps/comps/customComp/customComp.tsx | 2 +- .../openblocks/src/comps/comps/customShortcutsComp.tsx | 2 +- .../src/comps/comps/dataChangeResponderComp.tsx | 2 +- .../openblocks/src/comps/comps/dividerComp.tsx | 2 +- .../openblocks/src/comps/comps/fileViewerComp.tsx | 2 +- .../openblocks/src/comps/comps/formComp/createForm.tsx | 2 +- .../openblocks/src/comps/comps/formComp/formComp.tsx | 4 ++-- .../src/comps/comps/formComp/formDataConstants.tsx | 2 +- .../openblocks/src/comps/comps/gridItemComp.tsx | 2 +- .../packages/openblocks/src/comps/comps/iframeComp.tsx | 2 +- .../packages/openblocks/src/comps/comps/imageComp.tsx | 2 +- .../src/comps/comps/jsonComp/jsonEditorComp.tsx | 2 +- .../src/comps/comps/jsonComp/jsonExplorerComp.tsx | 2 +- .../comps/jsonSchemaFormComp/jsonSchemaFormComp.tsx | 4 ++-- .../openblocks/src/comps/comps/layout/navLayout.tsx | 2 +- .../src/comps/comps/listViewComp/listView.tsx | 2 +- .../comps/comps/listViewComp/listViewPropertyView.tsx | 2 +- .../openblocks/src/comps/comps/mediaComp/audioComp.tsx | 4 ++-- .../openblocks/src/comps/comps/mediaComp/videoComp.tsx | 6 +++--- .../src/comps/comps/moduleComp/moduleComp.tsx | 2 +- .../src/comps/comps/moduleComp/moduleInputComp.tsx | 2 +- .../comps/moduleContainerComp/ioComp/inputListComp.tsx | 2 +- .../moduleContainerComp/ioComp/inputListItemComp.tsx | 2 +- .../comps/moduleContainerComp/moduleContainerComp.tsx | 2 +- .../comps/moduleContainerComp/moduleEventListComp.tsx | 2 +- .../comps/moduleContainerComp/moduleLayoutComp.tsx | 2 +- .../comps/moduleContainerComp/moduleMethodListComp.tsx | 2 +- .../moduleContainerComp/moduleMethodParamListComp.tsx | 2 +- .../comps/comps/navComp/components/DraggableItem.tsx | 2 +- .../src/comps/comps/navComp/components/MenuItem.tsx | 4 ++-- .../comps/comps/navComp/components/MenuItemList.tsx | 2 +- .../openblocks/src/comps/comps/navComp/navComp.tsx | 2 +- .../comps/comps/numberInputComp/numberInputComp.tsx | 2 +- .../comps/comps/numberInputComp/rangeSliderComp.tsx | 2 +- .../src/comps/comps/numberInputComp/sliderComp.tsx | 2 +- .../comps/numberInputComp/sliderCompConstants.tsx | 4 ++-- .../openblocks/src/comps/comps/preLoadComp.tsx | 2 +- .../openblocks/src/comps/comps/progressCircleComp.tsx | 2 +- .../openblocks/src/comps/comps/progressComp.tsx | 2 +- .../packages/openblocks/src/comps/comps/qrCodeComp.tsx | 2 +- .../src/comps/comps/queryLibrary/inputListComp.tsx | 2 +- .../src/comps/comps/queryLibrary/queryLibraryComp.tsx | 2 +- .../packages/openblocks/src/comps/comps/ratingComp.tsx | 2 +- .../src/comps/comps/remoteComp/remoteComp.tsx | 2 +- .../openblocks/src/comps/comps/richTextEditorComp.tsx | 2 +- .../packages/openblocks/src/comps/comps/rootComp.tsx | 2 +- .../comps/comps/selectInputComp/cascaderContants.tsx | 2 +- .../src/comps/comps/selectInputComp/checkboxComp.tsx | 4 ++-- .../src/comps/comps/selectInputComp/radioComp.tsx | 2 +- .../comps/comps/selectInputComp/radioCompConstants.tsx | 2 +- .../comps/comps/selectInputComp/segmentedControl.tsx | 2 +- .../comps/selectInputComp/selectCompConstants.tsx | 2 +- .../comps/selectInputComp/selectInputConstants.tsx | 2 +- .../openblocks/src/comps/comps/signatureComp.tsx | 2 +- .../packages/openblocks/src/comps/comps/switchComp.tsx | 2 +- .../comps/comps/tableComp/column/columnTypeComp.tsx | 2 +- .../column/columnTypeComps/columnBooleanComp.tsx | 2 +- .../column/columnTypeComps/columnDateComp.tsx | 2 +- .../tableComp/column/columnTypeComps/columnImgComp.tsx | 2 +- .../column/columnTypeComps/columnMarkdownComp.tsx | 2 +- .../column/columnTypeComps/columnProgressComp.tsx | 2 +- .../column/columnTypeComps/columnStatusComp.tsx | 2 +- .../column/columnTypeComps/columnTagsComp.tsx | 4 ++-- .../comps/comps/tableComp/column/tableColumnComp.tsx | 2 +- .../src/comps/comps/tableComp/tableCompView.tsx | 2 +- .../src/comps/comps/tableComp/tablePropertyView.tsx | 2 +- .../src/comps/comps/tableComp/tableToolbarComp.tsx | 2 +- .../src/comps/comps/tableComp/tableTypes.tsx | 2 +- .../src/comps/comps/tableComp/tableUtils.tsx | 2 +- .../src/comps/comps/tabs/tabbedContainerComp.tsx | 4 ++-- .../openblocks/src/comps/comps/temporaryStateComp.tsx | 2 +- .../packages/openblocks/src/comps/comps/textComp.tsx | 10 +++++----- .../src/comps/comps/textInputComp/inputComp.tsx | 2 +- .../src/comps/comps/textInputComp/passwordComp.tsx | 2 +- .../src/comps/comps/textInputComp/textAreaComp.tsx | 2 +- .../comps/comps/textInputComp/textInputConstants.tsx | 2 +- .../openblocks/src/comps/comps/transformerListComp.tsx | 2 +- .../openblocks/src/comps/comps/treeComp/treeComp.tsx | 2 +- .../src/comps/comps/treeComp/treeSelectComp.tsx | 2 +- .../openblocks/src/comps/comps/treeComp/treeUtils.tsx | 2 +- .../src/comps/comps/triContainerComp/triContainer.tsx | 2 +- .../comps/comps/triContainerComp/triContainerComp.tsx | 2 +- .../controls/actionSelector/actionSelectorControl.tsx | 2 +- .../controls/actionSelector/copyToClipboardAction.tsx | 2 +- .../comps/controls/actionSelector/downloadAction.tsx | 2 +- .../controls/actionSelector/executeCompAction.tsx | 2 +- .../controls/actionSelector/executeQueryAction.tsx | 2 +- .../comps/controls/actionSelector/goToURLAction.tsx | 2 +- .../comps/controls/actionSelector/messageAction.tsx | 2 +- .../comps/controls/actionSelector/openAppAction.tsx | 2 +- .../src/comps/controls/actionSelector/runScript.tsx | 2 +- .../actionSelector/triggerModuleEventAction.tsx | 2 +- .../openblocks/src/comps/controls/alignControl.tsx | 4 ++-- .../openblocks/src/comps/controls/appSelectControl.tsx | 2 +- .../openblocks/src/comps/controls/boolControl.tsx | 2 +- .../openblocks/src/comps/controls/codeControl.tsx | 2 +- .../openblocks/src/comps/controls/codeTextControl.tsx | 2 +- .../openblocks/src/comps/controls/colorControl.tsx | 2 +- .../openblocks/src/comps/controls/compNameControl.tsx | 6 +++--- .../openblocks/src/comps/controls/dropdownControl.tsx | 2 +- .../src/comps/controls/dropdownInputSimpleControl.tsx | 2 +- .../src/comps/controls/eventHandlerControl.tsx | 2 +- .../openblocks/src/comps/controls/iconControl.tsx | 2 +- .../openblocks/src/comps/controls/keyValueControl.tsx | 2 +- .../openblocks/src/comps/controls/labelControl.tsx | 10 +++++----- .../src/comps/controls/numberSimpleControl.tsx | 2 +- .../openblocks/src/comps/controls/optionsControl.tsx | 2 +- .../src/comps/controls/querySelectControl.tsx | 4 ++-- .../src/comps/controls/simpleStringControl.tsx | 4 ++-- .../openblocks/src/comps/controls/slotControl.tsx | 2 +- .../src/comps/controls/stringSimpleControl.tsx | 2 +- .../openblocks/src/comps/controls/styleControl.tsx | 2 +- .../src/comps/controls/styleControlConstants.tsx | 2 +- .../src/comps/generators/controlCompBuilder.tsx | 2 +- .../src/comps/generators/simpleGenerators.tsx | 2 +- .../packages/openblocks/src/comps/hooks/drawerComp.tsx | 2 +- .../packages/openblocks/src/comps/hooks/hookComp.tsx | 2 +- .../packages/openblocks/src/comps/hooks/modalComp.tsx | 2 +- client/packages/openblocks/src/comps/index.tsx | 2 +- .../packages/openblocks/src/comps/queries/esQuery.tsx | 2 +- .../openblocks/src/comps/queries/googleSheetsQuery.tsx | 2 +- .../openblocks/src/comps/queries/inputChangeSet.tsx | 2 +- .../openblocks/src/comps/queries/inputSort.tsx | 2 +- .../packages/openblocks/src/comps/queries/jsQuery.tsx | 2 +- .../openblocks/src/comps/queries/libraryQuery.tsx | 2 +- .../openblocks/src/comps/queries/mongoQuery.tsx | 2 +- .../openblocks/src/comps/queries/openBlocksQuery.tsx | 2 +- .../src/comps/queries/pluginQuery/pluginQuery.tsx | 4 ++-- client/packages/openblocks/src/comps/queries/query.tsx | 2 +- .../openblocks/src/comps/queries/queryComp.tsx | 2 +- .../comps/queries/queryComp/queryConfirmationModal.tsx | 2 +- .../queries/queryComp/queryNotificationControl.tsx | 2 +- .../src/comps/queries/queryComp/queryPropertyView.tsx | 2 +- .../openblocks/src/comps/queries/redisQuery.tsx | 2 +- .../openblocks/src/comps/queries/resourceDropdown.tsx | 2 +- .../src/comps/queries/sqlQuery/FilterComp.tsx | 4 ++-- .../openblocks/src/comps/queries/sqlQuery/SQLQuery.tsx | 2 +- .../src/comps/queries/sqlQuery/changeSetComp.tsx | 2 +- .../src/comps/queries/sqlQuery/columnNameDropdown.tsx | 2 +- .../src/comps/queries/sqlQuery/tableNameComp.tsx | 2 +- .../openblocks/src/comps/utils/gridCompOperator.ts | 2 +- client/packages/openblocks/src/index.less | 2 +- client/packages/openblocks/src/index.sdk.ts | 2 +- .../openblocks/src/layout/compSelectionWrapper.tsx | 10 +++++----- .../src/pages/ApplicationV2/AppFromTemplate.tsx | 4 ++-- .../src/pages/ApplicationV2/CreateDropdown.tsx | 2 +- .../openblocks/src/pages/ApplicationV2/HomeLayout.tsx | 2 +- .../openblocks/src/pages/ApplicationV2/HomeResCard.tsx | 2 +- .../src/pages/ApplicationV2/HomeResOptions.tsx | 2 +- .../src/pages/ApplicationV2/HomeTableView.tsx | 2 +- .../src/pages/ApplicationV2/MoveToFolderModal.tsx | 2 +- .../src/pages/ApplicationV2/TrashTableView.tsx | 2 +- .../openblocks/src/pages/ApplicationV2/index.tsx | 2 +- .../src/pages/ApplicationV2/useCreateFolder.tsx | 2 +- .../src/pages/ComponentDoc/common/Example.tsx | 2 +- .../ComponentDoc/examples/presentationComp/chart.tsx | 2 +- .../openblocks/src/pages/ComponentDoc/index.tsx | 2 +- .../openblocks/src/pages/common/commonLayout.tsx | 2 +- .../packages/openblocks/src/pages/common/copyModal.tsx | 2 +- client/packages/openblocks/src/pages/common/header.tsx | 2 +- .../src/pages/common/headerStartDropdown.tsx | 2 +- client/packages/openblocks/src/pages/common/help.tsx | 8 ++++---- .../openblocks/src/pages/common/inviteDialog.tsx | 4 ++-- .../openblocks/src/pages/common/previewHeader.tsx | 2 +- .../openblocks/src/pages/common/profileDropdown.tsx | 2 +- .../openblocks/src/pages/common/shortcutListPopup.tsx | 2 +- .../openblocks/src/pages/common/styledComponent.tsx | 2 +- .../openblocks/src/pages/common/videoDialog.tsx | 2 +- .../src/pages/datasource/datasourceEditPage.tsx | 2 +- .../openblocks/src/pages/datasource/datasourceList.tsx | 2 +- .../src/pages/datasource/datasourceModal.tsx | 2 +- .../packages/openblocks/src/pages/datasource/form.tsx | 2 +- .../pages/datasource/form/datasourceFormRegistry.tsx | 2 +- .../src/pages/datasource/form/esDatasourceForm.tsx | 2 +- .../datasource/form/googleSheetsDatasourceForm.tsx | 2 +- .../pages/datasource/form/graphqlDatasourceForm.tsx | 2 +- .../src/pages/datasource/form/httpDatasourceForm.tsx | 2 +- .../src/pages/datasource/form/mongoDatasourceForm.tsx | 2 +- .../src/pages/datasource/form/oracleDatasourceForm.tsx | 2 +- .../src/pages/datasource/form/pluginDataSourceForm.tsx | 2 +- .../src/pages/datasource/form/redisDatasourceForm.tsx | 2 +- .../src/pages/datasource/form/smtpDatasourceForm.tsx | 2 +- .../pages/datasource/form/snowflakeDatasourceForm.tsx | 2 +- .../src/pages/datasource/form/sqlDatasourceForm.tsx | 2 +- .../openblocks/src/pages/editor/LeftContent.tsx | 2 +- .../openblocks/src/pages/editor/appSnapshot.tsx | 8 ++++---- .../src/pages/editor/bottom/BottomContent.tsx | 2 +- .../src/pages/editor/bottom/BottomMetaDrawer.tsx | 2 +- .../src/pages/editor/bottom/BottomSidebar.tsx | 2 +- .../openblocks/src/pages/editor/bottom/BottomTabs.tsx | 2 +- .../openblocks/src/pages/editor/codeEditorPanel.tsx | 6 +++--- .../openblocks/src/pages/editor/editorConstants.tsx | 2 +- .../openblocks/src/pages/editor/editorView.tsx | 2 +- .../openblocks/src/pages/editor/right/InsertView.tsx | 2 +- .../openblocks/src/pages/editor/right/ModulePanel.tsx | 2 +- .../pages/editor/right/PluginPanel/PluginCompItem.tsx | 2 +- .../src/pages/editor/right/PluginPanel/PluginItem.tsx | 2 +- .../src/pages/editor/right/PluginPanel/index.tsx | 2 +- .../openblocks/src/pages/editor/right/PropertyView.tsx | 4 ++-- .../openblocks/src/pages/editor/right/RightPanel.tsx | 6 +++--- .../src/pages/editor/right/styledComponent.tsx | 2 +- .../openblocks/src/pages/editor/right/uiCompPanel.tsx | 2 +- .../openblocks/src/pages/queryLibrary/LeftNav.tsx | 2 +- .../src/pages/queryLibrary/QueryLibraryEditor.tsx | 2 +- .../src/pages/queryLibrary/QueryLibraryHistoryView.tsx | 4 ++-- .../src/pages/setting/advanced/AdvancedSetting.tsx | 2 +- .../src/pages/setting/idSource/detail/deleteConfig.tsx | 2 +- .../src/pages/setting/idSource/detail/index.tsx | 2 +- .../src/pages/setting/idSource/detail/manual.tsx | 2 +- .../src/pages/setting/idSource/styledComponents.tsx | 2 +- .../src/pages/setting/organization/orgList.tsx | 2 +- .../pages/setting/organization/orgSettingContent.tsx | 2 +- .../pages/setting/permission/addGroupUserDialog.tsx | 4 ++-- .../pages/setting/permission/groupUsersPermission.tsx | 2 +- .../pages/setting/permission/orgUsersPermission.tsx | 2 +- .../src/pages/setting/permission/permissionList.tsx | 2 +- .../src/pages/setting/permission/styledComponents.tsx | 2 +- .../openblocks/src/pages/setting/profile/index.tsx | 2 +- .../src/pages/setting/profile/profileComponets.tsx | 6 +++--- .../pages/setting/profile/styledProfileComponets.tsx | 4 ++-- .../openblocks/src/pages/setting/settingHome.tsx | 2 +- .../packages/openblocks/src/pages/setting/styled.tsx | 2 +- .../src/pages/setting/theme/chartThemeConstant.ts | 2 +- .../openblocks/src/pages/setting/theme/createModal.tsx | 8 ++++---- .../src/pages/setting/theme/detail/index.tsx | 2 +- .../src/pages/setting/theme/styledComponents.tsx | 2 +- .../openblocks/src/pages/setting/theme/themePage.tsx | 2 +- .../openblocks/src/pages/tutorials/HomeTutorialsV2.tsx | 2 +- .../openblocks/src/pages/tutorials/editorTutorials.tsx | 2 +- .../openblocks/src/pages/userAuth/authComponents.tsx | 2 +- .../openblocks/src/pages/userAuth/formLogin.tsx | 2 +- .../openblocks/src/pages/userAuth/register.tsx | 2 +- .../src/pages/userAuth/thirdParty/thirdPartyAuth.tsx | 2 +- client/packages/openblocks/src/util/bottomResUtils.tsx | 2 +- client/packages/openblocks/src/util/homeResUtils.tsx | 2 +- client/packages/openblocks/tsconfig.paths.json | 3 +-- client/packages/openblocks/vite.config.mts | 2 +- client/yarn.lock | 8 ++++---- 269 files changed, 330 insertions(+), 331 deletions(-) diff --git a/client/config/test/jest.config.js b/client/config/test/jest.config.js index a086ff40c..6384461ae 100644 --- a/client/config/test/jest.config.js +++ b/client/config/test/jest.config.js @@ -28,7 +28,7 @@ export default { "/src", path.resolve(dirname, "../../packages/openblocks/src"), path.resolve(dirname, "../../packages/openblocks-comps/src"), - path.resolve(dirname, "../../packages/openblocks-design/src"), + path.resolve(dirname, "../../packages/lowcoder-design/src"), ], setupFiles: [path.resolve(dirname, "./jest.setup.js")], setupFilesAfterEnv: [path.resolve(dirname, "./jest.setup-after-env.js")], diff --git a/client/packages/openblocks-design/README.md b/client/packages/openblocks-design/README.md index 40bc349cc..1e725bb96 100644 --- a/client/packages/openblocks-design/README.md +++ b/client/packages/openblocks-design/README.md @@ -1,9 +1,9 @@ -# openblocks-design +# lowcoder-design Lowcoder base react components. When add new components, you should rebuild it with: ```bash -yarn workspace openblocks-design build +yarn workspace lowcoder-design build ``` diff --git a/client/packages/openblocks-design/package.json b/client/packages/openblocks-design/package.json index d6870e8e4..9971642cf 100644 --- a/client/packages/openblocks-design/package.json +++ b/client/packages/openblocks-design/package.json @@ -1,5 +1,5 @@ { - "name": "openblocks-design", + "name": "lowcoder-design", "version": "0.0.1", "types": "src/index.ts", "main": "src/index.ts", diff --git a/client/packages/openblocks-plugin-demo/package.json b/client/packages/openblocks-plugin-demo/package.json index 1154e00e5..1fa5646a7 100644 --- a/client/packages/openblocks-plugin-demo/package.json +++ b/client/packages/openblocks-plugin-demo/package.json @@ -5,7 +5,7 @@ "license": "MIT", "dependencies": { "lowcoder-core": "^0.0.1", - "openblocks-design": "^0.0.1", + "lowcoder-design": "^0.0.1", "react": "17", "react-dom": "17" }, diff --git a/client/packages/openblocks-sdk/tsconfig.json b/client/packages/openblocks-sdk/tsconfig.json index 88d19c801..3f5fb8c92 100644 --- a/client/packages/openblocks-sdk/tsconfig.json +++ b/client/packages/openblocks-sdk/tsconfig.json @@ -25,7 +25,7 @@ "*", "../../openblocks/src/*", "../../openblocks-comps/src/*", - "../../openblocks-design/src/*" + "../../lowcoder-design/src/*" ], "@openblocks-ee/*": ["../../openblocks/src/*"] } @@ -36,6 +36,6 @@ "index.tsx", "../openblocks/src", "../openblocks-comps/src", - "../openblocks-design/src" + "../lowcoder-design/src" ] } diff --git a/client/packages/openblocks-sdk/vite.config.mts b/client/packages/openblocks-sdk/vite.config.mts index 3226b36b4..e3cb006ae 100644 --- a/client/packages/openblocks-sdk/vite.config.mts +++ b/client/packages/openblocks-sdk/vite.config.mts @@ -85,7 +85,7 @@ export const viteConfig: UserConfig = { projects: [ "../openblocks/tsconfig.json", "../openblocks-comps/tsconfig.json", - "../openblocks-design/tsconfig.json", + "../lowcoder-design/tsconfig.json", ], }), svgrPlugin({ diff --git a/client/packages/openblocks/package.json b/client/packages/openblocks/package.json index 37894d6ba..73b96869a 100644 --- a/client/packages/openblocks/package.json +++ b/client/packages/openblocks/package.json @@ -55,7 +55,7 @@ "moment": "^2.29.4", "numbro": "^2.3.6", "lowcoder-core": "workspace:^", - "openblocks-design": "workspace:^", + "lowcoder-design": "workspace:^", "papaparse": "^5.3.2", "qrcode.react": "^3.1.0", "rc-trigger": "^5.3.1", diff --git a/client/packages/openblocks/src/base/codeEditor/codeEditor.tsx b/client/packages/openblocks/src/base/codeEditor/codeEditor.tsx index 03a9e7ce5..fd1844146 100644 --- a/client/packages/openblocks/src/base/codeEditor/codeEditor.tsx +++ b/client/packages/openblocks/src/base/codeEditor/codeEditor.tsx @@ -9,7 +9,7 @@ import React, { import styled, { css } from "styled-components"; import { EditorState, EditorView } from "./codeMirror"; import { useExtensions } from "./extensions"; -import { PopupCard } from "openblocks-design"; +import { PopupCard } from "lowcoder-design"; import { CodeEditorPanel } from "../../pages/editor/codeEditorPanel"; import { CodeEditorProps, StyleName } from "./codeEditorTypes"; import { useClickCompNameEffect } from "./clickCompName"; diff --git a/client/packages/openblocks/src/base/codeEditor/extensions/iconExtension.tsx b/client/packages/openblocks/src/base/codeEditor/extensions/iconExtension.tsx index c04444a07..ab1c3539d 100644 --- a/client/packages/openblocks/src/base/codeEditor/extensions/iconExtension.tsx +++ b/client/packages/openblocks/src/base/codeEditor/extensions/iconExtension.tsx @@ -7,7 +7,7 @@ import { ViewUpdate, WidgetType, } from "@codemirror/view"; -import { useIcon } from "openblocks-design"; +import { useIcon } from "lowcoder-design"; import ReactDOM from "react-dom"; import styled from "styled-components"; diff --git a/client/packages/openblocks/src/components/ApplicationSelect.tsx b/client/packages/openblocks/src/components/ApplicationSelect.tsx index 65af40fe0..fd6cba8a6 100644 --- a/client/packages/openblocks/src/components/ApplicationSelect.tsx +++ b/client/packages/openblocks/src/components/ApplicationSelect.tsx @@ -1,5 +1,5 @@ import { AppTypeEnum } from "constants/applicationConstants"; -import { Dropdown } from "openblocks-design"; +import { Dropdown } from "lowcoder-design"; import { trans } from "i18n"; import { ReactNode, useEffect } from "react"; import { useApplicationId } from "util/hooks"; diff --git a/client/packages/openblocks/src/components/CompName.tsx b/client/packages/openblocks/src/components/CompName.tsx index 647254fe5..400d85895 100644 --- a/client/packages/openblocks/src/components/CompName.tsx +++ b/client/packages/openblocks/src/components/CompName.tsx @@ -1,11 +1,11 @@ import { useContext, useEffect, useState } from "react"; import styled from "styled-components"; -import { EditPopoverItemType, PointIcon, Search, SearchOutlinedIcon } from "openblocks-design"; -import { EditPopover } from "openblocks-design"; +import { EditPopoverItemType, PointIcon, Search, SearchOutlinedIcon } from "lowcoder-design"; +import { EditPopover } from "lowcoder-design"; import { EditorContext } from "comps/editorState"; import { GridCompOperator } from "comps/utils/gridCompOperator"; -import { PopupCard } from "openblocks-design"; -import { EditText } from "openblocks-design"; +import { PopupCard } from "lowcoder-design"; +import { EditText } from "lowcoder-design"; import { values } from "lodash"; import { GreyTextColor } from "constants/style"; import { UICompType } from "comps/uiCompRegistry"; diff --git a/client/packages/openblocks/src/components/EmptyContent.tsx b/client/packages/openblocks/src/components/EmptyContent.tsx index c0b8dc66e..5202dae4c 100644 --- a/client/packages/openblocks/src/components/EmptyContent.tsx +++ b/client/packages/openblocks/src/components/EmptyContent.tsx @@ -1,4 +1,4 @@ -import { labelCss } from "openblocks-design"; +import { labelCss } from "lowcoder-design"; import { HTMLAttributes } from "react"; import styled from "styled-components"; diff --git a/client/packages/openblocks/src/components/EmptyItem.tsx b/client/packages/openblocks/src/components/EmptyItem.tsx index ea1fc742b..5f36d84f4 100644 --- a/client/packages/openblocks/src/components/EmptyItem.tsx +++ b/client/packages/openblocks/src/components/EmptyItem.tsx @@ -1,4 +1,4 @@ -import { labelCss } from "openblocks-design"; +import { labelCss } from "lowcoder-design"; import { PropsWithChildren } from "react"; import styled from "styled-components"; diff --git a/client/packages/openblocks/src/components/InputList.tsx b/client/packages/openblocks/src/components/InputList.tsx index c91b6a93f..03ebecf8c 100644 --- a/client/packages/openblocks/src/components/InputList.tsx +++ b/client/packages/openblocks/src/components/InputList.tsx @@ -1,10 +1,10 @@ import { Form } from "antd"; import { FormListProps, Rule } from "antd/lib/form"; -import { TacoButton } from "openblocks-design"; -import { Input } from "openblocks-design"; +import { TacoButton } from "lowcoder-design"; +import { Input } from "lowcoder-design"; import styled from "styled-components"; import LinkPlusButton from "./LinkPlusButton"; -import { BluePlusIcon } from "openblocks-design"; +import { BluePlusIcon } from "lowcoder-design"; import { useEffect } from "react"; import { useForm } from "antd/lib/form/Form"; import { trans } from "i18n"; diff --git a/client/packages/openblocks/src/components/KeyValueItemList.tsx b/client/packages/openblocks/src/components/KeyValueItemList.tsx index 71fb6dd58..a09f6d175 100644 --- a/client/packages/openblocks/src/components/KeyValueItemList.tsx +++ b/client/packages/openblocks/src/components/KeyValueItemList.tsx @@ -12,7 +12,7 @@ import { EditPopoverProps, PointIcon, SimplePopover, -} from "openblocks-design"; +} from "lowcoder-design"; import { trans } from "i18n"; import { Children, PropsWithChildren, ReactNode, useState } from "react"; import styled from "styled-components"; diff --git a/client/packages/openblocks/src/components/LinkPlusButton.tsx b/client/packages/openblocks/src/components/LinkPlusButton.tsx index 63f300297..1085d861f 100644 --- a/client/packages/openblocks/src/components/LinkPlusButton.tsx +++ b/client/packages/openblocks/src/components/LinkPlusButton.tsx @@ -1,4 +1,4 @@ -import { TacoButton } from "openblocks-design"; +import { TacoButton } from "lowcoder-design"; import { PropsWithChildren, ReactNode } from "react"; import styled from "styled-components"; diff --git a/client/packages/openblocks/src/components/PermissionDialog/Permission.tsx b/client/packages/openblocks/src/components/PermissionDialog/Permission.tsx index 3c2e680f0..4fff667fc 100644 --- a/client/packages/openblocks/src/components/PermissionDialog/Permission.tsx +++ b/client/packages/openblocks/src/components/PermissionDialog/Permission.tsx @@ -4,7 +4,7 @@ import { CommonTextLabel, CustomSelect, TacoButton, -} from "openblocks-design"; +} from "lowcoder-design"; import { useEffect, useRef, useState } from "react"; import styled from "styled-components"; import ProfileImage from "pages/common/profileImage"; diff --git a/client/packages/openblocks/src/components/PermissionDialog/PermissionList.tsx b/client/packages/openblocks/src/components/PermissionDialog/PermissionList.tsx index 5953956db..e88541dfd 100644 --- a/client/packages/openblocks/src/components/PermissionDialog/PermissionList.tsx +++ b/client/packages/openblocks/src/components/PermissionDialog/PermissionList.tsx @@ -5,7 +5,7 @@ import { CommonGrayLabel, CommonTextLabel, CustomSelect, -} from "openblocks-design"; +} from "lowcoder-design"; import { PermissionItemName, RoleSelectOption, diff --git a/client/packages/openblocks/src/components/PermissionDialog/commonComponents.tsx b/client/packages/openblocks/src/components/PermissionDialog/commonComponents.tsx index 6ba925494..4ec71c83f 100644 --- a/client/packages/openblocks/src/components/PermissionDialog/commonComponents.tsx +++ b/client/packages/openblocks/src/components/PermissionDialog/commonComponents.tsx @@ -1,5 +1,5 @@ import styled from "styled-components"; -import { AdminIcon, CustomSelect, GroupIcon, WhiteLoading } from "openblocks-design"; +import { AdminIcon, CustomSelect, GroupIcon, WhiteLoading } from "lowcoder-design"; import React from "react"; export const StyledRoleSelect = styled(CustomSelect)` diff --git a/client/packages/openblocks/src/components/ResCreatePanel.tsx b/client/packages/openblocks/src/components/ResCreatePanel.tsx index 2b9cf19b2..f76763705 100644 --- a/client/packages/openblocks/src/components/ResCreatePanel.tsx +++ b/client/packages/openblocks/src/components/ResCreatePanel.tsx @@ -1,4 +1,4 @@ -import { AddIcon, CloseIcon, CustomModalProps, ImportIconV2, ScrollBar } from "openblocks-design"; +import { AddIcon, CloseIcon, CustomModalProps, ImportIconV2, ScrollBar } from "lowcoder-design"; import { BottomShadow, GreyTextColor, TabActiveColor } from "constants/style"; import { trans } from "i18n"; import _, { noop } from "lodash"; diff --git a/client/packages/openblocks/src/components/StepModal.tsx b/client/packages/openblocks/src/components/StepModal.tsx index 0d3f0aec0..13d08319b 100644 --- a/client/packages/openblocks/src/components/StepModal.tsx +++ b/client/packages/openblocks/src/components/StepModal.tsx @@ -1,5 +1,5 @@ -import { CustomModal } from "openblocks-design"; -import { CustomModalProps } from "openblocks-design"; +import { CustomModal } from "lowcoder-design"; +import { CustomModalProps } from "lowcoder-design"; import { ReactNode, useState } from "react"; interface StepRenderProps { diff --git a/client/packages/openblocks/src/components/table/EditableCell.tsx b/client/packages/openblocks/src/components/table/EditableCell.tsx index b110cb330..9955438b2 100644 --- a/client/packages/openblocks/src/components/table/EditableCell.tsx +++ b/client/packages/openblocks/src/components/table/EditableCell.tsx @@ -1,7 +1,7 @@ import { PresetStatusColorType } from "antd/es/_util/colors"; import _ from "lodash"; import { changeChildAction, DispatchType } from "lowcoder-core"; -import { constantColors } from "openblocks-design"; +import { constantColors } from "lowcoder-design"; import React, { ReactNode, useCallback, useContext, useEffect, useMemo, useState } from "react"; import styled from "styled-components"; import { JSONValue } from "util/jsonTypes"; diff --git a/client/packages/openblocks/src/comps/comps/appSettingsComp.tsx b/client/packages/openblocks/src/comps/comps/appSettingsComp.tsx index 2a297e305..feb65a879 100644 --- a/client/packages/openblocks/src/comps/comps/appSettingsComp.tsx +++ b/client/packages/openblocks/src/comps/comps/appSettingsComp.tsx @@ -2,7 +2,7 @@ import { ThemeDetail, ThemeType } from "api/commonSettingApi"; import { RecordConstructorToComp } from "lowcoder-core"; import { dropdownInputSimpleControl } from "comps/controls/dropdownInputSimpleControl"; import { MultiCompBuilder, valueComp } from "comps/generators"; -import { AddIcon, Dropdown } from "openblocks-design"; +import { AddIcon, Dropdown } from "lowcoder-design"; import { EllipsisSpan } from "pages/setting/theme/styledComponents"; import { useEffect } from "react"; import { useSelector } from "react-redux"; diff --git a/client/packages/openblocks/src/comps/comps/buttonComp/buttonComp.tsx b/client/packages/openblocks/src/comps/comps/buttonComp/buttonComp.tsx index 235456e8f..c554a733a 100644 --- a/client/packages/openblocks/src/comps/comps/buttonComp/buttonComp.tsx +++ b/client/packages/openblocks/src/comps/comps/buttonComp/buttonComp.tsx @@ -10,7 +10,7 @@ import { hiddenPropertyView, loadingPropertyView, } from "comps/utils/propertyUtils"; -import { CommonBlueLabel, controlItem, Dropdown, Section, sectionNames } from "openblocks-design"; +import { CommonBlueLabel, controlItem, Dropdown, Section, sectionNames } from "lowcoder-design"; import { trans } from "i18n"; import styled from "styled-components"; import { CommonNameConfig, NameConfig, withExposingConfigs } from "../../generators/withExposing"; diff --git a/client/packages/openblocks/src/comps/comps/buttonComp/buttonCompConstants.tsx b/client/packages/openblocks/src/comps/comps/buttonComp/buttonCompConstants.tsx index cf1e743ee..496408803 100644 --- a/client/packages/openblocks/src/comps/comps/buttonComp/buttonCompConstants.tsx +++ b/client/packages/openblocks/src/comps/comps/buttonComp/buttonCompConstants.tsx @@ -3,7 +3,7 @@ import { styleControl } from "comps/controls/styleControl"; import { ButtonStyleType, ButtonStyle } from "comps/controls/styleControlConstants"; import { migrateOldData } from "comps/generators/simpleGenerators"; import styled, { css } from "styled-components"; -import { genActiveColor, genHoverColor } from "openblocks-design"; +import { genActiveColor, genHoverColor } from "lowcoder-design"; import { refMethods } from "comps/generators/withMethodExposing"; import { blurMethod, clickMethod, focusWithOptions } from "comps/utils/methodUtils"; diff --git a/client/packages/openblocks/src/comps/comps/buttonComp/dropdownComp.tsx b/client/packages/openblocks/src/comps/comps/buttonComp/dropdownComp.tsx index a3036a68a..a6405d6b5 100644 --- a/client/packages/openblocks/src/comps/comps/buttonComp/dropdownComp.tsx +++ b/client/packages/openblocks/src/comps/comps/buttonComp/dropdownComp.tsx @@ -5,7 +5,7 @@ import { ButtonStyleType } from "comps/controls/styleControlConstants"; import { withDefault } from "comps/generators"; import { UICompBuilder } from "comps/generators/uiCompBuilder"; import { disabledPropertyView, hiddenPropertyView } from "comps/utils/propertyUtils"; -import { Section, sectionNames } from "openblocks-design"; +import { Section, sectionNames } from "lowcoder-design"; import { trans } from "i18n"; import React, { ReactElement } from "react"; import styled from "styled-components"; diff --git a/client/packages/openblocks/src/comps/comps/buttonComp/linkComp.tsx b/client/packages/openblocks/src/comps/comps/buttonComp/linkComp.tsx index 890c70d5c..d0e3bc517 100644 --- a/client/packages/openblocks/src/comps/comps/buttonComp/linkComp.tsx +++ b/client/packages/openblocks/src/comps/comps/buttonComp/linkComp.tsx @@ -7,7 +7,7 @@ import { LinkStyle, LinkStyleType } from "comps/controls/styleControlConstants"; import { withDefault } from "comps/generators"; import { migrateOldData } from "comps/generators/simpleGenerators"; import { UICompBuilder } from "comps/generators/uiCompBuilder"; -import { Section, sectionNames } from "openblocks-design"; +import { Section, sectionNames } from "lowcoder-design"; import styled from "styled-components"; import { CommonNameConfig, NameConfig, withExposingConfigs } from "../../generators/withExposing"; import { diff --git a/client/packages/openblocks/src/comps/comps/buttonComp/scannerComp.tsx b/client/packages/openblocks/src/comps/comps/buttonComp/scannerComp.tsx index 789f5c7fc..533c5df11 100644 --- a/client/packages/openblocks/src/comps/comps/buttonComp/scannerComp.tsx +++ b/client/packages/openblocks/src/comps/comps/buttonComp/scannerComp.tsx @@ -10,7 +10,7 @@ import { styleControl } from "comps/controls/styleControl"; import { ButtonStyle } from "comps/controls/styleControlConstants"; import { withDefault } from "comps/generators"; import { UICompBuilder } from "comps/generators/uiCompBuilder"; -import { CustomModal, Section, sectionNames } from "openblocks-design"; +import { CustomModal, Section, sectionNames } from "lowcoder-design"; import styled from "styled-components"; import { CommonNameConfig, NameConfig, withExposingConfigs } from "../../generators/withExposing"; import { hiddenPropertyView, disabledPropertyView } from "comps/utils/propertyUtils"; diff --git a/client/packages/openblocks/src/comps/comps/buttonComp/toggleButtonComp.tsx b/client/packages/openblocks/src/comps/comps/buttonComp/toggleButtonComp.tsx index fd4ad0946..7603ee9c8 100644 --- a/client/packages/openblocks/src/comps/comps/buttonComp/toggleButtonComp.tsx +++ b/client/packages/openblocks/src/comps/comps/buttonComp/toggleButtonComp.tsx @@ -6,7 +6,7 @@ import { hiddenPropertyView, loadingPropertyView, } from "comps/utils/propertyUtils"; -import { Section, sectionNames } from "openblocks-design"; +import { Section, sectionNames } from "lowcoder-design"; import { trans } from "i18n"; import styled from "styled-components"; import { ChangeEventHandlerControl } from "../../controls/eventHandlerControl"; diff --git a/client/packages/openblocks/src/comps/comps/carouselComp.tsx b/client/packages/openblocks/src/comps/comps/carouselComp.tsx index 1697f618d..0356f8940 100644 --- a/client/packages/openblocks/src/comps/comps/carouselComp.tsx +++ b/client/packages/openblocks/src/comps/comps/carouselComp.tsx @@ -1,5 +1,5 @@ import { Carousel } from "antd"; -import { Section, sectionNames } from "openblocks-design"; +import { Section, sectionNames } from "lowcoder-design"; import { BoolControl } from "../controls/boolControl"; import { UICompBuilder, withDefault } from "../generators"; import { NameConfig, NameConfigHidden, withExposingConfigs } from "../generators/withExposing"; diff --git a/client/packages/openblocks/src/comps/comps/containerComp/containerComp.tsx b/client/packages/openblocks/src/comps/comps/containerComp/containerComp.tsx index 0b01dd7ff..e2b85b9c5 100644 --- a/client/packages/openblocks/src/comps/comps/containerComp/containerComp.tsx +++ b/client/packages/openblocks/src/comps/comps/containerComp/containerComp.tsx @@ -2,7 +2,7 @@ import { CompParams } from "lowcoder-core"; import { ToDataType } from "comps/generators/multi"; import { NameConfigHidden, withExposingConfigs } from "comps/generators/withExposing"; import { NameGenerator } from "comps/utils/nameGenerator"; -import { Section, sectionNames } from "openblocks-design"; +import { Section, sectionNames } from "lowcoder-design"; import { oldContainerParamsToNew } from "../containerBase"; import { toSimpleContainerData } from "../containerBase/simpleContainerComp"; import { TriContainer } from "../triContainerComp/triContainer"; diff --git a/client/packages/openblocks/src/comps/comps/customComp/customComp.tsx b/client/packages/openblocks/src/comps/comps/customComp/customComp.tsx index 77141e45e..4f31d0374 100644 --- a/client/packages/openblocks/src/comps/comps/customComp/customComp.tsx +++ b/client/packages/openblocks/src/comps/comps/customComp/customComp.tsx @@ -4,7 +4,7 @@ import { StringControl } from "comps/controls/codeControl"; import { jsonObjectStateControl } from "comps/controls/codeStateControl"; import { UICompBuilder, withDefault } from "comps/generators"; import { NameConfig, NameConfigHidden, withExposingConfigs } from "comps/generators/withExposing"; -import { Section, sectionNames } from "openblocks-design"; +import { Section, sectionNames } from "lowcoder-design"; import { useEffect, useRef } from "react"; import styled from "styled-components"; import { getPromiseAfterDispatch } from "util/promiseUtils"; diff --git a/client/packages/openblocks/src/comps/comps/customShortcutsComp.tsx b/client/packages/openblocks/src/comps/comps/customShortcutsComp.tsx index 394e5e1c8..0defb6fde 100644 --- a/client/packages/openblocks/src/comps/comps/customShortcutsComp.tsx +++ b/client/packages/openblocks/src/comps/comps/customShortcutsComp.tsx @@ -2,7 +2,7 @@ import { ActionSelectorControl } from "comps/controls/actionSelector/actionSelec import { MultiCompBuilder, valueComp } from "comps/generators"; import { KeyValueItem, KeyValueItemListWithNewCreateState } from "components/KeyValueItemList"; import { list } from "comps/generators/list"; -import { StyledInput } from "openblocks-design"; +import { StyledInput } from "lowcoder-design"; import { trans } from "i18n"; import { eventKeyString, diff --git a/client/packages/openblocks/src/comps/comps/dataChangeResponderComp.tsx b/client/packages/openblocks/src/comps/comps/dataChangeResponderComp.tsx index e315be8b7..d4c824d19 100644 --- a/client/packages/openblocks/src/comps/comps/dataChangeResponderComp.tsx +++ b/client/packages/openblocks/src/comps/comps/dataChangeResponderComp.tsx @@ -13,7 +13,7 @@ import { QueryConfigWrapper, QueryPropertyViewWrapper, QuerySectionWrapper, -} from "openblocks-design"; +} from "lowcoder-design"; import { BottomTabs } from "pages/editor/bottom/BottomTabs"; import { ReactNode } from "react"; import { BottomResComp, BottomResCompResult, BottomResTypeEnum } from "types/bottomRes"; diff --git a/client/packages/openblocks/src/comps/comps/dividerComp.tsx b/client/packages/openblocks/src/comps/comps/dividerComp.tsx index 3b766dc2d..1da6f8d2d 100644 --- a/client/packages/openblocks/src/comps/comps/dividerComp.tsx +++ b/client/packages/openblocks/src/comps/comps/dividerComp.tsx @@ -4,7 +4,7 @@ import { BoolControl } from "comps/controls/boolControl"; import { alignControl } from "comps/controls/alignControl"; import { UICompBuilder } from "comps/generators"; import { NameConfig, NameConfigHidden } from "comps/generators/withExposing"; -import { Section, sectionNames } from "openblocks-design"; +import { Section, sectionNames } from "lowcoder-design"; import _ from "lodash"; import styled from "styled-components"; import { styleControl } from "comps/controls/styleControl"; diff --git a/client/packages/openblocks/src/comps/comps/fileViewerComp.tsx b/client/packages/openblocks/src/comps/comps/fileViewerComp.tsx index 48c2f0870..8952c63a5 100644 --- a/client/packages/openblocks/src/comps/comps/fileViewerComp.tsx +++ b/client/packages/openblocks/src/comps/comps/fileViewerComp.tsx @@ -4,7 +4,7 @@ import { isEmpty } from "lodash"; import { useState } from "react"; import { DocumentViewer } from "react-documents"; import styled, { css } from "styled-components"; -import { Section, sectionNames } from "openblocks-design"; +import { Section, sectionNames } from "lowcoder-design"; import { StringControl } from "../controls/codeControl"; import { UICompBuilder } from "../generators"; import { NameConfig, NameConfigHidden, withExposingConfigs } from "../generators/withExposing"; diff --git a/client/packages/openblocks/src/comps/comps/formComp/createForm.tsx b/client/packages/openblocks/src/comps/comps/formComp/createForm.tsx index 1570e6ca4..5b33e0ba2 100644 --- a/client/packages/openblocks/src/comps/comps/formComp/createForm.tsx +++ b/client/packages/openblocks/src/comps/comps/formComp/createForm.tsx @@ -8,7 +8,7 @@ import { labelCss, ModalFooterWrapper, TacoButton, -} from "openblocks-design"; +} from "lowcoder-design"; import _ from "lodash"; import { useEffect, useState } from "react"; import { useDispatch, useSelector } from "react-redux"; diff --git a/client/packages/openblocks/src/comps/comps/formComp/formComp.tsx b/client/packages/openblocks/src/comps/comps/formComp/formComp.tsx index a12b274e9..2be7eaac9 100644 --- a/client/packages/openblocks/src/comps/comps/formComp/formComp.tsx +++ b/client/packages/openblocks/src/comps/comps/formComp/formComp.tsx @@ -4,11 +4,11 @@ import { NameConfig, withExposingConfigs, } from "comps/generators/withExposing"; -import { Section, sectionNames } from "openblocks-design"; +import { Section, sectionNames } from "lowcoder-design"; import { genQueryId } from "comps/utils/idGenerator"; import { CompNameContext, EditorContext, EditorState } from "comps/editorState"; import { withMethodExposing } from "comps/generators/withMethodExposing"; -import { ContainerPlaceholder } from "openblocks-design"; +import { ContainerPlaceholder } from "lowcoder-design"; import { CompAction, CompActionTypes, diff --git a/client/packages/openblocks/src/comps/comps/formComp/formDataConstants.tsx b/client/packages/openblocks/src/comps/comps/formComp/formDataConstants.tsx index e5c87bec5..fae531ae0 100644 --- a/client/packages/openblocks/src/comps/comps/formComp/formDataConstants.tsx +++ b/client/packages/openblocks/src/comps/comps/formComp/formDataConstants.tsx @@ -1,7 +1,7 @@ import { RecordConstructorToComp } from "lowcoder-core"; import { StringControl } from "comps/controls/codeControl"; import { CompNameContext, EditorContext } from "comps/editorState"; -import { Section } from "openblocks-design"; +import { Section } from "lowcoder-design"; import { ReactNode } from "react"; import { trans } from "i18n"; diff --git a/client/packages/openblocks/src/comps/comps/gridItemComp.tsx b/client/packages/openblocks/src/comps/comps/gridItemComp.tsx index 24354ed11..5fb1e0b64 100644 --- a/client/packages/openblocks/src/comps/comps/gridItemComp.tsx +++ b/client/packages/openblocks/src/comps/comps/gridItemComp.tsx @@ -17,7 +17,7 @@ import { ExposingInfo } from "comps/utils/exposingTypes"; import { getReduceContext, WithParamsContext } from "comps/utils/reduceContext"; import { parseCompType } from "comps/utils/remote"; import { Comp, CompAction, ConstructorToDataType } from "lowcoder-core"; -import { ScrollBar, SearchTextContext } from "openblocks-design"; +import { ScrollBar, SearchTextContext } from "lowcoder-design"; import React, { Profiler, useContext, useEffect, useMemo, useState } from "react"; import { profilerCallback } from "util/cacheUtils"; import { setFieldsNoTypeCheck, shallowEqual } from "util/objectUtils"; diff --git a/client/packages/openblocks/src/comps/comps/iframeComp.tsx b/client/packages/openblocks/src/comps/comps/iframeComp.tsx index dd2ad0cd4..d8ab72d35 100644 --- a/client/packages/openblocks/src/comps/comps/iframeComp.tsx +++ b/client/packages/openblocks/src/comps/comps/iframeComp.tsx @@ -1,5 +1,5 @@ import { UICompBuilder, withDefault } from "../generators"; -import { Section, sectionNames } from "openblocks-design"; +import { Section, sectionNames } from "lowcoder-design"; import { StringControl } from "../controls/codeControl"; import { BoolControl } from "../controls/boolControl"; import styled from "styled-components"; diff --git a/client/packages/openblocks/src/comps/comps/imageComp.tsx b/client/packages/openblocks/src/comps/comps/imageComp.tsx index 64e850f49..297d97f45 100644 --- a/client/packages/openblocks/src/comps/comps/imageComp.tsx +++ b/client/packages/openblocks/src/comps/comps/imageComp.tsx @@ -1,5 +1,5 @@ import styled, { css } from "styled-components"; -import { Section, sectionNames } from "openblocks-design"; +import { Section, sectionNames } from "lowcoder-design"; import { clickEvent, eventHandlerControl } from "../controls/eventHandlerControl"; import { StringStateControl } from "../controls/codeStateControl"; import { UICompBuilder, withDefault } from "../generators"; diff --git a/client/packages/openblocks/src/comps/comps/jsonComp/jsonEditorComp.tsx b/client/packages/openblocks/src/comps/comps/jsonComp/jsonEditorComp.tsx index 2b29e3e9b..a46fa328c 100644 --- a/client/packages/openblocks/src/comps/comps/jsonComp/jsonEditorComp.tsx +++ b/client/packages/openblocks/src/comps/comps/jsonComp/jsonEditorComp.tsx @@ -1,4 +1,4 @@ -import { Section, sectionNames } from "openblocks-design"; +import { Section, sectionNames } from "lowcoder-design"; import { UICompBuilder } from "../../generators"; import { NameConfigHidden, NameConfig, withExposingConfigs } from "../../generators/withExposing"; import { defaultData } from "./jsonConstants"; diff --git a/client/packages/openblocks/src/comps/comps/jsonComp/jsonExplorerComp.tsx b/client/packages/openblocks/src/comps/comps/jsonComp/jsonExplorerComp.tsx index c93cd5944..50babe510 100644 --- a/client/packages/openblocks/src/comps/comps/jsonComp/jsonExplorerComp.tsx +++ b/client/packages/openblocks/src/comps/comps/jsonComp/jsonExplorerComp.tsx @@ -1,4 +1,4 @@ -import { Section, sectionNames } from "openblocks-design"; +import { Section, sectionNames } from "lowcoder-design"; import { UICompBuilder, withDefault } from "../../generators"; import { NameConfigHidden, NameConfig, withExposingConfigs } from "../../generators/withExposing"; import ReactJson, { ThemeKeys } from "react-json-view"; diff --git a/client/packages/openblocks/src/comps/comps/jsonSchemaFormComp/jsonSchemaFormComp.tsx b/client/packages/openblocks/src/comps/comps/jsonSchemaFormComp/jsonSchemaFormComp.tsx index 853828f8c..c67800ffb 100644 --- a/client/packages/openblocks/src/comps/comps/jsonSchemaFormComp/jsonSchemaFormComp.tsx +++ b/client/packages/openblocks/src/comps/comps/jsonSchemaFormComp/jsonSchemaFormComp.tsx @@ -6,13 +6,13 @@ import { styleControl } from "comps/controls/styleControl"; import { JsonSchemaFormStyle, JsonSchemaFormStyleType } from "comps/controls/styleControlConstants"; import { depsConfig, NameConfigHidden, withExposingConfigs } from "comps/generators/withExposing"; import { withMethodExposing } from "comps/generators/withMethodExposing"; -import { ValueFromOption } from "openblocks-design"; +import { ValueFromOption } from "lowcoder-design"; import { i18n } from "lowcoder-core"; import { i18nObjs, trans } from "i18n"; import { JSONSchema7 } from "json-schema"; import styled from "styled-components"; import { toBoolean, toNumber, toString } from "util/convertUtils"; -import { Section, sectionNames } from "openblocks-design"; +import { Section, sectionNames } from "lowcoder-design"; import { jsonObjectControl } from "../../controls/codeControl"; import { eventHandlerControl, submitEvent } from "../../controls/eventHandlerControl"; import { UICompBuilder } from "../../generators"; diff --git a/client/packages/openblocks/src/comps/comps/layout/navLayout.tsx b/client/packages/openblocks/src/comps/comps/layout/navLayout.tsx index f5878d39a..5e8d47320 100644 --- a/client/packages/openblocks/src/comps/comps/layout/navLayout.tsx +++ b/client/packages/openblocks/src/comps/comps/layout/navLayout.tsx @@ -8,7 +8,7 @@ import { withDispatchHook } from "comps/generators/withDispatchHook"; import { NameAndExposingInfo } from "comps/utils/exposingTypes"; import { ALL_APPLICATIONS_URL } from "constants/routesURL"; import { TopHeaderHeight } from "constants/style"; -import { Section } from "openblocks-design"; +import { Section } from "lowcoder-design"; import { trans } from "i18n"; import { EditorContainer, EmptyContent } from "pages/common/styledComponent"; import { useCallback, useEffect, useMemo, useState } from "react"; diff --git a/client/packages/openblocks/src/comps/comps/listViewComp/listView.tsx b/client/packages/openblocks/src/comps/comps/listViewComp/listView.tsx index 0e547eb7d..10bcefa55 100644 --- a/client/packages/openblocks/src/comps/comps/listViewComp/listView.tsx +++ b/client/packages/openblocks/src/comps/comps/listViewComp/listView.tsx @@ -3,7 +3,7 @@ import { EditorContext } from "comps/editorState"; import { BackgroundColorContext } from "comps/utils/backgroundColorContext"; import _ from "lodash"; import { ConstructorToView, deferAction } from "lowcoder-core"; -import { HintPlaceHolder, pageItemRender } from "openblocks-design"; +import { HintPlaceHolder, pageItemRender } from "lowcoder-design"; import { RefObject, useContext, useEffect, useMemo, useRef } from "react"; import ReactResizeDetector from "react-resize-detector"; import styled from "styled-components"; diff --git a/client/packages/openblocks/src/comps/comps/listViewComp/listViewPropertyView.tsx b/client/packages/openblocks/src/comps/comps/listViewComp/listViewPropertyView.tsx index dbbd2b343..d9c712dbb 100644 --- a/client/packages/openblocks/src/comps/comps/listViewComp/listViewPropertyView.tsx +++ b/client/packages/openblocks/src/comps/comps/listViewComp/listViewPropertyView.tsx @@ -1,5 +1,5 @@ import { trans, transToNode } from "i18n"; -import { Section, sectionNames } from "openblocks-design"; +import { Section, sectionNames } from "lowcoder-design"; import { ListViewImplComp } from "./listViewComp"; import { ListCompType } from "./listViewUtils"; diff --git a/client/packages/openblocks/src/comps/comps/mediaComp/audioComp.tsx b/client/packages/openblocks/src/comps/comps/mediaComp/audioComp.tsx index 98ff123f0..4c9ce8e10 100644 --- a/client/packages/openblocks/src/comps/comps/mediaComp/audioComp.tsx +++ b/client/packages/openblocks/src/comps/comps/mediaComp/audioComp.tsx @@ -1,5 +1,5 @@ import styled from "styled-components"; -import { Section, sectionNames } from "openblocks-design"; +import { Section, sectionNames } from "lowcoder-design"; import { eventHandlerControl } from "../../controls/eventHandlerControl"; import { StringStateControl } from "../../controls/codeStateControl"; import { UICompBuilder } from "../../generators"; @@ -7,7 +7,7 @@ import { NameConfig, NameConfigHidden, withExposingConfigs } from "../../generat import { RecordConstructorToView } from "lowcoder-core"; import { styleControl } from "comps/controls/styleControl"; import { ImageStyle } from "comps/controls/styleControlConstants"; -import { TacoAudio } from "openblocks-design"; +import { TacoAudio } from "lowcoder-design"; import { BoolControl } from "comps/controls/boolControl"; import { withDefault } from "../../generators/simpleGenerators"; import { trans } from "i18n"; diff --git a/client/packages/openblocks/src/comps/comps/mediaComp/videoComp.tsx b/client/packages/openblocks/src/comps/comps/mediaComp/videoComp.tsx index db50e35aa..a97d34014 100644 --- a/client/packages/openblocks/src/comps/comps/mediaComp/videoComp.tsx +++ b/client/packages/openblocks/src/comps/comps/mediaComp/videoComp.tsx @@ -1,4 +1,4 @@ -import { Section, sectionNames } from "openblocks-design"; +import { Section, sectionNames } from "lowcoder-design"; import { eventHandlerControl } from "../../controls/eventHandlerControl"; import { StringStateControl, numberExposingStateControl } from "../../controls/codeStateControl"; import { UICompBuilder } from "../../generators"; @@ -9,11 +9,11 @@ import { styleControl } from "comps/controls/styleControl"; import { ImageStyle } from "comps/controls/styleControlConstants"; import { BoolControl } from "comps/controls/boolControl"; import { withDefault } from "../../generators/simpleGenerators"; -import { Container, playIcon } from "openblocks-design"; +import { Container, playIcon } from "lowcoder-design"; import { RangeControl } from "../../controls/codeControl"; import { hiddenPropertyView } from "comps/utils/propertyUtils"; import { trans } from "i18n"; -import { Video } from "openblocks-design"; +import { Video } from "lowcoder-design"; import ReactPlayer from "react-player"; import { mediaCommonChildren, mediaMethods } from "./mediaUtils"; diff --git a/client/packages/openblocks/src/comps/comps/moduleComp/moduleComp.tsx b/client/packages/openblocks/src/comps/comps/moduleComp/moduleComp.tsx index acb7f6c8f..5534bd43b 100644 --- a/client/packages/openblocks/src/comps/comps/moduleComp/moduleComp.tsx +++ b/client/packages/openblocks/src/comps/comps/moduleComp/moduleComp.tsx @@ -22,7 +22,7 @@ import { getReduceContext, PartialReduceContext, reduceInContext } from "comps/u import { API_STATUS_CODES } from "constants/apiConstants"; import { AppTypeEnum } from "constants/applicationConstants"; import { GreyTextColor } from "constants/style"; -import { Section, sectionNames } from "openblocks-design"; +import { Section, sectionNames } from "lowcoder-design"; import { ReactNode, useEffect, useMemo } from "react"; import styled from "styled-components"; import { diff --git a/client/packages/openblocks/src/comps/comps/moduleComp/moduleInputComp.tsx b/client/packages/openblocks/src/comps/comps/moduleComp/moduleInputComp.tsx index 5230ee96c..6b40aedc5 100644 --- a/client/packages/openblocks/src/comps/comps/moduleComp/moduleInputComp.tsx +++ b/client/packages/openblocks/src/comps/comps/moduleComp/moduleInputComp.tsx @@ -8,7 +8,7 @@ import { Node } from "lowcoder-core"; import { Fragment, ReactNode } from "react"; import { setFieldsNoTypeCheck } from "util/objectUtils"; import { inputControls, InputTypeEnum } from "../moduleContainerComp/ioComp/inputListItemComp"; -import { controlItem, ControlNode } from "openblocks-design"; +import { controlItem, ControlNode } from "lowcoder-design"; interface InputItem { name: string; diff --git a/client/packages/openblocks/src/comps/comps/moduleContainerComp/ioComp/inputListComp.tsx b/client/packages/openblocks/src/comps/comps/moduleContainerComp/ioComp/inputListComp.tsx index 7db286d0e..cc4a1d5cd 100644 --- a/client/packages/openblocks/src/comps/comps/moduleContainerComp/ioComp/inputListComp.tsx +++ b/client/packages/openblocks/src/comps/comps/moduleContainerComp/ioComp/inputListComp.tsx @@ -7,7 +7,7 @@ import { EditorContext } from "comps/editorState"; import { list } from "comps/generators/list"; import { trans } from "i18n"; import { multiChangeAction } from "lowcoder-core"; -import { controlItem, Section } from "openblocks-design"; +import { controlItem, Section } from "lowcoder-design"; import { useContext } from "react"; import InputListItemComp, { getInputOptionLabel, InputTypeEnum } from "./inputListItemComp"; diff --git a/client/packages/openblocks/src/comps/comps/moduleContainerComp/ioComp/inputListItemComp.tsx b/client/packages/openblocks/src/comps/comps/moduleContainerComp/ioComp/inputListItemComp.tsx index d18668ffc..759214308 100644 --- a/client/packages/openblocks/src/comps/comps/moduleContainerComp/ioComp/inputListItemComp.tsx +++ b/client/packages/openblocks/src/comps/comps/moduleContainerComp/ioComp/inputListItemComp.tsx @@ -29,7 +29,7 @@ import { Fragment, useEffect } from "react"; import { setFieldsNoTypeCheck } from "util/objectUtils"; import { handlePromiseAndDispatch } from "util/promiseUtils"; import { trans } from "i18n"; -import { controlItem } from "openblocks-design"; +import { controlItem } from "lowcoder-design"; export enum InputTypeEnum { Data = "data", diff --git a/client/packages/openblocks/src/comps/comps/moduleContainerComp/moduleContainerComp.tsx b/client/packages/openblocks/src/comps/comps/moduleContainerComp/moduleContainerComp.tsx index a5f434306..61202f7f2 100644 --- a/client/packages/openblocks/src/comps/comps/moduleContainerComp/moduleContainerComp.tsx +++ b/client/packages/openblocks/src/comps/comps/moduleContainerComp/moduleContainerComp.tsx @@ -1,7 +1,7 @@ import { defaultTheme } from "comps/controls/styleControlConstants"; import { ThemeContext } from "comps/utils/themeContext"; import { BorderColor } from "constants/style"; -import { HintPlaceHolder } from "openblocks-design"; +import { HintPlaceHolder } from "lowcoder-design"; import _ from "lodash"; import { useContext, useRef } from "react"; import styled from "styled-components"; diff --git a/client/packages/openblocks/src/comps/comps/moduleContainerComp/moduleEventListComp.tsx b/client/packages/openblocks/src/comps/comps/moduleContainerComp/moduleEventListComp.tsx index 79d880536..8f990d174 100644 --- a/client/packages/openblocks/src/comps/comps/moduleContainerComp/moduleEventListComp.tsx +++ b/client/packages/openblocks/src/comps/comps/moduleContainerComp/moduleEventListComp.tsx @@ -7,7 +7,7 @@ import { simpleMultiComp, valueComp } from "comps/generators"; import { list } from "comps/generators/list"; import { NameGenerator } from "comps/utils"; import { NameAndExposingInfo } from "comps/utils/exposingTypes"; -import { controlItem, Section, Switch, SwitchWrapper } from "openblocks-design"; +import { controlItem, Section, Switch, SwitchWrapper } from "lowcoder-design"; import { trans } from "i18n"; import { ModuleEventListItemComp } from "./moduleEventListItemComp"; import { ConfigViewSection } from "./styled"; diff --git a/client/packages/openblocks/src/comps/comps/moduleContainerComp/moduleLayoutComp.tsx b/client/packages/openblocks/src/comps/comps/moduleContainerComp/moduleLayoutComp.tsx index 9d8181383..b5ada3b6e 100644 --- a/client/packages/openblocks/src/comps/comps/moduleContainerComp/moduleLayoutComp.tsx +++ b/client/packages/openblocks/src/comps/comps/moduleContainerComp/moduleLayoutComp.tsx @@ -11,7 +11,7 @@ import { CompAction, CompActionTypes } from "lowcoder-core"; import { ReactElement, useContext } from "react"; import { ExternalEditorContext } from "util/context/ExternalEditorContext"; import { JSONValue } from "util/jsonTypes"; -import { Section, sectionNames } from "openblocks-design"; +import { Section, sectionNames } from "lowcoder-design"; import { getAllCompItems, IContainer } from "../containerBase"; import { SimpleContainerComp } from "../containerBase/simpleContainerComp"; import { GridItemsType } from "../containerComp/containerView"; diff --git a/client/packages/openblocks/src/comps/comps/moduleContainerComp/moduleMethodListComp.tsx b/client/packages/openblocks/src/comps/comps/moduleContainerComp/moduleMethodListComp.tsx index c78774767..fd73f11f2 100644 --- a/client/packages/openblocks/src/comps/comps/moduleContainerComp/moduleMethodListComp.tsx +++ b/client/packages/openblocks/src/comps/comps/moduleContainerComp/moduleMethodListComp.tsx @@ -5,7 +5,7 @@ import { list } from "comps/generators/list"; import { NameGenerator } from "comps/utils"; import { GreyTextColor } from "constants/style"; import { trans } from "i18n"; -import { controlItem, Section, TacoButton } from "openblocks-design"; +import { controlItem, Section, TacoButton } from "lowcoder-design"; import styled from "styled-components"; import { ModuleMethodListItemComp, WithParamsActionControl } from "./moduleMethodListItemComp"; import ModuleMethodParamListComp from "./moduleMethodParamListComp"; diff --git a/client/packages/openblocks/src/comps/comps/moduleContainerComp/moduleMethodParamListComp.tsx b/client/packages/openblocks/src/comps/comps/moduleContainerComp/moduleMethodParamListComp.tsx index 27f7a55d4..332017c64 100644 --- a/client/packages/openblocks/src/comps/comps/moduleContainerComp/moduleMethodParamListComp.tsx +++ b/client/packages/openblocks/src/comps/comps/moduleContainerComp/moduleMethodParamListComp.tsx @@ -7,7 +7,7 @@ import { list } from "comps/generators/list"; import { NameGenerator } from "comps/utils/nameGenerator"; import { trans } from "i18n"; import { multiChangeAction } from "lowcoder-core"; -import { ControlPropertyViewWrapper } from "openblocks-design"; +import { ControlPropertyViewWrapper } from "lowcoder-design"; import { useEffect } from "react"; import ParamListItemComp, { getParamOptionLabel, diff --git a/client/packages/openblocks/src/comps/comps/navComp/components/DraggableItem.tsx b/client/packages/openblocks/src/comps/comps/navComp/components/DraggableItem.tsx index 8afe446ab..03e2f6bff 100644 --- a/client/packages/openblocks/src/comps/comps/navComp/components/DraggableItem.tsx +++ b/client/packages/openblocks/src/comps/comps/navComp/components/DraggableItem.tsx @@ -1,4 +1,4 @@ -import { DragIcon } from "openblocks-design"; +import { DragIcon } from "lowcoder-design"; import React, { Ref } from "react"; import { HTMLAttributes, ReactNode } from "react"; import styled from "styled-components"; diff --git a/client/packages/openblocks/src/comps/comps/navComp/components/MenuItem.tsx b/client/packages/openblocks/src/comps/comps/navComp/components/MenuItem.tsx index 4938cf3ba..db1e1aee6 100644 --- a/client/packages/openblocks/src/comps/comps/navComp/components/MenuItem.tsx +++ b/client/packages/openblocks/src/comps/comps/navComp/components/MenuItem.tsx @@ -1,6 +1,6 @@ import { ActiveTextColor, GreyTextColor } from "constants/style"; -import { EditPopover, SimplePopover } from "openblocks-design"; -import { PointIcon } from "openblocks-design"; +import { EditPopover, SimplePopover } from "lowcoder-design"; +import { PointIcon } from "lowcoder-design"; import React, { HTMLAttributes, useState } from "react"; import styled from "styled-components"; import DraggableItem from "./DraggableItem"; diff --git a/client/packages/openblocks/src/comps/comps/navComp/components/MenuItemList.tsx b/client/packages/openblocks/src/comps/comps/navComp/components/MenuItemList.tsx index 447c7687a..41f5e2cd6 100644 --- a/client/packages/openblocks/src/comps/comps/navComp/components/MenuItemList.tsx +++ b/client/packages/openblocks/src/comps/comps/navComp/components/MenuItemList.tsx @@ -1,6 +1,6 @@ import { DndContext, DragEndEvent, DragOverlay, DragStartEvent } from "@dnd-kit/core"; import LinkPlusButton from "components/LinkPlusButton"; -import { BluePlusIcon, controlItem } from "openblocks-design"; +import { BluePlusIcon, controlItem } from "lowcoder-design"; import { trans } from "i18n"; import _ from "lodash"; import { useState } from "react"; diff --git a/client/packages/openblocks/src/comps/comps/navComp/navComp.tsx b/client/packages/openblocks/src/comps/comps/navComp/navComp.tsx index a1e63fb22..5dea32b35 100644 --- a/client/packages/openblocks/src/comps/comps/navComp/navComp.tsx +++ b/client/packages/openblocks/src/comps/comps/navComp/navComp.tsx @@ -1,6 +1,6 @@ import { NameConfig, NameConfigHidden, withExposingConfigs } from "comps/generators/withExposing"; import { UICompBuilder, withDefault } from "comps/generators"; -import { Section, sectionNames } from "openblocks-design"; +import { Section, sectionNames } from "lowcoder-design"; import styled from "styled-components"; import { clickEvent, eventHandlerControl } from "comps/controls/eventHandlerControl"; import { StringControl } from "comps/controls/codeControl"; diff --git a/client/packages/openblocks/src/comps/comps/numberInputComp/numberInputComp.tsx b/client/packages/openblocks/src/comps/comps/numberInputComp/numberInputComp.tsx index 16ca1fa89..a2e13ed11 100644 --- a/client/packages/openblocks/src/comps/comps/numberInputComp/numberInputComp.tsx +++ b/client/packages/openblocks/src/comps/comps/numberInputComp/numberInputComp.tsx @@ -20,7 +20,7 @@ import { NameConfigRequired, withExposingConfigs, } from "comps/generators/withExposing"; -import { Section, sectionNames, ValueFromOption } from "openblocks-design"; +import { Section, sectionNames, ValueFromOption } from "lowcoder-design"; import { useEffect, useRef, useState } from "react"; import styled, { css } from "styled-components"; import { RecordConstructorToView } from "lowcoder-core"; diff --git a/client/packages/openblocks/src/comps/comps/numberInputComp/rangeSliderComp.tsx b/client/packages/openblocks/src/comps/comps/numberInputComp/rangeSliderComp.tsx index 8a4358172..4cb4e166e 100644 --- a/client/packages/openblocks/src/comps/comps/numberInputComp/rangeSliderComp.tsx +++ b/client/packages/openblocks/src/comps/comps/numberInputComp/rangeSliderComp.tsx @@ -1,5 +1,5 @@ import { trans } from "i18n"; -import { Section, sectionNames } from "openblocks-design"; +import { Section, sectionNames } from "lowcoder-design"; import { numberExposingStateControl } from "../../controls/codeStateControl"; import { UICompBuilder } from "../../generators"; import { CommonNameConfig, NameConfig, withExposingConfigs } from "../../generators/withExposing"; diff --git a/client/packages/openblocks/src/comps/comps/numberInputComp/sliderComp.tsx b/client/packages/openblocks/src/comps/comps/numberInputComp/sliderComp.tsx index 4628ac31d..931fe3a27 100644 --- a/client/packages/openblocks/src/comps/comps/numberInputComp/sliderComp.tsx +++ b/client/packages/openblocks/src/comps/comps/numberInputComp/sliderComp.tsx @@ -1,5 +1,5 @@ import { trans } from "i18n"; -import { Section, sectionNames } from "openblocks-design"; +import { Section, sectionNames } from "lowcoder-design"; import { numberExposingStateControl } from "../../controls/codeStateControl"; import { UICompBuilder } from "../../generators"; import { CommonNameConfig, NameConfig, withExposingConfigs } from "../../generators/withExposing"; diff --git a/client/packages/openblocks/src/comps/comps/numberInputComp/sliderCompConstants.tsx b/client/packages/openblocks/src/comps/comps/numberInputComp/sliderCompConstants.tsx index e6abcd14f..a19c3f958 100644 --- a/client/packages/openblocks/src/comps/comps/numberInputComp/sliderCompConstants.tsx +++ b/client/packages/openblocks/src/comps/comps/numberInputComp/sliderCompConstants.tsx @@ -2,13 +2,13 @@ import { BoolCodeControl, NumberControl } from "../../controls/codeControl"; import { LabelControl } from "../../controls/labelControl"; import { withDefault } from "../../generators"; import { ChangeEventHandlerControl } from "../../controls/eventHandlerControl"; -import { Section, sectionNames } from "openblocks-design"; +import { Section, sectionNames } from "lowcoder-design"; import { RecordConstructorToComp } from "lowcoder-core"; import { styleControl } from "comps/controls/styleControl"; import { SliderStyle, SliderStyleType } from "comps/controls/styleControlConstants"; import styled, { css } from "styled-components"; import { Slider } from "antd"; -import { darkenColor, fadeColor } from "openblocks-design"; +import { darkenColor, fadeColor } from "lowcoder-design"; import { disabledPropertyView, hiddenPropertyView } from "comps/utils/propertyUtils"; import { IconControl } from "comps/controls/iconControl"; import { trans } from "i18n"; diff --git a/client/packages/openblocks/src/comps/comps/preLoadComp.tsx b/client/packages/openblocks/src/comps/comps/preLoadComp.tsx index c4a2afabc..d746f6a65 100644 --- a/client/packages/openblocks/src/comps/comps/preLoadComp.tsx +++ b/client/packages/openblocks/src/comps/comps/preLoadComp.tsx @@ -13,7 +13,7 @@ import { CodeTextControl } from "comps/controls/codeTextControl"; import SimpleStringControl from "comps/controls/simpleStringControl"; import { MultiCompBuilder, withPropertyViewFn } from "comps/generators"; import { list } from "comps/generators/list"; -import { BaseSection, CustomModal, PlusIcon, ScrollBar } from "openblocks-design"; +import { BaseSection, CustomModal, PlusIcon, ScrollBar } from "lowcoder-design"; import React, { useContext, useEffect, useState } from "react"; import styled from "styled-components"; import { ExternalEditorContext } from "util/context/ExternalEditorContext"; diff --git a/client/packages/openblocks/src/comps/comps/progressCircleComp.tsx b/client/packages/openblocks/src/comps/comps/progressCircleComp.tsx index ed708f894..777774f90 100644 --- a/client/packages/openblocks/src/comps/comps/progressCircleComp.tsx +++ b/client/packages/openblocks/src/comps/comps/progressCircleComp.tsx @@ -2,7 +2,7 @@ import { Progress } from "antd"; import { styleControl } from "comps/controls/styleControl"; import { ProgressStyle, ProgressStyleType } from "comps/controls/styleControlConstants"; import styled, { css } from "styled-components"; -import { Section, sectionNames } from "openblocks-design"; +import { Section, sectionNames } from "lowcoder-design"; import { numberExposingStateControl } from "../controls/codeStateControl"; import { UICompBuilder } from "../generators"; import { NameConfig, NameConfigHidden, withExposingConfigs } from "../generators/withExposing"; diff --git a/client/packages/openblocks/src/comps/comps/progressComp.tsx b/client/packages/openblocks/src/comps/comps/progressComp.tsx index bfeeab217..1f3d74b42 100644 --- a/client/packages/openblocks/src/comps/comps/progressComp.tsx +++ b/client/packages/openblocks/src/comps/comps/progressComp.tsx @@ -1,5 +1,5 @@ import { Progress } from "antd"; -import { Section, sectionNames } from "openblocks-design"; +import { Section, sectionNames } from "lowcoder-design"; import { numberExposingStateControl } from "../controls/codeStateControl"; import { BoolControl } from "../controls/boolControl"; import { UICompBuilder } from "../generators"; diff --git a/client/packages/openblocks/src/comps/comps/qrCodeComp.tsx b/client/packages/openblocks/src/comps/comps/qrCodeComp.tsx index 6908b00d9..cbfbc8236 100644 --- a/client/packages/openblocks/src/comps/comps/qrCodeComp.tsx +++ b/client/packages/openblocks/src/comps/comps/qrCodeComp.tsx @@ -6,7 +6,7 @@ import { styleControl } from "comps/controls/styleControl"; import { QRCodeStyle } from "comps/controls/styleControlConstants"; import { UICompBuilder } from "comps/generators/uiCompBuilder"; import { NameConfig, NameConfigHidden, withExposingConfigs } from "comps/generators/withExposing"; -import { Section, sectionNames } from "openblocks-design"; +import { Section, sectionNames } from "lowcoder-design"; import { QRCodeSVG } from "qrcode.react"; import { hiddenPropertyView } from "comps/utils/propertyUtils"; import { trans } from "i18n"; diff --git a/client/packages/openblocks/src/comps/comps/queryLibrary/inputListComp.tsx b/client/packages/openblocks/src/comps/comps/queryLibrary/inputListComp.tsx index 098d2967b..7506a2158 100644 --- a/client/packages/openblocks/src/comps/comps/queryLibrary/inputListComp.tsx +++ b/client/packages/openblocks/src/comps/comps/queryLibrary/inputListComp.tsx @@ -10,7 +10,7 @@ import { PointIcon, SimplePopover, TacoButton, -} from "openblocks-design"; +} from "lowcoder-design"; import { Fragment, useContext, useEffect, useState } from "react"; import styled from "styled-components"; import { EmptyContent } from "../../../components/EmptyContent"; diff --git a/client/packages/openblocks/src/comps/comps/queryLibrary/queryLibraryComp.tsx b/client/packages/openblocks/src/comps/comps/queryLibrary/queryLibraryComp.tsx index 682e7df60..60d9a6bd5 100644 --- a/client/packages/openblocks/src/comps/comps/queryLibrary/queryLibraryComp.tsx +++ b/client/packages/openblocks/src/comps/comps/queryLibrary/queryLibraryComp.tsx @@ -16,7 +16,7 @@ import { ScrollBar, TacoButton, UnfoldWhiteIcon, -} from "openblocks-design"; +} from "lowcoder-design"; import ReactHotkeys from "../../../util/hotkeys"; import { executeQueryAction, renameAction } from "lowcoder-core"; import { deleteQueryLibrary } from "redux/reduxActions/queryLibraryActions"; diff --git a/client/packages/openblocks/src/comps/comps/ratingComp.tsx b/client/packages/openblocks/src/comps/comps/ratingComp.tsx index f3f364fb2..0c2815eaf 100644 --- a/client/packages/openblocks/src/comps/comps/ratingComp.tsx +++ b/client/packages/openblocks/src/comps/comps/ratingComp.tsx @@ -1,6 +1,6 @@ import { Rate } from "antd"; import styled, { css } from "styled-components"; -import { Section, sectionNames } from "openblocks-design"; +import { Section, sectionNames } from "lowcoder-design"; import { NumberControl } from "../controls/codeControl"; import { BoolControl } from "../controls/boolControl"; import { changeEvent, eventHandlerControl } from "../controls/eventHandlerControl"; diff --git a/client/packages/openblocks/src/comps/comps/remoteComp/remoteComp.tsx b/client/packages/openblocks/src/comps/comps/remoteComp/remoteComp.tsx index 6dc6f71f1..0c345aceb 100644 --- a/client/packages/openblocks/src/comps/comps/remoteComp/remoteComp.tsx +++ b/client/packages/openblocks/src/comps/comps/remoteComp/remoteComp.tsx @@ -4,7 +4,7 @@ import { withExposingConfigs } from "comps/generators/withExposing"; import { GreyTextColor } from "constants/style"; import log from "loglevel"; import { Comp, CompAction, CompParams, customAction, isCustomAction } from "lowcoder-core"; -import { WhiteLoading } from "openblocks-design"; +import { WhiteLoading } from "lowcoder-design"; import { useState } from "react"; import { useMount } from "react-use"; import styled from "styled-components"; diff --git a/client/packages/openblocks/src/comps/comps/richTextEditorComp.tsx b/client/packages/openblocks/src/comps/comps/richTextEditorComp.tsx index e8691d69d..53e1a2176 100644 --- a/client/packages/openblocks/src/comps/comps/richTextEditorComp.tsx +++ b/client/packages/openblocks/src/comps/comps/richTextEditorComp.tsx @@ -5,7 +5,7 @@ import { AutoHeightControl } from "comps/controls/autoHeightControl"; import { ChangeEventHandlerControl } from "comps/controls/eventHandlerControl"; import { UICompBuilder, withDefault } from "comps/generators"; import { NameConfig, NameConfigHidden, withExposingConfigs } from "comps/generators/withExposing"; -import { Section, sectionNames } from "openblocks-design"; +import { Section, sectionNames } from "lowcoder-design"; import React, { Suspense, useEffect, useRef, useState } from "react"; import type ReactQuill from "react-quill"; import { useDebounce } from "react-use"; diff --git a/client/packages/openblocks/src/comps/comps/rootComp.tsx b/client/packages/openblocks/src/comps/comps/rootComp.tsx index 35b3d17a6..2944cd3a1 100644 --- a/client/packages/openblocks/src/comps/comps/rootComp.tsx +++ b/client/packages/openblocks/src/comps/comps/rootComp.tsx @@ -26,7 +26,7 @@ import { PropertySectionContext, PropertySectionContextType, PropertySectionState, -} from "openblocks-design"; +} from "lowcoder-design"; import RefTreeComp from "./refTreeComp"; interface RootViewProps extends HTMLAttributes { diff --git a/client/packages/openblocks/src/comps/comps/selectInputComp/cascaderContants.tsx b/client/packages/openblocks/src/comps/comps/selectInputComp/cascaderContants.tsx index 7267b8b40..21023e3d7 100644 --- a/client/packages/openblocks/src/comps/comps/selectInputComp/cascaderContants.tsx +++ b/client/packages/openblocks/src/comps/comps/selectInputComp/cascaderContants.tsx @@ -1,5 +1,5 @@ import { SelectEventHandlerControl } from "../../controls/eventHandlerControl"; -import { Section, sectionNames } from "openblocks-design"; +import { Section, sectionNames } from "lowcoder-design"; import { RecordConstructorToComp } from "lowcoder-core"; import { BoolCodeControl, JSONObjectArrayControl, StringControl } from "comps/controls/codeControl"; import { arrayStringExposingStateControl } from "comps/controls/codeStateControl"; diff --git a/client/packages/openblocks/src/comps/comps/selectInputComp/checkboxComp.tsx b/client/packages/openblocks/src/comps/comps/selectInputComp/checkboxComp.tsx index 1d2f199c3..9b5284273 100644 --- a/client/packages/openblocks/src/comps/comps/selectInputComp/checkboxComp.tsx +++ b/client/packages/openblocks/src/comps/comps/selectInputComp/checkboxComp.tsx @@ -18,8 +18,8 @@ import { styleControl } from "comps/controls/styleControl"; import { CheckboxStyle, CheckboxStyleType } from "comps/controls/styleControlConstants"; import { RadioLayoutOptions, RadioPropertyView } from "./radioCompConstants"; import { dropdownControl } from "../../controls/dropdownControl"; -import { ValueFromOption } from "openblocks-design"; -import { EllipsisTextCss } from "openblocks-design"; +import { ValueFromOption } from "lowcoder-design"; +import { EllipsisTextCss } from "lowcoder-design"; import { trans } from "i18n"; import { RefControl } from "comps/controls/refControl"; diff --git a/client/packages/openblocks/src/comps/comps/selectInputComp/radioComp.tsx b/client/packages/openblocks/src/comps/comps/selectInputComp/radioComp.tsx index bbddf4b23..c2f457757 100644 --- a/client/packages/openblocks/src/comps/comps/selectInputComp/radioComp.tsx +++ b/client/packages/openblocks/src/comps/comps/selectInputComp/radioComp.tsx @@ -9,7 +9,7 @@ import { SelectInputInvalidConfig, useSelectInputValidate, } from "./selectInputConstants"; -import { EllipsisTextCss, ValueFromOption } from "openblocks-design"; +import { EllipsisTextCss, ValueFromOption } from "lowcoder-design"; import { trans } from "i18n"; const getStyle = (style: RadioStyleType) => { diff --git a/client/packages/openblocks/src/comps/comps/selectInputComp/radioCompConstants.tsx b/client/packages/openblocks/src/comps/comps/selectInputComp/radioCompConstants.tsx index 6a999e40d..e4a77f74a 100644 --- a/client/packages/openblocks/src/comps/comps/selectInputComp/radioCompConstants.tsx +++ b/client/packages/openblocks/src/comps/comps/selectInputComp/radioCompConstants.tsx @@ -5,7 +5,7 @@ import { arrayStringExposingStateControl, stringExposingStateControl, } from "../../controls/codeStateControl"; -import { Section, sectionNames } from "openblocks-design"; +import { Section, sectionNames } from "lowcoder-design"; import { SelectInputOptionControl } from "../../controls/optionsControl"; import { ChangeEventHandlerControl } from "../../controls/eventHandlerControl"; import { diff --git a/client/packages/openblocks/src/comps/comps/selectInputComp/segmentedControl.tsx b/client/packages/openblocks/src/comps/comps/selectInputComp/segmentedControl.tsx index 21159249a..3a791fc4a 100644 --- a/client/packages/openblocks/src/comps/comps/selectInputComp/segmentedControl.tsx +++ b/client/packages/openblocks/src/comps/comps/selectInputComp/segmentedControl.tsx @@ -17,7 +17,7 @@ import { SelectInputValidationSection, useSelectInputValidate, } from "./selectInputConstants"; -import { Section, sectionNames } from "openblocks-design"; +import { Section, sectionNames } from "lowcoder-design"; import { hiddenPropertyView, disabledPropertyView } from "comps/utils/propertyUtils"; import { trans } from "i18n"; import { hasIcon } from "comps/utils"; diff --git a/client/packages/openblocks/src/comps/comps/selectInputComp/selectCompConstants.tsx b/client/packages/openblocks/src/comps/comps/selectInputComp/selectCompConstants.tsx index a0d4145ce..f0b1eb87e 100644 --- a/client/packages/openblocks/src/comps/comps/selectInputComp/selectCompConstants.tsx +++ b/client/packages/openblocks/src/comps/comps/selectInputComp/selectCompConstants.tsx @@ -14,7 +14,7 @@ import { MultiselectTagIcon, Section, sectionNames, -} from "openblocks-design"; +} from "lowcoder-design"; import { SelectOptionControl } from "../../controls/optionsControl"; import { SelectEventHandlerControl } from "../../controls/eventHandlerControl"; import { Select as AntdSelect } from "antd"; diff --git a/client/packages/openblocks/src/comps/comps/selectInputComp/selectInputConstants.tsx b/client/packages/openblocks/src/comps/comps/selectInputComp/selectInputConstants.tsx index 3cf6b238d..8476a372c 100644 --- a/client/packages/openblocks/src/comps/comps/selectInputComp/selectInputConstants.tsx +++ b/client/packages/openblocks/src/comps/comps/selectInputComp/selectInputConstants.tsx @@ -1,4 +1,4 @@ -import { Section, sectionNames } from "openblocks-design"; +import { Section, sectionNames } from "lowcoder-design"; import { ChildrenTypeToDepsKeys, depsConfig } from "../../generators/withExposing"; import { BoolControl } from "../../controls/boolControl"; import { CustomRuleControl } from "../../controls/codeControl"; diff --git a/client/packages/openblocks/src/comps/comps/signatureComp.tsx b/client/packages/openblocks/src/comps/comps/signatureComp.tsx index 0ad958575..293d42a1c 100644 --- a/client/packages/openblocks/src/comps/comps/signatureComp.tsx +++ b/client/packages/openblocks/src/comps/comps/signatureComp.tsx @@ -14,7 +14,7 @@ import { stateComp, withDefault } from "comps/generators/simpleGenerators"; import { hiddenPropertyView } from "comps/utils/propertyUtils"; import { trans } from "i18n"; import { changeValueAction, multiChangeAction } from "lowcoder-core"; -import { Section, sectionNames, UndoIcon } from "openblocks-design"; +import { Section, sectionNames, UndoIcon } from "lowcoder-design"; import React, { Suspense, useState } from "react"; import ReactResizeDetector from "react-resize-detector"; import type SignatureCanvasType from "react-signature-canvas"; diff --git a/client/packages/openblocks/src/comps/comps/switchComp.tsx b/client/packages/openblocks/src/comps/comps/switchComp.tsx index 2b2159996..36afecff7 100644 --- a/client/packages/openblocks/src/comps/comps/switchComp.tsx +++ b/client/packages/openblocks/src/comps/comps/switchComp.tsx @@ -6,7 +6,7 @@ import { LabelControl } from "comps/controls/labelControl"; import { styleControl } from "comps/controls/styleControl"; import { SwitchStyle, SwitchStyleType } from "comps/controls/styleControlConstants"; import { migrateOldData } from "comps/generators/simpleGenerators"; -import { Section, sectionNames } from "openblocks-design"; +import { Section, sectionNames } from "lowcoder-design"; import styled, { css } from "styled-components"; import { UICompBuilder } from "../generators"; import { CommonNameConfig, NameConfig, withExposingConfigs } from "../generators/withExposing"; diff --git a/client/packages/openblocks/src/comps/comps/tableComp/column/columnTypeComp.tsx b/client/packages/openblocks/src/comps/comps/tableComp/column/columnTypeComp.tsx index cc7ba4b16..b3e1e1faf 100644 --- a/client/packages/openblocks/src/comps/comps/tableComp/column/columnTypeComp.tsx +++ b/client/packages/openblocks/src/comps/comps/tableComp/column/columnTypeComp.tsx @@ -3,7 +3,7 @@ import { DateTimeComp } from "comps/comps/tableComp/column/columnTypeComps/colum import { ButtonComp } from "comps/comps/tableComp/column/simpleColumnTypeComps"; import { withType } from "comps/generators"; import { trans } from "i18n"; -import { Dropdown } from "openblocks-design"; +import { Dropdown } from "lowcoder-design"; import { BooleanComp } from "./columnTypeComps/columnBooleanComp"; import { DateComp } from "./columnTypeComps/columnDateComp"; import { ImageComp } from "./columnTypeComps/columnImgComp"; diff --git a/client/packages/openblocks/src/comps/comps/tableComp/column/columnTypeComps/columnBooleanComp.tsx b/client/packages/openblocks/src/comps/comps/tableComp/column/columnTypeComps/columnBooleanComp.tsx index 8d6a5b974..b48e626c0 100644 --- a/client/packages/openblocks/src/comps/comps/tableComp/column/columnTypeComps/columnBooleanComp.tsx +++ b/client/packages/openblocks/src/comps/comps/tableComp/column/columnTypeComps/columnBooleanComp.tsx @@ -8,7 +8,7 @@ import styled from "styled-components"; import { CheckboxStyle, CheckboxStyleType } from "comps/controls/styleControlConstants"; import { useStyle } from "comps/controls/styleControl"; import { dropdownControl } from "comps/controls/dropdownControl"; -import { TableCheckedIcon, TableUnCheckedIcon } from "openblocks-design"; +import { TableCheckedIcon, TableUnCheckedIcon } from "lowcoder-design"; const CheckboxStyled = styled(Checkbox)<{ $style: CheckboxStyleType }>` ${(props) => props.$style && getStyle(props.$style)} diff --git a/client/packages/openblocks/src/comps/comps/tableComp/column/columnTypeComps/columnDateComp.tsx b/client/packages/openblocks/src/comps/comps/tableComp/column/columnTypeComps/columnDateComp.tsx index 2100c15a7..7f715bba4 100644 --- a/client/packages/openblocks/src/comps/comps/tableComp/column/columnTypeComps/columnDateComp.tsx +++ b/client/packages/openblocks/src/comps/comps/tableComp/column/columnTypeComps/columnDateComp.tsx @@ -10,7 +10,7 @@ import { formatPropertyView } from "comps/utils/propertyUtils"; import { trans } from "i18n"; import { isNumber } from "lodash"; import moment from "moment"; -import { CalendarIcon, PrevIcon, SuperPrevIcon } from "openblocks-design"; +import { CalendarIcon, PrevIcon, SuperPrevIcon } from "lowcoder-design"; import { useState } from "react"; import styled from "styled-components"; import { DateParser, DATE_FORMAT } from "util/dateTimeUtils"; diff --git a/client/packages/openblocks/src/comps/comps/tableComp/column/columnTypeComps/columnImgComp.tsx b/client/packages/openblocks/src/comps/comps/tableComp/column/columnTypeComps/columnImgComp.tsx index c843261fa..4eda27432 100644 --- a/client/packages/openblocks/src/comps/comps/tableComp/column/columnTypeComps/columnImgComp.tsx +++ b/client/packages/openblocks/src/comps/comps/tableComp/column/columnTypeComps/columnImgComp.tsx @@ -6,7 +6,7 @@ import { import { StringControl, NumberControl } from "comps/controls/codeControl"; import { trans } from "i18n"; import { withDefault } from "comps/generators"; -import { TacoImage } from "openblocks-design"; +import { TacoImage } from "lowcoder-design"; export const ColumnValueTooltip = trans("table.columnValueTooltip"); diff --git a/client/packages/openblocks/src/comps/comps/tableComp/column/columnTypeComps/columnMarkdownComp.tsx b/client/packages/openblocks/src/comps/comps/tableComp/column/columnTypeComps/columnMarkdownComp.tsx index 288746a2e..efcdd436c 100644 --- a/client/packages/openblocks/src/comps/comps/tableComp/column/columnTypeComps/columnMarkdownComp.tsx +++ b/client/packages/openblocks/src/comps/comps/tableComp/column/columnTypeComps/columnMarkdownComp.tsx @@ -6,7 +6,7 @@ import { import { ColumnValueTooltip } from "comps/comps/tableComp/column/simpleColumnTypeComps"; import { StringControl } from "comps/controls/codeControl"; import { trans } from "i18n"; -import { markdownCompCss, TacoMarkDown } from "openblocks-design"; +import { markdownCompCss, TacoMarkDown } from "lowcoder-design"; import styled from "styled-components"; const Wrapper = styled.div` diff --git a/client/packages/openblocks/src/comps/comps/tableComp/column/columnTypeComps/columnProgressComp.tsx b/client/packages/openblocks/src/comps/comps/tableComp/column/columnTypeComps/columnProgressComp.tsx index b52a7d8d4..7c5dc3bdd 100644 --- a/client/packages/openblocks/src/comps/comps/tableComp/column/columnTypeComps/columnProgressComp.tsx +++ b/client/packages/openblocks/src/comps/comps/tableComp/column/columnTypeComps/columnProgressComp.tsx @@ -7,7 +7,7 @@ import { ProgressStyle } from "comps/controls/styleControlConstants"; import { useStyle } from "comps/controls/styleControl"; import { BoolControl } from "comps/controls/boolControl"; import { ProgressStyled as Progress } from "comps/comps/progressComp"; -import { TableMinusIcon, TablePlusIcon } from "openblocks-design"; +import { TableMinusIcon, TablePlusIcon } from "lowcoder-design"; import styled from "styled-components"; const ProgressStyled = styled(Progress)` diff --git a/client/packages/openblocks/src/comps/comps/tableComp/column/columnTypeComps/columnStatusComp.tsx b/client/packages/openblocks/src/comps/comps/tableComp/column/columnTypeComps/columnStatusComp.tsx index 9c13633c6..3cdf9e84b 100644 --- a/client/packages/openblocks/src/comps/comps/tableComp/column/columnTypeComps/columnStatusComp.tsx +++ b/client/packages/openblocks/src/comps/comps/tableComp/column/columnTypeComps/columnStatusComp.tsx @@ -8,7 +8,7 @@ import { StringControl, stringUnionControl } from "comps/controls/codeControl"; import { DropdownStyled, Wrapper } from "./columnTagsComp"; import { ReactNode, useContext, useState } from "react"; import { StatusContext } from "components/table/EditableCell"; -import { CustomSelect, PackUpIcon, ScrollBar } from "openblocks-design"; +import { CustomSelect, PackUpIcon, ScrollBar } from "lowcoder-design"; import { PresetStatusColorType } from "antd/lib/_util/colors"; export const ColumnValueTooltip = trans("table.columnValueTooltip"); diff --git a/client/packages/openblocks/src/comps/comps/tableComp/column/columnTypeComps/columnTagsComp.tsx b/client/packages/openblocks/src/comps/comps/tableComp/column/columnTypeComps/columnTagsComp.tsx index cab8f7463..8725035a1 100644 --- a/client/packages/openblocks/src/comps/comps/tableComp/column/columnTypeComps/columnTagsComp.tsx +++ b/client/packages/openblocks/src/comps/comps/tableComp/column/columnTypeComps/columnTagsComp.tsx @@ -13,8 +13,8 @@ import _ from "lodash"; import { ReactNode, useContext, useState } from "react"; import { toJson } from "really-relaxed-json"; import { hashToNum } from "util/stringUtils"; -import { CustomSelect, PackUpIcon } from "openblocks-design"; -import { ScrollBar } from "openblocks-design"; +import { CustomSelect, PackUpIcon } from "lowcoder-design"; +import { ScrollBar } from "lowcoder-design"; const colors = PresetColorTypes; diff --git a/client/packages/openblocks/src/comps/comps/tableComp/column/tableColumnComp.tsx b/client/packages/openblocks/src/comps/comps/tableComp/column/tableColumnComp.tsx index c9078204b..0e2ec9639 100644 --- a/client/packages/openblocks/src/comps/comps/tableComp/column/tableColumnComp.tsx +++ b/client/packages/openblocks/src/comps/comps/tableComp/column/tableColumnComp.tsx @@ -19,7 +19,7 @@ import { withFunction, wrapChildAction, } from "lowcoder-core"; -import { AlignClose, AlignLeft, AlignRight } from "openblocks-design"; +import { AlignClose, AlignLeft, AlignRight } from "lowcoder-design"; import { ColumnTypeComp, ColumnTypeCompMap } from "./columnTypeComp"; export type Render = ReturnType["getOriginalComp"]>; diff --git a/client/packages/openblocks/src/comps/comps/tableComp/tableCompView.tsx b/client/packages/openblocks/src/comps/comps/tableComp/tableCompView.tsx index d7d1d5132..aee219a81 100644 --- a/client/packages/openblocks/src/comps/comps/tableComp/tableCompView.tsx +++ b/client/packages/openblocks/src/comps/comps/tableComp/tableCompView.tsx @@ -24,7 +24,7 @@ import { BackgroundColorContext } from "comps/utils/backgroundColorContext"; import { PrimaryColor } from "constants/style"; import { trans } from "i18n"; import _ from "lodash"; -import { darkenColor, isDarkColor } from "openblocks-design"; +import { darkenColor, isDarkColor } from "lowcoder-design"; import React, { useCallback, useContext, useEffect, useMemo, useRef, useState } from "react"; import { Resizable } from "react-resizable"; import styled, { css } from "styled-components"; diff --git a/client/packages/openblocks/src/comps/comps/tableComp/tablePropertyView.tsx b/client/packages/openblocks/src/comps/comps/tableComp/tablePropertyView.tsx index f0878a0bf..49d6ad7d0 100644 --- a/client/packages/openblocks/src/comps/comps/tableComp/tablePropertyView.tsx +++ b/client/packages/openblocks/src/comps/comps/tableComp/tablePropertyView.tsx @@ -24,7 +24,7 @@ import { sectionNames, TextLabel, ToolTipLabel, -} from "openblocks-design"; +} from "lowcoder-design"; import { tableDataDivClassName } from "pages/tutorials/tutorialsConstant"; import styled, { css } from "styled-components"; import { getSelectedRowKeys } from "./selectionControl"; diff --git a/client/packages/openblocks/src/comps/comps/tableComp/tableToolbarComp.tsx b/client/packages/openblocks/src/comps/comps/tableComp/tableToolbarComp.tsx index f3f9bc2f3..bd9c3b5a5 100644 --- a/client/packages/openblocks/src/comps/comps/tableComp/tableToolbarComp.tsx +++ b/client/packages/openblocks/src/comps/comps/tableComp/tableToolbarComp.tsx @@ -32,7 +32,7 @@ import { TacoButton, TacoInput, ValueFromOption, -} from "openblocks-design"; +} from "lowcoder-design"; import React, { useContext, useEffect, useMemo, useRef, useState } from "react"; import styled, { css } from "styled-components"; import { JSONValue } from "util/jsonTypes"; diff --git a/client/packages/openblocks/src/comps/comps/tableComp/tableTypes.tsx b/client/packages/openblocks/src/comps/comps/tableComp/tableTypes.tsx index 00124c17d..cf05ffac2 100644 --- a/client/packages/openblocks/src/comps/comps/tableComp/tableTypes.tsx +++ b/client/packages/openblocks/src/comps/comps/tableComp/tableTypes.tsx @@ -27,7 +27,7 @@ import { RecordConstructorToComp, RecordConstructorToView, } from "lowcoder-core"; -import { controlItem } from "openblocks-design"; +import { controlItem } from "lowcoder-design"; import { JSONObject } from "util/jsonTypes"; import { ExpansionControl } from "./expansionControl"; import { PaginationControl } from "./paginationControl"; diff --git a/client/packages/openblocks/src/comps/comps/tableComp/tableUtils.tsx b/client/packages/openblocks/src/comps/comps/tableComp/tableUtils.tsx index 3a8f05a09..a2b7445d2 100644 --- a/client/packages/openblocks/src/comps/comps/tableComp/tableUtils.tsx +++ b/client/packages/openblocks/src/comps/comps/tableComp/tableUtils.tsx @@ -12,7 +12,7 @@ import { TableFilter, tableFilterOperatorMap } from "comps/comps/tableComp/table import { SortValue, TableOnEventView } from "comps/comps/tableComp/tableTypes"; import _ from "lodash"; import { changeChildAction, CompAction, NodeToValue } from "lowcoder-core"; -import { EditableIcon } from "openblocks-design"; +import { EditableIcon } from "lowcoder-design"; import { tryToNumber } from "util/convertUtils"; import { JSONObject, JSONValue } from "util/jsonTypes"; import { StatusType } from "./column/columnTypeComps/columnStatusComp"; diff --git a/client/packages/openblocks/src/comps/comps/tabs/tabbedContainerComp.tsx b/client/packages/openblocks/src/comps/comps/tabs/tabbedContainerComp.tsx index a2d0f20c2..5abdf6a2a 100644 --- a/client/packages/openblocks/src/comps/comps/tabs/tabbedContainerComp.tsx +++ b/client/packages/openblocks/src/comps/comps/tabs/tabbedContainerComp.tsx @@ -12,8 +12,8 @@ import { sameTypeMap, UICompBuilder, withDefault } from "comps/generators"; import { addMapChildAction } from "comps/generators/sameTypeMap"; import { NameConfig, NameConfigHidden, withExposingConfigs } from "comps/generators/withExposing"; import { NameGenerator } from "comps/utils"; -import { Section, sectionNames } from "openblocks-design"; -import { HintPlaceHolder } from "openblocks-design"; +import { Section, sectionNames } from "lowcoder-design"; +import { HintPlaceHolder } from "lowcoder-design"; import _ from "lodash"; import React, { useCallback, useContext } from "react"; import styled, { css } from "styled-components"; diff --git a/client/packages/openblocks/src/comps/comps/temporaryStateComp.tsx b/client/packages/openblocks/src/comps/comps/temporaryStateComp.tsx index 124667247..a3c4e4161 100644 --- a/client/packages/openblocks/src/comps/comps/temporaryStateComp.tsx +++ b/client/packages/openblocks/src/comps/comps/temporaryStateComp.tsx @@ -6,7 +6,7 @@ import { NameConfig, withExposingConfigs } from "comps/generators/withExposing"; import { withMethodExposing } from "comps/generators/withMethodExposing"; import { trans } from "i18n"; import _ from "lodash"; -import { DocLink } from "openblocks-design"; +import { DocLink } from "lowcoder-design"; import { BottomTabs } from "pages/editor/bottom/BottomTabs"; import { ReactNode } from "react"; import { BottomResComp, BottomResCompResult, BottomResTypeEnum } from "types/bottomRes"; diff --git a/client/packages/openblocks/src/comps/comps/textComp.tsx b/client/packages/openblocks/src/comps/comps/textComp.tsx index 4a8b68dda..4e7990617 100644 --- a/client/packages/openblocks/src/comps/comps/textComp.tsx +++ b/client/packages/openblocks/src/comps/comps/textComp.tsx @@ -1,14 +1,14 @@ import { dropdownControl } from "comps/controls/dropdownControl"; import { stringExposingStateControl } from "comps/controls/codeStateControl"; import { AutoHeightControl } from "comps/controls/autoHeightControl"; -import { Section, sectionNames } from "openblocks-design"; +import { Section, sectionNames } from "lowcoder-design"; import styled, { css } from "styled-components"; -import { AlignCenter } from "openblocks-design"; -import { AlignLeft } from "openblocks-design"; -import { AlignRight } from "openblocks-design"; +import { AlignCenter } from "lowcoder-design"; +import { AlignLeft } from "lowcoder-design"; +import { AlignRight } from "lowcoder-design"; import { UICompBuilder } from "../generators"; import { NameConfig, NameConfigHidden, withExposingConfigs } from "../generators/withExposing"; -import { markdownCompCss, TacoMarkDown } from "openblocks-design"; +import { markdownCompCss, TacoMarkDown } from "lowcoder-design"; import { styleControl } from "comps/controls/styleControl"; import { TextStyle, TextStyleType } from "comps/controls/styleControlConstants"; import { hiddenPropertyView } from "comps/utils/propertyUtils"; diff --git a/client/packages/openblocks/src/comps/comps/textInputComp/inputComp.tsx b/client/packages/openblocks/src/comps/comps/textInputComp/inputComp.tsx index 505de5cd4..c0d27312c 100644 --- a/client/packages/openblocks/src/comps/comps/textInputComp/inputComp.tsx +++ b/client/packages/openblocks/src/comps/comps/textInputComp/inputComp.tsx @@ -1,4 +1,4 @@ -import { Input, Section, sectionNames } from "openblocks-design"; +import { Input, Section, sectionNames } from "lowcoder-design"; import { BoolControl } from "comps/controls/boolControl"; import { styleControl } from "comps/controls/styleControl"; import { InputLikeStyle, InputLikeStyleType } from "comps/controls/styleControlConstants"; diff --git a/client/packages/openblocks/src/comps/comps/textInputComp/passwordComp.tsx b/client/packages/openblocks/src/comps/comps/textInputComp/passwordComp.tsx index 44c98af36..93d707169 100644 --- a/client/packages/openblocks/src/comps/comps/textInputComp/passwordComp.tsx +++ b/client/packages/openblocks/src/comps/comps/textInputComp/passwordComp.tsx @@ -5,7 +5,7 @@ import { NameConfigRequired, withExposingConfigs, } from "comps/generators/withExposing"; -import { Section, sectionNames } from "openblocks-design"; +import { Section, sectionNames } from "lowcoder-design"; import { BoolControl } from "../../controls/boolControl"; import { dropdownControl } from "../../controls/dropdownControl"; import { LabelControl } from "../../controls/labelControl"; diff --git a/client/packages/openblocks/src/comps/comps/textInputComp/textAreaComp.tsx b/client/packages/openblocks/src/comps/comps/textInputComp/textAreaComp.tsx index 4a276016a..3e1f97359 100644 --- a/client/packages/openblocks/src/comps/comps/textInputComp/textAreaComp.tsx +++ b/client/packages/openblocks/src/comps/comps/textInputComp/textAreaComp.tsx @@ -4,7 +4,7 @@ import { NameConfigRequired, withExposingConfigs, } from "comps/generators/withExposing"; -import { Section, sectionNames } from "openblocks-design"; +import { Section, sectionNames } from "lowcoder-design"; import { BoolControl } from "../../controls/boolControl"; import { AutoHeightControl } from "../../controls/autoHeightControl"; import { UICompBuilder } from "../../generators"; diff --git a/client/packages/openblocks/src/comps/comps/textInputComp/textInputConstants.tsx b/client/packages/openblocks/src/comps/comps/textInputComp/textInputConstants.tsx index 61f20255b..ebc6a21f7 100644 --- a/client/packages/openblocks/src/comps/comps/textInputComp/textInputConstants.tsx +++ b/client/packages/openblocks/src/comps/comps/textInputComp/textInputConstants.tsx @@ -9,7 +9,7 @@ import { import { stringExposingStateControl } from "comps/controls/codeStateControl"; import { LabelControl } from "comps/controls/labelControl"; import { InputLikeStyleType } from "comps/controls/styleControlConstants"; -import { Section, sectionNames, ValueFromOption } from "openblocks-design"; +import { Section, sectionNames, ValueFromOption } from "lowcoder-design"; import _ from "lodash"; import { css } from "styled-components"; import { EMAIL_PATTERN, URL_PATTERN } from "util/stringUtils"; diff --git a/client/packages/openblocks/src/comps/comps/transformerListComp.tsx b/client/packages/openblocks/src/comps/comps/transformerListComp.tsx index 491c8011c..2390e7934 100644 --- a/client/packages/openblocks/src/comps/comps/transformerListComp.tsx +++ b/client/packages/openblocks/src/comps/comps/transformerListComp.tsx @@ -6,7 +6,7 @@ import { bottomResListComp } from "comps/generators/bottomResList"; import { withExposingRaw } from "comps/generators/withExposing"; import { trans } from "i18n"; import { fromRecord } from "lowcoder-core"; -import { DocLink } from "openblocks-design"; +import { DocLink } from "lowcoder-design"; import { BottomTabs } from "pages/editor/bottom/BottomTabs"; import { ReactNode } from "react"; import { BottomResComp, BottomResCompResult, BottomResTypeEnum } from "types/bottomRes"; diff --git a/client/packages/openblocks/src/comps/comps/treeComp/treeComp.tsx b/client/packages/openblocks/src/comps/comps/treeComp/treeComp.tsx index 558c56efa..b24c8f8a3 100644 --- a/client/packages/openblocks/src/comps/comps/treeComp/treeComp.tsx +++ b/client/packages/openblocks/src/comps/comps/treeComp/treeComp.tsx @@ -1,7 +1,7 @@ import { RecordConstructorToView } from "lowcoder-core"; import { UICompBuilder } from "comps/generators/uiCompBuilder"; import { withExposingConfigs } from "comps/generators/withExposing"; -import { Section, sectionNames } from "openblocks-design"; +import { Section, sectionNames } from "lowcoder-design"; import { Tree } from "antd"; import { useEffect, useState } from "react"; import styled from "styled-components"; diff --git a/client/packages/openblocks/src/comps/comps/treeComp/treeSelectComp.tsx b/client/packages/openblocks/src/comps/comps/treeComp/treeSelectComp.tsx index b29c4eacf..09c38cd20 100644 --- a/client/packages/openblocks/src/comps/comps/treeComp/treeSelectComp.tsx +++ b/client/packages/openblocks/src/comps/comps/treeComp/treeSelectComp.tsx @@ -1,7 +1,7 @@ import { changeChildAction, DispatchType, RecordConstructorToView } from "lowcoder-core"; import { UICompBuilder } from "comps/generators/uiCompBuilder"; import { NameConfig, withExposingConfigs } from "comps/generators/withExposing"; -import { Section, sectionNames, ValueFromOption } from "openblocks-design"; +import { Section, sectionNames, ValueFromOption } from "lowcoder-design"; import { TreeSelect } from "antd"; import { useEffect } from "react"; import styled from "styled-components"; diff --git a/client/packages/openblocks/src/comps/comps/treeComp/treeUtils.tsx b/client/packages/openblocks/src/comps/comps/treeComp/treeUtils.tsx index 7a2b021af..e539c042c 100644 --- a/client/packages/openblocks/src/comps/comps/treeComp/treeUtils.tsx +++ b/client/packages/openblocks/src/comps/comps/treeComp/treeUtils.tsx @@ -4,7 +4,7 @@ import { jsonExposingStateControl, jsonStateControl } from "comps/controls/codeS import { NewChildren } from "comps/generators/uiCompBuilder"; import { CommonNameConfig, NameConfig } from "comps/generators/withExposing"; import { disabledPropertyView, hiddenPropertyView } from "comps/utils/propertyUtils"; -import { ControlNode, Section, sectionNames } from "openblocks-design"; +import { ControlNode, Section, sectionNames } from "lowcoder-design"; import { trans } from "i18n"; import { RecordConstructorToComp, RecordConstructorToView } from "lowcoder-core"; import { ReactNode, useEffect } from "react"; diff --git a/client/packages/openblocks/src/comps/comps/triContainerComp/triContainer.tsx b/client/packages/openblocks/src/comps/comps/triContainerComp/triContainer.tsx index d413863fc..886a0e6f3 100644 --- a/client/packages/openblocks/src/comps/comps/triContainerComp/triContainer.tsx +++ b/client/packages/openblocks/src/comps/comps/triContainerComp/triContainer.tsx @@ -1,7 +1,7 @@ import { ContainerStyleType } from "comps/controls/styleControlConstants"; import { EditorContext } from "comps/editorState"; import { BackgroundColorContext } from "comps/utils/backgroundColorContext"; -import { HintPlaceHolder } from "openblocks-design"; +import { HintPlaceHolder } from "lowcoder-design"; import { ReactNode, useContext } from "react"; import styled, { css } from "styled-components"; import { checkIsMobile } from "util/commonUtils"; diff --git a/client/packages/openblocks/src/comps/comps/triContainerComp/triContainerComp.tsx b/client/packages/openblocks/src/comps/comps/triContainerComp/triContainerComp.tsx index a0bca5fd7..bf0373188 100644 --- a/client/packages/openblocks/src/comps/comps/triContainerComp/triContainerComp.tsx +++ b/client/packages/openblocks/src/comps/comps/triContainerComp/triContainerComp.tsx @@ -21,7 +21,7 @@ import { import { SimpleContainerComp } from "../containerBase/simpleContainerComp"; import { ContainerBodyChildComp } from "./containerBodyChildComp"; import { trans } from "i18n"; -import { ControlNode } from "openblocks-design"; +import { ControlNode } from "lowcoder-design"; const childrenMap = { header: SimpleContainerComp, diff --git a/client/packages/openblocks/src/comps/controls/actionSelector/actionSelectorControl.tsx b/client/packages/openblocks/src/comps/controls/actionSelector/actionSelectorControl.tsx index d2fcfcc80..65ef0df56 100644 --- a/client/packages/openblocks/src/comps/controls/actionSelector/actionSelectorControl.tsx +++ b/client/packages/openblocks/src/comps/controls/actionSelector/actionSelectorControl.tsx @@ -17,7 +17,7 @@ import { isMyCustomAction, UpdateActionContextAction, } from "lowcoder-core"; -import { Dropdown, HighContainer, Treediv } from "openblocks-design"; +import { Dropdown, HighContainer, Treediv } from "lowcoder-design"; import { useContext } from "react"; import { limitExecutor, setFieldsNoTypeCheck } from "util/objectUtils"; import { getPromiseAfterExecuteDispatch, handlePromiseAfterResult } from "util/promiseUtils"; diff --git a/client/packages/openblocks/src/comps/controls/actionSelector/copyToClipboardAction.tsx b/client/packages/openblocks/src/comps/controls/actionSelector/copyToClipboardAction.tsx index b940973af..c09b3835b 100644 --- a/client/packages/openblocks/src/comps/controls/actionSelector/copyToClipboardAction.tsx +++ b/client/packages/openblocks/src/comps/controls/actionSelector/copyToClipboardAction.tsx @@ -1,7 +1,7 @@ import { StringControl } from "comps/controls/codeControl"; import { MultiCompBuilder } from "comps/generators/multi"; import copy from "copy-to-clipboard"; -import { BranchDiv } from "openblocks-design"; +import { BranchDiv } from "lowcoder-design"; import { trans } from "i18n"; export const CopyToClipboardAction = (function () { diff --git a/client/packages/openblocks/src/comps/controls/actionSelector/downloadAction.tsx b/client/packages/openblocks/src/comps/controls/actionSelector/downloadAction.tsx index 1c469911d..833add9be 100644 --- a/client/packages/openblocks/src/comps/controls/actionSelector/downloadAction.tsx +++ b/client/packages/openblocks/src/comps/controls/actionSelector/downloadAction.tsx @@ -1,7 +1,7 @@ import { codeControl, StringControl } from "comps/controls/codeControl"; import { dropdownControl } from "comps/controls/dropdownControl"; import { MultiCompBuilder } from "comps/generators/multi"; -import { BranchDiv } from "openblocks-design"; +import { BranchDiv } from "lowcoder-design"; import { trans } from "i18n"; import { saveDataAsFile } from "util/fileUtils"; diff --git a/client/packages/openblocks/src/comps/controls/actionSelector/executeCompAction.tsx b/client/packages/openblocks/src/comps/controls/actionSelector/executeCompAction.tsx index 2d21b9819..a14adb207 100644 --- a/client/packages/openblocks/src/comps/controls/actionSelector/executeCompAction.tsx +++ b/client/packages/openblocks/src/comps/controls/actionSelector/executeCompAction.tsx @@ -8,7 +8,7 @@ import { valueComp, withTypeAndChildren } from "comps/generators"; import { list } from "comps/generators/list"; import { MultiCompBuilder } from "comps/generators/multi"; import { HookComp } from "comps/hooks/hookComp"; -import { BranchDiv, Dropdown } from "openblocks-design"; +import { BranchDiv, Dropdown } from "lowcoder-design"; import { mapValues } from "lodash"; import { Fragment, ReactNode } from "react"; import { getPromiseAfterDispatch } from "util/promiseUtils"; diff --git a/client/packages/openblocks/src/comps/controls/actionSelector/executeQueryAction.tsx b/client/packages/openblocks/src/comps/controls/actionSelector/executeQueryAction.tsx index 71a2123ac..720fc93fe 100644 --- a/client/packages/openblocks/src/comps/controls/actionSelector/executeQueryAction.tsx +++ b/client/packages/openblocks/src/comps/controls/actionSelector/executeQueryAction.tsx @@ -3,7 +3,7 @@ import { InputTypeEnum } from "comps/comps/moduleContainerComp/ioComp/inputListI import { SimpleNameComp } from "comps/comps/simpleNameComp"; import { EditorContext, EditorState } from "comps/editorState"; import { MultiCompBuilder } from "comps/generators/multi"; -import { BranchDiv, Dropdown } from "openblocks-design"; +import { BranchDiv, Dropdown } from "lowcoder-design"; import { BottomResTypeEnum } from "types/bottomRes"; import { getPromiseAfterDispatch } from "util/promiseUtils"; import { trans } from "i18n"; diff --git a/client/packages/openblocks/src/comps/controls/actionSelector/goToURLAction.tsx b/client/packages/openblocks/src/comps/controls/actionSelector/goToURLAction.tsx index 5eb46b683..aab608c6c 100644 --- a/client/packages/openblocks/src/comps/controls/actionSelector/goToURLAction.tsx +++ b/client/packages/openblocks/src/comps/controls/actionSelector/goToURLAction.tsx @@ -1,7 +1,7 @@ import { StringControl } from "comps/controls/codeControl"; import { BoolControl } from "comps/controls/boolControl"; import { MultiCompBuilder } from "comps/generators/multi"; -import { BranchDiv } from "openblocks-design"; +import { BranchDiv } from "lowcoder-design"; import { trans } from "i18n"; export const GoToURLAction = (function () { diff --git a/client/packages/openblocks/src/comps/controls/actionSelector/messageAction.tsx b/client/packages/openblocks/src/comps/controls/actionSelector/messageAction.tsx index b79b612a1..5c5372178 100644 --- a/client/packages/openblocks/src/comps/controls/actionSelector/messageAction.tsx +++ b/client/packages/openblocks/src/comps/controls/actionSelector/messageAction.tsx @@ -2,7 +2,7 @@ import { message } from "antd"; import { StringControl } from "comps/controls/codeControl"; import { dropdownControl } from "comps/controls/dropdownControl"; import { MultiCompBuilder } from "comps/generators/multi"; -import { BranchDiv } from "openblocks-design"; +import { BranchDiv } from "lowcoder-design"; import { trans } from "i18n"; import { millisecondsControl } from "../millisecondControl"; diff --git a/client/packages/openblocks/src/comps/controls/actionSelector/openAppAction.tsx b/client/packages/openblocks/src/comps/controls/actionSelector/openAppAction.tsx index 394f064a8..c35eb0670 100644 --- a/client/packages/openblocks/src/comps/controls/actionSelector/openAppAction.tsx +++ b/client/packages/openblocks/src/comps/controls/actionSelector/openAppAction.tsx @@ -1,6 +1,6 @@ import { MultiCompBuilder } from "comps/generators/multi"; import { withDefault } from "comps/generators/simpleGenerators"; -import { BranchDiv } from "openblocks-design"; +import { BranchDiv } from "lowcoder-design"; import { KeyValue } from "types/common"; import ApplicationSelectControl from "../appSelectControl"; import { BoolControl } from "../boolControl"; diff --git a/client/packages/openblocks/src/comps/controls/actionSelector/runScript.tsx b/client/packages/openblocks/src/comps/controls/actionSelector/runScript.tsx index 024af8ded..082477c18 100644 --- a/client/packages/openblocks/src/comps/controls/actionSelector/runScript.tsx +++ b/client/packages/openblocks/src/comps/controls/actionSelector/runScript.tsx @@ -1,7 +1,7 @@ import { MultiCompBuilder } from "comps/generators/multi"; import { getGlobalSettings } from "comps/utils/globalSettings"; import { trans } from "i18n"; -import { BranchDiv } from "openblocks-design"; +import { BranchDiv } from "lowcoder-design"; import { FunctionControl } from "../codeControl"; const RunScriptTmpAction = (function () { diff --git a/client/packages/openblocks/src/comps/controls/actionSelector/triggerModuleEventAction.tsx b/client/packages/openblocks/src/comps/controls/actionSelector/triggerModuleEventAction.tsx index b4ac88bd3..60159669f 100644 --- a/client/packages/openblocks/src/comps/controls/actionSelector/triggerModuleEventAction.tsx +++ b/client/packages/openblocks/src/comps/controls/actionSelector/triggerModuleEventAction.tsx @@ -2,7 +2,7 @@ import { triggerModuleEventAction, routeByNameAction } from "lowcoder-core"; import { SimpleNameComp } from "comps/comps/simpleNameComp"; import { CompNameContext, EditorContext } from "comps/editorState"; import { MultiCompBuilder } from "comps/generators/multi"; -import { BranchDiv, Dropdown } from "openblocks-design"; +import { BranchDiv, Dropdown } from "lowcoder-design"; import { ModuleLayoutCompName } from "constants/compConstants"; import { trans } from "i18n"; diff --git a/client/packages/openblocks/src/comps/controls/alignControl.tsx b/client/packages/openblocks/src/comps/controls/alignControl.tsx index 6518ad1a4..a38937819 100644 --- a/client/packages/openblocks/src/comps/controls/alignControl.tsx +++ b/client/packages/openblocks/src/comps/controls/alignControl.tsx @@ -1,5 +1,5 @@ -import { ValueFromOption } from "openblocks-design"; -import { AlignCenter, AlignJustify, AlignLeft, AlignRight } from "openblocks-design"; +import { ValueFromOption } from "lowcoder-design"; +import { AlignCenter, AlignJustify, AlignLeft, AlignRight } from "lowcoder-design"; import { dropdownControl } from "./dropdownControl"; const AlignOptions = [ diff --git a/client/packages/openblocks/src/comps/controls/appSelectControl.tsx b/client/packages/openblocks/src/comps/controls/appSelectControl.tsx index 2c0a3a7f6..0a9c27252 100644 --- a/client/packages/openblocks/src/comps/controls/appSelectControl.tsx +++ b/client/packages/openblocks/src/comps/controls/appSelectControl.tsx @@ -1,7 +1,7 @@ import ApplicationSelect from "components/ApplicationSelect"; import { StringControl } from "comps/controls/codeControl"; import { MultiCompBuilder } from "comps/generators/multi"; -import { ControlPropertyViewWrapper } from "openblocks-design"; +import { ControlPropertyViewWrapper } from "lowcoder-design"; import { trans } from "i18n"; const childrenMap = { diff --git a/client/packages/openblocks/src/comps/controls/boolControl.tsx b/client/packages/openblocks/src/comps/controls/boolControl.tsx index bd4967a4e..541f97a02 100644 --- a/client/packages/openblocks/src/comps/controls/boolControl.tsx +++ b/client/packages/openblocks/src/comps/controls/boolControl.tsx @@ -10,7 +10,7 @@ import { SimpleComp, ValueAndMsg, } from "lowcoder-core"; -import { CheckBox, controlItem, Switch, SwitchJsIcon, SwitchWrapper } from "openblocks-design"; +import { CheckBox, controlItem, Switch, SwitchJsIcon, SwitchWrapper } from "lowcoder-design"; import { ReactNode } from "react"; import styled from "styled-components"; import { setFieldsNoTypeCheck } from "util/objectUtils"; diff --git a/client/packages/openblocks/src/comps/controls/codeControl.tsx b/client/packages/openblocks/src/comps/controls/codeControl.tsx index 10c90d461..27b9197c5 100644 --- a/client/packages/openblocks/src/comps/controls/codeControl.tsx +++ b/client/packages/openblocks/src/comps/controls/codeControl.tsx @@ -30,7 +30,7 @@ import { isValidColor, toHex, wrapperToControlItem, -} from "openblocks-design"; +} from "lowcoder-design"; import { ReactNode } from "react"; import { showTransform, diff --git a/client/packages/openblocks/src/comps/controls/codeTextControl.tsx b/client/packages/openblocks/src/comps/controls/codeTextControl.tsx index 254306316..15ad0d57d 100644 --- a/client/packages/openblocks/src/comps/controls/codeTextControl.tsx +++ b/client/packages/openblocks/src/comps/controls/codeTextControl.tsx @@ -4,7 +4,7 @@ import { EditorContext } from "comps/editorState"; import { valueComp } from "comps/generators"; import { CompExposingContext } from "comps/generators/withContext"; import { exposingDataForAutoComplete } from "comps/utils/exposingTypes"; -import { ControlPropertyViewWrapper } from "openblocks-design"; +import { ControlPropertyViewWrapper } from "lowcoder-design"; import _ from "lodash"; import { ReactNode, useContext, useMemo } from "react"; import { CodeEditorProps } from "base/codeEditor/codeEditorTypes"; diff --git a/client/packages/openblocks/src/comps/controls/colorControl.tsx b/client/packages/openblocks/src/comps/controls/colorControl.tsx index 53a2a38d6..0c00f9e75 100644 --- a/client/packages/openblocks/src/comps/controls/colorControl.tsx +++ b/client/packages/openblocks/src/comps/controls/colorControl.tsx @@ -1,5 +1,5 @@ import { ColorCodeControl } from "./codeControl"; -import { ColorSelect, controlItem, ControlPropertyViewWrapper, IconDep } from "openblocks-design"; +import { ColorSelect, controlItem, ControlPropertyViewWrapper, IconDep } from "lowcoder-design"; import styled from "styled-components"; import React, { useEffect, useState } from "react"; import { ControlParams } from "./controlParams"; diff --git a/client/packages/openblocks/src/comps/controls/compNameControl.tsx b/client/packages/openblocks/src/comps/controls/compNameControl.tsx index 8acf298c0..d7bf027cd 100644 --- a/client/packages/openblocks/src/comps/controls/compNameControl.tsx +++ b/client/packages/openblocks/src/comps/controls/compNameControl.tsx @@ -1,8 +1,8 @@ -import { PopupCard } from "openblocks-design"; -import { Input } from "openblocks-design"; +import { PopupCard } from "lowcoder-design"; +import { Input } from "lowcoder-design"; import { EditorContext } from "comps/editorState"; import { valueComp } from "comps/generators"; -import { ControlPropertyViewWrapper } from "openblocks-design"; +import { ControlPropertyViewWrapper } from "lowcoder-design"; import { trans } from "i18n"; import { ReactNode, useContext, useRef, useState } from "react"; import { ControlParams } from "./controlParams"; diff --git a/client/packages/openblocks/src/comps/controls/dropdownControl.tsx b/client/packages/openblocks/src/comps/controls/dropdownControl.tsx index e8551e672..211dd0910 100644 --- a/client/packages/openblocks/src/comps/controls/dropdownControl.tsx +++ b/client/packages/openblocks/src/comps/controls/dropdownControl.tsx @@ -10,7 +10,7 @@ import { Dropdown, OptionsType, ValueFromOption, -} from "openblocks-design"; +} from "lowcoder-design"; import { ReactNode, useEffect, useState } from "react"; import { ControlParams } from "./controlParams"; diff --git a/client/packages/openblocks/src/comps/controls/dropdownInputSimpleControl.tsx b/client/packages/openblocks/src/comps/controls/dropdownInputSimpleControl.tsx index e9f399a8f..afbaed721 100644 --- a/client/packages/openblocks/src/comps/controls/dropdownInputSimpleControl.tsx +++ b/client/packages/openblocks/src/comps/controls/dropdownInputSimpleControl.tsx @@ -1,6 +1,6 @@ import { MultiCompBuilder } from "comps/generators"; import { CompAction, CompActionTypes } from "lowcoder-core"; -import { OptionsType, ValueFromOption } from "openblocks-design"; +import { OptionsType, ValueFromOption } from "lowcoder-design"; import { ReactNode } from "react"; import { ControlPlacement } from "./controlParams"; import { dropdownControl } from "./dropdownControl"; diff --git a/client/packages/openblocks/src/comps/controls/eventHandlerControl.tsx b/client/packages/openblocks/src/comps/controls/eventHandlerControl.tsx index 43551ce1b..38b953c8c 100644 --- a/client/packages/openblocks/src/comps/controls/eventHandlerControl.tsx +++ b/client/packages/openblocks/src/comps/controls/eventHandlerControl.tsx @@ -19,7 +19,7 @@ import { OptionType, QueryConfigItemWrapper, ValueFromOption, -} from "openblocks-design"; +} from "lowcoder-design"; import { Fragment, ReactNode, useContext, useEffect, useState } from "react"; import { memo } from "util/cacheUtils"; import { EditorContext } from "../editorState"; diff --git a/client/packages/openblocks/src/comps/controls/iconControl.tsx b/client/packages/openblocks/src/comps/controls/iconControl.tsx index 7ffd0a3b2..26a768b4e 100644 --- a/client/packages/openblocks/src/comps/controls/iconControl.tsx +++ b/client/packages/openblocks/src/comps/controls/iconControl.tsx @@ -26,7 +26,7 @@ import { TacoButton, useIcon, wrapperToControlItem, -} from "openblocks-design"; +} from "lowcoder-design"; import { ReactNode, useCallback, useState } from "react"; import styled from "styled-components"; import { setFieldsNoTypeCheck } from "util/objectUtils"; diff --git a/client/packages/openblocks/src/comps/controls/keyValueControl.tsx b/client/packages/openblocks/src/comps/controls/keyValueControl.tsx index 2fccabc14..c691e6569 100644 --- a/client/packages/openblocks/src/comps/controls/keyValueControl.tsx +++ b/client/packages/openblocks/src/comps/controls/keyValueControl.tsx @@ -1,4 +1,4 @@ -import { ControlPropertyViewWrapper, KeyValueList, OptionsType } from "openblocks-design"; +import { ControlPropertyViewWrapper, KeyValueList, OptionsType } from "lowcoder-design"; import { ReactNode } from "react"; import styled from "styled-components"; import { MultiCompBuilder } from "../generators"; diff --git a/client/packages/openblocks/src/comps/controls/labelControl.tsx b/client/packages/openblocks/src/comps/controls/labelControl.tsx index cb065ecfb..fbe0d3d96 100644 --- a/client/packages/openblocks/src/comps/controls/labelControl.tsx +++ b/client/packages/openblocks/src/comps/controls/labelControl.tsx @@ -6,14 +6,14 @@ import { NumberControl, StringControl } from "comps/controls/codeControl"; import { dropdownControl } from "comps/controls/dropdownControl"; import { withDefault } from "comps/generators"; import { MultiCompBuilder } from "comps/generators/multi"; -import { labelCss, Section, Tooltip, UnderlineCss } from "openblocks-design"; -import { ValueFromOption } from "openblocks-design"; +import { labelCss, Section, Tooltip, UnderlineCss } from "lowcoder-design"; +import { ValueFromOption } from "lowcoder-design"; import { isEmpty } from "lodash"; import { ReactNode } from "react"; import styled, { css } from "styled-components"; -import { AlignLeft } from "openblocks-design"; -import { AlignRight } from "openblocks-design"; -import { StarIcon } from "openblocks-design"; +import { AlignLeft } from "lowcoder-design"; +import { AlignRight } from "lowcoder-design"; +import { StarIcon } from "lowcoder-design"; type LabelViewProps = Pick & { children: ReactNode; diff --git a/client/packages/openblocks/src/comps/controls/numberSimpleControl.tsx b/client/packages/openblocks/src/comps/controls/numberSimpleControl.tsx index a2899b40a..9dd89a7c3 100644 --- a/client/packages/openblocks/src/comps/controls/numberSimpleControl.tsx +++ b/client/packages/openblocks/src/comps/controls/numberSimpleControl.tsx @@ -1,6 +1,6 @@ import { InputNumber } from "antd"; import { SimpleComp } from "lowcoder-core"; -import { ControlPropertyViewWrapper } from "openblocks-design"; +import { ControlPropertyViewWrapper } from "lowcoder-design"; import React, { ReactNode } from "react"; import styled from "styled-components"; import { ControlParams } from "./controlParams"; diff --git a/client/packages/openblocks/src/comps/controls/optionsControl.tsx b/client/packages/openblocks/src/comps/controls/optionsControl.tsx index 73e955dbc..05f1f6d63 100644 --- a/client/packages/openblocks/src/comps/controls/optionsControl.tsx +++ b/client/packages/openblocks/src/comps/controls/optionsControl.tsx @@ -20,7 +20,7 @@ import { MultiBaseComp, withFunction, } from "lowcoder-core"; -import { AutoArea, controlItem, Option } from "openblocks-design"; +import { AutoArea, controlItem, Option } from "lowcoder-design"; import styled from "styled-components"; import { lastValueIfEqual } from "util/objectUtils"; import { getNextEntityName } from "util/stringUtils"; diff --git a/client/packages/openblocks/src/comps/controls/querySelectControl.tsx b/client/packages/openblocks/src/comps/controls/querySelectControl.tsx index ad27fbd93..435786ca4 100644 --- a/client/packages/openblocks/src/comps/controls/querySelectControl.tsx +++ b/client/packages/openblocks/src/comps/controls/querySelectControl.tsx @@ -1,7 +1,7 @@ import { EditorContext } from "comps/editorState"; import { MultiCompBuilder, valueComp } from "comps/generators"; -import { ControlPropertyViewWrapper } from "openblocks-design"; -import { Dropdown } from "openblocks-design"; +import { ControlPropertyViewWrapper } from "lowcoder-design"; +import { Dropdown } from "lowcoder-design"; import { useContext } from "react"; import { ControlParams } from "./controlParams"; diff --git a/client/packages/openblocks/src/comps/controls/simpleStringControl.tsx b/client/packages/openblocks/src/comps/controls/simpleStringControl.tsx index 830fb6abc..9e5136c2d 100644 --- a/client/packages/openblocks/src/comps/controls/simpleStringControl.tsx +++ b/client/packages/openblocks/src/comps/controls/simpleStringControl.tsx @@ -1,6 +1,6 @@ -import { Input } from "openblocks-design"; +import { Input } from "lowcoder-design"; import { SimpleComp } from "lowcoder-core"; -import { ControlPropertyViewWrapper } from "openblocks-design"; +import { ControlPropertyViewWrapper } from "lowcoder-design"; import { ControlParams } from "./controlParams"; class SimpleStringControl extends SimpleComp { diff --git a/client/packages/openblocks/src/comps/controls/slotControl.tsx b/client/packages/openblocks/src/comps/controls/slotControl.tsx index c677421db..3e7a6f59e 100644 --- a/client/packages/openblocks/src/comps/controls/slotControl.tsx +++ b/client/packages/openblocks/src/comps/controls/slotControl.tsx @@ -11,7 +11,7 @@ import { CanvasContainerID } from "constants/domLocators"; import { Layers } from "constants/Layers"; import { trans } from "i18n"; import { changeChildAction, ConstructorToView } from "lowcoder-core"; -import { HintPlaceHolder, TacoButton } from "openblocks-design"; +import { HintPlaceHolder, TacoButton } from "lowcoder-design"; import { createContext, useContext } from "react"; import styled from "styled-components"; import { NameGenerator } from "comps/utils"; diff --git a/client/packages/openblocks/src/comps/controls/stringSimpleControl.tsx b/client/packages/openblocks/src/comps/controls/stringSimpleControl.tsx index 86e71d415..9fcfac33e 100644 --- a/client/packages/openblocks/src/comps/controls/stringSimpleControl.tsx +++ b/client/packages/openblocks/src/comps/controls/stringSimpleControl.tsx @@ -1,5 +1,5 @@ import { SimpleComp } from "lowcoder-core"; -import { ControlPropertyViewWrapper, Input } from "openblocks-design"; +import { ControlPropertyViewWrapper, Input } from "lowcoder-design"; import { ReactNode } from "react"; import { ControlParams } from "./controlParams"; diff --git a/client/packages/openblocks/src/comps/controls/styleControl.tsx b/client/packages/openblocks/src/comps/controls/styleControl.tsx index c6ed2a6dd..e3c3392f6 100644 --- a/client/packages/openblocks/src/comps/controls/styleControl.tsx +++ b/client/packages/openblocks/src/comps/controls/styleControl.tsx @@ -6,7 +6,7 @@ import { BackgroundColorContext } from "comps/utils/backgroundColorContext"; import { ThemeContext } from "comps/utils/themeContext"; import { trans } from "i18n"; import _ from "lodash"; -import { controlItem, IconRadius, IconReset } from "openblocks-design"; +import { controlItem, IconRadius, IconReset } from "lowcoder-design"; import { useContext } from "react"; import styled from "styled-components"; import { useIsMobile } from "util/hooks"; diff --git a/client/packages/openblocks/src/comps/controls/styleControlConstants.tsx b/client/packages/openblocks/src/comps/controls/styleControlConstants.tsx index 4475a7465..6672b6938 100644 --- a/client/packages/openblocks/src/comps/controls/styleControlConstants.tsx +++ b/client/packages/openblocks/src/comps/controls/styleControlConstants.tsx @@ -1,5 +1,5 @@ import { ThemeDetail } from "api/commonSettingApi"; -import { darkenColor, isDarkColor, lightenColor, toHex } from "openblocks-design"; +import { darkenColor, isDarkColor, lightenColor, toHex } from "lowcoder-design"; import { trans } from "i18n"; import { StyleConfigType } from "./styleControl"; diff --git a/client/packages/openblocks/src/comps/generators/controlCompBuilder.tsx b/client/packages/openblocks/src/comps/generators/controlCompBuilder.tsx index de530ec25..5750693de 100644 --- a/client/packages/openblocks/src/comps/generators/controlCompBuilder.tsx +++ b/client/packages/openblocks/src/comps/generators/controlCompBuilder.tsx @@ -1,5 +1,5 @@ import { Comp, DispatchType } from "lowcoder-core"; -import { controlItem, ControlItemData, ControlNode } from "openblocks-design"; +import { controlItem, ControlItemData, ControlNode } from "lowcoder-design"; import { MultiCompBuilder } from "./multi"; // Build a comp with getPropertyView() returns ControlItem diff --git a/client/packages/openblocks/src/comps/generators/simpleGenerators.tsx b/client/packages/openblocks/src/comps/generators/simpleGenerators.tsx index c1b8d12b6..430b1a55a 100644 --- a/client/packages/openblocks/src/comps/generators/simpleGenerators.tsx +++ b/client/packages/openblocks/src/comps/generators/simpleGenerators.tsx @@ -10,7 +10,7 @@ import { ConstructorToDataType, SimpleComp, } from "lowcoder-core"; -import { ControlPropertyViewWrapper } from "openblocks-design"; +import { ControlPropertyViewWrapper } from "lowcoder-design"; import { ReactNode } from "react"; import { JSONValue } from "util/jsonTypes"; diff --git a/client/packages/openblocks/src/comps/hooks/drawerComp.tsx b/client/packages/openblocks/src/comps/hooks/drawerComp.tsx index 0a87ea8be..a132c4ecf 100644 --- a/client/packages/openblocks/src/comps/hooks/drawerComp.tsx +++ b/client/packages/openblocks/src/comps/hooks/drawerComp.tsx @@ -17,7 +17,7 @@ import { CanvasContainerID } from "constants/domLocators"; import { Layers } from "constants/Layers"; import { trans } from "i18n"; import { changeChildAction } from "lowcoder-core"; -import { Drawer, HintPlaceHolder, Section, sectionNames } from "openblocks-design"; +import { Drawer, HintPlaceHolder, Section, sectionNames } from "lowcoder-design"; import { useCallback } from "react"; import { ResizeHandle } from "react-resizable"; import styled from "styled-components"; diff --git a/client/packages/openblocks/src/comps/hooks/hookComp.tsx b/client/packages/openblocks/src/comps/hooks/hookComp.tsx index 3cd4f20a8..e4e9c09dc 100644 --- a/client/packages/openblocks/src/comps/hooks/hookComp.tsx +++ b/client/packages/openblocks/src/comps/hooks/hookComp.tsx @@ -19,7 +19,7 @@ import { trans } from "i18n"; import _ from "lodash"; import moment from "moment"; import { ConstructorToComp } from "lowcoder-core"; -import { Section, sectionNames } from "openblocks-design"; +import { Section, sectionNames } from "lowcoder-design"; import React, { useContext, useEffect, useMemo } from "react"; import { useInterval, useTitle, useWindowSize } from "react-use"; import { useCurrentUser } from "util/currentUser"; diff --git a/client/packages/openblocks/src/comps/hooks/modalComp.tsx b/client/packages/openblocks/src/comps/hooks/modalComp.tsx index f5e7ad299..1e017ba0e 100644 --- a/client/packages/openblocks/src/comps/hooks/modalComp.tsx +++ b/client/packages/openblocks/src/comps/hooks/modalComp.tsx @@ -10,7 +10,7 @@ import { withMethodExposing } from "comps/generators/withMethodExposing"; import { BackgroundColorContext } from "comps/utils/backgroundColorContext"; import { CanvasContainerID } from "constants/domLocators"; import { Layers } from "constants/Layers"; -import { HintPlaceHolder, Modal, Section, sectionNames } from "openblocks-design"; +import { HintPlaceHolder, Modal, Section, sectionNames } from "lowcoder-design"; import { trans } from "i18n"; import { changeChildAction } from "lowcoder-core"; import { CSSProperties, useCallback } from "react"; diff --git a/client/packages/openblocks/src/comps/index.tsx b/client/packages/openblocks/src/comps/index.tsx index f6d591c59..9de495641 100644 --- a/client/packages/openblocks/src/comps/index.tsx +++ b/client/packages/openblocks/src/comps/index.tsx @@ -91,7 +91,7 @@ import { TreeSelectIcon, UploadCompIcon, VideoCompIcon, -} from "openblocks-design"; +} from "lowcoder-design"; import { defaultFormData, FormComp } from "./comps/formComp/formComp"; import { IFrameComp } from "./comps/iframeComp"; diff --git a/client/packages/openblocks/src/comps/queries/esQuery.tsx b/client/packages/openblocks/src/comps/queries/esQuery.tsx index 2c06d6928..9222231bd 100644 --- a/client/packages/openblocks/src/comps/queries/esQuery.tsx +++ b/client/packages/openblocks/src/comps/queries/esQuery.tsx @@ -16,7 +16,7 @@ import { QueryConfigWrapper, QueryTutorialButton, ValueFromOption, -} from "openblocks-design"; +} from "lowcoder-design"; import { useSelector } from "react-redux"; import styled from "styled-components"; import { QueryTutorials } from "util/tutorialUtils"; diff --git a/client/packages/openblocks/src/comps/queries/googleSheetsQuery.tsx b/client/packages/openblocks/src/comps/queries/googleSheetsQuery.tsx index a4efe8a7f..e29d20ddc 100644 --- a/client/packages/openblocks/src/comps/queries/googleSheetsQuery.tsx +++ b/client/packages/openblocks/src/comps/queries/googleSheetsQuery.tsx @@ -7,7 +7,7 @@ import { QueryConfigWrapper, QueryTutorialButton, ValueFromOption, -} from "openblocks-design"; +} from "lowcoder-design"; import { QueryTutorials } from "util/tutorialUtils"; import { ParamsStringControl } from "../controls/paramsControl"; import { withPropertyViewFn } from "../generators"; diff --git a/client/packages/openblocks/src/comps/queries/inputChangeSet.tsx b/client/packages/openblocks/src/comps/queries/inputChangeSet.tsx index e9aad4d37..296bf78ff 100644 --- a/client/packages/openblocks/src/comps/queries/inputChangeSet.tsx +++ b/client/packages/openblocks/src/comps/queries/inputChangeSet.tsx @@ -1,4 +1,4 @@ -import { ControlPropertyViewWrapper, Input, KeyValueList } from "openblocks-design"; +import { ControlPropertyViewWrapper, Input, KeyValueList } from "lowcoder-design"; import { ControlParams } from "../controls/controlParams"; import { ParamsJsonControl } from "../controls/paramsControl"; import { valueComp, withDefault, withType } from "../generators"; diff --git a/client/packages/openblocks/src/comps/queries/inputSort.tsx b/client/packages/openblocks/src/comps/queries/inputSort.tsx index 4ee84ca2c..9c2003177 100644 --- a/client/packages/openblocks/src/comps/queries/inputSort.tsx +++ b/client/packages/openblocks/src/comps/queries/inputSort.tsx @@ -9,7 +9,7 @@ import { QueryConfigItemWrapper, QueryConfigLabel, QueryConfigWrapper, -} from "openblocks-design"; +} from "lowcoder-design"; import { trans } from "i18n"; const SingleSort = class extends buildQueryCommand({ diff --git a/client/packages/openblocks/src/comps/queries/jsQuery.tsx b/client/packages/openblocks/src/comps/queries/jsQuery.tsx index e4a3be674..24c368915 100644 --- a/client/packages/openblocks/src/comps/queries/jsQuery.tsx +++ b/client/packages/openblocks/src/comps/queries/jsQuery.tsx @@ -2,7 +2,7 @@ import { FunctionControl } from "comps/controls/codeControl"; import { MultiCompBuilder } from "comps/generators"; import { QueryResult } from "./queryComp"; import { QueryTutorials } from "util/tutorialUtils"; -import { DocLink } from "openblocks-design"; +import { DocLink } from "lowcoder-design"; import { getGlobalSettings } from "comps/utils/globalSettings"; import { trans } from "i18n"; import { QUERY_EXECUTION_ERROR, QUERY_EXECUTION_OK } from "../../constants/queryConstants"; diff --git a/client/packages/openblocks/src/comps/queries/libraryQuery.tsx b/client/packages/openblocks/src/comps/queries/libraryQuery.tsx index b9184b134..bc30e137e 100644 --- a/client/packages/openblocks/src/comps/queries/libraryQuery.tsx +++ b/client/packages/openblocks/src/comps/queries/libraryQuery.tsx @@ -16,7 +16,7 @@ import { QueryConfigLabel, QueryConfigWrapper, QueryTutorialButton, -} from "openblocks-design"; +} from "lowcoder-design"; import { Fragment, useEffect } from "react"; import { useDispatch, useSelector } from "react-redux"; import styled from "styled-components"; diff --git a/client/packages/openblocks/src/comps/queries/mongoQuery.tsx b/client/packages/openblocks/src/comps/queries/mongoQuery.tsx index d23a00680..6a2b3612d 100644 --- a/client/packages/openblocks/src/comps/queries/mongoQuery.tsx +++ b/client/packages/openblocks/src/comps/queries/mongoQuery.tsx @@ -1,7 +1,7 @@ import { withPropertyViewFn, withTypeAndChildren } from "comps/generators"; import { includes } from "lodash"; import { CompAction, CompConstructor } from "lowcoder-core"; -import { Dropdown, ValueFromOption } from "openblocks-design"; +import { Dropdown, ValueFromOption } from "lowcoder-design"; import { dropdownControl } from "../controls/dropdownControl"; import { ParamsJsonControl, diff --git a/client/packages/openblocks/src/comps/queries/openBlocksQuery.tsx b/client/packages/openblocks/src/comps/queries/openBlocksQuery.tsx index f0ae97fd1..e8235c5bc 100644 --- a/client/packages/openblocks/src/comps/queries/openBlocksQuery.tsx +++ b/client/packages/openblocks/src/comps/queries/openBlocksQuery.tsx @@ -1,7 +1,7 @@ import { withTypeAndChildrenAbstract } from "comps/generators/withType"; import { trans } from "i18n"; import { CompConstructor } from "lowcoder-core"; -import { Dropdown, ValueFromOption } from "openblocks-design"; +import { Dropdown, ValueFromOption } from "lowcoder-design"; import { buildQueryCommand, FunctionProperty, toQueryView } from "./queryCompUtils"; const CommandOptions = [ diff --git a/client/packages/openblocks/src/comps/queries/pluginQuery/pluginQuery.tsx b/client/packages/openblocks/src/comps/queries/pluginQuery/pluginQuery.tsx index e89f86b79..71584e877 100644 --- a/client/packages/openblocks/src/comps/queries/pluginQuery/pluginQuery.tsx +++ b/client/packages/openblocks/src/comps/queries/pluginQuery/pluginQuery.tsx @@ -22,13 +22,13 @@ import { QueryConfigItemWrapper, QueryConfigLabel, QueryConfigWrapper, -} from "openblocks-design"; +} from "lowcoder-design"; import React, { ReactNode, useEffect, useState } from "react"; import { FunctionProperty, toQueryView } from "../queryCompUtils"; import { CompConstructor } from "lowcoder-core"; import { dropdownControl } from "comps/controls/dropdownControl"; import { ControlParams, ControlType } from "comps/controls/controlParams"; -import MarkdownTooltip from "openblocks-design/src/components/MarkdownTooltip"; +import MarkdownTooltip from "lowcoder-design/src/components/MarkdownTooltip"; import { KeyValueControlParams, keyValueListControl } from "comps/controls/keyValueControl"; import { VariablesControl } from "../httpQuery/graphqlQuery"; diff --git a/client/packages/openblocks/src/comps/queries/query.tsx b/client/packages/openblocks/src/comps/queries/query.tsx index f33863256..075648e01 100644 --- a/client/packages/openblocks/src/comps/queries/query.tsx +++ b/client/packages/openblocks/src/comps/queries/query.tsx @@ -1,4 +1,4 @@ -import { QueryConfigLabel } from "openblocks-design"; +import { QueryConfigLabel } from "lowcoder-design"; import { trans } from "i18n"; export const QueryConfigLabelMethod = () => { diff --git a/client/packages/openblocks/src/comps/queries/queryComp.tsx b/client/packages/openblocks/src/comps/queries/queryComp.tsx index 02fe3380f..b2ef16766 100644 --- a/client/packages/openblocks/src/comps/queries/queryComp.tsx +++ b/client/packages/openblocks/src/comps/queries/queryComp.tsx @@ -43,7 +43,7 @@ import { multiChangeAction, wrapActionExtraInfo, } from "lowcoder-core"; -import { ValueFromOption } from "openblocks-design"; +import { ValueFromOption } from "lowcoder-design"; import { ReactNode, useEffect } from "react"; import { BottomResComp, diff --git a/client/packages/openblocks/src/comps/queries/queryComp/queryConfirmationModal.tsx b/client/packages/openblocks/src/comps/queries/queryComp/queryConfirmationModal.tsx index da8bc80bc..66f5de712 100644 --- a/client/packages/openblocks/src/comps/queries/queryComp/queryConfirmationModal.tsx +++ b/client/packages/openblocks/src/comps/queries/queryComp/queryConfirmationModal.tsx @@ -1,7 +1,7 @@ import { MultiCompBuilder } from "../../generators"; import { BoolPureControl } from "../../controls/boolControl"; import { StringControl } from "../../controls/codeControl"; -import { CustomModal } from "openblocks-design"; +import { CustomModal } from "lowcoder-design"; import { isEmpty } from "lodash"; import { QueryResult } from "../queryComp"; import { trans } from "i18n"; diff --git a/client/packages/openblocks/src/comps/queries/queryComp/queryNotificationControl.tsx b/client/packages/openblocks/src/comps/queries/queryComp/queryNotificationControl.tsx index d8fd3bb2b..c55827b0e 100644 --- a/client/packages/openblocks/src/comps/queries/queryComp/queryNotificationControl.tsx +++ b/client/packages/openblocks/src/comps/queries/queryComp/queryNotificationControl.tsx @@ -9,7 +9,7 @@ import { QueryConfigWrapper, QueryPropertyViewWrapper, QuerySectionWrapper, -} from "openblocks-design"; +} from "lowcoder-design"; import _, { pick } from "lodash"; import { ControlParams } from "../../controls/controlParams"; import styled from "styled-components"; diff --git a/client/packages/openblocks/src/comps/queries/queryComp/queryPropertyView.tsx b/client/packages/openblocks/src/comps/queries/queryComp/queryPropertyView.tsx index fdb1467b1..6635e4eab 100644 --- a/client/packages/openblocks/src/comps/queries/queryComp/queryPropertyView.tsx +++ b/client/packages/openblocks/src/comps/queries/queryComp/queryPropertyView.tsx @@ -20,7 +20,7 @@ import { QueryPropertyViewWrapper, QuerySectionWrapper, TriggerTypeStyled, -} from "openblocks-design"; +} from "lowcoder-design"; import { BottomTabs } from "pages/editor/bottom/BottomTabs"; import { useContext, useMemo } from "react"; import { useSelector } from "react-redux"; diff --git a/client/packages/openblocks/src/comps/queries/redisQuery.tsx b/client/packages/openblocks/src/comps/queries/redisQuery.tsx index 79bd96c38..530553c7e 100644 --- a/client/packages/openblocks/src/comps/queries/redisQuery.tsx +++ b/client/packages/openblocks/src/comps/queries/redisQuery.tsx @@ -7,7 +7,7 @@ import { QueryConfigWrapper, QueryTutorialButton, ValueFromOption, -} from "openblocks-design"; +} from "lowcoder-design"; import { QueryTutorials } from "util/tutorialUtils"; import { ParamsNumberControl, diff --git a/client/packages/openblocks/src/comps/queries/resourceDropdown.tsx b/client/packages/openblocks/src/comps/queries/resourceDropdown.tsx index a6643284b..47f14a644 100644 --- a/client/packages/openblocks/src/comps/queries/resourceDropdown.tsx +++ b/client/packages/openblocks/src/comps/queries/resourceDropdown.tsx @@ -3,7 +3,7 @@ import { useSelector } from "react-redux"; import React, { useContext, useMemo, useState } from "react"; import { DataSourceTypeInfo } from "api/datasourceApi"; import styled from "styled-components"; -import { CustomSelect, EllipsisTextCss } from "openblocks-design"; +import { CustomSelect, EllipsisTextCss } from "lowcoder-design"; import { DatasourceModal } from "pages/datasource/datasourceModal"; import { InputStatus } from "antd/lib/_util/statusUtils"; import { getDataSource, getDataSourceTypes } from "redux/selectors/datasourceSelectors"; diff --git a/client/packages/openblocks/src/comps/queries/sqlQuery/FilterComp.tsx b/client/packages/openblocks/src/comps/queries/sqlQuery/FilterComp.tsx index eabc23e59..1fb2a9669 100644 --- a/client/packages/openblocks/src/comps/queries/sqlQuery/FilterComp.tsx +++ b/client/packages/openblocks/src/comps/queries/sqlQuery/FilterComp.tsx @@ -5,8 +5,8 @@ import { ParamsJsonControl } from "../../controls/paramsControl"; import { ColumnNameDropdown } from "./columnNameDropdown"; import { list } from "../../generators/list"; import { ControlParams } from "../../controls/controlParams"; -import { ControlPropertyViewWrapper } from "openblocks-design"; -import { KeyValueList } from "openblocks-design"; +import { ControlPropertyViewWrapper } from "lowcoder-design"; +import { KeyValueList } from "lowcoder-design"; import React from "react"; const SingleFilter = class extends buildQueryCommand({ diff --git a/client/packages/openblocks/src/comps/queries/sqlQuery/SQLQuery.tsx b/client/packages/openblocks/src/comps/queries/sqlQuery/SQLQuery.tsx index 309b1c087..cb1234009 100644 --- a/client/packages/openblocks/src/comps/queries/sqlQuery/SQLQuery.tsx +++ b/client/packages/openblocks/src/comps/queries/sqlQuery/SQLQuery.tsx @@ -12,7 +12,7 @@ import { QueryConfigItemWrapper, QueryConfigLabel, QueryConfigWrapper, -} from "openblocks-design"; +} from "lowcoder-design"; import { BoolPureControl } from "../../controls/boolControl"; import { dropdownControl } from "../../controls/dropdownControl"; import { TableNameComp } from "./tableNameComp"; diff --git a/client/packages/openblocks/src/comps/queries/sqlQuery/changeSetComp.tsx b/client/packages/openblocks/src/comps/queries/sqlQuery/changeSetComp.tsx index 28942dd14..dc9eb2e20 100644 --- a/client/packages/openblocks/src/comps/queries/sqlQuery/changeSetComp.tsx +++ b/client/packages/openblocks/src/comps/queries/sqlQuery/changeSetComp.tsx @@ -1,5 +1,5 @@ import { trans } from "i18n"; -import { ControlPropertyViewWrapper, Dropdown, KeyValueList } from "openblocks-design"; +import { ControlPropertyViewWrapper, Dropdown, KeyValueList } from "lowcoder-design"; import { ControlParams } from "../../controls/controlParams"; import { ParamsJsonControl } from "../../controls/paramsControl"; import { valueComp, withDefault, withType } from "../../generators"; diff --git a/client/packages/openblocks/src/comps/queries/sqlQuery/columnNameDropdown.tsx b/client/packages/openblocks/src/comps/queries/sqlQuery/columnNameDropdown.tsx index 8dd5e2021..e33be20bd 100644 --- a/client/packages/openblocks/src/comps/queries/sqlQuery/columnNameDropdown.tsx +++ b/client/packages/openblocks/src/comps/queries/sqlQuery/columnNameDropdown.tsx @@ -1,7 +1,7 @@ import { DispatchType } from "lowcoder-core"; import { ControlPlacement } from "../../controls/controlParams"; import React, { useContext } from "react"; -import { Dropdown, OptionsType } from "openblocks-design"; +import { Dropdown, OptionsType } from "lowcoder-design"; import { isEmpty, values } from "lodash"; import { useSelector } from "react-redux"; import { getDataSourceStructures } from "../../../redux/selectors/datasourceSelectors"; diff --git a/client/packages/openblocks/src/comps/queries/sqlQuery/tableNameComp.tsx b/client/packages/openblocks/src/comps/queries/sqlQuery/tableNameComp.tsx index cf139b1a9..2ca213918 100644 --- a/client/packages/openblocks/src/comps/queries/sqlQuery/tableNameComp.tsx +++ b/client/packages/openblocks/src/comps/queries/sqlQuery/tableNameComp.tsx @@ -1,7 +1,7 @@ import { trans } from "i18n"; import { isEmpty } from "lodash"; import { changeValueAction, DispatchType } from "lowcoder-core"; -import { Dropdown, OptionsType } from "openblocks-design"; +import { Dropdown, OptionsType } from "lowcoder-design"; import { useContext } from "react"; import { useSelector } from "react-redux"; import { getDataSourceStructures } from "../../../redux/selectors/datasourceSelectors"; diff --git a/client/packages/openblocks/src/comps/utils/gridCompOperator.ts b/client/packages/openblocks/src/comps/utils/gridCompOperator.ts index 4e28fcbed..253af1137 100644 --- a/client/packages/openblocks/src/comps/utils/gridCompOperator.ts +++ b/client/packages/openblocks/src/comps/utils/gridCompOperator.ts @@ -24,7 +24,7 @@ import { replaceCompAction, wrapActionExtraInfo, } from "lowcoder-core"; -import { CustomModal } from "openblocks-design"; +import { CustomModal } from "lowcoder-design"; import { pasteKey, undoKey } from "util/keyUtils"; import { genRandomKey } from "./idGenerator"; import { getLatestVersion, getRemoteCompType, parseCompType } from "./remote"; diff --git a/client/packages/openblocks/src/index.less b/client/packages/openblocks/src/index.less index a675cd2e6..8dd4c2ca7 100644 --- a/client/packages/openblocks/src/index.less +++ b/client/packages/openblocks/src/index.less @@ -1,7 +1,7 @@ @import "antd/dist/antd.less"; @import "react-grid-layout/css/styles.css"; @import "simplebar/dist/simplebar.min.css"; -@import "openblocks-design/src/index.less"; +@import "lowcoder-design/src/index.less"; // fixme: move into comps @import "github-markdown-css/github-markdown-light.css"; diff --git a/client/packages/openblocks/src/index.sdk.ts b/client/packages/openblocks/src/index.sdk.ts index b0ee986cc..775a0dd2c 100644 --- a/client/packages/openblocks/src/index.sdk.ts +++ b/client/packages/openblocks/src/index.sdk.ts @@ -53,7 +53,7 @@ export * from "comps/utils"; export * from "comps/utils/themeContext"; // design -export * from "openblocks-design"; +export * from "lowcoder-design"; export * from "lowcoder-core"; // controls diff --git a/client/packages/openblocks/src/layout/compSelectionWrapper.tsx b/client/packages/openblocks/src/layout/compSelectionWrapper.tsx index ac4d5af00..4214ab6d9 100644 --- a/client/packages/openblocks/src/layout/compSelectionWrapper.tsx +++ b/client/packages/openblocks/src/layout/compSelectionWrapper.tsx @@ -2,10 +2,10 @@ import { EditorContext } from "comps/editorState"; import { UICompType } from "comps/uiCompRegistry"; import { Layers } from "constants/Layers"; import { ModulePrimaryColor, PrimaryColor } from "constants/style"; -import { fadeColor } from "openblocks-design"; -import { CloseEyeIcon } from "openblocks-design"; -import { DragWhiteIcon } from "openblocks-design"; -import { WidthDragIcon } from "openblocks-design"; +import { fadeColor } from "lowcoder-design"; +import { CloseEyeIcon } from "lowcoder-design"; +import { DragWhiteIcon } from "lowcoder-design"; +import { WidthDragIcon } from "lowcoder-design"; import React, { MouseEvent, MouseEventHandler, @@ -16,7 +16,7 @@ import React, { } from "react"; import ReactResizeDetector, { useResizeDetector } from "react-resize-detector"; import styled, { css } from "styled-components"; -import { EllipsisTextCss } from "openblocks-design"; +import { EllipsisTextCss } from "lowcoder-design"; import { draggingUtils } from "./draggingUtils"; import { ResizeHandleAxis } from "./gridLayoutPropTypes"; diff --git a/client/packages/openblocks/src/pages/ApplicationV2/AppFromTemplate.tsx b/client/packages/openblocks/src/pages/ApplicationV2/AppFromTemplate.tsx index 89235f557..ce5ad3b1f 100644 --- a/client/packages/openblocks/src/pages/ApplicationV2/AppFromTemplate.tsx +++ b/client/packages/openblocks/src/pages/ApplicationV2/AppFromTemplate.tsx @@ -4,9 +4,9 @@ import { validateResponse } from "api/apiUtils"; import { message } from "antd"; import history from "util/history"; import { APPLICATION_VIEW_URL, ALL_APPLICATIONS_URL } from "constants/routesURL"; -import { WhiteLoading } from "openblocks-design"; +import { WhiteLoading } from "lowcoder-design"; import React, { useEffect } from "react"; -import { CommonTextLabel } from "openblocks-design"; +import { CommonTextLabel } from "lowcoder-design"; import styled from "styled-components"; import { trans } from "i18n"; import { ERROR_CODES } from "constants/apiConstants"; diff --git a/client/packages/openblocks/src/pages/ApplicationV2/CreateDropdown.tsx b/client/packages/openblocks/src/pages/ApplicationV2/CreateDropdown.tsx index 039ce65b9..e37338da8 100644 --- a/client/packages/openblocks/src/pages/ApplicationV2/CreateDropdown.tsx +++ b/client/packages/openblocks/src/pages/ApplicationV2/CreateDropdown.tsx @@ -9,7 +9,7 @@ import { PackUpIcon, PcNavIcon, TacoButton, -} from "openblocks-design"; +} from "lowcoder-design"; import React, { FunctionComponent, useState } from "react"; import { ItemType } from "antd/lib/menu/hooks/useItems"; import { HomeResInfo } from "../../util/homeResUtils"; diff --git a/client/packages/openblocks/src/pages/ApplicationV2/HomeLayout.tsx b/client/packages/openblocks/src/pages/ApplicationV2/HomeLayout.tsx index 3a1148e00..11c50bfac 100644 --- a/client/packages/openblocks/src/pages/ApplicationV2/HomeLayout.tsx +++ b/client/packages/openblocks/src/pages/ApplicationV2/HomeLayout.tsx @@ -14,7 +14,7 @@ import { HomeEmptyIcon, HomeListIcon, Search, -} from "openblocks-design"; +} from "lowcoder-design"; import { canEditApp, canManageApp } from "../../util/permissionUtils"; import { HomeResKey, HomeResTypeEnum, NavigationTypes } from "../../types/homeRes"; import { HomeResInfo } from "../../util/homeResUtils"; diff --git a/client/packages/openblocks/src/pages/ApplicationV2/HomeResCard.tsx b/client/packages/openblocks/src/pages/ApplicationV2/HomeResCard.tsx index 76f996262..3c64726c6 100644 --- a/client/packages/openblocks/src/pages/ApplicationV2/HomeResCard.tsx +++ b/client/packages/openblocks/src/pages/ApplicationV2/HomeResCard.tsx @@ -1,5 +1,5 @@ import { message } from "antd"; -import { TacoButton } from "openblocks-design"; +import { TacoButton } from "lowcoder-design"; import React, { useState } from "react"; import { useDispatch } from "react-redux"; import { updateAppMetaAction } from "redux/reduxActions/applicationActions"; diff --git a/client/packages/openblocks/src/pages/ApplicationV2/HomeResOptions.tsx b/client/packages/openblocks/src/pages/ApplicationV2/HomeResOptions.tsx index 22aff7a8e..c6e2a6735 100644 --- a/client/packages/openblocks/src/pages/ApplicationV2/HomeResOptions.tsx +++ b/client/packages/openblocks/src/pages/ApplicationV2/HomeResOptions.tsx @@ -1,7 +1,7 @@ import { HomeRes } from "./HomeLayout"; import { HomeResTypeEnum } from "../../types/homeRes"; import { exportApplicationAsJSONFile } from "./components/AppImport"; -import { CustomModal, EditPopover, EditPopoverItemType, PointIcon } from "openblocks-design"; +import { CustomModal, EditPopover, EditPopoverItemType, PointIcon } from "lowcoder-design"; import { HomeResInfo } from "../../util/homeResUtils"; import { recycleApplication } from "../../redux/reduxActions/applicationActions"; import { deleteFolder } from "../../redux/reduxActions/folderActions"; diff --git a/client/packages/openblocks/src/pages/ApplicationV2/HomeTableView.tsx b/client/packages/openblocks/src/pages/ApplicationV2/HomeTableView.tsx index 838bfcd4e..59caabcc7 100644 --- a/client/packages/openblocks/src/pages/ApplicationV2/HomeTableView.tsx +++ b/client/packages/openblocks/src/pages/ApplicationV2/HomeTableView.tsx @@ -1,6 +1,6 @@ import { timestampToHumanReadable } from "../../util/dateTimeUtils"; import { Table } from "../../components/Table"; -import { TacoButton } from "openblocks-design"; +import { TacoButton } from "lowcoder-design"; import styled from "styled-components"; import { useDispatch } from "react-redux"; import { diff --git a/client/packages/openblocks/src/pages/ApplicationV2/MoveToFolderModal.tsx b/client/packages/openblocks/src/pages/ApplicationV2/MoveToFolderModal.tsx index 34491627d..c9e3d2abc 100644 --- a/client/packages/openblocks/src/pages/ApplicationV2/MoveToFolderModal.tsx +++ b/client/packages/openblocks/src/pages/ApplicationV2/MoveToFolderModal.tsx @@ -10,7 +10,7 @@ import { FormSection, FormSelectItem, TacoButton, -} from "openblocks-design"; +} from "lowcoder-design"; import { moveToFolder } from "../../redux/reduxActions/folderActions"; import styled from "styled-components"; import { trans } from "../../i18n"; diff --git a/client/packages/openblocks/src/pages/ApplicationV2/TrashTableView.tsx b/client/packages/openblocks/src/pages/ApplicationV2/TrashTableView.tsx index ac5e0faad..861dbd8af 100644 --- a/client/packages/openblocks/src/pages/ApplicationV2/TrashTableView.tsx +++ b/client/packages/openblocks/src/pages/ApplicationV2/TrashTableView.tsx @@ -1,6 +1,6 @@ import { timestampToHumanReadable } from "../../util/dateTimeUtils"; import { Table } from "../../components/Table"; -import { CustomModal, TacoButton } from "openblocks-design"; +import { CustomModal, TacoButton } from "lowcoder-design"; import styled from "styled-components"; import { useDispatch } from "react-redux"; import { HomeResInfo } from "../../util/homeResUtils"; diff --git a/client/packages/openblocks/src/pages/ApplicationV2/index.tsx b/client/packages/openblocks/src/pages/ApplicationV2/index.tsx index ab9ceabbd..51a2e6989 100644 --- a/client/packages/openblocks/src/pages/ApplicationV2/index.tsx +++ b/client/packages/openblocks/src/pages/ApplicationV2/index.tsx @@ -30,7 +30,7 @@ import { PointIcon, RecyclerActiveIcon, RecyclerIcon, -} from "openblocks-design"; +} from "lowcoder-design"; import React, { useEffect, useState } from "react"; import { fetchAllApplications, fetchHomeData } from "redux/reduxActions/applicationActions"; import { getHomeOrg, normalAppListSelector } from "redux/selectors/applicationSelector"; diff --git a/client/packages/openblocks/src/pages/ApplicationV2/useCreateFolder.tsx b/client/packages/openblocks/src/pages/ApplicationV2/useCreateFolder.tsx index 61e349b98..36d27b637 100644 --- a/client/packages/openblocks/src/pages/ApplicationV2/useCreateFolder.tsx +++ b/client/packages/openblocks/src/pages/ApplicationV2/useCreateFolder.tsx @@ -1,4 +1,4 @@ -import { CustomModal, DatasourceForm, FormInputItem, FormSection } from "openblocks-design"; +import { CustomModal, DatasourceForm, FormInputItem, FormSection } from "lowcoder-design"; import { RuleObject, StoreValue } from "rc-field-form/lib/interface"; import { createFolder } from "../../redux/reduxActions/folderActions"; import React, { useCallback, useMemo } from "react"; diff --git a/client/packages/openblocks/src/pages/ComponentDoc/common/Example.tsx b/client/packages/openblocks/src/pages/ComponentDoc/common/Example.tsx index 144e50c0d..73402350b 100644 --- a/client/packages/openblocks/src/pages/ComponentDoc/common/Example.tsx +++ b/client/packages/openblocks/src/pages/ComponentDoc/common/Example.tsx @@ -3,7 +3,7 @@ import { evalAndReduceWithExposing } from "comps/utils"; import _ from "lodash"; import React, { ReactNode, useContext, useEffect, useState } from "react"; import styled from "styled-components"; -import { ShowBorderIcon, EditIcon } from "openblocks-design"; +import { ShowBorderIcon, EditIcon } from "lowcoder-design"; import propNames from "../propNameText"; import valueTranslate from "../propValueText"; import { AppTypeEnum } from "constants/applicationConstants"; diff --git a/client/packages/openblocks/src/pages/ComponentDoc/examples/presentationComp/chart.tsx b/client/packages/openblocks/src/pages/ComponentDoc/examples/presentationComp/chart.tsx index 4ac362081..4ae6fcda9 100644 --- a/client/packages/openblocks/src/pages/ComponentDoc/examples/presentationComp/chart.tsx +++ b/client/packages/openblocks/src/pages/ComponentDoc/examples/presentationComp/chart.tsx @@ -1,6 +1,6 @@ import { uiCompRegistry } from "comps/uiCompRegistry"; import { trans } from "i18n"; -import { chartColorPalette } from "openblocks-design"; +import { chartColorPalette } from "lowcoder-design"; import Example from "../../common/Example"; import ExampleGroup from "../../common/ExampleGroup"; diff --git a/client/packages/openblocks/src/pages/ComponentDoc/index.tsx b/client/packages/openblocks/src/pages/ComponentDoc/index.tsx index e5722d60e..acb399e67 100644 --- a/client/packages/openblocks/src/pages/ComponentDoc/index.tsx +++ b/client/packages/openblocks/src/pages/ComponentDoc/index.tsx @@ -1,4 +1,4 @@ -import { Search } from "openblocks-design"; +import { Search } from "lowcoder-design"; import { useEffect, useState } from "react"; import { Link, useParams } from "react-router-dom"; import styled from "styled-components"; diff --git a/client/packages/openblocks/src/pages/common/commonLayout.tsx b/client/packages/openblocks/src/pages/common/commonLayout.tsx index 5b30cd7cd..f78ab704f 100644 --- a/client/packages/openblocks/src/pages/common/commonLayout.tsx +++ b/client/packages/openblocks/src/pages/common/commonLayout.tsx @@ -1,7 +1,7 @@ import { Route, Switch, useLocation } from "react-router-dom"; import { Layout } from "antd"; import { AppHeader } from "pages/common/header"; -import { Menu } from "openblocks-design"; +import { Menu } from "lowcoder-design"; import history from "util/history"; import styled from "styled-components"; import * as React from "react"; diff --git a/client/packages/openblocks/src/pages/common/copyModal.tsx b/client/packages/openblocks/src/pages/common/copyModal.tsx index a518393d4..a88e3bda4 100644 --- a/client/packages/openblocks/src/pages/common/copyModal.tsx +++ b/client/packages/openblocks/src/pages/common/copyModal.tsx @@ -1,6 +1,6 @@ import { message } from "antd"; import { APPLICATION_VIEW_URL } from "constants/routesURL"; -import { CustomModal, CustomSelect, TacoInput } from "openblocks-design"; +import { CustomModal, CustomSelect, TacoInput } from "lowcoder-design"; import { trans } from "i18n"; import { useState } from "react"; import { useSelector } from "react-redux"; diff --git a/client/packages/openblocks/src/pages/common/header.tsx b/client/packages/openblocks/src/pages/common/header.tsx index b67134d34..4e208305a 100644 --- a/client/packages/openblocks/src/pages/common/header.tsx +++ b/client/packages/openblocks/src/pages/common/header.tsx @@ -15,7 +15,7 @@ import { PackUpIcon, Right, TacoButton, -} from "openblocks-design"; +} from "lowcoder-design"; import { trans } from "i18n"; import moment from "moment"; import { useContext, useState } from "react"; diff --git a/client/packages/openblocks/src/pages/common/headerStartDropdown.tsx b/client/packages/openblocks/src/pages/common/headerStartDropdown.tsx index fdae432a5..b60b0cf5a 100644 --- a/client/packages/openblocks/src/pages/common/headerStartDropdown.tsx +++ b/client/packages/openblocks/src/pages/common/headerStartDropdown.tsx @@ -8,7 +8,7 @@ import { PackUpIcon, TextWrapper, ModuleIcon, -} from "openblocks-design"; +} from "lowcoder-design"; import { trans, transToNode } from "i18n"; import { exportApplicationAsJSONFile } from "pages/ApplicationV2/components/AppImport"; import { useContext, useState } from "react"; diff --git a/client/packages/openblocks/src/pages/common/help.tsx b/client/packages/openblocks/src/pages/common/help.tsx index 0072fbfb8..78b32cc0d 100644 --- a/client/packages/openblocks/src/pages/common/help.tsx +++ b/client/packages/openblocks/src/pages/common/help.tsx @@ -1,6 +1,6 @@ import styled from "styled-components"; import { Layers } from "constants/Layers"; -import { HelpIcon, LeftHelpIcon, HelpGithubIcon, HelpDiscordIcon } from "openblocks-design"; +import { HelpIcon, LeftHelpIcon, HelpGithubIcon, HelpDiscordIcon } from "lowcoder-design"; import { VideoIcon, ChatIcon, DocIcon, TutorialIcon, ShortcutIcon } from "assets/icons"; import TutorialVideoPic from "assets/images/tutorialVideoThumbnail.png"; import { Dropdown, Popover, Tooltip } from "antd"; @@ -15,14 +15,14 @@ import { createApplication } from "redux/reduxActions/applicationActions"; import history from "util/history"; import { buildAppRouteWithState } from "constants/routesURL"; import { getUser } from "redux/selectors/usersSelectors"; -import { DropdownMenu } from "openblocks-design"; +import { DropdownMenu } from "lowcoder-design"; import VideoDialog from "pages/common/videoDialog"; import { PlatformApi } from "api/platformApi"; -import { CommonTipsOverlay } from "openblocks-design"; +import { CommonTipsOverlay } from "lowcoder-design"; import { markUserStatus } from "redux/reduxActions/userActions"; import { AppTypeEnum } from "constants/applicationConstants"; import { ShortcutListPopup } from "./shortcutListPopup"; -import { QuestionIcon, UpgradeIcon } from "openblocks-design"; +import { QuestionIcon, UpgradeIcon } from "lowcoder-design"; import { trans } from "i18n"; import { localEnv } from "util/envUtils"; diff --git a/client/packages/openblocks/src/pages/common/inviteDialog.tsx b/client/packages/openblocks/src/pages/common/inviteDialog.tsx index 6488aba8e..4d971805e 100644 --- a/client/packages/openblocks/src/pages/common/inviteDialog.tsx +++ b/client/packages/openblocks/src/pages/common/inviteDialog.tsx @@ -1,13 +1,13 @@ import { message } from "antd"; import InviteApi, { InviteInfo } from "api/inviteApi"; -import { CommonTextLabel, CustomModal, TacoButton, TacoInput } from "openblocks-design"; +import { CommonTextLabel, CustomModal, TacoButton, TacoInput } from "lowcoder-design"; import { CSSProperties, ReactNode, useEffect, useState } from "react"; import { connect } from "react-redux"; import { AppState } from "redux/reducers"; import { getUser } from "redux/selectors/usersSelectors"; import styled from "styled-components"; import { validateResponse } from "api/apiUtils"; -import { WhiteLoading } from "openblocks-design"; +import { WhiteLoading } from "lowcoder-design"; import { genInviteLink } from "util/urlUtils"; import { HelpText } from "components/HelpText"; import copyToClipboard from "copy-to-clipboard"; diff --git a/client/packages/openblocks/src/pages/common/previewHeader.tsx b/client/packages/openblocks/src/pages/common/previewHeader.tsx index 4c377a3d6..c86e7df3b 100644 --- a/client/packages/openblocks/src/pages/common/previewHeader.tsx +++ b/client/packages/openblocks/src/pages/common/previewHeader.tsx @@ -3,7 +3,7 @@ import Header from "components/layout/Header"; import { SHARE_TITLE } from "constants/apiConstants"; import { ALL_APPLICATIONS_URL, APPLICATION_VIEW_URL, AUTH_LOGIN_URL } from "constants/routesURL"; import { User } from "constants/userConstants"; -import { EllipsisTextCss, isDarkColor, TacoButton, TextEditIcon } from "openblocks-design"; +import { EllipsisTextCss, isDarkColor, TacoButton, TextEditIcon } from "lowcoder-design"; import { useSelector } from "react-redux"; import { currentApplication, getTemplateId } from "redux/selectors/applicationSelector"; import { getUser, isFetchingUser } from "redux/selectors/usersSelectors"; diff --git a/client/packages/openblocks/src/pages/common/profileDropdown.tsx b/client/packages/openblocks/src/pages/common/profileDropdown.tsx index 2a160a4ab..5722824b8 100644 --- a/client/packages/openblocks/src/pages/common/profileDropdown.tsx +++ b/client/packages/openblocks/src/pages/common/profileDropdown.tsx @@ -12,7 +12,7 @@ import { DropDownSubMenu, EditIcon, PackUpIcon, -} from "openblocks-design"; +} from "lowcoder-design"; import ProfileSettingModal from "pages/setting/profile"; import React, { useMemo } from "react"; import { useDispatch, useSelector } from "react-redux"; diff --git a/client/packages/openblocks/src/pages/common/shortcutListPopup.tsx b/client/packages/openblocks/src/pages/common/shortcutListPopup.tsx index 242705785..ffca77850 100644 --- a/client/packages/openblocks/src/pages/common/shortcutListPopup.tsx +++ b/client/packages/openblocks/src/pages/common/shortcutListPopup.tsx @@ -1,5 +1,5 @@ import styled from "styled-components"; -import { CloseIcon } from "openblocks-design"; +import { CloseIcon } from "lowcoder-design"; import { allShortcutGroups } from "./shortcutConfigs"; import { isMac } from "util/commonUtils"; import { trans } from "i18n"; diff --git a/client/packages/openblocks/src/pages/common/styledComponent.tsx b/client/packages/openblocks/src/pages/common/styledComponent.tsx index b214b5f41..517e627ba 100644 --- a/client/packages/openblocks/src/pages/common/styledComponent.tsx +++ b/client/packages/openblocks/src/pages/common/styledComponent.tsx @@ -2,7 +2,7 @@ import React, { CSSProperties } from "react"; import styled from "styled-components"; import { message } from "antd"; -import { CommonGrayLabel, EmptyDataIcon } from "openblocks-design"; +import { CommonGrayLabel, EmptyDataIcon } from "lowcoder-design"; import { Layers } from "constants/Layers"; import _ from "lodash"; import { useResizeDetector } from "react-resize-detector"; diff --git a/client/packages/openblocks/src/pages/common/videoDialog.tsx b/client/packages/openblocks/src/pages/common/videoDialog.tsx index da1526c4d..a580c6a0d 100644 --- a/client/packages/openblocks/src/pages/common/videoDialog.tsx +++ b/client/packages/openblocks/src/pages/common/videoDialog.tsx @@ -1,6 +1,6 @@ import React, { useEffect, useRef } from "react"; import { Modal } from "antd"; -import { CloseIcon } from "openblocks-design"; +import { CloseIcon } from "lowcoder-design"; import styled from "styled-components"; import { Layers } from "constants/Layers"; diff --git a/client/packages/openblocks/src/pages/datasource/datasourceEditPage.tsx b/client/packages/openblocks/src/pages/datasource/datasourceEditPage.tsx index 44e0c4ab8..d9a849fef 100644 --- a/client/packages/openblocks/src/pages/datasource/datasourceEditPage.tsx +++ b/client/packages/openblocks/src/pages/datasource/datasourceEditPage.tsx @@ -2,7 +2,7 @@ import styled from "styled-components"; import history from "../../util/history"; import { Button } from "antd"; import { useCallback, useMemo, useState } from "react"; -import { CopyTextButton, DocIcon, PackUpIcon, TacoButton } from "openblocks-design"; +import { CopyTextButton, DocIcon, PackUpIcon, TacoButton } from "lowcoder-design"; import { useDatasourceForm } from "./form/useDatasourceForm"; import { useParams } from "react-router-dom"; import { DATASOURCE_URL } from "../../constants/routesURL"; diff --git a/client/packages/openblocks/src/pages/datasource/datasourceList.tsx b/client/packages/openblocks/src/pages/datasource/datasourceList.tsx index dd55fc788..0ba7b2f3d 100644 --- a/client/packages/openblocks/src/pages/datasource/datasourceList.tsx +++ b/client/packages/openblocks/src/pages/datasource/datasourceList.tsx @@ -1,5 +1,5 @@ import styled from "styled-components"; -import { EditPopover, PointIcon, Search, TacoButton } from "openblocks-design"; +import { EditPopover, PointIcon, Search, TacoButton } from "lowcoder-design"; import React, { useState } from "react"; import { useDispatch, useSelector } from "react-redux"; import { getDataSource, getDataSourceTypesMap } from "../../redux/selectors/datasourceSelectors"; diff --git a/client/packages/openblocks/src/pages/datasource/datasourceModal.tsx b/client/packages/openblocks/src/pages/datasource/datasourceModal.tsx index 5c0390bd3..334db5c15 100644 --- a/client/packages/openblocks/src/pages/datasource/datasourceModal.tsx +++ b/client/packages/openblocks/src/pages/datasource/datasourceModal.tsx @@ -1,6 +1,6 @@ import React, { ReactNode, useEffect, useMemo, useState } from "react"; import { DataSourceTypeInfo } from "../../api/datasourceApi"; -import { AddIcon, DocIcon, ModalFooterWrapper, TacoButton } from "openblocks-design"; +import { AddIcon, DocIcon, ModalFooterWrapper, TacoButton } from "lowcoder-design"; import styled from "styled-components"; import { Button } from "antd"; import { useDatasourceForm } from "./form/useDatasourceForm"; diff --git a/client/packages/openblocks/src/pages/datasource/form.tsx b/client/packages/openblocks/src/pages/datasource/form.tsx index c9e55ddca..f54aaf3f0 100644 --- a/client/packages/openblocks/src/pages/datasource/form.tsx +++ b/client/packages/openblocks/src/pages/datasource/form.tsx @@ -5,7 +5,7 @@ import { FormSectionLabel, FormSelectItem, FormTextAreaItem, -} from "openblocks-design"; +} from "lowcoder-design"; import { trans } from "i18n"; import { toNumber } from "lodash"; import { useHostCheck } from "./form/useHostCheck"; diff --git a/client/packages/openblocks/src/pages/datasource/form/datasourceFormRegistry.tsx b/client/packages/openblocks/src/pages/datasource/form/datasourceFormRegistry.tsx index 1c2b5886c..8dfeb017a 100644 --- a/client/packages/openblocks/src/pages/datasource/form/datasourceFormRegistry.tsx +++ b/client/packages/openblocks/src/pages/datasource/form/datasourceFormRegistry.tsx @@ -4,7 +4,7 @@ import { EsDatasourceForm } from "./esDatasourceForm"; import { SMTPDatasourceForm } from "./smtpDatasourceForm"; import { FormInstance } from "antd"; import { MongoDatasourceForm } from "./mongoDatasourceForm"; -import { FormSize } from "openblocks-design"; +import { FormSize } from "lowcoder-design"; import { GoogleSheetsDatasourceForm } from "./googleSheetsDatasourceForm"; import { DatasourceType } from "@openblocks-ee/constants/queryConstants"; import { Datasource } from "@openblocks-ee/constants/datasourceConstants"; diff --git a/client/packages/openblocks/src/pages/datasource/form/esDatasourceForm.tsx b/client/packages/openblocks/src/pages/datasource/form/esDatasourceForm.tsx index 6106029ae..7cd423c02 100644 --- a/client/packages/openblocks/src/pages/datasource/form/esDatasourceForm.tsx +++ b/client/packages/openblocks/src/pages/datasource/form/esDatasourceForm.tsx @@ -1,5 +1,5 @@ import React from "react"; -import { DatasourceForm, FormInputItem, FormSection } from "openblocks-design"; +import { DatasourceForm, FormInputItem, FormSection } from "lowcoder-design"; import { EsConfig } from "../../../api/datasourceApi"; import { DatasourceFormProps } from "./datasourceFormRegistry"; import { diff --git a/client/packages/openblocks/src/pages/datasource/form/googleSheetsDatasourceForm.tsx b/client/packages/openblocks/src/pages/datasource/form/googleSheetsDatasourceForm.tsx index 00611f345..4e2b9b60e 100644 --- a/client/packages/openblocks/src/pages/datasource/form/googleSheetsDatasourceForm.tsx +++ b/client/packages/openblocks/src/pages/datasource/form/googleSheetsDatasourceForm.tsx @@ -3,7 +3,7 @@ import { GoogleSheetsConfig } from "../../../api/datasourceApi"; import { DatasourceFormProps } from "./datasourceFormRegistry"; import { DatasourceNameFormInputItem, GeneralSettingFormSectionLabel } from "../form"; import { trans } from "i18n"; -import { DatasourceForm, FormSection, FormTextAreaItem } from "openblocks-design"; +import { DatasourceForm, FormSection, FormTextAreaItem } from "lowcoder-design"; /** * todo check service account diff --git a/client/packages/openblocks/src/pages/datasource/form/graphqlDatasourceForm.tsx b/client/packages/openblocks/src/pages/datasource/form/graphqlDatasourceForm.tsx index 963dfca90..bec2b4815 100644 --- a/client/packages/openblocks/src/pages/datasource/form/graphqlDatasourceForm.tsx +++ b/client/packages/openblocks/src/pages/datasource/form/graphqlDatasourceForm.tsx @@ -8,7 +8,7 @@ import { FormSectionLabel, FormSelectItem, ValueFromOption, -} from "openblocks-design"; +} from "lowcoder-design"; import { trans } from "i18n"; import React, { useState } from "react"; import { diff --git a/client/packages/openblocks/src/pages/datasource/form/httpDatasourceForm.tsx b/client/packages/openblocks/src/pages/datasource/form/httpDatasourceForm.tsx index a4059b7de..b0d60320f 100644 --- a/client/packages/openblocks/src/pages/datasource/form/httpDatasourceForm.tsx +++ b/client/packages/openblocks/src/pages/datasource/form/httpDatasourceForm.tsx @@ -8,7 +8,7 @@ import { FormSectionLabel, FormSelectItem, ValueFromOption, -} from "openblocks-design"; +} from "lowcoder-design"; import { trans } from "i18n"; import React, { useState } from "react"; import { diff --git a/client/packages/openblocks/src/pages/datasource/form/mongoDatasourceForm.tsx b/client/packages/openblocks/src/pages/datasource/form/mongoDatasourceForm.tsx index 59dcabf9c..1a9ed08ac 100644 --- a/client/packages/openblocks/src/pages/datasource/form/mongoDatasourceForm.tsx +++ b/client/packages/openblocks/src/pages/datasource/form/mongoDatasourceForm.tsx @@ -1,5 +1,5 @@ import React, { useState } from "react"; -import { DatasourceForm, FormInputItem, FormSection, FormSelectItem } from "openblocks-design"; +import { DatasourceForm, FormInputItem, FormSection, FormSelectItem } from "lowcoder-design"; import { MongoConfig } from "../../../api/datasourceApi"; import { DatasourceFormProps } from "./datasourceFormRegistry"; import { useHostCheck } from "./useHostCheck"; diff --git a/client/packages/openblocks/src/pages/datasource/form/oracleDatasourceForm.tsx b/client/packages/openblocks/src/pages/datasource/form/oracleDatasourceForm.tsx index 13c04fff6..4299c8d5a 100644 --- a/client/packages/openblocks/src/pages/datasource/form/oracleDatasourceForm.tsx +++ b/client/packages/openblocks/src/pages/datasource/form/oracleDatasourceForm.tsx @@ -1,5 +1,5 @@ import React from "react"; -import { DatasourceForm, FormCheckboxItem, FormInputItem, FormSection } from "openblocks-design"; +import { DatasourceForm, FormCheckboxItem, FormInputItem, FormSection } from "lowcoder-design"; import { OracleConfig } from "../../../api/datasourceApi"; import { DatasourceFormProps } from "./datasourceFormRegistry"; import { diff --git a/client/packages/openblocks/src/pages/datasource/form/pluginDataSourceForm.tsx b/client/packages/openblocks/src/pages/datasource/form/pluginDataSourceForm.tsx index ec578a335..f764c4061 100644 --- a/client/packages/openblocks/src/pages/datasource/form/pluginDataSourceForm.tsx +++ b/client/packages/openblocks/src/pages/datasource/form/pluginDataSourceForm.tsx @@ -20,7 +20,7 @@ import { FormSelectItemProps, TacoButton, TacoMarkDown, -} from "openblocks-design"; +} from "lowcoder-design"; import { DatasourceFormProps } from "./datasourceFormRegistry"; import { DatasourceNameFormInputItem, GeneralSettingFormSectionLabel } from "../form"; import { diff --git a/client/packages/openblocks/src/pages/datasource/form/redisDatasourceForm.tsx b/client/packages/openblocks/src/pages/datasource/form/redisDatasourceForm.tsx index 35ca2fa20..11492b7da 100644 --- a/client/packages/openblocks/src/pages/datasource/form/redisDatasourceForm.tsx +++ b/client/packages/openblocks/src/pages/datasource/form/redisDatasourceForm.tsx @@ -1,5 +1,5 @@ import React, { useState } from "react"; -import { DatasourceForm, FormInputItem, FormSection, FormSelectItem } from "openblocks-design"; +import { DatasourceForm, FormInputItem, FormSection, FormSelectItem } from "lowcoder-design"; import { MongoConfig } from "../../../api/datasourceApi"; import { DatasourceFormProps } from "./datasourceFormRegistry"; import { useHostCheck } from "./useHostCheck"; diff --git a/client/packages/openblocks/src/pages/datasource/form/smtpDatasourceForm.tsx b/client/packages/openblocks/src/pages/datasource/form/smtpDatasourceForm.tsx index a054eb529..adf9f70af 100644 --- a/client/packages/openblocks/src/pages/datasource/form/smtpDatasourceForm.tsx +++ b/client/packages/openblocks/src/pages/datasource/form/smtpDatasourceForm.tsx @@ -1,5 +1,5 @@ import React from "react"; -import { DatasourceForm, FormSection } from "openblocks-design"; +import { DatasourceForm, FormSection } from "lowcoder-design"; import { SQLConfig } from "../../../api/datasourceApi"; import { DatasourceFormProps } from "./datasourceFormRegistry"; import { diff --git a/client/packages/openblocks/src/pages/datasource/form/snowflakeDatasourceForm.tsx b/client/packages/openblocks/src/pages/datasource/form/snowflakeDatasourceForm.tsx index ed95f4686..2b6572921 100644 --- a/client/packages/openblocks/src/pages/datasource/form/snowflakeDatasourceForm.tsx +++ b/client/packages/openblocks/src/pages/datasource/form/snowflakeDatasourceForm.tsx @@ -1,5 +1,5 @@ import React from "react"; -import { DatasourceForm, FormInputItem, FormKeyValueItem, FormSection } from "openblocks-design"; +import { DatasourceForm, FormInputItem, FormKeyValueItem, FormSection } from "lowcoder-design"; import { SnowflakeConfig } from "api/datasourceApi"; import { DatasourceFormProps } from "./datasourceFormRegistry"; import { diff --git a/client/packages/openblocks/src/pages/datasource/form/sqlDatasourceForm.tsx b/client/packages/openblocks/src/pages/datasource/form/sqlDatasourceForm.tsx index 6a8e2aef4..eba66ce03 100644 --- a/client/packages/openblocks/src/pages/datasource/form/sqlDatasourceForm.tsx +++ b/client/packages/openblocks/src/pages/datasource/form/sqlDatasourceForm.tsx @@ -1,5 +1,5 @@ import React from "react"; -import { DatasourceForm, FormCheckboxItem, FormSection } from "openblocks-design"; +import { DatasourceForm, FormCheckboxItem, FormSection } from "lowcoder-design"; import { SQLConfig } from "api/datasourceApi"; import { DatasourceFormProps } from "./datasourceFormRegistry"; import { diff --git a/client/packages/openblocks/src/pages/editor/LeftContent.tsx b/client/packages/openblocks/src/pages/editor/LeftContent.tsx index df6ce2adf..c870b13f6 100644 --- a/client/packages/openblocks/src/pages/editor/LeftContent.tsx +++ b/client/packages/openblocks/src/pages/editor/LeftContent.tsx @@ -14,7 +14,7 @@ import { Tooltip, UnfoldIcon, UnShow, -} from "openblocks-design"; +} from "lowcoder-design"; import React, { ReactNode, useCallback, useContext, useMemo, useState } from "react"; import { hookCompCategory } from "comps/hooks/hookCompTypes"; import _ from "lodash"; diff --git a/client/packages/openblocks/src/pages/editor/appSnapshot.tsx b/client/packages/openblocks/src/pages/editor/appSnapshot.tsx index 46c40fe6b..af03ceed9 100644 --- a/client/packages/openblocks/src/pages/editor/appSnapshot.tsx +++ b/client/packages/openblocks/src/pages/editor/appSnapshot.tsx @@ -1,7 +1,7 @@ import { useDispatch, useSelector } from "react-redux"; import styled from "styled-components"; -import { CloseIcon } from "openblocks-design"; -import { AppSnapshotIcon } from "openblocks-design"; +import { CloseIcon } from "lowcoder-design"; +import { AppSnapshotIcon } from "lowcoder-design"; import { fetchSnapshotDslAction, fetchSnapshotsAction, @@ -18,12 +18,12 @@ import { isAppSnapshotsFetching, } from "redux/selectors/appSnapshotSelector"; import { Skeleton } from "antd"; -import { TacoPagination } from "openblocks-design"; +import { TacoPagination } from "lowcoder-design"; import { AppSnapshotContext, AppSnapshotList } from "constants/applicationConstants"; import { ExtraActionType } from "lowcoder-core"; import { formatString } from "util/stringUtils"; import { getUser } from "redux/selectors/usersSelectors"; -import { ScrollBar } from "openblocks-design"; +import { ScrollBar } from "lowcoder-design"; import { RightPanelWrapper } from "pages/common/styledComponent"; import { Layers } from "constants/Layers"; import { useMount } from "react-use"; diff --git a/client/packages/openblocks/src/pages/editor/bottom/BottomContent.tsx b/client/packages/openblocks/src/pages/editor/bottom/BottomContent.tsx index efbe963cd..31394563e 100644 --- a/client/packages/openblocks/src/pages/editor/bottom/BottomContent.tsx +++ b/client/packages/openblocks/src/pages/editor/bottom/BottomContent.tsx @@ -1,6 +1,6 @@ import { useContext, useEffect, useState } from "react"; import styled, { css } from "styled-components"; -import { NofileIcon } from "openblocks-design"; +import { NofileIcon } from "lowcoder-design"; import { EmptyTab } from "./BottomTabs"; import { CompNameContext, EditorContext } from "comps/editorState"; import { BottomSidebar } from "./BottomSidebar"; diff --git a/client/packages/openblocks/src/pages/editor/bottom/BottomMetaDrawer.tsx b/client/packages/openblocks/src/pages/editor/bottom/BottomMetaDrawer.tsx index 778350bce..71f33622f 100644 --- a/client/packages/openblocks/src/pages/editor/bottom/BottomMetaDrawer.tsx +++ b/client/packages/openblocks/src/pages/editor/bottom/BottomMetaDrawer.tsx @@ -1,5 +1,5 @@ import { DataNode } from "antd/lib/tree"; -import { CopyTextButton, CustomTree, labelCss, PackUpIcon, Search } from "openblocks-design"; +import { CopyTextButton, CustomTree, labelCss, PackUpIcon, Search } from "lowcoder-design"; import _ from "lodash"; import { Drawer as AntdDrawer } from "antd"; import { CSSProperties, useEffect, useState } from "react"; diff --git a/client/packages/openblocks/src/pages/editor/bottom/BottomSidebar.tsx b/client/packages/openblocks/src/pages/editor/bottom/BottomSidebar.tsx index 3e1621dbb..c64ad6383 100644 --- a/client/packages/openblocks/src/pages/editor/bottom/BottomSidebar.tsx +++ b/client/packages/openblocks/src/pages/editor/bottom/BottomSidebar.tsx @@ -11,7 +11,7 @@ import { SearchIcon, TacoButton, UnfoldIcon, -} from "openblocks-design"; +} from "lowcoder-design"; import { CSSProperties, useContext, useEffect, useState } from "react"; import { EditorContext } from "comps/editorState"; import { useSelector } from "react-redux"; diff --git a/client/packages/openblocks/src/pages/editor/bottom/BottomTabs.tsx b/client/packages/openblocks/src/pages/editor/bottom/BottomTabs.tsx index 1bc725e5d..3e0b966df 100644 --- a/client/packages/openblocks/src/pages/editor/bottom/BottomTabs.tsx +++ b/client/packages/openblocks/src/pages/editor/bottom/BottomTabs.tsx @@ -6,7 +6,7 @@ import { ScrollBar, TacoButton, UnfoldWhiteIcon, -} from "openblocks-design"; +} from "lowcoder-design"; import React, { ReactNode, useContext, useEffect, useState } from "react"; import styled from "styled-components"; import { EditorContext } from "../../../comps/editorState"; diff --git a/client/packages/openblocks/src/pages/editor/codeEditorPanel.tsx b/client/packages/openblocks/src/pages/editor/codeEditorPanel.tsx index 9d638069f..ef7a5821d 100644 --- a/client/packages/openblocks/src/pages/editor/codeEditorPanel.tsx +++ b/client/packages/openblocks/src/pages/editor/codeEditorPanel.tsx @@ -1,9 +1,9 @@ import styled from "styled-components"; import { ReactNode, useContext, useMemo, useRef, useState } from "react"; import { Layers } from "../../constants/Layers"; -import { CodeEditorOpenIcon } from "openblocks-design"; -import { CodeEditorCloseIcon } from "openblocks-design"; -import { DragIcon } from "openblocks-design"; +import { CodeEditorOpenIcon } from "lowcoder-design"; +import { CodeEditorCloseIcon } from "lowcoder-design"; +import { DragIcon } from "lowcoder-design"; import Trigger from "rc-trigger"; import { Resizable } from "react-resizable"; import Handle from "../../layout/handler"; diff --git a/client/packages/openblocks/src/pages/editor/editorConstants.tsx b/client/packages/openblocks/src/pages/editor/editorConstants.tsx index 542e66059..2f9fabf2f 100644 --- a/client/packages/openblocks/src/pages/editor/editorConstants.tsx +++ b/client/packages/openblocks/src/pages/editor/editorConstants.tsx @@ -36,7 +36,7 @@ import { LeftTree, LeftVideo, LeftSignature -} from "openblocks-design"; +} from "lowcoder-design"; export const CompStateIcon: { [key in UICompType]: JSX.Element; diff --git a/client/packages/openblocks/src/pages/editor/editorView.tsx b/client/packages/openblocks/src/pages/editor/editorView.tsx index a702544aa..d8b17b0ac 100644 --- a/client/packages/openblocks/src/pages/editor/editorView.tsx +++ b/client/packages/openblocks/src/pages/editor/editorView.tsx @@ -8,7 +8,7 @@ import { Layers } from "constants/Layers"; import { TopHeaderHeight } from "constants/style"; import { trans } from "i18n"; import { draggingUtils } from "layout"; -import { LeftPreloadIcon, LeftSettingIcon, LeftStateIcon, ScrollBar } from "openblocks-design"; +import { LeftPreloadIcon, LeftSettingIcon, LeftStateIcon, ScrollBar } from "lowcoder-design"; import { useTemplateViewMode } from "util/hooks"; import Header, { PanelStatus, TogglePanel } from "pages/common/header"; import { HelpDropdown } from "pages/common/help"; diff --git a/client/packages/openblocks/src/pages/editor/right/InsertView.tsx b/client/packages/openblocks/src/pages/editor/right/InsertView.tsx index 13a3b0e15..2340506bf 100644 --- a/client/packages/openblocks/src/pages/editor/right/InsertView.tsx +++ b/client/packages/openblocks/src/pages/editor/right/InsertView.tsx @@ -1,6 +1,6 @@ import Segmented from "components/Segmented"; import { featureSwitch } from "constants/featureSwitch"; -import { ScrollBar, Search } from "openblocks-design"; +import { ScrollBar, Search } from "lowcoder-design"; import { useState } from "react"; import styled from "styled-components"; import { RightContext } from "./rightContext"; diff --git a/client/packages/openblocks/src/pages/editor/right/ModulePanel.tsx b/client/packages/openblocks/src/pages/editor/right/ModulePanel.tsx index 376e080ec..935b44c7a 100644 --- a/client/packages/openblocks/src/pages/editor/right/ModulePanel.tsx +++ b/client/packages/openblocks/src/pages/editor/right/ModulePanel.tsx @@ -8,7 +8,7 @@ import { BorderColor, GreyTextColor, } from "constants/style"; -import { ModuleDocIcon } from "openblocks-design"; +import { ModuleDocIcon } from "lowcoder-design"; import { trans } from "i18n"; import { draggingUtils } from "layout/draggingUtils"; import { useContext, useEffect } from "react"; diff --git a/client/packages/openblocks/src/pages/editor/right/PluginPanel/PluginCompItem.tsx b/client/packages/openblocks/src/pages/editor/right/PluginPanel/PluginCompItem.tsx index 8f95bd8e0..b68343bc7 100644 --- a/client/packages/openblocks/src/pages/editor/right/PluginPanel/PluginCompItem.tsx +++ b/client/packages/openblocks/src/pages/editor/right/PluginPanel/PluginCompItem.tsx @@ -9,7 +9,7 @@ import styled from "styled-components"; import { getRemoteCompType } from "comps/utils/remote"; import { OpenblocksCompMeta } from "types/remoteComp"; import { TransparentImg } from "util/commonUtils"; -import { ModuleIcon } from "openblocks-design"; +import { ModuleIcon } from "lowcoder-design"; import { NPM_PLUGIN_ASSETS_BASE_URL } from "constants/npmPlugins"; const ItemWrapper = styled.div` diff --git a/client/packages/openblocks/src/pages/editor/right/PluginPanel/PluginItem.tsx b/client/packages/openblocks/src/pages/editor/right/PluginPanel/PluginItem.tsx index aba55def0..009c5963a 100644 --- a/client/packages/openblocks/src/pages/editor/right/PluginPanel/PluginItem.tsx +++ b/client/packages/openblocks/src/pages/editor/right/PluginPanel/PluginItem.tsx @@ -1,6 +1,6 @@ import axios from "axios"; import { EmptyContent } from "components/EmptyContent"; -import { LinkButton } from "openblocks-design"; +import { LinkButton } from "lowcoder-design"; import { useShallowEqualSelector } from "util/hooks"; import { useContext, useEffect, useMemo, useState } from "react"; import { useDispatch, useSelector } from "react-redux"; diff --git a/client/packages/openblocks/src/pages/editor/right/PluginPanel/index.tsx b/client/packages/openblocks/src/pages/editor/right/PluginPanel/index.tsx index 47be68dc3..c3337e191 100644 --- a/client/packages/openblocks/src/pages/editor/right/PluginPanel/index.tsx +++ b/client/packages/openblocks/src/pages/editor/right/PluginPanel/index.tsx @@ -4,7 +4,7 @@ import { PluginItem } from "./PluginItem"; import { useDispatch, useSelector } from "react-redux"; import { setCommonSettings } from "redux/reduxActions/commonSettingsActions"; import { getUser } from "redux/selectors/usersSelectors"; -import { BluePlusIcon, CustomModal, DocLink, TacoButton, TacoInput } from "openblocks-design"; +import { BluePlusIcon, CustomModal, DocLink, TacoButton, TacoInput } from "lowcoder-design"; import { getCommonSettings } from "redux/selectors/commonSettingSelectors"; import { message } from "antd"; import styled from "styled-components"; diff --git a/client/packages/openblocks/src/pages/editor/right/PropertyView.tsx b/client/packages/openblocks/src/pages/editor/right/PropertyView.tsx index e8effda57..f1eed8a9e 100644 --- a/client/packages/openblocks/src/pages/editor/right/PropertyView.tsx +++ b/client/packages/openblocks/src/pages/editor/right/PropertyView.tsx @@ -2,8 +2,8 @@ import { EmptyContent } from "components/EmptyContent"; import UIComp from "comps/comps/uiComp"; import { EditorContext } from "comps/editorState"; import { GridCompOperator } from "comps/utils/gridCompOperator"; -import { SelectedComps } from "openblocks-design"; -import { ScrollBar } from "openblocks-design"; +import { SelectedComps } from "lowcoder-design"; +import { ScrollBar } from "lowcoder-design"; import { ReactNode, useContext } from "react"; import { trans } from "i18n"; diff --git a/client/packages/openblocks/src/pages/editor/right/RightPanel.tsx b/client/packages/openblocks/src/pages/editor/right/RightPanel.tsx index 7b1ba8424..b0393c616 100644 --- a/client/packages/openblocks/src/pages/editor/right/RightPanel.tsx +++ b/client/packages/openblocks/src/pages/editor/right/RightPanel.tsx @@ -1,11 +1,11 @@ import { RightPanelWrapper } from "pages/common/styledComponent"; -import { Tabs } from "openblocks-design"; +import { Tabs } from "lowcoder-design"; import PropertyView from "./PropertyView"; import InsertView from "./InsertView"; import UIComp, { UiLayoutType } from "comps/comps/uiComp"; import { useEffect, useState } from "react"; -import { AttributeIcon } from "openblocks-design"; -import { InsertIcon } from "openblocks-design"; +import { AttributeIcon } from "lowcoder-design"; +import { InsertIcon } from "lowcoder-design"; import { trans } from "i18n"; import { isAggregationApp } from "util/appUtils"; diff --git a/client/packages/openblocks/src/pages/editor/right/styledComponent.tsx b/client/packages/openblocks/src/pages/editor/right/styledComponent.tsx index fb2ebc29c..0853dbe51 100644 --- a/client/packages/openblocks/src/pages/editor/right/styledComponent.tsx +++ b/client/packages/openblocks/src/pages/editor/right/styledComponent.tsx @@ -2,7 +2,7 @@ import styled, { css } from "styled-components"; import { StyledLink } from "pages/common/styledComponent"; import { EmptyContent } from "components/EmptyContent"; import { trans } from "i18n"; -import { labelCss } from "openblocks-design"; +import { labelCss } from "lowcoder-design"; const NoShake = css` transform: translate3d(0, 0, 0); diff --git a/client/packages/openblocks/src/pages/editor/right/uiCompPanel.tsx b/client/packages/openblocks/src/pages/editor/right/uiCompPanel.tsx index 8d5f2e5a7..3451c679a 100644 --- a/client/packages/openblocks/src/pages/editor/right/uiCompPanel.tsx +++ b/client/packages/openblocks/src/pages/editor/right/uiCompPanel.tsx @@ -16,7 +16,7 @@ import { import { tableDragClassName } from "pages/tutorials/tutorialsConstant"; import React, { useContext, useMemo } from "react"; import styled from "styled-components"; -import { labelCss } from "openblocks-design"; +import { labelCss } from "lowcoder-design"; import { TransparentImg } from "../../../util/commonUtils"; import { RightContext } from "./rightContext"; diff --git a/client/packages/openblocks/src/pages/queryLibrary/LeftNav.tsx b/client/packages/openblocks/src/pages/queryLibrary/LeftNav.tsx index cca827076..84789b03c 100644 --- a/client/packages/openblocks/src/pages/queryLibrary/LeftNav.tsx +++ b/client/packages/openblocks/src/pages/queryLibrary/LeftNav.tsx @@ -9,7 +9,7 @@ import { ScrollBar, Search, TacoButton, -} from "openblocks-design"; +} from "lowcoder-design"; import { LibraryQuery } from "../../api/queryLibraryApi"; import { timestampToHumanReadable } from "../../util/dateTimeUtils"; import { useDispatch, useSelector } from "react-redux"; diff --git a/client/packages/openblocks/src/pages/queryLibrary/QueryLibraryEditor.tsx b/client/packages/openblocks/src/pages/queryLibrary/QueryLibraryEditor.tsx index 92beea73b..58a73e91b 100644 --- a/client/packages/openblocks/src/pages/queryLibrary/QueryLibraryEditor.tsx +++ b/client/packages/openblocks/src/pages/queryLibrary/QueryLibraryEditor.tsx @@ -33,7 +33,7 @@ import { FormRadioItem, FormSection, TacoButton, -} from "openblocks-design"; +} from "lowcoder-design"; import { CheckboxOptionType } from "antd/lib/checkbox/Group"; import { trans } from "i18n"; import { getDataSource } from "../../redux/selectors/datasourceSelectors"; diff --git a/client/packages/openblocks/src/pages/queryLibrary/QueryLibraryHistoryView.tsx b/client/packages/openblocks/src/pages/queryLibrary/QueryLibraryHistoryView.tsx index 4772b3127..34f711a08 100644 --- a/client/packages/openblocks/src/pages/queryLibrary/QueryLibraryHistoryView.tsx +++ b/client/packages/openblocks/src/pages/queryLibrary/QueryLibraryHistoryView.tsx @@ -1,5 +1,5 @@ import styled from "styled-components"; -import { CustomModal, TacoButton } from "openblocks-design"; +import { CustomModal, TacoButton } from "lowcoder-design"; import { QueryLibraryEditorView } from "./queryLibraryEditorView"; import { ReadOnlyMask } from "../common/styledComponent"; import { useDispatch, useSelector } from "react-redux"; @@ -13,7 +13,7 @@ import { getCompContainer, useCompInstance } from "../../comps/utils/useCompInst import { QueryLibraryComp } from "../../comps/comps/queryLibrary/queryLibraryComp"; import { SnapshotList } from "../../components/SnapshotList"; import { timestampToHumanReadable } from "../../util/dateTimeUtils"; -import { ScrollBar } from "openblocks-design"; +import { ScrollBar } from "lowcoder-design"; import QueryLibrarySkeletonView from "./QueryLibrarySkeletonView"; import { ReadonlyTag } from "../common/freeLimitTag"; import { trans } from "i18n"; diff --git a/client/packages/openblocks/src/pages/setting/advanced/AdvancedSetting.tsx b/client/packages/openblocks/src/pages/setting/advanced/AdvancedSetting.tsx index 5de76dfb4..56fabc6d6 100644 --- a/client/packages/openblocks/src/pages/setting/advanced/AdvancedSetting.tsx +++ b/client/packages/openblocks/src/pages/setting/advanced/AdvancedSetting.tsx @@ -3,7 +3,7 @@ import { CodeEditor } from "base/codeEditor"; import { EmptyContent } from "components/EmptyContent"; import { HelpText } from "components/HelpText"; import { GreyTextColor } from "constants/style"; -import { CustomModal, CustomSelect, TacoButton } from "openblocks-design"; +import { CustomModal, CustomSelect, TacoButton } from "lowcoder-design"; import React, { useEffect, useState } from "react"; import { useDispatch, useSelector } from "react-redux"; import { fetchCommonSettings, setCommonSettings } from "redux/reduxActions/commonSettingsActions"; diff --git a/client/packages/openblocks/src/pages/setting/idSource/detail/deleteConfig.tsx b/client/packages/openblocks/src/pages/setting/idSource/detail/deleteConfig.tsx index 83d995bcd..65d4f887b 100644 --- a/client/packages/openblocks/src/pages/setting/idSource/detail/deleteConfig.tsx +++ b/client/packages/openblocks/src/pages/setting/idSource/detail/deleteConfig.tsx @@ -4,7 +4,7 @@ import { trans } from "i18n"; import { useState } from "react"; import { validateResponse } from "api/apiUtils"; import IdSourceApi from "api/idSourceApi"; -import { DangerIcon, CustomModal } from "openblocks-design"; +import { DangerIcon, CustomModal } from "lowcoder-design"; import history from "util/history"; import { IDSOURCE_SETTING } from "constants/routesURL"; diff --git a/client/packages/openblocks/src/pages/setting/idSource/detail/index.tsx b/client/packages/openblocks/src/pages/setting/idSource/detail/index.tsx index 3559ef24a..050f755f6 100644 --- a/client/packages/openblocks/src/pages/setting/idSource/detail/index.tsx +++ b/client/packages/openblocks/src/pages/setting/idSource/detail/index.tsx @@ -10,7 +10,7 @@ import { LockIcon, UnLockIcon, CloseEyeIcon, -} from "openblocks-design"; +} from "lowcoder-design"; import history from "util/history"; import { IDSOURCE_SETTING } from "constants/routesURL"; import { diff --git a/client/packages/openblocks/src/pages/setting/idSource/detail/manual.tsx b/client/packages/openblocks/src/pages/setting/idSource/detail/manual.tsx index e9c422237..5e636df08 100644 --- a/client/packages/openblocks/src/pages/setting/idSource/detail/manual.tsx +++ b/client/packages/openblocks/src/pages/setting/idSource/detail/manual.tsx @@ -1,7 +1,7 @@ import { Button, message } from "antd"; import { ManualWapper } from "pages/setting/idSource/styledComponents"; import { trans } from "i18n"; -import { SyncManualIcon } from "openblocks-design"; +import { SyncManualIcon } from "lowcoder-design"; import { useState } from "react"; import { validateResponse } from "api/apiUtils"; import { AuthType } from "@openblocks-ee/pages/setting/idSource/idSourceConstants"; diff --git a/client/packages/openblocks/src/pages/setting/idSource/styledComponents.tsx b/client/packages/openblocks/src/pages/setting/idSource/styledComponents.tsx index 52c65aab5..fdb62ac9a 100644 --- a/client/packages/openblocks/src/pages/setting/idSource/styledComponents.tsx +++ b/client/packages/openblocks/src/pages/setting/idSource/styledComponents.tsx @@ -1,7 +1,7 @@ import styled, { css } from "styled-components"; import { Table } from "components/Table"; import { Button, Checkbox, Form } from "antd"; -import { UnderlineCss } from "openblocks-design"; +import { UnderlineCss } from "lowcoder-design"; const btnLoadingCss = css` > .ant-btn-loading-icon .anticon { diff --git a/client/packages/openblocks/src/pages/setting/organization/orgList.tsx b/client/packages/openblocks/src/pages/setting/organization/orgList.tsx index a3b716f5d..dcd262d6a 100644 --- a/client/packages/openblocks/src/pages/setting/organization/orgList.tsx +++ b/client/packages/openblocks/src/pages/setting/organization/orgList.tsx @@ -1,5 +1,5 @@ import { ADMIN_ROLE } from "constants/orgConstants"; -import { AddIcon, CustomModal, DangerIcon, EditPopover } from "openblocks-design"; +import { AddIcon, CustomModal, DangerIcon, EditPopover } from "lowcoder-design"; import { useDispatch, useSelector } from "react-redux"; import { createOrgAction, deleteOrgAction } from "redux/reduxActions/orgActions"; import styled from "styled-components"; diff --git a/client/packages/openblocks/src/pages/setting/organization/orgSettingContent.tsx b/client/packages/openblocks/src/pages/setting/organization/orgSettingContent.tsx index 77e018332..2a6a07dd1 100644 --- a/client/packages/openblocks/src/pages/setting/organization/orgSettingContent.tsx +++ b/client/packages/openblocks/src/pages/setting/organization/orgSettingContent.tsx @@ -1,5 +1,5 @@ import { Org } from "constants/orgConstants"; -import { ArrowIcon, BlurFinishInput } from "openblocks-design"; +import { ArrowIcon, BlurFinishInput } from "lowcoder-design"; import { useDispatch, useSelector } from "react-redux"; import { updateOrgAction } from "redux/reduxActions/orgActions"; import styled from "styled-components"; diff --git a/client/packages/openblocks/src/pages/setting/permission/addGroupUserDialog.tsx b/client/packages/openblocks/src/pages/setting/permission/addGroupUserDialog.tsx index 8bfbbcef4..25eb73d74 100644 --- a/client/packages/openblocks/src/pages/setting/permission/addGroupUserDialog.tsx +++ b/client/packages/openblocks/src/pages/setting/permission/addGroupUserDialog.tsx @@ -1,7 +1,7 @@ import Column from "antd/lib/table/Column"; import OrgApi from "api/orgApi"; import { GroupUser, MEMBER_ROLE, OrgUser } from "constants/orgConstants"; -import { CheckBox, CustomModal } from "openblocks-design"; +import { CheckBox, CustomModal } from "lowcoder-design"; import { CSSProperties, ReactNode, useEffect, useRef, useState } from "react"; import { connect, useDispatch } from "react-redux"; import { AppState } from "redux/reducers"; @@ -11,7 +11,7 @@ import { StyledTable, UserTableCellWrapper } from "./styledComponents"; import { formatTimestamp } from "util/dateTimeUtils"; import ProfileImage from "pages/common/profileImage"; import { isGroupAdmin } from "util/permissionUtils"; -import { SuperUserIcon } from "openblocks-design"; +import { SuperUserIcon } from "lowcoder-design"; import { EmptyContent } from "pages/common/styledComponent"; import { trans } from "i18n"; diff --git a/client/packages/openblocks/src/pages/setting/permission/groupUsersPermission.tsx b/client/packages/openblocks/src/pages/setting/permission/groupUsersPermission.tsx index f243727ad..c2f2a1425 100644 --- a/client/packages/openblocks/src/pages/setting/permission/groupUsersPermission.tsx +++ b/client/packages/openblocks/src/pages/setting/permission/groupUsersPermission.tsx @@ -1,6 +1,6 @@ import { GroupRoleInfo, GroupUser, OrgGroup, TacoRoles } from "constants/orgConstants"; import { User } from "constants/userConstants"; -import { AddIcon, ArrowIcon, CustomSelect, PackUpIcon, SuperUserIcon } from "openblocks-design"; +import { AddIcon, ArrowIcon, CustomSelect, PackUpIcon, SuperUserIcon } from "lowcoder-design"; import { trans } from "i18n"; import ProfileImage from "pages/common/profileImage"; import React, { useEffect, useMemo } from "react"; diff --git a/client/packages/openblocks/src/pages/setting/permission/orgUsersPermission.tsx b/client/packages/openblocks/src/pages/setting/permission/orgUsersPermission.tsx index 74559ac28..53eefc896 100644 --- a/client/packages/openblocks/src/pages/setting/permission/orgUsersPermission.tsx +++ b/client/packages/openblocks/src/pages/setting/permission/orgUsersPermission.tsx @@ -10,7 +10,7 @@ import { ModalFooterWrapper, SuperUserIcon, TacoButton, -} from "openblocks-design"; +} from "lowcoder-design"; import { trans, transToNode } from "i18n"; import InviteDialog from "pages/common/inviteDialog"; import ProfileImage from "pages/common/profileImage"; diff --git a/client/packages/openblocks/src/pages/setting/permission/permissionList.tsx b/client/packages/openblocks/src/pages/setting/permission/permissionList.tsx index b314780dc..c85af8ba2 100644 --- a/client/packages/openblocks/src/pages/setting/permission/permissionList.tsx +++ b/client/packages/openblocks/src/pages/setting/permission/permissionList.tsx @@ -1,7 +1,7 @@ import { message, Typography } from "antd"; import OrgApi from "api/orgApi"; import { buildGroupId } from "constants/routesURL"; -import { AddIcon, CustomModal, EditPopover } from "openblocks-design"; +import { AddIcon, CustomModal, EditPopover } from "lowcoder-design"; import { useEffect, useState } from "react"; import { useDispatch, useSelector } from "react-redux"; import { fetchGroupsAction, updateGroupAction } from "redux/reduxActions/orgActions"; diff --git a/client/packages/openblocks/src/pages/setting/permission/styledComponents.tsx b/client/packages/openblocks/src/pages/setting/permission/styledComponents.tsx index 66b79c1ed..4d38fba63 100644 --- a/client/packages/openblocks/src/pages/setting/permission/styledComponents.tsx +++ b/client/packages/openblocks/src/pages/setting/permission/styledComponents.tsx @@ -10,7 +10,7 @@ import { Tooltip, WarnIcon, WhiteLoading, -} from "openblocks-design"; +} from "lowcoder-design"; import styled from "styled-components"; import React, { useEffect, useState } from "react"; import { i18nObjs, trans } from "i18n"; diff --git a/client/packages/openblocks/src/pages/setting/profile/index.tsx b/client/packages/openblocks/src/pages/setting/profile/index.tsx index a7a68dfcb..8d66bd53d 100644 --- a/client/packages/openblocks/src/pages/setting/profile/index.tsx +++ b/client/packages/openblocks/src/pages/setting/profile/index.tsx @@ -1,4 +1,4 @@ -import { CustomModal } from "openblocks-design"; +import { CustomModal } from "lowcoder-design"; import { useEffect, useState } from "react"; import { useDispatch, useSelector } from "react-redux"; diff --git a/client/packages/openblocks/src/pages/setting/profile/profileComponets.tsx b/client/packages/openblocks/src/pages/setting/profile/profileComponets.tsx index 9ac4e78ff..1894784b1 100644 --- a/client/packages/openblocks/src/pages/setting/profile/profileComponets.tsx +++ b/client/packages/openblocks/src/pages/setting/profile/profileComponets.tsx @@ -6,9 +6,9 @@ import { FormInput, OtpFormInput, PasswordInput, -} from "openblocks-design"; -import { TacoButton } from "openblocks-design"; -import { PackUpIcon } from "openblocks-design"; +} from "lowcoder-design"; +import { TacoButton } from "lowcoder-design"; +import { PackUpIcon } from "lowcoder-design"; import ProfileImage from "pages/common/profileImage"; import { User } from "constants/userConstants"; import { replaceMiddleWithStar } from "util/stringUtils"; diff --git a/client/packages/openblocks/src/pages/setting/profile/styledProfileComponets.tsx b/client/packages/openblocks/src/pages/setting/profile/styledProfileComponets.tsx index 5dbdd0dbf..72e3e10ac 100644 --- a/client/packages/openblocks/src/pages/setting/profile/styledProfileComponets.tsx +++ b/client/packages/openblocks/src/pages/setting/profile/styledProfileComponets.tsx @@ -1,6 +1,6 @@ import styled, { css } from "styled-components"; -import { FormInput, OtpFormInput, PasswordInput } from "openblocks-design"; -import { TacoButton } from "openblocks-design"; +import { FormInput, OtpFormInput, PasswordInput } from "lowcoder-design"; +import { TacoButton } from "lowcoder-design"; const FormInputStyle = css` input { diff --git a/client/packages/openblocks/src/pages/setting/settingHome.tsx b/client/packages/openblocks/src/pages/setting/settingHome.tsx index 8af126196..c15956405 100644 --- a/client/packages/openblocks/src/pages/setting/settingHome.tsx +++ b/client/packages/openblocks/src/pages/setting/settingHome.tsx @@ -8,7 +8,7 @@ import AuditSetting from "@openblocks-ee/pages/setting/audit"; import { isEE, isEnterpriseMode, isSelfDomain, showAuditLog } from "util/envUtils"; import { TwoColumnSettingPageContent } from "./styled"; import SubSideBar from "components/layout/SubSideBar"; -import { Menu } from "openblocks-design"; +import { Menu } from "lowcoder-design"; import { useSelector } from "react-redux"; import { getUser } from "redux/selectors/usersSelectors"; import history from "util/history"; diff --git a/client/packages/openblocks/src/pages/setting/styled.tsx b/client/packages/openblocks/src/pages/setting/styled.tsx index f86b3ef7b..3b05582e4 100644 --- a/client/packages/openblocks/src/pages/setting/styled.tsx +++ b/client/packages/openblocks/src/pages/setting/styled.tsx @@ -1,5 +1,5 @@ import { GreyTextColor } from "constants/style"; -import { TacoButton } from "openblocks-design"; +import { TacoButton } from "lowcoder-design"; import styled from "styled-components"; export const TwoColumnSettingPageContent = styled.div` diff --git a/client/packages/openblocks/src/pages/setting/theme/chartThemeConstant.ts b/client/packages/openblocks/src/pages/setting/theme/chartThemeConstant.ts index 74536d84e..a48c7ec11 100644 --- a/client/packages/openblocks/src/pages/setting/theme/chartThemeConstant.ts +++ b/client/packages/openblocks/src/pages/setting/theme/chartThemeConstant.ts @@ -1,4 +1,4 @@ -import { chartColorPalette } from "openblocks-design"; +import { chartColorPalette } from "lowcoder-design"; export const ChartTheme = { color: chartColorPalette, diff --git a/client/packages/openblocks/src/pages/setting/theme/createModal.tsx b/client/packages/openblocks/src/pages/setting/theme/createModal.tsx index 9d7a11f8b..da2106615 100644 --- a/client/packages/openblocks/src/pages/setting/theme/createModal.tsx +++ b/client/packages/openblocks/src/pages/setting/theme/createModal.tsx @@ -1,10 +1,10 @@ import { ThemeType } from "api/commonSettingApi"; import { useState } from "react"; import { themeTemplateList } from "./themeConstant"; -import { RadioCheckedIcon } from "openblocks-design"; -import { SwitchCheckedIcon } from "openblocks-design"; -import { RequiredIcon } from "openblocks-design"; -import { SuccessIcon } from "openblocks-design"; +import { RadioCheckedIcon } from "lowcoder-design"; +import { SwitchCheckedIcon } from "lowcoder-design"; +import { RequiredIcon } from "lowcoder-design"; +import { SuccessIcon } from "lowcoder-design"; import { CustomModalStyled, ModalNameDiv, diff --git a/client/packages/openblocks/src/pages/setting/theme/detail/index.tsx b/client/packages/openblocks/src/pages/setting/theme/detail/index.tsx index 490580759..386f72e79 100644 --- a/client/packages/openblocks/src/pages/setting/theme/detail/index.tsx +++ b/client/packages/openblocks/src/pages/setting/theme/detail/index.tsx @@ -14,7 +14,7 @@ import { connect } from "react-redux"; import { fetchCommonSettings, setCommonSettings } from "redux/reduxActions/commonSettingsActions"; import { AppState } from "redux/reducers"; import { DETAIL_TYPE } from "../themeConstant"; -import { ArrowIcon, CustomModal, ResetIcon } from "openblocks-design"; +import { ArrowIcon, CustomModal, ResetIcon } from "lowcoder-design"; import { DetailContainer, DetailContent, diff --git a/client/packages/openblocks/src/pages/setting/theme/styledComponents.tsx b/client/packages/openblocks/src/pages/setting/theme/styledComponents.tsx index ac394598d..b4fabe71e 100644 --- a/client/packages/openblocks/src/pages/setting/theme/styledComponents.tsx +++ b/client/packages/openblocks/src/pages/setting/theme/styledComponents.tsx @@ -7,7 +7,7 @@ import { ScrollBar, TacoButton, TacoInput, -} from "openblocks-design"; +} from "lowcoder-design"; import styled, { css } from "styled-components"; import { PopoverIcon } from "../permission/styledComponents"; diff --git a/client/packages/openblocks/src/pages/setting/theme/themePage.tsx b/client/packages/openblocks/src/pages/setting/theme/themePage.tsx index 2a6f7ba46..5af46555b 100644 --- a/client/packages/openblocks/src/pages/setting/theme/themePage.tsx +++ b/client/packages/openblocks/src/pages/setting/theme/themePage.tsx @@ -14,7 +14,7 @@ import CreateModal from "./createModal"; import history from "util/history"; import { THEME_DETAIL } from "constants/routesURL"; import { currentOrgAdmin } from "util/permissionUtils"; -import { AddIcon } from "openblocks-design"; +import { AddIcon } from "lowcoder-design"; import { CreateButton, ThemeContent } from "./styledComponents"; import { genQueryId } from "comps/utils/idGenerator"; import { trans } from "i18n"; diff --git a/client/packages/openblocks/src/pages/tutorials/HomeTutorialsV2.tsx b/client/packages/openblocks/src/pages/tutorials/HomeTutorialsV2.tsx index 136b9d1e5..aabe73050 100644 --- a/client/packages/openblocks/src/pages/tutorials/HomeTutorialsV2.tsx +++ b/client/packages/openblocks/src/pages/tutorials/HomeTutorialsV2.tsx @@ -7,7 +7,7 @@ import { import { markUserStatus } from "redux/reduxActions/userActions"; import { useDispatch } from "react-redux"; import { trans } from "i18n"; -import { TutorialsTooltip } from "openblocks-design"; +import { TutorialsTooltip } from "lowcoder-design"; export const createAppItemClass = "joyride-create-app-item"; diff --git a/client/packages/openblocks/src/pages/tutorials/editorTutorials.tsx b/client/packages/openblocks/src/pages/tutorials/editorTutorials.tsx index 922c90a8d..9e3979ef4 100644 --- a/client/packages/openblocks/src/pages/tutorials/editorTutorials.tsx +++ b/client/packages/openblocks/src/pages/tutorials/editorTutorials.tsx @@ -22,7 +22,7 @@ import { tableDragClassName, UserGuideLocationState, } from "./tutorialsConstant"; -import { TooltipCodeBlock, TooltipLink, TutorialsTooltip } from "openblocks-design"; +import { TooltipCodeBlock, TooltipLink, TutorialsTooltip } from "lowcoder-design"; import { markUserStatus } from "redux/reduxActions/userActions"; import { useHistory } from "react-router"; import { defaultLayout, GridItemDataType } from "comps/comps/gridItemComp"; diff --git a/client/packages/openblocks/src/pages/userAuth/authComponents.tsx b/client/packages/openblocks/src/pages/userAuth/authComponents.tsx index c03f059dc..98b7d37cd 100644 --- a/client/packages/openblocks/src/pages/userAuth/authComponents.tsx +++ b/client/packages/openblocks/src/pages/userAuth/authComponents.tsx @@ -1,7 +1,7 @@ import { CheckboxChangeEvent } from "antd/lib/checkbox"; import LoginBackground from "assets/images/loginBackground.png"; import React, { CSSProperties, useEffect, useRef, useState } from "react"; -import { CheckBox, PackUpIcon, TacoButton } from "openblocks-design"; +import { CheckBox, PackUpIcon, TacoButton } from "lowcoder-design"; import { Link } from "react-router-dom"; import styled from "styled-components"; import ReactHotkeys from "util/hotkeys"; diff --git a/client/packages/openblocks/src/pages/userAuth/formLogin.tsx b/client/packages/openblocks/src/pages/userAuth/formLogin.tsx index c507d7d8e..7f23ef6a1 100644 --- a/client/packages/openblocks/src/pages/userAuth/formLogin.tsx +++ b/client/packages/openblocks/src/pages/userAuth/formLogin.tsx @@ -1,4 +1,4 @@ -import { FormInput, PasswordInput } from "openblocks-design"; +import { FormInput, PasswordInput } from "lowcoder-design"; import { AuthBottomView, ConfirmButton, diff --git a/client/packages/openblocks/src/pages/userAuth/register.tsx b/client/packages/openblocks/src/pages/userAuth/register.tsx index 29f8af909..7a5058d0e 100644 --- a/client/packages/openblocks/src/pages/userAuth/register.tsx +++ b/client/packages/openblocks/src/pages/userAuth/register.tsx @@ -7,7 +7,7 @@ import { StyledRouteLinkLogin, TermsAndPrivacyInfo, } from "pages/userAuth/authComponents"; -import { FormInput, PasswordInput } from "openblocks-design"; +import { FormInput, PasswordInput } from "lowcoder-design"; import { AUTH_LOGIN_URL } from "constants/routesURL"; import UserApi from "api/userApi"; import { useRedirectUrl } from "util/hooks"; diff --git a/client/packages/openblocks/src/pages/userAuth/thirdParty/thirdPartyAuth.tsx b/client/packages/openblocks/src/pages/userAuth/thirdParty/thirdPartyAuth.tsx index 198f4029b..2e212cf1d 100644 --- a/client/packages/openblocks/src/pages/userAuth/thirdParty/thirdPartyAuth.tsx +++ b/client/packages/openblocks/src/pages/userAuth/thirdParty/thirdPartyAuth.tsx @@ -4,7 +4,7 @@ import { ThirdPartyAuthGoal, ThirdPartyConfigType, } from "constants/authConstants"; -import { CommonGrayLabel, WhiteLoading } from "openblocks-design"; +import { CommonGrayLabel, WhiteLoading } from "lowcoder-design"; import { useLocation } from "react-router-dom"; import history from "util/history"; import { LoginLogoStyle, StyledLoginButton } from "pages/userAuth/authComponents"; diff --git a/client/packages/openblocks/src/util/bottomResUtils.tsx b/client/packages/openblocks/src/util/bottomResUtils.tsx index d36110843..30c9a9ed5 100644 --- a/client/packages/openblocks/src/util/bottomResUtils.tsx +++ b/client/packages/openblocks/src/util/bottomResUtils.tsx @@ -30,7 +30,7 @@ import { TempStateIcon, TraceApiIcon, TransformerIcon, -} from "openblocks-design"; +} from "lowcoder-design"; import { BottomResTypeEnum } from "types/bottomRes"; import { HttpMethod } from "api/api"; diff --git a/client/packages/openblocks/src/util/homeResUtils.tsx b/client/packages/openblocks/src/util/homeResUtils.tsx index 0dce511bd..2c37817d9 100644 --- a/client/packages/openblocks/src/util/homeResUtils.tsx +++ b/client/packages/openblocks/src/util/homeResUtils.tsx @@ -5,7 +5,7 @@ import { MobileAppIcon, ModuleDocIcon, NavDocIcon, -} from "openblocks-design"; +} from "lowcoder-design"; import { HomeResTypeEnum } from "../types/homeRes"; import { APPLICATION_VIEW_URL, buildFolderUrl } from "../constants/routesURL"; import history from "./history"; diff --git a/client/packages/openblocks/tsconfig.paths.json b/client/packages/openblocks/tsconfig.paths.json index 18465e4b2..9735cc247 100644 --- a/client/packages/openblocks/tsconfig.paths.json +++ b/client/packages/openblocks/tsconfig.paths.json @@ -3,8 +3,7 @@ "paths": { "@openblocks-ee/*": ["*"], "openblocks-sdk": ["index.sdk"], - "*": ["*", "../../openblocks-comps/src/*", "../../openblocks-design/src/*"] + "*": ["*", "../../openblocks-comps/src/*", "../../lowcoder-design/src/*"] } } } - \ No newline at end of file diff --git a/client/packages/openblocks/vite.config.mts b/client/packages/openblocks/vite.config.mts index f0c690edf..1901fcbe3 100644 --- a/client/packages/openblocks/vite.config.mts +++ b/client/packages/openblocks/vite.config.mts @@ -124,7 +124,7 @@ export const viteConfig: UserConfig = { }, }), viteTsconfigPaths({ - projects: ["../openblocks/tsconfig.json", "../openblocks-design/tsconfig.json"], + projects: ["../openblocks/tsconfig.json", "../lowcoder-design/tsconfig.json"], }), svgrPlugin({ svgrOptions: { diff --git a/client/yarn.lock b/client/yarn.lock index 63c49e8e2..48fc6d947 100644 --- a/client/yarn.lock +++ b/client/yarn.lock @@ -14380,9 +14380,9 @@ __metadata: languageName: unknown linkType: soft -"openblocks-design@^0.0.1, openblocks-design@workspace:^, openblocks-design@workspace:packages/openblocks-design": +"lowcoder-design@^0.0.1, lowcoder-design@workspace:^, lowcoder-design@workspace:packages/lowcoder-design": version: 0.0.0-use.local - resolution: "openblocks-design@workspace:packages/openblocks-design" + resolution: "lowcoder-design@workspace:packages/lowcoder-design" dependencies: "@rollup/plugin-commonjs": ^23.0.2 "@rollup/plugin-json": ^5.0.1 @@ -14419,7 +14419,7 @@ __metadata: "@types/react-dom": 17 openblocks-cli: "workspace:^" lowcoder-core: ^0.0.1 - openblocks-design: ^0.0.1 + lowcoder-design: ^0.0.1 openblocks-sdk: "workspace:^" react: 17 react-dom: 17 @@ -14521,7 +14521,7 @@ __metadata: moment: ^2.29.4 numbro: ^2.3.6 lowcoder-core: "workspace:^" - openblocks-design: "workspace:^" + lowcoder-design: "workspace:^" lowcoder-dev-utils: "workspace:^" papaparse: ^5.3.2 qrcode.react: ^3.1.0 From 0c119ad686b225e2ae936ad2da591731a3b86fe4 Mon Sep 17 00:00:00 2001 From: Jan Richter Date: Fri, 12 May 2023 01:53:39 +1200 Subject: [PATCH 05/21] refactor: rename openblocks-comps to lowcoder-comps --- client/config/test/jest.config.js | 2 +- client/package.json | 2 +- client/packages/openblocks-comps/package.json | 2 +- client/packages/openblocks-sdk/tsconfig.json | 4 ++-- client/packages/openblocks-sdk/vite.config.mts | 2 +- client/packages/openblocks/src/comps/index.tsx | 2 +- client/packages/openblocks/src/pages/setting/Plugins.tsx | 2 +- client/packages/openblocks/tsconfig.paths.json | 2 +- client/scripts/build.js | 2 +- client/yarn.lock | 4 ++-- 10 files changed, 12 insertions(+), 12 deletions(-) diff --git a/client/config/test/jest.config.js b/client/config/test/jest.config.js index 6384461ae..f189f4dd6 100644 --- a/client/config/test/jest.config.js +++ b/client/config/test/jest.config.js @@ -27,7 +27,7 @@ export default { modulePaths: [ "/src", path.resolve(dirname, "../../packages/openblocks/src"), - path.resolve(dirname, "../../packages/openblocks-comps/src"), + path.resolve(dirname, "../../packages/lowcoder-comps/src"), path.resolve(dirname, "../../packages/lowcoder-design/src"), ], setupFiles: [path.resolve(dirname, "./jest.setup.js")], diff --git a/client/package.json b/client/package.json index bb766538a..ebc23e83b 100644 --- a/client/package.json +++ b/client/package.json @@ -14,7 +14,7 @@ "start:ee": "REACT_APP_EDITION=enterprise yarn workspace openblocks start", "start:ee-global": "REACT_APP_EDITION=enterprise-global yarn workspace openblocks start", "build": "yarn node ./scripts/build.js", - "test": "jest && yarn workspace openblocks-comps test", + "test": "jest && yarn workspace lowcoder-comps test", "prepare": "yarn workspace openblocks prepare", "build:core": "yarn workspace lowcoder-core build", "test:core": "yarn workspace lowcoder-core test" diff --git a/client/packages/openblocks-comps/package.json b/client/packages/openblocks-comps/package.json index 8fb1701c6..97238b6f3 100644 --- a/client/packages/openblocks-comps/package.json +++ b/client/packages/openblocks-comps/package.json @@ -1,5 +1,5 @@ { - "name": "openblocks-comps", + "name": "lowcoder-comps", "version": "0.0.4", "type": "module", "license": "MIT", diff --git a/client/packages/openblocks-sdk/tsconfig.json b/client/packages/openblocks-sdk/tsconfig.json index 3f5fb8c92..2ae4f7d9b 100644 --- a/client/packages/openblocks-sdk/tsconfig.json +++ b/client/packages/openblocks-sdk/tsconfig.json @@ -24,7 +24,7 @@ "*": [ "*", "../../openblocks/src/*", - "../../openblocks-comps/src/*", + "../../lowcoder-comps/src/*", "../../lowcoder-design/src/*" ], "@openblocks-ee/*": ["../../openblocks/src/*"] @@ -35,7 +35,7 @@ "src", "index.tsx", "../openblocks/src", - "../openblocks-comps/src", + "../lowcoder-comps/src", "../lowcoder-design/src" ] } diff --git a/client/packages/openblocks-sdk/vite.config.mts b/client/packages/openblocks-sdk/vite.config.mts index e3cb006ae..598b2bcf9 100644 --- a/client/packages/openblocks-sdk/vite.config.mts +++ b/client/packages/openblocks-sdk/vite.config.mts @@ -84,7 +84,7 @@ export const viteConfig: UserConfig = { viteTsconfigPaths({ projects: [ "../openblocks/tsconfig.json", - "../openblocks-comps/tsconfig.json", + "../lowcoder-comps/tsconfig.json", "../lowcoder-design/tsconfig.json", ], }), diff --git a/client/packages/openblocks/src/comps/index.tsx b/client/packages/openblocks/src/comps/index.tsx index 9de495641..c0d172d0d 100644 --- a/client/packages/openblocks/src/comps/index.tsx +++ b/client/packages/openblocks/src/comps/index.tsx @@ -124,7 +124,7 @@ type Registry = { const builtInRemoteComps: Omit = { source: !!REACT_APP_BUNDLE_BUILTIN_PLUGIN ? "bundle" : "npm", isRemote: true, - packageName: "openblocks-comps", + packageName: "lowcoder-comps", }; const uiCompMap: Registry = { diff --git a/client/packages/openblocks/src/pages/setting/Plugins.tsx b/client/packages/openblocks/src/pages/setting/Plugins.tsx index 249e2ecb5..1762295aa 100644 --- a/client/packages/openblocks/src/pages/setting/Plugins.tsx +++ b/client/packages/openblocks/src/pages/setting/Plugins.tsx @@ -66,7 +66,7 @@ export function PluginSetting() { setSettings((v) => ({ ...v, npmPlugins: value }))} /> handleSaveCommonSetting("npmPlugins")()}> diff --git a/client/packages/openblocks/tsconfig.paths.json b/client/packages/openblocks/tsconfig.paths.json index 9735cc247..913498485 100644 --- a/client/packages/openblocks/tsconfig.paths.json +++ b/client/packages/openblocks/tsconfig.paths.json @@ -3,7 +3,7 @@ "paths": { "@openblocks-ee/*": ["*"], "openblocks-sdk": ["index.sdk"], - "*": ["*", "../../openblocks-comps/src/*", "../../lowcoder-design/src/*"] + "*": ["*", "../../lowcoder-comps/src/*", "../../lowcoder-design/src/*"] } } } diff --git a/client/scripts/build.js b/client/scripts/build.js index ae820d5fc..8ab34e565 100644 --- a/client/scripts/build.js +++ b/client/scripts/build.js @@ -7,7 +7,7 @@ import axios from "axios"; import { buildVars } from "lowcoder-dev-utils/buildVars.js"; import { currentDirName, readJson } from "lowcoder-dev-utils/util.js"; -const builtinPlugins = ["openblocks-comps"]; +const builtinPlugins = ["lowcoder-comps"]; const curDirName = currentDirName(import.meta.url); async function downloadFile(url, dest) { diff --git a/client/yarn.lock b/client/yarn.lock index 48fc6d947..49a832d5d 100644 --- a/client/yarn.lock +++ b/client/yarn.lock @@ -14324,9 +14324,9 @@ __metadata: languageName: unknown linkType: soft -"openblocks-comps@workspace:packages/openblocks-comps": +"lowcoder-comps@workspace:packages/lowcoder-comps": version: 0.0.0-use.local - resolution: "openblocks-comps@workspace:packages/openblocks-comps" + resolution: "lowcoder-comps@workspace:packages/lowcoder-comps" dependencies: "@fullcalendar/core": ^6.1.6 "@fullcalendar/daygrid": ^6.1.6 From cf0a870640d3adedd66b5399b76e94504298cc1d Mon Sep 17 00:00:00 2001 From: Jan Richter Date: Fri, 12 May 2023 01:54:40 +1200 Subject: [PATCH 06/21] refactor: rename openblocks-sdk to lowcoder-sdk --- client/config/test/jest.config.js | 2 +- client/packages/create-openblocks-plugin/index.js | 2 +- .../openblocks-cli-template-typescript/index.tsx | 4 ++-- .../package.json | 2 +- .../src/HelloWorldComp.tsx | 2 +- .../src/app-env.d.ts | 2 +- client/packages/openblocks-cli/package.json | 2 +- client/packages/openblocks-comps/index.tsx | 4 ++-- client/packages/openblocks-comps/package.json | 2 +- .../openblocks-comps/src/__test__/allComp.test.tsx | 2 +- client/packages/openblocks-comps/src/app-env.d.ts | 2 +- .../src/comps/calendarComp/calendarComp.tsx | 2 +- .../src/comps/calendarComp/calendarConstants.tsx | 2 +- .../src/comps/chartComp/chartComp.tsx | 2 +- .../chartComp/chartConfigs/barChartConfig.tsx | 2 +- .../chartComp/chartConfigs/cartesianAxisConfig.tsx | 2 +- .../comps/chartComp/chartConfigs/legendConfig.tsx | 2 +- .../chartComp/chartConfigs/lineChartConfig.tsx | 2 +- .../chartComp/chartConfigs/pieChartConfig.tsx | 4 ++-- .../chartComp/chartConfigs/scatterChartConfig.tsx | 2 +- .../src/comps/chartComp/chartConstants.tsx | 14 +++++++------- .../src/comps/chartComp/chartPropertyView.tsx | 2 +- .../src/comps/chartComp/chartUtils.ts | 2 +- .../src/comps/chartComp/seriesComp.tsx | 2 +- .../comps/imageEditorComp/imageEditorConstants.tsx | 2 +- .../src/comps/imageEditorComp/index.tsx | 2 +- .../src/comps/mermaidComp/index.tsx | 2 +- .../src/i18n/comps/locales/enObj.tsx | 2 +- .../src/i18n/comps/locales/types.tsx | 2 +- client/packages/openblocks-dev-utils/external.js | 2 +- client/packages/openblocks-plugin-demo/index.tsx | 4 ++-- .../packages/openblocks-plugin-demo/package.json | 2 +- .../openblocks-plugin-demo/src/CounterComp.tsx | 2 +- .../openblocks-plugin-demo/src/HelloWorldComp.tsx | 2 +- .../openblocks-plugin-demo/src/app-env.d.ts | 2 +- .../packages/openblocks-plugin-demo/tsconfig.json | 8 ++++---- client/packages/openblocks-sdk/README.md | 14 +++++++------- client/packages/openblocks-sdk/package.json | 10 +++++----- client/packages/openblocks-sdk/vite.config.mts | 6 +++--- .../packages/openblocks/src/api/datasourceApi.ts | 2 +- .../src/comps/queries/pluginQuery/pluginQuery.tsx | 2 +- .../src/constants/datasourceConstants.ts | 2 +- .../openblocks/src/constants/queryConstants.ts | 2 +- .../pages/datasource/form/pluginDataSourceForm.tsx | 2 +- .../pages/datasource/getDataSourceFormManifest.ts | 2 +- client/packages/openblocks/tsconfig.paths.json | 2 +- client/yarn.lock | 12 ++++++------ 47 files changed, 77 insertions(+), 77 deletions(-) diff --git a/client/config/test/jest.config.js b/client/config/test/jest.config.js index f189f4dd6..30397badb 100644 --- a/client/config/test/jest.config.js +++ b/client/config/test/jest.config.js @@ -20,7 +20,7 @@ export default { dirname, isEE ? "../../packages/openblocks/src/ee/$1" : "../../packages/openblocks/src/$1" ), - "openblocks-sdk": path.resolve(dirname, "../../packages/openblocks/src/index.sdk"), + "lowcoder-sdk": path.resolve(dirname, "../../packages/openblocks/src/index.sdk"), }, globals, // roots: ["/src"], diff --git a/client/packages/create-openblocks-plugin/index.js b/client/packages/create-openblocks-plugin/index.js index 1f7f1dbfa..f587dbf93 100755 --- a/client/packages/create-openblocks-plugin/index.js +++ b/client/packages/create-openblocks-plugin/index.js @@ -12,7 +12,7 @@ const pkg = readJson(path.resolve(currentDir, "./package.json")); const isUsingYarn = (process.env.npm_config_user_agent || "").indexOf("yarn") === 0; const cliPackageName = "openblocks-cli"; -const sdkPackageName = "openblocks-sdk"; +const sdkPackageName = "lowcoder-sdk"; let verbose = false; let registry; diff --git a/client/packages/openblocks-cli-template-typescript/index.tsx b/client/packages/openblocks-cli-template-typescript/index.tsx index dc9d639c5..515a9d253 100644 --- a/client/packages/openblocks-cli-template-typescript/index.tsx +++ b/client/packages/openblocks-cli-template-typescript/index.tsx @@ -1,9 +1,9 @@ import ReactDOM from "react-dom"; -import { CompIDE } from "openblocks-sdk"; +import { CompIDE } from "lowcoder-sdk"; import { name, version, openblocks } from "./package.json"; import compMap from "./src/index"; -import "openblocks-sdk/dist/style.css"; +import "lowcoder-sdk/dist/style.css"; function CompDevApp() { return ( diff --git a/client/packages/openblocks-cli-template-typescript/package.json b/client/packages/openblocks-cli-template-typescript/package.json index dee3161f9..43e4b8313 100644 --- a/client/packages/openblocks-cli-template-typescript/package.json +++ b/client/packages/openblocks-cli-template-typescript/package.json @@ -17,7 +17,7 @@ }, "devDependencies": { "openblocks-cli": "workspace:^", - "openblocks-sdk": "workspace:^", + "lowcoder-sdk": "workspace:^", "typescript": "^4.8.4", "vite": "^3.2.4" }, diff --git a/client/packages/openblocks-cli-template-typescript/src/HelloWorldComp.tsx b/client/packages/openblocks-cli-template-typescript/src/HelloWorldComp.tsx index 042f00ef7..c06b43c6e 100644 --- a/client/packages/openblocks-cli-template-typescript/src/HelloWorldComp.tsx +++ b/client/packages/openblocks-cli-template-typescript/src/HelloWorldComp.tsx @@ -9,7 +9,7 @@ import { NameConfig, eventHandlerControl, withMethodExposing, -} from "openblocks-sdk"; +} from "lowcoder-sdk"; import styles from "./styles.module.css"; diff --git a/client/packages/openblocks-cli-template-typescript/src/app-env.d.ts b/client/packages/openblocks-cli-template-typescript/src/app-env.d.ts index 384087217..c43b9fb87 100644 --- a/client/packages/openblocks-cli-template-typescript/src/app-env.d.ts +++ b/client/packages/openblocks-cli-template-typescript/src/app-env.d.ts @@ -1,3 +1,3 @@ /// -declare module "openblocks-sdk"; +declare module "lowcoder-sdk"; diff --git a/client/packages/openblocks-cli/package.json b/client/packages/openblocks-cli/package.json index 90e9db00a..d63311147 100644 --- a/client/packages/openblocks-cli/package.json +++ b/client/packages/openblocks-cli/package.json @@ -43,7 +43,7 @@ "typescript": "^4.8.4" }, "peerDependencies": { - "openblocks-sdk": "*" + "lowcoder-sdk": "*" }, "keywords": [ "openblocks" diff --git a/client/packages/openblocks-comps/index.tsx b/client/packages/openblocks-comps/index.tsx index dc9d639c5..515a9d253 100644 --- a/client/packages/openblocks-comps/index.tsx +++ b/client/packages/openblocks-comps/index.tsx @@ -1,9 +1,9 @@ import ReactDOM from "react-dom"; -import { CompIDE } from "openblocks-sdk"; +import { CompIDE } from "lowcoder-sdk"; import { name, version, openblocks } from "./package.json"; import compMap from "./src/index"; -import "openblocks-sdk/dist/style.css"; +import "lowcoder-sdk/dist/style.css"; function CompDevApp() { return ( diff --git a/client/packages/openblocks-comps/package.json b/client/packages/openblocks-comps/package.json index 97238b6f3..3d6c66298 100644 --- a/client/packages/openblocks-comps/package.json +++ b/client/packages/openblocks-comps/package.json @@ -16,7 +16,7 @@ "big.js": "^6.2.1", "mermaid": "^10.0.2", "openblocks-cli": "workspace:^", - "openblocks-sdk": "workspace:^", + "lowcoder-sdk": "workspace:^", "react": "17", "react-dom": "17", "typescript": "4.8.4" diff --git a/client/packages/openblocks-comps/src/__test__/allComp.test.tsx b/client/packages/openblocks-comps/src/__test__/allComp.test.tsx index d2537840e..328eb3547 100644 --- a/client/packages/openblocks-comps/src/__test__/allComp.test.tsx +++ b/client/packages/openblocks-comps/src/__test__/allComp.test.tsx @@ -1,6 +1,6 @@ import _ from "lodash"; import { CompConstructor, CustomAction } from "lowcoder-core"; -import { evalAndReduce, isExposingMethodComp } from "openblocks-sdk"; +import { evalAndReduce, isExposingMethodComp } from "lowcoder-sdk"; import { ChartCompWithDefault } from "comps/chartComp/chartComp"; import log from "loglevel"; diff --git a/client/packages/openblocks-comps/src/app-env.d.ts b/client/packages/openblocks-comps/src/app-env.d.ts index 384087217..c43b9fb87 100644 --- a/client/packages/openblocks-comps/src/app-env.d.ts +++ b/client/packages/openblocks-comps/src/app-env.d.ts @@ -1,3 +1,3 @@ /// -declare module "openblocks-sdk"; +declare module "lowcoder-sdk"; diff --git a/client/packages/openblocks-comps/src/comps/calendarComp/calendarComp.tsx b/client/packages/openblocks-comps/src/comps/calendarComp/calendarComp.tsx index e398b8fae..9e91a9558 100644 --- a/client/packages/openblocks-comps/src/comps/calendarComp/calendarComp.tsx +++ b/client/packages/openblocks-comps/src/comps/calendarComp/calendarComp.tsx @@ -21,7 +21,7 @@ import { jsonValueExposingStateControl, CalendarDeleteIcon, Tooltip, -} from "openblocks-sdk"; +} from "lowcoder-sdk"; import { Input, Form } from "antd"; import { trans, getCalendarLocale } from "../../i18n/comps"; import { createRef, useContext, useRef, useState } from "react"; diff --git a/client/packages/openblocks-comps/src/comps/calendarComp/calendarConstants.tsx b/client/packages/openblocks-comps/src/comps/calendarComp/calendarConstants.tsx index 877be4693..6c26347bd 100644 --- a/client/packages/openblocks-comps/src/comps/calendarComp/calendarConstants.tsx +++ b/client/packages/openblocks-comps/src/comps/calendarComp/calendarConstants.tsx @@ -15,7 +15,7 @@ import { lightenColor, toHex, UnderlineCss, -} from "openblocks-sdk"; +} from "lowcoder-sdk"; import styled from "styled-components"; import moment from "moment"; import { diff --git a/client/packages/openblocks-comps/src/comps/chartComp/chartComp.tsx b/client/packages/openblocks-comps/src/comps/chartComp/chartComp.tsx index d04479350..5f94533a8 100644 --- a/client/packages/openblocks-comps/src/comps/chartComp/chartComp.tsx +++ b/client/packages/openblocks-comps/src/comps/chartComp/chartComp.tsx @@ -26,7 +26,7 @@ import { withViewFn, ThemeContext, chartColorPalette, -} from "openblocks-sdk"; +} from "lowcoder-sdk"; import { getEchartsLocale, trans } from "i18n/comps"; import { ItemColorComp } from "comps/chartComp/chartConfigs/lineChartConfig"; import { diff --git a/client/packages/openblocks-comps/src/comps/chartComp/chartConfigs/barChartConfig.tsx b/client/packages/openblocks-comps/src/comps/chartComp/chartConfigs/barChartConfig.tsx index 913d8773a..6c91fe252 100644 --- a/client/packages/openblocks-comps/src/comps/chartComp/chartConfigs/barChartConfig.tsx +++ b/client/packages/openblocks-comps/src/comps/chartComp/chartConfigs/barChartConfig.tsx @@ -3,7 +3,7 @@ import { dropdownControl, MultiCompBuilder, showLabelPropertyView, -} from "openblocks-sdk"; +} from "lowcoder-sdk"; import { BarSeriesOption } from "echarts"; import { trans } from "i18n/comps"; diff --git a/client/packages/openblocks-comps/src/comps/chartComp/chartConfigs/cartesianAxisConfig.tsx b/client/packages/openblocks-comps/src/comps/chartComp/chartConfigs/cartesianAxisConfig.tsx index 55c58a33d..da4d70221 100644 --- a/client/packages/openblocks-comps/src/comps/chartComp/chartConfigs/cartesianAxisConfig.tsx +++ b/client/packages/openblocks-comps/src/comps/chartComp/chartConfigs/cartesianAxisConfig.tsx @@ -9,7 +9,7 @@ import { dropdownControl, JSONValue, isNumeric, -} from "openblocks-sdk"; +} from "lowcoder-sdk"; import { i18nObjs, trans } from "i18n/comps"; import _, { isNil } from "lodash"; import { xAxisTypeUrl } from "./chartUrls"; diff --git a/client/packages/openblocks-comps/src/comps/chartComp/chartConfigs/legendConfig.tsx b/client/packages/openblocks-comps/src/comps/chartComp/chartConfigs/legendConfig.tsx index 84f03578d..1384c88d8 100644 --- a/client/packages/openblocks-comps/src/comps/chartComp/chartConfigs/legendConfig.tsx +++ b/client/packages/openblocks-comps/src/comps/chartComp/chartConfigs/legendConfig.tsx @@ -4,7 +4,7 @@ import { AlignRight, dropdownControl, MultiCompBuilder, -} from "openblocks-sdk"; +} from "lowcoder-sdk"; import { LegendComponentOption } from "echarts"; import { trans } from "i18n/comps"; diff --git a/client/packages/openblocks-comps/src/comps/chartComp/chartConfigs/lineChartConfig.tsx b/client/packages/openblocks-comps/src/comps/chartComp/chartConfigs/lineChartConfig.tsx index 3c16db136..266e5fbf7 100644 --- a/client/packages/openblocks-comps/src/comps/chartComp/chartConfigs/lineChartConfig.tsx +++ b/client/packages/openblocks-comps/src/comps/chartComp/chartConfigs/lineChartConfig.tsx @@ -7,7 +7,7 @@ import { withContext, StringControl, ColorOrBoolCodeControl, -} from "openblocks-sdk"; +} from "lowcoder-sdk"; import { trans } from "i18n/comps"; const BarTypeOptions = [ diff --git a/client/packages/openblocks-comps/src/comps/chartComp/chartConfigs/pieChartConfig.tsx b/client/packages/openblocks-comps/src/comps/chartComp/chartConfigs/pieChartConfig.tsx index 41166a927..0861fb6ba 100644 --- a/client/packages/openblocks-comps/src/comps/chartComp/chartConfigs/pieChartConfig.tsx +++ b/client/packages/openblocks-comps/src/comps/chartComp/chartConfigs/pieChartConfig.tsx @@ -1,6 +1,6 @@ -import { MultiCompBuilder } from "openblocks-sdk"; +import { MultiCompBuilder } from "lowcoder-sdk"; import { PieSeriesOption } from "echarts"; -import { dropdownControl } from "openblocks-sdk"; +import { dropdownControl } from "lowcoder-sdk"; import { ConstructorToView } from "lowcoder-core"; import { trans } from "i18n/comps"; diff --git a/client/packages/openblocks-comps/src/comps/chartComp/chartConfigs/scatterChartConfig.tsx b/client/packages/openblocks-comps/src/comps/chartComp/chartConfigs/scatterChartConfig.tsx index e16c3c167..edb339bdb 100644 --- a/client/packages/openblocks-comps/src/comps/chartComp/chartConfigs/scatterChartConfig.tsx +++ b/client/packages/openblocks-comps/src/comps/chartComp/chartConfigs/scatterChartConfig.tsx @@ -3,7 +3,7 @@ import { dropdownControl, BoolControl, showLabelPropertyView, -} from "openblocks-sdk"; +} from "lowcoder-sdk"; import { ScatterSeriesOption } from "echarts"; import { trans } from "i18n/comps"; diff --git a/client/packages/openblocks-comps/src/comps/chartComp/chartConstants.tsx b/client/packages/openblocks-comps/src/comps/chartComp/chartConstants.tsx index 82d8e4116..f06e66996 100644 --- a/client/packages/openblocks-comps/src/comps/chartComp/chartConstants.tsx +++ b/client/packages/openblocks-comps/src/comps/chartComp/chartConstants.tsx @@ -1,10 +1,10 @@ -import { jsonControl, JSONObject, stateComp, toJSONObjectArray, toObject } from "openblocks-sdk"; -import { StringControl } from "openblocks-sdk"; -import { dropdownControl } from "openblocks-sdk"; -import { eventHandlerControl } from "openblocks-sdk"; -import { valueComp, withType } from "openblocks-sdk"; -import { ValueFromOption } from "openblocks-sdk"; -import { uiChildren } from "openblocks-sdk"; +import { jsonControl, JSONObject, stateComp, toJSONObjectArray, toObject } from "lowcoder-sdk"; +import { StringControl } from "lowcoder-sdk"; +import { dropdownControl } from "lowcoder-sdk"; +import { eventHandlerControl } from "lowcoder-sdk"; +import { valueComp, withType } from "lowcoder-sdk"; +import { ValueFromOption } from "lowcoder-sdk"; +import { uiChildren } from "lowcoder-sdk"; import { RecordConstructorToComp, RecordConstructorToView } from "lowcoder-core"; import { BarChartConfig } from "./chartConfigs/barChartConfig"; import { XAxisConfig, YAxisConfig } from "./chartConfigs/cartesianAxisConfig"; diff --git a/client/packages/openblocks-comps/src/comps/chartComp/chartPropertyView.tsx b/client/packages/openblocks-comps/src/comps/chartComp/chartPropertyView.tsx index 9e6751bd5..113c71c13 100644 --- a/client/packages/openblocks-comps/src/comps/chartComp/chartPropertyView.tsx +++ b/client/packages/openblocks-comps/src/comps/chartComp/chartPropertyView.tsx @@ -9,7 +9,7 @@ import { RedButton, Section, sectionNames, -} from "openblocks-sdk"; +} from "lowcoder-sdk"; import { trans } from "i18n/comps"; import { examplesUrl, optionUrl } from "./chartConfigs/chartUrls"; diff --git a/client/packages/openblocks-comps/src/comps/chartComp/chartUtils.ts b/client/packages/openblocks-comps/src/comps/chartComp/chartUtils.ts index d910fee8f..280992714 100644 --- a/client/packages/openblocks-comps/src/comps/chartComp/chartUtils.ts +++ b/client/packages/openblocks-comps/src/comps/chartComp/chartUtils.ts @@ -8,7 +8,7 @@ import { import { getPieRadiusAndCenter } from "comps/chartComp/chartConfigs/pieChartConfig"; import { EChartsOption } from "echarts"; import _ from "lodash"; -import { chartColorPalette, isNumeric, JSONObject } from "openblocks-sdk"; +import { chartColorPalette, isNumeric, JSONObject } from "lowcoder-sdk"; import { calcXYConfig } from "comps/chartComp/chartConfigs/cartesianAxisConfig"; import Big from "big.js"; diff --git a/client/packages/openblocks-comps/src/comps/chartComp/seriesComp.tsx b/client/packages/openblocks-comps/src/comps/chartComp/seriesComp.tsx index 780d1be15..9ded885b5 100644 --- a/client/packages/openblocks-comps/src/comps/chartComp/seriesComp.tsx +++ b/client/packages/openblocks-comps/src/comps/chartComp/seriesComp.tsx @@ -9,7 +9,7 @@ import { OptionsType, MultiCompBuilder, valueComp, -} from "openblocks-sdk"; +} from "lowcoder-sdk"; import { trans } from "i18n/comps"; import { ConstructorToComp, ConstructorToDataType, ConstructorToView } from "lowcoder-core"; diff --git a/client/packages/openblocks-comps/src/comps/imageEditorComp/imageEditorConstants.tsx b/client/packages/openblocks-comps/src/comps/imageEditorComp/imageEditorConstants.tsx index 21e65dd29..968955f63 100644 --- a/client/packages/openblocks-comps/src/comps/imageEditorComp/imageEditorConstants.tsx +++ b/client/packages/openblocks-comps/src/comps/imageEditorComp/imageEditorConstants.tsx @@ -1,6 +1,6 @@ import styled from "styled-components"; import { Button } from "antd"; -import { EventConfigType } from "openblocks-sdk"; +import { EventConfigType } from "lowcoder-sdk"; import { trans } from "i18n/comps"; export const saveEvent: EventConfigType = { diff --git a/client/packages/openblocks-comps/src/comps/imageEditorComp/index.tsx b/client/packages/openblocks-comps/src/comps/imageEditorComp/index.tsx index a27e29e6e..70d2bf29b 100644 --- a/client/packages/openblocks-comps/src/comps/imageEditorComp/index.tsx +++ b/client/packages/openblocks-comps/src/comps/imageEditorComp/index.tsx @@ -11,7 +11,7 @@ import { eventHandlerControl, NameConfigHidden, stringExposingStateControl, -} from "openblocks-sdk"; +} from "lowcoder-sdk"; import { useRef } from "react"; import ReactResizeDetector from "react-resize-detector"; import _ from "lodash"; diff --git a/client/packages/openblocks-comps/src/comps/mermaidComp/index.tsx b/client/packages/openblocks-comps/src/comps/mermaidComp/index.tsx index b1918e486..09ea5cba8 100644 --- a/client/packages/openblocks-comps/src/comps/mermaidComp/index.tsx +++ b/client/packages/openblocks-comps/src/comps/mermaidComp/index.tsx @@ -6,7 +6,7 @@ import { NameConfig, eventHandlerControl, withMethodExposing, -} from "openblocks-sdk"; +} from "lowcoder-sdk"; import Mermaid from "./mermaid"; diff --git a/client/packages/openblocks-comps/src/i18n/comps/locales/enObj.tsx b/client/packages/openblocks-comps/src/i18n/comps/locales/enObj.tsx index 9e586611b..c96adaba1 100644 --- a/client/packages/openblocks-comps/src/i18n/comps/locales/enObj.tsx +++ b/client/packages/openblocks-comps/src/i18n/comps/locales/enObj.tsx @@ -1,5 +1,5 @@ import { I18nObjects } from "./types"; -import { chartColorPalette } from "openblocks-sdk"; +import { chartColorPalette } from "lowcoder-sdk"; export const enObj: I18nObjects = { defaultDataSource: [ diff --git a/client/packages/openblocks-comps/src/i18n/comps/locales/types.tsx b/client/packages/openblocks-comps/src/i18n/comps/locales/types.tsx index fb9068c78..821f631c6 100644 --- a/client/packages/openblocks-comps/src/i18n/comps/locales/types.tsx +++ b/client/packages/openblocks-comps/src/i18n/comps/locales/types.tsx @@ -1,4 +1,4 @@ -import { JSONObject } from "openblocks-sdk"; +import { JSONObject } from "lowcoder-sdk"; import { XAXisComponentOption } from "echarts"; export type I18nObjects = { diff --git a/client/packages/openblocks-dev-utils/external.js b/client/packages/openblocks-dev-utils/external.js index fc0b325fd..9b291df86 100644 --- a/client/packages/openblocks-dev-utils/external.js +++ b/client/packages/openblocks-dev-utils/external.js @@ -23,7 +23,7 @@ export const libs = [ extractDefault: true, }, { - name: "openblocks-sdk", + name: "lowcoder-sdk", from: "./src/index.sdk.ts", }, { diff --git a/client/packages/openblocks-plugin-demo/index.tsx b/client/packages/openblocks-plugin-demo/index.tsx index dc9d639c5..515a9d253 100644 --- a/client/packages/openblocks-plugin-demo/index.tsx +++ b/client/packages/openblocks-plugin-demo/index.tsx @@ -1,9 +1,9 @@ import ReactDOM from "react-dom"; -import { CompIDE } from "openblocks-sdk"; +import { CompIDE } from "lowcoder-sdk"; import { name, version, openblocks } from "./package.json"; import compMap from "./src/index"; -import "openblocks-sdk/dist/style.css"; +import "lowcoder-sdk/dist/style.css"; function CompDevApp() { return ( diff --git a/client/packages/openblocks-plugin-demo/package.json b/client/packages/openblocks-plugin-demo/package.json index 1fa5646a7..e3a0959c2 100644 --- a/client/packages/openblocks-plugin-demo/package.json +++ b/client/packages/openblocks-plugin-demo/package.json @@ -33,7 +33,7 @@ "@types/react": "17", "@types/react-dom": "17", "openblocks-cli": "workspace:^", - "openblocks-sdk": "workspace:^", + "lowcoder-sdk": "workspace:^", "typescript": "4.8.4", "vite": "^3.2.4" } diff --git a/client/packages/openblocks-plugin-demo/src/CounterComp.tsx b/client/packages/openblocks-plugin-demo/src/CounterComp.tsx index 9c45281b1..43329449c 100644 --- a/client/packages/openblocks-plugin-demo/src/CounterComp.tsx +++ b/client/packages/openblocks-plugin-demo/src/CounterComp.tsx @@ -9,7 +9,7 @@ import { NameConfig, eventHandlerControl, withMethodExposing, -} from "openblocks-sdk"; +} from "lowcoder-sdk"; import styles from "./style.module.css"; const { Button } = antd; diff --git a/client/packages/openblocks-plugin-demo/src/HelloWorldComp.tsx b/client/packages/openblocks-plugin-demo/src/HelloWorldComp.tsx index eca48282d..c7e2c5fb4 100644 --- a/client/packages/openblocks-plugin-demo/src/HelloWorldComp.tsx +++ b/client/packages/openblocks-plugin-demo/src/HelloWorldComp.tsx @@ -4,7 +4,7 @@ import { Section, withExposingConfigs, NameConfig, -} from "openblocks-sdk"; +} from "lowcoder-sdk"; import styles from "./style.module.css"; diff --git a/client/packages/openblocks-plugin-demo/src/app-env.d.ts b/client/packages/openblocks-plugin-demo/src/app-env.d.ts index 384087217..c43b9fb87 100644 --- a/client/packages/openblocks-plugin-demo/src/app-env.d.ts +++ b/client/packages/openblocks-plugin-demo/src/app-env.d.ts @@ -1,3 +1,3 @@ /// -declare module "openblocks-sdk"; +declare module "lowcoder-sdk"; diff --git a/client/packages/openblocks-plugin-demo/tsconfig.json b/client/packages/openblocks-plugin-demo/tsconfig.json index 04d17614a..8d138d7a4 100644 --- a/client/packages/openblocks-plugin-demo/tsconfig.json +++ b/client/packages/openblocks-plugin-demo/tsconfig.json @@ -18,15 +18,15 @@ "jsx": "react-jsx", "baseUrl": "src", "paths": { - "openblocks-sdk": [ + "lowcoder-sdk": [ "../../openblocks/src/index.sdk.ts", - "../node_modules/openblocks-sdk/src/openblocks/index.sdk.ts" + "../node_modules/lowcoder-sdk/src/openblocks/index.sdk.ts" ], "*": [ "*", "../../openblocks/src/*", - "../../openblocks-sdk/src/*", - "../node_modules/openblocks-sdk/src/openblocks/*" + "../../lowcoder-sdk/src/*", + "../node_modules/lowcoder-sdk/src/openblocks/*" ] } }, diff --git a/client/packages/openblocks-sdk/README.md b/client/packages/openblocks-sdk/README.md index 6a0d9b772..dbfc8a473 100644 --- a/client/packages/openblocks-sdk/README.md +++ b/client/packages/openblocks-sdk/README.md @@ -1,17 +1,17 @@ -# openblocks-sdk +# lowcoder-sdk ## Usage yarn: ```bash -yarn add openblocks-sdk +yarn add lowcoder-sdk ``` npm: ```bash -npm install openblocks-sdk +npm install lowcoder-sdk ``` ## Integrate Lowcoder's app/module into existing app page @@ -23,13 +23,13 @@ npm install openblocks-sdk ### Import style ```ts -import "openblocks-sdk/dist/style.css"; +import "lowcoder-sdk/dist/style.css"; ``` ### For react app: ```ts -import { OpenblocksAppView } from "openblocks-sdk"; +import { OpenblocksAppView } from "lowcoder-sdk"; ; ``` @@ -47,7 +47,7 @@ import { OpenblocksAppView } from "openblocks-sdk"; ```tsx import { useRef } from "ref"; -import { OpenblocksAppView } from "openblocks-sdk"; +import { OpenblocksAppView } from "lowcoder-sdk"; function MyExistingAppPage() { const appRef = useRef(); @@ -65,7 +65,7 @@ function MyExistingAppPage() { ### For vanilla js: ```js -import { bootstrapAppAt } from "openblocks-sdk"; +import { bootstrapAppAt } from "lowcoder-sdk"; const node = document.querySelector("#my-app"); diff --git a/client/packages/openblocks-sdk/package.json b/client/packages/openblocks-sdk/package.json index b62c516fc..e6f224cdb 100644 --- a/client/packages/openblocks-sdk/package.json +++ b/client/packages/openblocks-sdk/package.json @@ -1,5 +1,5 @@ { - "name": "openblocks-sdk", + "name": "lowcoder-sdk", "version": "0.0.39", "type": "module", "files": [ @@ -9,12 +9,12 @@ "dataSource.d.ts", "tsconfig.json" ], - "main": "./dist/openblocks-sdk.js", - "module": "./dist/openblocks-sdk.js", + "main": "./dist/lowcoder-sdk.js", + "module": "./dist/lowcoder-sdk.js", "exports": { ".": { - "import": "./dist/openblocks-sdk.js", - "require": "./dist/openblocks-sdk.js" + "import": "./dist/lowcoder-sdk.js", + "require": "./dist/lowcoder-sdk.js" }, "./dataSource": { "types": "./dataSource.d.ts" diff --git a/client/packages/openblocks-sdk/vite.config.mts b/client/packages/openblocks-sdk/vite.config.mts index 598b2bcf9..e465e2609 100644 --- a/client/packages/openblocks-sdk/vite.config.mts +++ b/client/packages/openblocks-sdk/vite.config.mts @@ -24,7 +24,7 @@ export const viteConfig: UserConfig = { resolve: { extensions: [".mjs", ".js", ".ts", ".jsx", ".tsx", ".json"], alias: { - "openblocks-sdk": path.resolve(__dirname, "../openblocks/src/index.sdk"), + "lowcoder-sdk": path.resolve(__dirname, "../openblocks/src/index.sdk"), "@openblocks-ee": path.resolve(__dirname, "../openblocks/src"), }, }, @@ -34,7 +34,7 @@ export const viteConfig: UserConfig = { formats: ["es"], entry: "./src/index.ts", name: "Openblocks", - fileName: "openblocks-sdk", + fileName: "lowcoder-sdk", }, rollupOptions: { external: ["react", "react-dom"], @@ -73,7 +73,7 @@ export const viteConfig: UserConfig = { }, }, plugins: [ - globalDepPlugin(["openblocks-sdk"]), + globalDepPlugin(["lowcoder-sdk"]), react({ babel: { parserOpts: { diff --git a/client/packages/openblocks/src/api/datasourceApi.ts b/client/packages/openblocks/src/api/datasourceApi.ts index d246a5dbc..a79486ceb 100644 --- a/client/packages/openblocks/src/api/datasourceApi.ts +++ b/client/packages/openblocks/src/api/datasourceApi.ts @@ -7,7 +7,7 @@ import { DatasourceType } from "@openblocks-ee/constants/queryConstants"; import { JSONArray } from "util/jsonTypes"; import { AuthType, HttpOAuthGrantType } from "pages/datasource/form/httpDatasourceForm"; import { Datasource } from "@openblocks-ee/constants/datasourceConstants"; -import { DataSourcePluginMeta } from "openblocks-sdk/dataSource"; +import { DataSourcePluginMeta } from "lowcoder-sdk/dataSource"; export interface PreparedStatementConfig { enableTurnOffPreparedStatement: boolean; diff --git a/client/packages/openblocks/src/comps/queries/pluginQuery/pluginQuery.tsx b/client/packages/openblocks/src/comps/queries/pluginQuery/pluginQuery.tsx index 71584e877..9ce3451d4 100644 --- a/client/packages/openblocks/src/comps/queries/pluginQuery/pluginQuery.tsx +++ b/client/packages/openblocks/src/comps/queries/pluginQuery/pluginQuery.tsx @@ -4,7 +4,7 @@ import { ActionParamConfig, KeyedParamConfig, QueryConfig, -} from "openblocks-sdk/dataSource"; +} from "lowcoder-sdk/dataSource"; import { ParamsBooleanCodeControl, ParamsNumberControl, diff --git a/client/packages/openblocks/src/constants/datasourceConstants.ts b/client/packages/openblocks/src/constants/datasourceConstants.ts index 3f57800e2..bde6ee07c 100644 --- a/client/packages/openblocks/src/constants/datasourceConstants.ts +++ b/client/packages/openblocks/src/constants/datasourceConstants.ts @@ -2,7 +2,7 @@ import { DatasourceType } from "@openblocks-ee/constants/queryConstants"; import { DatasourceConfigType } from "api/datasourceApi"; import { getBottomResIcon } from "@openblocks-ee/util/bottomResUtils"; import { trans } from "i18n"; -import { DataSourcePluginMeta } from "openblocks-sdk/dataSource"; +import { DataSourcePluginMeta } from "lowcoder-sdk/dataSource"; export const databasePlugins: Partial[] = [ "mysql", diff --git a/client/packages/openblocks/src/constants/queryConstants.ts b/client/packages/openblocks/src/constants/queryConstants.ts index 9221edd9a..b50d64eb7 100644 --- a/client/packages/openblocks/src/constants/queryConstants.ts +++ b/client/packages/openblocks/src/constants/queryConstants.ts @@ -12,7 +12,7 @@ import { GoogleSheetsQuery } from "../comps/queries/googleSheetsQuery"; import { GraphqlQuery } from "../comps/queries/httpQuery/graphqlQuery"; import { toPluginQuery } from "comps/queries/pluginQuery/pluginQuery"; import { MultiCompConstructor } from "lowcoder-core"; -import { DataSourcePluginMeta } from "openblocks-sdk/dataSource"; +import { DataSourcePluginMeta } from "lowcoder-sdk/dataSource"; export type DatasourceType = | "mysql" diff --git a/client/packages/openblocks/src/pages/datasource/form/pluginDataSourceForm.tsx b/client/packages/openblocks/src/pages/datasource/form/pluginDataSourceForm.tsx index f764c4061..4eab38fb8 100644 --- a/client/packages/openblocks/src/pages/datasource/form/pluginDataSourceForm.tsx +++ b/client/packages/openblocks/src/pages/datasource/form/pluginDataSourceForm.tsx @@ -29,7 +29,7 @@ import { DataSourceParamType, DataSourcePluginMeta, DataSourceExtraConfig, -} from "openblocks-sdk/dataSource"; +} from "lowcoder-sdk/dataSource"; import styled from "styled-components"; import { trans } from "i18n"; import { Datasource } from "constants/datasourceConstants"; diff --git a/client/packages/openblocks/src/pages/datasource/getDataSourceFormManifest.ts b/client/packages/openblocks/src/pages/datasource/getDataSourceFormManifest.ts index f6a10ed8e..f99213f77 100644 --- a/client/packages/openblocks/src/pages/datasource/getDataSourceFormManifest.ts +++ b/client/packages/openblocks/src/pages/datasource/getDataSourceFormManifest.ts @@ -1,6 +1,6 @@ import { DatasourceType } from "@openblocks-ee/constants/queryConstants"; import { DatasourceFormRegistry } from "@openblocks-ee/pages/datasource/form/datasourceFormRegistry"; -import { DataSourcePluginMeta } from "openblocks-sdk/dataSource"; +import { DataSourcePluginMeta } from "lowcoder-sdk/dataSource"; import { DatasourceFormManifest } from "./form/datasourceFormRegistry"; import { PluginDataSourceForm } from "./form/pluginDataSourceForm"; diff --git a/client/packages/openblocks/tsconfig.paths.json b/client/packages/openblocks/tsconfig.paths.json index 913498485..799251623 100644 --- a/client/packages/openblocks/tsconfig.paths.json +++ b/client/packages/openblocks/tsconfig.paths.json @@ -2,7 +2,7 @@ "compilerOptions": { "paths": { "@openblocks-ee/*": ["*"], - "openblocks-sdk": ["index.sdk"], + "lowcoder-sdk": ["index.sdk"], "*": ["*", "../../lowcoder-comps/src/*", "../../lowcoder-design/src/*"] } } diff --git a/client/yarn.lock b/client/yarn.lock index 49a832d5d..6e9f5a255 100644 --- a/client/yarn.lock +++ b/client/yarn.lock @@ -14291,7 +14291,7 @@ __metadata: resolution: "openblocks-cli-template-typescript@workspace:packages/openblocks-cli-template-typescript" dependencies: openblocks-cli: "workspace:^" - openblocks-sdk: "workspace:^" + lowcoder-sdk: "workspace:^" typescript: ^4.8.4 vite: ^3.2.4 languageName: unknown @@ -14318,7 +14318,7 @@ __metadata: vite-plugin-css-injected-by-js: ^2.1.1 vite-plugin-svgr: ^2.2.2 peerDependencies: - openblocks-sdk: "*" + lowcoder-sdk: "*" bin: openblocks-cli: ./index.js languageName: unknown @@ -14341,7 +14341,7 @@ __metadata: jest: 29.3.0 mermaid: ^10.0.2 openblocks-cli: "workspace:^" - openblocks-sdk: "workspace:^" + lowcoder-sdk: "workspace:^" react: 17 react-dom: 17 typescript: 4.8.4 @@ -14420,7 +14420,7 @@ __metadata: openblocks-cli: "workspace:^" lowcoder-core: ^0.0.1 lowcoder-design: ^0.0.1 - openblocks-sdk: "workspace:^" + lowcoder-sdk: "workspace:^" react: 17 react-dom: 17 typescript: 4.8.4 @@ -14428,9 +14428,9 @@ __metadata: languageName: unknown linkType: soft -"openblocks-sdk@workspace:^, openblocks-sdk@workspace:packages/openblocks-sdk": +"lowcoder-sdk@workspace:^, lowcoder-sdk@workspace:packages/lowcoder-sdk": version: 0.0.0-use.local - resolution: "openblocks-sdk@workspace:packages/openblocks-sdk" + resolution: "lowcoder-sdk@workspace:packages/lowcoder-sdk" dependencies: "@rollup/plugin-commonjs": ^22.0.2 "@rollup/plugin-json": ^5.0.1 From dec2350f057f7efbe9018c19687a69918e8f690a Mon Sep 17 00:00:00 2001 From: Jan Richter Date: Fri, 12 May 2023 01:56:37 +1200 Subject: [PATCH 07/21] refactor: rename openblocks-ee to lowcoder-sdk --- client/config/test/jest.config.js | 2 +- client/packages/openblocks-dev-utils/globalDepPlguin.js | 2 +- client/packages/openblocks-sdk/tsconfig.json | 2 +- client/packages/openblocks-sdk/vite.config.mts | 2 +- client/packages/openblocks/src/api/applicationApi.ts | 2 +- client/packages/openblocks/src/api/datasourceApi.ts | 4 ++-- client/packages/openblocks/src/api/idSourceApi.ts | 2 +- client/packages/openblocks/src/api/queryLibraryApi.ts | 2 +- client/packages/openblocks/src/app.tsx | 2 +- .../packages/openblocks/src/components/DataSourceIcon.tsx | 2 +- .../packages/openblocks/src/components/PageSkeleton.tsx | 2 +- .../packages/openblocks/src/components/ResCreatePanel.tsx | 4 ++-- .../packages/openblocks/src/comps/comps/allComp.test.tsx | 2 +- .../src/comps/comps/dataChangeResponderComp.tsx | 2 +- .../openblocks/src/comps/comps/folderListComp.tsx | 2 +- .../openblocks/src/comps/comps/formComp/createForm.tsx | 2 +- .../comps/comps/formComp/generate/dataSourceCommon.tsx | 2 +- .../src/comps/comps/formComp/generate/index.tsx | 2 +- .../openblocks/src/comps/comps/temporaryStateComp.tsx | 2 +- .../openblocks/src/comps/comps/transformerListComp.tsx | 2 +- .../packages/openblocks/src/comps/queries/queryComp.tsx | 2 +- .../src/comps/queries/queryComp/queryPropertyView.tsx | 4 ++-- .../openblocks/src/comps/queries/queryCompUtils.tsx | 2 +- .../openblocks/src/comps/queries/resourceDropdown.tsx | 6 +++--- .../packages/openblocks/src/constants/configConstants.ts | 4 ++-- .../openblocks/src/constants/datasourceConstants.ts | 4 ++-- client/packages/openblocks/src/constants/routesURL.ts | 2 +- client/packages/openblocks/src/i18n/locales/index.ts | 4 ++-- client/packages/openblocks/src/pages/common/header.tsx | 2 +- client/packages/openblocks/src/pages/common/help.tsx | 2 +- .../openblocks/src/pages/common/previewHeader.tsx | 2 +- .../openblocks/src/pages/common/profileDropdown.tsx | 2 +- .../src/pages/datasource/datasourceEditPage.tsx | 4 ++-- .../openblocks/src/pages/datasource/datasourceModal.tsx | 8 ++++---- client/packages/openblocks/src/pages/datasource/form.tsx | 2 +- .../src/pages/datasource/form/datasourceFormRegistry.tsx | 4 ++-- .../src/pages/datasource/form/useDatasourceForm.ts | 4 ++-- .../src/pages/datasource/getDataSourceFormManifest.ts | 4 ++-- .../openblocks/src/pages/datasource/pluginPanel.tsx | 4 ++-- .../src/pages/editor/bottom/BottomMetaDrawer.tsx | 2 +- .../openblocks/src/pages/queryLibrary/LeftNav.tsx | 2 +- .../src/pages/queryLibrary/QueryLibraryEditor.tsx | 2 +- .../src/pages/setting/advanced/AdvancedSetting.tsx | 2 +- .../src/pages/setting/idSource/detail/index.tsx | 2 +- .../src/pages/setting/idSource/detail/manual.tsx | 2 +- .../openblocks/src/pages/setting/idSource/list.tsx | 4 ++-- .../src/pages/setting/permission/permissionList.tsx | 2 +- .../openblocks/src/pages/setting/profile/index.tsx | 2 +- .../src/pages/setting/profile/profileInfoCard.tsx | 2 +- .../packages/openblocks/src/pages/setting/settingHome.tsx | 6 +++--- .../packages/openblocks/src/pages/userAuth/formLogin.tsx | 2 +- client/packages/openblocks/src/pages/userAuth/index.tsx | 2 +- client/packages/openblocks/src/pages/userAuth/login.tsx | 2 +- .../packages/openblocks/src/pages/userAuth/register.tsx | 2 +- .../src/pages/userAuth/thirdParty/authRedirect.tsx | 2 +- .../redux/reducers/entitiyReducers/datasourceReducer.ts | 2 +- .../src/redux/reduxActions/datasourceActions.ts | 2 +- .../src/redux/reduxActions/queryLibraryActions.ts | 2 +- client/packages/openblocks/src/redux/sagas/configSagas.ts | 2 +- .../openblocks/src/redux/sagas/datasourceSagas.ts | 2 +- .../openblocks/src/redux/selectors/datasourceSelectors.ts | 2 +- client/packages/openblocks/src/redux/store/store.ts | 4 ++-- client/packages/openblocks/src/util/bottomResUtils.tsx | 2 +- .../packages/openblocks/src/util/context/QueryContext.ts | 2 +- client/packages/openblocks/src/util/tutorialUtils.ts | 2 +- client/packages/openblocks/tsconfig.paths.json | 2 +- client/packages/openblocks/vite.config.mts | 2 +- 67 files changed, 87 insertions(+), 87 deletions(-) diff --git a/client/config/test/jest.config.js b/client/config/test/jest.config.js index 30397badb..dc29cae50 100644 --- a/client/config/test/jest.config.js +++ b/client/config/test/jest.config.js @@ -16,7 +16,7 @@ export default { moduleNameMapper: { "react-markdown": path.resolve(dirname, "./mocks/react-markdown.js"), "\\.md\\?url$": path.resolve(dirname, "./mocks/markdown-url-module.js"), - "^@openblocks-ee(.*)$": path.resolve( + "^@lowcoder-ee(.*)$": path.resolve( dirname, isEE ? "../../packages/openblocks/src/ee/$1" : "../../packages/openblocks/src/$1" ), diff --git a/client/packages/openblocks-dev-utils/globalDepPlguin.js b/client/packages/openblocks-dev-utils/globalDepPlguin.js index 72dd6d828..90068f81b 100644 --- a/client/packages/openblocks-dev-utils/globalDepPlguin.js +++ b/client/packages/openblocks-dev-utils/globalDepPlguin.js @@ -3,7 +3,7 @@ import { libsImportCode } from "./external.js"; export function globalDepPlugin(exclude = []) { const virtualModuleId = "virtual:globals"; return { - name: "openblocks-global-plugin", + name: "lowcoder-global-plugin", resolveId(id) { if (id === virtualModuleId) { return id; diff --git a/client/packages/openblocks-sdk/tsconfig.json b/client/packages/openblocks-sdk/tsconfig.json index 2ae4f7d9b..ad9482e59 100644 --- a/client/packages/openblocks-sdk/tsconfig.json +++ b/client/packages/openblocks-sdk/tsconfig.json @@ -27,7 +27,7 @@ "../../lowcoder-comps/src/*", "../../lowcoder-design/src/*" ], - "@openblocks-ee/*": ["../../openblocks/src/*"] + "@lowcoder-ee/*": ["../../openblocks/src/*"] } }, "exclude": ["../openblocks/src/ee/*"], diff --git a/client/packages/openblocks-sdk/vite.config.mts b/client/packages/openblocks-sdk/vite.config.mts index e465e2609..17888f8d9 100644 --- a/client/packages/openblocks-sdk/vite.config.mts +++ b/client/packages/openblocks-sdk/vite.config.mts @@ -25,7 +25,7 @@ export const viteConfig: UserConfig = { extensions: [".mjs", ".js", ".ts", ".jsx", ".tsx", ".json"], alias: { "lowcoder-sdk": path.resolve(__dirname, "../openblocks/src/index.sdk"), - "@openblocks-ee": path.resolve(__dirname, "../openblocks/src"), + "@lowcoder-ee": path.resolve(__dirname, "../openblocks/src"), }, }, base: ensureLastSlash(process.env.PUBLIC_URL), diff --git a/client/packages/openblocks/src/api/applicationApi.ts b/client/packages/openblocks/src/api/applicationApi.ts index 6a049a578..41ee23204 100644 --- a/client/packages/openblocks/src/api/applicationApi.ts +++ b/client/packages/openblocks/src/api/applicationApi.ts @@ -22,7 +22,7 @@ import { FolderMeta, } from "constants/applicationConstants"; import { CommonSettingResponseData } from "./commonSettingApi"; -import { ResourceType } from "@openblocks-ee/constants/queryConstants"; +import { ResourceType } from "@lowcoder-ee/constants/queryConstants"; export interface HomeOrgMeta { id: string; diff --git a/client/packages/openblocks/src/api/datasourceApi.ts b/client/packages/openblocks/src/api/datasourceApi.ts index a79486ceb..647a87bc9 100644 --- a/client/packages/openblocks/src/api/datasourceApi.ts +++ b/client/packages/openblocks/src/api/datasourceApi.ts @@ -3,10 +3,10 @@ import Api from "./api"; import { GenericApiResponse } from "./apiResponses"; import { DEFAULT_TEST_DATA_SOURCE_TIMEOUT_MS } from "constants/apiConstants"; import { Datasource as CEDatasource } from "../constants/datasourceConstants"; -import { DatasourceType } from "@openblocks-ee/constants/queryConstants"; +import { DatasourceType } from "@lowcoder-ee/constants/queryConstants"; import { JSONArray } from "util/jsonTypes"; import { AuthType, HttpOAuthGrantType } from "pages/datasource/form/httpDatasourceForm"; -import { Datasource } from "@openblocks-ee/constants/datasourceConstants"; +import { Datasource } from "@lowcoder-ee/constants/datasourceConstants"; import { DataSourcePluginMeta } from "lowcoder-sdk/dataSource"; export interface PreparedStatementConfig { diff --git a/client/packages/openblocks/src/api/idSourceApi.ts b/client/packages/openblocks/src/api/idSourceApi.ts index a8c2035bb..98e6141d7 100644 --- a/client/packages/openblocks/src/api/idSourceApi.ts +++ b/client/packages/openblocks/src/api/idSourceApi.ts @@ -1,7 +1,7 @@ import Api from "api/api"; import { AxiosPromise } from "axios"; import { ApiResponse } from "api/apiResponses"; -import { AuthType } from "@openblocks-ee/pages/setting/idSource/idSourceConstants"; +import { AuthType } from "@lowcoder-ee/pages/setting/idSource/idSourceConstants"; export interface ConfigItem { id: string; diff --git a/client/packages/openblocks/src/api/queryLibraryApi.ts b/client/packages/openblocks/src/api/queryLibraryApi.ts index 0e3c3da4f..063cf6ecc 100644 --- a/client/packages/openblocks/src/api/queryLibraryApi.ts +++ b/client/packages/openblocks/src/api/queryLibraryApi.ts @@ -1,7 +1,7 @@ import Api from "./api"; import { AxiosPromise } from "axios"; import { GenericApiResponse } from "./apiResponses"; -import { DatasourceType } from "@openblocks-ee/constants/queryConstants"; +import { DatasourceType } from "@lowcoder-ee/constants/queryConstants"; export interface LibraryQuery { id: string; diff --git a/client/packages/openblocks/src/app.tsx b/client/packages/openblocks/src/app.tsx index 76fc3c809..f1b86d89d 100644 --- a/client/packages/openblocks/src/app.tsx +++ b/client/packages/openblocks/src/app.tsx @@ -40,7 +40,7 @@ import { loadComps } from "comps"; import { fetchHomeData } from "redux/reduxActions/applicationActions"; import { initApp } from "util/commonUtils"; import ApplicationHome from "./pages/ApplicationV2"; -import { favicon } from "@openblocks-ee/assets/images"; +import { favicon } from "@lowcoder-ee/assets/images"; import { hasQueryParam } from "util/urlUtils"; import { isFetchUserFinished } from "redux/selectors/usersSelectors"; import { SystemWarning } from "./components/SystemWarning"; diff --git a/client/packages/openblocks/src/components/DataSourceIcon.tsx b/client/packages/openblocks/src/components/DataSourceIcon.tsx index 4aea4fcbd..d2ee74bd4 100644 --- a/client/packages/openblocks/src/components/DataSourceIcon.tsx +++ b/client/packages/openblocks/src/components/DataSourceIcon.tsx @@ -1,4 +1,4 @@ -import { getBottomResIcon } from "@openblocks-ee/util/bottomResUtils"; +import { getBottomResIcon } from "@lowcoder-ee/util/bottomResUtils"; import { HttpMethod } from "api/api"; import { useSelector } from "react-redux"; import { getDataSource } from "redux/selectors/datasourceSelectors"; diff --git a/client/packages/openblocks/src/components/PageSkeleton.tsx b/client/packages/openblocks/src/components/PageSkeleton.tsx index aa728c544..d5a2dd7c2 100644 --- a/client/packages/openblocks/src/components/PageSkeleton.tsx +++ b/client/packages/openblocks/src/components/PageSkeleton.tsx @@ -2,7 +2,7 @@ import { Layout, Skeleton } from "antd"; import MainContent from "components/layout/MainContent"; import SideBar from "components/layout/SideBar"; import Header from "./layout/Header"; -import { Logo, LogoWithName } from "@openblocks-ee/assets/images"; +import { Logo, LogoWithName } from "@lowcoder-ee/assets/images"; import styled from "styled-components"; import { useSelector } from "react-redux"; import { getBrandingConfig, getSystemConfigFetching } from "../redux/selectors/configSelectors"; diff --git a/client/packages/openblocks/src/components/ResCreatePanel.tsx b/client/packages/openblocks/src/components/ResCreatePanel.tsx index f76763705..6d174c02e 100644 --- a/client/packages/openblocks/src/components/ResCreatePanel.tsx +++ b/client/packages/openblocks/src/components/ResCreatePanel.tsx @@ -11,14 +11,14 @@ import { BottomResTypeEnum } from "types/bottomRes"; import { LargeBottomResIconWrapper } from "util/bottomResUtils"; import { PageType } from "../constants/pageConstants"; import { SizeType } from "antd/lib/config-provider/SizeContext"; -import { Datasource } from "@openblocks-ee/constants/datasourceConstants"; +import { Datasource } from "@lowcoder-ee/constants/datasourceConstants"; import { OPENBLOCKS_API_ID, OPENBLOCKS_API_INFO, QUICK_GRAPHQL_ID, QUICK_REST_API_ID, } from "../constants/datasourceConstants"; -import { ResourceType } from "@openblocks-ee/constants/queryConstants"; +import { ResourceType } from "@lowcoder-ee/constants/queryConstants"; import { Upload } from "antd"; import { useSelector } from "react-redux"; import { getUser } from "../redux/selectors/usersSelectors"; diff --git a/client/packages/openblocks/src/comps/comps/allComp.test.tsx b/client/packages/openblocks/src/comps/comps/allComp.test.tsx index 051602c90..44292f3d7 100644 --- a/client/packages/openblocks/src/comps/comps/allComp.test.tsx +++ b/client/packages/openblocks/src/comps/comps/allComp.test.tsx @@ -1,4 +1,4 @@ -import { QueryMap } from "@openblocks-ee/constants/queryConstants"; +import { QueryMap } from "@lowcoder-ee/constants/queryConstants"; import { loadComps } from "comps"; import { ColumnComp, RenderComp } from "comps/comps/tableComp/column/tableColumnComp"; import { InputComp } from "comps/comps/textInputComp/inputComp"; diff --git a/client/packages/openblocks/src/comps/comps/dataChangeResponderComp.tsx b/client/packages/openblocks/src/comps/comps/dataChangeResponderComp.tsx index d4c824d19..b480ce5c8 100644 --- a/client/packages/openblocks/src/comps/comps/dataChangeResponderComp.tsx +++ b/client/packages/openblocks/src/comps/comps/dataChangeResponderComp.tsx @@ -1,4 +1,4 @@ -import { getBottomResIcon } from "@openblocks-ee/util/bottomResUtils"; +import { getBottomResIcon } from "@lowcoder-ee/util/bottomResUtils"; import { JSONValueControl } from "comps/controls/codeControl"; import { EventConfigType, eventHandlerControl } from "comps/controls/eventHandlerControl"; import { MultiCompBuilder, valueComp } from "comps/generators"; diff --git a/client/packages/openblocks/src/comps/comps/folderListComp.tsx b/client/packages/openblocks/src/comps/comps/folderListComp.tsx index c0724b027..e072d9cc2 100644 --- a/client/packages/openblocks/src/comps/comps/folderListComp.tsx +++ b/client/packages/openblocks/src/comps/comps/folderListComp.tsx @@ -1,4 +1,4 @@ -import { getBottomResIcon } from "@openblocks-ee/util/bottomResUtils"; +import { getBottomResIcon } from "@lowcoder-ee/util/bottomResUtils"; import { MultiCompBuilder, valueComp } from "comps/generators"; import { bottomResListComp } from "comps/generators/bottomResList"; import { NameGenerator } from "comps/utils"; diff --git a/client/packages/openblocks/src/comps/comps/formComp/createForm.tsx b/client/packages/openblocks/src/comps/comps/formComp/createForm.tsx index 5b33e0ba2..5d4dd05ad 100644 --- a/client/packages/openblocks/src/comps/comps/formComp/createForm.tsx +++ b/client/packages/openblocks/src/comps/comps/formComp/createForm.tsx @@ -24,7 +24,7 @@ import { uiCompRegistry } from "comps/uiCompRegistry"; import { arrayMove, SortableContainer, SortableElement, SortableHandle } from "react-sortable-hoc"; import { trans } from "i18n"; import log from "loglevel"; -import { Datasource } from "@openblocks-ee/constants/datasourceConstants"; +import { Datasource } from "@lowcoder-ee/constants/datasourceConstants"; import DataSourceIcon from "components/DataSourceIcon"; const OpenDialogButton = styled.span` diff --git a/client/packages/openblocks/src/comps/comps/formComp/generate/dataSourceCommon.tsx b/client/packages/openblocks/src/comps/comps/formComp/generate/dataSourceCommon.tsx index 93f0ed727..99d8af499 100644 --- a/client/packages/openblocks/src/comps/comps/formComp/generate/dataSourceCommon.tsx +++ b/client/packages/openblocks/src/comps/comps/formComp/generate/dataSourceCommon.tsx @@ -1,7 +1,7 @@ import { ConstructorToDataType } from "lowcoder-core"; import { QueryComp } from "comps/queries/queryComp"; import { CompConfig, CompSelection, generateWrapJs } from "./comp"; -import { DatasourceType } from "@openblocks-ee/constants/queryConstants"; +import { DatasourceType } from "@lowcoder-ee/constants/queryConstants"; export type TableColumn = { // The type of column, different data sources have different definitions diff --git a/client/packages/openblocks/src/comps/comps/formComp/generate/index.tsx b/client/packages/openblocks/src/comps/comps/formComp/generate/index.tsx index d083f66e4..7fdffe2b7 100644 --- a/client/packages/openblocks/src/comps/comps/formComp/generate/index.tsx +++ b/client/packages/openblocks/src/comps/comps/formComp/generate/index.tsx @@ -3,7 +3,7 @@ import { msSqlConfig } from "./mssql"; import { mysqlConfig } from "./mysql"; import { oracleSqlConfig } from "./oracle"; import { postgreSqlConfig } from "./postgresql"; -import { DatasourceType } from "@openblocks-ee/constants/queryConstants"; +import { DatasourceType } from "@lowcoder-ee/constants/queryConstants"; export function getDataSourceTypeConfig( dataSourceType?: DatasourceType diff --git a/client/packages/openblocks/src/comps/comps/temporaryStateComp.tsx b/client/packages/openblocks/src/comps/comps/temporaryStateComp.tsx index a3c4e4161..9c88e05d3 100644 --- a/client/packages/openblocks/src/comps/comps/temporaryStateComp.tsx +++ b/client/packages/openblocks/src/comps/comps/temporaryStateComp.tsx @@ -1,4 +1,4 @@ -import { getBottomResIcon } from "@openblocks-ee/util/bottomResUtils"; +import { getBottomResIcon } from "@lowcoder-ee/util/bottomResUtils"; import { jsonValueStateControl } from "comps/controls/codeStateControl"; import { MultiCompBuilder } from "comps/generators"; import { bottomResListComp } from "comps/generators/bottomResList"; diff --git a/client/packages/openblocks/src/comps/comps/transformerListComp.tsx b/client/packages/openblocks/src/comps/comps/transformerListComp.tsx index 2390e7934..bdc74f0e3 100644 --- a/client/packages/openblocks/src/comps/comps/transformerListComp.tsx +++ b/client/packages/openblocks/src/comps/comps/transformerListComp.tsx @@ -1,4 +1,4 @@ -import { getBottomResIcon } from "@openblocks-ee/util/bottomResUtils"; +import { getBottomResIcon } from "@lowcoder-ee/util/bottomResUtils"; import { codeControl, TransformerCodeControl } from "comps/controls/codeControl"; import { EditorContext } from "comps/editorState"; import { MultiCompBuilder } from "comps/generators"; diff --git a/client/packages/openblocks/src/comps/queries/queryComp.tsx b/client/packages/openblocks/src/comps/queries/queryComp.tsx index b2ef16766..f63e7f709 100644 --- a/client/packages/openblocks/src/comps/queries/queryComp.tsx +++ b/client/packages/openblocks/src/comps/queries/queryComp.tsx @@ -2,7 +2,7 @@ import { manualTriggerResource, QueryMap, ResourceType, -} from "@openblocks-ee/constants/queryConstants"; +} from "@lowcoder-ee/constants/queryConstants"; import { message } from "antd"; import axios from "axios"; import DataSourceIcon from "components/DataSourceIcon"; diff --git a/client/packages/openblocks/src/comps/queries/queryComp/queryPropertyView.tsx b/client/packages/openblocks/src/comps/queries/queryComp/queryPropertyView.tsx index 6635e4eab..7a849fb73 100644 --- a/client/packages/openblocks/src/comps/queries/queryComp/queryPropertyView.tsx +++ b/client/packages/openblocks/src/comps/queries/queryComp/queryPropertyView.tsx @@ -1,5 +1,5 @@ -import { OLD_OPENBLOCKS_DATASOURCE } from "@openblocks-ee/constants/datasourceConstants"; -import { manualTriggerResource, ResourceType } from "@openblocks-ee/constants/queryConstants"; +import { OLD_OPENBLOCKS_DATASOURCE } from "@lowcoder-ee/constants/datasourceConstants"; +import { manualTriggerResource, ResourceType } from "@lowcoder-ee/constants/queryConstants"; import { PreparedStatementConfig } from "api/datasourceApi"; import { isCompWithPropertyView } from "comps/utils/propertyUtils"; import { diff --git a/client/packages/openblocks/src/comps/queries/queryCompUtils.tsx b/client/packages/openblocks/src/comps/queries/queryCompUtils.tsx index 4197c6140..1971e8ec5 100644 --- a/client/packages/openblocks/src/comps/queries/queryCompUtils.tsx +++ b/client/packages/openblocks/src/comps/queries/queryCompUtils.tsx @@ -6,7 +6,7 @@ import { MultiCompBuilder, ToConstructor } from "../generators/multi"; import { Fragment } from "react"; import { ParamsControlType, ValueFunction } from "../controls/paramsControl"; import { getGlobalSettings } from "comps/utils/globalSettings"; -import { ResourceType } from "@openblocks-ee/constants/queryConstants"; +import { ResourceType } from "@lowcoder-ee/constants/queryConstants"; export type FunctionProperty = { key: string; diff --git a/client/packages/openblocks/src/comps/queries/resourceDropdown.tsx b/client/packages/openblocks/src/comps/queries/resourceDropdown.tsx index 47f14a644..7a45705a8 100644 --- a/client/packages/openblocks/src/comps/queries/resourceDropdown.tsx +++ b/client/packages/openblocks/src/comps/queries/resourceDropdown.tsx @@ -8,9 +8,9 @@ import { DatasourceModal } from "pages/datasource/datasourceModal"; import { InputStatus } from "antd/lib/_util/statusUtils"; import { getDataSource, getDataSourceTypes } from "redux/selectors/datasourceSelectors"; import { getUser } from "redux/selectors/usersSelectors"; -import { getBottomResIcon } from "@openblocks-ee/util/bottomResUtils"; +import { getBottomResIcon } from "@lowcoder-ee/util/bottomResUtils"; import { trans } from "i18n"; -import { DatasourceType, ResourceType } from "@openblocks-ee/constants/queryConstants"; +import { DatasourceType, ResourceType } from "@lowcoder-ee/constants/queryConstants"; import { OPENBLOCKS_API_ID, OPENBLOCKS_API_INFO, @@ -20,7 +20,7 @@ import { import { apiPluginsForQueryLibrary, databasePlugins, -} from "@openblocks-ee/constants/datasourceConstants"; +} from "@lowcoder-ee/constants/datasourceConstants"; import { QueryContext } from "util/context/QueryContext"; const SelectOptionLabel = styled.div` diff --git a/client/packages/openblocks/src/constants/configConstants.ts b/client/packages/openblocks/src/constants/configConstants.ts index ff6bcef71..03b0947e3 100644 --- a/client/packages/openblocks/src/constants/configConstants.ts +++ b/client/packages/openblocks/src/constants/configConstants.ts @@ -1,12 +1,12 @@ import { ThirdPartyConfigType } from "constants/authConstants"; import { QR_CODE_OAUTH_URL } from "constants/routesURL"; -import { UserConnectionSource } from "@openblocks-ee/constants/userConstants"; +import { UserConnectionSource } from "@lowcoder-ee/constants/userConstants"; import { GeneralLoginIcon } from "assets/icons"; import { isRouteLink, ServerAuthType, ServerAuthTypeInfo, -} from "@openblocks-ee/constants/authConstants"; +} from "@lowcoder-ee/constants/authConstants"; interface FeatureFlag { enableCustomBranding: boolean; diff --git a/client/packages/openblocks/src/constants/datasourceConstants.ts b/client/packages/openblocks/src/constants/datasourceConstants.ts index bde6ee07c..887a5e2e1 100644 --- a/client/packages/openblocks/src/constants/datasourceConstants.ts +++ b/client/packages/openblocks/src/constants/datasourceConstants.ts @@ -1,6 +1,6 @@ -import { DatasourceType } from "@openblocks-ee/constants/queryConstants"; +import { DatasourceType } from "@lowcoder-ee/constants/queryConstants"; import { DatasourceConfigType } from "api/datasourceApi"; -import { getBottomResIcon } from "@openblocks-ee/util/bottomResUtils"; +import { getBottomResIcon } from "@lowcoder-ee/util/bottomResUtils"; import { trans } from "i18n"; import { DataSourcePluginMeta } from "lowcoder-sdk/dataSource"; diff --git a/client/packages/openblocks/src/constants/routesURL.ts b/client/packages/openblocks/src/constants/routesURL.ts index 216d9abd4..b9e164bbf 100644 --- a/client/packages/openblocks/src/constants/routesURL.ts +++ b/client/packages/openblocks/src/constants/routesURL.ts @@ -1,7 +1,7 @@ import { AppViewMode } from "constants/applicationConstants"; import { LocationDescriptor } from "history"; import { UserGuideLocationState } from "pages/tutorials/tutorialsConstant"; -import { DatasourceType } from "@openblocks-ee/constants/queryConstants"; +import { DatasourceType } from "@lowcoder-ee/constants/queryConstants"; export const BASE_URL = "/"; export const USER_AUTH_URL = "/user/auth"; diff --git a/client/packages/openblocks/src/i18n/locales/index.ts b/client/packages/openblocks/src/i18n/locales/index.ts index cd48e5ce2..e1ce6572c 100644 --- a/client/packages/openblocks/src/i18n/locales/index.ts +++ b/client/packages/openblocks/src/i18n/locales/index.ts @@ -2,8 +2,8 @@ // fallback example: current locale is zh-HK, fallback order is zhHK => zh => en export * from "./en"; export * from "./it"; -export * from "@openblocks-ee/i18n/locales/zh"; +export * from "@lowcoder-ee/i18n/locales/zh"; export * from "./enObj"; export * from "./itObj"; -export * from "@openblocks-ee/i18n/locales/zhObj"; +export * from "@lowcoder-ee/i18n/locales/zhObj"; diff --git a/client/packages/openblocks/src/pages/common/header.tsx b/client/packages/openblocks/src/pages/common/header.tsx index 4e208305a..74b31648d 100644 --- a/client/packages/openblocks/src/pages/common/header.tsx +++ b/client/packages/openblocks/src/pages/common/header.tsx @@ -34,7 +34,7 @@ import history from "util/history"; import { useApplicationId } from "util/hooks"; import { canManageApp } from "util/permissionUtils"; import ProfileDropdown from "./profileDropdown"; -import { Logo, LogoWithName } from "@openblocks-ee/assets/images"; +import { Logo, LogoWithName } from "@lowcoder-ee/assets/images"; import { HeaderStartDropdown } from "./headerStartDropdown"; import { AppPermissionDialog } from "../../components/PermissionDialog/AppPermissionDialog"; import { getBrandingConfig } from "../../redux/selectors/configSelectors"; diff --git a/client/packages/openblocks/src/pages/common/help.tsx b/client/packages/openblocks/src/pages/common/help.tsx index 78b32cc0d..2c2a1cf35 100644 --- a/client/packages/openblocks/src/pages/common/help.tsx +++ b/client/packages/openblocks/src/pages/common/help.tsx @@ -8,7 +8,7 @@ import { customerService, showCustomerServicePanel, showHelpDropdown, -} from "@openblocks-ee/pages/common/customerService"; +} from "@lowcoder-ee/pages/common/customerService"; import React, { useCallback, useEffect, useState } from "react"; import { useDispatch, useSelector } from "react-redux"; import { createApplication } from "redux/reduxActions/applicationActions"; diff --git a/client/packages/openblocks/src/pages/common/previewHeader.tsx b/client/packages/openblocks/src/pages/common/previewHeader.tsx index c86e7df3b..e7930c345 100644 --- a/client/packages/openblocks/src/pages/common/previewHeader.tsx +++ b/client/packages/openblocks/src/pages/common/previewHeader.tsx @@ -13,7 +13,7 @@ import { useApplicationId } from "util/hooks"; import { canEditApp, canManageApp } from "util/permissionUtils"; import ProfileDropdown from "./profileDropdown"; import { trans } from "i18n"; -import { Logo } from "@openblocks-ee/assets/images"; +import { Logo } from "@lowcoder-ee/assets/images"; import { AppPermissionDialog } from "../../components/PermissionDialog/AppPermissionDialog"; import { useState } from "react"; import { getBrandingConfig } from "../../redux/selectors/configSelectors"; diff --git a/client/packages/openblocks/src/pages/common/profileDropdown.tsx b/client/packages/openblocks/src/pages/common/profileDropdown.tsx index 5722824b8..02486096f 100644 --- a/client/packages/openblocks/src/pages/common/profileDropdown.tsx +++ b/client/packages/openblocks/src/pages/common/profileDropdown.tsx @@ -23,7 +23,7 @@ import ProfileImage from "pages/common/profileImage"; import { isProfileSettingModalVisible } from "redux/selectors/usersSelectors"; import { logoutAction, profileSettingModalVisible } from "redux/reduxActions/userActions"; import { trans } from "i18n"; -import { showSwitchOrg } from "@openblocks-ee/pages/common/customerService"; +import { showSwitchOrg } from "@lowcoder-ee/pages/common/customerService"; import { checkIsMobile } from "util/commonUtils"; import { selectSystemConfig } from "redux/selectors/configSelectors"; diff --git a/client/packages/openblocks/src/pages/datasource/datasourceEditPage.tsx b/client/packages/openblocks/src/pages/datasource/datasourceEditPage.tsx index d9a849fef..28416c052 100644 --- a/client/packages/openblocks/src/pages/datasource/datasourceEditPage.tsx +++ b/client/packages/openblocks/src/pages/datasource/datasourceEditPage.tsx @@ -9,8 +9,8 @@ import { DATASOURCE_URL } from "../../constants/routesURL"; import { useSelector } from "react-redux"; import { getDataSource, getDataSourceTypes } from "../../redux/selectors/datasourceSelectors"; import { trans } from "i18n"; -import { DatasourceType } from "@openblocks-ee/constants/queryConstants"; -import { getDatasourceTutorial } from "@openblocks-ee/util/tutorialUtils"; +import { DatasourceType } from "@lowcoder-ee/constants/queryConstants"; +import { getDatasourceTutorial } from "@lowcoder-ee/util/tutorialUtils"; import { getDataSourceFormManifest } from "./getDataSourceFormManifest"; import DataSourceIcon from "components/DataSourceIcon"; diff --git a/client/packages/openblocks/src/pages/datasource/datasourceModal.tsx b/client/packages/openblocks/src/pages/datasource/datasourceModal.tsx index 334db5c15..271a12dd7 100644 --- a/client/packages/openblocks/src/pages/datasource/datasourceModal.tsx +++ b/client/packages/openblocks/src/pages/datasource/datasourceModal.tsx @@ -9,12 +9,12 @@ import { DatasourceFormManifest } from "./form/datasourceFormRegistry"; import StepModal, { StepItem, StepModalProps } from "components/StepModal"; import { GreyTextColor } from "constants/style"; import { trans } from "i18n"; -import { DatasourceType } from "@openblocks-ee/constants/queryConstants"; -import { getDatasourceTutorial } from "@openblocks-ee/util/tutorialUtils"; +import { DatasourceType } from "@lowcoder-ee/constants/queryConstants"; +import { getDatasourceTutorial } from "@lowcoder-ee/util/tutorialUtils"; import { useSelector } from "react-redux"; import { getDataSourceTypesMap } from "../../redux/selectors/datasourceSelectors"; -import { getBottomResIcon } from "@openblocks-ee/util/bottomResUtils"; -import { Datasource } from "@openblocks-ee/constants/datasourceConstants"; +import { getBottomResIcon } from "@lowcoder-ee/util/bottomResUtils"; +import { Datasource } from "@lowcoder-ee/constants/datasourceConstants"; import { getDataSourceFormManifest } from "./getDataSourceFormManifest"; const EditButton = styled(Button)` diff --git a/client/packages/openblocks/src/pages/datasource/form.tsx b/client/packages/openblocks/src/pages/datasource/form.tsx index f54aaf3f0..8880fa3dc 100644 --- a/client/packages/openblocks/src/pages/datasource/form.tsx +++ b/client/packages/openblocks/src/pages/datasource/form.tsx @@ -9,7 +9,7 @@ import { import { trans } from "i18n"; import { toNumber } from "lodash"; import { useHostCheck } from "./form/useHostCheck"; -import { Datasource } from "@openblocks-ee/constants/datasourceConstants"; +import { Datasource } from "@lowcoder-ee/constants/datasourceConstants"; import React, { ReactNode, useState } from "react"; import { HttpConfig, SSLCertVerificationEnum } from "../../api/datasourceApi"; diff --git a/client/packages/openblocks/src/pages/datasource/form/datasourceFormRegistry.tsx b/client/packages/openblocks/src/pages/datasource/form/datasourceFormRegistry.tsx index 8dfeb017a..73121523b 100644 --- a/client/packages/openblocks/src/pages/datasource/form/datasourceFormRegistry.tsx +++ b/client/packages/openblocks/src/pages/datasource/form/datasourceFormRegistry.tsx @@ -6,8 +6,8 @@ import { FormInstance } from "antd"; import { MongoDatasourceForm } from "./mongoDatasourceForm"; import { FormSize } from "lowcoder-design"; import { GoogleSheetsDatasourceForm } from "./googleSheetsDatasourceForm"; -import { DatasourceType } from "@openblocks-ee/constants/queryConstants"; -import { Datasource } from "@openblocks-ee/constants/datasourceConstants"; +import { DatasourceType } from "@lowcoder-ee/constants/queryConstants"; +import { Datasource } from "@lowcoder-ee/constants/datasourceConstants"; import { sqlDatasourceForm } from "./sqlDatasourceForm"; import { GraphqlDatasourceForm } from "./graphqlDatasourceForm"; import { OracleDatasourceForm } from "./oracleDatasourceForm"; diff --git a/client/packages/openblocks/src/pages/datasource/form/useDatasourceForm.ts b/client/packages/openblocks/src/pages/datasource/form/useDatasourceForm.ts index 84352f8dd..297affed2 100644 --- a/client/packages/openblocks/src/pages/datasource/form/useDatasourceForm.ts +++ b/client/packages/openblocks/src/pages/datasource/form/useDatasourceForm.ts @@ -7,8 +7,8 @@ import { getUser } from "../../../redux/selectors/usersSelectors"; import { createDatasource, updateDatasource } from "../../../redux/reduxActions/datasourceActions"; import { trans } from "i18n"; import { registryDataSourcePlugin } from "constants/queryConstants"; -import { DatasourceType } from "@openblocks-ee/constants/queryConstants"; -import { Datasource } from "@openblocks-ee/constants/datasourceConstants"; +import { DatasourceType } from "@lowcoder-ee/constants/queryConstants"; +import { Datasource } from "@lowcoder-ee/constants/datasourceConstants"; import { getSnowflakeFormParams } from "pages/datasource/form/snowflakeDatasourceForm"; export function useDatasourceForm() { diff --git a/client/packages/openblocks/src/pages/datasource/getDataSourceFormManifest.ts b/client/packages/openblocks/src/pages/datasource/getDataSourceFormManifest.ts index f99213f77..5a3a0c957 100644 --- a/client/packages/openblocks/src/pages/datasource/getDataSourceFormManifest.ts +++ b/client/packages/openblocks/src/pages/datasource/getDataSourceFormManifest.ts @@ -1,5 +1,5 @@ -import { DatasourceType } from "@openblocks-ee/constants/queryConstants"; -import { DatasourceFormRegistry } from "@openblocks-ee/pages/datasource/form/datasourceFormRegistry"; +import { DatasourceType } from "@lowcoder-ee/constants/queryConstants"; +import { DatasourceFormRegistry } from "@lowcoder-ee/pages/datasource/form/datasourceFormRegistry"; import { DataSourcePluginMeta } from "lowcoder-sdk/dataSource"; import { DatasourceFormManifest } from "./form/datasourceFormRegistry"; import { PluginDataSourceForm } from "./form/pluginDataSourceForm"; diff --git a/client/packages/openblocks/src/pages/datasource/pluginPanel.tsx b/client/packages/openblocks/src/pages/datasource/pluginPanel.tsx index f814964ca..97cb09cfd 100644 --- a/client/packages/openblocks/src/pages/datasource/pluginPanel.tsx +++ b/client/packages/openblocks/src/pages/datasource/pluginPanel.tsx @@ -2,7 +2,7 @@ import styled from "styled-components"; import { Button as AntdButton } from "antd"; import { useSelector } from "react-redux"; import { getDataSourceTypes } from "../../redux/selectors/datasourceSelectors"; -import { getBottomResIcon } from "@openblocks-ee/util/bottomResUtils"; +import { getBottomResIcon } from "@lowcoder-ee/util/bottomResUtils"; import { DataSourceTypeInfo } from "../../api/datasourceApi"; import { useCurrentPage } from "../../util/hooks"; import { trans } from "i18n"; @@ -10,7 +10,7 @@ import { apiPlugins, apiPluginsForQueryLibrary, databasePlugins, -} from "@openblocks-ee/constants/datasourceConstants"; +} from "@lowcoder-ee/constants/datasourceConstants"; export const DataSourceButton = styled(AntdButton)` width: 208px; diff --git a/client/packages/openblocks/src/pages/editor/bottom/BottomMetaDrawer.tsx b/client/packages/openblocks/src/pages/editor/bottom/BottomMetaDrawer.tsx index 71f33622f..3288a75b7 100644 --- a/client/packages/openblocks/src/pages/editor/bottom/BottomMetaDrawer.tsx +++ b/client/packages/openblocks/src/pages/editor/bottom/BottomMetaDrawer.tsx @@ -12,7 +12,7 @@ import { } from "redux/selectors/datasourceSelectors"; import { EmptyContent } from "components/EmptyContent"; import { trans } from "i18n"; -import { DatasourceType } from "@openblocks-ee/constants/queryConstants"; +import { DatasourceType } from "@lowcoder-ee/constants/queryConstants"; const TreeTitle = styled.div` height: 23px; diff --git a/client/packages/openblocks/src/pages/queryLibrary/LeftNav.tsx b/client/packages/openblocks/src/pages/queryLibrary/LeftNav.tsx index 84789b03c..85cb98f1b 100644 --- a/client/packages/openblocks/src/pages/queryLibrary/LeftNav.tsx +++ b/client/packages/openblocks/src/pages/queryLibrary/LeftNav.tsx @@ -18,7 +18,7 @@ import { deleteQueryLibrary } from "../../redux/reduxActions/queryLibraryActions import { EmptyContent } from "../../components/EmptyContent"; import { ReadOnlyMask } from "../common/styledComponent"; import { trans } from "i18n"; -import { DatasourceType } from "@openblocks-ee/constants/queryConstants"; +import { DatasourceType } from "@lowcoder-ee/constants/queryConstants"; import { saveAs } from "file-saver"; import DataSourceIcon from "components/DataSourceIcon"; diff --git a/client/packages/openblocks/src/pages/queryLibrary/QueryLibraryEditor.tsx b/client/packages/openblocks/src/pages/queryLibrary/QueryLibraryEditor.tsx index 58a73e91b..6e9d1af8d 100644 --- a/client/packages/openblocks/src/pages/queryLibrary/QueryLibraryEditor.tsx +++ b/client/packages/openblocks/src/pages/queryLibrary/QueryLibraryEditor.tsx @@ -41,7 +41,7 @@ import { apiPluginsForQueryLibrary, databasePlugins, Datasource, -} from "@openblocks-ee/constants/datasourceConstants"; +} from "@lowcoder-ee/constants/datasourceConstants"; import { importQueryLibrary } from "./importQueryLibrary"; import { registryDataSourcePlugin } from "constants/queryConstants"; diff --git a/client/packages/openblocks/src/pages/setting/advanced/AdvancedSetting.tsx b/client/packages/openblocks/src/pages/setting/advanced/AdvancedSetting.tsx index 56fabc6d6..db3378204 100644 --- a/client/packages/openblocks/src/pages/setting/advanced/AdvancedSetting.tsx +++ b/client/packages/openblocks/src/pages/setting/advanced/AdvancedSetting.tsx @@ -18,7 +18,7 @@ import { trans } from "i18n"; import { Prompt } from "react-router"; import history from "util/history"; import { Location } from "history"; -import { useExtraAdvanceSettings } from "@openblocks-ee/pages/setting/advanced/extraAdvancedSetting"; +import { useExtraAdvanceSettings } from "@lowcoder-ee/pages/setting/advanced/extraAdvancedSetting"; import { JSLibraryModal } from "components/JSLibraryModal"; import { JSLibraryTree } from "components/JSLibraryTree"; import { getGlobalSettings } from "comps/utils/globalSettings"; diff --git a/client/packages/openblocks/src/pages/setting/idSource/detail/index.tsx b/client/packages/openblocks/src/pages/setting/idSource/detail/index.tsx index 050f755f6..fdbea64cb 100644 --- a/client/packages/openblocks/src/pages/setting/idSource/detail/index.tsx +++ b/client/packages/openblocks/src/pages/setting/idSource/detail/index.tsx @@ -17,7 +17,7 @@ import { authConfig, AuthType, ManualSyncTypes, -} from "@openblocks-ee/pages/setting/idSource/idSourceConstants"; +} from "@lowcoder-ee/pages/setting/idSource/idSourceConstants"; import { Manual } from "pages/setting/idSource/detail/manual"; import { DeleteConfig } from "pages/setting/idSource/detail/deleteConfig"; import { Divider, Form, Input, message, Tooltip } from "antd"; diff --git a/client/packages/openblocks/src/pages/setting/idSource/detail/manual.tsx b/client/packages/openblocks/src/pages/setting/idSource/detail/manual.tsx index 5e636df08..29d0322e1 100644 --- a/client/packages/openblocks/src/pages/setting/idSource/detail/manual.tsx +++ b/client/packages/openblocks/src/pages/setting/idSource/detail/manual.tsx @@ -4,7 +4,7 @@ import { trans } from "i18n"; import { SyncManualIcon } from "lowcoder-design"; import { useState } from "react"; import { validateResponse } from "api/apiUtils"; -import { AuthType } from "@openblocks-ee/pages/setting/idSource/idSourceConstants"; +import { AuthType } from "@lowcoder-ee/pages/setting/idSource/idSourceConstants"; import IdSourceApi from "api/idSourceApi"; export const Manual = (props: { type: AuthType }) => { diff --git a/client/packages/openblocks/src/pages/setting/idSource/list.tsx b/client/packages/openblocks/src/pages/setting/idSource/list.tsx index 2ef76322a..0a67d2988 100644 --- a/client/packages/openblocks/src/pages/setting/idSource/list.tsx +++ b/client/packages/openblocks/src/pages/setting/idSource/list.tsx @@ -13,7 +13,7 @@ import { AuthType, authTypeDisabled, IdSource, -} from "@openblocks-ee/pages/setting/idSource/idSourceConstants"; +} from "@lowcoder-ee/pages/setting/idSource/idSourceConstants"; import { SpanStyled, StatusSpan, TableStyled } from "pages/setting/idSource/styledComponents"; import { genQueryId } from "comps/utils/idGenerator"; import FreeLimitTag from "pages/common/freeLimitTag"; @@ -23,7 +23,7 @@ import { selectSystemConfig } from "redux/selectors/configSelectors"; import { isEnterpriseMode, isSelfDomain } from "util/envUtils"; import { Badge, message } from "antd"; import { validateResponse } from "api/apiUtils"; -import { ServerAuthTypeInfo } from "@openblocks-ee/constants/authConstants"; +import { ServerAuthTypeInfo } from "@lowcoder-ee/constants/authConstants"; import { GeneralLoginIcon } from "assets/icons"; import { FreeTypes } from "pages/setting/idSource/idSourceConstants"; diff --git a/client/packages/openblocks/src/pages/setting/permission/permissionList.tsx b/client/packages/openblocks/src/pages/setting/permission/permissionList.tsx index c85af8ba2..986e3e27a 100644 --- a/client/packages/openblocks/src/pages/setting/permission/permissionList.tsx +++ b/client/packages/openblocks/src/pages/setting/permission/permissionList.tsx @@ -22,7 +22,7 @@ import history from "util/history"; import { Level1SettingPageContentWithList, Level1SettingPageTitleWithBtn } from "../styled"; import { currentOrgAdmin, isGroupAdmin } from "../../../util/permissionUtils"; import { timestampToHumanReadable } from "../../../util/dateTimeUtils"; -import { usePermissionMenuItems } from "@openblocks-ee/pages/setting/permission/permissionMenuItems"; +import { usePermissionMenuItems } from "@lowcoder-ee/pages/setting/permission/permissionMenuItems"; import { OrgGroup } from "constants/orgConstants"; const NEW_GROUP_PREFIX = trans("memberSettings.newGroupPrefix"); diff --git a/client/packages/openblocks/src/pages/setting/profile/index.tsx b/client/packages/openblocks/src/pages/setting/profile/index.tsx index 8d66bd53d..4c315ee12 100644 --- a/client/packages/openblocks/src/pages/setting/profile/index.tsx +++ b/client/packages/openblocks/src/pages/setting/profile/index.tsx @@ -3,7 +3,7 @@ import { CustomModal } from "lowcoder-design"; import { useEffect, useState } from "react"; import { useDispatch, useSelector } from "react-redux"; import { fetchUserAction, profileSettingModalVisible } from "redux/reduxActions/userActions"; -import { ProfileInfoCard } from "@openblocks-ee/pages/setting/profile/profileInfoCard"; +import { ProfileInfoCard } from "@lowcoder-ee/pages/setting/profile/profileInfoCard"; import { message } from "antd"; import { WindowMessageTypes } from "constants/messages"; import { isProfileSettingModalVisible } from "redux/selectors/usersSelectors"; diff --git a/client/packages/openblocks/src/pages/setting/profile/profileInfoCard.tsx b/client/packages/openblocks/src/pages/setting/profile/profileInfoCard.tsx index 311ed7f4b..e8145a68d 100644 --- a/client/packages/openblocks/src/pages/setting/profile/profileInfoCard.tsx +++ b/client/packages/openblocks/src/pages/setting/profile/profileInfoCard.tsx @@ -1,4 +1,4 @@ -import { UserConnectionSource } from "@openblocks-ee/constants/userConstants"; +import { UserConnectionSource } from "@lowcoder-ee/constants/userConstants"; import { useSelector } from "react-redux"; import { getUser } from "redux/selectors/usersSelectors"; import EmailCard from "pages/setting/profile/emailCard"; diff --git a/client/packages/openblocks/src/pages/setting/settingHome.tsx b/client/packages/openblocks/src/pages/setting/settingHome.tsx index c15956405..53a860c45 100644 --- a/client/packages/openblocks/src/pages/setting/settingHome.tsx +++ b/client/packages/openblocks/src/pages/setting/settingHome.tsx @@ -4,7 +4,7 @@ import { ThemeHome } from "./theme"; import { AdvancedSetting } from "./advanced/AdvancedSetting"; import { currentOrgAdmin } from "util/permissionUtils"; import { trans } from "i18n"; -import AuditSetting from "@openblocks-ee/pages/setting/audit"; +import AuditSetting from "@lowcoder-ee/pages/setting/audit"; import { isEE, isEnterpriseMode, isSelfDomain, showAuditLog } from "util/envUtils"; import { TwoColumnSettingPageContent } from "./styled"; import SubSideBar from "components/layout/SubSideBar"; @@ -13,8 +13,8 @@ import { useSelector } from "react-redux"; import { getUser } from "redux/selectors/usersSelectors"; import history from "util/history"; import { useParams } from "react-router-dom"; -import { BrandingSetting } from "@openblocks-ee/pages/setting/branding/BrandingSetting"; -import { IdSourceHome } from "@openblocks-ee/pages/setting/idSource"; +import { BrandingSetting } from "@lowcoder-ee/pages/setting/branding/BrandingSetting"; +import { IdSourceHome } from "@lowcoder-ee/pages/setting/idSource"; import { selectSystemConfig } from "redux/selectors/configSelectors"; import { enableCustomBrand } from "util/featureFlagUtils"; import FreeLimitTag from "pages/common/freeLimitTag"; diff --git a/client/packages/openblocks/src/pages/userAuth/formLogin.tsx b/client/packages/openblocks/src/pages/userAuth/formLogin.tsx index 7f23ef6a1..ffd9dd1b9 100644 --- a/client/packages/openblocks/src/pages/userAuth/formLogin.tsx +++ b/client/packages/openblocks/src/pages/userAuth/formLogin.tsx @@ -11,7 +11,7 @@ import styled from "styled-components"; import UserApi from "api/userApi"; import { useRedirectUrl } from "util/hooks"; import { checkEmailValid, checkPhoneValid } from "util/stringUtils"; -import { UserConnectionSource } from "@openblocks-ee/constants/userConstants"; +import { UserConnectionSource } from "@lowcoder-ee/constants/userConstants"; import { trans } from "i18n"; import { AuthContext, useAuthSubmit } from "pages/userAuth/authUtils"; import { ThirdPartyAuth } from "pages/userAuth/thirdParty/thirdPartyAuth"; diff --git a/client/packages/openblocks/src/pages/userAuth/index.tsx b/client/packages/openblocks/src/pages/userAuth/index.tsx index bf51de0f5..1e0fb898f 100644 --- a/client/packages/openblocks/src/pages/userAuth/index.tsx +++ b/client/packages/openblocks/src/pages/userAuth/index.tsx @@ -4,7 +4,7 @@ import React from "react"; import { useSelector } from "react-redux"; import { selectSystemConfig } from "redux/selectors/configSelectors"; import { AuthContext } from "pages/userAuth/authUtils"; -import { AuthRoutes } from "@openblocks-ee/constants/authConstants"; +import { AuthRoutes } from "@lowcoder-ee/constants/authConstants"; import { AuthLocationState } from "constants/authConstants"; import { ProductLoading } from "components/ProductLoading"; diff --git a/client/packages/openblocks/src/pages/userAuth/login.tsx b/client/packages/openblocks/src/pages/userAuth/login.tsx index d18ca99b4..a847e93cf 100644 --- a/client/packages/openblocks/src/pages/userAuth/login.tsx +++ b/client/packages/openblocks/src/pages/userAuth/login.tsx @@ -3,7 +3,7 @@ import { AuthSearchParams } from "constants/authConstants"; import { CommonTextLabel } from "components/Label"; import { trans } from "i18n"; import { ThirdPartyAuth } from "pages/userAuth/thirdParty/thirdPartyAuth"; -import FormLogin from "@openblocks-ee/pages/userAuth/formLogin"; +import FormLogin from "@lowcoder-ee/pages/userAuth/formLogin"; import { AuthContainer } from "pages/userAuth/authComponents"; import React, { useContext } from "react"; import { AuthContext, getLoginTitle } from "pages/userAuth/authUtils"; diff --git a/client/packages/openblocks/src/pages/userAuth/register.tsx b/client/packages/openblocks/src/pages/userAuth/register.tsx index 7a5058d0e..b1b82d0f9 100644 --- a/client/packages/openblocks/src/pages/userAuth/register.tsx +++ b/client/packages/openblocks/src/pages/userAuth/register.tsx @@ -15,7 +15,7 @@ import { checkEmailValid } from "util/stringUtils"; import styled from "styled-components"; import { requiresUnAuth } from "./authHOC"; import { useLocation } from "react-router-dom"; -import { UserConnectionSource } from "@openblocks-ee/constants/userConstants"; +import { UserConnectionSource } from "@lowcoder-ee/constants/userConstants"; import { trans } from "i18n"; import { AuthContext, checkPassWithMsg, useAuthSubmit } from "pages/userAuth/authUtils"; diff --git a/client/packages/openblocks/src/pages/userAuth/thirdParty/authRedirect.tsx b/client/packages/openblocks/src/pages/userAuth/thirdParty/authRedirect.tsx index 2393ef59e..5d46382b4 100644 --- a/client/packages/openblocks/src/pages/userAuth/thirdParty/authRedirect.tsx +++ b/client/packages/openblocks/src/pages/userAuth/thirdParty/authRedirect.tsx @@ -6,7 +6,7 @@ import history from "util/history"; import PageSkeleton from "components/PageSkeleton"; import { trans } from "i18n"; import { useEffect, useState } from "react"; -import { getAuthenticator } from "@openblocks-ee/pages/userAuth/thirdParty/authenticator"; +import { getAuthenticator } from "@lowcoder-ee/pages/userAuth/thirdParty/authenticator"; import { AuthRedirectUrlParams } from "pages/userAuth/thirdParty/authenticator"; import { loadAuthParams } from "pages/userAuth/authUtils"; diff --git a/client/packages/openblocks/src/redux/reducers/entitiyReducers/datasourceReducer.ts b/client/packages/openblocks/src/redux/reducers/entitiyReducers/datasourceReducer.ts index d88fac555..e034a5444 100644 --- a/client/packages/openblocks/src/redux/reducers/entitiyReducers/datasourceReducer.ts +++ b/client/packages/openblocks/src/redux/reducers/entitiyReducers/datasourceReducer.ts @@ -1,7 +1,7 @@ import { createReducer } from "util/reducerUtils"; import { ReduxAction, ReduxActionTypes } from "constants/reduxActionConstants"; import { DatasourceInfo, DatasourceStructure } from "api/datasourceApi"; -import { Datasource } from "@openblocks-ee/constants/datasourceConstants"; +import { Datasource } from "@lowcoder-ee/constants/datasourceConstants"; import { DatasourcePermissionInfo } from "../../../api/datasourcePermissionApi"; import { DeleteDatasourcePermissionPayload, diff --git a/client/packages/openblocks/src/redux/reduxActions/datasourceActions.ts b/client/packages/openblocks/src/redux/reduxActions/datasourceActions.ts index bd0e360d8..869bbd20f 100644 --- a/client/packages/openblocks/src/redux/reduxActions/datasourceActions.ts +++ b/client/packages/openblocks/src/redux/reduxActions/datasourceActions.ts @@ -3,7 +3,7 @@ import { ReduxActionTypes, ReduxActionWithCallbacks, } from "constants/reduxActionConstants"; -import { Datasource } from "@openblocks-ee/constants/datasourceConstants"; +import { Datasource } from "@lowcoder-ee/constants/datasourceConstants"; import { DatasourceInfo, DataSourceTypeInfo } from "api/datasourceApi"; export type FetchDatasourcePayload = { diff --git a/client/packages/openblocks/src/redux/reduxActions/queryLibraryActions.ts b/client/packages/openblocks/src/redux/reduxActions/queryLibraryActions.ts index a8ddf5e92..6487c446e 100644 --- a/client/packages/openblocks/src/redux/reduxActions/queryLibraryActions.ts +++ b/client/packages/openblocks/src/redux/reduxActions/queryLibraryActions.ts @@ -7,7 +7,7 @@ import { import { LibraryQuery, LibraryQueryPublishRequest } from "../../api/queryLibraryApi"; import { AxiosResponse } from "axios"; import { GenericApiResponse } from "../../api/apiResponses"; -import { Datasource } from "@openblocks-ee/constants/datasourceConstants"; +import { Datasource } from "@lowcoder-ee/constants/datasourceConstants"; export const fetchQueryLibrary = (): ReduxActionWithoutPayload => { return { diff --git a/client/packages/openblocks/src/redux/sagas/configSagas.ts b/client/packages/openblocks/src/redux/sagas/configSagas.ts index 1b92f41ba..8faf9c9e6 100644 --- a/client/packages/openblocks/src/redux/sagas/configSagas.ts +++ b/client/packages/openblocks/src/redux/sagas/configSagas.ts @@ -4,7 +4,7 @@ import { AxiosResponse } from "axios"; import { validateResponse } from "api/apiUtils"; import log from "loglevel"; import ConfigApi, { ConfigResponse } from "api/configApi"; -import { transToSystemConfig } from "@openblocks-ee/constants/configConstants"; +import { transToSystemConfig } from "@lowcoder-ee/constants/configConstants"; export function* fetchConfigSaga() { try { diff --git a/client/packages/openblocks/src/redux/sagas/datasourceSagas.ts b/client/packages/openblocks/src/redux/sagas/datasourceSagas.ts index 6b9c77738..4c6f69720 100644 --- a/client/packages/openblocks/src/redux/sagas/datasourceSagas.ts +++ b/client/packages/openblocks/src/redux/sagas/datasourceSagas.ts @@ -14,7 +14,7 @@ import { import { validateResponse } from "api/apiUtils"; import log from "loglevel"; import { message } from "antd"; -import { Datasource } from "@openblocks-ee/constants/datasourceConstants"; +import { Datasource } from "@lowcoder-ee/constants/datasourceConstants"; export function* fetchDatasourceSaga(action: EvaluationReduxAction) { const { organizationId, onSuccess } = action.payload; diff --git a/client/packages/openblocks/src/redux/selectors/datasourceSelectors.ts b/client/packages/openblocks/src/redux/selectors/datasourceSelectors.ts index 4b25c4d17..a781f0fa2 100644 --- a/client/packages/openblocks/src/redux/selectors/datasourceSelectors.ts +++ b/client/packages/openblocks/src/redux/selectors/datasourceSelectors.ts @@ -1,6 +1,6 @@ import { AppState } from "../reducers"; import { DataSourceTypeInfo } from "../../api/datasourceApi"; -import { DatasourceType } from "@openblocks-ee/constants/queryConstants"; +import { DatasourceType } from "@lowcoder-ee/constants/queryConstants"; export const getDataSource = (state: AppState) => { return state.entities.datasource.data; diff --git a/client/packages/openblocks/src/redux/store/store.ts b/client/packages/openblocks/src/redux/store/store.ts index f548db445..08876662e 100644 --- a/client/packages/openblocks/src/redux/store/store.ts +++ b/client/packages/openblocks/src/redux/store/store.ts @@ -1,10 +1,10 @@ import { reduxBatch } from "@manaflair/redux-batch"; import { TypedUseSelectorHook, useSelector as useReduxSelector } from "react-redux"; -import { appReducer, AppState } from "@openblocks-ee/redux/reducers"; +import { appReducer, AppState } from "@lowcoder-ee/redux/reducers"; import { applyMiddleware, createStore } from "redux"; import { composeWithDevTools } from "redux-devtools-extension/logOnlyInProduction"; import createSagaMiddleware from "redux-saga"; -import { rootSaga } from "@openblocks-ee/redux/sagas"; +import { rootSaga } from "@lowcoder-ee/redux/sagas"; import StoreRegistry from "redux/store/storeRegistry"; const sagaMiddleware = createSagaMiddleware(); diff --git a/client/packages/openblocks/src/util/bottomResUtils.tsx b/client/packages/openblocks/src/util/bottomResUtils.tsx index 30c9a9ed5..0dbda8117 100644 --- a/client/packages/openblocks/src/util/bottomResUtils.tsx +++ b/client/packages/openblocks/src/util/bottomResUtils.tsx @@ -1,5 +1,5 @@ import styled from "styled-components"; -import { ResourceType } from "@openblocks-ee/constants/queryConstants"; +import { ResourceType } from "@lowcoder-ee/constants/queryConstants"; import { ClickHouseIcon, DataResponderIcon, diff --git a/client/packages/openblocks/src/util/context/QueryContext.ts b/client/packages/openblocks/src/util/context/QueryContext.ts index 5ba4dd745..8700b6c87 100644 --- a/client/packages/openblocks/src/util/context/QueryContext.ts +++ b/client/packages/openblocks/src/util/context/QueryContext.ts @@ -1,5 +1,5 @@ import React from "react"; -import { ResourceType } from "@openblocks-ee/constants/queryConstants"; +import { ResourceType } from "@lowcoder-ee/constants/queryConstants"; class Query { readonly datasourceId?: string; diff --git a/client/packages/openblocks/src/util/tutorialUtils.ts b/client/packages/openblocks/src/util/tutorialUtils.ts index 465a6f98d..f26fe22c1 100644 --- a/client/packages/openblocks/src/util/tutorialUtils.ts +++ b/client/packages/openblocks/src/util/tutorialUtils.ts @@ -1,4 +1,4 @@ -import { DatasourceType } from "@openblocks-ee/constants/queryConstants"; +import { DatasourceType } from "@lowcoder-ee/constants/queryConstants"; import { trans } from "i18n"; const DatasourceTutorials: Partial> = { diff --git a/client/packages/openblocks/tsconfig.paths.json b/client/packages/openblocks/tsconfig.paths.json index 799251623..0c9fc0cd8 100644 --- a/client/packages/openblocks/tsconfig.paths.json +++ b/client/packages/openblocks/tsconfig.paths.json @@ -1,7 +1,7 @@ { "compilerOptions": { "paths": { - "@openblocks-ee/*": ["*"], + "@lowcoder-ee/*": ["*"], "lowcoder-sdk": ["index.sdk"], "*": ["*", "../../lowcoder-comps/src/*", "../../lowcoder-design/src/*"] } diff --git a/client/packages/openblocks/vite.config.mts b/client/packages/openblocks/vite.config.mts index 1901fcbe3..0e48f8b0f 100644 --- a/client/packages/openblocks/vite.config.mts +++ b/client/packages/openblocks/vite.config.mts @@ -58,7 +58,7 @@ export const viteConfig: UserConfig = { resolve: { extensions: [".mjs", ".js", ".ts", ".jsx", ".tsx", ".json"], alias: { - "@openblocks-ee": path.resolve( + "@lowcoder-ee": path.resolve( __dirname, isEE ? `../openblocks/src/${isEEGlobal ? "ee-global" : "ee"}` : "../openblocks/src" ), From 18aaffc719eb6078f47e303a4160f01673daf6e8 Mon Sep 17 00:00:00 2001 From: Jan Richter Date: Fri, 12 May 2023 01:58:01 +1200 Subject: [PATCH 08/21] refactor: rename openblocks- lowcoder- --- client/README.md | 6 ++--- .../create-openblocks-plugin/README.md | 6 ++--- .../create-openblocks-plugin/index.js | 6 ++--- .../create-openblocks-plugin/package.json | 2 +- .../README.md | 4 +-- .../package.json | 6 ++--- .../src/app-env.d.ts | 2 +- .../vite.config.js | 2 +- client/packages/openblocks-cli/README.md | 2 +- .../packages/openblocks-cli/actions/init.js | 4 +-- client/packages/openblocks-cli/package.json | 2 +- client/packages/openblocks-comps/package.json | 6 ++--- .../openblocks-comps/src/app-env.d.ts | 2 +- .../packages/openblocks-comps/vite.config.js | 2 +- .../openblocks-dev-utils/package.json | 2 +- .../openblocks-plugin-demo/package.json | 6 ++--- .../openblocks-plugin-demo/src/app-env.d.ts | 2 +- .../openblocks-plugin-demo/vite.config.js | 2 +- .../openblocks/src/i18n/locales/en.ts | 2 +- client/packages/openblocks/src/index.less | 2 +- client/scripts/build.js | 4 +-- client/yarn.lock | 26 +++++++++---------- 22 files changed, 49 insertions(+), 49 deletions(-) diff --git a/client/README.md b/client/README.md index b5b16013f..6f539c8af 100644 --- a/client/README.md +++ b/client/README.md @@ -9,7 +9,7 @@ Simply run below command to start a backend server. ```bash -docker run -d --name openblocks -p 3000:3000 -v "$PWD/stacks:/openblocks-stacks" lowcoderorg/lowcoder-ce +docker run -d --name openblocks -p 3000:3000 -v "$PWD/stacks:/lowcoder-stacks" lowcoderorg/lowcoder-ce ``` For more information, view our [docs](../docs/self-hosting) @@ -20,13 +20,13 @@ For more information, view our [docs](../docs/self-hosting) 2. Use the command below to build Docker image : ```bash -docker build -f ./deploy/docker/Dockerfile -t openblocks-dev . +docker build -f ./deploy/docker/Dockerfile -t lowcoder-dev . ``` 3. Start ```bash -docker run -d --name openblocks-dev -p 3000:3000 -v "$PWD/stacks:/openblocks-stacks" openblocks-dev +docker run -d --name lowcoder-dev -p 3000:3000 -v "$PWD/stacks:/lowcoder-stacks" lowcoder-dev ``` ### Start develop diff --git a/client/packages/create-openblocks-plugin/README.md b/client/packages/create-openblocks-plugin/README.md index c4fb22512..6052a5500 100644 --- a/client/packages/create-openblocks-plugin/README.md +++ b/client/packages/create-openblocks-plugin/README.md @@ -1,11 +1,11 @@ -# create-openblocks-plugin +# create-lowcoder-plugin ## Usage ```bash -yarn create openblocks-plugin my-openblocks-plugin +yarn create lowcoder-plugin my-lowcoder-plugin # or -npm create openblocks-plugin my-openblocks-plugin +npm create lowcoder-plugin my-lowcoder-plugin ``` diff --git a/client/packages/create-openblocks-plugin/index.js b/client/packages/create-openblocks-plugin/index.js index f587dbf93..f29c95cb5 100755 --- a/client/packages/create-openblocks-plugin/index.js +++ b/client/packages/create-openblocks-plugin/index.js @@ -11,7 +11,7 @@ const currentDir = currentDirName(import.meta.url); const pkg = readJson(path.resolve(currentDir, "./package.json")); const isUsingYarn = (process.env.npm_config_user_agent || "").indexOf("yarn") === 0; -const cliPackageName = "openblocks-cli"; +const cliPackageName = "lowcoder-cli"; const sdkPackageName = "lowcoder-sdk"; let verbose = false; @@ -92,8 +92,8 @@ function executeNodeScript({ cwd, args }, data, source) { * create openblocks comps project * 1. create dir * 2. create package.json - * 3. install openblocks-cli - * 4. run `openblocks-cli init` + * 3. install lowcoder-cli + * 4. run `lowcoder-cli init` */ async function createProject(projectName, options) { const { template, force } = options; diff --git a/client/packages/create-openblocks-plugin/package.json b/client/packages/create-openblocks-plugin/package.json index 9b6c77a0f..03cfc334c 100644 --- a/client/packages/create-openblocks-plugin/package.json +++ b/client/packages/create-openblocks-plugin/package.json @@ -1,5 +1,5 @@ { - "name": "create-openblocks-plugin", + "name": "create-lowcoder-plugin", "version": "0.0.3", "bin": "./index.js", "type": "module", diff --git a/client/packages/openblocks-cli-template-typescript/README.md b/client/packages/openblocks-cli-template-typescript/README.md index 25f570770..e95b8830e 100644 --- a/client/packages/openblocks-cli-template-typescript/README.md +++ b/client/packages/openblocks-cli-template-typescript/README.md @@ -1,5 +1,5 @@ -# openblocks-cli-template-typescript +# lowcoder-cli-template-typescript -This is the official typescript template of openblocks-cli. +This is the official typescript template of lowcoder-cli. This template will be used by default. diff --git a/client/packages/openblocks-cli-template-typescript/package.json b/client/packages/openblocks-cli-template-typescript/package.json index 43e4b8313..a89eb8e88 100644 --- a/client/packages/openblocks-cli-template-typescript/package.json +++ b/client/packages/openblocks-cli-template-typescript/package.json @@ -1,10 +1,10 @@ { - "name": "openblocks-cli-template-typescript", + "name": "lowcoder-cli-template-typescript", "version": "0.0.11", "type": "module", "scripts": { "start": "vite", - "build": "openblocks-cli build" + "build": "lowcoder-cli build" }, "openblocks": { "description": "", @@ -16,7 +16,7 @@ } }, "devDependencies": { - "openblocks-cli": "workspace:^", + "lowcoder-cli": "workspace:^", "lowcoder-sdk": "workspace:^", "typescript": "^4.8.4", "vite": "^3.2.4" diff --git a/client/packages/openblocks-cli-template-typescript/src/app-env.d.ts b/client/packages/openblocks-cli-template-typescript/src/app-env.d.ts index c43b9fb87..ea53e77bb 100644 --- a/client/packages/openblocks-cli-template-typescript/src/app-env.d.ts +++ b/client/packages/openblocks-cli-template-typescript/src/app-env.d.ts @@ -1,3 +1,3 @@ -/// +/// declare module "lowcoder-sdk"; diff --git a/client/packages/openblocks-cli-template-typescript/vite.config.js b/client/packages/openblocks-cli-template-typescript/vite.config.js index a409a01b0..1b9138160 100644 --- a/client/packages/openblocks-cli-template-typescript/vite.config.js +++ b/client/packages/openblocks-cli-template-typescript/vite.config.js @@ -1,4 +1,4 @@ -import config from "openblocks-cli/config/vite.config"; +import config from "lowcoder-cli/config/vite.config"; export default { ...config, server: { diff --git a/client/packages/openblocks-cli/README.md b/client/packages/openblocks-cli/README.md index 49f9cd855..6af48e6fd 100644 --- a/client/packages/openblocks-cli/README.md +++ b/client/packages/openblocks-cli/README.md @@ -1,3 +1,3 @@ -# openblocks-cli +# lowcoder-cli CLI tool used to start build and publish openblocks component library. diff --git a/client/packages/openblocks-cli/actions/init.js b/client/packages/openblocks-cli/actions/init.js index 3a27dd604..4c1764d40 100644 --- a/client/packages/openblocks-cli/actions/init.js +++ b/client/packages/openblocks-cli/actions/init.js @@ -64,7 +64,7 @@ async function uninstall(dependencies) { */ export default async function initAction(options) { const { template, registry } = options; - const templatePackageName = `openblocks-cli-template-${template}`; + const templatePackageName = `lowcoder-cli-template-${template}`; await install([templatePackageName], registry); console.log("template package installed"); @@ -77,7 +77,7 @@ export default async function initAction(options) { appPackageJson.openblocks = templatePackageJson.openblocks || {}; appPackageJson.scripts = { start: "vite", - build: "openblocks-cli build", + build: "lowcoder-cli build", }; fs.writeFileSync(paths.appPackageJson, JSON.stringify(appPackageJson, null, 2)); console.log("package.json updated"); diff --git a/client/packages/openblocks-cli/package.json b/client/packages/openblocks-cli/package.json index d63311147..807192ae8 100644 --- a/client/packages/openblocks-cli/package.json +++ b/client/packages/openblocks-cli/package.json @@ -1,5 +1,5 @@ { - "name": "openblocks-cli", + "name": "lowcoder-cli", "description": "CLI tool used to start build publish openblocks components", "version": "0.0.24", "license": "MIT", diff --git a/client/packages/openblocks-comps/package.json b/client/packages/openblocks-comps/package.json index 3d6c66298..b1500dfa8 100644 --- a/client/packages/openblocks-comps/package.json +++ b/client/packages/openblocks-comps/package.json @@ -15,7 +15,7 @@ "@types/react-dom": "17", "big.js": "^6.2.1", "mermaid": "^10.0.2", - "openblocks-cli": "workspace:^", + "lowcoder-cli": "workspace:^", "lowcoder-sdk": "workspace:^", "react": "17", "react-dom": "17", @@ -52,8 +52,8 @@ }, "scripts": { "start": "vite", - "build": "yarn test && openblocks-cli build", - "build_only": "openblocks-cli build", + "build": "yarn test && lowcoder-cli build", + "build_only": "lowcoder-cli build", "test": "jest" }, "devDependencies": { diff --git a/client/packages/openblocks-comps/src/app-env.d.ts b/client/packages/openblocks-comps/src/app-env.d.ts index c43b9fb87..ea53e77bb 100644 --- a/client/packages/openblocks-comps/src/app-env.d.ts +++ b/client/packages/openblocks-comps/src/app-env.d.ts @@ -1,3 +1,3 @@ -/// +/// declare module "lowcoder-sdk"; diff --git a/client/packages/openblocks-comps/vite.config.js b/client/packages/openblocks-comps/vite.config.js index cbfe032f6..a6becdd0e 100644 --- a/client/packages/openblocks-comps/vite.config.js +++ b/client/packages/openblocks-comps/vite.config.js @@ -1,4 +1,4 @@ -import config from "openblocks-cli/config/vite.config"; +import config from "lowcoder-cli/config/vite.config"; import viteTsconfigPaths from "vite-tsconfig-paths"; export default { ...config, diff --git a/client/packages/openblocks-dev-utils/package.json b/client/packages/openblocks-dev-utils/package.json index 50af24c09..90d54657c 100644 --- a/client/packages/openblocks-dev-utils/package.json +++ b/client/packages/openblocks-dev-utils/package.json @@ -3,7 +3,7 @@ "version": "0.0.5", "license": "MIT", "type": "module", - "description": "Openblocks dev utils for openblocks build process and openblocks-cli", + "description": "Openblocks dev utils for openblocks build process and lowcoder-cli", "keywords": [ "openblocks" ] diff --git a/client/packages/openblocks-plugin-demo/package.json b/client/packages/openblocks-plugin-demo/package.json index e3a0959c2..9732698ae 100644 --- a/client/packages/openblocks-plugin-demo/package.json +++ b/client/packages/openblocks-plugin-demo/package.json @@ -1,5 +1,5 @@ { - "name": "openblocks-plugin-demo", + "name": "lowcoder-plugin-demo", "version": "0.0.3", "type": "module", "license": "MIT", @@ -27,12 +27,12 @@ }, "scripts": { "start": "vite", - "build": "openblocks-cli build" + "build": "lowcoder-cli build" }, "devDependencies": { "@types/react": "17", "@types/react-dom": "17", - "openblocks-cli": "workspace:^", + "lowcoder-cli": "workspace:^", "lowcoder-sdk": "workspace:^", "typescript": "4.8.4", "vite": "^3.2.4" diff --git a/client/packages/openblocks-plugin-demo/src/app-env.d.ts b/client/packages/openblocks-plugin-demo/src/app-env.d.ts index c43b9fb87..ea53e77bb 100644 --- a/client/packages/openblocks-plugin-demo/src/app-env.d.ts +++ b/client/packages/openblocks-plugin-demo/src/app-env.d.ts @@ -1,3 +1,3 @@ -/// +/// declare module "lowcoder-sdk"; diff --git a/client/packages/openblocks-plugin-demo/vite.config.js b/client/packages/openblocks-plugin-demo/vite.config.js index a409a01b0..1b9138160 100644 --- a/client/packages/openblocks-plugin-demo/vite.config.js +++ b/client/packages/openblocks-plugin-demo/vite.config.js @@ -1,4 +1,4 @@ -import config from "openblocks-cli/config/vite.config"; +import config from "lowcoder-cli/config/vite.config"; export default { ...config, server: { diff --git a/client/packages/openblocks/src/i18n/locales/en.ts b/client/packages/openblocks/src/i18n/locales/en.ts index 929919d9a..65fbff0a3 100644 --- a/client/packages/openblocks/src/i18n/locales/en.ts +++ b/client/packages/openblocks/src/i18n/locales/en.ts @@ -2121,7 +2121,7 @@ export const en = { cloneUrl: "/apps/template-import/", }, openBlocksUrl: { - createIssue: "https://github.com/openblocks-dev/openblocks/issues", + createIssue: "https://github.com/lowcoder-dev/openblocks/issues", discord: "https://discord.com/invite/z5W2YHXdtt", }, componentDoc: { diff --git a/client/packages/openblocks/src/index.less b/client/packages/openblocks/src/index.less index 8dd4c2ca7..99bc36b30 100644 --- a/client/packages/openblocks/src/index.less +++ b/client/packages/openblocks/src/index.less @@ -13,7 +13,7 @@ transition: none !important; } -.openblocks-app-root, // used for app run in shadow dom, don't delete! +.lowcoder-app-root, // used for app run in shadow dom, don't delete! body { margin: 0; padding: 0; diff --git a/client/scripts/build.js b/client/scripts/build.js index 8ab34e565..7a2a77be1 100644 --- a/client/scripts/build.js +++ b/client/scripts/build.js @@ -96,9 +96,9 @@ if (process.argv.includes("--internal-deploy")) { const deployDir = shell.env["DEPLOY_DIR"]; console.log(); console.log(chalk.cyan`deploying...`); - shell.exec("docker cp ./packages/openblocks/build openblocks-fe:/var/www/", { fatal: true }); + shell.exec("docker cp ./packages/openblocks/build lowcoder-fe:/var/www/", { fatal: true }); shell.exec( - `docker exec openblocks-fe /bin/sh -c "cd /var/www/ && rm -rf ${deployDir} && mv build ${deployDir}"`, + `docker exec lowcoder-fe /bin/sh -c "cd /var/www/ && rm -rf ${deployDir} && mv build ${deployDir}"`, { fatal: true } ); } diff --git a/client/yarn.lock b/client/yarn.lock index 6e9f5a255..70ff50b20 100644 --- a/client/yarn.lock +++ b/client/yarn.lock @@ -7466,9 +7466,9 @@ __metadata: languageName: node linkType: hard -"create-openblocks-plugin@workspace:packages/create-openblocks-plugin": +"create-lowcoder-plugin@workspace:packages/create-lowcoder-plugin": version: 0.0.0-use.local - resolution: "create-openblocks-plugin@workspace:packages/create-openblocks-plugin" + resolution: "create-lowcoder-plugin@workspace:packages/create-lowcoder-plugin" dependencies: chalk: 4 commander: ^9.4.1 @@ -7476,7 +7476,7 @@ __metadata: fs-extra: ^10.1.0 lowcoder-dev-utils: "workspace:^" bin: - create-openblocks-plugin: ./index.js + create-lowcoder-plugin: ./index.js languageName: unknown linkType: soft @@ -14286,20 +14286,20 @@ __metadata: languageName: node linkType: hard -"openblocks-cli-template-typescript@workspace:packages/openblocks-cli-template-typescript": +"lowcoder-cli-template-typescript@workspace:packages/lowcoder-cli-template-typescript": version: 0.0.0-use.local - resolution: "openblocks-cli-template-typescript@workspace:packages/openblocks-cli-template-typescript" + resolution: "lowcoder-cli-template-typescript@workspace:packages/lowcoder-cli-template-typescript" dependencies: - openblocks-cli: "workspace:^" + lowcoder-cli: "workspace:^" lowcoder-sdk: "workspace:^" typescript: ^4.8.4 vite: ^3.2.4 languageName: unknown linkType: soft -"openblocks-cli@workspace:^, openblocks-cli@workspace:packages/openblocks-cli": +"lowcoder-cli@workspace:^, lowcoder-cli@workspace:packages/lowcoder-cli": version: 0.0.0-use.local - resolution: "openblocks-cli@workspace:packages/openblocks-cli" + resolution: "lowcoder-cli@workspace:packages/lowcoder-cli" dependencies: "@types/axios": ^0.14.0 "@vitejs/plugin-react": ^2.2.0 @@ -14320,7 +14320,7 @@ __metadata: peerDependencies: lowcoder-sdk: "*" bin: - openblocks-cli: ./index.js + lowcoder-cli: ./index.js languageName: unknown linkType: soft @@ -14340,7 +14340,7 @@ __metadata: big.js: ^6.2.1 jest: 29.3.0 mermaid: ^10.0.2 - openblocks-cli: "workspace:^" + lowcoder-cli: "workspace:^" lowcoder-sdk: "workspace:^" react: 17 react-dom: 17 @@ -14411,13 +14411,13 @@ __metadata: languageName: unknown linkType: soft -"openblocks-plugin-demo@workspace:packages/openblocks-plugin-demo": +"lowcoder-plugin-demo@workspace:packages/lowcoder-plugin-demo": version: 0.0.0-use.local - resolution: "openblocks-plugin-demo@workspace:packages/openblocks-plugin-demo" + resolution: "lowcoder-plugin-demo@workspace:packages/lowcoder-plugin-demo" dependencies: "@types/react": 17 "@types/react-dom": 17 - openblocks-cli: "workspace:^" + lowcoder-cli: "workspace:^" lowcoder-core: ^0.0.1 lowcoder-design: ^0.0.1 lowcoder-sdk: "workspace:^" From b04b0ff59e508d4b3a5b2ba27368fe1d0ee22bf6 Mon Sep 17 00:00:00 2001 From: Jan Richter Date: Fri, 12 May 2023 01:59:17 +1200 Subject: [PATCH 09/21] refactor: rename /openblocks to /lowcoder --- client/.gitignore | 4 ++-- client/config/test/jest.config.js | 6 +++--- client/jest.config.js | 2 +- client/packages/openblocks-comps/src/global.ts | 2 +- client/packages/openblocks-design/src/app-env.d.ts | 2 +- client/packages/openblocks-plugin-demo/tsconfig.json | 8 ++++---- client/packages/openblocks-sdk/src/index.ts | 2 +- client/packages/openblocks-sdk/tsconfig.json | 8 ++++---- client/packages/openblocks-sdk/vite.config.mts | 6 +++--- .../src/comps/comps/fileComp/fileComp.test.tsx | 10 +++++----- client/packages/openblocks/src/i18n/locales/en.ts | 2 +- client/packages/openblocks/src/i18n/locales/enObj.tsx | 2 +- client/packages/openblocks/vite.config.mts | 4 ++-- client/scripts/build.js | 6 +++--- client/yarn.lock | 4 ++-- 15 files changed, 34 insertions(+), 34 deletions(-) diff --git a/client/.gitignore b/client/.gitignore index 6dc91ad5b..fff164f7f 100644 --- a/client/.gitignore +++ b/client/.gitignore @@ -14,7 +14,7 @@ # production /build -/packages/openblocks/build +/packages/lowcoder/build # misc .DS_Store @@ -52,4 +52,4 @@ TODO /ossutil_output package-lock.json -op.mjs \ No newline at end of file +op.mjs diff --git a/client/config/test/jest.config.js b/client/config/test/jest.config.js index dc29cae50..0c5a5e088 100644 --- a/client/config/test/jest.config.js +++ b/client/config/test/jest.config.js @@ -18,15 +18,15 @@ export default { "\\.md\\?url$": path.resolve(dirname, "./mocks/markdown-url-module.js"), "^@lowcoder-ee(.*)$": path.resolve( dirname, - isEE ? "../../packages/openblocks/src/ee/$1" : "../../packages/openblocks/src/$1" + isEE ? "../../packages/lowcoder/src/ee/$1" : "../../packages/lowcoder/src/$1" ), - "lowcoder-sdk": path.resolve(dirname, "../../packages/openblocks/src/index.sdk"), + "lowcoder-sdk": path.resolve(dirname, "../../packages/lowcoder/src/index.sdk"), }, globals, // roots: ["/src"], modulePaths: [ "/src", - path.resolve(dirname, "../../packages/openblocks/src"), + path.resolve(dirname, "../../packages/lowcoder/src"), path.resolve(dirname, "../../packages/lowcoder-comps/src"), path.resolve(dirname, "../../packages/lowcoder-design/src"), ], diff --git a/client/jest.config.js b/client/jest.config.js index 6d89a2a37..5369bf475 100644 --- a/client/jest.config.js +++ b/client/jest.config.js @@ -1,3 +1,3 @@ export default { - projects: ["/packages/openblocks", "/packages/lowcoder-core"], + projects: ["/packages/lowcoder", "/packages/lowcoder-core"], }; diff --git a/client/packages/openblocks-comps/src/global.ts b/client/packages/openblocks-comps/src/global.ts index 542a29385..5e34730e9 100644 --- a/client/packages/openblocks-comps/src/global.ts +++ b/client/packages/openblocks-comps/src/global.ts @@ -1 +1 @@ -import "../../openblocks/src/global"; +import "../../lowcoder/src/global"; diff --git a/client/packages/openblocks-design/src/app-env.d.ts b/client/packages/openblocks-design/src/app-env.d.ts index addaec22b..e0169e337 100644 --- a/client/packages/openblocks-design/src/app-env.d.ts +++ b/client/packages/openblocks-design/src/app-env.d.ts @@ -1 +1 @@ -/// +/// diff --git a/client/packages/openblocks-plugin-demo/tsconfig.json b/client/packages/openblocks-plugin-demo/tsconfig.json index 8d138d7a4..ec04f8477 100644 --- a/client/packages/openblocks-plugin-demo/tsconfig.json +++ b/client/packages/openblocks-plugin-demo/tsconfig.json @@ -19,14 +19,14 @@ "baseUrl": "src", "paths": { "lowcoder-sdk": [ - "../../openblocks/src/index.sdk.ts", - "../node_modules/lowcoder-sdk/src/openblocks/index.sdk.ts" + "../../lowcoder/src/index.sdk.ts", + "../node_modules/lowcoder-sdk/src/lowcoder/index.sdk.ts" ], "*": [ "*", - "../../openblocks/src/*", + "../../lowcoder/src/*", "../../lowcoder-sdk/src/*", - "../node_modules/lowcoder-sdk/src/openblocks/*" + "../node_modules/lowcoder-sdk/src/lowcoder/*" ] } }, diff --git a/client/packages/openblocks-sdk/src/index.ts b/client/packages/openblocks-sdk/src/index.ts index 9176e0388..9b3e1a0f3 100644 --- a/client/packages/openblocks-sdk/src/index.ts +++ b/client/packages/openblocks-sdk/src/index.ts @@ -1,5 +1,5 @@ // @ts-nocheck -import "../../openblocks/src/index.less"; +import "../../lowcoder/src/index.less"; import "virtual:globals"; import * as sdk from "openblocks"; export * from "openblocks"; diff --git a/client/packages/openblocks-sdk/tsconfig.json b/client/packages/openblocks-sdk/tsconfig.json index ad9482e59..8bf21e74d 100644 --- a/client/packages/openblocks-sdk/tsconfig.json +++ b/client/packages/openblocks-sdk/tsconfig.json @@ -23,18 +23,18 @@ "paths": { "*": [ "*", - "../../openblocks/src/*", + "../../lowcoder/src/*", "../../lowcoder-comps/src/*", "../../lowcoder-design/src/*" ], - "@lowcoder-ee/*": ["../../openblocks/src/*"] + "@lowcoder-ee/*": ["../../lowcoder/src/*"] } }, - "exclude": ["../openblocks/src/ee/*"], + "exclude": ["../lowcoder/src/ee/*"], "include": [ "src", "index.tsx", - "../openblocks/src", + "../lowcoder/src", "../lowcoder-comps/src", "../lowcoder-design/src" ] diff --git a/client/packages/openblocks-sdk/vite.config.mts b/client/packages/openblocks-sdk/vite.config.mts index 17888f8d9..f0405258f 100644 --- a/client/packages/openblocks-sdk/vite.config.mts +++ b/client/packages/openblocks-sdk/vite.config.mts @@ -24,8 +24,8 @@ export const viteConfig: UserConfig = { resolve: { extensions: [".mjs", ".js", ".ts", ".jsx", ".tsx", ".json"], alias: { - "lowcoder-sdk": path.resolve(__dirname, "../openblocks/src/index.sdk"), - "@lowcoder-ee": path.resolve(__dirname, "../openblocks/src"), + "lowcoder-sdk": path.resolve(__dirname, "../lowcoder/src/index.sdk"), + "@lowcoder-ee": path.resolve(__dirname, "../lowcoder/src"), }, }, base: ensureLastSlash(process.env.PUBLIC_URL), @@ -83,7 +83,7 @@ export const viteConfig: UserConfig = { }), viteTsconfigPaths({ projects: [ - "../openblocks/tsconfig.json", + "../lowcoder/tsconfig.json", "../lowcoder-comps/tsconfig.json", "../lowcoder-design/tsconfig.json", ], diff --git a/client/packages/openblocks/src/comps/comps/fileComp/fileComp.test.tsx b/client/packages/openblocks/src/comps/comps/fileComp/fileComp.test.tsx index 6f030106d..0dc0e8f66 100644 --- a/client/packages/openblocks/src/comps/comps/fileComp/fileComp.test.tsx +++ b/client/packages/openblocks/src/comps/comps/fileComp/fileComp.test.tsx @@ -100,11 +100,11 @@ function getFile(path: string) { test("test resolveParsedValue", async () => { const files = await Promise.all([ - getFile("packages/openblocks/src/comps/comps/fileComp/fileComp.test.csv"), - getFile("packages/openblocks/src/comps/comps/fileComp/fileComp.test.json"), - getFile("packages/openblocks/src/comps/comps/fileComp/fileComp.test.png"), - getFile("packages/openblocks/src/comps/comps/fileComp/fileComp.test.txt"), - getFile("packages/openblocks/src/comps/comps/fileComp/fileComp.test.xlsx"), + getFile("packages/lowcoder/src/comps/comps/fileComp/fileComp.test.csv"), + getFile("packages/lowcoder/src/comps/comps/fileComp/fileComp.test.json"), + getFile("packages/lowcoder/src/comps/comps/fileComp/fileComp.test.png"), + getFile("packages/lowcoder/src/comps/comps/fileComp/fileComp.test.txt"), + getFile("packages/lowcoder/src/comps/comps/fileComp/fileComp.test.xlsx"), ]); const parsedValue = await resolveParsedValue(files as any); expect(parsedValue[0]).toMatchObject(expectParseValue); diff --git a/client/packages/openblocks/src/i18n/locales/en.ts b/client/packages/openblocks/src/i18n/locales/en.ts index 65fbff0a3..b2be298a2 100644 --- a/client/packages/openblocks/src/i18n/locales/en.ts +++ b/client/packages/openblocks/src/i18n/locales/en.ts @@ -2121,7 +2121,7 @@ export const en = { cloneUrl: "/apps/template-import/", }, openBlocksUrl: { - createIssue: "https://github.com/lowcoder-dev/openblocks/issues", + createIssue: "https://github.com/lowcoder-dev/lowcoder/issues", discord: "https://discord.com/invite/z5W2YHXdtt", }, componentDoc: { diff --git a/client/packages/openblocks/src/i18n/locales/enObj.tsx b/client/packages/openblocks/src/i18n/locales/enObj.tsx index f47b43c35..433abe000 100644 --- a/client/packages/openblocks/src/i18n/locales/enObj.tsx +++ b/client/packages/openblocks/src/i18n/locales/enObj.tsx @@ -112,7 +112,7 @@ export const enObj: I18nObjects = { ], }, editorTutorials: { - mockDataUrl: "https://63621db87521369cd06514c2.mockapi.io/api/openblocks/users", + mockDataUrl: "https://63621db87521369cd06514c2.mockapi.io/api/lowcoder/users", data: (code) => ( <> The component and query data are listed here, which can be referenced through diff --git a/client/packages/openblocks/vite.config.mts b/client/packages/openblocks/vite.config.mts index 0e48f8b0f..dc91711e4 100644 --- a/client/packages/openblocks/vite.config.mts +++ b/client/packages/openblocks/vite.config.mts @@ -60,7 +60,7 @@ export const viteConfig: UserConfig = { alias: { "@lowcoder-ee": path.resolve( __dirname, - isEE ? `../openblocks/src/${isEEGlobal ? "ee-global" : "ee"}` : "../openblocks/src" + isEE ? `../lowcoder/src/${isEEGlobal ? "ee-global" : "ee"}` : "../lowcoder/src" ), }, }, @@ -124,7 +124,7 @@ export const viteConfig: UserConfig = { }, }), viteTsconfigPaths({ - projects: ["../openblocks/tsconfig.json", "../lowcoder-design/tsconfig.json"], + projects: ["../lowcoder/tsconfig.json", "../lowcoder-design/tsconfig.json"], }), svgrPlugin({ svgrOptions: { diff --git a/client/scripts/build.js b/client/scripts/build.js index 7a2a77be1..2889f42a1 100644 --- a/client/scripts/build.js +++ b/client/scripts/build.js @@ -36,7 +36,7 @@ async function downloadBuiltinPlugin(name) { const packageRes = await axios.get(`https://registry.npmjs.com/${name}/latest`); const tarball = packageRes.data.dist.tarball; const tarballFileName = `${name}.tgz`; - const targetDir = `./packages/openblocks/build/${name}/latest`; + const targetDir = `./packages/lowcoder/build/${name}/latest`; console.log(chalk.blue`tarball: ${tarball}`); @@ -52,7 +52,7 @@ async function buildBuiltinPlugin(name) { console.log(); console.log(chalk.cyan`plugin ${name} building...`); - const targetDir = `./packages/openblocks/build/${name}/latest`; + const targetDir = `./packages/lowcoder/build/${name}/latest`; shell.mkdir("-p", targetDir); shell.exec(`yarn workspace ${name} build_only`, { fatal: true }); @@ -96,7 +96,7 @@ if (process.argv.includes("--internal-deploy")) { const deployDir = shell.env["DEPLOY_DIR"]; console.log(); console.log(chalk.cyan`deploying...`); - shell.exec("docker cp ./packages/openblocks/build lowcoder-fe:/var/www/", { fatal: true }); + shell.exec("docker cp ./packages/lowcoder/build lowcoder-fe:/var/www/", { fatal: true }); shell.exec( `docker exec lowcoder-fe /bin/sh -c "cd /var/www/ && rm -rf ${deployDir} && mv build ${deployDir}"`, { fatal: true } diff --git a/client/yarn.lock b/client/yarn.lock index 70ff50b20..4c95eb917 100644 --- a/client/yarn.lock +++ b/client/yarn.lock @@ -14457,9 +14457,9 @@ __metadata: languageName: unknown linkType: soft -"openblocks@workspace:packages/openblocks": +"openblocks@workspace:packages/lowcoder": version: 0.0.0-use.local - resolution: "openblocks@workspace:packages/openblocks" + resolution: "openblocks@workspace:packages/lowcoder" dependencies: "@ant-design/icons": ^4.7.0 "@ant-design/pro-form": ^1.52.9 From f75715f209584b9120f68fda77a66e93c0ae082e Mon Sep 17 00:00:00 2001 From: Jan Richter Date: Fri, 12 May 2023 02:02:46 +1200 Subject: [PATCH 10/21] refactor: rename openblocks. to lowcoder. --- .../index.tsx | 2 +- .../packages/openblocks-cli/actions/build.js | 12 +++++----- client/packages/openblocks-comps/index.tsx | 2 +- .../openblocks-design/src/icons/index.ts | 2 +- .../packages/openblocks-plugin-demo/index.tsx | 2 +- client/packages/openblocks/README.md | 2 +- .../src/appView/AppViewInstance.tsx | 4 ++-- .../openblocks/src/i18n/locales/en.ts | 24 +++++++++---------- .../openblocks/src/util/tutorialUtils.ts | 2 +- 9 files changed, 26 insertions(+), 26 deletions(-) diff --git a/client/packages/openblocks-cli-template-typescript/index.tsx b/client/packages/openblocks-cli-template-typescript/index.tsx index 515a9d253..725bd2aba 100644 --- a/client/packages/openblocks-cli-template-typescript/index.tsx +++ b/client/packages/openblocks-cli-template-typescript/index.tsx @@ -11,7 +11,7 @@ function CompDevApp() { compMap={compMap} packageName={name} packageVersion={version} - compMeta={openblocks.comps} + compMeta={lowcoder.comps} /> ); } diff --git a/client/packages/openblocks-cli/actions/build.js b/client/packages/openblocks-cli/actions/build.js index 77ee8ebb6..fee3bb3da 100644 --- a/client/packages/openblocks-cli/actions/build.js +++ b/client/packages/openblocks-cli/actions/build.js @@ -21,13 +21,13 @@ function validPackageJSON() { return "- openblocks field is required in package.json"; } const openblocks = packageJSON.openblocks; - if (!openblocks.comps || Object.keys(openblocks.comps).length === 0) { + if (!lowcoder.comps || Object.keys(lowcoder.comps).length === 0) { return "- not found any comps to build"; } const compErrors = []; - Object.keys(openblocks.comps).forEach((name) => { - const compManifest = packageJSON.openblocks.comps[name]; + Object.keys(lowcoder.comps).forEach((name) => { + const compManifest = packageJSON.lowcoder.comps[name]; if (!compManifest.icon) { // compErrors.push(`- comp ${name} must specify an icon`); return; @@ -64,7 +64,7 @@ export default async function buildAction(options) { return; } - const compNames = Object.keys(packageJSON.openblocks.comps); + const compNames = Object.keys(packageJSON.lowcoder.comps); console.cyan(`Name : ${packageJSON.name}`); console.cyan(`Version : ${packageJSON.version}`); console.cyan(`Comps : ${compNames.length}\n`); @@ -78,7 +78,7 @@ export default async function buildAction(options) { await build(viteConfig); // write package.json - packageJSON.openblocks.entry = "index.js"; + packageJSON.lowcoder.entry = "index.js"; writeFileSync(paths.appOutPackageJson, JSON.stringify(packageJSON, null, 2)); // copy locales @@ -88,7 +88,7 @@ export default async function buildAction(options) { // copy icon files compNames.forEach((name) => { - const compManifest = packageJSON.openblocks.comps[name]; + const compManifest = packageJSON.lowcoder.comps[name]; if (compManifest.icon) { copySync(paths.resolveApp(compManifest.icon), resolve(paths.appOutPath, compManifest.icon)); } diff --git a/client/packages/openblocks-comps/index.tsx b/client/packages/openblocks-comps/index.tsx index 515a9d253..725bd2aba 100644 --- a/client/packages/openblocks-comps/index.tsx +++ b/client/packages/openblocks-comps/index.tsx @@ -11,7 +11,7 @@ function CompDevApp() { compMap={compMap} packageName={name} packageVersion={version} - compMeta={openblocks.comps} + compMeta={lowcoder.comps} /> ); } diff --git a/client/packages/openblocks-design/src/icons/index.ts b/client/packages/openblocks-design/src/icons/index.ts index 25b268f57..337e77182 100644 --- a/client/packages/openblocks-design/src/icons/index.ts +++ b/client/packages/openblocks-design/src/icons/index.ts @@ -202,7 +202,7 @@ export { ReactComponent as HeadApiIcon } from "./icon-query-head.svg"; export { ReactComponent as TraceApiIcon } from "./icon-query-trace.svg"; export { ReactComponent as PostgresIcon } from "./icon-query-postgres.svg"; export { ReactComponent as JSIcon } from "./icon-query-JS.svg"; -export { ReactComponent as OpenBlocksQueryIcon } from "./icon-query-openblocks.svg"; +export { ReactComponent as OpenBlocksQueryIcon } from "./icon-query-lowcoder.svg"; export { ReactComponent as RedisIcon } from "./icon-query-Redis.svg"; export { ReactComponent as EsIcon } from "./icon-query-ElasticSearch.svg"; export { ReactComponent as MSSQLIcon } from "./icon-query-mssql.svg"; diff --git a/client/packages/openblocks-plugin-demo/index.tsx b/client/packages/openblocks-plugin-demo/index.tsx index 515a9d253..725bd2aba 100644 --- a/client/packages/openblocks-plugin-demo/index.tsx +++ b/client/packages/openblocks-plugin-demo/index.tsx @@ -11,7 +11,7 @@ function CompDevApp() { compMap={compMap} packageName={name} packageVersion={version} - compMeta={openblocks.comps} + compMeta={lowcoder.comps} /> ); } diff --git a/client/packages/openblocks/README.md b/client/packages/openblocks/README.md index 6d0976e8b..84b51d55f 100644 --- a/client/packages/openblocks/README.md +++ b/client/packages/openblocks/README.md @@ -1,3 +1,3 @@ # openblocks -The main app of openblocks. +The main app of lowcoder. diff --git a/client/packages/openblocks/src/appView/AppViewInstance.tsx b/client/packages/openblocks/src/appView/AppViewInstance.tsx index d5a20c527..ad4ddf901 100644 --- a/client/packages/openblocks/src/appView/AppViewInstance.tsx +++ b/client/packages/openblocks/src/appView/AppViewInstance.tsx @@ -35,8 +35,8 @@ export class AppViewInstance { private events = new Map[keyof EventHandlerMap]>(); private dataPromise: Promise<{ appDsl: any; moduleDslMap: any }>; private options: AppViewInstanceOptions = { - baseUrl: "https://api.openblocks.dev", - webUrl: "https://cloud.openblocks.dev", + baseUrl: "https://api.lowcoder.dev", + webUrl: "https://cloud.lowcoder.dev", }; constructor(private appId: string, private node: Element, options: AppViewInstanceOptions = {}) { diff --git a/client/packages/openblocks/src/i18n/locales/en.ts b/client/packages/openblocks/src/i18n/locales/en.ts index b2be298a2..533bd70fa 100644 --- a/client/packages/openblocks/src/i18n/locales/en.ts +++ b/client/packages/openblocks/src/i18n/locales/en.ts @@ -1248,7 +1248,7 @@ export const en = { }, audio: { src: "Audio URL", - defaultSrcUrl: "https://cdn-files.openblocks.dev/canon-excerpt.mp3", + defaultSrcUrl: "https://cdn-files.lowcoder.dev/canon-excerpt.mp3", autoPlay: "Autoplay", loop: "Loop", srcDesc: "Current audio URL", @@ -1606,7 +1606,7 @@ export const en = { phoneColumn: "Phone", subTitle: "Title", linkLabel: "Link", - linkUrl: "cloud.openblocks.dev", + linkUrl: "cloud.lowcoder.dev", progressLabel: "Progress", sliderLabel: "Slider", radioLabel: "Radio", @@ -1932,7 +1932,7 @@ export const en = { jsLibraryInstallSuccess: "JavaScript library installed successfully", jsLibraryInstallFailed: "JavaScript library installation failed", jsLibraryInstallFailedCloud: - "Perhaps the library is not available in the sandbox, [Documentation](https://docs.openblocks.dev/build-apps/write-javascript/use-third-party-libraries#manually-import-libraries)\n{message}", + "Perhaps the library is not available in the sandbox, [Documentation](https://docs.lowcoder.dev/build-apps/write-javascript/use-third-party-libraries#manually-import-libraries)\n{message}", jsLibraryInstallFailedHost: "{message}", add: "Add New", jsHelpText: "Add a global method or variable to the current application.", @@ -2083,8 +2083,8 @@ export const en = { showBorder: "Show border", }, docUrls: { - docHome: "https://docs.openblocks.dev/", - components: "https://cloud.openblocks.dev/components?n={compType}", + docHome: "https://docs.lowcoder.dev/", + components: "https://cloud.lowcoder.dev/components?n={compType}", module: "", optionList: "", terms: "", @@ -2092,12 +2092,12 @@ export const en = { aboutUs: "", changeLog: "", introVideo: "", - devNpmPlugin: "https://docs.openblocks.dev/build-plugins/develop-your-first-plugin", + devNpmPlugin: "https://docs.lowcoder.dev/build-plugins/develop-your-first-plugin", devNpmPluginText: "How to develop npm plugin", - useHost: "https://docs.openblocks.dev/self-hosting/access-local-database-or-api", + useHost: "https://docs.lowcoder.dev/self-hosting/access-local-database-or-api", eventHandlerSlowdown: - "https://docs.openblocks.dev/build-apps/event-handlers#debounce-and-throttle", - thirdLib: "https://docs.openblocks.dev/build-apps/write-javascript/use-third-party-libraries", + "https://docs.lowcoder.dev/build-apps/event-handlers#debounce-and-throttle", + thirdLib: "https://docs.lowcoder.dev/build-apps/write-javascript/use-third-party-libraries", thirdLibUrlText: "Use third-party libraries", }, datasourceTutorial: { @@ -2111,11 +2111,11 @@ export const en = { }, queryTutorial: { js: "", - transformer: "https://docs.openblocks.dev/build-apps/write-javascript/transformers", - tempState: "https://docs.openblocks.dev/build-apps/write-javascript/temporary-state", + transformer: "https://docs.lowcoder.dev/build-apps/write-javascript/transformers", + tempState: "https://docs.lowcoder.dev/build-apps/write-javascript/temporary-state", }, customComponent: { - entryUrl: "https://custom-component.openblocks.dev/index.html", + entryUrl: "https://custom-component.lowcoder.dev/index.html", }, template: { cloneUrl: "/apps/template-import/", diff --git a/client/packages/openblocks/src/util/tutorialUtils.ts b/client/packages/openblocks/src/util/tutorialUtils.ts index f26fe22c1..9750f59b6 100644 --- a/client/packages/openblocks/src/util/tutorialUtils.ts +++ b/client/packages/openblocks/src/util/tutorialUtils.ts @@ -9,7 +9,7 @@ const DatasourceTutorials: Partial> = { es: trans("datasourceTutorial.es"), smtp: trans("datasourceTutorial.smtp"), clickHouse: trans("datasourceTutorial.clickHouse"), - googleSheets: "https://docs.openblocks.dev/data-sources/connect-to-databases/google-sheets", + googleSheets: "https://docs.lowcoder.dev/data-sources/connect-to-databases/google-sheets", }; export const getDatasourceTutorial = (datasourceType: DatasourceType) => { From c1a25c58c2e56b017abc44bc9ec1009bbe0a9f74 Mon Sep 17 00:00:00 2001 From: Jan Richter Date: Fri, 12 May 2023 02:03:36 +1200 Subject: [PATCH 11/21] refactor: rename openblocks to lowcoder --- client/README.md | 4 ++-- client/package.json | 8 ++++---- client/packages/create-openblocks-plugin/index.js | 2 +- client/packages/create-openblocks-plugin/package.json | 2 +- .../openblocks-cli-template-typescript/README-template.md | 2 +- .../packages/openblocks-cli-template-typescript/index.tsx | 2 +- .../openblocks-cli-template-typescript/package.json | 4 ++-- client/packages/openblocks-cli/README.md | 2 +- client/packages/openblocks-cli/actions/build.js | 6 +++--- client/packages/openblocks-cli/actions/init.js | 2 +- client/packages/openblocks-cli/package.json | 4 ++-- client/packages/openblocks-comps/README.md | 2 +- client/packages/openblocks-comps/index.tsx | 2 +- client/packages/openblocks-comps/package.json | 2 +- .../src/comps/chartComp/chartConstants.tsx | 2 +- client/packages/openblocks-core/package.json | 4 ++-- client/packages/openblocks-dev-utils/package.json | 4 ++-- client/packages/openblocks-plugin-demo/README.md | 2 +- client/packages/openblocks-plugin-demo/index.tsx | 2 +- client/packages/openblocks-plugin-demo/package.json | 2 +- client/packages/openblocks-sdk/package.json | 2 +- client/packages/openblocks-sdk/src/index.ts | 6 +++--- client/packages/openblocks/README.md | 2 +- client/packages/openblocks/package.json | 2 +- .../packages/openblocks/src/components/ResCreatePanel.tsx | 6 +++--- .../src/comps/queries/queryComp/queryPropertyView.tsx | 4 ++-- .../openblocks/src/comps/queries/resourceDropdown.tsx | 2 +- .../openblocks/src/comps/utils/gridCompOperator.ts | 2 +- .../openblocks/src/constants/datasourceConstants.ts | 4 ++-- .../packages/openblocks/src/constants/queryConstants.ts | 4 ++-- client/packages/openblocks/src/i18n/locales/en.ts | 2 +- .../src/pages/editor/right/PluginPanel/PluginItem.tsx | 2 +- client/packages/openblocks/src/types/remoteComp.ts | 2 +- client/packages/openblocks/src/util/bottomResUtils.tsx | 2 +- client/scripts/build.js | 4 ++-- client/yarn.lock | 4 ++-- 36 files changed, 55 insertions(+), 55 deletions(-) diff --git a/client/README.md b/client/README.md index 6f539c8af..bde7319b3 100644 --- a/client/README.md +++ b/client/README.md @@ -9,7 +9,7 @@ Simply run below command to start a backend server. ```bash -docker run -d --name openblocks -p 3000:3000 -v "$PWD/stacks:/lowcoder-stacks" lowcoderorg/lowcoder-ce +docker run -d --name lowcoder -p 3000:3000 -v "$PWD/stacks:/lowcoder-stacks" lowcoderorg/lowcoder-ce ``` For more information, view our [docs](../docs/self-hosting) @@ -43,4 +43,4 @@ In addition, before submitting a pull request, please make sure the following is 1. If you’ve fixed a bug or added code that should be tested and add unit test suite. 2. Run `yarn test` and ensure all test suites pass. -3. If you add new dependency, use yarn workspace openblocks some-package to make sure yarn.lock is also updated. +3. If you add new dependency, use yarn workspace lowcoder some-package to make sure yarn.lock is also updated. diff --git a/client/package.json b/client/package.json index ebc23e83b..acb71d646 100644 --- a/client/package.json +++ b/client/package.json @@ -10,12 +10,12 @@ "node": "^14.18.0 || >=16.0.0" }, "scripts": { - "start": "yarn workspace openblocks start", - "start:ee": "REACT_APP_EDITION=enterprise yarn workspace openblocks start", - "start:ee-global": "REACT_APP_EDITION=enterprise-global yarn workspace openblocks start", + "start": "yarn workspace lowcoder start", + "start:ee": "REACT_APP_EDITION=enterprise yarn workspace lowcoder start", + "start:ee-global": "REACT_APP_EDITION=enterprise-global yarn workspace lowcoder start", "build": "yarn node ./scripts/build.js", "test": "jest && yarn workspace lowcoder-comps test", - "prepare": "yarn workspace openblocks prepare", + "prepare": "yarn workspace lowcoder prepare", "build:core": "yarn workspace lowcoder-core build", "test:core": "yarn workspace lowcoder-core test" }, diff --git a/client/packages/create-openblocks-plugin/index.js b/client/packages/create-openblocks-plugin/index.js index f29c95cb5..b47bfa9f8 100755 --- a/client/packages/create-openblocks-plugin/index.js +++ b/client/packages/create-openblocks-plugin/index.js @@ -89,7 +89,7 @@ function executeNodeScript({ cwd, args }, data, source) { } /** - * create openblocks comps project + * create lowcoder comps project * 1. create dir * 2. create package.json * 3. install lowcoder-cli diff --git a/client/packages/create-openblocks-plugin/package.json b/client/packages/create-openblocks-plugin/package.json index 03cfc334c..49922e125 100644 --- a/client/packages/create-openblocks-plugin/package.json +++ b/client/packages/create-openblocks-plugin/package.json @@ -12,6 +12,6 @@ }, "license": "MIT", "keywords": [ - "openblocks" + "lowcoder" ] } diff --git a/client/packages/openblocks-cli-template-typescript/README-template.md b/client/packages/openblocks-cli-template-typescript/README-template.md index 3257ea6bb..7c74d491a 100644 --- a/client/packages/openblocks-cli-template-typescript/README-template.md +++ b/client/packages/openblocks-cli-template-typescript/README-template.md @@ -1,4 +1,4 @@ -# openblocks comp lib +# lowcoder comp lib ## Start diff --git a/client/packages/openblocks-cli-template-typescript/index.tsx b/client/packages/openblocks-cli-template-typescript/index.tsx index 725bd2aba..b446b08b8 100644 --- a/client/packages/openblocks-cli-template-typescript/index.tsx +++ b/client/packages/openblocks-cli-template-typescript/index.tsx @@ -1,6 +1,6 @@ import ReactDOM from "react-dom"; import { CompIDE } from "lowcoder-sdk"; -import { name, version, openblocks } from "./package.json"; +import { name, version, lowcoder } from "./package.json"; import compMap from "./src/index"; import "lowcoder-sdk/dist/style.css"; diff --git a/client/packages/openblocks-cli-template-typescript/package.json b/client/packages/openblocks-cli-template-typescript/package.json index a89eb8e88..6a579f554 100644 --- a/client/packages/openblocks-cli-template-typescript/package.json +++ b/client/packages/openblocks-cli-template-typescript/package.json @@ -6,7 +6,7 @@ "start": "vite", "build": "lowcoder-cli build" }, - "openblocks": { + "lowcoder": { "description": "", "comps": { "hello_world": { @@ -22,7 +22,7 @@ "vite": "^3.2.4" }, "keywords": [ - "openblocks" + "lowcoder" ], "license": "MIT" } diff --git a/client/packages/openblocks-cli/README.md b/client/packages/openblocks-cli/README.md index 6af48e6fd..0a679525e 100644 --- a/client/packages/openblocks-cli/README.md +++ b/client/packages/openblocks-cli/README.md @@ -1,3 +1,3 @@ # lowcoder-cli -CLI tool used to start build and publish openblocks component library. +CLI tool used to start build and publish lowcoder component library. diff --git a/client/packages/openblocks-cli/actions/build.js b/client/packages/openblocks-cli/actions/build.js index fee3bb3da..b59ae51b5 100644 --- a/client/packages/openblocks-cli/actions/build.js +++ b/client/packages/openblocks-cli/actions/build.js @@ -17,10 +17,10 @@ function validPackageJSON() { if (!packageJSON.version) { return "- package version is required"; } - if (!packageJSON.openblocks) { - return "- openblocks field is required in package.json"; + if (!packageJSON.lowcoder) { + return "- lowcoder field is required in package.json"; } - const openblocks = packageJSON.openblocks; + const lowcoder = packageJSON.lowcoder; if (!lowcoder.comps || Object.keys(lowcoder.comps).length === 0) { return "- not found any comps to build"; } diff --git a/client/packages/openblocks-cli/actions/init.js b/client/packages/openblocks-cli/actions/init.js index 4c1764d40..1d36db48c 100644 --- a/client/packages/openblocks-cli/actions/init.js +++ b/client/packages/openblocks-cli/actions/init.js @@ -74,7 +74,7 @@ export default async function initAction(options) { const templatePackageJson = fs.readJsonSync(templatePackageJsonFile); const appPackageJson = fs.readJsonSync(paths.appPackageJson); - appPackageJson.openblocks = templatePackageJson.openblocks || {}; + appPackageJson.lowcoder = templatePackageJson.lowcoder || {}; appPackageJson.scripts = { start: "vite", build: "lowcoder-cli build", diff --git a/client/packages/openblocks-cli/package.json b/client/packages/openblocks-cli/package.json index 807192ae8..555f02e58 100644 --- a/client/packages/openblocks-cli/package.json +++ b/client/packages/openblocks-cli/package.json @@ -1,6 +1,6 @@ { "name": "lowcoder-cli", - "description": "CLI tool used to start build publish openblocks components", + "description": "CLI tool used to start build publish lowcoder components", "version": "0.0.24", "license": "MIT", "bin": "./index.js", @@ -46,6 +46,6 @@ "lowcoder-sdk": "*" }, "keywords": [ - "openblocks" + "lowcoder" ] } diff --git a/client/packages/openblocks-comps/README.md b/client/packages/openblocks-comps/README.md index 3257ea6bb..7c74d491a 100644 --- a/client/packages/openblocks-comps/README.md +++ b/client/packages/openblocks-comps/README.md @@ -1,4 +1,4 @@ -# openblocks comp lib +# lowcoder comp lib ## Start diff --git a/client/packages/openblocks-comps/index.tsx b/client/packages/openblocks-comps/index.tsx index 725bd2aba..b446b08b8 100644 --- a/client/packages/openblocks-comps/index.tsx +++ b/client/packages/openblocks-comps/index.tsx @@ -1,6 +1,6 @@ import ReactDOM from "react-dom"; import { CompIDE } from "lowcoder-sdk"; -import { name, version, openblocks } from "./package.json"; +import { name, version, lowcoder } from "./package.json"; import compMap from "./src/index"; import "lowcoder-sdk/dist/style.css"; diff --git a/client/packages/openblocks-comps/package.json b/client/packages/openblocks-comps/package.json index b1500dfa8..2d8df5bb7 100644 --- a/client/packages/openblocks-comps/package.json +++ b/client/packages/openblocks-comps/package.json @@ -21,7 +21,7 @@ "react-dom": "17", "typescript": "4.8.4" }, - "openblocks": { + "lowcoder": { "description": "", "comps": { "chart": { diff --git a/client/packages/openblocks-comps/src/comps/chartComp/chartConstants.tsx b/client/packages/openblocks-comps/src/comps/chartComp/chartConstants.tsx index f06e66996..52db1c5ab 100644 --- a/client/packages/openblocks-comps/src/comps/chartComp/chartConstants.tsx +++ b/client/packages/openblocks-comps/src/comps/chartComp/chartConstants.tsx @@ -15,7 +15,7 @@ import { ScatterChartConfig } from "./chartConfigs/scatterChartConfig"; import { SeriesListComp } from "./seriesComp"; import { EChartsOption } from "echarts"; import { i18nObjs, trans } from "i18n/comps"; -import { JSONValue } from "openblocks"; +import { JSONValue } from "lowcoder"; export const ChartTypeOptions = [ { diff --git a/client/packages/openblocks-core/package.json b/client/packages/openblocks-core/package.json index 6798ef4b0..16aaaa794 100644 --- a/client/packages/openblocks-core/package.json +++ b/client/packages/openblocks-core/package.json @@ -21,9 +21,9 @@ "lodash": "^4.17.21", "lru-cache": "^7.14.1" }, - "description": "lowcoder-core is a JavaScript library for building new components in openblocks", + "description": "lowcoder-core is a JavaScript library for building new components in lowcoder", "keywords": [ - "openblocks", + "lowcoder", "components" ], "types": "lib/index.d.ts", diff --git a/client/packages/openblocks-dev-utils/package.json b/client/packages/openblocks-dev-utils/package.json index 90d54657c..6ceaee790 100644 --- a/client/packages/openblocks-dev-utils/package.json +++ b/client/packages/openblocks-dev-utils/package.json @@ -3,8 +3,8 @@ "version": "0.0.5", "license": "MIT", "type": "module", - "description": "Openblocks dev utils for openblocks build process and lowcoder-cli", + "description": "Openblocks dev utils for lowcoder build process and lowcoder-cli", "keywords": [ - "openblocks" + "lowcoder" ] } diff --git a/client/packages/openblocks-plugin-demo/README.md b/client/packages/openblocks-plugin-demo/README.md index 3257ea6bb..7c74d491a 100644 --- a/client/packages/openblocks-plugin-demo/README.md +++ b/client/packages/openblocks-plugin-demo/README.md @@ -1,4 +1,4 @@ -# openblocks comp lib +# lowcoder comp lib ## Start diff --git a/client/packages/openblocks-plugin-demo/index.tsx b/client/packages/openblocks-plugin-demo/index.tsx index 725bd2aba..b446b08b8 100644 --- a/client/packages/openblocks-plugin-demo/index.tsx +++ b/client/packages/openblocks-plugin-demo/index.tsx @@ -1,6 +1,6 @@ import ReactDOM from "react-dom"; import { CompIDE } from "lowcoder-sdk"; -import { name, version, openblocks } from "./package.json"; +import { name, version, lowcoder } from "./package.json"; import compMap from "./src/index"; import "lowcoder-sdk/dist/style.css"; diff --git a/client/packages/openblocks-plugin-demo/package.json b/client/packages/openblocks-plugin-demo/package.json index 9732698ae..4d3203ced 100644 --- a/client/packages/openblocks-plugin-demo/package.json +++ b/client/packages/openblocks-plugin-demo/package.json @@ -12,7 +12,7 @@ "publishConfig": { "registry": "https://registry.npmjs.com" }, - "openblocks": { + "lowcoder": { "description": "", "comps": { "hello_world": { diff --git a/client/packages/openblocks-sdk/package.json b/client/packages/openblocks-sdk/package.json index e6f224cdb..305a32582 100644 --- a/client/packages/openblocks-sdk/package.json +++ b/client/packages/openblocks-sdk/package.json @@ -53,7 +53,7 @@ "react-dom": ">=17" }, "keywords": [ - "openblocks" + "lowcoder" ], "license": "MIT" } diff --git a/client/packages/openblocks-sdk/src/index.ts b/client/packages/openblocks-sdk/src/index.ts index 9b3e1a0f3..230263c67 100644 --- a/client/packages/openblocks-sdk/src/index.ts +++ b/client/packages/openblocks-sdk/src/index.ts @@ -1,7 +1,7 @@ // @ts-nocheck import "../../lowcoder/src/index.less"; import "virtual:globals"; -import * as sdk from "openblocks"; -export * from "openblocks"; +import * as sdk from "lowcoder"; +export * from "lowcoder"; -window.$openblocks_sdk = sdk; +window.$lowcoder_sdk = sdk; diff --git a/client/packages/openblocks/README.md b/client/packages/openblocks/README.md index 84b51d55f..d357ed5d7 100644 --- a/client/packages/openblocks/README.md +++ b/client/packages/openblocks/README.md @@ -1,3 +1,3 @@ -# openblocks +# lowcoder The main app of lowcoder. diff --git a/client/packages/openblocks/package.json b/client/packages/openblocks/package.json index 73b96869a..f3a5f6289 100644 --- a/client/packages/openblocks/package.json +++ b/client/packages/openblocks/package.json @@ -1,5 +1,5 @@ { - "name": "openblocks", + "name": "lowcoder", "version": "0.1.0", "private": true, "type": "module", diff --git a/client/packages/openblocks/src/components/ResCreatePanel.tsx b/client/packages/openblocks/src/components/ResCreatePanel.tsx index 6d174c02e..5f81dfbb5 100644 --- a/client/packages/openblocks/src/components/ResCreatePanel.tsx +++ b/client/packages/openblocks/src/components/ResCreatePanel.tsx @@ -169,12 +169,12 @@ const ResButton = (props: { dataSourceId: QUICK_GRAPHQL_ID, }, }, - openblocksApi: { + lowcoderApi: { icon: OPENBLOCKS_API_INFO.icon, label: OPENBLOCKS_API_INFO.name, type: BottomResTypeEnum.Query, extra: { - compType: "openblocksApi", + compType: "lowcoderApi", dataSourceId: OPENBLOCKS_API_ID, }, }, @@ -320,7 +320,7 @@ export function ResCreatePanel(props: ResCreateModalProps) { {placement === "editor" && ( - + )} {datasource.map((i) => ( diff --git a/client/packages/openblocks/src/comps/queries/queryComp/queryPropertyView.tsx b/client/packages/openblocks/src/comps/queries/queryComp/queryPropertyView.tsx index 7a849fb73..ff35c445d 100644 --- a/client/packages/openblocks/src/comps/queries/queryComp/queryPropertyView.tsx +++ b/client/packages/openblocks/src/comps/queries/queryComp/queryPropertyView.tsx @@ -186,12 +186,12 @@ export const QueryGeneralPropertyView = (props: { ); if (datasourceId === oldOpenblocksId) { datasourceId = OPENBLOCKS_API_ID; - datasourceType = "openblocksApi"; + datasourceType = "lowcoderApi"; dispatch( comp.changeValueAction({ ...comp.toJsonValue(), datasourceId: OPENBLOCKS_API_ID, - compType: "openblocksApi", + compType: "lowcoderApi", } as any) ); } diff --git a/client/packages/openblocks/src/comps/queries/resourceDropdown.tsx b/client/packages/openblocks/src/comps/queries/resourceDropdown.tsx index 7a45705a8..91e36f3b5 100644 --- a/client/packages/openblocks/src/comps/queries/resourceDropdown.tsx +++ b/client/packages/openblocks/src/comps/queries/resourceDropdown.tsx @@ -97,7 +97,7 @@ const QuickGraphqlValue: ResourceOptionValue = { const OpenblocksAPIValue: ResourceOptionValue = { id: OPENBLOCKS_API_ID, - type: "openblocksApi", + type: "lowcoderApi", }; interface ResourceDropdownProps { diff --git a/client/packages/openblocks/src/comps/utils/gridCompOperator.ts b/client/packages/openblocks/src/comps/utils/gridCompOperator.ts index 253af1137..81ff57807 100644 --- a/client/packages/openblocks/src/comps/utils/gridCompOperator.ts +++ b/client/packages/openblocks/src/comps/utils/gridCompOperator.ts @@ -240,7 +240,7 @@ export class GridCompOperator { return; } - if (!latestVersion.openblocks?.comps?.[compInfo.compName]) { + if (!latestVersion.lowcoder?.comps?.[compInfo.compName]) { message.error(trans("comp.compNotFoundInLatestVersion")); return; } diff --git a/client/packages/openblocks/src/constants/datasourceConstants.ts b/client/packages/openblocks/src/constants/datasourceConstants.ts index 887a5e2e1..4d894c9f0 100644 --- a/client/packages/openblocks/src/constants/datasourceConstants.ts +++ b/client/packages/openblocks/src/constants/datasourceConstants.ts @@ -44,7 +44,7 @@ export const QUICK_REST_API_ID = "#QUICK_REST_API"; export const QUICK_GRAPHQL_ID = "#QUICK_GRAPHQL"; export const OPENBLOCKS_API_ID = "#OPENBLOCKS_API"; export const OPENBLOCKS_API_INFO = { - icon: getBottomResIcon("openblocksApi"), - name: trans("query.openblocksAPI"), + icon: getBottomResIcon("lowcoderApi"), + name: trans("query.lowcoderAPI"), }; export const OLD_OPENBLOCKS_DATASOURCE: Partial[] = []; diff --git a/client/packages/openblocks/src/constants/queryConstants.ts b/client/packages/openblocks/src/constants/queryConstants.ts index b50d64eb7..4d4d10a8f 100644 --- a/client/packages/openblocks/src/constants/queryConstants.ts +++ b/client/packages/openblocks/src/constants/queryConstants.ts @@ -19,7 +19,7 @@ export type DatasourceType = | "mongodb" | "restApi" | "postgres" - | "openblocksApi" + | "lowcoderApi" | "redis" | "es" | "mssql" @@ -39,7 +39,7 @@ export const QueryMap = { restApi: HttpQuery, mongodb: MongoQuery, postgres: SQLQuery, - openblocksApi: OpenBlocksQuery, + lowcoderApi: OpenBlocksQuery, redis: RedisQuery, es: EsQuery, mssql: SQLQuery, diff --git a/client/packages/openblocks/src/i18n/locales/en.ts b/client/packages/openblocks/src/i18n/locales/en.ts index 533bd70fa..4e7ddc614 100644 --- a/client/packages/openblocks/src/i18n/locales/en.ts +++ b/client/packages/openblocks/src/i18n/locales/en.ts @@ -409,7 +409,7 @@ export const en = { transformer: "Transformer", quickRestAPI: "REST Query", quickGraphql: "GraphQL Query", - openblocksAPI: "Openblocks API", + lowcoderAPI: "Openblocks API", executeJSCode: "Run JavaScript Code", importFromQueryLibrary: "Import from Query Library", importFromFile: "Import from File", diff --git a/client/packages/openblocks/src/pages/editor/right/PluginPanel/PluginItem.tsx b/client/packages/openblocks/src/pages/editor/right/PluginPanel/PluginItem.tsx index 009c5963a..a61f3db03 100644 --- a/client/packages/openblocks/src/pages/editor/right/PluginPanel/PluginItem.tsx +++ b/client/packages/openblocks/src/pages/editor/right/PluginPanel/PluginItem.tsx @@ -62,7 +62,7 @@ export function PluginItem(props: PluginViewProps) { ); const currentVersion = useSelector((state: AppState) => state.npmPlugin.packageVersion[name]); const versions = useMemo(() => packageMeta?.versions || {}, [packageMeta?.versions]); - const comps = versions[currentVersion]?.openblocks?.comps || {}; + const comps = versions[currentVersion]?.lowcoder?.comps || {}; const compNames = Object.keys(comps); useEffect(() => { diff --git a/client/packages/openblocks/src/types/remoteComp.ts b/client/packages/openblocks/src/types/remoteComp.ts index 15abb219a..0ba395c3a 100644 --- a/client/packages/openblocks/src/types/remoteComp.ts +++ b/client/packages/openblocks/src/types/remoteComp.ts @@ -15,7 +15,7 @@ export interface OpenblocksMeta { export interface NpmVersionMeta { name: string; version: string; - openblocks: OpenblocksMeta; + lowcoder: OpenblocksMeta; } export interface NpmPackageMeta { diff --git a/client/packages/openblocks/src/util/bottomResUtils.tsx b/client/packages/openblocks/src/util/bottomResUtils.tsx index 0dbda8117..73f02ec16 100644 --- a/client/packages/openblocks/src/util/bottomResUtils.tsx +++ b/client/packages/openblocks/src/util/bottomResUtils.tsx @@ -131,7 +131,7 @@ export const getBottomResIcon = ( return ; case "graphql": return ; - case "openblocksApi": + case "lowcoderApi": return ; case "snowflake": return ; diff --git a/client/scripts/build.js b/client/scripts/build.js index 2889f42a1..a98a4e5e8 100644 --- a/client/scripts/build.js +++ b/client/scripts/build.js @@ -83,8 +83,8 @@ buildVars.forEach(({ name, defaultValue }) => { shell.env[name] = shell.env[name] ?? defaultValue; }); -shell.exec(`BUILD_TARGET=browserCheck yarn workspace openblocks build`, { fatal: true }); -shell.exec(`yarn workspace openblocks build`, { fatal: true }); +shell.exec(`BUILD_TARGET=browserCheck yarn workspace lowcoder build`, { fatal: true }); +shell.exec(`yarn workspace lowcoder build`, { fatal: true }); if (process.env.REACT_APP_BUNDLE_BUILTIN_PLUGIN) { for (const pluginName of builtinPlugins) { diff --git a/client/yarn.lock b/client/yarn.lock index 4c95eb917..16356e047 100644 --- a/client/yarn.lock +++ b/client/yarn.lock @@ -14457,9 +14457,9 @@ __metadata: languageName: unknown linkType: soft -"openblocks@workspace:packages/lowcoder": +"lowcoder@workspace:packages/lowcoder": version: 0.0.0-use.local - resolution: "openblocks@workspace:packages/lowcoder" + resolution: "lowcoder@workspace:packages/lowcoder" dependencies: "@ant-design/icons": ^4.7.0 "@ant-design/pro-form": ^1.52.9 From 2f5a085d0887d34f0592348ddd4c99213cf2c5c4 Mon Sep 17 00:00:00 2001 From: Jan Richter Date: Fri, 12 May 2023 02:07:03 +1200 Subject: [PATCH 12/21] refactor: rename Openblocks to Lowcoder --- .../index.html | 2 +- .../openblocks-cli/config/vite.config.js | 2 +- client/packages/openblocks-cli/global.d.ts | 2 +- client/packages/openblocks-comps/index.html | 2 +- client/packages/openblocks-core/package.json | 2 +- .../packages/openblocks-dev-utils/package.json | 2 +- .../packages/openblocks-plugin-demo/index.html | 2 +- client/packages/openblocks-sdk/README.md | 10 +++++----- client/packages/openblocks-sdk/index.d.ts | 6 +++--- client/packages/openblocks-sdk/index.html | 2 +- client/packages/openblocks-sdk/index.tsx | 4 ++-- client/packages/openblocks-sdk/vite.config.mts | 2 +- .../openblocks/src/appView/AppView.tsx | 6 +++--- .../src/appView/OpenblocksAppView.tsx | 8 ++++---- .../src/components/ResCreatePanel.tsx | 10 +++++----- .../actionSelector/actionSelectorControl.tsx | 2 +- .../src/comps/controls/eventHandlerControl.tsx | 2 +- .../queries/queryComp/queryPropertyView.tsx | 18 +++++++++--------- .../src/comps/queries/resourceDropdown.tsx | 18 +++++++++--------- .../src/constants/datasourceConstants.ts | 6 +++--- client/packages/openblocks/src/global.ts | 2 +- .../packages/openblocks/src/i18n/locales/en.ts | 18 +++++++++--------- client/packages/openblocks/src/index.sdk.ts | 2 +- .../src/pages/ComponentPlayground/index.tsx | 2 +- .../right/PluginPanel/PluginCompItem.tsx | 4 ++-- .../openblocks/src/types/remoteComp.ts | 8 ++++---- 26 files changed, 72 insertions(+), 72 deletions(-) diff --git a/client/packages/openblocks-cli-template-typescript/index.html b/client/packages/openblocks-cli-template-typescript/index.html index 877ecc060..12f0761f4 100644 --- a/client/packages/openblocks-cli-template-typescript/index.html +++ b/client/packages/openblocks-cli-template-typescript/index.html @@ -4,7 +4,7 @@ - Openblocks Comp Playground + Lowcoder Comp Playground