diff --git a/.idea/.gitignore b/.idea/.gitignore
deleted file mode 100644
index 01b5f8c..0000000
--- a/.idea/.gitignore
+++ /dev/null
@@ -1,10 +0,0 @@
-# 默认忽略的文件
-/shelf/
-/workspace.xml
-# 基于编辑器的 HTTP 客户端请求
-/httpRequests/
-# Datasource local storage ignored files
-/dataSources/
-/dataSources.local.xml
-# GitHub Copilot persisted chat sessions
-/copilot/chatSessions
diff --git a/.idea/compiler.xml b/.idea/compiler.xml
index 45e8b10..73943a2 100644
--- a/.idea/compiler.xml
+++ b/.idea/compiler.xml
@@ -17,24 +17,19 @@
-
-
+
\ No newline at end of file
diff --git a/.idea/jarRepositories.xml b/.idea/jarRepositories.xml
index 2b124b9..38e2802 100644
--- a/.idea/jarRepositories.xml
+++ b/.idea/jarRepositories.xml
@@ -11,15 +11,20 @@
+
+
+
+
+
-
-
-
+
+
+
@@ -31,6 +36,11 @@
+
+
+
+
+
diff --git a/.idea/misc.xml b/.idea/misc.xml
index dc13fb0..a9e03b0 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -5,17 +5,19 @@
-
+
\ No newline at end of file
diff --git a/hoe-admin/admin-boot/pom.xml b/hoe-admin/admin-boot/pom.xml
index f3f9b61..84e3d7b 100644
--- a/hoe-admin/admin-boot/pom.xml
+++ b/hoe-admin/admin-boot/pom.xml
@@ -12,8 +12,8 @@
admin-boot
- 8
- 8
+ 17
+ 17
UTF-8
@@ -36,6 +36,19 @@
spring-cloud-starter-bootstrap
+
+
+ org.hibernate.validator
+ hibernate-validator
+ 6.2.0.Final
+
+
+
+ org.glassfish
+ jakarta.el
+ 3.0.3
+
+
com.alibaba.cloud
@@ -108,13 +121,9 @@
com.nimbusds
nimbus-jose-jwt
+ 9.22
-
- com.recovery
- common-redis
- ${hoe-version}
-
com.recovery
common-mybatis-plus
@@ -125,6 +134,10 @@
common-web
${hoe-version}
+
+ jakarta.validation
+ jakarta.validation-api
+
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 fa3d126..70946b2 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
@@ -1,17 +1,16 @@
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;
-import org.mybatis.spring.SqlSessionFactoryBean;
import org.mybatis.spring.SqlSessionTemplate;
import org.mybatis.spring.annotation.MapperScan;
+import org.mybatis.spring.transaction.SpringManagedTransactionFactory;
import org.springframework.beans.factory.annotation.Qualifier;
import org.springframework.beans.factory.annotation.Value;
+import org.springframework.boot.context.properties.ConfigurationProperties;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.context.annotation.Primary;
@@ -66,7 +65,7 @@ public class DataSourceConfig {
map.put("master", masterDataSource);
dynamicDataSource.setTargetDataSources(map);
//设置默认数据源
-// dynamicDataSource.setDefaultTargetDataSource(masterDataSource);
+ dynamicDataSource.setDefaultTargetDataSource(masterDataSource);
//
return dynamicDataSource;
}
@@ -76,10 +75,13 @@ 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));
+ bean.setTransactionFactory(new SpringManagedTransactionFactory());
return bean.getObject();
}
diff --git a/hoe-admin/admin-boot/src/main/java/com/recovery/admin/boot/config/ds/DataSourceProxyConfig.java b/hoe-admin/admin-boot/src/main/java/com/recovery/admin/boot/config/ds/DataSourceProxyConfig.java
new file mode 100644
index 0000000..9d3cc4f
--- /dev/null
+++ b/hoe-admin/admin-boot/src/main/java/com/recovery/admin/boot/config/ds/DataSourceProxyConfig.java
@@ -0,0 +1,50 @@
+//package com.recovery.admin.boot.config.ds;
+//
+//
+//
+//import com.alibaba.druid.pool.DruidDataSource;
+//import com.baomidou.mybatisplus.extension.spring.MybatisSqlSessionFactoryBean;
+//import io.seata.rm.datasource.DataSourceProxy;
+//import org.apache.ibatis.session.SqlSessionFactory;
+//import org.mybatis.spring.SqlSessionFactoryBean;
+//import org.mybatis.spring.transaction.SpringManagedTransactionFactory;
+//import org.springframework.beans.factory.annotation.Value;
+//import org.springframework.boot.context.properties.ConfigurationProperties;
+//import org.springframework.context.annotation.Bean;
+//import org.springframework.context.annotation.Configuration;
+//import org.springframework.core.io.support.PathMatchingResourcePatternResolver;
+//
+//import javax.sql.DataSource;
+//
+//
+////使用seata对DataSource进行代理
+//@Configuration
+//public class DataSourceProxyConfig {
+//
+// //mapper.xml路径
+// static final String MAPPER_LOCATION = "classpath:mapper/*.xml";
+//
+// //手动配置bean
+// @Bean
+// @ConfigurationProperties(prefix = "master.datasource")
+// public DataSource druidDataSource(){
+//
+// return new DruidDataSource();
+// }
+//
+// @Bean
+// public SqlSessionFactory sessionFactory(DataSourceProxy dataSourceProxy) throws Exception {
+// MybatisSqlSessionFactoryBean sessionFactoryBean = new MybatisSqlSessionFactoryBean();
+// sessionFactoryBean.setDataSource(dataSourceProxy);
+// sessionFactoryBean.setMapperLocations(new PathMatchingResourcePatternResolver().getResources(MAPPER_LOCATION));
+// //事务管理工厂
+// sessionFactoryBean.setTransactionFactory(new SpringManagedTransactionFactory());
+// return sessionFactoryBean.getObject();
+// }
+//
+// @Bean
+// public DataSourceProxy dataSource() {
+// DataSource source = druidDataSource();
+// return new DataSourceProxy(druidDataSource());
+// }
+//}
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
deleted file mode 100644
index dc8349d..0000000
--- a/hoe-admin/admin-boot/src/main/java/com/recovery/admin/boot/controller/OauthClientController.java
+++ /dev/null
@@ -1,35 +0,0 @@
-//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 86a4c69..38ce2ab 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
@@ -1,7 +1,6 @@
package com.recovery.admin.boot.controller;
-import com.recovery.admin.boot.service.IMemberUserService;
import com.recovery.admin.boot.service.UserService;
import com.recovery.common.base.dto.MemberUserAuthDTO;
@@ -22,7 +21,6 @@ public class UserController {
private final UserService userService;
- private final IMemberUserService memberUserService;
/**
* 获取用户信息
@@ -32,13 +30,5 @@ public class UserController {
UserAuthDTO user = userService.getByUsername(username);
return ApiResult.ok(user);
}
- /**
- * 获取会员用户信息
- */
- @GetMapping("/member/username/{username}")
- public ApiResult getMemberUserByUsername(@PathVariable String username) {
- log.info("获取member user info。。。");
- MemberUserAuthDTO user = memberUserService.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 03b71a6..9817d58 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
@@ -40,13 +40,20 @@ public class testController {
*/
@GetMapping("/cs")
public ApiResult cs(@RequestParam String name, HttpServletRequest request) {
- User user = new User();
- user.setUserName("测试库");
- user.setPhone("123");
- userService.add(user);
+ try {
+ User user = new User();
+ user.setUserName("测试库");
+ user.setPhone("123");
+ List list = userService.list();
+ log.info("测试库："+list.size());
+ }catch (Exception e) {
+ return ApiResult.failed(e.getMessage());
+ }
+
// try {
// UserAuthDTO authDTO = userService.getByUsername(name);
// List l = userService.list();
+
// log.info("测试库："+authDTO.getStatus());
// log.info("111获取线程的数据=="+HspHostUtil.getHspHost());
// log.info("获取登陆值去除------"+ UtilTools.getUserId() +"");
@@ -67,7 +74,7 @@ public class testController {
// log.info("cs异常"+e.getMessage(),e);
// return ApiResult.failed("cs异常");
// }
- return ApiResult.failed("cs异常");
+ return ApiResult.ok();
}
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 5374865..a99ce92 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
@@ -27,20 +27,6 @@ public class JwtInterceptor implements HandlerInterceptor {
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");
- response.setHeader( "Content-Security-Policy" , "default-src 'self'; script-src 'self'; frame-ancestors 'self'");
- response.setHeader("Access-Control-Allow-Origin", (request).getHeader("Origin"));
- response.setHeader("Access-Control-Allow-Credentials", "true");
- 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();// 获取过期时间
diff --git a/hoe-admin/admin-boot/src/main/java/com/recovery/admin/boot/listener/InitResourcePermissionCache.java b/hoe-admin/admin-boot/src/main/java/com/recovery/admin/boot/listener/InitResourcePermissionCache.java
index 38acbfd..2f357dc 100644
--- a/hoe-admin/admin-boot/src/main/java/com/recovery/admin/boot/listener/InitResourcePermissionCache.java
+++ b/hoe-admin/admin-boot/src/main/java/com/recovery/admin/boot/listener/InitResourcePermissionCache.java
@@ -1,7 +1,6 @@
package com.recovery.admin.boot.listener;
-import com.recovery.admin.boot.service.ISysPermissionService;
import lombok.AllArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.boot.CommandLineRunner;
@@ -15,7 +14,6 @@ import org.springframework.stereotype.Component;
@AllArgsConstructor
public class InitResourcePermissionCache implements CommandLineRunner {
- private ISysPermissionService iSysPermissionService;
@Override
public void run(String... args) {
diff --git a/hoe-admin/admin-boot/src/main/java/com/recovery/admin/boot/mapper/MemberUserMapper.java b/hoe-admin/admin-boot/src/main/java/com/recovery/admin/boot/mapper/MemberUserMapper.java
deleted file mode 100644
index 5cce7f2..0000000
--- a/hoe-admin/admin-boot/src/main/java/com/recovery/admin/boot/mapper/MemberUserMapper.java
+++ /dev/null
@@ -1,18 +0,0 @@
-package com.recovery.admin.boot.mapper;
-
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.recovery.admin.boot.entity.MemberUser;
-
-import com.recovery.common.base.dto.MemberUserAuthDTO;
-import org.apache.ibatis.annotations.Mapper;
-import org.apache.ibatis.annotations.Param;
-
-/**
- * @author：
- */
-@Mapper
-public interface MemberUserMapper extends BaseMapper {
-
- MemberUserAuthDTO getByUsername(@Param("userName") String userName);
-}
diff --git a/hoe-admin/admin-boot/src/main/java/com/recovery/admin/boot/mapper/SysOauthClientMapper.java b/hoe-admin/admin-boot/src/main/java/com/recovery/admin/boot/mapper/SysOauthClientMapper.java
deleted file mode 100644
index 27ff71a..0000000
--- a/hoe-admin/admin-boot/src/main/java/com/recovery/admin/boot/mapper/SysOauthClientMapper.java
+++ /dev/null
@@ -1,12 +0,0 @@
-package com.recovery.admin.boot.mapper;
-
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.recovery.admin.boot.entity.SysOauthClient;
-import org.apache.ibatis.annotations.Mapper;
-/**
- * @author：
- */
-@Mapper
-public interface SysOauthClientMapper extends BaseMapper {
-}
diff --git a/hoe-admin/admin-boot/src/main/java/com/recovery/admin/boot/mapper/SysPermissionMapper.java b/hoe-admin/admin-boot/src/main/java/com/recovery/admin/boot/mapper/SysPermissionMapper.java
deleted file mode 100644
index 3a28a5c..0000000
--- a/hoe-admin/admin-boot/src/main/java/com/recovery/admin/boot/mapper/SysPermissionMapper.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package com.recovery.admin.boot.mapper;
-
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.recovery.admin.boot.entity.SysPermission;
-import org.apache.ibatis.annotations.Mapper;
-
-import java.util.List;
-/**
- * @author：
- */
-@Mapper
-public interface SysPermissionMapper extends BaseMapper {
-
- List listPermRoles();
-}
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 f8331db..ce6ec3c 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
@@ -1,7 +1,6 @@
package com.recovery.admin.boot.rest;
-import com.recovery.admin.boot.service.IMemberUserService;
import com.recovery.admin.boot.service.UserService;
import com.recovery.common.base.dto.MemberUserAuthDTO;
import com.recovery.common.base.dto.UserAuthDTO;
@@ -21,8 +20,7 @@ public class UserRest {
@Resource
private UserService userService;
- @Resource
- private IMemberUserService memberUserService;
+
/**
* 获取用户信息
@@ -35,13 +33,4 @@ public class UserRest {
}
return ApiResult.ok(user);
}
- /**12
- * 获取会员用户信息
- */
- @GetMapping("/member/username/{username}")
- public ApiResult getMemberUserByUsername(@RequestParam(value = "username") String username) {
- log.info("获取member user info。。。");
- MemberUserAuthDTO user = memberUserService.getByUsername(username);
- return ApiResult.ok(user);
- }
}
diff --git a/hoe-admin/admin-boot/src/main/java/com/recovery/admin/boot/service/IMemberUserService.java b/hoe-admin/admin-boot/src/main/java/com/recovery/admin/boot/service/IMemberUserService.java
deleted file mode 100644
index 2730dcd..0000000
--- a/hoe-admin/admin-boot/src/main/java/com/recovery/admin/boot/service/IMemberUserService.java
+++ /dev/null
@@ -1,25 +0,0 @@
-package com.recovery.admin.boot.service;
-
-
-
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.recovery.admin.boot.entity.MemberUser;
-import com.recovery.common.base.dto.MemberUserAuthDTO;
-
-
-/**
- * @author：
- */
-public interface IMemberUserService extends IService {
-
-
- /**
- * 根据用户名获取认证用户信息，携带角色和密码
- *
- * @param username
- * @return
- */
- MemberUserAuthDTO getByUsername(String username);
-
-}
diff --git a/hoe-admin/admin-boot/src/main/java/com/recovery/admin/boot/service/ISysOauthClientService.java b/hoe-admin/admin-boot/src/main/java/com/recovery/admin/boot/service/ISysOauthClientService.java
deleted file mode 100644
index 941110a..0000000
--- a/hoe-admin/admin-boot/src/main/java/com/recovery/admin/boot/service/ISysOauthClientService.java
+++ /dev/null
@@ -1,11 +0,0 @@
-package com.recovery.admin.boot.service;
-
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.recovery.admin.boot.entity.SysOauthClient;
-
-/**
- * @author：
- */
-public interface ISysOauthClientService extends IService {
-}
diff --git a/hoe-admin/admin-boot/src/main/java/com/recovery/admin/boot/service/ISysPermissionService.java b/hoe-admin/admin-boot/src/main/java/com/recovery/admin/boot/service/ISysPermissionService.java
deleted file mode 100644
index b02eb83..0000000
--- a/hoe-admin/admin-boot/src/main/java/com/recovery/admin/boot/service/ISysPermissionService.java
+++ /dev/null
@@ -1,17 +0,0 @@
-package com.recovery.admin.boot.service;
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.recovery.admin.boot.entity.SysPermission;
-
-import java.util.List;
-/**
- * @author：
- */
-public interface ISysPermissionService extends IService {
- /**
- * 刷新Redis缓存中角色菜单的权限规则，角色和菜单信息变更调用
- */
- boolean refreshPermRolesRules();
-
- List listPermRoles();
-}
diff --git a/hoe-admin/admin-boot/src/main/java/com/recovery/admin/boot/service/impl/MemberUserServiceImpl.java b/hoe-admin/admin-boot/src/main/java/com/recovery/admin/boot/service/impl/MemberUserServiceImpl.java
deleted file mode 100644
index b9762ac..0000000
--- a/hoe-admin/admin-boot/src/main/java/com/recovery/admin/boot/service/impl/MemberUserServiceImpl.java
+++ /dev/null
@@ -1,24 +0,0 @@
-package com.recovery.admin.boot.service.impl;
-
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.recovery.admin.boot.entity.MemberUser;
-import com.recovery.admin.boot.mapper.MemberUserMapper;
-import com.recovery.admin.boot.service.IMemberUserService;
-
-import com.recovery.common.base.dto.MemberUserAuthDTO;
-import lombok.RequiredArgsConstructor;
-import org.springframework.stereotype.Service;
-
-/**
- * @author：
- */
-@Service
-@RequiredArgsConstructor
-public class MemberUserServiceImpl extends ServiceImpl implements IMemberUserService {
- @Override
- public MemberUserAuthDTO getByUsername(String username) {
- MemberUserAuthDTO memberUserAuthDTO = this.baseMapper.getByUsername(username);
- return memberUserAuthDTO;
- }
-
-}
diff --git a/hoe-admin/admin-boot/src/main/java/com/recovery/admin/boot/service/impl/SysOauthClientServiceImpl.java b/hoe-admin/admin-boot/src/main/java/com/recovery/admin/boot/service/impl/SysOauthClientServiceImpl.java
deleted file mode 100644
index 84fbb98..0000000
--- a/hoe-admin/admin-boot/src/main/java/com/recovery/admin/boot/service/impl/SysOauthClientServiceImpl.java
+++ /dev/null
@@ -1,19 +0,0 @@
-package com.recovery.admin.boot.service.impl;
-
-
-
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.recovery.admin.boot.entity.SysOauthClient;
-import com.recovery.admin.boot.mapper.SysOauthClientMapper;
-import com.recovery.admin.boot.service.ISysOauthClientService;
-import lombok.RequiredArgsConstructor;
-import org.springframework.stereotype.Service;
-
-/**
- * @author：
- */
-@Service
-@RequiredArgsConstructor
-public class SysOauthClientServiceImpl extends ServiceImpl implements ISysOauthClientService {
-
-}
diff --git a/hoe-admin/admin-boot/src/main/java/com/recovery/admin/boot/service/impl/SysPermissionServiceImpl.java b/hoe-admin/admin-boot/src/main/java/com/recovery/admin/boot/service/impl/SysPermissionServiceImpl.java
deleted file mode 100644
index 9e77aae..0000000
--- a/hoe-admin/admin-boot/src/main/java/com/recovery/admin/boot/service/impl/SysPermissionServiceImpl.java
+++ /dev/null
@@ -1,57 +0,0 @@
-package com.recovery.admin.boot.service.impl;
-
-import cn.hutool.core.collection.CollectionUtil;
-import cn.hutool.core.util.StrUtil;
-
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.recovery.admin.boot.entity.SysPermission;
-import com.recovery.admin.boot.mapper.SysPermissionMapper;
-import com.recovery.admin.boot.service.ISysPermissionService;
-import com.recovery.common.base.constant.GlobalConstants;
-import lombok.RequiredArgsConstructor;
-import org.springframework.data.redis.core.RedisTemplate;
-import org.springframework.stereotype.Service;
-
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.stream.Collectors;
-
-
-/**
- * @author：
- */
-@Service
-@RequiredArgsConstructor
-public class SysPermissionServiceImpl extends ServiceImpl implements ISysPermissionService {
-
- private final RedisTemplate redisTemplate;
-
- @Override
- public boolean refreshPermRolesRules() {
- redisTemplate.delete(Arrays.asList(GlobalConstants.URL_PERM_ROLES_KEY));
- List permissions = this.listPermRoles();
- if (CollectionUtil.isNotEmpty(permissions)) {
- // 初始化URL- 角色规则
- List urlPermList = permissions.stream()
- .filter(item -> StrUtil.isNotBlank(item.getUrlPerm()))
- .collect(Collectors.toList());
- if (CollectionUtil.isNotEmpty(urlPermList)) {
- Map> urlPermRoles = new HashMap<>();
- urlPermList.stream().forEach(item -> {
- String perm = item.getUrlPerm();
- List roles = item.getRoles();
- urlPermRoles.put(perm, roles);
- });
- redisTemplate.opsForHash().putAll(GlobalConstants.URL_PERM_ROLES_KEY, urlPermRoles);
- }
- }
- return true;
- }
-
- @Override
- public List listPermRoles() {
- return this.baseMapper.listPermRoles();
- }
-}
diff --git a/hoe-admin/admin-boot/src/main/java/com/recovery/admin/boot/service/impl/UserServiceImpl.java b/hoe-admin/admin-boot/src/main/java/com/recovery/admin/boot/service/impl/UserServiceImpl.java
index 6973bb4..80011af 100644
--- a/hoe-admin/admin-boot/src/main/java/com/recovery/admin/boot/service/impl/UserServiceImpl.java
+++ b/hoe-admin/admin-boot/src/main/java/com/recovery/admin/boot/service/impl/UserServiceImpl.java
@@ -11,11 +11,13 @@ import com.recovery.common.base.dto.UserAuthDTO;
import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
import javax.annotation.Resource;
/**
- * @author：
+ * @author：
+ *
*/
@Service
@RequiredArgsConstructor
@@ -29,9 +31,10 @@ public class UserServiceImpl extends ServiceImpl implements Us
}
@Override
+ @Transactional
public void add(User user) {
- user.setId(2l);
- this.baseMapper.deleteById(user);
+ user.setUserName("123");
+ this.baseMapper.insert(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 8dc2a9e..6317ffd 100644
--- a/hoe-admin/admin-boot/src/main/resources/bootstrap.yml
+++ b/hoe-admin/admin-boot/src/main/resources/bootstrap.yml
@@ -1,22 +1,23 @@
spring:
-# datasource:
-# dynamic:
-# seata: true
+ datasource:
+ dynamic:
+ seata: true
application:
name: hoe-admin
main:
allow-bean-definition-overriding: true
+ allow-circular-references: true
profiles:
active: dev
cloud:
nacos:
discovery:
- # metadata:
- # serviceGroup: ytChen
- server-addr: 192.168.110.209:8848
+ metadata:
+ serviceGroup: cpp
+ server-addr: 192.168.110.210:8848
namespace: 11bfd099-10d6-4f2c-b969-58b76e435cce
config:
- server-addr: 192.168.110.209:8848
+ server-addr: 192.168.110.210:8848
file-extension: yaml
prefix: hoe-admin
group: dev
@@ -83,7 +84,7 @@ server:
#分布式事务
#seata:
# enabled: true
-# enable-auto-data-source-proxy: true
+# enable-auto-data-source-proxy: false
# config:
# type: nacos
# nacos:
@@ -92,6 +93,7 @@ server:
# username: nacos
# password: nacos
# data-id: seataServer.properties
+# namespace: 11bfd099-10d6-4f2c-b969-58b76e435cce
# registry:
# type: nacos
# nacos:
@@ -100,3 +102,4 @@ server:
# group: SEATA_GROUP
# username: nacos
# password: nacos
+# namespace: 11bfd099-10d6-4f2c-b969-58b76e435cce
diff --git a/hoe-admin/pom.xml b/hoe-admin/pom.xml
index 213d53f..6863591 100644
--- a/hoe-admin/pom.xml
+++ b/hoe-admin/pom.xml
@@ -16,8 +16,8 @@
- 8
- 8
+ 17
+ 17
UTF-8
diff --git a/hoe-auth/pom.xml b/hoe-auth/pom.xml
index 3746785..7359899 100644
--- a/hoe-auth/pom.xml
+++ b/hoe-auth/pom.xml
@@ -36,6 +36,21 @@
+
+
+ org.hibernate.validator
+ hibernate-validator
+ 6.2.0.Final
+
+
+
+ org.glassfish
+ jakarta.el
+ 3.0.3
+
+
+
+
cn.dev33
diff --git a/hoe-auth/src/main/java/com/recovery/auth/config/ds/TeachingDataSourceConfig.java b/hoe-auth/src/main/java/com/recovery/auth/config/ds/TeachingDataSourceConfig.java
index 263c45a..85fe713 100644
--- a/hoe-auth/src/main/java/com/recovery/auth/config/ds/TeachingDataSourceConfig.java
+++ b/hoe-auth/src/main/java/com/recovery/auth/config/ds/TeachingDataSourceConfig.java
@@ -1,58 +1,58 @@
-package com.recovery.auth.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 {
- // 精确到 auth 目录，以便跟其他数据源隔离
- static final String PACKAGE = "com.recovery.auth.dao.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();
- }
-}
+//package com.recovery.auth.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 {
+// // 精确到 auth 目录，以便跟其他数据源隔离
+// static final String PACKAGE = "com.recovery.auth.dao.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-auth/src/main/resources/bootstrap.yml b/hoe-auth/src/main/resources/bootstrap.yml
index 6f24dd8..e32f2d5 100644
--- a/hoe-auth/src/main/resources/bootstrap.yml
+++ b/hoe-auth/src/main/resources/bootstrap.yml
@@ -4,17 +4,18 @@ spring:
name: hoe-auth
main:
allow-bean-definition-overriding: true
+ allow-circular-references: true
profiles:
active: dev
cloud:
nacos:
discovery:
- metadata:
- serviceGroup: ytChen
- server-addr: 192.168.110.209:8848
+# metadata:
+# serviceGroup: ytChen
+ server-addr: 192.168.110.210:8848
namespace: 11bfd099-10d6-4f2c-b969-58b76e435cce
config:
- server-addr: 192.168.110.209:8848
+ server-addr: 192.168.110.210:8848
file-extension: yaml
prefix: hoe-auth
group: dev
diff --git a/hoe-auth/target/classes/bootstrap.yml b/hoe-auth/target/classes/bootstrap.yml
index df92dee..e32f2d5 100644
--- a/hoe-auth/target/classes/bootstrap.yml
+++ b/hoe-auth/target/classes/bootstrap.yml
@@ -4,17 +4,18 @@ spring:
name: hoe-auth
main:
allow-bean-definition-overriding: true
+ allow-circular-references: true
profiles:
active: dev
cloud:
nacos:
discovery:
- metadata:
- serviceGroup: ytChen
- server-addr: localhost:8848
+# metadata:
+# serviceGroup: ytChen
+ server-addr: 192.168.110.210:8848
namespace: 11bfd099-10d6-4f2c-b969-58b76e435cce
config:
- server-addr: localhost:8848
+ server-addr: 192.168.110.210:8848
file-extension: yaml
prefix: hoe-auth
group: dev
diff --git a/hoe-auth/target/classes/com/recovery/auth/config/ds/DataSourceConfig.class b/hoe-auth/target/classes/com/recovery/auth/config/ds/DataSourceConfig.class
index 58bc40e..69b8e7f 100644
Binary files a/hoe-auth/target/classes/com/recovery/auth/config/ds/DataSourceConfig.class and b/hoe-auth/target/classes/com/recovery/auth/config/ds/DataSourceConfig.class differ
diff --git a/hoe-auth/target/classes/com/recovery/auth/controller/AuthController.class b/hoe-auth/target/classes/com/recovery/auth/controller/AuthController.class
index 19bc245..99f6180 100644
Binary files a/hoe-auth/target/classes/com/recovery/auth/controller/AuthController.class and b/hoe-auth/target/classes/com/recovery/auth/controller/AuthController.class differ
diff --git a/hoe-auth/target/classes/com/recovery/auth/feign/UserFeignClient.class b/hoe-auth/target/classes/com/recovery/auth/feign/UserFeignClient.class
index eb6fdb0..d4eef15 100644
Binary files a/hoe-auth/target/classes/com/recovery/auth/feign/UserFeignClient.class and b/hoe-auth/target/classes/com/recovery/auth/feign/UserFeignClient.class differ
diff --git a/hoe-common/common-base/src/main/java/com/recovery/common/base/po/base/DBInfo.java b/hoe-common/common-base/src/main/java/com/recovery/common/base/po/base/DBInfo.java
index e22aeb7..71a37ea 100644
--- a/hoe-common/common-base/src/main/java/com/recovery/common/base/po/base/DBInfo.java
+++ b/hoe-common/common-base/src/main/java/com/recovery/common/base/po/base/DBInfo.java
@@ -30,7 +30,7 @@ public class DBInfo implements Serializable {
private String module;
- private String hospitalHost;
+ private String dbHost;
- private String hospitalCode;
+ private String dbCode;
}
diff --git a/hoe-common/common-base/src/main/java/com/recovery/common/base/util/EncryptUtil.java b/hoe-common/common-base/src/main/java/com/recovery/common/base/util/EncryptUtil.java
index 2e8ca82..04e361b 100644
--- a/hoe-common/common-base/src/main/java/com/recovery/common/base/util/EncryptUtil.java
+++ b/hoe-common/common-base/src/main/java/com/recovery/common/base/util/EncryptUtil.java
@@ -96,8 +96,8 @@ public final class EncryptUtil {
* @return
*/
private static byte[] hex2byte(byte[] b) {
- if ((b.length % 2) != 0)
- throw new IllegalArgumentException("长度不是偶数");
+ if ((b.length % 2) != 0){
+ throw new IllegalArgumentException("长度不是偶数");}
byte[] b2 = new byte[b.length / 2];
for (int n = 0; n < b.length; n += 2) {
String item = new String(b, n, 2);
@@ -116,10 +116,11 @@ public final class EncryptUtil {
String stmp = "";
for (int n = 0; n < b.length; n++) {
stmp = (Integer.toHexString(b[n] & 0XFF));
- if (stmp.length() == 1)
+ if (stmp.length() == 1){
hs = hs + "0" + stmp;
- else
+ } else {
hs = hs + stmp;
+ }
}
return hs.toUpperCase();
}
diff --git a/hoe-common/common-base/src/main/java/com/recovery/common/base/util/HspHostUtil.java b/hoe-common/common-base/src/main/java/com/recovery/common/base/util/HspHostUtil.java
index da926af..334afd9 100644
--- a/hoe-common/common-base/src/main/java/com/recovery/common/base/util/HspHostUtil.java
+++ b/hoe-common/common-base/src/main/java/com/recovery/common/base/util/HspHostUtil.java
@@ -98,7 +98,7 @@ public class HspHostUtil {
* @param dbInfo
*/
public static void switchDB(DBInfo dbInfo,StringRedisTemplate redisTemplate){
- String host = dbInfo.getHospitalCode();
+ String host = dbInfo.getDbCode();
String dataSourceKey = "dynamic-slave"+"_"+host;
Map dataSourceMap = DynamicDataSource.getInstance().getDataSourceMap();
if (!dataSourceMap.containsKey(dataSourceKey)) {
diff --git a/hoe-common/common-base/src/main/java/com/recovery/common/base/util/UtilTools.java b/hoe-common/common-base/src/main/java/com/recovery/common/base/util/UtilTools.java
index ffc352d..87687ef 100644
--- a/hoe-common/common-base/src/main/java/com/recovery/common/base/util/UtilTools.java
+++ b/hoe-common/common-base/src/main/java/com/recovery/common/base/util/UtilTools.java
@@ -438,7 +438,7 @@ public class UtilTools {
public static String formatNum(Object num, String format){
if(null==num){
return "";
- }else if(null==format || format.equals("")){
+ }else if(null==format || "".equals(format)){
return num.toString();
}
DecimalFormat df = new DecimalFormat(format);
diff --git a/hoe-common/common-base/src/main/java/com/recovery/common/base/utils/RedisUtils.java b/hoe-common/common-base/src/main/java/com/recovery/common/base/utils/RedisUtils.java
index 4103f0c..854f25e 100644
--- a/hoe-common/common-base/src/main/java/com/recovery/common/base/utils/RedisUtils.java
+++ b/hoe-common/common-base/src/main/java/com/recovery/common/base/utils/RedisUtils.java
@@ -30,8 +30,8 @@ public class RedisUtils {
* @return
*/
public static DBInfo getDBInfoByHostAndModule(StringRedisTemplate redisTemplate, String host, String module){
- log.info("查询数据库："+"hoe:hospital:dbInfo:"+host+"_"+module);
- String dbStr = redisTemplate.opsForValue().get("hoe:hospital:dbInfo:"+host+"_"+module);
+ log.info("查询数据库："+"hoe:common:dbInfo:"+host+"_"+module);
+ String dbStr = redisTemplate.opsForValue().get("hoe:common:dbInfo:"+host+"_"+module);
if(UtilTools.isNotEmpty(dbStr)){
return JSONObject.parseObject(dbStr, DBInfo.class);
}else{
diff --git a/hoe-common/common-base/target/classes/com/recovery/common/base/config/GlobalCorsConfig.class b/hoe-common/common-base/target/classes/com/recovery/common/base/config/GlobalCorsConfig.class
index 0910cc6..6f91fc0 100644
Binary files a/hoe-common/common-base/target/classes/com/recovery/common/base/config/GlobalCorsConfig.class and b/hoe-common/common-base/target/classes/com/recovery/common/base/config/GlobalCorsConfig.class differ
diff --git a/hoe-common/common-base/target/classes/com/recovery/common/base/config/RedisConfig.class b/hoe-common/common-base/target/classes/com/recovery/common/base/config/RedisConfig.class
deleted file mode 100644
index 76d3fdd..0000000
Binary files a/hoe-common/common-base/target/classes/com/recovery/common/base/config/RedisConfig.class and /dev/null differ
diff --git a/hoe-common/common-base/target/classes/com/recovery/common/base/config/feign/CommonRequestInterceptor.class b/hoe-common/common-base/target/classes/com/recovery/common/base/config/feign/CommonRequestInterceptor.class
index 1b8c09b..cd43d85 100644
Binary files a/hoe-common/common-base/target/classes/com/recovery/common/base/config/feign/CommonRequestInterceptor.class and b/hoe-common/common-base/target/classes/com/recovery/common/base/config/feign/CommonRequestInterceptor.class differ
diff --git a/hoe-common/common-base/target/classes/com/recovery/common/base/config/feign/FeignConfiguration.class b/hoe-common/common-base/target/classes/com/recovery/common/base/config/feign/FeignConfiguration.class
index 2f6d510..484b8a8 100644
Binary files a/hoe-common/common-base/target/classes/com/recovery/common/base/config/feign/FeignConfiguration.class and b/hoe-common/common-base/target/classes/com/recovery/common/base/config/feign/FeignConfiguration.class differ
diff --git a/hoe-common/common-base/target/classes/com/recovery/common/base/config/redis/BaseRedisCache.class b/hoe-common/common-base/target/classes/com/recovery/common/base/config/redis/BaseRedisCache.class
index 1a2198d..541ef6f 100644
Binary files a/hoe-common/common-base/target/classes/com/recovery/common/base/config/redis/BaseRedisCache.class and b/hoe-common/common-base/target/classes/com/recovery/common/base/config/redis/BaseRedisCache.class differ
diff --git a/hoe-common/common-base/target/classes/com/recovery/common/base/config/redis/BaseRedisCacheImpl.class b/hoe-common/common-base/target/classes/com/recovery/common/base/config/redis/BaseRedisCacheImpl.class
index b92487d..45ba8ae 100644
Binary files a/hoe-common/common-base/target/classes/com/recovery/common/base/config/redis/BaseRedisCacheImpl.class and b/hoe-common/common-base/target/classes/com/recovery/common/base/config/redis/BaseRedisCacheImpl.class differ
diff --git a/hoe-common/common-base/target/classes/com/recovery/common/base/config/redis/RedisCache.class b/hoe-common/common-base/target/classes/com/recovery/common/base/config/redis/RedisCache.class
deleted file mode 100644
index 27a568a..0000000
Binary files a/hoe-common/common-base/target/classes/com/recovery/common/base/config/redis/RedisCache.class and /dev/null differ
diff --git a/hoe-common/common-base/target/classes/com/recovery/common/base/config/redis/RedisCacheImpl.class b/hoe-common/common-base/target/classes/com/recovery/common/base/config/redis/RedisCacheImpl.class
deleted file mode 100644
index 12c99d8..0000000
Binary files a/hoe-common/common-base/target/classes/com/recovery/common/base/config/redis/RedisCacheImpl.class and /dev/null differ
diff --git a/hoe-common/common-base/target/classes/com/recovery/common/base/constant/Constants.class b/hoe-common/common-base/target/classes/com/recovery/common/base/constant/Constants.class
index aebbf30..6577ef8 100644
Binary files a/hoe-common/common-base/target/classes/com/recovery/common/base/constant/Constants.class and b/hoe-common/common-base/target/classes/com/recovery/common/base/constant/Constants.class differ
diff --git a/hoe-common/common-base/target/classes/com/recovery/common/base/constant/GlobalConstants.class b/hoe-common/common-base/target/classes/com/recovery/common/base/constant/GlobalConstants.class
index a9272d0..8216cea 100644
Binary files a/hoe-common/common-base/target/classes/com/recovery/common/base/constant/GlobalConstants.class and b/hoe-common/common-base/target/classes/com/recovery/common/base/constant/GlobalConstants.class differ
diff --git a/hoe-common/common-base/target/classes/com/recovery/common/base/constant/SecurityConstants.class b/hoe-common/common-base/target/classes/com/recovery/common/base/constant/SecurityConstants.class
index 9118f38..fc53d52 100644
Binary files a/hoe-common/common-base/target/classes/com/recovery/common/base/constant/SecurityConstants.class and b/hoe-common/common-base/target/classes/com/recovery/common/base/constant/SecurityConstants.class differ
diff --git a/hoe-common/common-base/target/classes/com/recovery/common/base/ds/DataSourceContextHolder.class b/hoe-common/common-base/target/classes/com/recovery/common/base/ds/DataSourceContextHolder.class
index ab1fe4b..2ddc452 100644
Binary files a/hoe-common/common-base/target/classes/com/recovery/common/base/ds/DataSourceContextHolder.class and b/hoe-common/common-base/target/classes/com/recovery/common/base/ds/DataSourceContextHolder.class differ
diff --git a/hoe-common/common-base/target/classes/com/recovery/common/base/ds/DynamicDataSource.class b/hoe-common/common-base/target/classes/com/recovery/common/base/ds/DynamicDataSource.class
index 8afc2df..ce8be34 100644
Binary files a/hoe-common/common-base/target/classes/com/recovery/common/base/ds/DynamicDataSource.class and b/hoe-common/common-base/target/classes/com/recovery/common/base/ds/DynamicDataSource.class differ
diff --git a/hoe-common/common-base/target/classes/com/recovery/common/base/dto/MemberUserAuthDTO.class b/hoe-common/common-base/target/classes/com/recovery/common/base/dto/MemberUserAuthDTO.class
index cd5d9f8..99ce5e8 100644
Binary files a/hoe-common/common-base/target/classes/com/recovery/common/base/dto/MemberUserAuthDTO.class and b/hoe-common/common-base/target/classes/com/recovery/common/base/dto/MemberUserAuthDTO.class differ
diff --git a/hoe-common/common-base/target/classes/com/recovery/common/base/dto/OAuth2ClientDTO.class b/hoe-common/common-base/target/classes/com/recovery/common/base/dto/OAuth2ClientDTO.class
index fd61280..76b4991 100644
Binary files a/hoe-common/common-base/target/classes/com/recovery/common/base/dto/OAuth2ClientDTO.class and b/hoe-common/common-base/target/classes/com/recovery/common/base/dto/OAuth2ClientDTO.class differ
diff --git a/hoe-common/common-base/target/classes/com/recovery/common/base/dto/RolePermissionDTO.class b/hoe-common/common-base/target/classes/com/recovery/common/base/dto/RolePermissionDTO.class
index a7353cd..e3d9773 100644
Binary files a/hoe-common/common-base/target/classes/com/recovery/common/base/dto/RolePermissionDTO.class and b/hoe-common/common-base/target/classes/com/recovery/common/base/dto/RolePermissionDTO.class differ
diff --git a/hoe-common/common-base/target/classes/com/recovery/common/base/dto/UserAuthDTO.class b/hoe-common/common-base/target/classes/com/recovery/common/base/dto/UserAuthDTO.class
index 2635a86..073d7e9 100644
Binary files a/hoe-common/common-base/target/classes/com/recovery/common/base/dto/UserAuthDTO.class and b/hoe-common/common-base/target/classes/com/recovery/common/base/dto/UserAuthDTO.class differ
diff --git a/hoe-common/common-base/target/classes/com/recovery/common/base/dto/UserAuthorityDto.class b/hoe-common/common-base/target/classes/com/recovery/common/base/dto/UserAuthorityDto.class
index d8060fe..dc9382b 100644
Binary files a/hoe-common/common-base/target/classes/com/recovery/common/base/dto/UserAuthorityDto.class and b/hoe-common/common-base/target/classes/com/recovery/common/base/dto/UserAuthorityDto.class differ
diff --git a/hoe-common/common-base/target/classes/com/recovery/common/base/enums/ClientEnums.class b/hoe-common/common-base/target/classes/com/recovery/common/base/enums/ClientEnums.class
index 6a04b75..eb9e24d 100644
Binary files a/hoe-common/common-base/target/classes/com/recovery/common/base/enums/ClientEnums.class and b/hoe-common/common-base/target/classes/com/recovery/common/base/enums/ClientEnums.class differ
diff --git a/hoe-common/common-base/target/classes/com/recovery/common/base/enums/PasswordEncoderTypeEnum.class b/hoe-common/common-base/target/classes/com/recovery/common/base/enums/PasswordEncoderTypeEnum.class
index 8fab25d..746eb03 100644
Binary files a/hoe-common/common-base/target/classes/com/recovery/common/base/enums/PasswordEncoderTypeEnum.class and b/hoe-common/common-base/target/classes/com/recovery/common/base/enums/PasswordEncoderTypeEnum.class differ
diff --git a/hoe-common/common-base/target/classes/com/recovery/common/base/po/base/DBInfo.class b/hoe-common/common-base/target/classes/com/recovery/common/base/po/base/DBInfo.class
index 8dc0b98..47940ce 100644
Binary files a/hoe-common/common-base/target/classes/com/recovery/common/base/po/base/DBInfo.class and b/hoe-common/common-base/target/classes/com/recovery/common/base/po/base/DBInfo.class differ
diff --git a/hoe-common/common-base/target/classes/com/recovery/common/base/po/base/OauthClientDetails.class b/hoe-common/common-base/target/classes/com/recovery/common/base/po/base/OauthClientDetails.class
index 3f3db48..010deef 100644
Binary files a/hoe-common/common-base/target/classes/com/recovery/common/base/po/base/OauthClientDetails.class and b/hoe-common/common-base/target/classes/com/recovery/common/base/po/base/OauthClientDetails.class differ
diff --git a/hoe-common/common-base/target/classes/com/recovery/common/base/result/ApiResult.class b/hoe-common/common-base/target/classes/com/recovery/common/base/result/ApiResult.class
index 1f4d22c..94555ea 100644
Binary files a/hoe-common/common-base/target/classes/com/recovery/common/base/result/ApiResult.class and b/hoe-common/common-base/target/classes/com/recovery/common/base/result/ApiResult.class differ
diff --git a/hoe-common/common-base/target/classes/com/recovery/common/base/result/IResultCode.class b/hoe-common/common-base/target/classes/com/recovery/common/base/result/IResultCode.class
index 16cef38..eefc61d 100644
Binary files a/hoe-common/common-base/target/classes/com/recovery/common/base/result/IResultCode.class and b/hoe-common/common-base/target/classes/com/recovery/common/base/result/IResultCode.class differ
diff --git a/hoe-common/common-base/target/classes/com/recovery/common/base/result/ResultCode.class b/hoe-common/common-base/target/classes/com/recovery/common/base/result/ResultCode.class
index 126f0d1..afe7073 100644
Binary files a/hoe-common/common-base/target/classes/com/recovery/common/base/result/ResultCode.class and b/hoe-common/common-base/target/classes/com/recovery/common/base/result/ResultCode.class differ
diff --git a/hoe-common/common-base/target/classes/com/recovery/common/base/util/EncryptUtil.class b/hoe-common/common-base/target/classes/com/recovery/common/base/util/EncryptUtil.class
index de46dd7..10a6a01 100644
Binary files a/hoe-common/common-base/target/classes/com/recovery/common/base/util/EncryptUtil.class and b/hoe-common/common-base/target/classes/com/recovery/common/base/util/EncryptUtil.class differ
diff --git a/hoe-common/common-base/target/classes/com/recovery/common/base/util/HspHostUtil.class b/hoe-common/common-base/target/classes/com/recovery/common/base/util/HspHostUtil.class
index 7bb991e..901e76d 100644
Binary files a/hoe-common/common-base/target/classes/com/recovery/common/base/util/HspHostUtil.class and b/hoe-common/common-base/target/classes/com/recovery/common/base/util/HspHostUtil.class differ
diff --git a/hoe-common/common-base/target/classes/com/recovery/common/base/util/RedisUtil.class b/hoe-common/common-base/target/classes/com/recovery/common/base/util/RedisUtil.class
index bf244d6..d59c8d8 100644
Binary files a/hoe-common/common-base/target/classes/com/recovery/common/base/util/RedisUtil.class and b/hoe-common/common-base/target/classes/com/recovery/common/base/util/RedisUtil.class differ
diff --git a/hoe-common/common-base/target/classes/com/recovery/common/base/util/UtilTools.class b/hoe-common/common-base/target/classes/com/recovery/common/base/util/UtilTools.class
index d634422..93fec71 100644
Binary files a/hoe-common/common-base/target/classes/com/recovery/common/base/util/UtilTools.class and b/hoe-common/common-base/target/classes/com/recovery/common/base/util/UtilTools.class differ
diff --git a/hoe-common/common-base/target/classes/com/recovery/common/base/utils/JwtUtils.class b/hoe-common/common-base/target/classes/com/recovery/common/base/utils/JwtUtils.class
index 64bc965..33fb786 100644
Binary files a/hoe-common/common-base/target/classes/com/recovery/common/base/utils/JwtUtils.class and b/hoe-common/common-base/target/classes/com/recovery/common/base/utils/JwtUtils.class differ
diff --git a/hoe-common/common-base/target/classes/com/recovery/common/base/utils/RedisUtils.class b/hoe-common/common-base/target/classes/com/recovery/common/base/utils/RedisUtils.class
index f70b10b..6fdbc5c 100644
Binary files a/hoe-common/common-base/target/classes/com/recovery/common/base/utils/RedisUtils.class and b/hoe-common/common-base/target/classes/com/recovery/common/base/utils/RedisUtils.class differ
diff --git a/hoe-common/common-mybatis-plus/target/classes/com/recovery/common/mybatis/config/MybatisPlusConfig.class b/hoe-common/common-mybatis-plus/target/classes/com/recovery/common/mybatis/config/MybatisPlusConfig.class
index f072786..b4677ca 100644
Binary files a/hoe-common/common-mybatis-plus/target/classes/com/recovery/common/mybatis/config/MybatisPlusConfig.class and b/hoe-common/common-mybatis-plus/target/classes/com/recovery/common/mybatis/config/MybatisPlusConfig.class differ
diff --git a/hoe-common/common-mybatis-plus/target/classes/com/recovery/common/mybatis/handler/MyMetaObjectHandler.class b/hoe-common/common-mybatis-plus/target/classes/com/recovery/common/mybatis/handler/MyMetaObjectHandler.class
index 5c88bea..471ff3d 100644
Binary files a/hoe-common/common-mybatis-plus/target/classes/com/recovery/common/mybatis/handler/MyMetaObjectHandler.class and b/hoe-common/common-mybatis-plus/target/classes/com/recovery/common/mybatis/handler/MyMetaObjectHandler.class differ
diff --git a/hoe-common/common-redis/pom.xml b/hoe-common/common-redis/pom.xml
index 81158dc..634057d 100644
--- a/hoe-common/common-redis/pom.xml
+++ b/hoe-common/common-redis/pom.xml
@@ -11,26 +11,26 @@
common-redis
-
-
- com.recovery
- common-base
- ${hoe-version}
-
+
+
+
+
+
+
-
- org.springframework.boot
- spring-boot-starter-data-redis
-
-
- org.apache.commons
- commons-pool2
-
-
- org.springframework.boot
- spring-boot-configuration-processor
- true
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/hoe-common/common-web/pom.xml b/hoe-common/common-web/pom.xml
index 2ad7654..404bf42 100644
--- a/hoe-common/common-web/pom.xml
+++ b/hoe-common/common-web/pom.xml
@@ -45,6 +45,7 @@
com.nimbusds
nimbus-jose-jwt
+ 9.22
diff --git a/hoe-common/common-web/src/main/java/com/recovery/common/web/config/FeignConfig.java b/hoe-common/common-web/src/main/java/com/recovery/common/web/config/FeignConfig.java
index fcb8891..1c3be19 100644
--- a/hoe-common/common-web/src/main/java/com/recovery/common/web/config/FeignConfig.java
+++ b/hoe-common/common-web/src/main/java/com/recovery/common/web/config/FeignConfig.java
@@ -50,7 +50,7 @@ public class FeignConfig {
String name = headerNames.nextElement();
String values = request.getHeader(name);
//将请求头保存到模板中
- if (!name.equalsIgnoreCase("serviceName")){
+ if (!"serviceName".equalsIgnoreCase(name)){
template.header(name, values);
}
diff --git a/hoe-common/common-web/target/classes/com/recovery/common/web/config/FeignConfig.class b/hoe-common/common-web/target/classes/com/recovery/common/web/config/FeignConfig.class
index 23dbf31..4fb705a 100644
Binary files a/hoe-common/common-web/target/classes/com/recovery/common/web/config/FeignConfig.class and b/hoe-common/common-web/target/classes/com/recovery/common/web/config/FeignConfig.class differ
diff --git a/hoe-common/common-web/target/classes/com/recovery/common/web/exception/BizException.class b/hoe-common/common-web/target/classes/com/recovery/common/web/exception/BizException.class
index 13c764b..c083032 100644
Binary files a/hoe-common/common-web/target/classes/com/recovery/common/web/exception/BizException.class and b/hoe-common/common-web/target/classes/com/recovery/common/web/exception/BizException.class differ
diff --git a/hoe-common/common-web/target/classes/com/recovery/common/web/exception/GlobalExceptionHandler.class b/hoe-common/common-web/target/classes/com/recovery/common/web/exception/GlobalExceptionHandler.class
index 3c4005d..2f918eb 100644
Binary files a/hoe-common/common-web/target/classes/com/recovery/common/web/exception/GlobalExceptionHandler.class and b/hoe-common/common-web/target/classes/com/recovery/common/web/exception/GlobalExceptionHandler.class differ
diff --git a/hoe-common/common-web/target/classes/com/recovery/common/web/log/HttpAspect.class b/hoe-common/common-web/target/classes/com/recovery/common/web/log/HttpAspect.class
index a6dea9c..a55f93c 100644
Binary files a/hoe-common/common-web/target/classes/com/recovery/common/web/log/HttpAspect.class and b/hoe-common/common-web/target/classes/com/recovery/common/web/log/HttpAspect.class differ
diff --git a/hoe-common/common-web/target/classes/com/recovery/common/web/sentinel/DefaultBlockExceptionHandler.class b/hoe-common/common-web/target/classes/com/recovery/common/web/sentinel/DefaultBlockExceptionHandler.class
index 571f1e8..765dcb7 100644
Binary files a/hoe-common/common-web/target/classes/com/recovery/common/web/sentinel/DefaultBlockExceptionHandler.class and b/hoe-common/common-web/target/classes/com/recovery/common/web/sentinel/DefaultBlockExceptionHandler.class differ
diff --git a/hoe-common/common-web/target/classes/com/recovery/common/web/sentinel/RequestOriginParserDefinition.class b/hoe-common/common-web/target/classes/com/recovery/common/web/sentinel/RequestOriginParserDefinition.class
index 5f067b8..9ae7a6b 100644
Binary files a/hoe-common/common-web/target/classes/com/recovery/common/web/sentinel/RequestOriginParserDefinition.class and b/hoe-common/common-web/target/classes/com/recovery/common/web/sentinel/RequestOriginParserDefinition.class differ
diff --git a/hoe-common/pom.xml b/hoe-common/pom.xml
index d6b4aca..cc9d1bd 100644
--- a/hoe-common/pom.xml
+++ b/hoe-common/pom.xml
@@ -13,7 +13,7 @@
pom
common-base
- common-redis
+
common-mybatis-plus
common-web
diff --git a/hoe-gateway/pom.xml b/hoe-gateway/pom.xml
index a60c4da..9d41d6e 100644
--- a/hoe-gateway/pom.xml
+++ b/hoe-gateway/pom.xml
@@ -12,8 +12,8 @@
hoe-gateway
- 8
- 8
+ 17
+ 17
UTF-8
diff --git a/hoe-gateway/src/main/java/com/recovery/gateway/task/DataInitTask.java b/hoe-gateway/src/main/java/com/recovery/gateway/task/DataInitTask.java
index 3d1e661..f24637b 100644
--- a/hoe-gateway/src/main/java/com/recovery/gateway/task/DataInitTask.java
+++ b/hoe-gateway/src/main/java/com/recovery/gateway/task/DataInitTask.java
@@ -34,7 +34,7 @@ public class DataInitTask {
public void initHospitalDB(){
try {
JdbcTemplate jdbcTemplate=new JdbcTemplate(generateDataSource());
- List> mapList = jdbcTemplate.queryForList("SELECT id,db_name,db_ip,db_port,db_user,db_passwd,`module`,hospital_host,hospital_code FROM db_info");
+ List> mapList = jdbcTemplate.queryForList("SELECT id,db_name,db_ip,db_port,db_user,db_passwd,`module`,db_host,db_code FROM db_info");
if(mapList.size() > 0){
Map> dbMap = new HashMap<>();
for(Map map : mapList){
@@ -47,11 +47,11 @@ public class DataInitTask {
dbInfo.setDbPasswd(map.get("db_passwd").toString());
dbInfo.setModule(map.get("module").toString());
- if(map.get("hospital_host") != null) {
- dbInfo.setHospitalHost(map.get("hospital_host").toString());
+ if(map.get("db_host") != null) {
+ dbInfo.setDbHost(map.get("db_host").toString());
}
- dbInfo.setHospitalCode((String)map.get("hospital_code"));
- String codeKey = "hoe:hospital:dbInfo:"+dbInfo.getHospitalCode()+"_"+dbInfo.getModule();
+ dbInfo.setDbCode((String)map.get("db_code"));
+ String codeKey = "hoe:common:dbInfo:"+dbInfo.getDbCode()+"_"+dbInfo.getModule();
redisCache.put(codeKey, JSONObject.toJSONString(dbInfo));
/** 废弃host字段 迁移至新表 website_info
if(UtilTools.isNotEmpty(dbInfo.getModule()) && dbInfo.getModule().equals("common")){
@@ -69,7 +69,7 @@ public class DataInitTask {
}
}
dbMap.forEach((k,v)->{
- String redisKey = "hoe:hospital:dbs:"+k;
+ String redisKey = "hoe:dbs:"+k;
redisCache.put(redisKey,JSONObject.toJSONString(v));
});
}
diff --git a/hoe-gateway/src/main/resources/bootstrap.yml b/hoe-gateway/src/main/resources/bootstrap.yml
index 1965b3b..8d9aa86 100644
--- a/hoe-gateway/src/main/resources/bootstrap.yml
+++ b/hoe-gateway/src/main/resources/bootstrap.yml
@@ -11,10 +11,10 @@ spring:
discovery:
# metadata:
# serviceGroup: ytChen
- server-addr: 192.168.110.209:8848
+ server-addr: 192.168.110.210:8848
namespace: 11bfd099-10d6-4f2c-b969-58b76e435cce
config:
- server-addr: 192.168.110.209:8848
+ server-addr: 192.168.110.210:8848
file-extension: yaml
prefix: hoe-gateway
group: dev
diff --git a/hoe-gateway/target/classes/bootstrap.yml b/hoe-gateway/target/classes/bootstrap.yml
index 1f4767e..8d9aa86 100644
--- a/hoe-gateway/target/classes/bootstrap.yml
+++ b/hoe-gateway/target/classes/bootstrap.yml
@@ -11,10 +11,10 @@ spring:
discovery:
# metadata:
# serviceGroup: ytChen
- server-addr: localhost:8848
+ server-addr: 192.168.110.210:8848
namespace: 11bfd099-10d6-4f2c-b969-58b76e435cce
config:
- server-addr: localhost:8848
+ server-addr: 192.168.110.210:8848
file-extension: yaml
prefix: hoe-gateway
group: dev
diff --git a/hoe-gateway/target/classes/com/recovery/gateway/GatewayApp.class b/hoe-gateway/target/classes/com/recovery/gateway/GatewayApp.class
index a522ca2..4f56ce7 100644
Binary files a/hoe-gateway/target/classes/com/recovery/gateway/GatewayApp.class and b/hoe-gateway/target/classes/com/recovery/gateway/GatewayApp.class differ
diff --git a/hoe-gateway/target/classes/com/recovery/gateway/config/SaTokenConfigure.class b/hoe-gateway/target/classes/com/recovery/gateway/config/SaTokenConfigure.class
index 74cd8a1..4f63c75 100644
Binary files a/hoe-gateway/target/classes/com/recovery/gateway/config/SaTokenConfigure.class and b/hoe-gateway/target/classes/com/recovery/gateway/config/SaTokenConfigure.class differ
diff --git a/hoe-gateway/target/classes/com/recovery/gateway/config/SecretStoreRunner.class b/hoe-gateway/target/classes/com/recovery/gateway/config/SecretStoreRunner.class
index 121fba8..0c7d943 100644
Binary files a/hoe-gateway/target/classes/com/recovery/gateway/config/SecretStoreRunner.class and b/hoe-gateway/target/classes/com/recovery/gateway/config/SecretStoreRunner.class differ
diff --git a/hoe-gateway/target/classes/com/recovery/gateway/security/ResourceServerConfig.class b/hoe-gateway/target/classes/com/recovery/gateway/security/ResourceServerConfig.class
index 5eea486..3ff651f 100644
Binary files a/hoe-gateway/target/classes/com/recovery/gateway/security/ResourceServerConfig.class and b/hoe-gateway/target/classes/com/recovery/gateway/security/ResourceServerConfig.class differ
diff --git a/hoe-gateway/target/classes/com/recovery/gateway/security/ResourceServerManager.class b/hoe-gateway/target/classes/com/recovery/gateway/security/ResourceServerManager.class
index ee712ea..9cda9fb 100644
Binary files a/hoe-gateway/target/classes/com/recovery/gateway/security/ResourceServerManager.class and b/hoe-gateway/target/classes/com/recovery/gateway/security/ResourceServerManager.class differ
diff --git a/hoe-gateway/target/classes/com/recovery/gateway/security/SecurityGlobalFilter.class b/hoe-gateway/target/classes/com/recovery/gateway/security/SecurityGlobalFilter.class
index e39e9dc..a1dd627 100644
Binary files a/hoe-gateway/target/classes/com/recovery/gateway/security/SecurityGlobalFilter.class and b/hoe-gateway/target/classes/com/recovery/gateway/security/SecurityGlobalFilter.class differ
diff --git a/hoe-gateway/target/classes/com/recovery/gateway/task/DataInitTask.class b/hoe-gateway/target/classes/com/recovery/gateway/task/DataInitTask.class
index 12162fa..4ec7f4c 100644
Binary files a/hoe-gateway/target/classes/com/recovery/gateway/task/DataInitTask.class and b/hoe-gateway/target/classes/com/recovery/gateway/task/DataInitTask.class differ
diff --git a/hoe-gateway/target/classes/com/recovery/gateway/util/ResponseUtils$1.class b/hoe-gateway/target/classes/com/recovery/gateway/util/ResponseUtils$1.class
index 5294c10..72a6b65 100644
Binary files a/hoe-gateway/target/classes/com/recovery/gateway/util/ResponseUtils$1.class and b/hoe-gateway/target/classes/com/recovery/gateway/util/ResponseUtils$1.class differ
diff --git a/hoe-gateway/target/classes/com/recovery/gateway/util/ResponseUtils.class b/hoe-gateway/target/classes/com/recovery/gateway/util/ResponseUtils.class
index 7e5d48a..17d7925 100644
Binary files a/hoe-gateway/target/classes/com/recovery/gateway/util/ResponseUtils.class and b/hoe-gateway/target/classes/com/recovery/gateway/util/ResponseUtils.class differ
diff --git a/hoe-gateway/target/classes/com/recovery/gateway/util/UrlPatternUtils.class b/hoe-gateway/target/classes/com/recovery/gateway/util/UrlPatternUtils.class
index 14d0e5d..64a0148 100644
Binary files a/hoe-gateway/target/classes/com/recovery/gateway/util/UrlPatternUtils.class and b/hoe-gateway/target/classes/com/recovery/gateway/util/UrlPatternUtils.class differ
diff --git a/hoe-order/pom.xml b/hoe-order/pom.xml
index f62628c..c0d6f2d 100644
--- a/hoe-order/pom.xml
+++ b/hoe-order/pom.xml
@@ -12,8 +12,8 @@
hoe-order
- 8
- 8
+ 17
+ 17
UTF-8
@@ -57,8 +57,24 @@
com.nimbusds
nimbus-jose-jwt
+ 9.22
+
+
+ org.hibernate.validator
+ hibernate-validator
+ 6.2.0.Final
+
+
+
+ org.glassfish
+ jakarta.el
+ 3.0.3
+
+
+
+
javax.persistence
javax.persistence-api
diff --git a/hoe-order/src/main/java/com/recovery/order/OrderApp.java b/hoe-order/src/main/java/com/recovery/order/OrderApp.java
index 953038e..d905c55 100644
--- a/hoe-order/src/main/java/com/recovery/order/OrderApp.java
+++ b/hoe-order/src/main/java/com/recovery/order/OrderApp.java
@@ -1,6 +1,7 @@
package com.recovery.order;
import com.dtp.core.spring.EnableDynamicTp;
+
import org.mybatis.spring.annotation.MapperScan;
import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication;
diff --git a/hoe-order/src/main/java/com/recovery/order/config/ds/DataSourceConfig.java b/hoe-order/src/main/java/com/recovery/order/config/ds/DataSourceConfig.java
index 5f8d992..c8d85f6 100644
--- a/hoe-order/src/main/java/com/recovery/order/config/ds/DataSourceConfig.java
+++ b/hoe-order/src/main/java/com/recovery/order/config/ds/DataSourceConfig.java
@@ -9,6 +9,7 @@ import org.apache.ibatis.session.SqlSessionFactory;
import org.mybatis.spring.SqlSessionFactoryBean;
import org.mybatis.spring.SqlSessionTemplate;
import org.mybatis.spring.annotation.MapperScan;
+import org.mybatis.spring.transaction.SpringManagedTransactionFactory;
import org.springframework.beans.factory.annotation.Qualifier;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.context.annotation.Bean;
@@ -79,6 +80,7 @@ public class DataSourceConfig {
bean.setDataSource(dynamicDataSource);
bean.setMapperLocations(new PathMatchingResourcePatternResolver()
.getResources(DataSourceConfig.MAPPER_LOCATION));
+ bean.setTransactionFactory(new SpringManagedTransactionFactory());
return bean.getObject();
}
diff --git a/hoe-order/src/main/java/com/recovery/order/service/impl/OrderInServiceImpl.java b/hoe-order/src/main/java/com/recovery/order/service/impl/OrderInServiceImpl.java
index dd2874c..c35a72e 100644
--- a/hoe-order/src/main/java/com/recovery/order/service/impl/OrderInServiceImpl.java
+++ b/hoe-order/src/main/java/com/recovery/order/service/impl/OrderInServiceImpl.java
@@ -6,6 +6,7 @@ import com.recovery.order.mapper.OrderInMapper;
import com.recovery.order.service.OrderInService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@@ -23,8 +24,8 @@ import org.springframework.transaction.annotation.Transactional;
public class OrderInServiceImpl extends ServiceImpl implements OrderInService {
@Override
-// @Transactional
-// @GlobalTransactional
+ @Transactional
+// @GlobalTransactional(rollbackFor = Exception.class)
public boolean saveOrderIn(OrderIn orderIn) {
orderIn.setIsDeleted(0);
orderIn.setUserId(1L);
diff --git a/hoe-order/src/main/resources/bootstrap.yml b/hoe-order/src/main/resources/bootstrap.yml
index 61674f6..fecb134 100644
--- a/hoe-order/src/main/resources/bootstrap.yml
+++ b/hoe-order/src/main/resources/bootstrap.yml
@@ -4,6 +4,7 @@ spring:
name: hoe-order
main:
allow-bean-definition-overriding: true
+ allow-circular-references: true
profiles:
active: dev
cloud:
@@ -11,10 +12,10 @@ spring:
discovery:
# metadata:
# serviceGroup: ytChen
- server-addr: 192.168.110.209:8848
+ server-addr: 192.168.110.210:8848
namespace: 11bfd099-10d6-4f2c-b969-58b76e435cce
config:
- server-addr: 192.168.110.209:8848
+ server-addr: 192.168.110.210:8848
file-extension: yaml
prefix: hoe-order
group: dev
@@ -25,7 +26,7 @@ server:
#分布式事务
#seata:
# enabled: true
-# enable-auto-data-source-proxy: true
+# enable-auto-data-source-proxy: false
# config:
# type: nacos
# nacos:
@@ -34,6 +35,7 @@ server:
# username: nacos
# password: nacos
# data-id: seataServer.properties
+# namespace: 11bfd099-10d6-4f2c-b969-58b76e435cce
# registry:
# type: nacos
# nacos:
@@ -42,3 +44,4 @@ server:
# group: SEATA_GROUP
# username: nacos
# password: nacos
+# namespace: 11bfd099-10d6-4f2c-b969-58b76e435cce
diff --git a/pom.xml b/pom.xml
index 4798192..f1fdd47 100644
--- a/pom.xml
+++ b/pom.xml
@@ -17,12 +17,12 @@
- 8
- 8
+ 17
+ 17
UTF-8
- 2020.0.3
+ 2021.0.5
2021.1
- 2.5.4
+ 2.7.5
1.0.0
5.7.14
8.0.22
@@ -32,7 +32,7 @@
org.springframework.boot
spring-boot-starter-parent
- 2.5.4
+ 2.7.5
@@ -41,6 +41,7 @@
org.projectlombok
lombok
+
cn.hutool
hutool-all
@@ -80,6 +81,11 @@
pom
import
+
+
+
+
+