潘钊 / bsth_control · Commits

Commit 3b13988cd0952a13467ec93c8ee908b8f85d8380

Authored by 潘钊
1 parent ed3d5df2
build: skipped

update

Inline Side-by-side
Showing 4 changed files with 9 additions and 10 deletions
src/main/resources/application-dev.properties
  View file @3b13988
... ... @@ -8,9 +8,9 @@ spring.jpa.hibernate.naming_strategy= org.hibernate.cfg.ImprovedNamingStrategy
8 8 spring.jpa.database= MYSQL
9 9 spring.jpa.show-sql= true
10 10 spring.datasource.driver-class-name= com.mysql.jdbc.Driver
11   -spring.datasource.url= jdbc:mysql://192.168.168.201:3306/control
  11 +spring.datasource.url= jdbc:mysql://127.0.0.1:3306/control
12 12 spring.datasource.username= root
13   -spring.datasource.password= 123456
  13 +spring.datasource.password= panzhao
14 14 #DATASOURCE
15 15 spring.datasource.max-active=100
16 16 spring.datasource.max-idle=8
... ...
src/main/resources/ms-jdbc.properties
  View file @3b13988
... ... @@ -4,6 +4,6 @@
4 4 #ms.mysql.password= 123456
5 5  
6 6 ms.mysql.driver= com.mysql.jdbc.Driver
7   -ms.mysql.url= jdbc:mysql://192.168.168.171:3306/ms?useUnicode=true&characterEncoding=utf-8
  7 +ms.mysql.url= jdbc:mysql://192.168.40.82:3306/ms?useUnicode=true&characterEncoding=utf-8
8 8 ms.mysql.username= root
9   -ms.mysql.password= root2jsp
10 9 \ No newline at end of file
  10 +ms.mysql.password= 123456
11 11 \ No newline at end of file
... ...
src/main/resources/static/index.html
  View file @3b13988
... ... @@ -143,7 +143,7 @@ tr.row-active td {
143 143 <div class="page-header-inner ">
144 144 <!-- LOGO -->
145 145 <div class="page-logo">
146   - <a href="index.html" class="logo-default logo-default-text" > 闵行公交调度系统 </a>
  146 + <a href="index.html" class="logo-default logo-default-text" > 青浦公交调度系统 </a>
147 147 <div class="menu-toggler sidebar-toggler">
148 148 </div>
149 149 </div>
... ...
src/main/resources/static/pages/permission/user/list.html
  View file @3b13988
... ... @@ -133,11 +133,7 @@
133 133 {{obj.lastLoginDate}}
134 134 </td>
135 135 <td>
136   - {{if obj.enabled}}
137   - <button type="button" onclick="changeEnabled({{obj.id}},0)" class="btn btn-warning btn-sm">禁用</button>
138   - {{else}}
139   - <button type="button" onclick="changeEnabled({{obj.id}},1)" class="btn btn-success btn-sm">启用</button>
140   - {{/if}}
  136 + <a class="btn btn-sm blue btn-outline" href="edit.html?no={{obj.id}}"><i class="fa fa-edit"></i> 编辑</a>
141 137 </td>
142 138 </tr>
143 139 {{/each}}
... ... @@ -194,6 +190,9 @@ $(function(){
194 190 params['page'] = page;
195 191 var i = layer.load(2);
196 192 $get('/user' ,params, function(data){
  193 + $.each(data.content, function(i, obj) {
  194 + obj.lastLoginDate = moment(obj.lastLoginDate).format("YYYY-MM-DD HH:mm:ss");
  195 + });
197 196 var bodyHtm = template('user_list_temp', {list: data.content});
198 197  
199 198 $('#datatable_user tbody').html(bodyHtm)
... ...