添加人大金仓

alonelaval · Nov 16, 2021 · 4831955 · 4831955
1 parent 0f3b0d3
commit 4831955
Show file tree

Hide file tree

Showing 4 changed files with 29 additions and 28 deletions.
diff --git a/config/pom.xml b/config/pom.xml
@@ -16,25 +16,25 @@
   -->
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    
+
     <parent>
         <groupId>com.alibaba.nacos</groupId>
         <artifactId>nacos-all</artifactId>
         <version>${revision}</version>
     </parent>
-    
+
     <modelVersion>4.0.0</modelVersion>
-    
+
     <artifactId>nacos-config</artifactId>
     <packaging>jar</packaging>
-    
+
     <name>nacos-config ${project.version}</name>
     <url>http://nacos.io</url>
-    
+
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     </properties>
-    
+
     <dependencies>
         <dependency>
             <groupId>org.springframework.boot</groupId>
@@ -72,7 +72,7 @@
             <groupId>ch.qos.logback</groupId>
             <artifactId>logback-classic</artifactId>
         </dependency>
-        
+
         <!-- for aop -->
         <dependency>
             <groupId>org.aspectj</groupId>
@@ -86,13 +86,13 @@
             <groupId>org.apache.httpcomponents</groupId>
             <artifactId>httpasyncclient</artifactId>
         </dependency>
-        
+
         <!-- Provided -->
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-tomcat</artifactId>
         </dependency>
-        
+
         <dependency>
             <groupId>com.fasterxml.jackson.core</groupId>
             <artifactId>jackson-core</artifactId>
@@ -138,6 +138,7 @@
             <artifactId>Dm8JdbcDriver18</artifactId>
             <version>8.1.1.49</version>
         </dependency>
+        <!--人大金仓数据库-->
         <dependency>
             <groupId>com.kingbase8</groupId>
             <artifactId>kingbase8</artifactId>
@@ -146,11 +147,6 @@
             <systemPath>${basedir}/src/main/resources/lib/kingbase8-8.2.0.jar</systemPath>
         </dependency>
 
-<!--        <dependency>-->
-<!--            <groupId>com.demeng</groupId>-->
-<!--            <artifactId>hibernate</artifactId>-->
-<!--            <version>5.3</version>-->
-<!--        </dependency>-->
 
     </dependencies>
     <build>

diff --git a/...aba/nacos/config/server/service/repository/extrnal/ExternalStoragePersistServiceImpl.java b/...aba/nacos/config/server/service/repository/extrnal/ExternalStoragePersistServiceImpl.java
@@ -2087,7 +2087,12 @@ public PreparedStatement createPreparedStatement(Connection connection) throws S
                     return ps;
                 }
             }, keyHolder);
-            Number nu = keyHolder.getKey();
+            Number nu;
+            if (keyHolder.getKeys().size() > 1) {
+                nu = (Number) keyHolder.getKeys().get("id");
+            } else {
+                nu= keyHolder.getKey();
+            }
             if (nu == null) {
                 throw new IllegalArgumentException("insert config_info fail");
             }

diff --git a/config/src/main/resources/lib/kingbase8-8.2.0.jar b/config/src/main/resources/lib/kingbase8-8.2.0.jar
diff --git a/console/src/main/resources/application.properties b/console/src/main/resources/application.properties
@@ -45,7 +45,7 @@ server.port=4444
 
 #*************** Config Module Related Configurations ***************#
 ### If use other as datasource，mysql,dameng8,kingbase8:
-spring.datasource.platform=dameng8
+spring.datasource.platform=kingbase8
 #
 ### Count of DB  mysql:
 #db.num=1
@@ -56,21 +56,21 @@ spring.datasource.platform=dameng8
 
 
 ## Count of DB dameng8:
-db.num=1
-db.jdbcDriverName=dm.jdbc.driver.DmDriver
-## Connect URL of DB:
-db.url.0=jdbc:dm://10.5.5.240:5236/nacos
-db.user.0=nacos
-db.password.0=Aa12345678
+#db.num=1
+#db.jdbcDriverName=dm.jdbc.driver.DmDriver
+### Connect URL of DB:
+#db.url.0=jdbc:dm://10.5.5.240:5236/nacos
+#db.user.0=nacos
+#db.password.0=Aa12345678
 
 
 ## Count of DB dameng8:
-#db.num=1
-#db.jdbcDriverName=com.kingbase8.Driver
-### Connect URL of DB:
-#db.url.0=jdbc:kingbase8://10.0.130.229:54321/nacos3
-#db.user.0=SYSTEM
-#db.password.0=123456
+db.num=1
+db.jdbcDriverName=com.kingbase8.Driver
+## Connect URL of DB:
+db.url.0=jdbc:kingbase8://10.5.5.240:54321/nacos
+db.user.0=SYSTEM
+db.password.0=Aa12345678
 
 
 #*************** Naming Module Related Configurations ***************#