From abf2dc974d3ccedfcfcf98f6913ea83cd76d0842 Mon Sep 17 00:00:00 2001 From: Bryant Date: Wed, 16 Mar 2022 10:17:39 +0800 Subject: [PATCH 1/2] =?UTF-8?q?REPORT-67131=20=E4=B9=8B=E5=89=8D=E6=9A=82?= =?UTF-8?q?=E5=AD=98=E5=9F=8B=E7=82=B9=E7=9A=84=E9=80=BB=E8=BE=91=E6=B2=A1?= =?UTF-8?q?=E4=BA=BA=E7=94=A8=E4=BA=86=EF=BC=8C=E5=8E=BB=E6=8E=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../record/analyzer/advice/MonitorAdvice.java | 15 ++++----------- 1 file changed, 4 insertions(+), 11 deletions(-) diff --git a/designer-base/src/main/java/com/fr/design/record/analyzer/advice/MonitorAdvice.java b/designer-base/src/main/java/com/fr/design/record/analyzer/advice/MonitorAdvice.java index 607c80619..a459d0841 100644 --- a/designer-base/src/main/java/com/fr/design/record/analyzer/advice/MonitorAdvice.java +++ b/designer-base/src/main/java/com/fr/design/record/analyzer/advice/MonitorAdvice.java @@ -9,6 +9,7 @@ import com.fr.intelli.record.Measurable; import com.fr.intelli.record.MeasureObject; import com.fr.intelli.record.MeasureUnit; import com.fr.intelli.record.MetricRegistry; +import com.fr.log.FineLoggerFactory; import com.fr.measure.DBMeterFactory; import com.fr.stable.ArrayUtils; import com.fr.stable.StringUtils; @@ -79,25 +80,17 @@ public class MonitorAdvice implements DesignerAnalyzerAdvice { List newArgs = new ArrayList<>(Arrays.asList(args)); newArgs.add(id); recordSQLDetail(id); - String sessionID = null; - SessionProvider provider = SessionLocalManager.getSession(); - if (provider != null) { - sessionID = provider.getSessionID(); - } if (measurable instanceof Estimator) { measurable.asyncDurable(measureObject, newArgs.toArray()); } else { - Object message; + Object message = null; try { message = measurable.durableEntity(measureObject, newArgs.toArray()); } catch (Throwable throwable) { - //埋点生成失败，降级逻辑 - message = measurable.fallBackEntity(); + FineLoggerFactory.getLogger().error(throwable.getMessage(), throwable); } - if (StringUtils.isEmpty(sessionID)) { + if (message != null) { MetricRegistry.getMetric().submit(message); - } else { - MetricRegistry.getMetric().submitAccumulativeData(sessionID, message); } } } From e955d041f49385302e5c1f03249739470afee24c Mon Sep 17 00:00:00 2001 From: "Bruce.Deng" Date: Wed, 16 Mar 2022 10:40:12 +0800 Subject: [PATCH 2/2] =?UTF-8?q?REPORT-67466=20&=20REPORT-67467=20=E3=80=90?= =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=A4=A7=E6=96=87=E6=9C=AC=E3=80=91=E8=AE=BE?= =?UTF-8?q?=E8=AE=A1=E5=99=A8=E5=86=85=E5=8F=96=E6=B6=88=E5=8B=BE=E9=80=89?= =?UTF-8?q?=E6=96=87=E6=9C=AC=E8=B6=85=E5=87=BA=E9=9A=90=E8=97=8F=E5=90=8E?= =?UTF-8?q?=E5=A4=9A=E6=AC=A1=E7=82=B9=E5=87=BB=E5=8D=95=E5=85=83=E6=A0=BC?= =?UTF-8?q?=E5=B8=A6=E5=87=BA=E6=9D=A5=E7=9A=84=E8=AE=BE=E7=BD=AE=E4=B8=8D?= =?UTF-8?q?=E4=B8=80=E8=87=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../design/mainframe/cell/settingpane/CellOtherSetPane.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/designer-realize/src/main/java/com/fr/design/mainframe/cell/settingpane/CellOtherSetPane.java b/designer-realize/src/main/java/com/fr/design/mainframe/cell/settingpane/CellOtherSetPane.java index 99a0d9bf4..eeaf8f920 100644 --- a/designer-realize/src/main/java/com/fr/design/mainframe/cell/settingpane/CellOtherSetPane.java +++ b/designer-realize/src/main/java/com/fr/design/mainframe/cell/settingpane/CellOtherSetPane.java @@ -553,9 +553,9 @@ public class CellOtherSetPane extends AbstractCellAttrPane { textOverflowTypeComboBox.setSelectedItem(Toolkit.i18nText("Fine-Design_Report_CellWrite_TextOverflow_NoneSymbol")); } } else { - showPartComboBox.setSelectedIndex(0); + showPartComboBox.setSelectedIndex(cellGUIAttr.isShowCharNum() ? 0 : 1); showCharNums.setValue(cellGUIAttr.getShowCharNums()); - textOverflowTypeComboBox.setSelectedIndex(0); + textOverflowTypeComboBox.setSelectedIndex(cellGUIAttr.isTextOverflowEllipsis() ? 0 : 1); textOverflowCheckBox.setSelected(false); } CellPageAttr cellPageAttr = cellElement.getCellPageAttr(); // 分页