From 97372541208141dd927ecb786168d5bc5b938cc2 Mon Sep 17 00:00:00 2001
From: sgj <1442489573@qq.com>
Date: 星期四, 04 十二月 2025 11:42:04 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
fzzy-igdss-core/src/main/java/com/fzzy/task/package-info.java | 1
fzzy-igdss-web/src/main/resources/banner.txt | 1
fzzy-igdss-view/src/main/java/com/fzzy/igds/SelectDept.view.xml | 2
fzzy-igdss-web/src/main/java/com/bstek/dorado/core/DoradoAbout.java | 70 +++++++++++++++++++++++++++++++++++
4 files changed, 73 insertions(+), 1 deletions(-)
diff --git a/fzzy-igdss-core/src/main/java/com/fzzy/task/package-info.java b/fzzy-igdss-core/src/main/java/com/fzzy/task/package-info.java
new file mode 100644
index 0000000..ffa7bf2
--- /dev/null
+++ b/fzzy-igdss-core/src/main/java/com/fzzy/task/package-info.java
@@ -0,0 +1 @@
+package com.fzzy.task;
\ No newline at end of file
diff --git a/fzzy-igdss-view/src/main/java/com/fzzy/igds/SelectDept.view.xml b/fzzy-igdss-view/src/main/java/com/fzzy/igds/SelectDept.view.xml
index faa9827..481a790 100644
--- a/fzzy-igdss-view/src/main/java/com/fzzy/igds/SelectDept.view.xml
+++ b/fzzy-igdss-view/src/main/java/com/fzzy/igds/SelectDept.view.xml
@@ -32,7 +32,7 @@
</DataType>
</Model>
<View>
- <Property name="packages">font-awesome</Property>
+ <Property name="packages">font-awesome,css-common</Property>
<DataSet id="dsCompany">
<Property name="dataType">[dtCompany]</Property>
<Property name="dataProvider">selectDeptPR#listCompany</Property>
diff --git a/fzzy-igdss-web/src/main/java/com/bstek/dorado/core/DoradoAbout.java b/fzzy-igdss-web/src/main/java/com/bstek/dorado/core/DoradoAbout.java
new file mode 100644
index 0000000..3a47283
--- /dev/null
+++ b/fzzy-igdss-web/src/main/java/com/bstek/dorado/core/DoradoAbout.java
@@ -0,0 +1,70 @@
+/*
+ * This file is part of Dorado 7.x (http://dorado7.bsdn.org).
+ *
+ * Copyright (c) 2002-2012 BSTEK Corp. All rights reserved.
+ *
+ * This file is dual-licensed under the AGPLv3 (http://www.gnu.org/licenses/agpl-3.0.html)
+ * and BSDN commercial (http://www.bsdn.org/licenses) licenses.
+ *
+ * If you are unsure which license is appropriate for your use, please contact the sales department
+ * at http://www.bstek.com/contact.
+ */
+
+package com.bstek.dorado.core;
+
+import java.rmi.dgc.VMID;
+
+import org.apache.commons.lang.StringUtils;
+
+/**
+ *
+ *
+ *璋冩暣鏄剧ず淇℃伅
+ *
+ * 鐢ㄤ簬鑾峰彇鍚勭Dorado鍩烘湰淇℃伅鐨勫伐鍏风被銆�
+ * @author Benny Bao (mailto:benny.bao@bstek.com)
+ * @since Feb 27, 2007
+ */
+public class DoradoAbout {
+ private static String instanceId = new VMID().toString();
+ private static long instantiationTime = System.currentTimeMillis();
+
+ /**
+ * 杩斿洖浜у搧鍚嶇О銆�
+ */
+ public static String getProductTitle() {
+ return "dorado";
+ }
+
+ /**
+ * 杩斿洖浜у搧鎻愪緵鍟嗐��
+ */
+ public static String getVendor() {
+ return "dorado";
+ }
+
+ /**
+ * 杩斿洖浜у搧鐗堟湰鍙枫��
+ */
+ public static String getVersion() {
+ Package pkg = DoradoAbout.class.getPackage();
+ String version = null;
+ if (pkg != null) version = pkg.getImplementationVersion();
+ if (StringUtils.isEmpty(version)) version = instanceId;
+ return version;
+ }
+
+ /**
+ * 杩斿洖dorado鐨勫疄渚媔d銆�
+ */
+ public static String getInstanceId() {
+ return instanceId;
+ }
+
+ /**
+ * 杩斿洖璇orado鐨勫疄渚嬬殑鍒涘缓鏃堕棿銆�
+ */
+ public static long getInstantiationTime() {
+ return instantiationTime;
+ }
+}
diff --git a/fzzy-igdss-web/src/main/resources/banner.txt b/fzzy-igdss-web/src/main/resources/banner.txt
index cca892b..a80680c 100644
--- a/fzzy-igdss-web/src/main/resources/banner.txt
+++ b/fzzy-igdss-web/src/main/resources/banner.txt
@@ -3,6 +3,7 @@
Application Version: fzzy-igdss
Application Version: 2.0
Spring Boot Version: ${spring-boot.version}
+Vendor锛歨ttp://www.fzzygf.com
============================================
______ _______ _______ ___ __
--
Gitblit v1.9.3