Skip to content

D
data-server
Commit b9c9690d authored by liqin's avatar liqin 💬
Browse files
Options

Merge branch 'master' of http://111.203.232.171:8888/licc/shop-mall into master 

 Conflicts:
	wisenergy-web-admin/src/main/resources/application-test.yml
parents f070910b c07bae07
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 1168 additions and 1274 deletions
pom.xml
View file @ b9c9690d
...@@ -39,7 +39,7 @@ ...@@ -39,7 +39,7 @@
<module>wisenergy-model</module> <module>wisenergy-model</module>
<module>wisenergy-mapper</module> <module>wisenergy-mapper</module>
<module>wisenergy-service</module> <module>wisenergy-service</module>
<module>wisenergy-shiro</module> <!--<module>wisenergy-shiro</module>-->
<module>wisenergy-web-admin</module> <module>wisenergy-web-admin</module>
</modules> </modules>
......
wisenergy-common/src/main/java/cn/wisenergy/common/config/file/FileUploadConfig.java
View file @ b9c9690d
...@@ -17,13 +17,13 @@ public class FileUploadConfig { ...@@ -17,13 +17,13 @@ public class FileUploadConfig {
* 重新定义文件上传对象【springBoot request转化成MultipartHttpServletRequest】 * 重新定义文件上传对象【springBoot request转化成MultipartHttpServletRequest】
* @return * @return
*/ */
@Bean(name = "multipartResolver") // @Bean(name = "multipartResolver")
public MultipartResolver multipartResolver() { // public MultipartResolver multipartResolver() {
CommonsMultipartResolver resolver = new CommonsMultipartResolver(); // CommonsMultipartResolver resolver = new CommonsMultipartResolver();
resolver.setDefaultEncoding("UTF-8"); // resolver.setDefaultEncoding("UTF-8");
resolver.setResolveLazily(true); // resolver.setResolveLazily(true);
resolver.setMaxInMemorySize(40960); // resolver.setMaxInMemorySize(40960);
resolver.setMaxUploadSize(512 * 1024 * 1024); // resolver.setMaxUploadSize(512 * 1024 * 1024);
return resolver; // return resolver;
} // }
} }
wisenergy-mapper/src/main/java/cn/wisenergy/mapper/AccountMapper.java
View file @ b9c9690d
package cn.wisenergy.mapper; package cn.wisenergy.mapper;
import cn.wisenergy.model.app.AccountInfo; import cn.wisenergy.model.app.AccountInfo;
import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Param;
......
wisenergy-model/src/main/java/cn/wisenergy/model/app/User.java
View file @ b9c9690d
package cn.wisenergy.model.app; package cn.wisenergy.model.app;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.baomidou.mybatisplus.extension.activerecord.Model; import com.baomidou.mybatisplus.extension.activerecord.Model;
import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
...@@ -19,7 +17,6 @@ import java.util.Date; ...@@ -19,7 +17,6 @@ import java.util.Date;
*/ */
@Data @Data
@ApiModel(value = "User") @ApiModel(value = "User")
@TableName("user_info")
public class User extends Model<User> implements Serializable{ public class User extends Model<User> implements Serializable{
private static final long serialVersionUID = 2525339404301884673L; private static final long serialVersionUID = 2525339404301884673L;
...@@ -27,21 +24,18 @@ public class User extends Model<User> implements Serializable{ ...@@ -27,21 +24,18 @@ public class User extends Model<User> implements Serializable{
* 主键id * 主键id
*/ */
@ApiModelProperty(name = "id", value = "用户主键id") @ApiModelProperty(name = "id", value = "用户主键id")
@TableId("id")
private Integer id; private Integer id;
/** /**
* 手机号作为用户账号 * 手机号作为用户账号
*/ */
@ApiModelProperty(name = "user_id", value = "用户主键id") @ApiModelProperty(name = "user_id", value = "用户主键id")
@TableId("user_id")
private String userId; private String userId;
/** /**
* 密码 * 密码
*/ */
@ApiModelProperty(name = "password", value = "用户密码") @ApiModelProperty(name = "password", value = "用户密码")
@TableId("password")
private String password; private String password;
...@@ -49,49 +43,42 @@ public class User extends Model<User> implements Serializable{ ...@@ -49,49 +43,42 @@ public class User extends Model<User> implements Serializable{
* 用户会员等级 * 用户会员等级
*/ */
@ApiModelProperty(name = "user_level", value = "用户会员等级") @ApiModelProperty(name = "user_level", value = "用户会员等级")
@TableId("user_level")
private int userLevel; private int userLevel;
/** /**
* 跨境额度 * 跨境额度
*/ */
@ApiModelProperty(name = "cross_border_line", value = "跨境额度") @ApiModelProperty(name = "cross_border_line", value = "跨境额度")
@TableId("cross_border_line")
private BigDecimal crossBorderLine; private BigDecimal crossBorderLine;
/** /**
* 身份证号码 * 身份证号码
*/ */
@ApiModelProperty(name = "id_card_number", value = "身份证号码") @ApiModelProperty(name = "id_card_number", value = "身份证号码")
@TableId("id_card_number")
private String idCardNumber; private String idCardNumber;
/** /**
* 粉丝昵称 * 粉丝昵称
*/ */
@ApiModelProperty(name = "fans_nickname", value = "粉丝昵称") @ApiModelProperty(name = "fans_nickname", value = "粉丝昵称")
@TableId("fans_nickname")
private String fansNickname; private String fansNickname;
/** /**
* 有赞粉丝id，有赞自动生成 * 有赞粉丝id，有赞自动生成
*/ */
@ApiModelProperty(name = "fans_id", value = "有赞粉丝id，有赞自动生成") @ApiModelProperty(name = "fans_id", value = "有赞粉丝id，有赞自动生成")
@TableId("fans_id")
private String fansId; private String fansId;
/** /**
* 用户本人邀请码 * 用户本人邀请码
*/ */
@ApiModelProperty(name = "invite_code", value = "用户本人邀请码") @ApiModelProperty(name = "invite_code", value = "用户本人邀请码")
@TableId("invite_code")
private String inviteCode; private String inviteCode;
/** /**
* 推荐人邀请码 * 推荐人邀请码
*/ */
@ApiModelProperty(name = "be_invited_code", value = "推荐人邀请码") @ApiModelProperty(name = "be_invited_code", value = "推荐人邀请码")
@TableId("be_invited_code")
private String beInvitedCode; private String beInvitedCode;
/** /**
...@@ -104,100 +91,4 @@ public class User extends Model<User> implements Serializable{ ...@@ -104,100 +91,4 @@ public class User extends Model<User> implements Serializable{
*/ */
@ApiModelProperty(name = "updateTime", value = "修改时间") @ApiModelProperty(name = "updateTime", value = "修改时间")
private Date updateTime; private Date updateTime;
public Integer getId() {
return id;
}
public void setId(Integer id) {
this.id = id;
}
public String getUserId() {
return userId;
}
public void setUserId(String userId) {
this.userId = userId;
}
public String getPassword() {
return password;
}
public void setPassword(String password) {
this.password = password;
}
public int getUserLevel() {
return userLevel;
}
public void setUserLevel(int userLevel) {
this.userLevel = userLevel;
}
public BigDecimal getCrossBorderLine() {
return crossBorderLine;
}
public void setCrossBorderLine(BigDecimal crossBorderLine) {
this.crossBorderLine = crossBorderLine;
}
public String getIdCardNumber() {
return idCardNumber;
}
public void setIdCardNumber(String idCardNumber) {
this.idCardNumber = idCardNumber;
}
public String getFansNickname() {
return fansNickname;
}
public void setFansNickname(String fansNickname) {
this.fansNickname = fansNickname;
}
public String getFansId() {
return fansId;
}
public void setFansId(String fansId) {
this.fansId = fansId;
}
public String getInviteCode() {
return inviteCode;
}
public void setInviteCode(String inviteCode) {
this.inviteCode = inviteCode;
}
public String getBeInvitedCode() {
return beInvitedCode;
}
public void setBeInvitedCode(String beInvitedCode) {
this.beInvitedCode = beInvitedCode;
}
public Date getCreateTime() {
return createTime;
}
public void setCreateTime(Date createTime) {
this.createTime = createTime;
}
public Date getUpdateTime() {
return updateTime;
}
public void setUpdateTime(Date updateTime) {
this.updateTime = updateTime;
}
} }
wisenergy-shiro/src/main/java/com/project/shiro/util/AuthenticationToken.java
View file @ b9c9690d
package com.project.shiro.util; //package com.project.shiro.util;
//
import org.apache.shiro.authc.UsernamePasswordToken; //import org.apache.shiro.authc.UsernamePasswordToken;
//
/** ///**
* 登录令牌 // * 登录令牌
*/ // */
public class AuthenticationToken extends UsernamePasswordToken { //public class AuthenticationToken extends UsernamePasswordToken {
//
private static final long serialVersionUID = 4628652632307774263L; // private static final long serialVersionUID = 4628652632307774263L;
//
//验证码ID // //验证码ID
private String captchaId; // private String captchaId;
//
//验证码 // //验证码
private String captcha; // private String captcha;
//
//ip保留 // //ip保留
public AuthenticationToken(String loginName, String password, boolean remeberMe, String ip, String captchaId, String caprcha) { // public AuthenticationToken(String loginName, String password, boolean remeberMe, String ip, String captchaId, String caprcha) {
super(loginName, password, remeberMe); // super(loginName, password, remeberMe);
this.captchaId = captchaId; // this.captchaId = captchaId;
this.captcha = caprcha; // this.captcha = caprcha;
} // }
//
public String getCaptchaId() { // public String getCaptchaId() {
return captchaId; // return captchaId;
} // }
//
public void setCaptchaId(String captchaId) { // public void setCaptchaId(String captchaId) {
this.captchaId = captchaId; // this.captchaId = captchaId;
} // }
//
public String getCaptcha() { // public String getCaptcha() {
return captcha; // return captcha;
} // }
//
public void setCaptcha(String captcha) { // public void setCaptcha(String captcha) {
this.captcha = captcha; // this.captcha = captcha;
} // }
//
} //}
wisenergy-shiro/src/main/java/com/project/shiro/util/AuthorizationFilter.java
View file @ b9c9690d
package com.project.shiro.util; //package com.project.shiro.util;
//
import com.alibaba.fastjson.JSONObject; //import com.alibaba.fastjson.JSONObject;
import io.swagger.annotations.ResponseHeader; //import io.swagger.annotations.ResponseHeader;
import org.apache.commons.lang3.StringUtils; //import org.apache.commons.lang3.StringUtils;
import org.apache.shiro.web.filter.authz.PermissionsAuthorizationFilter; //import org.apache.shiro.web.filter.authz.PermissionsAuthorizationFilter;
//
import javax.servlet.ServletRequest; //import javax.servlet.ServletRequest;
import javax.servlet.ServletResponse; //import javax.servlet.ServletResponse;
import javax.servlet.http.HttpServletRequest; //import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse; //import javax.servlet.http.HttpServletResponse;
import java.io.IOException; //import java.io.IOException;
import java.io.PrintWriter; //import java.io.PrintWriter;
//
/** ///**
* @author wyy // * @author wyy
* @date 2019-09-14 17:57 // * @date 2019-09-14 17:57
*/ // */
public class AuthorizationFilter extends PermissionsAuthorizationFilter { //public class AuthorizationFilter extends PermissionsAuthorizationFilter {
/** // /**
* shiro认证perms资源失败后回调方法 // * shiro认证perms资源失败后回调方法
* @param servletRequest // * @param servletRequest
* @param servletResponse // * @param servletResponse
* @return // * @return
* @throws IOException // * @throws IOException
*/ // */
@Override // @Override
protected boolean onAccessDenied(ServletRequest servletRequest, ServletResponse servletResponse) throws IOException { // protected boolean onAccessDenied(ServletRequest servletRequest, ServletResponse servletResponse) throws IOException {
HttpServletRequest httpServletRequest = (HttpServletRequest) servletRequest; // HttpServletRequest httpServletRequest = (HttpServletRequest) servletRequest;
HttpServletResponse httpServletResponse = (HttpServletResponse) servletResponse; // HttpServletResponse httpServletResponse = (HttpServletResponse) servletResponse;
String requestedWith = httpServletRequest.getHeader("X-Requested-With"); // String requestedWith = httpServletRequest.getHeader("X-Requested-With");
if (StringUtils.isNotEmpty(requestedWith) && StringUtils.equals(requestedWith, "XMLHttpRequest")) {//如果是ajax返回指定格式数据 // if (StringUtils.isNotEmpty(requestedWith) && StringUtils.equals(requestedWith, "XMLHttpRequest")) {//如果是ajax返回指定格式数据
httpServletResponse.setContentType("application/json"); // httpServletResponse.setContentType("application/json");
httpServletResponse.setCharacterEncoding("UTF-8"); // httpServletResponse.setCharacterEncoding("UTF-8");
PrintWriter out = httpServletResponse.getWriter(); // PrintWriter out = httpServletResponse.getWriter();
JSONObject json = new JSONObject(); // JSONObject json = new JSONObject();
json.put("result", "success"); // json.put("result", "success");
json.put("msg", "登录成功"); // json.put("msg", "登录成功");
out.write(json.toJSONString()); // out.write(json.toJSONString());
out.flush(); // out.flush();
out.close(); // out.close();
} else {//如果是普通请求进行重定向 // } else {//如果是普通请求进行重定向
httpServletResponse.sendRedirect("/403"); // httpServletResponse.sendRedirect("/403");
} // }
return false; // return false;
} // }
} //}
wisenergy-shiro/src/main/java/com/project/shiro/util/Principal.java
View file @ b9c9690d
package com.project.shiro.util; //package com.project.shiro.util;
//
import java.io.Serializable; //import java.io.Serializable;
//
public class Principal implements Serializable { //public class Principal implements Serializable {
//
private static final long serialVersionUID = 598764316789461315L; // private static final long serialVersionUID = 598764316789461315L;
//
public Long id; // public Long id;
//
public String loginName; // public String loginName;
//
public Principal(Long id, String loginName) { // public Principal(Long id, String loginName) {
this.id = id; // this.id = id;
this.loginName = loginName; // this.loginName = loginName;
} // }
//
public Principal() { // public Principal() {
//
} // }
//
public Long getId() { // public Long getId() {
return id; // return id;
} // }
//
public void setId(Long id) { // public void setId(Long id) {
this.id = id; // this.id = id;
} // }
//
public String getLoginName() { // public String getLoginName() {
return loginName; // return loginName;
} // }
//
public void setLoginName(String loginName) { // public void setLoginName(String loginName) {
this.loginName = loginName; // this.loginName = loginName;
} // }
//
} //}
wisenergy-shiro/src/main/java/com/project/shiro/util/redis/ShiroRedisCacheManager.java
View file @ b9c9690d
package com.project.shiro.util.redis; //package com.project.shiro.util.redis;
//
//
import cn.wisenergy.service.common.utils.redis.RedisClient; //import cn.wisenergy.service.common.utils.redis.RedisClient;
import cn.wisenergy.service.common.utils.redis.RedisConsts; //import cn.wisenergy.service.common.utils.redis.RedisConsts;
import org.apache.shiro.cache.Cache; //import org.apache.shiro.cache.Cache;
import org.apache.shiro.cache.CacheException; //import org.apache.shiro.cache.CacheException;
import org.apache.shiro.cache.CacheManager; //import org.apache.shiro.cache.CacheManager;
import org.slf4j.Logger; //import org.slf4j.Logger;
import org.slf4j.LoggerFactory; //import org.slf4j.LoggerFactory;
//
import javax.annotation.Resource; //import javax.annotation.Resource;
import java.util.concurrent.ConcurrentHashMap; //import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.ConcurrentMap; //import java.util.concurrent.ConcurrentMap;
//
public class ShiroRedisCacheManager implements CacheManager { //public class ShiroRedisCacheManager implements CacheManager {
//
private static final Logger logger = LoggerFactory.getLogger(ShiroRedisCacheManager.class); // private static final Logger logger = LoggerFactory.getLogger(ShiroRedisCacheManager.class);
//
private final ConcurrentMap<String, Cache> caches = new ConcurrentHashMap<String, Cache>(); // private final ConcurrentMap<String, Cache> caches = new ConcurrentHashMap<String, Cache>();
//
//注入redisClient实例 // //注入redisClient实例
@Resource(name = "redisClient") // @Resource(name = "redisClient")
private RedisClient redisClient; // private RedisClient redisClient;
//
/** // /**
* shiro权限缓存前缀 // * shiro权限缓存前缀
*/ // */
private String keyPrefix = RedisConsts.ADMIN_SHIRO_REALM_KEY; // private String keyPrefix = RedisConsts.ADMIN_SHIRO_REALM_KEY;
//
//
@Override // @Override
public <K, V> Cache<K, V> getCache(String name) throws CacheException { // public <K, V> Cache<K, V> getCache(String name) throws CacheException {
//
logger.debug("获取名称为: " + name + " 的RedisCache实例"); // logger.debug("获取名称为: " + name + " 的RedisCache实例");
Cache c = caches.get(keyPrefix + name); // Cache c = caches.get(keyPrefix + name);
if (c == null) { // if (c == null) {
c = new ShiroRedisCache<K, V>(redisClient, keyPrefix); // c = new ShiroRedisCache<K, V>(redisClient, keyPrefix);
caches.put(keyPrefix + name, c); // caches.put(keyPrefix + name, c);
} // }
return c; // return c;
} // }
//
public RedisClient getRedisClient() { // public RedisClient getRedisClient() {
return redisClient; // return redisClient;
} // }
//
public void setRedisClient(RedisClient redisClient) { // public void setRedisClient(RedisClient redisClient) {
this.redisClient = redisClient; // this.redisClient = redisClient;
} // }
//
public String getKeyPrefix() { // public String getKeyPrefix() {
return keyPrefix; // return keyPrefix;
} // }
//
public void setKeyPrefix(String keyPrefix) { // public void setKeyPrefix(String keyPrefix) {
this.keyPrefix = keyPrefix; // this.keyPrefix = keyPrefix;
} // }
} //}
wisenergy-shiro/src/main/java/com/project/shiro/util/redis/ShiroRedisSessionDAO.java
View file @ b9c9690d
package com.project.shiro.util.redis; //package com.project.shiro.util.redis;
//
import cn.wisenergy.service.common.utils.ByteUtil; //import cn.wisenergy.service.common.utils.ByteUtil;
import cn.wisenergy.service.common.utils.redis.RedisClient; //import cn.wisenergy.service.common.utils.redis.RedisClient;
import cn.wisenergy.service.common.utils.redis.RedisConsts; //import cn.wisenergy.service.common.utils.redis.RedisConsts;
import org.apache.shiro.session.Session; //import org.apache.shiro.session.Session;
import org.apache.shiro.session.UnknownSessionException; //import org.apache.shiro.session.UnknownSessionException;
import org.apache.shiro.session.mgt.eis.AbstractSessionDAO; //import org.apache.shiro.session.mgt.eis.AbstractSessionDAO;
import org.slf4j.Logger; //import org.slf4j.Logger;
import org.slf4j.LoggerFactory; //import org.slf4j.LoggerFactory;
//
import javax.annotation.Resource; //import javax.annotation.Resource;
import java.io.IOException; //import java.io.IOException;
import java.io.Serializable; //import java.io.Serializable;
import java.util.Collection; //import java.util.Collection;
import java.util.HashSet; //import java.util.HashSet;
import java.util.Set; //import java.util.Set;
//
public class ShiroRedisSessionDAO extends AbstractSessionDAO { //public class ShiroRedisSessionDAO extends AbstractSessionDAO {
//
private static Logger logger = LoggerFactory.getLogger(ShiroRedisSessionDAO.class); // private static Logger logger = LoggerFactory.getLogger(ShiroRedisSessionDAO.class);
//
//注入redisClient实例 // //注入redisClient实例
@Resource(name = "redisClient") // @Resource(name = "redisClient")
private RedisClient redisClient; // private RedisClient redisClient;
//
/** // /**
* shiro-redis的session对象前缀 // * shiro-redis的session对象前缀
*/ // */
//
private String keyPrefix = RedisConsts.ADMIN_SHIRO_SESSION_KEY; // private String keyPrefix = RedisConsts.ADMIN_SHIRO_SESSION_KEY;
//
@Override // @Override
public void update(Session session) throws UnknownSessionException { // public void update(Session session) throws UnknownSessionException {
this.saveSession(session); // this.saveSession(session);
} // }
//
private void saveSession(Session session) throws UnknownSessionException { // private void saveSession(Session session) throws UnknownSessionException {
if (session == null || session.getId() == null) { // if (session == null || session.getId() == null) {
logger.error("session or session id is null"); // logger.error("session or session id is null");
return; // return;
} // }
this.redisClient.setAndExpire(this.getPreStringKey(session.getId()), session, RedisConsts.ADMIN_SHIRO_SESSION_EXPIRE); // this.redisClient.setAndExpire(this.getPreStringKey(session.getId()), session, RedisConsts.ADMIN_SHIRO_SESSION_EXPIRE);
} // }
//
@Override // @Override
public void delete(Session session) { // public void delete(Session session) {
if (session == null || session.getId() == null) { // if (session == null || session.getId() == null) {
logger.error("session or session id is null"); // logger.error("session or session id is null");
return; // return;
} // }
redisClient.del(getPreStringKey(session.getId())); // redisClient.del(getPreStringKey(session.getId()));
//
} // }
//
@Override // @Override
public Collection<Session> getActiveSessions() { // public Collection<Session> getActiveSessions() {
Set<Session> sessions = new HashSet<Session>(); // Set<Session> sessions = new HashSet<Session>();
//
Set<byte[]> keys = null; // Set<byte[]> keys = null;
try { // try {
keys = redisClient.keys(ByteUtil.objectToBytes(this.keyPrefix + "*")); // keys = redisClient.keys(ByteUtil.objectToBytes(this.keyPrefix + "*"));
} catch (IOException e) { // } catch (IOException e) {
e.printStackTrace(); // e.printStackTrace();
} // }
if (keys != null && keys.size() > 0) { // if (keys != null && keys.size() > 0) {
for (byte[] key : keys) { // for (byte[] key : keys) {
Session s = null; // Session s = null;
try { // try {
s = (Session) ByteUtil.bytesToObject(redisClient.get(key)); // s = (Session) ByteUtil.bytesToObject(redisClient.get(key));
} catch (IOException e) { // } catch (IOException e) {
e.printStackTrace(); // e.printStackTrace();
} catch (ClassNotFoundException e) { // } catch (ClassNotFoundException e) {
e.printStackTrace(); // e.printStackTrace();
} // }
sessions.add(s); // sessions.add(s);
} // }
} // }
//
return sessions; // return sessions;
} // }
//
@Override // @Override
protected Serializable doCreate(Session session) { // protected Serializable doCreate(Session session) {
Serializable sessionId = this.generateSessionId(session); // Serializable sessionId = this.generateSessionId(session);
this.assignSessionId(session, sessionId); // this.assignSessionId(session, sessionId);
this.saveSession(session); // this.saveSession(session);
return sessionId; // return sessionId;
} // }
//
@Override // @Override
protected Session doReadSession(Serializable sessionId) { // protected Session doReadSession(Serializable sessionId) {
if (sessionId == null) { // if (sessionId == null) {
logger.error("session id is null"); // logger.error("session id is null");
return null; // return null;
} // }
//
Session s = (Session) redisClient.get(this.getPreStringKey(sessionId)); // Session s = (Session) redisClient.get(this.getPreStringKey(sessionId));
return s; // return s;
} // }
//
/** // /**
* 获得String类型的key // * 获得String类型的key
* // *
* @param // * @param
* @return // * @return
*/ // */
private String getPreStringKey(Serializable sessionId) { // private String getPreStringKey(Serializable sessionId) {
String preKey = this.keyPrefix + sessionId; // String preKey = this.keyPrefix + sessionId;
return preKey; // return preKey;
} // }
//
public String getKeyPrefix() { // public String getKeyPrefix() {
return keyPrefix; // return keyPrefix;
} // }
//
public void setKeyPrefix(String keyPrefix) { // public void setKeyPrefix(String keyPrefix) {
this.keyPrefix = keyPrefix; // this.keyPrefix = keyPrefix;
} // }
//
public void setRedisClient(RedisClient redisClient) { // public void setRedisClient(RedisClient redisClient) {
this.redisClient = redisClient; // this.redisClient = redisClient;
} // }
//
public RedisClient getRedisClient() { // public RedisClient getRedisClient() {
return redisClient; // return redisClient;
} // }
//
} //}
wisenergy-web-admin/src/main/java/cn/wisenergy/web/config/MvcConfiguration.java
View file @ b9c9690d
...@@ -51,7 +51,7 @@ public class MvcConfiguration extends WebMvcConfigurationSupport { ...@@ -51,7 +51,7 @@ public class MvcConfiguration extends WebMvcConfigurationSupport {
@Override @Override
public void addCorsMappings(CorsRegistry registry) { public void addCorsMappings(CorsRegistry registry) {
registry.addMapping("/**") registry.addMapping("/**")
.allowedOrigins("*") .allowedOriginPatterns("*")
.allowedHeaders("*") .allowedHeaders("*")
.allowedMethods("*") .allowedMethods("*")
.allowCredentials(true) .allowCredentials(true)
......
wisenergy-web-admin/src/main/java/cn/wisenergy/web/sms/interceptor/LoginInterceptor.java
View file @ b9c9690d
package cn.wisenergy.web.sms.interceptor; package cn.wisenergy.web.sms.interceptor;
import cn.wisenergy.common.enums.ResultEnum; import cn.wisenergy.common.enums.ResultEnum;
import cn.wisenergy.common.utils.Constants;
import cn.wisenergy.common.utils.RedisUtils; import cn.wisenergy.common.utils.RedisUtils;
import cn.wisenergy.common.utils.ResponseOutput; import cn.wisenergy.common.utils.ResponseOutput;
import cn.wisenergy.common.utils.StringUtil; import cn.wisenergy.common.utils.StringUtil;
......
wisenergy-web-admin/src/main/resources/application-dev.yml
View file @ b9c9690d
...@@ -3,9 +3,9 @@ spring: ...@@ -3,9 +3,9 @@ spring:
type: com.alibaba.druid.pool.DruidDataSource type: com.alibaba.druid.pool.DruidDataSource
druid: druid:
driver-class-name: com.mysql.cj.jdbc.Driver driver-class-name: com.mysql.cj.jdbc.Driver
url: jdbc:mysql://192.168.110.164:3306/shop_app?useUnicode=true&characterEncoding=UTF-8&allowMultiQueries=true&serverTimezone=GMT%2B8 url: jdbc:mysql://39.97.107.31:3306/qunzhihe?useUnicode=true&characterEncoding=UTF-8&allowMultiQueries=true&serverTimezone=GMT%2B8
username: root username: qunzhihe
password: adm4HYservice$ password: j2kRn8HjrPez7trw
initial-size: 10 initial-size: 10
max-active: 100 max-active: 100
min-idle: 10 min-idle: 10
...@@ -46,9 +46,9 @@ spring: ...@@ -46,9 +46,9 @@ spring:
# 192.168.110.165 adm4HYservice$ # 192.168.110.165 adm4HYservice$
redis: redis:
database: 0 database: 0
host: 127.0.0.1 host: 39.97.107.31
port: 6379 port: 6379
password: 123456 # 密码（默认为空） password: 1qaz@WSX # 密码（默认为空）
timeout: 6000ms # 连接超时时长（毫秒） timeout: 6000ms # 连接超时时长（毫秒）
jedis: jedis:
pool: pool:
......
wisenergy-web-admin/src/main/resources/application-test.yml
View file @ b9c9690d
...@@ -3,7 +3,7 @@ spring: ...@@ -3,7 +3,7 @@ spring:
type: com.alibaba.druid.pool.DruidDataSource type: com.alibaba.druid.pool.DruidDataSource
druid: druid:
driver-class-name: com.mysql.cj.jdbc.Driver driver-class-name: com.mysql.cj.jdbc.Driver
url: jdbc:mysql://localhost:3306/qunzhihe?useUnicode=true&characterEncoding=UTF-8&serverTimezone=GMT%2B8 url: jdbc:mysql://39.97.107.31:3306/qunzhihe?useUnicode=true&characterEncoding=UTF-8&serverTimezone=GMT%2B8
username: qunzhihe username: qunzhihe
password: j2kRn8HjrPez7trw password: j2kRn8HjrPez7trw
initial-size: 10 initial-size: 10
...@@ -34,15 +34,16 @@ spring: ...@@ -34,15 +34,16 @@ spring:
multi-statement-allow: true multi-statement-allow: true
#/www/server/redis/src/redis-server #/www/server/redis/src/redis-server
redis: redis:
open: false # 是否开启redis缓存 true开启 false关闭
database: 0 database: 0
host: localhost host: 39.97.107.31
port: 6379 port: 6379
password: password: 1qaz@WSX # 密码（默认为空）
timeout: 6000ms timeout: 6000ms # 连接超时时长（毫秒）
jedis: jedis:
pool: pool:
max-active: 1000 # 连接池最大连接数（使用负值表示没有限制） max-active: 1000 # 连接池最大连接数（使用负值表示没有限制）
max-wait: -1ms # 连接池最大阻塞等待时间（使用负值表示没有限制） max-wait: -1ms # 连接池最大阻塞等待时间（使用负值表示没有限制）
max-idle: 10 # 连接池中的最大空闲连接 max-idle: 10 # 连接池中的最大空闲连接
min-idle: 5 # 连接池中的最小空闲连接 min-idle: 5 # 连接池中的最小空闲连接
#jwt: #jwt:
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment