Merge remote-tracking branch 'origin/demo/edit' into demo/edit

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

@@ -75,15 +75,15 @@ public class ResourceServerConfigurer extends ResourceServerConfigurerAdapter {
                 .antMatchers("/qc/behospitalInfo/page_group").permitAll()
                 .antMatchers("/qc/casesEntryHospital/findQcCasesEntry").permitAll()
                 .antMatchers("/qc/dataimport/import").permitAll()
-                .antMatchers("/qc/dataimport/test").permitAll()
+//                .antMatchers("/qc/dataimport/test").permitAll()
                 .antMatchers("/qc/behospitalInfo/exportExcel").permitAll()
                 .antMatchers("/qc/behospitalInfo/exportQcresult").permitAll()
                 .antMatchers("/qc/behospitalInfo/exportQcresultByDept").permitAll()
                 .antMatchers("/qc/behospitalInfo/exportQcresultByGroup").permitAll()
                 .antMatchers("/qc/abnormal/getQcAnnormalMode").permitAll()
-                .antMatchers("/qc/dataimport/import").permitAll()
+//                .antMatchers("/qc/dataimport/import").permitAll()
                 .antMatchers("/qc/dataimport/dataimportPrepare").permitAll()
-                .antMatchers("/qc/dataimport/test").permitAll()
+//                .antMatchers("/qc/dataimport/test").permitAll()
                 .antMatchers("/sys/user/pageset/getPageSet").permitAll()
                 .antMatchers("/sys/user/pageset/savePageSet").permitAll()
                 .antMatchers("/sys/user/pageset/getDefultPageSet").permitAll()
@@ -288,7 +288,7 @@ public class ResourceServerConfigurer extends ResourceServerConfigurerAdapter {
                 .antMatchers("/qc/qcType/add").permitAll()
                 .antMatchers("/qc/qcType/update").permitAll()
                 .antMatchers("/qc/qcType/copy").permitAll()
-                .antMatchers("/medNewsNotice/**").permitAll()
+//                .antMatchers("/medNewsNotice/**").permitAll()
                 .antMatchers("/str/FirstRecord/infos").permitAll()
                 .antMatchers("/str/WardRecord/infos").permitAll()
                 .antMatchers("/str/ConsultationApply/infos").permitAll()
@@ -308,7 +308,7 @@ public class ResourceServerConfigurer extends ResourceServerConfigurerAdapter {
                 .antMatchers("/str/DifficultCase/infos").permitAll()
                 .antMatchers("/str/BloodResult/infos").permitAll()
                 .antMatchers("/str/PeriodConclusion/infos").permitAll()
-//                .antMatchers("/str/IllSeriousl/infos").permitAll()
+                .antMatchers("/str/IllSeriousl/infos").permitAll()
                 .antMatchers("/**").authenticated();
         //                .antMatchers("/**").permitAll();
     }

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

@@ -127,8 +127,8 @@ public class UrlAccessDecisionManager implements AccessDecisionManager {
                 || matchers("/qc/behospitalInfo/page_group", request)
                 || matchers("/qc/casesEntryHospital/findQcCasesEntry", request)
                 || matchers("/qc/behospitalInfo/exportExcel", request)
-                || matchers("/qc/dataimport/import", request)
-                || matchers("/qc/dataimport/test", request)
+//                || matchers("/qc/dataimport/import", request)
+//                || matchers("/qc/dataimport/test", request)
                 || matchers("/qc/behospitalInfo/exportExcel", request)
                 || matchers("/qc/behospitalInfo/exportQcresult", request)
                 || matchers("/qc/behospitalInfo/exportQcresultByDept", request)
@@ -136,7 +136,7 @@ public class UrlAccessDecisionManager implements AccessDecisionManager {
                 || matchers("/qc/abnormal/getQcAnnormalMode", request)
                 || matchers("/qc/dataimport/import", request)
                 || matchers("/qc/dataimport/dataimportPrepare", request)
-                || matchers("/qc/dataimport/test", request)
+//                || matchers("/qc/dataimport/test", request)
                 || matchers("/sys/user/pageset/getPageSet", request)
                 || matchers("/sys/user/pageset/savePageSet", request)
                 || matchers("/sys/user/pageset/getDefaultPageSet", request)
@@ -406,7 +406,7 @@ public class UrlAccessDecisionManager implements AccessDecisionManager {
                 || matchers("/str/DifficultCase/infos", request)
                 || matchers("/str/BloodResult/infos", request)
                 || matchers("/str/PeriodConclusion/infos", request)
-//                || matchers("/str/IllSeriousl/infos", request)
+                || matchers("/str/IllSeriousl/infos", request)
                 || matchers("/", request)) {
             return true;
         }