diff --git a/pom.xml b/pom.xml
index a1c8f86b84a3d9172710ab142afcd4aa3cf8d679..c42ac61f3f2b8c83525e17a6e4e13686cb5ea6b8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,8 +4,8 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
4.0.0
- com.enjoyvds
- enjoyvds
+ com.enjoy
+ EnjoyVIID
jar
1.0-SNAPSHOT
diff --git a/src/main/java/com/enjoyvds/EnjoyVdsApplication.java b/src/main/java/com/enjoy/EnjoyVIIDApplication.java
similarity index 73%
rename from src/main/java/com/enjoyvds/EnjoyVdsApplication.java
rename to src/main/java/com/enjoy/EnjoyVIIDApplication.java
index f0408e950bf7dfc9a8c478594c0ef53686ab0a81..400aa7af383adf0da683973de34f21279031266a 100644
--- a/src/main/java/com/enjoyvds/EnjoyVdsApplication.java
+++ b/src/main/java/com/enjoy/EnjoyVIIDApplication.java
@@ -1,4 +1,4 @@
-package com.enjoyvds;
+package com.enjoy;
import org.mybatis.spring.annotation.MapperScan;
import org.springframework.boot.SpringApplication;
@@ -10,9 +10,9 @@ import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration;
* @date 2021/9/6 15:51
*/
@SpringBootApplication(exclude = {DataSourceAutoConfiguration.class})
-@MapperScan("com.enjoyvds.mapper")
-public class EnjoyVdsApplication {
+@MapperScan("com.enjoy.mapper")
+public class EnjoyVIIDApplication {
public static void main(String[] args) {
- SpringApplication.run(EnjoyVdsApplication.class, args);
+ SpringApplication.run(EnjoyVIIDApplication.class, args);
}
}
diff --git a/src/main/java/com/enjoyvds/common/Result.java b/src/main/java/com/enjoy/common/Result.java
similarity index 96%
rename from src/main/java/com/enjoyvds/common/Result.java
rename to src/main/java/com/enjoy/common/Result.java
index 0fb012848651ab272c8c00e70ce9e722f25e8875..16fd4efad0b02e39d6f35f349ae7b5e509f4bcfa 100644
--- a/src/main/java/com/enjoyvds/common/Result.java
+++ b/src/main/java/com/enjoy/common/Result.java
@@ -1,9 +1,9 @@
-package com.enjoyvds.common;
+package com.enjoy.common;
-import com.enjoyvds.common.constant.HttpStatus;
-import com.enjoyvds.util.StringUtils;
+import com.enjoy.common.constant.HttpStatus;
+import com.enjoy.util.StringUtils;
import java.util.HashMap;
diff --git a/src/main/java/com/enjoyvds/common/constant/Constants.java b/src/main/java/com/enjoy/common/constant/Constants.java
similarity index 97%
rename from src/main/java/com/enjoyvds/common/constant/Constants.java
rename to src/main/java/com/enjoy/common/constant/Constants.java
index 25cce7b0f539145a69e2badeba95eb2fd4fa3990..764ee2907ab2716371c692974f1ca7da92573d23 100644
--- a/src/main/java/com/enjoyvds/common/constant/Constants.java
+++ b/src/main/java/com/enjoy/common/constant/Constants.java
@@ -1,6 +1,6 @@
-package com.enjoyvds.common.constant;
+package com.enjoy.common.constant;
-import com.enjoyvds.service.VdsInfoDeviceService;
+import com.enjoy.service.VdsInfoDeviceService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
diff --git a/src/main/java/com/enjoyvds/common/constant/HttpStatus.java b/src/main/java/com/enjoy/common/constant/HttpStatus.java
similarity index 97%
rename from src/main/java/com/enjoyvds/common/constant/HttpStatus.java
rename to src/main/java/com/enjoy/common/constant/HttpStatus.java
index 6dbedda1aa579e65d7ad94ee6a010b1aeca76376..64dbc4526904974432dd9f8b2650cdfd1a1a07ea 100644
--- a/src/main/java/com/enjoyvds/common/constant/HttpStatus.java
+++ b/src/main/java/com/enjoy/common/constant/HttpStatus.java
@@ -1,4 +1,4 @@
-package com.enjoyvds.common.constant;
+package com.enjoy.common.constant;
/**
* 返回状态码
diff --git a/src/main/java/com/enjoyvds/common/text/CharsetKit.java b/src/main/java/com/enjoy/common/text/CharsetKit.java
similarity index 97%
rename from src/main/java/com/enjoyvds/common/text/CharsetKit.java
rename to src/main/java/com/enjoy/common/text/CharsetKit.java
index 9b7c4d2b43a0a671cf06cdddce48ba0df2d0115a..7878f00d3ae3d8c353e87530f0bfd2576b15ea8e 100644
--- a/src/main/java/com/enjoyvds/common/text/CharsetKit.java
+++ b/src/main/java/com/enjoy/common/text/CharsetKit.java
@@ -1,8 +1,8 @@
-package com.enjoyvds.common.text;
+package com.enjoy.common.text;
-import com.enjoyvds.util.StringUtils;
+import com.enjoy.util.StringUtils;
import java.nio.charset.Charset;
import java.nio.charset.StandardCharsets;
diff --git a/src/main/java/com/enjoyvds/common/text/Convert.java b/src/main/java/com/enjoy/common/text/Convert.java
similarity index 99%
rename from src/main/java/com/enjoyvds/common/text/Convert.java
rename to src/main/java/com/enjoy/common/text/Convert.java
index ce31c30d3f4d8796b7700949e698715ce508a0c9..0022e20dacb8175dda348e98871a8dd69d2f7c4e 100644
--- a/src/main/java/com/enjoyvds/common/text/Convert.java
+++ b/src/main/java/com/enjoy/common/text/Convert.java
@@ -1,6 +1,6 @@
-package com.enjoyvds.common.text;
+package com.enjoy.common.text;
-import com.enjoyvds.util.StringUtils;
+import com.enjoy.util.StringUtils;
import org.apache.commons.lang3.ArrayUtils;
import java.math.BigDecimal;
diff --git a/src/main/java/com/enjoyvds/common/text/StrFormatter.java b/src/main/java/com/enjoy/common/text/StrFormatter.java
similarity index 97%
rename from src/main/java/com/enjoyvds/common/text/StrFormatter.java
rename to src/main/java/com/enjoy/common/text/StrFormatter.java
index 1cd0b4ea21229e6ef5e3e97bc45e5a34cf5180f4..b711682e1089d3d695f4f32738336e053986ce85 100644
--- a/src/main/java/com/enjoyvds/common/text/StrFormatter.java
+++ b/src/main/java/com/enjoy/common/text/StrFormatter.java
@@ -1,7 +1,7 @@
-package com.enjoyvds.common.text;
+package com.enjoy.common.text;
-import com.enjoyvds.util.StringUtils;
+import com.enjoy.util.StringUtils;
/**
* 字符串格式化
diff --git a/src/main/java/com/enjoyvds/config/FileConfig.java b/src/main/java/com/enjoy/config/FileConfig.java
similarity index 77%
rename from src/main/java/com/enjoyvds/config/FileConfig.java
rename to src/main/java/com/enjoy/config/FileConfig.java
index 858ee189d6a5efcf1fdf1cbd1d1a57b22a5a19e3..3c67bc6d527d955698289f85fc142aec2c64672e 100644
--- a/src/main/java/com/enjoyvds/config/FileConfig.java
+++ b/src/main/java/com/enjoy/config/FileConfig.java
@@ -1,4 +1,4 @@
-package com.enjoyvds.config;
+package com.enjoy.config;
import lombok.Data;
import org.springframework.boot.context.properties.ConfigurationProperties;
@@ -9,7 +9,7 @@ import org.springframework.context.annotation.Configuration;
*/
@Configuration
@Data
-@ConfigurationProperties(prefix = "enjoyvds")
+@ConfigurationProperties(prefix = "enjoyviid")
public class FileConfig {
public String profile;
diff --git a/src/main/java/com/enjoyvds/config/JacksonConfig.java b/src/main/java/com/enjoy/config/JacksonConfig.java
similarity index 97%
rename from src/main/java/com/enjoyvds/config/JacksonConfig.java
rename to src/main/java/com/enjoy/config/JacksonConfig.java
index 5c2105bb92b8dfdb63da3f41900b7a4dc5c846e7..6e7efb2d6b9889c8dc3883b250705ef2f201a7dd 100644
--- a/src/main/java/com/enjoyvds/config/JacksonConfig.java
+++ b/src/main/java/com/enjoy/config/JacksonConfig.java
@@ -1,4 +1,4 @@
-package com.enjoyvds.config;
+package com.enjoy.config;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.fasterxml.jackson.databind.module.SimpleModule;
diff --git a/src/main/java/com/enjoyvds/config/MinioConfig.java b/src/main/java/com/enjoy/config/MinioConfig.java
similarity index 98%
rename from src/main/java/com/enjoyvds/config/MinioConfig.java
rename to src/main/java/com/enjoy/config/MinioConfig.java
index 36b22e6b939e288bbb15e7998bb6333d9ed4a25a..05eab03182213f58fd6611f44345cf1bfc9c17bf 100644
--- a/src/main/java/com/enjoyvds/config/MinioConfig.java
+++ b/src/main/java/com/enjoy/config/MinioConfig.java
@@ -1,4 +1,4 @@
-package com.enjoyvds.config;
+package com.enjoy.config;
import io.minio.MinioClient;
import org.springframework.boot.context.properties.ConfigurationProperties;
diff --git a/src/main/java/com/enjoyvds/config/ServiceUrlConfig.java b/src/main/java/com/enjoy/config/ServiceUrlConfig.java
similarity index 93%
rename from src/main/java/com/enjoyvds/config/ServiceUrlConfig.java
rename to src/main/java/com/enjoy/config/ServiceUrlConfig.java
index 3bd778a57e811a0c1d4d0c8921adcdab80b6cd47..59a3df6e7d1be2e37c7c6590536ba5d3ef5d953c 100644
--- a/src/main/java/com/enjoyvds/config/ServiceUrlConfig.java
+++ b/src/main/java/com/enjoy/config/ServiceUrlConfig.java
@@ -1,4 +1,4 @@
-package com.enjoyvds.config;
+package com.enjoy.config;
import lombok.Data;
import org.springframework.boot.context.properties.ConfigurationProperties;
diff --git a/src/main/java/com/enjoyvds/config/ShiroConfig.java b/src/main/java/com/enjoy/config/ShiroConfig.java
similarity index 97%
rename from src/main/java/com/enjoyvds/config/ShiroConfig.java
rename to src/main/java/com/enjoy/config/ShiroConfig.java
index c193807b8ca6a3b49bcd0220fbce13379b0eaa7d..4a753a0bbbce6ccb2938e40606bc576cddcc22c2 100644
--- a/src/main/java/com/enjoyvds/config/ShiroConfig.java
+++ b/src/main/java/com/enjoy/config/ShiroConfig.java
@@ -1,6 +1,6 @@
-package com.enjoyvds.config;
+package com.enjoy.config;
-import com.enjoyvds.shiro.CustomRealm;
+import com.enjoy.shiro.CustomRealm;
import org.apache.shiro.mgt.SecurityManager;
import org.apache.shiro.mgt.SessionsSecurityManager;
import org.apache.shiro.spring.security.interceptor.AuthorizationAttributeSourceAdvisor;
diff --git a/src/main/java/com/enjoyvds/controller/FaceController.java b/src/main/java/com/enjoy/controller/FaceController.java
similarity index 89%
rename from src/main/java/com/enjoyvds/controller/FaceController.java
rename to src/main/java/com/enjoy/controller/FaceController.java
index fa7df6765828459413f6688ff3de7e1fc26e8f36..c6541b5bf2d4fdcb26157abc5326ebc24a621988 100644
--- a/src/main/java/com/enjoyvds/controller/FaceController.java
+++ b/src/main/java/com/enjoy/controller/FaceController.java
@@ -1,26 +1,21 @@
-package com.enjoyvds.controller;
+package com.enjoy.controller;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
-import com.enjoyvds.common.Result;
-import com.enjoyvds.config.FileConfig;
-import com.enjoyvds.config.MinioConfig;
-import com.enjoyvds.domain.SubImageInfo;
-import com.enjoyvds.domain.SubImageInfoObject;
-import com.enjoyvds.domain.VdsFace;
-import com.enjoyvds.domain.dto.RegisterObject;
-import com.enjoyvds.factory.TimeFormatFactory;
-import com.enjoyvds.util.MinioUtil;
-import com.enjoyvds.util.SnowflakeGenerateIdUtil;
+import com.enjoy.config.FileConfig;
+import com.enjoy.config.MinioConfig;
+import com.enjoy.domain.SubImageInfo;
+import com.enjoy.domain.SubImageInfoObject;
+import com.enjoy.domain.VdsFace;
+import com.enjoy.factory.TimeFormatFactory;
+import com.enjoy.util.MinioUtil;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.time.DateFormatUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.ResponseBody;
import org.springframework.web.bind.annotation.RestController;
-import org.springframework.web.multipart.MultipartFile;
import sun.misc.BASE64Decoder;
import java.io.File;
@@ -28,7 +23,6 @@ import java.io.FileOutputStream;
import java.io.OutputStream;
import java.text.SimpleDateFormat;
import java.util.Date;
-import java.util.Map;
/**
* 人脸对象接口
diff --git a/src/main/java/com/enjoyvds/controller/FileOperateController.java b/src/main/java/com/enjoy/controller/FileOperateController.java
similarity index 88%
rename from src/main/java/com/enjoyvds/controller/FileOperateController.java
rename to src/main/java/com/enjoy/controller/FileOperateController.java
index df98483eae92d49bfc9cb13fb2b6b6514a883c5d..465fd9f279aed1363d95810a4fae3a71d6c81179 100644
--- a/src/main/java/com/enjoyvds/controller/FileOperateController.java
+++ b/src/main/java/com/enjoy/controller/FileOperateController.java
@@ -1,7 +1,7 @@
-package com.enjoyvds.controller;
+package com.enjoy.controller;
-import com.enjoyvds.common.Result;
-import com.enjoyvds.service.FileOperateService;
+import com.enjoy.common.Result;
+import com.enjoy.service.FileOperateService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
diff --git a/src/main/java/com/enjoyvds/controller/LoginController.java b/src/main/java/com/enjoy/controller/LoginController.java
similarity index 89%
rename from src/main/java/com/enjoyvds/controller/LoginController.java
rename to src/main/java/com/enjoy/controller/LoginController.java
index 0219f56add3794ada9b55d869fff7a98cb5eb525..1a674dc479c6be9dffc4cf29c1b3760566c06a3f 100644
--- a/src/main/java/com/enjoyvds/controller/LoginController.java
+++ b/src/main/java/com/enjoy/controller/LoginController.java
@@ -1,11 +1,11 @@
-package com.enjoyvds.controller;
+package com.enjoy.controller;
-import com.enjoyvds.common.Result;
-import com.enjoyvds.common.constant.Constants;
-import com.enjoyvds.domain.dto.LoginDTO;
-import com.enjoyvds.domain.VdsUser;
-import com.enjoyvds.service.LoginService;
-import com.enjoyvds.util.StringUtils;
+import com.enjoy.common.Result;
+import com.enjoy.common.constant.Constants;
+import com.enjoy.domain.dto.LoginDTO;
+import com.enjoy.domain.VdsUser;
+import com.enjoy.service.LoginService;
+import com.enjoy.util.StringUtils;
import lombok.extern.slf4j.Slf4j;
import org.apache.shiro.SecurityUtils;
import org.apache.shiro.authc.AuthenticationException;
diff --git a/src/main/java/com/enjoyvds/controller/SystemController.java b/src/main/java/com/enjoy/controller/SystemController.java
similarity index 95%
rename from src/main/java/com/enjoyvds/controller/SystemController.java
rename to src/main/java/com/enjoy/controller/SystemController.java
index 9fa71dbf23e0111a380f2f3e41c0745ed9ac8d01..ea573eefe752f3b2190ea552f4a8b09da6a5ccc1 100644
--- a/src/main/java/com/enjoyvds/controller/SystemController.java
+++ b/src/main/java/com/enjoy/controller/SystemController.java
@@ -1,14 +1,14 @@
-package com.enjoyvds.controller;
+package com.enjoy.controller;
import com.alibaba.fastjson.JSONObject;
-import com.enjoyvds.common.constant.Constants;
-import com.enjoyvds.config.ServiceUrlConfig;
-import com.enjoyvds.domain.VdsInfoDevice;
-import com.enjoyvds.domain.dto.KeepaliveObject;
-import com.enjoyvds.domain.dto.RegisterObject;
-import com.enjoyvds.factory.TimeFormatFactory;
-import com.enjoyvds.service.VdsInfoDeviceService;
-import com.enjoyvds.util.IPUtils;
+import com.enjoy.common.constant.Constants;
+import com.enjoy.config.ServiceUrlConfig;
+import com.enjoy.domain.VdsInfoDevice;
+import com.enjoy.domain.dto.KeepaliveObject;
+import com.enjoy.domain.dto.RegisterObject;
+import com.enjoy.factory.TimeFormatFactory;
+import com.enjoy.service.VdsInfoDeviceService;
+import com.enjoy.util.IPUtils;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.RequestBody;
diff --git a/src/main/java/com/enjoyvds/controller/VdsInfoDeviceController.java b/src/main/java/com/enjoy/controller/VdsInfoDeviceController.java
similarity index 83%
rename from src/main/java/com/enjoyvds/controller/VdsInfoDeviceController.java
rename to src/main/java/com/enjoy/controller/VdsInfoDeviceController.java
index 2fc461452139d6953b370c36cce48be50caf1200..1daad3e24811c69c4f9158444f6e9f0c3affc25d 100644
--- a/src/main/java/com/enjoyvds/controller/VdsInfoDeviceController.java
+++ b/src/main/java/com/enjoy/controller/VdsInfoDeviceController.java
@@ -1,8 +1,8 @@
-package com.enjoyvds.controller;
+package com.enjoy.controller;
-import com.enjoyvds.common.Result;
-import com.enjoyvds.domain.VdsInfoDevice;
-import com.enjoyvds.service.VdsInfoDeviceService;
+import com.enjoy.common.Result;
+import com.enjoy.domain.VdsInfoDevice;
+import com.enjoy.service.VdsInfoDeviceService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
diff --git a/src/main/java/com/enjoyvds/domain/Image.java b/src/main/java/com/enjoy/domain/Image.java
similarity index 89%
rename from src/main/java/com/enjoyvds/domain/Image.java
rename to src/main/java/com/enjoy/domain/Image.java
index 1bd242cdd76792dc7069d7320a718c9e96f55f15..a08b64bca0348681d11f1912eaa65a133f832961 100644
--- a/src/main/java/com/enjoyvds/domain/Image.java
+++ b/src/main/java/com/enjoy/domain/Image.java
@@ -1,4 +1,4 @@
-package com.enjoyvds.domain;
+package com.enjoy.domain;
import lombok.*;
diff --git a/src/main/java/com/enjoyvds/domain/Permissions.java b/src/main/java/com/enjoy/domain/Permissions.java
similarity index 91%
rename from src/main/java/com/enjoyvds/domain/Permissions.java
rename to src/main/java/com/enjoy/domain/Permissions.java
index c929ed7d16d292b2a9af45aaed24cdba45feaed9..42c85ee84b5c7dff924e07169516a1e6de0109fb 100644
--- a/src/main/java/com/enjoyvds/domain/Permissions.java
+++ b/src/main/java/com/enjoy/domain/Permissions.java
@@ -1,4 +1,4 @@
-package com.enjoyvds.domain;
+package com.enjoy.domain;
import lombok.AllArgsConstructor;
import lombok.Data;
diff --git a/src/main/java/com/enjoyvds/domain/Related.java b/src/main/java/com/enjoy/domain/Related.java
similarity index 91%
rename from src/main/java/com/enjoyvds/domain/Related.java
rename to src/main/java/com/enjoy/domain/Related.java
index e9bb559a0f0c21bf68583135a8d029dbc476e11c..a31b03123669082fd97654741f6f7cb0e65f4ea5 100644
--- a/src/main/java/com/enjoyvds/domain/Related.java
+++ b/src/main/java/com/enjoy/domain/Related.java
@@ -1,4 +1,4 @@
-package com.enjoyvds.domain;
+package com.enjoy.domain;
import lombok.*;
diff --git a/src/main/java/com/enjoyvds/domain/RelatedObject.java b/src/main/java/com/enjoy/domain/RelatedObject.java
similarity index 87%
rename from src/main/java/com/enjoyvds/domain/RelatedObject.java
rename to src/main/java/com/enjoy/domain/RelatedObject.java
index fb160c8daafd3b80bba704a66305dc98c9cf09ad..9072d1bcd46cc5d1e3702cc19d908a401a36d90b 100644
--- a/src/main/java/com/enjoyvds/domain/RelatedObject.java
+++ b/src/main/java/com/enjoy/domain/RelatedObject.java
@@ -1,4 +1,4 @@
-package com.enjoyvds.domain;
+package com.enjoy.domain;
import lombok.*;
diff --git a/src/main/java/com/enjoyvds/domain/Role.java b/src/main/java/com/enjoy/domain/Role.java
similarity index 92%
rename from src/main/java/com/enjoyvds/domain/Role.java
rename to src/main/java/com/enjoy/domain/Role.java
index 6798bf4520f8f4dd1022c2d91b55879c435919e1..ea1c06a4bbe96c3c8ff52d89cc80f47004078465 100644
--- a/src/main/java/com/enjoyvds/domain/Role.java
+++ b/src/main/java/com/enjoy/domain/Role.java
@@ -1,4 +1,4 @@
-package com.enjoyvds.domain;
+package com.enjoy.domain;
import lombok.AllArgsConstructor;
import lombok.Data;
diff --git a/src/main/java/com/enjoyvds/domain/SubImageInfo.java b/src/main/java/com/enjoy/domain/SubImageInfo.java
similarity index 88%
rename from src/main/java/com/enjoyvds/domain/SubImageInfo.java
rename to src/main/java/com/enjoy/domain/SubImageInfo.java
index 9352bd8aee89a49029b6dbe66d70be21eda91bed..ee7722e92dd928a18a93f5b4bf579d685aae4c1c 100644
--- a/src/main/java/com/enjoyvds/domain/SubImageInfo.java
+++ b/src/main/java/com/enjoy/domain/SubImageInfo.java
@@ -1,9 +1,7 @@
-package com.enjoyvds.domain;
+package com.enjoy.domain;
import lombok.*;
-import java.sql.Timestamp;
-
/**
* @author 1h
* 图片具体消息
diff --git a/src/main/java/com/enjoyvds/domain/SubImageInfoObject.java b/src/main/java/com/enjoy/domain/SubImageInfoObject.java
similarity index 88%
rename from src/main/java/com/enjoyvds/domain/SubImageInfoObject.java
rename to src/main/java/com/enjoy/domain/SubImageInfoObject.java
index eb6d100b685e48f19fb6dc2bacb8e0879ec01ab6..357651cdac7cf6890521115999ceb04496b0ffad 100644
--- a/src/main/java/com/enjoyvds/domain/SubImageInfoObject.java
+++ b/src/main/java/com/enjoy/domain/SubImageInfoObject.java
@@ -1,4 +1,4 @@
-package com.enjoyvds.domain;
+package com.enjoy.domain;
import lombok.*;
diff --git a/src/main/java/com/enjoyvds/domain/VdsFace.java b/src/main/java/com/enjoy/domain/VdsFace.java
similarity index 97%
rename from src/main/java/com/enjoyvds/domain/VdsFace.java
rename to src/main/java/com/enjoy/domain/VdsFace.java
index 24ff719d27cdeba1080479770870173b32259877..24c5d4ccd829bc4ff7d7df2138526441252285cc 100644
--- a/src/main/java/com/enjoyvds/domain/VdsFace.java
+++ b/src/main/java/com/enjoy/domain/VdsFace.java
@@ -1,4 +1,4 @@
-package com.enjoyvds.domain;
+package com.enjoy.domain;
import lombok.*;
diff --git a/src/main/java/com/enjoyvds/domain/VdsInfoDevice.java b/src/main/java/com/enjoy/domain/VdsInfoDevice.java
similarity index 96%
rename from src/main/java/com/enjoyvds/domain/VdsInfoDevice.java
rename to src/main/java/com/enjoy/domain/VdsInfoDevice.java
index 94ca489870ba9ca84f909566e0a83187ddae221a..f4d760b7dede53ae9c850b92c8c798611dc84604 100644
--- a/src/main/java/com/enjoyvds/domain/VdsInfoDevice.java
+++ b/src/main/java/com/enjoy/domain/VdsInfoDevice.java
@@ -1,4 +1,4 @@
-package com.enjoyvds.domain;
+package com.enjoy.domain;
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.AllArgsConstructor;
diff --git a/src/main/java/com/enjoyvds/domain/VdsInfoFile.java b/src/main/java/com/enjoy/domain/VdsInfoFile.java
similarity index 82%
rename from src/main/java/com/enjoyvds/domain/VdsInfoFile.java
rename to src/main/java/com/enjoy/domain/VdsInfoFile.java
index a734f84c13518dace7231f9086a004440e57e40d..4b69ad09b51be474caa53b6c6d03714f886ee2b5 100644
--- a/src/main/java/com/enjoyvds/domain/VdsInfoFile.java
+++ b/src/main/java/com/enjoy/domain/VdsInfoFile.java
@@ -1,4 +1,4 @@
-package com.enjoyvds.domain;
+package com.enjoy.domain;
import java.io.Serializable;
diff --git a/src/main/java/com/enjoyvds/domain/VdsUser.java b/src/main/java/com/enjoy/domain/VdsUser.java
similarity index 93%
rename from src/main/java/com/enjoyvds/domain/VdsUser.java
rename to src/main/java/com/enjoy/domain/VdsUser.java
index c51129150905d3a626b3d45b3ea4b17b55371910..c96e680464221ccab3ed7d68097a60550fc60b90 100644
--- a/src/main/java/com/enjoyvds/domain/VdsUser.java
+++ b/src/main/java/com/enjoy/domain/VdsUser.java
@@ -1,4 +1,4 @@
-package com.enjoyvds.domain;
+package com.enjoy.domain;
import lombok.AllArgsConstructor;
import lombok.Data;
diff --git a/src/main/java/com/enjoyvds/domain/dto/KeepaliveObject.java b/src/main/java/com/enjoy/domain/dto/KeepaliveObject.java
similarity index 89%
rename from src/main/java/com/enjoyvds/domain/dto/KeepaliveObject.java
rename to src/main/java/com/enjoy/domain/dto/KeepaliveObject.java
index dd9eddfbce83314171b38e8a7ec8fcbfca895e9e..3fb8fc51803c8bf070d0dd4fd7e9af17897b16f0 100644
--- a/src/main/java/com/enjoyvds/domain/dto/KeepaliveObject.java
+++ b/src/main/java/com/enjoy/domain/dto/KeepaliveObject.java
@@ -1,4 +1,4 @@
-package com.enjoyvds.domain.dto;
+package com.enjoy.domain.dto;
import com.fasterxml.jackson.annotation.JsonProperty;
import lombok.Data;
diff --git a/src/main/java/com/enjoyvds/domain/dto/LoginDTO.java b/src/main/java/com/enjoy/domain/dto/LoginDTO.java
similarity index 83%
rename from src/main/java/com/enjoyvds/domain/dto/LoginDTO.java
rename to src/main/java/com/enjoy/domain/dto/LoginDTO.java
index da2feb690f088579c380b5cbdf608d05a449fe70..f218775b59e9f61175ba275d0a5553477450fdaf 100644
--- a/src/main/java/com/enjoyvds/domain/dto/LoginDTO.java
+++ b/src/main/java/com/enjoy/domain/dto/LoginDTO.java
@@ -1,4 +1,4 @@
-package com.enjoyvds.domain.dto;
+package com.enjoy.domain.dto;
import lombok.Data;
diff --git a/src/main/java/com/enjoyvds/domain/dto/RegisterObject.java b/src/main/java/com/enjoy/domain/dto/RegisterObject.java
similarity index 89%
rename from src/main/java/com/enjoyvds/domain/dto/RegisterObject.java
rename to src/main/java/com/enjoy/domain/dto/RegisterObject.java
index acc4fc87894c95d919a758424cc1e81dd43b69df..8eac4cf6f04bdd8102c58632d6b305899b82a760 100644
--- a/src/main/java/com/enjoyvds/domain/dto/RegisterObject.java
+++ b/src/main/java/com/enjoy/domain/dto/RegisterObject.java
@@ -1,4 +1,4 @@
-package com.enjoyvds.domain.dto;
+package com.enjoy.domain.dto;
import com.fasterxml.jackson.annotation.JsonProperty;
import lombok.Data;
diff --git a/src/main/java/com/enjoyvds/domain/dto/ResponseStatusObject.java b/src/main/java/com/enjoy/domain/dto/ResponseStatusObject.java
similarity index 92%
rename from src/main/java/com/enjoyvds/domain/dto/ResponseStatusObject.java
rename to src/main/java/com/enjoy/domain/dto/ResponseStatusObject.java
index f72fc14f0d6a05680ad52817d226c8d792ead769..4eb8be9bde34d1c44a0bff9bca6eee892d5d28eb 100644
--- a/src/main/java/com/enjoyvds/domain/dto/ResponseStatusObject.java
+++ b/src/main/java/com/enjoy/domain/dto/ResponseStatusObject.java
@@ -1,4 +1,4 @@
-package com.enjoyvds.domain.dto;
+package com.enjoy.domain.dto;
import lombok.AllArgsConstructor;
import lombok.Data;
diff --git a/src/main/java/com/enjoyvds/factory/TimeFormatFactory.java b/src/main/java/com/enjoy/factory/TimeFormatFactory.java
similarity index 97%
rename from src/main/java/com/enjoyvds/factory/TimeFormatFactory.java
rename to src/main/java/com/enjoy/factory/TimeFormatFactory.java
index e4f570e134fdbbd8968c97fc634331758d29bdcd..4461fe887321f2365a3c6ecf64c025f48f2ca60c 100644
--- a/src/main/java/com/enjoyvds/factory/TimeFormatFactory.java
+++ b/src/main/java/com/enjoy/factory/TimeFormatFactory.java
@@ -1,4 +1,4 @@
-package com.enjoyvds.factory;
+package com.enjoy.factory;
import org.springframework.stereotype.Component;
diff --git a/src/main/java/com/enjoyvds/filter/MyExceptionHandler.java b/src/main/java/com/enjoy/filter/MyExceptionHandler.java
similarity index 90%
rename from src/main/java/com/enjoyvds/filter/MyExceptionHandler.java
rename to src/main/java/com/enjoy/filter/MyExceptionHandler.java
index acf3f039f13f65b41fb46dbcb95317121d32752e..43bab38c2f503988dc73196e007049dd58524ed2 100644
--- a/src/main/java/com/enjoyvds/filter/MyExceptionHandler.java
+++ b/src/main/java/com/enjoy/filter/MyExceptionHandler.java
@@ -1,7 +1,7 @@
-package com.enjoyvds.filter;
+package com.enjoy.filter;
-import com.enjoyvds.common.Result;
+import com.enjoy.common.Result;
import lombok.extern.slf4j.Slf4j;
import org.apache.shiro.authz.AuthorizationException;
import org.springframework.web.bind.annotation.ControllerAdvice;
diff --git a/src/main/java/com/enjoyvds/mapper/FileOperateMapper.java b/src/main/java/com/enjoy/mapper/FileOperateMapper.java
similarity index 72%
rename from src/main/java/com/enjoyvds/mapper/FileOperateMapper.java
rename to src/main/java/com/enjoy/mapper/FileOperateMapper.java
index 09291f2c5e1a49153ab737448782f06c6085bbbf..f55042897293616c6b08488dc6adbd40ae956b99 100644
--- a/src/main/java/com/enjoyvds/mapper/FileOperateMapper.java
+++ b/src/main/java/com/enjoy/mapper/FileOperateMapper.java
@@ -1,7 +1,7 @@
-package com.enjoyvds.mapper;
+package com.enjoy.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.enjoyvds.domain.VdsInfoFile;
+import com.enjoy.domain.VdsInfoFile;
/**
* @author 姜风
diff --git a/src/main/java/com/enjoyvds/mapper/LoginMapper.java b/src/main/java/com/enjoy/mapper/LoginMapper.java
similarity index 83%
rename from src/main/java/com/enjoyvds/mapper/LoginMapper.java
rename to src/main/java/com/enjoy/mapper/LoginMapper.java
index 1a5476fdb479b19ad2c2cec9d64b214bc4146f4a..d7c1210561c299d98744173116b040bc608bc8c7 100644
--- a/src/main/java/com/enjoyvds/mapper/LoginMapper.java
+++ b/src/main/java/com/enjoy/mapper/LoginMapper.java
@@ -1,7 +1,7 @@
-package com.enjoyvds.mapper;
+package com.enjoy.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.enjoyvds.domain.VdsUser;
+import com.enjoy.domain.VdsUser;
/**
* @author 姜风
diff --git a/src/main/java/com/enjoyvds/mapper/VdsInfoDeviceMapper.java b/src/main/java/com/enjoy/mapper/VdsInfoDeviceMapper.java
similarity index 90%
rename from src/main/java/com/enjoyvds/mapper/VdsInfoDeviceMapper.java
rename to src/main/java/com/enjoy/mapper/VdsInfoDeviceMapper.java
index 4d39f980d76dba453b74a1d9a467fd7b1a11c907..0172d7b164e0889d8976f771b7f0a15efbc2e2c7 100644
--- a/src/main/java/com/enjoyvds/mapper/VdsInfoDeviceMapper.java
+++ b/src/main/java/com/enjoy/mapper/VdsInfoDeviceMapper.java
@@ -1,7 +1,7 @@
-package com.enjoyvds.mapper;
+package com.enjoy.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.enjoyvds.domain.VdsInfoDevice;
+import com.enjoy.domain.VdsInfoDevice;
import java.util.List;
diff --git a/src/main/java/com/enjoyvds/service/FileOperateService.java b/src/main/java/com/enjoy/service/FileOperateService.java
similarity index 80%
rename from src/main/java/com/enjoyvds/service/FileOperateService.java
rename to src/main/java/com/enjoy/service/FileOperateService.java
index 8df49bf1a539215aa701a39a5b8dab7ba92318c6..7dbd9b7be2afad2c7f967f14ab8c373b07d30ae6 100644
--- a/src/main/java/com/enjoyvds/service/FileOperateService.java
+++ b/src/main/java/com/enjoy/service/FileOperateService.java
@@ -1,6 +1,6 @@
-package com.enjoyvds.service;
+package com.enjoy.service;
-import com.enjoyvds.common.Result;
+import com.enjoy.common.Result;
import org.springframework.web.multipart.MultipartFile;
/**
diff --git a/src/main/java/com/enjoyvds/service/LoginService.java b/src/main/java/com/enjoy/service/LoginService.java
similarity index 77%
rename from src/main/java/com/enjoyvds/service/LoginService.java
rename to src/main/java/com/enjoy/service/LoginService.java
index 0aea2b266e4db0476b536de00e259dbceda1502f..0096a53e1ff87fb0a7561f5eac1472e85ab968da 100644
--- a/src/main/java/com/enjoyvds/service/LoginService.java
+++ b/src/main/java/com/enjoy/service/LoginService.java
@@ -1,6 +1,6 @@
-package com.enjoyvds.service;
+package com.enjoy.service;
-import com.enjoyvds.domain.VdsUser;
+import com.enjoy.domain.VdsUser;
/**
* @author 姜风
diff --git a/src/main/java/com/enjoyvds/service/VdsInfoDeviceService.java b/src/main/java/com/enjoy/service/VdsInfoDeviceService.java
similarity index 91%
rename from src/main/java/com/enjoyvds/service/VdsInfoDeviceService.java
rename to src/main/java/com/enjoy/service/VdsInfoDeviceService.java
index 8bb4ca64ca4747ff91245a222658141b6bd04230..919bad702ffb161a9b0626ba9ca539a4cf421d86 100644
--- a/src/main/java/com/enjoyvds/service/VdsInfoDeviceService.java
+++ b/src/main/java/com/enjoy/service/VdsInfoDeviceService.java
@@ -1,6 +1,6 @@
-package com.enjoyvds.service;
+package com.enjoy.service;
-import com.enjoyvds.domain.VdsInfoDevice;
+import com.enjoy.domain.VdsInfoDevice;
import java.util.List;
diff --git a/src/main/java/com/enjoyvds/service/impl/FileOperateServiceImpl.java b/src/main/java/com/enjoy/service/impl/FileOperateServiceImpl.java
similarity index 85%
rename from src/main/java/com/enjoyvds/service/impl/FileOperateServiceImpl.java
rename to src/main/java/com/enjoy/service/impl/FileOperateServiceImpl.java
index d21dd0e1e8ea4c26d99a3d420770adee655626e2..7d98359b9d30dc2f0f877bdbcf615c20cb3437ef 100644
--- a/src/main/java/com/enjoyvds/service/impl/FileOperateServiceImpl.java
+++ b/src/main/java/com/enjoy/service/impl/FileOperateServiceImpl.java
@@ -1,11 +1,11 @@
-package com.enjoyvds.service.impl;
+package com.enjoy.service.impl;
-import com.enjoyvds.common.Result;
-import com.enjoyvds.config.MinioConfig;
-import com.enjoyvds.mapper.FileOperateMapper;
-import com.enjoyvds.service.FileOperateService;
-import com.enjoyvds.util.MinioUtil;
-import com.enjoyvds.util.SnowflakeGenerateIdUtil;
+import com.enjoy.common.Result;
+import com.enjoy.config.MinioConfig;
+import com.enjoy.mapper.FileOperateMapper;
+import com.enjoy.service.FileOperateService;
+import com.enjoy.util.MinioUtil;
+import com.enjoy.util.SnowflakeGenerateIdUtil;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.time.DateFormatUtils;
import org.springframework.beans.factory.annotation.Autowired;
diff --git a/src/main/java/com/enjoyvds/service/impl/LoginServiceImpl.java b/src/main/java/com/enjoy/service/impl/LoginServiceImpl.java
similarity index 81%
rename from src/main/java/com/enjoyvds/service/impl/LoginServiceImpl.java
rename to src/main/java/com/enjoy/service/impl/LoginServiceImpl.java
index 452fe864c3c69d6dc0ebb6f1716485f7a808effd..802866d2dad237a8995ad4b18b13dd2ef3a26459 100644
--- a/src/main/java/com/enjoyvds/service/impl/LoginServiceImpl.java
+++ b/src/main/java/com/enjoy/service/impl/LoginServiceImpl.java
@@ -1,10 +1,10 @@
-package com.enjoyvds.service.impl;
+package com.enjoy.service.impl;
-import com.enjoyvds.domain.Permissions;
-import com.enjoyvds.domain.Role;
-import com.enjoyvds.domain.VdsUser;
-import com.enjoyvds.mapper.LoginMapper;
-import com.enjoyvds.service.LoginService;
+import com.enjoy.domain.Permissions;
+import com.enjoy.domain.Role;
+import com.enjoy.domain.VdsUser;
+import com.enjoy.mapper.LoginMapper;
+import com.enjoy.service.LoginService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
diff --git a/src/main/java/com/enjoyvds/service/impl/VdsInfoDeviceServiceImpl.java b/src/main/java/com/enjoy/service/impl/VdsInfoDeviceServiceImpl.java
similarity index 90%
rename from src/main/java/com/enjoyvds/service/impl/VdsInfoDeviceServiceImpl.java
rename to src/main/java/com/enjoy/service/impl/VdsInfoDeviceServiceImpl.java
index 71954408f8fdaf1b6550569095a45b4caddfcdc2..6b6970e44bbb66801d6b20ca825f6b18a3deee88 100644
--- a/src/main/java/com/enjoyvds/service/impl/VdsInfoDeviceServiceImpl.java
+++ b/src/main/java/com/enjoy/service/impl/VdsInfoDeviceServiceImpl.java
@@ -1,9 +1,9 @@
-package com.enjoyvds.service.impl;
+package com.enjoy.service.impl;
-import com.enjoyvds.domain.VdsInfoDevice;
-import com.enjoyvds.mapper.VdsInfoDeviceMapper;
-import com.enjoyvds.service.VdsInfoDeviceService;
-import com.enjoyvds.util.SnowflakeGenerateIdUtil;
+import com.enjoy.domain.VdsInfoDevice;
+import com.enjoy.mapper.VdsInfoDeviceMapper;
+import com.enjoy.service.VdsInfoDeviceService;
+import com.enjoy.util.SnowflakeGenerateIdUtil;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
diff --git a/src/main/java/com/enjoyvds/shiro/CustomRealm.java b/src/main/java/com/enjoy/shiro/CustomRealm.java
similarity index 93%
rename from src/main/java/com/enjoyvds/shiro/CustomRealm.java
rename to src/main/java/com/enjoy/shiro/CustomRealm.java
index 7db82eb02d7fdb0099ada50a0a4664d32c5bc742..b8f9185bd73690da23f53511afa676de177a4826 100644
--- a/src/main/java/com/enjoyvds/shiro/CustomRealm.java
+++ b/src/main/java/com/enjoy/shiro/CustomRealm.java
@@ -1,9 +1,9 @@
-package com.enjoyvds.shiro;
+package com.enjoy.shiro;
-import com.enjoyvds.domain.Permissions;
-import com.enjoyvds.domain.Role;
-import com.enjoyvds.domain.VdsUser;
-import com.enjoyvds.service.LoginService;
+import com.enjoy.domain.Permissions;
+import com.enjoy.domain.Role;
+import com.enjoy.domain.VdsUser;
+import com.enjoy.service.LoginService;
import org.apache.shiro.authc.*;
import org.apache.shiro.authz.AuthorizationInfo;
import org.apache.shiro.authz.SimpleAuthorizationInfo;
diff --git a/src/main/java/com/enjoyvds/util/IPUtils.java b/src/main/java/com/enjoy/util/IPUtils.java
similarity index 98%
rename from src/main/java/com/enjoyvds/util/IPUtils.java
rename to src/main/java/com/enjoy/util/IPUtils.java
index f19291c7288ba6c03934e6ed8bae5f23c22ba95d..34abb70f1c9005b17f20a60bad70e302a7abe2c3 100644
--- a/src/main/java/com/enjoyvds/util/IPUtils.java
+++ b/src/main/java/com/enjoy/util/IPUtils.java
@@ -1,4 +1,4 @@
-package com.enjoyvds.util;
+package com.enjoy.util;
import javax.servlet.http.HttpServletRequest;
import java.net.InetAddress;
diff --git a/src/main/java/com/enjoyvds/util/MinioUtil.java b/src/main/java/com/enjoy/util/MinioUtil.java
similarity index 99%
rename from src/main/java/com/enjoyvds/util/MinioUtil.java
rename to src/main/java/com/enjoy/util/MinioUtil.java
index b8e1d97fa91945704a9164b43f907d547296f2e5..1fc4e3f051d786509f7bf47e32a087c058795372 100644
--- a/src/main/java/com/enjoyvds/util/MinioUtil.java
+++ b/src/main/java/com/enjoy/util/MinioUtil.java
@@ -5,7 +5,7 @@
* Date: 2021/6/20 23:04
* Description: minio存储
*/
-package com.enjoyvds.util;
+package com.enjoy.util;
import io.minio.*;
import io.minio.messages.DeleteError;
diff --git a/src/main/java/com/enjoyvds/util/ObjectItem.java b/src/main/java/com/enjoy/util/ObjectItem.java
similarity index 95%
rename from src/main/java/com/enjoyvds/util/ObjectItem.java
rename to src/main/java/com/enjoy/util/ObjectItem.java
index f81923e4534a17a73fadbf53955da7465c2b4ca6..8cd21289e71630c5377d5de01e5e772f8503040e 100644
--- a/src/main/java/com/enjoyvds/util/ObjectItem.java
+++ b/src/main/java/com/enjoy/util/ObjectItem.java
@@ -1,4 +1,4 @@
-package com.enjoyvds.util;
+package com.enjoy.util;
/**
* Minio返回对象
diff --git a/src/main/java/com/enjoyvds/util/SnowflakeGenerateIdUtil.java b/src/main/java/com/enjoy/util/SnowflakeGenerateIdUtil.java
similarity index 99%
rename from src/main/java/com/enjoyvds/util/SnowflakeGenerateIdUtil.java
rename to src/main/java/com/enjoy/util/SnowflakeGenerateIdUtil.java
index ca32c764986862d830132a33992385d899f7c440..696244c04aff9a4c81fc443cf8512f1bece67918 100644
--- a/src/main/java/com/enjoyvds/util/SnowflakeGenerateIdUtil.java
+++ b/src/main/java/com/enjoy/util/SnowflakeGenerateIdUtil.java
@@ -1,4 +1,4 @@
-package com.enjoyvds.util;
+package com.enjoy.util;
/**
/**
diff --git a/src/main/java/com/enjoyvds/util/StringUtils.java b/src/main/java/com/enjoy/util/StringUtils.java
similarity index 99%
rename from src/main/java/com/enjoyvds/util/StringUtils.java
rename to src/main/java/com/enjoy/util/StringUtils.java
index afd27fe767c1b3418c5545c6af6a9ba656a161ff..eae52d7e31f70f40eeabc08878d4106b61c825bd 100644
--- a/src/main/java/com/enjoyvds/util/StringUtils.java
+++ b/src/main/java/com/enjoy/util/StringUtils.java
@@ -1,9 +1,9 @@
-package com.enjoyvds.util;
+package com.enjoy.util;
-import com.enjoyvds.common.text.StrFormatter;
+import com.enjoy.common.text.StrFormatter;
import java.util.*;
diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml
index 760cd5fe5060cb205ffe2739800a211e8b704771..8281c55f9312171ac57325577c0d840772e5eed9 100644
--- a/src/main/resources/application-dev.yml
+++ b/src/main/resources/application-dev.yml
@@ -4,7 +4,7 @@ spring:
type: com.alibaba.druid.pool.DruidDataSource
driverClassName: com.mysql.cj.jdbc.Driver
druid:
- url: jdbc:mysql://112.31.72.250:13307/enjoyvds?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
+ url: jdbc:mysql://112.31.72.250:13307/enjoyviid?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
username: root
password: yiju@123456
# 初始连接数
@@ -34,8 +34,8 @@ spring:
allow:
url-pattern: /druid/*
# 控制台管理用户名和密码
- login-username: enjoyvds
- login-password: enjoyvds
+ login-username: enjoyviid
+ login-password: enjoyviid
filter:
stat:
enabled: true
@@ -76,7 +76,7 @@ minio:
# 密码
secretKey: minioadmin
# MinIO桶名字
- bucketName: enjoyvds
+ bucketName: enjoyviid
# 设备接入请求的地址
service:
diff --git a/src/main/resources/application-prod.yml b/src/main/resources/application-prod.yml
index 760cd5fe5060cb205ffe2739800a211e8b704771..8281c55f9312171ac57325577c0d840772e5eed9 100644
--- a/src/main/resources/application-prod.yml
+++ b/src/main/resources/application-prod.yml
@@ -4,7 +4,7 @@ spring:
type: com.alibaba.druid.pool.DruidDataSource
driverClassName: com.mysql.cj.jdbc.Driver
druid:
- url: jdbc:mysql://112.31.72.250:13307/enjoyvds?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
+ url: jdbc:mysql://112.31.72.250:13307/enjoyviid?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
username: root
password: yiju@123456
# 初始连接数
@@ -34,8 +34,8 @@ spring:
allow:
url-pattern: /druid/*
# 控制台管理用户名和密码
- login-username: enjoyvds
- login-password: enjoyvds
+ login-username: enjoyviid
+ login-password: enjoyviid
filter:
stat:
enabled: true
@@ -76,7 +76,7 @@ minio:
# 密码
secretKey: minioadmin
# MinIO桶名字
- bucketName: enjoyvds
+ bucketName: enjoyviid
# 设备接入请求的地址
service:
diff --git a/src/main/resources/application-test.yml b/src/main/resources/application-test.yml
index 760cd5fe5060cb205ffe2739800a211e8b704771..8281c55f9312171ac57325577c0d840772e5eed9 100644
--- a/src/main/resources/application-test.yml
+++ b/src/main/resources/application-test.yml
@@ -4,7 +4,7 @@ spring:
type: com.alibaba.druid.pool.DruidDataSource
driverClassName: com.mysql.cj.jdbc.Driver
druid:
- url: jdbc:mysql://112.31.72.250:13307/enjoyvds?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
+ url: jdbc:mysql://112.31.72.250:13307/enjoyviid?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
username: root
password: yiju@123456
# 初始连接数
@@ -34,8 +34,8 @@ spring:
allow:
url-pattern: /druid/*
# 控制台管理用户名和密码
- login-username: enjoyvds
- login-password: enjoyvds
+ login-username: enjoyviid
+ login-password: enjoyviid
filter:
stat:
enabled: true
@@ -76,7 +76,7 @@ minio:
# 密码
secretKey: minioadmin
# MinIO桶名字
- bucketName: enjoyvds
+ bucketName: enjoyviid
# 设备接入请求的地址
service:
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index bb42da9bd0b2248b064fd590e7ff4350e5afb8ad..d869a3bb1b7c6ff86f715ad4c72a9989c98c3346 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -1,15 +1,15 @@
# 项目相关配置
-enjoyvds:
+enjoyviid:
# 名称
- name: EnjoyVds
+ name: EnjoyVIID
# 版本
version: 1.0.0
# 版权年份
copyrightYear: 2021
# 实例演示开关
demoEnabled: true
- # 文件路径 示例( Windows配置D:/enjoyvds/uploadPath,Linux配置 /home/enjoyvds/uploadPath)
- profile: D:/enjoyvds/uploadPath
+ # 文件路径 示例( Windows配置D:/enjoyviid/uploadPath,Linux配置 /home/enjoyviid/uploadPath)
+ profile: D:/enjoyviid/uploadPath
# 获取ip地址开关
addressEnabled: false
@@ -55,7 +55,7 @@ spring:
# MyBatis配置
mybatis:
# 搜索指定包别名
- typeAliasesPackage: com.enjoyvds.**.domain
+ typeAliasesPackage: com.enjoy.**.domain
# 配置mapper的扫描,找到所有的mapper.xml映射文件
mapperLocations: classpath*:mapper/**/*Mapper.xml
# 加载全局的配置文件
diff --git a/src/main/resources/logback.xml b/src/main/resources/logback.xml
index 414287f7147cb163abdd0e3eafba9a3355505dee..09b9add75c2971b48d2665b0306fe21650ed4e76 100644
--- a/src/main/resources/logback.xml
+++ b/src/main/resources/logback.xml
@@ -12,7 +12,7 @@
-
+
@@ -161,8 +161,8 @@
-
-
+
+
diff --git a/src/main/resources/mapper/FileOperateMapper.xml b/src/main/resources/mapper/FileOperateMapper.xml
index 7f70bc5169c9df9cd556744e4d934466ce9e499b..3275461f11d02ebb340abcb5e224afabf14414e0 100644
--- a/src/main/resources/mapper/FileOperateMapper.xml
+++ b/src/main/resources/mapper/FileOperateMapper.xml
@@ -1,5 +1,5 @@
-
+
\ No newline at end of file
diff --git a/src/main/resources/mapper/LoginMapper.xml b/src/main/resources/mapper/LoginMapper.xml
index 372aed5d99c501d5ef0892742200174229116cfc..d0c7e785237bf80d5f703f5f724c3ece904efada 100644
--- a/src/main/resources/mapper/LoginMapper.xml
+++ b/src/main/resources/mapper/LoginMapper.xml
@@ -1,8 +1,8 @@
-
+
-
+
diff --git a/src/main/resources/mapper/VdsInfoDeviceMapper.xml b/src/main/resources/mapper/VdsInfoDeviceMapper.xml
index 3a683a0dcdc2c783882e8822a5bc840e30e5b5db..1e520e3c9f5188ef7ca34ed888c282c556b6eb12 100644
--- a/src/main/resources/mapper/VdsInfoDeviceMapper.xml
+++ b/src/main/resources/mapper/VdsInfoDeviceMapper.xml
@@ -1,8 +1,8 @@
-
+
-
+