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

liquidnet-bus-service/liquidnet-service-adam/liquidnet-service-adam-impl/src/main/java/com/liquidnet/service/adam/service/processor/DMAddressesProcessor.java

@@ -47,10 +47,8 @@ public class DMAddressesProcessor extends DataMigrationProcessorService {
         }
         sql += " order by id limit ?,?";
 
-        Class.forName("com.mysql.cj.jdbc.Driver");
-//        String url = "jdbc:mysql://pc-2ze6z2hxkug559q79.mysql.polardb.rds.aliyuncs.com:3306/mall";
-        String url = "jdbc:mysql://zhengzai.mysql.polardb.rds.aliyuncs.com:3306/mall";
-        Connection connection = DriverManager.getConnection(url, "readonly", "ZWDsf8Fy");
+        Class.forName(DB_DRIVER);
+        Connection connection = DriverManager.getConnection(DB_URL + DB_NAME_MALL, DB_USER, DB_PWD);
 
         PreparedStatement statement = connection.prepareStatement(sqlCount);
         ResultSetImpl row = (ResultSetImpl) statement.executeQuery();

liquidnet-bus-service/liquidnet-service-adam/liquidnet-service-adam-impl/src/main/java/com/liquidnet/service/adam/service/processor/DMCollectionProcessor.java

@@ -48,10 +48,8 @@ public class DMCollectionProcessor extends DataMigrationProcessorService {
         }
         sql += " order by id limit ?,?";
 
-        Class.forName("com.mysql.cj.jdbc.Driver");
-//        String url = "jdbc:mysql://pc-2ze6z2hxkug559q79.mysql.polardb.rds.aliyuncs.com:3306/passport";
-        String url = "jdbc:mysql://zhengzai.mysql.polardb.rds.aliyuncs.com:3306/passport";
-        Connection connection = DriverManager.getConnection(url, "readonly", "ZWDsf8Fy");
+        Class.forName(DB_DRIVER);
+        Connection connection = DriverManager.getConnection(DB_URL + DB_NAME_PASSPORT, DB_USER, DB_PWD);
 
         PreparedStatement statement = connection.prepareStatement(sqlCount);
         ResultSetImpl row = (ResultSetImpl) statement.executeQuery();

liquidnet-bus-service/liquidnet-service-adam/liquidnet-service-adam-impl/src/main/java/com/liquidnet/service/adam/service/processor/DMEntersProcessor.java

@@ -48,10 +48,8 @@ public class DMEntersProcessor extends DataMigrationProcessorService {
         }
         sql += " order by id limit ?,?";
 
-        Class.forName("com.mysql.cj.jdbc.Driver");
-//        String url = "jdbc:mysql://pc-2ze6z2hxkug559q79.mysql.polardb.rds.aliyuncs.com:3306/mall";
-        String url = "jdbc:mysql://zhengzai.mysql.polardb.rds.aliyuncs.com:3306/mall";
-        Connection connection = DriverManager.getConnection(url, "readonly", "ZWDsf8Fy");
+        Class.forName(DB_DRIVER);
+        Connection connection = DriverManager.getConnection(DB_URL + DB_NAME_MALL, DB_USER, DB_PWD);
 
         PreparedStatement statement = connection.prepareStatement(sqlCount);
         ResultSetImpl row = (ResultSetImpl) statement.executeQuery();

liquidnet-bus-service/liquidnet-service-adam/liquidnet-service-adam-impl/src/main/java/com/liquidnet/service/adam/service/processor/DMMemberCodeProcessor.java

@@ -198,10 +198,8 @@ public class DMMemberCodeProcessor extends DataMigrationProcessorService {
         String sql = sqlCount.replace("count(1)", field);
         sql += " order by id limit ?,?";
 
-        Class.forName("com.mysql.cj.jdbc.Driver");
-//        String url = "jdbc:mysql://pc-2ze6z2hxkug559q79.mysql.polardb.rds.aliyuncs.com:3306/passport";
-        String url = "jdbc:mysql://zhengzai.mysql.polardb.rds.aliyuncs.com:3306/passport";
-        Connection connection = DriverManager.getConnection(url, "readonly", "ZWDsf8Fy");
+        Class.forName(DB_DRIVER);
+        Connection connection = DriverManager.getConnection(DB_URL + DB_NAME_PASSPORT, DB_USER, DB_PWD);
 
         PreparedStatement statement = connection.prepareStatement(sqlCount);
         ResultSetImpl row = (ResultSetImpl) statement.executeQuery();

liquidnet-bus-service/liquidnet-service-adam/liquidnet-service-adam-impl/src/main/java/com/liquidnet/service/adam/service/processor/DMMemberOrderProcessor.java

@@ -73,10 +73,8 @@ public class DMMemberOrderProcessor extends DataMigrationProcessorService {
         }
         sql += " order by id limit ?,?";
 
-        Class.forName("com.mysql.cj.jdbc.Driver");
-//        String url = "jdbc:mysql://pc-2ze6z2hxkug559q79.mysql.polardb.rds.aliyuncs.com:3306/passport";
-        String url = "jdbc:mysql://zhengzai.mysql.polardb.rds.aliyuncs.com:3306/passport";
-        Connection connection = DriverManager.getConnection(url, "readonly", "ZWDsf8Fy");
+        Class.forName(DB_DRIVER);
+        Connection connection = DriverManager.getConnection(DB_URL + DB_NAME_PASSPORT, DB_USER, DB_PWD);
 
         PreparedStatement statement = connection.prepareStatement(sqlCount);
         ResultSetImpl row = (ResultSetImpl) statement.executeQuery();

liquidnet-bus-service/liquidnet-service-adam/liquidnet-service-adam-impl/src/main/java/com/liquidnet/service/adam/service/processor/DMRealNameProcessor.java

@@ -48,10 +48,8 @@ public class DMRealNameProcessor extends DataMigrationProcessorService {
         }
         sql += " order by id limit ?,?";
 
-        Class.forName("com.mysql.cj.jdbc.Driver");
-//        String url = "jdbc:mysql://pc-2ze6z2hxkug559q79.mysql.polardb.rds.aliyuncs.com:3306/passport";
-        String url = "jdbc:mysql://zhengzai.mysql.polardb.rds.aliyuncs.com:3306/passport";
-        Connection connection = DriverManager.getConnection(url, "readonly", "ZWDsf8Fy");
+        Class.forName(DB_DRIVER);
+        Connection connection = DriverManager.getConnection(DB_URL + DB_NAME_PASSPORT, DB_USER, DB_PWD);
 
         PreparedStatement statement = connection.prepareStatement(sqlCount);
         ResultSetImpl row = (ResultSetImpl) statement.executeQuery();

liquidnet-bus-service/liquidnet-service-adam/liquidnet-service-adam-impl/src/main/java/com/liquidnet/service/adam/service/processor/DMThirdPartsProcessor.java

@@ -50,10 +50,8 @@ public class DMThirdPartsProcessor extends DataMigrationProcessorService {
         }
         sql += " order by id limit ?,?";
 
-        Class.forName("com.mysql.cj.jdbc.Driver");
-//        String url = "jdbc:mysql://pc-2ze6z2hxkug559q79.mysql.polardb.rds.aliyuncs.com:3306/passport";
-        String url = "jdbc:mysql://zhengzai.mysql.polardb.rds.aliyuncs.com:3306/passport";
-        Connection connection = DriverManager.getConnection(url, "readonly", "ZWDsf8Fy");
+        Class.forName(DB_DRIVER);
+        Connection connection = DriverManager.getConnection(DB_URL + DB_NAME_PASSPORT, DB_USER, DB_PWD);
 
         PreparedStatement statement = connection.prepareStatement(sqlCount);
         ResultSetImpl row = (ResultSetImpl) statement.executeQuery();

liquidnet-bus-service/liquidnet-service-adam/liquidnet-service-adam-impl/src/main/java/com/liquidnet/service/adam/service/processor/DMTracesInfoProcessor.java

@@ -54,10 +54,8 @@ public class DMTracesInfoProcessor extends DataMigrationProcessorService {
             String sql = "select id,`name`,sub_title,icon,avatar,min_card_number,if(`type`='VIP',1,0),interests_detail,notes,created_at,updated_at,is_notice,vip_notice,vip_notice_title,need_question,display_agreement,status,limitation from vip_cards";
 //        1-id,2-`name`,3-sub_title,4-icon,5-avatar,6-min_card_number,7-`type`,8-interests_detail,9-notes,10-created_at,11-updated_at,12-is_notice,13-vip_notice,14-vip_notice_title,15-need_question,16-display_agreement,17-status,18-limitation
 
-            Class.forName("com.mysql.cj.jdbc.Driver");
-//        String url = "jdbc:mysql://pc-2ze6z2hxkug559q79.mysql.polardb.rds.aliyuncs.com:3306/passport";
-            String url = "jdbc:mysql://zhengzai.mysql.polardb.rds.aliyuncs.com:3306/passport";
-            Connection connection = DriverManager.getConnection(url, "readonly", "ZWDsf8Fy");
+            Class.forName(DB_DRIVER);
+            Connection connection = DriverManager.getConnection(DB_URL + DB_NAME_PASSPORT, DB_USER, DB_PWD);
 
             PreparedStatement statement = connection.prepareStatement(sql);
             ResultSetImpl row = (ResultSetImpl) statement.executeQuery();
@@ -103,7 +101,7 @@ public class DMTracesInfoProcessor extends DataMigrationProcessorService {
             String sql = "select id,vip_card_id,status,name,price,days,detail,created_at,updated_at from vip_card_prices";
 //        1-id,2-vip_card_id,3-status,4-name,5-price,6-days,7-detail,8-created_at,9-updated_at
 
-            Class.forName("com.mysql.cj.jdbc.Driver");
+            Class.forName(DB_DRIVER);
 //        String url = "jdbc:mysql://pc-2ze6z2hxkug559q79.mysql.polardb.rds.aliyuncs.com:3306/passport";
             String url = "jdbc:mysql://zhengzai.mysql.polardb.rds.aliyuncs.com:3306/passport";
             Connection connection = DriverManager.getConnection(url, "readonly", "ZWDsf8Fy");

liquidnet-bus-service/liquidnet-service-adam/liquidnet-service-adam-impl/src/main/java/com/liquidnet/service/adam/service/processor/DMUserInformationProcessor.java

@@ -68,10 +68,8 @@ public class DMUserInformationProcessor extends DataMigrationProcessorService {
         }
         sql += " order by uid limit ?,?";
 
-        Class.forName("com.mysql.cj.jdbc.Driver");
-//        String url = "jdbc:mysql://pc-2ze6z2hxkug559q79.mysql.polardb.rds.aliyuncs.com:3306/passport";
-        String url = "jdbc:mysql://zhengzai.mysql.polardb.rds.aliyuncs.com:3306/passport";
-        Connection connection = DriverManager.getConnection(url, "readonly", "ZWDsf8Fy");
+        Class.forName(DB_DRIVER);
+        Connection connection = DriverManager.getConnection(DB_URL + DB_NAME_PASSPORT, DB_USER, DB_PWD);
 
         PreparedStatement statement = connection.prepareStatement(sqlCount);
         ResultSetImpl row = (ResultSetImpl) statement.executeQuery();

liquidnet-bus-service/liquidnet-service-adam/liquidnet-service-adam-impl/src/main/java/com/liquidnet/service/adam/service/processor/DMUserMemberProcessor.java

@@ -48,10 +48,8 @@ public class DMUserMemberProcessor extends DataMigrationProcessorService {
         }
         sql += " order by id limit ?,?";
 
-        Class.forName("com.mysql.cj.jdbc.Driver");
-//        String url = "jdbc:mysql://pc-2ze6z2hxkug559q79.mysql.polardb.rds.aliyuncs.com:3306/passport";
-        String url = "jdbc:mysql://zhengzai.mysql.polardb.rds.aliyuncs.com:3306/passport";
-        Connection connection = DriverManager.getConnection(url, "readonly", "ZWDsf8Fy");
+        Class.forName(DB_DRIVER);
+        Connection connection = DriverManager.getConnection(DB_URL + DB_NAME_PASSPORT, DB_USER, DB_PWD);
 
         PreparedStatement statement = connection.prepareStatement(sqlCount);
         ResultSetImpl row = (ResultSetImpl) statement.executeQuery();