|
|
@@ -55,7 +55,7 @@ public class MasterManager {
|
|
|
Set<Entry<String, Object>> entrySet = jsonObject.entrySet();
|
|
|
for (Entry<String, Object> entry : entrySet) {
|
|
|
DruidDataSource dataSource = JSONObject.parseObject(entry.getValue().toString(), DruidDataSource.class);
|
|
|
- dataSources.put(entry.getKey(), dataSource);
|
|
|
+ dataSources.put(entry.getKey().toUpperCase(), dataSource);
|
|
|
masters.add(new Master(entry.getKey()));
|
|
|
}
|
|
|
}
|
|
|
@@ -73,6 +73,7 @@ public class MasterManager {
|
|
|
if (StringUtils.isEmpty(userName)) {
|
|
|
return null;
|
|
|
}
|
|
|
+ userName = userName.toUpperCase();
|
|
|
// 需要考虑B2B打印时账套名为B2B/10045740等类似的情况
|
|
|
if (!StringUtils.isEmpty(profile)) {
|
|
|
userName = userName.split("/")[0] + "_" + profile;
|
|
|
@@ -173,6 +174,7 @@ public class MasterManager {
|
|
|
if (StringUtils.isEmpty(userName)) {
|
|
|
return null;
|
|
|
}
|
|
|
+ userName = userName.toUpperCase();
|
|
|
for (Master master : masters) {
|
|
|
if (master.getName().equals(userName)) {
|
|
|
return master;
|