Merge branch 'refs/heads/main' into dev_20260130_RemoveRedis
# Conflicts: # backend/Skyeye-sys-dev/skyeye-service-manager/src/main/java/com/zhangy/skyeye/jm/controller/JmImageController.java # backend/Skyeye-sys-dev/skyeye-service-manager/src/main/java/com/zhangy/skyeye/jm/service/impl/JmJobStatusServiceImpl.java # backend/Skyeye-sys-dev/skyeye-service-manager/src/main/java/com/zhangy/skyeye/publics/controller/SysUserController.java
This commit is contained in:
longguancheng
commit
27dfb2d878
@ -0,0 +1,21 @@
|
||||
package com.zhangy.skyeye.common.extend.config;
|
||||
|
||||
import com.zhangy.skyeye.common.extend.core.I18nLocaleResolver;
|
||||
import org.springframework.context.annotation.Bean;
|
||||
import org.springframework.context.annotation.Configuration;
|
||||
import org.springframework.web.servlet.LocaleResolver;
|
||||
|
||||
/**
|
||||
* 国际化配置
|
||||
*
|
||||
* @author zhangy
|
||||
*/
|
||||
@Configuration
|
||||
public class I18nConfig {
|
||||
|
||||
@Bean
|
||||
public LocaleResolver localeResolver() {
|
||||
return new I18nLocaleResolver();
|
||||
}
|
||||
|
||||
}
|
||||
@ -0,0 +1,35 @@
|
||||
package com.zhangy.skyeye.common.extend.core;
|
||||
|
||||
import org.springframework.web.servlet.LocaleResolver;
|
||||
|
||||
import javax.servlet.http.HttpServletRequest;
|
||||
import javax.servlet.http.HttpServletResponse;
|
||||
import java.util.Locale;
|
||||
|
||||
/**
|
||||
* 获取请求头国际化信息
|
||||
*
|
||||
* @author zhangy
|
||||
*/
|
||||
public class I18nLocaleResolver implements LocaleResolver {
|
||||
|
||||
@Override
|
||||
public Locale resolveLocale(HttpServletRequest httpServletRequest) {
|
||||
String language = httpServletRequest.getHeader("content-language");
|
||||
Locale locale = Locale.ENGLISH;
|
||||
if (language != null && language.length() > 0) {
|
||||
String[] split = language.split("_");
|
||||
if (split.length > 1) {
|
||||
locale = new Locale(split[0], split[1]);
|
||||
} else {
|
||||
locale = new Locale(split[0]);
|
||||
}
|
||||
}
|
||||
return locale;
|
||||
}
|
||||
|
||||
@Override
|
||||
public void setLocale(HttpServletRequest httpServletRequest, HttpServletResponse httpServletResponse, Locale locale) {
|
||||
|
||||
}
|
||||
}
|
||||
@ -0,0 +1,31 @@
|
||||
package com.zhangy.skyeye.common.extend.util;
|
||||
|
||||
import org.springframework.context.MessageSource;
|
||||
import org.springframework.context.NoSuchMessageException;
|
||||
import org.springframework.context.i18n.LocaleContextHolder;
|
||||
|
||||
import java.util.Locale;
|
||||
|
||||
/**
|
||||
* 获取i18n资源文件
|
||||
*
|
||||
* @author zhangy
|
||||
*/
|
||||
public class MessageUtils {
|
||||
|
||||
/**
|
||||
* 根据消息键和参数 获取消息 委托给spring messageSource
|
||||
*
|
||||
* @param code 消息键
|
||||
* @param args 参数
|
||||
* @return 获取国际化翻译值
|
||||
*/
|
||||
public static String message(String code, Object... args) {
|
||||
MessageSource messageSource = SpringUtils.getBean(MessageSource.class);
|
||||
try {
|
||||
return messageSource.getMessage(code, args, LocaleContextHolder.getLocale());
|
||||
} catch (NoSuchMessageException e) {
|
||||
return code;
|
||||
}
|
||||
}
|
||||
}
|
||||
@ -0,0 +1,66 @@
|
||||
package com.zhangy.skyeye.common.extend.util;
|
||||
|
||||
import org.springframework.beans.BeansException;
|
||||
import org.springframework.context.ApplicationContext;
|
||||
import org.springframework.context.ApplicationContextAware;
|
||||
import org.springframework.stereotype.Component;
|
||||
|
||||
/**
|
||||
* spring工具类 方便在非spring管理环境中获取bean
|
||||
*
|
||||
* @author zhangy
|
||||
*/
|
||||
@Component
|
||||
public class SpringUtils implements ApplicationContextAware {
|
||||
|
||||
/**
|
||||
* 当前IOC上下文对象
|
||||
*/
|
||||
private static ApplicationContext applicationContext;
|
||||
|
||||
@Override
|
||||
public void setApplicationContext(ApplicationContext applicationContext) throws BeansException {
|
||||
SpringUtils.applicationContext = applicationContext;
|
||||
}
|
||||
|
||||
/**
|
||||
* 获取applicationContext
|
||||
*/
|
||||
public static ApplicationContext getApplicationContext() {
|
||||
return applicationContext;
|
||||
}
|
||||
|
||||
/**
|
||||
* 通过name获取 Bean.
|
||||
*
|
||||
* @param name bean名称
|
||||
* @return bean对象
|
||||
*/
|
||||
public static Object getBean(String name) {
|
||||
return getApplicationContext().getBean(name);
|
||||
}
|
||||
|
||||
/**
|
||||
* 通过class获取Bean.
|
||||
*
|
||||
* @param clazz bean类型
|
||||
* @param <T> 泛型
|
||||
* @return bean对象
|
||||
*/
|
||||
public static <T> T getBean(Class<T> clazz) {
|
||||
return getApplicationContext().getBean(clazz);
|
||||
}
|
||||
|
||||
/**
|
||||
* 通过name,以及Clazz返回指定的Bean
|
||||
*
|
||||
* @param name bean名称
|
||||
* @param clazz bean类型
|
||||
* @param <T> 泛型
|
||||
* @return bean对象
|
||||
*/
|
||||
public static <T> T getBean(String name, Class<T> clazz) {
|
||||
return getApplicationContext().getBean(name, clazz);
|
||||
}
|
||||
|
||||
}
|
||||
@ -1,5 +1,6 @@
|
||||
package com.zhangy.skyeye.device.controller;
|
||||
|
||||
import com.zhangy.skyeye.common.extend.util.MessageUtils;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.validation.annotation.Validated;
|
||||
import org.springframework.web.bind.annotation.*;
|
||||
@ -77,6 +78,6 @@ public class UavController {
|
||||
@PostMapping("/remove")
|
||||
public Object delete(@RequestBody Long... id) {
|
||||
uavService.delete(id);
|
||||
return "操作成功";
|
||||
return MessageUtils.message("device.uav.remove.success");
|
||||
}
|
||||
}
|
||||
@ -3,6 +3,7 @@ package com.zhangy.skyeye.jm.controller;
|
||||
import cn.hutool.core.bean.BeanUtil;
|
||||
import com.zhangy.skyeye.common.extend.anno.IgnoreAuth;
|
||||
import com.zhangy.skyeye.common.extend.exception.ServiceException;
|
||||
import com.zhangy.skyeye.common.extend.util.MessageUtils;
|
||||
import com.zhangy.skyeye.jm.dto.JmImageKtyDTO;
|
||||
import com.zhangy.skyeye.jm.dto.JmImagePageDTO;
|
||||
import com.zhangy.skyeye.jm.dto.JmImageUpdDTO;
|
||||
@ -64,7 +65,7 @@ public class JmImageController {
|
||||
public Object selectList(@Valid @RequestBody JmImageUpdDTO param) {
|
||||
JmImage e = BeanUtil.copyProperties(param, JmImage.class);
|
||||
sarImageService.updateNotNull(e);
|
||||
return "操作成功";
|
||||
return MessageUtils.message("sar.image.update.success");
|
||||
}
|
||||
|
||||
/**
|
||||
@ -73,14 +74,17 @@ public class JmImageController {
|
||||
@PostMapping("/addHigh")
|
||||
public Object addHighImage(@Valid @RequestBody JmJobImageDTO dto) {
|
||||
String lockKey = SAR_IMAGE_UPLOAD_LOCK;
|
||||
boolean locked = localLockUtil.tryLock(lockKey, 60); // 尝试 60 秒获取锁（比原来 1 分钟更灵活）
|
||||
// 尝试 60 秒获取锁（比原来 1 分钟更灵活）
|
||||
boolean locked = localLockUtil.tryLock(lockKey, 60);
|
||||
if (!locked) {
|
||||
throw ServiceException.noLog("正在上传其它图像，请稍后重试！");
|
||||
}
|
||||
try {
|
||||
// 执行高精度图像添加逻辑
|
||||
sarImageService.addHighImage(dto);
|
||||
} finally {
|
||||
localLockUtil.unlock(lockKey); // 释放锁
|
||||
// 释放锁
|
||||
localLockUtil.unlock(lockKey);
|
||||
}
|
||||
return "操作完成";
|
||||
}
|
||||
@ -99,7 +103,7 @@ public class JmImageController {
|
||||
@PostMapping("/remove")
|
||||
public Object delete(@RequestBody Long... id) {
|
||||
sarImageService.delete(id);
|
||||
return "操作完成";
|
||||
return MessageUtils.message("sar.image.remove.success");
|
||||
}
|
||||
|
||||
// 空天院只查询sar低精度图
|
||||
|
||||
@ -5,6 +5,7 @@ import com.zhangy.skyeye.common.extend.anno.IgnoreAuth;
|
||||
import com.zhangy.skyeye.common.extend.enums.EnumUtil;
|
||||
import com.zhangy.skyeye.common.extend.exception.ServiceException;
|
||||
import com.zhangy.skyeye.common.extend.util.DateUtil;
|
||||
import com.zhangy.skyeye.common.extend.util.MessageUtils;
|
||||
import com.zhangy.skyeye.common.pojo.result.Result;
|
||||
import com.zhangy.skyeye.jm.consts.JmJobModeEnum;
|
||||
import com.zhangy.skyeye.jm.dto.JmJobDTO;
|
||||
@ -23,6 +24,7 @@ import org.springframework.web.bind.annotation.*;
|
||||
import javax.validation.Valid;
|
||||
import javax.validation.constraints.NotNull;
|
||||
import java.util.Collections;
|
||||
import java.util.Objects;
|
||||
|
||||
@Validated
|
||||
@RestController
|
||||
@ -114,7 +116,10 @@ public class JmJobController {
|
||||
* 重飞
|
||||
*/
|
||||
@GetMapping("/retry")
|
||||
public Object retry(@NotNull(message = "任务ID不能为空") Long id) {
|
||||
public Object retry(Long id) {
|
||||
if(Objects.isNull(id)) {
|
||||
return MessageUtils.message("sar.job.retry.enullid");
|
||||
}
|
||||
JmJobDTO e = jobService.selectDetail(id);
|
||||
clearId(e);
|
||||
e.setName(DateUtil.getTimeStr(DateUtil.DF_2));
|
||||
@ -135,12 +140,12 @@ public class JmJobController {
|
||||
// 查询执行任务的无人机
|
||||
JmJobDTO job = jobService.selectDetail(id);
|
||||
if (job == null) {
|
||||
throw ServiceException.noLog("找不到任务，id=" + id);
|
||||
throw ServiceException.noLog(MessageUtils.message("sar.job.start.enosuchjob", id));
|
||||
} else if (EnumUtil.parseEx(ExecStatusEnum.class, job.getStatus()) == ExecStatusEnum.PROCESSING) {
|
||||
throw ServiceException.noLog("任务状态为执行中，无法起飞");
|
||||
throw ServiceException.noLog(MessageUtils.message("sar.job.start.einexecuting"));
|
||||
}
|
||||
jobService.start(job);
|
||||
return "开始执行";
|
||||
return MessageUtils.message("sar.job.start.success");
|
||||
}
|
||||
|
||||
/**
|
||||
@ -177,7 +182,7 @@ public class JmJobController {
|
||||
@GetMapping("/exit")
|
||||
public Object exit(@RequestParam Long id) {
|
||||
jobService.exit(id);
|
||||
return "操作成功";
|
||||
return MessageUtils.message("sar.job.exit.success");
|
||||
}
|
||||
|
||||
/**
|
||||
|
||||
@ -1,6 +1,7 @@
|
||||
package com.zhangy.skyeye.jm.controller;
|
||||
|
||||
import com.baomidou.mybatisplus.core.metadata.IPage;
|
||||
import com.zhangy.skyeye.common.extend.util.MessageUtils;
|
||||
import com.zhangy.skyeye.jm.dto.JmJobDTO;
|
||||
import com.zhangy.skyeye.jm.dto.JmJobPageDTO;
|
||||
import com.zhangy.skyeye.jm.entity.JmImage;
|
||||
@ -60,6 +61,6 @@ public class JmJobExecController {
|
||||
@RequestMapping("/brightness")
|
||||
public Object adjustBrightness(@Valid @RequestBody JmImage param) {
|
||||
jobExecService.adjustBrightness(param);
|
||||
return "成功调整亮度";
|
||||
return MessageUtils.message("sar.job_exec.brightness.success");
|
||||
}
|
||||
}
|
||||
@ -0,0 +1,23 @@
|
||||
package com.zhangy.skyeye.jm.controller;
|
||||
|
||||
import com.zhangy.skyeye.common.extend.anno.IgnoreAuth;
|
||||
import com.zhangy.skyeye.common.extend.util.MessageUtils;
|
||||
import org.springframework.web.bind.annotation.GetMapping;
|
||||
import org.springframework.web.bind.annotation.RequestMapping;
|
||||
import org.springframework.web.bind.annotation.RestController;
|
||||
|
||||
/**
|
||||
* i18n 测试
|
||||
*
|
||||
* @author zhangy
|
||||
*/
|
||||
@RestController
|
||||
@RequestMapping("/test/i18n")
|
||||
public class TestI18nController {
|
||||
|
||||
@IgnoreAuth
|
||||
@GetMapping
|
||||
public String test(String code) {
|
||||
return MessageUtils.message(code);
|
||||
}
|
||||
}
|
||||
@ -1,6 +1,8 @@
|
||||
package com.zhangy.skyeye.jm.service.impl;
|
||||
|
||||
import com.zhangy.skyeye.cache.sar.SarCache;
|
||||
import com.zhangy.skyeye.common.extend.exception.ServiceException;
|
||||
import com.zhangy.skyeye.common.extend.util.MessageUtils;
|
||||
import com.zhangy.skyeye.jm.dto.*;
|
||||
import com.zhangy.skyeye.jm.entity.JmJobPayload;
|
||||
import com.zhangy.skyeye.jm.entity.JmJobUav;
|
||||
@ -9,6 +11,7 @@ import com.zhangy.skyeye.jm.event.JmJobStatusEvent;
|
||||
import com.zhangy.skyeye.jm.event.JmPayloadStatusEvent;
|
||||
import com.zhangy.skyeye.jm.service.JmJobStatusService;
|
||||
import com.zhangy.skyeye.jm.service.JmStatusLogService;
|
||||
import com.zhangy.skyeye.publics.consts.CacheKey;
|
||||
import com.zhangy.skyeye.publics.consts.ExecStatusEnum;
|
||||
import com.zhangy.skyeye.publics.consts.WebSocketKey;
|
||||
import com.zhangy.skyeye.publics.utils.CoordUtil;
|
||||
@ -42,6 +45,12 @@ public class JmJobStatusServiceImpl implements JmJobStatusService {
|
||||
@Autowired
|
||||
private SarImageUdpProcessor imageProcessService;
|
||||
|
||||
@Autowired
|
||||
private SarCache sarCache;
|
||||
|
||||
// @Autowired
|
||||
// private ISmpSubscriptService subscriptService;
|
||||
|
||||
/**
|
||||
* 缓存所有执行中的任务的状态 key 任务配置ID，value 任务状态
|
||||
*/
|
||||
@ -170,11 +179,15 @@ public class JmJobStatusServiceImpl implements JmJobStatusService {
|
||||
// 校验新任务中的无人机和载荷是否冲突
|
||||
for (JmJobUav newUav : newJobUavs) {
|
||||
if (runningUavIds.contains(newUav.getUavId())) {
|
||||
throw ServiceException.warnLog("无人机正在任务中，无法执行新任务");
|
||||
throw ServiceException.warnLog(MessageUtils.message("sar.control.turnon.euavinexec"));
|
||||
}
|
||||
for (JmJobPayload payload : newUav.getPayloadList()) {
|
||||
// 校验雷达连接状态
|
||||
if (!sarCache.isConnected(payload.getIp())) {
|
||||
throw ServiceException.warnLog(MessageUtils.message("device.sar.offline", payload.getPayloadName()));
|
||||
}
|
||||
if (runningPayloadIds.contains(payload.getPayloadId())) {
|
||||
throw ServiceException.warnLog("载荷正在任务中，无法执行新任务");
|
||||
throw ServiceException.warnLog(MessageUtils.message("sar.control.turnon.esarinexec"));
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@ -6,9 +6,11 @@ import com.zhangy.skyeye.common.extend.anno.IgnoreAuth;
|
||||
import com.zhangy.skyeye.common.extend.anno.OperationLog;
|
||||
import com.zhangy.skyeye.common.extend.dto.PageDTO;
|
||||
import com.zhangy.skyeye.common.extend.exception.ServiceException;
|
||||
import com.zhangy.skyeye.common.extend.util.MessageUtils;
|
||||
import com.zhangy.skyeye.common.extend.util.ObjectUtil;
|
||||
import com.zhangy.skyeye.common.pojo.result.Result;
|
||||
import com.zhangy.skyeye.common.utils.JwtUtil;
|
||||
import com.zhangy.skyeye.redis.utils.RedisUtil;
|
||||
import com.zhangy.skyeye.publics.consts.CacheKey;
|
||||
import com.zhangy.skyeye.publics.dto.RegisterDTO;
|
||||
import com.zhangy.skyeye.publics.dto.SysUserPwdDTO;
|
||||
@ -20,13 +22,11 @@ import com.zhangy.skyeye.publics.utils.SecurityUtil;
|
||||
import lombok.AllArgsConstructor;
|
||||
import lombok.extern.slf4j.Slf4j;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.cache.CacheManager;
|
||||
import org.springframework.validation.annotation.Validated;
|
||||
import org.springframework.web.bind.annotation.*;
|
||||
|
||||
import javax.validation.Valid;
|
||||
import java.util.List;
|
||||
import java.util.Objects;
|
||||
|
||||
@Validated
|
||||
@RestController
|
||||
@ -39,11 +39,13 @@ public class SysUserController {
|
||||
private ISysUserService sysUserService;
|
||||
|
||||
@Autowired
|
||||
private CacheManager cacheManager;
|
||||
private RedisUtil redisUtil;
|
||||
|
||||
/** token失效时间（秒） */
|
||||
private final int TOKEN_EXPIRE = 60 * 60 * 24;
|
||||
|
||||
/**
|
||||
* 登录接口
|
||||
*
|
||||
* @return
|
||||
*/
|
||||
@IgnoreAuth
|
||||
@ -52,21 +54,18 @@ public class SysUserController {
|
||||
public Result login(@RequestBody RegisterDTO registerDTO) {
|
||||
SysUser user = sysUserService.selectByAccount(registerDTO.getUsername(), registerDTO.getPassword().toLowerCase());
|
||||
if (user == null) {
|
||||
throw ServiceException.noLog("用户名或密码错误！");
|
||||
throw ServiceException.noLog(MessageUtils.message("user.login.error"));
|
||||
}
|
||||
UserDTO userDTO = BeanUtil.copyProperties(user, UserDTO.class);
|
||||
String payload = JSONUtil.toJsonStr(userDTO); // 保持原逻辑
|
||||
String accessToken = JwtUtil.sign(payload, user.getPassword());
|
||||
// 存到 Caffeine（用 cache name "user-tokens"）
|
||||
String tokenKey = userDTO.getTokenKey(); // skyeye:user:token:id@account
|
||||
Objects.requireNonNull(cacheManager.getCache("user-tokens")).put(tokenKey, accessToken);
|
||||
String key = JSONUtil.toJsonStr(userDTO);
|
||||
String accessToken = JwtUtil.sign(key, user.getPassword());
|
||||
redisUtil.set(userDTO.getTokenKey(), accessToken, TOKEN_EXPIRE);
|
||||
userDTO.setToken(accessToken);
|
||||
return Result.successData("登录成功", userDTO);
|
||||
return Result.successData(MessageUtils.message("user.login.success"), userDTO);
|
||||
}
|
||||
|
||||
/**
|
||||
* 修改密码
|
||||
*
|
||||
* @param dto
|
||||
* @return
|
||||
*/
|
||||
@ -74,15 +73,15 @@ public class SysUserController {
|
||||
public Object updatePwd(@Valid SysUserPwdDTO dto) {
|
||||
List<SysUser> list = sysUserService.selectById(dto.getUserId());
|
||||
if (ObjectUtil.isEmpty(list)) {
|
||||
throw ServiceException.noLog("用户名或密码错误！");
|
||||
throw ServiceException.noLog(MessageUtils.message("user.updpwd.error"));
|
||||
}
|
||||
SysUser user = list.get(0);
|
||||
if (user.getPassword().equals(dto.getOldPwd())) {
|
||||
throw ServiceException.noLog("旧密码错误！");
|
||||
throw ServiceException.noLog(MessageUtils.message("user.updpwd.nochg"));
|
||||
}
|
||||
user.setPassword(dto.getNewPwd());
|
||||
sysUserService.update(user);
|
||||
return "修改成功";
|
||||
return MessageUtils.message("user.updpwd.success");
|
||||
}
|
||||
|
||||
/**
|
||||
@ -90,12 +89,13 @@ public class SysUserController {
|
||||
*/
|
||||
@IgnoreAuth
|
||||
@OperationLog(value = "退出登录", type = SysLog.TYPE_USER)
|
||||
@GetMapping("/logout")
|
||||
@RequestMapping("/logout")
|
||||
@GetMapping
|
||||
public Result logout() {
|
||||
UserDTO userDTO = SecurityUtil.getUser();
|
||||
if (userDTO != null) {
|
||||
String key = CacheKey.getToken(userDTO.getId(), userDTO.getAccount());
|
||||
Objects.requireNonNull(cacheManager.getCache("user-tokens")).evict(key);
|
||||
String key = CacheKey.getToekn(userDTO.getId(), userDTO.getAccount());
|
||||
redisUtil.del(key);
|
||||
}
|
||||
return Result.status(true);
|
||||
}
|
||||
|
||||
@ -1,5 +1,6 @@
|
||||
package com.zhangy.skyeye.sar.controller;
|
||||
|
||||
import com.zhangy.skyeye.common.extend.util.MessageUtils;
|
||||
import com.zhangy.skyeye.common.pojo.result.Result;
|
||||
import com.zhangy.skyeye.sar.service.ISarControlService;
|
||||
import com.zhangy.skyeye.sar.dto.SarControlParamDTO;
|
||||
@ -31,7 +32,7 @@ public class SarControlController {
|
||||
public Result send(@RequestBody SarControlParamDTO param) {
|
||||
param.checkOrSetData();
|
||||
controlInfoService.sendUdp(param);
|
||||
return Result.successData("发送成功");
|
||||
return Result.successData(MessageUtils.message("sar.control.send.success"));
|
||||
}
|
||||
|
||||
/**
|
||||
@ -50,16 +51,16 @@ public class SarControlController {
|
||||
// 检查是否成功获取
|
||||
if (ipVal == null || ipVal.isEmpty()) {
|
||||
// 根据你的业务逻辑返回错误，例如
|
||||
return Result.error("请求体中缺少 'payloadId' 或其值为空");
|
||||
return Result.error(MessageUtils.message("sar.control.turnon.enoip"));
|
||||
}
|
||||
} catch (Exception e) {
|
||||
// 处理JSON解析异常
|
||||
// 记录日志 e.g., log.error("Failed to parse turnOn payload", e);
|
||||
return Result.error("请求体JSON格式错误");
|
||||
return Result.error(MessageUtils.message("sar.control.turnon.eexcept"));
|
||||
}
|
||||
// 3. 调用服务层
|
||||
controlInfoService.turnOn(ipVal);
|
||||
return Result.successData("发送成功");
|
||||
return Result.successData(MessageUtils.message("sar.control.turnon.success"));
|
||||
}
|
||||
|
||||
/**
|
||||
@ -80,16 +81,16 @@ public class SarControlController {
|
||||
// 检查是否成功获取
|
||||
if (ipVal == null || ipVal.isEmpty()) {
|
||||
// 根据你的业务逻辑返回错误，例如
|
||||
return Result.error("请求体中缺少 'payloadId' 或其值为空");
|
||||
return Result.error(MessageUtils.message("sar.control.endall.enoip"));
|
||||
}
|
||||
|
||||
} catch (Exception e) {
|
||||
// 处理JSON解析异常
|
||||
// 记录日志 e.g., log.error("Failed to parse turnOn payload", e);
|
||||
return Result.error("请求体JSON格式错误");
|
||||
return Result.error(MessageUtils.message("sar.control.endall.eexcept"));
|
||||
}
|
||||
// 3. 调用服务层
|
||||
controlInfoService.endAll(ipVal);
|
||||
return Result.successData("发送成功");
|
||||
return Result.successData(MessageUtils.message("sar.control.endall.success"));
|
||||
}
|
||||
}
|
||||
|
||||
@ -0,0 +1,311 @@
|
||||
package com.zhangy.skyeye.sar.image.enhancer;
|
||||
|
||||
import org.opencv.core.*;
|
||||
import org.opencv.imgcodecs.Imgcodecs;
|
||||
import org.opencv.imgproc.Imgproc;
|
||||
import org.opencv.imgproc.CLAHE;
|
||||
import org.opencv.photo.Photo;
|
||||
import org.opencv.photo.TonemapReinhard;
|
||||
|
||||
import java.nio.ShortBuffer;
|
||||
import java.util.ArrayList;
|
||||
import java.util.Arrays;
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* ImageEnhancer.java
|
||||
* ==================
|
||||
* 两步组合图像亮度增强脚本（自适应参数 + 多格式兼容 Java 版）
|
||||
*
|
||||
* 支持的输入格式：
|
||||
* - JPG : 8 bit BGR，直接兼容
|
||||
* - PNG : 8/16 bit，RGB/RGBA，自动处理透明通道与位深
|
||||
* - TIF : 8/16/32 bit，灰度/彩色/含透明通道，自动处理所有组合
|
||||
*
|
||||
* 增强步骤：
|
||||
* 1. Reinhard 局部色调映射 —— 压缩动态范围，统一全局亮度
|
||||
* 2. CLAHE 局部对比度增强 —— 在 LAB 空间对 L 通道进行局部直方图均衡化
|
||||
*
|
||||
* 所有关键参数均根据输入图像的统计特征自动计算，无需手动调参。
|
||||
*
|
||||
* 依赖：
|
||||
* - OpenCV for Java (e.g., opencv-4.x.x.jar)
|
||||
*
|
||||
* 编译与运行：
|
||||
* 1. 确保 opencv-4.x.x.jar 在 classpath 中。
|
||||
* 2. 确保 OpenCV native library (e.g., opencv_java4xx.dll/so) 在 java.library.path 中。
|
||||
* javac -cp .:/path/to/opencv-4.x.x.jar ImageEnhancer.java
|
||||
* java -cp .:/path/to/opencv-4.x.x.jar -Djava.library.path=/path/to/native/libs ImageEnhancer <input_path> [output_dir]
|
||||
*/
|
||||
public class ImageEnhancer {
|
||||
|
||||
static {
|
||||
try {
|
||||
System.loadLibrary(Core.NATIVE_LIBRARY_NAME);
|
||||
} catch (UnsatisfiedLinkError e) {
|
||||
System.err.println("Native code library failed to load.\n" + e);
|
||||
System.exit(1);
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* 存放自适应计算出的参数
|
||||
*/
|
||||
public static class AdaptiveParams {
|
||||
double gamma, intensity, lightAdapt, colorAdapt = 0.0, clipLimit;
|
||||
Size tileGrid;
|
||||
|
||||
@Override
|
||||
public String toString() {
|
||||
return String.format(
|
||||
" gamma = %.3f%n" +
|
||||
" intensity = %.3f%n" +
|
||||
" light_adapt = %.3f%n" +
|
||||
" clip_limit = %.3f%n" +
|
||||
" tile_grid = %s",
|
||||
gamma, intensity, lightAdapt, clipLimit, tileGrid
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* 存放归一化结果和日志
|
||||
*/
|
||||
public static class NormalizedImage {
|
||||
Mat image;
|
||||
String log;
|
||||
}
|
||||
|
||||
/**
|
||||
* 对 uint16 图像做百分位截断线性拉伸后转为 uint8。
|
||||
*/
|
||||
private static Mat uint16ToUint8Stretch(Mat imgU16, double lowPct, double highPct) {
|
||||
// 将所有通道像素合并后统一计算 lo/hi，避免各通道独立拉伸导致色偏
|
||||
int totalPixels = (int) (imgU16.total() * imgU16.channels());
|
||||
short[] pixels = new short[totalPixels];
|
||||
imgU16.get(0, 0, pixels);
|
||||
|
||||
// 转换为 int 以避免排序时的符号问题
|
||||
int[] pixelsInt = new int[totalPixels];
|
||||
for (int i = 0; i < totalPixels; i++) {
|
||||
pixelsInt[i] = pixels[i] & 0xFFFF;
|
||||
}
|
||||
Arrays.sort(pixelsInt);
|
||||
|
||||
// 使用全局统一的 lo/hi（所有通道共用），保持色彩比例
|
||||
double lo = pixelsInt[(int) (totalPixels * lowPct / 100.0)];
|
||||
double hi = pixelsInt[(int) (totalPixels * highPct / 100.0)];
|
||||
|
||||
// 使用 convertTo(alpha, beta) 做线性变换：dst = src * alpha + beta
|
||||
// 等价于 (src - lo) * 255/(hi-lo) = src * (255/(hi-lo)) + (-lo * 255/(hi-lo))
|
||||
double alpha = 255.0 / (hi - lo + 1e-6);
|
||||
double beta = -lo * alpha;
|
||||
Mat result = new Mat();
|
||||
// convertTo 对所有通道均匀应用相同的 alpha/beta，不存在 Scalar 多通道问题
|
||||
imgU16.convertTo(result, CvType.CV_8U, alpha, beta);
|
||||
return result;
|
||||
}
|
||||
|
||||
/**
|
||||
* 将任意常见格式的图像统一转换为 BGR uint8。
|
||||
*/
|
||||
public static NormalizedImage normalizeToBgrUint8(Mat img) {
|
||||
NormalizedImage result = new NormalizedImage();
|
||||
StringBuilder log = new StringBuilder();
|
||||
log.append(String.format("原始格式：dtype=%s, shape=(%d, %d, %d)%n",
|
||||
CvType.typeToString(img.type()), img.rows(), img.cols(), img.channels()));
|
||||
|
||||
Mat currentImg = img.clone();
|
||||
List<String> steps = new ArrayList<>();
|
||||
|
||||
// 1. 位深归一化
|
||||
if (img.depth() == CvType.CV_16U) {
|
||||
currentImg = uint16ToUint8Stretch(img, 2.0, 98.0);
|
||||
steps.add("uint16 → uint8 (百分位拉伸 2%~98%)");
|
||||
} else if (img.depth() == CvType.CV_32F || img.depth() == CvType.CV_64F) {
|
||||
img.convertTo(currentImg, CvType.CV_8U, 255.0);
|
||||
steps.add(CvType.typeToString(img.type()) + " → uint8 (×255 缩放)");
|
||||
}
|
||||
|
||||
// 2. 通道数归一化
|
||||
if (currentImg.channels() == 1) {
|
||||
Imgproc.cvtColor(currentImg, currentImg, Imgproc.COLOR_GRAY2BGR);
|
||||
steps.add("灰度(1ch) → BGR(3ch)");
|
||||
} else if (currentImg.channels() == 4) {
|
||||
Imgproc.cvtColor(currentImg, currentImg, Imgproc.COLOR_BGRA2BGR);
|
||||
steps.add("BGRA(4ch) → BGR(3ch, 丢弃 Alpha)");
|
||||
}
|
||||
|
||||
log.append(" 转换步骤：").append(steps.isEmpty() ? "无需转换 (已是 BGR uint8)" : String.join(" | ", steps)).append("\n");
|
||||
log.append(String.format(" 归一化后：dtype=%s, shape=(%d, %d, %d)",
|
||||
CvType.typeToString(currentImg.type()), currentImg.rows(), currentImg.cols(), currentImg.channels()));
|
||||
|
||||
result.image = currentImg;
|
||||
result.log = log.toString();
|
||||
return result;
|
||||
}
|
||||
|
||||
/**
|
||||
* 根据输入图像的统计特征自适应计算增强参数。
|
||||
*/
|
||||
public static AdaptiveParams computeAdaptiveParams(Mat imgBgr) {
|
||||
Mat gray = new Mat();
|
||||
Imgproc.cvtColor(imgBgr, gray, Imgproc.COLOR_BGR2GRAY);
|
||||
Mat grayF = new Mat();
|
||||
gray.convertTo(grayF, CvType.CV_32F);
|
||||
|
||||
int H = gray.rows(), W = gray.cols(), totalPixels = H * W;
|
||||
AdaptiveParams params = new AdaptiveParams();
|
||||
|
||||
// ── Reinhard gamma 语义说明 ────────────────────────────────────────────
|
||||
// OpenCV Reinhard 中 gamma 越大 → 输出越亮（与传统 gamma 校正语义相反）
|
||||
// 由实验扫描拟合（la=0.8, intensity=0）：mean_out ≈ 79.2 × gamma
|
||||
// target_mean 根据图像均值自适应：图越暗 → 目标越高（最大提亮到 128）
|
||||
// 1. 图像均值 → gamma
|
||||
double meanVal = Core.mean(grayF).val[0];
|
||||
double meanNorm = meanVal / 255.0;
|
||||
double targetMean = Math.min(128.0, 128.0 * Math.pow(1.0 - meanNorm, 0.3));
|
||||
params.gamma = Math.max(0.8, Math.min(3.0, targetMean / 79.2));
|
||||
|
||||
// 2. intensity 固定为 0：亮度控制完全由 gamma 承担
|
||||
// 避免 intensity 与 gamma 叠加导致方向混乱
|
||||
params.intensity = 0.0;
|
||||
|
||||
// 3. 全局标准差 → light_adapt
|
||||
// std 越小（对比度越低）→ 越需要局部自适应 → light_adapt 越大
|
||||
// 上限 0.9（1.0 会产生 NaN），下限 0.5
|
||||
MatOfDouble mean = new MatOfDouble(), stddev = new MatOfDouble();
|
||||
Core.meanStdDev(grayF, mean, stddev);
|
||||
double stdGlobal = stddev.get(0, 0)[0] / 255.0;
|
||||
params.lightAdapt = Math.max(0.5, Math.min(0.9, 0.9 - stdGlobal));
|
||||
|
||||
// 4. 局部标准差均值 → clipLimit
|
||||
int tile = 8;
|
||||
List<Double> localStds = new ArrayList<>();
|
||||
for (int y = 0; y < H - tile; y += tile) {
|
||||
for (int x = 0; x < W - tile; x += tile) {
|
||||
Mat patch = new Mat(grayF, new Rect(x, y, tile, tile));
|
||||
Core.meanStdDev(patch, mean, stddev);
|
||||
localStds.add(stddev.get(0, 0)[0]);
|
||||
}
|
||||
}
|
||||
double meanLocalStd = localStds.stream().mapToDouble(d -> d).average().orElse(20.0);
|
||||
double clipLimit = 2.0 * (30.0 / (meanLocalStd + 1e-6));
|
||||
params.clipLimit = Math.max(1.0, Math.min(6.0, clipLimit));
|
||||
|
||||
// 5. 图像短边分辨率 → tileGridSize
|
||||
int tileSize = Math.max(8, Math.min(H, W) / 16);
|
||||
params.tileGrid = new Size(tileSize, tileSize);
|
||||
|
||||
gray.release(); grayF.release(); mean.release(); stddev.release();
|
||||
return params;
|
||||
}
|
||||
|
||||
/**
|
||||
* 第一步：Reinhard 局部色调映射。
|
||||
*/
|
||||
public static Mat step1Reinhard(Mat imgBgr, AdaptiveParams params) {
|
||||
Mat imgF32 = new Mat();
|
||||
imgBgr.convertTo(imgF32, CvType.CV_32FC3, 1.0 / 255.0);
|
||||
|
||||
TonemapReinhard tonemap = Photo.createTonemapReinhard(
|
||||
(float) params.gamma, (float) params.intensity, (float) params.lightAdapt, (float) params.colorAdapt);
|
||||
Mat mapped = new Mat();
|
||||
tonemap.process(imgF32, mapped);
|
||||
|
||||
// 将 NaN/Inf 替换为 0，再裁剪到合法范围
|
||||
Core.patchNaNs(mapped, 0.0);
|
||||
|
||||
Mat result = new Mat();
|
||||
mapped.convertTo(result, CvType.CV_8UC3, 255.0);
|
||||
|
||||
imgF32.release(); mapped.release();
|
||||
return result;
|
||||
}
|
||||
|
||||
/**
|
||||
* 第二步：CLAHE 局部对比度增强。
|
||||
*/
|
||||
public static Mat step2Clahe(Mat imgBgr, AdaptiveParams params) {
|
||||
Mat lab = new Mat();
|
||||
Imgproc.cvtColor(imgBgr, lab, Imgproc.COLOR_BGR2Lab);
|
||||
|
||||
List<Mat> labPlanes = new ArrayList<>(3);
|
||||
Core.split(lab, labPlanes);
|
||||
|
||||
CLAHE clahe = Imgproc.createCLAHE(params.clipLimit, params.tileGrid);
|
||||
Mat lEnhanced = new Mat();
|
||||
clahe.apply(labPlanes.get(0), lEnhanced);
|
||||
|
||||
labPlanes.set(0, lEnhanced);
|
||||
Mat resultLab = new Mat();
|
||||
Core.merge(labPlanes, resultLab);
|
||||
|
||||
Mat result = new Mat();
|
||||
Imgproc.cvtColor(resultLab, result, Imgproc.COLOR_Lab2BGR);
|
||||
|
||||
lab.release(); lEnhanced.release(); resultLab.release();
|
||||
for(Mat p : labPlanes) p.release();
|
||||
return result;
|
||||
}
|
||||
|
||||
/**
|
||||
* 主流程：对输入图像执行两步增强并保存结果。
|
||||
*/
|
||||
public static void enhance(String inputPath, String outputDir) {
|
||||
Mat imgRaw = Imgcodecs.imread(inputPath, Imgcodecs.IMREAD_UNCHANGED);
|
||||
if (imgRaw.empty()) {
|
||||
System.err.println("无法读取图像: " + inputPath);
|
||||
return;
|
||||
}
|
||||
|
||||
String baseName = inputPath.substring(
|
||||
inputPath.lastIndexOf("/") >= 0 ? inputPath.lastIndexOf("/") + 1 : 0,
|
||||
inputPath.lastIndexOf(".")
|
||||
);
|
||||
|
||||
// 1. 格式归一化
|
||||
System.out.println("── 格式归一化 ──────────────────────────────");
|
||||
NormalizedImage normResult = normalizeToBgrUint8(imgRaw);
|
||||
Mat imgBgr = normResult.image;
|
||||
System.out.println(normResult.log);
|
||||
|
||||
// 2. 计算自适应参数
|
||||
System.out.println("── 自适应参数 ──────────────────────────────");
|
||||
AdaptiveParams params = computeAdaptiveParams(imgBgr);
|
||||
System.out.println(params);
|
||||
System.out.println("────────────────────────────────────────────");
|
||||
|
||||
// 3. 第一步：Reinhard 色调映射
|
||||
Mat resultStep1 = step1Reinhard(imgBgr, params);
|
||||
String pathStep1 = outputDir + "/" + baseName + "_step1_tonemap.png";
|
||||
Imgcodecs.imwrite(pathStep1, resultStep1);
|
||||
System.out.println("第一步结果已保存: " + pathStep1);
|
||||
|
||||
// 4. 第二步：CLAHE 局部增强
|
||||
Mat resultStep2 = step2Clahe(resultStep1, params);
|
||||
String pathStep2 = outputDir + "/" + baseName + "_step2_clahe.png";
|
||||
Imgcodecs.imwrite(pathStep2, resultStep2);
|
||||
System.out.println("第二步结果已保存: " + pathStep2);
|
||||
|
||||
imgRaw.release(); imgBgr.release(); resultStep1.release(); resultStep2.release();
|
||||
}
|
||||
|
||||
public static void main(String[] args) {
|
||||
if (args.length < 1) {
|
||||
System.out.println("用法: java ImageEnhancer <input_path> [output_dir]");
|
||||
String inputPath = "/home/ubuntu/upload/pasted_file_a5uhAu_8986130c06b1e8661387e859b5d2ac93.png";
|
||||
String outputDir = "/home/ubuntu";
|
||||
System.out.println("\n使用默认路径进行处理:");
|
||||
enhance(inputPath, outputDir);
|
||||
return;
|
||||
}
|
||||
|
||||
String inputPath = args[0];
|
||||
String outputDir = (args.length > 1) ? args[1] : new java.io.File(inputPath).getParent();
|
||||
if (outputDir == null) outputDir = ".";
|
||||
new java.io.File(outputDir).mkdirs();
|
||||
|
||||
enhance(inputPath, outputDir);
|
||||
}
|
||||
}
|
||||
@ -14,6 +14,9 @@ spring:
|
||||
allow-circular-references: true
|
||||
application:
|
||||
name: @artifactId@
|
||||
messages:
|
||||
basename: i18n/messages
|
||||
fallback-to-system-locale: false
|
||||
profiles:
|
||||
# active: dev
|
||||
config:
|
||||
|
||||
@ -0,0 +1,47 @@
|
||||
# Default messages
|
||||
# device management
|
||||
device.uav.remove.success=Remove success
|
||||
device.uav.remove.fail=Remove failed
|
||||
device.uav.offline=UAV [{0}] disconnected
|
||||
device.sar.offline=SAR [{0}] disconnected
|
||||
|
||||
# SAR图片管理
|
||||
sar.image.remove.success=Remove success
|
||||
sar.image.remove.fail=Remove failed
|
||||
sar.image.add_highres.success=Operation success
|
||||
sar.image.add_highres.eagain=Other uploading in progress, try later！
|
||||
sar.image.add_highres.fail=Operation failed
|
||||
sar.image.update.success=Update success
|
||||
sar.image.update.fail=Update failed
|
||||
|
||||
# SAR Job管理
|
||||
sar.job.update.success=Operation success
|
||||
sar.job.update.failed=Operation failed
|
||||
sar.job.retry.enullid=Job ID can't be blank
|
||||
sar.job.start.success=Start executing
|
||||
sar.job.start.enosuchjob=Find no job, id={0}
|
||||
sar.job.start.einexecuting=Job in executing, operation failed
|
||||
sar.job.exit.success=Operation success
|
||||
sar.job.exit.failed=Operation failed
|
||||
sar.job_exec.brightness.success=Operation success
|
||||
sar.job_exec.brightness.failed=Operation failed
|
||||
|
||||
# SAR控制
|
||||
sar.control.send.success=Send success
|
||||
sar.control.send.failed=Send failed
|
||||
sar.control.turnon.success=Send success
|
||||
sar.control.turnon.enoip=Failed to extract payload IP address
|
||||
sar.control.turnon.eexcept=Failed to parse request body
|
||||
sar.control.turnon.euavinexec=Configured UAV in middle of executing
|
||||
sar.control.turnon.esarinexec=Configured SAR in middle of executing
|
||||
sar.control.endall.success=Send success
|
||||
sar.control.endall.enoip=Failed to extract payload IP address
|
||||
sar.control.endall.eexcept=Failed to parse request body
|
||||
|
||||
# 用户管理
|
||||
user.login.success=Login success
|
||||
user.login.error=Login error
|
||||
user.updpwd.success=Change password success
|
||||
user.updpwd.error=User name or password error!
|
||||
user.updpwd.nochg=Old password error!
|
||||
|
||||
@ -0,0 +1,45 @@
|
||||
# 中文消息
|
||||
# 设备管理
|
||||
device.uav.remove.success=操作成功
|
||||
device.uav.remove.fail=操作失败
|
||||
device.uav.offline=无人机[{0}]未连接
|
||||
device.sar.offline=雷达[{0}]未连接
|
||||
|
||||
# SAR图片管理
|
||||
sar.image.remove.success=操作完成
|
||||
sar.image.remove.fail=操作失败
|
||||
sar.image.add_highres.success=操作完成
|
||||
sar.image.add_highres.eagain=正在上传其它图像，请稍后重试！
|
||||
sar.image.add_highres.fail=操作失败
|
||||
sar.image.update.success=操作成功
|
||||
sar.image.update.fail=操作失败
|
||||
|
||||
# SAR Job管理
|
||||
sar.job.update.success=操作成功
|
||||
sar.job.update.failed=操作失败
|
||||
sar.job.retry.enullid=任务ID不能为空
|
||||
sar.job.start.success=开始执行
|
||||
sar.job.start.enosuchjob=找不到任务，id={0}
|
||||
sar.job.start.einexecuting=任务状态为执行中，无法起飞
|
||||
sar.job.exit.success=操作成功
|
||||
sar.job.exit.failed=操作失败
|
||||
|
||||
# SAR控制
|
||||
sar.control.send.success=发送成功
|
||||
sar.control.send.failed=发送失败
|
||||
sar.control.turnon.success=发送成功
|
||||
sar.control.turnon.enoip=请求体中缺少 'payloadId' 或其值为空
|
||||
sar.control.turnon.eexcept=请求体JSON格式错误
|
||||
sar.control.turnon.euavinexec=无人机正在任务中，无法执行新任务
|
||||
sar.control.turnon.esarinexec=载荷正在任务中，无法执行新任务
|
||||
sar.control.endall.success=发送成功
|
||||
sar.control.endall.enoip=请求体中缺少 'payloadId' 或其值为空
|
||||
sar.control.endall.eexcept=请求体JSON格式错误
|
||||
|
||||
|
||||
# 用户管理
|
||||
user.login.success=登录成功
|
||||
user.login.error=用户名或密码错误！
|
||||
user.updpwd.success=修改成功
|
||||
user.updpwd.error=用户名或密码错误！
|
||||
user.updpwd.nochg=旧密码错误！
|
||||
@ -32,6 +32,7 @@
|
||||
"sockjs-client": "^1.5.1",
|
||||
"stompjs": "^2.3.3",
|
||||
"vue": "^2.6.11",
|
||||
"vue-i18n": "^8.28.2",
|
||||
"vue-router": "^3.1.5",
|
||||
"vuex": "^3.1.2",
|
||||
"vuex-persistedstate": "^4.1.0"
|
||||
|
||||
29
frontend/Skyeye-sys-ui/src/lang/en.js
Normal file
29
frontend/Skyeye-sys-ui/src/lang/en.js
Normal file
@ -0,0 +1,29 @@
|
||||
// English translations
|
||||
export default {
|
||||
app: {
|
||||
title: 'Skyeye Twin System',
|
||||
},
|
||||
header: {
|
||||
login: 'Login',
|
||||
logout: 'Logout',
|
||||
},
|
||||
login: {
|
||||
username: 'Please enter username',
|
||||
password: 'Please enter password',
|
||||
title: 'Login',
|
||||
submit: 'Log In',
|
||||
validation: {
|
||||
required: 'Cannot be empty',
|
||||
passwordMin: 'Password must be at least 6 characters',
|
||||
},
|
||||
},
|
||||
common: {
|
||||
capsLockOn: 'Caps lock is On',
|
||||
},
|
||||
menu: {
|
||||
device: 'Device Management',
|
||||
task: 'Task Management',
|
||||
picture: 'Picture Management',
|
||||
user: 'User Management'
|
||||
}
|
||||
}
|
||||
21
frontend/Skyeye-sys-ui/src/lang/index.js
Normal file
21
frontend/Skyeye-sys-ui/src/lang/index.js
Normal file
@ -0,0 +1,21 @@
|
||||
import Vue from 'vue'
|
||||
import VueI18n from 'vue-i18n'
|
||||
import zh from './zh';
|
||||
import en from './en';
|
||||
Vue.use(VueI18n)
|
||||
|
||||
// load locale messages
|
||||
const messages = {
|
||||
zh,
|
||||
en,
|
||||
}
|
||||
|
||||
const locale = localStorage.getItem('locale') || 'zh'
|
||||
|
||||
const i18n = new VueI18n({
|
||||
locale,
|
||||
fallbackLocale: 'zh',
|
||||
messages,
|
||||
})
|
||||
|
||||
export default i18n
|
||||
29
frontend/Skyeye-sys-ui/src/lang/zh.js
Normal file
29
frontend/Skyeye-sys-ui/src/lang/zh.js
Normal file
@ -0,0 +1,29 @@
|
||||
// Chinese translations
|
||||
export default {
|
||||
app: {
|
||||
title: '空域快视系统',
|
||||
},
|
||||
header: {
|
||||
login: '登录',
|
||||
logout: '退出登录',
|
||||
},
|
||||
login: {
|
||||
username: '请输入用户名',
|
||||
password: '请输入用户密码',
|
||||
title: '登录',
|
||||
submit: '登 录',
|
||||
validation: {
|
||||
required: '不能为空',
|
||||
passwordMin: '密码不少于6位字符',
|
||||
},
|
||||
},
|
||||
common: {
|
||||
capsLockOn: '大写锁定已打开',
|
||||
},
|
||||
menu: {
|
||||
device: '设备管理',
|
||||
task: '任务管理',
|
||||
picture: '图片管理',
|
||||
user: '用户管理'
|
||||
}
|
||||
}
|
||||
@ -18,7 +18,7 @@ export default {
|
||||
}
|
||||
const validatePassword = (rule, value, callback) => {
|
||||
if (value.length < 6) {
|
||||
callback(new Error('密码不少于6位字符'))
|
||||
callback(new Error(this.$t('login.validation.passwordMin')))
|
||||
} else {
|
||||
callback()
|
||||
}
|
||||
@ -51,7 +51,7 @@ export default {
|
||||
loginRules: {
|
||||
username: [
|
||||
// { required: true, trigger: 'blur', validator: validateUsername }
|
||||
{ required: true, message: '请输入用户名', trigger: 'blur' }
|
||||
{ required: true, message: this.$t('login.username'), trigger: 'blur' }
|
||||
],
|
||||
password: [
|
||||
{ required: true, trigger: 'blur', validator: validatePassword }
|
||||
@ -67,22 +67,22 @@ export default {
|
||||
activeIndex: '1',
|
||||
menus: [
|
||||
{
|
||||
label: "设备管理",
|
||||
key: 'device',
|
||||
value: '2',
|
||||
show: true
|
||||
},
|
||||
{
|
||||
label: "任务管理",
|
||||
key: 'task',
|
||||
value: '3',
|
||||
show: true
|
||||
},
|
||||
{
|
||||
label: "图片管理",
|
||||
key: 'picture',
|
||||
value: '4',
|
||||
show: true
|
||||
},
|
||||
{
|
||||
label: "用户管理",
|
||||
key: 'user',
|
||||
value: '5',
|
||||
show: true
|
||||
},
|
||||
@ -175,6 +175,10 @@ export default {
|
||||
handleSelect(key) {
|
||||
this.SET_MENUS_CHOSE(key)
|
||||
},
|
||||
changeLocale(lang) {
|
||||
this.$i18n.locale = lang
|
||||
localStorage.setItem('locale', lang)
|
||||
},
|
||||
goHome() {
|
||||
this.SET_MENUS_CHOSE('1')
|
||||
},
|
||||
|
||||
@ -25,7 +25,7 @@ $light_gray: #eee;
|
||||
align-items: center;
|
||||
|
||||
.logo {
|
||||
width: 250px;
|
||||
width: 350px;
|
||||
height: 32px;
|
||||
display: flex;
|
||||
justify-content: flex-start;
|
||||
@ -129,7 +129,7 @@ $light_gray: #eee;
|
||||
}
|
||||
|
||||
.header-nav-r {
|
||||
width: 250px;
|
||||
width: 350px;
|
||||
display: flex;
|
||||
align-items: center;
|
||||
justify-content: flex-end;
|
||||
|
||||
@ -4,7 +4,7 @@
|
||||
<div class="logo" @click="goHome">
|
||||
<img src="@/assets/img/common/logo3.png" alt />
|
||||
<!--span :class="tokenKey">灵动孪生智控系统</span-->
|
||||
<span :class="tokenKey">空域快视系统</span>
|
||||
<span :class="tokenKey">{{ $t('app.title') }}</span>
|
||||
</div>
|
||||
</div>
|
||||
<div class="header-nav-c">
|
||||
@ -19,14 +19,17 @@
|
||||
v-if="item.show"
|
||||
:index="item.value"
|
||||
:key="item.value"
|
||||
>{{ item.label }}</el-menu-item
|
||||
>{{ $t('menu.' + item.key) }}</el-menu-item
|
||||
>
|
||||
</template>
|
||||
</el-menu>
|
||||
</div>
|
||||
<ul class="header-nav-r">
|
||||
<!-- <li class="lang-select">
|
||||
<a @click.prevent="changeLocale('zh')">中文</a> | <a @click.prevent="changeLocale('en')">EN</a>
|
||||
</li> -->
|
||||
<li v-if="roleIdsLocale.indexOf(2) !== -1">
|
||||
<span class="user-login" @click="showLogin">登录</span>
|
||||
<span class="user-login" @click="showLogin">{{ $t('header.login') }}</span>
|
||||
</li>
|
||||
<li v-if="roleIdsLocale.indexOf(2) === -1">
|
||||
<span class="user-photo">
|
||||
@ -42,14 +45,14 @@
|
||||
<!-- <el-dropdown-item command="modifyPassword"
|
||||
>修改密码</el-dropdown-item
|
||||
> -->
|
||||
<el-dropdown-item command="logout">退出登录</el-dropdown-item>
|
||||
<el-dropdown-item command="logout">{{ $t('header.logout') }}</el-dropdown-item>
|
||||
</el-dropdown-menu>
|
||||
</el-dropdown>
|
||||
</li>
|
||||
</ul>
|
||||
|
||||
<dt-dialog
|
||||
title="登录"
|
||||
:title="$t('header.login')"
|
||||
:visible.sync="visible.login"
|
||||
top="20vh"
|
||||
width="22%"
|
||||
@ -70,7 +73,7 @@
|
||||
class="username"
|
||||
clearable
|
||||
v-model="loginForm.username"
|
||||
placeholder="请输入用户名"
|
||||
:placeholder="$t('login.username')"
|
||||
name="username"
|
||||
type="text"
|
||||
size="mini"
|
||||
@ -82,7 +85,7 @@
|
||||
|
||||
<el-tooltip
|
||||
v-model="capsTooltip"
|
||||
content="Caps lock is On"
|
||||
:content="$t('common.capsLockOn')"
|
||||
placement="right"
|
||||
manual
|
||||
>
|
||||
@ -93,7 +96,7 @@
|
||||
class="password"
|
||||
v-model="loginForm.password"
|
||||
:type="passwordType"
|
||||
placeholder="请输入用户密码"
|
||||
:placeholder="$t('login.password')"
|
||||
name="password"
|
||||
tabindex="2"
|
||||
size="mini"
|
||||
@ -122,8 +125,7 @@
|
||||
size="mini"
|
||||
style="width: 100%"
|
||||
@click.native.prevent="handleLogin"
|
||||
>登 录</el-button
|
||||
>
|
||||
>{{ $t('login.submit') }}</el-button>
|
||||
</el-form-item>
|
||||
</el-form>
|
||||
</dt-dialog>
|
||||
|
||||
@ -4,6 +4,7 @@
|
||||
*/
|
||||
import Vue from 'vue'
|
||||
import appLoader from './App.Loader';
|
||||
import i18n from '@/lang/index';
|
||||
(async () => {
|
||||
await appLoader.install()
|
||||
Promise.all([
|
||||
@ -17,6 +18,7 @@ import appLoader from './App.Loader';
|
||||
el: '#app',
|
||||
router,
|
||||
store,
|
||||
i18n,
|
||||
render: h => h(App)
|
||||
})
|
||||
})
|
||||
|
||||
@ -12,7 +12,7 @@
|
||||
label-position="left"
|
||||
>
|
||||
<div class="title-container">
|
||||
<h3 class="title">登录</h3>
|
||||
<h3 class="title">{{ $t('login.title') }}</h3>
|
||||
</div>
|
||||
|
||||
<el-form-item prop="username">
|
||||
@ -25,7 +25,7 @@
|
||||
ref="username"
|
||||
class="username"
|
||||
v-model="loginForm.username"
|
||||
placeholder="请输入用户名"
|
||||
:placeholder="$t('login.username')"
|
||||
name="username"
|
||||
type="text"
|
||||
tabindex="1"
|
||||
@ -36,7 +36,7 @@
|
||||
|
||||
<el-tooltip
|
||||
v-model="capsTooltip"
|
||||
content="Caps lock is On"
|
||||
:content="$t('common.capsLockOn')"
|
||||
placement="right"
|
||||
manual
|
||||
>
|
||||
@ -52,7 +52,7 @@
|
||||
class="password"
|
||||
v-model="loginForm.password"
|
||||
:type="passwordType"
|
||||
placeholder="请输入用户密码"
|
||||
:placeholder="$t('login.password')"
|
||||
name="password"
|
||||
tabindex="2"
|
||||
autocomplete="on"
|
||||
@ -77,7 +77,7 @@
|
||||
type="primary"
|
||||
round
|
||||
@click.native.prevent="handleLogin"
|
||||
>登 录</el-button
|
||||
>{{ $t('login.submit') }}</el-button
|
||||
>
|
||||
</el-form>
|
||||
</div>
|
||||
@ -101,7 +101,7 @@ export default {
|
||||
}
|
||||
const validatePassword = (rule, value, callback) => {
|
||||
if (value.length < 6) {
|
||||
callback(new Error('密码不少于6位字符'))
|
||||
callback(new Error(this.$t('login.validation.passwordMin')))
|
||||
} else {
|
||||
callback()
|
||||
}
|
||||
@ -117,7 +117,7 @@ export default {
|
||||
],
|
||||
password: [
|
||||
// { required: true, trigger: 'blur', validator: validatePassword }
|
||||
{ required: true, trigger: 'blur', message: '请输入密码' },
|
||||
{ required: true, trigger: 'blur', message: this.$t('login.validation.required') },
|
||||
],
|
||||
},
|
||||
passwordType: 'password',
|
||||
|
||||
@ -201,15 +201,15 @@
|
||||
"@babel/traverse" "^7.24.7"
|
||||
"@babel/types" "^7.24.7"
|
||||
|
||||
"@babel/helper-string-parser@^7.24.8":
|
||||
"integrity" "sha512-pO9KhhRcuUyGnJWwyEgnRJTSIZHiT+vMD0kPeD+so0l7mxkMT19g3pjY9GTnHySck/hDzq+dtW/4VgnMkippsQ=="
|
||||
"resolved" "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.24.8.tgz"
|
||||
"version" "7.24.8"
|
||||
"@babel/helper-string-parser@^7.27.1":
|
||||
"integrity" "sha512-qMlSxKbpRlAridDExk92nSobyDdpPijUq2DW6oDnUqd0iOGxmQjyqhMIihI9+zv4LPyZdRje2cavWPbCbWm3eA=="
|
||||
"resolved" "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.27.1.tgz"
|
||||
"version" "7.27.1"
|
||||
|
||||
"@babel/helper-validator-identifier@^7.24.7":
|
||||
"integrity" "sha512-rR+PBcQ1SMQDDyF6X0wxtG8QyLCgUB0eRAGguqRLfkCA87l7yAP7ehq8SNj96OOGTO8OBV70KhuFYcIkHXOg0w=="
|
||||
"resolved" "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.24.7.tgz"
|
||||
"version" "7.24.7"
|
||||
"@babel/helper-validator-identifier@^7.24.7", "@babel/helper-validator-identifier@^7.28.5":
|
||||
"integrity" "sha512-qSs4ifwzKJSV39ucNjsvc6WVHs6b7S03sOh2OcHF9UHfVPqWWALUsNUVzhSBiItjRZoLHx7nIarVjqKVusUZ1Q=="
|
||||
"resolved" "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.28.5.tgz"
|
||||
"version" "7.28.5"
|
||||
|
||||
"@babel/helper-validator-option@^7.24.8":
|
||||
"integrity" "sha512-xb8t9tD1MHLungh/AIoWYN+gVHaB9kwlu8gffXGSt3FFEIT7RjS+xWbc2vUD1UTZdIpKj/ab3rdqJ7ufngyi2Q=="
|
||||
@ -243,12 +243,12 @@
|
||||
"js-tokens" "^4.0.0"
|
||||
"picocolors" "^1.0.0"
|
||||
|
||||
"@babel/parser@^7.23.5", "@babel/parser@^7.23.9", "@babel/parser@^7.24.7", "@babel/parser@^7.25.0", "@babel/parser@^7.25.6", "@babel/parser@^7.7.0":
|
||||
"integrity" "sha512-trGdfBdbD0l1ZPmcJ83eNxB9rbEax4ALFTF7fN386TMYbeCQbyme5cOEXQhbGXKebwGaB/J52w1mrklMcbgy6Q=="
|
||||
"resolved" "https://registry.npmjs.org/@babel/parser/-/parser-7.25.6.tgz"
|
||||
"version" "7.25.6"
|
||||
"@babel/parser@^7.23.5", "@babel/parser@^7.23.9", "@babel/parser@^7.25.0", "@babel/parser@^7.25.6", "@babel/parser@^7.28.5", "@babel/parser@^7.7.0":
|
||||
"integrity" "sha512-IyDgFV5GeDUVX4YdF/3CPULtVGSXXMLh1xVIgdCgxApktqnQV0r7/8Nqthg+8YLGaAtdyIlo2qIdZrbCv4+7ww=="
|
||||
"resolved" "https://registry.npmjs.org/@babel/parser/-/parser-7.29.0.tgz"
|
||||
"version" "7.29.0"
|
||||
dependencies:
|
||||
"@babel/types" "^7.25.6"
|
||||
"@babel/types" "^7.29.0"
|
||||
|
||||
"@babel/plugin-bugfix-firefox-class-in-computed-class-key@^7.25.3":
|
||||
"integrity" "sha512-wUrcsxZg6rqBXG05HG1FPYgsP6EvwF4WpBbxIpWIIYnH8wG0gzx3yZY3dtEHas4sTAOGkbTsc9EGPxwff8lRoA=="
|
||||
@ -989,14 +989,13 @@
|
||||
"debug" "^4.3.1"
|
||||
"globals" "^11.1.0"
|
||||
|
||||
"@babel/types@^7.22.15", "@babel/types@^7.23.9", "@babel/types@^7.24.7", "@babel/types@^7.24.8", "@babel/types@^7.25.0", "@babel/types@^7.25.2", "@babel/types@^7.25.6", "@babel/types@^7.4.4", "@babel/types@^7.7.0":
|
||||
"integrity" "sha512-/l42B1qxpG6RdfYf343Uw1vmDjeNhneUXtzhojE7pDgfpEypmRhI6j1kr17XCVv4Cgl9HdAiQY2x0GwKm7rWCw=="
|
||||
"resolved" "https://registry.npmjs.org/@babel/types/-/types-7.25.6.tgz"
|
||||
"version" "7.25.6"
|
||||
"@babel/types@^7.22.15", "@babel/types@^7.23.9", "@babel/types@^7.24.7", "@babel/types@^7.24.8", "@babel/types@^7.25.0", "@babel/types@^7.25.2", "@babel/types@^7.25.6", "@babel/types@^7.29.0", "@babel/types@^7.4.4", "@babel/types@^7.7.0":
|
||||
"integrity" "sha512-LwdZHpScM4Qz8Xw2iKSzS+cfglZzJGvofQICy7W7v4caru4EaAmyUuO6BGrbyQ2mYV11W0U8j5mBhd14dd3B0A=="
|
||||
"resolved" "https://registry.npmjs.org/@babel/types/-/types-7.29.0.tgz"
|
||||
"version" "7.29.0"
|
||||
dependencies:
|
||||
"@babel/helper-string-parser" "^7.24.8"
|
||||
"@babel/helper-validator-identifier" "^7.24.7"
|
||||
"to-fast-properties" "^2.0.0"
|
||||
"@babel/helper-string-parser" "^7.27.1"
|
||||
"@babel/helper-validator-identifier" "^7.28.5"
|
||||
|
||||
"@gar/promisify@^1.0.1":
|
||||
"integrity" "sha512-k2Ty1JcVojjJFwrg/ThKi2ujJ7XNLYaFGNB/bWT9wGR+oSMJHMa5w+CUq6p/pVrKeNNgA7pCqEcjSnHVoqJQFw=="
|
||||
@ -1063,10 +1062,10 @@
|
||||
"resolved" "https://registry.npmjs.org/@jridgewell/set-array/-/set-array-1.2.1.tgz"
|
||||
"version" "1.2.1"
|
||||
|
||||
"@jridgewell/sourcemap-codec@^1.4.10", "@jridgewell/sourcemap-codec@^1.4.14", "@jridgewell/sourcemap-codec@^1.5.0":
|
||||
"integrity" "sha512-gv3ZRaISU3fjPAgNsriBRqGWQL6quFx04YMPW/zD8XMLsU32mhCCbfbO6KZFLjvYpCZ8zyDEgqsgf+PwPaM7GQ=="
|
||||
"resolved" "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.5.0.tgz"
|
||||
"version" "1.5.0"
|
||||
"@jridgewell/sourcemap-codec@^1.4.10", "@jridgewell/sourcemap-codec@^1.4.14", "@jridgewell/sourcemap-codec@^1.5.5":
|
||||
"integrity" "sha512-cYQ9310grqxueWbl+WuIUIaiUaDcj7WOq5fVhEljNVgRfOUhY9fy2zTvfoqWsnebh8Sl70VScFbICvJnLKB0Og=="
|
||||
"resolved" "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.5.5.tgz"
|
||||
"version" "1.5.5"
|
||||
|
||||
"@jridgewell/trace-mapping@^0.3.24", "@jridgewell/trace-mapping@^0.3.25":
|
||||
"integrity" "sha512-vNk6aEwybGtawWmy/PzwnGDOjCkLWSD2wqvjGGAgOAwCGWySYXfYoxt00IJkTF+8Lb57DwOb3Aa0o9CApepiYQ=="
|
||||
@ -2879,39 +2878,39 @@
|
||||
"semver" "^6.1.0"
|
||||
"strip-ansi" "^6.0.0"
|
||||
|
||||
"@vue/compiler-core@3.4.38":
|
||||
"integrity" "sha512-8IQOTCWnLFqfHzOGm9+P8OPSEDukgg3Huc92qSG49if/xI2SAwLHQO2qaPQbjCWPBcQoO1WYfXfTACUrWV3c5A=="
|
||||
"resolved" "https://registry.npmjs.org/@vue/compiler-core/-/compiler-core-3.4.38.tgz"
|
||||
"version" "3.4.38"
|
||||
"@vue/compiler-core@3.5.27":
|
||||
"integrity" "sha512-gnSBQjZA+//qDZen+6a2EdHqJ68Z7uybrMf3SPjEGgG4dicklwDVmMC1AeIHxtLVPT7sn6sH1KOO+tS6gwOUeQ=="
|
||||
"resolved" "https://registry.npmjs.org/@vue/compiler-core/-/compiler-core-3.5.27.tgz"
|
||||
"version" "3.5.27"
|
||||
dependencies:
|
||||
"@babel/parser" "^7.24.7"
|
||||
"@vue/shared" "3.4.38"
|
||||
"entities" "^4.5.0"
|
||||
"@babel/parser" "^7.28.5"
|
||||
"@vue/shared" "3.5.27"
|
||||
"entities" "^7.0.0"
|
||||
"estree-walker" "^2.0.2"
|
||||
"source-map-js" "^1.2.0"
|
||||
"source-map-js" "^1.2.1"
|
||||
|
||||
"@vue/compiler-dom@3.4.38":
|
||||
"integrity" "sha512-Osc/c7ABsHXTsETLgykcOwIxFktHfGSUDkb05V61rocEfsFDcjDLH/IHJSNJP+/Sv9KeN2Lx1V6McZzlSb9EhQ=="
|
||||
"resolved" "https://registry.npmjs.org/@vue/compiler-dom/-/compiler-dom-3.4.38.tgz"
|
||||
"version" "3.4.38"
|
||||
"@vue/compiler-dom@3.5.27":
|
||||
"integrity" "sha512-oAFea8dZgCtVVVTEC7fv3T5CbZW9BxpFzGGxC79xakTr6ooeEqmRuvQydIiDAkglZEAd09LgVf1RoDnL54fu5w=="
|
||||
"resolved" "https://registry.npmjs.org/@vue/compiler-dom/-/compiler-dom-3.5.27.tgz"
|
||||
"version" "3.5.27"
|
||||
dependencies:
|
||||
"@vue/compiler-core" "3.4.38"
|
||||
"@vue/shared" "3.4.38"
|
||||
"@vue/compiler-core" "3.5.27"
|
||||
"@vue/shared" "3.5.27"
|
||||
|
||||
"@vue/compiler-sfc@^3.4.15":
|
||||
"integrity" "sha512-s5QfZ+9PzPh3T5H4hsQDJtI8x7zdJaew/dCGgqZ2630XdzaZ3AD8xGZfBqpT8oaD/p2eedd+pL8tD5vvt5ZYJQ=="
|
||||
"resolved" "https://registry.npmjs.org/@vue/compiler-sfc/-/compiler-sfc-3.4.38.tgz"
|
||||
"version" "3.4.38"
|
||||
"integrity" "sha512-sHZu9QyDPeDmN/MRoshhggVOWE5WlGFStKFwu8G52swATgSny27hJRWteKDSUUzUH+wp+bmeNbhJnEAel/auUQ=="
|
||||
"resolved" "https://registry.npmjs.org/@vue/compiler-sfc/-/compiler-sfc-3.5.27.tgz"
|
||||
"version" "3.5.27"
|
||||
dependencies:
|
||||
"@babel/parser" "^7.24.7"
|
||||
"@vue/compiler-core" "3.4.38"
|
||||
"@vue/compiler-dom" "3.4.38"
|
||||
"@vue/compiler-ssr" "3.4.38"
|
||||
"@vue/shared" "3.4.38"
|
||||
"@babel/parser" "^7.28.5"
|
||||
"@vue/compiler-core" "3.5.27"
|
||||
"@vue/compiler-dom" "3.5.27"
|
||||
"@vue/compiler-ssr" "3.5.27"
|
||||
"@vue/shared" "3.5.27"
|
||||
"estree-walker" "^2.0.2"
|
||||
"magic-string" "^0.30.10"
|
||||
"postcss" "^8.4.40"
|
||||
"source-map-js" "^1.2.0"
|
||||
"magic-string" "^0.30.21"
|
||||
"postcss" "^8.5.6"
|
||||
"source-map-js" "^1.2.1"
|
||||
|
||||
"@vue/compiler-sfc@2.7.16":
|
||||
"integrity" "sha512-KWhJ9k5nXuNtygPU7+t1rX6baZeqOYLEforUPjgNDBnLicfHCoi48H87Q8XyLZOrNNsmhuwKqtpDQWjEFe6Ekg=="
|
||||
@ -2924,13 +2923,13 @@
|
||||
optionalDependencies:
|
||||
"prettier" "^1.18.2 || ^2.0.0"
|
||||
|
||||
"@vue/compiler-ssr@3.4.38":
|
||||
"integrity" "sha512-YXznKFQ8dxYpAz9zLuVvfcXhc31FSPFDcqr0kyujbOwNhlmaNvL2QfIy+RZeJgSn5Fk54CWoEUeW+NVBAogGaw=="
|
||||
"resolved" "https://registry.npmjs.org/@vue/compiler-ssr/-/compiler-ssr-3.4.38.tgz"
|
||||
"version" "3.4.38"
|
||||
"@vue/compiler-ssr@3.5.27":
|
||||
"integrity" "sha512-Sj7h+JHt512fV1cTxKlYhg7qxBvack+BGncSpH+8vnN+KN95iPIcqB5rsbblX40XorP+ilO7VIKlkuu3Xq2vjw=="
|
||||
"resolved" "https://registry.npmjs.org/@vue/compiler-ssr/-/compiler-ssr-3.5.27.tgz"
|
||||
"version" "3.5.27"
|
||||
dependencies:
|
||||
"@vue/compiler-dom" "3.4.38"
|
||||
"@vue/shared" "3.4.38"
|
||||
"@vue/compiler-dom" "3.5.27"
|
||||
"@vue/shared" "3.5.27"
|
||||
|
||||
"@vue/component-compiler-utils@^3.1.0", "@vue/component-compiler-utils@^3.1.2":
|
||||
"integrity" "sha512-97sfH2mYNU+2PzGrmK2haqffDpVASuib9/w2/noxiFi31Z54hW+q3izKQXXQZSNhtiUpAI36uSuYepeBe4wpHQ=="
|
||||
@ -2960,10 +2959,10 @@
|
||||
"resolved" "https://registry.npmjs.org/@vue/preload-webpack-plugin/-/preload-webpack-plugin-1.1.2.tgz"
|
||||
"version" "1.1.2"
|
||||
|
||||
"@vue/shared@3.4.38":
|
||||
"integrity" "sha512-q0xCiLkuWWQLzVrecPb0RMsNWyxICOjPrcrwxTUEHb1fsnvni4dcuyG7RT/Ie7VPTvnjzIaWzRMUBsrqNj/hhw=="
|
||||
"resolved" "https://registry.npmjs.org/@vue/shared/-/shared-3.4.38.tgz"
|
||||
"version" "3.4.38"
|
||||
"@vue/shared@3.5.27":
|
||||
"integrity" "sha512-dXr/3CgqXsJkZ0n9F3I4elY8wM9jMJpP3pvRG52r6m0tu/MsAFIe6JpXVGeNMd/D9F4hQynWT8Rfuj0bdm9kFQ=="
|
||||
"resolved" "https://registry.npmjs.org/@vue/shared/-/shared-3.5.27.tgz"
|
||||
"version" "3.5.27"
|
||||
|
||||
"@vue/web-component-wrapper@^1.2.0":
|
||||
"integrity" "sha512-Iu8Tbg3f+emIIMmI2ycSI8QcEuAUgPTgHwesDU1eKMLE4YC/c/sFbGc70QgMq31ijRftV0R7vCm9co6rldCeOA=="
|
||||
@ -3553,6 +3552,11 @@
|
||||
dependencies:
|
||||
"@babel/helper-define-polyfill-provider" "^0.6.2"
|
||||
|
||||
"babel-plugin-transform-remove-console@^6.9.4":
|
||||
"integrity" "sha512-88blrUrMX3SPiGkT1GnvVY8E/7A+k6oj3MNvUtTIxJflFzXTw1bHkuJ/y039ouhFMp2prRn5cQGzokViYi1dsg=="
|
||||
"resolved" "https://registry.npmjs.org/babel-plugin-transform-remove-console/-/babel-plugin-transform-remove-console-6.9.4.tgz"
|
||||
"version" "6.9.4"
|
||||
|
||||
"babel-runtime@6.x":
|
||||
"integrity" "sha1-llxwWGaOgrVde/4E/yM3vItWR/4=sha512-ITKNuq2wKlW1fJg9sSW52eepoYgZBggvOAHC0u/CYu/qxQ9EVzThCgR69BnSXLHjy2f7SY5zaQ4yt7H9ZVxY2g==sha512-ITKNuq2wKlW1fJg9sSW52eepoYgZBggvOAHC0u/CYu/qxQ9EVzThCgR69BnSXLHjy2f7SY5zaQ4yt7H9ZVxY2g==sha512-ITKNuq2wKlW1fJg9sSW52eepoYgZBggvOAHC0u/CYu/qxQ9EVzThCgR69BnSXLHjy2f7SY5zaQ4yt7H9ZVxY2g=="
|
||||
"resolved" "https://registry.npmjs.org/babel-runtime/-/babel-runtime-6.26.0.tgz"
|
||||
@ -3973,16 +3977,23 @@
|
||||
"neo-async" "^2.6.1"
|
||||
"schema-utils" "^2.0.0"
|
||||
|
||||
"call-bind@^1.0.2", "call-bind@^1.0.5", "call-bind@^1.0.6", "call-bind@^1.0.7":
|
||||
"integrity" "sha512-GHTSNSYICQ7scH7sZ+M2rFopRoLh8t2bLSW6BbgrtLsahOIB5iyAVJf9GjWK3cYTDaMj4XdBpM1cA6pIS0Kv2w=="
|
||||
"resolved" "https://registry.npmjs.org/call-bind/-/call-bind-1.0.7.tgz"
|
||||
"version" "1.0.7"
|
||||
"call-bind-apply-helpers@^1.0.0", "call-bind-apply-helpers@^1.0.1", "call-bind-apply-helpers@^1.0.2":
|
||||
"integrity" "sha512-Sp1ablJ0ivDkSzjcaJdxEunN5/XvksFJ2sMBFfq6x0ryhQV/2b/KwFe21cMpmHtPOSij8K99/wSfoEuTObmuMQ=="
|
||||
"resolved" "https://registry.npmjs.org/call-bind-apply-helpers/-/call-bind-apply-helpers-1.0.2.tgz"
|
||||
"version" "1.0.2"
|
||||
dependencies:
|
||||
"es-define-property" "^1.0.0"
|
||||
"es-errors" "^1.3.0"
|
||||
"function-bind" "^1.1.2"
|
||||
|
||||
"call-bind@^1.0.2", "call-bind@^1.0.5", "call-bind@^1.0.6", "call-bind@^1.0.7":
|
||||
"integrity" "sha512-oKlSFMcMwpUg2ednkhQ454wfWiU/ul3CkJe/PEHcTKuiX6RpbehUiFMXu13HalGZxfUwCQzZG747YXBn1im9ww=="
|
||||
"resolved" "https://registry.npmjs.org/call-bind/-/call-bind-1.0.8.tgz"
|
||||
"version" "1.0.8"
|
||||
dependencies:
|
||||
"call-bind-apply-helpers" "^1.0.0"
|
||||
"es-define-property" "^1.0.0"
|
||||
"get-intrinsic" "^1.2.4"
|
||||
"set-function-length" "^1.2.1"
|
||||
"set-function-length" "^1.2.2"
|
||||
|
||||
"call-me-maybe@^1.0.1":
|
||||
"integrity" "sha1-JtII6onje1y95gJQoV8DHBak1ms=sha512-wCyFsDQkKPwwF8BDwOiWNx/9K45L/hvggQiDbve+viMNMQnWhrlYIuBk09offfwCRtCO9P6XwUttufzU11WCVw==sha512-wCyFsDQkKPwwF8BDwOiWNx/9K45L/hvggQiDbve+viMNMQnWhrlYIuBk09offfwCRtCO9P6XwUttufzU11WCVw==sha512-wCyFsDQkKPwwF8BDwOiWNx/9K45L/hvggQiDbve+viMNMQnWhrlYIuBk09offfwCRtCO9P6XwUttufzU11WCVw=="
|
||||
@ -4799,9 +4810,9 @@
|
||||
"css-tree" "^1.1.2"
|
||||
|
||||
"csstype@^3.1.0":
|
||||
"integrity" "sha512-M1uQkMl8rQK/szD0LNhtqxIPLpimGm8sOBwU7lLnCpSbTyY3yeU1Vc7l4KT5zT4s/yOxHH5O7tIuuLOCnLADRw=="
|
||||
"resolved" "https://registry.npmjs.org/csstype/-/csstype-3.1.3.tgz"
|
||||
"version" "3.1.3"
|
||||
"integrity" "sha512-z1HGKcYy2xA8AGQfwrn0PAy+PB7X/GSj3UVJW9qKyn43xWa+gl5nXmU4qqLMRzWVLFC8KusUX8T/0kCiOYpAIQ=="
|
||||
"resolved" "https://registry.npmjs.org/csstype/-/csstype-3.2.3.tgz"
|
||||
"version" "3.2.3"
|
||||
|
||||
"cyclist@^1.0.1":
|
||||
"integrity" "sha1-WW6WmP0MgOEgOMK4LW6xs1tiJNk=sha512-NJGVKPS81XejHcLhaLJS7plab0fK3slPh11mESeeDq2W4ZI5kUKK/LRRdVDvjJseojbPB7ZwjnyOybg3Igea/A==sha512-NJGVKPS81XejHcLhaLJS7plab0fK3slPh11mESeeDq2W4ZI5kUKK/LRRdVDvjJseojbPB7ZwjnyOybg3Igea/A==sha512-NJGVKPS81XejHcLhaLJS7plab0fK3slPh11mESeeDq2W4ZI5kUKK/LRRdVDvjJseojbPB7ZwjnyOybg3Igea/A=="
|
||||
@ -5202,6 +5213,15 @@
|
||||
"resolved" "https://registry.npmjs.org/dotenv/-/dotenv-8.6.0.tgz"
|
||||
"version" "8.6.0"
|
||||
|
||||
"dunder-proto@^1.0.1":
|
||||
"integrity" "sha512-KIN/nDJBQRcXw0MLVhZE9iQHmG68qAVIBg9CqmUYjmQIhgij9U5MFvrqkUL5FbtyyzZuOeOt0zdeRe4UY7ct+A=="
|
||||
"resolved" "https://registry.npmjs.org/dunder-proto/-/dunder-proto-1.0.1.tgz"
|
||||
"version" "1.0.1"
|
||||
dependencies:
|
||||
"call-bind-apply-helpers" "^1.0.1"
|
||||
"es-errors" "^1.3.0"
|
||||
"gopd" "^1.2.0"
|
||||
|
||||
"duplexer@^0.1.1":
|
||||
"integrity" "sha512-jtD6YG370ZCIi/9GTaJKQxWTZD045+4R4hTk/x1UyoqadyJ9x9CgSi1RlVDQF8U2sxLLSnFkCaMihqljHIWgMg=="
|
||||
"resolved" "https://registry.npmjs.org/duplexer/-/duplexer-0.1.2.tgz"
|
||||
@ -5326,10 +5346,10 @@
|
||||
"resolved" "https://registry.npmjs.org/entities/-/entities-2.2.0.tgz"
|
||||
"version" "2.2.0"
|
||||
|
||||
"entities@^4.5.0":
|
||||
"integrity" "sha512-V0hjH4dGPh9Ao5p0MoRY6BVqtwCjhz6vI5LT8AJ55H+4g9/4vbHx1I54fS0XuclLhDHArPQCiMjDxjaL8fPxhw=="
|
||||
"resolved" "https://registry.npmjs.org/entities/-/entities-4.5.0.tgz"
|
||||
"version" "4.5.0"
|
||||
"entities@^7.0.0":
|
||||
"integrity" "sha512-TWrgLOFUQTH994YUyl1yT4uyavY5nNB5muff+RtWaqNVCAK408b5ZnnbNAUEWLTCpum9w6arT70i1XdQ4UeOPA=="
|
||||
"resolved" "https://registry.npmjs.org/entities/-/entities-7.0.1.tgz"
|
||||
"version" "7.0.1"
|
||||
|
||||
"errno@^0.1.3", "errno@~0.1.7":
|
||||
"integrity" "sha512-dJ6oBr5SQ1VSd9qkk7ByRgb/1SH4JZjCHSW/mr63/QcXO9zLVxvJ6Oy13nio03rxpSnVDDjFor75SjVeZWPW/A=="
|
||||
@ -5409,22 +5429,20 @@
|
||||
"resolved" "https://registry.npmjs.org/es-array-method-boxes-properly/-/es-array-method-boxes-properly-1.0.0.tgz"
|
||||
"version" "1.0.0"
|
||||
|
||||
"es-define-property@^1.0.0":
|
||||
"integrity" "sha512-jxayLKShrEqqzJ0eumQbVhTYQM27CfT1T35+gCgDFoL82JLsXqTJ76zv6A0YLOgEnLUMvLzsDsGIrl8NFpT2gQ=="
|
||||
"resolved" "https://registry.npmjs.org/es-define-property/-/es-define-property-1.0.0.tgz"
|
||||
"version" "1.0.0"
|
||||
dependencies:
|
||||
"get-intrinsic" "^1.2.4"
|
||||
"es-define-property@^1.0.0", "es-define-property@^1.0.1":
|
||||
"integrity" "sha512-e3nRfgfUZ4rNGL232gUgX06QNyyez04KdjFrF+LTRoOXmrOgFKDg4BCdsjW8EnT69eqdYGmRpJwiPVYNrCaW3g=="
|
||||
"resolved" "https://registry.npmjs.org/es-define-property/-/es-define-property-1.0.1.tgz"
|
||||
"version" "1.0.1"
|
||||
|
||||
"es-errors@^1.2.1", "es-errors@^1.3.0":
|
||||
"integrity" "sha512-Zf5H2Kxt2xjTvbJvP2ZWLEICxA6j+hAmMzIlypy4xcBg1vKVnx89Wy0GbS+kf5cwCVFFzdCFh2XSCFNULS6csw=="
|
||||
"resolved" "https://registry.npmjs.org/es-errors/-/es-errors-1.3.0.tgz"
|
||||
"version" "1.3.0"
|
||||
|
||||
"es-object-atoms@^1.0.0":
|
||||
"integrity" "sha512-MZ4iQ6JwHOBQjahnjwaC1ZtIBH+2ohjamzAO3oaHcXYup7qxjF2fixyH+Q71voWHeOkI2q/TnJao/KfXYIZWbw=="
|
||||
"resolved" "https://registry.npmjs.org/es-object-atoms/-/es-object-atoms-1.0.0.tgz"
|
||||
"version" "1.0.0"
|
||||
"es-object-atoms@^1.0.0", "es-object-atoms@^1.1.1":
|
||||
"integrity" "sha512-FGgH2h8zKNim9ljj7dankFPcICIK9Cp5bm+c2gQSYePhpaG5+esrLODihIorn+Pe6FGJzWhXQotPv73jTaldXA=="
|
||||
"resolved" "https://registry.npmjs.org/es-object-atoms/-/es-object-atoms-1.1.1.tgz"
|
||||
"version" "1.1.1"
|
||||
dependencies:
|
||||
"es-errors" "^1.3.0"
|
||||
|
||||
@ -6176,16 +6194,29 @@
|
||||
"resolved" "https://registry.npmjs.org/get-caller-file/-/get-caller-file-2.0.5.tgz"
|
||||
"version" "2.0.5"
|
||||
|
||||
"get-intrinsic@^1.1.3", "get-intrinsic@^1.2.1", "get-intrinsic@^1.2.3", "get-intrinsic@^1.2.4":
|
||||
"integrity" "sha512-5uYhsJH8VJBTv7oslg4BznJYhDoRI6waYCxMmCdnTrcCrHA/fCFKoTFz2JKKE0HdDFUF7/oQuhzumXJK7paBRQ=="
|
||||
"resolved" "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.2.4.tgz"
|
||||
"version" "1.2.4"
|
||||
"get-intrinsic@^1.2.1", "get-intrinsic@^1.2.3", "get-intrinsic@^1.2.4":
|
||||
"integrity" "sha512-9fSjSaos/fRIVIp+xSJlE6lfwhES7LNtKaCBIamHsjr2na1BiABJPo0mOjjz8GJDURarmCPGqaiVg5mfjb98CQ=="
|
||||
"resolved" "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.3.0.tgz"
|
||||
"version" "1.3.0"
|
||||
dependencies:
|
||||
"call-bind-apply-helpers" "^1.0.2"
|
||||
"es-define-property" "^1.0.1"
|
||||
"es-errors" "^1.3.0"
|
||||
"es-object-atoms" "^1.1.1"
|
||||
"function-bind" "^1.1.2"
|
||||
"has-proto" "^1.0.1"
|
||||
"has-symbols" "^1.0.3"
|
||||
"hasown" "^2.0.0"
|
||||
"get-proto" "^1.0.1"
|
||||
"gopd" "^1.2.0"
|
||||
"has-symbols" "^1.1.0"
|
||||
"hasown" "^2.0.2"
|
||||
"math-intrinsics" "^1.1.0"
|
||||
|
||||
"get-proto@^1.0.1":
|
||||
"integrity" "sha512-sTSfBjoXBp89JvIKIefqw7U2CCebsc74kiY6awiGogKtoSGbgjYE/G/+l9sF3MWFPNc9IcoOC4ODfKHfxFmp0g=="
|
||||
"resolved" "https://registry.npmjs.org/get-proto/-/get-proto-1.0.1.tgz"
|
||||
"version" "1.0.1"
|
||||
dependencies:
|
||||
"dunder-proto" "^1.0.1"
|
||||
"es-object-atoms" "^1.0.0"
|
||||
|
||||
"get-stdin@^6.0.0":
|
||||
"integrity" "sha512-jp4tHawyV7+fkkSKyvjuLZswblUtz+SQKzSWnBbii16BuZksJlU1wuBYXY75r+duh/llF1ur6oNwi+2ZzjKZ7g=="
|
||||
@ -6314,12 +6345,10 @@
|
||||
"pify" "^4.0.1"
|
||||
"slash" "^2.0.0"
|
||||
|
||||
"gopd@^1.0.1":
|
||||
"integrity" "sha512-d65bNlIadxvpb/A2abVdlqKqV563juRnZ1Wtk6s1sIR8uNsXR70xqIzVqxVf1eTqDunwT2MkczEeaezCKTZhwA=="
|
||||
"resolved" "https://registry.npmjs.org/gopd/-/gopd-1.0.1.tgz"
|
||||
"version" "1.0.1"
|
||||
dependencies:
|
||||
"get-intrinsic" "^1.1.3"
|
||||
"gopd@^1.0.1", "gopd@^1.2.0":
|
||||
"integrity" "sha512-ZUKRh6/kUFoAiTAtTYPZJ3hw9wNxx+BIBOijnlG9PnrJsCcSjs1wyyD6vJpaYtgnzDrKYRSqf3OO6Rfa93xsRg=="
|
||||
"resolved" "https://registry.npmjs.org/gopd/-/gopd-1.2.0.tgz"
|
||||
"version" "1.2.0"
|
||||
|
||||
"graceful-fs@^4.1.11", "graceful-fs@^4.1.15", "graceful-fs@^4.1.2", "graceful-fs@^4.1.6", "graceful-fs@^4.2.2":
|
||||
"integrity" "sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ=="
|
||||
@ -6386,15 +6415,15 @@
|
||||
dependencies:
|
||||
"es-define-property" "^1.0.0"
|
||||
|
||||
"has-proto@^1.0.1", "has-proto@^1.0.3":
|
||||
"has-proto@^1.0.3":
|
||||
"integrity" "sha512-SJ1amZAJUiZS+PhsVLf5tGydlaVB8EdFpaSO4gmiUKUOxk8qzn5AIy4ZeJUmh22znIdk/uMAUT2pl3FxzVUH+Q=="
|
||||
"resolved" "https://registry.npmjs.org/has-proto/-/has-proto-1.0.3.tgz"
|
||||
"version" "1.0.3"
|
||||
|
||||
"has-symbols@^1.0.2", "has-symbols@^1.0.3":
|
||||
"integrity" "sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A=="
|
||||
"resolved" "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.3.tgz"
|
||||
"version" "1.0.3"
|
||||
"has-symbols@^1.0.2", "has-symbols@^1.0.3", "has-symbols@^1.1.0":
|
||||
"integrity" "sha512-1cDNdwJ2Jaohmb3sg4OmKaMBwuC48sYni5HUw2DvsC8LjGTLK9h+eb1X6RyuOHe4hT0ULCW68iomhjUoKUqlPQ=="
|
||||
"resolved" "https://registry.npmjs.org/has-symbols/-/has-symbols-1.1.0.tgz"
|
||||
"version" "1.1.0"
|
||||
|
||||
"has-tostringtag@^1.0.0", "has-tostringtag@^1.0.2":
|
||||
"integrity" "sha512-NqADB8VjPFLM2V0VvHUewwwsw0ZWBaIdgo+ieHtK3hasLz4qeCRjYcqfB6AQrBggRKppKF8L52/VqdVsO47Dlw=="
|
||||
@ -7576,9 +7605,9 @@
|
||||
"version" "4.5.0"
|
||||
|
||||
"lodash@^4.17.11", "lodash@^4.17.12", "lodash@^4.17.14", "lodash@^4.17.15", "lodash@^4.17.19", "lodash@^4.17.20", "lodash@^4.17.21", "lodash@^4.17.3":
|
||||
"integrity" "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg=="
|
||||
"resolved" "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz"
|
||||
"version" "4.17.21"
|
||||
"integrity" "sha512-LgVTMpQtIopCi79SJeDiP0TfWi5CNEc/L/aRdTh3yIvmZXTnheWpKjSZhnvMl8iXbC1tFg9gdHHDMLoV7CnG+w=="
|
||||
"resolved" "https://registry.npmjs.org/lodash/-/lodash-4.17.23.tgz"
|
||||
"version" "4.17.23"
|
||||
|
||||
"log-symbols@^2.2.0":
|
||||
"integrity" "sha512-VeIAFslyIerEJLXHziedo2basKbMKtTw3vfn5IzG0XTjhAVEJyNHnL2p7vc+wBDSdQuUpNw3M2u6xb9QsAY5Eg=="
|
||||
@ -7627,12 +7656,12 @@
|
||||
dependencies:
|
||||
"yallist" "^4.0.0"
|
||||
|
||||
"magic-string@^0.30.10":
|
||||
"integrity" "sha512-+Wri9p0QHMy+545hKww7YAu5NyzF8iomPL/RQazugQ9+Ez4Ic3mERMd8ZTX5rfK944j+560ZJi8iAwgak1Ac7A=="
|
||||
"resolved" "https://registry.npmjs.org/magic-string/-/magic-string-0.30.11.tgz"
|
||||
"version" "0.30.11"
|
||||
"magic-string@^0.30.21":
|
||||
"integrity" "sha512-vd2F4YUyEXKGcLHoq+TEyCjxueSeHnFxyyjNp80yg0XV4vUhnDer/lvvlqM/arB5bXQN5K2/3oinyCRyx8T2CQ=="
|
||||
"resolved" "https://registry.npmjs.org/magic-string/-/magic-string-0.30.21.tgz"
|
||||
"version" "0.30.21"
|
||||
dependencies:
|
||||
"@jridgewell/sourcemap-codec" "^1.5.0"
|
||||
"@jridgewell/sourcemap-codec" "^1.5.5"
|
||||
|
||||
"make-dir@^2.0.0":
|
||||
"integrity" "sha512-LS9X+dc8KLxXCb8dni79fLIIUA5VyZoyjSMCwTluaXA0o27cCK0bhXkpgw+sTXVpPy/lSO57ilRixqk0vDmtRA=="
|
||||
@ -7661,6 +7690,11 @@
|
||||
dependencies:
|
||||
"object-visit" "^1.0.0"
|
||||
|
||||
"math-intrinsics@^1.1.0":
|
||||
"integrity" "sha512-/IXtbwEk5HTPyEwyKX6hGkYXxM9nbj64B+ilVJnC/R6B0pH5G4V3b0pVbL7DBj4tkhBAppbQUlf6F6Xl9LHu1g=="
|
||||
"resolved" "https://registry.npmjs.org/math-intrinsics/-/math-intrinsics-1.1.0.tgz"
|
||||
"version" "1.1.0"
|
||||
|
||||
"md5.js@^1.3.4":
|
||||
"integrity" "sha512-xitP+WxNPcTTOgnTJcrhM0xvdPepipPSf3I8EIpGKeFLjt3PlJLIDG3u8EX53ZIubkb+5U2+3rELYpEhHhzdkg=="
|
||||
"resolved" "https://registry.npmjs.org/md5.js/-/md5.js-1.3.5.tgz"
|
||||
@ -8001,10 +8035,10 @@
|
||||
"resolved" "https://registry.npmjs.org/nan/-/nan-2.24.0.tgz"
|
||||
"version" "2.24.0"
|
||||
|
||||
"nanoid@^3.3.7":
|
||||
"integrity" "sha512-eSRppjcPIatRIMC1U6UngP8XFcz8MQWGQdt1MTBQ7NaAmvXDfvNxbvWV3x2y6CdEUciCSsDHDQZbhYaB8QEo2g=="
|
||||
"resolved" "https://registry.npmjs.org/nanoid/-/nanoid-3.3.7.tgz"
|
||||
"version" "3.3.7"
|
||||
"nanoid@^3.3.11", "nanoid@^3.3.7":
|
||||
"integrity" "sha512-N8SpfPUnUp1bK+PMYW8qSWdl9U+wwNWI4QKxOYDy9JAro3WMX7p2OeVRF9v+347pnakNevPmiHhNmZ2HbFA76w=="
|
||||
"resolved" "https://registry.npmjs.org/nanoid/-/nanoid-3.3.11.tgz"
|
||||
"version" "3.3.11"
|
||||
|
||||
"nanomatch@^1.2.1", "nanomatch@^1.2.9":
|
||||
"integrity" "sha512-fpoe2T0RbHwBTBUOftAfBPaDEi06ufaUai0mE6Yn1kacc3SnTErfb/h+X94VXzI64rKFHYImXSvdwGGCmwOqCA=="
|
||||
@ -8599,10 +8633,10 @@
|
||||
"resolved" "https://registry.npmjs.org/picocolors/-/picocolors-0.2.1.tgz"
|
||||
"version" "0.2.1"
|
||||
|
||||
"picocolors@^1.0.0", "picocolors@^1.0.1":
|
||||
"integrity" "sha512-anP1Z8qwhkbmu7MFP5iTt+wQKXgwzf7zTyGlcdzabySa9vd0Xt392U0rVmz9poOaBj0uHJKyyo9/upk0HrEQew=="
|
||||
"resolved" "https://registry.npmjs.org/picocolors/-/picocolors-1.0.1.tgz"
|
||||
"version" "1.0.1"
|
||||
"picocolors@^1.0.0", "picocolors@^1.0.1", "picocolors@^1.1.1":
|
||||
"integrity" "sha512-xceH2snhtb5M9liqDsmEw56le376mTZkEX/jEb/RxNFyegNul7eNslCXP9FDj/Lcu0X8KEyMceP2ntpaHrDEVA=="
|
||||
"resolved" "https://registry.npmjs.org/picocolors/-/picocolors-1.1.1.tgz"
|
||||
"version" "1.1.1"
|
||||
|
||||
"picomatch@^2.0.4", "picomatch@^2.2.1":
|
||||
"integrity" "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA=="
|
||||
@ -9066,14 +9100,14 @@
|
||||
"picocolors" "^1.0.1"
|
||||
"source-map-js" "^1.2.0"
|
||||
|
||||
"postcss@^8.4.40":
|
||||
"integrity" "sha512-gJAQVYbh5R3gYm33FijzCZj7CHyQ3hWMgJMprLUlIYqCwTeZhBQ19wp0e9mA25BUbEvY5+EXuuaAjqQsrBxQBQ=="
|
||||
"resolved" "https://registry.npmjs.org/postcss/-/postcss-8.4.43.tgz"
|
||||
"version" "8.4.43"
|
||||
"postcss@^8.5.6":
|
||||
"integrity" "sha512-3Ybi1tAuwAP9s0r1UQ2J4n5Y0G05bJkpUIO0/bI9MhwmD70S5aTWbXGBwxHrelT+XM1k6dM0pk+SwNkpTRN7Pg=="
|
||||
"resolved" "https://registry.npmjs.org/postcss/-/postcss-8.5.6.tgz"
|
||||
"version" "8.5.6"
|
||||
dependencies:
|
||||
"nanoid" "^3.3.7"
|
||||
"picocolors" "^1.0.1"
|
||||
"source-map-js" "^1.2.0"
|
||||
"nanoid" "^3.3.11"
|
||||
"picocolors" "^1.1.1"
|
||||
"source-map-js" "^1.2.1"
|
||||
|
||||
"posthtml-parser@^0.2.0", "posthtml-parser@^0.2.1":
|
||||
"integrity" "sha1-NdUw3jhnQMK6JP8usvrznM3ycd0=sha512-nPC53YMqJnc/+1x4fRYFfm81KV2V+G9NZY+hTohpYg64Ay7NemWWcV4UWuy/SgMupqQ3kJ88M/iRfZmSnxT+pw==sha512-nPC53YMqJnc/+1x4fRYFfm81KV2V+G9NZY+hTohpYg64Ay7NemWWcV4UWuy/SgMupqQ3kJ88M/iRfZmSnxT+pw==sha512-nPC53YMqJnc/+1x4fRYFfm81KV2V+G9NZY+hTohpYg64Ay7NemWWcV4UWuy/SgMupqQ3kJ88M/iRfZmSnxT+pw=="
|
||||
@ -9911,7 +9945,7 @@
|
||||
"resolved" "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz"
|
||||
"version" "2.0.0"
|
||||
|
||||
"set-function-length@^1.2.1":
|
||||
"set-function-length@^1.2.2":
|
||||
"integrity" "sha512-pgRc4hJ4/sNjWCSS9AmnS40x3bNMDTknHgL5UaMBTMyJnU90EgWh1Rz+MC9eFu4BuN/UwZjKQuY/1v3rM7HMfg=="
|
||||
"resolved" "https://registry.npmjs.org/set-function-length/-/set-function-length-1.2.2.tgz"
|
||||
"version" "1.2.2"
|
||||
@ -10108,10 +10142,10 @@
|
||||
"resolved" "https://registry.npmjs.org/source-list-map/-/source-list-map-2.0.1.tgz"
|
||||
"version" "2.0.1"
|
||||
|
||||
"source-map-js@^1.2.0":
|
||||
"integrity" "sha512-itJW8lvSA0TXEphiRoawsCksnlf8SyvmFzIhltqAHluXd88pkCd+cXJVHTDwdCr0IzwptSm035IHQktUu1QUMg=="
|
||||
"resolved" "https://registry.npmjs.org/source-map-js/-/source-map-js-1.2.0.tgz"
|
||||
"version" "1.2.0"
|
||||
"source-map-js@^1.2.0", "source-map-js@^1.2.1":
|
||||
"integrity" "sha512-UXWMKhLOwVKb728IUtQPXxfYU+usdybtUrK/8uGE8CQMvrhOpwvzDBwj0QhSL7MQc7vIsISBG8VQ8+IDQxpfQA=="
|
||||
"resolved" "https://registry.npmjs.org/source-map-js/-/source-map-js-1.2.1.tgz"
|
||||
"version" "1.2.1"
|
||||
|
||||
"source-map-resolve@^0.5.0":
|
||||
"integrity" "sha512-Htz+RnsXWk5+P2slx5Jh3Q66vhQj1Cllm0zvnaY98+NFx+Dv2CF/f5O/t8x+KaNdrdIAsruNzoh/KpialbqAnw=="
|
||||
@ -10725,11 +10759,6 @@
|
||||
"resolved" "https://registry.npmjs.org/to-arraybuffer/-/to-arraybuffer-1.0.1.tgz"
|
||||
"version" "1.0.1"
|
||||
|
||||
"to-fast-properties@^2.0.0":
|
||||
"integrity" "sha1-3F5pjL0HkmW8c+A3doGk5Og/YW4=sha512-/OaKK0xYrs3DmxRYqL/yDc+FxFUVYhDlXMhRmv3z915w2HF1tnN1omB354j8VUGO/hbRzyD6Y3sA7v7GS/ceog==sha512-/OaKK0xYrs3DmxRYqL/yDc+FxFUVYhDlXMhRmv3z915w2HF1tnN1omB354j8VUGO/hbRzyD6Y3sA7v7GS/ceog== sha512-/OaKK0xYrs3DmxRYqL/yDc+FxFUVYhDlXMhRmv3z915w2HF1tnN1omB354j8VUGO/hbRzyD6Y3sA7v7GS/ceog=="
|
||||
"resolved" "https://registry.npmjs.org/to-fast-properties/-/to-fast-properties-2.0.0.tgz"
|
||||
"version" "2.0.0"
|
||||
|
||||
"to-object-path@^0.3.0":
|
||||
"integrity" "sha1-KXWIt7Dn4KwI4E5nL4XB9JmeF68=sha512-9mWHdnGRuh3onocaHzukyvCZhzvr6tiflAy/JRFXcJX0TjgfWA9pk9t8CMbzmBE4Jfw58pXbkngtBtqYxzNEyg==sha512-9mWHdnGRuh3onocaHzukyvCZhzvr6tiflAy/JRFXcJX0TjgfWA9pk9t8CMbzmBE4Jfw58pXbkngtBtqYxzNEyg==sha512-9mWHdnGRuh3onocaHzukyvCZhzvr6tiflAy/JRFXcJX0TjgfWA9pk9t8CMbzmBE4Jfw58pXbkngtBtqYxzNEyg=="
|
||||
"resolved" "https://registry.npmjs.org/to-object-path/-/to-object-path-0.3.0.tgz"
|
||||
@ -11209,6 +11238,11 @@
|
||||
"resolved" "https://registry.npmjs.org/vue-hot-reload-api/-/vue-hot-reload-api-2.3.4.tgz"
|
||||
"version" "2.3.4"
|
||||
|
||||
"vue-i18n@^8.28.2":
|
||||
"integrity" "sha512-C5GZjs1tYlAqjwymaaCPDjCyGo10ajUphiwA922jKt9n7KPpqR7oM1PCwYzhB/E7+nT3wfdG3oRre5raIT1rKA=="
|
||||
"resolved" "https://registry.npmjs.org/vue-i18n/-/vue-i18n-8.28.2.tgz"
|
||||
"version" "8.28.2"
|
||||
|
||||
"vue-loader@^15.9.2":
|
||||
"integrity" "sha512-0iw4VchYLePqJfJu9s62ACWUXeSqM30SQqlIftbYWM3C+jpPcEHKSPUZBLjSF9au4HTHQ/naF6OGnO3Q/qGR3Q=="
|
||||
"resolved" "https://registry.npmjs.org/vue-loader/-/vue-loader-15.11.1.tgz"
|
||||
|
||||
Loading…
Reference in New Issue
Block a user