配置文件拆分

ffe10304 · fangxinjiang · 11fa2dbd · ffe10304 · ffe10304 · ffe10304
Commit ffe10304 authored Jun 16, 2022 by fangxinjiang
18 changed files
--- a/yifu-consumer/.gitignore
+++ b/yifu-consumer/.gitignore
--- a/yifu-consumer/consumer-api/pom.xml
+++ b/yifu-consumer/consumer-api/pom.xml
--- a/yifu-consumer/consumer-biz/Dockerfile
+++ b/yifu-consumer/consumer-biz/Dockerfile
--- a/yifu-consumer/consumer-biz/build-prd.sh
+++ b/yifu-consumer/consumer-biz/build-prd.sh
--- a/yifu-consumer/consumer-biz/build-test.sh
+++ b/yifu-consumer/consumer-biz/build-test.sh
--- a/yifu-consumer/consumer-biz/build.sh
+++ b/yifu-consumer/consumer-biz/build.sh
--- a/yifu-consumer/consumer-biz/pom.xml
+++ b/yifu-consumer/consumer-biz/pom.xml
--- a/yifu-consumer/consumer-biz/src/main/java/com/yifu/cloud/plus/v1/consumer/ConsumerApplication.java
+++ b/yifu-consumer/consumer-biz/src/main/java/com/yifu/cloud/plus/v1/consumer/ConsumerApplication.java
--- a/yifu-consumer/consumer-biz/src/main/java/com/yifu/cloud/plus/v1/consumer/controller/ConsumerController.java
+++ b/yifu-consumer/consumer-biz/src/main/java/com/yifu/cloud/plus/v1/consumer/controller/ConsumerController.java
--- a/yifu-consumer/consumer-biz/src/main/java/com/yifu/cloud/plus/v1/consumer/entity/Consumer.java
+++ b/yifu-consumer/consumer-biz/src/main/java/com/yifu/cloud/plus/v1/consumer/entity/Consumer.java
--- a/yifu-consumer/consumer-biz/src/main/java/com/yifu/cloud/plus/v1/consumer/mapper/ConsumerMapper.java
+++ b/yifu-consumer/consumer-biz/src/main/java/com/yifu/cloud/plus/v1/consumer/mapper/ConsumerMapper.java
--- a/yifu-consumer/consumer-biz/src/main/java/com/yifu/cloud/plus/v1/consumer/service/ConsumerService.java
+++ b/yifu-consumer/consumer-biz/src/main/java/com/yifu/cloud/plus/v1/consumer/service/ConsumerService.java
--- a/yifu-consumer/consumer-biz/src/main/java/com/yifu/cloud/plus/v1/consumer/service/impl/ConsumerServiceImpl.java
+++ b/yifu-consumer/consumer-biz/src/main/java/com/yifu/cloud/plus/v1/consumer/service/impl/ConsumerServiceImpl.java
--- a/yifu-consumer/consumer-biz/src/main/resources/application.yml
+++ b/yifu-consumer/consumer-biz/src/main/resources/application.yml
--- a/yifu-consumer/consumer-biz/src/main/resources/logback-spring.xml
+++ b/yifu-consumer/consumer-biz/src/main/resources/logback-spring.xml
--- a/yifu-consumer/consumer-biz/src/main/resources/mapper/ConsumerMapper.xml
+++ b/yifu-consumer/consumer-biz/src/main/resources/mapper/ConsumerMapper.xml
--- a/yifu-consumer/pom.xml
+++ b/yifu-consumer/pom.xml
--- a/yifu-upms/yifu-upms-biz/src/main/java/com/yifu.cloud.plus.v1/yifu/admin/controller/DictController.java
+++ b/yifu-upms/yifu-upms-biz/src/main/java/com/yifu.cloud.plus.v1/yifu/admin/controller/DictController.java
@@ -201,7 +201,7 @@ public class DictController {
 	public R updateById(@RequestBody SysDictItem sysDictItem) {
 		SysDictItem item = sysDictItemService.getOne(Wrappers.<SysDictItem>query().lambda()
 				.eq(SysDictItem::getType,sysDictItem.getType())
-				.ne(SysDictItem::getId,sysDictItem.getDictId())
+				.ne(SysDictItem::getId,sysDictItem.getId())
 				.eq(SysDictItem::getValue,sysDictItem.getValue())
 				.eq(SysDictItem::getDelFlag,CommonConstants.ZERO_STRING)
 				.last(CommonConstants.LAST_ONE_SQL));