diff --git a/pom.xml b/pom.xml index 35eba21d..bfc0fd58 100644 --- a/pom.xml +++ b/pom.xml @@ -238,6 +238,8 @@ ruoyi-api-system ${ruoyi.version} + + diff --git a/ruoyi-auth/src/main/resources/bootstrap.yml b/ruoyi-auth/src/main/resources/bootstrap.yml index f456b03c..21677f35 100644 --- a/ruoyi-auth/src/main/resources/bootstrap.yml +++ b/ruoyi-auth/src/main/resources/bootstrap.yml @@ -14,12 +14,14 @@ spring: nacos: discovery: # 服务注册地址 - server-addr: 127.0.0.1:8848 + server-addr: 192.168.1.211:30006 + namespace: dev config: # 配置中心地址 - server-addr: 127.0.0.1:8848 + server-addr: 192.168.1.211:30006 # 配置文件格式 file-extension: yml + namespace: dev # 共享配置 shared-configs: - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension} diff --git a/ruoyi-gateway/src/main/resources/bootstrap.yml b/ruoyi-gateway/src/main/resources/bootstrap.yml index 5a955b4c..c6b3ecac 100644 --- a/ruoyi-gateway/src/main/resources/bootstrap.yml +++ b/ruoyi-gateway/src/main/resources/bootstrap.yml @@ -14,10 +14,12 @@ spring: nacos: discovery: # 服务注册地址 - server-addr: 127.0.0.1:8848 + server-addr: 192.168.1.211:30006 + namespace: dev config: # 配置中心地址 - server-addr: 127.0.0.1:8848 + server-addr: 192.168.1.211:30006 + namespace: dev # 配置文件格式 file-extension: yml # 共享配置 @@ -33,7 +35,8 @@ spring: datasource: ds1: nacos: - server-addr: 127.0.0.1:8848 + server-addr: 192.168.1.211:30006 + namespace: dev dataId: sentinel-ruoyi-gateway groupId: DEFAULT_GROUP data-type: json diff --git a/ruoyi-modules/ruoyi-gen/src/main/resources/bootstrap.yml b/ruoyi-modules/ruoyi-gen/src/main/resources/bootstrap.yml index 0ef5a457..0fd986c0 100644 --- a/ruoyi-modules/ruoyi-gen/src/main/resources/bootstrap.yml +++ b/ruoyi-modules/ruoyi-gen/src/main/resources/bootstrap.yml @@ -14,12 +14,14 @@ spring: nacos: discovery: # 服务注册地址 - server-addr: 127.0.0.1:8848 + server-addr: 192.168.1.211:30006 + namespace: dev config: # 配置中心地址 - server-addr: 127.0.0.1:8848 + server-addr: 192.168.1.211:30006 # 配置文件格式 file-extension: yml + namespace: dev # 共享配置 shared-configs: - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension} diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/WxUserController.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/WxUserController.java new file mode 100644 index 00000000..5f9e13ab --- /dev/null +++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/WxUserController.java @@ -0,0 +1,105 @@ +package com.ruoyi.system.controller; + +import java.util.List; +import java.io.IOException; +import javax.servlet.http.HttpServletResponse; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.PutMapping; +import org.springframework.web.bind.annotation.DeleteMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; +import com.ruoyi.common.log.annotation.Log; +import com.ruoyi.common.log.enums.BusinessType; +import com.ruoyi.common.security.annotation.RequiresPermissions; +import com.ruoyi.system.domain.WxUser; +import com.ruoyi.system.service.IWxUserService; +import com.ruoyi.common.core.web.controller.BaseController; +import com.ruoyi.common.core.web.domain.AjaxResult; +import com.ruoyi.common.core.utils.poi.ExcelUtil; +import com.ruoyi.common.core.web.page.TableDataInfo; + +/** + * 微信用户Controller + * + * @author 吴一博 + * @date 2022-08-30 + */ +@RestController +@RequestMapping("/wxUser") +public class WxUserController extends BaseController +{ + @Autowired + private IWxUserService wxUserService; + + /** + * 查询微信用户列表 + */ + @RequiresPermissions("system:wxUser:list") + @GetMapping("/list") + public TableDataInfo list(WxUser wxUser) + { + startPage(); + List list = wxUserService.selectWxUserList(wxUser); + return getDataTable(list); + } + + /** + * 导出微信用户列表 + */ + @RequiresPermissions("system:wxUser:export") + @Log(title = "微信用户", businessType = BusinessType.EXPORT) + @PostMapping("/export") + public void export(HttpServletResponse response, WxUser wxUser) + { + List list = wxUserService.selectWxUserList(wxUser); + ExcelUtil util = new ExcelUtil(WxUser.class); + util.exportExcel(response, list, "微信用户数据"); + } + + /** + * 获取微信用户详细信息 + */ + @RequiresPermissions("system:wxUser:query") + @GetMapping(value = "/{id}") + public AjaxResult getInfo(@PathVariable("id") Long id) + { + return AjaxResult.success(wxUserService.selectWxUserById(id)); + } + + /** + * 新增微信用户 + */ + @RequiresPermissions("system:wxUser:add") + @Log(title = "微信用户", businessType = BusinessType.INSERT) + @PostMapping + public AjaxResult add(@RequestBody WxUser wxUser) + { + return toAjax(wxUserService.insertWxUser(wxUser)); + } + + /** + * 修改微信用户 + */ + @RequiresPermissions("system:wxUser:edit") + @Log(title = "微信用户", businessType = BusinessType.UPDATE) + @PutMapping + public AjaxResult edit(@RequestBody WxUser wxUser) + { + return toAjax(wxUserService.updateWxUser(wxUser)); + } + + /** + * 删除微信用户 + */ + @RequiresPermissions("system:wxUser:remove") + @Log(title = "微信用户", businessType = BusinessType.DELETE) + @DeleteMapping("/{ids}") + public AjaxResult remove(@PathVariable Long[] ids) + { + return toAjax(wxUserService.deleteWxUserByIds(ids)); + } +} diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/WxUser.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/WxUser.java new file mode 100644 index 00000000..7a1c4bc7 --- /dev/null +++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/WxUser.java @@ -0,0 +1,351 @@ +package com.ruoyi.system.domain; + +import java.math.BigDecimal; +import java.util.Date; +import com.fasterxml.jackson.annotation.JsonFormat; +import org.apache.commons.lang3.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; +import com.ruoyi.common.core.annotation.Excel; +import com.ruoyi.common.core.web.domain.BaseEntity; + +/** + * 微信用户对象 user_info + * + * @author 吴一博 + * @date 2022-08-30 + */ +public class WxUser extends BaseEntity +{ + private static final long serialVersionUID = 1L; + + /** 主键ID */ + private Long id; + + /** 删除 */ + @Excel(name = "删除") + private Long isDeleted; + + /** 创建时间 */ + @JsonFormat(pattern = "yyyy-MM-dd") + @Excel(name = "创建时间", width = 30, dateFormat = "yyyy-MM-dd") + private Date createdTime; + + /** 创建人 */ + @Excel(name = "创建人") + private String createdBy; + + /** 最后修改人 */ + @Excel(name = "最后修改人") + private String modifiedBy; + + /** 最后修改时间 */ + @JsonFormat(pattern = "yyyy-MM-dd") + @Excel(name = "最后修改时间", width = 30, dateFormat = "yyyy-MM-dd") + private Date lastUpdatedTime; + + /** 登录名称 */ + @Excel(name = "登录名称") + private String loginName; + + /** 密码 */ + @Excel(name = "密码") + private String passWord; + + /** 角色 */ + @Excel(name = "角色") + private String role; + + /** 用户编码(小程序平台OPENID) */ + @Excel(name = "用户编码(小程序平台OPENID)") + private String openid; + + /** 头像地址 */ + @Excel(name = "头像地址") + private String avatar; + + /** 性别 */ + @Excel(name = "性别") + private String gender; + + /** 用户名称 */ + @Excel(name = "用户名称") + private String userName; + + /** 手机号 */ + @Excel(name = "手机号") + private String telephone; + + /** 生日 */ + @JsonFormat(pattern = "yyyy-MM-dd") + @Excel(name = "生日", width = 30, dateFormat = "yyyy-MM-dd") + private Date birthday; + + /** 身高 */ + @Excel(name = "身高") + private Long height; + + /** 体重 */ + @Excel(name = "体重") + private BigDecimal weight; + + /** 球队位置 */ + @Excel(name = "球队位置") + private String teamPosition; + + /** 标签 */ + @Excel(name = "标签") + private String tag; + + /** 状态 */ + @Excel(name = "状态") + private String enabled; + + /** 微信多平台唯一ID */ + @Excel(name = "微信多平台唯一ID") + private String unionid; + + /** 公众号平台的openId */ + @Excel(name = "公众号平台的openId") + private String officialAccountOpenid; + + /** 真实姓名 */ + @Excel(name = "真实姓名") + private String realName; + + public void setId(Long id) + { + this.id = id; + } + + public Long getId() + { + return id; + } + public void setIsDeleted(Long isDeleted) + { + this.isDeleted = isDeleted; + } + + public Long getIsDeleted() + { + return isDeleted; + } + public void setCreatedTime(Date createdTime) + { + this.createdTime = createdTime; + } + + public Date getCreatedTime() + { + return createdTime; + } + public void setCreatedBy(String createdBy) + { + this.createdBy = createdBy; + } + + public String getCreatedBy() + { + return createdBy; + } + public void setModifiedBy(String modifiedBy) + { + this.modifiedBy = modifiedBy; + } + + public String getModifiedBy() + { + return modifiedBy; + } + public void setLastUpdatedTime(Date lastUpdatedTime) + { + this.lastUpdatedTime = lastUpdatedTime; + } + + public Date getLastUpdatedTime() + { + return lastUpdatedTime; + } + public void setLoginName(String loginName) + { + this.loginName = loginName; + } + + public String getLoginName() + { + return loginName; + } + public void setPassWord(String passWord) + { + this.passWord = passWord; + } + + public String getPassWord() + { + return passWord; + } + public void setRole(String role) + { + this.role = role; + } + + public String getRole() + { + return role; + } + public void setOpenid(String openid) + { + this.openid = openid; + } + + public String getOpenid() + { + return openid; + } + public void setAvatar(String avatar) + { + this.avatar = avatar; + } + + public String getAvatar() + { + return avatar; + } + public void setGender(String gender) + { + this.gender = gender; + } + + public String getGender() + { + return gender; + } + public void setUserName(String userName) + { + this.userName = userName; + } + + public String getUserName() + { + return userName; + } + public void setTelephone(String telephone) + { + this.telephone = telephone; + } + + public String getTelephone() + { + return telephone; + } + public void setBirthday(Date birthday) + { + this.birthday = birthday; + } + + public Date getBirthday() + { + return birthday; + } + public void setHeight(Long height) + { + this.height = height; + } + + public Long getHeight() + { + return height; + } + public void setWeight(BigDecimal weight) + { + this.weight = weight; + } + + public BigDecimal getWeight() + { + return weight; + } + public void setTeamPosition(String teamPosition) + { + this.teamPosition = teamPosition; + } + + public String getTeamPosition() + { + return teamPosition; + } + public void setTag(String tag) + { + this.tag = tag; + } + + public String getTag() + { + return tag; + } + public void setEnabled(String enabled) + { + this.enabled = enabled; + } + + public String getEnabled() + { + return enabled; + } + public void setUnionid(String unionid) + { + this.unionid = unionid; + } + + public String getUnionid() + { + return unionid; + } + public void setOfficialAccountOpenid(String officialAccountOpenid) + { + this.officialAccountOpenid = officialAccountOpenid; + } + + public String getOfficialAccountOpenid() + { + return officialAccountOpenid; + } + public void setRealName(String realName) + { + this.realName = realName; + } + + public String getRealName() + { + return realName; + } + + @Override + public String toString() { + return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) + .append("id", getId()) + .append("isDeleted", getIsDeleted()) + .append("createdTime", getCreatedTime()) + .append("createdBy", getCreatedBy()) + .append("modifiedBy", getModifiedBy()) + .append("lastUpdatedTime", getLastUpdatedTime()) + .append("loginName", getLoginName()) + .append("passWord", getPassWord()) + .append("role", getRole()) + .append("openid", getOpenid()) + .append("avatar", getAvatar()) + .append("gender", getGender()) + .append("userName", getUserName()) + .append("telephone", getTelephone()) + .append("birthday", getBirthday()) + .append("height", getHeight()) + .append("weight", getWeight()) + .append("teamPosition", getTeamPosition()) + .append("tag", getTag()) + .append("enabled", getEnabled()) + .append("unionid", getUnionid()) + .append("officialAccountOpenid", getOfficialAccountOpenid()) + .append("realName", getRealName()) + .toString(); + } +} diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/WxUserMapper.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/WxUserMapper.java new file mode 100644 index 00000000..49e85256 --- /dev/null +++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/WxUserMapper.java @@ -0,0 +1,61 @@ +package com.ruoyi.system.mapper; + +import java.util.List; +import com.ruoyi.system.domain.WxUser; + +/** + * 微信用户Mapper接口 + * + * @author 吴一博 + * @date 2022-08-30 + */ +public interface WxUserMapper +{ + /** + * 查询微信用户 + * + * @param id 微信用户主键 + * @return 微信用户 + */ + public WxUser selectWxUserById(Long id); + + /** + * 查询微信用户列表 + * + * @param wxUser 微信用户 + * @return 微信用户集合 + */ + public List selectWxUserList(WxUser wxUser); + + /** + * 新增微信用户 + * + * @param wxUser 微信用户 + * @return 结果 + */ + public int insertWxUser(WxUser wxUser); + + /** + * 修改微信用户 + * + * @param wxUser 微信用户 + * @return 结果 + */ + public int updateWxUser(WxUser wxUser); + + /** + * 删除微信用户 + * + * @param id 微信用户主键 + * @return 结果 + */ + public int deleteWxUserById(Long id); + + /** + * 批量删除微信用户 + * + * @param ids 需要删除的数据主键集合 + * @return 结果 + */ + public int deleteWxUserByIds(Long[] ids); +} diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/IWxUserService.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/IWxUserService.java new file mode 100644 index 00000000..5c143ccf --- /dev/null +++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/IWxUserService.java @@ -0,0 +1,61 @@ +package com.ruoyi.system.service; + +import java.util.List; +import com.ruoyi.system.domain.WxUser; + +/** + * 微信用户Service接口 + * + * @author 吴一博 + * @date 2022-08-30 + */ +public interface IWxUserService +{ + /** + * 查询微信用户 + * + * @param id 微信用户主键 + * @return 微信用户 + */ + public WxUser selectWxUserById(Long id); + + /** + * 查询微信用户列表 + * + * @param wxUser 微信用户 + * @return 微信用户集合 + */ + public List selectWxUserList(WxUser wxUser); + + /** + * 新增微信用户 + * + * @param wxUser 微信用户 + * @return 结果 + */ + public int insertWxUser(WxUser wxUser); + + /** + * 修改微信用户 + * + * @param wxUser 微信用户 + * @return 结果 + */ + public int updateWxUser(WxUser wxUser); + + /** + * 批量删除微信用户 + * + * @param ids 需要删除的微信用户主键集合 + * @return 结果 + */ + public int deleteWxUserByIds(Long[] ids); + + /** + * 删除微信用户信息 + * + * @param id 微信用户主键 + * @return 结果 + */ + public int deleteWxUserById(Long id); +} diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/WxUserServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/WxUserServiceImpl.java new file mode 100644 index 00000000..669ffb62 --- /dev/null +++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/WxUserServiceImpl.java @@ -0,0 +1,93 @@ +package com.ruoyi.system.service.impl; + +import java.util.List; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import com.ruoyi.system.mapper.WxUserMapper; +import com.ruoyi.system.domain.WxUser; +import com.ruoyi.system.service.IWxUserService; + +/** + * 微信用户Service业务层处理 + * + * @author 吴一博 + * @date 2022-08-30 + */ +@Service +public class WxUserServiceImpl implements IWxUserService +{ + @Autowired + private WxUserMapper wxUserMapper; + + /** + * 查询微信用户 + * + * @param id 微信用户主键 + * @return 微信用户 + */ + @Override + public WxUser selectWxUserById(Long id) + { + return wxUserMapper.selectWxUserById(id); + } + + /** + * 查询微信用户列表 + * + * @param wxUser 微信用户 + * @return 微信用户 + */ + @Override + public List selectWxUserList(WxUser wxUser) + { + return wxUserMapper.selectWxUserList(wxUser); + } + + /** + * 新增微信用户 + * + * @param wxUser 微信用户 + * @return 结果 + */ + @Override + public int insertWxUser(WxUser wxUser) + { + return wxUserMapper.insertWxUser(wxUser); + } + + /** + * 修改微信用户 + * + * @param wxUser 微信用户 + * @return 结果 + */ + @Override + public int updateWxUser(WxUser wxUser) + { + return wxUserMapper.updateWxUser(wxUser); + } + + /** + * 批量删除微信用户 + * + * @param ids 需要删除的微信用户主键 + * @return 结果 + */ + @Override + public int deleteWxUserByIds(Long[] ids) + { + return wxUserMapper.deleteWxUserByIds(ids); + } + + /** + * 删除微信用户信息 + * + * @param id 微信用户主键 + * @return 结果 + */ + @Override + public int deleteWxUserById(Long id) + { + return wxUserMapper.deleteWxUserById(id); + } +} diff --git a/ruoyi-modules/ruoyi-system/src/main/resources/bootstrap.yml b/ruoyi-modules/ruoyi-system/src/main/resources/bootstrap.yml index 40ab7816..6fe05391 100644 --- a/ruoyi-modules/ruoyi-system/src/main/resources/bootstrap.yml +++ b/ruoyi-modules/ruoyi-system/src/main/resources/bootstrap.yml @@ -14,10 +14,12 @@ spring: nacos: discovery: # 服务注册地址 - server-addr: 127.0.0.1:8848 + server-addr: 192.168.1.211:30006 + namespace: dev config: # 配置中心地址 - server-addr: 127.0.0.1:8848 + server-addr: 192.168.1.211:30006 + namespace: dev # 配置文件格式 file-extension: yml # 共享配置 diff --git a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/WxUserMapper.xml b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/WxUserMapper.xml new file mode 100644 index 00000000..80a7fcb2 --- /dev/null +++ b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/WxUserMapper.xml @@ -0,0 +1,161 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + select ID, IS_DELETED, CREATED_TIME, CREATED_BY, MODIFIED_BY, LAST_UPDATED_TIME, LOGIN_NAME, PASS_WORD, ROLE, OPENID, AVATAR, GENDER, USER_NAME, TELEPHONE, BIRTHDAY, HEIGHT, WEIGHT, TEAM_POSITION, TAG, ENABLED, UNIONID, OFFICIAL_ACCOUNT_OPENID, real_name from user_info + + + + + + + + insert into user_info + + IS_DELETED, + CREATED_TIME, + CREATED_BY, + MODIFIED_BY, + LAST_UPDATED_TIME, + LOGIN_NAME, + PASS_WORD, + ROLE, + OPENID, + AVATAR, + GENDER, + USER_NAME, + TELEPHONE, + BIRTHDAY, + HEIGHT, + WEIGHT, + TEAM_POSITION, + TAG, + ENABLED, + UNIONID, + OFFICIAL_ACCOUNT_OPENID, + real_name, + + + #{isDeleted}, + #{createdTime}, + #{createdBy}, + #{modifiedBy}, + #{lastUpdatedTime}, + #{loginName}, + #{passWord}, + #{role}, + #{openid}, + #{avatar}, + #{gender}, + #{userName}, + #{telephone}, + #{birthday}, + #{height}, + #{weight}, + #{teamPosition}, + #{tag}, + #{enabled}, + #{unionid}, + #{officialAccountOpenid}, + #{realName}, + + + + + update user_info + + IS_DELETED = #{isDeleted}, + CREATED_TIME = #{createdTime}, + CREATED_BY = #{createdBy}, + MODIFIED_BY = #{modifiedBy}, + LAST_UPDATED_TIME = #{lastUpdatedTime}, + LOGIN_NAME = #{loginName}, + PASS_WORD = #{passWord}, + ROLE = #{role}, + OPENID = #{openid}, + AVATAR = #{avatar}, + GENDER = #{gender}, + USER_NAME = #{userName}, + TELEPHONE = #{telephone}, + BIRTHDAY = #{birthday}, + HEIGHT = #{height}, + WEIGHT = #{weight}, + TEAM_POSITION = #{teamPosition}, + TAG = #{tag}, + ENABLED = #{enabled}, + UNIONID = #{unionid}, + OFFICIAL_ACCOUNT_OPENID = #{officialAccountOpenid}, + real_name = #{realName}, + + where ID = #{id} + + + + delete from user_info where ID = #{id} + + + + delete from user_info where ID in + + #{id} + + + \ No newline at end of file diff --git a/ruoyi-ui/src/api/system/wxUser.js b/ruoyi-ui/src/api/system/wxUser.js new file mode 100644 index 00000000..f75a7961 --- /dev/null +++ b/ruoyi-ui/src/api/system/wxUser.js @@ -0,0 +1,44 @@ +import request from '@/utils/request' + +// 查询微信用户列表 +export function listWxUser(query) { + return request({ + url: '/system/wxUser/list', + method: 'get', + params: query + }) +} + +// 查询微信用户详细 +export function getWxUser(id) { + return request({ + url: '/system/wxUser/' + id, + method: 'get' + }) +} + +// 新增微信用户 +export function addWxUser(data) { + return request({ + url: '/system/wxUser', + method: 'post', + data: data + }) +} + +// 修改微信用户 +export function updateWxUser(data) { + return request({ + url: '/system/wxUser', + method: 'put', + data: data + }) +} + +// 删除微信用户 +export function delWxUser(id) { + return request({ + url: '/system/wxUser/' + id, + method: 'delete' + }) +} diff --git a/ruoyi-ui/src/views/system/wxUser/index.vue b/ruoyi-ui/src/views/system/wxUser/index.vue new file mode 100644 index 00000000..bf42793e --- /dev/null +++ b/ruoyi-ui/src/views/system/wxUser/index.vue @@ -0,0 +1,382 @@ + + +