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/controller/ScreenshotController.java

@@ -15,7 +15,8 @@ import org.springframework.web.bind.annotation.RestController;
  */
 @RestController
 @RequestMapping("/screenshot")
-public class ScreenshotController {
+public class 
+creenshotController {
 
 }
 

fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/service/impl/ScreenshotServiceImpl.java

@@ -40,6 +40,7 @@ public class ScreenshotServiceImpl extends ServiceImpl<ScreenshotMapper, Screens
 
     @Autowired
     private RedisUtil redisUtil;
+
     @Resource
     private ScreenshotMapper screenshotMapper;
 
@@ -50,15 +51,13 @@ public class ScreenshotServiceImpl extends ServiceImpl<ScreenshotMapper, Screens
         BeanUtils.copyProperties(screenshotvo,screenshot);
         screenshot.setPicUrl(filePath);
         screenshot.setDateStr(DateTimeFormatter.ofPattern("yyyy-MM-dd").format(screenshotvo.getIndate()));
-        screenshotMapper.insert(screenshot);
         String accessToken = "";
         if (redisUtil.existsKey("accessToken")) {
             accessToken = redisUtil.getKey("accessToken");
         } else {
             Map<String, Object> map = AuthService.getAuth(Constant.API_KEY, Constant.SECRET_KEY);
             accessToken = (String) map.get("access_token");
-            Long expiresTimeOut = (Long) map.get("expires_in");
-            redisUtil.setKeyWithExpireTime("accessToken", accessToken, expiresTimeOut);
+            redisUtil.setKeyWithExpireTime("accessToken", accessToken, (Long) map.get("expires_in"));
         }
         //利用token去检测
 //        DateTimeFormatter dateTimeFormatter = DateTimeFormatter.ofPattern("yyyy-MM-dd");
@@ -69,7 +68,7 @@ public class ScreenshotServiceImpl extends ServiceImpl<ScreenshotMapper, Screens
         Set<Object> members = redisUtil.members(Constant.COMMON_SOFTWARE_KEYWORDS);
             for (String textContent : textContents) {
                 for (Object member : members) {
-                    //由于redis里存储的member是一个PicContentKeywords类型的json字符串，所以取出关键字类容比较
+                    //由于redis里存储的member是一个PicContentKeywords类型的json字符串，所以取出关键字内容比较
                     JSONObject jsonMember = JSON.parseObject((String)member);
                     if (textContent.contains(jsonMember.getString("content"))) {
                         //包含关键字们可以简单认为是在用常用开发软件
@@ -79,7 +78,7 @@ public class ScreenshotServiceImpl extends ServiceImpl<ScreenshotMapper, Screens
                     }
                 }
             }
-        screenshotMapper.updateById(screenshot);
+        screenshotMapper.insert(screenshot);
         return new HttpRespMsg();
     }
 }

fhKeeper/formulahousekeeper/pom.xml

@@ -174,6 +174,12 @@
                 <groupId>com.baidu.aip</groupId>
                 <artifactId>java-sdk</artifactId>
                 <version>${baidu.api.sdk.version}</version>
+                <exclusions>
+                    <exclusion>
+                        <groupId>org.slf4j</groupId>
+                        <artifactId>slf4j-simple</artifactId>
+                    </exclusion>
+                </exclusions>
             </dependency>
 
         </dependencies>