From e27fd9e55d066d093084262d81d58dc4b3cd6791 Mon Sep 17 00:00:00 2001 From: Theo <971366405@qq.com> Date: Tue, 31 Dec 2024 17:26:34 +0800 Subject: [PATCH 1/5] =?UTF-8?q?feat(UserMapper):=20=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E7=94=A8=E6=88=B7=E6=9F=A5=E8=AF=A2=E6=9D=A1=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 将用户查询条件从用户名改为 openid - 此修改使得系统能够根据 openid 获取用户信息，提高了安全性 --- src/main/resources/mapper/system/UserMapper.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/resources/mapper/system/UserMapper.xml b/src/main/resources/mapper/system/UserMapper.xml index 56034645..8bd7dc3e 100644 --- a/src/main/resources/mapper/system/UserMapper.xml +++ b/src/main/resources/mapper/system/UserMapper.xml @@ -156,7 +156,7 @@ LEFT JOIN sys_user_role t2 ON t2.user_id = t1.id LEFT JOIN sys_role t3 ON t3.id = t2.role_id WHERE - t1.username = #{username} AND t1.is_deleted = 0 + t1.openid = #{openid} AND t1.is_deleted = 0 From 82b8e101a2d0c993eb814180b9bec794225e0cde Mon Sep 17 00:00:00 2001 From: "Ray.Hao" <1490493387@qq.com> Date: Wed, 1 Jan 2025 22:11:52 +0800 Subject: [PATCH 2/5] =?UTF-8?q?fix:=20=E4=BB=A3=E7=A0=81=E7=94=9F=E6=88=90?= =?UTF-8?q?=E5=AE=9E=E4=BD=93=E5=90=8D=E7=94=9F=E6=88=90=E4=B8=BA=E7=A9=BA?= =?UTF-8?q?=E9=97=AE=E9=A2=98=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../shared/codegen/service/impl/GenConfigServiceImpl.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/youlai/boot/shared/codegen/service/impl/GenConfigServiceImpl.java b/src/main/java/com/youlai/boot/shared/codegen/service/impl/GenConfigServiceImpl.java index bb6601f4..d305894d 100644 --- a/src/main/java/com/youlai/boot/shared/codegen/service/impl/GenConfigServiceImpl.java +++ b/src/main/java/com/youlai/boot/shared/codegen/service/impl/GenConfigServiceImpl.java @@ -78,13 +78,13 @@ public class GenConfigServiceImpl extends ServiceImpl 用户 String tableComment = tableMetadata.getTableComment(); if (StrUtil.isNotBlank(tableComment)) { genConfig.setBusinessName(tableComment.replace("表", "").trim()); } - // 实体类名 = 表名去掉前缀后转驼峰，前缀默认为下划线分割的第一个元素 - String entityName = StrUtil.toCamelCase(StrUtil.removePrefix(tableName, tableName.split("_")[0])); - genConfig.setEntityName(entityName); + // 根据表名生成实体类名 例如：sys_user -> SysUser + genConfig.setEntityName(StrUtil.toCamelCase(StrUtil.upperFirst(StrUtil.toCamelCase(tableName)))); genConfig.setPackageName(YouLaiBootApplication.class.getPackageName()); genConfig.setModuleName(codegenProperties.getDefaultConfig().getModuleName()); // 默认模块名 From bdabe6c997c1e494dee1e28c6e575134336d850b Mon Sep 17 00:00:00 2001 From: "Ray.Hao" <1490493387@qq.com> Date: Thu, 2 Jan 2025 01:10:22 +0800 Subject: [PATCH 3/5] =?UTF-8?q?refactor:=20=E4=BB=A3=E7=A0=81=E7=94=9F?= =?UTF-8?q?=E6=88=90=E8=A1=A8=E5=8D=95=E6=94=AF=E6=8C=81=E9=9A=90=E8=97=8F?= =?UTF-8?q?=E5=9F=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../shared/codegen/enums/FormTypeEnum.java | 7 ++++- .../resources/templates/codegen/api.ts.vm | 8 +++--- .../resources/templates/codegen/index.vue.vm | 27 +++++++++++++------ 3 files changed, 29 insertions(+), 13 deletions(-) diff --git a/src/main/java/com/youlai/boot/shared/codegen/enums/FormTypeEnum.java b/src/main/java/com/youlai/boot/shared/codegen/enums/FormTypeEnum.java index 299b80aa..255d83f5 100644 --- a/src/main/java/com/youlai/boot/shared/codegen/enums/FormTypeEnum.java +++ b/src/main/java/com/youlai/boot/shared/codegen/enums/FormTypeEnum.java @@ -60,7 +60,12 @@ public enum FormTypeEnum implements IBaseEnum { /** * 日期框 */ - DATE_TIME(9, "日期时间框"); + DATE_TIME(9, "日期时间框"), + + /** + * 隐藏域 + */ + HIDDEN(10, "隐藏域"); // Mybatis-Plus 提供注解表示插入数据库时插入该值 diff --git a/src/main/resources/templates/codegen/api.ts.vm b/src/main/resources/templates/codegen/api.ts.vm index 1e2e6c97..cbf8f6dd 100644 --- a/src/main/resources/templates/codegen/api.ts.vm +++ b/src/main/resources/templates/codegen/api.ts.vm @@ -14,8 +14,8 @@ const ${entityName}API = { /** * 获取${businessName}表单数据 * - * @param id ${entityName}ID - * @returns ${entityName}表单数据 + * @param id ${businessName}ID + * @returns ${businessName}表单数据 */ getFormData(id: number) { return request({ @@ -36,8 +36,8 @@ const ${entityName}API = { /** * 更新${businessName} * - * @param id ${entityName}ID - * @param data ${entityName}表单数据 + * @param id ${businessName}ID + * @param data ${businessName}表单数据 */ update(id: number, data: ${entityName}Form) { return request({ diff --git a/src/main/resources/templates/codegen/index.vue.vm b/src/main/resources/templates/codegen/index.vue.vm index faedf21c..4c21b77e 100644 --- a/src/main/resources/templates/codegen/index.vue.vm +++ b/src/main/resources/templates/codegen/index.vue.vm @@ -125,13 +125,21 @@ #foreach($fieldConfig in $fieldConfigs) #if($fieldConfig.isShowInList == 1) - + #if($fieldConfig.dictType && $fieldConfig.dictType.trim() != "") + + + + #else + + #end #end #end @@ -178,7 +186,7 @@ > #foreach($fieldConfig in $fieldConfigs) - #if($fieldConfig.isShowInForm == 1) + #if($fieldConfig.isShowInForm == 1 && $fieldConfig.formType != "HIDDEN") #if($fieldConfig.formType == "INPUT") #end + + #elseif($fieldConfig.formType == "HIDDEN") + #end #end From 897c42f0f2177e687585ec516ecfef44f8ad8634 Mon Sep 17 00:00:00 2001 From: "Ray.Hao" <1490493387@qq.com> Date: Thu, 2 Jan 2025 08:09:19 +0800 Subject: [PATCH 4/5] =?UTF-8?q?refactor(codegen):=20=E4=BB=A3=E7=A0=81?= =?UTF-8?q?=E7=94=9F=E6=88=90=E4=BC=98=E5=8C=96=E5=AD=97=E5=85=B8=E6=98=BE?= =?UTF-8?q?=E7=A4=BA=E5=92=8C=E5=8D=95/=E5=A4=8D=E9=80=89=E6=A1=86?= =?UTF-8?q?=E6=94=AF=E6=8C=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../resources/templates/codegen/index.vue.vm | 52 ++++++++++++------- 1 file changed, 34 insertions(+), 18 deletions(-) diff --git a/src/main/resources/templates/codegen/index.vue.vm b/src/main/resources/templates/codegen/index.vue.vm index 4c21b77e..c7bdad55 100644 --- a/src/main/resources/templates/codegen/index.vue.vm +++ b/src/main/resources/templates/codegen/index.vue.vm @@ -13,7 +13,7 @@ @keyup.enter="handleQuery()" /> #elseif($fieldConfig.formType == "SELECT") - #if($fieldConfig.dictType != "") + #if($fieldConfig.dictType && $fieldConfig.dictType.trim() != "") #else @@ -22,15 +22,23 @@ #end #elseif($fieldConfig.formType == "RADIO") - - 选项一 - 选项二 - + #if($fieldConfig.dictType && $fieldConfig.dictType.trim() != "") + + #else + + 选项一 + 选项二 + + #end #elseif($fieldConfig.formType == "CHECK_BOX") - - 选项一 - 选项二 - + #if($fieldConfig.dictType && $fieldConfig.dictType.trim() != "") + + #else + + 选项一 + 选项二 + + #end #elseif($fieldConfig.formType == "INPUT_NUMBER") #elseif($fieldConfig.formType == "SELECT") - #if($fieldConfig.dictType != "") + #if($fieldConfig.dictType && $fieldConfig.dictType.trim() != "") #else @@ -203,15 +211,23 @@ #end #elseif($fieldConfig.formType == "RADIO") - - 选项一 - 选项二 - + #if($fieldConfig.dictType && $fieldConfig.dictType.trim() != "") + + #else + + 选项一 + 选项二 + + #end #elseif($fieldConfig.formType == "CHECK_BOX") - - 选项一 - 选项二 - + #if($fieldConfig.dictType && $fieldConfig.dictType.trim() != "") + + #else + + 选项一 + 选项二 + + #end #elseif($fieldConfig.formType == "INPUT_NUMBER") Date: Sun, 5 Jan 2025 23:41:31 +0800 Subject: [PATCH 5/5] =?UTF-8?q?feat(WebMvcConfig):=20=E4=BC=98=E5=8C=96=20?= =?UTF-8?q?JSON=20=E5=BA=8F=E5=88=97=E5=8C=96=E4=B8=AD=E7=9A=84=E6=97=A5?= =?UTF-8?q?=E6=9C=9F=E6=A0=BC=E5=BC=8F=20-=20=E5=9C=A8=20ObjectMapper=20?= =?UTF-8?q?=E4=B8=AD=E8=AE=BE=E7=BD=AE=E6=97=A5=E6=9C=9F=E6=A0=BC=E5=BC=8F?= =?UTF-8?q?=E4=B8=BA=20"yyyy-MM-dd=20HH:mm:ss"=20-=20=E4=BC=98=E5=8C=96?= =?UTF-8?q?=E9=85=8D=E7=BD=AE=E6=B6=88=E6=81=AF=E8=BD=AC=E6=8D=A2=E5=99=A8?= =?UTF-8?q?=E5=AF=BC=E8=87=B4=E9=85=8D=E7=BD=AE=E6=96=87=E4=BB=B6=E4=B8=AD?= =?UTF-8?q?=E7=9A=84date-format:=20yyyy-MM-dd=20HH:mm:ss=E5=A4=B1=E6=95=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/com/youlai/boot/config/WebMvcConfig.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/main/java/com/youlai/boot/config/WebMvcConfig.java b/src/main/java/com/youlai/boot/config/WebMvcConfig.java index 20f73586..a865c163 100644 --- a/src/main/java/com/youlai/boot/config/WebMvcConfig.java +++ b/src/main/java/com/youlai/boot/config/WebMvcConfig.java @@ -20,6 +20,7 @@ import org.springframework.validation.beanvalidation.SpringConstraintValidatorFa import org.springframework.web.servlet.config.annotation.WebMvcConfigurer; import java.math.BigInteger; +import java.text.SimpleDateFormat; import java.util.List; /** @@ -50,6 +51,7 @@ public class WebMvcConfig implements WebMvcConfigurer { simpleModule.addSerializer(Long.class, ToStringSerializer.instance); simpleModule.addSerializer(BigInteger.class, ToStringSerializer.instance); objectMapper.registerModule(simpleModule); + objectMapper.setDateFormat(new SimpleDateFormat("yyyy-MM-dd HH:mm:ss")); jackson2HttpMessageConverter.setObjectMapper(objectMapper); converters.add(1, jackson2HttpMessageConverter);