Skip to content

Commit d740efc

Browse files
dolywdolyw
committed
修复切换数据库问题
1 parent eb077d6 commit d740efc

File tree

8 files changed

+413
-25
lines changed

8 files changed

+413
-25
lines changed

‎pom.xml‎

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,11 +71,25 @@
7171
<version>1.9.21</version>
7272
</dependency>
7373

74-
<!-- Mysql-Connector -->
74+
<!-- Sql-Connector -->
7575
<dependency>
7676
<groupId>mysql</groupId>
7777
<artifactId>mysql-connector-java</artifactId>
7878
</dependency>
79+
<!--<dependency>
80+
<groupId>oracle.jdbc</groupId>
81+
<artifactId>ojdbc6</artifactId>
82+
<version>0.0.1</version>
83+
</dependency>-->
84+
<!--<dependency>
85+
<groupId>com.microsoft.sqlserver</groupId>
86+
<artifactId>sqljdbc4</artifactId>
87+
<version>4.0</version>
88+
</dependency>-->
89+
<dependency>
90+
<groupId>org.postgresql</groupId>
91+
<artifactId>postgresql</artifactId>
92+
</dependency>
7993

8094
<!-- Mybatis -->
8195
<dependency>

‎src/main/java/com/example/config/DataBaseConfig.java‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -42,14 +42,13 @@ public class DataBaseConfig {
4242
@Bean
4343
@Primary
4444
public GeneratorDao getGeneratorDao() {
45-
String str = DataBaseEnum.MYSQL.getValue();
46-
if(driver.indexOf(DataBaseEnum.MYSQL.getValue()) > 0) {
45+
if(driver.indexOf(DataBaseEnum.MYSQL.getValue()) >= 0) {
4746
return mySqlGeneratorDao;
48-
} else if (driver.indexOf(DataBaseEnum.ORACLE.getValue()) > 0) {
47+
} else if (driver.indexOf(DataBaseEnum.ORACLE.getValue()) >= 0) {
4948
return oracleGeneratorDao;
50-
} else if (driver.indexOf(DataBaseEnum.POSTGRESQL.getValue()) > 0) {
49+
} else if (driver.indexOf(DataBaseEnum.POSTGRESQL.getValue()) >= 0) {
5150
return postgreSqlGeneratorDao;
52-
} else if (driver.indexOf(DataBaseEnum.SQLSERVER.getValue()) > 0) {
51+
} else if (driver.indexOf(DataBaseEnum.SQLSERVER.getValue()) >= 0) {
5352
return sqlServerGeneratorDao;
5453
}
5554
return null;

‎src/main/resources/application.yml‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,8 @@ spring:
1717
minIdle: 1
1818
timeBetweenEvictionRunsMillis: 60000
1919
minEvictableIdleTimeMillis: 300000
20-
validationQuery: select 'x'
20+
# validationQuery: select 'x'
21+
validation-query: SELECT 1 from dual
2122
testWhileIdle: true
2223
testOnBorrow: false
2324
testOnReturn: false

‎src/main/resources/config/generator.properties‎

Lines changed: 19 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -7,28 +7,28 @@ jdbc_catalog=
77
jdbc_schema=
88

99
# 数据源配置(Oracle)
10-
# jdbc_driver=oracle.jdbc.OracleDriver
11-
# jdbc_url=jdbc:oracle:thin:@47.XX.XX.XX:XXXX:XXX
12-
# jdbc_username=system
13-
# jdbc_password=123456
14-
# jdbc_catalog=
15-
# jdbc_schema=
10+
# jdbc_driver=oracle.jdbc.OracleDriver
11+
# jdbc_url=jdbc:oracle:thin:@XXX.XX.XX.XXX:XXXX/XXXX
12+
# jdbc_username=XXX
13+
# jdbc_password=XXX
14+
# jdbc_catalog=
15+
# jdbc_schema=
1616

1717
# 数据源配置(SqlServer)
18-
# jdbc_driver=com.microsoft.sqlserver.jdbc.SQLServerDriver
19-
# jdbc_url=jdbc:sqlserver://192.168.XX.XX:XXXX;DatabaseName=XXX
20-
# jdbc_username=sa
21-
# jdbc_password=123456
22-
# jdbc_catalog=
23-
# jdbc_schema=
18+
# jdbc_driver=com.microsoft.sqlserver.jdbc.SQLServerDriver
19+
# jdbc_url=jdbc:sqlserver://192.168.XX.XX:XXXX;DatabaseName=XXX
20+
# jdbc_username=sa
21+
# jdbc_password=123456
22+
# jdbc_catalog=
23+
# jdbc_schema=
2424

2525
# 数据源配置(PostgreSql)
26-
# jdbc_driver=org.postgresql.Driver
27-
# jdbc_url=jdbc:postgresql://192.168.XX.XX:XXXX/XXX
28-
# jdbc_username=postgres
29-
# jdbc_password=123456
30-
# jdbc_catalog=
31-
# jdbc_schema=
26+
# jdbc_driver=org.postgresql.Driver
27+
# jdbc_url=jdbc:postgresql://192.168.XX.XX:XXXX/XXX
28+
# jdbc_username=postgres
29+
# jdbc_password=123456
30+
# jdbc_catalog=
31+
# jdbc_schema=
3232

3333
# 代码生成的文件输出路径，可配置绝对路径或者当前项目相对路径
3434
outRoot=E:/work/outRoot
@@ -53,6 +53,7 @@ namespace=jsp
5353
modulepackage=generator
5454
# 可以继续添加属性名属性值，对应模板代码
5555
# XXXXX=XXXXX
56+
moduleName=test
5657

5758
# 数据库列名大小写 U:大写 L:小写，不配置默认小写
5859
column.sqlName.caseSize=L

src/main/resources/template/two/RESTful/resources/vue/${className}.vue renamed to src/main/resources/template/two/RESTful/vue/HelloWorld.vue

File renamed without changes.

‎src/main/resources/template/two/RESTful/vue/api/${moduleName}/${classNameFirstLower}.js‎

Lines changed: 64 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,64 @@
1+
<#include "/macro.include">
2+
<#assign className = table.className>
3+
<#assign classNameLower = className?uncap_first>
4+
import http from '@/utils/httpRequest'
5+
6+
export const baseURL = process.env.NODE_ENV !== 'production' && process.env.OPEN_PROXY ? '/proxyApi/' : window.SITE_CONFIG.baseUrl
7+
8+
/**
9+
* 列表查询
10+
* @param {*} searchForm
11+
*/
12+
export function list (searchForm) {
13+
return http({
14+
url: baseURL + '/${moduleName}/${classNameLower}',
15+
method: 'get',
16+
params: searchForm
17+
})
18+
}
19+
20+
/**
21+
* 根据Id查询
22+
* @param {*} id
23+
*/
24+
export function findById (id) {
25+
return http({
26+
url: baseURL + '/${moduleName}/${classNameLower}/' + id,
27+
method: 'get'
28+
})
29+
}
30+
31+
/**
32+
* 新增
33+
* @param {*} data
34+
*/
35+
export function add (data) {
36+
return http({
37+
url: baseURL + '/${moduleName}/${classNameLower}',
38+
method: 'post',
39+
data
40+
})
41+
}
42+
43+
/**
44+
* 修改
45+
* @param {*} data
46+
*/
47+
export function update (data) {
48+
return http({
49+
url: baseURL + '/${moduleName}/${classNameLower}',
50+
method: 'put',
51+
data
52+
})
53+
}
54+
55+
/**
56+
* 删除
57+
* @param {*} id
58+
*/
59+
export function delById (id) {
60+
return http({
61+
url: baseURL + '/${moduleName}/${classNameLower}/' + id,
62+
method: 'delete'
63+
})
64+
}

‎src/main/resources/template/two/RESTful/vue/views/modules/${moduleName}/${classNameFirstLower}.vue‎

Lines changed: 155 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,155 @@
1+
<#include "/macro.include">
2+
<#assign className = table.className>
3+
<#assign classNameLower = className?uncap_first>
4+
<template>
5+
<div>
6+
<!-- 查询表单 -->
7+
<el-form :inline="true" :model="searchForm" label-width="100px" size="small">
8+
9+
<#list table.columns as column>
10+
<el-form-item label="${column.columnAlias!}">
11+
<el-input v-model.trim="searchForm.${column.columnNameLower}" placeholder="请输入${column.columnAlias!}" clearable />
12+
</el-form-item>
13+
</#list>
14+
15+
<el-row type="flex">
16+
<el-form-item>
17+
<el-button type="primary" v-if="isAuth('${moduleName}:${classNameLower}:list')" icon="el-icon-search" @click="list(searchForm)">查询</el-button>
18+
<el-button type="primary" v-if="isAuth('${moduleName}:${classNameLower}:add')" icon="el-icon-plus" @click="preById(null)">新增</el-button>
19+
</el-form-item>
20+
</el-row>
21+
22+
</el-form>
23+
24+
<!-- 数据表格 -->
25+
<el-table :data="tableData" v-loading="tableLoading" border style="width: 100%">
26+
27+
<#list table.columns as column>
28+
<el-table-column prop="${column.columnNameLower}" label="${column.columnAlias!}" align="center" min-width="100" show-overflow-tooltip />
29+
</#list>
30+
31+
<el-table-column label="操作" align="center" fixed="right" min-width="100">
32+
<template slot-scope="scope">
33+
<el-button type="text" v-if="isAuth('${moduleName}:${classNameLower}:update')" @click="preById(scope.row.<#list table.columns as column><#if column.pk>${column.columnNameLower}</#if></#list>)">编辑</el-button>
34+
<el-button type="text" v-if="isAuth('${moduleName}:${classNameLower}:delete')" @click="delById(scope.row.<#list table.columns as column><#if column.pk>${column.columnNameLower}</#if></#list>)">删除</el-button>
35+
</template>
36+
</el-table-column>
37+
38+
</el-table>
39+
40+
<div align="right" style="margin-top:10px;">
41+
<el-pagination
42+
:current-page="searchForm.page"
43+
:page-sizes="[20, 40, 60, 80]"
44+
:page-size="searchForm.rows"
45+
:total="totalCount"
46+
layout="total, sizes, prev, pager, next, jumper"
47+
@size-change="handleSizeChange"
48+
@current-change="handleCurrentChange"/>
49+
</div>
50+
51+
<!-- 弹窗 -->
52+
<edit ref="edit" @refreshTableData="list(searchForm)"></edit>
53+
</div>
54+
</template>
55+
56+
<script>
57+
import Edit from './${classNameLower}Edit'
58+
import * as ${classNameLower} from '@/api/${moduleName}/${classNameLower}'
59+
60+
export default {
61+
name: '${className}',
62+
data () {
63+
return {
64+
// 表格加载条控制
65+
tableLoading: false,
66+
// Table数据
67+
tableData: [],
68+
// Table数据总条数
69+
totalCount: 0,
70+
// 查询表单属性
71+
searchForm: {
72+
// 当前页
73+
page: 1,
74+
// 每页条数
75+
rows: 20,
76+
<#list table.columns as column>
77+
'${column.columnNameLower}': null<#if column_has_next>,</#if>
78+
</#list>
79+
}
80+
}
81+
},
82+
components: {
83+
Edit
84+
},
85+
// 启动时就执行
86+
mounted: function () {
87+
88+
},
89+
// 获取活动窗口
90+
activated () {
91+
// 列表查询
92+
this.list(this.searchForm)
93+
},
94+
methods: {
95+
// 每页条数改变
96+
handleSizeChange: function (rows) {
97+
this.searchForm.rows = rows
98+
// 刷新列表
99+
this.list(this.searchForm)
100+
},
101+
// 当前页数改变
102+
handleCurrentChange: function (page) {
103+
this.searchForm.page = page
104+
// 刷新列表
105+
this.list(this.searchForm)
106+
},
107+
// 列表查询
108+
list: function (searchForm) {
109+
// 加载显示
110+
this.tableLoading = true
111+
${classNameLower}.list(searchForm).then(response => {
112+
const data = response.data.data
113+
this.tableData = data.data
114+
this.totalCount = data.count
115+
// 加载完成
116+
this.tableLoading = false
117+
})
118+
},
119+
// 调用子组件的preById方法
120+
preById: function (<#list table.columns as column><#if column.pk>${column.columnNameLower}</#if></#list>) {
121+
// this.$nextTick Dom渲染完执行
122+
/* this.$nextTick(() => {
123+
this.$refs.edit.preById(<#list table.columns as column><#if column.pk>${column.columnNameLower}</#if></#list>)
124+
}) */
125+
this.$refs.edit.preById(<#list table.columns as column><#if column.pk>${column.columnNameLower}</#if></#list>)
126+
},
127+
// 删除
128+
delById: function (<#list table.columns as column><#if column.pk>${column.columnNameLower}</#if></#list>) {
129+
this.$confirm('是否确定删除？', '提示', {
130+
confirmButtonText: '确定',
131+
cancelButtonText: '取消',
132+
type: 'warning'
133+
}).then(() => {
134+
// 确定执行删除
135+
${classNameLower}.delById(<#list table.columns as column><#if column.pk>${column.columnNameLower}</#if></#list>).then(response => {
136+
const data = response.data
137+
this.$message({
138+
type: 'success',
139+
message: data.msg
140+
})
141+
// 刷新列表
142+
this.list(this.searchForm)
143+
})
144+
}).catch(() => {
145+
146+
})
147+
}
148+
}
149+
}
150+
</script>
151+
152+
<!-- Add "scoped" attribute to limit CSS to this component only -->
153+
<style scoped>
154+
155+
</style>

0 commit comments

Comments
 (0)