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 ec71925..06813c8 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,17 +1,32 @@ package com.schisandra.auth.application.config; +import com.schisandra.auth.common.constants.SmsConfigConstant; +import com.schisandra.auth.common.redis.RedisUtil; +import com.schisandra.auth.infra.entity.SmsConfigInfo; +import com.schisandra.auth.infra.rpc.SmsConfigRpc; 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; -@Configuration + +//@Configuration public class SmsInitConfig { @Resource SmsReadConfig smsReadConfig; + @Resource + SmsConfigRpc smsConfigRpc; + + @Resource + RedisUtil redisUtil; + + @EventListener public void init(ContextRefreshedEvent event) { - SmsFactory.createSmsBlend(smsReadConfig, "alibaba"); + SmsConfigInfo configInfo = smsConfigRpc.getConfigInfo(SmsConfigConstant.SMS_CONFIG_KEY); + redisUtil.set(SmsConfigConstant.SMS_CONFIG_KEY, configInfo.getConfigValue()); + // 初始化短信配置 + SmsFactory.createSmsBlend(smsReadConfig, configInfo.getConfigValue()); } } 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 ea6d06e..45f2f0b 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 @@ -4,9 +4,12 @@ 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.constants.SmsConfigConstant; import com.schisandra.auth.common.entity.Result; import com.schisandra.auth.common.redis.RedisUtil; import com.schisandra.auth.common.utils.SmsCodeUtils; +import com.schisandra.auth.infra.entity.SmsConfigInfo; +import com.schisandra.auth.infra.rpc.SmsConfigRpc; import lombok.extern.slf4j.Slf4j; import org.dromara.sms4j.api.SmsBlend; import org.dromara.sms4j.api.entity.SmsResponse; @@ -28,7 +31,11 @@ public class SchisandraSmsController { @Resource private SmsReadConfig smsReadConfig; + @Resource + SmsConfigRpc smsConfigRpc; + private final String authPhonePrefix="auth.phone"; + private final String smsConfigPrefix="sys.config.sms"; /** * @description: 发送短信验证码 * @param: [phone] @@ -41,7 +48,12 @@ public class SchisandraSmsController { String prefix = redisUtil.buildKey(authPhonePrefix, phone); String code = SmsCodeUtils.generateValidateCode(4).toString(); if (!redisUtil.exist(prefix)){ - SmsResponse smsResponse=SmsFactory.getSmsBlend("alibaba").sendMessage(phone,code); + SmsConfigInfo configInfo = smsConfigRpc.getConfigInfo(SmsConfigConstant.SMS_CONFIG_KEY); + String key = redisUtil.buildKey(smsConfigPrefix, SmsConfigConstant.SMS_CONFIG_KEY); + redisUtil.set(key, configInfo.getConfigValue()); + SmsFactory.createSmsBlend(smsReadConfig, configInfo.getConfigValue()); + String configId = redisUtil.get(SmsConfigConstant.SMS_CONFIG_KEY); + SmsResponse smsResponse=SmsFactory.getSmsBlend(configId).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-common/src/main/java/com/schisandra/auth/common/constants/SmsConfigConstant.java b/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-common/src/main/java/com/schisandra/auth/common/constants/SmsConfigConstant.java new file mode 100644 index 0000000..bab3a9c --- /dev/null +++ b/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-common/src/main/java/com/schisandra/auth/common/constants/SmsConfigConstant.java @@ -0,0 +1,14 @@ +package com.schisandra.auth.common.constants; + +/** + * @Classname SmsConfigConstant + * @BelongsProject: schisandra-cloud-storage + * @BelongsPackage: com.schisandra.auth.common.constants + * @Author: landaiqing + * @CreateTime: 2024-05-12 00:16 + * @Description: TODO + * @Version: 1.0 + */ +public class SmsConfigConstant { + public static final String SMS_CONFIG_KEY = "sms_config_id"; +} diff --git a/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-infra/pom.xml b/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-infra/pom.xml index 6bedc42..e69a19c 100644 --- a/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-infra/pom.xml +++ b/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-infra/pom.xml @@ -47,5 +47,10 @@ schisandra-cloud-storage-auth-common 1.0-SNAPSHOT + + com.schisandra.system + schisandra-cloud-storage-system-api + 1.0-SNAPSHOT + diff --git a/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-infra/src/main/java/com/schisandra/auth/infra/entity/SmsConfigInfo.java b/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-infra/src/main/java/com/schisandra/auth/infra/entity/SmsConfigInfo.java new file mode 100644 index 0000000..3b744b0 --- /dev/null +++ b/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-infra/src/main/java/com/schisandra/auth/infra/entity/SmsConfigInfo.java @@ -0,0 +1,44 @@ +package com.schisandra.auth.infra.entity; + +import lombok.Data; + +import java.io.Serializable; + +/** + * @Classname SmsConfigInfo + * @BelongsProject: schisandra-cloud-storage + * @BelongsPackage: com.schisandra.auth.application.rpc.entity + * @Author: landaiqing + * @CreateTime: 2024-05-11 23:50 + * @Description: TODO + * @Version: 1.0 + */ +@Data +public class SmsConfigInfo implements Serializable { + + /** + * 名称 + */ + private String configName; + + /** + * 参数键 + */ + private String configKey; + + /** + * 参数值 + */ + private String configValue; + + /** + * 系统内置（0是 1否） + */ + private Integer configType; + + /** + * 备注信息 + */ + private String remarks; + +} diff --git a/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-infra/src/main/java/com/schisandra/auth/infra/rpc/SmsConfigRpc.java b/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-infra/src/main/java/com/schisandra/auth/infra/rpc/SmsConfigRpc.java new file mode 100644 index 0000000..bd53067 --- /dev/null +++ b/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-infra/src/main/java/com/schisandra/auth/infra/rpc/SmsConfigRpc.java @@ -0,0 +1,41 @@ +package com.schisandra.auth.infra.rpc; + + +import com.schisandra.auth.infra.entity.SmsConfigInfo; +import com.schisandra.system.api.SmsConfigFeignService; +import com.schisandra.system.entity.Result; +import com.schisandra.system.entity.SchisandraSysConfigDTO; +import org.springframework.stereotype.Component; + +import javax.annotation.Resource; + +/** + * @Classname SmsConfigRpc + * @BelongsProject: schisandra-cloud-storage + * @BelongsPackage: com.schisandra.auth.application.rpc + * @Author: landaiqing + * @CreateTime: 2024-05-11 23:44 + * @Description: TODO + * @Version: 1.0 + */ +@Component +public class SmsConfigRpc { + @Resource + private SmsConfigFeignService smsConfigFeignService; + + public SmsConfigInfo getConfigInfo(String key) { + Result result = smsConfigFeignService.getConfigByKey(key); + SmsConfigInfo smsConfigInfo = new SmsConfigInfo(); + if (!result.getSuccess()) { + return smsConfigInfo; + } + SchisandraSysConfigDTO data = result.getData(); + smsConfigInfo.setConfigKey(data.getConfigKey()); + smsConfigInfo.setConfigName(data.getConfigName()); + smsConfigInfo.setConfigValue(data.getConfigValue()); + smsConfigInfo.setRemarks(data.getRemarks()); + smsConfigInfo.setConfigType(data.getConfigType()); + return smsConfigInfo; + } + +} diff --git a/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-infra/src/main/java/com/schisandra/auth/infra/rpc/package-info.md b/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-infra/src/main/java/com/schisandra/auth/infra/rpc/package-info.md deleted file mode 100644 index ed9ae98..0000000 --- a/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-infra/src/main/java/com/schisandra/auth/infra/rpc/package-info.md +++ /dev/null @@ -1 +0,0 @@ -rpc \ No newline at end of file diff --git a/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-starter/pom.xml b/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-starter/pom.xml index f58e2ae..d0b9eea 100644 --- a/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-starter/pom.xml +++ b/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-starter/pom.xml @@ -36,7 +36,14 @@ org.springframework.cloud spring-cloud-starter-bootstrap - + + com.alibaba.cloud + spring-cloud-starter-alibaba-nacos-config + + + com.alibaba.cloud + spring-cloud-starter-alibaba-nacos-discovery + com.schisandra schisandra-cloud-storage-auth-application-controller 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 c5e25bd..8cfb613 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 @@ -3,6 +3,7 @@ package com.schisandra.auth; import org.mybatis.spring.annotation.MapperScan; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; +import org.springframework.cloud.openfeign.EnableFeignClients; import org.springframework.context.annotation.ComponentScan; /** @@ -14,6 +15,7 @@ import org.springframework.context.annotation.ComponentScan; @SpringBootApplication @ComponentScan("com.schisandra") @MapperScan("com.schisandra.**.dao") +@EnableFeignClients(basePackages = "com.schisandra") public class AuthApplication { public static void main(String[] args) { SpringApplication.run(AuthApplication.class); diff --git a/schisandra-cloud-storage-gateway/src/main/resources/application.yml b/schisandra-cloud-storage-gateway/src/main/resources/application.yml index 0bece70..181eff3 100644 --- a/schisandra-cloud-storage-gateway/src/main/resources/application.yml +++ b/schisandra-cloud-storage-gateway/src/main/resources/application.yml @@ -1,5 +1,5 @@ server: - port: 5000 + port: 6000 spring: cloud: gateway: @@ -21,7 +21,7 @@ spring: # Redis数据库索引（默认为0） database: 1 # Redis服务器地址 - host: 116.196.80.239 + host: 1.95.0.111 # Redis服务器连接端口 port: 6379 # Redis服务器连接密码（默认为空） diff --git a/schisandra-cloud-storage-system/schisandra-cloud-storage-system-api/src/main/java/com/schisandra/system/api/SmsConfigFeignService.java b/schisandra-cloud-storage-system/schisandra-cloud-storage-system-api/src/main/java/com/schisandra/system/api/SmsConfigFeignService.java new file mode 100644 index 0000000..3b2ef3f --- /dev/null +++ b/schisandra-cloud-storage-system/schisandra-cloud-storage-system-api/src/main/java/com/schisandra/system/api/SmsConfigFeignService.java @@ -0,0 +1,16 @@ +package com.schisandra.system.api; + +import com.schisandra.system.entity.Result; +import com.schisandra.system.entity.SchisandraSysConfigDTO; +import feign.Param; +import org.springframework.cloud.openfeign.FeignClient; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestMethod; +import org.springframework.web.bind.annotation.RequestParam; + +@FeignClient("schisandra-cloud-storage-system-dev") +public interface SmsConfigFeignService { + @RequestMapping(value = "/system/getConfigByKey",method = RequestMethod.GET) + Result getConfigByKey(@RequestParam(value = "key") String key); +} diff --git a/schisandra-cloud-storage-system/schisandra-cloud-storage-system-api/src/main/java/com/schisandra/system/api/package-info.md b/schisandra-cloud-storage-system/schisandra-cloud-storage-system-api/src/main/java/com/schisandra/system/api/package-info.md deleted file mode 100644 index 005714a..0000000 --- a/schisandra-cloud-storage-system/schisandra-cloud-storage-system-api/src/main/java/com/schisandra/system/api/package-info.md +++ /dev/null @@ -1 +0,0 @@ -api 对外接口 \ No newline at end of file diff --git a/schisandra-cloud-storage-system/schisandra-cloud-storage-system-api/src/main/java/com/schisandra/system/entity/Result.java b/schisandra-cloud-storage-system/schisandra-cloud-storage-system-api/src/main/java/com/schisandra/system/entity/Result.java new file mode 100644 index 0000000..b9ff027 --- /dev/null +++ b/schisandra-cloud-storage-system/schisandra-cloud-storage-system-api/src/main/java/com/schisandra/system/entity/Result.java @@ -0,0 +1,50 @@ +package com.schisandra.system.entity; + +import lombok.Data; + +@Data +public class Result { + + private Boolean success; + + private Integer code; + + private String message; + + private T data; + + public static Result ok(){ + Result result = new Result(); + result.setSuccess(true); + result.setCode(ResultCodeEnum.SUCCESS.getCode()); + result.setMessage(ResultCodeEnum.SUCCESS.getDesc()); + return result; + } + + public static Result ok(T data){ + Result result = new Result(); + result.setSuccess(true); + result.setCode(ResultCodeEnum.SUCCESS.getCode()); + result.setMessage(ResultCodeEnum.SUCCESS.getDesc()); + result.setData(data); + return result; + } + + public static Result fail(){ + Result result = new Result(); + result.setSuccess(false); + result.setCode(ResultCodeEnum.FAIL.getCode()); + result.setMessage(ResultCodeEnum.FAIL.getDesc()); + return result; + } + + public static Result fail(T data){ + Result result = new Result(); + result.setSuccess(false); + result.setCode(ResultCodeEnum.FAIL.getCode()); + result.setMessage(ResultCodeEnum.FAIL.getDesc()); + result.setData(data); + return result; + } + +} diff --git a/schisandra-cloud-storage-system/schisandra-cloud-storage-system-api/src/main/java/com/schisandra/system/entity/ResultCodeEnum.java b/schisandra-cloud-storage-system/schisandra-cloud-storage-system-api/src/main/java/com/schisandra/system/entity/ResultCodeEnum.java new file mode 100644 index 0000000..b4be239 --- /dev/null +++ b/schisandra-cloud-storage-system/schisandra-cloud-storage-system-api/src/main/java/com/schisandra/system/entity/ResultCodeEnum.java @@ -0,0 +1,29 @@ +package com.schisandra.system.entity; + +import lombok.Getter; + +@Getter +public enum ResultCodeEnum { + + SUCCESS(200,"成功"), + FAIL(500,"失败"); + + public int code; + + public String desc; + + ResultCodeEnum(int code,String desc){ + this.code = code; + this.desc = desc; + } + + public static ResultCodeEnum getByCode(int codeVal){ + for(ResultCodeEnum resultCodeEnum : ResultCodeEnum.values()){ + if(resultCodeEnum.code == codeVal){ + return resultCodeEnum; + } + } + return null; + } + +} diff --git a/schisandra-cloud-storage-system/schisandra-cloud-storage-system-api/src/main/java/com/schisandra/system/entity/SchisandraSysConfigDTO.java b/schisandra-cloud-storage-system/schisandra-cloud-storage-system-api/src/main/java/com/schisandra/system/entity/SchisandraSysConfigDTO.java new file mode 100644 index 0000000..382ff02 --- /dev/null +++ b/schisandra-cloud-storage-system/schisandra-cloud-storage-system-api/src/main/java/com/schisandra/system/entity/SchisandraSysConfigDTO.java @@ -0,0 +1,73 @@ +package com.schisandra.system.entity; + +import lombok.Data; + +import java.io.Serializable; +import java.util.Date; + +/** + * dto + * + * @author landaiqing + * @since 2024-05-11 22:45:55 + */ +@Data +public class SchisandraSysConfigDTO implements Serializable { + + /** + * id + */ + private Long id; + + /** + * 名称 + */ + private String configName; + + /** + * 参数键 + */ + private String configKey; + + /** + * 参数值 + */ + private String configValue; + + /** + * 创建者 + */ + private String createBy; + + /** + * 系统内置（0是 1否） + */ + private Integer configType; + + /** + * 创建时间 + */ + private Date createDate; + + /** + * 更新者 + */ + private String updateBy; + + /** + * 更新时间 + */ + private Date updateDate; + + /** + * 备注信息 + */ + private String remarks; + + /** + * 是否删除 0未删除 1已删除 + */ + private Integer isDeleted; + +} + diff --git a/schisandra-cloud-storage-system/schisandra-cloud-storage-system-api/src/main/java/com/schisandra/system/entity/package-info.md b/schisandra-cloud-storage-system/schisandra-cloud-storage-system-api/src/main/java/com/schisandra/system/entity/package-info.md deleted file mode 100644 index a3e0cc7..0000000 --- a/schisandra-cloud-storage-system/schisandra-cloud-storage-system-api/src/main/java/com/schisandra/system/entity/package-info.md +++ /dev/null @@ -1 +0,0 @@ -api 实体 \ No newline at end of file diff --git a/schisandra-cloud-storage-system/schisandra-cloud-storage-system-application/schisandra-cloud-storage-system-application-controller/src/main/java/com/schisandra/system/application/controller/SchisandraSysConfigController.java b/schisandra-cloud-storage-system/schisandra-cloud-storage-system-application/schisandra-cloud-storage-system-application-controller/src/main/java/com/schisandra/system/application/controller/SchisandraSysConfigController.java index 1e52e3e..f382f58 100644 --- a/schisandra-cloud-storage-system/schisandra-cloud-storage-system-application/schisandra-cloud-storage-system-application-controller/src/main/java/com/schisandra/system/application/controller/SchisandraSysConfigController.java +++ b/schisandra-cloud-storage-system/schisandra-cloud-storage-system-application/schisandra-cloud-storage-system-application-controller/src/main/java/com/schisandra/system/application/controller/SchisandraSysConfigController.java @@ -8,15 +8,15 @@ import com.schisandra.system.application.dto.SchisandraSysConfigDTO; import com.schisandra.system.common.entity.Result; import com.schisandra.system.domain.entity.SchisandraSysConfigBO; import com.schisandra.system.domain.service.SchisandraSysConfigDomainService; +import feign.Param; 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 org.springframework.web.bind.annotation.*; import javax.annotation.Resource; +import java.util.List; /** - * controller + * controller * * @author landaiqing * @since 2024-05-11 22:45:55 @@ -119,4 +119,16 @@ public class SchisandraSysConfigController { } + @RequestMapping(value = "getConfigByKey",method = RequestMethod.GET) + public Result getConfigByKey(@RequestParam(value = "key") String key) { + try { + if (log.isInfoEnabled()) { + log.info("SchisandraSysConfigController.getConfigByKey.key:{}", key); + } + return Result.ok(schisandraSysConfigDomainService.getConfigByKey(key)); + } catch (Exception e) { + return Result.fail("配置信息获取失败"); + } + } + } diff --git a/schisandra-cloud-storage-system/schisandra-cloud-storage-system-application/schisandra-cloud-storage-system-application-controller/src/main/java/com/schisandra/system/application/convert/SchisandraSysConfigDTOConverter.java b/schisandra-cloud-storage-system/schisandra-cloud-storage-system-application/schisandra-cloud-storage-system-application-controller/src/main/java/com/schisandra/system/application/convert/SchisandraSysConfigDTOConverter.java index 85c6d83..0c12817 100644 --- a/schisandra-cloud-storage-system/schisandra-cloud-storage-system-application/schisandra-cloud-storage-system-application-controller/src/main/java/com/schisandra/system/application/convert/SchisandraSysConfigDTOConverter.java +++ b/schisandra-cloud-storage-system/schisandra-cloud-storage-system-application/schisandra-cloud-storage-system-application-controller/src/main/java/com/schisandra/system/application/convert/SchisandraSysConfigDTOConverter.java @@ -19,4 +19,5 @@ public interface SchisandraSysConfigDTOConverter { SchisandraSysConfigBO convertDTOToBO(SchisandraSysConfigDTO schisandraSysConfigDTO); + } diff --git a/schisandra-cloud-storage-system/schisandra-cloud-storage-system-domain/src/main/java/com/schisandra/system/domain/convert/SchisandraSysConfigBOConverter.java b/schisandra-cloud-storage-system/schisandra-cloud-storage-system-domain/src/main/java/com/schisandra/system/domain/convert/SchisandraSysConfigBOConverter.java index dd56b77..1147a1f 100644 --- a/schisandra-cloud-storage-system/schisandra-cloud-storage-system-domain/src/main/java/com/schisandra/system/domain/convert/SchisandraSysConfigBOConverter.java +++ b/schisandra-cloud-storage-system/schisandra-cloud-storage-system-domain/src/main/java/com/schisandra/system/domain/convert/SchisandraSysConfigBOConverter.java @@ -17,5 +17,6 @@ public interface SchisandraSysConfigBOConverter { SchisandraSysConfigBOConverter INSTANCE = Mappers.getMapper(SchisandraSysConfigBOConverter.class); SchisandraSysConfig convertBOToEntity(SchisandraSysConfigBO schisandraSysConfigBO); + SchisandraSysConfigBO convertEntityToBO(SchisandraSysConfig schisandraSysConfig); } diff --git a/schisandra-cloud-storage-system/schisandra-cloud-storage-system-domain/src/main/java/com/schisandra/system/domain/service/SchisandraSysConfigDomainService.java b/schisandra-cloud-storage-system/schisandra-cloud-storage-system-domain/src/main/java/com/schisandra/system/domain/service/SchisandraSysConfigDomainService.java index 0a7c239..ebaa3b9 100644 --- a/schisandra-cloud-storage-system/schisandra-cloud-storage-system-domain/src/main/java/com/schisandra/system/domain/service/SchisandraSysConfigDomainService.java +++ b/schisandra-cloud-storage-system/schisandra-cloud-storage-system-domain/src/main/java/com/schisandra/system/domain/service/SchisandraSysConfigDomainService.java @@ -25,4 +25,5 @@ public interface SchisandraSysConfigDomainService { */ Boolean delete(SchisandraSysConfigBO schisandraSysConfigBO); + Object getConfigByKey(String key); } diff --git a/schisandra-cloud-storage-system/schisandra-cloud-storage-system-domain/src/main/java/com/schisandra/system/domain/service/impl/SchisandraSysConfigDomainServiceImpl.java b/schisandra-cloud-storage-system/schisandra-cloud-storage-system-domain/src/main/java/com/schisandra/system/domain/service/impl/SchisandraSysConfigDomainServiceImpl.java index 0b7c22f..4af27f1 100644 --- a/schisandra-cloud-storage-system/schisandra-cloud-storage-system-domain/src/main/java/com/schisandra/system/domain/service/impl/SchisandraSysConfigDomainServiceImpl.java +++ b/schisandra-cloud-storage-system/schisandra-cloud-storage-system-domain/src/main/java/com/schisandra/system/domain/service/impl/SchisandraSysConfigDomainServiceImpl.java @@ -46,4 +46,14 @@ public class SchisandraSysConfigDomainServiceImpl implements SchisandraSysConfig return schisandraSysConfigService.update(schisandraSysConfig) > 0; } + @Override + public SchisandraSysConfigBO getConfigByKey(String key) { + SchisandraSysConfig schisandraSysConfig= schisandraSysConfigService.getConfigByKey(key); + SchisandraSysConfigBO schisandraSysConfigBO = SchisandraSysConfigBOConverter.INSTANCE.convertEntityToBO(schisandraSysConfig); + if (schisandraSysConfigBO == null){ + return null; + } + return schisandraSysConfigBO; + } + } diff --git a/schisandra-cloud-storage-system/schisandra-cloud-storage-system-infra/src/main/java/com/schisandra/system/infra/basic/service/SchisandraSysConfigService.java b/schisandra-cloud-storage-system/schisandra-cloud-storage-system-infra/src/main/java/com/schisandra/system/infra/basic/service/SchisandraSysConfigService.java index d7d61e1..a58e126 100644 --- a/schisandra-cloud-storage-system/schisandra-cloud-storage-system-infra/src/main/java/com/schisandra/system/infra/basic/service/SchisandraSysConfigService.java +++ b/schisandra-cloud-storage-system/schisandra-cloud-storage-system-infra/src/main/java/com/schisandra/system/infra/basic/service/SchisandraSysConfigService.java @@ -48,4 +48,5 @@ public interface SchisandraSysConfigService { */ SchisandraSysConfig queryByCondition(SchisandraSysConfig schisandraSysConfig); + SchisandraSysConfig getConfigByKey(String key); } diff --git a/schisandra-cloud-storage-system/schisandra-cloud-storage-system-infra/src/main/java/com/schisandra/system/infra/basic/service/impl/SchisandraSysConfigServiceImpl.java b/schisandra-cloud-storage-system/schisandra-cloud-storage-system-infra/src/main/java/com/schisandra/system/infra/basic/service/impl/SchisandraSysConfigServiceImpl.java index ec4b445..4e47633 100644 --- a/schisandra-cloud-storage-system/schisandra-cloud-storage-system-infra/src/main/java/com/schisandra/system/infra/basic/service/impl/SchisandraSysConfigServiceImpl.java +++ b/schisandra-cloud-storage-system/schisandra-cloud-storage-system-infra/src/main/java/com/schisandra/system/infra/basic/service/impl/SchisandraSysConfigServiceImpl.java @@ -2,6 +2,7 @@ package com.schisandra.system.infra.basic.service.impl; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.schisandra.system.infra.basic.entity.SchisandraSysConfig; import com.schisandra.system.infra.basic.dao.SchisandraSysConfigDao; @@ -93,4 +94,10 @@ public class SchisandraSysConfigServiceImpl implements SchisandraSysConfigServic } + @Override + public SchisandraSysConfig getConfigByKey(String key) { + return schisandraSysConfigDao.selectOne(new QueryWrapper().eq("config_key", key) + .eq("is_deleted", 0)); + } + } diff --git a/schisandra-cloud-storage-system/schisandra-cloud-storage-system-starter/pom.xml b/schisandra-cloud-storage-system/schisandra-cloud-storage-system-starter/pom.xml index 3bb85f0..d1b3201 100644 --- a/schisandra-cloud-storage-system/schisandra-cloud-storage-system-starter/pom.xml +++ b/schisandra-cloud-storage-system/schisandra-cloud-storage-system-starter/pom.xml @@ -39,6 +39,14 @@ spring-cloud-starter-bootstrap + + com.alibaba.cloud + spring-cloud-starter-alibaba-nacos-config + + + com.alibaba.cloud + spring-cloud-starter-alibaba-nacos-discovery + com.schisandra.system diff --git a/schisandra-cloud-storage-system/schisandra-cloud-storage-system-starter/src/main/resources/application.yml b/schisandra-cloud-storage-system/schisandra-cloud-storage-system-starter/src/main/resources/application.yml index 48758e6..e03393f 100644 --- a/schisandra-cloud-storage-system/schisandra-cloud-storage-system-starter/src/main/resources/application.yml +++ b/schisandra-cloud-storage-system/schisandra-cloud-storage-system-starter/src/main/resources/application.yml @@ -1,5 +1,5 @@ server: - port: 4000 + port: 5000 spring: datasource: username: root diff --git a/schisandra-cloud-storage-system/schisandra-cloud-storage-system-starter/src/main/resources/bootstrap.yml b/schisandra-cloud-storage-system/schisandra-cloud-storage-system-starter/src/main/resources/bootstrap.yml index 5c4c820..a86ef95 100644 --- a/schisandra-cloud-storage-system/schisandra-cloud-storage-system-starter/src/main/resources/bootstrap.yml +++ b/schisandra-cloud-storage-system/schisandra-cloud-storage-system-starter/src/main/resources/bootstrap.yml @@ -1,6 +1,6 @@ spring: application: - name: schisandra-cloud-storage-oss-dev + name: schisandra-cloud-storage-system-dev profiles: active: dev cloud: