Merge branch 'staging' into 'master'

提供前端查询ip 浏览器显示换行

See merge request !176

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

@@ -47,9 +47,9 @@ public class TempServiceImpl implements TempService {
         IpResource ipResource = ipResourceRepository.findFirstByAddrOrderByPurchasedTimeDesc(ip);
         String password;
         if (ipResource.getProxyPassword() == null) {
-            password = ipResource.getUsername() + "\n" + ipResource.getPassword();
+            password = ipResource.getUsername() + "<br/>" + ipResource.getPassword();
         } else {
-            password = ipResource.getProxyUsername() + "\n" + ipResource.getPassword();
+            password = ipResource.getProxyUsername() + "<br/>" + ipResource.getProxyPassword();
         }
         return password;
     }