update springboot 2.1.7 and beetl 2.1.10

admin-console/pom.xml

@@ -6,14 +6,14 @@
 	<parent>
 		<groupId>com.ibeetl</groupId>
 		<artifactId>admin</artifactId>
-		<version>1.3.1</version>
+		<version>1.3.2</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 	<dependencies>
 		<dependency>
 			<groupId>com.ibeetl</groupId>
 			<artifactId>admin-core</artifactId>
-			<version>1.3.1</version>
+			<version>1.3.2</version>
 		</dependency>
 
 		<dependency>

admin-core/pom.xml

@@ -6,7 +6,7 @@
      <parent>
         <groupId>com.ibeetl</groupId>
         <artifactId>admin</artifactId>
-        <version>1.3.1</version>
+        <version>1.3.2</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <properties>
@@ -44,7 +44,7 @@
 		<dependency>
 			<groupId>com.ibeetl</groupId>
 			<artifactId>beetl-framework-starter</artifactId>
-			<version>1.2.6.RELEASE</version>
+			<version>1.2.10.RELEASE</version>
 		</dependency>
 		
 		<dependency>

admin-core/src/main/java/com/ibeetl/admin/core/entity/CoreFunction.java

@@ -32,7 +32,7 @@ public class CoreFunction extends BaseEntity   {
 	private Long parentId ;
 	@Dict(type=CoreDictType.FUNCTION_TYPE)
 	@NotBlank
-	private String type ="FN0" ;
+	private String type = null;//"FN0" ;
 	
 
 	public String getAccessUrl(){

admin-core/src/main/java/com/ibeetl/admin/core/gen/BaseTarget.java

@@ -38,7 +38,7 @@ public abstract class BaseTarget implements Target {
 			cfg.setStatementEnd(null);
 
 			cfg.setHtmlTagSupport(false);
-			cfg.initOther();
+			cfg.build();
 			gt = new GroupTemplate(rs,cfg);
             gt.registerFunction("verifyFormat", new VerifyForamtFunction());
 			gt.registerFunction("upperFirst", new Function() {

admin-core/src/main/java/com/ibeetl/admin/core/service/CorePlatformService.java

@@ -260,18 +260,6 @@ public class CorePlatformService {
             return true;
         }
         String str = functionCode;
-//        do {
-//            List<SysRoleFunction> list = sysRoleFunctionDao.getRoleFunction(userId, orgId, str);
-//            boolean canAccess = !list.isEmpty();
-//            if (canAccess) {
-//                return true;
-//            }
-//            int index = str.lastIndexOf('.');
-//            if (index == -1) {
-//                break;
-//            }
-//            str = str.substring(0, index);
-//        } while (true);
         List<CoreRoleFunction> list = sysRoleFunctionDao.getRoleFunction(userId, orgId, str);
         boolean canAccess = !list.isEmpty();
         if (canAccess) {

admin-core/src/main/resources/codeTemplate/maven/pomTemplate.xml

@@ -13,19 +13,19 @@
 	<parent>
 		<groupId>org.springframework.boot</groupId>
 		<artifactId>spring-boot-starter-parent</artifactId>
-		<version>2.1.5.RELEASE</version>
+		<version>2.1.7.RELEASE</version>
 	</parent>
 	<dependencies>
 		<dependency>
 			<groupId>com.ibeetl</groupId>
 			<artifactId>admin-core</artifactId>
-			<version>1.3.1</version>
+			<version>1.3.2</version>
 		</dependency>
 		<!--  admin-console 包含了系统管理管理的所有功能，子系统可以不使用这部分 -->
 		<dependency>
 			<groupId>com.ibeetl</groupId>
 			<artifactId>admin-console</artifactId>
-			<version>1.3.1</version>
+			<version>1.3.2</version>
 		</dependency>
 
 		<dependency>

pom.xml

@@ -4,7 +4,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>com.ibeetl</groupId>
 	<artifactId>admin</artifactId>
-	<version>1.3.1</version>
+	<version>1.3.2</version>
 	<packaging>pom</packaging>
 	<properties>
 		<java.version>1.8</java.version>
@@ -18,7 +18,7 @@
 	<parent>
 		<groupId>org.springframework.boot</groupId>
 		<artifactId>spring-boot-starter-parent</artifactId>
-		<version>2.1.5.RELEASE</version>
+		<version>2.1.7.RELEASE</version>
 	</parent>
 	<!-- Add typical dependencies for a web application -->
 	<dependencies>