登录接口优化

zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/controller/app/enforcement/AppEnfLoginController.java

@@ -14,6 +14,7 @@ import org.apache.commons.codec.binary.Hex;
 import org.dromara.common.core.domain.R;
 import org.dromara.system.domain.vo.SysDeptVo;
 import org.dromara.system.domain.vo.SysUserVo;
+import org.dromara.system.service.ISysConfigService;
 import org.dromara.system.service.ISysDeptService;
 import org.dromara.system.service.ISysUserService;
 import org.springframework.beans.factory.annotation.Value;
@@ -36,7 +37,7 @@ public class AppEnfLoginController extends LoginController {
     private final ISysUserService sysUserService;
     private final ISysDeptService sysDeptService;
     private final IAppEnfLoginService appEnfLoginService;
-
+    private final ISysConfigService sysConfigService;
     @Value("${szypt.corpid}")
     private String szyptCorpid;
     @Value("${szypt.agentid}")
@@ -55,6 +56,12 @@ public class AppEnfLoginController extends LoginController {
     @SaIgnore
     @PostMapping("/do")
     public R<Map<String, Object>> validate(@RequestBody Map<String, String> params) {
+
+        String login_check = sysConfigService.selectConfigByKey("login.check");
+        if (!"1".equals(login_check)) {
+            return R.fail("当前系统维护中，请稍后再试");
+        }
+
         String loginName = params.get("secretName");
         String secretKey = params.get("secretKey");
 

zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/controller/app/enterprise/AppEntLoginController.java

@@ -10,6 +10,7 @@ import com.zdxt.enforcementcode.service.IEnterpriseUserService;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.dromara.common.core.domain.R;
+import org.dromara.system.service.ISysConfigService;
 import org.springframework.web.bind.annotation.*;
 
 import java.util.HashMap;
@@ -28,6 +29,8 @@ public class AppEntLoginController extends LoginController {
     private final IEnterpriseUserService enterpriseUserService;
     private final IEnterpriseInformationService enterpriseInformationService;
     private final IEnterpriseUserRefService enterpriseUserRefService;
+
+    private final ISysConfigService sysConfigService;
     /**
      * 企业端用户登录
      *
@@ -37,6 +40,13 @@ public class AppEntLoginController extends LoginController {
     @SaIgnore
     @PostMapping("/do")
     public R<Map<String, Object>> validate(@RequestBody Map<String, String> params) {
+
+        // 查询字符串值
+        String login_check = sysConfigService.selectConfigByKey("login.check");
+        if (!"1".equals(login_check)) {
+            return R.fail("当前系统维护中，请稍后再试");
+        }
+
         String secretName = params.get("secretName");
         String secretKey = params.get("secretKey");
 

zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/controller/app/enterprise/AppEnterpriseLoginController.java

@@ -91,6 +91,7 @@ public class AppEnterpriseLoginController {
             } catch (Exception e) {
                 e.printStackTrace();
                 log.error("---> 获取深i企用户信息失败，返回结果：{}",data);
+                return R.fail("登录失败，获取深i企用户信息失败," + e.getMessage());
             }
 
             log.info("---> data: {}", data);
@@ -101,18 +102,18 @@ public class AppEnterpriseLoginController {
             return R.ok("登录成功", result);
         }catch (Exception e){
             e.printStackTrace();
+            return R.fail("登录失败,"+e.getMessage());
         }
-        return R.ok("登录失败");
     }
 
-    /**
-     * 深i企模拟登录（开发/联调）
-     */
-    @SaIgnore
-    @ApiResponse(description = "企业端-深i企模拟登录")
-    @PostMapping("/siqLoginMock")
-    public R<Map<String, Object>> siqLoginMock(@RequestBody AppEnterpriseLoginBo bo) {
-        Map<String, Object> result = appEnterpriseLoginService.siqLoginMock(bo);
-        return R.ok("登录成功", result);
-    }
+//    /**
+//     * 深i企模拟登录（开发/联调）
+//     */
+//    @SaIgnore
+//    @ApiResponse(description = "企业端-深i企模拟登录")
+//    @PostMapping("/siqLoginMock")
+//    public R<Map<String, Object>> siqLoginMock(@RequestBody AppEnterpriseLoginBo bo) {
+//        Map<String, Object> result = appEnterpriseLoginService.siqLoginMock(bo);
+//        return R.ok("登录成功", result);
+//    }
 }

zdxt-web-server/zdxt-admin-web-server/src/main/resources/application-dev.yml

@@ -368,3 +368,37 @@ business-data-sync:
   max-retry: 5
   # 日志保留天数
   log-retention-days: 30
+
+
+springdoc:
+  api-docs:
+    enabled: false
+  swagger-ui:
+    enabled: false
+  info:
+    # 标题
+    title: '执法监督码接口文档'
+    # 描述
+    description: '执法监督码系统接口文档'
+    # 版本
+    version: '版本号: ${project.version}'
+  # Swagger UI 安全认证配置（Token 登录入口）
+  components:
+    security-schemes:
+      Authorization:
+        type: HTTP
+        scheme: bearer
+        bearer-format: JWT
+        description: "请输入 Token，格式：Bearer {token} 或直接输入 {token}"
+      clientid:
+        type: apiKey
+        in: header
+        name: clientid
+        description: "客户端ID，例如：enterprise_app"
+
+  #这里定义了两个分组，可定义多个，也可以不定义
+  group-configs:
+    - group: 1、执法监督码
+      packages-to-scan: com.zdxt.enforcementcode
+    - group: 3.系统模块
+      packages-to-scan: org.dromara.system

zdxt-web-server/zdxt-admin-web-server/src/main/resources/application-prod.yml

@@ -359,3 +359,9 @@ business-data-sync:
   max-retry: 5
   # 日志保留天数
   log-retention-days: 30
+
+springdoc:
+  api-docs:
+    enabled: false
+  swagger-ui:
+    enabled: false

zdxt-web-server/zdxt-admin-web-server/src/main/resources/application.yml

@@ -86,7 +86,7 @@ spring:
     # 国际化资源文件路径
     basename: i18n/messages
   profiles:
-    active: dev
+    active: prod
   # 文件上传
   servlet:
     multipart:
@@ -256,47 +256,6 @@ api-decrypt:
   # 对应前端加密公钥 MFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAKoR8mX0rGKLqzcWmOzbfj64K8ZIgOdHnzkXSOVOZbFu/TJhZ7rFAN+eaGkl3C4buccQd/EjEsj9ir7ijT7h96MCAwEAAQ==
   privateKey: MIIBVAIBADANBgkqhkiG9w0BAQEFAASCAT4wggE6AgEAAkEAqhHyZfSsYourNxaY7Nt+PrgrxkiA50efORdI5U5lsW79MmFnusUA355oaSXcLhu5xxB38SMSyP2KvuKNPuH3owIDAQABAkAfoiLyL+Z4lf4Myxk6xUDgLaWGximj20CUf+5BKKnlrK+Ed8gAkM0HqoTt2UZwA5E2MzS4EI2gjfQhz5X28uqxAiEA3wNFxfrCZlSZHb0gn2zDpWowcSxQAgiCstxGUoOqlW8CIQDDOerGKH5OmCJ4Z21v+F25WaHYPxCFMvwxpcw99EcvDQIgIdhDTIqD2jfYjPTY8Jj3EDGPbH2HHuffvflECt3Ek60CIQCFRlCkHpi7hthhYhovyloRYsM+IS9h/0BzlEAuO0ktMQIgSPT3aFAgJYwKpqRYKlLDVcflZFCKY7u3UP8iWi1Qw0Y=
 
-springdoc:
-  api-docs:
-    # 是否开启接口文档
-    enabled: false
-  swagger-ui:
-    enabled: false
-
-  info:
-    # 标题
-    title: '执法监督码接口文档'
-    # 描述
-    description: '执法监督码系统接口文档'
-    # 版本
-    version: '版本号: ${project.version}'
-  # Swagger UI 安全认证配置（Token 登录入口）
-  components:
-    security-schemes:
-      Authorization:
-        type: HTTP
-        scheme: bearer
-        bearer-format: JWT
-        description: "请输入 Token，格式：Bearer {token} 或直接输入 {token}"
-      clientid:
-        type: apiKey
-        in: header
-        name: clientid
-        description: "客户端ID，例如：enterprise_app"
-
-  #这里定义了两个分组，可定义多个，也可以不定义
-  group-configs:
-    - group: 1、执法监督码
-      packages-to-scan: com.zdxt.enforcementcode
-#    - group: 2.通用模块
-#      packages-to-scan: org.dromara.web
-    - group: 3.系统模块
-      packages-to-scan: org.dromara.system
-#    - group: 4.代码生成模块
-#      packages-to-scan: org.dromara.generator
-#    - group: 5.工作流模块
-#      packages-to-scan: org.dromara.workflow
-
 # 防止XSS攻击
 xss:
   # 过滤开关