Skip to content

N
Nse
Commit 215efb32 by 周海峰
Options

Merge branch 'master' of https://code.palacesun.com/wuchao/Nse

parents 9627a4f5 c477d22c
正在显示 包含 243 行增加 和 19 行删除
pom.xml
......@@ -1119,7 +1119,11 @@
<scope>system</scope>
<systemPath>${project.basedir}/src/main/resources/bin/swxajce-1.0.jar</systemPath>
</dependency>
<dependency>
<groupId>xerces</groupId>
<artifactId>xercesImpl</artifactId>
<version>2.12.2</version>
</dependency>
</dependencies>
<build>
......@@ -1149,6 +1153,8 @@
<artifactId>lombok</artifactId>
</exclude>
</excludes>
<!-- 关键配置：将 system scope 的依赖打包进去 -->
<includeSystemScope>true</includeSystemScope>
</configuration>
</plugin>
</plugins>
......
src/main/java/com/chenyang/nse/bussiness/controller/core/EncryptionConfigController.java
......@@ -578,9 +578,9 @@ public class EncryptionConfigController {
configContent.append("\r\n");
configContent.append("#gateway config");
configContent.append("\r\n");
configContent.append("gateway.protocol=https");
configContent.append("gateway.protocol=http"); // 这里和下面第二行暂时改成 http
configContent.append("\r\n");
configContent.append("gateway.host=" + gatewayUrl.replace("https://", "").replace(":", "").replace(gatewayPort, ""));
configContent.append("gateway.host=" + gatewayUrl.replace("http://", "").replace(":", "").replace(gatewayPort, ""));
configContent.append("\r\n");
configContent.append("gateway.port=" + gatewayPort);
configContent.append("\r\n");
......
src/main/java/com/chenyang/nse/bussiness/controller/core/SearchSensitiveDataController.java
......@@ -1008,23 +1008,45 @@ public class SearchSensitiveDataController {
String schemaname = map.get("schemaname");
String dbType = map.get("dbType");
String dataSystemId = map.get("dataSystemId");
List<ComboboxVO> result = new ArrayList<>();
ArrayList<ComboboxVO> result = new ArrayList<ComboboxVO>();
try {
return RespHelper.successResp(result);
} catch (Exception e) {
return RespHelper.successResp(result);
} finally{ Exception exception = null;
List<ComboboxVO> queryresult = new ArrayList<>();
if (dbType.equals("LOCALFILE")) {
TCoreDatasystem ta = this.dataSystemService.queryDataSystemById(dataSystemId);
List<File> filelist = new ArrayList();
switch (ta.getDbtype()) {
case "LOCALFILE": {
filelist = FileTool.getFileList((String)ta.getLocaldir());
break;
}
default: {
result.add(new ComboboxVO("", ""));
}
}
for (File file : filelist) {
result.add(new ComboboxVO(file.toString(), file.toString()));
}
} else {
List list = this.dataSystemService.queryShemas(dbType, dataSystemId);
if (list.size() != 0) {
result.addAll(list);
}
}
}
catch (Exception e) {
e.printStackTrace();
}
finally {
ArrayList<ComboboxVO> queryresult = new ArrayList<ComboboxVO>();
if (schemaname != null && !schemaname.equals("")) {
ComboboxVO schemaValue = null;
for (int i = 0; i < result.size(); i++) {
schemaValue = result.get(i);
if (schemaValue.getValue().toLowerCase().contains(schemaname.toLowerCase())) {
queryresult.add(schemaValue);
}
for (int i = 0; i < result.size(); ++i) {
schemaValue = (ComboboxVO)result.get(i);
if (!schemaValue.getValue().toLowerCase().contains(schemaname.toLowerCase())) continue;
queryresult.add(schemaValue);
}
return RespHelper.successResp(queryresult);
}
return RespHelper.successResp(result);
}
}
......
src/main/java/com/chenyang/nse/bussiness/service/core/impl/TdataProjectServiceImpl.java
......@@ -1086,7 +1086,7 @@ public class TdataProjectServiceImpl implements TdataProjectService {
this.tCoreProjectFindruleDao.save(obj);
}
this.tCoreDataProjectDao.save(project);
this.tCoreDataProjectDao.update(project);
}
public String queryEdtionIdByProId(String projectid) {
......
src/main/resources/application-test.yml 0 → 100644
spring:
servlet:
multipart:
max-file-size:
104857600
max-request-size:
104857600
datasource:
type: com.alibaba.druid.pool.DruidDataSource
druid:
# mysql 账号密码
username: root
password: '!QAZ2wsx#EDC2022'
# kingbase 账号密码
# username: system
# password: system
# 达梦 账号密码
# username: SYSDBA
# password: 123123123
#H2SQL
# username: sa
# password: sa
# oracle 驱动
#driverClassName: oracle.jdbc.driver.OracleDriver
#url: jdbc:oracle:thin:@localhost:1521:orcl
# mysql 驱动
driver-class-name: com.mysql.cj.jdbc.Driver
# kingbase 驱动
# driver-class-name: com.kingbase8.Driver
# 达梦 驱动
# driver-class-name: dm.jdbc.driver.DmDriver
# HSSQL 驱动
# driver-class-name: org.h2.Driver
#serverTimezone=UTC 设置时区
# 达梦数据库 url
# url: jdbc:dm://192.168.2.228:5236?SCHEMA=encryption&columnNameUpperCase=false&genKeyNameCase=2&clobAsString=1&blobAsString=1
# H2SQL 数据库
# url: jdbc:h2:tcp://localhost/d:/db/enc;AUTO_SERVER=TRUE
# url: jdbc:h2:C:\\Users\\15613\\Desktop\\fsdownload\\data\\db
# url: jdbc:h2:./db
# kingbase数据库 urlcolumnNameUpperCase
# url: jdbc:kingbase8://192.168.2.127:54321/encryption_gateway?currentSchema=encryption
# mysql数据库 url
url: jdbc:mysql://demo.docmis.cn:23500/nse_test?useSSL=false&useUnicode=true&characterEncoding=UTF-8&serverTimezone=GMT%2B8&rewriteBatchedStatements=true
#正式环境
# url: jdbc:mysql://127.0.0.1:3306/encryption?useSSL=false&useUnicode=true&characterEncoding=UTF-8&serverTimezone=GMT%2B8&rewriteBatchedStatements=true
#最小连接数
minIdLe: 5
#最大连接数
maxActive: 100
#解决mysql8小时问题
validationQuery: SELECT 'X'
#空闲链接最小空闲时间
minEvictableIdleTimeMillis: 30000
#空闲连接检查时间间隔
timeBetweenEvictionRunsMillis: 60000
maxWait: 10000
login:
password:
username:
#ORM映射设置，hibernate需要配置jpa
jpa:
hibernate:
#是否自动建表m
ddl-auto: update
properties:
hibernate:
#是否自动打印hql对应的sql语句
show_sql: false
#是否格式化sql语句
format_sql: fasle
#事务交由spring管理
current_session_context_class: org.springframework.orm.hibernate5.SpringSessionContext
cache:
use_second_level_cache: false
use_query_cache: false
jackson:
date-format: yyyy-MM-dd HH:mm:ss
time-zone: GMT+8
serialization:
write-dates-as-timestamps: false
# 初始化大小，最小，最大
#告警设置-邮件通知 springboot自动加载必须属性，设置空，实际从数据库获取值
#SMTP服务器地址
mail:
host: 空
#用户名
username: 空
#密码
password: 空
mvc:
static-path-pattern: /**
axios:
defaults:
withCredentials: true
h2:
console:
enabled: true
settings:
trace: true
# web-allow-others: false
# path: /console
server:
port: 9005
tomcat:
max-swallow-size: 10485760
# ssl:
# key-store: classpath:tomcat.keystore
# key-store-password: syghca
# key-store-type: jks
# key-alias: tomcat
# enabled-protocols: TLSV1.2
# ciphers: ECDHE-ECDSA-AES256-GCM-SHA384,ECDHE-RSA-AES256-GCM-SHA384,ECDHE-ECDSA-CHACHA20-POLY1305,ECDHE-RSA-CHACHA20-POLY1305,ECDHE-ECDSA-AES128-GCM-SHA256,ECDHE-RSA-AES128-GCM-SHA256,ECDHE-ECDSA-AES256-SHA384,ECDHE-RSA-AES256-SHA384,ECDHE-ECDSA-AES128-SHA256,ECDHE-RSA-AES128-SHA256
incencryption:
thread:
pool:
core-size: 10
max-size: 10
encryption:
#base64随机数/格尔kms/泰和kms/加密机/国芯加密卡
#Local/KMS/THKMS/SDK/CCORESDF
secret-key-mode: Local
thkms:
protocol: http
host: 10.160.30.130
port: 10006
appId: APP_85B7665094BE4996A71A517E39C1D2B5
keyId: 0303b22f135644ec86023bf62cfe813f
#httpclient_config
httpclient:
connectionRequestTimeout: 30000
connectTimeout: 300000
socketTimeout: 600000
mybatis-plus:
datasource: second-datasource
# 如果是放在src/main/java目录下 classpath:/com/mistra/axela/*/mapper/*Mapper.xml
# 如果是放在resource目录 classpath:/mapper/*Mapper.xml
mapper-locations: classpath:/mapper/*.xml
# mapper-locations: classpath:/com/performancemonitor/framework/mybatis/xml/*.xml
global-config:
#主键类型 0:"数据库ID自增", 1:"用户输入ID",2:"全局唯一ID (数字类型唯一ID)", 3:"全局唯一ID UUID";
id-type: 2
#字段策略 0:"忽略判断",1:"非 NULL 判断"),2:"非空判断"
field-strategy: 2
#驼峰下划线转换
db-column-underline: true
#刷新mapper 调试神器
#refresh-mapper: true
#数据库大写下划线转换
#capital-mode: true
# Sequence序列接口实现类配置
key-generator: com.baomidou.mybatisplus.incrementer.OracleKeyGenerator
#逻辑删除配置（下面3个配置）
logic-delete-value: 1
logic-not-delete-value: 0
db-config:
schema: ${base.schema}
# for dm "\"%s\""
# column-format: "\"%s\""
column-format: "\"%s\""
sql-injector: com.baomidou.mybatisplus.mapper.LogicSqlInjector
configuration:
map-underscore-to-camel-case: true
auto-mapping-behavior: FULL
cache-enabled: false
#配置JdbcTypeForNull
jdbc-type-for-null: 'null'
log-impl: org.apache.ibatis.logging.nologging.NoLoggingImpl
#分类分级http协议
protocol:
prex: http
classify:
#是否开启分类分级标签
classifyEnable: false
#分类分级IP
classifyIp: 127.0.0.1
#分类分级端口
classifyPort: 8182
url: ${protocol.prex}://${classify.classifyIp}:${classify.classifyPort}
#分类接口地址
classifyName: /core/datascope/getscopetable
#分级接口地址
levelName: /core/sensitivelevel/getscopetable
src/main/resources/config.properties
......@@ -2,11 +2,11 @@
#IP信息
#jdbc.host=192.168.2.127
#正式环境
jdbc.host=127.0.0.1
jdbc.host=demo.docmis.cn
#jdbc.host=192.168.2.228
#端口信息
#jdbc.port=54321
jdbc.port=3306
jdbc.port=23500
#数据库实例
jdbc.kingbase.dbname=security
#jdbc.dbname=encryption_gateway
......@@ -14,7 +14,8 @@ jdbc.kingbase.dbname=security
#如果配置数据库类型是H2,则jdbc.dbname的值是public
jdbc.dbname=public
#jdbc.dbname=encryption
basePath=/home/trustz
#basePath=/home/trustz
basePath=D:/trustz
maskingPath=/home/masking
#jdbc-mysql
#jdbc.driver=com.mysql.cj.jdbc.Driver
......@@ -167,7 +168,7 @@ loginfilepath = D:/login.properties
app_alert_interface = http://127.0.0.1:8180/core/applog/sendAlertInfo
db_alert_interface = http://127.0.0.1:8180/core/dblog/sendAlertInfo
# 邮件接收人
mailTo = shuyi666@aliyun.com
mailTo = dhdhhd@aliyun.com
# 告警end
# 审计日志begin
......
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论