1

njzscloud-common/njzscloud-common-gen/src/main/resources/templates/java/entity.btl

@@ -44,7 +44,7 @@ for(column in table.columns) {
     @TableId(type = IdType.ASSIGN_ID)
     <%}%>
     <%if(column.name == "creator_id" || column.name == "create_time"){%>
-    @TableId(fill = FieldFill.INSERT)
+    @TableField(fill = FieldFill.INSERT)
     <%}else if(column.name == "modifier_id" || column.name == "modify_time"){%>
     @TableField(fill = FieldFill.INSERT_UPDATE)
     <%}else if(column.name == "deleted"){%>

njzscloud-common/njzscloud-common-wechat/src/main/java/com/njzscloud/common/wechat/WechatUtil.java

@@ -25,7 +25,7 @@ public class WechatUtil {
         return API.code2Session(param.setAccess_token(accessToken));
     }
 
-    public static void auth() {
+    public synchronized static void auth() {
         if (tokenExpTime <= new Date().getTime() / 1000 + 60) {
             GetAccessTokenResult getAccessTokenResult = API.getAccessToken(new GetAccessTokenParam());
             accessToken = getAccessTokenResult.getAccess_token();

njzscloud-svr/src/main/java/com/njzscloud/dispose/Main.java

@@ -1,4 +1,4 @@
-package com.njzscloud.supervisory;
+package com.njzscloud.dispose;
 
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;

njzscloud-svr/src/main/java/com/njzscloud/dispose/config/AppConfiguration.java

@@ -1,4 +1,4 @@
-package com.njzscloud.supervisory.config;
+package com.njzscloud.dispose.config;
 
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.context.annotation.Configuration;

njzscloud-svr/src/main/java/com/njzscloud/dispose/config/AppProperties.java

@@ -1,4 +1,4 @@
-package com.njzscloud.supervisory.config;
+package com.njzscloud.dispose.config;
 
 import lombok.Getter;
 import lombok.Setter;

njzscloud-svr/src/main/java/com/njzscloud/dispose/config/Example.java

@@ -1,4 +1,4 @@
-package com.njzscloud.supervisory.config;
+package com.njzscloud.dispose.config;
 
 import cn.hutool.core.util.RandomUtil;
 import com.njzscloud.common.sichen.support.Task;

njzscloud-svr/src/main/java/com/njzscloud/dispose/config/SpringReady.java

@@ -1,4 +1,4 @@
-package com.njzscloud.supervisory.config;
+package com.njzscloud.dispose.config;
 
 import com.njzscloud.common.security.util.SecurityUtil;
 import org.springframework.boot.context.event.ApplicationReadyEvent;
@@ -7,7 +7,7 @@ import org.springframework.stereotype.Component;
 
 import java.util.List;
 
-import static com.njzscloud.supervisory.event.SysMittEvent.COERCE_LOGOUT;
+import static com.njzscloud.dispose.event.SysMittEvent.COERCE_LOGOUT;
 
 @Component
 public class SpringReady {

njzscloud-svr/src/main/java/com/njzscloud/dispose/cst/customer/constant/IdentityCategory.java

@@ -0,0 +1,30 @@
+package com.njzscloud.dispose.cst.customer.constant;
+
+import com.njzscloud.common.core.ienum.DictStr;
+import lombok.Getter;
+import lombok.RequiredArgsConstructor;
+
+/**
+ * 字典代码：identity_category
+ * 字典名称：身份类型
+ */
+@Getter
+@RequiredArgsConstructor
+public enum IdentityCategory implements DictStr {
+    PingTai("PingTai", "平台"),
+
+    ChanFei("ChanFei", "产废方"),
+
+    YunShu("YunShu", "运输方"),
+
+    XiaoNa("XiaoNa", "消纳方"),
+
+    CaiGou("CaiGou", "采购方"),
+
+    SiJi("SiJi", "司机"),
+
+    ;
+    private final String val;
+
+    private final String txt;
+}

njzscloud-svr/src/main/java/com/njzscloud/dispose/cst/customer/constant/SettlementWay.java

@@ -0,0 +1,24 @@
+package com.njzscloud.dispose.cst.customer.constant;
+
+import com.njzscloud.common.core.ienum.DictStr;
+import lombok.Getter;
+import lombok.RequiredArgsConstructor;
+
+/**
+ * 字典代码：settlement_way
+ * 字典名称：结算方式
+ */
+@Getter
+@RequiredArgsConstructor
+public enum SettlementWay implements DictStr {
+    YueJie("YueJie", "月结"),
+
+    YuE("YuE", "余额"),
+
+    XianFu("XianFu", "现付"),
+
+    ;
+    private final String val;
+
+    private final String txt;
+}

njzscloud-svr/src/main/java/com/njzscloud/dispose/cst/customer/controller/CustomerController.java

@@ -0,0 +1,66 @@
+package com.njzscloud.dispose.cst.customer.controller;
+
+import com.njzscloud.common.core.utils.R;
+import com.njzscloud.common.mp.support.PageParam;
+import com.njzscloud.common.mp.support.PageResult;
+import com.njzscloud.dispose.cst.customer.pojo.entity.CustomerEntity;
+import com.njzscloud.dispose.cst.customer.service.CustomerService;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+/**
+ * 客户信息
+ */
+@Slf4j
+@RestController
+@RequestMapping("/customer")
+@RequiredArgsConstructor
+public class CustomerController {
+    private final CustomerService customerService;
+
+    /**
+     * 新增
+     */
+    @PostMapping("/add")
+    public R<?> add(@RequestBody CustomerEntity customerEntity) {
+        customerService.add(customerEntity);
+        return R.success();
+    }
+
+    /**
+     * 修改
+     */
+    @PostMapping("/modify")
+    public R<?> modify(@RequestBody CustomerEntity customerEntity) {
+        customerService.modify(customerEntity);
+        return R.success();
+    }
+
+    /**
+     * 删除
+     */
+    @PostMapping("/del")
+    public R<?> del(@RequestBody List<Long> ids) {
+        customerService.del(ids);
+        return R.success();
+    }
+
+    /**
+     * 详情
+     */
+    @GetMapping("/detail")
+    public R<CustomerEntity> detail(@RequestParam Long id) {
+        return R.success(customerService.detail(id));
+    }
+
+    /**
+     * 分页查询
+     */
+    @GetMapping("/paging")
+    public R<PageResult<CustomerEntity>> paging(PageParam pageParam, CustomerEntity customerEntity) {
+        return R.success(customerService.paging(pageParam, customerEntity));
+    }
+}

njzscloud-svr/src/main/java/com/njzscloud/dispose/cst/customer/mapper/CustomerMapper.java

@@ -0,0 +1,12 @@
+package com.njzscloud.dispose.cst.customer.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.njzscloud.dispose.cst.customer.pojo.entity.CustomerEntity;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * 客户信息
+ */
+@Mapper
+public interface CustomerMapper extends BaseMapper<CustomerEntity> {
+}

njzscloud-svr/src/main/java/com/njzscloud/dispose/cst/customer/pojo/entity/CustomerEntity.java

@@ -0,0 +1,94 @@
+package com.njzscloud.dispose.cst.customer.pojo.entity;
+
+import com.baomidou.mybatisplus.annotation.*;
+import com.njzscloud.dispose.cst.customer.constant.IdentityCategory;
+import com.njzscloud.dispose.cst.customer.constant.SettlementWay;
+import lombok.Getter;
+import lombok.Setter;
+import lombok.ToString;
+import lombok.experimental.Accessors;
+
+import java.time.LocalDateTime;
+
+/**
+ * 客户信息
+ */
+@Getter
+@Setter
+@ToString
+@Accessors(chain = true)
+@TableName("cst_customer")
+public class CustomerEntity {
+
+    /**
+     * Id
+     */
+    @TableId(type = IdType.ASSIGN_ID)
+    private Long id;
+
+    /**
+     * 用户 Id；一个用户可以有多个身份
+     */
+    private Long userId;
+
+    /**
+     * 身份类型；多个身份多条数据，PingTai-->平台、ChanFei-->产废方、QingYun-->清运方、XiaoNa-->消纳方、CaiGou-->采购方
+     */
+    private IdentityCategory identityCategory;
+
+    /**
+     * 组织信息 Id；cst_org.id
+     */
+    private Long orgId;
+
+    /**
+     * 客户姓名
+     */
+    private String customerName;
+
+    /**
+     * 客户联系电话
+     */
+    private String phone;
+
+    /**
+     * 结算方式，YueJie-->月结、YuE-->余额、XianFu-->现付
+     */
+    private SettlementWay settlementWay;
+
+    /**
+     * 是否管理员；是否为当前的组织管理员，0-->否、1-->是
+     */
+    private Boolean manager;
+
+    /**
+     * 创建人 Id；sys_user.id
+     */
+    @TableField(fill = FieldFill.INSERT)
+    private Long creatorId;
+
+    /**
+     * 修改人 Id；sys_user.id
+     */
+    @TableField(fill = FieldFill.INSERT_UPDATE)
+    private Long modifierId;
+
+    /**
+     * 创建时间
+     */
+    @TableField(fill = FieldFill.INSERT)
+    private LocalDateTime createTime;
+
+    /**
+     * 修改时间
+     */
+    @TableField(fill = FieldFill.INSERT_UPDATE)
+    private LocalDateTime modifyTime;
+
+    /**
+     * 是否删除；0-->未删除、1-->已删除
+     */
+    @TableLogic
+    private Boolean deleted;
+
+}

njzscloud-svr/src/main/java/com/njzscloud/dispose/cst/customer/service/CustomerService.java

@@ -0,0 +1,60 @@
+package com.njzscloud.dispose.cst.customer.service;
+
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.njzscloud.common.mp.support.PageParam;
+import com.njzscloud.common.mp.support.PageResult;
+import com.njzscloud.dispose.cst.customer.mapper.CustomerMapper;
+import com.njzscloud.dispose.cst.customer.pojo.entity.CustomerEntity;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.List;
+
+/**
+ * 客户信息
+ */
+@Slf4j
+@Service
+@RequiredArgsConstructor
+public class CustomerService extends ServiceImpl<CustomerMapper, CustomerEntity> implements IService<CustomerEntity> {
+
+    /**
+     * 新增
+     */
+    public void add(CustomerEntity customerEntity) {
+        this.save(customerEntity);
+    }
+
+    /**
+     * 修改
+     */
+    public void modify(CustomerEntity customerEntity) {
+        this.updateById(customerEntity);
+    }
+
+    /**
+     * 删除
+     */
+    @Transactional(rollbackFor = Exception.class)
+    public void del(List<Long> ids) {
+        this.removeBatchByIds(ids);
+    }
+
+    /**
+     * 详情
+     */
+    public CustomerEntity detail(Long id) {
+        return this.getById(id);
+    }
+
+    /**
+     * 分页查询
+     */
+    public PageResult<CustomerEntity> paging(PageParam pageParam, CustomerEntity customerEntity) {
+        return PageResult.of(this.page(pageParam.toPage(), Wrappers.<CustomerEntity>query(customerEntity)));
+    }
+}

njzscloud-svr/src/main/java/com/njzscloud/dispose/cst/org/constant/OrgCategory.java

@@ -0,0 +1,24 @@
+package com.njzscloud.dispose.cst.org.constant;
+
+import com.njzscloud.common.core.ienum.DictStr;
+import lombok.Getter;
+import lombok.RequiredArgsConstructor;
+
+/**
+ * 字典代码：org_category
+ * 字典名称：主体类型
+ */
+@Getter
+@RequiredArgsConstructor
+public enum OrgCategory implements DictStr {
+    GeTiHu("GeTiHu", "个体户"),
+
+    QiYe("QiYe", "企业"),
+
+    ;
+    private final String val;
+
+    private final String txt;
+}
+
+

njzscloud-svr/src/main/java/com/njzscloud/dispose/cst/org/controller/OrgController.java

@@ -0,0 +1,66 @@
+package com.njzscloud.dispose.cst.org.controller;
+
+import com.njzscloud.common.core.utils.R;
+import com.njzscloud.common.mp.support.PageParam;
+import com.njzscloud.common.mp.support.PageResult;
+import com.njzscloud.dispose.cst.org.pojo.entity.OrgEntity;
+import com.njzscloud.dispose.cst.org.service.OrgService;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+/**
+ * 组织信息
+ */
+@Slf4j
+@RestController
+@RequestMapping("/org")
+@RequiredArgsConstructor
+public class OrgController {
+    private final OrgService orgService;
+
+    /**
+     * 新增
+     */
+    @PostMapping("/add")
+    public R<?> add(@RequestBody OrgEntity orgEntity) {
+        orgService.add(orgEntity);
+        return R.success();
+    }
+
+    /**
+     * 修改
+     */
+    @PostMapping("/modify")
+    public R<?> modify(@RequestBody OrgEntity orgEntity) {
+        orgService.modify(orgEntity);
+        return R.success();
+    }
+
+    /**
+     * 删除
+     */
+    @PostMapping("/del")
+    public R<?> del(@RequestBody List<Long> ids) {
+        orgService.del(ids);
+        return R.success();
+    }
+
+    /**
+     * 详情
+     */
+    @GetMapping("/detail")
+    public R<OrgEntity> detail(@RequestParam Long id) {
+        return R.success(orgService.detail(id));
+    }
+
+    /**
+     * 分页查询
+     */
+    @GetMapping("/paging")
+    public R<PageResult<OrgEntity>> paging(PageParam pageParam, OrgEntity orgEntity) {
+        return R.success(orgService.paging(pageParam, orgEntity));
+    }
+}

njzscloud-svr/src/main/java/com/njzscloud/dispose/cst/org/mapper/OrgMapper.java

@@ -0,0 +1,12 @@
+package com.njzscloud.dispose.cst.org.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.njzscloud.dispose.cst.org.pojo.entity.OrgEntity;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * 组织信息
+ */
+@Mapper
+public interface OrgMapper extends BaseMapper<OrgEntity> {
+}

njzscloud-svr/src/main/java/com/njzscloud/dispose/cst/org/pojo/entity/OrgEntity.java

@@ -0,0 +1,173 @@
+package com.njzscloud.dispose.cst.org.pojo.entity;
+
+import com.baomidou.mybatisplus.annotation.*;
+import com.njzscloud.dispose.cst.org.constant.OrgCategory;
+import lombok.Getter;
+import lombok.Setter;
+import lombok.ToString;
+import lombok.experimental.Accessors;
+
+import java.time.LocalDateTime;
+
+/**
+ * 组织信息
+ */
+@Getter
+@Setter
+@ToString
+@Accessors(chain = true)
+@TableName("cst_org")
+public class OrgEntity {
+
+    /**
+     * Id
+     */
+    @TableId(type = IdType.ASSIGN_ID)
+    private Long id;
+
+    /**
+     * 主体类型，GeTiHu-->个体户、QiYe-->企业
+     */
+    private OrgCategory orgCategory;
+
+    /**
+     * 统一社会信用代码
+     */
+    private String uscc;
+
+    /**
+     * 组织名称
+     */
+    private String orgName;
+
+    /**
+     * 营业执照
+     */
+    private String businessLicense;
+
+    /**
+     * 营业执照有效期
+     */
+    private LocalDateTime licenseStartTime;
+
+    /**
+     * 营业执照有效期
+     */
+    private LocalDateTime licenseEndTime;
+
+    /**
+     * 法人名称
+     */
+    private String legalRepresentative;
+
+    /**
+     * 法人身份证号
+     */
+    private String idcard;
+
+    /**
+     * 法人身份证有效期
+     */
+    private LocalDateTime idcardStartTime;
+
+    /**
+     * 法人身份证有效期
+     */
+    private LocalDateTime idcardEndTime;
+
+    /**
+     * 法人身份证正面
+     */
+    private String idcardFront;
+
+    /**
+     * 法人身份证反面
+     */
+    private String idcardBack;
+
+    /**
+     * 省；代码
+     */
+    private String province;
+
+    /**
+     * 市；代码
+     */
+    private String city;
+
+    /**
+     * 区县；代码
+     */
+    private String area;
+
+    /**
+     * 乡镇街道；代码
+     */
+    private String town;
+
+    /**
+     * 省；名称
+     */
+    private String provinceName;
+
+    /**
+     * 市；名称
+     */
+    private String cityName;
+
+    /**
+     * 区县；名称
+     */
+    private String areaName;
+
+    /**
+     * 乡镇街道；名称
+     */
+    private String townName;
+
+    /**
+     * 详细地址
+     */
+    private String address;
+
+    /**
+     * 经度
+     */
+    private Double lng;
+
+    /**
+     * 纬度
+     */
+    private Double lat;
+
+    /**
+     * 创建人 Id； sys_user.id
+     */
+    @TableField(fill = FieldFill.INSERT)
+    private Long creatorId;
+
+    /**
+     * 修改人 Id； sys_user.id
+     */
+    @TableField(fill = FieldFill.INSERT_UPDATE)
+    private Long modifierId;
+
+    /**
+     * 创建时间
+     */
+    @TableField(fill = FieldFill.INSERT)
+    private LocalDateTime createTime;
+
+    /**
+     * 修改时间
+     */
+    @TableField(fill = FieldFill.INSERT_UPDATE)
+    private LocalDateTime modifyTime;
+
+    /**
+     * 是否删除； 0-->未删除、1-->已删除
+     */
+    @TableLogic
+    private Boolean deleted;
+
+}

njzscloud-svr/src/main/java/com/njzscloud/dispose/cst/org/service/OrgService.java

@@ -0,0 +1,60 @@
+package com.njzscloud.dispose.cst.org.service;
+
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.njzscloud.common.mp.support.PageParam;
+import com.njzscloud.common.mp.support.PageResult;
+import com.njzscloud.dispose.cst.org.mapper.OrgMapper;
+import com.njzscloud.dispose.cst.org.pojo.entity.OrgEntity;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.List;
+
+/**
+ * 组织信息
+ */
+@Slf4j
+@Service
+@RequiredArgsConstructor
+public class OrgService extends ServiceImpl<OrgMapper, OrgEntity> implements IService<OrgEntity> {
+
+    /**
+     * 新增
+     */
+    public void add(OrgEntity orgEntity) {
+        this.save(orgEntity);
+    }
+
+    /**
+     * 修改
+     */
+    public void modify(OrgEntity orgEntity) {
+        this.updateById(orgEntity);
+    }
+
+    /**
+     * 删除
+     */
+    @Transactional(rollbackFor = Exception.class)
+    public void del(List<Long> ids) {
+        this.removeBatchByIds(ids);
+    }
+
+    /**
+     * 详情
+     */
+    public OrgEntity detail(Long id) {
+        return this.getById(id);
+    }
+
+    /**
+     * 分页查询
+     */
+    public PageResult<OrgEntity> paging(PageParam pageParam, OrgEntity orgEntity) {
+        return PageResult.of(this.page(pageParam.toPage(), Wrappers.<OrgEntity>query(orgEntity)));
+    }
+}

njzscloud-svr/src/main/java/com/njzscloud/dispose/event/SysMittEvent.java

@@ -1,4 +1,4 @@
-package com.njzscloud.supervisory.event;
+package com.njzscloud.dispose.event;
 
 import com.njzscloud.common.core.mitt.MittEvent;
 

njzscloud-svr/src/main/java/com/njzscloud/dispose/sys/auth/controller/AuthController.java

@@ -1,9 +1,9 @@
-package com.njzscloud.supervisory.sys.auth.controller;
+package com.njzscloud.dispose.sys.auth.controller;
 
 import com.njzscloud.common.core.utils.R;
 import com.njzscloud.common.security.support.UserDetail;
 import com.njzscloud.common.security.util.SecurityUtil;
-import com.njzscloud.supervisory.sys.auth.service.AuthService;
+import com.njzscloud.dispose.sys.auth.service.AuthService;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.web.bind.annotation.GetMapping;

njzscloud-svr/src/main/java/com/njzscloud/dispose/sys/auth/mapper/AuthMapper.java

@@ -1,9 +1,9 @@
-package com.njzscloud.supervisory.sys.auth.mapper;
+package com.njzscloud.dispose.sys.auth.mapper;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.njzscloud.supervisory.sys.auth.pojo.result.EndpointResource;
-import com.njzscloud.supervisory.sys.auth.pojo.result.MenuResource;
-import com.njzscloud.supervisory.sys.auth.pojo.result.MyResult;
+import com.njzscloud.dispose.sys.auth.pojo.result.EndpointResource;
+import com.njzscloud.dispose.sys.auth.pojo.result.MenuResource;
+import com.njzscloud.dispose.sys.auth.pojo.result.MyResult;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 

njzscloud-svr/src/main/java/com/njzscloud/dispose/sys/auth/mapper/SysTokenMapper.java

@@ -1,7 +1,7 @@
-package com.njzscloud.supervisory.sys.auth.mapper;
+package com.njzscloud.dispose.sys.auth.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.njzscloud.supervisory.sys.auth.pojo.entity.SysTokenEntity;
+import com.njzscloud.dispose.sys.auth.pojo.entity.SysTokenEntity;
 import org.apache.ibatis.annotations.Mapper;
 
 /**

njzscloud-svr/src/main/java/com/njzscloud/dispose/sys/auth/pojo/entity/SysTokenEntity.java

@@ -1,4 +1,4 @@
-package com.njzscloud.supervisory.sys.auth.pojo.entity;
+package com.njzscloud.dispose.sys.auth.pojo.entity;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;

njzscloud-svr/src/main/java/com/njzscloud/dispose/sys/auth/pojo/result/EndpointResource.java

@@ -1,4 +1,4 @@
-package com.njzscloud.supervisory.sys.auth.pojo.result;
+package com.njzscloud.dispose.sys.auth.pojo.result;
 
 import lombok.Getter;
 import lombok.Setter;

njzscloud-svr/src/main/java/com/njzscloud/dispose/sys/auth/pojo/result/MenuResource.java

@@ -1,4 +1,4 @@
-package com.njzscloud.supervisory.sys.auth.pojo.result;
+package com.njzscloud.dispose.sys.auth.pojo.result;
 
 import lombok.Getter;
 import lombok.Setter;

njzscloud-svr/src/main/java/com/njzscloud/dispose/sys/auth/pojo/result/MyResult.java

@@ -1,7 +1,7 @@
-package com.njzscloud.supervisory.sys.auth.pojo.result;
+package com.njzscloud.dispose.sys.auth.pojo.result;
 
 import com.njzscloud.common.security.support.UserDetail;
-import com.njzscloud.supervisory.sys.user.contant.Gender;
+import com.njzscloud.dispose.sys.user.constant.Gender;
 import lombok.Getter;
 import lombok.Setter;
 import lombok.experimental.Accessors;

njzscloud-svr/src/main/java/com/njzscloud/dispose/sys/auth/service/AuthService.java

@@ -1,4 +1,4 @@
-package com.njzscloud.supervisory.sys.auth.service;
+package com.njzscloud.dispose.sys.auth.service;
 
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.util.StrUtil;
@@ -7,10 +7,10 @@ import com.njzscloud.common.security.module.password.PasswordLoginForm;
 import com.njzscloud.common.security.module.wechat.mini.WechatMiniLoginForm;
 import com.njzscloud.common.security.support.IAuthService;
 import com.njzscloud.common.security.support.UserDetail;
-import com.njzscloud.supervisory.sys.auth.mapper.AuthMapper;
-import com.njzscloud.supervisory.sys.auth.pojo.result.EndpointResource;
-import com.njzscloud.supervisory.sys.auth.pojo.result.MenuResource;
-import com.njzscloud.supervisory.sys.auth.pojo.result.MyResult;
+import com.njzscloud.dispose.sys.auth.mapper.AuthMapper;
+import com.njzscloud.dispose.sys.auth.pojo.result.EndpointResource;
+import com.njzscloud.dispose.sys.auth.pojo.result.MenuResource;
+import com.njzscloud.dispose.sys.auth.pojo.result.MyResult;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;

njzscloud-svr/src/main/java/com/njzscloud/dispose/sys/auth/service/TokenService.java

@@ -1,4 +1,4 @@
-package com.njzscloud.supervisory.sys.auth.service;
+package com.njzscloud.dispose.sys.auth.service;
 
 import cn.hutool.cache.CacheUtil;
 import cn.hutool.cache.impl.TimedCache;
@@ -8,8 +8,8 @@ import com.njzscloud.common.security.contant.Constants;
 import com.njzscloud.common.security.support.ITokenService;
 import com.njzscloud.common.security.support.Token;
 import com.njzscloud.common.security.support.UserDetail;
-import com.njzscloud.supervisory.sys.auth.mapper.SysTokenMapper;
-import com.njzscloud.supervisory.sys.auth.pojo.entity.SysTokenEntity;
+import com.njzscloud.dispose.sys.auth.mapper.SysTokenMapper;
+import com.njzscloud.dispose.sys.auth.pojo.entity.SysTokenEntity;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
 

njzscloud-svr/src/main/java/com/njzscloud/dispose/sys/dict/controller/DictController.java

@@ -1,11 +1,11 @@
-package com.njzscloud.supervisory.sys.dict.controller;
+package com.njzscloud.dispose.sys.dict.controller;
 
 import com.njzscloud.common.core.utils.R;
 import com.njzscloud.common.mp.support.PageParam;
 import com.njzscloud.common.mp.support.PageResult;
-import com.njzscloud.supervisory.sys.dict.pojo.DictEntity;
-import com.njzscloud.supervisory.sys.dict.pojo.ObtainDictDataResult;
-import com.njzscloud.supervisory.sys.dict.service.DictService;
+import com.njzscloud.dispose.sys.dict.pojo.DictEntity;
+import com.njzscloud.dispose.sys.dict.pojo.ObtainDictDataResult;
+import com.njzscloud.dispose.sys.dict.service.DictService;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.web.bind.annotation.*;

njzscloud-svr/src/main/java/com/njzscloud/dispose/sys/dict/controller/SysDictItemController.java

@@ -1,10 +1,10 @@
-package com.njzscloud.supervisory.sys.dict.controller;
+package com.njzscloud.dispose.sys.dict.controller;
 
 import com.njzscloud.common.core.utils.R;
 import com.njzscloud.common.mp.support.PageParam;
 import com.njzscloud.common.mp.support.PageResult;
-import com.njzscloud.supervisory.sys.dict.pojo.DictItemEntity;
-import com.njzscloud.supervisory.sys.dict.service.DictItemService;
+import com.njzscloud.dispose.sys.dict.pojo.DictItemEntity;
+import com.njzscloud.dispose.sys.dict.service.DictItemService;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.web.bind.annotation.*;

njzscloud-svr/src/main/java/com/njzscloud/dispose/sys/dict/mapper/DictItemMapper.java

@@ -1,7 +1,7 @@
-package com.njzscloud.supervisory.sys.dict.mapper;
+package com.njzscloud.dispose.sys.dict.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.njzscloud.supervisory.sys.dict.pojo.DictItemEntity;
+import com.njzscloud.dispose.sys.dict.pojo.DictItemEntity;
 import org.apache.ibatis.annotations.Mapper;
 
 /**

njzscloud-svr/src/main/java/com/njzscloud/dispose/sys/dict/mapper/DictMapper.java

@@ -1,7 +1,7 @@
-package com.njzscloud.supervisory.sys.dict.mapper;
+package com.njzscloud.dispose.sys.dict.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.njzscloud.supervisory.sys.dict.pojo.DictEntity;
+import com.njzscloud.dispose.sys.dict.pojo.DictEntity;
 import org.apache.ibatis.annotations.Mapper;
 
 /**

njzscloud-svr/src/main/java/com/njzscloud/dispose/sys/dict/pojo/DictEntity.java

@@ -1,4 +1,4 @@
-package com.njzscloud.supervisory.sys.dict.pojo;
+package com.njzscloud.dispose.sys.dict.pojo;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;

njzscloud-svr/src/main/java/com/njzscloud/dispose/sys/dict/pojo/DictItemEntity.java

@@ -1,4 +1,4 @@
-package com.njzscloud.supervisory.sys.dict.pojo;
+package com.njzscloud.dispose.sys.dict.pojo;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;

njzscloud-svr/src/main/java/com/njzscloud/dispose/sys/dict/pojo/ObtainDictDataResult.java

@@ -1,4 +1,4 @@
-package com.njzscloud.supervisory.sys.dict.pojo;
+package com.njzscloud.dispose.sys.dict.pojo;
 
 import lombok.Getter;
 import lombok.Setter;

njzscloud-svr/src/main/java/com/njzscloud/dispose/sys/dict/service/DictItemService.java

@@ -1,4 +1,4 @@
-package com.njzscloud.supervisory.sys.dict.service;
+package com.njzscloud.dispose.sys.dict.service;
 
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.lang.Assert;
@@ -9,8 +9,8 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.njzscloud.common.core.ex.Exceptions;
 import com.njzscloud.common.mp.support.PageParam;
 import com.njzscloud.common.mp.support.PageResult;
-import com.njzscloud.supervisory.sys.dict.mapper.DictItemMapper;
-import com.njzscloud.supervisory.sys.dict.pojo.DictItemEntity;
+import com.njzscloud.dispose.sys.dict.mapper.DictItemMapper;
+import com.njzscloud.dispose.sys.dict.pojo.DictItemEntity;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;

njzscloud-svr/src/main/java/com/njzscloud/dispose/sys/dict/service/DictService.java

@@ -1,4 +1,4 @@
-package com.njzscloud.supervisory.sys.dict.service;
+package com.njzscloud.dispose.sys.dict.service;
 
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.lang.Assert;
@@ -9,10 +9,10 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.njzscloud.common.core.ex.Exceptions;
 import com.njzscloud.common.mp.support.PageParam;
 import com.njzscloud.common.mp.support.PageResult;
-import com.njzscloud.supervisory.sys.dict.mapper.DictMapper;
-import com.njzscloud.supervisory.sys.dict.pojo.DictEntity;
-import com.njzscloud.supervisory.sys.dict.pojo.DictItemEntity;
-import com.njzscloud.supervisory.sys.dict.pojo.ObtainDictDataResult;
+import com.njzscloud.dispose.sys.dict.mapper.DictMapper;
+import com.njzscloud.dispose.sys.dict.pojo.DictEntity;
+import com.njzscloud.dispose.sys.dict.pojo.DictItemEntity;
+import com.njzscloud.dispose.sys.dict.pojo.ObtainDictDataResult;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;

njzscloud-svr/src/main/java/com/njzscloud/dispose/sys/district/controller/DistrictController.java

@@ -1,11 +1,11 @@
-package com.njzscloud.supervisory.sys.district.controller;
+package com.njzscloud.dispose.sys.district.controller;
 
 import com.njzscloud.common.core.utils.R;
 import com.njzscloud.common.mp.support.PageParam;
 import com.njzscloud.common.mp.support.PageResult;
-import com.njzscloud.supervisory.sys.district.pojo.entity.DistrictEntity;
-import com.njzscloud.supervisory.sys.district.pojo.param.SearchDistrictParam;
-import com.njzscloud.supervisory.sys.district.service.DistrictService;
+import com.njzscloud.dispose.sys.district.pojo.entity.DistrictEntity;
+import com.njzscloud.dispose.sys.district.pojo.param.SearchDistrictParam;
+import com.njzscloud.dispose.sys.district.service.DistrictService;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.web.bind.annotation.*;

njzscloud-svr/src/main/java/com/njzscloud/dispose/sys/district/mapper/DistrictMapper.java

@@ -1,7 +1,7 @@
-package com.njzscloud.supervisory.sys.district.mapper;
+package com.njzscloud.dispose.sys.district.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.njzscloud.supervisory.sys.district.pojo.entity.DistrictEntity;
+import com.njzscloud.dispose.sys.district.pojo.entity.DistrictEntity;
 import org.apache.ibatis.annotations.Mapper;
 
 /**

njzscloud-svr/src/main/java/com/njzscloud/dispose/sys/district/pojo/entity/DistrictEntity.java

@@ -1,4 +1,4 @@
-package com.njzscloud.supervisory.sys.district.pojo.entity;
+package com.njzscloud.dispose.sys.district.pojo.entity;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;

njzscloud-svr/src/main/java/com/njzscloud/dispose/sys/district/pojo/param/SearchDistrictParam.java

@@ -1,4 +1,4 @@
-package com.njzscloud.supervisory.sys.district.pojo.param;
+package com.njzscloud.dispose.sys.district.pojo.param;
 
 import lombok.Getter;
 import lombok.Setter;

njzscloud-svr/src/main/java/com/njzscloud/dispose/sys/district/pojo/result/DistrictTreeResult.java

@@ -1,4 +1,4 @@
-package com.njzscloud.supervisory.sys.district.pojo.result;
+package com.njzscloud.dispose.sys.district.pojo.result;
 
 import lombok.Getter;
 import lombok.Setter;

njzscloud-svr/src/main/java/com/njzscloud/dispose/sys/district/service/DistrictService.java

@@ -1,4 +1,4 @@
-package com.njzscloud.supervisory.sys.district.service;
+package com.njzscloud.dispose.sys.district.service;
 
 import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
@@ -6,9 +6,9 @@ import com.baomidou.mybatisplus.extension.service.IService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.njzscloud.common.mp.support.PageParam;
 import com.njzscloud.common.mp.support.PageResult;
-import com.njzscloud.supervisory.sys.district.mapper.DistrictMapper;
-import com.njzscloud.supervisory.sys.district.pojo.entity.DistrictEntity;
-import com.njzscloud.supervisory.sys.district.pojo.param.SearchDistrictParam;
+import com.njzscloud.dispose.sys.district.mapper.DistrictMapper;
+import com.njzscloud.dispose.sys.district.pojo.entity.DistrictEntity;
+import com.njzscloud.dispose.sys.district.pojo.param.SearchDistrictParam;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;

njzscloud-svr/src/main/java/com/njzscloud/dispose/sys/endpoint/contant/RequestMethod.java

@@ -1,4 +1,4 @@
-package com.njzscloud.supervisory.sys.endpoint.contant;
+package com.njzscloud.dispose.sys.endpoint.contant;
 
 import com.njzscloud.common.core.ienum.DictStr;
 import lombok.Getter;
@@ -18,4 +18,4 @@ public enum RequestMethod implements DictStr {
 
     private final String val;
     private final String txt;
-}    
+}

njzscloud-svr/src/main/java/com/njzscloud/dispose/sys/endpoint/controller/EndpointController.java

@@ -1,10 +1,10 @@
-package com.njzscloud.supervisory.sys.endpoint.controller;
+package com.njzscloud.dispose.sys.endpoint.controller;
 
 import com.njzscloud.common.core.utils.R;
-import com.njzscloud.supervisory.sys.endpoint.pojo.entity.EndpointEntity;
-import com.njzscloud.supervisory.sys.endpoint.pojo.param.EndpointSearchParam;
-import com.njzscloud.supervisory.sys.endpoint.pojo.result.EndpointDetailResult;
-import com.njzscloud.supervisory.sys.endpoint.service.EndpointService;
+import com.njzscloud.dispose.sys.endpoint.pojo.entity.EndpointEntity;
+import com.njzscloud.dispose.sys.endpoint.pojo.param.EndpointSearchParam;
+import com.njzscloud.dispose.sys.endpoint.pojo.result.EndpointDetailResult;
+import com.njzscloud.dispose.sys.endpoint.service.EndpointService;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.web.bind.annotation.*;

njzscloud-svr/src/main/java/com/njzscloud/dispose/sys/endpoint/mapper/EndpointMapper.java

@@ -1,7 +1,7 @@
-package com.njzscloud.supervisory.sys.endpoint.mapper;
+package com.njzscloud.dispose.sys.endpoint.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.njzscloud.supervisory.sys.endpoint.pojo.entity.EndpointEntity;
+import com.njzscloud.dispose.sys.endpoint.pojo.entity.EndpointEntity;
 import org.apache.ibatis.annotations.Mapper;
 
 /**

njzscloud-svr/src/main/java/com/njzscloud/dispose/sys/endpoint/pojo/entity/EndpointEntity.java

@@ -1,10 +1,10 @@
-package com.njzscloud.supervisory.sys.endpoint.pojo.entity;
+package com.njzscloud.dispose.sys.endpoint.pojo.entity;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.njzscloud.common.security.contant.EndpointAccessModel;
-import com.njzscloud.supervisory.sys.endpoint.contant.RequestMethod;
+import com.njzscloud.dispose.sys.endpoint.contant.RequestMethod;
 import lombok.Getter;
 import lombok.Setter;
 import lombok.ToString;

njzscloud-svr/src/main/java/com/njzscloud/dispose/sys/endpoint/pojo/param/EndpointSearchParam.java

@@ -1,4 +1,4 @@
-package com.njzscloud.supervisory.sys.endpoint.pojo.param;
+package com.njzscloud.dispose.sys.endpoint.pojo.param;
 
 import lombok.Getter;
 import lombok.Setter;

njzscloud-svr/src/main/java/com/njzscloud/dispose/sys/endpoint/pojo/result/EndpointDetailResult.java

@@ -1,7 +1,7 @@
-package com.njzscloud.supervisory.sys.endpoint.pojo.result;
+package com.njzscloud.dispose.sys.endpoint.pojo.result;
 
 import com.njzscloud.common.security.contant.EndpointAccessModel;
-import com.njzscloud.supervisory.sys.endpoint.contant.RequestMethod;
+import com.njzscloud.dispose.sys.endpoint.contant.RequestMethod;
 import lombok.Getter;
 import lombok.Setter;
 import lombok.ToString;

njzscloud-svr/src/main/java/com/njzscloud/dispose/sys/endpoint/service/EndpointService.java

@@ -1,14 +1,14 @@
-package com.njzscloud.supervisory.sys.endpoint.service;
+package com.njzscloud.dispose.sys.endpoint.service;
 
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.njzscloud.supervisory.sys.endpoint.mapper.EndpointMapper;
-import com.njzscloud.supervisory.sys.endpoint.pojo.entity.EndpointEntity;
-import com.njzscloud.supervisory.sys.endpoint.pojo.param.EndpointSearchParam;
-import com.njzscloud.supervisory.sys.endpoint.pojo.result.EndpointDetailResult;
+import com.njzscloud.dispose.sys.endpoint.mapper.EndpointMapper;
+import com.njzscloud.dispose.sys.endpoint.pojo.entity.EndpointEntity;
+import com.njzscloud.dispose.sys.endpoint.pojo.param.EndpointSearchParam;
+import com.njzscloud.dispose.sys.endpoint.pojo.result.EndpointDetailResult;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;

njzscloud-svr/src/main/java/com/njzscloud/dispose/sys/menu/contant/MenuCategory.java

@@ -1,4 +1,4 @@
-package com.njzscloud.supervisory.sys.menu.contant;
+package com.njzscloud.dispose.sys.menu.contant;
 
 import com.njzscloud.common.core.ienum.DictStr;
 import lombok.Getter;

njzscloud-svr/src/main/java/com/njzscloud/dispose/sys/menu/controller/MenuController.java

@@ -1,14 +1,14 @@
-package com.njzscloud.supervisory.sys.menu.controller;
+package com.njzscloud.dispose.sys.menu.controller;
 
 import cn.hutool.core.lang.Assert;
 import com.njzscloud.common.core.utils.R;
 import com.njzscloud.common.mp.support.PageParam;
 import com.njzscloud.common.mp.support.PageResult;
-import com.njzscloud.supervisory.sys.menu.pojo.param.MenuAddParam;
-import com.njzscloud.supervisory.sys.menu.pojo.param.MenuModifyParam;
-import com.njzscloud.supervisory.sys.menu.pojo.param.MenuSearchParam;
-import com.njzscloud.supervisory.sys.menu.pojo.result.MenuDetailResult;
-import com.njzscloud.supervisory.sys.menu.service.MenuService;
+import com.njzscloud.dispose.sys.menu.pojo.param.MenuAddParam;
+import com.njzscloud.dispose.sys.menu.pojo.param.MenuModifyParam;
+import com.njzscloud.dispose.sys.menu.pojo.param.MenuSearchParam;
+import com.njzscloud.dispose.sys.menu.pojo.result.MenuDetailResult;
+import com.njzscloud.dispose.sys.menu.service.MenuService;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.validation.annotation.Validated;

njzscloud-svr/src/main/java/com/njzscloud/dispose/sys/menu/mapper/MenuMapper.java

@@ -1,7 +1,7 @@
-package com.njzscloud.supervisory.sys.menu.mapper;
+package com.njzscloud.dispose.sys.menu.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.njzscloud.supervisory.sys.menu.pojo.entity.MenuEntity;
+import com.njzscloud.dispose.sys.menu.pojo.entity.MenuEntity;
 import org.apache.ibatis.annotations.Mapper;
 
 /**

njzscloud-svr/src/main/java/com/njzscloud/dispose/sys/menu/pojo/entity/MenuEntity.java

@@ -1,8 +1,8 @@
-package com.njzscloud.supervisory.sys.menu.pojo.entity;
+package com.njzscloud.dispose.sys.menu.pojo.entity;
 
 import com.baomidou.mybatisplus.annotation.*;
 import com.njzscloud.common.mp.support.handler.j.JsonTypeHandler;
-import com.njzscloud.supervisory.sys.menu.contant.MenuCategory;
+import com.njzscloud.dispose.sys.menu.contant.MenuCategory;
 import lombok.Getter;
 import lombok.Setter;
 import lombok.experimental.Accessors;

njzscloud-svr/src/main/java/com/njzscloud/dispose/sys/menu/pojo/param/MenuAddParam.java

@@ -1,10 +1,10 @@
-package com.njzscloud.supervisory.sys.menu.pojo.param;
+package com.njzscloud.dispose.sys.menu.pojo.param;
 
 import cn.hutool.core.util.StrUtil;
 import com.njzscloud.common.mvc.validator.Constrained;
 import com.njzscloud.common.mvc.validator.Constraint;
 import com.njzscloud.common.mvc.validator.ValidRule;
-import com.njzscloud.supervisory.sys.menu.contant.MenuCategory;
+import com.njzscloud.dispose.sys.menu.contant.MenuCategory;
 import jakarta.validation.constraints.NotBlank;
 import lombok.Getter;
 import lombok.Setter;

njzscloud-svr/src/main/java/com/njzscloud/dispose/sys/menu/pojo/param/MenuModifyParam.java

@@ -1,4 +1,4 @@
-package com.njzscloud.supervisory.sys.menu.pojo.param;
+package com.njzscloud.dispose.sys.menu.pojo.param;
 
 import com.njzscloud.common.mvc.validator.Constrained;
 import com.njzscloud.common.mvc.validator.Constraint;

njzscloud-svr/src/main/java/com/njzscloud/dispose/sys/menu/pojo/param/MenuSearchParam.java

@@ -1,4 +1,4 @@
-package com.njzscloud.supervisory.sys.menu.pojo.param;
+package com.njzscloud.dispose.sys.menu.pojo.param;
 
 import com.njzscloud.common.mvc.validator.Constraint;
 import lombok.Getter;

njzscloud-svr/src/main/java/com/njzscloud/dispose/sys/menu/pojo/result/MenuDetailResult.java

@@ -1,6 +1,6 @@
-package com.njzscloud.supervisory.sys.menu.pojo.result;
+package com.njzscloud.dispose.sys.menu.pojo.result;
 
-import com.njzscloud.supervisory.sys.menu.contant.MenuCategory;
+import com.njzscloud.dispose.sys.menu.contant.MenuCategory;
 import lombok.EqualsAndHashCode;
 import lombok.Getter;
 import lombok.Setter;

njzscloud-svr/src/main/java/com/njzscloud/dispose/sys/menu/service/MenuService.java

@@ -1,4 +1,4 @@
-package com.njzscloud.supervisory.sys.menu.service;
+package com.njzscloud.dispose.sys.menu.service;
 
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.collection.CollUtil;
@@ -11,16 +11,16 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.njzscloud.common.core.ex.Exceptions;
 import com.njzscloud.common.mp.support.PageParam;
 import com.njzscloud.common.mp.support.PageResult;
-import com.njzscloud.supervisory.sys.menu.contant.MenuCategory;
-import com.njzscloud.supervisory.sys.menu.mapper.MenuMapper;
-import com.njzscloud.supervisory.sys.menu.pojo.entity.MenuEntity;
-import com.njzscloud.supervisory.sys.menu.pojo.param.MenuAddParam;
-import com.njzscloud.supervisory.sys.menu.pojo.param.MenuModifyParam;
-import com.njzscloud.supervisory.sys.menu.pojo.param.MenuSearchParam;
-import com.njzscloud.supervisory.sys.menu.pojo.result.MenuDetailResult;
-import com.njzscloud.supervisory.sys.resource.contant.ResourceOrigin;
-import com.njzscloud.supervisory.sys.resource.pojo.entity.ResourceEntity;
-import com.njzscloud.supervisory.sys.resource.service.ResourceService;
+import com.njzscloud.dispose.sys.menu.contant.MenuCategory;
+import com.njzscloud.dispose.sys.menu.mapper.MenuMapper;
+import com.njzscloud.dispose.sys.menu.pojo.entity.MenuEntity;
+import com.njzscloud.dispose.sys.menu.pojo.param.MenuAddParam;
+import com.njzscloud.dispose.sys.menu.pojo.param.MenuModifyParam;
+import com.njzscloud.dispose.sys.menu.pojo.param.MenuSearchParam;
+import com.njzscloud.dispose.sys.menu.pojo.result.MenuDetailResult;
+import com.njzscloud.dispose.sys.resource.contant.ResourceOrigin;
+import com.njzscloud.dispose.sys.resource.pojo.entity.ResourceEntity;
+import com.njzscloud.dispose.sys.resource.service.ResourceService;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;

njzscloud-svr/src/main/java/com/njzscloud/dispose/sys/resource/contant/ResourceOrigin.java

@@ -1,4 +1,4 @@
-package com.njzscloud.supervisory.sys.resource.contant;
+package com.njzscloud.dispose.sys.resource.contant;
 
 import com.njzscloud.common.core.ienum.DictStr;
 import lombok.Getter;

njzscloud-svr/src/main/java/com/njzscloud/dispose/sys/resource/cotroller/ResourceController.java

@@ -1,10 +1,10 @@
-package com.njzscloud.supervisory.sys.resource.cotroller;
+package com.njzscloud.dispose.sys.resource.cotroller;
 
 import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.njzscloud.common.core.utils.R;
-import com.njzscloud.supervisory.sys.resource.pojo.entity.ResourceEntity;
-import com.njzscloud.supervisory.sys.resource.service.ResourceService;
+import com.njzscloud.dispose.sys.resource.pojo.entity.ResourceEntity;
+import com.njzscloud.dispose.sys.resource.service.ResourceService;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.web.bind.annotation.GetMapping;

njzscloud-svr/src/main/java/com/njzscloud/dispose/sys/resource/mapper/ResourceMapper.java

@@ -1,9 +1,9 @@
-package com.njzscloud.supervisory.sys.resource.mapper;
+package com.njzscloud.dispose.sys.resource.mapper;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.toolkit.Constants;
-import com.njzscloud.supervisory.sys.resource.pojo.entity.ResourceEntity;
+import com.njzscloud.dispose.sys.resource.pojo.entity.ResourceEntity;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 

njzscloud-svr/src/main/java/com/njzscloud/dispose/sys/resource/pojo/entity/ResourceEntity.java

@@ -1,4 +1,4 @@
-package com.njzscloud.supervisory.sys.resource.pojo.entity;
+package com.njzscloud.dispose.sys.resource.pojo.entity;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;

njzscloud-svr/src/main/java/com/njzscloud/dispose/sys/resource/service/ResourceService.java

@@ -1,11 +1,11 @@
-package com.njzscloud.supervisory.sys.resource.service;
+package com.njzscloud.dispose.sys.resource.service;
 
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.njzscloud.supervisory.sys.resource.contant.ResourceOrigin;
-import com.njzscloud.supervisory.sys.resource.mapper.ResourceMapper;
-import com.njzscloud.supervisory.sys.resource.pojo.entity.ResourceEntity;
+import com.njzscloud.dispose.sys.resource.contant.ResourceOrigin;
+import com.njzscloud.dispose.sys.resource.mapper.ResourceMapper;
+import com.njzscloud.dispose.sys.resource.pojo.entity.ResourceEntity;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;

njzscloud-svr/src/main/java/com/njzscloud/dispose/sys/role/controller/RoleController.java

@@ -1,4 +1,4 @@
-package com.njzscloud.supervisory.sys.role.controller;
+package com.njzscloud.dispose.sys.role.controller;
 
 import cn.hutool.core.lang.Assert;
 import cn.hutool.core.util.StrUtil;
@@ -6,13 +6,13 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.njzscloud.common.core.utils.R;
 import com.njzscloud.common.mp.support.PageParam;
 import com.njzscloud.common.mp.support.PageResult;
-import com.njzscloud.supervisory.sys.role.pojo.entity.RoleEntity;
-import com.njzscloud.supervisory.sys.role.pojo.param.BindResParam;
-import com.njzscloud.supervisory.sys.role.pojo.param.RoleAddParam;
-import com.njzscloud.supervisory.sys.role.pojo.param.RoleModifyParam;
-import com.njzscloud.supervisory.sys.role.pojo.param.RoleQueryParam;
-import com.njzscloud.supervisory.sys.role.pojo.result.RoleDetailResult;
-import com.njzscloud.supervisory.sys.role.service.RoleService;
+import com.njzscloud.dispose.sys.role.pojo.entity.RoleEntity;
+import com.njzscloud.dispose.sys.role.pojo.param.BindResParam;
+import com.njzscloud.dispose.sys.role.pojo.param.RoleAddParam;
+import com.njzscloud.dispose.sys.role.pojo.param.RoleModifyParam;
+import com.njzscloud.dispose.sys.role.pojo.param.RoleQueryParam;
+import com.njzscloud.dispose.sys.role.pojo.result.RoleDetailResult;
+import com.njzscloud.dispose.sys.role.service.RoleService;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.validation.annotation.Validated;

njzscloud-svr/src/main/java/com/njzscloud/dispose/sys/role/mapper/RoleMapper.java

@@ -1,11 +1,11 @@
-package com.njzscloud.supervisory.sys.role.mapper;
+package com.njzscloud.dispose.sys.role.mapper;
 
 import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.Constants;
-import com.njzscloud.supervisory.sys.role.pojo.entity.RoleEntity;
+import com.njzscloud.dispose.sys.role.pojo.entity.RoleEntity;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 

njzscloud-svr/src/main/java/com/njzscloud/dispose/sys/role/mapper/RoleResMapper.java

@@ -1,7 +1,7 @@
-package com.njzscloud.supervisory.sys.role.mapper;
+package com.njzscloud.dispose.sys.role.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.njzscloud.supervisory.sys.role.pojo.entity.RoleResourceEntity;
+import com.njzscloud.dispose.sys.role.pojo.entity.RoleResourceEntity;
 import org.apache.ibatis.annotations.Mapper;
 
 /**

njzscloud-svr/src/main/java/com/njzscloud/dispose/sys/role/pojo/entity/RoleEntity.java

@@ -1,4 +1,4 @@
-package com.njzscloud.supervisory.sys.role.pojo.entity;
+package com.njzscloud.dispose.sys.role.pojo.entity;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;

njzscloud-svr/src/main/java/com/njzscloud/dispose/sys/role/pojo/entity/RoleResourceEntity.java

@@ -1,4 +1,4 @@
-package com.njzscloud.supervisory.sys.role.pojo.entity;
+package com.njzscloud.dispose.sys.role.pojo.entity;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;

njzscloud-svr/src/main/java/com/njzscloud/dispose/sys/role/pojo/param/BindResParam.java

@@ -1,4 +1,4 @@
-package com.njzscloud.supervisory.sys.role.pojo.param;
+package com.njzscloud.dispose.sys.role.pojo.param;
 
 import lombok.Getter;
 import lombok.Setter;

njzscloud-svr/src/main/java/com/njzscloud/dispose/sys/role/pojo/param/RoleAddParam.java

@@ -1,4 +1,4 @@
-package com.njzscloud.supervisory.sys.role.pojo.param;
+package com.njzscloud.dispose.sys.role.pojo.param;
 
 import jakarta.validation.constraints.NotBlank;
 import lombok.Getter;

njzscloud-svr/src/main/java/com/njzscloud/dispose/sys/role/pojo/param/RoleModifyParam.java

@@ -1,4 +1,4 @@
-package com.njzscloud.supervisory.sys.role.pojo.param;
+package com.njzscloud.dispose.sys.role.pojo.param;
 
 import jakarta.validation.constraints.NotNull;
 import lombok.Getter;

njzscloud-svr/src/main/java/com/njzscloud/dispose/sys/role/pojo/param/RoleQueryParam.java

@@ -1,4 +1,4 @@
-package com.njzscloud.supervisory.sys.role.pojo.param;
+package com.njzscloud.dispose.sys.role.pojo.param;
 
 import lombok.Getter;
 import lombok.Setter;

njzscloud-svr/src/main/java/com/njzscloud/dispose/sys/role/pojo/result/RoleDetailResult.java

@@ -1,4 +1,4 @@
-package com.njzscloud.supervisory.sys.role.pojo.result;
+package com.njzscloud.dispose.sys.role.pojo.result;
 
 import lombok.Getter;
 import lombok.Setter;

njzscloud-svr/src/main/java/com/njzscloud/dispose/sys/role/service/RoleResService.java

@@ -1,4 +1,4 @@
-package com.njzscloud.supervisory.sys.role.service;
+package com.njzscloud.dispose.sys.role.service;
 
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.lang.Assert;
@@ -9,10 +9,10 @@ import com.njzscloud.common.core.ex.Exceptions;
 import com.njzscloud.common.core.utils.GroupUtil;
 import com.njzscloud.common.mp.support.PageParam;
 import com.njzscloud.common.mp.support.PageResult;
-import com.njzscloud.supervisory.sys.resource.pojo.entity.ResourceEntity;
-import com.njzscloud.supervisory.sys.resource.service.ResourceService;
-import com.njzscloud.supervisory.sys.role.mapper.RoleResMapper;
-import com.njzscloud.supervisory.sys.role.pojo.entity.RoleResourceEntity;
+import com.njzscloud.dispose.sys.resource.pojo.entity.ResourceEntity;
+import com.njzscloud.dispose.sys.resource.service.ResourceService;
+import com.njzscloud.dispose.sys.role.mapper.RoleResMapper;
+import com.njzscloud.dispose.sys.role.pojo.entity.RoleResourceEntity;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;

njzscloud-svr/src/main/java/com/njzscloud/dispose/sys/role/service/RoleService.java

@@ -1,4 +1,4 @@
-package com.njzscloud.supervisory.sys.role.service;
+package com.njzscloud.dispose.sys.role.service;
 
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.lang.Assert;
@@ -10,14 +10,14 @@ import com.baomidou.mybatisplus.extension.service.IService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.njzscloud.common.core.ex.Exceptions;
 import com.njzscloud.common.mp.support.PageResult;
-import com.njzscloud.supervisory.sys.role.mapper.RoleMapper;
-import com.njzscloud.supervisory.sys.role.pojo.entity.RoleEntity;
-import com.njzscloud.supervisory.sys.role.pojo.entity.RoleResourceEntity;
-import com.njzscloud.supervisory.sys.role.pojo.param.BindResParam;
-import com.njzscloud.supervisory.sys.role.pojo.param.RoleAddParam;
-import com.njzscloud.supervisory.sys.role.pojo.param.RoleModifyParam;
-import com.njzscloud.supervisory.sys.role.pojo.param.RoleQueryParam;
-import com.njzscloud.supervisory.sys.role.pojo.result.RoleDetailResult;
+import com.njzscloud.dispose.sys.role.mapper.RoleMapper;
+import com.njzscloud.dispose.sys.role.pojo.entity.RoleEntity;
+import com.njzscloud.dispose.sys.role.pojo.entity.RoleResourceEntity;
+import com.njzscloud.dispose.sys.role.pojo.param.BindResParam;
+import com.njzscloud.dispose.sys.role.pojo.param.RoleAddParam;
+import com.njzscloud.dispose.sys.role.pojo.param.RoleModifyParam;
+import com.njzscloud.dispose.sys.role.pojo.param.RoleQueryParam;
+import com.njzscloud.dispose.sys.role.pojo.result.RoleDetailResult;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
@@ -28,7 +28,7 @@ import java.util.Set;
 import java.util.stream.Collectors;
 
 import static com.njzscloud.common.security.contant.Constants.ROLE_ADMIN;
-import static com.njzscloud.supervisory.event.SysMittEvent.COERCE_LOGOUT;
+import static com.njzscloud.dispose.event.SysMittEvent.COERCE_LOGOUT;
 
 /**
  * 角色表

njzscloud-svr/src/main/java/com/njzscloud/dispose/sys/user/constant/Gender.java

@@ -1,4 +1,4 @@
-package com.njzscloud.supervisory.sys.user.contant;
+package com.njzscloud.dispose.sys.user.constant;
 
 import com.njzscloud.common.core.ienum.DictStr;
 import lombok.Getter;

njzscloud-svr/src/main/java/com/njzscloud/dispose/sys/user/controller/UserController.java

@@ -1,13 +1,13 @@
-package com.njzscloud.supervisory.sys.user.controller;
+package com.njzscloud.dispose.sys.user.controller;
 
 import cn.hutool.core.lang.Assert;
 import com.njzscloud.common.core.ex.Exceptions;
 import com.njzscloud.common.core.utils.R;
 import com.njzscloud.common.mp.support.PageParam;
 import com.njzscloud.common.mp.support.PageResult;
-import com.njzscloud.supervisory.sys.user.pojo.param.*;
-import com.njzscloud.supervisory.sys.user.pojo.result.UserDetailResult;
-import com.njzscloud.supervisory.sys.user.service.UserService;
+import com.njzscloud.dispose.sys.user.pojo.param.*;
+import com.njzscloud.dispose.sys.user.pojo.result.UserDetailResult;
+import com.njzscloud.dispose.sys.user.service.UserService;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.validation.annotation.Validated;

njzscloud-svr/src/main/java/com/njzscloud/dispose/sys/user/mapper/SysUserRoleMapper.java

@@ -1,9 +1,9 @@
-package com.njzscloud.supervisory.sys.user.mapper;
+package com.njzscloud.dispose.sys.user.mapper;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.njzscloud.supervisory.sys.role.pojo.result.RoleDetailResult;
-import com.njzscloud.supervisory.sys.user.pojo.entity.SysUserRoleEntity;
+import com.njzscloud.dispose.sys.role.pojo.result.RoleDetailResult;
+import com.njzscloud.dispose.sys.user.pojo.entity.SysUserRoleEntity;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 

njzscloud-svr/src/main/java/com/njzscloud/dispose/sys/user/mapper/UserAccountMapper.java

@@ -1,7 +1,7 @@
-package com.njzscloud.supervisory.sys.user.mapper;
+package com.njzscloud.dispose.sys.user.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.njzscloud.supervisory.sys.user.pojo.entity.UserAccountEntity;
+import com.njzscloud.dispose.sys.user.pojo.entity.UserAccountEntity;
 import org.apache.ibatis.annotations.Mapper;
 
 /**

njzscloud-svr/src/main/java/com/njzscloud/dispose/sys/user/mapper/UserMapper.java

@@ -1,12 +1,12 @@
-package com.njzscloud.supervisory.sys.user.mapper;
+package com.njzscloud.dispose.sys.user.mapper;
 
 import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.Constants;
 import com.njzscloud.common.security.support.UserDetail;
-import com.njzscloud.supervisory.sys.user.pojo.entity.UserEntity;
-import com.njzscloud.supervisory.sys.user.pojo.result.UserDetailResult;
+import com.njzscloud.dispose.sys.user.pojo.entity.UserEntity;
+import com.njzscloud.dispose.sys.user.pojo.result.UserDetailResult;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 

njzscloud-svr/src/main/java/com/njzscloud/dispose/sys/user/pojo/entity/SysUserRoleEntity.java

@@ -1,4 +1,4 @@
-package com.njzscloud.supervisory.sys.user.pojo.entity;
+package com.njzscloud.dispose.sys.user.pojo.entity;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;

njzscloud-svr/src/main/java/com/njzscloud/dispose/sys/user/pojo/entity/UserAccountEntity.java

@@ -1,4 +1,4 @@
-package com.njzscloud.supervisory.sys.user.pojo.entity;
+package com.njzscloud.dispose.sys.user.pojo.entity;
 
 import com.baomidou.mybatisplus.annotation.*;
 import lombok.Getter;

njzscloud-svr/src/main/java/com/njzscloud/dispose/sys/user/pojo/entity/UserEntity.java

@@ -1,4 +1,4 @@
-package com.njzscloud.supervisory.sys.user.pojo.entity;
+package com.njzscloud.dispose.sys.user.pojo.entity;
 
 import com.baomidou.mybatisplus.annotation.*;
 import lombok.Getter;

njzscloud-svr/src/main/java/com/njzscloud/dispose/sys/user/pojo/param/AddUserAccountParam.java

@@ -1,4 +1,4 @@
-package com.njzscloud.supervisory.sys.user.pojo.param;
+package com.njzscloud.dispose.sys.user.pojo.param;
 
 import cn.hutool.core.util.StrUtil;
 import com.njzscloud.common.mvc.validator.Constrained;

njzscloud-svr/src/main/java/com/njzscloud/dispose/sys/user/pojo/param/AddUserParam.java

@@ -1,9 +1,9 @@
-package com.njzscloud.supervisory.sys.user.pojo.param;
+package com.njzscloud.dispose.sys.user.pojo.param;
 
 import cn.hutool.core.util.StrUtil;
 import com.njzscloud.common.mvc.validator.Constrained;
 import com.njzscloud.common.mvc.validator.ValidRule;
-import com.njzscloud.supervisory.sys.user.contant.Gender;
+import com.njzscloud.dispose.sys.user.constant.Gender;
 import jakarta.validation.Valid;
 import lombok.Getter;
 import lombok.Setter;

njzscloud-svr/src/main/java/com/njzscloud/dispose/sys/user/pojo/param/BindRoleParam.java

@@ -1,4 +1,4 @@
-package com.njzscloud.supervisory.sys.user.pojo.param;
+package com.njzscloud.dispose.sys.user.pojo.param;
 
 import lombok.Getter;
 import lombok.Setter;

njzscloud-svr/src/main/java/com/njzscloud/dispose/sys/user/pojo/param/ModifyPasswdParam.java

@@ -1,4 +1,4 @@
-package com.njzscloud.supervisory.sys.user.pojo.param;
+package com.njzscloud.dispose.sys.user.pojo.param;
 
 import jakarta.validation.constraints.NotBlank;
 import lombok.Getter;

njzscloud-svr/src/main/java/com/njzscloud/dispose/sys/user/pojo/param/UserModifyParam.java

@@ -1,6 +1,6 @@
-package com.njzscloud.supervisory.sys.user.pojo.param;
+package com.njzscloud.dispose.sys.user.pojo.param;
 
-import com.njzscloud.supervisory.sys.user.contant.Gender;
+import com.njzscloud.dispose.sys.user.constant.Gender;
 import jakarta.validation.constraints.NotNull;
 import lombok.Getter;
 import lombok.Setter;

njzscloud-svr/src/main/java/com/njzscloud/dispose/sys/user/pojo/param/UserQueryParam.java

@@ -1,6 +1,6 @@
-package com.njzscloud.supervisory.sys.user.pojo.param;
+package com.njzscloud.dispose.sys.user.pojo.param;
 
-import com.njzscloud.supervisory.sys.user.contant.Gender;
+import com.njzscloud.dispose.sys.user.constant.Gender;
 import lombok.Getter;
 import lombok.Setter;
 

njzscloud-svr/src/main/java/com/njzscloud/dispose/sys/user/pojo/param/UserRegisterParam.java

@@ -0,0 +1,292 @@
+package com.njzscloud.dispose.sys.user.pojo.param;
+
+import cn.hutool.core.util.StrUtil;
+import com.njzscloud.common.mvc.validator.Constrained;
+import com.njzscloud.common.mvc.validator.Constraint;
+import com.njzscloud.common.mvc.validator.ValidRule;
+import com.njzscloud.common.security.contant.AuthWay;
+import com.njzscloud.dispose.cst.customer.constant.IdentityCategory;
+import com.njzscloud.dispose.cst.org.constant.OrgCategory;
+import com.njzscloud.dispose.sys.user.constant.Gender;
+import jakarta.validation.Valid;
+import jakarta.validation.constraints.NotBlank;
+import jakarta.validation.constraints.NotNull;
+import lombok.Getter;
+import lombok.Setter;
+import lombok.ToString;
+import lombok.experimental.Accessors;
+
+import java.time.LocalDateTime;
+import java.util.List;
+
+@Getter
+@Setter
+@ToString
+@Accessors(chain = true)
+public class UserRegisterParam implements Constrained {
+    private AuthWay authWay;
+    /**
+     * 昵称
+     */
+    private String nickname;
+    /**
+     * 邮箱
+     */
+    private String email;
+    /**
+     * 手机号
+     */
+    private String phone;
+    /**
+     * 头像
+     */
+    private String avatar;
+
+    /**
+     * 性别; 字典代码：gender
+     */
+    private Gender gender;
+    /**
+     * 账号信息
+     */
+    @Valid
+    private Account account;
+
+    /**
+     * 客户信息
+     */
+    @Valid
+    private Customer customer;
+
+    /**
+     * 组织信息
+     */
+    @Valid
+    private Org org;
+
+    /**
+     * 角色 Id 列表
+     */
+    private List<Long> roles;
+
+    @Override
+    public ValidRule[] rules() {
+        return new ValidRule[]{
+            ValidRule.of(() -> StrUtil.isNotBlank(nickname), "用户昵称不能为空"),
+            ValidRule.of(() -> account != null, "账号信息不能为空"),
+        };
+    }
+
+    @Getter
+    @Setter
+    @Constraint
+    @Accessors(chain = true)
+    public static class Account implements Constrained {
+        /**
+         * 用户 Id; sys_user.id
+         */
+        private Long userId;
+        /**
+         * 用户名
+         */
+        private String username;
+        /**
+         * 手机号
+         */
+        private String phone;
+        /**
+         * 密码
+         */
+        private String secret;
+        /**
+         * 微信 openid
+         */
+        private String wechatOpenid;
+        /**
+         * 微信 unionid
+         */
+        private String wechatUnionid;
+        /**
+         * 允许登录的客户端; 字典代码：client_code
+         */
+        private Integer clientCode;
+        /**
+         * 是否禁用; 0-->启用、1-->禁用
+         */
+        private Boolean disabled;
+
+
+        @Override
+        public ValidRule[] rules() {
+            return new ValidRule[]{
+                ValidRule.of(() -> (StrUtil.isNotBlank(username) && StrUtil.isNotBlank(secret))
+                    || (StrUtil.isNotBlank(phone) && StrUtil.isNotBlank(secret))
+                    || StrUtil.isNotBlank(wechatOpenid), "账号信息不能为空"),
+            };
+        }
+
+    }
+
+    @Getter
+    @Setter
+    @Constraint
+    @Accessors(chain = true)
+    public static class Customer {
+
+        /**
+         * 身份类型；多个身份多条数据，ChanFei-->产废方、YunShu-->运输方、CaiGou-->采购方、SiJi-->司机
+         */
+        @NotNull(message = "身份类型不能为空")
+        private IdentityCategory identityCategory;
+
+        /**
+         * 组织信息 Id；cst_org.id
+         */
+        private Long orgId;
+
+        /**
+         * 客户姓名
+         */
+        @NotBlank(message = "客户姓名不能为空")
+        private String customerName;
+
+        /**
+         * 客户联系电话
+         */
+        @NotBlank(message = "客户联系电话不能为空")
+        private String phone;
+
+        /**
+         * 是否管理员；是否为当前的组织管理员，0-->否、1-->是
+         */
+        @NotNull(message = "是否为当前组织管理员不能为空")
+        private Boolean manager;
+    }
+
+    @Getter
+    @Setter
+    @Constraint
+    @Accessors(chain = true)
+    public static class Org {
+
+        /**
+         * 主体类型，GeTiHu-->个体户、QiYe-->企业
+         */
+        @NotNull(message = "主体类型不能为空")
+        private OrgCategory orgCategory;
+
+        /**
+         * 统一社会信用代码
+         */
+        @NotBlank(message = "统一社会信用代码不能为空")
+        private String uscc;
+
+        /**
+         * 组织名称
+         */
+        @NotBlank(message = "组织名称不能为空")
+        private String orgName;
+
+        /**
+         * 营业执照
+         */
+        private String businessLicense;
+
+        /**
+         * 营业执照有效期
+         */
+        private LocalDateTime licenseStartTime;
+
+        /**
+         * 营业执照有效期
+         */
+        private LocalDateTime licenseEndTime;
+
+        /**
+         * 法人名称
+         */
+        private String legalRepresentative;
+
+        /**
+         * 法人身份证号
+         */
+        private String idcard;
+
+        /**
+         * 法人身份证有效期
+         */
+        private LocalDateTime idcardStartTime;
+
+        /**
+         * 法人身份证有效期
+         */
+        private LocalDateTime idcardEndTime;
+
+        /**
+         * 法人身份证正面
+         */
+        private String idcardFront;
+
+        /**
+         * 法人身份证反面
+         */
+        private String idcardBack;
+
+        /**
+         * 省；代码
+         */
+        private String province;
+
+        /**
+         * 市；代码
+         */
+        private String city;
+
+        /**
+         * 区县；代码
+         */
+        private String area;
+
+        /**
+         * 乡镇街道；代码
+         */
+        private String town;
+
+        /**
+         * 省；名称
+         */
+        private String provinceName;
+
+        /**
+         * 市；名称
+         */
+        private String cityName;
+
+        /**
+         * 区县；名称
+         */
+        private String areaName;
+
+        /**
+         * 乡镇街道；名称
+         */
+        private String townName;
+
+        /**
+         * 详细地址
+         */
+        private String address;
+
+        /**
+         * 经度
+         */
+        private Double lng;
+
+        /**
+         * 纬度
+         */
+        private Double lat;
+
+    }
+
+}

njzscloud-svr/src/main/java/com/njzscloud/dispose/sys/user/pojo/result/UserAccountDetailResult.java

@@ -1,4 +1,4 @@
-package com.njzscloud.supervisory.sys.user.pojo.result;
+package com.njzscloud.dispose.sys.user.pojo.result;
 
 import lombok.Getter;
 import lombok.Setter;

njzscloud-svr/src/main/java/com/njzscloud/dispose/sys/user/pojo/result/UserDetailResult.java

@@ -1,6 +1,6 @@
-package com.njzscloud.supervisory.sys.user.pojo.result;
+package com.njzscloud.dispose.sys.user.pojo.result;
 
-import com.njzscloud.supervisory.sys.role.pojo.result.RoleDetailResult;
+import com.njzscloud.dispose.sys.role.pojo.result.RoleDetailResult;
 import lombok.Getter;
 import lombok.Setter;
 import lombok.experimental.Accessors;

njzscloud-svr/src/main/java/com/njzscloud/dispose/sys/user/service/UserAccountService.java

@@ -1,4 +1,4 @@
-package com.njzscloud.supervisory.sys.user.service;
+package com.njzscloud.dispose.sys.user.service;
 
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.lang.Assert;
@@ -8,10 +8,10 @@ import com.baomidou.mybatisplus.extension.service.IService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.njzscloud.common.core.ex.Exceptions;
 import com.njzscloud.common.security.util.EncryptUtil;
-import com.njzscloud.supervisory.sys.user.mapper.UserAccountMapper;
-import com.njzscloud.supervisory.sys.user.pojo.entity.UserAccountEntity;
-import com.njzscloud.supervisory.sys.user.pojo.param.AddUserAccountParam;
-import com.njzscloud.supervisory.sys.user.pojo.param.ModifyPasswdParam;
+import com.njzscloud.dispose.sys.user.mapper.UserAccountMapper;
+import com.njzscloud.dispose.sys.user.pojo.entity.UserAccountEntity;
+import com.njzscloud.dispose.sys.user.pojo.param.AddUserAccountParam;
+import com.njzscloud.dispose.sys.user.pojo.param.ModifyPasswdParam;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;

njzscloud-svr/src/main/java/com/njzscloud/dispose/sys/user/service/UserRoleService.java

@@ -1,4 +1,4 @@
-package com.njzscloud.supervisory.sys.user.service;
+package com.njzscloud.dispose.sys.user.service;
 
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.lang.Assert;
@@ -6,11 +6,11 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.njzscloud.common.core.ex.Exceptions;
-import com.njzscloud.supervisory.sys.role.pojo.entity.RoleEntity;
-import com.njzscloud.supervisory.sys.role.pojo.result.RoleDetailResult;
-import com.njzscloud.supervisory.sys.role.service.RoleService;
-import com.njzscloud.supervisory.sys.user.mapper.SysUserRoleMapper;
-import com.njzscloud.supervisory.sys.user.pojo.entity.SysUserRoleEntity;
+import com.njzscloud.dispose.sys.role.pojo.entity.RoleEntity;
+import com.njzscloud.dispose.sys.role.pojo.result.RoleDetailResult;
+import com.njzscloud.dispose.sys.role.service.RoleService;
+import com.njzscloud.dispose.sys.user.mapper.SysUserRoleMapper;
+import com.njzscloud.dispose.sys.user.pojo.entity.SysUserRoleEntity;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;

njzscloud-svr/src/main/java/com/njzscloud/dispose/sys/user/service/UserService.java

@@ -1,4 +1,4 @@
-package com.njzscloud.supervisory.sys.user.service;
+package com.njzscloud.dispose.sys.user.service;
 
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.lang.Assert;
@@ -13,14 +13,14 @@ import com.njzscloud.common.mp.support.PageResult;
 import com.njzscloud.common.security.support.UserDetail;
 import com.njzscloud.common.security.util.EncryptUtil;
 import com.njzscloud.common.security.util.SecurityUtil;
-import com.njzscloud.supervisory.sys.role.pojo.result.RoleDetailResult;
-import com.njzscloud.supervisory.sys.user.contant.Gender;
-import com.njzscloud.supervisory.sys.user.mapper.UserMapper;
-import com.njzscloud.supervisory.sys.user.pojo.entity.UserAccountEntity;
-import com.njzscloud.supervisory.sys.user.pojo.entity.UserEntity;
-import com.njzscloud.supervisory.sys.user.pojo.param.*;
-import com.njzscloud.supervisory.sys.user.pojo.result.UserAccountDetailResult;
-import com.njzscloud.supervisory.sys.user.pojo.result.UserDetailResult;
+import com.njzscloud.dispose.sys.role.pojo.result.RoleDetailResult;
+import com.njzscloud.dispose.sys.user.constant.Gender;
+import com.njzscloud.dispose.sys.user.mapper.UserMapper;
+import com.njzscloud.dispose.sys.user.pojo.entity.UserAccountEntity;
+import com.njzscloud.dispose.sys.user.pojo.entity.UserEntity;
+import com.njzscloud.dispose.sys.user.pojo.param.*;
+import com.njzscloud.dispose.sys.user.pojo.result.UserAccountDetailResult;
+import com.njzscloud.dispose.sys.user.pojo.result.UserDetailResult;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
@@ -31,7 +31,7 @@ import java.util.List;
 import java.util.Set;
 import java.util.stream.Collectors;
 
-import static com.njzscloud.supervisory.event.SysMittEvent.COERCE_LOGOUT;
+import static com.njzscloud.dispose.event.SysMittEvent.COERCE_LOGOUT;
 
 /**
  * 用户信息表

njzscloud-svr/src/main/java/com/njzscloud/supervisory/sys/user/pojo/param/UserRegisterParam.java

@@ -1,118 +0,0 @@
-package com.njzscloud.supervisory.sys.user.pojo.param;
-
-import cn.hutool.core.util.StrUtil;
-import com.njzscloud.common.mvc.validator.Constrained;
-import com.njzscloud.common.mvc.validator.Constraint;
-import com.njzscloud.common.mvc.validator.ValidRule;
-import com.njzscloud.common.security.contant.AuthWay;
-import com.njzscloud.supervisory.sys.user.contant.Gender;
-import jakarta.validation.Valid;
-import lombok.Getter;
-import lombok.Setter;
-import lombok.ToString;
-import lombok.experimental.Accessors;
-
-import java.util.List;
-
-@Getter
-@Setter
-@ToString
-@Accessors(chain = true)
-public class UserRegisterParam implements Constrained {
-    private AuthWay authWay;
-    /**
-     * 昵称
-     */
-    private String nickname;
-    /**
-     * 邮箱
-     */
-    private String email;
-    /**
-     * 手机号
-     */
-    private String phone;
-    /**
-     * 头像
-     */
-    private String avatar;
-
-    /**
-     * 性别; 字典代码：gender
-     */
-    private Gender gender;
-    /**
-     * 账号信息
-     */
-    @Valid
-    private Account account;
-    /**
-     * 角色 Id 列表
-     */
-    private List<Long> roles;
-
-    @Override
-    public ValidRule[] rules() {
-        return new ValidRule[]{
-            ValidRule.of(() -> StrUtil.isNotBlank(nickname), "用户昵称不能为空"),
-            ValidRule.of(() -> account != null, "账号信息不能为空"),
-        };
-    }
-
-
-    @Getter
-    @Setter
-    @Constraint
-    @Accessors(chain = true)
-    public static class Account implements Constrained {
-        /**
-         * 用户 Id; sys_user.id
-         */
-        private Long userId;
-        /**
-         * 用户名
-         */
-        private String username;
-        /**
-         * 邮箱
-         */
-        private String email;
-        /**
-         * 手机号
-         */
-        private String phone;
-        /**
-         * 密码
-         */
-        private String secret;
-        /**
-         * 微信 openid
-         */
-        private String wechatOpenid;
-        /**
-         * 微信 unionid
-         */
-        private String wechatUnionid;
-        /**
-         * 允许登录的客户端; 字典代码：client_code
-         */
-        private Integer clientCode;
-        /**
-         * 是否禁用; 0-->启用、1-->禁用
-         */
-        private Boolean disabled;
-
-
-        @Override
-        public ValidRule[] rules() {
-            return new ValidRule[]{
-                ValidRule.of(() -> (StrUtil.isNotBlank(username) && StrUtil.isNotBlank(secret))
-                    || (StrUtil.isNotBlank(email) && StrUtil.isNotBlank(secret))
-                    || (StrUtil.isNotBlank(phone) && StrUtil.isNotBlank(secret))
-                    || StrUtil.isNotBlank(wechatOpenid), "账号信息不能为空"),
-            };
-        }
-
-    }
-
-}

njzscloud-svr/src/main/resources/mapper/cst/customer/CustomerMapper.xml

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.njzscloud.dispose.cst.customer.pojo.entity.CustomerEntity">
+</mapper>

njzscloud-svr/src/main/resources/mapper/cst/org/OrgMapper.xml

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.njzscloud.dispose.cst.org.pojo.entity.OrgEntity">
+</mapper>

njzscloud-svr/src/main/resources/mapper/sys/auth/AuthMapper.xml

@@ -2,7 +2,7 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 
 <mapper namespace="com.njzscloud.supervisory.sys.auth.mapper.AuthMapper">
-    <resultMap id="selectUserMap" autoMapping="true" type="com.njzscloud.supervisory.sys.auth.pojo.result.MyResult">
+    <resultMap id="selectUserMap" autoMapping="true" type="com.njzscloud.dispose.sys.auth.pojo.result.MyResult">
         <result property="accountId" column="account_id"/>
         <result property="userId" column="user_id"/>
         <result property="secret" column="secret"/>
@@ -33,7 +33,7 @@
                  INNER JOIN sys_user_role b ON b.role_id = a.id AND b.user_id = #{userId}
     </select>
 
-    <select id="selectUserMenu" resultType="com.njzscloud.supervisory.sys.auth.pojo.result.MenuResource">
+    <select id="selectUserMenu" resultType="com.njzscloud.dispose.sys.auth.pojo.result.MenuResource">
         SELECT DISTINCT a.id,
                         a.sn,
                         a.pid,
@@ -52,7 +52,7 @@
         WHERE a.deleted = 0
     </select>
 
-    <select id="selectUserEndpoint" resultType="com.njzscloud.supervisory.sys.auth.pojo.result.EndpointResource">
+    <select id="selectUserEndpoint" resultType="com.njzscloud.dispose.sys.auth.pojo.result.EndpointResource">
         SELECT DISTINCT a.id,
                         a.request_method,
                         a.routing_path,