From 3b82706132e1a1842d3a04cae63ed6f5b52909bc Mon Sep 17 00:00:00 2001
From: Carl <376654749@qq.com>
Date: Fri, 24 Dec 2021 11:57:41 +0800
Subject: [PATCH] fix bug

---
 .../system/royalcanin/good/service/GoodService.java    | 10 ----------
 .../main/java/net/lab1024/smartadmin/util/AESUtil.java |  3 ++-
 2 files changed, 2 insertions(+), 11 deletions(-)

diff --git a/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/good/service/GoodService.java b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/good/service/GoodService.java
index 4c48841f..20b45961 100644
--- a/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/good/service/GoodService.java
+++ b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/good/service/GoodService.java
@@ -1,20 +1,14 @@
 package net.lab1024.smartadmin.module.system.royalcanin.good.service;
 
 import com.alibaba.fastjson.JSONObject;
-import net.lab1024.smartadmin.common.domain.ResponseDTO;
-import net.lab1024.smartadmin.module.system.royalcanin.good.dao.FlowDao;
 import net.lab1024.smartadmin.module.system.royalcanin.good.dao.GoodsDao;
-import net.lab1024.smartadmin.module.system.royalcanin.good.dao.OrdersDao;
-import net.lab1024.smartadmin.module.system.royalcanin.good.model.FlowEntity;
 import net.lab1024.smartadmin.module.system.royalcanin.good.model.GoodsEntity;
-import net.lab1024.smartadmin.module.system.royalcanin.good.model.OrdersEntity;
 import net.lab1024.smartadmin.util.AESUtil;
 import net.lab1024.smartadmin.util.MapRemoveNullUtil;
 import net.lab1024.smartadmin.util.SmartHttpUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
-import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
@@ -22,14 +16,10 @@ import java.util.Map;
 public class GoodService {
 
     String url = "https://miniapp-test.royalcanin.com.cn/rcmini/h5/";
-    @Autowired
-   private OrdersDao ordersDao;
 
     @Autowired
     private GoodsDao goodsDao;
 
-    @Autowired
-    private FlowDao flowDao;
     public List<GoodsEntity> listGoodsByNameBankNameTagUsedAge(String title){
         return goodsDao.selectRoleIdByGoodsNameBankNameTagUsedAge(title);
     }
diff --git a/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/util/AESUtil.java b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/util/AESUtil.java
index 00e0e289..8551402e 100644
--- a/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/util/AESUtil.java
+++ b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/util/AESUtil.java
@@ -14,7 +14,8 @@ import org.apache.commons.lang3.StringUtils;
  * 
  */
 public class AESUtil {
-    private static final String defaultCharset = "UTF-8";
+//    private static final String defaultCharset = "UTF-8";
+    private static final String defaultCharset = "GBK";
     private static final String KEY_AES        = "AES";
     public static final String KEY            = "H5@2021";