diff --git a/WebRoot/html/batb.png b/WebRoot/html/batb.png
new file mode 100644
index 0000000..9f76394
Binary files /dev/null and b/WebRoot/html/batb.png differ
diff --git a/WebRoot/html/login.html b/WebRoot/html/login.html
index dc1e2e4..7161715 100644
--- a/WebRoot/html/login.html
+++ b/WebRoot/html/login.html
@@ -11,12 +11,12 @@
-
-
+
@@ -63,7 +63,8 @@
-
+
diff --git a/WebRoot/html/ypzs/view/apply.html b/WebRoot/html/ypzs/view/apply.html
index 6b749a7..c67d3af 100644
--- a/WebRoot/html/ypzs/view/apply.html
+++ b/WebRoot/html/ypzs/view/apply.html
@@ -97,11 +97,14 @@
点击上传,或将文件拖拽到此处
+
文件小于20MB,可用扩展名: jpg
+
+
@@ -119,7 +122,7 @@
-
+
diff --git a/WebRoot/images/yangpu.png b/WebRoot/images/yangpu.png
index 1a1de15..ea92b00 100644
Binary files a/WebRoot/images/yangpu.png and b/WebRoot/images/yangpu.png differ
diff --git a/src/main/java/UnitTest/TestC.java b/src/main/java/UnitTest/TestC.java
index e847b8b..268f2f7 100644
--- a/src/main/java/UnitTest/TestC.java
+++ b/src/main/java/UnitTest/TestC.java
@@ -2,9 +2,51 @@ package UnitTest;
import com.dsideal.FengHuang.Util.CommonUtil;
+import java.util.Arrays;
+
public class TestC {
+
+ public static String[] sortByName(String[] names, int[] heights) {
+ quickSort(names, heights, 0, heights.length - 1);
+ return names;
+ }
+
+ private static void quickSort(String[] names, int[] heights, int start, int end) {
+ if (start >= end) {
+ return;
+ }
+ int pivot = partition(names, heights, start, end);
+ quickSort(names, heights, start, pivot - 1);
+ quickSort(names, heights, pivot + 1, end);
+ }
+
+ private static int partition(String[] names, int[] heights, int start, int end) {
+ int pivotHeight = heights[end];
+ int i = start - 1;
+ for (int j = start; j < end; j++) {
+ if (heights[j] >= pivotHeight) {
+ i++;
+ int tmpHeight = heights[i];
+ heights[i] = heights[j];
+ heights[j] = tmpHeight;
+ String tmpName = names[i];
+ names[i] = names[j];
+ names[j] = tmpName;
+ }
+ }
+ int tmpHeight = heights[i + 1];
+ heights[i + 1] = heights[end];
+ heights[end] = tmpHeight;
+ String tmpName = names[i + 1];
+ names[i + 1] = names[end];
+ names[end] = tmpName;
+ return i + 1;
+ }
+
public static void main(String[] args) {
- String t= CommonUtil.getLdapPassword("Xyy199191");
- System.out.println(t);
+ String[] names = {"Mary", "John", "Emma"};
+ int[] heights = {180, 165, 170};
+ String[] sortedNames = sortByName(names, heights);
+ System.out.println(Arrays.toString(sortedNames));
}
}