Browse Source

Pull request #17155: fix: 扩展图表插件场景地图无法使用自签名证书远程https环境 #REPORT-151829 && fix: 提供内嵌浏览器启动参数配置方案 #REPORT-125730

Merge in DESIGN/design from ~ZHENG/c-design:release/11.0 to release/11.0

* commit '0ac9502022733947a82b723345a7a55fe8f51ca9':
  fix: 代码质量 #none
  fix: 提供内嵌浏览器启动参数配置方案 #REPORT-125730
  fix: 扩展图表插件场景地图无法使用自签名证书远程https环境 #REPORT-151829
release/11.0
zheng-郑潇 1 month ago
parent
commit
79e9115357
  1. 8
      designer-base/src/main/java/com/fr/design/jxbrowser/JxEngine.java

8
designer-base/src/main/java/com/fr/design/jxbrowser/JxEngine.java

@ -39,6 +39,7 @@ import java.util.Map;
* Created on 2023/6/8
*/
public class JxEngine {
private static final String SPLIT = ";";
private static final JxEngine INSTANCE = new JxEngine();
@ -53,6 +54,10 @@ public class JxEngine {
.addSwitch("--disable-google-traffic")
.addScheme(Scheme.of(ModernUIConstants.EMB_TAG),
new NxInterceptRequestCallback(this::getComponent, this::getParameterMap));
String options = System.getProperty("jxbrowser.chrome.setup.options");
for (String s : options.split(SPLIT)) {
builder.addSwitch(s);
}
if (disableWebSecurity) {
builder.addSwitch("--disable-web-security");
}
@ -72,7 +77,8 @@ public class JxEngine {
FineLoggerFactory.getLogger().error("jxBrowser engine crashed with exitCode: {}", event.exitCode());
event.engine().close();
});
if (DesignerEnvManager.getEnvManager().isOpenDebug()) {
if (DesignerEnvManager.getEnvManager().isOpenDebug()
|| Boolean.parseBoolean(System.getProperty("jxbrowser.verify.vertificate.prohibit"))) {
// 调试模式下,禁止HTTPS证书验证,使得可以正常访问商城测试服务器等
Network network = engine.network();
network.set(VerifyCertificateCallback.class, params -> VerifyCertificateCallback.Response.valid());

Loading…
Cancel
Save