From e405b861b9521f5ea38c5402203a5b05988f9de2 Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期三, 04 十二月 2024 10:47:05 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/plt-web/plt-web-parent/plt-web-permission/src/main/java/com/vci/web/initTask/VciWebInitTaskComponent.java | 74 +------------------------------------
1 files changed, 2 insertions(+), 72 deletions(-)
diff --git a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/initTask/VciWebInitTaskComponent.java b/Source/plt-web/plt-web-parent/plt-web-permission/src/main/java/com/vci/web/initTask/VciWebInitTaskComponent.java
similarity index 80%
rename from Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/initTask/VciWebInitTaskComponent.java
rename to Source/plt-web/plt-web-parent/plt-web-permission/src/main/java/com/vci/web/initTask/VciWebInitTaskComponent.java
index 8fbdc66..c1ba834 100644
--- a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/initTask/VciWebInitTaskComponent.java
+++ b/Source/plt-web/plt-web-parent/plt-web-permission/src/main/java/com/vci/web/initTask/VciWebInitTaskComponent.java
@@ -1,14 +1,11 @@
package com.vci.web.initTask;
-import com.alibaba.fastjson.JSONObject;
import com.vci.client.mw.ClientContextVariable;
import com.vci.client.mw.LaunchModeEnum;
import com.vci.constant.FrameWorkBtmTypeConstant;
import com.vci.corba.common.PLException;
import com.vci.corba.framework.FrameworkServicePrx;
import com.vci.corba.omd.data.AttributeValue;
-import com.vci.constant.FrameWorkBtmTypeConstant;
-import com.vci.frameworkcore.properties.VciFramworkCompatibilityProperties;
import com.vci.starter.web.annotation.config.VciConfigField;
import com.vci.starter.web.annotation.config.VciConfigModule;
import com.vci.starter.web.enumpck.SessionStorageTypeEnum;
@@ -16,20 +13,14 @@
import com.vci.starter.web.pagemodel.SessionInfo;
import com.vci.starter.web.properties.VciSessionProperties;
import com.vci.starter.web.util.ApplicationContextProvider;
-import com.vci.starter.web.util.LocalFileUtil;
import com.vci.starter.web.wrapper.VciQueryWrapperForDO;
-import com.vci.pagemodel.OsAttributeVO;
+import com.vci.web.properties.VciFramworkCompatibilityProperties;
import com.vci.web.properties.WebProperties;
-import com.vci.web.service.OsAttributeServiceI;
-import com.vci.web.service.VciMdServiceI;
-import com.vci.web.service.impl.UIEngineServiceImpl;
import com.vci.web.util.PlatformClientUtil;
import com.vci.web.util.WebUtil;
-import org.apache.commons.lang3.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Value;
import org.springframework.boot.ApplicationArguments;
import org.springframework.boot.ApplicationRunner;
import org.springframework.stereotype.Component;
@@ -40,7 +31,6 @@
import java.lang.reflect.Method;
import java.util.HashMap;
import java.util.List;
-import java.util.Locale;
import java.util.Map;
import java.util.stream.Collectors;
@@ -57,12 +47,6 @@
* 鏃ュ織瀵硅薄
*/
private Logger logger = LoggerFactory.getLogger(getClass());
-
- /**
- * 鏄惁鍏煎
- */
- @Value("${user-table-compatibility:}")
- private String compatibility;
/**
* 閰嶇疆瀵硅薄
@@ -89,19 +73,6 @@
private VciFramworkCompatibilityProperties compatibilityProperties;
/**
- * 灞炴�х殑鏈嶅姟
- */
- @Autowired
- private OsAttributeServiceI attributeService;
-
- /**
- * markdown鐨勬湇鍔�
- */
- @Autowired
- private VciMdServiceI mdService;
-
-
- /**
* 鎵ц鍒濆鍖�
* @param args 鍚姩鐨勫弬鏁�
*/
@@ -111,35 +82,9 @@
initSysadmin();
initClearSession();
initSetting();
-// secretService.getMinDataSecret();
-// secretService.getMinIpSecret();
-// secretService.getMinUserSecret();
-// initService.clearAllCache();
-// initService.initServerCache();
- mdService.scanAllMdFile();
- initDefaultAttribute();
}
- /**
- * 鍒濆鍖栭粯璁ょ殑灞炴��
- */
- private void initDefaultAttribute() {
- try {
- String attrJson = LocalFileUtil.readContentForFileInJar("DefaultAttribute.json");
- if (StringUtils.isBlank(attrJson)) {
- logger.info("娌℃湁璇诲彇鍒癱lasspath*:DefaultAttribute.json鏂囦欢鐨勫唴瀹�");
- return;
- }
- List<OsAttributeVO> attributeVOS = JSONObject.parseArray(attrJson, OsAttributeVO.class);
- if(!CollectionUtils.isEmpty(attributeVOS)){
- attributeService.setDefaultAttributeVOs(attributeVOS.stream().sorted(((o1, o2) -> o1.getId().compareTo(o2.getId()))).collect(Collectors.toList()));
- attributeService.setDefaultAttributeVOMap(attributeVOS.stream().collect(Collectors.toMap(s->s.getId().toLowerCase(Locale.ROOT), t->t)));
- }
- logger.info("璇诲彇榛樿灞炴�у畬鎴�");
- }catch (Throwable e){
- logger.error("璇诲彇classpath*:DefaultAttribute.json鐨勫唴瀹瑰苟杞崲鐨勬椂鍊欏嚭閿欎簡",e);
- }
- }
+
/**
* 娓呴櫎浼氳瘽鐨勪俊鎭唴瀹�
@@ -281,21 +226,6 @@
}
//鍙湁褰撴暟鎹瘑绾ф帶鍒跺紑鍚殑鎯呭喌涓嬶紝鎵嶄細鎺у埗娴佺▼鍙戣捣鏃剁殑瀵嗙骇
webProperties.setCheckSecretOnProcessStart(webProperties.isCheckClientSessionTimeout()&&webProperties.isSecretRight());
- if(webProperties.isDebug()){
- UIEngineServiceImpl.QUERY_BY_CACHE = false;
- }
System.out.println("---璇诲彇鏈嶅姟绔殑閰嶇疆鏂囦欢瀹屾垚---");
- }
-
-
-
-
-
- public String getCompatibility() {
- return compatibility;
- }
-
- public void setCompatibility(String compatibility) {
- this.compatibility = compatibility;
}
}
--
Gitblit v1.9.3