浏览代码

update:拆分common项目

yonge 5 年之前
父节点
当前提交
d3fce2181d
共有 32 个文件被更改,包括 80 次插入29 次删除
  1. 1 1
      mec-auth/mec-auth-api/pom.xml
  2. 42 0
      mec-common/common-core/pom.xml
  3. 0 0
      mec-common/common-core/src/main/java/com/ym/mec/common/cache/Cache.java
  4. 0 0
      mec-common/common-core/src/main/java/com/ym/mec/common/cache/CacheException.java
  5. 0 0
      mec-common/common-core/src/main/java/com/ym/mec/common/constant/CommonConstants.java
  6. 0 0
      mec-common/common-core/src/main/java/com/ym/mec/common/controller/BaseController.java
  7. 0 0
      mec-common/common-core/src/main/java/com/ym/mec/common/dal/BaseDAO.java
  8. 0 0
      mec-common/common-core/src/main/java/com/ym/mec/common/dal/IntEnumTypeHandler.java
  9. 0 0
      mec-common/common-core/src/main/java/com/ym/mec/common/dal/StringEnumTypeHandler.java
  10. 0 0
      mec-common/common-core/src/main/java/com/ym/mec/common/dal/base/BaseIntEnum.java
  11. 0 0
      mec-common/common-core/src/main/java/com/ym/mec/common/dal/base/BaseStringEnum.java
  12. 0 0
      mec-common/common-core/src/main/java/com/ym/mec/common/entity/HttpCode.java
  13. 0 0
      mec-common/common-core/src/main/java/com/ym/mec/common/entity/HttpResponseResult.java
  14. 0 0
      mec-common/common-core/src/main/java/com/ym/mec/common/enums/AccessSource.java
  15. 0 0
      mec-common/common-core/src/main/java/com/ym/mec/common/exception/BasicControllerAdvice.java
  16. 0 0
      mec-common/common-core/src/main/java/com/ym/mec/common/exception/BizException.java
  17. 0 0
      mec-common/common-core/src/main/java/com/ym/mec/common/page/PageInfo.java
  18. 0 0
      mec-common/common-core/src/main/java/com/ym/mec/common/page/QueryInfo.java
  19. 0 0
      mec-common/common-core/src/main/java/com/ym/mec/common/redis/config/RedisTemplateConfig.java
  20. 0 0
      mec-common/common-core/src/main/java/com/ym/mec/common/redis/service/RedisCache.java
  21. 0 0
      mec-common/common-core/src/main/java/com/ym/mec/common/security/AuthUser.java
  22. 0 0
      mec-common/common-core/src/main/java/com/ym/mec/common/security/BaseAccessDeniedHandler.java
  23. 0 0
      mec-common/common-core/src/main/java/com/ym/mec/common/security/BaseAuthenticationEntryPoint.java
  24. 0 0
      mec-common/common-core/src/main/java/com/ym/mec/common/security/SecurityUtils.java
  25. 0 0
      mec-common/common-core/src/main/java/com/ym/mec/common/service/BaseService.java
  26. 0 0
      mec-common/common-core/src/main/java/com/ym/mec/common/service/impl/BaseServiceImpl.java
  27. 0 0
      mec-common/common-core/src/main/java/com/ym/mec/common/validcode/SmsCodeService.java
  28. 0 0
      mec-common/common-core/src/main/java/com/ym/mec/common/validcode/impl/SmsCodeServiceImpl.java
  29. 26 0
      mec-common/common-log/pom.xml
  30. 9 26
      mec-common/pom.xml
  31. 1 1
      mec-task/pom.xml
  32. 1 1
      pom.xml

+ 1 - 1
mec-auth/mec-auth-api/pom.xml

@@ -27,7 +27,7 @@
 	
 		<dependency>
 			<groupId>com.ym</groupId>
-			<artifactId>mec-common</artifactId>
+			<artifactId>common-core</artifactId>
 		</dependency>
 		
 	</dependencies>

+ 42 - 0
mec-common/common-core/pom.xml

@@ -0,0 +1,42 @@
+<?xml version="1.0"?>
+<project
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
+	xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+	<modelVersion>4.0.0</modelVersion>
+	<parent>
+		<groupId>com.ym</groupId>
+		<artifactId>mec-common</artifactId>
+		<version>1.0</version>
+	</parent>
+	<artifactId>common-core</artifactId>
+	<name>common-core</name>
+	<url>http://maven.apache.org</url>
+	<properties>
+		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+	</properties>
+
+	<dependencies>
+
+		<dependency>
+			<groupId>org.mybatis.spring.boot</groupId>
+			<artifactId>mybatis-spring-boot-starter</artifactId>
+		</dependency>
+
+		<!-- Redis缓存整合开始 -->
+		<dependency>
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-starter-data-redis</artifactId>
+		</dependency>
+		<!-- Redis缓存整合结束 -->
+
+		<dependency>
+			<groupId>org.springframework.cloud</groupId>
+			<artifactId>spring-cloud-starter-oauth2</artifactId>
+		</dependency>
+
+		<dependency>
+			<groupId>org.springframework.cloud</groupId>
+			<artifactId>spring-cloud-starter-openfeign</artifactId>
+		</dependency>
+	</dependencies>
+</project>

+ 0 - 0
mec-common/src/main/java/com/ym/mec/common/cache/Cache.java → mec-common/common-core/src/main/java/com/ym/mec/common/cache/Cache.java


+ 0 - 0
mec-common/src/main/java/com/ym/mec/common/cache/CacheException.java → mec-common/common-core/src/main/java/com/ym/mec/common/cache/CacheException.java


+ 0 - 0
mec-common/src/main/java/com/ym/mec/common/constant/CommonConstants.java → mec-common/common-core/src/main/java/com/ym/mec/common/constant/CommonConstants.java


+ 0 - 0
mec-common/src/main/java/com/ym/mec/common/controller/BaseController.java → mec-common/common-core/src/main/java/com/ym/mec/common/controller/BaseController.java


+ 0 - 0
mec-common/src/main/java/com/ym/mec/common/dal/BaseDAO.java → mec-common/common-core/src/main/java/com/ym/mec/common/dal/BaseDAO.java


+ 0 - 0
mec-common/src/main/java/com/ym/mec/common/dal/IntEnumTypeHandler.java → mec-common/common-core/src/main/java/com/ym/mec/common/dal/IntEnumTypeHandler.java


+ 0 - 0
mec-common/src/main/java/com/ym/mec/common/dal/StringEnumTypeHandler.java → mec-common/common-core/src/main/java/com/ym/mec/common/dal/StringEnumTypeHandler.java


+ 0 - 0
mec-common/src/main/java/com/ym/mec/common/dal/base/BaseIntEnum.java → mec-common/common-core/src/main/java/com/ym/mec/common/dal/base/BaseIntEnum.java


+ 0 - 0
mec-common/src/main/java/com/ym/mec/common/dal/base/BaseStringEnum.java → mec-common/common-core/src/main/java/com/ym/mec/common/dal/base/BaseStringEnum.java


+ 0 - 0
mec-common/src/main/java/com/ym/mec/common/entity/HttpCode.java → mec-common/common-core/src/main/java/com/ym/mec/common/entity/HttpCode.java


+ 0 - 0
mec-common/src/main/java/com/ym/mec/common/entity/HttpResponseResult.java → mec-common/common-core/src/main/java/com/ym/mec/common/entity/HttpResponseResult.java


+ 0 - 0
mec-common/src/main/java/com/ym/mec/common/enums/AccessSource.java → mec-common/common-core/src/main/java/com/ym/mec/common/enums/AccessSource.java


+ 0 - 0
mec-common/src/main/java/com/ym/mec/common/exception/BasicControllerAdvice.java → mec-common/common-core/src/main/java/com/ym/mec/common/exception/BasicControllerAdvice.java


+ 0 - 0
mec-common/src/main/java/com/ym/mec/common/exception/BizException.java → mec-common/common-core/src/main/java/com/ym/mec/common/exception/BizException.java


+ 0 - 0
mec-common/src/main/java/com/ym/mec/common/page/PageInfo.java → mec-common/common-core/src/main/java/com/ym/mec/common/page/PageInfo.java


+ 0 - 0
mec-common/src/main/java/com/ym/mec/common/page/QueryInfo.java → mec-common/common-core/src/main/java/com/ym/mec/common/page/QueryInfo.java


+ 0 - 0
mec-common/src/main/java/com/ym/mec/common/redis/config/RedisTemplateConfig.java → mec-common/common-core/src/main/java/com/ym/mec/common/redis/config/RedisTemplateConfig.java


+ 0 - 0
mec-common/src/main/java/com/ym/mec/common/redis/service/RedisCache.java → mec-common/common-core/src/main/java/com/ym/mec/common/redis/service/RedisCache.java


+ 0 - 0
mec-common/src/main/java/com/ym/mec/common/security/AuthUser.java → mec-common/common-core/src/main/java/com/ym/mec/common/security/AuthUser.java


+ 0 - 0
mec-common/src/main/java/com/ym/mec/common/security/BaseAccessDeniedHandler.java → mec-common/common-core/src/main/java/com/ym/mec/common/security/BaseAccessDeniedHandler.java


+ 0 - 0
mec-common/src/main/java/com/ym/mec/common/security/BaseAuthenticationEntryPoint.java → mec-common/common-core/src/main/java/com/ym/mec/common/security/BaseAuthenticationEntryPoint.java


+ 0 - 0
mec-common/src/main/java/com/ym/mec/common/security/SecurityUtils.java → mec-common/common-core/src/main/java/com/ym/mec/common/security/SecurityUtils.java


+ 0 - 0
mec-common/src/main/java/com/ym/mec/common/service/BaseService.java → mec-common/common-core/src/main/java/com/ym/mec/common/service/BaseService.java


+ 0 - 0
mec-common/src/main/java/com/ym/mec/common/service/impl/BaseServiceImpl.java → mec-common/common-core/src/main/java/com/ym/mec/common/service/impl/BaseServiceImpl.java


+ 0 - 0
mec-common/src/main/java/com/ym/mec/common/validcode/SmsCodeService.java → mec-common/common-core/src/main/java/com/ym/mec/common/validcode/SmsCodeService.java


+ 0 - 0
mec-common/src/main/java/com/ym/mec/common/validcode/impl/SmsCodeServiceImpl.java → mec-common/common-core/src/main/java/com/ym/mec/common/validcode/impl/SmsCodeServiceImpl.java


+ 26 - 0
mec-common/common-log/pom.xml

@@ -0,0 +1,26 @@
+<?xml version="1.0"?>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <groupId>com.ym</groupId>
+    <artifactId>mec-common</artifactId>
+    <version>1.0</version>
+  </parent>
+  <groupId>com.ym</groupId>
+  <artifactId>common-log</artifactId>
+  <version>1.0</version>
+  <name>common-log</name>
+  <url>http://maven.apache.org</url>
+  <properties>
+    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+  </properties>
+  <dependencies>
+    <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+      <version>3.8.1</version>
+      <scope>test</scope>
+    </dependency>
+  </dependencies>
+</project>

+ 9 - 26
mec-common/pom.xml

@@ -1,7 +1,6 @@
-<?xml version="1.0"?>
-<project
-	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
-	xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
 		<groupId>com.ym</groupId>
@@ -10,6 +9,7 @@
 	</parent>
 
 	<artifactId>mec-common</artifactId>
+	<packaging>pom</packaging>
 	<name>mec-common</name>
 	<url>http://maven.apache.org</url>
 
@@ -22,27 +22,10 @@
 			<groupId>com.ym</groupId>
 			<artifactId>mec-util</artifactId>
 		</dependency>
-		
-		<dependency>
-			<groupId>org.mybatis.spring.boot</groupId>
-			<artifactId>mybatis-spring-boot-starter</artifactId>
-		</dependency>
-		
-		<!-- Redis缓存整合开始 -->
-		<dependency>
-			<groupId>org.springframework.boot</groupId>
-			<artifactId>spring-boot-starter-data-redis</artifactId>
-		</dependency>
-		<!-- Redis缓存整合结束 -->
-		
-		<dependency>
-			<groupId>org.springframework.cloud</groupId>
-			<artifactId>spring-cloud-starter-oauth2</artifactId>
-		</dependency>
-	
-		<dependency>
-			<groupId>org.springframework.cloud</groupId>
-			<artifactId>spring-cloud-starter-openfeign</artifactId>
-		</dependency>
 	</dependencies>
+	
+	<modules>
+		<module>common-core</module>
+		<module>common-log</module>
+	</modules>
 </project>

+ 1 - 1
mec-task/pom.xml

@@ -21,7 +21,7 @@
 	<dependencies>
 		<dependency>
 			<groupId>com.ym</groupId>
-			<artifactId>mec-common</artifactId>
+			<artifactId>common-core</artifactId>
 		</dependency>
 
 		<dependency>

+ 1 - 1
pom.xml

@@ -53,7 +53,7 @@
 
 			<dependency>
 				<groupId>com.ym</groupId>
-				<artifactId>mec-common</artifactId>
+				<artifactId>common-core</artifactId>
 				<version>1.0</version>
 			</dependency>