更新BPS信息

box-bps/src/main/resources/templates/bps/expsubspushresp/expsubspushresp.html

@@ -72,6 +72,7 @@
         var removeFlag = [[${@permission.hasPermi('bps:expsubspushresp:remove')}]];
         var companyDatas = [[${@dict.getType('express_company')}]];
         var statsDatas = [[${@dict.getType('express_stats')}]];
+        var monitorStats=[[${@dict.getType('express_monitor_stats')}]];
         var prefix = ctx + "bps/expsubspushresp";
 
         $(function() {
@@ -90,19 +91,19 @@
                     title: 'SID',
                     visible: false
                 },
-                /*{
+                {
                     field: 'status',
-                    title: '监控状态'
+                    title: '监控状态',
+                    formatter: function(value, row, index) {
+                return $.table.selectDictLabel(monitorStats, value);
+                    }
                 },
                 {
                     field: 'billStatus',
-                    title: '状态'
+                    title: '状态',
+                    visible: false
                 },
-                {
+                /*{
-                    field: 'message',
-                    title: '监控状态消息'
-                },
-                {
                     field: 'autoCheck',
                     title: '快递公司编码是否出错'
                 },
@@ -159,7 +160,12 @@
                     formatter:function (value,row,index){
                         return value.replace(/(\r\n)|(\n)/g,'<br>');
                     }
-                },/*
+                },
+                    /*
+                {
+                    field: 'message',
+                    title: '监控状态消息'
+                },
                 {
                     field: 'destResultMessage',
                     title: '目的国快递消息'

ruoyi-admin/src/main/resources/application-druid.yml

@@ -71,8 +71,8 @@ spring:
                 allow:
                 url-pattern: /druid/*
                 # 控制台管理用户名和密码
-                login-username: ruoyi
+                login-username: admin
-                login-password: 123456
+                login-password: bps2019
             filter:
                 stat:
                     enabled: true

ruoyi-admin/src/main/resources/templates/index-topnav.html

@@ -302,7 +302,7 @@
         </div>
         
         <div th:if="${ignoreFooter}" class="footer">
-            <div class="pull-right">© [[${copyrightYear}]] RuoYi Copyright </div>
+            <div class="pull-right">© [[${copyrightYear}]] Bpsemi Copyright </div>
         </div>
     </div>
     <!--右侧部分结束-->

ruoyi-admin/src/main/resources/templates/index.html

@@ -26,7 +26,8 @@
         </div>
         <a th:href="@{/index}">
             <li class="logo hidden-xs">
-                <span class="logo-lg">BPS后台管理系统</span>
+                <!--<span class="logo-lg">BPS后台管理系统</span> -->
+				<span><img height="40" alt="[ BPS ]" src="../static/bps.png" th:src="@{/bps.png}"></span>
             </li>
          </a>
         <div class="sidebar-collapse">
@@ -249,7 +250,7 @@
         </div>
         
         <div th:if="${ignoreFooter}" class="footer">
-            <div class="pull-right">© [[${copyrightYear}]] RuoYi Copyright </div>
+            <div class="pull-right">© [[${copyrightYear}]] Bpsemi Copyright </div>
         </div>
     </div>
     <!--右侧部分结束-->

ruoyi-admin/src/main/resources/templates/login.html

@@ -65,7 +65,7 @@
         </div>
         <div class="signup-footer">
             <div class="pull-left">
-                Copyright © 2018-2021 ruoyi.vip All Rights Reserved. <br>
+                Copyright © 2018-2021 bpsemi.com All Rights Reserved. <br>
             </div>
         </div>
     </div>

ruoyi-admin/src/main/resources/templates/main.html

@@ -16,7 +16,7 @@
 	<div class="col-sm-12">
 		<h2>BPS后台管理系统</h2>
 		<p>
-			<b>当前版本：</b><a href="http://www.ruoyi.vip" target="_blank"><b>若依 </b></a>v[[${version}]]
+			<b>版本：</b><a href="http://www.ruoyi.vip" target="_blank"><b>若依 </b></a>v[[${version}]]
 		</p>
 
 

ruoyi-admin/src/main/resources/templates/register.html

@@ -23,10 +23,10 @@
             <div class="col-sm-7">
                 <div class="signin-info">
                     <div class="logopanel m-b">
-                        <h1><img alt="[ 若依 ]" src="../static/ruoyi.png" th:src="@{/ruoyi.png}"></h1>
+                        <h1><img alt="[ BPS ]" src="../static/ruoyi.png" th:src="@{/ruoyi.png}"></h1>
                     </div>
                     <div class="m-b"></div>
-                    <h4>欢迎使用 <strong>若依 后台管理系统</strong></h4>
+                    <h4>欢迎使用 <strong>BPS后台管理系统</strong></h4>
                     <ul class="m-b">
                         <li><i class="fa fa-arrow-circle-o-right m-r-xs"></i> SpringBoot</li>
                         <li><i class="fa fa-arrow-circle-o-right m-r-xs"></i> Mybatis</li>
@@ -40,7 +40,7 @@
             <div class="col-sm-5">
                 <form id="registerForm" autocomplete="off">
                     <h4 class="no-margins">注册：</h4>
-                    <p class="m-t-md">你若不离不弃，我必生死相依</p>
+                    <p class="m-t-md">欢迎使用BPS后台管理系统</p>
                     <input type="text"     name="username" class="form-control uname"         placeholder="用户名"   maxlength="20" />
                     <input type="password" name="password" class="form-control pword"         placeholder="密码"     maxlength="20" />
                     <input type="password" name="confirmPassword" class="form-control pword"  placeholder="确认密码" maxlength="20" />
@@ -64,7 +64,7 @@
         </div>
         <div class="signup-footer">
             <div class="pull-left">
-                &copy; 2019 All Rights Reserved. RuoYi <br>
+                &copy; 2019 All Rights Reserved. BPSemi <br>
             </div>
         </div>
     </div>