clay
/
ebts
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

修改显示文字

This commit is contained in:
clay 2022-04-20 22:51:46 +08:00
parent 1d77befadb
commit 5d968cdf0e
8 changed files with 217 additions and 95 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ebts-ui/src/router/index.js
View File

@ -128,7 +128,7 @@ export const constantRoutes = [
path: 'edit/:queryId(\\d+)',
component: (resolve) => require(['@/views/tool/query/uniQuery'], resolve),
name: 'UniQuery',
meta: { title: '万能查询配置' }
meta: { title: '自定义查询配置' }
}
]
},

8
ebts-ui/src/views/tool/query/index.vue
View File

@ -256,7 +256,7 @@ export default {
handleAdd() {
this.reset();
this.open = true;
this.title = "添加万能查询";
this.title = "添加自定义查询";
},
/** 修改按钮操作 */
handleUpdate(row) {
@ -265,7 +265,7 @@ export default {
getQuery(id).then(response => {
this.form = response.data;
this.open = true;
this.title = "修改万能查询";
this.title = "修改自定义查询";
});
},
/** 提交按钮 */
@ -292,7 +292,7 @@ export default {
/** 删除按钮操作 */
handleDelete(row) {
const ids = row.id || this.ids;
this.$confirm('是否确认删除万能查询编号为"' + ids + '"的数据项?', "警告", {
this.$confirm('是否确认删除自定义查询编号为"' + ids + '"的数据项?', "警告", {
confirmButtonText: "确定",
cancelButtonText: "取消",
type: "warning"
@ -306,7 +306,7 @@ export default {
/** 导出按钮操作 */
handleExport() {
const queryParams = this.queryParams;
this.$confirm('是否确认导出所有万能查询数据项?', "警告", {
this.$confirm('是否确认导出所有自定义查询数据项?', "警告", {
confirmButtonText: "确定",
cancelButtonText: "取消",
type: "warning"

12
ebts-ui/src/views/tool/table/index.vue
View File

@ -220,7 +220,7 @@
</el-table>
</el-col>
</el-row>
<el-divider content-position="center">top万能查询字段信息</el-divider>
<el-divider content-position="center">ER可视化查询字段信息</el-divider>
<el-row :gutter="10" class="mb8">
<!-- <el-col :span="1.5">-->
<!-- <el-button type="primary" icon="el-icon-plus" size="mini" @click="handleAddTopSearchColumn">添加</el-button>-->
@ -408,7 +408,7 @@ export default {
handleAdd() {
this.reset();
this.open = true;
this.title = "添加top万能查询主";
this.title = "添加拓扑数据";
},
/** 修改按钮操作 */
handleUpdate(row) {
@ -437,7 +437,7 @@ export default {
this.relationalMapList.push(item)
}
this.open = true;
this.title = "修改top万能查询主";
this.title = "修改拓扑数据";
});
},
/** 提交按钮 */
@ -476,7 +476,7 @@ export default {
/** 删除按钮操作 */
handleDelete(row) {
const ids = row.id || this.ids;
this.$confirm('是否确认删除top万能查询主编号为"' + ids + '"的数据项?', "警告", {
this.$confirm('是否确认删除拓扑数据主编号为"' + ids + '"的数据项?', "警告", {
confirmButtonText: "确定",
cancelButtonText: "取消",
type: "warning"
@ -511,7 +511,7 @@ export default {
/** top万能查询字段删除按钮操作 */
handleDeleteTopSearchColumn() {
if (this.checkedRelationalMapList.length == 0) {
this.$alert("请先选择要删除的top万能查询字段数据", "提示", { confirmButtonText: "确定", });
this.$alert("请先选择要删除的拓扑数据字段数据", "提示", { confirmButtonText: "确定", });
} else {
this.relationalMapList.splice(this.checkedRelationalMapList[0].index - 1, 1);
}
@ -534,7 +534,7 @@ export default {
/** 导出按钮操作 */
handleExport() {
const queryParams = this.queryParams;
this.$confirm('是否确认导出所有top万能查询主数据项?', "警告", {
this.$confirm('是否确认导出所有拓扑数据主数据项?', "警告", {
confirmButtonText: "确定",
cancelButtonText: "取消",
type: "warning"

8
ebts-ui/src/views/tool/top/index.vue
View File

@ -253,7 +253,7 @@ export default {
handleAdd() {
this.reset();
this.open = true;
this.title = "添加万能查询";
this.title = "添加ER可视化查询";
},
/** 修改按钮操作 */
handleUpdate(row) {
@ -262,7 +262,7 @@ export default {
getQuery(id).then(response => {
this.form = response.data;
this.open = true;
this.title = "修改万能查询";
this.title = "修改ER可视化查询";
});
},
/** 提交按钮 */
@ -289,7 +289,7 @@ export default {
/** 删除按钮操作 */
handleDelete(row) {
const ids = row.id || this.ids;
this.$confirm('是否确认删除万能查询编号为"' + ids + '"的数据项?', "警告", {
this.$confirm('是否确认删除ER可视化查询编号为"' + ids + '"的数据项?', "警告", {
confirmButtonText: "确定",
cancelButtonText: "取消",
type: "warning"
@ -303,7 +303,7 @@ export default {
/** 导出按钮操作 */
handleExport() {
const queryParams = this.queryParams;
this.$confirm('是否确认导出所有万能查询数据项?', "警告", {
this.$confirm('是否确认导出所有ER可视化查询数据项?', "警告", {
confirmButtonText: "确定",
cancelButtonText: "取消",
type: "warning"

65
ebts/ebts-admin/src/main/resources/application-back.yml Normal file
View File

@ -0,0 +1,65 @@
# 数据源配置
spring:
datasource:
type: com.alibaba.druid.pool.DruidDataSource
driverClassName: com.mysql.cj.jdbc.Driver
druid:
# 主库数据源
master:
# url: jdbc:mysql://114.215.82.135:3306/hcybase?useUnicode=true&characterEncoding=utf8&allowMultiQueries=true&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
# username: hcybase
# password: hcybase@2020
url: jdbc:mysql://13.75.92.40:3306/gen?useUnicode=true&characterEncoding=utf8&allowMultiQueries=true&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
username: gen
password: zcsbKxPseM8LhFdT
# url: jdbc:mysql://127.0.0.1:3306/gen?useUnicode=true&characterEncoding=utf8&allowMultiQueries=true&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
# username: root
# password: 926425
# 从库数据源
slave:
# 从数据源开关/默认关闭
enabled: false
url:
username:
password:
# 初始连接数
initialSize: 5
# 最小连接池数量
minIdle: 10
# 最大连接池数量
maxActive: 20
# 配置获取连接等待超时的时间
maxWait: 60000
# 配置间隔多久才进行一次检测，检测需要关闭的空闲连接，单位是毫秒
timeBetweenEvictionRunsMillis: 60000
# 配置一个连接在池中最小生存的时间，单位是毫秒
minEvictableIdleTimeMillis: 300000
# 配置一个连接在池中最大生存的时间，单位是毫秒
maxEvictableIdleTimeMillis: 900000
# 配置检测连接是否有效
validationQuery: SELECT 1 FROM DUAL
testWhileIdle: true
testOnBorrow: false
testOnReturn: false
webStatFilter:
enabled: true
statViewServlet:
enabled: true
# 设置白名单，不填则允许所有访问
allow:
url-pattern: /druid/*
# 控制台管理用户名和密码
login-username:
login-password:
filter:
stat:
enabled: true
# 慢SQL记录
log-slow-sql: true
slow-sql-millis: 1000
merge-sql: true
wall:
config:
multi-statement-allow: true

54
ebts/ebts-admin/src/main/resources/application-dev.yml Normal file
View File

@ -0,0 +1,54 @@
ebts:
# 文件路径 示例（ Windows配置D:/ebts/uploadPath，Linux配置(宝塔) /www/wwwroot/ebts/uploadPath）
profile: D:/ebts/uploadPath
# 日志配置
logging:
level:
com.ebts: debug
org.springframework: debug
# 数据源配置
spring:
datasource:
druid:
# 主库数据源
master:
url: jdbc:mysql://13.75.92.40:3306/gen?useUnicode=true&characterEncoding=utf8&allowMultiQueries=true&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
username: gen
password: zcsbKxPseM8LhFdT
# 从库数据源
slave:
# 从数据源开关/默认关闭
enabled: false
url:
username:
password:
redis:
# 地址
host: 13.70.28.14
# 端口，默认为6379
port: 6379
# 密码
password: 926425
ftp:
# ftp服务器ip地址
ftpAddress: 13.75.92.40
# 端口号
ftpPort: 21
# 用户名
ftpUsername: genfile
# 密码
ftpPassword: xanTPWM7jC4XpcWx
# 字符集编码
encoding: UTF-8
# 资源域名末尾以/结尾
resources: https://download.odliken.top
#后端部署域名
apiurl: https://apig.odliken.top
# 公开目录
pubfiles: pubfiles
# 保护目录
prifiles: prifiles

87
ebts/ebts-admin/src/main/resources/application-druid.yml
View File

@ -1,63 +1,54 @@
ebts:
# 文件路径 示例（ Windows配置D:/ebts/uploadPath，Linux配置(宝塔) /www/wwwroot/ebts/uploadPath）
profile: /www/wwwroot/gen/uploadPath
# 日志配置
logging:
level:
com.ebts: error
org.springframework: error
# 数据源配置
spring:
datasource:
type: com.alibaba.druid.pool.DruidDataSource
driverClassName: com.mysql.cj.jdbc.Driver
druid:
# 主库数据源
master:
# url: jdbc:mysql://114.215.82.135:3306/hcybase?useUnicode=true&characterEncoding=utf8&allowMultiQueries=true&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
# username: hcybase
# password: hcybase@2020
url: jdbc:mysql://13.75.92.40:3306/gen?useUnicode=true&characterEncoding=utf8&allowMultiQueries=true&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
username: gen
password: zcsbKxPseM8LhFdT
# url: jdbc:mysql://127.0.0.1:3306/gen?useUnicode=true&characterEncoding=utf8&allowMultiQueries=true&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
# username: root
# password: 926425
# 从库数据源
slave:
# 从数据源开关/默认关闭
enabled: false
url:
username:
password:
# 初始连接数
initialSize: 5
# 最小连接池数量
minIdle: 10
# 最大连接池数量
maxActive: 20
# 配置获取连接等待超时的时间
maxWait: 60000
# 配置间隔多久才进行一次检测，检测需要关闭的空闲连接，单位是毫秒
timeBetweenEvictionRunsMillis: 60000
# 配置一个连接在池中最小生存的时间，单位是毫秒
minEvictableIdleTimeMillis: 300000
# 配置一个连接在池中最大生存的时间，单位是毫秒
maxEvictableIdleTimeMillis: 900000
# 配置检测连接是否有效
validationQuery: SELECT 1 FROM DUAL
testWhileIdle: true
testOnBorrow: false
testOnReturn: false
webStatFilter:
enabled: true
statViewServlet:
enabled: true
# 设置白名单，不填则允许所有访问
allow:
url-pattern: /druid/*
# 控制台管理用户名和密码
login-username:
login-password:
filter:
stat:
enabled: true
# 慢SQL记录
log-slow-sql: true
slow-sql-millis: 1000
merge-sql: true
wall:
config:
multi-statement-allow: true
password:
redis:
# 地址
host: 127.0.0.1
# 端口，默认为6379
port: 6379
# 密码
password: 926425
ftp:
# ftp服务器ip地址
ftpAddress: 13.75.92.40
# 端口号
ftpPort: 21
# 用户名
ftpUsername: genfile
# 密码
ftpPassword: xanTPWM7jC4XpcWx
# 字符集编码
encoding: UTF-8
# 资源域名末尾以/结尾
resources: https://download.odliken.top
#后端部署域名
apiurl: https://apig.odliken.top
# 公开目录
pubfiles: pubfiles
# 保护目录
prifiles: prifiles

76
ebts/ebts-admin/src/main/resources/application.yml
View File

@ -15,28 +15,6 @@ ebts:
addressEnabled: true
# 验证码类型 math 数组计算 char 字符验证
captchaType: math
ftp:
# ftp服务器ip地址
# ftpAddress: 114.215.82.135
ftpAddress: 13.75.92.40
# 端口号
ftpPort: 21
# 用户名
# ftpUsername: hcyftp
ftpUsername: genfile
# 密码
# ftpPassword: hcyftp@2020
ftpPassword: xanTPWM7jC4XpcWx
# 字符集编码
encoding: UTF-8
# 资源域名末尾以/结尾
resources: https://download.odliken.top
#后端部署域名
apiurl: https://apig.odliken.top
# 公开目录
pubfiles: pubfiles
# 保护目录
prifiles: prifiles
@ -90,11 +68,53 @@ logging:
level:
com.ebts: debug
org.springframework: warn
# com.ebts: error
# org.springframework: error
# Spring配置
spring:
# 数据源配置
datasource:
type: com.alibaba.druid.pool.DruidDataSource
driverClassName: com.mysql.cj.jdbc.Driver
druid:
# 初始连接数
initialSize: 5
# 最小连接池数量
minIdle: 10
# 最大连接池数量
maxActive: 20
# 配置获取连接等待超时的时间
maxWait: 60000
# 配置间隔多久才进行一次检测，检测需要关闭的空闲连接，单位是毫秒
timeBetweenEvictionRunsMillis: 60000
# 配置一个连接在池中最小生存的时间，单位是毫秒
minEvictableIdleTimeMillis: 300000
# 配置一个连接在池中最大生存的时间，单位是毫秒
maxEvictableIdleTimeMillis: 900000
# 配置检测连接是否有效
validationQuery: SELECT 1 FROM DUAL
testWhileIdle: true
testOnBorrow: false
testOnReturn: false
webStatFilter:
enabled: true
statViewServlet:
enabled: true
# 设置白名单，不填则允许所有访问
allow:
url-pattern: /druid/*
# 控制台管理用户名和密码
login-username:
login-password:
filter:
stat:
enabled: true
# 慢SQL记录
log-slow-sql: true
slow-sql-millis: 1000
merge-sql: true
wall:
config:
multi-statement-allow: true
# 资源信息
messages:
# 国际化资源文件路径
@ -115,14 +135,6 @@ spring:
enabled: true
# redis 配置
redis:
# 地址
# host: 114.215.82.135
host: 127.0.0.1
# host: 13.70.28.14
# 端口，默认为6379
port: 6379
# 密码
password: 926425
# 连接超时时间
timeout: 10s
database: 15