diff --git a/ant-design-vue-jeecg/src/views/team/GroupxList.vue b/ant-design-vue-jeecg/src/views/team/GroupxList.vue new file mode 100644 index 00000000..3d393f01 --- /dev/null +++ b/ant-design-vue-jeecg/src/views/team/GroupxList.vue @@ -0,0 +1,187 @@ + + + + \ No newline at end of file diff --git a/ant-design-vue-jeecg/src/views/team/GroupxMemberList.vue b/ant-design-vue-jeecg/src/views/team/GroupxMemberList.vue new file mode 100644 index 00000000..be9ef825 --- /dev/null +++ b/ant-design-vue-jeecg/src/views/team/GroupxMemberList.vue @@ -0,0 +1,172 @@ + + + + \ No newline at end of file diff --git a/ant-design-vue-jeecg/src/views/team/modules/GroupxMemberModal.vue b/ant-design-vue-jeecg/src/views/team/modules/GroupxMemberModal.vue new file mode 100644 index 00000000..e51087ed --- /dev/null +++ b/ant-design-vue-jeecg/src/views/team/modules/GroupxMemberModal.vue @@ -0,0 +1,127 @@ + + + + + \ No newline at end of file diff --git a/ant-design-vue-jeecg/src/views/team/modules/GroupxMemberModal__Style#Drawer.vue b/ant-design-vue-jeecg/src/views/team/modules/GroupxMemberModal__Style#Drawer.vue new file mode 100644 index 00000000..7128ad89 --- /dev/null +++ b/ant-design-vue-jeecg/src/views/team/modules/GroupxMemberModal__Style#Drawer.vue @@ -0,0 +1,137 @@ + + + + + \ No newline at end of file diff --git a/ant-design-vue-jeecg/src/views/team/modules/GroupxModal.vue b/ant-design-vue-jeecg/src/views/team/modules/GroupxModal.vue new file mode 100644 index 00000000..da674f00 --- /dev/null +++ b/ant-design-vue-jeecg/src/views/team/modules/GroupxModal.vue @@ -0,0 +1,140 @@ + + + + + \ No newline at end of file diff --git a/ant-design-vue-jeecg/src/views/team/modules/GroupxModal__Style#Drawer.vue b/ant-design-vue-jeecg/src/views/team/modules/GroupxModal__Style#Drawer.vue new file mode 100644 index 00000000..d499341e --- /dev/null +++ b/ant-design-vue-jeecg/src/views/team/modules/GroupxModal__Style#Drawer.vue @@ -0,0 +1,140 @@ + + + + + \ No newline at end of file diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/team/controller/GroupxController.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/team/controller/GroupxController.java new file mode 100644 index 00000000..a5cd554f --- /dev/null +++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/team/controller/GroupxController.java @@ -0,0 +1,152 @@ +package org.jeecg.modules.team.controller; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.extern.slf4j.Slf4j; +import org.jeecg.common.api.vo.Result; +import org.jeecg.common.aspect.annotation.AutoLog; +import org.jeecg.common.system.base.controller.JeecgController; +import org.jeecg.common.system.query.QueryGenerator; +import org.jeecg.modules.team.entity.Groupx; +import org.jeecg.modules.team.service.IGroupxService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; +import org.springframework.web.servlet.ModelAndView; + +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import java.util.Arrays; + + /** + * @Description: 班组 + * @Author: jeecg-boot + * @Date: 2022-12-03 + * @Version: V1.0 + */ +@Slf4j +@Api(tags="班组管理") +@RestController +@RequestMapping("/groupx") +public class GroupxController extends JeecgController { + @Autowired + private IGroupxService groupxService; + + /** + * 分页列表查询 + * + * @param groupx + * @param pageNo + * @param pageSize + * @param req + * @return + */ + @AutoLog(value = "班组-分页列表查询") + @ApiOperation(value="班组-分页列表查询", notes="班组-分页列表查询") + @GetMapping(value = "/list") + public Result queryPageList(Groupx groupx, + @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, + @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, + HttpServletRequest req) { + QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(groupx, req.getParameterMap()); + Page page = new Page(pageNo, pageSize); + IPage pageList = groupxService.page(page, queryWrapper); + return Result.OK(pageList); + } + + /** + * 添加 + * + * @param groupx + * @return + */ + @AutoLog(value = "班组-添加") + @ApiOperation(value="班组-添加", notes="班组-添加") + @PostMapping(value = "/add") + public Result add(@RequestBody Groupx groupx) { + groupxService.save(groupx); + return Result.OK("添加成功！"); + } + + /** + * 编辑 + * + * @param groupx + * @return + */ + @AutoLog(value = "班组-编辑") + @ApiOperation(value="班组-编辑", notes="班组-编辑") + @PutMapping(value = "/edit") + public Result edit(@RequestBody Groupx groupx) { + groupxService.updateById(groupx); + return Result.OK("编辑成功!"); + } + + /** + * 通过id删除 + * + * @param id + * @return + */ + @AutoLog(value = "班组-通过id删除") + @ApiOperation(value="班组-通过id删除", notes="班组-通过id删除") + @DeleteMapping(value = "/delete") + public Result delete(@RequestParam(name="id",required=true) String id) { + groupxService.removeById(id); + return Result.OK("删除成功!"); + } + + /** + * 批量删除 + * + * @param ids + * @return + */ + @AutoLog(value = "班组-批量删除") + @ApiOperation(value="班组-批量删除", notes="班组-批量删除") + @DeleteMapping(value = "/deleteBatch") + public Result deleteBatch(@RequestParam(name="ids",required=true) String ids) { + this.groupxService.removeByIds(Arrays.asList(ids.split(","))); + return Result.OK("批量删除成功！"); + } + + /** + * 通过id查询 + * + * @param id + * @return + */ + @AutoLog(value = "班组-通过id查询") + @ApiOperation(value="班组-通过id查询", notes="班组-通过id查询") + @GetMapping(value = "/queryById") + public Result queryById(@RequestParam(name="id",required=true) String id) { + Groupx groupx = groupxService.getById(id); + return Result.OK(groupx); + } + + /** + * 导出excel + * + * @param request + * @param groupx + */ + @RequestMapping(value = "/exportXls") + public ModelAndView exportXls(HttpServletRequest request, Groupx groupx) { + return super.exportXls(request, groupx, Groupx.class, "班组"); + } + + /** + * 通过excel导入数据 + * + * @param request + * @param response + * @return + */ + @RequestMapping(value = "/importExcel", method = RequestMethod.POST) + public Result importExcel(HttpServletRequest request, HttpServletResponse response) { + return super.importExcel(request, response, Groupx.class); + } + +} diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/team/controller/GroupxMemberController.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/team/controller/GroupxMemberController.java new file mode 100644 index 00000000..4cf24112 --- /dev/null +++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/team/controller/GroupxMemberController.java @@ -0,0 +1,149 @@ +package org.jeecg.modules.team.controller; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.extern.slf4j.Slf4j; +import org.jeecg.common.api.vo.Result; +import org.jeecg.common.aspect.annotation.AutoLog; +import org.jeecg.common.system.base.controller.JeecgController; +import org.jeecg.common.system.query.QueryGenerator; +import org.jeecg.modules.team.entity.GroupxMember; +import org.jeecg.modules.team.service.IGroupxMemberService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; +import org.springframework.web.servlet.ModelAndView; + +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import java.util.Arrays; + +/** + * @Description: 班组成员管理 + * @Author: jeecg-boot + * @Date: 2022-12-03 + * @Version: V1.0 + */ +@Slf4j +@Api(tags = "班组成员表管理") +@RestController +@RequestMapping("/groupxMember") +public class GroupxMemberController extends JeecgController { + @Autowired + private IGroupxMemberService groupxMemberService; + + /** + * 分页列表查询 + * + * @param groupxMember + * @param pageNo + * @param pageSize + * @param req + * @return + */ + @AutoLog(value = "班组成员表管理-分页列表查询") + @ApiOperation(value = "班组成员表管理-分页列表查询", notes = "班组成员表管理-分页列表查询") + @GetMapping(value = "/list") + public Result queryPageList(GroupxMember groupxMember, @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo, @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize, HttpServletRequest req) { + QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(groupxMember, req.getParameterMap()); + Page page = new Page(pageNo, pageSize); + IPage pageList = groupxMemberService.page(page, queryWrapper); + return Result.OK(pageList); + } + + /** + * 添加 + * + * @param groupxMember + * @return + */ + @AutoLog(value = "班组成员表管理-添加") + @ApiOperation(value = "班组成员表管理-添加", notes = "班组成员表管理-添加") + @PostMapping(value = "/add") + public Result add(@RequestBody GroupxMember groupxMember) { + groupxMemberService.save(groupxMember); + return Result.OK("添加成功！"); + } + + /** + * 编辑 + * + * @param groupxMember + * @return + */ + @AutoLog(value = "班组成员表管理-编辑") + @ApiOperation(value = "班组成员表管理-编辑", notes = "班组成员表管理-编辑") + @PutMapping(value = "/edit") + public Result edit(@RequestBody GroupxMember groupxMember) { + groupxMemberService.updateById(groupxMember); + return Result.OK("编辑成功!"); + } + + /** + * 通过id删除 + * + * @param id + * @return + */ + @AutoLog(value = "班组成员表管理-通过id删除") + @ApiOperation(value = "班组成员表管理-通过id删除", notes = "班组成员表管理-通过id删除") + @DeleteMapping(value = "/delete") + public Result delete(@RequestParam(name = "id", required = true) String id) { + groupxMemberService.removeById(id); + return Result.OK("删除成功!"); + } + + /** + * 批量删除 + * + * @param ids + * @return + */ + @AutoLog(value = "班组成员表管理-批量删除") + @ApiOperation(value = "班组成员表管理-批量删除", notes = "班组成员表管理-批量删除") + @DeleteMapping(value = "/deleteBatch") + public Result deleteBatch(@RequestParam(name = "ids", required = true) String ids) { + this.groupxMemberService.removeByIds(Arrays.asList(ids.split(","))); + return Result.OK("批量删除成功！"); + } + + /** + * 通过id查询 + * + * @param id + * @return + */ + @AutoLog(value = "班组成员表管理-通过id查询") + @ApiOperation(value = "班组成员表管理-通过id查询", notes = "班组成员表管理-通过id查询") + @GetMapping(value = "/queryById") + public Result queryById(@RequestParam(name = "id", required = true) String id) { + GroupxMember groupxMember = groupxMemberService.getById(id); + return Result.OK(groupxMember); + } + + /** + * 导出excel + * + * @param request + * @param groupxMember + */ + @RequestMapping(value = "/exportXls") + public ModelAndView exportXls(HttpServletRequest request, GroupxMember groupxMember) { + return super.exportXls(request, groupxMember, GroupxMember.class, "班组成员表管理"); + } + + /** + * 通过excel导入数据 + * + * @param request + * @param response + * @return + */ + @RequestMapping(value = "/importExcel", method = RequestMethod.POST) + public Result importExcel(HttpServletRequest request, HttpServletResponse response) { + return super.importExcel(request, response, GroupxMember.class); + } + +} diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/team/entity/Groupx.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/team/entity/Groupx.java new file mode 100644 index 00000000..a72a19cf --- /dev/null +++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/team/entity/Groupx.java @@ -0,0 +1,56 @@ +package org.jeecg.modules.team.entity; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import com.fasterxml.jackson.annotation.JsonFormat; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; +import org.jeecgframework.poi.excel.annotation.Excel; +import org.springframework.format.annotation.DateTimeFormat; + +import java.util.Date; + +/** + * @Description: 班组 + * @Author: jeecg-boot + * @Date: 2022-12-03 + * @Version: V1.0 + */ +@Data +@TableName("groupx") +@EqualsAndHashCode(callSuper = false) +@Accessors(chain = true) +@ApiModel(value="groupx对象", description="班组") +public class Groupx { + + /**id*/ + @TableId(type = IdType.ASSIGN_ID) + @ApiModelProperty(value = "id") + private String id; + /**部门id*/ + @Excel(name = "部门id", width = 15) + @ApiModelProperty(value = "部门id") + private String departId; + /**班组名称*/ + @Excel(name = "班组名称", width = 15) + @ApiModelProperty(value = "班组名称") + private String groupName; + /**负责人;fk用户表id*/ + @Excel(name = "负责人;fk用户表id", width = 15) + @ApiModelProperty(value = "负责人;fk用户表id") + private String enterprisesManager; + /**手机号*/ + @Excel(name = "手机号", width = 15) + @ApiModelProperty(value = "手机号") + private String mobile; + /**创建时间*/ + @Excel(name = "创建时间", width = 20, format = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + @ApiModelProperty(value = "创建时间") + private Date createTime; +} diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/team/entity/GroupxMember.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/team/entity/GroupxMember.java new file mode 100644 index 00000000..be1fe870 --- /dev/null +++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/team/entity/GroupxMember.java @@ -0,0 +1,53 @@ +package org.jeecg.modules.team.entity; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import com.fasterxml.jackson.annotation.JsonFormat; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; +import org.jeecgframework.poi.excel.annotation.Excel; +import org.springframework.format.annotation.DateTimeFormat; + +import java.util.Date; + +/** + * @Description: 班组成员表管理 + * @Author: jeecg-boot + * @Date: 2022-12-03 + * @Version: V1.0 + */ +@Data +@TableName("groupx_member") +@EqualsAndHashCode(callSuper = false) +@Accessors(chain = true) +@ApiModel(value="groupx_member对象", description="班组成员管理") +public class GroupxMember { + + /**id*/ + @TableId(type = IdType.ASSIGN_ID) + @ApiModelProperty(value = "id") + private String id; + /**班组id FK 班组表*/ + @Excel(name = "班组id FK 班组表", width = 15) + @ApiModelProperty(value = "班组id FK 班组表") + private String groupxId; + /**用户id FK 用户表*/ + @Excel(name = "用户id FK 用户表", width = 15) + @ApiModelProperty(value = "用户id FK 用户表") + private String userId; + /**加入时间*/ + @Excel(name = "加入时间", width = 20, format = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + @ApiModelProperty(value = "加入时间") + private Date joinTime; + + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + @ApiModelProperty(value = "创建时间") + private Date createTime; +} diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/team/mapper/GroupxMapper.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/team/mapper/GroupxMapper.java new file mode 100644 index 00000000..d9e5c0e8 --- /dev/null +++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/team/mapper/GroupxMapper.java @@ -0,0 +1,14 @@ +package org.jeecg.modules.team.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.jeecg.modules.team.entity.Groupx; + +/** + * @Description: 班组 + * @Author: jeecg-boot + * @Date: 2022-12-03 + * @Version: V1.0 + */ +public interface GroupxMapper extends BaseMapper { + +} diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/team/mapper/GroupxMemberMapper.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/team/mapper/GroupxMemberMapper.java new file mode 100644 index 00000000..f446e6c8 --- /dev/null +++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/team/mapper/GroupxMemberMapper.java @@ -0,0 +1,14 @@ +package org.jeecg.modules.team.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.jeecg.modules.team.entity.GroupxMember; + +/** + * @Description: 班组成员表管理 + * @Author: jeecg-boot + * @Date: 2022-12-03 + * @Version: V1.0 + */ +public interface GroupxMemberMapper extends BaseMapper { + +} diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/team/mapper/xml/GroupxMapper.xml b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/team/mapper/xml/GroupxMapper.xml new file mode 100644 index 00000000..eb87f17a --- /dev/null +++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/team/mapper/xml/GroupxMapper.xml @@ -0,0 +1,5 @@ + + + + + diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/team/mapper/xml/GroupxMemberMapper.xml b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/team/mapper/xml/GroupxMemberMapper.xml new file mode 100644 index 00000000..70f4095e --- /dev/null +++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/team/mapper/xml/GroupxMemberMapper.xml @@ -0,0 +1,5 @@ + + + + + diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/team/service/IGroupxMemberService.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/team/service/IGroupxMemberService.java new file mode 100644 index 00000000..c37ff6df --- /dev/null +++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/team/service/IGroupxMemberService.java @@ -0,0 +1,14 @@ +package org.jeecg.modules.team.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import org.jeecg.modules.team.entity.GroupxMember; + +/** + * @Description: 班组成员表管理 + * @Author: jeecg-boot + * @Date: 2022-12-03 + * @Version: V1.0 + */ +public interface IGroupxMemberService extends IService { + +} diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/team/service/IGroupxService.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/team/service/IGroupxService.java new file mode 100644 index 00000000..e4b1591c --- /dev/null +++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/team/service/IGroupxService.java @@ -0,0 +1,13 @@ +package org.jeecg.modules.team.service; +import org.jeecg.modules.team.entity.Groupx; +import com.baomidou.mybatisplus.extension.service.IService; + +/** + * @Description: 班组 + * @Author: jeecg-boot + * @Date: 2022-12-03 + * @Version: V1.0 + */ +public interface IGroupxService extends IService { + +} diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/team/service/impl/GroupxMemberServiceImpl.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/team/service/impl/GroupxMemberServiceImpl.java new file mode 100644 index 00000000..7d50e01d --- /dev/null +++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/team/service/impl/GroupxMemberServiceImpl.java @@ -0,0 +1,18 @@ +package org.jeecg.modules.team.service.impl; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import org.jeecg.modules.team.entity.GroupxMember; +import org.jeecg.modules.team.mapper.GroupxMemberMapper; +import org.jeecg.modules.team.service.IGroupxMemberService; +import org.springframework.stereotype.Service; + +/** + * @Description: 班组成员表管理 + * @Author: jeecg-boot + * @Date: 2022-12-03 + * @Version: V1.0 + */ +@Service +public class GroupxMemberServiceImpl extends ServiceImpl implements IGroupxMemberService { + +} diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/team/service/impl/GroupxServiceImpl.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/team/service/impl/GroupxServiceImpl.java new file mode 100644 index 00000000..f21c9b80 --- /dev/null +++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/team/service/impl/GroupxServiceImpl.java @@ -0,0 +1,17 @@ +package org.jeecg.modules.team.service.impl; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import org.jeecg.modules.team.entity.Groupx; +import org.jeecg.modules.team.mapper.GroupxMapper; +import org.jeecg.modules.team.service.IGroupxService; +import org.springframework.stereotype.Service; + +/** + * @Description: 班组 + * @Author: jeecg-boot + * @Date: 2022-12-03 + * @Version: V1.0 + */ +@Service +public class GroupxServiceImpl extends ServiceImpl implements IGroupxService { + +} diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/jeecg_config.properties b/jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/jeecg_config.properties index 57f44dcf..588e481f 100644 --- a/jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/jeecg_config.properties +++ b/jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/jeecg_config.properties @@ -1,7 +1,7 @@ #code_generate_project_path project_path=E:\\eclipse2018-workspace\\jeecg-boot #bussi_package[User defined] -bussi_package=org.jeecg.modules.demo +bussi_package= #default code path @@ -16,7 +16,7 @@ webroot_package=src.main.webapp templatepath=/jeecg/code-template system_encoding=utf-8 -#db Table id [User defined] +#db Table id [User defined] db_table_id=id #db convert flag[true/false] diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/jeecg_database.properties b/jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/jeecg_database.properties index 7aa47eb4..8193847f 100644 --- a/jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/jeecg_database.properties +++ b/jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/jeecg_database.properties @@ -1,9 +1,9 @@ #mysql diver_name=com.mysql.jdbc.Driver -url: jdbc:mysql://mysql-lee.mysql.rds.aliyuncs.com:3306/zy?characterEncoding=UTF-8&useUnicode=true&useSSL=false&tinyInt1isBit=false&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai -username: root1 -password: zxcvbnm023@lee -database_name=jeecg-boot +database_name=costumingplatform +url: jdbc:mysql://182.92.169.222:3306/costumingplatform?useUnicode=true&characterEncoding=utf8&autoReconnect=true&zeroDateTimeBehavior=convertToNull&transformedBitIsBoolean=true&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai +username: root +password: ycwl2022. #oracle #diver_name=oracle.jdbc.driver.OracleDriver