diff --git a/mall-ebtp-cloud-jpa-starter/pom.xml b/mall-ebtp-cloud-jpa-starter/pom.xml index 0493123..7965315 100644 --- a/mall-ebtp-cloud-jpa-starter/pom.xml +++ b/mall-ebtp-cloud-jpa-starter/pom.xml @@ -7,13 +7,13 @@ com.chinaunicom.ebtp mall-ebtp-cloud-parent - 2.3.1-SNAPSHOT + 2.4.1-zyhy-SNAPSHOT ../mall-ebtp-cloud-parent com.chinaunicom.ebtp mall-ebtp-cloud-jpa-starter - 2.3.1-SNAPSHOT + 2.4.1-zyhy-SNAPSHOT mall-ebtp-cloud-jpa-starter diff --git a/mall-ebtp-cloud-kafka-starter/pom.xml b/mall-ebtp-cloud-kafka-starter/pom.xml index 4cbfc51..83a1398 100644 --- a/mall-ebtp-cloud-kafka-starter/pom.xml +++ b/mall-ebtp-cloud-kafka-starter/pom.xml @@ -8,13 +8,13 @@ com.chinaunicom.ebtp mall-ebtp-cloud-parent - 2.3.1-SNAPSHOT + 2.4.1-zyhy-SNAPSHOT ../mall-ebtp-cloud-parent com.chinaunicom.ebtp mall-ebtp-cloud-kafka-starter - 2.3.1-SNAPSHOT + 2.4.1-zyhy-SNAPSHOT mall-ebtp-cloud-kafka-starter @@ -49,4 +49,4 @@ - \ No newline at end of file + diff --git a/mall-ebtp-cloud-parent/pom.xml b/mall-ebtp-cloud-parent/pom.xml index 04c018b..bc2b943 100644 --- a/mall-ebtp-cloud-parent/pom.xml +++ b/mall-ebtp-cloud-parent/pom.xml @@ -7,39 +7,39 @@ com.chinaunicom.ebtp mall-ebtp-cloud - 2.3.1-SNAPSHOT + 2.4.1-zyhy-SNAPSHOT com.chinaunicom.ebtp mall-ebtp-cloud-parent - 2.3.1-SNAPSHOT + 2.4.1-zyhy-SNAPSHOT pom mall-ebtp-cloud-parent - 9.0.93 + 9.0.64 com.chinaunicom.ebtp mall-ebtp-cloud-jpa-starter - 2.3.1-SNAPSHOT + 2.4.1-zyhy-SNAPSHOT com.chinaunicom.ebtp mall-ebtp-cloud-kafka-starter - 2.3.1-SNAPSHOT + 2.4.1-zyhy-SNAPSHOT com.chinaunicom.mall.ebtp uboot-common - 2.3.1-SNAPSHOT + 2.4.1-zyhy-SNAPSHOT com.chinaunicom.mall.ebtp uboot-core - 2.3.1-SNAPSHOT + 2.4.1-zyhy-SNAPSHOT @@ -48,26 +48,6 @@ org.springframework.boot spring-boot-starter-web - - - org.apache.tomcat.embed - tomcat-embed-core - - - org.apache.tomcat.embed - tomcat-embed-websocket - - - - - org.apache.tomcat.embed - tomcat-embed-core - 9.0.93 - - - org.apache.tomcat.embed - tomcat-embed-websocket - 9.0.93 org.springframework.boot diff --git a/pom.xml b/pom.xml index aaed363..56a97ab 100644 --- a/pom.xml +++ b/pom.xml @@ -13,7 +13,7 @@ com.chinaunicom.ebtp mall-ebtp-cloud - 2.3.1-SNAPSHOT + 2.4.1-zyhy-SNAPSHOT pom mall-ebtp-cloud @@ -42,7 +42,7 @@ 4.1.2 3.1.0 3.11.4 - 9.0.93 + 9.0.64 @@ -410,4 +410,4 @@ - \ No newline at end of file + diff --git a/uboot-common/pom.xml b/uboot-common/pom.xml index e6a7687..c309f9a 100644 --- a/uboot-common/pom.xml +++ b/uboot-common/pom.xml @@ -6,13 +6,13 @@ com.chinaunicom.ebtp mall-ebtp-cloud-parent - 2.3.1-SNAPSHOT + 2.4.1-zyhy-SNAPSHOT ../mall-ebtp-cloud-parent com.chinaunicom.mall.ebtp uboot-common - 2.3.1-SNAPSHOT + 2.4.1-zyhy-SNAPSHOT uboot-common @@ -181,11 +181,11 @@ - - com.github.ulisesbocchio - jasypt-spring-boot-starter - 3.0.2 - + + + + + diff --git a/uboot-common/src/main/java/com/chinaunicom/mall/ebtp/cloud/jasypt/starter/JasyptStarterConfiguration.java b/uboot-common/src/main/java/com/chinaunicom/mall/ebtp/cloud/jasypt/starter/JasyptStarterConfiguration.java index 4f63329..4d62746 100644 --- a/uboot-common/src/main/java/com/chinaunicom/mall/ebtp/cloud/jasypt/starter/JasyptStarterConfiguration.java +++ b/uboot-common/src/main/java/com/chinaunicom/mall/ebtp/cloud/jasypt/starter/JasyptStarterConfiguration.java @@ -1,73 +1,32 @@ -package com.chinaunicom.mall.ebtp.cloud.jasypt.starter; - - -import org.jasypt.encryption.StringEncryptor; -import org.jasypt.encryption.pbe.PooledPBEStringEncryptor; -import org.jasypt.encryption.pbe.config.SimpleStringPBEConfig; -import org.springframework.context.annotation.Bean; -import org.springframework.context.annotation.Configuration; - -@Configuration -public class JasyptStarterConfiguration { - - @Bean( name = "stringEncryptor" ) - public StringEncryptor stringEncryptor() { - - PooledPBEStringEncryptor encryptor = new PooledPBEStringEncryptor(); - - SimpleStringPBEConfig config = new SimpleStringPBEConfig(); - config.setPassword("uniom-ebtp"); - config.setAlgorithm("PBEWITHHMACSHA512ANDAES_256"); - config.setKeyObtentionIterations("1000"); - config.setPoolSize("1"); - config.setProviderName("SunJCE"); - config.setSaltGeneratorClassName("org.jasypt.salt.RandomSaltGenerator"); - config.setIvGeneratorClassName("org.jasypt.iv.RandomIvGenerator"); - config.setStringOutputType("base64"); - encryptor.setConfig(config); - - return encryptor; - } - public static String encryptStr(String encryptStr, String password) { - PooledPBEStringEncryptor encryptor = new PooledPBEStringEncryptor(); - SimpleStringPBEConfig config = new SimpleStringPBEConfig(); - config.setPassword(password); - config.setAlgorithm("PBEWITHHMACSHA512ANDAES_256"); - config.setKeyObtentionIterations("1000"); - config.setPoolSize("1"); - config.setProviderName("SunJCE"); - config.setSaltGeneratorClassName("org.jasypt.salt.RandomSaltGenerator"); - config.setIvGeneratorClassName("org.jasypt.iv.RandomIvGenerator"); - config.setStringOutputType("base64"); - encryptor.setConfig(config); - String enPw = encryptor.encrypt(encryptStr); - System.out.println("加密后:" + enPw); - String decrypt = encryptor.decrypt(enPw); - System.out.println("解密的字符串:" + decrypt); - return enPw; - } - - public static void main(String[] args) { - PooledPBEStringEncryptor encryptor = new PooledPBEStringEncryptor(); - SimpleStringPBEConfig config = new SimpleStringPBEConfig(); - config.setPassword("uniom-ebtp");// unicom uniom-ebtp - config.setAlgorithm("PBEWITHHMACSHA512ANDAES_256");// PBEWithMD5AndDES PBEWITHMD5ANDDES - config.setKeyObtentionIterations("1000"); - config.setPoolSize("1"); - config.setProviderName("SunJCE"); - config.setSaltGeneratorClassName("org.jasypt.salt.RandomSaltGenerator"); - config.setIvGeneratorClassName("org.jasypt.iv.RandomIvGenerator"); - config.setStringOutputType("base64"); - encryptor.setConfig(config); -// String decrypt = encryptor.decrypt("Ecrp94gdEbYqQnnHDq/ILoRM9cs44vT02BvmZMqHaUphaYuAPSciSqM/loGvFcrQMjwXuoMJD6jYSSiycgzcwnav29alP7intVCpiIhM/p6fjYGevVUp0O0H0VpRF0TvSAZjVIndW4g="); -// System.out.println("解密1的字符串:" + decrypt); - String decrypt2 = encryptor.decrypt("OBATzbzsytt8pNrJGHyyfUIMhatPdUmpLrRHYICtkm/XiJRUrOvrVfcBNlylIreI"); - System.out.println("解密2的字符串:" + decrypt2); -// String decrypt3 = encryptor.decrypt("OBATzbzsytt8pNrJGHyyfUIMhatPdUmpLrRHYICtkm/XiJRUrOvrVfcBNlylIreI"); -// System.out.println("解密3的字符串:" + decrypt3); - //JasyptStarterConfiguration.encryptStr("org.apache.kafka.common.security.scram.ScramLoginModule required username=\"kafka-gjgs\" password=\"Gjgs#2023\";","uniom-ebtp"); - //JasyptStarterConfiguration.encryptStr("7i6O36#eol8!","uniom-ebtp"); - //JasyptStarterConfiguration.encryptStr("hzfsftpuser","uniom-ebtp"); - - } -} +//package com.chinaunicom.mall.ebtp.cloud.jasypt.starter; +// +// +//import org.jasypt.encryption.StringEncryptor; +//import org.jasypt.encryption.pbe.PooledPBEStringEncryptor; +//import org.jasypt.encryption.pbe.config.SimpleStringPBEConfig; +//import org.springframework.context.annotation.Bean; +//import org.springframework.context.annotation.Configuration; +// +//@Configuration +//public class JasyptStarterConfiguration { +// +// @Bean( name = "stringEncryptor" ) +// public StringEncryptor stringEncryptor() { +// +// PooledPBEStringEncryptor encryptor = new PooledPBEStringEncryptor(); +// +// SimpleStringPBEConfig config = new SimpleStringPBEConfig(); +// config.setPassword("uniom-ebtp"); +// config.setAlgorithm("PBEWITHHMACSHA512ANDAES_256"); +// config.setKeyObtentionIterations("1000"); +// config.setPoolSize("1"); +// config.setProviderName("SunJCE"); +// config.setSaltGeneratorClassName("org.jasypt.salt.RandomSaltGenerator"); +// config.setIvGeneratorClassName("org.jasypt.iv.RandomIvGenerator"); +// config.setStringOutputType("base64"); +// encryptor.setConfig(config); +// +// return encryptor; +// } +// +//} diff --git a/uboot-common/src/main/java/com/chinaunicom/mall/ebtp/cloud/jasypt/starter/util/JasyptUtil.java b/uboot-common/src/main/java/com/chinaunicom/mall/ebtp/cloud/jasypt/starter/util/JasyptUtil.java index cd290e9..73cb9ca 100644 --- a/uboot-common/src/main/java/com/chinaunicom/mall/ebtp/cloud/jasypt/starter/util/JasyptUtil.java +++ b/uboot-common/src/main/java/com/chinaunicom/mall/ebtp/cloud/jasypt/starter/util/JasyptUtil.java @@ -1,35 +1,35 @@ -package com.chinaunicom.mall.ebtp.cloud.jasypt.starter.util; - -import org.jasypt.encryption.pbe.PooledPBEStringEncryptor; -import org.jasypt.encryption.pbe.config.SimpleStringPBEConfig; - -public class JasyptUtil { - - - public static String encryptStr(String encryptStr, String password) { - PooledPBEStringEncryptor encryptor = new PooledPBEStringEncryptor(); - - SimpleStringPBEConfig config = new SimpleStringPBEConfig(); - config.setPassword(password); - config.setAlgorithm("PBEWITHHMACSHA512ANDAES_256"); - config.setKeyObtentionIterations("1000"); - config.setPoolSize("1"); - config.setProviderName("SunJCE"); - config.setSaltGeneratorClassName("org.jasypt.salt.RandomSaltGenerator"); - config.setIvGeneratorClassName("org.jasypt.iv.RandomIvGenerator"); - config.setStringOutputType("base64"); - encryptor.setConfig(config); - - String enPw = encryptor.encrypt(encryptStr); - System.out.println("加密后:" + enPw); - String decrypt = encryptor.decrypt(enPw); - System.out.println("解密的字符串:" + decrypt); - return enPw; - - } - - public static void main(String[] args) { - JasyptUtil.encryptStr("Eshop@2021","uniom-ebtp"); - } - -} +//package com.chinaunicom.mall.ebtp.cloud.jasypt.starter.util; +// +//import org.jasypt.encryption.pbe.PooledPBEStringEncryptor; +//import org.jasypt.encryption.pbe.config.SimpleStringPBEConfig; +// +//public class JasyptUtil { +// +// +// public static String encryptStr(String encryptStr, String password) { +// PooledPBEStringEncryptor encryptor = new PooledPBEStringEncryptor(); +// +// SimpleStringPBEConfig config = new SimpleStringPBEConfig(); +// config.setPassword(password); +// config.setAlgorithm("PBEWITHHMACSHA512ANDAES_256"); +// config.setKeyObtentionIterations("1000"); +// config.setPoolSize("1"); +// config.setProviderName("SunJCE"); +// config.setSaltGeneratorClassName("org.jasypt.salt.RandomSaltGenerator"); +// config.setIvGeneratorClassName("org.jasypt.iv.RandomIvGenerator"); +// config.setStringOutputType("base64"); +// encryptor.setConfig(config); +// +// String enPw = encryptor.encrypt(encryptStr); +// System.out.println("加密后:" + enPw); +// String decrypt = encryptor.decrypt(enPw); +// System.out.println("解密的字符串:" + decrypt); +// return enPw; +// +// } +// +// public static void main(String[] args) { +// JasyptUtil.encryptStr("Eshop@2021","uniom-ebtp"); +// } +// +//} diff --git a/uboot-common/src/main/java/com/chinaunicom/mall/ebtp/cloud/security/starter/common/ParameterRequestWrapper.java b/uboot-common/src/main/java/com/chinaunicom/mall/ebtp/cloud/security/starter/common/ParameterRequestWrapper.java index 3fcffd3..5bec701 100644 --- a/uboot-common/src/main/java/com/chinaunicom/mall/ebtp/cloud/security/starter/common/ParameterRequestWrapper.java +++ b/uboot-common/src/main/java/com/chinaunicom/mall/ebtp/cloud/security/starter/common/ParameterRequestWrapper.java @@ -2,7 +2,7 @@ package com.chinaunicom.mall.ebtp.cloud.security.starter.common; import com.alibaba.fastjson.JSONObject; import lombok.extern.slf4j.Slf4j; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import javax.servlet.ReadListener; import javax.servlet.ServletInputStream; diff --git a/uboot-core/pom.xml b/uboot-core/pom.xml index 97d1252..f2c98c2 100644 --- a/uboot-core/pom.xml +++ b/uboot-core/pom.xml @@ -6,13 +6,13 @@ com.chinaunicom.ebtp mall-ebtp-cloud-parent - 2.3.1-SNAPSHOT + 2.4.1-zyhy-SNAPSHOT ../mall-ebtp-cloud-parent com.chinaunicom.mall.ebtp uboot-core - 2.3.1-SNAPSHOT + 2.4.1-zyhy-SNAPSHOT uboot-core @@ -20,7 +20,7 @@ com.chinaunicom.mall.ebtp uboot-common - 2.3.1-SNAPSHOT + 2.4.1-zyhy-SNAPSHOT @@ -48,4 +48,4 @@ - \ No newline at end of file +