From c94a843ca6c381977b886a610b9211c8296492bc Mon Sep 17 00:00:00 2001
From: Jinquan_Ou <Jinquan@gdut.com>
Date: 星期日, 19 三月 2023 10:06:41 +0800
Subject: [PATCH] 修改上传文件
---
ruoyi-admin/src/main/resources/application-druid.yml | 1 -
ruoyi-admin/src/main/java/com/ruoyi/web/controller/common/CommonController.java | 2 +-
ruoyi-admin/src/test/java/com/ruoyi/generatorTest.java | 36 ++++++++++++++++++------------------
3 files changed, 19 insertions(+), 20 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/common/CommonController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/common/CommonController.java
index f424327..f630899 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/common/CommonController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/common/CommonController.java
@@ -73,7 +73,7 @@
* 閫氱敤涓婁紶璇锋眰锛堝崟涓級
*/
@PostMapping("/upload")
- public AjaxResult uploadFile(@RequestParam("uploadFile")MultipartFile file) throws Exception
+ public AjaxResult uploadFile(MultipartFile file) throws Exception
{
try
{
diff --git a/ruoyi-admin/src/main/resources/application-druid.yml b/ruoyi-admin/src/main/resources/application-druid.yml
index 5273a53..7fb6bb7 100644
--- a/ruoyi-admin/src/main/resources/application-druid.yml
+++ b/ruoyi-admin/src/main/resources/application-druid.yml
@@ -8,7 +8,6 @@
master:
url: jdbc:mysql://localhost:3306/ruoyi?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
username: root
-# username: zhangApp
password: ZhangApp123!
# password: 123456
# 浠庡簱鏁版嵁婧�
diff --git a/ruoyi-admin/src/test/java/com/ruoyi/generatorTest.java b/ruoyi-admin/src/test/java/com/ruoyi/generatorTest.java
index 2e34aa5..b2c85b9 100644
--- a/ruoyi-admin/src/test/java/com/ruoyi/generatorTest.java
+++ b/ruoyi-admin/src/test/java/com/ruoyi/generatorTest.java
@@ -20,7 +20,7 @@
@Test
public void test01() {
//鍒涘缓涓�涓唬鐮佺敓鎴愬櫒
- FastAutoGenerator.create("jdbc:mysql://192.168.88.68:3306/mall_sms?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8",
+ FastAutoGenerator.create("jdbc:mysql://192.168.88.68:3306/mall_pms?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8",
"root", "root")
//鍏ㄥ眬閰嶇疆(GlobalConfig)
.globalConfig(builder -> {
@@ -41,22 +41,21 @@
.strategyConfig(builder -> {
// builder.addInclude("zf_clean") // 璁剧疆闇�瑕佺敓鎴愮殑琛ㄥ悕
// .addInclude("zf_collection") // 璁剧疆闇�瑕佺敓鎴愮殑琛ㄥ悕
- builder.addInclude("sms_coupon") // 璁剧疆闇�瑕佺敓鎴愮殑琛ㄥ悕
- .addInclude("sms_coupon_history") // 璁剧疆闇�瑕佺敓鎴愮殑琛ㄥ悕
- .addInclude("sms_coupon_spu_category_relation") // 璁剧疆闇�瑕佺敓鎴愮殑琛ㄥ悕
- .addInclude("sms_coupon_spu_relation") // 璁剧疆闇�瑕佺敓鎴愮殑琛ㄥ悕
- .addInclude("sms_home_adv") // 璁剧疆闇�瑕佺敓鎴愮殑琛ㄥ悕
- .addInclude("sms_home_subject") // 璁剧疆闇�瑕佺敓鎴愮殑琛ㄥ悕
- .addInclude("sms_home_subject_spu") // 璁剧疆闇�瑕佺敓鎴愮殑琛ㄥ悕
- .addInclude("sms_member_price") // 璁剧疆闇�瑕佺敓鎴愮殑琛ㄥ悕
- .addInclude("sms_seckill_promotion") // 璁剧疆闇�瑕佺敓鎴愮殑琛ㄥ悕
- .addInclude("sms_seckill_session") // 璁剧疆闇�瑕佺敓鎴愮殑琛ㄥ悕
- .addInclude("sms_seckill_sku_notice") // 璁剧疆闇�瑕佺敓鎴愮殑琛ㄥ悕
- .addInclude("sms_seckill_sku_relation") // 璁剧疆闇�瑕佺敓鎴愮殑琛ㄥ悕
- .addInclude("sms_sku_full_reduction") // 璁剧疆闇�瑕佺敓鎴愮殑琛ㄥ悕
- .addInclude("sms_sku_ladder") // 璁剧疆闇�瑕佺敓鎴愮殑琛ㄥ悕
- .addInclude("sms_spu_bounds"); // 璁剧疆闇�瑕佺敓鎴愮殑琛ㄥ悕
-
+ builder.addInclude("pms_attr") // 璁剧疆闇�瑕佺敓鎴愮殑琛ㄥ悕
+ .addInclude("pms_attr_attrgroup_relation") // 璁剧疆闇�瑕佺敓鎴愮殑琛ㄥ悕
+ .addInclude("pms_attr_group") // 璁剧疆闇�瑕佺敓鎴愮殑琛ㄥ悕
+ .addInclude("pms_brand") // 璁剧疆闇�瑕佺敓鎴愮殑琛ㄥ悕
+ .addInclude("pms_category") // 璁剧疆闇�瑕佺敓鎴愮殑琛ㄥ悕
+ .addInclude("pms_category_brand") // 璁剧疆闇�瑕佺敓鎴愮殑琛ㄥ悕
+ .addInclude("pms_comment_replay") // 璁剧疆闇�瑕佺敓鎴愮殑琛ㄥ悕
+ .addInclude("pms_product_attr_value") // 璁剧疆闇�瑕佺敓鎴愮殑琛ㄥ悕
+ .addInclude("pms_sku_images") // 璁剧疆闇�瑕佺敓鎴愮殑琛ㄥ悕
+ .addInclude("pms_sku_info") // 璁剧疆闇�瑕佺敓鎴愮殑琛ㄥ悕
+ .addInclude("pms_sku_sale_attr_value") // 璁剧疆闇�瑕佺敓鎴愮殑琛ㄥ悕
+ .addInclude("pms_spu_comment") // 璁剧疆闇�瑕佺敓鎴愮殑琛ㄥ悕
+ .addInclude("pms_spu_images") // 璁剧疆闇�瑕佺敓鎴愮殑琛ㄥ悕
+ .addInclude("pms_spu_info") // 璁剧疆闇�瑕佺敓鎴愮殑琛ㄥ悕
+ .addInclude("pms_spu_info_desc"); // 璁剧疆闇�瑕佺敓鎴愮殑琛ㄥ悕
builder.serviceBuilder()
.formatServiceFileName("%sService") //璁剧疆service鐨勫懡鍚嶇瓥鐣�,娌℃湁杩欎釜閰嶇疆鐨勮瘽锛岀敓鎴愮殑service鍜宻erviceImpl绫诲墠闈細鏈変竴涓狪锛屾瘮濡侷UserService鍜孖UserServiceImpl
@@ -64,11 +63,12 @@
builder.controllerBuilder()
.enableRestStyle(); // 寮�鍚敓鎴怈RestController 鎺у埗鍣紝涓嶉厤缃繖涓粯璁ゆ槸Controller娉ㄨВ锛孯estController鏄繑鍥濲son瀛楃涓茬殑锛屽鐢ㄤ簬鍓嶅悗绔垎绂婚」鐩��
builder.mapperBuilder()
- .enableMapperAnnotation();//寮�鍚� @Mapper 娉ㄨВ锛屼篃灏辨槸鍦╠ao鎺ュ彛涓婃坊鍔犱竴涓狜Mapper娉ㄨВ锛岃繖涓敞瑙ｇ殑浣滅敤鏄紑鍚敞瑙ｆā寮忥紝灏卞彲浠ュ湪鎺ュ彛鐨勬娊璞℃柟娉曚笂闈㈢洿鎺ヤ娇鐢ˊSelect鍜孈Insert鍜孈Update鍜孈Delete娉ㄨВ銆�
+ .enableMapperAnnotation() ;//寮�鍚� @Mapper 娉ㄨВ锛屼篃灏辨槸鍦╠ao鎺ュ彛涓婃坊鍔犱竴涓狜Mapper娉ㄨВ锛岃繖涓敞瑙ｇ殑浣滅敤鏄紑鍚敞瑙ｆā寮忥紝灏卞彲浠ュ湪鎺ュ彛鐨勬娊璞℃柟娉曚笂闈㈢洿鎺ヤ娇鐢ˊSelect鍜孈Insert鍜孈Update鍜孈Delete娉ㄨВ銆�
})
// .templateEngine(new FreemarkerTemplateEngine()) // 浣跨敤Freemarker寮曟搸妯℃澘锛岄粯璁ょ殑鏄疺elocity寮曟搸妯℃澘
.templateEngine(new VelocityTemplateEngine())
.execute(); //鎵ц浠ヤ笂閰嶇疆
+
}
}
--
Gitblit v1.9.1