diff --git a/maintain-admin/src/main/resources/application-prod.yml b/maintain-admin/src/main/resources/application-prod.yml index 7de2c2affceeda22856ace1f1270437560c661d5..d57a9f6344e51e90a90c2138830d6a8f00248c6a 100644 --- a/maintain-admin/src/main/resources/application-prod.yml +++ b/maintain-admin/src/main/resources/application-prod.yml @@ -52,17 +52,17 @@ spring: driverClassName: com.mysql.cj.jdbc.Driver # jdbc 所有参数配置参考 https://lionli.blog.csdn.net/article/details/122018562 # rewriteBatchedStatements=true 批处理优化 大幅提升批量插入更新删除性能(对数据库有性能损耗 使用批量操作应考虑性能问题) - url: jdbc:mysql://rm-hp3340490n5mw72tcto.mysql.huhehaote.rds.aliyuncs.com:3306/tianmaiweixiu_db?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&autoReconnect=true&rewriteBatchedStatements=true - username: tianmaiweixiu - password: 7HTx9s@2wcbTQ@r1 + url: jdbc:mysql://10.100.102.83:3306/weixiu?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&autoReconnect=true&rewriteBatchedStatements=true + username: root + password: 15afb87c52059344 # 从库数据源 slave: lazy: true type: ${spring.datasource.type} driverClassName: com.mysql.cj.jdbc.Driver - url: jdbc:mysql://rm-hp3340490n5mw72tcto.mysql.huhehaote.rds.aliyuncs.com:3306/tianmaiweixiu_db?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&autoReconnect=true&rewriteBatchedStatements=true - username: tianmaiweixiu - password: 7HTx9s@2wcbTQ@r1 + url: jdbc:mysql://10.100.102.83:3306/weixiu?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&autoReconnect=true&rewriteBatchedStatements=true + username: root + password: 15afb87c52059344 # oracle: # type: ${spring.datasource.type} # driverClassName: oracle.jdbc.OracleDriver diff --git a/maintain-admin/src/main/resources/application.yml b/maintain-admin/src/main/resources/application.yml index 0dc19c67bc5b4d2565f634cac13b4167ade838fe..d39c4222276c0f60e97fc8f44c5815ee7a64aabf 100644 --- a/maintain-admin/src/main/resources/application.yml +++ b/maintain-admin/src/main/resources/application.yml @@ -66,7 +66,7 @@ spring: # 国际化资源文件路径 basename: i18n/messages profiles: - active: dev + active: prod # 文件上传 servlet: multipart: diff --git a/maintain-business/src/main/java/com/maintain/business/domain/bo/ErpCarBo.java b/maintain-business/src/main/java/com/maintain/business/domain/bo/ErpCarBo.java index a07fd03b71e2f37dbc43c9b326ef5581dc5585de..852a5b0f8b230b2a5947c2a72ef04f8c99880363 100644 --- a/maintain-business/src/main/java/com/maintain/business/domain/bo/ErpCarBo.java +++ b/maintain-business/src/main/java/com/maintain/business/domain/bo/ErpCarBo.java @@ -38,19 +38,16 @@ public class ErpCarBo extends BaseEntity { /** * 手机号 */ - @NotBlank(message = "手机号不能为空", groups = { AddGroup.class, EditGroup.class }) private String phone; /** * 客户ID */ - @NotNull(message = "客户ID不能为空", groups = { AddGroup.class, EditGroup.class }) private Long clientId; /** * 客户名称 */ - @NotBlank(message = "客户名称不能为空", groups = { AddGroup.class, EditGroup.class }) private String clientName; /** @@ -67,19 +64,17 @@ public class ErpCarBo extends BaseEntity { /** * 驾驶证图片(逗号分割) */ - @NotBlank(message = "驾驶证图片(逗号分割)不能为空", groups = { AddGroup.class, EditGroup.class }) private String drivingLicenseUrl; /** * 车辆图片(逗号分割) */ - @NotBlank(message = "车辆图片(逗号分割)不能为空", groups = { AddGroup.class, EditGroup.class }) private String carImgUrl; /** * 车型ID */ - @NotNull(message = "车型ID不能为空", groups = { AddGroup.class, EditGroup.class }) + @NotNull(message = "车型不能为空", groups = { AddGroup.class, EditGroup.class }) private Long carTypeId; /** diff --git a/maintain-business/src/main/java/com/maintain/business/domain/bo/ErpRepairFormBo.java b/maintain-business/src/main/java/com/maintain/business/domain/bo/ErpRepairFormBo.java index 3dae3196906925b1201a97410d65398223d59bd3..7e498340158b60c0912126a84852993e8654c32f 100644 --- a/maintain-business/src/main/java/com/maintain/business/domain/bo/ErpRepairFormBo.java +++ b/maintain-business/src/main/java/com/maintain/business/domain/bo/ErpRepairFormBo.java @@ -120,7 +120,6 @@ public class ErpRepairFormBo extends BaseEntity { /** * 旧件带走(0不带 1带走) */ - @NotNull(message = "旧件带走不能为空", groups = { AddGroup.class, EditGroup.class }) private Integer isOldPart; /** diff --git a/maintain-ui/src/views/business/car/index.vue b/maintain-ui/src/views/business/car/index.vue index 927fc580829a476c79b635896a80f144c71ec952..1a79544f8e3781e3e48feea1f77fcf481896ecc6 100644 --- a/maintain-ui/src/views/business/car/index.vue +++ b/maintain-ui/src/views/business/car/index.vue @@ -1,6 +1,14 @@