解决启动报错

pom.xml

@@ -39,7 +39,7 @@
         <module>wisenergy-model</module>
         <module>wisenergy-mapper</module>
         <module>wisenergy-service</module>
-        <module>wisenergy-shiro</module>
+        <!--<module>wisenergy-shiro</module>-->
         <module>wisenergy-web-admin</module>
     </modules>
 

wisenergy-common/src/main/java/cn/wisenergy/common/config/file/FileUploadConfig.java

-package cn.wisenergy.common.config.file;
-
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.web.multipart.MultipartResolver;
-import org.springframework.web.multipart.commons.CommonsMultipartResolver;
-
-/**
- * 文件上传配置
- * @author wyy
- * @date 2019-08-22 19:20
- */
-@Configuration
-public class FileUploadConfig {
-
-    /**
-     * 重新定义文件上传对象【springBoot request转化成MultipartHttpServletRequest】
-     * @return
-     */
-    @Bean(name = "multipartResolver")
-    public MultipartResolver multipartResolver() {
-        CommonsMultipartResolver resolver = new CommonsMultipartResolver();
-        resolver.setDefaultEncoding("UTF-8");
-        resolver.setResolveLazily(true);
-        resolver.setMaxInMemorySize(40960);
-        resolver.setMaxUploadSize(512 * 1024 * 1024);
-        return resolver;
-    }
-}

wisenergy-model/src/main/java/cn/wisenergy/model/app/User.java

 package cn.wisenergy.model.app;
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.baomidou.mybatisplus.extension.activerecord.Model;
@@ -34,14 +35,14 @@ public class User extends Model<User> implements Serializable{
      * 手机号作为用户账号
      */
     @ApiModelProperty(name = "user_id", value = "用户主键id")
-    @TableId("user_id")
+    @TableField("user_id")
     private String userId;
 
     /**
      * 密码
      */
     @ApiModelProperty(name = "password", value = "用户密码")
-    @TableId("password")
+    @TableField("password")
     private String password;
 
 
@@ -49,49 +50,49 @@ public class User extends Model<User> implements Serializable{
      * 用户会员等级
      */
     @ApiModelProperty(name = "user_level", value = "用户会员等级")
-    @TableId("user_level")
+    @TableField("user_level")
     private int userLevel;
 
     /**
      * 跨境额度
      */
     @ApiModelProperty(name = "cross_border_line", value = "跨境额度")
-    @TableId("cross_border_line")
+    @TableField("cross_border_line")
     private BigDecimal crossBorderLine;
 
     /**
      * 身份证号码
      */
     @ApiModelProperty(name = "id_card_number", value = "身份证号码")
-    @TableId("id_card_number")
+    @TableField("id_card_number")
     private String idCardNumber;
 
     /**
      * 粉丝昵称
      */
     @ApiModelProperty(name = "fans_nickname", value = "粉丝昵称")
-    @TableId("fans_nickname")
+    @TableField("fans_nickname")
     private String fansNickname;
 
     /**
      * 有赞粉丝id，有赞自动生成
      */
     @ApiModelProperty(name = "fans_id", value = "有赞粉丝id，有赞自动生成")
-    @TableId("fans_id")
+    @TableField("fans_id")
     private String fansId;
 
     /**
      * 用户本人邀请码
      */
     @ApiModelProperty(name = "invite_code", value = "用户本人邀请码")
-    @TableId("invite_code")
+    @TableField("invite_code")
     private String inviteCode;
 
     /**
      * 推荐人邀请码
      */
     @ApiModelProperty(name = "be_invited_code", value = "推荐人邀请码")
-    @TableId("be_invited_code")
+    @TableField("be_invited_code")
     private String beInvitedCode;
 
     /**

wisenergy-shiro/src/main/java/com/project/shiro/util/AuthenticationToken.java

-package com.project.shiro.util;
-
-import org.apache.shiro.authc.UsernamePasswordToken;
-
-/**
- * 登录令牌
- */
-public class AuthenticationToken extends UsernamePasswordToken {
-
-    private static final long serialVersionUID = 4628652632307774263L;
-
-    //验证码ID
-    private String captchaId;
-
-    //验证码
-    private String captcha;
-
-    //ip保留
-    public AuthenticationToken(String loginName, String password, boolean remeberMe, String ip, String captchaId, String caprcha) {
-        super(loginName, password, remeberMe);
-        this.captchaId = captchaId;
-        this.captcha = caprcha;
-    }
-
-    public String getCaptchaId() {
-        return captchaId;
-    }
-
-    public void setCaptchaId(String captchaId) {
-        this.captchaId = captchaId;
-    }
-
-    public String getCaptcha() {
-        return captcha;
-    }
-
-    public void setCaptcha(String captcha) {
-        this.captcha = captcha;
-    }
-
-}
+//package com.project.shiro.util;
+//
+//import org.apache.shiro.authc.UsernamePasswordToken;
+//
+///**
+// * 登录令牌
+// */
+//public class AuthenticationToken extends UsernamePasswordToken {
+//
+//    private static final long serialVersionUID = 4628652632307774263L;
+//
+//    //验证码ID
+//    private String captchaId;
+//
+//    //验证码
+//    private String captcha;
+//
+//    //ip保留
+//    public AuthenticationToken(String loginName, String password, boolean remeberMe, String ip, String captchaId, String caprcha) {
+//        super(loginName, password, remeberMe);
+//        this.captchaId = captchaId;
+//        this.captcha = caprcha;
+//    }
+//
+//    public String getCaptchaId() {
+//        return captchaId;
+//    }
+//
+//    public void setCaptchaId(String captchaId) {
+//        this.captchaId = captchaId;
+//    }
+//
+//    public String getCaptcha() {
+//        return captcha;
+//    }
+//
+//    public void setCaptcha(String captcha) {
+//        this.captcha = captcha;
+//    }
+//
+//}

wisenergy-shiro/src/main/java/com/project/shiro/util/AuthorizationFilter.java

-package com.project.shiro.util;
-
-import com.alibaba.fastjson.JSONObject;
-import io.swagger.annotations.ResponseHeader;
-import org.apache.commons.lang3.StringUtils;
-import org.apache.shiro.web.filter.authz.PermissionsAuthorizationFilter;
-
-import javax.servlet.ServletRequest;
-import javax.servlet.ServletResponse;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import java.io.IOException;
-import java.io.PrintWriter;
-
-/**
- * @author wyy
- * @date 2019-09-14 17:57
- */
-public class AuthorizationFilter extends PermissionsAuthorizationFilter {
-     /**
-     * shiro认证perms资源失败后回调方法
-     * @param servletRequest
-     * @param servletResponse
-     * @return
-     * @throws IOException
-     */
-    @Override
-    protected boolean onAccessDenied(ServletRequest servletRequest, ServletResponse servletResponse) throws IOException {
-        HttpServletRequest httpServletRequest = (HttpServletRequest) servletRequest;
-        HttpServletResponse httpServletResponse = (HttpServletResponse) servletResponse;
-        String requestedWith = httpServletRequest.getHeader("X-Requested-With");
-        if (StringUtils.isNotEmpty(requestedWith) && StringUtils.equals(requestedWith, "XMLHttpRequest")) {//如果是ajax返回指定格式数据
-            httpServletResponse.setContentType("application/json");
-            httpServletResponse.setCharacterEncoding("UTF-8");
-            PrintWriter out = httpServletResponse.getWriter();
-            JSONObject json = new JSONObject();
-            json.put("result", "success");
-            json.put("msg", "登录成功");
-            out.write(json.toJSONString());
-            out.flush();
-            out.close();
-        } else {//如果是普通请求进行重定向
-            httpServletResponse.sendRedirect("/403");
-        }
-        return false;
-    }
-}
+//package com.project.shiro.util;
+//
+//import com.alibaba.fastjson.JSONObject;
+//import io.swagger.annotations.ResponseHeader;
+//import org.apache.commons.lang3.StringUtils;
+//import org.apache.shiro.web.filter.authz.PermissionsAuthorizationFilter;
+//
+//import javax.servlet.ServletRequest;
+//import javax.servlet.ServletResponse;
+//import javax.servlet.http.HttpServletRequest;
+//import javax.servlet.http.HttpServletResponse;
+//import java.io.IOException;
+//import java.io.PrintWriter;
+//
+///**
+// * @author wyy
+// * @date 2019-09-14 17:57
+// */
+//public class AuthorizationFilter extends PermissionsAuthorizationFilter {
+//     /**
+//     * shiro认证perms资源失败后回调方法
+//     * @param servletRequest
+//     * @param servletResponse
+//     * @return
+//     * @throws IOException
+//     */
+//    @Override
+//    protected boolean onAccessDenied(ServletRequest servletRequest, ServletResponse servletResponse) throws IOException {
+//        HttpServletRequest httpServletRequest = (HttpServletRequest) servletRequest;
+//        HttpServletResponse httpServletResponse = (HttpServletResponse) servletResponse;
+//        String requestedWith = httpServletRequest.getHeader("X-Requested-With");
+//        if (StringUtils.isNotEmpty(requestedWith) && StringUtils.equals(requestedWith, "XMLHttpRequest")) {//如果是ajax返回指定格式数据
+//            httpServletResponse.setContentType("application/json");
+//            httpServletResponse.setCharacterEncoding("UTF-8");
+//            PrintWriter out = httpServletResponse.getWriter();
+//            JSONObject json = new JSONObject();
+//            json.put("result", "success");
+//            json.put("msg", "登录成功");
+//            out.write(json.toJSONString());
+//            out.flush();
+//            out.close();
+//        } else {//如果是普通请求进行重定向
+//            httpServletResponse.sendRedirect("/403");
+//        }
+//        return false;
+//    }
+//}

wisenergy-shiro/src/main/java/com/project/shiro/util/Principal.java

-package com.project.shiro.util;
-
-import java.io.Serializable;
-
-public class Principal implements Serializable {
-
-    private static final long serialVersionUID = 598764316789461315L;
-
-    public Long id;
-
-    public String loginName;
-
-    public Principal(Long id, String loginName) {
-        this.id = id;
-        this.loginName = loginName;
-    }
-
-    public Principal() {
-
-    }
-
-    public Long getId() {
-        return id;
-    }
-
-    public void setId(Long id) {
-        this.id = id;
-    }
-
-    public String getLoginName() {
-        return loginName;
-    }
-
-    public void setLoginName(String loginName) {
-        this.loginName = loginName;
-    }
-
-}
+//package com.project.shiro.util;
+//
+//import java.io.Serializable;
+//
+//public class Principal implements Serializable {
+//
+//    private static final long serialVersionUID = 598764316789461315L;
+//
+//    public Long id;
+//
+//    public String loginName;
+//
+//    public Principal(Long id, String loginName) {
+//        this.id = id;
+//        this.loginName = loginName;
+//    }
+//
+//    public Principal() {
+//
+//    }
+//
+//    public Long getId() {
+//        return id;
+//    }
+//
+//    public void setId(Long id) {
+//        this.id = id;
+//    }
+//
+//    public String getLoginName() {
+//        return loginName;
+//    }
+//
+//    public void setLoginName(String loginName) {
+//        this.loginName = loginName;
+//    }
+//
+//}

wisenergy-shiro/src/main/java/com/project/shiro/util/redis/ShiroRedisCacheManager.java

-package com.project.shiro.util.redis;
-
-
-import cn.wisenergy.service.common.utils.redis.RedisClient;
-import cn.wisenergy.service.common.utils.redis.RedisConsts;
-import org.apache.shiro.cache.Cache;
-import org.apache.shiro.cache.CacheException;
-import org.apache.shiro.cache.CacheManager;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import javax.annotation.Resource;
-import java.util.concurrent.ConcurrentHashMap;
-import java.util.concurrent.ConcurrentMap;
-
-public class ShiroRedisCacheManager implements CacheManager {
-
-    private static final Logger logger = LoggerFactory.getLogger(ShiroRedisCacheManager.class);
-
-    private final ConcurrentMap<String, Cache> caches = new ConcurrentHashMap<String, Cache>();
-
-    //注入redisClient实例
-    @Resource(name = "redisClient")
-    private RedisClient redisClient;
-
-    /**
-     * shiro权限缓存前缀
-     */
-    private String keyPrefix = RedisConsts.ADMIN_SHIRO_REALM_KEY;
-
-
-    @Override
-    public <K, V> Cache<K, V> getCache(String name) throws CacheException {
-
-        logger.debug("获取名称为: " + name + " 的RedisCache实例");
-        Cache c = caches.get(keyPrefix + name);
-        if (c == null) {
-            c = new ShiroRedisCache<K, V>(redisClient, keyPrefix);
-            caches.put(keyPrefix + name, c);
-        }
-        return c;
-    }
-
-    public RedisClient getRedisClient() {
-        return redisClient;
-    }
-
-    public void setRedisClient(RedisClient redisClient) {
-        this.redisClient = redisClient;
-    }
-
-    public String getKeyPrefix() {
-        return keyPrefix;
-    }
-
-    public void setKeyPrefix(String keyPrefix) {
-        this.keyPrefix = keyPrefix;
-    }
-}
+//package com.project.shiro.util.redis;
+//
+//
+//import cn.wisenergy.service.common.utils.redis.RedisClient;
+//import cn.wisenergy.service.common.utils.redis.RedisConsts;
+//import org.apache.shiro.cache.Cache;
+//import org.apache.shiro.cache.CacheException;
+//import org.apache.shiro.cache.CacheManager;
+//import org.slf4j.Logger;
+//import org.slf4j.LoggerFactory;
+//
+//import javax.annotation.Resource;
+//import java.util.concurrent.ConcurrentHashMap;
+//import java.util.concurrent.ConcurrentMap;
+//
+//public class ShiroRedisCacheManager implements CacheManager {
+//
+//    private static final Logger logger = LoggerFactory.getLogger(ShiroRedisCacheManager.class);
+//
+//    private final ConcurrentMap<String, Cache> caches = new ConcurrentHashMap<String, Cache>();
+//
+//    //注入redisClient实例
+//    @Resource(name = "redisClient")
+//    private RedisClient redisClient;
+//
+//    /**
+//     * shiro权限缓存前缀
+//     */
+//    private String keyPrefix = RedisConsts.ADMIN_SHIRO_REALM_KEY;
+//
+//
+//    @Override
+//    public <K, V> Cache<K, V> getCache(String name) throws CacheException {
+//
+//        logger.debug("获取名称为: " + name + " 的RedisCache实例");
+//        Cache c = caches.get(keyPrefix + name);
+//        if (c == null) {
+//            c = new ShiroRedisCache<K, V>(redisClient, keyPrefix);
+//            caches.put(keyPrefix + name, c);
+//        }
+//        return c;
+//    }
+//
+//    public RedisClient getRedisClient() {
+//        return redisClient;
+//    }
+//
+//    public void setRedisClient(RedisClient redisClient) {
+//        this.redisClient = redisClient;
+//    }
+//
+//    public String getKeyPrefix() {
+//        return keyPrefix;
+//    }
+//
+//    public void setKeyPrefix(String keyPrefix) {
+//        this.keyPrefix = keyPrefix;
+//    }
+//}

wisenergy-shiro/src/main/java/com/project/shiro/util/redis/ShiroRedisSessionDAO.java

-package com.project.shiro.util.redis;
-
-import cn.wisenergy.service.common.utils.ByteUtil;
-import cn.wisenergy.service.common.utils.redis.RedisClient;
-import cn.wisenergy.service.common.utils.redis.RedisConsts;
-import org.apache.shiro.session.Session;
-import org.apache.shiro.session.UnknownSessionException;
-import org.apache.shiro.session.mgt.eis.AbstractSessionDAO;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import javax.annotation.Resource;
-import java.io.IOException;
-import java.io.Serializable;
-import java.util.Collection;
-import java.util.HashSet;
-import java.util.Set;
-
-public class ShiroRedisSessionDAO extends AbstractSessionDAO {
-
-    private static Logger logger = LoggerFactory.getLogger(ShiroRedisSessionDAO.class);
-
-    //注入redisClient实例
-    @Resource(name = "redisClient")
-    private RedisClient redisClient;
-
-    /**
-     * shiro-redis的session对象前缀
-     */
-
-    private String keyPrefix = RedisConsts.ADMIN_SHIRO_SESSION_KEY;
-
-    @Override
-    public void update(Session session) throws UnknownSessionException {
-        this.saveSession(session);
-    }
-
-    private void saveSession(Session session) throws UnknownSessionException {
-        if (session == null || session.getId() == null) {
-            logger.error("session or session id is null");
-            return;
-        }
-        this.redisClient.setAndExpire(this.getPreStringKey(session.getId()), session, RedisConsts.ADMIN_SHIRO_SESSION_EXPIRE);
-    }
-
-    @Override
-    public void delete(Session session) {
-        if (session == null || session.getId() == null) {
-            logger.error("session or session id is null");
-            return;
-        }
-        redisClient.del(getPreStringKey(session.getId()));
-
-    }
-
-    @Override
-    public Collection<Session> getActiveSessions() {
-        Set<Session> sessions = new HashSet<Session>();
-
-        Set<byte[]> keys = null;
-        try {
-            keys = redisClient.keys(ByteUtil.objectToBytes(this.keyPrefix + "*"));
-        } catch (IOException e) {
-            e.printStackTrace();
-        }
-        if (keys != null && keys.size() > 0) {
-            for (byte[] key : keys) {
-                Session s = null;
-                try {
-                    s = (Session) ByteUtil.bytesToObject(redisClient.get(key));
-                } catch (IOException e) {
-                    e.printStackTrace();
-                } catch (ClassNotFoundException e) {
-                    e.printStackTrace();
-                }
-                sessions.add(s);
-            }
-        }
-
-        return sessions;
-    }
-
-    @Override
-    protected Serializable doCreate(Session session) {
-        Serializable sessionId = this.generateSessionId(session);
-        this.assignSessionId(session, sessionId);
-        this.saveSession(session);
-        return sessionId;
-    }
-
-    @Override
-    protected Session doReadSession(Serializable sessionId) {
-        if (sessionId == null) {
-            logger.error("session id is null");
-            return null;
-        }
-
-        Session s = (Session) redisClient.get(this.getPreStringKey(sessionId));
-        return s;
-    }
-
-    /**
-     * 获得String类型的key
-     *
-     * @param
-     * @return
-     */
-    private String getPreStringKey(Serializable sessionId) {
-        String preKey = this.keyPrefix + sessionId;
-        return preKey;
-    }
-
-    public String getKeyPrefix() {
-        return keyPrefix;
-    }
-
-    public void setKeyPrefix(String keyPrefix) {
-        this.keyPrefix = keyPrefix;
-    }
-
-    public void setRedisClient(RedisClient redisClient) {
-        this.redisClient = redisClient;
-    }
-
-    public RedisClient getRedisClient() {
-        return redisClient;
-    }
-
-}
+//package com.project.shiro.util.redis;
+//
+//import cn.wisenergy.service.common.utils.ByteUtil;
+//import cn.wisenergy.service.common.utils.redis.RedisClient;
+//import cn.wisenergy.service.common.utils.redis.RedisConsts;
+//import org.apache.shiro.session.Session;
+//import org.apache.shiro.session.UnknownSessionException;
+//import org.apache.shiro.session.mgt.eis.AbstractSessionDAO;
+//import org.slf4j.Logger;
+//import org.slf4j.LoggerFactory;
+//
+//import javax.annotation.Resource;
+//import java.io.IOException;
+//import java.io.Serializable;
+//import java.util.Collection;
+//import java.util.HashSet;
+//import java.util.Set;
+//
+//public class ShiroRedisSessionDAO extends AbstractSessionDAO {
+//
+//    private static Logger logger = LoggerFactory.getLogger(ShiroRedisSessionDAO.class);
+//
+//    //注入redisClient实例
+//    @Resource(name = "redisClient")
+//    private RedisClient redisClient;
+//
+//    /**
+//     * shiro-redis的session对象前缀
+//     */
+//
+//    private String keyPrefix = RedisConsts.ADMIN_SHIRO_SESSION_KEY;
+//
+//    @Override
+//    public void update(Session session) throws UnknownSessionException {
+//        this.saveSession(session);
+//    }
+//
+//    private void saveSession(Session session) throws UnknownSessionException {
+//        if (session == null || session.getId() == null) {
+//            logger.error("session or session id is null");
+//            return;
+//        }
+//        this.redisClient.setAndExpire(this.getPreStringKey(session.getId()), session, RedisConsts.ADMIN_SHIRO_SESSION_EXPIRE);
+//    }
+//
+//    @Override
+//    public void delete(Session session) {
+//        if (session == null || session.getId() == null) {
+//            logger.error("session or session id is null");
+//            return;
+//        }
+//        redisClient.del(getPreStringKey(session.getId()));
+//
+//    }
+//
+//    @Override
+//    public Collection<Session> getActiveSessions() {
+//        Set<Session> sessions = new HashSet<Session>();
+//
+//        Set<byte[]> keys = null;
+//        try {
+//            keys = redisClient.keys(ByteUtil.objectToBytes(this.keyPrefix + "*"));
+//        } catch (IOException e) {
+//            e.printStackTrace();
+//        }
+//        if (keys != null && keys.size() > 0) {
+//            for (byte[] key : keys) {
+//                Session s = null;
+//                try {
+//                    s = (Session) ByteUtil.bytesToObject(redisClient.get(key));
+//                } catch (IOException e) {
+//                    e.printStackTrace();
+//                } catch (ClassNotFoundException e) {
+//                    e.printStackTrace();
+//                }
+//                sessions.add(s);
+//            }
+//        }
+//
+//        return sessions;
+//    }
+//
+//    @Override
+//    protected Serializable doCreate(Session session) {
+//        Serializable sessionId = this.generateSessionId(session);
+//        this.assignSessionId(session, sessionId);
+//        this.saveSession(session);
+//        return sessionId;
+//    }
+//
+//    @Override
+//    protected Session doReadSession(Serializable sessionId) {
+//        if (sessionId == null) {
+//            logger.error("session id is null");
+//            return null;
+//        }
+//
+//        Session s = (Session) redisClient.get(this.getPreStringKey(sessionId));
+//        return s;
+//    }
+//
+//    /**
+//     * 获得String类型的key
+//     *
+//     * @param
+//     * @return
+//     */
+//    private String getPreStringKey(Serializable sessionId) {
+//        String preKey = this.keyPrefix + sessionId;
+//        return preKey;
+//    }
+//
+//    public String getKeyPrefix() {
+//        return keyPrefix;
+//    }
+//
+//    public void setKeyPrefix(String keyPrefix) {
+//        this.keyPrefix = keyPrefix;
+//    }
+//
+//    public void setRedisClient(RedisClient redisClient) {
+//        this.redisClient = redisClient;
+//    }
+//
+//    public RedisClient getRedisClient() {
+//        return redisClient;
+//    }
+//
+//}

wisenergy-web-admin/src/main/java/cn/wisenergy/web/sms/interceptor/LoginInterceptor.java

 package cn.wisenergy.web.sms.interceptor;
 
 import cn.wisenergy.common.enums.ResultEnum;
+import cn.wisenergy.common.utils.Constants;
 import cn.wisenergy.common.utils.RedisUtils;
 import cn.wisenergy.common.utils.ResponseOutput;
 import cn.wisenergy.common.utils.StringUtil;