1

.idea/artifacts/leisp_admin_war_exploded.xml

@@ -68,20 +68,20 @@
           <element id="library" level="project" name="Maven: com.alibaba:druid:1.1.14" />
           <element id="library" level="project" name="Maven: com.github.penggle:kaptcha:2.3.2" />
           <element id="library" level="project" name="Maven: com.jhlabs:filters:2.0.235-1" />
-          <element id="library" level="project" name="Maven: org.apache.shiro:shiro-spring:1.5.3" />
-          <element id="library" level="project" name="Maven: org.apache.shiro:shiro-core:1.5.3" />
-          <element id="library" level="project" name="Maven: org.apache.shiro:shiro-lang:1.5.3" />
-          <element id="library" level="project" name="Maven: org.apache.shiro:shiro-crypto-hash:1.5.3" />
-          <element id="library" level="project" name="Maven: org.apache.shiro:shiro-crypto-core:1.5.3" />
-          <element id="library" level="project" name="Maven: org.apache.shiro:shiro-crypto-cipher:1.5.3" />
-          <element id="library" level="project" name="Maven: org.apache.shiro:shiro-config-core:1.5.3" />
-          <element id="library" level="project" name="Maven: org.apache.shiro:shiro-config-ogdl:1.5.3" />
+          <element id="library" level="project" name="Maven: org.apache.shiro:shiro-spring:1.7.1" />
+          <element id="library" level="project" name="Maven: org.apache.shiro:shiro-core:1.7.1" />
+          <element id="library" level="project" name="Maven: org.apache.shiro:shiro-lang:1.7.1" />
+          <element id="library" level="project" name="Maven: org.apache.shiro:shiro-crypto-hash:1.7.1" />
+          <element id="library" level="project" name="Maven: org.apache.shiro:shiro-crypto-core:1.7.1" />
+          <element id="library" level="project" name="Maven: org.apache.shiro:shiro-crypto-cipher:1.7.1" />
+          <element id="library" level="project" name="Maven: org.apache.shiro:shiro-config-core:1.7.1" />
+          <element id="library" level="project" name="Maven: org.apache.shiro:shiro-config-ogdl:1.7.1" />
           <element id="library" level="project" name="Maven: commons-beanutils:commons-beanutils:1.9.4" />
-          <element id="library" level="project" name="Maven: org.apache.shiro:shiro-event:1.5.3" />
-          <element id="library" level="project" name="Maven: org.apache.shiro:shiro-web:1.5.3" />
+          <element id="library" level="project" name="Maven: org.apache.shiro:shiro-event:1.7.1" />
+          <element id="library" level="project" name="Maven: org.apache.shiro:shiro-web:1.7.1" />
           <element id="library" level="project" name="Maven: org.owasp.encoder:encoder:1.2.2" />
-          <element id="library" level="project" name="Maven: org.apache.shiro:shiro-ehcache:1.5.3" />
-          <element id="library" level="project" name="Maven: org.apache.shiro:shiro-cache:1.5.3" />
+          <element id="library" level="project" name="Maven: org.apache.shiro:shiro-ehcache:1.7.1" />
+          <element id="library" level="project" name="Maven: org.apache.shiro:shiro-cache:1.7.1" />
           <element id="library" level="project" name="Maven: net.sf.ehcache:ehcache-core:2.6.11" />
           <element id="library" level="project" name="Maven: com.github.theborakompanioni:thymeleaf-extras-shiro:2.0.0" />
           <element id="library" level="project" name="Maven: eu.bitwalker:UserAgentUtils:1.19" />
@@ -115,7 +115,7 @@
           <element id="library" level="project" name="Maven: org.apache.commons:commons-lang3:3.8.1" />
           <element id="library" level="project" name="Maven: com.fasterxml.jackson.core:jackson-databind:2.9.7" />
           <element id="library" level="project" name="Maven: com.fasterxml.jackson.core:jackson-core:2.9.7" />
-          <element id="library" level="project" name="Maven: com.alibaba:fastjson:1.2.70" />
+          <element id="library" level="project" name="Maven: com.alibaba:fastjson:1.2.83" />
           <element id="library" level="project" name="Maven: commons-io:commons-io:2.5" />
           <element id="library" level="project" name="Maven: commons-fileupload:commons-fileupload:1.3.3" />
           <element id="library" level="project" name="Maven: org.apache.poi:poi-ooxml:3.17" />

.idea/libraries/Maven__com_alibaba_fastjson_1_2_70.xml

@@ -1,13 +1,13 @@
 <component name="libraryTable">
-  <library name="Maven: com.alibaba:fastjson:1.2.70">
+  <library name="Maven: com.alibaba:fastjson:1.2.83">
     <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/com/alibaba/fastjson/1.2.70/fastjson-1.2.70.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/com/alibaba/fastjson/1.2.83/fastjson-1.2.83.jar!/" />
     </CLASSES>
     <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/com/alibaba/fastjson/1.2.70/fastjson-1.2.70-javadoc.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/com/alibaba/fastjson/1.2.83/fastjson-1.2.83-javadoc.jar!/" />
     </JAVADOC>
     <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/com/alibaba/fastjson/1.2.70/fastjson-1.2.70-sources.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/com/alibaba/fastjson/1.2.83/fastjson-1.2.83-sources.jar!/" />
     </SOURCES>
   </library>
 </component>

.idea/libraries/Maven__org_apache_shiro_shiro_cache_1_5_3.xml

@@ -1,13 +0,0 @@
-<component name="libraryTable">
-  <library name="Maven: org.apache.shiro:shiro-cache:1.5.3">
-    <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/apache/shiro/shiro-cache/1.5.3/shiro-cache-1.5.3.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/org/apache/shiro/shiro-cache/1.5.3/shiro-cache-1.5.3-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/apache/shiro/shiro-cache/1.5.3/shiro-cache-1.5.3-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>

.idea/libraries/Maven__org_apache_shiro_shiro_config_core_1_5_3.xml

@@ -1,13 +0,0 @@
-<component name="libraryTable">
-  <library name="Maven: org.apache.shiro:shiro-config-core:1.5.3">
-    <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/apache/shiro/shiro-config-core/1.5.3/shiro-config-core-1.5.3.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/org/apache/shiro/shiro-config-core/1.5.3/shiro-config-core-1.5.3-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/apache/shiro/shiro-config-core/1.5.3/shiro-config-core-1.5.3-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>

.idea/libraries/Maven__org_apache_shiro_shiro_config_ogdl_1_5_3.xml

@@ -1,13 +0,0 @@
-<component name="libraryTable">
-  <library name="Maven: org.apache.shiro:shiro-config-ogdl:1.5.3">
-    <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/apache/shiro/shiro-config-ogdl/1.5.3/shiro-config-ogdl-1.5.3.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/org/apache/shiro/shiro-config-ogdl/1.5.3/shiro-config-ogdl-1.5.3-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/apache/shiro/shiro-config-ogdl/1.5.3/shiro-config-ogdl-1.5.3-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>

.idea/libraries/Maven__org_apache_shiro_shiro_core_1_5_3.xml

@@ -1,13 +0,0 @@
-<component name="libraryTable">
-  <library name="Maven: org.apache.shiro:shiro-core:1.5.3">
-    <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/apache/shiro/shiro-core/1.5.3/shiro-core-1.5.3.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/org/apache/shiro/shiro-core/1.5.3/shiro-core-1.5.3-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/apache/shiro/shiro-core/1.5.3/shiro-core-1.5.3-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>

.idea/libraries/Maven__org_apache_shiro_shiro_crypto_cipher_1_5_3.xml

@@ -1,13 +0,0 @@
-<component name="libraryTable">
-  <library name="Maven: org.apache.shiro:shiro-crypto-cipher:1.5.3">
-    <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/apache/shiro/shiro-crypto-cipher/1.5.3/shiro-crypto-cipher-1.5.3.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/org/apache/shiro/shiro-crypto-cipher/1.5.3/shiro-crypto-cipher-1.5.3-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/apache/shiro/shiro-crypto-cipher/1.5.3/shiro-crypto-cipher-1.5.3-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>

.idea/libraries/Maven__org_apache_shiro_shiro_crypto_core_1_5_3.xml

@@ -1,13 +0,0 @@
-<component name="libraryTable">
-  <library name="Maven: org.apache.shiro:shiro-crypto-core:1.5.3">
-    <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/apache/shiro/shiro-crypto-core/1.5.3/shiro-crypto-core-1.5.3.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/org/apache/shiro/shiro-crypto-core/1.5.3/shiro-crypto-core-1.5.3-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/apache/shiro/shiro-crypto-core/1.5.3/shiro-crypto-core-1.5.3-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>

.idea/libraries/Maven__org_apache_shiro_shiro_crypto_hash_1_5_3.xml

@@ -1,13 +0,0 @@
-<component name="libraryTable">
-  <library name="Maven: org.apache.shiro:shiro-crypto-hash:1.5.3">
-    <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/apache/shiro/shiro-crypto-hash/1.5.3/shiro-crypto-hash-1.5.3.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/org/apache/shiro/shiro-crypto-hash/1.5.3/shiro-crypto-hash-1.5.3-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/apache/shiro/shiro-crypto-hash/1.5.3/shiro-crypto-hash-1.5.3-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>

.idea/libraries/Maven__org_apache_shiro_shiro_ehcache_1_5_3.xml

@@ -1,13 +0,0 @@
-<component name="libraryTable">
-  <library name="Maven: org.apache.shiro:shiro-ehcache:1.5.3">
-    <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/apache/shiro/shiro-ehcache/1.5.3/shiro-ehcache-1.5.3.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/org/apache/shiro/shiro-ehcache/1.5.3/shiro-ehcache-1.5.3-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/apache/shiro/shiro-ehcache/1.5.3/shiro-ehcache-1.5.3-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>

.idea/libraries/Maven__org_apache_shiro_shiro_event_1_5_3.xml

@@ -1,13 +0,0 @@
-<component name="libraryTable">
-  <library name="Maven: org.apache.shiro:shiro-event:1.5.3">
-    <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/apache/shiro/shiro-event/1.5.3/shiro-event-1.5.3.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/org/apache/shiro/shiro-event/1.5.3/shiro-event-1.5.3-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/apache/shiro/shiro-event/1.5.3/shiro-event-1.5.3-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>

.idea/libraries/Maven__org_apache_shiro_shiro_lang_1_5_3.xml

@@ -1,13 +0,0 @@
-<component name="libraryTable">
-  <library name="Maven: org.apache.shiro:shiro-lang:1.5.3">
-    <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/apache/shiro/shiro-lang/1.5.3/shiro-lang-1.5.3.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/org/apache/shiro/shiro-lang/1.5.3/shiro-lang-1.5.3-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/apache/shiro/shiro-lang/1.5.3/shiro-lang-1.5.3-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>

.idea/libraries/Maven__org_apache_shiro_shiro_spring_1_5_3.xml

@@ -1,13 +0,0 @@
-<component name="libraryTable">
-  <library name="Maven: org.apache.shiro:shiro-spring:1.5.3">
-    <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/apache/shiro/shiro-spring/1.5.3/shiro-spring-1.5.3.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/org/apache/shiro/shiro-spring/1.5.3/shiro-spring-1.5.3-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/apache/shiro/shiro-spring/1.5.3/shiro-spring-1.5.3-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>

.idea/libraries/Maven__org_apache_shiro_shiro_web_1_5_3.xml

@@ -1,13 +0,0 @@
-<component name="libraryTable">
-  <library name="Maven: org.apache.shiro:shiro-web:1.5.3">
-    <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/apache/shiro/shiro-web/1.5.3/shiro-web-1.5.3.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/org/apache/shiro/shiro-web/1.5.3/shiro-web-1.5.3-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/apache/shiro/shiro-web/1.5.3/shiro-web-1.5.3-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>

leiSP-admin/leisp-admin.iml

@@ -81,20 +81,20 @@
     <orderEntry type="library" name="Maven: com.alibaba:druid:1.1.14" level="project" />
     <orderEntry type="library" name="Maven: com.github.penggle:kaptcha:2.3.2" level="project" />
     <orderEntry type="library" name="Maven: com.jhlabs:filters:2.0.235-1" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.shiro:shiro-spring:1.5.3" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.shiro:shiro-core:1.5.3" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.shiro:shiro-lang:1.5.3" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.shiro:shiro-crypto-hash:1.5.3" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.shiro:shiro-crypto-core:1.5.3" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.shiro:shiro-crypto-cipher:1.5.3" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.shiro:shiro-config-core:1.5.3" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.shiro:shiro-config-ogdl:1.5.3" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.shiro:shiro-spring:1.7.1" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.shiro:shiro-core:1.7.1" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.shiro:shiro-lang:1.7.1" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.shiro:shiro-crypto-hash:1.7.1" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.shiro:shiro-crypto-core:1.7.1" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.shiro:shiro-crypto-cipher:1.7.1" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.shiro:shiro-config-core:1.7.1" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.shiro:shiro-config-ogdl:1.7.1" level="project" />
     <orderEntry type="library" name="Maven: commons-beanutils:commons-beanutils:1.9.4" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.shiro:shiro-event:1.5.3" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.shiro:shiro-web:1.5.3" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.shiro:shiro-event:1.7.1" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.shiro:shiro-web:1.7.1" level="project" />
     <orderEntry type="library" name="Maven: org.owasp.encoder:encoder:1.2.2" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.shiro:shiro-ehcache:1.5.3" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.shiro:shiro-cache:1.5.3" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.shiro:shiro-ehcache:1.7.1" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.shiro:shiro-cache:1.7.1" level="project" />
     <orderEntry type="library" name="Maven: net.sf.ehcache:ehcache-core:2.6.11" level="project" />
     <orderEntry type="library" name="Maven: com.github.theborakompanioni:thymeleaf-extras-shiro:2.0.0" level="project" />
     <orderEntry type="library" name="Maven: eu.bitwalker:UserAgentUtils:1.19" level="project" />
@@ -122,7 +122,7 @@
     <orderEntry type="library" name="Maven: org.apache.commons:commons-lang3:3.8.1" level="project" />
     <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-databind:2.9.7" level="project" />
     <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-core:2.9.7" level="project" />
-    <orderEntry type="library" name="Maven: com.alibaba:fastjson:1.2.70" level="project" />
+    <orderEntry type="library" name="Maven: com.alibaba:fastjson:1.2.83" level="project" />
     <orderEntry type="library" name="Maven: commons-io:commons-io:2.5" level="project" />
     <orderEntry type="library" name="Maven: commons-fileupload:commons-fileupload:1.3.3" level="project" />
     <orderEntry type="library" name="Maven: org.apache.poi:poi-ooxml:3.17" level="project" />

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

@@ -1,15 +1,19 @@
 package com.sooka.web.controller.system;
 
+import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
+
+import com.sooka.framework.util.ShiroUtils;
+import com.sooka.system.domain.SysUser;
+import com.sooka.system.service.ISysUserService;
 import org.apache.shiro.SecurityUtils;
 import org.apache.shiro.authc.AuthenticationException;
 import org.apache.shiro.authc.UsernamePasswordToken;
 import org.apache.shiro.subject.Subject;
 import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.ui.ModelMap;
+import org.springframework.web.bind.annotation.*;
 import com.sooka.common.core.controller.BaseController;
 import com.sooka.common.core.domain.AjaxResult;
 import com.sooka.common.utils.ServletUtils;
@@ -21,14 +25,11 @@ import com.sooka.common.utils.StringUtils;
  * @author lei_wang
  */
 @Controller
-public class SysLoginController extends BaseController
-{
+public class SysLoginController extends BaseController {
     @GetMapping("/login")
-    public String login(HttpServletRequest request, HttpServletResponse response)
-    {
+    public String login(HttpServletRequest request, HttpServletResponse response) {
         // 如果是Ajax请求，返回Json字符串。
-        if (ServletUtils.isAjaxRequest(request))
-        {
+        if (ServletUtils.isAjaxRequest(request)) {
             return ServletUtils.renderString(response, "{\"code\":\"1\",\"msg\":\"未登录或登录超时。请重新登录\"}");
         }
 
@@ -37,11 +38,9 @@ public class SysLoginController extends BaseController
 
 
     @GetMapping("/syslogin")
-    public String syslogin(HttpServletRequest request, HttpServletResponse response)
-    {
+    public String syslogin(HttpServletRequest request, HttpServletResponse response) {
         // 如果是Ajax请求，返回Json字符串。
-        if (ServletUtils.isAjaxRequest(request))
-        {
+        if (ServletUtils.isAjaxRequest(request)) {
             return ServletUtils.renderString(response, "{\"code\":\"1\",\"msg\":\"未登录或登录超时。请重新登录\"}");
         }
 
@@ -49,26 +48,31 @@ public class SysLoginController extends BaseController
     }
 
 
+    @Resource
+    ISysUserService iSysUserService;
+    @ResponseBody
+    @RequestMapping("getuserinfo")
+    public AjaxResult getuserinfo(){
+        String loginname =getSession().getAttribute("loginusername").toString();
+        SysUser sysUser = iSysUserService.selectUserByLoginName(loginname);
+        return AjaxResult.success(sysUser);
+    }
 
 
     @PostMapping("/login")
     @ResponseBody
-    public AjaxResult ajaxLogin(String username, String password, Boolean rememberMe)
-    {
+    public AjaxResult ajaxLogin(String username, String password, Boolean rememberMe, ModelMap map) {
         UsernamePasswordToken token = new UsernamePasswordToken(username, password, rememberMe);
         Subject subject = SecurityUtils.getSubject();
-        try
-        {
+        try {
             String loginname = token.getUsername();
-            getSession().setAttribute("loginusername",loginname);
+            getSession().setAttribute("loginusername", loginname);
             subject.login(token);
+            map.put("deptId", ShiroUtils.getSysUser().getDeptId());
             return success();
-        }
-        catch (AuthenticationException e)
-        {
+        } catch (AuthenticationException e) {
             String msg = "用户或密码错误";
-            if (StringUtils.isNotEmpty(e.getMessage()))
-            {
+            if (StringUtils.isNotEmpty(e.getMessage())) {
                 msg = e.getMessage();
             }
             return error(msg);
@@ -76,8 +80,7 @@ public class SysLoginController extends BaseController
     }
 
     @GetMapping("/unauth")
-    public String unauth()
-    {
+    public String unauth() {
         return "error/unauth";
     }
 }

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

@@ -7,8 +7,12 @@ spring:
             # 主库数据源
             master:
 
-#                url: jdbc:mysql://127.0.0.1:53306/jian?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
-                url: jdbc:mysql://218.27.1.157:53306/jian?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
+                url: jdbc:mysql://192.168.1.5:53306/jian?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
+##                url: jdbc:mysql://218.27.1.157:53306/jian?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
+#                username: root
+#                password: sys200888
+#                url: jdbc:mysql://192.168.0.200:3306/jian?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
+#                url: jdbc:mysql://218.27.1.157:53306/jian?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
                 username: root
                 password: sys200888
 

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

@@ -190,7 +190,7 @@
                 </div>
                 <span class="index-tit">集安市智慧林业综合管理平台</span>
                 <ul class="nav navbar-top-links navbar-right welcome-message">
-                    <li><a title="电视墙" href="http://36.97.65.105:9090/dahua/demo-dsd.html" target="_blank">电视墙</a></li>
+                    <li><a id="dsq" title="电视墙" href="http://122.141.177.213:9090/dahua/demo-dsd.html" target="_blank">电视墙</a></li>
                     <li><a title="插件下载" href="http://218.27.1.157:9091/soft/slfhplug.zip" target="_blank">插件下载</a></li>
                     <li><a title="安卓APP" onclick="showappcode()" onmouseover="$('#appcode').show(100)"
                            onmouseout="$('#appcode').hide(100)">安卓APP</a>
@@ -273,8 +273,7 @@
 <script th:src="@{/ruoyi/index.js}"></script>
 <script th:src="@{/ajax/libs/fullscreen/jquery.fullscreen.js}"></script>
 <script th:inline="javascript">
-    var ctx = [[@{
-        /}]];
+
 // 皮肤缓存
         var skin = storage.get("skin");
 // history（表示去掉地址的#）否则地址以"#"形式展示
@@ -333,6 +332,16 @@
             }
         });
 
+        $(document).ready(function () {
+            $.ajax({
+                url :"/getuserinfo",
+                success : function (e) {
+                    console.log(e)
+                    $("#dsq").attr("href","http://122.141.177.213:9090/dahua/demo-dsd.html?deptId="+e.data.deptId)
+                }
+            })
+
+        });
 </script>
 </body>
 </html>

leiSP-admin/target/classes/application-druid.yml

@@ -7,7 +7,11 @@ spring:
             # 主库数据源
             master:
 
-                url: jdbc:mysql://127.0.0.1:53306/jian?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
+                url: jdbc:mysql://192.168.1.5:53306/jian?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
+##                url: jdbc:mysql://218.27.1.157:53306/jian?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
+#                username: root
+#                password: sys200888
+#                url: jdbc:mysql://192.168.0.200:3306/jian?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
 #                url: jdbc:mysql://218.27.1.157:53306/jian?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
                 username: root
                 password: sys200888

leiSP-admin/target/classes/templates/index.html

@@ -190,7 +190,7 @@
                 </div>
                 <span class="index-tit">集安市智慧林业综合管理平台</span>
                 <ul class="nav navbar-top-links navbar-right welcome-message">
-                    <li><a title="电视墙" href="http://36.97.65.105:9090/dahua/demo-dsd.html" target="_blank">电视墙</a></li>
+                    <li><a id="dsq" title="电视墙" href="http://122.141.177.213:9090/dahua/demo-dsd.html" target="_blank">电视墙</a></li>
                     <li><a title="插件下载" href="http://218.27.1.157:9091/soft/slfhplug.zip" target="_blank">插件下载</a></li>
                     <li><a title="安卓APP" onclick="showappcode()" onmouseover="$('#appcode').show(100)"
                            onmouseout="$('#appcode').hide(100)">安卓APP</a>
@@ -273,8 +273,7 @@
 <script th:src="@{/ruoyi/index.js}"></script>
 <script th:src="@{/ajax/libs/fullscreen/jquery.fullscreen.js}"></script>
 <script th:inline="javascript">
-    var ctx = [[@{
-        /}]];
+
 // 皮肤缓存
         var skin = storage.get("skin");
 // history（表示去掉地址的#）否则地址以"#"形式展示
@@ -333,6 +332,16 @@
             }
         });
 
+        $(document).ready(function () {
+            $.ajax({
+                url :"/getuserinfo",
+                success : function (e) {
+                    console.log(e)
+                    $("#dsq").attr("href","http://122.141.177.213:9090/dahua/demo-dsd.html?deptId="+e.data.deptId)
+                }
+            })
+
+        });
 </script>
 </body>
 </html>

leiSP-admin/target/leisp-admin/WEB-INF/classes/application-druid.yml

@@ -7,7 +7,11 @@ spring:
             # 主库数据源
             master:
 
-                url: jdbc:mysql://127.0.0.1:53306/jian?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
+                url: jdbc:mysql://192.168.1.5:53306/jian?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
+##                url: jdbc:mysql://218.27.1.157:53306/jian?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
+#                username: root
+#                password: sys200888
+#                url: jdbc:mysql://192.168.0.200:3306/jian?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
 #                url: jdbc:mysql://218.27.1.157:53306/jian?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
                 username: root
                 password: sys200888

leiSP-admin/target/leisp-admin/WEB-INF/classes/templates/index.html

@@ -190,7 +190,7 @@
                 </div>
                 <span class="index-tit">集安市智慧林业综合管理平台</span>
                 <ul class="nav navbar-top-links navbar-right welcome-message">
-                    <li><a title="电视墙" href="http://36.97.65.105:9090/dahua/demo-dsd.html" target="_blank">电视墙</a></li>
+                    <li><a id="dsq" title="电视墙" href="http://122.141.177.213:9090/dahua/demo-dsd.html" target="_blank">电视墙</a></li>
                     <li><a title="插件下载" href="http://218.27.1.157:9091/soft/slfhplug.zip" target="_blank">插件下载</a></li>
                     <li><a title="安卓APP" onclick="showappcode()" onmouseover="$('#appcode').show(100)"
                            onmouseout="$('#appcode').hide(100)">安卓APP</a>
@@ -273,8 +273,7 @@
 <script th:src="@{/ruoyi/index.js}"></script>
 <script th:src="@{/ajax/libs/fullscreen/jquery.fullscreen.js}"></script>
 <script th:inline="javascript">
-    var ctx = [[@{
-        /}]];
+
 // 皮肤缓存
         var skin = storage.get("skin");
 // history（表示去掉地址的#）否则地址以"#"形式展示
@@ -333,6 +332,16 @@
             }
         });
 
+        $(document).ready(function () {
+            $.ajax({
+                url :"/getuserinfo",
+                success : function (e) {
+                    console.log(e)
+                    $("#dsq").attr("href","http://122.141.177.213:9090/dahua/demo-dsd.html?deptId="+e.data.deptId)
+                }
+            })
+
+        });
 </script>
 </body>
 </html>

leiSP-common/leisp-common.iml

@@ -27,17 +27,17 @@
     <orderEntry type="library" name="Maven: org.springframework:spring-core:5.1.3.RELEASE" level="project" />
     <orderEntry type="library" name="Maven: org.springframework:spring-jcl:5.1.3.RELEASE" level="project" />
     <orderEntry type="library" name="Maven: org.springframework:spring-web:5.1.3.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.shiro:shiro-core:1.5.3" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.shiro:shiro-lang:1.5.3" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.shiro:shiro-cache:1.5.3" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.shiro:shiro-crypto-hash:1.5.3" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.shiro:shiro-crypto-core:1.5.3" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.shiro:shiro-crypto-cipher:1.5.3" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.shiro:shiro-config-core:1.5.3" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.shiro:shiro-config-ogdl:1.5.3" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.shiro:shiro-core:1.7.1" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.shiro:shiro-lang:1.7.1" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.shiro:shiro-cache:1.7.1" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.shiro:shiro-crypto-hash:1.7.1" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.shiro:shiro-crypto-core:1.7.1" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.shiro:shiro-crypto-cipher:1.7.1" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.shiro:shiro-config-core:1.7.1" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.shiro:shiro-config-ogdl:1.7.1" level="project" />
     <orderEntry type="library" name="Maven: commons-beanutils:commons-beanutils:1.9.4" level="project" />
     <orderEntry type="library" name="Maven: commons-collections:commons-collections:3.2.2" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.shiro:shiro-event:1.5.3" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.shiro:shiro-event:1.7.1" level="project" />
     <orderEntry type="library" name="Maven: com.github.pagehelper:pagehelper-spring-boot-starter:1.2.5" level="project" />
     <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter:2.1.1.RELEASE" level="project" />
     <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot:2.1.1.RELEASE" level="project" />
@@ -65,7 +65,7 @@
     <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-databind:2.9.7" level="project" />
     <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-annotations:2.9.0" level="project" />
     <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-core:2.9.7" level="project" />
-    <orderEntry type="library" name="Maven: com.alibaba:fastjson:1.2.70" level="project" />
+    <orderEntry type="library" name="Maven: com.alibaba:fastjson:1.2.83" level="project" />
     <orderEntry type="library" name="Maven: commons-io:commons-io:2.5" level="project" />
     <orderEntry type="library" name="Maven: commons-fileupload:commons-fileupload:1.3.3" level="project" />
     <orderEntry type="library" name="Maven: org.apache.poi:poi-ooxml:3.17" level="project" />

leiSP-common/target/maven-archiver/pom.properties

@@ -1,5 +1,5 @@
 #Generated by Maven
-#Mon Apr 04 15:00:11 CST 2022
+#Fri Sep 23 13:21:06 CST 2022
 groupId=com.leisp
 artifactId=leisp-common
 version=1.0.0

leiSP-framework/leisp-framework.iml

@@ -61,21 +61,21 @@
     <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-autoconfigure:2.1.1.RELEASE" level="project" />
     <orderEntry type="library" name="Maven: com.github.penggle:kaptcha:2.3.2" level="project" />
     <orderEntry type="library" name="Maven: com.jhlabs:filters:2.0.235-1" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.shiro:shiro-spring:1.5.3" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.shiro:shiro-core:1.5.3" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.shiro:shiro-lang:1.5.3" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.shiro:shiro-crypto-hash:1.5.3" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.shiro:shiro-crypto-core:1.5.3" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.shiro:shiro-crypto-cipher:1.5.3" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.shiro:shiro-config-core:1.5.3" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.shiro:shiro-config-ogdl:1.5.3" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.shiro:shiro-spring:1.7.1" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.shiro:shiro-core:1.7.1" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.shiro:shiro-lang:1.7.1" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.shiro:shiro-crypto-hash:1.7.1" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.shiro:shiro-crypto-core:1.7.1" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.shiro:shiro-crypto-cipher:1.7.1" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.shiro:shiro-config-core:1.7.1" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.shiro:shiro-config-ogdl:1.7.1" level="project" />
     <orderEntry type="library" name="Maven: commons-beanutils:commons-beanutils:1.9.4" level="project" />
     <orderEntry type="library" name="Maven: commons-collections:commons-collections:3.2.2" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.shiro:shiro-event:1.5.3" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.shiro:shiro-web:1.5.3" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.shiro:shiro-event:1.7.1" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.shiro:shiro-web:1.7.1" level="project" />
     <orderEntry type="library" name="Maven: org.owasp.encoder:encoder:1.2.2" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.shiro:shiro-ehcache:1.5.3" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.shiro:shiro-cache:1.5.3" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.shiro:shiro-ehcache:1.7.1" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.shiro:shiro-cache:1.7.1" level="project" />
     <orderEntry type="library" name="Maven: net.sf.ehcache:ehcache-core:2.6.11" level="project" />
     <orderEntry type="library" name="Maven: com.github.theborakompanioni:thymeleaf-extras-shiro:2.0.0" level="project" />
     <orderEntry type="library" name="Maven: eu.bitwalker:UserAgentUtils:1.19" level="project" />
@@ -98,7 +98,7 @@
     <orderEntry type="library" name="Maven: com.github.pagehelper:pagehelper:5.1.4" level="project" />
     <orderEntry type="library" name="Maven: com.github.jsqlparser:jsqlparser:1.0" level="project" />
     <orderEntry type="library" name="Maven: org.apache.commons:commons-lang3:3.8.1" level="project" />
-    <orderEntry type="library" name="Maven: com.alibaba:fastjson:1.2.70" level="project" />
+    <orderEntry type="library" name="Maven: com.alibaba:fastjson:1.2.83" level="project" />
     <orderEntry type="library" name="Maven: commons-io:commons-io:2.5" level="project" />
     <orderEntry type="library" name="Maven: commons-fileupload:commons-fileupload:1.3.3" level="project" />
     <orderEntry type="library" name="Maven: org.apache.poi:poi-ooxml:3.17" level="project" />

leiSP-framework/src/main/java/com/sooka/framework/aspectj/DataScopeAspect.java

@@ -5,6 +5,7 @@ import java.lang.reflect.Method;
 
 import com.sooka.common.utils.ServletUtils;
 import com.sooka.framework.util.ShiroUtils;
+import org.apache.catalina.security.SecurityUtil;
 import org.aspectj.lang.JoinPoint;
 import org.aspectj.lang.Signature;
 import org.aspectj.lang.annotation.Aspect;

leiSP-framework/target/maven-archiver/pom.properties

@@ -1,5 +1,5 @@
 #Generated by Maven
-#Mon Apr 04 15:00:20 CST 2022
+#Fri Sep 23 13:21:14 CST 2022
 groupId=com.leisp
 artifactId=leisp-framework
 version=1.0.0

leiSP-generator/leisp-generator.iml

@@ -32,16 +32,16 @@
     <orderEntry type="library" name="Maven: org.springframework:spring-core:5.1.3.RELEASE" level="project" />
     <orderEntry type="library" name="Maven: org.springframework:spring-jcl:5.1.3.RELEASE" level="project" />
     <orderEntry type="library" name="Maven: org.springframework:spring-web:5.1.3.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.shiro:shiro-core:1.5.3" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.shiro:shiro-lang:1.5.3" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.shiro:shiro-cache:1.5.3" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.shiro:shiro-crypto-hash:1.5.3" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.shiro:shiro-crypto-core:1.5.3" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.shiro:shiro-crypto-cipher:1.5.3" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.shiro:shiro-config-core:1.5.3" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.shiro:shiro-config-ogdl:1.5.3" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.shiro:shiro-core:1.7.1" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.shiro:shiro-lang:1.7.1" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.shiro:shiro-cache:1.7.1" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.shiro:shiro-crypto-hash:1.7.1" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.shiro:shiro-crypto-core:1.7.1" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.shiro:shiro-crypto-cipher:1.7.1" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.shiro:shiro-config-core:1.7.1" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.shiro:shiro-config-ogdl:1.7.1" level="project" />
     <orderEntry type="library" name="Maven: commons-beanutils:commons-beanutils:1.9.4" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.shiro:shiro-event:1.5.3" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.shiro:shiro-event:1.7.1" level="project" />
     <orderEntry type="library" name="Maven: com.github.pagehelper:pagehelper-spring-boot-starter:1.2.5" level="project" />
     <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter:2.1.1.RELEASE" level="project" />
     <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot:2.1.1.RELEASE" level="project" />
@@ -69,7 +69,7 @@
     <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-databind:2.9.7" level="project" />
     <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-annotations:2.9.0" level="project" />
     <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-core:2.9.7" level="project" />
-    <orderEntry type="library" name="Maven: com.alibaba:fastjson:1.2.70" level="project" />
+    <orderEntry type="library" name="Maven: com.alibaba:fastjson:1.2.83" level="project" />
     <orderEntry type="library" name="Maven: commons-io:commons-io:2.5" level="project" />
     <orderEntry type="library" name="Maven: commons-fileupload:commons-fileupload:1.3.3" level="project" />
     <orderEntry type="library" name="Maven: org.apache.poi:poi-ooxml:3.17" level="project" />

leiSP-generator/target/maven-archiver/pom.properties

@@ -1,5 +1,5 @@
 #Generated by Maven
-#Mon Apr 04 15:00:26 CST 2022
+#Fri Sep 23 13:21:18 CST 2022
 groupId=com.leisp
 artifactId=leisp-generator
 version=1.0.0

leiSP-quartz/leisp-quartz.iml

@@ -32,17 +32,17 @@
     <orderEntry type="library" name="Maven: org.springframework:spring-core:5.1.3.RELEASE" level="project" />
     <orderEntry type="library" name="Maven: org.springframework:spring-jcl:5.1.3.RELEASE" level="project" />
     <orderEntry type="library" name="Maven: org.springframework:spring-web:5.1.3.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.shiro:shiro-core:1.5.3" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.shiro:shiro-lang:1.5.3" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.shiro:shiro-cache:1.5.3" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.shiro:shiro-crypto-hash:1.5.3" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.shiro:shiro-crypto-core:1.5.3" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.shiro:shiro-crypto-cipher:1.5.3" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.shiro:shiro-config-core:1.5.3" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.shiro:shiro-config-ogdl:1.5.3" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.shiro:shiro-core:1.7.1" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.shiro:shiro-lang:1.7.1" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.shiro:shiro-cache:1.7.1" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.shiro:shiro-crypto-hash:1.7.1" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.shiro:shiro-crypto-core:1.7.1" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.shiro:shiro-crypto-cipher:1.7.1" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.shiro:shiro-config-core:1.7.1" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.shiro:shiro-config-ogdl:1.7.1" level="project" />
     <orderEntry type="library" name="Maven: commons-beanutils:commons-beanutils:1.9.4" level="project" />
     <orderEntry type="library" name="Maven: commons-collections:commons-collections:3.2.2" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.shiro:shiro-event:1.5.3" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.shiro:shiro-event:1.7.1" level="project" />
     <orderEntry type="library" name="Maven: com.github.pagehelper:pagehelper-spring-boot-starter:1.2.5" level="project" />
     <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter:2.1.1.RELEASE" level="project" />
     <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot:2.1.1.RELEASE" level="project" />
@@ -70,7 +70,7 @@
     <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-databind:2.9.7" level="project" />
     <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-annotations:2.9.0" level="project" />
     <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-core:2.9.7" level="project" />
-    <orderEntry type="library" name="Maven: com.alibaba:fastjson:1.2.70" level="project" />
+    <orderEntry type="library" name="Maven: com.alibaba:fastjson:1.2.83" level="project" />
     <orderEntry type="library" name="Maven: commons-io:commons-io:2.5" level="project" />
     <orderEntry type="library" name="Maven: commons-fileupload:commons-fileupload:1.3.3" level="project" />
     <orderEntry type="library" name="Maven: org.apache.poi:poi-ooxml:3.17" level="project" />

leiSP-quartz/target/maven-archiver/pom.properties

@@ -1,5 +1,5 @@
 #Generated by Maven
-#Mon Apr 04 15:00:23 CST 2022
+#Fri Sep 23 13:21:16 CST 2022
 groupId=com.leisp
 artifactId=leisp-quartz
 version=1.0.0

leiSP-system/leisp-system.iml

@@ -29,17 +29,17 @@
     <orderEntry type="library" name="Maven: org.springframework:spring-core:5.1.3.RELEASE" level="project" />
     <orderEntry type="library" name="Maven: org.springframework:spring-jcl:5.1.3.RELEASE" level="project" />
     <orderEntry type="library" name="Maven: org.springframework:spring-web:5.1.3.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.shiro:shiro-core:1.5.3" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.shiro:shiro-lang:1.5.3" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.shiro:shiro-cache:1.5.3" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.shiro:shiro-crypto-hash:1.5.3" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.shiro:shiro-crypto-core:1.5.3" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.shiro:shiro-crypto-cipher:1.5.3" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.shiro:shiro-config-core:1.5.3" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.shiro:shiro-config-ogdl:1.5.3" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.shiro:shiro-core:1.7.1" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.shiro:shiro-lang:1.7.1" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.shiro:shiro-cache:1.7.1" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.shiro:shiro-crypto-hash:1.7.1" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.shiro:shiro-crypto-core:1.7.1" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.shiro:shiro-crypto-cipher:1.7.1" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.shiro:shiro-config-core:1.7.1" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.shiro:shiro-config-ogdl:1.7.1" level="project" />
     <orderEntry type="library" name="Maven: commons-beanutils:commons-beanutils:1.9.4" level="project" />
     <orderEntry type="library" name="Maven: commons-collections:commons-collections:3.2.2" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.shiro:shiro-event:1.5.3" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.shiro:shiro-event:1.7.1" level="project" />
     <orderEntry type="library" name="Maven: com.github.pagehelper:pagehelper-spring-boot-starter:1.2.5" level="project" />
     <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter:2.1.1.RELEASE" level="project" />
     <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot:2.1.1.RELEASE" level="project" />
@@ -67,7 +67,7 @@
     <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-databind:2.9.7" level="project" />
     <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-annotations:2.9.0" level="project" />
     <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-core:2.9.7" level="project" />
-    <orderEntry type="library" name="Maven: com.alibaba:fastjson:1.2.70" level="project" />
+    <orderEntry type="library" name="Maven: com.alibaba:fastjson:1.2.83" level="project" />
     <orderEntry type="library" name="Maven: commons-io:commons-io:2.5" level="project" />
     <orderEntry type="library" name="Maven: commons-fileupload:commons-fileupload:1.3.3" level="project" />
     <orderEntry type="library" name="Maven: org.apache.poi:poi-ooxml:3.17" level="project" />

leiSP-system/target/maven-archiver/pom.properties

@@ -1,5 +1,5 @@
 #Generated by Maven
-#Mon Apr 04 15:00:16 CST 2022
+#Fri Sep 23 13:21:10 CST 2022
 groupId=com.leisp
 artifactId=leisp-system
 version=1.0.0

mybusiness/mybusiness.iml

@@ -28,17 +28,17 @@
     <orderEntry type="library" name="Maven: org.springframework:spring-core:5.1.3.RELEASE" level="project" />
     <orderEntry type="library" name="Maven: org.springframework:spring-jcl:5.1.3.RELEASE" level="project" />
     <orderEntry type="library" name="Maven: org.springframework:spring-web:5.1.3.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.shiro:shiro-core:1.5.3" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.shiro:shiro-lang:1.5.3" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.shiro:shiro-cache:1.5.3" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.shiro:shiro-crypto-hash:1.5.3" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.shiro:shiro-crypto-core:1.5.3" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.shiro:shiro-crypto-cipher:1.5.3" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.shiro:shiro-config-core:1.5.3" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.shiro:shiro-config-ogdl:1.5.3" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.shiro:shiro-core:1.7.1" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.shiro:shiro-lang:1.7.1" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.shiro:shiro-cache:1.7.1" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.shiro:shiro-crypto-hash:1.7.1" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.shiro:shiro-crypto-core:1.7.1" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.shiro:shiro-crypto-cipher:1.7.1" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.shiro:shiro-config-core:1.7.1" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.shiro:shiro-config-ogdl:1.7.1" level="project" />
     <orderEntry type="library" name="Maven: commons-beanutils:commons-beanutils:1.9.4" level="project" />
     <orderEntry type="library" name="Maven: commons-collections:commons-collections:3.2.2" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.shiro:shiro-event:1.5.3" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.shiro:shiro-event:1.7.1" level="project" />
     <orderEntry type="library" name="Maven: com.github.pagehelper:pagehelper-spring-boot-starter:1.2.5" level="project" />
     <orderEntry type="library" name="Maven: org.mybatis.spring.boot:mybatis-spring-boot-starter:1.3.2" level="project" />
     <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-jdbc:2.1.1.RELEASE" level="project" />
@@ -55,7 +55,7 @@
     <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-databind:2.9.7" level="project" />
     <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-annotations:2.9.0" level="project" />
     <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-core:2.9.7" level="project" />
-    <orderEntry type="library" name="Maven: com.alibaba:fastjson:1.2.70" level="project" />
+    <orderEntry type="library" name="Maven: com.alibaba:fastjson:1.2.83" level="project" />
     <orderEntry type="library" name="Maven: commons-io:commons-io:2.5" level="project" />
     <orderEntry type="library" name="Maven: commons-fileupload:commons-fileupload:1.3.3" level="project" />
     <orderEntry type="library" name="Maven: org.apache.poi:poi-ooxml:3.17" level="project" />
@@ -108,10 +108,10 @@
     <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-autoconfigure:2.1.1.RELEASE" level="project" />
     <orderEntry type="library" name="Maven: com.github.penggle:kaptcha:2.3.2" level="project" />
     <orderEntry type="library" name="Maven: com.jhlabs:filters:2.0.235-1" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.shiro:shiro-spring:1.5.3" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.shiro:shiro-web:1.5.3" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.shiro:shiro-spring:1.7.1" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.shiro:shiro-web:1.7.1" level="project" />
     <orderEntry type="library" name="Maven: org.owasp.encoder:encoder:1.2.2" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.shiro:shiro-ehcache:1.5.3" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.shiro:shiro-ehcache:1.7.1" level="project" />
     <orderEntry type="library" name="Maven: net.sf.ehcache:ehcache-core:2.6.11" level="project" />
     <orderEntry type="library" name="Maven: com.github.theborakompanioni:thymeleaf-extras-shiro:2.0.0" level="project" />
     <orderEntry type="library" name="Maven: eu.bitwalker:UserAgentUtils:1.19" level="project" />

mybusiness/src/main/java/com/business/slfh/dahua/controller/DahuaMQController.java

@@ -17,9 +17,9 @@ import java.util.TimerTask;
 public class DahuaMQController implements ApplicationRunner {
 
     private static final String USERNAME = "admin";// 默认连接用户名
-    private static final String PASSWORD = "admin";// 默认连接密码
-//    private static final String BROKEURL = "tcp://127.0.0.1:61616";// 默认连接地址
-    private static final String BROKEURL = "tcp://218.27.1.157:61616";// 默认连接地址
+    private static final String PASSWORD = "admin123!";// 默认连接密码
+    private static final String BROKEURL = "tcp://127.0.0.1:61616";// 默认连接地址
+//    private static final String BROKEURL = "tcp://218.27.1.157:61616";// 默认连接地址
 //
 
     @Autowired

mybusiness/src/main/java/com/business/slfh/dahua/util/DahuaUtil.java

@@ -208,14 +208,14 @@ public class DahuaUtil {
     public static void main(String[] args) {
         DahuaUtil util = new DahuaUtil();
         util.authorize();
-        String al =util.QueryAlarms("{0E1A6D0E-C0B2-1F4E-8421-2787A0A3FA4B}");
-        System.out.println(al);
-
-         JSONObject jso = JSON.parseObject(al);
-         String pics =JSON.parseObject(jso.getJSONObject("data").getJSONArray("alarms").get(0).toString()).getString("picture") ;
-         System.out.println(pics);
+//        String al =util.QueryAlarms("{0E1A6D0E-C0B2-1F4E-8421-2787A0A3FA4B}");
+//        System.out.println(al);
+//
+//         JSONObject jso = JSON.parseObject(al);
+//         String pics =JSON.parseObject(jso.getJSONObject("data").getJSONArray("alarms").get(0).toString()).getString("picture") ;
+//         System.out.println(pics);
          //        util.getLiveUrl("1000001");
-//        util.getRecordUrl("1000005","0","2021-10-29 00:00:00","2021-10-29 23:59:00");
+        util.getRecordUrl("1000018","0","2022-04-13 09:08:02","2022-04-13 09:10:02");
 
 //        util.OperateCamera("1000001$1$0$0",1,1,1,10);
 

mybusiness/src/main/java/com/business/slfh/tools/WebSocketConfig.java

@@ -4,10 +4,10 @@ import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.web.socket.server.standard.ServerEndpointExporter;
 
-@Configuration
+//@Configuration
 public class WebSocketConfig {
 
-    @Bean
+//    @Bean
     public ServerEndpointExporter serverEndpointExporter() {
         return new ServerEndpointExporter();
     }

mybusiness/src/main/java/com/business/slfh/tools/controller/WebSocketServer.java

@@ -18,8 +18,8 @@ import org.springframework.stereotype.Component;
 import cn.hutool.log.Log;
 import cn.hutool.log.LogFactory;
 
-@ServerEndpoint("/business/app/websocket/{userId}")
-@Component
+//@ServerEndpoint("/business/app/websocket/{userId}")
+//@Component
 public class WebSocketServer {
     static Log log = LogFactory.get(WebSocketServer.class);
     /**

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

@@ -1,7 +1,6 @@
 package com.business.slfh.visualization.event.controller;
 
-import com.alibaba.fastjson.JSONArray;
-import com.alibaba.fastjson.JSONObject;
+
 import com.business.slfh.app.appbase.controller.AppBaseController;
 import com.business.slfh.app.appbase.domain.AppPageModel;
 import com.business.slfh.manager.cameramanager.domain.TResCamera;
@@ -18,6 +17,7 @@ import com.business.slfh.tools.UserInfoUtil;
 import com.business.slfh.visualization.event.domain.*;
 import com.business.slfh.visualization.event.service.Visualization_Event_Service;
 import com.sooka.common.config.Global;
+import com.sooka.common.json.JSONObject;
 import com.sooka.common.utils.CacheUtils;
 import com.sooka.common.utils.StringUtils;
 import com.sooka.framework.util.ShiroUtils;

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

@@ -199,7 +199,7 @@
     //function goCamera(hik_ip,hik_port,hik_username,hik_password,hik_deviceport){//展示画面
     function goCamera(hik_ip,hik_port,hik_username,hik_password,hik_deviceport,hik_cameraid){//展示画面
 
-        window.open('http://36.97.65.105:9090/dahua/demo-jkd.html?hik_ip='+hik_ip+'&hik_cameraid='+hik_cameraid+'&hik_deviceport='+hik_deviceport+"&hik_username="+hik_username+"&hik_password="+hik_password+"&port="+hik_port)
+        window.open('http://122.141.177.214:9090/dahua/demo-jkd.html?hik_ip='+hik_ip+'&hik_cameraid='+hik_cameraid+'&hik_deviceport='+hik_deviceport+"&hik_username="+hik_username+"&hik_password="+hik_password+"&port="+hik_port)
         //$.post('http://localhost:8899/camera_id='+hik_ip+","+hik_port+","+hik_username+","+hik_password+","+hik_deviceport,{});
     }
 

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

@@ -440,7 +440,7 @@
 
     function play_preview(hik_ip,hik_port,hik_username,hik_password) {
         // window.open('/business/manager/hikcameracontroller/demo_window_simple_preview?hik_cameraid='+hik_cameraid)
-        window.open('http://36.97.65.105:9090/dahua/demo-jkd.html?hik_ip='+hik_ip+'&hik_username='+hik_username+"&hik_password="+hik_password+"&port="+hik_port)
+        window.open('http://122.141.177.213:9090/dahua/demo-jkd.html?hik_ip='+hik_ip+'&hik_username='+hik_username+"&hik_password="+hik_password+"&port="+hik_port)
     }
 
 

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

@@ -274,7 +274,7 @@
     <div class="fr timing">
         <div class="xl_select fl">
             <div class="se_div clearfix">
-                <p class="on"><span class="jkd"><a href="http://36.97.65.105:9090/dahua/demo-dsd.html">电视墙</a></span><i></i></p>
+                <p class="on"><span class="jkd"><a href="http://122.141.177.213:9090/dahua/demo-dsd.html">电视墙</a></span><i></i></p>
                 <p class="on"><span class="jkd"><a>监控端</a></span><i></i></p>
                 <p><span class="gld"><a th:href="@{/index}" target="_blank">管理端</a></span><i></i></p>
                 <p><span class="dsjd"><a th:href="@{/bigdata/inspection/getBigDataInspection}" target="_blank">大数据端</a></span><i></i></p>

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

@@ -361,7 +361,7 @@
     });
 
     $(document).ready(function () {
-        $("#dsq").attr("href","http://36.97.65.105:9090/dahua/demo-dsd.html?deptId="+[[${deptId}]])
+        $("#dsq").attr("href","http://122.141.177.213:9090/dahua/demo-dsd.html?deptId="+[[${deptId}]])
     });
 </script>
 </html>

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

@@ -1455,7 +1455,7 @@
 
     function goCamera(hik_ip,hik_port,hik_username,hik_password,hik_deviceport){
 
-        window.open('http://36.97.65.105:9090/dahua/demo-jkd.html?hik_ip='+hik_ip+'&hik_deviceport='+hik_deviceport+"&hik_username="+hik_username+"&hik_password="+hik_password+"&port="+hik_port)
+        window.open('http://122.141.177.213:9090/dahua/demo-jkd.html?hik_ip='+hik_ip+'&hik_deviceport='+hik_deviceport+"&hik_username="+hik_username+"&hik_password="+hik_password+"&port="+hik_port)
 
 
         // $.post("[[@{/visualization/event/getRoleMenu}]]",function(e){

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

@@ -65,7 +65,7 @@
     <ul class="zhly_list3">
         <li th:each="user : ${visualization_users}" >
             <div class="list_xl clearfix">
-                <a class="list_img fl"><img th:src="${user.AVATAR}" th:onclick="draw_trajectoryLine([[${user.USER_ID}]],[[${user.USER_NAME}]],[[${user.PHONENUMBER}]])"/></a>
+                <a class="list_img fl"><img onerror="this.src='http://218.27.1.157:9090/soft/hww.jpg';" th:src="${user.AVATAR}" th:onclick="draw_trajectoryLine([[${user.USER_ID}]],[[${user.USER_NAME}]],[[${user.PHONENUMBER}]])"/></a>
                 <div class="list_txt fl">
                     <p><b>登录名：</b><i>[[${user.LOGIN_NAME}]]</i></p>
                     <p><b>用户名称：</b><i>[[${user.USER_NAME}]]</i></p>

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

@@ -39,7 +39,7 @@
 </div>
 <div class="sxt_4 clearfix">
     <!--<a href="http://localhost:8899/cams">-->
-        <a href="http://36.97.65.105:9090/dahua/demo-dsd.html" target="_blank">
+        <a href="http://122.141.177.213:9090/dahua/demo-dsd.html" target="_blank">
         <!--<a href="/v/index/evenCamera" target="_blank">-->
         <div class="ztt sxt_div">
             <i></i>

mybusiness/target/classes/templates/business/manager/cameramanager/index.html

@@ -199,7 +199,7 @@
     //function goCamera(hik_ip,hik_port,hik_username,hik_password,hik_deviceport){//展示画面
     function goCamera(hik_ip,hik_port,hik_username,hik_password,hik_deviceport,hik_cameraid){//展示画面
 
-        window.open('http://36.97.65.105:9090/dahua/demo-jkd.html?hik_ip='+hik_ip+'&hik_cameraid='+hik_cameraid+'&hik_deviceport='+hik_deviceport+"&hik_username="+hik_username+"&hik_password="+hik_password+"&port="+hik_port)
+        window.open('http://122.141.177.214:9090/dahua/demo-jkd.html?hik_ip='+hik_ip+'&hik_cameraid='+hik_cameraid+'&hik_deviceport='+hik_deviceport+"&hik_username="+hik_username+"&hik_password="+hik_password+"&port="+hik_port)
         //$.post('http://localhost:8899/camera_id='+hik_ip+","+hik_port+","+hik_username+","+hik_password+","+hik_deviceport,{});
     }
 

mybusiness/target/classes/templates/business/visualization/details.html

@@ -440,7 +440,7 @@
 
     function play_preview(hik_ip,hik_port,hik_username,hik_password) {
         // window.open('/business/manager/hikcameracontroller/demo_window_simple_preview?hik_cameraid='+hik_cameraid)
-        window.open('http://36.97.65.105:9090/dahua/demo-jkd.html?hik_ip='+hik_ip+'&hik_username='+hik_username+"&hik_password="+hik_password+"&port="+hik_port)
+        window.open('http://122.141.177.213:9090/dahua/demo-jkd.html?hik_ip='+hik_ip+'&hik_username='+hik_username+"&hik_password="+hik_password+"&port="+hik_port)
     }
 
 

mybusiness/target/classes/templates/business/visualization/evemt.html

@@ -274,7 +274,7 @@
     <div class="fr timing">
         <div class="xl_select fl">
             <div class="se_div clearfix">
-                <p class="on"><span class="jkd"><a href="http://36.97.65.105:9090/dahua/demo-dsd.html">电视墙</a></span><i></i></p>
+                <p class="on"><span class="jkd"><a href="http://122.141.177.213:9090/dahua/demo-dsd.html">电视墙</a></span><i></i></p>
                 <p class="on"><span class="jkd"><a>监控端</a></span><i></i></p>
                 <p><span class="gld"><a th:href="@{/index}" target="_blank">管理端</a></span><i></i></p>
                 <p><span class="dsjd"><a th:href="@{/bigdata/inspection/getBigDataInspection}" target="_blank">大数据端</a></span><i></i></p>

mybusiness/target/classes/templates/business/visualization/event.html

@@ -361,7 +361,7 @@
     });
 
     $(document).ready(function () {
-        $("#dsq").attr("href","http://36.97.65.105:9090/dahua/demo-dsd.html?deptId="+[[${deptId}]])
+        $("#dsq").attr("href","http://122.141.177.213:9090/dahua/demo-dsd.html?deptId="+[[${deptId}]])
     });
 </script>
 </html>

mybusiness/target/classes/templates/business/visualization/map.html

@@ -1455,7 +1455,7 @@
 
     function goCamera(hik_ip,hik_port,hik_username,hik_password,hik_deviceport){
 
-        window.open('http://36.97.65.105:9090/dahua/demo-jkd.html?hik_ip='+hik_ip+'&hik_deviceport='+hik_deviceport+"&hik_username="+hik_username+"&hik_password="+hik_password+"&port="+hik_port)
+        window.open('http://122.141.177.213:9090/dahua/demo-jkd.html?hik_ip='+hik_ip+'&hik_deviceport='+hik_deviceport+"&hik_username="+hik_username+"&hik_password="+hik_password+"&port="+hik_port)
 
 
         // $.post("[[@{/visualization/event/getRoleMenu}]]",function(e){

mybusiness/target/classes/templates/business/visualization/ry.html

@@ -65,7 +65,7 @@
     <ul class="zhly_list3">
         <li th:each="user : ${visualization_users}" >
             <div class="list_xl clearfix">
-                <a class="list_img fl"><img th:src="${user.AVATAR}" th:onclick="draw_trajectoryLine([[${user.USER_ID}]],[[${user.USER_NAME}]],[[${user.PHONENUMBER}]])"/></a>
+                <a class="list_img fl"><img onerror="this.src='http://218.27.1.157:9090/soft/hww.jpg';" th:src="${user.AVATAR}" th:onclick="draw_trajectoryLine([[${user.USER_ID}]],[[${user.USER_NAME}]],[[${user.PHONENUMBER}]])"/></a>
                 <div class="list_txt fl">
                     <p><b>登录名：</b><i>[[${user.LOGIN_NAME}]]</i></p>
                     <p><b>用户名称：</b><i>[[${user.USER_NAME}]]</i></p>

mybusiness/target/classes/templates/business/visualization/sxt.html

@@ -39,7 +39,7 @@
 </div>
 <div class="sxt_4 clearfix">
     <!--<a href="http://localhost:8899/cams">-->
-        <a href="http://36.97.65.105:9090/dahua/demo-dsd.html" target="_blank">
+        <a href="http://122.141.177.213:9090/dahua/demo-dsd.html" target="_blank">
         <!--<a href="/v/index/evenCamera" target="_blank">-->
         <div class="ztt sxt_div">
             <i></i>

mybusiness/target/maven-archiver/pom.properties

@@ -1,5 +1,5 @@
 #Generated by Maven
-#Mon Apr 04 15:03:55 CST 2022
+#Fri Sep 23 13:23:54 CST 2022
 groupId=com.leisp
 artifactId=mybusiness
 version=1.0.0

pom.xml

@@ -17,7 +17,8 @@
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
         <java.version>1.8</java.version>
-        <shiro.version>1.5.3</shiro.version>
+        <!--<shiro.version>1.5.3</shiro.version>-->
+        <shiro.version>1.7.1</shiro.version>
         <thymeleaf.extras.shiro.version>2.0.0</thymeleaf.extras.shiro.version>
         <mybatis.boot.version>1.3.2</mybatis.boot.version>
         <druid.version>1.1.14</druid.version>
@@ -25,12 +26,15 @@
         <kaptcha.version>2.3.2</kaptcha.version>
         <swagger.version>2.9.2</swagger.version>
         <pagehelper.boot.version>1.2.5</pagehelper.boot.version>
-        <fastjson.version>1.2.70</fastjson.version>
+        <fastjson.version>1.2.83</fastjson.version>
         <oshi.version>3.9.1</oshi.version>
         <commons.io.version>2.5</commons.io.version>
         <commons.fileupload.version>1.3.3</commons.fileupload.version>
         <poi.version>3.17</poi.version>
         <velocity.version>1.7</velocity.version>
+
+        <skipTests>true</skipTests>
+
     </properties>
 
     <!-- 依赖声明 -->