From 229cdb3d5692219b8ddd3ebcf13873d3a0bc703a Mon Sep 17 00:00:00 2001
From: huangh <hshgjzd5@163.com>
Date: Thu, 26 Sep 2024 10:34:54 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/gzdyh_test' into gzdyh_test
---
dyh-service/dyh-cust/src/main/resources/config/application.yml | 11 ++++++-----
1 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/dyh-service/dyh-cust/src/main/resources/config/application.yml b/dyh-service/dyh-cust/src/main/resources/config/application.yml
index 1193643..14865eb 100644
--- a/dyh-service/dyh-cust/src/main/resources/config/application.yml
+++ b/dyh-service/dyh-cust/src/main/resources/config/application.yml
@@ -16,6 +16,7 @@
main:
#可以重复命名配置
allow-bean-definition-overriding: true
+ allow-circular-references: true
#server配置
server:
@@ -53,10 +54,10 @@
capital-mode: true
#全局逻辑删除的实体字段名
#logic-delete-field: flag
- #逻辑未删除值(默认为 1)，实体类字段需要加上@TableLogic
- logic-not-delete-value: 1
- #逻辑已删除值(默认为 0)
- logic-delete-value: 0
+ #逻辑未删除值(默认为 0)，实体类字段需要加上@TableLogic
+ logic-not-delete-value: 0
+ #逻辑已删除值(默认为 1)
+ logic-delete-value: 1
#字段策略，IGNORED：忽略判断，NOT_NULL：非null判断，NOT_EMPTY：非空判断，DEFAULT：默认，NEVER：不加入sql
update-strategy: IGNORED
mapper-locations: classpath*:/cn/huge/*/*/dao/mapper/xml/*Mapper.xml
@@ -66,7 +67,7 @@
#jwt生成密钥
secret-key: asdfghjkl
#用户
- iss_user: HUGEINFO
+ iss-user: HUGEINFO
refresh-token-key:
#refreshToken 存储key
format: JWT_REFRESH_TOKEN::%s
--
Gitblit v1.8.0