Merge branch 'master' of ssh://111.61.77.35:15/gengdidi/zhengyuan-danger-chemistry-manage

danger-manage-framework/src/main/java/com/zehong/framework/config/SecurityConfig.java

@@ -98,7 +98,7 @@ public class SecurityConfig extends WebSecurityConfigurerAdapter
                 // 过滤请求
                 .authorizeRequests()
                 // 对于登录login 验证码captchaImage 允许匿名访问
-                .antMatchers("/login", "/captchaImage","/bx/send").anonymous()
+                .antMatchers("/login", "/captchaImage","/bx/send","/bx/testsend").anonymous()
                 .antMatchers(
                         HttpMethod.GET,
                         "/*.html",

danger-manage-system/src/main/java/com/zehong/system/service/impl/TEntranceGuardPersonInfoServiceImpl.java

@@ -169,7 +169,7 @@ public class TEntranceGuardPersonInfoServiceImpl implements ITEntranceGuardPerso
             contents[i+2]=tEntranceGuardPersonInfo.getPersonName()+" "+crc+" "+DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD_HH_MM_SS,tEntranceGuardPersonInfo.getActionTime());
             i++;
         }
-        contents[5]="      "+DateUtils.getDate();//展示当日日期
+        contents[5]="                    "+DateUtils.getDate();//展示当日日期
         //执行发送
         send(contents);