From cd3e5bdd14b9648d6b07a87413edb233be971acf Mon Sep 17 00:00:00 2001 From: Redkale Date: Tue, 12 Jul 2022 09:36:05 +0800 Subject: [PATCH] =?UTF-8?q?=E6=94=AF=E6=8C=81redkale.datasource.xxx=20?= =?UTF-8?q?=E5=92=8C=20redkale.cachesource.xxx=20=E9=85=8D=E7=BD=AE?= =?UTF-8?q?=E6=A0=BC=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/META-INF/persistence-template.xml | 2 +- .../java/META-INF/source-template.properties | 46 +++++++++---------- .../java/org/redkale/boot/Application.java | 6 ++- 3 files changed, 28 insertions(+), 26 deletions(-) diff --git a/src/main/java/META-INF/persistence-template.xml b/src/main/java/META-INF/persistence-template.xml index 3ae2d8f2f..68b0c8e42 100644 --- a/src/main/java/META-INF/persistence-template.xml +++ b/src/main/java/META-INF/persistence-template.xml @@ -1,6 +1,6 @@ diff --git a/src/main/java/META-INF/source-template.properties b/src/main/java/META-INF/source-template.properties index abffc7ed6..248be2027 100644 --- a/src/main/java/META-INF/source-template.properties +++ b/src/main/java/META-INF/source-template.properties @@ -1,50 +1,50 @@ # CacheSource @Resource(name="usersession") # type\u53ef\u4ee5\u4e0d\u7528\u8bbe\u7f6e\uff0c\u6846\u67b6\u4f1a\u6839\u636eurl\u5224\u65ad\u4f7f\u7528\u54ea\u4e2aCacheSource\u5b9e\u73b0\u7c7b -redkale.cachesource[usersession].type = org.redkalex.cache.redis.RedisCacheSource +redkale.cachesource.usersession.type = org.redkalex.cache.redis.RedisCacheSource # \u6700\u5927\u8fde\u63a5\u6570 -redkale.cachesource[usersession].maxconns = 16 +redkale.cachesource.usersession.maxconns = 16 # \u8282\u70b9\u5730\u5740 -redkale.cachesource[usersession].node[0].url = redis://127.0.0.1:6363 +redkale.cachesource.usersession.node[0].url = redis://127.0.0.1:6363 # \u8282\u70b9\u5bc6\u7801 -redkale.cachesource[usersession].node[0].password = 12345678 +redkale.cachesource.usersession.node[0].password = 12345678 # \u8282\u70b9db -redkale.cachesource[usersession].node[0].db = 0 +redkale.cachesource.usersession.node[0].db = 0 #\u7b80\u5316\u5199\u6cd5: \u53ef\u4ee5\u4e0d\u7528.node[0], \u5c06\u53c2\u6570\u90fd\u5408\u5e76\u5230url\u4e2d -redkale.cachesource[usersession].url = redis://user:123456@127.0.0.1:6363?db=0 +redkale.cachesource.usersession.url = redis://user:123456@127.0.0.1:6363?db=0 # DataSource @Resource(name="platf") # type\u53ef\u4ee5\u4e0d\u7528\u8bbe\u7f6e\uff0c\u6846\u67b6\u4f1a\u6839\u636eurl\u5224\u65ad\u4f7f\u7528\u54ea\u4e2aDataSource\u5b9e\u73b0\u7c7b\uff0c\u9ed8\u8ba4\u503c: org.redkale.source.DataJdbcSource -redkale.datasource[platf].type = org.redkale.source.DataJdbcSource +redkale.datasource.platf.type = org.redkale.source.DataJdbcSource # \u662f\u5426\u5f00\u542f\u7f13\u5b58(\u6807\u8bb0\u4e3a@Cacheable\u7684Entity\u7c7b)\uff0c\u503c\u76ee\u524d\u53ea\u652f\u6301\u4e24\u79cd\uff1a ALL: \u6240\u6709\u5f00\u542f\u7f13\u5b58\u3002 NONE: \u5173\u95ed\u6240\u6709\u7f13\u5b58\uff0c \u975eNONE\u5b57\u6837\u7edf\u4e00\u89c6\u4e3aALL -redkale.datasource[platf].cachemode = ALL +redkale.datasource.platf.cachemode = ALL # \u662f\u5426\u81ea\u52a8\u5efa\u8868\u5f53\u8868\u4e0d\u5b58\u5728\u7684\u65f6\u5019\uff0c \u76ee\u524d\u53ea\u652f\u6301mysql\u3001postgres\uff0c \u9ed8\u8ba4\u4e3afalse -redkale.datasource[platf].table-autoddl = false +redkale.datasource.platf.table-autoddl = false # \u7528\u6237 -redkale.datasource[platf].user = root +redkale.datasource.platf.user = root # \u5bc6\u7801 -redkale.datasource[platf].password = 12345678 +redkale.datasource.platf.password = 12345678 # \u591a\u4e2aURL\u7528;\u9694\u5f00\uff0c\u5982\u5206\u5e03\u5f0fSearchSource\u9700\u8981\u914d\u591a\u4e2aURL -redkale.datasource[platf].url = jdbc:mysql://127.0.0.1:3306/platf?allowPublicKeyRetrieval=true&rewriteBatchedStatements=true&serverTimezone=UTC&characterEncoding=utf8 +redkale.datasource.platf.url = jdbc:mysql://127.0.0.1:3306/platf?allowPublicKeyRetrieval=true&rewriteBatchedStatements=true&serverTimezone=UTC&characterEncoding=utf8 # \u6700\u5927\u8fde\u63a5\u6570\uff0c\u9ed8\u8ba4\u503c\uff1aCPU\u6570 -redkale.datasource[platf].maxconns = 16 +redkale.datasource.platf.maxconns = 16 # \u5305\u542b\u7684SQL\u6a21\u677f\uff0c\u76f8\u5f53\u4e8e\u53cd\u5411LIKE\uff0c\u4e0d\u540c\u7684JDBC\u9a71\u52a8\u7684SQL\u8bed\u53e5\u4e0d\u4e00\u6837\uff0cRedkale\u5185\u7f6e\u4e86MySQL\u7684\u8bed\u53e5 -redkale.datasource[platf].contain-sqltemplate = LOCATE(${keystr}, ${column}) > 0 +redkale.datasource.platf.contain-sqltemplate = LOCATE(${keystr}, ${column}) > 0 # \u5305\u542b\u7684SQL\u6a21\u677f\uff0c\u76f8\u5f53\u4e8e\u53cd\u5411LIKE\uff0c\u4e0d\u540c\u7684JDBC\u9a71\u52a8\u7684SQL\u8bed\u53e5\u4e0d\u4e00\u6837\uff0cRedkale\u5185\u7f6e\u4e86MySQL\u7684\u8bed\u53e5 -redkale.datasource[platf].notcontain-sqltemplate = LOCATE(${keystr}, ${column}) = 0 +redkale.datasource.platf.notcontain-sqltemplate = LOCATE(${keystr}, ${column}) = 0 # \u590d\u5236\u8868\u7ed3\u6784\u7684SQL\u6a21\u677f\uff0cRedkale\u5185\u7f6e\u4e86MySQL\u7684\u8bed\u53e5 -redkale.datasource[platf].tablenotexist-sqlstates = 42000;42S02 +redkale.datasource.platf.tablenotexist-sqlstates = 42000;42S02 # \u590d\u5236\u8868\u7ed3\u6784\u7684SQL\u6a21\u677f\uff0cRedkale\u5185\u7f6e\u4e86MySQL\u7684\u8bed\u53e5 -redkale.datasource[platf].tablecopy-sqltemplate = CREATE TABLE IF NOT EXISTS ${newtable} LIKE ${oldtable} +redkale.datasource.platf.tablecopy-sqltemplate = CREATE TABLE IF NOT EXISTS ${newtable} LIKE ${oldtable} # DataSource \u8bfb\u5199\u5206\u79bb -redkale.datasource[platf].read.url = jdbc:mysql://127.0.0.1:3306/platf_r?allowPublicKeyRetrieval=true&rewriteBatchedStatements=true&serverTimezone=UTC&characterEncoding=utf8 -redkale.datasource[platf].read.user = root -redkale.datasource[platf].read.password = 12345678 +redkale.datasource.platf.read.url = jdbc:mysql://127.0.0.1:3306/platf_r?allowPublicKeyRetrieval=true&rewriteBatchedStatements=true&serverTimezone=UTC&characterEncoding=utf8 +redkale.datasource.platf.read.user = root +redkale.datasource.platf.read.password = 12345678 -redkale.datasource[platf].write.url = jdbc:mysql://127.0.0.1:3306/platf_w?allowPublicKeyRetrieval=true&rewriteBatchedStatements=true&serverTimezone=UTC&characterEncoding=utf8 -redkale.datasource[platf].write.user = root -redkale.datasource[platf].write.password = 12345678 \ No newline at end of file +redkale.datasource.platf.write.url = jdbc:mysql://127.0.0.1:3306/platf_w?allowPublicKeyRetrieval=true&rewriteBatchedStatements=true&serverTimezone=UTC&characterEncoding=utf8 +redkale.datasource.platf.write.user = root +redkale.datasource.platf.write.password = 12345678 \ No newline at end of file diff --git a/src/main/java/org/redkale/boot/Application.java b/src/main/java/org/redkale/boot/Application.java index 628dc943b..c11d67ab2 100644 --- a/src/main/java/org/redkale/boot/Application.java +++ b/src/main/java/org/redkale/boot/Application.java @@ -743,7 +743,8 @@ public final class Application { if (key == null || value == null) continue; appProperties.put(key, value); value = replaceValue(value); - if (key.startsWith("redkale.datasource[") || key.startsWith("redkale.cachesource[")) { + if (key.startsWith("redkale.datasource.") || key.startsWith("redkale.datasource[") + || key.startsWith("redkale.cachesource.") || key.startsWith("redkale.cachesource[")) { sourceProperties.put(key, value); } else if (key.startsWith("system.property.")) { String propName = key.substring("system.property.".length()); @@ -772,7 +773,8 @@ public final class Application { if (logger.isLoggable(Level.FINEST)) logger.log(Level.FINEST, "load properties(" + dfload + ") size = " + ps.size()); appProperties.putAll(ps); ps.forEach((x, y) -> { - if (x.toString().startsWith("redkale.datasource[") || x.toString().startsWith("redkale.cachesource[")) { + if (x.toString().startsWith("redkale.datasource.") || x.toString().startsWith("redkale.datasource[") + || x.toString().startsWith("redkale.cachesource.") || x.toString().startsWith("redkale.cachesource[")) { sourceProperties.put(x, replaceValue(y.toString())); } else { resourceFactory.register("property." + x, replaceValue(y.toString()));