From 72776f3bc0b6266d208478f1e5a856471046d32f Mon Sep 17 00:00:00 2001
From: ikiler <ikiler@126.com>
Date: Tue, 19 Dec 2023 13:46:42 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E5=88=A0=E9=99=A4=E6=97=A0=E7=94=A8?=
 =?UTF-8?q?=E7=9A=84pom=E9=85=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 dinky-admin/pom.xml                           | 12 +--
 dinky-gateway/pom.xml                         | 91 -------------------
 .../ConfigurationForm/FlinkK8s/contants.tsx   |  3 +-
 pom.xml                                       |  6 ++
 4 files changed, 10 insertions(+), 102 deletions(-)

diff --git a/dinky-admin/pom.xml b/dinky-admin/pom.xml
index 97d0867231..1cabfcceb6 100644
--- a/dinky-admin/pom.xml
+++ b/dinky-admin/pom.xml
@@ -166,21 +166,15 @@
         </dependency>
         <dependency>
             <groupId>org.dinky</groupId>
-            <artifactId>dinky-core</artifactId>
+            <artifactId>dinky-gateway</artifactId>
         </dependency>
         <dependency>
             <groupId>org.dinky</groupId>
-            <artifactId>dinky-daemon</artifactId>
+            <artifactId>dinky-core</artifactId>
         </dependency>
         <dependency>
             <groupId>org.dinky</groupId>
-            <artifactId>dinky-gateway</artifactId>
-            <exclusions>
-                <exclusion>
-                    <groupId>io.fabric8</groupId>
-                    <artifactId>kubernetes-client</artifactId>
-                </exclusion>
-            </exclusions>
+            <artifactId>dinky-daemon</artifactId>
         </dependency>
         <dependency>
             <groupId>org.dinky</groupId>
diff --git a/dinky-gateway/pom.xml b/dinky-gateway/pom.xml
index 3831c1cc71..eaf17b63c5 100644
--- a/dinky-gateway/pom.xml
+++ b/dinky-gateway/pom.xml
@@ -38,7 +38,6 @@
         <dependency>
             <groupId>io.fabric8</groupId>
             <artifactId>kubernetes-client</artifactId>
-            <version>5.12.4</version>
         </dependency>
         <dependency>
             <groupId>org.dinky</groupId>
@@ -136,94 +135,4 @@ for k8s commit tasks-->
         </dependency>
     </dependencies>
 
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-shade-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>shade-dinky</id>
-                        <goals>
-                            <goal>shade</goal>
-                        </goals>
-                        <phase>package</phase>
-                        <configuration>
-                            <artifactSet>
-                                <includes combine.children="append">
-                                    <include>io.fabric8:kubernetes-client</include>
-                                    <include>io.fabric8:kubernetes-model-*</include>
-                                    <include>io.fabric8:zjsonpatch</include>
-
-                                    <!-- Shade all the dependencies of kubernetes client  -->
-                                    <include>com.fasterxml.jackson.core:jackson-core</include>
-                                    <include>com.fasterxml.jackson.core:jackson-annotations</include>
-                                    <include>com.fasterxml.jackson.core:jackson-databind</include>
-                                    <include>com.fasterxml.jackson.dataformat:jackson-dataformat-yaml</include>
-                                    <include>com.fasterxml.jackson.datatype:jackson-datatype-jsr310</include>
-                                    <include>com.squareup.okhttp3:*</include>
-                                    <include>com.squareup.okio:okio</include>
-                                    <include>org.yaml:*</include>
-                                    <include>dk.brics.automaton:*</include>
-                                </includes>
-                            </artifactSet>
-                            <filters combine.children="append">
-                                <filter>
-                                    <artifact>*:*</artifact>
-                                    <excludes>
-                                        <exclude>*.aut</exclude>
-                                        <exclude>META-INF/services/*com.fasterxml*</exclude>
-                                        <exclude>META-INF/proguard/**</exclude>
-                                        <exclude>OSGI-INF/**</exclude>
-                                        <exclude>schema/**</exclude>
-                                        <exclude>*.vm</exclude>
-                                        <exclude>*.properties</exclude>
-                                        <exclude>*.xml</exclude>
-                                        <exclude>META-INF/jandex.idx</exclude>
-                                        <exclude>license.header</exclude>
-                                    </excludes>
-                                </filter>
-                            </filters>
-                            <relocations>
-                                <relocation>
-                                    <pattern>com.fasterxml.jackson</pattern>
-                                    <shadedPattern>org.dinky.gateway.kubernetes.operator.com.fasterxml.jackson</shadedPattern>
-                                </relocation>
-                                <relocation>
-                                    <pattern>okhttp3/internal/publicsuffix</pattern>
-                                    <shadedPattern>META-INF</shadedPattern>
-                                    <includes>
-                                        <include>**/NOTICE</include>
-                                    </includes>
-                                </relocation>
-                                <relocation>
-                                    <pattern>okhttp3</pattern>
-                                    <shadedPattern>org.dinky.gateway.kubernetes.operator.okhttp3</shadedPattern>
-                                </relocation>
-                                <relocation>
-                                    <pattern>okio</pattern>
-                                    <shadedPattern>org.dinky.gateway.kubernetes.operator.okio</shadedPattern>
-                                </relocation>
-                                <relocation>
-                                    <pattern>org.yaml</pattern>
-                                    <shadedPattern>org.dinky.gateway.kubernetes.operator.org.yaml</shadedPattern>
-                                </relocation>
-                                <relocation>
-                                    <pattern>dk.brics.automaton</pattern>
-                                    <shadedPattern>org.dinky.gateway.kubernetes.operator.dk.brics.automaton</shadedPattern>
-                                </relocation>
-                                <relocation>
-                                    <pattern>io.fabric8</pattern>
-                                    <shadedPattern>org.dinky.gateway.kubernetes.operator.io.fabric8</shadedPattern>
-                                </relocation>
-                            </relocations>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
-    </build>
-
-    <profiles />
-
 </project>
diff --git a/dinky-web/src/pages/RegCenter/Cluster/Configuration/components/ConfigurationModal/ConfigurationForm/FlinkK8s/contants.tsx b/dinky-web/src/pages/RegCenter/Cluster/Configuration/components/ConfigurationModal/ConfigurationForm/FlinkK8s/contants.tsx
index 255997fa3a..d338bba1f3 100644
--- a/dinky-web/src/pages/RegCenter/Cluster/Configuration/components/ConfigurationModal/ConfigurationForm/FlinkK8s/contants.tsx
+++ b/dinky-web/src/pages/RegCenter/Cluster/Configuration/components/ConfigurationModal/ConfigurationForm/FlinkK8s/contants.tsx
@@ -23,9 +23,8 @@ export const ExposedTypeOptions = [
 ];
 
 export const versionOptions = [
-  { label: '1.14', value: 'v1_14' },
   { label: '1.15', value: 'v1_15' },
   { label: '1.16', value: 'v1_16' },
   { label: '1.17', value: 'v1_17' },
-  { label: '1.18', value: 'v1_18', disabled: true }
+  { label: '1.18', value: 'v1_18' }
 ];
diff --git a/pom.xml b/pom.xml
index e2a81a8471..1ce8282552 100644
--- a/pom.xml
+++ b/pom.xml
@@ -80,6 +80,7 @@
         <jgit.version>5.13.1.202206130422-r</jgit.version>
         <junit5.version>5.9.1</junit5.version>
         <knife4j.version>4.1.0</knife4j.version>
+        <kubernetes-client.version>5.12.4</kubernetes-client.version>
         <log4j.version>2.19.0</log4j.version>
         <lombok.version>1.18.24</lombok.version>
         <maven-assembly-plugin.version>3.4.2</maven-assembly-plugin.version>
@@ -125,6 +126,11 @@
 
     <dependencyManagement>
         <dependencies>
+            <dependency>
+                <groupId>io.fabric8</groupId>
+                <artifactId>kubernetes-client</artifactId>
+                <version>${kubernetes-client.version}</version>
+            </dependency>
             <dependency>
                 <groupId>com.amazonaws</groupId>
                 <artifactId>aws-java-sdk-s3</artifactId>

From 2edd5ec799bb9b9646a9a8c5a8ecdf63505f74c2 Mon Sep 17 00:00:00 2001
From: ikiler <ikiler@126.com>
Date: Tue, 19 Dec 2023 22:02:36 +0800
Subject: [PATCH 2/2] fix log error

---
 .../java/org/dinky/aop/exception/UnKnownExceptionHandler.java    | 1 +
 1 file changed, 1 insertion(+)

diff --git a/dinky-admin/src/main/java/org/dinky/aop/exception/UnKnownExceptionHandler.java b/dinky-admin/src/main/java/org/dinky/aop/exception/UnKnownExceptionHandler.java
index f1913b8ee6..37038aa9a5 100644
--- a/dinky-admin/src/main/java/org/dinky/aop/exception/UnKnownExceptionHandler.java
+++ b/dinky-admin/src/main/java/org/dinky/aop/exception/UnKnownExceptionHandler.java
@@ -34,6 +34,7 @@ public class UnKnownExceptionHandler {
 
     @ExceptionHandler
     public Result<Exception> unknownException(Exception e) {
+        log.error(e.getMessage(), e);
         return Result.exception(e.getMessage(), e);
     }
 }