Merge branch 'dev' into optimize_docker_image

Author: zackyoungh

dinky-admin/src/main/java/org/dinky/interceptor/PostgreSQLPrepareInterceptor.java

@@ -44,7 +44,12 @@ public Object intercept(final Invocation invocation) throws Throwable {
         BoundSql boundSql = statementHandler.getBoundSql();
         Field field = boundSql.getClass().getDeclaredField("sql");
         field.setAccessible(true);
-        field.set(boundSql, boundSql.getSql().replace("`", "\"").toLowerCase());
+        field.set(
+                boundSql,
+                boundSql.getSql()
+                        .replace("`", "\"")
+                        .replace("concat('%', ?, '%')", "concat('%', ?::text, '%')")
+                        .toLowerCase());
         return invocation.proceed();
     }
 

dinky-admin/src/main/java/org/dinky/service/impl/TaskServiceImpl.java

@@ -1101,10 +1101,10 @@ public List<TaskDTO> getUserTasks(Integer userId) {
     private Boolean hasTaskOperatePermission(Integer firstLevelOwner, List<Integer> secondLevelOwners) {
         boolean isFirstLevelOwner = firstLevelOwner != null && firstLevelOwner == StpUtil.getLoginIdAsInt();
         if (TaskOwnerLockStrategyEnum.OWNER.equals(
-                SystemConfiguration.getInstances().getTaskOwnerLockStrategy())) {
+                SystemConfiguration.getInstances().getTaskOwnerLockStrategy().getValue())) {
             return isFirstLevelOwner;
         } else if (TaskOwnerLockStrategyEnum.OWNER_AND_MAINTAINER.equals(
-                SystemConfiguration.getInstances().getTaskOwnerLockStrategy())) {
+                SystemConfiguration.getInstances().getTaskOwnerLockStrategy().getValue())) {
             return isFirstLevelOwner
                     || (secondLevelOwners != null && secondLevelOwners.contains(StpUtil.getLoginIdAsInt()));
         }

dinky-core/src/main/java/org/dinky/api/FlinkAPI.java

@@ -112,7 +112,7 @@ private String getResult(String route) {
     }
 
     private JsonNode post(String route, String body) {
-        String url = NetConstant.SLASH + route;
+        String url = address + NetConstant.SLASH + route;
         if (!address.startsWith(NetConstant.HTTP) && !address.startsWith(NetConstant.HTTPS)) {
             url = NetConstant.HTTP + url;
         }

dinky-web/src/pages/DataStudio/CenterTabContent/SqlTask/index.tsx

@@ -237,6 +237,7 @@ export const SqlTask = memo((props: FlinkSqlProps & any) => {
           statement: sqlConvertForm?.initSqlStatement ?? ''
         });
         setOriginStatementValue(sqlConvertForm?.initSqlStatement ?? '');
+        updateCenterTab({ ...props.tabData, params: newParams });
         if (params?.statement && params?.statement !== sqlConvertForm?.initSqlStatement) {
           setDiff([
             { key: 'statement', server: sqlConvertForm?.initSqlStatement, cache: params.statement }