diff --git a/front-end/js/events.js b/front-end/js/events.js
index 2ce26cb..379a878 100644
--- a/front-end/js/events.js
+++ b/front-end/js/events.js
@@ -1,5 +1,7 @@
-function login() {
+var operationStatus = "login";
+function login() {
+ clearMessage();
username = $("#username").val();
password = $("#passwd").val();
@@ -13,6 +15,10 @@ function login() {
"password": encPassword
};
+ sendLogin(postData);
+}
+
+function sendLogin(postData) {
$.ajax({
url: "/api/v1/login",
type: "post",
@@ -47,6 +53,7 @@ function login() {
}
function register() {
+ clearMessage();
username = $("#username").val();
password = $("#passwd").val();
@@ -91,4 +98,8 @@ function register() {
showMessage("注册时发生错误:" + status + " " + msg.status);
}
})
+}
+
+function jumpToFillInformation() {
+
}
\ No newline at end of file
diff --git a/front-end/login.html b/front-end/login.html
index ac1fd7a..9a87d6f 100644
--- a/front-end/login.html
+++ b/front-end/login.html
@@ -4,7 +4,7 @@
-
欢迎 - LittleBusters
+
欢迎 - Trailblazer
diff --git a/pom.xml b/pom.xml
index 5d362c2..782b373 100644
--- a/pom.xml
+++ b/pom.xml
@@ -5,9 +5,9 @@
4.0.0
me.lensfrex
-
LittleBusters
+
Trailblazer
0.0.1-dev
-
LittleBusters
+
Trailblazer
war
diff --git a/src/main/java/me/lensfrex/littlebusters/api/v1/utils/key/KeyManager.java b/src/main/java/me/lensfrex/littlebusters/api/v1/utils/key/KeyManager.java
deleted file mode 100644
index 6fb192e..0000000
--- a/src/main/java/me/lensfrex/littlebusters/api/v1/utils/key/KeyManager.java
+++ /dev/null
@@ -1,4 +0,0 @@
-package me.lensfrex.littlebusters.api.v1.utils.key;
-
-public class KeyManager {
-}
diff --git a/src/main/java/me/lensfrex/littlebusters/api/v1/beans/ProfileItem.java b/src/main/java/me/lensfrex/trailblazer/api/v1/beans/ProfileItem.java
similarity index 86%
rename from src/main/java/me/lensfrex/littlebusters/api/v1/beans/ProfileItem.java
rename to src/main/java/me/lensfrex/trailblazer/api/v1/beans/ProfileItem.java
index 7992538..a45bd8a 100644
--- a/src/main/java/me/lensfrex/littlebusters/api/v1/beans/ProfileItem.java
+++ b/src/main/java/me/lensfrex/trailblazer/api/v1/beans/ProfileItem.java
@@ -1,4 +1,4 @@
-package me.lensfrex.littlebusters.api.v1.beans;
+package me.lensfrex.trailblazer.api.v1.beans;
public class ProfileItem {
private String itemName;
diff --git a/src/main/java/me/lensfrex/littlebusters/api/v1/beans/requests/LoginRequestBody.java b/src/main/java/me/lensfrex/trailblazer/api/v1/beans/requests/LoginRequestBody.java
similarity index 87%
rename from src/main/java/me/lensfrex/littlebusters/api/v1/beans/requests/LoginRequestBody.java
rename to src/main/java/me/lensfrex/trailblazer/api/v1/beans/requests/LoginRequestBody.java
index 6bc3bc3..e3f6877 100644
--- a/src/main/java/me/lensfrex/littlebusters/api/v1/beans/requests/LoginRequestBody.java
+++ b/src/main/java/me/lensfrex/trailblazer/api/v1/beans/requests/LoginRequestBody.java
@@ -1,4 +1,4 @@
-package me.lensfrex.littlebusters.api.v1.beans.requests;
+package me.lensfrex.trailblazer.api.v1.beans.requests;
import com.google.gson.annotations.SerializedName;
diff --git a/src/main/java/me/lensfrex/littlebusters/api/v1/beans/requests/RegisterRequestBody.java b/src/main/java/me/lensfrex/trailblazer/api/v1/beans/requests/RegisterRequestBody.java
similarity index 87%
rename from src/main/java/me/lensfrex/littlebusters/api/v1/beans/requests/RegisterRequestBody.java
rename to src/main/java/me/lensfrex/trailblazer/api/v1/beans/requests/RegisterRequestBody.java
index 7903b34..5095a2a 100644
--- a/src/main/java/me/lensfrex/littlebusters/api/v1/beans/requests/RegisterRequestBody.java
+++ b/src/main/java/me/lensfrex/trailblazer/api/v1/beans/requests/RegisterRequestBody.java
@@ -1,4 +1,4 @@
-package me.lensfrex.littlebusters.api.v1.beans.requests;
+package me.lensfrex.trailblazer.api.v1.beans.requests;
import com.google.gson.annotations.SerializedName;
diff --git a/src/main/java/me/lensfrex/littlebusters/api/v1/beans/responses/LoginResponseData.java b/src/main/java/me/lensfrex/trailblazer/api/v1/beans/responses/LoginResponseData.java
similarity index 70%
rename from src/main/java/me/lensfrex/littlebusters/api/v1/beans/responses/LoginResponseData.java
rename to src/main/java/me/lensfrex/trailblazer/api/v1/beans/responses/LoginResponseData.java
index eb62a55..fb019e6 100644
--- a/src/main/java/me/lensfrex/littlebusters/api/v1/beans/responses/LoginResponseData.java
+++ b/src/main/java/me/lensfrex/trailblazer/api/v1/beans/responses/LoginResponseData.java
@@ -1,4 +1,4 @@
-package me.lensfrex.littlebusters.api.v1.beans.responses;
+package me.lensfrex.trailblazer.api.v1.beans.responses;
import com.google.gson.annotations.SerializedName;
@@ -13,25 +13,28 @@ public class LoginResponseData {
private String uuid;
+ private int account_status;
+
/**
* 用户本次登录得到的token
*/
@SerializedName("access_token")
private String accessToken;
- /**
- * 用户此次得到的token的过期时间
- */
- @SerializedName("expired_at")
- private long expiredAt;
-
- public LoginResponseData(long uid, String uuid, String accessToken, long expiredAt) {
+ public LoginResponseData(long uid, String uuid, int account_status, String accessToken, long expiredAt) {
this.uid = uid;
this.uuid = uuid;
+ this.account_status = account_status;
this.accessToken = accessToken;
this.expiredAt = expiredAt;
}
+ /**
+ * 用户此次得到的token的过期时间
+ */
+ @SerializedName("expired_at")
+ private long expiredAt;
+
public long getUid() {
return uid;
}
@@ -63,4 +66,12 @@ public class LoginResponseData {
public void setExpiredAt(long expiredAt) {
this.expiredAt = expiredAt;
}
+
+ public int getAccount_status() {
+ return account_status;
+ }
+
+ public void setAccount_status(int account_status) {
+ this.account_status = account_status;
+ }
}
diff --git a/src/main/java/me/lensfrex/littlebusters/api/v1/beans/responses/ProfileResponseData.java b/src/main/java/me/lensfrex/trailblazer/api/v1/beans/responses/ProfileResponseData.java
similarity index 76%
rename from src/main/java/me/lensfrex/littlebusters/api/v1/beans/responses/ProfileResponseData.java
rename to src/main/java/me/lensfrex/trailblazer/api/v1/beans/responses/ProfileResponseData.java
index 27bcdb3..97a09ec 100644
--- a/src/main/java/me/lensfrex/littlebusters/api/v1/beans/responses/ProfileResponseData.java
+++ b/src/main/java/me/lensfrex/trailblazer/api/v1/beans/responses/ProfileResponseData.java
@@ -1,6 +1,6 @@
-package me.lensfrex.littlebusters.api.v1.beans.responses;
+package me.lensfrex.trailblazer.api.v1.beans.responses;
-import me.lensfrex.littlebusters.api.v1.beans.ProfileItem;
+import me.lensfrex.trailblazer.api.v1.beans.ProfileItem;
import java.util.ArrayList;
import java.util.List;
diff --git a/src/main/java/me/lensfrex/littlebusters/api/v1/beans/responses/RegisterResponseData.java b/src/main/java/me/lensfrex/trailblazer/api/v1/beans/responses/RegisterResponseData.java
similarity index 91%
rename from src/main/java/me/lensfrex/littlebusters/api/v1/beans/responses/RegisterResponseData.java
rename to src/main/java/me/lensfrex/trailblazer/api/v1/beans/responses/RegisterResponseData.java
index 530aef7..d84b58b 100644
--- a/src/main/java/me/lensfrex/littlebusters/api/v1/beans/responses/RegisterResponseData.java
+++ b/src/main/java/me/lensfrex/trailblazer/api/v1/beans/responses/RegisterResponseData.java
@@ -1,4 +1,4 @@
-package me.lensfrex.littlebusters.api.v1.beans.responses;
+package me.lensfrex.trailblazer.api.v1.beans.responses;
import com.google.gson.annotations.SerializedName;
diff --git a/src/main/java/me/lensfrex/littlebusters/api/v1/beans/responses/general/ErrorResponse.java b/src/main/java/me/lensfrex/trailblazer/api/v1/beans/responses/general/ErrorResponse.java
similarity index 77%
rename from src/main/java/me/lensfrex/littlebusters/api/v1/beans/responses/general/ErrorResponse.java
rename to src/main/java/me/lensfrex/trailblazer/api/v1/beans/responses/general/ErrorResponse.java
index c0b71ba..5730643 100644
--- a/src/main/java/me/lensfrex/littlebusters/api/v1/beans/responses/general/ErrorResponse.java
+++ b/src/main/java/me/lensfrex/trailblazer/api/v1/beans/responses/general/ErrorResponse.java
@@ -1,4 +1,4 @@
-package me.lensfrex.littlebusters.api.v1.beans.responses.general;
+package me.lensfrex.trailblazer.api.v1.beans.responses.general;
/**
* 错误响应类。
diff --git a/src/main/java/me/lensfrex/littlebusters/api/v1/beans/responses/general/ResponseBase.java b/src/main/java/me/lensfrex/trailblazer/api/v1/beans/responses/general/ResponseBase.java
similarity index 90%
rename from src/main/java/me/lensfrex/littlebusters/api/v1/beans/responses/general/ResponseBase.java
rename to src/main/java/me/lensfrex/trailblazer/api/v1/beans/responses/general/ResponseBase.java
index dbfad02..8ca110a 100644
--- a/src/main/java/me/lensfrex/littlebusters/api/v1/beans/responses/general/ResponseBase.java
+++ b/src/main/java/me/lensfrex/trailblazer/api/v1/beans/responses/general/ResponseBase.java
@@ -1,4 +1,4 @@
-package me.lensfrex.littlebusters.api.v1.beans.responses.general;
+package me.lensfrex.trailblazer.api.v1.beans.responses.general;
import com.google.gson.annotations.SerializedName;
diff --git a/src/main/java/me/lensfrex/littlebusters/api/v1/beans/responses/general/ResponseCode.java b/src/main/java/me/lensfrex/trailblazer/api/v1/beans/responses/general/ResponseCode.java
similarity index 82%
rename from src/main/java/me/lensfrex/littlebusters/api/v1/beans/responses/general/ResponseCode.java
rename to src/main/java/me/lensfrex/trailblazer/api/v1/beans/responses/general/ResponseCode.java
index 804649f..bb90b71 100644
--- a/src/main/java/me/lensfrex/littlebusters/api/v1/beans/responses/general/ResponseCode.java
+++ b/src/main/java/me/lensfrex/trailblazer/api/v1/beans/responses/general/ResponseCode.java
@@ -1,4 +1,4 @@
-package me.lensfrex.littlebusters.api.v1.beans.responses.general;
+package me.lensfrex.trailblazer.api.v1.beans.responses.general;
public class ResponseCode {
public final static int SERVER_ERROR = -1;
diff --git a/src/main/java/me/lensfrex/littlebusters/api/v1/config/ConfigLoader.java b/src/main/java/me/lensfrex/trailblazer/api/v1/config/ConfigLoader.java
similarity index 86%
rename from src/main/java/me/lensfrex/littlebusters/api/v1/config/ConfigLoader.java
rename to src/main/java/me/lensfrex/trailblazer/api/v1/config/ConfigLoader.java
index 5f1dc8d..ef6bd0c 100644
--- a/src/main/java/me/lensfrex/littlebusters/api/v1/config/ConfigLoader.java
+++ b/src/main/java/me/lensfrex/trailblazer/api/v1/config/ConfigLoader.java
@@ -1,7 +1,7 @@
-package me.lensfrex.littlebusters.api.v1.config;
+package me.lensfrex.trailblazer.api.v1.config;
-import me.lensfrex.littlebusters.api.v1.exceptions.ConfigureFileInvalidException;
-import me.lensfrex.littlebusters.api.v1.utils.IOUtil;
+import me.lensfrex.trailblazer.api.v1.exceptions.ConfigureFileInvalidException;
+import me.lensfrex.trailblazer.api.v1.utils.IOUtil;
import java.io.*;
import java.nio.charset.StandardCharsets;
@@ -28,7 +28,7 @@ public class ConfigLoader {
globalConfigFile.getParentFile().mkdirs();
globalConfigFile.createNewFile();
- InputStream defaultConfigInoutStream = getClass().getResourceAsStream("me/lensfrex/littlebusters/DefaultConfig.conf");
+ InputStream defaultConfigInoutStream = getClass().getResourceAsStream("me/lensfrex/trailblazer/DefaultConfig.conf");
if (defaultConfigInoutStream == null) {
throw new NullPointerException("Can't find the default config file in program.");
}
diff --git a/src/main/java/me/lensfrex/littlebusters/api/v1/config/GlobalConfig.java b/src/main/java/me/lensfrex/trailblazer/api/v1/config/GlobalConfig.java
similarity index 81%
rename from src/main/java/me/lensfrex/littlebusters/api/v1/config/GlobalConfig.java
rename to src/main/java/me/lensfrex/trailblazer/api/v1/config/GlobalConfig.java
index ce44b4a..4048114 100644
--- a/src/main/java/me/lensfrex/littlebusters/api/v1/config/GlobalConfig.java
+++ b/src/main/java/me/lensfrex/trailblazer/api/v1/config/GlobalConfig.java
@@ -1,4 +1,4 @@
-package me.lensfrex.littlebusters.api.v1.config;
+package me.lensfrex.trailblazer.api.v1.config;
import java.util.Properties;
diff --git a/src/main/java/me/lensfrex/littlebusters/api/v1/dao/UserDao.java b/src/main/java/me/lensfrex/trailblazer/api/v1/dao/UserDao.java
similarity index 77%
rename from src/main/java/me/lensfrex/littlebusters/api/v1/dao/UserDao.java
rename to src/main/java/me/lensfrex/trailblazer/api/v1/dao/UserDao.java
index 64e2020..2f35496 100644
--- a/src/main/java/me/lensfrex/littlebusters/api/v1/dao/UserDao.java
+++ b/src/main/java/me/lensfrex/trailblazer/api/v1/dao/UserDao.java
@@ -1,8 +1,8 @@
-package me.lensfrex.littlebusters.api.v1.dao;
+package me.lensfrex.trailblazer.api.v1.dao;
-import me.lensfrex.littlebusters.api.v1.dao.sql.UserDaoInterface;
-import me.lensfrex.littlebusters.api.v1.pojos.UserInformation;
-import me.lensfrex.littlebusters.api.v1.utils.database.MyBatisUtil;
+import me.lensfrex.trailblazer.api.v1.dao.sql.UserDaoInterface;
+import me.lensfrex.trailblazer.api.v1.pojos.UserInformation;
+import me.lensfrex.trailblazer.api.v1.utils.database.MyBatisUtil;
import org.apache.ibatis.session.SqlSession;
public class UserDao {
diff --git a/src/main/java/me/lensfrex/littlebusters/api/v1/dao/sql/KeyDaoInterface.java b/src/main/java/me/lensfrex/trailblazer/api/v1/dao/sql/KeyDaoInterface.java
similarity index 59%
rename from src/main/java/me/lensfrex/littlebusters/api/v1/dao/sql/KeyDaoInterface.java
rename to src/main/java/me/lensfrex/trailblazer/api/v1/dao/sql/KeyDaoInterface.java
index e34f3a9..a5c41ff 100644
--- a/src/main/java/me/lensfrex/littlebusters/api/v1/dao/sql/KeyDaoInterface.java
+++ b/src/main/java/me/lensfrex/trailblazer/api/v1/dao/sql/KeyDaoInterface.java
@@ -1,6 +1,6 @@
-package me.lensfrex.littlebusters.api.v1.dao.sql;
+package me.lensfrex.trailblazer.api.v1.dao.sql;
-import me.lensfrex.littlebusters.api.v1.pojos.StoredKey;
+import me.lensfrex.trailblazer.api.v1.pojos.StoredKey;
public interface KeyDaoInterface {
StoredKey getKeyContentByKeyName(String keyName);
diff --git a/src/main/java/me/lensfrex/littlebusters/api/v1/dao/sql/UserDaoInterface.java b/src/main/java/me/lensfrex/trailblazer/api/v1/dao/sql/UserDaoInterface.java
similarity index 76%
rename from src/main/java/me/lensfrex/littlebusters/api/v1/dao/sql/UserDaoInterface.java
rename to src/main/java/me/lensfrex/trailblazer/api/v1/dao/sql/UserDaoInterface.java
index 3882744..1939036 100644
--- a/src/main/java/me/lensfrex/littlebusters/api/v1/dao/sql/UserDaoInterface.java
+++ b/src/main/java/me/lensfrex/trailblazer/api/v1/dao/sql/UserDaoInterface.java
@@ -1,6 +1,6 @@
-package me.lensfrex.littlebusters.api.v1.dao.sql;
+package me.lensfrex.trailblazer.api.v1.dao.sql;
-import me.lensfrex.littlebusters.api.v1.pojos.UserInformation;
+import me.lensfrex.trailblazer.api.v1.pojos.UserInformation;
import org.apache.ibatis.annotations.Param;
public interface UserDaoInterface {
diff --git a/src/main/java/me/lensfrex/littlebusters/api/v1/exceptions/ConfigureFileInvalidException.java b/src/main/java/me/lensfrex/trailblazer/api/v1/exceptions/ConfigureFileInvalidException.java
similarity index 81%
rename from src/main/java/me/lensfrex/littlebusters/api/v1/exceptions/ConfigureFileInvalidException.java
rename to src/main/java/me/lensfrex/trailblazer/api/v1/exceptions/ConfigureFileInvalidException.java
index 2204c62..4fd905a 100644
--- a/src/main/java/me/lensfrex/littlebusters/api/v1/exceptions/ConfigureFileInvalidException.java
+++ b/src/main/java/me/lensfrex/trailblazer/api/v1/exceptions/ConfigureFileInvalidException.java
@@ -1,4 +1,4 @@
-package me.lensfrex.littlebusters.api.v1.exceptions;
+package me.lensfrex.trailblazer.api.v1.exceptions;
public class ConfigureFileInvalidException extends Exception {
public ConfigureFileInvalidException() {
diff --git a/src/main/java/me/lensfrex/littlebusters/api/v1/exceptions/RequestDataInvalidException.java b/src/main/java/me/lensfrex/trailblazer/api/v1/exceptions/RequestDataInvalidException.java
similarity index 79%
rename from src/main/java/me/lensfrex/littlebusters/api/v1/exceptions/RequestDataInvalidException.java
rename to src/main/java/me/lensfrex/trailblazer/api/v1/exceptions/RequestDataInvalidException.java
index d223022..212e263 100644
--- a/src/main/java/me/lensfrex/littlebusters/api/v1/exceptions/RequestDataInvalidException.java
+++ b/src/main/java/me/lensfrex/trailblazer/api/v1/exceptions/RequestDataInvalidException.java
@@ -1,4 +1,4 @@
-package me.lensfrex.littlebusters.api.v1.exceptions;
+package me.lensfrex.trailblazer.api.v1.exceptions;
public class RequestDataInvalidException extends Exception {
public RequestDataInvalidException(String message) {
diff --git a/src/main/java/me/lensfrex/littlebusters/api/v1/exceptions/user/LoginInfoWrongException.java b/src/main/java/me/lensfrex/trailblazer/api/v1/exceptions/user/LoginInfoWrongException.java
similarity index 77%
rename from src/main/java/me/lensfrex/littlebusters/api/v1/exceptions/user/LoginInfoWrongException.java
rename to src/main/java/me/lensfrex/trailblazer/api/v1/exceptions/user/LoginInfoWrongException.java
index 0bf2b92..b62adb2 100644
--- a/src/main/java/me/lensfrex/littlebusters/api/v1/exceptions/user/LoginInfoWrongException.java
+++ b/src/main/java/me/lensfrex/trailblazer/api/v1/exceptions/user/LoginInfoWrongException.java
@@ -1,4 +1,4 @@
-package me.lensfrex.littlebusters.api.v1.exceptions.user;
+package me.lensfrex.trailblazer.api.v1.exceptions.user;
public class LoginInfoWrongException extends Exception {
public LoginInfoWrongException(String message) {
diff --git a/src/main/java/me/lensfrex/littlebusters/api/v1/pojos/StoredKey.java b/src/main/java/me/lensfrex/trailblazer/api/v1/pojos/StoredKey.java
similarity index 82%
rename from src/main/java/me/lensfrex/littlebusters/api/v1/pojos/StoredKey.java
rename to src/main/java/me/lensfrex/trailblazer/api/v1/pojos/StoredKey.java
index feb5de3..efe7da3 100644
--- a/src/main/java/me/lensfrex/littlebusters/api/v1/pojos/StoredKey.java
+++ b/src/main/java/me/lensfrex/trailblazer/api/v1/pojos/StoredKey.java
@@ -1,4 +1,4 @@
-package me.lensfrex.littlebusters.api.v1.pojos;
+package me.lensfrex.trailblazer.api.v1.pojos;
public class StoredKey {
public String keyContent;
diff --git a/src/main/java/me/lensfrex/littlebusters/api/v1/pojos/UserInformation.java b/src/main/java/me/lensfrex/trailblazer/api/v1/pojos/UserInformation.java
similarity index 91%
rename from src/main/java/me/lensfrex/littlebusters/api/v1/pojos/UserInformation.java
rename to src/main/java/me/lensfrex/trailblazer/api/v1/pojos/UserInformation.java
index 4ea8ddd..aaee112 100644
--- a/src/main/java/me/lensfrex/littlebusters/api/v1/pojos/UserInformation.java
+++ b/src/main/java/me/lensfrex/trailblazer/api/v1/pojos/UserInformation.java
@@ -1,4 +1,4 @@
-package me.lensfrex.littlebusters.api.v1.pojos;
+package me.lensfrex.trailblazer.api.v1.pojos;
public class UserInformation {
public long uid;
diff --git a/src/main/java/me/lensfrex/littlebusters/api/v1/pojos/UserResult.java b/src/main/java/me/lensfrex/trailblazer/api/v1/pojos/UserResult.java
similarity index 87%
rename from src/main/java/me/lensfrex/littlebusters/api/v1/pojos/UserResult.java
rename to src/main/java/me/lensfrex/trailblazer/api/v1/pojos/UserResult.java
index 241918e..f78ac63 100644
--- a/src/main/java/me/lensfrex/littlebusters/api/v1/pojos/UserResult.java
+++ b/src/main/java/me/lensfrex/trailblazer/api/v1/pojos/UserResult.java
@@ -1,4 +1,4 @@
-package me.lensfrex.littlebusters.api.v1.pojos;
+package me.lensfrex.trailblazer.api.v1.pojos;
public class UserResult {
public final int uid;
diff --git a/src/main/java/me/lensfrex/littlebusters/api/v1/service/FeedBack.java b/src/main/java/me/lensfrex/trailblazer/api/v1/service/FeedBack.java
similarity index 87%
rename from src/main/java/me/lensfrex/littlebusters/api/v1/service/FeedBack.java
rename to src/main/java/me/lensfrex/trailblazer/api/v1/service/FeedBack.java
index 7fc403c..77b5414 100644
--- a/src/main/java/me/lensfrex/littlebusters/api/v1/service/FeedBack.java
+++ b/src/main/java/me/lensfrex/trailblazer/api/v1/service/FeedBack.java
@@ -1,4 +1,4 @@
-package me.lensfrex.littlebusters.api.v1.service;
+package me.lensfrex.trailblazer.api.v1.service;
import jakarta.ws.rs.POST;
import jakarta.ws.rs.Path;
diff --git a/src/main/java/me/lensfrex/littlebusters/api/v1/service/Index.java b/src/main/java/me/lensfrex/trailblazer/api/v1/service/Index.java
similarity index 50%
rename from src/main/java/me/lensfrex/littlebusters/api/v1/service/Index.java
rename to src/main/java/me/lensfrex/trailblazer/api/v1/service/Index.java
index b8c0178..dc3430f 100644
--- a/src/main/java/me/lensfrex/littlebusters/api/v1/service/Index.java
+++ b/src/main/java/me/lensfrex/trailblazer/api/v1/service/Index.java
@@ -1,4 +1,4 @@
-package me.lensfrex.littlebusters.api.v1.service;
+package me.lensfrex.trailblazer.api.v1.service;
import jakarta.ws.rs.GET;
import jakarta.ws.rs.Path;
@@ -10,7 +10,7 @@ public class Index {
@GET
@Produces(MediaType.TEXT_HTML)
public String index() {
- return "Here is the API root of LittleBusters.\n" +
- "To use the API currently, please see the LittleBusters RESTFul API document.";
+ return "Here is the API root of Trailblazer.\n" +
+ "To use the API currently, please see the Trailblazer RESTFul API document.";
}
}
diff --git a/src/main/java/me/lensfrex/littlebusters/api/v1/service/login/Login.java b/src/main/java/me/lensfrex/trailblazer/api/v1/service/login/Login.java
similarity index 75%
rename from src/main/java/me/lensfrex/littlebusters/api/v1/service/login/Login.java
rename to src/main/java/me/lensfrex/trailblazer/api/v1/service/login/Login.java
index cf64c44..23bc385 100644
--- a/src/main/java/me/lensfrex/littlebusters/api/v1/service/login/Login.java
+++ b/src/main/java/me/lensfrex/trailblazer/api/v1/service/login/Login.java
@@ -1,4 +1,4 @@
-package me.lensfrex.littlebusters.api.v1.service.login;
+package me.lensfrex.trailblazer.api.v1.service.login;
import com.google.gson.Gson;
import com.google.gson.JsonParseException;
@@ -6,16 +6,16 @@ import jakarta.ws.rs.POST;
import jakarta.ws.rs.Path;
import jakarta.ws.rs.Produces;
import jakarta.ws.rs.core.MediaType;
-import me.lensfrex.littlebusters.api.v1.beans.requests.LoginRequestBody;
-import me.lensfrex.littlebusters.api.v1.beans.responses.LoginResponseData;
-import me.lensfrex.littlebusters.api.v1.beans.responses.general.ErrorResponse;
-import me.lensfrex.littlebusters.api.v1.beans.responses.general.ResponseBase;
-import me.lensfrex.littlebusters.api.v1.beans.responses.general.ResponseCode;
-import me.lensfrex.littlebusters.api.v1.exceptions.user.LoginInfoWrongException;
-import me.lensfrex.littlebusters.api.v1.pojos.UserInformation;
-import me.lensfrex.littlebusters.api.v1.utils.InputChecker;
-import me.lensfrex.littlebusters.api.v1.dao.UserDao;
-import me.lensfrex.littlebusters.api.v1.utils.jwt.JWTManager;
+import me.lensfrex.trailblazer.api.v1.beans.requests.LoginRequestBody;
+import me.lensfrex.trailblazer.api.v1.beans.responses.LoginResponseData;
+import me.lensfrex.trailblazer.api.v1.beans.responses.general.ErrorResponse;
+import me.lensfrex.trailblazer.api.v1.beans.responses.general.ResponseBase;
+import me.lensfrex.trailblazer.api.v1.beans.responses.general.ResponseCode;
+import me.lensfrex.trailblazer.api.v1.exceptions.user.LoginInfoWrongException;
+import me.lensfrex.trailblazer.api.v1.pojos.UserInformation;
+import me.lensfrex.trailblazer.api.v1.utils.InputChecker;
+import me.lensfrex.trailblazer.api.v1.dao.UserDao;
+import me.lensfrex.trailblazer.api.v1.utils.jwt.JWTManager;
import org.mindrot.jbcrypt.BCrypt;
import java.time.Instant;
@@ -56,6 +56,7 @@ public class Login {
LoginResponseData loginResponseData = new LoginResponseData(
userDatabaseInformation.uid,
userDatabaseInformation.uuid,
+ userDatabaseInformation.accountStatus,
userToken,
expireDate.getTime());
diff --git a/src/main/java/me/lensfrex/littlebusters/api/v1/service/register/Register.java b/src/main/java/me/lensfrex/trailblazer/api/v1/service/register/Register.java
similarity index 76%
rename from src/main/java/me/lensfrex/littlebusters/api/v1/service/register/Register.java
rename to src/main/java/me/lensfrex/trailblazer/api/v1/service/register/Register.java
index 581be1d..b6106ad 100644
--- a/src/main/java/me/lensfrex/littlebusters/api/v1/service/register/Register.java
+++ b/src/main/java/me/lensfrex/trailblazer/api/v1/service/register/Register.java
@@ -1,4 +1,4 @@
-package me.lensfrex.littlebusters.api.v1.service.register;
+package me.lensfrex.trailblazer.api.v1.service.register;
import com.google.gson.Gson;
import com.google.gson.JsonParseException;
@@ -6,18 +6,17 @@ import jakarta.ws.rs.POST;
import jakarta.ws.rs.Path;
import jakarta.ws.rs.Produces;
import jakarta.ws.rs.core.MediaType;
-import me.lensfrex.littlebusters.api.v1.beans.requests.RegisterRequestBody;
-import me.lensfrex.littlebusters.api.v1.beans.responses.general.ResponseCode;
-import me.lensfrex.littlebusters.api.v1.beans.responses.RegisterResponseData;
-import me.lensfrex.littlebusters.api.v1.beans.responses.general.ResponseBase;
-import me.lensfrex.littlebusters.api.v1.dao.UserDao;
-import me.lensfrex.littlebusters.api.v1.exceptions.RequestDataInvalidException;
-import me.lensfrex.littlebusters.api.v1.utils.InputChecker;
-import me.lensfrex.littlebusters.api.v1.utils.jwt.JWTManager;
+import me.lensfrex.trailblazer.api.v1.beans.requests.RegisterRequestBody;
+import me.lensfrex.trailblazer.api.v1.beans.responses.general.ResponseCode;
+import me.lensfrex.trailblazer.api.v1.beans.responses.RegisterResponseData;
+import me.lensfrex.trailblazer.api.v1.beans.responses.general.ResponseBase;
+import me.lensfrex.trailblazer.api.v1.dao.UserDao;
+import me.lensfrex.trailblazer.api.v1.exceptions.RequestDataInvalidException;
+import me.lensfrex.trailblazer.api.v1.utils.InputChecker;
+import me.lensfrex.trailblazer.api.v1.utils.jwt.JWTManager;
import org.mindrot.jbcrypt.BCrypt;
import java.time.Instant;
-import java.time.LocalDateTime;
import java.time.temporal.ChronoUnit;
import java.util.Date;
import java.util.UUID;
diff --git a/src/main/java/me/lensfrex/littlebusters/api/v1/service/token/TokenChecker.java b/src/main/java/me/lensfrex/trailblazer/api/v1/service/token/TokenChecker.java
similarity index 76%
rename from src/main/java/me/lensfrex/littlebusters/api/v1/service/token/TokenChecker.java
rename to src/main/java/me/lensfrex/trailblazer/api/v1/service/token/TokenChecker.java
index 640592c..ea5048a 100644
--- a/src/main/java/me/lensfrex/littlebusters/api/v1/service/token/TokenChecker.java
+++ b/src/main/java/me/lensfrex/trailblazer/api/v1/service/token/TokenChecker.java
@@ -1,10 +1,10 @@
-package me.lensfrex.littlebusters.api.v1.service.token;
+package me.lensfrex.trailblazer.api.v1.service.token;
import jakarta.ws.rs.POST;
import jakarta.ws.rs.Path;
import jakarta.ws.rs.Produces;
import jakarta.ws.rs.core.MediaType;
-import me.lensfrex.littlebusters.api.v1.utils.jwt.JWTManager;
+import me.lensfrex.trailblazer.api.v1.utils.jwt.JWTManager;
@Path("/token")
public class TokenChecker {
diff --git a/src/main/java/me/lensfrex/littlebusters/api/v1/service/token/TokenRefresher.java b/src/main/java/me/lensfrex/trailblazer/api/v1/service/token/TokenRefresher.java
similarity index 81%
rename from src/main/java/me/lensfrex/littlebusters/api/v1/service/token/TokenRefresher.java
rename to src/main/java/me/lensfrex/trailblazer/api/v1/service/token/TokenRefresher.java
index 0b9dc07..fbcb2cc 100644
--- a/src/main/java/me/lensfrex/littlebusters/api/v1/service/token/TokenRefresher.java
+++ b/src/main/java/me/lensfrex/trailblazer/api/v1/service/token/TokenRefresher.java
@@ -1,4 +1,4 @@
-package me.lensfrex.littlebusters.api.v1.service.token;
+package me.lensfrex.trailblazer.api.v1.service.token;
import jakarta.ws.rs.POST;
import jakarta.ws.rs.Path;
diff --git a/src/main/java/me/lensfrex/littlebusters/api/v1/utils/IOUtil.java b/src/main/java/me/lensfrex/trailblazer/api/v1/utils/IOUtil.java
similarity index 94%
rename from src/main/java/me/lensfrex/littlebusters/api/v1/utils/IOUtil.java
rename to src/main/java/me/lensfrex/trailblazer/api/v1/utils/IOUtil.java
index 74f3841..d29d74e 100644
--- a/src/main/java/me/lensfrex/littlebusters/api/v1/utils/IOUtil.java
+++ b/src/main/java/me/lensfrex/trailblazer/api/v1/utils/IOUtil.java
@@ -1,4 +1,4 @@
-package me.lensfrex.littlebusters.api.v1.utils;
+package me.lensfrex.trailblazer.api.v1.utils;
import java.io.ByteArrayOutputStream;
diff --git a/src/main/java/me/lensfrex/littlebusters/api/v1/utils/InputChecker.java b/src/main/java/me/lensfrex/trailblazer/api/v1/utils/InputChecker.java
similarity index 89%
rename from src/main/java/me/lensfrex/littlebusters/api/v1/utils/InputChecker.java
rename to src/main/java/me/lensfrex/trailblazer/api/v1/utils/InputChecker.java
index 8df2201..7c21154 100644
--- a/src/main/java/me/lensfrex/littlebusters/api/v1/utils/InputChecker.java
+++ b/src/main/java/me/lensfrex/trailblazer/api/v1/utils/InputChecker.java
@@ -1,4 +1,4 @@
-package me.lensfrex.littlebusters.api.v1.utils;
+package me.lensfrex.trailblazer.api.v1.utils;
public class InputChecker {
diff --git a/src/main/java/me/lensfrex/littlebusters/api/v1/utils/Time.java b/src/main/java/me/lensfrex/trailblazer/api/v1/utils/Time.java
similarity index 81%
rename from src/main/java/me/lensfrex/littlebusters/api/v1/utils/Time.java
rename to src/main/java/me/lensfrex/trailblazer/api/v1/utils/Time.java
index 251f6a9..b2ae272 100644
--- a/src/main/java/me/lensfrex/littlebusters/api/v1/utils/Time.java
+++ b/src/main/java/me/lensfrex/trailblazer/api/v1/utils/Time.java
@@ -1,4 +1,4 @@
-package me.lensfrex.littlebusters.api.v1.utils;
+package me.lensfrex.trailblazer.api.v1.utils;
import java.time.LocalDateTime;
diff --git a/src/main/java/me/lensfrex/littlebusters/api/v1/utils/database/MyBatisUtil.java b/src/main/java/me/lensfrex/trailblazer/api/v1/utils/database/MyBatisUtil.java
similarity index 91%
rename from src/main/java/me/lensfrex/littlebusters/api/v1/utils/database/MyBatisUtil.java
rename to src/main/java/me/lensfrex/trailblazer/api/v1/utils/database/MyBatisUtil.java
index 960646a..5be6ce1 100644
--- a/src/main/java/me/lensfrex/littlebusters/api/v1/utils/database/MyBatisUtil.java
+++ b/src/main/java/me/lensfrex/trailblazer/api/v1/utils/database/MyBatisUtil.java
@@ -1,4 +1,4 @@
-package me.lensfrex.littlebusters.api.v1.utils.database;
+package me.lensfrex.trailblazer.api.v1.utils.database;
import org.apache.ibatis.io.Resources;
import org.apache.ibatis.session.SqlSession;
diff --git a/src/main/java/me/lensfrex/littlebusters/api/v1/utils/jwt/JWTManager.java b/src/main/java/me/lensfrex/trailblazer/api/v1/utils/jwt/JWTManager.java
similarity index 92%
rename from src/main/java/me/lensfrex/littlebusters/api/v1/utils/jwt/JWTManager.java
rename to src/main/java/me/lensfrex/trailblazer/api/v1/utils/jwt/JWTManager.java
index 5401b21..8ce42b1 100644
--- a/src/main/java/me/lensfrex/littlebusters/api/v1/utils/jwt/JWTManager.java
+++ b/src/main/java/me/lensfrex/trailblazer/api/v1/utils/jwt/JWTManager.java
@@ -1,10 +1,9 @@
-package me.lensfrex.littlebusters.api.v1.utils.jwt;
+package me.lensfrex.trailblazer.api.v1.utils.jwt;
import io.jsonwebtoken.*;
import io.jsonwebtoken.security.Keys;
import java.security.Key;
-import java.time.LocalDate;
import java.util.Date;
import java.util.HashMap;
import java.util.Map;
diff --git a/src/main/java/me/lensfrex/trailblazer/api/v1/utils/key/KeyManager.java b/src/main/java/me/lensfrex/trailblazer/api/v1/utils/key/KeyManager.java
new file mode 100644
index 0000000..078e761
--- /dev/null
+++ b/src/main/java/me/lensfrex/trailblazer/api/v1/utils/key/KeyManager.java
@@ -0,0 +1,4 @@
+package me.lensfrex.trailblazer.api.v1.utils.key;
+
+public class KeyManager {
+}
diff --git a/src/main/resources/mappers/DatabaseInitSqlMapper.xml b/src/main/resources/mappers/DatabaseInitSqlMapper.xml
index 0922d52..2f2a731 100644
--- a/src/main/resources/mappers/DatabaseInitSqlMapper.xml
+++ b/src/main/resources/mappers/DatabaseInitSqlMapper.xml
@@ -4,7 +4,7 @@
PUBLIC "-//mybatis.org//DTD Config 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-
+
CREATE TABLE `account_basic` (
`uid` int(18) unsigned unique NOT NULL AUTO_INCREMENT COMMENT '用户id,1起,给人看的',
diff --git a/src/main/resources/mappers/KeySqlMapper.xml b/src/main/resources/mappers/KeySqlMapper.xml
index a99b52b..22b6be8 100644
--- a/src/main/resources/mappers/KeySqlMapper.xml
+++ b/src/main/resources/mappers/KeySqlMapper.xml
@@ -4,16 +4,16 @@
PUBLIC "-//mybatis.org//DTD Config 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-
-
\ No newline at end of file
diff --git a/src/main/resources/mappers/UserSqlMapper.xml b/src/main/resources/mappers/UserSqlMapper.xml
index 1272ec8..b087594 100644
--- a/src/main/resources/mappers/UserSqlMapper.xml
+++ b/src/main/resources/mappers/UserSqlMapper.xml
@@ -4,8 +4,8 @@
PUBLIC "-//mybatis.org//DTD Config 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-
-
+
+
select uid, uuid, passwd as password, deleted, account_status as accountStstus
from `account_basic`
where user_name = #{userName}
@@ -16,7 +16,7 @@
- insert into `LittleBusters`.`account_basic` (`uuid`, `user_name`, `passwd`)
+ insert into `Trailblazer`.`account_basic` (`uuid`, `user_name`, `passwd`)
values (#{uuid}, #{userName}, #{password})
diff --git a/src/main/resources/me/lensfrex/littlebusters/DefaultConfig.conf b/src/main/resources/me/lensfrex/trailblazer/DefaultConfig.conf
similarity index 73%
rename from src/main/resources/me/lensfrex/littlebusters/DefaultConfig.conf
rename to src/main/resources/me/lensfrex/trailblazer/DefaultConfig.conf
index d855150..ce6bdb0 100644
--- a/src/main/resources/me/lensfrex/littlebusters/DefaultConfig.conf
+++ b/src/main/resources/me/lensfrex/trailblazer/DefaultConfig.conf
@@ -1,6 +1,6 @@
# 数据库的类型,目前仅支持mysql和mariadb两种sql服务器
database.dbType = "mariadb"
-database.url = "jdbc:mariadb://localhost:3386/LittleBusters?characterEncoding=utf-8"
+database.url = "jdbc:mariadb://localhost:3386/Trailblazer?characterEncoding=utf-8"
database.userName = "root"
database.password = "321654mid"
diff --git a/src/main/webapp/WEB-INF/web.xml b/src/main/webapp/WEB-INF/web.xml
index 21b66f4..6192d0f 100644
--- a/src/main/webapp/WEB-INF/web.xml
+++ b/src/main/webapp/WEB-INF/web.xml
@@ -5,12 +5,12 @@
version="4.0">
- LittleBustersApiV1
+ TrailblazerApiV1
org.glassfish.jersey.servlet.ServletContainer
jersey.config.server.provider.packages
- me.lensfrex.littlebusters
+ me.lensfrex.trailblazer
@@ -20,7 +20,7 @@
- LittleBustersApiV1
+ TrailblazerApiV1
/api/v1/*