From 867f08b42decb339510952a923852724aa7da138 Mon Sep 17 00:00:00 2001
From: 1821349743@qq.com <1821349743@qq.com>
Date: 星期五, 28 四月 2023 10:06:48 +0800
Subject: [PATCH] update
---
/dev/null | 0
home-server-admin/.gitignore | 6 +++
home-server-admin/pom.xml | 1
pom.xml | 55 +++++++++++++++------------
product-server-web/resources/LicenseKey.dat | 2
5 files changed, 38 insertions(+), 26 deletions(-)
diff --git a/home-server-admin/.classpath b/home-server-admin/.classpath
deleted file mode 100644
index 906bfce..0000000
--- a/home-server-admin/.classpath
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <classpathentry kind="src" output="target/classes" path="src/main/java">
- <attributes>
- <attribute name="optional" value="true"/>
- <attribute name="maven.pomderived" value="true"/>
- </attributes>
- </classpathentry>
- <classpathentry excluding="**" kind="src" output="target/classes" path="src/main/resources">
- <attributes>
- <attribute name="maven.pomderived" value="true"/>
- </attributes>
- </classpathentry>
- <classpathentry kind="src" output="target/test-classes" path="src/test/java">
- <attributes>
- <attribute name="optional" value="true"/>
- <attribute name="maven.pomderived" value="true"/>
- <attribute name="test" value="true"/>
- </attributes>
- </classpathentry>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8">
- <attributes>
- <attribute name="maven.pomderived" value="true"/>
- </attributes>
- </classpathentry>
- <classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
- <attributes>
- <attribute name="maven.pomderived" value="true"/>
- </attributes>
- </classpathentry>
- <classpathentry kind="output" path="target/classes"/>
-</classpath>
diff --git a/home-server-admin/.gitignore b/home-server-admin/.gitignore
new file mode 100644
index 0000000..14b2cd9
--- /dev/null
+++ b/home-server-admin/.gitignore
@@ -0,0 +1,6 @@
+/.metadata/
+/.idea/
+/.settings/
+.classpath
+.project
+target
diff --git a/home-server-admin/.project b/home-server-admin/.project
deleted file mode 100644
index df83b83..0000000
--- a/home-server-admin/.project
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>product-server-xining</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.jdt.core.javabuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.m2e.core.maven2Builder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.jdt.core.javanature</nature>
- <nature>org.eclipse.m2e.core.maven2Nature</nature>
- </natures>
-</projectDescription>
diff --git a/home-server-admin/.settings/org.eclipse.core.resources.prefs b/home-server-admin/.settings/org.eclipse.core.resources.prefs
deleted file mode 100644
index 365bbd6..0000000
--- a/home-server-admin/.settings/org.eclipse.core.resources.prefs
+++ /dev/null
@@ -1,5 +0,0 @@
-eclipse.preferences.version=1
-encoding//src/main/java=UTF-8
-encoding//src/main/resources=UTF-8
-encoding//src/test/java=UTF-8
-encoding/<project>=UTF-8
diff --git a/home-server-admin/.settings/org.eclipse.jdt.core.prefs b/home-server-admin/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 0ada971..0000000
--- a/home-server-admin/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,9 +0,0 @@
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.methodParameters=generate
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
-org.eclipse.jdt.core.compiler.compliance=1.8
-org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
-org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
-org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=ignore
-org.eclipse.jdt.core.compiler.release=disabled
-org.eclipse.jdt.core.compiler.source=1.8
diff --git a/home-server-admin/.settings/org.eclipse.m2e.core.prefs b/home-server-admin/.settings/org.eclipse.m2e.core.prefs
deleted file mode 100644
index 14b697b..0000000
--- a/home-server-admin/.settings/org.eclipse.m2e.core.prefs
+++ /dev/null
@@ -1,4 +0,0 @@
-activeProfiles=
-eclipse.preferences.version=1
-resolveWorkspaceProjects=true
-version=1
diff --git a/home-server-admin/pom.xml b/home-server-admin/pom.xml
index 3046861..c2537c3 100644
--- a/home-server-admin/pom.xml
+++ b/home-server-admin/pom.xml
@@ -11,6 +11,7 @@
<artifactId>product-server-xining</artifactId>
<packaging>jar</packaging>
+ <version>2.0.0-release</version>
<name>product-server-xining</name>
<description>product-server-xining</description>
diff --git a/home-server-admin/pom.xml.versionsBackup b/home-server-admin/pom.xml.versionsBackup
deleted file mode 100644
index 4fa2353..0000000
--- a/home-server-admin/pom.xml.versionsBackup
+++ /dev/null
@@ -1,44 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
- <parent>
- <artifactId>product-server</artifactId>
- <groupId>com.lx</groupId>
- <version>1.0.0-SNAPSHOT</version>
- </parent>
- <modelVersion>4.0.0</modelVersion>
- <artifactId>product-server-xining</artifactId>
- <packaging>jar</packaging>
- <name>product-server-xining</name>
- <description>product-server-xining</description>
-
- <properties>
- <maven.compiler.source>8</maven.compiler.source>
- <maven.compiler.target>8</maven.compiler.target>
- </properties>
- <dependencies>
- <dependency>
- <groupId>com.lx</groupId>
- <artifactId>product-server-common</artifactId>
- <version>1.0.0-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>com.lx</groupId>
- <artifactId>product-server-util</artifactId>
- <version>1.0.0-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>com.lx</groupId>
- <artifactId>product-server-admin</artifactId>
- <version>1.0.0-SNAPSHOT</version>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>com.lx</groupId>
- <artifactId>product-server-admin</artifactId>
- <version>1.0.0-SNAPSHOT</version>
- <scope>compile</scope>
- </dependency>
- </dependencies>
-</project>
\ No newline at end of file
diff --git a/home-server-admin/target/classes/META-INF/MANIFEST.MF b/home-server-admin/target/classes/META-INF/MANIFEST.MF
deleted file mode 100644
index 7d555d2..0000000
--- a/home-server-admin/target/classes/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,11 +0,0 @@
-Manifest-Version: 1.0
-Built-By: longxin
-Build-Jdk: 18.0.1
-Implementation-Title: product-server-xining
-Implementation-Version: 1.2.0-SNAPSHOT
-Implementation-Vendor-Id: com.lx
-Implementation-URL: https://projects.spring.io/spring-boot/#/spring-boot
- -starter-parent/product-server/product-server-xining
-Main-Class: com.product.Application
-Created-By: Maven Integration for Eclipse
-
diff --git a/home-server-admin/target/classes/META-INF/maven/com.lx/product-server-xining/pom.properties b/home-server-admin/target/classes/META-INF/maven/com.lx/product-server-xining/pom.properties
deleted file mode 100644
index 5000c95..0000000
--- a/home-server-admin/target/classes/META-INF/maven/com.lx/product-server-xining/pom.properties
+++ /dev/null
@@ -1,7 +0,0 @@
-#Generated by Maven Integration for Eclipse
-#Mon Aug 29 10:48:37 GMT+08:00 2022
-artifactId=product-server-xining
-groupId=com.lx
-m2e.projectLocation=D\:\\product\\XiNingWorkspace\\product-server-new-xn\\home-server-admin
-m2e.projectName=product-server-xining
-version=1.2.0-SNAPSHOT
diff --git a/home-server-admin/target/classes/META-INF/maven/com.lx/product-server-xining/pom.xml b/home-server-admin/target/classes/META-INF/maven/com.lx/product-server-xining/pom.xml
deleted file mode 100644
index 1633cd2..0000000
--- a/home-server-admin/target/classes/META-INF/maven/com.lx/product-server-xining/pom.xml
+++ /dev/null
@@ -1,38 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
- <parent>
- <artifactId>product-server</artifactId>
- <groupId>com.lx</groupId>
- <version>1.2.0-SNAPSHOT</version>
- </parent>
- <modelVersion>4.0.0</modelVersion>
- <artifactId>product-server-xining</artifactId>
- <packaging>jar</packaging>
- <name>product-server-xining</name>
- <description>product-server-xining</description>
-
- <properties>
- <maven.compiler.source>8</maven.compiler.source>
- <maven.compiler.target>8</maven.compiler.target>
- </properties>
- <dependencies>
- <dependency>
- <groupId>com.lx</groupId>
- <artifactId>product-server-common</artifactId>
- <version>1.2.0-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>com.lx</groupId>
- <artifactId>product-server-util</artifactId>
- <version>1.2.0-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>com.lx</groupId>
- <artifactId>product-server-admin</artifactId>
- <version>1.2.0-SNAPSHOT</version>
- <scope>compile</scope>
- </dependency>
- </dependencies>
-</project>
diff --git a/home-server-admin/target/classes/com/home/xining/config/CmnConst.class b/home-server-admin/target/classes/com/home/xining/config/CmnConst.class
deleted file mode 100644
index f97b03a..0000000
--- a/home-server-admin/target/classes/com/home/xining/config/CmnConst.class
+++ /dev/null
Binary files differ
diff --git a/home-server-admin/target/classes/com/home/xining/config/SystemCode.class b/home-server-admin/target/classes/com/home/xining/config/SystemCode.class
deleted file mode 100644
index 9fdf6c6..0000000
--- a/home-server-admin/target/classes/com/home/xining/config/SystemCode.class
+++ /dev/null
Binary files differ
diff --git a/home-server-admin/target/classes/com/home/xining/controller/AdvanceNoticeController.class b/home-server-admin/target/classes/com/home/xining/controller/AdvanceNoticeController.class
deleted file mode 100644
index 7fd0ee4..0000000
--- a/home-server-admin/target/classes/com/home/xining/controller/AdvanceNoticeController.class
+++ /dev/null
Binary files differ
diff --git a/home-server-admin/target/classes/com/home/xining/controller/CivilServantReceptionController.class b/home-server-admin/target/classes/com/home/xining/controller/CivilServantReceptionController.class
deleted file mode 100644
index 26852bd..0000000
--- a/home-server-admin/target/classes/com/home/xining/controller/CivilServantReceptionController.class
+++ /dev/null
Binary files differ
diff --git a/home-server-admin/target/classes/com/home/xining/controller/HousingArchivesController.class b/home-server-admin/target/classes/com/home/xining/controller/HousingArchivesController.class
deleted file mode 100644
index 629569d..0000000
--- a/home-server-admin/target/classes/com/home/xining/controller/HousingArchivesController.class
+++ /dev/null
Binary files differ
diff --git a/home-server-admin/target/classes/com/home/xining/controller/LawEnforcementController.class b/home-server-admin/target/classes/com/home/xining/controller/LawEnforcementController.class
deleted file mode 100644
index 8a1632c..0000000
--- a/home-server-admin/target/classes/com/home/xining/controller/LawEnforcementController.class
+++ /dev/null
Binary files differ
diff --git a/home-server-admin/target/classes/com/home/xining/controller/OfficeExpensesController.class b/home-server-admin/target/classes/com/home/xining/controller/OfficeExpensesController.class
deleted file mode 100644
index f7981b8..0000000
--- a/home-server-admin/target/classes/com/home/xining/controller/OfficeExpensesController.class
+++ /dev/null
Binary files differ
diff --git a/home-server-admin/target/classes/com/home/xining/controller/OfficePurchaseController.class b/home-server-admin/target/classes/com/home/xining/controller/OfficePurchaseController.class
deleted file mode 100644
index 83e5a4f..0000000
--- a/home-server-admin/target/classes/com/home/xining/controller/OfficePurchaseController.class
+++ /dev/null
Binary files differ
diff --git a/home-server-admin/target/classes/com/home/xining/controller/OfficeSuppliesCollectionController.class b/home-server-admin/target/classes/com/home/xining/controller/OfficeSuppliesCollectionController.class
deleted file mode 100644
index 96986fd..0000000
--- a/home-server-admin/target/classes/com/home/xining/controller/OfficeSuppliesCollectionController.class
+++ /dev/null
Binary files differ
diff --git a/home-server-admin/target/classes/com/home/xining/controller/PleaseLeaveController.class b/home-server-admin/target/classes/com/home/xining/controller/PleaseLeaveController.class
deleted file mode 100644
index e421f37..0000000
--- a/home-server-admin/target/classes/com/home/xining/controller/PleaseLeaveController.class
+++ /dev/null
Binary files differ
diff --git a/home-server-admin/target/classes/com/home/xining/controller/ReceiptDocumentController.class b/home-server-admin/target/classes/com/home/xining/controller/ReceiptDocumentController.class
deleted file mode 100644
index 1555add..0000000
--- a/home-server-admin/target/classes/com/home/xining/controller/ReceiptDocumentController.class
+++ /dev/null
Binary files differ
diff --git a/home-server-admin/target/classes/com/home/xining/controller/SendDocumentController.class b/home-server-admin/target/classes/com/home/xining/controller/SendDocumentController.class
deleted file mode 100644
index 0c81471..0000000
--- a/home-server-admin/target/classes/com/home/xining/controller/SendDocumentController.class
+++ /dev/null
Binary files differ
diff --git a/home-server-admin/target/classes/com/home/xining/controller/TravelTrainingController.class b/home-server-admin/target/classes/com/home/xining/controller/TravelTrainingController.class
deleted file mode 100644
index ac42a69..0000000
--- a/home-server-admin/target/classes/com/home/xining/controller/TravelTrainingController.class
+++ /dev/null
Binary files differ
diff --git a/home-server-admin/target/classes/com/home/xining/controller/XiNingPublicController.class b/home-server-admin/target/classes/com/home/xining/controller/XiNingPublicController.class
deleted file mode 100644
index f4d424a..0000000
--- a/home-server-admin/target/classes/com/home/xining/controller/XiNingPublicController.class
+++ /dev/null
Binary files differ
diff --git a/home-server-admin/target/classes/com/home/xining/service/AdvanceNoticeService.class b/home-server-admin/target/classes/com/home/xining/service/AdvanceNoticeService.class
deleted file mode 100644
index d8b4bba..0000000
--- a/home-server-admin/target/classes/com/home/xining/service/AdvanceNoticeService.class
+++ /dev/null
Binary files differ
diff --git a/home-server-admin/target/classes/com/home/xining/service/CivilServantReceptionService.class b/home-server-admin/target/classes/com/home/xining/service/CivilServantReceptionService.class
deleted file mode 100644
index e9452e8..0000000
--- a/home-server-admin/target/classes/com/home/xining/service/CivilServantReceptionService.class
+++ /dev/null
Binary files differ
diff --git a/home-server-admin/target/classes/com/home/xining/service/HousingArchivesService.class b/home-server-admin/target/classes/com/home/xining/service/HousingArchivesService.class
deleted file mode 100644
index 027f8ad..0000000
--- a/home-server-admin/target/classes/com/home/xining/service/HousingArchivesService.class
+++ /dev/null
Binary files differ
diff --git a/home-server-admin/target/classes/com/home/xining/service/LawEnforcementService.class b/home-server-admin/target/classes/com/home/xining/service/LawEnforcementService.class
deleted file mode 100644
index 1d98154..0000000
--- a/home-server-admin/target/classes/com/home/xining/service/LawEnforcementService.class
+++ /dev/null
Binary files differ
diff --git a/home-server-admin/target/classes/com/home/xining/service/OfficeExpensesService.class b/home-server-admin/target/classes/com/home/xining/service/OfficeExpensesService.class
deleted file mode 100644
index 42404c1..0000000
--- a/home-server-admin/target/classes/com/home/xining/service/OfficeExpensesService.class
+++ /dev/null
Binary files differ
diff --git a/home-server-admin/target/classes/com/home/xining/service/OfficePurchaseService.class b/home-server-admin/target/classes/com/home/xining/service/OfficePurchaseService.class
deleted file mode 100644
index 8214514..0000000
--- a/home-server-admin/target/classes/com/home/xining/service/OfficePurchaseService.class
+++ /dev/null
Binary files differ
diff --git a/home-server-admin/target/classes/com/home/xining/service/OfficeSuppliesCollectionService.class b/home-server-admin/target/classes/com/home/xining/service/OfficeSuppliesCollectionService.class
deleted file mode 100644
index 45c2cda..0000000
--- a/home-server-admin/target/classes/com/home/xining/service/OfficeSuppliesCollectionService.class
+++ /dev/null
Binary files differ
diff --git a/home-server-admin/target/classes/com/home/xining/service/PleaseLeaveService.class b/home-server-admin/target/classes/com/home/xining/service/PleaseLeaveService.class
deleted file mode 100644
index dc262e2..0000000
--- a/home-server-admin/target/classes/com/home/xining/service/PleaseLeaveService.class
+++ /dev/null
Binary files differ
diff --git a/home-server-admin/target/classes/com/home/xining/service/ReceiptDocumentService.class b/home-server-admin/target/classes/com/home/xining/service/ReceiptDocumentService.class
deleted file mode 100644
index 6d1ba42..0000000
--- a/home-server-admin/target/classes/com/home/xining/service/ReceiptDocumentService.class
+++ /dev/null
Binary files differ
diff --git a/home-server-admin/target/classes/com/home/xining/service/SendDocumentService.class b/home-server-admin/target/classes/com/home/xining/service/SendDocumentService.class
deleted file mode 100644
index d08418d..0000000
--- a/home-server-admin/target/classes/com/home/xining/service/SendDocumentService.class
+++ /dev/null
Binary files differ
diff --git a/home-server-admin/target/classes/com/home/xining/service/TravelTrainingService.class b/home-server-admin/target/classes/com/home/xining/service/TravelTrainingService.class
deleted file mode 100644
index 9a302fe..0000000
--- a/home-server-admin/target/classes/com/home/xining/service/TravelTrainingService.class
+++ /dev/null
Binary files differ
diff --git a/home-server-admin/target/classes/com/home/xining/service/idel/IAdvanceNoticeService.class b/home-server-admin/target/classes/com/home/xining/service/idel/IAdvanceNoticeService.class
deleted file mode 100644
index 6572a5c..0000000
--- a/home-server-admin/target/classes/com/home/xining/service/idel/IAdvanceNoticeService.class
+++ /dev/null
Binary files differ
diff --git a/home-server-admin/target/classes/com/home/xining/service/idel/ICivilServantReceptionService.class b/home-server-admin/target/classes/com/home/xining/service/idel/ICivilServantReceptionService.class
deleted file mode 100644
index a1556f3..0000000
--- a/home-server-admin/target/classes/com/home/xining/service/idel/ICivilServantReceptionService.class
+++ /dev/null
Binary files differ
diff --git a/home-server-admin/target/classes/com/home/xining/service/idel/IHousingArchivesService.class b/home-server-admin/target/classes/com/home/xining/service/idel/IHousingArchivesService.class
deleted file mode 100644
index d643d86..0000000
--- a/home-server-admin/target/classes/com/home/xining/service/idel/IHousingArchivesService.class
+++ /dev/null
Binary files differ
diff --git a/home-server-admin/target/classes/com/home/xining/service/idel/ILawEnforcementService.class b/home-server-admin/target/classes/com/home/xining/service/idel/ILawEnforcementService.class
deleted file mode 100644
index 53dca09..0000000
--- a/home-server-admin/target/classes/com/home/xining/service/idel/ILawEnforcementService.class
+++ /dev/null
Binary files differ
diff --git a/home-server-admin/target/classes/com/home/xining/service/idel/IOfficeExpensesService.class b/home-server-admin/target/classes/com/home/xining/service/idel/IOfficeExpensesService.class
deleted file mode 100644
index d7fe607..0000000
--- a/home-server-admin/target/classes/com/home/xining/service/idel/IOfficeExpensesService.class
+++ /dev/null
Binary files differ
diff --git a/home-server-admin/target/classes/com/home/xining/service/idel/IOfficePurchaseService.class b/home-server-admin/target/classes/com/home/xining/service/idel/IOfficePurchaseService.class
deleted file mode 100644
index 37019f2..0000000
--- a/home-server-admin/target/classes/com/home/xining/service/idel/IOfficePurchaseService.class
+++ /dev/null
Binary files differ
diff --git a/home-server-admin/target/classes/com/home/xining/service/idel/IOfficeSuppliesCollectionService.class b/home-server-admin/target/classes/com/home/xining/service/idel/IOfficeSuppliesCollectionService.class
deleted file mode 100644
index 084cf46..0000000
--- a/home-server-admin/target/classes/com/home/xining/service/idel/IOfficeSuppliesCollectionService.class
+++ /dev/null
Binary files differ
diff --git a/home-server-admin/target/classes/com/home/xining/service/idel/IReceiptDocumentService.class b/home-server-admin/target/classes/com/home/xining/service/idel/IReceiptDocumentService.class
deleted file mode 100644
index ed82561..0000000
--- a/home-server-admin/target/classes/com/home/xining/service/idel/IReceiptDocumentService.class
+++ /dev/null
Binary files differ
diff --git a/home-server-admin/target/classes/com/home/xining/service/idel/ISendDocumentService.class b/home-server-admin/target/classes/com/home/xining/service/idel/ISendDocumentService.class
deleted file mode 100644
index e032a57..0000000
--- a/home-server-admin/target/classes/com/home/xining/service/idel/ISendDocumentService.class
+++ /dev/null
Binary files differ
diff --git a/home-server-admin/target/classes/com/home/xining/service/idel/ITravelTrainingService.class b/home-server-admin/target/classes/com/home/xining/service/idel/ITravelTrainingService.class
deleted file mode 100644
index 98d17c7..0000000
--- a/home-server-admin/target/classes/com/home/xining/service/idel/ITravelTrainingService.class
+++ /dev/null
Binary files differ
diff --git a/home-server-admin/target/maven-archiver/pom.properties b/home-server-admin/target/maven-archiver/pom.properties
deleted file mode 100644
index 5062778..0000000
--- a/home-server-admin/target/maven-archiver/pom.properties
+++ /dev/null
@@ -1,4 +0,0 @@
-#Created by Apache Maven 3.6.1
-version=1.2.0-SNAPSHOT
-groupId=com.lx
-artifactId=product-server-xining
diff --git a/home-server-admin/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst b/home-server-admin/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst
deleted file mode 100644
index 46a9f1f..0000000
--- a/home-server-admin/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst
+++ /dev/null
@@ -1,35 +0,0 @@
-com\home\xining\service\AdvanceNoticeService.class
-com\home\xining\service\idel\IAdvanceNoticeService.class
-com\home\xining\controller\SendDocumentController.class
-com\home\xining\service\idel\ISendDocumentService.class
-com\home\xining\controller\HousingArchivesController.class
-com\home\xining\service\OfficePurchaseService.class
-com\home\xining\controller\XiNingPublicController.class
-com\home\xining\service\idel\IOfficeExpensesService.class
-com\home\xining\service\PleaseLeaveService.class
-com\home\xining\service\idel\IHousingArchivesService.class
-com\home\xining\service\LawEnforcementService.class
-com\home\xining\controller\CivilServantReceptionController.class
-com\home\xining\controller\OfficeExpensesController.class
-com\home\xining\service\ReceiptDocumentService.class
-com\home\xining\service\idel\IOfficeSuppliesCollectionService.class
-com\home\xining\service\OfficeSuppliesCollectionService.class
-com\home\xining\controller\OfficeSuppliesCollectionController.class
-com\home\xining\service\idel\IReceiptDocumentService.class
-com\home\xining\controller\ReceiptDocumentController.class
-com\home\xining\service\CivilServantReceptionService.class
-com\home\xining\service\idel\ILawEnforcementService.class
-com\home\xining\service\SendDocumentService.class
-com\home\xining\controller\LawEnforcementController.class
-com\home\xining\controller\PleaseLeaveController.class
-com\home\xining\controller\TravelTrainingController.class
-com\home\xining\service\idel\ICivilServantReceptionService.class
-com\home\xining\config\SystemCode.class
-com\home\xining\service\OfficeExpensesService.class
-com\home\xining\config\CmnConst.class
-com\home\xining\service\HousingArchivesService.class
-com\home\xining\controller\OfficePurchaseController.class
-com\home\xining\controller\AdvanceNoticeController.class
-com\home\xining\service\idel\ITravelTrainingService.class
-com\home\xining\service\idel\IOfficePurchaseService.class
-com\home\xining\service\TravelTrainingService.class
diff --git a/home-server-admin/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst b/home-server-admin/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst
deleted file mode 100644
index 27924bd..0000000
--- a/home-server-admin/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst
+++ /dev/null
@@ -1,35 +0,0 @@
-D:\product\XiNingWorkspace\product-server-new-xn\home-server-admin\src\main\java\com\home\xining\service\OfficeExpensesService.java
-D:\product\XiNingWorkspace\product-server-new-xn\home-server-admin\src\main\java\com\home\xining\service\ReceiptDocumentService.java
-D:\product\XiNingWorkspace\product-server-new-xn\home-server-admin\src\main\java\com\home\xining\controller\ReceiptDocumentController.java
-D:\product\XiNingWorkspace\product-server-new-xn\home-server-admin\src\main\java\com\home\xining\service\CivilServantReceptionService.java
-D:\product\XiNingWorkspace\product-server-new-xn\home-server-admin\src\main\java\com\home\xining\service\idel\ISendDocumentService.java
-D:\product\XiNingWorkspace\product-server-new-xn\home-server-admin\src\main\java\com\home\xining\service\OfficePurchaseService.java
-D:\product\XiNingWorkspace\product-server-new-xn\home-server-admin\src\main\java\com\home\xining\service\idel\IOfficePurchaseService.java
-D:\product\XiNingWorkspace\product-server-new-xn\home-server-admin\src\main\java\com\home\xining\service\OfficeSuppliesCollectionService.java
-D:\product\XiNingWorkspace\product-server-new-xn\home-server-admin\src\main\java\com\home\xining\config\SystemCode.java
-D:\product\XiNingWorkspace\product-server-new-xn\home-server-admin\src\main\java\com\home\xining\service\idel\IOfficeExpensesService.java
-D:\product\XiNingWorkspace\product-server-new-xn\home-server-admin\src\main\java\com\home\xining\controller\XiNingPublicController.java
-D:\product\XiNingWorkspace\product-server-new-xn\home-server-admin\src\main\java\com\home\xining\service\SendDocumentService.java
-D:\product\XiNingWorkspace\product-server-new-xn\home-server-admin\src\main\java\com\home\xining\service\TravelTrainingService.java
-D:\product\XiNingWorkspace\product-server-new-xn\home-server-admin\src\main\java\com\home\xining\service\idel\IReceiptDocumentService.java
-D:\product\XiNingWorkspace\product-server-new-xn\home-server-admin\src\main\java\com\home\xining\controller\PleaseLeaveController.java
-D:\product\XiNingWorkspace\product-server-new-xn\home-server-admin\src\main\java\com\home\xining\service\idel\IOfficeSuppliesCollectionService.java
-D:\product\XiNingWorkspace\product-server-new-xn\home-server-admin\src\main\java\com\home\xining\controller\LawEnforcementController.java
-D:\product\XiNingWorkspace\product-server-new-xn\home-server-admin\src\main\java\com\home\xining\controller\HousingArchivesController.java
-D:\product\XiNingWorkspace\product-server-new-xn\home-server-admin\src\main\java\com\home\xining\controller\TravelTrainingController.java
-D:\product\XiNingWorkspace\product-server-new-xn\home-server-admin\src\main\java\com\home\xining\controller\OfficeExpensesController.java
-D:\product\XiNingWorkspace\product-server-new-xn\home-server-admin\src\main\java\com\home\xining\service\idel\ILawEnforcementService.java
-D:\product\XiNingWorkspace\product-server-new-xn\home-server-admin\src\main\java\com\home\xining\service\idel\ITravelTrainingService.java
-D:\product\XiNingWorkspace\product-server-new-xn\home-server-admin\src\main\java\com\home\xining\controller\CivilServantReceptionController.java
-D:\product\XiNingWorkspace\product-server-new-xn\home-server-admin\src\main\java\com\home\xining\service\AdvanceNoticeService.java
-D:\product\XiNingWorkspace\product-server-new-xn\home-server-admin\src\main\java\com\home\xining\service\idel\IHousingArchivesService.java
-D:\product\XiNingWorkspace\product-server-new-xn\home-server-admin\src\main\java\com\home\xining\service\PleaseLeaveService.java
-D:\product\XiNingWorkspace\product-server-new-xn\home-server-admin\src\main\java\com\home\xining\service\HousingArchivesService.java
-D:\product\XiNingWorkspace\product-server-new-xn\home-server-admin\src\main\java\com\home\xining\controller\AdvanceNoticeController.java
-D:\product\XiNingWorkspace\product-server-new-xn\home-server-admin\src\main\java\com\home\xining\service\idel\ICivilServantReceptionService.java
-D:\product\XiNingWorkspace\product-server-new-xn\home-server-admin\src\main\java\com\home\xining\controller\OfficePurchaseController.java
-D:\product\XiNingWorkspace\product-server-new-xn\home-server-admin\src\main\java\com\home\xining\service\LawEnforcementService.java
-D:\product\XiNingWorkspace\product-server-new-xn\home-server-admin\src\main\java\com\home\xining\config\CmnConst.java
-D:\product\XiNingWorkspace\product-server-new-xn\home-server-admin\src\main\java\com\home\xining\controller\OfficeSuppliesCollectionController.java
-D:\product\XiNingWorkspace\product-server-new-xn\home-server-admin\src\main\java\com\home\xining\service\idel\IAdvanceNoticeService.java
-D:\product\XiNingWorkspace\product-server-new-xn\home-server-admin\src\main\java\com\home\xining\controller\SendDocumentController.java
diff --git a/home-server-admin/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/inputFiles.lst b/home-server-admin/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/inputFiles.lst
deleted file mode 100644
index e69de29..0000000
--- a/home-server-admin/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/inputFiles.lst
+++ /dev/null
diff --git a/home-server-admin/target/product-server-xining-1.0.0-SNAPSHOT.jar b/home-server-admin/target/product-server-xining-1.0.0-SNAPSHOT.jar
deleted file mode 100644
index 425c4ed..0000000
--- a/home-server-admin/target/product-server-xining-1.0.0-SNAPSHOT.jar
+++ /dev/null
Binary files differ
diff --git a/home-server-admin/target/product-server-xining-1.2.0-SNAPSHOT.jar b/home-server-admin/target/product-server-xining-1.2.0-SNAPSHOT.jar
deleted file mode 100644
index 3f9795b..0000000
--- a/home-server-admin/target/product-server-xining-1.2.0-SNAPSHOT.jar
+++ /dev/null
Binary files differ
diff --git a/pom.xml b/pom.xml
index 1bfdac6..c6f2982 100644
--- a/pom.xml
+++ b/pom.xml
@@ -17,7 +17,7 @@
<module>product-server-web</module>
<module>product-server-admin</module>
<module>product-server-org-admin</module>
- <module>product-server-xining</module>
+ <module>home-server-admin</module>
</modules>
<properties>
<skipTests>true</skipTests>
@@ -96,6 +96,11 @@
<groupId>com.lx</groupId>
<artifactId>product-server-core</artifactId>
<version>2.0.1</version>
+ </dependency>
+ <dependency>
+ <groupId>com.lx</groupId>
+ <artifactId>product-server-xining</artifactId>
+ <version>${product-module-version}</version>
</dependency>
<dependency>
<groupId>com.lx</groupId>
@@ -233,7 +238,7 @@
<version>${product-module-version}</version>
</dependency>
<!--瀛愭ā鍧楋細end-->
-
+
<!--绗笁鏂逛緷璧栵細start-->
<dependency>
<groupId>cn.hutool</groupId>
@@ -313,7 +318,7 @@
<version>0.9.1</version>
</dependency>
<!--绗笁鏂逛緷璧栵細end-->
-
+
</dependencies>
</dependencyManagement>
<dependencies>
@@ -333,7 +338,7 @@
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-to-slf4j</artifactId>
</exclusion>
-
+
</exclusions>
</dependency>
<!--logo4j-->
@@ -352,7 +357,7 @@
<artifactId>log4j-to-slf4j</artifactId>
<version>2.15.0</version>
</dependency>
-
+
<!--鏀寔浣跨敤 JDBC 璁块棶鏁版嵁搴� -->
<dependency>
<groupId>org.springframework.boot</groupId>
@@ -374,7 +379,7 @@
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-data-redis</artifactId>
</dependency>
-
+
<dependency>
<groupId>org.apache.tomcat</groupId>
<artifactId>tomcat-jdbc</artifactId>
@@ -392,7 +397,7 @@
<groupId>javax.servlet</groupId>
<artifactId>jstl</artifactId>
</dependency>
-
+
<!-- Need this to compile JSP <dependency> <groupId>org.apache.tomcat.embed</groupId>
<artifactId>tomcat-embed-jasper</artifactId> <scope>provided</scope> </dependency> -->
<dependency>
@@ -445,7 +450,7 @@
<artifactId>commons-beanutils</artifactId>
<version>${commons-beanutils.version}</version>
</dependency>
-
+
<dependency>
<groupId>com.google.zxing</groupId>
<artifactId>javase</artifactId>
@@ -481,32 +486,32 @@
<groupId>dom4j</groupId>
<artifactId>dom4j</artifactId>
</dependency>
-
+
<!-- XPath xml -->
<dependency>
<groupId>jaxen</groupId>
<artifactId>jaxen</artifactId>
</dependency>
-
+
<!-- Snake YAML -->
<dependency>
<groupId>org.yaml</groupId>
<artifactId>snakeyaml</artifactId>
</dependency>
-
+
<!-- Apache HTTP -->
<dependency>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpclient</artifactId>
</dependency>
-
+
<!-- Jsoup HTTP -->
<dependency>
<groupId>org.jsoup</groupId>
<artifactId>jsoup</artifactId>
<version>${jsoup.version}</version>
</dependency>
-
+
<!-- Email -->
<dependency>
<groupId>org.apache.commons</groupId>
@@ -533,7 +538,7 @@
<artifactId>UserAgentUtils</artifactId>
<version>${UserAgentUtils.version}</version>
</dependency>
-
+
<!-- POI Office Tools -->
<dependency>
<groupId>org.apache.poi</groupId>
@@ -552,7 +557,7 @@
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-to-slf4j</artifactId>
</exclusion>
-
+
</exclusions>
</dependency>
<dependency>
@@ -572,7 +577,7 @@
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-to-slf4j</artifactId>
</exclusion>
-
+
</exclusions>
</dependency>
<dependency>
@@ -592,7 +597,7 @@
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-to-slf4j</artifactId>
</exclusion>
-
+
</exclusions>
</dependency>
<dependency>
@@ -612,7 +617,7 @@
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-to-slf4j</artifactId>
</exclusion>
-
+
</exclusions>
</dependency>
<!-- pinyin4j -->
@@ -621,7 +626,7 @@
<artifactId>pinyin4j</artifactId>
<version>${pinyin4j.version}</version>
</dependency>
-
+
<!-- Logging begin -->
<dependency>
<groupId>org.slf4j</groupId>
@@ -648,7 +653,7 @@
<artifactId>logback-classic</artifactId>
</dependency>
<!-- Logging end -->
-
+
<!-- JUnit Test -->
<dependency>
<groupId>junit</groupId>
@@ -706,13 +711,13 @@
<groupId>com.alibaba</groupId>
<artifactId>druid</artifactId>
</dependency>
-
-
+
+
<dependency>
<groupId>io.logz.logback</groupId>
<artifactId>logzio-logback-appender</artifactId>
</dependency>
-
+
<dependency>
<groupId>com.mashape.unirest</groupId>
<artifactId>unirest-java</artifactId>
@@ -722,7 +727,7 @@
<groupId>com.sun.jersey</groupId>
<artifactId>jersey-client</artifactId>
</dependency>
-
+
<dependency>
<groupId>cn.hutool</groupId>
<artifactId>hutool-all</artifactId>
@@ -757,4 +762,4 @@
<artifactId>jjwt</artifactId>
</dependency>
</dependencies>
-</project>
\ No newline at end of file
+</project>
diff --git a/product-server-web/resources/LicenseKey.dat b/product-server-web/resources/LicenseKey.dat
index 8616628..0df5ff5 100644
--- a/product-server-web/resources/LicenseKey.dat
+++ b/product-server-web/resources/LicenseKey.dat
@@ -1 +1 @@
-76FD8F743895D6683BCECB6FAF4EB362660E45FFE0C4378DDE91DF9E3E0F326C3A358B594411516F13FD6590CB82458CEF4E5BD7E02AEA62A96B9456CD3D727C766E936491DD456412D6B352EF76B7DD16F29BFEC7E429A19C35D7E337D96A0E09F39C59B85FCA7DFE82520778215EC9475A733E12786E3490090AD5C14C0F78E8FBC0D96D2DEA1F7D4281854239DF9D052D4E9E3C29123C941033B3B4AE9598B3B2C598E5B4F5AC0A4A856D18D40E336A6E6D13C04EDB515EE4E82BEDC84179A5402756EF2DE172A81D262F0FE1687A762A4298CD14F69727AF037C201FE4850155D672B66B25A56156ACFB39D4C7EE6ADC7C909511F31C76AF28B83BE24EA3F413EFC0C57DF217FD8D742D44BF418B3AB84F715B642AB2EF575AC4AB82843EC1F31565605344D84ABB1974AA24F50BE6C28F0D9D910DAA725B8B2680F773BD8655A56052AD841D19E53E63A7F3207DEF14A7E8F9C57E67EBF03005EF5B7967ABE2695D2B6CCF97FA0B5B6F49079A9AB59F6E7745894BAF00C234980E4CB28AC5F206B6BAEEB9957C8CD9B9F042C2502E7E3003937B81C048BC7D57003ACA30833C22A724433483E9729043128CEB34D9CFA0A0DEA58FA2472A2BCEF1575AE6EBC5A3302F58521AA336A5B2572371AE6408A9850579E4E7402E762069D022573061767C0A18383A14886B8BEE217235970C92858271EC01D5A28EA1A5053688
\ No newline at end of file
+8B06F517F4B35CAFC45792B7065F38BF9352470A2C22DB9EE6D2192219B344FA3BA102634AC86DCF114CF0FD9D2003E421C87F05C38951AFA954D50CF5E523DED7F234C96FB5B74D329FEBE4D7FE1F99AB130F33B30ED357B0E99F9C48614D8AEB6558BBD43B4A61112F7C00C55BB5D32DB0594FB2AD1A2BF1891F33D3E528E88546FC71D374E13410BD8BFB6A1219790F9BA6273472B05B4454EA1F584B1E8D31261DF9F5A9675A2A62C95AD93FAFE2FB77449D4E7B87445D6983AB21E05D05ABDB3D6C2E78F74E2C47580C9AD8F08A5A2DEE79085842E6FAEF3BFFA4C2822FFE45A7960C54A3FDA2975D298CD1F5BF4576BDD943EA76294B2276137437ADDB897482AB2050C39CF76596524DE488CDB04E6AC9BDBDB5B203A6CC2871CC66B4D11E4B41455F49C8BB6E5EAC8A366538972193B23DDEF28EE9574ABB1B7044F4B6FA65445DAD71591AA628C9EBF3528FFED494A3F3BF3CC3B66BED1923EB70CD31BE23E666488982B7F9E42317C6B3B9A8249B07D63A396D99D0C90DFE1DCC6D
--
Gitblit v1.9.2