diff --git a/MengYu-Trade/pom.xml b/MengYu-Trade/pom.xml index 3e5972e8f..064ad5e66 100644 --- a/MengYu-Trade/pom.xml +++ b/MengYu-Trade/pom.xml @@ -32,8 +32,10 @@ + + org.springframework.boot @@ -103,6 +105,8 @@ freemaker.properties logback-spring.xml *.jar + ehcache/** + i18n/** @@ -137,6 +141,8 @@ + + diff --git a/MengYu-Trade/src/main/build/package.xml b/MengYu-Trade/src/main/build/package.xml index 851ae74af..91e43909b 100644 --- a/MengYu-Trade/src/main/build/package.xml +++ b/MengYu-Trade/src/main/build/package.xml @@ -23,6 +23,12 @@ *.jar + + + ${basedir.parent}/ruoyi-admin/src/main/resources + / + + diff --git a/MengYu-Trade/src/main/java/com/cronie/MengYuApplication.java b/MengYu-Trade/src/main/java/com/cronie/MengYuApplication.java index 989fd671b..9cdfdabee 100644 --- a/MengYu-Trade/src/main/java/com/cronie/MengYuApplication.java +++ b/MengYu-Trade/src/main/java/com/cronie/MengYuApplication.java @@ -22,15 +22,6 @@ public class MengYuApplication { // System.setProperty("spring.devtools.restart.enabled", "false"); SpringApplication.run(MengYuApplication.class, args); - System.out.println("(♥◠‿◠)ﾉﾞ mengyu启动成功 ლ(´ڡ`ლ)ﾞ \n" + - " .-------. ____ __ \n" + - " | _ _ \\ \\ \\ / / \n" + - " | ( ' ) | \\ _. / ' \n" + - " |(_ o _) / _( )_ .' \n" + - " | (_,_).' __ ___(_ o _)' \n" + - " | |\\ \\ | || |(_,_)' \n" + - " | | \\ `' /| `-' / \n" + - " | | \\ / \\ / \n" + - " ''-' `'-' `-..-' "); + System.out.println("(♥◠‿◠)ﾉﾞ mengyu启动成功 ლ(´ڡ`ლ)ﾞ \n" ); } } \ No newline at end of file diff --git a/MengYu-Trade/src/main/resources/templates/mengyu/goods/add.html b/MengYu-Trade/src/main/resources/templates/mengyu/goods/add.html new file mode 100644 index 000000000..2bbf61018 --- /dev/null +++ b/MengYu-Trade/src/main/resources/templates/mengyu/goods/add.html @@ -0,0 +1,64 @@ + + + + + +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+
+
+ + + diff --git a/MengYu-Trade/src/main/resources/templates/mengyu/goods/edit.html b/MengYu-Trade/src/main/resources/templates/mengyu/goods/edit.html new file mode 100644 index 000000000..397d93a84 --- /dev/null +++ b/MengYu-Trade/src/main/resources/templates/mengyu/goods/edit.html @@ -0,0 +1,65 @@ + + + + + +
+
+ +
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+
+
+ + + diff --git a/MengYu-Trade/src/main/resources/templates/mengyu/goods/goods.html b/MengYu-Trade/src/main/resources/templates/mengyu/goods/goods.html new file mode 100644 index 000000000..6409c6b7f --- /dev/null +++ b/MengYu-Trade/src/main/resources/templates/mengyu/goods/goods.html @@ -0,0 +1,82 @@ + + + + + +
+ + +
+
+
+
+
+ + + \ No newline at end of file diff --git a/MengYu-Trade/src/main/resources/templates/mengyu/goodsTradeModel/add.html b/MengYu-Trade/src/main/resources/templates/mengyu/goodsTradeModel/add.html new file mode 100644 index 000000000..078a18a95 --- /dev/null +++ b/MengYu-Trade/src/main/resources/templates/mengyu/goodsTradeModel/add.html @@ -0,0 +1,76 @@ + + + + + +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+
+
+ + + diff --git a/MengYu-Trade/src/main/resources/templates/mengyu/goodsTradeModel/edit.html b/MengYu-Trade/src/main/resources/templates/mengyu/goodsTradeModel/edit.html new file mode 100644 index 000000000..b0bb63bd5 --- /dev/null +++ b/MengYu-Trade/src/main/resources/templates/mengyu/goodsTradeModel/edit.html @@ -0,0 +1,77 @@ + + + + + +
+
+ +
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+
+
+ + + diff --git a/MengYu-Trade/src/main/resources/templates/mengyu/goodsTradeModel/goodsTradeModel.html b/MengYu-Trade/src/main/resources/templates/mengyu/goodsTradeModel/goodsTradeModel.html new file mode 100644 index 000000000..8d3f302c8 --- /dev/null +++ b/MengYu-Trade/src/main/resources/templates/mengyu/goodsTradeModel/goodsTradeModel.html @@ -0,0 +1,90 @@ + + + + + +
+ + +
+
+
+
+
+ + + \ No newline at end of file diff --git a/MengYu-Trade/src/main/resources/templates/mengyu/goodsTradeModelIns/add.html b/MengYu-Trade/src/main/resources/templates/mengyu/goodsTradeModelIns/add.html new file mode 100644 index 000000000..6ffa2bf20 --- /dev/null +++ b/MengYu-Trade/src/main/resources/templates/mengyu/goodsTradeModelIns/add.html @@ -0,0 +1,52 @@ + + + + + +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+
+
+ + + diff --git a/MengYu-Trade/src/main/resources/templates/mengyu/goodsTradeModelIns/edit.html b/MengYu-Trade/src/main/resources/templates/mengyu/goodsTradeModelIns/edit.html new file mode 100644 index 000000000..96a0f50b0 --- /dev/null +++ b/MengYu-Trade/src/main/resources/templates/mengyu/goodsTradeModelIns/edit.html @@ -0,0 +1,53 @@ + + + + + +
+
+ +
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+
+
+ + + diff --git a/MengYu-Trade/src/main/resources/templates/mengyu/goodsTradeModelIns/goodsTradeModelIns.html b/MengYu-Trade/src/main/resources/templates/mengyu/goodsTradeModelIns/goodsTradeModelIns.html new file mode 100644 index 000000000..3d6e09a09 --- /dev/null +++ b/MengYu-Trade/src/main/resources/templates/mengyu/goodsTradeModelIns/goodsTradeModelIns.html @@ -0,0 +1,74 @@ + + + + + +
+ + +
+
+
+
+
+ + + \ No newline at end of file diff --git a/MengYu-Trade/src/main/resources/templates/mengyu/goodsTradeModelInsNode/add.html b/MengYu-Trade/src/main/resources/templates/mengyu/goodsTradeModelInsNode/add.html new file mode 100644 index 000000000..fd930751d --- /dev/null +++ b/MengYu-Trade/src/main/resources/templates/mengyu/goodsTradeModelInsNode/add.html @@ -0,0 +1,76 @@ + + + + + +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+
+
+ + + diff --git a/MengYu-Trade/src/main/resources/templates/mengyu/goodsTradeModelInsNode/edit.html b/MengYu-Trade/src/main/resources/templates/mengyu/goodsTradeModelInsNode/edit.html new file mode 100644 index 000000000..edffa46ec --- /dev/null +++ b/MengYu-Trade/src/main/resources/templates/mengyu/goodsTradeModelInsNode/edit.html @@ -0,0 +1,77 @@ + + + + + +
+
+ +
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+
+
+ + + diff --git a/MengYu-Trade/src/main/resources/templates/mengyu/goodsTradeModelInsNode/goodsTradeModelInsNode.html b/MengYu-Trade/src/main/resources/templates/mengyu/goodsTradeModelInsNode/goodsTradeModelInsNode.html new file mode 100644 index 000000000..46dc7807b --- /dev/null +++ b/MengYu-Trade/src/main/resources/templates/mengyu/goodsTradeModelInsNode/goodsTradeModelInsNode.html @@ -0,0 +1,90 @@ + + + + + +
+ + +
+
+
+
+
+ + + \ No newline at end of file diff --git a/MengYu-Trade/src/main/resources/templates/mengyu/moneyPool/add.html b/MengYu-Trade/src/main/resources/templates/mengyu/moneyPool/add.html new file mode 100644 index 000000000..3a26a71db --- /dev/null +++ b/MengYu-Trade/src/main/resources/templates/mengyu/moneyPool/add.html @@ -0,0 +1,46 @@ + + + + + +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+
+
+ + + diff --git a/MengYu-Trade/src/main/resources/templates/mengyu/moneyPool/edit.html b/MengYu-Trade/src/main/resources/templates/mengyu/moneyPool/edit.html new file mode 100644 index 000000000..5ee191f41 --- /dev/null +++ b/MengYu-Trade/src/main/resources/templates/mengyu/moneyPool/edit.html @@ -0,0 +1,47 @@ + + + + + +
+
+ +
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+
+
+ + + diff --git a/MengYu-Trade/src/main/resources/templates/mengyu/moneyPool/moneyPool.html b/MengYu-Trade/src/main/resources/templates/mengyu/moneyPool/moneyPool.html new file mode 100644 index 000000000..eac6a6f11 --- /dev/null +++ b/MengYu-Trade/src/main/resources/templates/mengyu/moneyPool/moneyPool.html @@ -0,0 +1,70 @@ + + + + + +
+ + +
+
+
+
+
+ + + \ No newline at end of file diff --git a/MengYu-Trade/src/main/resources/templates/mengyu/moneyPoolLog/add.html b/MengYu-Trade/src/main/resources/templates/mengyu/moneyPoolLog/add.html new file mode 100644 index 000000000..57b6e28c9 --- /dev/null +++ b/MengYu-Trade/src/main/resources/templates/mengyu/moneyPoolLog/add.html @@ -0,0 +1,52 @@ + + + + + +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+
+
+ + + diff --git a/MengYu-Trade/src/main/resources/templates/mengyu/moneyPoolLog/edit.html b/MengYu-Trade/src/main/resources/templates/mengyu/moneyPoolLog/edit.html new file mode 100644 index 000000000..3a80a3cf5 --- /dev/null +++ b/MengYu-Trade/src/main/resources/templates/mengyu/moneyPoolLog/edit.html @@ -0,0 +1,53 @@ + + + + + +
+
+ +
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+
+
+ + + diff --git a/MengYu-Trade/src/main/resources/templates/mengyu/moneyPoolLog/moneyPoolLog.html b/MengYu-Trade/src/main/resources/templates/mengyu/moneyPoolLog/moneyPoolLog.html new file mode 100644 index 000000000..787e90908 --- /dev/null +++ b/MengYu-Trade/src/main/resources/templates/mengyu/moneyPoolLog/moneyPoolLog.html @@ -0,0 +1,74 @@ + + + + + +
+ + +
+
+
+
+
+ + + \ No newline at end of file diff --git a/MengYu-Trade/src/main/resources/templates/mengyu/yearPlan/add.html b/MengYu-Trade/src/main/resources/templates/mengyu/yearPlan/add.html new file mode 100644 index 000000000..cfdb00805 --- /dev/null +++ b/MengYu-Trade/src/main/resources/templates/mengyu/yearPlan/add.html @@ -0,0 +1,58 @@ + + + + + +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+
+
+ + + diff --git a/MengYu-Trade/src/main/resources/templates/mengyu/yearPlan/edit.html b/MengYu-Trade/src/main/resources/templates/mengyu/yearPlan/edit.html new file mode 100644 index 000000000..e3c710415 --- /dev/null +++ b/MengYu-Trade/src/main/resources/templates/mengyu/yearPlan/edit.html @@ -0,0 +1,59 @@ + + + + + +
+
+ +
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+
+
+ + + diff --git a/MengYu-Trade/src/main/resources/templates/mengyu/yearPlan/yearPlan.html b/MengYu-Trade/src/main/resources/templates/mengyu/yearPlan/yearPlan.html new file mode 100644 index 000000000..995d648f4 --- /dev/null +++ b/MengYu-Trade/src/main/resources/templates/mengyu/yearPlan/yearPlan.html @@ -0,0 +1,78 @@ + + + + + +
+ + +
+
+
+
+
+ + + \ No newline at end of file