Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
L
lingxi-lxy-yanshou
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
后端-黄柯铭
lingxi-lxy-yanshou
Commits
70fe15c2
Commit
70fe15c2
authored
Jun 16, 2021
by
fhj
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
活动服务改为营销活动
parent
8ae09683
Show whitespace changes
Inline
Side-by-side
Showing
20 changed files
with
40 additions
and
40 deletions
+40
-40
build.gradle
marketing-service/build.gradle
+1
-1
build.gradle
marketing-service/marketing-service-api/build.gradle
+1
-1
settings.gradle
marketing-service/settings.gradle
+4
-4
MarketingServiceApplication.java
...com/ssy/lingxi/marketing/MarketingServiceApplication.java
+3
-3
ServletInitializer.java
...ain/java/com/ssy/lingxi/marketing/ServletInitializer.java
+2
-2
application-all.yml
marketing-service/src/main/resources/application-all.yml
+2
-2
application-b2b.yml
marketing-service/src/main/resources/application-b2b.yml
+2
-2
application-demo.yml
marketing-service/src/main/resources/application-demo.yml
+2
-2
application-dev.yml
marketing-service/src/main/resources/application-dev.yml
+2
-2
application-dms.yml
marketing-service/src/main/resources/application-dms.yml
+2
-2
application-kubernetes.yml
...ing-service/src/main/resources/application-kubernetes.yml
+2
-2
application-learn.yml
marketing-service/src/main/resources/application-learn.yml
+2
-2
application-scm.yml
marketing-service/src/main/resources/application-scm.yml
+2
-2
application-scm_v2.yml
marketing-service/src/main/resources/application-scm_v2.yml
+2
-2
application-test.yml
marketing-service/src/main/resources/application-test.yml
+2
-2
application-yxc.yml
marketing-service/src/main/resources/application-yxc.yml
+2
-2
application-yxcdev.yml
marketing-service/src/main/resources/application-yxcdev.yml
+2
-2
application.yml
marketing-service/src/main/resources/application.yml
+0
-0
logback.xml
marketing-service/src/main/resources/logback.xml
+1
-1
settings.gradle
settings.gradle
+4
-4
No files found.
activity
-service/build.gradle
→
marketing
-service/build.gradle
View file @
70fe15c2
...
@@ -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'
...
...
activity-service/activity
-service-api/build.gradle
→
marketing-service/marketing
-service-api/build.gradle
View file @
70fe15c2
...
@@ -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
...
...
activity
-service/settings.gradle
→
marketing
-service/settings.gradle
View file @
70fe15c2
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
activity-service/src/main/java/com/ssy/lingxi/activity/Activity
ServiceApplication.java
→
marketing-service/src/main/java/com/ssy/lingxi/marketing/Marketing
ServiceApplication.java
View file @
70fe15c2
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
Activity
ServiceApplication
{
public
class
Marketing
ServiceApplication
{
public
static
void
main
(
String
[]
args
)
{
public
static
void
main
(
String
[]
args
)
{
SpringApplication
.
run
(
Activity
ServiceApplication
.
class
,
args
);
SpringApplication
.
run
(
Marketing
ServiceApplication
.
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.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
(
Activity
ServiceApplication
.
class
);
return
application
.
sources
(
Marketing
ServiceApplication
.
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:
...
@@ -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
:
Activity
ServiceHikariPool
pool-name
:
Marketing
ServiceHikariPool
max-lifetime
:
1800000
max-lifetime
:
1800000
connection-timeout
:
30000
connection-timeout
:
30000
connection-test-query
:
SELECT 1
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:
...
@@ -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
:
Activity
ServiceHikariPool
pool-name
:
Marketing
ServiceHikariPool
max-lifetime
:
1800000
max-lifetime
:
1800000
connection-timeout
:
30000
connection-timeout
:
30000
connection-test-query
:
SELECT 1
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:
...
@@ -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
:
Activity
ServiceHikariPool
pool-name
:
Marketing
ServiceHikariPool
max-lifetime
:
1800000
max-lifetime
:
1800000
connection-timeout
:
30000
connection-timeout
:
30000
connection-test-query
:
SELECT 1
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:
...
@@ -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
:
Activity
ServiceHikariPool
pool-name
:
Marketing
ServiceHikariPool
max-lifetime
:
1800000
max-lifetime
:
1800000
connection-timeout
:
30000
connection-timeout
:
30000
connection-test-query
:
SELECT 1
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:
...
@@ -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
:
Activity
ServiceHikariPool
pool-name
:
Marketing
ServiceHikariPool
max-lifetime
:
1800000
max-lifetime
:
1800000
connection-timeout
:
30000
connection-timeout
:
30000
connection-test-query
:
SELECT 1
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:
...
@@ -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
:
Activity
ServiceHikariPool
pool-name
:
Marketing
ServiceHikariPool
max-lifetime
:
1800000
max-lifetime
:
1800000
connection-timeout
:
30000
connection-timeout
:
30000
connection-test-query
:
SELECT 1
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:
...
@@ -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
:
Activity
ServiceHikariPool
pool-name
:
Marketing
ServiceHikariPool
max-lifetime
:
1800000
max-lifetime
:
1800000
connection-timeout
:
30000
connection-timeout
:
30000
connection-test-query
:
SELECT 1
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:
...
@@ -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
:
Activity
ServiceHikariPool
pool-name
:
Marketing
ServiceHikariPool
max-lifetime
:
1800000
max-lifetime
:
1800000
connection-timeout
:
30000
connection-timeout
:
30000
connection-test-query
:
SELECT 1
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:
...
@@ -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
:
Activity
ServiceHikariPool
pool-name
:
Marketing
ServiceHikariPool
max-lifetime
:
1800000
max-lifetime
:
1800000
connection-timeout
:
30000
connection-timeout
:
30000
connection-test-query
:
SELECT 1
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:
...
@@ -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
:
Activity
ServiceHikariPool
pool-name
:
Marketing
ServiceHikariPool
max-lifetime
:
1800000
max-lifetime
:
1800000
connection-timeout
:
30000
connection-timeout
:
30000
connection-test-query
:
SELECT 1
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:
...
@@ -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
:
Activity
ServiceHikariPool
pool-name
:
Marketing
ServiceHikariPool
max-lifetime
:
1800000
max-lifetime
:
1800000
connection-timeout
:
30000
connection-timeout
:
30000
connection-test-query
:
SELECT 1
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:
...
@@ -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
:
Activity
ServiceHikariPool
pool-name
:
Marketing
ServiceHikariPool
max-lifetime
:
1800000
max-lifetime
:
1800000
connection-timeout
:
30000
connection-timeout
:
30000
connection-test-query
:
SELECT 1
connection-test-query
:
SELECT 1
...
...
activity
-service/src/main/resources/application.yml
→
marketing
-service/src/main/resources/application.yml
View file @
70fe15c2
File moved
activity
-service/src/main/resources/logback.xml
→
marketing
-service/src/main/resources/logback.xml
View file @
70fe15c2
...
@@ -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"
>
...
...
settings.gradle
View file @
70fe15c2
...
@@ -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
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment