Skip to content

Commit f9ce7eb

Browse files
author
liuyong
committed
优化test 自动删除测试数据文件
1 parent 8664f0b commit f9ce7eb

File tree

10 files changed

+113
-166
lines changed

10 files changed

+113
-166
lines changed

‎src/main/java/com/vue/adminlte4j/model/AppInfo.java

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,6 @@ public class AppInfo implements Serializable{
1414
@UIFormItem(label = "首页地址" )
1515
private String indexUrl ;
1616

17-
private String userName ;
18-
private String userImgUrl ;
19-
2017
@UIFormItem(label = "用户信息Url" )
2118
private String profileUrl ;
2219

@@ -29,30 +26,26 @@ public class AppInfo implements Serializable{
2926
@UIFormItem(label = "Logo名称缩写")
3027
private String logoShortName;
3128

29+
@UIFormItem(label = "版权信息")
30+
private String copyright ;
3231

32+
@UIFormItem(label = "版本信息")
33+
private String version ;
3334

34-
public String getIndexUrl() {
35-
return indexUrl;
36-
}
37-
38-
public void setIndexUrl(String indexUrl) {
39-
this.indexUrl = indexUrl;
40-
}
41-
42-
public String getUserName() {
43-
return userName;
35+
public String getAppName() {
36+
return appName;
4437
}
4538

46-
public void setUserName(String userName) {
47-
this.userName = userName;
39+
public void setAppName(String appName) {
40+
this.appName = appName;
4841
}
4942

50-
public String getUserImgUrl() {
51-
return userImgUrl;
43+
public String getIndexUrl() {
44+
return indexUrl;
5245
}
5346

54-
public void setUserImgUrl(String userImgUrl) {
55-
this.userImgUrl = userImgUrl;
47+
public void setIndexUrl(String indexUrl) {
48+
this.indexUrl = indexUrl;
5649
}
5750

5851
public String getProfileUrl() {
@@ -87,12 +80,19 @@ public void setLogoShortName(String logoShortName) {
8780
this.logoShortName = logoShortName;
8881
}
8982

90-
public String getAppName() {
91-
return appName;
83+
public String getCopyright() {
84+
return copyright;
9285
}
9386

94-
public void setAppName(String appName) {
95-
this.appName = appName;
87+
public void setCopyright(String copyright) {
88+
this.copyright = copyright;
9689
}
9790

98-
}
91+
public String getVersion() {
92+
return version;
93+
}
94+
95+
public void setVersion(String version) {
96+
this.version = version;
97+
}
98+
}

‎src/main/java/com/vue/adminlte4j/model/UIModel.java

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,11 @@ public class UIModel extends HashMap implements Map {
4545
/** 返回信息的key ***/
4646
public static final String MSG = "msg" ;
4747

48+
/**
49+
* 用户名称对应的Key
50+
*/
51+
public static final String USER_NAME = "user_name" ;
52+
4853
/**
4954
* 返回菜单列表
5055
* @return
@@ -99,6 +104,15 @@ public UIModel setLoginUrl(String loginUrl) {
99104
return put(LOGIN_URL , loginUrl) ;
100105
}
101106

107+
/**
108+
* 设置展示的用户名称
109+
* @param userName
110+
* @return
111+
*/
112+
public UIModel setUserName(String userName) {
113+
return put(USER_NAME , userName) ;
114+
}
115+
102116
public UIModel setCode(int code) {
103117
return put(CODE , code) ;
104118
}

‎src/main/java/com/vue/adminlte4j/web/springmvc/ApiAdminController.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ public UIModel _getAllApiInfo(HttpServletRequest request) {
3131
AppInfo appInfo = getAppInfoService().get() ;
3232
UIModel uiModel = UIModel.success().appInfo(appInfo) ;
3333
configureMenu(uiModel);
34-
appInfo.setUserName(getUserName(request));
34+
uiModel.setUserName(getUserName(request));
3535
MenuUtils.sortTreeData(uiModel.menu());
3636
return uiModel;
3737
}) ;

‎src/main/resources/META-INF/resources/admin/config/cmodel.html

Lines changed: 0 additions & 27 deletions
This file was deleted.

‎src/main/resources/META-INF/resources/admin/config/help.html

Lines changed: 0 additions & 10 deletions
This file was deleted.

‎src/main/resources/META-INF/resources/admin/config/menu.html

Lines changed: 33 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -7,41 +7,41 @@
77
<meta content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no" name="viewport">
88
</head>
99
<body>
10-
<v-app :data="data" >
10+
<v-app>
1111

12-
<v-row>
13-
<v-col span="3">
14-
<v-box title="菜单树">
15-
<v-tree ajax_url="/admin/menu/tree" @on-node-selected="onNodeSelected" ref="tree"></v-tree>
16-
</v-box>
17-
</v-col>
18-
<v-col span="9">
19-
<v-box >
20-
<div slot="header" class="btn-group">
21-
<button type="button" class="btn btn-default" @click="addRoot">
22-
<li class="fa fa-plus">&nbsp;新增根菜单</li>
23-
</button>
24-
<button type="button" class="btn btn-default" @click="addChild">
25-
<li class="fa fa-plus">&nbsp;新增下级菜单</li>
26-
</button>
27-
<button type="button" class="btn btn-default" @click="deleteCur">
28-
<li class="fa fa-remove">&nbsp;删除当前菜单</li>
29-
</button>
30-
</div>
31-
<v-form ajax_url="/admin/menu/get/" ref="form"></v-form>
12+
<v-row>
13+
<v-col span="3">
14+
<v-box title="菜单树">
15+
<v-tree ajax_url="/admin/menu/tree" @on-node-selected="onNodeSelected" ref="tree"></v-tree>
16+
</v-box>
17+
</v-col>
18+
<v-col span="9">
19+
<v-box >
20+
<div slot="header" class="btn-group">
21+
<button type="button" class="btn btn-default" @click="addRoot">
22+
<li class="fa fa-plus">&nbsp;新增根菜单</li>
23+
</button>
24+
<button type="button" class="btn btn-default" @click="addChild">
25+
<li class="fa fa-plus">&nbsp;新增下级菜单</li>
26+
</button>
27+
<button type="button" class="btn btn-default" @click="deleteCur">
28+
<li class="fa fa-remove">&nbsp;删除当前菜单</li>
29+
</button>
30+
</div>
31+
<v-form ajax_url="/admin/menu/get/" ref="form"></v-form>
3232

33-
<div slot="footer" class="text-center">
34-
<button type="button" class="btn btn-primary" @click="upOrder">
35-
<li class="fa fa-long-arrow-up">&nbsp;提序</li>
36-
</button>
37-
<button type="button" class="btn btn-primary" @click="onSaveOrUpdate">
38-
<li class="fa fa-save">&nbsp;保存</li>
39-
</button>
40-
</div>
41-
</v-box>
42-
</v-col>
43-
</v-row>
44-
</v-app>
33+
<div slot="footer" class="text-center">
34+
<button type="button" class="btn btn-primary" @click="upOrder">
35+
<li class="fa fa-long-arrow-up">&nbsp;提序</li>
36+
</button>
37+
<button type="button" class="btn btn-primary" @click="onSaveOrUpdate">
38+
<li class="fa fa-save">&nbsp;保存</li>
39+
</button>
40+
</div>
41+
</v-box>
42+
</v-col>
43+
</v-row>
44+
</v-app>
4545
</body>
4646
<script src="/lib/lib.js"></script>
4747
<script>

‎src/main/resources/META-INF/sys_tpl_dft_config/starter.html

Lines changed: 0 additions & 24 deletions
This file was deleted.

‎src/main/static/src/components/dashboard.vue

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
<template>
22
<div id="app" class="wrapper">
3-
<v-header :data="app_info"></v-header>
3+
<v-header :data="app_info" :user_name="user_name" :user_img="user_img"></v-header>
44
<v-sidebar :data="menu_items"></v-sidebar>
55
<v-content>
66
<slot></slot>
77
</v-content>
88
<v-control-sidebar></v-control-sidebar>
9-
<v-footer ></v-footer>
9+
<v-footer :copyright="app_info.copyright" :version="app_info.version"></v-footer>
1010
</div>
1111
</template>
1212

@@ -24,15 +24,20 @@ export default {
2424
} ,
2525
data(){
2626
return {
27+
user_name : '' ,
28+
user_img:'' ,
2729
app_info:{} ,
2830
menu_items:[]
2931
}
3032
} ,
3133
created() {
3234
var vm=this
3335
axios.get('/admin/app_info/get_all').then(function (response) {
34-
vm.app_info=response.data.app_info
35-
vm.menu_items=response.data.menu_items
36+
var data=response.data
37+
vm.app_info=data.app_info
38+
vm.menu_items=data.menu_items
39+
vm.user_name=data.user_name
40+
vm.user_img=data.user_img
3641
})
3742
console.log("dashboard created!!")
3843
} ,

‎src/main/static/src/components/header.vue

Lines changed: 25 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -22,14 +22,14 @@
2222
<!-- Menu Toggle Button -->
2323
<a href="#" class="dropdown-toggle" data-toggle="dropdown" aria-expanded="true">
2424
<!-- The user image in the navbar-->
25-
<img :src="user_img_url" class="user-image" alt="User Image">
25+
<img :src="user_img" class="user-image" alt="User Image">
2626
<!-- hidden-xs hides the username on small devices so only the image appears. -->
2727
<span class="hidden-xs">{{user_name}}</span>
2828
</a>
2929
<ul class="dropdown-menu">
3030
<!-- The user image in the menu -->
3131
<li class="user-header">
32-
<img :src="user_img_url" class="img-circle" alt="User Image">
32+
<img :src="user_img" class="img-circle" alt="User Image">
3333
<p>{{user_name}}</p>
3434
</li>
3535
<!-- Menu Footer-->
@@ -56,35 +56,31 @@
5656
<script>
5757
import util from '../lib/util'
5858
export default {
59-
name: 'v-header',
60-
props: {
61-
data: {type:Object , default:{}}
62-
} ,
63-
mounted : function() {
64-
console.log("mounted!!")
65-
} ,
66-
computed : {
67-
index_url() {
68-
return this.data.indexUrl || '/index.html'
59+
name: 'v-header',
60+
props: {
61+
user_name:{type:String , default:'No Name'} ,
62+
user_img:{type:String , default:'/lib/vue-adminlte/dist/img/jd_def.gif'} ,
63+
data: {type:Object , default:{}}
6964
} ,
70-
logo_name : function() {
71-
return util.get_val(this.data['logoName'] , '' )
65+
mounted : function() {
66+
console.log("mounted!!")
7267
} ,
73-
logo_short_name : function() {
74-
return util.get_val(this.data['logoShortName'] , '' )
75-
} ,
76-
sign_out_url : function() {
77-
return util.get_val(this.data['signOutUrl'] , '#' )
78-
} ,
79-
user_img_url : function() {
80-
return util.get_val(this.data['userImgUrl'] , '/lib/vue-adminlte/dist/img/jd_def.gif' )
81-
} ,
82-
profile_url : function() {
83-
return util.get_val(this.data['profileUrl'] , '#')
84-
} ,
85-
user_name : function() {
86-
return util.get_val( this.data['userName'] , 'No Name')
68+
computed : {
69+
index_url() {
70+
return this.data.indexUrl || '/index.html'
71+
} ,
72+
logo_name : function() {
73+
return util.get_val(this.data['logoName'] , '' )
74+
} ,
75+
logo_short_name : function() {
76+
return util.get_val(this.data['logoShortName'] , '' )
77+
} ,
78+
sign_out_url : function() {
79+
return util.get_val(this.data['signOutUrl'] , '#' )
80+
} ,
81+
profile_url : function() {
82+
return util.get_val(this.data['profileUrl'] , '#')
83+
}
8784
}
88-
}
8985
}
9086
</script>

0 commit comments

Comments
 (0)