Merge branch 'develop' of http://git.dayaedu.com/yonge/cooleshow into develop

cooleshow-app/src/main/java/com/yonge/cooleshow/config/ResourceServerConfig.java

@@ -29,7 +29,7 @@ public class ResourceServerConfig extends ResourceServerConfigurerAdapter {
 				.authenticationEntryPoint(baseAuthenticationEntryPoint).and()
 				// .authorizeRequests().antMatchers("/task/**").hasIpAddress("0.0.0.0/0")
 				.authorizeRequests()
-				.antMatchers("/task/**").permitAll()
+				.antMatchers("/*/task/**").permitAll()
 				.antMatchers(
 						"/v2/api-docs",
 						"/*/v2/api-docs",

cooleshow-app/src/main/java/com/yonge/cooleshow/tenant/controller/TenantActivationCodeController.java

@@ -109,7 +109,7 @@ public class TenantActivationCodeController extends BaseController {
             instance.set(Calendar.HOUR_OF_DAY, 23);
             instance.set(Calendar.MINUTE, 59);
             instance.set(Calendar.MILLISECOND, 59);
-            query.setActivationEndTime(parse);
+            query.setActivationEndTime(instance.getTime());
         }
         IPage<TenantActivationCodeWrapper.TenantActivationCode> pages =
                 tenantActivationCodeService.selectPage(QueryInfo.getPage(query), query);

cooleshow-auth/auth-server/src/main/java/com/yonge/cooleshow/auth/core/handler/BaseAuthenticationFailureEvenHandler.java

@@ -13,6 +13,7 @@ import org.springframework.stereotype.Component;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
+import java.util.Optional;
 
 @Component
 public class BaseAuthenticationFailureEvenHandler extends ExceptionMappingAuthenticationFailureHandler {
@@ -27,7 +28,7 @@ public class BaseAuthenticationFailureEvenHandler extends ExceptionMappingAuthen
     	
     	int resultCode = HttpStatus.SC_CONFLICT;
     	
-        String message = exception.getLocalizedMessage();
+        String message = Optional.ofNullable(exception.getLocalizedMessage()).orElse("系统异常");
 
         String data = null;
         if (message.equals("Bad credentials")) {

cooleshow-auth/auth-server/src/main/java/com/yonge/cooleshow/auth/core/provider/service/DefaultUserDetailsService.java

@@ -13,6 +13,7 @@ import com.yonge.cooleshow.common.enums.UserLockFlag;
 import com.yonge.cooleshow.common.security.AuthUser;
 import com.yonge.cooleshow.common.security.SecurityConstants;
 import com.yonge.cooleshow.common.util.WebUtil;
+import com.yonge.toolset.base.result.BaseResult;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.authentication.LockedException;
@@ -26,6 +27,7 @@ import org.springframework.stereotype.Service;
 
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Optional;
 
 @Service
 public class DefaultUserDetailsService implements UserDetailsService {
@@ -71,7 +73,8 @@ public class DefaultUserDetailsService implements UserDetailsService {
         }
         //判断用户是否被锁定
         if (SysUserType.STUDENT.getCode().equals(clientId)) {
-            StudentApi data = adminFeignService.getStudent(sysUser.getId()).getData();
+            StudentApi data = Optional.ofNullable(adminFeignService.getStudent(sysUser.getId()))
+                    .map(BaseResult::getData).orElse(null);
             if (data == null) {
                 throw new UsernameNotFoundException("账户不存在");
             }
@@ -79,7 +82,8 @@ public class DefaultUserDetailsService implements UserDetailsService {
                 throw new LockedException("账户被锁定");
             }
         }else if(SysUserType.TEACHER.getCode().equals(clientId)) {
-            TeacherApi data = adminFeignService.getTeacher(sysUser.getId()).getData();
+            TeacherApi data = Optional.ofNullable(adminFeignService.getTeacher(sysUser.getId()))
+                    .map(BaseResult::getData).orElse(null);
             if (data == null) {
                 throw new UsernameNotFoundException("账户不存在");
             }
@@ -87,7 +91,8 @@ public class DefaultUserDetailsService implements UserDetailsService {
                 throw new LockedException("账户被锁定");
             }
         }else if(SysUserType.SYSTEM.getCode().equals(clientId)) {
-            EmployeeApi data = adminFeignService.getEmployee(sysUser.getId()).getData();
+            EmployeeApi data = Optional.ofNullable(adminFeignService.getEmployee(sysUser.getId()))
+                    .map(BaseResult::getData).orElse(null);
             if (data == null) {
                 throw new UsernameNotFoundException("账户不存在");
             }
@@ -95,7 +100,8 @@ public class DefaultUserDetailsService implements UserDetailsService {
                 throw new LockedException("账户被锁定");
             }
         } else if (SysUserType.ORGANIZATION.getCode().equals(clientId)) {
-            TenantWrapper.Staff tenantStaff = adminFeignService.getTenantStaff(sysUser.getId()).getData();
+            TenantWrapper.Staff tenantStaff = Optional.ofNullable(adminFeignService.getTenantStaff(sysUser.getId()))
+                    .map(BaseResult::getData).orElse(null);
             if (tenantStaff == null) {
                 throw new UsernameNotFoundException("账户不存在");
             }

cooleshow-user/user-tenant/src/main/java/com/yonge/cooleshow/tenant/controller/TenantActivationCodeController.java

@@ -110,7 +110,7 @@ public class TenantActivationCodeController extends BaseController {
             instance.set(Calendar.HOUR_OF_DAY, 23);
             instance.set(Calendar.MINUTE, 59);
             instance.set(Calendar.MILLISECOND, 59);
-            query.setActivationEndTime(parse);
+            query.setActivationEndTime(instance.getTime());
         }
         IPage<TenantActivationCodeWrapper.TenantActivationCode> pages =
                 tenantActivationCodeService.selectPage(QueryInfo.getPage(query), query);