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

dsk-admin/src/main/java/com/dsk/web/controller/monitor/CacheController.java

@@ -40,7 +40,7 @@ public class CacheController {
         CACHES.add(new SysCache(GlobalConstants.CAPTCHA_CODE_KEY, "验证码"));
         CACHES.add(new SysCache(GlobalConstants.REPEAT_SUBMIT_KEY, "防重提交"));
         CACHES.add(new SysCache(GlobalConstants.RATE_LIMIT_KEY, "限流处理"));
-        CACHES.add(new SysCache(CacheNames.SYS_OSS_CONFIG, "OSS配置"));
+        CACHES.add(new SysCache(GlobalConstants.SYS_OSS_CONFIG, "OSS配置"));
         CACHES.add(new SysCache(GlobalConstants.PWD_ERR_CNT_KEY, "密码错误次数"));
     }
 

dsk-admin/src/main/resources/application-test.yml

 --- # 监控中心配置
 spring.boot.admin.client:
   # 增加客户端开关
-  enabled: true
+  enabled: false
   url: http://localhost:9090/admin
   instance:
     service-host-type: IP

dsk-operate-ui/src/views/detail/groupAccount/component/members.vue

@@ -63,7 +63,7 @@
         @sort-change="sortChange"
       >
         <template slot="companyName" slot-scope="scope">
-          <router-link :to="scope.row.uipId?`/enterprise/${encodeStr(scope.row.companyId)}`:`/company/${encodeStr(scope.row.companyId)}`" tag="a" class="a-link" v-if="scope.row.companyId&&scope.row.companyName" v-html="scope.row.companyName"></router-link>
+          <div v-if="scope.row.companyId&&scope.row.companyName" class="a-link" @click="getUipIdByCid(scope.row.companyId)" v-html="scope.row.companyName"></div>
           <div v-else v-html="scope.row.companyName || '--'"></div>
         </template>
         <template slot="stockPercent" slot-scope="scope">
@@ -76,6 +76,7 @@
 
 <script>
   import {memberList,memberCount,memberListExport} from '@/api/detail/groupAccount/groupAccount'
+  import { getUipIdByCid } from '@/api/macro/macro'
   import dataRegion from '@/assets/json/dataRegion'
   import { getDictType } from '@/api/main'
   import mixin from '../../party-a/mixins/mixin'
@@ -479,6 +480,20 @@
         this.handleQuery(params)
         this.$emit('handle-scroll')
       },
+      getUipIdByCid(companyId){
+        var params=[companyId]
+        getUipIdByCid(params).then(res=>{
+          if (res.code==200) {
+            if(res.data&&res.data.length>0&&res.data[0].uipId){
+              this.$router.push({path: '/enterprise/'+this.encodeStr(companyId)})
+            }else{
+              this.$router.push({path: '/company/'+this.encodeStr(companyId)})
+            }
+          }
+        }).catch(error=>{
+
+        });
+      },
       clickDialog(){
         this.exportData.dialogExportVisible=true;
       },

dsk-operate-ui/src/views/enterpriseData/components/SearchEnterprise/index.vue

@@ -3053,7 +3053,6 @@ export default {
       }else {
         this.dataEXCEL.exportCount=2000;
       }
-      console.log(this.exportData)
       //企业资质
       if(this.exportData.type === 1){
         api.aptitudeExport(this.dataEXCEL).then(res => {

dsk-oss/src/main/java/com/dsk/oss/factory/OssFactory.java

@@ -30,7 +30,10 @@ public class OssFactory {
      */
     public static OssClient instance() {
         // 获取redis 默认类型
-        String configKey = RedisUtils.getCacheObject(GlobalConstants.DEFAULT_CONFIG_KEY);
+        String configKey = RedisUtils.getCacheObject(OssConstant.DEFAULT_CONFIG_KEY);
+        if (StringUtils.isEmpty(configKey)) {
+            configKey = RedisUtils.getCacheObject(GlobalConstants.DEFAULT_CONFIG_KEY);
+        }
         if (StringUtils.isEmpty(configKey)) {
             throw new OssException("文件存储服务类型无法找到!");
         }

dsk-system/src/main/java/com/dsk/system/service/impl/SysConfigServiceImpl.java

@@ -21,6 +21,7 @@ import com.dsk.common.core.domain.model.DskAccessTokenVO;
 import com.dsk.common.core.page.TableDataInfo;
 import com.dsk.common.core.service.ConfigService;
 import com.dsk.common.exception.ServiceException;
+import com.dsk.common.tenant.helper.TenantHelper;
 import com.dsk.common.utils.JsonUtils;
 import com.dsk.common.utils.StringUtils;
 import com.dsk.common.utils.redis.CacheUtils;
@@ -299,7 +300,7 @@ public class SysConfigServiceImpl implements ISysConfigService, ConfigService {
 
     public List<SysConfig> queryListByKey(String keyName) {
         LambdaQueryWrapper<SysConfig> dsk = new LambdaQueryWrapper<SysConfig>().likeRight(SysConfig::getConfigKey, keyName);
-        return baseMapper.selectList(dsk);
+        return TenantHelper.ignore(()->baseMapper.selectList(dsk));
     }
 
 }

dsk-system/src/main/java/com/dsk/system/service/impl/SysOssConfigServiceImpl.java

@@ -2,11 +2,14 @@ package com.dsk.system.service.impl;
 
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.core.util.ObjectUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.dsk.common.constant.GlobalConstants;
+import com.dsk.common.constant.TenantConstants;
 import com.dsk.common.tenant.core.TenantEntity;
 import com.dsk.common.tenant.helper.TenantHelper;
 import com.dsk.common.utils.StreamUtils;
@@ -67,6 +70,11 @@ public class SysOssConfigServiceImpl implements ISysOssConfigService {
                         RedisUtils.setCacheObject(OssConstant.DEFAULT_CONFIG_KEY, configKey);
                     }
                     CacheUtils.put(CacheNames.SYS_OSS_CONFIG, config.getConfigKey(), JsonUtils.toJsonString(config));
+                    if(TenantConstants.DEFAULT_TENANT_ID.equals(config.getTenantId())){
+                        RedisUtils.setCacheObject(GlobalConstants.DEFAULT_CONFIG_KEY, configKey);
+                        CacheUtils.put(GlobalConstants.SYS_OSS_CONFIG, config.getConfigKey(), JsonUtils.toJsonString(config));
+                    }
+
                 }
             }
         } finally {

dsk-system/src/main/java/com/dsk/system/utils/DskOpenApiUtil.java

@@ -6,20 +6,16 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.dsk.acc.openapi.api.AccClient;
 import com.dsk.acc.openapi.client.Config;
 import com.dsk.acc.openapi.client.util.CommonUtils;
-import com.dsk.common.config.DskOpenApiConfig;
 import com.dsk.common.constant.TenantConstants;
 import com.dsk.common.core.page.TableDataInfo;
-import com.dsk.common.exception.ServiceException;
 import com.dsk.common.tenant.helper.TenantHelper;
 import com.dsk.system.domain.SysConfig;
 import com.dsk.system.mapper.SysConfigMapper;
 import org.apache.commons.collections4.MapUtils;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 import org.springframework.util.ObjectUtils;
 
 import javax.annotation.Resource;
-import java.lang.reflect.Field;
 import java.util.List;
 import java.util.Map;