1 版本更新

jboot-admin-base/src/main/java/io/jboot/admin/base/captcha/CaptchaCache.java

@@ -2,7 +2,6 @@ package io.jboot.admin.base.captcha;
 
 import com.jfinal.captcha.Captcha;
 import com.jfinal.captcha.ICaptchaCache;
-
 import io.jboot.Jboot;
 import io.jboot.admin.base.common.CacheKey;
 

jboot-admin-base/src/main/java/io/jboot/admin/base/gencode/model/AppMetaBuilder.java

@@ -1,14 +1,13 @@
 package io.jboot.admin.base.gencode.model;
 
-import java.sql.ResultSet;
-import java.sql.SQLException;
-
-import javax.sql.DataSource;
-
 import com.jfinal.plugin.activerecord.dialect.OracleDialect;
 import com.jfinal.plugin.activerecord.generator.MetaBuilder;
 import com.jfinal.plugin.activerecord.generator.TableMeta;
 
+import javax.sql.DataSource;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+
 /**
  * 自定义 MetaBuilder，处理表前缀跳过生成
  * @author Rlax

jboot-admin-base/src/main/java/io/jboot/admin/base/gencode/model/AppModelGenerator.java

@@ -1,18 +1,16 @@
 package io.jboot.admin.base.gencode.model;
 
-import java.util.List;
-
-import javax.sql.DataSource;
-
 import com.jfinal.kit.PathKit;
 import com.jfinal.kit.StrKit;
 import com.jfinal.plugin.activerecord.generator.TableMeta;
-
 import io.jboot.Jboot;
 import io.jboot.codegen.CodeGenHelpler;
 import io.jboot.codegen.model.JbootBaseModelGenerator;
 import io.jboot.codegen.model.JbootModelGenerator;
 
+import javax.sql.DataSource;
+import java.util.List;
+
 /**
  * model代码自动生成
  * @author Rlax

jboot-admin-base/src/main/java/io/jboot/admin/base/gencode/service/AppServiceGenerator.java

@@ -1,17 +1,15 @@
 package io.jboot.admin.base.gencode.service;
 
-import java.util.List;
-
-import javax.sql.DataSource;
-
 import com.jfinal.kit.StrKit;
 import com.jfinal.plugin.activerecord.generator.TableMeta;
-
 import io.jboot.Jboot;
 import io.jboot.admin.base.gencode.model.AppMetaBuilder;
 import io.jboot.codegen.CodeGenHelpler;
 import io.jboot.codegen.service.JbootServiceInterfaceGenerator;
 
+import javax.sql.DataSource;
+import java.util.List;
+
 /**
  * service 生成
  * @author Rlax

jboot-admin-base/src/main/java/io/jboot/admin/base/gencode/serviceimpl/AppJbootServiceImplGenerator.java

@@ -15,11 +15,6 @@
  */
 package io.jboot.admin.base.gencode.serviceimpl;
 
-import java.io.File;
-import java.io.FileWriter;
-import java.io.IOException;
-import java.util.List;
-
 import com.jfinal.kit.Kv;
 import com.jfinal.kit.PathKit;
 import com.jfinal.kit.StrKit;
@@ -28,6 +23,11 @@ import com.jfinal.plugin.activerecord.generator.TableMeta;
 import com.jfinal.template.Engine;
 import com.jfinal.template.source.ClassPathSourceFactory;
 
+import java.io.File;
+import java.io.FileWriter;
+import java.io.IOException;
+import java.util.List;
+
 public class AppJbootServiceImplGenerator extends BaseModelGenerator {
 
     private String modelPacket;

jboot-admin-base/src/main/java/io/jboot/admin/base/gencode/serviceimpl/AppServiceImplGenerator.java

@@ -1,16 +1,14 @@
 package io.jboot.admin.base.gencode.serviceimpl;
 
-import java.util.List;
-
-import javax.sql.DataSource;
-
 import com.jfinal.kit.StrKit;
 import com.jfinal.plugin.activerecord.generator.TableMeta;
-
 import io.jboot.Jboot;
 import io.jboot.admin.base.gencode.model.AppMetaBuilder;
 import io.jboot.codegen.CodeGenHelpler;
 
+import javax.sql.DataSource;
+import java.util.List;
+
 /**
  * service 生成
  * @author Rlax

jboot-admin-base/src/main/java/io/jboot/admin/base/interceptor/BusinessExceptionInterceptor.java

@@ -2,7 +2,6 @@ package io.jboot.admin.base.interceptor;
 
 import com.jfinal.aop.Interceptor;
 import com.jfinal.aop.Invocation;
-
 import io.jboot.admin.base.common.RestResult;
 import io.jboot.exception.JbootException;
 import io.jboot.web.controller.JbootController;

jboot-admin-base/src/main/java/io/jboot/admin/base/interceptor/NotNullPara.java

@@ -1,11 +1,6 @@
 package io.jboot.admin.base.interceptor;
 
-import java.lang.annotation.Documented;
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Inherited;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
+import java.lang.annotation.*;
 
 /**
  * 参数不为空

jboot-admin-base/src/main/java/io/jboot/admin/base/interceptor/NotNullParaInterceptor.java

@@ -1,16 +1,15 @@
 package io.jboot.admin.base.interceptor;
 
-import java.lang.reflect.Method;
-
 import com.jfinal.aop.Interceptor;
 import com.jfinal.aop.Invocation;
 import com.jfinal.core.Controller;
-
 import io.jboot.admin.base.common.RestResult;
 import io.jboot.utils.ArrayUtil;
 import io.jboot.utils.StrUtil;
 import io.jboot.web.controller.JbootController;
 
+import java.lang.reflect.Method;
+
 /**
  * 非空参数拦截器
  * @author Rlax

jboot-admin-base/src/main/java/io/jboot/admin/base/plugin/shiro/CharacterEncodingFilter.java

@@ -1,15 +1,13 @@
 package io.jboot.admin.base.plugin.shiro;
 
-import java.io.IOException;
+import com.jfinal.core.Const;
+import org.apache.shiro.web.servlet.OncePerRequestFilter;
 
 import javax.servlet.FilterChain;
 import javax.servlet.ServletException;
 import javax.servlet.ServletRequest;
 import javax.servlet.ServletResponse;
-
-import org.apache.shiro.web.servlet.OncePerRequestFilter;
-
-import com.jfinal.core.Const;
+import java.io.IOException;
 
 
 /**

jboot-admin-base/src/main/java/io/jboot/admin/base/plugin/shiro/RetryLimitHashedCredentialsMatcher.java

@@ -1,16 +1,15 @@
 package io.jboot.admin.base.plugin.shiro;
 
-import java.util.concurrent.atomic.AtomicInteger;
-
+import io.jboot.Jboot;
+import io.jboot.admin.base.common.CacheKey;
+import io.jboot.admin.base.exception.BusinessException;
 import org.apache.shiro.authc.AuthenticationInfo;
 import org.apache.shiro.authc.AuthenticationToken;
 import org.apache.shiro.authc.ExcessiveAttemptsException;
 import org.apache.shiro.authc.credential.HashedCredentialsMatcher;
 import org.apache.shiro.authc.credential.SimpleCredentialsMatcher;
 
-import io.jboot.Jboot;
-import io.jboot.admin.base.common.CacheKey;
-import io.jboot.admin.base.exception.BusinessException;
+import java.util.concurrent.atomic.AtomicInteger;
 
 /**
  * 密码重试认证

jboot-admin-base/src/main/java/io/jboot/admin/base/plugin/shiro/SessionDAO.java

@@ -1,13 +1,13 @@
 package io.jboot.admin.base.plugin.shiro;
 
-import java.io.Serializable;
-
 import org.apache.shiro.cache.CacheManager;
 import org.apache.shiro.session.Session;
 import org.apache.shiro.session.mgt.eis.EnterpriseCacheSessionDAO;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import java.io.Serializable;
+
 /***
  * 集成会话管理
  * 

jboot-admin-base/src/main/java/io/jboot/admin/base/plugin/shiro/SessionHandler.java

@@ -1,10 +1,10 @@
 package io.jboot.admin.base.plugin.shiro;
 
+import com.jfinal.handler.Handler;
+
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
-import com.jfinal.handler.Handler;
-
 /**
  * 去除;jsessionid
  * @author Rlax

jboot-admin-base/src/main/java/io/jboot/admin/base/plugin/shiro/ShiroCacheUtils.java

@@ -1,11 +1,10 @@
 package io.jboot.admin.base.plugin.shiro;
 
-import java.io.Serializable;
-
+import io.jboot.admin.base.common.CacheKey;
 import org.apache.shiro.cache.Cache;
 import org.apache.shiro.cache.CacheManager;
 
-import io.jboot.admin.base.common.CacheKey;
+import java.io.Serializable;
 
 /**
  * ShiroCache工具类

jboot-admin-base/src/main/java/io/jboot/admin/base/plugin/shiro/ShiroDbRealm.java

@@ -1,17 +1,12 @@
 package io.jboot.admin.base.plugin.shiro;
 
-import org.apache.shiro.authc.AuthenticationException;
-import org.apache.shiro.authc.AuthenticationInfo;
-import org.apache.shiro.authc.AuthenticationToken;
-import org.apache.shiro.authc.LockedAccountException;
-import org.apache.shiro.authc.UnknownAccountException;
+import io.jboot.admin.base.plugin.shiro.auth.MuitiAuthenticatied;
+import org.apache.shiro.authc.*;
 import org.apache.shiro.authz.AuthorizationInfo;
 import org.apache.shiro.cache.CacheManager;
 import org.apache.shiro.realm.AuthorizingRealm;
 import org.apache.shiro.subject.PrincipalCollection;
 
-import io.jboot.admin.base.plugin.shiro.auth.MuitiAuthenticatied;
-
 /**
  * ShiroDbRealm
  * @author Rlax

jboot-admin-base/src/main/java/io/jboot/admin/base/plugin/shiro/ShiroUtils.java

@@ -1,14 +1,14 @@
 package io.jboot.admin.base.plugin.shiro;
 
+import org.apache.shiro.SecurityUtils;
+import org.apache.shiro.crypto.hash.SimpleHash;
+import org.apache.shiro.subject.Subject;
+
 import java.beans.BeanInfo;
 import java.beans.Introspector;
 import java.beans.PropertyDescriptor;
 import java.util.Map;
 
-import org.apache.shiro.SecurityUtils;
-import org.apache.shiro.crypto.hash.SimpleHash;
-import org.apache.shiro.subject.Subject;
-
 /**
  * Shiro 工具类
  * gt.registerFunctionPackage("so",new ShiroUtils ());

jboot-admin-base/src/main/java/io/jboot/admin/base/plugin/shiro/cache/ShiroCache.java

@@ -1,16 +1,11 @@
 package io.jboot.admin.base.plugin.shiro.cache;
 
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.List;
-import java.util.Set;
-
+import io.jboot.Jboot;
 import org.apache.shiro.cache.Cache;
 import org.apache.shiro.cache.CacheException;
 import org.apache.shiro.util.CollectionUtils;
 
-import io.jboot.Jboot;
+import java.util.*;
 
 /**
  * Shiro 缓存，使用jboot cache

jboot-admin-base/src/main/java/io/jboot/admin/base/plugin/shiro/cache/ShiroCacheManager.java

@@ -1,12 +1,12 @@
 package io.jboot.admin.base.plugin.shiro.cache;
 
-import java.util.concurrent.ConcurrentHashMap;
-import java.util.concurrent.ConcurrentMap;
-
 import org.apache.shiro.cache.Cache;
 import org.apache.shiro.cache.CacheException;
 import org.apache.shiro.cache.CacheManager;
 
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.ConcurrentMap;
+
 /**
  * 封装shiro manager 扩展使用 redis/ehcache
  * @author Rlax

jboot-admin-base/src/main/java/io/jboot/admin/base/rest/datatable/DataTable.java

@@ -1,9 +1,9 @@
 package io.jboot.admin.base.rest.datatable;
 
-import java.util.List;
-
 import com.jfinal.plugin.activerecord.Page;
 
+import java.util.List;
+
 /**
  * layui 数据表格
  * @author Rlax

jboot-admin-base/src/main/java/io/jboot/admin/base/rpc/motan/FstMotanSerialization.java

@@ -1,11 +1,10 @@
 package io.jboot.admin.base.rpc.motan;
 
-import java.io.IOException;
-
-import org.nustaq.serialization.FSTConfiguration;
-
 import com.weibo.api.motan.codec.Serialization;
 import com.weibo.api.motan.core.extension.SpiMeta;
+import org.nustaq.serialization.FSTConfiguration;
+
+import java.io.IOException;
 
 /**
  * Motan 序列化，替代hessian，有 BigDecimal BUG

jboot-admin-base/src/main/java/io/jboot/admin/base/web/base/JsonValidator.java

@@ -1,7 +1,6 @@
 package io.jboot.admin.base.web.base;
 
 import com.jfinal.core.Controller;
-
 import io.jboot.admin.base.common.RegexKey;
 import io.jboot.admin.base.common.RestResult;
 

jboot-admin-base/src/main/java/io/jboot/admin/base/web/render/AppRenderFactory.java

@@ -2,7 +2,6 @@ package io.jboot.admin.base.web.render;
 
 import com.jfinal.render.ErrorRender;
 import com.jfinal.render.Render;
-
 import io.jboot.web.render.JbootRenderFactory;
 
 /**

jboot-admin-base/src/main/java/io/jboot/admin/base/web/render/error/JsonErrorRender.java

@@ -1,10 +1,10 @@
 package io.jboot.admin.base.web.render.error;
 
+import com.jfinal.render.RenderException;
+
 import java.io.IOException;
 import java.io.PrintWriter;
 
-import com.jfinal.render.RenderException;
-
 /**
  * Json异常Render
  * @author Rlax

jboot-admin-service/jboot-admin-service-api/src/main/java/io/jboot/admin/service/api/DataService.java

@@ -1,12 +1,11 @@
 package io.jboot.admin.service.api;
 
-import java.util.List;
-import java.util.Map;
-
 import com.jfinal.plugin.activerecord.Page;
-
 import io.jboot.admin.service.entity.model.Data;
 
+import java.util.List;
+import java.util.Map;
+
 public interface DataService  {
     
     /**

jboot-admin-service/jboot-admin-service-api/src/main/java/io/jboot/admin/service/api/LogService.java

@@ -1,7 +1,6 @@
 package io.jboot.admin.service.api;
 
 import com.jfinal.plugin.activerecord.Page;
-
 import io.jboot.admin.service.entity.model.Log;
 
 public interface LogService  {

jboot-admin-service/jboot-admin-service-api/src/main/java/io/jboot/admin/service/api/ResService.java

@@ -1,12 +1,11 @@
 package io.jboot.admin.service.api;
 
-import java.util.List;
-
 import com.jfinal.plugin.activerecord.Page;
-
 import io.jboot.admin.base.common.ZTree;
 import io.jboot.admin.service.entity.model.Res;
 
+import java.util.List;
+
 public interface ResService  {
 
     /**

jboot-admin-service/jboot-admin-service-api/src/main/java/io/jboot/admin/service/api/RoleResService.java

@@ -1,9 +1,9 @@
 package io.jboot.admin.service.api;
 
-import java.util.List;
-
 import io.jboot.admin.service.entity.model.RoleRes;
 
+import java.util.List;
+
 public interface RoleResService  {
 
     /**

jboot-admin-service/jboot-admin-service-api/src/main/java/io/jboot/admin/service/api/RoleService.java

@@ -1,11 +1,10 @@
 package io.jboot.admin.service.api;
 
-import java.util.List;
-
 import com.jfinal.plugin.activerecord.Page;
-
 import io.jboot.admin.service.entity.model.Role;
 
+import java.util.List;
+
 public interface RoleService  {
 
     /**

jboot-admin-service/jboot-admin-service-api/src/main/java/io/jboot/admin/service/api/UserRoleService.java

@@ -1,9 +1,9 @@
 package io.jboot.admin.service.api;
 
-import java.util.List;
-
 import io.jboot.admin.service.entity.model.UserRole;
 
+import java.util.List;
+
 public interface UserRoleService  {
 
     /**

jboot-admin-service/jboot-admin-service-api/src/main/java/io/jboot/admin/service/api/UserService.java

@@ -1,7 +1,6 @@
 package io.jboot.admin.service.api;
 
 import com.jfinal.plugin.activerecord.Page;
-
 import io.jboot.admin.service.entity.model.User;
 
 public interface UserService  {

jboot-admin-service/jboot-admin-service-entity/src/main/java/io/jboot/admin/service/entity/model/base/BaseData.java

@@ -1,7 +1,6 @@
 package io.jboot.admin.service.entity.model.base;
 
 import com.jfinal.plugin.activerecord.IBean;
-
 import io.jboot.db.model.JbootModel;
 
 /**

jboot-admin-service/jboot-admin-service-entity/src/main/java/io/jboot/admin/service/entity/model/base/BaseLog.java

@@ -1,7 +1,6 @@
 package io.jboot.admin.service.entity.model.base;
 
 import com.jfinal.plugin.activerecord.IBean;
-
 import io.jboot.db.model.JbootModel;
 
 /**

jboot-admin-service/jboot-admin-service-entity/src/main/java/io/jboot/admin/service/entity/model/base/BaseRes.java

@@ -1,7 +1,6 @@
 package io.jboot.admin.service.entity.model.base;
 
 import com.jfinal.plugin.activerecord.IBean;
-
 import io.jboot.db.model.JbootModel;
 
 /**

jboot-admin-service/jboot-admin-service-entity/src/main/java/io/jboot/admin/service/entity/model/base/BaseRole.java

@@ -1,7 +1,6 @@
 package io.jboot.admin.service.entity.model.base;
 
 import com.jfinal.plugin.activerecord.IBean;
-
 import io.jboot.db.model.JbootModel;
 
 /**

jboot-admin-service/jboot-admin-service-entity/src/main/java/io/jboot/admin/service/entity/model/base/BaseRoleRes.java

@@ -1,7 +1,6 @@
 package io.jboot.admin.service.entity.model.base;
 
 import com.jfinal.plugin.activerecord.IBean;
-
 import io.jboot.db.model.JbootModel;
 
 /**

jboot-admin-service/jboot-admin-service-entity/src/main/java/io/jboot/admin/service/entity/model/base/BaseUser.java

@@ -1,7 +1,6 @@
 package io.jboot.admin.service.entity.model.base;
 
 import com.jfinal.plugin.activerecord.IBean;
-
 import io.jboot.db.model.JbootModel;
 
 /**

jboot-admin-service/jboot-admin-service-entity/src/main/java/io/jboot/admin/service/entity/model/base/BaseUserRole.java

@@ -1,7 +1,6 @@
 package io.jboot.admin.service.entity.model.base;
 
 import com.jfinal.plugin.activerecord.IBean;
-
 import io.jboot.db.model.JbootModel;
 
 /**

jboot-admin-service/jboot-admin-service-provider/src/main/java/io/jboot/admin/service/provider/DataServiceImpl.java

@@ -1,12 +1,7 @@
 package io.jboot.admin.service.provider;
 
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-
 import com.jfinal.kit.StrKit;
 import com.jfinal.plugin.activerecord.Page;
-
 import io.jboot.Jboot;
 import io.jboot.admin.base.common.CacheKey;
 import io.jboot.admin.service.api.DataService;
@@ -18,6 +13,10 @@ import io.jboot.components.rpc.annotation.RPCBean;
 import io.jboot.db.model.Columns;
 import io.jboot.service.JbootServiceBase;
 
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+
 @Bean
 @RPCBean
 public class DataServiceImpl extends JbootServiceBase<Data> implements DataService {

jboot-admin-service/jboot-admin-service-provider/src/main/java/io/jboot/admin/service/provider/LogServiceImpl.java

@@ -3,7 +3,6 @@ package io.jboot.admin.service.provider;
 import com.jfinal.aop.Inject;
 import com.jfinal.kit.StrKit;
 import com.jfinal.plugin.activerecord.Page;
-
 import io.jboot.admin.service.api.LogService;
 import io.jboot.admin.service.api.UserService;
 import io.jboot.admin.service.entity.model.Log;

jboot-admin-service/jboot-admin-service-provider/src/main/java/io/jboot/admin/service/provider/ResServiceImpl.java

@@ -1,13 +1,9 @@
 package io.jboot.admin.service.provider;
 
-import java.util.ArrayList;
-import java.util.List;
-
 import com.jfinal.kit.StrKit;
 import com.jfinal.plugin.activerecord.Db;
 import com.jfinal.plugin.activerecord.Page;
 import com.jfinal.plugin.activerecord.SqlPara;
-
 import io.jboot.admin.base.common.ZTree;
 import io.jboot.admin.service.api.ResService;
 import io.jboot.admin.service.entity.model.Res;
@@ -18,6 +14,9 @@ import io.jboot.components.rpc.annotation.RPCBean;
 import io.jboot.db.model.Columns;
 import io.jboot.service.JbootServiceBase;
 
+import java.util.ArrayList;
+import java.util.List;
+
 @Bean
 @RPCBean
 public class ResServiceImpl extends JbootServiceBase<Res> implements ResService {

jboot-admin-service/jboot-admin-service-provider/src/main/java/io/jboot/admin/service/provider/RoleResServiceImpl.java

@@ -1,15 +1,14 @@
 package io.jboot.admin.service.provider;
 
-import java.util.List;
-
 import com.jfinal.plugin.activerecord.Db;
-
 import io.jboot.admin.service.api.RoleResService;
 import io.jboot.admin.service.entity.model.RoleRes;
 import io.jboot.aop.annotation.Bean;
 import io.jboot.components.rpc.annotation.RPCBean;
 import io.jboot.service.JbootServiceBase;
 
+import java.util.List;
+
 @Bean
 @RPCBean
 public class RoleResServiceImpl extends JbootServiceBase<RoleRes> implements RoleResService {

jboot-admin-service/jboot-admin-service-provider/src/main/java/io/jboot/admin/service/provider/RoleServiceImpl.java

@@ -1,16 +1,11 @@
 package io.jboot.admin.service.provider;
 
-import java.sql.SQLException;
-import java.util.ArrayList;
-import java.util.List;
-
 import com.jfinal.aop.Inject;
 import com.jfinal.kit.StrKit;
 import com.jfinal.plugin.activerecord.Db;
 import com.jfinal.plugin.activerecord.IAtom;
 import com.jfinal.plugin.activerecord.Page;
 import com.jfinal.plugin.activerecord.SqlPara;
-
 import io.jboot.admin.service.api.RoleResService;
 import io.jboot.admin.service.api.RoleService;
 import io.jboot.admin.service.entity.model.Role;
@@ -21,6 +16,10 @@ import io.jboot.components.rpc.annotation.RPCBean;
 import io.jboot.db.model.Columns;
 import io.jboot.service.JbootServiceBase;
 
+import java.sql.SQLException;
+import java.util.ArrayList;
+import java.util.List;
+
 @Bean
 @RPCBean
 public class RoleServiceImpl extends JbootServiceBase<Role> implements RoleService {

jboot-admin-service/jboot-admin-service-provider/src/main/java/io/jboot/admin/service/provider/UserRoleServiceImpl.java

@@ -1,15 +1,14 @@
 package io.jboot.admin.service.provider;
 
-import java.util.List;
-
 import com.jfinal.plugin.activerecord.Db;
-
 import io.jboot.admin.service.api.UserRoleService;
 import io.jboot.admin.service.entity.model.UserRole;
 import io.jboot.aop.annotation.Bean;
 import io.jboot.components.rpc.annotation.RPCBean;
 import io.jboot.service.JbootServiceBase;
 
+import java.util.List;
+
 @Bean
 @RPCBean
 public class UserRoleServiceImpl extends JbootServiceBase<UserRole> implements UserRoleService {

jboot-admin-service/jboot-admin-service-provider/src/main/java/io/jboot/admin/service/provider/UserServiceImpl.java

@@ -1,19 +1,10 @@
 package io.jboot.admin.service.provider;
 
-import java.sql.SQLException;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
-
-import org.apache.shiro.crypto.SecureRandomNumberGenerator;
-import org.apache.shiro.crypto.hash.SimpleHash;
-
 import com.jfinal.aop.Inject;
 import com.jfinal.kit.StrKit;
 import com.jfinal.plugin.activerecord.Db;
 import com.jfinal.plugin.activerecord.IAtom;
 import com.jfinal.plugin.activerecord.Page;
-
 import io.jboot.admin.service.api.UserRoleService;
 import io.jboot.admin.service.api.UserService;
 import io.jboot.admin.service.entity.model.User;
@@ -23,6 +14,13 @@ import io.jboot.aop.annotation.Bean;
 import io.jboot.components.rpc.annotation.RPCBean;
 import io.jboot.db.model.Columns;
 import io.jboot.service.JbootServiceBase;
+import org.apache.shiro.crypto.SecureRandomNumberGenerator;
+import org.apache.shiro.crypto.hash.SimpleHash;
+
+import java.sql.SQLException;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
 
 @Bean
 @RPCBean

jboot-admin/src/main/java/io/jboot/admin/config/JfinalConfigListener.java

@@ -6,7 +6,6 @@ import com.jfinal.config.Interceptors;
 import com.jfinal.config.Routes;
 import com.jfinal.ext.handler.ContextPathHandler;
 import com.jfinal.template.Engine;
-
 import io.jboot.Jboot;
 import io.jboot.admin.base.captcha.CaptchaCache;
 import io.jboot.admin.base.common.AppInfo;

jboot-admin/src/main/java/io/jboot/admin/controller/MainController.java

@@ -9,7 +9,7 @@ import io.jboot.admin.base.web.base.BaseController;
 import io.jboot.admin.service.api.UserService;
 import io.jboot.admin.service.entity.model.User;
 import io.jboot.admin.validator.LoginValidator;
-import io.jboot.core.rpc.annotation.JbootrpcService;
+import io.jboot.components.rpc.annotation.RPCInject;
 import io.jboot.web.controller.annotation.RequestMapping;
 import org.apache.shiro.SecurityUtils;
 import org.apache.shiro.authc.ExcessiveAttemptsException;
@@ -26,7 +26,7 @@ import org.apache.shiro.subject.Subject;
 @RequestMapping("/")
 public class MainController extends BaseController {
 
-    @JbootrpcService
+    @RPCInject
     private UserService userService;
 
     public void index() {

jboot-admin/src/main/java/io/jboot/admin/controller/b2c/ProductController.java

@@ -11,24 +11,23 @@ import io.jboot.admin.support.auth.AuthUtils;
 import io.jboot.b2c.service.api.ProductService;
 import io.jboot.b2c.service.entity.model.Product;
 import io.jboot.b2c.service.entity.status.ProductStatus;
-import io.jboot.component.metric.annotation.EnableMetricCounter;
-import io.jboot.component.metric.annotation.EnableMetricHistogram;
-import io.jboot.component.metric.annotation.EnableMetricMeter;
-import io.jboot.component.metric.annotation.EnableMetricTimer;
-import io.jboot.core.rpc.annotation.JbootrpcService;
+import io.jboot.components.rpc.annotation.RPCInject;
+import io.jboot.support.metric.annotation.EnableMetricCounter;
+import io.jboot.support.metric.annotation.EnableMetricHistogram;
+import io.jboot.support.metric.annotation.EnableMetricMeter;
+import io.jboot.support.metric.annotation.EnableMetricTimer;
 import io.jboot.web.controller.annotation.RequestMapping;
 
 import java.util.Date;
 
 /**
  * 商品管理
- * @author Rlax
  *
+ * @author Rlax
  */
 @RequestMapping("/b2c/product")
 public class ProductController extends BaseController {
-
-    @JbootrpcService(group = ServiceConst.SERVICE_B2C, version = ServiceConst.VERSION_1_0)
+    @RPCInject(group = ServiceConst.SERVICE_B2C, version = ServiceConst.VERSION_1_0)
     private ProductService productService;
 
     /**
@@ -76,7 +75,7 @@ public class ProductController extends BaseController {
         product.setLastUpdTime(new Date());
         product.setNote("新增商品");
 
-        if (!productService.save(product)) {
+        if (productService.save(product) == null) {
             throw new BusinessException("保存失败");
         }
 

jboot-admin/src/main/java/io/jboot/admin/controller/system/DataController.java

@@ -10,20 +10,20 @@ import io.jboot.admin.service.api.DataService;
 import io.jboot.admin.service.entity.model.Data;
 import io.jboot.admin.service.entity.status.system.DataStatus;
 import io.jboot.admin.support.auth.AuthUtils;
-import io.jboot.core.rpc.annotation.JbootrpcService;
+import io.jboot.components.rpc.annotation.RPCInject;
 import io.jboot.web.controller.annotation.RequestMapping;
 
 import java.util.Date;
 
 /**
  * 数据字典管理
- * @author Rlax
  *
+ * @author Rlax
  */
 @RequestMapping("/system/data")
 public class DataController extends BaseController {
 
-    @JbootrpcService
+    @RPCInject
     private DataService dataService;
 
     /**
@@ -67,7 +67,7 @@ public class DataController extends BaseController {
         data.setLastUpdTime(new Date());
         data.setNote("保存数据字典");
 
-        if (!dataService.save(data)) {
+        if (dataService.save(data) == null) {
             throw new BusinessException("保存失败");
         }
 

jboot-admin/src/main/java/io/jboot/admin/controller/system/LogController.java

@@ -5,7 +5,7 @@ import io.jboot.admin.base.rest.datatable.DataTable;
 import io.jboot.admin.base.web.base.BaseController;
 import io.jboot.admin.service.api.LogService;
 import io.jboot.admin.service.entity.model.Log;
-import io.jboot.core.rpc.annotation.JbootrpcService;
+import io.jboot.components.rpc.annotation.RPCInject;
 import io.jboot.web.controller.annotation.RequestMapping;
 
 /**
@@ -16,7 +16,7 @@ import io.jboot.web.controller.annotation.RequestMapping;
 @RequestMapping("/system/log")
 public class LogController extends BaseController {
     
-    @JbootrpcService
+    @RPCInject
     private LogService logService;
 
     /**

jboot-admin/src/main/java/io/jboot/admin/controller/system/ResController.java

@@ -15,13 +15,9 @@ import io.jboot.admin.service.entity.model.Res;
 import io.jboot.admin.service.entity.status.system.ResStatus;
 import io.jboot.admin.support.auth.AuthUtils;
 import io.jboot.admin.validator.system.ResValidator;
-import io.jboot.component.metric.annotation.EnableMetricCounter;
-import io.jboot.component.swagger.ParamType;
-import io.jboot.core.rpc.annotation.JbootrpcService;
+import io.jboot.components.rpc.annotation.RPCInject;
 import io.jboot.web.controller.annotation.RequestMapping;
 import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiImplicitParam;
-import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
 
 import java.util.*;
@@ -29,14 +25,14 @@ import java.util.*;
 
 /**
  * 系统资源控制器
- * @author Rlax
  *
+ * @author Rlax
  */
 @RequestMapping("/system/res")
 @Api(description = "资源管理接口文档", basePath = "/system/res", tags = "res")
 public class ResController extends BaseController {
 
-    @JbootrpcService
+    @RPCInject
     private ResService resService;
 
     /**
@@ -93,7 +89,7 @@ public class ResController extends BaseController {
         sysRes.setLastUpdTime(new Date());
         sysRes.setNote("保存系统资源");
 
-        if (!resService.save(sysRes)) {
+        if (resService.save(sysRes) == null) {
             throw new BusinessException("保存失败，请重试");
         }
 

jboot-admin/src/main/java/io/jboot/admin/controller/system/RoleController.java

@@ -11,20 +11,20 @@ import io.jboot.admin.service.api.RoleService;
 import io.jboot.admin.service.entity.model.Role;
 import io.jboot.admin.service.entity.status.system.RoleStatus;
 import io.jboot.admin.support.auth.AuthUtils;
-import io.jboot.core.rpc.annotation.JbootrpcService;
+import io.jboot.components.rpc.annotation.RPCInject;
 import io.jboot.web.controller.annotation.RequestMapping;
 
 import java.util.Date;
 
 /**
  * 系统角色管理
- * @author Rlax
  *
+ * @author Rlax
  */
 @RequestMapping("/system/role")
 public class RoleController extends BaseController {
 
-    @JbootrpcService
+    @RPCInject
     private RoleService roleService;
 
     /**
@@ -66,7 +66,7 @@ public class RoleController extends BaseController {
         sysRole.setLastUpdTime(new Date());
         sysRole.setNote("保存系统角色");
 
-        if (!roleService.save(sysRole)) {
+        if (roleService.save(sysRole) == null) {
             throw new BusinessException("保存失败");
         }
 
@@ -126,7 +126,7 @@ public class RoleController extends BaseController {
     /**
      * 角色赋权提交
      */
-    @NotNullPara({"id","resIds"})
+    @NotNullPara({"id", "resIds"})
     public void postAuth() {
         String resIds = getPara("resIds");
         Long id = getParaToLong("id");

jboot-admin/src/main/java/io/jboot/admin/controller/system/UserController.java

@@ -15,7 +15,7 @@ import io.jboot.admin.service.entity.model.User;
 import io.jboot.admin.service.entity.status.system.UserStatus;
 import io.jboot.admin.support.auth.AuthUtils;
 import io.jboot.admin.validator.system.ChangePwdValidator;
-import io.jboot.core.rpc.annotation.JbootrpcService;
+import io.jboot.components.rpc.annotation.RPCInject;
 import io.jboot.web.controller.annotation.RequestMapping;
 import org.apache.shiro.crypto.SecureRandomNumberGenerator;
 import org.apache.shiro.crypto.hash.SimpleHash;
@@ -31,10 +31,10 @@ import java.util.List;
 @RequestMapping("/system/user")
 public class UserController extends BaseController {
 
-    @JbootrpcService
+    @RPCInject
     private UserService userService;
 
-    @JbootrpcService
+    @RPCInject
     private RoleService roleService;
 
     /**

jboot-admin/src/main/java/io/jboot/admin/support/auth/AuthInterceptor.java

@@ -1,17 +1,15 @@
 package io.jboot.admin.support.auth;
 
-import java.util.ArrayList;
-import java.util.List;
-
-import org.apache.shiro.SecurityUtils;
-
 import com.jfinal.aop.Interceptor;
 import com.jfinal.aop.Invocation;
-
 import io.jboot.Jboot;
 import io.jboot.admin.service.api.ResService;
 import io.jboot.admin.service.entity.model.Res;
 import io.jboot.admin.service.entity.status.system.ResStatus;
+import org.apache.shiro.SecurityUtils;
+
+import java.util.ArrayList;
+import java.util.List;
 
 /**
  * 根据url的权限拦截器，具有url权限的角色才允许访问

jboot-admin/src/main/java/io/jboot/admin/support/auth/AuthUtils.java

@@ -1,10 +1,9 @@
 package io.jboot.admin.support.auth;
 
-import org.apache.shiro.SecurityUtils;
-
 import io.jboot.admin.base.common.Consts;
 import io.jboot.admin.base.plugin.shiro.ShiroUtils;
 import io.jboot.admin.service.entity.model.User;
+import org.apache.shiro.SecurityUtils;
 
 /**
  * 授权认证工具类

jboot-admin/src/main/java/io/jboot/admin/support/auth/LoginAuth.java

@@ -1,16 +1,5 @@
 package io.jboot.admin.support.auth;
 
-import java.util.ArrayList;
-import java.util.List;
-
-import org.apache.shiro.authc.AuthenticationInfo;
-import org.apache.shiro.authc.AuthenticationToken;
-import org.apache.shiro.authc.SimpleAuthenticationInfo;
-import org.apache.shiro.authz.AuthorizationInfo;
-import org.apache.shiro.authz.SimpleAuthorizationInfo;
-import org.apache.shiro.subject.PrincipalCollection;
-import org.apache.shiro.util.ByteSource;
-
 import io.jboot.Jboot;
 import io.jboot.admin.base.plugin.shiro.auth.MuitiAuthenticatied;
 import io.jboot.admin.service.api.ResService;
@@ -20,6 +9,16 @@ import io.jboot.admin.service.entity.model.Res;
 import io.jboot.admin.service.entity.model.Role;
 import io.jboot.admin.service.entity.model.User;
 import io.jboot.admin.service.entity.status.system.UserStatus;
+import org.apache.shiro.authc.AuthenticationInfo;
+import org.apache.shiro.authc.AuthenticationToken;
+import org.apache.shiro.authc.SimpleAuthenticationInfo;
+import org.apache.shiro.authz.AuthorizationInfo;
+import org.apache.shiro.authz.SimpleAuthorizationInfo;
+import org.apache.shiro.subject.PrincipalCollection;
+import org.apache.shiro.util.ByteSource;
+
+import java.util.ArrayList;
+import java.util.List;
 
 /**
  * 管理端认证授权

jboot-admin/src/main/java/io/jboot/admin/support/enjoy/directive/DataDirective.java

@@ -1,19 +1,18 @@
 package io.jboot.admin.support.enjoy.directive;
 
-import java.util.List;
-
 import com.jfinal.kit.StrKit;
 import com.jfinal.template.Env;
 import com.jfinal.template.io.Writer;
 import com.jfinal.template.stat.ParseException;
 import com.jfinal.template.stat.Scope;
-
 import io.jboot.admin.service.api.DataService;
 import io.jboot.admin.service.entity.model.Data;
 import io.jboot.components.rpc.annotation.RPCInject;
 import io.jboot.web.directive.annotation.JFinalDirective;
 import io.jboot.web.directive.base.JbootDirectiveBase;
 
+import java.util.List;
+
 /**
  * 根据data的type和value获取对应的字典描述
  */

jboot-admin/src/main/java/io/jboot/admin/support/enjoy/directive/DataTplDirective.java

@@ -1,19 +1,18 @@
 package io.jboot.admin.support.enjoy.directive;
 
-import java.util.List;
-
 import com.jfinal.kit.StrKit;
 import com.jfinal.template.Env;
 import com.jfinal.template.io.Writer;
 import com.jfinal.template.stat.ParseException;
 import com.jfinal.template.stat.Scope;
-
 import io.jboot.admin.service.api.DataService;
 import io.jboot.admin.service.entity.model.Data;
 import io.jboot.components.rpc.annotation.RPCInject;
 import io.jboot.web.directive.annotation.JFinalDirective;
 import io.jboot.web.directive.base.JbootDirectiveBase;
 
+import java.util.List;
+
 /**
  * 下拉Option指令
  */

jboot-admin/src/main/java/io/jboot/admin/support/enjoy/directive/OptionDirective.java

@@ -1,20 +1,19 @@
 package io.jboot.admin.support.enjoy.directive;
 
-import java.util.List;
-
 import com.jfinal.kit.LogKit;
 import com.jfinal.kit.StrKit;
 import com.jfinal.template.Env;
 import com.jfinal.template.io.Writer;
 import com.jfinal.template.stat.ParseException;
 import com.jfinal.template.stat.Scope;
-
 import io.jboot.admin.service.api.DataService;
 import io.jboot.admin.service.entity.model.Data;
 import io.jboot.components.rpc.annotation.RPCInject;
 import io.jboot.web.directive.annotation.JFinalDirective;
 import io.jboot.web.directive.base.JbootDirectiveBase;
 
+import java.util.List;
+
 /**
  * 下拉Option指令
  */

jboot-admin/src/main/java/io/jboot/admin/support/enjoy/directive/OptionStatusDirective.java

@@ -4,7 +4,6 @@ import com.jfinal.template.Env;
 import com.jfinal.template.io.Writer;
 import com.jfinal.template.stat.ParseException;
 import com.jfinal.template.stat.Scope;
-
 import io.jboot.admin.base.common.BaseStatus;
 import io.jboot.web.directive.annotation.JFinalDirective;
 import io.jboot.web.directive.base.JbootDirectiveBase;

jboot-admin/src/main/java/io/jboot/admin/support/enjoy/directive/StatusTplDirective.java

@@ -4,7 +4,6 @@ import com.jfinal.template.Env;
 import com.jfinal.template.io.Writer;
 import com.jfinal.template.stat.ParseException;
 import com.jfinal.template.stat.Scope;
-
 import io.jboot.admin.base.common.BaseStatus;
 import io.jboot.web.directive.annotation.JFinalDirective;
 import io.jboot.web.directive.base.JbootDirectiveBase;

jboot-admin/src/main/java/io/jboot/admin/support/log/LogInterceptor.java

@@ -1,10 +1,7 @@
 package io.jboot.admin.support.log;
 
-import java.util.Date;
-
 import com.jfinal.aop.Interceptor;
 import com.jfinal.aop.Invocation;
-
 import eu.bitwalker.useragentutils.Browser;
 import eu.bitwalker.useragentutils.UserAgent;
 import io.jboot.Jboot;
@@ -14,6 +11,8 @@ import io.jboot.admin.service.entity.model.Log;
 import io.jboot.admin.service.entity.model.User;
 import io.jboot.admin.support.auth.AuthUtils;
 
+import java.util.Date;
+
 /**
  * 系统日志拦截器
  * @author Rlax

jboot-admin/src/main/java/io/jboot/admin/validator/LoginValidator.java

@@ -1,7 +1,6 @@
 package io.jboot.admin.validator;
 
 import com.jfinal.core.Controller;
-
 import io.jboot.admin.base.web.base.JsonValidator;
 
 /**

jboot-admin/src/main/java/io/jboot/admin/validator/system/ChangePwdValidator.java

@@ -1,7 +1,6 @@
 package io.jboot.admin.validator.system;
 
 import com.jfinal.core.Controller;
-
 import io.jboot.admin.base.web.base.JsonValidator;
 import io.jboot.admin.service.entity.model.User;
 import io.jboot.admin.support.auth.AuthUtils;

jboot-admin/src/main/java/io/jboot/admin/validator/system/ResValidator.java

@@ -1,7 +1,6 @@
 package io.jboot.admin.validator.system;
 
 import com.jfinal.core.Controller;
-
 import io.jboot.admin.base.web.base.JsonValidator;
 
 /**

jboot-admin/src/main/resources/jboot.properties

@@ -109,7 +109,7 @@ jboot.shiro.ini = shiro.ini
 jboot.cache.type=redis
 jboot.cache.redis.host=127.0.0.1
 jboot.cache.redis.port=6379
-jboot.cache.redis.password=123456
+jboot.cache.redis.password=woshinidaye
 jboot.cache.redis.database=0
 #---------------------------------------------------------------------------------#
 
@@ -118,7 +118,7 @@ jboot.cache.redis.database=0
 jboot.mq.type=redis
 jboot.mq.redis.host=127.0.0.1
 jboot.mq.redis.port=6379
-jboot.mq.redis.password=123456
+jboot.mq.redis.password=woshinidaye
 jboot.mq.redis.channel=message-channel
 jboot.mq.redis.database=0
 #---------------------------------------------------------------------------------#

jboot-admin/src/main/resources/swaggerui/index.html

@@ -30,7 +30,7 @@
 
 <body>
 
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" style="position:absolute;width:0;height:0">
+<svg xmlns="http://www.w3.org/2000/svg" style="position:absolute;width:0;height:0">
   <defs>
     <symbol viewBox="0 0 20 20" id="unlocked">
           <path d="M15.8 8H14V5.6C14 2.703 12.665 1 10 1 7.334 1 6 2.703 6 5.6V6h2v-.801C8 3.754 8.797 3 10 3c1.203 0 2 .754 2 2.199V8H4c-.553 0-1 .646-1 1.199V17c0 .549.428 1.139.951 1.307l1.197.387C5.672 18.861 6.55 19 7.1 19h5.8c.549 0 1.428-.139 1.951-.307l1.196-.387c.524-.167.953-.757.953-1.306V9.199C17 8.646 16.352 8 15.8 8z"></path>

jboot-b2c-service/jboot-b2c-service-api/src/main/java/io/jboot/b2c/service/api/ProductService.java

@@ -1,7 +1,6 @@
 package io.jboot.b2c.service.api;
 
 import com.jfinal.plugin.activerecord.Page;
-
 import io.jboot.b2c.service.entity.model.Product;
 
 public interface ProductService  {

jboot-b2c-service/jboot-b2c-service-entity/src/main/java/io/jboot/b2c/service/entity/model/base/BaseProduct.java

@@ -1,7 +1,6 @@
 package io.jboot.b2c.service.entity.model.base;
 
 import com.jfinal.plugin.activerecord.IBean;
-
 import io.jboot.db.model.JbootModel;
 
 /**

jboot-b2c-service/jboot-b2c-service-provider/src/main/java/io/jboot/b2c/service/provider/ProductServiceImpl.java

@@ -2,7 +2,6 @@ package io.jboot.b2c.service.provider;
 
 import com.jfinal.kit.StrKit;
 import com.jfinal.plugin.activerecord.Page;
-
 import io.jboot.aop.annotation.Bean;
 import io.jboot.b2c.service.api.ProductService;
 import io.jboot.b2c.service.entity.model.Product;

jboot-b2c/src/main/java/io/jboot/b2c/config/JfinalConfigListener.java

@@ -6,7 +6,6 @@ import com.jfinal.config.Interceptors;
 import com.jfinal.config.Routes;
 import com.jfinal.ext.handler.ContextPathHandler;
 import com.jfinal.template.Engine;
-
 import io.jboot.Jboot;
 import io.jboot.admin.base.captcha.CaptchaCache;
 import io.jboot.admin.base.common.AppInfo;

jboot-b2c/src/main/java/io/jboot/b2c/controller/MainController.java

@@ -42,7 +42,7 @@ public class MainController extends BaseController {
             String userId = "user1";
 
             // 登录成功移除用户退出标识
-            Jboot.me().getCache().remove(CacheKey.CACHE_JWT_TOKEN, userId);
+            Jboot.getCache().remove(CacheKey.CACHE_JWT_TOKEN, userId);
             setJwtAttr("userId", userId);
         } else {
             throw new BusinessException("用户名密码错误");
@@ -54,7 +54,7 @@ public class MainController extends BaseController {
     @RequiresAuthentication
     public void logout() {
         // 退出后将 jwt 加入黑名单
-        Jboot.me().getCache().put(CacheKey.CACHE_JWT_TOKEN, getJwtPara("userId"), getJwtPara("userId"), 2 * 60 * 60);
+        Jboot.getCache().put(CacheKey.CACHE_JWT_TOKEN, getJwtPara("userId"), getJwtPara("userId"), 2 * 60 * 60);
         renderJson(RestResult.buildSuccess("退出成功"));
     }
 }

jboot-b2c/src/main/java/io/jboot/b2c/support/JwtAuthorizingRealm.java

@@ -1,20 +1,15 @@
 package io.jboot.b2c.support;
 
-import org.apache.shiro.authc.AuthenticationException;
-import org.apache.shiro.authc.AuthenticationInfo;
-import org.apache.shiro.authc.AuthenticationToken;
-import org.apache.shiro.authc.SimpleAuthenticationInfo;
-import org.apache.shiro.authc.UnknownAccountException;
-import org.apache.shiro.authz.AuthorizationInfo;
-import org.apache.shiro.cache.CacheManager;
-import org.apache.shiro.realm.AuthorizingRealm;
-import org.apache.shiro.subject.PrincipalCollection;
-
 import io.jboot.Jboot;
 import io.jboot.admin.base.common.CacheKey;
 import io.jboot.admin.base.plugin.jwt.shiro.JwtAuthenticationToken;
 import io.jboot.admin.base.plugin.shiro.ShiroCacheUtils;
 import io.jboot.utils.StrUtil;
+import org.apache.shiro.authc.*;
+import org.apache.shiro.authz.AuthorizationInfo;
+import org.apache.shiro.cache.CacheManager;
+import org.apache.shiro.realm.AuthorizingRealm;
+import org.apache.shiro.subject.PrincipalCollection;
 
 /**
  * JwtAuthorizingRealm

jboot-b2c/src/main/java/io/jboot/b2c/support/JwtShiroInvokeListener.java

@@ -1,15 +1,8 @@
 package io.jboot.b2c.support;
 
-import java.util.Map;
-
-import org.apache.shiro.SecurityUtils;
-import org.apache.shiro.authc.AuthenticationToken;
-import org.apache.shiro.subject.Subject;
-
 import com.jfinal.aop.Invocation;
 import com.jfinal.core.Controller;
 import com.jfinal.log.Log;
-
 import io.jboot.admin.base.common.RestResult;
 import io.jboot.admin.base.plugin.jwt.shiro.JwtAuthenticationToken;
 import io.jboot.support.jwt.JwtManager;
@@ -17,6 +10,11 @@ import io.jboot.support.shiro.JbootShiroInvokeListener;
 import io.jboot.support.shiro.processer.AuthorizeResult;
 import io.jboot.utils.StrUtil;
 import io.jboot.web.controller.JbootController;
+import org.apache.shiro.SecurityUtils;
+import org.apache.shiro.authc.AuthenticationToken;
+import org.apache.shiro.subject.Subject;
+
+import java.util.Map;
 
 /**
  * jwt shiro listener

jboot-wechat/src/main/java/io/jboot/wechat/config/JfinalConfigListener.java

@@ -8,7 +8,6 @@ import com.jfinal.ext.handler.ContextPathHandler;
 import com.jfinal.template.Engine;
 import com.jfinal.weixin.sdk.api.ApiConfig;
 import com.jfinal.weixin.sdk.api.ApiConfigKit;
-
 import io.jboot.Jboot;
 import io.jboot.admin.base.captcha.CaptchaCache;
 import io.jboot.admin.base.common.AppInfo;