diff --git a/mlWechatOpen/src/main/java/com/iformall/controller/HomeController.java b/mlWechatOpen/src/main/java/com/iformall/controller/HomeController.java index a2b93a4..b370a68 100644 --- a/mlWechatOpen/src/main/java/com/iformall/controller/HomeController.java +++ b/mlWechatOpen/src/main/java/com/iformall/controller/HomeController.java @@ -4,6 +4,7 @@ import com.google.code.kaptcha.Constants; import com.google.code.kaptcha.Producer; import com.iformall.common.ErrorCode; import com.iformall.common.ResultData; +import com.iformall.controller.base.BaseController; import com.iformall.domain.po.MallUserInfo; import com.iformall.exception.MallinkException; import com.iformall.shiro.UserSession; diff --git a/mlWechatOpen/src/main/java/com/iformall/controller/WechatCalllbackController.java b/mlWechatOpen/src/main/java/com/iformall/controller/WechatCalllbackController.java index afefb5d..46a9cb8 100644 --- a/mlWechatOpen/src/main/java/com/iformall/controller/WechatCalllbackController.java +++ b/mlWechatOpen/src/main/java/com/iformall/controller/WechatCalllbackController.java @@ -7,6 +7,7 @@ import com.google.gson.Gson; import com.google.gson.GsonBuilder; import com.iformall.common.Result; import com.iformall.common.ResultData; +import com.iformall.controller.base.BaseController; import com.iformall.domain.po.*; import com.iformall.enums.*; import com.iformall.service.*; diff --git a/mlWechatOpen/src/main/java/com/iformall/controller/WechatMediaController.java b/mlWechatOpen/src/main/java/com/iformall/controller/WechatMediaController.java index d6ad5ca..db61792 100644 --- a/mlWechatOpen/src/main/java/com/iformall/controller/WechatMediaController.java +++ b/mlWechatOpen/src/main/java/com/iformall/controller/WechatMediaController.java @@ -1,6 +1,7 @@ package com.iformall.controller; import com.iformall.common.ResultData; +import com.iformall.controller.base.BaseController; import com.iformall.service.WxAuthorizerInfoService; import com.iformall.service.wechat.FmOpenService; import io.swagger.annotations.Api; @@ -23,7 +24,6 @@ import java.io.BufferedInputStream; import java.io.File; import java.io.FileOutputStream; import java.io.InputStream; -import java.util.UUID; /** * Stormeye Wu diff --git a/mlWechatOpen/src/main/java/com/iformall/controller/WxWeappBasicSetController.java b/mlWechatOpen/src/main/java/com/iformall/controller/WxWeappBasicSetController.java index c32f35d..cf05151 100644 --- a/mlWechatOpen/src/main/java/com/iformall/controller/WxWeappBasicSetController.java +++ b/mlWechatOpen/src/main/java/com/iformall/controller/WxWeappBasicSetController.java @@ -3,6 +3,7 @@ package com.iformall.controller; import com.github.pagehelper.PageInfo; import com.iformall.common.ErrorCode; import com.iformall.common.ResultData; +import com.iformall.controller.base.BaseController; import com.iformall.domain.po.WxWeappBasicSet; import com.iformall.service.WxWeappBasicSetService; import io.swagger.annotations.Api; diff --git a/mlWechatOpen/src/main/java/com/iformall/controller/WxWeappExtSetController.java b/mlWechatOpen/src/main/java/com/iformall/controller/WxWeappExtSetController.java index 8e394f3..37e2219 100644 --- a/mlWechatOpen/src/main/java/com/iformall/controller/WxWeappExtSetController.java +++ b/mlWechatOpen/src/main/java/com/iformall/controller/WxWeappExtSetController.java @@ -5,6 +5,7 @@ import com.alibaba.fastjson.JSONObject; import com.github.pagehelper.PageInfo; import com.iformall.common.ErrorCode; import com.iformall.common.ResultData; +import com.iformall.controller.base.BaseController; import com.iformall.domain.po.WxAppinfo; import com.iformall.domain.po.WxWeappExtSet; import com.iformall.enums.EnumAppType; diff --git a/mlWechatOpen/src/main/java/com/iformall/controller/WxWeappInfoController.java b/mlWechatOpen/src/main/java/com/iformall/controller/WxWeappInfoController.java index 91ac2e5..0bb1dcf 100644 --- a/mlWechatOpen/src/main/java/com/iformall/controller/WxWeappInfoController.java +++ b/mlWechatOpen/src/main/java/com/iformall/controller/WxWeappInfoController.java @@ -2,7 +2,6 @@ package com.iformall.controller; import cn.binarywang.wx.miniapp.api.WxMaService; import cn.binarywang.wx.miniapp.bean.template.WxMaTemplateAddResult; -import cn.binarywang.wx.miniapp.bean.template.WxMaTemplateListResult; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; @@ -13,6 +12,7 @@ import com.google.gson.reflect.TypeToken; import com.iformall.common.ErrorCode; import com.iformall.common.Result; import com.iformall.common.ResultData; +import com.iformall.controller.base.BaseController; import com.iformall.domain.po.*; import com.iformall.domain.vo.WxWeappAuditStatusVo; import com.iformall.domain.vo.WxWeappCodeStatusVo; diff --git a/mlWechatOpen/src/main/java/com/iformall/controller/BaseController.java b/mlWechatOpen/src/main/java/com/iformall/controller/base/BaseController.java similarity index 97% rename from mlWechatOpen/src/main/java/com/iformall/controller/BaseController.java rename to mlWechatOpen/src/main/java/com/iformall/controller/base/BaseController.java index c77080f..cca8d3e 100644 --- a/mlWechatOpen/src/main/java/com/iformall/controller/BaseController.java +++ b/mlWechatOpen/src/main/java/com/iformall/controller/base/BaseController.java @@ -1,4 +1,4 @@ -package com.iformall.controller; +package com.iformall.controller.base; import com.iformall.utils.IPUtil; import org.springframework.web.bind.WebDataBinder;