From 89ab23bde27e3ad921a5c2f88851b9a262ca9d4e Mon Sep 17 00:00:00 2001
From: wuguolin <mispower@163.com>
Date: Tue, 23 Nov 2021 13:07:38 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .gitignore                                    |   3 +++
 backend/pom.xml                               |  20 +++++++++---------
 conf/data/ehcache/jdbc_provider_cache.index   | Bin 4 -> 0 bytes
 conf/data/ehcache/users_info.data             | Bin 763 -> 764 bytes
 conf/data/ehcache/users_info.index            | Bin 185 -> 185 bytes
 conf/data/ehcache/users_permissions_info.data | Bin 438 -> 455 bytes
 .../data/ehcache/users_permissions_info.index | Bin 185 -> 185 bytes
 conf/data/ehcache/users_roles_info.data       | Bin 485 -> 485 bytes
 conf/data/ehcache/users_roles_info.index      | Bin 185 -> 185 bytes
 conf/{smartbi.properties => ipsos.properties} |   0
 frontend/src/views/chart/view/ChartEdit.vue   |   4 ++--
 plugins/plugin-common/pom.xml                 |   2 +-
 plugins/pom.xml                               |  13 +++++++++---
 13 files changed, 26 insertions(+), 16 deletions(-)
 delete mode 100644 conf/data/ehcache/jdbc_provider_cache.index
 rename conf/{smartbi.properties => ipsos.properties} (100%)

diff --git a/.gitignore b/.gitignore
index dd0d793..677be40 100644
--- a/.gitignore
+++ b/.gitignore
@@ -56,3 +56,6 @@ pnpm-debug.log*
 
 
 package-lock.json
+
+
+conf/data/ehcache
\ No newline at end of file
diff --git a/backend/pom.xml b/backend/pom.xml
index 792dec7..24ea289 100644
--- a/backend/pom.xml
+++ b/backend/pom.xml
@@ -288,11 +288,11 @@
                 <configuration>
                     <addResources>true</addResources>
                     <excludes>
-                        <!--                        <exclude>-->
-                        <!--                            <groupId>org.projectlombok</groupId>-->
-                        <!--                            <artifactId>lombok</artifactId>-->
-                        <!--                            <version>1.18.18</version>-->
-                        <!--                        </exclude>-->
+<!--                        <exclude>-->
+<!--                            <groupId>org.projectlombok</groupId>-->
+<!--                            <artifactId>lombok</artifactId>-->
+
+<!--                        </exclude>-->
                         <exclude>
                             <groupId>org.springframework.boot</groupId>
                             <artifactId>spring-boot-configuration-processor</artifactId>
@@ -424,11 +424,11 @@
                 <updatePolicy>always</updatePolicy>
             </snapshots>
         </repository>
-<!--        <repository>-->
-<!--            <id>AliRepo-aliyun</id>-->
-<!--            <name>Alirepo.</name>-->
-<!--            <url>https://maven.aliyun.com/repository/public</url>-->
-<!--        </repository>-->
+        <!--        <repository>-->
+        <!--            <id>AliRepo-aliyun</id>-->
+        <!--            <name>Alirepo.</name>-->
+        <!--            <url>https://maven.aliyun.com/repository/public</url>-->
+        <!--        </repository>-->
     </repositories>
 
 </project>
diff --git a/conf/data/ehcache/jdbc_provider_cache.index b/conf/data/ehcache/jdbc_provider_cache.index
deleted file mode 100644
index 711006c3d3b5c6d50049e3f48311f3dbe372803d..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 4
LcmZ4UmVp%j1%Lsc

diff --git a/conf/data/ehcache/users_info.data b/conf/data/ehcache/users_info.data
index 4ebbea9ebe081cfe1c40111bff775cc84c77e924..8ffb46d1fb3b51cc1f3ecb18cd4095f54fa9bf54 100644
GIT binary patch
delta 40
ucmey(`iFJG5f*Q)Tl^bO6fko0CZ^<O<~bOe8S71UV%o?tr?eswh${d<G7m-o

delta 39
tcmeyv`kQsa5f+c4T(^xU3K+R~5>s+B^BfG#j3+xYZRD7JSU(YnD*!fi4=w-z

diff --git a/conf/data/ehcache/users_info.index b/conf/data/ehcache/users_info.index
index 372096f95bb129c883c79dc6faf216b1136cac34..5c379929a8cfb1778eaf090a1582e044cc1bd60b 100644
GIT binary patch
delta 39
ecmdnVxRY_hOa*VZ5C%-Z^rwV@wX`_3$PfUMI0p&<

delta 39
fcmdnVxRY_hOa+hLXEzuy0MqXh2G-Kz)FMLw!~6)h

diff --git a/conf/data/ehcache/users_permissions_info.data b/conf/data/ehcache/users_permissions_info.data
index f417eac0614641dc44e03a1805e4313e36f73c0a..e2b8837f559f9e0b4e06b21dca8217a15ad64fe2 100644
GIT binary patch
delta 56
zcmdnSe4Kg05f*Q)TNM*exUut;voJ6)@JtqEoGM$wz?WEBl96AOSyE|Ll$w}QQO=P#
Jr?diuD*zX*6T1Ka

delta 39
scmX@kyp4In5f+c4+{}q5+}OFxSr`}?xF?G;PUWd6=SZA=SRaHd00s{YH~;_u

diff --git a/conf/data/ehcache/users_permissions_info.index b/conf/data/ehcache/users_permissions_info.index
index ef1d63530fffa4de5ffc3a5c34a98013876a1af1..247bfaf84e3b30727cafa3ebfa1878be62c0fa4b 100644
GIT binary patch
delta 39
ecmdnVxRY_hOa*VZ5C%-Zc)WyxwX`_3$PfUKQ3lii

delta 39
fcmdnVxRY_hOa+hLXEzuy0OPh22G-Kz)FMLw!G#EM

diff --git a/conf/data/ehcache/users_roles_info.data b/conf/data/ehcache/users_roles_info.data
index b777d2a6987d9930e50e4922a60e21f12e0fce25..9fe4a58138393dacec9b0f92b1465469b37af765 100644
GIT binary patch
delta 24
ecmaFL{FHgZ5f*Q)TS^;Gh%$1_DXmBZ;tBwNs0tha

delta 24
ecmaFL{FHgZ5f+c4+~AETL>W0|AJ$I<;tBwO_zEom

diff --git a/conf/data/ehcache/users_roles_info.index b/conf/data/ehcache/users_roles_info.index
index 08b50a8ec697991840fec4f2c0f6df32d089adbc..e05054748ce69d4696fde7c4dc207b02b70efef1 100644
GIT binary patch
delta 14
VcmdnVxRY_hOcrmq5Qd3!WdJ5`1knHh

delta 14
WcmdnVxRY_hOcsycXE!F!l>q=QJ_dgP

diff --git a/conf/smartbi.properties b/conf/ipsos.properties
similarity index 100%
rename from conf/smartbi.properties
rename to conf/ipsos.properties
diff --git a/frontend/src/views/chart/view/ChartEdit.vue b/frontend/src/views/chart/view/ChartEdit.vue
index 64984b3..742b364 100644
--- a/frontend/src/views/chart/view/ChartEdit.vue
+++ b/frontend/src/views/chart/view/ChartEdit.vue
@@ -106,11 +106,11 @@
                       @change="save(true,'chart',true,true)"
                     >
                       <div class="chart-radio-div" style="width: 100%;display: flex;display: -webkit-flex;justify-content: space-between;flex-direction: row;flex-wrap: wrap;">
-                        <!-- <el-radio value="table-normal" label="table-normal">
+                        <el-radio value="table-normal" label="table-normal">
                           <span :title="$t('chart.chart_table_normal')">
                             <svg-icon icon-class="table-normal" class="chart-icon" />
                           </span>
-                        </el-radio> -->
+                        </el-radio>
                         <el-radio value="table-info" label="table-info">
                           <span :title="$t('chart.chart_table_info')">
                             <svg-icon icon-class="table-info" class="chart-icon" />
diff --git a/plugins/plugin-common/pom.xml b/plugins/plugin-common/pom.xml
index cb3948e..0843184 100644
--- a/plugins/plugin-common/pom.xml
+++ b/plugins/plugin-common/pom.xml
@@ -34,8 +34,8 @@
         <dependency>
             <groupId>org.projectlombok</groupId>
             <artifactId>lombok</artifactId>
+            <version>1.18.18</version>
         </dependency>
     </dependencies>
 
-
 </project>
diff --git a/plugins/pom.xml b/plugins/pom.xml
index e8b28b5..525e8ad 100644
--- a/plugins/pom.xml
+++ b/plugins/pom.xml
@@ -15,9 +15,9 @@
     </modules>
 
     <parent>
-        <artifactId>spring-boot-parent</artifactId>
-        <groupId>org.springframework.boot</groupId>
-        <version>2.3.4.RELEASE</version>
+        <artifactId>ipsos-bi-server</artifactId>
+        <groupId>com.ipsos</groupId>
+        <version>1.3.0</version>
     </parent>
 
     <dependencies>
@@ -92,6 +92,13 @@
                 <configuration>
                     <source>1.8</source>
                     <target>1.8</target>
+                    <annotationProcessorPaths>
+                        <path>
+                            <groupId>org.projectlombok</groupId>
+                            <artifactId>lombok</artifactId>
+                            <version>1.18.18</version>
+                        </path>
+                    </annotationProcessorPaths>
                 </configuration>
             </plugin>
         </plugins>