Merge branch 'staging' into 'master'

Staging

See merge request !56

src/main/java/com/edgec/browserbackend/account/controller/AdministratorController.java

@@ -8,7 +8,10 @@ import com.edgec.browserbackend.account.domain.*;
 import com.edgec.browserbackend.browser.ErrorCode.BrowserErrorCode;
 import com.edgec.browserbackend.common.auth.Securitys;
 import com.edgec.browserbackend.common.commons.error.ClientRequestException;
+import org.apache.commons.io.FileUtils;
 import org.apache.commons.lang3.StringUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.PageRequest;
@@ -32,6 +35,9 @@ import java.util.Map;
 @RequestMapping("/vpsadmin")
 public class AdministratorController {
 
+    private final Logger log = LoggerFactory.getLogger(getClass());
+
+
     static final String mykey = "Xi6JZQ1SbUTxjO62u1MX01hBeB7AqQXR6jVfer@s8@9JZxNqB@NTs$vpwH9aVXe";
 
     @Autowired
@@ -448,11 +454,13 @@ public class AdministratorController {
                 }
 
             }catch(Exception e) {
-                e.printStackTrace();
+                log.error(e.getMessage(), e);
                 throw new ClientRequestException(BrowserErrorCode.UNKNOWN);
-            }finally {
+            } finally {
                 file.delete();
             }
+        } else {
+            log.error("file is empty");
         }
 
     }

src/main/java/com/edgec/browserbackend/browser/task/Set3proxyTask.java

@@ -11,6 +11,7 @@ import com.edgec.browserbackend.browser.repository.IpResourceRepository;
 import com.edgec.browserbackend.browser.repository.ProxyConfigRepository;
 import com.edgec.browserbackend.browser.repository.SpecialLineRepository;
 import net.javacrumbs.shedlock.core.SchedulerLock;
+import org.apache.commons.io.FileUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -83,7 +84,8 @@ public class Set3proxyTask {
             bw.write("\nallow none\nproxy -p20004\nsocks -p20005\n");
             bw.flush();
             bw.close();
-            log.info("成功写入文件");
+            log.error("成功写入文件");
+            log.error(FileUtils.readFileToString(file));
             long nowtime = Instant.now().toEpochMilli();
             if (proxyConfigRepository.count() > 0) {
                 ProxyConfig proxyConfig = proxyConfigRepository.findAll().get(0);