manaer 测试分支

.gitignore

@@ -4,7 +4,7 @@
 /.classpath
 /.project
 /.externalToolBuilders
-/.idea/
+.idea/
 /node_modules/
 /dist/
 !/src/main/webapp/WEB-INF

manage.iml

@@ -11,8 +11,11 @@
         </webroots>
       </configuration>
     </facet>
+    <facet type="Spring" name="Spring">
+      <configuration />
+    </facet>
   </component>
-  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8" inherit-compiler-output="false">
+  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8">
     <output url="file://$MODULE_DIR$/target/classes" />
     <output-test url="file://$MODULE_DIR$/target/test-classes" />
     <content url="file://$MODULE_DIR$">
@@ -79,7 +82,7 @@
     <orderEntry type="module-library">
       <library name="Maven: com.alibaba:jconsole:1.8.0">
         <CLASSES>
-          <root url="jar://E:/Java/jdk1.8.0_65/lib/jconsole.jar!/" />
+          <root url="jar://D:/Program Files/Java/jdk1.8.0_181/lib/jconsole.jar!/" />
         </CLASSES>
         <JAVADOC />
         <SOURCES />
@@ -88,7 +91,7 @@
     <orderEntry type="module-library">
       <library name="Maven: com.alibaba:tools:1.8.0">
         <CLASSES>
-          <root url="jar://E:/Java/jdk1.8.0_65/lib/tools.jar!/" />
+          <root url="jar://D:/Program Files/Java/jdk1.8.0_181/lib/tools.jar!/" />
         </CLASSES>
         <JAVADOC />
         <SOURCES />

src/main/java/common/controller/LoginController.java

@@ -113,4 +113,7 @@ public class LoginController {
         return ResultModel.OK(true);
     }
 
+
+
+
 }

src/main/java/common/service/impl/UserServiceImpl.java

@@ -353,5 +353,10 @@ public class UserServiceImpl implements UserService {
         return result;
     }
 
+    public static void main(String[] args) {
+
+        System.out.println(CipherUtil.generatePassword("111111"));
+    }
+
 
 }

src/main/java/track/service/impl/TrackAccountFlowRestrictServiceImpl.java

 package track.service.impl;
 
-import org.json.JSONArray;
-import org.json.JSONException;
-import org.json.JSONObject;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-import org.springframework.util.StringUtils;
-
-
-import tkio.model.AccountRestrict4Web;
 import track.model.Account;
 import track.model.App;
 import track.repository.MeasureRepository;
 import track.repository.TrackAppRepository;
 import track.service.TrackAccountFlowRestrictService;
-import util.Constant;
 import util.DateUtil;
-import util.HttpClientUtil;
 import util.ValidateUtil;
 
-import java.math.BigDecimal;
 import java.math.BigInteger;
-import java.text.DecimalFormat;
-import java.text.SimpleDateFormat;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.List;
 
 /**
  * Created by song on 2017/10/19.