diff --git a/cola-cloud-auth/src/main/java/com/honvay/cola/cloud/auth/AuthApplication.java b/cola-cloud-auth/src/main/java/com/honvay/cola/cloud/auth/AuthApplication.java
index b22be659e4312532c72a036843ece02b6cbf5567..3a8fb8f94b28ad5bafb1499fdf839ea570cbdd41 100644
--- a/cola-cloud-auth/src/main/java/com/honvay/cola/cloud/auth/AuthApplication.java
+++ b/cola-cloud-auth/src/main/java/com/honvay/cola/cloud/auth/AuthApplication.java
@@ -3,22 +3,17 @@ package com.honvay.cola.cloud.auth;
 import com.honvay.cola.cloud.framework.oauth2.feign.EnableOAuth2ClientFeign;
 import org.mybatis.spring.annotation.MapperScan;
 import org.springframework.boot.SpringApplication;
-import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.cache.annotation.EnableCaching;
 import org.springframework.cloud.client.SpringCloudApplication;
-import org.springframework.cloud.client.circuitbreaker.EnableCircuitBreaker;
 import org.springframework.cloud.client.discovery.EnableDiscoveryClient;
-import org.springframework.cloud.netflix.eureka.EnableEurekaClient;
 import org.springframework.cloud.netflix.feign.EnableFeignClients;
 import org.springframework.context.annotation.ComponentScan;
 import org.springframework.security.oauth2.config.annotation.web.configuration.EnableOAuth2Client;
-import org.springframework.security.oauth2.config.annotation.web.configuration.EnableResourceServer;
 
 /** 
  * @author LIQIU
  */
 @SpringCloudApplication
-@EnableResourceServer
 @EnableCaching
 @EnableOAuth2Client
 @EnableDiscoveryClient
diff --git a/cola-cloud-auth/src/main/java/com/honvay/cola/cloud/auth/configuration/ResourceServerConfiguration.java b/cola-cloud-auth/src/main/java/com/honvay/cola/cloud/auth/configuration/ResourceServerConfiguration.java
index 81b8e1f5528e2c4bc8ca6e23a821f87cc43d1fa6..068d77b697954f095e5b52b72dc480df063e0f4f 100644
--- a/cola-cloud-auth/src/main/java/com/honvay/cola/cloud/auth/configuration/ResourceServerConfiguration.java
+++ b/cola-cloud-auth/src/main/java/com/honvay/cola/cloud/auth/configuration/ResourceServerConfiguration.java
@@ -20,7 +20,9 @@ public class ResourceServerConfiguration extends ResourceServerConfigurerAdapter
 
     @Override
     public void configure(HttpSecurity http) throws Exception {
-        http.anonymous().disable().csrf().disable()
+        http
+            //anonymous().disable()
+            .csrf().disable()
             .authorizeRequests().antMatchers("/v2/api-docs", "/sms/token").permitAll()
             .and().authorizeRequests().anyRequest().fullyAuthenticated()
             .and().logout().permitAll()
diff --git a/cola-cloud-config/src/main/resources/shared/application.yml b/cola-cloud-config/src/main/resources/shared/application.yml
index 845bcd2b42c5ccb22996cedb08e8fade88b4698f..636384b4afc787ada09323d6b7239c8f2fae3cb3 100644
--- a/cola-cloud-config/src/main/resources/shared/application.yml
+++ b/cola-cloud-config/src/main/resources/shared/application.yml
@@ -31,14 +31,16 @@ spring:
   datasource:
     url: jdbc:mysql://cola-mysql:3306/cola-cloud?autoReconnect=true&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull
     username: root
-    password: root
+    password: ${COLA_MYSQL_PASSWORD}
     type: com.alibaba.druid.pool.DruidDataSource
     driver-class-name: com.mysql.jdbc.Driver
     db-name: cola-cloud
+  cache:
+    type: redis
   redis:
     host: cola-redis
     port: 6379
-    password:
+    password: ${COLA_REDIS_PASSWORD}
     database: 8
     timeout: 0
     pool:
diff --git a/cola-cloud-config/src/main/resources/shared/common-service.yml b/cola-cloud-config/src/main/resources/shared/common-service.yml
index dadd5d561d9d0df38713a5a60bd2a0a8a4ee6e0e..25b79e662d19eceb6a73f82cdbd7170399c44db5 100644
--- a/cola-cloud-config/src/main/resources/shared/common-service.yml
+++ b/cola-cloud-config/src/main/resources/shared/common-service.yml
@@ -8,10 +8,10 @@ cola:
     oss:
       access-key-id: ${COLA_ALIYUN_ACCESS_KEY_ID}
       access-key-secret: ${COLA_ALIYUN_ACCESS_KEY_SECRET}
-      bucket-name: honvay-cola
+      bucket-name: ${COLA_ALIYUN_OSS_BUCKET_NAME}
       endpoint: oss-cn-hangzhou.aliyuncs.com
   vc:
     sms:
-      template-code: SMS_115750106
+      template-code: ${COLA_SMS_TEMPLATE_CODE}
       code-param-name: code
-      sign-name: Cola云平台
+      sign-name: ${COLA_SMS_SIGN_NAME}
diff --git a/cola-cloud-config/src/main/resources/shared/gateway.yml b/cola-cloud-config/src/main/resources/shared/gateway.yml
index b0d7bcd5a12060b0386f85420a821244f911c2dc..071ff1827dfa9d80dc4e49911c1a8ac661c727aa 100644
--- a/cola-cloud-config/src/main/resources/shared/gateway.yml
+++ b/cola-cloud-config/src/main/resources/shared/gateway.yml
@@ -41,6 +41,12 @@ zuul:
         stripPrefix: false
         sensitiveHeaders:
 
+    message-service:
+        path: /message/**
+        serviceId: message-service
+        stripPrefix: false
+        sensitiveHeaders:
+
     notification-service:
         path: /notification/**
         serviceId: notification-service
diff --git a/cola-cloud-devtools/src/main/java/com/honvay/cola/cloud/devtools/generator/service/GenerateService.java b/cola-cloud-devtools/src/main/java/com/honvay/cola/cloud/devtools/generator/service/GenerateService.java
index a26e78982e421c125d6ea13dc5697add01924c0e..ff83d8faa3646a3bb1e72307d4a024a7136bdbd2 100644
--- a/cola-cloud-devtools/src/main/java/com/honvay/cola/cloud/devtools/generator/service/GenerateService.java
+++ b/cola-cloud-devtools/src/main/java/com/honvay/cola/cloud/devtools/generator/service/GenerateService.java
@@ -82,6 +82,7 @@ public class GenerateService {
         strategyConfig.setSuperControllerClass("com.honvay.cola.cloud.framework.base.controller.BaseController");
         strategyConfig.setEntityLombokModel(true);
         strategyConfig.setRestControllerStyle(true);
+        strategyConfig.setEntityColumnConstant(true);
 
 
         packageConfig = new PackageConfig();
diff --git a/cola-cloud-devtools/src/main/resources/application.yml b/cola-cloud-devtools/src/main/resources/application.yml
index 041966320001715f3ed98e5b743ed2492cc66a97..11d9c2f55da24edc5682bf561fce5d159c006687 100644
--- a/cola-cloud-devtools/src/main/resources/application.yml
+++ b/cola-cloud-devtools/src/main/resources/application.yml
@@ -3,9 +3,9 @@ server:
 
 spring:
     datasource:
-      url: jdbc:mysql://localhost:3306/cola-cloud?autoReconnect=true&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull
+      url: jdbc:mysql://cola-mysql:3306/cola-cloud?autoReconnect=true&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull
       username: root
-      password: root
+      password: ${COLA_MYSQL_PASSWORD}
       type: com.alibaba.druid.pool.DruidDataSource
       driver-class-name: com.mysql.jdbc.Driver
       db-name: cola-cloud
diff --git a/cola-cloud-platform/cola-cloud-message/cola-cloud-message-service/pom.xml b/cola-cloud-platform/cola-cloud-message/cola-cloud-message-service/pom.xml
index a4fa6ac26695c074b62599d517045b8e76a22296..754a661152f9d15663f844f387b6a34caf830145 100644
--- a/cola-cloud-platform/cola-cloud-message/cola-cloud-message-service/pom.xml
+++ b/cola-cloud-platform/cola-cloud-message/cola-cloud-message-service/pom.xml
@@ -71,5 +71,9 @@
             <groupId>com.honvay.cola</groupId>
             <artifactId>cola-cloud-notification-client</artifactId>
         </dependency>
+        <dependency>
+            <groupId>com.honvay.cola</groupId>
+            <artifactId>cola-cloud-framework-starter-swagger</artifactId>
+        </dependency>
     </dependencies>
 </project>
\ No newline at end of file
diff --git a/cola-cloud-platform/cola-cloud-notification/cola-cloud-notification-service/src/main/java/com/honvay/cola/cloud/notification/service/NoticationAutoConfiguration.java b/cola-cloud-platform/cola-cloud-notification/cola-cloud-notification-service/src/main/java/com/honvay/cola/cloud/notification/service/configuration/NoticationAutoConfiguration.java
similarity index 96%
rename from cola-cloud-platform/cola-cloud-notification/cola-cloud-notification-service/src/main/java/com/honvay/cola/cloud/notification/service/NoticationAutoConfiguration.java
rename to cola-cloud-platform/cola-cloud-notification/cola-cloud-notification-service/src/main/java/com/honvay/cola/cloud/notification/service/configuration/NoticationAutoConfiguration.java
index 8adc443820af2ab4a173b70aac155865ec0276c2..59218b603158b24d379738ca4858652735e4b60e 100644
--- a/cola-cloud-platform/cola-cloud-notification/cola-cloud-notification-service/src/main/java/com/honvay/cola/cloud/notification/service/NoticationAutoConfiguration.java
+++ b/cola-cloud-platform/cola-cloud-notification/cola-cloud-notification-service/src/main/java/com/honvay/cola/cloud/notification/service/configuration/NoticationAutoConfiguration.java
@@ -1,4 +1,4 @@
-package com.honvay.cola.cloud.notification.service;
+package com.honvay.cola.cloud.notification.service.configuration;
 
 import com.honvay.cola.cloud.framework.mail.MailSender;
 import com.honvay.cola.cloud.framework.sms.SmsSender;
diff --git a/cola-cloud-platform/cola-cloud-notification/cola-cloud-notification-service/src/main/java/com/honvay/cola/cloud/notification/service/NotificationController.java b/cola-cloud-platform/cola-cloud-notification/cola-cloud-notification-service/src/main/java/com/honvay/cola/cloud/notification/service/controller/NotificationController.java
similarity index 89%
rename from cola-cloud-platform/cola-cloud-notification/cola-cloud-notification-service/src/main/java/com/honvay/cola/cloud/notification/service/NotificationController.java
rename to cola-cloud-platform/cola-cloud-notification/cola-cloud-notification-service/src/main/java/com/honvay/cola/cloud/notification/service/controller/NotificationController.java
index cb952131f0c20024b2274dc1ca3a6df55765136a..f143efefb0c46d64ec6eeb1a2eba2a4560ea9d91 100644
--- a/cola-cloud-platform/cola-cloud-notification/cola-cloud-notification-service/src/main/java/com/honvay/cola/cloud/notification/service/NotificationController.java
+++ b/cola-cloud-platform/cola-cloud-notification/cola-cloud-notification-service/src/main/java/com/honvay/cola/cloud/notification/service/controller/NotificationController.java
@@ -1,8 +1,9 @@
-package com.honvay.cola.cloud.notification.service;
+package com.honvay.cola.cloud.notification.service.controller;
 
 import com.honvay.cola.cloud.framework.core.protocol.Result;
 import com.honvay.cola.cloud.notification.model.EmailNotification;
 import com.honvay.cola.cloud.notification.model.SmsNotification;
+import com.honvay.cola.cloud.notification.service.support.NotificationDispatcher;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.amqp.rabbit.core.RabbitTemplate;
diff --git a/cola-cloud-platform/cola-cloud-notification/cola-cloud-notification-service/src/main/java/com/honvay/cola/cloud/notification/service/NotificationTask.java b/cola-cloud-platform/cola-cloud-notification/cola-cloud-notification-service/src/main/java/com/honvay/cola/cloud/notification/service/model/NotificationTask.java
similarity index 92%
rename from cola-cloud-platform/cola-cloud-notification/cola-cloud-notification-service/src/main/java/com/honvay/cola/cloud/notification/service/NotificationTask.java
rename to cola-cloud-platform/cola-cloud-notification/cola-cloud-notification-service/src/main/java/com/honvay/cola/cloud/notification/service/model/NotificationTask.java
index 35e0cbe0256a7d41f9fe2671b132a9effa2c28c5..2912f8bc3e6c3efabc7335b586bba4d29d765b96 100644
--- a/cola-cloud-platform/cola-cloud-notification/cola-cloud-notification-service/src/main/java/com/honvay/cola/cloud/notification/service/NotificationTask.java
+++ b/cola-cloud-platform/cola-cloud-notification/cola-cloud-notification-service/src/main/java/com/honvay/cola/cloud/notification/service/model/NotificationTask.java
@@ -1,4 +1,4 @@
-package com.honvay.cola.cloud.notification.service;
+package com.honvay.cola.cloud.notification.service.model;
 
 import com.honvay.cola.cloud.notification.model.Notification;
 import com.honvay.cola.cloud.notification.service.exchanger.NotificationExchanger;
diff --git a/cola-cloud-platform/cola-cloud-notification/cola-cloud-notification-service/src/main/java/com/honvay/cola/cloud/notification/service/NotificationDispatcher.java b/cola-cloud-platform/cola-cloud-notification/cola-cloud-notification-service/src/main/java/com/honvay/cola/cloud/notification/service/support/NotificationDispatcher.java
similarity index 95%
rename from cola-cloud-platform/cola-cloud-notification/cola-cloud-notification-service/src/main/java/com/honvay/cola/cloud/notification/service/NotificationDispatcher.java
rename to cola-cloud-platform/cola-cloud-notification/cola-cloud-notification-service/src/main/java/com/honvay/cola/cloud/notification/service/support/NotificationDispatcher.java
index c4ae228525030d0f2d30d056cf381d3bc5d5608c..4f966eb28a6e0cdea54ccff27782b8a29fd5b476 100644
--- a/cola-cloud-platform/cola-cloud-notification/cola-cloud-notification-service/src/main/java/com/honvay/cola/cloud/notification/service/NotificationDispatcher.java
+++ b/cola-cloud-platform/cola-cloud-notification/cola-cloud-notification-service/src/main/java/com/honvay/cola/cloud/notification/service/support/NotificationDispatcher.java
@@ -1,7 +1,8 @@
-package com.honvay.cola.cloud.notification.service;
+package com.honvay.cola.cloud.notification.service.support;
 
 import com.honvay.cola.cloud.notification.model.Notification;
 import com.honvay.cola.cloud.notification.service.exchanger.NotificationExchanger;
+import com.honvay.cola.cloud.notification.service.model.NotificationTask;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.log4j.Logger;
 import org.springframework.amqp.core.Queue;
diff --git a/cola-cloud-platform/cola-cloud-organization/src/main/resources/bootstrap.yml b/cola-cloud-platform/cola-cloud-organization/src/main/resources/bootstrap.yml
index 046cbc1cfe13ca38dfa74de5f9d7528cd5447ca3..612b398f2c825cedd6d9b89b8fb202edd02781e8 100644
--- a/cola-cloud-platform/cola-cloud-organization/src/main/resources/bootstrap.yml
+++ b/cola-cloud-platform/cola-cloud-organization/src/main/resources/bootstrap.yml
@@ -1,22 +1,18 @@
+eureka:
+  instance:
+    prefer-ip-address: true
+  client:
+    serviceUrl:
+      defaultZone: http://${REGISTRY_SERVER_USERNAME}:${REGISTRY_SERVER_PASSWORD}@registry:8761/eureka/
+
 spring:
   application:
     name: organization-service
   cloud:
     config:
-      uri: http://config:8888
       fail-fast: true
-      password: 123456
-      username: user
-  cache:
-      type: redis
-  redis:
-      host: 192.168.0.119
-      port: 6379
-      password:
-      database: 8
-      pool:
-          max-active: 8
-          max-wait: 1
-          max-idle: 8
-          min-idle: 0
-      timeout: 0
\ No newline at end of file
+      username: ${CONFIG_SERVER_USERNAME}
+      password: ${CONFIG_SERVER_PASSWORD}
+      discovery:
+        enabled: true
+        service-id: config
\ No newline at end of file
diff --git a/cola-cloud-zipkin/pom.xml b/cola-cloud-zipkin/pom.xml
index d6bd0f0c12f9553cccbac2d0fc2e72b739cd1585..5be0272d63867699f9366815f75fdc292bb6c221 100644
--- a/cola-cloud-zipkin/pom.xml
+++ b/cola-cloud-zipkin/pom.xml
@@ -28,6 +28,10 @@
             <groupId>org.springframework.cloud</groupId>
             <artifactId>spring-cloud-starter-stream-rabbit</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.springframework.cloud</groupId>
+            <artifactId>spring-cloud-starter-hystrix</artifactId>
+        </dependency>
         <dependency>
             <groupId>io.zipkin.java</groupId>
             <artifactId>zipkin-autoconfigure-ui</artifactId>