修改: 移除 BaseService 中的冗余search_path 设置代码并更新 redkale 依赖版本
This commit is contained in:
parent
92c009cde6
commit
4fd53fe434
2
pom.xml
2
pom.xml
@ -25,7 +25,7 @@
|
|||||||
<dependency>
|
<dependency>
|
||||||
<groupId>org.redkale</groupId>
|
<groupId>org.redkale</groupId>
|
||||||
<artifactId>redkale</artifactId>
|
<artifactId>redkale</artifactId>
|
||||||
<version>2.2.0</version>
|
<version>2.2.250620</version>
|
||||||
</dependency>
|
</dependency>
|
||||||
|
|
||||||
<dependency>
|
<dependency>
|
||||||
|
@ -1,19 +1,15 @@
|
|||||||
package com.zchd.base;
|
package com.zchd.base;
|
||||||
|
|
||||||
import com.zchd.base.util.Utils;
|
|
||||||
import net.tccn.zhub.ZHubClient;
|
import net.tccn.zhub.ZHubClient;
|
||||||
import org.redkale.convert.json.JsonConvert;
|
import org.redkale.convert.json.JsonConvert;
|
||||||
import org.redkale.service.AbstractService;
|
import org.redkale.service.AbstractService;
|
||||||
import org.redkale.service.RetResult;
|
import org.redkale.service.RetResult;
|
||||||
import org.redkale.source.DataJdbcSource;
|
|
||||||
import org.redkale.source.DataSource;
|
import org.redkale.source.DataSource;
|
||||||
import org.redkale.source.PoolSource;
|
|
||||||
import org.redkale.util.AnyValue;
|
import org.redkale.util.AnyValue;
|
||||||
import org.redkale.util.Sheet;
|
import org.redkale.util.Sheet;
|
||||||
|
|
||||||
import javax.annotation.Resource;
|
import javax.annotation.Resource;
|
||||||
import java.io.File;
|
import java.io.File;
|
||||||
import java.sql.Connection;
|
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
import java.util.logging.Logger;
|
import java.util.logging.Logger;
|
||||||
|
|
||||||
@ -48,7 +44,7 @@ public class BaseService extends AbstractService {
|
|||||||
@Override
|
@Override
|
||||||
public void init(AnyValue config) {
|
public void init(AnyValue config) {
|
||||||
|
|
||||||
PoolSource<Connection> source = ((DataJdbcSource) zimSource).getReadPoolSource();
|
/*PoolSource<Connection> source = ((DataJdbcSource) zimSource).getReadPoolSource();
|
||||||
// postgresql 设置当前schema
|
// postgresql 设置当前schema
|
||||||
if ("postgresql".equals(source.getDbtype())) {
|
if ("postgresql".equals(source.getDbtype())) {
|
||||||
String url = source.getUrl();
|
String url = source.getUrl();
|
||||||
@ -57,7 +53,7 @@ public class BaseService extends AbstractService {
|
|||||||
schema = "public";
|
schema = "public";
|
||||||
}
|
}
|
||||||
((DataJdbcSource) zimSource).directExecute(String.format("SET search_path TO %s;", schema));
|
((DataJdbcSource) zimSource).directExecute(String.format("SET search_path TO %s;", schema));
|
||||||
}
|
}*/
|
||||||
}
|
}
|
||||||
|
|
||||||
protected RetResult retError(String info) {
|
protected RetResult retError(String info) {
|
||||||
@ -74,7 +70,7 @@ public class BaseService extends AbstractService {
|
|||||||
* @param url
|
* @param url
|
||||||
* @return
|
* @return
|
||||||
*/
|
*/
|
||||||
protected String getCurrentSchema(String url) {
|
/*protected String getCurrentSchema(String url) {
|
||||||
String[] arr = url.split("currentSchema=");
|
String[] arr = url.split("currentSchema=");
|
||||||
if (arr.length > 1) {
|
if (arr.length > 1) {
|
||||||
String[] arr2 = arr[1].split("&");
|
String[] arr2 = arr[1].split("&");
|
||||||
@ -83,5 +79,5 @@ public class BaseService extends AbstractService {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
return "";
|
return "";
|
||||||
}
|
}*/
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user