Browse Source

MaxKeyOpenApiApplication name MaxKeyApiApplication

MaxKey 3 months ago
parent
commit
80b5f001bc

+ 1 - 1
maxkey-webs/maxkey-web-openapi/build.gradle

@@ -27,7 +27,7 @@ bootJar {
 	dependsOn jar
 	archiveBaseName = 'maxkey-openapi-boot'
     version = "${project.version}-ga"
-    mainClass = 'org.dromara.maxkey.MaxKeyOpenApiApplication'
+    mainClass = 'org.dromara.maxkey.MaxKeyApiApplication'
 	manifest {
 	        attributes(
                         "Implementation-Title": project.name,

+ 8 - 4
maxkey-webs/maxkey-web-openapi/config/build_docker.gradle

@@ -40,7 +40,7 @@ jib {
 		
 	}
 	container {
-		mainClass 	= "org.dromara.maxkey.MaxKeyOpenApiApplication"
+		mainClass 	= "org.dromara.maxkey.MaxKeyApiApplication"
 		jvmFlags 	= ['-Dfile.encoding=utf-8', '-Dserver.port=9525','-Duser.timezone=Asia/Shanghai']
 		ports	 	= ['9525']
 	}
@@ -49,8 +49,12 @@ jib {
 //build.configure { finalizedBy jib }
 
 dependencies {
-	implementation project(":maxkey-common")
-	implementation project(":maxkey-core")
+	implementation project(":maxkey-commons:maxkey-cache")
+	implementation project(":maxkey-commons:maxkey-common")
+	implementation project(":maxkey-commons:maxkey-core")
+	implementation project(":maxkey-commons:maxkey-crypto")
+	
+	implementation project(":maxkey-entity")
 	implementation project(":maxkey-persistence")
 	
 	implementation project(":maxkey-starter:maxkey-starter-captcha")
@@ -68,6 +72,6 @@ dependencies {
    	
    	//webapis
    	implementation project(":maxkey-web-apis:maxkey-web-api-scim")   
-   	implementation project(":maxkey-web-apis:maxkey-web-api-rest")
+   	implementation project(":maxkey-web-apis:maxkey-web-api-rest")	
    	
 }

+ 7 - 3
maxkey-webs/maxkey-web-openapi/config/build_standard.gradle

@@ -27,7 +27,7 @@ bootJar {
 	dependsOn jar
 	archiveBaseName = 'maxkey-openapi-boot'
     version = "${project.version}-ga"
-    mainClass = 'org.dromara.maxkey.MaxKeyOpenApiApplication'
+    mainClass = 'org.dromara.maxkey.MaxKeyApiApplication'
 	manifest {
 	        attributes(
 						"Implementation-Title": project.name,
@@ -40,8 +40,12 @@ bootJar {
 }
 
 dependencies {
-	implementation project(":maxkey-common")
-	implementation project(":maxkey-core")
+	implementation project(":maxkey-commons:maxkey-cache")
+	implementation project(":maxkey-commons:maxkey-common")
+	implementation project(":maxkey-commons:maxkey-core")
+	implementation project(":maxkey-commons:maxkey-crypto")
+	
+	implementation project(":maxkey-entity")
 	implementation project(":maxkey-persistence")
 	
 	implementation project(":maxkey-starter:maxkey-starter-captcha")

+ 7 - 3
maxkey-webs/maxkey-web-openapi/config/build_tradition.gradle

@@ -4,8 +4,12 @@ description = "maxkey-web-openapi"
 apply plugin: 'java'
 
 dependencies {
-	implementation project(":maxkey-common")
-	implementation project(":maxkey-core")
+	implementation project(":maxkey-commons:maxkey-cache")
+	implementation project(":maxkey-commons:maxkey-common")
+	implementation project(":maxkey-commons:maxkey-core")
+	implementation project(":maxkey-commons:maxkey-crypto")
+	
+	implementation project(":maxkey-entity")
 	implementation project(":maxkey-persistence")
 	
 	implementation project(":maxkey-starter:maxkey-starter-captcha")
@@ -23,6 +27,6 @@ dependencies {
    	
    	//webapis
    	implementation project(":maxkey-web-apis:maxkey-web-api-scim")   
-   	implementation project(":maxkey-web-apis:maxkey-web-api-rest")
+   	implementation project(":maxkey-web-apis:maxkey-web-api-rest")	
 
 }

+ 8 - 8
maxkey-webs/maxkey-web-openapi/src/main/java/org/dromara/maxkey/MaxKeyOpenApiApplication.java → maxkey-webs/maxkey-web-openapi/src/main/java/org/dromara/maxkey/MaxKeyApiApplication.java

@@ -35,25 +35,25 @@ import org.springframework.context.ConfigurableApplicationContext;
 @SpringBootApplication
 @EnableDiscoveryClient
 @MapperScan("org.dromara.maxkey.persistence.mapper,")
-public class MaxKeyOpenApiApplication extends SpringBootServletInitializer {
-	static final Logger _logger = LoggerFactory.getLogger(MaxKeyOpenApiApplication.class);
+public class MaxKeyApiApplication extends SpringBootServletInitializer {
+	static final Logger _logger = LoggerFactory.getLogger(MaxKeyApiApplication.class);
 
 	public static void main(String[] args) {
-		_logger.info("Start MaxKey OpenApi Application ...");
+		_logger.info("Start MaxKey Api Application ...");
 	    ProductEnvironment.listEnvVars();
 	    
-		ConfigurableApplicationContext  applicationContext = SpringApplication.run(MaxKeyOpenApiApplication.class, args);
+		ConfigurableApplicationContext  applicationContext = SpringApplication.run(MaxKeyApiApplication.class, args);
 		new InitializeContext(applicationContext).init();
 		
-		_logger.info("MaxKey OpenApi at {}" , new DateTime());
-		_logger.info("MaxKey OpenApi Server Port {}" , WebContext.getServerPort());
-		_logger.info("MaxKey OpenApi started.");
+		_logger.info("MaxKey Api at {}" , new DateTime());
+		_logger.info("MaxKey Api Server Port {}" , WebContext.getServerPort());
+		_logger.info("MaxKey Api started.");
 		
 	}
 
 	@Override
 	protected SpringApplicationBuilder configure(SpringApplicationBuilder application) {
-		return application.sources(MaxKeyOpenApiApplication.class);
+		return application.sources(MaxKeyApiApplication.class);
 	}
 
 }