lxm_front/AJ-Report
1
0
Fork 0
mirror of https://gitee.com/anji-plus/report.git synced 2026-03-24 09:48:34 +08:00
Code Issues Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
qianming
2021-07-22 13:51:17 +08:00
parent 1e1f9aa1dc d7625bd2ab
commit fdf1faf5f3
3 changed files with 11 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
report-core/src/main/java/com/anjiplus/template/gaea/business/modules/dataSource/service/impl/DataSourceServiceImpl.java
View File

@@ -96,6 +96,8 @@ public class DataSourceServiceImpl implements DataSourceService {
case JdbcConstants.MYSQL:
case JdbcConstants.KUDU_IMAPLA:
case JdbcConstants.ORACLE:
case JdbcConstants.SQL_SERVER:
case JdbcConstants.JDBC:
testRelationalDb(dto);
break;
case JdbcConstants.HTTP:
@@ -118,6 +120,8 @@ public class DataSourceServiceImpl implements DataSourceService {
case JdbcConstants.MYSQL:
case JdbcConstants.KUDU_IMAPLA:
case JdbcConstants.ORACLE:
case JdbcConstants.SQL_SERVER:
case JdbcConstants.JDBC:
return executeRelationalDb(dto);
case JdbcConstants.HTTP:
return executeHttp(dto);

5
report-core/src/main/java/com/anjiplus/template/gaea/business/util/JdbcConstants.java
View File

@@ -12,8 +12,8 @@ public class JdbcConstants {
public final static String MYSQL = "mysql";
public final static String ORACLE = "oracle";
public final static String ELASTIC_SEARCH_SQL = "elasticsearch_sql";
public final static String SQL_SERVER = "mssqlserver";
public final static String JDBC = "jdbc";
@@ -25,7 +25,6 @@ public class JdbcConstants {
public final static String POSTGRESQL = "postgresql";
public final static String POSTGRESQL_DRIVER = "org.postgresql.Driver";
public final static String SYBASE = "sybase";
public final static String SQL_SERVER = "sqlserver";
public final static String SQL_SERVER_DRIVER = "com.microsoft.jdbc.sqlserver.SQLServerDriver";
public final static String SQL_SERVER_DRIVER_SQLJDBC4 = "com.microsoft.sqlserver.jdbc.SQLServerDriver";
public final static String SQL_SERVER_DRIVER_JTDS = "net.sourceforge.jtds.jdbc.Driver";

8
report-core/src/main/resources/bootstrap-dev.yml
View File

@@ -67,11 +67,13 @@ management:
logging:
config: classpath:logback.xml
file:
#上传对应本地全路径
dist-path: /app/disk/upload/
white-list: .png|.jpg|.gif|.icon|.pdf|.xlsx|.xls|.csv|.mp4|.avi
excelSuffix: .xlsx|.xls|.csv
downloadPath: http://10.108.26.197:9095/file/
#上传对应下载的下载链接路径 http://serverip:9095/file/download
downloadPath: http://10.108.26.197:9095/file/download
customer:
# 跳过token验证和权限验证的url清单
skip-authenticate-urls: /gaeaDict/all, /login, /static, /file/download/, /index.html
skip-authenticate-urls: /gaeaDict/all, /login, /static, /file/download/, /index.html