1、优化系统管理；

user-service/src/main/java/com/mh/user/controller/SysLoginController.java

@@ -88,6 +88,7 @@ public class SysLoginController {
 		}
 		// 系统登录认证
 		JwtAuthenticatioToken token = SecurityUtils.login(request, username, password, authenticationManager);
+		sysUserService.updateLoginTime(user.getId());
 		return HttpResult.ok(token);
 	}
 }

user-service/src/main/java/com/mh/user/mapper/SysUserMapper.java

@@ -58,4 +58,7 @@ public interface SysUserMapper {
     //查询所有记录数
     @SelectProvider(type = SysUserProvider.class,method = "getCount")
     int getCount(@Param(value = "userName") String userName,@Param(value = "page") int page,@Param(value = "limit") int limit);
+
+    @Update("update sys_user set login_time = getdate() where id = #{id}")
+    void updateLoginTime(@Param("id") Long id);
 }

user-service/src/main/java/com/mh/user/mapper/provider/SysLogProvider.java

@@ -5,7 +5,7 @@ public class SysLogProvider {
     public String findLogs(String userName, int page, int limit){
         StringBuffer sql = new StringBuffer("");
         sql.append("select * from (" +
-                " select *,ROW_NUMBER() over(order by id) as rn from sys_log  " +
+                " select *,ROW_NUMBER() over(order by id desc) as rn from sys_log  " +
                 " where 1=1 ");
         if (userName != null && !userName.equals("")){
             sql.append(" AND user_name = #{userName} ");
@@ -23,7 +23,7 @@ public class SysLogProvider {
     public String findCount(String userName, int page, int limit){
         StringBuffer sql = new StringBuffer("");
         sql.append("select count(*) from (" +
-                " select *,ROW_NUMBER() over(order by id) as rn from  sys_log " +
+                " select *,ROW_NUMBER() over(order by id desc) as rn from  sys_log " +
                 " where 1=1 ");
         if (userName != null && !userName.equals("")){
             sql.append(" AND user_name = #{userName} ");

user-service/src/main/java/com/mh/user/model/SysUser.java

@@ -1,6 +1,7 @@
 package com.mh.user.model;
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.fasterxml.jackson.annotation.JsonProperty;
 import jdk.nashorn.internal.ir.annotations.Ignore;
 import lombok.Getter;
 import lombok.Setter;
@@ -15,10 +16,10 @@ public class SysUser extends BaseModel {
 
     private String userName;
 
-    @JsonIgnore
+    @JsonProperty(access = JsonProperty.Access.WRITE_ONLY)
     private String password;
 
-    @JsonIgnore
+    @JsonProperty(access = JsonProperty.Access.WRITE_ONLY)
     private String salt;
 
     private String email;

user-service/src/main/java/com/mh/user/security/UserDetailsServiceImpl.java

@@ -34,8 +34,8 @@ public class UserDetailsServiceImpl implements UserDetailsService {
         // 用户权限列表，根据用户拥有的权限标识与如 @PreAuthorize("hasAuthority('sys:menu:view')") 标注的接口对比，决定是否可以调用接口
         Set<String> permissions = sysUserService.findPermissions(user.getSystemId(),user.getUserName());
         List<GrantedAuthority> grantedAuthorities = permissions.stream().map(GrantedAuthorityImpl::new).collect(Collectors.toList());
-        System.out.println("获取权限列表"+grantedAuthorities);
-        System.out.println(user.getUserName());
+//        System.out.println("获取权限列表"+grantedAuthorities);
+//        System.out.println(user.getUserName());
         return new JwtUserDetails(user.getUserName(), user.getPassword(), user.getSalt(), grantedAuthorities);
     }
 }

user-service/src/main/java/com/mh/user/service/SysUserService.java

@@ -42,4 +42,5 @@ public interface SysUserService extends CurdService<SysUser> {
 	//查询记录数
 	int getCount(String userName,int page,int limit);
 
+	void updateLoginTime(Long id);
 }

user-service/src/main/java/com/mh/user/service/impl/SysUserServiceImpl.java

@@ -1,9 +1,7 @@
 package com.mh.user.service.impl;
 
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Set;
+import java.util.*;
+
 import com.mh.common.page.ColumnFilter;
 import com.mh.common.page.MybatisPageHelper;
 import com.mh.common.page.PageRequest;
@@ -18,6 +16,7 @@ import com.mh.user.model.SysUser;
 import com.mh.user.model.SysUserRole;
 import com.mh.user.service.SysMenuService;
 import com.mh.user.service.SysUserService;
+import com.mh.user.utils.SecurityUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -54,10 +53,14 @@ public class SysUserServiceImpl  implements SysUserService {
 		Long id = null;
 		if(record.getId() == null || record.getId() == 0) {
 			// 新增用户
+			record.setCreateBy(SecurityUtils.getUsername());
+			record.setCreateTime(new Date());
 			sysUserMapper.insertSelective(record);
 			SysUser sysUser=sysUserMapper.findByName(record.getUserName());
 			id = sysUser.getId();
 		} else {
+			record.setLastUpdateBy(SecurityUtils.getUsername());
+			record.setLastUpdateTime(new Date());
 			// 更新用户信息
 			sysUserMapper.updateByPrimaryKeySelective(record);
 		}
@@ -199,4 +202,9 @@ public class SysUserServiceImpl  implements SysUserService {
 	public int getCount(String userName, int page, int limit) {
 		return sysUserMapper.getCount(userName,page,limit);
 	}
+
+	@Override
+	public void updateLoginTime(Long id) {
+		sysUserMapper.updateLoginTime(id);
+	}
 }

user-service/src/main/java/com/mh/user/utils/SecurityUtils.java

@@ -35,7 +35,7 @@ public class SecurityUtils {
 	    SecurityContextHolder.getContext().setAuthentication(authentication);
 		// 生成令牌并返回给客户端
 	    token.setToken(JwtTokenUtils.generateToken(authentication));
-        System.out.println("返回token到前端！");
+//        System.out.println("返回token到前端！");
 		return token;
 	}
 

user-service/src/main/resources/application-dev.yml

@@ -1,5 +1,5 @@
 server:
-  port: 8766 #8764新珠江,8766广合科技,8767广大科技,8768珠江国际,8769保利山庄,8770东莞迎宾馆
+  port: 8764 #8764新珠江,8766广合科技,8767广大科技,8768珠江国际,8769保利山庄,8770东莞迎宾馆
 spring:
   application:
     name: jnd-user-service