用户管理增删改接口，登录验证调整

src/main/java/com/hb/proj/allconfig/APICallInterceptor.java

@@ -28,6 +28,9 @@ public class APICallInterceptor implements HandlerInterceptor {
 	
 	private  static  Set<String> EXCLUDE_PATHS=null;
 	
+	public APICallInterceptor() {
+		
+	}
 	public APICallInterceptor(String excludePath) {
 		if(StringUtils.isNotBlank(excludePath)) {
 			String[] ep=excludePath.split(",");
@@ -50,10 +53,10 @@ public class APICallInterceptor implements HandlerInterceptor {
 		String reqUri=request.getRequestURI();
 		reqUri=reqUri.replaceFirst(request.getContextPath(), "");
 		
-		if(isExcludePath(reqUri)) {
-			logger.debug("该请求地址为排除地址："+reqUri);
-			return true;
-		}
+		/*
+		 * if(isExcludePath(reqUri)) { logger.debug("该请求地址为排除地址："+reqUri); return true;
+		 * }
+		 */
 		
 		
 		String token=request.getHeader(CacheConfig.TOKEN_HEADER_NAME);

src/main/java/com/hb/proj/allconfig/AccessToken.java

@@ -26,8 +26,9 @@ public class AccessToken {
 		
 	}
 	
-	public AccessToken(String tokenId) {
+	public AccessToken(String tokenId,boolean superAdminIf) {
 		this.tokenId=tokenId;
+		this.superAdminIf=superAdminIf;
 	}
 	
 	public AccessToken(String tokenId,String authCodes) {
@@ -40,7 +41,7 @@ public class AccessToken {
 		if(superAdminIf) {
 			return true;
 		}
-		if(StringUtils.isBlank(uri)) {
+		if(StringUtils.isBlank(uri)||StringUtils.isBlank(authCodes)) {
 			return false;
 		}
 		return authCodes.contains("~"+MD5Encrypt.md5(uri.trim())+"~");

src/main/java/com/hb/proj/allconfig/CustomMethodArgumentResolver.java

@@ -22,6 +22,10 @@ public class CustomMethodArgumentResolver implements
 		if(parameter.getParameterType().isAssignableFrom(RequestParams.class)){
 			return true;
 		}
+		if(parameter.getParameterType().isAssignableFrom(AccessToken.class)){
+			return true;
+		}
+		
 		return false;
 	}
 
@@ -43,6 +47,11 @@ public class CustomMethodArgumentResolver implements
 			 
 			return reqParams;
 		}
+		
+		if(parameter.getParameterType().equals(AccessToken.class)) {
+			String token=webRequest.getHeader(CacheConfig.TOKEN_HEADER_NAME);
+			return CacheConfig.get(token);
+		}
 		return null;
 	}
 

src/main/java/com/hb/proj/allconfig/SpringMvcConfigurer.java

@@ -77,26 +77,27 @@ public class SpringMvcConfigurer implements WebMvcConfigurer {
      * api调用权限控制过滤器
      * @return
      */
-    /*@Bean
+    @Bean
     public FilterRegistrationBean<APICallFilter> apiCallFilter() {
     	FilterRegistrationBean<APICallFilter> apiFilter=new FilterRegistrationBean<>(new APICallFilter());
     	apiFilter.addInitParameter("excludePath", excludePath);
     	//apiFilter.setName("apiCallFilter");
     	apiFilter.addUrlPatterns("/*");
     	return apiFilter;
-    }*/
+    }
     
     
-	@Override
-	public void addInterceptors(InterceptorRegistry registry) {
-		//LocaleChangeInterceptor localeInterceptor = new LocaleChangeInterceptor();
-        //localeInterceptor.setParamName("lang");  //拦截lang参数
-		
-		APICallInterceptor  apiCallInterceptor=new APICallInterceptor(excludePath);
-		registry.addInterceptor(apiCallInterceptor);
-				//.excludePathPatterns("");
-		
-	}
+	/*
+	 * @Override public void addInterceptors(InterceptorRegistry registry) {
+	 * //LocaleChangeInterceptor localeInterceptor = new LocaleChangeInterceptor();
+	 * //localeInterceptor.setParamName("lang"); //拦截lang参数
+	 * 
+	 * APICallInterceptor apiCallInterceptor=new APICallInterceptor();
+	 * registry.addInterceptor(apiCallInterceptor) .addPathPatterns("/**")
+	 * .excludePathPatterns(excludePath);
+	 * 
+	 * }
+	 */
 	
 	
 	

src/main/java/com/hb/proj/allconfig/SysLogAspect.java

@@ -126,7 +126,7 @@ public class SysLogAspect {
 	public static void main(String[] args) {
 		SysLogAspect  log=new SysLogAspect();
 		User us=new User();
-		us.setUserName("李四");
+		us.setRealName("李四");
 		Object[] params=new Object[] {us,"张三","历史"};
 		System.out.println(log.format("更新数据{arg0.userName},{arg1}", params));
 		

src/main/java/com/hb/proj/auth/controller/LoginController.java

@@ -1,6 +1,9 @@
 package com.hb.proj.auth.controller;
 
+import java.util.UUID;
+
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
@@ -8,9 +11,8 @@ import org.springframework.web.bind.annotation.RestController;
 import com.hb.proj.allconfig.AccessToken;
 import com.hb.proj.allconfig.CacheConfig;
 import com.hb.proj.allconfig.SysLog;
-import com.hb.proj.auth.service.User;
-import com.hb.proj.auth.service.UserService;
-import com.hb.proj.utils.RequestParams;
+import com.hb.proj.model.User;
+import com.hb.proj.sys.service.UserService;
 import com.hb.proj.utils.RespVO;
 import com.hb.proj.utils.RespVOBuilder;
 
@@ -21,10 +23,15 @@ import jakarta.validation.constraints.NotBlank;
  */
 
 @RestController
-@RequestMapping("/api/login")
+@RequestMapping("/login")
 @Validated
 public class LoginController {
 	
+	@Value("${sys.admin.account}") 
+	private String adminAccount;
+	
+	@Value("${sys.admin.pwd}") 
+	private String adminPwd;
 	
 	@Autowired
 	private UserService userService;
@@ -39,39 +46,29 @@ public class LoginController {
 	@RequestMapping("/check")
 	@SysLog("用户{arg0}登录系统")
 	public RespVO<AccessToken> check(@NotBlank(message = "账号不能为空") String loginId,@NotBlank(message = "密码不能为空") String pwd){
-		User us=userService.getByLoginId(loginId);
-		if(us==null||!pwd.equals(us.getPwd())) {
-			return RespVOBuilder.error("账号或密码错误");
+		boolean isAdmin=loginId.equalsIgnoreCase(adminAccount);
+		AccessToken token=null;
+		
+		if(isAdmin) {
+			if(!pwd.equals(adminPwd)) {
+				return RespVOBuilder.error("账号或密码错误");
+			}
+			token=new AccessToken(UUID.randomUUID().toString().replace("-", ""),isAdmin);
+		}
+		else {
+			User us=userService.getByLoginId(loginId);
+			if(us==null||!pwd.equals(us.getPwd())) {
+				return RespVOBuilder.error("账号或密码错误");
+			}
+			
+			token=new AccessToken(us.getUserId(),isAdmin);
 		}
 		
-		AccessToken token=new AccessToken(us.getUserId());
 		
 		CacheConfig.put(token);
 		
-		
 		return RespVOBuilder.ok(token);
 	}
 
-	/**
-	 * 获得单个用户数据.
-	 * @apiNote <p>通过指定的用户编号获取数据<br>
-	 * 用户编号不能为空
-	 * @param id 用户编号
-	 * @param params 其它参数
-	 * @return 用户数据json
-	 */
-	@RequestMapping("/get")
-	RespVO<User> getUser(@NotBlank(message = "用户编号【id】不能为空") String id,RequestParams params) {
-		return RespVOBuilder.ok(userService.getUs(id));
-	}
 	
-	@RequestMapping("/update")
-	@SysLog("更新用户{arg0}的姓名为{arg1}")
-	RespVO<String> updateUser(@NotBlank(message = "用户编号编号【id】不能为空") String id,String name) {
-		User us=new User();
-		us.setNickname(name);
-		us.setUserId(id);
-		boolean rst=userService.updateUser(us);
-		return rst?RespVOBuilder.ok():RespVOBuilder.error("未找到数据");
-	}
 }

src/main/java/com/hb/proj/auth/service/User.java

@@ -1,64 +0,0 @@
-package com.hb.proj.auth.service;
-
-public class User {
-	
-	/**
-	 * 用户编号
-	 * @mock a123e
-	 */
-	private String userId;
-	
-	private String nickname;
-	
-	private String pwd;
-	
-	private String loginId;
-	
-	private String orgId;
-	
-
-	public String getUserId() {
-		return userId;
-	}
-
-	public void setUserId(String userId) {
-		this.userId = userId;
-	}
-
-	
-
-	public String getPwd() {
-		return pwd;
-	}
-
-	public void setPwd(String pwd) {
-		this.pwd = pwd;
-	}
-
-	public String getLoginId() {
-		return loginId;
-	}
-
-	public void setLoginId(String loginId) {
-		this.loginId = loginId;
-	}
-
-	public String getOrgId() {
-		return orgId;
-	}
-
-	public void setOrgId(String orgId) {
-		this.orgId = orgId;
-	}
-
-	public String getNickname() {
-		return nickname;
-	}
-
-	public void setNickname(String nickname) {
-		this.nickname = nickname;
-	}
-
-	
-
-}

src/main/java/com/hb/proj/auth/service/UserService.java

@@ -1,73 +0,0 @@
-package com.hb.proj.auth.service;
-
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-import com.hb.xframework.dao.core.SpringJdbcDAO;
-import com.hb.xframework.dao.util.PageModel;
-
-@Service
-public class UserService {
-
-	
-	
-	@Autowired
-	private SpringJdbcDAO springDAO;
-	
-	
-	public User getByLoginId(String loginId) {
-		String sql="""
-				
-				select * from tsys_user
-				where user_id=?
-				
-				""";
-		return springDAO.queryForPojo(sql,User.class,loginId);
-	}
-	
-	/**
-	 * 获得单个用户数据.服务层方法
-	 * @param id
-	 * @return
-	 */
-	public User getUs(String id){
-		String sql="""
-				
-				select * from tsys_user
-				where user_id=?
-				
-				""";
-		return springDAO.queryForPojo(sql,User.class,id);
-	}
-	
-	public List<Map<String,Object>> getAllUsers(){
-		return springDAO.queryForList("select * from tsys_user");
-	}
-	
-	
-	
-	public Map<String,Object> getUserMapping(){
-		return springDAO.queryForMapping("select * from tsys_user", "user_id", "user_name");
-	}
-	
-	
-	
-	public PageModel<Map<String,Object>> queryPagedMapUser(){
-		return springDAO.queryForPagedData("select * from tsys_user", 1, 10);
-	}
-	
-	public int updateUser() {
-		Map<String,Object> args=new HashMap<String,Object>();
-		args.put("userName", "张云华2");
-		args.put("userId", "2c9138fa7413d7e80174235443700095");
-		return springDAO.updateNamedSQL("update tsys_user set user_name=:userName where user_id=:userId", args);
-	}
-	
-	public boolean updateUser(User us) {
-		return springDAO.update(us, "tsys_user", "user_id")>0;
-	}
-}

src/main/java/com/hb/proj/model/User.java

@@ -1,61 +1,48 @@
 package com.hb.proj.model;
 
-public class User {
+import java.util.Date;
 
-	private String userName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+
+import jakarta.validation.constraints.NotBlank;
+import lombok.Data;
+
+@Data
+public class User{
 	
-	private String openid;
 	
-	private String phone;
+	public static interface Create {};
 	
+	/**
+	 * 用户编号
+	 * @mock a123e
+	 */
 	
 	private String userId;
 	
+	private String realName;
+	
+	private String pwd;
+	
+	@NotBlank(groups=Create.class,message = "登录账号不能为空")
 	private String loginId;
-
-	public String getUserName() {
-		return userName;
-	}
-
-	public void setUserName(String userName) {
-		this.userName = userName;
-	}
-
 	
-	public String getPhone() {
-		return phone;
-	}
-
-	public void setPhone(String phone) {
-		this.phone = phone;
-	}
-
+	private String orgId;
 	
-
-	public String getOpenid() {
-		return openid;
-	}
-
-	public void setOpenid(String openid) {
-		this.openid = openid;
-	}
-
-	public String getUserId() {
-		return userId;
-	}
-
-	public void setUserId(String userId) {
-		this.userId = userId;
-	}
-
-	public String getLoginId() {
-		return loginId;
-	}
-
-	public void setLoginId(String loginId) {
-		this.loginId = loginId;
-	}
-
+	private String authOrgs;
+	
+	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
+	private Date createTime;
+	
+	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
+	private Date modifyTime;
+	
+	private String createBy;
+	
+	private String modifyBy;
+	
+	private Boolean delIf;
 	
 
+	
 }

src/main/java/com/hb/proj/model/UserVO.java

@@ -0,0 +1,5 @@
+package com.hb.proj.model;
+
+public class UserVO extends User {
+
+}

src/main/java/com/hb/proj/sys/controller/UserController.java

@@ -0,0 +1,111 @@
+package com.hb.proj.sys.controller;
+
+import java.util.Map;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+import com.hb.proj.allconfig.AccessToken;
+import com.hb.proj.allconfig.SysLog;
+import com.hb.proj.model.User;
+import com.hb.proj.model.UserVO;
+import com.hb.proj.sys.service.UserService;
+import com.hb.proj.utils.RequestParams;
+import com.hb.proj.utils.RespVO;
+import com.hb.proj.utils.RespVOBuilder;
+import com.hb.xframework.dao.util.PageModel;
+
+import jakarta.validation.constraints.NotBlank;
+
+@RestController
+@RequestMapping("/user")
+@Validated
+public class UserController {
+
+	@Autowired
+	private UserService  userService;
+	
+	/**
+	 * 查询用户列表
+	 * @apiNote 查询用户列表
+	 * @param params  查询参数
+	 * @param pageNum  页码
+	 * @param pageSize 每页记录数
+	 * @return
+	 */
+	@RequestMapping("/query")
+	public RespVO<PageModel<Map<String,Object>>> query(RequestParams params,@RequestParam(value="page",defaultValue="1") Integer pageNum,@RequestParam(value="limit",defaultValue="20") Integer pageSize){
+		return RespVOBuilder.ok(userService.query(params.getObjectMap(),pageNum, pageSize));
+	}
+	
+	
+	/**
+	 * 获得单个用户数据
+	 * @param userId 用户记录id
+	 * @return
+	 */
+	@RequestMapping("/get")
+	public RespVO<UserVO> get(@NotBlank(message = "缺少用户记录号") String userId){
+		return RespVOBuilder.ok(userService.get(userId));
+	}
+	
+	
+	/**
+	 * 删除单个用户
+	 * @param userId  用户记录id
+	 * @return
+	 */
+	@RequestMapping("/delete")
+	@SysLog("删除用户：{arg0}")
+	public RespVO<Object> delete(String userId){
+		userService.delete(userId);
+		return RespVOBuilder.ok();
+	}
+	
+
+	/**
+	 * 增加新用户
+	 * @param user  用户实体类
+	 * @return
+	 */
+	@RequestMapping("/add")
+	@SysLog("新增用户：{arg0.loginId}")
+	public RespVO<String> add(User user,AccessToken token){
+		 User dbUser=userService.getByLoginId(user.getLoginId());
+		 if(dbUser!=null) {
+			 return RespVOBuilder.error("该账号已被注册过，请更换");
+		 }
+		 user.setCreateBy(token.getTokenId());
+		 user.setModifyBy(token.getTokenId());
+		 return RespVOBuilder.ok(userService.add(user));
+		
+	}
+	
+	@RequestMapping("/update")
+	@SysLog("更新用户：{arg0.loginId}")
+	public RespVO<Object> update(User user,AccessToken token){
+		User dbUser=userService.get(user.getUserId());
+		if(dbUser==null) {
+			 return RespVOBuilder.error("用户已不存在");
+		}
+		
+		if(dbUser.getLoginId().equals(user.getLoginId())) {  //修改了账号
+			if(userService.isLoginIdUsing(user.getLoginId(), user.getUserId())) {
+				 return RespVOBuilder.error("该账号已被占用，请更换");
+			}
+		}
+		
+		user.setDelIf(false);
+		user.setCreateBy(dbUser.getCreateBy());
+		user.setCreateTime(dbUser.getCreateTime());
+		user.setModifyBy(token.getTokenId());
+		userService.update(user);
+		
+		return RespVOBuilder.ok();
+	  
+		
+	}
+}

src/main/java/com/hb/proj/sys/service/UserService.java

@@ -0,0 +1,81 @@
+package com.hb.proj.sys.service;
+
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
+
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import com.hb.proj.model.User;
+import com.hb.proj.model.UserVO;
+import com.hb.xframework.dao.core.SpringJdbcDAO;
+import com.hb.xframework.dao.util.PageModel;
+import com.hb.xframework.dao.util.UUIDHexGenerator;
+
+@Service
+public class UserService {
+
+	@Autowired
+	private SpringJdbcDAO  dao;
+	
+	public PageModel<Map<String,Object>> query(Map<String,Object> args,int pageNo,int pageSize){
+		List<Object> sqlParams=new ArrayList<Object>();
+		StringBuilder sql=new StringBuilder(100);
+		sql.append("select * ");
+		sql.append(" from tsys_user u ");
+		sql.append(" where del_if=false ");
+		
+		if(args!=null&&StringUtils.isNotBlank((String)args.get("userName"))) {
+			sql.append(" and (real_name like ? or login_id like ?)");
+			sqlParams.add("%"+args.get("userName")+"%");
+			sqlParams.add("%"+args.get("userName")+"%");
+		}
+		
+		sql.append(" order by login_id");
+		
+		Object[] sqlArgs=sqlParams.size()>0?sqlParams.toArray():null;
+		return dao.queryForPagedData(sql.toString(),pageNo, pageSize,sqlArgs);
+	}
+	
+	public String add(User user) {
+		UUIDHexGenerator uuid=UUIDHexGenerator.getInstance();
+		user.setUserId(uuid.generate());
+		user.setCreateTime(new Date());
+		user.setModifyTime(new Date());
+		user.setDelIf(false);
+		dao.insert(user,"tsys_user");
+		return user.getUserId();
+	}
+	
+	public boolean delete(String userId) {
+		String sql="update  tsys_user set del_if=true where user_id=?";
+		dao.exeUpdate(sql,userId);
+		return true;
+	}
+	
+	public UserVO get(String userId) {
+		return dao.queryForPojo("select u.* from tsys_user u where del_if=false and user_id=?",UserVO.class,userId);
+	}
+	
+	public boolean update(User user) {
+		user.setModifyTime(new Date());
+		return dao.update(user, "tsys_user", "user_id")>0;
+	}
+	
+	public boolean updateByUsId(Map<String, Object> user){
+		user.put("modifyTime", new Date());
+		return dao.update(user,"tsys_user", "user_id")>0;
+	}
+	
+	public User getByLoginId(String loginId) {
+		return dao.queryForPojo("select u.* from tsys_user u where login_id=? and del_if=false",User.class, loginId);
+	}
+	
+	public boolean isLoginIdUsing(String loginId,String userId) {
+		Integer num=dao.queryForObject("select count(1) from tsys_user where del_if=false and  login_id=? and user_id!=?", Integer.class, loginId,userId);
+		return num!=null&&num.intValue()>0;
+	}
+}

src/main/java/com/hb/proj/utils/LayGridResp.java

@@ -1,52 +0,0 @@
-package com.hb.proj.utils;
-
-
-public class LayGridResp {
-
-	private int  code;
-	
-	private int  count;
-	
-	private Object data;
-	
-	private Boolean success;
-	
-	public LayGridResp(int code,int count,Object data){
-		this.code=code;
-		this.success=code==0;
-		this.count=count;
-		this.data=data;
-	}
-
-	public int getCode() {
-		return code;
-	}
-
-	public void setCode(int code) {
-		this.code = code;
-	}
-
-	public int getCount() {
-		return count;
-	}
-
-	public void setCount(int count) {
-		this.count = count;
-	}
-
-	public Object getData() {
-		return data;
-	}
-
-	public void setData(Object data) {
-		this.data = data;
-	}
-
-	public Boolean getSuccess() {
-		return success;
-	}
-
-	public void setSuccess(Boolean success) {
-		this.success = success;
-	}
-}

src/main/resources/application-dev.properties

@@ -37,4 +37,8 @@ cache.token.expire=120
 token.header.name=token
 
 #api调用权限控制filter配置
-api.filter.exclude=login/check,login/update
+api.filter.exclude=login/check
+
+#系统管理员
+sys.admin.account=admin
+sys.admin.pwd=2f459bf76f471ff9753caffd1be02bac