Huanyi 1 день назад
Родитель
Сommit
22786abe75

+ 2 - 2
.idea/runConfigurations/主服务.xml → .idea/runConfigurations/8080 - 主服务.xml

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="主服务" type="SpringBootApplicationConfigurationType" factoryName="Spring Boot">
+  <configuration default="false" name="8080 - 主服务" type="SpringBootApplicationConfigurationType" factoryName="Spring Boot">
     <module name="ruoyi-admin" />
     <option name="SPRING_BOOT_MAIN_CLASS" value="org.dromara.DromaraApplication" />
-    <option name="VM_PARAMETERS" value="-Dspring.profiles.active=dev" />
+    <option name="VM_PARAMETERS" value="-Dspring.profiles.active=dev -Dserver.port=8080" />
     <option name="PROGRAM_PARAMETERS" value="" />
     <method v="2">
       <option name="Make" enabled="true" />

+ 2 - 2
.idea/runConfigurations/定时任务.xml → .idea/runConfigurations/8800 - 定时任务.xml

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="定时任务" type="SpringBootApplicationConfigurationType" factoryName="Spring Boot">
+  <configuration default="false" name="8800 - 定时任务" type="SpringBootApplicationConfigurationType" factoryName="Spring Boot">
     <module name="ruoyi-snailjob-server" />
     <option name="SPRING_BOOT_MAIN_CLASS" value="org.dromara.snailjob.SnailJobServerApplication" />
-    <option name="VM_PARAMETERS" value="-Dspring.profiles.active=dev" />
+    <option name="VM_PARAMETERS" value="-Dspring.profiles.active=dev -Dserver.port=8800" />
     <option name="PROGRAM_PARAMETERS" value="" />
     <method v="2">
       <option name="Make" enabled="true" />

+ 12 - 0
.idea/runConfigurations/9090 - 监控中心.xml

@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="9090 - 监控中心" type="SpringBootApplicationConfigurationType" factoryName="Spring Boot">
+    <module name="ruoyi-monitor-admin" />
+    <option name="SPRING_BOOT_MAIN_CLASS" value="org.dromara.monitor.admin.MonitorAdminApplication" />
+    <option name="VM_PARAMETERS" value="-Dspring.profiles.active=dev -Dserver.port=9090" />
+    <option name="PROGRAM_PARAMETERS" value="" />
+    <method v="2">
+      <option name="Make" enabled="true" />
+    </method>
+  </configuration>
+</component>

+ 2 - 1
ruoyi-admin/src/main/java/org/dromara/web/service/impl/PasswordAuthStrategy.java

@@ -64,7 +64,8 @@ public class PasswordAuthStrategy implements IAuthStrategy {
         UserSource userSource = UserSource.getBySource(loginBody.getUserSource());
 
         boolean captchaEnabled = captchaProperties.getEnable();
-        if (captchaEnabled) {
+        // sys_employee 登录时不校验验证码
+        if (captchaEnabled && !UserSource.SYS_EMPLOYEE.equals(userSource)) {
             validateCaptcha(tenantId, username, code, uuid);
         }