更换至beetlsql3最新版本

plus-admin/admin-core/src/main/java/com/ibeetl/admin/core/util/beetl/FunFunction.java

 package com.ibeetl.admin.core.util.beetl;
 
+import com.ibeetl.admin.core.rbac.tree.FunctionItem;
+import com.ibeetl.admin.core.service.CorePlatformService;
 import org.beetl.core.Context;
 import org.beetl.core.Function;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
-import com.ibeetl.admin.core.rbac.tree.FunctionItem;
-import com.ibeetl.admin.core.service.CorePlatformService;
-
 /** 通过functionId获取functionName,从缓存中获取 */
 @Component
 public class FunFunction implements Function {

plus-admin/admin-core/src/main/java/com/ibeetl/admin/core/util/beetl/MenuFunction.java

 package com.ibeetl.admin.core.util.beetl;
 
+import com.ibeetl.admin.core.rbac.tree.MenuItem;
+import com.ibeetl.admin.core.service.CorePlatformService;
 import org.beetl.core.Context;
 import org.beetl.core.Function;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
-import com.ibeetl.admin.core.rbac.tree.MenuItem;
-import com.ibeetl.admin.core.service.CorePlatformService;
-
 /** 通过menuId获取menuName,从缓存中获取 */
 @Component
 public class MenuFunction implements Function {

plus-admin/admin-core/src/main/java/com/ibeetl/admin/core/util/beetl/NextDayFunction.java

@@ -2,7 +2,6 @@ package com.ibeetl.admin.core.util.beetl;
 
 import java.util.Calendar;
 import java.util.Date;
-
 import org.beetl.core.Context;
 import org.beetl.core.Function;
 

plus-admin/admin-core/src/main/java/com/ibeetl/admin/core/util/beetl/OrgFunction.java

 package com.ibeetl.admin.core.util.beetl;
 
+import com.ibeetl.admin.core.rbac.tree.OrgItem;
+import com.ibeetl.admin.core.service.CorePlatformService;
 import org.beetl.core.Context;
 import org.beetl.core.Function;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
-import com.ibeetl.admin.core.rbac.tree.OrgItem;
-import com.ibeetl.admin.core.service.CorePlatformService;
-
-import java.util.List;
-
 /**
  * 通过orgId获取orgName,从缓存中获取
  *

plus-admin/admin-core/src/main/java/com/ibeetl/admin/core/util/beetl/RoleFunction.java

 package com.ibeetl.admin.core.util.beetl;
 
+import com.ibeetl.admin.core.service.CoreRoleService;
 import org.beetl.core.Context;
 import org.beetl.core.Function;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
-import com.ibeetl.admin.core.rbac.tree.OrgItem;
-import com.ibeetl.admin.core.service.CoreRoleService;
-
 /**
  * 获取系统的所有角色列表
  *

plus-admin/admin-core/src/main/java/com/ibeetl/admin/core/util/beetl/SearchCondtionFunction.java

 package com.ibeetl.admin.core.util.beetl;
 
+import com.ibeetl.admin.core.annotation.Query;
+import com.ibeetl.admin.core.util.AnnotationUtil;
 import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
-
 import org.beetl.core.Context;
 import org.beetl.core.Function;
 import org.springframework.stereotype.Component;
 
-import com.ibeetl.admin.core.annotation.Query;
-import com.ibeetl.admin.core.util.AnnotationUtil;
-
 /**
  * 描述: 通过解析注解，获取表达查询条件信息
  *

plus-admin/admin-core/src/main/java/com/ibeetl/admin/core/util/beetl/SysFunctionTreeFunction.java

 package com.ibeetl.admin.core.util.beetl;
 
+import com.ibeetl.admin.core.rbac.tree.FunctionItem;
+import com.ibeetl.admin.core.service.CorePlatformService;
 import java.util.List;
-
 import org.beetl.core.Context;
 import org.beetl.core.Function;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
-import com.ibeetl.admin.core.rbac.tree.FunctionItem;
-import com.ibeetl.admin.core.rbac.tree.OrgItem;
-import com.ibeetl.admin.core.service.CorePlatformService;
-
 /**
  * 手工构造一个功能树，书上包含模块，功能，按钮
  *

plus-admin/admin-core/src/main/java/com/ibeetl/admin/core/util/beetl/UUIDFunction.java

 package com.ibeetl.admin.core.util.beetl;
 
+import com.ibeetl.admin.core.util.UUIDUtil;
 import org.beetl.core.Context;
 import org.beetl.core.Function;
 
-import com.ibeetl.admin.core.util.UUIDUtil;
-
 public class UUIDFunction implements Function {
 
   @Override

plus-admin/admin-core/src/main/java/com/ibeetl/admin/core/util/beetl/VerifyForamtFunction.java

 package com.ibeetl.admin.core.util.beetl;
 
+import com.ibeetl.admin.core.gen.model.Verify;
 import java.util.List;
-
 import org.beetl.core.Context;
 import org.beetl.core.Function;
 
-import com.ibeetl.admin.core.gen.model.Verify;
-
 /** 格式化校验集合 */
 public class VerifyForamtFunction implements Function {
 

plus-admin/admin-core/src/main/java/com/ibeetl/admin/core/util/doc/BeetlExpressionEvaluator.java

 package com.ibeetl.admin.core.util.doc;
 
 import java.util.Map;
-
 import org.jxls.expression.ExpressionEvaluator;
 
 public class BeetlExpressionEvaluator implements ExpressionEvaluator {

plus-admin/admin-core/src/main/java/com/ibeetl/admin/core/util/enums/DelFlagEnum.java

 package com.ibeetl.admin.core.util.enums;
 
-import org.beetl.sql.core.annotatoin.EnumMapping;
+
+import org.beetl.sql.annotation.entity.EnumMapping;
 
 /**
  * 描述:数据是否被逻辑删除
@@ -9,6 +10,9 @@ import org.beetl.sql.core.annotatoin.EnumMapping;
  */
 @EnumMapping("value")
 public enum DelFlagEnum {
+  /**
+   *
+   */
   NORMAL(0),
   DELETED(1);
 

plus-admin/admin-core/src/main/java/com/ibeetl/admin/core/util/enums/FunctionTypeEnum.java

@@ -2,14 +2,17 @@ package com.ibeetl.admin.core.util.enums;
 
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonValue;
-import org.beetl.sql.core.annotatoin.EnumMapping;
+import org.beetl.sql.annotation.entity.EnumValue;
 
-@EnumMapping("value")
 public enum FunctionTypeEnum implements DictTypeEnum<FunctionTypeEnum> {
+  /**
+   *
+   */
   FN0("FN0", "导航访问", "function_type"),
   FN1("FN1", "功能访问", "function_type"),
   FN2("FN2", "菜单访问", "function_type");
 
+  @EnumValue
   private String value;
 
   private String name;

plus-admin/admin-core/src/main/java/com/ibeetl/admin/core/util/enums/GeneralStateEnum.java

 package com.ibeetl.admin.core.util.enums;
 
-import org.beetl.sql.core.annotatoin.EnumMapping;
+
+import org.beetl.sql.annotation.entity.EnumMapping;
 
 /**
  * 描述:数据是否有效
@@ -17,18 +18,22 @@ public enum GeneralStateEnum {
   private String value;
 
   GeneralStateEnum(String value) {
+
     this.value = value;
   }
 
   public String getValue() {
+
     return value;
   }
 
   public void setValue(String value) {
+
     this.value = value;
   }
 
   public static GeneralStateEnum getEnum(String value) {
+
     for (GeneralStateEnum stateEnum : GeneralStateEnum.values()) {
       if (stateEnum.value == value) {
         return stateEnum;
@@ -39,6 +44,7 @@ public enum GeneralStateEnum {
 
   @Override
   public String toString() {
+
     return String.valueOf(this.value);
   }
 }

plus-admin/admin-core/src/main/java/com/ibeetl/admin/core/util/enums/JobTypeEnum.java

@@ -2,10 +2,12 @@ package com.ibeetl.admin.core.util.enums;
 
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonValue;
-import org.beetl.sql.core.annotatoin.EnumMapping;
+import org.beetl.sql.annotation.entity.EnumValue;
 
-@EnumMapping("value")
 public enum JobTypeEnum implements DictTypeEnum<JobTypeEnum> {
+  /**
+   *
+   */
   MANAGER("管理岗位", "JT_01", "job_type"),
   TECHNOLOGY("技术岗位", "JT_02", "job_type"),
   BOARD_OF_DIRECTORS("董事会", "JT_S_01", "job_sub_managment_type"),
@@ -14,43 +16,54 @@ public enum JobTypeEnum implements DictTypeEnum<JobTypeEnum> {
   PROGRAMMER("程序员", "JT_S_04", "job_dev_sub_type");
 
   private String name;
+
+  @EnumValue
   private String value;
+
   private String type;
 
   JobTypeEnum(String name, String value, String type) {
+
     this.name = name;
     this.value = value;
     this.type = type;
   }
 
   public String getName() {
+
     return name;
   }
 
   public void setName(String name) {
+
     this.name = name;
   }
 
   @JsonValue
   public String getValue() {
+
     return value;
   }
 
   public void setValue(String value) {
+
     this.value = value;
   }
 
   public String getType() {
+
     return type;
   }
 
   public void setType(String type) {
+
     this.type = type;
   }
 
   @JsonCreator
   @Override
   public JobTypeEnum findEnum(String value) {
+
     JobTypeEnum[] values = values();
     for (JobTypeEnum typeEnum : values) {
       if (typeEnum.value.equals(value)) {

plus-admin/admin-core/src/main/java/com/ibeetl/admin/core/util/enums/RoleTypeEnum.java

@@ -2,14 +2,13 @@ package com.ibeetl.admin.core.util.enums;
 
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonValue;
-import org.beetl.sql.core.annotatoin.EnumMapping;
+import org.beetl.sql.annotation.entity.EnumValue;
 
 /**
  * 描述: 角色字典枚举
  *
  * @author : Administrator
  */
-@EnumMapping("value")
 public enum RoleTypeEnum implements DictTypeEnum<RoleTypeEnum> {
 
   /** 操作角色 */
@@ -17,24 +16,29 @@ public enum RoleTypeEnum implements DictTypeEnum<RoleTypeEnum> {
   /** 工作流角色 */
   WORKFLOW("R1");
 
+  @EnumValue
   private String value;
 
   RoleTypeEnum(String value) {
+
     this.value = value;
   }
 
   @JsonValue
   public String getValue() {
+
     return value;
   }
 
   public void setValue(String value) {
+
     this.value = value;
   }
 
   @JsonCreator
   @Override
   public RoleTypeEnum findEnum(String value) {
+
     RoleTypeEnum[] values = values();
     for (RoleTypeEnum typeEnum : values) {
       if (typeEnum.value.equals(value)) {

plus-admin/admin-core/src/main/java/com/ibeetl/admin/core/util/enums/StateTypeEnum.java

@@ -2,52 +2,65 @@ package com.ibeetl.admin.core.util.enums;
 
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonValue;
-import org.beetl.sql.core.annotatoin.EnumMapping;
+import org.beetl.sql.annotation.entity.EnumValue;
 
-@EnumMapping("value")
 public enum StateTypeEnum implements DictTypeEnum<StateTypeEnum> {
+  /**
+   *
+   */
   S0("禁用", "S0", "user_state"),
   S1("启用", "S1", "job_type");
 
   private String name;
+
+  @EnumValue
   private String value;
+
   private String type;
 
   StateTypeEnum(String name, String value, String type) {
+
     this.name = name;
     this.value = value;
     this.type = type;
   }
 
   public String getName() {
+
     return name;
   }
 
   public void setName(String name) {
+
     this.name = name;
   }
 
   @Override
   @JsonValue
   public String getValue() {
+
     return value;
   }
 
   public void setValue(String value) {
+
     this.value = value;
   }
 
   public String getType() {
+
     return type;
   }
 
   public void setType(String type) {
+
     this.type = type;
   }
 
   @JsonCreator
   @Override
   public StateTypeEnum findEnum(String value) {
+
     StateTypeEnum[] values = values();
     for (StateTypeEnum typeEnum : values) {
       if (typeEnum.value.equals(value)) {

plus-admin/admin-core/src/main/java/com/ibeetl/admin/core/web/ControllerNotFound.java

@@ -2,7 +2,6 @@ package com.ibeetl.admin.core.web;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
-
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.beetl.ext.simulate.WebSimulate;
@@ -16,10 +15,10 @@ import org.springframework.web.bind.annotation.RequestMapping;
  */
 @Controller
 public class ControllerNotFound {
-  @Autowired WebSimulate webSimulate;
+//  @Autowired WebSimulate webSimulate;
   Log log = LogFactory.getLog(ControllerNotFound.class);
 
-  @RequestMapping("/**/*.do")
+//  @RequestMapping("/**/*.do")
   public void error(HttpServletRequest request, HttpServletResponse response) {
     response.setContentType("text/html;charset=UTF-8");
     log.info("没有配置 url " + request.getRequestURI() + ",确认所访问Controller是否存在，是否被Spring Boot管理");

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

 package com.ibeetl.admin.core.web;
 
+import com.ibeetl.admin.core.gen.AutoGen;
+import com.ibeetl.admin.core.gen.HtmlGen;
+import com.ibeetl.admin.core.gen.JSGen;
+import com.ibeetl.admin.core.gen.JavaCodeGen;
+import com.ibeetl.admin.core.gen.MavenProjectTarget;
+import com.ibeetl.admin.core.gen.MdGen;
+import com.ibeetl.admin.core.gen.WebTarget;
+import com.ibeetl.admin.core.gen.model.Attribute;
+import com.ibeetl.admin.core.gen.model.Entity;
+import com.ibeetl.admin.core.service.CoreCodeGenService;
+import com.ibeetl.admin.core.util.PlatformException;
 import java.io.File;
 import java.io.FileOutputStream;
-import java.io.FileReader;
 import java.io.FileWriter;
 import java.io.IOException;
 import java.io.InputStream;
@@ -10,8 +20,6 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.Map.Entry;
-import java.util.Properties;
-
 import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
@@ -27,18 +35,6 @@ import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.ResponseBody;
 import org.springframework.web.servlet.ModelAndView;
 
-import com.ibeetl.admin.core.gen.AutoGen;
-import com.ibeetl.admin.core.gen.HtmlGen;
-import com.ibeetl.admin.core.gen.JSGen;
-import com.ibeetl.admin.core.gen.JavaCodeGen;
-import com.ibeetl.admin.core.gen.MavenProjectTarget;
-import com.ibeetl.admin.core.gen.MdGen;
-import com.ibeetl.admin.core.gen.WebTarget;
-import com.ibeetl.admin.core.gen.model.Attribute;
-import com.ibeetl.admin.core.gen.model.Entity;
-import com.ibeetl.admin.core.service.CoreCodeGenService;
-import com.ibeetl.admin.core.util.PlatformException;
-
 @Controller
 public class CoreCodeGenController {
   private final Log log = LogFactory.getLog(this.getClass());

plus-admin/admin-core/src/main/java/com/ibeetl/admin/core/web/JsonResult.java

 package com.ibeetl.admin.core.web;
 
-import cn.hutool.core.map.MapUtil;
-import com.ibeetl.admin.core.util.JoseJwtUtil;
-import java.util.Map;
-
 /**
  * 描述: json格式数据返回对象，使用CustomJsonResultSerializer 来序列化
  *

plus-admin/admin-core/src/main/java/com/ibeetl/admin/core/web/UserLoginElController.java

@@ -7,14 +7,14 @@ import com.ibeetl.admin.core.entity.CoreRoute;
 import com.ibeetl.admin.core.entity.CoreUser;
 import com.ibeetl.admin.core.rbac.UserLoginInfo;
 import com.ibeetl.admin.core.rbac.UserRoleInfo;
-import com.ibeetl.admin.core.service.RoleRoutesElService;
 import com.ibeetl.admin.core.service.CoreUserService;
-import com.ibeetl.admin.core.util.HttpRequestLocal;
+import com.ibeetl.admin.core.service.RoleRoutesElService;
 import com.ibeetl.admin.core.util.JoseJwtUtil;
 import com.ibeetl.admin.core.util.PlatformException;
+import com.ibeetl.admin.core.util.RequestContextThreadLocal;
+import com.ibeetl.admin.core.util.cache.CacheUtil;
 import java.util.List;
 import java.util.Map;
-import java.util.Optional;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -25,19 +25,24 @@ import org.springframework.web.bind.annotation.RestController;
 @RestController
 public class UserLoginElController {
 
-  @Autowired private RoleRoutesElService roleRoutesService;
+  @Autowired
+  private RoleRoutesElService roleRoutesService;
 
-  @Autowired private CoreUserService coreUserService;
+  @Autowired
+  private CoreUserService coreUserService;
 
   @GetMapping("/routes")
   public JsonResult<List<CoreRoute>> routes() {
-    return JsonResult.success(roleRoutesService.getRoutes());
+
+    List<Long> roleIds = RequestContextThreadLocal.getUserRoleIds();
+    return JsonResult.success(roleRoutesService.getRoutes(roleIds));
   }
 
   @GetMapping("/info")
   public JsonResult info() {
-    CoreOrg currentOrg = HttpRequestLocal.getAccessCurrentOrg();
-    CoreUser currentUser = HttpRequestLocal.getAccessCurrentUser();
+
+    CoreOrg currentOrg = RequestContextThreadLocal.getCurrentOrg();
+    CoreUser currentUser = RequestContextThreadLocal.getCurrentUser();
     List<Long> roleIds = roleRoutesService.getAllRoleIds(currentUser.getId(), currentOrg.getId());
     UserRoleInfo userRoleInfo = new UserRoleInfo();
     userRoleInfo.setAvatar("avatar");
@@ -50,24 +55,14 @@ public class UserLoginElController {
   @PostMapping("/login")
   public JsonResult loginEle(
       @RequestBodyPlus("username") String username, @RequestBodyPlus("password") String password) {
+
     UserLoginInfo info = coreUserService.login(username, password);
     if (info == null) {
       throw new PlatformException("用户名密码错误");
     }
     CoreUser user = info.getUser();
-    CoreOrg currentOrg = info.getOrgs().stream().findFirst().orElse(null);
 
-    for (CoreOrg org : info.getOrgs()) {
-      Long orgId = user.getOrgId();
-      if (org.getId().equals(orgId)) {
-        currentOrg = org;
-        break;
-      }
-    }
-
-    info.setCurrentOrg(currentOrg);
-    // 记录登录信息到session
-    HttpRequestLocal.setLoginerInfo(info.getUser(), info.getCurrentOrg(), info.getOrgs());
+    RequestContextThreadLocal.setLoginerInfo(info);
     Map<String, Object> resultMap =
         MapUtil.<String, Object>builder()
             .put("token", JoseJwtUtil.generateJwtToken(String.valueOf(user.getId())))
@@ -77,7 +72,9 @@ public class UserLoginElController {
 
   @PostMapping("/logout")
   public JsonResult logout() {
-    HttpRequestLocal.clearAllSession();
+
+    RequestContextThreadLocal.destory();
     return JsonResult.success();
   }
+
 }