ThbTech/gis-bi
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修正了一部分错误。

Browse Source
This commit is contained in:
root 2025-03-03 10:57:00 +08:00
parent edcdfd3bf1
commit c84df1d80c
8 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/core-backend/src/main/java/io/gisbi/datasource/server/DatasourceServer.java
View File

@ -1274,7 +1274,7 @@ public class DatasourceServer implements DatasourceApi {
private Method getMethod(String dsType, String methodName, Class<?> classes) {
Method method = null;
try {
String ClassName = "io.dataease.datasource.provider.ApiUtils";
String ClassName = "io.gisbi.datasource.provider.ApiUtils";
if (!dsType.equals(DatasourceConfiguration.DatasourceType.API.name())) {
Provider provider = ProviderFactory.getProvider(dsType);
method = provider.getClass().getMethod(methodName, classes);

8
core/core-backend/src/main/java/io/gisbi/listener/EhCacheStartListener.java
View File

@ -16,10 +16,10 @@ public class EhCacheStartListener implements ApplicationContextInitializer<Confi
Resource resource = new ClassPathResource("application.yml");
YamlPropertiesFactoryBean factory = new YamlPropertiesFactoryBean();
factory.setResources(resource);
String property = Objects.requireNonNull(factory.getObject()).getProperty("dataease.login_timeout", "480");
System.setProperty("dataease.login_timeout", property);
String property = Objects.requireNonNull(factory.getObject()).getProperty("gisbi.login_timeout", "480");
System.setProperty("gisbi.login_timeout", property);
String ehcache = ConfigUtils.getConfig("dataease.path.ehcache", "/opt/dataease2.0/cache");
System.setProperty("dataease.path.ehcache", ehcache);
String ehcache = ConfigUtils.getConfig("gisbi.path.ehcache", "/opt/gisbi/cache");
System.setProperty("gisbi.path.ehcache", ehcache);
}
}

2
core/core-backend/src/main/java/io/gisbi/share/interceptor/DeLinkAop.java
View File

@ -41,7 +41,7 @@ public class DeLinkAop {
@Resource
private XpackShareManage xpackShareManage;
@Around(value = "@annotation(io.dataease.auth.DeLinkPermit)")
@Around(value = "@annotation(io.gisbi.auth.DeLinkPermit)")
public Object logAround(ProceedingJoinPoint point) throws Throwable {
Object[] params = point.getArgs();
String linkToken = ServletUtils.getHead(AuthConstant.LINK_TOKEN_KEY);

6
core/core-backend/src/main/java/io/gisbi/substitute/permissions/auth/SubstituleAuthServer.java
View File

@ -1,8 +1,8 @@
package io.gisbi.substitute.permissions.auth;
/*import io.dataease.api.permissions.auth.api.AuthApi;
import io.dataease.api.permissions.dto.AuthDTO;
import io.dataease.api.permissions.request.AuthRequest;
/*import io.gisbi.api.permissions.auth.api.AuthApi;
import io.gisbi.api.permissions.dto.AuthDTO;
import io.gisbi.api.permissions.request.AuthRequest;
import org.springframework.stereotype.Service;
*//**

2
core/core-backend/src/main/java/io/gisbi/websocket/aop/WSTrigger.java
View File

@ -18,7 +18,7 @@ public class WSTrigger {
@Autowired
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) {
Object[] args = point.getArgs();
Optional.ofNullable(args).ifPresent(objs -> {

2
core/core-backend/src/main/resources/db/migration/V2.7__ddl.sql
View File

@ -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');

4
core/core-backend/src/main/resources/ehcache/ehcache.xml
View File

@ -78,10 +78,6 @@
<value-type>java.util.List</value-type>
</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">
<key-type>java.lang.String</key-type>
<value-type>io.gisbi.api.map.vo.AreaNode</value-type>

4
sdk/common/src/main/java/io/gisbi/auth/filter/TokenFilter.java
View File

@ -76,6 +76,10 @@ public class TokenFilter implements Filter {
filterChain.doFilter(servletRequest, servletResponse);
return;
}
if (requestURI.startsWith("/swagger") || requestURI.startsWith("/v3/api-docs")) {
filterChain.doFilter(servletRequest, servletResponse);
return;
}
String token = ServletUtils.getToken();
TokenUserBO userBO = TokenUtils.validate(token);
UserUtils.setUserInfo(userBO);