Skip to content

L
lingxi-lxy-yanshou
Commit 70fe15c2 authored by fhj's avatar fhj
Browse files
Options

活动服务改为营销活动

parent 8ae09683
Hide whitespace changes
Inline Side-by-side
Showing with 40 additions and 40 deletions
activity-service/build.gradle → marketing-service/build.gradle
View file @ 70fe15c2
......@@ -6,7 +6,7 @@ plugins {
}
// 项目坐标
group = 'com.ssy.lingxi.activity'
group = 'com.ssy.lingxi.marketing'
version = '2.0.0'
sourceCompatibility = '1.8'
......
activity-service/activity-service-api/build.gradle → marketing-service/marketing-service-api/build.gradle
View file @ 70fe15c2
......@@ -2,7 +2,7 @@ plugins {
id 'java'
}
group 'com.ssy.lingxi.activity.api'
group 'com.ssy.lingxi.marketing.api'
version '2.0.0'
sourceCompatibility = 1.8
......
activity-service/settings.gradle → marketing-service/settings.gradle
View file @ 70fe15c2
rootProject.name = 'activity-service'
rootProject.name = 'marketing-service'
include 'common'
project(':common').projectDir = "../common" as File
......@@ -6,5 +6,5 @@ project(':common').projectDir = "../common" as File
include 'component-service:redis'
project(':component-service:redis').projectDir = "../component-service/redis" as File
include 'activity-service:activity-service-api'
project(':activity-service:activity-service-api').projectDir = "../activity-service/activity-service-api" as File
\ No newline at end of file
include 'marketing-service:marketing-service-api'
project(':marketing-service:marketing-service-api').projectDir = "../marketing-service/marketing-service-api" as File
\ No newline at end of file
activity-service/src/main/java/com/ssy/lingxi/activity/ActivityServiceApplication.java → marketing-service/src/main/java/com/ssy/lingxi/marketing/MarketingServiceApplication.java
View file @ 70fe15c2
package com.ssy.lingxi.activity;
package com.ssy.lingxi.marketing;
import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication;
......@@ -11,10 +11,10 @@ import org.springframework.scheduling.annotation.EnableAsync;
@ComponentScan(basePackages = {"com.ssy.lingxi"})
@EnableFeignClients(basePackages = {"com.ssy.lingxi.**.api"})
@SpringBootApplication
public class ActivityServiceApplication {
public class MarketingServiceApplication {
public static void main(String[] args) {
SpringApplication.run(ActivityServiceApplication.class, args);
SpringApplication.run(MarketingServiceApplication.class, args);
}
}
activity-service/src/main/java/com/ssy/lingxi/activity/ServletInitializer.java → marketing-service/src/main/java/com/ssy/lingxi/marketing/ServletInitializer.java
View file @ 70fe15c2
package com.ssy.lingxi.activity;
package com.ssy.lingxi.marketing;
import org.springframework.boot.builder.SpringApplicationBuilder;
import org.springframework.boot.web.servlet.support.SpringBootServletInitializer;
......@@ -7,7 +7,7 @@ public class ServletInitializer extends SpringBootServletInitializer {
@Override
protected SpringApplicationBuilder configure(SpringApplicationBuilder application) {
return application.sources(ActivityServiceApplication.class);
return application.sources(MarketingServiceApplication.class);
}
}
activity-service/src/main/resources/application-all.yml → marketing-service/src/main/resources/application-all.yml
View file @ 70fe15c2
......@@ -5,7 +5,7 @@ server:
spring:
application:
name: activity-service
name: marketing-service
main:
allow-bean-definition-overriding: true
datasource:
......@@ -18,7 +18,7 @@ spring:
maximum-pool-size: 10
auto-commit: true
idle-timeout: 30000
pool-name: ActivityServiceHikariPool
pool-name: MarketingServiceHikariPool
max-lifetime: 1800000
connection-timeout: 30000
connection-test-query: SELECT 1
......
activity-service/src/main/resources/application-b2b.yml → marketing-service/src/main/resources/application-b2b.yml
View file @ 70fe15c2
......@@ -5,7 +5,7 @@ server:
spring:
application:
name: activity-service
name: marketing-service
main:
allow-bean-definition-overriding: true
datasource:
......@@ -18,7 +18,7 @@ spring:
maximum-pool-size: 10
auto-commit: true
idle-timeout: 30000
pool-name: ActivityServiceHikariPool
pool-name: MarketingServiceHikariPool
max-lifetime: 1800000
connection-timeout: 30000
connection-test-query: SELECT 1
......
activity-service/src/main/resources/application-demo.yml → marketing-service/src/main/resources/application-demo.yml
View file @ 70fe15c2
......@@ -5,7 +5,7 @@ server:
spring:
application:
name: activity-service
name: marketing-service
main:
allow-bean-definition-overriding: true
datasource:
......@@ -18,7 +18,7 @@ spring:
maximum-pool-size: 10
auto-commit: true
idle-timeout: 30000
pool-name: ActivityServiceHikariPool
pool-name: MarketingServiceHikariPool
max-lifetime: 1800000
connection-timeout: 30000
connection-test-query: SELECT 1
......
activity-service/src/main/resources/application-dev.yml → marketing-service/src/main/resources/application-dev.yml
View file @ 70fe15c2
......@@ -5,7 +5,7 @@ server:
spring:
application:
name: activity-service
name: marketing-service
main:
allow-bean-definition-overriding: true
datasource:
......@@ -18,7 +18,7 @@ spring:
maximum-pool-size: 10
auto-commit: true
idle-timeout: 30000
pool-name: ActivityServiceHikariPool
pool-name: MarketingServiceHikariPool
max-lifetime: 1800000
connection-timeout: 30000
connection-test-query: SELECT 1
......
activity-service/src/main/resources/application-dms.yml → marketing-service/src/main/resources/application-dms.yml
View file @ 70fe15c2
......@@ -5,7 +5,7 @@ server:
spring:
application:
name: activity-service
name: marketing-service
main:
allow-bean-definition-overriding: true
datasource:
......@@ -18,7 +18,7 @@ spring:
maximum-pool-size: 10
auto-commit: true
idle-timeout: 30000
pool-name: ActivityServiceHikariPool
pool-name: MarketingServiceHikariPool
max-lifetime: 1800000
connection-timeout: 30000
connection-test-query: SELECT 1
......
activity-service/src/main/resources/application-kubernetes.yml → marketing-service/src/main/resources/application-kubernetes.yml
View file @ 70fe15c2
......@@ -5,7 +5,7 @@ server:
spring:
application:
name: activity-service
name: marketing-service
main:
allow-bean-definition-overriding: true
datasource:
......@@ -18,7 +18,7 @@ spring:
maximum-pool-size: 10
auto-commit: true
idle-timeout: 30000
pool-name: ActivityServiceHikariPool
pool-name: MarketingServiceHikariPool
max-lifetime: 1800000
connection-timeout: 30000
connection-test-query: SELECT 1
......
activity-service/src/main/resources/application-learn.yml → marketing-service/src/main/resources/application-learn.yml
View file @ 70fe15c2
......@@ -5,7 +5,7 @@ server:
spring:
application:
name: activity-service
name: marketing-service
main:
allow-bean-definition-overriding: true
datasource:
......@@ -18,7 +18,7 @@ spring:
maximum-pool-size: 10
auto-commit: true
idle-timeout: 30000
pool-name: ActivityServiceHikariPool
pool-name: MarketingServiceHikariPool
max-lifetime: 1800000
connection-timeout: 30000
connection-test-query: SELECT 1
......
activity-service/src/main/resources/application-scm.yml → marketing-service/src/main/resources/application-scm.yml
View file @ 70fe15c2
......@@ -5,7 +5,7 @@ server:
spring:
application:
name: activity-service
name: marketing-service
main:
allow-bean-definition-overriding: true
datasource:
......@@ -18,7 +18,7 @@ spring:
maximum-pool-size: 10
auto-commit: true
idle-timeout: 30000
pool-name: ActivityServiceHikariPool
pool-name: MarketingServiceHikariPool
max-lifetime: 1800000
connection-timeout: 30000
connection-test-query: SELECT 1
......
activity-service/src/main/resources/application-scm_v2.yml → marketing-service/src/main/resources/application-scm_v2.yml
View file @ 70fe15c2
......@@ -5,7 +5,7 @@ server:
spring:
application:
name: activity-service
name: marketing-service
main:
allow-bean-definition-overriding: true
datasource:
......@@ -18,7 +18,7 @@ spring:
maximum-pool-size: 10
auto-commit: true
idle-timeout: 30000
pool-name: ActivityServiceHikariPool
pool-name: MarketingServiceHikariPool
max-lifetime: 1800000
connection-timeout: 30000
connection-test-query: SELECT 1
......
activity-service/src/main/resources/application-test.yml → marketing-service/src/main/resources/application-test.yml
View file @ 70fe15c2
......@@ -5,7 +5,7 @@ server:
spring:
application:
name: activity-service
name: marketing-service
main:
allow-bean-definition-overriding: true
datasource:
......@@ -18,7 +18,7 @@ spring:
maximum-pool-size: 15
auto-commit: true
idle-timeout: 30000
pool-name: ActivityServiceHikariPool
pool-name: MarketingServiceHikariPool
max-lifetime: 1800000
connection-timeout: 30000
connection-test-query: SELECT 1
......
activity-service/src/main/resources/application-yxc.yml → marketing-service/src/main/resources/application-yxc.yml
View file @ 70fe15c2
......@@ -5,7 +5,7 @@ server:
spring:
application:
name: activity-service
name: marketing-service
main:
allow-bean-definition-overriding: true
datasource:
......@@ -18,7 +18,7 @@ spring:
maximum-pool-size: 10
auto-commit: true
idle-timeout: 30000
pool-name: ActivityServiceHikariPool
pool-name: MarketingServiceHikariPool
max-lifetime: 1800000
connection-timeout: 30000
connection-test-query: SELECT 1
......
activity-service/src/main/resources/application-yxcdev.yml → marketing-service/src/main/resources/application-yxcdev.yml
View file @ 70fe15c2
......@@ -5,7 +5,7 @@ server:
spring:
application:
name: activity-service
name: marketing-service
main:
allow-bean-definition-overriding: true
datasource:
......@@ -18,7 +18,7 @@ spring:
maximum-pool-size: 10
auto-commit: true
idle-timeout: 30000
pool-name: ActivityServiceHikariPool
pool-name: MarketingServiceHikariPool
max-lifetime: 1800000
connection-timeout: 30000
connection-test-query: SELECT 1
......
activity-service/src/main/resources/logback.xml → marketing-service/src/main/resources/logback.xml
View file @ 70fe15c2
......@@ -3,7 +3,7 @@
<!--LogBack的配置文件中不要使用相对路径，否则报错-->
<!--日志文件的存储路径，spring配置文件中的logging.file.path，一定要使用${LOG_PATH:-.}来引用这个配置-->
<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">
......
settings.gradle
View file @ 70fe15c2
......@@ -102,7 +102,6 @@ findProject(':workflow1-service:workflow1-service-api')?.name = 'workflow1-servi
include 'component-service:data-auth'
findProject(':component-service:data-auth')?.name = 'data-auth'
//活动服务
include 'activity-service-api'
include 'activity-service:activity-service-api'
//营销服务
include 'marketing-service'
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