Browse Source

Merge pull request #9928 in DESIGN/design from release/10.0 to final/10.0

* commit '01ca0d66df7157df6780481017debf3561b3e906':
  REPORT-79440 找不到驱动的话可以保存数据连接
  REPORT-64340 删除无效日志
superman 2 years ago
parent
commit
855a6014c9
  1. 3
      designer-base/src/main/java/com/fr/design/data/datapane/connect/ConnectionListPane.java
  2. 6
      designer-base/src/main/java/com/fr/design/mainframe/share/collect/ComponentSender.java

3
designer-base/src/main/java/com/fr/design/data/datapane/connect/ConnectionListPane.java

@ -1,5 +1,6 @@
package com.fr.design.data.datapane.connect;
import com.fr.data.driver.DriverClassNotFoundException;
import com.fr.data.impl.Connection;
import com.fr.data.impl.JDBCDatabaseConnection;
import com.fr.data.impl.JNDIDatabaseConnection;
@ -221,6 +222,8 @@ public class ConnectionListPane extends JListControlPane implements ConnectionSh
Connection connection = entry.getValue();
try {
DataOperator.getInstance().validateConnectionSettings(connection);
} catch (DriverClassNotFoundException e) {
FineLoggerFactory.getLogger().info(e.getMessage());
} catch (SQLException e) {
throw new SQLException(Toolkit.i18nText("Fine-Design_Basic_Database_Connection_Invalid_Config", entry.getKey()) + ", " + e.getMessage(), e.getCause());
}

6
designer-base/src/main/java/com/fr/design/mainframe/share/collect/ComponentSender.java

@ -17,13 +17,7 @@ public class ComponentSender {
private static final String CLOUD_REUSE_URL = "https://cloud.fanruan.com/api/monitor/record_of_reusePlugin/single";
public static boolean send() {
long start = System.currentTimeMillis();
String content = ComponentCollector.getInstance().generateTotalInfo();
long end = System.currentTimeMillis();
FineLoggerFactory.getLogger().error("cal time cost {} ms", end - start);
return sendInfo(CLOUD_REUSE_URL, content);
}

Loading…
Cancel
Save