Skip to content

Commit a66b665

Browse files
committed
JS文件离线,界面微调
1 parent 1828ee7 commit a66b665

File tree

11 files changed

+65
-43
lines changed

11 files changed

+65
-43
lines changed

src/main/resources/config/generator.properties

Lines changed: 34 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,36 @@
1-
# 代码生成器配置文件
2-
# 会为所有的property生成property_dir属性,如pkg=com.uframe => pkg_dir=com/uframe
3-
# 可以引用环境变量: ${env.JAVA_HOME} or System.properties: ${user.home},property之间也可以相互引用
1+
# 数据源配置(MySql)
2+
jdbc_driver=com.mysql.jdbc.Driver
3+
jdbc_url=jdbc:mysql://127.0.0.1:3306/dev?useSSL=false&useUnicode=true&characterEncoding=UTF-8
4+
jdbc_username=root
5+
jdbc_password=root
6+
jdbc_catalog=
7+
jdbc_schema=
8+
9+
# 数据源配置(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=
16+
17+
# 数据源配置(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=
24+
25+
# 数据源配置(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=
432

5-
# 代码生成的文件输出路径,可配置全路径或者当前项目下路径
33+
# 代码生成的文件输出路径,可配置绝对路径或者当前项目相对路径
634
outRoot=E:/work/outRoot
735
# outRoot=/src/main
836

@@ -13,37 +41,6 @@ template=/src/main/resources/template/two/RESTful
1341
# 需要移除的表名前缀,使用逗号进行分隔多个前缀,示例值: t_,table_(不能有空格)
1442
tableRemovePrefixes=
1543

16-
# 数据源配置
17-
jdbc_driver=com.mysql.jdbc.Driver
18-
jdbc_url=jdbc:mysql://127.0.0.1:3306/dev?useSSL=false&useUnicode=true&characterEncoding=UTF-8
19-
jdbc_username=root
20-
jdbc_password=root
21-
jdbc_catalog=dev
22-
# oracle需要指定jdbc.schema,并且要大写,其它数据库忽略此项配置
23-
jdbc_schema=
24-
25-
# Oracle配置
26-
# jdbc.driver=oracle.jdbc.OracleDriver
27-
# jdbc.url=jdbc:oracle:thin:@47.XX.XX.XX:XXXX:XXX
28-
# jdbc.username=system
29-
# jdbc.password=123456
30-
# jdbc.catalog=
31-
# jdbc.schema=
32-
# SQLServer配置
33-
# jdbc.driver=com.microsoft.sqlserver.jdbc.SQLServerDriver
34-
# jdbc.url=jdbc:sqlserver://192.168.XX.XX:XXXX;DatabaseName=XXX
35-
# jdbc.username=sa
36-
# jdbc.password=123456
37-
# jdbc.catalog=
38-
# jdbc.schema=
39-
# PostgreSQL配置
40-
# jdbc.driver=org.postgresql.Driver
41-
# jdbc.url=jdbc:postgresql://192.168.XX.XX:XXXX/XXX
42-
# jdbc.username=postgres
43-
# jdbc.password=123456
44-
# jdbc.catalog=
45-
# jdbc.schema=
46-
4744
# basepackage属性,包路径
4845
basepackage=com.example
4946
# commonspackage属性,包路径
@@ -52,6 +49,8 @@ commonspackage=com.example
5249
namespace=jsp
5350
# modulepackage属性,模块名称
5451
modulepackage=generator
52+
# 可以继续添加属性名属性值,对应模板代码
53+
# XXXXX=XXXXX
5554

5655
# 数据库列名大小写 U:大写 L:小写,不配置默认小写
5756
column.sqlName.caseSize=L
10.8 KB
Binary file not shown.
6.02 KB
Binary file not shown.

src/main/resources/static/element-ui/index.css

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/main/resources/static/element-ui/index.js

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/main/resources/static/js/axios.min.js

Lines changed: 9 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/main/resources/static/js/moment.min.js

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/main/resources/static/js/vue.min.js

Lines changed: 6 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/main/resources/templates/common/common.html

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -24,11 +24,11 @@
2424
}
2525
</style>
2626
<!-- 引入Vue,Element UI,Axios,Moment -->
27-
<link rel="stylesheet" th:href="@{https://unpkg.com/element-ui/lib/theme-chalk/index.css}">
28-
<script th:src="@{https://cdn.staticfile.org/vue/2.5.22/vue.min.js}"></script>
29-
<script th:src="@{https://unpkg.com/element-ui/lib/index.js}"></script>
30-
<script th:src="@{https://cdn.staticfile.org/axios/0.18.0/axios.min.js}"></script>
31-
<script th:src="@{https://cdn.staticfile.org/moment.js/2.24.0/moment.min.js}"></script>
27+
<link rel="stylesheet" th:href="@{element-ui/index.css}">
28+
<script th:src="@{js/vue.min.js}"></script>
29+
<script th:src="@{element-ui/index.js}"></script>
30+
<script th:src="@{js/axios.min.js}"></script>
31+
<script th:src="@{js/moment.min.js}"></script>
3232
</head>
3333

3434
<div th:fragment="commonJS">

src/main/resources/templates/config.html

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -218,6 +218,11 @@ <h5 class="header-title m-t-0 m-b-30">说明</h5>
218218
this.submitLoading = true;
219219
console.log(valid)
220220
if (valid) {
221+
this.$notify({
222+
dangerouslyUseHTMLString: true,
223+
title: '请等待',
224+
message: '配置更新会导致应用热重启'
225+
});
221226
this.generator.isRead = false;
222227
axios.put('/database/config', this.generator).then(res => {
223228
var data = res.data;
@@ -228,7 +233,7 @@ <h5 class="header-title m-t-0 m-b-30">说明</h5>
228233
message: data.msg,
229234
type: 'success'
230235
});
231-
}, 2666);
236+
}, 3033);
232237
}).catch(err => {
233238
console.log(err.response);
234239
this.submitLoading = false;

0 commit comments

Comments
 (0)