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/DataMigrationProcessorService.java

@@ -17,16 +17,16 @@ public abstract class DataMigrationProcessorService {
     }
     public static final String DB_DRIVER = "com.mysql.cj.jdbc.Driver";
 //    public static final String DB_URL = "jdbc:mysql://zhengzai.mysql.polardb.rds.aliyuncs.com:3306/";
-//    public static final String DB_URL = "jdbc:mysql://pc-2ze6z2hxkug559q79.mysql.polardb.rds.aliyuncs.com:3306/";
-//    public static final String DB_USER = "readonly";
-//    public static final String DB_PWD = "ZWDsf8Fy";
-//    public static final String DB_NAME_PASSPORT = "passport";
+    public static final String DB_URL = "jdbc:mysql://pc-2ze6z2hxkug559q79.mysql.polardb.rds.aliyuncs.com:3306/";
+    public static final String DB_USER = "readonly";
+    public static final String DB_PWD = "ZWDsf8Fy";
+    public static final String DB_NAME_PASSPORT = "passport";
     public static final String DB_NAME_MALL = "mall";
 
-    public static final String DB_URL = "jdbc:mysql://39.106.122.201:3308/";
-    public static final String DB_USER = "testmall";
-    public static final String DB_PWD = "zhengzai!mYT";
-    public static final String DB_NAME_PASSPORT = "testmall";
+//    public static final String DB_URL = "jdbc:mysql://39.106.122.201:3308/";
+//    public static final String DB_USER = "testmall";
+//    public static final String DB_PWD = "zhengzai!mYT";
+//    public static final String DB_NAME_PASSPORT = "devpassport";
 
     @Autowired
     public MongoTemplate mongoTemplate;

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

@@ -415,7 +415,7 @@ public class AdamMemberOrderServiceImpl extends ServiceImpl<AdamMemberOrderMappe
 
         s = System.currentTimeMillis();
         rabbitTemplate.convertAndSend(MQConst.EX_LNS_SQL_UCENTER, MQConst.RK_SQL_UMEMBER,
-                SqlMapping.gets(toMqSqls, updateMemberCodeObjs, initMemberOrderObjs, upsertUserMemberObjs));
+                SqlMapping.gets(toMqSqls, upsertUserMemberObjs, updateMemberCodeObjs, initMemberOrderObjs));
         log.debug("#MQ耗时:{}ms", System.currentTimeMillis() - s);
 
         AdamMemberOrderResult result = AdamMemberOrderResult.getNew();