diff --git a/pom.xml b/pom.xml
index 63aa70ecb..4fe52775b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -35,8 +35,8 @@
3.0.0-M5
3.8.0
- 1.18.20
- 1.4.1.Final
+ 1.18.24
+ 1.5.2.Final
UTF-8
diff --git a/yudao-dependencies/pom.xml b/yudao-dependencies/pom.xml
index d7912ba69..99998b5eb 100644
--- a/yudao-dependencies/pom.xml
+++ b/yudao-dependencies/pom.xml
@@ -22,11 +22,11 @@
1.6.6
2.5
- 1.2.11
+ 1.2.12
3.5.2
3.5.2
- 3.5.0
- 3.17.4
+ 3.5.2
+ 3.17.6
1.9.2
@@ -37,21 +37,21 @@
2.6.7
0.31.0
- 7.2.6.RELEASE
- 0.1.16
+ 7.2.9.RELEASE
+ 1.0.3
4.0.0
6.7.2
3.0.4
- 1.18.20
- 1.4.1.Final
- 5.8.5
+ 1.18.24
+ 1.5.2.Final
+ 5.8.6
3.1.1
2.3
1.0.5
- 1.2.83
- 30.1.1-jre
+ 1.2.83
+ 31.1-jre
5.1.0
2.12.2
3.8.0
@@ -60,7 +60,7 @@
1.3.0
8.2.2
- 4.6.0
+ 4.6.1
2.2.1
3.1.561
1.2.7
diff --git a/yudao-framework/yudao-spring-boot-starter-biz-pay/pom.xml b/yudao-framework/yudao-spring-boot-starter-biz-pay/pom.xml
index e6106b9d9..4a6f92dca 100644
--- a/yudao-framework/yudao-spring-boot-starter-biz-pay/pom.xml
+++ b/yudao-framework/yudao-spring-boot-starter-biz-pay/pom.xml
@@ -52,7 +52,7 @@
com.alipay.sdk
alipay-sdk-java
- 4.31.72.ALL
+ 4.33.39.ALL
org.bouncycastle
@@ -63,7 +63,7 @@
com.github.binarywang
weixin-java-pay
- 4.3.8.B
+ 4.4.0
diff --git a/yudao-framework/yudao-spring-boot-starter-biz-weixin/pom.xml b/yudao-framework/yudao-spring-boot-starter-biz-weixin/pom.xml
index 2dc2fe688..8af0041a9 100644
--- a/yudao-framework/yudao-spring-boot-starter-biz-weixin/pom.xml
+++ b/yudao-framework/yudao-spring-boot-starter-biz-weixin/pom.xml
@@ -35,12 +35,12 @@
com.github.binarywang
wx-java-mp-spring-boot-starter
- 4.3.8.B
+ 4.4.0
com.github.binarywang
wx-java-miniapp-spring-boot-starter
- 4.3.8.B
+ 4.4.0
diff --git a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/convert/message/BpmMessageConvert.java b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/convert/message/BpmMessageConvert.java
index 92683f4c9..99b7bebf2 100644
--- a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/convert/message/BpmMessageConvert.java
+++ b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/convert/message/BpmMessageConvert.java
@@ -2,6 +2,7 @@ package cn.iocoder.yudao.module.bpm.convert.message;
import cn.iocoder.yudao.module.system.api.sms.dto.send.SmsSendSingleToUserReqDTO;
import org.mapstruct.Mapper;
+import org.mapstruct.Mapping;
import org.mapstruct.factory.Mappers;
import java.util.Map;
@@ -11,6 +12,10 @@ public interface BpmMessageConvert {
BpmMessageConvert INSTANCE = Mappers.getMapper(BpmMessageConvert.class);
+ @Mapping(target = "mobile", ignore = true)
+ @Mapping(source = "userId", target = "userId")
+ @Mapping(source = "templateCode", target = "templateCode")
+ @Mapping(source = "templateParams", target = "templateParams")
SmsSendSingleToUserReqDTO convert(Long userId, String templateCode, Map templateParams);
}
diff --git a/yudao-module-mall/yudao-module-market-biz/src/main/java/cn/iocoder/yudao/module/market/controller/app/banner/AppBannerController.java b/yudao-module-mall/yudao-module-market-biz/src/main/java/cn/iocoder/yudao/module/market/controller/app/banner/AppBannerController.java
index 3d9d58eb8..9af420a61 100644
--- a/yudao-module-mall/yudao-module-market-biz/src/main/java/cn/iocoder/yudao/module/market/controller/app/banner/AppBannerController.java
+++ b/yudao-module-mall/yudao-module-market-biz/src/main/java/cn/iocoder/yudao/module/market/controller/app/banner/AppBannerController.java
@@ -7,13 +7,13 @@ import cn.iocoder.yudao.module.market.dal.dataobject.banner.BannerDO;
import cn.iocoder.yudao.module.market.service.banner.BannerService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
-import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.validation.annotation.Validated;
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.List;
import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
@@ -27,8 +27,7 @@ import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
@Validated
public class AppBannerController {
- // TODO @xia:使用 @Resource 哈
- @Autowired
+ @Resource
private BannerService bannerService;
// TODO @xia:新建一个 AppBannerRespVO,只返回必要的字段。status 要过滤下。然后 sort 下结果
diff --git a/yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/api/sms/dto/send/SmsSendSingleToUserReqDTO.java b/yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/api/sms/dto/send/SmsSendSingleToUserReqDTO.java
index 67a5d93d2..ef77780de 100644
--- a/yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/api/sms/dto/send/SmsSendSingleToUserReqDTO.java
+++ b/yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/api/sms/dto/send/SmsSendSingleToUserReqDTO.java
@@ -4,7 +4,6 @@ import cn.iocoder.yudao.framework.common.validation.Mobile;
import lombok.Data;
import javax.validation.constraints.NotEmpty;
-import javax.validation.constraints.NotNull;
import java.util.Map;
/**
diff --git a/yudao-ui-admin-vue3/package.json b/yudao-ui-admin-vue3/package.json
index 81c41cc42..0a3de9a1c 100644
--- a/yudao-ui-admin-vue3/package.json
+++ b/yudao-ui-admin-vue3/package.json
@@ -1,6 +1,6 @@
{
"name": "ruoyi-vue-pro-vue3",
- "version": "1.6.3.1611",
+ "version": "1.6.4.1611",
"description": "基于vue3、element-plus、typesScript、vite3",
"author": "xingyu",
"private": false,
@@ -25,57 +25,57 @@
"p": "plop"
},
"dependencies": {
- "@iconify/iconify": "^2.2.1",
- "@vueuse/core": "^9.1.0",
- "@wangeditor/editor": "^5.1.14",
+ "@iconify/iconify": "^3.0.0",
+ "@vueuse/core": "^9.2.0",
+ "@wangeditor/editor": "^5.1.18",
"@wangeditor/editor-for-vue": "^5.1.10",
- "@zxcvbn-ts/core": "^2.0.4",
+ "@zxcvbn-ts/core": "^2.0.5",
"animate.css": "^4.1.1",
"axios": "^0.27.2",
"crypto-js": "^4.1.1",
- "dayjs": "^1.11.4",
+ "dayjs": "^1.11.5",
"echarts": "^5.3.3",
"echarts-wordcloud": "^2.0.0",
- "element-plus": "2.2.12",
+ "element-plus": "2.2.17",
"intro.js": "^6.0.0",
"jsencrypt": "^3.2.1",
"lodash-es": "^4.17.21",
"mitt": "^3.0.0",
"nprogress": "^0.2.0",
- "pinia": "^2.0.17",
+ "pinia": "^2.0.22",
"pinia-plugin-persist": "^1.0.0",
"qrcode": "^1.5.1",
"qs": "^6.11.0",
"url": "^0.11.0",
- "vue": "3.2.37",
+ "vue": "3.2.39",
"vue-cropper": "^1.0.3",
"vue-i18n": "9.2.2",
- "vue-router": "^4.1.3",
+ "vue-router": "^4.1.5",
"vue-types": "^4.2.1",
"web-storage-cache": "^1.1.1"
},
"devDependencies": {
- "@commitlint/cli": "^17.0.3",
- "@commitlint/config-conventional": "^17.0.3",
- "@iconify/json": "^2.1.89",
- "@intlify/vite-plugin-vue-i18n": "^6.0.0",
+ "@commitlint/cli": "^17.1.2",
+ "@commitlint/config-conventional": "^17.1.0",
+ "@iconify/json": "^2.1.110",
+ "@intlify/vite-plugin-vue-i18n": "^6.0.1",
"@purge-icons/generated": "^0.9.0",
"@types/intro.js": "^5.1.0",
"@types/lodash-es": "^4.17.6",
- "@types/node": "^18.6.5",
+ "@types/node": "^18.7.18",
"@types/nprogress": "^0.2.0",
- "@types/qrcode": "^1.4.2",
+ "@types/qrcode": "^1.5.0",
"@types/qs": "^6.9.7",
- "@typescript-eslint/eslint-plugin": "^5.33.0",
- "@typescript-eslint/parser": "^5.33.0",
- "@vitejs/plugin-vue": "^3.0.1",
- "@vitejs/plugin-vue-jsx": "^2.0.0",
- "autoprefixer": "^10.4.8",
- "eslint": "^8.21.0",
+ "@typescript-eslint/eslint-plugin": "^5.38.0",
+ "@typescript-eslint/parser": "^5.38.0",
+ "@vitejs/plugin-vue": "^3.1.0",
+ "@vitejs/plugin-vue-jsx": "^2.0.1",
+ "autoprefixer": "^10.4.11",
+ "eslint": "^8.23.1",
"eslint-config-prettier": "^8.5.0",
- "eslint-define-config": "^1.6.0",
+ "eslint-define-config": "^1.7.0",
"eslint-plugin-prettier": "^4.2.1",
- "eslint-plugin-vue": "^9.3.0",
+ "eslint-plugin-vue": "^9.5.1",
"less": "^4.1.3",
"lint-staged": "^13.0.3",
"plop": "^3.1.1",
@@ -84,24 +84,24 @@
"postcss-less": "^6.0.0",
"prettier": "^2.7.1",
"rimraf": "^3.0.2",
- "rollup": "^2.77.2",
- "stylelint": "^14.9.1",
+ "rollup": "^2.79.0",
+ "stylelint": "^14.12.0",
"stylelint-config-html": "^1.1.0",
"stylelint-config-prettier": "^9.0.3",
- "stylelint-config-recommended": "^8.0.0",
- "stylelint-config-standard": "^26.0.0",
+ "stylelint-config-recommended": "^9.0.0",
+ "stylelint-config-standard": "^28.0.0",
"stylelint-order": "^5.0.0",
- "typescript": "4.7.4",
- "unplugin-vue-define-options": "^0.7.3",
- "vite": "3.0.5",
+ "typescript": "4.8.3",
+ "unplugin-vue-define-options": "^0.11.2",
+ "vite": "3.1.3",
"vite-plugin-compression": "^0.5.1",
- "vite-plugin-eslint": "^1.7.0",
+ "vite-plugin-eslint": "^1.8.1",
"vite-plugin-html": "^3.2.0",
- "vite-plugin-purge-icons": "^0.9.0",
+ "vite-plugin-purge-icons": "^0.9.1",
"vite-plugin-style-import": "^2.0.0",
"vite-plugin-svg-icons": "^2.0.1",
- "vite-plugin-windicss": "^1.8.7",
- "vue-tsc": "^0.39.5",
+ "vite-plugin-windicss": "^1.8.8",
+ "vue-tsc": "^0.40.13",
"windicss": "^3.5.6"
},
"engines": {