password and search

src/main/java/com/zglc/fm/service/UserService.java

@@ -106,8 +106,8 @@ public class UserService {
             msg = "用户已存在!";
         } else {
 //            UserEntity userEntity = new UserEntity();
-            String digestPassword = DigestUtil.getMD5Str(data.getPassword());
-            data.setPassword(digestPassword);
+            //String digestPassword = DigestUtil.getMD5Str(data.getPassword());
+            //data.setPassword(digestPassword);
             int index = userDao.insertSelective(data);
             if (index == 0) {
                 flag = false;
@@ -175,8 +175,9 @@ public class UserService {
         if (name == null || "".equals(name)){
             return Result.result(false, "名称不能为空！", null);
         }
-        List<UserEntity> list = userDao.findByName("%" + name + "%");
-        return Result.success(list);
+        Example example = new Example(UserEntity.class);
+        example.createCriteria().andLike("realName", "%" + name + "%");
+        return Result.success(userDao.selectByExample(example));
     }
 
     public Result<List<UserEntity>> findByUser(UserEntity user){

src/main/resources/application-dev.yml

@@ -2,7 +2,7 @@ spring:
 
   datasource:
     url: jdbc:mysql://180.76.52.24:3306/fault_management?userUnicode=ture&characterEncoding=utf8&serverTimezone=GMT%2B8&useSSL=false
-    #url: jdbc:mysql://127.0.0.1:3306/fault_management?userUnicode=ture&characterEncoding=utf8&serverTimezone=GMT%2B8&useSSL=false
+#    url: jdbc:mysql://127.0.0.1:3306/fault_management?userUnicode=ture&characterEncoding=utf8&serverTimezone=GMT%2B8&useSSL=false
 
     username: root
 

src/main/resources/static/admin/js/log.js

@@ -4,8 +4,7 @@ $(function() {
     var currentPage = defaultPage;
     var currentSize = defaultSize;
     var tableFirstLoad = true;
-    var isExportAll = false;
-    var dataCount = 0;
+
     Date.prototype.Format = function(fmt) {
         var o = {
             "M+": this.getMonth() + 1, //月份
@@ -61,7 +60,7 @@ $(function() {
                         },
                         {
                             field: "arguments",
-                            title: "参数",
+                            title: "论据",
                             align: "center",
                             width: 100,
                         },
@@ -97,11 +96,15 @@ $(function() {
                             field: "execStatus",
                             title: "执行状态",
                             align: "center",
-                             templet: function(d) {
-                                 return d.execStatus == 0 ? "成功" : "失败"
-                             }
+                            // templet: function(d) {
+                            //     return d.execStatus == 0 ? "成功" : "失败"
+                            // }
+                        },
+                        {
+                            field: "userId",
+                            title: "用户编号",
+                            align: "center"
                         },
-
                         {
                             field: "userIp",
                             title: "用户IP",
@@ -125,7 +128,6 @@ $(function() {
                 if (data.status === 0) {
                     if (tableFirstLoad) {
                         tableFirstLoad = false;
-                        dataCount = data.data.total;
                         laypage.render({
                             curr: page + 1,
                             elem: "pagination",
@@ -139,16 +141,8 @@ $(function() {
                             }
                         });
                     }
-
                     tableOption.data = data.data.list;
                     table.render(tableOption);
-                    if (isExportAll)
-                    {
-                        isExportAll = false;
-                        defaultPage = 0;
-                        defaultSize = 10;
-                        exportFile("logList");
-                    }
                 } else {
                     showMsg(data.msg, 2, 2000);
                 }
@@ -244,10 +238,7 @@ $(function() {
         }
 
         $("#exportLog").on("click", function(e) {
-            //exportFile("logList");
-            isExportAll = true;
-           loadLogList(0,dataCount);
-            return false;
+            exportFile("logList");
         });
 
         // 批量删除

src/main/resources/static/index-list.html

@@ -34,7 +34,7 @@
                 </dl>
             </li>
             <li class="layui-nav-item to-index">
-                <a href="modelSelection.html">浏览文献</a>
+                <a href="./admin/modelSelection.html">浏览文献</a>
             </li>
         </ul>
 

src/main/resources/static/other/js/functions.js

@@ -1,7 +1,7 @@
 var urlBase = window.location.origin + "/";
 
 //var urlBase = "http://180.76.52.24:11083/"; //网络版
-// var urlBase = "http://127.0.0.1:11083/"; //本地版
+
 
 function loginout() {
     /*if ($("#loginMenu").text() == "登录") {