Merge remote-tracking branch 'origin/20210716' into 20210716

operation_manager/pom.xml

@@ -90,8 +90,12 @@
                     <artifactId>spring-boot-starter-jdbc</artifactId>
                 </exclusion>
             </exclusions>
-        </dependency>
 
+        </dependency>
+        <dependency>
+            <groupId>org.apache.commons</groupId>
+            <artifactId>commons-pool2</artifactId>
+        </dependency>
        <!-- -->
       <!--  <dependency>
             <groupId>org.activiti</groupId>

pom.xml

@@ -173,7 +173,6 @@
                 </exclusion>
             </exclusions>
         </dependency>
-
     </dependencies>
 
     <build>

sms_water/pom.xml

@@ -77,6 +77,10 @@
            <groupId>org.springframework.boot</groupId>
            <artifactId>spring-boot-starter-quartz</artifactId>
        </dependency>
+       <dependency>
+           <groupId>org.apache.commons</groupId>
+           <artifactId>commons-pool2</artifactId>
+       </dependency>
    </dependencies>
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>

user_auth/pom.xml

@@ -28,6 +28,10 @@
                </exclusion>
            </exclusions>
        </dependency>
+       <dependency>
+           <groupId>org.apache.commons</groupId>
+           <artifactId>commons-pool2</artifactId>
+       </dependency>
    </dependencies>
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>

user_center/pom.xml

@@ -55,6 +55,10 @@
            <artifactId>poi-scratchpad</artifactId>
            <version>4.0.1</version>
        </dependency>
+       <dependency>
+           <groupId>org.apache.commons</groupId>
+           <artifactId>commons-pool2</artifactId>
+       </dependency>
    </dependencies>
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>

zoniot-rmcp/zoniot-rmcp-api/.gitignore

@@ -0,0 +1,40 @@
+# Created by .ignore support plugin (hsz.mobi)
+# Package Files #
+*.jar
+*.war
+*.nar
+*.ear
+*.zip
+*.tar.gz
+*.rar
+target/
+
+# Compiled class file
+*.class
+
+# Log file
+*.log
+
+### Gradle Files ###
+.gradle
+/build/
+!gradle/wrapper/gradle-wrapper.jar
+
+### eclipse ###
+.classpath
+.factorypath
+.project
+
+### IntelliJ IDEA ###
+.idea
+*.iws
+*.iml
+*.ipr
+/out/
+
+### svn ###
+.svn
+
+### gitgnore ###
+*.gitgnore
+.gitgnore

zoniot-rmcp/zoniot-rmcp-core/.gitignore

@@ -0,0 +1,40 @@
+# Created by .ignore support plugin (hsz.mobi)
+# Package Files #
+*.jar
+*.war
+*.nar
+*.ear
+*.zip
+*.tar.gz
+*.rar
+target/
+
+# Compiled class file
+*.class
+
+# Log file
+*.log
+
+### Gradle Files ###
+.gradle
+/build/
+!gradle/wrapper/gradle-wrapper.jar
+
+### eclipse ###
+.classpath
+.factorypath
+.project
+
+### IntelliJ IDEA ###
+.idea
+*.iws
+*.iml
+*.ipr
+/out/
+
+### svn ###
+.svn
+
+### gitgnore ###
+*.gitgnore
+.gitgnore

zoniot-rmcp/zoniot-rmcp-web/.gitignore

@@ -0,0 +1,40 @@
+# Created by .ignore support plugin (hsz.mobi)
+# Package Files #
+*.jar
+*.war
+*.nar
+*.ear
+*.zip
+*.tar.gz
+*.rar
+target/
+
+# Compiled class file
+*.class
+
+# Log file
+*.log
+
+### Gradle Files ###
+.gradle
+/build/
+!gradle/wrapper/gradle-wrapper.jar
+
+### eclipse ###
+.classpath
+.factorypath
+.project
+
+### IntelliJ IDEA ###
+.idea
+*.iws
+*.iml
+*.ipr
+/out/
+
+### svn ###
+.svn
+
+### gitgnore ###
+*.gitgnore
+.gitgnore