Skip to content

B
browser-backend
Commit f056b3d3 authored by Administrator's avatar Administrator
Browse files
Options

Merge branch 'feature-password' into 'master' 

check-ip-util

See merge request !218
parents 063dd026 e91eae89
Hide whitespace changes
Inline Side-by-side
Showing with 10 additions and 6 deletions
src/main/java/com/edgec/browserbackend/browser/service/Impl/TempServiceImpl.java
View file @ f056b3d3
...@@ -62,13 +62,17 @@ public class TempServiceImpl implements TempService { ...@@ -62,13 +62,17 @@ public class TempServiceImpl implements TempService {
@Override @Override
public String getPassword(String ip) { public String getPassword(String ip) {
IpResource ipResource = ipResourceRepository.findFirstByAddrOrderByPurchasedTimeDesc(ip); IpResource ipResource = ipResourceRepository.findFirstByAddrOrderByPurchasedTimeDesc(ip);
String password; StringBuilder proxy = new StringBuilder();
if (ipResource.getProxyPassword() == null) { proxy.append(ipResource.getUsername())
password = ipResource.getUsername() + "<br/>" + ipResource.getPassword(); .append(",")
} else { .append(ipResource.getPassword());
password = ipResource.getProxyUsername() + "<br/>" + ipResource.getProxyPassword(); if (ipResource.getProxyPassword() != null) {
proxy.append(",")
.append(ipResource.getProxyUsername())
.append(",")
.append(ipResource.getProxyPassword());
} }
return password; return proxy.toString();
} }
@Override @Override
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment