diff --git a/muyu-modules/muyu-gen/marketing-service/src/main/java/com/muyu/marketing/MuYuMarketIngApplication.java b/muyu-modules/muyu-gen/marketing-service/src/main/java/com/muyu/marketing/MuYuMarketIngApplication.java
new file mode 100644
index 0000000..35370a2
--- /dev/null
+++ b/muyu-modules/muyu-gen/marketing-service/src/main/java/com/muyu/marketing/MuYuMarketIngApplication.java
@@ -0,0 +1,22 @@
+package com.muyu.marketing;
+
+import com.muyu.common.security.annotation.EnableCustomConfig;
+import com.muyu.common.security.annotation.EnableMyFeignClients;
+import com.muyu.common.swagger.annotation.EnableCustomSwagger2;
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+
+/**
+ * 系统模块
+ *
+ * @author muyu
+ */
+@EnableCustomConfig
+@EnableCustomSwagger2
+@EnableMyFeignClients
+@SpringBootApplication
+public class MuYuMarketIngApplication {
+ public static void main (String[] args) {
+ SpringApplication.run(MuYuMarketIngApplication.class,args);
+ }
+}
diff --git a/muyu-modules/muyu-marketing/marketing-common/pom.xml b/muyu-modules/muyu-marketing/marketing-common/pom.xml
index c899d63..615f9da 100644
--- a/muyu-modules/muyu-marketing/marketing-common/pom.xml
+++ b/muyu-modules/muyu-marketing/marketing-common/pom.xml
@@ -16,5 +16,12 @@
17
UTF-8
+
+
+ com.muyu
+ muyu-common-core
+
+
+
diff --git a/muyu-modules/muyu-marketing/marketing-common/src/main/java/com/muyu/Main.java b/muyu-modules/muyu-marketing/marketing-common/src/main/java/com/muyu/Main.java
deleted file mode 100644
index 75fcd65..0000000
--- a/muyu-modules/muyu-marketing/marketing-common/src/main/java/com/muyu/Main.java
+++ /dev/null
@@ -1,7 +0,0 @@
-package com.muyu;
-
-public class Main {
- public static void main(String[] args) {
- System.out.println("Hello world!");
- }
-}
diff --git a/muyu-modules/muyu-marketing/marketing-remote/pom.xml b/muyu-modules/muyu-marketing/marketing-remote/pom.xml
new file mode 100644
index 0000000..047b4c9
--- /dev/null
+++ b/muyu-modules/muyu-marketing/marketing-remote/pom.xml
@@ -0,0 +1,27 @@
+
+
+ 4.0.0
+
+ com.muyu
+ muyu-marketing
+ 3.6.3
+
+
+ marketing-remote
+
+
+ 17
+ 17
+ UTF-8
+
+
+
+
+ com.muyu
+ marketing-common
+
+
+
+
diff --git a/muyu-modules/muyu-marketing/marketing-server/pom.xml b/muyu-modules/muyu-marketing/marketing-server/pom.xml
new file mode 100644
index 0000000..21cecfe
--- /dev/null
+++ b/muyu-modules/muyu-marketing/marketing-server/pom.xml
@@ -0,0 +1,54 @@
+
+
+ 4.0.0
+
+ com.muyu
+ muyu-marketing
+ 3.6.3
+
+
+ marketing-server
+
+
+ 17
+ 17
+ UTF-8
+
+
+
+
+
+ org.springframework.boot
+ spring-boot-starter-undertow
+
+
+
+ com.muyu
+ marketing-common
+
+
+
+
+ com.mysql
+ mysql-connector-j
+
+
+
+
+ com.alibaba
+ druid-spring-boot-starter
+ ${druid.version}
+
+
+
+
+ com.baomidou
+ dynamic-datasource-spring-boot-starter
+ ${dynamic-ds.version}
+
+
+
+
+
diff --git a/muyu-modules/muyu-marketing/marketing-server/src/main/java/com/muyu/marketing/MuYuMarketIngApplication.java b/muyu-modules/muyu-marketing/marketing-server/src/main/java/com/muyu/marketing/MuYuMarketIngApplication.java
new file mode 100644
index 0000000..d926c67
--- /dev/null
+++ b/muyu-modules/muyu-marketing/marketing-server/src/main/java/com/muyu/marketing/MuYuMarketIngApplication.java
@@ -0,0 +1,18 @@
+package com.muyu.marketing;
+
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.stereotype.Component;
+
+/**
+ * 营销模块
+ *
+ * @author muyu
+ */
+@SpringBootApplication
+@Component
+public class MuYuMarketIngApplication {
+ public static void main(String[] args) {
+ SpringApplication.run(MuYuMarketIngApplication.class,args);
+ }
+}
diff --git a/muyu-modules/muyu-marketing/marketing-server/src/main/resources/banner.txt b/muyu-modules/muyu-marketing/marketing-server/src/main/resources/banner.txt
new file mode 100644
index 0000000..0dd5eee
--- /dev/null
+++ b/muyu-modules/muyu-marketing/marketing-server/src/main/resources/banner.txt
@@ -0,0 +1,2 @@
+Spring Boot Version: ${spring-boot.version}
+Spring Application Name: ${spring.application.name}
diff --git a/muyu-modules/muyu-marketing/marketing-server/src/main/resources/bootstrap.yml b/muyu-modules/muyu-marketing/marketing-server/src/main/resources/bootstrap.yml
new file mode 100644
index 0000000..b217767
--- /dev/null
+++ b/muyu-modules/muyu-marketing/marketing-server/src/main/resources/bootstrap.yml
@@ -0,0 +1,25 @@
+# Tomcat
+server:
+ port: 9204
+
+# Spring
+spring:
+ application:
+ # 应用名称
+ name: marketing-server
+ profiles:
+ # 环境配置
+ active: dev
+ cloud:
+ nacos:
+ discovery:
+ # 服务注册地址
+ server-addr: 60.204.150.30:8848
+ config:
+ # 配置中心地址
+ server-addr: 60.204.150.30:8848
+ # 配置文件格式
+ file-extension: yml
+ # 共享配置
+ shared-configs:
+ - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension}
diff --git a/muyu-modules/muyu-marketing/marketing-server/src/main/resources/logback.xml b/muyu-modules/muyu-marketing/marketing-server/src/main/resources/logback.xml
new file mode 100644
index 0000000..aa340cd
--- /dev/null
+++ b/muyu-modules/muyu-marketing/marketing-server/src/main/resources/logback.xml
@@ -0,0 +1,74 @@
+
+
+
+
+
+
+
+
+
+
+ ${log.pattern}
+
+
+
+
+
+ ${log.path}/info.log
+
+
+
+ ${log.path}/info.%d{yyyy-MM-dd}.log
+
+ 60
+
+
+ ${log.pattern}
+
+
+
+ INFO
+
+ ACCEPT
+
+ DENY
+
+
+
+
+ ${log.path}/error.log
+
+
+
+ ${log.path}/error.%d{yyyy-MM-dd}.log
+
+ 60
+
+
+ ${log.pattern}
+
+
+
+ ERROR
+
+ ACCEPT
+
+ DENY
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/muyu-modules/muyu-marketing/pom.xml b/muyu-modules/muyu-marketing/pom.xml
new file mode 100644
index 0000000..8561763
--- /dev/null
+++ b/muyu-modules/muyu-marketing/pom.xml
@@ -0,0 +1,27 @@
+
+
+ 4.0.0
+
+ com.muyu
+ muyu-modules
+ 3.6.3
+
+
+ muyu-marketing
+ pom
+
+ marketing-common
+ marketing-remote
+ marketing-server
+
+
+
+ 17
+ 17
+ UTF-8
+
+
+
+
diff --git a/pom.xml b/pom.xml
index e256d02..a844551 100644
--- a/pom.xml
+++ b/pom.xml
@@ -228,6 +228,12 @@
${muyu.version}
+
+ com.muyu
+ marketing-common
+ ${muyu.version}
+
+
com.muyu