diff --git a/yudao-framework/yudao-spring-boot-starter-biz-social/pom.xml b/yudao-framework/yudao-spring-boot-starter-biz-social/pom.xml
index 18da315a41..0e0ac6dc47 100644
--- a/yudao-framework/yudao-spring-boot-starter-biz-social/pom.xml
+++ b/yudao-framework/yudao-spring-boot-starter-biz-social/pom.xml
@@ -38,6 +38,12 @@
com.xkcoding.justauth
justauth-spring-boot-starter
+
+
+ cn.hutool
+ hutool-core
+
+
cn.iocoder.boot
diff --git a/yudao-server/src/main/resources/application-dev.yaml b/yudao-server/src/main/resources/application-dev.yaml
index e54bec4fc7..35c0ca53cf 100644
--- a/yudao-server/src/main/resources/application-dev.yaml
+++ b/yudao-server/src/main/resources/application-dev.yaml
@@ -146,7 +146,7 @@ spring:
client:
url: http://127.0.0.1:${server.port}/${spring.boot.admin.context-path} # 设置 Spring Boot Admin Server 地址
instance:
- prefer-ip: true # 注册实例时,优先使用 IP
+ service-host-type: IP # 注册实例时,优先使用 IP [IP, HOST_NAME, CANONICAL_HOST_NAME]
# Spring Boot Admin Server 服务端的相关配置
context-path: /admin # 配置 Spring
diff --git a/yudao-server/src/main/resources/application-local.yaml b/yudao-server/src/main/resources/application-local.yaml
index 177abf9e4d..c1db555810 100644
--- a/yudao-server/src/main/resources/application-local.yaml
+++ b/yudao-server/src/main/resources/application-local.yaml
@@ -156,7 +156,7 @@ spring:
client:
url: http://127.0.0.1:${server.port}/${spring.boot.admin.context-path} # 设置 Spring Boot Admin Server 地址
instance:
- prefer-ip: true # 注册实例时,优先使用 IP
+ service-host-type: IP # 注册实例时,优先使用 IP [IP, HOST_NAME, CANONICAL_HOST_NAME]
# Spring Boot Admin Server 服务端的相关配置
context-path: /admin # 配置 Spring
diff --git a/yudao-ui-admin-vue3/package.json b/yudao-ui-admin-vue3/package.json
index 8956dd3a54..2a955d79d3 100644
--- a/yudao-ui-admin-vue3/package.json
+++ b/yudao-ui-admin-vue3/package.json
@@ -50,18 +50,18 @@
"vue-cropper": "^1.0.3",
"vue-i18n": "9.1.10",
"vue-router": "^4.1.2",
- "vue-types": "^4.1.1",
+ "vue-types": "^4.2.0",
"web-storage-cache": "^1.1.1"
},
"devDependencies": {
"@commitlint/cli": "^17.0.3",
"@commitlint/config-conventional": "^17.0.3",
- "@iconify/json": "^2.1.80",
- "@intlify/vite-plugin-vue-i18n": "^5.0.0",
+ "@iconify/json": "^2.1.81",
+ "@intlify/vite-plugin-vue-i18n": "^5.0.1",
"@purge-icons/generated": "^0.8.1",
"@types/intro.js": "^5.1.0",
"@types/lodash-es": "^4.17.6",
- "@types/node": "^18.0.6",
+ "@types/node": "^18.6.0",
"@types/nprogress": "^0.2.0",
"@types/qrcode": "^1.4.2",
"@types/qs": "^6.9.7",
@@ -96,11 +96,11 @@
"vite-plugin-compression": "^0.5.1",
"vite-plugin-eslint": "^1.7.0",
"vite-plugin-html": "^3.2.0",
- "vite-plugin-purge-icons": "^0.8.1",
+ "vite-plugin-purge-icons": "^0.8.2",
"vite-plugin-style-import": "^1.4.1",
"vite-plugin-svg-icons": "^2.0.1",
"vite-plugin-windicss": "^1.8.7",
- "vue-tsc": "^0.38.9",
+ "vue-tsc": "^0.39.0",
"windicss": "^3.5.6",
"windicss-analysis": "^0.3.5"
},
diff --git a/yudao-ui-admin-vue3/src/api/system/sms/smsTemplate/index.ts b/yudao-ui-admin-vue3/src/api/system/sms/smsTemplate/index.ts
index b6dcc6a4a8..26cc883c05 100644
--- a/yudao-ui-admin-vue3/src/api/system/sms/smsTemplate/index.ts
+++ b/yudao-ui-admin-vue3/src/api/system/sms/smsTemplate/index.ts
@@ -1,5 +1,5 @@
import { useAxios } from '@/hooks/web/useAxios'
-import type { SmsTemplateVO, SmsSendVO } from './types'
+import type { SmsTemplateVO } from './types'
const request = useAxios()
@@ -29,7 +29,7 @@ export const deleteSmsTemplateApi = (id: number) => {
}
// 发送短信
-export function sendSms(data: SmsSendVO) {
+export const sendSmsApi = (data) => {
return request.post({ url: '/system/sms-template/send-sms', data })
}
diff --git a/yudao-ui-admin-vue3/src/views/Profile/components/UserAvatar.vue b/yudao-ui-admin-vue3/src/views/Profile/components/UserAvatar.vue
index bf9464ef20..47887ad097 100644
--- a/yudao-ui-admin-vue3/src/views/Profile/components/UserAvatar.vue
+++ b/yudao-ui-admin-vue3/src/views/Profile/components/UserAvatar.vue
@@ -30,8 +30,6 @@ const editCropper = () => {
state.dialogVisible = true
state.cropperVisible = true
}
-/** 覆盖默认上传行为 */
-const requestUpload = () => {}
/** 向左旋转 */
const rotateLeft = () => {
cropper.value.rotateLeft()
@@ -121,12 +119,7 @@ watch(
-
+
选择
diff --git a/yudao-ui-admin-vue3/src/views/system/sms/smsTemplate/index.vue b/yudao-ui-admin-vue3/src/views/system/sms/smsTemplate/index.vue
index af54dd386f..0c7438fcd8 100644
--- a/yudao-ui-admin-vue3/src/views/system/sms/smsTemplate/index.vue
+++ b/yudao-ui-admin-vue3/src/views/system/sms/smsTemplate/index.vue
@@ -1,7 +1,7 @@