save

admin-console/pom.xml

@@ -6,17 +6,16 @@
 	<parent>
 		<groupId>com.ibeetl</groupId>
 		<artifactId>admin</artifactId>
-		<version>${plus.version}</version>
+		<version>1.3.0</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 	<dependencies>
 		<dependency>
 			<groupId>com.ibeetl</groupId>
 			<artifactId>admin-core</artifactId>
-			<version>${plus.version}</version>
+			<version>1.3.0</version>
 		</dependency>
-		
-<!-- 		重新覆盖mysql的版本，原因：虽然admin-core更新过mysql版本，但由于parent是admin-cloud，导致更新的版本失效 -->
+
 		<dependency>
 			<groupId>mysql</groupId>
 			<artifactId>mysql-connector-java</artifactId>

admin-console/src/main/resources/application.properties

@@ -20,8 +20,9 @@ user.orgId=1
 audit.enable=false
 #单机情况下使用hashmap存放回话，集群下可以参考springboot 使用redis
 spring.session.store-type=HASH_MAP 
+
 #spring.cache.type=
-spring.cache.type=SIMPLE
+spring.cache.type=simple
 logging.level.root=info
 logging.level.org.springframework.web.servlet.mvc.method.annotation=warn
 #logging.file = my.log

admin-core/pom.xml

@@ -6,7 +6,7 @@
      <parent>
         <groupId>com.ibeetl</groupId>
         <artifactId>admin</artifactId>
-        <version>${plus.version}</version>
+        <version>1.3.0</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <properties>
@@ -44,7 +44,7 @@
 		<dependency>
 			<groupId>com.ibeetl</groupId>
 			<artifactId>beetl-framework-starter</artifactId>
-			<version>1.1.68.RELEASE</version>
+			<version>1.2.0.RELEASE</version>
 		</dependency>
 		
 		<dependency>

admin-core/src/main/java/com/ibeetl/admin/core/web/CoreCodeGenController.java

@@ -333,6 +333,7 @@ public class CoreCodeGenController {
 		String basePackage = data.getBasePackage();
 		Entity entity = codeGenService.getEntityInfo(info.getTableName());
 		entity.setCode(info.getCode());
+		entity.setName(info.getName());
 		entity.setDisplayName(info.getDisplayName());
 		entity.setSystem(info.getSystem());
 		entity.setAttachment(data.entity.isAttachment());

pom.xml

@@ -4,12 +4,12 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>com.ibeetl</groupId>
 	<artifactId>admin</artifactId>
-	<version>${plus.version}</version>
+	<version>1.3.0</version>
 	<packaging>pom</packaging>
 	<properties>
 		<java.version>1.8</java.version>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-		<plus.version>1.2.1</plus.version>
+
 	</properties>
 	<modules>
 		<module>admin-core</module>
@@ -34,7 +34,7 @@
 
 	</dependencies>
 	<build>
-		<finalName></finalName>
+
 		<plugins>
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>