Merge branch 'feature-password' into 'master'

check-ip-util

See merge request !218

src/main/java/com/edgec/browserbackend/browser/service/Impl/TempServiceImpl.java

@@ -62,13 +62,17 @@ public class TempServiceImpl implements TempService {
     @Override
     public String getPassword(String ip) {
         IpResource ipResource = ipResourceRepository.findFirstByAddrOrderByPurchasedTimeDesc(ip);
-        String password;
-        if (ipResource.getProxyPassword() == null) {
-            password = ipResource.getUsername() + "<br/>" + ipResource.getPassword();
-        } else {
-            password = ipResource.getProxyUsername() + "<br/>" + ipResource.getProxyPassword();
+        StringBuilder proxy = new StringBuilder();
+        proxy.append(ipResource.getUsername())
+                .append(",")
+                .append(ipResource.getPassword());
+        if (ipResource.getProxyPassword() != null) {
+            proxy.append(",")
+                    .append(ipResource.getProxyUsername())
+                    .append(",")
+                    .append(ipResource.getProxyPassword());
         }
-        return password;
+        return proxy.toString();
     }
 
     @Override