From e32801b26236a644584c40885446ae9e7adda71a Mon Sep 17 00:00:00 2001
From: 克 刘 <4345453@qq.com>
Date: Fri, 12 Jun 2020 18:23:48 +0800
Subject: [PATCH] Merge branch 'dev' of http://192.168.2.240:7070/r/kidgrow-microservices-platform into dev
---
.idea/encodings.xml | 10 ----------
1 files changed, 0 insertions(+), 10 deletions(-)
diff --git a/.idea/encodings.xml b/.idea/encodings.xml
index edfcddd..33e9a81 100644
--- a/.idea/encodings.xml
+++ b/.idea/encodings.xml
@@ -4,19 +4,13 @@
<file url="file://$PROJECT_DIR$/kidgrow-business/kidgrow-code-generator/src/main/java" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/kidgrow-business/kidgrow-code-generator/src/main/resources" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/kidgrow-business/kidgrow-filecenter/kidgrow-filecenter-api/src/main/java" charset="UTF-8" />
- <file url="file://$PROJECT_DIR$/kidgrow-business/kidgrow-filecenter/kidgrow-filecenter-api/src/main/resources" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/kidgrow-business/kidgrow-filecenter/kidgrow-filecenter-biz/src/main/java" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/kidgrow-business/kidgrow-filecenter/kidgrow-filecenter-biz/src/main/resources" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/kidgrow-business/kidgrow-filecenter/kidgrow-filecenter-server/src/main/java" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/kidgrow-business/kidgrow-filecenter/kidgrow-filecenter-server/src/main/resources" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/kidgrow-business/kidgrow-logcenter/src/main/java" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/kidgrow-business/kidgrow-logcenter/src/main/resources" charset="UTF-8" />
- <file url="file://$PROJECT_DIR$/kidgrow-business/kidgrow-mqcenter/kidgrow-mqcenter-rocket/kidgrow-mqcenter-rocket-consume/src/main/java" charset="UTF-8" />
- <file url="file://$PROJECT_DIR$/kidgrow-business/kidgrow-mqcenter/kidgrow-mqcenter-rocket/kidgrow-mqcenter-rocket-consume/src/main/resources" charset="UTF-8" />
- <file url="file://$PROJECT_DIR$/kidgrow-business/kidgrow-mqcenter/kidgrow-mqcenter-rocket/kidgrow-mqcenter-rocket-product/src/main/java" charset="UTF-8" />
- <file url="file://$PROJECT_DIR$/kidgrow-business/kidgrow-mqcenter/kidgrow-mqcenter-rocket/kidgrow-mqcenter-rocket-product/src/main/resources" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/kidgrow-business/kidgrow-searchcenter/kidgrow-searchcenter-client/src/main/java" charset="UTF-8" />
- <file url="file://$PROJECT_DIR$/kidgrow-business/kidgrow-searchcenter/kidgrow-searchcenter-client/src/main/resources" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/kidgrow-business/kidgrow-searchcenter/kidgrow-searchcenter-server/src/main/java" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/kidgrow-business/kidgrow-searchcenter/kidgrow-searchcenter-server/src/main/resources" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-api/src/main/java" charset="UTF-8" />
@@ -52,13 +46,10 @@
<file url="file://$PROJECT_DIR$/kidgrow-jobs/kidgrow-jobs-admin/src/main/java" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/kidgrow-jobs/kidgrow-jobs-admin/src/main/resources" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/kidgrow-jobs/kidgrow-jobs-core/src/main/java" charset="UTF-8" />
- <file url="file://$PROJECT_DIR$/kidgrow-jobs/kidgrow-jobs-core/src/main/resources" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/kidgrow-jobs/kidgrow-jobs-samples/src/main/java" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/kidgrow-jobs/kidgrow-jobs-samples/src/main/resources" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/kidgrow-plugin/kidgrow-plugin-email/src/main/java" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/kidgrow-plugin/kidgrow-plugin-email/src/main/resources" charset="UTF-8" />
- <file url="file://$PROJECT_DIR$/kidgrow-plugin/kidgrow-plugin-mq/src/main/java" charset="UTF-8" />
- <file url="file://$PROJECT_DIR$/kidgrow-plugin/kidgrow-plugin-mq/src/main/resources" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/kidgrow-plugin/kidgrow-plugin-sms/src/main/java" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/kidgrow-plugin/kidgrow-plugin-sms/src/main/resources" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/kidgrow-springcloud/kidgrow-springcloud-eureka/src/main/java" charset="UTF-8" />
@@ -70,7 +61,6 @@
<file url="file://$PROJECT_DIR$/kidgrow-springcloud/kidgrow-springcloud-zuul/src/main/java" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/kidgrow-springcloud/kidgrow-springcloud-zuul/src/main/resources" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/kidgrow-uaa/kidgrow-uaa-api/src/main/java" charset="UTF-8" />
- <file url="file://$PROJECT_DIR$/kidgrow-uaa/kidgrow-uaa-api/src/main/resources" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/kidgrow-uaa/kidgrow-uaa-biz/src/main/java" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/kidgrow-uaa/kidgrow-uaa-biz/src/main/resources" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/kidgrow-uaa/kidgrow-uaa-server/src/main/java" charset="UTF-8" />
--
Gitblit v1.8.0