From 694e0068d20b7b9cc7f2fcc2021bf83765d3799f Mon Sep 17 00:00:00 2001
From: ludc <ludc@vci-tech.com>
Date: 星期四, 26 十二月 2024 11:22:09 +0800
Subject: [PATCH] 去掉不需要的一些配置文件，修改pom打包插件
---
/dev/null | 38 -------------------
Source/plt-web/plt-web-parent/plt-web/pom.xml | 7 ++-
Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/properties/JsonConfigReader.java | 16 +++++---
Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/OsAttributeServiceImpl.java | 37 +++++++++++-------
4 files changed, 38 insertions(+), 60 deletions(-)
diff --git a/Source/plt-web/plt-web-parent/plt-web/pom.xml b/Source/plt-web/plt-web-parent/plt-web/pom.xml
index 58a217f..4a8dcda 100644
--- a/Source/plt-web/plt-web-parent/plt-web/pom.xml
+++ b/Source/plt-web/plt-web-parent/plt-web/pom.xml
@@ -107,11 +107,14 @@
<manifest>
<addClasspath>true</addClasspath>
<classpathPrefix>lib/</classpathPrefix>
+ <mainClass>com.vci.PlatformWebApplication</mainClass>
</manifest>
</archive>
<excludes>
- <exclude>properties/conf.properties</exclude>
- <exclude>properties/eventConf.properties</exclude>
+ <exclude>properties/ice.properties</exclude>
+ <exclude>properties/iceClient.properties</exclude>
+ <exclude>application-dev.yml</exclude>
+ <exclude>application-prod.yml</exclude>
<exclude>lib/*</exclude>
</excludes>
</configuration>
diff --git a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/properties/JsonConfigReader.java b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/properties/JsonConfigReader.java
index 0efe596..7ac3c4e 100644
--- a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/properties/JsonConfigReader.java
+++ b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/properties/JsonConfigReader.java
@@ -2,7 +2,13 @@
import com.alibaba.fastjson.JSON;
import com.vci.pagemodel.MenuVO;
+import com.vci.starter.web.exception.VciBaseException;
+import com.vci.starter.web.util.Lcm.Func;
+import com.vci.starter.web.util.LocalFileUtil;
import org.apache.commons.io.FileUtils;
+import org.apache.commons.lang3.StringUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.springframework.util.ResourceUtils;
import java.io.*;
@@ -20,12 +26,10 @@
private static sysModuleConf sysModuleConf;
static{
- try {
- File file = ResourceUtils.getFile("classpath:menuConfig.json");
- String json = FileUtils.readFileToString(file, "UTF-8");
- sysModuleConf = JSON.parseObject(json, sysModuleConf.class);
- }catch (IOException e) {
- e.printStackTrace();
+ String menuJson = LocalFileUtil.readContentForFileInJar("menuConfig.json");
+ sysModuleConf = JSON.parseObject(menuJson, sysModuleConf.class);
+ if(Func.isEmpty(sysModuleConf)){
+ throw new VciBaseException("璇诲彇menuConfig.json涓虹┖锛�");
}
}
diff --git a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/properties/UsedNames.java b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/properties/UsedNames.java
deleted file mode 100644
index bda0410..0000000
--- a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/properties/UsedNames.java
+++ /dev/null
@@ -1,38 +0,0 @@
-package com.vci.web.properties;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.PropertyResourceBundle;
-
-import com.vci.client.common.ClientLog4j;
-
-public class UsedNames {
- private static PropertyResourceBundle resourceBundle = null;
-
- static{
- try{
- if(resourceBundle == null){
- InputStream ins = UsedNames.class.getClassLoader().getResourceAsStream("properties/usedNames.properties");
- if(ins != null){
- resourceBundle = new PropertyResourceBundle(ins);
- }
- }
- }catch(IOException e){
- //e.printStackTrace();
- ClientLog4j.logger.error(e);
- }catch(Exception e){
- //e.printStackTrace();
- ClientLog4j.logger.error(e);
- }
- }
-
- public static String getProperty(String strKey){
- try{
- return resourceBundle.getString(strKey);
- }catch(Exception e){
- //e.printStackTrace();
- ClientLog4j.logger.error(e);
- return "";
- }
- }
-}
diff --git a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/OsAttributeServiceImpl.java b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/OsAttributeServiceImpl.java
index 7045ac8..fbbf6db 100644
--- a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/OsAttributeServiceImpl.java
+++ b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/OsAttributeServiceImpl.java
@@ -26,7 +26,6 @@
import com.vci.starter.web.pagemodel.*;
import com.vci.starter.web.util.*;
import com.vci.web.enumpck.PortalVITypeFlag;
-import com.vci.web.properties.UsedNames;
import com.vci.web.service.OsAttributeServiceI;
import com.vci.web.service.OsEnumServiceI;
import com.vci.web.service.OsLinkTypeServiceI;
@@ -81,14 +80,22 @@
private Integer NAME_MAX_LENGTH = 28;
/**
- * 绯荤粺涓彉閲忛厤缃枃浠朵腑閰嶇疆鐨刱ey
+ * 鏁版嵁搴撲腑鐨勪竴浜涘叧閿瓧
*/
- private final String SYSUSEDNAMES = "sysUsedNames";
-
- /**
- * 鏁版嵁搴撲腑鍏抽敭瀛楅厤缃枃浠朵腑閰嶇疆鐨刱ey
- */
- private final String DATABASEUSEDNAMES = "dataBaseUsedNames";
+ private final List<String> DATABASEUSEDNAMELIST = Arrays.asList(
+ "ACCESS", "ADD", "ALL", "ALTER", "AND", "ANY", "AS", "ASC", "AUDIT", "BETWEEN",
+ "BY", "CHAR", "CHECK", "CLUSTER", "COLUMN", "COMMENT", "COMPRESS", "CONNECT",
+ "CREATE", "CURRENT", "DATE", "DECIMAL", "DEFAULT", "DELETE", "DESC", "DISTINCT",
+ "DROP", "ELSE", "EXCLUSIVE", "EXISTS", "FILE", "FLOAT", "FOR", "FROM", "GRANT", "GROUP",
+ "HAVING", "IDENTIFIED", "IMMEDIATE", "IN", "INCREMENT", "INDEX", "INITIAL",
+ "INSERT", "INTEGER", "INTERSECT", "INTO", "IS", "LEVEL", "LIKE", "LOCK", "LONG",
+ "MAXEXTENTS", "MINUS", "MLSLABEL", "MODE", "MODIFY", "NOAUDIT", "NOCOMPRESS",
+ "NOT", "NOWAIT", "NULL", "NUMBER", "OF", "OFFLINE", "ON", "ONLINE", "OPTION", "OR", "ORDER",
+ "P", "CTFREE", "PRIOR", "PRIVILEGES", "PUBLIC", "RAW", "RENAME", "RESOURCE", "REVOKE",
+ "ROW", "ROWID", "ROWNUM", "ROWS", "SELECT", "SESSION", "SET", "SHARE", "SIZE", "SMALLINT",
+ "START", "SUCCESSFUL", "SYNONYM", "SYSDATE", "TABLE", "THEN", "TO", "TRIGGER", "UID", "UNION",
+ "UNIQUE", "UPDATE", "USER", "VALIDATE", "VALUES", "VARCHAR", "VARCHAR2", "VIEW",
+ "WHENEVER", "WHERE", "WITH");
/**
* 閾炬帴绫诲瀷鏈嶅姟
@@ -915,10 +922,14 @@
* @param abName
* @return
*/
- private boolean usedBySystem(String abName) {
+ private boolean usedBySystem(String abName) throws PLException {
boolean flag = false;
- String[] names = UsedNames.getProperty(SYSUSEDNAMES).toUpperCase().split(",");
- List<String> nameList = Arrays.asList(names);
+ AttributeDef[] sysAttributeDefs = platformClientUtil.getBtmService().getSysAttributeDefs();
+ List<String> nameList = null;
+ if(Func.isNotEmpty(sysAttributeDefs)){
+ nameList = Arrays.stream(sysAttributeDefs)
+ .map(item -> item.name.toUpperCase(Locale.ROOT)).collect(Collectors.toList());
+ }
if(nameList.contains(abName.toUpperCase())){
flag = true;
}
@@ -932,9 +943,7 @@
*/
private boolean usedByDataBase(String abName){
boolean flag = false;
- String[] names = UsedNames.getProperty(DATABASEUSEDNAMES).toUpperCase().split(",");
- List<String> nameList = Arrays.asList(names);
- if(nameList.contains(abName.toUpperCase())){
+ if(DATABASEUSEDNAMELIST.contains(abName.toUpperCase())){
flag = true;
}
return flag;
--
Gitblit v1.9.3