diff --git a/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-application/schisandra-cloud-storage-auth-application-controller/pom.xml b/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-application/schisandra-cloud-storage-auth-application-controller/pom.xml index c300f41..860327c 100644 --- a/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-application/schisandra-cloud-storage-auth-application-controller/pom.xml +++ b/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-application/schisandra-cloud-storage-auth-application-controller/pom.xml @@ -66,11 +66,5 @@ schisandra-cloud-storage-auth-api 1.0-SNAPSHOT - - com.xkcoding - justauth-spring-boot-starter - 1.1.0 - compile - 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 c69e742..70e05b3 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 @@ -12,9 +12,9 @@ import java.util.List; /** * @Classname GlobalConfig - * @BelongsProject: qing-yu-club + * @BelongsProject: schisandra-cloud-storage * @BelongsPackage: com.schisandra.auth.application.config - * @Author: landaiqing + * @Author: schisandra * @CreateTime: 2024-02-16 15:57 * @Description: MVC全局处理 * @Version: 1.0 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/SmsInitConfig.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/SmsInitConfig.java index 3df73ac..ec71925 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/SmsInitConfig.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/SmsInitConfig.java @@ -1,31 +1,17 @@ package com.schisandra.auth.application.config; -import com.schisandra.auth.application.convert.SchisandraSmsConfigDTOConvert; -import com.schisandra.auth.application.dto.SchisandraSmsConfigDTO; -import com.schisandra.auth.domain.bo.SchisandraSmsConfigBO; -import com.schisandra.auth.domain.service.SchisandraSmsConfigDomainService; -import com.schisandra.auth.infra.basic.entity.SchisandraSmsConfig; import org.dromara.sms4j.core.factory.SmsFactory; import org.springframework.context.annotation.Configuration; import org.springframework.context.event.ContextRefreshedEvent; import org.springframework.context.event.EventListener; import javax.annotation.Resource; -import java.util.List; @Configuration public class SmsInitConfig { @Resource SmsReadConfig smsReadConfig; - @Resource - SchisandraSmsConfigDomainService schisandraSmsConfigDomainService; @EventListener - public void init(ContextRefreshedEvent event){ - List SchisandraSmsConfigBOs= schisandraSmsConfigDomainService.queryAll(); - List schisandraSmsConfigDTOS = SchisandraSmsConfigDTOConvert.INSTANCE.convertBOToDTOList(SchisandraSmsConfigBOs); - for (SchisandraSmsConfigDTO schisandraSmsConfig : schisandraSmsConfigDTOS){ - if (schisandraSmsConfig!=null){ - // 创建SmsBlend 短信实例 - SmsFactory.createSmsBlend(smsReadConfig); - }; - }} + public void init(ContextRefreshedEvent event) { + SmsFactory.createSmsBlend(smsReadConfig, "alibaba"); + } } 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/SmsReadConfig.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/SmsReadConfig.java index ac40ceb..d5df0ab 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/SmsReadConfig.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/SmsReadConfig.java @@ -1,88 +1,39 @@ package com.schisandra.auth.application.config; -import com.schisandra.auth.application.convert.SchisandraSmsConfigDTOConvert; -import com.schisandra.auth.application.dto.SchisandraSmsConfigDTO; -import com.schisandra.auth.domain.bo.SchisandraSmsConfigBO; -import com.schisandra.auth.domain.service.SchisandraSmsConfigDomainService; -import com.schisandra.auth.infra.basic.dao.SchisandraSmsConfigDao; -import com.schisandra.auth.infra.basic.entity.SchisandraSmsConfig; -import org.dromara.sms4j.aliyun.config.AlibabaConfig; -import org.dromara.sms4j.huawei.config.HuaweiConfig; +import com.schisandra.auth.application.factory.SmsTypeHandlerFactory; +import com.schisandra.auth.application.handler.SchisandraSmsTypeHandler; import org.dromara.sms4j.provider.config.BaseConfig; -import org.dromara.sms4j.tencent.config.TencentConfig; import org.springframework.stereotype.Component; import javax.annotation.Resource; -import java.util.ArrayList; import java.util.List; /** * @Classname SmsConfig * @BelongsProject: schisandra-cloud-storage * @BelongsPackage: com.schisandra.auth.common.config - * @Author: landaiqing + * @Author: schisandra * @CreateTime: 2024-05-08 18:46 * @Description: TODO * @Version: 1.0 */ @Component public class SmsReadConfig implements org.dromara.sms4j.core.datainterface.SmsReadConfig { + + @Resource - SchisandraSmsConfigDomainService schisandraSmsConfigDomainService; + private SmsTypeHandlerFactory smsTypeHandlerFactory; @Override public BaseConfig getSupplierConfig(String configId) { - return null; + SchisandraSmsTypeHandler handler = smsTypeHandlerFactory.getHandler(configId); + return handler.addConfig(configId); } @Override public List getSupplierConfigList() { - List configs = new ArrayList<>(); - List SchisandraSmsConfigBOs= schisandraSmsConfigDomainService.queryAll(); - List schisandraSmsConfigDTOS = SchisandraSmsConfigDTOConvert.INSTANCE.convertBOToDTOList(SchisandraSmsConfigBOs); - for (SchisandraSmsConfigDTO schisandraSmsConfig : schisandraSmsConfigDTOS){ - if ("alibaba".equals(schisandraSmsConfig.getConfigId())) { - AlibabaConfig alibabaConfig = new AlibabaConfig(); - alibabaConfig.setConfigId(schisandraSmsConfig.getConfigId()); - alibabaConfig.setRequestUrl(schisandraSmsConfig.getRequestUrl()); - alibabaConfig.setAccessKeyId(schisandraSmsConfig.getAccessKeyId()); - alibabaConfig.setAccessKeySecret(schisandraSmsConfig.getAccessKeySecret()); - alibabaConfig.setSignature(schisandraSmsConfig.getSignature()); - alibabaConfig.setTemplateId(schisandraSmsConfig.getTemplateId()); - alibabaConfig.setTemplateName(schisandraSmsConfig.getTemplateName()); - alibabaConfig.setSdkAppId(schisandraSmsConfig.getSdkAppId()); - configs.add(alibabaConfig); - } - if ("tencent".equals(schisandraSmsConfig.getConfigId())) { - TencentConfig tencentConfig=new TencentConfig(); - tencentConfig.setConfigId(schisandraSmsConfig.getConfigId()); - tencentConfig.setAccessKeyId(schisandraSmsConfig.getAccessKeyId()); - tencentConfig.setAccessKeySecret(schisandraSmsConfig.getAccessKeySecret()); - tencentConfig.setSdkAppId(schisandraSmsConfig.getSdkAppId()); - tencentConfig.setService(schisandraSmsConfig.getSdkAppId()); - tencentConfig.setRequestUrl(schisandraSmsConfig.getRequestUrl()); - tencentConfig.setTerritory(schisandraSmsConfig.getRegion()); - tencentConfig.setAction(schisandraSmsConfig.getAction()); - tencentConfig.setSignature(schisandraSmsConfig.getSignature()); - tencentConfig.setTemplateId(schisandraSmsConfig.getTemplateId()); - tencentConfig.setVersion(schisandraSmsConfig.getVersion()); - tencentConfig.setConnTimeout(schisandraSmsConfig.getConnTimeout()); - tencentConfig.setSdkAppId(schisandraSmsConfig.getSdkAppId()); - configs.add(tencentConfig); - } - if ("huawei".equals(schisandraSmsConfig.getConfigId())) { - HuaweiConfig huaweiConfig = new HuaweiConfig(); - huaweiConfig.setConfigId(schisandraSmsConfig.getConfigId()); - huaweiConfig.setSdkAppId(schisandraSmsConfig.getSdkAppId()); - huaweiConfig.setAccessKeySecret(schisandraSmsConfig.getAccessKeySecret()); - huaweiConfig.setAccessKeyId(schisandraSmsConfig.getAccessKeyId()); - huaweiConfig.setUrl(schisandraSmsConfig.getUrl()); - huaweiConfig.setSignature(schisandraSmsConfig.getSignature()); - huaweiConfig.setTemplateId(schisandraSmsConfig.getTemplateId()); - configs.add(huaweiConfig); - }} - return configs; + return null; } 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/controller/ReactRotateCaptchaController.java b/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-application/schisandra-cloud-storage-auth-application-controller/src/main/java/com/schisandra/auth/application/controller/ReactRotateCaptchaController.java index 462ab97..0be7798 100644 --- a/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-application/schisandra-cloud-storage-auth-application-controller/src/main/java/com/schisandra/auth/application/controller/ReactRotateCaptchaController.java +++ b/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-application/schisandra-cloud-storage-auth-application-controller/src/main/java/com/schisandra/auth/application/controller/ReactRotateCaptchaController.java @@ -1,28 +1,21 @@ package com.schisandra.auth.application.controller; -import cn.hutool.core.lang.Assert; - import com.schisandra.auth.application.dto.SchisandraCaptchaDTO; import com.schisandra.auth.common.entity.CaptchaResult; -import com.schisandra.auth.common.entity.Result; import com.schisandra.auth.common.redis.RedisUtil; import com.schisandra.auth.common.utils.AESUtils; import com.schisandra.auth.common.utils.RotateImageUtils; -import com.schisandra.auth.common.utils.SmsCodeUtils; import lombok.extern.slf4j.Slf4j; -import org.springframework.http.MediaType; -import org.springframework.http.ResponseEntity; -import org.springframework.web.bind.annotation.*; - +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; import javax.annotation.Resource; import javax.imageio.ImageIO; import java.awt.*; import java.awt.image.BufferedImage; -import java.io.*; -import java.security.NoSuchAlgorithmException; -import java.security.SecureRandom; -import java.util.Base64; +import java.io.InputStream; import java.util.HashMap; import java.util.Random; import java.util.concurrent.TimeUnit; @@ -39,7 +32,7 @@ public class ReactRotateCaptchaController { public final String authRotateCaptchaPrefix = "auth.RotateCaptcha"; /** - * @description:获取图片 + * @description: 获取图片 * @param: [] * @return: java.lang.String * @author zlg @@ -89,7 +82,6 @@ public class ReactRotateCaptchaController { redisUtil.del(prefix); return CaptchaResult.ok(); } else { - redisUtil.del(prefix); return CaptchaResult.fail(); } } else { 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/controller/SchisandraAuthUserController.java b/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-application/schisandra-cloud-storage-auth-application-controller/src/main/java/com/schisandra/auth/application/controller/SchisandraAuthUserController.java index d70309f..4193cbd 100644 --- a/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-application/schisandra-cloud-storage-auth-application-controller/src/main/java/com/schisandra/auth/application/controller/SchisandraAuthUserController.java +++ b/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-application/schisandra-cloud-storage-auth-application-controller/src/main/java/com/schisandra/auth/application/controller/SchisandraAuthUserController.java @@ -14,7 +14,7 @@ import javax.annotation.Resource; * @Classname SchisandraAuthUserController * @BelongsProject: schisandra-cloud-storage * @BelongsPackage: com.schisandra.auth.application.controller - * @Author: landaiqing + * @Author: schisandra * @CreateTime: 2024-03-21 22:48 * @Description: AuthUserController层 * @Version: 1.0 @@ -29,7 +29,7 @@ public class SchisandraAuthUserController { * @description 更新用户信息 * @param schisandraAuthUserDTO * @return com.schisandra.auth.common.entity.Result - * @author landaiqing + * @author schisandra * @date 2024/3/21 23:06 */ @PostMapping("update") @@ -111,7 +111,7 @@ public class SchisandraAuthUserController { * @description 用户信息断言校验 * @param schisandraAuthUserDTO * @return void - * @author landaiqing + * @author schisandra * @date 2024/3/21 23:09 */ private void checkUserInfo(@RequestBody SchisandraAuthUserDTO schisandraAuthUserDTO) { 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/controller/SchisandraSmsController.java b/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-application/schisandra-cloud-storage-auth-application-controller/src/main/java/com/schisandra/auth/application/controller/SchisandraSmsController.java index db7f73a..ea6d06e 100644 --- a/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-application/schisandra-cloud-storage-auth-application-controller/src/main/java/com/schisandra/auth/application/controller/SchisandraSmsController.java +++ b/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-application/schisandra-cloud-storage-auth-application-controller/src/main/java/com/schisandra/auth/application/controller/SchisandraSmsController.java @@ -1,10 +1,14 @@ package com.schisandra.auth.application.controller; +import com.schisandra.auth.application.config.SmsReadConfig; +import com.schisandra.auth.application.factory.SmsTypeHandlerFactory; +import com.schisandra.auth.application.handler.SchisandraSmsTypeHandler; import com.schisandra.auth.common.entity.Result; import com.schisandra.auth.common.redis.RedisUtil; import com.schisandra.auth.common.utils.SmsCodeUtils; import lombok.extern.slf4j.Slf4j; +import org.dromara.sms4j.api.SmsBlend; import org.dromara.sms4j.api.entity.SmsResponse; import org.dromara.sms4j.core.factory.SmsFactory; import org.springframework.web.bind.annotation.GetMapping; @@ -21,6 +25,8 @@ import static java.util.concurrent.TimeUnit.SECONDS; public class SchisandraSmsController { @Resource private RedisUtil redisUtil; + @Resource + private SmsReadConfig smsReadConfig; private final String authPhonePrefix="auth.phone"; /** @@ -35,7 +41,7 @@ public class SchisandraSmsController { String prefix = redisUtil.buildKey(authPhonePrefix, phone); String code = SmsCodeUtils.generateValidateCode(4).toString(); if (!redisUtil.exist(prefix)){ - SmsResponse smsResponse=SmsFactory.getBySupplier("alibaba").sendMessage(phone,code); + SmsResponse smsResponse=SmsFactory.getSmsBlend("alibaba").sendMessage(phone,code); if (smsResponse.isSuccess()){ redisUtil.setNx(prefix, code, 60L,SECONDS); return Result.ok(); 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/convert/SchisandraAuthRoleDTOConverter.java b/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-application/schisandra-cloud-storage-auth-application-controller/src/main/java/com/schisandra/auth/application/convert/SchisandraAuthRoleDTOConverter.java index ec78979..ab90f3e 100644 --- a/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-application/schisandra-cloud-storage-auth-application-controller/src/main/java/com/schisandra/auth/application/convert/SchisandraAuthRoleDTOConverter.java +++ b/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-application/schisandra-cloud-storage-auth-application-controller/src/main/java/com/schisandra/auth/application/convert/SchisandraAuthRoleDTOConverter.java @@ -25,7 +25,7 @@ public interface SchisandraAuthRoleDTOConverter { * @param authRoleDTO * @return com.schisandra.auth.domain.bo.SchisandraAuthRoleBO * @description DTO转BO - * @author landaiqing + * @author schisandra * @date 2024/3/21 23:11 */ @@ -35,7 +35,7 @@ public interface SchisandraAuthRoleDTOConverter { * @description: BO转DTO * @param: [authUserBO] * @return: com.schisandra.auth.application.dto.SchisandraAuthRoleDTO - * @author: landaiqing + * @author: schisandra * @date: 2024/3/21 23:26 */ SchisandraAuthRoleDTO convertBOToDTO(SchisandraAuthRoleBO authRoleBO); 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/convert/SchisandraAuthUserDTOConverter.java b/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-application/schisandra-cloud-storage-auth-application-controller/src/main/java/com/schisandra/auth/application/convert/SchisandraAuthUserDTOConverter.java index faac2ac..8caa0ca 100644 --- a/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-application/schisandra-cloud-storage-auth-application-controller/src/main/java/com/schisandra/auth/application/convert/SchisandraAuthUserDTOConverter.java +++ b/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-application/schisandra-cloud-storage-auth-application-controller/src/main/java/com/schisandra/auth/application/convert/SchisandraAuthUserDTOConverter.java @@ -8,7 +8,7 @@ import org.mapstruct.factory.Mappers; /** * 用户dto转换器 * - * @author landaiqing + * @author schisandra */ @Mapper(componentModel = "spring") public interface SchisandraAuthUserDTOConverter { @@ -19,7 +19,7 @@ public interface SchisandraAuthUserDTOConverter { * @param authUserDTO * @return com.schisandra.auth.domain.bo.SchisandraAuthUserBO * @description DTO转BO - * @author landaiqing + * @author schisandra * @date 2024/3/21 23:11 */ @@ -29,7 +29,7 @@ public interface SchisandraAuthUserDTOConverter { * @description: BO转DTO * @param: [authUserBO] * @return: com.schisandra.auth.application.dto.SchisandraAuthUserDTO - * @author: landaiqing + * @author: schisandra * @date: 2024/3/21 23:26 */ SchisandraAuthUserDTO convertBOToDTO(SchisandraAuthUserBO authUserBO); 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/convert/SchisandraSmsConfigDTOConvert.java b/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-application/schisandra-cloud-storage-auth-application-controller/src/main/java/com/schisandra/auth/application/convert/SchisandraSmsConfigDTOConvert.java index 3484116..d06154d 100644 --- a/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-application/schisandra-cloud-storage-auth-application-controller/src/main/java/com/schisandra/auth/application/convert/SchisandraSmsConfigDTOConvert.java +++ b/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-application/schisandra-cloud-storage-auth-application-controller/src/main/java/com/schisandra/auth/application/convert/SchisandraSmsConfigDTOConvert.java @@ -23,7 +23,7 @@ public interface SchisandraSmsConfigDTOConvert { * @description 将bo转换为实体 * @param schisandraSmsConfigDTO * @return com.schisandra.auth.infra.basic.entity.SchisandraAuthUser - * @author landaiqing + * @author schisandra * @date 2024/3/21 23:13 */ SchisandraSmsConfigBO convertDTOToBO(SchisandraSmsConfigDTO schisandraSmsConfigDTO); @@ -32,7 +32,7 @@ public interface SchisandraSmsConfigDTOConvert { * @description 将实体转换为bo * @param schisandraSmsConfigBO * @return com.schisandra.auth.domain.bo.SchisandraAuthUserBO - * @author landaiqing + * @author schisandra * @date 2024/3/21 23:13 */ SchisandraSmsConfigDTO convertBOToDTO(SchisandraSmsConfigBO schisandraSmsConfigBO); 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/dto/SchisandraSmsConfigDTO.java b/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-application/schisandra-cloud-storage-auth-application-controller/src/main/java/com/schisandra/auth/application/dto/SchisandraSmsConfigDTO.java index 33127cc..84d41f2 100644 --- a/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-application/schisandra-cloud-storage-auth-application-controller/src/main/java/com/schisandra/auth/application/dto/SchisandraSmsConfigDTO.java +++ b/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-application/schisandra-cloud-storage-auth-application-controller/src/main/java/com/schisandra/auth/application/dto/SchisandraSmsConfigDTO.java @@ -148,6 +148,16 @@ public class SchisandraSmsConfigDTO implements Serializable { * 签名ID */ private String signatureId; + /** + * 是否删除 0 未删除 1已删除 + */ + private Integer isDeleted; + + private String extraJson; + /** + * 服务名 + */ + private String service; 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/factory/SmsTypeHandlerFactory.java b/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-application/schisandra-cloud-storage-auth-application-controller/src/main/java/com/schisandra/auth/application/factory/SmsTypeHandlerFactory.java new file mode 100644 index 0000000..a14b844 --- /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/factory/SmsTypeHandlerFactory.java @@ -0,0 +1,40 @@ +package com.schisandra.auth.application.factory; + +import com.schisandra.auth.application.handler.SchisandraSmsTypeHandler; +import com.schisandra.auth.common.enums.SmsSupplierType; +import org.springframework.beans.factory.InitializingBean; +import org.springframework.stereotype.Component; + +import javax.annotation.Resource; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +/** + * @Classname SmsTypeHandlerFactory + * @BelongsProject: schisandra-cloud-storage + * @BelongsPackage: com.schisandra.auth.application.factory + * @Author: schisandra + * @CreateTime: 2024-05-11 18:36 + * @Description: TODO + * @Version: 1.0 + */ +@Component +public class SmsTypeHandlerFactory implements InitializingBean { + @Resource + private List smsTypeHandlerList; + + private HashMap handlerMap =new HashMap<>(); + + public SchisandraSmsTypeHandler getHandler(String configId){ + SmsSupplierType smsSupplierType = SmsSupplierType.getByKey(configId); + return handlerMap.get(smsSupplierType); + } + + @Override + public void afterPropertiesSet() throws Exception { + for(SchisandraSmsTypeHandler smsTypeHandler : smsTypeHandlerList){ + handlerMap.put(smsTypeHandler.getHandlerType(),smsTypeHandler); + } + } +} 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/handler/AlibabaSmsHandler.java b/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-application/schisandra-cloud-storage-auth-application-controller/src/main/java/com/schisandra/auth/application/handler/AlibabaSmsHandler.java new file mode 100644 index 0000000..2b05326 --- /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/handler/AlibabaSmsHandler.java @@ -0,0 +1,51 @@ +package com.schisandra.auth.application.handler; + +import com.schisandra.auth.application.convert.SchisandraSmsConfigDTOConvert; +import com.schisandra.auth.application.dto.SchisandraSmsConfigDTO; +import com.schisandra.auth.common.enums.SmsSupplierType; +import com.schisandra.auth.domain.bo.SchisandraSmsConfigBO; +import com.schisandra.auth.domain.service.SchisandraSmsConfigDomainService; +import org.apache.commons.lang3.ObjectUtils; +import org.dromara.sms4j.aliyun.config.AlibabaConfig; +import org.dromara.sms4j.provider.config.BaseConfig; +import org.springframework.stereotype.Component; + +import javax.annotation.Resource; + +/** + * @Classname AlibabaSmsHandler + * @BelongsProject: schisandra-cloud-storage + * @BelongsPackage: com.schisandra.auth.application.handler + * @Author: schisandra + * @CreateTime: 2024-05-11 18:20 + * @Description: TODO + * @Version: 1.0 + */ +@Component +public class AlibabaSmsHandler implements SchisandraSmsTypeHandler{ + @Resource + SchisandraSmsConfigDomainService schisandraSmsConfigDomainService; + @Override + public SmsSupplierType getHandlerType() { + return SmsSupplierType.ALIBABA; + } + + @Override + public BaseConfig addConfig(String configId) { + SchisandraSmsConfigBO schisandraSmsConfigBO = schisandraSmsConfigDomainService.queryByConfigId(configId); + SchisandraSmsConfigDTO schisandraSmsConfigDTO = SchisandraSmsConfigDTOConvert.INSTANCE.convertBOToDTO(schisandraSmsConfigBO); + if (ObjectUtils.isEmpty(schisandraSmsConfigDTO)){ + return null; + } + AlibabaConfig alibabaConfig=new AlibabaConfig(); + alibabaConfig.setConfigId(schisandraSmsConfigDTO.getConfigId()); + alibabaConfig.setRequestUrl(schisandraSmsConfigDTO.getRequestUrl()); + alibabaConfig.setAccessKeyId(schisandraSmsConfigDTO.getAccessKeyId()); + alibabaConfig.setAccessKeySecret(schisandraSmsConfigDTO.getAccessKeySecret()); + alibabaConfig.setSignature(schisandraSmsConfigDTO.getSignature()); + alibabaConfig.setTemplateId(schisandraSmsConfigDTO.getTemplateId()); + alibabaConfig.setTemplateName(schisandraSmsConfigDTO.getTemplateName()); + alibabaConfig.setSdkAppId(schisandraSmsConfigDTO.getSdkAppId()); + return alibabaConfig; + } +} 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/handler/SchisandraSmsTypeHandler.java b/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-application/schisandra-cloud-storage-auth-application-controller/src/main/java/com/schisandra/auth/application/handler/SchisandraSmsTypeHandler.java new file mode 100644 index 0000000..ba7288b --- /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/handler/SchisandraSmsTypeHandler.java @@ -0,0 +1,21 @@ +package com.schisandra.auth.application.handler; + +import com.schisandra.auth.common.enums.SmsSupplierType; +import org.dromara.sms4j.provider.config.BaseConfig; +import org.springframework.stereotype.Component; + +/** + * @Classname SchisandraSmsTypeHandler + * @BelongsProject: schisandra-cloud-storage + * @BelongsPackage: com.schisandra.auth.application.handler + * @Author: schisandra + * @CreateTime: 2024-05-11 18:04 + * @Description: TODO + * @Version: 1.0 + */ +@Component +public interface SchisandraSmsTypeHandler { + SmsSupplierType getHandlerType(); + + BaseConfig addConfig(String configId); +} diff --git a/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-common/pom.xml b/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-common/pom.xml index c8a657a..bc8b0de 100644 --- a/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-common/pom.xml +++ b/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-common/pom.xml @@ -110,14 +110,6 @@ - - - cn.hutool - hutool-all - 5.3.8 - - - org.apache.directory.studio org.apache.commons.codec @@ -125,9 +117,16 @@ - cn.hutool - hutool-extra - 5.8.27 + com.xkcoding + justauth-spring-boot-starter + 1.1.0 + compile + + + hutool-http + cn.hutool + + diff --git a/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-common/src/main/java/com/schisandra/auth/common/entity/CaptchaResult.java b/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-common/src/main/java/com/schisandra/auth/common/entity/CaptchaResult.java index 4eb6bb4..1d33885 100644 --- a/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-common/src/main/java/com/schisandra/auth/common/entity/CaptchaResult.java +++ b/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-common/src/main/java/com/schisandra/auth/common/entity/CaptchaResult.java @@ -32,14 +32,14 @@ public class CaptchaResult { CaptchaResult result = new CaptchaResult(); result.setCode(1); - result.setMsg("Fail"); + result.setMsg("验证失败"); return result; } public static CaptchaResult fail(T data) { CaptchaResult result = new CaptchaResult(); result.setCode(1); - result.setMsg("Fail"); + result.setMsg("验证失败"); result.setData(data); return result; } diff --git a/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-common/src/main/java/com/schisandra/auth/common/entity/PageInfo.java b/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-common/src/main/java/com/schisandra/auth/common/entity/PageInfo.java index 5ef3fe2..8b1e6b7 100644 --- a/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-common/src/main/java/com/schisandra/auth/common/entity/PageInfo.java +++ b/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-common/src/main/java/com/schisandra/auth/common/entity/PageInfo.java @@ -3,7 +3,7 @@ package com.schisandra.auth.common.entity; /** * 分页请求实体 * - * @author: landaiqing + * @author: schisandra */ public class PageInfo { diff --git a/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-common/src/main/java/com/schisandra/auth/common/entity/PageResult.java b/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-common/src/main/java/com/schisandra/auth/common/entity/PageResult.java index 7ef6714..c10c99f 100644 --- a/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-common/src/main/java/com/schisandra/auth/common/entity/PageResult.java +++ b/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-common/src/main/java/com/schisandra/auth/common/entity/PageResult.java @@ -9,7 +9,7 @@ import java.util.List; /** * 分页返回实体 * - * @author: landaiqing + * @author: schisandra */ @Data public class PageResult implements Serializable { diff --git a/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-common/src/main/java/com/schisandra/auth/common/entity/Result.java b/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-common/src/main/java/com/schisandra/auth/common/entity/Result.java index 19b788b..c773a49 100644 --- a/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-common/src/main/java/com/schisandra/auth/common/entity/Result.java +++ b/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-common/src/main/java/com/schisandra/auth/common/entity/Result.java @@ -5,7 +5,7 @@ import lombok.Data; /** * @description: 返回结果泛型类 - * @author: landaiqing + * @author: schisandra * @date: 2024/3/22 13:09 */ @Data diff --git a/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-common/src/main/java/com/schisandra/auth/common/enums/AuthUserStatusEnum.java b/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-common/src/main/java/com/schisandra/auth/common/enums/AuthUserStatusEnum.java index 8307ae4..ca74b21 100644 --- a/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-common/src/main/java/com/schisandra/auth/common/enums/AuthUserStatusEnum.java +++ b/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-common/src/main/java/com/schisandra/auth/common/enums/AuthUserStatusEnum.java @@ -5,7 +5,7 @@ import lombok.Getter; /** * 用户状态枚举 * - * @author: landaiqing + * @author: schisandra */ @Getter public enum AuthUserStatusEnum { diff --git a/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-common/src/main/java/com/schisandra/auth/common/enums/IsDeletedFlagEnum.java b/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-common/src/main/java/com/schisandra/auth/common/enums/IsDeletedFlagEnum.java index 0658e49..ce9c84a 100644 --- a/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-common/src/main/java/com/schisandra/auth/common/enums/IsDeletedFlagEnum.java +++ b/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-common/src/main/java/com/schisandra/auth/common/enums/IsDeletedFlagEnum.java @@ -5,7 +5,7 @@ import lombok.Getter; /** * 删除状态枚举 * - * @author: landaiqing + * @author: schisandra */ @Getter public enum IsDeletedFlagEnum { diff --git a/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-common/src/main/java/com/schisandra/auth/common/enums/ResultCodeEnum.java b/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-common/src/main/java/com/schisandra/auth/common/enums/ResultCodeEnum.java index 1dbf6e6..78ba114 100644 --- a/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-common/src/main/java/com/schisandra/auth/common/enums/ResultCodeEnum.java +++ b/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-common/src/main/java/com/schisandra/auth/common/enums/ResultCodeEnum.java @@ -4,7 +4,7 @@ import lombok.Getter; /** * @description: 返回结果状态枚举 - * @author: landaiqing + * @author: schisandra * @date: 2024/3/22 13:10 */ @Getter diff --git a/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-common/src/main/java/com/schisandra/auth/common/enums/SmsSupplierType.java b/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-common/src/main/java/com/schisandra/auth/common/enums/SmsSupplierType.java new file mode 100644 index 0000000..aef910d --- /dev/null +++ b/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-common/src/main/java/com/schisandra/auth/common/enums/SmsSupplierType.java @@ -0,0 +1,82 @@ +package com.schisandra.auth.common.enums; + +import lombok.Getter; + +@Getter +public enum SmsSupplierType { + /** + * 阿里云 + */ + ALIBABA("alibaba"), + /** + * 华为云 + */ + HUAWEI("huawei"), + /** + * 云片 + */ + YUNPIAN("yunpian"), + /** + * 腾讯云 + */ + TENCENT("tenxun"), + /** + * 合一短信 + */ + UNI_SMS("uni"), + /** + * 京东云 + */ + JD_CLOUD("jd"), + /** + * 容联云 + */ + CLOOPEN("cloopen"), + /** + * 亿美软通 + */ + EMAY("emay"), + /** + * 天翼云 + */ + CTYUN("ctyun"), + /** + * 网易云 + */ + WANGYIYUN("wangyiyun"), + /** + * 七牛云 + */ + QINIU("qiniu"), + /** + * 助通 + */ + ZHUTONG("zhutong"), + + /** + * 联麓 + */ + LIANLU("lianlu"), + + /** + * 鼎众 + */ + DINGZHONG("dingzhong"), + ; + public String key; + + SmsSupplierType(String key) { + this.key = key; + + } + + public static SmsSupplierType getByKey(String key) { + for (SmsSupplierType resultKeyEnum : SmsSupplierType.values()) { + if (resultKeyEnum.key.equals(key)) { + return resultKeyEnum; + } + } + return null; + } +} + diff --git a/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-common/src/main/java/com/schisandra/auth/common/redis/RedisConfig.java b/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-common/src/main/java/com/schisandra/auth/common/redis/RedisConfig.java index 8f2b55e..d49ed49 100644 --- a/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-common/src/main/java/com/schisandra/auth/common/redis/RedisConfig.java +++ b/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-common/src/main/java/com/schisandra/auth/common/redis/RedisConfig.java @@ -16,7 +16,7 @@ import org.springframework.data.redis.serializer.StringRedisSerializer; /** * Redis的config处理 * - * @author: landaiqing + * @author: schisandra */ @Configuration public class RedisConfig { diff --git a/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-common/src/main/java/com/schisandra/auth/common/redis/RedisUtil.java b/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-common/src/main/java/com/schisandra/auth/common/redis/RedisUtil.java index ebdb9f7..9a90064 100644 --- a/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-common/src/main/java/com/schisandra/auth/common/redis/RedisUtil.java +++ b/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-common/src/main/java/com/schisandra/auth/common/redis/RedisUtil.java @@ -13,7 +13,7 @@ import java.util.stream.Stream; /** * RedisUtil工具类 * - * @author: landaiqing + * @author: schisandra * @date: 2024/2/19 */ @Component diff --git a/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-common/src/main/java/com/schisandra/auth/common/utils/RotateImageUtils.java b/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-common/src/main/java/com/schisandra/auth/common/utils/RotateImageUtils.java index 2a3b6dd..5bf47e6 100644 --- a/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-common/src/main/java/com/schisandra/auth/common/utils/RotateImageUtils.java +++ b/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-common/src/main/java/com/schisandra/auth/common/utils/RotateImageUtils.java @@ -1,18 +1,16 @@ package com.schisandra.auth.common.utils; -import sun.misc.BASE64Decoder; -import sun.misc.BASE64Encoder; +import java.util.Base64; +import java.util.Base64.Encoder; +import java.util.Base64.Decoder; import javax.imageio.ImageIO; import java.awt.*; import java.awt.image.BufferedImage; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; -import java.io.File; import java.io.IOException; import java.util.Arrays; -import java.util.LinkedHashMap; -import java.util.Map; public class RotateImageUtils { @@ -45,8 +43,8 @@ public class RotateImageUtils { ByteArrayOutputStream baos = new ByteArrayOutputStream();//io流 ImageIO.write(outputImage, "png", baos);//写入流中 byte[] bytes = baos.toByteArray();//转换成字节 - BASE64Encoder encoder = new BASE64Encoder(); - String png_base64 = encoder.encodeBuffer(bytes).trim();//转换成base64串 + Encoder encoder = Base64.getEncoder(); + String png_base64 = encoder.encodeToString(bytes);//转换成base64串 png_base64 = png_base64.replaceAll("\n", "").replaceAll("\r", "");//删除 \r\n return "data:image/jpg;base64," + png_base64; @@ -60,9 +58,9 @@ public class RotateImageUtils { * @date: 2024/5/9 13:14 */ public static BufferedImage base64ToBufferedImage(String base64) { - BASE64Decoder decoder = new sun.misc.BASE64Decoder(); + Decoder decoder = Base64.getDecoder(); try { - byte[] bytes1 = decoder.decodeBuffer(base64); + byte[] bytes1 = decoder.decode(base64); ByteArrayInputStream bais = new ByteArrayInputStream(bytes1); return ImageIO.read(bais); } catch (IOException e) { diff --git a/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-domain/src/main/java/com/schisandra/auth/domain/bo/SchisandraSmsConfigBO.java b/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-domain/src/main/java/com/schisandra/auth/domain/bo/SchisandraSmsConfigBO.java index 7d574e5..a8c861a 100644 --- a/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-domain/src/main/java/com/schisandra/auth/domain/bo/SchisandraSmsConfigBO.java +++ b/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-domain/src/main/java/com/schisandra/auth/domain/bo/SchisandraSmsConfigBO.java @@ -148,6 +148,16 @@ public class SchisandraSmsConfigBO implements Serializable { * 签名ID */ private String signatureId; + /** + * 是否删除 0 未删除 1已删除 + */ + private Integer isDeleted; + + private String extraJson; + /** + * 服务名 + */ + private String service; diff --git a/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-domain/src/main/java/com/schisandra/auth/domain/convert/SchisandraAuthRoleBOConverter.java b/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-domain/src/main/java/com/schisandra/auth/domain/convert/SchisandraAuthRoleBOConverter.java index ef98e4c..2f603ca 100644 --- a/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-domain/src/main/java/com/schisandra/auth/domain/convert/SchisandraAuthRoleBOConverter.java +++ b/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-domain/src/main/java/com/schisandra/auth/domain/convert/SchisandraAuthRoleBOConverter.java @@ -24,7 +24,7 @@ public interface SchisandraAuthRoleBOConverter { * @description 将bo转换为实体 * @param schisandraAuthRoleBO * @return com.schisandra.auth.infra.basic.entity.SchisandraRoleUser - * @author landaiqing + * @author schisandra * @date 2024/3/21 23:13 */ SchisandraAuthRole convertBOToEntity(SchisandraAuthRoleBO schisandraAuthRoleBO); @@ -33,7 +33,7 @@ public interface SchisandraAuthRoleBOConverter { * @description 将实体转换为bo * @param schisandraAuthRole * @return com.schisandra.auth.domain.bo.SchisandraAuthRoleBO - * @author landaiqing + * @author schisandra * @date 2024/3/21 23:13 */ SchisandraAuthRoleBO convertEntityToBO(SchisandraAuthRole schisandraAuthRole); diff --git a/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-domain/src/main/java/com/schisandra/auth/domain/convert/SchisandraAuthUserBOConverter.java b/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-domain/src/main/java/com/schisandra/auth/domain/convert/SchisandraAuthUserBOConverter.java index 5da55db..a34bbf1 100644 --- a/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-domain/src/main/java/com/schisandra/auth/domain/convert/SchisandraAuthUserBOConverter.java +++ b/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-domain/src/main/java/com/schisandra/auth/domain/convert/SchisandraAuthUserBOConverter.java @@ -8,7 +8,7 @@ import org.mapstruct.factory.Mappers; /** * 用户bo转换器 * - * @author landaiqing + * @author schisandra * @date 2024/3/21 */ @Mapper(componentModel = "spring") @@ -20,7 +20,7 @@ public interface SchisandraAuthUserBOConverter { * @description 将bo转换为实体 * @param schisandraAuthUserBO * @return com.schisandra.auth.infra.basic.entity.SchisandraAuthUser - * @author landaiqing + * @author schisandra * @date 2024/3/21 23:13 */ SchisandraAuthUser convertBOToEntity(SchisandraAuthUserBO schisandraAuthUserBO); @@ -29,7 +29,7 @@ public interface SchisandraAuthUserBOConverter { * @description 将实体转换为bo * @param schisandraAuthUser * @return com.schisandra.auth.domain.bo.SchisandraAuthUserBO - * @author landaiqing + * @author schisandra * @date 2024/3/21 23:13 */ SchisandraAuthUserBO convertEntityToBO(SchisandraAuthUser schisandraAuthUser); diff --git a/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-domain/src/main/java/com/schisandra/auth/domain/convert/SchisandraSmsConfigBOConvert.java b/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-domain/src/main/java/com/schisandra/auth/domain/convert/SchisandraSmsConfigBOConvert.java index 2a5a579..a3247fb 100644 --- a/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-domain/src/main/java/com/schisandra/auth/domain/convert/SchisandraSmsConfigBOConvert.java +++ b/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-domain/src/main/java/com/schisandra/auth/domain/convert/SchisandraSmsConfigBOConvert.java @@ -27,7 +27,7 @@ public interface SchisandraSmsConfigBOConvert { * @description 将bo转换为实体 * @param schisandraSmsConfigBO * @return com.schisandra.auth.infra.basic.entity.SchisandraAuthUser - * @author landaiqing + * @author schisandra * @date 2024/3/21 23:13 */ SchisandraSmsConfig convertBOToEntity(SchisandraSmsConfigBO schisandraSmsConfigBO); @@ -36,7 +36,7 @@ public interface SchisandraSmsConfigBOConvert { * @description 将实体转换为bo * @param schisandraSmsConfig * @return com.schisandra.auth.domain.bo.SchisandraAuthUserBO - * @author landaiqing + * @author schisandra * @date 2024/3/21 23:13 */ SchisandraSmsConfigBO convertEntityToBO(SchisandraSmsConfig schisandraSmsConfig); diff --git a/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-domain/src/main/java/com/schisandra/auth/domain/service/SchisandraAuthUserDomainService.java b/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-domain/src/main/java/com/schisandra/auth/domain/service/SchisandraAuthUserDomainService.java index 276339f..44689f2 100644 --- a/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-domain/src/main/java/com/schisandra/auth/domain/service/SchisandraAuthUserDomainService.java +++ b/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-domain/src/main/java/com/schisandra/auth/domain/service/SchisandraAuthUserDomainService.java @@ -7,7 +7,7 @@ import com.schisandra.auth.infra.basic.entity.SchisandraAuthUser; /** * 用户领域service * - * @author landaiqing + * @author schisandra * @date 2024/3/21 */ public interface SchisandraAuthUserDomainService { @@ -16,7 +16,7 @@ public interface SchisandraAuthUserDomainService { * @description 更新用户信息 * @param schisandraAuthUserBO * @return java.lang.Object - * @author landaiqing + * @author schisandra * @date 2024/3/21 23:14 */ Object update(SchisandraAuthUserBO schisandraAuthUserBO); 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 68b55bf..9301cac 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 @@ -9,7 +9,7 @@ import java.util.List; /** * 用户领域service * - * @author landaiqing + * @author schisandra * @date 2024/3/21 */ public interface SchisandraSmsConfigDomainService { @@ -18,5 +18,7 @@ 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/SchisandraAuthUserDomainServiceImpl.java b/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-domain/src/main/java/com/schisandra/auth/domain/service/impl/SchisandraAuthUserDomainServiceImpl.java index 4fa075a..61cbcd7 100644 --- a/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-domain/src/main/java/com/schisandra/auth/domain/service/impl/SchisandraAuthUserDomainServiceImpl.java +++ b/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-domain/src/main/java/com/schisandra/auth/domain/service/impl/SchisandraAuthUserDomainServiceImpl.java @@ -21,7 +21,7 @@ public class SchisandraAuthUserDomainServiceImpl implements SchisandraAuthUserDo * @description 更新用户信息 * @param schisandraAuthUserBO * @return java.lang.Object - * @author landaiqing + * @author schisandra * @date 2024/3/21 23:14 */ @Override 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 1a5056d..03e17c3 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 @@ -23,4 +23,12 @@ public class SchisandraSmsConfigDomainServiceImpl implements SchisandraSmsConfig } + @Override + public SchisandraSmsConfigBO queryByConfigId(String configId) { + SchisandraSmsConfig schisandraSmsConfig= schisandraSmsConfigService.queryByConfigId(configId); + + SchisandraSmsConfigBO schisandraSmsConfigBO = SchisandraSmsConfigBOConvert.INSTANCE.convertEntityToBO(schisandraSmsConfig); + return schisandraSmsConfigBO; + } + } diff --git a/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-infra/src/main/java/com/schisandra/auth/infra/basic/dao/SchisandraAuthUserDao.java b/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-infra/src/main/java/com/schisandra/auth/infra/basic/dao/SchisandraAuthUserDao.java index ec50c94..3cad532 100644 --- a/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-infra/src/main/java/com/schisandra/auth/infra/basic/dao/SchisandraAuthUserDao.java +++ b/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-infra/src/main/java/com/schisandra/auth/infra/basic/dao/SchisandraAuthUserDao.java @@ -9,7 +9,7 @@ import java.util.List; /** * (SchisandraAuthUser)表数据库访问层 * - * @author landaiqing + * @author schisandra * @since 2024-03-21 20:15:43 */ public interface SchisandraAuthUserDao { 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 fdd11b0..22b0f46 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 @@ -10,7 +10,7 @@ import java.util.List; * (SchisandraSmsConfig)表数据库访问层 * * @author makejava - * @since 2024-05-08 20:09:54 + * @since 2024-05-11 15:47:58 */ public interface SchisandraSmsConfigDao { @@ -31,8 +31,6 @@ public interface SchisandraSmsConfigDao { */ List queryAllByLimit(SchisandraSmsConfig schisandraSmsConfig, @Param("pageable") Pageable pageable); - List queryAll(); - /** * 统计总行数 * @@ -82,5 +80,8 @@ public interface SchisandraSmsConfigDao { */ 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/entity/SchisandraSmsConfig.java b/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-infra/src/main/java/com/schisandra/auth/infra/basic/entity/SchisandraSmsConfig.java index 4a264cc..913ae7e 100644 --- a/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-infra/src/main/java/com/schisandra/auth/infra/basic/entity/SchisandraSmsConfig.java +++ b/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-infra/src/main/java/com/schisandra/auth/infra/basic/entity/SchisandraSmsConfig.java @@ -9,7 +9,7 @@ import java.io.Serializable; * (SchisandraSmsConfig)实体类 * * @author makejava - * @since 2024-05-08 20:09:54 + * @since 2024-05-11 15:47:59 */ @Data public class SchisandraSmsConfig implements Serializable { @@ -169,6 +169,11 @@ public class SchisandraSmsConfig implements Serializable { */ private Integer isDeleted; + private String extraJson; + /** + * 服务名 + */ + private String service; } diff --git a/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-infra/src/main/java/com/schisandra/auth/infra/basic/service/SchisandraAuthUserService.java b/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-infra/src/main/java/com/schisandra/auth/infra/basic/service/SchisandraAuthUserService.java index 3e3a56f..18f66e0 100644 --- a/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-infra/src/main/java/com/schisandra/auth/infra/basic/service/SchisandraAuthUserService.java +++ b/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-infra/src/main/java/com/schisandra/auth/infra/basic/service/SchisandraAuthUserService.java @@ -7,7 +7,7 @@ import org.springframework.data.domain.PageRequest; /** * (SchisandraAuthUser)表服务接口 * - * @author landaiqing + * @author schisandra * @since 2024-03-21 20:15:44 */ public interface SchisandraAuthUserService { 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 1ab2f35..41f650c 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 @@ -10,7 +10,7 @@ import java.util.List; * (SchisandraSmsConfig)表服务接口 * * @author makejava - * @since 2024-05-08 20:09:55 + * @since 2024-05-11 15:48:02 */ public interface SchisandraSmsConfigService { @@ -22,8 +22,6 @@ public interface SchisandraSmsConfigService { */ SchisandraSmsConfig queryById(Integer id); - List queryAll(); - /** * 分页查询 * @@ -57,4 +55,7 @@ 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/SchisandraAuthUserServiceImpl.java b/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-infra/src/main/java/com/schisandra/auth/infra/basic/service/impl/SchisandraAuthUserServiceImpl.java index d11fb89..459d562 100644 --- a/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-infra/src/main/java/com/schisandra/auth/infra/basic/service/impl/SchisandraAuthUserServiceImpl.java +++ b/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-infra/src/main/java/com/schisandra/auth/infra/basic/service/impl/SchisandraAuthUserServiceImpl.java @@ -13,7 +13,7 @@ import javax.annotation.Resource; /** * (SchisandraAuthUser)表服务实现类 * - * @author landaiqing + * @author schisandra * @since 2024-03-21 20:15:44 */ @Service("schisandraAuthUserService") 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 66f2ba7..798bcd4 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 @@ -15,7 +15,7 @@ import java.util.List; * (SchisandraSmsConfig)表服务实现类 * * @author makejava - * @since 2024-05-08 20:09:55 + * @since 2024-05-11 15:48:03 */ @Service("schisandraSmsConfigService") public class SchisandraSmsConfigServiceImpl implements SchisandraSmsConfigService { @@ -46,11 +46,6 @@ public class SchisandraSmsConfigServiceImpl implements SchisandraSmsConfigServic return new PageImpl<>(this.schisandraSmsConfigDao.queryAllByLimit(schisandraSmsConfig, pageRequest), pageRequest, total); } - @Override - public List queryAll() { - return this.schisandraSmsConfigDao.queryAll(); - } - /** * 新增数据 * @@ -85,4 +80,14 @@ public class SchisandraSmsConfigServiceImpl implements SchisandraSmsConfigServic public boolean deleteById(Integer id) { return this.schisandraSmsConfigDao.deleteById(id) > 0; } + + @Override + public List queryAll() { + return schisandraSmsConfigDao.queryAll(); + } + + @Override + public SchisandraSmsConfig queryByConfigId(String configId) { + return schisandraSmsConfigDao.queryByConfigId(configId); + } } diff --git a/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-infra/src/main/java/com/schisandra/auth/infra/basic/utils/DruidEncryptUtil.java b/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-infra/src/main/java/com/schisandra/auth/infra/basic/utils/DruidEncryptUtil.java index bf4f79b..5817105 100644 --- a/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-infra/src/main/java/com/schisandra/auth/infra/basic/utils/DruidEncryptUtil.java +++ b/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-infra/src/main/java/com/schisandra/auth/infra/basic/utils/DruidEncryptUtil.java @@ -8,7 +8,7 @@ import java.security.NoSuchProviderException; /** * 数据库加密util * - * @author: landaiqing + * @author: schisandra * @date: 2024/3/21 */ public class DruidEncryptUtil { 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 22e9dd8..16e2d4d 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 @@ -44,24 +44,21 @@ + + - @@ -209,7 +212,7 @@ and template_name = #{templateName} - and 'action' = #{action} + and action = #{action} and region = #{region} @@ -319,30 +322,50 @@ and is_deleted = #{isDeleted} + + and extra_json = #{extraJson} + + + and service = #{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) - 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}) + 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) + 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.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) + 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.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 = @@ -357,7 +380,8 @@ 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) + values(update_time)update_by = values(update_by)is_deleted = values(is_deleted)extra_json = + values(extra_json)service = values(service) @@ -374,7 +398,7 @@ template_name = #{templateName}, - `action` = #{action}, + action = #{action}, region = #{region}, @@ -484,6 +508,12 @@ is_deleted = #{isDeleted}, + + extra_json = #{extraJson}, + + + service = #{service}, + where id = #{id} diff --git a/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-starter/src/main/java/com/schisandra/auth/AuthApplication.java b/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-starter/src/main/java/com/schisandra/auth/AuthApplication.java index 7205c53..c5e25bd 100644 --- a/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-starter/src/main/java/com/schisandra/auth/AuthApplication.java +++ b/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-starter/src/main/java/com/schisandra/auth/AuthApplication.java @@ -8,7 +8,7 @@ import org.springframework.context.annotation.ComponentScan; /** * 鉴权微服务启动类 * - * @author: landaiqing + * @author: schisandra * @date: 2024/3/21 */ @SpringBootApplication diff --git a/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-starter/src/main/resources/log4j2-spring.xml b/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-starter/src/main/resources/log4j2-spring.xml index a0ea33e..a49e28c 100644 --- a/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-starter/src/main/resources/log4j2-spring.xml +++ b/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-starter/src/main/resources/log4j2-spring.xml @@ -7,7 +7,7 @@ - + diff --git a/schisandra-cloud-storage-common-starter/easy-gen-code-spring-boot-starter/pom.xml b/schisandra-cloud-storage-common-starter/easy-gen-code-spring-boot-starter/pom.xml new file mode 100644 index 0000000..daa42b2 --- /dev/null +++ b/schisandra-cloud-storage-common-starter/easy-gen-code-spring-boot-starter/pom.xml @@ -0,0 +1,99 @@ + + 4.0.0 + + com.schisandra + schisandra-cloud-storage-common-starter + 1.0-SNAPSHOT + + + easy-gen-code-spring-boot-starter + jar + + easy-gen-code-spring-boot-starter + + + 8 + 8 + + + + + org.apache.velocity + velocity-engine-core + 2.2 + + + org.apache.logging.log4j + log4j-slf4j-impl + + + org.apache.logging.log4j + log4j-to-slf4j + + + ch.qos.logback + logback-classic + + + + + cn.hutool + hutool-all + 5.1.1 + + + org.projectlombok + lombok + 1.18.16 + true + + + com.alibaba + fastjson + 1.2.76 + + + com.fasterxml.jackson.dataformat + jackson-dataformat-yaml + 2.12.3 + + + org.apache.logging.log4j + log4j-slf4j-impl + + + org.apache.logging.log4j + log4j-to-slf4j + + + ch.qos.logback + logback-classic + + + + + org.springframework + spring-jdbc + 5.3.3 + + + mysql + mysql-connector-java + 8.0.22 + + + + + + rdc-releases + dw-repo-releases + https://packages.aliyun.com/maven/repository/2012812-release-SiITng/ + + + rdc-snapshots + dw-repo-snapshots + https://packages.aliyun.com/maven/repository/2012812-snapshot-LHGmjL/ + + + diff --git a/schisandra-cloud-storage-common-starter/easy-gen-code-spring-boot-starter/src/main/java/com/schisandra/core/anno/Table.java b/schisandra-cloud-storage-common-starter/easy-gen-code-spring-boot-starter/src/main/java/com/schisandra/core/anno/Table.java new file mode 100644 index 0000000..664f055 --- /dev/null +++ b/schisandra-cloud-storage-common-starter/easy-gen-code-spring-boot-starter/src/main/java/com/schisandra/core/anno/Table.java @@ -0,0 +1,26 @@ +package com.schisandra.core.anno; + +import java.lang.annotation.Documented; +import java.lang.annotation.ElementType; +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; +import java.lang.annotation.Target; + +@Documented +@Target({ElementType.TYPE, ElementType.FIELD}) +@Retention(RetentionPolicy.RUNTIME) +public @interface Table { + + String value() default ""; + + String keyType() default ""; + + String col() default ""; + + String comment() default ""; + + String myBatisType() default ""; + + String jdbcType() default ""; + +} diff --git a/schisandra-cloud-storage-common-starter/easy-gen-code-spring-boot-starter/src/main/java/com/schisandra/core/config/GenConfig.java b/schisandra-cloud-storage-common-starter/easy-gen-code-spring-boot-starter/src/main/java/com/schisandra/core/config/GenConfig.java new file mode 100644 index 0000000..90d5901 --- /dev/null +++ b/schisandra-cloud-storage-common-starter/easy-gen-code-spring-boot-starter/src/main/java/com/schisandra/core/config/GenConfig.java @@ -0,0 +1,47 @@ +package com.schisandra.core.config; + +import com.schisandra.core.entity.JdbcConfig; +import lombok.Data; + +import java.util.Map; + +/** + * 代码生成器配置 + * + * @author loser + * @date 2023/9/4 + */ +@Data +public class GenConfig { + + /** + * 从自定义的类中获取数据 + */ + private String handler; + + /** + * 从classPath下的json文件中获取数据 + */ + private String json; + + /** + * 使用jdbc从表结构中获取数据 + */ + private JdbcConfig jdbc; + + /** + * 模板与生成文件的映射配置文件 + */ + private String mapperInfos; + + /** + * 针对某一个模板将数据写入该模板上下文 + */ + private String filePutHandler; + + /** + * 自定义写入全局的参数 + */ + private Map params; + +} diff --git a/schisandra-cloud-storage-common-starter/easy-gen-code-spring-boot-starter/src/main/java/com/schisandra/core/config/MapperConfig.java b/schisandra-cloud-storage-common-starter/easy-gen-code-spring-boot-starter/src/main/java/com/schisandra/core/config/MapperConfig.java new file mode 100644 index 0000000..cc40408 --- /dev/null +++ b/schisandra-cloud-storage-common-starter/easy-gen-code-spring-boot-starter/src/main/java/com/schisandra/core/config/MapperConfig.java @@ -0,0 +1,27 @@ +package com.schisandra.core.config; + +import com.schisandra.core.entity.Mapper; +import lombok.Data; + +import java.util.List; + +/** + * 模板与生成文件的映射关系 + * + * @author loser + * @date 2023/9/4 + */ +@Data +public class MapperConfig { + + /** + * 文件生成到该项目的哪个模块 + */ + private String module; + + /** + * 映射关系 + */ + private List mappers; + +} diff --git a/schisandra-cloud-storage-common-starter/easy-gen-code-spring-boot-starter/src/main/java/com/schisandra/core/core/CodeGenerationCode.java b/schisandra-cloud-storage-common-starter/easy-gen-code-spring-boot-starter/src/main/java/com/schisandra/core/core/CodeGenerationCode.java new file mode 100644 index 0000000..ccb638e --- /dev/null +++ b/schisandra-cloud-storage-common-starter/easy-gen-code-spring-boot-starter/src/main/java/com/schisandra/core/core/CodeGenerationCode.java @@ -0,0 +1,241 @@ +package com.schisandra.core.core; + + +import cn.hutool.core.io.FileUtil; +import cn.hutool.core.util.StrUtil; +import com.alibaba.fastjson.JSONObject; +import com.schisandra.core.config.GenConfig; +import com.schisandra.core.config.MapperConfig; +import com.schisandra.core.core.impl.JdbcPutContextHandler; +import com.schisandra.core.core.sdk.FilePutContextHandler; +import com.schisandra.core.core.sdk.PostCurFiledContextAware; +import com.schisandra.core.entity.Context; +import com.schisandra.core.entity.MapperInfo; +import com.schisandra.core.utils.*; +import org.apache.velocity.VelocityContext; + +import java.io.File; +import java.net.URL; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.Objects; +import java.util.concurrent.atomic.AtomicInteger; +import java.util.stream.Collectors; + +public class CodeGenerationCode { + + public static void doGenCode() { + doGenCode(null); + } + + public static void doGenCode(PostCurFiledContextAware aware) { + + try { + // 01 获取入口配置文件 + GenConfig genConfig = YamlUtils.loadYaml("genCode/gen.yml", GenConfig.class); + + // 02 获取全局的配置上下文 + assert genConfig != null; + VelocityContext context = getGlobalContext(genConfig); + Map contexts = new HashMap<>(); + for (String key : context.getKeys()) { + Object value = context.get(key); + if (value instanceof String && FunctionUtils.isFunction(value)) { + value = FunctionUtils.doFunction(value); + context.put(key, value); + } + contexts.put(key, context.get(key)); + } + System.out.println("==========> getGlobalContext:" + System.lineSeparator() + JSONObject.toJSONString(contexts)); + System.out.println(); + + // 03 获取 模板与生成文件的映射关系 + List infos = getMapperInfos(genConfig, context, aware); + + // 04 通过映射关系生成代码文件 + genCode(infos, genConfig.getParams().getOrDefault("templateBasePath", "").toString()); + } catch (Exception e) { + e.printStackTrace(); + } + + } + + private static void genCode(List infos, String templateBasePath) { + + AtomicInteger count = new AtomicInteger(1); + infos.forEach(info -> { + CodeGeneratorUtils codeGenerator = new CodeGeneratorUtils(templateBasePath); + codeGenerator.generateCode( + info.getContext(), + info.getTemplatePath(), + info.getOutPutPath(), + count); + }); + + } + + private static List getMapperInfos(GenConfig genConfig, VelocityContext context, PostCurFiledContextAware aware) { + + MapperConfig mapperConfig = YamlUtils.loadYaml(genConfig.getMapperInfos(), MapperConfig.class); + assert mapperConfig != null; + // 允许在生成文件前对上下文中的数据进行修改 处理一些导包之类的不好控制业务 + if (Objects.nonNull(aware)) { + aware.doAware(genConfig, mapperConfig, context); + Map contexts = new HashMap<>(); + for (String key : context.getKeys()) { + Object value = context.get(key); + contexts.put(key, value); + } + System.out.println("==========> modify file context :" + System.lineSeparator() + JSONObject.toJSONString(contexts)); + } + + AtomicInteger count = new AtomicInteger(1); + return mapperConfig.getMappers().stream().filter(Objects::nonNull).map(item -> { + MapperInfo info = new MapperInfo(); + info.setTemplatePath(getResPath(item.getTemplate())); + String cName = item.getName(); + + if (cName.contains("$")) { + cName = replace$key(context, cName); + } + String pkg = item.getPackageName(); + if (StrUtil.isNotEmpty(pkg) && pkg.contains("$")) { + pkg = replace$key(context, pkg); + } + String filePath = item.getFilePath(); + if (StrUtil.isNotEmpty(filePath) && filePath.contains("$")) { + filePath = replace$key(context, filePath); + } + String outPutPath = getTargetPath(mapperConfig.getModule(), pkg, filePath); + File file = new File(outPutPath); + if (!file.exists()) { + boolean mkdirs = file.mkdirs(); + System.out.println("==========> mkdir " + mkdirs + " " + file.getAbsolutePath()); + System.out.println(); + } + outPutPath += ("/" + cName + "." + item.getExt()); + VelocityContext cloneCtx = (VelocityContext) context.clone(); + info.setOutPutPath(outPutPath); + if (StrUtil.isNotBlank(genConfig.getFilePutHandler())) { + try { + FilePutContextHandler handler = (FilePutContextHandler) Class.forName(genConfig.getFilePutHandler()).newInstance(); + handler.put(cloneCtx, item.getFileId()); + } catch (Exception e) { + e.printStackTrace(); + } + } + cloneCtx.put("className", cName); + cloneCtx.put("packageName", pkg); + System.out.println("==========> " + count.get() + " MapperInfo : " + System.lineSeparator() + info); + System.out.println(); + Map contexts = new HashMap<>(); + for (String key : cloneCtx.getKeys()) { + contexts.put(key, cloneCtx.get(key)); + } + System.out.println("==========> MapperInfo context : " + System.lineSeparator() + JSONObject.toJSONString(contexts)); + System.out.println(); + System.out.println("============================================================================================================================================="); + System.out.println(); + info.setContext(cloneCtx); + return info; + }).collect(Collectors.toList()); + } + + private static String replace$key(VelocityContext velocityContext, String conextkey) { + + String key = conextkey.substring(conextkey.indexOf("${") + 2, conextkey.indexOf("}")); + Object value = velocityContext.get(key); + conextkey = conextkey.replace("${" + key + "}", value.toString()); + if (conextkey.contains("$")) { + conextkey = replace$key(velocityContext, conextkey); + } + return conextkey; + + } + + private static VelocityContext getGlobalContext(GenConfig genConfig) throws InstantiationException, IllegalAccessException, ClassNotFoundException { + + Context context = ConfigUtils.getContext(); + boolean putData = false; + + // 01 处理优先级第一的处理器 + if (StrUtil.isNotBlank(genConfig.getHandler())) { + JdbcPutContextHandler jdbcPutContextHandler = (JdbcPutContextHandler) Class.forName(genConfig.getHandler()).newInstance(); + putData = jdbcPutContextHandler.put(); + } + + // 02 处理优先级第二的json导入 + if (!putData && StrUtil.isNotBlank(genConfig.getJson())) { + List lines = FileUtil.readLines(getRealResPath(genConfig.getJson()), "UTF-8"); + StringBuilder json = new StringBuilder(); + for (String line : lines) { + json.append(line); + } + context = ContextUtils.buildContext(json.toString()); + ConfigUtils.reSetContext(context); + putData = true; + } + + // 03 处理优先级第三的mysql导入 + if (!putData) { + JdbcPutContextHandler jdbcPutContextHandler = new JdbcPutContextHandler(); + jdbcPutContextHandler.put(); + } + + // 04 添加配置中的全局参数 + Map params = genConfig.getParams(); + for (Map.Entry entry : params.entrySet()) { + context.put(entry.getKey(), entry.getValue()); + } + return context.get(); + + } + + private static String getTargetPath(String module, String packageName, String filePath) { + + if (StrUtil.isEmpty(module)) { + module = "/"; + } + if (SystemUtils.isMacOs()) { + if (StrUtil.isEmpty(filePath)) { + return getCurPath().substring(0, getCurPath().length() - 2) + module + "src/main/java/" + packageName.replaceAll("\\.", "/"); + } else { + return getCurPath().substring(0, getCurPath().length() - 2) + module + filePath; + } + } else { + if (StrUtil.isEmpty(filePath)) { + return getCurPath() + module + "src/main/java/" + packageName.replaceAll("\\.", "\\"); + } else { + return getCurPath() + module + filePath; + } + } + + } + + private static URL getRealResPath(String res) { + ClassLoader classLoader = CodeGenerationCode.class.getClassLoader(); + return classLoader.getResource(res); + } + + private static String getResPath(String res) { + + if (SystemUtils.isMacOs()) { + ClassLoader classLoader = CodeGenerationCode.class.getClassLoader(); + return classLoader.getResource(res).getPath() + .replaceAll(getCurPath().substring(0, getCurPath().length() - 1), ""); + } else { + return res; + } + + } + + private static String getCurPath() { + if (SystemUtils.isMacOs()) { + return new File("./").getAbsolutePath(); + } else { + return System.getProperty("user.dir"); + } + } + +} diff --git a/schisandra-cloud-storage-common-starter/easy-gen-code-spring-boot-starter/src/main/java/com/schisandra/core/core/MysqlDataHandler.java b/schisandra-cloud-storage-common-starter/easy-gen-code-spring-boot-starter/src/main/java/com/schisandra/core/core/MysqlDataHandler.java new file mode 100644 index 0000000..23c6a16 --- /dev/null +++ b/schisandra-cloud-storage-common-starter/easy-gen-code-spring-boot-starter/src/main/java/com/schisandra/core/core/MysqlDataHandler.java @@ -0,0 +1,134 @@ +package com.schisandra.core.core; + +import cn.hutool.core.collection.CollectionUtil; +import com.schisandra.core.entity.JdbcConfig; +import com.schisandra.core.entity.TableInfo; +import com.schisandra.core.utils.Lists; +import lombok.AllArgsConstructor; +import org.springframework.beans.BeanUtils; +import org.springframework.jdbc.core.BeanPropertyRowMapper; +import org.springframework.jdbc.core.JdbcTemplate; +import org.springframework.jdbc.datasource.SimpleDriverDataSource; + +import javax.sql.DataSource; +import java.sql.Driver; +import java.util.List; +import java.util.regex.Matcher; +import java.util.regex.Pattern; +import java.util.stream.Collectors; + + +/** + * 简易mysql处理器 查询表备注及表字段 + * + * @author loser + * @date 2023/9/4 + */ +@AllArgsConstructor +public class MysqlDataHandler { + + private String tableName; + private String dbUrl; + private String dbUser; + private String dbPw; + private String dbName; + private String driver; + + public String getTableComment() { + JdbcConfig config = new JdbcConfig( + dbUrl + dbName + "?useUnicode=true", + dbUser, + dbPw, + dbName, + driver, + tableName + ); + JdbcTemplate jdbcTemplate = initJdbcTemplate(config); + String sql = "SELECT table_comment tableComment FROM information_schema.TABLES WHERE table_schema = ? and table_name = ? "; + List params = Lists.newArrayList(); + params.add(config.getDbName()); + params.add(tableName); + BeanPropertyRowMapper rowMapper = new BeanPropertyRowMapper<>(TableInfo.class); + if (CollectionUtil.isEmpty(params)) { + return jdbcTemplate.query(sql, rowMapper).get(0).getTableComment(); + } + List query = jdbcTemplate.query(sql, rowMapper, params.toArray()); + if (CollectionUtil.isEmpty(query)) { + throw new RuntimeException("表不存在：" + tableName); + } + return query.get(0).getTableComment(); + + } + + + /** + * 使用表名 查询表结构信息 + */ + public List searchByDb() { + + JdbcConfig config = new JdbcConfig( + dbUrl + dbName + "?useUnicode=true", + dbUser, + dbPw, + dbName, + driver, + tableName + ); + JdbcTemplate jdbcTemplate = initJdbcTemplate(config); + String sql = "select column_name as name, column_comment as comment,DATA_TYPE as dataType,COLUMN_KEY as keyType " + + "from information_schema.columns where table_schema = ? and table_name = ? ORDER BY ORDINAL_POSITION"; + List params = Lists.newArrayList(); + + params.add(config.getDbName()); + params.add(tableName); + BeanPropertyRowMapper rowMapper = new BeanPropertyRowMapper<>(TableInfo.class); + if (CollectionUtil.isEmpty(params)) { + return jdbcTemplate.query(sql, rowMapper); + } + List list = jdbcTemplate.query(sql, rowMapper, params.toArray()); + return list.stream().peek(item -> { + item.setCol(item.getName()); + item.setName(underlineToHump(item.getName())); + }).collect(Collectors.toList()); + + } + + + /** + * 初始化一个jdbc + */ + private static JdbcTemplate initJdbcTemplate(JdbcConfig config) { + DataSource dataSource; + try { + dataSource = new SimpleDriverDataSource( + BeanUtils.instantiateClass((Class) Class.forName(config.getDriver())), + config.getUrl(), + config.getUsername(), + config.getPassword()); + } catch (ClassNotFoundException e) { + throw new RuntimeException(e); + } + return new JdbcTemplate(dataSource); + } + + private static Pattern UNDERLINE_PATTERN = Pattern.compile("_([a-z])"); + + public static String underlineToHump(String str) { + //正则匹配下划线及后一个字符，删除下划线并将匹配的字符转成大写 + Matcher matcher = UNDERLINE_PATTERN.matcher(str); + StringBuffer sb = new StringBuffer(str); + if (matcher.find()) { + sb = new StringBuffer(); + //将当前匹配的子串替换成指定字符串，并且将替换后的子串及之前到上次匹配的子串之后的字符串添加到StringBuffer对象中 + //正则之前的字符和被替换的字符 + matcher.appendReplacement(sb, matcher.group(1).toUpperCase()); + //把之后的字符串也添加到StringBuffer对象中 + matcher.appendTail(sb); + } else { + //去除除字母之外的前面带的下划线 + return sb.toString().replaceAll("_", ""); + } + return underlineToHump(sb.toString()); + } + +} diff --git a/schisandra-cloud-storage-common-starter/easy-gen-code-spring-boot-starter/src/main/java/com/schisandra/core/core/impl/ClassPutContextHandler.java b/schisandra-cloud-storage-common-starter/easy-gen-code-spring-boot-starter/src/main/java/com/schisandra/core/core/impl/ClassPutContextHandler.java new file mode 100644 index 0000000..37862f3 --- /dev/null +++ b/schisandra-cloud-storage-common-starter/easy-gen-code-spring-boot-starter/src/main/java/com/schisandra/core/core/impl/ClassPutContextHandler.java @@ -0,0 +1,36 @@ +package com.schisandra.core.core.impl; + +import com.schisandra.core.config.GenConfig; +import com.schisandra.core.config.MapperConfig; +import com.schisandra.core.core.sdk.PostCurFiledContextAware; +import com.schisandra.core.entity.TableInfo; +import com.schisandra.core.utils.TableUtils; +import org.apache.velocity.VelocityContext; + +import java.util.List; + +/** + * 从字段注解中获取数据 + * + * @author loser + * @date 2023/9/4 + */ +public class ClassPutContextHandler implements PostCurFiledContextAware { + + private Class clazz; + + public ClassPutContextHandler(Class clazz) { + this.clazz = clazz; + } + + @Override + public void doAware(GenConfig genConfig, MapperConfig mapperConfig, VelocityContext context) { + + String tableComment = TableUtils.getComment(clazz); + List fields = TableUtils.build(clazz); + context.put("tableComment", tableComment); + context.put("fields", fields); + + } + +} diff --git a/schisandra-cloud-storage-common-starter/easy-gen-code-spring-boot-starter/src/main/java/com/schisandra/core/core/impl/DemoFilePutContextHandler.java b/schisandra-cloud-storage-common-starter/easy-gen-code-spring-boot-starter/src/main/java/com/schisandra/core/core/impl/DemoFilePutContextHandler.java new file mode 100644 index 0000000..6b3717a --- /dev/null +++ b/schisandra-cloud-storage-common-starter/easy-gen-code-spring-boot-starter/src/main/java/com/schisandra/core/core/impl/DemoFilePutContextHandler.java @@ -0,0 +1,14 @@ +package com.schisandra.core.core.impl; + +import com.schisandra.core.core.sdk.FilePutContextHandler; + +import java.util.Map; + +public class DemoFilePutContextHandler implements FilePutContextHandler { + + @Override + public Map putData(String fileId) { + return null; + } + +} diff --git a/schisandra-cloud-storage-common-starter/easy-gen-code-spring-boot-starter/src/main/java/com/schisandra/core/core/impl/JdbcPutContextHandler.java b/schisandra-cloud-storage-common-starter/easy-gen-code-spring-boot-starter/src/main/java/com/schisandra/core/core/impl/JdbcPutContextHandler.java new file mode 100644 index 0000000..66bb47d --- /dev/null +++ b/schisandra-cloud-storage-common-starter/easy-gen-code-spring-boot-starter/src/main/java/com/schisandra/core/core/impl/JdbcPutContextHandler.java @@ -0,0 +1,34 @@ +package com.schisandra.core.core.impl; + +import com.schisandra.core.config.GenConfig; +import com.schisandra.core.core.sdk.PutContextHandler; +import com.schisandra.core.entity.TableInfo; +import com.schisandra.core.utils.JdbcUtil; +import com.schisandra.core.utils.YamlUtils; + +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +/** + * 从配置的mysql数据源中获取表字段及表备注写入到全局上下文 + * + * @author loser + * @date 2023/9/4 + */ +public class JdbcPutContextHandler implements PutContextHandler { + + @Override + public Map putData() { + + GenConfig genConfig = YamlUtils.loadYaml("genCode/gen.yml", GenConfig.class); + String tableComment = JdbcUtil.getComment(genConfig.getJdbc(), genConfig.getJdbc().getTableName()); + List fields = JdbcUtil.queryTableInfo(genConfig.getJdbc(), genConfig.getJdbc().getTableName()); + Map res = new HashMap<>(); + res.put("tableComment", tableComment); + res.put("fields", fields); + return res; + + } + +} diff --git a/schisandra-cloud-storage-common-starter/easy-gen-code-spring-boot-starter/src/main/java/com/schisandra/core/core/sdk/FilePutContextHandler.java b/schisandra-cloud-storage-common-starter/easy-gen-code-spring-boot-starter/src/main/java/com/schisandra/core/core/sdk/FilePutContextHandler.java new file mode 100644 index 0000000..78b2a8b --- /dev/null +++ b/schisandra-cloud-storage-common-starter/easy-gen-code-spring-boot-starter/src/main/java/com/schisandra/core/core/sdk/FilePutContextHandler.java @@ -0,0 +1,36 @@ +package com.schisandra.core.core.sdk; + +import cn.hutool.core.map.MapUtil; +import org.apache.velocity.VelocityContext; + +import java.util.Map; + +/** + * 针对某个生成文件写入独有上下文 + * + * @author loser + * @date 2023/9/4 + */ +public interface FilePutContextHandler { + + /** + * 将map中的键值对写入当前文件的上下文 + * + * @param fileId 文件id + * @return 写入的数据 + */ + Map putData(String fileId); + + default void put(VelocityContext context, String fileId) { + + Map map = putData(fileId); + if (MapUtil.isNotEmpty(map)) { + for (Map.Entry entity : map.entrySet()) { + context.put(entity.getKey(), entity.getValue()); + } + + } + + } + +} diff --git a/schisandra-cloud-storage-common-starter/easy-gen-code-spring-boot-starter/src/main/java/com/schisandra/core/core/sdk/Function.java b/schisandra-cloud-storage-common-starter/easy-gen-code-spring-boot-starter/src/main/java/com/schisandra/core/core/sdk/Function.java new file mode 100644 index 0000000..ec702a9 --- /dev/null +++ b/schisandra-cloud-storage-common-starter/easy-gen-code-spring-boot-starter/src/main/java/com/schisandra/core/core/sdk/Function.java @@ -0,0 +1,21 @@ +package com.schisandra.core.core.sdk; + +/** + * 内置函数 + * + * @author loser + * @date 2023/9/4 + */ +public interface Function { + + /** + * 函数key + */ + String funcKey(); + + /** + * 执行函授后的返回值 + */ + String doFunc(); + +} diff --git a/schisandra-cloud-storage-common-starter/easy-gen-code-spring-boot-starter/src/main/java/com/schisandra/core/core/sdk/PostCurFiledContextAware.java b/schisandra-cloud-storage-common-starter/easy-gen-code-spring-boot-starter/src/main/java/com/schisandra/core/core/sdk/PostCurFiledContextAware.java new file mode 100644 index 0000000..e0080b9 --- /dev/null +++ b/schisandra-cloud-storage-common-starter/easy-gen-code-spring-boot-starter/src/main/java/com/schisandra/core/core/sdk/PostCurFiledContextAware.java @@ -0,0 +1,18 @@ +package com.schisandra.core.core.sdk; + +import com.schisandra.core.config.GenConfig; +import com.schisandra.core.config.MapperConfig; +import org.apache.velocity.VelocityContext; + +/** + * 针对当前文件的上下文进行操作 + * + * @author loser + * @date 2023/9/4 + */ +@FunctionalInterface +public interface PostCurFiledContextAware { + + void doAware(GenConfig genConfig, MapperConfig mapperConfig, VelocityContext context); + +} diff --git a/schisandra-cloud-storage-common-starter/easy-gen-code-spring-boot-starter/src/main/java/com/schisandra/core/core/sdk/PutContextHandler.java b/schisandra-cloud-storage-common-starter/easy-gen-code-spring-boot-starter/src/main/java/com/schisandra/core/core/sdk/PutContextHandler.java new file mode 100644 index 0000000..6eb6cb3 --- /dev/null +++ b/schisandra-cloud-storage-common-starter/easy-gen-code-spring-boot-starter/src/main/java/com/schisandra/core/core/sdk/PutContextHandler.java @@ -0,0 +1,31 @@ +package com.schisandra.core.core.sdk; + +import com.schisandra.core.entity.Context; +import com.schisandra.core.utils.ConfigUtils; + +import java.util.Map; + +/** + * 从类中写入数据到全局上下文 + * + * @author loser + * @date 2023/9/4 + */ +public interface PutContextHandler { + + Map putData(); + + default boolean put() { + + boolean res = false; + Map map = putData(); + Context context = ConfigUtils.getContext(); + for (Map.Entry entry : map.entrySet()) { + context.put(entry.getKey(), entry.getValue()); + res = true; + } + return res; + + } + +} diff --git a/schisandra-cloud-storage-common-starter/easy-gen-code-spring-boot-starter/src/main/java/com/schisandra/core/entity/Context.java b/schisandra-cloud-storage-common-starter/easy-gen-code-spring-boot-starter/src/main/java/com/schisandra/core/entity/Context.java new file mode 100644 index 0000000..18e6a66 --- /dev/null +++ b/schisandra-cloud-storage-common-starter/easy-gen-code-spring-boot-starter/src/main/java/com/schisandra/core/entity/Context.java @@ -0,0 +1,83 @@ +package com.schisandra.core.entity; + +import com.schisandra.core.utils.PrimitiveTypeUtils; +import lombok.Data; +import org.apache.velocity.VelocityContext; + +import java.lang.reflect.Field; +import java.util.Map; +import java.util.concurrent.ConcurrentHashMap; + +/** + * 自定义上下文 + * + * @author loser + * @date 2023/9/4 + */ +@Data +public class Context implements Cloneable { + + private VelocityContext context = new VelocityContext(); + + public VelocityContext get() { + for (Map.Entry entry : contexts.entrySet()) { + context.put(entry.getKey(), entry.getValue()); + } + return context; + } + + private Map contexts = new ConcurrentHashMap<>(); + + public void put(String key, Object obj) { + contexts.put(key, obj); + } + + public void remove(String key) { + contexts.remove(key); + } + + public void put(Object obj) { + + if (PrimitiveTypeUtils.isPrimitive(obj)) { + return; + } + Class aClass = obj.getClass(); + Field[] fields = aClass.getDeclaredFields(); + for (Field field : fields) { + try { + field.setAccessible(true); + Object value = field.get(obj); + put(field.getName(), value); + } catch (Exception e) { + e.printStackTrace(); + } + } + + } + + public void removeObj(Object obj) { + + if (PrimitiveTypeUtils.isPrimitive(obj)) { + return; + } + Class aClass = obj.getClass(); + Field[] fields = aClass.getDeclaredFields(); + for (Field field : fields) { + String name = field.getName(); + remove(name); + } + + } + + + @Override + public Context clone() { + try { + Context clone = (Context) super.clone(); + // TODO: copy mutable state here, so the clone can't change the internals of the original + return clone; + } catch (CloneNotSupportedException e) { + throw new AssertionError(); + } + } +} diff --git a/schisandra-cloud-storage-common-starter/easy-gen-code-spring-boot-starter/src/main/java/com/schisandra/core/entity/JdbcConfig.java b/schisandra-cloud-storage-common-starter/easy-gen-code-spring-boot-starter/src/main/java/com/schisandra/core/entity/JdbcConfig.java new file mode 100644 index 0000000..c5edbae --- /dev/null +++ b/schisandra-cloud-storage-common-starter/easy-gen-code-spring-boot-starter/src/main/java/com/schisandra/core/entity/JdbcConfig.java @@ -0,0 +1,25 @@ +package com.schisandra.core.entity; + +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + +/** + * 数据库配置 + * + * @author loser + * @date 2023/9/4 + */ +@Data +@AllArgsConstructor +@NoArgsConstructor +public class JdbcConfig { + + private String url; + private String username; + private String password; + private String dbName; + private String driver; + private String tableName; + +} \ No newline at end of file diff --git a/schisandra-cloud-storage-common-starter/easy-gen-code-spring-boot-starter/src/main/java/com/schisandra/core/entity/Mapper.java b/schisandra-cloud-storage-common-starter/easy-gen-code-spring-boot-starter/src/main/java/com/schisandra/core/entity/Mapper.java new file mode 100644 index 0000000..d68f05e --- /dev/null +++ b/schisandra-cloud-storage-common-starter/easy-gen-code-spring-boot-starter/src/main/java/com/schisandra/core/entity/Mapper.java @@ -0,0 +1,43 @@ +package com.schisandra.core.entity; + +import lombok.Data; + +/** + * 映射关系 + * + * @author loser + * @date 2023/9/4 + */ +@Data +public class Mapper { + + /** + * 生成文件的id + */ + private String fileId; + + /** + * 模板地址 + */ + private String template; + + /** + * 生成类包名称 可使用占位符 ${} + */ + private String packageName; + + /** + * 生成文件的路径 没有指定则用 packageName 进行替换处理 可使用占位符 ${} + */ + private String filePath; + + /** + * 生成文件的名称 可使用占位符 ${} + */ + private String name; + + /** + * 生成文件的扩展名 + */ + private String ext; +} diff --git a/schisandra-cloud-storage-common-starter/easy-gen-code-spring-boot-starter/src/main/java/com/schisandra/core/entity/MapperInfo.java b/schisandra-cloud-storage-common-starter/easy-gen-code-spring-boot-starter/src/main/java/com/schisandra/core/entity/MapperInfo.java new file mode 100644 index 0000000..af9a2ca --- /dev/null +++ b/schisandra-cloud-storage-common-starter/easy-gen-code-spring-boot-starter/src/main/java/com/schisandra/core/entity/MapperInfo.java @@ -0,0 +1,47 @@ +package com.schisandra.core.entity; + +import com.alibaba.fastjson.JSONObject; +import lombok.Data; +import org.apache.velocity.VelocityContext; + +import java.util.HashMap; +import java.util.Map; + +/** + * 映射关系包裹对象 + * + * @author loser + * @date 2023/9/4 + */ +@Data +public class MapperInfo { + + /** + * 文件id用于自定义忘 context 中存入自己特有的信息 + */ + private String fileId; + + /** + * 模板路径 + */ + private String templatePath; + + /** + * 生成文件路径 + */ + private String outPutPath; + + /** + * 每个文件自个持有的上下文 包含全局的上下文数据 + */ + private VelocityContext context; + + @Override + public String toString() { + Map res = new HashMap<>(); + res.put("fileId", fileId); + res.put("templatePath", templatePath); + res.put("outPutPath", outPutPath); + return JSONObject.toJSONString(res); + } +} diff --git a/schisandra-cloud-storage-common-starter/easy-gen-code-spring-boot-starter/src/main/java/com/schisandra/core/entity/TableInfo.java b/schisandra-cloud-storage-common-starter/easy-gen-code-spring-boot-starter/src/main/java/com/schisandra/core/entity/TableInfo.java new file mode 100644 index 0000000..e18711e --- /dev/null +++ b/schisandra-cloud-storage-common-starter/easy-gen-code-spring-boot-starter/src/main/java/com/schisandra/core/entity/TableInfo.java @@ -0,0 +1,65 @@ +package com.schisandra.core.entity; + +import cn.hutool.core.util.StrUtil; +import com.schisandra.core.utils.MySQLToJavaTypeConverter; +import com.schisandra.core.utils.MySQLToMyBatisTypeConverter; +import lombok.Data; +import org.springframework.util.StringUtils; + +/** + * 表信息 + * + * @author loser + * @date 2023/9/4 + */ +@Data +public class TableInfo { + + // 字段索引类型 + private String keyType; + private String col; + private String name; + private String upName; + private String comment; + private String dataType; + private String tableComment; + // 转化为java中的数据类型 + private String type; + // 转为mybatis中的数据类型 + private String myBatisType; + + public String getMyBatisType() { + if (StrUtil.isNotEmpty(myBatisType)) { + return myBatisType; + } + return MySQLToMyBatisTypeConverter.convert(dataType); + + } + + public String getUpName() { + return StrUtil.upperFirst(name); + } + + public String getType() { + if (StrUtil.isNotEmpty(type)) { + return type; + } + return MySQLToJavaTypeConverter.convert(dataType).getType(); + } + + public MySQLToJavaTypeConverter.Item getTypeInfo() { + return MySQLToJavaTypeConverter.convert(dataType); + } + + public MySQLToJavaTypeConverter.Item getTypeInfo(String type) { + return MySQLToJavaTypeConverter.trans(type); + } + + public String getComment() { + if (StringUtils.isEmpty(comment)) { + return ""; + } + return comment.trim().replace("\n" , ""); + } + +} \ No newline at end of file diff --git a/schisandra-cloud-storage-common-starter/easy-gen-code-spring-boot-starter/src/main/java/com/schisandra/core/utils/CodeGeneratorUtils.java b/schisandra-cloud-storage-common-starter/easy-gen-code-spring-boot-starter/src/main/java/com/schisandra/core/utils/CodeGeneratorUtils.java new file mode 100644 index 0000000..b9327f0 --- /dev/null +++ b/schisandra-cloud-storage-common-starter/easy-gen-code-spring-boot-starter/src/main/java/com/schisandra/core/utils/CodeGeneratorUtils.java @@ -0,0 +1,46 @@ +package com.schisandra.core.utils; + +import org.apache.velocity.Template; +import org.apache.velocity.VelocityContext; +import org.apache.velocity.app.VelocityEngine; + +import java.io.FileWriter; +import java.io.IOException; +import java.io.StringWriter; +import java.util.concurrent.atomic.AtomicInteger; + +/** + * 使用velocity生成文件 + * + * @author loser + * @date 2023/9/4 + */ +public class CodeGeneratorUtils { + + private final VelocityEngine velocityEngine; + + public CodeGeneratorUtils(String templateBasePath) { + this.velocityEngine = new VelocityEngine(); + if (SystemUtils.isWindows()) { + this.velocityEngine.setProperty("file.resource.loader.path", templateBasePath); + } + velocityEngine.init(); + + } + + public void generateCode(VelocityContext context, String templatePath, String outputPath, AtomicInteger count) { + + Template template = velocityEngine.getTemplate(templatePath, "UTF-8"); + StringWriter writer = new StringWriter(); + template.merge(context, writer); + + try (FileWriter fileWriter = new FileWriter(outputPath)) { + fileWriter.write(writer.toString()); + System.out.println(); + System.out.println("==========> " + count.getAndIncrement() + " genFile succeed : " + outputPath); + } catch (IOException e) { + e.printStackTrace(); + } + } + +} diff --git a/schisandra-cloud-storage-common-starter/easy-gen-code-spring-boot-starter/src/main/java/com/schisandra/core/utils/ConfigUtils.java b/schisandra-cloud-storage-common-starter/easy-gen-code-spring-boot-starter/src/main/java/com/schisandra/core/utils/ConfigUtils.java new file mode 100644 index 0000000..9f8d76c --- /dev/null +++ b/schisandra-cloud-storage-common-starter/easy-gen-code-spring-boot-starter/src/main/java/com/schisandra/core/utils/ConfigUtils.java @@ -0,0 +1,23 @@ +package com.schisandra.core.utils; + +import com.schisandra.core.entity.Context; + +/** + * 获取全局上下文的配置工具 + * + * @author loser + * @date 2023/9/4 + */ +public class ConfigUtils { + + private static Context ctx = new Context(); + + public static Context getContext() { + return ctx; + } + + public static void reSetContext(Context context) { + ctx = context; + } + +} diff --git a/schisandra-cloud-storage-common-starter/easy-gen-code-spring-boot-starter/src/main/java/com/schisandra/core/utils/ContextUtils.java b/schisandra-cloud-storage-common-starter/easy-gen-code-spring-boot-starter/src/main/java/com/schisandra/core/utils/ContextUtils.java new file mode 100644 index 0000000..149a6dc --- /dev/null +++ b/schisandra-cloud-storage-common-starter/easy-gen-code-spring-boot-starter/src/main/java/com/schisandra/core/utils/ContextUtils.java @@ -0,0 +1,27 @@ +package com.schisandra.core.utils; + +import com.alibaba.fastjson.JSONObject; +import com.schisandra.core.entity.Context; + +import java.util.Map; + +/** + * 使用json构建上下文的上下文工具 + * + * @author loser + * @date 2023/9/4 + */ +public class ContextUtils { + + public static Context buildContext(String json) { + + Context context = new Context(); + JSONObject jsonObject = JSONObject.parseObject(json); + for (Map.Entry entry : jsonObject.entrySet()) { + context.put(entry.getKey(), entry.getValue()); + } + return context; + + } + +} diff --git a/schisandra-cloud-storage-common-starter/easy-gen-code-spring-boot-starter/src/main/java/com/schisandra/core/utils/FunctionUtils.java b/schisandra-cloud-storage-common-starter/easy-gen-code-spring-boot-starter/src/main/java/com/schisandra/core/utils/FunctionUtils.java new file mode 100644 index 0000000..2adc946 --- /dev/null +++ b/schisandra-cloud-storage-common-starter/easy-gen-code-spring-boot-starter/src/main/java/com/schisandra/core/utils/FunctionUtils.java @@ -0,0 +1,96 @@ +package com.schisandra.core.utils; + +import cn.hutool.core.date.DateUtil; +import cn.hutool.core.util.RandomUtil; +import com.schisandra.core.core.sdk.Function; + +import java.io.ByteArrayOutputStream; +import java.io.ObjectOutputStream; +import java.io.Serializable; +import java.security.MessageDigest; +import java.util.Map; +import java.util.Objects; +import java.util.concurrent.ConcurrentHashMap; + +public class FunctionUtils implements Serializable { + + private static final Map functionMap = new ConcurrentHashMap<>(); + + static { + register(new Function() { + @Override + public String funcKey() { + return "now()"; + } + + @Override + public String doFunc() { + return DateUtil.now(); + } + }); + + register(new Function() { + @Override + public String funcKey() { + return "svUid()"; + } + + @Override + public String doFunc() { + try { + ByteArrayOutputStream byteStream = new ByteArrayOutputStream(); + ObjectOutputStream objectStream = new ObjectOutputStream(byteStream); + objectStream.writeObject(RandomUtil.randomBigDecimal()); + objectStream.flush(); + objectStream.close(); + + MessageDigest md5 = MessageDigest.getInstance("MD5"); + byte[] byteArray = md5.digest(byteStream.toByteArray()); + long serialVersionUID = 0L; + for (int i = Math.min(byteArray.length, 8) - 1; i >= 0; i--) { + serialVersionUID = (serialVersionUID << 8) | (byteArray[i] & 0xFF); + } + return Long.toString(serialVersionUID); + } catch (Exception ignore) { + } + return null; + } + }); + + register(new Function() { + @Override + public String funcKey() { + return "date()"; + } + + @Override + public String doFunc() { + return DateUtil.formatDate(DateUtil.date()); + } + }); + } + + + public static boolean isFunction(Object funKey) { + if (!(funKey instanceof String)) { + return false; + } + return functionMap.containsKey(funKey); + } + + public static void register(Function function) { + functionMap.put(function.funcKey(), function); + } + + public static Object doFunction(Object funKey) { + if (!(funKey instanceof String)) { + return funKey; + } + Function function = functionMap.get(funKey); + if (Objects.isNull(function)) { + return funKey; + } + return function.doFunc(); + } + +} diff --git a/schisandra-cloud-storage-common-starter/easy-gen-code-spring-boot-starter/src/main/java/com/schisandra/core/utils/JdbcUtil.java b/schisandra-cloud-storage-common-starter/easy-gen-code-spring-boot-starter/src/main/java/com/schisandra/core/utils/JdbcUtil.java new file mode 100644 index 0000000..3af46aa --- /dev/null +++ b/schisandra-cloud-storage-common-starter/easy-gen-code-spring-boot-starter/src/main/java/com/schisandra/core/utils/JdbcUtil.java @@ -0,0 +1,36 @@ +package com.schisandra.core.utils; + +import com.schisandra.core.core.MysqlDataHandler; +import com.schisandra.core.entity.JdbcConfig; +import com.schisandra.core.entity.TableInfo; + +import java.util.List; + +/** + * jdbc工具 用于查询表字段信息 及 表结构信息 + * + * @author loser + * @date 2023/9/4 + */ +public class JdbcUtil { + + private JdbcUtil() { + } + + public static List queryTableInfo(JdbcConfig config, String table) { + + return new MysqlDataHandler(table, config.getUrl(), config.getUsername(), + config.getPassword(), config.getDbName(), config.getDriver()) + .searchByDb(); + + } + + public static String getComment(JdbcConfig config, String table) { + + return new MysqlDataHandler(table, config.getUrl(), config.getUsername(), + config.getPassword(), config.getDbName(), config.getDriver()) + .getTableComment(); + + } + +} diff --git a/schisandra-cloud-storage-common-starter/easy-gen-code-spring-boot-starter/src/main/java/com/schisandra/core/utils/Lists.java b/schisandra-cloud-storage-common-starter/easy-gen-code-spring-boot-starter/src/main/java/com/schisandra/core/utils/Lists.java new file mode 100644 index 0000000..570ae0c --- /dev/null +++ b/schisandra-cloud-storage-common-starter/easy-gen-code-spring-boot-starter/src/main/java/com/schisandra/core/utils/Lists.java @@ -0,0 +1,18 @@ +package com.schisandra.core.utils; + +import java.util.ArrayList; +import java.util.List; + +/** + * 集合类 + * + * @author loser + * @date 2023/9/4 + */ +public class Lists { + + public static List newArrayList() { + return new ArrayList<>(); + } + +} diff --git a/schisandra-cloud-storage-common-starter/easy-gen-code-spring-boot-starter/src/main/java/com/schisandra/core/utils/MySQLToJavaTypeConverter.java b/schisandra-cloud-storage-common-starter/easy-gen-code-spring-boot-starter/src/main/java/com/schisandra/core/utils/MySQLToJavaTypeConverter.java new file mode 100644 index 0000000..af9a5f7 --- /dev/null +++ b/schisandra-cloud-storage-common-starter/easy-gen-code-spring-boot-starter/src/main/java/com/schisandra/core/utils/MySQLToJavaTypeConverter.java @@ -0,0 +1,64 @@ +package com.schisandra.core.utils; + +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.util.HashMap; +import java.util.Map; +import java.util.Objects; + +/** + * mysql转java转换器 + * + * @author loser + * @date 2023/9/4 + */ +public class MySQLToJavaTypeConverter { + private static final Map typeMap = new HashMap<>(); + + static { + typeMap.put("tinyint", new Item(false, "Integer")); + typeMap.put("smallint", new Item(false, "Short")); + typeMap.put("mediumint", new Item(false, "Integer")); + typeMap.put("int", new Item(false, "Integer")); + typeMap.put("bigint", new Item(false, "Long")); + typeMap.put("float", new Item(false, "Float")); + typeMap.put("double", new Item(false, "Double")); + typeMap.put("char", new Item(false, "String")); + typeMap.put("varchar", new Item(false, "String")); + typeMap.put("text", new Item(false, "String")); + typeMap.put("longtext", new Item(false, "String")); + typeMap.put("blob", new Item(false, "Byte")); + typeMap.put("decimal", new Item(true, "BigDecimal")); + typeMap.put("date", new Item(true, "Date")); + typeMap.put("time", new Item(true, "Date")); + typeMap.put("datetime", new Item(true, "Date")); + typeMap.put("timestamp", new Item(true, "Date")); + } + + public static Item convert(String mysqlType) { + Item item = typeMap.get(mysqlType.toLowerCase()); + if (Objects.isNull(item)) { + return new Item(false, mysqlType); + } + return item; + } + + public static Item trans(String type) { + for (Item value : typeMap.values()) { + if (value.type.equals(type)) { + return value; + } + } + return new Item(false, type); + } + + @Data + @AllArgsConstructor + @NoArgsConstructor + public static class Item { + private boolean flag; + private String type; + } +} diff --git a/schisandra-cloud-storage-common-starter/easy-gen-code-spring-boot-starter/src/main/java/com/schisandra/core/utils/MySQLToMyBatisTypeConverter.java b/schisandra-cloud-storage-common-starter/easy-gen-code-spring-boot-starter/src/main/java/com/schisandra/core/utils/MySQLToMyBatisTypeConverter.java new file mode 100644 index 0000000..6a23275 --- /dev/null +++ b/schisandra-cloud-storage-common-starter/easy-gen-code-spring-boot-starter/src/main/java/com/schisandra/core/utils/MySQLToMyBatisTypeConverter.java @@ -0,0 +1,33 @@ +package com.schisandra.core.utils; + +import java.util.HashMap; +import java.util.Map; + +public class MySQLToMyBatisTypeConverter { + private static final Map typeMap = new HashMap<>(); + + static { + // 添加MySQL数据类型到MyBatis数据类型的映射关系 + typeMap.put("VARCHAR", "VARCHAR"); + typeMap.put("CHAR", "CHAR"); + typeMap.put("TEXT", "VARCHAR"); + typeMap.put("LONGTEXT", "VARCHAR"); + typeMap.put("INT", "INTEGER"); + typeMap.put("TINYINT", "TINYINT"); + typeMap.put("SMALLINT", "SMALLINT"); + typeMap.put("MEDIUMINT", "INTEGER"); + typeMap.put("BIGINT", "BIGINT"); + typeMap.put("FLOAT", "REAL"); + typeMap.put("DOUBLE", "DOUBLE"); + typeMap.put("DECIMAL", "DECIMAL"); + typeMap.put("DATE", "DATE"); + typeMap.put("TIME", "TIME"); + typeMap.put("DATETIME", "TIMESTAMP"); + typeMap.put("TIMESTAMP", "TIMESTAMP"); + typeMap.put("YEAR", "DATE"); + } + + public static String convert(String mysqlType) { + return typeMap.getOrDefault(mysqlType.toUpperCase(), "VARCHAR"); + } +} diff --git a/schisandra-cloud-storage-common-starter/easy-gen-code-spring-boot-starter/src/main/java/com/schisandra/core/utils/PrimitiveTypeUtils.java b/schisandra-cloud-storage-common-starter/easy-gen-code-spring-boot-starter/src/main/java/com/schisandra/core/utils/PrimitiveTypeUtils.java new file mode 100644 index 0000000..ae39fd9 --- /dev/null +++ b/schisandra-cloud-storage-common-starter/easy-gen-code-spring-boot-starter/src/main/java/com/schisandra/core/utils/PrimitiveTypeUtils.java @@ -0,0 +1,21 @@ +package com.schisandra.core.utils; + +/** + * 判断是否是基本类型工具类 + * + * @author loser + * @date 2023/9/4 + */ +public class PrimitiveTypeUtils { + + public static boolean isPrimitive(Object obj) { + return obj instanceof Integer || + obj instanceof Long || + obj instanceof Float || + obj instanceof Double || + obj instanceof Boolean || + obj instanceof Character || + obj instanceof Byte; + } + +} diff --git a/schisandra-cloud-storage-common-starter/easy-gen-code-spring-boot-starter/src/main/java/com/schisandra/core/utils/SystemUtils.java b/schisandra-cloud-storage-common-starter/easy-gen-code-spring-boot-starter/src/main/java/com/schisandra/core/utils/SystemUtils.java new file mode 100644 index 0000000..44cacb7 --- /dev/null +++ b/schisandra-cloud-storage-common-starter/easy-gen-code-spring-boot-starter/src/main/java/com/schisandra/core/utils/SystemUtils.java @@ -0,0 +1,49 @@ +package com.schisandra.core.utils; + +public class SystemUtils { + + /** + * 判断操作系统是否是 Windows + * + * @return true：操作系统是 Windows + * false：其它操作系统 + */ + public static boolean isWindows() { + String osName = getOsName(); + + return osName != null && osName.startsWith("Windows"); + } + + /** + * 判断操作系统是否是 MacOS + * + * @return true：操作系统是 MacOS + * false：其它操作系统 + */ + public static boolean isMacOs() { + String osName = getOsName(); + + return osName != null && osName.startsWith("Mac"); + } + + /** + * 判断操作系统是否是 Linux + * + * @return true：操作系统是 Linux + * false：其它操作系统 + */ + public static boolean isLinux() { + String osName = getOsName(); + + return (osName != null && osName.startsWith("Linux")) || (!isWindows() && !isMacOs()); + } + + /** + * 获取操作系统名称 + * + * @return os.name 属性值 + */ + public static String getOsName() { + return System.getProperty("os.name"); + } +} \ No newline at end of file diff --git a/schisandra-cloud-storage-common-starter/easy-gen-code-spring-boot-starter/src/main/java/com/schisandra/core/utils/TableUtils.java b/schisandra-cloud-storage-common-starter/easy-gen-code-spring-boot-starter/src/main/java/com/schisandra/core/utils/TableUtils.java new file mode 100644 index 0000000..a0c28b1 --- /dev/null +++ b/schisandra-cloud-storage-common-starter/easy-gen-code-spring-boot-starter/src/main/java/com/schisandra/core/utils/TableUtils.java @@ -0,0 +1,46 @@ +package com.schisandra.core.utils; + +import com.schisandra.core.anno.Table; +import com.schisandra.core.entity.TableInfo; + +import java.util.Arrays; +import java.util.List; +import java.util.Objects; +import java.util.stream.Collectors; + +public class TableUtils { + + private TableUtils() { + } + + public static String getComment(Class clazz) { + Table table = clazz.getAnnotation(Table.class); + if (Objects.isNull(table)) { + return ""; + } + return table.value(); + } + + public static List build(Class clazz) { + + String comment = getComment(clazz); + return Arrays.stream(clazz.getDeclaredFields()).filter(item -> { + Table table = item.getAnnotation(Table.class); + return Objects.nonNull(table); + }).map(item -> { + Table table = item.getAnnotation(Table.class); + TableInfo info = new TableInfo(); + info.setKeyType(table.keyType()); + info.setCol(table.col()); + info.setTableComment(comment); + info.setType(table.jdbcType()); + info.setMyBatisType(table.myBatisType()); + info.setName(item.getName()); + info.setComment(table.value()); + info.setDataType(item.getType().getSimpleName()); + return info; + }).collect(Collectors.toList()); + + } + +} diff --git a/schisandra-cloud-storage-common-starter/easy-gen-code-spring-boot-starter/src/main/java/com/schisandra/core/utils/YamlUtils.java b/schisandra-cloud-storage-common-starter/easy-gen-code-spring-boot-starter/src/main/java/com/schisandra/core/utils/YamlUtils.java new file mode 100644 index 0000000..f3abe04 --- /dev/null +++ b/schisandra-cloud-storage-common-starter/easy-gen-code-spring-boot-starter/src/main/java/com/schisandra/core/utils/YamlUtils.java @@ -0,0 +1,31 @@ +package com.schisandra.core.utils; + +import com.fasterxml.jackson.databind.ObjectMapper; +import com.fasterxml.jackson.dataformat.yaml.YAMLFactory; +import com.schisandra.core.core.CodeGenerationCode; + +import java.io.IOException; +import java.io.InputStream; +import java.net.URL; + +/** + * yml 转对象工具类 + * + * @author loser + * @date 2023/9/4 + */ +public class YamlUtils { + private static final ObjectMapper objectMapper = new ObjectMapper(new YAMLFactory()); + + public static T loadYaml(String filePath, Class valueType) { + try { + ClassLoader classLoader = CodeGenerationCode.class.getClassLoader(); + URL resource = classLoader.getResource(filePath); + InputStream inputStream = resource.openStream(); + return objectMapper.readValue(inputStream, valueType); + } catch (IOException e) { + e.printStackTrace(); + } + return null; + } +} diff --git a/schisandra-cloud-storage-common-starter/easy-gen-code-spring-boot-starter/src/main/resources/demo/genCode/fields.json b/schisandra-cloud-storage-common-starter/easy-gen-code-spring-boot-starter/src/main/resources/demo/genCode/fields.json new file mode 100644 index 0000000..b5d215c --- /dev/null +++ b/schisandra-cloud-storage-common-starter/easy-gen-code-spring-boot-starter/src/main/resources/demo/genCode/fields.json @@ -0,0 +1,44 @@ +{ + "fields": [ + { + "type": "int", + "name": "Element1" + }, + { + "type": "boolean", + "name": "Element2" + }, + { + "type": "byte", + "name": "Element3" + }, + { + "type": "double", + "name": "Element4" + }, + { + "type": "float", + "name": "Element5" + }, + { + "type": "short", + "name": "Element6" + }, + { + "type": "int", + "name": "Element7" + }, + { + "type": "char", + "name": "Element8" + }, + { + "type": "boolean", + "name": "Element9" + }, + { + "type": "long", + "name": "Element10" + } + ] +} \ No newline at end of file diff --git a/schisandra-cloud-storage-common-starter/easy-gen-code-spring-boot-starter/src/main/resources/demo/genCode/gen.yml b/schisandra-cloud-storage-common-starter/easy-gen-code-spring-boot-starter/src/main/resources/demo/genCode/gen.yml new file mode 100644 index 0000000..6193efe --- /dev/null +++ b/schisandra-cloud-storage-common-starter/easy-gen-code-spring-boot-starter/src/main/resources/demo/genCode/gen.yml @@ -0,0 +1,28 @@ +# 01 数据源输入 填充到全局的context中 +# 1.1 通过指定类的返回值写入 (优先级第一) +#handler: com.loser.core.impl.JdbcPutContextHandler +# 1.2 直接从classPath中引入一个json数据 可配合 mapperInfos 替换模板 (优先级第二) +json: genCode/fields.json +# 1.3 配置数据库信息从表字段中获取数据 (优先级第三) +#jdbc: +# url: jdbc:mysql://119.91.155.174:3306/ +# username: root +# password: 6666888123 +# dbName: ape +# driver: com.mysql.cj.jdbc.Driver +# tableName: sys_user + +# 02 模板与生成类的映射关系 通过修改该配置 切换不同的生成模板 （比如从基础的crud代码模板 切换到 rpc代码模板等） +mapperInfos: genCode/mapper.yml + +# 03 针对某个生成文件写入独有上下文 通过 mapper.yml > mappers > fileId 关联 +#filePutHandler: com.loser.core.impl.DemoFilePutContextHandler + +# 04 全局上下文参数 +params: + pre: Loser + module: test + author: loser + # 内置函数:now()-获取当前时间;date()-获取当前时间不带时分秒;svUid()-生成序列化ID; + # 扩展新的函数 则在调用生成方法前 使用 FunctionUtils.register(Function function) + date: now() \ No newline at end of file diff --git a/schisandra-cloud-storage-common-starter/easy-gen-code-spring-boot-starter/src/main/resources/demo/genCode/mapper.yml b/schisandra-cloud-storage-common-starter/easy-gen-code-spring-boot-starter/src/main/resources/demo/genCode/mapper.yml new file mode 100644 index 0000000..91932aa --- /dev/null +++ b/schisandra-cloud-storage-common-starter/easy-gen-code-spring-boot-starter/src/main/resources/demo/genCode/mapper.yml @@ -0,0 +1,74 @@ +# 生成到当前项目的那个子模块,没有则配置 / +module: /ape-demo/ + +# 模板文件和生成类的映射关系 多个文件 数组形式配置 +mappers: + - + - fileId: 001 + template: genCode/template/ReqAndRespTemplate.java.vm + # 生成到 src.main.java 下的对应包中 + packageName: com.loser.user.${module}.vo.resp + name: ${pre}InfoResp + ext: java + + # fileId 用于实现 FilePutContextHandler 接口时 忘对应文件的上下文补充数据 + - fileId: 002 + template: genCode/template/ReqAndRespTemplate.java.vm + # 优先级比 packageName 使用场景为需要指定目录的文件比如resources下的 mapper 文件等 + filePath: src/main/resources/${module}/template + name: ${pre}InfoResp + ext: java.vm + + - fileId: 003 + template: genCode/template/EntityTemplate.java.vm + packageName: com.loser.user.${module}.entity + name: ${pre} + ext: java + + - fileId: 004 + template: genCode/template/ReqAndRespTemplate.java.vm + packageName: com.loser.user.${module}.vo.req + name: ${pre}Req + ext: java + + - fileId: 005 + template: genCode/template/ReqAndRespTemplate.java.vm + packageName: com.loser.user.${module}.vo.resp + name: ${pre}Resp + ext: java + + - fileId: 006 + template: genCode/template/ServiceTemplate.java.vm + packageName: com.loser.user.${module}.service + name: ${pre}Service + ext: java + + - fileId: 007 + template: genCode/template/ServiceImplTemplate.java.vm + packageName: com.loser.user.${module}.service.impl + name: ${pre}ServiceImpl + ext: java + + - fileId: 008 + template: genCode/template/HandlerTemplate.java.vm + packageName: com.loser.user.${module}.handler + name: ${pre}Handler + ext: java + + - fileId: 009 + template: genCode/template/PageReqTemplate.java.vm + packageName: com.loser.user.${module}.vo.req + name: ${pre}PageReq + ext: java + + - fileId: 010 + template: genCode/template/ReqAndRespTemplate.java.vm + packageName: com.loser.user.${module}.vo.req + name: ${pre}SaveReq + ext: java + + - fileId: 011 + template: genCode/template/ReqAndRespTemplate.java.vm + packageName: com.loser.user.${module}.vo.req + name: ${pre}UpdateReq + ext: java diff --git a/schisandra-cloud-storage-common-starter/easy-gen-code-spring-boot-starter/src/main/resources/demo/genCode/template/EntityTemplate.java.vm b/schisandra-cloud-storage-common-starter/easy-gen-code-spring-boot-starter/src/main/resources/demo/genCode/template/EntityTemplate.java.vm new file mode 100644 index 0000000..785eb68 --- /dev/null +++ b/schisandra-cloud-storage-common-starter/easy-gen-code-spring-boot-starter/src/main/resources/demo/genCode/template/EntityTemplate.java.vm @@ -0,0 +1,19 @@ +package ${packageName}; + +#if($importDate) +import java.util.Date; +#end + +/** + * ${tableComment}实体 + * + * @author ${author} + * @date ${date} + */ +public class ${className} { +#foreach($field in $fields) + + private $field.type $field.name; +#end + +} diff --git a/schisandra-cloud-storage-common-starter/easy-gen-code-spring-boot-starter/src/main/resources/demo/genCode/template/HandlerTemplate.java.vm b/schisandra-cloud-storage-common-starter/easy-gen-code-spring-boot-starter/src/main/resources/demo/genCode/template/HandlerTemplate.java.vm new file mode 100644 index 0000000..e824a90 --- /dev/null +++ b/schisandra-cloud-storage-common-starter/easy-gen-code-spring-boot-starter/src/main/resources/demo/genCode/template/HandlerTemplate.java.vm @@ -0,0 +1,84 @@ +package ${packageName}; + +import com.loser.bean.Result; +import com.loser.user.mongo.ParamsUtil; +import com.loser.user.${module}.entity.${pre}; +import com.loser.user.${module}.service.${pre}Service; +import com.loser.user.${module}.vo.req.${pre}PageReq; +import com.loser.user.${module}.vo.req.${pre}SaveReq; +import com.loser.user.${module}.vo.req.${pre}UpdateReq; +import com.loser.user.${module}.vo.resp.${pre}InfoResp; +import com.loser.core.entity.Page; +import com.loser.core.wrapper.LambdaQueryWrapper; +import com.loser.core.wrapper.Wrappers; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Component; + +import java.util.Objects; + +/** + * 测试数据 处理器 + * + * @author loser + * @date 2023-06-13 + */ +@Component +public class ${pre}Handler { + + @Autowired + private ${pre}Service ${pre}Service; + + /** + * 新增测试数据 + */ + public Result save(${pre}SaveReq req) { + + ${pre} save = ParamsUtil.copyProperties(req, ${pre}.class); + return Result.ok(${pre}Service.save(save)); + + } + + /** + * 修改测试数据 + */ + public Result update(${pre}UpdateReq req) { + + ${pre} update = ParamsUtil.copyProperties(req, ${pre}.class); + return Result.ok(${pre}Service.updateById(update)); + + } + + /** + * 通过id删除测试数据 + */ + public Result deleteById(String id) { + + return Result.ok(${pre}Service.removeById(id)); + + } + + /** + * 通过id获取测试数据 + */ + public Result<${pre}InfoResp> getById(String id) { + + ${pre} dbData = ${pre}Service.getById(id); + if (Objects.isNull(dbData)) { + return Result.ok(); + } + return Result.ok(ParamsUtil.copyProperties(dbData, ${pre}InfoResp.class)); + + } + + /** + * 分页获取测试数据 + */ + public Result> queryList(${pre}PageReq req) { + + LambdaQueryWrapper<${pre}> query = Wrappers.<${pre}>lambdaQuery(); + Page<${pre}> page = ${pre}Service.page(query, req.getPageNo(), req.getPageSize()); + return Result.ok(page); + + } + +} diff --git a/schisandra-cloud-storage-common-starter/easy-gen-code-spring-boot-starter/src/main/resources/demo/genCode/template/PageReqTemplate.java.vm b/schisandra-cloud-storage-common-starter/easy-gen-code-spring-boot-starter/src/main/resources/demo/genCode/template/PageReqTemplate.java.vm new file mode 100644 index 0000000..79e85e2 --- /dev/null +++ b/schisandra-cloud-storage-common-starter/easy-gen-code-spring-boot-starter/src/main/resources/demo/genCode/template/PageReqTemplate.java.vm @@ -0,0 +1,26 @@ +package ${packageName}; + +#if($importDate) +import java.util.Date; +#end +import lombok.Data; + +/** + * ${tableComment}实体 + * + * @author ${author} + * @date ${date} + */ +@Data +public class ${className} { + + private Integer pageNo = 1; + + private Integer pageSize = 20; + +#foreach($field in $fields) + + private $field.type $field.name; +#end + +} diff --git a/schisandra-cloud-storage-common-starter/easy-gen-code-spring-boot-starter/src/main/resources/demo/genCode/template/ReqAndRespTemplate.java.vm b/schisandra-cloud-storage-common-starter/easy-gen-code-spring-boot-starter/src/main/resources/demo/genCode/template/ReqAndRespTemplate.java.vm new file mode 100644 index 0000000..039a2a9 --- /dev/null +++ b/schisandra-cloud-storage-common-starter/easy-gen-code-spring-boot-starter/src/main/resources/demo/genCode/template/ReqAndRespTemplate.java.vm @@ -0,0 +1,21 @@ +package ${packageName}; + +#if($importDate) +import java.util.Date; +#end +import lombok.Data; + +/** + * ${tableComment}试图 + * + * @author ${author} + * @date ${date} + */ +@Data +public class $className { +#foreach($field in $fields) + + private $field.type $field.name; +#end + +} diff --git a/schisandra-cloud-storage-common-starter/easy-gen-code-spring-boot-starter/src/main/resources/demo/genCode/template/ServiceImplTemplate.java.vm b/schisandra-cloud-storage-common-starter/easy-gen-code-spring-boot-starter/src/main/resources/demo/genCode/template/ServiceImplTemplate.java.vm new file mode 100644 index 0000000..b3ec8a5 --- /dev/null +++ b/schisandra-cloud-storage-common-starter/easy-gen-code-spring-boot-starter/src/main/resources/demo/genCode/template/ServiceImplTemplate.java.vm @@ -0,0 +1,11 @@ +package ${packageName}; + +import com.loser.user.${module}.entity.${pre}; +import com.loser.user.${module}.service.${pre}Service; +import com.loser.core.impl.EasyMongoServiceImpl; +import org.springframework.stereotype.Service; + +@Service +public class ${pre}ServiceImpl extends EasyMongoServiceImpl implements ${pre}Service { + +} diff --git a/schisandra-cloud-storage-common-starter/easy-gen-code-spring-boot-starter/src/main/resources/demo/genCode/template/ServiceTemplate.java.vm b/schisandra-cloud-storage-common-starter/easy-gen-code-spring-boot-starter/src/main/resources/demo/genCode/template/ServiceTemplate.java.vm new file mode 100644 index 0000000..b3be863 --- /dev/null +++ b/schisandra-cloud-storage-common-starter/easy-gen-code-spring-boot-starter/src/main/resources/demo/genCode/template/ServiceTemplate.java.vm @@ -0,0 +1,8 @@ +package ${packageName}; + +import com.loser.user.${module}.entity.${pre}; +import com.loser.core.sdk.EasyMongoService; + +public interface ${pre}Service extends EasyMongoService { + +} diff --git a/schisandra-cloud-storage-common-starter/pom.xml b/schisandra-cloud-storage-common-starter/pom.xml new file mode 100644 index 0000000..c68a6de --- /dev/null +++ b/schisandra-cloud-storage-common-starter/pom.xml @@ -0,0 +1,44 @@ + + 4.0.0 + + com.schisandra + schisandra-cloud-storage-common-starter + 1.0-SNAPSHOT + pom + + schisandra-cloud-storage-common-starter + + easy-gen-code-spring-boot-starter + + + + 8 + 8 + + + + + org.springframework.boot + spring-boot-dependencies + 2.4.2 + pom + import + + + + + + central + aliyun maven + http://maven.aliyun.com/nexus/content/groups/public/ + default + + true + + + true + + + + diff --git a/schisandra-cloud-storage-gateway/src/main/java/com/schisandra/gateway/GatewayApplication.java b/schisandra-cloud-storage-gateway/src/main/java/com/schisandra/gateway/GatewayApplication.java index f4405ab..a77a5d1 100644 --- a/schisandra-cloud-storage-gateway/src/main/java/com/schisandra/gateway/GatewayApplication.java +++ b/schisandra-cloud-storage-gateway/src/main/java/com/schisandra/gateway/GatewayApplication.java @@ -7,7 +7,7 @@ import org.springframework.context.annotation.ComponentScan; /** * 网关启动类 * - * @author: landaiqing + * @author: schisandra * @date: 2024/2/7 */ @SpringBootApplication diff --git a/schisandra-cloud-storage-gateway/src/main/java/com/schisandra/gateway/auth/SaTokenConfigure.java b/schisandra-cloud-storage-gateway/src/main/java/com/schisandra/gateway/auth/SaTokenConfigure.java index 0ddc1d7..069f6dd 100644 --- a/schisandra-cloud-storage-gateway/src/main/java/com/schisandra/gateway/auth/SaTokenConfigure.java +++ b/schisandra-cloud-storage-gateway/src/main/java/com/schisandra/gateway/auth/SaTokenConfigure.java @@ -8,7 +8,7 @@ import org.springframework.context.annotation.Configuration; /** * 权限认证的配置器 * - * @author: landaiqing + * @author: schisandra */ @Configuration public class SaTokenConfigure { diff --git a/schisandra-cloud-storage-gateway/src/main/java/com/schisandra/gateway/auth/StpInterfaceImpl.java b/schisandra-cloud-storage-gateway/src/main/java/com/schisandra/gateway/auth/StpInterfaceImpl.java index 0e77b9d..d037b8d 100644 --- a/schisandra-cloud-storage-gateway/src/main/java/com/schisandra/gateway/auth/StpInterfaceImpl.java +++ b/schisandra-cloud-storage-gateway/src/main/java/com/schisandra/gateway/auth/StpInterfaceImpl.java @@ -18,7 +18,7 @@ import java.util.stream.Collectors; /** * 自定义权限验证接口扩展 * - * @author: landaiqing + * @author: schisandra */ @Component public class StpInterfaceImpl implements StpInterface { diff --git a/schisandra-cloud-storage-gateway/src/main/java/com/schisandra/gateway/entity/AuthPermission.java b/schisandra-cloud-storage-gateway/src/main/java/com/schisandra/gateway/entity/AuthPermission.java index 8d13f83..7f7867a 100644 --- a/schisandra-cloud-storage-gateway/src/main/java/com/schisandra/gateway/entity/AuthPermission.java +++ b/schisandra-cloud-storage-gateway/src/main/java/com/schisandra/gateway/entity/AuthPermission.java @@ -8,7 +8,7 @@ import java.util.Date; /** * (AuthPermission)实体类 * - * @author landaiqing + * @author schisandra */ @Data public class AuthPermission implements Serializable { diff --git a/schisandra-cloud-storage-gateway/src/main/java/com/schisandra/gateway/entity/AuthRole.java b/schisandra-cloud-storage-gateway/src/main/java/com/schisandra/gateway/entity/AuthRole.java index b61acd6..0e41139 100644 --- a/schisandra-cloud-storage-gateway/src/main/java/com/schisandra/gateway/entity/AuthRole.java +++ b/schisandra-cloud-storage-gateway/src/main/java/com/schisandra/gateway/entity/AuthRole.java @@ -8,7 +8,7 @@ import java.util.Date; /** * (AuthRole)实体类 * - * @author landaiqing + * @author schisandra * @since 2024-2-18 18:55:50 */ @Data 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 9444e35..fb262ce 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 @@ -15,9 +15,9 @@ import reactor.core.publisher.Mono; /** * @Classname GatewayExceptionHandler - * @BelongsProject: qing-yu-club - * @BelongsPackage: com.landaiqing.club.gateway.exception - * @Author: landaiqing + * @BelongsProject: schisandra-cloud-storage + * @BelongsPackage: com.schisandra.club.gateway.exception + * @Author: schisandra * @CreateTime: 2024-05-18 17:52 * @Description: 网关全局异常处理 * @Version: 1.0 diff --git a/schisandra-cloud-storage-gateway/src/main/java/com/schisandra/gateway/filter/LoginFilter.java b/schisandra-cloud-storage-gateway/src/main/java/com/schisandra/gateway/filter/LoginFilter.java index 2461c13..9383f9f 100644 --- a/schisandra-cloud-storage-gateway/src/main/java/com/schisandra/gateway/filter/LoginFilter.java +++ b/schisandra-cloud-storage-gateway/src/main/java/com/schisandra/gateway/filter/LoginFilter.java @@ -14,9 +14,9 @@ import reactor.core.publisher.Mono; /** * @Classname LoginFilter - * @BelongsProject: qing-yu-club - * @BelongsPackage: com.landaiqing.club.gateway.filter - * @Author: landaiqing + * @BelongsProject: schisandra-cloud-storage + * @BelongsPackage: com.schisandra.club.gateway.filter + * @Author: schisandra * @CreateTime: 2024-03-03 17:41 * @Description: 登录拦截器 * @Version: 1.0 diff --git a/schisandra-cloud-storage-gateway/src/main/java/com/schisandra/gateway/redis/RedisConfig.java b/schisandra-cloud-storage-gateway/src/main/java/com/schisandra/gateway/redis/RedisConfig.java index 2e505fb..378e808 100644 --- a/schisandra-cloud-storage-gateway/src/main/java/com/schisandra/gateway/redis/RedisConfig.java +++ b/schisandra-cloud-storage-gateway/src/main/java/com/schisandra/gateway/redis/RedisConfig.java @@ -15,9 +15,9 @@ import org.springframework.data.redis.serializer.StringRedisSerializer; /** * @Classname RedisConfig - * @BelongsProject: qing-yu-club - * @BelongsPackage: com.landaiqing.club.gateway.redis - * @Author: landaiqing + * @BelongsProject: schisandra-cloud-storage + * @BelongsPackage: com.schisandra.club.gateway.redis + * @Author: schisandra * @CreateTime: 2024-02-18 18:10 * @Description: redis的config处理 * @Version: 1.0 diff --git a/schisandra-cloud-storage-gateway/src/main/java/com/schisandra/gateway/redis/RedisUtil.java b/schisandra-cloud-storage-gateway/src/main/java/com/schisandra/gateway/redis/RedisUtil.java index cf08e0b..42d60d6 100644 --- a/schisandra-cloud-storage-gateway/src/main/java/com/schisandra/gateway/redis/RedisUtil.java +++ b/schisandra-cloud-storage-gateway/src/main/java/com/schisandra/gateway/redis/RedisUtil.java @@ -13,7 +13,7 @@ import java.util.stream.Stream; /** * RedisUtil工具类 * - * @author: landaiqing + * @author: schisandra * @date: 2024/2/19 */ @Component diff --git a/schisandra-cloud-storage-gen/pom.xml b/schisandra-cloud-storage-gen/pom.xml new file mode 100644 index 0000000..9dea50a --- /dev/null +++ b/schisandra-cloud-storage-gen/pom.xml @@ -0,0 +1,30 @@ + + + 4.0.0 + + com.schisandra + schisandra-cloud-storage-gen + 1.0-SNAPSHOT + jar + + schisandra-cloud-storage-gen + + + 8 + 8 + + + + com.schisandra + easy-gen-code-spring-boot-starter + 1.0-SNAPSHOT + + + org.projectlombok + lombok + 1.18.24 + + + diff --git a/schisandra-cloud-storage-gen/src/main/java/BizPutContextHandler.java b/schisandra-cloud-storage-gen/src/main/java/BizPutContextHandler.java new file mode 100644 index 0000000..556e57c --- /dev/null +++ b/schisandra-cloud-storage-gen/src/main/java/BizPutContextHandler.java @@ -0,0 +1,58 @@ +import cn.hutool.core.convert.Convert; +import cn.hutool.core.util.StrUtil; +import com.alibaba.fastjson.JSONObject; +import com.schisandra.core.config.GenConfig; +import com.schisandra.core.config.MapperConfig; +import com.schisandra.core.core.sdk.PostCurFiledContextAware; +import com.schisandra.core.entity.TableInfo; +import com.schisandra.core.utils.MySQLToJavaTypeConverter; +import org.apache.velocity.VelocityContext; + +import java.util.List; +import java.util.regex.Matcher; +import java.util.regex.Pattern; + +public class BizPutContextHandler implements PostCurFiledContextAware { + + public static String underlineToHump(String str, boolean removePre) { + if (removePre) { + str = str.substring(str.indexOf("_")); + } + str = str.toLowerCase(); + Pattern compile = Pattern.compile("_[a-z]"); + Matcher matcher = compile.matcher(str); + StringBuffer sb = new StringBuffer(); + while (matcher.find()) { + matcher.appendReplacement(sb, matcher.group(0).toUpperCase().replace("_", "")); + } + matcher.appendTail(sb); + return StrUtil.upperFirst(sb.toString()); + } + + private static String convert(String str) { + if (str == null || str.isEmpty()) { + return str; + } + char firstChar = str.charAt(0); + char lowerFirstChar = Character.toLowerCase(firstChar); + return lowerFirstChar + str.substring(1); + } + + @Override + public void doAware(GenConfig genConfig, MapperConfig mapperConfig, VelocityContext context) { + + // 处理导包标志位 + List files = JSONObject.parseArray(JSONObject.toJSONString(context.get("fields")), TableInfo.class); + for (TableInfo tableInfo : files) { + MySQLToJavaTypeConverter.Item typeInfo = tableInfo.getTypeInfo(tableInfo.getType()); + if (typeInfo.isFlag()) { + context.put("import" + typeInfo.getType(), true); + } + } + context.put("modelName", underlineToHump(genConfig.getJdbc().getTableName(), Convert.toBool(context.get("removePre")))); + context.put("_modelName", convert(context.get("modelName").toString())); + context.put("tableName", genConfig.getJdbc().getTableName()); + + } + +} diff --git a/schisandra-cloud-storage-gen/src/main/java/GenCodeMain.java b/schisandra-cloud-storage-gen/src/main/java/GenCodeMain.java new file mode 100644 index 0000000..6b40d91 --- /dev/null +++ b/schisandra-cloud-storage-gen/src/main/java/GenCodeMain.java @@ -0,0 +1,9 @@ +import com.schisandra.core.core.CodeGenerationCode; + +public class GenCodeMain { + + public static void main(String[] args) { + CodeGenerationCode.doGenCode(new BizPutContextHandler()); + } + +} diff --git a/schisandra-cloud-storage-gen/src/main/resources/genCode/authMapper.yml b/schisandra-cloud-storage-gen/src/main/resources/genCode/authMapper.yml new file mode 100644 index 0000000..d2e5ddd --- /dev/null +++ b/schisandra-cloud-storage-gen/src/main/resources/genCode/authMapper.yml @@ -0,0 +1,69 @@ +# auth模块映射关系 ${module} 占位符 +# 模板文件和生成类的映射关系 多个文件 数组形式配置 +mappers: + - + - fileId: 001 + template: genCode/template/DemoDTO.java.vm + filePath: /schisandra-cloud-storage-${module}/schisandra-cloud-storage-${module}-application/schisandra-cloud-storage-${module}-application-controller/src/main/java/com/schisandra/${module}/application/dto + name: ${modelName}DTO + ext: java + - fileId: 002 + template: genCode/template/DemoController.java.vm + filePath: /schisandra-cloud-storage-${module}/schisandra-cloud-storage-${module}-application/schisandra-cloud-storage-${module}-application-controller/src/main/java/com/schisandra/${module}/application/controller + name: ${modelName}Controller + ext: java + - fileId: 003 + template: genCode/template/DemoDTOConverter.java.vm + filePath: /schisandra-cloud-storage-${module}/schisandra-cloud-storage-${module}-application/schisandra-cloud-storage-${module}-application-controller/src/main/java/com/schisandra/${module}/application/convert + name: ${modelName}DTOConverter + ext: java + - fileId: 004 + template: genCode/template/DemoBO.java.vm + filePath: /schisandra-cloud-storage-${module}/schisandra-cloud-storage-${module}-domain/src/main/java/com/schisandra/${module}/domain/entity + name: ${modelName}BO + ext: java + - fileId: 005 + template: genCode/template/DemoDomainService.java.vm + filePath: /schisandra-cloud-storage-${module}/schisandra-cloud-storage-${module}-domain/src/main/java/com/schisandra/${module}/domain/service + name: ${modelName}DomainService + ext: java + - fileId: 006 + template: genCode/template/DemoDomainServiceImpl.java.vm + filePath: /schisandra-cloud-storage-${module}/schisandra-cloud-storage-${module}-domain/src/main/java/com/schisandra/${module}/domain/service/impl + name: ${modelName}DomainServiceImpl + ext: java + - fileId: 007 + template: genCode/template/DemoBOConverter.java.vm + filePath: /schisandra-cloud-storage-${module}/schisandra-cloud-storage-${module}-domain/src/main/java/com/schisandra/${module}/domain/convert + name: ${modelName}BOConverter + ext: java + - fileId: 008 + template: genCode/template/DemoService.java.vm + filePath: /schisandra-cloud-storage-${module}/schisandra-cloud-storage-${module}-infra/src/main/java/com/schisandra/${module}/infra/basic/service + name: ${modelName}Service + ext: java + - fileId: 009 + template: genCode/template/DemoTable.java.vm + filePath: /schisandra-cloud-storage-${module}/schisandra-cloud-storage-${module}-infra/src/main/java/com/schisandra/${module}/infra/basic/entity + name: ${modelName} + ext: java + - fileId: 010 + template: genCode/template/DemoServiceImpl.java.vm + filePath: /schisandra-cloud-storage-${module}/schisandra-cloud-storage-${module}-infra/src/main/java/com/schisandra/${module}/infra/basic/service/impl + name: ${modelName}ServiceImpl + ext: java + - fileId: 011 + template: genCode/template/DemoDao.java.vm + filePath: /schisandra-cloud-storage-${module}/schisandra-cloud-storage-${module}-infra/src/main/java/com/schisandra/${module}/infra/basic/mapper + name: ${modelName}Dao + ext: java + - fileId: 012 + template: genCode/template/DemoXml.xml.vm + filePath: /schisandra-cloud-storage-${module}/schisandra-cloud-storage-${module}-infra/src/main/resources/mapper + name: ${modelName}Dao + ext: xml + + + + + diff --git a/schisandra-cloud-storage-gen/src/main/resources/genCode/gen.yml b/schisandra-cloud-storage-gen/src/main/resources/genCode/gen.yml new file mode 100644 index 0000000..89d06c1 --- /dev/null +++ b/schisandra-cloud-storage-gen/src/main/resources/genCode/gen.yml @@ -0,0 +1,33 @@ +# 使用步骤 +# 01 替换数据库连接信息及对应表 jdbc:* +# 02 替换模板映射关系 mapperInfos +# 03 替换作者信息 params:loser +# 04 替换模块 params:module +# 05 替换 controller 前缀 params:api + +# 数据库连接信息 +jdbc: + dbName: schisandra-cloud-storage + tableName: subject_liked + url: jdbc:mysql://1.95.0.111:3306/ + username: schisandra + password: LDQ20020618xxx + driver: com.mysql.cj.jdbc.Driver + +# 使用的模板与生成文件映射给关系 +mapperInfos: genCode/subjectLikedMapper.yml + +# 全局参数 +params: + # 作者 + author: schisandra + # 模块 + module: subject + # controller 通用前缀 + api: /subjectLiked + # 生成对象是否移除前缀 + removePre: false + # 使用内置函数赋值给变量 FunctionUtils 中替换 + genDate: now() + # win 需要补充模板具体目录 + templateBasePath: E:/JavaProjects_IDEA/schisandra-cloud-storage/schisandra-cloud-storage-gen/src/main/resources/ diff --git a/schisandra-cloud-storage-gen/src/main/resources/genCode/template/DemoBO.java.vm b/schisandra-cloud-storage-gen/src/main/resources/genCode/template/DemoBO.java.vm new file mode 100644 index 0000000..d430907 --- /dev/null +++ b/schisandra-cloud-storage-gen/src/main/resources/genCode/template/DemoBO.java.vm @@ -0,0 +1,24 @@ +package com.schisandra.${module}.domain.entity; + +import lombok.Data; + +import java.io.Serializable; + +/** + * ${tableComment} bo + * + * @author ${author} + * @since ${genDate} + */ +@Data +public class ${modelName}BO implements Serializable { + #foreach($field in $fields) + + /** + * ${field.comment} + */ + private $field.type $field.name; + #end + +} + diff --git a/schisandra-cloud-storage-gen/src/main/resources/genCode/template/DemoBOConverter.java.vm b/schisandra-cloud-storage-gen/src/main/resources/genCode/template/DemoBOConverter.java.vm new file mode 100644 index 0000000..96c804f --- /dev/null +++ b/schisandra-cloud-storage-gen/src/main/resources/genCode/template/DemoBOConverter.java.vm @@ -0,0 +1,21 @@ +package com.schisandra.${module}.domain.convert; + + ${module}.domain.entity.${modelName}BO; + ${module}.infra.basic.entity.${modelName}; +import org.mapstruct.Mapper; +import org.mapstruct.factory.Mappers; + +/** + * ${tableComment} bo转换器 + * + * @author ${author} + * @since ${genDate} + */ +@Mapper +public interface ${modelName}BOConverter { + + ${modelName}BOConverter INSTANCE = Mappers.getMapper(${modelName}BOConverter.class); + + ${modelName} convertBOToEntity(${modelName}BO ${_modelName}BO); + +} diff --git a/schisandra-cloud-storage-gen/src/main/resources/genCode/template/DemoController.java.vm b/schisandra-cloud-storage-gen/src/main/resources/genCode/template/DemoController.java.vm new file mode 100644 index 0000000..5ac6130 --- /dev/null +++ b/schisandra-cloud-storage-gen/src/main/resources/genCode/template/DemoController.java.vm @@ -0,0 +1,97 @@ +package com.schisandra.${module}.application.controller; + +import com.alibaba.fastjson.JSON; +import com.google.common.base.Preconditions; + ${module}.application.convert.${modelName}DTOConverter; + ${module}.application.dto.${modelName}DTO; + ${module}.common.entity.Result; + ${module}.domain.entity.${modelName}BO; + ${module}.domain.service.${modelName}DomainService; +import lombok.extern.slf4j.Slf4j; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import javax.annotation.Resource; + +/** + * ${tableComment} controller + * + * @author ${author} + * @since ${genDate} + */ +@RestController +@RequestMapping("${api}/") +@Slf4j +public class ${modelName}Controller { + + @Resource + private ${modelName}DomainService ${_modelName}DomainService; + + /** + * 新增${tableComment} + */ + @RequestMapping("add") + public Result add(@RequestBody ${modelName}DTO ${_modelName}DTO) { + + try { + if (log.isInfoEnabled()) { + log.info("${modelName}Controller.add.dto:{}", JSON.toJSONString(${_modelName}DTO)); + } + #foreach($field in $fields) + Preconditions.checkNotNull(${_modelName}DTO.get${field.upName}(), "${field.comment}不能为空"); + #end + ${modelName}BO ${modelName}BO = ${modelName}DTOConverter.INSTANCE.convertDTOToBO(${_modelName}DTO); + return Result.ok(${_modelName}DomainService.add(${modelName}BO)); + } catch (Exception e) { + log.error("${modelName}Controller.register.error:{}", e.getMessage(), e); + return Result.fail("新增${tableComment}失败"); + } + + } + + /** + * 修改${tableComment} + */ + @RequestMapping("update") + public Result update(@RequestBody ${modelName}DTO ${_modelName}DTO) { + + try { + if (log.isInfoEnabled()) { + log.info("${modelName}Controller.update.dto:{}", JSON.toJSONString(${_modelName}DTO)); + } + #foreach($field in $fields) + Preconditions.checkNotNull(${_modelName}DTO.get${field.upName}(), "${field.comment}不能为空"); + #end + ${modelName}BO ${_modelName}BO = ${modelName}DTOConverter.INSTANCE.convertDTOToBO(${_modelName}DTO); + return Result.ok(${_modelName}DomainService.update(${_modelName}BO)); + } catch (Exception e) { + log.error("${modelName}Controller.update.error:{}", e.getMessage(), e); + return Result.fail("更新${tableComment}信息失败"); + } + + } + + /** + * 删除${tableComment} + */ + @RequestMapping("delete") + public Result delete(@RequestBody ${modelName}DTO ${_modelName}DTO) { + + try { + if (log.isInfoEnabled()) { + log.info("${modelName}Controller.delete.dto:{}", JSON.toJSONString(${_modelName}DTO)); + } + #foreach($field in $fields) + Preconditions.checkNotNull(${_modelName}DTO.get${field.upName}(), "${field.comment}不能为空"); + #end + ${modelName}BO ${_modelName}BO = ${modelName}DTOConverter.INSTANCE.convertDTOToBO(${_modelName}DTO); + return Result.ok(${_modelName}DomainService.delete(${_modelName}BO)); + } catch (Exception e) { + log.error("${modelName}Controller.delete.error:{}", e.getMessage(), e); + return Result.fail("删除${tableComment}信息失败"); + } + + } + +} diff --git a/schisandra-cloud-storage-gen/src/main/resources/genCode/template/DemoDTO.java.vm b/schisandra-cloud-storage-gen/src/main/resources/genCode/template/DemoDTO.java.vm new file mode 100644 index 0000000..32f678d --- /dev/null +++ b/schisandra-cloud-storage-gen/src/main/resources/genCode/template/DemoDTO.java.vm @@ -0,0 +1,24 @@ +package com.schisandra.${module}.application.dto; + +import lombok.Data; + +import java.io.Serializable; + +/** + * ${tableComment} dto + * + * @author ${author} + * @since ${genDate} + */ +@Data +public class ${modelName}DTO implements Serializable { + #foreach($field in $fields) + + /** + * ${field.comment} + */ + private $field.type $field.name; + #end + +} + diff --git a/schisandra-cloud-storage-gen/src/main/resources/genCode/template/DemoDTOConverter.java.vm b/schisandra-cloud-storage-gen/src/main/resources/genCode/template/DemoDTOConverter.java.vm new file mode 100644 index 0000000..4d7dea8 --- /dev/null +++ b/schisandra-cloud-storage-gen/src/main/resources/genCode/template/DemoDTOConverter.java.vm @@ -0,0 +1,21 @@ +package com.schisandra.${module}.application.convert; + + ${module}.application.dto.${modelName}DTO; + ${module}.domain.entity.${modelName}BO; +import org.mapstruct.Mapper; +import org.mapstruct.factory.Mappers; + +/** + * ${tableComment} dto转换器 + * + * @author ${author} + * @since ${genDate} + */ +@Mapper +public interface ${modelName}DTOConverter { + + ${modelName}DTOConverter INSTANCE = Mappers.getMapper(${modelName}DTOConverter.class); + + ${modelName}BO convertDTOToBO(${modelName}DTO ${_modelName}DTO); + +} diff --git a/schisandra-cloud-storage-gen/src/main/resources/genCode/template/DemoDao.java.vm b/schisandra-cloud-storage-gen/src/main/resources/genCode/template/DemoDao.java.vm new file mode 100644 index 0000000..1ac61e4 --- /dev/null +++ b/schisandra-cloud-storage-gen/src/main/resources/genCode/template/DemoDao.java.vm @@ -0,0 +1,17 @@ +package com.schisandra.${module}.infra.basic.mapper; + + ${module}.infra.basic.entity.${modelName}; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.springframework.stereotype.Repository; + +/** + * ${tableComment} 表数据库访问层 + * + * @author ${author} + * @since ${genDate} + */ +@Repository +public interface ${modelName}Dao extends BaseMapper<${modelName}> { + +} + diff --git a/schisandra-cloud-storage-gen/src/main/resources/genCode/template/DemoDomainService.java.vm b/schisandra-cloud-storage-gen/src/main/resources/genCode/template/DemoDomainService.java.vm new file mode 100644 index 0000000..20e8039 --- /dev/null +++ b/schisandra-cloud-storage-gen/src/main/resources/genCode/template/DemoDomainService.java.vm @@ -0,0 +1,26 @@ +package com.schisandra.${module}.domain.service;${module}.domain.entity.${modelName}BO; + +/** + * ${tableComment} 领域service + * + * @author ${author} + * @since ${genDate} + */ +public interface ${modelName}DomainService { + + /** + * 添加 ${tableComment} 信息 + */ + Boolean add(${modelName}BO ${_modelName}BO); + + /** + * 更新 ${tableComment} 信息 + */ + Boolean update(${modelName}BO ${_modelName}BO); + + /** + * 删除 ${tableComment} 信息 + */ + Boolean delete(${modelName}BO ${_modelName}BO); + +} diff --git a/schisandra-cloud-storage-gen/src/main/resources/genCode/template/DemoDomainServiceImpl.java.vm b/schisandra-cloud-storage-gen/src/main/resources/genCode/template/DemoDomainServiceImpl.java.vm new file mode 100644 index 0000000..8c433ef --- /dev/null +++ b/schisandra-cloud-storage-gen/src/main/resources/genCode/template/DemoDomainServiceImpl.java.vm @@ -0,0 +1,48 @@ +package com.schisandra.${module}.domain.service.impl; + + ${module}.common.enums.IsDeletedFlagEnum; + ${module}.domain.convert.${modelName}BOConverter; + ${module}.domain.entity.${modelName}BO; + ${module}.domain.service.${modelName}DomainService; + ${module}.infra.basic.entity.${modelName}; + ${module}.infra.basic.service.${modelName}Service; +import lombok.extern.slf4j.Slf4j; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; + +/** + * ${tableComment} 领域service实现了 + * + * @author ${author} + * @since ${genDate} + */ +@Service +@Slf4j +public class ${modelName}DomainServiceImpl implements ${modelName}DomainService { + + @Resource + private ${modelName}Service ${_modelName}Service; + + @Override + public Boolean add(${modelName}BO ${_modelName}BO) { + ${modelName} ${_modelName} = ${modelName}BOConverter.INSTANCE.convertBOToEntity(${_modelName}BO); + ${_modelName}.setIsDeleted(IsDeletedFlagEnum.UN_DELETED.getCode()); + return ${_modelName}Service.insert(${_modelName}) > 0; + } + + @Override + public Boolean update(${modelName}BO ${_modelName}BO) { + ${modelName} ${_modelName} = ${modelName}BOConverter.INSTANCE.convertBOToEntity(${_modelName}BO); + return ${_modelName}Service.update(${_modelName}) > 0; + } + + @Override + public Boolean delete(${modelName}BO ${_modelName}BO) { + ${modelName} ${_modelName} = new ${modelName}(); + ${_modelName}.setId(${_modelName}BO.getId()); + ${_modelName}.setIsDeleted(IsDeletedFlagEnum.DELETED.getCode()); + return ${_modelName}Service.update(${_modelName}) > 0; + } + +} diff --git a/schisandra-cloud-storage-gen/src/main/resources/genCode/template/DemoService.java.vm b/schisandra-cloud-storage-gen/src/main/resources/genCode/template/DemoService.java.vm new file mode 100644 index 0000000..bf52488 --- /dev/null +++ b/schisandra-cloud-storage-gen/src/main/resources/genCode/template/DemoService.java.vm @@ -0,0 +1,48 @@ +package com.schisandra.${module}.infra.basic.service;${module}.infra.basic.entity.${modelName}; + +/** + * ${tableComment} 表服务接口 + * + * @author ${author} + * @since ${genDate} + */ +public interface ${modelName}Service { + + /** + * 通过ID查询单条数据 + * + * @param id 主键 + * @return 实例对象 + */ + ${modelName} queryById(Long id); + + /** + * 新增数据 + * + * @param ${_modelName} 实例对象 + * @return 实例对象 + */ + int insert(${modelName} ${_modelName}); + + /** + * 修改数据 + * + * @param ${_modelName} 实例对象 + * @return 实例对象 + */ + int update(${modelName} ${_modelName}); + + /** + * 通过主键删除数据 + * + * @param id 主键 + * @return 是否成功 + */ + boolean deleteById(Long id); + + /** + * 根据条件查询角色 + */ + ${modelName} queryByCondition(${modelName} ${_modelName}); + +} diff --git a/schisandra-cloud-storage-gen/src/main/resources/genCode/template/DemoServiceImpl.java.vm b/schisandra-cloud-storage-gen/src/main/resources/genCode/template/DemoServiceImpl.java.vm new file mode 100644 index 0000000..d0ac38e --- /dev/null +++ b/schisandra-cloud-storage-gen/src/main/resources/genCode/template/DemoServiceImpl.java.vm @@ -0,0 +1,87 @@ +package com.schisandra.${module}.infra.basic.service.impl; + +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; + ${module}.infra.basic.entity.${modelName}; + ${module}.infra.basic.mapper.${modelName}Dao; + ${module}.infra.basic.service.${modelName}Service; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.Objects; + +/** + * ${tableComment} 表服务实现类 + * + * @author ${author} + * @since ${genDate} + */ +@Service("${modelName}Service") +public class ${modelName}ServiceImpl implements ${modelName}Service { + + @Resource + private ${modelName}Dao ${_modelName}Dao; + + /** + * 通过ID查询单条数据 + * + * @param id 主键 + * @return 实例对象 + */ + @Override + public ${modelName} queryById(Long id) { + return this.${_modelName}Dao.selectById(id); + } + + /** + * 新增数据 + * + * @param ${_modelName} 实例对象 + * @return 实例对象 + */ + @Override + public int insert(${modelName} ${_modelName}) { + return this.${_modelName}Dao.insert(${_modelName}); + } + + /** + * 修改数据 + * + * @param ${_modelName} 实例对象 + * @return 实例对象 + */ + @Override + public int update(${modelName} ${_modelName}) { + return this.${_modelName}Dao.updateById(${_modelName}); + } + + /** + * 通过主键删除数据 + * + * @param id 主键 + * @return 是否成功 + */ + @Override + public boolean deleteById(Long id) { + return this.${_modelName}Dao.deleteById(id) > 0; + } + + /** + * 条件查询 + * + * @param ${_modelName} 条件 + * @return 实例对象 + */ + @Override + public ${modelName} queryByCondition(${modelName} ${_modelName}) { + + LambdaQueryWrapper<${modelName}> queryWrapper = Wrappers.<${modelName}>lambdaQuery() + #foreach($field in $fields) + .eq(Objects.nonNull(${_modelName}.get${field.upName}()), ${modelName}::get${field.upName}, ${_modelName}.get${field.upName}()) + #end + ; + return ${_modelName}Dao.selectOne(queryWrapper); + + } + +} diff --git a/schisandra-cloud-storage-gen/src/main/resources/genCode/template/DemoTable.java.vm b/schisandra-cloud-storage-gen/src/main/resources/genCode/template/DemoTable.java.vm new file mode 100644 index 0000000..05946fe --- /dev/null +++ b/schisandra-cloud-storage-gen/src/main/resources/genCode/template/DemoTable.java.vm @@ -0,0 +1,33 @@ +package com.schisandra.${module}.infra.basic.entity; + +import lombok.Data; +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; + +/** + * ${tableComment} 实体类 + * + * @author ${author} + * @since ${genDate} + */ +@Data +@TableName("${tableName}") +public class ${modelName} implements Serializable { +#foreach($field in $fields) + + /** + * ${field.comment} + */ + #if($field.keyType=='PRI') + @TableId(value = "`$field.col`", type = IdType.AUTO) + #end + #if($field.keyType!='PRI') + @TableField("`$field.col`") + #end + private $field.type $field.name; + #end + +} + diff --git a/schisandra-cloud-storage-gen/src/main/resources/genCode/template/DemoXml.xml.vm b/schisandra-cloud-storage-gen/src/main/resources/genCode/template/DemoXml.xml.vm new file mode 100644 index 0000000..89b8ad2 --- /dev/null +++ b/schisandra-cloud-storage-gen/src/main/resources/genCode/template/DemoXml.xml.vm @@ -0,0 +1,16 @@ + + + + + + #foreach($field in $fields) + #if($field.keyType=='PRI') + + #end + #if($field.keyType!='PRI') + + #end +#end + + + diff --git a/schisandra-cloud-storage-oss/schisandra-cloud-storage-oss-common/src/main/java/com/schisandra/oss/common/entity/PageInfo.java b/schisandra-cloud-storage-oss/schisandra-cloud-storage-oss-common/src/main/java/com/schisandra/oss/common/entity/PageInfo.java index 64ea95e..c57fbd4 100644 --- a/schisandra-cloud-storage-oss/schisandra-cloud-storage-oss-common/src/main/java/com/schisandra/oss/common/entity/PageInfo.java +++ b/schisandra-cloud-storage-oss/schisandra-cloud-storage-oss-common/src/main/java/com/schisandra/oss/common/entity/PageInfo.java @@ -3,7 +3,7 @@ package com.schisandra.oss.common.entity; /** * 分页请求实体 * - * @author: landaiqing + * @author: schisandra */ public class PageInfo { diff --git a/schisandra-cloud-storage-oss/schisandra-cloud-storage-oss-common/src/main/java/com/schisandra/oss/common/entity/PageResult.java b/schisandra-cloud-storage-oss/schisandra-cloud-storage-oss-common/src/main/java/com/schisandra/oss/common/entity/PageResult.java index 1a69dc5..85cb7fb 100644 --- a/schisandra-cloud-storage-oss/schisandra-cloud-storage-oss-common/src/main/java/com/schisandra/oss/common/entity/PageResult.java +++ b/schisandra-cloud-storage-oss/schisandra-cloud-storage-oss-common/src/main/java/com/schisandra/oss/common/entity/PageResult.java @@ -9,7 +9,7 @@ import java.util.List; /** * 分页返回实体 * - * @author: landaiqing + * @author: schisandra */ @Data public class PageResult implements Serializable { diff --git a/schisandra-cloud-storage-oss/schisandra-cloud-storage-oss-common/src/main/java/com/schisandra/oss/common/entity/Result.java b/schisandra-cloud-storage-oss/schisandra-cloud-storage-oss-common/src/main/java/com/schisandra/oss/common/entity/Result.java index 567366e..6b0ea32 100644 --- a/schisandra-cloud-storage-oss/schisandra-cloud-storage-oss-common/src/main/java/com/schisandra/oss/common/entity/Result.java +++ b/schisandra-cloud-storage-oss/schisandra-cloud-storage-oss-common/src/main/java/com/schisandra/oss/common/entity/Result.java @@ -5,7 +5,7 @@ import lombok.Data; /** * @description: 返回结果泛型类 - * @author: landaiqing + * @author: schisandra * @date: 2024/3/22 13:09 */ @Data diff --git a/schisandra-cloud-storage-oss/schisandra-cloud-storage-oss-common/src/main/java/com/schisandra/oss/common/enums/IsDeletedFlagEnum.java b/schisandra-cloud-storage-oss/schisandra-cloud-storage-oss-common/src/main/java/com/schisandra/oss/common/enums/IsDeletedFlagEnum.java index 28a9a76..5d748ca 100644 --- a/schisandra-cloud-storage-oss/schisandra-cloud-storage-oss-common/src/main/java/com/schisandra/oss/common/enums/IsDeletedFlagEnum.java +++ b/schisandra-cloud-storage-oss/schisandra-cloud-storage-oss-common/src/main/java/com/schisandra/oss/common/enums/IsDeletedFlagEnum.java @@ -5,7 +5,7 @@ import lombok.Getter; /** * 删除状态枚举 * - * @author: landaiqing + * @author: schisandra */ @Getter public enum IsDeletedFlagEnum { diff --git a/schisandra-cloud-storage-oss/schisandra-cloud-storage-oss-common/src/main/java/com/schisandra/oss/common/enums/OssStatusEnum.java b/schisandra-cloud-storage-oss/schisandra-cloud-storage-oss-common/src/main/java/com/schisandra/oss/common/enums/OssStatusEnum.java index 4dcbd6c..be03eae 100644 --- a/schisandra-cloud-storage-oss/schisandra-cloud-storage-oss-common/src/main/java/com/schisandra/oss/common/enums/OssStatusEnum.java +++ b/schisandra-cloud-storage-oss/schisandra-cloud-storage-oss-common/src/main/java/com/schisandra/oss/common/enums/OssStatusEnum.java @@ -5,7 +5,7 @@ import lombok.Getter; /** * 用户状态枚举 * - * @author: landaiqing + * @author: schisandra */ @Getter public enum OssStatusEnum { diff --git a/schisandra-cloud-storage-oss/schisandra-cloud-storage-oss-common/src/main/java/com/schisandra/oss/common/enums/ResultCodeEnum.java b/schisandra-cloud-storage-oss/schisandra-cloud-storage-oss-common/src/main/java/com/schisandra/oss/common/enums/ResultCodeEnum.java index cb19b7f..f6ef4b9 100644 --- a/schisandra-cloud-storage-oss/schisandra-cloud-storage-oss-common/src/main/java/com/schisandra/oss/common/enums/ResultCodeEnum.java +++ b/schisandra-cloud-storage-oss/schisandra-cloud-storage-oss-common/src/main/java/com/schisandra/oss/common/enums/ResultCodeEnum.java @@ -4,7 +4,7 @@ import lombok.Getter; /** * @description: 返回结果状态枚举 - * @author: landaiqing + * @author: schisandra * @date: 2024/3/22 13:10 */ @Getter diff --git a/schisandra-cloud-storage-oss/schisandra-cloud-storage-oss-common/src/main/java/com/schisandra/oss/common/redis/RedisConfig.java b/schisandra-cloud-storage-oss/schisandra-cloud-storage-oss-common/src/main/java/com/schisandra/oss/common/redis/RedisConfig.java index 6150d24..7474b24 100644 --- a/schisandra-cloud-storage-oss/schisandra-cloud-storage-oss-common/src/main/java/com/schisandra/oss/common/redis/RedisConfig.java +++ b/schisandra-cloud-storage-oss/schisandra-cloud-storage-oss-common/src/main/java/com/schisandra/oss/common/redis/RedisConfig.java @@ -16,7 +16,7 @@ import org.springframework.data.redis.serializer.StringRedisSerializer; /** * Redis的config处理 * - * @author: landaiqing + * @author: schisandra */ @Configuration public class RedisConfig { diff --git a/schisandra-cloud-storage-oss/schisandra-cloud-storage-oss-common/src/main/java/com/schisandra/oss/common/redis/RedisUtil.java b/schisandra-cloud-storage-oss/schisandra-cloud-storage-oss-common/src/main/java/com/schisandra/oss/common/redis/RedisUtil.java index a67a7f8..dabaf44 100644 --- a/schisandra-cloud-storage-oss/schisandra-cloud-storage-oss-common/src/main/java/com/schisandra/oss/common/redis/RedisUtil.java +++ b/schisandra-cloud-storage-oss/schisandra-cloud-storage-oss-common/src/main/java/com/schisandra/oss/common/redis/RedisUtil.java @@ -13,7 +13,7 @@ import java.util.stream.Stream; /** * RedisUtil工具类 * - * @author: landaiqing + * @author: schisandra * @date: 2024/2/19 */ @Component diff --git a/schisandra-cloud-storage-oss/schisandra-cloud-storage-oss-infra/src/main/java/com/schisandra/oss/infra/basic/utils/DruidEncryptUtil.java b/schisandra-cloud-storage-oss/schisandra-cloud-storage-oss-infra/src/main/java/com/schisandra/oss/infra/basic/utils/DruidEncryptUtil.java index 570f800..2aa507f 100644 --- a/schisandra-cloud-storage-oss/schisandra-cloud-storage-oss-infra/src/main/java/com/schisandra/oss/infra/basic/utils/DruidEncryptUtil.java +++ b/schisandra-cloud-storage-oss/schisandra-cloud-storage-oss-infra/src/main/java/com/schisandra/oss/infra/basic/utils/DruidEncryptUtil.java @@ -8,7 +8,7 @@ import java.security.NoSuchProviderException; /** * 数据库加密util * - * @author: landaiqing + * @author: schisandra * @date: 2024/3/21 */ public class DruidEncryptUtil { diff --git a/schisandra-cloud-storage-oss/schisandra-cloud-storage-oss-starter/src/main/java/com/schisandra/oss/OssApplication.java b/schisandra-cloud-storage-oss/schisandra-cloud-storage-oss-starter/src/main/java/com/schisandra/oss/OssApplication.java index 9c019bd..a7b4a68 100644 --- a/schisandra-cloud-storage-oss/schisandra-cloud-storage-oss-starter/src/main/java/com/schisandra/oss/OssApplication.java +++ b/schisandra-cloud-storage-oss/schisandra-cloud-storage-oss-starter/src/main/java/com/schisandra/oss/OssApplication.java @@ -8,7 +8,7 @@ import org.springframework.context.annotation.ComponentScan; /** * 存储微服务启动类 * - * @author: landaiqing + * @author: schisandra * @date: 2024/3/21 */ @SpringBootApplication diff --git a/schisandra-cloud-storage-wechat/src/main/java/com/schisandra/wechat/WeChatApplication.java b/schisandra-cloud-storage-wechat/src/main/java/com/schisandra/wechat/WeChatApplication.java index a1d7d17..95e34d3 100644 --- a/schisandra-cloud-storage-wechat/src/main/java/com/schisandra/wechat/WeChatApplication.java +++ b/schisandra-cloud-storage-wechat/src/main/java/com/schisandra/wechat/WeChatApplication.java @@ -7,7 +7,7 @@ import org.springframework.context.annotation.ComponentScan; /** * 微信微服务启动类 * - * @author: landaiqing + * @author: schisandra * @date: 2024/4/9 */ @SpringBootApplication diff --git a/schisandra-cloud-storage-wechat/src/main/java/com/schisandra/wechat/controller/CallBackController.java b/schisandra-cloud-storage-wechat/src/main/java/com/schisandra/wechat/controller/CallBackController.java index a24a4d7..128808a 100644 --- a/schisandra-cloud-storage-wechat/src/main/java/com/schisandra/wechat/controller/CallBackController.java +++ b/schisandra-cloud-storage-wechat/src/main/java/com/schisandra/wechat/controller/CallBackController.java @@ -14,7 +14,7 @@ import java.util.Objects; /** * @Classname CallBackController - * @BelongsProject: qing-yu-club + * @BelongsProject: schisandra-cloud-storage * @BelongsPackage: com.schisandra.wechat.controller * @Author: schisandra * @CreateTime: 2024-02-21 16:41 diff --git a/schisandra-cloud-storage-wechat/src/main/java/com/schisandra/wechat/utils/SHA1.java b/schisandra-cloud-storage-wechat/src/main/java/com/schisandra/wechat/utils/SHA1.java index da072ab..e326297 100644 --- a/schisandra-cloud-storage-wechat/src/main/java/com/schisandra/wechat/utils/SHA1.java +++ b/schisandra-cloud-storage-wechat/src/main/java/com/schisandra/wechat/utils/SHA1.java @@ -8,7 +8,7 @@ import java.util.Arrays; /** * sha1生成签名工具 * - * @author: landaiqing + * @author: schisandra * @date: 2023/11/5 */ @Slf4j