From 1361a289693952d8851e1dd4278bdb4fdee1c8b3 Mon Sep 17 00:00:00 2001 From: tanzs Date: Sun, 2 Mar 2025 13:24:24 +0800 Subject: [PATCH] =?UTF-8?q?fix:=E8=B0=83=E6=95=B4=E8=AE=A2=E5=8D=95?= =?UTF-8?q?=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../sysMiniapp/order/entity/AppOrderCar.java | 4 ++- .../src/main/resources/application-dev.yml | 32 +++++++++++++--------- 2 files changed, 22 insertions(+), 14 deletions(-) diff --git a/jeecg-module-demo/src/main/java/org/jeecg/modules/sysMiniapp/order/entity/AppOrderCar.java b/jeecg-module-demo/src/main/java/org/jeecg/modules/sysMiniapp/order/entity/AppOrderCar.java index 0ef2bff..1dbed18 100644 --- a/jeecg-module-demo/src/main/java/org/jeecg/modules/sysMiniapp/order/entity/AppOrderCar.java +++ b/jeecg-module-demo/src/main/java/org/jeecg/modules/sysMiniapp/order/entity/AppOrderCar.java @@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.annotation.TableLogic; +import org.jeecg.common.aspect.annotation.Dict; import org.jeecg.common.constant.ProvinceCityArea; import org.jeecg.common.util.SpringContextUtils; import lombok.Data; @@ -49,7 +50,8 @@ public class AppOrderCar implements Serializable { @ApiModelProperty(value = "使用性质") private java.lang.String useType; /**是否新车*/ - @Excel(name = "是否新车", width = 15) + @Excel(name = "是否新车", width = 15, dicCode = "yn") + @Dict(dicCode = "yn") @ApiModelProperty(value = "是否新车") private java.lang.Integer newCar; /**车辆型号*/ diff --git a/jeecg-module-system/jeecg-system-start/src/main/resources/application-dev.yml b/jeecg-module-system/jeecg-system-start/src/main/resources/application-dev.yml index 7e02f06..29507ad 100644 --- a/jeecg-module-system/jeecg-system-start/src/main/resources/application-dev.yml +++ b/jeecg-module-system/jeecg-system-start/src/main/resources/application-dev.yml @@ -163,9 +163,9 @@ spring: slow-sql-millis: 5000 datasource: master: - url: jdbc:mysql://8.138.162.67:3306/jeecg_boot?characterEncoding=UTF-8&useUnicode=true&useSSL=false&tinyInt1isBit=false&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai - username: jeecg_boot_test - password: jeecg_boot_test_QM + url: jdbc:mysql://175.24.40.40:3306/contract?characterEncoding=UTF-8&useUnicode=true&useSSL=false&tinyInt1isBit=false&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai + username: root + password: RKpGX%Hz driver-class-name: com.mysql.cj.jdbc.Driver # 多数据源配置 #multi-datasource1: @@ -175,10 +175,10 @@ spring: #driver-class-name: com.mysql.cj.jdbc.Driver #redis 配置 redis: - database: 12 - host: 14.103.91.133 - port: 63799 - password: 'WEather_2024' + database: 0 + host: 175.24.40.40 + port: 6379 + password: 'scyk.123456' #mybatis plus 设置 mybatis-plus: mapper-locations: classpath*:org/jeecg/**/xml/*Mapper.xml @@ -238,6 +238,12 @@ jeecg: endpoint: oss-cn-guangzhou.aliyuncs.com bucketName: augcl staticDomain: https://img.augcl.com +# oss: +# accessKey: LTAI5tHJ2CiaSEZGtYwrPcwS +# secretKey: egOOGtnxgltLlMc488YeXHDVU2cwVm +# endpoint: oss-cn-shenzhen.aliyuncs.com +# bucketName: shengchuangyunkong +# staticDomain: https://img.shengchuangyunkong.com # 短信模板 sms-template: # 签名 @@ -281,8 +287,8 @@ jeecg: logRetentionDays: 30 #分布式锁配置 redisson: - address: 127.0.0.1:6379 - password: + address: 175.24.40.40:6379 + password: scyk.123456 type: STANDALONE enabled: true # 百度开放API配置 @@ -351,10 +357,10 @@ wx: key-prefix: 'wa' # 相关redis前缀配置: wa(默认) type: RedisTemplate # 配置类型: Memory(默认), Jedis, RedisTemplate redis: - database: 12 - host: 14.103.91.133 - port: 63799 - password: 'WEather_2024' + database: 0 + host: 175.24.40.40 + port: 6379 + password: 'scyk.123456' #连接超时时间 timeout: 5000 http-client-type: 'HttpClient' # http客户端类型: HttpClient(默认), OkHttp, JoddHttp