diff --git a/nl-agv/pom.xml b/nl-agv/pom.xml new file mode 100644 index 0000000..e36d6f3 --- /dev/null +++ b/nl-agv/pom.xml @@ -0,0 +1,138 @@ + + + 4.0.0 + + org.nl + nl-tool-platform + 3.0.0 + + + nl-agv + 0.0.1-SNAPSHOT + nl-agv + nl-agv + + + + + + org.openjdk.nashorn + nashorn-core + + + + + org.springframework.boot + spring-boot-starter-validation + + + + + org.springframework.boot + spring-boot-starter-web + + + + + org.springframework.boot + spring-boot-starter-aop + + + + + org.springframework.boot + spring-boot-configuration-processor + + + + + org.springframework.boot + spring-boot-starter-data-redis + + + + + org.projectlombok + lombok + + + + + com.alibaba + druid-spring-boot-3-starter + + + + + com.baomidou + mybatis-plus-spring-boot3-starter + + + + + com.fhs-opensource + easy-trans-spring-boot-starter + + + + + com.fhs-opensource + easy-trans-mybatis-plus-extend + + + + + org.apache.commons + commons-pool2 + + + + + cn.hutool + hutool-all + + + + + com.belerweb + pinyin4j + + + + + org.lionsoul + ip2region + + + + + com.github.xiaoymin + knife4j-openapi3-jakarta-spring-boot-starter + + + + + cn.afterturn + easypoi-spring-boot-starter + + + + + com.antherd + sm-crypto + + + + + com.alibaba + easyexcel + + + + org.nl + nl-common + + + + diff --git a/nl-agv/src/main/java/org/nl/controller/AgvStatusController.java b/nl-agv/src/main/java/org/nl/controller/AgvStatusController.java new file mode 100644 index 0000000..989b0a2 --- /dev/null +++ b/nl-agv/src/main/java/org/nl/controller/AgvStatusController.java @@ -0,0 +1,40 @@ +/* + * Copyright [2022] [https://www.xiaonuo.vip] + * + * Snowy采用APACHE LICENSE 2.0开源协议，您在使用过程中，需要注意以下几点： + * + * 1.请不要删除和修改根目录下的LICENSE文件。 + * 2.请不要删除和修改Snowy源码头部的版权声明。 + * 3.本项目代码可免费商业使用，商业使用请保留源码和相关描述文件的项目出处，作者声明等。 + * 4.分发源码时候，请注明软件出处 https://www.xiaonuo.vip + * 5.不可二次分发开源参与同类竞品，如有想法可联系团队xiaonuobase@qq.com商议合作。 + * 6.若您的项目无法满足以上几点，需要更多功能代码，获取Snowy商业授权许可，请在官网购买授权，地址为 https://www.xiaonuo.vip + */ +package org.nl.controller; + + +import com.alibaba.fastjson.JSONObject; +import io.swagger.v3.oas.annotations.tags.Tag; +import org.nl.common.pojo.CommonResult; +import org.nl.language.LangBehavior; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import java.util.ArrayList; + +@Tag(name = "AGV模块") +@RestController() +@RequestMapping("/api/agv") +@Validated +public class AgvStatusController { + static { + System.out.println("初始化AGV模块------------"); + } + @GetMapping("status") + public CommonResult status() { + ArrayList list = new ArrayList<>(); + return CommonResult.ok(); + } +} diff --git a/nl-agv/src/main/java/org/nl/server/dto/AgvStatus.java b/nl-agv/src/main/java/org/nl/server/dto/AgvStatus.java new file mode 100644 index 0000000..97760bc --- /dev/null +++ b/nl-agv/src/main/java/org/nl/server/dto/AgvStatus.java @@ -0,0 +1,60 @@ +package org.nl.server.dto; + +public class AgvStatus { + /** + * 车辆ID + */ + private String agvId; + /** + * 车辆类型 + */ + private String type; + /** + * 图标 + */ + private String icon; + /** + * 电量 + */ + private String power; + /** + * AGV状态未知 + * 待机中 + * 关机 + * 运行中 + * 交通管制 + * 任务等待 + * 充电中 + * 故障中 + * 低电量 + */ + private String statusType; + /** + * 状态类型：1.休息 2.正常运行 3.异常 + */ + private Integer status; + /** + * 动作状态：请求取货/放货/取货完成。。。 + */ + private String action; + /** + * 动作交互信息 + */ + private String actionMsg; + /** + * 任务号 + */ + private String taskCode; + /** + * 坐标X + */ + private String x; + /** + * 坐标Y + */ + private String y; + /** + * 航向角 + */ + private String angle; +} diff --git a/nl-common/pom.xml b/nl-common/pom.xml index af4b478..fad9506 100644 --- a/nl-common/pom.xml +++ b/nl-common/pom.xml @@ -21,7 +21,10 @@ org.openjdk.nashorn nashorn-core - + + nl.sdk + language + org.springframework.boot diff --git a/nl-plugin-api/nl-plugin-dev-api/pom.xml b/nl-plugin-api/nl-plugin-dev-api/pom.xml index 126e4e1..274ecf3 100644 --- a/nl-plugin-api/nl-plugin-dev-api/pom.xml +++ b/nl-plugin-api/nl-plugin-dev-api/pom.xml @@ -33,11 +33,11 @@ cos_api - - - com.aliyun.oss - aliyun-sdk-oss - + + + + + @@ -51,11 +51,11 @@ javax.mail - - - com.aliyun - dm20151123 - + + + + + @@ -64,10 +64,10 @@ - - com.aliyun - dysmsapi20170525 - + + + + diff --git a/nl-plugin/nl-plugin-dev/src/main/java/org/nl/dev/modular/email/service/impl/DevEmailServiceImpl.java b/nl-plugin/nl-plugin-dev/src/main/java/org/nl/dev/modular/email/service/impl/DevEmailServiceImpl.java index 3c88026..ba66df8 100644 --- a/nl-plugin/nl-plugin-dev/src/main/java/org/nl/dev/modular/email/service/impl/DevEmailServiceImpl.java +++ b/nl-plugin/nl-plugin-dev/src/main/java/org/nl/dev/modular/email/service/impl/DevEmailServiceImpl.java @@ -33,7 +33,6 @@ import org.nl.dev.modular.email.enums.DevEmailEngineTypeEnum; import org.nl.dev.modular.email.mapper.DevEmailMapper; import org.nl.dev.modular.email.param.*; import org.nl.dev.modular.email.service.DevEmailService; -import org.nl.dev.modular.email.util.DevEmailAliyunUtil; import org.nl.dev.modular.email.util.DevEmailLocalUtil; import org.nl.dev.modular.email.util.DevEmailTencentUtil; @@ -84,42 +83,17 @@ public class DevEmailServiceImpl extends ServiceImpl i @Transactional(rollbackFor = Exception.class) @Override public void sendAliyun(DevEmailSendAliyunTxtParam devEmailSendAliyunTxtParam) { - CommonEmailUtil.validEmail(devEmailSendAliyunTxtParam.getReceiveAccounts()); - String receiptInfo = DevEmailAliyunUtil.sendTextEmail(devEmailSendAliyunTxtParam.getSendAccount(), - devEmailSendAliyunTxtParam.getSendUser(), devEmailSendAliyunTxtParam.getReceiveAccounts(), - devEmailSendAliyunTxtParam.getSubject(), devEmailSendAliyunTxtParam.getContent()); - DevEmail devEmail = new DevEmail(); - BeanUtil.copyProperties(devEmailSendAliyunTxtParam, devEmail); - devEmail.setEngine(DevEmailEngineTypeEnum.ALIYUN.getValue()); - devEmail.setReceiptInfo(receiptInfo); - this.save(devEmail); } @Transactional(rollbackFor = Exception.class) @Override public void sendAliyun(DevEmailSendAliyunHtmlParam devEmailSendAliyunHtmlParam) { - CommonEmailUtil.validEmail(devEmailSendAliyunHtmlParam.getReceiveAccounts()); - String receiptInfo = DevEmailAliyunUtil.sendHtmlEmail(devEmailSendAliyunHtmlParam.getSendAccount(), - devEmailSendAliyunHtmlParam.getSendUser(), devEmailSendAliyunHtmlParam.getReceiveAccounts(), - devEmailSendAliyunHtmlParam.getSubject(), devEmailSendAliyunHtmlParam.getContent()); - DevEmail devEmail = new DevEmail(); - BeanUtil.copyProperties(devEmailSendAliyunHtmlParam, devEmail); - devEmail.setEngine(DevEmailEngineTypeEnum.ALIYUN.getValue()); - devEmail.setReceiptInfo(receiptInfo); - this.save(devEmail); + } @Override public void sendAliyun(DevEmailSendAliyunTmpParam devEmailSendAliyunTmpParam) { - CommonEmailUtil.validEmail(devEmailSendAliyunTmpParam.getReceiveAccounts()); - String receiptInfo = DevEmailAliyunUtil.sendEmailWithTemplate(devEmailSendAliyunTmpParam.getSendAccount(), - devEmailSendAliyunTmpParam.getTagName(), devEmailSendAliyunTmpParam.getReceiveAccounts(), - devEmailSendAliyunTmpParam.getTemplateName()); - DevEmail devEmail = new DevEmail(); - BeanUtil.copyProperties(devEmailSendAliyunTmpParam, devEmail); - devEmail.setEngine(DevEmailEngineTypeEnum.ALIYUN.getValue()); - devEmail.setReceiptInfo(receiptInfo); - this.save(devEmail); + } @Override diff --git a/nl-plugin/nl-plugin-dev/src/main/java/org/nl/dev/modular/email/util/DevEmailAliyunUtil.java b/nl-plugin/nl-plugin-dev/src/main/java/org/nl/dev/modular/email/util/DevEmailAliyunUtil.java deleted file mode 100644 index df6aac4..0000000 --- a/nl-plugin/nl-plugin-dev/src/main/java/org/nl/dev/modular/email/util/DevEmailAliyunUtil.java +++ /dev/null @@ -1,214 +0,0 @@ -/* - * Copyright [2022] [https://www.xiaonuo.vip] - * - * Snowy采用APACHE LICENSE 2.0开源协议，您在使用过程中，需要注意以下几点： - * - * 1.请不要删除和修改根目录下的LICENSE文件。 - * 2.请不要删除和修改Snowy源码头部的版权声明。 - * 3.本项目代码可免费商业使用，商业使用请保留源码和相关描述文件的项目出处，作者声明等。 - * 4.分发源码时候，请注明软件出处 https://www.xiaonuo.vip - * 5.不可二次分发开源参与同类竞品，如有想法可联系团队xiaonuobase@qq.com商议合作。 - * 6.若您的项目无法满足以上几点，需要更多功能代码，获取Snowy商业授权许可，请在官网购买授权，地址为 https://www.xiaonuo.vip - */ -package org.nl.dev.modular.email.util; - -import cn.hutool.core.util.ObjectUtil; -import cn.hutool.extra.spring.SpringUtil; -import com.aliyun.dm20151123.Client; -import com.aliyun.dm20151123.models.BatchSendMailRequest; -import com.aliyun.dm20151123.models.SingleSendMailRequest; -import com.aliyun.teaopenapi.models.Config; -import lombok.extern.slf4j.Slf4j; -import org.nl.common.exception.CommonException; -import org.nl.dev.api.DevConfigApi; - -/** - * 阿里云邮件工具类 - * 参考文档：https://help.aliyun.com/document_detail/29459.html - * - * @author xuyuxiang - * @date 2022/6/17 10:17 - **/ -@Slf4j -public class DevEmailAliyunUtil { - - private static Client client; - - private static final String SNOWY_EMAIL_ALIYUN_ACCESS_KEY_ID_KEY = "SNOWY_EMAIL_ALIYUN_ACCESS_KEY_ID"; - private static final String SNOWY_EMAIL_ALIYUN_ACCESS_KEY_SECRET_KEY = "SNOWY_EMAIL_ALIYUN_ACCESS_KEY_SECRET"; - private static final String SNOWY_EMAIL_ALIYUN_REGION_ID_KEY = "SNOWY_EMAIL_ALIYUN_REGION_ID"; - - /** - * 初始化操作的客户端 - * - * @author xuyuxiang - * @date 2022/1/5 23:24 - */ - private static void initClient() { - - DevConfigApi devConfigApi = SpringUtil.getBean(DevConfigApi.class); - - /* accessKeyId */ - String accessKeyId = devConfigApi.getValueByKey(SNOWY_EMAIL_ALIYUN_ACCESS_KEY_ID_KEY); - - if(ObjectUtil.isEmpty(accessKeyId)) { - throw new CommonException("阿里云邮件操作客户端未正确配置：accessKeyId为空"); - } - - /* accessKeySecret */ - String accessKeySecret = devConfigApi.getValueByKey(SNOWY_EMAIL_ALIYUN_ACCESS_KEY_SECRET_KEY); - - if(ObjectUtil.isEmpty(accessKeySecret)) { - throw new CommonException("阿里云邮件操作客户端未正确配置：accessKeySecret为空"); - } - - /* regionId */ - String regionId = devConfigApi.getValueByKey(SNOWY_EMAIL_ALIYUN_REGION_ID_KEY); - - if(ObjectUtil.isEmpty(regionId)) { - throw new CommonException("阿里云邮件操作客户端未正确配置：regionId为空"); - } - - try { - client = new Client(new Config().setRegionId(regionId).setEndpoint("dm.aliyuncs.com").setAccessKeyId(accessKeyId).setAccessKeySecret(accessKeySecret)); - } catch (Exception e) { - throw new CommonException(e.getMessage()); - } - } - - /** - * 发送纯文本邮件（不使用模板，频率限制100 QPS） - * - * @param from 管理控制台中配置的发信地址，必传且必须正确 - * @param user 发信人昵称，长度小于15个字符，可不传 - * @param tos 目标地址，多个 email 地址可以用逗号分隔，最多100个地址，必传且必须正确 - * @param subject 邮件主题，必传 - * @param content 邮件 txt 正文，限制28K，必传 - * @return 发送成功的回执id - * @author xuyuxiang - * @date 2022/2/23 14:24 - **/ - public static String sendTextEmail(String from, String user, String tos, String subject, String content) { - try { - initClient(); - SingleSendMailRequest singleSendMailRequest = createSingleSendRequest(from, user, tos, subject, content, false); - return client.singleSendMail(singleSendMailRequest).getBody().getEnvId(); - } catch (Exception e) { - throw new CommonException(e.getMessage()); - } - } - - /** - * 发送HTML邮件（不使用模板，频率限制100 QPS） - * - * @param from 管理控制台中配置的发信地址，必传且必须正确 - * @param user 发信人昵称，长度小于15个字符，可不传 - * @param tos 目标地址，多个 email 地址可以用逗号分隔，最多100个地址，必传且必须正确 - * @param subject 邮件主题，必传 - * @param content 邮件 html 正文，限制28K，必传 - * @return 发送成功的回执id - * @author xuyuxiang - * @date 2022/2/23 14:24 - **/ - public static String sendHtmlEmail(String from, String user, String tos, String subject, String content) { - try { - initClient(); - SingleSendMailRequest singleSendMailRequest = createSingleSendRequest(from, user, tos, subject, content, true); - return client.singleSendMail(singleSendMailRequest).getBody().getEnvId(); - } catch (Exception e) { - throw new CommonException(e.getMessage()); - } - } - - /** - * 使用模板发送邮件，国内频率限制是20/min；海外频率限制是10/min。 - * - * @param from 管理控制台中配置的发信地址，必传且必须正确 - * @param tagName 控制台创建的邮件标签，可不传 - * @param toName 预先创建且上传了收件人的收件人列表名称，必传且必须正确 - * @param templateName 预先创建且通过审核的模板名称，必传且必须正确 - * @return 发送成功的回执id - * @author xuyuxiang - * @date 2022/2/23 14:24 - **/ - public static String sendEmailWithTemplate(String from, String tagName, String toName, String templateName) { - try { - initClient(); - BatchSendMailRequest batchSendMailRequest = createBatchSendRequest(from, tagName, toName, templateName); - return client.batchSendMail(batchSendMailRequest).getBody().getEnvId(); - } catch (Exception e) { - throw new CommonException(e.getMessage()); - } - } - - - /** - * 创建发送一个邮件的请求 - * - * @author xuyuxiang - * @date 2022/2/23 13:33 - **/ - private static SingleSendMailRequest createSingleSendRequest(String from, String user, String tos, String subject, String content, boolean isHtml) { - SingleSendMailRequest request = new SingleSendMailRequest(); - - // 控制台创建的发信地址 - request.setAccountName(from); - - // 发信人昵称 - request.setFromAlias(user); - - // 地址类型：0-为随机账号，1-为发信地址 - request.setAddressType(1); - - // 使用管理台配置的回信地址 - request.setReplyToAddress(true); - - // 目标地址 - request.setToAddress(tos); - - // 邮件主题 - request.setSubject(subject); - - //如果采用byte[].toString的方式的话请确保最终转换成utf-8的格式再放入htmlbody和textbody，若编码不一致则会被当成垃圾邮件。 - if(isHtml) { - request.setHtmlBody(content); - } else { - request.setTextBody(content); - } - - //是否开启追踪功能，开启需要备案，0关闭，1开启 - request.setClickTrace("0"); - - return request; - } - - /** - * 创建发送批量邮件的请求 - * - * @author fengshuonan - * @date 2020/10/30 22:39 - */ - private static BatchSendMailRequest createBatchSendRequest(String from, String tagName, String toName, String templateName) { - BatchSendMailRequest request = new BatchSendMailRequest(); - - // 控制台创建的发信地址 - request.setAccountName(from); - - // 预先创建且上传了收件人的收件人列表名称 - request.setReceiversName(toName); - - // 邮件模板，在控制台创建，相当于邮件的内容 - request.setTemplateName(templateName); - - // 地址类型：0-为随机账号，1-为发信地址 - request.setAddressType(1); - - // 控制台创建的标签 - request.setTagName(tagName); - - //是否开启追踪功能，开启需要备案，0关闭，1开启 - request.setClickTrace("0"); - - return request; - } -} diff --git a/nl-plugin/nl-plugin-dev/src/main/java/org/nl/dev/modular/file/service/impl/DevFileServiceImpl.java b/nl-plugin/nl-plugin-dev/src/main/java/org/nl/dev/modular/file/service/impl/DevFileServiceImpl.java index 7d56a2d..dea6292 100644 --- a/nl-plugin/nl-plugin-dev/src/main/java/org/nl/dev/modular/file/service/impl/DevFileServiceImpl.java +++ b/nl-plugin/nl-plugin-dev/src/main/java/org/nl/dev/modular/file/service/impl/DevFileServiceImpl.java @@ -28,13 +28,13 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import jakarta.annotation.Resource; import jakarta.servlet.http.HttpServletResponse; +import org.apache.commons.math3.dfp.DfpField; import org.nl.dev.modular.file.entity.DevFile; import org.nl.dev.modular.file.enums.DevFileEngineTypeEnum; import org.nl.dev.modular.file.param.DevFileIdParam; import org.nl.dev.modular.file.param.DevFileListParam; import org.nl.dev.modular.file.param.DevFilePageParam; import org.nl.dev.modular.file.param.DevFileUrlListParam; -import org.nl.dev.modular.file.util.DevFileAliyunUtil; import org.springframework.stereotype.Service; import org.springframework.web.multipart.MultipartFile; import org.nl.common.exception.CommonException; @@ -51,7 +51,6 @@ import org.nl.dev.modular.file.util.DevFileTencentUtil; import java.io.File; import java.io.IOException; import java.math.BigDecimal; -import java.math.RoundingMode; import java.util.List; /** @@ -143,10 +142,10 @@ public class DevFileServiceImpl extends ServiceImpl impl String fileId = IdWorker.getIdStr(); // 存储桶名称 - String bucketName; + String bucketName = null; // 定义存储的url，本地文件返回文件实际路径，其他引擎返回网络地址 - String storageUrl; + String storageUrl = null; // 根据引擎类型执行不同方法 if(engine.equals(DevFileEngineTypeEnum.LOCAL.getValue())) { @@ -156,9 +155,6 @@ public class DevFileServiceImpl extends ServiceImpl impl storageUrl = DevFileLocalUtil.storageFileWithReturnUrl(bucketName, genFileKey(fileId, file), file); } else if(engine.equals(DevFileEngineTypeEnum.ALIYUN.getValue())) { - // 使用阿里云默认配置的bucketName - bucketName = DevFileAliyunUtil.getDefaultBucketName(); - storageUrl = DevFileAliyunUtil.storageFileWithReturnUrl(bucketName, genFileKey(fileId, file), file); } else if(engine.equals(DevFileEngineTypeEnum.TENCENT.getValue())) { // 使用腾讯云默认配置的bucketName @@ -187,7 +183,7 @@ public class DevFileServiceImpl extends ServiceImpl impl StrUtil.DOT, true):null; devFile.setSuffix(suffix); devFile.setSizeKb(Convert.toStr(NumberUtil.div(new BigDecimal(file.getSize()), BigDecimal.valueOf(1024)) - .setScale(0, RoundingMode.HALF_UP))); + .setScale(0, DfpField.RoundingMode.ROUND_HALF_UP.ordinal()))); devFile.setSizeInfo(FileUtil.readableFileSize(file.getSize())); devFile.setObjName(ObjectUtil.isNotEmpty(devFile.getSuffix())?fileId + StrUtil.DOT + devFile.getSuffix():null); // 如果是图片，则压缩生成缩略图 diff --git a/nl-plugin/nl-plugin-dev/src/main/java/org/nl/dev/modular/file/util/DevFileAliyunUtil.java b/nl-plugin/nl-plugin-dev/src/main/java/org/nl/dev/modular/file/util/DevFileAliyunUtil.java deleted file mode 100644 index 1f3a3e5..0000000 --- a/nl-plugin/nl-plugin-dev/src/main/java/org/nl/dev/modular/file/util/DevFileAliyunUtil.java +++ /dev/null @@ -1,471 +0,0 @@ -/* - * Copyright [2022] [https://www.xiaonuo.vip] - * - * Snowy采用APACHE LICENSE 2.0开源协议，您在使用过程中，需要注意以下几点： - * - * 1.请不要删除和修改根目录下的LICENSE文件。 - * 2.请不要删除和修改Snowy源码头部的版权声明。 - * 3.本项目代码可免费商业使用，商业使用请保留源码和相关描述文件的项目出处，作者声明等。 - * 4.分发源码时候，请注明软件出处 https://www.xiaonuo.vip - * 5.不可二次分发开源参与同类竞品，如有想法可联系团队xiaonuobase@qq.com商议合作。 - * 6.若您的项目无法满足以上几点，需要更多功能代码，获取Snowy商业授权许可，请在官网购买授权，地址为 https://www.xiaonuo.vip - */ -package org.nl.dev.modular.file.util; - -import cn.hutool.core.io.FileUtil; -import cn.hutool.core.io.IORuntimeException; -import cn.hutool.core.io.IoUtil; -import cn.hutool.core.util.ObjectUtil; -import cn.hutool.core.util.StrUtil; -import cn.hutool.extra.spring.SpringUtil; -import com.aliyun.oss.*; -import com.aliyun.oss.model.CannedAccessControlList; -import com.aliyun.oss.model.GeneratePresignedUrlRequest; -import com.aliyun.oss.model.OSSObject; -import com.aliyun.oss.model.ObjectMetadata; -import jakarta.activation.MimetypesFileTypeMap; -import lombok.extern.slf4j.Slf4j; -import org.nl.dev.modular.file.enums.DevFileBucketAuthEnum; -import org.springframework.web.multipart.MultipartFile; -import org.nl.common.exception.CommonException; -import org.nl.dev.api.DevConfigApi; - -import java.io.*; -import java.net.URL; -import java.util.Date; -import java.util.List; - -/** - * 阿里云文件工具类 - * 参考文档：https://help.aliyun.com/document_detail/32010.html - * - * @author xuyuxiang - * @date 2022/1/2 18:13 - */ -@Slf4j -public class DevFileAliyunUtil { - - private static OSS client; - - private static String defaultBucketName; - - private static final String SNOWY_FILE_ALIYUN_ACCESS_KEY_ID_KEY = "SNOWY_FILE_ALIYUN_ACCESS_KEY_ID"; - private static final String SNOWY_FILE_ALIYUN_ACCESS_KEY_SECRET_KEY = "SNOWY_FILE_ALIYUN_ACCESS_KEY_SECRET"; - private static final String SNOWY_FILE_ALIYUN_END_POINT_KEY = "SNOWY_FILE_ALIYUN_END_POINT"; - private static final String SNOWY_FILE_ALIYUN_DEFAULT_BUCKET_NAME = "SNOWY_FILE_ALIYUN_DEFAULT_BUCKET_NAME"; - - /** - * 初始化操作的客户端 - * - * @author xuyuxiang - * @date 2022/1/5 23:24 - */ - private static void initClient() { - - DevConfigApi devConfigApi = SpringUtil.getBean(DevConfigApi.class); - - /* accessKeyId */ - String accessKeyId = devConfigApi.getValueByKey(SNOWY_FILE_ALIYUN_ACCESS_KEY_ID_KEY); - - if(ObjectUtil.isEmpty(accessKeyId)) { - throw new CommonException("阿里云文件操作客户端未正确配置：accessKeyId为空"); - } - - /* accessKeySecret */ - String accessKeySecret = devConfigApi.getValueByKey(SNOWY_FILE_ALIYUN_ACCESS_KEY_SECRET_KEY); - - if(ObjectUtil.isEmpty(accessKeySecret)) { - throw new CommonException("阿里云文件操作客户端未正确配置：accessKeySecret为空"); - } - - /* endpoint */ - String endpoint = devConfigApi.getValueByKey(SNOWY_FILE_ALIYUN_END_POINT_KEY); - - if(ObjectUtil.isEmpty(endpoint)) { - throw new CommonException("阿里云文件操作客户端未正确配置：endpoint为空"); - } - - /* 默认BucketName */ - defaultBucketName = devConfigApi.getValueByKey(SNOWY_FILE_ALIYUN_DEFAULT_BUCKET_NAME); - - if(ObjectUtil.isEmpty(defaultBucketName)) { - throw new CommonException("阿里云文件操作客户端未正确配置：defaultBucketName为空"); - } - - client = new OSSClientBuilder().build(endpoint, accessKeyId, accessKeySecret); - } - - /** - * 获取默认存储桶名称 - * - * @author xuyuxiang - * @date 2022/6/22 18:05 - **/ - public static String getDefaultBucketName() { - initClient(); - return defaultBucketName; - } - - /** - * 销毁操作的客户端 - * - * @author xuyuxiang - * @date 2022/1/5 23:24 - */ - public static void destroyClient() { - initClient(); - client.shutdown(); - } - - /** - * 获取操作的客户端 - * - * @author xuyuxiang - * @date 2022/1/5 23:24 - */ - public OSS getClient() { - initClient(); - return client; - } - - /** - * 查询存储桶是否存在 - * 例如：传入参数examplebucket-1250000000，返回true代表存在此桶 - * - * @param bucketName 桶名称 - * @author xuyuxiang - * @date 2022/1/5 23:24 - */ - public boolean doesBucketExist(String bucketName) { - try { - initClient(); - return client.doesBucketExist(bucketName); - } catch (OSSException | ClientException e) { - throw new CommonException(e.getMessage()); - } - } - - /** - * 设置预定义策略 - * 预定义策略如公有读、公有读写、私有读 - * - * @param bucketName 桶名称 - * @param devFileBucketAuthEnum 存储桶权限 - * @author xuyuxiang - * @date 2022/1/5 23:24 - */ - public static void setBucketAcl(String bucketName, DevFileBucketAuthEnum devFileBucketAuthEnum) { - try { - initClient(); - if (devFileBucketAuthEnum.equals(DevFileBucketAuthEnum.PRIVATE)) { - client.setBucketAcl(bucketName, CannedAccessControlList.Private); - } else if (devFileBucketAuthEnum.equals(DevFileBucketAuthEnum.PUBLIC_READ)) { - client.setBucketAcl(bucketName, CannedAccessControlList.PublicRead); - } else if (devFileBucketAuthEnum.equals(DevFileBucketAuthEnum.PUBLIC_READ_WRITE)) { - client.setBucketAcl(bucketName, CannedAccessControlList.PublicReadWrite); - } - } catch (OSSException | ClientException e) { - throw new CommonException(e.getMessage()); - } - } - - /** - * 判断是否存在文件 - * - * @param bucketName 桶名称 - * @param key 唯一标示id，例如a.txt, doc/a.txt - * @author xuyuxiang - * @date 2022/1/5 23:24 - */ - public static boolean isExistingFile(String bucketName, String key) { - try { - initClient(); - return client.doesObjectExist(bucketName, key); - } catch (OSSException | ClientException e) { - throw new CommonException(e.getMessage()); - } - } - - /** - * 存储文件，不返回地址 - * - * @param bucketName 桶名称 - * @param key 唯一标示id，例如a.txt, doc/a.txt - * @param file 文件 - * @author xuyuxiang - * @date 2022/1/5 23:45 - */ - public static void storageFile(String bucketName, String key, File file) { - BufferedInputStream inputStream; - try { - inputStream = FileUtil.getInputStream(file); - } catch (IORuntimeException e) { - throw new CommonException("获取文件流异常，名称是：{}", file.getName()); - } - storageFile(bucketName, key, inputStream); - } - - /** - * 存储文件，不返回地址 - * - * @param bucketName 桶名称 - * @param key 唯一标示id，例如a.txt, doc/a.txt - * @param multipartFile 文件 - * @author xuyuxiang - * @date 2022/1/5 23:45 - */ - public static void storageFile(String bucketName, String key, MultipartFile multipartFile) { - InputStream inputStream; - try { - inputStream = multipartFile.getInputStream(); - } catch (IOException e) { - throw new CommonException("获取文件流异常，名称是：{}", multipartFile.getName()); - } - storageFile(bucketName, key, inputStream); - } - - /** - * 存储文件，不返回地址 - * - * @param bucketName 桶名称 - * @param key 唯一标示id，例如a.txt, doc/a.txt - * @param bytes 文件字节数组 - * @author xuyuxiang - * @date 2022/1/5 23:24 - */ - public static void storageFile(String bucketName, String key, byte[] bytes) { - ByteArrayInputStream byteArrayInputStream = null; - try { - initClient(); - byteArrayInputStream = new ByteArrayInputStream(bytes); - ObjectMetadata objectMetadata = new ObjectMetadata(); - objectMetadata.setContentType(getFileContentType(key)); - client.putObject(bucketName, key, byteArrayInputStream, objectMetadata); - } catch (OSSException | ClientException e) { - throw new CommonException(e.getMessage()); - } finally { - IoUtil.close(byteArrayInputStream); - } - } - - /** - * 存储文件，不返回地址 - * - * @param bucketName 桶名称 - * @param key 唯一标示id，例如a.txt, doc/a.txt - * @param inputStream 文件流 - * @author xuyuxiang - * @date 2022/1/5 23:24 - */ - public static void storageFile(String bucketName, String key, InputStream inputStream) { - try { - initClient(); - ObjectMetadata objectMetadata = new ObjectMetadata(); - objectMetadata.setContentType(getFileContentType(key)); - client.putObject(bucketName, key, inputStream, objectMetadata); - } catch (OSSException | ClientException e) { - throw new CommonException(e.getMessage()); - } finally { - IoUtil.close(inputStream); - } - } - - /** - * 存储文件，返回外网地址 - * - * @param bucketName 桶名称 - * @param key 唯一标示id，例如a.txt, doc/a.txt - * @param file 文件 - * @author xuyuxiang - * @date 2022/1/5 23:45 - */ - public static String storageFileWithReturnUrl(String bucketName, String key, File file) { - storageFile(bucketName, key, file); - setFileAcl(bucketName, key, DevFileBucketAuthEnum.PUBLIC_READ); - return getFileAuthUrl(bucketName, key); - } - - /** - * 存储文件，返回外网地址 - * - * @param bucketName 桶名称 - * @param key 唯一标示id，例如a.txt, doc/a.txt - * @param multipartFile 文件 - * @author xuyuxiang - * @date 2022/1/5 23:45 - */ - public static String storageFileWithReturnUrl(String bucketName, String key, MultipartFile multipartFile) { - storageFile(bucketName, key, multipartFile); - setFileAcl(bucketName, key, DevFileBucketAuthEnum.PUBLIC_READ); - return getFileAuthUrl(bucketName, key); - } - - /** - * 存储文件，返回外网地址 - * - * @param bucketName 桶名称 - * @param key 唯一标示id，例如a.txt, doc/a.txt - * @param bytes 文件字节数组 - * @author xuyuxiang - * @date 2022/1/5 23:24 - */ - public static String storageFileWithReturnUrl(String bucketName, String key, byte[] bytes) { - storageFile(bucketName, key, bytes); - setFileAcl(bucketName, key, DevFileBucketAuthEnum.PUBLIC_READ); - return getFileAuthUrl(bucketName, key); - } - - /** - * 存储文件，返回外网地址 - * - * @param bucketName 桶名称 - * @param key 唯一标示id，例如a.txt, doc/a.txt - * @param inputStream 文件流 - * @author xuyuxiang - * @date 2022/1/5 23:24 - */ - public static String storageFileWithReturnUrl(String bucketName, String key, InputStream inputStream) { - storageFile(bucketName, key, inputStream); - setFileAcl(bucketName, key, DevFileBucketAuthEnum.PUBLIC_READ); - return getFileAuthUrl(bucketName, key); - } - - /** - * 获取某个bucket下的文件字节 - * - * @param bucketName 桶名称 - * @param key 唯一标示id，例如a.txt, doc/a.txt - * @author xuyuxiang - * @date 2022/1/5 23:24 - */ - public static byte[] getFileBytes(String bucketName, String key) { - InputStream objectContent = null; - try { - initClient(); - OSSObject ossObject = client.getObject(bucketName, key); - objectContent = ossObject.getObjectContent(); - return IoUtil.readBytes(objectContent); - } catch (OSSException | ClientException e) { - throw new CommonException(e.getMessage()); - } finally { - IoUtil.close(objectContent); - } - } - - /** - * 设置文件访问权限管理 - * - * @param bucketName 桶名称 - * @param key 唯一标示id，例如a.txt, doc/a.txt - * @param devFileBucketAuthEnum 文件权限 - * @author xuyuxiang - * @date 2022/1/5 23:24 - */ - public static void setFileAcl(String bucketName, String key, DevFileBucketAuthEnum devFileBucketAuthEnum) { - try { - initClient(); - if (devFileBucketAuthEnum.equals(DevFileBucketAuthEnum.PRIVATE)) { - client.setObjectAcl(bucketName, key, CannedAccessControlList.Private); - } else if (devFileBucketAuthEnum.equals(DevFileBucketAuthEnum.PUBLIC_READ)) { - client.setObjectAcl(bucketName, key, CannedAccessControlList.PublicRead); - } else if (devFileBucketAuthEnum.equals(DevFileBucketAuthEnum.PUBLIC_READ_WRITE)) { - client.setObjectAcl(bucketName, key, CannedAccessControlList.PublicReadWrite); - } - } catch (OSSException | ClientException e) { - throw new CommonException(e.getMessage()); - } - } - - /** - * 拷贝文件 - * - * @param originBucketName 源文件桶 - * @param originFileKey 源文件名称 - * @param newBucketName 新文件桶 - * @param newFileKey 新文件名称 - * @author xuyuxiang - * @date 2022/1/5 23:24 - */ - public static void copyFile(String originBucketName, String originFileKey, String newBucketName, String newFileKey) { - try { - initClient(); - client.copyObject(originBucketName, originFileKey, newBucketName, newFileKey); - } catch (OSSException | ClientException e) { - throw new CommonException(e.getMessage()); - } - } - - /** - * 获取文件的下载地址（带鉴权和有效时间的），生成外网地址 - * - * @param bucketName 文件桶 - * @param key 唯一标示id，例如a.txt, doc/a.txt - * @param timeoutMillis 时效 - * @author xuyuxiang - * @date 2022/1/5 23:24 - */ - public static String getFileAuthUrl(String bucketName, String key, Long timeoutMillis) { - initClient(); - GeneratePresignedUrlRequest request = new GeneratePresignedUrlRequest(bucketName, key, HttpMethod.GET); - Date expirationDate = new Date(System.currentTimeMillis() + timeoutMillis); - request.setExpiration(expirationDate); - URL url; - try { - url = client.generatePresignedUrl(request); - } catch (OSSException | ClientException e) { - throw new CommonException(e.getMessage()); - } - return url.toString(); - } - - /** - * 获取文件的下载地址（永久的，文件必须为公有读），生成外网地址 - * - * @param bucketName 文件桶 - * @param key 唯一标示id，例如a.txt, doc/a.txt - * @author xuyuxiang - * @date 2022/1/5 23:24 - */ - public static String getFileAuthUrl(String bucketName, String key) { - try { - initClient(); - OSSClient ossClient = (OSSClient) client; - List urlList = StrUtil.split(ossClient.getEndpoint().toString(), StrUtil.COLON + StrUtil.SLASH + StrUtil.SLASH); - return urlList.get(0) + StrUtil.COLON + StrUtil.SLASH + StrUtil.SLASH + bucketName + StrUtil.DOT + urlList.get(1) + StrUtil.SLASH + key; - } catch (OSSException | ClientException e) { - throw new CommonException(e.getMessage()); - } - } - - /** - * 删除文件 - * - * @param bucketName 文件桶 - * @param key 唯一标示id，例如a.txt, doc/a.txt - * @author xuyuxiang - * @date 2022/1/5 23:24 - */ - public static void deleteFile(String bucketName, String key) { - try{ - initClient(); - client.deleteObject(bucketName, key); - } catch (OSSException | ClientException e) { - throw new CommonException(e.getMessage()); - } - } - - /** - * 根据文件名获取ContentType - * - * @author xuyuxiang - * @date 2022/1/6 11:27 - **/ - private static String getFileContentType(String key) { - // 根据文件名获取contentType - String contentType = "application/octet-stream"; - if (key.contains(".")) { - contentType = MimetypesFileTypeMap.getDefaultFileTypeMap().getContentType(key); - } - return contentType; - } -} diff --git a/nl-plugin/nl-plugin-dev/src/main/java/org/nl/dev/modular/sms/service/impl/DevSmsServiceImpl.java b/nl-plugin/nl-plugin-dev/src/main/java/org/nl/dev/modular/sms/service/impl/DevSmsServiceImpl.java index 3237d00..a3850b5 100644 --- a/nl-plugin/nl-plugin-dev/src/main/java/org/nl/dev/modular/sms/service/impl/DevSmsServiceImpl.java +++ b/nl-plugin/nl-plugin-dev/src/main/java/org/nl/dev/modular/sms/service/impl/DevSmsServiceImpl.java @@ -22,7 +22,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import org.nl.dev.modular.sms.enums.DevSmsEngineTypeEnum; import org.nl.dev.modular.sms.param.*; -import org.nl.dev.modular.sms.util.DevSmsAliyunUtil; + import org.nl.dev.modular.sms.util.DevSmsTencentUtil; import org.nl.dev.modular.sms.util.DevSmsXiaonuoUtil; import org.springframework.stereotype.Service; @@ -49,15 +49,7 @@ public class DevSmsServiceImpl extends ServiceImpl impleme @Transactional(rollbackFor = Exception.class) @Override public void sendAliyun(DevSmsSendAliyunParam devSmsSendAliyunParam) { - validPhone(devSmsSendAliyunParam.getPhoneNumbers()); - String receiptInfo = DevSmsAliyunUtil.sendSms(devSmsSendAliyunParam.getPhoneNumbers(), devSmsSendAliyunParam.getSignName(), - devSmsSendAliyunParam.getTemplateCode(), devSmsSendAliyunParam.getTemplateParam()); - DevSms devSms = new DevSms(); - BeanUtil.copyProperties(devSmsSendAliyunParam, devSms); - devSms.setSignName(ObjectUtil.isNotEmpty(devSms.getSignName())?devSms.getSignName():DevSmsAliyunUtil.getDefaultSignName()); - devSms.setEngine(DevSmsEngineTypeEnum.ALIYUN.getValue()); - devSms.setReceiptInfo(receiptInfo); - this.save(devSms); + } @Transactional(rollbackFor = Exception.class) diff --git a/nl-plugin/nl-plugin-dev/src/main/java/org/nl/dev/modular/sms/util/DevSmsAliyunUtil.java b/nl-plugin/nl-plugin-dev/src/main/java/org/nl/dev/modular/sms/util/DevSmsAliyunUtil.java deleted file mode 100644 index af028e5..0000000 --- a/nl-plugin/nl-plugin-dev/src/main/java/org/nl/dev/modular/sms/util/DevSmsAliyunUtil.java +++ /dev/null @@ -1,133 +0,0 @@ -/* - * Copyright [2022] [https://www.xiaonuo.vip] - * - * Snowy采用APACHE LICENSE 2.0开源协议，您在使用过程中，需要注意以下几点： - * - * 1.请不要删除和修改根目录下的LICENSE文件。 - * 2.请不要删除和修改Snowy源码头部的版权声明。 - * 3.本项目代码可免费商业使用，商业使用请保留源码和相关描述文件的项目出处，作者声明等。 - * 4.分发源码时候，请注明软件出处 https://www.xiaonuo.vip - * 5.不可二次分发开源参与同类竞品，如有想法可联系团队xiaonuobase@qq.com商议合作。 - * 6.若您的项目无法满足以上几点，需要更多功能代码，获取Snowy商业授权许可，请在官网购买授权，地址为 https://www.xiaonuo.vip - */ -package org.nl.dev.modular.sms.util; - -import cn.hutool.core.util.ObjectUtil; -import cn.hutool.extra.spring.SpringUtil; -import cn.hutool.json.JSONUtil; -import com.aliyun.dysmsapi20170525.Client; -import com.aliyun.dysmsapi20170525.models.SendSmsRequest; -import com.aliyun.dysmsapi20170525.models.SendSmsResponse; -import com.aliyun.dysmsapi20170525.models.SendSmsResponseBody; -import com.aliyun.teaopenapi.models.Config; -import lombok.extern.slf4j.Slf4j; -import org.nl.common.exception.CommonException; -import org.nl.dev.api.DevConfigApi; - -/** - * 阿里云短信工具类 - * 参考文档：https://next.api.aliyun.com/api-tools/sdk/Dysmsapi?version=2017-05-25&language=java-tea - * - * @author xuyuxiang - * @date 2022/1/2 17:05 - */ -@Slf4j -public class DevSmsAliyunUtil { - - private static Client client; - - private static final String SNOWY_SMS_ALIYUN_ACCESS_KEY_ID_KEY = "SNOWY_SMS_ALIYUN_ACCESS_KEY_ID"; - private static final String SNOWY_SMS_ALIYUN_ACCESS_KEY_SECRET_KEY = "SNOWY_SMS_ALIYUN_ACCESS_KEY_SECRET"; - private static final String SNOWY_SMS_ALIYUN_END_POINT_KEY = "SNOWY_SMS_ALIYUN_END_POINT"; - private static final String SNOWY_SMS_ALIYUN_DEFAULT_SIGN_NAME_KEY = "SNOWY_SMS_ALIYUN_DEFAULT_SIGN_NAME"; - - /** - * 初始化操作的客户端 - * - * @author xuyuxiang - * @date 2022/1/5 23:24 - */ - private static void initClient() { - - DevConfigApi devConfigApi = SpringUtil.getBean(DevConfigApi.class); - - /* accessKeyId */ - String accessKeyId = devConfigApi.getValueByKey(SNOWY_SMS_ALIYUN_ACCESS_KEY_ID_KEY); - - if(ObjectUtil.isEmpty(accessKeyId)) { - throw new CommonException("阿里云短信操作客户端未正确配置：accessKeyId为空"); - } - - /* accessKeySecret */ - String accessKeySecret = devConfigApi.getValueByKey(SNOWY_SMS_ALIYUN_ACCESS_KEY_SECRET_KEY); - - if(ObjectUtil.isEmpty(accessKeySecret)) { - throw new CommonException("阿里云短信操作客户端未正确配置：accessKeySecret为空"); - } - - /* endpoint */ - String endpoint = devConfigApi.getValueByKey(SNOWY_SMS_ALIYUN_END_POINT_KEY); - - if(ObjectUtil.isEmpty(endpoint)) { - throw new CommonException("阿里云短信操作客户端未正确配置：endpoint为空"); - } - - try { - client = new Client(new Config().setAccessKeyId(accessKeyId).setAccessKeySecret(accessKeySecret).setEndpoint(endpoint)); - } catch (Exception e) { - throw new CommonException(e.getMessage()); - } - } - - /** - * 发送短信 - * - * @param phoneNumbers 手机号码，支持对多个手机号码发送短信，手机号码之间以半角逗号（,）分隔。 - * 上限为1000个手机号码。批量调用相对于单条调用及时性稍有延迟。 - * @param signName 短信服务控制台配置且审核通过的短信签名，为空则使用默认签名 - * @param templateCode 短信服务控制台配置且审核通过的模板编码 - * @param templateParam 短信模板变量对应的实际值，JSON格式。支持传入多个参数，示例：{"name":"张三","number":"15038****76"} - * @return 发送的结果信息集合 com.aliyun.dysmsapi20170525.models.SendSmsResponse - * @author xuyuxiang - * @date 2022/2/24 13:42 - **/ - public static String sendSms(String phoneNumbers, String signName, String templateCode, String templateParam) { - try { - initClient(); - if(ObjectUtil.isEmpty(signName)) { - signName = getDefaultSignName(); - } - SendSmsRequest sendSmsRequest = new SendSmsRequest() - .setPhoneNumbers(phoneNumbers) - .setSignName(signName) - .setTemplateCode(templateCode) - .setTemplateParam(templateParam); - SendSmsResponse sendSmsResponse = client.sendSms(sendSmsRequest); - SendSmsResponseBody body = sendSmsResponse.getBody(); - String code = body.getCode().toLowerCase(); - if("ok".equals(code)) { - return JSONUtil.toJsonStr(body); - } else { - throw new CommonException(body.getMessage()); - } - } catch (Exception e) { - throw new CommonException(e.getMessage()); - } - } - - /** - * 获取默认签名 - * - * @author xuyuxiang - * @date 2024/1/26 16:40 - **/ - public static String getDefaultSignName() { - // 签名为空，则获取默认签名 - DevConfigApi devConfigApi = SpringUtil.getBean(DevConfigApi.class); - String signName = devConfigApi.getValueByKey(SNOWY_SMS_ALIYUN_DEFAULT_SIGN_NAME_KEY); - if(ObjectUtil.isEmpty(signName)) { - throw new CommonException("阿里云短信操作客户端未正确配置：signName为空"); - } - return signName; - } -} diff --git a/nl-plugin/nl-plugin-mobile/src/main/java/org/nl/mobile/modular/resource/controller/MobileButtonController.java b/nl-plugin/nl-plugin-mobile/src/main/java/org/nl/mobile/modular/resource/controller/MobileButtonController.java index 50f63cd..4566c3d 100644 --- a/nl-plugin/nl-plugin-mobile/src/main/java/org/nl/mobile/modular/resource/controller/MobileButtonController.java +++ b/nl-plugin/nl-plugin-mobile/src/main/java/org/nl/mobile/modular/resource/controller/MobileButtonController.java @@ -44,7 +44,9 @@ import java.util.List; @RestController @Validated public class MobileButtonController { - + static { + System.out.println("移动端按钮控制器------------"); + } @Resource private MobileButtonService mobileButtonService; diff --git a/nl-plugin/nl-plugin-sys/pom.xml b/nl-plugin/nl-plugin-sys/pom.xml index 146d163..adf3468 100644 --- a/nl-plugin/nl-plugin-sys/pom.xml +++ b/nl-plugin/nl-plugin-sys/pom.xml @@ -31,6 +31,12 @@ org.nl nl-plugin-dev-api + + + tea + com.aliyun + + diff --git a/nl-system/pom.xml b/nl-system/pom.xml new file mode 100644 index 0000000..2bf4e92 --- /dev/null +++ b/nl-system/pom.xml @@ -0,0 +1,131 @@ + + 4.0.0 + + org.nl + nl-tool-platform + 3.0.0 + + + nl-system + 0.0.1-SNAPSHOT + nl-system + nl-system + + + + + org.openjdk.nashorn + nashorn-core + + + + + org.springframework.boot + spring-boot-starter-validation + + + + + org.springframework.boot + spring-boot-starter-web + + + + + org.springframework.boot + spring-boot-starter-aop + + + + + org.springframework.boot + spring-boot-configuration-processor + + + + + org.springframework.boot + spring-boot-starter-data-redis + + + + + org.projectlombok + lombok + + + + + com.alibaba + druid-spring-boot-3-starter + + + + + com.baomidou + mybatis-plus-spring-boot3-starter + + + + + com.fhs-opensource + easy-trans-spring-boot-starter + + + + + com.fhs-opensource + easy-trans-mybatis-plus-extend + + + + + org.apache.commons + commons-pool2 + + + + + cn.hutool + hutool-all + + + + + com.belerweb + pinyin4j + + + + + org.lionsoul + ip2region + + + + + com.github.xiaoymin + knife4j-openapi3-jakarta-spring-boot-starter + + + + + cn.afterturn + easypoi-spring-boot-starter + + + + + com.antherd + sm-crypto + + + + + com.alibaba + easyexcel + + + + diff --git a/nl-system/src/main/java/org/nl/NlSystemApplication.java b/nl-system/src/main/java/org/nl/NlSystemApplication.java new file mode 100644 index 0000000..c885a9a --- /dev/null +++ b/nl-system/src/main/java/org/nl/NlSystemApplication.java @@ -0,0 +1,13 @@ +package org.nl; + +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; + +@SpringBootApplication +public class NlSystemApplication { + + public static void main(String[] args) { + SpringApplication.run(NlSystemApplication.class, args); + } + +} diff --git a/nl-web-app/pom.xml b/nl-web-app/pom.xml index 096e114..135366a 100644 --- a/nl-web-app/pom.xml +++ b/nl-web-app/pom.xml @@ -35,47 +35,12 @@ com.baomidou dynamic-datasource-spring-boot3-starter - com.mysql mysql-connector-j - - - - - - - - - - - - - - - - org.nl @@ -83,6 +48,12 @@ + + org.nl + nl-agv + 0.0.1-SNAPSHOT + + org.nl nl-plugin-biz diff --git a/nl-web-app/src/main/java/org/nl/core/config/GlobalConfigure.java b/nl-web-app/src/main/java/org/nl/core/config/GlobalConfigure.java index 8707f80..75d55bf 100644 --- a/nl-web-app/src/main/java/org/nl/core/config/GlobalConfigure.java +++ b/nl-web-app/src/main/java/org/nl/core/config/GlobalConfigure.java @@ -107,7 +107,9 @@ public class GlobalConfigure implements WebMvcConfigurer { public static final String[] NO_LOGIN_PATH_ARR = { /* 主入口 */ "/", - + /*AGV*/ + "/api/agv/status", + "/api/language/**", /* 静态资源 */ "/favicon.ico", "/doc.html", diff --git a/nl-web-app/src/main/resources/application.yml b/nl-web-app/src/main/resources/application.yml index b9b085e..5718a8c 100644 --- a/nl-web-app/src/main/resources/application.yml +++ b/nl-web-app/src/main/resources/application.yml @@ -158,34 +158,9 @@ snowy: common: front-url: "http://localhost:81" backend-url: "http://localhost:82" - -# 其他数据库配置已注释，如有需要请取消注释并调整 -# spring.datasource.dynamic.datasource.master.driver-class-name=org.postgresql.Driver -# spring.datasource.dynamic.datasource.master.url=jdbc:postgresql://localhost:5432/snowy -# spring.datasource.dynamic.datasource.master.username=postgres -# spring.datasource.dynamic.datasource.master.password=123456 -# spring.datasource.dynamic.strict=true -# -# spring.datasource.dynamic.datasource.master.driver-class-name=oracle.jdbc.OracleDriver -# spring.datasource.dynamic.datasource.master.url=jdbc:oracle:thin:@//127.0.0.1:1521/XE?remarksReporting=true -# spring.datasource.dynamic.datasource.master.username=SNOWY -# spring.datasource.dynamic.datasource.master.password=12345678 -# spring.datasource.dynamic.strict=true -# -# spring.datasource.dynamic.datasource.master.driver-class-name=com.microsoft.sqlserver.jdbc.SQLServerDriver -# spring.datasource.dynamic.datasource.master.url=jdbc:sqlserver://localhost:1433;DatabaseName=SNOWY -# spring.datasource.dynamic.datasource.master.username=sa -# spring.datasource.dynamic.datasource.master.password=123456 -# spring.datasource.dynamic.strict=true -# -# spring.datasource.dynamic.datasource.master.driver-class-name=dm.jdbc.driver.DmDriver -# spring.datasource.dynamic.datasource.master.url=jdbc:dm://localhost:5236/SYSDBA -# spring.datasource.dynamic.datasource.master.username=SYSDBA -# spring.datasource.dynamic.datasource.master.password=SYSDBA -# spring.datasource.dynamic.strict=true -# -# spring.datasource.dynamic.datasource.master.driver-class-name=com.kingbase8.Driver -# spring.datasource.dynamic.datasource.master.url=jdbc:kingbase8://localhost:54321/snowy -# spring.datasource.dynamic.datasource.master.username=SYSTEM -# spring.datasource.dynamic.datasource.master.password=123456 -# spring.datasource.dynamic.strict=true +i18n: + location: D:/i18n + supported-languages: + - zh + - vi + fallback-to-classpath: true diff --git a/nl-web-app/src/main/resources/logback-spring.xml b/nl-web-app/src/main/resources/logback-spring.xml index a15d9ab..f703308 100644 --- a/nl-web-app/src/main/resources/logback-spring.xml +++ b/nl-web-app/src/main/resources/logback-spring.xml @@ -107,7 +107,7 @@ - + diff --git a/pom.xml b/pom.xml index abc4709..61e6c18 100644 --- a/pom.xml +++ b/pom.xml @@ -28,7 +28,10 @@ nl-common - + + nl-agv + + nl-system nl-plugin @@ -247,7 +250,17 @@ sm-crypto 0.3.2 - + + nl.sdk + sdk-all + 1.0.5-spring3.0 + pom + + + nl.sdk + language + 1.0.5-spring3.0 + com.alibaba @@ -318,12 +331,12 @@ 5.6.199 - - - com.aliyun.oss - aliyun-sdk-oss - 3.15.1 - + + + + + + @@ -339,12 +352,12 @@ 1.5.4 - - - com.aliyun - dm20151123 - 1.0.6 - + + + + + + @@ -353,12 +366,12 @@ 3.1.944 - - - com.aliyun - dysmsapi20170525 - 2.0.24 - + + + + + +