http

.idea/workspace.xml

@@ -2,16 +2,8 @@
 <project version="4">
   <component name="ChangeListManager">
     <list default="true" id="8ad4baec-f819-4a7c-b135-6a76a7a0c72f" name="Default" comment="">
-      <change beforePath="$PROJECT_DIR$/.idea/compiler.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/compiler.xml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/leiSP-admin/src/main/resources/templates/login.html" beforeDir="false" afterPath="$PROJECT_DIR$/leiSP-admin/src/main/resources/templates/login.html" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/leiSP-framework/src/main/java/com/sooka/framework/config/ShiroConfig.java" beforeDir="false" afterPath="$PROJECT_DIR$/leiSP-framework/src/main/java/com/sooka/framework/config/ShiroConfig.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/mybusiness/src/main/java/com/business/slfh/dahua/controller/DahuaDsdController.java" beforeDir="false" afterPath="$PROJECT_DIR$/mybusiness/src/main/java/com/business/slfh/dahua/controller/DahuaDsdController.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/mybusiness/src/main/resources/templates/business/manager/firemanager/index.html" beforeDir="false" afterPath="$PROJECT_DIR$/mybusiness/src/main/resources/templates/business/manager/firemanager/index.html" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/mybusiness/src/main/resources/templates/business/visualization/details.html" beforeDir="false" afterPath="$PROJECT_DIR$/mybusiness/src/main/resources/templates/business/visualization/details.html" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/mybusiness/src/main/resources/templates/dahua/lib/on_off_switch.js" beforeDir="false" afterPath="$PROJECT_DIR$/mybusiness/src/main/resources/templates/dahua/lib/on_off_switch.js" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/pom.xml" beforeDir="false" afterPath="$PROJECT_DIR$/pom.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/sz_jian.iml" beforeDir="false" afterPath="$PROJECT_DIR$/sz_jian.iml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/leiSP-framework/src/main/java/com/sooka/framework/shiro/service/SysLoginService.java" beforeDir="false" afterPath="$PROJECT_DIR$/leiSP-framework/src/main/java/com/sooka/framework/shiro/service/SysLoginService.java" afterDir="false" />
     </list>
     <ignored path="$PROJECT_DIR$/leiSP-admin/target/" />
     <ignored path="$PROJECT_DIR$/target/" />
@@ -42,17 +34,26 @@
       <file leaf-file-name="login.html" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/leiSP-admin/src/main/resources/templates/login.html">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="477">
-              <caret line="51" column="18" selection-start-line="51" selection-start-column="18" selection-end-line="51" selection-end-column="18" />
+            <state relative-caret-position="-911">
+              <caret line="30" column="28" selection-start-line="30" selection-start-column="18" selection-end-line="30" selection-end-column="28" />
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="login_old.html" pinned="false" current-in-tab="true">
-        <entry file="file://$PROJECT_DIR$/leiSP-admin/src/main/resources/templates/login_old.html">
+      <file leaf-file-name="login.js" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/leiSP-admin/src/main/resources/static/ruoyi/login.js">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="150">
-              <caret line="44" column="46" selection-start-line="44" selection-start-column="46" selection-end-line="44" selection-end-column="46" />
+            <state relative-caret-position="480">
+              <caret line="25" column="25" selection-start-line="25" selection-start-column="20" selection-end-line="25" selection-end-column="25" />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="SysLoginService.java" pinned="false" current-in-tab="true">
+        <entry file="file://$PROJECT_DIR$/leiSP-framework/src/main/java/com/sooka/framework/shiro/service/SysLoginService.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="217">
+              <caret line="47" column="9" lean-forward="true" selection-start-line="47" selection-start-column="9" selection-end-line="47" selection-end-column="9" />
             </state>
           </provider>
         </entry>
@@ -69,8 +70,6 @@
   </component>
   <component name="FindInProjectRecents">
     <findStrings>
-      <find>itResAttachService</find>
-      <find>login timeout</find>
       <find>edit</find>
       <find>updateTResCamera</find>
       <find>热感云台</find>
@@ -99,6 +98,8 @@
       <find>验证码</find>
       <find>captchaEnabled</find>
       <find>用户登录</find>
+      <find>signupForm</find>
+      <find>login</find>
     </findStrings>
     <dirStrings>
       <dir>E:\首佳工作目录\辉南-集安\code\hnly\mybusiness\src\main\java\com\business\slfh\manager\cameramanager</dir>
@@ -121,7 +122,6 @@
   <component name="IdeDocumentHistory">
     <option name="CHANGED_PATHS">
       <list>
-        <option value="$PROJECT_DIR$/leiSP-admin/pom.xml" />
         <option value="$PROJECT_DIR$/leiSP-common/pom.xml" />
         <option value="$PROJECT_DIR$/leiSP-generator/pom.xml" />
         <option value="$PROJECT_DIR$/leiSP-quartz/pom.xml" />
@@ -172,6 +172,7 @@
         <option value="$PROJECT_DIR$/leiSP-admin/src/main/resources/application.yml" />
         <option value="$PROJECT_DIR$/leiSP-admin/src/main/resources/templates/login.html" />
         <option value="$PROJECT_DIR$/leiSP-admin/src/main/resources/templates/login_old.html" />
+        <option value="$PROJECT_DIR$/leiSP-framework/src/main/java/com/sooka/framework/shiro/service/SysLoginService.java" />
       </list>
     </option>
   </component>
@@ -269,7 +270,52 @@
               <item name="src" type="462c0819:PsiDirectoryNode" />
               <item name="main" type="462c0819:PsiDirectoryNode" />
               <item name="resources" type="462c0819:PsiDirectoryNode" />
-              <item name="templates" type="462c0819:PsiDirectoryNode" />
+              <item name="static" type="462c0819:PsiDirectoryNode" />
+            </path>
+            <path>
+              <item name="sz_jian" type="b2602c69:ProjectViewProjectNode" />
+              <item name="hnly" type="462c0819:PsiDirectoryNode" />
+              <item name="leiSP-admin" type="462c0819:PsiDirectoryNode" />
+              <item name="src" type="462c0819:PsiDirectoryNode" />
+              <item name="main" type="462c0819:PsiDirectoryNode" />
+              <item name="resources" type="462c0819:PsiDirectoryNode" />
+              <item name="static" type="462c0819:PsiDirectoryNode" />
+              <item name="ruoyi" type="462c0819:PsiDirectoryNode" />
+            </path>
+            <path>
+              <item name="sz_jian" type="b2602c69:ProjectViewProjectNode" />
+              <item name="hnly" type="462c0819:PsiDirectoryNode" />
+              <item name="leiSP-framework" type="462c0819:PsiDirectoryNode" />
+            </path>
+            <path>
+              <item name="sz_jian" type="b2602c69:ProjectViewProjectNode" />
+              <item name="hnly" type="462c0819:PsiDirectoryNode" />
+              <item name="leiSP-framework" type="462c0819:PsiDirectoryNode" />
+              <item name="src" type="462c0819:PsiDirectoryNode" />
+            </path>
+            <path>
+              <item name="sz_jian" type="b2602c69:ProjectViewProjectNode" />
+              <item name="hnly" type="462c0819:PsiDirectoryNode" />
+              <item name="leiSP-framework" type="462c0819:PsiDirectoryNode" />
+              <item name="src" type="462c0819:PsiDirectoryNode" />
+              <item name="main" type="462c0819:PsiDirectoryNode" />
+            </path>
+            <path>
+              <item name="sz_jian" type="b2602c69:ProjectViewProjectNode" />
+              <item name="hnly" type="462c0819:PsiDirectoryNode" />
+              <item name="leiSP-framework" type="462c0819:PsiDirectoryNode" />
+              <item name="src" type="462c0819:PsiDirectoryNode" />
+              <item name="main" type="462c0819:PsiDirectoryNode" />
+              <item name="java" type="462c0819:PsiDirectoryNode" />
+            </path>
+            <path>
+              <item name="sz_jian" type="b2602c69:ProjectViewProjectNode" />
+              <item name="hnly" type="462c0819:PsiDirectoryNode" />
+              <item name="leiSP-framework" type="462c0819:PsiDirectoryNode" />
+              <item name="src" type="462c0819:PsiDirectoryNode" />
+              <item name="main" type="462c0819:PsiDirectoryNode" />
+              <item name="java" type="462c0819:PsiDirectoryNode" />
+              <item name="framework" type="462c0819:PsiDirectoryNode" />
             </path>
           </expand>
           <select />
@@ -525,7 +571,7 @@
       <workItem from="1665709592040" duration="15031000" />
       <workItem from="1665801242192" duration="1888000" />
       <workItem from="1665991581016" duration="6194000" />
-      <workItem from="1666053602923" duration="4830000" />
+      <workItem from="1666053602923" duration="5234000" />
     </task>
     <task id="LOCAL-00001" summary="http">
       <created>1665216030960</created>
@@ -667,11 +713,18 @@
       <option name="project" value="LOCAL" />
       <updated>1665738568085</updated>
     </task>
-    <option name="localTasksCounter" value="21" />
+    <task id="LOCAL-00021" summary="http">
+      <created>1666061412123</created>
+      <option name="number" value="00021" />
+      <option name="presentableId" value="LOCAL-00021" />
+      <option name="project" value="LOCAL" />
+      <updated>1666061412123</updated>
+    </task>
+    <option name="localTasksCounter" value="22" />
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="124982000" />
+    <option name="totallyTimeSpent" value="125386000" />
   </component>
   <component name="ToolWindowManager">
     <frame x="-8" y="-8" width="1936" height="1056" extended-state="6" />
@@ -687,7 +740,7 @@
       <window_info id="Structure" order="1" side_tool="true" weight="0.25" />
       <window_info anchor="right" id="Ant Build" order="1" weight="0.25" />
       <window_info id="UI Designer" order="2" />
-      <window_info active="true" anchor="bottom" id="Debug" order="3" visible="true" weight="0.34444445" />
+      <window_info anchor="bottom" id="Debug" order="3" visible="true" weight="0.34444445" />
       <window_info anchor="bottom" id="TODO" order="6" />
       <window_info anchor="bottom" id="Messages" order="7" weight="0.4211111" />
       <window_info anchor="right" id="Palette&#9;" order="3" />
@@ -698,7 +751,7 @@
       <window_info anchor="bottom" id="Run" order="2" weight="0.52666664" />
       <window_info anchor="bottom" id="Spring" order="7" />
       <window_info anchor="bottom" id="Terminal" order="7" weight="0.36888888" />
-      <window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.24840085" />
+      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.24840085" />
       <window_info anchor="right" id="Bean Validation" order="3" />
       <window_info id="Web" order="2" side_tool="true" />
       <window_info anchor="bottom" id="Find" order="1" />
@@ -735,12 +788,6 @@
     </breakpoint-manager>
   </component>
   <component name="editorHistoryManager">
-    <entry file="file://$PROJECT_DIR$/mybusiness/src/main/resources/templates/business/manager/othersmanager/index.html">
-      <provider selected="true" editor-type-id="text-editor" />
-    </entry>
-    <entry file="file://$PROJECT_DIR$/mybusiness/src/main/resources/templates/business/manager/canalmanager/index.html">
-      <provider selected="true" editor-type-id="text-editor" />
-    </entry>
     <entry file="file://$PROJECT_DIR$/mybusiness/src/main/resources/templates/business/manager/areamanager/index.html">
       <provider selected="true" editor-type-id="text-editor" />
     </entry>
@@ -1028,17 +1075,31 @@
         </state>
       </provider>
     </entry>
+    <entry file="file://$PROJECT_DIR$/leiSP-admin/src/main/resources/templates/login_old.html">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="420">
+          <caret line="47" column="64" selection-start-line="47" selection-start-column="50" selection-end-line="47" selection-end-column="64" />
+        </state>
+      </provider>
+    </entry>
     <entry file="file://$PROJECT_DIR$/leiSP-admin/src/main/resources/templates/login.html">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="477">
-          <caret line="51" column="18" selection-start-line="51" selection-start-column="18" selection-end-line="51" selection-end-column="18" />
+        <state relative-caret-position="-911">
+          <caret line="30" column="28" selection-start-line="30" selection-start-column="18" selection-end-line="30" selection-end-column="28" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/leiSP-admin/src/main/resources/templates/login_old.html">
+    <entry file="file://$PROJECT_DIR$/leiSP-admin/src/main/resources/static/ruoyi/login.js">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="480">
+          <caret line="25" column="25" selection-start-line="25" selection-start-column="20" selection-end-line="25" selection-end-column="25" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/leiSP-framework/src/main/java/com/sooka/framework/shiro/service/SysLoginService.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="150">
-          <caret line="44" column="46" selection-start-line="44" selection-start-column="46" selection-end-line="44" selection-end-column="46" />
+        <state relative-caret-position="217">
+          <caret line="47" column="9" lean-forward="true" selection-start-line="47" selection-start-column="9" selection-end-line="47" selection-end-column="9" />
         </state>
       </provider>
     </entry>

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())));