Merge branch 'zuhuduan' of http://192.168.60.201/root/dsk-operate-sys into zuhuduan

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

@@ -112,7 +112,7 @@ public class CaptchaController {
         String phonenumber = sysUser.getPhonenumber();
         String key = GlobalConstants.CAPTCHA_CODE_KEY + phonenumber;
         String code = RandomUtil.randomNumbers(6);
-        RedisUtils.setCacheObject(key, code, Duration.ofMinutes(Constants.CAPTCHA_EXPIRATION));
+        RedisUtils.setCacheObject(key, code, Duration.ofMinutes(10));
         // 验证码模板id 自行处理 (查数据库或写死均可)
         LinkedHashMap<String, String> map = new LinkedHashMap<>(1);
         map.put("code", code);

dsk-admin/src/main/java/com/dsk/web/schedule/TenantTimerTask.java

@@ -25,7 +25,7 @@ public class TenantTimerTask {
      */
     @Scheduled(cron = "0 0/10 * * * ? ")
     public void updateExpiredTenantStatus() {
-        log.info("执行定时禁用已过期租户账号(6h/次)");
+        log.info("执行定时禁用已过期租户账号(10min/次)");
         TenantHelper.ignore(tenantService::handleExpiredTenant);
     }
 

dsk-module/dsk-biz-api/src/main/java/com/dsk/search/controller/BusinessOpportunityRadarController.java

@@ -190,4 +190,12 @@ public class BusinessOpportunityRadarController {
         ExcelUtils<ImportantProjectExportVo> util = new ExcelUtils<>(ImportantProjectExportVo.class);
         util.exportExcel(response, list, "重点项目", "重点项目导出明细", true);
     }
+
+    /*
+     * 公招市场
+     */
+    @RequestMapping("/bxproPage")
+    public AjaxResult bxproPage(@RequestBody JSONObject object) {
+        return opportunityRadarService.bxproPage(object);
+    }
 }

dsk-module/dsk-biz-api/src/main/java/com/dsk/search/service/BusinessOpportunityRadarService.java

@@ -160,4 +160,9 @@ public class BusinessOpportunityRadarService {
         return result;
 
     }
+
+    public AjaxResult bxproPage(JSONObject object) {
+        Map<String, Object> map = dskOpenApiUtil.requestBody("/nationzj/subscription/bxproPage", object);
+        return BeanUtil.toBean(map, AjaxResult.class);
+    }
 }

dsk-operate-ui/src/views/login.vue

@@ -45,7 +45,7 @@
             <img class="img" slot="prefix" src="../assets/images/validCode.png"/>
           </el-input>
           <div class="login-code">
-            <div class="hqyzm" @click="getsms" :class="{'disableds':smstitle!='获取验证码'}">{{smstitle}}</div>
+            <div class="hqyzm" @click="getsms" :class="{'disableds':smstitle!='获取验证码'&&smstitle!='重新获取'}">{{smstitle}}</div>
           </div>
         </el-form-item>
         <el-form-item style="width:100%;margin-top: 42px">
@@ -151,7 +151,7 @@
             <img class="img" slot="prefix" src="../assets/images/validCode.png"/>
           </el-input>
           <div class="login-code">
-            <div class="hqyzm" @click="getsms" :class="{'disableds':smstitle!='获取验证码'}">{{smstitle}}</div>
+            <div class="hqyzm" @click="getsms" :class="{'disableds':smstitle!='获取验证码'&&smstitle!='重新获取'}">{{smstitle}}</div>
           </div>
         </el-form-item>
         <el-form-item style="width:100%;margin-top: 42px">
@@ -247,6 +247,7 @@
       immediate: true
     },
     isDXlogin(){
+      this.smstitle = '获取验证码'
       this.resetForm('dxform')
       this.resetForm('loginForm')
       this.getCode()
@@ -271,28 +272,30 @@
       if(this.nosend == true){
         return false
       }
-      logincaptchaSms(this.dxform).then(res=>{
-        if(res.code == 200){
+      // logincaptchaSms(this.dxform).then(res=>{
+      //   if(res.code == 200){
+
           this.$message.success('已发送短信！')
           let _this = this
           _this.nosend = true
           this.timers = setInterval(()=>{
             _this.smstitle =  _this.smstime +'秒后重试'
             _this.smstime--;
-            if(_this.smstime <= 0){
-              _this.smstitle = '获取验证码'
+            if(_this.smstime < 0){
+              _this.smstitle = '重新获取'
               clearInterval(_this.timers)
               _this.nosend = false
+              _this.smstime = 60
             }
           },1000)
-        }else{
-          this.$message.error(res.msg)
-          this.getCode()
-          this.showcode = true
-        }
-      }).catch(res=>{
-        this.$message.error(res.msg)
-      })
+      //   }else{
+      //     this.$message.error(res.msg)
+      //     this.getCode()
+      //     this.showcode = true
+      //   }
+      // }).catch(res=>{
+      //   this.$message.error(res.msg)
+      // })
     },
     handleLogin() {
       this.$refs.loginForm.validate(valid => {