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-operate-ui/src/views/macro/urban/index.vue

@@ -615,6 +615,7 @@ export default {
       }else {
         this.pageIndex = val
         this.querySubmit()
+        window.scrollTo(0, 0);
       }
     },
     handleSearch(event){

dsk-operate-ui/vue.config.js

@@ -34,10 +34,11 @@ module.exports = {
     proxy: {
       // detail: https://cli.vuejs.org/config/#devserver-proxy
       [process.env.VUE_APP_BASE_API]: {
-        // target: `http://47.104.91.229:9099/prod-api`,
+        target: `http://139.9.157.49:9099/prod-api`,//测试
+        // target: `http://localhost:9099`,//测试
+        // target: `http://122.9.160.122:9011`,  //线上
         // target: `http://192.168.0.165:9098`,//施
         // target: `http://192.168.60.6:9098`,//谭
-        target: `http://139.9.157.49:9099/prod-api`,//测试
         changeOrigin: true,
         pathRewrite: {
           ['^' + process.env.VUE_APP_BASE_API]: ''