Browse Source

KERNEL-7634 mac和win使用不同版本的jxbrowser fix 登录名获取方式

feature/10.0
hades 3 years ago
parent
commit
f8b37438f9
  1. 6
      designer-base/src/main/java/com/fr/design/upm/NewUpmBridge.java

6
designer-base/src/main/java/com/fr/design/upm/NewUpmBridge.java

@ -1,7 +1,7 @@
package com.fr.design.upm; package com.fr.design.upm;
import com.fr.config.MarketConfig;
import com.fr.decision.webservice.v10.plugin.helper.category.impl.UpmResourceLoader; import com.fr.decision.webservice.v10.plugin.helper.category.impl.UpmResourceLoader;
import com.fr.design.DesignerEnvManager;
import com.fr.design.bridge.exec.JSBridge; import com.fr.design.bridge.exec.JSBridge;
import com.fr.design.bridge.exec.JSCallback; import com.fr.design.bridge.exec.JSCallback;
import com.fr.design.extra.PluginOperateUtils; import com.fr.design.extra.PluginOperateUtils;
@ -411,7 +411,7 @@ public class NewUpmBridge extends UpmBridge {
@JsAccessible @JsAccessible
public String getLoginInfo(final JsFunction callback) { public String getLoginInfo(final JsFunction callback) {
registerLoginInfo(callback); registerLoginInfo(callback);
return MarketConfig.getInstance().getBbsUsername(); return DesignerEnvManager.getEnvManager().getDesignerLoginUsername();
} }
/** /**
@ -423,7 +423,7 @@ public class NewUpmBridge extends UpmBridge {
@JsAccessible @JsAccessible
public void registerLoginInfo(final JsFunction callback) { public void registerLoginInfo(final JsFunction callback) {
JSCallback jsCallback = new JSCallback(NewUpmBrowserExecutor.create(jsObject, callback)); JSCallback jsCallback = new JSCallback(NewUpmBrowserExecutor.create(jsObject, callback));
String username = MarketConfig.getInstance().getBbsUsername(); String username = DesignerEnvManager.getEnvManager().getDesignerLoginUsername();
if (StringUtils.isEmpty(username)) { if (StringUtils.isEmpty(username)) {
jsCallback.execute(StringUtils.EMPTY); jsCallback.execute(StringUtils.EMPTY);
EventDispatcher.fire(CertificateEvent.LOGOUT, StringUtils.EMPTY); EventDispatcher.fire(CertificateEvent.LOGOUT, StringUtils.EMPTY);

Loading…
Cancel
Save