From f3f2efcced2b81091895584d9aec57a8a1a062f5 Mon Sep 17 00:00:00 2001 From: xingyu Date: Mon, 23 Oct 2023 11:38:01 +0800 Subject: [PATCH 1/5] feat: update springboot 2.7.17 --- pom.xml | 2 +- yudao-dependencies/pom.xml | 2 +- yudao-example/yudao-sso-demo-by-code/pom.xml | 2 +- yudao-example/yudao-sso-demo-by-password/pom.xml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pom.xml b/pom.xml index d308fa9dd..f9fee5910 100644 --- a/pom.xml +++ b/pom.xml @@ -40,7 +40,7 @@ 1.5.0 1.18.30 - 2.7.16 + 2.7.17 1.5.5.Final UTF-8 diff --git a/yudao-dependencies/pom.xml b/yudao-dependencies/pom.xml index 2e589fbac..663fdf028 100644 --- a/yudao-dependencies/pom.xml +++ b/yudao-dependencies/pom.xml @@ -17,7 +17,7 @@ 1.8.2-snapshot 1.5.0 - 2.7.16 + 2.7.17 1.6.15 4.3.0 diff --git a/yudao-example/yudao-sso-demo-by-code/pom.xml b/yudao-example/yudao-sso-demo-by-code/pom.xml index dd617588d..dffca80ea 100644 --- a/yudao-example/yudao-sso-demo-by-code/pom.xml +++ b/yudao-example/yudao-sso-demo-by-code/pom.xml @@ -21,7 +21,7 @@ 8 UTF-8 - 2.7.16 + 2.7.17 diff --git a/yudao-example/yudao-sso-demo-by-password/pom.xml b/yudao-example/yudao-sso-demo-by-password/pom.xml index a5fc6129c..63287913f 100644 --- a/yudao-example/yudao-sso-demo-by-password/pom.xml +++ b/yudao-example/yudao-sso-demo-by-password/pom.xml @@ -21,7 +21,7 @@ 8 UTF-8 - 2.7.16 + 2.7.17 From 1611dd4b239676a084e35fc6b771493a759f7ae8 Mon Sep 17 00:00:00 2001 From: xingyu Date: Mon, 23 Oct 2023 11:38:28 +0800 Subject: [PATCH 2/5] docs: up springboot 2.7.17 --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index c28bae463..768f6120b 100644 --- a/README.md +++ b/README.md @@ -256,7 +256,7 @@ _前端基于 crmeb uniapp 经过授权重构，优化代码实现，接入芋 | 框架 | 说明 | 版本 | 学习指南 | |---------------------------------------------------------------------------------------------|------------------|----------------|----------------------------------------------------------------| -| [Spring Boot](https://spring.io/projects/spring-boot) | 应用开发框架 | 2.7.16 | [文档](https://github.com/YunaiV/SpringBoot-Labs) | +| [Spring Boot](https://spring.io/projects/spring-boot) | 应用开发框架 | 2.7.17 | [文档](https://github.com/YunaiV/SpringBoot-Labs) | | [MySQL](https://www.mysql.com/cn/) | 数据库服务器 | 5.7 / 8.0+ | | | [Druid](https://github.com/alibaba/druid) | JDBC 连接池、监控组件 | 1.2.19 | [文档](http://www.iocoder.cn/Spring-Boot/datasource-pool/?yudao) | | [MyBatis Plus](https://mp.baomidou.com/) | MyBatis 增强工具包 | 3.5.3.2 | [文档](http://www.iocoder.cn/Spring-Boot/MyBatis/?yudao) | From f0d3614c34a79d74c118b34ec6031459ac78504e Mon Sep 17 00:00:00 2001 From: xingyu Date: Mon, 23 Oct 2023 11:38:41 +0800 Subject: [PATCH 3/5] fix: reset config --- yudao-dependencies/pom.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/yudao-dependencies/pom.xml b/yudao-dependencies/pom.xml index 663fdf028..b60b1852b 100644 --- a/yudao-dependencies/pom.xml +++ b/yudao-dependencies/pom.xml @@ -23,9 +23,9 @@ 4.3.0 2.5 - 1.2.19 - 3.5.3.2 - 3.5.3.2 + 1.2.20 + 3.5.4 + 3.5.4 3.6.1 1.4.6 3.18.0 From 98561731f5cc6aedf82743983fbabc44e82bb456 Mon Sep 17 00:00:00 2001 From: xingyu Date: Mon, 23 Oct 2023 11:38:55 +0800 Subject: [PATCH 4/5] chore: update deps --- yudao-dependencies/pom.xml | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/yudao-dependencies/pom.xml b/yudao-dependencies/pom.xml index b60b1852b..7c2ecea34 100644 --- a/yudao-dependencies/pom.xml +++ b/yudao-dependencies/pom.xml @@ -29,13 +29,13 @@ 3.6.1 1.4.6 3.18.0 - 8.1.2.141 + 8.1.3.62 - 2.2.3 + 2.2.5 1.7.1 8.12.0 - 2.7.10 + 2.7.11 0.33.0 7.2.11.RELEASE @@ -44,8 +44,8 @@ 6.8.0 - 1.0.8 - 1.16.1 + 1.0.10 + 1.16.2 1.18.30 1.5.5.Final 5.8.22 @@ -53,10 +53,10 @@ 2.3 1.0.5 1.2.83 - 32.1.2-jre + 32.1.3-jre 5.1.0 2.14.2 - 3.9.0 + 3.10.0 0.1.55 2.7.0 2.7.0 @@ -67,8 +67,8 @@ 8.5.6 4.6.4 2.2.1 - 3.1.853 - 1.0.5 + 3.1.880 + 1.0.7 1.6.1 2.12.2 4.5.0 From a39a0e68a042acadeece9b1b847c4c7e7c72f0be Mon Sep 17 00:00:00 2001 From: xingyu Date: Mon, 23 Oct 2023 11:49:23 +0800 Subject: [PATCH 5/5] fix: vben codegen --- .../resources/codegen/vue3_vben/api/api.ts.vm | 4 ++-- .../codegen/vue3_vben/views/data.ts.vm | 20 ++++++++++++++----- .../codegen/vue3_vben/views/index.vue.vm | 16 +++++++-------- 3 files changed, 24 insertions(+), 16 deletions(-) diff --git a/yudao-module-infra/yudao-module-infra-biz/src/main/resources/codegen/vue3_vben/api/api.ts.vm b/yudao-module-infra/yudao-module-infra-biz/src/main/resources/codegen/vue3_vben/api/api.ts.vm index c7283a121..5ab06f577 100644 --- a/yudao-module-infra/yudao-module-infra-biz/src/main/resources/codegen/vue3_vben/api/api.ts.vm +++ b/yudao-module-infra/yudao-module-infra-biz/src/main/resources/codegen/vue3_vben/api/api.ts.vm @@ -1,4 +1,4 @@ -import { defHttp } from '@/utils/http/axios' +import {defHttp} from '@/utils/http/axios' #set ($baseURL = "/${table.moduleName}/${simpleClassName_strikeCase}") // 查询${table.classComment}列表 @@ -28,5 +28,5 @@ export function delete${simpleClassName}(id: number) { // 导出${table.classComment} Excel export function export${simpleClassName}(params) { - return defHttp.download({ url: '${baseURL}/export-excel', params }, '${table.classComment}.xls') + return defHttp.download({ url: '${baseURL}/export-excel', params }, '${table.classComment}.xls') } diff --git a/yudao-module-infra/yudao-module-infra-biz/src/main/resources/codegen/vue3_vben/views/data.ts.vm b/yudao-module-infra/yudao-module-infra-biz/src/main/resources/codegen/vue3_vben/views/data.ts.vm index 5557b38c9..92d3b2d75 100644 --- a/yudao-module-infra/yudao-module-infra-biz/src/main/resources/codegen/vue3_vben/views/data.ts.vm +++ b/yudao-module-infra/yudao-module-infra-biz/src/main/resources/codegen/vue3_vben/views/data.ts.vm @@ -1,6 +1,6 @@ -import type { BasicColumn, FormSchema } from '@/components/Table' -import { useRender } from '@/components/Table' -import { DICT_TYPE, getDictOptions } from '@/utils/dict' +import type {BasicColumn, FormSchema} from '@/components/Table' +import {useRender} from '@/components/Table' +import {DICT_TYPE, getDictOptions} from '@/utils/dict' export const columns: BasicColumn[] = [ #foreach($column in $columns) @@ -50,7 +50,7 @@ export const searchFormSchema: FormSchema[] = [ field: '${javaField}', #if ($column.htmlType == "input") component: 'Input', - #elseif ($column.htmlType == "select" || $column.htmlType == "radio") + #elseif ($column.htmlType == "select") component: 'Select', componentProps: { #if ("" != $dictType)## 设置了 dictType 数据字典的情况 @@ -59,6 +59,15 @@ export const searchFormSchema: FormSchema[] = [ options: [], #end }, + #elseif ($column.htmlType == "radio") + component: 'Radio', + componentProps: { + #if ("" != $dictType)## 设置了 dictType 数据字典的情况 + options: getDictOptions(DICT_TYPE.$dictType.toUpperCase()), + #else## 未设置 dictType 数据字典的情况 + options: [], + #end + }, #elseif($column.htmlType == "datetime") component: 'RangePicker', #end @@ -181,7 +190,8 @@ export const updateFormSchema: FormSchema[] = [ fileType: 'file', maxCount: 1, }, - #elseif($column.htmlType == "editor")## 文本编辑器component: 'Editor', + #elseif($column.htmlType == "editor")## 文本编辑器 + component: 'Editor', #elseif($column.htmlType == "select")## 下拉框 component: 'Select', componentProps: { diff --git a/yudao-module-infra/yudao-module-infra-biz/src/main/resources/codegen/vue3_vben/views/index.vue.vm b/yudao-module-infra/yudao-module-infra-biz/src/main/resources/codegen/vue3_vben/views/index.vue.vm index 07f3285c1..f8bcdd865 100644 --- a/yudao-module-infra/yudao-module-infra-biz/src/main/resources/codegen/vue3_vben/views/index.vue.vm +++ b/yudao-module-infra/yudao-module-infra-biz/src/main/resources/codegen/vue3_vben/views/index.vue.vm @@ -1,12 +1,10 @@