Merge branch 'master' into 'dev-zrj'

# Conflicts:
#   src/main/java/com/edgec/browserbackend/account/service/impl/AccountServiceImpl.java

src/main/java/com/edgec/browserbackend/account/service/impl/AccountServiceImpl.java

@@ -414,7 +414,9 @@ public class AccountServiceImpl implements AccountService {
             resultDto.setStatus(0);
             resultDto.setData(current);
         } catch (Exception e) {
-            log.error(e.getMessage(), e);
+
+            log.error("eeee", e);
+
             resultDto.setStatus(-1);
             Map<String, Object> statusInfo = new HashMap<>();
             statusInfo.put("code", AccountErrorCode.NAMENOTEXIST);
@@ -718,7 +720,7 @@ public class AccountServiceImpl implements AccountService {
     }
 
     public static String makeRandomPassword(int len) {
-        char charr[] = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ1234567890".toCharArray();
+        char charr[] = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ1234567890~!@$%^&*.?".toCharArray();
         StringBuilder sb = new StringBuilder();
         Random r = new Random();
         for (int x = 0; x < len; ++x) {