项目升级https

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

@@ -38,6 +38,7 @@ public class SysLoginController extends BaseController
     public String login(HttpServletRequest request, HttpServletResponse response)
     {
         // 如果是Ajax请求，返回Json字符串。
+
         if (ServletUtils.isAjaxRequest(request))
         {
             return ServletUtils.renderString(response, "{\"code\":\"1\",\"msg\":\"未登录或登录超时。请重新登录\"}");

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

@@ -1,9 +1,12 @@
 package com.sooka.web.controller.system;
 
+import java.util.ArrayList;
 import java.util.List;
 import java.util.stream.Collectors;
 
 import com.business.slfh.tools.PinYinUtil;
+import com.business.slfh.tools.SendSms;
+import com.sooka.common.utils.StringUtils;
 import com.sooka.system.service.ISysConfigService;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -313,15 +316,33 @@ public class SysUserController extends BaseController
             return AjaxResult.error("初始化失败，没有符合条件的用户");
         }
 
-        String password = configService.selectConfigByKey("sys.user.initPassword");
+        List<SysUser> errorList = new ArrayList<>();
 
         List<SysUser> newList = list.stream().map(sysUser -> {
-            sysUser.setPassword(passwordService.encryptPassword(sysUser.getLoginName(), password, sysUser.getSalt()));
+
+            try {
+                String newPassword = StringUtils.format("LsJgPt{}!@#", sysUser.getPhonenumber());
+
+                sysUser.setPassword(passwordService.encryptPassword(sysUser.getLoginName(), newPassword, sysUser.getSalt()));
+
+                String content = StringUtils.format("尊敬的“数字梨树监管平台”用户您好，根据国家信息化安全检查要求，现对“数字梨树监管平台”进行统一密码调整，调整后，初始密码为【{}】，在平台恢复运行后", newPassword);
+
+                SendSms.sendMessage(sysUser.getPhonenumber(),content);
+            } catch (Exception e) {
+                e.printStackTrace();
+                errorList.add(sysUser);
+            }
+
             return sysUser;
         }).collect(Collectors.toList());
 
+        if (errorList.size() > 0) {
+            return AjaxResult.error(StringUtils.format("初始化失败：{}", errorList.size()));
+        } else {
+            return AjaxResult.success(StringUtils.format("初始化失败：{}", userService.passwordInit(newList)));
+        }
 
-        return AjaxResult.success(userService.passwordInit(newList));
     }
 
+
 }

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

@@ -8,9 +8,9 @@ spring:
             master:
 
 #                现网数据库
-                # url: jdbc:mysql://127.0.0.1:53306/lishu?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&allowMultiQueries=true
-                #username: lsqx
-                # password: Lishu123.456
+                 url: jdbc:mysql://192.168.0.200:3306/sz_lishu?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&allowMultiQueries=true
+                 username: root
+                 password: 910335
 
 #                测试数据库
 #                url: jdbc:mysql://192.168.10.16:53306/lishu?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&allowMultiQueries=true
@@ -18,9 +18,9 @@ spring:
 #                password: Lishu123.456
 
 #                本地数据库
-                url: jdbc:mysql://localhost:3306/lishu?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&serverTimezone=GMT%2B8&allowMultiQueries=true
-                username: root
-                password: root
+#                url: jdbc:mysql://localhost:3306/lishu?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&serverTimezone=GMT%2B8&allowMultiQueries=true
+#                username: root
+#                password: root
 
             # 从库数据源
             slave:

leiSP-admin/src/main/resources/application.yml

@@ -9,9 +9,9 @@ leisp:
   # 实例演示开关
   demoEnabled: true
   # 文件路径 示例（ Windows配置D:/leisp/uploadPath，Linux配置 /home/leisp/uploadPath）
-#  profile: /Users/yanhongliang/Documents/leisp/uploadPath/
+  profile: /Users/yanhongliang/Documents/leisp/uploadPath/
 #  profile: /home/leisp/uploadPath/
-  profile: D:/leisp/uploadPath/
+#  profile: D:/leisp/uploadPath/
   # 获取ip地址开关
   addressEnabled: false
   superMapUrl : http://192.168.1.144:8090/iserver/iClient/forJavaScript
@@ -25,7 +25,7 @@ leisp:
 # 开发环境配置
 server:
   # 服务器的HTTP端口，默认为80
-  port: 80
+  port: 88
   servlet:
     # 应用的访问路径
     context-path: /
@@ -36,6 +36,13 @@ server:
     max-threads: 800
     # Tomcat启动初始化的线程数，默认值25
     min-spare-threads: 30
+  ssl:
+    protocol: TLS
+    key-store: classpath:key.keystore
+    key-alias: tomcat
+    enabled: true
+    key-store-password: 111112
+    key-store-type: JKS
 
 # 日志配置
 logging:

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

@@ -70,10 +70,11 @@
     <div class="signup-footer">
         <div class="pull-left">
             <label style="cursor: pointer;" onmouseover="showAndroidCode()" onmouseout="hideAndroidCode()">安卓手机端</label>
-            &nbsp;&nbsp;|&nbsp;&nbsp;<a title="插件下载" style="color: #ffffff" target="_blank" href="http://218.27.1.154:9090/t/tools.zip">工具包</a>
-            &nbsp;&nbsp;|&nbsp;&nbsp;<a title="手册下载" style="color: #ffffff" target="_blank" href="http://218.27.1.154:9090/t/szlssc.rar">使用手册</a>
+            &nbsp;&nbsp;|&nbsp;&nbsp;<a title="插件下载" style="color: #ffffff" target="_blank" th:href="@{/ruoyi/tools.rar}">工具包</a>
+            <!--&nbsp;&nbsp;|&nbsp;&nbsp;<a title="手册下载" style="color: #ffffff" target="_blank" href="https://218.27.1.154:9090/t/szlssc.rar">使用手册</a>-->
             <br>
-            <img style="width: 126px;height: 126px;display: none" src="http://218.27.1.154:9090/t/szls.png" id="android_download_code">
+            <!--<img style="width: 126px;height: 126px;display: none" th:src="https://218.27.1.154:9090/t/szls.png" id="android_download_code">-->
+            <img style="width: 126px;height: 126px;display: none" th:src="@{/ruoyi/szls.png}" id="android_download_code">
         </div>
     </div>
 </div>

leiSP-admin/src/main/resources/templates/system/user/user.html

@@ -88,7 +88,7 @@
                 <a class="btn btn-warning" onclick="$.table.exportExcel()" shiro:hasPermission="system:user:export">
                     <i class="fa fa-download"></i> 导出
                 </a>
-                <a class="btn btn-info" onclick="passwordInit()" shiro:hasPermission="system:user:passwordInit">
+                <a class="btn btn-info" onclick="passwordInit()" shiro:hasPermission="system:user:remove">
                     <i class="fa fa-info-circle"></i> 初始化
                 </a>
             </div>

leiSP-framework/src/main/java/com/sooka/framework/shiro/service/SysLoginService.java

@@ -23,7 +23,7 @@ import com.sooka.system.service.ISysUserService;
 
 /**
  * 登录校验方法
- * 
+ *
  * @author lei_wang
  */
 @Component
@@ -41,11 +41,11 @@ public class SysLoginService
     public SysUser login(String username, String password)
     {
         // 验证码校验
-        /*if (!StringUtils.isEmpty(ServletUtils.getRequest().getAttribute(ShiroConstants.CURRENT_CAPTCHA)))
+        if (!StringUtils.isEmpty(ServletUtils.getRequest().getAttribute(ShiroConstants.CURRENT_CAPTCHA)))
         {
             AsyncManager.me().execute(AsyncFactory.recordLogininfor(username, Constants.LOGIN_FAIL, MessageUtils.message("user.jcaptcha.error")));
             throw new CaptchaException();
-        }*/
+        }
         // 用户名或密码为空 错误
         if (StringUtils.isEmpty(username) || StringUtils.isEmpty(password))
         {
@@ -86,13 +86,13 @@ public class SysLoginService
             AsyncManager.me().execute(AsyncFactory.recordLogininfor(username, Constants.LOGIN_FAIL, MessageUtils.message("user.not.exists")));
             throw new UserNotExistsException();
         }
-        
+
         if (UserStatus.DELETED.getCode().equals(user.getDelFlag()))
         {
             AsyncManager.me().execute(AsyncFactory.recordLogininfor(username, Constants.LOGIN_FAIL, MessageUtils.message("user.password.delete")));
             throw new UserDeleteException();
         }
-        
+
         if (UserStatus.DISABLE.getCode().equals(user.getStatus()))
         {
             AsyncManager.me().execute(AsyncFactory.recordLogininfor(username, Constants.LOGIN_FAIL, MessageUtils.message("user.blocked", user.getRemark())));

mybusiness/src/main/java/com/business/slfh/manager/hikeventordermanager/service/impl/HikEventOrderServiceImpl.java

@@ -15,7 +15,7 @@ import java.util.List;
 
 /**
  * 海康事件订阅管理Service业务层处理
- * 
+ *
  * @author lei
  * @date 2020-12-24
  */
@@ -27,7 +27,7 @@ public class HikEventOrderServiceImpl implements IHikEventOrderService
 
     /**
      * 查询海康事件订阅管理
-     * 
+     *
      * @param id 海康事件订阅管理ID
      * @return 海康事件订阅管理
      */
@@ -107,7 +107,7 @@ public class HikEventOrderServiceImpl implements IHikEventOrderService
 
     /**
      * 新增海康事件订阅管理
-     * 
+     *
      * @param hikEventOrder 海康事件订阅管理
      * @return 结果
      */
@@ -115,13 +115,14 @@ public class HikEventOrderServiceImpl implements IHikEventOrderService
     public int insertHikEventOrder(HikEventOrder hikEventOrder)
     {
         //hikEventOrder.setCreateTime(DateUtils.getNowDate());
-        return HikSubscription.eventSubscriptionByEventTypes(Long.valueOf(hikEventOrder.getEventTypes()),hikEventOrder.getAddress());
+        long[] types = {Long.valueOf(hikEventOrder.getEventTypes())};
+        return HikSubscription.eventSubscriptionByEventTypes(types,hikEventOrder.getAddress());
         //return hikEventOrderMapper.insertHikEventOrder(hikEventOrder);
     }
 
     /**
      * 修改海康事件订阅管理
-     * 
+     *
      * @param hikEventOrder 海康事件订阅管理
      * @return 结果
      */
@@ -135,20 +136,23 @@ public class HikEventOrderServiceImpl implements IHikEventOrderService
 
     /**
      * 删除海康事件订阅管理对象
-     * 
+     *
      * @param ids 需要删除的数据ID
      * @return 结果
      */
     @Override
     public int deleteHikEventOrderByIds(String ids)
     {
-        return HikSubscription.eventUnSubscriptionByEventTypes(Long.valueOf(ids)).length();
+
+        long[] types = {Long.valueOf(ids)};
+
+        return HikSubscription.eventUnSubscriptionByEventTypes(types).length();
         //return hikEventOrderMapper.deleteHikEventOrderByIds(Convert.toStrArray(ids));
     }
 
     /**
      * 删除海康事件订阅管理信息
-     * 
+     *
      * @param id 海康事件订阅管理ID
      * @return 结果
      */

mybusiness/src/main/java/com/business/slfh/tools/hik/HikSubscription.java

@@ -115,7 +115,7 @@ public class HikSubscription {
     /**
      * 按事件类型订阅事件
      */
-    public static int eventSubscriptionByEventTypes(long type,String eventDest) {
+    public static int eventSubscriptionByEventTypes(long[] types,String eventDest) {
         int res = 0;
         final String VechicleDataApi = ARTEMIS_PATH + "/api/eventService/v1/eventSubscriptionByEventTypes";
         Map<String, String> path = new HashMap<String, String>(2) {
@@ -125,7 +125,6 @@ public class HikSubscription {
         };
 
         JSONObject jsonBody = new JSONObject();
-        long[] types = {type};
         jsonBody.put("eventTypes", types);
 
         jsonBody.put("eventDest", eventDest);
@@ -207,7 +206,7 @@ public class HikSubscription {
 
 
 
-    public static String eventUnSubscriptionByEventTypes(long type){
+    public static String eventUnSubscriptionByEventTypes(long[] types){
         final String VechicleDataApi = ARTEMIS_PATH + "/api/eventService/v1/eventUnSubscriptionByEventTypes";
         Map<String, String> path = new HashMap<String, String>(2) {
             {
@@ -216,7 +215,6 @@ public class HikSubscription {
         };
 
         JSONObject jsonBody = new JSONObject();
-        long[] types = {type};
         jsonBody.put("eventTypes", types);
         //jsonBody.put("eventLvl", 3);
         String body = jsonBody.toJSONString();
@@ -289,23 +287,17 @@ public class HikSubscription {
 
     public static void main(String[] args) {
 
-        /*
+        //*
 
         //订阅
 
-//        long[] subscription = {169001001L};
-//
-//        for (long l : subscription) {
-//            eventSubscriptionByEventTypes(l,"http://192.168.10.15:9090/business/app/hikc/cameraHikByEventFire/");
-//        }
+        long[] subscription = {221001001L,192513L,192514L,192515L,169001001L};
+        eventSubscriptionByEventTypes(subscription,"https://192.168.10.15:9090/business/app/hikc/cameraHikByEventFire/");
 
         //取消订阅
 
-        long[] unSubscription = {221001001L,192513L,192514L,192515L};
-
-        for (long l : unSubscription) {
-            eventUnSubscriptionByEventTypes(l);
-        }
+//        long[] unSubscription = {221001001L,192513L,192514L,192515L,169001001L};
+//        eventUnSubscriptionByEventTypes(unSubscription);
 
         //查询已经订阅的事件
         eventSubscriptionView();
@@ -313,7 +305,7 @@ public class HikSubscription {
         //*/
 
         //订阅警戒头事件
-//        eventSubscriptionByEventTypes(131588,"http://192.168.10.15:9090/business/app/hikc/cameraHikByEventRcv/");
+//        eventSubscriptionByEventTypes(131588,"https://192.168.10.15:9090/business/app/hikc/cameraHikByEventRcv/");
 
 //        eventUnSubscriptionByEventTypes(131588);
 

mybusiness/src/main/java/com/business/slfh/visualization/event/controller/Visualization_Event_Controller.java

@@ -131,10 +131,12 @@ public class Visualization_Event_Controller extends AppBaseController {
     private String initMap(ModelMap map, String s) {
         logger.info("getVisualizationMap");
         String basepath =iSysConfigService.selectConfigByKey("supmap_service_path");
+        String supermap_map_yingxiang =iSysConfigService.selectConfigByKey("supermap_map_yingxiang");
         String iserver =iSysConfigService.selectConfigByKey("supermap_iserver");
         String datapath =iSysConfigService.selectConfigByKey("supmap_service_data_path");
         String centerPoint =iSysDictDataService.selectDictLabel("supermap_centerpoint","supermap_centerpoint_7");
         map.put("iserver",iserver);
+        map.put("supermap_map_yingxiang", supermap_map_yingxiang);
         map.put("basepath",basepath);
         map.put("datapath",datapath);
         map.put("centerPoint",centerPoint);

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

@@ -16,7 +16,7 @@
             <div class="ibox" style="overflow-y: auto;">
                 <div class="ibox-content">
                     <!--视频窗口展示-->
-                    <iframe id="mIframe" src="http://218.27.1.154:9090/hik_video/en/demo.html" style="width:100%;height:900px;"></iframe>
+                    <iframe id="mIframe" src="https://218.27.1.154:9090/hik_video/en/demo.html" style="width:100%;height:900px;"></iframe>
                     <!-- <iframe id="mIframe" src="http://192.168.3.101:88/en/demo.html" style="width:100%;height:900px;"></iframe>-->
                  </div>
              </div>
@@ -54,4 +54,4 @@
 
 </script>
 </body>
-</html>
+</html>

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

@@ -68,7 +68,7 @@
     $(window).load(function () {
         initPlugin();
     });
-    
+
     function openOnePreview() {
         window.open(ctx + "business/manager/cameramanager/onePreview/"+cId);
     }
@@ -104,7 +104,7 @@
                         initPlugin();
                     }, 3000)
                 } else {
-                    $("#playWnd").html("插件启动失败，请检查插件是否安装！<a target='_blank' href='http://218.27.1.154:9090/t/VideoWebPlugin.exe'>点此下载</a>");
+                    $("#playWnd").html("插件启动失败，请检查插件是否安装！<a target='_blank' href='https://218.27.1.154:9090/t/VideoWebPlugin.exe'>点此下载</a>");
                 }
             },
             cbConnectClose: function (bNormalClose) {
@@ -318,11 +318,16 @@
         var jPassword = [[${password}]];
         var jDeviceport = [[${deviceport}]];
 
-        var url = 'http://localhost:8899/camera_id='+jIp+","+jPort+","+jUsername+","+jPassword+","+jDeviceport;
+        // 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;
 
         $.ajax({
             dataType: 'json',
-            url: url,
+            url: 'http://localhost:8899/open/ie',
+            data: {
+              url: path
+            },
             success: function (result) {
                 console.log(result);
             },
@@ -367,4 +372,4 @@
 
 </script>
 </body>
-</html>
+</html>

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

@@ -239,7 +239,7 @@
                         initPlugin();
                     }, 3000)
                 } else {
-                    $("#playWnd").html("插件启动失败，请检查插件是否安装！<a target='_blank' href='http://218.27.1.154:9090/t/VideoWebPlugin.exe'>点此下载</a>");
+                    $("#playWnd").html("插件启动失败，请检查插件是否安装！<a target='_blank' href='https://218.27.1.154:9090/t/VideoWebPlugin.exe'>点此下载</a>");
                 }
             },
             cbConnectClose: function () {
@@ -527,4 +527,4 @@
 
 </script>
 </body>
-</html>
+</html>

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

@@ -47,7 +47,7 @@
             <div class="ibox" style="overflow-y: auto;">
                 <div class="ibox-content">
                     <!--视频窗口展示-->
-                    <iframe id="mIframe" src="http://218.27.1.154:9090/hik_video/en/demo.html" style="width:100%;height:900px;"></iframe>
+                    <iframe id="mIframe" src="https://218.27.1.154:9090/hik_video/en/demo.html" style="width:100%;height:900px;"></iframe>
                     <!--<iframe id="mIframe" src="http://121.37.83.100:9989/en/demo.html" style="width:100%;height:900px;"></iframe>-->
                 </div>
 <!--                <div style="text-align: end;padding-right: 3rem;">-->
@@ -176,4 +176,4 @@
 
 </script>
 </body>
-</html>
+</html>

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

@@ -162,7 +162,7 @@
                         initPlugin();
                     }, 3000)
                 } else {
-                    $("#playWnd").html("插件启动失败，请检查插件是否安装！<a target='_blank' href='http://218.27.1.154:9090/t/VideoWebPlugin.exe'>点此下载</a>");
+                    $("#playWnd").html("插件启动失败，请检查插件是否安装！<a target='_blank' href='https://218.27.1.154:9090/t/VideoWebPlugin.exe'>点此下载</a>");
                 }
             },
             cbConnectClose: function (bNormalClose) {
@@ -370,4 +370,4 @@
 
 </script>
 </body>
-</html>
+</html>

mybusiness/src/main/resources/templates/business/visualization/map.html

@@ -26,6 +26,7 @@
 <script th:src="@{/ajax/libs/fullscreen/jquery.fullscreen.js}"></script>
 <script type="text/javascript" th:src="@{/util/businessutil.js}"></script>
 <script type="text/javascript">
+    var supermapMapYingXiang = "[[${supermap_map_yingxiang}]]";
     var iServer = "[[${iserver}]]";
     var basePath = "[[${basepath}]]";
     var dataUrl = "[[${datapath}]]";
@@ -42,15 +43,18 @@
         zoom: 10
     });
 
+    // L.supermap.tiledMapLayer(iServer+"/map-china400/rest/maps/China_4326", {
+    //     opacity:0.3,
+    //     noWrap: true
+    // }).addTo(map);
 
-    L.supermap.tiledMapLayer(iServer+"/map-china400/rest/maps/China_4326", {
-        opacity:0.3,
+    var yingxiangtu = L.supermap.tiledMapLayer(supermapMapYingXiang, {
         noWrap: true
     }).addTo(map);
 
-    var yingxiangtu = L.supermap.tiledMapLayer(basePath+"梨树影像", {
-        noWrap: true
-    }).addTo(map);
+    // var yingxiangtu = L.supermap.tiledMapLayer(basePath+"梨树影像", {
+    //     noWrap: true
+    // }).addTo(map);
 
     var lunkuotu = L.supermap.tiledMapLayer(basePath+"各林场轮廓图", {
         transparent:true,
@@ -1919,4 +1923,4 @@
     }
 </script>
 </body>
-</html>
+</html>

mybusiness/src/main/resources/templates/business/visualization/sp.html

@@ -8,7 +8,7 @@
 </head>
 
 <body>
-<iframe id="mIframe" src="http://218.27.1.154:9090/hik/cn/demo.html" style="width:950px;height:500px;"></iframe>
+<iframe id="mIframe" src="https://218.27.1.154:9090/hik/cn/demo.html" style="width:950px;height:500px;"></iframe>
 </body>
 <script th:src="@{/js/jquery.min.js}"></script>
 <script th:inline="javascript">
@@ -42,4 +42,4 @@
 	}
 	*/
 </script>
-</html>
+</html>