feat: 模块整合，取消独立服务，修改login

guzijian
1 parent ab228c79
Showing 30 changed files with 137 additions and 1018 deletions
trash-admin/pom.xml
trash-framework/src/main/java/com/trash/framework/config/SecurityConfig.java
trash-garbage/pom.xml
trash-garbage/src/main/java/com/trash/garbage/GarbageApplication.java
trash-garbage/src/main/java/com/trash/garbage/config/CorsConfig.java
trash-garbage/src/main/java/com/trash/garbage/config/RedisConfig.java
trash-garbage/src/main/java/com/trash/garbage/config/RestTemplateConfig.java
trash-garbage/src/main/java/com/trash/garbage/config/SwaggerConfiguration.java
trash-garbage/src/main/java/com/trash/garbage/config/WebSecurityConfig.java
trash-garbage/src/main/java/com/trash/garbage/controller/GarbageUserController.java
trash-garbage/src/main/java/com/trash/garbage/filter/JwtAuthenticationFilter.java
trash-garbage/src/main/java/com/trash/garbage/global/GlobalStatus.java
trash-garbage/src/main/java/com/trash/garbage/global/Result.java
trash-garbage/src/main/java/com/trash/garbage/interceptor/MyMetaObjectHandler.java
trash-garbage/src/main/java/com/trash/garbage/interfaces/Authorization.java
trash-garbage/src/main/java/com/trash/garbage/pojo/domain/GarUser.java
trash-garbage/src/main/java/com/trash/garbage/pojo/dto/LoginDto.java
trash-garbage/src/main/java/com/trash/garbage/security/JwtAuthenticationFilterAbstract.java
trash-garbage/src/main/java/com/trash/garbage/security/PasswordCustom.java
trash-garbage/src/main/java/com/trash/garbage/security/UserAbstract.java
@@ -90,6 +90,11 @@
             <groupId>com.trash</groupId>
             <artifactId>trash-unit</artifactId>
         </dependency>
+        <dependency>
+            <groupId>com.trash</groupId>
+            <artifactId>trash-garbage</artifactId>
+            <version>3.2.0</version>
+        </dependency>
     </dependencies>
     <build>
@@ -117,6 +117,9 @@ public class SecurityConfig extends WebSecurityConfigurerAdapter
                 .antMatchers("/webjars/**").anonymous()
                 .antMatchers("/*/api-docs").anonymous()
                 .antMatchers("/druid/**").anonymous()
+                .antMatchers("/user/login").anonymous()
+                .antMatchers("/user/send/verify").anonymous()
+                .antMatchers("/user/logout").anonymous()
                 .antMatchers("/system/post/all").anonymous()
                 .antMatchers("/system/user/all").anonymous()
 //                .antMatchers("/workflow/add").anonymous()//测试
@@ -22,16 +22,6 @@
             <groupId>com.trash</groupId>
             <artifactId>trash-common</artifactId>
         </dependency>
-        <!--        mysql connect-->
-        <dependency>
-            <groupId>mysql</groupId>
-            <artifactId>mysql-connector-java</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>com.alibaba</groupId>
-            <artifactId>druid-spring-boot-starter</artifactId>
-            <version>1.2.1</version>
-        </dependency>
         <!--        mybatis plus-->
         <dependency>
             <groupId>com.baomidou</groupId>
@@ -39,80 +29,31 @@
             <version>3.5.4.1</version>
         </dependency>
         <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-web</artifactId>
+            <groupId>com.trash</groupId>
+            <artifactId>trash-activiti</artifactId>
         </dependency>
-        <!--        knife4j swagger-ui-->
         <dependency>
-            <groupId>com.github.xiaoymin</groupId>
-            <artifactId>knife4j-spring-boot-starter</artifactId>
-            <!--在引用时请在maven中央仓库搜索2.X最新版本号-->
-            <version>2.0.7</version>
+            <groupId>com.trash</groupId>
+            <artifactId>trash-framework</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.projectlombok</groupId>
-            <artifactId>lombok</artifactId>
+            <groupId>com.aliyun</groupId>
+            <artifactId>aliyun-java-sdk-core</artifactId>
+            <version>4.5.16</version>
         </dependency>
-        <!--        jjwt -->
         <dependency>
-            <groupId>io.jsonwebtoken</groupId>
-            <artifactId>jjwt</artifactId>
+            <groupId>com.aliyun</groupId>
+            <artifactId>aliyun-java-sdk-dysmsapi</artifactId>
+            <version>2.1.0</version>
         </dependency>
-        <!--        fastjson-->
         <dependency>
-            <groupId>com.alibaba</groupId>
-            <artifactId>fastjson</artifactId>
+            <groupId>org.projectlombok</groupId>
+            <artifactId>lombok</artifactId>
         </dependency>
-        <!--        hutool 工具包-->
         <dependency>
             <groupId>cn.hutool</groupId>
             <artifactId>hutool-all</artifactId>
             <version>5.3.8</version>
         </dependency>
-        <!-- 引入redis连接池的依赖 -->
-        <!--        我配置文件配置了redis连接池 所以需要这个依赖-->
-        <dependency>
-            <groupId>org.apache.commons</groupId>
-            <artifactId>commons-pool2</artifactId>
-            <version>2.8.1</version>
-        </dependency>
-        <dependency>
-            <groupId>org.springframework</groupId>
-            <artifactId>spring-webmvc</artifactId>
-        </dependency>
-        <!-- jackson 2.x 相关依赖 -->
-
-        <dependency>
-            <groupId>com.fasterxml.jackson.core</groupId>
-            <artifactId>jackson-core</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>com.fasterxml.jackson.core</groupId>
-            <artifactId>jackson-databind</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>com.fasterxml.jackson.core</groupId>
-            <artifactId>jackson-annotations</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>com.aliyun</groupId>
-            <artifactId>aliyun-java-sdk-core</artifactId>
-            <version>4.5.16</version>
-        </dependency>
-        <dependency>
-            <groupId>com.aliyun</groupId>
-            <artifactId>aliyun-java-sdk-dysmsapi</artifactId>
-            <version>2.1.0</version>
-        </dependency>
     </dependencies>
-
-    <build>
-        <finalName>garbage</finalName>
-        <plugins>
-            <plugin>
-                <groupId>org.springframework.boot</groupId>
-                <artifactId>spring-boot-maven-plugin</artifactId>
-            </plugin>
-        </plugins>
-    </build>
 </project>
 \ No newline at end of file
-package com.trash.garbage;
-
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.boot.SpringApplication;
-import org.springframework.boot.autoconfigure.SpringBootApplication;
-import org.springframework.context.ConfigurableApplicationContext;
-import org.springframework.core.env.ConfigurableEnvironment;
-import org.springframework.scheduling.annotation.EnableAsync;
-
-import java.net.InetAddress;
-import java.net.UnknownHostException;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-
-/**
- * @author trash
- */
-@SpringBootApplication
-@EnableAsync
-@Slf4j
-public class GarbageApplication {
-    public static void main(String[] args)  throws UnknownHostException {
-        ConfigurableApplicationContext run = SpringApplication.run(GarbageApplication.class, args);
-        ConfigurableEnvironment env = run.getEnvironment();
-        String ip = InetAddress.getLocalHost().getHostAddress();
-        String port = env.getProperty("server.port");
-        String path = env.getProperty("server.servlet.context-path");
-        String redisPort = env.getProperty("spring.redis.port");
-        String redisHost = env.getProperty("spring.redis.host");
-        String sqlUrl = env.getProperty("spring.datasource.druid.url");
-        List<String> sqlInfo = getSqlInfo(sqlUrl);
-        log.info(
-                "\n Swagger访问地址：http://" + ip + ":" + port + path + "/doc.html \n" +
-                        " Redis服务器地址：" + redisHost + ":" + redisPort + "\n" +
-                        " Mysql服务器地址：" + sqlInfo.get(0) + ":" + sqlInfo.get(1));
-        log.info("--装修垃圾服务启动成功 --");
-    }
-    private static List<String> getSqlInfo(String sqlInfo) {
-        List<String> str = new ArrayList<>(3);
-        Pattern pattern = Pattern.compile("jdbc:mysql://([a-zA-Z0-9.-]+):(\\d+)/");
-        Matcher matcher = pattern.matcher(sqlInfo);
-        if (matcher.find()) {
-            str.add(matcher.group(1));
-            str.add(matcher.group(2));
-        }
-        return str;
-    }
-}
-package com.trash.garbage.config;
-
-import org.springframework.context.annotation.Configuration;
-import org.springframework.web.servlet.config.annotation.CorsRegistry;
-import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
-
-/**
- *
- * 允许跨域  后期修改  前端做服务代理
- * @author 20412
- */
-@Configuration
-public class CorsConfig implements WebMvcConfigurer {
-
-    @Override
-    public void addCorsMappings(CorsRegistry registry) {
-        registry.addMapping("/**")
-                .allowedOrigins("*")
-                .allowCredentials(true)
-                .allowedMethods("GET", "POST", "DELETE", "PUT", "PATCH")
-                .maxAge(3600);
-    }
-
-}
-package com.trash.garbage.config;
-
-import com.trash.garbage.utils.FastJson2JsonRedisSerializer;
-import org.springframework.cache.CacheManager;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.data.redis.cache.RedisCacheConfiguration;
-import org.springframework.data.redis.cache.RedisCacheManager;
-import org.springframework.data.redis.connection.RedisConnectionFactory;
-import org.springframework.data.redis.core.RedisTemplate;
-import org.springframework.data.redis.serializer.RedisSerializationContext;
-import org.springframework.data.redis.serializer.RedisSerializer;
-import org.springframework.data.redis.serializer.StringRedisSerializer;
-
-import java.time.Duration;
-
-
-/**
- * redis 配置文件
- * @author 20412
- */
-// 开启缓存
-//@EnableCaching
-@Configuration
-public class RedisConfig {
-    @Bean
-    public RedisTemplate<String, Object> redisTemplate(RedisConnectionFactory factory) {
-        RedisTemplate<String, Object> template = new RedisTemplate<>();
-        StringRedisSerializer stringRedisSerializer = new StringRedisSerializer();
-//        Jackson2JsonRedisSerializer genericJackson2JsonRedisSerializer = new Jackson2JsonRedisSerializer(Object.class);
-        // 使用fast json来完成反序列
-        FastJson2JsonRedisSerializer<Object> fastJson2JsonRedisSerializer = new FastJson2JsonRedisSerializer<>(Object.class);
-//        ObjectMapper om = new ObjectMapper();
-//        om.setVisibility(PropertyAccessor.ALL, JsonAutoDetect.Visibility.ANY);
-        // 解决linkArraylist反序列化问题
-//        om.activateDefaultTyping(LaissezFaireSubTypeValidator.instance ,ObjectMapper.DefaultTyping.NON_FINAL, JsonTypeInfo.As.WRAPPER_ARRAY);
-//        genericJackson2JsonRedisSerializer.setObjectMapper(om);
-        template.setConnectionFactory(factory);
-        //key序列化方式
-        template.setKeySerializer(stringRedisSerializer);
-        //value序列化
-        template.setValueSerializer(fastJson2JsonRedisSerializer);
-        template.setHashKeySerializer(stringRedisSerializer);
-        //value hashmap序列化  Jackson2JsonRedisSerializer 主要针对String类型的数据
-        template.setHashValueSerializer(fastJson2JsonRedisSerializer);
-        return template;
-    }
-
-    @Bean
-    public CacheManager cacheManager(RedisConnectionFactory factory) {
-        RedisSerializer<String> redisSerializer = new StringRedisSerializer();
-        FastJson2JsonRedisSerializer<Object> jackson2JsonRedisSerializer = new FastJson2JsonRedisSerializer<>(Object.class);
-// 配置序列化（解决乱码的问题）,过期时间600秒
-        RedisCacheConfiguration config = RedisCacheConfiguration.defaultCacheConfig()
-                .entryTtl(Duration.ofSeconds(600))
-                .serializeKeysWith(RedisSerializationContext.SerializationPair.fromSerializer(redisSerializer))
-                .serializeValuesWith(RedisSerializationContext.SerializationPair.fromSerializer(jackson2JsonRedisSerializer))
-                .disableCachingNullValues();
-        RedisCacheManager cacheManager = RedisCacheManager.builder(factory)
-                .cacheDefaults(config)
-                .build();
-        return cacheManager;
-    }
-}
 \ No newline at end of file
-package com.trash.garbage.config;
-
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.web.client.RestTemplate;
-
-@Configuration
-public class RestTemplateConfig {
-    @Bean
-    public RestTemplate getRestTemplate(){
-        return new RestTemplate();
-    }
-}
-package com.trash.garbage.config;
-
-import com.trash.garbage.global.ResultCode;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.web.bind.annotation.RequestMethod;
-import springfox.documentation.builders.ApiInfoBuilder;
-import springfox.documentation.builders.PathSelectors;
-import springfox.documentation.builders.RequestHandlerSelectors;
-import springfox.documentation.builders.ResponseMessageBuilder;
-import springfox.documentation.schema.ModelRef;
-import springfox.documentation.service.ApiInfo;
-import springfox.documentation.service.ResponseMessage;
-import springfox.documentation.spi.DocumentationType;
-import springfox.documentation.spring.web.plugins.Docket;
-import springfox.documentation.swagger2.annotations.EnableSwagger2;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-
-/**
- * @author guzijian
- * 2020/11/07 9:26
- * @since:knife4j-spring-boot-fast-demo 1.0
- */
-@Configuration
-@EnableSwagger2
-public class SwaggerConfiguration {
-
-    @Bean(value = "defaultApi2")
-    public Docket defaultApi2() {
-        //添加全局响应状态码
-        List<ResponseMessage> responseMessageList = new ArrayList<>();
-        Arrays.stream(ResultCode.values()).forEach(errorEnum -> {
-            responseMessageList.add(
-                    new ResponseMessageBuilder().code(errorEnum.getCode()).message(errorEnum.getMsg()).responseModel(
-                            new ModelRef(errorEnum.getMsg()))
-                            .build()
-            );
-        });
-
-        String groupName="学习间swagger";
-
-        Docket docket=new Docket(DocumentationType.SWAGGER_2)
-                .globalResponseMessage(RequestMethod.GET,responseMessageList)
-                .globalResponseMessage(RequestMethod.POST,responseMessageList)
-                .globalResponseMessage(RequestMethod.DELETE,responseMessageList)
-                .globalResponseMessage(RequestMethod.PUT,responseMessageList)
-                .host("http://localhost:9090/")
-                .apiInfo(apiInfo())
-                .groupName(groupName)
-                .select()
-                .apis(RequestHandlerSelectors.basePackage("com.trash.garbage"))
-                .paths(PathSelectors.any())
-                .build();
-        return docket;
-    }
-
-    private ApiInfo apiInfo() {
-        return new ApiInfoBuilder()
-                .description(" 学习间接口文档  ")
-                .contact("204126329@qq.com")
-                .version("1.0")
-                .build();
-    }
-}
 \ No newline at end of file
-package com.trash.garbage.config;
-import com.trash.garbage.security.JwtAuthenticationFilterAbstract;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-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.web.authentication.UsernamePasswordAuthenticationFilter;
-import org.springframework.security.web.util.matcher.AntPathRequestMatcher;
-import org.springframework.security.web.util.matcher.OrRequestMatcher;
-import org.springframework.security.web.util.matcher.RequestMatcher;
-
-/**
- * security配置类
- * @author gzj
- */
-@Configuration
-@EnableWebSecurity
-@EnableGlobalMethodSecurity(prePostEnabled = true)
-public class WebSecurityConfig extends WebSecurityConfigurerAdapter {
-
-    @Autowired
-    private JwtAuthenticationFilterAbstract jwtAuthenticationFilter;
-
-    /**
-     * 放行路径
-     */
-    @Value("${trash.garbage.config.location.exclude}")
-    private String[] exclude;
-
-    /**
-     * 放行端口  和security配置
-     * @param http
-     * @throws Exception
-     */
-    @Override
-    protected void configure(HttpSecurity http) throws Exception {
-
-        RequestMatcher PUBLIC_URLS = new OrRequestMatcher(
-                new AntPathRequestMatcher("/**", "OPTIONS"),
-                new AntPathRequestMatcher("/error/**")
-        );
-
-        http
-                // 关闭 csrf
-                .csrf().disable()
-                // 前后端分离的项目session就不管用了 不通过session获取securityContext
-                .sessionManagement().sessionCreationPolicy(SessionCreationPolicy.STATELESS)
-                .and()
-                .authorizeRequests()
-                // 对于登录接口 允许匿名访问
-                .antMatchers(exclude).anonymous()
-                .requestMatchers(PUBLIC_URLS).permitAll()
-                // 任意认证成功后都可以访问
-                .anyRequest().authenticated();
-
-        http.addFilterBefore(jwtAuthenticationFilter, UsernamePasswordAuthenticationFilter.class);
-        // spring security 异常处理   用于权限认证
-//        http.exceptionHandling()
-        // 权限异常
-//                .accessDeniedHandler()
-        // 认证异常
-//                .authenticationEntryPoint();
-    }
-
-    /**
-     * 重写认证管理
-     * @return
-     * @throws Exception
-     */
-    @Bean
-    @Override
-    public AuthenticationManager authenticationManagerBean() throws Exception {
-        return super.authenticationManagerBean();
-    }
-
-    /**
-     * 监听器  监听认证结果  当认证成功后触发
-     * @param applicationEventPublisher
-     * @return
-     */
-//    @Bean
-//    public AuthenticationEventPublisher authenticationEventPublisher
-//            (ApplicationEventPublisher applicationEventPublisher) {
-//        return new DefaultAuthenticationEventPublisher(applicationEventPublisher);
-//    }
-
-
-}
 \ No newline at end of file
@@ -6,8 +6,6 @@ import com.trash.garbage.pojo.domain.GarAddress;
 import com.trash.garbage.pojo.dto.AddressDto;
 import com.trash.garbage.pojo.dto.LoginDto;
 import com.trash.garbage.service.GarUserService;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
@@ -19,7 +17,6 @@ import java.util.List;
  */
 @RestController
 @RequestMapping("user")
-@Api(tags = "建筑垃圾-用户接口")
 public class GarbageUserController {
     @Autowired
@@ -31,13 +28,11 @@ public class GarbageUserController {
      * @param user
      * @return
      */
-    @ApiOperation("用户接口-用户登录")
     @PostMapping("/login")
     public Result<String> login(@RequestBody LoginDto user) {
         return Result.OK(garUserService.login(user));
     }
-    @ApiOperation("用户接口-发送验证码")
     @GetMapping("/send/verify")
     public Result<?> sendVerify(@RequestParam("tel") String tel) {
         try {
@@ -49,27 +44,23 @@ public class GarbageUserController {
         }
     }
-    @ApiOperation("用户接口-获取用户地址")
     @GetMapping("/query/address/{type}")
     public Result<List<GarAddress>> queryAddress(@PathVariable("type") String type) {
         return Result.OK(garUserService.queryAddress(type));
     }
-    @ApiOperation("用户接口-新增地址")
     @PostMapping("/save/address")
     public Result<String> saveAddress(@Validated @RequestBody AddressDto dto) {
         return Result.OK(null, garUserService.saveAddress(dto));
     }
-    @ApiOperation("用户接口-编辑地址")
     @PostMapping("/update/address")
     public Result<String> updateAddress(@Validated @RequestBody AddressDto dto) {
         return Result.OK(null, garUserService.updateAddress(dto));
     }
-    @ApiOperation("用户接口-删除地址")
     @DeleteMapping("/delete/address/{addressId}")
     public Result<String> deleteAddress(@PathVariable("addressId") String addressId) {
         return Result.OK(null, garUserService.deleteAddress(addressId));
-package com.trash.garbage.filter;
-
-import com.trash.common.utils.StringUtils;
-import com.trash.garbage.global.GlobalRedisProperties;
-import com.trash.garbage.security.JwtAuthenticationFilterAbstract;
-import com.trash.garbage.security.UserCustom;
-import com.trash.garbage.utils.JwtUtils;
-import com.trash.garbage.utils.RedisUtils;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;
-import org.springframework.security.core.Authentication;
-import org.springframework.security.core.context.SecurityContextHolder;
-import org.springframework.security.core.userdetails.UsernameNotFoundException;
-import org.springframework.stereotype.Component;
-import org.springframework.util.AntPathMatcher;
-import javax.servlet.FilterChain;
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import java.io.IOException;
-import static com.trash.garbage.interfaces.Authorization.AUTHORIZATION;
-
-/**
- * 实现登录认证逻辑
- * @author 20412
- */
-@Component
-@Slf4j
-public class JwtAuthenticationFilter extends JwtAuthenticationFilterAbstract {
-
-    private static final AntPathMatcher PATH_MATCHER = new AntPathMatcher();
-
-    @Autowired
-    private RedisUtils redisUtils;
-
-    @Value("${trash.garbage.config.location.exclude}")
-    private String[] exclude;
-
-    @Override
-    protected void doFilterInternal(HttpServletRequest request, HttpServletResponse response, FilterChain filterChain) throws ServletException, IOException {
-        String token = request.getHeader(AUTHORIZATION);
-        // 如果为空说明没有认证  进入下一层过滤器进行安全认证
-        if(StringUtils.isBlank(token) || doCheck(request.getRequestURI())){
-            filterChain.doFilter(request, response);
-            return;
-        }
-
-        String userId = JwtUtils.getUserId(token);
-        UserCustom customUser = (UserCustom) redisUtils.get(GlobalRedisProperties.REDIS_USER_HEADER.getValue() + userId);
-        if(customUser == null){
-            throw new UsernameNotFoundException("认证信息过期，请重新登录");
-        }
-        log.info("userId:{}",userId);
-        Authentication authenticationToken = new UsernamePasswordAuthenticationToken(customUser,null,null);
-        SecurityContextHolder.getContext().setAuthentication(authenticationToken);
-        //  放行
-        filterChain.doFilter(request,response);
-    }
-
-    private boolean doCheck(String url) {
-        for (String location : exclude) {
-            if (PATH_MATCHER.match(location,url)){
-                return true;
-            }
-        }
-        return false;
-    }
-}
 \ No newline at end of file
@@ -2,6 +2,7 @@ package com.trash.garbage.global;
 /**
  * 全局状态管理
+ *
  * @author guzijian
  */
 public class GlobalStatus {
@@ -26,42 +27,55 @@ public class GlobalStatus {
     /**
      * 用户状态管理
      */
-    public enum UserStatusEnum{
+    public enum UserStatusEnum {
         /**
-         * 管理员
+         * 微信登录
          */
-        WX_LOGIN(1,"微信登录"),
+        WX_LOGIN(1, "微信登录"),
         /**
-         * 普通用户
+         * 普通登录
          */
-        NORMAL_LOGIN(0,"普通登录");
+        NORMAL_LOGIN(0, "普通登录"),
+        NORMAL_USER(0, "普通用户"),
+        DRIVER_USER(1, "驾驶员用户");
         private Integer status;
         private String description;
-        public int getStatus(){
+
+        public int getStatus() {
             return this.status;
         }
-        UserStatusEnum(Integer status,String description){
+
+        public String getDescription() {
+            return this.description;
+        }
+
+        UserStatusEnum(Integer status, String description) {
             this.status = status;
             this.description = description;
         }
     }
+
     /**
      * 字典
      */
     public enum GarAddressStatus {
-        NORMAL_ADDRESS(0,"地址"),
-        CURRENT_ADDRESS(1,"当前地址");
-        GarAddressStatus(Integer status,String description){
+        NORMAL_ADDRESS(0, "地址"),
+        CURRENT_ADDRESS(1, "当前地址");
+
+        GarAddressStatus(Integer status, String description) {
             this.status = status;
             this.description = description;
         }
+
         private String description;
         private Integer status;
-        public Integer getValue(){
+
+        public Integer getValue() {
             return this.status;
         }
-        public String getDescription(){
+
+        public String getDescription() {
             return this.description;
         }
 package com.trash.garbage.global;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import static com.trash.garbage.global.ResultCode.CODE_200;
@@ -13,19 +11,14 @@ import static com.trash.garbage.global.ResultCode.CODE_500;
  * @author 20412
  */
 @Data
-@ApiModel("返回结果")
 public class Result<T extends Object> {
-    @ApiModelProperty(value = "是否成功")
     private Boolean success;
-    @ApiModelProperty(value = "状态码")
     private Integer code;
-    @ApiModelProperty(value = "返回消息")
     private String msg;
-    @ApiModelProperty(value = "返回对象")
     private T data ;
     private Result() {}
 package com.trash.garbage.interceptor;
 import com.baomidou.mybatisplus.core.handlers.MetaObjectHandler;
-import com.trash.garbage.utils.SecurityUtil;
+import com.trash.common.utils.SecurityUtils;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.ibatis.reflection.MetaObject;
 import org.springframework.stereotype.Component;
 import java.util.Date;
-import java.util.Objects;
 /**
  * mybatis 拦截器全局注入
+ *
  * @author 20412
  */
 @Slf4j
@@ -20,39 +20,33 @@ public class MyMetaObjectHandler implements MetaObjectHandler {
     @Override
     public void insertFill(MetaObject metaObject) {
         log.info("start insert fill ....");
-        if (metaObject.hasGetter("garCreateTime")){
+        if (metaObject.hasGetter("garCreateTime")) {
             this.strictInsertFill(metaObject, "garCreateTime", Date.class, new Date());
         }
-        if (metaObject.hasGetter("garCreateBy")){
-            if (!Objects.isNull(SecurityUtil.getUserCustom())){
-                this.strictInsertFill(metaObject, "garCreateBy", String.class, SecurityUtil.getUserCustom().getUser().getGarUserId());
-            }
+        if (metaObject.hasGetter("garCreateBy")) {
+            this.strictInsertFill(metaObject, "garCreateBy", String.class, SecurityUtils.getLoginUser().getUser().getUserId());
         }
-        if (metaObject.hasGetter("garUpdateTime")){
+        if (metaObject.hasGetter("garUpdateTime")) {
             this.strictInsertFill(metaObject, "garUpdateTime", Date.class, new Date());
         }
-        if (metaObject.hasGetter("garUserId")){
-            if (!Objects.isNull(SecurityUtil.getUserCustom())) {
-                this.strictInsertFill(metaObject, "garUserId", String.class, SecurityUtil.getUserCustom().getUser().getGarUserId());
-            }
+        if (metaObject.hasGetter("garUserId")) {
+            this.strictInsertFill(metaObject, "garUserId", String.class, SecurityUtils.getLoginUser().getUser().getUserId());
         }
-        if (metaObject.hasGetter("garUpdateBy")){
-            if (!Objects.isNull(SecurityUtil.getUserCustom())){
-                this.strictInsertFill(metaObject, "garUpdateBy", String.class, SecurityUtil.getUserCustom().getUser().getGarUserId());
-            }
+        if (metaObject.hasGetter("garUpdateBy")) {
+            this.strictInsertFill(metaObject, "garUpdateBy", String.class, SecurityUtils.getLoginUser().getUser().getUserId());
         }
     }
     @Override
     public void updateFill(MetaObject metaObject) {
         log.info("start update fill ....");
-        if (metaObject.hasGetter("garUpdateTime")){
+        if (metaObject.hasGetter("garUpdateTime")) {
             this.strictUpdateFill(metaObject, "garUpdateTime", Date.class, new Date());
         }
-        if (metaObject.hasGetter("garUpdateBy")){
-            this.strictUpdateFill(metaObject,"garUpdateBy",String.class,SecurityUtil.getUserCustom().getUser().getGarUserId());
+        if (metaObject.hasGetter("garUpdateBy")) {
+            this.strictUpdateFill(metaObject, "garUpdateBy", String.class, SecurityUtils.getLoginUser().getUser().getUserId());
         }
     }
 }
 \ No newline at end of file
-package com.trash.garbage.interfaces;
-
-/**
- * 请求头规范
- * @date 2023-3-21
- * @author 20412
- */
-public interface Authorization {
-    String AUTHORIZATION = "Authorization";
-
-    /**
-     * 这个已经被淘汰，请使用AUTHORIZATION
-     */
-    @Deprecated
-    String TOKEN = "X-TOKEN-AUTH";
-}
@@ -8,7 +8,6 @@ import java.io.Serializable;
 import java.util.Date;
 import com.fasterxml.jackson.annotation.JsonFormat;
-import com.trash.garbage.security.UserAbstract;
 import lombok.Data;
 /**
@@ -17,7 +16,7 @@ import lombok.Data;
  */
 @TableName(value ="gar_user")
 @Data
-public class GarUser extends UserAbstract implements Serializable {
+public class GarUser implements Serializable {
     /**
      * 建筑垃圾用户id
      */
@@ -131,8 +130,4 @@ public class GarUser extends UserAbstract implements Serializable {
         return sb.toString();
     }
-    @Override
-    public String getTel() {
-        return this.garUserTel;
-    }
 }
 \ No newline at end of file
 package com.trash.garbage.pojo.dto;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 /**
  * @author 20412
  */
 @Data
-@ApiModel(value = "登录vo")
 public class LoginDto {
-    @ApiModelProperty(value = "登录vo-手机号")
     private String tel;
-    @ApiModelProperty(value = "登录vo-验证码")
     private String code;
-    @ApiModelProperty(value = "登录vo-用户昵称")
     private String nickname;
-    @ApiModelProperty(value = "登录vo-wxCode")
     private String wxCode;
-    @ApiModelProperty(value = "登录vo-loginType:0 手机号登录 ， 1 微信登录")
     private Integer loginType;
     private String encryptedData;
     private String iv;
-package com.trash.garbage.security;
-
-import org.springframework.web.filter.OncePerRequestFilter;
-
-
-
-/**
- * 使用抽象类
- * 因为不同的调用者可能需要的过滤不一样
- * 由调用者自己实现
- * @author 20412
- */
-public abstract class JwtAuthenticationFilterAbstract extends OncePerRequestFilter {
-
-}
-package com.trash.garbage.security;
-
-import org.springframework.security.crypto.password.PasswordEncoder;
-import org.springframework.stereotype.Component;
-import org.springframework.util.DigestUtils;
-
-/**
- * @author 20412
- */
-@Component
-public class PasswordCustom implements PasswordEncoder {
-
-    /** 密码加密 */
-    @Override
-    public String encode(CharSequence charSequence) {
-        return "";
-    }
-
-    /** 密码配对  用户登录的密码加密后是否配对上 */
-    @Override
-    public boolean matches(CharSequence rawPassword, String password) {
-        return true;
-    }
-}
-package com.trash.garbage.security;
-
-/**
- * 封装用户信息必须实现一下模板
- * @author guzijian
- */
-public abstract class UserAbstract {
-
-    /**
-     * 可选属性  根据需要设置
-     */
-    String garUserId;
-
-    /**
-     * 实现获取用手机号
-     * @return
-     */
-    public abstract String getTel();
-
-    public String getGarUserId(){
-        return this.garUserId;
-    }
-
-}
-package com.trash.garbage.security;
-
-import com.alibaba.fastjson.annotation.JSONField;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-import org.springframework.security.core.GrantedAuthority;
-import org.springframework.security.core.authority.SimpleGrantedAuthority;
-import org.springframework.security.core.userdetails.UserDetails;
-import java.io.Serializable;
-import java.util.Collection;
-import java.util.List;
-import java.util.stream.Collectors;
-
-/**
- * @author 20412
- */
-@Data
-@NoArgsConstructor
-public class UserCustom implements Serializable , UserDetails {
-
-    private static final long serialVersionUID = -2L;
-
-    /**
-     * 用户实体
-     */
-    private UserAbstract user;
-
-    /**
-     * 权限集合
-     */
-    private List<String> permissions;
-    @JSONField(serialize = false)
-    private Collection<? extends GrantedAuthority> authorities;
-
-    /**
-     * 初始化构造
-     * @param user  用户实体
-     * @param permissions   权限集合
-     */
-    public UserCustom(UserAbstract user, List<String> permissions) {
-        this.user = user;
-        this.permissions = permissions;
-    }
-
-    public UserAbstract getUser() {
-        return this.user;
-    }
-
-    @Override
-    public Collection<? extends GrantedAuthority> getAuthorities() {
-        if (authorities != null){
-            return authorities;
-        }
-
-        authorities = permissions.stream()
-                .map(SimpleGrantedAuthority::new)
-                .collect(Collectors.toList());
-
-        return this.authorities;
-    }
-
-    @Override
-    public String getPassword() {
-        return this.user.getTel();
-    }
-
-    @Override
-    public String getUsername() {
-        return this.user.getTel();
-    }
-
-    @Override
-    public boolean isAccountNonExpired() {
-        return true;
-    }
-
-    @Override
-    public boolean isAccountNonLocked() {
-        return true;
-    }
-
-    @Override
-    public boolean isCredentialsNonExpired() {
-        return true;
-    }
-
-    @Override
-    public boolean isEnabled() {
-        return true;
-    }
-}
@@ -4,8 +4,15 @@ import cn.hutool.http.HttpUtil;
 import com.alibaba.fastjson.JSONObject;
 import com.aliyuncs.exceptions.ClientException;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.trash.common.core.domain.entity.SysRole;
+import com.trash.common.core.domain.entity.SysUser;
+import com.trash.common.core.domain.model.LoginUser;
+import com.trash.common.core.redis.RedisCache;
+import com.trash.common.utils.SecurityUtils;
+import com.trash.framework.web.service.TokenService;
 import com.trash.garbage.config.WxConfig;
 import com.trash.garbage.custom.BizException;
 import com.trash.garbage.global.GlobalRedisProperties;
@@ -15,7 +22,6 @@ import com.trash.garbage.pojo.domain.GarAddress;
 import com.trash.garbage.pojo.domain.GarUser;
 import com.trash.garbage.pojo.dto.AddressDto;
 import com.trash.garbage.pojo.dto.LoginDto;
-import com.trash.garbage.security.UserCustom;
 import com.trash.garbage.service.GarAddressService;
 import com.trash.garbage.service.GarUserService;
 import com.trash.garbage.mapper.GarUserMapper;
@@ -23,8 +29,7 @@ import com.trash.garbage.utils.*;
 import org.apache.commons.codec.binary.Base64;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.authentication.AuthenticationManager;
-import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;
-import org.springframework.security.core.Authentication;
+import org.springframework.security.core.authority.SimpleGrantedAuthority;
 import org.springframework.security.core.userdetails.UsernameNotFoundException;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -34,10 +39,7 @@ import javax.crypto.Cipher;
 import javax.crypto.spec.IvParameterSpec;
 import javax.crypto.spec.SecretKeySpec;
 import java.security.spec.AlgorithmParameterSpec;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-import java.util.Objects;
+import java.util.*;
 import java.util.concurrent.TimeUnit;
 /**
@@ -51,50 +53,75 @@ public class GarUserServiceImpl extends ServiceImpl&lt;GarUserMapper, GarUser&gt;
         implements GarUserService {
     @Resource
     private WxConfig wxConfig;
-    @Autowired
-    private AuthenticationManager authenticationManager;
     @Autowired
     private GarAddressService garAddressService;
+
     @Resource
-    private RedisUtils redisUtils;
+    private RedisCache redisCache;
+
+    @Autowired
+    private TokenService tokenService;
     @Override
-    public String login(LoginDto user) {
-        if (Objects.isNull(user)) {
-            throw new UsernameNotFoundException("当前用户不存在");
+    public String login(LoginDto loginDto) {
+        if (Objects.isNull(loginDto)) {
+            throw new UsernameNotFoundException("当前用户不存在!");
         }
         // TODO 微信登录
-        if (user.getLoginType().equals(GlobalStatus.UserStatusEnum.WX_LOGIN.getStatus())) {
-            String url = "https://api.weixin.qq.com/sns/jscode2session?appid=" + wxConfig.getAppId() + "&secret=" + wxConfig.getSecret() + "&js_code=" + user.getWxCode() + "&grant_type=authorization_code";
+        if (loginDto.getLoginType().equals(GlobalStatus.UserStatusEnum.WX_LOGIN.getStatus())) {
+            String url = "https://api.weixin.qq.com/sns/jscode2session?appid=" + wxConfig.getAppId() + "&secret=" + wxConfig.getSecret() + "&js_code=" + loginDto.getWxCode() + "&grant_type=authorization_code";
             String body = HttpUtil.createGet(url).header("cache-control", "no-cache").execute().body();
             JSONObject open = JSONObject.parseObject(body);
             String sessionKey = open.getString("session_key");
             try {
-                user.setTel(decrypt(user.getEncryptedData(), sessionKey, user.getIv()));
+                loginDto.setTel(decrypt(loginDto.getEncryptedData(), sessionKey, loginDto.getIv()));
             } catch (Exception e) {
                 throw new RuntimeException("解密失败");
             }
         }
         // 验证码验证
-        String code = (String) redisUtils.get(GlobalRedisProperties.REDIS_USER_CODE.getValue() + user.getTel());
-        if (user.getCode() == null || !user.getCode().equals(code)) {
+        String code = redisCache.getCacheObject(GlobalRedisProperties.REDIS_USER_CODE.getValue() + loginDto.getTel());
+        if (loginDto.getCode() == null || !loginDto.getCode().equals(code)) {
             throw new BizException(ResultCode.CODE_400, "验证码错误！！");
         }
-        // 封装成authentication对象
-        Authentication authentication = new UsernamePasswordAuthenticationToken(user.getTel(), "");
-        // 开始认证
-        Authentication authenticate = authenticationManager.authenticate(authentication);
-        if (Objects.isNull(authenticate)) {
-            throw new RuntimeException("用户名或密码错误");
+        // 查询用户
+        QueryWrapper<GarUser> qw = new QueryWrapper<>();
+        qw.lambda().eq(GarUser::getGarUserTel, loginDto.getTel());
+        GarUser nUser = this.getOne(qw);
+        if (Objects.isNull(nUser)) {
+            // 不存在就创建用户
+            nUser = new GarUser();
+            nUser.setGarUserTel(loginDto.getTel());
+            nUser.setGarUserDelFlag(GlobalStatus.DEL_FLAG_NO);
+            nUser.setGarUserType(GlobalStatus.UserStatusEnum.NORMAL_USER.getDescription());
+            this.save(nUser);
+        }
+        LoginUser loginUser = new LoginUser();
+        ArrayList<SimpleGrantedAuthority> authorities = new ArrayList<SimpleGrantedAuthority>();
+        loginUser.setAuthorities(authorities);
+        Set<String> set = new HashSet<String>();
+        SysUser user = new SysUser();
+        user.setUserId(nUser.getGarUserId());
+        user.setUserName(nUser.getGarUserName());
+        user.setPhonenumber(loginDto.getTel());
+        loginUser.setUser(user);
+        set.add("*:*:*");
+        SysRole role = new SysRole();
+        role.setRoleKey("admin");
+        ArrayList<SysRole> roles = new ArrayList<SysRole>();
+        roles.add(role);
+        user.setRoles(roles);
+        loginUser.setPermissions(set);
+        String token = JwtUtils.createToken(nUser.getGarUserId(), nUser.getGarUserTel());
+        if (!token.contains("Bearer ")) {
+            token = "Bearer " + token;
         }
-        UserCustom userCustom = (UserCustom) authenticate.getPrincipal();
-        // 存入redis
-        redisUtils.set(GlobalRedisProperties.REDIS_USER_HEADER.getValue() + userCustom.getUser().getGarUserId(), userCustom);
-        // 修改在线状态
-        return JwtUtils.createToken(userCustom.getUser().getTel(), userCustom.getUser().getGarUserId());
+        loginUser.setToken(token);
+        tokenService.refreshToken(loginUser);
+        return token;
     }
     @Override
@@ -105,16 +132,13 @@ public class GarUserServiceImpl extends ServiceImpl&lt;GarUserMapper, GarUser&gt;
 //        SMSUtils.sendMessage("", tel, validateCode.toString(), "");
         // 保存redis
         System.out.println("code:" + validateCode);
-        redisUtils.setEx(GlobalRedisProperties.REDIS_USER_CODE.getValue() + tel, validateCode, 60, TimeUnit.SECONDS);
+        redisCache.setCacheObject(GlobalRedisProperties.REDIS_USER_CODE.getValue() + tel, validateCode, 60, TimeUnit.SECONDS);
     }
     @Override
     public List<GarAddress> queryAddress(String type) {
-        UserCustom userCustom = SecurityUtil.getUserCustom();
-        if (Objects.isNull(userCustom)) {
-            throw new BizException(ResultCode.CODE_401, ResultCode.CODE_401.getMsg());
-        }
-        String garUserId = userCustom.getUser().getGarUserId();
+        LoginUser user = SecurityUtils.getLoginUser();
+        String garUserId = user.getUser().getUserId();
         LambdaQueryWrapper<GarAddress> qw = new LambdaQueryWrapper<>();
         qw.eq(GarAddress::getGarUserId, garUserId);
         if (GlobalStatus.QUERY_ADDRESS_TYPE_CURRENT.equals(type)) {
@@ -127,16 +151,16 @@ public class GarUserServiceImpl extends ServiceImpl&lt;GarUserMapper, GarUser&gt;
     @Override
     public String saveAddress(AddressDto dto) {
-        UserCustom userCustom = SecurityUtil.getUserCustom();
+        LoginUser userCustom = SecurityUtils.getLoginUser();
         // 限制地址数
         LambdaQueryWrapper<GarAddress> qw = new LambdaQueryWrapper<>();
-        qw.eq(GarAddress::getGarUserId, userCustom.getUser().getGarUserId());
+        qw.eq(GarAddress::getGarUserId, userCustom.getUser().getUserId());
         List<GarAddress> list = garAddressService.list(qw);
         if (list.size() > 19) {
             throw new BizException(ResultCode.CODE_201, "新增地址数已达上线，请删除地址后新增地址或编辑已有地址！");
         }
         GarAddress address = new GarAddress();
-        address.setGarUserId(userCustom.getUser().getGarUserId());
+        address.setGarUserId(userCustom.getUser().getUserId());
         address.setGarUserAddress(dto.getAddressArea());
         address.setGarUserDefault(dto.getDefaultFlag() ? GlobalStatus.GarAddressStatus.CURRENT_ADDRESS.getValue() : GlobalStatus.GarAddressStatus.NORMAL_ADDRESS.getValue());
         address.setGarUserContactName(dto.getContactPerson());
@@ -150,7 +174,7 @@ public class GarUserServiceImpl extends ServiceImpl&lt;GarUserMapper, GarUser&gt;
     @Override
     public String updateAddress(AddressDto dto) {
         GarAddress address = new GarAddress();
-        String userId = SecurityUtil.getUserCustom().getUser().getGarUserId();
+        String userId = SecurityUtils.getLoginUser().getUser().getUserId();
         address.setGarAddressId(dto.getGarAddressId());
         address.setGarUserId(userId);
         address.setGarUserAddress(dto.getAddressArea());
@@ -177,7 +201,7 @@ public class GarUserServiceImpl extends ServiceImpl&lt;GarUserMapper, GarUser&gt;
     @Override
     public String deleteAddress(String addressId) {
-        String garUserId = SecurityUtil.getUserCustom().getUser().getGarUserId();
+        String garUserId = SecurityUtils.getLoginUser().getUser().getUserId();
         LambdaQueryWrapper<GarAddress> qw = new LambdaQueryWrapper<>();
         qw.eq(GarAddress::getGarUserId, garUserId)
                 .eq(GarAddress::getGarAddressId, addressId);
-package com.trash.garbage.service.impl;
-
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.trash.garbage.global.GlobalStatus;
-import com.trash.garbage.pojo.domain.GarUser;
-import com.trash.garbage.security.UserCustom;
-import com.trash.garbage.service.GarUserService;
-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;
-
-import java.util.Collections;
-import java.util.Objects;
-
-/**
- * 用户信息实现类
- * @author 20412
- */
-@Component
-public class UserDetailServiceImpl implements UserDetailsService {
-
-    @Autowired
-    private GarUserService userService;
-
-    /** 查询数据库中的数据是否配对上 */
-    @Override
-    public UserDetails loadUserByUsername(String tel) throws UsernameNotFoundException {
-        // 查表是否有对应的tel
-        QueryWrapper<GarUser> qw = new QueryWrapper<>();
-        qw.lambda().eq(GarUser::getGarUserTel, tel);
-        GarUser user = userService.getOne(qw);
-        if (Objects.isNull(user)) {
-            // 不存在就创建用户
-            GarUser nUser = new GarUser();
-            nUser.setGarUserTel(tel);
-            nUser.setGarUserDelFlag(GlobalStatus.DEL_FLAG_NO);
-            nUser.setGarUserType("iphone");
-            if (userService.save(nUser)) {
-                return new UserCustom(nUser, Collections.emptyList());
-            }
-        }
-        // 第二参数是控制权限  普通用户无需角色认证
-        return new UserCustom(user, Collections.emptyList());
-    }
-}
-package com.trash.garbage.utils;
-
-import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.parser.ParserConfig;
-import com.alibaba.fastjson.serializer.SerializerFeature;
-import com.fasterxml.jackson.databind.JavaType;
-import com.fasterxml.jackson.databind.ObjectMapper;
-import com.fasterxml.jackson.databind.type.TypeFactory;
-import org.springframework.data.redis.serializer.RedisSerializer;
-import org.springframework.data.redis.serializer.SerializationException;
-import org.springframework.util.Assert;
-
-import java.nio.charset.Charset;
-/**
- * FastJson2JsonRedisSerializer
- *  Redis使用FastJson序列化
- */
-public class FastJson2JsonRedisSerializer<T> implements RedisSerializer<T> {
-    private ObjectMapper objectMapper = new ObjectMapper();
-    public static final Charset DEFAULT_CHARSET = Charset.forName("UTF-8");
-
-    private Class<T> clazz;
-
-    static {
-        ParserConfig.getGlobalInstance().setAutoTypeSupport(true);
-        //如果遇到反序列化autoType is not support错误，请添加并修改一下包名到bean文件路径
-        // ParserConfig.getGlobalInstance().addAccept("com.xxxxx.xxx");
-    }
-    public FastJson2JsonRedisSerializer(Class<T> clazz) {
-        super();
-        this.clazz = clazz;
-    }
-
-    public byte[] serialize(T t) throws SerializationException {
-        if (t == null) {
-            return new byte[0];
-        }
-        return JSON.toJSONString(t, SerializerFeature.WriteClassName).getBytes(DEFAULT_CHARSET);
-    }
-
-    public T deserialize(byte[] bytes) throws SerializationException {
-        if (bytes == null || bytes.length <= 0) {
-            return null;
-        }
-        String str = new String(bytes, DEFAULT_CHARSET);
-
-        return JSON.parseObject(str, clazz);
-    }
-    public void setObjectMapper(ObjectMapper objectMapper) {
-        Assert.notNull(objectMapper, "'objectMapper' must not be null");
-        this.objectMapper = objectMapper;
-    }
-
-    protected JavaType getJavaType(Class<?> clazz) {
-        return TypeFactory.defaultInstance().constructType(clazz);
-    }
-
-}
-package com.trash.garbage.utils;
-
-import cn.hutool.core.bean.BeanUtil;
-import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.JSONObject;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-
-/**
- * @Author : guzijian
- * @Description :
- **/
-public final class JsonUtil {
-    static Logger log = LoggerFactory.getLogger(JsonUtil.class) ;
-    /**
-     * 把Java对象转换成json字符串
-     *
-     * @param object 待转化为JSON字符串的Java对象
-     * @return json 串 or null
-     */
-    public static String parseObjToJson(Object object) {
-        String string = null;
-        try {
-            string = JSONObject.toJSONString(object);
-        } catch (Exception e) {
-            log.info("把Java对象转换成json字符串转换异常：{}",e.getMessage());
-        }
-        return string;
-    }
- 
-    /**
-     * 将Json字符串信息转换成对应的Java对象
-     *
-     * @param json json字符串对象
-     * @param c    对应的类型
-     */
-    public static <T> T parseJsonToObj(String json, Class<T> c) {
-        try {
-            JSONObject jsonObject = JSON.parseObject(json);
-            return JSON.toJavaObject(jsonObject, c);
-        } catch (Exception e) {
-            log.info("将Json字符串信息转换成对应的Java对象转换异常：{}",e.getMessage());
-            return null;
-        }
-    }
-
-    public static <T> T parseObjToObj(Object obj,Class<T> clazz){
-        try {
-            return BeanUtil.toBean(obj, clazz);
-        }catch (Exception e){
-            log.info("将Json字符串信息转换成对应的Java对象转换异常：{}",e.getMessage());
-        }
-        return null;
-    }
-}
 \ No newline at end of file
@@ -19,15 +19,15 @@ public class JwtUtils {
     private final static String tokenSecret = "guzijian";
     /** 创建token  */
-    public static String createToken(String username, String userId) {
+    public static String createToken(String id, String tel) {
         String token = Jwts.builder()
                 // 说明
                 .setSubject("AUTH-USER")
                 // 过期时间
                 .setExpiration(new Date(System.currentTimeMillis() + tokenExpiration))
                 // 加入认证信息
-                .claim("userId",userId)
-                .claim("username",username)
+                .claim("tel",tel)
+                .claim("userId",id)
                 // 加密方式 jwt 密钥方便解密
                 .signWith(SignatureAlgorithm.HS256, tokenSecret)
                 // 压缩方式
 package com.trash.garbage.utils;
-import cn.hutool.core.bean.BeanUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.redis.core.RedisTemplate;
 import org.springframework.stereotype.Component;
@@ -25,10 +24,6 @@ public class RedisUtils {
         return redisTemplate.opsForValue().get(key);
     }
-    public <T> T get(String key,Class<T> clazz){
-        return BeanUtil.toBean(redisTemplate.opsForValue().get(key), clazz);
-    }
-
     public boolean setNxAndEx(String key,String value,long expireTime){
         return redisTemplate.opsForValue().setIfAbsent(key,value,expireTime, TimeUnit.SECONDS);
     }
-package com.trash.garbage.utils;
-
-import com.trash.garbage.custom.BizException;
-import com.trash.garbage.global.ResultCode;
-import com.trash.garbage.security.UserCustom;
-import org.springframework.security.core.context.SecurityContextHolder;
-
-/**
- * @author 20412
- */
-public class SecurityUtil {
-
-
-    public static UserCustom getUserCustom() {
-        if (SecurityContextHolder.getContext().getAuthentication().getPrincipal() instanceof UserCustom)
-            return (UserCustom) SecurityContextHolder.getContext().getAuthentication().getPrincipal();
-        throw new BizException(ResultCode.CODE_401, ResultCode.CODE_401.getMsg());
-    }
-}
-spring:
-  datasource:
-    type: com.alibaba.druid.pool.DruidDataSource
-    driverClassName: com.mysql.cj.jdbc.Driver
-    druid:
-      # 主库数据源
-      url: jdbc:mysql://localhost:3306/trash?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&useAffectedRows=true&allowMultiQueries=true
-      username: root
-      password: guzijian
-      # 初始连接数
-      initialSize: 5
-      # 最小连接池数量
-      minIdle: 10
-      # 最大连接池数量
-      maxActive: 20
-      # 配置获取连接等待超时的时间
-      maxWait: 60000
-      # 配置连接超时时间
-      connectTimeout: 30000
-      # 配置网络超时时间
-      socketTimeout: 60000
-      # 配置间隔多久才进行一次检测，检测需要关闭的空闲连接，单位是毫秒
-      timeBetweenEvictionRunsMillis: 60000
-      # 配置一个连接在池中最小生存的时间，单位是毫秒
-      minEvictableIdleTimeMillis: 300000
-      # 配置一个连接在池中最大生存的时间，单位是毫秒
-      maxEvictableIdleTimeMillis: 900000
-      # 配置检测连接是否有效
-      validationQuery: SELECT 1 FROM DUAL
-      testWhileIdle: true
-      testOnBorrow: false
-      testOnReturn: false
-      webStatFilter:
-        enabled: true
-      statViewServlet:
-        enabled: true
-        # 设置白名单，不填则允许所有访问
-        allow:
-        url-pattern: /druid/*
-        # 控制台管理用户名和密码
-        login-username: ruoyi
-        login-password: 123456
-      filter:
-        stat:
-          enabled: true
-          # 慢SQL记录
-          log-slow-sql: true
-          slow-sql-millis: 1000
-          merge-sql: true
-        wall:
-          config:
-            multi-statement-allow: true
-  redis:
-    # 地址
-#    host: 121.41.83.61
-#    host: 192.168.172.221
-    host: 127.0.0.1
-    database: 0
-    #            password: "guzijian"
-    port: 6379
-    # 连接超时时间
-    timeout: 10s
-    lettuce:
-      pool:
-        # 连接池中的最小空闲连接
-        min-idle: 0
-        # 连接池中的最大空闲连接
-        max-idle: 8
-        # 连接池的最大数据库连接数
-        max-active: 8
-        # #连接池最大阻塞等待时间（使用负值表示没有限制）
-        max-wait: -1ms
-    #返回json的全局时间格式
-  jackson:
-    date-format: yyyy-MM-dd HH:mm:ss
-    time-zone: GMT+8
-
-# mybaits 配置
-mybatis-plus:
-  global-config:
-    # 指定逻辑删除含义
-    db-config:
-      logic-delete-value: 1
-      logic-not-delete-value: 0
-  configuration:
-    # 日志打印sql
-    log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
-
-trash:
-  garbage:
-    config:
-      location:
-        # security 放行路径
-        exclude: /user/login,/user/send/verify,/user/sendCode/**,/doc.html,/swagger-ui.html,/swagger-ui/**,/swagger-resources/**,/v2/api-docs,/v3/api-docs,/webjars/**,/ws/**
-
-wx:
-  appId: 'wxc3f60667dc9d6cea'
-  secret: 'd35996a9f898dff37974efba0b6f23ed'
 \ No newline at end of file
-server:
-  servlet:
-    context-path:
-  port: 9090
-spring:
-  profiles:
-    active: dev
 \ No newline at end of file
+# mybaits 配置
+mybatis-plus:
+  global-config:
+    # 指定逻辑删除含义
+    db-config:
+      logic-delete-value: 1
+      logic-not-delete-value: 0
+  configuration:
+    # 日志打印sql
+    log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
 \ No newline at end of file