zyp

fs-ad-api/src/main/java/com/fs/app/controller/CommonController.java

@@ -7,7 +7,6 @@ import com.fs.ad.service.IAdHtmlClickLogService;
 import com.fs.common.core.domain.R;
 import com.fs.qw.vo.AdUploadVo;
 import io.swagger.annotations.Api;
-import jdk.nashorn.internal.ir.annotations.Ignore;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.rocketmq.spring.core.RocketMQTemplate;
@@ -20,7 +19,6 @@ import org.springframework.web.bind.annotation.RestController;
 @Api("公共接口")
 @RestController
 @AllArgsConstructor
-@Ignore
 @RequestMapping(value="/app/common")
 public class CommonController {
     private IAdHtmlClickLogService adHtmlClickLogService;

fs-admin-saas/src/main/java/com/fs/FSApplication.java → fs-admin-saas/src/main/java/com/fs/FSAdminSaasApplication.java

@@ -31,10 +31,10 @@ import org.springframework.transaction.annotation.Transactional;
 @Transactional
 @EnableAsync
 @EnableScheduling
-public class FSApplication {
+public class FSAdminSaasApplication {
     public static void main(String[] args) {
         // System.setProperty("spring.devtools.restart.enabled", "false");
-        SpringApplication.run(FSApplication.class, args);
+        SpringApplication.run(FSAdminSaasApplication.class, args);
         System.out.println("admin启动成功");
     }
 }

fs-admin-saas/src/main/java/com/fs/FSServletInitializer.java

@@ -9,6 +9,6 @@ public class FSServletInitializer extends SpringBootServletInitializer
     @Override
     protected SpringApplicationBuilder configure(SpringApplicationBuilder application)
     {
-        return application.sources(FSApplication.class);
+        return application.sources(FSAdminSaasApplication.class);
     }
 }

fs-admin-saas/src/main/java/com/fs/web/controller/common/CaptchaController.java

@@ -22,10 +22,10 @@ import org.springframework.context.annotation.Profile;
 
 /**
  * 验证码操作处理
- * 
+ *
 
  */
-@Profile("admin")
+//@Profile("admin")
 @RestController
 public class CaptchaController
 {
@@ -37,11 +37,11 @@ public class CaptchaController
 
     @Autowired
     private RedisCache redisCache;
-    
+
     // 验证码类型
     @Value("${fs.captchaType}")
     private String captchaType;
-    
+
     @Autowired
     private ISysConfigService configService;
     /**
@@ -51,12 +51,12 @@ public class CaptchaController
     public AjaxResult getCode(HttpServletResponse response) throws IOException
     {
         AjaxResult ajax = AjaxResult.success();
-        boolean captchaOnOff = configService.selectCaptchaOnOff();
-        ajax.put("captchaOnOff", captchaOnOff);
-        if (!captchaOnOff)
-        {
-            return ajax;
-        }
+//        boolean captchaOnOff = configService.selectCaptchaOnOff();
+//        ajax.put("captchaOnOff", captchaOnOff);
+//        if (!captchaOnOff)
+//        {
+//            return ajax;
+//        }
 
         // 保存验证码信息
         String uuid = IdUtils.simpleUUID();

fs-admin-saas/src/main/java/com/fs/web/controller/system/SysLoginController.java

@@ -42,7 +42,7 @@ import com.fs.system.service.IAdminMenuService;
  *
 
  */
-@Profile("admin")
+//@Profile("admin")
 @RestController
 public class SysLoginController
 {

fs-framework/src/main/java/com/fs/framework/web/service/SysLoginService.java

@@ -43,7 +43,7 @@ import java.util.concurrent.TimeUnit;
 
 /**
  * 登录校验方法
- * 
+ *
 
  */
 @Component
@@ -57,7 +57,7 @@ public class SysLoginService
 
     @Autowired
     private RedisCache redisCache;
-    
+
     @Autowired
     private ISysUserService userService;
 
@@ -77,7 +77,7 @@ public class SysLoginService
 
     /**
      * 登录验证
-     * 
+     *
      * @param username 用户名
      * @param password 密码
      * @param code 验证码
@@ -154,7 +154,7 @@ public class SysLoginService
 
     /**
      * 校验验证码
-     * 
+     *
      * @param username 用户名
      * @param code 验证码
      * @param uuid 唯一标识
@@ -227,24 +227,21 @@ public class SysLoginService
 
         // 默认使用主库
         DynamicDataSourceContextHolder.setDataSourceType(DataSourceType.MASTER.name());
-
-        // ===== 只有传了 tenantCode 才走租户逻辑 =====
-        if (StringUtils.isNotBlank(tenantCode))
+        
+        // 查询租户（主库）
+        tenantInfo = userService.getTenantInfo(tenantCode);
+        if (BeanUtil.isEmpty(tenantInfo))
         {
-            // 查询租户（主库）
-            tenantInfo = userService.getTenantInfo(tenantCode);
-            if (BeanUtil.isEmpty(tenantInfo))
-            {
-                throw new ServiceException("企业不存在");
-            }
-            if (!tenantInfo.getStatus().equals(1))
-            {
-                throw new ServiceException("企业已禁用");
-            }
-
-            // 切到租户库
-            tenantDataSourceManager.switchTenant(tenantInfo);
+            throw new ServiceException("企业不存在");
         }
+        if (!tenantInfo.getStatus().equals(1))
+        {
+            throw new ServiceException("企业已禁用");
+        }
+
+        // 切到租户库
+        tenantDataSourceManager.switchTenant(tenantInfo);
+
 
         try
         {