Commit 70fe15c2 authored by fhj's avatar fhj

活动服务改为营销活动

parent 8ae09683
...@@ -6,7 +6,7 @@ plugins { ...@@ -6,7 +6,7 @@ plugins {
} }
// 项目坐标 // 项目坐标
group = 'com.ssy.lingxi.activity' group = 'com.ssy.lingxi.marketing'
version = '2.0.0' version = '2.0.0'
sourceCompatibility = '1.8' sourceCompatibility = '1.8'
......
...@@ -2,7 +2,7 @@ plugins { ...@@ -2,7 +2,7 @@ plugins {
id 'java' id 'java'
} }
group 'com.ssy.lingxi.activity.api' group 'com.ssy.lingxi.marketing.api'
version '2.0.0' version '2.0.0'
sourceCompatibility = 1.8 sourceCompatibility = 1.8
......
rootProject.name = 'activity-service' rootProject.name = 'marketing-service'
include 'common' include 'common'
project(':common').projectDir = "../common" as File project(':common').projectDir = "../common" as File
...@@ -6,5 +6,5 @@ project(':common').projectDir = "../common" as File ...@@ -6,5 +6,5 @@ project(':common').projectDir = "../common" as File
include 'component-service:redis' include 'component-service:redis'
project(':component-service:redis').projectDir = "../component-service/redis" as File project(':component-service:redis').projectDir = "../component-service/redis" as File
include 'activity-service:activity-service-api' include 'marketing-service:marketing-service-api'
project(':activity-service:activity-service-api').projectDir = "../activity-service/activity-service-api" as File project(':marketing-service:marketing-service-api').projectDir = "../marketing-service/marketing-service-api" as File
\ No newline at end of file \ No newline at end of file
package com.ssy.lingxi.activity; package com.ssy.lingxi.marketing;
import org.springframework.boot.SpringApplication; import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.boot.autoconfigure.SpringBootApplication;
...@@ -11,10 +11,10 @@ import org.springframework.scheduling.annotation.EnableAsync; ...@@ -11,10 +11,10 @@ import org.springframework.scheduling.annotation.EnableAsync;
@ComponentScan(basePackages = {"com.ssy.lingxi"}) @ComponentScan(basePackages = {"com.ssy.lingxi"})
@EnableFeignClients(basePackages = {"com.ssy.lingxi.**.api"}) @EnableFeignClients(basePackages = {"com.ssy.lingxi.**.api"})
@SpringBootApplication @SpringBootApplication
public class ActivityServiceApplication { public class MarketingServiceApplication {
public static void main(String[] args) { public static void main(String[] args) {
SpringApplication.run(ActivityServiceApplication.class, args); SpringApplication.run(MarketingServiceApplication.class, args);
} }
} }
package com.ssy.lingxi.activity; package com.ssy.lingxi.marketing;
import org.springframework.boot.builder.SpringApplicationBuilder; import org.springframework.boot.builder.SpringApplicationBuilder;
import org.springframework.boot.web.servlet.support.SpringBootServletInitializer; import org.springframework.boot.web.servlet.support.SpringBootServletInitializer;
...@@ -7,7 +7,7 @@ public class ServletInitializer extends SpringBootServletInitializer { ...@@ -7,7 +7,7 @@ public class ServletInitializer extends SpringBootServletInitializer {
@Override @Override
protected SpringApplicationBuilder configure(SpringApplicationBuilder application) { protected SpringApplicationBuilder configure(SpringApplicationBuilder application) {
return application.sources(ActivityServiceApplication.class); return application.sources(MarketingServiceApplication.class);
} }
} }
...@@ -5,7 +5,7 @@ server: ...@@ -5,7 +5,7 @@ server:
spring: spring:
application: application:
name: activity-service name: marketing-service
main: main:
allow-bean-definition-overriding: true allow-bean-definition-overriding: true
datasource: datasource:
...@@ -18,7 +18,7 @@ spring: ...@@ -18,7 +18,7 @@ spring:
maximum-pool-size: 10 maximum-pool-size: 10
auto-commit: true auto-commit: true
idle-timeout: 30000 idle-timeout: 30000
pool-name: ActivityServiceHikariPool pool-name: MarketingServiceHikariPool
max-lifetime: 1800000 max-lifetime: 1800000
connection-timeout: 30000 connection-timeout: 30000
connection-test-query: SELECT 1 connection-test-query: SELECT 1
......
...@@ -5,7 +5,7 @@ server: ...@@ -5,7 +5,7 @@ server:
spring: spring:
application: application:
name: activity-service name: marketing-service
main: main:
allow-bean-definition-overriding: true allow-bean-definition-overriding: true
datasource: datasource:
...@@ -18,7 +18,7 @@ spring: ...@@ -18,7 +18,7 @@ spring:
maximum-pool-size: 10 maximum-pool-size: 10
auto-commit: true auto-commit: true
idle-timeout: 30000 idle-timeout: 30000
pool-name: ActivityServiceHikariPool pool-name: MarketingServiceHikariPool
max-lifetime: 1800000 max-lifetime: 1800000
connection-timeout: 30000 connection-timeout: 30000
connection-test-query: SELECT 1 connection-test-query: SELECT 1
......
...@@ -5,7 +5,7 @@ server: ...@@ -5,7 +5,7 @@ server:
spring: spring:
application: application:
name: activity-service name: marketing-service
main: main:
allow-bean-definition-overriding: true allow-bean-definition-overriding: true
datasource: datasource:
...@@ -18,7 +18,7 @@ spring: ...@@ -18,7 +18,7 @@ spring:
maximum-pool-size: 10 maximum-pool-size: 10
auto-commit: true auto-commit: true
idle-timeout: 30000 idle-timeout: 30000
pool-name: ActivityServiceHikariPool pool-name: MarketingServiceHikariPool
max-lifetime: 1800000 max-lifetime: 1800000
connection-timeout: 30000 connection-timeout: 30000
connection-test-query: SELECT 1 connection-test-query: SELECT 1
......
...@@ -5,7 +5,7 @@ server: ...@@ -5,7 +5,7 @@ server:
spring: spring:
application: application:
name: activity-service name: marketing-service
main: main:
allow-bean-definition-overriding: true allow-bean-definition-overriding: true
datasource: datasource:
...@@ -18,7 +18,7 @@ spring: ...@@ -18,7 +18,7 @@ spring:
maximum-pool-size: 10 maximum-pool-size: 10
auto-commit: true auto-commit: true
idle-timeout: 30000 idle-timeout: 30000
pool-name: ActivityServiceHikariPool pool-name: MarketingServiceHikariPool
max-lifetime: 1800000 max-lifetime: 1800000
connection-timeout: 30000 connection-timeout: 30000
connection-test-query: SELECT 1 connection-test-query: SELECT 1
......
...@@ -5,7 +5,7 @@ server: ...@@ -5,7 +5,7 @@ server:
spring: spring:
application: application:
name: activity-service name: marketing-service
main: main:
allow-bean-definition-overriding: true allow-bean-definition-overriding: true
datasource: datasource:
...@@ -18,7 +18,7 @@ spring: ...@@ -18,7 +18,7 @@ spring:
maximum-pool-size: 10 maximum-pool-size: 10
auto-commit: true auto-commit: true
idle-timeout: 30000 idle-timeout: 30000
pool-name: ActivityServiceHikariPool pool-name: MarketingServiceHikariPool
max-lifetime: 1800000 max-lifetime: 1800000
connection-timeout: 30000 connection-timeout: 30000
connection-test-query: SELECT 1 connection-test-query: SELECT 1
......
...@@ -5,7 +5,7 @@ server: ...@@ -5,7 +5,7 @@ server:
spring: spring:
application: application:
name: activity-service name: marketing-service
main: main:
allow-bean-definition-overriding: true allow-bean-definition-overriding: true
datasource: datasource:
...@@ -18,7 +18,7 @@ spring: ...@@ -18,7 +18,7 @@ spring:
maximum-pool-size: 10 maximum-pool-size: 10
auto-commit: true auto-commit: true
idle-timeout: 30000 idle-timeout: 30000
pool-name: ActivityServiceHikariPool pool-name: MarketingServiceHikariPool
max-lifetime: 1800000 max-lifetime: 1800000
connection-timeout: 30000 connection-timeout: 30000
connection-test-query: SELECT 1 connection-test-query: SELECT 1
......
...@@ -5,7 +5,7 @@ server: ...@@ -5,7 +5,7 @@ server:
spring: spring:
application: application:
name: activity-service name: marketing-service
main: main:
allow-bean-definition-overriding: true allow-bean-definition-overriding: true
datasource: datasource:
...@@ -18,7 +18,7 @@ spring: ...@@ -18,7 +18,7 @@ spring:
maximum-pool-size: 10 maximum-pool-size: 10
auto-commit: true auto-commit: true
idle-timeout: 30000 idle-timeout: 30000
pool-name: ActivityServiceHikariPool pool-name: MarketingServiceHikariPool
max-lifetime: 1800000 max-lifetime: 1800000
connection-timeout: 30000 connection-timeout: 30000
connection-test-query: SELECT 1 connection-test-query: SELECT 1
......
...@@ -5,7 +5,7 @@ server: ...@@ -5,7 +5,7 @@ server:
spring: spring:
application: application:
name: activity-service name: marketing-service
main: main:
allow-bean-definition-overriding: true allow-bean-definition-overriding: true
datasource: datasource:
...@@ -18,7 +18,7 @@ spring: ...@@ -18,7 +18,7 @@ spring:
maximum-pool-size: 10 maximum-pool-size: 10
auto-commit: true auto-commit: true
idle-timeout: 30000 idle-timeout: 30000
pool-name: ActivityServiceHikariPool pool-name: MarketingServiceHikariPool
max-lifetime: 1800000 max-lifetime: 1800000
connection-timeout: 30000 connection-timeout: 30000
connection-test-query: SELECT 1 connection-test-query: SELECT 1
......
...@@ -5,7 +5,7 @@ server: ...@@ -5,7 +5,7 @@ server:
spring: spring:
application: application:
name: activity-service name: marketing-service
main: main:
allow-bean-definition-overriding: true allow-bean-definition-overriding: true
datasource: datasource:
...@@ -18,7 +18,7 @@ spring: ...@@ -18,7 +18,7 @@ spring:
maximum-pool-size: 10 maximum-pool-size: 10
auto-commit: true auto-commit: true
idle-timeout: 30000 idle-timeout: 30000
pool-name: ActivityServiceHikariPool pool-name: MarketingServiceHikariPool
max-lifetime: 1800000 max-lifetime: 1800000
connection-timeout: 30000 connection-timeout: 30000
connection-test-query: SELECT 1 connection-test-query: SELECT 1
......
...@@ -5,7 +5,7 @@ server: ...@@ -5,7 +5,7 @@ server:
spring: spring:
application: application:
name: activity-service name: marketing-service
main: main:
allow-bean-definition-overriding: true allow-bean-definition-overriding: true
datasource: datasource:
...@@ -18,7 +18,7 @@ spring: ...@@ -18,7 +18,7 @@ spring:
maximum-pool-size: 15 maximum-pool-size: 15
auto-commit: true auto-commit: true
idle-timeout: 30000 idle-timeout: 30000
pool-name: ActivityServiceHikariPool pool-name: MarketingServiceHikariPool
max-lifetime: 1800000 max-lifetime: 1800000
connection-timeout: 30000 connection-timeout: 30000
connection-test-query: SELECT 1 connection-test-query: SELECT 1
......
...@@ -5,7 +5,7 @@ server: ...@@ -5,7 +5,7 @@ server:
spring: spring:
application: application:
name: activity-service name: marketing-service
main: main:
allow-bean-definition-overriding: true allow-bean-definition-overriding: true
datasource: datasource:
...@@ -18,7 +18,7 @@ spring: ...@@ -18,7 +18,7 @@ spring:
maximum-pool-size: 10 maximum-pool-size: 10
auto-commit: true auto-commit: true
idle-timeout: 30000 idle-timeout: 30000
pool-name: ActivityServiceHikariPool pool-name: MarketingServiceHikariPool
max-lifetime: 1800000 max-lifetime: 1800000
connection-timeout: 30000 connection-timeout: 30000
connection-test-query: SELECT 1 connection-test-query: SELECT 1
......
...@@ -5,7 +5,7 @@ server: ...@@ -5,7 +5,7 @@ server:
spring: spring:
application: application:
name: activity-service name: marketing-service
main: main:
allow-bean-definition-overriding: true allow-bean-definition-overriding: true
datasource: datasource:
...@@ -18,7 +18,7 @@ spring: ...@@ -18,7 +18,7 @@ spring:
maximum-pool-size: 10 maximum-pool-size: 10
auto-commit: true auto-commit: true
idle-timeout: 30000 idle-timeout: 30000
pool-name: ActivityServiceHikariPool pool-name: MarketingServiceHikariPool
max-lifetime: 1800000 max-lifetime: 1800000
connection-timeout: 30000 connection-timeout: 30000
connection-test-query: SELECT 1 connection-test-query: SELECT 1
......
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
<!--LogBack的配置文件中不要使用相对路径,否则报错--> <!--LogBack的配置文件中不要使用相对路径,否则报错-->
<!--日志文件的存储路径,spring配置文件中的logging.file.path,一定要使用${LOG_PATH:-.}来引用这个配置--> <!--日志文件的存储路径,spring配置文件中的logging.file.path,一定要使用${LOG_PATH:-.}来引用这个配置-->
<property name="LOG_HOME" value="./"/> <property name="LOG_HOME" value="./"/>
<property name="SERVICE_NAME" value="activity-service" /> <property name="SERVICE_NAME" value="marketing-service" />
<!-- 控制台输出 --> <!-- 控制台输出 -->
<appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender"> <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
......
...@@ -102,7 +102,6 @@ findProject(':workflow1-service:workflow1-service-api')?.name = 'workflow1-servi ...@@ -102,7 +102,6 @@ findProject(':workflow1-service:workflow1-service-api')?.name = 'workflow1-servi
include 'component-service:data-auth' include 'component-service:data-auth'
findProject(':component-service:data-auth')?.name = 'data-auth' findProject(':component-service:data-auth')?.name = 'data-auth'
//活动服务 //营销服务
include 'activity-service-api' include 'marketing-service'
include 'activity-service:activity-service-api' include 'marketing-service:marketing-service-api'
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment