diff --git a/sa-token-demo-springboot/lib/sa-token-spring-1.0.0.jar b/sa-token-demo-springboot/lib/sa-token-spring-1.0.0.jar
deleted file mode 100644
index d93b176e5f6424ce6928a6df36fa67080f99cae7..0000000000000000000000000000000000000000
Binary files a/sa-token-demo-springboot/lib/sa-token-spring-1.0.0.jar and /dev/null differ
diff --git a/sa-token-demo-springboot/pom.xml b/sa-token-demo-springboot/pom.xml
index aa6c274a4bdfcca1e168058546b556c02e92c945..50acefa91b934848f6a12803f9e5d4d1bd3c62a3 100644
--- a/sa-token-demo-springboot/pom.xml
+++ b/sa-token-demo-springboot/pom.xml
@@ -25,14 +25,12 @@
spring-boot-starter-aop
-
-
- cn.dev33.sa-token
- sa-token-spring
- 1.0.0
- system
- ${project.basedir}/lib/sa-token-spring-1.0.0.jar
-
+
+
+ cn.dev33
+ sa-token
+ 1.0.0
+
@@ -57,10 +55,6 @@
lib/
com.pj.SaTokenDemoApplication
-
-
- lib/sa-token-spring-1.0.0.jar
-
diff --git a/sa-token-dev/src/main/java/cn/dev33/satoken/config/SaTokenConfig.java b/sa-token-dev/src/main/java/cn/dev33/satoken/config/SaTokenConfig.java
index 5ee25c94fc9c8bb538b03856ca05492569d01f81..f499697bc42c281f00db0511d3e46d03d63f635b 100644
--- a/sa-token-dev/src/main/java/cn/dev33/satoken/config/SaTokenConfig.java
+++ b/sa-token-dev/src/main/java/cn/dev33/satoken/config/SaTokenConfig.java
@@ -12,46 +12,97 @@ public class SaTokenConfig {
private Boolean isReadBody = true; // 是否在header读取不到token时,继续从请求题参数里继续尝试读取
private Boolean isV = true; // 是否在初始化配置时打印版本字符画
+
+
+ /**
+ * @return tokenName
+ */
public String getTokenName() {
return tokenName;
}
+
+ /**
+ * @param tokenName 要设置的 tokenName
+ */
public void setTokenName(String tokenName) {
this.tokenName = tokenName;
}
+
+ /**
+ * @return timeout
+ */
public long getTimeout() {
return timeout;
}
+
+ /**
+ * @param timeout 要设置的 timeout
+ */
public void setTimeout(long timeout) {
this.timeout = timeout;
}
+
+ /**
+ * @return isShare
+ */
public Boolean getIsShare() {
return isShare;
}
+
+ /**
+ * @param isShare 要设置的 isShare
+ */
public void setIsShare(Boolean isShare) {
this.isShare = isShare;
}
+
+ /**
+ * @return isReadHead
+ */
public Boolean getIsReadHead() {
return isReadHead;
}
+
+ /**
+ * @param isReadHead 要设置的 isReadHead
+ */
public void setIsReadHead(Boolean isReadHead) {
this.isReadHead = isReadHead;
}
+
+ /**
+ * @return isReadBody
+ */
public Boolean getIsReadBody() {
return isReadBody;
}
+
+ /**
+ * @param isReadBody 要设置的 isReadBody
+ */
public void setIsReadBody(Boolean isReadBody) {
this.isReadBody = isReadBody;
}
+
+ /**
+ * @return isV
+ */
public Boolean getIsV() {
return isV;
}
+
+ /**
+ * @param isV 要设置的 isV
+ */
public void setIsV(Boolean isV) {
this.isV = isV;
}
-
-
+
+ /* (非 Javadoc)
+ * @see java.lang.Object#toString()
+ */
@Override
public String toString() {
return "SaTokenConfig [tokenName=" + tokenName + ", timeout=" + timeout + ", isShare=" + isShare
@@ -62,4 +113,5 @@ public class SaTokenConfig {
+
}
diff --git a/sa-token-dev/src/main/java/cn/dev33/satoken/config/SaTokenConfigFactory.java b/sa-token-dev/src/main/java/cn/dev33/satoken/config/SaTokenConfigFactory.java
index ae3d39d435ad268d7bf1c5fea29a2347ce6bdaaa..034a6d730ddbeddd26c7976ca0c148864a9693d2 100644
--- a/sa-token-dev/src/main/java/cn/dev33/satoken/config/SaTokenConfigFactory.java
+++ b/sa-token-dev/src/main/java/cn/dev33/satoken/config/SaTokenConfigFactory.java
@@ -62,7 +62,7 @@ public class SaTokenConfigFactory {
private static Object initPropByMap(Map map, Object obj){
if(map == null){
- map = new HashMap<>();
+ map = new HashMap();
}
// 1、取出类型
@@ -84,7 +84,9 @@ public class SaTokenConfigFactory {
Object valueConvert = getObjectByClass(value, field.getType()); // 转换值类型
field.setAccessible(true);
field.set(obj, valueConvert);
- } catch (IllegalArgumentException | IllegalAccessException e) {
+ } catch (IllegalArgumentException e) {
+ throw new RuntimeException("属性赋值出错:" + field.getName(), e);
+ } catch (IllegalAccessException e) {
throw new RuntimeException("属性赋值出错:" + field.getName(), e);
}
}
diff --git a/sa-token-dev/src/main/java/cn/dev33/satoken/dao/SaTokenDao.java b/sa-token-dev/src/main/java/cn/dev33/satoken/dao/SaTokenDao.java
index 54e99b5e8096d11ee1b6e55f8a9427739abae1b4..e676a2a1d4d93a7f4011089eb2022a558f163555 100644
--- a/sa-token-dev/src/main/java/cn/dev33/satoken/dao/SaTokenDao.java
+++ b/sa-token-dev/src/main/java/cn/dev33/satoken/dao/SaTokenDao.java
@@ -33,27 +33,27 @@ public interface SaTokenDao {
/**
* 根据指定key的session,如果没有,则返回空
- * @param key 键名称
+ * @param sessionId 键名称
* @return
*/
public SaSession getSaSession(String sessionId);
/**
* 将指定session持久化
- * @param key 键名称
- * @param value 值
+ * @param session 要保存的session对象
* @param timeout 过期时间,单位: s
*/
public void saveSaSession(SaSession session, long timeout);
/**
- * 更新指定session
+ * 更新指定session
+ * @param session 要更新的session对象
*/
public void updateSaSession(SaSession session);
/**
* 删除一个指定的session
- * @param key 键名称
+ * @param sessionId sessionId
*/
public void delSaSession(String sessionId);
diff --git a/sa-token-dev/src/main/java/cn/dev33/satoken/dao/SaTokenDaoDefault.java b/sa-token-dev/src/main/java/cn/dev33/satoken/dao/SaTokenDaoDefault.java
index ee195dbcab7bebe5de5a80eb55588be9ae99e8b1..e61cac1eae01a9882ccf7ebe43416ae5a9517622 100644
--- a/sa-token-dev/src/main/java/cn/dev33/satoken/dao/SaTokenDaoDefault.java
+++ b/sa-token-dev/src/main/java/cn/dev33/satoken/dao/SaTokenDaoDefault.java
@@ -10,9 +10,7 @@ import cn.dev33.satoken.session.SaSession;
*/
public class SaTokenDaoDefault implements SaTokenDao {
- /**
- * 所有数据集合
- */
+ // 所有数据集合
Map dataMap = new HashMap();
diff --git a/sa-token-dev/src/main/java/cn/dev33/satoken/session/SaSession.java b/sa-token-dev/src/main/java/cn/dev33/satoken/session/SaSession.java
index bb812c3225aa3cd5499f1c97ddf57e8e4a2962f7..d4224bd721a563e75c1cf197b0852067c92dea3d 100644
--- a/sa-token-dev/src/main/java/cn/dev33/satoken/session/SaSession.java
+++ b/sa-token-dev/src/main/java/cn/dev33/satoken/session/SaSession.java
@@ -41,14 +41,17 @@ public class SaSession implements Serializable {
}
/**
- * 当前会话创建时间
+ * 返回当前会话创建时间
+ * @return 时间戳
*/
public long getCreateTime() {
return createTime;
}
/**
- * 写入值
+ * 写入一个值
+ * @param key 名称
+ * @param value 值
*/
public void setAttribute(String key, Object value) {
dataMap.put(key, value);
@@ -56,14 +59,19 @@ public class SaSession implements Serializable {
}
/**
- * 取值
+ * 取出一个值
+ * @param key 名称
+ * @return 值
*/
public Object getAttribute(String key) {
return dataMap.get(key);
}
/**
- * 取值,并指定取不到值时的默认值
+ * 取值,并指定取不到值时的默认值
+ * @param key 名称
+ * @param default_value 取不到值的时候返回的默认值
+ * @return
*/
public Object getAttribute(String key, Object default_value) {
Object value = getAttribute(key);
@@ -75,7 +83,8 @@ public class SaSession implements Serializable {
/**
- * 移除一个key
+ * 移除一个值
+ * @param key 要移除的值的名字
*/
public void removeAttribute(String key) {
dataMap.remove(key);
@@ -83,7 +92,7 @@ public class SaSession implements Serializable {
}
/**
- * 清空所有key
+ * 清空所有值
*/
public void clearAttribute() {
dataMap.clear();
@@ -91,14 +100,17 @@ public class SaSession implements Serializable {
}
/**
- * 是否含有指定key
+ * 是否含有指定key
+ * @param key 是否含有指定值
+ * @return 是否含有
*/
public boolean containsAttribute(String key) {
return dataMap.keySet().contains(key);
}
/**
- * 当前session会话所有key
+ * 返回当前session会话所有key
+ * @return 所有值的key列表
*/
public Set getAttributeKeys() {
return dataMap.keySet();
@@ -106,6 +118,7 @@ public class SaSession implements Serializable {
/**
* 获取数据集合(如果更新map里的值,请调用session.update()方法避免数据过时 )
+ * @return 返回底层储存值的map对象
*/
public Map getDataMap() {
return dataMap;
diff --git a/sa-token-dev/src/main/java/cn/dev33/satoken/session/SaSessionCustomUtil.java b/sa-token-dev/src/main/java/cn/dev33/satoken/session/SaSessionCustomUtil.java
index e4bc306a1d082dd6f97c53b713474ee328ee509f..5b88c6fcea313da3a26e4f1e113bcd89a129e431 100644
--- a/sa-token-dev/src/main/java/cn/dev33/satoken/session/SaSessionCustomUtil.java
+++ b/sa-token-dev/src/main/java/cn/dev33/satoken/session/SaSessionCustomUtil.java
@@ -15,12 +15,21 @@ public class SaSessionCustomUtil {
return SaTokenManager.getConfig().getTokenName() + ":" + session_key + ":session:" + sessionId;
}
- /** 指定key的session是否存在 */
+ /**
+ * 指定key的session是否存在
+ * @param sessionId session的id
+ * @return 是否存在
+ */
public boolean isExists(String sessionId) {
return SaTokenManager.getDao().getSaSession(getSessionKey(sessionId)) != null;
}
- /** 获取指定key的session, 如果没有,is_create=是否新建并返回 */
+ /**
+ * 获取指定key的session
+ * @param sessionId key
+ * @param is_create 如果没有,是否新建并返回
+ * @return
+ */
public static SaSession getSessionById(String sessionId, boolean is_create) {
SaSession session = SaTokenManager.getDao().getSaSession(getSessionKey(sessionId));
if(session == null && is_create) {
@@ -29,12 +38,19 @@ public class SaSessionCustomUtil {
}
return session;
}
- /** 获取指定key的session, 如果没有则新建并返回 */
+ /**
+ * 获取指定key的session, 如果没有则新建并返回
+ * @param sessionId key
+ * @return session对象
+ */
public static SaSession getSessionById(String sessionId) {
return getSessionById(sessionId, true);
}
- /** 删除指定key的session */
+ /**
+ * 删除指定key的session
+ * @param sessionId 删除指定key
+ */
public static void delSessionById(String sessionId) {
SaTokenManager.getDao().delSaSession(getSessionKey(sessionId));
}
diff --git a/sa-token-dev/src/main/java/cn/dev33/satoken/stp/StpInterface.java b/sa-token-dev/src/main/java/cn/dev33/satoken/stp/StpInterface.java
index 005c37e32cc334a643ed4292cb024f5f97acf9d2..1f4d438f3624131424b03a06001d6e5376ea54ce 100644
--- a/sa-token-dev/src/main/java/cn/dev33/satoken/stp/StpInterface.java
+++ b/sa-token-dev/src/main/java/cn/dev33/satoken/stp/StpInterface.java
@@ -7,7 +7,12 @@ import java.util.List;
*/
public interface StpInterface {
- /** 返回指定login_id所拥有的权限码集合 */
+ /**
+ * 返回指定login_id所拥有的权限码集合
+ * @param login_id 账号id
+ * @param login_key 具体的stp标识
+ * @return
+ */
public List