Merge branch 'master' of http://47.100.37.243:10080/wutt/manHourHousekeeper

# Conflicts:
#	fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/util/CodeGenerator.java

fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/test/TestApplicationTests.java

@@ -34,7 +34,7 @@ public class TestApplicationTests {
 //        for (PicContentKeywords  keyWord : picContentKeywords) {
 //            redisUtil.sSetJsonString("keyWords",keyWord);
 //        }
-        redisUtil.deleteKey("list1");
+//        redisUtil.deleteKey("list1");
 //        Set<Object> keyWords = redisUtil.members("keyWords");
 //        for (Object keyWord : keyWords) {
 //            JSONObject jsonMember = JSON.parseObject((String)keyWord);
@@ -43,14 +43,14 @@ public class TestApplicationTests {
 //        }
 
 
-//        Map<String,Object> map = AuthService.getAuth(Constant.API_KEY, Constant.SECRET_KEY);
-//        String accessToken = (String)map.get("access_token");
-//        Long expiresTimeOut = (Long)map.get("expires_in");
-//        System.out.println("accessToken:==="+accessToken);
-//        System.out.println("expiresTimeOut:==="+expiresTimeOut);
-//        redisUtil.setKeyWithExpireTime("accessToken",accessToken,expiresTimeOut);
-////        redisUtil.setString("wtt","aaa");
-//        System.out.println(redisUtil.getKey("accessToken"));
+        Map<String,Object> map = AuthService.getAuth(Constant.API_KEY, Constant.SECRET_KEY);
+        String accessToken = (String)map.get("access_token");
+        Long expiresTimeOut = (Long)map.get("expires_in");
+        System.out.println("accessToken:==="+accessToken);
+        System.out.println("expiresTimeOut:==="+expiresTimeOut);
+        redisUtil.setKeyWithExpireTime("accessToken",accessToken,expiresTimeOut);
+//        redisUtil.setString("wtt","aaa");
+        System.out.println(redisUtil.getKey("accessToken"));
 
 //        for (String keyWord : Constant.keyWords) {
 //            redisUtil.sSet("keyWords",keyWord);