From ee67e4df638c289cfa0bd913fe91f0934a47108a Mon Sep 17 00:00:00 2001
From: kerry <kerry@fanruan.com>
Date: Tue, 16 May 2023 11:12:49 +0800
Subject: [PATCH 1/2] =?UTF-8?q?REPORT-96002=E3=80=90=E6=9D=A5=E6=BA=90?=
 =?UTF-8?q?=E5=AE=A2=E6=88=B7BUG=20REPORT-94898=E3=80=91FR11=E7=A8=8B?=
 =?UTF-8?q?=E5=BA=8F=E7=BD=91=E7=BB=9C=E6=8A=A5=E8=A1=A8=E7=9A=84demo?=
 =?UTF-8?q?=E7=B1=BB=EF=BC=8C=E6=9B=B4=E6=96=B0=E6=96=87=E6=A1=A3=E5=92=8C?=
 =?UTF-8?q?demo=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/fr/demo/SimpleReportletDemoFrm.java   | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/src/main/java/com/fr/demo/SimpleReportletDemoFrm.java b/src/main/java/com/fr/demo/SimpleReportletDemoFrm.java
index a3862fd..89edc9d 100644
--- a/src/main/java/com/fr/demo/SimpleReportletDemoFrm.java
+++ b/src/main/java/com/fr/demo/SimpleReportletDemoFrm.java
@@ -1,16 +1,15 @@
 package com.fr.demo;
 
-import java.util.Map;
-import javax.servlet.http.HttpServletRequest;
 
+import com.fr.form.main.DashboardTemplate;
 import com.fr.form.main.Form;
 import com.fr.form.main.FormIO;
 import com.fr.log.FineLoggerFactory;
 import com.fr.web.weblet.Formlet;
-
+import java.util.Map;
+import javax.servlet.http.HttpServletRequest;
 
 public class SimpleReportletDemoFrm extends Formlet {
-
     @Override
     public void setParameterMap(Map arg0) {
         // TODO Auto-generated method stub
@@ -18,17 +17,20 @@ public class SimpleReportletDemoFrm extends Formlet {
     }
 
     @Override
-    protected Form createForm(HttpServletRequest request) throws Exception {
+    protected DashboardTemplate createDashboard(HttpServletRequest req) throws Exception {
         Form form = null;
         //模板的相对路径
         String tplPath = "//doc//frm//决策报表入门.frm";
         this.setTplPath(tplPath);
+
         try {
             form = FormIO.readForm(tplPath);
         } catch (Exception e) {
             FineLoggerFactory.getLogger().error(e.getMessage(), e);
         }
+
         return form;
     }
 
-}
\ No newline at end of file
+
+}

From 7c9d423df1f750586df80f6b3d9a35ca5dad4c9b Mon Sep 17 00:00:00 2001
From: "Bruce.Deng" <bruce.deng@fanruan.com>
Date: Tue, 28 Nov 2023 14:53:20 +0800
Subject: [PATCH 2/2] =?UTF-8?q?REPORT-109627=20=E5=AF=BC=E5=87=BAapi?=
 =?UTF-8?q?=E4=BD=BF=E7=94=A8maven=E5=BC=95=E5=85=A5jar=E7=89=88=E6=9C=AC?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 plugin.xml |  3 ++-
 pom.xml    | 10 ++++++++--
 readme.md  |  9 ++++-----
 3 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/plugin.xml b/plugin.xml
index 879bd29..1019e12 100644
--- a/plugin.xml
+++ b/plugin.xml
@@ -4,12 +4,13 @@
     <name><![CDATA[文档demo代码集成]]></name>
     <active>yes</active>
     <hidden>no</hidden>
-    <version>1.1.1</version>
+    <version>1.1.2</version>
     <env-version>10.0~</env-version>
     <jartime>2018-08-02</jartime>
     <vendor>finereport</vendor>
     <description><![CDATA[集成帮助文档中的demo代码]]></description>
     <change-notes><![CDATA[
+        [2023-11-28] 插件适配11<br>
         [2018-01-25] 发布。<br>
         [2018-08-02] 插件适配10
         ]]></change-notes>
diff --git a/pom.xml b/pom.xml
index 61099db..7938f36 100644
--- a/pom.xml
+++ b/pom.xml
@@ -3,10 +3,10 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>com.fr.plugin</groupId>
     <artifactId>starter</artifactId>
-    <version>10.0</version>
+    <version>11.0</version>
     <packaging>pom</packaging>
     <properties>
-        <common-version>10.0-RELEASE-SNAPSHOT</common-version>
+        <common-version>11.0-RELEASE-SNAPSHOT</common-version>
         <web-inf-bucket>${project.basedir}/webroot/WEB-INF</web-inf-bucket>
     </properties>
     <dependencies>
@@ -28,6 +28,12 @@
             <version>${common-version}</version>
             <scope>compile</scope>
         </dependency>
+        <dependency>
+            <groupId>com.fr.cbb</groupId>
+            <artifactId>fine-cbb</artifactId>
+            <version>${common-version}</version>
+            <scope>compile</scope>
+        </dependency>
         <dependency>
             <groupId>com.fr.webui</groupId>
             <artifactId>fine-webui</artifactId>
diff --git a/readme.md b/readme.md
index fd6605a..c6f1ef9 100644
--- a/readme.md
+++ b/readme.md
@@ -19,8 +19,7 @@
 ## 修改依赖的jar版本
 只需要更改pom.xml中的common-version属性即可。
 
-|common-version|含义|
-|--------------|----|
-|10.0-RELEASE-SNAPSHOT|10.0的测试版本快照|
-|10.0-SNAPSHOT|10.0的正式版本快照|
-|10.0|10.0的正式版本|
\ No newline at end of file
+| common-version        | 含义          |
+|-----------------------|-------------|
+| 11.0-RELEASE-SNAPSHOT | 11.0的测试版本快照 |
+| 11.0-PERSIST-SNAPSHOT | 11.0的正式版本快照 |
\ No newline at end of file