Merge branch 'master' of http://git.dayaedu.com/yonge/edu-saas

edu-user/edu-user-server/src/main/java/com/keao/edu/user/config/ResourceServerConfig.java

@@ -26,7 +26,7 @@ public class ResourceServerConfig extends ResourceServerConfigurerAdapter {
     public void configure(HttpSecurity http) throws Exception {
         http.authorizeRequests()
                 .antMatchers("/task/*","/v2/api-docs", "/su/**", "/student/apply", "/examRegistration/ocr", "/examOrder/paymentResult",
-                        "/examOrder/notify","/examinationBasic/getInfo","/examOrder/executePayment","/examOrder/pageList","/studentExamResult/recordSync")
+                        "/examOrder/notify","/examinationBasic/getInfo","/examOrder/executePayment","/examOrder/pageList","/studentExamResult/recordSync", "/appVersionInfo/queryByPlatform")
                 .permitAll()
                 .anyRequest().authenticated().and().csrf().disable().exceptionHandling().accessDeniedHandler(baseAccessDeniedHandler)
                 .authenticationEntryPoint(baseAuthenticationEntryPoint).and();

edu-util/src/main/java/com/keao/edu/util/excel/POIUtil.java

@@ -641,6 +641,9 @@ public class POIUtil {
      */
     public static Map<String, List<PictureData>> getXlsPictures(HSSFSheet sheet) throws IOException {
         Map<String, List<PictureData>> map = new HashMap<>();
+        if(sheet.getDrawingPatriarch() == null || sheet.getDrawingPatriarch().getChildren()==null){
+            return map;
+        }
         List<HSSFShape> list = sheet.getDrawingPatriarch().getChildren();
         for (HSSFShape shape : list) {
             if (shape instanceof HSSFPicture) {