!

leiSP-admin/src/main/java/com/sooka/web/controller/system/SysUserController.java

@@ -311,7 +311,7 @@ public class SysUserController extends BaseController
 
         List<SysUser> list = userService.selectUserList(new SysUser());
 
-        System.out.println(list.size());
+        System.out.println("总人数："+list.size());
         if (list.size() == 0) {
             return AjaxResult.error("初始化失败，没有符合条件的用户");
         }
@@ -323,11 +323,11 @@ public class SysUserController extends BaseController
             try {
                 String newPassword = StringUtils.format("LsJgPt{}!@#", sysUser.getPhonenumber());
 
-                sysUser.setPassword(passwordService.encryptPassword(sysUser.getLoginName(), newPassword, sysUser.getSalt()));
+//                sysUser.setPassword(passwordService.encryptPassword(sysUser.getLoginName(), newPassword, sysUser.getSalt()));
 
-                String content = StringUtils.format("尊敬的“数字梨树监管平台”用户您好，根据国家信息化安全检查要求，现对“数字梨树监管平台”进行统一密码调整，调整后，初始密码为【{}】，在平台恢复运行后", newPassword);
+                String content = StringUtils.format("尊敬的“数字梨树监管平台”用户您好，根据国家信息化安全检查要求，现对“数字梨树监管平台”进行调整，调整后，平台访问地址改为【https://218.27.1.154:9090】，初始密码为【{}】，所有摄像头播放插件需要通过平台登录页【工具箱】重新获取，手机端需要从平台登录页【手机端二维码】重新下载安装，收到短信后", newPassword);
 
-                SendSms.sendMessage(sysUser.getPhonenumber(),content);
+//                SendSms.sendMessage(sysUser.getPhonenumber(),content);
             } catch (Exception e) {
                 e.printStackTrace();
                 errorList.add(sysUser);
@@ -337,12 +337,23 @@ public class SysUserController extends BaseController
         }).collect(Collectors.toList());
 
         if (errorList.size() > 0) {
+            System.out.println("失败人数："+errorList.size());
             return AjaxResult.error(StringUtils.format("初始化失败：{}", errorList.size()));
         } else {
-            return AjaxResult.success(StringUtils.format("初始化失败：{}", userService.passwordInit(newList)));
+//            return AjaxResult.success(StringUtils.format("初始化成功：{}", userService.passwordInit(newList)));
+            System.out.println("成功人数："+newList.size());
+            return AjaxResult.success(StringUtils.format("初始化成功：{}", newList.size()));
         }
 
     }
 
+    public static void main(String[] args){
+        String newPassword = StringUtils.format("LsJgPt{}!@#", "18686652964");
+
+        String content = StringUtils.format("尊敬的“数字梨树监管平台”用户您好，根据国家信息化安全检查要求，现对“数字梨树监管平台”进行调整，调整后，平台访问地址改为【https://218.27.1.154:9090】，初始密码为【{}】，所有摄像头播放插件需要通过平台登录页【工具箱】重新获取，手机端需要从平台登录页【手机端二维码】重新下载安装，收到短信后", newPassword);
+
+        SendSms.sendMessage("18686652964",content);
+    }
+
 
 }

mybusiness/src/main/resources/templates/business/manager/cameramanager/onePreviewOld.html

@@ -22,7 +22,7 @@
 <div class="wrapper wrapper-content fadeInRight" style="height: inherit;">
     <div class="row" style="height: auto;">
         <div class="col-sm-12" style="height: inherit;">
-            <a href="javascript:void (0)" onclick="openOnePreview()">【体验新版】</a>
+            <!--<a href="javascript:void (0)" onclick="openOnePreview()">【体验新版】</a>-->
             <a href="javascript:void (0)" onclick="goPlugIn()">【启动插件版】</a>
            <!-- <a href="javascript:void (0)" onclick="goPlugIn1()">【内测】</a>-->
         </div>
@@ -73,6 +73,36 @@
         window.open(ctx + "business/manager/cameramanager/onePreview/"+cId);
     }
 
+    function goPlugIn() {
+        var jIp = [[${ip}]];
+        var jPort = [[${port}]];
+        var jUsername = [[${username}]];
+        var jPassword = [[${password}]];
+        var jDeviceport = [[${deviceport}]];
+
+        var url = 'http://localhost:8899/camera_id='+jIp+","+jPort+","+jUsername+","+jPassword+","+jDeviceport;
+
+        var path = "https://218.27.1.154:9090/camera2/cn/demo.html?camera_id="+jIp+","+jPort+","+jUsername+","+jPassword+","+jDeviceport;
+
+        // $.get(url, function (e) {
+        //     console.log(e)
+        // });
+
+        $.ajax({
+            url: url,
+            success: function (result) {
+                console.log(result);
+            },
+            error: function (jqXHR, status, errorThrown) {
+                console.log(status, errorThrown);
+            },
+            complete: function(XMLHttpRequest, textStatus) {
+                console.log(textStatus);
+            }
+        });
+
+    }
+
     // 创建播放实例
     function initPlugin () {
         oWebControl = new WebControl({
@@ -311,36 +341,6 @@
         }
     });
 
-    function goPlugIn() {
-        var jIp = [[${ip}]];
-        var jPort = [[${port}]];
-        var jUsername = [[${username}]];
-        var jPassword = [[${password}]];
-        var jDeviceport = [[${deviceport}]];
-
-        var url = 'http://localhost:8899/camera_id='+jIp+","+jPort+","+jUsername+","+jPassword+","+jDeviceport;
-
-        var path = "https://218.27.1.154:9090/camera2/cn/demo.html?camera_id="+jIp+","+jPort+","+jUsername+","+jPassword+","+jDeviceport;
-
-        // $.get(url, function (e) {
-        //     console.log(e)
-        // });
-
-        $.ajax({
-            url: url,
-            success: function (result) {
-                console.log(result);
-            },
-            error: function (jqXHR, status, errorThrown) {
-                console.log(status, errorThrown);
-            },
-            complete: function(XMLHttpRequest, textStatus) {
-                console.log(textStatus);
-            }
-        });
-
-    }
-
     function goPlugIn1() {
         var jIp = [[${ip}]];
         var name = [[${name}]];