Open
Conversation
Owner
|
wdea |
develop Conflicts: src/pomonitor/analyse/articlesubanalyse/ISubScoreAdd.java src/pomonitor/clawer/Crawl.java src/pomonitor/clawer/Frontier.java src/pomonitor/entity/NewsEntity.java src/pomonitor/test/TestNewsCrawler.java
修改了一些接口不健康的状态
develop Conflicts: src/pomonitor/analyse/articlesubanalyse/ISubScoreAdd.java src/pomonitor/analyse/articlesubanalyse/SubScoreAddPos.java src/pomonitor/analyse/articlesubanalyse/SubScoreAddWord.java src/pomonitor/analyse/articlesubanalyse/SubSentenceGet.java src/pomonitor/view/Test.java
develop Conflicts: src/pomonitor/clawer/newsanalyse/FenghuangAnalyse.java
develop Conflicts: WebRoot/js/hotword.js
develop Conflicts: WebRoot/hotword.html
develop Conflicts: src/META-INF/persistence.xml src/pomonitor.properties
develop Conflicts: WebRoot/js/websiteEvaluate-default.js WebRoot/js/websiteEvaluate.js src/META-INF/persistence.xml
develop Conflicts: WebRoot/js/websiteEvaluate-default.js WebRoot/js/websiteEvaluate.js
develop Conflicts: WebRoot/js/hotword.js WebRoot/js/websiteEvaluate-default.js WebRoot/js/websiteEvaluate.js
2.将JSON文件放置指定目录，并更新了引用 3.修改某些id名称，并更新了引用
develop Conflicts: src/pomonitor/analyse/ArticleTendAnalyse.java
develop Conflicts: src/META-INF/persistence.xml
develop Conflicts: src/pomonitor/clawer/newsanalyse/TengXunAnalyse.java
develop Conflicts: WebRoot/js/hotword.js src/META-INF/persistence.xml
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
No description provided.