diff --git a/dscape-cache/pom.xml b/dscape-cache/pom.xml
new file mode 100644
index 0000000..3048d56
--- /dev/null
+++ b/dscape-cache/pom.xml
@@ -0,0 +1,77 @@
+
+
+
+
+
+ dscape-server
+ net.lensfrex
+ 0.0.1-dev
+
+ 4.0.0
+
+ dscape-cache
+
+
+ 11
+ 11
+ UTF-8
+
+
+
+
+ net.lensfrex
+ dscape-entities
+ 0.0.1-dev
+
+
+ net.lensfrex
+ dscape-utils
+ 0.0.1-dev
+
+
+
+ org.springframework.boot
+ spring-boot-starter-data-redis
+ 2.7.3
+
+
+ org.apache.commons
+ commons-pool2
+
+
+
+ com.fasterxml.jackson.core
+ jackson-core
+
+
+ com.fasterxml.jackson.core
+ jackson-databind
+
+
+ com.fasterxml.jackson.core
+ jackson-annotations
+
+
+
+ org.apache.commons
+ commons-lang3
+
+
+
+
+
+
+ org.springframework.boot
+ spring-boot-maven-plugin
+
+ exec
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/main/java/net/lensfrex/dscape/cache/UserBasicCache.java b/dscape-cache/src/main/java/net/lensfrex/dscape/cache/UserBasicCache.java
similarity index 93%
rename from src/main/java/net/lensfrex/dscape/cache/UserBasicCache.java
rename to dscape-cache/src/main/java/net/lensfrex/dscape/cache/UserBasicCache.java
index 09c8780..d30f578 100644
--- a/src/main/java/net/lensfrex/dscape/cache/UserBasicCache.java
+++ b/dscape-cache/src/main/java/net/lensfrex/dscape/cache/UserBasicCache.java
@@ -2,12 +2,20 @@
* Class created by lensfrex.
*/
+/*
+ * Class created by lensfrex.
+ */
+
+/*
+ * Class created by lensfrex.
+ */
+
package net.lensfrex.dscape.cache;
-import lombok.extern.slf4j.Slf4j;
import net.lensfrex.dscape.configure.GlobalConstant;
import net.lensfrex.dscape.dao.entity.UserBasic;
import net.lensfrex.dscape.utils.ObjectJsonSerializer;
+import lombok.extern.slf4j.Slf4j;
import org.springframework.data.redis.core.RedisTemplate;
import org.springframework.stereotype.Component;
diff --git a/src/main/java/net/lensfrex/dscape/configure/GlobalConstant.java b/dscape-cache/src/main/java/net/lensfrex/dscape/configure/GlobalConstant.java
similarity index 81%
rename from src/main/java/net/lensfrex/dscape/configure/GlobalConstant.java
rename to dscape-cache/src/main/java/net/lensfrex/dscape/configure/GlobalConstant.java
index 0333343..41ebae1 100644
--- a/src/main/java/net/lensfrex/dscape/configure/GlobalConstant.java
+++ b/dscape-cache/src/main/java/net/lensfrex/dscape/configure/GlobalConstant.java
@@ -2,6 +2,14 @@
* Class created by lensfrex.
*/
+/*
+ * Class created by lensfrex.
+ */
+
+/*
+ * Class created by lensfrex.
+ */
+
package net.lensfrex.dscape.configure;
public class GlobalConstant {
diff --git a/src/main/java/net/lensfrex/dscape/configure/RedisConfigure.java b/dscape-cache/src/main/java/net/lensfrex/dscape/configure/RedisConfigure.java
similarity index 92%
rename from src/main/java/net/lensfrex/dscape/configure/RedisConfigure.java
rename to dscape-cache/src/main/java/net/lensfrex/dscape/configure/RedisConfigure.java
index f03bc2e..b1122cb 100644
--- a/src/main/java/net/lensfrex/dscape/configure/RedisConfigure.java
+++ b/dscape-cache/src/main/java/net/lensfrex/dscape/configure/RedisConfigure.java
@@ -1,3 +1,11 @@
+/*
+ * Class created by lensfrex.
+ */
+
+/*
+ * Class created by lensfrex.
+ */
+
package net.lensfrex.dscape.configure;
import org.springframework.cache.annotation.CachingConfigurerSupport;
diff --git a/dscape-compute/pom.xml b/dscape-compute/pom.xml
new file mode 100644
index 0000000..88c8f5a
--- /dev/null
+++ b/dscape-compute/pom.xml
@@ -0,0 +1,28 @@
+
+
+
+
+ dscape-server
+ net.lensfrex
+ 0.0.1-dev
+
+ 4.0.0
+
+ dscape-compute
+
+
+ 11
+ 11
+ UTF-8
+
+
+
+
+ net.lensfrex
+ dscape-dao
+ 0.0.1-dev
+
+
+
\ No newline at end of file
diff --git a/dscape-dao/pom.xml b/dscape-dao/pom.xml
new file mode 100644
index 0000000..8053497
--- /dev/null
+++ b/dscape-dao/pom.xml
@@ -0,0 +1,67 @@
+
+
+
+
+
+ dscape-server
+ net.lensfrex
+ 0.0.1-dev
+
+ 4.0.0
+
+ dscape-dao
+
+
+ 11
+ 11
+ UTF-8
+
+
+
+
+ net.lensfrex
+ dscape-entities
+ 0.0.1-dev
+
+
+
+ com.baomidou
+ mybatis-plus-boot-starter
+ 3.5.2
+
+
+
+ org.mariadb.jdbc
+ mariadb-java-client
+ 3.0.6
+
+
+
+ com.alibaba
+ druid
+ 1.2.11
+
+
+ com.alibaba
+ druid-spring-boot-starter
+ 1.2.11
+
+
+
+
+
+
+ org.springframework.boot
+ spring-boot-maven-plugin
+
+ exec
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/main/java/net/lensfrex/dscape/configure/MybatisPlusConfigure.java b/dscape-dao/src/main/java/net/lensfrex/dscape/dao/configure/MybatisPlusConfigure.java
similarity index 92%
rename from src/main/java/net/lensfrex/dscape/configure/MybatisPlusConfigure.java
rename to dscape-dao/src/main/java/net/lensfrex/dscape/dao/configure/MybatisPlusConfigure.java
index 0d8fe13..9e4dec1 100644
--- a/src/main/java/net/lensfrex/dscape/configure/MybatisPlusConfigure.java
+++ b/dscape-dao/src/main/java/net/lensfrex/dscape/dao/configure/MybatisPlusConfigure.java
@@ -1,4 +1,16 @@
-package net.lensfrex.dscape.configure;
+/*
+ * Class created by lensfrex.
+ */
+
+/*
+ * Class created by lensfrex.
+ */
+
+/*
+ * Class created by lensfrex.
+ */
+
+package net.lensfrex.dscape.dao.configure;
import com.baomidou.mybatisplus.annotation.DbType;
import com.baomidou.mybatisplus.extension.plugins.MybatisPlusInterceptor;
diff --git a/src/main/java/net/lensfrex/dscape/dao/mapper/BlackListMapper.java b/dscape-dao/src/main/java/net/lensfrex/dscape/dao/mapper/BlackListMapper.java
similarity index 77%
rename from src/main/java/net/lensfrex/dscape/dao/mapper/BlackListMapper.java
rename to dscape-dao/src/main/java/net/lensfrex/dscape/dao/mapper/BlackListMapper.java
index ff0a084..9cd5163 100644
--- a/src/main/java/net/lensfrex/dscape/dao/mapper/BlackListMapper.java
+++ b/dscape-dao/src/main/java/net/lensfrex/dscape/dao/mapper/BlackListMapper.java
@@ -1,3 +1,11 @@
+/*
+ * Class created by lensfrex.
+ */
+
+/*
+ * Class created by lensfrex.
+ */
+
package net.lensfrex.dscape.dao.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
diff --git a/src/main/java/net/lensfrex/dscape/dao/mapper/ComputeHistoryMapper.java b/dscape-dao/src/main/java/net/lensfrex/dscape/dao/mapper/ComputeHistoryMapper.java
similarity index 78%
rename from src/main/java/net/lensfrex/dscape/dao/mapper/ComputeHistoryMapper.java
rename to dscape-dao/src/main/java/net/lensfrex/dscape/dao/mapper/ComputeHistoryMapper.java
index 4c9aa5b..95f5248 100644
--- a/src/main/java/net/lensfrex/dscape/dao/mapper/ComputeHistoryMapper.java
+++ b/dscape-dao/src/main/java/net/lensfrex/dscape/dao/mapper/ComputeHistoryMapper.java
@@ -1,3 +1,11 @@
+/*
+ * Class created by lensfrex.
+ */
+
+/*
+ * Class created by lensfrex.
+ */
+
package net.lensfrex.dscape.dao.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
diff --git a/src/main/java/net/lensfrex/dscape/dao/mapper/PatientDataMapper.java b/dscape-dao/src/main/java/net/lensfrex/dscape/dao/mapper/PatientDataMapper.java
similarity index 78%
rename from src/main/java/net/lensfrex/dscape/dao/mapper/PatientDataMapper.java
rename to dscape-dao/src/main/java/net/lensfrex/dscape/dao/mapper/PatientDataMapper.java
index 563fe5d..753ee17 100644
--- a/src/main/java/net/lensfrex/dscape/dao/mapper/PatientDataMapper.java
+++ b/dscape-dao/src/main/java/net/lensfrex/dscape/dao/mapper/PatientDataMapper.java
@@ -1,3 +1,11 @@
+/*
+ * Class created by lensfrex.
+ */
+
+/*
+ * Class created by lensfrex.
+ */
+
package net.lensfrex.dscape.dao.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
diff --git a/src/main/java/net/lensfrex/dscape/dao/mapper/RegisterAppliesMapper.java b/dscape-dao/src/main/java/net/lensfrex/dscape/dao/mapper/RegisterAppliesMapper.java
similarity index 78%
rename from src/main/java/net/lensfrex/dscape/dao/mapper/RegisterAppliesMapper.java
rename to dscape-dao/src/main/java/net/lensfrex/dscape/dao/mapper/RegisterAppliesMapper.java
index a40b82c..109fab5 100644
--- a/src/main/java/net/lensfrex/dscape/dao/mapper/RegisterAppliesMapper.java
+++ b/dscape-dao/src/main/java/net/lensfrex/dscape/dao/mapper/RegisterAppliesMapper.java
@@ -1,3 +1,11 @@
+/*
+ * Class created by lensfrex.
+ */
+
+/*
+ * Class created by lensfrex.
+ */
+
package net.lensfrex.dscape.dao.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
diff --git a/src/main/java/net/lensfrex/dscape/dao/mapper/RolePermissionMapper.java b/dscape-dao/src/main/java/net/lensfrex/dscape/dao/mapper/RolePermissionMapper.java
similarity index 78%
rename from src/main/java/net/lensfrex/dscape/dao/mapper/RolePermissionMapper.java
rename to dscape-dao/src/main/java/net/lensfrex/dscape/dao/mapper/RolePermissionMapper.java
index e7b7f96..0ef7dd2 100644
--- a/src/main/java/net/lensfrex/dscape/dao/mapper/RolePermissionMapper.java
+++ b/dscape-dao/src/main/java/net/lensfrex/dscape/dao/mapper/RolePermissionMapper.java
@@ -1,3 +1,11 @@
+/*
+ * Class created by lensfrex.
+ */
+
+/*
+ * Class created by lensfrex.
+ */
+
package net.lensfrex.dscape.dao.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
diff --git a/src/main/java/net/lensfrex/dscape/dao/mapper/UserBasicMapper.java b/dscape-dao/src/main/java/net/lensfrex/dscape/dao/mapper/UserBasicMapper.java
similarity index 77%
rename from src/main/java/net/lensfrex/dscape/dao/mapper/UserBasicMapper.java
rename to dscape-dao/src/main/java/net/lensfrex/dscape/dao/mapper/UserBasicMapper.java
index 3838062..b3a6859 100644
--- a/src/main/java/net/lensfrex/dscape/dao/mapper/UserBasicMapper.java
+++ b/dscape-dao/src/main/java/net/lensfrex/dscape/dao/mapper/UserBasicMapper.java
@@ -1,3 +1,11 @@
+/*
+ * Class created by lensfrex.
+ */
+
+/*
+ * Class created by lensfrex.
+ */
+
package net.lensfrex.dscape.dao.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
diff --git a/src/main/java/net/lensfrex/dscape/dao/mapper/UserRoleMapper.java b/dscape-dao/src/main/java/net/lensfrex/dscape/dao/mapper/UserRoleMapper.java
similarity index 77%
rename from src/main/java/net/lensfrex/dscape/dao/mapper/UserRoleMapper.java
rename to dscape-dao/src/main/java/net/lensfrex/dscape/dao/mapper/UserRoleMapper.java
index 50edb3e..a7f8bcf 100644
--- a/src/main/java/net/lensfrex/dscape/dao/mapper/UserRoleMapper.java
+++ b/dscape-dao/src/main/java/net/lensfrex/dscape/dao/mapper/UserRoleMapper.java
@@ -1,3 +1,11 @@
+/*
+ * Class created by lensfrex.
+ */
+
+/*
+ * Class created by lensfrex.
+ */
+
package net.lensfrex.dscape.dao.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
diff --git a/src/main/java/net/lensfrex/dscape/dao/service/BlackListService.java b/dscape-dao/src/main/java/net/lensfrex/dscape/dao/service/BlackListService.java
similarity index 78%
rename from src/main/java/net/lensfrex/dscape/dao/service/BlackListService.java
rename to dscape-dao/src/main/java/net/lensfrex/dscape/dao/service/BlackListService.java
index 5f56805..79c42d3 100644
--- a/src/main/java/net/lensfrex/dscape/dao/service/BlackListService.java
+++ b/dscape-dao/src/main/java/net/lensfrex/dscape/dao/service/BlackListService.java
@@ -1,3 +1,11 @@
+/*
+ * Class created by lensfrex.
+ */
+
+/*
+ * Class created by lensfrex.
+ */
+
package net.lensfrex.dscape.dao.service;
import com.baomidou.mybatisplus.extension.service.IService;
diff --git a/src/main/java/net/lensfrex/dscape/dao/service/ComputeHistoryService.java b/dscape-dao/src/main/java/net/lensfrex/dscape/dao/service/ComputeHistoryService.java
similarity index 87%
rename from src/main/java/net/lensfrex/dscape/dao/service/ComputeHistoryService.java
rename to dscape-dao/src/main/java/net/lensfrex/dscape/dao/service/ComputeHistoryService.java
index 890379c..ebe4cd8 100644
--- a/src/main/java/net/lensfrex/dscape/dao/service/ComputeHistoryService.java
+++ b/dscape-dao/src/main/java/net/lensfrex/dscape/dao/service/ComputeHistoryService.java
@@ -1,3 +1,11 @@
+/*
+ * Class created by lensfrex.
+ */
+
+/*
+ * Class created by lensfrex.
+ */
+
package net.lensfrex.dscape.dao.service;
import com.baomidou.mybatisplus.core.toolkit.support.SFunction;
diff --git a/src/main/java/net/lensfrex/dscape/dao/service/PatientDataService.java b/dscape-dao/src/main/java/net/lensfrex/dscape/dao/service/PatientDataService.java
similarity index 81%
rename from src/main/java/net/lensfrex/dscape/dao/service/PatientDataService.java
rename to dscape-dao/src/main/java/net/lensfrex/dscape/dao/service/PatientDataService.java
index bc2118c..b944c2c 100644
--- a/src/main/java/net/lensfrex/dscape/dao/service/PatientDataService.java
+++ b/dscape-dao/src/main/java/net/lensfrex/dscape/dao/service/PatientDataService.java
@@ -1,3 +1,11 @@
+/*
+ * Class created by lensfrex.
+ */
+
+/*
+ * Class created by lensfrex.
+ */
+
package net.lensfrex.dscape.dao.service;
import com.baomidou.mybatisplus.extension.service.IService;
diff --git a/src/main/java/net/lensfrex/dscape/dao/service/RegisterAppliesService.java b/dscape-dao/src/main/java/net/lensfrex/dscape/dao/service/RegisterAppliesService.java
similarity index 79%
rename from src/main/java/net/lensfrex/dscape/dao/service/RegisterAppliesService.java
rename to dscape-dao/src/main/java/net/lensfrex/dscape/dao/service/RegisterAppliesService.java
index 146aa4e..8e60636 100644
--- a/src/main/java/net/lensfrex/dscape/dao/service/RegisterAppliesService.java
+++ b/dscape-dao/src/main/java/net/lensfrex/dscape/dao/service/RegisterAppliesService.java
@@ -1,3 +1,11 @@
+/*
+ * Class created by lensfrex.
+ */
+
+/*
+ * Class created by lensfrex.
+ */
+
package net.lensfrex.dscape.dao.service;
import com.baomidou.mybatisplus.extension.service.IService;
diff --git a/src/main/java/net/lensfrex/dscape/dao/service/RolePermissionService.java b/dscape-dao/src/main/java/net/lensfrex/dscape/dao/service/RolePermissionService.java
similarity index 87%
rename from src/main/java/net/lensfrex/dscape/dao/service/RolePermissionService.java
rename to dscape-dao/src/main/java/net/lensfrex/dscape/dao/service/RolePermissionService.java
index 5898f8e..ff4c4ef 100644
--- a/src/main/java/net/lensfrex/dscape/dao/service/RolePermissionService.java
+++ b/dscape-dao/src/main/java/net/lensfrex/dscape/dao/service/RolePermissionService.java
@@ -1,3 +1,11 @@
+/*
+ * Class created by lensfrex.
+ */
+
+/*
+ * Class created by lensfrex.
+ */
+
package net.lensfrex.dscape.dao.service;
import com.baomidou.mybatisplus.extension.service.IService;
diff --git a/src/main/java/net/lensfrex/dscape/dao/service/UserBasicService.java b/dscape-dao/src/main/java/net/lensfrex/dscape/dao/service/UserBasicService.java
similarity index 89%
rename from src/main/java/net/lensfrex/dscape/dao/service/UserBasicService.java
rename to dscape-dao/src/main/java/net/lensfrex/dscape/dao/service/UserBasicService.java
index 9112a09..82eba69 100644
--- a/src/main/java/net/lensfrex/dscape/dao/service/UserBasicService.java
+++ b/dscape-dao/src/main/java/net/lensfrex/dscape/dao/service/UserBasicService.java
@@ -1,3 +1,11 @@
+/*
+ * Class created by lensfrex.
+ */
+
+/*
+ * Class created by lensfrex.
+ */
+
package net.lensfrex.dscape.dao.service;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
diff --git a/src/main/java/net/lensfrex/dscape/dao/service/UserRoleService.java b/dscape-dao/src/main/java/net/lensfrex/dscape/dao/service/UserRoleService.java
similarity index 83%
rename from src/main/java/net/lensfrex/dscape/dao/service/UserRoleService.java
rename to dscape-dao/src/main/java/net/lensfrex/dscape/dao/service/UserRoleService.java
index e184adf..33aed93 100644
--- a/src/main/java/net/lensfrex/dscape/dao/service/UserRoleService.java
+++ b/dscape-dao/src/main/java/net/lensfrex/dscape/dao/service/UserRoleService.java
@@ -1,3 +1,11 @@
+/*
+ * Class created by lensfrex.
+ */
+
+/*
+ * Class created by lensfrex.
+ */
+
package net.lensfrex.dscape.dao.service;
import com.baomidou.mybatisplus.extension.service.IService;
diff --git a/src/main/java/net/lensfrex/dscape/dao/service/impl/BlackListServiceImpl.java b/dscape-dao/src/main/java/net/lensfrex/dscape/dao/service/impl/BlackListServiceImpl.java
similarity index 82%
rename from src/main/java/net/lensfrex/dscape/dao/service/impl/BlackListServiceImpl.java
rename to dscape-dao/src/main/java/net/lensfrex/dscape/dao/service/impl/BlackListServiceImpl.java
index abe66c9..07e3c02 100644
--- a/src/main/java/net/lensfrex/dscape/dao/service/impl/BlackListServiceImpl.java
+++ b/dscape-dao/src/main/java/net/lensfrex/dscape/dao/service/impl/BlackListServiceImpl.java
@@ -2,6 +2,14 @@
* Class created by lensfrex.
*/
+/*
+ * Class created by lensfrex.
+ */
+
+/*
+ * Class created by lensfrex.
+ */
+
package net.lensfrex.dscape.dao.service.impl;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
diff --git a/src/main/java/net/lensfrex/dscape/dao/service/impl/ComputeHistoryServiceImpl.java b/dscape-dao/src/main/java/net/lensfrex/dscape/dao/service/impl/ComputeHistoryServiceImpl.java
similarity index 93%
rename from src/main/java/net/lensfrex/dscape/dao/service/impl/ComputeHistoryServiceImpl.java
rename to dscape-dao/src/main/java/net/lensfrex/dscape/dao/service/impl/ComputeHistoryServiceImpl.java
index 74e1a38..35eef8a 100644
--- a/src/main/java/net/lensfrex/dscape/dao/service/impl/ComputeHistoryServiceImpl.java
+++ b/dscape-dao/src/main/java/net/lensfrex/dscape/dao/service/impl/ComputeHistoryServiceImpl.java
@@ -2,6 +2,14 @@
* Class created by lensfrex.
*/
+/*
+ * Class created by lensfrex.
+ */
+
+/*
+ * Class created by lensfrex.
+ */
+
package net.lensfrex.dscape.dao.service.impl;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
diff --git a/src/main/java/net/lensfrex/dscape/dao/service/impl/PatientDataServiceImpl.java b/dscape-dao/src/main/java/net/lensfrex/dscape/dao/service/impl/PatientDataServiceImpl.java
similarity index 90%
rename from src/main/java/net/lensfrex/dscape/dao/service/impl/PatientDataServiceImpl.java
rename to dscape-dao/src/main/java/net/lensfrex/dscape/dao/service/impl/PatientDataServiceImpl.java
index bdcaab8..f41b2a5 100644
--- a/src/main/java/net/lensfrex/dscape/dao/service/impl/PatientDataServiceImpl.java
+++ b/dscape-dao/src/main/java/net/lensfrex/dscape/dao/service/impl/PatientDataServiceImpl.java
@@ -2,13 +2,21 @@
* Class created by lensfrex.
*/
+/*
+ * Class created by lensfrex.
+ */
+
+/*
+ * Class created by lensfrex.
+ */
+
package net.lensfrex.dscape.dao.service.impl;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import net.lensfrex.dscape.dao.entity.PatientData;
-import net.lensfrex.dscape.dao.mapper.PatientDataMapper;
import net.lensfrex.dscape.dao.service.PatientDataService;
+import net.lensfrex.dscape.dao.mapper.PatientDataMapper;
import org.springframework.stereotype.Service;
import java.util.ArrayList;
diff --git a/src/main/java/net/lensfrex/dscape/dao/service/impl/RegisterAppliesServiceImpl.java b/dscape-dao/src/main/java/net/lensfrex/dscape/dao/service/impl/RegisterAppliesServiceImpl.java
similarity index 82%
rename from src/main/java/net/lensfrex/dscape/dao/service/impl/RegisterAppliesServiceImpl.java
rename to dscape-dao/src/main/java/net/lensfrex/dscape/dao/service/impl/RegisterAppliesServiceImpl.java
index 2433383..cd205ef 100644
--- a/src/main/java/net/lensfrex/dscape/dao/service/impl/RegisterAppliesServiceImpl.java
+++ b/dscape-dao/src/main/java/net/lensfrex/dscape/dao/service/impl/RegisterAppliesServiceImpl.java
@@ -2,12 +2,20 @@
* Class created by lensfrex.
*/
+/*
+ * Class created by lensfrex.
+ */
+
+/*
+ * Class created by lensfrex.
+ */
+
package net.lensfrex.dscape.dao.service.impl;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import net.lensfrex.dscape.dao.entity.RegisterApplies;
import net.lensfrex.dscape.dao.mapper.RegisterAppliesMapper;
import net.lensfrex.dscape.dao.service.RegisterAppliesService;
+import net.lensfrex.dscape.dao.entity.RegisterApplies;
public class RegisterAppliesServiceImpl extends ServiceImpl implements RegisterAppliesService {
diff --git a/src/main/java/net/lensfrex/dscape/dao/service/impl/RolePermissionServiceImpl.java b/dscape-dao/src/main/java/net/lensfrex/dscape/dao/service/impl/RolePermissionServiceImpl.java
similarity index 92%
rename from src/main/java/net/lensfrex/dscape/dao/service/impl/RolePermissionServiceImpl.java
rename to dscape-dao/src/main/java/net/lensfrex/dscape/dao/service/impl/RolePermissionServiceImpl.java
index 22b6fb8..091b130 100644
--- a/src/main/java/net/lensfrex/dscape/dao/service/impl/RolePermissionServiceImpl.java
+++ b/dscape-dao/src/main/java/net/lensfrex/dscape/dao/service/impl/RolePermissionServiceImpl.java
@@ -2,6 +2,14 @@
* Class created by lensfrex.
*/
+/*
+ * Class created by lensfrex.
+ */
+
+/*
+ * Class created by lensfrex.
+ */
+
package net.lensfrex.dscape.dao.service.impl;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
diff --git a/src/main/java/net/lensfrex/dscape/dao/service/impl/UserBasicServiceImpl.java b/dscape-dao/src/main/java/net/lensfrex/dscape/dao/service/impl/UserBasicServiceImpl.java
similarity index 92%
rename from src/main/java/net/lensfrex/dscape/dao/service/impl/UserBasicServiceImpl.java
rename to dscape-dao/src/main/java/net/lensfrex/dscape/dao/service/impl/UserBasicServiceImpl.java
index 8a64750..50456be 100644
--- a/src/main/java/net/lensfrex/dscape/dao/service/impl/UserBasicServiceImpl.java
+++ b/dscape-dao/src/main/java/net/lensfrex/dscape/dao/service/impl/UserBasicServiceImpl.java
@@ -2,6 +2,14 @@
* Class created by lensfrex.
*/
+/*
+ * Class created by lensfrex.
+ */
+
+/*
+ * Class created by lensfrex.
+ */
+
package net.lensfrex.dscape.dao.service.impl;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -9,8 +17,8 @@ import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.baomidou.mybatisplus.core.toolkit.support.SFunction;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import net.lensfrex.dscape.dao.entity.UserBasic;
-import net.lensfrex.dscape.dao.mapper.UserBasicMapper;
import net.lensfrex.dscape.dao.service.UserBasicService;
+import net.lensfrex.dscape.dao.mapper.UserBasicMapper;
import org.springframework.stereotype.Service;
@Service
diff --git a/src/main/java/net/lensfrex/dscape/dao/service/impl/UserRoleServiceImpl.java b/dscape-dao/src/main/java/net/lensfrex/dscape/dao/service/impl/UserRoleServiceImpl.java
similarity index 90%
rename from src/main/java/net/lensfrex/dscape/dao/service/impl/UserRoleServiceImpl.java
rename to dscape-dao/src/main/java/net/lensfrex/dscape/dao/service/impl/UserRoleServiceImpl.java
index fd825f3..ce82009 100644
--- a/src/main/java/net/lensfrex/dscape/dao/service/impl/UserRoleServiceImpl.java
+++ b/dscape-dao/src/main/java/net/lensfrex/dscape/dao/service/impl/UserRoleServiceImpl.java
@@ -2,6 +2,14 @@
* Class created by lensfrex.
*/
+/*
+ * Class created by lensfrex.
+ */
+
+/*
+ * Class created by lensfrex.
+ */
+
package net.lensfrex.dscape.dao.service.impl;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
diff --git a/dscape-entities/pom.xml b/dscape-entities/pom.xml
new file mode 100644
index 0000000..3514349
--- /dev/null
+++ b/dscape-entities/pom.xml
@@ -0,0 +1,45 @@
+
+
+
+
+
+ dscape-server
+ net.lensfrex
+ 0.0.1-dev
+
+ 4.0.0
+
+ dscape-entities
+
+
+ 11
+ 11
+ UTF-8
+
+
+
+
+ com.baomidou
+ mybatis-plus-annotation
+ 3.5.2
+ compile
+
+
+
+
+
+
+ org.springframework.boot
+ spring-boot-maven-plugin
+
+ exec
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/main/java/net/lensfrex/dscape/dao/entity/BlackList.java b/dscape-entities/src/main/java/net/lensfrex/dscape/dao/entity/BlackList.java
similarity index 87%
rename from src/main/java/net/lensfrex/dscape/dao/entity/BlackList.java
rename to dscape-entities/src/main/java/net/lensfrex/dscape/dao/entity/BlackList.java
index 9fc24e0..76735cb 100644
--- a/src/main/java/net/lensfrex/dscape/dao/entity/BlackList.java
+++ b/dscape-entities/src/main/java/net/lensfrex/dscape/dao/entity/BlackList.java
@@ -1,3 +1,11 @@
+/*
+ * Class created by lensfrex.
+ */
+
+/*
+ * Class created by lensfrex.
+ */
+
package net.lensfrex.dscape.dao.entity;
import com.baomidou.mybatisplus.annotation.IdType;
diff --git a/src/main/java/net/lensfrex/dscape/dao/entity/ComputeHistory.java b/dscape-entities/src/main/java/net/lensfrex/dscape/dao/entity/ComputeHistory.java
similarity index 62%
rename from src/main/java/net/lensfrex/dscape/dao/entity/ComputeHistory.java
rename to dscape-entities/src/main/java/net/lensfrex/dscape/dao/entity/ComputeHistory.java
index f95f3ac..bf7f5a5 100644
--- a/src/main/java/net/lensfrex/dscape/dao/entity/ComputeHistory.java
+++ b/dscape-entities/src/main/java/net/lensfrex/dscape/dao/entity/ComputeHistory.java
@@ -5,21 +5,22 @@ import com.baomidou.mybatisplus.annotation.TableId;
import lombok.Data;
import java.io.Serializable;
+import java.time.LocalDateTime;
/**
* @author lensfrex
* @description compute_history
- * @date 2022-08-17
+ * @date 2022-08-23
*/
@Data
public class ComputeHistory implements Serializable {
private static final long serialVersionUID = 1L;
+ @TableId(type = IdType.AUTO)
/**
* id
*/
- @TableId(type = IdType.AUTO)
private Integer id;
/**
@@ -32,6 +33,26 @@ public class ComputeHistory implements Serializable {
*/
private Long rid;
+ /**
+ * 状态,0:完成,1:计算中
+ */
+ private int status;
+
+ /**
+ * create_time
+ */
+ private LocalDateTime createTime;
+
+ /**
+ * edit_time
+ */
+ private LocalDateTime editTime;
+
+ /**
+ * is_deleted
+ */
+ private int isDeleted;
+
public ComputeHistory() {
}
}
\ No newline at end of file
diff --git a/src/main/java/net/lensfrex/dscape/dao/entity/PatientData.java b/dscape-entities/src/main/java/net/lensfrex/dscape/dao/entity/PatientData.java
similarity index 88%
rename from src/main/java/net/lensfrex/dscape/dao/entity/PatientData.java
rename to dscape-entities/src/main/java/net/lensfrex/dscape/dao/entity/PatientData.java
index 93399ad..8db7d1d 100644
--- a/src/main/java/net/lensfrex/dscape/dao/entity/PatientData.java
+++ b/dscape-entities/src/main/java/net/lensfrex/dscape/dao/entity/PatientData.java
@@ -1,3 +1,11 @@
+/*
+ * Class created by lensfrex.
+ */
+
+/*
+ * Class created by lensfrex.
+ */
+
package net.lensfrex.dscape.dao.entity;
import com.baomidou.mybatisplus.annotation.IdType;
diff --git a/src/main/java/net/lensfrex/dscape/dao/entity/RegisterApplies.java b/dscape-entities/src/main/java/net/lensfrex/dscape/dao/entity/RegisterApplies.java
similarity index 87%
rename from src/main/java/net/lensfrex/dscape/dao/entity/RegisterApplies.java
rename to dscape-entities/src/main/java/net/lensfrex/dscape/dao/entity/RegisterApplies.java
index 30f43e8..0bc61c0 100644
--- a/src/main/java/net/lensfrex/dscape/dao/entity/RegisterApplies.java
+++ b/dscape-entities/src/main/java/net/lensfrex/dscape/dao/entity/RegisterApplies.java
@@ -1,3 +1,11 @@
+/*
+ * Class created by lensfrex.
+ */
+
+/*
+ * Class created by lensfrex.
+ */
+
package net.lensfrex.dscape.dao.entity;
import com.baomidou.mybatisplus.annotation.IdType;
diff --git a/src/main/java/net/lensfrex/dscape/dao/entity/RolePermission.java b/dscape-entities/src/main/java/net/lensfrex/dscape/dao/entity/RolePermission.java
similarity index 87%
rename from src/main/java/net/lensfrex/dscape/dao/entity/RolePermission.java
rename to dscape-entities/src/main/java/net/lensfrex/dscape/dao/entity/RolePermission.java
index 8a8402c..726804c 100644
--- a/src/main/java/net/lensfrex/dscape/dao/entity/RolePermission.java
+++ b/dscape-entities/src/main/java/net/lensfrex/dscape/dao/entity/RolePermission.java
@@ -1,3 +1,11 @@
+/*
+ * Class created by lensfrex.
+ */
+
+/*
+ * Class created by lensfrex.
+ */
+
package net.lensfrex.dscape.dao.entity;
import com.baomidou.mybatisplus.annotation.IdType;
diff --git a/src/main/java/net/lensfrex/dscape/dao/entity/UserBasic.java b/dscape-entities/src/main/java/net/lensfrex/dscape/dao/entity/UserBasic.java
similarity index 89%
rename from src/main/java/net/lensfrex/dscape/dao/entity/UserBasic.java
rename to dscape-entities/src/main/java/net/lensfrex/dscape/dao/entity/UserBasic.java
index d9e0863..6859fff 100644
--- a/src/main/java/net/lensfrex/dscape/dao/entity/UserBasic.java
+++ b/dscape-entities/src/main/java/net/lensfrex/dscape/dao/entity/UserBasic.java
@@ -1,3 +1,11 @@
+/*
+ * Class created by lensfrex.
+ */
+
+/*
+ * Class created by lensfrex.
+ */
+
package net.lensfrex.dscape.dao.entity;
import com.baomidou.mybatisplus.annotation.IdType;
diff --git a/src/main/java/net/lensfrex/dscape/dao/entity/UserRole.java b/dscape-entities/src/main/java/net/lensfrex/dscape/dao/entity/UserRole.java
similarity index 86%
rename from src/main/java/net/lensfrex/dscape/dao/entity/UserRole.java
rename to dscape-entities/src/main/java/net/lensfrex/dscape/dao/entity/UserRole.java
index 5564ce7..024ffe8 100644
--- a/src/main/java/net/lensfrex/dscape/dao/entity/UserRole.java
+++ b/dscape-entities/src/main/java/net/lensfrex/dscape/dao/entity/UserRole.java
@@ -1,3 +1,11 @@
+/*
+ * Class created by lensfrex.
+ */
+
+/*
+ * Class created by lensfrex.
+ */
+
package net.lensfrex.dscape.dao.entity;
import com.baomidou.mybatisplus.annotation.IdType;
diff --git a/src/main/java/net/lensfrex/dscape/dto/request/UserLoginRequestBody.java b/dscape-entities/src/main/java/net/lensfrex/dscape/dto/request/UserLoginRequestBody.java
similarity index 72%
rename from src/main/java/net/lensfrex/dscape/dto/request/UserLoginRequestBody.java
rename to dscape-entities/src/main/java/net/lensfrex/dscape/dto/request/UserLoginRequestBody.java
index cbdf289..4cd5c9d 100644
--- a/src/main/java/net/lensfrex/dscape/dto/request/UserLoginRequestBody.java
+++ b/dscape-entities/src/main/java/net/lensfrex/dscape/dto/request/UserLoginRequestBody.java
@@ -1,3 +1,11 @@
+/*
+ * Class created by lensfrex.
+ */
+
+/*
+ * Class created by lensfrex.
+ */
+
package net.lensfrex.dscape.dto.request;
import com.fasterxml.jackson.annotation.JsonProperty;
diff --git a/src/main/java/net/lensfrex/dscape/dto/request/user/PasswordModifyRequestBody.java b/dscape-entities/src/main/java/net/lensfrex/dscape/dto/request/user/PasswordModifyRequestBody.java
similarity index 78%
rename from src/main/java/net/lensfrex/dscape/dto/request/user/PasswordModifyRequestBody.java
rename to dscape-entities/src/main/java/net/lensfrex/dscape/dto/request/user/PasswordModifyRequestBody.java
index 7ff6afe..e1ef823 100644
--- a/src/main/java/net/lensfrex/dscape/dto/request/user/PasswordModifyRequestBody.java
+++ b/dscape-entities/src/main/java/net/lensfrex/dscape/dto/request/user/PasswordModifyRequestBody.java
@@ -1,3 +1,11 @@
+/*
+ * Class created by lensfrex.
+ */
+
+/*
+ * Class created by lensfrex.
+ */
+
package net.lensfrex.dscape.dto.request.user;
import com.fasterxml.jackson.annotation.JsonProperty;
diff --git a/src/main/java/net/lensfrex/dscape/dto/request/user/RegisterRequestBody.java b/dscape-entities/src/main/java/net/lensfrex/dscape/dto/request/user/RegisterRequestBody.java
similarity index 80%
rename from src/main/java/net/lensfrex/dscape/dto/request/user/RegisterRequestBody.java
rename to dscape-entities/src/main/java/net/lensfrex/dscape/dto/request/user/RegisterRequestBody.java
index bb4bdfa..73a7c2c 100644
--- a/src/main/java/net/lensfrex/dscape/dto/request/user/RegisterRequestBody.java
+++ b/dscape-entities/src/main/java/net/lensfrex/dscape/dto/request/user/RegisterRequestBody.java
@@ -1,3 +1,11 @@
+/*
+ * Class created by lensfrex.
+ */
+
+/*
+ * Class created by lensfrex.
+ */
+
package net.lensfrex.dscape.dto.request.user;
import com.fasterxml.jackson.annotation.JsonProperty;
diff --git a/src/main/java/net/lensfrex/dscape/dto/request/user/UserAddRequest.java b/dscape-entities/src/main/java/net/lensfrex/dscape/dto/request/user/UserAddRequest.java
similarity index 77%
rename from src/main/java/net/lensfrex/dscape/dto/request/user/UserAddRequest.java
rename to dscape-entities/src/main/java/net/lensfrex/dscape/dto/request/user/UserAddRequest.java
index ecec917..73d0ac6 100644
--- a/src/main/java/net/lensfrex/dscape/dto/request/user/UserAddRequest.java
+++ b/dscape-entities/src/main/java/net/lensfrex/dscape/dto/request/user/UserAddRequest.java
@@ -1,3 +1,11 @@
+/*
+ * Class created by lensfrex.
+ */
+
+/*
+ * Class created by lensfrex.
+ */
+
package net.lensfrex.dscape.dto.request.user;
import com.fasterxml.jackson.annotation.JsonProperty;
diff --git a/src/main/java/net/lensfrex/dscape/dto/response/data/compute/ComputeHistoryResponseData.java b/dscape-entities/src/main/java/net/lensfrex/dscape/dto/response/data/compute/ComputeHistoryResponseData.java
similarity index 79%
rename from src/main/java/net/lensfrex/dscape/dto/response/data/compute/ComputeHistoryResponseData.java
rename to dscape-entities/src/main/java/net/lensfrex/dscape/dto/response/data/compute/ComputeHistoryResponseData.java
index e6ae993..c4e378d 100644
--- a/src/main/java/net/lensfrex/dscape/dto/response/data/compute/ComputeHistoryResponseData.java
+++ b/dscape-entities/src/main/java/net/lensfrex/dscape/dto/response/data/compute/ComputeHistoryResponseData.java
@@ -2,6 +2,14 @@
* Class created by lensfrex.
*/
+/*
+ * Class created by lensfrex.
+ */
+
+/*
+ * Class created by lensfrex.
+ */
+
package net.lensfrex.dscape.dto.response.data.compute;
import com.fasterxml.jackson.annotation.JsonProperty;
diff --git a/src/main/java/net/lensfrex/dscape/dto/response/data/user/RegisterResponseBody.java b/dscape-entities/src/main/java/net/lensfrex/dscape/dto/response/data/user/RegisterResponseBody.java
similarity index 69%
rename from src/main/java/net/lensfrex/dscape/dto/response/data/user/RegisterResponseBody.java
rename to dscape-entities/src/main/java/net/lensfrex/dscape/dto/response/data/user/RegisterResponseBody.java
index dfd0ec7..1c9bb66 100644
--- a/src/main/java/net/lensfrex/dscape/dto/response/data/user/RegisterResponseBody.java
+++ b/dscape-entities/src/main/java/net/lensfrex/dscape/dto/response/data/user/RegisterResponseBody.java
@@ -2,6 +2,14 @@
* Class created by lensfrex.
*/
+/*
+ * Class created by lensfrex.
+ */
+
+/*
+ * Class created by lensfrex.
+ */
+
package net.lensfrex.dscape.dto.response.data.user;
import lombok.Data;
diff --git a/src/main/java/net/lensfrex/dscape/dto/response/general/Response.java b/dscape-entities/src/main/java/net/lensfrex/dscape/dto/response/general/Response.java
similarity index 89%
rename from src/main/java/net/lensfrex/dscape/dto/response/general/Response.java
rename to dscape-entities/src/main/java/net/lensfrex/dscape/dto/response/general/Response.java
index e9abae4..b1e3c45 100644
--- a/src/main/java/net/lensfrex/dscape/dto/response/general/Response.java
+++ b/dscape-entities/src/main/java/net/lensfrex/dscape/dto/response/general/Response.java
@@ -2,6 +2,14 @@
* Class created by lensfrex.
*/
+/*
+ * Class created by lensfrex.
+ */
+
+/*
+ * Class created by lensfrex.
+ */
+
package net.lensfrex.dscape.dto.response.general;
//@JsonInclude(JsonInclude.Include.NON_NULL)
diff --git a/src/main/java/net/lensfrex/dscape/dto/response/general/ResponseCode.java b/dscape-entities/src/main/java/net/lensfrex/dscape/dto/response/general/ResponseCode.java
similarity index 90%
rename from src/main/java/net/lensfrex/dscape/dto/response/general/ResponseCode.java
rename to dscape-entities/src/main/java/net/lensfrex/dscape/dto/response/general/ResponseCode.java
index c8b324f..9af5dbf 100644
--- a/src/main/java/net/lensfrex/dscape/dto/response/general/ResponseCode.java
+++ b/dscape-entities/src/main/java/net/lensfrex/dscape/dto/response/general/ResponseCode.java
@@ -2,6 +2,14 @@
* Class created by lensfrex.
*/
+/*
+ * Class created by lensfrex.
+ */
+
+/*
+ * Class created by lensfrex.
+ */
+
package net.lensfrex.dscape.dto.response.general;
public enum ResponseCode {
diff --git a/src/main/java/net/lensfrex/dscape/enums/user/BlackListTypeEnum.java b/dscape-entities/src/main/java/net/lensfrex/dscape/enums/blacklist/BlackListTypeEnum.java
similarity index 56%
rename from src/main/java/net/lensfrex/dscape/enums/user/BlackListTypeEnum.java
rename to dscape-entities/src/main/java/net/lensfrex/dscape/enums/blacklist/BlackListTypeEnum.java
index ed5b63f..291bfb4 100644
--- a/src/main/java/net/lensfrex/dscape/enums/user/BlackListTypeEnum.java
+++ b/dscape-entities/src/main/java/net/lensfrex/dscape/enums/blacklist/BlackListTypeEnum.java
@@ -1,4 +1,24 @@
-package net.lensfrex.dscape.enums.user;
+/*
+ * Class created by lensfrex.
+ */
+
+/*
+ * Class created by lensfrex.
+ */
+
+/*
+ * Class created by lensfrex.
+ */
+
+/*
+ * Class created by lensfrex.
+ */
+
+/*
+ * Class created by lensfrex.
+ */
+
+package net.lensfrex.dscape.enums.blacklist;
import com.baomidou.mybatisplus.annotation.EnumValue;
import lombok.Getter;
diff --git a/src/main/java/net/lensfrex/dscape/enums/user/UserRoleEnum.java b/dscape-entities/src/main/java/net/lensfrex/dscape/enums/user/UserRoleEnum.java
similarity index 79%
rename from src/main/java/net/lensfrex/dscape/enums/user/UserRoleEnum.java
rename to dscape-entities/src/main/java/net/lensfrex/dscape/enums/user/UserRoleEnum.java
index 42902fa..24b751f 100644
--- a/src/main/java/net/lensfrex/dscape/enums/user/UserRoleEnum.java
+++ b/dscape-entities/src/main/java/net/lensfrex/dscape/enums/user/UserRoleEnum.java
@@ -1,3 +1,19 @@
+/*
+ * Class created by lensfrex.
+ */
+
+/*
+ * Class created by lensfrex.
+ */
+
+/*
+ * Class created by lensfrex.
+ */
+
+/*
+ * Class created by lensfrex.
+ */
+
package net.lensfrex.dscape.enums.user;
import com.baomidou.mybatisplus.annotation.EnumValue;
diff --git a/src/main/java/net/lensfrex/dscape/enums/user/UserStatusEnum.java b/dscape-entities/src/main/java/net/lensfrex/dscape/enums/user/UserStatusEnum.java
similarity index 69%
rename from src/main/java/net/lensfrex/dscape/enums/user/UserStatusEnum.java
rename to dscape-entities/src/main/java/net/lensfrex/dscape/enums/user/UserStatusEnum.java
index f79a895..df5d9ed 100644
--- a/src/main/java/net/lensfrex/dscape/enums/user/UserStatusEnum.java
+++ b/dscape-entities/src/main/java/net/lensfrex/dscape/enums/user/UserStatusEnum.java
@@ -1,3 +1,19 @@
+/*
+ * Class created by lensfrex.
+ */
+
+/*
+ * Class created by lensfrex.
+ */
+
+/*
+ * Class created by lensfrex.
+ */
+
+/*
+ * Class created by lensfrex.
+ */
+
package net.lensfrex.dscape.enums.user;
import com.baomidou.mybatisplus.annotation.EnumValue;
diff --git a/src/main/java/net/lensfrex/dscape/exception/GlobalException.java b/dscape-entities/src/main/java/net/lensfrex/dscape/exception/GlobalException.java
similarity index 75%
rename from src/main/java/net/lensfrex/dscape/exception/GlobalException.java
rename to dscape-entities/src/main/java/net/lensfrex/dscape/exception/GlobalException.java
index 839ff4f..86afeb2 100644
--- a/src/main/java/net/lensfrex/dscape/exception/GlobalException.java
+++ b/dscape-entities/src/main/java/net/lensfrex/dscape/exception/GlobalException.java
@@ -1,3 +1,19 @@
+/*
+ * Class created by lensfrex.
+ */
+
+/*
+ * Class created by lensfrex.
+ */
+
+/*
+ * Class created by lensfrex.
+ */
+
+/*
+ * Class created by lensfrex.
+ */
+
package net.lensfrex.dscape.exception;
import net.lensfrex.dscape.dto.response.general.ResponseCode;
diff --git a/dscape-utils/pom.xml b/dscape-utils/pom.xml
new file mode 100644
index 0000000..bd604e6
--- /dev/null
+++ b/dscape-utils/pom.xml
@@ -0,0 +1,55 @@
+
+
+
+
+
+ dscape-server
+ net.lensfrex
+ 0.0.1-dev
+
+ 4.0.0
+
+ dscape-utils
+
+
+ 11
+ 11
+ UTF-8
+
+
+
+
+ com.fasterxml.jackson.core
+ jackson-core
+
+
+ com.fasterxml.jackson.core
+ jackson-databind
+
+
+ com.fasterxml.jackson.core
+ jackson-annotations
+
+
+ com.fasterxml.jackson.datatype
+ jackson-datatype-jsr310
+
+
+
+
+
+
+ org.springframework.boot
+ spring-boot-maven-plugin
+
+ exec
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/main/java/net/lensfrex/dscape/utils/ObjectJsonSerializer.java b/dscape-utils/src/main/java/net/lensfrex/dscape/utils/ObjectJsonSerializer.java
similarity index 78%
rename from src/main/java/net/lensfrex/dscape/utils/ObjectJsonSerializer.java
rename to dscape-utils/src/main/java/net/lensfrex/dscape/utils/ObjectJsonSerializer.java
index 1eebeb1..86dc0b2 100644
--- a/src/main/java/net/lensfrex/dscape/utils/ObjectJsonSerializer.java
+++ b/dscape-utils/src/main/java/net/lensfrex/dscape/utils/ObjectJsonSerializer.java
@@ -2,13 +2,19 @@
* Class created by lensfrex.
*/
+/*
+ * Class created by lensfrex.
+ */
+
+/*
+ * Class created by lensfrex.
+ */
+
package net.lensfrex.dscape.utils;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule;
-import org.springframework.stereotype.Component;
-@Component
public class ObjectJsonSerializer {
/**
* 序列化对象到json字符串
@@ -16,7 +22,7 @@ public class ObjectJsonSerializer {
* @param obj 待序列化的对象
* @return 序列化后的数据
*/
- public String serialize(Object obj) {
+ public static String serialize(Object obj) {
try {
return new ObjectMapper().registerModule(new JavaTimeModule()).writeValueAsString(obj);
} catch (Exception e) {
@@ -30,7 +36,7 @@ public class ObjectJsonSerializer {
* @param data 源数据
* @return 反序列化后的对象
*/
- public T deserialize(String data, Class valueType) {
+ public static T deserialize(String data, Class valueType) {
try {
return new ObjectMapper().registerModule(new JavaTimeModule()).readValue(data, valueType);
} catch (Exception e) {
diff --git a/src/main/java/net/lensfrex/dscape/utils/ObjectSerializer.java b/dscape-utils/src/main/java/net/lensfrex/dscape/utils/ObjectSerializer.java
similarity index 82%
rename from src/main/java/net/lensfrex/dscape/utils/ObjectSerializer.java
rename to dscape-utils/src/main/java/net/lensfrex/dscape/utils/ObjectSerializer.java
index 8f20e67..a6d7c92 100644
--- a/src/main/java/net/lensfrex/dscape/utils/ObjectSerializer.java
+++ b/dscape-utils/src/main/java/net/lensfrex/dscape/utils/ObjectSerializer.java
@@ -2,6 +2,14 @@
* Class created by lensfrex.
*/
+/*
+ * Class created by lensfrex.
+ */
+
+/*
+ * Class created by lensfrex.
+ */
+
package net.lensfrex.dscape.utils;
import lombok.extern.slf4j.Slf4j;
@@ -13,7 +21,6 @@ import java.io.ObjectInputStream;
import java.io.ObjectOutputStream;
@Slf4j
-@Component
public class ObjectSerializer {
/**
* 序列化对象到二进制
@@ -21,7 +28,7 @@ public class ObjectSerializer {
* @param obj 待序列化的对象
* @return 序列化后的数据
*/
- public byte[] serialize(Object obj) {
+ public static byte[] serialize(Object obj) {
try {
ByteArrayOutputStream byteArrayOutputStream = new ByteArrayOutputStream();
new ObjectOutputStream(byteArrayOutputStream).writeObject(obj);
@@ -38,7 +45,7 @@ public class ObjectSerializer {
* @param data 源数据
* @return 反序列化后的对象
*/
- public Object deserialize(byte[] data) {
+ public static Object deserialize(byte[] data) {
try {
return new ObjectInputStream(new ByteArrayInputStream(data)).readObject();
} catch (Exception e) {
diff --git a/src/main/java/net/lensfrex/dscape/utils/validate/TextCheckUtil.java b/dscape-utils/src/main/java/net/lensfrex/dscape/utils/validate/TextCheckUtil.java
similarity index 91%
rename from src/main/java/net/lensfrex/dscape/utils/validate/TextCheckUtil.java
rename to dscape-utils/src/main/java/net/lensfrex/dscape/utils/validate/TextCheckUtil.java
index 3f4e7e0..e63c43e 100644
--- a/src/main/java/net/lensfrex/dscape/utils/validate/TextCheckUtil.java
+++ b/dscape-utils/src/main/java/net/lensfrex/dscape/utils/validate/TextCheckUtil.java
@@ -6,6 +6,14 @@
* Class created by lensfrex.
*/
+/*
+ * Class created by lensfrex.
+ */
+
+/*
+ * Class created by lensfrex.
+ */
+
package net.lensfrex.dscape.utils.validate;
public class TextCheckUtil {
diff --git a/dscape-web/message-queue/pom.xml b/dscape-web/message-queue/pom.xml
new file mode 100644
index 0000000..7b8ec7d
--- /dev/null
+++ b/dscape-web/message-queue/pom.xml
@@ -0,0 +1,24 @@
+
+
+
+
+
+ dscape-web
+ net.lensfrex
+ 0.0.1-dev
+
+ 4.0.0
+
+ message-queue
+
+
+ 11
+ 11
+ UTF-8
+
+
+
\ No newline at end of file
diff --git a/dscape-web/message-queue/src/main/java/net/lensfrex/dscape/mq/MessageQueueProducer.java b/dscape-web/message-queue/src/main/java/net/lensfrex/dscape/mq/MessageQueueProducer.java
new file mode 100644
index 0000000..93eebd0
--- /dev/null
+++ b/dscape-web/message-queue/src/main/java/net/lensfrex/dscape/mq/MessageQueueProducer.java
@@ -0,0 +1,21 @@
+/*
+ * Class created by lensfrex.
+ */
+
+package net.lensfrex.dscape.mq;
+
+import org.springframework.amqp.rabbit.core.RabbitTemplate;
+import org.springframework.stereotype.Component;
+
+@Component
+public class MessageQueueProducer {
+ private final RabbitTemplate rabbit;
+
+ public MessageQueueProducer(RabbitTemplate rabbit) {
+ this.rabbit = rabbit;
+ }
+
+ public void sendObject(Object data) {
+ rabbit.convertAndSend(data);
+ }
+}
diff --git a/dscape-web/pom.xml b/dscape-web/pom.xml
new file mode 100644
index 0000000..a8dea92
--- /dev/null
+++ b/dscape-web/pom.xml
@@ -0,0 +1,133 @@
+
+
+
+
+ dscape-server
+ net.lensfrex
+ 0.0.1-dev
+
+ 4.0.0
+ pom
+
+ message-queue
+
+ dscape-web
+ dscape后端主服务
+
+
+ 11
+ 11
+ UTF-8
+
+
+
+
+ net.lensfrex
+ dscape-dao
+ 0.0.1-dev
+
+
+ net.lensfrex
+ dscape-cache
+ 0.0.1-dev
+
+
+ net.lensfrex
+ dscape-entities
+ 0.0.1-dev
+
+
+ net.lensfrex
+ dscape-utils
+ 0.0.1-dev
+
+
+ net.lensfrex
+ message-queue
+ 0.0.1-dev
+
+
+
+ org.springframework.boot
+ spring-boot-starter-web
+ 2.7.3
+
+
+ org.springframework.boot
+ spring-boot-starter-tomcat
+
+
+
+
+
+ org.springframework.boot
+ spring-boot-starter
+ 2.7.3
+
+
+
+ org.springframework.boot
+ spring-boot-starter-test
+ 2.7.3
+ test
+
+
+
+ org.springframework.boot
+ spring-boot-starter-amqp
+ 2.7.3
+
+
+
+ com.fasterxml.jackson.core
+ jackson-core
+
+
+ com.fasterxml.jackson.core
+ jackson-databind
+
+
+ com.fasterxml.jackson.core
+ jackson-annotations
+
+
+
+ org.mindrot
+ jbcrypt
+ 0.4
+
+
+
+ org.springframework.boot
+ spring-boot-starter-jetty
+ 2.7.3
+ compile
+
+
+
+ cn.dev33
+ sa-token-spring-boot-starter
+ 1.30.0
+
+
+
+ org.apache.commons
+ commons-lang3
+
+
+
+
+
+
+ org.springframework.boot
+ spring-boot-maven-plugin
+
+ exec
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/main/java/net/lensfrex/dscape/ServerMain.java b/dscape-web/src/main/java/net/lensfrex/dscape/ServerMain.java
similarity index 93%
rename from src/main/java/net/lensfrex/dscape/ServerMain.java
rename to dscape-web/src/main/java/net/lensfrex/dscape/ServerMain.java
index 0970567..1a9bea1 100644
--- a/src/main/java/net/lensfrex/dscape/ServerMain.java
+++ b/dscape-web/src/main/java/net/lensfrex/dscape/ServerMain.java
@@ -1,3 +1,7 @@
+/*
+ * Class created by lensfrex.
+ */
+
package net.lensfrex.dscape;
import org.mybatis.spring.annotation.MapperScan;
diff --git a/src/main/java/net/lensfrex/dscape/annotation/NotInvalidChar.java b/dscape-web/src/main/java/net/lensfrex/dscape/annotation/NotInvalidChar.java
similarity index 100%
rename from src/main/java/net/lensfrex/dscape/annotation/NotInvalidChar.java
rename to dscape-web/src/main/java/net/lensfrex/dscape/annotation/NotInvalidChar.java
diff --git a/src/main/java/net/lensfrex/dscape/auth/StpInterfaceImpl.java b/dscape-web/src/main/java/net/lensfrex/dscape/auth/StpInterfaceImpl.java
similarity index 92%
rename from src/main/java/net/lensfrex/dscape/auth/StpInterfaceImpl.java
rename to dscape-web/src/main/java/net/lensfrex/dscape/auth/StpInterfaceImpl.java
index b68b5c1..4b713c9 100644
--- a/src/main/java/net/lensfrex/dscape/auth/StpInterfaceImpl.java
+++ b/dscape-web/src/main/java/net/lensfrex/dscape/auth/StpInterfaceImpl.java
@@ -1,3 +1,19 @@
+/*
+ * Class created by lensfrex.
+ */
+
+/*
+ * Class created by lensfrex.
+ */
+
+/*
+ * Class created by lensfrex.
+ */
+
+/*
+ * Class created by lensfrex.
+ */
+
package net.lensfrex.dscape.auth;
import cn.dev33.satoken.stp.StpInterface;
diff --git a/dscape-web/src/main/java/net/lensfrex/dscape/configure/RabbitMqConfigure.java b/dscape-web/src/main/java/net/lensfrex/dscape/configure/RabbitMqConfigure.java
new file mode 100644
index 0000000..cfbe0b7
--- /dev/null
+++ b/dscape-web/src/main/java/net/lensfrex/dscape/configure/RabbitMqConfigure.java
@@ -0,0 +1,34 @@
+/*
+ * Class created by lensfrex.
+ */
+
+package net.lensfrex.dscape.configure;
+
+import org.springframework.amqp.core.Binding;
+import org.springframework.amqp.core.BindingBuilder;
+import org.springframework.amqp.core.DirectExchange;
+import org.springframework.amqp.core.Queue;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+
+@Configuration
+public class RabbitMqConfigure {
+
+ @Bean
+ public Queue queue() {
+ return new Queue("dscape-compute-queue", true, false, false);
+ }
+
+ @Bean
+ public DirectExchange directExchange() {
+ return new DirectExchange("dscape-compute-exchange", true, false);
+ }
+
+ @Bean
+ public Binding binding() {
+ return BindingBuilder
+ .bind(this.queue())
+ .to(this.directExchange())
+ .with("dscape-compute");
+ }
+}
diff --git a/src/main/java/net/lensfrex/dscape/exception/handler/GlobalExceptionHandler.java b/dscape-web/src/main/java/net/lensfrex/dscape/exception/handler/GlobalExceptionHandler.java
similarity index 94%
rename from src/main/java/net/lensfrex/dscape/exception/handler/GlobalExceptionHandler.java
rename to dscape-web/src/main/java/net/lensfrex/dscape/exception/handler/GlobalExceptionHandler.java
index 7d0b4cc..44adbe4 100644
--- a/src/main/java/net/lensfrex/dscape/exception/handler/GlobalExceptionHandler.java
+++ b/dscape-web/src/main/java/net/lensfrex/dscape/exception/handler/GlobalExceptionHandler.java
@@ -1,3 +1,19 @@
+/*
+ * Class created by lensfrex.
+ */
+
+/*
+ * Class created by lensfrex.
+ */
+
+/*
+ * Class created by lensfrex.
+ */
+
+/*
+ * Class created by lensfrex.
+ */
+
package net.lensfrex.dscape.exception.handler;
import cn.dev33.satoken.exception.NotLoginException;
diff --git a/src/main/java/net/lensfrex/dscape/utils/NetworkUtil.java b/dscape-web/src/main/java/net/lensfrex/dscape/utils/NetworkUtil.java
similarity index 71%
rename from src/main/java/net/lensfrex/dscape/utils/NetworkUtil.java
rename to dscape-web/src/main/java/net/lensfrex/dscape/utils/NetworkUtil.java
index d27e8af..96626fa 100644
--- a/src/main/java/net/lensfrex/dscape/utils/NetworkUtil.java
+++ b/dscape-web/src/main/java/net/lensfrex/dscape/utils/NetworkUtil.java
@@ -1,12 +1,15 @@
-package net.lensfrex.dscape.utils;
+/*
+ * Class created by lensfrex.
+ */
+
+/*
+ * Class created by lensfrex.
+ */
-import org.springframework.context.annotation.Scope;
-import org.springframework.stereotype.Component;
+package net.lensfrex.dscape.utils;
import javax.servlet.http.HttpServletRequest;
-@Component
-@Scope("singleton")
public class NetworkUtil {
public static String getRealIP(HttpServletRequest request) {
diff --git a/src/main/java/net/lensfrex/dscape/web/controllers/compute/ComputeController.java b/dscape-web/src/main/java/net/lensfrex/dscape/web/controllers/compute/ComputeController.java
similarity index 85%
rename from src/main/java/net/lensfrex/dscape/web/controllers/compute/ComputeController.java
rename to dscape-web/src/main/java/net/lensfrex/dscape/web/controllers/compute/ComputeController.java
index d67cde3..950ce63 100644
--- a/src/main/java/net/lensfrex/dscape/web/controllers/compute/ComputeController.java
+++ b/dscape-web/src/main/java/net/lensfrex/dscape/web/controllers/compute/ComputeController.java
@@ -2,6 +2,18 @@
* Class created by lensfrex.
*/
+/*
+ * Class created by lensfrex.
+ */
+
+/*
+ * Class created by lensfrex.
+ */
+
+/*
+ * Class created by lensfrex.
+ */
+
package net.lensfrex.dscape.web.controllers.compute;
import cn.dev33.satoken.stp.StpUtil;
diff --git a/src/main/java/net/lensfrex/dscape/web/controllers/history/HistoryController.java b/dscape-web/src/main/java/net/lensfrex/dscape/web/controllers/history/HistoryController.java
similarity index 93%
rename from src/main/java/net/lensfrex/dscape/web/controllers/history/HistoryController.java
rename to dscape-web/src/main/java/net/lensfrex/dscape/web/controllers/history/HistoryController.java
index 0c879c4..92767ee 100644
--- a/src/main/java/net/lensfrex/dscape/web/controllers/history/HistoryController.java
+++ b/dscape-web/src/main/java/net/lensfrex/dscape/web/controllers/history/HistoryController.java
@@ -2,6 +2,18 @@
* Class created by lensfrex.
*/
+/*
+ * Class created by lensfrex.
+ */
+
+/*
+ * Class created by lensfrex.
+ */
+
+/*
+ * Class created by lensfrex.
+ */
+
package net.lensfrex.dscape.web.controllers.history;
import cn.dev33.satoken.annotation.SaCheckLogin;
diff --git a/src/main/java/net/lensfrex/dscape/web/controllers/user/UserController.java b/dscape-web/src/main/java/net/lensfrex/dscape/web/controllers/user/UserController.java
similarity index 93%
rename from src/main/java/net/lensfrex/dscape/web/controllers/user/UserController.java
rename to dscape-web/src/main/java/net/lensfrex/dscape/web/controllers/user/UserController.java
index 8b9795f..34fde16 100644
--- a/src/main/java/net/lensfrex/dscape/web/controllers/user/UserController.java
+++ b/dscape-web/src/main/java/net/lensfrex/dscape/web/controllers/user/UserController.java
@@ -2,6 +2,18 @@
* Class created by lensfrex.
*/
+/*
+ * Class created by lensfrex.
+ */
+
+/*
+ * Class created by lensfrex.
+ */
+
+/*
+ * Class created by lensfrex.
+ */
+
package net.lensfrex.dscape.web.controllers.user;
import cn.dev33.satoken.stp.SaTokenInfo;
@@ -9,15 +21,15 @@ import cn.dev33.satoken.stp.StpUtil;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import net.lensfrex.dscape.dto.request.UserLoginRequestBody;
-import net.lensfrex.dscape.dto.request.user.PasswordModifyRequestBody;
-import net.lensfrex.dscape.dto.request.user.RegisterRequestBody;
-import net.lensfrex.dscape.dto.response.data.user.RegisterResponseBody;
import net.lensfrex.dscape.dto.response.general.Response;
import net.lensfrex.dscape.dto.response.general.ResponseCode;
import net.lensfrex.dscape.exception.GlobalException;
+import net.lensfrex.dscape.web.service.user.UserService;
+import net.lensfrex.dscape.dto.request.user.PasswordModifyRequestBody;
+import net.lensfrex.dscape.dto.request.user.RegisterRequestBody;
+import net.lensfrex.dscape.dto.response.data.user.RegisterResponseBody;
import net.lensfrex.dscape.utils.NetworkUtil;
import net.lensfrex.dscape.utils.validate.TextCheckUtil;
-import net.lensfrex.dscape.web.service.user.UserService;
import org.springframework.web.bind.annotation.*;
import javax.servlet.http.HttpServletRequest;
diff --git a/src/main/java/net/lensfrex/dscape/web/controllers/user/admin/AdminController.java b/dscape-web/src/main/java/net/lensfrex/dscape/web/controllers/user/admin/AdminController.java
similarity index 93%
rename from src/main/java/net/lensfrex/dscape/web/controllers/user/admin/AdminController.java
rename to dscape-web/src/main/java/net/lensfrex/dscape/web/controllers/user/admin/AdminController.java
index 3da72b9..2fe656e 100644
--- a/src/main/java/net/lensfrex/dscape/web/controllers/user/admin/AdminController.java
+++ b/dscape-web/src/main/java/net/lensfrex/dscape/web/controllers/user/admin/AdminController.java
@@ -2,17 +2,29 @@
* Class created by lensfrex.
*/
+/*
+ * Class created by lensfrex.
+ */
+
+/*
+ * Class created by lensfrex.
+ */
+
+/*
+ * Class created by lensfrex.
+ */
+
package net.lensfrex.dscape.web.controllers.user.admin;
import cn.dev33.satoken.annotation.SaCheckLogin;
import cn.dev33.satoken.stp.StpUtil;
-import lombok.extern.slf4j.Slf4j;
-import net.lensfrex.dscape.dto.request.user.UserAddRequest;
-import net.lensfrex.dscape.dto.response.data.user.RegisterResponseBody;
import net.lensfrex.dscape.dto.response.general.Response;
import net.lensfrex.dscape.dto.response.general.ResponseCode;
import net.lensfrex.dscape.enums.user.UserRoleEnum;
import net.lensfrex.dscape.exception.GlobalException;
+import lombok.extern.slf4j.Slf4j;
+import net.lensfrex.dscape.dto.request.user.UserAddRequest;
+import net.lensfrex.dscape.dto.response.data.user.RegisterResponseBody;
import net.lensfrex.dscape.utils.NetworkUtil;
import net.lensfrex.dscape.web.service.user.AdminService;
import org.springframework.web.bind.annotation.*;
diff --git a/src/main/java/net/lensfrex/dscape/web/service/data/HistoryService.java b/dscape-web/src/main/java/net/lensfrex/dscape/web/service/data/HistoryService.java
similarity index 89%
rename from src/main/java/net/lensfrex/dscape/web/service/data/HistoryService.java
rename to dscape-web/src/main/java/net/lensfrex/dscape/web/service/data/HistoryService.java
index bbabd1c..24fde0c 100644
--- a/src/main/java/net/lensfrex/dscape/web/service/data/HistoryService.java
+++ b/dscape-web/src/main/java/net/lensfrex/dscape/web/service/data/HistoryService.java
@@ -2,13 +2,25 @@
* Class created by lensfrex.
*/
+/*
+ * Class created by lensfrex.
+ */
+
+/*
+ * Class created by lensfrex.
+ */
+
+/*
+ * Class created by lensfrex.
+ */
+
package net.lensfrex.dscape.web.service.data;
-import lombok.extern.slf4j.Slf4j;
import net.lensfrex.dscape.dao.entity.ComputeHistory;
import net.lensfrex.dscape.dao.entity.PatientData;
-import net.lensfrex.dscape.dao.service.ComputeHistoryService;
import net.lensfrex.dscape.dao.service.PatientDataService;
+import lombok.extern.slf4j.Slf4j;
+import net.lensfrex.dscape.dao.service.ComputeHistoryService;
import org.springframework.stereotype.Service;
import java.util.List;
diff --git a/src/main/java/net/lensfrex/dscape/web/service/user/AdminService.java b/dscape-web/src/main/java/net/lensfrex/dscape/web/service/user/AdminService.java
similarity index 85%
rename from src/main/java/net/lensfrex/dscape/web/service/user/AdminService.java
rename to dscape-web/src/main/java/net/lensfrex/dscape/web/service/user/AdminService.java
index b9ca376..3174eec 100644
--- a/src/main/java/net/lensfrex/dscape/web/service/user/AdminService.java
+++ b/dscape-web/src/main/java/net/lensfrex/dscape/web/service/user/AdminService.java
@@ -6,22 +6,34 @@
* Class created by lensfrex.
*/
+/*
+ * Class created by lensfrex.
+ */
+
+/*
+ * Class created by lensfrex.
+ */
+
+/*
+ * Class created by lensfrex.
+ */
+
package net.lensfrex.dscape.web.service.user;
import cn.dev33.satoken.stp.StpUtil;
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
-import net.lensfrex.dscape.cache.InviteCodeService;
+import net.lensfrex.dscape.web.service.user.admin.InviteCode;
import net.lensfrex.dscape.cache.UserBasicCache;
import net.lensfrex.dscape.dao.entity.BlackList;
import net.lensfrex.dscape.dao.entity.UserBasic;
import net.lensfrex.dscape.dao.service.BlackListService;
import net.lensfrex.dscape.dao.service.UserBasicService;
import net.lensfrex.dscape.dto.request.user.UserAddRequest;
-import net.lensfrex.dscape.dto.response.data.user.RegisterResponseBody;
import net.lensfrex.dscape.dto.response.general.ResponseCode;
-import net.lensfrex.dscape.enums.user.BlackListTypeEnum;
+import net.lensfrex.dscape.enums.blacklist.BlackListTypeEnum;
import net.lensfrex.dscape.enums.user.UserRoleEnum;
import net.lensfrex.dscape.exception.GlobalException;
+import net.lensfrex.dscape.dto.response.data.user.RegisterResponseBody;
import org.springframework.data.redis.core.RedisTemplate;
import org.springframework.stereotype.Service;
@@ -37,7 +49,7 @@ public class AdminService {
private final BlackListService blackListService;
- private final InviteCodeService inviteCodeService;
+ private final InviteCode inviteCode;
private final UserBasicCache userBasicCache;
@@ -45,19 +57,19 @@ public class AdminService {
UserBasicService userBasicService,
UserService userService,
BlackListService blackListService,
- InviteCodeService inviteCodeService,
+ InviteCode inviteCode,
UserBasicCache userBasicCache) {
this.redis = redis;
this.userBasicService = userBasicService;
this.userService = userService;
this.blackListService = blackListService;
- this.inviteCodeService = inviteCodeService;
+ this.inviteCode = inviteCode;
this.userBasicCache = userBasicCache;
}
public List generateInviteCode(long expired, int count) {
- return inviteCodeService.generateInviteCode(expired, count);
+ return inviteCode.generateInviteCode(expired, count, StpUtil.getLoginIdAsString());
}
public void modifyUserStatus(String uid, int status) {
diff --git a/src/main/java/net/lensfrex/dscape/web/service/user/UserService.java b/dscape-web/src/main/java/net/lensfrex/dscape/web/service/user/UserService.java
similarity index 91%
rename from src/main/java/net/lensfrex/dscape/web/service/user/UserService.java
rename to dscape-web/src/main/java/net/lensfrex/dscape/web/service/user/UserService.java
index 0d73c2a..781b8e2 100644
--- a/src/main/java/net/lensfrex/dscape/web/service/user/UserService.java
+++ b/dscape-web/src/main/java/net/lensfrex/dscape/web/service/user/UserService.java
@@ -2,24 +2,36 @@
* Class created by lensfrex.
*/
+/*
+ * Class created by lensfrex.
+ */
+
+/*
+ * Class created by lensfrex.
+ */
+
+/*
+ * Class created by lensfrex.
+ */
+
package net.lensfrex.dscape.web.service.user;
import cn.dev33.satoken.stp.SaTokenInfo;
import cn.dev33.satoken.stp.StpUtil;
-import lombok.extern.slf4j.Slf4j;
-import net.lensfrex.dscape.cache.InviteCodeService;
-import net.lensfrex.dscape.cache.UserBasicCache;
import net.lensfrex.dscape.dao.entity.UserBasic;
-import net.lensfrex.dscape.dao.entity.UserRole;
import net.lensfrex.dscape.dao.service.UserBasicService;
-import net.lensfrex.dscape.dao.service.UserRoleService;
import net.lensfrex.dscape.dto.request.UserLoginRequestBody;
-import net.lensfrex.dscape.dto.request.user.RegisterRequestBody;
-import net.lensfrex.dscape.dto.response.data.user.RegisterResponseBody;
import net.lensfrex.dscape.dto.response.general.ResponseCode;
import net.lensfrex.dscape.enums.user.UserRoleEnum;
import net.lensfrex.dscape.enums.user.UserStatusEnum;
import net.lensfrex.dscape.exception.GlobalException;
+import lombok.extern.slf4j.Slf4j;
+import net.lensfrex.dscape.web.service.user.admin.InviteCode;
+import net.lensfrex.dscape.cache.UserBasicCache;
+import net.lensfrex.dscape.dao.entity.UserRole;
+import net.lensfrex.dscape.dao.service.UserRoleService;
+import net.lensfrex.dscape.dto.request.user.RegisterRequestBody;
+import net.lensfrex.dscape.dto.response.data.user.RegisterResponseBody;
import org.mindrot.jbcrypt.BCrypt;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -36,18 +48,18 @@ public class UserService {
private final UserRoleService userRoleService;
- private final InviteCodeService inviteCodeService;
+ private final InviteCode inviteCode;
@Autowired
public UserService(UserBasicCache userBasicCache,
UserBasicService userBasicService,
UserRoleService userRoleService,
- InviteCodeService inviteCodeService) {
+ InviteCode inviteCode) {
this.userBasicCache = userBasicCache;
this.userBasicService = userBasicService;
this.userRoleService = userRoleService;
- this.inviteCodeService = inviteCodeService;
+ this.inviteCode = inviteCode;
}
public SaTokenInfo checkLogin() {
@@ -129,7 +141,7 @@ public class UserService {
String uid = addUserToDatabase(requestBody.getUserName(), requestBody.getPassword(), "null", UserRoleEnum.ADMIN, registerIp);
registerResponseBody.setUid(uid);
} else {
- String superior = inviteCodeService.useInviteCode(inviteCode);
+ String superior = this.inviteCode.useInviteCode(inviteCode);
String uid = addUserToDatabase(requestBody.getUserName(), requestBody.getPassword(), superior, UserRoleEnum.NORMAL_USER, registerIp);
registerResponseBody.setUid(uid);
diff --git a/src/main/java/net/lensfrex/dscape/cache/InviteCodeService.java b/dscape-web/src/main/java/net/lensfrex/dscape/web/service/user/admin/InviteCode.java
similarity index 83%
rename from src/main/java/net/lensfrex/dscape/cache/InviteCodeService.java
rename to dscape-web/src/main/java/net/lensfrex/dscape/web/service/user/admin/InviteCode.java
index f41eb9d..6f96203 100644
--- a/src/main/java/net/lensfrex/dscape/cache/InviteCodeService.java
+++ b/dscape-web/src/main/java/net/lensfrex/dscape/web/service/user/admin/InviteCode.java
@@ -2,14 +2,25 @@
* Class created by lensfrex.
*/
-package net.lensfrex.dscape.cache;
+/*
+ * Class created by lensfrex.
+ */
+
+/*
+ * Class created by lensfrex.
+ */
+
+/*
+ * Class created by lensfrex.
+ */
+
+package net.lensfrex.dscape.web.service.user.admin;
-import cn.dev33.satoken.stp.StpUtil;
-import cn.dev33.satoken.util.SaFoxUtil;
-import lombok.extern.slf4j.Slf4j;
import net.lensfrex.dscape.configure.GlobalConstant;
import net.lensfrex.dscape.dto.response.general.ResponseCode;
import net.lensfrex.dscape.exception.GlobalException;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.RandomStringUtils;
import org.springframework.data.redis.core.RedisTemplate;
import org.springframework.stereotype.Service;
@@ -19,7 +30,7 @@ import java.util.List;
@Slf4j
@Service
-public class InviteCodeService {
+public class InviteCode {
private static final int INVITE_CODE_LENGTH = 6;
private static final String REGISTER_INVITE_CODE_KEY = GlobalConstant.REGISTER_INVITE_CODE_KEY;
@@ -28,12 +39,11 @@ public class InviteCodeService {
private final RedisTemplate redis;
- public InviteCodeService(RedisTemplate redis) {
+ public InviteCode(RedisTemplate redis) {
this.redis = redis;
}
- public List generateInviteCode(long expired, int count) {
- String adminUid = StpUtil.getLoginIdAsString();
+ public List generateInviteCode(long expired, int count, String adminUid) {
String adminInviteCodeCounterKey = String.format(ADMIN_INVITE_CODE_COUNTER_KEY, adminUid);
String countResult = redis.opsForValue().get(adminInviteCodeCounterKey);
@@ -45,7 +55,7 @@ public class InviteCodeService {
List inviteCodes = new ArrayList<>(count);
for (int i = 0; i < count; i++) {
- inviteCodes.add(SaFoxUtil.getRandomString(INVITE_CODE_LENGTH));
+ inviteCodes.add(RandomStringUtils.randomAlphanumeric(INVITE_CODE_LENGTH));
}
HashMap codeAdmin = new HashMap<>(count);
inviteCodes.forEach(inviteCode -> codeAdmin.put(inviteCode, adminUid));
diff --git a/src/main/resources/application.yml b/dscape-web/src/main/resources/application.yml
similarity index 88%
rename from src/main/resources/application.yml
rename to dscape-web/src/main/resources/application.yml
index ad9dae3..929b6dd 100644
--- a/src/main/resources/application.yml
+++ b/dscape-web/src/main/resources/application.yml
@@ -1,3 +1,9 @@
+spring:
+ profiles:
+ active: dev
+
+---
+
server:
address: 127.0.0.1
port: 6480
@@ -16,6 +22,11 @@ spring:
url: jdbc:mariadb://localhost:3306/dscape?useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai
username: "dscape_user"
password: asdfasdf
+ rabbitmq:
+ host: 127.0.0.1
+ port: 5672
+ username: dscape-test
+ password: asdfasdf
redis:
client-name: dscape
host: 127.0.0.1
@@ -29,6 +40,9 @@ spring:
max-wait: -1
max-idle: 8
min-idle: 0
+ config:
+ activate:
+ on-profile: dev
mybatis-plus:
configuration:
diff --git a/src/main/resources/database.sql b/dscape-web/src/main/resources/database.sql
similarity index 100%
rename from src/main/resources/database.sql
rename to dscape-web/src/main/resources/database.sql
diff --git a/pom.xml b/pom.xml
index e8e24ad..c371b0e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -2,6 +2,15 @@
4.0.0
+ pom
+
+ dscape-compute
+ dscape-web
+ dscape-dao
+ dscape-cache
+ dscape-entities
+ dscape-utils
+
org.springframework.boot
spring-boot-starter-parent
@@ -12,130 +21,17 @@
dscape-server
0.0.1-dev
dscape-server
- dscape-server
+ dscape后端
11
-
-
- org.springframework.boot
- spring-boot-starter
- 2.7.0
-
-
-
- org.springframework.boot
- spring-boot-starter-test
- test
-
-
-
- org.springframework.boot
- spring-boot-starter-web
-
-
- org.springframework.boot
- spring-boot-starter-tomcat
-
-
-
-
-
- org.springframework.boot
- spring-boot-starter-jetty
- compile
-
-
-
- cn.dev33
- sa-token-spring-boot-starter
- 1.30.0
-
-
-
- com.baomidou
- mybatis-plus-boot-starter
- 3.5.2
-
-
-
- org.mariadb.jdbc
- mariadb-java-client
- 3.0.5
-
-
-
-
- com.alibaba
- druid
- 1.2.11
-
-
- com.alibaba
- druid-spring-boot-starter
- 1.2.11
-
-
-
- com.google.code.gson
- gson
-
-
-
- com.fasterxml.jackson.core
- jackson-core
-
-
- com.fasterxml.jackson.core
- jackson-databind
-
-
- com.fasterxml.jackson.core
- jackson-annotations
-
-
-
- commons-cli
- commons-cli
- 1.5.0
-
-
-
- io.jsonwebtoken
- jjwt-api
- 0.11.5
-
-
- io.jsonwebtoken
- jjwt-impl
- 0.11.5
-
-
- io.jsonwebtoken
- jjwt-gson
- 0.11.5
-
-
-
- org.mindrot
- jbcrypt
- 0.4
-
+
org.projectlombok
lombok
-
- org.springframework.boot
- spring-boot-starter-data-redis
-
-
- org.apache.commons
- commons-pool2
-
-
cn.langpy
@@ -145,12 +41,12 @@
org.springframework.boot
spring-boot-starter-freemarker
- 2.7.1
+ 2.7.3
org.springframework.boot
spring-boot-starter-aop
- 2.7.1
+ 2.7.3
@@ -160,8 +56,10 @@
org.springframework.boot
spring-boot-maven-plugin
+
+ net.lensfrex.dscape.ServerMain
+
-