From 1bd1e4778d0b36ccaf3e0491dbb2f0cc38d1679c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=85=B1=E5=8C=85?= Date: Tue, 17 Jun 2025 15:36:00 +0800 Subject: [PATCH 1/6] =?UTF-8?q?=E3=80=90=E4=BF=AE=E5=A4=8D=E3=80=91?= =?UTF-8?q?=E9=98=BF=E9=87=8C=E4=BA=91oss=E6=97=A0=E6=B3=95=E4=B8=8A?= =?UTF-8?q?=E4=BC=A0=E9=97=AE=E9=A2=98=EF=BC=8Cdev/pom=E4=B8=AD=E5=A2=9E?= =?UTF-8?q?=E5=8A=A0oss=E7=9B=B8=E5=85=B3jdk=E5=BC=95=E7=94=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- snowy-plugin/snowy-plugin-dev/pom.xml | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/snowy-plugin/snowy-plugin-dev/pom.xml b/snowy-plugin/snowy-plugin-dev/pom.xml index f3d2f60..37d43d6 100644 --- a/snowy-plugin/snowy-plugin-dev/pom.xml +++ b/snowy-plugin/snowy-plugin-dev/pom.xml @@ -43,5 +43,25 @@ org.dromara.sms4j sms4j-javase-plugin + + + + com.qcloud + cos_api + + + + + com.aliyun.oss + aliyun-sdk-oss + + + + + io.minio + minio + + + -- Gitee From 85db9f3738a285379476f7012a55910ca9430367 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=85=B1=E5=8C=85?= Date: Tue, 17 Jun 2025 15:49:55 +0800 Subject: [PATCH 2/6] =?UTF-8?q?=E3=80=90=E4=BF=AE=E5=A4=8D=E3=80=91?= =?UTF-8?q?=E6=97=A0=E9=9C=80=E7=99=BB=E5=BD=95=E7=9A=84=E6=8E=A5=E5=8F=A3?= =?UTF-8?q?=E8=AE=B0=E5=BD=95=E6=97=A5=E5=BF=97=E6=98=AF=EF=BC=8C=E6=8A=A5?= =?UTF-8?q?=E9=94=99token=E4=B8=8D=E5=AD=98=E5=9C=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/vip/xiaonuo/dev/modular/log/util/DevLogUtil.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/snowy-plugin/snowy-plugin-dev/src/main/java/vip/xiaonuo/dev/modular/log/util/DevLogUtil.java b/snowy-plugin/snowy-plugin-dev/src/main/java/vip/xiaonuo/dev/modular/log/util/DevLogUtil.java index 1151bf1..b1c7906 100644 --- a/snowy-plugin/snowy-plugin-dev/src/main/java/vip/xiaonuo/dev/modular/log/util/DevLogUtil.java +++ b/snowy-plugin/snowy-plugin-dev/src/main/java/vip/xiaonuo/dev/modular/log/util/DevLogUtil.java @@ -46,7 +46,7 @@ public class DevLogUtil { public static void executeOperationLog(CommonLog commonLog, String userName, Invocation inv, String resultJson) { Context request = CommonServletUtil.getRequest(); DevLog devLog = genBasOpLog(); - String loginId = StpUtil.getLoginIdAsString(); + String loginId = StpUtil.isLogin()? StpUtil.getLoginIdAsString():""; if (ObjectUtil.isEmpty(loginId)) { loginId = "-1"; } -- Gitee From a33a262cc52c6227dc6f636a2d3643f9539dd4f8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=85=B1=E5=8C=85?= Date: Tue, 17 Jun 2025 15:53:15 +0800 Subject: [PATCH 3/6] =?UTF-8?q?=E3=80=90=E4=BF=AE=E5=A4=8D=E3=80=91?= =?UTF-8?q?=E5=9B=BE=E7=89=87=E4=B8=8A=E4=BC=A0=E6=97=A0=E6=B3=95=E7=94=9F?= =?UTF-8?q?=E6=88=90=E7=BC=A9=E7=BC=A9=E7=95=A5=E5=9B=BE-=E4=B8=B4?= =?UTF-8?q?=E6=97=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modular/file/service/impl/DevFileServiceImpl.java | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/snowy-plugin/snowy-plugin-dev/src/main/java/vip/xiaonuo/dev/modular/file/service/impl/DevFileServiceImpl.java b/snowy-plugin/snowy-plugin-dev/src/main/java/vip/xiaonuo/dev/modular/file/service/impl/DevFileServiceImpl.java index 33df30b..a468474 100644 --- a/snowy-plugin/snowy-plugin-dev/src/main/java/vip/xiaonuo/dev/modular/file/service/impl/DevFileServiceImpl.java +++ b/snowy-plugin/snowy-plugin-dev/src/main/java/vip/xiaonuo/dev/modular/file/service/impl/DevFileServiceImpl.java @@ -22,6 +22,7 @@ import cn.hutool.core.util.IdUtil; import cn.hutool.core.util.NumberUtil; import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; +import cn.hutool.http.HttpUtil; import com.mybatisflex.core.paginate.Page; import com.mybatisflex.core.query.QueryWrapper; import com.mybatisflex.solon.service.impl.ServiceImpl; @@ -47,9 +48,11 @@ import vip.xiaonuo.dev.modular.file.util.DevFileLocalUtil; import vip.xiaonuo.dev.modular.file.util.DevFileMinIoUtil; import vip.xiaonuo.dev.modular.file.util.DevFileTencentUtil; +import java.awt.image.BufferedImage; import java.io.File; import java.io.IOException; import java.math.BigDecimal; +import java.net.URL; import java.util.List; /** @@ -189,11 +192,13 @@ public class DevFileServiceImpl extends ServiceImpl impl devFile.setSizeInfo(FileUtil.readableFileSize(file.getContentSize())); devFile.setObjName(ObjectUtil.isNotEmpty(devFile.getSuffix()) ? fileId + StrUtil.DOT + devFile.getSuffix() : null); // 如果是图片，则压缩生成缩略图 - if (ObjectUtil.isNotEmpty(suffix)) { + if (ObjectUtil.isNotEmpty(suffix) && StrUtil.isNotBlank(storageUrl)) { if (isPic(suffix)) { try { - byte[] bytes = IoUtil.readBytes(file.getContent()); - devFile.setThumbnail(ImgUtil.toBase64DataUri(ImgUtil.scale(ImgUtil.toImage(bytes), + // byte[] bytes = IoUtil.readBytes(file.getContent()); + //**暂时这样读取，最优解还是file.getContent可以服用，本地文件还好，OSS文件的话压力比较大 + BufferedImage img = HttpUtil.isHttp(storageUrl) || HttpUtil.isHttps(storageUrl) ? ImgUtil.read(new URL(storageUrl)) : ImgUtil.read(storageUrl); + devFile.setThumbnail(ImgUtil.toBase64DataUri(ImgUtil.scale(img, 100, 100, null), suffix)); } catch (Exception ignored) { } -- Gitee From 1fddaebf669ae270c010c01e830111f64c177fd2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=85=B1=E5=8C=85?= Date: Tue, 17 Jun 2025 16:12:19 +0800 Subject: [PATCH 4/6] =?UTF-8?q?=E3=80=90=E4=BF=AE=E5=A4=8D=E3=80=91?= =?UTF-8?q?=E7=9F=AD=E4=BF=A1=E5=8F=91=E9=80=81=E6=8A=A5=E9=94=99bouncycas?= =?UTF-8?q?tle=20null?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- snowy-plugin/snowy-plugin-dev/pom.xml | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/snowy-plugin/snowy-plugin-dev/pom.xml b/snowy-plugin/snowy-plugin-dev/pom.xml index 37d43d6..fe44e4e 100644 --- a/snowy-plugin/snowy-plugin-dev/pom.xml +++ b/snowy-plugin/snowy-plugin-dev/pom.xml @@ -62,6 +62,23 @@ minio + + + com.aliyun + dysmsapi20170525 + + + + + com.tencentcloudapi + tencentcloud-sdk-java-sms + + + + + org.bouncycastle + bcprov-jdk15on + -- Gitee From 25b9bd2c2708c03af48f9ed8cc8340f1835193d3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=85=B1=E5=8C=85?= Date: Tue, 17 Jun 2025 16:13:33 +0800 Subject: [PATCH 5/6] =?UTF-8?q?=E3=80=90=E5=8A=A0=E5=85=A5=E3=80=91SNOWY?= =?UTF-8?q?=5FSMS=5FALIYUN=5FEND=5FPOINT=E9=BB=98=E8=AE=A4=E5=80=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- snowy-web-app/src/main/resources/_sql/snowy_mysql.sql | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/snowy-web-app/src/main/resources/_sql/snowy_mysql.sql b/snowy-web-app/src/main/resources/_sql/snowy_mysql.sql index 60b85ae..d4ad724 100644 --- a/snowy-web-app/src/main/resources/_sql/snowy_mysql.sql +++ b/snowy-web-app/src/main/resources/_sql/snowy_mysql.sql @@ -169,7 +169,7 @@ INSERT INTO `DEV_CONFIG` VALUES ('1554740179362967589', 'SNOWY_SMS_TENCENT_DEFAU INSERT INTO `DEV_CONFIG` VALUES ('1554740179362967590', 'SNOWY_SMS_TENCENT_DEFAULT_SIGN_NAME', '腾讯云短信默认签名', 'SMS_TENCENT', '腾讯云短信默认签名', 45, NULL, 'NOT_DELETE', NULL, NULL, NULL, NULL); INSERT INTO `DEV_CONFIG` VALUES ('1554740179362967591', 'SNOWY_SMS_ALIYUN_ACCESS_KEY_ID', '阿里云短信AccessKeyId', 'SMS_ALIYUN', '阿里云短信AccessKeyId', 46, NULL, 'NOT_DELETE', NULL, NULL, NULL, NULL); INSERT INTO `DEV_CONFIG` VALUES ('1554740179362967592', 'SNOWY_SMS_ALIYUN_ACCESS_KEY_SECRET', '阿里云短信AccessKeySecret', 'SMS_ALIYUN', '阿里云短信AccessKeySecret', 47, NULL, 'NOT_DELETE', NULL, NULL, NULL, NULL); -INSERT INTO `DEV_CONFIG` VALUES ('1554740179362967593', 'SNOWY_SMS_ALIYUN_END_POINT', '阿里云短信EndPoint', 'SMS_ALIYUN', '阿里云短信EndPoint', 48, NULL, 'NOT_DELETE', NULL, NULL, NULL, NULL); +INSERT INTO `DEV_CONFIG` VALUES ('1554740179362967593', 'SNOWY_SMS_ALIYUN_END_POINT', 'dysmsapi.aliyuncs.com', 'SMS_ALIYUN', '阿里云短信EndPoint', 48, NULL, 'NOT_DELETE', NULL, NULL, NULL, NULL); INSERT INTO `DEV_CONFIG` VALUES ('1554740179362967594', 'SNOWY_SMS_ALIYUN_DEFAULT_SIGN_NAME', '阿里云短信默认签名', 'SMS_ALIYUN', '阿里云短信默认签名', 49, NULL, 'NOT_DELETE', NULL, NULL, NULL, NULL); INSERT INTO `DEV_CONFIG` VALUES ('1554740179362967595', 'SNOWY_SMS_XIAONUO_ACCESS_KEY_ID', '小诺短信账号Id', 'SMS_XIAONUO', '小诺短信账号Id', 50, NULL, 'NOT_DELETE', NULL, NULL, NULL, NULL); INSERT INTO `DEV_CONFIG` VALUES ('1554740179362967596', 'SNOWY_SMS_XIAONUO_ACCESS_KEY_SECRET', '小诺短信账号Secret', 'SMS_XIAONUO', '小诺短信账号', 51, NULL, 'NOT_DELETE', NULL, NULL, NULL, NULL); -- Gitee From 9b260e36e31fd0d945b0ad28d69a4e64582c90f2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=85=B1=E5=8C=85?= Date: Tue, 17 Jun 2025 16:16:14 +0800 Subject: [PATCH 6/6] =?UTF-8?q?=E3=80=90=E5=8A=A0=E5=85=A5=E3=80=91?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=B6=88=E6=81=AF=E6=8E=A8=E9=80=81=E5=BC=95?= =?UTF-8?q?=E6=93=8E=E9=80=89=E6=8B=A9=E9=A1=B9dict?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- snowy-web-app/src/main/resources/_sql/snowy_mysql.sql | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/snowy-web-app/src/main/resources/_sql/snowy_mysql.sql b/snowy-web-app/src/main/resources/_sql/snowy_mysql.sql index d4ad724..0d2e71e 100644 --- a/snowy-web-app/src/main/resources/_sql/snowy_mysql.sql +++ b/snowy-web-app/src/main/resources/_sql/snowy_mysql.sql @@ -360,6 +360,10 @@ INSERT INTO `DEV_DICT` VALUES ('1811259821748785154', '0', '通知公告位置', INSERT INTO `DEV_DICT` VALUES ('1811260041488371714', '1811259821748785154', '后台移动端首页', 'BACK_MOBILE', 'FRM', 136, NULL, 'NOT_DELETE', NULL, NULL, NULL, NULL); INSERT INTO `DEV_DICT` VALUES ('1811260212410454018', '1811259821748785154', '后台业务首页', 'BACK_INDEX', 'FRM', 137, NULL, 'NOT_DELETE', NULL, NULL, NULL, NULL); INSERT INTO `DEV_DICT` VALUES ('1811260660487950338', '1811259821748785154', '用户移动端首页', 'CLIENT_MOBILE', 'FRM', 138, NULL, 'NOT_DELETE', NULL, NULL, NULL, NULL); +INSERT INTO `DEV_DICT` VALUES ('292417703091331072', '0', '消息推送引擎', 'PUSH_ENGINE', 'FRM', 11, NULL, 'NOT_DELETE', NULL, NULL, NULL, NULL); +INSERT INTO `DEV_DICT` VALUES ('292418030402232320', '292417703091331072', '钉钉', 'DINGTALK', 'FRM', 12, NULL, 'NOT_DELETE', NULL, NULL, NULL, NULL); +INSERT INTO `DEV_DICT` VALUES ('1811260660487950338', '292417703091331072', '飞书', 'FEISHU', 'FRM', 13, NULL, 'NOT_DELETE', NULL, NULL, NULL, NULL); +INSERT INTO `DEV_DICT` VALUES ('1811260660487950338', '292417703091331072', '企业微信', 'WORKWECHAT', 'FRM', 15, NULL, 'NOT_DELETE', NULL, NULL, NULL, NULL); -- ---------------------------- -- Table structure for DEV_EMAIL -- Gitee