From 83164be6f8bd509025f3cfdc7a01f3e06de255c8 Mon Sep 17 00:00:00 2001
From: zhujinyong <zhujinyong@cnezsoft.com>
Date: Tue, 1 Mar 2022 13:19:09 +0800
Subject: [PATCH] * Refactor xuan.

---
 Makefile                   | 20 ++++++++++++--------
 framework/router.class.php |  2 +-
 xuanxuan/XUANVERSION       |  1 +
 xuanxuan/XVERSION          |  1 +
 4 files changed, 15 insertions(+), 9 deletions(-)
 create mode 100644 xuanxuan/XUANVERSION
 create mode 100644 xuanxuan/XVERSION

diff --git a/Makefile b/Makefile
index 5900322d36..80b276fc37 100644
--- a/Makefile
+++ b/Makefile
@@ -1,8 +1,8 @@
 VERSION     = $(shell head -n 1 VERSION)
-XUANPATH    = $(shell head -n 1 XUANPATH)
-XUANVERSION = $(shell head -n 1 XUANVERSION)
-XVERSION    = $(shell head -n 1 XVERSION)
+XUANVERSION = $(shell head -n 1 xuan/XUANVERSION)
+XVERSION    = $(shell head -n 1 xuan/XVERSION)
 
+XUANPATH     := $(XUANXUAN_SRC_PATH)
 BUILD_PATH   := $(if $(ZENTAO_BUILD_PATH),$(ZENTAO_BUILD_PATH),$(shell pwd))
 RELEASE_PATH := $(if $(ZENTAO_RELEASE_PATH),$(ZENTAO_RELEASE_PATH),$(shell pwd))
 
@@ -46,7 +46,7 @@ common:
 	rm -fr zentaopms/tools
 	# create the restart file for svn.
 	# touch zentaopms/module/svn/restart
-	# delee the unused files.
+	# delete the unused files.
 	find zentaopms -name .gitkeep |xargs rm -fr
 	find zentaopms -name tests |xargs rm -fr
 	# notify.zip.
@@ -229,10 +229,14 @@ enrpm:
 ci:
 	git pull
 	make common
-	make zentaoxx
-	unzip zentaoxx.*.zip
-	cp zentaoxx/* zentaopms/ -r
-	cat zentaoxx/db/xuanxuan.sql >> zentaopms/db/zentao.sql
+
+        ifneq ($(XUANPATH), )
+	    make zentaoxx
+	    unzip zentaoxx.*.zip
+	    cp zentaoxx/* zentaopms/ -r
+	    cat zentaoxx/db/xuanxuan.sql >> zentaopms/db/zentao.sql
+        endif
+
 	make package
 	if [ -d $(BUILD_PATH)/zentaopms ]; then rm -r $(BUILD_PATH)/zentaopms; fi
 	zip -rq -9 ZenTaoPMS.$(VERSION).zip zentaopms
diff --git a/framework/router.class.php b/framework/router.class.php
index e28a1f7a96..e933c2a24b 100755
--- a/framework/router.class.php
+++ b/framework/router.class.php
@@ -319,7 +319,7 @@ class router extends baseRouter
             if(!empty($extConfigPath['vision'])) $commonExtConfigFiles = array_merge($commonExtConfigFiles, helper::ls($extConfigPath['vision'], '.php'));
             if(!empty($extConfigPath['custom'])) $commonExtConfigFiles = array_merge($commonExtConfigFiles, helper::ls($extConfigPath['custom'], '.php'));
         }
-        if($config->framework->extensionLevel == 2 and !empty($extConfigPath['site']))   $siteExtConfigFiles   = helper::ls($extConfigPath['site'], '.php');
+        if($config->framework->extensionLevel == 2 and !empty($extConfigPath['site'])) $siteExtConfigFiles = helper::ls($extConfigPath['site'], '.php');
         $extConfigFiles = array_merge($commonExtConfigFiles, $siteExtConfigFiles);
 
         /* 将主配置文件和扩展配置文件合并在一起。Put the main config file and extension config files together. */
diff --git a/xuanxuan/XUANVERSION b/xuanxuan/XUANVERSION
new file mode 100644
index 0000000000..6882b35112
--- /dev/null
+++ b/xuanxuan/XUANVERSION
@@ -0,0 +1 @@
+dc75cbfd
diff --git a/xuanxuan/XVERSION b/xuanxuan/XVERSION
new file mode 100644
index 0000000000..a1ef0cae18
--- /dev/null
+++ b/xuanxuan/XVERSION
@@ -0,0 +1 @@
+5.0.2