diff --git a/.idea/misc.xml b/.idea/misc.xml index 9134c12..79f13d2 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -9,5 +9,5 @@ - + \ No newline at end of file diff --git a/common/spring-security/src/main/java/com/atguigu/security/custom/LoginUserInfoHelper.java b/common/common-util/src/main/java/com/atguigu/common/utlis/BaseContext.java similarity index 89% rename from common/spring-security/src/main/java/com/atguigu/security/custom/LoginUserInfoHelper.java rename to common/common-util/src/main/java/com/atguigu/common/utlis/BaseContext.java index 039036d..b0dc6d9 100644 --- a/common/spring-security/src/main/java/com/atguigu/security/custom/LoginUserInfoHelper.java +++ b/common/common-util/src/main/java/com/atguigu/common/utlis/BaseContext.java @@ -1,7 +1,6 @@ -package com.atguigu.security.custom; - -public class LoginUserInfoHelper { +package com.atguigu.common.utlis; +public class BaseContext { private static final ThreadLocal userId = new ThreadLocal(); private static final ThreadLocal username = new ThreadLocal(); diff --git a/common/service-util/target/classes/com/atguigu/CodeGet.class b/common/service-util/target/classes/com/atguigu/CodeGet.class deleted file mode 100644 index b9e4bfa..0000000 Binary files a/common/service-util/target/classes/com/atguigu/CodeGet.class and /dev/null differ diff --git a/common/service-util/target/classes/com/atguigu/config/MybatisPlusConfig.class b/common/service-util/target/classes/com/atguigu/config/MybatisPlusConfig.class deleted file mode 100644 index 3fbc339..0000000 Binary files a/common/service-util/target/classes/com/atguigu/config/MybatisPlusConfig.class and /dev/null differ diff --git a/common/service-util/target/classes/com/atguigu/constant/MessageConstant.class b/common/service-util/target/classes/com/atguigu/constant/MessageConstant.class deleted file mode 100644 index c52f380..0000000 Binary files a/common/service-util/target/classes/com/atguigu/constant/MessageConstant.class and /dev/null differ diff --git a/common/service-util/target/classes/com/atguigu/context/BaseContext.class b/common/service-util/target/classes/com/atguigu/context/BaseContext.class deleted file mode 100644 index be58c65..0000000 Binary files a/common/service-util/target/classes/com/atguigu/context/BaseContext.class and /dev/null differ diff --git a/common/spring-security/src/main/java/com/atguigu/security/config/WebSecurityConfig.java b/common/spring-security/src/main/java/com/atguigu/security/config/WebSecurityConfig.java index 8a3312c..4c62ec2 100644 --- a/common/spring-security/src/main/java/com/atguigu/security/config/WebSecurityConfig.java +++ b/common/spring-security/src/main/java/com/atguigu/security/config/WebSecurityConfig.java @@ -38,20 +38,17 @@ public class WebSecurityConfig extends WebSecurityConfigurerAdapter { @Override protected void configure(HttpSecurity http) throws Exception { // 这是配置的关键，决定哪些接口开启防护，哪些接口绕过防护 - http - // 关闭csrf跨站请求伪造 - .csrf().disable() - // 开启跨域以便前端调用接口 - .cors().and() + http.csrf().disable() // 关闭csrf跨站请求伪造 + .cors().and()// 开启跨域以便前端调用接口 .authorizeRequests() // 指定某些接口不需要通过验证即可访问。登陆接口肯定是不需要认证的 - //.antMatchers("/admin/system/index/login").permitAll() + .antMatchers("/admin/system/index/login").permitAll() // 这里意思是其它所有接口需要认证才能访问 .anyRequest().authenticated() .and() - // TokenAuthenticationFilter放到UsernamePasswordAuthenticationFilter的前面，这样做就是为了除了登录的时候去查询数据库外，其他时候都用token进行认证。 - .addFilterBefore(new TokenAuthenticationFilter(redisTemplate), - UsernamePasswordAuthenticationFilter.class) + // TokenAuthenticationFilter放到UsernamePasswordAuthenticationFilter的前面 + // 这样做就是为了除了登录的时候去查询数据库外，其他时候都用token进行认证。 + .addFilterBefore(new TokenAuthenticationFilter(redisTemplate), UsernamePasswordAuthenticationFilter.class) .addFilter(new TokenLoginFilter(authenticationManager(), redisTemplate)); // 禁用session diff --git a/common/spring-security/src/main/java/com/atguigu/security/custom/CustomUser.java b/common/spring-security/src/main/java/com/atguigu/security/custom/CustomUser.java index 1969f79..3c752ed 100644 --- a/common/spring-security/src/main/java/com/atguigu/security/custom/CustomUser.java +++ b/common/spring-security/src/main/java/com/atguigu/security/custom/CustomUser.java @@ -11,7 +11,6 @@ import java.util.Collection; @Setter @Getter public class CustomUser extends User { - /** * 我们自己的用户实体对象，要调取用户信息时直接获取这个实体对象。（这里我就不写get/set方法了） */ @@ -21,5 +20,4 @@ public class CustomUser extends User { super(sysUser.getUsername(), sysUser.getPassword(), authorities); this.sysUser = sysUser; } - } diff --git a/common/spring-security/src/main/java/com/atguigu/security/filter/TokenAuthenticationFilter.java b/common/spring-security/src/main/java/com/atguigu/security/filter/TokenAuthenticationFilter.java index e851f99..448bff0 100644 --- a/common/spring-security/src/main/java/com/atguigu/security/filter/TokenAuthenticationFilter.java +++ b/common/spring-security/src/main/java/com/atguigu/security/filter/TokenAuthenticationFilter.java @@ -3,9 +3,9 @@ package com.atguigu.security.filter; import com.alibaba.fastjson.JSON; import com.atguigu.common.result.Result; import com.atguigu.common.result.ResultCodeEnum; +import com.atguigu.common.utlis.BaseContext; import com.atguigu.common.utlis.JwtHelper; import com.atguigu.common.utlis.ResponseUtil; -import com.atguigu.security.custom.LoginUserInfoHelper; import org.springframework.data.redis.core.RedisTemplate; import org.springframework.security.authentication.UsernamePasswordAuthenticationToken; import org.springframework.security.core.authority.SimpleGrantedAuthority; @@ -56,8 +56,8 @@ public class TokenAuthenticationFilter extends OncePerRequestFilter { String username = JwtHelper.getUserName(token); if (!StringUtils.isEmpty(username)) { // 当前用户信息放到ThreadLocal里面 - LoginUserInfoHelper.setUserId(JwtHelper.getUserId(token)); - LoginUserInfoHelper.setUsername(username); + BaseContext.setUserId(JwtHelper.getUserId(token)); + BaseContext.setUsername(username); // 通过username从redis获取权限数据 String authString = (String) redisTemplate.opsForValue().get(username); diff --git a/common/spring-security/src/main/java/com/atguigu/security/custom/UserDetailsService.java b/common/spring-security/src/main/java/com/atguigu/security/service/UserDetailsService.java similarity index 93% rename from common/spring-security/src/main/java/com/atguigu/security/custom/UserDetailsService.java rename to common/spring-security/src/main/java/com/atguigu/security/service/UserDetailsService.java index e0057c4..9185009 100644 --- a/common/spring-security/src/main/java/com/atguigu/security/custom/UserDetailsService.java +++ b/common/spring-security/src/main/java/com/atguigu/security/service/UserDetailsService.java @@ -1,4 +1,4 @@ -package com.atguigu.security.custom; +package com.atguigu.security.service; import org.springframework.security.core.userdetails.UserDetails; import org.springframework.security.core.userdetails.UsernameNotFoundException; diff --git a/service-oa/src/main/java/com/atguigu/auth/service/impl/UserDetailsServiceImpl.java b/service-oa/src/main/java/com/atguigu/auth/service/impl/UserDetailsServiceImpl.java index 64460ad..dcea726 100644 --- a/service-oa/src/main/java/com/atguigu/auth/service/impl/UserDetailsServiceImpl.java +++ b/service-oa/src/main/java/com/atguigu/auth/service/impl/UserDetailsServiceImpl.java @@ -5,9 +5,9 @@ import com.atguigu.constant.MessageConstant; import com.atguigu.exception.BunnyException; import com.atguigu.model.system.SysUser; import com.atguigu.security.custom.CustomUser; +import com.atguigu.security.service.UserDetailsService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.security.core.userdetails.UserDetails; -import org.springframework.security.core.userdetails.UserDetailsService; import org.springframework.security.core.userdetails.UsernameNotFoundException; import org.springframework.stereotype.Component; diff --git a/service-oa/target/classes/application-dev.yml b/service-oa/target/classes/application-dev.yml deleted file mode 100644 index 2ea6574..0000000 --- a/service-oa/target/classes/application-dev.yml +++ /dev/null @@ -1,21 +0,0 @@ -server: - port: 8800 - -bunny: - datasource: - host: 106.15.251.123 - port: 3305 - sqlData: guigu-oa - username: root - password: "02120212" - -# nacos: -# server-addr: z-bunny.cn:8848 -# discovery: -# namespace: ssyx -# -# minio: -# endpointUrl: "http://129.211.31.58:9000" -# bucket-name: ssyx -# accessKey: bunny -# secretKey: "02120212" \ No newline at end of file diff --git a/service-oa/target/classes/application.yml b/service-oa/target/classes/application.yml deleted file mode 100644 index 856c064..0000000 --- a/service-oa/target/classes/application.yml +++ /dev/null @@ -1,34 +0,0 @@ -server: - port: 8800 - -spring: - application: - name: service-oa - profiles: - active: dev - - datasource: - type: com.zaxxer.hikari.HikariDataSource - driver-class-name: com.mysql.cj.jdbc.Driver - url: jdbc:mysql://${bunny.datasource.host}:${bunny.datasource.port}/${bunny.datasource.sqlData}?serverTimezone=GMT%2B8&useSSL=false&characterEncoding=utf-8&allowPublicKeyRetrieval=true - username: ${bunny.datasource.username} - password: ${bunny.datasource.password} - - jackson: - date-format: yyyy-MM-dd HH:mm:ss - time-zone: GMT+8 - -mybatis-plus: - mapper-locations: classpath:mapper/*.xml - configuration: - log-impl: org.apache.ibatis.logging.stdout.StdOutImpl # 查看日志 - -logging: - level: - com.atguigu.auth.mapper: debug - com.atguigu.auth.controller: info - com.atguigu.auth.service: info - pattern: - dateformat: HH:mm:ss:SSS - file: - path: "logs/${spring.application.name}" \ No newline at end of file diff --git a/service-oa/target/classes/banner.txt b/service-oa/target/classes/banner.txt deleted file mode 100644 index cc77fc2..0000000 --- a/service-oa/target/classes/banner.txt +++ /dev/null @@ -1,16 +0,0 @@ ------------------▄██-█▄--------- ------------------███▄██▄-------- ------------------███████-------- ------------------▀███████------- --------------------██████▄▄----- --------------------█████████▄--- --------------------██████▄████-- --------▄███████████████████████- ------▄███████████████████████▀-- ----▄██████████████████████------ ----███████████████████████------ ----███████████████████████------ --▄▄██████████████████████▀------ --█████████████████▀█████-------- --▀██████████████▀▀-▀█████▄------ --------▀▀▀▀▀▀▀▀▀------▀▀▀▀------ \ No newline at end of file diff --git a/service-oa/target/classes/favicon.ico b/service-oa/target/classes/favicon.ico deleted file mode 100644 index 2f64da5..0000000 Binary files a/service-oa/target/classes/favicon.ico and /dev/null differ