hangzhoumesParent/common/servicebase/src/main/java/com/mes/common/config/Swagger2Config.java
@@ -49,43 +49,10 @@ .globalOperationParameters(pars); } @Bean public Docket adminApiConfig() { List<Parameter> pars = new ArrayList<>(); ParameterBuilder tokenPar = new ParameterBuilder(); tokenPar.name("adminId") .description("用户token") .defaultValue("1") .modelRef(new ModelRef("string")) .parameterType("header") .required(false) .build(); pars.add(tokenPar.build()); return new Docket(DocumentationType.SWAGGER_2) .groupName("adminApi") .apiInfo(adminApiInfo()) .select() //只显示admin路径下的页面 .apis(RequestHandlerSelectors.basePackage("com.mes")) .paths(PathSelectors.any()) .build() .globalOperationParameters(pars); } private ApiInfo webApiInfo() { return new ApiInfoBuilder() .title("网站-API文档") .description("本文档描述了mes网站微服务接口定义") .version("1.0") .contact(new Contact("zhan_py", "", "")) .build(); } private ApiInfo adminApiInfo() { return new ApiInfoBuilder() .title("后台管理系统-API文档") .description("本文档描述了mes后台系统服务接口定义") .version("1.0") .contact(new Contact("zhan_py", "", "")) .build(); hangzhoumesParent/common/springsecurity/src/main/java/com/mes/common/config/TokenWebSecurityConfig.java
@@ -8,17 +8,27 @@ import org.springframework.security.authentication.AuthenticationManager; import org.springframework.security.config.annotation.method.configuration.EnableGlobalMethodSecurity; import org.springframework.security.config.annotation.web.builders.HttpSecurity; import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity; import org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter; import org.springframework.security.config.http.SessionCreationPolicy; import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder; import org.springframework.security.crypto.password.PasswordEncoder; import org.springframework.security.web.AuthenticationEntryPoint; import org.springframework.security.web.access.AccessDeniedHandler; import org.springframework.security.web.authentication.UsernamePasswordAuthenticationFilter; @Configuration //@EnableWebSecurity @EnableWebSecurity @EnableGlobalMethodSecurity(prePostEnabled = true) public class TokenWebSecurityConfig extends WebSecurityConfigurerAdapter { @Autowired private JwtAuthenticationTokenFilter jwtAuthenticationTokenFilter; @Autowired private AuthenticationEntryPoint authenticationEntryPoint; @Autowired private AccessDeniedHandler accessDeniedHandler; @Bean public PasswordEncoder passwordEncoder() { @@ -39,10 +49,16 @@ .authorizeRequests() // 对于登录接口 允许匿名访问 .antMatchers("/userinfo/login").anonymous() .antMatchers("/hello").permitAll() // 除上面外的所有请求全部需要鉴权认证 .anyRequest().permitAll(); // http.addFilterBefore(jwtAuthenticationTokenFilter, UsernamePasswordAuthenticationFilter.class); .anyRequest().authenticated(); http.addFilterBefore(jwtAuthenticationTokenFilter, UsernamePasswordAuthenticationFilter.class); //配置异常处理器 http.exceptionHandling() .authenticationEntryPoint(authenticationEntryPoint) .accessDeniedHandler(accessDeniedHandler); //允许跨域 http.cors(); } @Bean hangzhoumesParent/common/springsecurity/src/main/java/com/mes/config/TokenWebSecurityConfig.java
File was deleted hangzhoumesParent/common/springsecurity/src/main/java/com/mes/entity/SecurityUser.java
File was deleted hangzhoumesParent/common/springsecurity/src/main/java/com/mes/entity/User.java
File was deleted hangzhoumesParent/common/springsecurity/src/main/java/com/mes/filter/TokenAuthFilter.java
File was deleted hangzhoumesParent/common/springsecurity/src/main/java/com/mes/filter/TokenLoginFilter.java
File was deleted hangzhoumesParent/common/springsecurity/src/main/java/com/mes/security/DefaultPasswordEncoder.java
File was deleted hangzhoumesParent/common/springsecurity/src/main/java/com/mes/security/TokenLogoutHandler.java
File was deleted hangzhoumesParent/common/springsecurity/src/main/java/com/mes/security/TokenManager.java
File was deleted hangzhoumesParent/common/springsecurity/src/main/java/com/mes/security/UnauthEntryPoint.java
File was deleted hangzhoumesParent/common/springsecurity/src/main/java/com/mes/userinfo/controller/SysUserController.java
@@ -2,10 +2,20 @@ import com.mes.userinfo.entity.SysUser; import com.mes.userinfo.entity.request.UserRequest; import com.mes.userinfo.entity.vo.SysUserVO; import com.mes.userinfo.service.SysUserService; import com.mes.utils.Result; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; import java.util.List; import java.util.Map; /** * <p> @@ -15,6 +25,7 @@ * @author zhoush * @since 2024-04-11 */ @ApiModel("用户信息") @RestController @RequestMapping("/userinfo") public class SysUserController { @@ -22,14 +33,42 @@ @Autowired private SysUserService sysUserService; @ApiOperation("用户登录") @PostMapping("/login") public Result login(@RequestBody SysUser user) { return sysUserService.login(user); public Result<Map<String, String>> login(@RequestBody SysUser user) { return Result.success(sysUserService.login(user)); } @GetMapping("/hello") public Result hello() { return Result.success("eyJhbGciOiJIUzI1NiJ9.eyJqdGkiOiJlZjMyMjQ4NDcyODE0ZWFlYWRlOTBkYmZjYWFlZmNmZSIsInN1YiI6IjEiLCJpc3MiOiJzZyIsImlhdCI6MTcxMjkwMjI0NCwiZXhwIjoxNzEyOTA1ODQ0fQ.DlJkhkiwjZSqprdLzKaTB3yuyxGukerKeF0FbJK_6HY"); @ApiOperation("退出登录") @PostMapping("/logout") public Result<String> logout() { return Result.success(sysUserService.logout()); } @ApiOperation("新增用户信息") @PostMapping("/saveUser") public Result<SysUserVO> saveUser(@RequestBody SysUserVO sysUser) { return Result.success(sysUserService.saveUser(sysUser)); } @ApiOperation("获取用户列表") @PostMapping("/listByUserName") public Result<List<SysUserVO>> listByUserName(@RequestBody UserRequest request) { return Result.success(sysUserService.listByUserName(request)); } @ApiOperation("更新用户信息") @PostMapping("/updateUser") public Result<SysUserVO> updateUser(@RequestBody SysUserVO sysUser) { return Result.success(sysUserService.updateUser(sysUser)); } @ApiOperation("删除用户信息") @PostMapping("/deleteUser") public Result<String> deleteUser(@RequestBody SysUserVO sysUser) { return Result.success(sysUserService.deleteUser(sysUser)); } } hangzhoumesParent/common/springsecurity/src/main/java/com/mes/userinfo/entity/LoginUser.java
@@ -28,7 +28,7 @@ /** * 存储SpringSecurity调用getAuthorities()方法获取的权限信息的集合 */ @JSONField(serialize = false) // @JSONField(serialize = false) private List<GrantedAuthority> authorities; hangzhoumesParent/common/springsecurity/src/main/java/com/mes/userinfo/entity/request/UserRequest.java
New file @@ -0,0 +1,17 @@ package com.mes.userinfo.entity.request; import cn.hutool.db.Page; import lombok.Data; /** * @Author : zhoush * @Date: 2024/4/22 11:21 * @Description: */ @Data public class UserRequest { private String userName; private Page page; } hangzhoumesParent/common/springsecurity/src/main/java/com/mes/userinfo/entity/vo/SysUserVO.java
New file @@ -0,0 +1,63 @@ package com.mes.userinfo.entity.vo; import com.mes.role.entity.SysRole; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import java.io.Serializable; import java.util.List; /** * <p> * 用户表 * </p> * * @author zhoush * @since 2024-04-11 */ @ApiModel(description = "<p> 用户信息 </p>") @Data public class SysUserVO implements Serializable { @ApiModelProperty(hidden = true) private static final long serialVersionUID = 1L; /** * 主键 */ @ApiModelProperty(value = "主键", position = 2) private Long id; /** * 用户名 */ @ApiModelProperty(value = "用户名", position = 3) private String userName; /** * 昵称 */ @ApiModelProperty(value = "昵称", position = 4) private String nickName; /** * 密码 */ @ApiModelProperty(value = "密码", position = 5) private String password; /** * 头像 */ @ApiModelProperty(value = "头像", position = 6) private String avatar; /** * 用户的角色信息 */ @ApiModelProperty(value = "用户的角色信息", position = 7) private List<SysRole> roleList; } hangzhoumesParent/common/springsecurity/src/main/java/com/mes/userinfo/mapper/SysUserMapper.java
@@ -1,6 +1,6 @@ package com.mes.userinfo.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.github.yulichang.base.MPJBaseMapper; import com.mes.userinfo.entity.SysUser; import org.apache.ibatis.annotations.Mapper; @@ -13,6 +13,6 @@ * @since 2024-04-11 */ @Mapper public interface SysUserMapper extends BaseMapper<SysUser> { public interface SysUserMapper extends MPJBaseMapper<SysUser> { } hangzhoumesParent/common/springsecurity/src/main/java/com/mes/userinfo/service/SysUserService.java
@@ -2,7 +2,11 @@ import com.baomidou.mybatisplus.extension.service.IService; import com.mes.userinfo.entity.SysUser; import com.mes.utils.Result; import com.mes.userinfo.entity.request.UserRequest; import com.mes.userinfo.entity.vo.SysUserVO; import java.util.List; import java.util.Map; /** * <p> @@ -14,7 +18,50 @@ */ public interface SysUserService extends IService<SysUser> { Result login(SysUser user); /** * 用户登录 * * @param user * @return */ Map<String, String> login(SysUser user); Result logout(); /** * 退出登录 * * @return */ String logout(); /** * 新增用户信息 * * @param user * @return */ SysUserVO saveUser(SysUserVO user); /** * 按名称获取用户信息 * * @param sysUser * @return */ SysUserVO updateUser(SysUserVO sysUser); /** * 按名称获取用户信息 * * @param request * @return */ List<SysUserVO> listByUserName(UserRequest request); /** * 删除用户信息 * * @param user * @return */ String deleteUser(SysUserVO user); } hangzhoumesParent/gateway/pom.xml
@@ -28,5 +28,13 @@ <artifactId>spring-cloud-starter-gateway</artifactId> </dependency> </dependencies> <build> <plugins> <plugin> <groupId>org.springframework.boot</groupId> <artifactId>spring-boot-maven-plugin</artifactId> </plugin> </plugins> </build> </project> hangzhoumesParent/moduleService/UnLoadGlassModule/src/test/java/com/mes/UnLoadGlassApplicationTest.java
New file @@ -0,0 +1,42 @@ package com.mes; import com.mes.downglassinfo.entity.DownGlassTask; import com.mes.downglassinfo.mapper.DownGlassTaskMapper; import lombok.extern.slf4j.Slf4j; import org.junit.Test; import org.junit.runner.RunWith; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.test.context.junit4.SpringRunner; import java.util.Arrays; /** * @Author : zhoush * @Date: 2024/3/27 16:37 * @Description: */ @Slf4j @RunWith(SpringRunner.class) @SpringBootTest(classes = UnLoadGlassApplication.class) public class UnLoadGlassApplicationTest { @Autowired DownGlassTaskMapper downGlassTaskMapper; @Test public void testFindPath() { log.info("完整路径:{}", Arrays.asList("123")); } @Test public void testCacheGlass() { DownGlassTask glassTask = new DownGlassTask(); glassTask.setId(1L); glassTask.setTaskType("1"); glassTask.setHeight(100.01); glassTask.setWidth(200.02); int i = downGlassTaskMapper.insert(glassTask); log.info("插入结果:{}", i); } } hangzhoumesParent/moduleService/pom.xml
@@ -56,11 +56,11 @@ </dependency> <!--开发者工具--> <dependency> <groupId>org.springframework.boot</groupId> <artifactId>spring-boot-devtools</artifactId> <optional>true</optional> </dependency> <!-- <dependency>--> <!-- <groupId>org.springframework.boot</groupId>--> <!-- <artifactId>spring-boot-devtools</artifactId>--> <!-- <optional>true</optional>--> <!-- </dependency>--> <dependency> <groupId>org.springframework.boot</groupId>