bug fix

README.md

@@ -13,9 +13,9 @@
 * 看数据字典是否支持级联，数据字典级联太常见了，平台需要提供数据和前端的支持。puls系统支持
 * 看代码生成是否支持预览，为什么要预览，因为生成会覆盖，预览可以修改已经生成的代码 
 
-Plus系统是一个使用简单，功能较为复杂的开源系统，已经数十家商业公司采用
+Plus系统是一个开发和部署简单，业务功能较为复杂的开源系统，已经数十家商业公司采用，兼顾教学和实战。
 
-系统基于Spring Boot2.1技术，前端采用了Layui2.4。数据库以MySQL/Oracle/Postgres/SQLServer为实例，理论上是跨数据库平台.
+系统基于Spring Boot2.5技术，前端采用了Layui2.4。数据库以MySQL/Oracle/Postgres/SQLServer为实例，理论上是跨数据库平台.
 
 基本技术栈来源于我为电子工业出版社编写的的[<<Spring Boot 2 精髓 >>](https://item.jd.com/12214143.html) (这本书每一章也有各种例子，但Springboot-plus 更偏向于应用而不是教学)
 该书的第二版电子版可以可以在[看云广场购买](https://www.kancloud.cn/xiandafu/springboot2-in-practice/), 包含基础篇，分布式篇和微服务篇，第二版也包含一章说明Plus系统
@@ -23,7 +23,7 @@ Plus系统是一个使用简单，功能较为复杂的开源系统，已经数
 > 我的新书，程序员性能优化，程序装B宝典[《Java系统性能优化》](https://item.jd.com/12742086.html)，可以在京东上购买了
 
 
-当前版本:1.3.0
+当前版本:2.0.0, 当前版本与1.3.x版本差别较大
 
 技术交流群：252010126
 

admin-console/src/main/java/com/ibeetl/admin/console/dao/FunctionConsoleDao.java

@@ -18,5 +18,5 @@ public interface FunctionConsoleDao extends BaseMapper<CoreFunction> {
      *
      * @param query
      */
-    PageResult<CoreFunction> queryByCondtion(PageRequest query, @Root Map params);
+    PageResult<CoreFunction> queryByCondition(PageRequest query, @Root Map params);
 }

admin-console/src/main/java/com/ibeetl/admin/console/service/FunctionConsoleService.java

@@ -49,7 +49,7 @@ public class FunctionConsoleService  extends CoreBaseService<CoreFunction> {
 	public PageResult<CoreFunction> queryByCondtion(FunctionQuery query) {
 		PageRequest pageRequest = query.getPageRequest();
 		Map params = query.getPageParam();
-		PageResult<CoreFunction> pageResult = functionDao.queryByCondtion(pageRequest,params);
+		PageResult<CoreFunction> pageResult = functionDao.queryByCondition(pageRequest,params);
 		List<CoreFunction> list = pageResult.getList();
 		this.queryListAfter(list);
 		//处理父功能名称显示

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

@@ -7,6 +7,7 @@ spring.datasource.baseDataSource.driver-class-name=com.mysql.cj.jdbc.Driver
 beetlsql.sqlManagers=coreSqlManager
 beetlsql.coreSqlManager.ds=baseDataSource
 beetlsql.coreSqlManager.basePackage=com.ibeetl.admin.core.dao,com.ibeetl.admin.console.dao
+beetlsql.coreSqlManager.daoSuffix=Dao
 beetlsql.coreSqlManager.dbStyle=org.beetl.sql.core.db.MySqlStyle
 
 

admin-console/src/main/resources/btsql-ext.properties

+# 兼容2的定界符
+DELIMITER_PLACEHOLDER_START=#
+DELIMITER_PLACEHOLDER_END=#
+DELIMITER_STATEMENT_START=@
+DELIMITER_STATEMENT_END=
+DELIMITER_PLACEHOLDER_START2=${
+DELIMITER_PLACEHOLDER_END2=}
+
 FN.isEmpty = org.beetl.ext.fn.EmptyExpressionFunction
 FN.isNotEmpty = org.beetl.ext.fn.IsNotEmptyExpressionFunction

admin-console/src/main/resources/sql/console/audit.md

-queryByCondtion
+queryByCondition
 ===
 
     select 

admin-console/src/main/resources/sql/console/function.md

-queryByCondtion
+queryByCondition
 ===
 
     select 

admin-console/src/main/resources/sql/console/menu.md

 
-queryByCondtion
+queryByCondition
 ===============
 * 根据条件查询
 

admin-console/src/main/resources/sql/console/org.md

@@ -2,7 +2,7 @@ batchDelByIds
 ===
 	update core_org set u.del_flag = 1 where u.id in( #join(ids)#)
 
-queryByCondtion
+queryByCondition
 ===
 	select 
 	@pageTag(){

admin-console/src/main/resources/sql/console/role.md

-queryByCondtion
+queryByCondition
 ===
 
 	select

admin-console/src/main/resources/sql/console/user.md

 
-queryByCondtion
+queryByCondition
 ===
 
     select 

admin-core/pom.xml

@@ -55,7 +55,7 @@
         <dependency>
             <groupId>com.ibeetl</groupId>
             <artifactId>sql-springboot-starter</artifactId>
-            <version>3.6.0-RELEASE</version>
+            <version>3.6.1-RELEASE</version>
         </dependency>
 
 

admin-core/src/main/java/com/ibeetl/admin/core/conf/JasonConfig.java

@@ -4,6 +4,7 @@ import java.io.IOException;
 import java.text.SimpleDateFormat;
 
 import org.beetl.sql.core.engine.PageQuery;
+import org.beetl.sql.core.page.PageResult;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
@@ -52,8 +53,8 @@ public class JasonConfig {
 			}
 			gen.writeStringField("msg", value.getMsg());
 			Object data = value.getData();
-			if(data instanceof PageQuery ) {
-				PageQuery query = (PageQuery)(data);
+			if(data instanceof PageResult) {
+				PageResult query = (PageResult)(data);
 				gen.writeObjectField("count", query.getTotalRow());
 				gen.writeObjectField("data", query.getList());
 			}else {

admin-core/src/main/java/com/ibeetl/admin/core/rbac/da/SameOrgDataAccess.java

@@ -35,7 +35,7 @@ public class SameOrgDataAccess implements DataAccess {
 
 	@Override
 	public String getName() {
-		return "同结构";
+		return "同机构";
 	}
 
 	@Override

admin-core/src/main/java/com/ibeetl/admin/core/web/query/PageParam.java

@@ -56,6 +56,7 @@ public class PageParam {
                 }
             }else{
             	try{
+					f.setAccessible(true);
 					Object o = f.get(this);
 					map.put(f.getName(),o);
 				}  catch (IllegalAccessException e) {

admin-core/src/main/resources/codeTemplate/java/dao.java

@@ -2,9 +2,13 @@ package ${package};
 
 import java.util.List;
 
-import org.beetl.sql.core.annotatoin.SqlResource;
-import org.beetl.sql.core.mapper.BaseMapper;
-import org.beetl.sql.core.engine.PageQuery;
+import com.ibeetl.admin.core.entity.CoreUser;
+import org.beetl.sql.mapper.BaseMapper;
+import org.beetl.sql.mapper.annotation.SqlResource;
+import org.beetl.sql.core.page.PageRequest;
+import org.beetl.sql.core.page.PageResult;
+import org.beetl.sql.mapper.BaseMapper;
+import org.beetl.sql.mapper.annotation.Root;
 
 import  ${basePackage}.entity.*;
 
@@ -13,6 +17,6 @@ import  ${basePackage}.entity.*;
  */
 \@SqlResource("${entity.system}.${entity.code}")
 public interface ${entity.name}Dao extends BaseMapper<${entity.name}>{
-    public PageQuery<${entity.name}> queryByCondition(PageQuery query);
+    public PageResult<${entity.name}> queryByCondition(PageRequest request,\@Root Map params);
     public void batchDel${entity.name}ByIds( List<Long> ids);
 }
\ No newline at end of file