ключ теперь не поле бд а отдельный файл на сервере.

This commit is contained in:
2025-02-19 01:10:25 +03:00
parent 7eba13370d
commit 024f274360
8 changed files with 37 additions and 26 deletions

View File

@@ -5,6 +5,10 @@ import Common.Utils.TextLog;
import _VisualDVM.ComponentsServer.BugReport.BugReport;
import _VisualDVM.Global;
import com.sun.org.glassfish.gmbal.Description;
import org.apache.commons.io.FileUtils;
import org.apache.commons.lang.RandomStringUtils;
import java.io.File;
public class UserAccount extends iDBObject {
public String name = "";
public String email = "";
@@ -12,7 +16,6 @@ public class UserAccount extends iDBObject {
public String telegram_name="";
@Description("DEFAULT 1")
public int subscribe_active = 1;
public String security_key = "";
@Description("DEFAULT 'Undefined'")
public AccountRole role = AccountRole.Undefined; //права доступа
public UserAccount(){
@@ -29,13 +32,21 @@ public class UserAccount extends iDBObject {
email = src_.email;
telegram_name=src_.telegram_name;
subscribe_active=src_.subscribe_active;
security_key = src_.security_key;
role = src_.role;
}
public UserAccount(String name_in, String email_in){
name = name_in;
email=email_in;
}
public File getClientKeyFile(){
return new File(Global.KeysDirectory,"key");
}
public File getServerKeyFile(){
return new File(Global.KeysDirectory,String.valueOf(id));
}
public String getKey() throws Exception{
return FileUtils.readFileToString(getServerKeyFile());
}
//todo часть устарело.разобрать.
public boolean CheckRegistered(TextLog Log) {
if (role.equals(AccountRole.Undefined)) {

View File

@@ -8,9 +8,9 @@ public class UserAccountsDBTable extends iDBTable<UserAccount> {
public UserAccountsDBTable() {
super(UserAccount.class);
}
public UserAccount getByKey(String key_in){
public UserAccount getByKey(String key_in) throws Exception{
for (UserAccount userAccount: Data.values()){
if (userAccount.security_key.equals(key_in))
if (userAccount.getKey().equals(key_in))
return userAccount;
}
return null;