This is an automated email from the ASF dual-hosted git repository. monster pushed a commit to branch fs in repository https://gitbox.apache.org/repos/asf/incubator-streampark.git
commit a87998b3db92d835fc725c0047ba1ad421cdbd33 Merge: 530ffa961 00d5782ca Author: Monster <[email protected]> AuthorDate: Mon Oct 31 09:49:22 2022 +0800 Merge branch 'dev' of github.com:apache/incubator-streampark into fs Conflicts: streampark-common/src/main/scala/org/apache/streampark/common/conf/Workspace.scala build.sh | 4 +- deploy/docker/docker-compose.yaml | 3 + .../streampark/common/conf/ConfigConst.scala | 10 +- .../apache/streampark/common/conf/Workspace.scala | 65 ++-- .../apache/streampark/common/util/FileUtils.scala | 98 ++++++ .../streampark-console-newui/package.json | 2 +- .../src/api/flink/app/app.ts | 6 +- .../src/api/flink/app/app.type.ts | 28 ++ .../src/api/flink/setting/types/alert.type.ts | 1 + .../src/api/system/variable.ts | 27 ++ .../src/assets/images/logo-bg.jpg | Bin 0 -> 758479 bytes .../src/assets/images/logo.png | Bin 0 -> 56632 bytes .../src/assets/images/sign-bg.jpg | Bin 0 -> 339710 bytes .../src/components/Button/src/props.ts | 5 +- .../src/components/CardList/src/CardList.vue | 4 +- .../src/components/Description/src/Description.vue | 2 +- .../src/components/Form/src/BasicForm.vue | 3 +- .../components/Form/src/components/FormAction.tsx | 158 +++++++++ .../components/Form/src/components/FormItem.vue | 13 +- .../src/components/Form/src/hooks/useFormValues.ts | 2 +- .../src/components/Form/src/props.ts | 1 + .../src/components/Form/src/types/form.ts | 9 +- .../src/components/Modal/src/index.less | 11 +- .../src/components/Table/src/BasicTable.vue | 1 + .../streampark-console-newui/src/design/color.less | 2 + .../streampark-console-newui/src/design/index.less | 2 +- .../src/design/public.less | 5 + .../src/design/var/index.less | 16 - .../src/hooks/web/useMonaco.ts | 88 ++++- .../src/hooks/web/usePage.ts | 4 +- .../src/hooks/web/usePermission.ts | 31 +- .../src/layouts/default/footer/index.vue | 6 +- .../header/components/user-dropdown/index.vue | 4 +- .../src/router/constant.ts | 3 + .../src/router/guard/permissionGuard.ts | 3 +- .../src/settings/componentSetting.ts | 2 +- .../src/settings/projectSetting.ts | 4 +- .../src/store/modules/multipleTab.ts | 1 - .../src/store/modules/permission.ts | 48 ++- .../src/store/modules/user.ts | 17 +- .../src/utils/auth/index.ts | 29 +- .../src/utils/cache/persistent.ts | 6 +- .../src/utils/cache/storageCache.ts | 2 +- .../streampark-console-newui/src/utils/cipher.ts | 1 - .../src/views/base/login/Login.vue | 190 ++++------ .../src/views/base/login/LoginForm.vue | 50 +-- .../src/views/base/login/LoginFormTitle.vue | 9 +- .../src/views/flink/app/Add.vue | 82 +++-- .../src/views/flink/app/EditFlink.vue | 90 ++--- .../src/views/flink/app/EditStreamPark.vue | 158 ++++++--- .../{FlinkSqlFormatter.ts => FlinkSqlFormatter.js} | 4 +- .../src/views/flink/app/View.vue | 383 ++------------------- .../src/views/flink/app/components/AppConf.tsx | 8 +- .../flink/app/components/AppDetail/DetailTab.vue | 38 +- .../flink/app/components/AppView/AppDashboard.vue | 87 +++++ .../components/AppView/StartApplicationModal.vue | 8 +- .../components/AppView/StopApplicationModal.vue | 6 +- .../src/views/flink/app/components/Dependency.vue | 119 ++++++- .../app/components/PodTemplate/PomTemplateTab.vue | 2 +- .../src/views/flink/app/components/ProgramArgs.vue | 70 ++++ .../views/flink/app/components/UploadJobJar.vue | 49 +-- .../views/flink/app/components/VariableReview.vue | 60 ++++ .../src/views/flink/app/components/customForm.tsx | 9 +- .../src/views/flink/app/components/flinkSql.vue | 39 ++- .../src/views/flink/app/data/index.ts | 5 +- .../src/views/flink/app/hooks/useAppTableAction.ts | 297 ++++++++++++++++ .../flink/app/hooks/useCreateAndEditSchema.ts | 183 +++++----- .../src/views/flink/app/hooks/useCreateSchema.ts | 77 ++--- .../src/views/flink/app/hooks/useEdit.ts | 39 ++- .../views/flink/app/hooks/useEditFlinkSchema.ts | 33 +- .../src/views/flink/app/hooks/useEditStreamPark.ts | 23 +- .../src/views/flink/app/hooks/useFlinkRender.tsx | 85 +++-- .../src/views/flink/app/hooks/useFlinkSchema.ts | 32 +- .../src/views/flink/app/styles/Add.less | 27 +- .../src/views/flink/app/utils/index.ts | 18 +- .../src/views/flink/notebook/Submit.less | 10 + .../src/views/flink/setting/View.less | 2 +- .../src/views/flink/setting/View.vue | 6 +- .../flink/setting/components/AlertDetailModal.vue | 136 ++++++++ .../views/flink/setting/components/AlertModal.vue | 209 ++++------- .../flink/setting/components/AlertSetting.vue | 218 ++++++++---- .../flink/setting/components/AlertTypeInfo.vue | 104 ++++++ .../flink/setting/components/FlinkEnvModal.vue | 4 +- .../views/flink/setting/components/SettingList.vue | 1 + .../flink/setting/components/SystemSetting.vue | 17 +- .../views/flink/setting/components/alert.data.ts | 79 ++++- .../views/flink/setting/hooks/useClusterSetting.ts | 19 +- .../src/views/system/variable/DependApps.vue | 77 +++++ .../src/views/system/variable/View.vue | 28 +- .../variable/{ => components}/VariableDrawer.vue | 6 +- .../variable/{ => components}/VariableInfo.vue | 8 + .../streampark-console-service/pom.xml | 2 +- .../src/assembly/script/data/mysql-data.sql | 2 + .../src/assembly/script/data/pgsql-data.sql | 3 +- .../src/assembly/script/upgrade/mysql/1.2.4.sql | 3 + .../console/base/config/WebMvcConfig.java | 5 +- .../interceptor/FileHeaderCheckInterceptor.java | 1 + .../core/controller/VariableController.java | 34 +- .../console/core/entity/Application.java | 18 +- .../streampark/console/core/entity/Project.java | 4 +- .../console/core/mapper/ApplicationMapper.java | 1 - .../console/core/runner/EnvInitializer.java | 4 +- .../console/core/service/SettingService.java | 4 + .../console/core/service/VariableService.java | 3 + .../core/service/impl/ApplicationServiceImpl.java | 1 + .../core/service/impl/ProjectServiceImpl.java | 2 +- .../core/service/impl/SettingServiceImpl.java | 5 + .../core/service/impl/VariableServiceImpl.java | 40 ++- .../system/controller/PassportController.java | 4 - .../src/main/resources/db/data-h2.sql | 2 + .../src/main/resources/flink-application.conf | 109 +++--- .../resources/mapper/core/ApplicationMapper.xml | 8 + .../benmanes/caffeine/cache/RefreshCacheTest.java | 4 +- .../util/concurrent/CompletableFutureTest.java | 8 +- .../src/test/java/java/util/regex/RegexTest.java | 10 +- .../org/apache/commons/mail/SendEmailTest.java | 6 +- .../console/base/util/FileUtilsTest.java | 8 +- .../console/base/util/ShaHashUtilsTest.java | 4 +- .../console/core/entity/DependencyTest.java | 4 +- .../streampark/console/core/entity/GitTest.java | 8 +- .../console/core/enums/AlertTypeTest.java | 2 +- .../core/service/ApplicationServiceTest.java | 8 +- .../console/core/service/VariableServiceTest.java | 6 +- .../core/service/alert/AlertServiceTest.java | 12 +- .../console/system/authentication/JWTTest.java | 4 +- .../streampark-console-webapp/src/api/index.js | 1 + .../streampark-console-webapp/src/api/variable.js | 4 + .../streampark-console-webapp/src/store/getters.js | 3 +- .../streampark-console-webapp/src/store/index.js | 4 +- .../src/store/{index.js => modules/variable.js} | 44 +-- .../src/views/flink/app/View.vue | 2 +- .../system/variable/DependApps.less} | 47 +-- .../src/views/system/variable/DependApps.vue | 171 +++++++++ .../src/views/system/variable/View.vue | 16 +- .../streampark/flink/packer/maven/MavenTool.scala | 2 +- .../flink/repl/test/FlinkInterpreterTest.java | 6 +- .../streampark/flink/core/FlinkSqlExecutor.scala | 45 +-- .../streampark/flink/core/FlinkSqlValidator.scala | 10 - .../flink/core/FlinkStreamingInitializer.scala | 46 +-- .../flink/core/FlinkTableInitializer.scala | 57 ++- .../flink/core/conf/FlinkConfiguration.scala | 12 +- .../streampark/flink/core/conf/ParameterCli.scala | 6 +- .../java/org/apache/streampark/RegExpTest.java | 10 +- .../flink/submit/bean/SubmitRequest.scala | 4 +- .../streampark/plugin/profiling/AgentITCase.java | 12 +- .../plugin/profiling/AgentThreadFactoryTest.java | 4 +- .../streampark/plugin/profiling/ArgumentsTest.java | 24 +- .../plugin/profiling/ProfilerRunnableTest.java | 4 +- .../plugin/profiling/YamlConfigProviderTest.java | 8 +- .../profiler/CpuAndMemoryProfilerTest.java | 4 +- .../profiler/MethodArgumentProfilerTest.java | 4 +- .../profiler/MethodDurationProfilerTest.java | 4 +- .../profiler/ProcessInfoProfilerTest.java | 4 +- .../profiler/StacktraceCollectorProfilerTest.java | 8 +- .../profiler/StacktraceReporterProfilerTest.java | 4 +- .../profiling/profiler/ThreadInfoProfilerTest.java | 4 +- .../reporter/ConsoleOutputReporterTest.java | 4 +- .../transformer/MethodProfilerStaticProxyTest.java | 10 +- .../profiling/util/ClassAndMethodFilterTest.java | 10 +- .../util/ClassAndMethodMetricBufferTest.java | 6 +- .../util/ClassMethodArgmentMetricBufferTest.java | 6 +- .../util/ClassMethodArgumentFilterTest.java | 10 +- .../plugin/profiling/util/IOUtilsTest.java | 4 +- .../plugin/profiling/util/ProcFileUtilsTest.java | 26 +- .../plugin/profiling/util/ReflectionUtilsTest.java | 4 +- .../plugin/profiling/util/SparkUtilsTest.java | 12 +- .../profiling/util/StacktraceMetricBufferTest.java | 4 +- .../plugin/profiling/util/StringUtilsTest.java | 12 +- .../streampark/storage/oss/OssStorageService.java | 4 +- .../storage/oss/OssStorageServiceTest.java | 4 +- 170 files changed, 3248 insertions(+), 1712 deletions(-)
