代码初始化

vetti-admin/pom.xml

@@ -0,0 +1,106 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <artifactId>vetti-service</artifactId>
+        <groupId>com.vetti</groupId>
+        <version>3.9.0</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+    <packaging>jar</packaging>
+    <artifactId>vetti-admin</artifactId>
+
+    <description>
+        web服务入口
+    </description>
+
+    <dependencies>
+
+        <!-- spring-boot-devtools -->
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-devtools</artifactId>
+            <!-- 表示依赖不会传递 -->
+            <optional>true</optional>
+        </dependency>
+
+        <!-- swagger3-->
+        <dependency>
+            <groupId>io.springfox</groupId>
+            <artifactId>springfox-boot-starter</artifactId>
+        </dependency>
+
+        <!-- knife4j Swagger 增强版本 -->
+        <dependency>
+            <groupId>com.github.xiaoymin</groupId>
+            <artifactId>knife4j-spring-boot-starter</artifactId>
+            <version>3.0.3</version>
+        </dependency>
+
+        <!-- 防止进入swagger页面报类型转换错误，排除3.0.0中的引用，手动增加1.6.2版本 -->
+        <dependency>
+            <groupId>io.swagger</groupId>
+            <artifactId>swagger-models</artifactId>
+            <version>1.6.2</version>
+        </dependency>
+
+         <!-- Mysql驱动包 -->
+        <dependency>
+            <groupId>mysql</groupId>
+            <artifactId>mysql-connector-java</artifactId>
+        </dependency>
+
+        <!-- 核心模块-->
+        <dependency>
+            <groupId>com.vetti</groupId>
+            <artifactId>vetti-framework</artifactId>
+        </dependency>
+
+        <!-- 定时任务-->
+        <dependency>
+            <groupId>com.vetti</groupId>
+            <artifactId>vetti-quartz</artifactId>
+        </dependency>
+
+        <!-- 代码生成-->
+        <dependency>
+            <groupId>com.vetti</groupId>
+            <artifactId>vetti-generator</artifactId>
+        </dependency>
+
+
+
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.springframework.boot</groupId>
+                <artifactId>spring-boot-maven-plugin</artifactId>
+                <version>2.5.15</version>
+                <configuration>
+                    <fork>true</fork> <!-- 如果没有该配置，devtools不会生效 -->
+                </configuration>
+                <executions>
+                    <execution>
+                        <goals>
+                            <goal>repackage</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>   
+                <groupId>org.apache.maven.plugins</groupId>   
+                <artifactId>maven-war-plugin</artifactId>   
+                <version>3.1.0</version>   
+                <configuration>
+                    <failOnMissingWebXml>false</failOnMissingWebXml>
+                    <warName>${project.artifactId}</warName>
+                </configuration>   
+           </plugin>   
+        </plugins>
+        <finalName>${project.artifactId}</finalName>
+    </build>
+
+</project>

vetti-admin/src/main/java/com/vetti/RuoYiApplication.java

@@ -0,0 +1,23 @@
+package com.vetti;
+
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration;
+import org.springframework.boot.web.servlet.ServletComponentScan;
+
+/**
+ * 启动程序
+ * 
+ * @author ruoyi
+ */
+@SpringBootApplication(exclude = { DataSourceAutoConfiguration.class })
+@ServletComponentScan
+public class RuoYiApplication
+{
+    public static void main(String[] args)
+    {
+        SpringApplication.run(RuoYiApplication.class, args);
+        System.out.println("(♥◠‿◠)ﾉﾞ  Vetti Dashboard Startup Successful   ლ(´ڡ`ლ)ﾞ  \n");
+
+    }
+}

vetti-admin/src/main/java/com/vetti/RuoYiServletInitializer.java

@@ -0,0 +1,18 @@
+package com.vetti;
+
+import org.springframework.boot.builder.SpringApplicationBuilder;
+import org.springframework.boot.web.servlet.support.SpringBootServletInitializer;
+
+/**
+ * web容器中进行部署
+ * 
+ * @author ruoyi
+ */
+public class RuoYiServletInitializer extends SpringBootServletInitializer
+{
+    @Override
+    protected SpringApplicationBuilder configure(SpringApplicationBuilder application)
+    {
+        return application.sources(RuoYiApplication.class);
+    }
+}

vetti-admin/src/main/java/com/vetti/config/IgnoreWhiteProperties.java

@@ -0,0 +1,24 @@
+package com.vetti.config;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import lombok.Data;
+import org.springframework.boot.context.properties.ConfigurationProperties;
+import org.springframework.context.annotation.Configuration;
+
+/**
+ * 放行白名单配置
+ * 
+ * @author wangxiangshun
+ */
+@Data
+@Configuration
+@ConfigurationProperties(prefix = "security.ignore")
+public class IgnoreWhiteProperties
+{
+    /**
+     * 放行白名单配置，网关不校验此处的白名单
+     */
+    private List<String> whites = new ArrayList<>();
+}

vetti-admin/src/main/java/com/vetti/filter/AuthFilter.java

@@ -0,0 +1,139 @@
+package com.vetti.filter;
+
+import com.vetti.common.constant.CacheConstants;
+import com.vetti.common.constant.SecurityConstants;
+import com.vetti.common.constant.TokenConstants;
+import com.vetti.common.core.redis.RedisService;
+import com.vetti.common.utils.JwtUtils;
+import com.vetti.common.utils.MessageUtils;
+import com.vetti.common.utils.StringUtils;
+import com.vetti.config.IgnoreWhiteProperties;
+import io.jsonwebtoken.Claims;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+import javax.servlet.*;
+import javax.servlet.annotation.WebFilter;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+import java.io.PrintWriter;
+
+/**
+ * APP登录鉴权
+ * 
+ * @author wangxiangshun
+ */
+@Component
+@WebFilter
+public class AuthFilter implements Filter
+{
+    private static final Logger log = LoggerFactory.getLogger(AuthFilter.class);
+
+    // 排除过滤的 uri 地址
+    @Autowired
+    private IgnoreWhiteProperties ignoreWhite;
+
+    @Autowired
+    private RedisService redisService;
+
+    /**
+     * 获取缓存key
+     */
+    private String getTokenKey(String token)
+    {
+        return CacheConstants.LOGIN_TOKEN_KEY + token;
+    }
+
+    /**
+     * 获取请求token
+     */
+    private String getToken(HttpServletRequest request)
+    {
+        String token = request.getHeader(SecurityConstants.AUTHORIZATION_HEADER);
+        // 如果前端设置了令牌前缀，则裁剪掉前缀
+        if (StringUtils.isNotEmpty(token) && token.startsWith(TokenConstants.PREFIX))
+        {
+            token = token.replaceFirst(TokenConstants.PREFIX, StringUtils.EMPTY);
+        }
+        return token;
+    }
+
+    @Override
+    public void doFilter(ServletRequest request, ServletResponse response, FilterChain chain)
+            throws IOException, ServletException {
+
+        HttpServletRequest httpRequest = (HttpServletRequest) request;
+        HttpServletResponse httpResponse = (HttpServletResponse) response;
+        // 执行拦截逻辑
+        String url = httpRequest.getRequestURI();
+        // 跳过不需要验证的路径
+        if ((url != null && url.contains("/v1/app"))
+                && !StringUtils.matches(url, ignoreWhite.getWhites()))
+        {
+            String token = getToken(httpRequest);
+            if (StringUtils.isEmpty(token))
+            {
+                // 认证失败：返回 401
+                sendResponse(httpResponse,HttpServletResponse.SC_UNAUTHORIZED, MessageUtils.messageCustomize("systemExceptionAuthFilter10001"));
+                // 中断请求
+                return;
+            }
+            Claims claims = JwtUtils.parseToken(token);
+            if (claims == null)
+            {
+                // 认证失败：返回 401
+                sendResponse(httpResponse,HttpServletResponse.SC_UNAUTHORIZED,MessageUtils.messageCustomize("systemExceptionAuthFilter10002"));
+                // 中断请求
+                return;
+            }
+            String userkey = JwtUtils.getUserKey(claims);
+            boolean islogin = redisService.hasKey(getTokenKey(userkey));
+            if (!islogin)
+            {
+                // 认证失败：返回 401
+                sendResponse(httpResponse,HttpServletResponse.SC_UNAUTHORIZED,MessageUtils.messageCustomize("systemExceptionAuthFilter10003"));
+                // 中断请求
+                return;
+            }
+
+            String userid = JwtUtils.getUserId(claims);
+            String username = JwtUtils.getUserName(claims);
+            if (StringUtils.isEmpty(userid) || StringUtils.isEmpty(username))
+            {
+                // 认证失败：返回 401
+                sendResponse(httpResponse,HttpServletResponse.SC_UNAUTHORIZED,MessageUtils.messageCustomize("systemExceptionAuthFilter10004"));
+                // 中断请求
+                return;
+            }
+        }
+        // 拦截通过，继续执行后续过滤器或控制器
+        chain.doFilter(request, response);
+    }
+
+    /**
+     * 返回响应结构体
+     * @param response
+     * @param code HTTP状态码
+     * @param message 提示信息
+     * @throws IOException
+     */
+    private void sendResponse(HttpServletResponse response,int code, String message) throws IOException {
+        // 设置HTTP状态码
+        response.setStatus(code);
+        // 设置响应内容类型（JSON格式便于前端解析）
+        response.setContentType("application/json;charset=UTF-8");
+        // 构建响应体（包含错误信息）
+        String jsonResponse = String.format(
+                "{\"code\": "+code+", \"msg\": \"%s\"}",
+                message
+        );
+        // 写入响应并关闭流
+        PrintWriter writer = response.getWriter();
+        writer.write(jsonResponse);
+        writer.flush();
+        writer.close();
+    }
+}

vetti-admin/src/main/java/com/vetti/web/controller/common/CaptchaController.java

@@ -0,0 +1,94 @@
+package com.vetti.web.controller.common;
+
+import java.awt.image.BufferedImage;
+import java.io.IOException;
+import java.util.concurrent.TimeUnit;
+import javax.annotation.Resource;
+import javax.imageio.ImageIO;
+import javax.servlet.http.HttpServletResponse;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.FastByteArrayOutputStream;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RestController;
+import com.google.code.kaptcha.Producer;
+import com.vetti.common.config.RuoYiConfig;
+import com.vetti.common.constant.CacheConstants;
+import com.vetti.common.constant.Constants;
+import com.vetti.common.core.domain.AjaxResult;
+import com.vetti.common.core.redis.RedisCache;
+import com.vetti.common.utils.sign.Base64;
+import com.vetti.common.utils.uuid.IdUtils;
+import com.vetti.system.service.ISysConfigService;
+
+/**
+ * 验证码操作处理
+ * 
+ * @author ruoyi
+ */
+@RestController
+public class CaptchaController
+{
+    @Resource(name = "captchaProducer")
+    private Producer captchaProducer;
+
+    @Resource(name = "captchaProducerMath")
+    private Producer captchaProducerMath;
+
+    @Autowired
+    private RedisCache redisCache;
+    
+    @Autowired
+    private ISysConfigService configService;
+    /**
+     * 生成验证码
+     */
+    @GetMapping("/captchaImage")
+    public AjaxResult getCode(HttpServletResponse response) throws IOException
+    {
+        AjaxResult ajax = AjaxResult.success();
+        boolean captchaEnabled = configService.selectCaptchaEnabled();
+        ajax.put("captchaEnabled", captchaEnabled);
+        if (!captchaEnabled)
+        {
+            return ajax;
+        }
+
+        // 保存验证码信息
+        String uuid = IdUtils.simpleUUID();
+        String verifyKey = CacheConstants.CAPTCHA_CODE_KEY + uuid;
+
+        String capStr = null, code = null;
+        BufferedImage image = null;
+
+        // 生成验证码
+        String captchaType = RuoYiConfig.getCaptchaType();
+        if ("math".equals(captchaType))
+        {
+            String capText = captchaProducerMath.createText();
+            capStr = capText.substring(0, capText.lastIndexOf("@"));
+            code = capText.substring(capText.lastIndexOf("@") + 1);
+            image = captchaProducerMath.createImage(capStr);
+        }
+        else if ("char".equals(captchaType))
+        {
+            capStr = code = captchaProducer.createText();
+            image = captchaProducer.createImage(capStr);
+        }
+
+        redisCache.setCacheObject(verifyKey, code, Constants.CAPTCHA_EXPIRATION, TimeUnit.MINUTES);
+        // 转换流信息写出
+        FastByteArrayOutputStream os = new FastByteArrayOutputStream();
+        try
+        {
+            ImageIO.write(image, "jpg", os);
+        }
+        catch (IOException e)
+        {
+            return AjaxResult.error(e.getMessage());
+        }
+
+        ajax.put("uuid", uuid);
+        ajax.put("img", Base64.encode(os.toByteArray()));
+        return ajax;
+    }
+}

vetti-admin/src/main/java/com/vetti/web/controller/common/CommonController.java

@@ -0,0 +1,162 @@
+package com.vetti.web.controller.common;
+
+import java.util.ArrayList;
+import java.util.List;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.MediaType;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.multipart.MultipartFile;
+import com.vetti.common.config.RuoYiConfig;
+import com.vetti.common.core.domain.AjaxResult;
+import com.vetti.common.utils.StringUtils;
+import com.vetti.common.utils.file.FileUploadUtils;
+import com.vetti.common.utils.file.FileUtils;
+import com.vetti.framework.config.ServerConfig;
+
+/**
+ * 通用请求处理
+ * 
+ * @author ruoyi
+ */
+@RestController
+@RequestMapping("/common")
+public class CommonController
+{
+    private static final Logger log = LoggerFactory.getLogger(CommonController.class);
+
+    @Autowired
+    private ServerConfig serverConfig;
+
+    private static final String FILE_DELIMETER = ",";
+
+    /**
+     * 通用下载请求
+     * 
+     * @param fileName 文件名称
+     * @param delete 是否删除
+     */
+    @GetMapping("/download")
+    public void fileDownload(String fileName, Boolean delete, HttpServletResponse response, HttpServletRequest request)
+    {
+        try
+        {
+            if (!FileUtils.checkAllowDownload(fileName))
+            {
+                throw new Exception(StringUtils.format("文件名称({})非法，不允许下载。 ", fileName));
+            }
+            String realFileName = System.currentTimeMillis() + fileName.substring(fileName.indexOf("_") + 1);
+            String filePath = RuoYiConfig.getDownloadPath() + fileName;
+
+            response.setContentType(MediaType.APPLICATION_OCTET_STREAM_VALUE);
+            FileUtils.setAttachmentResponseHeader(response, realFileName);
+            FileUtils.writeBytes(filePath, response.getOutputStream());
+            if (delete)
+            {
+                FileUtils.deleteFile(filePath);
+            }
+        }
+        catch (Exception e)
+        {
+            log.error("下载文件失败", e);
+        }
+    }
+
+    /**
+     * 通用上传请求（单个）
+     */
+    @PostMapping("/upload")
+    public AjaxResult uploadFile(MultipartFile file) throws Exception
+    {
+        try
+        {
+            // 上传文件路径
+            String filePath = RuoYiConfig.getUploadPath();
+            // 上传并返回新文件名称
+            String fileName = FileUploadUtils.upload(filePath, file);
+            String url = serverConfig.getUrl() + fileName;
+            AjaxResult ajax = AjaxResult.success();
+            ajax.put("url", url);
+            ajax.put("fileName", fileName);
+            ajax.put("newFileName", FileUtils.getName(fileName));
+            ajax.put("originalFilename", file.getOriginalFilename());
+            return ajax;
+        }
+        catch (Exception e)
+        {
+            return AjaxResult.error(e.getMessage());
+        }
+    }
+
+    /**
+     * 通用上传请求（多个）
+     */
+    @PostMapping("/uploads")
+    public AjaxResult uploadFiles(List<MultipartFile> files) throws Exception
+    {
+        try
+        {
+            // 上传文件路径
+            String filePath = RuoYiConfig.getUploadPath();
+            List<String> urls = new ArrayList<String>();
+            List<String> fileNames = new ArrayList<String>();
+            List<String> newFileNames = new ArrayList<String>();
+            List<String> originalFilenames = new ArrayList<String>();
+            for (MultipartFile file : files)
+            {
+                // 上传并返回新文件名称
+                String fileName = FileUploadUtils.upload(filePath, file);
+                String url = serverConfig.getUrl() + fileName;
+                urls.add(url);
+                fileNames.add(fileName);
+                newFileNames.add(FileUtils.getName(fileName));
+                originalFilenames.add(file.getOriginalFilename());
+            }
+            AjaxResult ajax = AjaxResult.success();
+            ajax.put("urls", StringUtils.join(urls, FILE_DELIMETER));
+            ajax.put("fileNames", StringUtils.join(fileNames, FILE_DELIMETER));
+            ajax.put("newFileNames", StringUtils.join(newFileNames, FILE_DELIMETER));
+            ajax.put("originalFilenames", StringUtils.join(originalFilenames, FILE_DELIMETER));
+            return ajax;
+        }
+        catch (Exception e)
+        {
+            return AjaxResult.error(e.getMessage());
+        }
+    }
+
+    /**
+     * 本地资源通用下载
+     */
+    @GetMapping("/download/resource")
+    public void resourceDownload(String resource, HttpServletRequest request, HttpServletResponse response)
+            throws Exception
+    {
+        try
+        {
+            if (!FileUtils.checkAllowDownload(resource))
+            {
+                throw new Exception(StringUtils.format("资源文件({})非法，不允许下载。 ", resource));
+            }
+            // 本地资源路径
+            String localPath = RuoYiConfig.getProfile();
+            // 数据库资源地址
+            String downloadPath = localPath + FileUtils.stripPrefix(resource);
+            // 下载名称
+            String downloadName = StringUtils.substringAfterLast(downloadPath, "/");
+            response.setContentType(MediaType.APPLICATION_OCTET_STREAM_VALUE);
+            FileUtils.setAttachmentResponseHeader(response, downloadName);
+            FileUtils.writeBytes(downloadPath, response.getOutputStream());
+        }
+        catch (Exception e)
+        {
+            log.error("下载文件失败", e);
+        }
+    }
+}

vetti-admin/src/main/java/com/vetti/web/controller/monitor/CacheController.java

@@ -0,0 +1,121 @@
+package com.vetti.web.controller.monitor;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Properties;
+import java.util.Set;
+import java.util.TreeSet;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.redis.core.RedisCallback;
+import org.springframework.data.redis.core.RedisTemplate;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import com.vetti.common.constant.CacheConstants;
+import com.vetti.common.core.domain.AjaxResult;
+import com.vetti.common.utils.StringUtils;
+import com.vetti.system.domain.SysCache;
+
+/**
+ * 缓存监控
+ * 
+ * @author ruoyi
+ */
+@RestController
+@RequestMapping("/monitor/cache")
+public class CacheController
+{
+    @Autowired
+    private RedisTemplate<String, String> redisTemplate;
+
+    private final static List<SysCache> caches = new ArrayList<SysCache>();
+    {
+        caches.add(new SysCache(CacheConstants.LOGIN_TOKEN_KEY, "用户信息"));
+        caches.add(new SysCache(CacheConstants.SYS_CONFIG_KEY, "配置信息"));
+        caches.add(new SysCache(CacheConstants.SYS_DICT_KEY, "数据字典"));
+        caches.add(new SysCache(CacheConstants.CAPTCHA_CODE_KEY, "验证码"));
+        caches.add(new SysCache(CacheConstants.REPEAT_SUBMIT_KEY, "防重提交"));
+        caches.add(new SysCache(CacheConstants.RATE_LIMIT_KEY, "限流处理"));
+        caches.add(new SysCache(CacheConstants.PWD_ERR_CNT_KEY, "密码错误次数"));
+    }
+
+    @PreAuthorize("@ss.hasPermi('monitor:cache:list')")
+    @GetMapping()
+    public AjaxResult getInfo() throws Exception
+    {
+        Properties info = (Properties) redisTemplate.execute((RedisCallback<Object>) connection -> connection.info());
+        Properties commandStats = (Properties) redisTemplate.execute((RedisCallback<Object>) connection -> connection.info("commandstats"));
+        Object dbSize = redisTemplate.execute((RedisCallback<Object>) connection -> connection.dbSize());
+
+        Map<String, Object> result = new HashMap<>(3);
+        result.put("info", info);
+        result.put("dbSize", dbSize);
+
+        List<Map<String, String>> pieList = new ArrayList<>();
+        commandStats.stringPropertyNames().forEach(key -> {
+            Map<String, String> data = new HashMap<>(2);
+            String property = commandStats.getProperty(key);
+            data.put("name", StringUtils.removeStart(key, "cmdstat_"));
+            data.put("value", StringUtils.substringBetween(property, "calls=", ",usec"));
+            pieList.add(data);
+        });
+        result.put("commandStats", pieList);
+        return AjaxResult.success(result);
+    }
+
+    @PreAuthorize("@ss.hasPermi('monitor:cache:list')")
+    @GetMapping("/getNames")
+    public AjaxResult cache()
+    {
+        return AjaxResult.success(caches);
+    }
+
+    @PreAuthorize("@ss.hasPermi('monitor:cache:list')")
+    @GetMapping("/getKeys/{cacheName}")
+    public AjaxResult getCacheKeys(@PathVariable String cacheName)
+    {
+        Set<String> cacheKeys = redisTemplate.keys(cacheName + "*");
+        return AjaxResult.success(new TreeSet<>(cacheKeys));
+    }
+
+    @PreAuthorize("@ss.hasPermi('monitor:cache:list')")
+    @GetMapping("/getValue/{cacheName}/{cacheKey}")
+    public AjaxResult getCacheValue(@PathVariable String cacheName, @PathVariable String cacheKey)
+    {
+        String cacheValue = redisTemplate.opsForValue().get(cacheKey);
+        SysCache sysCache = new SysCache(cacheName, cacheKey, cacheValue);
+        return AjaxResult.success(sysCache);
+    }
+
+    @PreAuthorize("@ss.hasPermi('monitor:cache:list')")
+    @DeleteMapping("/clearCacheName/{cacheName}")
+    public AjaxResult clearCacheName(@PathVariable String cacheName)
+    {
+        Collection<String> cacheKeys = redisTemplate.keys(cacheName + "*");
+        redisTemplate.delete(cacheKeys);
+        return AjaxResult.success();
+    }
+
+    @PreAuthorize("@ss.hasPermi('monitor:cache:list')")
+    @DeleteMapping("/clearCacheKey/{cacheKey}")
+    public AjaxResult clearCacheKey(@PathVariable String cacheKey)
+    {
+        redisTemplate.delete(cacheKey);
+        return AjaxResult.success();
+    }
+
+    @PreAuthorize("@ss.hasPermi('monitor:cache:list')")
+    @DeleteMapping("/clearCacheAll")
+    public AjaxResult clearCacheAll()
+    {
+        Collection<String> cacheKeys = redisTemplate.keys("*");
+        redisTemplate.delete(cacheKeys);
+        return AjaxResult.success();
+    }
+}

vetti-admin/src/main/java/com/vetti/web/controller/monitor/ServerController.java

@@ -0,0 +1,27 @@
+package com.vetti.web.controller.monitor;
+
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import com.vetti.common.core.domain.AjaxResult;
+import com.vetti.framework.web.domain.Server;
+
+/**
+ * 服务器监控
+ * 
+ * @author ruoyi
+ */
+@RestController
+@RequestMapping("/monitor/server")
+public class ServerController
+{
+    @PreAuthorize("@ss.hasPermi('monitor:server:list')")
+    @GetMapping()
+    public AjaxResult getInfo() throws Exception
+    {
+        Server server = new Server();
+        server.copyTo();
+        return AjaxResult.success(server);
+    }
+}

vetti-admin/src/main/java/com/vetti/web/controller/monitor/SysLogininforController.java

@@ -0,0 +1,82 @@
+package com.vetti.web.controller.monitor;
+
+import java.util.List;
+import javax.servlet.http.HttpServletResponse;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import com.vetti.common.annotation.Log;
+import com.vetti.common.core.controller.BaseController;
+import com.vetti.common.core.domain.AjaxResult;
+import com.vetti.common.core.page.TableDataInfo;
+import com.vetti.common.enums.BusinessType;
+import com.vetti.common.utils.poi.ExcelUtil;
+import com.vetti.framework.web.service.SysPasswordService;
+import com.vetti.system.domain.SysLogininfor;
+import com.vetti.system.service.ISysLogininforService;
+
+/**
+ * 系统访问记录
+ * 
+ * @author ruoyi
+ */
+@RestController
+@RequestMapping("/monitor/logininfor")
+public class SysLogininforController extends BaseController
+{
+    @Autowired
+    private ISysLogininforService logininforService;
+
+    @Autowired
+    private SysPasswordService passwordService;
+
+    @PreAuthorize("@ss.hasPermi('monitor:logininfor:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(SysLogininfor logininfor)
+    {
+        startPage();
+        List<SysLogininfor> list = logininforService.selectLogininforList(logininfor);
+        return getDataTable(list);
+    }
+
+    @Log(title = "登录日志", businessType = BusinessType.EXPORT)
+    @PreAuthorize("@ss.hasPermi('monitor:logininfor:export')")
+    @PostMapping("/export")
+    public void export(HttpServletResponse response, SysLogininfor logininfor)
+    {
+        List<SysLogininfor> list = logininforService.selectLogininforList(logininfor);
+        ExcelUtil<SysLogininfor> util = new ExcelUtil<SysLogininfor>(SysLogininfor.class);
+        util.exportExcel(response, list, "登录日志");
+    }
+
+    @PreAuthorize("@ss.hasPermi('monitor:logininfor:remove')")
+    @Log(title = "登录日志", businessType = BusinessType.DELETE)
+    @DeleteMapping("/{infoIds}")
+    public AjaxResult remove(@PathVariable Long[] infoIds)
+    {
+        return toAjax(logininforService.deleteLogininforByIds(infoIds));
+    }
+
+    @PreAuthorize("@ss.hasPermi('monitor:logininfor:remove')")
+    @Log(title = "登录日志", businessType = BusinessType.CLEAN)
+    @DeleteMapping("/clean")
+    public AjaxResult clean()
+    {
+        logininforService.cleanLogininfor();
+        return success();
+    }
+
+    @PreAuthorize("@ss.hasPermi('monitor:logininfor:unlock')")
+    @Log(title = "账户解锁", businessType = BusinessType.OTHER)
+    @GetMapping("/unlock/{userName}")
+    public AjaxResult unlock(@PathVariable("userName") String userName)
+    {
+        passwordService.clearLoginRecordCache(userName);
+        return success();
+    }
+}

vetti-admin/src/main/java/com/vetti/web/controller/monitor/SysOperlogController.java

@@ -0,0 +1,69 @@
+package com.vetti.web.controller.monitor;
+
+import java.util.List;
+import javax.servlet.http.HttpServletResponse;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import com.vetti.common.annotation.Log;
+import com.vetti.common.core.controller.BaseController;
+import com.vetti.common.core.domain.AjaxResult;
+import com.vetti.common.core.page.TableDataInfo;
+import com.vetti.common.enums.BusinessType;
+import com.vetti.common.utils.poi.ExcelUtil;
+import com.vetti.system.domain.SysOperLog;
+import com.vetti.system.service.ISysOperLogService;
+
+/**
+ * 操作日志记录
+ * 
+ * @author ruoyi
+ */
+@RestController
+@RequestMapping("/monitor/operlog")
+public class SysOperlogController extends BaseController
+{
+    @Autowired
+    private ISysOperLogService operLogService;
+
+    @PreAuthorize("@ss.hasPermi('monitor:operlog:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(SysOperLog operLog)
+    {
+        startPage();
+        List<SysOperLog> list = operLogService.selectOperLogList(operLog);
+        return getDataTable(list);
+    }
+
+    @Log(title = "操作日志", businessType = BusinessType.EXPORT)
+    @PreAuthorize("@ss.hasPermi('monitor:operlog:export')")
+    @PostMapping("/export")
+    public void export(HttpServletResponse response, SysOperLog operLog)
+    {
+        List<SysOperLog> list = operLogService.selectOperLogList(operLog);
+        ExcelUtil<SysOperLog> util = new ExcelUtil<SysOperLog>(SysOperLog.class);
+        util.exportExcel(response, list, "操作日志");
+    }
+
+    @Log(title = "操作日志", businessType = BusinessType.DELETE)
+    @PreAuthorize("@ss.hasPermi('monitor:operlog:remove')")
+    @DeleteMapping("/{operIds}")
+    public AjaxResult remove(@PathVariable Long[] operIds)
+    {
+        return toAjax(operLogService.deleteOperLogByIds(operIds));
+    }
+
+    @Log(title = "操作日志", businessType = BusinessType.CLEAN)
+    @PreAuthorize("@ss.hasPermi('monitor:operlog:remove')")
+    @DeleteMapping("/clean")
+    public AjaxResult clean()
+    {
+        operLogService.cleanOperLog();
+        return success();
+    }
+}

vetti-admin/src/main/java/com/vetti/web/controller/monitor/SysUserOnlineController.java

@@ -0,0 +1,83 @@
+package com.vetti.web.controller.monitor;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.List;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import com.vetti.common.annotation.Log;
+import com.vetti.common.constant.CacheConstants;
+import com.vetti.common.core.controller.BaseController;
+import com.vetti.common.core.domain.AjaxResult;
+import com.vetti.common.core.domain.model.LoginUser;
+import com.vetti.common.core.page.TableDataInfo;
+import com.vetti.common.core.redis.RedisCache;
+import com.vetti.common.enums.BusinessType;
+import com.vetti.common.utils.StringUtils;
+import com.vetti.system.domain.SysUserOnline;
+import com.vetti.system.service.ISysUserOnlineService;
+
+/**
+ * 在线用户监控
+ * 
+ * @author ruoyi
+ */
+@RestController
+@RequestMapping("/monitor/online")
+public class SysUserOnlineController extends BaseController
+{
+    @Autowired
+    private ISysUserOnlineService userOnlineService;
+
+    @Autowired
+    private RedisCache redisCache;
+
+    @PreAuthorize("@ss.hasPermi('monitor:online:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(String ipaddr, String userName)
+    {
+        Collection<String> keys = redisCache.keys(CacheConstants.LOGIN_TOKEN_KEY + "*");
+        List<SysUserOnline> userOnlineList = new ArrayList<SysUserOnline>();
+        for (String key : keys)
+        {
+            LoginUser user = redisCache.getCacheObject(key);
+            if (StringUtils.isNotEmpty(ipaddr) && StringUtils.isNotEmpty(userName))
+            {
+                userOnlineList.add(userOnlineService.selectOnlineByInfo(ipaddr, userName, user));
+            }
+            else if (StringUtils.isNotEmpty(ipaddr))
+            {
+                userOnlineList.add(userOnlineService.selectOnlineByIpaddr(ipaddr, user));
+            }
+            else if (StringUtils.isNotEmpty(userName) && StringUtils.isNotNull(user.getUser()))
+            {
+                userOnlineList.add(userOnlineService.selectOnlineByUserName(userName, user));
+            }
+            else
+            {
+                userOnlineList.add(userOnlineService.loginUserToUserOnline(user));
+            }
+        }
+        Collections.reverse(userOnlineList);
+        userOnlineList.removeAll(Collections.singleton(null));
+        return getDataTable(userOnlineList);
+    }
+
+    /**
+     * 强退用户
+     */
+    @PreAuthorize("@ss.hasPermi('monitor:online:forceLogout')")
+    @Log(title = "在线用户", businessType = BusinessType.FORCE)
+    @DeleteMapping("/{tokenId}")
+    public AjaxResult forceLogout(@PathVariable String tokenId)
+    {
+        redisCache.deleteObject(CacheConstants.LOGIN_TOKEN_KEY + tokenId);
+        return success();
+    }
+}

vetti-admin/src/main/java/com/vetti/web/controller/system/SysConfigController.java

@@ -0,0 +1,133 @@
+package com.vetti.web.controller.system;
+
+import java.util.List;
+import javax.servlet.http.HttpServletResponse;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import com.vetti.common.annotation.Log;
+import com.vetti.common.core.controller.BaseController;
+import com.vetti.common.core.domain.AjaxResult;
+import com.vetti.common.core.page.TableDataInfo;
+import com.vetti.common.enums.BusinessType;
+import com.vetti.common.utils.poi.ExcelUtil;
+import com.vetti.system.domain.SysConfig;
+import com.vetti.system.service.ISysConfigService;
+
+/**
+ * 参数配置 信息操作处理
+ * 
+ * @author ruoyi
+ */
+@RestController
+@RequestMapping("/system/config")
+public class SysConfigController extends BaseController
+{
+    @Autowired
+    private ISysConfigService configService;
+
+    /**
+     * 获取参数配置列表
+     */
+    @PreAuthorize("@ss.hasPermi('system:config:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(SysConfig config)
+    {
+        startPage();
+        List<SysConfig> list = configService.selectConfigList(config);
+        return getDataTable(list);
+    }
+
+    @Log(title = "参数管理", businessType = BusinessType.EXPORT)
+    @PreAuthorize("@ss.hasPermi('system:config:export')")
+    @PostMapping("/export")
+    public void export(HttpServletResponse response, SysConfig config)
+    {
+        List<SysConfig> list = configService.selectConfigList(config);
+        ExcelUtil<SysConfig> util = new ExcelUtil<SysConfig>(SysConfig.class);
+        util.exportExcel(response, list, "参数数据");
+    }
+
+    /**
+     * 根据参数编号获取详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('system:config:query')")
+    @GetMapping(value = "/{configId}")
+    public AjaxResult getInfo(@PathVariable Long configId)
+    {
+        return success(configService.selectConfigById(configId));
+    }
+
+    /**
+     * 根据参数键名查询参数值
+     */
+    @GetMapping(value = "/configKey/{configKey}")
+    public AjaxResult getConfigKey(@PathVariable String configKey)
+    {
+        return success(configService.selectConfigByKey(configKey));
+    }
+
+    /**
+     * 新增参数配置
+     */
+    @PreAuthorize("@ss.hasPermi('system:config:add')")
+    @Log(title = "参数管理", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@Validated @RequestBody SysConfig config)
+    {
+        if (!configService.checkConfigKeyUnique(config))
+        {
+            return error("新增参数'" + config.getConfigName() + "'失败，参数键名已存在");
+        }
+        config.setCreateBy(getUsername());
+        return toAjax(configService.insertConfig(config));
+    }
+
+    /**
+     * 修改参数配置
+     */
+    @PreAuthorize("@ss.hasPermi('system:config:edit')")
+    @Log(title = "参数管理", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@Validated @RequestBody SysConfig config)
+    {
+        if (!configService.checkConfigKeyUnique(config))
+        {
+            return error("修改参数'" + config.getConfigName() + "'失败，参数键名已存在");
+        }
+        config.setUpdateBy(getUsername());
+        return toAjax(configService.updateConfig(config));
+    }
+
+    /**
+     * 删除参数配置
+     */
+    @PreAuthorize("@ss.hasPermi('system:config:remove')")
+    @Log(title = "参数管理", businessType = BusinessType.DELETE)
+    @DeleteMapping("/{configIds}")
+    public AjaxResult remove(@PathVariable Long[] configIds)
+    {
+        configService.deleteConfigByIds(configIds);
+        return success();
+    }
+
+    /**
+     * 刷新参数缓存
+     */
+    @PreAuthorize("@ss.hasPermi('system:config:remove')")
+    @Log(title = "参数管理", businessType = BusinessType.CLEAN)
+    @DeleteMapping("/refreshCache")
+    public AjaxResult refreshCache()
+    {
+        configService.resetConfigCache();
+        return success();
+    }
+}

vetti-admin/src/main/java/com/vetti/web/controller/system/SysDeptController.java

@@ -0,0 +1,132 @@
+package com.vetti.web.controller.system;
+
+import java.util.List;
+import org.apache.commons.lang3.ArrayUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import com.vetti.common.annotation.Log;
+import com.vetti.common.constant.UserConstants;
+import com.vetti.common.core.controller.BaseController;
+import com.vetti.common.core.domain.AjaxResult;
+import com.vetti.common.core.domain.entity.SysDept;
+import com.vetti.common.enums.BusinessType;
+import com.vetti.common.utils.StringUtils;
+import com.vetti.system.service.ISysDeptService;
+
+/**
+ * 部门信息
+ * 
+ * @author ruoyi
+ */
+@RestController
+@RequestMapping("/system/dept")
+public class SysDeptController extends BaseController
+{
+    @Autowired
+    private ISysDeptService deptService;
+
+    /**
+     * 获取部门列表
+     */
+    @PreAuthorize("@ss.hasPermi('system:dept:list')")
+    @GetMapping("/list")
+    public AjaxResult list(SysDept dept)
+    {
+        List<SysDept> depts = deptService.selectDeptList(dept);
+        return success(depts);
+    }
+
+    /**
+     * 查询部门列表（排除节点）
+     */
+    @PreAuthorize("@ss.hasPermi('system:dept:list')")
+    @GetMapping("/list/exclude/{deptId}")
+    public AjaxResult excludeChild(@PathVariable(value = "deptId", required = false) Long deptId)
+    {
+        List<SysDept> depts = deptService.selectDeptList(new SysDept());
+        depts.removeIf(d -> d.getDeptId().intValue() == deptId || ArrayUtils.contains(StringUtils.split(d.getAncestors(), ","), deptId + ""));
+        return success(depts);
+    }
+
+    /**
+     * 根据部门编号获取详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('system:dept:query')")
+    @GetMapping(value = "/{deptId}")
+    public AjaxResult getInfo(@PathVariable Long deptId)
+    {
+        deptService.checkDeptDataScope(deptId);
+        return success(deptService.selectDeptById(deptId));
+    }
+
+    /**
+     * 新增部门
+     */
+    @PreAuthorize("@ss.hasPermi('system:dept:add')")
+    @Log(title = "部门管理", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@Validated @RequestBody SysDept dept)
+    {
+        if (!deptService.checkDeptNameUnique(dept))
+        {
+            return error("新增部门'" + dept.getDeptName() + "'失败，部门名称已存在");
+        }
+        dept.setCreateBy(getUsername());
+        return toAjax(deptService.insertDept(dept));
+    }
+
+    /**
+     * 修改部门
+     */
+    @PreAuthorize("@ss.hasPermi('system:dept:edit')")
+    @Log(title = "部门管理", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@Validated @RequestBody SysDept dept)
+    {
+        Long deptId = dept.getDeptId();
+        deptService.checkDeptDataScope(deptId);
+        if (!deptService.checkDeptNameUnique(dept))
+        {
+            return error("修改部门'" + dept.getDeptName() + "'失败，部门名称已存在");
+        }
+        else if (dept.getParentId().equals(deptId))
+        {
+            return error("修改部门'" + dept.getDeptName() + "'失败，上级部门不能是自己");
+        }
+        else if (StringUtils.equals(UserConstants.DEPT_DISABLE, dept.getStatus()) && deptService.selectNormalChildrenDeptById(deptId) > 0)
+        {
+            return error("该部门包含未停用的子部门！");
+        }
+        dept.setUpdateBy(getUsername());
+        return toAjax(deptService.updateDept(dept));
+    }
+
+    /**
+     * 删除部门
+     */
+    @PreAuthorize("@ss.hasPermi('system:dept:remove')")
+    @Log(title = "部门管理", businessType = BusinessType.DELETE)
+    @DeleteMapping("/{deptId}")
+    public AjaxResult remove(@PathVariable Long deptId)
+    {
+        if (deptService.hasChildByDeptId(deptId))
+        {
+            return warn("存在下级部门,不允许删除");
+        }
+        if (deptService.checkDeptExistUser(deptId))
+        {
+            return warn("部门存在用户,不允许删除");
+        }
+        deptService.checkDeptDataScope(deptId);
+        return toAjax(deptService.deleteDeptById(deptId));
+    }
+}

vetti-admin/src/main/java/com/vetti/web/controller/system/SysDictDataController.java

@@ -0,0 +1,121 @@
+package com.vetti.web.controller.system;
+
+import java.util.ArrayList;
+import java.util.List;
+import javax.servlet.http.HttpServletResponse;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import com.vetti.common.annotation.Log;
+import com.vetti.common.core.controller.BaseController;
+import com.vetti.common.core.domain.AjaxResult;
+import com.vetti.common.core.domain.entity.SysDictData;
+import com.vetti.common.core.page.TableDataInfo;
+import com.vetti.common.enums.BusinessType;
+import com.vetti.common.utils.StringUtils;
+import com.vetti.common.utils.poi.ExcelUtil;
+import com.vetti.system.service.ISysDictDataService;
+import com.vetti.system.service.ISysDictTypeService;
+
+/**
+ * 数据字典信息
+ * 
+ * @author ruoyi
+ */
+@RestController
+@RequestMapping("/system/dict/data")
+public class SysDictDataController extends BaseController
+{
+    @Autowired
+    private ISysDictDataService dictDataService;
+
+    @Autowired
+    private ISysDictTypeService dictTypeService;
+
+    @PreAuthorize("@ss.hasPermi('system:dict:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(SysDictData dictData)
+    {
+        startPage();
+        List<SysDictData> list = dictDataService.selectDictDataList(dictData);
+        return getDataTable(list);
+    }
+
+    @Log(title = "字典数据", businessType = BusinessType.EXPORT)
+    @PreAuthorize("@ss.hasPermi('system:dict:export')")
+    @PostMapping("/export")
+    public void export(HttpServletResponse response, SysDictData dictData)
+    {
+        List<SysDictData> list = dictDataService.selectDictDataList(dictData);
+        ExcelUtil<SysDictData> util = new ExcelUtil<SysDictData>(SysDictData.class);
+        util.exportExcel(response, list, "字典数据");
+    }
+
+    /**
+     * 查询字典数据详细
+     */
+    @PreAuthorize("@ss.hasPermi('system:dict:query')")
+    @GetMapping(value = "/{dictCode}")
+    public AjaxResult getInfo(@PathVariable Long dictCode)
+    {
+        return success(dictDataService.selectDictDataById(dictCode));
+    }
+
+    /**
+     * 根据字典类型查询字典数据信息
+     */
+    @GetMapping(value = "/type/{dictType}")
+    public AjaxResult dictType(@PathVariable String dictType)
+    {
+        List<SysDictData> data = dictTypeService.selectDictDataByType(dictType);
+        if (StringUtils.isNull(data))
+        {
+            data = new ArrayList<SysDictData>();
+        }
+        return success(data);
+    }
+
+    /**
+     * 新增字典类型
+     */
+    @PreAuthorize("@ss.hasPermi('system:dict:add')")
+    @Log(title = "字典数据", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@Validated @RequestBody SysDictData dict)
+    {
+        dict.setCreateBy(getUsername());
+        return toAjax(dictDataService.insertDictData(dict));
+    }
+
+    /**
+     * 修改保存字典类型
+     */
+    @PreAuthorize("@ss.hasPermi('system:dict:edit')")
+    @Log(title = "字典数据", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@Validated @RequestBody SysDictData dict)
+    {
+        dict.setUpdateBy(getUsername());
+        return toAjax(dictDataService.updateDictData(dict));
+    }
+
+    /**
+     * 删除字典类型
+     */
+    @PreAuthorize("@ss.hasPermi('system:dict:remove')")
+    @Log(title = "字典类型", businessType = BusinessType.DELETE)
+    @DeleteMapping("/{dictCodes}")
+    public AjaxResult remove(@PathVariable Long[] dictCodes)
+    {
+        dictDataService.deleteDictDataByIds(dictCodes);
+        return success();
+    }
+}

vetti-admin/src/main/java/com/vetti/web/controller/system/SysDictTypeController.java

@@ -0,0 +1,131 @@
+package com.vetti.web.controller.system;
+
+import java.util.List;
+import javax.servlet.http.HttpServletResponse;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import com.vetti.common.annotation.Log;
+import com.vetti.common.core.controller.BaseController;
+import com.vetti.common.core.domain.AjaxResult;
+import com.vetti.common.core.domain.entity.SysDictType;
+import com.vetti.common.core.page.TableDataInfo;
+import com.vetti.common.enums.BusinessType;
+import com.vetti.common.utils.poi.ExcelUtil;
+import com.vetti.system.service.ISysDictTypeService;
+
+/**
+ * 数据字典信息
+ * 
+ * @author ruoyi
+ */
+@RestController
+@RequestMapping("/system/dict/type")
+public class SysDictTypeController extends BaseController
+{
+    @Autowired
+    private ISysDictTypeService dictTypeService;
+
+    @PreAuthorize("@ss.hasPermi('system:dict:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(SysDictType dictType)
+    {
+        startPage();
+        List<SysDictType> list = dictTypeService.selectDictTypeList(dictType);
+        return getDataTable(list);
+    }
+
+    @Log(title = "字典类型", businessType = BusinessType.EXPORT)
+    @PreAuthorize("@ss.hasPermi('system:dict:export')")
+    @PostMapping("/export")
+    public void export(HttpServletResponse response, SysDictType dictType)
+    {
+        List<SysDictType> list = dictTypeService.selectDictTypeList(dictType);
+        ExcelUtil<SysDictType> util = new ExcelUtil<SysDictType>(SysDictType.class);
+        util.exportExcel(response, list, "字典类型");
+    }
+
+    /**
+     * 查询字典类型详细
+     */
+    @PreAuthorize("@ss.hasPermi('system:dict:query')")
+    @GetMapping(value = "/{dictId}")
+    public AjaxResult getInfo(@PathVariable Long dictId)
+    {
+        return success(dictTypeService.selectDictTypeById(dictId));
+    }
+
+    /**
+     * 新增字典类型
+     */
+    @PreAuthorize("@ss.hasPermi('system:dict:add')")
+    @Log(title = "字典类型", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@Validated @RequestBody SysDictType dict)
+    {
+        if (!dictTypeService.checkDictTypeUnique(dict))
+        {
+            return error("新增字典'" + dict.getDictName() + "'失败，字典类型已存在");
+        }
+        dict.setCreateBy(getUsername());
+        return toAjax(dictTypeService.insertDictType(dict));
+    }
+
+    /**
+     * 修改字典类型
+     */
+    @PreAuthorize("@ss.hasPermi('system:dict:edit')")
+    @Log(title = "字典类型", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@Validated @RequestBody SysDictType dict)
+    {
+        if (!dictTypeService.checkDictTypeUnique(dict))
+        {
+            return error("修改字典'" + dict.getDictName() + "'失败，字典类型已存在");
+        }
+        dict.setUpdateBy(getUsername());
+        return toAjax(dictTypeService.updateDictType(dict));
+    }
+
+    /**
+     * 删除字典类型
+     */
+    @PreAuthorize("@ss.hasPermi('system:dict:remove')")
+    @Log(title = "字典类型", businessType = BusinessType.DELETE)
+    @DeleteMapping("/{dictIds}")
+    public AjaxResult remove(@PathVariable Long[] dictIds)
+    {
+        dictTypeService.deleteDictTypeByIds(dictIds);
+        return success();
+    }
+
+    /**
+     * 刷新字典缓存
+     */
+    @PreAuthorize("@ss.hasPermi('system:dict:remove')")
+    @Log(title = "字典类型", businessType = BusinessType.CLEAN)
+    @DeleteMapping("/refreshCache")
+    public AjaxResult refreshCache()
+    {
+        dictTypeService.resetDictCache();
+        return success();
+    }
+
+    /**
+     * 获取字典选择框列表
+     */
+    @GetMapping("/optionselect")
+    public AjaxResult optionselect()
+    {
+        List<SysDictType> dictTypes = dictTypeService.selectDictTypeAll();
+        return success(dictTypes);
+    }
+}

vetti-admin/src/main/java/com/vetti/web/controller/system/SysI18nGainController.java

@@ -0,0 +1,38 @@
+package com.vetti.web.controller.system;
+
+import com.vetti.common.annotation.Anonymous;
+import com.vetti.common.core.controller.BaseController;
+import com.vetti.common.core.domain.AjaxResult;
+import com.vetti.web.service.ISystemI18nGainService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * 系统获取国际化信息
+ *
+ * @author Wangxiangshun
+ */
+@Api(tags ="国际化管理")
+@RestController
+@RequestMapping("/system/i18nGain")
+public class SysI18nGainController extends BaseController {
+
+    @Autowired
+    private ISystemI18nGainService systemI18nGainService;
+
+    /**
+     * 获取国际化信息
+     */
+    @Anonymous
+    @ApiOperation("查询国际化信息")
+    @GetMapping(value = "/getInfo")
+    public AjaxResult getInfo()
+    {
+        return AjaxResult.success(systemI18nGainService.getI18nInfo());
+    }
+
+}

vetti-admin/src/main/java/com/vetti/web/controller/system/SysIndexController.java

@@ -0,0 +1,29 @@
+package com.vetti.web.controller.system;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import com.vetti.common.config.RuoYiConfig;
+import com.vetti.common.utils.StringUtils;
+
+/**
+ * 首页
+ *
+ * @author ruoyi
+ */
+@RestController
+public class SysIndexController
+{
+    /** 系统基础配置 */
+    @Autowired
+    private RuoYiConfig ruoyiConfig;
+
+    /**
+     * 访问首页，提示语
+     */
+    @RequestMapping("/")
+    public String index()
+    {
+        return StringUtils.format("欢迎使用{}后台管理框架，当前版本：v{}，请通过前端地址访问。", ruoyiConfig.getName(), ruoyiConfig.getVersion());
+    }
+}

vetti-admin/src/main/java/com/vetti/web/controller/system/SysLoginController.java

@@ -0,0 +1,131 @@
+package com.vetti.web.controller.system;
+
+import java.util.Date;
+import java.util.List;
+import java.util.Set;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RestController;
+import com.vetti.common.constant.Constants;
+import com.vetti.common.core.domain.AjaxResult;
+import com.vetti.common.core.domain.entity.SysMenu;
+import com.vetti.common.core.domain.entity.SysUser;
+import com.vetti.common.core.domain.model.LoginBody;
+import com.vetti.common.core.domain.model.LoginUser;
+import com.vetti.common.core.text.Convert;
+import com.vetti.common.utils.DateUtils;
+import com.vetti.common.utils.SecurityUtils;
+import com.vetti.common.utils.StringUtils;
+import com.vetti.framework.web.service.SysLoginService;
+import com.vetti.framework.web.service.SysPermissionService;
+import com.vetti.framework.web.service.TokenService;
+import com.vetti.system.service.ISysConfigService;
+import com.vetti.system.service.ISysMenuService;
+
+/**
+ * 登录验证
+ * 
+ * @author ruoyi
+ */
+@RestController
+public class SysLoginController
+{
+    @Autowired
+    private SysLoginService loginService;
+
+    @Autowired
+    private ISysMenuService menuService;
+
+    @Autowired
+    private SysPermissionService permissionService;
+
+    @Autowired
+    private TokenService tokenService;
+
+    @Autowired
+    private ISysConfigService configService;
+
+    /**
+     * 登录方法
+     * 
+     * @param loginBody 登录信息
+     * @return 结果
+     */
+    @PostMapping("/login")
+    public AjaxResult login(@RequestBody LoginBody loginBody)
+    {
+        AjaxResult ajax = AjaxResult.success();
+        // 生成令牌
+        String token = loginService.login(loginBody.getUsername(), loginBody.getPassword(), loginBody.getCode(),
+                loginBody.getUuid());
+        ajax.put(Constants.TOKEN, token);
+        return ajax;
+    }
+
+    /**
+     * 获取用户信息
+     * 
+     * @return 用户信息
+     */
+    @GetMapping("getInfo")
+    public AjaxResult getInfo()
+    {
+        LoginUser loginUser = SecurityUtils.getLoginUser();
+        SysUser user = loginUser.getUser();
+        // 角色集合
+        Set<String> roles = permissionService.getRolePermission(user);
+        // 权限集合
+        Set<String> permissions = permissionService.getMenuPermission(user);
+        if (!loginUser.getPermissions().equals(permissions))
+        {
+            loginUser.setPermissions(permissions);
+            tokenService.refreshToken(loginUser);
+        }
+        AjaxResult ajax = AjaxResult.success();
+        ajax.put("user", user);
+        ajax.put("roles", roles);
+        ajax.put("permissions", permissions);
+        ajax.put("isDefaultModifyPwd", initPasswordIsModify(user.getPwdUpdateDate()));
+        ajax.put("isPasswordExpired", passwordIsExpiration(user.getPwdUpdateDate()));
+        return ajax;
+    }
+
+    /**
+     * 获取路由信息
+     * 
+     * @return 路由信息
+     */
+    @GetMapping("getRouters")
+    public AjaxResult getRouters()
+    {
+        Long userId = SecurityUtils.getUserId();
+        List<SysMenu> menus = menuService.selectMenuTreeByUserId(userId);
+        return AjaxResult.success(menuService.buildMenus(menus));
+    }
+    
+    // 检查初始密码是否提醒修改
+    public boolean initPasswordIsModify(Date pwdUpdateDate)
+    {
+        Integer initPasswordModify = Convert.toInt(configService.selectConfigByKey("sys.account.initPasswordModify"));
+        return initPasswordModify != null && initPasswordModify == 1 && pwdUpdateDate == null;
+    }
+
+    // 检查密码是否过期
+    public boolean passwordIsExpiration(Date pwdUpdateDate)
+    {
+        Integer passwordValidateDays = Convert.toInt(configService.selectConfigByKey("sys.account.passwordValidateDays"));
+        if (passwordValidateDays != null && passwordValidateDays > 0)
+        {
+            if (StringUtils.isNull(pwdUpdateDate))
+            {
+                // 如果从未修改过初始密码，直接提醒过期
+                return true;
+            }
+            Date nowDate = DateUtils.getNowDate();
+            return DateUtils.differentDaysByMillisecond(nowDate, pwdUpdateDate) > passwordValidateDays;
+        }
+        return false;
+    }
+}

vetti-admin/src/main/java/com/vetti/web/controller/system/SysMenuController.java

@@ -0,0 +1,142 @@
+package com.vetti.web.controller.system;
+
+import java.util.List;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import com.vetti.common.annotation.Log;
+import com.vetti.common.constant.UserConstants;
+import com.vetti.common.core.controller.BaseController;
+import com.vetti.common.core.domain.AjaxResult;
+import com.vetti.common.core.domain.entity.SysMenu;
+import com.vetti.common.enums.BusinessType;
+import com.vetti.common.utils.StringUtils;
+import com.vetti.system.service.ISysMenuService;
+
+/**
+ * 菜单信息
+ * 
+ * @author ruoyi
+ */
+@RestController
+@RequestMapping("/system/menu")
+public class SysMenuController extends BaseController
+{
+    @Autowired
+    private ISysMenuService menuService;
+
+    /**
+     * 获取菜单列表
+     */
+    @PreAuthorize("@ss.hasPermi('system:menu:list')")
+    @GetMapping("/list")
+    public AjaxResult list(SysMenu menu)
+    {
+        List<SysMenu> menus = menuService.selectMenuList(menu, getUserId());
+        return success(menus);
+    }
+
+    /**
+     * 根据菜单编号获取详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('system:menu:query')")
+    @GetMapping(value = "/{menuId}")
+    public AjaxResult getInfo(@PathVariable Long menuId)
+    {
+        return success(menuService.selectMenuById(menuId));
+    }
+
+    /**
+     * 获取菜单下拉树列表
+     */
+    @GetMapping("/treeselect")
+    public AjaxResult treeselect(SysMenu menu)
+    {
+        List<SysMenu> menus = menuService.selectMenuList(menu, getUserId());
+        return success(menuService.buildMenuTreeSelect(menus));
+    }
+
+    /**
+     * 加载对应角色菜单列表树
+     */
+    @GetMapping(value = "/roleMenuTreeselect/{roleId}")
+    public AjaxResult roleMenuTreeselect(@PathVariable("roleId") Long roleId)
+    {
+        List<SysMenu> menus = menuService.selectMenuList(getUserId());
+        AjaxResult ajax = AjaxResult.success();
+        ajax.put("checkedKeys", menuService.selectMenuListByRoleId(roleId));
+        ajax.put("menus", menuService.buildMenuTreeSelect(menus));
+        return ajax;
+    }
+
+    /**
+     * 新增菜单
+     */
+    @PreAuthorize("@ss.hasPermi('system:menu:add')")
+    @Log(title = "菜单管理", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@Validated @RequestBody SysMenu menu)
+    {
+        if (!menuService.checkMenuNameUnique(menu))
+        {
+            return error("新增菜单'" + menu.getMenuName() + "'失败，菜单名称已存在");
+        }
+        else if (UserConstants.YES_FRAME.equals(menu.getIsFrame()) && !StringUtils.ishttp(menu.getPath()))
+        {
+            return error("新增菜单'" + menu.getMenuName() + "'失败，地址必须以http(s)://开头");
+        }
+        menu.setCreateBy(getUsername());
+        return toAjax(menuService.insertMenu(menu));
+    }
+
+    /**
+     * 修改菜单
+     */
+    @PreAuthorize("@ss.hasPermi('system:menu:edit')")
+    @Log(title = "菜单管理", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@Validated @RequestBody SysMenu menu)
+    {
+        if (!menuService.checkMenuNameUnique(menu))
+        {
+            return error("修改菜单'" + menu.getMenuName() + "'失败，菜单名称已存在");
+        }
+        else if (UserConstants.YES_FRAME.equals(menu.getIsFrame()) && !StringUtils.ishttp(menu.getPath()))
+        {
+            return error("修改菜单'" + menu.getMenuName() + "'失败，地址必须以http(s)://开头");
+        }
+        else if (menu.getMenuId().equals(menu.getParentId()))
+        {
+            return error("修改菜单'" + menu.getMenuName() + "'失败，上级菜单不能选择自己");
+        }
+        menu.setUpdateBy(getUsername());
+        return toAjax(menuService.updateMenu(menu));
+    }
+
+    /**
+     * 删除菜单
+     */
+    @PreAuthorize("@ss.hasPermi('system:menu:remove')")
+    @Log(title = "菜单管理", businessType = BusinessType.DELETE)
+    @DeleteMapping("/{menuId}")
+    public AjaxResult remove(@PathVariable("menuId") Long menuId)
+    {
+        if (menuService.hasChildByMenuId(menuId))
+        {
+            return warn("存在子菜单,不允许删除");
+        }
+        if (menuService.checkMenuExistRole(menuId))
+        {
+            return warn("菜单已分配,不允许删除");
+        }
+        return toAjax(menuService.deleteMenuById(menuId));
+    }
+}

vetti-admin/src/main/java/com/vetti/web/controller/system/SysNoticeController.java

@@ -0,0 +1,91 @@
+package com.vetti.web.controller.system;
+
+import java.util.List;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import com.vetti.common.annotation.Log;
+import com.vetti.common.core.controller.BaseController;
+import com.vetti.common.core.domain.AjaxResult;
+import com.vetti.common.core.page.TableDataInfo;
+import com.vetti.common.enums.BusinessType;
+import com.vetti.system.domain.SysNotice;
+import com.vetti.system.service.ISysNoticeService;
+
+/**
+ * 公告 信息操作处理
+ * 
+ * @author ruoyi
+ */
+@RestController
+@RequestMapping("/system/notice")
+public class SysNoticeController extends BaseController
+{
+    @Autowired
+    private ISysNoticeService noticeService;
+
+    /**
+     * 获取通知公告列表
+     */
+    @PreAuthorize("@ss.hasPermi('system:notice:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(SysNotice notice)
+    {
+        startPage();
+        List<SysNotice> list = noticeService.selectNoticeList(notice);
+        return getDataTable(list);
+    }
+
+    /**
+     * 根据通知公告编号获取详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('system:notice:query')")
+    @GetMapping(value = "/{noticeId}")
+    public AjaxResult getInfo(@PathVariable Long noticeId)
+    {
+        return success(noticeService.selectNoticeById(noticeId));
+    }
+
+    /**
+     * 新增通知公告
+     */
+    @PreAuthorize("@ss.hasPermi('system:notice:add')")
+    @Log(title = "通知公告", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@Validated @RequestBody SysNotice notice)
+    {
+        notice.setCreateBy(getUsername());
+        return toAjax(noticeService.insertNotice(notice));
+    }
+
+    /**
+     * 修改通知公告
+     */
+    @PreAuthorize("@ss.hasPermi('system:notice:edit')")
+    @Log(title = "通知公告", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@Validated @RequestBody SysNotice notice)
+    {
+        notice.setUpdateBy(getUsername());
+        return toAjax(noticeService.updateNotice(notice));
+    }
+
+    /**
+     * 删除通知公告
+     */
+    @PreAuthorize("@ss.hasPermi('system:notice:remove')")
+    @Log(title = "通知公告", businessType = BusinessType.DELETE)
+    @DeleteMapping("/{noticeIds}")
+    public AjaxResult remove(@PathVariable Long[] noticeIds)
+    {
+        return toAjax(noticeService.deleteNoticeByIds(noticeIds));
+    }
+}

vetti-admin/src/main/java/com/vetti/web/controller/system/SysPostController.java

@@ -0,0 +1,129 @@
+package com.vetti.web.controller.system;
+
+import java.util.List;
+import javax.servlet.http.HttpServletResponse;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import com.vetti.common.annotation.Log;
+import com.vetti.common.core.controller.BaseController;
+import com.vetti.common.core.domain.AjaxResult;
+import com.vetti.common.core.page.TableDataInfo;
+import com.vetti.common.enums.BusinessType;
+import com.vetti.common.utils.poi.ExcelUtil;
+import com.vetti.system.domain.SysPost;
+import com.vetti.system.service.ISysPostService;
+
+/**
+ * 岗位信息操作处理
+ * 
+ * @author ruoyi
+ */
+@RestController
+@RequestMapping("/system/post")
+public class SysPostController extends BaseController
+{
+    @Autowired
+    private ISysPostService postService;
+
+    /**
+     * 获取岗位列表
+     */
+    @PreAuthorize("@ss.hasPermi('system:post:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(SysPost post)
+    {
+        startPage();
+        List<SysPost> list = postService.selectPostList(post);
+        return getDataTable(list);
+    }
+    
+    @Log(title = "岗位管理", businessType = BusinessType.EXPORT)
+    @PreAuthorize("@ss.hasPermi('system:post:export')")
+    @PostMapping("/export")
+    public void export(HttpServletResponse response, SysPost post)
+    {
+        List<SysPost> list = postService.selectPostList(post);
+        ExcelUtil<SysPost> util = new ExcelUtil<SysPost>(SysPost.class);
+        util.exportExcel(response, list, "岗位数据");
+    }
+
+    /**
+     * 根据岗位编号获取详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('system:post:query')")
+    @GetMapping(value = "/{postId}")
+    public AjaxResult getInfo(@PathVariable Long postId)
+    {
+        return success(postService.selectPostById(postId));
+    }
+
+    /**
+     * 新增岗位
+     */
+    @PreAuthorize("@ss.hasPermi('system:post:add')")
+    @Log(title = "岗位管理", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@Validated @RequestBody SysPost post)
+    {
+        if (!postService.checkPostNameUnique(post))
+        {
+            return error("新增岗位'" + post.getPostName() + "'失败，岗位名称已存在");
+        }
+        else if (!postService.checkPostCodeUnique(post))
+        {
+            return error("新增岗位'" + post.getPostName() + "'失败，岗位编码已存在");
+        }
+        post.setCreateBy(getUsername());
+        return toAjax(postService.insertPost(post));
+    }
+
+    /**
+     * 修改岗位
+     */
+    @PreAuthorize("@ss.hasPermi('system:post:edit')")
+    @Log(title = "岗位管理", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@Validated @RequestBody SysPost post)
+    {
+        if (!postService.checkPostNameUnique(post))
+        {
+            return error("修改岗位'" + post.getPostName() + "'失败，岗位名称已存在");
+        }
+        else if (!postService.checkPostCodeUnique(post))
+        {
+            return error("修改岗位'" + post.getPostName() + "'失败，岗位编码已存在");
+        }
+        post.setUpdateBy(getUsername());
+        return toAjax(postService.updatePost(post));
+    }
+
+    /**
+     * 删除岗位
+     */
+    @PreAuthorize("@ss.hasPermi('system:post:remove')")
+    @Log(title = "岗位管理", businessType = BusinessType.DELETE)
+    @DeleteMapping("/{postIds}")
+    public AjaxResult remove(@PathVariable Long[] postIds)
+    {
+        return toAjax(postService.deletePostByIds(postIds));
+    }
+
+    /**
+     * 获取岗位选择框列表
+     */
+    @GetMapping("/optionselect")
+    public AjaxResult optionselect()
+    {
+        List<SysPost> posts = postService.selectPostAll();
+        return success(posts);
+    }
+}

vetti-admin/src/main/java/com/vetti/web/controller/system/SysProfileController.java

@@ -0,0 +1,148 @@
+package com.vetti.web.controller.system;
+
+import java.util.Map;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.multipart.MultipartFile;
+import com.vetti.common.annotation.Log;
+import com.vetti.common.config.RuoYiConfig;
+import com.vetti.common.core.controller.BaseController;
+import com.vetti.common.core.domain.AjaxResult;
+import com.vetti.common.core.domain.entity.SysUser;
+import com.vetti.common.core.domain.model.LoginUser;
+import com.vetti.common.enums.BusinessType;
+import com.vetti.common.utils.DateUtils;
+import com.vetti.common.utils.SecurityUtils;
+import com.vetti.common.utils.StringUtils;
+import com.vetti.common.utils.file.FileUploadUtils;
+import com.vetti.common.utils.file.FileUtils;
+import com.vetti.common.utils.file.MimeTypeUtils;
+import com.vetti.framework.web.service.TokenService;
+import com.vetti.system.service.ISysUserService;
+
+/**
+ * 个人信息 业务处理
+ * 
+ * @author ruoyi
+ */
+@RestController
+@RequestMapping("/system/user/profile")
+public class SysProfileController extends BaseController
+{
+    @Autowired
+    private ISysUserService userService;
+
+    @Autowired
+    private TokenService tokenService;
+
+    /**
+     * 个人信息
+     */
+    @GetMapping
+    public AjaxResult profile()
+    {
+        LoginUser loginUser = getLoginUser();
+        SysUser user = loginUser.getUser();
+        AjaxResult ajax = AjaxResult.success(user);
+        ajax.put("roleGroup", userService.selectUserRoleGroup(loginUser.getUsername()));
+        ajax.put("postGroup", userService.selectUserPostGroup(loginUser.getUsername()));
+        return ajax;
+    }
+
+    /**
+     * 修改用户
+     */
+    @Log(title = "个人信息", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult updateProfile(@RequestBody SysUser user)
+    {
+        LoginUser loginUser = getLoginUser();
+        SysUser currentUser = loginUser.getUser();
+        currentUser.setNickName(user.getNickName());
+        currentUser.setEmail(user.getEmail());
+        currentUser.setPhonenumber(user.getPhonenumber());
+        currentUser.setSex(user.getSex());
+        if (StringUtils.isNotEmpty(user.getPhonenumber()) && !userService.checkPhoneUnique(currentUser))
+        {
+            return error("修改用户'" + loginUser.getUsername() + "'失败，手机号码已存在");
+        }
+        if (StringUtils.isNotEmpty(user.getEmail()) && !userService.checkEmailUnique(currentUser))
+        {
+            return error("修改用户'" + loginUser.getUsername() + "'失败，邮箱账号已存在");
+        }
+        if (userService.updateUserProfile(currentUser) > 0)
+        {
+            // 更新缓存用户信息
+            tokenService.setLoginUser(loginUser);
+            return success();
+        }
+        return error("修改个人信息异常，请联系管理员");
+    }
+
+    /**
+     * 重置密码
+     */
+    @Log(title = "个人信息", businessType = BusinessType.UPDATE)
+    @PutMapping("/updatePwd")
+    public AjaxResult updatePwd(@RequestBody Map<String, String> params)
+    {
+        String oldPassword = params.get("oldPassword");
+        String newPassword = params.get("newPassword");
+        LoginUser loginUser = getLoginUser();
+        Long userId = loginUser.getUserId();
+        String password = loginUser.getPassword();
+        if (!SecurityUtils.matchesPassword(oldPassword, password))
+        {
+            return error("修改密码失败，旧密码错误");
+        }
+        if (SecurityUtils.matchesPassword(newPassword, password))
+        {
+            return error("新密码不能与旧密码相同");
+        }
+        newPassword = SecurityUtils.encryptPassword(newPassword);
+        if (userService.resetUserPwd(userId, newPassword) > 0)
+        {
+            // 更新缓存用户密码&密码最后更新时间
+            loginUser.getUser().setPwdUpdateDate(DateUtils.getNowDate());
+            loginUser.getUser().setPassword(newPassword);
+            tokenService.setLoginUser(loginUser);
+            return success();
+        }
+        return error("修改密码异常，请联系管理员");
+    }
+
+    /**
+     * 头像上传
+     */
+    @Log(title = "用户头像", businessType = BusinessType.UPDATE)
+    @PostMapping("/avatar")
+    public AjaxResult avatar(@RequestParam("avatarfile") MultipartFile file) throws Exception
+    {
+        if (!file.isEmpty())
+        {
+            LoginUser loginUser = getLoginUser();
+            String avatar = FileUploadUtils.upload(RuoYiConfig.getAvatarPath(), file, MimeTypeUtils.IMAGE_EXTENSION, true);
+            if (userService.updateUserAvatar(loginUser.getUserId(), avatar))
+            {
+                String oldAvatar = loginUser.getUser().getAvatar();
+                if (StringUtils.isNotEmpty(oldAvatar))
+                {
+                    FileUtils.deleteFile(RuoYiConfig.getProfile() + FileUtils.stripPrefix(oldAvatar));
+                }
+                AjaxResult ajax = AjaxResult.success();
+                ajax.put("imgUrl", avatar);
+                // 更新缓存用户头像
+                loginUser.getUser().setAvatar(avatar);
+                tokenService.setLoginUser(loginUser);
+                return ajax;
+            }
+        }
+        return error("上传图片异常，请联系管理员");
+    }
+}

vetti-admin/src/main/java/com/vetti/web/controller/system/SysRegisterController.java

@@ -0,0 +1,38 @@
+package com.vetti.web.controller.system;
+
+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.RestController;
+import com.vetti.common.core.controller.BaseController;
+import com.vetti.common.core.domain.AjaxResult;
+import com.vetti.common.core.domain.model.RegisterBody;
+import com.vetti.common.utils.StringUtils;
+import com.vetti.framework.web.service.SysRegisterService;
+import com.vetti.system.service.ISysConfigService;
+
+/**
+ * 注册验证
+ * 
+ * @author ruoyi
+ */
+@RestController
+public class SysRegisterController extends BaseController
+{
+    @Autowired
+    private SysRegisterService registerService;
+
+    @Autowired
+    private ISysConfigService configService;
+
+    @PostMapping("/register")
+    public AjaxResult register(@RequestBody RegisterBody user)
+    {
+        if (!("true".equals(configService.selectConfigByKey("sys.account.registerUser"))))
+        {
+            return error("当前系统没有开启注册功能！");
+        }
+        String msg = registerService.register(user);
+        return StringUtils.isEmpty(msg) ? success() : error(msg);
+    }
+}

vetti-admin/src/main/java/com/vetti/web/controller/system/SysRoleController.java

@@ -0,0 +1,262 @@
+package com.vetti.web.controller.system;
+
+import java.util.List;
+import javax.servlet.http.HttpServletResponse;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import com.vetti.common.annotation.Log;
+import com.vetti.common.core.controller.BaseController;
+import com.vetti.common.core.domain.AjaxResult;
+import com.vetti.common.core.domain.entity.SysDept;
+import com.vetti.common.core.domain.entity.SysRole;
+import com.vetti.common.core.domain.entity.SysUser;
+import com.vetti.common.core.domain.model.LoginUser;
+import com.vetti.common.core.page.TableDataInfo;
+import com.vetti.common.enums.BusinessType;
+import com.vetti.common.utils.StringUtils;
+import com.vetti.common.utils.poi.ExcelUtil;
+import com.vetti.framework.web.service.SysPermissionService;
+import com.vetti.framework.web.service.TokenService;
+import com.vetti.system.domain.SysUserRole;
+import com.vetti.system.service.ISysDeptService;
+import com.vetti.system.service.ISysRoleService;
+import com.vetti.system.service.ISysUserService;
+
+/**
+ * 角色信息
+ * 
+ * @author ruoyi
+ */
+@RestController
+@RequestMapping("/system/role")
+public class SysRoleController extends BaseController
+{
+    @Autowired
+    private ISysRoleService roleService;
+
+    @Autowired
+    private TokenService tokenService;
+
+    @Autowired
+    private SysPermissionService permissionService;
+
+    @Autowired
+    private ISysUserService userService;
+
+    @Autowired
+    private ISysDeptService deptService;
+
+    @PreAuthorize("@ss.hasPermi('system:role:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(SysRole role)
+    {
+        startPage();
+        List<SysRole> list = roleService.selectRoleList(role);
+        return getDataTable(list);
+    }
+
+    @Log(title = "角色管理", businessType = BusinessType.EXPORT)
+    @PreAuthorize("@ss.hasPermi('system:role:export')")
+    @PostMapping("/export")
+    public void export(HttpServletResponse response, SysRole role)
+    {
+        List<SysRole> list = roleService.selectRoleList(role);
+        ExcelUtil<SysRole> util = new ExcelUtil<SysRole>(SysRole.class);
+        util.exportExcel(response, list, "角色数据");
+    }
+
+    /**
+     * 根据角色编号获取详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('system:role:query')")
+    @GetMapping(value = "/{roleId}")
+    public AjaxResult getInfo(@PathVariable Long roleId)
+    {
+        roleService.checkRoleDataScope(roleId);
+        return success(roleService.selectRoleById(roleId));
+    }
+
+    /**
+     * 新增角色
+     */
+    @PreAuthorize("@ss.hasPermi('system:role:add')")
+    @Log(title = "角色管理", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@Validated @RequestBody SysRole role)
+    {
+        if (!roleService.checkRoleNameUnique(role))
+        {
+            return error("新增角色'" + role.getRoleName() + "'失败，角色名称已存在");
+        }
+        else if (!roleService.checkRoleKeyUnique(role))
+        {
+            return error("新增角色'" + role.getRoleName() + "'失败，角色权限已存在");
+        }
+        role.setCreateBy(getUsername());
+        return toAjax(roleService.insertRole(role));
+
+    }
+
+    /**
+     * 修改保存角色
+     */
+    @PreAuthorize("@ss.hasPermi('system:role:edit')")
+    @Log(title = "角色管理", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@Validated @RequestBody SysRole role)
+    {
+        roleService.checkRoleAllowed(role);
+        roleService.checkRoleDataScope(role.getRoleId());
+        if (!roleService.checkRoleNameUnique(role))
+        {
+            return error("修改角色'" + role.getRoleName() + "'失败，角色名称已存在");
+        }
+        else if (!roleService.checkRoleKeyUnique(role))
+        {
+            return error("修改角色'" + role.getRoleName() + "'失败，角色权限已存在");
+        }
+        role.setUpdateBy(getUsername());
+        
+        if (roleService.updateRole(role) > 0)
+        {
+            // 更新缓存用户权限
+            LoginUser loginUser = getLoginUser();
+            if (StringUtils.isNotNull(loginUser.getUser()) && !loginUser.getUser().isAdmin())
+            {
+                loginUser.setUser(userService.selectUserByUserName(loginUser.getUser().getUserName()));
+                loginUser.setPermissions(permissionService.getMenuPermission(loginUser.getUser()));
+                tokenService.setLoginUser(loginUser);
+            }
+            return success();
+        }
+        return error("修改角色'" + role.getRoleName() + "'失败，请联系管理员");
+    }
+
+    /**
+     * 修改保存数据权限
+     */
+    @PreAuthorize("@ss.hasPermi('system:role:edit')")
+    @Log(title = "角色管理", businessType = BusinessType.UPDATE)
+    @PutMapping("/dataScope")
+    public AjaxResult dataScope(@RequestBody SysRole role)
+    {
+        roleService.checkRoleAllowed(role);
+        roleService.checkRoleDataScope(role.getRoleId());
+        return toAjax(roleService.authDataScope(role));
+    }
+
+    /**
+     * 状态修改
+     */
+    @PreAuthorize("@ss.hasPermi('system:role:edit')")
+    @Log(title = "角色管理", businessType = BusinessType.UPDATE)
+    @PutMapping("/changeStatus")
+    public AjaxResult changeStatus(@RequestBody SysRole role)
+    {
+        roleService.checkRoleAllowed(role);
+        roleService.checkRoleDataScope(role.getRoleId());
+        role.setUpdateBy(getUsername());
+        return toAjax(roleService.updateRoleStatus(role));
+    }
+
+    /**
+     * 删除角色
+     */
+    @PreAuthorize("@ss.hasPermi('system:role:remove')")
+    @Log(title = "角色管理", businessType = BusinessType.DELETE)
+    @DeleteMapping("/{roleIds}")
+    public AjaxResult remove(@PathVariable Long[] roleIds)
+    {
+        return toAjax(roleService.deleteRoleByIds(roleIds));
+    }
+
+    /**
+     * 获取角色选择框列表
+     */
+    @PreAuthorize("@ss.hasPermi('system:role:query')")
+    @GetMapping("/optionselect")
+    public AjaxResult optionselect()
+    {
+        return success(roleService.selectRoleAll());
+    }
+
+    /**
+     * 查询已分配用户角色列表
+     */
+    @PreAuthorize("@ss.hasPermi('system:role:list')")
+    @GetMapping("/authUser/allocatedList")
+    public TableDataInfo allocatedList(SysUser user)
+    {
+        startPage();
+        List<SysUser> list = userService.selectAllocatedList(user);
+        return getDataTable(list);
+    }
+
+    /**
+     * 查询未分配用户角色列表
+     */
+    @PreAuthorize("@ss.hasPermi('system:role:list')")
+    @GetMapping("/authUser/unallocatedList")
+    public TableDataInfo unallocatedList(SysUser user)
+    {
+        startPage();
+        List<SysUser> list = userService.selectUnallocatedList(user);
+        return getDataTable(list);
+    }
+
+    /**
+     * 取消授权用户
+     */
+    @PreAuthorize("@ss.hasPermi('system:role:edit')")
+    @Log(title = "角色管理", businessType = BusinessType.GRANT)
+    @PutMapping("/authUser/cancel")
+    public AjaxResult cancelAuthUser(@RequestBody SysUserRole userRole)
+    {
+        return toAjax(roleService.deleteAuthUser(userRole));
+    }
+
+    /**
+     * 批量取消授权用户
+     */
+    @PreAuthorize("@ss.hasPermi('system:role:edit')")
+    @Log(title = "角色管理", businessType = BusinessType.GRANT)
+    @PutMapping("/authUser/cancelAll")
+    public AjaxResult cancelAuthUserAll(Long roleId, Long[] userIds)
+    {
+        return toAjax(roleService.deleteAuthUsers(roleId, userIds));
+    }
+
+    /**
+     * 批量选择用户授权
+     */
+    @PreAuthorize("@ss.hasPermi('system:role:edit')")
+    @Log(title = "角色管理", businessType = BusinessType.GRANT)
+    @PutMapping("/authUser/selectAll")
+    public AjaxResult selectAuthUserAll(Long roleId, Long[] userIds)
+    {
+        roleService.checkRoleDataScope(roleId);
+        return toAjax(roleService.insertAuthUsers(roleId, userIds));
+    }
+
+    /**
+     * 获取对应角色部门树列表
+     */
+    @PreAuthorize("@ss.hasPermi('system:role:query')")
+    @GetMapping(value = "/deptTree/{roleId}")
+    public AjaxResult deptTree(@PathVariable("roleId") Long roleId)
+    {
+        AjaxResult ajax = AjaxResult.success();
+        ajax.put("checkedKeys", deptService.selectDeptListByRoleId(roleId));
+        ajax.put("depts", deptService.selectDeptTreeList(new SysDept()));
+        return ajax;
+    }
+}

vetti-admin/src/main/java/com/vetti/web/controller/system/SysUserController.java

@@ -0,0 +1,266 @@
+package com.vetti.web.controller.system;
+
+import java.util.List;
+import java.util.stream.Collectors;
+import javax.servlet.http.HttpServletResponse;
+import org.apache.commons.lang3.ArrayUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.multipart.MultipartFile;
+import com.vetti.common.annotation.Log;
+import com.vetti.common.core.controller.BaseController;
+import com.vetti.common.core.domain.AjaxResult;
+import com.vetti.common.core.domain.entity.SysDept;
+import com.vetti.common.core.domain.entity.SysRole;
+import com.vetti.common.core.domain.entity.SysUser;
+import com.vetti.common.core.page.TableDataInfo;
+import com.vetti.common.enums.BusinessType;
+import com.vetti.common.utils.SecurityUtils;
+import com.vetti.common.utils.StringUtils;
+import com.vetti.common.utils.poi.ExcelUtil;
+import com.vetti.system.service.ISysDeptService;
+import com.vetti.system.service.ISysPostService;
+import com.vetti.system.service.ISysRoleService;
+import com.vetti.system.service.ISysUserService;
+
+/**
+ * 用户信息
+ * 
+ * @author ruoyi
+ */
+@RestController
+@RequestMapping("/system/user")
+public class SysUserController extends BaseController
+{
+    @Autowired
+    private ISysUserService userService;
+
+    @Autowired
+    private ISysRoleService roleService;
+
+    @Autowired
+    private ISysDeptService deptService;
+
+    @Autowired
+    private ISysPostService postService;
+
+    /**
+     * 获取用户列表
+     */
+    @PreAuthorize("@ss.hasPermi('system:user:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(SysUser user)
+    {
+        startPage();
+        List<SysUser> list = userService.selectUserList(user);
+        return getDataTable(list);
+    }
+
+    /**
+     * 获取用户列表
+     */
+    @GetMapping("/getList")
+    public AjaxResult getList(SysUser user)
+    {
+        List<SysUser> list = userService.selectUserList(user);
+        return AjaxResult.success(list);
+    }
+
+    @Log(title = "用户管理", businessType = BusinessType.EXPORT)
+    @PreAuthorize("@ss.hasPermi('system:user:export')")
+    @PostMapping("/export")
+    public void export(HttpServletResponse response, SysUser user)
+    {
+        List<SysUser> list = userService.selectUserList(user);
+        ExcelUtil<SysUser> util = new ExcelUtil<SysUser>(SysUser.class);
+        util.exportExcel(response, list, "用户数据");
+    }
+
+    @Log(title = "用户管理", businessType = BusinessType.IMPORT)
+    @PreAuthorize("@ss.hasPermi('system:user:import')")
+    @PostMapping("/importData")
+    public AjaxResult importData(MultipartFile file, boolean updateSupport) throws Exception
+    {
+        ExcelUtil<SysUser> util = new ExcelUtil<SysUser>(SysUser.class);
+        List<SysUser> userList = util.importExcel(file.getInputStream());
+        String operName = getUsername();
+        String message = userService.importUser(userList, updateSupport, operName);
+        return success(message);
+    }
+
+    @PostMapping("/importTemplate")
+    public void importTemplate(HttpServletResponse response)
+    {
+        ExcelUtil<SysUser> util = new ExcelUtil<SysUser>(SysUser.class);
+        util.importTemplateExcel(response, "用户数据");
+    }
+
+    /**
+     * 根据用户编号获取详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('system:user:query')")
+    @GetMapping(value = { "/", "/{userId}" })
+    public AjaxResult getInfo(@PathVariable(value = "userId", required = false) Long userId)
+    {
+        AjaxResult ajax = AjaxResult.success();
+        if (StringUtils.isNotNull(userId))
+        {
+            userService.checkUserDataScope(userId);
+            SysUser sysUser = userService.selectUserById(userId);
+            ajax.put(AjaxResult.DATA_TAG, sysUser);
+            ajax.put("postIds", postService.selectPostListByUserId(userId));
+            ajax.put("roleIds", sysUser.getRoles().stream().map(SysRole::getRoleId).collect(Collectors.toList()));
+        }
+        List<SysRole> roles = roleService.selectRoleAll();
+        ajax.put("roles", SysUser.isAdmin(userId) ? roles : roles.stream().filter(r -> !r.isAdmin()).collect(Collectors.toList()));
+        ajax.put("posts", postService.selectPostAll());
+        return ajax;
+    }
+
+    /**
+     * 新增用户
+     */
+    @PreAuthorize("@ss.hasPermi('system:user:add')")
+    @Log(title = "用户管理", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@Validated @RequestBody SysUser user)
+    {
+        deptService.checkDeptDataScope(user.getDeptId());
+        roleService.checkRoleDataScope(user.getRoleIds());
+        if (!userService.checkUserNameUnique(user))
+        {
+            return error("新增用户'" + user.getUserName() + "'失败，登录账号已存在");
+        }
+        else if (StringUtils.isNotEmpty(user.getPhonenumber()) && !userService.checkPhoneUnique(user))
+        {
+            return error("新增用户'" + user.getUserName() + "'失败，手机号码已存在");
+        }
+        else if (StringUtils.isNotEmpty(user.getEmail()) && !userService.checkEmailUnique(user))
+        {
+            return error("新增用户'" + user.getUserName() + "'失败，邮箱账号已存在");
+        }
+        user.setCreateBy(getUsername());
+        user.setPassword(SecurityUtils.encryptPassword(user.getPassword()));
+        return toAjax(userService.insertUser(user));
+    }
+
+    /**
+     * 修改用户
+     */
+    @PreAuthorize("@ss.hasPermi('system:user:edit')")
+    @Log(title = "用户管理", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@Validated @RequestBody SysUser user)
+    {
+        userService.checkUserAllowed(user);
+        userService.checkUserDataScope(user.getUserId());
+        deptService.checkDeptDataScope(user.getDeptId());
+        roleService.checkRoleDataScope(user.getRoleIds());
+        if (!userService.checkUserNameUnique(user))
+        {
+            return error("修改用户'" + user.getUserName() + "'失败，登录账号已存在");
+        }
+        else if (StringUtils.isNotEmpty(user.getPhonenumber()) && !userService.checkPhoneUnique(user))
+        {
+            return error("修改用户'" + user.getUserName() + "'失败，手机号码已存在");
+        }
+        else if (StringUtils.isNotEmpty(user.getEmail()) && !userService.checkEmailUnique(user))
+        {
+            return error("修改用户'" + user.getUserName() + "'失败，邮箱账号已存在");
+        }
+        user.setUpdateBy(getUsername());
+        return toAjax(userService.updateUser(user));
+    }
+
+    /**
+     * 删除用户
+     */
+    @PreAuthorize("@ss.hasPermi('system:user:remove')")
+    @Log(title = "用户管理", businessType = BusinessType.DELETE)
+    @DeleteMapping("/{userIds}")
+    public AjaxResult remove(@PathVariable Long[] userIds)
+    {
+        if (ArrayUtils.contains(userIds, getUserId()))
+        {
+            return error("当前用户不能删除");
+        }
+        return toAjax(userService.deleteUserByIds(userIds));
+    }
+
+    /**
+     * 重置密码
+     */
+    @PreAuthorize("@ss.hasPermi('system:user:resetPwd')")
+    @Log(title = "用户管理", businessType = BusinessType.UPDATE)
+    @PutMapping("/resetPwd")
+    public AjaxResult resetPwd(@RequestBody SysUser user)
+    {
+        userService.checkUserAllowed(user);
+        userService.checkUserDataScope(user.getUserId());
+        user.setPassword(SecurityUtils.encryptPassword(user.getPassword()));
+        user.setUpdateBy(getUsername());
+        return toAjax(userService.resetPwd(user));
+    }
+
+    /**
+     * 状态修改
+     */
+    @PreAuthorize("@ss.hasPermi('system:user:edit')")
+    @Log(title = "用户管理", businessType = BusinessType.UPDATE)
+    @PutMapping("/changeStatus")
+    public AjaxResult changeStatus(@RequestBody SysUser user)
+    {
+        userService.checkUserAllowed(user);
+        userService.checkUserDataScope(user.getUserId());
+        user.setUpdateBy(getUsername());
+        return toAjax(userService.updateUserStatus(user));
+    }
+
+    /**
+     * 根据用户编号获取授权角色
+     */
+    @PreAuthorize("@ss.hasPermi('system:user:query')")
+    @GetMapping("/authRole/{userId}")
+    public AjaxResult authRole(@PathVariable("userId") Long userId)
+    {
+        AjaxResult ajax = AjaxResult.success();
+        SysUser user = userService.selectUserById(userId);
+        List<SysRole> roles = roleService.selectRolesByUserId(userId);
+        ajax.put("user", user);
+        ajax.put("roles", SysUser.isAdmin(userId) ? roles : roles.stream().filter(r -> !r.isAdmin()).collect(Collectors.toList()));
+        return ajax;
+    }
+
+    /**
+     * 用户授权角色
+     */
+    @PreAuthorize("@ss.hasPermi('system:user:edit')")
+    @Log(title = "用户管理", businessType = BusinessType.GRANT)
+    @PutMapping("/authRole")
+    public AjaxResult insertAuthRole(Long userId, Long[] roleIds)
+    {
+        userService.checkUserDataScope(userId);
+        roleService.checkRoleDataScope(roleIds);
+        userService.insertUserAuth(userId, roleIds);
+        return success();
+    }
+
+    /**
+     * 获取部门树列表
+     */
+    @PreAuthorize("@ss.hasPermi('system:user:list')")
+    @GetMapping("/deptTree")
+    public AjaxResult deptTree(SysDept dept)
+    {
+        return success(deptService.selectDeptTreeList(dept));
+    }
+}

vetti-admin/src/main/java/com/vetti/web/controller/tool/SwaggerController.java

@@ -0,0 +1,24 @@
+package com.vetti.web.controller.tool;
+
+import com.vetti.common.core.controller.BaseController;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+
+/**
+ * swagger 接口
+ *
+ * @author ruoyi
+ */
+@Controller
+@RequestMapping("/tool/swagger")
+public class SwaggerController extends BaseController
+{
+    @PreAuthorize("@ss.hasPermi('tool:swagger:view')")
+    @GetMapping()
+    public String index()
+    {
+        return redirect("/doc.html");
+    }
+}

vetti-admin/src/main/java/com/vetti/web/controller/tool/TestController.java

@@ -0,0 +1,183 @@
+package com.vetti.web.controller.tool;
+
+import java.util.ArrayList;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import com.vetti.common.core.controller.BaseController;
+import com.vetti.common.core.domain.R;
+import com.vetti.common.utils.StringUtils;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import io.swagger.annotations.ApiOperation;
+
+/**
+ * swagger 用户测试方法
+ * 
+ * @author ruoyi
+ */
+@Api("用户信息管理")
+@RestController
+@RequestMapping("/test/user")
+public class TestController extends BaseController
+{
+    private final static Map<Integer, UserEntity> users = new LinkedHashMap<Integer, UserEntity>();
+    {
+        users.put(1, new UserEntity(1, "admin", "admin123", "15888888888"));
+        users.put(2, new UserEntity(2, "ry", "admin123", "15666666666"));
+    }
+
+    @ApiOperation("获取用户列表")
+    @GetMapping("/list")
+    public R<List<UserEntity>> userList()
+    {
+        List<UserEntity> userList = new ArrayList<UserEntity>(users.values());
+        return R.ok(userList);
+    }
+
+    @ApiOperation("获取用户详细")
+    @ApiImplicitParam(name = "userId", value = "用户ID", required = true, dataType = "int", paramType = "path", dataTypeClass = Integer.class)
+    @GetMapping("/{userId}")
+    public R<UserEntity> getUser(@PathVariable Integer userId)
+    {
+        if (!users.isEmpty() && users.containsKey(userId))
+        {
+            return R.ok(users.get(userId));
+        }
+        else
+        {
+            return R.fail("用户不存在");
+        }
+    }
+
+    @ApiOperation("新增用户")
+    @ApiImplicitParams({
+        @ApiImplicitParam(name = "userId", value = "用户id", dataType = "Integer", dataTypeClass = Integer.class),
+        @ApiImplicitParam(name = "username", value = "用户名称", dataType = "String", dataTypeClass = String.class),
+        @ApiImplicitParam(name = "password", value = "用户密码", dataType = "String", dataTypeClass = String.class),
+        @ApiImplicitParam(name = "mobile", value = "用户手机", dataType = "String", dataTypeClass = String.class)
+    })
+    @PostMapping("/save")
+    public R<String> save(UserEntity user)
+    {
+        if (StringUtils.isNull(user) || StringUtils.isNull(user.getUserId()))
+        {
+            return R.fail("用户ID不能为空");
+        }
+        users.put(user.getUserId(), user);
+        return R.ok();
+    }
+
+    @ApiOperation("更新用户")
+    @PutMapping("/update")
+    public R<String> update(@RequestBody UserEntity user)
+    {
+        if (StringUtils.isNull(user) || StringUtils.isNull(user.getUserId()))
+        {
+            return R.fail("用户ID不能为空");
+        }
+        if (users.isEmpty() || !users.containsKey(user.getUserId()))
+        {
+            return R.fail("用户不存在");
+        }
+        users.remove(user.getUserId());
+        users.put(user.getUserId(), user);
+        return R.ok();
+    }
+
+    @ApiOperation("删除用户信息")
+    @ApiImplicitParam(name = "userId", value = "用户ID", required = true, dataType = "int", paramType = "path", dataTypeClass = Integer.class)
+    @DeleteMapping("/{userId}")
+    public R<String> delete(@PathVariable Integer userId)
+    {
+        if (!users.isEmpty() && users.containsKey(userId))
+        {
+            users.remove(userId);
+            return R.ok();
+        }
+        else
+        {
+            return R.fail("用户不存在");
+        }
+    }
+}
+
+@ApiModel(value = "UserEntity", description = "用户实体")
+class UserEntity
+{
+    @ApiModelProperty("用户ID")
+    private Integer userId;
+
+    @ApiModelProperty("用户名称")
+    private String username;
+
+    @ApiModelProperty("用户密码")
+    private String password;
+
+    @ApiModelProperty("用户手机")
+    private String mobile;
+
+    public UserEntity()
+    {
+
+    }
+
+    public UserEntity(Integer userId, String username, String password, String mobile)
+    {
+        this.userId = userId;
+        this.username = username;
+        this.password = password;
+        this.mobile = mobile;
+    }
+
+    public Integer getUserId()
+    {
+        return userId;
+    }
+
+    public void setUserId(Integer userId)
+    {
+        this.userId = userId;
+    }
+
+    public String getUsername()
+    {
+        return username;
+    }
+
+    public void setUsername(String username)
+    {
+        this.username = username;
+    }
+
+    public String getPassword()
+    {
+        return password;
+    }
+
+    public void setPassword(String password)
+    {
+        this.password = password;
+    }
+
+    public String getMobile()
+    {
+        return mobile;
+    }
+
+    public void setMobile(String mobile)
+    {
+        this.mobile = mobile;
+    }
+}

vetti-admin/src/main/java/com/vetti/web/core/config/SwaggerConfig.java

@@ -0,0 +1,124 @@
+package com.vetti.web.core.config;
+
+import java.util.ArrayList;
+import java.util.List;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import com.vetti.common.config.RuoYiConfig;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.models.auth.In;
+import springfox.documentation.builders.ApiInfoBuilder;
+import springfox.documentation.builders.PathSelectors;
+import springfox.documentation.builders.RequestHandlerSelectors;
+import springfox.documentation.service.ApiInfo;
+import springfox.documentation.service.ApiKey;
+import springfox.documentation.service.AuthorizationScope;
+import springfox.documentation.service.Contact;
+import springfox.documentation.service.SecurityReference;
+import springfox.documentation.service.SecurityScheme;
+import springfox.documentation.spi.DocumentationType;
+import springfox.documentation.spi.service.contexts.SecurityContext;
+import springfox.documentation.spring.web.plugins.Docket;
+
+/**
+ * Swagger2的接口配置
+ * 
+ * @author ruoyi
+ */
+@Configuration
+public class SwaggerConfig
+{
+    /** 系统基础配置 */
+    @Autowired
+    private RuoYiConfig ruoyiConfig;
+
+    /** 是否开启swagger */
+    @Value("${swagger.enabled}")
+    private boolean enabled;
+
+    /** 设置请求的统一前缀 */
+    @Value("${swagger.pathMapping}")
+    private String pathMapping;
+
+    /**
+     * 创建API
+     */
+    @Bean
+    public Docket createRestApi()
+    {
+        return new Docket(DocumentationType.OAS_30)
+                // 是否启用Swagger
+                .enable(enabled)
+                // 用来创建该API的基本信息，展示在文档的页面中（自定义展示的信息）
+                .apiInfo(apiInfo())
+                // 设置哪些接口暴露给Swagger展示
+                .select()
+                // 扫描所有有注解的api，用这种方式更灵活
+                .apis(RequestHandlerSelectors.withMethodAnnotation(ApiOperation.class))
+                // 扫描指定包中的swagger注解
+                // 扫描所有 .apis(RequestHandlerSelectors.any())
+                .paths(PathSelectors.any())
+                .build()
+                /* 设置安全模式，swagger可以设置访问token */
+                .securitySchemes(securitySchemes())
+                .securityContexts(securityContexts())
+                .pathMapping(pathMapping);
+    }
+
+    /**
+     * 安全模式，这里指定token通过Authorization头请求头传递
+     */
+    private List<SecurityScheme> securitySchemes()
+    {
+        List<SecurityScheme> apiKeyList = new ArrayList<SecurityScheme>();
+        apiKeyList.add(new ApiKey("Authorization", "Authorization", In.HEADER.toValue()));
+        return apiKeyList;
+    }
+
+    /**
+     * 安全上下文
+     */
+    private List<SecurityContext> securityContexts()
+    {
+        List<SecurityContext> securityContexts = new ArrayList<>();
+        securityContexts.add(
+                SecurityContext.builder()
+                        .securityReferences(defaultAuth())
+                        .operationSelector(o -> o.requestMappingPattern().matches("/.*"))
+                        .build());
+        return securityContexts;
+    }
+
+    /**
+     * 默认的安全上引用
+     */
+    private List<SecurityReference> defaultAuth()
+    {
+        AuthorizationScope authorizationScope = new AuthorizationScope("global", "accessEverything");
+        AuthorizationScope[] authorizationScopes = new AuthorizationScope[1];
+        authorizationScopes[0] = authorizationScope;
+        List<SecurityReference> securityReferences = new ArrayList<>();
+        securityReferences.add(new SecurityReference("Authorization", authorizationScopes));
+        return securityReferences;
+    }
+
+    /**
+     * 添加摘要信息
+     */
+    private ApiInfo apiInfo()
+    {
+        // 用ApiInfoBuilder进行定制
+        return new ApiInfoBuilder()
+                // 设置标题
+                .title("Title：Vetti Dashboard API Documentation")
+                // 描述
+                .description("Description: Explanation of all interface structures in the project")
+                // 作者信息
+                .contact(new Contact(ruoyiConfig.getName(), null, null))
+                // 版本
+                .version("Version:" + ruoyiConfig.getVersion())
+                .build();
+    }
+}

vetti-admin/src/main/java/com/vetti/web/service/ISystemI18nGainService.java

@@ -0,0 +1,20 @@
+package com.vetti.web.service;
+
+import java.util.Properties;
+
+/**
+ * 国际化操作 信息 服务类
+ *
+ * @author WangXiangShun
+ * @since 2025-08-27
+ */
+public interface ISystemI18nGainService {
+
+    /**
+     * 获取国际化数据
+     *
+     * @return
+     */
+    Properties getI18nInfo();
+
+}

vetti-admin/src/main/java/com/vetti/web/service/impl/SystemI18nGainServiceImpl.java

@@ -0,0 +1,48 @@
+package com.vetti.web.service.impl;
+
+import cn.hutool.core.util.StrUtil;
+import com.vetti.common.config.InternationalProperties;
+import com.vetti.common.exception.ServiceException;
+import com.vetti.common.utils.I18nUtil;
+import com.vetti.common.utils.MessageUtils;
+import com.vetti.common.utils.spring.SpringUtils;
+import com.vetti.web.service.ISystemI18nGainService;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import javax.servlet.http.HttpServletRequest;
+import java.util.Properties;
+
+/**
+ * 国际化操作 信息 服务实现类
+ *
+ * @author WangXiangShun
+ * @since 2025-08-27
+ */
+@Slf4j
+@Service
+public class SystemI18nGainServiceImpl implements ISystemI18nGainService {
+
+    @Autowired
+    protected HttpServletRequest request;
+
+    /**
+     * 获取国际化数据
+     *
+     * @return
+     */
+    @Override
+    public Properties getI18nInfo() {
+        //获取语言类型
+        InternationalProperties iProperties = SpringUtils.getBean(InternationalProperties.class);
+        // 获取客户语言环境
+        String lang = iProperties.getLang();
+        if(StrUtil.isEmpty(lang)){
+            throw new ServiceException(MessageUtils.messageCustomize("systemExceptionSystemI18nGainServiceImpl10001"));
+        }
+        Properties properties = I18nUtil.loadI18nProp(lang);
+        return properties;
+    }
+
+}

vetti-admin/src/main/resources/META-INF/spring-devtools.properties

@@ -0,0 +1 @@
+restart.include.json=/com.alibaba.fastjson2.*.jar

vetti-admin/src/main/resources/application-druid.yml

@@ -0,0 +1,153 @@
+
+# 开发环境配置
+server:
+    # 服务器的HTTP端口，默认为8080
+    port: 8080
+    servlet:
+        # 应用的访问路径
+        context-path: /
+    tomcat:
+        # tomcat的URI编码
+        uri-encoding: UTF-8
+        # 连接数满后的排队数，默认为100
+        accept-count: 1000
+        threads:
+            # tomcat最大线程数，默认为200
+            max: 800
+            # Tomcat启动初始化的线程数，默认值10
+            min-spare: 100
+
+# 日志配置
+logging:
+    level:
+        com.vetti: debug
+        org.springframework: warn
+    pathUrl: ./logs/
+
+# 用户配置
+user:
+    password:
+        # 密码最大错误次数
+        maxRetryCount: 5
+        # 密码锁定时间（默认10分钟）
+        lockTime: 10
+
+# 数据源配置
+spring:
+    datasource:
+        type: com.alibaba.druid.pool.DruidDataSource
+        driverClassName: com.mysql.cj.jdbc.Driver
+        druid:
+            # 主库数据源
+            master:
+                url: jdbc:mysql://test.hotake.cn:13306/htk-vetti?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
+                username: root
+                password: Hamkke@2021
+            # 从库数据源
+            slave:
+                # 从数据源开关/默认关闭
+                enabled: false
+                url: 
+                username: 
+                password: 
+            # 初始连接数
+            initialSize: 5
+            # 最小连接池数量
+            minIdle: 10
+            # 最大连接池数量
+            maxActive: 20
+            # 配置获取连接等待超时的时间
+            maxWait: 60000
+            # 配置连接超时时间
+            connectTimeout: 30000
+            # 配置网络超时时间
+            socketTimeout: 60000
+            # 配置间隔多久才进行一次检测，检测需要关闭的空闲连接，单位是毫秒
+            timeBetweenEvictionRunsMillis: 60000
+            # 配置一个连接在池中最小生存的时间，单位是毫秒
+            minEvictableIdleTimeMillis: 300000
+            # 配置一个连接在池中最大生存的时间，单位是毫秒
+            maxEvictableIdleTimeMillis: 900000
+            # 配置检测连接是否有效
+            validationQuery: SELECT 1 FROM DUAL
+            testWhileIdle: true
+            testOnBorrow: false
+            testOnReturn: false
+            webStatFilter: 
+                enabled: true
+            statViewServlet:
+                enabled: true
+                # 设置白名单，不填则允许所有访问
+                allow:
+                url-pattern: /druid/*
+                # 控制台管理用户名和密码
+                login-username: ruoyi
+                login-password: 123456
+            filter:
+                stat:
+                    enabled: true
+                    # 慢SQL记录
+                    log-slow-sql: true
+                    slow-sql-millis: 1000
+                    merge-sql: true
+                wall:
+                    config:
+                        multi-statement-allow: true
+    # redis 配置
+    redis:
+        # 地址
+        host: localhost
+        # 端口，默认为6379
+        port: 6379
+        # 数据库索引
+        database: 0
+        # 密码
+        password: Hamkke@2021
+        # 连接超时时间
+        timeout: 10s
+        lettuce:
+            pool:
+                # 连接池中的最小空闲连接
+                min-idle: 0
+                # 连接池中的最大空闲连接
+                max-idle: 8
+                # 连接池的最大数据库连接数
+                max-active: 8
+                # #连接池最大阻塞等待时间（使用负值表示没有限制）
+                max-wait: -1ms
+fs:
+    minio:
+        endpoint: http://test.hotake.cn:19000  # MinIO 服务地址
+        access-key: minioadmin  # 访问密钥（替换为你的 Access Key）
+        secret-key: minioadmin  # 密钥（替换为你的 Secret Key）
+        max-file-size: 104857600 #字节（Byte）
+        bucket-name.: # 存储桶名称（提前在 MinIO 控制台创建）
+            system-fs: system-fs
+# Twilio SendGrid 配置
+twilio:
+    sendgrid:
+        #你的SendGrid API Key
+        api-key: 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
+        #已验证的发送邮箱地址
+        from-email: noreply@routez.app
+        #你的应用名称
+        from-name: RouteZ
+        template-ids:
+            routez-verification-code: d-321fee8a85704983849eb1f69313ae24
+verification:
+    code:
+        email:
+        # 验证码长度
+            length: 5
+        # 验证码过期时间（分钟）
+            expiration-minutes: 10
+
+here-map:
+    api-key: q1gsOSZ899P8dVaoW2HZXq40W-AqCwB6iON5tw7-sqI
+    geocoding-api-url: https://geocode.search.hereapi.com/v1/geocode
+    reverse-geocoding-api-url: https://revgeocode.search.hereapi.com/v1/revgeocode
+    router-api-url: https://router.hereapi.com/v8/routes
+
+http:
+    client:
+        connect-timeout-seconds: 10

vetti-admin/src/main/resources/application.yml

@@ -0,0 +1,94 @@
+# 项目相关配置
+vetti:
+  # 名称
+  name: Vetti
+  # 版本
+  version: 3.9.0
+  # 版权年份
+  copyrightYear: 2025
+  # 文件路径 示例（ Windows配置D:/vetti/uploadPath，Linux配置 /home/vetti/uploadPath）
+  profile: ./uploadPath
+  # 获取ip地址开关
+  addressEnabled: false
+  # 验证码类型 math 数字计算 char 字符验证
+  captchaType: math
+  # 国际化默认语言环境
+  international:
+    enable: true
+
+# Spring配置
+spring:
+  # 资源信息
+  messages:
+    # 国际化资源文件路径
+    basename: i18n/messages
+  profiles:
+    active: druid
+  # 文件上传
+  servlet:
+    multipart:
+      # 单个文件大小
+      max-file-size: 10MB
+      # 设置总上传的文件大小
+      max-request-size: 20MB
+  # 服务模块
+  devtools:
+    restart:
+      # 热部署开关
+      enabled: true
+
+# token配置
+token:
+  # 令牌自定义标识
+  header: Authorization
+  # 令牌密钥
+  secret: abcdefghijklmnopqrstuvwxyz
+  # 令牌有效期（默认30分钟）
+  expireTime: 30
+
+# MyBatis配置
+mybatis:
+  # 搜索指定包别名
+  typeAliasesPackage: com.vetti.**.domain
+  # 配置mapper的扫描，找到所有的mapper.xml映射文件
+  mapperLocations: classpath*:mapper/**/*Mapper.xml
+  # 加载全局的配置文件
+  configLocation: classpath:mybatis/mybatis-config.xml
+
+# PageHelper分页插件
+pagehelper:
+  helperDialect: mysql
+  supportMethodsArguments: true
+  params: count=countSql
+
+#################################### Swagger start #################################
+# Swagger配置
+swagger:
+  # 是否开启swagger
+  enabled: true
+  # 请求前缀
+  pathMapping: /prod-api
+#################################### Swagger end ###################################
+
+# 防止XSS攻击
+xss:
+  # 过滤开关
+  enabled: true
+  # 排除链接（多个用逗号分隔）
+  excludes: /system/notice
+  # 匹配链接
+  urlPatterns: /system/*,/monitor/*,/tool/*
+
+# 安全配置
+security:
+  # 不校验白名单
+  ignore:
+    whites:
+      - /v1/app/system/i18nGain/getInfo
+      - /v1/app/verificationEmail/send
+      - /v1/app/verificationEmail/verify
+      - /v1/app/auth/appLogin
+      - /v1/app/auth/appRegister
+      - /v1/app/auth/appResetPassword
+      - /v1/app/auth/getUserInfoByEmail
+      - /v1/app/verificationEmail/register/send

vetti-admin/src/main/resources/banner.txt

@@ -0,0 +1,2 @@
+Application Version: ${vetti.version}
+Spring Boot Version: ${spring-boot.version}

vetti-admin/src/main/resources/i18n/messages.properties

@@ -0,0 +1,39 @@
+#错误消息
+not.null=* 必须填写
+user.jcaptcha.error=验证码错误
+user.jcaptcha.expire=验证码已失效
+user.not.exists=用户不存在/密码错误
+user.password.not.match=用户不存在/密码错误
+user.password.retry.limit.count=密码输入错误{0}次
+user.password.retry.limit.exceed=密码输入错误{0}次，帐户锁定{1}分钟
+user.password.delete=对不起，您的账号已被删除
+user.blocked=用户已封禁，请联系管理员
+role.blocked=角色已封禁，请联系管理员
+login.blocked=很遗憾，访问IP已被列入系统黑名单
+user.logout.success=退出成功
+
+length.not.valid=长度必须在{min}到{max}个字符之间
+
+user.username.not.valid=* 2到20个汉字、字母、数字或下划线组成，且必须以非数字开头
+user.password.not.valid=* 5-50个字符
+
+user.email.not.valid=邮箱格式错误
+user.mobile.phone.number.not.valid=手机号格式错误
+user.login.success=登录成功
+user.register.success=注册成功
+user.notfound=请重新登录
+user.forcelogout=管理员强制退出，请重新登录
+user.unknown.error=未知错误，请重新登录
+
+##文件上传消息
+upload.exceed.maxSize=上传的文件大小超出限制的文件大小！<br/>允许的文件最大大小是：{0}MB！
+upload.filename.exceed.length=上传的文件名最长{0}个字符
+
+##权限
+no.permission=您没有数据的权限，请联系管理员添加权限 [{0}]
+no.create.permission=您没有创建数据的权限，请联系管理员添加权限 [{0}]
+no.update.permission=您没有修改数据的权限，请联系管理员添加权限 [{0}]
+no.delete.permission=您没有删除数据的权限，请联系管理员添加权限 [{0}]
+no.export.permission=您没有导出数据的权限，请联系管理员添加权限 [{0}]
+no.view.permission=您没有查看数据的权限，请联系管理员添加权限 [{0}]
+

vetti-admin/src/main/resources/i18n/messages_en_US.properties

@@ -0,0 +1,46 @@
+#异常消息
+# system.exception.类名.编号=* Required
+systemCommonTip10001 = Operation Successful
+
+systemExceptionSystemI18nGainServiceImpl10001 = The language type does not exist. Please try again later
+
+systemExceptionTokenController10001 = Illegal login information
+systemExceptionTokenController10002 = Registered Successfully
+systemExceptionTokenController10003 = Password Reset Successful
+
+systemExceptionSysAppLoginServiceImpl10001 = Email Cannot Be Empty
+systemExceptionSysAppLoginServiceImpl10002 = Account Or Password Error
+systemExceptionSysAppLoginServiceImpl10003 = Account Or Password Error
+systemExceptionSysAppLoginServiceImpl10004 = Email Already In Use
+systemExceptionSysAppLoginServiceImpl10005 = Invalid Verification Code
+systemExceptionSysAppLoginServiceImpl10006 = Email Does Not Exist
+systemExceptionSysAppLoginServiceImpl10007 = Passwords Do Not Match
+systemExceptionSysAppLoginServiceImpl10008 = The New PassWord Cannot Match The Old PassWord
+systemExceptionSysAppLoginServiceImpl10009 = The Current Logged In User Is Abnormal. Please Log In Again Or Contact Management
+systemExceptionSysAppLoginServiceImpl10010 = Token has expired
+systemExceptionSysAppLoginServiceImpl10011 = Invalid issuer
+systemExceptionSysAppLoginServiceImpl10012 = Invalid audience
+systemExceptionSysAppLoginServiceImpl10013 = Invalid token signature
+systemExceptionSysAppLoginServiceImpl10014 = Failed to verify token
+systemExceptionSysAppLoginServiceImpl10015 = Email unverified
+systemExceptionSysAppLoginServiceImpl10016 = Invalid Google ID token
+
+systemExceptionAuthFilter10001 = Token Cannot Be Empty
+systemExceptionAuthFilter10002 = Token Has Expired Or Verification Is Incorrect
+systemExceptionAuthFilter10003 = Login Status Has Expired
+systemExceptionAuthFilter10004 = Token Verification Failed
+
+systemVerificationEmailController10001 = The Verification Code Has Been Sent To Your Email
+systemVerificationEmailController10002 = Failed To Send Verification Code, Please Try Again Later
+systemVerificationEmailController10003 = Verification Code Verification Successful
+systemVerificationEmailController10004 = The Verification Code Is Invalid Or Has Expired
+
+SystemCommandOverhaulAppController10001 = Operation Successful
+
+systemEmailUtil10001 = Sending Email Failed
+systemR10001 = Operation Successful
+
+#管理端
+# manager.页面,字段 = User Manager
+VerificationEmailTiTle = Your verification code
+VerificationEmailContent = Your verification code is: {0}, valid for {1} minutes.

vetti-admin/src/main/resources/i18n/messages_zh_CN.properties

@@ -0,0 +1,47 @@
+#异常消息
+# system.exception.类名.编号=* 必须填写
+systemCommonTip10001 = 操作成功
+
+systemExceptionSystemI18nGainServiceImpl10001 = 语言类型不存在,请稍后再试
+
+systemExceptionTokenController10001 = 非法登录信息
+systemExceptionTokenController10002 = 注册成功
+systemExceptionTokenController10003 = 密码重置成功
+
+systemExceptionSysAppLoginServiceImpl10001 = 邮箱不可为空
+systemExceptionSysAppLoginServiceImpl10002 = 账号或者密码错误
+systemExceptionSysAppLoginServiceImpl10003 = 账号或者密码错误
+systemExceptionSysAppLoginServiceImpl10004 = 邮箱已被使用
+systemExceptionSysAppLoginServiceImpl10005 = 验证码无效
+systemExceptionSysAppLoginServiceImpl10006 = 邮箱不存在
+systemExceptionSysAppLoginServiceImpl10007 = 密码不一致
+systemExceptionSysAppLoginServiceImpl10008 = 新密码不能与旧密码一致
+systemExceptionSysAppLoginServiceImpl10009 = 当前登录用户异常,请重新登录或联系管理
+systemExceptionSysAppLoginServiceImpl10010 = 令牌已过期
+systemExceptionSysAppLoginServiceImpl10011 = 颁发者无效
+systemExceptionSysAppLoginServiceImpl10012 = 无效访问群体
+systemExceptionSysAppLoginServiceImpl10013 = 令牌签名无效
+systemExceptionSysAppLoginServiceImpl10014 = 验证令牌失败
+systemExceptionSysAppLoginServiceImpl10015 = 电子邮件未验证
+systemExceptionSysAppLoginServiceImpl10016 = 无效的Google ID令牌
+
+systemExceptionAuthFilter10001 = 令牌不能为空
+systemExceptionAuthFilter10002 = 令牌已过期或验证不正确
+systemExceptionAuthFilter10003 = 登录状态已过期
+systemExceptionAuthFilter10004 = 令牌验证失败
+
+systemVerificationEmailController10001 = 验证码已发送到你的邮箱
+systemVerificationEmailController10002 = 发送验证码失败，请稍后重试
+systemVerificationEmailController10003 = 验证码验证成功
+systemVerificationEmailController10004 = 验证码无效或已过期
+
+SystemCommandOverhaulAppController10001 = 操作成功
+
+systemEmailUtil10001 = 发送邮件失败
+systemR10001 = 操作成功
+
+#管理端
+# manager.页面,字段 = 用户管理
+VerificationEmailTiTle = 你的验证码
+VerificationEmailContent = 你的验证码是: {0}，有效期为 {1} 分钟。
+

vetti-admin/src/main/resources/logback.xml

@@ -0,0 +1,96 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<configuration>
+    <!-- 读取yml配置文件中的路径地址-->
+    <springProperty scope="context" name="logPath" source="logging.pathUrl" defaultValue="logDir"/>
+    <!-- 日志存放路径 -->
+    <property name="log.path" value="${logPath}" />
+    <!-- 日志输出格式 -->
+    <property name="log.pattern" value="%d{HH:mm:ss.SSS} [%thread] %-5level %logger{20} - [%method,%line] - %msg%n" />
+
+
+    <!-- 控制台输出 -->
+	<appender name="console" class="ch.qos.logback.core.ConsoleAppender">
+		<encoder>
+			<pattern>${log.pattern}</pattern>
+		</encoder>
+	</appender>
+	
+	<!-- 系统日志输出 -->
+	<appender name="file_info" class="ch.qos.logback.core.rolling.RollingFileAppender">
+	    <file>${log.path}/sys-info.log</file>
+        <!-- 循环政策：基于时间创建日志文件 -->
+		<rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+            <!-- 日志文件名格式 -->
+			<fileNamePattern>${log.path}/sys-info.%d{yyyy-MM-dd}.log</fileNamePattern>
+			<!-- 日志最大的历史 60天 -->
+			<maxHistory>60</maxHistory>
+		</rollingPolicy>
+		<encoder>
+			<pattern>${log.pattern}</pattern>
+		</encoder>
+		<filter class="ch.qos.logback.classic.filter.LevelFilter">
+            <!-- 过滤的级别 -->
+            <level>INFO</level>
+            <!-- 匹配时的操作：接收（记录） -->
+            <onMatch>ACCEPT</onMatch>
+            <!-- 不匹配时的操作：拒绝（不记录） -->
+            <onMismatch>DENY</onMismatch>
+        </filter>
+	</appender>
+	
+	<appender name="file_error" class="ch.qos.logback.core.rolling.RollingFileAppender">
+	    <file>${log.path}/sys-error.log</file>
+        <!-- 循环政策：基于时间创建日志文件 -->
+        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+            <!-- 日志文件名格式 -->
+            <fileNamePattern>${log.path}/sys-error.%d{yyyy-MM-dd}.log</fileNamePattern>
+			<!-- 日志最大的历史 60天 -->
+			<maxHistory>60</maxHistory>
+        </rollingPolicy>
+        <encoder>
+            <pattern>${log.pattern}</pattern>
+        </encoder>
+        <filter class="ch.qos.logback.classic.filter.LevelFilter">
+            <!-- 过滤的级别 -->
+            <level>ERROR</level>
+			<!-- 匹配时的操作：接收（记录） -->
+            <onMatch>ACCEPT</onMatch>
+			<!-- 不匹配时的操作：拒绝（不记录） -->
+            <onMismatch>DENY</onMismatch>
+        </filter>
+    </appender>
+	
+	<!-- 用户访问日志输出  -->
+    <appender name="sys-user" class="ch.qos.logback.core.rolling.RollingFileAppender">
+		<file>${log.path}/sys-user.log</file>
+        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+            <!-- 按天回滚 daily -->
+            <fileNamePattern>${log.path}/sys-user.%d{yyyy-MM-dd}.log</fileNamePattern>
+            <!-- 日志最大的历史 60天 -->
+            <maxHistory>60</maxHistory>
+        </rollingPolicy>
+        <encoder>
+            <pattern>${log.pattern}</pattern>
+        </encoder>
+    </appender>
+	
+	<!-- 系统模块日志级别控制  -->
+	<logger name="com.vetti" level="info" />
+	<!-- Spring日志级别控制  -->
+	<logger name="org.springframework" level="warn" />
+
+	<root level="info">
+		<appender-ref ref="console" />
+	</root>
+	
+	<!--系统操作日志-->
+    <root level="info">
+        <appender-ref ref="file_info" />
+        <appender-ref ref="file_error" />
+    </root>
+	
+	<!--系统用户操作日志-->
+    <logger name="sys-user" level="info">
+        <appender-ref ref="sys-user"/>
+    </logger>
+</configuration> 

vetti-admin/src/main/resources/mybatis/mybatis-config.xml

@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE configuration
+PUBLIC "-//mybatis.org//DTD Config 3.0//EN"
+"http://mybatis.org/dtd/mybatis-3-config.dtd">
+<configuration>
+    <!-- 全局参数 -->
+    <settings>
+        <!-- 使全局的映射器启用或禁用缓存 -->
+        <setting name="cacheEnabled"             value="true"   />
+        <!-- 允许JDBC 支持自动生成主键 -->
+        <setting name="useGeneratedKeys"         value="true"   />
+        <!-- 配置默认的执行器.SIMPLE就是普通执行器;REUSE执行器会重用预处理语句(prepared statements);BATCH执行器将重用语句并执行批量更新 -->
+        <setting name="defaultExecutorType"      value="SIMPLE" />
+		<!-- 指定 MyBatis 所用日志的具体实现 -->
+        <setting name="logImpl"                  value="SLF4J"  />
+        <!-- 使用驼峰命名法转换字段 -->
+		<!-- <setting name="mapUnderscoreToCamelCase" value="true"/> -->
+	</settings>
+	
+</configuration>

vetti-admin/target/classes/META-INF/spring-devtools.properties

@@ -0,0 +1 @@
+restart.include.json=/com.alibaba.fastjson2.*.jar

vetti-admin/target/classes/application-druid.yml

@@ -0,0 +1,153 @@
+
+# 开发环境配置
+server:
+    # 服务器的HTTP端口，默认为8080
+    port: 8080
+    servlet:
+        # 应用的访问路径
+        context-path: /
+    tomcat:
+        # tomcat的URI编码
+        uri-encoding: UTF-8
+        # 连接数满后的排队数，默认为100
+        accept-count: 1000
+        threads:
+            # tomcat最大线程数，默认为200
+            max: 800
+            # Tomcat启动初始化的线程数，默认值10
+            min-spare: 100
+
+# 日志配置
+logging:
+    level:
+        com.vetti: debug
+        org.springframework: warn
+    pathUrl: ./logs/
+
+# 用户配置
+user:
+    password:
+        # 密码最大错误次数
+        maxRetryCount: 5
+        # 密码锁定时间（默认10分钟）
+        lockTime: 10
+
+# 数据源配置
+spring:
+    datasource:
+        type: com.alibaba.druid.pool.DruidDataSource
+        driverClassName: com.mysql.cj.jdbc.Driver
+        druid:
+            # 主库数据源
+            master:
+                url: jdbc:mysql://test.hotake.cn:13306/htk-vetti?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
+                username: root
+                password: Hamkke@2021
+            # 从库数据源
+            slave:
+                # 从数据源开关/默认关闭
+                enabled: false
+                url: 
+                username: 
+                password: 
+            # 初始连接数
+            initialSize: 5
+            # 最小连接池数量
+            minIdle: 10
+            # 最大连接池数量
+            maxActive: 20
+            # 配置获取连接等待超时的时间
+            maxWait: 60000
+            # 配置连接超时时间
+            connectTimeout: 30000
+            # 配置网络超时时间
+            socketTimeout: 60000
+            # 配置间隔多久才进行一次检测，检测需要关闭的空闲连接，单位是毫秒
+            timeBetweenEvictionRunsMillis: 60000
+            # 配置一个连接在池中最小生存的时间，单位是毫秒
+            minEvictableIdleTimeMillis: 300000
+            # 配置一个连接在池中最大生存的时间，单位是毫秒
+            maxEvictableIdleTimeMillis: 900000
+            # 配置检测连接是否有效
+            validationQuery: SELECT 1 FROM DUAL
+            testWhileIdle: true
+            testOnBorrow: false
+            testOnReturn: false
+            webStatFilter: 
+                enabled: true
+            statViewServlet:
+                enabled: true
+                # 设置白名单，不填则允许所有访问
+                allow:
+                url-pattern: /druid/*
+                # 控制台管理用户名和密码
+                login-username: ruoyi
+                login-password: 123456
+            filter:
+                stat:
+                    enabled: true
+                    # 慢SQL记录
+                    log-slow-sql: true
+                    slow-sql-millis: 1000
+                    merge-sql: true
+                wall:
+                    config:
+                        multi-statement-allow: true
+    # redis 配置
+    redis:
+        # 地址
+        host: localhost
+        # 端口，默认为6379
+        port: 6379
+        # 数据库索引
+        database: 0
+        # 密码
+        password: Hamkke@2021
+        # 连接超时时间
+        timeout: 10s
+        lettuce:
+            pool:
+                # 连接池中的最小空闲连接
+                min-idle: 0
+                # 连接池中的最大空闲连接
+                max-idle: 8
+                # 连接池的最大数据库连接数
+                max-active: 8
+                # #连接池最大阻塞等待时间（使用负值表示没有限制）
+                max-wait: -1ms
+fs:
+    minio:
+        endpoint: http://test.hotake.cn:19000  # MinIO 服务地址
+        access-key: minioadmin  # 访问密钥（替换为你的 Access Key）
+        secret-key: minioadmin  # 密钥（替换为你的 Secret Key）
+        max-file-size: 104857600 #字节（Byte）
+        bucket-name.: # 存储桶名称（提前在 MinIO 控制台创建）
+            system-fs: system-fs
+# Twilio SendGrid 配置
+twilio:
+    sendgrid:
+        #你的SendGrid API Key
+        api-key: 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
+        #已验证的发送邮箱地址
+        from-email: noreply@routez.app
+        #你的应用名称
+        from-name: RouteZ
+        template-ids:
+            routez-verification-code: d-321fee8a85704983849eb1f69313ae24
+verification:
+    code:
+        email:
+        # 验证码长度
+            length: 5
+        # 验证码过期时间（分钟）
+            expiration-minutes: 10
+
+here-map:
+    api-key: q1gsOSZ899P8dVaoW2HZXq40W-AqCwB6iON5tw7-sqI
+    geocoding-api-url: https://geocode.search.hereapi.com/v1/geocode
+    reverse-geocoding-api-url: https://revgeocode.search.hereapi.com/v1/revgeocode
+    router-api-url: https://router.hereapi.com/v8/routes
+
+http:
+    client:
+        connect-timeout-seconds: 10

vetti-admin/target/classes/application.yml

@@ -0,0 +1,94 @@
+# 项目相关配置
+vetti:
+  # 名称
+  name: Vetti
+  # 版本
+  version: 3.9.0
+  # 版权年份
+  copyrightYear: 2025
+  # 文件路径 示例（ Windows配置D:/vetti/uploadPath，Linux配置 /home/vetti/uploadPath）
+  profile: ./uploadPath
+  # 获取ip地址开关
+  addressEnabled: false
+  # 验证码类型 math 数字计算 char 字符验证
+  captchaType: math
+  # 国际化默认语言环境
+  international:
+    enable: true
+
+# Spring配置
+spring:
+  # 资源信息
+  messages:
+    # 国际化资源文件路径
+    basename: i18n/messages
+  profiles:
+    active: druid
+  # 文件上传
+  servlet:
+    multipart:
+      # 单个文件大小
+      max-file-size: 10MB
+      # 设置总上传的文件大小
+      max-request-size: 20MB
+  # 服务模块
+  devtools:
+    restart:
+      # 热部署开关
+      enabled: true
+
+# token配置
+token:
+  # 令牌自定义标识
+  header: Authorization
+  # 令牌密钥
+  secret: abcdefghijklmnopqrstuvwxyz
+  # 令牌有效期（默认30分钟）
+  expireTime: 30
+
+# MyBatis配置
+mybatis:
+  # 搜索指定包别名
+  typeAliasesPackage: com.vetti.**.domain
+  # 配置mapper的扫描，找到所有的mapper.xml映射文件
+  mapperLocations: classpath*:mapper/**/*Mapper.xml
+  # 加载全局的配置文件
+  configLocation: classpath:mybatis/mybatis-config.xml
+
+# PageHelper分页插件
+pagehelper:
+  helperDialect: mysql
+  supportMethodsArguments: true
+  params: count=countSql
+
+#################################### Swagger start #################################
+# Swagger配置
+swagger:
+  # 是否开启swagger
+  enabled: true
+  # 请求前缀
+  pathMapping: /prod-api
+#################################### Swagger end ###################################
+
+# 防止XSS攻击
+xss:
+  # 过滤开关
+  enabled: true
+  # 排除链接（多个用逗号分隔）
+  excludes: /system/notice
+  # 匹配链接
+  urlPatterns: /system/*,/monitor/*,/tool/*
+
+# 安全配置
+security:
+  # 不校验白名单
+  ignore:
+    whites:
+      - /v1/app/system/i18nGain/getInfo
+      - /v1/app/verificationEmail/send
+      - /v1/app/verificationEmail/verify
+      - /v1/app/auth/appLogin
+      - /v1/app/auth/appRegister
+      - /v1/app/auth/appResetPassword
+      - /v1/app/auth/getUserInfoByEmail
+      - /v1/app/verificationEmail/register/send

vetti-admin/target/classes/banner.txt

@@ -0,0 +1,2 @@
+Application Version: ${vetti.version}
+Spring Boot Version: ${spring-boot.version}

vetti-admin/target/classes/i18n/messages.properties

@@ -0,0 +1,39 @@
+#错误消息
+not.null=* 必须填写
+user.jcaptcha.error=验证码错误
+user.jcaptcha.expire=验证码已失效
+user.not.exists=用户不存在/密码错误
+user.password.not.match=用户不存在/密码错误
+user.password.retry.limit.count=密码输入错误{0}次
+user.password.retry.limit.exceed=密码输入错误{0}次，帐户锁定{1}分钟
+user.password.delete=对不起，您的账号已被删除
+user.blocked=用户已封禁，请联系管理员
+role.blocked=角色已封禁，请联系管理员
+login.blocked=很遗憾，访问IP已被列入系统黑名单
+user.logout.success=退出成功
+
+length.not.valid=长度必须在{min}到{max}个字符之间
+
+user.username.not.valid=* 2到20个汉字、字母、数字或下划线组成，且必须以非数字开头
+user.password.not.valid=* 5-50个字符
+
+user.email.not.valid=邮箱格式错误
+user.mobile.phone.number.not.valid=手机号格式错误
+user.login.success=登录成功
+user.register.success=注册成功
+user.notfound=请重新登录
+user.forcelogout=管理员强制退出，请重新登录
+user.unknown.error=未知错误，请重新登录
+
+##文件上传消息
+upload.exceed.maxSize=上传的文件大小超出限制的文件大小！<br/>允许的文件最大大小是：{0}MB！
+upload.filename.exceed.length=上传的文件名最长{0}个字符
+
+##权限
+no.permission=您没有数据的权限，请联系管理员添加权限 [{0}]
+no.create.permission=您没有创建数据的权限，请联系管理员添加权限 [{0}]
+no.update.permission=您没有修改数据的权限，请联系管理员添加权限 [{0}]
+no.delete.permission=您没有删除数据的权限，请联系管理员添加权限 [{0}]
+no.export.permission=您没有导出数据的权限，请联系管理员添加权限 [{0}]
+no.view.permission=您没有查看数据的权限，请联系管理员添加权限 [{0}]
+

vetti-admin/target/classes/i18n/messages_en_US.properties

@@ -0,0 +1,496 @@
+#异常消息
+# system.exception.类名.编号=* Required
+systemCommonTip10001 = Operation Successful
+
+systemExceptionSystemI18nGainServiceImpl10001 = The language type does not exist. Please try again later
+
+systemExceptionTokenController10001 = Illegal login information
+systemExceptionTokenController10002 = Registered Successfully
+systemExceptionTokenController10003 = Password Reset Successful
+
+systemExceptionSysAppLoginServiceImpl10001 = Email Cannot Be Empty
+systemExceptionSysAppLoginServiceImpl10002 = Account Or Password Error
+systemExceptionSysAppLoginServiceImpl10003 = Account Or Password Error
+systemExceptionSysAppLoginServiceImpl10004 = Email Already In Use
+systemExceptionSysAppLoginServiceImpl10005 = Invalid Verification Code
+systemExceptionSysAppLoginServiceImpl10006 = Email Does Not Exist
+systemExceptionSysAppLoginServiceImpl10007 = Passwords Do Not Match
+systemExceptionSysAppLoginServiceImpl10008 = The New PassWord Cannot Match The Old PassWord
+systemExceptionSysAppLoginServiceImpl10009 = The Current Logged In User Is Abnormal. Please Log In Again Or Contact Management
+systemExceptionSysAppLoginServiceImpl10010 = Token has expired
+systemExceptionSysAppLoginServiceImpl10011 = Invalid issuer
+systemExceptionSysAppLoginServiceImpl10012 = Invalid audience
+systemExceptionSysAppLoginServiceImpl10013 = Invalid token signature
+systemExceptionSysAppLoginServiceImpl10014 = Failed to verify token
+systemExceptionSysAppLoginServiceImpl10015 = Email unverified
+systemExceptionSysAppLoginServiceImpl10016 = Invalid Google ID token
+
+systemExceptionAuthFilter10001 = Token Cannot Be Empty
+systemExceptionAuthFilter10002 = Token Has Expired Or Verification Is Incorrect
+systemExceptionAuthFilter10003 = Login Status Has Expired
+systemExceptionAuthFilter10004 = Token Verification Failed
+
+systemVerificationEmailController10001 = The Verification Code Has Been Sent To Your Email
+systemVerificationEmailController10002 = Failed To Send Verification Code, Please Try Again Later
+systemVerificationEmailController10003 = Verification Code Verification Successful
+systemVerificationEmailController10004 = The Verification Code Is Invalid Or Has Expired
+
+SystemCommandOverhaulAppController10001 = Operation Successful
+
+systemEmailUtil10001 = Sending Email Failed
+systemR10001 = Operation Successful
+
+#管理端
+# manager.页面,字段 = User Manager
+VerificationEmailTiTle = Your verification code
+VerificationEmailContent = Your verification code is: {0}, valid for {1} minutes.
+
+#APP端
+AppSystemPassWordTip10001 =  Two Inputs Are Inconsistent
+AppSystemPassWordTip10002 =  Cannot Include Your Name Or Email
+AppSystemPassWordTip10003 =  Contains At Least 8 Characters
+AppSystemPassWordTip10004 =  Contains Symbols Or Numbers
+
+OnboardingOnboarding2ActionSkip	=	Skip
+OnboardingOnboarding2TitleOne	=	Smart, fast routes every time.
+OnboardingOnboarding2InfoOne	=	Optimised Navigation to get you there faster and safer.
+OnboardingOnboarding2ButtonGetStarted	=	Get Started
+OnboardingOnboarding3ActionSkip	=	Skip
+OnboardingOnboarding3TitleOne	=	Stay compliant, drive easy.
+OnboardingOnboarding3InfoOne	=	Seamless EWD & CoR compliance to keep you on track.
+OnboardingOnboarding3ButtonGetStarted	=	Get Started
+OnboardingGetStartedTitleOne	=	Maximise earnings, minimise hassle.
+OnboardingGetStartedInfoOne	=	Sign up or login to see what happening near you
+OnboardingGetStartedButtonEamil	=	Continue with Email
+OnboardingGetStartedButtonGoogle	=	Continue with Google
+OnboardingGetStartedButtonApple	=	Continue with Apple
+AuthenticationLoginEmptyStateTitleOne	=	Sign in to Routez
+AuthenticationLoginEmptyStateInfoOne	=	Welcome back! Please enter yout details.
+AuthenticationLoginEmptyStatePlaceholderEamil	=	Email
+AuthenticationLoginEmptyStatePlaceholderPassword	=	Password
+AuthenticationLoginEmptyStateInfoTwo	=	Forgot password?
+AuthenticationLoginEmptyStateActionReset	=	Reset it
+AuthenticationLoginEmptyStateButtonSignin	=	Sign in
+AuthenticationLoginEmptyStateButtonGoogle	=	Sign in with Google
+AuthenticationLoginEmptyStateButtonApple	=	Sign in with Apple
+AuthenticationLoginEmptyStateInfoThree	=	Don’t have and account? 
+AuthenticationLoginEmptyStateActionSignup	=	Sign Up
+AuthenticationSignUpEmptyStateTitleOne	=	Sign Up
+AuthenticationSignUpEmptyStatePlaceholderFullname	=	Fullname
+AuthenticationSignUpEmptyStatePlaceholderEamil	=	Email
+AuthenticationSignUpEmptyStatePlaceholderPassword	=	Password
+AuthenticationSignUpEmptyStatePlaceholderFullnameTips	=	Please Check Fullname
+AuthenticationSignUpEmptyStatePlaceholderEamilTips	=	Please Check Email
+AuthenticationSignUpEmptyStatePlaceholderPasswordTips	=	Please Check Password
+AuthenticationSignUpEmptyStateInfoOne	=	By signing up, you agree to our 
+AuthenticationSignUpEmptyStateLegalService	=	Terms of Service
+AuthenticationSignUpEmptyStateInfoTwo	=	and
+AuthenticationSignUpEmptyStateLegalpolicy	=	Privacy Policy.
+AuthenticationSignUpEmptyStateButtonSignup	=	Sign Up
+AuthenticationSignUpEmptyStateButtonGoogle	=	Sign in with Google
+AuthenticationSignUpEmptyStateButtonApple	=	Sign in with Apple
+AuthenticationSignUpEmptyStateInfoThree	=	Already have and account? 
+AuthenticationSignUpEmptyStateActionSignin	=	Sign in
+AuthenticationEnterVerificationCodeTitleOne	=	Almost there!
+AuthenticationEnterVerificationCodeInfoOne	=	Check your email inbox and input the verification code to verify your account.
+AuthenticationEnterVerificationCodeButtonContinue	=	Continue
+AuthenticationEnterVerificationCodeButtonResend	=	Resend Code
+AuthenticationForgotPasswordTitleOne	=	Can’t sign in?
+AuthenticationForgotPasswordInfoOne	=	Enter the email associated with your account, and Carline will send you a link to reset your password.
+AuthenticationForgotPasswordPlaceholderEamil	=	Email
+AuthenticationForgotPasswordButtonReset	=	Reset Password
+AuthenticationForgotPasswordButtonReturn	=	Return to Sign In
+AuthenticationEnterNewPasswordTitleOne	=	Create your new password
+AuthenticationEnterNewPasswordInfoOne	=	Your new password must be different from previous password.
+AuthenticationEnterNewPasswordPlaceholderPassword	=	Password
+AuthenticationEnterNewPasswordPlaceholderRepeat	=	Password
+AuthenticationEnterNewPasswordAlertOne	=	Must not contain your name or email
+AuthenticationEnterNewPasswordAlertTwo	=	At least 8 characters
+AuthenticationEnterNewPasswordAlertThree	=	Contains a symbol or a number
+AuthenticationEnterNewPasswordButtonCreate	=	Create New Password
+DriverMyProfileTitleOne	=	Profile
+DriverMyProfileButtonMyProfile	=	My Profile
+DriverMyProfileTitleTwo	=	General
+DriverMyProfileActionOne	=	Appointment
+DriverMyProfileActionTwo	=	Test Drive
+DriverMyProfileActionThree	=	My vouchers
+DriverMyProfileTitleThree	=	Browse history
+DriverMyProfileNavMome	=	Home
+DriverMyProfileNavFavourite	=	Map
+DriverMyProfileNavMessage	=	Fleet
+DriverMyProfileNavProfile	=	Profile
+DriverPreTripCheckTitleOne	=	Pre-Trip Check
+DriverPreTripCheckTitleTwo	=	Next Service
+DriverPreTripCheckButtonStart	=	Start Check
+DriverPreTripCheckButtonOne	=	Check DOne
+DriverPreTripCheckButtonFinish	=	Finish Check
+DriverPreTripCheckButtonStartfull	=	Start Full Inspection
+DriverPreTripCheckListTitleOne	=	Pre-Trip Inspection
+DriverPreTripCheckListInfoOne	=	Complete
+DriverPreTripCheckDetailInfoOne	=	Inspection Point
+DriverPreTripCheckDetailTitleOne	=	Required Specifications
+DriverPreTripCheckDetailButtonFail	=	Fail
+DriverPreTripCheckDetailButtonPass	=	Pass
+DriverPreTripCheckDetailLabelOne	=	Issue Details
+DriverPreTripCheckDetailTitleTwo	=	Photos
+DriverPreTripCheckDetailButtonAdd	=	Add Photo
+DriverPreTripCheckDetailButtonSubmit	=	Submit
+DriverPreTripCheckHistoryTitleOne	=	Hours of Service
+DriverPreTripCheckHistoryInfoOne	=	Last Break
+DriverPreTripCheckHistoryInfoTwo	=	Next Required
+DriverPreTripCheckHistoryTitleTwo	=	Current Route
+DriverPreTripCheckHistoryTitleThree	=	Current Vehicle
+DriverPreTripCheckHistoryButtonStartInspection	=	Start Inspection
+DriverPreTripCheckHistoryButtonViewDetails	=	View Details
+DriverPreTripCheckHistoryTitleFour	=	Recent Inspections
+DriverPreTripCheckHistoryStatusIssues	=	issues found
+DriverPreTripCheckHistoryButtonView	=	View
+DriverJobCenterTitleOne	=	Truck
+DriverJobCenterStatusCompleted	=	Completed
+DriverJobCenterStatusReamining	=	Remaining
+DriverJobCenterTitleTwo	=	Next Job
+DriverJobCenterInfoPackages	=	packages
+DriverJobCenterButtonDeliverTo	=	Deliver to Main Dock
+DriverJobCenterTitleThree	=	Upcoming Stops
+DriverJobCenterButtonSelect	=	Select Job
+DriverCurrentDeliveryTitleOne	=	Current Delivery
+DriverCurrentDeliveryTitleTwo	=	Packages
+DriverCurrentDeliveryTitleThree	=	Delivery Notes
+DriverCurrentDeliveryButtonStartNav	=	Start Navigation
+DriverCurrentDeliveryCompleteTitleOne	=	Current Delivery
+DriverCurrentDeliveryCompleteTitleTwo	=	Packages
+DriverCurrentDeliveryCompleteTitleThree	=	Delivery Notes
+DriverCurrentDeliveryCompleteButtonComplete	=	Complete Delivery
+TruckTruckParameterTitleOne	=	Truck details
+TruckTruckParameterTitleTwo	=	Load Capacity
+TruckTruckParameterTitleThree	=	Condition
+TruckTruckParameterButtonAdd	=	Add to Fleet
+TruckVehicleProfileTitleOne	=	Add My Vehicles
+TruckVehicleProfileInfoOne	=	The selected vehicles will be used for route calculation and guidance.
+TruckVehicleProfileTitleTwo	=	Trucks
+TruckVehicleProfileTitleThree	=	Passenger Cars
+TruckVehicleProfileButtonAdd	=	Add Vehicle
+# 新增加
+NavigationReferenceNavHomePlaceholderSearch	=	Where to?
+NavigationReferenceNavHomeButtonHome	=	home
+NavigationReferenceNavHomeButtonDepo	=	depo
+NavigationReferenceNavHomeButtonSaved	=	saved
+
+NavigationReferenceNavDockUpPlaceholderSearch	=	Where to?
+NavigationReferenceNavDockUpButtonHome	=	home
+NavigationReferenceNavDockUpButtonDepo	=	depo
+NavigationReferenceNavDockUpButtonAddPlace	=	add place
+NavigationReferenceNavDockUpTitleSaved	=	Saved Location
+NavigationReferenceNavDockUpActionSeeAll	=	See all
+NavigationReferenceNavDockUpButtonAddJobLocation	=	Add Job Location
+
+NavigationReferenceNavSearchNormalPlaceholderSearch	=	Where to?
+NavigationReferenceNavSearchNormalActionCancel	=	Cancel
+NavigationReferenceNavSearchNormalButtonRestaurant	=	Restaurant
+NavigationReferenceNavSearchNormalButtonCoffee	=	Coffee
+NavigationReferenceNavSearchNormalButtonATM	=	ATM
+NavigationReferenceNavSearchNormalButtonShopping	=	Shopping
+NavigationReferenceNavSearchNormalButtonFuel	=	Fuel
+NavigationReferenceNavSearchNormalTitleRecentSearches	=	RECENT SEARCHES
+NavigationReferenceNavSearchNormalActionClear	=	Clear
+
+NavigationReferenceNavSearchSelectPlaceholderYourLocation	=	Your Location
+NavigationReferenceNavSearchSelectButtonTruck	=	Truck
+NavigationReferenceNavSearchSelectButtonVan	=	Van
+NavigationReferenceNavSearchSelectButtonCar	=	Car
+NavigationReferenceNavSearchSelectTitleLeavingNow	=	Leaving Now
+NavigationReferenceNavSearchSelectActionRoutePreferences	=	Route Preferences
+
+NavigationReferenceNavRoutePreferenceTitleRoutePreferences	=	Route Preferences
+NavigationReferenceNavRoutePreferenceinfoCar	=	Car
+NavigationReferenceNavRoutePreferenceToggleSetMaxVehicleSpeed	=	Set max vehicle speed
+NavigationReferenceNavRoutePreferenceInfoOne	=	This speed will be used to calculate travel time and alert you in case of over speeding
+NavigationReferenceNavRoutePreferenceTitleZoneRegulations	=	ZONE REGULATIONS
+NavigationReferenceNavRoutePreferenceMenuLicensePlateNumber	=	License plate number
+NavigationReferenceNavRoutePreferenceInfoTwo	=	Indonesia and the Philippines
+NavigationReferenceNavRoutePreferenceTitleAVOID	=	AVOID
+NavigationReferenceNavRoutePreferenceCheckboxAvoidUTurns	=	Avoid U-turns
+NavigationReferenceNavRoutePreferenceCheckboxAvoidFerries	=	Avoid ferries
+NavigationReferenceNavRoutePreferenceCheckboxAvoidHighways	=	Avoid highways
+NavigationReferenceNavRoutePreferenceCheckboxAvoidTunnels	=	Avoid tunnels
+NavigationReferenceNavRoutePreferenceCheckboxAvoidTollRoads	=	Avoid toll roads
+NavigationReferenceNavRoutePreferenceCheckboxAvoidUnpavedRoads	=	Avoid unpaved roads
+
+NavigationReferenceNavigatingTitleArrival	=	arrival
+NavigationReferenceNavigatingTitleRemaining	=	remaining
+NavigationReferenceNavigatingTitleDistance	=	distance
+
+NavigationReferenceNavOverviewTitleArrival	=	arrival
+NavigationReferenceNavOverviewTitleAddAStop	=	ADD A STOP
+NavigationReferenceNavSearchSelectButtonSearch	=	Search
+NavigationReferenceNavSearchSelectButtonGas	=	Gas
+NavigationReferenceNavSearchSelectButtonParking	=	Parking
+NavigationReferenceNavSearchSelectButtonRestaurants	=	Restaurants
+NavigationReferenceNavOverviewTitleQuickSettings	=	QUICK SETTINGS
+NavigationReferenceNavOverviewToggleSpeedAlert	=	Speed alert
+NavigationReferenceNavOverviewToggleOffline	=	Offline
+NavigationReferenceNavOverviewToggleTheme	=	Theme
+NavigationReferenceNavOverviewButtonMoreSetting	=	More setting
+NavigationReferenceNavOverviewTitleOverview	=	OVERVIEW
+
+NavigationReferenceHomePageMenuStartDailyRoute	=	Start Daily Route
+NavigationReferenceHomePageMenuCurrentRoute	=	Current Route
+NavigationReferenceHomePageInfoNoActiveRoute	=	No active route
+NavigationReferenceHomePageMenuMyDiary	=	My Diary / Log
+NavigationReferenceHomePageInfoElectronicWorkDiary	=	Electronic work diary
+NavigationReferenceHomePageMenuTripsReports	=	Trips & Reports
+NavigationReferenceHomePageInfoViewTripHistory	=	View trip history
+NavigationReferenceHomePageMenuDefectsMaintenance	=	Defects & Maintenance
+NavigationReferenceHomePageInfoVehicleIssues	=	Vehicle issues
+
+NavigationReferenceSetVehicleInfoTitleDimensionsWeight	=	Dimensions & Weight
+NavigationReferenceSetVehicleInfoTitleVehicleSpecifications	=	Vehicle Specifications
+NavigationReferenceSetVehicleInfoinfoOne	=	Enter total size and weight including trailersand load
+NavigationReferenceSetVehicleInfoTitlePhysicalDimensions	=	Physical Dimensions
+NavigationReferenceSetVehicleInfoTitleUnitM	=	m
+NavigationReferenceSetVehicleInfoTitleUnitCM	=	cm
+NavigationReferenceSetVehicleInfoTitleHeight	=	Height
+NavigationReferenceSetVehicleInfoTitleWidth	=	Width
+NavigationReferenceSetVehicleInfoTitleLength	=	Length
+NavigationReferenceSetVehicleInfoTitleWeightSpecifications	=	Weight Specifications
+NavigationReferenceSetVehicleInfoTitleTotalWeight	=	Total Weight
+NavigationReferenceSetVehicleInfoTitleUnitTonnes	=	tonnes
+NavigationReferenceSetVehicleInfoInfoTwo	=	15 metric tons =33,069 lbs
+NavigationReferenceSetVehicleInfoButtonNext	=	Next: Hazardous Materials
+
+NavigationReferenceHazardousMaterialsTitleHazardousMaterials	=	Hazardous Materials
+NavigationReferenceHazardousMaterialsTitleCargoClassification	=	Cargo Classification
+NavigationReferenceHazardousMaterialsInfoOne	=	Select any hazardous materials you will betransporting
+NavigationReferenceHazardousMaterialsTitleHazmatCategories	=	Hazmat Categories
+NavigationReferenceHazardousMaterialsToggleExplosives	=	Explosives
+NavigationReferenceHazardousMaterialsToggleGas	=	Gas
+NavigationReferenceHazardousMaterialsToggleFlammable	=	Flammable
+NavigationReferenceHazardousMaterialsTogglePoison	=	Poison
+NavigationReferenceHazardousMaterialsToggleRadioactive	=	Radioactive
+NavigationReferenceHazardousMaterialsToggleCorrosive	=	Corrosive
+NavigationReferenceHazardousMaterialsToggleMiscellaneous	=	Miscellaneous
+NavigationReferenceHazardousMaterialsButtonNext	=	Next: Tunnel Category
+
+NavigationReferenceTripSummaryTitleTripSummary	=	Trip Summary
+NavigationReferenceTripSummaryTitleTripCompletedSuccessfully	=	Trip Completed Successfully
+NavigationReferenceTripSummaryInfoOne	=	All compliance requirements met
+NavigationReferenceTripSummaryTitleTripStatistics	=	Trip Statistics
+NavigationReferenceTripSummaryTitleStartTime	=	START TIME
+NavigationReferenceTripSummaryTitleEndTime	=	END TIME
+NavigationReferenceTripSummaryTitleDistance	=	DISTANCE
+NavigationReferenceTripSummaryTitleDuration	=	DURATION
+NavigationReferenceTripSummaryTitleComplianceStatus	=	Compliance Status
+NavigationReferenceTripSummaryStatusOne	=	Pre-trip inspection completed
+NavigationReferenceTripSummaryStatusTwo	=	Route configured properly
+NavigationReferenceTripSummaryStatusThree	=	Break requirements met
+NavigationReferenceTripSummaryStatusFour	=	No incidents reported
+NavigationReferenceTripSummaryButtonPDF	=	PDF
+NavigationReferenceTripSummaryButtonDone	=	Done
+
+TripReportAndProfileDefectsMaintenanceButtonBack	=	Back
+TripReportAndProfileDefectsMaintenanceTitleDefectsMaintenance	=	Defects & Maintenance
+TripReportAndProfileDefectsMaintenanceTabOpen	=	Open
+TripReportAndProfileDefectsMaintenanceTabResolved	=	Resolved
+TripReportAndProfileDefectsMaintenanceTitleReported	=	Reported
+TripReportAndProfileDefectsMaintenanceTitleLoaction	=	Loaction
+TripReportAndProfileDefectsMaintenanceTitleReporter	=	Reporter
+TripReportAndProfileDefectsMaintenanceButtonAddNewDefect	=	Add New Defect
+
+TripReportAndProfileMyDiaryLogButtonBack	=	Back
+TripReportAndProfileMyDiaryLogTitleMyDiaryLog	=	My Diary / Log
+TripReportAndProfileMyDiaryLogTabToday	=	Today
+TripReportAndProfileMyDiaryLogTabWeek	=	Week
+TripReportAndProfileMyDiaryLogTab28Days	=	28Days
+TripReportAndProfileMyDiaryLogTitleDailyTotals	=	Daily Totals
+TripReportAndProfileMyDiaryLogTitleDrivingTime	=	Driving Time
+TripReportAndProfileMyDiaryLogTitleOnDutyTime	=	On Duty Time
+TripReportAndProfileMyDiaryLogTitleOffDutyTime	=	Off Duty Time
+TripReportAndProfileMyDiaryLogTitleTotalBreaks	=	Total Breaks
+TripReportAndProfileMyDiaryLogStatusRestDay	=	Rest Day
+TripReportAndProfileMyDiaryLogTitleOffDuty	=	Off Duty
+TripReportAndProfileMyDiaryLogTitleDriving	=	Driving
+TripReportAndProfileMyDiaryLogTitleOnDuty	=	OnDuty
+TripReportAndProfileMyDiaryLogStatusCompliant	=	Compliant
+TripReportAndProfileMyDiaryLogStatusViolation	=	Violation
+TripReportAndProfileMyDiaryLogTitle28DayComplianceOverview	=	28-Day Compliance Overview
+TripReportAndProfileMyDiaryLogStatusOff	=	Off
+TripReportAndProfileMyDiaryLogButtonExport	=	Export
+TripReportAndProfileMyDiaryLogButtonEmailReport	=	Email Report
+
+TripReportAndProfileTripsReportsButtonBack	=	Back
+TripReportAndProfileTripsReportsTitleTripsReports	=	Trips & Reports
+TripReportAndProfileTripsReportsTabRecent	=	Recent
+TripReportAndProfileTripsReportsTabThisWeek	=	This Week
+TripReportAndProfileTripsReportsTabThisMonth	=	This Month
+TripReportAndProfileTripsReportsTitleTotalTrips	=	TOTAL TRIPS
+TripReportAndProfileTripsReportsTitleCompliance	=	COMPLIANCE
+TripReportAndProfileTripsReportsTitleDistance	=	Distance
+TripReportAndProfileTripsReportsTitleDuration	=	Duration
+TripReportAndProfileTripsReportsTitleLoadType	=	Load Type
+TripReportAndProfileTripsReportsActionViewDetails	=	View Details
+TripReportAndProfileTripsReportsButtonExportAl	=	Export Al
+TripReportAndProfileTripsReportsButtonFilter	=	Filter
+
+TripReportAndProfileMyProfileDetailButtonBack	=	Back
+TripReportAndProfileMyProfileDetailTitleProfile	=	Profile
+TripReportAndProfileMyProfileDetailActionEdit	=	Edit
+TripReportAndProfileMyProfileDetailTitleDriverInformation	=	Driver Information
+TripReportAndProfileMyProfileDetailTitleLicenceNumber	=	Licence Number
+TripReportAndProfileMyProfileDetailTitleState	=	State
+TripReportAndProfileMyProfileDetailTitleExpiryDate	=	Expiry Date
+TripReportAndProfileMyProfileDetailTitleABN	=	ABN
+TripReportAndProfileMyProfileDetailTitleMyVehicles	=	My Vehicles
+TripReportAndProfileMyProfileDetailTitleAccountSettings	=	Account Settings
+TripReportAndProfileMyProfileDetailTitlePushNotifications	=	Push Notifications
+TripReportAndProfileMyProfileDetailTitleLocationServices	=	Location Services
+TripReportAndProfileMyProfileDetailTitleAutoBackup	=	Auto Backup
+TripReportAndProfileMyProfileDetailButtonSettings	=	Settings
+TripReportAndProfileMyProfileDetailButtonSign Out	=	Sign Out
+
+TripReportAndProfileTripInProgressTitleTripInProgress	=	Trip in Progress
+TripReportAndProfileTripInProgressActionActive	=	Active
+TripReportAndProfileTripInProgressTitleCurrentLocation	=	Current Location
+TripReportAndProfileTripInProgressTitleDestination	=	Destination
+TripReportAndProfileTripInProgressTitleTripDuration	=	Trip Duration
+TripReportAndProfileTripInProgressTitleWorkTime	=	Work Time
+TripReportAndProfileTripInProgressTitleDriveTime	=	Drive Time
+TripReportAndProfileTripInProgressTitleRestTaken	=	Rest Taken
+TripReportAndProfileTripInProgressTitleQuickActions	=	Quick Actions
+TripReportAndProfileTripInProgressButtonTakeBreak	=	Take Break
+TripReportAndProfileTripInProgressButtonReportlssue	=	Report lssue
+TripReportAndProfileTripInProgressButtonFuelStop	=	Fuel Stop
+TripReportAndProfileTripInProgressButtonAddNote	=	Add Note
+TripReportAndProfileTripInProgressButtonEndTrip	=	End Trip
+
+TripReportAndProfileEndTripButtonBack	=	Back
+TripReportAndProfileEndTripTitleEndTrip	=	End Trip
+TripReportAndProfileEndTripTitleTripSummary	=	Trip Summary
+TripReportAndProfileEndTripTitleStartLocation	=	Start Location
+TripReportAndProfileEndTripTitleEndLocation	=	End Location
+TripReportAndProfileEndTripTitleTotalDistance	=	Total Distance
+TripReportAndProfileEndTripTitleTripDuration	=	Trip Duration
+TripReportAndProfileEndTripTitleFuelUsed	=	Fuel Used (Est.)
+TripReportAndProfileEndTripTitleFinalOdometerLu	=	Final OdometerLu
+TripReportAndProfileEndTripTitleStartOdometer	=	Start Odometer
+TripReportAndProfileEndTripTitleEndOdometer	=	End Odometer
+TripReportAndProfileEndTripTitleDeliveryConfirmation	=	Delivery Confirmation
+TripReportAndProfileEndTripTitleCargoDeliveredSuccessfully	=	Cargo delivered successfully
+TripReportAndProfileEndTripTitleDeliveryDocumentationComplete	=	Delivery documentation complete
+TripReportAndProfileEndTripTitleVehicleParkedSafely	=	Vehicle parked safely
+TripReportAndProfileEndTripPlaceholderAddTripNotes	=	Add trip notes (optional)
+TripReportAndProfileEndTripButtonCompleteTrip	=	Complete Trip
+
+TripReportAndProfileBreakRestButtonBack	=	Back
+TripReportAndProfileBreakRestTitleBreakRest	=	Break & Rest
+TripReportAndProfileBreakRestTitleBreakTimer	=	Break Timer
+TripReportAndProfileBreakRestInfoOne	=	Minimum
+TripReportAndProfileBreakRestInfoTwo	=	required
+TripReportAndProfileBreakRestTitleWorkTimeSummary	=	Work Time Summary
+TripReportAndProfileBreakRestTitleTotalWorkTime	=	Total Work Time
+TripReportAndProfileBreakRestTitleContinuousDriving	=	Continuous Driving
+TripReportAndProfileBreakRestTitleLastBreak	=	Last Break
+TripReportAndProfileBreakRestTitleTotalBreaksToday	=	Total Breaks Today
+TripReportAndProfileBreakRestTitleComplianceStatus	=	Compliance Status
+TripReportAndProfileBreakRestTitleDailyWorkLimit	=	Daily Work Limit
+TripReportAndProfileBreakRestTitleWeeklyHours	=	Weekly Hours
+TripReportAndProfileBreakRestButtonEndBreakResume	=	End Break & Resume
+
+
+TripReportAndProfileTripCompleteTitleTripComplete	=	Trip Complete!
+TripReportAndProfileTripCompleteInfoOne	=	Your trip has been successfully logged and saved to your electronic work diary.
+TripReportAndProfileTripCompleteTitleTripStatistics	=	Trip Statistics
+TripReportAndProfileTripCompleteTitleDistance	=	Distance
+TripReportAndProfileTripCompleteTitleDuration	=	Duration
+TripReportAndProfileTripCompleteTitleAvgSpeed	=	Avg Speed
+TripReportAndProfileTripCompleteTitleFuelUsed	=	Fuel Used
+TripReportAndProfileTripCompleteTitleAllComplianceMet	=	All Compliance Met
+TripReportAndProfileTripCompleteInfoTwo	=	Your trip complies with all NHVR regulations
+TripReportAndProfileTripCompleteButtonViewSummary	=	View Summary
+TripReportAndProfileTripCompleteButtonBackToDashboard	=	Back to Dashboard
+
+TripReportAndProfileReportIncidentButtonBack	=	Back
+TripReportAndProfileReportIncidentTitleReportIncident	=	Report Incident
+TripReportAndProfileReportIncidentStatusUrgent	=	URGENT
+TripReportAndProfileReportIncidentTitleIncidentType	=	Incident Type
+TripReportAndProfileReportIncidentTitleLocationDetails	=	Location Details
+TripReportAndProfileReportIncidentTitleCurrentLocation	=	Current Location
+TripReportAndProfileReportIncidentPlaceholderOne	=	Nearest landmark or address
+TripReportAndProfileReportIncidentTitleIncidentDetails	=	Incident Details
+TripReportAndProfileReportIncidentPlaceholderTwo	=	Describe what happened..
+TripReportAndProfileReportIncidentTitleAnyInjuries	=	Any injuries?
+TripReportAndProfileReportIncidentButtonYes	=	Yes
+TripReportAndProfileReportIncidentButtonNo	=	No
+TripReportAndProfileReportIncidentTitleEmergencyServicesCalled	=	Emergency services called?
+TripReportAndProfileReportIncidentTitlePhotosEvidence	=	Photos & Evidence
+TripReportAndProfileReportIncidentButtonSubmitReport	=	Submit Report
+TripReportAndProfileReportIncidentButtonSaveDraft	=	Save Draft
+
+TripReportAndProfileDailySummaryButtonBack	=	Back
+TripReportAndProfileDailySummaryTitleDailySummary	=	Daily Summary
+TripReportAndProfileDailySummaryInfoOne	=	Work Day Complete
+TripReportAndProfileDailySummaryTitleTodayPerformance	=	Today's Performance
+TripReportAndProfileDailySummaryTitleTotalDistance	=	Total Distance
+TripReportAndProfileDailySummaryTitleTotalWorkTime	=	Total work Time
+TripReportAndProfileDailySummaryTitleTripsCompleted	=	Trips Completed
+TripReportAndProfileDailySummaryTitleTotalBreaks	=	Total Breaks
+TripReportAndProfileDailySummaryTitleTripDetails	=	Trip Details
+TripReportAndProfileDailySummaryTitleTrip	=	Trip
+TripReportAndProfileDailySummaryTitleComplianceSummary	=	Compliance Summary
+TripReportAndProfileDailySummaryTitleWorkTimeLimits	=	Work Time Limits
+TripReportAndProfileDailySummaryTitleRestBreaks	=	Rest Breaks
+TripReportAndProfileDailySummaryTitleElectronicWorkDiary	=	Electronic Work Diary
+TripReportAndProfileDailySummaryButtonExportReport	=	Export Report
+TripReportAndProfileDailySummaryButtonSignOffDay	=	Sign Off Day
+
+AuthenticationAddDriverTitleAddVehicle	=	Add Vehicle
+AuthenticationAddDriverTitleVehicleInformation	=	Vehicle Information
+AuthenticationAddDriverTagRegistration	=	REGISTRATION
+AuthenticationAddDriverTagVIN	=	VIN(VEHICLEIDENTIFICATIONNUMBER)
+AuthenticationAddDriverTagRegistrationExpiry	=	REGISTRATION EXPIRY
+AuthenticationAddDriverTagInsuranceExpiry	=	INSURANCE EXPIRY
+AuthenticationAddDriverTagVehicleType	=	VEHICLE TYPE
+AuthenticationAddDriverOptionSelectType	=	Select type
+AuthenticationAddDriverTagMake	=	MAKE
+AuthenticationAddDriverTagModel	=	MODEL
+AuthenticationAddDriverTagYear	=	YEAR
+AuthenticationAddDriverTagColor	=	COLOR
+AuthenticationAddDriverTagDimensionsCapacity	=	Dimensions & Capacity
+AuthenticationAddDriverTagVehicleHeight	=	Vehicle Height
+AuthenticationAddDriverTagVehicleWidth	=	Vehicle Width
+AuthenticationAddDriverTagVehicleLength	=	Vehicle Length
+AuthenticationAddDriverTagGrossWeight	=	Gross Weight
+AuthenticationAddDriverTitleAdditionalSpecifications	=	Additional Specifications
+AuthenticationAddDriverTagAxles	=	AXLES
+AuthenticationAddDriverTagTrailers	=	TRAILERS
+AuthenticationAddDriverTagWeightPerAxle	=	WEIGHT PER AXLE
+AuthenticationAddDriverTagTruckType	=	TRUCK TYPE
+AuthenticationAddDriverTitleHazardousMaterials	=	Hazardous Materials
+AuthenticationAddDriverTagCarryingHazardousGoods	=	CARRYING HAZARDOUS GOODS?
+AuthenticationAddDriverButtonNo	=	No
+AuthenticationAddDriverButtonYes	=	Yes
+AuthenticationAddDriverButtonAddVehicle	=	Add Vehicle
+
+AuthenticationAddVehicleTitleDriverProfile	=	Driver Profile
+AuthenticationAddVehicleTitlePersonalInformation	=	Personal Information
+AuthenticationAddVehicleTagFirstName	=	FIRST NAME
+AuthenticationAddVehicleTagLastName	=	LAST NAME
+AuthenticationAddVehicleTagPhoneNumber	=	PHONE NUMBER
+AuthenticationAddVehicleTitleLicenseCertification	=	License & Certification
+AuthenticationAddVehicleTagDriverLicenseNumber	=	DRIVER'S LICENSE NUMBER
+AuthenticationAddVehicleTagLicenseClass	=	LICENSE CLASS
+AuthenticationAddVehicleTagLicenseState	=	LICENSE STATE
+AuthenticationAddVehicleOptionSelect	=	Select
+AuthenticationAddVehicleTagLicenseExpiry	=	LICENSE EXPIRY
+AuthenticationAddVehicleTagMedicalCert	=	MEDICAL CERT
+AuthenticationAddVehicleTitleHazmatCertification	=	Hazmat Certification
+AuthenticationAddVehicleTagHazmatCertified	=	HAZMAT CERTIFIED?
+AuthenticationAddVehicleButtonNo	=	No
+AuthenticationAddVehicleButtonYes	=	Yes
+AuthenticationAddVehicleButtonSave	=	Save
+
+AuthenticationHazmatDialogTitleHazmatCertification	=	Hazmat Certification
+AuthenticationHazmatDialogTagHazmatCertified	=	HAZMAT CERTIFIED?
+AuthenticationHazmatDialogButtonNo	=	No
+AuthenticationHazmatDialogButtonYes	=	Yes
+AuthenticationHazmatDialogTagHazmatExpiryDate	=	HAZMAT EXPIRY DATE
+AuthenticationHazmatDialogOptionSelect	=	Select date

vetti-admin/target/classes/i18n/messages_zh_CN.properties

@@ -0,0 +1,498 @@
+#异常消息
+# system.exception.类名.编号=* 必须填写
+systemCommonTip10001 = 操作成功
+
+systemExceptionSystemI18nGainServiceImpl10001 = 语言类型不存在,请稍后再试
+
+systemExceptionTokenController10001 = 非法登录信息
+systemExceptionTokenController10002 = 注册成功
+systemExceptionTokenController10003 = 密码重置成功
+
+systemExceptionSysAppLoginServiceImpl10001 = 邮箱不可为空
+systemExceptionSysAppLoginServiceImpl10002 = 账号或者密码错误
+systemExceptionSysAppLoginServiceImpl10003 = 账号或者密码错误
+systemExceptionSysAppLoginServiceImpl10004 = 邮箱已被使用
+systemExceptionSysAppLoginServiceImpl10005 = 验证码无效
+systemExceptionSysAppLoginServiceImpl10006 = 邮箱不存在
+systemExceptionSysAppLoginServiceImpl10007 = 密码不一致
+systemExceptionSysAppLoginServiceImpl10008 = 新密码不能与旧密码一致
+systemExceptionSysAppLoginServiceImpl10009 = 当前登录用户异常,请重新登录或联系管理
+systemExceptionSysAppLoginServiceImpl10010 = 令牌已过期
+systemExceptionSysAppLoginServiceImpl10011 = 颁发者无效
+systemExceptionSysAppLoginServiceImpl10012 = 无效访问群体
+systemExceptionSysAppLoginServiceImpl10013 = 令牌签名无效
+systemExceptionSysAppLoginServiceImpl10014 = 验证令牌失败
+systemExceptionSysAppLoginServiceImpl10015 = 电子邮件未验证
+systemExceptionSysAppLoginServiceImpl10016 = 无效的Google ID令牌
+
+systemExceptionAuthFilter10001 = 令牌不能为空
+systemExceptionAuthFilter10002 = 令牌已过期或验证不正确
+systemExceptionAuthFilter10003 = 登录状态已过期
+systemExceptionAuthFilter10004 = 令牌验证失败
+
+systemVerificationEmailController10001 = 验证码已发送到你的邮箱
+systemVerificationEmailController10002 = 发送验证码失败，请稍后重试
+systemVerificationEmailController10003 = 验证码验证成功
+systemVerificationEmailController10004 = 验证码无效或已过期
+
+SystemCommandOverhaulAppController10001 = 操作成功
+
+systemEmailUtil10001 = 发送邮件失败
+systemR10001 = 操作成功
+
+#管理端
+# manager.页面,字段 = 用户管理
+VerificationEmailTiTle = 你的验证码
+VerificationEmailContent = 你的验证码是: {0}，有效期为 {1} 分钟。
+
+
+#APP端
+
+AppSystemPassWordTip10001 =  两次输入不一致
+AppSystemPassWordTip10002 =  不得包含您的姓名或电子邮件
+AppSystemPassWordTip10003 =  至少包含8个字符
+AppSystemPassWordTip10004 =  包含符号或数字
+
+OnboardingOnboarding2ActionSkip	=	跳过
+OnboardingOnboarding2TitleOne	=	每次都能智能、快速地规划路线。
+OnboardingOnboarding2InfoOne	=	优化后的导航将帮助您更快、更安全地到达目的地。
+OnboardingOnboarding2ButtonGetStarted	=	开始
+OnboardingOnboarding3ActionSkip	=	跳过
+OnboardingOnboarding3TitleOne	=	保持合规，驾驶平稳。
+OnboardingOnboarding3InfoOne	=	无缝的 EWD 和 CoR 合规性设计，助您保持行稳致远。
+OnboardingOnboarding3ButtonGetStarted	=	开始
+OnboardingGetStartedTitleOne	=	实现收益最大化，减少麻烦事。
+OnboardingGetStartedInfoOne	=	点击“注册”或“登录”以查看您附近正在发生的事情
+OnboardingGetStartedButtonEamil	=	继续使用电子邮件
+OnboardingGetStartedButtonGoogle	=	继续使用 Google
+OnboardingGetStartedButtonApple	=	继续使用 AppleID
+AuthenticationLoginEmptyStateTitleOne	=	登录至 Routez
+AuthenticationLoginEmptyStateInfoOne	=	欢迎回来！请填写您的详细信息。
+AuthenticationLoginEmptyStatePlaceholderEamil	=	邮箱
+AuthenticationLoginEmptyStatePlaceholderPassword	=	密码
+AuthenticationLoginEmptyStateInfoTwo	=	忘记了密码？
+AuthenticationLoginEmptyStateActionReset	=	重置
+AuthenticationLoginEmptyStateButtonSignin	=	登录
+AuthenticationLoginEmptyStateButtonGoogle	=	使用 Google 注册
+AuthenticationLoginEmptyStateButtonApple	=	使用 AppleID 注册
+AuthenticationLoginEmptyStateInfoThree	=	还没有账户吗？
+AuthenticationLoginEmptyStateActionSignup	=	注册
+AuthenticationSignUpEmptyStateTitleOne	=	注册
+AuthenticationSignUpEmptyStatePlaceholderFullname	=	全名
+AuthenticationSignUpEmptyStatePlaceholderEamil	=	邮箱
+AuthenticationSignUpEmptyStatePlaceholderPassword	=	密码
+AuthenticationSignUpEmptyStatePlaceholderFullnameTips	=	请检查全名
+AuthenticationSignUpEmptyStatePlaceholderEamilTips	=	请检查邮箱
+AuthenticationSignUpEmptyStatePlaceholderPasswordTips	=	请检查密码
+AuthenticationSignUpEmptyStateInfoOne	=	通过注册，您即表示同意我们的条款。
+AuthenticationSignUpEmptyStateLegalService	=	服务条款
+AuthenticationSignUpEmptyStateInfoTwo	=	和
+AuthenticationSignUpEmptyStateLegalpolicy	=	隐私协议。
+AuthenticationSignUpEmptyStateButtonSignup	=	注册
+AuthenticationSignUpEmptyStateButtonGoogle	=	使用 Google 注册
+AuthenticationSignUpEmptyStateButtonApple	=	使用 AppleID 注册
+AuthenticationSignUpEmptyStateInfoThree	=	已经有账号了吗？
+AuthenticationSignUpEmptyStateActionSignin	=	登录
+AuthenticationEnterVerificationCodeTitleOne	=	即将完成！
+AuthenticationEnterVerificationCodeInfoOne	=	请查看您的电子邮件收件箱，并输入验证码以验证您的账户。
+AuthenticationEnterVerificationCodeButtonContinue	=	继续
+AuthenticationEnterVerificationCodeButtonResend	=	重新发送验证码
+AuthenticationForgotPasswordTitleOne	=	无法登录？
+AuthenticationForgotPasswordInfoOne	=	输入你账号绑定的邮箱，Carline 就会给你发个链接，直接重置密码！
+AuthenticationForgotPasswordPlaceholderEamil	=	邮箱
+AuthenticationForgotPasswordButtonReset	=	重置密码
+AuthenticationForgotPasswordButtonReturn	=	返回登录页面
+AuthenticationEnterNewPasswordTitleOne	=	创建您的新密码
+AuthenticationEnterNewPasswordInfoOne	=	您的新密码必须与之前的密码不同。
+AuthenticationEnterNewPasswordPlaceholderPassword	=	密码
+AuthenticationEnterNewPasswordPlaceholderRepeat	=	密码
+AuthenticationEnterNewPasswordAlertOne	=	不得包含您的姓名或电子邮件。
+AuthenticationEnterNewPasswordAlertTwo	=	至少 8 个字符
+AuthenticationEnterNewPasswordAlertThree	=	包含一个符号或一个数字
+AuthenticationEnterNewPasswordButtonCreate	=	创建新密码
+DriverMyProfileTitleOne	=	资料
+DriverMyProfileButtonMyProfile	=	我的资料
+DriverMyProfileTitleTwo	=	通用
+DriverMyProfileActionOne	=	职务
+DriverMyProfileActionTwo	=	试驾
+DriverMyProfileActionThree	=	我的订单
+DriverMyProfileTitleThree	=	浏览历史
+DriverMyProfileNavMome	=	主页
+DriverMyProfileNavFavourite	=	地图
+DriverMyProfileNavMessage	=	车队
+DriverMyProfileNavProfile	=	资料
+DriverPreTripCheckTitleOne	=	行车前检查
+DriverPreTripCheckTitleTwo	=	下一站
+DriverPreTripCheckButtonStart	=	开始检查
+DriverPreTripCheckButtonOne	=	检查完成
+DriverPreTripCheckButtonFinish	=	结束检查
+DriverPreTripCheckButtonStartfull	=	开始全部检查
+DriverPreTripCheckListTitleOne	=	行车前检查
+DriverPreTripCheckListInfoOne	=	完成
+DriverPreTripCheckDetailInfoOne	=	检查点
+DriverPreTripCheckDetailTitleOne	=	所需规格
+DriverPreTripCheckDetailButtonFail	=	失败
+DriverPreTripCheckDetailButtonPass	=	通过
+DriverPreTripCheckDetailLabelOne	=	问题详情
+DriverPreTripCheckDetailTitleTwo	=	照片
+DriverPreTripCheckDetailButtonAdd	=	添加照片
+DriverPreTripCheckDetailButtonSubmit	=	提交
+DriverPreTripCheckHistoryTitleOne	=	服务时间
+DriverPreTripCheckHistoryInfoOne	=	上次休息
+DriverPreTripCheckHistoryInfoTwo	=	下次需要
+DriverPreTripCheckHistoryTitleTwo	=	当前路线
+DriverPreTripCheckHistoryTitleThree	=	当前车辆
+DriverPreTripCheckHistoryButtonStartInspection	=	开始检查
+DriverPreTripCheckHistoryButtonViewDetails	=	查看详情
+DriverPreTripCheckHistoryTitleFour	=	最近检查
+DriverPreTripCheckHistoryStatusIssues	=	发现问题
+DriverPreTripCheckHistoryButtonView	=	查看
+DriverJobCenterTitleOne	=	卡车
+DriverJobCenterStatusCompleted	=	已完成
+DriverJobCenterStatusReamining	=	剩余
+DriverJobCenterTitleTwo	=	下一个任务
+DriverJobCenterInfoPackages	=	个包裹
+DriverJobCenterButtonDeliverTo	=	送至主码头
+DriverJobCenterTitleThree	=	即将到达的站点
+DriverJobCenterButtonSelect	=	选择任务
+DriverCurrentDeliveryTitleOne	=	当前配送
+DriverCurrentDeliveryTitleTwo	=	包裹
+DriverCurrentDeliveryTitleThree	=	配送备注
+DriverCurrentDeliveryButtonStartNav	=	开始导航
+DriverCurrentDeliveryCompleteTitleOne	=	当前配送
+DriverCurrentDeliveryCompleteTitleTwo	=	包裹
+DriverCurrentDeliveryCompleteTitleThree	=	配送备注
+DriverCurrentDeliveryCompleteButtonComplete	=	完成配送
+TruckTruckParameterTitleOne	=	卡车详情
+TruckTruckParameterTitleTwo	=	载重能力
+TruckTruckParameterTitleThree	=	状态
+TruckTruckParameterButtonAdd	=	添加到车队
+TruckVehicleProfileTitleOne	=	添加我的车辆
+TruckVehicleProfileInfoOne	=	所选车辆将用于路线计算和导航。
+TruckVehicleProfileTitleTwo	=	卡车
+TruckVehicleProfileTitleThree	=	乘用车
+TruckVehicleProfileButtonAdd	=	添加车辆
+
+# 新增
+NavigationReferenceNavHomePlaceholderSearch	=	去哪里？
+NavigationReferenceNavHomeButtonHome	=	家
+NavigationReferenceNavHomeButtonDepo	=	仓库
+NavigationReferenceNavHomeButtonSaved	=	已保存
+
+NavigationReferenceNavDockUpPlaceholderSearch	=	去哪里？
+NavigationReferenceNavDockUpButtonHome	=	家
+NavigationReferenceNavDockUpButtonDepo	=	仓库
+NavigationReferenceNavDockUpButtonAddPlace	=	添加地点
+NavigationReferenceNavDockUpTitleSaved	=	已保存的位置
+NavigationReferenceNavDockUpActionSeeAll	=	查看全部
+NavigationReferenceNavDockUpButtonAddJobLocation	=	添加工作地点
+
+NavigationReferenceNavSearchNormalPlaceholderSearch	=	去哪里？
+NavigationReferenceNavSearchNormalActionCancel	=	取消
+NavigationReferenceNavSearchNormalButtonRestaurant	=	餐厅
+NavigationReferenceNavSearchNormalButtonCoffee	=	咖啡厅
+NavigationReferenceNavSearchNormalButtonATM	=	ATM取款机
+NavigationReferenceNavSearchNormalButtonShopping	=	购物
+NavigationReferenceNavSearchNormalButtonFuel	=	加油
+NavigationReferenceNavSearchNormalTitleRecentSearches	=	最近
+NavigationReferenceNavSearchNormalActionClear	=	清除
+
+NavigationReferenceNavSearchSelectPlaceholderYourLocation	=	你的位置
+NavigationReferenceNavSearchSelectButtonTruck	=	卡车
+NavigationReferenceNavSearchSelectButtonVan	=	货车
+NavigationReferenceNavSearchSelectButtonCar	=	汽车
+NavigationReferenceNavSearchSelectTitleLeavingNow	=	立即出发
+NavigationReferenceNavSearchSelectActionRoutePreferences	=	路线偏好
+
+NavigationReferenceNavRoutePreferenceTitleRoutePreferences	=	路线偏好
+NavigationReferenceNavRoutePreferenceinfoCar	=	汽车
+NavigationReferenceNavRoutePreferenceToggleSetMaxVehicleSpeed	=	设置最大车速
+NavigationReferenceNavRoutePreferenceInfoOne	=	次速度将用于计算旅程时间，并在超速时提醒您
+NavigationReferenceNavRoutePreferenceTitleZoneRegulations	=	区域规定
+NavigationReferenceNavRoutePreferenceMenuLicensePlateNumber	=	车牌号码
+NavigationReferenceNavRoutePreferenceInfoTwo	=	印度尼西亚和菲律宾
+NavigationReferenceNavRoutePreferenceTitleAVOID	=	避免
+NavigationReferenceNavRoutePreferenceCheckboxAvoidUTurns	=	避免U型转弯
+NavigationReferenceNavRoutePreferenceCheckboxAvoidFerries	=	避免杜伦
+NavigationReferenceNavRoutePreferenceCheckboxAvoidHighways	=	避免高速公路
+NavigationReferenceNavRoutePreferenceCheckboxAvoidTunnels	=	避免隧道
+NavigationReferenceNavRoutePreferenceCheckboxAvoidTollRoads	=	避免收费公路
+NavigationReferenceNavRoutePreferenceCheckboxAvoidUnpavedRoads	=	避免未铺装道路
+
+NavigationReferenceNavigatingTitleArrival	=	到达
+NavigationReferenceNavigatingTitleRemaining	=	剩余
+NavigationReferenceNavigatingTitleDistance	=	距离
+
+NavigationReferenceNavOverviewTitleArrival	=	到达
+NavigationReferenceNavOverviewTitleAddAStop	=	添加站点
+NavigationReferenceNavSearchSelectButtonSearch	=	搜索
+NavigationReferenceNavSearchSelectButtonGas	=	加油站
+NavigationReferenceNavSearchSelectButtonParking	=	停车场
+NavigationReferenceNavSearchSelectButtonRestaurants	=	餐厅
+NavigationReferenceNavOverviewTitleQuickSettings	=	快速设置
+NavigationReferenceNavOverviewToggleSpeedAlert	=	超速报警
+NavigationReferenceNavOverviewToggleOffline	=	离线模式
+NavigationReferenceNavOverviewToggleTheme	=	主题
+NavigationReferenceNavOverviewButtonMoreSetting	=	更多设置
+NavigationReferenceNavOverviewTitleOverview	=	概览
+
+NavigationReferenceHomePageMenuStartDailyRoute	=	开始每日路线
+NavigationReferenceHomePageMenuCurrentRoute	=	当前路线
+NavigationReferenceHomePageInfoNoActiveRoute	=	无活动路线
+NavigationReferenceHomePageMenuMyDiary	=	我的日记 / 日志
+NavigationReferenceHomePageInfoElectronicWorkDiary	=	电子工作日记
+NavigationReferenceHomePageMenuTripsReports	=	行程和报告
+NavigationReferenceHomePageInfoViewTripHistory	=	查看历史行程
+NavigationReferenceHomePageMenuDefectsMaintenance	=	缺陷与维护
+NavigationReferenceHomePageInfoVehicleIssues	=	车辆问题
+
+NavigationReferenceSetVehicleInfoTitleDimensionsWeight	=	尺寸和重量
+NavigationReferenceSetVehicleInfoTitleVehicleSpecifications	=	车辆规格
+NavigationReferenceSetVehicleInfoinfoOne	=	输入包括拖车和负载在内的总尺寸和重量
+NavigationReferenceSetVehicleInfoTitlePhysicalDimensions	=	物理尺寸
+NavigationReferenceSetVehicleInfoTitleUnitM	=	米
+NavigationReferenceSetVehicleInfoTitleUnitCM	=	厘米
+NavigationReferenceSetVehicleInfoTitleHeight	=	高度
+NavigationReferenceSetVehicleInfoTitleWidth	=	宽度
+NavigationReferenceSetVehicleInfoTitleLength	=	长度
+NavigationReferenceSetVehicleInfoTitleWeightSpecifications	=	重量规格
+NavigationReferenceSetVehicleInfoTitleTotalWeight	=	总重量
+NavigationReferenceSetVehicleInfoTitleUnitTonnes	=	吨
+NavigationReferenceSetVehicleInfoInfoTwo	=	15吨 = 33,069 磅
+NavigationReferenceSetVehicleInfoButtonNext	=	下一项：危险品
+
+NavigationReferenceHazardousMaterialsTitleHazardousMaterials	=	危险材料
+NavigationReferenceHazardousMaterialsTitleCargoClassification	=	货物分类
+NavigationReferenceHazardousMaterialsInfoOne	=	选择您将要运输的任何危险材料
+NavigationReferenceHazardousMaterialsTitleHazmatCategories	=	危险品类别
+NavigationReferenceHazardousMaterialsToggleExplosives	=	爆炸物
+NavigationReferenceHazardousMaterialsToggleGas	=	气体
+NavigationReferenceHazardousMaterialsToggleFlammable	=	易燃物
+NavigationReferenceHazardousMaterialsTogglePoison	=	毒物
+NavigationReferenceHazardousMaterialsToggleRadioactive	=	放射性物质
+NavigationReferenceHazardousMaterialsToggleCorrosive	=	腐蚀性物质
+NavigationReferenceHazardousMaterialsToggleMiscellaneous	=	杂项
+NavigationReferenceHazardousMaterialsButtonNext	=	下一项：隧道类别
+
+NavigationReferenceTripSummaryTitleTripSummary	=	行程摘要
+NavigationReferenceTripSummaryTitleTripCompletedSuccessfully	=	行程成功完成
+NavigationReferenceTripSummaryInfoOne	=	所有合规要求已满足
+NavigationReferenceTripSummaryTitleTripStatistics	=	行程统计
+NavigationReferenceTripSummaryTitleStartTime	=	开始时间
+NavigationReferenceTripSummaryTitleEndTime	=	结束时间
+NavigationReferenceTripSummaryTitleDistance	=	距离
+NavigationReferenceTripSummaryTitleDuration	=	持续时间
+NavigationReferenceTripSummaryTitleComplianceStatus	=	合规状态
+NavigationReferenceTripSummaryStatusOne	=	行程前检查已完成
+NavigationReferenceTripSummaryStatusTwo	=	路线配置正确
+NavigationReferenceTripSummaryStatusThree	=	休息要求已满足
+NavigationReferenceTripSummaryStatusFour	=	未报告任何事件
+NavigationReferenceTripSummaryButtonPDF	=	PDF
+NavigationReferenceTripSummaryButtonDone	=	完成
+
+TripReportAndProfileDefectsMaintenanceButtonBack	=	返回
+TripReportAndProfileDefectsMaintenanceTitleDefectsMaintenance	=	缺陷与维护
+TripReportAndProfileDefectsMaintenanceTabOpen	=	打开
+TripReportAndProfileDefectsMaintenanceTabResolved	=	已解决
+TripReportAndProfileDefectsMaintenanceTitleReported	=	已报告
+TripReportAndProfileDefectsMaintenanceTitleLoaction	=	位置
+TripReportAndProfileDefectsMaintenanceTitleReporter	=	报告人
+TripReportAndProfileDefectsMaintenanceButtonAddNewDefect	=	添加新缺陷
+
+TripReportAndProfileMyDiaryLogButtonBack	=	返回
+TripReportAndProfileMyDiaryLogTitleMyDiaryLog	=	我的日记 / 日志
+TripReportAndProfileMyDiaryLogTabToday	=	今天
+TripReportAndProfileMyDiaryLogTabWeek	=	周
+TripReportAndProfileMyDiaryLogTab28Days	=	28天
+TripReportAndProfileMyDiaryLogTitleDailyTotals	=	每日总计
+TripReportAndProfileMyDiaryLogTitleDrivingTime	=	驾驶时间
+TripReportAndProfileMyDiaryLogTitleOnDutyTime	=	值班时间
+TripReportAndProfileMyDiaryLogTitleOffDutyTime	=	下班时间
+TripReportAndProfileMyDiaryLogTitleTotalBreaks	=	总休息时间
+TripReportAndProfileMyDiaryLogStatusRestDay	=	休息日
+TripReportAndProfileMyDiaryLogTitleOffDuty	=	下班时间
+TripReportAndProfileMyDiaryLogTitleDriving	=	驾驶时间
+TripReportAndProfileMyDiaryLogTitleOnDuty	=	在岗时间
+TripReportAndProfileMyDiaryLogStatusCompliant	=	合规
+TripReportAndProfileMyDiaryLogStatusViolation	=	违规
+TripReportAndProfileMyDiaryLogTitle28DayComplianceOverview	=	28天合规概览
+TripReportAndProfileMyDiaryLogStatusOff	=	下班
+TripReportAndProfileMyDiaryLogButtonExport	=	导出
+TripReportAndProfileMyDiaryLogButtonEmailReport	=	电子邮件报告
+
+TripReportAndProfileTripsReportsButtonBack	=	返回
+TripReportAndProfileTripsReportsTitleTripsReports	=	行程 & 报告
+TripReportAndProfileTripsReportsTabRecent	=	最近
+TripReportAndProfileTripsReportsTabThisWeek	=	本周
+TripReportAndProfileTripsReportsTabThisMonth	=	本月
+TripReportAndProfileTripsReportsTitleTotalTrips	=	总行程数
+TripReportAndProfileTripsReportsTitleDistance	=	距离
+TripReportAndProfileTripsReportsTitleCompliance	=	合规性
+TripReportAndProfileTripsReportsTitleDuration	=	持续时间
+TripReportAndProfileTripsReportsTitleLoadType	=	负载类型
+TripReportAndProfileTripsReportsActionViewDetails	=	查看详情
+TripReportAndProfileTripsReportsButtonExportAl	=	导出 AI
+TripReportAndProfileTripsReportsButtonFilter	=	筛选
+
+TripReportAndProfileMyProfileDetailButtonBack	=	返回
+TripReportAndProfileMyProfileDetailTitleProfile	=	个人资料
+TripReportAndProfileMyProfileDetailActionEdit	=	编辑
+TripReportAndProfileMyProfileDetailTitleDriverInformation	=	驾驶员信息
+TripReportAndProfileMyProfileDetailTitleLicenceNumber	=	驾照号码
+TripReportAndProfileMyProfileDetailTitleState	=	州
+TripReportAndProfileMyProfileDetailTitleExpiryDate	=	过期日期
+TripReportAndProfileMyProfileDetailTitleABN	=	ABN
+TripReportAndProfileMyProfileDetailTitleMyVehicles	=	我的车辆
+TripReportAndProfileMyProfileDetailTitleAccountSettings	=	账户设置
+TripReportAndProfileMyProfileDetailTitlePushNotifications	=	推送通知
+TripReportAndProfileMyProfileDetailTitleLocationServices	=	位置服务
+TripReportAndProfileMyProfileDetailTitleAutoBackup	=	自动备份
+TripReportAndProfileMyProfileDetailButtonSettings	=	设置
+TripReportAndProfileMyProfileDetailButtonSign Out	=	退出登录
+
+TripReportAndProfileTripInProgressTitleTripInProgress	=	行程进行中
+TripReportAndProfileTripInProgressActionActive	=	活动
+TripReportAndProfileTripInProgressTitleCurrentLocation	=	当前位置
+TripReportAndProfileTripInProgressTitleDestination	=	目的地
+TripReportAndProfileTripInProgressTitleTripDuration	=	行程时长
+TripReportAndProfileTripInProgressTitleWorkTime	=	工作时间
+TripReportAndProfileTripInProgressTitleDriveTime	=	驾驶时间
+TripReportAndProfileTripInProgressTitleRestTaken	=	休息时间
+TripReportAndProfileTripInProgressTitleQuickActions	=	快捷操作
+TripReportAndProfileTripInProgressButtonTakeBreak	=	休息
+TripReportAndProfileTripInProgressButtonReportlssue	=	报告问题
+TripReportAndProfileTripInProgressButtonFuelStop	=	加油
+TripReportAndProfileTripInProgressButtonAddNote	=	添加备注
+TripReportAndProfileTripInProgressButtonEndTrip	=	结束行程
+
+TripReportAndProfileEndTripButtonBack	=	返回
+TripReportAndProfileEndTripTitleEndTrip	=	结束行程
+TripReportAndProfileEndTripTitleTripSummary	=	行程摘要
+TripReportAndProfileEndTripTitleStartLocation	=	起点位置
+TripReportAndProfileEndTripTitleEndLocation	=	结束位置
+TripReportAndProfileEndTripTitleTotalDistance	=	总距离
+TripReportAndProfileEndTripTitleTripDuration	=	行程时长
+TripReportAndProfileEndTripTitleFuelUsed	=	已用燃油（估计）
+TripReportAndProfileEndTripTitleFinalOdometerLu	=	最终里程表读数
+TripReportAndProfileEndTripTitleStartOdometer	=	开始里程表读数
+TripReportAndProfileEndTripTitleEndOdometer	=	结束里程表读数
+TripReportAndProfileEndTripTitleDeliveryConfirmation	=	交付确认
+TripReportAndProfileEndTripTitleCargoDeliveredSuccessfully	=	货物成功交付
+TripReportAndProfileEndTripTitleDeliveryDocumentationComplete	=	交付文件完成
+TripReportAndProfileEndTripTitleVehicleParkedSafely	=	车辆安全停放
+TripReportAndProfileEndTripPlaceholderAddTripNotes	=	添加行程备注（可选）
+TripReportAndProfileEndTripButtonCompleteTrip	=	完成行程
+
+TripReportAndProfileBreakRestButtonBack	=	返回
+TripReportAndProfileBreakRestTitleBreakRest	=	休息与恢复
+TripReportAndProfileBreakRestTitleBreakTimer	=	休息计时器
+TripReportAndProfileBreakRestInfoOne	=	至少
+TripReportAndProfileBreakRestInfoTwo	=	所需
+TripReportAndProfileBreakRestTitleWorkTimeSummary	=	工作时间总结
+TripReportAndProfileBreakRestTitleTotalWorkTime	=	总工作时间
+TripReportAndProfileBreakRestTitleContinuousDriving	=	连续驾驶时间
+TripReportAndProfileBreakRestTitleLastBreak	=	上次休息时间
+TripReportAndProfileBreakRestTitleTotalBreaksToday	=	今天总休息时间
+TripReportAndProfileBreakRestTitleComplianceStatus	=	合规状态
+TripReportAndProfileBreakRestTitleDailyWorkLimit	=	每日工作限制
+TripReportAndProfileBreakRestTitleWeeklyHours	=	每周工时
+TripReportAndProfileBreakRestButtonEndBreakResume	=	结束休息并恢复工作
+
+TripReportAndProfileTripCompleteTitleTripComplete	=	行程完成！
+TripReportAndProfileTripCompleteInfoOne	=	您的行程已成功记录并保存到您的电子工作日记中。
+TripReportAndProfileTripCompleteTitleTripStatistics	=	行程统计
+TripReportAndProfileTripCompleteTitleDistance	=	距离
+TripReportAndProfileTripCompleteTitleDuration	=	持续时间
+TripReportAndProfileTripCompleteTitleAvgSpeed	=	平均速度
+TripReportAndProfileTripCompleteTitleFuelUsed	=	燃油消耗
+TripReportAndProfileTripCompleteTitleAllComplianceMet	=	所有合规要求已满足
+TripReportAndProfileTripCompleteInfoTwo	=	您的行程符合所有NHVR规定
+TripReportAndProfileTripCompleteButtonViewSummary	=	查看摘要
+TripReportAndProfileTripCompleteButtonBackToDashboard	=	返回仪表板
+
+TripReportAndProfileReportIncidentButtonBack	=	返回
+TripReportAndProfileReportIncidentTitleReportIncident	=	报告事件
+TripReportAndProfileReportIncidentStatusUrgent	=	紧急
+TripReportAndProfileReportIncidentTitleIncidentType	=	事件类型
+TripReportAndProfileReportIncidentTitleLocationDetails	=	位置详情
+TripReportAndProfileReportIncidentTitleCurrentLocation	=	当前位置
+TripReportAndProfileReportIncidentPlaceholderOne	=	最近的地标或地址
+TripReportAndProfileReportIncidentTitleIncidentDetails	=	事件详情
+TripReportAndProfileReportIncidentPlaceholderTwo	=	描述发生了什么。
+TripReportAndProfileReportIncidentTitleAnyInjuries	=	是否有受伤？
+TripReportAndProfileReportIncidentButtonYes	=	是
+TripReportAndProfileReportIncidentButtonNo	=	否
+TripReportAndProfileReportIncidentTitleEmergencyServicesCalled	=	是否呼叫了紧急服务？
+TripReportAndProfileReportIncidentTitlePhotosEvidence	=	照片和证据
+TripReportAndProfileReportIncidentButtonSubmitReport	=	提交报告
+TripReportAndProfileReportIncidentButtonSaveDraft	=	保存草稿
+
+TripReportAndProfileDailySummaryButtonBack	=	返回
+TripReportAndProfileDailySummaryTitleDailySummary	=	每日总结
+TripReportAndProfileDailySummaryInfoOne	=	工作日完成情况
+TripReportAndProfileDailySummaryTitleTodayPerformance	=	今日表现
+TripReportAndProfileDailySummaryTitleTotalDistance	=	总距离
+TripReportAndProfileDailySummaryTitleTotalWorkTime	=	总工作时间
+TripReportAndProfileDailySummaryTitleTripsCompleted	=	完成的行程次数
+TripReportAndProfileDailySummaryTitleTotalBreaks	=	总休息时间
+TripReportAndProfileDailySummaryTitleTripDetails	=	行程详情
+TripReportAndProfileDailySummaryTitleTrip	=	行程
+TripReportAndProfileDailySummaryTitleComplianceSummary	=	合规总结
+TripReportAndProfileDailySummaryTitleWorkTimeLimits	=	工作时间限制
+TripReportAndProfileDailySummaryTitleRestBreaks	=	休息时间
+TripReportAndProfileDailySummaryTitleElectronicWorkDiary	=	电子工作日记
+TripReportAndProfileDailySummaryButtonExportReport	=	导出报告
+TripReportAndProfileDailySummaryButtonSignOffDay	=	签退日
+
+AuthenticationAddDriverTitleAddVehicle	=	添加车辆
+AuthenticationAddDriverTitleVehicleInformation	=	车辆信息
+AuthenticationAddDriverTagRegistration	=	车牌号码
+AuthenticationAddDriverTagVIN	=	车辆识别号(VIN)
+AuthenticationAddDriverTagRegistrationExpiry	=	注册到期日志
+AuthenticationAddDriverTagInsuranceExpiry	=	保险到期日期
+AuthenticationAddDriverTagVehicleType	=	车辆类型
+AuthenticationAddDriverOptionSelectType	=	选择类型
+AuthenticationAddDriverTagMake	=	品牌
+AuthenticationAddDriverTagModel	=	型号
+AuthenticationAddDriverTagYear	=	年份
+AuthenticationAddDriverTagColor	=	颜色
+AuthenticationAddDriverTagDimensionsCapacity	=	尺寸和容量
+AuthenticationAddDriverTagVehicleHeight	=	车辆高度
+AuthenticationAddDriverTagVehicleWidth	=	车辆宽度
+AuthenticationAddDriverTagVehicleLength	=	车辆长度
+AuthenticationAddDriverTagGrossWeight	=	总载重
+AuthenticationAddDriverTitleAdditionalSpecifications	=	附加规格
+AuthenticationAddDriverTagAxles	=	轴数
+AuthenticationAddDriverTagTrailers	=	拖车
+AuthenticationAddDriverTagWeightPerAxle	=	每轴重量
+AuthenticationAddDriverTagTruckType	=	卡车类型
+AuthenticationAddDriverTitleHazardousMaterials	=	危险品
+AuthenticationAddDriverTagCarryingHazardousGoods	=	运输危险品？
+AuthenticationAddDriverButtonNo	=	否
+AuthenticationAddDriverButtonYes	=	是
+AuthenticationAddDriverButtonAddVehicle	=	添加车辆
+
+AuthenticationAddVehicleTitleDriverProfile	=	驾驶员资料
+AuthenticationAddVehicleTitlePersonalInformation	=	个人信息
+AuthenticationAddVehicleTagFirstName	=	名
+AuthenticationAddVehicleTagLastName	=	姓氏
+AuthenticationAddVehicleTagPhoneNumber	=	电话号码
+AuthenticationAddVehicleTitleLicenseCertification	=	驾照和认证
+AuthenticationAddVehicleTagDriverLicenseNumber	=	驾照号码
+AuthenticationAddVehicleTagLicenseClass	=	驾照类别
+AuthenticationAddVehicleTagLicenseState	=	驾照状态
+AuthenticationAddVehicleOptionSelect	=	选择
+AuthenticationAddVehicleTagLicenseExpiry	=	驾照到期日期
+AuthenticationAddVehicleTagMedicalCert	=	医疗证明
+AuthenticationAddVehicleTitleHazmatCertification	=	危险品认证
+AuthenticationAddVehicleTagHazmatCertified	=	是否获得危险品认证?
+AuthenticationAddVehicleButtonNo	=	否
+AuthenticationAddVehicleButtonYes	=	是
+AuthenticationAddVehicleButtonSave	=	保存
+
+AuthenticationHazmatDialogTitleHazmatCertification	=	危险品认证
+AuthenticationHazmatDialogTagHazmatCertified	=	是否通过危险品认证?
+AuthenticationHazmatDialogButtonNo	=	否
+AuthenticationHazmatDialogButtonYes	=	是
+AuthenticationHazmatDialogTagHazmatExpiryDate	=	危险品有效期
+AuthenticationHazmatDialogOptionSelect	=	选择日期

vetti-admin/target/classes/logback.xml

@@ -0,0 +1,96 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<configuration>
+    <!-- 读取yml配置文件中的路径地址-->
+    <springProperty scope="context" name="logPath" source="logging.pathUrl" defaultValue="logDir"/>
+    <!-- 日志存放路径 -->
+    <property name="log.path" value="${logPath}" />
+    <!-- 日志输出格式 -->
+    <property name="log.pattern" value="%d{HH:mm:ss.SSS} [%thread] %-5level %logger{20} - [%method,%line] - %msg%n" />
+
+
+    <!-- 控制台输出 -->
+	<appender name="console" class="ch.qos.logback.core.ConsoleAppender">
+		<encoder>
+			<pattern>${log.pattern}</pattern>
+		</encoder>
+	</appender>
+	
+	<!-- 系统日志输出 -->
+	<appender name="file_info" class="ch.qos.logback.core.rolling.RollingFileAppender">
+	    <file>${log.path}/sys-info.log</file>
+        <!-- 循环政策：基于时间创建日志文件 -->
+		<rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+            <!-- 日志文件名格式 -->
+			<fileNamePattern>${log.path}/sys-info.%d{yyyy-MM-dd}.log</fileNamePattern>
+			<!-- 日志最大的历史 60天 -->
+			<maxHistory>60</maxHistory>
+		</rollingPolicy>
+		<encoder>
+			<pattern>${log.pattern}</pattern>
+		</encoder>
+		<filter class="ch.qos.logback.classic.filter.LevelFilter">
+            <!-- 过滤的级别 -->
+            <level>INFO</level>
+            <!-- 匹配时的操作：接收（记录） -->
+            <onMatch>ACCEPT</onMatch>
+            <!-- 不匹配时的操作：拒绝（不记录） -->
+            <onMismatch>DENY</onMismatch>
+        </filter>
+	</appender>
+	
+	<appender name="file_error" class="ch.qos.logback.core.rolling.RollingFileAppender">
+	    <file>${log.path}/sys-error.log</file>
+        <!-- 循环政策：基于时间创建日志文件 -->
+        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+            <!-- 日志文件名格式 -->
+            <fileNamePattern>${log.path}/sys-error.%d{yyyy-MM-dd}.log</fileNamePattern>
+			<!-- 日志最大的历史 60天 -->
+			<maxHistory>60</maxHistory>
+        </rollingPolicy>
+        <encoder>
+            <pattern>${log.pattern}</pattern>
+        </encoder>
+        <filter class="ch.qos.logback.classic.filter.LevelFilter">
+            <!-- 过滤的级别 -->
+            <level>ERROR</level>
+			<!-- 匹配时的操作：接收（记录） -->
+            <onMatch>ACCEPT</onMatch>
+			<!-- 不匹配时的操作：拒绝（不记录） -->
+            <onMismatch>DENY</onMismatch>
+        </filter>
+    </appender>
+	
+	<!-- 用户访问日志输出  -->
+    <appender name="sys-user" class="ch.qos.logback.core.rolling.RollingFileAppender">
+		<file>${log.path}/sys-user.log</file>
+        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+            <!-- 按天回滚 daily -->
+            <fileNamePattern>${log.path}/sys-user.%d{yyyy-MM-dd}.log</fileNamePattern>
+            <!-- 日志最大的历史 60天 -->
+            <maxHistory>60</maxHistory>
+        </rollingPolicy>
+        <encoder>
+            <pattern>${log.pattern}</pattern>
+        </encoder>
+    </appender>
+	
+	<!-- 系统模块日志级别控制  -->
+	<logger name="com.vetti" level="info" />
+	<!-- Spring日志级别控制  -->
+	<logger name="org.springframework" level="warn" />
+
+	<root level="info">
+		<appender-ref ref="console" />
+	</root>
+	
+	<!--系统操作日志-->
+    <root level="info">
+        <appender-ref ref="file_info" />
+        <appender-ref ref="file_error" />
+    </root>
+	
+	<!--系统用户操作日志-->
+    <logger name="sys-user" level="info">
+        <appender-ref ref="sys-user"/>
+    </logger>
+</configuration> 

vetti-admin/target/classes/mybatis/mybatis-config.xml

@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE configuration
+PUBLIC "-//mybatis.org//DTD Config 3.0//EN"
+"http://mybatis.org/dtd/mybatis-3-config.dtd">
+<configuration>
+    <!-- 全局参数 -->
+    <settings>
+        <!-- 使全局的映射器启用或禁用缓存 -->
+        <setting name="cacheEnabled"             value="true"   />
+        <!-- 允许JDBC 支持自动生成主键 -->
+        <setting name="useGeneratedKeys"         value="true"   />
+        <!-- 配置默认的执行器.SIMPLE就是普通执行器;REUSE执行器会重用预处理语句(prepared statements);BATCH执行器将重用语句并执行批量更新 -->
+        <setting name="defaultExecutorType"      value="SIMPLE" />
+		<!-- 指定 MyBatis 所用日志的具体实现 -->
+        <setting name="logImpl"                  value="SLF4J"  />
+        <!-- 使用驼峰命名法转换字段 -->
+		<!-- <setting name="mapUnderscoreToCamelCase" value="true"/> -->
+	</settings>
+	
+</configuration>