From 8f8e8225dd6449f742070a0380f51d5d1c945d29 Mon Sep 17 00:00:00 2001 From: landaiqing <3517283258@qq.com> Date: Sun, 2 Jun 2024 14:54:37 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E6=8B=A6=E6=88=AA=E5=99=A8=E5=AE=9E?= =?UTF-8?q?=E7=8E=B0/gateway=E5=BE=AE=E6=9C=8D=E5=8A=A1=E6=89=93=E9=80=9A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../auth/application/config/GlobalConfig.java | 8 + .../context/LoginContextHolder.java | 41 ++ .../interceptor/FeignConfiguration.java | 22 + .../interceptor/FeignRequestInterceptor.java | 34 ++ .../interceptor/LoginInterceptor.java | 28 + .../application/interceptor/package-info.md | 1 - .../common/context/LoginContextHolder.java | 42 ++ .../auth/common/utils/LoginUtil.java | 20 + ...SchisandraAuthPermissionDomainService.java | 2 +- .../SchisandraAuthRoleDomainService.java | 2 +- .../SchisandraSmsConfigDomainService.java | 7 - ...sandraAuthPermissionDomainServiceImpl.java | 5 +- .../SchisandraAuthRoleDomainServiceImpl.java | 24 +- .../SchisandraSmsConfigDomainServiceImpl.java | 11 +- .../dao/SchisandraAuthPermissionDao.java | 48 -- .../basic/dao/SchisandraAuthRoleDao.java | 46 -- .../basic/dao/SchisandraSmsConfigDao.java | 75 +-- .../SchisandraAuthPermissionService.java | 12 +- .../service/SchisandraAuthRoleService.java | 10 +- .../service/SchisandraSmsConfigService.java | 11 +- .../SchisandraAuthPermissionServiceImpl.java | 19 +- .../impl/SchisandraAuthRoleServiceImpl.java | 27 +- .../impl/SchisandraSmsConfigServiceImpl.java | 33 +- .../mapper/SchisandraAuthPermissionDao.xml | 133 ----- .../mapper/SchisandraAuthRoleDao.xml | 95 ---- .../mapper/SchisandraSmsConfigDao.xml | 477 ------------------ .../exception/GatewayExceptionHandler.java | 2 +- 27 files changed, 235 insertions(+), 1000 deletions(-) create mode 100644 schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-application/schisandra-cloud-storage-auth-application-controller/src/main/java/com/schisandra/auth/application/context/LoginContextHolder.java create mode 100644 schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-application/schisandra-cloud-storage-auth-application-controller/src/main/java/com/schisandra/auth/application/interceptor/FeignConfiguration.java create mode 100644 schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-application/schisandra-cloud-storage-auth-application-controller/src/main/java/com/schisandra/auth/application/interceptor/FeignRequestInterceptor.java create mode 100644 schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-application/schisandra-cloud-storage-auth-application-controller/src/main/java/com/schisandra/auth/application/interceptor/LoginInterceptor.java delete mode 100644 schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-application/schisandra-cloud-storage-auth-application-controller/src/main/java/com/schisandra/auth/application/interceptor/package-info.md create mode 100644 schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-common/src/main/java/com/schisandra/auth/common/context/LoginContextHolder.java create mode 100644 schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-common/src/main/java/com/schisandra/auth/common/utils/LoginUtil.java diff --git a/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-application/schisandra-cloud-storage-auth-application-controller/src/main/java/com/schisandra/auth/application/config/GlobalConfig.java b/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-application/schisandra-cloud-storage-auth-application-controller/src/main/java/com/schisandra/auth/application/config/GlobalConfig.java index 9dba18e..c5f51b6 100644 --- a/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-application/schisandra-cloud-storage-auth-application-controller/src/main/java/com/schisandra/auth/application/config/GlobalConfig.java +++ b/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-application/schisandra-cloud-storage-auth-application-controller/src/main/java/com/schisandra/auth/application/config/GlobalConfig.java @@ -3,9 +3,11 @@ package com.schisandra.auth.application.config; import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.SerializationFeature; +import com.schisandra.auth.application.interceptor.LoginInterceptor; import org.springframework.context.annotation.Configuration; import org.springframework.http.converter.HttpMessageConverter; import org.springframework.http.converter.json.MappingJackson2HttpMessageConverter; +import org.springframework.web.servlet.config.annotation.InterceptorRegistry; import org.springframework.web.servlet.config.annotation.WebMvcConfigurationSupport; import java.util.List; @@ -35,4 +37,10 @@ public class GlobalConfig extends WebMvcConfigurationSupport { MappingJackson2HttpMessageConverter converter = new MappingJackson2HttpMessageConverter(objectMapper); return converter; } + + @Override + protected void addInterceptors(InterceptorRegistry registry) { + registry.addInterceptor(new LoginInterceptor()) + .addPathPatterns("/**"); + } } diff --git a/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-application/schisandra-cloud-storage-auth-application-controller/src/main/java/com/schisandra/auth/application/context/LoginContextHolder.java b/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-application/schisandra-cloud-storage-auth-application-controller/src/main/java/com/schisandra/auth/application/context/LoginContextHolder.java new file mode 100644 index 0000000..7cbfa6b --- /dev/null +++ b/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-application/schisandra-cloud-storage-auth-application-controller/src/main/java/com/schisandra/auth/application/context/LoginContextHolder.java @@ -0,0 +1,41 @@ +package com.schisandra.auth.application.context; + +import java.util.Map; +import java.util.Objects; +import java.util.concurrent.ConcurrentHashMap; + +/** + * @description: 登录上下文对象 + * @author: landaiqing + * @date: 2024/6/2 14:24 + */ +public class LoginContextHolder { + private static final InheritableThreadLocal> THREAD_LOCAL = new InheritableThreadLocal<>(); + + public static void set(String key, Object val) { + Map map = getThreadLoacalMap(); + map.put(key, val); + } + + public static Object get(String key) { + Map threadLoacalMap = getThreadLoacalMap(); + return threadLoacalMap.get(key); + } + + public static void remove() { + THREAD_LOCAL.remove(); + } + + public static String getUserId() { + return (String) getThreadLoacalMap().get("userId"); + } + + public static Map getThreadLoacalMap() { + Map map = THREAD_LOCAL.get(); + if (Objects.isNull(map)) { + map = new ConcurrentHashMap<>(); + THREAD_LOCAL.set(map); + } + return map; + } +} diff --git a/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-application/schisandra-cloud-storage-auth-application-controller/src/main/java/com/schisandra/auth/application/interceptor/FeignConfiguration.java b/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-application/schisandra-cloud-storage-auth-application-controller/src/main/java/com/schisandra/auth/application/interceptor/FeignConfiguration.java new file mode 100644 index 0000000..0e584e4 --- /dev/null +++ b/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-application/schisandra-cloud-storage-auth-application-controller/src/main/java/com/schisandra/auth/application/interceptor/FeignConfiguration.java @@ -0,0 +1,22 @@ +package com.schisandra.auth.application.interceptor; + +import feign.RequestInterceptor; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; + +/** + * @Classname FeignConfiguration + * @BelongsProject: qing-yu-club + * @BelongsPackage: com.landaiqing.subject.application.interceptor + * @Author: landaiqing + * @CreateTime: 2024-03-03 21:11 + * @Description: TODO + * @Version: 1.0 + */ +@Configuration +public class FeignConfiguration { + @Bean + public RequestInterceptor requestInterceptor(){ + return new FeignRequestInterceptor(); + } +} diff --git a/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-application/schisandra-cloud-storage-auth-application-controller/src/main/java/com/schisandra/auth/application/interceptor/FeignRequestInterceptor.java b/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-application/schisandra-cloud-storage-auth-application-controller/src/main/java/com/schisandra/auth/application/interceptor/FeignRequestInterceptor.java new file mode 100644 index 0000000..e6e1370 --- /dev/null +++ b/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-application/schisandra-cloud-storage-auth-application-controller/src/main/java/com/schisandra/auth/application/interceptor/FeignRequestInterceptor.java @@ -0,0 +1,34 @@ +package com.schisandra.auth.application.interceptor; + +import feign.RequestInterceptor; +import feign.RequestTemplate; +import org.apache.commons.lang3.StringUtils; +import org.springframework.stereotype.Component; +import org.springframework.web.context.request.RequestContextHolder; +import org.springframework.web.context.request.ServletRequestAttributes; + +import javax.servlet.http.HttpServletRequest; +import java.util.Objects; + +/** + * @Classname FeignRequestInterceptor + * @BelongsProject: qing-yu-club + * @BelongsPackage: com.landaiqing.subject.application.interceptor + * @Author: landaiqing + * @CreateTime: 2024-03-03 21:04 + * @Description: Feign请求拦截器 + * @Version: 1.0 + */ +@Component +public class FeignRequestInterceptor implements RequestInterceptor { + + @Override + public void apply(RequestTemplate requestTemplate) { + ServletRequestAttributes requestAttributes = (ServletRequestAttributes) RequestContextHolder.getRequestAttributes(); + HttpServletRequest request = requestAttributes.getRequest(); + String userId = request.getHeader("userId"); + if (StringUtils.isNotBlank(userId)) { + requestTemplate.header("userId", userId); + } + } +} diff --git a/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-application/schisandra-cloud-storage-auth-application-controller/src/main/java/com/schisandra/auth/application/interceptor/LoginInterceptor.java b/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-application/schisandra-cloud-storage-auth-application-controller/src/main/java/com/schisandra/auth/application/interceptor/LoginInterceptor.java new file mode 100644 index 0000000..30ec6e6 --- /dev/null +++ b/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-application/schisandra-cloud-storage-auth-application-controller/src/main/java/com/schisandra/auth/application/interceptor/LoginInterceptor.java @@ -0,0 +1,28 @@ +package com.schisandra.auth.application.interceptor; + + +import com.schisandra.auth.application.context.LoginContextHolder; +import org.springframework.lang.Nullable; +import org.springframework.web.servlet.HandlerInterceptor; + +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + +/** + * @description: 登录拦截器 + * @author: landaiqing + * @date: 2024/6/2 14:24 + */ +public class LoginInterceptor implements HandlerInterceptor { + @Override + public boolean preHandle(HttpServletRequest request, HttpServletResponse response, Object handler) throws Exception { + String userId = request.getHeader("userId"); + LoginContextHolder.set("userId",userId); + return true; + } + + @Override + public void afterCompletion(HttpServletRequest request, HttpServletResponse response, Object handler, @Nullable Exception ex) throws Exception { + LoginContextHolder.remove(); + } +} diff --git a/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-application/schisandra-cloud-storage-auth-application-controller/src/main/java/com/schisandra/auth/application/interceptor/package-info.md b/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-application/schisandra-cloud-storage-auth-application-controller/src/main/java/com/schisandra/auth/application/interceptor/package-info.md deleted file mode 100644 index 3f39b81..0000000 --- a/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-application/schisandra-cloud-storage-auth-application-controller/src/main/java/com/schisandra/auth/application/interceptor/package-info.md +++ /dev/null @@ -1 +0,0 @@ -controller 拦截器 \ No newline at end of file diff --git a/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-common/src/main/java/com/schisandra/auth/common/context/LoginContextHolder.java b/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-common/src/main/java/com/schisandra/auth/common/context/LoginContextHolder.java new file mode 100644 index 0000000..650d621 --- /dev/null +++ b/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-common/src/main/java/com/schisandra/auth/common/context/LoginContextHolder.java @@ -0,0 +1,42 @@ +package com.schisandra.auth.common.context; + +import java.util.Map; +import java.util.Objects; +import java.util.concurrent.ConcurrentHashMap; + +/** + * @Classname LoginContextHolder + * @BelongsProject: qing-yu-club + * @BelongsPackage: com.landaiqing.subject.application.context + * @Author: landaiqing + * @CreateTime: 2024-03-03 18:11 + * @Description: 登录上下文对象 + * @Version: 1.0 + */ +public class LoginContextHolder { + private static final InheritableThreadLocal > THREAD_LOCAL=new InheritableThreadLocal<>(); + + public static void set(String key,Object val){ + Map map=getThreadLoacalMap(); + map.put(key, val); + } + public static Object get(String key){ + Map threadLoacalMap=getThreadLoacalMap(); + return threadLoacalMap.get(key); + } + public static void remove(){ + THREAD_LOCAL.remove(); + } + + public static String getUserId(){ + return (String) getThreadLoacalMap().get("userId"); + } + public static Map getThreadLoacalMap(){ + Map map =THREAD_LOCAL.get(); + if (Objects.isNull(map)){ + map=new ConcurrentHashMap<>(); + THREAD_LOCAL.set(map); + } + return map; + } +} diff --git a/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-common/src/main/java/com/schisandra/auth/common/utils/LoginUtil.java b/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-common/src/main/java/com/schisandra/auth/common/utils/LoginUtil.java new file mode 100644 index 0000000..94747d7 --- /dev/null +++ b/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-common/src/main/java/com/schisandra/auth/common/utils/LoginUtil.java @@ -0,0 +1,20 @@ +package com.schisandra.auth.common.utils; + + +import com.schisandra.auth.common.context.LoginContextHolder; + +/** + * @Classname LoginUtil + * @BelongsProject: qing-yu-club + * @BelongsPackage: com.landaiqing.subject.application.util + * @Author: landaiqing + * @CreateTime: 2024-03-03 18:33 + * @Description: 用户登录util + * @Version: 1.0 + */ + +public class LoginUtil { + public static String getUserId() { + return LoginContextHolder.getUserId(); + } +} diff --git a/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-domain/src/main/java/com/schisandra/auth/domain/service/SchisandraAuthPermissionDomainService.java b/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-domain/src/main/java/com/schisandra/auth/domain/service/SchisandraAuthPermissionDomainService.java index a58509e..fa70ea2 100644 --- a/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-domain/src/main/java/com/schisandra/auth/domain/service/SchisandraAuthPermissionDomainService.java +++ b/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-domain/src/main/java/com/schisandra/auth/domain/service/SchisandraAuthPermissionDomainService.java @@ -5,7 +5,7 @@ import com.schisandra.auth.infra.basic.entity.SchisandraAuthPermission; public interface SchisandraAuthPermissionDomainService { - Object update(SchisandraAuthPermissionBO schisandraAuthPermissionBO); + int update(SchisandraAuthPermissionBO schisandraAuthPermissionBO); Object delete(SchisandraAuthPermissionBO schisandraAuthPermissionBO); Object insert(SchisandraAuthPermissionBO schisandraAuthPermissionBO); SchisandraAuthPermissionBO select(SchisandraAuthPermissionBO schisandraAuthPermissionBO); diff --git a/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-domain/src/main/java/com/schisandra/auth/domain/service/SchisandraAuthRoleDomainService.java b/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-domain/src/main/java/com/schisandra/auth/domain/service/SchisandraAuthRoleDomainService.java index 295b3f9..37447b5 100644 --- a/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-domain/src/main/java/com/schisandra/auth/domain/service/SchisandraAuthRoleDomainService.java +++ b/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-domain/src/main/java/com/schisandra/auth/domain/service/SchisandraAuthRoleDomainService.java @@ -38,7 +38,7 @@ public interface SchisandraAuthRoleDomainService { *@Time 21:03 */ - Object insert(SchisandraAuthRoleBO schisandraAuthRoleBO); + int insert(SchisandraAuthRoleBO schisandraAuthRoleBO); /*** *@ClassName: SchisandraAuthRoleDomainService *@Description 查询角色信息 diff --git a/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-domain/src/main/java/com/schisandra/auth/domain/service/SchisandraSmsConfigDomainService.java b/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-domain/src/main/java/com/schisandra/auth/domain/service/SchisandraSmsConfigDomainService.java index 9301cac..0ac4495 100644 --- a/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-domain/src/main/java/com/schisandra/auth/domain/service/SchisandraSmsConfigDomainService.java +++ b/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-domain/src/main/java/com/schisandra/auth/domain/service/SchisandraSmsConfigDomainService.java @@ -2,9 +2,6 @@ package com.schisandra.auth.domain.service; import com.schisandra.auth.domain.bo.SchisandraSmsConfigBO; -import com.schisandra.auth.infra.basic.entity.SchisandraSmsConfig; - -import java.util.List; /** * 用户领域service @@ -14,10 +11,6 @@ import java.util.List; */ public interface SchisandraSmsConfigDomainService { - - - List queryAll(); - SchisandraSmsConfigBO queryByConfigId(String configId); } diff --git a/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-domain/src/main/java/com/schisandra/auth/domain/service/impl/SchisandraAuthPermissionDomainServiceImpl.java b/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-domain/src/main/java/com/schisandra/auth/domain/service/impl/SchisandraAuthPermissionDomainServiceImpl.java index 05df5fe..5352de1 100644 --- a/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-domain/src/main/java/com/schisandra/auth/domain/service/impl/SchisandraAuthPermissionDomainServiceImpl.java +++ b/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-domain/src/main/java/com/schisandra/auth/domain/service/impl/SchisandraAuthPermissionDomainServiceImpl.java @@ -23,10 +23,9 @@ public class SchisandraAuthPermissionDomainServiceImpl implements SchisandraAuth * @date: 2024/4/17 17:06 */ @Override - public Object update(SchisandraAuthPermissionBO schisandraAuthPermissionBO) { + public int update(SchisandraAuthPermissionBO schisandraAuthPermissionBO) { SchisandraAuthPermission schisandraAuthPermission = SchisandraAuthPermissionBOConverter.INSTANCE.convertBOToEntity(schisandraAuthPermissionBO); - SchisandraAuthPermission schisandraAuthPermission1 =schisandraAuthPermissionService.update(schisandraAuthPermission); - return schisandraAuthPermission1; + return schisandraAuthPermissionService.update(schisandraAuthPermission); } /** * @description: 删除 diff --git a/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-domain/src/main/java/com/schisandra/auth/domain/service/impl/SchisandraAuthRoleDomainServiceImpl.java b/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-domain/src/main/java/com/schisandra/auth/domain/service/impl/SchisandraAuthRoleDomainServiceImpl.java index 22b41fb..fb2af23 100644 --- a/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-domain/src/main/java/com/schisandra/auth/domain/service/impl/SchisandraAuthRoleDomainServiceImpl.java +++ b/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-domain/src/main/java/com/schisandra/auth/domain/service/impl/SchisandraAuthRoleDomainServiceImpl.java @@ -23,32 +23,32 @@ import javax.annotation.Resource; @Slf4j public class SchisandraAuthRoleDomainServiceImpl implements SchisandraAuthRoleDomainService { @Resource - private SchisandraAuthRoleService schisandraAuthRoleService; + private SchisandraAuthRoleService schisandraAuthRoleService; + @Override public Object update(SchisandraAuthRoleBO schisandraAuthRoleBO) { - SchisandraAuthRole schisandraAuthRole =SchisandraAuthRoleBOConverter.INSTANCE.convertBOToEntity(schisandraAuthRoleBO); - SchisandraAuthRole schisandraAuthRole1=schisandraAuthRoleService.update(schisandraAuthRole); - return schisandraAuthRole1; + SchisandraAuthRole schisandraAuthRole = SchisandraAuthRoleBOConverter.INSTANCE.convertBOToEntity(schisandraAuthRoleBO); + SchisandraAuthRole update = schisandraAuthRoleService.update(schisandraAuthRole); + return update; } @Override public Object delete(Long id) { - boolean isDeleted=schisandraAuthRoleService.deleteById(id); + boolean isDeleted = schisandraAuthRoleService.deleteById(id); return isDeleted; } @Override - public Object insert(SchisandraAuthRoleBO schisandraAuthRoleBO) { - SchisandraAuthRole schisandraAuthRole =SchisandraAuthRoleBOConverter.INSTANCE.convertBOToEntity(schisandraAuthRoleBO); - SchisandraAuthRole schisandraAuthRole1=schisandraAuthRoleService.insert(schisandraAuthRole); - return schisandraAuthRole1; + public int insert(SchisandraAuthRoleBO schisandraAuthRoleBO) { + SchisandraAuthRole schisandraAuthRole = SchisandraAuthRoleBOConverter.INSTANCE.convertBOToEntity(schisandraAuthRoleBO); + return schisandraAuthRoleService.insert(schisandraAuthRole); } @Override public Object select(SchisandraAuthRoleBO schisandraAuthRoleBO) { - SchisandraAuthRole schisandraAuthRole =SchisandraAuthRoleBOConverter.INSTANCE.convertBOToEntity(schisandraAuthRoleBO); - if(schisandraAuthRoleBO.getId()!=null){ - SchisandraAuthRole schisandraAuthRole1=schisandraAuthRoleService.queryById(schisandraAuthRoleBO.getId()); + SchisandraAuthRole schisandraAuthRole = SchisandraAuthRoleBOConverter.INSTANCE.convertBOToEntity(schisandraAuthRoleBO); + if (schisandraAuthRoleBO.getId() != null) { + SchisandraAuthRole schisandraAuthRole1 = schisandraAuthRoleService.queryById(schisandraAuthRoleBO.getId()); return schisandraAuthRole1; } return null; diff --git a/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-domain/src/main/java/com/schisandra/auth/domain/service/impl/SchisandraSmsConfigDomainServiceImpl.java b/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-domain/src/main/java/com/schisandra/auth/domain/service/impl/SchisandraSmsConfigDomainServiceImpl.java index 03e17c3..b3fe2f7 100644 --- a/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-domain/src/main/java/com/schisandra/auth/domain/service/impl/SchisandraSmsConfigDomainServiceImpl.java +++ b/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-domain/src/main/java/com/schisandra/auth/domain/service/impl/SchisandraSmsConfigDomainServiceImpl.java @@ -15,20 +15,11 @@ import java.util.List; public class SchisandraSmsConfigDomainServiceImpl implements SchisandraSmsConfigDomainService { @Resource private SchisandraSmsConfigService schisandraSmsConfigService; - @Override - public List queryAll() { - - List schisandraSmsConfigs = schisandraSmsConfigService.queryAll(); - return SchisandraSmsConfigBOConvert.INSTANCE.convertEntityToBOList(schisandraSmsConfigs); - - } @Override public SchisandraSmsConfigBO queryByConfigId(String configId) { SchisandraSmsConfig schisandraSmsConfig= schisandraSmsConfigService.queryByConfigId(configId); - - SchisandraSmsConfigBO schisandraSmsConfigBO = SchisandraSmsConfigBOConvert.INSTANCE.convertEntityToBO(schisandraSmsConfig); - return schisandraSmsConfigBO; + return SchisandraSmsConfigBOConvert.INSTANCE.convertEntityToBO(schisandraSmsConfig); } } diff --git a/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-infra/src/main/java/com/schisandra/auth/infra/basic/dao/SchisandraAuthPermissionDao.java b/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-infra/src/main/java/com/schisandra/auth/infra/basic/dao/SchisandraAuthPermissionDao.java index 218b4fb..8194d2f 100644 --- a/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-infra/src/main/java/com/schisandra/auth/infra/basic/dao/SchisandraAuthPermissionDao.java +++ b/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-infra/src/main/java/com/schisandra/auth/infra/basic/dao/SchisandraAuthPermissionDao.java @@ -2,13 +2,8 @@ package com.schisandra.auth.infra.basic.dao; import com.mybatisflex.core.BaseMapper; import com.schisandra.auth.infra.basic.entity.SchisandraAuthPermission; -import com.schisandra.auth.infra.basic.entity.SchisandraAuthRole; -import org.apache.ibatis.annotations.Param; -import org.springframework.data.domain.Pageable; import org.springframework.stereotype.Repository; -import java.util.List; - /** * (SchisandraAuthPermission)表数据库访问层 * @@ -18,49 +13,6 @@ import java.util.List; @Repository public interface SchisandraAuthPermissionDao extends BaseMapper { - /** - * 通过ID查询单条数据 - * - * @param id 主键 - * @return 实例对象 - */ - SchisandraAuthPermission queryById(Long id); - - /** - * 查询指定行数据 - * - * @param schisandraAuthPermission 查询条件 - * @param pageable 分页对象 - * @return 对象列表 - */ - List queryAllByLimit(SchisandraAuthPermission schisandraAuthPermission, @Param("pageable") Pageable pageable); - - /** - * 统计总行数 - * - * @param schisandraAuthPermission 查询条件 - * @return 总行数 - */ - long count(SchisandraAuthPermission schisandraAuthPermission); - - /** - * 批量新增数据（MyBatis原生foreach方法） - * - * @param entities List 实例对象列表 - * @return 影响行数 - */ - int insertBatch(@Param("entities") List entities); - - /** - * 批量新增或按主键更新数据（MyBatis原生foreach方法） - * - * @param entities List 实例对象列表 - * @return 影响行数 - * @throws org.springframework.jdbc.BadSqlGrammarException 入参是空List的时候会抛SQL语句错误的异常，请自行校验入参 - */ - int insertOrUpdateBatch(@Param("entities") List entities); - - } diff --git a/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-infra/src/main/java/com/schisandra/auth/infra/basic/dao/SchisandraAuthRoleDao.java b/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-infra/src/main/java/com/schisandra/auth/infra/basic/dao/SchisandraAuthRoleDao.java index 87e66eb..74dbbe5 100644 --- a/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-infra/src/main/java/com/schisandra/auth/infra/basic/dao/SchisandraAuthRoleDao.java +++ b/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-infra/src/main/java/com/schisandra/auth/infra/basic/dao/SchisandraAuthRoleDao.java @@ -18,51 +18,5 @@ import java.util.List; @Repository public interface SchisandraAuthRoleDao extends BaseMapper { - /** - * 通过ID查询单条数据 - * - * @param id 主键 - * @return 实例对象 - */ - SchisandraAuthRole queryById(Long id); - - /** - * 查询指定行数据 - * - * @param schisandraAuthRole 查询条件 - * @param pageable 分页对象 - * @return 对象列表 - */ - List queryAllByLimit(SchisandraAuthRole schisandraAuthRole, @Param("pageable") Pageable pageable); - - /** - * 统计总行数 - * - * @param schisandraAuthRole 查询条件 - * @return 总行数 - */ - long count(SchisandraAuthRole schisandraAuthRole); - - - /** - * 批量新增数据（MyBatis原生foreach方法） - * - * @param entities List 实例对象列表 - * @return 影响行数 - */ - int insertBatch(@Param("entities") List entities); - - /** - * 批量新增或按主键更新数据（MyBatis原生foreach方法） - * - * @param entities List 实例对象列表 - * @return 影响行数 - * @throws org.springframework.jdbc.BadSqlGrammarException 入参是空List的时候会抛SQL语句错误的异常，请自行校验入参 - */ - int insertOrUpdateBatch(@Param("entities") List entities); - - - - } diff --git a/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-infra/src/main/java/com/schisandra/auth/infra/basic/dao/SchisandraSmsConfigDao.java b/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-infra/src/main/java/com/schisandra/auth/infra/basic/dao/SchisandraSmsConfigDao.java index 260d525..7ff963f 100644 --- a/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-infra/src/main/java/com/schisandra/auth/infra/basic/dao/SchisandraSmsConfigDao.java +++ b/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-infra/src/main/java/com/schisandra/auth/infra/basic/dao/SchisandraSmsConfigDao.java @@ -1,12 +1,9 @@ package com.schisandra.auth.infra.basic.dao; +import com.mybatisflex.core.BaseMapper; import com.schisandra.auth.infra.basic.entity.SchisandraSmsConfig; -import org.apache.ibatis.annotations.Param; -import org.springframework.data.domain.Pageable; import org.springframework.stereotype.Repository; -import java.util.List; - /** * (SchisandraSmsConfig)表数据库访问层 * @@ -14,76 +11,8 @@ import java.util.List; * @since 2024-05-11 15:47:58 */ @Repository -public interface SchisandraSmsConfigDao { +public interface SchisandraSmsConfigDao extends BaseMapper { - /** - * 通过ID查询单条数据 - * - * @param id 主键 - * @return 实例对象 - */ - SchisandraSmsConfig queryById(Integer id); - /** - * 查询指定行数据 - * - * @param schisandraSmsConfig 查询条件 - * @param pageable 分页对象 - * @return 对象列表 - */ - List queryAllByLimit(SchisandraSmsConfig schisandraSmsConfig, @Param("pageable") Pageable pageable); - - /** - * 统计总行数 - * - * @param schisandraSmsConfig 查询条件 - * @return 总行数 - */ - long count(SchisandraSmsConfig schisandraSmsConfig); - - /** - * 新增数据 - * - * @param schisandraSmsConfig 实例对象 - * @return 影响行数 - */ - int insert(SchisandraSmsConfig schisandraSmsConfig); - - /** - * 批量新增数据（MyBatis原生foreach方法） - * - * @param entities List 实例对象列表 - * @return 影响行数 - */ - int insertBatch(@Param("entities") List entities); - - /** - * 批量新增或按主键更新数据（MyBatis原生foreach方法） - * - * @param entities List 实例对象列表 - * @return 影响行数 - * @throws org.springframework.jdbc.BadSqlGrammarException 入参是空List的时候会抛SQL语句错误的异常，请自行校验入参 - */ - int insertOrUpdateBatch(@Param("entities") List entities); - - /** - * 修改数据 - * - * @param schisandraSmsConfig 实例对象 - * @return 影响行数 - */ - int update(SchisandraSmsConfig schisandraSmsConfig); - - /** - * 通过主键删除数据 - * - * @param id 主键 - * @return 影响行数 - */ - int deleteById(Integer id); - - List queryAll(); - - SchisandraSmsConfig queryByConfigId(String configId); } diff --git a/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-infra/src/main/java/com/schisandra/auth/infra/basic/service/SchisandraAuthPermissionService.java b/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-infra/src/main/java/com/schisandra/auth/infra/basic/service/SchisandraAuthPermissionService.java index 52225d3..0894857 100644 --- a/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-infra/src/main/java/com/schisandra/auth/infra/basic/service/SchisandraAuthPermissionService.java +++ b/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-infra/src/main/java/com/schisandra/auth/infra/basic/service/SchisandraAuthPermissionService.java @@ -22,14 +22,6 @@ public interface SchisandraAuthPermissionService { */ SchisandraAuthPermission queryById(Long id); - /** - * 分页查询 - * - * @param schisandraAuthPermission 筛选条件 - * @param pageRequest 分页对象 - * @return 查询结果 - */ - Page queryByPage(SchisandraAuthPermission schisandraAuthPermission, PageRequest pageRequest); /** * 新增数据 @@ -43,9 +35,9 @@ public interface SchisandraAuthPermissionService { * 修改数据 * * @param schisandraAuthPermission 实例对象 - * @return 实例对象 + * @return int */ - SchisandraAuthPermission update(SchisandraAuthPermission schisandraAuthPermission); + int update(SchisandraAuthPermission schisandraAuthPermission); /** * 通过主键删除数据 diff --git a/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-infra/src/main/java/com/schisandra/auth/infra/basic/service/SchisandraAuthRoleService.java b/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-infra/src/main/java/com/schisandra/auth/infra/basic/service/SchisandraAuthRoleService.java index 3926aa9..edfcc6f 100644 --- a/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-infra/src/main/java/com/schisandra/auth/infra/basic/service/SchisandraAuthRoleService.java +++ b/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-infra/src/main/java/com/schisandra/auth/infra/basic/service/SchisandraAuthRoleService.java @@ -20,14 +20,6 @@ public interface SchisandraAuthRoleService { */ SchisandraAuthRole queryById(Long id); - /** - * 分页查询 - * - * @param schisandraAuthRole 筛选条件 - * @param pageRequest 分页对象 - * @return 查询结果 - */ - Page queryByPage(SchisandraAuthRole schisandraAuthRole, PageRequest pageRequest); /** * 新增数据 @@ -35,7 +27,7 @@ public interface SchisandraAuthRoleService { * @param schisandraAuthRole 实例对象 * @return 实例对象 */ - SchisandraAuthRole insert(SchisandraAuthRole schisandraAuthRole); + int insert(SchisandraAuthRole schisandraAuthRole); /** * 修改数据 diff --git a/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-infra/src/main/java/com/schisandra/auth/infra/basic/service/SchisandraSmsConfigService.java b/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-infra/src/main/java/com/schisandra/auth/infra/basic/service/SchisandraSmsConfigService.java index 41f650c..ddaad2b 100644 --- a/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-infra/src/main/java/com/schisandra/auth/infra/basic/service/SchisandraSmsConfigService.java +++ b/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-infra/src/main/java/com/schisandra/auth/infra/basic/service/SchisandraSmsConfigService.java @@ -22,14 +22,6 @@ public interface SchisandraSmsConfigService { */ SchisandraSmsConfig queryById(Integer id); - /** - * 分页查询 - * - * @param schisandraSmsConfig 筛选条件 - * @param pageRequest 分页对象 - * @return 查询结果 - */ - Page queryByPage(SchisandraSmsConfig schisandraSmsConfig, PageRequest pageRequest); /** * 新增数据 @@ -37,7 +29,7 @@ public interface SchisandraSmsConfigService { * @param schisandraSmsConfig 实例对象 * @return 实例对象 */ - SchisandraSmsConfig insert(SchisandraSmsConfig schisandraSmsConfig); + int insert(SchisandraSmsConfig schisandraSmsConfig); /** * 修改数据 @@ -55,7 +47,6 @@ public interface SchisandraSmsConfigService { */ boolean deleteById(Integer id); - List queryAll(); SchisandraSmsConfig queryByConfigId(String configId); } diff --git a/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-infra/src/main/java/com/schisandra/auth/infra/basic/service/impl/SchisandraAuthPermissionServiceImpl.java b/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-infra/src/main/java/com/schisandra/auth/infra/basic/service/impl/SchisandraAuthPermissionServiceImpl.java index 993c5ce..5618a6d 100644 --- a/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-infra/src/main/java/com/schisandra/auth/infra/basic/service/impl/SchisandraAuthPermissionServiceImpl.java +++ b/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-infra/src/main/java/com/schisandra/auth/infra/basic/service/impl/SchisandraAuthPermissionServiceImpl.java @@ -30,21 +30,9 @@ public class SchisandraAuthPermissionServiceImpl implements SchisandraAuthPermis */ @Override public SchisandraAuthPermission queryById(Long id) { - return this.schisandraAuthPermissionDao.queryById(id); + return this.schisandraAuthPermissionDao.selectOneById(id); } - /** - * 分页查询 - * - * @param schisandraAuthPermission 筛选条件 - * @param pageRequest 分页对象 - * @return 查询结果 - */ - @Override - public Page queryByPage(SchisandraAuthPermission schisandraAuthPermission, PageRequest pageRequest) { - long total = this.schisandraAuthPermissionDao.count(schisandraAuthPermission); - return new PageImpl<>(this.schisandraAuthPermissionDao.queryAllByLimit(schisandraAuthPermission, pageRequest), pageRequest, total); - } /** * 新增数据 @@ -65,9 +53,8 @@ public class SchisandraAuthPermissionServiceImpl implements SchisandraAuthPermis * @return 实例对象 */ @Override - public SchisandraAuthPermission update(SchisandraAuthPermission schisandraAuthPermission) { - this.schisandraAuthPermissionDao.update(schisandraAuthPermission); - return this.queryById(schisandraAuthPermission.getId()); + public int update(SchisandraAuthPermission schisandraAuthPermission) { + return this.schisandraAuthPermissionDao.update(schisandraAuthPermission); } /** diff --git a/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-infra/src/main/java/com/schisandra/auth/infra/basic/service/impl/SchisandraAuthRoleServiceImpl.java b/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-infra/src/main/java/com/schisandra/auth/infra/basic/service/impl/SchisandraAuthRoleServiceImpl.java index 3618d4e..f618533 100644 --- a/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-infra/src/main/java/com/schisandra/auth/infra/basic/service/impl/SchisandraAuthRoleServiceImpl.java +++ b/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-infra/src/main/java/com/schisandra/auth/infra/basic/service/impl/SchisandraAuthRoleServiceImpl.java @@ -1,13 +1,10 @@ package com.schisandra.auth.infra.basic.service.impl; -import com.schisandra.auth.infra.basic.entity.SchisandraAuthRole; import com.schisandra.auth.infra.basic.dao.SchisandraAuthRoleDao; +import com.schisandra.auth.infra.basic.entity.SchisandraAuthRole; import com.schisandra.auth.infra.basic.entity.table.SchisandraAuthRoleTableDef; import com.schisandra.auth.infra.basic.service.SchisandraAuthRoleService; import org.springframework.stereotype.Service; -import org.springframework.data.domain.Page; -import org.springframework.data.domain.PageImpl; -import org.springframework.data.domain.PageRequest; import javax.annotation.Resource; @@ -32,32 +29,20 @@ public class SchisandraAuthRoleServiceImpl implements SchisandraAuthRoleService */ @Override public SchisandraAuthRole queryById(Long id) { - return this.schisandraAuthRoleDao.queryById(id); + return this.schisandraAuthRoleDao.selectOneById(id); } - /** - * 分页查询 - * - * @param schisandraAuthRole 筛选条件 - * @param pageRequest 分页对象 - * @return 查询结果 - */ - @Override - public Page queryByPage(SchisandraAuthRole schisandraAuthRole, PageRequest pageRequest) { - long total = this.schisandraAuthRoleDao.count(schisandraAuthRole); - return new PageImpl<>(this.schisandraAuthRoleDao.queryAllByLimit(schisandraAuthRole, pageRequest), pageRequest, total); - } /** * 新增数据 * * @param schisandraAuthRole 实例对象 - * @return 实例对象 + * @return int */ @Override - public SchisandraAuthRole insert(SchisandraAuthRole schisandraAuthRole) { - this.schisandraAuthRoleDao.insert(schisandraAuthRole); - return schisandraAuthRole; + public int insert(SchisandraAuthRole schisandraAuthRole) { + return this.schisandraAuthRoleDao.insert(schisandraAuthRole); + } /** diff --git a/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-infra/src/main/java/com/schisandra/auth/infra/basic/service/impl/SchisandraSmsConfigServiceImpl.java b/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-infra/src/main/java/com/schisandra/auth/infra/basic/service/impl/SchisandraSmsConfigServiceImpl.java index 798bcd4..eb72e2b 100644 --- a/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-infra/src/main/java/com/schisandra/auth/infra/basic/service/impl/SchisandraSmsConfigServiceImpl.java +++ b/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-infra/src/main/java/com/schisandra/auth/infra/basic/service/impl/SchisandraSmsConfigServiceImpl.java @@ -1,12 +1,10 @@ package com.schisandra.auth.infra.basic.service.impl; -import com.schisandra.auth.infra.basic.entity.SchisandraSmsConfig; import com.schisandra.auth.infra.basic.dao.SchisandraSmsConfigDao; +import com.schisandra.auth.infra.basic.entity.SchisandraSmsConfig; +import com.schisandra.auth.infra.basic.entity.table.SchisandraSmsConfigTableDef; import com.schisandra.auth.infra.basic.service.SchisandraSmsConfigService; import org.springframework.stereotype.Service; -import org.springframework.data.domain.Page; -import org.springframework.data.domain.PageImpl; -import org.springframework.data.domain.PageRequest; import javax.annotation.Resource; import java.util.List; @@ -30,21 +28,9 @@ public class SchisandraSmsConfigServiceImpl implements SchisandraSmsConfigServic */ @Override public SchisandraSmsConfig queryById(Integer id) { - return this.schisandraSmsConfigDao.queryById(id); + return this.schisandraSmsConfigDao.selectOneById(id); } - /** - * 分页查询 - * - * @param schisandraSmsConfig 筛选条件 - * @param pageRequest 分页对象 - * @return 查询结果 - */ - @Override - public Page queryByPage(SchisandraSmsConfig schisandraSmsConfig, PageRequest pageRequest) { - long total = this.schisandraSmsConfigDao.count(schisandraSmsConfig); - return new PageImpl<>(this.schisandraSmsConfigDao.queryAllByLimit(schisandraSmsConfig, pageRequest), pageRequest, total); - } /** * 新增数据 @@ -53,9 +39,9 @@ public class SchisandraSmsConfigServiceImpl implements SchisandraSmsConfigServic * @return 实例对象 */ @Override - public SchisandraSmsConfig insert(SchisandraSmsConfig schisandraSmsConfig) { - this.schisandraSmsConfigDao.insert(schisandraSmsConfig); - return schisandraSmsConfig; + public int insert(SchisandraSmsConfig schisandraSmsConfig) { + return schisandraSmsConfigDao.insert(schisandraSmsConfig,true); + } /** @@ -81,13 +67,8 @@ public class SchisandraSmsConfigServiceImpl implements SchisandraSmsConfigServic return this.schisandraSmsConfigDao.deleteById(id) > 0; } - @Override - public List queryAll() { - return schisandraSmsConfigDao.queryAll(); - } - @Override public SchisandraSmsConfig queryByConfigId(String configId) { - return schisandraSmsConfigDao.queryByConfigId(configId); + return schisandraSmsConfigDao.selectOneByCondition(SchisandraSmsConfigTableDef.SCHISANDRA_SMS_CONFIG.CONFIG_ID.eq(configId)); } } diff --git a/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-infra/src/main/resources/mapper/SchisandraAuthPermissionDao.xml b/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-infra/src/main/resources/mapper/SchisandraAuthPermissionDao.xml index 8d5eca4..d054d07 100644 --- a/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-infra/src/main/resources/mapper/SchisandraAuthPermissionDao.xml +++ b/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-infra/src/main/resources/mapper/SchisandraAuthPermissionDao.xml @@ -19,139 +19,6 @@ - - - - - - - - - - - - insert into - schisandra_auth_permission(`name`,parent_id,`type`,menu_url,`status`,`show`,icon,permission_key,created_by,created_time,update_by,update_time,is_deleted) - values - - (#{entity.name},#{entity.parentId},#{entity.type},#{entity.menuUrl},#{entity.status},#{entity.show},#{entity.icon},#{entity.permissionKey},#{entity.createdBy},#{entity.createdTime},#{entity.updateBy},#{entity.updateTime},#{entity.isDeleted}) - - - - - insert into - schisandra_auth_permission(`name`,parent_id,`type`,menu_url,`status`,`show`,icon,permission_key,created_by,created_time,update_by,update_time,is_deleted) - values - - (#{entity.name},#{entity.parentId},#{entity.type},#{entity.menuUrl},#{entity.status},#{entity.show},#{entity.icon},#{entity.permissionKey},#{entity.createdBy},#{entity.createdTime},#{entity.updateBy},#{entity.updateTime},#{entity.isDeleted}) - - on duplicate key update - name = values(name)parent_id = values(parent_id)type = values(type)menu_url = values(menu_url)status = - values(status)show = values(show)icon = values(icon)permission_key = values(permission_key)created_by = - values(created_by)created_time = values(created_time)update_by = values(update_by)update_time = - values(update_time)is_deleted = values(is_deleted) - - diff --git a/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-infra/src/main/resources/mapper/SchisandraAuthRoleDao.xml b/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-infra/src/main/resources/mapper/SchisandraAuthRoleDao.xml index 3222bfd..aa50c76 100644 --- a/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-infra/src/main/resources/mapper/SchisandraAuthRoleDao.xml +++ b/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-infra/src/main/resources/mapper/SchisandraAuthRoleDao.xml @@ -13,100 +13,5 @@ - - - - - - - - - - - - insert into schisandra_auth_role(role_name,role_key,created_by,created_time,update_by,update_time,is_deleted) - values - - (#{entity.roleName},#{entity.roleKey},#{entity.createdBy},#{entity.createdTime},#{entity.updateBy},#{entity.updateTime},#{entity.isDeleted}) - - - - - insert into schisandra_auth_role(role_name,role_key,created_by,created_time,update_by,update_time,is_deleted) - values - - (#{entity.roleName},#{entity.roleKey},#{entity.createdBy},#{entity.createdTime},#{entity.updateBy},#{entity.updateTime},#{entity.isDeleted}) - - on duplicate key update - role_name = values(role_name)role_key = values(role_key)created_by = values(created_by)created_time = - values(created_time)update_by = values(update_by)update_time = values(update_time)is_deleted = - values(is_deleted) - - - diff --git a/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-infra/src/main/resources/mapper/SchisandraSmsConfigDao.xml b/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-infra/src/main/resources/mapper/SchisandraSmsConfigDao.xml index 16e2d4d..4240b75 100644 --- a/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-infra/src/main/resources/mapper/SchisandraSmsConfigDao.xml +++ b/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-infra/src/main/resources/mapper/SchisandraSmsConfigDao.xml @@ -48,482 +48,5 @@ - - - - - - - - - - - - - - insert into schisandra_sms_config(config_id,request_url,template_name,action,region,access_key_id,access_key_secret,supplier,signature,sdk_app_id,template_id,weight,retry_interval,max_retries,maximum,base_url,server_ip,server_port,sender,status_call_back,url,template_url,code_url,verify_url,need_up,conn_timeout,is_simple,callback_url,mch_id,app_key,app_id,version,single_msg_url,mass_msg_url,signature_Id,created_by,created_time,update_time,update_by,is_deleted,extra_json,service - ) - values (#{configId},#{requestUrl},#{templateName},#{action},#{region},#{accessKeyId},#{accessKeySecret},#{supplier},#{signature},#{sdkAppId},#{templateId},#{weight},#{retryInterval},#{maxRetries},#{maximum},#{baseUrl},#{serverIp},#{serverPort},#{sender},#{statusCallBack},#{url},#{templateUrl},#{codeUrl},#{verifyUrl},#{needUp},#{connTimeout},#{isSimple},#{callbackUrl},#{mchId},#{appKey},#{appId},#{version},#{singleMsgUrl},#{massMsgUrl},#{signatureId},#{createdBy},#{createdTime},#{updateTime},#{updateBy},#{isDeleted},#{extraJson},#{service}) - - - - insert into - schisandra_sms_config(config_id,request_url,template_name,action,region,access_key_id,access_key_secret,supplier,signature,sdk_app_id,template_id,weight,retry_interval,max_retries,maximum,base_url,server_ip,server_port,sender,status_call_back,url,template_url,code_url,verify_url,need_up,conn_timeout,is_simple,callback_url,mch_id,app_key,app_id,version,single_msg_url,mass_msg_url,signature_Id,created_by,created_time,update_time,update_by,is_deleted,extra_json,service - ) - values - - (#{entity.configId},#{entity.requestUrl},#{entity.templateName},#{entity.action},#{entity.region},#{entity.accessKeyId},#{entity.accessKeySecret},#{entity.supplier},#{entity.signature},#{entity.sdkAppId},#{entity.templateId},#{entity.weight},#{entity.retryInterval},#{entity.maxRetries},#{entity.maximum},#{entity.baseUrl},#{entity.serverIp},#{entity.serverPort},#{entity.sender},#{entity.statusCallBack},#{entity.url},#{entity.templateUrl},#{entity.codeUrl},#{entity.verifyUrl},#{entity.needUp},#{entity.connTimeout},#{entity.isSimple},#{entity.callbackUrl},#{entity.mchId},#{entity.appKey},#{entity.appId},#{entity.version},#{entity.singleMsgUrl},#{entity.massMsgUrl},#{entity.signatureId},#{entity.createdBy},#{entity.createdTime},#{entity.updateTime},#{entity.updateBy},#{entity.isDeleted},#{entity.extraJson},#{entity.service}) - - - - - insert into - schisandra_sms_config(config_id,request_url,template_name,action,region,access_key_id,access_key_secret,supplier,signature,sdk_app_id,template_id,weight,retry_interval,max_retries,maximum,base_url,server_ip,server_port,sender,status_call_back,url,template_url,code_url,verify_url,need_up,conn_timeout,is_simple,callback_url,mch_id,app_key,app_id,version,single_msg_url,mass_msg_url,signature_Id,created_by,created_time,update_time,update_by,is_deleted,extra_json,service - ) - values - - (#{entity.configId},#{entity.requestUrl},#{entity.templateName},#{entity.action},#{entity.region},#{entity.accessKeyId},#{entity.accessKeySecret},#{entity.supplier},#{entity.signature},#{entity.sdkAppId},#{entity.templateId},#{entity.weight},#{entity.retryInterval},#{entity.maxRetries},#{entity.maximum},#{entity.baseUrl},#{entity.serverIp},#{entity.serverPort},#{entity.sender},#{entity.statusCallBack},#{entity.url},#{entity.templateUrl},#{entity.codeUrl},#{entity.verifyUrl},#{entity.needUp},#{entity.connTimeout},#{entity.isSimple},#{entity.callbackUrl},#{entity.mchId},#{entity.appKey},#{entity.appId},#{entity.version},#{entity.singleMsgUrl},#{entity.massMsgUrl},#{entity.signatureId},#{entity.createdBy},#{entity.createdTime},#{entity.updateTime},#{entity.updateBy},#{entity.isDeleted},#{entity.extraJson},#{entity.service}) - - on duplicate key update - config_id = values(config_id)request_url = values(request_url)template_name = values(template_name)action = - values(action)region = values(region)access_key_id = values(access_key_id)access_key_secret = - values(access_key_secret)supplier = values(supplier)signature = values(signature)sdk_app_id = - values(sdk_app_id)template_id = values(template_id)weight = values(weight)retry_interval = - values(retry_interval)max_retries = values(max_retries)maximum = values(maximum)base_url = - values(base_url)server_ip = values(server_ip)server_port = values(server_port)sender = - values(sender)status_call_back = values(status_call_back)url = values(url)template_url = - values(template_url)code_url = values(code_url)verify_url = values(verify_url)need_up = - values(need_up)conn_timeout = values(conn_timeout)is_simple = values(is_simple)callback_url = - values(callback_url)mch_id = values(mch_id)app_key = values(app_key)app_id = values(app_id)version = - values(version)single_msg_url = values(single_msg_url)mass_msg_url = values(mass_msg_url)signature_Id = - values(signature_Id)created_by = values(created_by)created_time = values(created_time)update_time = - values(update_time)update_by = values(update_by)is_deleted = values(is_deleted)extra_json = - values(extra_json)service = values(service) - - - - - update schisandra_sms_config - - - config_id = #{configId}, - - - request_url = #{requestUrl}, - - - template_name = #{templateName}, - - - action = #{action}, - - - region = #{region}, - - - access_key_id = #{accessKeyId}, - - - access_key_secret = #{accessKeySecret}, - - - supplier = #{supplier}, - - - signature = #{signature}, - - - sdk_app_id = #{sdkAppId}, - - - template_id = #{templateId}, - - - weight = #{weight}, - - - retry_interval = #{retryInterval}, - - - max_retries = #{maxRetries}, - - - maximum = #{maximum}, - - - base_url = #{baseUrl}, - - - server_ip = #{serverIp}, - - - server_port = #{serverPort}, - - - sender = #{sender}, - - - status_call_back = #{statusCallBack}, - - - url = #{url}, - - - template_url = #{templateUrl}, - - - code_url = #{codeUrl}, - - - verify_url = #{verifyUrl}, - - - need_up = #{needUp}, - - - conn_timeout = #{connTimeout}, - - - is_simple = #{isSimple}, - - - callback_url = #{callbackUrl}, - - - mch_id = #{mchId}, - - - app_key = #{appKey}, - - - app_id = #{appId}, - - - version = #{version}, - - - single_msg_url = #{singleMsgUrl}, - - - mass_msg_url = #{massMsgUrl}, - - - signature_Id = #{signatureId}, - - - created_by = #{createdBy}, - - - created_time = #{createdTime}, - - - update_time = #{updateTime}, - - - update_by = #{updateBy}, - - - is_deleted = #{isDeleted}, - - - extra_json = #{extraJson}, - - - service = #{service}, - - - where id = #{id} - - - - - delete - from schisandra_sms_config - where id = #{id} - - diff --git a/schisandra-cloud-storage-gateway/src/main/java/com/schisandra/gateway/exception/GatewayExceptionHandler.java b/schisandra-cloud-storage-gateway/src/main/java/com/schisandra/gateway/exception/GatewayExceptionHandler.java index fb262ce..6519b2d 100644 --- a/schisandra-cloud-storage-gateway/src/main/java/com/schisandra/gateway/exception/GatewayExceptionHandler.java +++ b/schisandra-cloud-storage-gateway/src/main/java/com/schisandra/gateway/exception/GatewayExceptionHandler.java @@ -29,7 +29,7 @@ public class GatewayExceptionHandler implements ErrorWebExceptionHandler { public Mono handle(ServerWebExchange serverWebExchange, Throwable throwable) { ServerHttpRequest request = serverWebExchange.getRequest(); ServerHttpResponse response = serverWebExchange.getResponse(); - Integer code=200; + int code=200; String message=""; if(throwable instanceof SaTokenException){ code=401;