Browse Source

REPORT-114391 【微服务适配】远程&本地设计器能够正常启动 修复图表配置+优化环境切换

mss/2.0
Destiny.Lin 4 months ago
parent
commit
8bdbb3f329
  1. 2
      designer-base/src/main/java/com/fr/design/env/HttpWorkspaceConnector.java
  2. 5
      designer-chart/src/main/java/com/fr/design/module/ChartPreStyleListPane.java

2
designer-base/src/main/java/com/fr/design/env/HttpWorkspaceConnector.java vendored

@ -63,11 +63,11 @@ public class HttpWorkspaceConnector implements WorkspaceConnector {
HttpConstants.AUTHORIZATION_PREFIX + bean.getAccessToken(), HttpConstants.AUTHORIZATION_PREFIX + bean.getAccessToken(),
InetAddress.getLocalHost().getHostAddress()); InetAddress.getLocalHost().getHostAddress());
client.updateConnection(connection); client.updateConnection(connection);
client.startHeartBeat();
} catch (Exception e) { } catch (Exception e) {
client.closePool(); client.closePool();
throw e; throw e;
} }
client.startHeartBeat();
CompatibleRegister.registerCompatibleEnv(); CompatibleRegister.registerCompatibleEnv();
RepositoryManager.getInstance().clearLastPool(); RepositoryManager.getInstance().clearLastPool();
return client; return client;

5
designer-chart/src/main/java/com/fr/design/module/ChartPreStyleListPane.java

@ -118,7 +118,10 @@ public class ChartPreStyleListPane extends JListControlPane {
while (keys.hasNext()) { while (keys.hasNext()) {
Object key = keys.next(); Object key = keys.next();
ChartColorMatching value = (ChartColorMatching) config.getPreStyle(key); ChartColorMatching value = (ChartColorMatching) config.getPreStyle(key);
// 新配置框架不再使用mirror后 原先mirror的地方需要手动清理下namespace
if(!StringUtils.isEmpty(value.getNameSpace())) {
value.reset();
}
list.add(new NameObject(Utils.objectToString(key), value)); list.add(new NameObject(Utils.objectToString(key), value));
} }

Loading…
Cancel
Save