all in one key

conf/already.cnf

+oAGG:MBJCEBSDPOoADD

crypto/BasicCrypto.cc

@@ -451,12 +451,12 @@ freeKey(PKCS * key)
 string
 getLayerKey(const AES_KEY * const mKey, string uniqueFieldName,
             SECLEVEL l) {
-    if (l == SECLEVEL::DETJOIN) {
-        return getKey(mKey, "joinjoin", l);
-    }
-    if (l == SECLEVEL::OPEFOREIGN){
-        return getKey(mKey,"foreignjoin",l);
-    }
+//    if (l == SECLEVEL::DETJOIN) {
+//        return getKey(mKey, "joinjoin", l);
+//    }
+//    if (l == SECLEVEL::OPEFOREIGN){
+//        return getKey(mKey,"foreignjoin",l);
+//    }
     return getKey(mKey, "uniqueFieldName", l);//disable layer key temporarily. shaoyiwen
 }