feat:移动文件目录，新增小程序账号密码登录

jeecg-module-demo/src/main/java/org/jeecg/modules/demo/appuser/mapper/AppUserMapper.java

@@ -1,17 +0,0 @@
-package org.jeecg.modules.demo.appuser.mapper;
-
-import java.util.List;
-
-import org.apache.ibatis.annotations.Param;
-import org.jeecg.modules.demo.appuser.entity.AppUser;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-
-/**
- * @Description: 应用用户表
- * @Author: jeecg-boot
- * @Date:   2025-02-16
- * @Version: V1.0
- */
-public interface AppUserMapper extends BaseMapper<AppUser> {
-
-}

jeecg-module-demo/src/main/java/org/jeecg/modules/demo/appuser/mapper/xml/AppUserMapper.xml

@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="org.jeecg.modules.demo.appuser.mapper.AppUserMapper">
-
-</mapper>

jeecg-module-demo/src/main/java/org/jeecg/modules/demo/appuser/service/IAppUserService.java

@@ -1,14 +0,0 @@
-package org.jeecg.modules.demo.appuser.service;
-
-import org.jeecg.modules.demo.appuser.entity.AppUser;
-import com.baomidou.mybatisplus.extension.service.IService;
-
-/**
- * @Description: 应用用户表
- * @Author: jeecg-boot
- * @Date:   2025-02-16
- * @Version: V1.0
- */
-public interface IAppUserService extends IService<AppUser> {
-
-}

jeecg-module-demo/src/main/java/org/jeecg/modules/demo/appuser/service/impl/AppUserServiceImpl.java

@@ -1,19 +0,0 @@
-package org.jeecg.modules.demo.appuser.service.impl;
-
-import org.jeecg.modules.demo.appuser.entity.AppUser;
-import org.jeecg.modules.demo.appuser.mapper.AppUserMapper;
-import org.jeecg.modules.demo.appuser.service.IAppUserService;
-import org.springframework.stereotype.Service;
-
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-
-/**
- * @Description: 应用用户表
- * @Author: jeecg-boot
- * @Date:   2025-02-16
- * @Version: V1.0
- */
-@Service
-public class AppUserServiceImpl extends ServiceImpl<AppUserMapper, AppUser> implements IAppUserService {
-
-}

jeecg-module-demo/src/main/java/org/jeecg/modules/demo/appbanner/controller/AppBannerController.java → jeecg-module-demo/src/main/java/org/jeecg/modules/sysMiniapp/appbanner/controller/AppBannerController.java

@@ -1,39 +1,25 @@
-package org.jeecg.modules.demo.appbanner.controller;
+package org.jeecg.modules.sysMiniapp.appbanner.controller;
 
 import java.util.Arrays;
 import java.util.HashMap;
-import java.util.List;
 import java.util.Map;
-import java.util.stream.Collectors;
-import java.io.IOException;
-import java.io.UnsupportedEncodingException;
-import java.net.URLDecoder;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import org.jeecg.common.api.vo.Result;
 import org.jeecg.common.system.query.QueryGenerator;
 import org.jeecg.common.system.query.QueryRuleEnum;
-import org.jeecg.common.util.oConvertUtils;
-import org.jeecg.modules.demo.appbanner.entity.AppBanner;
-import org.jeecg.modules.demo.appbanner.service.IAppBannerService;
+import org.jeecg.modules.sysMiniapp.appbanner.entity.AppBanner;
+import org.jeecg.modules.sysMiniapp.appbanner.service.IAppBannerService;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import lombok.extern.slf4j.Slf4j;
 
-import org.jeecgframework.poi.excel.ExcelImportUtil;
-import org.jeecgframework.poi.excel.def.NormalExcelConstants;
-import org.jeecgframework.poi.excel.entity.ExportParams;
-import org.jeecgframework.poi.excel.entity.ImportParams;
-import org.jeecgframework.poi.excel.view.JeecgEntityExcelView;
 import org.jeecg.common.system.base.controller.JeecgController;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
-import org.springframework.web.multipart.MultipartFile;
-import org.springframework.web.multipart.MultipartHttpServletRequest;
 import org.springframework.web.servlet.ModelAndView;
-import com.alibaba.fastjson.JSON;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.jeecg.common.aspect.annotation.AutoLog;
@@ -52,7 +38,7 @@ import org.apache.shiro.authz.annotation.RequiresPermissions;
 public class AppBannerController extends JeecgController<AppBanner, IAppBannerService> {
 	@Autowired
 	private IAppBannerService appBannerService;
-	
+
 	/**
 	 * 分页列表查询
 	 *
@@ -80,7 +66,7 @@ public class AppBannerController extends JeecgController<AppBanner, IAppBannerSe
 		IPage<AppBanner> pageList = appBannerService.page(page, queryWrapper);
 		return Result.OK(pageList);
 	}
-	
+
 	/**
 	 *   添加
 	 *
@@ -95,7 +81,7 @@ public class AppBannerController extends JeecgController<AppBanner, IAppBannerSe
 		appBannerService.save(appBanner);
 		return Result.OK("添加成功！");
 	}
-	
+
 	/**
 	 *  编辑
 	 *
@@ -110,7 +96,7 @@ public class AppBannerController extends JeecgController<AppBanner, IAppBannerSe
 		appBannerService.updateById(appBanner);
 		return Result.OK("编辑成功!");
 	}
-	
+
 	/**
 	 *   通过id删除
 	 *
@@ -125,7 +111,7 @@ public class AppBannerController extends JeecgController<AppBanner, IAppBannerSe
 		appBannerService.removeById(id);
 		return Result.OK("删除成功!");
 	}
-	
+
 	/**
 	 *  批量删除
 	 *
@@ -140,7 +126,7 @@ public class AppBannerController extends JeecgController<AppBanner, IAppBannerSe
 		this.appBannerService.removeByIds(Arrays.asList(ids.split(",")));
 		return Result.OK("批量删除成功!");
 	}
-	
+
 	/**
 	 * 通过id查询
 	 *

jeecg-module-demo/src/main/java/org/jeecg/modules/demo/appbanner/entity/AppBanner.java → jeecg-module-demo/src/main/java/org/jeecg/modules/sysMiniapp/appbanner/entity/AppBanner.java

@@ -1,15 +1,10 @@
-package org.jeecg.modules.demo.appbanner.entity;
+package org.jeecg.modules.sysMiniapp.appbanner.entity;
 
 import java.io.Serializable;
-import java.io.UnsupportedEncodingException;
-import java.util.Date;
-import java.math.BigDecimal;
+
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
-import com.baomidou.mybatisplus.annotation.TableLogic;
-import org.jeecg.common.constant.ProvinceCityArea;
-import org.jeecg.common.util.SpringContextUtils;
 import lombok.Data;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import org.springframework.format.annotation.DateTimeFormat;

jeecg-module-demo/src/main/java/org/jeecg/modules/demo/appbanner/mapper/AppBannerMapper.java → jeecg-module-demo/src/main/java/org/jeecg/modules/sysMiniapp/appbanner/mapper/AppBannerMapper.java

@@ -1,9 +1,6 @@
-package org.jeecg.modules.demo.appbanner.mapper;
+package org.jeecg.modules.sysMiniapp.appbanner.mapper;
 
-import java.util.List;
-
-import org.apache.ibatis.annotations.Param;
-import org.jeecg.modules.demo.appbanner.entity.AppBanner;
+import org.jeecg.modules.sysMiniapp.appbanner.entity.AppBanner;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
 /**

jeecg-module-demo/src/main/java/org/jeecg/modules/demo/appbanner/mapper/xml/AppBannerMapper.xml → jeecg-module-demo/src/main/java/org/jeecg/modules/sysMiniapp/appbanner/mapper/xml/AppBannerMapper.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="org.jeecg.modules.demo.appbanner.mapper.AppBannerMapper">
+<mapper namespace="org.jeecg.modules.sysMiniapp.appbanner.mapper.AppBannerMapper">
 
-</mapper>
+</mapper>

jeecg-module-demo/src/main/java/org/jeecg/modules/demo/appbanner/service/IAppBannerService.java → jeecg-module-demo/src/main/java/org/jeecg/modules/sysMiniapp/appbanner/service/IAppBannerService.java

@@ -1,6 +1,6 @@
-package org.jeecg.modules.demo.appbanner.service;
+package org.jeecg.modules.sysMiniapp.appbanner.service;
 
-import org.jeecg.modules.demo.appbanner.entity.AppBanner;
+import org.jeecg.modules.sysMiniapp.appbanner.entity.AppBanner;
 import com.baomidou.mybatisplus.extension.service.IService;
 
 /**

jeecg-module-demo/src/main/java/org/jeecg/modules/demo/appbanner/service/impl/AppBannerServiceImpl.java → jeecg-module-demo/src/main/java/org/jeecg/modules/sysMiniapp/appbanner/service/impl/AppBannerServiceImpl.java

@@ -1,8 +1,8 @@
-package org.jeecg.modules.demo.appbanner.service.impl;
+package org.jeecg.modules.sysMiniapp.appbanner.service.impl;
 
-import org.jeecg.modules.demo.appbanner.entity.AppBanner;
-import org.jeecg.modules.demo.appbanner.mapper.AppBannerMapper;
-import org.jeecg.modules.demo.appbanner.service.IAppBannerService;
+import org.jeecg.modules.sysMiniapp.appbanner.entity.AppBanner;
+import org.jeecg.modules.sysMiniapp.appbanner.mapper.AppBannerMapper;
+import org.jeecg.modules.sysMiniapp.appbanner.service.IAppBannerService;
 import org.springframework.stereotype.Service;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;

jeecg-module-demo/src/main/java/org/jeecg/modules/demo/appuser/controller/AppUserController.java → jeecg-module-demo/src/main/java/org/jeecg/modules/sysMiniapp/appuser/controller/AppUserController.java

@@ -1,39 +1,32 @@
-package org.jeecg.modules.demo.appuser.controller;
+package org.jeecg.modules.sysMiniapp.appuser.controller;
 
 import java.util.Arrays;
 import java.util.HashMap;
-import java.util.List;
 import java.util.Map;
-import java.util.stream.Collectors;
-import java.io.IOException;
-import java.io.UnsupportedEncodingException;
-import java.net.URLDecoder;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
+
+import cn.hutool.core.util.StrUtil;
 import org.jeecg.common.api.vo.Result;
+import org.jeecg.common.constant.CacheConstant;
 import org.jeecg.common.system.query.QueryGenerator;
 import org.jeecg.common.system.query.QueryRuleEnum;
+import org.jeecg.common.util.PasswordUtil;
 import org.jeecg.common.util.oConvertUtils;
-import org.jeecg.modules.demo.appuser.entity.AppUser;
-import org.jeecg.modules.demo.appuser.service.IAppUserService;
+import org.jeecg.modules.sysMiniapp.appuser.entity.AppUser;
+import org.jeecg.modules.sysMiniapp.appuser.service.IAppUserService;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import lombok.extern.slf4j.Slf4j;
 
-import org.jeecgframework.poi.excel.ExcelImportUtil;
-import org.jeecgframework.poi.excel.def.NormalExcelConstants;
-import org.jeecgframework.poi.excel.entity.ExportParams;
-import org.jeecgframework.poi.excel.entity.ImportParams;
-import org.jeecgframework.poi.excel.view.JeecgEntityExcelView;
 import org.jeecg.common.system.base.controller.JeecgController;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.cache.annotation.CacheEvict;
+import org.springframework.cache.annotation.Cacheable;
 import org.springframework.web.bind.annotation.*;
-import org.springframework.web.multipart.MultipartFile;
-import org.springframework.web.multipart.MultipartHttpServletRequest;
 import org.springframework.web.servlet.ModelAndView;
-import com.alibaba.fastjson.JSON;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.jeecg.common.aspect.annotation.AutoLog;
@@ -52,7 +45,7 @@ import org.apache.shiro.authz.annotation.RequiresPermissions;
 public class AppUserController extends JeecgController<AppUser, IAppUserService> {
 	@Autowired
 	private IAppUserService appUserService;
-	
+
 	/**
 	 * 分页列表查询
 	 *
@@ -78,7 +71,7 @@ public class AppUserController extends JeecgController<AppUser, IAppUserService>
 		IPage<AppUser> pageList = appUserService.page(page, queryWrapper);
 		return Result.OK(pageList);
 	}
-	
+
 	/**
 	 *   添加
 	 *
@@ -90,10 +83,14 @@ public class AppUserController extends JeecgController<AppUser, IAppUserService>
 	@RequiresPermissions("appuser:app_user:add")
 	@PostMapping(value = "/add")
 	public Result<String> add(@RequestBody AppUser appUser) {
+		String salt = oConvertUtils.randomGen(8);
+		appUser.setPasswordSalt(salt);
+		String passwordEncode = PasswordUtil.encrypt(appUser.getNickName(), appUser.getPassword(), salt);
+		appUser.setPassword(passwordEncode);
 		appUserService.save(appUser);
 		return Result.OK("添加成功！");
 	}
-	
+
 	/**
 	 *  编辑
 	 *
@@ -103,12 +100,18 @@ public class AppUserController extends JeecgController<AppUser, IAppUserService>
 	@AutoLog(value = "应用用户表-编辑")
 	@ApiOperation(value="应用用户表-编辑", notes="应用用户表-编辑")
 	@RequiresPermissions("appuser:app_user:edit")
+	@CacheEvict(value={CacheConstant.SYS_USERS_CACHE}, allEntries=true)
 	@RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST})
 	public Result<String> edit(@RequestBody AppUser appUser) {
+		// 修改密码
+		if (StrUtil.isNotBlank(appUser.getPassword()) || StrUtil.isNotBlank(appUser.getNickName())){
+			String passwordEncode = PasswordUtil.encrypt(appUser.getNickName(), appUser.getPassword(), appUser.getPasswordSalt());
+			appUser.setPassword(passwordEncode);
+		}
 		appUserService.updateById(appUser);
 		return Result.OK("编辑成功!");
 	}
-	
+
 	/**
 	 *   通过id删除
 	 *
@@ -123,7 +126,7 @@ public class AppUserController extends JeecgController<AppUser, IAppUserService>
 		appUserService.removeById(id);
 		return Result.OK("删除成功!");
 	}
-	
+
 	/**
 	 *  批量删除
 	 *
@@ -138,7 +141,7 @@ public class AppUserController extends JeecgController<AppUser, IAppUserService>
 		this.appUserService.removeByIds(Arrays.asList(ids.split(",")));
 		return Result.OK("批量删除成功!");
 	}
-	
+
 	/**
 	 * 通过id查询
 	 *

jeecg-module-demo/src/main/java/org/jeecg/modules/demo/appuser/entity/AppUser.java → jeecg-module-demo/src/main/java/org/jeecg/modules/sysMiniapp/appuser/entity/AppUser.java

@@ -1,15 +1,10 @@
-package org.jeecg.modules.demo.appuser.entity;
+package org.jeecg.modules.sysMiniapp.appuser.entity;
 
 import java.io.Serializable;
-import java.io.UnsupportedEncodingException;
-import java.util.Date;
-import java.math.BigDecimal;
+
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
-import com.baomidou.mybatisplus.annotation.TableLogic;
-import org.jeecg.common.constant.ProvinceCityArea;
-import org.jeecg.common.util.SpringContextUtils;
 import lombok.Data;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import org.springframework.format.annotation.DateTimeFormat;

jeecg-module-demo/src/main/java/org/jeecg/modules/sysMiniapp/appuser/mapper/AppUserMapper.java

@@ -0,0 +1,22 @@
+package org.jeecg.modules.sysMiniapp.appuser.mapper;
+
+import org.apache.ibatis.annotations.Param;
+import org.jeecg.modules.sysMiniapp.appuser.entity.AppUser;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * @Description: 应用用户表
+ * @Author: jeecg-boot
+ * @Date:   2025-02-16
+ * @Version: V1.0
+ */
+public interface AppUserMapper extends BaseMapper<AppUser> {
+
+    /**
+     * 通过用户账号查询用户信息
+     * @param username
+     * @return
+     */
+    public AppUser getUserByName(@Param("username") String username);
+
+}

jeecg-module-demo/src/main/java/org/jeecg/modules/sysMiniapp/appuser/mapper/xml/AppUserMapper.xml

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="org.jeecg.modules.sysMiniapp.appuser.mapper.AppUserMapper">
+    <!-- 根据用户名查询 -->
+    <select id="getUserByName" resultType="org.jeecg.modules.sysMiniapp.appuser.entity.AppUser">
+        select * from  app_user  where nick_name = #{username}
+    </select>
+</mapper>

jeecg-module-demo/src/main/java/org/jeecg/modules/sysMiniapp/appuser/service/IAppUserService.java

@@ -0,0 +1,24 @@
+package org.jeecg.modules.sysMiniapp.appuser.service;
+
+import org.jeecg.common.api.vo.Result;
+import org.jeecg.modules.sysMiniapp.appuser.entity.AppUser;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * @Description: 应用用户表
+ * @Author: jeecg-boot
+ * @Date:   2025-02-16
+ * @Version: V1.0
+ */
+public interface IAppUserService extends IService<AppUser> {
+
+    /**
+     * 通过用户名查询用户信息
+     * @param userName
+     * @return
+     */
+    AppUser getUserByName(String userName);
+
+    Result<?> checkUserIsEffective(AppUser appUser);
+
+}

jeecg-module-demo/src/main/java/org/jeecg/modules/sysMiniapp/appuser/service/impl/AppUserServiceImpl.java

@@ -0,0 +1,54 @@
+package org.jeecg.modules.sysMiniapp.appuser.service.impl;
+
+import org.jeecg.common.api.vo.Result;
+import org.jeecg.common.constant.CacheConstant;
+import org.jeecg.common.constant.CommonConstant;
+import org.jeecg.modules.base.service.BaseCommonService;
+import org.jeecg.modules.sysMiniapp.appuser.entity.AppUser;
+import org.jeecg.modules.sysMiniapp.appuser.mapper.AppUserMapper;
+import org.jeecg.modules.sysMiniapp.appuser.service.IAppUserService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.cache.annotation.Cacheable;
+import org.springframework.stereotype.Service;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+
+/**
+ * @Description: 应用用户表
+ * @Author: jeecg-boot
+ * @Date:   2025-02-16
+ * @Version: V1.0
+ */
+@Service
+public class AppUserServiceImpl extends ServiceImpl<AppUserMapper, AppUser> implements IAppUserService {
+
+    @Autowired
+    private AppUserMapper appUserMapper;
+
+    @Autowired
+    private BaseCommonService baseCommonService;
+
+    @Override
+    @Cacheable(cacheNames= CacheConstant.SYS_USERS_CACHE, key="#userName")
+    public AppUser getUserByName(String userName) {
+        return appUserMapper.getUserByName(userName);
+    }
+
+    @Override
+    public Result<?> checkUserIsEffective(AppUser appUser) {
+        Result<?> result = new Result<Object>();
+        //情况1：根据用户信息查询，该用户不存在
+        if (appUser == null) {
+            result.error500("用户名或密码错误，请检查后重试！");
+            baseCommonService.addLog("用户登录失败，用户不存在！【小程序端】", CommonConstant.LOG_TYPE_1, null);
+            return result;
+        }
+        //情况3：根据用户信息查询，该用户已冻结
+        if (CommonConstant.STATUS_0.equals(appUser.getStatus())) {
+            baseCommonService.addLog("用户登录失败，用户名:" +  appUser.getNickName() + "已冻结！【小程序端】", CommonConstant.LOG_TYPE_1, null);
+            result.error500("该用户已冻结，请联系管理员解冻");
+            return result;
+        }
+        return result;
+    }
+}

jeecg-module-demo/src/main/java/org/jeecg/modules/demo/notice/controller/AppNoticeController.java → jeecg-module-demo/src/main/java/org/jeecg/modules/sysMiniapp/notice/controller/AppNoticeController.java

@@ -1,39 +1,25 @@
-package org.jeecg.modules.demo.notice.controller;
+package org.jeecg.modules.sysMiniapp.notice.controller;
 
 import java.util.Arrays;
 import java.util.HashMap;
-import java.util.List;
 import java.util.Map;
-import java.util.stream.Collectors;
-import java.io.IOException;
-import java.io.UnsupportedEncodingException;
-import java.net.URLDecoder;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import org.jeecg.common.api.vo.Result;
 import org.jeecg.common.system.query.QueryGenerator;
 import org.jeecg.common.system.query.QueryRuleEnum;
-import org.jeecg.common.util.oConvertUtils;
-import org.jeecg.modules.demo.notice.entity.AppNotice;
-import org.jeecg.modules.demo.notice.service.IAppNoticeService;
+import org.jeecg.modules.sysMiniapp.notice.entity.AppNotice;
+import org.jeecg.modules.sysMiniapp.notice.service.IAppNoticeService;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import lombok.extern.slf4j.Slf4j;
 
-import org.jeecgframework.poi.excel.ExcelImportUtil;
-import org.jeecgframework.poi.excel.def.NormalExcelConstants;
-import org.jeecgframework.poi.excel.entity.ExportParams;
-import org.jeecgframework.poi.excel.entity.ImportParams;
-import org.jeecgframework.poi.excel.view.JeecgEntityExcelView;
 import org.jeecg.common.system.base.controller.JeecgController;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
-import org.springframework.web.multipart.MultipartFile;
-import org.springframework.web.multipart.MultipartHttpServletRequest;
 import org.springframework.web.servlet.ModelAndView;
-import com.alibaba.fastjson.JSON;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.jeecg.common.aspect.annotation.AutoLog;
@@ -52,7 +38,7 @@ import org.apache.shiro.authz.annotation.RequiresPermissions;
 public class AppNoticeController extends JeecgController<AppNotice, IAppNoticeService> {
 	@Autowired
 	private IAppNoticeService appNoticeService;
-	
+
 	/**
 	 * 分页列表查询
 	 *
@@ -78,7 +64,7 @@ public class AppNoticeController extends JeecgController<AppNotice, IAppNoticeSe
 		IPage<AppNotice> pageList = appNoticeService.page(page, queryWrapper);
 		return Result.OK(pageList);
 	}
-	
+
 	/**
 	 *   添加
 	 *
@@ -93,7 +79,7 @@ public class AppNoticeController extends JeecgController<AppNotice, IAppNoticeSe
 		appNoticeService.save(appNotice);
 		return Result.OK("添加成功！");
 	}
-	
+
 	/**
 	 *  编辑
 	 *
@@ -108,7 +94,7 @@ public class AppNoticeController extends JeecgController<AppNotice, IAppNoticeSe
 		appNoticeService.updateById(appNotice);
 		return Result.OK("编辑成功!");
 	}
-	
+
 	/**
 	 *   通过id删除
 	 *
@@ -123,7 +109,7 @@ public class AppNoticeController extends JeecgController<AppNotice, IAppNoticeSe
 		appNoticeService.removeById(id);
 		return Result.OK("删除成功!");
 	}
-	
+
 	/**
 	 *  批量删除
 	 *
@@ -138,7 +124,7 @@ public class AppNoticeController extends JeecgController<AppNotice, IAppNoticeSe
 		this.appNoticeService.removeByIds(Arrays.asList(ids.split(",")));
 		return Result.OK("批量删除成功!");
 	}
-	
+
 	/**
 	 * 通过id查询
 	 *

jeecg-module-demo/src/main/java/org/jeecg/modules/demo/notice/entity/AppNotice.java → jeecg-module-demo/src/main/java/org/jeecg/modules/sysMiniapp/notice/entity/AppNotice.java

@@ -1,15 +1,10 @@
-package org.jeecg.modules.demo.notice.entity;
+package org.jeecg.modules.sysMiniapp.notice.entity;
 
 import java.io.Serializable;
-import java.io.UnsupportedEncodingException;
-import java.util.Date;
-import java.math.BigDecimal;
+
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
-import com.baomidou.mybatisplus.annotation.TableLogic;
-import org.jeecg.common.constant.ProvinceCityArea;
-import org.jeecg.common.util.SpringContextUtils;
 import lombok.Data;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import org.springframework.format.annotation.DateTimeFormat;

jeecg-module-demo/src/main/java/org/jeecg/modules/demo/notice/mapper/AppNoticeMapper.java → jeecg-module-demo/src/main/java/org/jeecg/modules/sysMiniapp/notice/mapper/AppNoticeMapper.java

@@ -1,9 +1,6 @@
-package org.jeecg.modules.demo.notice.mapper;
+package org.jeecg.modules.sysMiniapp.notice.mapper;
 
-import java.util.List;
-
-import org.apache.ibatis.annotations.Param;
-import org.jeecg.modules.demo.notice.entity.AppNotice;
+import org.jeecg.modules.sysMiniapp.notice.entity.AppNotice;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
 /**

jeecg-module-demo/src/main/java/org/jeecg/modules/demo/notice/mapper/xml/AppNoticeMapper.xml → jeecg-module-demo/src/main/java/org/jeecg/modules/sysMiniapp/notice/mapper/xml/AppNoticeMapper.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="org.jeecg.modules.demo.notice.mapper.AppNoticeMapper">
+<mapper namespace="org.jeecg.modules.sysMiniapp.notice.mapper.AppNoticeMapper">
 
-</mapper>
+</mapper>

jeecg-module-demo/src/main/java/org/jeecg/modules/demo/notice/service/IAppNoticeService.java → jeecg-module-demo/src/main/java/org/jeecg/modules/sysMiniapp/notice/service/IAppNoticeService.java

@@ -1,6 +1,6 @@
-package org.jeecg.modules.demo.notice.service;
+package org.jeecg.modules.sysMiniapp.notice.service;
 
-import org.jeecg.modules.demo.notice.entity.AppNotice;
+import org.jeecg.modules.sysMiniapp.notice.entity.AppNotice;
 import com.baomidou.mybatisplus.extension.service.IService;
 
 /**

jeecg-module-demo/src/main/java/org/jeecg/modules/demo/notice/service/impl/AppNoticeServiceImpl.java → jeecg-module-demo/src/main/java/org/jeecg/modules/sysMiniapp/notice/service/impl/AppNoticeServiceImpl.java

@@ -1,8 +1,8 @@
-package org.jeecg.modules.demo.notice.service.impl;
+package org.jeecg.modules.sysMiniapp.notice.service.impl;
 
-import org.jeecg.modules.demo.notice.entity.AppNotice;
-import org.jeecg.modules.demo.notice.mapper.AppNoticeMapper;
-import org.jeecg.modules.demo.notice.service.IAppNoticeService;
+import org.jeecg.modules.sysMiniapp.notice.entity.AppNotice;
+import org.jeecg.modules.sysMiniapp.notice.mapper.AppNoticeMapper;
+import org.jeecg.modules.sysMiniapp.notice.service.IAppNoticeService;
 import org.springframework.stereotype.Service;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;

jeecg-module-demo/src/main/java/org/jeecg/modules/demo/product/controller/AppProductController.java → jeecg-module-demo/src/main/java/org/jeecg/modules/sysMiniapp/product/controller/AppProductController.java

@@ -1,39 +1,22 @@
-package org.jeecg.modules.demo.product.controller;
+package org.jeecg.modules.sysMiniapp.product.controller;
 
 import java.util.Arrays;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.stream.Collectors;
-import java.io.IOException;
-import java.io.UnsupportedEncodingException;
-import java.net.URLDecoder;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import org.jeecg.common.api.vo.Result;
 import org.jeecg.common.system.query.QueryGenerator;
-import org.jeecg.common.system.query.QueryRuleEnum;
-import org.jeecg.common.util.oConvertUtils;
-import org.jeecg.modules.demo.product.entity.AppProduct;
-import org.jeecg.modules.demo.product.service.IAppProductService;
+import org.jeecg.modules.sysMiniapp.product.entity.AppProduct;
+import org.jeecg.modules.sysMiniapp.product.service.IAppProductService;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import lombok.extern.slf4j.Slf4j;
 
-import org.jeecgframework.poi.excel.ExcelImportUtil;
-import org.jeecgframework.poi.excel.def.NormalExcelConstants;
-import org.jeecgframework.poi.excel.entity.ExportParams;
-import org.jeecgframework.poi.excel.entity.ImportParams;
-import org.jeecgframework.poi.excel.view.JeecgEntityExcelView;
 import org.jeecg.common.system.base.controller.JeecgController;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
-import org.springframework.web.multipart.MultipartFile;
-import org.springframework.web.multipart.MultipartHttpServletRequest;
 import org.springframework.web.servlet.ModelAndView;
-import com.alibaba.fastjson.JSON;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.jeecg.common.aspect.annotation.AutoLog;
@@ -52,7 +35,7 @@ import org.apache.shiro.authz.annotation.RequiresPermissions;
 public class AppProductController extends JeecgController<AppProduct, IAppProductService> {
 	@Autowired
 	private IAppProductService appProductService;
-	
+
 	/**
 	 * 分页列表查询
 	 *
@@ -74,7 +57,7 @@ public class AppProductController extends JeecgController<AppProduct, IAppProduc
 		IPage<AppProduct> pageList = appProductService.page(page, queryWrapper);
 		return Result.OK(pageList);
 	}
-	
+
 	/**
 	 *   添加
 	 *
@@ -89,7 +72,7 @@ public class AppProductController extends JeecgController<AppProduct, IAppProduc
 		appProductService.save(appProduct);
 		return Result.OK("添加成功！");
 	}
-	
+
 	/**
 	 *  编辑
 	 *
@@ -104,7 +87,7 @@ public class AppProductController extends JeecgController<AppProduct, IAppProduc
 		appProductService.updateById(appProduct);
 		return Result.OK("编辑成功!");
 	}
-	
+
 	/**
 	 *   通过id删除
 	 *
@@ -119,7 +102,7 @@ public class AppProductController extends JeecgController<AppProduct, IAppProduc
 		appProductService.removeById(id);
 		return Result.OK("删除成功!");
 	}
-	
+
 	/**
 	 *  批量删除
 	 *
@@ -134,7 +117,7 @@ public class AppProductController extends JeecgController<AppProduct, IAppProduc
 		this.appProductService.removeByIds(Arrays.asList(ids.split(",")));
 		return Result.OK("批量删除成功!");
 	}
-	
+
 	/**
 	 * 通过id查询
 	 *

jeecg-module-demo/src/main/java/org/jeecg/modules/demo/product/entity/AppProduct.java → jeecg-module-demo/src/main/java/org/jeecg/modules/sysMiniapp/product/entity/AppProduct.java

@@ -1,20 +1,14 @@
-package org.jeecg.modules.demo.product.entity;
+package org.jeecg.modules.sysMiniapp.product.entity;
 
 import java.io.Serializable;
-import java.io.UnsupportedEncodingException;
-import java.util.Date;
-import java.math.BigDecimal;
+
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
-import com.baomidou.mybatisplus.annotation.TableLogic;
-import org.jeecg.common.constant.ProvinceCityArea;
-import org.jeecg.common.util.SpringContextUtils;
 import lombok.Data;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import org.springframework.format.annotation.DateTimeFormat;
 import org.jeecgframework.poi.excel.annotation.Excel;
-import org.jeecg.common.aspect.annotation.Dict;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.EqualsAndHashCode;

jeecg-module-demo/src/main/java/org/jeecg/modules/demo/product/mapper/AppProductMapper.java → jeecg-module-demo/src/main/java/org/jeecg/modules/sysMiniapp/product/mapper/AppProductMapper.java

@@ -1,9 +1,6 @@
-package org.jeecg.modules.demo.product.mapper;
+package org.jeecg.modules.sysMiniapp.product.mapper;
 
-import java.util.List;
-
-import org.apache.ibatis.annotations.Param;
-import org.jeecg.modules.demo.product.entity.AppProduct;
+import org.jeecg.modules.sysMiniapp.product.entity.AppProduct;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
 /**

jeecg-module-demo/src/main/java/org/jeecg/modules/demo/product/mapper/xml/AppProductMapper.xml → jeecg-module-demo/src/main/java/org/jeecg/modules/sysMiniapp/product/mapper/xml/AppProductMapper.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="org.jeecg.modules.demo.product.mapper.AppProductMapper">
+<mapper namespace="org.jeecg.modules.sysMiniapp.product.mapper.AppProductMapper">
 
-</mapper>
+</mapper>

jeecg-module-demo/src/main/java/org/jeecg/modules/demo/product/service/IAppProductService.java → jeecg-module-demo/src/main/java/org/jeecg/modules/sysMiniapp/product/service/IAppProductService.java

@@ -1,6 +1,6 @@
-package org.jeecg.modules.demo.product.service;
+package org.jeecg.modules.sysMiniapp.product.service;
 
-import org.jeecg.modules.demo.product.entity.AppProduct;
+import org.jeecg.modules.sysMiniapp.product.entity.AppProduct;
 import com.baomidou.mybatisplus.extension.service.IService;
 
 /**

jeecg-module-demo/src/main/java/org/jeecg/modules/demo/product/service/impl/AppProductServiceImpl.java → jeecg-module-demo/src/main/java/org/jeecg/modules/sysMiniapp/product/service/impl/AppProductServiceImpl.java

@@ -1,8 +1,8 @@
-package org.jeecg.modules.demo.product.service.impl;
+package org.jeecg.modules.sysMiniapp.product.service.impl;
 
-import org.jeecg.modules.demo.product.entity.AppProduct;
-import org.jeecg.modules.demo.product.mapper.AppProductMapper;
-import org.jeecg.modules.demo.product.service.IAppProductService;
+import org.jeecg.modules.sysMiniapp.product.entity.AppProduct;
+import org.jeecg.modules.sysMiniapp.product.mapper.AppProductMapper;
+import org.jeecg.modules.sysMiniapp.product.service.IAppProductService;
 import org.springframework.stereotype.Service;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;

jeecg-module-demo/src/main/java/org/jeecg/modules/demo/productCategory/controller/AppCategoryController.java → jeecg-module-demo/src/main/java/org/jeecg/modules/sysMiniapp/productCategory/controller/AppCategoryController.java

@@ -1,39 +1,22 @@
-package org.jeecg.modules.demo.productCategory.controller;
+package org.jeecg.modules.sysMiniapp.productCategory.controller;
 
 import java.util.Arrays;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.stream.Collectors;
-import java.io.IOException;
-import java.io.UnsupportedEncodingException;
-import java.net.URLDecoder;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import org.jeecg.common.api.vo.Result;
 import org.jeecg.common.system.query.QueryGenerator;
-import org.jeecg.common.system.query.QueryRuleEnum;
-import org.jeecg.common.util.oConvertUtils;
-import org.jeecg.modules.demo.productCategory.entity.AppCategory;
-import org.jeecg.modules.demo.productCategory.service.IAppCategoryService;
+import org.jeecg.modules.sysMiniapp.productCategory.entity.AppCategory;
+import org.jeecg.modules.sysMiniapp.productCategory.service.IAppCategoryService;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import lombok.extern.slf4j.Slf4j;
 
-import org.jeecgframework.poi.excel.ExcelImportUtil;
-import org.jeecgframework.poi.excel.def.NormalExcelConstants;
-import org.jeecgframework.poi.excel.entity.ExportParams;
-import org.jeecgframework.poi.excel.entity.ImportParams;
-import org.jeecgframework.poi.excel.view.JeecgEntityExcelView;
 import org.jeecg.common.system.base.controller.JeecgController;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
-import org.springframework.web.multipart.MultipartFile;
-import org.springframework.web.multipart.MultipartHttpServletRequest;
 import org.springframework.web.servlet.ModelAndView;
-import com.alibaba.fastjson.JSON;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.jeecg.common.aspect.annotation.AutoLog;
@@ -52,7 +35,7 @@ import org.apache.shiro.authz.annotation.RequiresPermissions;
 public class AppCategoryController extends JeecgController<AppCategory, IAppCategoryService> {
 	@Autowired
 	private IAppCategoryService appCategoryService;
-	
+
 	/**
 	 * 分页列表查询
 	 *
@@ -74,7 +57,7 @@ public class AppCategoryController extends JeecgController<AppCategory, IAppCate
 		IPage<AppCategory> pageList = appCategoryService.page(page, queryWrapper);
 		return Result.OK(pageList);
 	}
-	
+
 	/**
 	 *   添加
 	 *
@@ -89,7 +72,7 @@ public class AppCategoryController extends JeecgController<AppCategory, IAppCate
 		appCategoryService.save(appCategory);
 		return Result.OK("添加成功！");
 	}
-	
+
 	/**
 	 *  编辑
 	 *
@@ -104,7 +87,7 @@ public class AppCategoryController extends JeecgController<AppCategory, IAppCate
 		appCategoryService.updateById(appCategory);
 		return Result.OK("编辑成功!");
 	}
-	
+
 	/**
 	 *   通过id删除
 	 *
@@ -119,7 +102,7 @@ public class AppCategoryController extends JeecgController<AppCategory, IAppCate
 		appCategoryService.removeById(id);
 		return Result.OK("删除成功!");
 	}
-	
+
 	/**
 	 *  批量删除
 	 *
@@ -134,7 +117,7 @@ public class AppCategoryController extends JeecgController<AppCategory, IAppCate
 		this.appCategoryService.removeByIds(Arrays.asList(ids.split(",")));
 		return Result.OK("批量删除成功!");
 	}
-	
+
 	/**
 	 * 通过id查询
 	 *

jeecg-module-demo/src/main/java/org/jeecg/modules/demo/productCategory/entity/AppCategory.java → jeecg-module-demo/src/main/java/org/jeecg/modules/sysMiniapp/productCategory/entity/AppCategory.java

@@ -1,20 +1,14 @@
-package org.jeecg.modules.demo.productCategory.entity;
+package org.jeecg.modules.sysMiniapp.productCategory.entity;
 
 import java.io.Serializable;
-import java.io.UnsupportedEncodingException;
-import java.util.Date;
-import java.math.BigDecimal;
+
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
-import com.baomidou.mybatisplus.annotation.TableLogic;
-import org.jeecg.common.constant.ProvinceCityArea;
-import org.jeecg.common.util.SpringContextUtils;
 import lombok.Data;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import org.springframework.format.annotation.DateTimeFormat;
 import org.jeecgframework.poi.excel.annotation.Excel;
-import org.jeecg.common.aspect.annotation.Dict;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.EqualsAndHashCode;

jeecg-module-demo/src/main/java/org/jeecg/modules/demo/productCategory/mapper/AppCategoryMapper.java → jeecg-module-demo/src/main/java/org/jeecg/modules/sysMiniapp/productCategory/mapper/AppCategoryMapper.java

@@ -1,9 +1,6 @@
-package org.jeecg.modules.demo.productCategory.mapper;
+package org.jeecg.modules.sysMiniapp.productCategory.mapper;
 
-import java.util.List;
-
-import org.apache.ibatis.annotations.Param;
-import org.jeecg.modules.demo.productCategory.entity.AppCategory;
+import org.jeecg.modules.sysMiniapp.productCategory.entity.AppCategory;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
 /**

jeecg-module-demo/src/main/java/org/jeecg/modules/demo/productCategory/mapper/xml/AppCategoryMapper.xml → jeecg-module-demo/src/main/java/org/jeecg/modules/sysMiniapp/productCategory/mapper/xml/AppCategoryMapper.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="org.jeecg.modules.demo.productCategory.mapper.AppCategoryMapper">
+<mapper namespace="org.jeecg.modules.sysMiniapp.productCategory.mapper.AppCategoryMapper">
 
-</mapper>
+</mapper>

jeecg-module-demo/src/main/java/org/jeecg/modules/demo/productCategory/service/IAppCategoryService.java → jeecg-module-demo/src/main/java/org/jeecg/modules/sysMiniapp/productCategory/service/IAppCategoryService.java

@@ -1,6 +1,6 @@
-package org.jeecg.modules.demo.productCategory.service;
+package org.jeecg.modules.sysMiniapp.productCategory.service;
 
-import org.jeecg.modules.demo.productCategory.entity.AppCategory;
+import org.jeecg.modules.sysMiniapp.productCategory.entity.AppCategory;
 import com.baomidou.mybatisplus.extension.service.IService;
 
 /**

jeecg-module-demo/src/main/java/org/jeecg/modules/demo/productCategory/service/impl/AppCategoryServiceImpl.java → jeecg-module-demo/src/main/java/org/jeecg/modules/sysMiniapp/productCategory/service/impl/AppCategoryServiceImpl.java

@@ -1,8 +1,8 @@
-package org.jeecg.modules.demo.productCategory.service.impl;
+package org.jeecg.modules.sysMiniapp.productCategory.service.impl;
 
-import org.jeecg.modules.demo.productCategory.entity.AppCategory;
-import org.jeecg.modules.demo.productCategory.mapper.AppCategoryMapper;
-import org.jeecg.modules.demo.productCategory.service.IAppCategoryService;
+import org.jeecg.modules.sysMiniapp.productCategory.entity.AppCategory;
+import org.jeecg.modules.sysMiniapp.productCategory.mapper.AppCategoryMapper;
+import org.jeecg.modules.sysMiniapp.productCategory.service.IAppCategoryService;
 import org.springframework.stereotype.Service;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;

jeecg-module-demo/src/main/java/org/jeecg/modules/demo/productCategoryJoin/controller/AppProductCategoryJoinController.java → jeecg-module-demo/src/main/java/org/jeecg/modules/sysMiniapp/productCategoryJoin/controller/AppProductCategoryJoinController.java

@@ -1,39 +1,22 @@
-package org.jeecg.modules.demo.productCategoryJoin.controller;
+package org.jeecg.modules.sysMiniapp.productCategoryJoin.controller;
 
 import java.util.Arrays;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.stream.Collectors;
-import java.io.IOException;
-import java.io.UnsupportedEncodingException;
-import java.net.URLDecoder;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import org.jeecg.common.api.vo.Result;
 import org.jeecg.common.system.query.QueryGenerator;
-import org.jeecg.common.system.query.QueryRuleEnum;
-import org.jeecg.common.util.oConvertUtils;
-import org.jeecg.modules.demo.productCategoryJoin.entity.AppProductCategoryJoin;
-import org.jeecg.modules.demo.productCategoryJoin.service.IAppProductCategoryJoinService;
+import org.jeecg.modules.sysMiniapp.productCategoryJoin.entity.AppProductCategoryJoin;
+import org.jeecg.modules.sysMiniapp.productCategoryJoin.service.IAppProductCategoryJoinService;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import lombok.extern.slf4j.Slf4j;
 
-import org.jeecgframework.poi.excel.ExcelImportUtil;
-import org.jeecgframework.poi.excel.def.NormalExcelConstants;
-import org.jeecgframework.poi.excel.entity.ExportParams;
-import org.jeecgframework.poi.excel.entity.ImportParams;
-import org.jeecgframework.poi.excel.view.JeecgEntityExcelView;
 import org.jeecg.common.system.base.controller.JeecgController;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
-import org.springframework.web.multipart.MultipartFile;
-import org.springframework.web.multipart.MultipartHttpServletRequest;
 import org.springframework.web.servlet.ModelAndView;
-import com.alibaba.fastjson.JSON;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.jeecg.common.aspect.annotation.AutoLog;
@@ -52,7 +35,7 @@ import org.apache.shiro.authz.annotation.RequiresPermissions;
 public class AppProductCategoryJoinController extends JeecgController<AppProductCategoryJoin, IAppProductCategoryJoinService> {
 	@Autowired
 	private IAppProductCategoryJoinService appProductCategoryJoinService;
-	
+
 	/**
 	 * 分页列表查询
 	 *
@@ -74,7 +57,7 @@ public class AppProductCategoryJoinController extends JeecgController<AppProduct
 		IPage<AppProductCategoryJoin> pageList = appProductCategoryJoinService.page(page, queryWrapper);
 		return Result.OK(pageList);
 	}
-	
+
 	/**
 	 *   添加
 	 *
@@ -89,7 +72,7 @@ public class AppProductCategoryJoinController extends JeecgController<AppProduct
 		appProductCategoryJoinService.save(appProductCategoryJoin);
 		return Result.OK("添加成功！");
 	}
-	
+
 	/**
 	 *  编辑
 	 *
@@ -104,7 +87,7 @@ public class AppProductCategoryJoinController extends JeecgController<AppProduct
 		appProductCategoryJoinService.updateById(appProductCategoryJoin);
 		return Result.OK("编辑成功!");
 	}
-	
+
 	/**
 	 *   通过id删除
 	 *
@@ -119,7 +102,7 @@ public class AppProductCategoryJoinController extends JeecgController<AppProduct
 		appProductCategoryJoinService.removeById(id);
 		return Result.OK("删除成功!");
 	}
-	
+
 	/**
 	 *  批量删除
 	 *
@@ -134,7 +117,7 @@ public class AppProductCategoryJoinController extends JeecgController<AppProduct
 		this.appProductCategoryJoinService.removeByIds(Arrays.asList(ids.split(",")));
 		return Result.OK("批量删除成功!");
 	}
-	
+
 	/**
 	 * 通过id查询
 	 *

jeecg-module-demo/src/main/java/org/jeecg/modules/demo/productCategoryJoin/entity/AppProductCategoryJoin.java → jeecg-module-demo/src/main/java/org/jeecg/modules/sysMiniapp/productCategoryJoin/entity/AppProductCategoryJoin.java

@@ -1,20 +1,14 @@
-package org.jeecg.modules.demo.productCategoryJoin.entity;
+package org.jeecg.modules.sysMiniapp.productCategoryJoin.entity;
 
 import java.io.Serializable;
-import java.io.UnsupportedEncodingException;
-import java.util.Date;
-import java.math.BigDecimal;
+
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
-import com.baomidou.mybatisplus.annotation.TableLogic;
-import org.jeecg.common.constant.ProvinceCityArea;
-import org.jeecg.common.util.SpringContextUtils;
 import lombok.Data;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import org.springframework.format.annotation.DateTimeFormat;
 import org.jeecgframework.poi.excel.annotation.Excel;
-import org.jeecg.common.aspect.annotation.Dict;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.EqualsAndHashCode;

jeecg-module-demo/src/main/java/org/jeecg/modules/demo/productCategoryJoin/mapper/AppProductCategoryJoinMapper.java → jeecg-module-demo/src/main/java/org/jeecg/modules/sysMiniapp/productCategoryJoin/mapper/AppProductCategoryJoinMapper.java

@@ -1,9 +1,6 @@
-package org.jeecg.modules.demo.productCategoryJoin.mapper;
+package org.jeecg.modules.sysMiniapp.productCategoryJoin.mapper;
 
-import java.util.List;
-
-import org.apache.ibatis.annotations.Param;
-import org.jeecg.modules.demo.productCategoryJoin.entity.AppProductCategoryJoin;
+import org.jeecg.modules.sysMiniapp.productCategoryJoin.entity.AppProductCategoryJoin;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
 /**

jeecg-module-demo/src/main/java/org/jeecg/modules/demo/productCategoryJoin/mapper/xml/AppProductCategoryJoinMapper.xml → jeecg-module-demo/src/main/java/org/jeecg/modules/sysMiniapp/productCategoryJoin/mapper/xml/AppProductCategoryJoinMapper.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="org.jeecg.modules.demo.productCategoryJoin.mapper.AppProductCategoryJoinMapper">
+<mapper namespace="org.jeecg.modules.sysMiniapp.productCategoryJoin.mapper.AppProductCategoryJoinMapper">
 
-</mapper>
+</mapper>

jeecg-module-demo/src/main/java/org/jeecg/modules/demo/productCategoryJoin/service/IAppProductCategoryJoinService.java → jeecg-module-demo/src/main/java/org/jeecg/modules/sysMiniapp/productCategoryJoin/service/IAppProductCategoryJoinService.java

@@ -1,6 +1,6 @@
-package org.jeecg.modules.demo.productCategoryJoin.service;
+package org.jeecg.modules.sysMiniapp.productCategoryJoin.service;
 
-import org.jeecg.modules.demo.productCategoryJoin.entity.AppProductCategoryJoin;
+import org.jeecg.modules.sysMiniapp.productCategoryJoin.entity.AppProductCategoryJoin;
 import com.baomidou.mybatisplus.extension.service.IService;
 
 /**

jeecg-module-demo/src/main/java/org/jeecg/modules/demo/productCategoryJoin/service/impl/AppProductCategoryJoinServiceImpl.java → jeecg-module-demo/src/main/java/org/jeecg/modules/sysMiniapp/productCategoryJoin/service/impl/AppProductCategoryJoinServiceImpl.java

@@ -1,8 +1,8 @@
-package org.jeecg.modules.demo.productCategoryJoin.service.impl;
+package org.jeecg.modules.sysMiniapp.productCategoryJoin.service.impl;
 
-import org.jeecg.modules.demo.productCategoryJoin.entity.AppProductCategoryJoin;
-import org.jeecg.modules.demo.productCategoryJoin.mapper.AppProductCategoryJoinMapper;
-import org.jeecg.modules.demo.productCategoryJoin.service.IAppProductCategoryJoinService;
+import org.jeecg.modules.sysMiniapp.productCategoryJoin.entity.AppProductCategoryJoin;
+import org.jeecg.modules.sysMiniapp.productCategoryJoin.mapper.AppProductCategoryJoinMapper;
+import org.jeecg.modules.sysMiniapp.productCategoryJoin.service.IAppProductCategoryJoinService;
 import org.springframework.stereotype.Service;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;

jeecg-module-demo/src/main/java/org/jeecg/modules/demo/store/controller/AppStoreController.java → jeecg-module-demo/src/main/java/org/jeecg/modules/sysMiniapp/store/controller/AppStoreController.java

@@ -1,39 +1,25 @@
-package org.jeecg.modules.demo.store.controller;
+package org.jeecg.modules.sysMiniapp.store.controller;
 
 import java.util.Arrays;
 import java.util.HashMap;
-import java.util.List;
 import java.util.Map;
-import java.util.stream.Collectors;
-import java.io.IOException;
-import java.io.UnsupportedEncodingException;
-import java.net.URLDecoder;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import org.jeecg.common.api.vo.Result;
 import org.jeecg.common.system.query.QueryGenerator;
 import org.jeecg.common.system.query.QueryRuleEnum;
-import org.jeecg.common.util.oConvertUtils;
-import org.jeecg.modules.demo.store.entity.AppStore;
-import org.jeecg.modules.demo.store.service.IAppStoreService;
+import org.jeecg.modules.sysMiniapp.store.entity.AppStore;
+import org.jeecg.modules.sysMiniapp.store.service.IAppStoreService;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import lombok.extern.slf4j.Slf4j;
 
-import org.jeecgframework.poi.excel.ExcelImportUtil;
-import org.jeecgframework.poi.excel.def.NormalExcelConstants;
-import org.jeecgframework.poi.excel.entity.ExportParams;
-import org.jeecgframework.poi.excel.entity.ImportParams;
-import org.jeecgframework.poi.excel.view.JeecgEntityExcelView;
 import org.jeecg.common.system.base.controller.JeecgController;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
-import org.springframework.web.multipart.MultipartFile;
-import org.springframework.web.multipart.MultipartHttpServletRequest;
 import org.springframework.web.servlet.ModelAndView;
-import com.alibaba.fastjson.JSON;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.jeecg.common.aspect.annotation.AutoLog;
@@ -52,7 +38,7 @@ import org.apache.shiro.authz.annotation.RequiresPermissions;
 public class AppStoreController extends JeecgController<AppStore, IAppStoreService> {
 	@Autowired
 	private IAppStoreService appStoreService;
-	
+
 	/**
 	 * 分页列表查询
 	 *
@@ -78,7 +64,7 @@ public class AppStoreController extends JeecgController<AppStore, IAppStoreServi
 		IPage<AppStore> pageList = appStoreService.page(page, queryWrapper);
 		return Result.OK(pageList);
 	}
-	
+
 	/**
 	 *   添加
 	 *
@@ -93,7 +79,7 @@ public class AppStoreController extends JeecgController<AppStore, IAppStoreServi
 		appStoreService.save(appStore);
 		return Result.OK("添加成功！");
 	}
-	
+
 	/**
 	 *  编辑
 	 *
@@ -108,7 +94,7 @@ public class AppStoreController extends JeecgController<AppStore, IAppStoreServi
 		appStoreService.updateById(appStore);
 		return Result.OK("编辑成功!");
 	}
-	
+
 	/**
 	 *   通过id删除
 	 *
@@ -123,7 +109,7 @@ public class AppStoreController extends JeecgController<AppStore, IAppStoreServi
 		appStoreService.removeById(id);
 		return Result.OK("删除成功!");
 	}
-	
+
 	/**
 	 *  批量删除
 	 *
@@ -138,7 +124,7 @@ public class AppStoreController extends JeecgController<AppStore, IAppStoreServi
 		this.appStoreService.removeByIds(Arrays.asList(ids.split(",")));
 		return Result.OK("批量删除成功!");
 	}
-	
+
 	/**
 	 * 通过id查询
 	 *

jeecg-module-demo/src/main/java/org/jeecg/modules/demo/store/entity/AppStore.java → jeecg-module-demo/src/main/java/org/jeecg/modules/sysMiniapp/store/entity/AppStore.java

@@ -1,15 +1,10 @@
-package org.jeecg.modules.demo.store.entity;
+package org.jeecg.modules.sysMiniapp.store.entity;
 
 import java.io.Serializable;
-import java.io.UnsupportedEncodingException;
-import java.util.Date;
-import java.math.BigDecimal;
+
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
-import com.baomidou.mybatisplus.annotation.TableLogic;
-import org.jeecg.common.constant.ProvinceCityArea;
-import org.jeecg.common.util.SpringContextUtils;
 import lombok.Data;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import org.springframework.format.annotation.DateTimeFormat;

jeecg-module-demo/src/main/java/org/jeecg/modules/demo/store/mapper/AppStoreMapper.java → jeecg-module-demo/src/main/java/org/jeecg/modules/sysMiniapp/store/mapper/AppStoreMapper.java

@@ -1,9 +1,6 @@
-package org.jeecg.modules.demo.store.mapper;
+package org.jeecg.modules.sysMiniapp.store.mapper;
 
-import java.util.List;
-
-import org.apache.ibatis.annotations.Param;
-import org.jeecg.modules.demo.store.entity.AppStore;
+import org.jeecg.modules.sysMiniapp.store.entity.AppStore;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
 /**

jeecg-module-demo/src/main/java/org/jeecg/modules/demo/store/mapper/xml/AppStoreMapper.xml → jeecg-module-demo/src/main/java/org/jeecg/modules/sysMiniapp/store/mapper/xml/AppStoreMapper.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="org.jeecg.modules.demo.store.mapper.AppStoreMapper">
+<mapper namespace="org.jeecg.modules.sysMiniapp.store.mapper.AppStoreMapper">
 
-</mapper>
+</mapper>

jeecg-module-demo/src/main/java/org/jeecg/modules/demo/store/service/IAppStoreService.java → jeecg-module-demo/src/main/java/org/jeecg/modules/sysMiniapp/store/service/IAppStoreService.java

@@ -1,6 +1,6 @@
-package org.jeecg.modules.demo.store.service;
+package org.jeecg.modules.sysMiniapp.store.service;
 
-import org.jeecg.modules.demo.store.entity.AppStore;
+import org.jeecg.modules.sysMiniapp.store.entity.AppStore;
 import com.baomidou.mybatisplus.extension.service.IService;
 
 /**

jeecg-module-demo/src/main/java/org/jeecg/modules/demo/store/service/impl/AppStoreServiceImpl.java → jeecg-module-demo/src/main/java/org/jeecg/modules/sysMiniapp/store/service/impl/AppStoreServiceImpl.java

@@ -1,8 +1,8 @@
-package org.jeecg.modules.demo.store.service.impl;
+package org.jeecg.modules.sysMiniapp.store.service.impl;
 
-import org.jeecg.modules.demo.store.entity.AppStore;
-import org.jeecg.modules.demo.store.mapper.AppStoreMapper;
-import org.jeecg.modules.demo.store.service.IAppStoreService;
+import org.jeecg.modules.sysMiniapp.store.entity.AppStore;
+import org.jeecg.modules.sysMiniapp.store.mapper.AppStoreMapper;
+import org.jeecg.modules.sysMiniapp.store.service.IAppStoreService;
 import org.springframework.stereotype.Service;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;