2 Commits 8c65096034 ... 3651a378f4

Author SHA1 Message Date
  wch 3651a378f4 Merge branch 'master' of http://115.238.142.158:20182/DL-HNDJ/HNDJ 3 years ago
  wch 83ae02766b 修改民主评议 3 years ago

+ 3 - 3
ruoyi-admin/src/main/resources/application-dev.yml

@@ -9,11 +9,11 @@ spring:
     druid:
       # 主库数据源
       master:
-        #url: jdbc:mysql://localhost:3306/hndj_dev?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
+        #url: jdbc:mysql://59.231.10.178:80/hndj_dev?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&nullCatalogMeansCurrent=true
+        #url: jdbc:mysql://115.238.142.158:8021/hndj_mysql?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
         url: jdbc:mysql://115.238.142.158:1406/hndj_dev?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
-        #url: jdbc:mysql://47.107.53.121:3306/hndj_dev?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
+        #url: jdbc:mysql://127.0.0.1:3306/hndj?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
         username: root
-        #password: root@123
         password: root
       # 从库数据源
       slave:

+ 1 - 1
ruoyi-admin/src/main/resources/banner.txt

@@ -20,5 +20,5 @@ Spring Boot Version: ${spring-boot.version}
 //      ========`-.____`-.___\_____/___.-`____.-'========         //
 //                           `=---='                              //
 //      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^        //
-//             佛祖保佑       永不宕机      永无BUG               //
+//             佛祖保佑       永不宕机      永无BUG                  //
 ////////////////////////////////////////////////////////////////////

+ 2 - 19
ruoyi-admin/src/main/resources/templates/login.html

@@ -23,30 +23,13 @@
 <body class="signin">
     <div class="signinpanel">
         <div class="row">
-            <!--<div class="col-sm-7">
-                <div class="signin-info">
-                    &lt;!&ndash;<div class="logopanel m-b">
-                        <h1><img alt="[ 若依 ]" src="../static/ruoyi.png" th:src="@{/ruoyi.png}"></h1>
-                    </div>&ndash;&gt;
-                    <div class="m-b"></div>
-                   &lt;!&ndash; <h2> <strong>欢迎使用智慧党建管理系统</strong></h2>&ndash;&gt;
-                    <ul class="m-b">
-                        &lt;!&ndash;<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>
-                        <li><i class="fa fa-arrow-circle-o-right m-r-xs"></i> Shiro</li>
-                        <li><i class="fa fa-arrow-circle-o-right m-r-xs"></i> Thymeleaf</li>
-                        <li><i class="fa fa-arrow-circle-o-right m-r-xs"></i> Bootstrap</li>&ndash;&gt;
-                    </ul>
-                    <strong th:if="${@config.getKey('sys.account.registerUser')}">还没有账号? <a th:href="@{/register}">立即注册&raquo;</a></strong>
-                </div>
-            </div>-->
             <br><br><br>
             <div class="col-sm-6 col-sm-offset-3">
                 <form id="signupForm" autocomplete="off">
                     <h4 class="no-margins">登录:</h4>
                     <p class="m-t-md"><!--你若不离不弃,我必生死相依--></p>
-                    <input type="text"     name="username" class="form-control uname"     placeholder="用户名或手机号码"   />
-                    <input type="password" name="password" class="form-control pword"     placeholder="密码"  />
+                    <input type="text"     name="username" class="form-control uname"     placeholder="用户名或手机号码"  value="hg" />
+                    <input type="password" name="password" class="form-control pword"     placeholder="密码"  value="12345"/>
 					<div class="row m-t" th:if="${captchaEnabled==true}">
 						<div class="col-xs-6">
 						    <input type="text" name="validateCode" class="form-control code" placeholder="验证码" maxlength="5" />

+ 1 - 3
ruoyi-hndj/src/main/resources/templates/base/staff/staffList.html

@@ -70,9 +70,7 @@
             var options = {
                 url: prefix + "/list",
                 modalName: "党员信息",
-                columns: [{
-                    checkbox: true
-                },
+                columns: [
                 {
                     field: 'staffId',
                     title: '人员id',

+ 1 - 1
ruoyi-hndj/src/main/resources/templates/mzpy/mzpy/mzpy.html

@@ -59,7 +59,7 @@
 
         $(function() {
             var options = {
-                url: prefix + "/list",
+                url: prefix + "/list"+"?staffId="+staffId,
                 createUrl: prefix + "/add/"+staffId,
                 updateUrl: prefix + "/edit/ "+staffId,
                 removeUrl: prefix + "/remove",