Browse Source

REPORT-126587 FBP适配测试-设计器-设置中没有内置服务器相关选项

fbp-1.0
Destiny.Lin 5 months ago
parent
commit
610c27fe84
  1. 2
      designer-base/src/main/java/com/fr/design/env/HttpWorkspaceConnector.java
  2. 2
      designer-base/src/main/java/com/fr/env/handler/impl/CancelHandler.java

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

@ -1,6 +1,7 @@
package com.fr.design.env; package com.fr.design.env;
import com.fanruan.workplace.http.HttpConstants; import com.fanruan.workplace.http.HttpConstants;
import com.fanruan.workplace.http.RepositoryManager;
import com.fr.stable.StringUtils; import com.fr.stable.StringUtils;
import com.fr.workspace.server.repository.authority.RemoteAuthorityRepository; import com.fr.workspace.server.repository.authority.RemoteAuthorityRepository;
import com.fr.workspace.server.repository.compatible.register.CompatibleRegister; import com.fr.workspace.server.repository.compatible.register.CompatibleRegister;
@ -64,6 +65,7 @@ public class HttpWorkspaceConnector implements WorkspaceConnector {
} }
client.startHeartBeat(); client.startHeartBeat();
CompatibleRegister.registerCompatibleEnv(); CompatibleRegister.registerCompatibleEnv();
RepositoryManager.getInstance().clearLastPool();
return client; return client;
} }

2
designer-base/src/main/java/com/fr/env/handler/impl/CancelHandler.java vendored

@ -1,5 +1,6 @@
package com.fr.env.handler.impl; package com.fr.env.handler.impl;
import com.fanruan.workplace.http.RepositoryManager;
import com.fr.env.handler.Handler; import com.fr.env.handler.Handler;
import com.fr.env.handler.RefWrapper; import com.fr.env.handler.RefWrapper;
import com.fr.env.handler.ResultWrapper; import com.fr.env.handler.ResultWrapper;
@ -17,6 +18,7 @@ public class CancelHandler implements Handler<RefWrapper, ResultWrapper> {
@Override @Override
public ResultWrapper handle(RefWrapper wrapper) { public ResultWrapper handle(RefWrapper wrapper) {
Throwable e = wrapper.getThrowable(); Throwable e = wrapper.getThrowable();
RepositoryManager.getInstance().rollBack();
return new ResultWrapper(!(e instanceof CancellationException), e); return new ResultWrapper(!(e instanceof CancellationException), e);
} }
} }

Loading…
Cancel
Save