From 331d0613585a475140cd42e344e5a21c8ce7530b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=88=98=E6=B3=BD=E7=92=8B?=
 <2833784085@qq.com@user.noreply.gitee.com>
Date: Tue, 25 Jun 2024 10:30:31 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B5=8B=E8=AF=95=E8=BF=9E=E6=8E=A5redis?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .idea/dataSources.local.xml                   |   1 -
 .idea/workspace.xml                           |  82 +++++++++----
 .../etl/data/source/common/config/Limit.java  |  26 ++++
 .../data/source/common/config/RedisLimit.java |  35 ------
 .../etl/data/source/common/pojo/Person.java   |  23 ++++
 .../etl/data/source/common/config/Limit.class | Bin 0 -> 732 bytes
 .../source/common/config/RedisLimit.class     | Bin 846 -> 0 bytes
 .../etl/data/source/common/pojo/Person.class  | Bin 0 -> 2059 bytes
 .../data/source/server/aop/LimitAspect.java   |  52 ++++++++
 .../source/server/aop/RedisLimitAspect.java   | 115 ------------------
 .../source/server/config/RedisConfig.java     |  13 --
 .../source/server/config/RedissonConfig.java  |  17 +++
 .../server/controller/DatabaseController.java |   4 +-
 .../ElDataSourceServerApplicationTests.java   |  75 ++++++++----
 .../data/source/server/aop/LimitAspect.class  | Bin 0 -> 3238 bytes
 .../server/aop/RedisLimitAspect$1.class       | Bin 797 -> 0 bytes
 .../source/server/aop/RedisLimitAspect.class  | Bin 6399 -> 0 bytes
 .../source/server/config/RedisConfig.class    | Bin 2404 -> 1468 bytes
 .../source/server/config/RedissonConfig.class | Bin 1442 -> 2330 bytes
 .../controller/DatabaseController.class       | Bin 4104 -> 4130 bytes
 ...aSourceServerApplicationTests$Person.class | Bin 0 -> 1055 bytes
 .../ElDataSourceServerApplicationTests.class  | Bin 1800 -> 2213 bytes
 22 files changed, 227 insertions(+), 216 deletions(-)
 create mode 100644 etl-data-source/el-data-source-common/src/main/java/com/etl/data/source/common/config/Limit.java
 delete mode 100644 etl-data-source/el-data-source-common/src/main/java/com/etl/data/source/common/config/RedisLimit.java
 create mode 100644 etl-data-source/el-data-source-common/src/main/java/com/etl/data/source/common/pojo/Person.java
 create mode 100644 etl-data-source/el-data-source-common/target/classes/com/etl/data/source/common/config/Limit.class
 delete mode 100644 etl-data-source/el-data-source-common/target/classes/com/etl/data/source/common/config/RedisLimit.class
 create mode 100644 etl-data-source/el-data-source-common/target/classes/com/etl/data/source/common/pojo/Person.class
 create mode 100644 etl-data-source/el-data-source-server/src/main/java/com/etl/data/source/server/aop/LimitAspect.java
 delete mode 100644 etl-data-source/el-data-source-server/src/main/java/com/etl/data/source/server/aop/RedisLimitAspect.java
 create mode 100644 etl-data-source/el-data-source-server/target/classes/com/etl/data/source/server/aop/LimitAspect.class
 delete mode 100644 etl-data-source/el-data-source-server/target/classes/com/etl/data/source/server/aop/RedisLimitAspect$1.class
 delete mode 100644 etl-data-source/el-data-source-server/target/classes/com/etl/data/source/server/aop/RedisLimitAspect.class
 create mode 100644 etl-data-source/el-data-source-server/target/test-classes/com/etl/data/source/server/ElDataSourceServerApplicationTests$Person.class

diff --git a/.idea/dataSources.local.xml b/.idea/dataSources.local.xml
index 1202416..cdd8ac8 100644
--- a/.idea/dataSources.local.xml
+++ b/.idea/dataSources.local.xml
@@ -5,7 +5,6 @@
       <database-info product="MySQL" version="5.7.44" jdbc-version="4.2" driver-name="MySQL Connector/J" driver-version="mysql-connector-java-8.0.25 (Revision: 08be9e9b4cba6aa115f9b27b215887af40b159e0)" dbms="MYSQL" exact-version="5.7.44" exact-driver-version="8.0">
         <extra-name-characters>#@</extra-name-characters>
         <identifier-quote-string>`</identifier-quote-string>
-        <jdbc-catalog-is-schema>true</jdbc-catalog-is-schema>
       </database-info>
       <case-sensitivity plain-identifiers="lower" quoted-identifiers="lower" />
       <secret-storage>master_key</secret-storage>
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 956567a..fb241fd 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -5,7 +5,28 @@
   </component>
   <component name="ChangeListManager">
     <list default="true" id="e53020f6-f301-415a-a26a-d22b9ac05907" name="更改" comment="集成easycode">
+      <change afterPath="$PROJECT_DIR$/etl-data-source/el-data-source-common/src/main/java/com/etl/data/source/common/config/Limit.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/etl-data-source/el-data-source-common/src/main/java/com/etl/data/source/common/pojo/Person.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/etl-data-source/el-data-source-common/target/classes/com/etl/data/source/common/config/Limit.class" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/etl-data-source/el-data-source-common/target/classes/com/etl/data/source/common/pojo/Person.class" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/etl-data-source/el-data-source-server/src/main/java/com/etl/data/source/server/aop/LimitAspect.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/etl-data-source/el-data-source-server/target/classes/com/etl/data/source/server/aop/LimitAspect.class" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/etl-data-source/el-data-source-server/target/test-classes/com/etl/data/source/server/ElDataSourceServerApplicationTests$Person.class" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/dataSources.local.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/dataSources.local.xml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/etl-data-source/el-data-source-common/src/main/java/com/etl/data/source/common/config/RedisLimit.java" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/etl-data-source/el-data-source-common/target/classes/com/etl/data/source/common/config/RedisLimit.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/etl-data-source/el-data-source-server/src/main/java/com/etl/data/source/server/aop/RedisLimitAspect.java" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/etl-data-source/el-data-source-server/src/main/java/com/etl/data/source/server/config/RedisConfig.java" beforeDir="false" afterPath="$PROJECT_DIR$/etl-data-source/el-data-source-server/src/main/java/com/etl/data/source/server/config/RedisConfig.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/etl-data-source/el-data-source-server/src/main/java/com/etl/data/source/server/config/RedissonConfig.java" beforeDir="false" afterPath="$PROJECT_DIR$/etl-data-source/el-data-source-server/src/main/java/com/etl/data/source/server/config/RedissonConfig.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/etl-data-source/el-data-source-server/src/main/java/com/etl/data/source/server/controller/DatabaseController.java" beforeDir="false" afterPath="$PROJECT_DIR$/etl-data-source/el-data-source-server/src/main/java/com/etl/data/source/server/controller/DatabaseController.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/etl-data-source/el-data-source-server/src/test/java/com/etl/data/source/server/ElDataSourceServerApplicationTests.java" beforeDir="false" afterPath="$PROJECT_DIR$/etl-data-source/el-data-source-server/src/test/java/com/etl/data/source/server/ElDataSourceServerApplicationTests.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/etl-data-source/el-data-source-server/target/classes/com/etl/data/source/server/aop/RedisLimitAspect$1.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/etl-data-source/el-data-source-server/target/classes/com/etl/data/source/server/aop/RedisLimitAspect.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/etl-data-source/el-data-source-server/target/classes/com/etl/data/source/server/config/RedisConfig.class" beforeDir="false" afterPath="$PROJECT_DIR$/etl-data-source/el-data-source-server/target/classes/com/etl/data/source/server/config/RedisConfig.class" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/etl-data-source/el-data-source-server/target/classes/com/etl/data/source/server/config/RedissonConfig.class" beforeDir="false" afterPath="$PROJECT_DIR$/etl-data-source/el-data-source-server/target/classes/com/etl/data/source/server/config/RedissonConfig.class" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/etl-data-source/el-data-source-server/target/classes/com/etl/data/source/server/controller/DatabaseController.class" beforeDir="false" afterPath="$PROJECT_DIR$/etl-data-source/el-data-source-server/target/classes/com/etl/data/source/server/controller/DatabaseController.class" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/etl-data-source/el-data-source-server/target/test-classes/com/etl/data/source/server/ElDataSourceServerApplicationTests.class" beforeDir="false" afterPath="$PROJECT_DIR$/etl-data-source/el-data-source-server/target/test-classes/com/etl/data/source/server/ElDataSourceServerApplicationTests.class" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -62,7 +83,7 @@
     "WebServerToolWindowFactoryState": "false",
     "git-widget-placeholder": "main",
     "jdk.selected.JAVA_MODULE": "1.8",
-    "last_opened_file_path": "D:/workspace/etl-cloud/etl-heihei/src/main/java",
+    "last_opened_file_path": "D:/workspace/etl-cloud/etl-data-source/el-data-source-common/src/main/java/com/etl/data/source/common",
     "node.js.detected.package.eslint": "true",
     "node.js.detected.package.tslint": "true",
     "node.js.selected.package.eslint": "(autodetect)",
@@ -72,7 +93,7 @@
     "project.structure.proportion": "0.17",
     "project.structure.side.proportion": "0.29885057",
     "settings.editor.selected.configurable": "preferences.lookFeel",
-    "spring.configuration.checksum": "21940204b7449cbc44619bf9f15c4b27",
+    "spring.configuration.checksum": "1d871ffdc938601b3b3345b2b129e57c",
     "vue.rearranger.settings.migration": "true"
   },
   "keyToStringList": {
@@ -91,6 +112,7 @@
       <recent name="com.etl.data.source.server.service" />
     </key>
     <key name="CopyFile.RECENT_KEYS">
+      <recent name="D:\workspace\etl-cloud\etl-data-source\el-data-source-common\src\main\java\com\etl\data\source\common" />
       <recent name="D:\workspace\etl-cloud\etl-common\src\main" />
       <recent name="D:\workspace\etl-cloud\etl-data-source\el-data-source-server\src\main" />
       <recent name="D:\workspace\etl-cloud\etl-data-source\src\main" />
@@ -100,6 +122,10 @@
       <recent name="com.etl.data.source.server" />
       <recent name="com.etl.data.source" />
     </key>
+    <key name="CopyClassDialog.RECENTS_KEY">
+      <recent name="com.etl.data.source.server.service" />
+      <recent name="com.etl.data.source.server.service.impl" />
+    </key>
   </component>
   <component name="RunDashboard">
     <option name="configurationTypes">
@@ -108,7 +134,20 @@
       </set>
     </option>
   </component>
-  <component name="RunManager" selected="Spring Boot.CarApplication">
+  <component name="RunManager" selected="应用程序.ElDataSourceServerApplicationTests">
+    <configuration name="ElDataSourceServerApplicationTests" type="Application" factoryName="Application" temporary="true" nameIsGenerated="true">
+      <option name="MAIN_CLASS_NAME" value="com.etl.data.source.server.ElDataSourceServerApplicationTests" />
+      <module name="el-data-source-server" />
+      <extension name="coverage">
+        <pattern>
+          <option name="PATTERN" value="com.etl.data.source.server.*" />
+          <option name="ENABLED" value="true" />
+        </pattern>
+      </extension>
+      <method v="2">
+        <option name="Make" enabled="true" />
+      </method>
+    </configuration>
     <configuration name="Main" type="Application" factoryName="Application" temporary="true" nameIsGenerated="true">
       <option name="MAIN_CLASS_NAME" value="com.Main" />
       <module name="etl-heihei" />
@@ -122,22 +161,6 @@
         <option name="Make" enabled="true" />
       </method>
     </configuration>
-    <configuration name="ElDataSourceServerApplicationTests.contextLoads (1)" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
-      <module name="el-data-source-server" />
-      <extension name="coverage">
-        <pattern>
-          <option name="PATTERN" value="com.etl.data.source.server.*" />
-          <option name="ENABLED" value="true" />
-        </pattern>
-      </extension>
-      <option name="PACKAGE_NAME" value="com.etl.data.source.server" />
-      <option name="MAIN_CLASS_NAME" value="com.etl.data.source.server.ElDataSourceServerApplicationTests" />
-      <option name="METHOD_NAME" value="contextLoads" />
-      <option name="TEST_OBJECT" value="method" />
-      <method v="2">
-        <option name="Make" enabled="true" />
-      </method>
-    </configuration>
     <configuration name="ElDataSourceServerApplicationTests.contextLoads" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
       <module name="el-data-source-server" />
       <extension name="coverage">
@@ -183,11 +206,11 @@
     </configuration>
     <recent_temporary>
       <list>
+        <item itemvalue="应用程序.ElDataSourceServerApplicationTests" />
+        <item itemvalue="Spring Boot.ElDataSourceServerApplication" />
         <item itemvalue="Spring Boot.CarApplication" />
         <item itemvalue="应用程序.Main" />
-        <item itemvalue="Spring Boot.ElDataSourceServerApplication" />
         <item itemvalue="JUnit.ElDataSourceServerApplicationTests.contextLoads" />
-        <item itemvalue="JUnit.ElDataSourceServerApplicationTests.contextLoads (1)" />
       </list>
     </recent_temporary>
   </component>
@@ -209,7 +232,8 @@
       <workItem from="1719026241976" duration="9213000" />
       <workItem from="1719104447484" duration="9376000" />
       <workItem from="1719188994279" duration="10247000" />
-      <workItem from="1719215606901" duration="7883000" />
+      <workItem from="1719215606901" duration="11291000" />
+      <workItem from="1719275369526" duration="6275000" />
     </task>
     <task id="LOCAL-00001" summary="第一次">
       <option name="closed" value="true" />
@@ -235,7 +259,15 @@
       <option name="project" value="LOCAL" />
       <updated>1719229225799</updated>
     </task>
-    <option name="localTasksCounter" value="4" />
+    <task id="LOCAL-00004" summary="集成easycode">
+      <option name="closed" value="true" />
+      <created>1719230664247</created>
+      <option name="number" value="00004" />
+      <option name="presentableId" value="LOCAL-00004" />
+      <option name="project" value="LOCAL" />
+      <updated>1719230664247</updated>
+    </task>
+    <option name="localTasksCounter" value="5" />
     <servers />
   </component>
   <component name="TypeScriptGeneratedFilesManager">
@@ -257,4 +289,8 @@
     <MESSAGE value="集成easycode" />
     <option name="LAST_COMMIT_MESSAGE" value="集成easycode" />
   </component>
+  <component name="XSLT-Support.FileAssociations.UIState">
+    <expand />
+    <select />
+  </component>
 </project>
\ No newline at end of file
diff --git a/etl-data-source/el-data-source-common/src/main/java/com/etl/data/source/common/config/Limit.java b/etl-data-source/el-data-source-common/src/main/java/com/etl/data/source/common/config/Limit.java
new file mode 100644
index 0000000..bb4d2ea
--- /dev/null
+++ b/etl-data-source/el-data-source-common/src/main/java/com/etl/data/source/common/config/Limit.java
@@ -0,0 +1,26 @@
+package com.etl.data.source.common.config;
+
+import java.lang.annotation.*;
+import java.util.concurrent.TimeUnit;
+
+@Retention(RetentionPolicy.RUNTIME)
+@Target({ElementType.METHOD})
+@Documented
+public @interface Limit {
+
+    // 资源key
+    String key() default "";
+
+    // 最多访问次数
+    double permitsPerSecond();
+
+    // 时间
+    long timeout();
+
+    // 时间类型
+    TimeUnit timeunit() default TimeUnit.MILLISECONDS;
+
+    // 提示信息
+    String msg() default "系统繁忙,请稍后再试";
+
+}
diff --git a/etl-data-source/el-data-source-common/src/main/java/com/etl/data/source/common/config/RedisLimit.java b/etl-data-source/el-data-source-common/src/main/java/com/etl/data/source/common/config/RedisLimit.java
deleted file mode 100644
index 532d7d8..0000000
--- a/etl-data-source/el-data-source-common/src/main/java/com/etl/data/source/common/config/RedisLimit.java
+++ /dev/null
@@ -1,35 +0,0 @@
-package com.etl.data.source.common.config;
-
-
-import com.etl.data.source.common.ennum.LimitType;
-
-import java.lang.annotation.*;
-
-@Target({ElementType.METHOD,ElementType.TYPE})
-@Retention(RetentionPolicy.RUNTIME)
-@Inherited
-@Documented
-public @interface RedisLimit {
-
-    // 资源名称
-    String name() default "";
-
-    // 资源key
-    String key() default "";
-
-    // 前缀
-    String prefix() default "";
-
-    // 时间
-    int period();
-
-    // 最多访问次数
-    int count();
-
-    // 类型
-    LimitType limitType() default LimitType.CUSTOM;
-
-    // 提示信息
-    String msg() default "系统繁忙,请稍后再试";
-
-}
diff --git a/etl-data-source/el-data-source-common/src/main/java/com/etl/data/source/common/pojo/Person.java b/etl-data-source/el-data-source-common/src/main/java/com/etl/data/source/common/pojo/Person.java
new file mode 100644
index 0000000..507534f
--- /dev/null
+++ b/etl-data-source/el-data-source-common/src/main/java/com/etl/data/source/common/pojo/Person.java
@@ -0,0 +1,23 @@
+package com.etl.data.source.common.pojo;
+
+import io.swagger.models.auth.In;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import javax.validation.constraints.NotNull;
+
+/**
+ * @ClassName Persion
+ * @Description 描述
+ * @Author ZeZhang.Liu
+ * @Date 2024/6/25 9:32
+ */
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+public class Person {
+    private String name;
+
+    private Integer age;
+}
diff --git a/etl-data-source/el-data-source-common/target/classes/com/etl/data/source/common/config/Limit.class b/etl-data-source/el-data-source-common/target/classes/com/etl/data/source/common/config/Limit.class
new file mode 100644
index 0000000000000000000000000000000000000000..e1414a78130c594f1d139291aecbed840995d90e
GIT binary patch
literal 732
zcmah{J8u&~5dJofb0GxsAUpyIPAKw_5ZlmEA#8+^9Y?+k4b|p6Ic?b6i|+O!xul^B
zqM@LorAtA9AQJTa56k%#h&l7H3k!<X?96`O%<MPw{l}ND0PbVW!>Whd9x4K*7t|G4
z+S+a$s$(UMvXS&%s%`W@VBw*)iBnD|wn_&oH%<To^GB4%+GV?x`V=O%!)dm*s{)?W
zF(o;p*ncW8UHG}x99aKTA$QtHCWU#Ll65j*$R0zuT;*2}|3J((>y1X;uRUt*RDG@z
zXOX~4|KnNz?0x_9%igzlch65h^*@~S-n{O;IypamD=_0Hc^cAVZHS$Q=FaaGe-&76
z=eFqZna=dSq2XsUfwd7m)L#{3n;bXIdT_htV`XyAx$z(9Zen!UWrEk<+X?E;n!xIK
zN}$q+3MKB0f3F#exqQ$)A_h%0Yr&Hi%f3DyT}{HgfK!LTn_&`5az=KPQ!*P!!efZz
z#1_*y(2*QS!_yruLTmq!LLOda7#h)HsMm(zt(f3b;{7U53QVHR-V}SK3?2ujaRFdE
zgNp+@i%Y)&Wx{35@zeY$XMxi#GJOJ9u*9~)sjo8Q8sR!_V7a(HhalX<Evx`P0S1QA
AA^-pY

literal 0
HcmV?d00001

diff --git a/etl-data-source/el-data-source-common/target/classes/com/etl/data/source/common/config/RedisLimit.class b/etl-data-source/el-data-source-common/target/classes/com/etl/data/source/common/config/RedisLimit.class
deleted file mode 100644
index 40ea670e12379d7f76b47bd7f5302216f39f94a5..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 846
zcmb7CyKWOf6g}g_-XuKoAUpyIc_2lOWMvvUDuj)&6ywO=AR(&Bdc2viI}`2BM!2M*
z3!<T*qNPhgfglp}{D<Xy1>){1uvTP1G&?(I&N=t$-245<m#+Zs;*NtA2dfU&7{;{-
zCBuAqV{2a=3LXgU^R|tY_U|#w-q+e#VU^KU*%e7(8Ne|1T=p1B2a)Wm7wM0Tl<5#&
z-l#JaJ(Fl6P6jGe*6kgT|0el+Cgjovyd$jOu}LCNa>7ERxzsud`PMH!Rj&LWz4TzG
z?KT_KLKyoDi-V6RgOm4z&oBGm-c?SIKMg({_20bizdAZSe#<b`&Z<9D0kt;Wk{uOi
zwKvlU7#3R8zY66O6|3Dq<{88cOG7b<-{EjqM834tckxgJ3AwI~=G6ijN}Yv5<Wi&N
zK5ABJ3hvYG8pFzHQA=9V&<sej{twEw36$3(qSM-W?A9B9cCG6@8k?0JBCn2itr{;$
z+s!zYzs%1wx~qJiC&@6AuTyh(UwX6<%Q-X@T^{c`qunZ``$cQ&j8iNq(yc_du{Z-J
z&I6O@fhk-7NP6+?yoAeV7Db6^%+S;9ux5@5UZDa7%;PGZWh#1&6xW}jAaMf=>E|YH
OrI5rTmT;R`%fL_8d+VkE

diff --git a/etl-data-source/el-data-source-common/target/classes/com/etl/data/source/common/pojo/Person.class b/etl-data-source/el-data-source-common/target/classes/com/etl/data/source/common/pojo/Person.class
new file mode 100644
index 0000000000000000000000000000000000000000..05db51a20ee6b434b048f9a6a28f64f34e4e2654
GIT binary patch
literal 2059
zcma)7TT>%N6#hChlbM8J30VR}QP~xDb7SKLFNBNkg=JX@i(qY)J~@Ob5)2tk27in{
zKwfyzDmPoDRhGW2Rr?$K89utMUw2O+1Rk~m-KS5V%XhxhCwczgufGGB!&U+YmgVxP
zjn9(YZ_DLQ5^3C((mg4y*tnlW0;>)l$bHShL%DzMU|sH2X|!r%L%?i#2fjdhec$`u
zD>uE?UU@rgH(GlO0*1H8tE+uiYpu}V^V__$_xx}}xsK)XeHN$A=G|bI-XrUcmcMay
zu;aJC^mdvmRZ#PqkG*z7o+G6h)*Bsx+<GlIDEncvyz7Ntxf2|<Ykrx!gP>JD4EBTa
zrr+)aEdq!Wz-@^yb1r`$!cGriCU+5F{xL()LWLObH|RxB7XEifUX#Gig?O~H@7KbG
z{MP~^IL}>lC13?%-ERvxvalINWJ0MTS*bPmNv+q1;qB0?eOvVo6*26w>XK9QS}PI?
z1J=DxU2|*X@@verxwTeZAr#8-w%<8whHR@&W6kKOP8jIM&}6aEYJ|(|ZcbL1>n}ZO
zULRZiWF)s$JMK4R7l(8sZpmlk;wr{mWH2sp<JB7I;$6Js;!V8eVn#|6m~`<T-WQk{
ze2I6C8qHn5?P4Ak0aqu^$-<UgJi;bxDovANb^3xt<XwD%NrBW^B;6NUdWVO8Ygb_Q
zlDaRx<0v(s+d2E*1Lz}4Q`fV{HI8DM6C2})<S2>!a8H6IVv=i?r!sfJ-75S7@sl!p
zjcZ&f$M8C3R~ujoZ}21}XIuxJV}s7)mpV@qnRc!yY)n-sK7sgoAazQ4kJCni(W#{*
zYmtbr<L%4h#9lRy<U+<_@1r>XFqh42^<v>iSmsIbPZ&SIGERzrz^IlAU6|@f!P+Qs
zshG2WVJK@p!{{;G*{s<`yk}uoESlJrc-E3O@n=XMV>oMN<2@tugt-iyk*zC!pfQ|Q
zT*nREB*F}~kz)g5M0^i<>I@XH%>SD(u}W5plq^)qTZvK}vy4BDgzfx`D>iPuz_^Vv
z{~YlGlUhu0PURd#49s(vd|R?~2`_d5o^FVB3eO@a2~Wt;iNgF%Ka1X#)WV{<r0AMT
zE!0VtlPVs=p6$Z<M(XW~DKD~SbmK@0c{O!8HFG*@l-t0^_<%o1{Qkj*{LC?HlEr*P
zJO&@f1n(s^l7@#cUs7R`1|e8Fgm_7#vvW);GO&6EJsb19ie}8m(T*zJVoo_cx!;iZ
z>M4@xp)Oom7`ODWmaQ(Xq(>-sks2Hk-Euu&xu`B7zh$EMXT$jvqk}Jd^wRm7$3o;>
qB{+lNMhbLRGgc@)!G!@yt1#2r^t7)d(V)>?eyyrH7a1&urT+oBnO>6s

literal 0
HcmV?d00001

diff --git a/etl-data-source/el-data-source-server/src/main/java/com/etl/data/source/server/aop/LimitAspect.java b/etl-data-source/el-data-source-server/src/main/java/com/etl/data/source/server/aop/LimitAspect.java
new file mode 100644
index 0000000..c0d6572
--- /dev/null
+++ b/etl-data-source/el-data-source-server/src/main/java/com/etl/data/source/server/aop/LimitAspect.java
@@ -0,0 +1,52 @@
+package com.etl.data.source.server.aop;
+
+import com.etl.common.exception.LimitException;
+import com.etl.data.source.common.config.Limit;
+import com.google.common.collect.Maps;
+import com.google.common.util.concurrent.RateLimiter;
+import lombok.extern.slf4j.Slf4j;
+import org.aspectj.lang.ProceedingJoinPoint;
+import org.aspectj.lang.annotation.Around;
+import org.aspectj.lang.annotation.Aspect;
+import org.aspectj.lang.reflect.MethodSignature;
+import org.springframework.stereotype.Component;
+import java.lang.reflect.Method;
+import java.util.Map;
+
+@Slf4j
+@Aspect
+@Component
+public class LimitAspect {
+
+    private final Map<String, RateLimiter> limitMap = Maps.newConcurrentMap();
+
+    @Around("@annotation(com.etl.data.source.common.config.Limit)")
+    public Object around(ProceedingJoinPoint pjp) throws Throwable {
+        MethodSignature signature = (MethodSignature)pjp.getSignature();
+        Method method = signature.getMethod();
+        //拿limit的注解
+        Limit limit = method.getAnnotation(Limit.class);
+        if (limit != null) {
+            //key作用：不同的接口，不同的流量控制
+            String key=limit.key();
+            RateLimiter rateLimiter;
+            //验证缓存是否有命中key
+            if (!limitMap.containsKey(key)) {
+                // 创建令牌桶
+                rateLimiter = RateLimiter.create(limit.permitsPerSecond());
+                limitMap.put(key, rateLimiter);
+                log.info("新建了令牌桶={}，容量={}",key,limit.permitsPerSecond());
+            }
+            rateLimiter = limitMap.get(key);
+            // 拿令牌
+            boolean acquire = rateLimiter.tryAcquire(limit.timeout(), limit.timeunit());
+            // 拿不到命令，直接返回异常提示
+            if (!acquire) {
+                log.debug("令牌桶={}，获取令牌失败",key);
+                throw new LimitException(limit.msg());
+            }
+        }
+        return pjp.proceed();
+    }
+
+}
diff --git a/etl-data-source/el-data-source-server/src/main/java/com/etl/data/source/server/aop/RedisLimitAspect.java b/etl-data-source/el-data-source-server/src/main/java/com/etl/data/source/server/aop/RedisLimitAspect.java
deleted file mode 100644
index 6421091..0000000
--- a/etl-data-source/el-data-source-server/src/main/java/com/etl/data/source/server/aop/RedisLimitAspect.java
+++ /dev/null
@@ -1,115 +0,0 @@
-package com.etl.data.source.server.aop;
-
-import com.etl.common.exception.LimitException;
-import com.etl.data.source.common.config.RedisLimit;
-import com.etl.data.source.common.ennum.LimitType;
-import com.google.common.collect.ImmutableList;
-import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.lang3.StringUtils;
-import org.aspectj.lang.ProceedingJoinPoint;
-import org.aspectj.lang.annotation.Around;
-import org.aspectj.lang.annotation.Aspect;
-import org.aspectj.lang.reflect.MethodSignature;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.data.redis.core.RedisTemplate;
-import org.springframework.data.redis.core.script.DefaultRedisScript;
-import org.springframework.web.context.request.RequestContextHolder;
-import org.springframework.web.context.request.ServletRequestAttributes;
-
-import javax.servlet.http.HttpServletRequest;
-import java.lang.reflect.Method;
-import java.util.Objects;
-
-
-@Slf4j
-@Aspect
-@Configuration
-public class RedisLimitAspect {
-
-    private final RedisTemplate<String, Object> redisTemplate;
-
-    public RedisLimitAspect(RedisTemplate<String, Object> redisTemplate) {
-        this.redisTemplate = redisTemplate;
-    }
-
-    @Around("@annotation(com.etl.data.source.common.config.RedisLimit)")
-    public Object around(ProceedingJoinPoint pjp){
-        MethodSignature methodSignature = (MethodSignature)pjp.getSignature();
-        Method method = methodSignature.getMethod();
-        RedisLimit annotation = method.getAnnotation(RedisLimit.class);
-        LimitType limitType = annotation.limitType();
-
-        String name = annotation.name();
-        String key;
-
-        int period = annotation.period();
-        int count = annotation.count();
-
-        switch (limitType){
-            case IP:
-                key = getIpAddress();
-                break;
-            case CUSTOMER:
-                key = annotation.key();
-                break;
-            default:
-                key = StringUtils.upperCase(method.getName());
-        }
-        ImmutableList<String> keys = ImmutableList.of(StringUtils.join(annotation.prefix(), key));
-        try {
-            String luaScript = buildLuaScript();
-            DefaultRedisScript<Number> redisScript = new DefaultRedisScript<>(luaScript, Number.class);
-            Number number = redisTemplate.execute(redisScript, keys, count, period);
-            log.info("Access try count is {} for name = {} and key = {}", number, name, key);
-            if(number != null && number.intValue() == 1){
-                return pjp.proceed();
-            }
-            throw new LimitException(annotation.msg());
-        }catch (Throwable e){
-            if(e instanceof LimitException){
-                log.debug("令牌桶={}，获取令牌失败",key);
-                throw new LimitException(e.getLocalizedMessage());
-            }
-            e.printStackTrace();
-            throw new RuntimeException("服务器异常");
-        }
-    }
-
-    public String buildLuaScript(){
-        return "redis.replicate_commands(); local listLen,time" +
-                "\nlistLen = redis.call('LLEN', KEYS[1])" +
-                // 不超过最大值，则直接写入时间
-                "\nif listLen and tonumber(listLen) < tonumber(ARGV[1]) then" +
-                "\nlocal a = redis.call('TIME');" +
-                "\nredis.call('LPUSH', KEYS[1], a[1]*1000000+a[2])" +
-                "\nelse" +
-                // 取出现存的最早的那个时间，和当前时间比较，看是小于时间间隔
-                "\ntime = redis.call('LINDEX', KEYS[1], -1)" +
-                "\nlocal a = redis.call('TIME');" +
-                "\nif a[1]*1000000+a[2] - time < tonumber(ARGV[2])*1000000 then" +
-                // 访问频率超过了限制，返回0表示失败
-                "\nreturn 0;" +
-                "\nelse" +
-                "\nredis.call('LPUSH', KEYS[1], a[1]*1000000+a[2])" +
-                "\nredis.call('LTRIM', KEYS[1], 0, tonumber(ARGV[1])-1)" +
-                "\nend" +
-                "\nend" +
-                "\nreturn 1;";
-    }
-
-    public String getIpAddress(){
-        HttpServletRequest request = ((ServletRequestAttributes) Objects.requireNonNull(RequestContextHolder.getRequestAttributes())).getRequest();
-        String ip = request.getHeader("x-forwarded-for");
-        if(ip == null || ip.length() == 0 || "unknown".equalsIgnoreCase(ip)){
-            ip = request.getHeader("Proxy-Client-IP");
-        }
-        if(ip == null || ip.length() == 0 || "unknown".equalsIgnoreCase(ip)){
-            ip = request.getHeader("WL-Client-IP");
-        }
-        if(ip == null || ip.length() == 0 || "unknown".equalsIgnoreCase(ip)){
-            ip = request.getRemoteAddr();
-        }
-        return ip;
-    }
-
-}
diff --git a/etl-data-source/el-data-source-server/src/main/java/com/etl/data/source/server/config/RedisConfig.java b/etl-data-source/el-data-source-server/src/main/java/com/etl/data/source/server/config/RedisConfig.java
index 96e2634..4c9e78e 100644
--- a/etl-data-source/el-data-source-server/src/main/java/com/etl/data/source/server/config/RedisConfig.java
+++ b/etl-data-source/el-data-source-server/src/main/java/com/etl/data/source/server/config/RedisConfig.java
@@ -31,19 +31,6 @@ public class RedisConfig {
         return jedisPool;
     }
 
-    @Bean
-    public RedisTemplate<String, Object> redisTemplate(RedisConnectionFactory redisConnectionFactory) {
-        RedisTemplate<String, Object> template = new RedisTemplate<>();
-        template.setConnectionFactory(redisConnectionFactory);
 
-        // 设置序列化器（如果需要）
-        // 例如:
-        // template.setKeySerializer(new StringRedisSerializer());
-        // template.setValueSerializer(new Jackson2JsonRedisSerializer<>(Object.class));
-
-        // ... 其他配置
-
-        return template;
-    }
 
 }
diff --git a/etl-data-source/el-data-source-server/src/main/java/com/etl/data/source/server/config/RedissonConfig.java b/etl-data-source/el-data-source-server/src/main/java/com/etl/data/source/server/config/RedissonConfig.java
index 9a1358b..eba3f96 100644
--- a/etl-data-source/el-data-source-server/src/main/java/com/etl/data/source/server/config/RedissonConfig.java
+++ b/etl-data-source/el-data-source-server/src/main/java/com/etl/data/source/server/config/RedissonConfig.java
@@ -6,6 +6,8 @@ import org.redisson.config.Config;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
+import org.springframework.data.redis.connection.RedisConnectionFactory;
+import org.springframework.data.redis.core.RedisTemplate;
 
 /**
  * @ClassName RedissonConfig
@@ -36,4 +38,19 @@ public class RedissonConfig {
 
         return Redisson.create(config);
     }
+
+    @Bean
+    public RedisTemplate<String, Object> redisTemplate(RedisConnectionFactory redisConnectionFactory) {
+        RedisTemplate<String, Object> template = new RedisTemplate<>();
+        template.setConnectionFactory(redisConnectionFactory);
+
+        // 设置序列化器（如果需要）
+        // 例如:
+        // template.setKeySerializer(new StringRedisSerializer());
+        // template.setValueSerializer(new Jackson2JsonRedisSerializer<>(Object.class));
+
+        // ... 其他配置
+
+        return template;
+    }
 }
diff --git a/etl-data-source/el-data-source-server/src/main/java/com/etl/data/source/server/controller/DatabaseController.java b/etl-data-source/el-data-source-server/src/main/java/com/etl/data/source/server/controller/DatabaseController.java
index 0a36cbf..9d1fe4d 100644
--- a/etl-data-source/el-data-source-server/src/main/java/com/etl/data/source/server/controller/DatabaseController.java
+++ b/etl-data-source/el-data-source-server/src/main/java/com/etl/data/source/server/controller/DatabaseController.java
@@ -1,7 +1,7 @@
 package com.etl.data.source.server.controller;
 
 import com.etl.common.result.Result;
-import com.etl.data.source.common.config.RedisLimit;
+import com.etl.data.source.common.config.Limit;
 import com.etl.data.source.common.pojo.DatabaseConfig;
 import com.etl.data.source.common.pojo.DatabaseRedis;
 import com.etl.data.source.common.pojo.resq.ColumnInfo;
@@ -36,7 +36,7 @@ public class DatabaseController {
     // POST请求映射到/test-database-connection路径
     @PostMapping("/testDatabaseMysql")
     @ApiOperation(value = "测试数据库连接")
-    @RedisLimit(key = "cachingTest", count = 2, period = 2, msg = "当前排队人数较多，请稍后再试！")
+    @Limit(key = "testDatabaseMysql", permitsPerSecond = 1, timeout = 500, msg = "当前排队人数较多，请稍后再试！")
     public Result<String> testDatabaseConnection(@Valid @RequestBody DatabaseConfig config) {
         String string = databaseService.testDatabaseConnection(config);
         if (string.equals("ok")) {
diff --git a/etl-data-source/el-data-source-server/src/test/java/com/etl/data/source/server/ElDataSourceServerApplicationTests.java b/etl-data-source/el-data-source-server/src/test/java/com/etl/data/source/server/ElDataSourceServerApplicationTests.java
index 00fb8a7..f6582c4 100644
--- a/etl-data-source/el-data-source-server/src/test/java/com/etl/data/source/server/ElDataSourceServerApplicationTests.java
+++ b/etl-data-source/el-data-source-server/src/test/java/com/etl/data/source/server/ElDataSourceServerApplicationTests.java
@@ -1,5 +1,6 @@
 package com.etl.data.source.server;
 
+import com.etl.data.source.common.pojo.Person;
 import org.junit.jupiter.api.Test;
 import org.springframework.boot.test.context.SpringBootTest;
 import java.sql.*;
@@ -7,33 +8,53 @@ import java.util.*;
 
 @SpringBootTest
 class ElDataSourceServerApplicationTests {
-    @Test
-    void contextLoads() {
-//        List<String> list = Arrays.asList("a", "b", "c");
-//        list.forEach(item -> System.out.println("Lambda方式遍历元素: "+item));
-        //创建一个未排序的列表
-        List<String> list = Arrays.asList("b", "a", "c","aa");
-        //使用传统方式进行排序
-//        Collections.sort(list, new Comparator<String>() {
-//            @Override
-//            public int compare(String o1, String o2) {
-//                return o1.compareTo(o2);
-//            }
-//        });
-//
-//        System.out.println("传统方式排序结果："+list);
-//         list.sort((s1,s2) -> s1.compareTo(s2));
-//         System.out.println("Lambda方式排序结果："+list);
-        //创建一个新的列表来存储过滤后的结果
-//        ArrayList<String> filteredLis = new ArrayList<>();
-//        //使用传统方式过滤
-//        for (String item : list) {
-//            if(item.startsWith("a")){
-//                filteredLis.add(item);
-//            }
-//        }
-//        //打印过滤后的列表
-//        System.out.println("传统过滤结果:"+filteredLis);
+    // 假设我们有一个简单的Person类，包含姓名和年龄
+    static class Person {
+        String name;
+        Integer age;
+
+        Person(String name, Integer age) {
+            this.name = name;
+            this.age = age;
+        }
+
+        @Override
+        public String toString() {
+            return "Person{" +
+                    "name='" + name + '\'' +
+                    ", age=" + age +
+                    '}';
+        }
+    }
+
+    public static void main(String[] args) {
+        // 示例数据集
+        List<Person> people = new ArrayList<>();
+        people.add(new Person("Alice", 25));
+        people.add(new Person("Bob", null)); // 缺失值
+        people.add(new Person("Charlie", 30));
+        people.add(new Person("Alice", 25)); // 重复数据
+
+        // 1. 处理缺失值
+        List<Person> cleanedPeople = new ArrayList<>();
+        for (Person person : people) {
+            if (person.age == null) {
+                // 假设我们用平均值或某个默认值替换缺失的年龄
+                // 这里简单起见，我们设置为0
+                person.age = 0;
+            }
+            cleanedPeople.add(person);
+        }
+
+        // 2. 处理重复数据
+        Set<Person> uniquePeople = new LinkedHashSet<>(cleanedPeople); // LinkedHashSet保持插入顺序
+        cleanedPeople.clear();
+        cleanedPeople.addAll(uniquePeople);
+
+        // 3. 数据格式化（这里只是一个简单的打印示例）
+        for (Person person : cleanedPeople) {
+            System.out.println(person);
+        }
     }
 
 }
diff --git a/etl-data-source/el-data-source-server/target/classes/com/etl/data/source/server/aop/LimitAspect.class b/etl-data-source/el-data-source-server/target/classes/com/etl/data/source/server/aop/LimitAspect.class
new file mode 100644
index 0000000000000000000000000000000000000000..c5300bb6f41f378a2b407aeea6d401a17dd0dfbc
GIT binary patch
literal 3238
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

literal 0
HcmV?d00001

diff --git a/etl-data-source/el-data-source-server/target/classes/com/etl/data/source/server/aop/RedisLimitAspect$1.class b/etl-data-source/el-data-source-server/target/classes/com/etl/data/source/server/aop/RedisLimitAspect$1.class
deleted file mode 100644
index dcab4869eebc45d449df788d9535d1f1df6c94d3..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 797
zcmb7CU279T6g`t{vPs<9wOSkNSG8MBL>vqHqzDpH2quj*u|D)^vO6>rcW1)xCgLyh
zSp^Z1{s4cJcxNjp;)8{~GxyBwIrnS6|M+?W;1SvlT*gKnE}C`nu2{I~;;IGLTwHf?
zli_hNdaLqqIuP?9G)W-yIEX|pg3K(^P};M^=s;?{NP@mfR6c$;mkgz&9z*SE7%Q#v
zXAI?5`;fuun20V{`%26GMKY1;SWIF%S?iln#D^kP7XLb28Ra5;Ly-$inK3j*Mc6%M
zN$UqPQdtr7c{Z0}{$M7Sg5<k8j7_HW@j&KN6S>%Oam&MPY<sAq;UU0|hda2-uxTkg
z7W$a)o6#bi?kO2Z-840+hZc4icBw>8Wpi6LKP{VQGF{4)3p3|`ClTy2cs;FU+KEM$
z$&A7O9b`C}QKAg|jH(Rx{>3<LKQG$P|7d@8DdL3<&0FoG{{J(d(ByhA8SbBr<C-*5
zTExYi?ch7FM&se2d*E-;^QzHvV}8@N-g<=3!J~bJ&<thrfYukVlW&brD1EeF`7<16
z_#V!S0#*rD3itsf(z%2URM5mW4Y5KB=SiVj=sd(K`6V)+%!BjV#RUxPLjSE5cNd8d
RI9R9k23docF75DZKLJyJ$c+F1

diff --git a/etl-data-source/el-data-source-server/target/classes/com/etl/data/source/server/aop/RedisLimitAspect.class b/etl-data-source/el-data-source-server/target/classes/com/etl/data/source/server/aop/RedisLimitAspect.class
deleted file mode 100644
index 97c12931083968f791862184e70197a7631cb43e..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 6399
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

diff --git a/etl-data-source/el-data-source-server/target/classes/com/etl/data/source/server/config/RedisConfig.class b/etl-data-source/el-data-source-server/target/classes/com/etl/data/source/server/config/RedisConfig.class
index 4033d2fecc2a563d149bf188cda7ddf899aeb4c7..3c45f7e69cfa5b2b3a3191a503688b4002c36fe8 100644
GIT binary patch
delta 346
zcmW-cNlpSm6o$X1yDe->MUZwvL{Om-2SgE^zzLO=ab@BH591B$7_N+o3u7>Dy@iRl
z&=_B_sPFx+>VHFhC*MYHKL1|(z&7201ko_#lohK1E|EpWV$EXRV#8uHpvsm-Es)9`
zMLl4YT}4CDeCoY8=F!WUo|kdz=EF^!FRu_!F{zm#X|!Le?6I#ousF0hqNQomQXFee
zIMtkSuIOkkxHR{E-c51!-1i@xEQ_*XLN;~?Y&%gg(b8R*Ht#AdhH^I~8EB>kwAyEy
z8Ho|I%niK1>dpzxZM=4EU1dDRXpmuEUaO?ZvLL;i^0S;wb;Z*qPeJ0693SV0ju@6D
MiLpXaq8(d;fBh~dtpET3

literal 2404
zcmc&#T~8ZF6g_Jj3}%gi0BzdRBu&y7OxTj7`KT#vAR&d?fnvukX<vqAVwTuD*6una
zZ~Y_v5B-pgRHVLDmHL+|RXww7o6tZAQl&oZotZoL-Z}Toox6Yj{p)W4Zs5BV&fr!*
zMsPccJ1N9*ON&pm$ZIjD#iv@#r|=m**Wzvp3s_9zUJ7a4Phu&BjP}dmK@wjiv237!
zM{YU(no>0b=L())Sa!{kZs1$tmbKC`$Q$ULb6h8wHxSQGRtzK-)s{4nDLAft*sO0#
zuPioe)Ql9AEov3vIeOhzCW39pH((WPRkvhNv$jMaEMGM}TUx&Ko=MNLmHWi0TI>4E
z#c<A3&8iH#C=9G+kBq>mb>&(OwWF+ijJzp)8OF&^o|spvK?0)l3|xM_c^6h<Tls;`
zbw@lCR!z87s}y*STP5T~LwVdY$Z%Sx*#&c4{>P(dgi;{vr$y0d6PXULsVwV_nh41D
zZnmJjs^vHI;ZHnKm%GY)8qwRnQRTYQ4jl5+p|-tV5_X`x7v$)~5T1;jI|nn(@i06Y
zIULQv!pY$}KF1+4&=+)5ynb@Lqu?Db!xxQCDQ=uT+}x|z{E}vMbBFxq=gCQb$*H;`
zXnMSvAO4@4d1I_+*PCwO)Mdr-9X`~%uB!r}%Y^Ur>X97T$_?c6z!F_kYe5Q^d8bO@
zOI~tx0~qR*8DH~^ejf&IzG=MZfi=AlNZ!Oa-ZC+YF#{Ld)qHe+iu_Eh;7bz)Es9z^
z#HxuktS0f5iFK4rl<_EuiixlBje&{R#?+^87??fv<1q0U-;%^r^*Zu)&`Y9{GBDuF
zpeUY~c{A+MiR`lOys1dJyrszw7mgb(GTbRkKUj4al;^2k?ebW=9BiyhR;POmxMLd;
zyFdHzBaa|Pvy(5?ez)l*xxW_ny|F_E%Pg6y^jIUq2kEtyeC3WCR79=GMEF->!z@OR
zMl^)IE%`^#ZQW;ISG8-F!=7h7kgoI`J0eK`x}uxUzltg3YLtx7;@>Um{(tc{E4aX4
z@)`c3c@4TqIg4}7nx%Z3D~qGSv1e)z#!sBYaF((+RGN5)b2Bo)yLgYQNlf5<YP9q3
z=s|+x%Fl@XfyI5qH};Sy<c9Hm3q8@$n;RNxA(>0G(5FTJR12vh#Xt+@{65kfx#@{L
z4E}-`qx{Hd@esib1~?xkk`WAs(8qZGI6ffsD?ELgcxI`&Lp)137b2Y^nnB#=>O2w7
zGTjTbkI^QLi@3zd#EQ%KkmD78Juv>Fvw<wriiasxX|ByO`^Yevq2hF|h2iM~T!Z2E
zCG;^)8Z+U!=OdRkLv+RzatzytBynD4$Qg#zJVqLenvbZ75#u$En(gc1`bH=}?rLuW
F{{WFos#yR4

diff --git a/etl-data-source/el-data-source-server/target/classes/com/etl/data/source/server/config/RedissonConfig.class b/etl-data-source/el-data-source-server/target/classes/com/etl/data/source/server/config/RedissonConfig.class
index 86772bb90f6e5191c1e36f6e7141c2f1c5aecf41..a9fe24b153853d2e1d6c47414a5d033f50a931b1 100644
GIT binary patch
literal 2330
zcmc&#>vG#f7(Htzmg6c(>!gL20xiAZ+^k+gfH<TiX#=!w3sJ_5hhK`laTILHtfZ6<
z!=vyHFvGMRI`9B}D2B6=<Jhs=(%}b_iKPAZyPWUav&S#~{^KtIi`dQ~k3|C?<&eUn
zek^72v4Kyr_;d`Xu$)CnzgKej468ZZ!sj`xVcoz+4ih?J0=Es^F|a9+j#N`1U*2~P
z9INSg4a*Ld>orOOXSX6RbX&6G2JTK%u6dpxI-%=(fxu$fR}Cv@Yu8=nwB#dSeQ)hZ
z#|x}orxyC^vE_6Ftcuf&BvXza=nsME%ReQtMJ4NQP~7u_@MnRMwy(m$U2WxVX2tc~
zaFv(~GZi{-_;se5EW4h35Vdxs+I9$2H{;iwX2nsiUU!Tm;hsy}H_A1?Wy!E<)t%6>
z0zXnUX$4XpNM+T0Z`W;DTN+Z}dmHhRsB^k*vJ$vdn2CFjfz!)!+U`+E)0JMxkW7+G
z;C#Pxr$jgP!q7R=E0jNmy%SvLXqk6BF1syT?WPm5*GGk+3F78rSKX8+Yx>v{lq}s@
zZzktdO8Pl|mVGIdOo9&!6Umu4{XjN>_5Y4YARBgDy!rZk!{GIk;Botq2-P=Fw=#G;
zdMpoj_Br3uDrYigyA96?BgK>X<^MUEe~mR~$K2m^^_7|0>f?M-tAW7M&`}K`Ct1LY
z6RB7oN+#aHd4Y3UA!3r~Tf!)Pw-QeiU*JmtkVQwjv$5wWTmBG9uSP`KIC9ytOiW=~
zKrEX$i)jO2nYfF42FfPx<AH&PCcefu0@sHL(kn@9VhgswwKr7+fs;q5lhdaRMS-*_
zhD~Y5Vj?hmTqrst==Dm*LFV*iO!Sxfw(q;1z@0)5*Lr7E`tD^LGd&w!HNQISI0ms$
z?E)FD)$2+I)XSCL>YZH2^zT(|o$f1oNHQ&tO2+ziE4d}ZY0^=q?&eUXohDq4v0u~T
zvAvcMhe0nD#tJU-cQnsm-4y@GLo)U>S0^-c`Ttgcx4A)H4sM)7nnvCPKHp`G#WyLB
z(b=aEzr`uv<1-T*r|>?%&BOs0SXN(-4{(Xub+DpeitnZ8NL8OAU7mY_k^HFfCo<J^
z-mt49v%e#2S4Z<>b~VHAoc#<Zp1}Ne?it2^Wn>Dv+5|y?kg{A|$A@v%GfC!7)hvp*
zj4Q0J8`bEp@-66FV64W{puf&C`5Y6(GI@WVU{22KBI%wY^DMG}aV*6}E+iqHA`He1
lW|=k%19O;X$_2*j0VI|pEfy^)T<ZgpB5ZBF(Y4+L{sCUbpLYNN

delta 363
zcmZXQxlY4C7=*u#ovd-J1P2IUj&LM|gd>C_+;@=@At5T>f(PIs+)?rXNEQVW1@u(B
z4h>>#5Di-G%>Mh&%>LT@%0sdL{`K+-Y;x{XrfFI9$<a)q<<Yh*c`Of5V#Q-M<&Mu9
zU7vL}eA%`vJ<E1-m6-U#y>Z4Ek00Hdv%_xu;kN37ga)%0P$jg8_c^c}1{`s0ISDxB
z?CCoHX6~3(dRepNv}D6jQB@QVX%F8rqK0DrH%8Sk=xJdjPe*LT`Svp=$s#9&h3qn9
zQs>}Dz!cM}47CC?N{Ql6+rLc3B^+UdCwZ4fW~xd7y<d|)L^IFHoX(ks&x>=^Gi?0b
GF2FaXSRY~l

diff --git a/etl-data-source/el-data-source-server/target/classes/com/etl/data/source/server/controller/DatabaseController.class b/etl-data-source/el-data-source-server/target/classes/com/etl/data/source/server/controller/DatabaseController.class
index 1a9fc8449f8d2fb27c67d2db4fef64244a563b11..ac6bf61c4ee6f46fad65fd519819685b5da68208 100644
GIT binary patch
delta 443
zcmZurOD_Xq6g}VcF>Q^hiV_<gX@WKliHJxoL^PD3sCu+seGICdj&`PKJ-W4(?*|Y|
zR$@ou2UzhN#8xb<#WxK*cX4v=$vO9)bLm=&J%2wu0T@8d0T<$Sh)6VG4eJhUVAEh*
zHY6QLA#Fp(2HDWJ4SmOeT?4W__8iC|Z=@9-g}d0B*{l*|=pE;$m(~F7Hi`7g(noys
z#o~=jXO*lzOkm2%6#|zoYkDZDCsRpHo~dZXJVDdGTw)$=PA)~|v|7kmM?P6iHUzw$
zRb;iSTYiPF`yT5DC+!RHpva>nK!YxzA7uhg&GAqL9N>@++9mf9Dgwf&3OF_(f-1of
zeYLdEn!U?<BH$Ef_qTS*+!(?r#-<R$xP}R;h+Yz=7h*egi$O9;-^Dn+5rZ9*Xk{(h
zz`@6w`4b=-W)LvAhS_>7Qjd)|gB^4KnCJh@3(VYUvLQ+zoxPq#c9lb{9%yE4iS5hm
J>Pr2?>JJsdT<!n>

delta 421
zcmZus%Sr-a7(M@tHeRNYq6=+w!XOe+h=Q<9Sz3aXnO15y(@DqMn4_811GN8NAbJCF
z*P>Nzf}j>XLHiydnqO+y=5W5lIp24_d-+yQzI;DC0+_>%4MW(oLc+csDWq-4;DE71
z3yy3!#)$=43r?AyV|t!}!r)9m!G<DKmM#e>caxtcQ-vT;yPSu<3SK(ROZ3j{CqDXS
zcF)I^ysAgls@hy6;LA#fz@E$IifXNpQ1m8&Ij6O1P2MQR5e(FohN|Uz!GSMMu8MG>
zCO{KW$GM1EGzd7YETAGnN0Y{^@@NYeB0^}3xMUDTn_z*yn@4DcOj!hUL|oyz_iU9-
zgAptv$Y4dsD(yNZd4dpKa!gRa6mW(yW|SBQhZzufG9WtE;ALFL`ma6Gw?9b%5~d|7
qO;e75bK{@j=3j8j2)ap(emH!tZT2MMefzM%c8ob;>`(S@?fw8Gz*OV_

diff --git a/etl-data-source/el-data-source-server/target/test-classes/com/etl/data/source/server/ElDataSourceServerApplicationTests$Person.class b/etl-data-source/el-data-source-server/target/test-classes/com/etl/data/source/server/ElDataSourceServerApplicationTests$Person.class
new file mode 100644
index 0000000000000000000000000000000000000000..163eaf829b18398c459d6d63ff6cd3bc4ff6fbc0
GIT binary patch
literal 1055
zcmb_b+iuf95IyUdI5AF>x<I)U8rnh}H>m;fR)Pd6l`2IADOFJ)H_0lva@LXU^ab%x
zAkkC;i4WkT5VLlGa8Y@Hhn?9uvomKd+RtA;d;;(g4@{J>T7-qF61NSknb5IXz`D{K
zO57>nuF^Fn90RU_O$J@^kzlYp$NYqQ0hdFsn?$}GZZqWgkX%c1u05HEp@_(rf8<L)
zdCcHAbN*TA9P%xqen?#Ha6k#m9bbz5$*3oy1KtZ#_OQ=`Lmv6co`HJu%8!ZYg^1!%
zGFW?3il`m%I2MHOcKYGS6G`9=c*4CnoJ4)$#UeTpk@qavA+Vcb-4uE<9tVD(Cw?do
zM4ZGMSz79(kc3&;440hxT<PEEU}lMSeN}7i@42_sEG^h*SXe;WLIsNq%fC+e>BJ8P
zB4Q|IwY*lVXw@t<v89AZ%{QvFgO;-HS-61}1NRwr{zvBwl^+E??;VSNLK}C~p7MM=
z7IMJQ{KIa4pU|ui8s&=9KF|GAx{PxBy!Wkt>JwG^2_^a-8XZ~#NvKVbREUiw(8lR@
zM0SpJ**ybuH&3CtjZ@^_r4KKsPj!+N`ZkLwQs4rGULmBKg<%=j$)W@)4NGr|NFxH;
z*^K68Y6H!W(2ve=!Ol-%xbLBns???^*u@OUO<`8v5HQ8Xx0FnSDk4v5Kvas@O7G1X
Uv4)%Jt6R86+9aQaI<BJd6?4Y}`~Uy|

literal 0
HcmV?d00001

diff --git a/etl-data-source/el-data-source-server/target/test-classes/com/etl/data/source/server/ElDataSourceServerApplicationTests.class b/etl-data-source/el-data-source-server/target/test-classes/com/etl/data/source/server/ElDataSourceServerApplicationTests.class
index 1729aefba514e9749f066de71c6e2aacc12ad51b..283cfcede7874cf91df964404deb12e11b3748db 100644
GIT binary patch
literal 2213
zcmb_dOH&+G6#km&p@*S)1Ojo;U`$YkFrj0Nc>p2u2!=R3%piosSI^94Xz1x4yL(V7
zOSf*V(q&dGEiDz1D$AXgRW7v3D&6`ov^4R%Jp)W4r3*qaeQ%$8?m6H6&UbGAaR2LX
z0Gx*%M<*_7xD-d7952T(7{?HX<4|#>5hJ)7!%H!Y%IR1m#xWru*BZDyso~`~T5w&i
zP07cN2E2lF9MhQ5FsorsLH(TYeAiK+PdSe8#%<I0g-`pi<ygUpf=IG&L4i8%=7oZm
zwB?AIaxp8sc{6L%(w25}roCW#mVB=o)nLV9jH~IKTQo#q8+kJ@4c{$$Ibrz1TNj>j
z&7Pn!6WTJNX|z<bt(+NHt}`$Ez#n4TqG=IZXYx*Z)m%3X+jI&>Ch#n$FeG8sm#XL|
z50|Q^!h+0bdIdsnKOkY4&MnDPw^rbk1IsqjmLG6qQ_dEqBl2^i;-Z%w>z%ULeQl}P
zkr8r3=flixly=#>RpTmy4?mu>jWFk8O=zNcjFFo%ftg#IHcO!dG`y<eCgrLjqaa?X
z@}woH>;3=256D_8NZc$tfmIX>mTys8qmJVSp*mQf3u)IY7=B4AVc9c_;$7EUGqSE5
z7y-3o<Xk5Z?*&FC^cbUEN@_?)0$r?bD5kJ_qn>AONR|~$97?TK2`Pw<QpG~UypGqf
zATutK4js3!#BLgMvkJ8F71OgVq2o60kSHCm;|(2e;w>F-gGWEM50D+VCi2%!e}x5;
z(Xu*n=+cn~lPv2fU`2zaV-;%(t{mzN6!w0b&1P3cj<ht_Vv#(x?Hi^7;hBN!QU3cz
z;#6>CKhP9QQ4sXe)=j%CW|w6{PxV!#7<P2kg91$^Ys}R~ud(bp%HEHd`MiRT+6@)R
zLw&au#H>ANoylshu;9CpnM_+T{TZqxyyUn?b;6gUyZ#}zYD}50K>4;GfQC}7q6jmL
zyS7c{c#Va3R8(FJJbgX!j@tHrI1@q*|CtRx5Jl#7%S6~w$!odB95o-18etZBhKiIQ
zHuGds_JPf-^FV$UZ~`6tu*knU{@4^y@FZsjM}=eb^cIv)!{w*=tPhQG9OqoGIG`I(
z^R0oQo}q=CmG2RyC-B=2>Xx<;N%!wSU22QACcZ-b7PM`|>abWbHYkr6;;r5P_IhM%
zHSTo(HX0SooY{u1;A8Z2(xl*9sDo-k{T$8TK~Ja=hWi4|sf1d|yZPYf9keW^w$M70
z+QtzDDeh|{BEB)4+*=LUC1=%$(a+GHh<=Hqn-6}Mgs6~&+&~+jClKS|kK-f;aEhPZ
z9yWO|J2;8E=)?O+;RCLGNLD|>Io!hw*yK0;6I{fPxP)JD8NXsMBz1(u-DMR{GLFjC
zSU8JHG8y$*jxqd%=NMgK{0(O4W##TMN*_)mg8mRqr0SL0^GfY`ouStNy-p!|9|a9Y
v_<!~<^k{hg4>bObZVl%&oc)u>iV&)l#(BKRQC9x~$0zuUbFNZ6#}NAmLsLrD

literal 1800
zcmbtVTUQ%Z6#h;UG9gS0O<O7zZ<Si0&{3&Xfr8MBqJd%ugK52;Bm)ec%w)}+RQUz|
z0H3;+OMP%HpY221innL~g0HUD-{3>_JCg(g_3~g==A1L%-e+IFy?64<!|#3sa26X`
zJcbDaXES&ygL4_YoWUzuyoyN!Q(0s%(SvE6@4*aa_3~O43CwB1d^axOqJc|U^kE`{
z%X)uZFK_5&A&WQhmVvy1MS=9R>$_@3AUQlz5J+7JDvm&J-u0cOdbQ+)E3)Jf$>oEx
z^a?U`^?M6UsSP(0n9Y}is^uupsz@cRD5!^J$BLZrrW0D1yo&_w7_(z&u2%EhvQ%#1
zuQ-v4rUcA#;49}7l@DZv22-wbs@mtKyeTbD`s<dhLf2oXYRYpXCD7ND)s^d6c_Nhb
ztht_YLZ`xafukJ?b73gAT3Y>k6WOY@lNsu`pmnDo^*%!{BOPixcK<>5fURWt#-gmn
zd>L3`=?q*E7`R&Zm0NWRZsd~AIo}UdOb7!X%m?ARwOMCbxYkHTXvvyuX|Cu$+obZc
ztE+PAzu7&bITSb-Ta9X(#kEjYosWa?hE)mzWholAS_QD|SYw`e?9apij+5>Eg%A)W
zJ~S-K0tqP%ESq>6R|O8ox^ZE4_+jcMY^*SO6Yrp4VioV2DB_xl>v+$=`zAiXhXTj;
zJDRV%Ud0J%_P6i9da(WF?>~KdfBWkP+n?S4;`2!pA3^G+WTK3U0msA|)&<W0uZG-{
z@0HS~Q)a^*+)Yb&2fK3@SYVB$3K(URsNLjQ&$Nu17fude?`Wx}-KoxYYISHvm%M4N
zf4EcLcEc_(He|HKfr;n#8mGdKUyii(<C$r>V9!KKhALWh)dmM+xFd?zSdGv`QdTPa
zr0p0f?d*W9C?3ybP^bUaoVkIu%-&Ko=*TJ~Ov_r$@o91V@BBRyLaWZaxJSPo!N2Hd
zRM5;qU~l?6KN-!A+#4Y&)Sa$8e_zgRMhbWu$M_ShKM6jZ0|-3Mlf_+d?;5=W@og*~
z<eHAbZal%W*;K%jc#3bJspB-l%c2V@bP=f<KOj*|=8|?Xl}p*hu3VR0Oy|<}T^RXo
zWQupty?FW_vI0xv_s}D73nzFm1%5_iGBv<k4IH?I?AQPg2UoxO^Vi$x-9{g89?In!
zI6T(Ckp_-7(656`K?iw){|`Vf&x06Zc(V*}f#EGvViWOjGEQKW`m;EMXNaeCxUEzM
zIpfb#Pw-iw?sH7*6y^Qgo3h~@*$A;w%5q3P#A!o+#|(@Q{XzT;aZQ-TJ%Q)r^@Sbu
GMc^+#hSu!>