Merge branch 'master' of http://git.quantgroup.cn/QA/qaHome

app/qa-home/controller/dbconfig/server.js

@@ -347,9 +347,21 @@ exports.reset_binlog = async function () {
 
     try {
         this.logger.info(
-            " active:", "reset_binlog",
-            "namespace:", req.name_space,
-            " user:", this.user);
+            {
+                active: "reset_binlog",
+                namespace: req.name_space,
+                microservice_name: "",
+                user: `${this.user.name}`,
+                user_email: `${this.user.mail}`,
+            }
+
+            // "| active:", "reset_binlog",
+            // "| namespace:", req.name_space,
+            // "| microservice_name:", "",
+            // "| user:", `${this.user.name}`,
+            // "| user_email:", `${this.user.mail}`,
+            // "~"
+        );
     } catch (error) {
 
     }

app/qa-home/controller/testdata/server.js

@@ -457,8 +457,11 @@ exports.createID = async function () {
             console.log(111, js_info)
 
             let java_info = await requestPromise(new get_person_from_acs());
-            java_info = JSON.parse(java_info)
-            console.log(222, java_info)
+            try {
+                java_info = JSON.parse(java_info)
+            } catch (error) {
+                console.log(222, java_info)
+            }
 
             let temp = {}
             for (let i in js_info) {