From 35e3cdef8a1096ae26ce17111d03cd2ac88f6c84 Mon Sep 17 00:00:00 2001 From: zlg <482370576@qq.com> Date: Sat, 27 Apr 2024 15:00:03 +0800 Subject: [PATCH 01/27] =?UTF-8?q?feat:=20=E7=9F=AD=E4=BF=A1=E9=AA=8C?= =?UTF-8?q?=E8=AF=81=E7=A0=81=E5=92=8C=E6=BB=91=E5=8A=A8=E5=9B=BE=E7=89=87?= =?UTF-8?q?=E9=AA=8C=E8=AF=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ReactRotateCaptchaController.java | 107 ++++++++++++++++++ .../application/controller/SmsController.java | 46 ++++++++ .../auth/common/utils/RedisUtils.java | 86 ++++++++++++++ .../auth/common/utils/SmsCodeUtils.java | 32 ++++++ .../src/main/resources/application.yml | 57 ++++------ 5 files changed, 296 insertions(+), 32 deletions(-) create mode 100644 schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-application/schisandra-cloud-storage-auth-application-controller/src/main/java/com/schisandra/auth/application/controller/ReactRotateCaptchaController.java create mode 100644 schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-application/schisandra-cloud-storage-auth-application-controller/src/main/java/com/schisandra/auth/application/controller/SmsController.java create mode 100644 schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-common/src/main/java/com/schisandra/auth/common/utils/RedisUtils.java create mode 100644 schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-common/src/main/java/com/schisandra/auth/common/utils/SmsCodeUtils.java diff --git a/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-application/schisandra-cloud-storage-auth-application-controller/src/main/java/com/schisandra/auth/application/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 new file mode 100644 index 0000000..11a3ca6 --- /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/controller/ReactRotateCaptchaController.java @@ -0,0 +1,107 @@ +package com.schisandra.auth.application.controller; + +import cn.hutool.core.lang.Assert; + +import lombok.extern.slf4j.Slf4j; +import org.springframework.http.MediaType; +import org.springframework.http.ResponseEntity; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + + +import javax.imageio.ImageIO; +import java.awt.image.BufferedImage; +import java.io.*; +import java.util.Base64; + + +@RestController +@RequestMapping("/ReactRotateCaptcha/") +@Slf4j +public class ReactRotateCaptchaController { + @PostMapping (value = "get", produces = MediaType.IMAGE_PNG_VALUE) + public ResponseEntity get(){ + //前端可以直接根据URL：/image/{图片id} 来获取图片 注意:资源文件ID最好进行加密和设置有效期 + // 在实际开发中 一般先通过图片id查看数据库有没有这条记录 + + String imageFilePath = "D:\\java_project\\schisandra-cloud-storage\\schisandra-cloud-storage-auth\\schisandra-cloud-storage-auth-application\\schisandra-cloud-storage-auth-application-controller\\src\\main\\java\\com\\schisandra\\auth\\application\\image\\test1.png"; + File file = new File(imageFilePath); + try { + BufferedImage bufferedImage = ImageIO.read(file); + ByteArrayOutputStream byteArrayOutputStream = new ByteArrayOutputStream(); + ImageIO.write(bufferedImage, "png", byteArrayOutputStream); + byte[] imageBytes = byteArrayOutputStream.toByteArray(); // 读取图片数据的字节数组 + // 将图片字节数组转换为Base64编码的字符串 + String base64Image = Base64.getEncoder().encodeToString(imageBytes); + System.out.println(base64Image); + // 创建包含Base64编码的响应体的ResponseEntity对象，并设置正确的媒体类型和内容长度 + return ResponseEntity.ok().contentType(MediaType.IMAGE_PNG) + .body(base64Image); + }catch (Exception e) { + e.printStackTrace(); + } + return ResponseEntity.ok().body(null); + } + + /** + * 请求图片地址, 返回的结果进行base64编码 + * @param imgUrl 图片地址 + * @return + */ +// public static String requestUrlToBase64(String imgUrl) { +// //读取图片字节数组 +// byte[] data = null; +// try { +// InputStream in = new FileInputStream(imgUrl); +//// System.out.println("文件大小(字节)=" + in.available()); +// data = new byte[in.available()]; +// in.read(data); +// in.close(); +// } catch (IOException e) { +// e.printStackTrace(); +// } +// //对字节数组进行Base64编码，得到Base64编码的字符串 +// return new String(Base64.encodeBase64(data)); +// +// } +// +// public static File convertBase64ToFile(String fileBase64String, String filePath, String fileName) { +// BufferedOutputStream bos = null; +// FileOutputStream fos = null; +// File file = null; +// try { +// File dir = new File(filePath); +// //判断文件目录是否存在 +// if (!dir.exists() && dir.isDirectory()) { +// dir.mkdirs(); +// } +// byte[] bfile = Base64.decodeBase64(fileBase64String); +// file = new File(filePath + File.separator + fileName); +// fos = new FileOutputStream(file); +// bos = new BufferedOutputStream(fos); +// bos.write(bfile); +// return file; +// } catch (Exception e) { +// e.printStackTrace(); +// } finally { +// if (bos != null) { +// try { +// bos.close(); +// } catch (IOException e1) { +// e1.printStackTrace(); +// } +// } +// if (fos != null) { +// try { +// fos.close(); +// } catch (IOException e1) { +// e1.printStackTrace(); +// } +// } +// } +// 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/SmsController.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/SmsController.java new file mode 100644 index 0000000..9171d09 --- /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/controller/SmsController.java @@ -0,0 +1,46 @@ +package com.schisandra.auth.application.controller; + + +import com.schisandra.auth.common.utils.RedisUtils; +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.dromara.sms4j.provider.enumerate.SupplierType; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import java.util.LinkedHashMap; + +@RestController +@RequestMapping("/sms/") +@Slf4j +public class SmsController { + @Autowired + private RedisUtils redisUtils; + private final SmsBlend aliSms = SmsFactory.createSmsBlend(SupplierType.ALIBABA); + + @GetMapping("/send") + public SmsResponse send(String phone, String templateId) { + return aliSms.sendMessage(phone, templateId, new LinkedHashMap<>()); + } + + @GetMapping("/sendByTemplate") + public SmsResponse sendByTemplate(String phone) { +// SmsBlend smsBlend = SmsFactory.getSmsBlend("alibaba"); + String code = SmsCodeUtils.generateValidateCode(4).toString(); +// redisUtils.cacheValue( phone, code, 60); + + SmsResponse smsResponse=aliSms.sendMessage(phone, code); + if (smsResponse.isSuccess()){ + redisUtils.cacheValue( phone, code, 60); + return smsResponse; + }else { + return smsResponse; + } + } + +} diff --git a/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-common/src/main/java/com/schisandra/auth/common/utils/RedisUtils.java b/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-common/src/main/java/com/schisandra/auth/common/utils/RedisUtils.java new file mode 100644 index 0000000..f83dd2b --- /dev/null +++ b/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-common/src/main/java/com/schisandra/auth/common/utils/RedisUtils.java @@ -0,0 +1,86 @@ +package com.schisandra.auth.common.utils; + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.data.redis.core.RedisTemplate; +import org.springframework.data.redis.core.ValueOperations; +import org.springframework.stereotype.Component; + +import javax.annotation.Resource; +import java.util.Set; +import java.util.concurrent.TimeUnit; + +/** + * @author luft-mensch + */ +@Component +public class RedisUtils { + + @Resource + private RedisTemplate redisTemplate; + + private Logger logger = LoggerFactory.getLogger(this.getClass()); + + + public boolean cacheValue(String key, Object value, long time) { + try { + ValueOperations valueOperations = redisTemplate.opsForValue(); + valueOperations.set(key, value); + if (time > 0) { + // 如果有设置超时时间的话 + redisTemplate.expire(key, time, TimeUnit.SECONDS); + } + return true; + } catch (Throwable e) { + logger.error("缓存[" + key + "]失败, value[" + value + "] " + e.getMessage()); + } + return false; + } + + public boolean cacheValue(String key, Object value) { + return cacheValue(key, value, -1); + } + + + public boolean containsKey(String key) { + try { + return redisTemplate.hasKey(key); + } catch (Throwable e) { + logger.error("判断缓存是否存在时失败key[" + key + "]", "err[" + e.getMessage() + "]"); + } + return false; + } + + public Object getValue(String key) { + try { + ValueOperations valueOperations = redisTemplate.opsForValue(); + return valueOperations.get(key); + } catch (Throwable e) { + logger.error("获取缓存时失败key[" + key + "]", "err[" + e.getMessage() + "]"); + } + return null; + } + + + public boolean removeValue(String key) { + try { + redisTemplate.delete(key); + return true; + } catch (Throwable e) { + logger.error("移除缓存时失败key[" + key + "]", "err[" + e.getMessage() + "]"); + } + return false; + } + + public boolean removeKeys(String pattern) { + try { + Set keySet = redisTemplate.keys(pattern + "*"); + redisTemplate.delete(keySet); + return true; + } catch (Throwable e) { + logger.error("移除key[" + pattern + "]前缀的缓存时失败", "err[" + e.getMessage() + "]"); + } + return false; + } + +} \ No newline at end of file diff --git a/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-common/src/main/java/com/schisandra/auth/common/utils/SmsCodeUtils.java b/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-common/src/main/java/com/schisandra/auth/common/utils/SmsCodeUtils.java new file mode 100644 index 0000000..c7f0b49 --- /dev/null +++ b/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-common/src/main/java/com/schisandra/auth/common/utils/SmsCodeUtils.java @@ -0,0 +1,32 @@ +package com.schisandra.auth.common.utils; + +import java.util.Random; + +public class SmsCodeUtils { + public static Integer generateValidateCode(int length){ + Integer code =null; + + //长度为4 + if(length == 4){ + //生成随机数，最大为9999 + code = new Random().nextInt(9999); + if(code < 1000){ + //保证随机数为4位数字 + code = code + 1000; + } + //长度为6 + }else if(length == 6){ + //生成随机数，最大为999999 + code = new Random().nextInt(999999); + if(code < 100000){ + //保证随机数为6位数字 + code = code + 100000; + } + //其他情况 + }else{ + throw new RuntimeException("只能生成4位或6位数字验证码"); + } + return code; + } + +} diff --git a/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-starter/src/main/resources/application.yml b/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-starter/src/main/resources/application.yml index 6ec5c39..976d134 100644 --- a/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-starter/src/main/resources/application.yml +++ b/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-starter/src/main/resources/application.yml @@ -70,37 +70,30 @@ sa-token: is-log: true token-prefix: schisandra -#sms: -# # 标注从yml读取配置 -# config-type: yaml -# blends: -# # 自定义的标识，也就是configId这里可以是任意值（最好不要是中文） -# tx1: -# #厂商标识，标定此配置是哪个厂商，详细请看厂商标识介绍部分 -# supplier: tencent -# #您的accessKey -# access-key-id: 您的accessKey -# #您的accessKeySecret -# access-key-secret: 您的accessKeySecret -# #您的短信签名 -# signature: 您的短信签名 -# #模板ID 非必须配置，如果使用sendMessage的快速发送需此配置 -# template-id: xxxxxxxx -# #您的sdkAppId -# sdk-app-id: 您的sdkAppId -# # 自定义的标识，也就是configId这里可以是任意值（最好不要是中文） -# tx2: -# #厂商标识，标定此配置是哪个厂商，详细请看厂商标识介绍部分 -# supplier: tencent -# #您的accessKey -# access-key-id: 您的accessKey -# #您的accessKeySecret -# access-key-secret: 您的accessKeySecret -# #您的短信签名 -# signature: 您的短信签名 -# #模板ID 非必须配置，如果使用sendMessage的快速发送需此配置 -# template-id: xxxxxxxx -# #您的sdkAppId -# sdk-app-id: 您的sdkAppId +sms: + # 标注从yml读取配置0 + # 自定义的标识，也就是configId这里可以是任意值（最好不要是中文） + alibaba: + #厂商标识，标定此配置是哪个厂商，详细请看厂商标识介绍部分 + supplier: alibaba + #您的accessKey + access-key-id: LTAI5tDy2edL9LhW43rnus69 + #您的accessKeySecret + access-key-secret: YWp44dcFrBICrjZgqvJBE7ZHArZfIP + #您的短信签名 + signature: 阿里云短信测试 + #模板ID 非必须配置，如果使用sendMessage的快速发送需此配置 + template-id: SMS_154950909 + template-name: code + #您的sdkAppId + sdk-app-id: sms + requestUrl: dysmsapi.aliyuncs.com +# # 接口方法默认为 SendSms 如无特殊改变可以不用设置 +# action: SendSms +# # 接口版本号默认为 2017-05-25 如无特殊改变可以不用设置 +# version: 2017-05-25 +# # 地域信息默认为 cn-hangzhou 如无特殊改变可以不用设置 +# regionId: cn-hangzhou + From 6ffa31366ff8b9478e630e078acc45804483c7cf Mon Sep 17 00:00:00 2001 From: landaiqing <3517283258@qq.com> Date: Sun, 28 Apr 2024 15:32:49 +0800 Subject: [PATCH 02/27] feat: add aes/rsa encrypt --- .../controller/EncryptController.java | 51 ++++ .../application/filter/EncryptApiFilter.java | 100 +++++++ .../wrapper/EncryptRequestWrapper.java | 257 ++++++++++++++++++ .../application/wrapper/ResponseWrapper.java | 114 ++++++++ .../pom.xml | 13 + .../auth/common/entity/ApiEncryptRes.java | 19 ++ .../auth/common/utils/AESUtils.java | 110 ++++++++ .../auth/common/utils/ApiSecurityUtils.java | 44 +++ .../schisandra/auth/common/utils/MD5Util.java | 61 +++++ .../auth/common/utils/RSAUtils.java | 171 ++++++++++++ 10 files changed, 940 insertions(+) create mode 100644 schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-application/schisandra-cloud-storage-auth-application-controller/src/main/java/com/schisandra/auth/application/controller/EncryptController.java create mode 100644 schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-application/schisandra-cloud-storage-auth-application-controller/src/main/java/com/schisandra/auth/application/filter/EncryptApiFilter.java create mode 100644 schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-application/schisandra-cloud-storage-auth-application-controller/src/main/java/com/schisandra/auth/application/wrapper/EncryptRequestWrapper.java create mode 100644 schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-application/schisandra-cloud-storage-auth-application-controller/src/main/java/com/schisandra/auth/application/wrapper/ResponseWrapper.java create mode 100644 schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-common/src/main/java/com/schisandra/auth/common/entity/ApiEncryptRes.java create mode 100644 schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-common/src/main/java/com/schisandra/auth/common/utils/AESUtils.java create mode 100644 schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-common/src/main/java/com/schisandra/auth/common/utils/ApiSecurityUtils.java create mode 100644 schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-common/src/main/java/com/schisandra/auth/common/utils/MD5Util.java create mode 100644 schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-common/src/main/java/com/schisandra/auth/common/utils/RSAUtils.java diff --git a/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-application/schisandra-cloud-storage-auth-application-controller/src/main/java/com/schisandra/auth/application/controller/EncryptController.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/EncryptController.java new file mode 100644 index 0000000..45d724f --- /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/controller/EncryptController.java @@ -0,0 +1,51 @@ +package com.schisandra.auth.application.controller; + +import com.schisandra.auth.common.entity.Result; +import com.schisandra.auth.common.redis.RedisUtil; +import com.schisandra.auth.common.utils.MD5Util; +import com.schisandra.auth.common.utils.RSAUtils; +import lombok.extern.slf4j.Slf4j; +import org.apache.commons.lang3.StringUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import javax.annotation.Resource; +import java.util.Map; + +/** + * @ClassName EncryptController + * @Description TODO + * @Author L + * @Date 2024/1/29 9:18 + */ +@RestController +@RequestMapping("/encrypt") +@Slf4j +public class EncryptController { + @Resource + private RedisUtil redisUtil; + private String authPublicKeyPrefix = "auth.publicKey"; + private String authPrivateKeyPrefix = "auth.privateKey"; + + @GetMapping("/getPublicKey") + public Result getPublicKey() throws Exception { + //获取当前登陆账号对应的token,这行代码就不贴了。 + String token="12345"; + String publicKey=""; + if (StringUtils.isNotBlank(token)) { + Map stringStringMap = RSAUtils.genKeyPair(); + publicKey = stringStringMap.get("publicKey"); + String privateKey = stringStringMap.get("privateKey"); + String md5Token = MD5Util.md5(token); + //这个地方的存放时间根据你的token存放时间走 + redisUtil.set(md5Token + "publicKey", publicKey); + redisUtil.set(md5Token + "privateKey", privateKey); + return Result.ok(publicKey); + } + return Result.ok(publicKey); + } + +} + 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/filter/EncryptApiFilter.java b/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-application/schisandra-cloud-storage-auth-application-controller/src/main/java/com/schisandra/auth/application/filter/EncryptApiFilter.java new file mode 100644 index 0000000..8bcbb28 --- /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/filter/EncryptApiFilter.java @@ -0,0 +1,100 @@ +package com.schisandra.auth.application.filter; + +import cn.hutool.core.util.StrUtil; +import cn.hutool.extra.servlet.ServletUtil; +import cn.hutool.json.JSONUtil; +import com.alibaba.fastjson.JSON; +import com.schisandra.auth.application.wrapper.EncryptRequestWrapper; +import com.schisandra.auth.application.wrapper.ResponseWrapper; +import com.schisandra.auth.common.entity.ApiEncryptRes; +import com.schisandra.auth.common.utils.ApiSecurityUtils; +import lombok.SneakyThrows; +import lombok.extern.slf4j.Slf4j; +import org.apache.commons.lang3.StringUtils; +import org.springframework.boot.web.servlet.filter.OrderedFilter; +import org.springframework.stereotype.Component; +import org.springframework.web.filter.OncePerRequestFilter; + +import javax.servlet.FilterChain; +import javax.servlet.ServletException; +import javax.servlet.ServletOutputStream; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import java.io.IOException; +import java.nio.charset.StandardCharsets; + +@Slf4j +@Component +public class EncryptApiFilter extends OncePerRequestFilter implements OrderedFilter { + public static final int DEFAULT_ORDER = Integer.MAX_VALUE; + + + @Override + protected void doFilterInternal(HttpServletRequest request, HttpServletResponse response, FilterChain filterChain) throws ServletException, IOException { + String servletPath = request.getServletPath(); + + ResponseWrapper wrapper = new ResponseWrapper(response); + String requestContent = null; + + if (ServletUtil.isMultipart(request)) { + } else { + EncryptRequestWrapper encryptRequestWrapper = EncryptRequestWrapper.newOrGetMultiReadHttpServletRequest(request); + requestContent = encryptRequestWrapper.getBody(); + request = encryptRequestWrapper; + + } + log.debug("{}>>>{}", servletPath, requestContent); + + try { + filterChain.doFilter(request, wrapper); + } finally { + try { + process(request, wrapper, response); + } catch (Exception e) { + log.error("AesFilter error", e); + } + } + } + + @SneakyThrows + protected void process(HttpServletRequest request, ResponseWrapper responseWrapper, HttpServletResponse response) { + + String servletPath = request.getRequestURI(); + String isencrypt = request.getHeader("Isencrypt"); + ServletOutputStream out = response.getOutputStream(); + if (ResponseWrapper.isJsonContentType(responseWrapper.getContentType())) { + String responseContent = responseWrapper.getTextContent(); + if (StrUtil.isNotEmpty(responseContent)&&StringUtils.isNotBlank(isencrypt)) { + String JSPublicKey = ((EncryptRequestWrapper)request).getJSPublicKey(); + if (StringUtils.isNotBlank(JSPublicKey)) { + ApiEncryptRes apiEncryptRes = ApiSecurityUtils.encrypt(JSON.toJSONString(responseContent), JSPublicKey); + responseContent = JSONUtil.toJsonStr(apiEncryptRes); + } + log.info("{}<<<{}", servletPath, responseContent); + byte[] bytes = responseContent.getBytes(StandardCharsets.UTF_8); + response.setContentLength(bytes.length); + out.write(bytes); + out.flush(); + out.close(); + } else { + responseWrapper.getByteArrayOutputStream().writeTo(out); + out.flush(); + out.close(); + } + } else { + responseWrapper.getByteArrayOutputStream().writeTo(out); + out.flush(); + out.close(); + } + } + + @Override + public void afterPropertiesSet() throws ServletException { + super.afterPropertiesSet(); + } + + @Override + public int getOrder() { + return DEFAULT_ORDER; + } +} 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/wrapper/EncryptRequestWrapper.java b/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-application/schisandra-cloud-storage-auth-application-controller/src/main/java/com/schisandra/auth/application/wrapper/EncryptRequestWrapper.java new file mode 100644 index 0000000..13fc264 --- /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/wrapper/EncryptRequestWrapper.java @@ -0,0 +1,257 @@ +package com.schisandra.auth.application.wrapper; + +import cn.hutool.core.convert.Convert; +import com.alibaba.fastjson.JSONObject; +import com.schisandra.auth.common.redis.RedisUtil; +import com.schisandra.auth.common.utils.ApiSecurityUtils; +import com.schisandra.auth.common.utils.MD5Util; +import lombok.extern.slf4j.Slf4j; +import org.apache.commons.lang3.StringUtils; + +import javax.servlet.ReadListener; +import javax.servlet.ServletInputStream; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletRequestWrapper; +import java.io.*; + + +import cn.hutool.core.io.FastByteArrayOutputStream; +import cn.hutool.core.io.IoUtil; +import cn.hutool.core.lang.Assert; +import cn.hutool.http.ContentType; + + +import lombok.SneakyThrows; +import org.springframework.web.context.WebApplicationContext; +import org.springframework.web.context.support.WebApplicationContextUtils; +import org.springframework.web.multipart.support.StandardServletMultipartResolver; +import org.springframework.web.util.WebUtils; + + +import java.util.TreeMap; + +/** + * @ClassName requestWrapper + * @Description TODO + * @Author landaiqing + * @Date 2024/1/31 17:58 + */ + +/** + * 确保request可以多次读取 + */ + +@Slf4j +public class EncryptRequestWrapper extends HttpServletRequestWrapper { + + + + //2024-02-02由于在过滤器中无法直接通过Autowired获取Bean,因此需要通过spring上下文来获取IOC管理的实体类 +// @Autowired +// private RedisUtil redisUtil; + + protected FastByteArrayOutputStream cachedContent; + protected String JSPublicKey; + protected EncryptRequestWrapper(HttpServletRequest request ) { + + super(request); + RedisUtil redisUtils =getBean(RedisUtil.class, request); + this.copyBody(redisUtils); + + + } + + /** + * + * 此处主要是用于读取 RedisUtil + * @param clazz + * @param request + * @param + * @return + */ + public T getBean(Class clazz, HttpServletRequest request){ + WebApplicationContext applicationContext = WebApplicationContextUtils.getRequiredWebApplicationContext(request.getServletContext()); + return applicationContext.getBean(clazz); + } + + public static EncryptRequestWrapper newOrGetMultiReadHttpServletRequest(HttpServletRequest request) { + EncryptRequestWrapper multiReadHttpServletRequest = getMultiReadHttpServletRequest(request); + if (null != multiReadHttpServletRequest) { + return multiReadHttpServletRequest; + } else { + String contentType = request.getContentType(); + if (contentType != null && contentType.contains(ContentType.MULTIPART.getValue())) { + // 将转化后的 request 放入过滤链中 + request = new StandardServletMultipartResolver().resolveMultipart(request); + } + return new EncryptRequestWrapper(request); + } + } + + public static EncryptRequestWrapper getMultiReadHttpServletRequest(HttpServletRequest request) { + EncryptRequestWrapper nativeRequest = WebUtils.getNativeRequest(request, EncryptRequestWrapper.class); + if (null != nativeRequest) { + return nativeRequest; + } else if (request instanceof EncryptRequestWrapper) { + return (EncryptRequestWrapper) request; + } else { + return null; + } + } + //重新读取请求，因为request只可以被读取一次，需要重新设置为可多次读取 + @SneakyThrows + protected void copyBody(RedisUtil redisUtils) { + int length = this.getContentLength(); + if (length > 0) { + cachedContent = IoUtil.read(getRequest().getInputStream()); + if (StringUtils.isNotBlank(this.getHeader("Isencrypt"))&&StringUtils.isNotBlank(this.getHeader("X-Access-Token"))) { + String body = new String(cachedContent.toByteArray()); + log.info("------------------- body = " + body + "------------------------"); + if (StringUtils.isNotBlank(body)) { + JSONObject jsonBody = JSONObject.parseObject(body); + if(null != jsonBody){ + String dataEncrypt = jsonBody.getString("data"); + String aeskey = jsonBody.getString("aeskey"); + JSPublicKey = jsonBody.getString("frontPublicKey"); + String data; + JSONObject json = null; + log.info("------------------- dataEncrypt = " + dataEncrypt + "------------------------"); + log.info("------------------- aesKey = " + aeskey + "------------------------"); + String token = this.getHeader("X-Access-Token"); + String md5Token = MD5Util.md5(token); + String privateKey = Convert.toStr(redisUtils.get(md5Token + "privateKey")); + data = ApiSecurityUtils.decrypt(aeskey, dataEncrypt,privateKey); + // 如果数据不为空就编译 + if (StringUtils.isNotBlank(data)) { + //如果参数为空前端传回undefined + if ("undefined".equalsIgnoreCase(data)) { + json = new JSONObject(); + } else { + json = JSONObject.parseObject(data); + } + } + if (json != null) { + body = json.toJSONString(); + } + } + log.info("------------------- body = " + body + "------------------------"); + cachedContent.reset(); + cachedContent.write( body.getBytes(), 0, body.getBytes().length); + + } + } + } else { + cachedContent = new FastByteArrayOutputStream(); + } + } + + @Override + public int getContentLength() { + if (null != cachedContent) { + return cachedContent.size(); + } + return super.getContentLength(); + } + + public byte[] getByteArrayBody() { + return cachedContent.toByteArray(); + } + + public String getBody() { + String body = null; + if (cachedContent != null && cachedContent.size() > 0) { + body = new String(cachedContent.toByteArray()); + } + return body; + } + + public String getSortBody() { + return JSONObject.toJSONString(this.getBody(TreeMap.class)); + } + + public T getBody(Class type) { + return cn.hutool.json.JSONUtil.toBean(this.getBody(), type); + } + + //这个方法为获取前端给后端用于加密aeskey的rsa公钥 + public String getJSPublicKey(){ + return JSPublicKey; + } + @Override + public BufferedReader getReader() throws IOException { + return new BufferedReader(new InputStreamReader(getInputStream())); + } + + @Override + public ServletInputStream getInputStream() throws IOException { + if (this.getContentLength() < 1) { + return super.getInputStream(); + } + return new ResettableServletInputStream(new ByteArrayInputStream(cachedContent.toByteArray())); + } + + private class ResettableServletInputStream extends ServletInputStream { + + private final InputStream sourceStream; + + private boolean finished = false; + + + /** + * Create a DelegatingServletInputStream for the given source stream. + * + * @param sourceStream the source stream (never {@code null}) + */ + public ResettableServletInputStream(InputStream sourceStream) { + Assert.notNull(sourceStream, "Source InputStream must not be null"); + this.sourceStream = sourceStream; + } + + /** + * Return the underlying source stream (never {@code null}). + */ + public final InputStream getSourceStream() { + return this.sourceStream; + } + + + @Override + public int read() throws IOException { + int data = this.sourceStream.read(); + if (data == -1) { + this.finished = true; + } + return data; + } + + @Override + public int available() throws IOException { + return this.sourceStream.available(); + } + + @Override + public void close() throws IOException { + super.close(); + this.sourceStream.close(); + } + + @Override + public boolean isFinished() { + return finished; + } + + @Override + public boolean isReady() { + return true; + } + + @Override + public void setReadListener(ReadListener readListener) { + + } + } + + + +} + 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/wrapper/ResponseWrapper.java b/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-application/schisandra-cloud-storage-auth-application-controller/src/main/java/com/schisandra/auth/application/wrapper/ResponseWrapper.java new file mode 100644 index 0000000..10f6eed --- /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/wrapper/ResponseWrapper.java @@ -0,0 +1,114 @@ +package com.schisandra.auth.application.wrapper; + +import cn.hutool.core.util.StrUtil; +import lombok.extern.slf4j.Slf4j; +import org.springframework.http.MediaType; + +import javax.servlet.ServletOutputStream; +import javax.servlet.WriteListener; +import javax.servlet.http.HttpServletResponse; +import javax.servlet.http.HttpServletResponseWrapper; +import java.io.ByteArrayOutputStream; +import java.io.IOException; +import java.io.PrintWriter; +/** * 返回值输出代理类 + * @ClassName ResponseWrapper + * @Description TODO + * @Author L + * @Date 2024/1/31 18:58 + */ + +@Slf4j +public class ResponseWrapper extends HttpServletResponseWrapper { + ByteArrayOutputStream _stream = new ByteArrayOutputStream(); + PrintWriter _pw = new PrintWriter(_stream); + + public ResponseWrapper(HttpServletResponse resp) throws IOException { + super(resp); + } + + /** + * 覆盖getWriter()方法，将字符流缓冲到本地 + */ + @Override + public PrintWriter getWriter() throws IOException { + return _pw; + } + + /** + * 覆盖getOutputStream()方法，将字节流缓冲到本地 + */ + @Override + public ServletOutputStream getOutputStream() throws IOException { + return new ServletOutputStream() { + @Override + public boolean isReady() { + return false; + } + + @Override + public void setWriteListener(WriteListener writeListener) { + + } + + @Override + public void write(int b) throws IOException { + _stream.write(b); + } + }; + } + + /** + * 把缓冲区内容写入输出流后关闭 + * + * @author xxj + */ + public void flush() { + try { + _pw.flush(); + _pw.close(); + _stream.flush(); + _stream.close(); + } catch (IOException e) { + log.error("", e); + } + } + + /** + * 获取字节流 + * + * @return + */ + public ByteArrayOutputStream getByteArrayOutputStream() { + return _stream; + } + + /** + * 将换出区内容转为文本输出 + * + * @return + */ + public String getTextContent() { + flush(); + return _stream.toString(); + } + + public static boolean isTextContentType(String contentType) { + boolean flag = false; + if (StrUtil.isBlank(contentType)) { + return false; + } else { + flag = StrUtil.startWithIgnoreCase(contentType, "text"); + if (!flag) { + flag = isJsonContentType(contentType); + } + } + return flag; + } + + public static boolean isJsonContentType(String contentType) { + return !StrUtil.isBlank(contentType) + && (StrUtil.containsIgnoreCase(contentType, "application/problem+json") + || StrUtil.containsIgnoreCase(contentType, MediaType.APPLICATION_JSON_VALUE)); + } +} 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 86846ad..13a1cf4 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 @@ -100,5 +100,18 @@ sms4j-Email-core 3.2.1 + + + org.apache.directory.studio + org.apache.commons.codec + 1.8 + + + + cn.hutool + hutool-extra + 5.8.27 + + diff --git a/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-common/src/main/java/com/schisandra/auth/common/entity/ApiEncryptRes.java b/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-common/src/main/java/com/schisandra/auth/common/entity/ApiEncryptRes.java new file mode 100644 index 0000000..9ba8785 --- /dev/null +++ b/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-common/src/main/java/com/schisandra/auth/common/entity/ApiEncryptRes.java @@ -0,0 +1,19 @@ +package com.schisandra.auth.common.entity; + +import lombok.Data; + +/** + * @Classname ApiEncryptRes + * @BelongsProject: schisandra-cloud-storage + * @BelongsPackage: com.schisandra.auth.common.entity + * @Author: landaiqing + * @CreateTime: 2024-04-28 12:01 + * @Description: TODO + * @Version: 1.0 + */ +@Data +public class ApiEncryptRes { + private String aesKeyByRsa; + private String data; + private String frontPublicKey; +} diff --git a/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-common/src/main/java/com/schisandra/auth/common/utils/AESUtils.java b/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-common/src/main/java/com/schisandra/auth/common/utils/AESUtils.java new file mode 100644 index 0000000..e5bd78c --- /dev/null +++ b/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-common/src/main/java/com/schisandra/auth/common/utils/AESUtils.java @@ -0,0 +1,110 @@ +package com.schisandra.auth.common.utils; + +import org.apache.commons.codec.binary.Base64; + +import javax.crypto.Cipher; +import javax.crypto.spec.SecretKeySpec; +import java.nio.charset.StandardCharsets; +import java.security.SecureRandom; +import java.util.Random; + +/** + * @ClassName AESUtils 一定要选择16位密钥长度，也就是KEY_LENGTH=16*8，36的话就需要修改环境的jar包。 + * @Description TODO + * @Author L + * @Date 2024/1/26 17:27 + */ +public class AESUtils { + /** + * 加密算法AES + */ + private static final String KEY_ALGORITHM = "AES"; + + /** + * key的长度，Wrong key size: must be equal to 128, 192 or 256 + * 传入时需要16、24、36 + */ + private static final int KEY_LENGTH = 16 * 8; + + /** + * 算法名称/加密模式/数据填充方式 + * 默认：AES/ECB/PKCS5Padding + */ + private static final String ALGORITHMS = "AES/ECB/PKCS5Padding"; + + /** + * 后端AES的key，由静态代码块赋值 + */ + public static String key; + + + static { + key = getKey(); + } + + /** + * 获取key + */ + public static String getKey() { + int length = KEY_LENGTH / 8; + StringBuilder uid = new StringBuilder(length); + //产生32位的强随机数 + Random rd = new SecureRandom(); + for (int i = 0; i < length; i++) { + //产生0-2的3位随机数 + switch (rd.nextInt(3)) { + case 0: + //0-9的随机数 + uid.append(rd.nextInt(10)); + break; + case 1: + //ASCII在65-90之间为大写,获取大写随机 + uid.append((char) (rd.nextInt(26) + 65)); + break; + case 2: + //ASCII在97-122之间为小写，获取小写随机 + uid.append((char) (rd.nextInt(26) + 97)); + break; + default: + break; + } + } + return uid.toString(); + } + + /** + * AES 加密 + * + * @param content 加密的字符串 + * @param encryptKey key值 + */ + public static String encrypt(String content, String encryptKey) throws Exception { + //设置Cipher对象 + Cipher cipher = Cipher.getInstance(ALGORITHMS); + cipher.init(Cipher.ENCRYPT_MODE, new SecretKeySpec(encryptKey.getBytes(), KEY_ALGORITHM)); + + //调用doFinal + // 转base64 + return Base64.encodeBase64String(cipher.doFinal(content.getBytes(StandardCharsets.UTF_8))); + + } + + /** + * AES 解密 + * + * @param encryptStr 解密的字符串 + * @param decryptKey 解密的key值 + */ + public static String decrypt(String encryptStr, String decryptKey) throws Exception { + //base64格式的key字符串转byte + byte[] decodeBase64 = Base64.decodeBase64(encryptStr); + + + //设置Cipher对象 + Cipher cipher = Cipher.getInstance(ALGORITHMS); + cipher.init(Cipher.DECRYPT_MODE, new SecretKeySpec(decryptKey.getBytes(), KEY_ALGORITHM)); + //调用doFinal解密 + return new String(cipher.doFinal(decodeBase64)); + + } +} diff --git a/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-common/src/main/java/com/schisandra/auth/common/utils/ApiSecurityUtils.java b/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-common/src/main/java/com/schisandra/auth/common/utils/ApiSecurityUtils.java new file mode 100644 index 0000000..230bc69 --- /dev/null +++ b/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-common/src/main/java/com/schisandra/auth/common/utils/ApiSecurityUtils.java @@ -0,0 +1,44 @@ +package com.schisandra.auth.common.utils; + +import com.schisandra.auth.common.entity.ApiEncryptRes; +import com.schisandra.auth.common.utils.AESUtils; +import com.schisandra.auth.common.utils.RSAUtils; +import org.apache.commons.codec.binary.Base64; +/** + * @ClassName ApiSecurityUtils + * @Description TODO + * @Author L + * @Date 2024/1/26 17:39 + */ +public class ApiSecurityUtils { + /** + * + * @param aesKeyByRsa 经过rsa加密的aeskey + * @param decryptStr 经过aes加密的数据 + * @return 解密后的数据 + */ + public static String decrypt(String aesKeyByRsa,String decryptStr,String privateKey) throws Exception { + byte[] bytes = RSAUtils.decryptByPrivateKey(Base64.decodeBase64(aesKeyByRsa), privateKey); + String aesKey = new String(bytes); + return AESUtils.decrypt(decryptStr, aesKey); + } + + /** + * + * @param encryptStr 要加密的数据 + * @param frontPublicKey 前端公钥 + * @return 加密后的数据 + */ + public static ApiEncryptRes encrypt(String encryptStr, String frontPublicKey) throws Exception { + String aesKey = AESUtils.getKey(); + String data = AESUtils.encrypt(encryptStr, aesKey); + ApiEncryptRes apiEncryptRes = new ApiEncryptRes(); + String aesKeyByRsa = Base64.encodeBase64String(RSAUtils.encryptByPublicKey(aesKey.getBytes(), frontPublicKey)); + apiEncryptRes.setAesKeyByRsa(aesKeyByRsa); + apiEncryptRes.setData(data); + return apiEncryptRes; + } + +} + + diff --git a/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-common/src/main/java/com/schisandra/auth/common/utils/MD5Util.java b/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-common/src/main/java/com/schisandra/auth/common/utils/MD5Util.java new file mode 100644 index 0000000..9a21050 --- /dev/null +++ b/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-common/src/main/java/com/schisandra/auth/common/utils/MD5Util.java @@ -0,0 +1,61 @@ +package com.schisandra.auth.common.utils; + +import java.security.MessageDigest; + +public class MD5Util { + //十六进制下数字到字符的映射数组 + private final static String[] hexDigits = {"0", "1", "2", "3", "4", + "5", "6", "7", "8", "9", "a", "b", "c", "d", "e", "f"}; + + + /** + * 把inputString加密 + */ + public static String md5(String inputString) { + return encodeByMD5(inputString); + } + /** + * 对字符串进行MD5加密 + */ + private static String encodeByMD5(String originString) { + if (originString != null) { + try { + //创建具有指定算法名称的信息摘要 + MessageDigest md = MessageDigest.getInstance("MD5"); + //使用指定的字节数组对摘要进行最后更新，然后完成摘要计算 + byte[] results = md.digest(originString.getBytes("utf-8")); + //将得到的字节数组变成字符串返回 + String resultString = byteArrayToHexString(results); + return resultString.toUpperCase(); + } catch (Exception ex) { + ex.printStackTrace(); + } + } + return null; + } + /** + * 转换字节数组为十六进制字符串 + * + * @param + * @return 十六进制字符串 + */ + private static String byteArrayToHexString(byte[] b) { + StringBuffer resultSb = new StringBuffer(); + for (int i = 0; i < b.length; i++) { + resultSb.append(byteToHexString(b[i])); + } + return resultSb.toString(); + } + + private static String byteToHexString(byte b) { + int n = b; + if (n < 0) { + n += 256; + } + int d1 = n / 16; + int d2 = n % 16; + return hexDigits[d1] + hexDigits[d2]; + } + +} + diff --git a/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-common/src/main/java/com/schisandra/auth/common/utils/RSAUtils.java b/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-common/src/main/java/com/schisandra/auth/common/utils/RSAUtils.java new file mode 100644 index 0000000..acdf56c --- /dev/null +++ b/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-common/src/main/java/com/schisandra/auth/common/utils/RSAUtils.java @@ -0,0 +1,171 @@ +package com.schisandra.auth.common.utils; + +import org.apache.commons.codec.binary.Base64; +import javax.crypto.Cipher; +import java.io.ByteArrayOutputStream; +import java.security.Key; +import java.security.KeyFactory; +import java.security.KeyPair; +import java.security.KeyPairGenerator; +import java.security.interfaces.RSAPrivateKey; +import java.security.interfaces.RSAPublicKey; +import java.security.spec.PKCS8EncodedKeySpec; +import java.security.spec.X509EncodedKeySpec; +import java.util.LinkedHashMap; +import java.util.Map; + +/** + * @ClassName RSAUtils + * @Description TODO + * @Author L + * @Date 2024/1/26 17:28 + */ +public class RSAUtils { + + /** + * 加密算法RSA + */ + private static final String KEY_ALGORITHM = "RSA"; + + /** + * 算法名称/加密模式/数据填充方式 + * 默认：RSA/ECB/PKCS1Padding + */ + private static final String ALGORITHMS = "RSA/ECB/PKCS1Padding"; + + /** + * RSA最大加密明文大小 + */ + private static final int MAX_ENCRYPT_BLOCK = 245; + + /** + * RSA最大解密密文大小 + */ + private static final int MAX_DECRYPT_BLOCK = 256; + + /** + * RSA 位数 如果采用2048 上面最大加密和最大解密则须填写: 245 256 + */ + private static final int INITIALIZE_LENGTH = 2048; + + /** + * 后端RSA的密钥对(公钥和私钥)Map，由静态代码块赋值 + */ + private static final Map map = new LinkedHashMap<>(2); + + /** + * 生成密钥对(公钥和私钥) + */ + + public static Map genKeyPair() throws Exception { + KeyPairGenerator keyPairGen = KeyPairGenerator.getInstance(KEY_ALGORITHM); + keyPairGen.initialize(INITIALIZE_LENGTH); + KeyPair keyPair = keyPairGen.generateKeyPair(); + // 获取公钥 + RSAPublicKey publicKey = (RSAPublicKey) keyPair.getPublic(); + // 获取私钥 + RSAPrivateKey privateKey = (RSAPrivateKey) keyPair.getPrivate(); + // 得到公钥字符串 + String publicKeyString = Base64.encodeBase64String(publicKey.getEncoded()); + // 得到私钥字符串 + String privateKeyString = Base64.encodeBase64String((privateKey.getEncoded())); + map.put("publicKey",publicKeyString); + map.put("privateKey",privateKeyString); + return map; + } + public static String getPrivateKey(){ + return map.get("privateKey"); + } + public static String getPublicKey(){ + return map.get("publicKey"); + } + /** + * RSA私钥解密 + * @param data BASE64编码过的密文 + * @param privateKey 私钥(BASE64编码) + * @return utf-8编码的明文 + */ + public static byte[] decryptByPrivateKey(byte[] data, String privateKey) throws Exception { + //base64格式的key字符串转Key对象 + Key privateK = KeyFactory.getInstance(KEY_ALGORITHM).generatePrivate(new PKCS8EncodedKeySpec(Base64.decodeBase64(privateKey))); + Cipher cipher = Cipher.getInstance(ALGORITHMS); + cipher.init(Cipher.DECRYPT_MODE, privateK); + + //分段进行解密操作 + return encryptAndDecryptOfSubsection(data, cipher, MAX_DECRYPT_BLOCK); + } + + /** + * RSA公钥加密 + * @param data BASE64编码过的密文 + * @param publicKey 公钥(BASE64编码) + * @return utf-8编码的明文 + */ + public static byte[] encryptByPublicKey(byte[] data, String publicKey) throws Exception { + //base64格式的key字符串转Key对象 + Key publicK = KeyFactory.getInstance(KEY_ALGORITHM).generatePublic(new X509EncodedKeySpec(Base64.decodeBase64(publicKey))); + Cipher cipher = Cipher.getInstance(ALGORITHMS); + cipher.init(Cipher.ENCRYPT_MODE, publicK); + //分段进行加密操作 + return encryptAndDecryptOfSubsection(data, cipher, MAX_ENCRYPT_BLOCK); + } + + /** + * RSA公钥解密 + * @param data BASE64编码过的密文 + * @param publicKey RSA公钥 + * @return utf-8编码的明文 + */ + public static byte[] pubKeyDec(byte[] data, String publicKey) throws Exception { + //base64格式的key字符串转Key对象 + Key privateK = KeyFactory.getInstance(KEY_ALGORITHM).generatePublic(new X509EncodedKeySpec(Base64.decodeBase64(publicKey))); + Cipher cipher = Cipher.getInstance(ALGORITHMS); + cipher.init(Cipher.DECRYPT_MODE, privateK); + + //分段进行解密操作 + return encryptAndDecryptOfSubsection(data, cipher, MAX_DECRYPT_BLOCK); + } + + + /** + * RSA私钥加密 + * @param data 待加密的明文 + * @param privateKey RSA私钥 + * @return 经BASE64编码后的密文 + */ + public static byte[] privKeyEnc(byte[] data, String privateKey) throws Exception { + + //base64格式的key字符串转Key对象 + Key publicK = KeyFactory.getInstance(KEY_ALGORITHM).generatePrivate(new PKCS8EncodedKeySpec(Base64.decodeBase64(privateKey))); + Cipher cipher = Cipher.getInstance(ALGORITHMS); + cipher.init(Cipher.ENCRYPT_MODE, publicK); + + //分段进行加密操作 + return encryptAndDecryptOfSubsection(data, cipher, MAX_ENCRYPT_BLOCK); + } + + /** + * 分段进行加密、解密操作 + */ + private static byte[] encryptAndDecryptOfSubsection(byte[] data, Cipher cipher, int encryptBlock) throws Exception { + int inputLen = data.length; + ByteArrayOutputStream out = new ByteArrayOutputStream(); + int offSet = 0; + byte[] cache; + int i = 0; + // 对数据分段加密 + while (inputLen - offSet > 0) { + if (inputLen - offSet > encryptBlock) { + cache = cipher.doFinal(data, offSet, encryptBlock); + } else { + cache = cipher.doFinal(data, offSet, inputLen - offSet); + } + out.write(cache, 0, cache.length); + i++; + offSet = i * encryptBlock; + } + out.close(); + return out.toByteArray(); + } + +} From a6994c25811c52b7105c89c12c1f6c19fccd30e8 Mon Sep 17 00:00:00 2001 From: landaiqing <3517283258@qq.com> Date: Mon, 29 Apr 2024 00:13:18 +0800 Subject: [PATCH 03/27] feat: remove aes/rsa encrypt --- .../controller/EncryptController.java | 51 ---- .../application/filter/EncryptApiFilter.java | 100 ------- .../wrapper/EncryptRequestWrapper.java | 257 ------------------ .../application/wrapper/ResponseWrapper.java | 114 -------- 4 files changed, 522 deletions(-) delete mode 100644 schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-application/schisandra-cloud-storage-auth-application-controller/src/main/java/com/schisandra/auth/application/controller/EncryptController.java delete mode 100644 schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-application/schisandra-cloud-storage-auth-application-controller/src/main/java/com/schisandra/auth/application/filter/EncryptApiFilter.java delete mode 100644 schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-application/schisandra-cloud-storage-auth-application-controller/src/main/java/com/schisandra/auth/application/wrapper/EncryptRequestWrapper.java delete mode 100644 schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-application/schisandra-cloud-storage-auth-application-controller/src/main/java/com/schisandra/auth/application/wrapper/ResponseWrapper.java diff --git a/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-application/schisandra-cloud-storage-auth-application-controller/src/main/java/com/schisandra/auth/application/controller/EncryptController.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/EncryptController.java deleted file mode 100644 index 45d724f..0000000 --- a/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-application/schisandra-cloud-storage-auth-application-controller/src/main/java/com/schisandra/auth/application/controller/EncryptController.java +++ /dev/null @@ -1,51 +0,0 @@ -package com.schisandra.auth.application.controller; - -import com.schisandra.auth.common.entity.Result; -import com.schisandra.auth.common.redis.RedisUtil; -import com.schisandra.auth.common.utils.MD5Util; -import com.schisandra.auth.common.utils.RSAUtils; -import lombok.extern.slf4j.Slf4j; -import org.apache.commons.lang3.StringUtils; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; - -import javax.annotation.Resource; -import java.util.Map; - -/** - * @ClassName EncryptController - * @Description TODO - * @Author L - * @Date 2024/1/29 9:18 - */ -@RestController -@RequestMapping("/encrypt") -@Slf4j -public class EncryptController { - @Resource - private RedisUtil redisUtil; - private String authPublicKeyPrefix = "auth.publicKey"; - private String authPrivateKeyPrefix = "auth.privateKey"; - - @GetMapping("/getPublicKey") - public Result getPublicKey() throws Exception { - //获取当前登陆账号对应的token,这行代码就不贴了。 - String token="12345"; - String publicKey=""; - if (StringUtils.isNotBlank(token)) { - Map stringStringMap = RSAUtils.genKeyPair(); - publicKey = stringStringMap.get("publicKey"); - String privateKey = stringStringMap.get("privateKey"); - String md5Token = MD5Util.md5(token); - //这个地方的存放时间根据你的token存放时间走 - redisUtil.set(md5Token + "publicKey", publicKey); - redisUtil.set(md5Token + "privateKey", privateKey); - return Result.ok(publicKey); - } - return Result.ok(publicKey); - } - -} - 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/filter/EncryptApiFilter.java b/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-application/schisandra-cloud-storage-auth-application-controller/src/main/java/com/schisandra/auth/application/filter/EncryptApiFilter.java deleted file mode 100644 index 8bcbb28..0000000 --- a/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-application/schisandra-cloud-storage-auth-application-controller/src/main/java/com/schisandra/auth/application/filter/EncryptApiFilter.java +++ /dev/null @@ -1,100 +0,0 @@ -package com.schisandra.auth.application.filter; - -import cn.hutool.core.util.StrUtil; -import cn.hutool.extra.servlet.ServletUtil; -import cn.hutool.json.JSONUtil; -import com.alibaba.fastjson.JSON; -import com.schisandra.auth.application.wrapper.EncryptRequestWrapper; -import com.schisandra.auth.application.wrapper.ResponseWrapper; -import com.schisandra.auth.common.entity.ApiEncryptRes; -import com.schisandra.auth.common.utils.ApiSecurityUtils; -import lombok.SneakyThrows; -import lombok.extern.slf4j.Slf4j; -import org.apache.commons.lang3.StringUtils; -import org.springframework.boot.web.servlet.filter.OrderedFilter; -import org.springframework.stereotype.Component; -import org.springframework.web.filter.OncePerRequestFilter; - -import javax.servlet.FilterChain; -import javax.servlet.ServletException; -import javax.servlet.ServletOutputStream; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import java.io.IOException; -import java.nio.charset.StandardCharsets; - -@Slf4j -@Component -public class EncryptApiFilter extends OncePerRequestFilter implements OrderedFilter { - public static final int DEFAULT_ORDER = Integer.MAX_VALUE; - - - @Override - protected void doFilterInternal(HttpServletRequest request, HttpServletResponse response, FilterChain filterChain) throws ServletException, IOException { - String servletPath = request.getServletPath(); - - ResponseWrapper wrapper = new ResponseWrapper(response); - String requestContent = null; - - if (ServletUtil.isMultipart(request)) { - } else { - EncryptRequestWrapper encryptRequestWrapper = EncryptRequestWrapper.newOrGetMultiReadHttpServletRequest(request); - requestContent = encryptRequestWrapper.getBody(); - request = encryptRequestWrapper; - - } - log.debug("{}>>>{}", servletPath, requestContent); - - try { - filterChain.doFilter(request, wrapper); - } finally { - try { - process(request, wrapper, response); - } catch (Exception e) { - log.error("AesFilter error", e); - } - } - } - - @SneakyThrows - protected void process(HttpServletRequest request, ResponseWrapper responseWrapper, HttpServletResponse response) { - - String servletPath = request.getRequestURI(); - String isencrypt = request.getHeader("Isencrypt"); - ServletOutputStream out = response.getOutputStream(); - if (ResponseWrapper.isJsonContentType(responseWrapper.getContentType())) { - String responseContent = responseWrapper.getTextContent(); - if (StrUtil.isNotEmpty(responseContent)&&StringUtils.isNotBlank(isencrypt)) { - String JSPublicKey = ((EncryptRequestWrapper)request).getJSPublicKey(); - if (StringUtils.isNotBlank(JSPublicKey)) { - ApiEncryptRes apiEncryptRes = ApiSecurityUtils.encrypt(JSON.toJSONString(responseContent), JSPublicKey); - responseContent = JSONUtil.toJsonStr(apiEncryptRes); - } - log.info("{}<<<{}", servletPath, responseContent); - byte[] bytes = responseContent.getBytes(StandardCharsets.UTF_8); - response.setContentLength(bytes.length); - out.write(bytes); - out.flush(); - out.close(); - } else { - responseWrapper.getByteArrayOutputStream().writeTo(out); - out.flush(); - out.close(); - } - } else { - responseWrapper.getByteArrayOutputStream().writeTo(out); - out.flush(); - out.close(); - } - } - - @Override - public void afterPropertiesSet() throws ServletException { - super.afterPropertiesSet(); - } - - @Override - public int getOrder() { - return DEFAULT_ORDER; - } -} 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/wrapper/EncryptRequestWrapper.java b/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-application/schisandra-cloud-storage-auth-application-controller/src/main/java/com/schisandra/auth/application/wrapper/EncryptRequestWrapper.java deleted file mode 100644 index 13fc264..0000000 --- a/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-application/schisandra-cloud-storage-auth-application-controller/src/main/java/com/schisandra/auth/application/wrapper/EncryptRequestWrapper.java +++ /dev/null @@ -1,257 +0,0 @@ -package com.schisandra.auth.application.wrapper; - -import cn.hutool.core.convert.Convert; -import com.alibaba.fastjson.JSONObject; -import com.schisandra.auth.common.redis.RedisUtil; -import com.schisandra.auth.common.utils.ApiSecurityUtils; -import com.schisandra.auth.common.utils.MD5Util; -import lombok.extern.slf4j.Slf4j; -import org.apache.commons.lang3.StringUtils; - -import javax.servlet.ReadListener; -import javax.servlet.ServletInputStream; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletRequestWrapper; -import java.io.*; - - -import cn.hutool.core.io.FastByteArrayOutputStream; -import cn.hutool.core.io.IoUtil; -import cn.hutool.core.lang.Assert; -import cn.hutool.http.ContentType; - - -import lombok.SneakyThrows; -import org.springframework.web.context.WebApplicationContext; -import org.springframework.web.context.support.WebApplicationContextUtils; -import org.springframework.web.multipart.support.StandardServletMultipartResolver; -import org.springframework.web.util.WebUtils; - - -import java.util.TreeMap; - -/** - * @ClassName requestWrapper - * @Description TODO - * @Author landaiqing - * @Date 2024/1/31 17:58 - */ - -/** - * 确保request可以多次读取 - */ - -@Slf4j -public class EncryptRequestWrapper extends HttpServletRequestWrapper { - - - - //2024-02-02由于在过滤器中无法直接通过Autowired获取Bean,因此需要通过spring上下文来获取IOC管理的实体类 -// @Autowired -// private RedisUtil redisUtil; - - protected FastByteArrayOutputStream cachedContent; - protected String JSPublicKey; - protected EncryptRequestWrapper(HttpServletRequest request ) { - - super(request); - RedisUtil redisUtils =getBean(RedisUtil.class, request); - this.copyBody(redisUtils); - - - } - - /** - * - * 此处主要是用于读取 RedisUtil - * @param clazz - * @param request - * @param - * @return - */ - public T getBean(Class clazz, HttpServletRequest request){ - WebApplicationContext applicationContext = WebApplicationContextUtils.getRequiredWebApplicationContext(request.getServletContext()); - return applicationContext.getBean(clazz); - } - - public static EncryptRequestWrapper newOrGetMultiReadHttpServletRequest(HttpServletRequest request) { - EncryptRequestWrapper multiReadHttpServletRequest = getMultiReadHttpServletRequest(request); - if (null != multiReadHttpServletRequest) { - return multiReadHttpServletRequest; - } else { - String contentType = request.getContentType(); - if (contentType != null && contentType.contains(ContentType.MULTIPART.getValue())) { - // 将转化后的 request 放入过滤链中 - request = new StandardServletMultipartResolver().resolveMultipart(request); - } - return new EncryptRequestWrapper(request); - } - } - - public static EncryptRequestWrapper getMultiReadHttpServletRequest(HttpServletRequest request) { - EncryptRequestWrapper nativeRequest = WebUtils.getNativeRequest(request, EncryptRequestWrapper.class); - if (null != nativeRequest) { - return nativeRequest; - } else if (request instanceof EncryptRequestWrapper) { - return (EncryptRequestWrapper) request; - } else { - return null; - } - } - //重新读取请求，因为request只可以被读取一次，需要重新设置为可多次读取 - @SneakyThrows - protected void copyBody(RedisUtil redisUtils) { - int length = this.getContentLength(); - if (length > 0) { - cachedContent = IoUtil.read(getRequest().getInputStream()); - if (StringUtils.isNotBlank(this.getHeader("Isencrypt"))&&StringUtils.isNotBlank(this.getHeader("X-Access-Token"))) { - String body = new String(cachedContent.toByteArray()); - log.info("------------------- body = " + body + "------------------------"); - if (StringUtils.isNotBlank(body)) { - JSONObject jsonBody = JSONObject.parseObject(body); - if(null != jsonBody){ - String dataEncrypt = jsonBody.getString("data"); - String aeskey = jsonBody.getString("aeskey"); - JSPublicKey = jsonBody.getString("frontPublicKey"); - String data; - JSONObject json = null; - log.info("------------------- dataEncrypt = " + dataEncrypt + "------------------------"); - log.info("------------------- aesKey = " + aeskey + "------------------------"); - String token = this.getHeader("X-Access-Token"); - String md5Token = MD5Util.md5(token); - String privateKey = Convert.toStr(redisUtils.get(md5Token + "privateKey")); - data = ApiSecurityUtils.decrypt(aeskey, dataEncrypt,privateKey); - // 如果数据不为空就编译 - if (StringUtils.isNotBlank(data)) { - //如果参数为空前端传回undefined - if ("undefined".equalsIgnoreCase(data)) { - json = new JSONObject(); - } else { - json = JSONObject.parseObject(data); - } - } - if (json != null) { - body = json.toJSONString(); - } - } - log.info("------------------- body = " + body + "------------------------"); - cachedContent.reset(); - cachedContent.write( body.getBytes(), 0, body.getBytes().length); - - } - } - } else { - cachedContent = new FastByteArrayOutputStream(); - } - } - - @Override - public int getContentLength() { - if (null != cachedContent) { - return cachedContent.size(); - } - return super.getContentLength(); - } - - public byte[] getByteArrayBody() { - return cachedContent.toByteArray(); - } - - public String getBody() { - String body = null; - if (cachedContent != null && cachedContent.size() > 0) { - body = new String(cachedContent.toByteArray()); - } - return body; - } - - public String getSortBody() { - return JSONObject.toJSONString(this.getBody(TreeMap.class)); - } - - public T getBody(Class type) { - return cn.hutool.json.JSONUtil.toBean(this.getBody(), type); - } - - //这个方法为获取前端给后端用于加密aeskey的rsa公钥 - public String getJSPublicKey(){ - return JSPublicKey; - } - @Override - public BufferedReader getReader() throws IOException { - return new BufferedReader(new InputStreamReader(getInputStream())); - } - - @Override - public ServletInputStream getInputStream() throws IOException { - if (this.getContentLength() < 1) { - return super.getInputStream(); - } - return new ResettableServletInputStream(new ByteArrayInputStream(cachedContent.toByteArray())); - } - - private class ResettableServletInputStream extends ServletInputStream { - - private final InputStream sourceStream; - - private boolean finished = false; - - - /** - * Create a DelegatingServletInputStream for the given source stream. - * - * @param sourceStream the source stream (never {@code null}) - */ - public ResettableServletInputStream(InputStream sourceStream) { - Assert.notNull(sourceStream, "Source InputStream must not be null"); - this.sourceStream = sourceStream; - } - - /** - * Return the underlying source stream (never {@code null}). - */ - public final InputStream getSourceStream() { - return this.sourceStream; - } - - - @Override - public int read() throws IOException { - int data = this.sourceStream.read(); - if (data == -1) { - this.finished = true; - } - return data; - } - - @Override - public int available() throws IOException { - return this.sourceStream.available(); - } - - @Override - public void close() throws IOException { - super.close(); - this.sourceStream.close(); - } - - @Override - public boolean isFinished() { - return finished; - } - - @Override - public boolean isReady() { - return true; - } - - @Override - public void setReadListener(ReadListener readListener) { - - } - } - - - -} - 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/wrapper/ResponseWrapper.java b/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-application/schisandra-cloud-storage-auth-application-controller/src/main/java/com/schisandra/auth/application/wrapper/ResponseWrapper.java deleted file mode 100644 index 10f6eed..0000000 --- a/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-application/schisandra-cloud-storage-auth-application-controller/src/main/java/com/schisandra/auth/application/wrapper/ResponseWrapper.java +++ /dev/null @@ -1,114 +0,0 @@ -package com.schisandra.auth.application.wrapper; - -import cn.hutool.core.util.StrUtil; -import lombok.extern.slf4j.Slf4j; -import org.springframework.http.MediaType; - -import javax.servlet.ServletOutputStream; -import javax.servlet.WriteListener; -import javax.servlet.http.HttpServletResponse; -import javax.servlet.http.HttpServletResponseWrapper; -import java.io.ByteArrayOutputStream; -import java.io.IOException; -import java.io.PrintWriter; -/** * 返回值输出代理类 - * @ClassName ResponseWrapper - * @Description TODO - * @Author L - * @Date 2024/1/31 18:58 - */ - -@Slf4j -public class ResponseWrapper extends HttpServletResponseWrapper { - ByteArrayOutputStream _stream = new ByteArrayOutputStream(); - PrintWriter _pw = new PrintWriter(_stream); - - public ResponseWrapper(HttpServletResponse resp) throws IOException { - super(resp); - } - - /** - * 覆盖getWriter()方法，将字符流缓冲到本地 - */ - @Override - public PrintWriter getWriter() throws IOException { - return _pw; - } - - /** - * 覆盖getOutputStream()方法，将字节流缓冲到本地 - */ - @Override - public ServletOutputStream getOutputStream() throws IOException { - return new ServletOutputStream() { - @Override - public boolean isReady() { - return false; - } - - @Override - public void setWriteListener(WriteListener writeListener) { - - } - - @Override - public void write(int b) throws IOException { - _stream.write(b); - } - }; - } - - /** - * 把缓冲区内容写入输出流后关闭 - * - * @author xxj - */ - public void flush() { - try { - _pw.flush(); - _pw.close(); - _stream.flush(); - _stream.close(); - } catch (IOException e) { - log.error("", e); - } - } - - /** - * 获取字节流 - * - * @return - */ - public ByteArrayOutputStream getByteArrayOutputStream() { - return _stream; - } - - /** - * 将换出区内容转为文本输出 - * - * @return - */ - public String getTextContent() { - flush(); - return _stream.toString(); - } - - public static boolean isTextContentType(String contentType) { - boolean flag = false; - if (StrUtil.isBlank(contentType)) { - return false; - } else { - flag = StrUtil.startWithIgnoreCase(contentType, "text"); - if (!flag) { - flag = isJsonContentType(contentType); - } - } - return flag; - } - - public static boolean isJsonContentType(String contentType) { - return !StrUtil.isBlank(contentType) - && (StrUtil.containsIgnoreCase(contentType, "application/problem+json") - || StrUtil.containsIgnoreCase(contentType, MediaType.APPLICATION_JSON_VALUE)); - } -} From 9b2d10a30b2d3e608dde90e42c07dbb22f99a1cb Mon Sep 17 00:00:00 2001 From: landaiqing <3517283258@qq.com> Date: Mon, 29 Apr 2024 23:23:32 +0800 Subject: [PATCH 04/27] feat: add sql file --- .../controller/EncryptController.java | 52 ++++ .../application/filter/EncryptApiFilter.java | 100 +++++++ .../wrapper/EncryptRequestWrapper.java | 257 ++++++++++++++++++ .../application/wrapper/ResponseWrapper.java | 114 ++++++++ .../sql/schisandra-cloud-storage.sql | 144 ++++++++++ .../src/main/resources/application.yml | 1 - 6 files changed, 667 insertions(+), 1 deletion(-) create mode 100644 schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-application/schisandra-cloud-storage-auth-application-controller/src/main/java/com/schisandra/auth/application/controller/EncryptController.java create mode 100644 schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-application/schisandra-cloud-storage-auth-application-controller/src/main/java/com/schisandra/auth/application/filter/EncryptApiFilter.java create mode 100644 schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-application/schisandra-cloud-storage-auth-application-controller/src/main/java/com/schisandra/auth/application/wrapper/EncryptRequestWrapper.java create mode 100644 schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-application/schisandra-cloud-storage-auth-application-controller/src/main/java/com/schisandra/auth/application/wrapper/ResponseWrapper.java create mode 100644 schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-infra/src/main/resources/sql/schisandra-cloud-storage.sql 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/EncryptController.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/EncryptController.java new file mode 100644 index 0000000..ccfe8ce --- /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/controller/EncryptController.java @@ -0,0 +1,52 @@ +package com.schisandra.auth.application.controller; + +import com.schisandra.auth.common.entity.Result; +import com.schisandra.auth.common.redis.RedisUtil; +import com.schisandra.auth.common.utils.MD5Util; +import com.schisandra.auth.common.utils.RSAUtils; +import lombok.extern.slf4j.Slf4j; +import org.apache.commons.lang3.StringUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import javax.annotation.Resource; +import java.util.Map; + +/** + * @ClassName EncryptController + * @Description TODO + * @Author L + * @Date 2024/1/29 9:18 + */ +@RestController +@RequestMapping("/encrypt") +@Slf4j +public class EncryptController { + @Resource + private RedisUtil redisUtil; + private String authPublicKeyPrefix = "auth.publicKey"; + private String authPrivateKeyPrefix = "auth.privateKey"; + + @PostMapping("/getPublicKey") + public Result getPublicKey() throws Exception { + //获取当前登陆账号对应的token,这行代码就不贴了。 + String token="12345"; + String publicKey=""; + if (StringUtils.isNotBlank(token)) { + Map stringStringMap = RSAUtils.genKeyPair(); + publicKey = stringStringMap.get("publicKey"); + String privateKey = stringStringMap.get("privateKey"); + String md5Token = MD5Util.md5(token); + //这个地方的存放时间根据你的token存放时间走 + redisUtil.set(md5Token + "publicKey", publicKey); + redisUtil.set(md5Token + "privateKey", privateKey); + return Result.ok(publicKey); + } + return Result.ok(publicKey); + } + +} + 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/filter/EncryptApiFilter.java b/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-application/schisandra-cloud-storage-auth-application-controller/src/main/java/com/schisandra/auth/application/filter/EncryptApiFilter.java new file mode 100644 index 0000000..8bcbb28 --- /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/filter/EncryptApiFilter.java @@ -0,0 +1,100 @@ +package com.schisandra.auth.application.filter; + +import cn.hutool.core.util.StrUtil; +import cn.hutool.extra.servlet.ServletUtil; +import cn.hutool.json.JSONUtil; +import com.alibaba.fastjson.JSON; +import com.schisandra.auth.application.wrapper.EncryptRequestWrapper; +import com.schisandra.auth.application.wrapper.ResponseWrapper; +import com.schisandra.auth.common.entity.ApiEncryptRes; +import com.schisandra.auth.common.utils.ApiSecurityUtils; +import lombok.SneakyThrows; +import lombok.extern.slf4j.Slf4j; +import org.apache.commons.lang3.StringUtils; +import org.springframework.boot.web.servlet.filter.OrderedFilter; +import org.springframework.stereotype.Component; +import org.springframework.web.filter.OncePerRequestFilter; + +import javax.servlet.FilterChain; +import javax.servlet.ServletException; +import javax.servlet.ServletOutputStream; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import java.io.IOException; +import java.nio.charset.StandardCharsets; + +@Slf4j +@Component +public class EncryptApiFilter extends OncePerRequestFilter implements OrderedFilter { + public static final int DEFAULT_ORDER = Integer.MAX_VALUE; + + + @Override + protected void doFilterInternal(HttpServletRequest request, HttpServletResponse response, FilterChain filterChain) throws ServletException, IOException { + String servletPath = request.getServletPath(); + + ResponseWrapper wrapper = new ResponseWrapper(response); + String requestContent = null; + + if (ServletUtil.isMultipart(request)) { + } else { + EncryptRequestWrapper encryptRequestWrapper = EncryptRequestWrapper.newOrGetMultiReadHttpServletRequest(request); + requestContent = encryptRequestWrapper.getBody(); + request = encryptRequestWrapper; + + } + log.debug("{}>>>{}", servletPath, requestContent); + + try { + filterChain.doFilter(request, wrapper); + } finally { + try { + process(request, wrapper, response); + } catch (Exception e) { + log.error("AesFilter error", e); + } + } + } + + @SneakyThrows + protected void process(HttpServletRequest request, ResponseWrapper responseWrapper, HttpServletResponse response) { + + String servletPath = request.getRequestURI(); + String isencrypt = request.getHeader("Isencrypt"); + ServletOutputStream out = response.getOutputStream(); + if (ResponseWrapper.isJsonContentType(responseWrapper.getContentType())) { + String responseContent = responseWrapper.getTextContent(); + if (StrUtil.isNotEmpty(responseContent)&&StringUtils.isNotBlank(isencrypt)) { + String JSPublicKey = ((EncryptRequestWrapper)request).getJSPublicKey(); + if (StringUtils.isNotBlank(JSPublicKey)) { + ApiEncryptRes apiEncryptRes = ApiSecurityUtils.encrypt(JSON.toJSONString(responseContent), JSPublicKey); + responseContent = JSONUtil.toJsonStr(apiEncryptRes); + } + log.info("{}<<<{}", servletPath, responseContent); + byte[] bytes = responseContent.getBytes(StandardCharsets.UTF_8); + response.setContentLength(bytes.length); + out.write(bytes); + out.flush(); + out.close(); + } else { + responseWrapper.getByteArrayOutputStream().writeTo(out); + out.flush(); + out.close(); + } + } else { + responseWrapper.getByteArrayOutputStream().writeTo(out); + out.flush(); + out.close(); + } + } + + @Override + public void afterPropertiesSet() throws ServletException { + super.afterPropertiesSet(); + } + + @Override + public int getOrder() { + return DEFAULT_ORDER; + } +} 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/wrapper/EncryptRequestWrapper.java b/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-application/schisandra-cloud-storage-auth-application-controller/src/main/java/com/schisandra/auth/application/wrapper/EncryptRequestWrapper.java new file mode 100644 index 0000000..89c256a --- /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/wrapper/EncryptRequestWrapper.java @@ -0,0 +1,257 @@ +package com.schisandra.auth.application.wrapper; + +import cn.hutool.core.convert.Convert; +import com.alibaba.fastjson.JSONObject; +import com.schisandra.auth.common.redis.RedisUtil; +import com.schisandra.auth.common.utils.ApiSecurityUtils; +import com.schisandra.auth.common.utils.MD5Util; +import lombok.extern.slf4j.Slf4j; +import org.apache.commons.lang3.StringUtils; + +import javax.servlet.ReadListener; +import javax.servlet.ServletInputStream; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletRequestWrapper; +import java.io.*; + + +import cn.hutool.core.io.FastByteArrayOutputStream; +import cn.hutool.core.io.IoUtil; +import cn.hutool.core.lang.Assert; +import cn.hutool.http.ContentType; + + +import lombok.SneakyThrows; +import org.springframework.web.context.WebApplicationContext; +import org.springframework.web.context.support.WebApplicationContextUtils; +import org.springframework.web.multipart.support.StandardServletMultipartResolver; +import org.springframework.web.util.WebUtils; + + +import java.util.TreeMap; + +/** + * @ClassName requestWrapper + * @Description TODO + * @Author landaiqing + * @Date 2024/1/31 17:58 + */ + +/** + * 确保request可以多次读取 + */ + +@Slf4j +public class EncryptRequestWrapper extends HttpServletRequestWrapper { + + + + //2024-02-02由于在过滤器中无法直接通过Autowired获取Bean,因此需要通过spring上下文来获取IOC管理的实体类 +// @Autowired +// private RedisUtil redisUtil; + + protected FastByteArrayOutputStream cachedContent; + protected String JSPublicKey; + protected EncryptRequestWrapper(HttpServletRequest request ) { + + super(request); + RedisUtil redisUtils =getBean(RedisUtil.class, request); + this.copyBody(redisUtils); + + + } + + /** + * + * 此处主要是用于读取 RedisUtil + * @param clazz + * @param request + * @param + * @return + */ + public T getBean(Class clazz, HttpServletRequest request){ + WebApplicationContext applicationContext = WebApplicationContextUtils.getRequiredWebApplicationContext(request.getServletContext()); + return applicationContext.getBean(clazz); + } + + public static EncryptRequestWrapper newOrGetMultiReadHttpServletRequest(HttpServletRequest request) { + EncryptRequestWrapper multiReadHttpServletRequest = getMultiReadHttpServletRequest(request); + if (null != multiReadHttpServletRequest) { + return multiReadHttpServletRequest; + } else { + String contentType = request.getContentType(); + if (contentType != null && contentType.contains(ContentType.MULTIPART.getValue())) { + // 将转化后的 request 放入过滤链中 + request = new StandardServletMultipartResolver().resolveMultipart(request); + } + return new EncryptRequestWrapper(request); + } + } + + public static EncryptRequestWrapper getMultiReadHttpServletRequest(HttpServletRequest request) { + EncryptRequestWrapper nativeRequest = WebUtils.getNativeRequest(request, EncryptRequestWrapper.class); + if (null != nativeRequest) { + return nativeRequest; + } else if (request instanceof EncryptRequestWrapper) { + return (EncryptRequestWrapper) request; + } else { + return null; + } + } + //重新读取请求，因为request只可以被读取一次，需要重新设置为可多次读取 + @SneakyThrows + protected void copyBody(RedisUtil redisUtils) { + int length = this.getContentLength(); + if (length > 0) { + cachedContent = IoUtil.read(getRequest().getInputStream()); + if (StringUtils.isNotBlank(this.getHeader("isEncrypt"))&&StringUtils.isNotBlank(this.getHeader("Authorization"))) { + String body = new String(cachedContent.toByteArray()); + log.info("------------------- body = " + body + "------------------------"); + if (StringUtils.isNotBlank(body)) { + JSONObject jsonBody = JSONObject.parseObject(body); + if(null != jsonBody){ + String dataEncrypt = jsonBody.getString("data"); + String aeskey = jsonBody.getString("aeskey"); + JSPublicKey = jsonBody.getString("frontPublicKey"); + String data; + JSONObject json = null; + log.info("------------------- dataEncrypt = " + dataEncrypt + "------------------------"); + log.info("------------------- aesKey = " + aeskey + "------------------------"); + String token = this.getHeader("Authorization"); + String md5Token = MD5Util.md5(token); + String privateKey = Convert.toStr(redisUtils.get(md5Token + "privateKey")); + data = ApiSecurityUtils.decrypt(aeskey, dataEncrypt,privateKey); + // 如果数据不为空就编译 + if (StringUtils.isNotBlank(data)) { + //如果参数为空前端传回undefined + if ("undefined".equalsIgnoreCase(data)) { + json = new JSONObject(); + } else { + json = JSONObject.parseObject(data); + } + } + if (json != null) { + body = json.toJSONString(); + } + } + log.info("------------------- body = " + body + "------------------------"); + cachedContent.reset(); + cachedContent.write( body.getBytes(), 0, body.getBytes().length); + + } + } + } else { + cachedContent = new FastByteArrayOutputStream(); + } + } + + @Override + public int getContentLength() { + if (null != cachedContent) { + return cachedContent.size(); + } + return super.getContentLength(); + } + + public byte[] getByteArrayBody() { + return cachedContent.toByteArray(); + } + + public String getBody() { + String body = null; + if (cachedContent != null && cachedContent.size() > 0) { + body = new String(cachedContent.toByteArray()); + } + return body; + } + + public String getSortBody() { + return JSONObject.toJSONString(this.getBody(TreeMap.class)); + } + + public T getBody(Class type) { + return cn.hutool.json.JSONUtil.toBean(this.getBody(), type); + } + + //这个方法为获取前端给后端用于加密aeskey的rsa公钥 + public String getJSPublicKey(){ + return JSPublicKey; + } + @Override + public BufferedReader getReader() throws IOException { + return new BufferedReader(new InputStreamReader(getInputStream())); + } + + @Override + public ServletInputStream getInputStream() throws IOException { + if (this.getContentLength() < 1) { + return super.getInputStream(); + } + return new ResettableServletInputStream(new ByteArrayInputStream(cachedContent.toByteArray())); + } + + private class ResettableServletInputStream extends ServletInputStream { + + private final InputStream sourceStream; + + private boolean finished = false; + + + /** + * Create a DelegatingServletInputStream for the given source stream. + * + * @param sourceStream the source stream (never {@code null}) + */ + public ResettableServletInputStream(InputStream sourceStream) { + Assert.notNull(sourceStream, "Source InputStream must not be null"); + this.sourceStream = sourceStream; + } + + /** + * Return the underlying source stream (never {@code null}). + */ + public final InputStream getSourceStream() { + return this.sourceStream; + } + + + @Override + public int read() throws IOException { + int data = this.sourceStream.read(); + if (data == -1) { + this.finished = true; + } + return data; + } + + @Override + public int available() throws IOException { + return this.sourceStream.available(); + } + + @Override + public void close() throws IOException { + super.close(); + this.sourceStream.close(); + } + + @Override + public boolean isFinished() { + return finished; + } + + @Override + public boolean isReady() { + return true; + } + + @Override + public void setReadListener(ReadListener readListener) { + + } + } + + + +} + 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/wrapper/ResponseWrapper.java b/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-application/schisandra-cloud-storage-auth-application-controller/src/main/java/com/schisandra/auth/application/wrapper/ResponseWrapper.java new file mode 100644 index 0000000..10f6eed --- /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/wrapper/ResponseWrapper.java @@ -0,0 +1,114 @@ +package com.schisandra.auth.application.wrapper; + +import cn.hutool.core.util.StrUtil; +import lombok.extern.slf4j.Slf4j; +import org.springframework.http.MediaType; + +import javax.servlet.ServletOutputStream; +import javax.servlet.WriteListener; +import javax.servlet.http.HttpServletResponse; +import javax.servlet.http.HttpServletResponseWrapper; +import java.io.ByteArrayOutputStream; +import java.io.IOException; +import java.io.PrintWriter; +/** * 返回值输出代理类 + * @ClassName ResponseWrapper + * @Description TODO + * @Author L + * @Date 2024/1/31 18:58 + */ + +@Slf4j +public class ResponseWrapper extends HttpServletResponseWrapper { + ByteArrayOutputStream _stream = new ByteArrayOutputStream(); + PrintWriter _pw = new PrintWriter(_stream); + + public ResponseWrapper(HttpServletResponse resp) throws IOException { + super(resp); + } + + /** + * 覆盖getWriter()方法，将字符流缓冲到本地 + */ + @Override + public PrintWriter getWriter() throws IOException { + return _pw; + } + + /** + * 覆盖getOutputStream()方法，将字节流缓冲到本地 + */ + @Override + public ServletOutputStream getOutputStream() throws IOException { + return new ServletOutputStream() { + @Override + public boolean isReady() { + return false; + } + + @Override + public void setWriteListener(WriteListener writeListener) { + + } + + @Override + public void write(int b) throws IOException { + _stream.write(b); + } + }; + } + + /** + * 把缓冲区内容写入输出流后关闭 + * + * @author xxj + */ + public void flush() { + try { + _pw.flush(); + _pw.close(); + _stream.flush(); + _stream.close(); + } catch (IOException e) { + log.error("", e); + } + } + + /** + * 获取字节流 + * + * @return + */ + public ByteArrayOutputStream getByteArrayOutputStream() { + return _stream; + } + + /** + * 将换出区内容转为文本输出 + * + * @return + */ + public String getTextContent() { + flush(); + return _stream.toString(); + } + + public static boolean isTextContentType(String contentType) { + boolean flag = false; + if (StrUtil.isBlank(contentType)) { + return false; + } else { + flag = StrUtil.startWithIgnoreCase(contentType, "text"); + if (!flag) { + flag = isJsonContentType(contentType); + } + } + return flag; + } + + public static boolean isJsonContentType(String contentType) { + return !StrUtil.isBlank(contentType) + && (StrUtil.containsIgnoreCase(contentType, "application/problem+json") + || StrUtil.containsIgnoreCase(contentType, MediaType.APPLICATION_JSON_VALUE)); + } +} diff --git a/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-infra/src/main/resources/sql/schisandra-cloud-storage.sql b/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-infra/src/main/resources/sql/schisandra-cloud-storage.sql new file mode 100644 index 0000000..448a191 --- /dev/null +++ b/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-infra/src/main/resources/sql/schisandra-cloud-storage.sql @@ -0,0 +1,144 @@ +/* + Navicat Premium Data Transfer + + Source Server : MySQL Cloud + Source Server Type : MySQL + Source Server Version : 50744 (5.7.44) + Source Host : 116.196.80.239:3306 + Source Schema : schisandra-cloud-storage + + Target Server Type : MySQL + Target Server Version : 50744 (5.7.44) + File Encoding : 65001 + + Date: 26/04/2024 01:28:16 +*/ + +SET NAMES utf8mb4; +SET FOREIGN_KEY_CHECKS = 0; + +-- ---------------------------- +-- Table structure for schisandra_auth_permission +-- ---------------------------- +DROP TABLE IF EXISTS `schisandra_auth_permission`; +CREATE TABLE `schisandra_auth_permission` ( + `id` bigint(20) NOT NULL AUTO_INCREMENT, + `name` varchar(64) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL, + `parent_id` bigint(20) NULL DEFAULT NULL, + `type` tinyint(4) NULL DEFAULT NULL, + `menu_url` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL, + `status` tinyint(4) NULL DEFAULT NULL, + `show` tinyint(4) NULL DEFAULT NULL, + `icon` varchar(128) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL, + `permission_key` varchar(64) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL, + `created_by` varchar(32) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '创建人', + `created_time` datetime NULL DEFAULT NULL COMMENT '创建时间', + `update_by` varchar(32) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '更新人', + `update_time` datetime NULL DEFAULT NULL COMMENT '更新时间', + `is_deleted` int(11) NULL DEFAULT 0, + PRIMARY KEY (`id`) USING BTREE +) ENGINE = InnoDB AUTO_INCREMENT = 4 CHARACTER SET = utf8 COLLATE = utf8_general_ci ROW_FORMAT = DYNAMIC; + +-- ---------------------------- +-- Records of schisandra_auth_permission +-- ---------------------------- +INSERT INTO `schisandra_auth_permission` VALUES (1, '普通用户', 0, 1, '1adiwd/awdw', 0, 0, 'httt://1.png', 'subject:add', NULL, NULL, NULL, NULL, 1); +INSERT INTO `schisandra_auth_permission` VALUES (2, '管理员', 0, 1, '1adiwd/awdw', 0, 0, 'httt://1.png', 'subject:add', NULL, NULL, NULL, NULL, 0); + +-- ---------------------------- +-- Table structure for schisandra_auth_role +-- ---------------------------- +DROP TABLE IF EXISTS `schisandra_auth_role`; +CREATE TABLE `schisandra_auth_role` ( + `id` bigint(20) NOT NULL AUTO_INCREMENT, + `role_name` varchar(32) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL, + `role_key` varchar(64) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL, + `created_by` varchar(32) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '创建人', + `created_time` datetime NULL DEFAULT NULL COMMENT '创建时间', + `update_by` varchar(32) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '更新人', + `update_time` datetime NULL DEFAULT NULL COMMENT '更新时间', + `is_deleted` int(11) NULL DEFAULT 0, + PRIMARY KEY (`id`) USING BTREE +) ENGINE = InnoDB AUTO_INCREMENT = 4 CHARACTER SET = utf8 COLLATE = utf8_general_ci ROW_FORMAT = DYNAMIC; + +-- ---------------------------- +-- Records of schisandra_auth_role +-- ---------------------------- +INSERT INTO `schisandra_auth_role` VALUES (1, '普通用户', 'normal_user', NULL, NULL, NULL, NULL, 0); +INSERT INTO `schisandra_auth_role` VALUES (2, '管理员', 'admin', NULL, NULL, NULL, NULL, 0); +INSERT INTO `schisandra_auth_role` VALUES (3, '超级管理员', 'super_admin', NULL, NULL, NULL, NULL, 0); + +-- ---------------------------- +-- Table structure for schisandra_auth_role_permission +-- ---------------------------- +DROP TABLE IF EXISTS `schisandra_auth_role_permission`; +CREATE TABLE `schisandra_auth_role_permission` ( + `id` bigint(20) NOT NULL AUTO_INCREMENT, + `role_id` bigint(20) NULL DEFAULT NULL, + `permission_id` bigint(20) NULL DEFAULT NULL, + `created_by` varchar(32) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '创建人', + `created_time` datetime NULL DEFAULT NULL COMMENT '创建时间', + `update_by` varchar(32) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '更新人', + `update_time` datetime NULL DEFAULT NULL COMMENT '更新时间', + `is_deleted` int(11) NULL DEFAULT 0, + PRIMARY KEY (`id`) USING BTREE +) ENGINE = InnoDB AUTO_INCREMENT = 4 CHARACTER SET = utf8 COLLATE = utf8_general_ci ROW_FORMAT = DYNAMIC; + +-- ---------------------------- +-- Records of schisandra_auth_role_permission +-- ---------------------------- +INSERT INTO `schisandra_auth_role_permission` VALUES (1, 2, 1, NULL, NULL, NULL, NULL, 0); +INSERT INTO `schisandra_auth_role_permission` VALUES (2, 3, 2, NULL, NULL, NULL, NULL, 0); +INSERT INTO `schisandra_auth_role_permission` VALUES (3, 1, 1, NULL, NULL, NULL, NULL, 0); + +-- ---------------------------- +-- Table structure for schisandra_auth_user +-- ---------------------------- +DROP TABLE IF EXISTS `schisandra_auth_user`; +CREATE TABLE `schisandra_auth_user` ( + `id` bigint(20) NOT NULL AUTO_INCREMENT, + `user_name` varchar(32) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL, + `nick_name` varchar(32) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL, + `email` varchar(32) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL, + `phone` varchar(32) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL, + `password` varchar(64) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL, + `sex` tinyint(4) NULL DEFAULT NULL, + `avatar` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL, + `status` tinyint(4) NULL DEFAULT NULL, + `introduce` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL, + `ext_json` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL, + `created_by` varchar(32) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '创建人', + `created_time` datetime NULL DEFAULT NULL COMMENT '创建时间', + `update_by` varchar(32) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '更新人', + `update_time` datetime NULL DEFAULT NULL COMMENT '更新时间', + `is_deleted` int(11) NULL DEFAULT 0, + PRIMARY KEY (`id`) USING BTREE +) ENGINE = InnoDB AUTO_INCREMENT = 10 CHARACTER SET = utf8 COLLATE = utf8_general_ci ROW_FORMAT = DYNAMIC; + +-- ---------------------------- +-- Records of schisandra_auth_user +-- ---------------------------- +INSERT INTO `schisandra_auth_user` VALUES (8, 'oF9UX6c2GNEHUpoQZRTrkHTmLYHs', NULL, NULL, NULL, NULL, NULL, 'http://117.72.10.84:9000/user/icon/微信图片_20231203153718(1).png', 0, NULL, NULL, NULL, NULL, NULL, NULL, 0); +INSERT INTO `schisandra_auth_user` VALUES (9, '666', '666', '666', '555', '666', 1, '', 1, '', '', NULL, NULL, NULL, NULL, 1); + +-- ---------------------------- +-- Table structure for schisandra_auth_user_role +-- ---------------------------- +DROP TABLE IF EXISTS `schisandra_auth_user_role`; +CREATE TABLE `schisandra_auth_user_role` ( + `id` bigint(20) NOT NULL AUTO_INCREMENT, + `user_id` bigint(20) NULL DEFAULT NULL, + `role_id` bigint(20) NULL DEFAULT NULL, + `created_by` varchar(32) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '创建人', + `created_time` datetime NULL DEFAULT NULL COMMENT '创建时间', + `update_by` varchar(32) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '更新人', + `update_time` datetime NULL DEFAULT NULL COMMENT '更新时间', + `is_deleted` int(11) NULL DEFAULT 0, + PRIMARY KEY (`id`) USING BTREE +) ENGINE = InnoDB AUTO_INCREMENT = 1 CHARACTER SET = utf8 COLLATE = utf8_general_ci ROW_FORMAT = DYNAMIC; + +-- ---------------------------- +-- Records of schisandra_auth_user_role +-- ---------------------------- + +SET FOREIGN_KEY_CHECKS = 1; diff --git a/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-starter/src/main/resources/application.yml b/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-starter/src/main/resources/application.yml index 976d134..47a7b79 100644 --- a/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-starter/src/main/resources/application.yml +++ b/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-starter/src/main/resources/application.yml @@ -96,4 +96,3 @@ sms: # regionId: cn-hangzhou - From 0cdcbfd45b734529886f9019b64ac51e0afd5af2 Mon Sep 17 00:00:00 2001 From: landaiqing <3517283258@qq.com> Date: Tue, 30 Apr 2024 14:34:14 +0800 Subject: [PATCH 05/27] =?UTF-8?q?feat:=20=E4=BF=AE=E6=94=B9=E6=9C=8D?= =?UTF-8?q?=E5=8A=A1=E5=99=A8=E5=9C=B0=E5=9D=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../auth/infra/basic/utils/DruidEncryptUtil.java | 2 +- .../src/main/resources/application.yml | 10 +++++----- .../src/main/resources/bootstrap.yml | 4 ++-- .../src/main/resources/application.yml | 2 +- .../src/main/resources/bootstrap.yml | 4 ++-- .../src/main/resources/application.yml | 2 +- 6 files changed, 12 insertions(+), 12 deletions(-) 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 cd823ba..bf4f79b 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 @@ -44,7 +44,7 @@ public class DruidEncryptUtil { } public static void main(String[] args) throws Exception { - String encrypt = encrypt("$LDQ20020618xxx$"); + String encrypt = encrypt(""); System.out.println("encrypt:" + encrypt); } diff --git a/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-starter/src/main/resources/application.yml b/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-starter/src/main/resources/application.yml index 47a7b79..1060573 100644 --- a/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-starter/src/main/resources/application.yml +++ b/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-starter/src/main/resources/application.yml @@ -2,10 +2,10 @@ server: port: 3000 spring: datasource: - username: landaiqing - password: Z1JyO9hVmDLYbpWnM7oiFO3BEoDCrV6njYjl/2oudBHwTepxLxnaZ1aDfohrYwYpGWUodgu7gnRcZ5mfIm6lIg== + username: root + password: BZbVbGDBePiA2q8/mt0eMxKNpHniDzxBtOxFadQiAOTDzCDlopC4qOKwwBEi9CAZcuFsCrRJdwn0wP6jwsnzxw== driver-class-name: com.mysql.cj.jdbc.Driver - url: jdbc:mysql://116.196.80.239:3306/schisandra-cloud-storage?serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&useSSL=true + url: jdbc:mysql://1.95.0.111:3306/schisandra-cloud-storage?serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&useSSL=true type: com.alibaba.druid.pool.DruidDataSource druid: initial-size: 20 @@ -32,7 +32,7 @@ spring: # Redis数据库索引（默认为0） database: 1 # Redis服务器地址 - host: 116.196.80.239 + host: 1.95.0.111 # Redis服务器连接端口 port: 6379 # Redis服务器连接密码（默认为空） @@ -49,7 +49,7 @@ spring: max-idle: 10 # 连接池中的最小空闲连接 min-idle: 0 -publicKey: MFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAKXX1HPAKowh8Ub9fDTGI5exGLMRppbVQFDlDBBxAWcbfdLN5hXgfg02D7wy+jCe9uCdV5vgZR72PFoe+mnLp80CAwEAAQ== +publicKey: MFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBANUVxjcrVoirBZaNmDrUqatHEW4FOHbO5ynW6zvhIbRMo6hEFGgglbURkjuHOlgEduxJVz6Xa+sG+FMrxTguOJECAwEAAQ== logging: config: classpath:log4j2-spring.xml ############## Sa-Token 配置 (文档: https://sa-token.cc) ############## diff --git a/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-starter/src/main/resources/bootstrap.yml b/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-starter/src/main/resources/bootstrap.yml index c3e60a2..68c0a9e 100644 --- a/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-starter/src/main/resources/bootstrap.yml +++ b/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-starter/src/main/resources/bootstrap.yml @@ -6,12 +6,12 @@ spring: cloud: nacos: config: - server-addr: 116.196.80.239:8848 + server-addr: 1.95.0.111:8848 prefix: ${spring.application.name} group: DEFAULT_GROUP namespace: file-extension: yaml discovery: enabled: true - server-addr: 116.196.80.239:8848 + server-addr: 1.95.0.111:8848 diff --git a/schisandra-cloud-storage-oss/src/main/resources/application.yml b/schisandra-cloud-storage-oss/src/main/resources/application.yml index f890f70..b142558 100644 --- a/schisandra-cloud-storage-oss/src/main/resources/application.yml +++ b/schisandra-cloud-storage-oss/src/main/resources/application.yml @@ -1,6 +1,6 @@ server: port: 4000 minio: - url: http://116.196.80.239:9000/ + url: http://1.95.0.111:9000/ accessKey: landaiqing secretKey: LDQ20020618xxx diff --git a/schisandra-cloud-storage-oss/src/main/resources/bootstrap.yml b/schisandra-cloud-storage-oss/src/main/resources/bootstrap.yml index 7f1174e..5c4c820 100644 --- a/schisandra-cloud-storage-oss/src/main/resources/bootstrap.yml +++ b/schisandra-cloud-storage-oss/src/main/resources/bootstrap.yml @@ -6,12 +6,12 @@ spring: cloud: nacos: config: - server-addr: 116.196.80.239:8848 + server-addr: 1.95.0.111:8848 prefix: ${spring.application.name} group: DEFAULT_GROUP namespace: file-extension: yaml discovery: enabled: true - server-addr: 116.196.80.239:8848 + server-addr: 1.95.0.111:8848 diff --git a/schisandra-cloud-storage-wechat/src/main/resources/application.yml b/schisandra-cloud-storage-wechat/src/main/resources/application.yml index db5625e..871bccf 100644 --- a/schisandra-cloud-storage-wechat/src/main/resources/application.yml +++ b/schisandra-cloud-storage-wechat/src/main/resources/application.yml @@ -6,7 +6,7 @@ spring: # Redis数据库索引（默认为0） database: 1 # Redis服务器地址 - host: 116.196.80.239 + host: 1.95.0.111 # Redis服务器连接端口 port: 6379 # Redis服务器连接密码（默认为空） From 4cdd0d0b52449eed3e815ab1e03af4f098e4bf3e Mon Sep 17 00:00:00 2001 From: landaiqing <3517283258@qq.com> Date: Wed, 1 May 2024 21:38:05 +0800 Subject: [PATCH 06/27] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8Dlombox=E7=89=88?= =?UTF-8?q?=E6=9C=AC=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pom.xml | 2 +- .../schisandra-cloud-storage-auth-common/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) 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 c68c4e9..c3e5eed 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 @@ -22,7 +22,7 @@ org.projectlombok lombok - 1.18.20 + 1.18.28 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 13a1cf4..d72eba8 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 @@ -36,7 +36,7 @@ org.projectlombok lombok - 1.18.20 + 1.18.28 org.mapstruct From 846a5934cf7322deff1dca0af5fd42f94bd88675 Mon Sep 17 00:00:00 2001 From: landaiqing <3517283258@qq.com> Date: Wed, 1 May 2024 21:43:42 +0800 Subject: [PATCH 07/27] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8Dlombox=E7=89=88?= =?UTF-8?q?=E6=9C=AC=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../schisandra-cloud-storage-auth-api/pom.xml | 2 +- .../pom.xml | 2 +- .../schisandra-cloud-storage-auth-common/pom.xml | 2 +- .../schisandra-cloud-storage-auth-domain/pom.xml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-api/pom.xml b/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-api/pom.xml index 5da4b4b..66f78f6 100644 --- a/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-api/pom.xml +++ b/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-api/pom.xml @@ -31,7 +31,7 @@ org.projectlombok lombok - 1.18.28 + 1.18.24 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 c3e5eed..7e5947b 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 @@ -22,7 +22,7 @@ org.projectlombok lombok - 1.18.28 + 1.18.24 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 d72eba8..d2ef0c7 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 @@ -36,7 +36,7 @@ org.projectlombok lombok - 1.18.28 + 1.18.24 org.mapstruct diff --git a/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-domain/pom.xml b/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-domain/pom.xml index bed94cc..85fb89c 100644 --- a/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-domain/pom.xml +++ b/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-domain/pom.xml @@ -21,7 +21,7 @@ org.projectlombok lombok - 1.18.20 + 1.18.24 From eaeb5b6032a3f4ae92de3ec22de6288a966f1dfa Mon Sep 17 00:00:00 2001 From: landaiqing <3517283258@qq.com> Date: Wed, 1 May 2024 21:46:09 +0800 Subject: [PATCH 08/27] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8Dlombox=E7=89=88?= =?UTF-8?q?=E6=9C=AC=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../schisandra-cloud-storage-auth-api/pom.xml | 2 +- .../pom.xml | 2 +- .../schisandra-cloud-storage-auth-common/pom.xml | 2 +- .../schisandra-cloud-storage-auth-domain/pom.xml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-api/pom.xml b/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-api/pom.xml index 66f78f6..d48d04c 100644 --- a/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-api/pom.xml +++ b/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-api/pom.xml @@ -31,7 +31,7 @@ org.projectlombok lombok - 1.18.24 + 1.18.20 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 7e5947b..c68c4e9 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 @@ -22,7 +22,7 @@ org.projectlombok lombok - 1.18.24 + 1.18.20 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 d2ef0c7..13a1cf4 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 @@ -36,7 +36,7 @@ org.projectlombok lombok - 1.18.24 + 1.18.20 org.mapstruct diff --git a/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-domain/pom.xml b/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-domain/pom.xml index 85fb89c..bed94cc 100644 --- a/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-domain/pom.xml +++ b/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-domain/pom.xml @@ -21,7 +21,7 @@ org.projectlombok lombok - 1.18.24 + 1.18.20 From 92bb1187f64452989d5b3a93ff72762670e6a6a8 Mon Sep 17 00:00:00 2001 From: landaiqing <3517283258@qq.com> Date: Wed, 1 May 2024 21:50:05 +0800 Subject: [PATCH 09/27] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8Dlombox=E7=89=88?= =?UTF-8?q?=E6=9C=AC=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../schisandra-cloud-storage-auth-api/pom.xml | 2 +- .../pom.xml | 2 +- .../schisandra-cloud-storage-auth-common/pom.xml | 2 +- .../schisandra-cloud-storage-auth-domain/pom.xml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-api/pom.xml b/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-api/pom.xml index d48d04c..f6b3b63 100644 --- a/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-api/pom.xml +++ b/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-api/pom.xml @@ -31,7 +31,7 @@ org.projectlombok lombok - 1.18.20 + 1.18.26 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 c68c4e9..d7d5c3b 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 @@ -22,7 +22,7 @@ org.projectlombok lombok - 1.18.20 + 1.18.26 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 13a1cf4..f28f185 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 @@ -36,7 +36,7 @@ org.projectlombok lombok - 1.18.20 + 1.18.26 org.mapstruct diff --git a/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-domain/pom.xml b/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-domain/pom.xml index bed94cc..67bceac 100644 --- a/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-domain/pom.xml +++ b/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-domain/pom.xml @@ -21,7 +21,7 @@ org.projectlombok lombok - 1.18.20 + 1.18.26 From 89b6749632212894e35fe0a5bc08b52681b3c9f9 Mon Sep 17 00:00:00 2001 From: landaiqing <3517283258@qq.com> Date: Wed, 1 May 2024 21:53:06 +0800 Subject: [PATCH 10/27] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8Dlombox=E7=89=88?= =?UTF-8?q?=E6=9C=AC=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../schisandra-cloud-storage-auth-api/pom.xml | 2 +- .../pom.xml | 2 +- .../schisandra-cloud-storage-auth-common/pom.xml | 2 +- .../schisandra-cloud-storage-auth-domain/pom.xml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-api/pom.xml b/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-api/pom.xml index f6b3b63..a5d50dd 100644 --- a/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-api/pom.xml +++ b/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-api/pom.xml @@ -31,7 +31,7 @@ org.projectlombok lombok - 1.18.26 + 1.18.16 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 d7d5c3b..db8c89f 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 @@ -22,7 +22,7 @@ org.projectlombok lombok - 1.18.26 + 1.18.16 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 f28f185..daa68d2 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 @@ -36,7 +36,7 @@ org.projectlombok lombok - 1.18.26 + 1.18.16 org.mapstruct diff --git a/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-domain/pom.xml b/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-domain/pom.xml index 67bceac..9f13b58 100644 --- a/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-domain/pom.xml +++ b/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-domain/pom.xml @@ -21,7 +21,7 @@ org.projectlombok lombok - 1.18.26 + 1.18.16 From dab56aa23be2a5b0eaa71cf5d59b72ebc4acd4eb Mon Sep 17 00:00:00 2001 From: landaiqing <3517283258@qq.com> Date: Wed, 1 May 2024 21:55:00 +0800 Subject: [PATCH 11/27] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8Dlombox=E7=89=88?= =?UTF-8?q?=E6=9C=AC=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../schisandra-cloud-storage-auth-api/pom.xml | 2 +- .../pom.xml | 2 +- .../schisandra-cloud-storage-auth-common/pom.xml | 2 +- .../schisandra-cloud-storage-auth-domain/pom.xml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-api/pom.xml b/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-api/pom.xml index a5d50dd..2fdc7d4 100644 --- a/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-api/pom.xml +++ b/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-api/pom.xml @@ -31,7 +31,7 @@ org.projectlombok lombok - 1.18.16 + 1.18.22 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 db8c89f..ae2a3b5 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 @@ -22,7 +22,7 @@ org.projectlombok lombok - 1.18.16 + 1.18.22 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 daa68d2..b7536c4 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 @@ -36,7 +36,7 @@ org.projectlombok lombok - 1.18.16 + 1.18.22 org.mapstruct diff --git a/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-domain/pom.xml b/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-domain/pom.xml index 9f13b58..660e7c4 100644 --- a/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-domain/pom.xml +++ b/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-domain/pom.xml @@ -21,7 +21,7 @@ org.projectlombok lombok - 1.18.16 + 1.18.22 From 86255aaf470627ad674e0febc872587848391691 Mon Sep 17 00:00:00 2001 From: landaiqing <3517283258@qq.com> Date: Wed, 1 May 2024 21:57:58 +0800 Subject: [PATCH 12/27] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8Dlombox=E7=89=88?= =?UTF-8?q?=E6=9C=AC=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../schisandra-cloud-storage-auth-api/pom.xml | 2 +- .../pom.xml | 2 +- .../schisandra-cloud-storage-auth-common/pom.xml | 2 +- .../schisandra-cloud-storage-auth-domain/pom.xml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-api/pom.xml b/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-api/pom.xml index 2fdc7d4..c2cf075 100644 --- a/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-api/pom.xml +++ b/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-api/pom.xml @@ -31,7 +31,7 @@ org.projectlombok lombok - 1.18.22 + 1.18.32 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 ae2a3b5..5f7fc6a 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 @@ -22,7 +22,7 @@ org.projectlombok lombok - 1.18.22 + 1.18.32 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 b7536c4..e952e93 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 @@ -36,7 +36,7 @@ org.projectlombok lombok - 1.18.22 + 1.18.32 org.mapstruct diff --git a/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-domain/pom.xml b/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-domain/pom.xml index 660e7c4..7de5577 100644 --- a/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-domain/pom.xml +++ b/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-domain/pom.xml @@ -21,7 +21,7 @@ org.projectlombok lombok - 1.18.22 + 1.18.32 From 16371a3fd991db3e0ddf3fb9c195b4de988954f5 Mon Sep 17 00:00:00 2001 From: landaiqing <3517283258@qq.com> Date: Sat, 4 May 2024 01:27:33 +0800 Subject: [PATCH 13/27] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8Dlombox=E7=89=88?= =?UTF-8?q?=E6=9C=AC=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../schisandra-cloud-storage-auth-api/pom.xml | 2 +- .../pom.xml | 2 +- .../schisandra-cloud-storage-auth-common/pom.xml | 2 +- .../schisandra-cloud-storage-auth-domain/pom.xml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-api/pom.xml b/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-api/pom.xml index c2cf075..5da4b4b 100644 --- a/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-api/pom.xml +++ b/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-api/pom.xml @@ -31,7 +31,7 @@ org.projectlombok lombok - 1.18.32 + 1.18.28 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 5f7fc6a..c3e5eed 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 @@ -22,7 +22,7 @@ org.projectlombok lombok - 1.18.32 + 1.18.28 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 e952e93..d72eba8 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 @@ -36,7 +36,7 @@ org.projectlombok lombok - 1.18.32 + 1.18.28 org.mapstruct diff --git a/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-domain/pom.xml b/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-domain/pom.xml index 7de5577..1549d29 100644 --- a/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-domain/pom.xml +++ b/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-domain/pom.xml @@ -21,7 +21,7 @@ org.projectlombok lombok - 1.18.32 + 1.18.28 From c4297b285386080e2868c821d8eef137dca8e94b Mon Sep 17 00:00:00 2001 From: landaiqing <3517283258@qq.com> Date: Sat, 4 May 2024 02:20:18 +0800 Subject: [PATCH 14/27] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8Dlombox=E7=89=88?= =?UTF-8?q?=E6=9C=AC=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../schisandra-cloud-storage-auth-api/pom.xml | 2 +- .../pom.xml | 2 +- .../schisandra-cloud-storage-auth-common/pom.xml | 2 +- .../schisandra-cloud-storage-auth-domain/pom.xml | 2 +- schisandra-cloud-storage-wechat/pom.xml | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-api/pom.xml b/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-api/pom.xml index 5da4b4b..d48d04c 100644 --- a/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-api/pom.xml +++ b/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-api/pom.xml @@ -31,7 +31,7 @@ org.projectlombok lombok - 1.18.28 + 1.18.20 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 c3e5eed..c68c4e9 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 @@ -22,7 +22,7 @@ org.projectlombok lombok - 1.18.28 + 1.18.20 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 d72eba8..13a1cf4 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 @@ -36,7 +36,7 @@ org.projectlombok lombok - 1.18.28 + 1.18.20 org.mapstruct diff --git a/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-domain/pom.xml b/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-domain/pom.xml index 1549d29..bed94cc 100644 --- a/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-domain/pom.xml +++ b/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-domain/pom.xml @@ -21,7 +21,7 @@ org.projectlombok lombok - 1.18.28 + 1.18.20 diff --git a/schisandra-cloud-storage-wechat/pom.xml b/schisandra-cloud-storage-wechat/pom.xml index e084267..33b6a23 100644 --- a/schisandra-cloud-storage-wechat/pom.xml +++ b/schisandra-cloud-storage-wechat/pom.xml @@ -31,7 +31,7 @@ org.projectlombok lombok - 1.18.28 + 1.18.20 org.springframework.boot From 4046aea83c6552530a572e0b0d42817831394abf Mon Sep 17 00:00:00 2001 From: landaiqing <3517283258@qq.com> Date: Sat, 4 May 2024 02:23:20 +0800 Subject: [PATCH 15/27] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8Dlombox=E7=89=88?= =?UTF-8?q?=E6=9C=AC=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../schisandra-cloud-storage-auth-api/pom.xml | 2 +- .../pom.xml | 2 +- .../schisandra-cloud-storage-auth-common/pom.xml | 2 +- .../schisandra-cloud-storage-auth-domain/pom.xml | 2 +- schisandra-cloud-storage-oss/pom.xml | 2 +- schisandra-cloud-storage-wechat/pom.xml | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-api/pom.xml b/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-api/pom.xml index d48d04c..a5d50dd 100644 --- a/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-api/pom.xml +++ b/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-api/pom.xml @@ -31,7 +31,7 @@ org.projectlombok lombok - 1.18.20 + 1.18.16 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 c68c4e9..db8c89f 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 @@ -22,7 +22,7 @@ org.projectlombok lombok - 1.18.20 + 1.18.16 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 13a1cf4..daa68d2 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 @@ -36,7 +36,7 @@ org.projectlombok lombok - 1.18.20 + 1.18.16 org.mapstruct diff --git a/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-domain/pom.xml b/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-domain/pom.xml index bed94cc..9f13b58 100644 --- a/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-domain/pom.xml +++ b/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-domain/pom.xml @@ -21,7 +21,7 @@ org.projectlombok lombok - 1.18.20 + 1.18.16 diff --git a/schisandra-cloud-storage-oss/pom.xml b/schisandra-cloud-storage-oss/pom.xml index 35dbc54..ced99f0 100644 --- a/schisandra-cloud-storage-oss/pom.xml +++ b/schisandra-cloud-storage-oss/pom.xml @@ -38,7 +38,7 @@ org.projectlombok lombok - 1.18.20 + 1.18.16 com.alibaba.cloud diff --git a/schisandra-cloud-storage-wechat/pom.xml b/schisandra-cloud-storage-wechat/pom.xml index 33b6a23..e48e7cf 100644 --- a/schisandra-cloud-storage-wechat/pom.xml +++ b/schisandra-cloud-storage-wechat/pom.xml @@ -31,7 +31,7 @@ org.projectlombok lombok - 1.18.20 + 1.18.16 org.springframework.boot From 6d7ef42219980566c5d55f97d1d1e27b34d14f83 Mon Sep 17 00:00:00 2001 From: landaiqing <3517283258@qq.com> Date: Sat, 4 May 2024 02:24:31 +0800 Subject: [PATCH 16/27] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8Dlombox=E7=89=88?= =?UTF-8?q?=E6=9C=AC=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../schisandra-cloud-storage-auth-api/pom.xml | 2 +- .../pom.xml | 2 +- .../schisandra-cloud-storage-auth-common/pom.xml | 2 +- .../schisandra-cloud-storage-auth-domain/pom.xml | 2 +- schisandra-cloud-storage-oss/pom.xml | 2 +- schisandra-cloud-storage-wechat/pom.xml | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-api/pom.xml b/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-api/pom.xml index a5d50dd..66f78f6 100644 --- a/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-api/pom.xml +++ b/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-api/pom.xml @@ -31,7 +31,7 @@ org.projectlombok lombok - 1.18.16 + 1.18.24 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 db8c89f..7e5947b 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 @@ -22,7 +22,7 @@ org.projectlombok lombok - 1.18.16 + 1.18.24 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 daa68d2..d2ef0c7 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 @@ -36,7 +36,7 @@ org.projectlombok lombok - 1.18.16 + 1.18.24 org.mapstruct diff --git a/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-domain/pom.xml b/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-domain/pom.xml index 9f13b58..85fb89c 100644 --- a/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-domain/pom.xml +++ b/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-domain/pom.xml @@ -21,7 +21,7 @@ org.projectlombok lombok - 1.18.16 + 1.18.24 diff --git a/schisandra-cloud-storage-oss/pom.xml b/schisandra-cloud-storage-oss/pom.xml index ced99f0..2c2df04 100644 --- a/schisandra-cloud-storage-oss/pom.xml +++ b/schisandra-cloud-storage-oss/pom.xml @@ -38,7 +38,7 @@ org.projectlombok lombok - 1.18.16 + 1.18.24 com.alibaba.cloud diff --git a/schisandra-cloud-storage-wechat/pom.xml b/schisandra-cloud-storage-wechat/pom.xml index e48e7cf..2898b64 100644 --- a/schisandra-cloud-storage-wechat/pom.xml +++ b/schisandra-cloud-storage-wechat/pom.xml @@ -31,7 +31,7 @@ org.projectlombok lombok - 1.18.16 + 1.18.24 org.springframework.boot From f68fca9ac15b6db878ae2c5a3e23e67de6768256 Mon Sep 17 00:00:00 2001 From: landaiqing <3517283258@qq.com> Date: Sat, 4 May 2024 02:28:18 +0800 Subject: [PATCH 17/27] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8Djenkins=20lombox?= =?UTF-8?q?=E7=89=88=E6=9C=AC=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pom.xml | 64 +++++++++---------- .../pom.xml | 38 +++++------ 2 files changed, 51 insertions(+), 51 deletions(-) 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 7e5947b..32b0267 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 @@ -9,38 +9,38 @@ schisandra-cloud-storage-auth-application-controller schisandra-cloud-storage-auth-application-controller - - - - org.apache.maven.plugins - maven-compiler-plugin - - 1.8 - 1.8 - UTF-8 - - - org.projectlombok - lombok - 1.18.24 - - - - org.mapstruct - mapstruct-processor - 1.4.2.Final - - - - org.projectlombok - lombok-mapstruct-binding - 0.2.0 - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 8 8 diff --git a/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-domain/pom.xml b/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-domain/pom.xml index 85fb89c..220674b 100644 --- a/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-domain/pom.xml +++ b/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-domain/pom.xml @@ -17,25 +17,25 @@ 1.8 1.8 UTF-8 - - - org.projectlombok - lombok - 1.18.24 - - - - org.mapstruct - mapstruct-processor - 1.4.2.Final - - - - org.projectlombok - lombok-mapstruct-binding - 0.2.0 - - + + + + + + + + + + + + + + + + + + + From ff7dc84625e2dbb717ddeabb5bdbcaacce407af1 Mon Sep 17 00:00:00 2001 From: landaiqing <3517283258@qq.com> Date: Sat, 4 May 2024 02:29:34 +0800 Subject: [PATCH 18/27] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8Djenkins=20lombox?= =?UTF-8?q?=E7=89=88=E6=9C=AC=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../schisandra-cloud-storage-auth-starter/pom.xml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) 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 8591203..2326282 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 @@ -92,13 +92,13 @@ - - - - org.projectlombok - lombok - - + + + + + + + From de4e4ca4692cbde250f8c82ef42730a2b94ebf9f Mon Sep 17 00:00:00 2001 From: landaiqing <3517283258@qq.com> Date: Sat, 4 May 2024 02:33:41 +0800 Subject: [PATCH 19/27] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8Djenkins=20lombox?= =?UTF-8?q?=E7=89=88=E6=9C=AC=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pom.xml | 64 +++++++++---------- .../pom.xml | 38 +++++------ .../pom.xml | 42 ++++++++++-- 3 files changed, 86 insertions(+), 58 deletions(-) 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 32b0267..7e5947b 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 @@ -9,38 +9,38 @@ schisandra-cloud-storage-auth-application-controller schisandra-cloud-storage-auth-application-controller - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + org.apache.maven.plugins + maven-compiler-plugin + + 1.8 + 1.8 + UTF-8 + + + org.projectlombok + lombok + 1.18.24 + + + + org.mapstruct + mapstruct-processor + 1.4.2.Final + + + + org.projectlombok + lombok-mapstruct-binding + 0.2.0 + + + + + + 8 8 diff --git a/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-domain/pom.xml b/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-domain/pom.xml index 220674b..85fb89c 100644 --- a/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-domain/pom.xml +++ b/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-domain/pom.xml @@ -17,25 +17,25 @@ 1.8 1.8 UTF-8 - - - - - - - - - - - - - - - - - - - + + + org.projectlombok + lombok + 1.18.24 + + + + org.mapstruct + mapstruct-processor + 1.4.2.Final + + + + org.projectlombok + lombok-mapstruct-binding + 0.2.0 + + 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 2326282..3793190 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 @@ -92,13 +92,41 @@ - - - - - - - + + + + org.projectlombok + lombok + + + + + + org.apache.maven.plugins + maven-compiler-plugin + + 1.8 + 1.8 + UTF-8 + + + org.projectlombok + lombok + 1.18.24 + + + + org.mapstruct + mapstruct-processor + 1.4.2.Final + + + + org.projectlombok + lombok-mapstruct-binding + 0.2.0 + + From 0b641c52f8eba6b816eb10862ff9e7c0f9d5e091 Mon Sep 17 00:00:00 2001 From: landaiqing <3517283258@qq.com> Date: Sat, 4 May 2024 14:31:48 +0800 Subject: [PATCH 20/27] =?UTF-8?q?feat:=20=E4=BF=AE=E6=94=B9=E5=BE=AE?= =?UTF-8?q?=E4=BF=A1=E5=85=AC=E4=BC=97=E5=8F=B7=E6=A8=A1=E5=9D=97=E7=AB=AF?= =?UTF-8?q?=E5=8F=A3/=E6=B7=BB=E5=8A=A0maven-compiler-plugin=E4=BE=9D?= =?UTF-8?q?=E8=B5=96=E7=89=88=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pom.xml | 1 + .../schisandra-cloud-storage-auth-domain/pom.xml | 1 + .../schisandra-cloud-storage-auth-starter/pom.xml | 1 + .../src/main/resources/application.yml | 2 +- 4 files changed, 4 insertions(+), 1 deletion(-) 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 7e5947b..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 @@ -14,6 +14,7 @@ org.apache.maven.plugins maven-compiler-plugin + 3.13.0 1.8 1.8 diff --git a/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-domain/pom.xml b/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-domain/pom.xml index 85fb89c..9891b65 100644 --- a/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-domain/pom.xml +++ b/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-domain/pom.xml @@ -13,6 +13,7 @@ org.apache.maven.plugins maven-compiler-plugin + 3.13.0 1.8 1.8 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 3793190..746aa35 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 @@ -104,6 +104,7 @@ org.apache.maven.plugins maven-compiler-plugin + 3.13.0 1.8 1.8 diff --git a/schisandra-cloud-storage-wechat/src/main/resources/application.yml b/schisandra-cloud-storage-wechat/src/main/resources/application.yml index 871bccf..4fe070a 100644 --- a/schisandra-cloud-storage-wechat/src/main/resources/application.yml +++ b/schisandra-cloud-storage-wechat/src/main/resources/application.yml @@ -1,5 +1,5 @@ server: - port: 3010 + port: 80 spring: # redis配置 redis: From f1b00090bb373fc7f838508afb90fa99481e48e2 Mon Sep 17 00:00:00 2001 From: landaiqing <3517283258@qq.com> Date: Sat, 4 May 2024 14:48:19 +0800 Subject: [PATCH 21/27] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8DWeChat=E6=A8=A1?= =?UTF-8?q?=E5=9D=97=E6=89=93=E5=8C=85=E6=B2=A1=E6=9C=89target=E7=9B=AE?= =?UTF-8?q?=E5=BD=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- schisandra-cloud-storage-wechat/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/schisandra-cloud-storage-wechat/pom.xml b/schisandra-cloud-storage-wechat/pom.xml index 2898b64..d9875d2 100644 --- a/schisandra-cloud-storage-wechat/pom.xml +++ b/schisandra-cloud-storage-wechat/pom.xml @@ -5,7 +5,7 @@ com.schisandra schisandra-cloud-storage-wechat 1.0-SNAPSHOT - pom + jar schisandra-cloud-storage-wechat From 393d13f0ce9375ded4d93dbbd665cc3782600b52 Mon Sep 17 00:00:00 2001 From: zlg <482370576@qq.com> Date: Tue, 7 May 2024 00:16:12 +0800 Subject: [PATCH 22/27] feat: update --- .../controller/EncryptController.java | 52 ---- .../application/filter/EncryptApiFilter.java | 100 ------- .../wrapper/EncryptRequestWrapper.java | 257 ------------------ .../application/wrapper/ResponseWrapper.java | 114 -------- .../auth/common/entity/ApiEncryptRes.java | 19 -- .../auth/common/utils/ApiSecurityUtils.java | 44 --- 6 files changed, 586 deletions(-) delete mode 100644 schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-application/schisandra-cloud-storage-auth-application-controller/src/main/java/com/schisandra/auth/application/controller/EncryptController.java delete mode 100644 schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-application/schisandra-cloud-storage-auth-application-controller/src/main/java/com/schisandra/auth/application/filter/EncryptApiFilter.java delete mode 100644 schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-application/schisandra-cloud-storage-auth-application-controller/src/main/java/com/schisandra/auth/application/wrapper/EncryptRequestWrapper.java delete mode 100644 schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-application/schisandra-cloud-storage-auth-application-controller/src/main/java/com/schisandra/auth/application/wrapper/ResponseWrapper.java delete mode 100644 schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-common/src/main/java/com/schisandra/auth/common/entity/ApiEncryptRes.java delete mode 100644 schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-common/src/main/java/com/schisandra/auth/common/utils/ApiSecurityUtils.java diff --git a/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-application/schisandra-cloud-storage-auth-application-controller/src/main/java/com/schisandra/auth/application/controller/EncryptController.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/EncryptController.java deleted file mode 100644 index ccfe8ce..0000000 --- a/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-application/schisandra-cloud-storage-auth-application-controller/src/main/java/com/schisandra/auth/application/controller/EncryptController.java +++ /dev/null @@ -1,52 +0,0 @@ -package com.schisandra.auth.application.controller; - -import com.schisandra.auth.common.entity.Result; -import com.schisandra.auth.common.redis.RedisUtil; -import com.schisandra.auth.common.utils.MD5Util; -import com.schisandra.auth.common.utils.RSAUtils; -import lombok.extern.slf4j.Slf4j; -import org.apache.commons.lang3.StringUtils; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; - -import javax.annotation.Resource; -import java.util.Map; - -/** - * @ClassName EncryptController - * @Description TODO - * @Author L - * @Date 2024/1/29 9:18 - */ -@RestController -@RequestMapping("/encrypt") -@Slf4j -public class EncryptController { - @Resource - private RedisUtil redisUtil; - private String authPublicKeyPrefix = "auth.publicKey"; - private String authPrivateKeyPrefix = "auth.privateKey"; - - @PostMapping("/getPublicKey") - public Result getPublicKey() throws Exception { - //获取当前登陆账号对应的token,这行代码就不贴了。 - String token="12345"; - String publicKey=""; - if (StringUtils.isNotBlank(token)) { - Map stringStringMap = RSAUtils.genKeyPair(); - publicKey = stringStringMap.get("publicKey"); - String privateKey = stringStringMap.get("privateKey"); - String md5Token = MD5Util.md5(token); - //这个地方的存放时间根据你的token存放时间走 - redisUtil.set(md5Token + "publicKey", publicKey); - redisUtil.set(md5Token + "privateKey", privateKey); - return Result.ok(publicKey); - } - return Result.ok(publicKey); - } - -} - 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/filter/EncryptApiFilter.java b/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-application/schisandra-cloud-storage-auth-application-controller/src/main/java/com/schisandra/auth/application/filter/EncryptApiFilter.java deleted file mode 100644 index 8bcbb28..0000000 --- a/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-application/schisandra-cloud-storage-auth-application-controller/src/main/java/com/schisandra/auth/application/filter/EncryptApiFilter.java +++ /dev/null @@ -1,100 +0,0 @@ -package com.schisandra.auth.application.filter; - -import cn.hutool.core.util.StrUtil; -import cn.hutool.extra.servlet.ServletUtil; -import cn.hutool.json.JSONUtil; -import com.alibaba.fastjson.JSON; -import com.schisandra.auth.application.wrapper.EncryptRequestWrapper; -import com.schisandra.auth.application.wrapper.ResponseWrapper; -import com.schisandra.auth.common.entity.ApiEncryptRes; -import com.schisandra.auth.common.utils.ApiSecurityUtils; -import lombok.SneakyThrows; -import lombok.extern.slf4j.Slf4j; -import org.apache.commons.lang3.StringUtils; -import org.springframework.boot.web.servlet.filter.OrderedFilter; -import org.springframework.stereotype.Component; -import org.springframework.web.filter.OncePerRequestFilter; - -import javax.servlet.FilterChain; -import javax.servlet.ServletException; -import javax.servlet.ServletOutputStream; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import java.io.IOException; -import java.nio.charset.StandardCharsets; - -@Slf4j -@Component -public class EncryptApiFilter extends OncePerRequestFilter implements OrderedFilter { - public static final int DEFAULT_ORDER = Integer.MAX_VALUE; - - - @Override - protected void doFilterInternal(HttpServletRequest request, HttpServletResponse response, FilterChain filterChain) throws ServletException, IOException { - String servletPath = request.getServletPath(); - - ResponseWrapper wrapper = new ResponseWrapper(response); - String requestContent = null; - - if (ServletUtil.isMultipart(request)) { - } else { - EncryptRequestWrapper encryptRequestWrapper = EncryptRequestWrapper.newOrGetMultiReadHttpServletRequest(request); - requestContent = encryptRequestWrapper.getBody(); - request = encryptRequestWrapper; - - } - log.debug("{}>>>{}", servletPath, requestContent); - - try { - filterChain.doFilter(request, wrapper); - } finally { - try { - process(request, wrapper, response); - } catch (Exception e) { - log.error("AesFilter error", e); - } - } - } - - @SneakyThrows - protected void process(HttpServletRequest request, ResponseWrapper responseWrapper, HttpServletResponse response) { - - String servletPath = request.getRequestURI(); - String isencrypt = request.getHeader("Isencrypt"); - ServletOutputStream out = response.getOutputStream(); - if (ResponseWrapper.isJsonContentType(responseWrapper.getContentType())) { - String responseContent = responseWrapper.getTextContent(); - if (StrUtil.isNotEmpty(responseContent)&&StringUtils.isNotBlank(isencrypt)) { - String JSPublicKey = ((EncryptRequestWrapper)request).getJSPublicKey(); - if (StringUtils.isNotBlank(JSPublicKey)) { - ApiEncryptRes apiEncryptRes = ApiSecurityUtils.encrypt(JSON.toJSONString(responseContent), JSPublicKey); - responseContent = JSONUtil.toJsonStr(apiEncryptRes); - } - log.info("{}<<<{}", servletPath, responseContent); - byte[] bytes = responseContent.getBytes(StandardCharsets.UTF_8); - response.setContentLength(bytes.length); - out.write(bytes); - out.flush(); - out.close(); - } else { - responseWrapper.getByteArrayOutputStream().writeTo(out); - out.flush(); - out.close(); - } - } else { - responseWrapper.getByteArrayOutputStream().writeTo(out); - out.flush(); - out.close(); - } - } - - @Override - public void afterPropertiesSet() throws ServletException { - super.afterPropertiesSet(); - } - - @Override - public int getOrder() { - return DEFAULT_ORDER; - } -} 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/wrapper/EncryptRequestWrapper.java b/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-application/schisandra-cloud-storage-auth-application-controller/src/main/java/com/schisandra/auth/application/wrapper/EncryptRequestWrapper.java deleted file mode 100644 index 89c256a..0000000 --- a/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-application/schisandra-cloud-storage-auth-application-controller/src/main/java/com/schisandra/auth/application/wrapper/EncryptRequestWrapper.java +++ /dev/null @@ -1,257 +0,0 @@ -package com.schisandra.auth.application.wrapper; - -import cn.hutool.core.convert.Convert; -import com.alibaba.fastjson.JSONObject; -import com.schisandra.auth.common.redis.RedisUtil; -import com.schisandra.auth.common.utils.ApiSecurityUtils; -import com.schisandra.auth.common.utils.MD5Util; -import lombok.extern.slf4j.Slf4j; -import org.apache.commons.lang3.StringUtils; - -import javax.servlet.ReadListener; -import javax.servlet.ServletInputStream; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletRequestWrapper; -import java.io.*; - - -import cn.hutool.core.io.FastByteArrayOutputStream; -import cn.hutool.core.io.IoUtil; -import cn.hutool.core.lang.Assert; -import cn.hutool.http.ContentType; - - -import lombok.SneakyThrows; -import org.springframework.web.context.WebApplicationContext; -import org.springframework.web.context.support.WebApplicationContextUtils; -import org.springframework.web.multipart.support.StandardServletMultipartResolver; -import org.springframework.web.util.WebUtils; - - -import java.util.TreeMap; - -/** - * @ClassName requestWrapper - * @Description TODO - * @Author landaiqing - * @Date 2024/1/31 17:58 - */ - -/** - * 确保request可以多次读取 - */ - -@Slf4j -public class EncryptRequestWrapper extends HttpServletRequestWrapper { - - - - //2024-02-02由于在过滤器中无法直接通过Autowired获取Bean,因此需要通过spring上下文来获取IOC管理的实体类 -// @Autowired -// private RedisUtil redisUtil; - - protected FastByteArrayOutputStream cachedContent; - protected String JSPublicKey; - protected EncryptRequestWrapper(HttpServletRequest request ) { - - super(request); - RedisUtil redisUtils =getBean(RedisUtil.class, request); - this.copyBody(redisUtils); - - - } - - /** - * - * 此处主要是用于读取 RedisUtil - * @param clazz - * @param request - * @param - * @return - */ - public T getBean(Class clazz, HttpServletRequest request){ - WebApplicationContext applicationContext = WebApplicationContextUtils.getRequiredWebApplicationContext(request.getServletContext()); - return applicationContext.getBean(clazz); - } - - public static EncryptRequestWrapper newOrGetMultiReadHttpServletRequest(HttpServletRequest request) { - EncryptRequestWrapper multiReadHttpServletRequest = getMultiReadHttpServletRequest(request); - if (null != multiReadHttpServletRequest) { - return multiReadHttpServletRequest; - } else { - String contentType = request.getContentType(); - if (contentType != null && contentType.contains(ContentType.MULTIPART.getValue())) { - // 将转化后的 request 放入过滤链中 - request = new StandardServletMultipartResolver().resolveMultipart(request); - } - return new EncryptRequestWrapper(request); - } - } - - public static EncryptRequestWrapper getMultiReadHttpServletRequest(HttpServletRequest request) { - EncryptRequestWrapper nativeRequest = WebUtils.getNativeRequest(request, EncryptRequestWrapper.class); - if (null != nativeRequest) { - return nativeRequest; - } else if (request instanceof EncryptRequestWrapper) { - return (EncryptRequestWrapper) request; - } else { - return null; - } - } - //重新读取请求，因为request只可以被读取一次，需要重新设置为可多次读取 - @SneakyThrows - protected void copyBody(RedisUtil redisUtils) { - int length = this.getContentLength(); - if (length > 0) { - cachedContent = IoUtil.read(getRequest().getInputStream()); - if (StringUtils.isNotBlank(this.getHeader("isEncrypt"))&&StringUtils.isNotBlank(this.getHeader("Authorization"))) { - String body = new String(cachedContent.toByteArray()); - log.info("------------------- body = " + body + "------------------------"); - if (StringUtils.isNotBlank(body)) { - JSONObject jsonBody = JSONObject.parseObject(body); - if(null != jsonBody){ - String dataEncrypt = jsonBody.getString("data"); - String aeskey = jsonBody.getString("aeskey"); - JSPublicKey = jsonBody.getString("frontPublicKey"); - String data; - JSONObject json = null; - log.info("------------------- dataEncrypt = " + dataEncrypt + "------------------------"); - log.info("------------------- aesKey = " + aeskey + "------------------------"); - String token = this.getHeader("Authorization"); - String md5Token = MD5Util.md5(token); - String privateKey = Convert.toStr(redisUtils.get(md5Token + "privateKey")); - data = ApiSecurityUtils.decrypt(aeskey, dataEncrypt,privateKey); - // 如果数据不为空就编译 - if (StringUtils.isNotBlank(data)) { - //如果参数为空前端传回undefined - if ("undefined".equalsIgnoreCase(data)) { - json = new JSONObject(); - } else { - json = JSONObject.parseObject(data); - } - } - if (json != null) { - body = json.toJSONString(); - } - } - log.info("------------------- body = " + body + "------------------------"); - cachedContent.reset(); - cachedContent.write( body.getBytes(), 0, body.getBytes().length); - - } - } - } else { - cachedContent = new FastByteArrayOutputStream(); - } - } - - @Override - public int getContentLength() { - if (null != cachedContent) { - return cachedContent.size(); - } - return super.getContentLength(); - } - - public byte[] getByteArrayBody() { - return cachedContent.toByteArray(); - } - - public String getBody() { - String body = null; - if (cachedContent != null && cachedContent.size() > 0) { - body = new String(cachedContent.toByteArray()); - } - return body; - } - - public String getSortBody() { - return JSONObject.toJSONString(this.getBody(TreeMap.class)); - } - - public T getBody(Class type) { - return cn.hutool.json.JSONUtil.toBean(this.getBody(), type); - } - - //这个方法为获取前端给后端用于加密aeskey的rsa公钥 - public String getJSPublicKey(){ - return JSPublicKey; - } - @Override - public BufferedReader getReader() throws IOException { - return new BufferedReader(new InputStreamReader(getInputStream())); - } - - @Override - public ServletInputStream getInputStream() throws IOException { - if (this.getContentLength() < 1) { - return super.getInputStream(); - } - return new ResettableServletInputStream(new ByteArrayInputStream(cachedContent.toByteArray())); - } - - private class ResettableServletInputStream extends ServletInputStream { - - private final InputStream sourceStream; - - private boolean finished = false; - - - /** - * Create a DelegatingServletInputStream for the given source stream. - * - * @param sourceStream the source stream (never {@code null}) - */ - public ResettableServletInputStream(InputStream sourceStream) { - Assert.notNull(sourceStream, "Source InputStream must not be null"); - this.sourceStream = sourceStream; - } - - /** - * Return the underlying source stream (never {@code null}). - */ - public final InputStream getSourceStream() { - return this.sourceStream; - } - - - @Override - public int read() throws IOException { - int data = this.sourceStream.read(); - if (data == -1) { - this.finished = true; - } - return data; - } - - @Override - public int available() throws IOException { - return this.sourceStream.available(); - } - - @Override - public void close() throws IOException { - super.close(); - this.sourceStream.close(); - } - - @Override - public boolean isFinished() { - return finished; - } - - @Override - public boolean isReady() { - return true; - } - - @Override - public void setReadListener(ReadListener readListener) { - - } - } - - - -} - 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/wrapper/ResponseWrapper.java b/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-application/schisandra-cloud-storage-auth-application-controller/src/main/java/com/schisandra/auth/application/wrapper/ResponseWrapper.java deleted file mode 100644 index 10f6eed..0000000 --- a/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-application/schisandra-cloud-storage-auth-application-controller/src/main/java/com/schisandra/auth/application/wrapper/ResponseWrapper.java +++ /dev/null @@ -1,114 +0,0 @@ -package com.schisandra.auth.application.wrapper; - -import cn.hutool.core.util.StrUtil; -import lombok.extern.slf4j.Slf4j; -import org.springframework.http.MediaType; - -import javax.servlet.ServletOutputStream; -import javax.servlet.WriteListener; -import javax.servlet.http.HttpServletResponse; -import javax.servlet.http.HttpServletResponseWrapper; -import java.io.ByteArrayOutputStream; -import java.io.IOException; -import java.io.PrintWriter; -/** * 返回值输出代理类 - * @ClassName ResponseWrapper - * @Description TODO - * @Author L - * @Date 2024/1/31 18:58 - */ - -@Slf4j -public class ResponseWrapper extends HttpServletResponseWrapper { - ByteArrayOutputStream _stream = new ByteArrayOutputStream(); - PrintWriter _pw = new PrintWriter(_stream); - - public ResponseWrapper(HttpServletResponse resp) throws IOException { - super(resp); - } - - /** - * 覆盖getWriter()方法，将字符流缓冲到本地 - */ - @Override - public PrintWriter getWriter() throws IOException { - return _pw; - } - - /** - * 覆盖getOutputStream()方法，将字节流缓冲到本地 - */ - @Override - public ServletOutputStream getOutputStream() throws IOException { - return new ServletOutputStream() { - @Override - public boolean isReady() { - return false; - } - - @Override - public void setWriteListener(WriteListener writeListener) { - - } - - @Override - public void write(int b) throws IOException { - _stream.write(b); - } - }; - } - - /** - * 把缓冲区内容写入输出流后关闭 - * - * @author xxj - */ - public void flush() { - try { - _pw.flush(); - _pw.close(); - _stream.flush(); - _stream.close(); - } catch (IOException e) { - log.error("", e); - } - } - - /** - * 获取字节流 - * - * @return - */ - public ByteArrayOutputStream getByteArrayOutputStream() { - return _stream; - } - - /** - * 将换出区内容转为文本输出 - * - * @return - */ - public String getTextContent() { - flush(); - return _stream.toString(); - } - - public static boolean isTextContentType(String contentType) { - boolean flag = false; - if (StrUtil.isBlank(contentType)) { - return false; - } else { - flag = StrUtil.startWithIgnoreCase(contentType, "text"); - if (!flag) { - flag = isJsonContentType(contentType); - } - } - return flag; - } - - public static boolean isJsonContentType(String contentType) { - return !StrUtil.isBlank(contentType) - && (StrUtil.containsIgnoreCase(contentType, "application/problem+json") - || StrUtil.containsIgnoreCase(contentType, MediaType.APPLICATION_JSON_VALUE)); - } -} diff --git a/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-common/src/main/java/com/schisandra/auth/common/entity/ApiEncryptRes.java b/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-common/src/main/java/com/schisandra/auth/common/entity/ApiEncryptRes.java deleted file mode 100644 index 9ba8785..0000000 --- a/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-common/src/main/java/com/schisandra/auth/common/entity/ApiEncryptRes.java +++ /dev/null @@ -1,19 +0,0 @@ -package com.schisandra.auth.common.entity; - -import lombok.Data; - -/** - * @Classname ApiEncryptRes - * @BelongsProject: schisandra-cloud-storage - * @BelongsPackage: com.schisandra.auth.common.entity - * @Author: landaiqing - * @CreateTime: 2024-04-28 12:01 - * @Description: TODO - * @Version: 1.0 - */ -@Data -public class ApiEncryptRes { - private String aesKeyByRsa; - private String data; - private String frontPublicKey; -} diff --git a/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-common/src/main/java/com/schisandra/auth/common/utils/ApiSecurityUtils.java b/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-common/src/main/java/com/schisandra/auth/common/utils/ApiSecurityUtils.java deleted file mode 100644 index 230bc69..0000000 --- a/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-common/src/main/java/com/schisandra/auth/common/utils/ApiSecurityUtils.java +++ /dev/null @@ -1,44 +0,0 @@ -package com.schisandra.auth.common.utils; - -import com.schisandra.auth.common.entity.ApiEncryptRes; -import com.schisandra.auth.common.utils.AESUtils; -import com.schisandra.auth.common.utils.RSAUtils; -import org.apache.commons.codec.binary.Base64; -/** - * @ClassName ApiSecurityUtils - * @Description TODO - * @Author L - * @Date 2024/1/26 17:39 - */ -public class ApiSecurityUtils { - /** - * - * @param aesKeyByRsa 经过rsa加密的aeskey - * @param decryptStr 经过aes加密的数据 - * @return 解密后的数据 - */ - public static String decrypt(String aesKeyByRsa,String decryptStr,String privateKey) throws Exception { - byte[] bytes = RSAUtils.decryptByPrivateKey(Base64.decodeBase64(aesKeyByRsa), privateKey); - String aesKey = new String(bytes); - return AESUtils.decrypt(decryptStr, aesKey); - } - - /** - * - * @param encryptStr 要加密的数据 - * @param frontPublicKey 前端公钥 - * @return 加密后的数据 - */ - public static ApiEncryptRes encrypt(String encryptStr, String frontPublicKey) throws Exception { - String aesKey = AESUtils.getKey(); - String data = AESUtils.encrypt(encryptStr, aesKey); - ApiEncryptRes apiEncryptRes = new ApiEncryptRes(); - String aesKeyByRsa = Base64.encodeBase64String(RSAUtils.encryptByPublicKey(aesKey.getBytes(), frontPublicKey)); - apiEncryptRes.setAesKeyByRsa(aesKeyByRsa); - apiEncryptRes.setData(data); - return apiEncryptRes; - } - -} - - From 81e5557b51e075e721467f45346c05c385d24588 Mon Sep 17 00:00:00 2001 From: landaiqing <3517283258@qq.com> Date: Mon, 29 Apr 2024 23:23:32 +0800 Subject: [PATCH 23/27] feat: add sql file --- .../controller/EncryptController.java | 52 ++++ .../application/filter/EncryptApiFilter.java | 100 +++++++ .../wrapper/EncryptRequestWrapper.java | 257 ++++++++++++++++++ .../application/wrapper/ResponseWrapper.java | 114 ++++++++ .../src/main/resources/application.yml | 1 - 5 files changed, 523 insertions(+), 1 deletion(-) create mode 100644 schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-application/schisandra-cloud-storage-auth-application-controller/src/main/java/com/schisandra/auth/application/controller/EncryptController.java create mode 100644 schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-application/schisandra-cloud-storage-auth-application-controller/src/main/java/com/schisandra/auth/application/filter/EncryptApiFilter.java create mode 100644 schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-application/schisandra-cloud-storage-auth-application-controller/src/main/java/com/schisandra/auth/application/wrapper/EncryptRequestWrapper.java create mode 100644 schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-application/schisandra-cloud-storage-auth-application-controller/src/main/java/com/schisandra/auth/application/wrapper/ResponseWrapper.java diff --git a/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-application/schisandra-cloud-storage-auth-application-controller/src/main/java/com/schisandra/auth/application/controller/EncryptController.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/EncryptController.java new file mode 100644 index 0000000..ccfe8ce --- /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/controller/EncryptController.java @@ -0,0 +1,52 @@ +package com.schisandra.auth.application.controller; + +import com.schisandra.auth.common.entity.Result; +import com.schisandra.auth.common.redis.RedisUtil; +import com.schisandra.auth.common.utils.MD5Util; +import com.schisandra.auth.common.utils.RSAUtils; +import lombok.extern.slf4j.Slf4j; +import org.apache.commons.lang3.StringUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import javax.annotation.Resource; +import java.util.Map; + +/** + * @ClassName EncryptController + * @Description TODO + * @Author L + * @Date 2024/1/29 9:18 + */ +@RestController +@RequestMapping("/encrypt") +@Slf4j +public class EncryptController { + @Resource + private RedisUtil redisUtil; + private String authPublicKeyPrefix = "auth.publicKey"; + private String authPrivateKeyPrefix = "auth.privateKey"; + + @PostMapping("/getPublicKey") + public Result getPublicKey() throws Exception { + //获取当前登陆账号对应的token,这行代码就不贴了。 + String token="12345"; + String publicKey=""; + if (StringUtils.isNotBlank(token)) { + Map stringStringMap = RSAUtils.genKeyPair(); + publicKey = stringStringMap.get("publicKey"); + String privateKey = stringStringMap.get("privateKey"); + String md5Token = MD5Util.md5(token); + //这个地方的存放时间根据你的token存放时间走 + redisUtil.set(md5Token + "publicKey", publicKey); + redisUtil.set(md5Token + "privateKey", privateKey); + return Result.ok(publicKey); + } + return Result.ok(publicKey); + } + +} + 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/filter/EncryptApiFilter.java b/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-application/schisandra-cloud-storage-auth-application-controller/src/main/java/com/schisandra/auth/application/filter/EncryptApiFilter.java new file mode 100644 index 0000000..8bcbb28 --- /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/filter/EncryptApiFilter.java @@ -0,0 +1,100 @@ +package com.schisandra.auth.application.filter; + +import cn.hutool.core.util.StrUtil; +import cn.hutool.extra.servlet.ServletUtil; +import cn.hutool.json.JSONUtil; +import com.alibaba.fastjson.JSON; +import com.schisandra.auth.application.wrapper.EncryptRequestWrapper; +import com.schisandra.auth.application.wrapper.ResponseWrapper; +import com.schisandra.auth.common.entity.ApiEncryptRes; +import com.schisandra.auth.common.utils.ApiSecurityUtils; +import lombok.SneakyThrows; +import lombok.extern.slf4j.Slf4j; +import org.apache.commons.lang3.StringUtils; +import org.springframework.boot.web.servlet.filter.OrderedFilter; +import org.springframework.stereotype.Component; +import org.springframework.web.filter.OncePerRequestFilter; + +import javax.servlet.FilterChain; +import javax.servlet.ServletException; +import javax.servlet.ServletOutputStream; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import java.io.IOException; +import java.nio.charset.StandardCharsets; + +@Slf4j +@Component +public class EncryptApiFilter extends OncePerRequestFilter implements OrderedFilter { + public static final int DEFAULT_ORDER = Integer.MAX_VALUE; + + + @Override + protected void doFilterInternal(HttpServletRequest request, HttpServletResponse response, FilterChain filterChain) throws ServletException, IOException { + String servletPath = request.getServletPath(); + + ResponseWrapper wrapper = new ResponseWrapper(response); + String requestContent = null; + + if (ServletUtil.isMultipart(request)) { + } else { + EncryptRequestWrapper encryptRequestWrapper = EncryptRequestWrapper.newOrGetMultiReadHttpServletRequest(request); + requestContent = encryptRequestWrapper.getBody(); + request = encryptRequestWrapper; + + } + log.debug("{}>>>{}", servletPath, requestContent); + + try { + filterChain.doFilter(request, wrapper); + } finally { + try { + process(request, wrapper, response); + } catch (Exception e) { + log.error("AesFilter error", e); + } + } + } + + @SneakyThrows + protected void process(HttpServletRequest request, ResponseWrapper responseWrapper, HttpServletResponse response) { + + String servletPath = request.getRequestURI(); + String isencrypt = request.getHeader("Isencrypt"); + ServletOutputStream out = response.getOutputStream(); + if (ResponseWrapper.isJsonContentType(responseWrapper.getContentType())) { + String responseContent = responseWrapper.getTextContent(); + if (StrUtil.isNotEmpty(responseContent)&&StringUtils.isNotBlank(isencrypt)) { + String JSPublicKey = ((EncryptRequestWrapper)request).getJSPublicKey(); + if (StringUtils.isNotBlank(JSPublicKey)) { + ApiEncryptRes apiEncryptRes = ApiSecurityUtils.encrypt(JSON.toJSONString(responseContent), JSPublicKey); + responseContent = JSONUtil.toJsonStr(apiEncryptRes); + } + log.info("{}<<<{}", servletPath, responseContent); + byte[] bytes = responseContent.getBytes(StandardCharsets.UTF_8); + response.setContentLength(bytes.length); + out.write(bytes); + out.flush(); + out.close(); + } else { + responseWrapper.getByteArrayOutputStream().writeTo(out); + out.flush(); + out.close(); + } + } else { + responseWrapper.getByteArrayOutputStream().writeTo(out); + out.flush(); + out.close(); + } + } + + @Override + public void afterPropertiesSet() throws ServletException { + super.afterPropertiesSet(); + } + + @Override + public int getOrder() { + return DEFAULT_ORDER; + } +} 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/wrapper/EncryptRequestWrapper.java b/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-application/schisandra-cloud-storage-auth-application-controller/src/main/java/com/schisandra/auth/application/wrapper/EncryptRequestWrapper.java new file mode 100644 index 0000000..89c256a --- /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/wrapper/EncryptRequestWrapper.java @@ -0,0 +1,257 @@ +package com.schisandra.auth.application.wrapper; + +import cn.hutool.core.convert.Convert; +import com.alibaba.fastjson.JSONObject; +import com.schisandra.auth.common.redis.RedisUtil; +import com.schisandra.auth.common.utils.ApiSecurityUtils; +import com.schisandra.auth.common.utils.MD5Util; +import lombok.extern.slf4j.Slf4j; +import org.apache.commons.lang3.StringUtils; + +import javax.servlet.ReadListener; +import javax.servlet.ServletInputStream; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletRequestWrapper; +import java.io.*; + + +import cn.hutool.core.io.FastByteArrayOutputStream; +import cn.hutool.core.io.IoUtil; +import cn.hutool.core.lang.Assert; +import cn.hutool.http.ContentType; + + +import lombok.SneakyThrows; +import org.springframework.web.context.WebApplicationContext; +import org.springframework.web.context.support.WebApplicationContextUtils; +import org.springframework.web.multipart.support.StandardServletMultipartResolver; +import org.springframework.web.util.WebUtils; + + +import java.util.TreeMap; + +/** + * @ClassName requestWrapper + * @Description TODO + * @Author landaiqing + * @Date 2024/1/31 17:58 + */ + +/** + * 确保request可以多次读取 + */ + +@Slf4j +public class EncryptRequestWrapper extends HttpServletRequestWrapper { + + + + //2024-02-02由于在过滤器中无法直接通过Autowired获取Bean,因此需要通过spring上下文来获取IOC管理的实体类 +// @Autowired +// private RedisUtil redisUtil; + + protected FastByteArrayOutputStream cachedContent; + protected String JSPublicKey; + protected EncryptRequestWrapper(HttpServletRequest request ) { + + super(request); + RedisUtil redisUtils =getBean(RedisUtil.class, request); + this.copyBody(redisUtils); + + + } + + /** + * + * 此处主要是用于读取 RedisUtil + * @param clazz + * @param request + * @param + * @return + */ + public T getBean(Class clazz, HttpServletRequest request){ + WebApplicationContext applicationContext = WebApplicationContextUtils.getRequiredWebApplicationContext(request.getServletContext()); + return applicationContext.getBean(clazz); + } + + public static EncryptRequestWrapper newOrGetMultiReadHttpServletRequest(HttpServletRequest request) { + EncryptRequestWrapper multiReadHttpServletRequest = getMultiReadHttpServletRequest(request); + if (null != multiReadHttpServletRequest) { + return multiReadHttpServletRequest; + } else { + String contentType = request.getContentType(); + if (contentType != null && contentType.contains(ContentType.MULTIPART.getValue())) { + // 将转化后的 request 放入过滤链中 + request = new StandardServletMultipartResolver().resolveMultipart(request); + } + return new EncryptRequestWrapper(request); + } + } + + public static EncryptRequestWrapper getMultiReadHttpServletRequest(HttpServletRequest request) { + EncryptRequestWrapper nativeRequest = WebUtils.getNativeRequest(request, EncryptRequestWrapper.class); + if (null != nativeRequest) { + return nativeRequest; + } else if (request instanceof EncryptRequestWrapper) { + return (EncryptRequestWrapper) request; + } else { + return null; + } + } + //重新读取请求，因为request只可以被读取一次，需要重新设置为可多次读取 + @SneakyThrows + protected void copyBody(RedisUtil redisUtils) { + int length = this.getContentLength(); + if (length > 0) { + cachedContent = IoUtil.read(getRequest().getInputStream()); + if (StringUtils.isNotBlank(this.getHeader("isEncrypt"))&&StringUtils.isNotBlank(this.getHeader("Authorization"))) { + String body = new String(cachedContent.toByteArray()); + log.info("------------------- body = " + body + "------------------------"); + if (StringUtils.isNotBlank(body)) { + JSONObject jsonBody = JSONObject.parseObject(body); + if(null != jsonBody){ + String dataEncrypt = jsonBody.getString("data"); + String aeskey = jsonBody.getString("aeskey"); + JSPublicKey = jsonBody.getString("frontPublicKey"); + String data; + JSONObject json = null; + log.info("------------------- dataEncrypt = " + dataEncrypt + "------------------------"); + log.info("------------------- aesKey = " + aeskey + "------------------------"); + String token = this.getHeader("Authorization"); + String md5Token = MD5Util.md5(token); + String privateKey = Convert.toStr(redisUtils.get(md5Token + "privateKey")); + data = ApiSecurityUtils.decrypt(aeskey, dataEncrypt,privateKey); + // 如果数据不为空就编译 + if (StringUtils.isNotBlank(data)) { + //如果参数为空前端传回undefined + if ("undefined".equalsIgnoreCase(data)) { + json = new JSONObject(); + } else { + json = JSONObject.parseObject(data); + } + } + if (json != null) { + body = json.toJSONString(); + } + } + log.info("------------------- body = " + body + "------------------------"); + cachedContent.reset(); + cachedContent.write( body.getBytes(), 0, body.getBytes().length); + + } + } + } else { + cachedContent = new FastByteArrayOutputStream(); + } + } + + @Override + public int getContentLength() { + if (null != cachedContent) { + return cachedContent.size(); + } + return super.getContentLength(); + } + + public byte[] getByteArrayBody() { + return cachedContent.toByteArray(); + } + + public String getBody() { + String body = null; + if (cachedContent != null && cachedContent.size() > 0) { + body = new String(cachedContent.toByteArray()); + } + return body; + } + + public String getSortBody() { + return JSONObject.toJSONString(this.getBody(TreeMap.class)); + } + + public T getBody(Class type) { + return cn.hutool.json.JSONUtil.toBean(this.getBody(), type); + } + + //这个方法为获取前端给后端用于加密aeskey的rsa公钥 + public String getJSPublicKey(){ + return JSPublicKey; + } + @Override + public BufferedReader getReader() throws IOException { + return new BufferedReader(new InputStreamReader(getInputStream())); + } + + @Override + public ServletInputStream getInputStream() throws IOException { + if (this.getContentLength() < 1) { + return super.getInputStream(); + } + return new ResettableServletInputStream(new ByteArrayInputStream(cachedContent.toByteArray())); + } + + private class ResettableServletInputStream extends ServletInputStream { + + private final InputStream sourceStream; + + private boolean finished = false; + + + /** + * Create a DelegatingServletInputStream for the given source stream. + * + * @param sourceStream the source stream (never {@code null}) + */ + public ResettableServletInputStream(InputStream sourceStream) { + Assert.notNull(sourceStream, "Source InputStream must not be null"); + this.sourceStream = sourceStream; + } + + /** + * Return the underlying source stream (never {@code null}). + */ + public final InputStream getSourceStream() { + return this.sourceStream; + } + + + @Override + public int read() throws IOException { + int data = this.sourceStream.read(); + if (data == -1) { + this.finished = true; + } + return data; + } + + @Override + public int available() throws IOException { + return this.sourceStream.available(); + } + + @Override + public void close() throws IOException { + super.close(); + this.sourceStream.close(); + } + + @Override + public boolean isFinished() { + return finished; + } + + @Override + public boolean isReady() { + return true; + } + + @Override + public void setReadListener(ReadListener readListener) { + + } + } + + + +} + 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/wrapper/ResponseWrapper.java b/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-application/schisandra-cloud-storage-auth-application-controller/src/main/java/com/schisandra/auth/application/wrapper/ResponseWrapper.java new file mode 100644 index 0000000..10f6eed --- /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/wrapper/ResponseWrapper.java @@ -0,0 +1,114 @@ +package com.schisandra.auth.application.wrapper; + +import cn.hutool.core.util.StrUtil; +import lombok.extern.slf4j.Slf4j; +import org.springframework.http.MediaType; + +import javax.servlet.ServletOutputStream; +import javax.servlet.WriteListener; +import javax.servlet.http.HttpServletResponse; +import javax.servlet.http.HttpServletResponseWrapper; +import java.io.ByteArrayOutputStream; +import java.io.IOException; +import java.io.PrintWriter; +/** * 返回值输出代理类 + * @ClassName ResponseWrapper + * @Description TODO + * @Author L + * @Date 2024/1/31 18:58 + */ + +@Slf4j +public class ResponseWrapper extends HttpServletResponseWrapper { + ByteArrayOutputStream _stream = new ByteArrayOutputStream(); + PrintWriter _pw = new PrintWriter(_stream); + + public ResponseWrapper(HttpServletResponse resp) throws IOException { + super(resp); + } + + /** + * 覆盖getWriter()方法，将字符流缓冲到本地 + */ + @Override + public PrintWriter getWriter() throws IOException { + return _pw; + } + + /** + * 覆盖getOutputStream()方法，将字节流缓冲到本地 + */ + @Override + public ServletOutputStream getOutputStream() throws IOException { + return new ServletOutputStream() { + @Override + public boolean isReady() { + return false; + } + + @Override + public void setWriteListener(WriteListener writeListener) { + + } + + @Override + public void write(int b) throws IOException { + _stream.write(b); + } + }; + } + + /** + * 把缓冲区内容写入输出流后关闭 + * + * @author xxj + */ + public void flush() { + try { + _pw.flush(); + _pw.close(); + _stream.flush(); + _stream.close(); + } catch (IOException e) { + log.error("", e); + } + } + + /** + * 获取字节流 + * + * @return + */ + public ByteArrayOutputStream getByteArrayOutputStream() { + return _stream; + } + + /** + * 将换出区内容转为文本输出 + * + * @return + */ + public String getTextContent() { + flush(); + return _stream.toString(); + } + + public static boolean isTextContentType(String contentType) { + boolean flag = false; + if (StrUtil.isBlank(contentType)) { + return false; + } else { + flag = StrUtil.startWithIgnoreCase(contentType, "text"); + if (!flag) { + flag = isJsonContentType(contentType); + } + } + return flag; + } + + public static boolean isJsonContentType(String contentType) { + return !StrUtil.isBlank(contentType) + && (StrUtil.containsIgnoreCase(contentType, "application/problem+json") + || StrUtil.containsIgnoreCase(contentType, MediaType.APPLICATION_JSON_VALUE)); + } +} diff --git a/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-starter/src/main/resources/application.yml b/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-starter/src/main/resources/application.yml index 1060573..01dae60 100644 --- a/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-starter/src/main/resources/application.yml +++ b/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-starter/src/main/resources/application.yml @@ -95,4 +95,3 @@ sms: # # 地域信息默认为 cn-hangzhou 如无特殊改变可以不用设置 # regionId: cn-hangzhou - From fb4b4cba876d1ac02d8ed5b8208ef271569db4c0 Mon Sep 17 00:00:00 2001 From: landaiqing <3517283258@qq.com> Date: Tue, 7 May 2024 19:53:11 +0800 Subject: [PATCH 24/27] feat: update gateway module --- schisandra-cloud-storage-gateway/pom.xml | 117 +++++++++++++++++- .../gateway/GatewayApplication.java | 19 +++ .../gateway/auth/SaTokenConfigure.java | 32 +++++ .../gateway/auth/StpInterfaceImpl.java | 62 ++++++++++ .../gateway/entity/AuthPermission.java | 53 ++++++++ .../schisandra/gateway/entity/AuthRole.java | 42 +++++++ .../com/schisandra/gateway/entity/Result.java | 59 +++++++++ .../gateway/enums/ResultCodeEnum.java | 24 ++++ .../exception/GatewayExceptionHandler.java | 55 ++++++++ .../gateway/filter/LoginFilter.java | 46 +++++++ .../schisandra/gateway/redis/RedisConfig.java | 49 ++++++++ .../schisandra/gateway/redis/RedisUtil.java | 107 ++++++++++++++++ .../src/main/resources/application.yml | 57 +++++++++ .../src/main/resources/bootstrap.yml | 17 +++ 14 files changed, 738 insertions(+), 1 deletion(-) create mode 100644 schisandra-cloud-storage-gateway/src/main/java/com/schisandra/gateway/GatewayApplication.java create mode 100644 schisandra-cloud-storage-gateway/src/main/java/com/schisandra/gateway/auth/SaTokenConfigure.java create mode 100644 schisandra-cloud-storage-gateway/src/main/java/com/schisandra/gateway/auth/StpInterfaceImpl.java create mode 100644 schisandra-cloud-storage-gateway/src/main/java/com/schisandra/gateway/entity/AuthPermission.java create mode 100644 schisandra-cloud-storage-gateway/src/main/java/com/schisandra/gateway/entity/AuthRole.java create mode 100644 schisandra-cloud-storage-gateway/src/main/java/com/schisandra/gateway/entity/Result.java create mode 100644 schisandra-cloud-storage-gateway/src/main/java/com/schisandra/gateway/enums/ResultCodeEnum.java create mode 100644 schisandra-cloud-storage-gateway/src/main/java/com/schisandra/gateway/exception/GatewayExceptionHandler.java create mode 100644 schisandra-cloud-storage-gateway/src/main/java/com/schisandra/gateway/filter/LoginFilter.java create mode 100644 schisandra-cloud-storage-gateway/src/main/java/com/schisandra/gateway/redis/RedisConfig.java create mode 100644 schisandra-cloud-storage-gateway/src/main/java/com/schisandra/gateway/redis/RedisUtil.java create mode 100644 schisandra-cloud-storage-gateway/src/main/resources/application.yml create mode 100644 schisandra-cloud-storage-gateway/src/main/resources/bootstrap.yml diff --git a/schisandra-cloud-storage-gateway/pom.xml b/schisandra-cloud-storage-gateway/pom.xml index ef44845..64e2261 100644 --- a/schisandra-cloud-storage-gateway/pom.xml +++ b/schisandra-cloud-storage-gateway/pom.xml @@ -9,10 +9,125 @@ schisandra-cloud-storage-gateway + 8 + 8 + 1.8 UTF-8 + UTF-8 + 2.4.2 + 2021.1 + 2020.0.6 - + + + + org.projectlombok + lombok + 1.18.20 + + + com.alibaba.cloud + spring-cloud-starter-alibaba-nacos-config + + + org.springframework.cloud + spring-cloud-starter-bootstrap + + + com.alibaba.cloud + spring-cloud-starter-alibaba-nacos-discovery + + + org.springframework.cloud + spring-cloud-starter-gateway + + + org.springframework.cloud + spring-cloud-loadbalancer + + + + cn.dev33 + sa-token-reactor-spring-boot-starter + 1.37.0 + + + + + cn.dev33 + sa-token-redis-jackson + 1.37.0 + + + org.apache.commons + commons-pool2 + + + com.google.code.gson + gson + 2.8.9 + + + + + + org.springframework.cloud + spring-cloud-dependencies + ${spring-cloud.version} + pom + import + + + org.springframework.boot + spring-boot-dependencies + ${spring-boot.version} + pom + import + + + com.alibaba.cloud + spring-cloud-alibaba-dependencies + ${spring-cloud-alibaba.version} + pom + import + + + + + + ${project.artifactId} + + + + org.springframework.boot + spring-boot-maven-plugin + 2.3.0.RELEASE + + + + repackage + + + + + + + + + + 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 new file mode 100644 index 0000000..f4405ab --- /dev/null +++ b/schisandra-cloud-storage-gateway/src/main/java/com/schisandra/gateway/GatewayApplication.java @@ -0,0 +1,19 @@ +package com.schisandra.gateway; + +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; +import org.springframework.context.annotation.ComponentScan; + +/** + * 网关启动类 + * + * @author: landaiqing + * @date: 2024/2/7 + */ +@SpringBootApplication +@ComponentScan("com.schisandra") +public class GatewayApplication { + public static void main(String[] args) { + SpringApplication.run(GatewayApplication.class); + } +} 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 new file mode 100644 index 0000000..0ddc1d7 --- /dev/null +++ b/schisandra-cloud-storage-gateway/src/main/java/com/schisandra/gateway/auth/SaTokenConfigure.java @@ -0,0 +1,32 @@ +package com.schisandra.gateway.auth; + +import cn.dev33.satoken.context.SaHolder; +import cn.dev33.satoken.reactor.filter.SaReactorFilter; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; + +/** + * 权限认证的配置器 + * + * @author: landaiqing + */ +@Configuration +public class SaTokenConfigure { + + @Bean + public SaReactorFilter getSaReactorFilter() { + return new SaReactorFilter() + // 拦截地址 + .addInclude("/**") + // 鉴权方法：每次访问进入 + .setAuth(obj -> { + System.out.println("-------- 前端访问path：" + SaHolder.getRequest().getRequestPath()); + // 登录校验 -- 拦截所有路由，并排除/user/doLogin 用于开放登录 + //SaRouter.match("/auth/**", "/auth/user/doLogin", r -> StpUtil.checkRole("admin")); +// SaRouter.match("/oss/**", r -> StpUtil.checkLogin()); +// SaRouter.match("/subject/subject/add", r -> StpUtil.checkPermission("subject:add")); +// SaRouter.match("/subject/**", r -> StpUtil.checkLogin()); + }) + ; + } +} 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 new file mode 100644 index 0000000..0e77b9d --- /dev/null +++ b/schisandra-cloud-storage-gateway/src/main/java/com/schisandra/gateway/auth/StpInterfaceImpl.java @@ -0,0 +1,62 @@ +package com.schisandra.gateway.auth; + +import cn.dev33.satoken.stp.StpInterface; +import com.alibaba.cloud.commons.lang.StringUtils; +import com.google.gson.Gson; +import com.google.gson.reflect.TypeToken; +import com.schisandra.gateway.entity.AuthPermission; +import com.schisandra.gateway.entity.AuthRole; +import com.schisandra.gateway.redis.RedisUtil; +import org.springframework.stereotype.Component; + +import javax.annotation.Resource; +import java.util.Collections; +import java.util.LinkedList; +import java.util.List; +import java.util.stream.Collectors; + +/** + * 自定义权限验证接口扩展 + * + * @author: landaiqing + */ +@Component +public class StpInterfaceImpl implements StpInterface { + + @Resource + private RedisUtil redisUtil; + + private String authPermissionPrefix = "auth.permission"; + + private String authRolePrefix = "auth.role"; + + @Override + public List getPermissionList(Object loginId, String loginType) { + return getAuth(loginId.toString(), authPermissionPrefix); + } + + @Override + public List getRoleList(Object loginId, String loginType) { + return getAuth(loginId.toString(), authRolePrefix); + } + + private List getAuth(String loginId, String prefix) { + String authKey = redisUtil.buildKey(prefix, loginId.toString()); + String authValue = redisUtil.get(authKey); + if (StringUtils.isBlank(authValue)) { + return Collections.emptyList(); + } + List authList = new LinkedList<>(); + if (authRolePrefix.equals(prefix)) { + List roleList = new Gson().fromJson(authValue, new TypeToken>() { + }.getType()); + authList = roleList.stream().map(AuthRole::getRoleKey).collect(Collectors.toList()); + } else if (authPermissionPrefix.equals(prefix)) { + List permissionList = new Gson().fromJson(authValue, new TypeToken>() { + }.getType()); + authList = permissionList.stream().map(AuthPermission::getPermissionKey).collect(Collectors.toList()); + } + return authList; + } + +} 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 new file mode 100644 index 0000000..8d13f83 --- /dev/null +++ b/schisandra-cloud-storage-gateway/src/main/java/com/schisandra/gateway/entity/AuthPermission.java @@ -0,0 +1,53 @@ +package com.schisandra.gateway.entity; + +import lombok.Data; + +import java.io.Serializable; +import java.util.Date; + +/** + * (AuthPermission)实体类 + * + * @author landaiqing + */ +@Data +public class AuthPermission implements Serializable { + private Long id; + + private String name; + + private Long parentId; + + private Integer type; + + private String menuUrl; + + private Integer status; + + private Integer show; + + private String icon; + + private String permissionKey; + /** + * 创建人 + */ + private String createdBy; + /** + * 创建时间 + */ + private Date createdTime; + /** + * 更新人 + */ + private String updateBy; + /** + * 更新时间 + */ + private Date updateTime; + + private Integer isDeleted; + + +} + 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 new file mode 100644 index 0000000..b61acd6 --- /dev/null +++ b/schisandra-cloud-storage-gateway/src/main/java/com/schisandra/gateway/entity/AuthRole.java @@ -0,0 +1,42 @@ +package com.schisandra.gateway.entity; + +import lombok.Data; + +import java.io.Serializable; +import java.util.Date; + +/** + * (AuthRole)实体类 + * + * @author landaiqing + * @since 2024-2-18 18:55:50 + */ +@Data +public class AuthRole implements Serializable { + + private Long id; + + private String roleName; + + private String roleKey; + /** + * 创建人 + */ + private String createdBy; + /** + * 创建时间 + */ + private Date createdTime; + /** + * 更新人 + */ + private String updateBy; + /** + * 更新时间 + */ + private Date updateTime; + + private Integer isDeleted; + +} + diff --git a/schisandra-cloud-storage-gateway/src/main/java/com/schisandra/gateway/entity/Result.java b/schisandra-cloud-storage-gateway/src/main/java/com/schisandra/gateway/entity/Result.java new file mode 100644 index 0000000..5b8713a --- /dev/null +++ b/schisandra-cloud-storage-gateway/src/main/java/com/schisandra/gateway/entity/Result.java @@ -0,0 +1,59 @@ +package com.schisandra.gateway.entity; + +import com.schisandra.gateway.enums.ResultCodeEnum; +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; + } + + public static Result fail(Integer code,String message){ + Result result = new Result(); + result.setSuccess(false); + result.setCode(code); + result.setMessage(message); + return result; + } + +} diff --git a/schisandra-cloud-storage-gateway/src/main/java/com/schisandra/gateway/enums/ResultCodeEnum.java b/schisandra-cloud-storage-gateway/src/main/java/com/schisandra/gateway/enums/ResultCodeEnum.java new file mode 100644 index 0000000..3addbda --- /dev/null +++ b/schisandra-cloud-storage-gateway/src/main/java/com/schisandra/gateway/enums/ResultCodeEnum.java @@ -0,0 +1,24 @@ +package com.schisandra.gateway.enums; + +import lombok.Getter; + +@Getter +public enum ResultCodeEnum { + SUCCESS(200,"成功"), + FAIL(500,"失败"); + private int code; + private 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-gateway/src/main/java/com/schisandra/gateway/exception/GatewayExceptionHandler.java b/schisandra-cloud-storage-gateway/src/main/java/com/schisandra/gateway/exception/GatewayExceptionHandler.java new file mode 100644 index 0000000..9444e35 --- /dev/null +++ b/schisandra-cloud-storage-gateway/src/main/java/com/schisandra/gateway/exception/GatewayExceptionHandler.java @@ -0,0 +1,55 @@ +package com.schisandra.gateway.exception; + +import cn.dev33.satoken.exception.SaTokenException; +import com.fasterxml.jackson.core.JsonProcessingException; +import com.fasterxml.jackson.databind.ObjectMapper; +import com.schisandra.gateway.entity.Result; +import org.springframework.boot.web.reactive.error.ErrorWebExceptionHandler; +import org.springframework.core.io.buffer.DataBufferFactory; +import org.springframework.http.MediaType; +import org.springframework.http.server.reactive.ServerHttpRequest; +import org.springframework.http.server.reactive.ServerHttpResponse; +import org.springframework.stereotype.Component; +import org.springframework.web.server.ServerWebExchange; +import reactor.core.publisher.Mono; + +/** + * @Classname GatewayExceptionHandler + * @BelongsProject: qing-yu-club + * @BelongsPackage: com.landaiqing.club.gateway.exception + * @Author: landaiqing + * @CreateTime: 2024-05-18 17:52 + * @Description: 网关全局异常处理 + * @Version: 1.0 + */ +@Component +public class GatewayExceptionHandler implements ErrorWebExceptionHandler { + private ObjectMapper objectMapper=new ObjectMapper(); + @Override + public Mono handle(ServerWebExchange serverWebExchange, Throwable throwable) { + ServerHttpRequest request = serverWebExchange.getRequest(); + ServerHttpResponse response = serverWebExchange.getResponse(); + Integer code=200; + String message=""; + if(throwable instanceof SaTokenException){ + code=401; + message="用户无权限"; + }else { + code=500; + message="系统繁忙"; + } + Result result = Result.fail(code, message); + response.getHeaders().setContentType(MediaType.APPLICATION_JSON); + return response.writeWith(Mono.fromSupplier(()->{ + DataBufferFactory dataBufferFactory=response.bufferFactory(); + byte[] bytes=null; + try { + bytes = objectMapper.writeValueAsBytes(result); + } catch (JsonProcessingException e) { + throw new RuntimeException(e); + } + return dataBufferFactory.wrap(bytes); + })); + + } +} 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 new file mode 100644 index 0000000..2461c13 --- /dev/null +++ b/schisandra-cloud-storage-gateway/src/main/java/com/schisandra/gateway/filter/LoginFilter.java @@ -0,0 +1,46 @@ +package com.schisandra.gateway.filter; + +import cn.dev33.satoken.stp.SaTokenInfo; +import cn.dev33.satoken.stp.StpUtil; +import lombok.SneakyThrows; +import lombok.extern.slf4j.Slf4j; +import org.springframework.cloud.gateway.filter.GatewayFilterChain; +import org.springframework.cloud.gateway.filter.GlobalFilter; +import org.springframework.http.server.reactive.ServerHttpRequest; +import org.springframework.stereotype.Component; +import org.springframework.util.StringUtils; +import org.springframework.web.server.ServerWebExchange; +import reactor.core.publisher.Mono; + +/** + * @Classname LoginFilter + * @BelongsProject: qing-yu-club + * @BelongsPackage: com.landaiqing.club.gateway.filter + * @Author: landaiqing + * @CreateTime: 2024-03-03 17:41 + * @Description: 登录拦截器 + * @Version: 1.0 + */ +@Component +@Slf4j +public class LoginFilter implements GlobalFilter { + @Override + @SneakyThrows + public Mono filter(ServerWebExchange exchange, GatewayFilterChain chain) { + ServerHttpRequest request = exchange.getRequest(); + ServerHttpRequest.Builder mutate = request.mutate(); + String url = request.getURI().getPath(); + log.info("LoginFilter.filter.url:{}", url); + if (url.equals("/user/doLogin") || url.equals("/user/getUserInfo")) { + return chain.filter(exchange); + } + SaTokenInfo tokenInfo = StpUtil.getTokenInfo(); + String loginId = (String) tokenInfo.getLoginId(); + if (StringUtils.isEmpty(loginId)) { + throw new Exception("未获取到用户信息"); + } + mutate.header("loginId", loginId); + + return chain.filter(exchange.mutate().request(mutate.build()).build()); + } +} 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 new file mode 100644 index 0000000..2e505fb --- /dev/null +++ b/schisandra-cloud-storage-gateway/src/main/java/com/schisandra/gateway/redis/RedisConfig.java @@ -0,0 +1,49 @@ +package com.schisandra.gateway.redis; + +import com.fasterxml.jackson.annotation.JsonAutoDetect; +import com.fasterxml.jackson.annotation.JsonTypeInfo; +import com.fasterxml.jackson.annotation.PropertyAccessor; +import com.fasterxml.jackson.databind.DeserializationFeature; +import com.fasterxml.jackson.databind.ObjectMapper; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; +import org.springframework.data.redis.connection.RedisConnectionFactory; +import org.springframework.data.redis.core.RedisTemplate; +import org.springframework.data.redis.serializer.Jackson2JsonRedisSerializer; +import org.springframework.data.redis.serializer.RedisSerializer; +import org.springframework.data.redis.serializer.StringRedisSerializer; + +/** + * @Classname RedisConfig + * @BelongsProject: qing-yu-club + * @BelongsPackage: com.landaiqing.club.gateway.redis + * @Author: landaiqing + * @CreateTime: 2024-02-18 18:10 + * @Description: redis的config处理 + * @Version: 1.0 + */ +@Configuration +public class RedisConfig { + @Bean + public RedisTemplate redisTemplate(RedisConnectionFactory redisConnectionFactory) { + RedisTemplate redisTemplate = new RedisTemplate<>(); + RedisSerializer redisSerializer = new StringRedisSerializer(); + redisTemplate.setConnectionFactory(redisConnectionFactory); + redisTemplate.setKeySerializer(redisSerializer); + redisTemplate.setHashKeySerializer(redisSerializer); + redisTemplate.setValueSerializer(jackson2JsonRedisSerializer()); + redisTemplate.setHashValueSerializer(jackson2JsonRedisSerializer()); + return redisTemplate; + } + + private Jackson2JsonRedisSerializer jackson2JsonRedisSerializer() { + Jackson2JsonRedisSerializer jsonRedisSerializer = new Jackson2JsonRedisSerializer<>(Object.class); + ObjectMapper objectMapper = new ObjectMapper(); + objectMapper.setVisibility(PropertyAccessor.ALL, JsonAutoDetect.Visibility.ANY); + objectMapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false); + objectMapper.enableDefaultTyping(ObjectMapper.DefaultTyping.NON_FINAL, JsonTypeInfo.As.PROPERTY); + jsonRedisSerializer.setObjectMapper(objectMapper); + return jsonRedisSerializer; + } + +} 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 new file mode 100644 index 0000000..cf08e0b --- /dev/null +++ b/schisandra-cloud-storage-gateway/src/main/java/com/schisandra/gateway/redis/RedisUtil.java @@ -0,0 +1,107 @@ +package com.schisandra.gateway.redis; + +import lombok.extern.slf4j.Slf4j; +import org.springframework.data.redis.core.RedisTemplate; +import org.springframework.stereotype.Component; + +import javax.annotation.Resource; +import java.util.Set; +import java.util.concurrent.TimeUnit; +import java.util.stream.Collectors; +import java.util.stream.Stream; + +/** + * RedisUtil工具类 + * + * @author: landaiqing + * @date: 2024/2/19 + */ +@Component +@Slf4j +public class RedisUtil { + + @Resource + private RedisTemplate redisTemplate; + + private static final String CACHE_KEY_SEPARATOR = "."; + + /** + * 构建缓存key + */ + public String buildKey(String... strObjs) { + return Stream.of(strObjs).collect(Collectors.joining(CACHE_KEY_SEPARATOR)); + } + + /** + * 是否存在key + */ + public boolean exist(String key) { + return redisTemplate.hasKey(key); + } + + /** + * 删除key + */ + public boolean del(String key) { + return redisTemplate.delete(key); + } + + /** + * set(不带过期) + */ + public void set(String key, String value) { + redisTemplate.opsForValue().set(key, value); + } + + /** + * set(带过期) + */ + public boolean setNx(String key, String value, Long time, TimeUnit timeUnit) { + return redisTemplate.opsForValue().setIfAbsent(key, value, time, timeUnit); + } + + /** + * 获取string类型缓存 + */ + public String get(String key) { + return (String) redisTemplate.opsForValue().get(key); + } + + public Boolean zAdd(String key, String value, Long score) { + return redisTemplate.opsForZSet().add(key, value, Double.valueOf(String.valueOf(score))); + } + + public Long countZset(String key) { + return redisTemplate.opsForZSet().size(key); + } + + public Set rangeZset(String key, long start, long end) { + return redisTemplate.opsForZSet().range(key, start, end); + } + + public Long removeZset(String key, Object value) { + return redisTemplate.opsForZSet().remove(key, value); + } + + public void removeZsetList(String key, Set value) { + value.stream().forEach((val) -> redisTemplate.opsForZSet().remove(key, val)); + } + + public Double score(String key, Object value) { + return redisTemplate.opsForZSet().score(key, value); + } + + public Set rangeByScore(String key, long start, long end) { + return redisTemplate.opsForZSet().rangeByScore(key, Double.valueOf(String.valueOf(start)), Double.valueOf(String.valueOf(end))); + } + + public Object addScore(String key, Object obj, double score) { + return redisTemplate.opsForZSet().incrementScore(key, obj, score); + } + + public Object rank(String key, Object obj) { + return redisTemplate.opsForZSet().rank(key, obj); + } + + +} diff --git a/schisandra-cloud-storage-gateway/src/main/resources/application.yml b/schisandra-cloud-storage-gateway/src/main/resources/application.yml new file mode 100644 index 0000000..0bece70 --- /dev/null +++ b/schisandra-cloud-storage-gateway/src/main/resources/application.yml @@ -0,0 +1,57 @@ +server: + port: 5000 +spring: + cloud: + gateway: + routes: + - id: oss + uri: lb://schisandra-cloud-storage-oss-dev + predicates: + - Path=/oss/** + filters: + - StripPrefix=1 + - id: auth + uri: lb://schisandra-cloud-storage-auth-dev + predicates: + - Path=/auth/** + filters: + - StripPrefix=1 + # redis配置 + redis: + # Redis数据库索引（默认为0） + database: 1 + # Redis服务器地址 + host: 116.196.80.239 + # Redis服务器连接端口 + port: 6379 + # Redis服务器连接密码（默认为空） + password: LDQ20020618xxx + # 连接超时时间 + timeout: 2s + lettuce: + pool: + # 连接池最大连接数 + max-active: 200 + # 连接池最大阻塞等待时间（使用负值表示没有限制） + max-wait: -1ms + # 连接池中的最大空闲连接 + max-idle: 10 + # 连接池中的最小空闲连接 + min-idle: 0 +############## Sa-Token 配置 (文档: https://sa-token.cc) ############## +sa-token: + # token 名称（同时也是 cookie 名称） + token-name: token + # token 有效期（单位：秒） 默认30天，-1 代表永久有效 + timeout: 2592000 + # token 最低活跃频率（单位：秒），如果 token 超过此时间没有访问系统就会被冻结，默认-1 代表不限制，永不冻结 + active-timeout: -1 + # 是否允许同一账号多地同时登录 （为 true 时允许一起登录, 为 false 时新登录挤掉旧登录） + is-concurrent: true + # 在多人登录同一账号时，是否共用一个 token （为 true 时所有登录共用一个 token, 为 false 时每次登录新建一个 token） + is-share: true + # token 风格（默认可取值：uuid、simple-uuid、random-32、random-64、random-128、tik） + token-style: random-32 + # 是否输出操作日志 + is-log: true + token-prefix: schisandra \ No newline at end of file diff --git a/schisandra-cloud-storage-gateway/src/main/resources/bootstrap.yml b/schisandra-cloud-storage-gateway/src/main/resources/bootstrap.yml new file mode 100644 index 0000000..cd94ae5 --- /dev/null +++ b/schisandra-cloud-storage-gateway/src/main/resources/bootstrap.yml @@ -0,0 +1,17 @@ +spring: + application: + name: schisandra-cloud-storage-gateway-dev + profiles: + active: dev + cloud: + nacos: + config: + server-addr: 116.196.80.239:8848 + prefix: ${spring.application.name} + group: DEFAULT_GROUP + namespace: + file-extension: yaml + discovery: + enabled: true + server-addr: 116.196.80.239:8848 + From 66cd9ac1971f85ae4e1c176e15c23538b217fc6a Mon Sep 17 00:00:00 2001 From: landaiqing <3517283258@qq.com> Date: Wed, 8 May 2024 20:01:36 +0800 Subject: [PATCH 25/27] feat: update sms module --- .../SchisandraAuthUserController.java | 4 -- .../controller/SchisandraSmsController.java | 31 +++++++++++++ .../auth/common/config/SmsConfig.java | 44 +++++++++++++++++++ .../src/main/resources/application.yml | 31 ++++--------- 4 files changed, 83 insertions(+), 27 deletions(-) create mode 100644 schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-application/schisandra-cloud-storage-auth-application-controller/src/main/java/com/schisandra/auth/application/controller/SchisandraSmsController.java create mode 100644 schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-common/src/main/java/com/schisandra/auth/common/config/SmsConfig.java diff --git a/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-application/schisandra-cloud-storage-auth-application-controller/src/main/java/com/schisandra/auth/application/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 d926d01..d70309f 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 @@ -1,16 +1,13 @@ package com.schisandra.auth.application.controller; import com.alibaba.fastjson.JSON; -import com.google.common.base.Preconditions; import com.schisandra.auth.application.convert.SchisandraAuthUserDTOConverter; import com.schisandra.auth.application.dto.SchisandraAuthUserDTO; import com.schisandra.auth.common.entity.Result; import com.schisandra.auth.domain.bo.SchisandraAuthUserBO; import com.schisandra.auth.domain.service.SchisandraAuthUserDomainService; import lombok.extern.slf4j.Slf4j; -import org.apache.commons.lang3.StringUtils; import org.springframework.web.bind.annotation.*; - import javax.annotation.Resource; /** @@ -28,7 +25,6 @@ import javax.annotation.Resource; public class SchisandraAuthUserController { @Resource private SchisandraAuthUserDomainService schisandraAuthUserDomainService; - /** * @description 更新用户信息 * @param 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 new file mode 100644 index 0000000..de547d8 --- /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/controller/SchisandraSmsController.java @@ -0,0 +1,31 @@ +package com.schisandra.auth.application.controller; + +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; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +/** + * @Classname SchisandraSmsController + * @BelongsProject: schisandra-cloud-storage + * @BelongsPackage: com.schisandra.auth.application.controller + * @Author: landaiqing + * @CreateTime: 2024-05-08 01:41 + * @Description: TODO + * @Version: 1.0 + */ +@RestController +@RequestMapping("/sms/") +@Slf4j +public class SchisandraSmsController { + + @GetMapping("send") + public SmsResponse send(String phone){ + SmsBlend smsBlend =SmsFactory.getSmsBlend(); + return smsBlend.sendMessage(phone, "1234"); + } +} diff --git a/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-common/src/main/java/com/schisandra/auth/common/config/SmsConfig.java b/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-common/src/main/java/com/schisandra/auth/common/config/SmsConfig.java new file mode 100644 index 0000000..fb8d835 --- /dev/null +++ b/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-common/src/main/java/com/schisandra/auth/common/config/SmsConfig.java @@ -0,0 +1,44 @@ +package com.schisandra.auth.common.config; + +import org.dromara.sms4j.aliyun.config.AlibabaConfig; +import org.dromara.sms4j.core.datainterface.SmsReadConfig; +import org.dromara.sms4j.provider.config.BaseConfig; +import org.dromara.sms4j.unisms.config.UniConfig; +import org.springframework.stereotype.Component; + +import java.util.List; + +/** + * @Classname SmsConfig + * @BelongsProject: schisandra-cloud-storage + * @BelongsPackage: com.schisandra.auth.common.config + * @Author: landaiqing + * @CreateTime: 2024-05-08 18:46 + * @Description: TODO + * @Version: 1.0 + */ +@Component +public class SmsConfig implements SmsReadConfig { + + //这里的configId指的是框架在调用该接口方法时候会传递进来的参数，用户可以根据此参数作为标准来动态的进行查询 + @Override + public BaseConfig getSupplierConfig(String configId) { + + AlibabaConfig alibabaConfig=new AlibabaConfig(); + alibabaConfig.setConfigId("alibaba"); + alibabaConfig.setRequestUrl("dysmsapi.aliyuncs.com"); + alibabaConfig.setAccessKeyId("LTAI5tDy2edL9LhW43rnus69"); + alibabaConfig.setAccessKeySecret("YWp44dcFrBICrjZgqvJBE7ZHArZfIP"); + alibabaConfig.setSignature("阿里云短信测试"); + alibabaConfig.setTemplateId("SMS_154950909"); + alibabaConfig.setTemplateName("code"); + alibabaConfig.setSdkAppId("sms"); + return alibabaConfig; + } + + @Override + public List getSupplierConfigList() { + //此处仅为示例，实际环境中，数据可以来自任意位置， + return null; + } +} diff --git a/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-starter/src/main/resources/application.yml b/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-starter/src/main/resources/application.yml index 01dae60..4cdce4b 100644 --- a/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-starter/src/main/resources/application.yml +++ b/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-starter/src/main/resources/application.yml @@ -71,27 +71,12 @@ sa-token: token-prefix: schisandra sms: - # 标注从yml读取配置0 - # 自定义的标识，也就是configId这里可以是任意值（最好不要是中文） - alibaba: - #厂商标识，标定此配置是哪个厂商，详细请看厂商标识介绍部分 - supplier: alibaba - #您的accessKey - access-key-id: LTAI5tDy2edL9LhW43rnus69 - #您的accessKeySecret - access-key-secret: YWp44dcFrBICrjZgqvJBE7ZHArZfIP - #您的短信签名 - signature: 阿里云短信测试 - #模板ID 非必须配置，如果使用sendMessage的快速发送需此配置 - template-id: SMS_154950909 - template-name: code - #您的sdkAppId - sdk-app-id: sms - requestUrl: dysmsapi.aliyuncs.com -# # 接口方法默认为 SendSms 如无特殊改变可以不用设置 -# action: SendSms -# # 接口版本号默认为 2017-05-25 如无特殊改变可以不用设置 -# version: 2017-05-25 -# # 地域信息默认为 cn-hangzhou 如无特殊改变可以不用设置 -# regionId: cn-hangzhou + # 标注从yml读取配置 + config-type: interface + restricted: true + accountMax: 10 + minuteMax: 1 + isPrint: false + HttpLog: true + From 14cfec6f3dac2bc5ec755a31957668cf545fc110 Mon Sep 17 00:00:00 2001 From: zlg <482370576@qq.com> Date: Wed, 8 May 2024 20:06:11 +0800 Subject: [PATCH 26/27] feat: update --- .../controller/EncryptController.java | 52 ---- .../application/filter/EncryptApiFilter.java | 100 ------- .../wrapper/EncryptRequestWrapper.java | 257 ------------------ .../application/wrapper/ResponseWrapper.java | 114 -------- 4 files changed, 523 deletions(-) delete mode 100644 schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-application/schisandra-cloud-storage-auth-application-controller/src/main/java/com/schisandra/auth/application/controller/EncryptController.java delete mode 100644 schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-application/schisandra-cloud-storage-auth-application-controller/src/main/java/com/schisandra/auth/application/filter/EncryptApiFilter.java delete mode 100644 schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-application/schisandra-cloud-storage-auth-application-controller/src/main/java/com/schisandra/auth/application/wrapper/EncryptRequestWrapper.java delete mode 100644 schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-application/schisandra-cloud-storage-auth-application-controller/src/main/java/com/schisandra/auth/application/wrapper/ResponseWrapper.java diff --git a/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-application/schisandra-cloud-storage-auth-application-controller/src/main/java/com/schisandra/auth/application/controller/EncryptController.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/EncryptController.java deleted file mode 100644 index ccfe8ce..0000000 --- a/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-application/schisandra-cloud-storage-auth-application-controller/src/main/java/com/schisandra/auth/application/controller/EncryptController.java +++ /dev/null @@ -1,52 +0,0 @@ -package com.schisandra.auth.application.controller; - -import com.schisandra.auth.common.entity.Result; -import com.schisandra.auth.common.redis.RedisUtil; -import com.schisandra.auth.common.utils.MD5Util; -import com.schisandra.auth.common.utils.RSAUtils; -import lombok.extern.slf4j.Slf4j; -import org.apache.commons.lang3.StringUtils; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; - -import javax.annotation.Resource; -import java.util.Map; - -/** - * @ClassName EncryptController - * @Description TODO - * @Author L - * @Date 2024/1/29 9:18 - */ -@RestController -@RequestMapping("/encrypt") -@Slf4j -public class EncryptController { - @Resource - private RedisUtil redisUtil; - private String authPublicKeyPrefix = "auth.publicKey"; - private String authPrivateKeyPrefix = "auth.privateKey"; - - @PostMapping("/getPublicKey") - public Result getPublicKey() throws Exception { - //获取当前登陆账号对应的token,这行代码就不贴了。 - String token="12345"; - String publicKey=""; - if (StringUtils.isNotBlank(token)) { - Map stringStringMap = RSAUtils.genKeyPair(); - publicKey = stringStringMap.get("publicKey"); - String privateKey = stringStringMap.get("privateKey"); - String md5Token = MD5Util.md5(token); - //这个地方的存放时间根据你的token存放时间走 - redisUtil.set(md5Token + "publicKey", publicKey); - redisUtil.set(md5Token + "privateKey", privateKey); - return Result.ok(publicKey); - } - return Result.ok(publicKey); - } - -} - 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/filter/EncryptApiFilter.java b/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-application/schisandra-cloud-storage-auth-application-controller/src/main/java/com/schisandra/auth/application/filter/EncryptApiFilter.java deleted file mode 100644 index 8bcbb28..0000000 --- a/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-application/schisandra-cloud-storage-auth-application-controller/src/main/java/com/schisandra/auth/application/filter/EncryptApiFilter.java +++ /dev/null @@ -1,100 +0,0 @@ -package com.schisandra.auth.application.filter; - -import cn.hutool.core.util.StrUtil; -import cn.hutool.extra.servlet.ServletUtil; -import cn.hutool.json.JSONUtil; -import com.alibaba.fastjson.JSON; -import com.schisandra.auth.application.wrapper.EncryptRequestWrapper; -import com.schisandra.auth.application.wrapper.ResponseWrapper; -import com.schisandra.auth.common.entity.ApiEncryptRes; -import com.schisandra.auth.common.utils.ApiSecurityUtils; -import lombok.SneakyThrows; -import lombok.extern.slf4j.Slf4j; -import org.apache.commons.lang3.StringUtils; -import org.springframework.boot.web.servlet.filter.OrderedFilter; -import org.springframework.stereotype.Component; -import org.springframework.web.filter.OncePerRequestFilter; - -import javax.servlet.FilterChain; -import javax.servlet.ServletException; -import javax.servlet.ServletOutputStream; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import java.io.IOException; -import java.nio.charset.StandardCharsets; - -@Slf4j -@Component -public class EncryptApiFilter extends OncePerRequestFilter implements OrderedFilter { - public static final int DEFAULT_ORDER = Integer.MAX_VALUE; - - - @Override - protected void doFilterInternal(HttpServletRequest request, HttpServletResponse response, FilterChain filterChain) throws ServletException, IOException { - String servletPath = request.getServletPath(); - - ResponseWrapper wrapper = new ResponseWrapper(response); - String requestContent = null; - - if (ServletUtil.isMultipart(request)) { - } else { - EncryptRequestWrapper encryptRequestWrapper = EncryptRequestWrapper.newOrGetMultiReadHttpServletRequest(request); - requestContent = encryptRequestWrapper.getBody(); - request = encryptRequestWrapper; - - } - log.debug("{}>>>{}", servletPath, requestContent); - - try { - filterChain.doFilter(request, wrapper); - } finally { - try { - process(request, wrapper, response); - } catch (Exception e) { - log.error("AesFilter error", e); - } - } - } - - @SneakyThrows - protected void process(HttpServletRequest request, ResponseWrapper responseWrapper, HttpServletResponse response) { - - String servletPath = request.getRequestURI(); - String isencrypt = request.getHeader("Isencrypt"); - ServletOutputStream out = response.getOutputStream(); - if (ResponseWrapper.isJsonContentType(responseWrapper.getContentType())) { - String responseContent = responseWrapper.getTextContent(); - if (StrUtil.isNotEmpty(responseContent)&&StringUtils.isNotBlank(isencrypt)) { - String JSPublicKey = ((EncryptRequestWrapper)request).getJSPublicKey(); - if (StringUtils.isNotBlank(JSPublicKey)) { - ApiEncryptRes apiEncryptRes = ApiSecurityUtils.encrypt(JSON.toJSONString(responseContent), JSPublicKey); - responseContent = JSONUtil.toJsonStr(apiEncryptRes); - } - log.info("{}<<<{}", servletPath, responseContent); - byte[] bytes = responseContent.getBytes(StandardCharsets.UTF_8); - response.setContentLength(bytes.length); - out.write(bytes); - out.flush(); - out.close(); - } else { - responseWrapper.getByteArrayOutputStream().writeTo(out); - out.flush(); - out.close(); - } - } else { - responseWrapper.getByteArrayOutputStream().writeTo(out); - out.flush(); - out.close(); - } - } - - @Override - public void afterPropertiesSet() throws ServletException { - super.afterPropertiesSet(); - } - - @Override - public int getOrder() { - return DEFAULT_ORDER; - } -} 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/wrapper/EncryptRequestWrapper.java b/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-application/schisandra-cloud-storage-auth-application-controller/src/main/java/com/schisandra/auth/application/wrapper/EncryptRequestWrapper.java deleted file mode 100644 index 89c256a..0000000 --- a/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-application/schisandra-cloud-storage-auth-application-controller/src/main/java/com/schisandra/auth/application/wrapper/EncryptRequestWrapper.java +++ /dev/null @@ -1,257 +0,0 @@ -package com.schisandra.auth.application.wrapper; - -import cn.hutool.core.convert.Convert; -import com.alibaba.fastjson.JSONObject; -import com.schisandra.auth.common.redis.RedisUtil; -import com.schisandra.auth.common.utils.ApiSecurityUtils; -import com.schisandra.auth.common.utils.MD5Util; -import lombok.extern.slf4j.Slf4j; -import org.apache.commons.lang3.StringUtils; - -import javax.servlet.ReadListener; -import javax.servlet.ServletInputStream; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletRequestWrapper; -import java.io.*; - - -import cn.hutool.core.io.FastByteArrayOutputStream; -import cn.hutool.core.io.IoUtil; -import cn.hutool.core.lang.Assert; -import cn.hutool.http.ContentType; - - -import lombok.SneakyThrows; -import org.springframework.web.context.WebApplicationContext; -import org.springframework.web.context.support.WebApplicationContextUtils; -import org.springframework.web.multipart.support.StandardServletMultipartResolver; -import org.springframework.web.util.WebUtils; - - -import java.util.TreeMap; - -/** - * @ClassName requestWrapper - * @Description TODO - * @Author landaiqing - * @Date 2024/1/31 17:58 - */ - -/** - * 确保request可以多次读取 - */ - -@Slf4j -public class EncryptRequestWrapper extends HttpServletRequestWrapper { - - - - //2024-02-02由于在过滤器中无法直接通过Autowired获取Bean,因此需要通过spring上下文来获取IOC管理的实体类 -// @Autowired -// private RedisUtil redisUtil; - - protected FastByteArrayOutputStream cachedContent; - protected String JSPublicKey; - protected EncryptRequestWrapper(HttpServletRequest request ) { - - super(request); - RedisUtil redisUtils =getBean(RedisUtil.class, request); - this.copyBody(redisUtils); - - - } - - /** - * - * 此处主要是用于读取 RedisUtil - * @param clazz - * @param request - * @param - * @return - */ - public T getBean(Class clazz, HttpServletRequest request){ - WebApplicationContext applicationContext = WebApplicationContextUtils.getRequiredWebApplicationContext(request.getServletContext()); - return applicationContext.getBean(clazz); - } - - public static EncryptRequestWrapper newOrGetMultiReadHttpServletRequest(HttpServletRequest request) { - EncryptRequestWrapper multiReadHttpServletRequest = getMultiReadHttpServletRequest(request); - if (null != multiReadHttpServletRequest) { - return multiReadHttpServletRequest; - } else { - String contentType = request.getContentType(); - if (contentType != null && contentType.contains(ContentType.MULTIPART.getValue())) { - // 将转化后的 request 放入过滤链中 - request = new StandardServletMultipartResolver().resolveMultipart(request); - } - return new EncryptRequestWrapper(request); - } - } - - public static EncryptRequestWrapper getMultiReadHttpServletRequest(HttpServletRequest request) { - EncryptRequestWrapper nativeRequest = WebUtils.getNativeRequest(request, EncryptRequestWrapper.class); - if (null != nativeRequest) { - return nativeRequest; - } else if (request instanceof EncryptRequestWrapper) { - return (EncryptRequestWrapper) request; - } else { - return null; - } - } - //重新读取请求，因为request只可以被读取一次，需要重新设置为可多次读取 - @SneakyThrows - protected void copyBody(RedisUtil redisUtils) { - int length = this.getContentLength(); - if (length > 0) { - cachedContent = IoUtil.read(getRequest().getInputStream()); - if (StringUtils.isNotBlank(this.getHeader("isEncrypt"))&&StringUtils.isNotBlank(this.getHeader("Authorization"))) { - String body = new String(cachedContent.toByteArray()); - log.info("------------------- body = " + body + "------------------------"); - if (StringUtils.isNotBlank(body)) { - JSONObject jsonBody = JSONObject.parseObject(body); - if(null != jsonBody){ - String dataEncrypt = jsonBody.getString("data"); - String aeskey = jsonBody.getString("aeskey"); - JSPublicKey = jsonBody.getString("frontPublicKey"); - String data; - JSONObject json = null; - log.info("------------------- dataEncrypt = " + dataEncrypt + "------------------------"); - log.info("------------------- aesKey = " + aeskey + "------------------------"); - String token = this.getHeader("Authorization"); - String md5Token = MD5Util.md5(token); - String privateKey = Convert.toStr(redisUtils.get(md5Token + "privateKey")); - data = ApiSecurityUtils.decrypt(aeskey, dataEncrypt,privateKey); - // 如果数据不为空就编译 - if (StringUtils.isNotBlank(data)) { - //如果参数为空前端传回undefined - if ("undefined".equalsIgnoreCase(data)) { - json = new JSONObject(); - } else { - json = JSONObject.parseObject(data); - } - } - if (json != null) { - body = json.toJSONString(); - } - } - log.info("------------------- body = " + body + "------------------------"); - cachedContent.reset(); - cachedContent.write( body.getBytes(), 0, body.getBytes().length); - - } - } - } else { - cachedContent = new FastByteArrayOutputStream(); - } - } - - @Override - public int getContentLength() { - if (null != cachedContent) { - return cachedContent.size(); - } - return super.getContentLength(); - } - - public byte[] getByteArrayBody() { - return cachedContent.toByteArray(); - } - - public String getBody() { - String body = null; - if (cachedContent != null && cachedContent.size() > 0) { - body = new String(cachedContent.toByteArray()); - } - return body; - } - - public String getSortBody() { - return JSONObject.toJSONString(this.getBody(TreeMap.class)); - } - - public T getBody(Class type) { - return cn.hutool.json.JSONUtil.toBean(this.getBody(), type); - } - - //这个方法为获取前端给后端用于加密aeskey的rsa公钥 - public String getJSPublicKey(){ - return JSPublicKey; - } - @Override - public BufferedReader getReader() throws IOException { - return new BufferedReader(new InputStreamReader(getInputStream())); - } - - @Override - public ServletInputStream getInputStream() throws IOException { - if (this.getContentLength() < 1) { - return super.getInputStream(); - } - return new ResettableServletInputStream(new ByteArrayInputStream(cachedContent.toByteArray())); - } - - private class ResettableServletInputStream extends ServletInputStream { - - private final InputStream sourceStream; - - private boolean finished = false; - - - /** - * Create a DelegatingServletInputStream for the given source stream. - * - * @param sourceStream the source stream (never {@code null}) - */ - public ResettableServletInputStream(InputStream sourceStream) { - Assert.notNull(sourceStream, "Source InputStream must not be null"); - this.sourceStream = sourceStream; - } - - /** - * Return the underlying source stream (never {@code null}). - */ - public final InputStream getSourceStream() { - return this.sourceStream; - } - - - @Override - public int read() throws IOException { - int data = this.sourceStream.read(); - if (data == -1) { - this.finished = true; - } - return data; - } - - @Override - public int available() throws IOException { - return this.sourceStream.available(); - } - - @Override - public void close() throws IOException { - super.close(); - this.sourceStream.close(); - } - - @Override - public boolean isFinished() { - return finished; - } - - @Override - public boolean isReady() { - return true; - } - - @Override - public void setReadListener(ReadListener readListener) { - - } - } - - - -} - 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/wrapper/ResponseWrapper.java b/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-application/schisandra-cloud-storage-auth-application-controller/src/main/java/com/schisandra/auth/application/wrapper/ResponseWrapper.java deleted file mode 100644 index 10f6eed..0000000 --- a/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-application/schisandra-cloud-storage-auth-application-controller/src/main/java/com/schisandra/auth/application/wrapper/ResponseWrapper.java +++ /dev/null @@ -1,114 +0,0 @@ -package com.schisandra.auth.application.wrapper; - -import cn.hutool.core.util.StrUtil; -import lombok.extern.slf4j.Slf4j; -import org.springframework.http.MediaType; - -import javax.servlet.ServletOutputStream; -import javax.servlet.WriteListener; -import javax.servlet.http.HttpServletResponse; -import javax.servlet.http.HttpServletResponseWrapper; -import java.io.ByteArrayOutputStream; -import java.io.IOException; -import java.io.PrintWriter; -/** * 返回值输出代理类 - * @ClassName ResponseWrapper - * @Description TODO - * @Author L - * @Date 2024/1/31 18:58 - */ - -@Slf4j -public class ResponseWrapper extends HttpServletResponseWrapper { - ByteArrayOutputStream _stream = new ByteArrayOutputStream(); - PrintWriter _pw = new PrintWriter(_stream); - - public ResponseWrapper(HttpServletResponse resp) throws IOException { - super(resp); - } - - /** - * 覆盖getWriter()方法，将字符流缓冲到本地 - */ - @Override - public PrintWriter getWriter() throws IOException { - return _pw; - } - - /** - * 覆盖getOutputStream()方法，将字节流缓冲到本地 - */ - @Override - public ServletOutputStream getOutputStream() throws IOException { - return new ServletOutputStream() { - @Override - public boolean isReady() { - return false; - } - - @Override - public void setWriteListener(WriteListener writeListener) { - - } - - @Override - public void write(int b) throws IOException { - _stream.write(b); - } - }; - } - - /** - * 把缓冲区内容写入输出流后关闭 - * - * @author xxj - */ - public void flush() { - try { - _pw.flush(); - _pw.close(); - _stream.flush(); - _stream.close(); - } catch (IOException e) { - log.error("", e); - } - } - - /** - * 获取字节流 - * - * @return - */ - public ByteArrayOutputStream getByteArrayOutputStream() { - return _stream; - } - - /** - * 将换出区内容转为文本输出 - * - * @return - */ - public String getTextContent() { - flush(); - return _stream.toString(); - } - - public static boolean isTextContentType(String contentType) { - boolean flag = false; - if (StrUtil.isBlank(contentType)) { - return false; - } else { - flag = StrUtil.startWithIgnoreCase(contentType, "text"); - if (!flag) { - flag = isJsonContentType(contentType); - } - } - return flag; - } - - public static boolean isJsonContentType(String contentType) { - return !StrUtil.isBlank(contentType) - && (StrUtil.containsIgnoreCase(contentType, "application/problem+json") - || StrUtil.containsIgnoreCase(contentType, MediaType.APPLICATION_JSON_VALUE)); - } -} From c0075ef88a780cb6d5cbdae57eed39fa516a6563 Mon Sep 17 00:00:00 2001 From: zlg <482370576@qq.com> Date: Wed, 8 May 2024 23:08:29 +0800 Subject: [PATCH 27/27] =?UTF-8?q?feat:=20=E7=9F=AD=E4=BF=A1=E9=AA=8C?= =?UTF-8?q?=E8=AF=81=E6=A8=A1=E5=9D=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../application/config/SmsInitConfig.java | 32 ++ .../application/config/SmsReadConfig.java | 89 ++++ .../application/controller/SmsController.java | 49 +- .../SchisandraSmsConfigDTOConvert.java | 43 ++ .../dto/SchisandraSmsConfigDTO.java | 155 ++++++ .../auth/common/config/SmsConfig.java | 44 -- .../auth/common/utils/RedisUtils.java | 86 --- .../domain/bo/SchisandraAuthPermissionBO.java | 3 +- .../auth/domain/bo/SchisandraSmsConfigBO.java | 155 ++++++ .../convert/SchisandraSmsConfigBOConvert.java | 48 ++ .../SchisandraSmsConfigDomainService.java | 22 + .../SchisandraSmsConfigDomainServiceImpl.java | 26 + .../basic/dao/SchisandraSmsConfigDao.java | 86 +++ .../basic/entity/SchisandraSmsConfig.java | 174 ++++++ .../service/SchisandraSmsConfigService.java | 60 +++ .../impl/SchisandraSmsConfigServiceImpl.java | 88 +++ .../mapper/SchisandraSmsConfigDao.xml | 499 ++++++++++++++++++ .../src/main/resources/application.yml | 2 +- 18 files changed, 1507 insertions(+), 154 deletions(-) create mode 100644 schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-application/schisandra-cloud-storage-auth-application-controller/src/main/java/com/schisandra/auth/application/config/SmsInitConfig.java create mode 100644 schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-application/schisandra-cloud-storage-auth-application-controller/src/main/java/com/schisandra/auth/application/config/SmsReadConfig.java create mode 100644 schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-application/schisandra-cloud-storage-auth-application-controller/src/main/java/com/schisandra/auth/application/convert/SchisandraSmsConfigDTOConvert.java create mode 100644 schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-application/schisandra-cloud-storage-auth-application-controller/src/main/java/com/schisandra/auth/application/dto/SchisandraSmsConfigDTO.java delete mode 100644 schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-common/src/main/java/com/schisandra/auth/common/config/SmsConfig.java delete mode 100644 schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-common/src/main/java/com/schisandra/auth/common/utils/RedisUtils.java create mode 100644 schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-domain/src/main/java/com/schisandra/auth/domain/bo/SchisandraSmsConfigBO.java create mode 100644 schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-domain/src/main/java/com/schisandra/auth/domain/convert/SchisandraSmsConfigBOConvert.java create mode 100644 schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-domain/src/main/java/com/schisandra/auth/domain/service/SchisandraSmsConfigDomainService.java create mode 100644 schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-domain/src/main/java/com/schisandra/auth/domain/service/impl/SchisandraSmsConfigDomainServiceImpl.java create mode 100644 schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-infra/src/main/java/com/schisandra/auth/infra/basic/dao/SchisandraSmsConfigDao.java create mode 100644 schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-infra/src/main/java/com/schisandra/auth/infra/basic/entity/SchisandraSmsConfig.java create mode 100644 schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-infra/src/main/java/com/schisandra/auth/infra/basic/service/SchisandraSmsConfigService.java create mode 100644 schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-infra/src/main/java/com/schisandra/auth/infra/basic/service/impl/SchisandraSmsConfigServiceImpl.java create mode 100644 schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-infra/src/main/resources/mapper/SchisandraSmsConfigDao.xml 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 new file mode 100644 index 0000000..3d157dc --- /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/config/SmsInitConfig.java @@ -0,0 +1,32 @@ +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){ + System.out.println(schisandraSmsConfig.toString()); + if (schisandraSmsConfig!=null){ + // 创建SmsBlend 短信实例 + SmsFactory.createSmsBlend(smsReadConfig); + }; + }} +} 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 new file mode 100644 index 0000000..ac40ceb --- /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/config/SmsReadConfig.java @@ -0,0 +1,89 @@ +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 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 + * @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; + + @Override + public BaseConfig getSupplierConfig(String configId) { + return null; + + } + + @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; + + } + +} 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/SmsController.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/SmsController.java index 9171d09..9bea211 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/SmsController.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/SmsController.java @@ -1,46 +1,51 @@ package com.schisandra.auth.application.controller; -import com.schisandra.auth.common.utils.RedisUtils; +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.dromara.sms4j.provider.enumerate.SupplierType; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; -import java.util.LinkedHashMap; +import javax.annotation.Resource; + +import static java.util.concurrent.TimeUnit.SECONDS; @RestController @RequestMapping("/sms/") @Slf4j public class SmsController { - @Autowired - private RedisUtils redisUtils; - private final SmsBlend aliSms = SmsFactory.createSmsBlend(SupplierType.ALIBABA); - - @GetMapping("/send") - public SmsResponse send(String phone, String templateId) { - return aliSms.sendMessage(phone, templateId, new LinkedHashMap<>()); - } + @Resource + private RedisUtil redisUtil; + private final String authPhonePrefix="auth.phone"; +/** + * @description: 发送短信验证码 + * @param: [phone] + * @return: com.schisandra.auth.common.entity.Result + * @author zlg + * @date: 2024/5/8 22:53 + */ @GetMapping("/sendByTemplate") - public SmsResponse sendByTemplate(String phone) { -// SmsBlend smsBlend = SmsFactory.getSmsBlend("alibaba"); + public Result sendByTemplate(String phone) { + String prefix = redisUtil.buildKey(authPhonePrefix, phone); String code = SmsCodeUtils.generateValidateCode(4).toString(); -// redisUtils.cacheValue( phone, code, 60); - - SmsResponse smsResponse=aliSms.sendMessage(phone, code); - if (smsResponse.isSuccess()){ - redisUtils.cacheValue( phone, code, 60); - return smsResponse; + if (!redisUtil.exist(prefix)){ + SmsResponse smsResponse=SmsFactory.getBySupplier("alibaba").sendMessage(phone,code); + if (smsResponse.isSuccess()){ + redisUtil.setNx(prefix, code, 60L,SECONDS); + return Result.ok(); + }else { + return Result.fail(); + } }else { - return smsResponse; + return Result.fail("发送频繁，请稍后重试"); } + } } 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 new file mode 100644 index 0000000..3484116 --- /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/convert/SchisandraSmsConfigDTOConvert.java @@ -0,0 +1,43 @@ +package com.schisandra.auth.application.convert; + +import com.schisandra.auth.application.dto.SchisandraSmsConfigDTO; +import com.schisandra.auth.domain.bo.SchisandraSmsConfigBO; +import com.schisandra.auth.infra.basic.entity.SchisandraSmsConfig; +import org.mapstruct.Mapper; +import org.mapstruct.factory.Mappers; + +import java.util.List; + +/** + * (SchisandraSmsConfig)实体类 + * + * @author makejava + * @since 2024-05-08 20:09:54 + */ +@Mapper(componentModel = "spring") +public interface SchisandraSmsConfigDTOConvert { + + SchisandraSmsConfigDTOConvert INSTANCE = Mappers.getMapper(SchisandraSmsConfigDTOConvert.class); + + /** + * @description 将bo转换为实体 + * @param schisandraSmsConfigDTO + * @return com.schisandra.auth.infra.basic.entity.SchisandraAuthUser + * @author landaiqing + * @date 2024/3/21 23:13 + */ + SchisandraSmsConfigBO convertDTOToBO(SchisandraSmsConfigDTO schisandraSmsConfigDTO); + + /** + * @description 将实体转换为bo + * @param schisandraSmsConfigBO + * @return com.schisandra.auth.domain.bo.SchisandraAuthUserBO + * @author landaiqing + * @date 2024/3/21 23:13 + */ + SchisandraSmsConfigDTO convertBOToDTO(SchisandraSmsConfigBO schisandraSmsConfigBO); + + List convertBOToDTOList(List 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 new file mode 100644 index 0000000..33127cc --- /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/dto/SchisandraSmsConfigDTO.java @@ -0,0 +1,155 @@ +package com.schisandra.auth.application.dto; + +import lombok.Data; + +import java.io.Serializable; +import java.util.Date; + +/** + * (SchisandraSmsConfig)实体类 + * + * @author makejava + * @since 2024-05-08 20:09:54 + */ +@Data +public class SchisandraSmsConfigDTO implements Serializable { + + /** + * id + */ + private Integer id; + /** + * 配置id + */ + private String configId; + /** + * 请求地址 + */ + private String requestUrl; + /** + * 模板变量名称 + */ + private String templateName; + /** + * 接口名称 + */ + private String action; + /** + * 地域信息 + */ + private String region; + + private String accessKeyId; + + private String accessKeySecret; + /** + * 厂商名称标识 + */ + private String supplier; + /** + * 短信签名 + */ + private String signature; + + private String sdkAppId; + /** + * 模板ID + */ + private String templateId; + /** + * 权重 + */ + private Integer weight; + /** + * 短信重试次数，默认0次不重试 + */ + private Integer retryInterval; + /** + * 短信重试次数，默认0次不重试 + */ + private Integer maxRetries; + /** + * 厂商的发送数量上限，默认不设置上限 + */ + private Long maximum; + /** + * REST API Base URL + */ + private String baseUrl; + /** + * 请求域名 + */ + private String serverIp; + /** + * 请求端口 + */ + private Integer serverPort; + /** + * 国内短信签名通道号 + */ + private String sender; + /** + * 短信状态报告接收地 + */ + private String statusCallBack; + /** + * APP接入地址 + */ + private String url; + /** + * 模板短信请求地址 + */ + private String templateUrl; + /** + * 验证码短信请求地址 + */ + private String codeUrl; + /** + * 验证码验证请求地址 + */ + private String verifyUrl; + /** + * 是否需要支持短信上行。true:需要，false:不需要false + */ + private String needUp; + /** + * 请求超时时间 + */ + private Integer connTimeout; + /** + * 是否为简易模式 + */ + private String isSimple; + /** + * 短信发送后将向这个地址推送(运营商返回的)发送报告 + */ + private String callbackUrl; + /** + * 企业ID + */ + private Integer mchId; + + private String appKey; + + private Integer appId; + /** + * 版本号 + */ + private String version; + /** + * 单发链接 + */ + private String singleMsgUrl; + /** + * 群发链接 + */ + private String massMsgUrl; + /** + * 签名ID + */ + private String signatureId; + + + +} + diff --git a/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-common/src/main/java/com/schisandra/auth/common/config/SmsConfig.java b/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-common/src/main/java/com/schisandra/auth/common/config/SmsConfig.java deleted file mode 100644 index fb8d835..0000000 --- a/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-common/src/main/java/com/schisandra/auth/common/config/SmsConfig.java +++ /dev/null @@ -1,44 +0,0 @@ -package com.schisandra.auth.common.config; - -import org.dromara.sms4j.aliyun.config.AlibabaConfig; -import org.dromara.sms4j.core.datainterface.SmsReadConfig; -import org.dromara.sms4j.provider.config.BaseConfig; -import org.dromara.sms4j.unisms.config.UniConfig; -import org.springframework.stereotype.Component; - -import java.util.List; - -/** - * @Classname SmsConfig - * @BelongsProject: schisandra-cloud-storage - * @BelongsPackage: com.schisandra.auth.common.config - * @Author: landaiqing - * @CreateTime: 2024-05-08 18:46 - * @Description: TODO - * @Version: 1.0 - */ -@Component -public class SmsConfig implements SmsReadConfig { - - //这里的configId指的是框架在调用该接口方法时候会传递进来的参数，用户可以根据此参数作为标准来动态的进行查询 - @Override - public BaseConfig getSupplierConfig(String configId) { - - AlibabaConfig alibabaConfig=new AlibabaConfig(); - alibabaConfig.setConfigId("alibaba"); - alibabaConfig.setRequestUrl("dysmsapi.aliyuncs.com"); - alibabaConfig.setAccessKeyId("LTAI5tDy2edL9LhW43rnus69"); - alibabaConfig.setAccessKeySecret("YWp44dcFrBICrjZgqvJBE7ZHArZfIP"); - alibabaConfig.setSignature("阿里云短信测试"); - alibabaConfig.setTemplateId("SMS_154950909"); - alibabaConfig.setTemplateName("code"); - alibabaConfig.setSdkAppId("sms"); - return alibabaConfig; - } - - @Override - public List getSupplierConfigList() { - //此处仅为示例，实际环境中，数据可以来自任意位置， - return null; - } -} diff --git a/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-common/src/main/java/com/schisandra/auth/common/utils/RedisUtils.java b/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-common/src/main/java/com/schisandra/auth/common/utils/RedisUtils.java deleted file mode 100644 index f83dd2b..0000000 --- a/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-common/src/main/java/com/schisandra/auth/common/utils/RedisUtils.java +++ /dev/null @@ -1,86 +0,0 @@ -package com.schisandra.auth.common.utils; - -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.springframework.data.redis.core.RedisTemplate; -import org.springframework.data.redis.core.ValueOperations; -import org.springframework.stereotype.Component; - -import javax.annotation.Resource; -import java.util.Set; -import java.util.concurrent.TimeUnit; - -/** - * @author luft-mensch - */ -@Component -public class RedisUtils { - - @Resource - private RedisTemplate redisTemplate; - - private Logger logger = LoggerFactory.getLogger(this.getClass()); - - - public boolean cacheValue(String key, Object value, long time) { - try { - ValueOperations valueOperations = redisTemplate.opsForValue(); - valueOperations.set(key, value); - if (time > 0) { - // 如果有设置超时时间的话 - redisTemplate.expire(key, time, TimeUnit.SECONDS); - } - return true; - } catch (Throwable e) { - logger.error("缓存[" + key + "]失败, value[" + value + "] " + e.getMessage()); - } - return false; - } - - public boolean cacheValue(String key, Object value) { - return cacheValue(key, value, -1); - } - - - public boolean containsKey(String key) { - try { - return redisTemplate.hasKey(key); - } catch (Throwable e) { - logger.error("判断缓存是否存在时失败key[" + key + "]", "err[" + e.getMessage() + "]"); - } - return false; - } - - public Object getValue(String key) { - try { - ValueOperations valueOperations = redisTemplate.opsForValue(); - return valueOperations.get(key); - } catch (Throwable e) { - logger.error("获取缓存时失败key[" + key + "]", "err[" + e.getMessage() + "]"); - } - return null; - } - - - public boolean removeValue(String key) { - try { - redisTemplate.delete(key); - return true; - } catch (Throwable e) { - logger.error("移除缓存时失败key[" + key + "]", "err[" + e.getMessage() + "]"); - } - return false; - } - - public boolean removeKeys(String pattern) { - try { - Set keySet = redisTemplate.keys(pattern + "*"); - redisTemplate.delete(keySet); - return true; - } catch (Throwable e) { - logger.error("移除key[" + pattern + "]前缀的缓存时失败", "err[" + e.getMessage() + "]"); - } - return false; - } - -} \ No newline at end of file diff --git a/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-domain/src/main/java/com/schisandra/auth/domain/bo/SchisandraAuthPermissionBO.java b/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-domain/src/main/java/com/schisandra/auth/domain/bo/SchisandraAuthPermissionBO.java index 866b651..e9b5ba8 100644 --- a/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-domain/src/main/java/com/schisandra/auth/domain/bo/SchisandraAuthPermissionBO.java +++ b/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-domain/src/main/java/com/schisandra/auth/domain/bo/SchisandraAuthPermissionBO.java @@ -13,7 +13,8 @@ import java.util.Date; * @since 2024-04-15 19:04:11 */ @Data -public class SchisandraAuthPermissionBO implements Serializable { +public class +SchisandraAuthPermissionBO implements Serializable { private Long id; 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 new file mode 100644 index 0000000..7d574e5 --- /dev/null +++ b/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-domain/src/main/java/com/schisandra/auth/domain/bo/SchisandraSmsConfigBO.java @@ -0,0 +1,155 @@ +package com.schisandra.auth.domain.bo; + +import lombok.Data; + +import java.io.Serializable; +import java.util.Date; + +/** + * (SchisandraSmsConfig)实体类 + * + * @author makejava + * @since 2024-05-08 20:09:54 + */ +@Data +public class SchisandraSmsConfigBO implements Serializable { + + /** + * id + */ + private Integer id; + /** + * 配置id + */ + private String configId; + /** + * 请求地址 + */ + private String requestUrl; + /** + * 模板变量名称 + */ + private String templateName; + /** + * 接口名称 + */ + private String action; + /** + * 地域信息 + */ + private String region; + + private String accessKeyId; + + private String accessKeySecret; + /** + * 厂商名称标识 + */ + private String supplier; + /** + * 短信签名 + */ + private String signature; + + private String sdkAppId; + /** + * 模板ID + */ + private String templateId; + /** + * 权重 + */ + private Integer weight; + /** + * 短信重试次数，默认0次不重试 + */ + private Integer retryInterval; + /** + * 短信重试次数，默认0次不重试 + */ + private Integer maxRetries; + /** + * 厂商的发送数量上限，默认不设置上限 + */ + private Long maximum; + /** + * REST API Base URL + */ + private String baseUrl; + /** + * 请求域名 + */ + private String serverIp; + /** + * 请求端口 + */ + private Integer serverPort; + /** + * 国内短信签名通道号 + */ + private String sender; + /** + * 短信状态报告接收地 + */ + private String statusCallBack; + /** + * APP接入地址 + */ + private String url; + /** + * 模板短信请求地址 + */ + private String templateUrl; + /** + * 验证码短信请求地址 + */ + private String codeUrl; + /** + * 验证码验证请求地址 + */ + private String verifyUrl; + /** + * 是否需要支持短信上行。true:需要，false:不需要false + */ + private String needUp; + /** + * 请求超时时间 + */ + private Integer connTimeout; + /** + * 是否为简易模式 + */ + private String isSimple; + /** + * 短信发送后将向这个地址推送(运营商返回的)发送报告 + */ + private String callbackUrl; + /** + * 企业ID + */ + private Integer mchId; + + private String appKey; + + private Integer appId; + /** + * 版本号 + */ + private String version; + /** + * 单发链接 + */ + private String singleMsgUrl; + /** + * 群发链接 + */ + private String massMsgUrl; + /** + * 签名ID + */ + private String signatureId; + + + +} + 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 new file mode 100644 index 0000000..2a5a579 --- /dev/null +++ b/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-domain/src/main/java/com/schisandra/auth/domain/convert/SchisandraSmsConfigBOConvert.java @@ -0,0 +1,48 @@ +package com.schisandra.auth.domain.convert; + +import com.schisandra.auth.domain.bo.SchisandraAuthUserBO; +import com.schisandra.auth.domain.bo.SchisandraSmsConfigBO; +import com.schisandra.auth.infra.basic.entity.SchisandraAuthUser; +import com.schisandra.auth.infra.basic.entity.SchisandraSmsConfig; +import lombok.Data; +import org.mapstruct.Mapper; +import org.mapstruct.factory.Mappers; + +import java.io.Serializable; +import java.util.Date; +import java.util.List; + +/** + * (SchisandraSmsConfig)实体类 + * + * @author makejava + * @since 2024-05-08 20:09:54 + */ +@Mapper(componentModel = "spring") +public interface SchisandraSmsConfigBOConvert { + + SchisandraSmsConfigBOConvert INSTANCE = Mappers.getMapper(SchisandraSmsConfigBOConvert.class); + + /** + * @description 将bo转换为实体 + * @param schisandraSmsConfigBO + * @return com.schisandra.auth.infra.basic.entity.SchisandraAuthUser + * @author landaiqing + * @date 2024/3/21 23:13 + */ + SchisandraSmsConfig convertBOToEntity(SchisandraSmsConfigBO schisandraSmsConfigBO); + + /** + * @description 将实体转换为bo + * @param schisandraSmsConfig + * @return com.schisandra.auth.domain.bo.SchisandraAuthUserBO + * @author landaiqing + * @date 2024/3/21 23:13 + */ + SchisandraSmsConfigBO convertEntityToBO(SchisandraSmsConfig schisandraSmsConfig); + + List convertEntityToBOList(List schisandraSmsConfigs); + + +} + 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 new file mode 100644 index 0000000..68b55bf --- /dev/null +++ b/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-domain/src/main/java/com/schisandra/auth/domain/service/SchisandraSmsConfigDomainService.java @@ -0,0 +1,22 @@ +package com.schisandra.auth.domain.service; + + +import com.schisandra.auth.domain.bo.SchisandraSmsConfigBO; +import com.schisandra.auth.infra.basic.entity.SchisandraSmsConfig; + +import java.util.List; + +/** + * 用户领域service + * + * @author landaiqing + * @date 2024/3/21 + */ +public interface SchisandraSmsConfigDomainService { + + + + List queryAll(); + +} + 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 new file mode 100644 index 0000000..1a5056d --- /dev/null +++ b/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-domain/src/main/java/com/schisandra/auth/domain/service/impl/SchisandraSmsConfigDomainServiceImpl.java @@ -0,0 +1,26 @@ +package com.schisandra.auth.domain.service.impl; + +import com.schisandra.auth.domain.bo.SchisandraSmsConfigBO; +import com.schisandra.auth.domain.convert.SchisandraSmsConfigBOConvert; +import com.schisandra.auth.domain.service.SchisandraSmsConfigDomainService; +import com.schisandra.auth.infra.basic.entity.SchisandraSmsConfig; +import com.schisandra.auth.infra.basic.service.SchisandraSmsConfigService; +import lombok.extern.slf4j.Slf4j; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.List; +@Service +@Slf4j +public class SchisandraSmsConfigDomainServiceImpl implements SchisandraSmsConfigDomainService { + @Resource + private SchisandraSmsConfigService schisandraSmsConfigService; + @Override + public List queryAll() { + + List schisandraSmsConfigs = schisandraSmsConfigService.queryAll(); + return SchisandraSmsConfigBOConvert.INSTANCE.convertEntityToBOList(schisandraSmsConfigs); + + } + +} 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 new file mode 100644 index 0000000..fdd11b0 --- /dev/null +++ b/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-infra/src/main/java/com/schisandra/auth/infra/basic/dao/SchisandraSmsConfigDao.java @@ -0,0 +1,86 @@ +package com.schisandra.auth.infra.basic.dao; + +import com.schisandra.auth.infra.basic.entity.SchisandraSmsConfig; +import org.apache.ibatis.annotations.Param; +import org.springframework.data.domain.Pageable; + +import java.util.List; + +/** + * (SchisandraSmsConfig)表数据库访问层 + * + * @author makejava + * @since 2024-05-08 20:09:54 + */ +public interface SchisandraSmsConfigDao { + + /** + * 通过ID查询单条数据 + * + * @param id 主键 + * @return 实例对象 + */ + SchisandraSmsConfig queryById(Integer id); + + /** + * 查询指定行数据 + * + * @param schisandraSmsConfig 查询条件 + * @param pageable 分页对象 + * @return 对象列表 + */ + List queryAllByLimit(SchisandraSmsConfig schisandraSmsConfig, @Param("pageable") Pageable pageable); + + List queryAll(); + + /** + * 统计总行数 + * + * @param schisandraSmsConfig 查询条件 + * @return 总行数 + */ + long count(SchisandraSmsConfig schisandraSmsConfig); + + /** + * 新增数据 + * + * @param schisandraSmsConfig 实例对象 + * @return 影响行数 + */ + int insert(SchisandraSmsConfig schisandraSmsConfig); + + /** + * 批量新增数据（MyBatis原生foreach方法） + * + * @param entities List 实例对象列表 + * @return 影响行数 + */ + int insertBatch(@Param("entities") List entities); + + /** + * 批量新增或按主键更新数据（MyBatis原生foreach方法） + * + * @param entities List 实例对象列表 + * @return 影响行数 + * @throws org.springframework.jdbc.BadSqlGrammarException 入参是空List的时候会抛SQL语句错误的异常，请自行校验入参 + */ + int insertOrUpdateBatch(@Param("entities") List entities); + + /** + * 修改数据 + * + * @param schisandraSmsConfig 实例对象 + * @return 影响行数 + */ + int update(SchisandraSmsConfig schisandraSmsConfig); + + /** + * 通过主键删除数据 + * + * @param id 主键 + * @return 影响行数 + */ + int deleteById(Integer id); + +} + 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 new file mode 100644 index 0000000..4a264cc --- /dev/null +++ b/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-infra/src/main/java/com/schisandra/auth/infra/basic/entity/SchisandraSmsConfig.java @@ -0,0 +1,174 @@ +package com.schisandra.auth.infra.basic.entity; + +import lombok.Data; + +import java.util.Date; +import java.io.Serializable; + +/** + * (SchisandraSmsConfig)实体类 + * + * @author makejava + * @since 2024-05-08 20:09:54 + */ +@Data +public class SchisandraSmsConfig implements Serializable { + + /** + * id + */ + private Integer id; + /** + * 配置id + */ + private String configId; + /** + * 请求地址 + */ + private String requestUrl; + /** + * 模板变量名称 + */ + private String templateName; + /** + * 接口名称 + */ + private String action; + /** + * 地域信息 + */ + private String region; + + private String accessKeyId; + + private String accessKeySecret; + /** + * 厂商名称标识 + */ + private String supplier; + /** + * 短信签名 + */ + private String signature; + + private String sdkAppId; + /** + * 模板ID + */ + private String templateId; + /** + * 权重 + */ + private Integer weight; + /** + * 短信重试次数，默认0次不重试 + */ + private Integer retryInterval; + /** + * 短信重试次数，默认0次不重试 + */ + private Integer maxRetries; + /** + * 厂商的发送数量上限，默认不设置上限 + */ + private Long maximum; + /** + * REST API Base URL + */ + private String baseUrl; + /** + * 请求域名 + */ + private String serverIp; + /** + * 请求端口 + */ + private Integer serverPort; + /** + * 国内短信签名通道号 + */ + private String sender; + /** + * 短信状态报告接收地 + */ + private String statusCallBack; + /** + * APP接入地址 + */ + private String url; + /** + * 模板短信请求地址 + */ + private String templateUrl; + /** + * 验证码短信请求地址 + */ + private String codeUrl; + /** + * 验证码验证请求地址 + */ + private String verifyUrl; + /** + * 是否需要支持短信上行。true:需要，false:不需要false + */ + private String needUp; + /** + * 请求超时时间 + */ + private Integer connTimeout; + /** + * 是否为简易模式 + */ + private String isSimple; + /** + * 短信发送后将向这个地址推送(运营商返回的)发送报告 + */ + private String callbackUrl; + /** + * 企业ID + */ + private Integer mchId; + + private String appKey; + + private Integer appId; + /** + * 版本号 + */ + private String version; + /** + * 单发链接 + */ + private String singleMsgUrl; + /** + * 群发链接 + */ + private String massMsgUrl; + /** + * 签名ID + */ + private String signatureId; + /** + * 创建人 + */ + private String createdBy; + /** + * 创建时间 + */ + private Date createdTime; + /** + * 更新时间 + */ + private Date updateTime; + /** + * 更新人 + */ + private String updateBy; + /** + * 是否删除 0 未删除 1已删除 + */ + private Integer isDeleted; + + +} + 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 new file mode 100644 index 0000000..1ab2f35 --- /dev/null +++ b/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-infra/src/main/java/com/schisandra/auth/infra/basic/service/SchisandraSmsConfigService.java @@ -0,0 +1,60 @@ +package com.schisandra.auth.infra.basic.service; + +import com.schisandra.auth.infra.basic.entity.SchisandraSmsConfig; +import org.springframework.data.domain.Page; +import org.springframework.data.domain.PageRequest; + +import java.util.List; + +/** + * (SchisandraSmsConfig)表服务接口 + * + * @author makejava + * @since 2024-05-08 20:09:55 + */ +public interface SchisandraSmsConfigService { + + /** + * 通过ID查询单条数据 + * + * @param id 主键 + * @return 实例对象 + */ + SchisandraSmsConfig queryById(Integer id); + + List queryAll(); + + /** + * 分页查询 + * + * @param schisandraSmsConfig 筛选条件 + * @param pageRequest 分页对象 + * @return 查询结果 + */ + Page queryByPage(SchisandraSmsConfig schisandraSmsConfig, PageRequest pageRequest); + + /** + * 新增数据 + * + * @param schisandraSmsConfig 实例对象 + * @return 实例对象 + */ + SchisandraSmsConfig insert(SchisandraSmsConfig schisandraSmsConfig); + + /** + * 修改数据 + * + * @param schisandraSmsConfig 实例对象 + * @return 实例对象 + */ + SchisandraSmsConfig update(SchisandraSmsConfig schisandraSmsConfig); + + /** + * 通过主键删除数据 + * + * @param id 主键 + * @return 是否成功 + */ + boolean deleteById(Integer id); + +} 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 new file mode 100644 index 0000000..66f2ba7 --- /dev/null +++ b/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-infra/src/main/java/com/schisandra/auth/infra/basic/service/impl/SchisandraSmsConfigServiceImpl.java @@ -0,0 +1,88 @@ +package com.schisandra.auth.infra.basic.service.impl; + +import com.schisandra.auth.infra.basic.entity.SchisandraSmsConfig; +import com.schisandra.auth.infra.basic.dao.SchisandraSmsConfigDao; +import com.schisandra.auth.infra.basic.service.SchisandraSmsConfigService; +import org.springframework.stereotype.Service; +import org.springframework.data.domain.Page; +import org.springframework.data.domain.PageImpl; +import org.springframework.data.domain.PageRequest; + +import javax.annotation.Resource; +import java.util.List; + +/** + * (SchisandraSmsConfig)表服务实现类 + * + * @author makejava + * @since 2024-05-08 20:09:55 + */ +@Service("schisandraSmsConfigService") +public class SchisandraSmsConfigServiceImpl implements SchisandraSmsConfigService { + @Resource + private SchisandraSmsConfigDao schisandraSmsConfigDao; + + /** + * 通过ID查询单条数据 + * + * @param id 主键 + * @return 实例对象 + */ + @Override + public SchisandraSmsConfig queryById(Integer id) { + return this.schisandraSmsConfigDao.queryById(id); + } + + /** + * 分页查询 + * + * @param schisandraSmsConfig 筛选条件 + * @param pageRequest 分页对象 + * @return 查询结果 + */ + @Override + public Page queryByPage(SchisandraSmsConfig schisandraSmsConfig, PageRequest pageRequest) { + long total = this.schisandraSmsConfigDao.count(schisandraSmsConfig); + return new PageImpl<>(this.schisandraSmsConfigDao.queryAllByLimit(schisandraSmsConfig, pageRequest), pageRequest, total); + } + + @Override + public List queryAll() { + return this.schisandraSmsConfigDao.queryAll(); + } + + /** + * 新增数据 + * + * @param schisandraSmsConfig 实例对象 + * @return 实例对象 + */ + @Override + public SchisandraSmsConfig insert(SchisandraSmsConfig schisandraSmsConfig) { + this.schisandraSmsConfigDao.insert(schisandraSmsConfig); + return schisandraSmsConfig; + } + + /** + * 修改数据 + * + * @param schisandraSmsConfig 实例对象 + * @return 实例对象 + */ + @Override + public SchisandraSmsConfig update(SchisandraSmsConfig schisandraSmsConfig) { + this.schisandraSmsConfigDao.update(schisandraSmsConfig); + return this.queryById(schisandraSmsConfig.getId()); + } + + /** + * 通过主键删除数据 + * + * @param id 主键 + * @return 是否成功 + */ + @Override + public boolean deleteById(Integer id) { + return this.schisandraSmsConfigDao.deleteById(id) > 0; + } +} 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 new file mode 100644 index 0000000..22e9dd8 --- /dev/null +++ b/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-infra/src/main/resources/mapper/SchisandraSmsConfigDao.xml @@ -0,0 +1,499 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 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) + 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}) + + + + + 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 + + (#{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}) + + on duplicate key update + config_id = values(config_id)request_url = values(request_url)template_name = values(template_name)action = + values(action)region = values(region)access_key_id = values(access_key_id)access_key_secret = + values(access_key_secret)supplier = values(supplier)signature = values(signature)sdk_app_id = + values(sdk_app_id)template_id = values(template_id)weight = values(weight)retry_interval = + values(retry_interval)max_retries = values(max_retries)maximum = values(maximum)base_url = + values(base_url)server_ip = values(server_ip)server_port = values(server_port)sender = + values(sender)status_call_back = values(status_call_back)url = values(url)template_url = + values(template_url)code_url = values(code_url)verify_url = values(verify_url)need_up = + values(need_up)conn_timeout = values(conn_timeout)is_simple = values(is_simple)callback_url = + values(callback_url)mch_id = values(mch_id)app_key = values(app_key)app_id = values(app_id)version = + values(version)single_msg_url = values(single_msg_url)mass_msg_url = values(mass_msg_url)signature_Id = + values(signature_Id)created_by = values(created_by)created_time = values(created_time)update_time = + values(update_time)update_by = values(update_by)is_deleted = values(is_deleted) + + + + + update schisandra_sms_config + + + config_id = #{configId}, + + + request_url = #{requestUrl}, + + + template_name = #{templateName}, + + + `action` = #{action}, + + + region = #{region}, + + + access_key_id = #{accessKeyId}, + + + access_key_secret = #{accessKeySecret}, + + + supplier = #{supplier}, + + + signature = #{signature}, + + + sdk_app_id = #{sdkAppId}, + + + template_id = #{templateId}, + + + weight = #{weight}, + + + retry_interval = #{retryInterval}, + + + max_retries = #{maxRetries}, + + + maximum = #{maximum}, + + + base_url = #{baseUrl}, + + + server_ip = #{serverIp}, + + + server_port = #{serverPort}, + + + sender = #{sender}, + + + status_call_back = #{statusCallBack}, + + + url = #{url}, + + + template_url = #{templateUrl}, + + + code_url = #{codeUrl}, + + + verify_url = #{verifyUrl}, + + + need_up = #{needUp}, + + + conn_timeout = #{connTimeout}, + + + is_simple = #{isSimple}, + + + callback_url = #{callbackUrl}, + + + mch_id = #{mchId}, + + + app_key = #{appKey}, + + + app_id = #{appId}, + + + version = #{version}, + + + single_msg_url = #{singleMsgUrl}, + + + mass_msg_url = #{massMsgUrl}, + + + signature_Id = #{signatureId}, + + + created_by = #{createdBy}, + + + created_time = #{createdTime}, + + + update_time = #{updateTime}, + + + update_by = #{updateBy}, + + + is_deleted = #{isDeleted}, + + + where id = #{id} + + + + + delete + from schisandra_sms_config + where id = #{id} + + + + diff --git a/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-starter/src/main/resources/application.yml b/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-starter/src/main/resources/application.yml index 4cdce4b..fe8dc08 100644 --- a/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-starter/src/main/resources/application.yml +++ b/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-starter/src/main/resources/application.yml @@ -72,7 +72,7 @@ sa-token: sms: # 标注从yml读取配置 - config-type: interface + config-type: yaml restricted: true accountMax: 10 minuteMax: 1