提升基础框架兼容性
Change-Id: I71e2538433b727d37b50424158b6f91424bd2567
diff --git a/.vscode/settings.json b/.vscode/settings.json
index 3541dcd..e5c786f 100644
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -6,5 +6,16 @@
"**/.factorypath": true
},
"java.compile.nullAnalysis.mode": "automatic",
- "java.configuration.updateBuildConfiguration": "interactive"
+ "java.configuration.updateBuildConfiguration": "interactive",
+ "editor.gotoLocation.alternativeDeclarationCommand": "editor.action.revealDefinition",
+ "editor.gotoLocation.alternativeDefinitionCommand": "editor.action.revealDefinition",
+ "editor.gotoLocation.alternativeTypeDefinitionCommand": "editor.action.revealDefinition",
+ "editor.selectionHighlight": false,
+ "files.autoSave": "onFocusChange",
+ "editor.suggest.snippetsPreventQuickSuggestions": false,
+ "editor.quickSuggestions": {
+ "other": "on",
+ "comments": "off",
+ "strings": "on"
+ }
}
\ No newline at end of file
diff --git a/bash.exe.stackdump b/bash.exe.stackdump
new file mode 100644
index 0000000..4600a29
--- /dev/null
+++ b/bash.exe.stackdump
@@ -0,0 +1,28 @@
+Stack trace:
+Frame Function Args
+0007FFFF3460 00021005FEBA (000210285F48, 00021026AB6E, 000000000000, 0007FFFF2360) msys-2.0.dll+0x1FEBA
+0007FFFF3460 0002100467F9 (000000000000, 000000000000, 000000000000, 0007FFFF3738) msys-2.0.dll+0x67F9
+0007FFFF3460 000210046832 (000210285FF9, 0007FFFF3318, 000000000000, 000000000000) msys-2.0.dll+0x6832
+0007FFFF3460 000210068F86 (000000000000, 000000000000, 000000000000, 000000000000) msys-2.0.dll+0x28F86
+0007FFFF3460 0002100690B4 (0007FFFF3470, 000000000000, 000000000000, 000000000000) msys-2.0.dll+0x290B4
+0007FFFF3740 00021006A49D (0007FFFF3470, 000000000000, 000000000000, 000000000000) msys-2.0.dll+0x2A49D
+End of stack trace
+Loaded modules:
+000100400000 bash.exe
+7FF9FCB60000 ntdll.dll
+7FF9FB430000 KERNEL32.DLL
+7FF9FA180000 KERNELBASE.dll
+7FF9FC950000 USER32.dll
+7FF9F9EB0000 win32u.dll
+7FF9FB720000 GDI32.dll
+7FF9FA550000 gdi32full.dll
+7FF9FA810000 msvcp_win.dll
+7FF9F9D60000 ucrtbase.dll
+000210040000 msys-2.0.dll
+7FF9FC890000 advapi32.dll
+7FF9FB170000 msvcrt.dll
+7FF9FB010000 sechost.dll
+7FF9FC120000 RPCRT4.dll
+7FF9F94E0000 CRYPTBASE.DLL
+7FF9FA0E0000 bcryptPrimitives.dll
+7FF9FB520000 IMM32.DLL
diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/RedisConfig.java b/ruoyi-framework/src/main/java/com/ruoyi/framework/config/RedisConfig.java
index 3453237..f4d74e9 100644
--- a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/RedisConfig.java
+++ b/ruoyi-framework/src/main/java/com/ruoyi/framework/config/RedisConfig.java
@@ -4,6 +4,7 @@
import org.springframework.cache.annotation.EnableCaching;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.Primary;
import org.springframework.data.redis.connection.RedisConnectionFactory;
import org.springframework.data.redis.core.RedisTemplate;
import org.springframework.data.redis.core.script.DefaultRedisScript;
@@ -21,6 +22,7 @@
{
@Bean
@SuppressWarnings(value = { "unchecked", "rawtypes" })
+ @Primary
public RedisTemplate<Object, Object> redisTemplate(RedisConnectionFactory connectionFactory)
{
RedisTemplate<Object, Object> template = new RedisTemplate<>();