Merge remote-tracking branch 'origin/dev/20200616_1.3.5' into debug

# Conflicts:
#	src/main/java/com/diagbot/config/ResourceServerConfigurer.java
#	src/main/java/com/diagbot/config/security/UrlAccessDecisionManager.java

src/main/java/com/diagbot/config/ResourceServerConfigurer.java

@@ -71,6 +71,9 @@ public class ResourceServerConfigurer extends ResourceServerConfigurerAdapter {
                 .antMatchers("/qc/dataimport/test").permitAll()
                 .antMatchers("/sys/user/pageset/getPageSet").permitAll()
                 .antMatchers("/sys/user/pageset/savePageSet").permitAll()
+                .antMatchers("/consoleByDept/getDept").permitAll()
+                .antMatchers("/console/entryRejectPercent").permitAll()
+                .antMatchers("/console/qcResultLevelPercent").permitAll()
                 .antMatchers("/console/averageStatistics").permitAll()
                 .antMatchers("/console/entryByDept").permitAll()
                 .antMatchers("/console/entryCountGroupByCase").permitAll()
@@ -102,7 +105,6 @@ public class ResourceServerConfigurer extends ResourceServerConfigurerAdapter {
                 .antMatchers("/consoleByDept/entryCountGroupByEntryAndDept").permitAll()
                 .antMatchers("/consoleByDept/entryCountGroupByEntryAndDeptPage").permitAll()
                 .antMatchers("/consoleByDept/entryGroupByEntryAndDeptInnerPage").permitAll()
-                .antMatchers("/consoleByDept/getDept").permitAll()
                 .antMatchers("/consoleByDept/homePageLevelByDeptLimit").permitAll()
                 .antMatchers("/consoleByDept/homePageLevelStatisticsByDept").permitAll()
                 .antMatchers("/consoleByDept/leaveHosCountByDept").permitAll()

src/main/java/com/diagbot/config/security/UrlAccessDecisionManager.java

@@ -115,6 +115,9 @@ public class UrlAccessDecisionManager implements AccessDecisionManager {
                 || matchers("/qc/dataimport/test", request)
                 || matchers("/sys/user/pageset/getPageSet", request)
                 || matchers("/sys/user/pageset/savePageSet", request)
+                || matchers("/consoleByDept/getDept", request)
+                || matchers("/console/entryRejectPercent", request)
+                || matchers("/console/qcResultLevelPercent", request)
                 || matchers("/console/averageStatistics", request)
                 || matchers("/console/entryByDept", request)
                 || matchers("/console/entryCountGroupByCase", request)
@@ -146,7 +149,6 @@ public class UrlAccessDecisionManager implements AccessDecisionManager {
                 || matchers("/consoleByDept/entryCountGroupByEntryAndDept", request)
                 || matchers("/consoleByDept/entryCountGroupByEntryAndDeptPage", request)
                 || matchers("/consoleByDept/entryGroupByEntryAndDeptInnerPage", request)
-                || matchers("/consoleByDept/getDept", request)
                 || matchers("/consoleByDept/homePageLevelByDeptLimit", request)
                 || matchers("/consoleByDept/homePageLevelStatisticsByDept", request)
                 || matchers("/consoleByDept/leaveHosCountByDept", request)