Merge branch 'musicScore' of http://git.dayaedu.com/yonge/mec into test

 Conflicts:

	mec-common/audit-log/src/main/java/com/yonge/log/interceptor/AuditLogInterceptor.java

cms/src/main/java/com/ym/mec/cms/interceptor/OperationLogInterceptor.java

@@ -25,7 +25,7 @@ public class OperationLogInterceptor extends AuditLogInterceptor {
 	public boolean preHandle(HttpServletRequest request, HttpServletResponse response, Object handler) throws ServletException, IOException {
 		SysUser sysUser = sysUserFeignService.queryUserInfo();
 		if (sysUser != null) {
-			setUsername(sysUser.getRealName());
+			setUsername(sysUser.getRealName(),sysUser.getId());
 		}
 		return true;
 	}

mec-common/audit-log/src/main/java/com/yonge/log/dal/model/AuditLog.java

@@ -18,6 +18,8 @@ public class AuditLog implements Serializable {
 
 	private String username;
 
+	private Integer userId;
+
 	private String operateName;
 
 	private String interfaceUrl;
@@ -32,6 +34,14 @@ public class AuditLog implements Serializable {
 
 	private String service;
 
+	public Integer getUserId() {
+		return userId;
+	}
+
+	public void setUserId(Integer userId) {
+		this.userId = userId;
+	}
+
 	public String getService() {
 		return service;
 	}

mec-common/audit-log/src/main/java/com/yonge/log/interceptor/AuditLogInterceptor.java

@@ -36,6 +36,8 @@ public class AuditLogInterceptor extends HandlerInterceptorAdapter {
 
 	private String username;
 
+	private Integer userId;
+
 	private SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
 
 	private static List<String> ignoreLogUrl;
@@ -99,20 +101,22 @@ public class AuditLogInterceptor extends HandlerInterceptorAdapter {
 		auditLog.setService(clientName);
 		auditLog.setUserIp(WebUtil.getRemoteIp(request));
 
-		Map<String, Object> params = WebUtil.getParameterMap(request);
-		if (params == null || params.size() == 0) {
-			auditLog.setInputParams(IOUtils.toString(request.getInputStream(), Charset.defaultCharset()));
-		} else {
-			auditLog.setInputParams(JsonUtil.toJSONString(WebUtil.getParameterMap(request)));
-		}
-		// 操作人
-		auditLog.setUsername(username);
-		auditLog.setOperateTime(sdf.format(new Date()));
-		auditLogService.insert(auditLog);
+			Map<String, Object> params = WebUtil.getParameterMap(request);
+			if (params == null || params.size() == 0) {
+				auditLog.setInputParams(IOUtils.toString(request.getInputStream(), Charset.defaultCharset()));
+			} else {
+				auditLog.setInputParams(JsonUtil.toJSONString(WebUtil.getParameterMap(request)));
+			}
+			// 操作人
+			auditLog.setUsername(username);
+			auditLog.setUserId(userId);
+			auditLog.setOperateTime(sdf.format(new Date()));
+			auditLogService.insert(auditLog);
 	}
 
-	public void setUsername(String username) {
+	public void setUsername(String username,Integer userId) {
 		this.username = username;
+		this.userId = userId;
 	}
 
 }

mec-student/src/main/java/com/ym/mec/student/interceptor/OperationLogInterceptor.java

@@ -23,7 +23,7 @@ public class OperationLogInterceptor extends AuditLogInterceptor {
 	public boolean preHandle(HttpServletRequest request, HttpServletResponse response, Object handler) throws ServletException, IOException {
 		SysUser sysUser = sysUserFeignService.queryUserInfo();
 		if (sysUser != null) {
-			setUsername(sysUser.getRealName());
+			setUsername(sysUser.getRealName(),sysUser.getId());
 		}
 		return true;
 	}

mec-teacher/src/main/java/com/ym/mec/teacher/interceptor/OperationLogInterceptor.java

@@ -23,7 +23,7 @@ public class OperationLogInterceptor extends AuditLogInterceptor {
 	public boolean preHandle(HttpServletRequest request, HttpServletResponse response, Object handler) throws ServletException, IOException {
 		SysUser sysUser = sysUserFeignService.queryUserInfo();
 		if (sysUser != null) {
-			setUsername(sysUser.getRealName());
+			setUsername(sysUser.getRealName(),sysUser.getId());
 		}
 		return true;
 	}

mec-web/src/main/java/com/ym/mec/web/interceptor/OperationLogInterceptor.java

@@ -25,7 +25,7 @@ public class OperationLogInterceptor extends AuditLogInterceptor {
 	public boolean preHandle(HttpServletRequest request, HttpServletResponse response, Object handler) throws ServletException, IOException {
 		SysUser sysUser = sysUserFeignService.queryUserInfo();
 		if (sysUser != null) {
-			setUsername(sysUser.getRealName());
+			setUsername(sysUser.getRealName(),sysUser.getId());
 		}
 		return true;
 	}