修改编译错误

.gitignore

@@ -1,2 +1,3 @@
-/08.src/Xingxi/xingxi.iml
 /08.src/Xingxi/.idea/
+/08.src/Xingxi/xingxi.iml
+/08.src/Xingxi/xingxi-quartz/target/

08.src/Xingxi/xingxi-admin/src/main/java/com/xingxi/web/controller/system/SysConfigController.java

@@ -1,6 +1,7 @@
 package com.xingxi.web.controller.system;
 
 import java.util.List;
+
 import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
@@ -22,13 +23,12 @@ import com.xingxi.system.service.ISysConfigService;
 
 /**
  * 参数配置 信息操作处理
- * 
- * @author ruoyi
+ *
+ * @author xingxi
  */
 @Controller
 @RequestMapping("/system/config")
-public class SysConfigController extends BaseController
-{
+public class SysConfigController extends BaseController {
     private String prefix = "system/config";
 
     @Autowired
@@ -36,8 +36,7 @@ public class SysConfigController extends BaseController
 
     @RequiresPermissions("system:config:view")
     @GetMapping()
-    public String config()
-    {
+    public String config() {
         return prefix + "/config";
     }
 
@@ -47,8 +46,7 @@ public class SysConfigController extends BaseController
     @RequiresPermissions("system:config:list")
     @PostMapping("/list")
     @ResponseBody
-    public TableDataInfo list(SysConfig config)
-    {
+    public TableDataInfo list(SysConfig config) {
         startPage();
         List<SysConfig> list = configService.selectConfigList(config);
         return getDataTable(list);
@@ -58,8 +56,7 @@ public class SysConfigController extends BaseController
     @RequiresPermissions("system:config:export")
     @PostMapping("/export")
     @ResponseBody
-    public AjaxResult export(SysConfig config)
-    {
+    public AjaxResult export(SysConfig config) {
         List<SysConfig> list = configService.selectConfigList(config);
         ExcelUtil<SysConfig> util = new ExcelUtil<SysConfig>(SysConfig.class);
         return util.exportExcel(list, "参数数据");
@@ -69,8 +66,7 @@ public class SysConfigController extends BaseController
      * 新增参数配置
      */
     @GetMapping("/add")
-    public String add()
-    {
+    public String add() {
         return prefix + "/add";
     }
 
@@ -81,13 +77,11 @@ public class SysConfigController extends BaseController
     @Log(title = "参数管理", businessType = BusinessType.INSERT)
     @PostMapping("/add")
     @ResponseBody
-    public AjaxResult addSave(@Validated SysConfig config)
-    {
-        if (!configService.checkConfigKeyUnique(config))
-        {
+    public AjaxResult addSave(@Validated SysConfig config) {
+        if (!configService.checkConfigKeyUnique(config)) {
             return error("新增参数'" + config.getConfigName() + "'失败，参数键名已存在");
         }
-        config.setCreateBy(getLoginName());
+        config.setCreateUser(getLoginName());
         return toAjax(configService.insertConfig(config));
     }
 
@@ -96,8 +90,7 @@ public class SysConfigController extends BaseController
      */
     @RequiresPermissions("system:config:edit")
     @GetMapping("/edit/{configId}")
-    public String edit(@PathVariable("configId") Long configId, ModelMap mmap)
-    {
+    public String edit(@PathVariable("configId") Long configId, ModelMap mmap) {
         mmap.put("config", configService.selectConfigById(configId));
         return prefix + "/edit";
     }
@@ -109,13 +102,11 @@ public class SysConfigController extends BaseController
     @Log(title = "参数管理", businessType = BusinessType.UPDATE)
     @PostMapping("/edit")
     @ResponseBody
-    public AjaxResult editSave(@Validated SysConfig config)
-    {
-        if (!configService.checkConfigKeyUnique(config))
-        {
+    public AjaxResult editSave(@Validated SysConfig config) {
+        if (!configService.checkConfigKeyUnique(config)) {
             return error("修改参数'" + config.getConfigName() + "'失败，参数键名已存在");
         }
-        config.setUpdateBy(getLoginName());
+        config.setUpdateUser(getLoginName());
         return toAjax(configService.updateConfig(config));
     }
 
@@ -126,8 +117,7 @@ public class SysConfigController extends BaseController
     @Log(title = "参数管理", businessType = BusinessType.DELETE)
     @PostMapping("/remove")
     @ResponseBody
-    public AjaxResult remove(String ids)
-    {
+    public AjaxResult remove(String ids) {
         configService.deleteConfigByIds(ids);
         return success();
     }
@@ -139,8 +129,7 @@ public class SysConfigController extends BaseController
     @Log(title = "参数管理", businessType = BusinessType.CLEAN)
     @GetMapping("/refreshCache")
     @ResponseBody
-    public AjaxResult refreshCache()
-    {
+    public AjaxResult refreshCache() {
         configService.resetConfigCache();
         return success();
     }
@@ -150,8 +139,7 @@ public class SysConfigController extends BaseController
      */
     @PostMapping("/checkConfigKeyUnique")
     @ResponseBody
-    public boolean checkConfigKeyUnique(SysConfig config)
-    {
+    public boolean checkConfigKeyUnique(SysConfig config) {
         return configService.checkConfigKeyUnique(config);
     }
 }

08.src/Xingxi/xingxi-admin/src/main/java/com/xingxi/web/controller/system/SysDeptController.java

@@ -1,6 +1,7 @@
 package com.xingxi.web.controller.system;
 
 import java.util.List;
+
 import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
@@ -23,13 +24,12 @@ import com.xingxi.system.service.ISysDeptService;
 
 /**
  * 部门信息
- * 
- * @author ruoyi
+ *
+ * @author xingxi
  */
 @Controller
 @RequestMapping("/system/dept")
-public class SysDeptController extends BaseController
-{
+public class SysDeptController extends BaseController {
     private String prefix = "system/dept";
 
     @Autowired
@@ -37,16 +37,14 @@ public class SysDeptController extends BaseController
 
     @RequiresPermissions("system:dept:view")
     @GetMapping()
-    public String dept()
-    {
+    public String dept() {
         return prefix + "/dept";
     }
 
     @RequiresPermissions("system:dept:list")
     @PostMapping("/list")
     @ResponseBody
-    public List<SysDept> list(SysDept dept)
-    {
+    public List<SysDept> list(SysDept dept) {
         List<SysDept> deptList = deptService.selectDeptList(dept);
         return deptList;
     }
@@ -55,10 +53,8 @@ public class SysDeptController extends BaseController
      * 新增部门
      */
     @GetMapping("/add/{parentId}")
-    public String add(@PathVariable("parentId") Long parentId, ModelMap mmap)
-    {
-        if (!getSysUser().isAdmin())
-        {
+    public String add(@PathVariable("parentId") Long parentId, ModelMap mmap) {
+        if (!getSysUser().isAdmin()) {
             parentId = getSysUser().getDeptId();
         }
         mmap.put("dept", deptService.selectDeptById(parentId));
@@ -72,13 +68,11 @@ public class SysDeptController extends BaseController
     @RequiresPermissions("system:dept:add")
     @PostMapping("/add")
     @ResponseBody
-    public AjaxResult addSave(@Validated SysDept dept)
-    {
-        if (!deptService.checkDeptNameUnique(dept))
-        {
+    public AjaxResult addSave(@Validated SysDept dept) {
+        if (!deptService.checkDeptNameUnique(dept)) {
             return error("新增部门'" + dept.getDeptName() + "'失败，部门名称已存在");
         }
-        dept.setCreateBy(getLoginName());
+        dept.setCreateUser(getLoginName());
         return toAjax(deptService.insertDept(dept));
     }
 
@@ -87,12 +81,10 @@ public class SysDeptController extends BaseController
      */
     @RequiresPermissions("system:dept:edit")
     @GetMapping("/edit/{deptId}")
-    public String edit(@PathVariable("deptId") Long deptId, ModelMap mmap)
-    {
+    public String edit(@PathVariable("deptId") Long deptId, ModelMap mmap) {
         deptService.checkDeptDataScope(deptId);
         SysDept dept = deptService.selectDeptById(deptId);
-        if (StringUtils.isNotNull(dept) && 100L == deptId)
-        {
+        if (StringUtils.isNotNull(dept) && 100L == deptId) {
             dept.setParentName("无");
         }
         mmap.put("dept", dept);
@@ -106,23 +98,17 @@ public class SysDeptController extends BaseController
     @RequiresPermissions("system:dept:edit")
     @PostMapping("/edit")
     @ResponseBody
-    public AjaxResult editSave(@Validated SysDept dept)
-    {
+    public AjaxResult editSave(@Validated SysDept dept) {
         Long deptId = dept.getDeptId();
         deptService.checkDeptDataScope(deptId);
-        if (!deptService.checkDeptNameUnique(dept))
-        {
+        if (!deptService.checkDeptNameUnique(dept)) {
             return error("修改部门'" + dept.getDeptName() + "'失败，部门名称已存在");
-        }
-        else if (dept.getParentId().equals(deptId))
-        {
+        } else if (dept.getParentId().equals(deptId)) {
             return error("修改部门'" + dept.getDeptName() + "'失败，上级部门不能是自己");
-        }
-        else if (StringUtils.equals(UserConstants.DEPT_DISABLE, dept.getStatus()) && deptService.selectNormalChildrenDeptById(deptId) > 0)
-        {
+        } else if (StringUtils.equals(UserConstants.DEPT_DISABLE, dept.getStatus()) && deptService.selectNormalChildrenDeptById(deptId) > 0) {
             return AjaxResult.error("该部门包含未停用的子部门！");
         }
-        dept.setUpdateBy(getLoginName());
+        dept.setUpdateUser(getLoginName());
         return toAjax(deptService.updateDept(dept));
     }
 
@@ -133,14 +119,11 @@ public class SysDeptController extends BaseController
     @RequiresPermissions("system:dept:remove")
     @GetMapping("/remove/{deptId}")
     @ResponseBody
-    public AjaxResult remove(@PathVariable("deptId") Long deptId)
-    {
-        if (deptService.selectDeptCount(deptId) > 0)
-        {
+    public AjaxResult remove(@PathVariable("deptId") Long deptId) {
+        if (deptService.selectDeptCount(deptId) > 0) {
             return AjaxResult.warn("存在下级部门,不允许删除");
         }
-        if (deptService.checkDeptExistUser(deptId))
-        {
+        if (deptService.checkDeptExistUser(deptId)) {
             return AjaxResult.warn("部门存在用户,不允许删除");
         }
         deptService.checkDeptDataScope(deptId);
@@ -152,21 +135,19 @@ public class SysDeptController extends BaseController
      */
     @PostMapping("/checkDeptNameUnique")
     @ResponseBody
-    public boolean checkDeptNameUnique(SysDept dept)
-    {
+    public boolean checkDeptNameUnique(SysDept dept) {
         return deptService.checkDeptNameUnique(dept);
     }
 
     /**
      * 选择部门树
-     * 
-     * @param deptId 部门ID
+     *
+     * @param deptId    部门ID
      * @param excludeId 排除ID
      */
-    @GetMapping(value = { "/selectDeptTree/{deptId}", "/selectDeptTree/{deptId}/{excludeId}" })
+    @GetMapping(value = {"/selectDeptTree/{deptId}", "/selectDeptTree/{deptId}/{excludeId}"})
     public String selectDeptTree(@PathVariable("deptId") Long deptId,
-            @PathVariable(value = "excludeId", required = false) Long excludeId, ModelMap mmap)
-    {
+                                 @PathVariable(value = "excludeId", required = false) Long excludeId, ModelMap mmap) {
         mmap.put("dept", deptService.selectDeptById(deptId));
         mmap.put("excludeId", excludeId);
         return prefix + "/tree";
@@ -177,8 +158,7 @@ public class SysDeptController extends BaseController
      */
     @GetMapping("/treeData/{excludeId}")
     @ResponseBody
-    public List<Ztree> treeDataExcludeChild(@PathVariable(value = "excludeId", required = false) Long excludeId)
-    {
+    public List<Ztree> treeDataExcludeChild(@PathVariable(value = "excludeId", required = false) Long excludeId) {
         SysDept dept = new SysDept();
         dept.setExcludeId(excludeId);
         List<Ztree> ztrees = deptService.selectDeptTreeExcludeChild(dept);

08.src/Xingxi/xingxi-admin/src/main/java/com/xingxi/web/controller/system/SysDictDataController.java

@@ -1,6 +1,7 @@
 package com.xingxi.web.controller.system;
 
 import java.util.List;
+
 import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
@@ -22,13 +23,12 @@ import com.xingxi.system.service.ISysDictDataService;
 
 /**
  * 数据字典信息
- * 
- * @author ruoyi
+ *
+ * @author xingxi
  */
 @Controller
 @RequestMapping("/system/dict/data")
-public class SysDictDataController extends BaseController
-{
+public class SysDictDataController extends BaseController {
     private String prefix = "system/dict/data";
 
     @Autowired
@@ -36,16 +36,14 @@ public class SysDictDataController extends BaseController
 
     @RequiresPermissions("system:dict:view")
     @GetMapping()
-    public String dictData()
-    {
+    public String dictData() {
         return prefix + "/data";
     }
 
     @PostMapping("/list")
     @RequiresPermissions("system:dict:list")
     @ResponseBody
-    public TableDataInfo list(SysDictData dictData)
-    {
+    public TableDataInfo list(SysDictData dictData) {
         startPage();
         List<SysDictData> list = dictDataService.selectDictDataList(dictData);
         return getDataTable(list);
@@ -55,8 +53,7 @@ public class SysDictDataController extends BaseController
     @RequiresPermissions("system:dict:export")
     @PostMapping("/export")
     @ResponseBody
-    public AjaxResult export(SysDictData dictData)
-    {
+    public AjaxResult export(SysDictData dictData) {
         List<SysDictData> list = dictDataService.selectDictDataList(dictData);
         ExcelUtil<SysDictData> util = new ExcelUtil<SysDictData>(SysDictData.class);
         return util.exportExcel(list, "字典数据");
@@ -66,8 +63,7 @@ public class SysDictDataController extends BaseController
      * 新增字典类型
      */
     @GetMapping("/add/{dictType}")
-    public String add(@PathVariable("dictType") String dictType, ModelMap mmap)
-    {
+    public String add(@PathVariable("dictType") String dictType, ModelMap mmap) {
         mmap.put("dictType", dictType);
         return prefix + "/add";
     }
@@ -79,9 +75,8 @@ public class SysDictDataController extends BaseController
     @RequiresPermissions("system:dict:add")
     @PostMapping("/add")
     @ResponseBody
-    public AjaxResult addSave(@Validated SysDictData dict)
-    {
-        dict.setCreateBy(getLoginName());
+    public AjaxResult addSave(@Validated SysDictData dict) {
+        dict.setCreateUser(getLoginName());
         return toAjax(dictDataService.insertDictData(dict));
     }
 
@@ -90,8 +85,7 @@ public class SysDictDataController extends BaseController
      */
     @RequiresPermissions("system:dict:edit")
     @GetMapping("/edit/{dictCode}")
-    public String edit(@PathVariable("dictCode") Long dictCode, ModelMap mmap)
-    {
+    public String edit(@PathVariable("dictCode") Long dictCode, ModelMap mmap) {
         mmap.put("dict", dictDataService.selectDictDataById(dictCode));
         return prefix + "/edit";
     }
@@ -103,9 +97,8 @@ public class SysDictDataController extends BaseController
     @RequiresPermissions("system:dict:edit")
     @PostMapping("/edit")
     @ResponseBody
-    public AjaxResult editSave(@Validated SysDictData dict)
-    {
-        dict.setUpdateBy(getLoginName());
+    public AjaxResult editSave(@Validated SysDictData dict) {
+        dict.setUpdateUser(getLoginName());
         return toAjax(dictDataService.updateDictData(dict));
     }
 
@@ -113,8 +106,7 @@ public class SysDictDataController extends BaseController
     @RequiresPermissions("system:dict:remove")
     @PostMapping("/remove")
     @ResponseBody
-    public AjaxResult remove(String ids)
-    {
+    public AjaxResult remove(String ids) {
         dictDataService.deleteDictDataByIds(ids);
         return success();
     }

08.src/Xingxi/xingxi-admin/src/main/java/com/xingxi/web/controller/system/SysDictTypeController.java

@@ -1,6 +1,7 @@
 package com.xingxi.web.controller.system;
 
 import java.util.List;
+
 import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
@@ -23,13 +24,12 @@ import com.xingxi.system.service.ISysDictTypeService;
 
 /**
  * 数据字典信息
- * 
- * @author ruoyi
+ *
+ * @author xingxi
  */
 @Controller
 @RequestMapping("/system/dict")
-public class SysDictTypeController extends BaseController
-{
+public class SysDictTypeController extends BaseController {
     private String prefix = "system/dict/type";
 
     @Autowired
@@ -37,16 +37,14 @@ public class SysDictTypeController extends BaseController
 
     @RequiresPermissions("system:dict:view")
     @GetMapping()
-    public String dictType()
-    {
+    public String dictType() {
         return prefix + "/type";
     }
 
     @PostMapping("/list")
     @RequiresPermissions("system:dict:list")
     @ResponseBody
-    public TableDataInfo list(SysDictType dictType)
-    {
+    public TableDataInfo list(SysDictType dictType) {
         startPage();
         List<SysDictType> list = dictTypeService.selectDictTypeList(dictType);
         return getDataTable(list);
@@ -56,8 +54,7 @@ public class SysDictTypeController extends BaseController
     @RequiresPermissions("system:dict:export")
     @PostMapping("/export")
     @ResponseBody
-    public AjaxResult export(SysDictType dictType)
-    {
+    public AjaxResult export(SysDictType dictType) {
 
         List<SysDictType> list = dictTypeService.selectDictTypeList(dictType);
         ExcelUtil<SysDictType> util = new ExcelUtil<SysDictType>(SysDictType.class);
@@ -68,8 +65,7 @@ public class SysDictTypeController extends BaseController
      * 新增字典类型
      */
     @GetMapping("/add")
-    public String add()
-    {
+    public String add() {
         return prefix + "/add";
     }
 
@@ -80,13 +76,11 @@ public class SysDictTypeController extends BaseController
     @RequiresPermissions("system:dict:add")
     @PostMapping("/add")
     @ResponseBody
-    public AjaxResult addSave(@Validated SysDictType dict)
-    {
-        if (!dictTypeService.checkDictTypeUnique(dict))
-        {
+    public AjaxResult addSave(@Validated SysDictType dict) {
+        if (!dictTypeService.checkDictTypeUnique(dict)) {
             return error("新增字典'" + dict.getDictName() + "'失败，字典类型已存在");
         }
-        dict.setCreateBy(getLoginName());
+        dict.setCreateUser(getLoginName());
         return toAjax(dictTypeService.insertDictType(dict));
     }
 
@@ -95,8 +89,7 @@ public class SysDictTypeController extends BaseController
      */
     @RequiresPermissions("system:dict:edit")
     @GetMapping("/edit/{dictId}")
-    public String edit(@PathVariable("dictId") Long dictId, ModelMap mmap)
-    {
+    public String edit(@PathVariable("dictId") Long dictId, ModelMap mmap) {
         mmap.put("dict", dictTypeService.selectDictTypeById(dictId));
         return prefix + "/edit";
     }
@@ -108,13 +101,11 @@ public class SysDictTypeController extends BaseController
     @RequiresPermissions("system:dict:edit")
     @PostMapping("/edit")
     @ResponseBody
-    public AjaxResult editSave(@Validated SysDictType dict)
-    {
-        if (!dictTypeService.checkDictTypeUnique(dict))
-        {
+    public AjaxResult editSave(@Validated SysDictType dict) {
+        if (!dictTypeService.checkDictTypeUnique(dict)) {
             return error("修改字典'" + dict.getDictName() + "'失败，字典类型已存在");
         }
-        dict.setUpdateBy(getLoginName());
+        dict.setUpdateUser(getLoginName());
         return toAjax(dictTypeService.updateDictType(dict));
     }
 
@@ -122,8 +113,7 @@ public class SysDictTypeController extends BaseController
     @RequiresPermissions("system:dict:remove")
     @PostMapping("/remove")
     @ResponseBody
-    public AjaxResult remove(String ids)
-    {
+    public AjaxResult remove(String ids) {
         dictTypeService.deleteDictTypeByIds(ids);
         return success();
     }
@@ -135,8 +125,7 @@ public class SysDictTypeController extends BaseController
     @Log(title = "字典类型", businessType = BusinessType.CLEAN)
     @GetMapping("/refreshCache")
     @ResponseBody
-    public AjaxResult refreshCache()
-    {
+    public AjaxResult refreshCache() {
         dictTypeService.resetDictCache();
         return success();
     }
@@ -146,8 +135,7 @@ public class SysDictTypeController extends BaseController
      */
     @RequiresPermissions("system:dict:list")
     @GetMapping("/detail/{dictId}")
-    public String detail(@PathVariable("dictId") Long dictId, ModelMap mmap)
-    {
+    public String detail(@PathVariable("dictId") Long dictId, ModelMap mmap) {
         mmap.put("dict", dictTypeService.selectDictTypeById(dictId));
         mmap.put("dictList", dictTypeService.selectDictTypeAll());
         return "system/dict/data/data";
@@ -158,8 +146,7 @@ public class SysDictTypeController extends BaseController
      */
     @PostMapping("/checkDictTypeUnique")
     @ResponseBody
-    public boolean checkDictTypeUnique(SysDictType dictType)
-    {
+    public boolean checkDictTypeUnique(SysDictType dictType) {
         return dictTypeService.checkDictTypeUnique(dictType);
     }
 
@@ -168,8 +155,7 @@ public class SysDictTypeController extends BaseController
      */
     @GetMapping("/selectDictTree/{columnId}/{dictType}")
     public String selectDeptTree(@PathVariable("columnId") Long columnId, @PathVariable("dictType") String dictType,
-            ModelMap mmap)
-    {
+                                 ModelMap mmap) {
         mmap.put("columnId", columnId);
         mmap.put("dict", dictTypeService.selectDictTypeByType(dictType));
         return prefix + "/tree";
@@ -180,8 +166,7 @@ public class SysDictTypeController extends BaseController
      */
     @GetMapping("/treeData")
     @ResponseBody
-    public List<Ztree> treeData()
-    {
+    public List<Ztree> treeData() {
         List<Ztree> ztrees = dictTypeService.selectDictTree(new SysDictType());
         return ztrees;
     }

08.src/Xingxi/xingxi-admin/src/main/java/com/xingxi/web/controller/system/SysMenuController.java

@@ -1,6 +1,7 @@
 package com.xingxi.web.controller.system;
 
 import java.util.List;
+
 import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
@@ -24,13 +25,12 @@ import com.xingxi.system.service.ISysMenuService;
 
 /**
  * 菜单信息
- * 
- * @author ruoyi
+ *
+ * @author xingxi
  */
 @Controller
 @RequestMapping("/system/menu")
-public class SysMenuController extends BaseController
-{
+public class SysMenuController extends BaseController {
     private String prefix = "system/menu";
 
     @Autowired
@@ -38,16 +38,14 @@ public class SysMenuController extends BaseController
 
     @RequiresPermissions("system:menu:view")
     @GetMapping()
-    public String menu()
-    {
+    public String menu() {
         return prefix + "/menu";
     }
 
     @RequiresPermissions("system:menu:list")
     @PostMapping("/list")
     @ResponseBody
-    public List<SysMenu> list(SysMenu menu)
-    {
+    public List<SysMenu> list(SysMenu menu) {
         Long userId = ShiroUtils.getUserId();
         List<SysMenu> menuList = menuService.selectMenuList(menu, userId);
         return menuList;
@@ -60,14 +58,11 @@ public class SysMenuController extends BaseController
     @RequiresPermissions("system:menu:remove")
     @GetMapping("/remove/{menuId}")
     @ResponseBody
-    public AjaxResult remove(@PathVariable("menuId") Long menuId)
-    {
-        if (menuService.selectCountMenuByParentId(menuId) > 0)
-        {
+    public AjaxResult remove(@PathVariable("menuId") Long menuId) {
+        if (menuService.selectCountMenuByParentId(menuId) > 0) {
             return AjaxResult.warn("存在子菜单,不允许删除");
         }
-        if (menuService.selectCountRoleMenuByMenuId(menuId) > 0)
-        {
+        if (menuService.selectCountRoleMenuByMenuId(menuId) > 0) {
             return AjaxResult.warn("菜单已分配,不允许删除");
         }
         AuthorizationUtils.clearAllCachedAuthorizationInfo();
@@ -78,15 +73,11 @@ public class SysMenuController extends BaseController
      * 新增
      */
     @GetMapping("/add/{parentId}")
-    public String add(@PathVariable("parentId") Long parentId, ModelMap mmap)
-    {
+    public String add(@PathVariable("parentId") Long parentId, ModelMap mmap) {
         SysMenu menu = null;
-        if (0L != parentId)
-        {
+        if (0L != parentId) {
             menu = menuService.selectMenuById(parentId);
-        }
-        else
-        {
+        } else {
             menu = new SysMenu();
             menu.setMenuId(0L);
             menu.setMenuName("主目录");
@@ -102,13 +93,11 @@ public class SysMenuController extends BaseController
     @RequiresPermissions("system:menu:add")
     @PostMapping("/add")
     @ResponseBody
-    public AjaxResult addSave(@Validated SysMenu menu)
-    {
-        if (!menuService.checkMenuNameUnique(menu))
-        {
+    public AjaxResult addSave(@Validated SysMenu menu) {
+        if (!menuService.checkMenuNameUnique(menu)) {
             return error("新增菜单'" + menu.getMenuName() + "'失败，菜单名称已存在");
         }
-        menu.setCreateBy(getLoginName());
+        menu.setCreateUser(getLoginName());
         AuthorizationUtils.clearAllCachedAuthorizationInfo();
         return toAjax(menuService.insertMenu(menu));
     }
@@ -118,8 +107,7 @@ public class SysMenuController extends BaseController
      */
     @RequiresPermissions("system:menu:edit")
     @GetMapping("/edit/{menuId}")
-    public String edit(@PathVariable("menuId") Long menuId, ModelMap mmap)
-    {
+    public String edit(@PathVariable("menuId") Long menuId, ModelMap mmap) {
         mmap.put("menu", menuService.selectMenuById(menuId));
         return prefix + "/edit";
     }
@@ -131,13 +119,11 @@ public class SysMenuController extends BaseController
     @RequiresPermissions("system:menu:edit")
     @PostMapping("/edit")
     @ResponseBody
-    public AjaxResult editSave(@Validated SysMenu menu)
-    {
-        if (!menuService.checkMenuNameUnique(menu))
-        {
+    public AjaxResult editSave(@Validated SysMenu menu) {
+        if (!menuService.checkMenuNameUnique(menu)) {
             return error("修改菜单'" + menu.getMenuName() + "'失败，菜单名称已存在");
         }
-        menu.setUpdateBy(getLoginName());
+        menu.setUpdateUser(getLoginName());
         AuthorizationUtils.clearAllCachedAuthorizationInfo();
         return toAjax(menuService.updateMenu(menu));
     }
@@ -146,8 +132,7 @@ public class SysMenuController extends BaseController
      * 选择菜单图标
      */
     @GetMapping("/icon")
-    public String icon()
-    {
+    public String icon() {
         return prefix + "/icon";
     }
 
@@ -156,8 +141,7 @@ public class SysMenuController extends BaseController
      */
     @PostMapping("/checkMenuNameUnique")
     @ResponseBody
-    public boolean checkMenuNameUnique(SysMenu menu)
-    {
+    public boolean checkMenuNameUnique(SysMenu menu) {
         return menuService.checkMenuNameUnique(menu);
     }
 
@@ -166,8 +150,7 @@ public class SysMenuController extends BaseController
      */
     @GetMapping("/roleMenuTreeData")
     @ResponseBody
-    public List<Ztree> roleMenuTreeData(SysRole role)
-    {
+    public List<Ztree> roleMenuTreeData(SysRole role) {
         Long userId = ShiroUtils.getUserId();
         List<Ztree> ztrees = menuService.roleMenuTreeData(role, userId);
         return ztrees;
@@ -178,8 +161,7 @@ public class SysMenuController extends BaseController
      */
     @GetMapping("/menuTreeData")
     @ResponseBody
-    public List<Ztree> menuTreeData()
-    {
+    public List<Ztree> menuTreeData() {
         Long userId = ShiroUtils.getUserId();
         List<Ztree> ztrees = menuService.menuTreeData(userId);
         return ztrees;
@@ -189,8 +171,7 @@ public class SysMenuController extends BaseController
      * 选择菜单树
      */
     @GetMapping("/selectMenuTree/{menuId}")
-    public String selectMenuTree(@PathVariable("menuId") Long menuId, ModelMap mmap)
-    {
+    public String selectMenuTree(@PathVariable("menuId") Long menuId, ModelMap mmap) {
         mmap.put("menu", menuService.selectMenuById(menuId));
         return prefix + "/tree";
     }

08.src/Xingxi/xingxi-admin/src/main/java/com/xingxi/web/controller/system/SysNoticeController.java

@@ -1,6 +1,7 @@
 package com.xingxi.web.controller.system;
 
 import java.util.List;
+
 import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
@@ -21,13 +22,12 @@ import com.xingxi.system.service.ISysNoticeService;
 
 /**
  * 公告 信息操作处理
- * 
- * @author ruoyi
+ *
+ * @author xingxi
  */
 @Controller
 @RequestMapping("/system/notice")
-public class SysNoticeController extends BaseController
-{
+public class SysNoticeController extends BaseController {
     private String prefix = "system/notice";
 
     @Autowired
@@ -35,8 +35,7 @@ public class SysNoticeController extends BaseController
 
     @RequiresPermissions("system:notice:view")
     @GetMapping()
-    public String notice()
-    {
+    public String notice() {
         return prefix + "/notice";
     }
 
@@ -46,8 +45,7 @@ public class SysNoticeController extends BaseController
     @RequiresPermissions("system:notice:list")
     @PostMapping("/list")
     @ResponseBody
-    public TableDataInfo list(SysNotice notice)
-    {
+    public TableDataInfo list(SysNotice notice) {
         startPage();
         List<SysNotice> list = noticeService.selectNoticeList(notice);
         return getDataTable(list);
@@ -57,8 +55,7 @@ public class SysNoticeController extends BaseController
      * 新增公告
      */
     @GetMapping("/add")
-    public String add()
-    {
+    public String add() {
         return prefix + "/add";
     }
 
@@ -69,9 +66,8 @@ public class SysNoticeController extends BaseController
     @Log(title = "通知公告", businessType = BusinessType.INSERT)
     @PostMapping("/add")
     @ResponseBody
-    public AjaxResult addSave(@Validated SysNotice notice)
-    {
-        notice.setCreateBy(getLoginName());
+    public AjaxResult addSave(@Validated SysNotice notice) {
+        notice.setCreateUser(getLoginName());
         return toAjax(noticeService.insertNotice(notice));
     }
 
@@ -80,8 +76,7 @@ public class SysNoticeController extends BaseController
      */
     @RequiresPermissions("system:notice:edit")
     @GetMapping("/edit/{noticeId}")
-    public String edit(@PathVariable("noticeId") Long noticeId, ModelMap mmap)
-    {
+    public String edit(@PathVariable("noticeId") Long noticeId, ModelMap mmap) {
         mmap.put("notice", noticeService.selectNoticeById(noticeId));
         return prefix + "/edit";
     }
@@ -93,9 +88,8 @@ public class SysNoticeController extends BaseController
     @Log(title = "通知公告", businessType = BusinessType.UPDATE)
     @PostMapping("/edit")
     @ResponseBody
-    public AjaxResult editSave(@Validated SysNotice notice)
-    {
-        notice.setUpdateBy(getLoginName());
+    public AjaxResult editSave(@Validated SysNotice notice) {
+        notice.setUpdateUser(getLoginName());
         return toAjax(noticeService.updateNotice(notice));
     }
 
@@ -104,8 +98,7 @@ public class SysNoticeController extends BaseController
      */
     @RequiresPermissions("system:notice:list")
     @GetMapping("/view/{noticeId}")
-    public String view(@PathVariable("noticeId") Long noticeId, ModelMap mmap)
-    {
+    public String view(@PathVariable("noticeId") Long noticeId, ModelMap mmap) {
         mmap.put("notice", noticeService.selectNoticeById(noticeId));
         return prefix + "/view";
     }
@@ -117,8 +110,7 @@ public class SysNoticeController extends BaseController
     @Log(title = "通知公告", businessType = BusinessType.DELETE)
     @PostMapping("/remove")
     @ResponseBody
-    public AjaxResult remove(String ids)
-    {
+    public AjaxResult remove(String ids) {
         return toAjax(noticeService.deleteNoticeByIds(ids));
     }
 }

08.src/Xingxi/xingxi-admin/src/main/java/com/xingxi/web/controller/system/SysPostController.java

@@ -1,6 +1,7 @@
 package com.xingxi.web.controller.system;
 
 import java.util.List;
+
 import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
@@ -22,13 +23,12 @@ import com.xingxi.system.service.ISysPostService;
 
 /**
  * 岗位信息操作处理
- * 
- * @author ruoyi
+ *
+ * @author xingxi
  */
 @Controller
 @RequestMapping("/system/post")
-public class SysPostController extends BaseController
-{
+public class SysPostController extends BaseController {
     private String prefix = "system/post";
 
     @Autowired
@@ -36,16 +36,14 @@ public class SysPostController extends BaseController
 
     @RequiresPermissions("system:post:view")
     @GetMapping()
-    public String operlog()
-    {
+    public String operlog() {
         return prefix + "/post";
     }
 
     @RequiresPermissions("system:post:list")
     @PostMapping("/list")
     @ResponseBody
-    public TableDataInfo list(SysPost post)
-    {
+    public TableDataInfo list(SysPost post) {
         startPage();
         List<SysPost> list = postService.selectPostList(post);
         return getDataTable(list);
@@ -55,8 +53,7 @@ public class SysPostController extends BaseController
     @RequiresPermissions("system:post:export")
     @PostMapping("/export")
     @ResponseBody
-    public AjaxResult export(SysPost post)
-    {
+    public AjaxResult export(SysPost post) {
         List<SysPost> list = postService.selectPostList(post);
         ExcelUtil<SysPost> util = new ExcelUtil<SysPost>(SysPost.class);
         return util.exportExcel(list, "岗位数据");
@@ -66,14 +63,10 @@ public class SysPostController extends BaseController
     @Log(title = "岗位管理", businessType = BusinessType.DELETE)
     @PostMapping("/remove")
     @ResponseBody
-    public AjaxResult remove(String ids)
-    {
-        try
-        {
+    public AjaxResult remove(String ids) {
+        try {
             return toAjax(postService.deletePostByIds(ids));
-        }
-        catch (Exception e)
-        {
+        } catch (Exception e) {
             return error(e.getMessage());
         }
     }
@@ -82,8 +75,7 @@ public class SysPostController extends BaseController
      * 新增岗位
      */
     @GetMapping("/add")
-    public String add()
-    {
+    public String add() {
         return prefix + "/add";
     }
 
@@ -94,17 +86,13 @@ public class SysPostController extends BaseController
     @Log(title = "岗位管理", businessType = BusinessType.INSERT)
     @PostMapping("/add")
     @ResponseBody
-    public AjaxResult addSave(@Validated SysPost post)
-    {
-        if (!postService.checkPostNameUnique(post))
-        {
+    public AjaxResult addSave(@Validated SysPost post) {
+        if (!postService.checkPostNameUnique(post)) {
             return error("新增岗位'" + post.getPostName() + "'失败，岗位名称已存在");
-        }
-        else if (!postService.checkPostCodeUnique(post))
-        {
+        } else if (!postService.checkPostCodeUnique(post)) {
             return error("新增岗位'" + post.getPostName() + "'失败，岗位编码已存在");
         }
-        post.setCreateBy(getLoginName());
+        post.setCreateUser(getLoginName());
         return toAjax(postService.insertPost(post));
     }
 
@@ -113,8 +101,7 @@ public class SysPostController extends BaseController
      */
     @RequiresPermissions("system:post:edit")
     @GetMapping("/edit/{postId}")
-    public String edit(@PathVariable("postId") Long postId, ModelMap mmap)
-    {
+    public String edit(@PathVariable("postId") Long postId, ModelMap mmap) {
         mmap.put("post", postService.selectPostById(postId));
         return prefix + "/edit";
     }
@@ -126,17 +113,13 @@ public class SysPostController extends BaseController
     @Log(title = "岗位管理", businessType = BusinessType.UPDATE)
     @PostMapping("/edit")
     @ResponseBody
-    public AjaxResult editSave(@Validated SysPost post)
-    {
-        if (!postService.checkPostNameUnique(post))
-        {
+    public AjaxResult editSave(@Validated SysPost post) {
+        if (!postService.checkPostNameUnique(post)) {
             return error("修改岗位'" + post.getPostName() + "'失败，岗位名称已存在");
-        }
-        else if (!postService.checkPostCodeUnique(post))
-        {
+        } else if (!postService.checkPostCodeUnique(post)) {
             return error("修改岗位'" + post.getPostName() + "'失败，岗位编码已存在");
         }
-        post.setUpdateBy(getLoginName());
+        post.setUpdateUser(getLoginName());
         return toAjax(postService.updatePost(post));
     }
 
@@ -145,8 +128,7 @@ public class SysPostController extends BaseController
      */
     @PostMapping("/checkPostNameUnique")
     @ResponseBody
-    public boolean checkPostNameUnique(SysPost post)
-    {
+    public boolean checkPostNameUnique(SysPost post) {
         return postService.checkPostNameUnique(post);
     }
 
@@ -155,8 +137,7 @@ public class SysPostController extends BaseController
      */
     @PostMapping("/checkPostCodeUnique")
     @ResponseBody
-    public boolean checkPostCodeUnique(SysPost post)
-    {
+    public boolean checkPostCodeUnique(SysPost post) {
         return postService.checkPostCodeUnique(post);
     }
 }

08.src/Xingxi/xingxi-admin/src/main/java/com/xingxi/web/controller/system/SysRoleController.java

@@ -1,6 +1,7 @@
 package com.xingxi.web.controller.system;
 
 import java.util.List;
+
 import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
@@ -28,13 +29,12 @@ import com.xingxi.system.service.ISysUserService;
 
 /**
  * 角色信息
- * 
- * @author ruoyi
+ *
+ * @author xingxi
  */
 @Controller
 @RequestMapping("/system/role")
-public class SysRoleController extends BaseController
-{
+public class SysRoleController extends BaseController {
     private String prefix = "system/role";
 
     @Autowired
@@ -48,16 +48,14 @@ public class SysRoleController extends BaseController
 
     @RequiresPermissions("system:role:view")
     @GetMapping()
-    public String role()
-    {
+    public String role() {
         return prefix + "/role";
     }
 
     @RequiresPermissions("system:role:list")
     @PostMapping("/list")
     @ResponseBody
-    public TableDataInfo list(SysRole role)
-    {
+    public TableDataInfo list(SysRole role) {
         startPage();
         List<SysRole> list = roleService.selectRoleList(role);
         return getDataTable(list);
@@ -67,8 +65,7 @@ public class SysRoleController extends BaseController
     @RequiresPermissions("system:role:export")
     @PostMapping("/export")
     @ResponseBody
-    public AjaxResult export(SysRole role)
-    {
+    public AjaxResult export(SysRole role) {
         List<SysRole> list = roleService.selectRoleList(role);
         ExcelUtil<SysRole> util = new ExcelUtil<SysRole>(SysRole.class);
         return util.exportExcel(list, "角色数据");
@@ -78,8 +75,7 @@ public class SysRoleController extends BaseController
      * 新增角色
      */
     @GetMapping("/add")
-    public String add()
-    {
+    public String add() {
         return prefix + "/add";
     }
 
@@ -90,17 +86,13 @@ public class SysRoleController extends BaseController
     @Log(title = "角色管理", businessType = BusinessType.INSERT)
     @PostMapping("/add")
     @ResponseBody
-    public AjaxResult addSave(@Validated SysRole role)
-    {
-        if (!roleService.checkRoleNameUnique(role))
-        {
+    public AjaxResult addSave(@Validated SysRole role) {
+        if (!roleService.checkRoleNameUnique(role)) {
             return error("新增角色'" + role.getRoleName() + "'失败，角色名称已存在");
-        }
-        else if (!roleService.checkRoleKeyUnique(role))
-        {
+        } else if (!roleService.checkRoleKeyUnique(role)) {
             return error("新增角色'" + role.getRoleName() + "'失败，角色权限已存在");
         }
-        role.setCreateBy(getLoginName());
+        role.setCreateUser(getLoginName());
         AuthorizationUtils.clearAllCachedAuthorizationInfo();
         return toAjax(roleService.insertRole(role));
 
@@ -111,8 +103,7 @@ public class SysRoleController extends BaseController
      */
     @RequiresPermissions("system:role:edit")
     @GetMapping("/edit/{roleId}")
-    public String edit(@PathVariable("roleId") Long roleId, ModelMap mmap)
-    {
+    public String edit(@PathVariable("roleId") Long roleId, ModelMap mmap) {
         roleService.checkRoleDataScope(roleId);
         mmap.put("role", roleService.selectRoleById(roleId));
         return prefix + "/edit";
@@ -125,19 +116,15 @@ public class SysRoleController extends BaseController
     @Log(title = "角色管理", businessType = BusinessType.UPDATE)
     @PostMapping("/edit")
     @ResponseBody
-    public AjaxResult editSave(@Validated SysRole role)
-    {
+    public AjaxResult editSave(@Validated SysRole role) {
         roleService.checkRoleAllowed(role);
         roleService.checkRoleDataScope(role.getRoleId());
-        if (!roleService.checkRoleNameUnique(role))
-        {
+        if (!roleService.checkRoleNameUnique(role)) {
             return error("修改角色'" + role.getRoleName() + "'失败，角色名称已存在");
-        }
-        else if (!roleService.checkRoleKeyUnique(role))
-        {
+        } else if (!roleService.checkRoleKeyUnique(role)) {
             return error("修改角色'" + role.getRoleName() + "'失败，角色权限已存在");
         }
-        role.setUpdateBy(getLoginName());
+        role.setUpdateUser(getLoginName());
         AuthorizationUtils.clearAllCachedAuthorizationInfo();
         return toAjax(roleService.updateRole(role));
     }
@@ -146,8 +133,7 @@ public class SysRoleController extends BaseController
      * 角色分配数据权限
      */
     @GetMapping("/authDataScope/{roleId}")
-    public String authDataScope(@PathVariable("roleId") Long roleId, ModelMap mmap)
-    {
+    public String authDataScope(@PathVariable("roleId") Long roleId, ModelMap mmap) {
         mmap.put("role", roleService.selectRoleById(roleId));
         return prefix + "/dataScope";
     }
@@ -159,13 +145,11 @@ public class SysRoleController extends BaseController
     @Log(title = "角色管理", businessType = BusinessType.UPDATE)
     @PostMapping("/authDataScope")
     @ResponseBody
-    public AjaxResult authDataScopeSave(SysRole role)
-    {
+    public AjaxResult authDataScopeSave(SysRole role) {
         roleService.checkRoleAllowed(role);
         roleService.checkRoleDataScope(role.getRoleId());
-        role.setUpdateBy(getLoginName());
-        if (roleService.authDataScope(role) > 0)
-        {
+        role.setUpdateUser(getLoginName());
+        if (roleService.authDataScope(role) > 0) {
             setSysUser(userService.selectUserById(getUserId()));
             return success();
         }
@@ -176,8 +160,7 @@ public class SysRoleController extends BaseController
     @Log(title = "角色管理", businessType = BusinessType.DELETE)
     @PostMapping("/remove")
     @ResponseBody
-    public AjaxResult remove(String ids)
-    {
+    public AjaxResult remove(String ids) {
         return toAjax(roleService.deleteRoleByIds(ids));
     }
 
@@ -186,8 +169,7 @@ public class SysRoleController extends BaseController
      */
     @PostMapping("/checkRoleNameUnique")
     @ResponseBody
-    public boolean checkRoleNameUnique(SysRole role)
-    {
+    public boolean checkRoleNameUnique(SysRole role) {
         return roleService.checkRoleNameUnique(role);
     }
 
@@ -196,8 +178,7 @@ public class SysRoleController extends BaseController
      */
     @PostMapping("/checkRoleKeyUnique")
     @ResponseBody
-    public boolean checkRoleKeyUnique(SysRole role)
-    {
+    public boolean checkRoleKeyUnique(SysRole role) {
         return roleService.checkRoleKeyUnique(role);
     }
 
@@ -205,8 +186,7 @@ public class SysRoleController extends BaseController
      * 选择菜单树
      */
     @GetMapping("/selectMenuTree")
-    public String selectMenuTree()
-    {
+    public String selectMenuTree() {
         return prefix + "/tree";
     }
 
@@ -217,8 +197,7 @@ public class SysRoleController extends BaseController
     @RequiresPermissions("system:role:edit")
     @PostMapping("/changeStatus")
     @ResponseBody
-    public AjaxResult changeStatus(SysRole role)
-    {
+    public AjaxResult changeStatus(SysRole role) {
         roleService.checkRoleAllowed(role);
         roleService.checkRoleDataScope(role.getRoleId());
         return toAjax(roleService.changeStatus(role));
@@ -229,8 +208,7 @@ public class SysRoleController extends BaseController
      */
     @RequiresPermissions("system:role:edit")
     @GetMapping("/authUser/{roleId}")
-    public String authUser(@PathVariable("roleId") Long roleId, ModelMap mmap)
-    {
+    public String authUser(@PathVariable("roleId") Long roleId, ModelMap mmap) {
         mmap.put("role", roleService.selectRoleById(roleId));
         return prefix + "/authUser";
     }
@@ -241,8 +219,7 @@ public class SysRoleController extends BaseController
     @RequiresPermissions("system:role:list")
     @PostMapping("/authUser/allocatedList")
     @ResponseBody
-    public TableDataInfo allocatedList(SysUser user)
-    {
+    public TableDataInfo allocatedList(SysUser user) {
         startPage();
         List<SysUser> list = userService.selectAllocatedList(user);
         return getDataTable(list);
@@ -255,8 +232,7 @@ public class SysRoleController extends BaseController
     @Log(title = "角色管理", businessType = BusinessType.GRANT)
     @PostMapping("/authUser/cancel")
     @ResponseBody
-    public AjaxResult cancelAuthUser(SysUserRole userRole)
-    {
+    public AjaxResult cancelAuthUser(SysUserRole userRole) {
         return toAjax(roleService.deleteAuthUser(userRole));
     }
 
@@ -267,8 +243,7 @@ public class SysRoleController extends BaseController
     @Log(title = "角色管理", businessType = BusinessType.GRANT)
     @PostMapping("/authUser/cancelAll")
     @ResponseBody
-    public AjaxResult cancelAuthUserAll(Long roleId, String userIds)
-    {
+    public AjaxResult cancelAuthUserAll(Long roleId, String userIds) {
         return toAjax(roleService.deleteAuthUsers(roleId, userIds));
     }
 
@@ -276,8 +251,7 @@ public class SysRoleController extends BaseController
      * 选择用户
      */
     @GetMapping("/authUser/selectUser/{roleId}")
-    public String selectUser(@PathVariable("roleId") Long roleId, ModelMap mmap)
-    {
+    public String selectUser(@PathVariable("roleId") Long roleId, ModelMap mmap) {
         mmap.put("role", roleService.selectRoleById(roleId));
         return prefix + "/selectUser";
     }
@@ -288,8 +262,7 @@ public class SysRoleController extends BaseController
     @RequiresPermissions("system:role:list")
     @PostMapping("/authUser/unallocatedList")
     @ResponseBody
-    public TableDataInfo unallocatedList(SysUser user)
-    {
+    public TableDataInfo unallocatedList(SysUser user) {
         startPage();
         List<SysUser> list = userService.selectUnallocatedList(user);
         return getDataTable(list);
@@ -302,8 +275,7 @@ public class SysRoleController extends BaseController
     @Log(title = "角色管理", businessType = BusinessType.GRANT)
     @PostMapping("/authUser/selectAll")
     @ResponseBody
-    public AjaxResult selectAuthUserAll(Long roleId, String userIds)
-    {
+    public AjaxResult selectAuthUserAll(Long roleId, String userIds) {
         roleService.checkRoleDataScope(roleId);
         return toAjax(roleService.insertAuthUsers(roleId, userIds));
     }
@@ -314,8 +286,7 @@ public class SysRoleController extends BaseController
     @RequiresPermissions("system:role:edit")
     @GetMapping("/deptTreeData")
     @ResponseBody
-    public List<Ztree> deptTreeData(SysRole role)
-    {
+    public List<Ztree> deptTreeData(SysRole role) {
         List<Ztree> ztrees = deptService.roleDeptTreeData(role);
         return ztrees;
     }

08.src/Xingxi/xingxi-admin/src/main/java/com/xingxi/web/controller/system/SysUserController.java

@@ -2,6 +2,7 @@ package com.xingxi.web.controller.system;
 
 import java.util.List;
 import java.util.stream.Collectors;
+
 import org.apache.commons.lang3.ArrayUtils;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -37,13 +38,12 @@ import com.xingxi.system.service.ISysUserService;
 
 /**
  * 用户信息
- * 
- * @author ruoyi
+ *
+ * @author xingxi
  */
 @Controller
 @RequestMapping("/system/user")
-public class SysUserController extends BaseController
-{
+public class SysUserController extends BaseController {
     private String prefix = "system/user";
 
     @Autowired
@@ -51,7 +51,7 @@ public class SysUserController extends BaseController
 
     @Autowired
     private ISysRoleService roleService;
-    
+
     @Autowired
     private ISysDeptService deptService;
 
@@ -63,16 +63,14 @@ public class SysUserController extends BaseController
 
     @RequiresPermissions("system:user:view")
     @GetMapping()
-    public String user()
-    {
+    public String user() {
         return prefix + "/user";
     }
 
     @RequiresPermissions("system:user:list")
     @PostMapping("/list")
     @ResponseBody
-    public TableDataInfo list(SysUser user)
-    {
+    public TableDataInfo list(SysUser user) {
         startPage();
         List<SysUser> list = userService.selectUserList(user);
         return getDataTable(list);
@@ -82,8 +80,7 @@ public class SysUserController extends BaseController
     @RequiresPermissions("system:user:export")
     @PostMapping("/export")
     @ResponseBody
-    public AjaxResult export(SysUser user)
-    {
+    public AjaxResult export(SysUser user) {
         List<SysUser> list = userService.selectUserList(user);
         ExcelUtil<SysUser> util = new ExcelUtil<SysUser>(SysUser.class);
         return util.exportExcel(list, "用户数据");
@@ -93,8 +90,7 @@ public class SysUserController extends BaseController
     @RequiresPermissions("system:user:import")
     @PostMapping("/importData")
     @ResponseBody
-    public AjaxResult importData(MultipartFile file, boolean updateSupport) throws Exception
-    {
+    public AjaxResult importData(MultipartFile file, boolean updateSupport) throws Exception {
         ExcelUtil<SysUser> util = new ExcelUtil<SysUser>(SysUser.class);
         List<SysUser> userList = util.importExcel(file.getInputStream());
         String message = userService.importUser(userList, updateSupport, getLoginName());
@@ -104,8 +100,7 @@ public class SysUserController extends BaseController
     @RequiresPermissions("system:user:view")
     @GetMapping("/importTemplate")
     @ResponseBody
-    public AjaxResult importTemplate()
-    {
+    public AjaxResult importTemplate() {
         ExcelUtil<SysUser> util = new ExcelUtil<SysUser>(SysUser.class);
         return util.importTemplateExcel("用户数据");
     }
@@ -114,8 +109,7 @@ public class SysUserController extends BaseController
      * 新增用户
      */
     @GetMapping("/add")
-    public String add(ModelMap mmap)
-    {
+    public String add(ModelMap mmap) {
         mmap.put("roles", roleService.selectRoleAll().stream().filter(r -> !r.isAdmin()).collect(Collectors.toList()));
         mmap.put("posts", postService.selectPostAll());
         return prefix + "/add";
@@ -128,26 +122,20 @@ public class SysUserController extends BaseController
     @Log(title = "用户管理", businessType = BusinessType.INSERT)
     @PostMapping("/add")
     @ResponseBody
-    public AjaxResult addSave(@Validated SysUser user)
-    {
+    public AjaxResult addSave(@Validated SysUser user) {
         deptService.checkDeptDataScope(user.getDeptId());
         roleService.checkRoleDataScope(user.getRoleIds());
-        if (!userService.checkLoginNameUnique(user))
-        {
+        if (!userService.checkLoginNameUnique(user)) {
             return error("新增用户'" + user.getLoginName() + "'失败，登录账号已存在");
-        }
-        else if (StringUtils.isNotEmpty(user.getPhonenumber()) && !userService.checkPhoneUnique(user))
-        {
+        } else if (StringUtils.isNotEmpty(user.getPhonenumber()) && !userService.checkPhoneUnique(user)) {
             return error("新增用户'" + user.getLoginName() + "'失败，手机号码已存在");
-        }
-        else if (StringUtils.isNotEmpty(user.getEmail()) && !userService.checkEmailUnique(user))
-        {
+        } else if (StringUtils.isNotEmpty(user.getEmail()) && !userService.checkEmailUnique(user)) {
             return error("新增用户'" + user.getLoginName() + "'失败，邮箱账号已存在");
         }
         user.setSalt(ShiroUtils.randomSalt());
         user.setPassword(passwordService.encryptPassword(user.getLoginName(), user.getPassword(), user.getSalt()));
         user.setPwdUpdateDate(DateUtils.getNowDate());
-        user.setCreateBy(getLoginName());
+        user.setCreateUser(getLoginName());
         return toAjax(userService.insertUser(user));
     }
 
@@ -156,8 +144,7 @@ public class SysUserController extends BaseController
      */
     @RequiresPermissions("system:user:edit")
     @GetMapping("/edit/{userId}")
-    public String edit(@PathVariable("userId") Long userId, ModelMap mmap)
-    {
+    public String edit(@PathVariable("userId") Long userId, ModelMap mmap) {
         userService.checkUserDataScope(userId);
         List<SysRole> roles = roleService.selectRolesByUserId(userId);
         mmap.put("user", userService.selectUserById(userId));
@@ -171,8 +158,7 @@ public class SysUserController extends BaseController
      */
     @RequiresPermissions("system:user:list")
     @GetMapping("/view/{userId}")
-    public String view(@PathVariable("userId") Long userId, ModelMap mmap)
-    {
+    public String view(@PathVariable("userId") Long userId, ModelMap mmap) {
         userService.checkUserDataScope(userId);
         mmap.put("user", userService.selectUserById(userId));
         mmap.put("roleGroup", userService.selectUserRoleGroup(userId));
@@ -187,33 +173,26 @@ public class SysUserController extends BaseController
     @Log(title = "用户管理", businessType = BusinessType.UPDATE)
     @PostMapping("/edit")
     @ResponseBody
-    public AjaxResult editSave(@Validated SysUser user)
-    {
+    public AjaxResult editSave(@Validated SysUser user) {
         userService.checkUserAllowed(user);
         userService.checkUserDataScope(user.getUserId());
         deptService.checkDeptDataScope(user.getDeptId());
         roleService.checkRoleDataScope(user.getRoleIds());
-        if (!userService.checkLoginNameUnique(user))
-        {
+        if (!userService.checkLoginNameUnique(user)) {
             return error("修改用户'" + user.getLoginName() + "'失败，登录账号已存在");
-        }
-        else if (StringUtils.isNotEmpty(user.getPhonenumber()) && !userService.checkPhoneUnique(user))
-        {
+        } else if (StringUtils.isNotEmpty(user.getPhonenumber()) && !userService.checkPhoneUnique(user)) {
             return error("修改用户'" + user.getLoginName() + "'失败，手机号码已存在");
-        }
-        else if (StringUtils.isNotEmpty(user.getEmail()) && !userService.checkEmailUnique(user))
-        {
+        } else if (StringUtils.isNotEmpty(user.getEmail()) && !userService.checkEmailUnique(user)) {
             return error("修改用户'" + user.getLoginName() + "'失败，邮箱账号已存在");
         }
-        user.setUpdateBy(getLoginName());
+        user.setUpdateUser(getLoginName());
         AuthorizationUtils.clearAllCachedAuthorizationInfo();
         return toAjax(userService.updateUser(user));
     }
 
     @RequiresPermissions("system:user:resetPwd")
     @GetMapping("/resetPwd/{userId}")
-    public String resetPwd(@PathVariable("userId") Long userId, ModelMap mmap)
-    {
+    public String resetPwd(@PathVariable("userId") Long userId, ModelMap mmap) {
         mmap.put("user", userService.selectUserById(userId));
         return prefix + "/resetPwd";
     }
@@ -222,16 +201,13 @@ public class SysUserController extends BaseController
     @Log(title = "重置密码", businessType = BusinessType.UPDATE)
     @PostMapping("/resetPwd")
     @ResponseBody
-    public AjaxResult resetPwdSave(SysUser user)
-    {
+    public AjaxResult resetPwdSave(SysUser user) {
         userService.checkUserAllowed(user);
         userService.checkUserDataScope(user.getUserId());
         user.setSalt(ShiroUtils.randomSalt());
         user.setPassword(passwordService.encryptPassword(user.getLoginName(), user.getPassword(), user.getSalt()));
-        if (userService.resetUserPwd(user) > 0)
-        {
-            if (ShiroUtils.getUserId().longValue() == user.getUserId().longValue())
-            {
+        if (userService.resetUserPwd(user) > 0) {
+            if (ShiroUtils.getUserId().longValue() == user.getUserId().longValue()) {
                 setSysUser(userService.selectUserById(user.getUserId()));
             }
             return success();
@@ -243,8 +219,7 @@ public class SysUserController extends BaseController
      * 进入授权角色页
      */
     @GetMapping("/authRole/{userId}")
-    public String authRole(@PathVariable("userId") Long userId, ModelMap mmap)
-    {
+    public String authRole(@PathVariable("userId") Long userId, ModelMap mmap) {
         SysUser user = userService.selectUserById(userId);
         // 获取用户所属的角色列表
         List<SysRole> roles = roleService.selectRolesByUserId(userId);
@@ -260,8 +235,7 @@ public class SysUserController extends BaseController
     @Log(title = "用户管理", businessType = BusinessType.GRANT)
     @PostMapping("/authRole/insertAuthRole")
     @ResponseBody
-    public AjaxResult insertAuthRole(Long userId, Long[] roleIds)
-    {
+    public AjaxResult insertAuthRole(Long userId, Long[] roleIds) {
         userService.checkUserDataScope(userId);
         roleService.checkRoleDataScope(roleIds);
         userService.insertUserAuth(userId, roleIds);
@@ -273,10 +247,8 @@ public class SysUserController extends BaseController
     @Log(title = "用户管理", businessType = BusinessType.DELETE)
     @PostMapping("/remove")
     @ResponseBody
-    public AjaxResult remove(String ids)
-    {
-        if (ArrayUtils.contains(Convert.toLongArray(ids), getUserId()))
-        {
+    public AjaxResult remove(String ids) {
+        if (ArrayUtils.contains(Convert.toLongArray(ids), getUserId())) {
             return error("当前用户不能删除");
         }
         return toAjax(userService.deleteUserByIds(ids));
@@ -287,8 +259,7 @@ public class SysUserController extends BaseController
      */
     @PostMapping("/checkLoginNameUnique")
     @ResponseBody
-    public boolean checkLoginNameUnique(SysUser user)
-    {
+    public boolean checkLoginNameUnique(SysUser user) {
         return userService.checkLoginNameUnique(user);
     }
 
@@ -297,8 +268,7 @@ public class SysUserController extends BaseController
      */
     @PostMapping("/checkPhoneUnique")
     @ResponseBody
-    public boolean checkPhoneUnique(SysUser user)
-    {
+    public boolean checkPhoneUnique(SysUser user) {
         return userService.checkPhoneUnique(user);
     }
 
@@ -307,8 +277,7 @@ public class SysUserController extends BaseController
      */
     @PostMapping("/checkEmailUnique")
     @ResponseBody
-    public boolean checkEmailUnique(SysUser user)
-    {
+    public boolean checkEmailUnique(SysUser user) {
         return userService.checkEmailUnique(user);
     }
 
@@ -319,8 +288,7 @@ public class SysUserController extends BaseController
     @RequiresPermissions("system:user:edit")
     @PostMapping("/changeStatus")
     @ResponseBody
-    public AjaxResult changeStatus(SysUser user)
-    {
+    public AjaxResult changeStatus(SysUser user) {
         userService.checkUserAllowed(user);
         userService.checkUserDataScope(user.getUserId());
         return toAjax(userService.changeStatus(user));
@@ -332,21 +300,19 @@ public class SysUserController extends BaseController
     @RequiresPermissions("system:user:list")
     @GetMapping("/deptTreeData")
     @ResponseBody
-    public List<Ztree> deptTreeData()
-    {
+    public List<Ztree> deptTreeData() {
         List<Ztree> ztrees = deptService.selectDeptTree(new SysDept());
         return ztrees;
     }
 
     /**
      * 选择部门树
-     * 
+     *
      * @param deptId 部门ID
      */
     @RequiresPermissions("system:user:list")
     @GetMapping("/selectDeptTree/{deptId}")
-    public String selectDeptTree(@PathVariable("deptId") Long deptId, ModelMap mmap)
-    {
+    public String selectDeptTree(@PathVariable("deptId") Long deptId, ModelMap mmap) {
         mmap.put("dept", deptService.selectDeptById(deptId));
         return prefix + "/deptTree";
     }

08.src/Xingxi/xingxi-common/src/main/java/com/xingxi/common/core/domain/entity/SysUser.java

@@ -3,6 +3,7 @@ package com.xingxi.common.core.domain.entity;
 import java.util.Date;
 import java.util.List;
 import javax.validation.constraints.*;
+
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 import com.fasterxml.jackson.annotation.JsonIgnore;
@@ -15,371 +16,380 @@ import com.xingxi.common.xss.Xss;
 
 /**
  * 用户对象 sys_user
- * 
- * @author ruoyi
+ *
+ * @author xingxi
  */
-public class SysUser extends BaseEntity
-{
+public class SysUser extends BaseEntity {
     private static final long serialVersionUID = 1L;
 
-    /** 用户ID */
+    /**
+     * 用户ID
+     */
     @Excel(name = "用户序号", type = Type.EXPORT, cellType = ColumnType.NUMERIC, prompt = "用户编号")
     private Long userId;
 
-    /** 部门ID */
+    /**
+     * 部门ID
+     */
     @Excel(name = "部门编号", type = Type.IMPORT)
     private Long deptId;
 
-    /** 部门父ID */
+    /**
+     * 部门父ID
+     */
     private Long parentId;
 
-    /** 角色ID */
+    /**
+     * 角色ID
+     */
     private Long roleId;
 
-    /** 登录名称 */
+    /**
+     * 登录名称
+     */
     @Excel(name = "登录名称")
     private String loginName;
 
-    /** 用户名称 */
+    /**
+     * 用户名称
+     */
     @Excel(name = "用户名称")
     private String userName;
 
-    /** 用户类型 */
+    /**
+     * 用户类型
+     */
     private String userType;
 
-    /** 用户邮箱 */
+    /**
+     * 用户邮箱
+     */
     @Excel(name = "用户邮箱")
     private String email;
 
-    /** 手机号码 */
+    /**
+     * 手机号码
+     */
     @Excel(name = "手机号码", cellType = ColumnType.TEXT)
     private String phonenumber;
 
-    /** 用户性别 */
+    /**
+     * 用户性别
+     */
     @Excel(name = "用户性别", readConverterExp = "0=男,1=女,2=未知")
     private String sex;
 
-    /** 用户头像 */
+    /**
+     * 用户头像
+     */
     private String avatar;
 
-    /** 密码 */
+    /**
+     * 密码
+     */
     private String password;
 
-    /** 盐加密 */
+    /**
+     * 盐加密
+     */
     private String salt;
 
-    /** 帐号状态（0正常 1停用） */
+    /**
+     * 帐号状态（0正常 1停用）
+     */
     @Excel(name = "帐号状态", readConverterExp = "0=正常,1=停用")
     private String status;
 
-    /** 删除标志（0代表存在 2代表删除） */
+    /**
+     * 删除标志（0代表存在 2代表删除）
+     */
     private String delFlag;
 
-    /** 最后登录IP */
+    /**
+     * 最后登录IP
+     */
     @Excel(name = "最后登录IP", type = Type.EXPORT)
     private String loginIp;
 
-    /** 最后登录时间 */
+    /**
+     * 最后登录时间
+     */
     @Excel(name = "最后登录时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss", type = Type.EXPORT)
     private Date loginDate;
 
-    /** 密码最后更新时间 */
+    // 密码最后更新时间
     private Date pwdUpdateDate;
 
-    /** 部门对象 */
+    // 微信openId
+    private String wxOpenId;
+
+    // 微信unionId
+    private String wxUnionId;
+
+    // 微信SessionKey
+    private String wxSessionKey;
+
+    /**
+     * 部门对象
+     */
     @Excels({
-        @Excel(name = "部门名称", targetAttr = "deptName", type = Type.EXPORT),
-        @Excel(name = "部门负责人", targetAttr = "leader", type = Type.EXPORT)
+            @Excel(name = "部门名称", targetAttr = "deptName", type = Type.EXPORT),
+            @Excel(name = "部门负责人", targetAttr = "leader", type = Type.EXPORT)
     })
     private SysDept dept;
 
     private List<SysRole> roles;
 
-    /** 角色组 */
+    /**
+     * 角色组
+     */
     private Long[] roleIds;
 
-    /** 岗位组 */
+    /**
+     * 岗位组
+     */
     private Long[] postIds;
 
-    public SysUser()
-    {
+    public SysUser() {
 
     }
 
-    public SysUser(Long userId)
-    {
+    public SysUser(Long userId) {
         this.userId = userId;
     }
 
-    public Long getUserId()
-    {
+    public Long getUserId() {
         return userId;
     }
 
-    public void setUserId(Long userId)
-    {
+    public void setUserId(Long userId) {
         this.userId = userId;
     }
 
-    public boolean isAdmin()
-    {
+    public boolean isAdmin() {
         return isAdmin(this.userId);
     }
 
-    public static boolean isAdmin(Long userId)
-    {
+    public static boolean isAdmin(Long userId) {
         return userId != null && 1L == userId;
     }
 
-    public Long getDeptId()
-    {
+    public Long getDeptId() {
         return deptId;
     }
 
-    public void setDeptId(Long deptId)
-    {
+    public void setDeptId(Long deptId) {
         this.deptId = deptId;
     }
 
-    public Long getParentId()
-    {
+    public Long getParentId() {
         return parentId;
     }
 
-    public void setParentId(Long parentId)
-    {
+    public void setParentId(Long parentId) {
         this.parentId = parentId;
     }
 
-    public Long getRoleId()
-    {
+    public Long getRoleId() {
         return roleId;
     }
 
-    public void setRoleId(Long roleId)
-    {
+    public void setRoleId(Long roleId) {
         this.roleId = roleId;
     }
 
     @Xss(message = "登录账号不能包含脚本字符")
     @NotBlank(message = "登录账号不能为空")
     @Size(min = 0, max = 30, message = "登录账号长度不能超过30个字符")
-    public String getLoginName()
-    {
+    public String getLoginName() {
         return loginName;
     }
 
-    public void setLoginName(String loginName)
-    {
+    public void setLoginName(String loginName) {
         this.loginName = loginName;
     }
 
     @Xss(message = "用户昵称不能包含脚本字符")
     @Size(min = 0, max = 30, message = "用户昵称长度不能超过30个字符")
-    public String getUserName()
-    {
+    public String getUserName() {
         return userName;
     }
 
-    public void setUserName(String userName)
-    {
+    public void setUserName(String userName) {
         this.userName = userName;
     }
 
-    public String getUserType()
-    {
+    public String getUserType() {
         return userType;
     }
 
-    public void setUserType(String userType)
-    {
+    public void setUserType(String userType) {
         this.userType = userType;
     }
 
     @Email(message = "邮箱格式不正确")
     @Size(min = 0, max = 50, message = "邮箱长度不能超过50个字符")
-    public String getEmail()
-    {
+    public String getEmail() {
         return email;
     }
 
-    public void setEmail(String email)
-    {
+    public void setEmail(String email) {
         this.email = email;
     }
 
     @Size(min = 0, max = 11, message = "手机号码长度不能超过11个字符")
-    public String getPhonenumber()
-    {
+    public String getPhonenumber() {
         return phonenumber;
     }
 
-    public void setPhonenumber(String phonenumber)
-    {
+    public void setPhonenumber(String phonenumber) {
         this.phonenumber = phonenumber;
     }
 
-    public String getSex()
-    {
+    public String getSex() {
         return sex;
     }
 
-    public void setSex(String sex)
-    {
+    public void setSex(String sex) {
         this.sex = sex;
     }
 
-    public String getAvatar()
-    {
+    public String getAvatar() {
         return avatar;
     }
 
-    public void setAvatar(String avatar)
-    {
+    public void setAvatar(String avatar) {
         this.avatar = avatar;
     }
 
     @JsonIgnore
-    public String getPassword()
-    {
+    public String getPassword() {
         return password;
     }
 
-    public void setPassword(String password)
-    {
+    public void setPassword(String password) {
         this.password = password;
     }
 
     @JsonIgnore
-    public String getSalt()
-    {
+    public String getSalt() {
         return salt;
     }
 
-    public void setSalt(String salt)
-    {
+    public void setSalt(String salt) {
         this.salt = salt;
     }
 
-    public String getStatus()
-    {
+    public String getStatus() {
         return status;
     }
 
-    public void setStatus(String status)
-    {
+    public void setStatus(String status) {
         this.status = status;
     }
 
-    public String getDelFlag()
-    {
+    public String getDelFlag() {
         return delFlag;
     }
 
-    public void setDelFlag(String delFlag)
-    {
+    public void setDelFlag(String delFlag) {
         this.delFlag = delFlag;
     }
 
-    public String getLoginIp()
-    {
+    public String getLoginIp() {
         return loginIp;
     }
 
-    public void setLoginIp(String loginIp)
-    {
+    public void setLoginIp(String loginIp) {
         this.loginIp = loginIp;
     }
 
-    public Date getLoginDate()
-    {
+    public Date getLoginDate() {
         return loginDate;
     }
 
-    public void setLoginDate(Date loginDate)
-    {
+    public void setLoginDate(Date loginDate) {
         this.loginDate = loginDate;
     }
 
-    public Date getPwdUpdateDate()
-    {
+    public Date getPwdUpdateDate() {
         return pwdUpdateDate;
     }
 
-    public void setPwdUpdateDate(Date pwdUpdateDate)
-    {
+    public void setPwdUpdateDate(Date pwdUpdateDate) {
         this.pwdUpdateDate = pwdUpdateDate;
     }
 
-    public SysDept getDept()
+    public String getWxSessionKey()
     {
-        if (dept == null)
-        {
+        return wxSessionKey;
+    }
+
+    public void setWxSessionKey(String wxSessionKey)
+    {
+        this.wxSessionKey = wxSessionKey;
+    }
+
+    public SysDept getDept() {
+        if (dept == null) {
             dept = new SysDept();
         }
         return dept;
     }
 
-    public void setDept(SysDept dept)
-    {
+    public void setDept(SysDept dept) {
         this.dept = dept;
     }
 
-    public List<SysRole> getRoles()
-    {
+    public List<SysRole> getRoles() {
         return roles;
     }
 
-    public void setRoles(List<SysRole> roles)
-    {
+    public void setRoles(List<SysRole> roles) {
         this.roles = roles;
     }
 
-    public Long[] getRoleIds()
-    {
+    public Long[] getRoleIds() {
         return roleIds;
     }
 
-    public void setRoleIds(Long[] roleIds)
-    {
+    public void setRoleIds(Long[] roleIds) {
         this.roleIds = roleIds;
     }
 
-    public Long[] getPostIds()
-    {
+    public Long[] getPostIds() {
         return postIds;
     }
 
-    public void setPostIds(Long[] postIds)
-    {
+    public void setPostIds(Long[] postIds) {
         this.postIds = postIds;
     }
 
     @Override
     public String toString() {
-        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
-            .append("userId", getUserId())
-            .append("deptId", getDeptId())
-            .append("loginName", getLoginName())
-            .append("userName", getUserName())
-            .append("userType", getUserType())
-            .append("email", getEmail())
-            .append("phonenumber", getPhonenumber())
-            .append("sex", getSex())
-            .append("avatar", getAvatar())
-            .append("password", getPassword())
-            .append("salt", getSalt())
-            .append("status", getStatus())
-            .append("delFlag", getDelFlag())
-            .append("loginIp", getLoginIp())
-            .append("loginDate", getLoginDate())
-            .append("createUser", getCreateUser())
-            .append("createTime", getCreateTime())
-            .append("updateUser", getUpdateUser())
-            .append("updateTime", getUpdateTime())
-            .append("remark", getRemark())
-            .append("dept", getDept())
-			.append("roles", getRoles())
-            .toString();
+        return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
+                .append("userId", getUserId())
+                .append("deptId", getDeptId())
+                .append("loginName", getLoginName())
+                .append("userName", getUserName())
+                .append("userType", getUserType())
+                .append("email", getEmail())
+                .append("phonenumber", getPhonenumber())
+                .append("sex", getSex())
+                .append("avatar", getAvatar())
+                .append("password", getPassword())
+                .append("salt", getSalt())
+                .append("status", getStatus())
+                .append("delFlag", getDelFlag())
+                .append("loginIp", getLoginIp())
+                .append("loginDate", getLoginDate())
+                .append("createUser", getCreateUser())
+                .append("createTime", getCreateTime())
+                .append("updateUser", getUpdateUser())
+                .append("updateTime", getUpdateTime())
+                .append("remark", getRemark())
+                .append("dept", getDept())
+                .append("roles", getRoles())
+                .toString();
     }
 }

08.src/Xingxi/xingxi-miniprogram-api/src/main/java/com/xingxi/store/common/JWTUtils.java

@@ -1,71 +0,0 @@
-package com.xingxi.store.common;
-
-import cn.com.wingxi.biandan.common.utils.DateUtils;
-import io.jsonwebtoken.*;
-import io.jsonwebtoken.io.Decoders;
-import io.jsonwebtoken.io.Encoders;
-import io.jsonwebtoken.security.Keys;
-
-import javax.crypto.SecretKey;
-import java.security.Key;
-import java.util.Date;
-import java.util.UUID;
-
-public final class JWTUtils {
-    private static final String SECRET_KEY_STRING = "9YIGtSIjKI2cGGz7TuPNQFtk2WmphzESAp98zicd6AI=";
-    private JWTUtils(){
-        throw new RuntimeException();
-    }
-
-
-    public static String generateSecretKeyString(){
-        Key key = Keys.secretKeyFor(SignatureAlgorithm.HS256);
-        return Encoders.BASE64.encode(key.getEncoded());
-    }
-
-
-    public static String generateJwtString(String openid, Date issuedAt){
-        SecretKey secretKey = Keys.hmacShaKeyFor(Decoders.BASE64.decode(SECRET_KEY_STRING));
-        return Jwts.builder()
-                .setHeaderParam("typ", "JWT")
-                .setId(UUID.randomUUID().toString()) // jti
-                .setSubject(openid) // sub 主题
-                .setExpiration(DateUtils.addHours(new Date(), 4)) //过期时间
-                .setIssuedAt(issuedAt) // 发布时间
-                .setIssuer("Biandan_wx_") // 发布者
-//                .claim("test", "1231333")
-                .signWith(secretKey)
-                .compact();
-    }
-
-
-    public static Jws<Claims> parseJwt(String compactJws){
-        try {
-            Jws<Claims> claimsJws = Jwts.parserBuilder()
-                    .setSigningKey(SECRET_KEY_STRING)
-                    .build().parseClaimsJws(compactJws);
-            Claims body = claimsJws.getBody();
-            JwsHeader header = claimsJws.getHeader();
-            System.out.println(body);
-            System.out.println(header);
-            //OK, we can trust this JWT
-            return claimsJws;
-        } catch (JwtException e) {
-            //don't trust the JWT!
-            e.printStackTrace();
-            throw new RuntimeException();
-        }
-    }
-
-    public static void main(String[] args) {
-//        String secretString = generateSecretKeyString();
-//        System.out.println(secretString);
-//        String test = generateJwtString(new HashMap<String, String>(){{
-//            put("test", "1213");
-//        }});
-//        System.out.println(test);
-//        parseJwt(test);
-    }
-
-
-}

08.src/Xingxi/xingxi-miniprogram-api/src/main/java/com/xingxi/store/common/UserContext.java

@@ -1,13 +1,9 @@
 package com.xingxi.store.common;
 
-
-import com.xingxi.store.data.domain.MercDTO;
-import cn.com.wingxi.biandan.common.core.domain.entity.SysUser;
+import com.xingxi.common.core.domain.entity.SysUser;
 import lombok.Value;
 
-
 @Value
 public class UserContext {
     SysUser currentUser;
-    MercDTO mercDTO;
 }

08.src/Xingxi/xingxi-miniprogram-api/src/main/java/com/xingxi/store/configuration/AttachRequestIdRequestFilter.java

@@ -1,110 +0,0 @@
-package com.xingxi.store.configuration;
-
-import cn.binarywang.wx.miniapp.api.WxMaService;
-import cn.binarywang.wx.miniapp.config.WxMaConfig;
-import cn.com.wingxi.biandan.common.utils.StringUtils;
-import com.xingxi.store.common.ResponseDTO;
-import com.fasterxml.jackson.databind.ObjectMapper;
-import lombok.RequiredArgsConstructor;
-import lombok.extern.slf4j.Slf4j;
-import org.slf4j.MDC;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.core.Ordered;
-import org.springframework.core.annotation.Order;
-import org.springframework.security.web.util.matcher.AntPathRequestMatcher;
-import org.springframework.security.web.util.matcher.RequestMatcher;
-import org.springframework.stereotype.Component;
-import org.springframework.web.filter.OncePerRequestFilter;
-
-import javax.servlet.FilterChain;
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import java.io.IOException;
-import java.util.Arrays;
-import java.util.UUID;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-
-
-@Slf4j
-@Component
-@Order(Ordered.HIGHEST_PRECEDENCE)
-@RequiredArgsConstructor
-class AttachRequestIdRequestFilter extends OncePerRequestFilter {
-
-    private final RequestMatcher requestMatcher = new AntPathRequestMatcher("/api/store/**");
-    private final ObjectMapper objectMapper;
-    private final WxMaService maService;
-
-    @Value("${spring.application.request.referers}")
-    private String[] referers;
-
-
-    @Override
-    protected void doFilterInternal(HttpServletRequest request, HttpServletResponse response, FilterChain filterChain) throws ServletException, IOException {
-        String uuid = UUID.randomUUID().toString();
-
-
-        if (requestMatcher.matches(request)) {
-
-            String userAgent = request.getHeader("User-Agent");
-            if (!(userAgent != null && userAgent.contains("MicroMessenger"))) {
-                log.debug("User-Agent[" + userAgent + "],请使用微信浏览器");
-                responseFail(uuid, response);
-                return;
-            }
-
-            String referer = request.getHeader("Referer");
-            if (!((referer != null && verifyReferer(referer)) || othersReferer(referer))) {
-                log.debug("Referer[" + referer + "]错误,请求不是来自微信服务器");
-                responseFail(uuid, response);
-                return;
-            }
-
-        }
-
-        ContentCachingRequestWrapper cachingRequestWrapper = new ContentCachingRequestWrapper(request);
-        String requestIdKey = "X-REQUEST-ID";
-
-        try {
-            cachingRequestWrapper.setAttribute(requestIdKey, uuid);
-            MDC.put(requestIdKey, uuid);
-            filterChain.doFilter(cachingRequestWrapper, response);
-        } finally {
-            MDC.remove(requestIdKey);
-        }
-
-
-    }
-
-
-    private void responseFail(String requestId, HttpServletResponse response) {
-        ResponseDTO<Void> responseDTO = new ResponseDTO<>(500);
-        responseDTO.setRequestId(requestId);
-        responseDTO.setMessage("拒绝访问");
-        response.setStatus(500);
-        response.setCharacterEncoding("utf-8");
-        try {
-            response.getWriter().write(objectMapper.writeValueAsString(responseDTO));
-        } catch (IOException e) {
-            e.printStackTrace();
-        }
-    }
-
-
-    private boolean othersReferer(String referer){
-        return Arrays.stream(referers).anyMatch(referer::contains);
-    }
-
-    private boolean verifyReferer(String referer) {
-        WxMaConfig wxMaConfig = maService.getWxMaConfig();
-        String appid = wxMaConfig.getAppid();
-        String regEx = String.format("^https://servicewechat.com/%s/([a-zA-Z0-9.]{1,}|devtools)/page-frame.html$", appid);
-        Pattern pattern = Pattern.compile(regEx);
-        Matcher matcher = pattern.matcher(referer);
-        return matcher.matches();
-    }
-
-
-}

08.src/Xingxi/xingxi-miniprogram-api/src/main/java/com/xingxi/store/configuration/DefaultHandlerExceptionResolver.java

@@ -1,7 +1,7 @@
 package com.xingxi.store.configuration;
 
 
-import cn.com.wingxi.biandan.common.exception.BusinessException;
+import com.xingxi.common.exception.BusinessException;
 import com.xingxi.store.common.ApiException;
 import com.xingxi.store.common.ResponseDTO;
 import lombok.RequiredArgsConstructor;
@@ -26,14 +26,11 @@ import javax.servlet.http.HttpServletRequest;
 import java.io.IOException;
 import java.util.List;
 
-
 @Slf4j
 @Order(Ordered.HIGHEST_PRECEDENCE)
-@RestControllerAdvice(basePackages = "cn.com.wingxi.biandan.store.controller")
+@RestControllerAdvice(basePackages = "com.xingxi.store.controller")
 @RequiredArgsConstructor
 class DefaultHandlerExceptionResolver {
-//    private final OperLogService operLogService;
-
     @ResponseStatus(HttpStatus.BAD_REQUEST)
     @ExceptionHandler(MissingServletRequestParameterException.class)
     public ResponseDTO<Void> handleMissingServletRequestParameterException(MissingServletRequestParameterException e, HttpServletRequest request) {
@@ -42,11 +39,9 @@ class DefaultHandlerExceptionResolver {
         ResponseDTO<Void> apiResultDTO = new ResponseDTO<>(400);
         apiResultDTO.setRequestId(requestId);
         apiResultDTO.setMessage("请求参数" + e.getParameterName() + "不能为空");
-//        operLogService.handleAfterLog(apiResultDTO, request);
         return apiResultDTO;
     }
 
-
     @ResponseStatus(HttpStatus.INTERNAL_SERVER_ERROR)
     @ExceptionHandler(ServletRequestBindingException.class)
     public ResponseDTO<Void> handleServletRequestBindingException(ServletRequestBindingException e, HttpServletRequest request) {
@@ -59,9 +54,6 @@ class DefaultHandlerExceptionResolver {
         return apiResultDTO;
     }
 
-
-
-
     @ResponseStatus(HttpStatus.BAD_REQUEST)
     @ExceptionHandler(HttpMessageNotReadableException.class)
     public ResponseDTO<Void> handleHttpMessageNotReadableException(HttpMessageNotReadableException e, HttpServletRequest request) {
@@ -74,8 +66,6 @@ class DefaultHandlerExceptionResolver {
         return apiResultDTO;
     }
 
-
-
     @ResponseStatus(HttpStatus.BAD_REQUEST)
     @ExceptionHandler(BindException.class)
     public ResponseDTO<Void> handleBindException(BindException e, HttpServletRequest request) {
@@ -99,7 +89,6 @@ class DefaultHandlerExceptionResolver {
         return apiResultDTO;
     }
 
-
     @ResponseStatus(HttpStatus.BAD_REQUEST)
     @ExceptionHandler(MethodArgumentNotValidException.class)
     public ResponseDTO<Void> handleMethodArgumentNotValidException(MethodArgumentNotValidException e, HttpServletRequest request) {
@@ -123,7 +112,6 @@ class DefaultHandlerExceptionResolver {
         return apiResultDTO;
     }
 
-
     @ResponseStatus(HttpStatus.BAD_REQUEST)
     @ExceptionHandler(ApiException.class)
     public ResponseDTO<Void> handleApiException(ApiException e, HttpServletRequest request) {
@@ -166,7 +154,6 @@ class DefaultHandlerExceptionResolver {
         return apiResultDTO;
     }
 
-
     @ResponseStatus(HttpStatus.INTERNAL_SERVER_ERROR)
     @ExceptionHandler({Exception.class, FileUploadException.class, IOException.class})
     public ResponseDTO<Void> handleException(Exception e, HttpServletRequest request) {
@@ -179,6 +166,4 @@ class DefaultHandlerExceptionResolver {
 //        operLogService.handleAfterLog(apiResultDTO, request);
         return apiResultDTO;
     }
-
-
 }

08.src/Xingxi/xingxi-miniprogram-api/src/main/java/com/xingxi/store/configuration/OperLogAspect.java

@@ -1,7 +1,6 @@
 package com.xingxi.store.configuration;
 
-
-import cn.com.wingxi.biandan.common.annotation.Log;
+import com.xingxi.common.annotation.Log;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.aspectj.lang.JoinPoint;
@@ -19,7 +18,7 @@ import javax.servlet.http.HttpServletRequest;
 @RequiredArgsConstructor
 class OperLogAspect {
     private final OperLogService operLogService;
-    @Pointcut("@annotation(cn.com.wingxi.biandan.common.annotation.Log)")
+    @Pointcut("@annotation(com.xingxi.common.annotation.Log)")
     public void logPointCut() {
     }
 
@@ -28,6 +27,4 @@ class OperLogAspect {
         HttpServletRequest servletRequest = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest();
         operLogService.handleBeforeLog(joinPoint, controllerLog, servletRequest);
     }
-
-
 }

08.src/Xingxi/xingxi-miniprogram-api/src/main/java/com/xingxi/store/configuration/OperLogService.java

@@ -1,11 +1,9 @@
 package com.xingxi.store.configuration;
 
-
-import cn.com.wingxi.biandan.common.annotation.Log;
+import com.xingxi.common.annotation.Log;
 import com.xingxi.store.common.DTO;
 import com.xingxi.store.common.ResponseDTO;
-import com.xingxi.store.data.mapper.WxaStoreSysOperLogMapper;
-import cn.com.wingxi.biandan.system.system.domain.SysOperLog;
+import com.xingxi.system.domain.SysOperLog;
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import lombok.RequiredArgsConstructor;
@@ -19,7 +17,6 @@ import javax.servlet.http.HttpServletRequest;
 @RequiredArgsConstructor
 //@Component
 class OperLogService {
-    private final WxaStoreSysOperLogMapper sysOperLogRepository;
     private final ObjectMapper objectMapper;
 
     @Async
@@ -61,13 +58,10 @@ class OperLogService {
         sysOperLog.setOperParam(jsonParams);
         sysOperLog.setRequestMethod(request.getMethod());
         sysOperLog.setOperUrl(url);
-        sysOperLogRepository.insertOperlog(sysOperLog);
     }
 
-
     @Async
     public void handleAfterLog(ResponseDTO<?> responseDTO, HttpServletRequest request){
-
         String requestId = (String) request.getAttribute("X-REQUEST-ID");
 //        SysOperLog sysOperLog = sysOperLogRepository.selectSysOperLogByOperName(requestId);
 //        if (sysOperLog != null) {
@@ -81,5 +75,4 @@ class OperLogService {
 //            }
 //        }
     }
-
 }

08.src/Xingxi/xingxi-miniprogram-api/src/main/java/com/xingxi/store/configuration/PresetMerchantIDAspect.java

@@ -1,62 +0,0 @@
-package com.xingxi.store.configuration;
-
-
-import com.xingxi.store.common.BaseDTO;
-import cn.com.wingxi.biandan.system.merchant.domain.Merchant;
-import cn.com.wingxi.biandan.system.merchant.mapper.MerchantMapper;
-import lombok.RequiredArgsConstructor;
-import lombok.extern.slf4j.Slf4j;
-import org.aspectj.lang.JoinPoint;
-import org.aspectj.lang.annotation.Before;
-import org.aspectj.lang.annotation.Pointcut;
-import org.springframework.util.StringUtils;
-import org.springframework.web.context.request.RequestContextHolder;
-import org.springframework.web.context.request.ServletRequestAttributes;
-
-import javax.servlet.http.HttpServletRequest;
-
-@Slf4j
-//@Component
-//@Aspect
-@RequiredArgsConstructor
-class PresetMerchantIDAspect {
-    private final MerchantMapper merchantMapper;
-
-    @Pointcut("@within(org.springframework.web.bind.annotation.RestController) && execution(public * *(..))")
-    public void beforePointcut() {
-    }
-
-    @Before(value = "beforePointcut()")
-    public void before(JoinPoint joinPoint) {
-        Object[] args = joinPoint.getArgs();
-        for (Object arg : args) {
-            if (arg instanceof BaseDTO) {
-                log.info("{}", arg);
-                ServletRequestAttributes requestAttributes = (ServletRequestAttributes) RequestContextHolder.getRequestAttributes();
-                HttpServletRequest request = requestAttributes.getRequest();
-                String mercId = request.getHeader("X-Store-Id");
-                if (!StringUtils.hasLength(mercId)) {
-                    log.error("MercId空");
-                    throw new RuntimeException("MercId不能为空");
-                } else {
-                    if (!checkMerchant(mercId)) {
-                        log.error("商户[" + mercId + "]不存在");
-                        throw new RuntimeException("商户不存在");
-                    }  else {
-                        BaseDTO base = (BaseDTO) arg;
-//                        base.setMercId(mercId);
-                    }
-                }
-            }
-        }
-    }
-
-
-    private boolean checkMerchant(String mercId) {
-        Merchant merchant = merchantMapper.selectMerchantByMercId(Long.valueOf(mercId));
-        return merchant != null
-                && "0".equalsIgnoreCase(merchant.getStatus())
-                && "0".equalsIgnoreCase(merchant.getDelFlag());
-    }
-
-}

08.src/Xingxi/xingxi-miniprogram-api/src/main/java/com/xingxi/store/configuration/StoreApiRequestBodyAdvice.java

@@ -1,6 +1,6 @@
 package com.xingxi.store.configuration;
 
-import cn.com.wingxi.biandan.common.constant.Constants;
+import com.xingxi.common.constant.Constants;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.io.IOUtils;
@@ -20,7 +20,7 @@ import java.io.InputStream;
 import java.lang.reflect.Type;
 
 @Slf4j
-@ControllerAdvice("cn.com.wingxi.biandan.store.controller")
+@ControllerAdvice("com.xingxi.store.controller")
 @RequiredArgsConstructor
 public class StoreApiRequestBodyAdvice implements RequestBodyAdvice {
 

08.src/Xingxi/xingxi-miniprogram-api/src/main/java/com/xingxi/store/configuration/WXMessageEndpoint.java

@@ -1,53 +0,0 @@
-package com.xingxi.store.configuration;
-
-
-import cn.binarywang.wx.miniapp.api.WxMaService;
-import cn.binarywang.wx.miniapp.bean.WxMaMessage;
-import cn.binarywang.wx.miniapp.config.WxMaConfig;
-import cn.binarywang.wx.miniapp.message.WxMaMessageHandler;
-import cn.binarywang.wx.miniapp.message.WxMaMessageRouter;
-import cn.binarywang.wx.miniapp.message.WxMaXmlOutMessage;
-import lombok.RequiredArgsConstructor;
-import me.chanjar.weixin.common.api.WxConsts;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import java.io.IOException;
-
-
-@RestController
-@RequestMapping("/wx/message")
-@RequiredArgsConstructor
-public class WXMessageEndpoint {
-    private final WxMaService wxMaService;
-    private final WxMaMessageHandler wxMaMessageHandler;
-
-
-    @PostMapping
-    public String message(HttpServletRequest request, HttpServletResponse response) {
-        WxMaMessageRouter router = new WxMaMessageRouter(wxMaService);
-        router.rule()
-                .msgType(WxConsts.XmlMsgType.EVENT)
-                .event("wxa_media_check")
-                .handler(wxMaMessageHandler)
-                .end();
-
-        WxMaConfig wxMaConfig = wxMaService.getWxMaConfig();
-
-        try {
-            WxMaMessage wxMaMessage = WxMaMessage.fromEncryptedJson(request.getInputStream(), wxMaConfig);
-            WxMaXmlOutMessage route = router.route(wxMaMessage);
-        } catch (IOException e) {
-            e.printStackTrace();
-
-            return "fail";
-        }
-
-        return "success";
-
-    }
-
-}

08.src/Xingxi/xingxi-miniprogram-api/src/main/java/com/xingxi/store/configuration/WxMpConfiguration.java

@@ -1,36 +0,0 @@
-package com.xingxi.store.configuration;
-
-import com.google.common.collect.Maps;
-import lombok.AllArgsConstructor;
-import me.chanjar.weixin.mp.api.WxMpService;
-import me.chanjar.weixin.mp.api.impl.WxMpServiceImpl;
-import me.chanjar.weixin.mp.config.WxMpConfigStorage;
-import me.chanjar.weixin.mp.config.impl.WxMpDefaultConfigImpl;
-import org.springframework.boot.context.properties.EnableConfigurationProperties;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-
-import java.util.Map;
-
-@AllArgsConstructor
-@Configuration
-@EnableConfigurationProperties(WxMpProperties.class)
-public class WxMpConfiguration {
-
-    private final WxMpProperties properties;
-
-    @Bean
-    public WxMpService wxMpService() {
-
-        WxMpService service = new WxMpServiceImpl();
-        WxMpDefaultConfigImpl wxMpDefaultConfig = new WxMpDefaultConfigImpl();
-        wxMpDefaultConfig.setAppId(properties.getAppId());
-        wxMpDefaultConfig.setSecret(properties.getSecret());
-
-        Map<String, WxMpConfigStorage> configMap = Maps.newHashMap();
-        configMap.put(properties.getAppId(),wxMpDefaultConfig);
-        service.setMultiConfigStorages(configMap);
-
-        return service;
-    }
-}

08.src/Xingxi/xingxi-miniprogram-api/src/main/java/com/xingxi/store/configuration/WxMpProperties.java

@@ -1,16 +0,0 @@
-package com.xingxi.store.configuration;
-
-import lombok.Data;
-import org.springframework.boot.context.properties.ConfigurationProperties;
-
-@Data
-//@ConfigurationProperties(prefix = "spring.application.biandan.unifiedpay.wxpay")
-@ConfigurationProperties(prefix = "wx.mp")
-public class WxMpProperties {
-
-    // 微信公众号appid.
-    private String appId;
-
-    // 证书序列号
-    private String secret;
-}

08.src/Xingxi/xingxi-miniprogram-api/src/main/java/com/xingxi/store/configuration/WxSubscribeMessageConsumer.java

@@ -1,66 +0,0 @@
-package com.xingxi.store.configuration;
-
-
-import cn.binarywang.wx.miniapp.api.WxMaMsgService;
-import cn.binarywang.wx.miniapp.api.WxMaService;
-import cn.binarywang.wx.miniapp.bean.WxMaSubscribeMessage;
-import cn.com.wingxi.biandan.common.mq.bo.wxmessage.WxSubscribeMessageBO;
-import cn.com.wingxi.biandan.common.mq.constant.WxSubscribeMessageMqKey;
-import cn.com.wingxi.biandan.common.mq.core.AbstractRabbitConsumer;
-import com.alibaba.fastjson.JSON;
-import com.google.common.collect.Lists;
-import com.rabbitmq.client.Channel;
-import lombok.RequiredArgsConstructor;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.amqp.core.Binding;
-import org.springframework.amqp.core.Message;
-import org.springframework.amqp.rabbit.annotation.RabbitListener;
-import org.springframework.beans.BeanUtils;
-import org.springframework.context.annotation.Bean;
-import org.springframework.stereotype.Component;
-
-import java.util.List;
-
-
-@Slf4j
-@Component
-@RequiredArgsConstructor
-class WxSubscribeMessageConsumer extends AbstractRabbitConsumer {
-    private final WxMaService wxMaService;
-
-    @Bean
-    @Override
-    protected List<Binding> getBindingList() {
-        return Lists.newArrayList(
-                this.bind(WxSubscribeMessageMqKey.EDIT_EXCHANGE,
-                        WxSubscribeMessageMqKey.EDIT_QUEUE_FOR_WXSUBSCRIBEMESSAGE_PUBLISH,
-                        WxSubscribeMessageMqKey.EDIT_ROUTE_FOR_WXSUBSCRIBEMESSAGE_PUBLISH));
-    }
-
-
-    @RabbitListener(queues = WxSubscribeMessageMqKey.EDIT_QUEUE_FOR_WXSUBSCRIBEMESSAGE_PUBLISH)
-    @Override
-    public void onMessage(Message message, Channel channel) throws Exception {
-        this.convertMessage(message, channel);
-    }
-
-
-    @Override
-    public boolean execute(String body, Channel channel, Message message) throws Exception {
-        log.debug("发布微信订阅消息[{}]", body);
-        WxSubscribeMessageBO wxSubscribeMessageBO = JSON.parseObject(body, WxSubscribeMessageBO.class);
-        WxMaSubscribeMessage subscribeMessage = new WxMaSubscribeMessage();
-        BeanUtils.copyProperties(wxSubscribeMessageBO, subscribeMessage);
-
-        try {
-            WxMaMsgService msgService = wxMaService.getMsgService();
-            msgService.sendSubscribeMsg(subscribeMessage);
-            return true;
-        } catch (Exception e) {
-            e.printStackTrace();
-            return false;
-        }
-    }
-
-
-}

08.src/Xingxi/xingxi-miniprogram-api/src/main/java/com/xingxi/store/configuration/security/JwtAuthenticationConverter.java

@@ -1,59 +0,0 @@
-package com.xingxi.store.configuration.security;
-
-import com.xingxi.store.common.JWTUtils;
-import cn.com.wingxi.biandan.common.core.domain.entity.SysUser;
-import io.jsonwebtoken.Claims;
-import io.jsonwebtoken.Jws;
-import org.springframework.http.HttpHeaders;
-import org.springframework.security.authentication.BadCredentialsException;
-import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;
-import org.springframework.security.web.authentication.AuthenticationConverter;
-import org.springframework.util.StringUtils;
-
-import javax.servlet.http.HttpServletRequest;
-import java.util.Date;
-
-class JwtAuthenticationConverter implements AuthenticationConverter {
-    public static final String AUTHENTICATION_SCHEME_BEARER = "Bearer";
-
-    public JwtAuthenticationConverter() {
-    }
-
-
-    @Override
-    public UsernamePasswordAuthenticationToken convert(HttpServletRequest request) {
-        String header = request.getHeader(HttpHeaders.AUTHORIZATION);
-        if (header == null) {
-            return null;
-        }
-
-        header = header.trim();
-        if (!StringUtils.startsWithIgnoreCase(header, AUTHENTICATION_SCHEME_BEARER)) {
-            return null;
-        }
-
-        if (header.equalsIgnoreCase(AUTHENTICATION_SCHEME_BEARER)) {
-            throw new BadCredentialsException("Empty bearer authentication token");
-        }
-
-        String bearerToken = header.substring(7);
-        SysUser sysUser = new SysUser();
-
-        try {
-            Jws<Claims> claimsJws = JWTUtils.parseJwt(bearerToken);
-            Claims claimsJwsBody = claimsJws.getBody();
-            String openid = claimsJwsBody.getSubject();
-            Date issuedAt = claimsJwsBody.getIssuedAt();
-            sysUser.setLoginDate(issuedAt);
-            sysUser.setWxOpenId(openid);
-        } catch (Exception e){
-            e.printStackTrace();
-            return null;
-        }
-
-
-        return new UsernamePasswordAuthenticationToken(sysUser, "");
-    }
-
-
-}

08.src/Xingxi/xingxi-miniprogram-api/src/main/java/com/xingxi/store/configuration/security/JwtAuthenticationFilter.java

@@ -1,40 +0,0 @@
-package com.xingxi.store.configuration.security;
-
-import lombok.RequiredArgsConstructor;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;
-import org.springframework.security.core.Authentication;
-import org.springframework.security.core.context.SecurityContextHolder;
-import org.springframework.web.filter.OncePerRequestFilter;
-
-import javax.servlet.FilterChain;
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import java.io.IOException;
-
-
-@Slf4j
-@RequiredArgsConstructor
-class JwtAuthenticationFilter extends OncePerRequestFilter {
-    private final JwtAuthenticationConverter authenticationConverter = new JwtAuthenticationConverter();
-    private final JwtAuthenticationManager jwtAuthenticationManager;
-
-    @Override
-    protected void doFilterInternal(HttpServletRequest request, HttpServletResponse response, FilterChain filterChain) throws ServletException, IOException {
-        log.debug("JwtAuthenticationFilter.doFilterInternal()...");
-        try {
-            UsernamePasswordAuthenticationToken authRequest = this.authenticationConverter.convert(request);
-            if (authRequest != null) {
-                Authentication authResult = jwtAuthenticationManager.authenticate(authRequest);
-                SecurityContextHolder.getContext().setAuthentication(authResult);
-            }
-        } catch (Exception e){
-            e.printStackTrace();
-            SecurityContextHolder.clearContext();
-        }
-
-        filterChain.doFilter(request, response);
-    }
-
-}

08.src/Xingxi/xingxi-miniprogram-api/src/main/java/com/xingxi/store/configuration/security/JwtAuthenticationManager.java

@@ -1,118 +0,0 @@
-package com.xingxi.store.configuration.security;
-
-import cn.com.wingxi.biandan.common.utils.DateUtils;
-import cn.com.wingxi.biandan.common.utils.StringUtils;
-import com.xingxi.store.common.UserContext;
-import com.xingxi.store.data.domain.MercDTO;
-import com.xingxi.store.data.mapper.WxaStoreMerchantMapper;
-import cn.com.wingxi.biandan.common.core.domain.entity.SysDept;
-import cn.com.wingxi.biandan.common.core.domain.entity.SysUser;
-import cn.com.wingxi.biandan.system.customer.domain.PrepareRegistryUser;
-import cn.com.wingxi.biandan.system.customer.mapper.PrepareRegistryUserMapper;
-import cn.com.wingxi.biandan.system.system.mapper.SysDeptMapper;
-import cn.com.wingxi.biandan.system.system.mapper.SysUserMapper;
-import lombok.RequiredArgsConstructor;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.security.authentication.AuthenticationManager;
-import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;
-import org.springframework.security.core.Authentication;
-import org.springframework.security.core.AuthenticationException;
-import org.springframework.stereotype.Component;
-import org.springframework.util.ObjectUtils;
-
-import java.util.ArrayList;
-import java.util.Date;
-
-
-@Slf4j
-@RequiredArgsConstructor
-@Component("JwtAuthenticationManager")
-class JwtAuthenticationManager implements AuthenticationManager {
-    private final SysUserMapper sysUserMapper;
-    private final PrepareRegistryUserMapper prepareRegistryUserMapper;
-    private final WxaStoreMerchantMapper wxaStoreMerchantMapper;
-    private final SysDeptMapper sysDeptMapper;
-
-    @Override
-    public Authentication authenticate(Authentication authentication) throws AuthenticationException {
-        log.debug("JwtAuthenticationManager.authenticate()....");
-        Date now = DateUtils.getNowDate();
-
-        SysUser loginSysUser = (SysUser) authentication.getPrincipal();
-        String wxOpenId = loginSysUser.getWxOpenId();
-        Date loginDate = loginSysUser.getLoginDate();
-
-        SysUser sysUser = sysUserMapper.selectUserByOpenId(wxOpenId);
-        if (ObjectUtils.isEmpty(sysUser)) {
-            log.debug("用户openid[" + wxOpenId + "]不存在");
-            throw new RuntimeException("用户不存在");
-        }
-
-        if (!DateUtils.isSameInstant(loginDate, sysUser.getLoginDate())) {
-            log.debug("token发行时间[" + loginDate + "],当前数据库登录时间[" + sysUser.getLoginDate() + "]");
-            throw new RuntimeException("token过期");
-        }
-
-        Long sellerId = sysUser.getSellerId();
-        MercDTO mercDTO = wxaStoreMerchantMapper.selectMercByMercId(sellerId);
-        if (ObjectUtils.isEmpty(mercDTO)) {
-            log.debug("商户[" + sellerId + "]不存在");
-            throw new RuntimeException("商户不存在");
-        }
-
-        if(StringUtils.isNotEmpty(sysUser.getPhonenumber())) {
-            PrepareRegistryUser prepareRegistryUser = prepareRegistryUserMapper.selectPrepareRegistryUserByPhoneNumber(sysUser.getPhonenumber());
-            if(StringUtils.isNotNull(prepareRegistryUser)) {
-                // 找到预设用户，（如果预设用户被删除，在逻辑删除方法中，有把用户改回微信用户的逻辑）
-                boolean updatePre = false;
-
-                PrepareRegistryUser up = new PrepareRegistryUser();
-                up.setId(prepareRegistryUser.getId());
-
-                // userId is null
-                if(StringUtils.isNull(prepareRegistryUser.getUserId())
-                        || sysUser.getUserId().longValue() != prepareRegistryUser.getUserId().longValue()) {
-                    up.setUserId(sysUser.getUserId());
-                    up.setUserType(sysUser.getUserType());
-                    up.setEffectDate(now);
-                    updatePre = true;
-                }
-                if(StringUtils.isNull(prepareRegistryUser.getEffectDate())) {
-                    up.setEffectDate(now);
-                    updatePre = true;
-                }
-                if(updatePre) {
-                    up.setUpdateUser(String.valueOf(sysUser.getUserId()));
-                    up.setUpdateTime(now);
-                    prepareRegistryUserMapper.updatePrepareRegistryUser(up);
-                }
-
-                if(!prepareRegistryUser.getRegType().equals(sysUser.getUserType())) {
-                    SysUser uu = new SysUser();
-                    uu.setUserId(sysUser.getUserId());
-                    uu.setUserType(prepareRegistryUser.getRegType());
-                    // 20230928 add
-                    uu.setBelongId(prepareRegistryUser.getBelongId());
-                    uu.setUpdateTime(now);
-                    uu.setUpdateUser(String.valueOf(sysUser.getUserId()));
-                    sysUserMapper.updateUser(uu);
-
-                    sysUser.setUserType(prepareRegistryUser.getRegType());
-                }
-            }
-        }
-
-        SysDept sysDept = sysDeptMapper.selectDeptById(sellerId);
-        SysDept parentDept = sysDeptMapper.selectDeptById(sysDept.getParentId());
-        mercDTO.setParentMercId(sysDept.getParentId());
-        mercDTO.setParentDeptType(parentDept.getDeptType());
-        mercDTO.setAfterContacter(sysDept.getAfterContacter());
-        mercDTO.setAfterMobile(sysDept.getAfterMobile());
-        mercDTO.setAfterAddress(sysDept.getAfterAddress());
-        UserContext userContext = new UserContext(sysUser, mercDTO);
-
-        return new UsernamePasswordAuthenticationToken(userContext, null, new ArrayList<>());
-    }
-
-
-}

08.src/Xingxi/xingxi-miniprogram-api/src/main/java/com/xingxi/store/configuration/security/SpringWebSecurityConfiguration.java

@@ -1,9 +1,7 @@
 package com.xingxi.store.configuration.security;
 
-import cn.binarywang.wx.miniapp.api.WxMaService;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
-import me.chanjar.weixin.mp.api.WxMpService;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
@@ -12,20 +10,17 @@ import org.springframework.security.config.annotation.web.builders.WebSecurity;
 import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity;
 import org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter;
 import org.springframework.security.config.http.SessionCreationPolicy;
-import org.springframework.security.web.authentication.UsernamePasswordAuthenticationFilter;
 import org.springframework.web.cors.CorsConfiguration;
 import org.springframework.web.cors.CorsConfigurationSource;
 import org.springframework.web.cors.UrlBasedCorsConfigurationSource;
 
 import java.util.Arrays;
 
-
 @Slf4j
 @Configuration
 @EnableWebSecurity
 @RequiredArgsConstructor
 class SpringWebSecurityConfiguration extends WebSecurityConfigurerAdapter {
-
     @Value("${spring.application.cors.pathPattern}")
     private String pathPattern;
     @Value("${spring.application.cors.allowedMethods}")
@@ -35,15 +30,6 @@ class SpringWebSecurityConfiguration extends WebSecurityConfigurerAdapter {
     @Value("${spring.application.cors.allowedHeaders}")
     private String[] allowedHeaders;
 
-    private final JwtAuthenticationManager jwtAuthenticationManager;
-    private final WxLoginAuthenticationManager wxLoginAuthenticationManager;
-    private final WxAuthenticationSuccessHandler wxAuthenticationSuccessHandler;
-    private final WxAuthenticationFailureHandler wxAuthenticationFailureHandler;
-    private final WxAuthenticationEntryPoint wxAuthenticationEntryPoint;
-    private final WxAccessDeniedHandler wxAccessDeniedHandler;
-    private final WxMaService wxMaService;
-    private final WxMpService wxMpService;
-
     // cors
     @Bean("corsConfigurationSource")
     public CorsConfigurationSource corsConfigurationSource() {
@@ -70,30 +56,8 @@ class SpringWebSecurityConfiguration extends WebSecurityConfigurerAdapter {
                 .anyRequest().authenticated()
                 .and()
                 .exceptionHandling()
-                .authenticationEntryPoint(wxAuthenticationEntryPoint)
-                .accessDeniedHandler(wxAccessDeniedHandler);
-        // 使用WxAppletAuthenticationFilter替换默认的认证过滤器UsernamePasswordAuthenticationFilter
-
-
-        http.addFilterAt(wxLoginAuthenticationProcessingFilter(), UsernamePasswordAuthenticationFilter.class)
-                // 在WxAppletAuthenticationFilter前面添加用于验证jwt，识别用户是否登录的过滤器
-                .addFilterBefore(jwtAuthenticationTokenFilter(), WxLoginAuthenticationProcessingFilter.class);
-    }
-
-
-    @Bean
-    public JwtAuthenticationFilter jwtAuthenticationTokenFilter() {
-        log.debug("JwtAuthenticationFilter created.");
-        return new JwtAuthenticationFilter(jwtAuthenticationManager);
-    }
-
-    @Bean
-    public WxLoginAuthenticationProcessingFilter wxLoginAuthenticationProcessingFilter() {
-        log.debug("WxLoginAuthenticationProcessingFilter created.");
-        WxLoginAuthenticationProcessingFilter filter = new WxLoginAuthenticationProcessingFilter(wxLoginAuthenticationManager, wxMaService, wxMpService);
-        filter.setAuthenticationSuccessHandler(wxAuthenticationSuccessHandler);
-        filter.setAuthenticationFailureHandler(wxAuthenticationFailureHandler);
-        return filter;
+                .authenticationEntryPoint(null)
+                .accessDeniedHandler(null);
     }
 
     @Override

08.src/Xingxi/xingxi-miniprogram-api/src/main/java/com/xingxi/store/configuration/security/WxAccessDeniedHandler.java

@@ -1,23 +0,0 @@
-package com.xingxi.store.configuration.security;
-
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.http.HttpStatus;
-import org.springframework.security.access.AccessDeniedException;
-import org.springframework.security.web.access.AccessDeniedHandler;
-import org.springframework.stereotype.Component;
-
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import java.io.IOException;
-
-
-@Slf4j
-@Component
-class WxAccessDeniedHandler implements AccessDeniedHandler {
-    @Override
-    public void handle(HttpServletRequest request, HttpServletResponse response, AccessDeniedException accessDeniedException) throws IOException, ServletException {
-        // Set the 403 status code.
-        response.setStatus(HttpStatus.FORBIDDEN.value());
-    }
-}

08.src/Xingxi/xingxi-miniprogram-api/src/main/java/com/xingxi/store/configuration/security/WxAuthenticationEntryPoint.java

@@ -1,22 +0,0 @@
-package com.xingxi.store.configuration.security;
-
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.http.HttpStatus;
-import org.springframework.security.core.AuthenticationException;
-import org.springframework.security.web.AuthenticationEntryPoint;
-import org.springframework.stereotype.Component;
-
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import java.io.IOException;
-
-
-@Slf4j
-@Component
-class WxAuthenticationEntryPoint implements AuthenticationEntryPoint {
-    @Override
-    public void commence(HttpServletRequest request, HttpServletResponse response, AuthenticationException authException) throws IOException, ServletException {
-        response.sendError(HttpStatus.UNAUTHORIZED.value(), HttpStatus.UNAUTHORIZED.getReasonPhrase());
-    }
-}

08.src/Xingxi/xingxi-miniprogram-api/src/main/java/com/xingxi/store/configuration/security/WxAuthenticationFailureHandler.java

@@ -1,32 +0,0 @@
-package com.xingxi.store.configuration.security;
-
-import com.xingxi.store.common.ResponseDTO;
-import com.fasterxml.jackson.databind.ObjectMapper;
-import lombok.RequiredArgsConstructor;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.security.core.AuthenticationException;
-import org.springframework.security.web.authentication.AuthenticationFailureHandler;
-import org.springframework.stereotype.Component;
-import org.springframework.util.StringUtils;
-
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import java.io.IOException;
-
-
-@Slf4j
-@Component
-@RequiredArgsConstructor
-class WxAuthenticationFailureHandler implements AuthenticationFailureHandler {
-    private final ObjectMapper objectMapper;
-    @Override
-    public void onAuthenticationFailure(HttpServletRequest request, HttpServletResponse response, AuthenticationException exception) throws IOException, ServletException {
-        String message = StringUtils.hasLength(exception.getMessage()) ? exception.getMessage() : "登录失败";
-        ResponseDTO<Void> responseDTO = new ResponseDTO<>(401);
-        responseDTO.setMessage(message);
-        response.setStatus(401);
-        response.setCharacterEncoding("utf-8");
-        response.getWriter().write(objectMapper.writeValueAsString(responseDTO));
-    }
-}

08.src/Xingxi/xingxi-miniprogram-api/src/main/java/com/xingxi/store/configuration/security/WxAuthenticationSuccessHandler.java

@@ -1,77 +0,0 @@
-package com.xingxi.store.configuration.security;
-
-import cn.com.wingxi.biandan.common.enums.EAppOrgType;
-import com.xingxi.store.common.AccessTokenDTO;
-import com.xingxi.store.common.JWTUtils;
-import com.xingxi.store.common.ResponseDTO;
-import com.xingxi.store.data.domain.UserProfileDTO;
-import cn.com.wingxi.biandan.common.core.domain.entity.SysUser;
-import cn.com.wingxi.biandan.system.merchant.domain.MercWxapp;
-import cn.com.wingxi.biandan.system.merchant.mapper.MercWxappMapper;
-import com.fasterxml.jackson.databind.ObjectMapper;
-import lombok.RequiredArgsConstructor;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.security.core.Authentication;
-import org.springframework.security.web.authentication.AuthenticationSuccessHandler;
-import org.springframework.stereotype.Component;
-
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import java.io.IOException;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-
-@Slf4j
-@Component
-@RequiredArgsConstructor
-class WxAuthenticationSuccessHandler implements AuthenticationSuccessHandler {
-    private final ObjectMapper objectMapper;
-
-    private final MercWxappMapper mercWxappMapper;
-
-    @Override
-    public void onAuthenticationSuccess(HttpServletRequest request, HttpServletResponse response, Authentication authentication) throws IOException, ServletException {
-        log.debug("WxAuthenticationSuccessHandler.onAuthenticationSuccess()...");
-
-        SysUser sysUser = (SysUser) authentication.getPrincipal();
-
-        UserProfileDTO userProfileDTO = new UserProfileDTO();
-        userProfileDTO.setUserType(sysUser.getUserType());
-        userProfileDTO.setUserId(sysUser.getUserId() + "");
-        userProfileDTO.setPhoneNumber(sysUser.getPhonenumber());
-        userProfileDTO.setNickName(sysUser.getUserName());
-        userProfileDTO.setAvatarUrl(sysUser.getAvatar());
-        userProfileDTO.setGender(sysUser.getSex());
-
-        MercWxapp mercWxapp = new MercWxapp();
-        mercWxapp.setUserId(sysUser.getUserId());
-        mercWxapp.setDelFlag("0");
-        mercWxapp.setWithdraw("1");
-        List<MercWxapp> mercWxapps = mercWxappMapper.selectMercWxappList(mercWxapp);
-        if (!mercWxapps.isEmpty()){
-            for (MercWxapp wxapp : mercWxapps) {
-                Map<String, String> test = new HashMap<>(1);
-                test.put(wxapp.getSubMchid(), EAppOrgType.parse(wxapp.getAppOrgType()).getAbbr());
-                userProfileDTO.getSubMchList().add(test);
-            }
-        }
-
-        String accessToken = JWTUtils.generateJwtString(sysUser.getWxOpenId(), sysUser.getLoginDate());
-        String requestId = (String) request.getAttribute("X-REQUEST-ID");
-
-        ResponseDTO<Map<String, Object>> responseDTO = new ResponseDTO<>(200);
-        responseDTO.setRequestId(requestId);
-        responseDTO.setData(new HashMap<String, Object>(){{
-            put("userProfileDTO", userProfileDTO);
-            put("accessTokenDTO", new AccessTokenDTO(accessToken, 14400L));
-        }});
-
-        response.setStatus(200);
-        response.setCharacterEncoding("utf-8");
-        response.getWriter().write(objectMapper.writeValueAsString(responseDTO));
-
-    }
-}

08.src/Xingxi/xingxi-miniprogram-api/src/main/java/com/xingxi/store/configuration/security/WxLoginAuthenticationManager.java

@@ -1,133 +0,0 @@
-package com.xingxi.store.configuration.security;
-
-import com.xingxi.common.core.domain.entity.SysUser;
-import com.xingxi.store.data.domain.MercDTO;
-import com.xingxi.store.data.mapper.WxaStoreMerchantMapper;
-import com.xingxi.system.mapper.SysConfigMapper;
-import com.xingxi.system.mapper.SysUserMapper;
-import lombok.RequiredArgsConstructor;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.context.annotation.Primary;
-import org.springframework.security.authentication.AuthenticationManager;
-import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;
-import org.springframework.security.core.Authentication;
-import org.springframework.security.core.AuthenticationException;
-import org.springframework.stereotype.Component;
-import org.springframework.transaction.annotation.Transactional;
-import org.springframework.util.ObjectUtils;
-
-import java.util.ArrayList;
-import java.util.Calendar;
-import java.util.Date;
-
-@Slf4j
-@RequiredArgsConstructor
-@Component("WxLoginAuthenticationManager")
-@Primary
-public class WxLoginAuthenticationManager implements AuthenticationManager {
-    private final SysUserMapper sysUserMapper;
-    private final SysConfigMapper configMapper;
-    private final WxaStoreMerchantMapper wxaStoreMerchantMapper;
-
-
-    @Transactional
-    @Override
-    public Authentication authenticate(Authentication authentication) throws AuthenticationException {
-        log.debug("WxLoginAuthenticationManager.authenticate()....");
-
-        SysUser loginSysUser = (SysUser) authentication.getPrincipal();
-//        String wxOpenId = loginSysUser.getWxOpenId();
-//        String wxSessionKey = loginSysUser.getWxSessionKey();
-
-        SysUser dbUser = null; //TODO sysUserMapper.selectUserByOpenId(wxOpenId);
-//        if (ObjectUtils.isEmpty(dbUser)) {
-//
-//            dbUser = new SysUser();
-//            dbUser.setLoginName("wx_user");
-//            dbUser.setDeptId(100L);
-//            dbUser.setWxOpenId(wxOpenId);
-//            dbUser.setWxSessionKey(wxSessionKey);
-//            dbUser.setSellerId(getSellerId(loginSysUser.getSellerId(), null));
-//            dbUser.setReferrerId(loginSysUser.getReferrerId());
-//            dbUser.setUserType(EUserType.WECHAT.getVal());
-//            dbUser.setLoginDate(getLoginDate());
-//            dbUser.setCreateUser(wxOpenId);
-//            dbUser.setCreateTime(new Date());
-//            sysUserMapper.insertUser(dbUser);
-//
-//        } else {
-//
-//            SysUser updateSysUser = new SysUser();
-//            updateSysUser.setUserId(dbUser.getUserId());
-//            updateSysUser.setWxSessionKey(wxSessionKey);
-//            updateSysUser.setReferrerId(loginSysUser.getReferrerId());
-//            updateSysUser.setSellerId(getSellerId(loginSysUser.getSellerId(), dbUser));
-//            updateSysUser.setLoginDate(getLoginDate());
-//            updateSysUser.setUpdateUser(wxOpenId);
-//            updateSysUser.setUpdateTime(new Date());
-//            sysUserMapper.updateUser(updateSysUser);
-//
-//            // 后续使用
-//            dbUser.setLoginDate(updateSysUser.getLoginDate());
-//        }
-
-        return new UsernamePasswordAuthenticationToken(dbUser, null, new ArrayList<>());
-    }
-
-
-//    private Long getSellerId(Long sellerId, SysUser dbUser) {
-//        if (ObjectUtils.isEmpty(sellerId)) {
-//            if (dbUser != null) {
-//                Long mercId = dbUser.getSellerId();
-//                MercDTO mercDTO = wxaStoreMerchantMapper.selectMercByMercId(mercId);
-//                if (!ObjectUtils.isEmpty(mercDTO) && mercId.longValue() != 100){
-//                    log.debug("用户直接用既有商户[" + mercId + "]");
-//                    return mercId;
-//                } else {
-//                    log.debug("既有商户[" + mercId + "]无效，");
-//                }
-//            }
-//
-//            // 平台直营商铺
-//            SysConfig info = configMapper.checkConfigKeyUnique(EConfigKeys.PF_MERC_ID.getVal());
-//            if(info != null) {
-//                MercDTO mercDTO = wxaStoreMerchantMapper.selectMercByMercId(Long.valueOf(info.getConfigValue()));
-//                if (!ObjectUtils.isEmpty(mercDTO)) {
-//                    log.debug("进平台直营商户[" + info.getConfigValue() + "]");
-//                    return mercDTO.getMercId();
-//                } else {
-//                    log.debug("平台直营商户[" + info.getConfigValue() + "]无效");
-//                }
-//            }
-//
-//            // 取可用商户id最小的一个商户
-//            Long minMercId = wxaStoreMerchantMapper.selectMinMercId();
-//            if(ObjectUtils.isEmpty(minMercId)){
-//                log.debug("系统没有可用商户");
-//                throw new RuntimeException("系统没有可用商户");
-//            }
-//
-//            log.debug("随机一个商户[" + minMercId + "]");
-//            return minMercId;
-//
-//        } else {
-//            MercDTO mercDTO = wxaStoreMerchantMapper.selectMercByMercId(sellerId);
-//            if (!ObjectUtils.isEmpty(mercDTO)) {
-//                return sellerId;
-//            }
-//
-//            log.debug("用户指定商户[" + sellerId + "]无效");
-//
-//            Long temp = getSellerId(null, dbUser);
-//            return temp;
-//        }
-//    }
-
-
-    private Date getLoginDate() {
-        Calendar instance = Calendar.getInstance();
-        instance.set(Calendar.MILLISECOND, 0);
-        return instance.getTime();
-    }
-
-}

08.src/Xingxi/xingxi-miniprogram-api/src/main/java/com/xingxi/store/configuration/security/WxLoginAuthenticationProcessingFilter.java

@@ -1,77 +0,0 @@
-package com.xingxi.store.configuration.security;
-
-import cn.binarywang.wx.miniapp.api.WxMaService;
-import cn.binarywang.wx.miniapp.bean.WxMaJscode2SessionResult;
-import com.xingxi.common.core.domain.entity.SysUser;
-import com.xingxi.store.common.ApiException;
-import lombok.extern.slf4j.Slf4j;
-import me.chanjar.weixin.common.bean.oauth2.WxOAuth2AccessToken;
-import me.chanjar.weixin.common.error.WxErrorException;
-import me.chanjar.weixin.mp.api.WxMpService;
-import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;
-import org.springframework.security.core.Authentication;
-import org.springframework.security.core.AuthenticationException;
-import org.springframework.security.web.authentication.UsernamePasswordAuthenticationFilter;
-import org.springframework.util.Assert;
-import org.springframework.util.StringUtils;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-@Slf4j
-public class WxLoginAuthenticationProcessingFilter extends UsernamePasswordAuthenticationFilter {
-    private final WxLoginAuthenticationManager authenticationManager;
-    private final WxMaService wxMaService;
-    private final WxMpService wxMpService;
-
-    public WxLoginAuthenticationProcessingFilter(final WxLoginAuthenticationManager authenticationManager, final WxMaService wxMaService, WxMpService wxMpService) {
-        this.authenticationManager = authenticationManager;
-        this.wxMaService = wxMaService;
-        this.wxMpService = wxMpService;
-        setAuthenticationManager(authenticationManager);
-        setFilterProcessesUrl("/api/store/wxlogin");
-    }
-
-    @Override
-    public Authentication attemptAuthentication(HttpServletRequest request, HttpServletResponse response) throws AuthenticationException {
-        log.debug("WxLoginAuthenticationProcessingFilter.attemptAuthentication()....");
-
-        String jsCode = request.getParameter("jsCode");
-        Assert.hasText(jsCode, "jsCode不能为空");
-
-        log.debug("jsCode = " + jsCode);
-        WxMaJscode2SessionResult result = null;
-        WxOAuth2AccessToken accessToken = null;
-        try {
-            accessToken = wxMpService.getOAuth2Service().getAccessToken(jsCode);
-//            result = wxMaService.jsCode2SessionInfo(jsCode);
-        } catch (WxErrorException e) {
-            e.printStackTrace();
-            log.debug("微信登录失败");
-            throw new ApiException("wxlogin.error");
-        }
-
-        String sessionKey = "";
-//        sessionKey = result.getSessionKey();
-        String openid = "";
-//        openid = result.getOpenid();
-
-        openid = accessToken.getOpenId();
-        String xStoreId = request.getHeader("X-Store-Id");
-        String xReferrerId = request.getHeader("X-Referrer-Id");
-
-        SysUser sysUser = new SysUser();
-//        sysUser.setWxOpenId(openid);
-//        sysUser.setWxSessionKey(sessionKey);
-//        if (StringUtils.hasLength(xStoreId)) {
-//            sysUser.setSellerId(Long.parseLong(xStoreId));
-//        }
-//        if (StringUtils.hasLength(xReferrerId)) {
-//            sysUser.setReferrerId(Long.parseLong(xReferrerId));
-//        }
-
-        UsernamePasswordAuthenticationToken token = new UsernamePasswordAuthenticationToken(sysUser, sessionKey);
-        return authenticationManager.authenticate(token);
-    }
-
-}

08.src/Xingxi/xingxi-miniprogram-api/src/main/java/com/xingxi/store/controller/BannerApiController.java

@@ -1,27 +0,0 @@
-package com.xingxi.store.controller;
-
-
-import com.xingxi.store.common.BaseApiController;
-import com.xingxi.store.model.BannerRequest;
-import com.xingxi.store.model.BannerResponse;
-import com.xingxi.store.service.BannerServiceI;
-import lombok.RequiredArgsConstructor;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-
-@Slf4j
-@RequiredArgsConstructor
-@RestController
-@RequestMapping("/api/store/banners")
-public class BannerApiController extends BaseApiController {
-    private final BannerServiceI bannerServiceI;
-
-    @GetMapping
-    public BannerResponse banners(BannerRequest request){
-        return bannerServiceI.queryBanners(getUserContext(), request);
-    }
-
-}

08.src/Xingxi/xingxi-miniprogram-api/src/main/java/com/xingxi/store/controller/BrandStoryApiController.java

@@ -1,25 +0,0 @@
-package com.xingxi.store.controller;
-
-import com.xingxi.store.common.BaseApiController;
-import com.xingxi.store.model.BrandStoryRequest;
-import com.xingxi.store.model.BrandStoryResponse;
-import com.xingxi.store.service.BrandStoryServiceI;
-import lombok.RequiredArgsConstructor;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-
-@Slf4j
-@RequiredArgsConstructor
-@RestController
-@RequestMapping("/api/store/brand-story")
-public class BrandStoryApiController extends BaseApiController {
-    private final BrandStoryServiceI brandStoryServiceI;
-
-    @GetMapping
-    public BrandStoryResponse brandStory(BrandStoryRequest request){
-        return brandStoryServiceI.queryBrandStory(getUserContext(), request);
-    }
-}

08.src/Xingxi/xingxi-miniprogram-api/src/main/java/com/xingxi/store/controller/CustomizeApiController.java

@@ -1,107 +0,0 @@
-package com.xingxi.store.controller;
-
-
-import cn.binarywang.wx.miniapp.api.WxMaService;
-import cn.binarywang.wx.miniapp.bean.security.WxMaMsgSecCheckCheckRequest;
-import cn.binarywang.wx.miniapp.bean.security.WxMaMsgSecCheckCheckResponse;
-import com.xingxi.store.common.ApiException;
-import com.xingxi.store.common.BaseApiController;
-import com.xingxi.store.common.UserContext;
-import com.xingxi.store.data.domain.CustomizeDTO;
-import com.xingxi.store.data.domain.UserAddFontTextDTO;
-import com.xingxi.store.data.domain.UserDesignDTO;
-import com.xingxi.store.model.CustomizeSubmitRequest;
-import com.xingxi.store.model.CustomizeSubmitResponse;
-import com.xingxi.store.service.CustomizeServiceI;
-import cn.com.wingxi.biandan.common.core.domain.entity.SysUser;
-import lombok.RequiredArgsConstructor;
-import lombok.extern.slf4j.Slf4j;
-import me.chanjar.weixin.common.error.WxErrorException;
-import org.springframework.util.StringUtils;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-import javax.validation.Valid;
-import java.util.List;
-
-
-@Slf4j
-@RestController
-@RequiredArgsConstructor
-@RequestMapping("/api/store/customize/submit")
-@Validated
-public class CustomizeApiController extends BaseApiController {
-    private final CustomizeServiceI customizeServiceI;
-
-    private final WxMaService wxMaService;
-
-    @PostMapping
-    public CustomizeSubmitResponse submit(@Valid @RequestBody CustomizeSubmitRequest request) {
-        try {
-//            CustomizeDTO customizeDTO = request.getCustomizeDTO();
-//            msgSecCheck(customizeDTO);
-            return customizeServiceI.customize(getUserContext(), request);
-        } catch (Exception e) {
-            e.printStackTrace();
-            throw new ApiException("customize.submit.error");
-        }
-    }
-
-
-
-
-    private void msgSecCheck(CustomizeDTO customizeDTO) {
-
-        UserContext userContext = getUserContext();
-        SysUser currentUser = userContext.getCurrentUser();
-        String wxOpenId = currentUser.getWxOpenId();
-
-        WxMaMsgSecCheckCheckRequest request = WxMaMsgSecCheckCheckRequest.builder()
-                .openid(wxOpenId)
-                .version("2")
-                .scene(1)
-                .build();
-
-
-        List<UserDesignDTO> designDTOS = customizeDTO.getDesignDTOS();
-        if (!designDTOS.isEmpty()) {
-            for (UserDesignDTO designDTO : designDTOS) {
-                List<UserAddFontTextDTO> fontTextDTOS = designDTO.getFontTextDTOS();
-                if (!fontTextDTOS.isEmpty()) {
-                    for (UserAddFontTextDTO fontTextDTO : fontTextDTOS) {
-                        String textId = fontTextDTO.getTextId();
-                        // 使用的自定义的文字要内容检测
-                        if (!StringUtils.hasLength(textId)) {
-                            List<String> textLines = fontTextDTO.getTextLines();
-                            for (String textLine : textLines) {
-                                request.setContent(textLine);
-                                try {
-                                    WxMaMsgSecCheckCheckResponse wxMaMsgSecCheckCheckResponse = wxMaService.getSecCheckService().checkMessage(request);
-                                    WxMaMsgSecCheckCheckResponse.ResultBean result = wxMaMsgSecCheckCheckResponse.getResult();
-                                    String suggest = result.getSuggest();
-                                    log.debug("msgSecCheck[" + wxMaMsgSecCheckCheckResponse + "]");
-                                    if ("risky".equals(suggest)) {
-                                        throw new RuntimeException();
-                                    }
-                                } catch (WxErrorException e) {
-                                    log.debug("文本检测异常", e);
-                                    // 使用文字不合规
-                                    throw new ApiException("custom.text.error");
-                                }
-                            }
-
-                        }
-                    }
-
-                }
-
-            }
-        }
-
-
-    }
-
-}

08.src/Xingxi/xingxi-miniprogram-api/src/main/java/com/xingxi/store/controller/FontminApiController.java

@@ -1,68 +0,0 @@
-package com.xingxi.store.controller;
-
-import com.xingxi.store.common.ApiException;
-import com.xingxi.store.common.BaseApiController;
-import com.xingxi.store.common.ResponseDTO;
-import com.xingxi.store.model.FontminRequest;
-import com.xingxi.store.model.FontminResponse;
-import lombok.RequiredArgsConstructor;
-import lombok.extern.slf4j.Slf4j;
-import lombok.val;
-import org.springframework.http.HttpEntity;
-import org.springframework.http.HttpHeaders;
-import org.springframework.http.MediaType;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-import org.springframework.web.client.RestTemplate;
-
-import javax.validation.Valid;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-
-@Slf4j
-@RequestMapping("/api/store/fontmin")
-@RestController
-@RequiredArgsConstructor
-@Validated
-public class FontminApiController extends BaseApiController {
-    private final RestTemplate restTemplate = new RestTemplate();
-
-    @PostMapping()
-    public FontminResponse fontmin(@Valid @RequestBody FontminRequest request) {
-
-        List<String> test = callRemoteFontmin(request);
-        if (test.isEmpty()) {
-            throw new ApiException("fontmin.zip.error");
-        }
-
-        return new FontminResponse(test);
-    }
-
-
-    @SuppressWarnings("all")
-    private List<String> callRemoteFontmin(FontminRequest request) {
-        HttpHeaders headers = new HttpHeaders();
-        headers.setContentType(MediaType.APPLICATION_JSON);
-        Map<String, String> data = new HashMap<>(2);
-        data.put("objectName", request.getObjectName());
-        data.put("content", request.getText());
-        HttpEntity<Map<String, String>> req = new HttpEntity<Map<String, String>>(data, headers);
-        val re = restTemplate.postForEntity("http://127.0.0.1:7001/fontmin", req, ResponseDTO.class);
-        log.debug("fontmin[" + re + "]");
-        if (re.getStatusCodeValue() != 200) {
-            throw new RuntimeException("字体服务不可用!!");
-        }
-        ResponseDTO body = re.getBody();
-        if (body != null && body.getData() != null) {
-            return (List<String>) body.getData();
-        } else {
-            throw new RuntimeException("字体压缩失败");
-        }
-    }
-
-}

08.src/Xingxi/xingxi-miniprogram-api/src/main/java/com/xingxi/store/controller/InvoiceVbrkApiController.java

@@ -1,45 +0,0 @@
-package com.xingxi.store.controller;
-
-import com.xingxi.store.common.BaseApiController;
-import com.xingxi.store.model.*;
-import com.xingxi.store.service.UserInvoiceInfoServiceI;
-import lombok.RequiredArgsConstructor;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.*;
-
-import javax.validation.Valid;
-
-
-@Slf4j
-@RequiredArgsConstructor
-@RestController
-@Validated
-@RequestMapping("/api/store/invoice/vbrk")
-public class InvoiceVbrkApiController extends BaseApiController {
-    private final UserInvoiceInfoServiceI userInvoiceInfoServiceI;
-
-    @GetMapping("/list")
-    public InvoiceVbrkListResponse list(InvoiceVbrkListRequest request){
-        return userInvoiceInfoServiceI.list(getUserContext(), request);
-    }
-
-    @PostMapping("/personal")
-    public InvoiceVbrkResponse personal(@Valid @RequestBody InvoiceVbrkPersonalRequest request) {
-        return userInvoiceInfoServiceI.save(getUserContext(), request);
-    }
-
-    @PostMapping("/company")
-    public InvoiceVbrkResponse com(@Valid @RequestBody InvoiceVbrkComRequest request){
-        return userInvoiceInfoServiceI.save(getUserContext(), request);
-    }
-
-
-    @PostMapping("/delete")
-    public InvoiceVbrkResponse delete(@Valid @RequestBody InvoiceVbrkDeleteRequest request){
-        return userInvoiceInfoServiceI.delete(getUserContext(), request);
-    }
-
-
-
-}

08.src/Xingxi/xingxi-miniprogram-api/src/main/java/com/xingxi/store/controller/MaterialApiController.java

@@ -1,42 +0,0 @@
-package com.xingxi.store.controller;
-
-import com.xingxi.store.common.BaseApiController;
-import com.xingxi.store.model.*;
-import com.xingxi.store.service.MaterialServiceI;
-import lombok.RequiredArgsConstructor;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-
-@Slf4j
-@RestController
-@RequestMapping("/api/store/material")
-@RequiredArgsConstructor
-public class MaterialApiController extends BaseApiController {
-    private final MaterialServiceI materialServiceI;
-
-
-    @GetMapping("/category")
-    public MaterialCategoryResponse category(MaterialCategoryRequest request) {
-        return materialServiceI.queryMaterialCategoryList(getUserContext(), request);
-    }
-
-    @GetMapping("/images")
-    public MaterialImageResponse imageMaterial(MaterialImageRequest request) {
-        return materialServiceI.queryMaterialImageList(getUserContext(), request);
-    }
-
-    @GetMapping("/fonts")
-    public MaterialFontResponse fontsMaterial(MaterialFontRequest request) {
-        return materialServiceI.queryMaterialFontList(getUserContext(), request);
-    }
-
-    @GetMapping("/recoword")
-    public MaterialRecowordResponse recoword(MaterialRecowordRequest request) {
-        return materialServiceI.queryMaterialRecowordList(getUserContext(), request);
-    }
-
-
-}

08.src/Xingxi/xingxi-miniprogram-api/src/main/java/com/xingxi/store/controller/MediaUploadApiController.java

@@ -1,78 +0,0 @@
-package com.xingxi.store.controller;
-
-import com.xingxi.common.aliyun.oss.AliyunOSSClient;
-import com.xingxi.common.core.domain.entity.SysUser;
-import com.xingxi.common.utils.uuid.UUID;
-import com.xingxi.store.common.ApiException;
-import com.xingxi.store.common.BaseApiController;
-import com.xingxi.store.common.UserContext;
-import com.xingxi.store.data.domain.MercDTO;
-import com.xingxi.store.model.MediaUploadRequest;
-import com.xingxi.store.model.MediaUploadResponse;
-import com.xingxi.store.service.impl.FileStorageServiceImpl;
-import lombok.RequiredArgsConstructor;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-import org.springframework.web.multipart.MultipartFile;
-
-import javax.validation.Valid;
-import java.io.IOException;
-import java.io.InputStream;
-import java.time.LocalDate;
-
-@Slf4j
-@RestController
-@RequestMapping("/api/store/media/upload")
-@RequiredArgsConstructor
-@Validated
-public class MediaUploadApiController extends BaseApiController {
-    private final AliyunOSSClient ossClient;
-    private final FileStorageServiceImpl fileStorageService;
-
-    @PostMapping
-    public MediaUploadResponse upload(@Valid MediaUploadRequest request) {
-
-        UserContext userContext = getUserContext();
-
-        MercDTO mercDTO = userContext.getMercDTO();
-        Long mercId = mercDTO.getMercId();
-
-        SysUser currentUser = userContext.getCurrentUser();
-        Long userId = currentUser.getUserId();
-
-        MultipartFile multipartFile = request.getFile();
-        String originalFilename = multipartFile.getOriginalFilename();
-
-        String objectName = String.format("OSS/public/customer/upload/%s/%s/%s/original-%s-%s",
-                LocalDate.now(), mercId, userId, UUID.randomUUID(), originalFilename);
-
-        InputStream inputStream = null;
-        try {
-            inputStream = multipartFile.getInputStream();
-            String resourceUrl = ossClient.putObject(objectName, inputStream);
-            String resourceId = fileStorageService.saveFile(getUserContext(), objectName, resourceUrl);
-
-            return new MediaUploadResponse(
-                    resourceId, resourceUrl
-            );
-        } catch (Exception e) {
-            e.printStackTrace();
-            log.debug("上传文件[" + objectName + "]失败");
-            throw new ApiException("media.upload.error");
-        } finally {
-
-            if (inputStream != null) {
-                try {
-                    inputStream.close();
-                } catch (IOException e) {
-                    e.printStackTrace();
-                }
-            }
-
-        }
-
-    }
-}

08.src/Xingxi/xingxi-miniprogram-api/src/main/java/com/xingxi/store/controller/OrderAfterSalesApiController.java

@@ -1,48 +0,0 @@
-package com.xingxi.store.controller;
-
-import com.xingxi.store.common.BaseApiController;
-import cn.com.wingxi.biandan.store.model.*;
-import com.wingxi.xingxi.store.model.*;
-import com.xingxi.store.model.*;
-import com.xingxi.store.service.OrderAftersalesServiceI;
-import lombok.RequiredArgsConstructor;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.*;
-
-import javax.validation.Valid;
-
-
-@Slf4j
-@RestController
-@Validated
-@RequiredArgsConstructor
-@RequestMapping("/api/store/aftersale")
-public class OrderAfterSalesApiController extends BaseApiController {
-    private final OrderAftersalesServiceI orderAftersalesServiceI;
-
-
-    @PostMapping("/apply/submit")
-    public OrderAftersaleApplySubmitResponse submit(@Valid @RequestBody OrderAftersaleApplySubmitRequest request){
-        return orderAftersalesServiceI.aftersalesSave(getUserContext(), request);
-    }
-
-    @GetMapping("/refund/orders")
-    public OrderAfterSalesRefundListResponse refundOrderList(OrderAfterSalesRefundListRequest request){
-        return orderAftersalesServiceI.refundOrderList(getUserContext(), request);
-    }
-
-    @GetMapping("/change/orders")
-    public OrderAfterSalesChangeListResponse changeOrderList(OrderAfterSalesChangeListRequest request){
-        return orderAftersalesServiceI.changeOrderList(getUserContext(),  request);
-    }
-
-
-    @PostMapping(path = "/expno/submit")
-    public OrderAfterSalesSubmitExpNoResponse submitExpNo(@Valid @RequestBody OrderAfterSalesSubmitExpNoRequest request){
-        orderAftersalesServiceI.submitExpNo(getUserContext(),  request);
-        return new OrderAfterSalesSubmitExpNoResponse();
-    }
-
-
-}

08.src/Xingxi/xingxi-miniprogram-api/src/main/java/com/xingxi/store/controller/OrderApiController.java

@@ -1,85 +0,0 @@
-package com.xingxi.store.controller;
-
-import com.xingxi.store.common.BaseApiController;
-import cn.com.wingxi.biandan.store.model.*;
-import com.wingxi.xingxi.store.model.*;
-import com.xingxi.store.model.*;
-import com.xingxi.store.service.OrderServiceI;
-import lombok.RequiredArgsConstructor;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.*;
-
-import javax.validation.Valid;
-
-
-@Slf4j
-@RequiredArgsConstructor
-@RestController
-@Validated
-@RequestMapping("/api/store/order")
-public class OrderApiController extends BaseApiController {
-    private final OrderServiceI orderServiceI;
-
-    @PostMapping("/create")
-    public OrderCreateResponse create(@Valid @RequestBody OrderCreateRequest request){
-        return orderServiceI.createOrder(getUserContext(), request);
-    }
-
-
-    @PostMapping("/close")
-    public OrderCloseResponse close(@Valid @RequestBody OrderCloseRequest request){
-        orderServiceI.closeOrder(getUserContext(), request);
-        return new OrderCloseResponse();
-    }
-
-
-
-    @PostMapping("/finish")
-    public OrderDetailFinishResponse finish(@Valid @RequestBody OrderDetailFinishRequest request){
-        orderServiceI.finish(getUserContext(), request);
-        return new OrderDetailFinishResponse();
-    }
-
-
-    @GetMapping("/query")
-    public OrderQueryResponse query(OrderQueryRequest request){
-        return orderServiceI.queryOrder(getUserContext(), request);
-    }
-
-
-    @GetMapping("/detail")
-    public OrderDetailResponse detail(OrderDetailRequest request){
-        return orderServiceI.get(getUserContext(), request);
-    }
-
-
-    @GetMapping("/subOrderDetail")
-    public SubOrderDetailResponse orderDetail(SubOrderDetailRequest request){
-        return orderServiceI.getOrderDetail(getUserContext(), request);
-    }
-
-
-
-    @PostMapping("/delete")
-    public OrderDeleteResponse delete(@Valid @RequestBody OrderDeleteRequest request){
-        orderServiceI.orderDelete(getUserContext(), request);
-        return new OrderDeleteResponse();
-    }
-
-
-
-    @PostMapping("/continue2pay")
-    public OrderRepayResponse continue2pay(@Valid @RequestBody OrderRepayRequest request){
-        return orderServiceI.orderContinue2pay(getUserContext(), request);
-    }
-
-
-
-    @GetMapping("/logistics")
-    public OrderExpressLogisticsResponse logistics(@Valid OrderExpressLogisticsRequest request){
-        return orderServiceI.getExpressLogistics(getUserContext(), request);
-
-    }
-
-}

08.src/Xingxi/xingxi-miniprogram-api/src/main/java/com/xingxi/store/controller/OrderProxyPayApiController.java

@@ -1,37 +0,0 @@
-package com.xingxi.store.controller;
-
-
-import com.xingxi.store.common.BaseApiController;
-import com.xingxi.store.model.OrderProxyPayInitRequest;
-import com.xingxi.store.model.OrderProxyPayInitResponse;
-import com.xingxi.store.model.OrderProxyPayRequest;
-import com.xingxi.store.model.OrderProxyPayResponse;
-import com.xingxi.store.service.OrderServiceI;
-import lombok.RequiredArgsConstructor;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.*;
-
-import javax.validation.Valid;
-
-
-@Slf4j
-@RestController
-@RequestMapping("/api/store/order/proxy-pay")
-@RequiredArgsConstructor
-@Validated
-public class OrderProxyPayApiController extends BaseApiController {
-    private final OrderServiceI orderServiceI;
-
-    @GetMapping()
-    public OrderProxyPayInitResponse orderProxyPayInit(@Valid OrderProxyPayInitRequest request){
-        return orderServiceI.orderProxyPayInit(getUserContext(), request);
-    }
-
-
-    @PostMapping()
-    public OrderProxyPayResponse orderProxyPay(@Valid @RequestBody OrderProxyPayRequest request){
-        return orderServiceI.orderProxyPay(getUserContext(), request);
-    }
-
-}

08.src/Xingxi/xingxi-miniprogram-api/src/main/java/com/xingxi/store/controller/OrderSettleApiController.java

@@ -1,31 +0,0 @@
-package com.xingxi.store.controller;
-
-import com.xingxi.store.common.BaseApiController;
-import com.xingxi.store.model.OrderSettlefcRequest;
-import com.xingxi.store.model.OrderSettlefcResponse;
-import com.xingxi.store.service.OrderServiceI;
-import lombok.RequiredArgsConstructor;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-import javax.validation.Valid;
-
-
-@Slf4j
-@RestController
-@Validated
-@RequestMapping("/api/store")
-@RequiredArgsConstructor
-public class OrderSettleApiController extends BaseApiController {
-    private final OrderServiceI orderServiceI;
-
-    @PostMapping("/order/2settle")
-    public OrderSettlefcResponse settle(@Valid @RequestBody OrderSettlefcRequest request){
-        return orderServiceI.orderSettleFc(getUserContext(), request);
-    }
-
-}

08.src/Xingxi/xingxi-miniprogram-api/src/main/java/com/xingxi/store/controller/PopuApiController.java

@@ -1,41 +0,0 @@
-package com.xingxi.store.controller;
-
-import com.xingxi.store.common.BaseApiController;
-import cn.com.wingxi.biandan.store.model.*;
-import com.wingxi.xingxi.store.model.*;
-import com.xingxi.store.model.*;
-import com.xingxi.store.service.PopuServiceI;
-import lombok.RequiredArgsConstructor;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.*;
-
-import javax.validation.Valid;
-
-
-@Slf4j
-@RestController
-@Validated
-@RequestMapping("/api/store/popu")
-@RequiredArgsConstructor
-public class PopuApiController extends BaseApiController {
-    private final PopuServiceI popuServiceI;
-
-    @PostMapping("/apply")
-    public ApplyPopuResponse applyPopu(@Valid @RequestBody ApplyPopuRequest request){
-        popuServiceI.applyPopu(getUserContext(), request);
-        return new ApplyPopuResponse();
-    }
-
-    @GetMapping("/promotion-costs")
-    public UserPopuCostsResponse popuCosts(@Valid UserPopuCostsRequest request){
-        return popuServiceI.getPopuCosts(getUserContext(), request);
-    }
-
-
-    @GetMapping("/promotion-costs/detail")
-    public UserPopuCostsDetailResponse popuCostsDetail(@Valid UserPopuCostsDetailRequest request){
-        return popuServiceI.getPopuCostsDetail(getUserContext(),  request);
-    }
-
-}

08.src/Xingxi/xingxi-miniprogram-api/src/main/java/com/xingxi/store/controller/ProductApiController.java

@@ -1,60 +0,0 @@
-package com.xingxi.store.controller;
-
-import com.xingxi.store.common.BaseApiController;
-import cn.com.wingxi.biandan.store.model.*;
-import com.wingxi.xingxi.store.model.*;
-import com.xingxi.store.model.*;
-import com.xingxi.store.service.ProductServiceI;
-import lombok.RequiredArgsConstructor;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-@Slf4j
-@RestController
-@RequestMapping("/api/store/product")
-@RequiredArgsConstructor
-public class ProductApiController extends BaseApiController {
-    private final ProductServiceI productServiceI;
-
-    @GetMapping("/design")
-    public DesignResponse design(DesignRequest request){
-        return productServiceI.queryListByMercId(getUserContext(), request);
-    }
-
-    @GetMapping("/category")
-    public CategoryResponse category(CategoryRequest request){
-        return productServiceI.queryCategoryList(getUserContext(), request);
-    }
-
-    @GetMapping("/brandInfo")
-    public BrandResponse brandInfo(BrandRequest request){
-        return productServiceI.queryBrandInfo(getUserContext(), request);
-    }
-
-    @GetMapping("/brands")
-    public BrandResponse brands(BrandRequest request){
-        return productServiceI.queryListBrands(getUserContext(), request);
-    }
-
-    @GetMapping
-    public ProductResponse get(ProductRequest request) {
-        return productServiceI.queryByProductId(getUserContext(), request);
-    }
-
-    @GetMapping("/attrs")
-    public ProductAttrResponse attr(ProductAttrRequest request){
-        return productServiceI.queryProductAttrList(getUserContext(),  request);
-    }
-
-    @GetMapping("/list")
-    public ProductListResponse list(ProductListRequest request) {
-        return productServiceI.queryPageList(getUserContext(), request);
-    }
-
-    @GetMapping("/share")
-    public ProductResponse share(ProductRequest request) {
-        return productServiceI.shareProduct(getUserContext(), request);
-    }
-}

08.src/Xingxi/xingxi-miniprogram-api/src/main/java/com/xingxi/store/controller/RecommendsProductApiController.java

@@ -1,26 +0,0 @@
-package com.xingxi.store.controller;
-
-import com.xingxi.store.common.BaseApiController;
-import com.xingxi.store.model.RecommendsProductRequest;
-import com.xingxi.store.model.RecommendsProductResponse;
-import com.xingxi.store.service.RecommendsProductServiceI;
-import lombok.RequiredArgsConstructor;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-
-@Slf4j
-@RequiredArgsConstructor
-@RestController
-@RequestMapping("/api/store/recommends")
-public class RecommendsProductApiController extends BaseApiController {
-    private final RecommendsProductServiceI recommendsProductServiceI;
-
-    @GetMapping
-    public RecommendsProductResponse recommends(RecommendsProductRequest request){
-        return recommendsProductServiceI.queryRecommendProducts(getUserContext(), request);
-    }
-
-}

08.src/Xingxi/xingxi-miniprogram-api/src/main/java/com/xingxi/store/controller/ShopEnvApiController.java

@@ -1,26 +0,0 @@
-package com.xingxi.store.controller;
-
-import com.xingxi.store.common.BaseApiController;
-import com.xingxi.store.model.ShopEnvRequest;
-import com.xingxi.store.model.ShopEnvResponse;
-import com.xingxi.store.service.ShopEnvServiceI;
-import lombok.RequiredArgsConstructor;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-
-@Slf4j
-@RequiredArgsConstructor
-@RestController
-@RequestMapping("/api/store/env")
-public class ShopEnvApiController extends BaseApiController {
-    private final ShopEnvServiceI shopEnvServiceI;
-
-    @GetMapping
-    public ShopEnvResponse shopEnv(ShopEnvRequest request){
-        return shopEnvServiceI.env(getUserContext(), request);
-    }
-
-}

08.src/Xingxi/xingxi-miniprogram-api/src/main/java/com/xingxi/store/controller/ShoppingCartsApiController.java

@@ -1,66 +0,0 @@
-package com.xingxi.store.controller;
-
-import com.xingxi.store.common.BaseApiController;
-import cn.com.wingxi.biandan.store.model.*;
-import com.wingxi.xingxi.store.model.*;
-import com.xingxi.store.model.*;
-import com.xingxi.store.service.ShoppingCartsServiceI;
-import lombok.RequiredArgsConstructor;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.*;
-
-import javax.validation.Valid;
-
-
-@Slf4j
-@RestController
-@Validated
-@RequiredArgsConstructor
-@RequestMapping("/api/store/shopping-cart")
-public class ShoppingCartsApiController extends BaseApiController {
-    private final ShoppingCartsServiceI shoppingCartsServiceI;
-
-
-    @PostMapping("/add")
-    public ShoppingCartAddResponse add(@RequestBody @Valid ShoppingCartAddRequest request){
-        return shoppingCartsServiceI.add(getUserContext(),  request);
-    }
-
-
-    @PostMapping("/skucount")
-    public ShoppingCartUpdateResponse skucount(@RequestBody @Valid ShoppingCartSkuCountRequest request){
-        return shoppingCartsServiceI.skucount(getUserContext(), request);
-    }
-
-
-    @PostMapping("/checked")
-    public ShoppingCartUpdateResponse checked(@RequestBody @Valid ShoppingCartCheckedRequest request){
-        return shoppingCartsServiceI.checked(getUserContext(), request);
-    }
-
-
-    @PostMapping("/checkedAll")
-    public ShoppingCartUpdateResponse checkedAll(@RequestBody @Valid ShoppingCartRequest request){
-        return shoppingCartsServiceI.checkedAll(getUserContext(), request);
-    }
-
-
-    @PostMapping("/uncheckedAll")
-    public ShoppingCartUpdateResponse uncheckedAll(@RequestBody @Valid ShoppingCartRequest request){
-        return shoppingCartsServiceI.uncheckedAll(getUserContext(),  request);
-    }
-
-
-    @PostMapping("/delete")
-    public ShoppingCartUpdateResponse delete(@Valid @RequestBody ShoppingCartDeleteRequest request){
-        return shoppingCartsServiceI.delete(getUserContext(),  request);
-    }
-
-    @GetMapping
-    public ShoppingCartResponse list(ShoppingCartRequest request){
-        return shoppingCartsServiceI.list(getUserContext(), request);
-    }
-
-
-}

08.src/Xingxi/xingxi-miniprogram-api/src/main/java/com/xingxi/store/controller/UserAddressApiController.java

@@ -1,56 +0,0 @@
-package com.xingxi.store.controller;
-
-import com.xingxi.store.common.BaseApiController;
-import cn.com.wingxi.biandan.store.model.*;
-import com.wingxi.xingxi.store.model.*;
-import com.xingxi.store.model.*;
-import com.xingxi.store.service.UserAddressServiceI;
-import lombok.RequiredArgsConstructor;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.*;
-
-import javax.validation.Valid;
-
-
-@Slf4j
-@RestController
-@RequiredArgsConstructor
-@Validated
-@RequestMapping("/api/store/user-address")
-public class UserAddressApiController extends BaseApiController {
-    private final UserAddressServiceI userAddressServiceI;
-
-    @GetMapping()
-    public UserAddressListResponse list(UserAddressListRequest request) {
-        return userAddressServiceI.queryList(getUserContext(), request);
-    }
-
-    @PostMapping("/add")
-    public UserAddressSaveResponse add(@Valid @RequestBody UserAddressSaveRequest request) {
-        userAddressServiceI.save(getUserContext(), request);
-        return new UserAddressSaveResponse();
-    }
-
-
-    @PostMapping("/update")
-    public UserAddressSaveResponse update(@Valid @RequestBody UserAddressSaveRequest request) {
-        userAddressServiceI.save(getUserContext(), request);
-        return new UserAddressSaveResponse();
-    }
-
-
-    @PostMapping("/delete")
-    public UserAddressSaveResponse delete(@Valid @RequestBody UserAddressDeleteRequest request) {
-        userAddressServiceI.delete(getUserContext(), request);
-        return new UserAddressSaveResponse();
-    }
-
-    @GetMapping("/get")
-    public UserAddressGetResponse get(UserAddressGetRequest request) {
-        return userAddressServiceI.get(getUserContext(), request);
-    }
-
-
-
-}

08.src/Xingxi/xingxi-miniprogram-api/src/main/java/com/xingxi/store/controller/UserInvoiceApiController.java

@@ -1,43 +0,0 @@
-package com.xingxi.store.controller;
-
-import com.xingxi.store.common.BaseApiController;
-import cn.com.wingxi.biandan.store.model.*;
-import com.wingxi.xingxi.store.model.*;
-import com.xingxi.store.model.*;
-import com.xingxi.store.service.InvoiceOrderServiceI;
-import lombok.RequiredArgsConstructor;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.web.bind.annotation.*;
-
-import javax.validation.Valid;
-
-
-@Slf4j
-@RestController
-@RequestMapping("/api/store/invoice")
-@RequiredArgsConstructor
-public class UserInvoiceApiController extends BaseApiController {
-    private final InvoiceOrderServiceI invoiceOrderServiceI;
-
-    // 可以开发票的订单列表
-    @GetMapping("/orders")
-    public InvoiceOrderListResponse invoiceOrders(InvoiceOrderListRequest request){
-        return invoiceOrderServiceI.getInvoiceOrders(getUserContext(), request);
-    }
-
-    // 我的发票
-    @GetMapping("/my")
-    public UserInvoiceListResponse userInvoiceList(UserInvoiceListRequest request){
-        return invoiceOrderServiceI.getUserInvoiceList(getUserContext(), request);
-    }
-
-
-    // 用户申请发票
-    @PostMapping("/apply")
-    public UserInvoiceApplyResponse apply(@Valid @RequestBody UserInvoiceApplyRequest request){
-        invoiceOrderServiceI.userInvoiceApply(getUserContext(), request);
-        return new UserInvoiceApplyResponse();
-    }
-
-
-}

08.src/Xingxi/xingxi-miniprogram-api/src/main/java/com/xingxi/store/controller/UserProfileApiController.java

@@ -1,8 +1,6 @@
 package com.xingxi.store.controller;
 
 import com.xingxi.store.common.BaseApiController;
-import cn.com.wingxi.biandan.store.model.*;
-import com.wingxi.xingxi.store.model.*;
 import com.xingxi.store.model.*;
 import com.xingxi.store.service.UserProfileServiceI;
 import lombok.RequiredArgsConstructor;
@@ -12,7 +10,6 @@ import org.springframework.web.bind.annotation.*;
 
 import javax.validation.Valid;
 
-
 @Slf4j
 @RequiredArgsConstructor
 @RestController
@@ -28,27 +25,16 @@ public class UserProfileApiController extends BaseApiController {
 
     @PostMapping("/user-profile")
     public UserProfileUpdateResponse userProfileUpdate(@Valid @RequestBody UserProfileUpdateRequest request) {
-        return userProfileServiceI.updateUserProfile(getUserContext(),  request);
-    }
-
-    @PostMapping("/user-profile/bindPhoneNumber")
-    public UserProfileBindPhoneNumResponse bindPhoneNum(@Valid @RequestBody UserProfileBindPhoneNumRequest request){
-        return userProfileServiceI.bindPhoneNum(getUserContext(), request);
-    }
-
-    @GetMapping("/user/design")
-    public UserDesignListResponse userDesignList(UserDesignListRequest request){
-        return userProfileServiceI.queryUserProdDesignList(getUserContext(), request);
+        return userProfileServiceI.updateUserProfile(getUserContext(), request);
     }
 
     @PostMapping("/user-profile/upload-avatar")
-    public UserProfileUpdateResponse saveAvatar(@RequestBody UserProfileUpdateRequest request){
+    public UserProfileUpdateResponse saveAvatar(@RequestBody UserProfileUpdateRequest request) {
         return userProfileServiceI.updateUserAvatar(getUserContext(), request);
     }
 
     @PostMapping("/user-profile/upload-nickname")
-    public UserProfileUpdateResponse saveNickName(@RequestBody UserProfileUpdateRequest request){
+    public UserProfileUpdateResponse saveNickName(@RequestBody UserProfileUpdateRequest request) {
         return userProfileServiceI.updateUserNickName(getUserContext(), request);
     }
-
 }

08.src/Xingxi/xingxi-miniprogram-api/src/main/java/com/xingxi/store/controller/UserProtApiController.java

@@ -1,37 +0,0 @@
-package com.xingxi.store.controller;
-
-
-import com.xingxi.store.common.BaseApiController;
-import com.xingxi.store.model.UserProtRequest;
-import com.xingxi.store.model.UserProtResponse;
-import com.xingxi.store.model.UserProtSignSubmitRequest;
-import com.xingxi.store.model.UserProtSignSubmitResponse;
-import com.xingxi.store.service.UserProtServiceI;
-import lombok.RequiredArgsConstructor;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.*;
-
-import javax.validation.Valid;
-
-
-@Slf4j
-@RestController
-@Validated
-@RequiredArgsConstructor
-@RequestMapping("/api/store/user/prot")
-public class UserProtApiController  extends BaseApiController {
-    private final UserProtServiceI userProtServiceI;
-
-
-    @GetMapping
-    public UserProtResponse index(UserProtRequest request){
-        return userProtServiceI.getUserProt(getUserContext(), request);
-    }
-
-    @PostMapping("/submit")
-    public UserProtSignSubmitResponse submit(@Valid @RequestBody UserProtSignSubmitRequest request){
-        return userProtServiceI.submitProtSignResult(getUserContext(), request);
-    }
-
-}

08.src/Xingxi/xingxi-miniprogram-api/src/main/java/com/xingxi/store/controller/UserWithdrawApiController.java

@@ -1,81 +0,0 @@
-package com.xingxi.store.controller;
-
-import com.xingxi.store.common.BaseApiController;
-import com.xingxi.store.common.UserContext;
-import com.xingxi.store.data.domain.MercDTO;
-import cn.com.wingxi.biandan.store.model.*;
-import com.wingxi.xingxi.store.model.*;
-import com.xingxi.store.model.*;
-import com.xingxi.store.service.UserWithdrawServiceI;
-import cn.com.wingxi.biandan.unifiedpay.bean.BiandanUnifiedpayQuerySubMchCurrBalanceRequest;
-import cn.com.wingxi.biandan.unifiedpay.bean.BiandanUnifiedpayQuerySubMchCurrBalanceResponse;
-import cn.com.wingxi.biandan.unifiedpay.open.BiandanUnifiedpayServiceI;
-import lombok.RequiredArgsConstructor;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.*;
-
-import javax.validation.Valid;
-
-
-@Slf4j
-@RestController
-@Validated
-@RequiredArgsConstructor
-@RequestMapping("/api/store/user-acc")
-public class UserWithdrawApiController extends BaseApiController {
-
-    private final BiandanUnifiedpayServiceI biandanUnifiedpayServiceI;
-    private final UserWithdrawServiceI userWithdrawServiceI;
-
-
-    @GetMapping("/withdraw/his")
-    public UserWithdrawHisResponse userWithdrawHis(@Valid UserWithdrawHisRequest request){
-        return userWithdrawServiceI.queryUserWithdrawHis(getUserContext(),  request);
-    }
-
-    // 提现申请
-    @PostMapping("/withdraw/apply")
-    public UserWithdrawApplyResponse apply(@Valid @RequestBody UserWithdrawApplyRequest request) {
-        userWithdrawServiceI.userWithdraw(getUserContext(), request);
-        return new UserWithdrawApplyResponse();
-    }
-
-
-    // 账户余额
-    @GetMapping("/balance")
-    public UserAccBalanceResponse userAccBalance(@Valid UserAccBalanceRequest request) {
-        return new UserAccBalanceResponse(
-                queryWxMchFundBalance(request.getSubMchId())
-        );
-    }
-
-
-
-    private BiandanUnifiedpayQuerySubMchCurrBalanceResponse queryWxMchFundBalance(String subMchId) {
-        BiandanUnifiedpayQuerySubMchCurrBalanceResponse fundBalanceResult = new BiandanUnifiedpayQuerySubMchCurrBalanceResponse();
-        fundBalanceResult.setAvailableAmount(0);
-        fundBalanceResult.setPendingAmount(0);
-
-        UserContext userContext = getUserContext();
-        MercDTO mercDTO = userContext.getMercDTO();
-        Long mercId = mercDTO.getMercId();
-
-        BiandanUnifiedpayQuerySubMchCurrBalanceRequest request = new BiandanUnifiedpayQuerySubMchCurrBalanceRequest();
-        request.setSubMchid(subMchId);
-        request.setSellerId(mercId);
-
-        try {
-            BiandanUnifiedpayQuerySubMchCurrBalanceResponse response = biandanUnifiedpayServiceI.getResponse(request);
-            fundBalanceResult.setPendingAmount(response.getPendingAmount());
-            fundBalanceResult.setAvailableAmount(response.getAvailableAmount());
-        } catch (Exception e) {
-            e.printStackTrace();
-            log.debug("账户[" + subMchId + "]余额查询异常", e);
-        }
-
-        return fundBalanceResult;
-    }
-
-
-}

08.src/Xingxi/xingxi-miniprogram-api/src/main/java/com/xingxi/store/controller/WxLogoutApiController.java

@@ -1,27 +0,0 @@
-package com.xingxi.store.controller;
-
-import com.xingxi.store.common.BaseApiController;
-import com.xingxi.store.model.WxLogoutRequest;
-import com.xingxi.store.model.WxLogoutResponse;
-import com.xingxi.store.service.WxmaUserServiceI;
-import lombok.RequiredArgsConstructor;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-
-
-@Slf4j
-@RestController
-@RequestMapping("/api/store/wxlogout")
-@RequiredArgsConstructor
-public class WxLogoutApiController extends BaseApiController {
-    private final WxmaUserServiceI wxmaUserServiceI;
-
-    @PostMapping
-    public WxLogoutResponse logout(WxLogoutRequest request){
-        wxmaUserServiceI.userExit(getUserContext(), request);
-        return new WxLogoutResponse();
-    }
-}

08.src/Xingxi/xingxi-miniprogram-api/src/main/java/com/xingxi/store/controller/YdtGroupApiController.java

@@ -1,97 +0,0 @@
-package com.xingxi.store.controller;
-
-import com.xingxi.store.common.BaseApiController;
-import cn.com.wingxi.biandan.store.model.*;
-import com.wingxi.xingxi.store.model.*;
-import com.xingxi.store.model.*;
-import com.xingxi.store.service.YdtGroupServiceI;
-import lombok.RequiredArgsConstructor;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.*;
-
-import javax.validation.Valid;
-
-
-@Slf4j
-@RequiredArgsConstructor
-@RestController
-@RequestMapping("/api/store/ydt")
-@Validated
-public class YdtGroupApiController extends BaseApiController {
-    private final YdtGroupServiceI ydtGroupServiceI;
-
-    @GetMapping("/get")
-    public YdtGetOneDetailResponse get(@Valid YdtGetOneDetailRequest request){
-        return new YdtGetOneDetailResponse(
-                ydtGroupServiceI.get(getUserContext(), request)
-        );
-    }
-
-    @GetMapping("/detail")
-    public YdtGetOneDetailResponse jlGet(@Valid YdtGetOneDetailRequest request){
-        return ydtGroupServiceI.detail(getUserContext(), request);
-    }
-
-
-
-
-    @GetMapping("/list")
-    public YdtListResponse list(@Valid YdtListRequest request) {
-        return new YdtListResponse(
-                ydtGroupServiceI.list(getUserContext(), request)
-        );
-    }
-
-
-
-    @GetMapping("/publish/count")
-    public YdtPublishGroupCountResponse count(YdtPublishGroupCountRequest request){
-        return new YdtPublishGroupCountResponse(
-                ydtGroupServiceI.countPublishGroup(getUserContext(), request)
-        );
-    }
-
-    @GetMapping("/flow/list")
-    public YdtGroupFlowGroupRecordsResponse flowGroupRecords(YdtGroupFlowGroupRecordsRequest request){
-        return new YdtGroupFlowGroupRecordsResponse(
-                ydtGroupServiceI.listFlowGroupRecords(getUserContext(), request)
-        );
-    }
-
-    @GetMapping("/product/list")
-    public YdtProdListResponse prodList(@Valid YdtProdListRequest request){
-        return new YdtProdListResponse(
-                ydtGroupServiceI.productList(getUserContext(), request)
-        );
-    }
-
-    @GetMapping("/product/attrs")
-    public ProductAttrResponse attr(ProductAttrRequest request){
-        return ydtGroupServiceI.queryProductAttrList(getUserContext(),  request);
-    }
-
-
-    @PostMapping("/create")
-    public YdtCreateResponse create(@RequestBody @Valid YdtCreateRequest request) {
-        ydtGroupServiceI.create(getUserContext(), request);
-        return new YdtCreateResponse();
-    }
-
-
-    @PostMapping("/del")
-    public YdtDelResponse del(@RequestBody @Valid YdtDelRequest request){
-        ydtGroupServiceI.delete(getUserContext(), request);
-        return new YdtDelResponse();
-    }
-
-
-
-    @PostMapping("/update")
-    public YdtUpdateResponse update(@RequestBody @Valid YdtUpdateRequest request){
-        ydtGroupServiceI.update(getUserContext(), request);
-        return new YdtUpdateResponse();
-    }
-
-
-}

08.src/Xingxi/xingxi-miniprogram-api/src/main/java/com/xingxi/store/controller/YdtOrderApiController.java

@@ -1,35 +0,0 @@
-package com.xingxi.store.controller;
-
-import com.xingxi.store.common.BaseApiController;
-import com.xingxi.store.model.YdtOrderCreateRequest;
-import com.xingxi.store.model.YdtOrderCreateResponse;
-import com.xingxi.store.service.YdtOrderServiceI;
-import lombok.RequiredArgsConstructor;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-import javax.validation.Valid;
-
-
-@Slf4j
-@RestController
-@RequestMapping("/api/store/ydt/order")
-@RequiredArgsConstructor
-@Validated
-public class YdtOrderApiController extends BaseApiController {
-    private final YdtOrderServiceI ydtOrderServiceI;
-
-    @PostMapping("/create")
-    public YdtOrderCreateResponse createOrder(@RequestBody @Valid YdtOrderCreateRequest request){
-        ydtOrderServiceI.create(getUserContext(), request);
-        return new YdtOrderCreateResponse();
-    }
-
-
-
-
-}

08.src/Xingxi/xingxi-miniprogram-api/src/main/java/com/xingxi/store/data/domain/AfterSaleSettingDTO.java

@@ -1,14 +0,0 @@
-package com.xingxi.store.data.domain;
-
-
-import lombok.Data;
-
-@Data
-public class AfterSaleSettingDTO {
-
-    private String imageCountLimitMin = "2";
-    private String imageCountLimitMax = "6";
-
-    private AfterSalesAddrDTO afterSalesAddrDTO;
-
-}

08.src/Xingxi/xingxi-miniprogram-api/src/main/java/com/xingxi/store/data/domain/AfterSalesAddrDTO.java

@@ -1,11 +0,0 @@
-package com.xingxi.store.data.domain;
-
-
-import lombok.Data;
-
-@Data
-public class AfterSalesAddrDTO {
-    private String afterContacter;
-    private String afterMobile;
-    private String afterAddress;
-}

08.src/Xingxi/xingxi-miniprogram-api/src/main/java/com/xingxi/store/data/domain/BrandDTO.java

@@ -1,18 +0,0 @@
-package com.xingxi.store.data.domain;
-
-import lombok.Getter;
-
-@Getter
-public class BrandDTO {
-    private Long brandId;
-    private String brandName;
-    private Long logoImageId;
-    private String logoImageUrl;
-    private Long brandImageId;
-    private String brandImageUrl;
-    private String brandDesc;
-
-//    private List<ImageDTO> logoImageUrls;
-//    private List<ImageDTO> brandImageUrls;
-
-}

08.src/Xingxi/xingxi-miniprogram-api/src/main/java/com/xingxi/store/data/domain/CategoryDTO.java

@@ -1,10 +0,0 @@
-package com.xingxi.store.data.domain;
-
-
-import lombok.Getter;
-
-@Getter
-public class CategoryDTO {
-    private Long categoryId;
-    private String categoryName;
-}

08.src/Xingxi/xingxi-miniprogram-api/src/main/java/com/xingxi/store/data/domain/ChangeOrderDTO.java

@@ -1,17 +0,0 @@
-package com.xingxi.store.data.domain;
-
-import cn.com.wingxi.biandan.system.order.domain.ChangeOrder;
-import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
-import lombok.Getter;
-import lombok.Setter;
-
-
-@Getter
-@Setter
-@JsonIgnoreProperties({"params"})
-public class ChangeOrderDTO extends ChangeOrder {
-
-    private String expressName;
-    private String expressNo;
-    private String returnExpressNo;
-}

08.src/Xingxi/xingxi-miniprogram-api/src/main/java/com/xingxi/store/data/domain/CommissionMoneyMonthDTO.java

@@ -1,9 +0,0 @@
-package com.xingxi.store.data.domain;
-
-import cn.com.wingxi.biandan.system.report.domain.CommissionMoneyMonth;
-import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
-
-
-@JsonIgnoreProperties({"params"})
-public class CommissionMoneyMonthDTO extends CommissionMoneyMonth {
-}

08.src/Xingxi/xingxi-miniprogram-api/src/main/java/com/xingxi/store/data/domain/CommissionOrderDTO.java

@@ -1,9 +0,0 @@
-package com.xingxi.store.data.domain;
-
-import cn.com.wingxi.biandan.system.order.domain.CommissionOrder;
-import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
-
-
-@JsonIgnoreProperties({"params"})
-public class CommissionOrderDTO extends CommissionOrder {
-}

08.src/Xingxi/xingxi-miniprogram-api/src/main/java/com/xingxi/store/data/domain/CompanyDTO.java

@@ -1,36 +0,0 @@
-package com.xingxi.store.data.domain;
-
-import cn.com.wingxi.biandan.system.master.domain.Company;
-import lombok.Getter;
-import lombok.Setter;
-
-
-@Getter
-@Setter
-public class CompanyDTO extends Company {
-
-    /** 营业执照URL */
-    private String licenseImgUrl;
-
-    /** 法人身份证人像面照片URL */
-    private String legalIdPortraitUrl;
-
-    /** 法人身份证国徽面照片URL */
-    private String legalIdEmblemUrl;
-
-    /** 联系手机 */
-    private String mobile;
-
-    /** 联系邮箱 */
-    private String mailbox;
-
-    private String provName;
-    private String cityName;
-    private String areaName;
-
-    /** 地址 */
-    private String address;
-
-    /** 开票员 */
-    private String invoiceClerk;
-}

08.src/Xingxi/xingxi-miniprogram-api/src/main/java/com/xingxi/store/data/domain/CustomizeDTO.java

@@ -1,26 +0,0 @@
-package com.xingxi.store.data.domain;
-
-import lombok.Getter;
-import lombok.Setter;
-
-import javax.validation.Valid;
-import javax.validation.constraints.NotBlank;
-import javax.validation.constraints.NotEmpty;
-import java.util.List;
-
-
-
-@Getter
-@Setter
-public class CustomizeDTO  {
-    @NotBlank
-    private String productId;
-    @NotBlank
-    private String pprId;
-    private String properties;
-    // 设计信息
-    @NotEmpty
-    @Valid
-    private List<UserDesignDTO> designDTOS;
-
-}

08.src/Xingxi/xingxi-miniprogram-api/src/main/java/com/xingxi/store/data/domain/CustomizeResultImageDTO.java

@@ -1,16 +0,0 @@
-package com.xingxi.store.data.domain;
-
-
-import lombok.AllArgsConstructor;
-import lombok.Data;
-
-@Data
-@AllArgsConstructor
-public class CustomizeResultImageDTO {
-
-    private String designName;
-    private String makeTechText;
-    private String resultImageUrl;
-
-
-}

08.src/Xingxi/xingxi-miniprogram-api/src/main/java/com/xingxi/store/data/domain/ExpressInfoDTO.java

@@ -1,9 +0,0 @@
-package com.xingxi.store.data.domain;
-
-import cn.com.wingxi.biandan.system.order.domain.ExpressInfo;
-import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
-
-
-@JsonIgnoreProperties({"params"})
-public class ExpressInfoDTO extends ExpressInfo {
-}

08.src/Xingxi/xingxi-miniprogram-api/src/main/java/com/xingxi/store/data/domain/ImageDTO.java

@@ -1,14 +0,0 @@
-package com.xingxi.store.data.domain;
-
-
-import lombok.Getter;
-import lombok.Setter;
-
-@Setter
-@Getter
-public class ImageDTO {
-    private Long imageId;
-    private String imageUrl;
-    private String width;
-    private String height;
-}

08.src/Xingxi/xingxi-miniprogram-api/src/main/java/com/xingxi/store/data/domain/InvoiceCompanyInfoDTO.java

@@ -1,24 +0,0 @@
-package com.xingxi.store.data.domain;
-
-
-import cn.com.wingxi.biandan.system.master.domain.Company;
-import lombok.Data;
-
-@Data
-public class InvoiceCompanyInfoDTO {
-
-    private String invoiceBillNo;
-
-    /** 交易区分 */
-    private String tradeType;
-
-    private Company sellerCompany;
-
-    private UserInvoiceTitleDTO buyerCompany;
-
-    public String getPrimaryKey() {
-        String buyerCompanyCode = "01".equals(buyerCompany.getType()) ? buyerCompany.getTaxNumber() : buyerCompany.getType();
-        return sellerCompany.getCompanyCode() + "_" + buyerCompanyCode;
-    }
-
-}

08.src/Xingxi/xingxi-miniprogram-api/src/main/java/com/xingxi/store/data/domain/InvoiceOrderDTO.java

@@ -1,27 +0,0 @@
-package com.xingxi.store.data.domain;
-
-import cn.com.wingxi.biandan.common.enums.EProdType;
-import cn.com.wingxi.biandan.system.order.domain.InvoiceOrder;
-import lombok.Getter;
-import lombok.Setter;
-
-import java.math.BigDecimal;
-import java.util.List;
-
-
-@Getter
-@Setter
-public class InvoiceOrderDTO extends InvoiceOrder {
-
-    private List<ImageDTO> prodImageDTOS;
-    private String buyerName;
-    private String invoiceProdName;
-    private String unitName;
-    private String taxCode;
-    private BigDecimal taxRate;
-
-    public boolean isMaterial(){
-        return (EProdType.MERCMATE.getVal().equals(getProdType())
-                || EProdType.MATERIAL.getVal().equals(getProdType()));
-    }
-}

08.src/Xingxi/xingxi-miniprogram-api/src/main/java/com/xingxi/store/data/domain/InvoiceProductInfoDTO.java

@@ -1,74 +0,0 @@
-package com.xingxi.store.data.domain;
-
-import lombok.Data;
-
-import java.math.BigDecimal;
-import java.util.Objects;
-
-
-@Data
-public class InvoiceProductInfoDTO {
-
-    private String key;
-
-    /** 商品ID */
-    private Long prodId;
-    /** 商品属性ID */
-    private Long propId;
-    /** 订单编号 */
-    private String orderNo;
-
-    //**********************商品信息******************************
-    /** 商品名称 */
-    private String prodName;
-    /** 商品属性名称 */
-    private String propName;
-    /** 商品区分 */
-    private String prodType;
-    /** 赠品区分 */
-    private String giftType;
-    /** 税率 */
-    private String taxRate = "0.01";
-
-    /** 计量单位 */
-    private String unitName;
-
-    /** 数量 */
-    private Integer orderQty;
-
-    /** 金额 */
-    private BigDecimal amount;
-
-    /** 原价金额 */
-    private BigDecimal orgAmount;
-
-    /** 扣减金额 */
-    private BigDecimal deductAmount;
-
-    /** 赠品数量 */
-    private Integer giftQty;
-
-    /** 赠品金额 */
-    private BigDecimal giftAmount;
-
-    /** 单价 */
-    private BigDecimal price;
-
-    /** 税收分类编码 */
-    private String taxCode;
-    //***********************************************************
-
-    @Override
-    public boolean equals(Object o) {
-        InvoiceProductInfoDTO that = (InvoiceProductInfoDTO)o;
-//        return Objects.equals(prodId, that.prodId)
-//                && Objects.equals(propId, that.propId)
-//                && Objects.equals(price, that.price);
-        return Objects.equals(prodId, that.prodId);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(prodId);
-    }
-}

08.src/Xingxi/xingxi-miniprogram-api/src/main/java/com/xingxi/store/data/domain/MakeTechDTO.java

@@ -1,16 +0,0 @@
-package com.xingxi.store.data.domain;
-
-
-import lombok.Data;
-
-@Data
-public class MakeTechDTO {
-    private String id;
-    private String name;
-
-
-    public MakeTechDTO(String id, String name) {
-        this.id = id;
-        this.name = name;
-    }
-}

08.src/Xingxi/xingxi-miniprogram-api/src/main/java/com/xingxi/store/data/domain/MaterialFontDTO.java

@@ -1,45 +0,0 @@
-package com.xingxi.store.data.domain;
-
-import com.xingxi.store.common.PageDTO;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.github.pagehelper.IPage;
-import lombok.Getter;
-import lombok.Setter;
-
-
-@Getter
-@Setter
-public class MaterialFontDTO extends PageDTO implements IPage {
-
-    private Long fontId;
-    private String fontType;
-    private String fontName;
-    private String fontFamily;
-    private String fontUrl;
-
-    public MaterialFontDTO() {
-    }
-
-    public MaterialFontDTO(PageDTO pageDTO, String fontType) {
-        this.fontType = fontType;
-        setPageNum(pageDTO.getPageNum());
-        setPageSize(pageDTO.getPageSize());
-    }
-
-    @Override
-    public Integer getPageNum() {
-        return super.getPageNum();
-    }
-
-    @Override
-    public Integer getPageSize() {
-        return super.getPageSize();
-    }
-
-
-    @JsonIgnore
-    @Override
-    public String getOrderBy() {
-        return "sort ASC";
-    }
-}

08.src/Xingxi/xingxi-miniprogram-api/src/main/java/com/xingxi/store/data/domain/MaterialImageDTO.java

@@ -1,23 +0,0 @@
-package com.xingxi.store.data.domain;
-
-
-import lombok.Getter;
-import lombok.Setter;
-
-import java.math.BigDecimal;
-
-
-@Getter
-@Setter
-public class MaterialImageDTO  {
-
-    private String mercId;
-    private Long materialId;
-    private String mateKindId;
-    private String materialName;
-    private BigDecimal price;
-    private ImageDTO imageDTO;
-
-
-
-}

08.src/Xingxi/xingxi-miniprogram-api/src/main/java/com/xingxi/store/data/domain/MaterialRecowordDTO.java

@@ -1,14 +0,0 @@
-package com.xingxi.store.data.domain;
-
-import lombok.Getter;
-import lombok.Setter;
-
-
-@Getter
-@Setter
-public class MaterialRecowordDTO {
-
-    private String recowordId;
-    private String content;
-
-}

08.src/Xingxi/xingxi-miniprogram-api/src/main/java/com/xingxi/store/data/domain/MercDTO.java

@@ -1,63 +0,0 @@
-package com.xingxi.store.data.domain;
-
-import lombok.Getter;
-import lombok.Setter;
-
-
-@Setter
-@Getter
-public class MercDTO extends Merchant {
-
-    private String subMchid;
-    private String afterContacter;
-    private String afterMobile;
-    private String afterAddress;
-    private Long parentMercId;
-    private String parentDeptType;
-
-    public Long switchMerchant() {
-        return isPopuMerc() ? this.getParentMercId() : getMercId();
-    }
-
-
-    // 推广商户
-    public boolean isPopuMerc(){
-        return "POPULARITY".equals(getMerchantType());
-    }
-
-    /**
-     *  商户收款+微信支付    商户自己上传证书 自己微信支付收款
-     *  商户收款+电商收付通  我们的电商收付通
-     *  平台收款+微信支付    我们的微信支付
-     *
-     *  payment_method
-     *     PLATFORM_PAYMENT 平台收款
-     *     MERCHANT_PAYMENT 商户收款
-     *  payment_channel
-     *     PAYTYPE_WX_PAY 微信支付
-     *     PAYTYPE_WX_ECOMMERCE 微信收付通
-     *
-     * @return payType
-     */
-//    public MercWXPayDTO switchMercWXPay(){
-//        String payType = getPaymentMethod() + getPaymentChannel();
-//        MercWXPayDTO result = null;
-//        switch (payType) {
-//            case "MERCHANT_PAYMENTPAYTYPE_WX_PAY": // 微信支付 商户自己上传证书
-//                result = new MercWXPayDTO("WXPay",  getMercId(), ERoleKey.MERCHANT.getCode());
-//                break;
-//            case "MERCHANT_PAYMENTPAYTYPE_WX_ECOMMERCE": // 电商收付通合单支付
-//                result = new MercWXPayDTO("EcommerceWXPay",  getMercId(), ERoleKey.MERCHANT.getCode());
-//                break;
-//            case "PLATFORM_PAYMENTPAYTYPE_WX_PAY": //微信支付平台支付证书
-//                result = new MercWXPayDTO("WXPay",  100L, ERoleKey.PLATFORM.getCode());
-//                break;
-//            default:
-//                throw new RuntimeException("商户支付方式不支持");
-//        }
-//        return result;
-//    }
-
-
-
-}

08.src/Xingxi/xingxi-miniprogram-api/src/main/java/com/xingxi/store/data/domain/MercProdDTO.java

@@ -1,8 +0,0 @@
-package com.xingxi.store.data.domain;
-
-import cn.com.wingxi.biandan.system.merchant.domain.MercProd;
-
-public class MercProdDTO extends MercProd {
-
-
-}

08.src/Xingxi/xingxi-miniprogram-api/src/main/java/com/xingxi/store/data/domain/MercWXPayDTO.java

@@ -1,13 +0,0 @@
-package com.xingxi.store.data.domain;
-
-
-import lombok.Value;
-
-@Value
-public class MercWXPayDTO {
-
-    String wxpayMethod;
-    Long callWXPayMercId;
-    String callWxPayMercRole;
-
-}

08.src/Xingxi/xingxi-miniprogram-api/src/main/java/com/xingxi/store/data/domain/OrderDTO.java

@@ -1,21 +1,16 @@
 package com.xingxi.store.data.domain;
 
-import cn.com.wingxi.biandan.system.order.domain.Order;
+import com.xingxi.order.domain.Order;
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import lombok.Getter;
 import lombok.Setter;
 
 import java.util.List;
 
-
-
 @Getter
 @Setter
 @JsonIgnoreProperties("params")
 public class OrderDTO extends Order {
-
     private String buyerName;
     private List<OrderDetailDTO> orderDetailDTOS;
-
-
 }

08.src/Xingxi/xingxi-miniprogram-api/src/main/java/com/xingxi/store/data/domain/OrderDetailDTO.java

@@ -1,23 +1,15 @@
 package com.xingxi.store.data.domain;
 
-import cn.com.wingxi.biandan.system.order.domain.OrderDetail;
-import cn.com.wingxi.biandan.system.order.domain.OrderDetailExpr;
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import com.xingxi.order.domain.OrderDetail;
 import lombok.Getter;
 import lombok.Setter;
 
-import java.util.List;
-
-
 @Setter
 @Getter
 @JsonIgnoreProperties("params")
 public class OrderDetailDTO extends OrderDetail {
-
-    private List<ImageDTO> imageDTOS;
-    private List<OrderDetailExprDTO> orderDetailExprs;
     private String afterSalesType;
     private String reason;
     private String materialImageUrl;
-
 }

08.src/Xingxi/xingxi-miniprogram-api/src/main/java/com/xingxi/store/data/domain/OrderDetailExprDTO.java

@@ -1,9 +0,0 @@
-package com.xingxi.store.data.domain;
-
-import cn.com.wingxi.biandan.system.order.domain.OrderDetailExpr;
-import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
-
-
-@JsonIgnoreProperties({"params"})
-public class OrderDetailExprDTO extends OrderDetailExpr {
-}

08.src/Xingxi/xingxi-miniprogram-api/src/main/java/com/xingxi/store/data/domain/OrderSettlefcDTO.java

@@ -1,17 +0,0 @@
-package com.xingxi.store.data.domain;
-
-
-import lombok.Data;
-
-import javax.validation.constraints.NotNull;
-
-@Data
-public class OrderSettlefcDTO {
-
-    private Long productId;
-    private Long pprId;
-    private String resourceId;
-    @NotNull
-    private Integer count;
-
-}

08.src/Xingxi/xingxi-miniprogram-api/src/main/java/com/xingxi/store/data/domain/OrderSettlefcResultDTO.java

@@ -1,13 +0,0 @@
-package com.xingxi.store.data.domain;
-
-import lombok.Value;
-
-import java.math.BigDecimal;
-import java.util.List;
-
-
-@Value
-public class OrderSettlefcResultDTO {
-    List<ProductDTO> productDTOS;
-    BigDecimal settleAmount;
-}

08.src/Xingxi/xingxi-miniprogram-api/src/main/java/com/xingxi/store/data/domain/ProdPriceDTO.java

@@ -1,34 +0,0 @@
-package com.xingxi.store.data.domain;
-
-import cn.com.wingxi.biandan.system.product.domain.ProdPrice;
-import lombok.Getter;
-import lombok.Setter;
-
-import java.math.BigDecimal;
-import java.util.List;
-
-
-@Getter
-@Setter
-public class ProdPriceDTO extends ProdPrice {
-
-
-    private String costItemName;
-
-    private String pprIds;
-
-    private List<ProdPriceDTO> prodPriceVoList;
-
-    private BigDecimal refPrice;
-
-    /** 开票名称 */
-    private String invoiceName;
-
-    /** 税收分类编码 */
-    private String taxCode;
-
-    /** 通用税率 */
-    private BigDecimal taxRate;
-
-    private String unitName;
-}

08.src/Xingxi/xingxi-miniprogram-api/src/main/java/com/xingxi/store/data/domain/ProductAttrDTO.java

@@ -1,13 +0,0 @@
-package com.xingxi.store.data.domain;
-
-import lombok.Data;
-
-import java.util.List;
-
-
-@Data
-public class ProductAttrDTO {
-    private Long id;
-    private String label;
-    private List<ProductAttrDTO> values;
-}

08.src/Xingxi/xingxi-miniprogram-api/src/main/java/com/xingxi/store/data/domain/ProductDTO.java

@@ -1,49 +0,0 @@
-package com.xingxi.store.data.domain;
-
-import cn.com.wingxi.biandan.system.product.domain.Prod;
-import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
-import lombok.Getter;
-import lombok.Setter;
-
-import java.math.BigDecimal;
-import java.util.List;
-
-
-@Setter
-@Getter
-@JsonIgnoreProperties({"params", "brandNames", "mercId", "getBrandNames"})
-public class ProductDTO extends Prod {
-    private String productId;
-    private String orgProductId;
-    private String skuId;
-    private Long pprId;
-    private Long brandId;
-    private String prodName;
-    private String subTitle;
-    private String propertyName;
-    private String prodType;
-    private String pprName;
-    private String brandName;
-    private BigDecimal productPrice;
-    // 供应商吊牌价
-    private BigDecimal productVendorPrice;
-    private String categoryName;
-    private List<ImageDTO> imageUrls;
-    private String description;
-
-    private String unitName;
-    private String mercId;
-    private String[] brandNames;
-
-    private Integer count;
-
-    private String barCodeUrl;
-
-    public String[] getBrandNames() {
-        if (brandName!= null) {
-            return brandName.split(",");
-        } else {
-            return null;
-        }
-    }
-}

08.src/Xingxi/xingxi-miniprogram-api/src/main/java/com/xingxi/store/data/domain/ProductDesignImageDTO.java

@@ -1,33 +0,0 @@
-package com.xingxi.store.data.domain;
-
-
-import lombok.Data;
-
-import java.util.ArrayList;
-import java.util.List;
-
-
-// 商品设计图白板
-
-
-@Data
-public class ProductDesignImageDTO {
-
-    private Long designId;
-    private int surfaceSeq;
-    private String designName;
-    private String suggestTech;
-    private String optionalTech;
-    private List<MakeTechDTO> optionalTechs = new ArrayList<>();
-    private String point1X;
-    private String point1Y;
-    private String point2X;
-    private String point2Y;
-    private String printHeight;
-    private String printWidth;
-    private List<ImageDTO> clearImgs;
-//    private List<ImageDTO> printImgs;
-//    private List<ImageDTO> coverImgs;
-//    private List<ImageDTO> resultImgs;
-
-}

08.src/Xingxi/xingxi-miniprogram-api/src/main/java/com/xingxi/store/data/domain/ProductSkuDTO.java

@@ -1,16 +0,0 @@
-package com.xingxi.store.data.domain;
-
-import lombok.Data;
-
-import java.math.BigDecimal;
-import java.util.List;
-
-
-@Data
-public class ProductSkuDTO {
-    private String id;
-    private String name;
-    private String attrs;
-    private BigDecimal price;
-    private List<ImageDTO> imageUrls;
-}

08.src/Xingxi/xingxi-miniprogram-api/src/main/java/com/xingxi/store/data/domain/ReturnOrderDTO.java

@@ -1,9 +0,0 @@
-package com.xingxi.store.data.domain;
-
-import cn.com.wingxi.biandan.system.order.domain.ReturnOrder;
-import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
-
-
-@JsonIgnoreProperties({"params"})
-public class ReturnOrderDTO extends ReturnOrder {
-}

08.src/Xingxi/xingxi-miniprogram-api/src/main/java/com/xingxi/store/data/domain/ShopBannerDTO.java

@@ -1,16 +0,0 @@
-package com.xingxi.store.data.domain;
-
-import cn.com.wingxi.biandan.system.merchant.domain.ShopBanner;
-import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
-import lombok.Getter;
-import lombok.Setter;
-
-import java.util.List;
-
-
-@Getter
-@Setter
-@JsonIgnoreProperties("params")
-public class ShopBannerDTO extends ShopBanner {
-    private List<ImageDTO> imageDTOS;
-}

08.src/Xingxi/xingxi-miniprogram-api/src/main/java/com/xingxi/store/data/domain/ShopBrandStoryDTO.java

@@ -1,10 +0,0 @@
-package com.xingxi.store.data.domain;
-
-import lombok.Data;
-
-
-@Data
-public class ShopBrandStoryDTO  {
-    private String imageUrl;
-    private String description;
-}

08.src/Xingxi/xingxi-miniprogram-api/src/main/java/com/xingxi/store/data/domain/ShopEnvDTO.java

@@ -1,29 +0,0 @@
-package com.xingxi.store.data.domain;
-
-import cn.com.wingxi.biandan.system.merchant.domain.ShopDeco;
-import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import lombok.Getter;
-import lombok.Setter;
-
-import java.util.List;
-
-
-@Getter
-@Setter
-@JsonIgnoreProperties("params")
-public class ShopEnvDTO extends ShopDeco {
-
-    private List<ShopThemeDTO> shopModelDTOs;
-
-    @JsonProperty("isPopuMerc")
-    private boolean isPopuMerc;
-
-    @JsonProperty("isPfMerc")
-    private boolean isPfMerc;
-
-    private AfterSaleSettingDTO afterSaleSettingDTO;
-
-}
-
-

08.src/Xingxi/xingxi-miniprogram-api/src/main/java/com/xingxi/store/data/domain/ShopRecommendDTO.java

@@ -1,17 +0,0 @@
-package com.xingxi.store.data.domain;
-
-import cn.com.wingxi.biandan.system.merchant.domain.ShopRecommend;
-import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
-import lombok.Getter;
-import lombok.Setter;
-
-import java.util.List;
-
-
-@Getter
-@Setter
-@JsonIgnoreProperties("params")
-public class ShopRecommendDTO extends ShopRecommend {
-    private String headImageUrl;
-    private List<ProductDTO> productDTOS;
-}

08.src/Xingxi/xingxi-miniprogram-api/src/main/java/com/xingxi/store/data/domain/ShopThemeDTO.java

@@ -1,12 +0,0 @@
-package com.xingxi.store.data.domain;
-
-import cn.com.wingxi.biandan.system.merchant.domain.ShopTheme;
-import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
-import lombok.Getter;
-import lombok.Setter;
-
-@Getter
-@Setter
-@JsonIgnoreProperties("params")
-public class ShopThemeDTO extends ShopTheme {
-}

08.src/Xingxi/xingxi-miniprogram-api/src/main/java/com/xingxi/store/data/domain/ShoppingCartDTO.java

@@ -1,33 +0,0 @@
-package com.xingxi.store.data.domain;
-
-
-import cn.com.wingxi.biandan.system.customer.domain.Carts;
-import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
-import lombok.Getter;
-import lombok.Setter;
-
-import java.util.List;
-
-@Getter
-@Setter
-@JsonIgnoreProperties({"params","delFlag", "createUser", "createTime", "updateUser", "updateTime"})
-public class ShoppingCartDTO extends Carts {
-
-    private String shoppingCartId;
-    private String checkedSumAmount;
-    private List<ShoppingCartDTO> shoppingCartDTOS;
-    private ProductDTO productDTO;
-
-    public ShoppingCartDTO() {
-    }
-
-    public ShoppingCartDTO(String checkedSumAmount) {
-        this.checkedSumAmount = checkedSumAmount;
-    }
-
-    public ShoppingCartDTO(String shoppingCartId, String checkedSumAmount, List<ShoppingCartDTO> shoppingCartDTOS) {
-        this.shoppingCartId = shoppingCartId;
-        this.checkedSumAmount = checkedSumAmount;
-        this.shoppingCartDTOS = shoppingCartDTOS;
-    }
-}

08.src/Xingxi/xingxi-miniprogram-api/src/main/java/com/xingxi/store/data/domain/UserAddFontTextDTO.java

@@ -1,31 +0,0 @@
-package com.xingxi.store.data.domain;
-
-import lombok.Data;
-
-import java.util.List;
-
-
-
-// 用户所使用文字
-
-@Data
-public class UserAddFontTextDTO {
-    private String text;
-    private List<String> textLines;
-    private String fontFamily;
-    private String textAlign;
-    private double angle;
-    private double lineHeight;
-    private double scaleX;
-    private double scaleY;
-    private double width;
-    private double height;
-    private double left;
-    private double top;
-    private int fontSize;
-    private String color;
-    private String fontId;
-    private String fontUrl;
-    private String textId;
-
-}

08.src/Xingxi/xingxi-miniprogram-api/src/main/java/com/xingxi/store/data/domain/UserAddMaterialImageDTO.java

@@ -1,24 +0,0 @@
-package com.xingxi.store.data.domain;
-
-
-import lombok.Data;
-
-
-// 用户设计时使用的图片素材
-
-@Data
-public class UserAddMaterialImageDTO {
-
-    // 用户自己上传图片base64
-    private String source;
-    private String imageMaterialId;
-    private String materialId;
-    private double width;
-    private double height;
-    private String color;
-    private double scaleX;
-    private double scaleY;
-    private double angle;
-    private double left;
-    private double top;
-}

08.src/Xingxi/xingxi-miniprogram-api/src/main/java/com/xingxi/store/data/domain/UserAddressDTO.java

@@ -4,10 +4,8 @@ import lombok.Data;
 
 import javax.validation.constraints.NotBlank;
 
-
 @Data
 public class UserAddressDTO {
-
     private Long userAddressId;
     @NotBlank
     private String userName;
@@ -26,9 +24,6 @@ public class UserAddressDTO {
     private String address;
     @NotBlank
     private String defaultFlag;
-
     private String buildingNo;
     private String roomNo;
-
-
 }