From ad5b63c50c248ea477160f4a6cedae31f22d2d76 Mon Sep 17 00:00:00 2001 From: ytChen <1650611030@qq.com> Date: Tue, 21 May 2024 13:47:03 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- hoe-admin/admin-boot/pom.xml | 38 +- .../admin/boot/config/InterceptConfig.java | 7 +- .../boot/config/ds/DataSourceConfig.java | 8 +- .../config/ds/TeachingDataSourceConfig.java | 58 - .../admin/boot}/config/redis/RedisCache.java | 2 +- .../boot}/config/redis/RedisCacheImpl.java | 2 +- .../controller/OauthClientController.java | 70 +- .../admin/boot/controller/UserController.java | 8 +- .../admin/boot/controller/testController.java | 53 +- .../com/recovery/admin/boot/entity/User.java | 128 +- .../admin/boot/feign/OrderFeignClient.java | 23 + .../boot/interceptor/JwtInterceptor.java | 31 +- .../admin/boot/mapper/UserMapper.java | 5 +- .../recovery/admin/boot/rest/UserRest.java | 9 +- ...{ISysUserService.java => UserService.java} | 6 +- ...rServiceImpl.java => UserServiceImpl.java} | 19 +- .../src/main/resources/bootstrap.yml | 30 +- .../src/main/resources/mapper/UserMapper.xml | 2 +- .../src/test/java/code/CodeGenerator.java | 115 + .../auth/config/ds/DataSourceConfig.java | 18 +- .../auth/controller/AuthController.java | 10 +- hoe-auth/src/main/resources/bootstrap.yml | 4 +- hoe-common/common-base/pom.xml | 9 + .../common/base/config/RedisConfig.java | 47 - .../feign/CommonRequestInterceptor.java | 9 + .../common/base/config/redis/RedisConfig.java | 68 + .../config/redis/RedisObjectSerializer.java | 45 + .../common/base/ds/DynamicDataSource.java | 3 + .../recovery/common/base/dto/UserAuthDTO.java | 6 +- .../recovery/common/base/util/UtilTools.java | 20 + .../common/mybatis/config/MyMapper.java | 18 + .../common/redis/util/RedisUtils.java | 1212 +++++------ .../main/resources/META-INF/spring.factories | 2 +- .../java/com/recovery/gateway/GatewayApp.java | 2 + hoe-gateway/src/main/resources/bootstrap.yml | 4 +- hoe-order/pom.xml | 52 +- .../java/com/recovery/order/OrderApp.java | 26 + .../recovery/order/aspect/WebLogAspect.java | 4 +- .../order/config/SaTokenConfigure.java | 35 + .../order/config/ds/DataSourceConfig.java | 24 +- .../config/ds/TeachingDataSourceConfig.java | 116 +- .../order/config/redis/RedisCache.java | 47 + .../order/config/redis/RedisCacheImpl.java | 109 + .../com/recovery/order/entity/OrderIn.java | 47 + .../order/interceptor/JwtInterceptor.java | 35 +- .../recovery/order/mapper/OrderInMapper.java | 16 + .../com/recovery/order/rest/UserRest.java | 14 +- .../order/service/OrderInService.java | 23 + .../service/impl/OrderInServiceImpl.java | 36 + hoe-order/src/main/resources/bootstrap.yml | 31 +- .../main/resources/mapper/OrderInMapper.xml | 18 + .../src/test/java/code/CodeGenerator.java | 112 + logs/common/2024-03-07/error-log.log | 0 logs/common/2024-03-07/info-log.log | 155 -- logs/common/2024-03-07/warn-log.log | 38 - logs/common/2024-03-11/error-log.log | 54 - logs/common/2024-03-11/info-log.log | 244 --- logs/common/2024-03-11/warn-log.log | 58 - logs/common/2024-03-12/error-log.log | 1546 -------------- logs/common/2024-03-12/info-log.log | 1849 ----------------- logs/common/2024-03-12/warn-log.log | 389 ---- logs/common/2024-03-13/error-log.log | 156 -- logs/common/2024-03-13/info-log.log | 684 ------ logs/common/2024-03-13/warn-log.log | 140 -- logs/common/2024-03-14/error-log.log | 39 - logs/common/2024-03-14/info-log.log | 29 - logs/common/2024-03-14/warn-log.log | 11 - pom.xml | 2 +- 68 files changed, 1884 insertions(+), 6346 deletions(-) delete mode 100644 hoe-admin/admin-boot/src/main/java/com/recovery/admin/boot/config/ds/TeachingDataSourceConfig.java rename {hoe-common/common-base/src/main/java/com/recovery/common/base => hoe-admin/admin-boot/src/main/java/com/recovery/admin/boot}/config/redis/RedisCache.java (95%) rename {hoe-common/common-base/src/main/java/com/recovery/common/base => hoe-admin/admin-boot/src/main/java/com/recovery/admin/boot}/config/redis/RedisCacheImpl.java (98%) create mode 100644 hoe-admin/admin-boot/src/main/java/com/recovery/admin/boot/feign/OrderFeignClient.java rename hoe-admin/admin-boot/src/main/java/com/recovery/admin/boot/service/{ISysUserService.java => UserService.java} (83%) rename hoe-admin/admin-boot/src/main/java/com/recovery/admin/boot/service/impl/{SysUserServiceImpl.java => UserServiceImpl.java} (54%) create mode 100644 hoe-admin/admin-boot/src/test/java/code/CodeGenerator.java delete mode 100644 hoe-common/common-base/src/main/java/com/recovery/common/base/config/RedisConfig.java create mode 100644 hoe-common/common-base/src/main/java/com/recovery/common/base/config/redis/RedisConfig.java create mode 100644 hoe-common/common-base/src/main/java/com/recovery/common/base/config/redis/RedisObjectSerializer.java create mode 100644 hoe-common/common-mybatis-plus/src/main/java/com/recovery/common/mybatis/config/MyMapper.java create mode 100644 hoe-order/src/main/java/com/recovery/order/OrderApp.java create mode 100644 hoe-order/src/main/java/com/recovery/order/config/SaTokenConfigure.java create mode 100644 hoe-order/src/main/java/com/recovery/order/config/redis/RedisCache.java create mode 100644 hoe-order/src/main/java/com/recovery/order/config/redis/RedisCacheImpl.java create mode 100644 hoe-order/src/main/java/com/recovery/order/entity/OrderIn.java create mode 100644 hoe-order/src/main/java/com/recovery/order/mapper/OrderInMapper.java create mode 100644 hoe-order/src/main/java/com/recovery/order/service/OrderInService.java create mode 100644 hoe-order/src/main/java/com/recovery/order/service/impl/OrderInServiceImpl.java create mode 100644 hoe-order/src/main/resources/mapper/OrderInMapper.xml create mode 100644 hoe-order/src/test/java/code/CodeGenerator.java delete mode 100644 logs/common/2024-03-07/error-log.log delete mode 100644 logs/common/2024-03-07/info-log.log delete mode 100644 logs/common/2024-03-07/warn-log.log delete mode 100644 logs/common/2024-03-11/error-log.log delete mode 100644 logs/common/2024-03-11/info-log.log delete mode 100644 logs/common/2024-03-11/warn-log.log delete mode 100644 logs/common/2024-03-12/error-log.log delete mode 100644 logs/common/2024-03-12/info-log.log delete mode 100644 logs/common/2024-03-12/warn-log.log delete mode 100644 logs/common/2024-03-13/error-log.log delete mode 100644 logs/common/2024-03-13/info-log.log delete mode 100644 logs/common/2024-03-13/warn-log.log delete mode 100644 logs/common/2024-03-14/error-log.log delete mode 100644 logs/common/2024-03-14/info-log.log delete mode 100644 logs/common/2024-03-14/warn-log.log diff --git a/hoe-admin/admin-boot/pom.xml b/hoe-admin/admin-boot/pom.xml index 7993851..f3f9b61 100644 --- a/hoe-admin/admin-boot/pom.xml +++ b/hoe-admin/admin-boot/pom.xml @@ -68,6 +68,42 @@ + + javax.persistence + javax.persistence-api + 2.2 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + com.nimbusds @@ -89,7 +125,7 @@ common-web ${hoe-version} - + diff --git a/hoe-admin/admin-boot/src/main/java/com/recovery/admin/boot/config/InterceptConfig.java b/hoe-admin/admin-boot/src/main/java/com/recovery/admin/boot/config/InterceptConfig.java index c86bb72..2061c3f 100644 --- a/hoe-admin/admin-boot/src/main/java/com/recovery/admin/boot/config/InterceptConfig.java +++ b/hoe-admin/admin-boot/src/main/java/com/recovery/admin/boot/config/InterceptConfig.java @@ -2,8 +2,6 @@ package com.recovery.admin.boot.config; import com.recovery.admin.boot.interceptor.JwtInterceptor; -import com.recovery.common.base.config.redis.RedisCache; -import com.recovery.common.base.util.RedisUtil; import org.springframework.context.annotation.Configuration; import org.springframework.web.servlet.config.annotation.InterceptorRegistry; import org.springframework.web.servlet.config.annotation.WebMvcConfigurer; @@ -13,12 +11,11 @@ import javax.annotation.Resource; @Configuration public class InterceptConfig implements WebMvcConfigurer { - @Resource - RedisCache redisCache; + @Override public void addInterceptors(InterceptorRegistry registry) { //添加拦截器 - registry.addInterceptor(new JwtInterceptor(redisCache)) + registry.addInterceptor(new JwtInterceptor()) //拦截的路径 需要进行token验证的路径 .addPathPatterns("/**") //放行的路径 diff --git a/hoe-admin/admin-boot/src/main/java/com/recovery/admin/boot/config/ds/DataSourceConfig.java b/hoe-admin/admin-boot/src/main/java/com/recovery/admin/boot/config/ds/DataSourceConfig.java index 2d17563..fa3d126 100644 --- a/hoe-admin/admin-boot/src/main/java/com/recovery/admin/boot/config/ds/DataSourceConfig.java +++ b/hoe-admin/admin-boot/src/main/java/com/recovery/admin/boot/config/ds/DataSourceConfig.java @@ -2,6 +2,8 @@ package com.recovery.admin.boot.config.ds; import com.alibaba.druid.pool.DruidDataSource; +import com.baomidou.mybatisplus.extension.spring.MybatisSqlSessionFactoryBean; + import com.recovery.common.base.ds.DynamicDataSource; import lombok.extern.slf4j.Slf4j; import org.apache.ibatis.session.SqlSessionFactory; @@ -63,7 +65,9 @@ public class DataSourceConfig { Map map = new HashMap<>(); map.put("master", masterDataSource); dynamicDataSource.setTargetDataSources(map); - + //设置默认数据源 +// dynamicDataSource.setDefaultTargetDataSource(masterDataSource); +// return dynamicDataSource; } @@ -72,7 +76,7 @@ public class DataSourceConfig { public SqlSessionFactory sqlSessionFactory( @Qualifier("commonDataSource") DataSource dynamicDataSource) throws Exception { - SqlSessionFactoryBean bean = new SqlSessionFactoryBean(); + MybatisSqlSessionFactoryBean bean = new MybatisSqlSessionFactoryBean(); bean.setDataSource(dynamicDataSource); bean.setMapperLocations(new PathMatchingResourcePatternResolver() .getResources(DataSourceConfig.MAPPER_LOCATION)); diff --git a/hoe-admin/admin-boot/src/main/java/com/recovery/admin/boot/config/ds/TeachingDataSourceConfig.java b/hoe-admin/admin-boot/src/main/java/com/recovery/admin/boot/config/ds/TeachingDataSourceConfig.java deleted file mode 100644 index ff76ea5..0000000 --- a/hoe-admin/admin-boot/src/main/java/com/recovery/admin/boot/config/ds/TeachingDataSourceConfig.java +++ /dev/null @@ -1,58 +0,0 @@ -//package com.recovery.admin.boot.config.ds; -// -//import com.alibaba.druid.pool.DruidDataSource; -//import org.apache.ibatis.session.SqlSessionFactory; -//import org.mybatis.spring.SqlSessionFactoryBean; -//import org.springframework.beans.factory.annotation.Qualifier; -//import org.springframework.beans.factory.annotation.Value; -//import org.springframework.context.annotation.Bean; -//import org.springframework.core.io.support.PathMatchingResourcePatternResolver; -//import org.springframework.jdbc.datasource.DataSourceTransactionManager; -// -//import javax.sql.DataSource; -// -////@Configuration -////// 扫描 Mapper 接口并容器管理 -////@MapperScan(basePackages = TeachingDataSourceConfig.PACKAGE, sqlSessionFactoryRef = "teachingSqlSessionFactory") -//public class TeachingDataSourceConfig { -// // 精确到 course 目录，以便跟其他数据源隔离 -// static final String PACKAGE = "com.recovery.admin.boot.mapper"; -// static final String MAPPER_LOCATION = "classpath:mapper/*.xml"; -// -// @Value("${admin.datasource.url}") -// private String url; -// -// @Value("${admin.datasource.username}") -// private String user; -// -// @Value("${admin.datasource.password}") -// private String password; -// -// @Value("${admin.datasource.driverClassName}") -// private String driverClass; -// -// @Bean(name = "adminDataSource") -// public DataSource cpdDataSource() { -// DruidDataSource dataSource = new DruidDataSource(); -// dataSource.setDriverClassName(driverClass); -// dataSource.setUrl(url); -// dataSource.setUsername(user); -// dataSource.setPassword(password); -// return dataSource; -// } -// -// @Bean(name = "adminTransactionManager") -// public DataSourceTransactionManager courseTransactionManager() { -// return new DataSourceTransactionManager(cpdDataSource()); -// } -// -// @Bean(name = "adminSqlSessionFactory") -// public SqlSessionFactory cpdSqlSessionFactory(@Qualifier("adminDataSource") DataSource cpdDataSource) -// throws Exception { -// final SqlSessionFactoryBean sessionFactory = new SqlSessionFactoryBean(); -// sessionFactory.setDataSource(cpdDataSource); -// sessionFactory.setMapperLocations(new PathMatchingResourcePatternResolver() -// .getResources(TeachingDataSourceConfig.MAPPER_LOCATION)); -// return sessionFactory.getObject(); -// } -//} diff --git a/hoe-common/common-base/src/main/java/com/recovery/common/base/config/redis/RedisCache.java b/hoe-admin/admin-boot/src/main/java/com/recovery/admin/boot/config/redis/RedisCache.java similarity index 95% rename from hoe-common/common-base/src/main/java/com/recovery/common/base/config/redis/RedisCache.java rename to hoe-admin/admin-boot/src/main/java/com/recovery/admin/boot/config/redis/RedisCache.java index ffd2beb..c0c2bc5 100644 --- a/hoe-common/common-base/src/main/java/com/recovery/common/base/config/redis/RedisCache.java +++ b/hoe-admin/admin-boot/src/main/java/com/recovery/admin/boot/config/redis/RedisCache.java @@ -1,4 +1,4 @@ -package com.recovery.common.base.config.redis; +package com.recovery.admin.boot.config.redis; public interface RedisCache { /** diff --git a/hoe-common/common-base/src/main/java/com/recovery/common/base/config/redis/RedisCacheImpl.java b/hoe-admin/admin-boot/src/main/java/com/recovery/admin/boot/config/redis/RedisCacheImpl.java similarity index 98% rename from hoe-common/common-base/src/main/java/com/recovery/common/base/config/redis/RedisCacheImpl.java rename to hoe-admin/admin-boot/src/main/java/com/recovery/admin/boot/config/redis/RedisCacheImpl.java index c37a6ac..42fe27f 100644 --- a/hoe-common/common-base/src/main/java/com/recovery/common/base/config/redis/RedisCacheImpl.java +++ b/hoe-admin/admin-boot/src/main/java/com/recovery/admin/boot/config/redis/RedisCacheImpl.java @@ -1,4 +1,4 @@ -package com.recovery.common.base.config.redis; +package com.recovery.admin.boot.config.redis; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.data.redis.core.RedisTemplate; diff --git a/hoe-admin/admin-boot/src/main/java/com/recovery/admin/boot/controller/OauthClientController.java b/hoe-admin/admin-boot/src/main/java/com/recovery/admin/boot/controller/OauthClientController.java index 40fc4a3..dc8349d 100644 --- a/hoe-admin/admin-boot/src/main/java/com/recovery/admin/boot/controller/OauthClientController.java +++ b/hoe-admin/admin-boot/src/main/java/com/recovery/admin/boot/controller/OauthClientController.java @@ -1,35 +1,35 @@ -package com.recovery.admin.boot.controller; - -import cn.hutool.core.bean.BeanUtil; -import cn.hutool.core.lang.Assert; - -import com.recovery.admin.boot.entity.SysOauthClient; -import com.recovery.admin.boot.service.ISysOauthClientService; - -import com.recovery.common.base.dto.OAuth2ClientDTO; -import com.recovery.common.base.result.ApiResult; -import lombok.AllArgsConstructor; -import lombok.extern.slf4j.Slf4j; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestParam; -import org.springframework.web.bind.annotation.RestController; -/** - * @author： - */ -@RequestMapping("/api/oauth-clients") -@Slf4j -@AllArgsConstructor -@RestController -public class OauthClientController { - private ISysOauthClientService iSysOauthClientService; - - @GetMapping("/getOAuth2ClientById") - public ApiResult getOAuth2ClientById(@RequestParam String clientId) { - SysOauthClient client = iSysOauthClientService.getById(clientId); - Assert.notNull(client, "OAuth2 客户端不存在"); - OAuth2ClientDTO oAuth2ClientDTO = new OAuth2ClientDTO(); - BeanUtil.copyProperties(client, oAuth2ClientDTO); - return ApiResult.ok(oAuth2ClientDTO); - } -} +//package com.recovery.admin.boot.controller; +// +//import cn.hutool.core.bean.BeanUtil; +//import cn.hutool.core.lang.Assert; +// +//import com.recovery.admin.boot.entity.SysOauthClient; +//import com.recovery.admin.boot.service.ISysOauthClientService; +// +//import com.recovery.common.base.dto.OAuth2ClientDTO; +//import com.recovery.common.base.result.ApiResult; +//import lombok.AllArgsConstructor; +//import lombok.extern.slf4j.Slf4j; +//import org.springframework.web.bind.annotation.GetMapping; +//import org.springframework.web.bind.annotation.RequestMapping; +//import org.springframework.web.bind.annotation.RequestParam; +//import org.springframework.web.bind.annotation.RestController; +///** +// * @author： +// */ +//@RequestMapping("/api/oauth-clients") +//@Slf4j +//@AllArgsConstructor +//@RestController +//public class OauthClientController { +// private ISysOauthClientService iSysOauthClientService; +// +// @GetMapping("/getOAuth2ClientById") +// public ApiResult getOAuth2ClientById(@RequestParam String clientId) { +// SysOauthClient client = iSysOauthClientService.getById(clientId); +// Assert.notNull(client, "OAuth2 客户端不存在"); +// OAuth2ClientDTO oAuth2ClientDTO = new OAuth2ClientDTO(); +// BeanUtil.copyProperties(client, oAuth2ClientDTO); +// return ApiResult.ok(oAuth2ClientDTO); +// } +//} diff --git a/hoe-admin/admin-boot/src/main/java/com/recovery/admin/boot/controller/UserController.java b/hoe-admin/admin-boot/src/main/java/com/recovery/admin/boot/controller/UserController.java index 1cc4c98..86a4c69 100644 --- a/hoe-admin/admin-boot/src/main/java/com/recovery/admin/boot/controller/UserController.java +++ b/hoe-admin/admin-boot/src/main/java/com/recovery/admin/boot/controller/UserController.java @@ -2,15 +2,13 @@ package com.recovery.admin.boot.controller; import com.recovery.admin.boot.service.IMemberUserService; -import com.recovery.admin.boot.service.ISysUserService; +import com.recovery.admin.boot.service.UserService; import com.recovery.common.base.dto.MemberUserAuthDTO; import com.recovery.common.base.dto.UserAuthDTO; -import com.recovery.common.base.enums.PasswordEncoderTypeEnum; import com.recovery.common.base.result.ApiResult; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; -import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder; import org.springframework.web.bind.annotation.*; /** @@ -22,7 +20,7 @@ import org.springframework.web.bind.annotation.*; @RequiredArgsConstructor public class UserController { - private final ISysUserService iSysUserService; + private final UserService userService; private final IMemberUserService memberUserService; @@ -31,7 +29,7 @@ public class UserController { */ @GetMapping("/username") public ApiResult getUserByUsername(@RequestParam String username) { - UserAuthDTO user = iSysUserService.getByUsername(username); + UserAuthDTO user = userService.getByUsername(username); return ApiResult.ok(user); } /** diff --git a/hoe-admin/admin-boot/src/main/java/com/recovery/admin/boot/controller/testController.java b/hoe-admin/admin-boot/src/main/java/com/recovery/admin/boot/controller/testController.java index ff8bffe..03b71a6 100644 --- a/hoe-admin/admin-boot/src/main/java/com/recovery/admin/boot/controller/testController.java +++ b/hoe-admin/admin-boot/src/main/java/com/recovery/admin/boot/controller/testController.java @@ -2,14 +2,15 @@ package com.recovery.admin.boot.controller; import cn.dev33.satoken.stp.StpUtil; -import cn.hutool.log.Log; import com.recovery.admin.boot.config.DynamicThreadPoolConfig; -import com.recovery.admin.boot.service.ISysUserService; +import com.recovery.admin.boot.entity.User; +import com.recovery.admin.boot.service.UserService; import com.recovery.common.base.constant.Constants; import com.recovery.common.base.dto.UserAuthDTO; import com.recovery.common.base.result.ApiResult; import com.recovery.common.base.util.HspHostUtil; import com.recovery.common.base.util.RedisUtil; +import com.recovery.common.base.util.UtilTools; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; @@ -20,6 +21,7 @@ import org.springframework.web.bind.annotation.RestController; import javax.annotation.Resource; import javax.servlet.http.HttpServletRequest; +import java.util.List; @RestController @RequestMapping("/api/v1/test") @@ -27,7 +29,7 @@ import javax.servlet.http.HttpServletRequest; public class testController { @Resource - ISysUserService iSysUserService; + UserService userService; @Resource RedisUtil redisUtil; @Autowired @@ -38,22 +40,35 @@ public class testController { */ @GetMapping("/cs") public ApiResult cs(@RequestParam String name, HttpServletRequest request) { - UserAuthDTO authDTO = iSysUserService.getByUsername(name); - log.info("测试库："+authDTO.getStatus()); - log.info("111获取线程的数据=="+HspHostUtil.getHspHost()); - StpUtil.kickoutByTokenValue(Constants.LOGIN_USRE_TOKEN); - Thread thread = new Thread(()->{ - try { - Thread.sleep(3000); - } catch (InterruptedException e) { - throw new RuntimeException(e); - } - log.info("获取线程的数据=="+HspHostUtil.getHspHost()); - },"测试线程"); - thread.start(); -// StpUtil.logout(); - dynamicThreadPool.printThreadPoolStatus(); - return ApiResult.ok(authDTO); + User user = new User(); + user.setUserName("测试库"); + user.setPhone("123"); + userService.add(user); +// try { +// UserAuthDTO authDTO = userService.getByUsername(name); +// List l = userService.list(); +// log.info("测试库："+authDTO.getStatus()); +// log.info("111获取线程的数据=="+HspHostUtil.getHspHost()); +// log.info("获取登陆值去除------"+ UtilTools.getUserId() +""); +// StpUtil.kickoutByTokenValue(Constants.LOGIN_USRE_TOKEN); +//// Thread thread = new Thread(()->{ +//// try { +//// Thread.sleep(3000); +//// } catch (InterruptedException e) { +//// throw new RuntimeException(e); +//// } +//// log.info("获取线程的数据=="+HspHostUtil.getHspHost()); +//// },"测试线程"); +//// thread.start(); +////// StpUtil.logout(); +//// dynamicThreadPool.printThreadPoolStatus(); +// return ApiResult.ok(authDTO); +// }catch (Exception e){ +// log.info("cs异常"+e.getMessage(),e); +// return ApiResult.failed("cs异常"); +// } + return ApiResult.failed("cs异常"); + } diff --git a/hoe-admin/admin-boot/src/main/java/com/recovery/admin/boot/entity/User.java b/hoe-admin/admin-boot/src/main/java/com/recovery/admin/boot/entity/User.java index 0c020a2..b20b9a5 100644 --- a/hoe-admin/admin-boot/src/main/java/com/recovery/admin/boot/entity/User.java +++ b/hoe-admin/admin-boot/src/main/java/com/recovery/admin/boot/entity/User.java @@ -1,50 +1,124 @@ package com.recovery.admin.boot.entity; import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableLogic; +import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; +import lombok.EqualsAndHashCode; -import java.util.List; +import javax.persistence.Column; +import java.io.Serializable; +import java.time.LocalDateTime; /** - * @author： + *

+ * + *

+ * + * @author ytChen + * @since 2024-01-19 */ @Data -public class User { +@EqualsAndHashCode(callSuper = false) +@TableName("tbl_user") +public class User implements Serializable { - @TableId(type = IdType.AUTO) + + /** + * 主键 + */ + @TableId(value = "id", type = IdType.ASSIGN_ID) private Long id; - private String username; + /** + * 姓名 + */ + private String name; - private String nickname; +// /** +// * 性别1=男2=女 +// */ +// private Integer gender; - private String mobile; + /** + * 手机号 + */ + private String phone; - private Integer gender; +// /** +// * 货场名称 +// */ +// private String factoryName; +// +// /** +// * 货场详细地址 +// */ +// private String factoryAddress; +// +// /** +// * 省份id +// */ +// private Integer provinceId; +// /** +// * 市区id +// */ +// private Integer areaId; +// /** +// * 县id +// */ +// private Integer citiyId; +// +// +// /** +// * 用户类别 1= 工作人员 2=采购商3=客户 +// */ +// private Integer userType; - private String avatar; + /** + * 账号 + */ + private String userName; + + /** + * 密码 + */ private String password; - private String email; - - private Integer status; - - @TableLogic(value = "0", delval = "1") - private Integer deleted; - - - @TableField(exist = false) - private List roleIds; - - @TableField(exist = false) - private String roleNames; - - @TableField(exist = false) - private List roles; +// /** +// * 状态 1=有效 0=无效 +// */ +// private Integer state; +// +// +// /** +// * 修改时间 +// */ +// @Column(name = "update_time") +// private LocalDateTime updateTime; +// +// /** +// * 创建时间 +// */ +// @Column(name = "create_time") +// private LocalDateTime createTime; +// +// /** +// * 创建人id +// */ +// @Column(name = "create_user_id") +// private Long createUserId; +// +// /** +// * 修改人id +// */ +// @Column(name = "update_user_id") +// private Long updateUserId; +// +// /** +// * 删除状态 +// */ +// private Boolean isDeleted; } diff --git a/hoe-admin/admin-boot/src/main/java/com/recovery/admin/boot/feign/OrderFeignClient.java b/hoe-admin/admin-boot/src/main/java/com/recovery/admin/boot/feign/OrderFeignClient.java new file mode 100644 index 0000000..13c0d64 --- /dev/null +++ b/hoe-admin/admin-boot/src/main/java/com/recovery/admin/boot/feign/OrderFeignClient.java @@ -0,0 +1,23 @@ +package com.recovery.admin.boot.feign; + + + +import com.recovery.common.base.config.feign.FeignConfiguration; +import com.recovery.common.base.dto.UserAuthDTO; +import com.recovery.common.base.result.ApiResult; +import org.springframework.cloud.openfeign.FeignClient; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestParam; + +/** + * @author： + */ +@FeignClient(value = "hoe-order",configuration = FeignConfiguration.class) +public interface OrderFeignClient { + + @RequestMapping("/api/rest/order/test") + String test(); + + +} diff --git a/hoe-admin/admin-boot/src/main/java/com/recovery/admin/boot/interceptor/JwtInterceptor.java b/hoe-admin/admin-boot/src/main/java/com/recovery/admin/boot/interceptor/JwtInterceptor.java index a3c6290..5374865 100644 --- a/hoe-admin/admin-boot/src/main/java/com/recovery/admin/boot/interceptor/JwtInterceptor.java +++ b/hoe-admin/admin-boot/src/main/java/com/recovery/admin/boot/interceptor/JwtInterceptor.java @@ -2,19 +2,11 @@ package com.recovery.admin.boot.interceptor; import cn.dev33.satoken.stp.StpUtil; -import cn.dev33.satoken.strategy.SaStrategy; -import cn.dev33.satoken.util.SaFoxUtil; -import cn.hutool.extra.spring.SpringUtil; import com.alibaba.fastjson.JSONObject; -import com.auth0.jwt.interfaces.DecodedJWT; import com.recovery.admin.boot.exception.BusinessException; -import com.recovery.admin.boot.filter.RequestWrapper; -import com.recovery.common.base.config.redis.RedisCache; import com.recovery.common.base.constant.Constants; import com.recovery.common.base.result.ResultCode; -import com.recovery.common.base.util.RedisUtil; -import com.recovery.common.base.utils.JwtUtils; import lombok.extern.slf4j.Slf4j; import org.springframework.util.StringUtils; @@ -26,17 +18,13 @@ import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import java.io.IOException; import java.util.Date; -import java.util.HashMap; @Slf4j public class JwtInterceptor implements HandlerInterceptor { - @Resource - RedisCache redisCache; - public JwtInterceptor(RedisCache redisCache) { - this.redisCache = redisCache; - } + + public JwtInterceptor() {} @Override public boolean preHandle(HttpServletRequest request, HttpServletResponse response, Object handler) throws Exception { response.setHeader( "Set-Cookie" , "cookiename=httponlyTest;Path=/;Domain=domainvalue;Max-Age=seconds;HTTPOnly"); @@ -46,6 +34,13 @@ public class JwtInterceptor implements HandlerInterceptor { response.setHeader("Referrer-Policy","no-referrer"); response.setContentType("application/json"); response.setCharacterEncoding("UTF-8"); + // 如果请求的header里面的SA-SAME-TOKEN 值和Authorization 值一样，就视为是内部接口调用，就直接返回ture + // 不在进行认证的相关逻辑。为什么相等时就视为是内部接口调用呢？请看上面的第一部分的feign拦截器的写法。 + String saSameId = request.getHeader("SA-SAME-TOKEN"); + String stoken = request.getHeader("Authorization"); + if(saSameId.equals(stoken)){ + return true; + } // 获取当前token（这个token获取的是请求头的token，也可以用 request 获取） String token = StpUtil.getTokenValue(); long tokenTimeout = StpUtil.getTokenTimeout();// 获取过期时间 @@ -60,10 +55,10 @@ public class JwtInterceptor implements HandlerInterceptor { if (!StpUtil.isLogin()) { throw new BusinessException(ResultCode.IS_LOGIN_EXPIRE_ERROR); } - boolean rest = redisCache.isExists(Constants.REDIS_USRE_TOKEN+token); - if (!rest) { - throw new BusinessException(ResultCode.LOGIN_EXPIRE_ERROR); - } +// boolean rest = redisCache.isExists(Constants.REDIS_USRE_TOKEN+token); +// if (!rest) { +// throw new BusinessException(ResultCode.LOGIN_EXPIRE_ERROR); +// } //把变量放在request请求域中，仅可以被这次请求，即同一个requerst使用 request.setAttribute(Constants.LOGIN_USRE_TOKEN,token); try { diff --git a/hoe-admin/admin-boot/src/main/java/com/recovery/admin/boot/mapper/UserMapper.java b/hoe-admin/admin-boot/src/main/java/com/recovery/admin/boot/mapper/UserMapper.java index ef69bcf..6d4478e 100644 --- a/hoe-admin/admin-boot/src/main/java/com/recovery/admin/boot/mapper/UserMapper.java +++ b/hoe-admin/admin-boot/src/main/java/com/recovery/admin/boot/mapper/UserMapper.java @@ -1,10 +1,11 @@ package com.recovery.admin.boot.mapper; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; + import com.recovery.admin.boot.entity.User; import com.recovery.common.base.dto.UserAuthDTO; +import com.recovery.common.mybatis.config.MyMapper; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; @@ -12,7 +13,7 @@ import org.apache.ibatis.annotations.Param; * @author： */ @Mapper -public interface UserMapper extends BaseMapper { +public interface UserMapper extends MyMapper { UserAuthDTO getByUsername(@Param("userName") String userName); } diff --git a/hoe-admin/admin-boot/src/main/java/com/recovery/admin/boot/rest/UserRest.java b/hoe-admin/admin-boot/src/main/java/com/recovery/admin/boot/rest/UserRest.java index 6630a90..f8331db 100644 --- a/hoe-admin/admin-boot/src/main/java/com/recovery/admin/boot/rest/UserRest.java +++ b/hoe-admin/admin-boot/src/main/java/com/recovery/admin/boot/rest/UserRest.java @@ -2,14 +2,11 @@ package com.recovery.admin.boot.rest; import com.recovery.admin.boot.service.IMemberUserService; -import com.recovery.admin.boot.service.ISysUserService; +import com.recovery.admin.boot.service.UserService; import com.recovery.common.base.dto.MemberUserAuthDTO; import com.recovery.common.base.dto.UserAuthDTO; -import com.recovery.common.base.enums.PasswordEncoderTypeEnum; import com.recovery.common.base.result.ApiResult; -import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; -import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; @@ -23,7 +20,7 @@ import javax.annotation.Resource; public class UserRest { @Resource - private ISysUserService iSysUserService; + private UserService userService; @Resource private IMemberUserService memberUserService; @@ -32,7 +29,7 @@ public class UserRest { */ @GetMapping("/getUserByUsername") public ApiResult getUserByUsername(@RequestParam(value = "username") String username) { - UserAuthDTO user = iSysUserService.getByUsername(username); + UserAuthDTO user = userService.getByUsername(username); if (user == null) { throw new RuntimeException(); } diff --git a/hoe-admin/admin-boot/src/main/java/com/recovery/admin/boot/service/ISysUserService.java b/hoe-admin/admin-boot/src/main/java/com/recovery/admin/boot/service/UserService.java similarity index 83% rename from hoe-admin/admin-boot/src/main/java/com/recovery/admin/boot/service/ISysUserService.java rename to hoe-admin/admin-boot/src/main/java/com/recovery/admin/boot/service/UserService.java index 7dee781..dc62f60 100644 --- a/hoe-admin/admin-boot/src/main/java/com/recovery/admin/boot/service/ISysUserService.java +++ b/hoe-admin/admin-boot/src/main/java/com/recovery/admin/boot/service/UserService.java @@ -8,7 +8,7 @@ import com.recovery.common.base.dto.UserAuthDTO; /** * @author： */ -public interface ISysUserService extends IService { +public interface UserService extends IService { /** @@ -19,4 +19,8 @@ public interface ISysUserService extends IService { */ UserAuthDTO getByUsername(String username); + + + void add(User user); + } diff --git a/hoe-admin/admin-boot/src/main/java/com/recovery/admin/boot/service/impl/SysUserServiceImpl.java b/hoe-admin/admin-boot/src/main/java/com/recovery/admin/boot/service/impl/UserServiceImpl.java similarity index 54% rename from hoe-admin/admin-boot/src/main/java/com/recovery/admin/boot/service/impl/SysUserServiceImpl.java rename to hoe-admin/admin-boot/src/main/java/com/recovery/admin/boot/service/impl/UserServiceImpl.java index 1cffd37..6973bb4 100644 --- a/hoe-admin/admin-boot/src/main/java/com/recovery/admin/boot/service/impl/SysUserServiceImpl.java +++ b/hoe-admin/admin-boot/src/main/java/com/recovery/admin/boot/service/impl/UserServiceImpl.java @@ -3,23 +3,38 @@ package com.recovery.admin.boot.service.impl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.recovery.admin.boot.entity.User; +import com.recovery.admin.boot.feign.OrderFeignClient; import com.recovery.admin.boot.mapper.UserMapper; -import com.recovery.admin.boot.service.ISysUserService; +import com.recovery.admin.boot.service.UserService; import com.recovery.common.base.dto.UserAuthDTO; + import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; +import javax.annotation.Resource; + /** * @author： */ @Service @RequiredArgsConstructor -public class SysUserServiceImpl extends ServiceImpl implements ISysUserService { +public class UserServiceImpl extends ServiceImpl implements UserService { + @Resource + OrderFeignClient orderFeignClient; @Override public UserAuthDTO getByUsername(String username) { UserAuthDTO userAuthInfo = this.baseMapper.getByUsername(username); return userAuthInfo; } + @Override + public void add(User user) { + user.setId(2l); + this.baseMapper.deleteById(user); + String sc= orderFeignClient.test(); + + System.out.println("123"); + } + } diff --git a/hoe-admin/admin-boot/src/main/resources/bootstrap.yml b/hoe-admin/admin-boot/src/main/resources/bootstrap.yml index 530d7d3..8dc2a9e 100644 --- a/hoe-admin/admin-boot/src/main/resources/bootstrap.yml +++ b/hoe-admin/admin-boot/src/main/resources/bootstrap.yml @@ -1,5 +1,7 @@ - spring: +# datasource: +# dynamic: +# seata: true application: name: hoe-admin main: @@ -11,10 +13,10 @@ spring: discovery: # metadata: # serviceGroup: ytChen - server-addr: localhost:8848 + server-addr: 192.168.110.209:8848 namespace: 11bfd099-10d6-4f2c-b969-58b76e435cce config: - server-addr: localhost:8848 + server-addr: 192.168.110.209:8848 file-extension: yaml prefix: hoe-admin group: dev @@ -76,3 +78,25 @@ spring: server: port: 9002 + + +#分布式事务 +#seata: +# enabled: true +# enable-auto-data-source-proxy: true +# config: +# type: nacos +# nacos: +# server-addr: localhost:8848 +# group: SEATA_GROUP +# username: nacos +# password: nacos +# data-id: seataServer.properties +# registry: +# type: nacos +# nacos: +# application: seata-server +# server-addr: localhost:8848 +# group: SEATA_GROUP +# username: nacos +# password: nacos diff --git a/hoe-admin/admin-boot/src/main/resources/mapper/UserMapper.xml b/hoe-admin/admin-boot/src/main/resources/mapper/UserMapper.xml index fdd9792..6257f90 100644 --- a/hoe-admin/admin-boot/src/main/resources/mapper/UserMapper.xml +++ b/hoe-admin/admin-boot/src/main/resources/mapper/UserMapper.xml @@ -4,7 +4,7 @@