Merge pull request #202 from jumpserver/pr@dev@fix_chen_bugs

fix:some bugs

Author: Zxc4wonder

backend/framework/src/main/java/org/jumpserver/chen/framework/console/QueryConsole.java

@@ -92,15 +92,13 @@ public void onConnect(Connect connect) {
         try {
             var currentContext = this.getSqlActuator().getCurrentSchema();
 
-            if (StringUtils.isEmpty(currentContext) && !StringUtils.isEmpty(context)) {
+            if (StringUtils.isNotEmpty(context)
+                    && !StringUtils.equals(currentContext, context)) {
                 this.getSqlActuator().changeSchema(context);
-                this.getState().setCurrentContext(context);
-            } else {
-                if (!StringUtils.isEmpty(context) && !currentContext.equals(context)) {
-                    this.getSqlActuator().changeSchema(context);
-                    this.getState().setCurrentContext(context);
-                }
             }
+            this.getState().setCurrentContext(
+                    StringUtils.defaultIfEmpty(context, currentContext)
+            );
 
             var schemas = this.getSqlActuator().getSchemas();
             this.replaceAllowedContexts(schemas);

backend/framework/src/main/java/org/jumpserver/chen/framework/datasource/base/BaseSQLActuator.java

@@ -199,7 +199,7 @@ private void executeStatement(SQLExecutePlan plan, Statement statement, SQLQuery
                     List<Object> fs = new ArrayList<>();
                     for (int i = 1; i <= columnCount; i++) {
                         try {
-                            fs.add(this.normalizeJdbcValue(resultSet.getObject(i)));
+                            fs.add(this.normalizeJdbcValue(resultSet, i));
                         } catch (NoClassDefFoundError e) {
                             log.error(e.getMessage());
                         }
@@ -230,17 +230,29 @@ private void executeStatement(SQLExecutePlan plan, Statement statement, SQLQuery
     }
 
     // Normalize JDBC driver objects before Gson sees them in update_data_view packets.
+    protected Object normalizeJdbcValue(ResultSet resultSet, int columnIndex) throws SQLException {
+        return this.normalizeJdbcValue(resultSet.getObject(columnIndex));
+    }
+
     protected Object normalizeJdbcValue(Object value) throws SQLException {
         if (value == null) {
             return null;
         }
 
+        if (value.getClass().getName().equals("oracle.sql.TIMESTAMPTZ")) {
+            return this.normalizeOracleTimestampWithTimeZone(value);
+        }
+
         var temporalValue = this.formatTemporalValue(value);
         if (temporalValue != null) {
             return temporalValue;
         }
 
-        if (value instanceof Long || value instanceof BigDecimal || value instanceof BigInteger) {
+        if (value instanceof BigDecimal decimal) {
+            return decimal.toPlainString();
+        }
+
+        if (value instanceof Long || value instanceof BigInteger) {
             return value.toString();
         }
 
@@ -268,9 +280,26 @@ protected Object normalizeJdbcValue(Object value) throws SQLException {
             return value.toString();
         }
 
+        if (value.getClass().getName().equals("microsoft.sql.DateTimeOffset")) {
+            return value.toString();
+        }
+
         return value;
     }
 
+    private String normalizeOracleTimestampWithTimeZone(Object value) throws SQLException {
+        try {
+            var offsetDateTime = value.getClass().getMethod("toOffsetDateTime").invoke(value);
+            return OFFSET_DATE_TIME_DISPLAY_FORMATTER.format((OffsetDateTime) offsetDateTime);
+        } catch (ReflectiveOperationException | ClassCastException e) {
+            var cause = e.getCause() == null ? e : e.getCause();
+            if (cause instanceof SQLException sqlException) {
+                throw sqlException;
+            }
+            throw new SQLException("normalize Oracle TIMESTAMP WITH TIME ZONE failed", cause);
+        }
+    }
+
     private String formatTemporalValue(Object value) {
         if (value instanceof Timestamp timestamp) {
             return LOCAL_DATE_TIME_DISPLAY_FORMATTER.format(timestamp.toLocalDateTime());

backend/modules/src/main/java/org.jumpserver.chen.modules/mariadb/MariaDBActuator.java

@@ -4,6 +4,8 @@
 import org.jumpserver.chen.modules.mysql.MysqlActuator;
 
 import java.sql.Connection;
+import java.sql.ResultSet;
+import java.sql.SQLException;
 
 public class MariaDBActuator extends MysqlActuator {
     public MariaDBActuator(ConnectionManager connectionManager) {
@@ -12,4 +14,13 @@ public MariaDBActuator(ConnectionManager connectionManager) {
     public MariaDBActuator(MariaDBActuator sqlActuator, Connection connection) {
         super(sqlActuator, connection);
     }
+
+    @Override
+    protected Object normalizeJdbcValue(ResultSet resultSet, int columnIndex) throws SQLException {
+        var columnTypeName = resultSet.getMetaData().getColumnTypeName(columnIndex);
+        if ("JSON".equalsIgnoreCase(columnTypeName) || "MYSQL_JSON".equalsIgnoreCase(columnTypeName)) {
+            return resultSet.getString(columnIndex);
+        }
+        return super.normalizeJdbcValue(resultSet, columnIndex);
+    }
 }

backend/web/src/main/java/org/jumpserver/chen/web/config/WebSocketConfig.java

@@ -30,8 +30,7 @@ public class WebSocketConfig {
     @Bean
     public ServletServerContainerFactoryBean createWebSocketContainer() {
         ServletServerContainerFactoryBean container = new ServletServerContainerFactoryBean();
-        container.setMaxTextMessageBufferSize(20 * 1024 * 1024);
-        container.setMaxBinaryMessageBufferSize(20 * 1024 * 1024);
+        container.setMaxTextMessageBufferSize(1024 * 1024);
         // 可选：异步发送超时
         // container.setAsyncSendTimeout(20_000L);
         return container;

frontend/src/components/Main/Explore/QueryConsole/SaveSnippetDialog.vue

@@ -6,7 +6,7 @@
     :modal="false"
     width="40%"
   >
-    <el-form ref="form" :model="form" label-width="80px">
+    <el-form ref="form" :model="form" label-width="80px" @submit.native.prevent="onSubmit">
       <el-form-item :label="$tc('Name')">
         <el-input v-model="form.name" />
       </el-form-item>