diff --git a/bonus-common-biz/pom.xml b/bonus-common-biz/pom.xml index 617d37d..efa8a0b 100644 --- a/bonus-common-biz/pom.xml +++ b/bonus-common-biz/pom.xml @@ -17,13 +17,6 @@ - - - com.ahsbd - sms-util - 1.0 - - org.springframework.cloud diff --git a/bonus-modules/bonus-material-mall/pom.xml b/bonus-modules/bonus-material-mall/pom.xml index 10199f1..d6374ba 100644 --- a/bonus-modules/bonus-material-mall/pom.xml +++ b/bonus-modules/bonus-material-mall/pom.xml @@ -17,6 +17,13 @@ + + + com.ah.sbd + sms-util + 1.0 + + com.github.ulisesbocchio @@ -117,6 +124,12 @@ poi-ooxml 5.2.3 + + cn.hutool + hutool-all + 5.8.24 + compile + diff --git a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/BonusMaterialMallApplication.java b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/BonusMaterialMallApplication.java index 8f561c9..52ace52 100644 --- a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/BonusMaterialMallApplication.java +++ b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/BonusMaterialMallApplication.java @@ -23,7 +23,7 @@ public class BonusMaterialMallApplication public static void main(String[] args) { SpringApplication.run(BonusMaterialMallApplication.class, args); - System.out.println("(♥◠‿◠)ノ゙ 2024安徽机械化装备平台启动成功 ლ(´ڡ`ლ)゙ \n" + + System.out.println("(♥◠‿◠)ノ゙ 2024陕西机械化装备平台启动成功 ლ(´ڡ`ლ)゙ \n" + " .-------. ____ __ \n" + " | _ _ \\ \\ \\ / / \n" + " | ( ' ) | \\ _. / ' \n" + diff --git a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/device/service/impl/DevInfoServiceImpl.java b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/device/service/impl/DevInfoServiceImpl.java index 345d334..053a90e 100644 --- a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/device/service/impl/DevInfoServiceImpl.java +++ b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/device/service/impl/DevInfoServiceImpl.java @@ -1,10 +1,8 @@ package com.bonus.material.device.service.impl; import cn.hutool.core.collection.CollectionUtil; -import cn.hutool.core.util.BooleanUtil; import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.PhoneUtil; -import com.alibaba.druid.sql.visitor.functions.If; import com.bonus.common.biz.constant.MaterialConstants; import com.bonus.common.biz.domain.*; import com.bonus.common.biz.enums.HttpCodeEnum; diff --git a/bonus-modules/bonus-material-mall/src/main/resources/bootstrap-material_mall_test.yml b/bonus-modules/bonus-material-mall/src/main/resources/bootstrap-material_mall_test.yml new file mode 100644 index 0000000..0a6de16 --- /dev/null +++ b/bonus-modules/bonus-material-mall/src/main/resources/bootstrap-material_mall_test.yml @@ -0,0 +1,30 @@ +# Tomcat +server: + port: 18589 + +# Spring +spring: + cloud: + nacos: + discovery: + # 服务注册地址 + server-addr: 14.103.246.124:8848 + namespace: material_mall_shanxi + config: + # 配置中心地址 + server-addr: 14.103.246.124:8848 + namespace: material_mall_shanxi + # 配置文件格式 + file-extension: yml + # 共享配置 + shared-configs: + - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension} + +#加密组件 +jasypt: + encryptor: + password: Encrypt + +mybatis: + configuration: + map-underscore-to-camel-case: true \ No newline at end of file diff --git a/bonus-modules/bonus-material-mall/src/main/resources/logback.xml b/bonus-modules/bonus-material-mall/src/main/resources/logback.xml index 7f61f80..506dc3a 100644 --- a/bonus-modules/bonus-material-mall/src/main/resources/logback.xml +++ b/bonus-modules/bonus-material-mall/src/main/resources/logback.xml @@ -1,74 +1,84 @@ - - + + + - + - - + + - ${log.pattern} + %d{HH:mm:ss.SSS} [%thread] %highlight(%-5level) %cyan(%logger{20}) - [%method,%line] - %msg%n - - - ${log.path}/info.log - + + + ${LOG_PATH}/info.log - - ${log.path}/info.%d{yyyy-MM-dd}.log - + ${LOG_PATH}/info.%d{yyyy-MM-dd}.%i.log 60 + + 100MB + - ${log.pattern} + ${LOG_PATTERN} - - + INFO - - ACCEPT - - DENY - - ${log.path}/error.log - + + + ${LOG_PATH}/error.log - - ${log.path}/error.%d{yyyy-MM-dd}.log - + ${LOG_PATH}/error.%d{yyyy-MM-dd}.%i.log 60 + + 100MB + - ${log.pattern} + ${LOG_PATTERN} - - + ERROR - - ACCEPT - - DENY - - - - + + + + 5000 + + 0 + + - - + + 2000 + + 0 + + false + + + + + + + + + + + + + - - - - -