From e94be0f2b97007db85baabff7907871da06cc2d1 Mon Sep 17 00:00:00 2001 From: hamst Date: Sat, 14 Apr 2018 17:21:42 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E4=BC=98=E5=8C=96=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/shared/application.yml | 2 +- .../main/resources/shared/common-service.yml | 6 ++-- .../src/main/resources/bootstrap.yml | 28 ++++++++----------- 3 files changed, 16 insertions(+), 20 deletions(-) diff --git a/cola-cloud-config/src/main/resources/shared/application.yml b/cola-cloud-config/src/main/resources/shared/application.yml index 845bcd2..4f8e54f 100644 --- a/cola-cloud-config/src/main/resources/shared/application.yml +++ b/cola-cloud-config/src/main/resources/shared/application.yml @@ -38,7 +38,7 @@ spring: redis: host: cola-redis port: 6379 - password: + password: ${COLA_MYSQL_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 dadd5d5..25b79e6 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-platform/cola-cloud-organization/src/main/resources/bootstrap.yml b/cola-cloud-platform/cola-cloud-organization/src/main/resources/bootstrap.yml index 046cbc1..612b398 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 -- Gitee From 21230e734eed1a9d7440ac4040f666006ef31f68 Mon Sep 17 00:00:00 2001 From: hamst Date: Sat, 14 Apr 2018 18:31:30 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E4=BC=98=E5=8C=96=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- cola-cloud-config/src/main/resources/shared/application.yml | 6 ++++-- cola-cloud-devtools/src/main/resources/application.yml | 4 ++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/cola-cloud-config/src/main/resources/shared/application.yml b/cola-cloud-config/src/main/resources/shared/application.yml index 4f8e54f..636384b 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: ${COLA_MYSQL_PASSWORD} + password: ${COLA_REDIS_PASSWORD} database: 8 timeout: 0 pool: diff --git a/cola-cloud-devtools/src/main/resources/application.yml b/cola-cloud-devtools/src/main/resources/application.yml index 0419663..11d9c2f 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 -- Gitee From 7bf924247e19569ded190c76d6f8c0bbc80255b0 Mon Sep 17 00:00:00 2001 From: hamst Date: Sat, 14 Apr 2018 20:57:00 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E8=8B=A5=E5=B9=B2?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/honvay/cola/cloud/auth/AuthApplication.java | 5 ----- .../auth/configuration/ResourceServerConfiguration.java | 4 +++- cola-cloud-config/src/main/resources/shared/gateway.yml | 6 ++++++ .../cloud/devtools/generator/service/GenerateService.java | 1 + .../cola-cloud-message/cola-cloud-message-service/pom.xml | 4 ++++ cola-cloud-zipkin/pom.xml | 4 ++++ 6 files changed, 18 insertions(+), 6 deletions(-) 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 b22be65..3a8fb8f 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 81b8e1f..068d77b 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/gateway.yml b/cola-cloud-config/src/main/resources/shared/gateway.yml index b0d7bcd..071ff18 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 a26e789..ff83d8f 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-platform/cola-cloud-message/cola-cloud-message-service/pom.xml b/cola-cloud-platform/cola-cloud-message/cola-cloud-message-service/pom.xml index a4fa6ac..754a661 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 @@ com.honvay.cola cola-cloud-notification-client + + com.honvay.cola + cola-cloud-framework-starter-swagger + \ No newline at end of file diff --git a/cola-cloud-zipkin/pom.xml b/cola-cloud-zipkin/pom.xml index d6bd0f0..5be0272 100644 --- a/cola-cloud-zipkin/pom.xml +++ b/cola-cloud-zipkin/pom.xml @@ -28,6 +28,10 @@ org.springframework.cloud spring-cloud-starter-stream-rabbit + + org.springframework.cloud + spring-cloud-starter-hystrix + io.zipkin.java zipkin-autoconfigure-ui -- Gitee From 634c47d937f2c1a2dc18434675068c68740b1f24 Mon Sep 17 00:00:00 2001 From: hamst Date: Sat, 14 Apr 2018 21:00:56 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E9=87=8D=E6=9E=84notification=E7=9B=AE?= =?UTF-8?q?=E5=BD=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../{ => configuration}/NoticationAutoConfiguration.java | 2 +- .../service/{ => controller}/NotificationController.java | 3 ++- .../notification/service/{ => model}/NotificationTask.java | 2 +- .../service/{ => support}/NotificationDispatcher.java | 3 ++- 4 files changed, 6 insertions(+), 4 deletions(-) rename cola-cloud-platform/cola-cloud-notification/cola-cloud-notification-service/src/main/java/com/honvay/cola/cloud/notification/service/{ => configuration}/NoticationAutoConfiguration.java (96%) rename cola-cloud-platform/cola-cloud-notification/cola-cloud-notification-service/src/main/java/com/honvay/cola/cloud/notification/service/{ => controller}/NotificationController.java (89%) rename cola-cloud-platform/cola-cloud-notification/cola-cloud-notification-service/src/main/java/com/honvay/cola/cloud/notification/service/{ => model}/NotificationTask.java (92%) rename cola-cloud-platform/cola-cloud-notification/cola-cloud-notification-service/src/main/java/com/honvay/cola/cloud/notification/service/{ => support}/NotificationDispatcher.java (95%) 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 8adc443..59218b6 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 cb95213..f143efe 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 35e0cbe..2912f8b 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 c4ae228..4f966eb 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; -- Gitee