调整架构

roncoo · Apr 30, 2020 · 37bfd14 · 37bfd14
1 parent 1f71364
commit 37bfd14
Show file tree

Hide file tree

Showing 27 changed files with 35 additions and 36 deletions.
diff --git a/UPDATE.md b/UPDATE.md
@@ -1,9 +1,11 @@
 ### 版本升级日志
 ---
-###### v6.1.0-RELEASE
+###### v7.0.0-RELEASE
 1. 整理优化演示数据
 2. 修复课程简介为空不显示课程信息
-3. 
+3. roncoo-education-gateway修改为roncoo-education-server-gateway
+4. roncoo-education-job修改为roncoo-education-server-job
+5. 
 
 ###### v6.0.0-RELEASE -- 2020.01.28
 1. 修改网关配置开发环境地址与测试环境地址一致

diff --git a/pom.xml b/pom.xml
@@ -5,7 +5,7 @@
 
 	<groupId>com.roncoo</groupId>
 	<artifactId>roncoo-education</artifactId>
-	<version>6.1.0-RELEASE</version>
+	<version>7.0.0-RELEASE</version>
 	<packaging>pom</packaging>
 
 	<name>roncoo-education</name>
@@ -333,7 +333,7 @@
 		<module>roncoo-education-server-config</module>
 		<!-- 监控中心 -->
 		<module>roncoo-education-server-admin</module>
-		<!-- 公用工具 -->
+		<!-- 基础工程 -->
 		<module>roncoo-education-util</module>
 		<!-- 系统管理 -->
 		<module>roncoo-education-system</module>
@@ -342,9 +342,9 @@
 		<!-- 课程管理 -->
 		<module>roncoo-education-course</module>
 		<!-- 定时任务 -->
-		<module>roncoo-education-job</module>
+		<module>roncoo-education-server-job</module>
 		<!-- 网关接口 -->
-		<module>roncoo-education-gateway</module>
+		<module>roncoo-education-server-gateway</module>
 	</modules>
 
 </project>
diff --git a/roncoo-education-course/pom.xml b/roncoo-education-course/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>com.roncoo</groupId>
 		<artifactId>roncoo-education</artifactId>
-		<version>6.1.0-RELEASE</version>
+		<version>7.0.0-RELEASE</version>
 	</parent>
 
 	<artifactId>roncoo-education-course</artifactId>

diff --git a/roncoo-education-course/roncoo-education-course-feign/pom.xml b/roncoo-education-course/roncoo-education-course-feign/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>com.roncoo</groupId>
 		<artifactId>roncoo-education-course</artifactId>
-		<version>6.1.0-RELEASE</version>
+		<version>7.0.0-RELEASE</version>
 	</parent>
 
 	<artifactId>roncoo-education-course-feign</artifactId>

diff --git a/roncoo-education-course/roncoo-education-course-service/pom.xml b/roncoo-education-course/roncoo-education-course-service/pom.xml
@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>com.roncoo</groupId>
 		<artifactId>roncoo-education-course</artifactId>
-		<version>6.1.0-RELEASE</version>
+		<version>7.0.0-RELEASE</version>
 	</parent>
 
 	<artifactId>roncoo-education-course-service</artifactId>

diff --git a/roncoo-education-server-admin/pom.xml b/roncoo-education-server-admin/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>com.roncoo</groupId>
 		<artifactId>roncoo-education</artifactId>
-		<version>6.1.0-RELEASE</version>
+		<version>7.0.0-RELEASE</version>
 	</parent>
 
 	<artifactId>roncoo-education-server-admin</artifactId>

diff --git a/roncoo-education-server-config/pom.xml b/roncoo-education-server-config/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>com.roncoo</groupId>
 		<artifactId>roncoo-education</artifactId>
-		<version>6.1.0-RELEASE</version>
+		<version>7.0.0-RELEASE</version>
 	</parent>
 
 	<artifactId>roncoo-education-server-config</artifactId>

diff --git a/roncoo-education-server-eureka/pom.xml b/roncoo-education-server-eureka/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>com.roncoo</groupId>
 		<artifactId>roncoo-education</artifactId>
-		<version>6.1.0-RELEASE</version>
+		<version>7.0.0-RELEASE</version>
 	</parent>
 
 	<artifactId>roncoo-education-server-eureka</artifactId>

diff --git a/roncoo-education-gateway/pom.xml → roncoo-education-server-gateway/pom.xml b/roncoo-education-gateway/pom.xml → roncoo-education-server-gateway/pom.xml
@@ -5,12 +5,12 @@
 	<parent>
 		<groupId>com.roncoo</groupId>
 		<artifactId>roncoo-education</artifactId>
-		<version>6.1.0-RELEASE</version>
+		<version>7.0.0-RELEASE</version>
 	</parent>
 
-	<artifactId>roncoo-education-gateway</artifactId>
+	<artifactId>roncoo-education-server-gateway</artifactId>
 
-	<name>roncoo-education-gateway</name>
+	<name>roncoo-education-server-gateway</name>
 
 	<dependencies>
 
@@ -91,7 +91,7 @@
 	</dependencies>
 
 	<build>
-		<finalName>gateway</finalName>
+		<finalName>server-gateway</finalName>
 
 		<plugins>
 			<plugin>

diff --git a/...ncoo/education/GatewayApiApplication.java → ...ncoo/education/GatewayApiApplication.java b/...ncoo/education/GatewayApiApplication.java → ...ncoo/education/GatewayApiApplication.java
@@ -11,7 +11,7 @@
 import org.springframework.web.cors.UrlBasedCorsConfigurationSource;
 import org.springframework.web.filter.CorsFilter;
 
-import com.roncoo.education.gateway.common.FilterPre;
+import com.roncoo.education.server.gateway.common.FilterPre;
 
 /**
  * 服务网关

diff --git a/...o/education/gateway/common/FilterPre.java → ...tion/server/gateway/common/FilterPre.java b/...o/education/gateway/common/FilterPre.java → ...tion/server/gateway/common/FilterPre.java
@@ -1,16 +1,14 @@
 /**
  * Copyright 2015-现在 广州市领课网络科技有限公司
  */
-package com.roncoo.education.gateway.common;
+package com.roncoo.education.server.gateway.common;
 
 import java.io.BufferedReader;
 import java.io.DataInputStream;
 import java.io.IOException;
 import java.io.InputStreamReader;
-import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
-import java.util.Set;
 import java.util.TreeMap;
 import java.util.concurrent.TimeUnit;
 
@@ -35,7 +33,6 @@
 import com.roncoo.education.util.enums.ResultEnum;
 import com.roncoo.education.util.tools.JSONUtil;
 import com.roncoo.education.util.tools.JWTUtil;
-import com.xiaoleilu.hutool.util.CollectionUtil;
 
 /**
  * 请求开始前执行

diff --git a/...n/gateway/controller/IndexController.java → ...r/gateway/controller/IndexController.java b/...n/gateway/controller/IndexController.java → ...r/gateway/controller/IndexController.java
@@ -1,7 +1,7 @@
 /**
  * Copyright 2015-现在 广州市领课网络科技有限公司
  */
-package com.roncoo.education.gateway.controller;
+package com.roncoo.education.server.gateway.controller;
 
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RequestMapping;

diff --git a/...y/src/main/resources/bootstrap.properties → ...y/src/main/resources/bootstrap.properties b/...y/src/main/resources/bootstrap.properties → ...y/src/main/resources/bootstrap.properties
diff --git a/...ay/src/main/resources/templates/index.ftl → ...ay/src/main/resources/templates/index.ftl b/...ay/src/main/resources/templates/index.ftl → ...ay/src/main/resources/templates/index.ftl
diff --git a/roncoo-education-job/pom.xml → roncoo-education-server-job/pom.xml b/roncoo-education-job/pom.xml → roncoo-education-server-job/pom.xml
@@ -6,12 +6,12 @@
 	<parent>
 		<groupId>com.roncoo</groupId>
 		<artifactId>roncoo-education</artifactId>
-		<version>6.1.0-RELEASE</version>
+		<version>7.0.0-RELEASE</version>
 	</parent>
 
-	<artifactId>roncoo-education-job</artifactId>
+	<artifactId>roncoo-education-server-job</artifactId>
 
-	<name>roncoo-education-job</name>
+	<name>roncoo-education-server-job</name>
 
 	<dependencies>
 
@@ -63,7 +63,7 @@
 	</dependencies>
 
 	<build>
-		<finalName>job</finalName>
+		<finalName>server-job</finalName>
 
 		<plugins>
 			<plugin>

diff --git a/...coo/education/CrontabPlanApplication.java → ...coo/education/CrontabPlanApplication.java b/...coo/education/CrontabPlanApplication.java → ...coo/education/CrontabPlanApplication.java
diff --git a/.../roncoo/education/job/MsgSendCrontab.java → .../education/server/job/MsgSendCrontab.java b/.../roncoo/education/job/MsgSendCrontab.java → .../education/server/job/MsgSendCrontab.java
@@ -1,4 +1,4 @@
-package com.roncoo.education.job;
+package com.roncoo.education.server.job;
 
 import com.roncoo.education.system.feign.interfaces.IFeignMsg;
 import org.springframework.beans.factory.annotation.Autowired;

diff --git a/...om/roncoo/education/job/OrderCrontab.java → ...oo/education/server/job/OrderCrontab.java b/...om/roncoo/education/job/OrderCrontab.java → ...oo/education/server/job/OrderCrontab.java
@@ -1,4 +1,4 @@
-package com.roncoo.education.job;
+package com.roncoo.education.server.job;
 
 import com.roncoo.education.course.feign.interfaces.IFeignOrderInfo;
 import org.springframework.beans.factory.annotation.Autowired;

diff --git a/...om/roncoo/education/job/VideoCrontab.java → ...oo/education/server/job/VideoCrontab.java b/...om/roncoo/education/job/VideoCrontab.java → ...oo/education/server/job/VideoCrontab.java
@@ -1,4 +1,4 @@
-package com.roncoo.education.job;
+package com.roncoo.education.server.job;
 
 import java.io.File;
 

diff --git a/...b/src/main/resources/bootstrap.properties → ...b/src/main/resources/bootstrap.properties b/...b/src/main/resources/bootstrap.properties → ...b/src/main/resources/bootstrap.properties
diff --git a/roncoo-education-system/pom.xml b/roncoo-education-system/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>com.roncoo</groupId>
 		<artifactId>roncoo-education</artifactId>
-		<version>6.1.0-RELEASE</version>
+		<version>7.0.0-RELEASE</version>
 	</parent>
 
 	<artifactId>roncoo-education-system</artifactId>

diff --git a/roncoo-education-system/roncoo-education-system-feign/pom.xml b/roncoo-education-system/roncoo-education-system-feign/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.roncoo</groupId>
         <artifactId>roncoo-education-system</artifactId>
-        <version>6.1.0-RELEASE</version>
+        <version>7.0.0-RELEASE</version>
     </parent>
 
     <artifactId>roncoo-education-system-feign</artifactId>

diff --git a/roncoo-education-system/roncoo-education-system-service/pom.xml b/roncoo-education-system/roncoo-education-system-service/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>com.roncoo</groupId>
 		<artifactId>roncoo-education-system</artifactId>
-		<version>6.1.0-RELEASE</version>
+		<version>7.0.0-RELEASE</version>
 	</parent>
 
 	<artifactId>roncoo-education-system-service</artifactId>

diff --git a/roncoo-education-user/pom.xml b/roncoo-education-user/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>com.roncoo</groupId>
 		<artifactId>roncoo-education</artifactId>
-		<version>6.1.0-RELEASE</version>
+		<version>7.0.0-RELEASE</version>
 	</parent>
 
 	<artifactId>roncoo-education-user</artifactId>

diff --git a/roncoo-education-user/roncoo-education-user-feign/pom.xml b/roncoo-education-user/roncoo-education-user-feign/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>com.roncoo</groupId>
 		<artifactId>roncoo-education-user</artifactId>
-		<version>6.1.0-RELEASE</version>
+		<version>7.0.0-RELEASE</version>
 	</parent>
 
 	<artifactId>roncoo-education-user-feign</artifactId>

diff --git a/roncoo-education-user/roncoo-education-user-service/pom.xml b/roncoo-education-user/roncoo-education-user-service/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>com.roncoo</groupId>
 		<artifactId>roncoo-education-user</artifactId>
-		<version>6.1.0-RELEASE</version>
+		<version>7.0.0-RELEASE</version>
 	</parent>
 
 	<artifactId>roncoo-education-user-service</artifactId>

diff --git a/roncoo-education-util/pom.xml b/roncoo-education-util/pom.xml
@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>com.roncoo</groupId>
 		<artifactId>roncoo-education</artifactId>
-		<version>6.1.0-RELEASE</version>
+		<version>7.0.0-RELEASE</version>
 	</parent>
 
 	<artifactId>roncoo-education-util</artifactId>