Browse Source

Merge pull request #6017 in DESIGN/design from final/11.0 to release/11.0

* commit '6ba243a75252fda49bc5d33b20edfe840f3f125e':
  Update designer-base/src/main/java/com/fr/design/update/ui/dialog/UpdateMainDialog.java
  Update designer-base/src/main/java/com/fr/design/update/push/DesignerPushUpdateManager.java
  REPORT-59770 【主题切换】编辑主题时,主题配色修改以后,细节配置和整体预览里的颜色没有相应联动
bugfix/11.0
superman 3 years ago
parent
commit
e98af599cd
  1. 2
      designer-base/src/main/java/com/fr/design/update/push/DesignerPushUpdateManager.java
  2. 2
      designer-base/src/main/java/com/fr/design/update/ui/dialog/UpdateMainDialog.java

2
designer-base/src/main/java/com/fr/design/update/push/DesignerPushUpdateManager.java

@ -60,7 +60,7 @@ public class DesignerPushUpdateManager {
private String getFullLatestVersion() { private String getFullLatestVersion() {
try { try {
String url = CloudCenter.getInstance().acquireUrlByKind("jar10.update"); String url = CloudCenter.getInstance().acquireUrlByKind("jar11.update");
if(StringUtils.isBlank(url)){ if(StringUtils.isBlank(url)){
return StringUtils.EMPTY; return StringUtils.EMPTY;
} }

2
designer-base/src/main/java/com/fr/design/update/ui/dialog/UpdateMainDialog.java

@ -350,7 +350,7 @@ public class UpdateMainDialog extends UIDialog {
new SwingWorker<JSONObject, Void>() { new SwingWorker<JSONObject, Void>() {
@Override @Override
protected JSONObject doInBackground() throws Exception { protected JSONObject doInBackground() throws Exception {
return new JSONObject(HttpToolbox.get(CloudCenter.getInstance().acquireUrlByKind("jar10.update"))); return new JSONObject(HttpToolbox.get(CloudCenter.getInstance().acquireUrlByKind("jar11.update")));
} }
@Override @Override

Loading…
Cancel
Save