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

edu-auth/edu-auth-server/src/main/java/com/keao/edu/auth/config/WebMvcConfig.java

@@ -28,15 +28,8 @@ public class WebMvcConfig implements WebMvcConfigurer {
 	
 	@Override
 	public void addInterceptors(InterceptorRegistry registry) {
-		// addPathPatterns 用于添加拦截规则, 这里假设拦截 /url 后面的全部链接
-		List<String> includePathPatterns = new ArrayList<String>();
-		includePathPatterns.add("/**");
 
-		// excludePathPatterns 用户排除拦截
-		List<String> excludePathPatterns = new ArrayList<String>();
-		excludePathPatterns.add("/login");
-
-		registry.addInterceptor(getDataSrouceInterceptor()).addPathPatterns(includePathPatterns).excludePathPatterns(excludePathPatterns);
+		registry.addInterceptor(getDataSrouceInterceptor()).addPathPatterns("/**");
 	}
 
 	@Bean

edu-user/edu-user-server/src/main/resources/config.mybatis/SysUserMapper.xml

@@ -138,7 +138,7 @@
 
     <!-- 分页查询 -->
     <select id="queryPage" resultMap="SysUser" parameterType="map">
-        SELECT * FROM sys_user ORDER BY id_
+        SELECT * FROM sys_user 
         <include refid="queryCondition"/>
         <include refid="global.orderby"/>
         <include refid="global.limit"/>