修正了一部分错误。
This commit is contained in:
parent
edcdfd3bf1
commit
c84df1d80c
@ -1274,7 +1274,7 @@ public class DatasourceServer implements DatasourceApi {
|
|||||||
private Method getMethod(String dsType, String methodName, Class<?> classes) {
|
private Method getMethod(String dsType, String methodName, Class<?> classes) {
|
||||||
Method method = null;
|
Method method = null;
|
||||||
try {
|
try {
|
||||||
String ClassName = "io.dataease.datasource.provider.ApiUtils";
|
String ClassName = "io.gisbi.datasource.provider.ApiUtils";
|
||||||
if (!dsType.equals(DatasourceConfiguration.DatasourceType.API.name())) {
|
if (!dsType.equals(DatasourceConfiguration.DatasourceType.API.name())) {
|
||||||
Provider provider = ProviderFactory.getProvider(dsType);
|
Provider provider = ProviderFactory.getProvider(dsType);
|
||||||
method = provider.getClass().getMethod(methodName, classes);
|
method = provider.getClass().getMethod(methodName, classes);
|
||||||
|
@ -16,10 +16,10 @@ public class EhCacheStartListener implements ApplicationContextInitializer<Confi
|
|||||||
Resource resource = new ClassPathResource("application.yml");
|
Resource resource = new ClassPathResource("application.yml");
|
||||||
YamlPropertiesFactoryBean factory = new YamlPropertiesFactoryBean();
|
YamlPropertiesFactoryBean factory = new YamlPropertiesFactoryBean();
|
||||||
factory.setResources(resource);
|
factory.setResources(resource);
|
||||||
String property = Objects.requireNonNull(factory.getObject()).getProperty("dataease.login_timeout", "480");
|
String property = Objects.requireNonNull(factory.getObject()).getProperty("gisbi.login_timeout", "480");
|
||||||
System.setProperty("dataease.login_timeout", property);
|
System.setProperty("gisbi.login_timeout", property);
|
||||||
|
|
||||||
String ehcache = ConfigUtils.getConfig("dataease.path.ehcache", "/opt/dataease2.0/cache");
|
String ehcache = ConfigUtils.getConfig("gisbi.path.ehcache", "/opt/gisbi/cache");
|
||||||
System.setProperty("dataease.path.ehcache", ehcache);
|
System.setProperty("gisbi.path.ehcache", ehcache);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -41,7 +41,7 @@ public class DeLinkAop {
|
|||||||
@Resource
|
@Resource
|
||||||
private XpackShareManage xpackShareManage;
|
private XpackShareManage xpackShareManage;
|
||||||
|
|
||||||
@Around(value = "@annotation(io.dataease.auth.DeLinkPermit)")
|
@Around(value = "@annotation(io.gisbi.auth.DeLinkPermit)")
|
||||||
public Object logAround(ProceedingJoinPoint point) throws Throwable {
|
public Object logAround(ProceedingJoinPoint point) throws Throwable {
|
||||||
Object[] params = point.getArgs();
|
Object[] params = point.getArgs();
|
||||||
String linkToken = ServletUtils.getHead(AuthConstant.LINK_TOKEN_KEY);
|
String linkToken = ServletUtils.getHead(AuthConstant.LINK_TOKEN_KEY);
|
||||||
|
@ -1,8 +1,8 @@
|
|||||||
package io.gisbi.substitute.permissions.auth;
|
package io.gisbi.substitute.permissions.auth;
|
||||||
|
|
||||||
/*import io.dataease.api.permissions.auth.api.AuthApi;
|
/*import io.gisbi.api.permissions.auth.api.AuthApi;
|
||||||
import io.dataease.api.permissions.dto.AuthDTO;
|
import io.gisbi.api.permissions.dto.AuthDTO;
|
||||||
import io.dataease.api.permissions.request.AuthRequest;
|
import io.gisbi.api.permissions.request.AuthRequest;
|
||||||
import org.springframework.stereotype.Service;
|
import org.springframework.stereotype.Service;
|
||||||
|
|
||||||
*//**
|
*//**
|
||||||
|
@ -18,7 +18,7 @@ public class WSTrigger {
|
|||||||
@Autowired
|
@Autowired
|
||||||
private WsService wsService;
|
private WsService wsService;
|
||||||
|
|
||||||
@AfterReturning(value = "execution(* io.dataease.service.message.service.strategy.SendStation.sendMsg(..))")
|
@AfterReturning(value = "execution(* io.gisbi.service.message.service.strategy.SendStation.sendMsg(..))")
|
||||||
public void after(JoinPoint point) {
|
public void after(JoinPoint point) {
|
||||||
Object[] args = point.getArgs();
|
Object[] args = point.getArgs();
|
||||||
Optional.ofNullable(args).ifPresent(objs -> {
|
Optional.ofNullable(args).ifPresent(objs -> {
|
||||||
|
@ -54,4 +54,4 @@ CREATE TABLE `xpack_platform_token`
|
|||||||
|
|
||||||
|
|
||||||
|
|
||||||
UPDATE `QRTZ_JOB_DETAILS` SET `JOB_CLASS_NAME` = 'io.dataease.job.schedule.CheckDsStatusJob' WHERE (`SCHED_NAME` = 'deSyncJob') and (`JOB_NAME` = 'Datasource') and (`JOB_GROUP` = 'check_status');
|
UPDATE `QRTZ_JOB_DETAILS` SET `JOB_CLASS_NAME` = 'io.gisbi.job.schedule.CheckDsStatusJob' WHERE (`SCHED_NAME` = 'deSyncJob') and (`JOB_NAME` = 'Datasource') and (`JOB_GROUP` = 'check_status');
|
||||||
|
@ -78,10 +78,6 @@
|
|||||||
<value-type>java.util.List</value-type>
|
<value-type>java.util.List</value-type>
|
||||||
</cache>
|
</cache>
|
||||||
|
|
||||||
<cache alias="de_v2_lic_cache_result" uses-template="common-cache">
|
|
||||||
<key-type>java.lang.String</key-type>
|
|
||||||
<value-type>io.gisbi.license.bo.F2CLicResult</value-type>
|
|
||||||
</cache>
|
|
||||||
<cache alias="de_v2_world_map" uses-template="common-cache">
|
<cache alias="de_v2_world_map" uses-template="common-cache">
|
||||||
<key-type>java.lang.String</key-type>
|
<key-type>java.lang.String</key-type>
|
||||||
<value-type>io.gisbi.api.map.vo.AreaNode</value-type>
|
<value-type>io.gisbi.api.map.vo.AreaNode</value-type>
|
||||||
|
@ -76,6 +76,10 @@ public class TokenFilter implements Filter {
|
|||||||
filterChain.doFilter(servletRequest, servletResponse);
|
filterChain.doFilter(servletRequest, servletResponse);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
if (requestURI.startsWith("/swagger") || requestURI.startsWith("/v3/api-docs")) {
|
||||||
|
filterChain.doFilter(servletRequest, servletResponse);
|
||||||
|
return;
|
||||||
|
}
|
||||||
String token = ServletUtils.getToken();
|
String token = ServletUtils.getToken();
|
||||||
TokenUserBO userBO = TokenUtils.validate(token);
|
TokenUserBO userBO = TokenUtils.validate(token);
|
||||||
UserUtils.setUserInfo(userBO);
|
UserUtils.setUserInfo(userBO);
|
||||||
|
Loading…
Reference in New Issue
Block a user