Source/platformProject/vci-platform-web/src/main/java/com/vci/web/initTask/VciWebInitTaskComponent.java

@@ -1,16 +1,11 @@
package com.vci.web.initTask;

import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.vci.corba.common.VCIError;
import com.vci.frameworkcore.compatibility.ISmFunctionQueryService;
import com.vci.client.mw.ClientContextVariable;
import com.vci.client.mw.LaunchModeEnum;
import com.vci.corba.omd.data.AttributeValue;
import com.vci.frameworkcore.constant.FrameWorkBtmTypeConstant;
import com.vci.frameworkcore.properties.VciFramworkCompatibilityProperties;
import com.vci.mw.client.ClientContextVariable;
import com.vci.mw.client.InvocationUtility;
import com.vci.mw.client.LaunchModeEnum;
import com.vci.starter.corba.initializer.JacorbClientRequestInterceptor;
import com.vci.starter.corba.properties.JacorbClientMapProperties;
import com.vci.starter.web.annotation.config.VciConfigField;
import com.vci.starter.web.annotation.config.VciConfigModule;
import com.vci.starter.web.enumpck.DataSecretEnum;
@@ -25,7 +20,6 @@
import com.vci.web.pageModel.OsAttributeVO;
import com.vci.web.properties.WebProperties;
import com.vci.web.service.*;
import com.vci.web.service.impl.OsAttributeServiceImpl;
import com.vci.web.service.impl.UIEngineServiceImpl;
import com.vci.web.service.impl.WebContextInfoFetcher;
import com.vci.web.service.impl.WebInitServiceImpl;
@@ -41,15 +35,12 @@
import org.springframework.stereotype.Component;
import org.springframework.util.CollectionUtils;
import org.springframework.util.ResourceUtils;
import plm.bs.bom.common.AttributeValue;

import java.io.File;
import java.io.FileInputStream;
import java.io.FileNotFoundException;
import java.io.IOException;
import java.lang.reflect.Field;
import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
import java.util.*;
import java.util.stream.Collectors;

@@ -133,11 +124,11 @@
    @Autowired
    private WebSecretServiceI secretService;

    /**
     * corba的客户端
     */
    @Autowired(required = false)
    private JacorbClientMapProperties jacorbClientMapProperties;
//    /**
//     * corba的客户端
//     */
//    @Autowired(required = false)
//    private JacorbClientMapProperties jacorbClientMapProperties;

    /**
     * 执行初始化
@@ -258,12 +249,12 @@
                properties.load(new FileInputStream(file));
                String url = properties.getProperty("NameService");
                String name = properties.getProperty("InstanceIdentity");
                if (StringUtils.isNotBlank(url)) {
                    jacorbClientMapProperties.setUrl(url);
                }
                if (StringUtils.isNotBlank(name)) {
                    jacorbClientMapProperties.setInstanceIdentity(name);
                }
//                if (StringUtils.isNotBlank(url)) {
//                    jacorbClientMapProperties.setUrl(url);
//                }
//                if (StringUtils.isNotBlank(name)) {
//                    jacorbClientMapProperties.setInstanceIdentity(name);
//                }
            }
        }catch (IOException e) {
            logger.error("读取平台的corb配置文件出现了错误",e);
@@ -288,8 +279,8 @@
    public void initSetting() {
        System.out.println("----初始化用于查询配置的用户----");
        ClientContextVariable.setClientLanuchMode(LaunchModeEnum.WebApp);
        InvocationUtility.registerIInvocationContext(contextInfoFetcher);
        JacorbClientRequestInterceptor.sessionContext = contextInfoFetcher;
//        InvocationUtility.registerIInvocationContext(contextInfoFetcher);
//        JacorbClientRequestInterceptor.sessionContext = contextInfoFetcher;
        System.out.println("----初始化用于查询配置的用户完成----");
        System.out.println("----开始扫描有VciConfigModule注解的类----");
        String[] namesForAnnotation = ApplicationContextProvider.getApplicationContext().getBeanNamesForAnnotation(VciConfigModule.class);