diff --git a/admin-hanhai-vue/src/views/picConfig/TbConfList.vue b/admin-hanhai-vue/src/views/picConfig/TbConfList.vue new file mode 100644 index 0000000..40a1115 --- /dev/null +++ b/admin-hanhai-vue/src/views/picConfig/TbConfList.vue @@ -0,0 +1,163 @@ + + + + \ No newline at end of file diff --git a/admin-hanhai-vue/src/views/picConfig/modules/TbConfForm.vue b/admin-hanhai-vue/src/views/picConfig/modules/TbConfForm.vue new file mode 100644 index 0000000..f8db9f6 --- /dev/null +++ b/admin-hanhai-vue/src/views/picConfig/modules/TbConfForm.vue @@ -0,0 +1,109 @@ + + + \ No newline at end of file diff --git a/admin-hanhai-vue/src/views/picConfig/modules/TbConfModal.Style#Drawer.vue b/admin-hanhai-vue/src/views/picConfig/modules/TbConfModal.Style#Drawer.vue new file mode 100644 index 0000000..c015084 --- /dev/null +++ b/admin-hanhai-vue/src/views/picConfig/modules/TbConfModal.Style#Drawer.vue @@ -0,0 +1,84 @@ + + + + + \ No newline at end of file diff --git a/admin-hanhai-vue/src/views/picConfig/modules/TbConfModal.vue b/admin-hanhai-vue/src/views/picConfig/modules/TbConfModal.vue new file mode 100644 index 0000000..b56d67b --- /dev/null +++ b/admin-hanhai-vue/src/views/picConfig/modules/TbConfModal.vue @@ -0,0 +1,60 @@ + + + \ No newline at end of file diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/config/shiro/ShiroConfig.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/config/shiro/ShiroConfig.java index 3d353af..1aec0b4 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/config/shiro/ShiroConfig.java +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/config/shiro/ShiroConfig.java @@ -74,11 +74,14 @@ public class ShiroConfig { filterChainDefinitionMap.put("/index/index", "anon"); //登录接口排除 filterChainDefinitionMap.put("/index/bannerList", "anon"); + filterChainDefinitionMap.put("/index/getSysText", "anon"); filterChainDefinitionMap.put("/index/industryList", "anon"); filterChainDefinitionMap.put("/index/getIndustryById", "anon"); filterChainDefinitionMap.put("/index/rolelist1", "anon"); filterChainDefinitionMap.put("/index/taskList", "anon"); filterChainDefinitionMap.put("/user/login", "anon"); + filterChainDefinitionMap.put("/user/bindPhone", "anon"); + filterChainDefinitionMap.put("/index//bannerList", "anon"); diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/bean/CodeBeanModel.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/bean/CodeBeanModel.java new file mode 100644 index 0000000..677fe9d --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/bean/CodeBeanModel.java @@ -0,0 +1,94 @@ +package org.jeecg.modules.bean; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * 用途描述： + * 微信小程序用户注册登录用实体对象 + * @author ducer + * @version : WxLoginModel, v0.1 + * @company 车姆数字科技 + * @createDate 2021年03月11日 15:25 + */ +@Data +@ApiModel("小程序登录参数") +public class CodeBeanModel { + + /** + * 用户唯一标识 + */ + @ApiModelProperty("用户唯一标识") + private String openid; + /** + * 会话密钥 + */ + @ApiModelProperty("会话密钥") + private String session_key; + /** + * 用户在开放平台的唯一标识符，在满足 UnionID 下发条件的情况下会返回，详见 UnionID 机制说明 + */ + @ApiModelProperty("用户在开放平台的唯一标识符，在满足 UnionID 下发条件的情况下会返回，详见 UnionID 机制说明") + private String unionid; + /** + * 错误码 + */ + @ApiModelProperty("错误码") + private String errcode; + /** + * 错误信息 + */ + @ApiModelProperty("错误信息") + private String errmsg; + /** + * 参数信息 + */ + @ApiModelProperty("参数信息") + private String code; + /** + * 用户uid + */ + @ApiModelProperty("用户uid") + private Integer id; + /** + * 用户姓名 + */ + @ApiModelProperty("用户姓名") + private String nickName; + /** + * 用户头像 + */ + @ApiModelProperty("用户头像") + private String headimgurl; + /** + * 邀请人 + */ + @ApiModelProperty("邀请人") + private String shareid; + /** + * 邀请码 + */ + @ApiModelProperty("技师邀请码") + private String inviteCode; + @ApiModelProperty("性别") + private String gender; + @ApiModelProperty("所在省份") + private String province; + @ApiModelProperty("所在城市") + private String city; + @ApiModelProperty("邀请码") + private String userCode; + + private String iv; + private String encryptedData; + @ApiModelProperty("用户头像") + private String avatarUrl; + + /** + * token + */ + @ApiModelProperty("token") + private String token; + +} diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/src/main/java/org/jeecg/modules/tbSpecs/controller/TbSpecsController.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/src/main/java/org/jeecg/modules/tbSpecs/controller/TbSpecsController.java new file mode 100644 index 0000000..344f4f6 --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/src/main/java/org/jeecg/modules/tbSpecs/controller/TbSpecsController.java @@ -0,0 +1,171 @@ +package org.jeecg.modules.tbSpecs.controller; + +import java.util.Arrays; +import java.util.List; +import java.util.Map; +import java.util.stream.Collectors; +import java.io.IOException; +import java.io.UnsupportedEncodingException; +import java.net.URLDecoder; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import org.jeecg.common.api.vo.Result; +import org.jeecg.common.system.query.QueryGenerator; +import org.jeecg.common.util.oConvertUtils; +import org.jeecg.modules.tbSpecs.entity.TbSpecs; +import org.jeecg.modules.tbSpecs.service.ITbSpecsService; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import lombok.extern.slf4j.Slf4j; + +import org.jeecgframework.poi.excel.ExcelImportUtil; +import org.jeecgframework.poi.excel.def.NormalExcelConstants; +import org.jeecgframework.poi.excel.entity.ExportParams; +import org.jeecgframework.poi.excel.entity.ImportParams; +import org.jeecgframework.poi.excel.view.JeecgEntityExcelView; +import org.jeecg.common.system.base.controller.JeecgController; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; +import org.springframework.web.multipart.MultipartFile; +import org.springframework.web.multipart.MultipartHttpServletRequest; +import org.springframework.web.servlet.ModelAndView; +import com.alibaba.fastjson.JSON; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.jeecg.common.aspect.annotation.AutoLog; + + /** + * @Description: tb_specs + * @Author: jeecg-boot + * @Date: 2024-12-13 + * @Version: V1.0 + */ +@Api(tags="tb_specs") +@RestController +@RequestMapping("/tbSpecs/tbSpecs") +@Slf4j +public class TbSpecsController extends JeecgController { + @Autowired + private ITbSpecsService tbSpecsService; + + /** + * 分页列表查询 + * + * @param tbSpecs + * @param pageNo + * @param pageSize + * @param req + * @return + */ + //@AutoLog(value = "tb_specs-分页列表查询") + @ApiOperation(value="tb_specs-分页列表查询", notes="tb_specs-分页列表查询") + @GetMapping(value = "/list") + public Result> queryPageList(TbSpecs tbSpecs, + @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, + @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, + HttpServletRequest req) { + QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(tbSpecs, req.getParameterMap()); + Page page = new Page(pageNo, pageSize); + IPage pageList = tbSpecsService.page(page, queryWrapper); + return Result.OK(pageList); + } + + /** + * 添加 + * + * @param tbSpecs + * @return + */ + @AutoLog(value = "tb_specs-添加") + @ApiOperation(value="tb_specs-添加", notes="tb_specs-添加") + @PostMapping(value = "/add") + public Result add(@RequestBody TbSpecs tbSpecs) { + tbSpecsService.save(tbSpecs); + return Result.OK("添加成功！"); + } + + /** + * 编辑 + * + * @param tbSpecs + * @return + */ + @AutoLog(value = "tb_specs-编辑") + @ApiOperation(value="tb_specs-编辑", notes="tb_specs-编辑") + @RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST}) + public Result edit(@RequestBody TbSpecs tbSpecs) { + tbSpecsService.updateById(tbSpecs); + return Result.OK("编辑成功!"); + } + + /** + * 通过id删除 + * + * @param id + * @return + */ + @AutoLog(value = "tb_specs-通过id删除") + @ApiOperation(value="tb_specs-通过id删除", notes="tb_specs-通过id删除") + @DeleteMapping(value = "/delete") + public Result delete(@RequestParam(name="id",required=true) String id) { + tbSpecsService.removeById(id); + return Result.OK("删除成功!"); + } + + /** + * 批量删除 + * + * @param ids + * @return + */ + @AutoLog(value = "tb_specs-批量删除") + @ApiOperation(value="tb_specs-批量删除", notes="tb_specs-批量删除") + @DeleteMapping(value = "/deleteBatch") + public Result deleteBatch(@RequestParam(name="ids",required=true) String ids) { + this.tbSpecsService.removeByIds(Arrays.asList(ids.split(","))); + return Result.OK("批量删除成功!"); + } + + /** + * 通过id查询 + * + * @param id + * @return + */ + //@AutoLog(value = "tb_specs-通过id查询") + @ApiOperation(value="tb_specs-通过id查询", notes="tb_specs-通过id查询") + @GetMapping(value = "/queryById") + public Result queryById(@RequestParam(name="id",required=true) String id) { + TbSpecs tbSpecs = tbSpecsService.getById(id); + if(tbSpecs==null) { + return Result.error("未找到对应数据"); + } + return Result.OK(tbSpecs); + } + + /** + * 导出excel + * + * @param request + * @param tbSpecs + */ + @RequestMapping(value = "/exportXls") + public ModelAndView exportXls(HttpServletRequest request, TbSpecs tbSpecs) { + return super.exportXls(request, tbSpecs, TbSpecs.class, "tb_specs"); + } + + /** + * 通过excel导入数据 + * + * @param request + * @param response + * @return + */ + @RequestMapping(value = "/importExcel", method = RequestMethod.POST) + public Result importExcel(HttpServletRequest request, HttpServletResponse response) { + return super.importExcel(request, response, TbSpecs.class); + } + +} diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/src/main/java/org/jeecg/modules/tbSpecs/entity/TbSpecs.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/src/main/java/org/jeecg/modules/tbSpecs/entity/TbSpecs.java new file mode 100644 index 0000000..27cee1c --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/src/main/java/org/jeecg/modules/tbSpecs/entity/TbSpecs.java @@ -0,0 +1,69 @@ +package org.jeecg.modules.tbSpecs.entity; + +import java.io.Serializable; +import java.io.UnsupportedEncodingException; +import java.util.Date; +import java.math.BigDecimal; +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; +import com.fasterxml.jackson.annotation.JsonFormat; +import org.springframework.format.annotation.DateTimeFormat; +import org.jeecgframework.poi.excel.annotation.Excel; +import org.jeecg.common.aspect.annotation.Dict; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; + +/** + * @Description: tb_specs + * @Author: jeecg-boot + * @Date: 2024-12-13 + * @Version: V1.0 + */ +@Data +@TableName("tb_specs") +@Accessors(chain = true) +@EqualsAndHashCode(callSuper = false) +@ApiModel(value="tb_specs对象", description="tb_specs") +public class TbSpecs implements Serializable { + private static final long serialVersionUID = 1L; + + /**id*/ + @TableId(type = IdType.ASSIGN_ID) + @ApiModelProperty(value = "id") + private java.lang.String id; + /**规格名*/ + @Excel(name = "规格名", width = 15) + @ApiModelProperty(value = "规格名") + private java.lang.String specsName; + /**图片*/ + @Excel(name = "图片", width = 15) + @ApiModelProperty(value = "图片") + private java.lang.String pic; + /**创建人*/ + @ApiModelProperty(value = "创建人") + private java.lang.String createBy; + /**创建日期*/ + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd") + @DateTimeFormat(pattern="yyyy-MM-dd") + @ApiModelProperty(value = "创建日期") + private java.util.Date createTime; + /**更新人*/ + @ApiModelProperty(value = "更新人") + private java.lang.String updateBy; + /**更新日期*/ + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd") + @DateTimeFormat(pattern="yyyy-MM-dd") + @ApiModelProperty(value = "更新日期") + private java.util.Date updateTime; + /**所属部门*/ + @ApiModelProperty(value = "所属部门") + private java.lang.String sysOrgCode; + /**删除标识0-正常,1-已删除*/ + @Excel(name = "删除标识0-正常,1-已删除", width = 15) + @ApiModelProperty(value = "删除标识0-正常,1-已删除") + private java.lang.Integer delFlag; +} diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/src/main/java/org/jeecg/modules/tbSpecs/mapper/TbSpecsMapper.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/src/main/java/org/jeecg/modules/tbSpecs/mapper/TbSpecsMapper.java new file mode 100644 index 0000000..5a78753 --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/src/main/java/org/jeecg/modules/tbSpecs/mapper/TbSpecsMapper.java @@ -0,0 +1,17 @@ +package org.jeecg.modules.tbSpecs.mapper; + +import java.util.List; + +import org.apache.ibatis.annotations.Param; +import org.jeecg.modules.tbSpecs.entity.TbSpecs; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +/** + * @Description: tb_specs + * @Author: jeecg-boot + * @Date: 2024-12-13 + * @Version: V1.0 + */ +public interface TbSpecsMapper extends BaseMapper { + +} diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/src/main/java/org/jeecg/modules/tbSpecs/mapper/xml/TbSpecsMapper.xml b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/src/main/java/org/jeecg/modules/tbSpecs/mapper/xml/TbSpecsMapper.xml new file mode 100644 index 0000000..440b91b --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/src/main/java/org/jeecg/modules/tbSpecs/mapper/xml/TbSpecsMapper.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/src/main/java/org/jeecg/modules/tbSpecs/service/ITbSpecsService.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/src/main/java/org/jeecg/modules/tbSpecs/service/ITbSpecsService.java new file mode 100644 index 0000000..baeaa1a --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/src/main/java/org/jeecg/modules/tbSpecs/service/ITbSpecsService.java @@ -0,0 +1,14 @@ +package org.jeecg.modules.tbSpecs.service; + +import org.jeecg.modules.tbSpecs.entity.TbSpecs; +import com.baomidou.mybatisplus.extension.service.IService; + +/** + * @Description: tb_specs + * @Author: jeecg-boot + * @Date: 2024-12-13 + * @Version: V1.0 + */ +public interface ITbSpecsService extends IService { + +} diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/src/main/java/org/jeecg/modules/tbSpecs/service/impl/TbSpecsServiceImpl.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/src/main/java/org/jeecg/modules/tbSpecs/service/impl/TbSpecsServiceImpl.java new file mode 100644 index 0000000..9b7b069 --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/src/main/java/org/jeecg/modules/tbSpecs/service/impl/TbSpecsServiceImpl.java @@ -0,0 +1,19 @@ +package org.jeecg.modules.tbSpecs.service.impl; + +import org.jeecg.modules.tbSpecs.entity.TbSpecs; +import org.jeecg.modules.tbSpecs.mapper.TbSpecsMapper; +import org.jeecg.modules.tbSpecs.service.ITbSpecsService; +import org.springframework.stereotype.Service; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; + +/** + * @Description: tb_specs + * @Author: jeecg-boot + * @Date: 2024-12-13 + * @Version: V1.0 + */ +@Service +public class TbSpecsServiceImpl extends ServiceImpl implements ITbSpecsService { + +} diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/src/main/java/org/jeecg/modules/tbSpecs/vue/TbSpecsList.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/src/main/java/org/jeecg/modules/tbSpecs/vue/TbSpecsList.vue new file mode 100644 index 0000000..f7356ea --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/src/main/java/org/jeecg/modules/tbSpecs/vue/TbSpecsList.vue @@ -0,0 +1,171 @@ + + + + \ No newline at end of file diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/src/main/java/org/jeecg/modules/tbSpecs/vue/modules/TbSpecsForm.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/src/main/java/org/jeecg/modules/tbSpecs/vue/modules/TbSpecsForm.vue new file mode 100644 index 0000000..1b8cd74 --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/src/main/java/org/jeecg/modules/tbSpecs/vue/modules/TbSpecsForm.vue @@ -0,0 +1,104 @@ + + + \ No newline at end of file diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/src/main/java/org/jeecg/modules/tbSpecs/vue/modules/TbSpecsModal.Style#Drawer.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/src/main/java/org/jeecg/modules/tbSpecs/vue/modules/TbSpecsModal.Style#Drawer.vue new file mode 100644 index 0000000..3198a42 --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/src/main/java/org/jeecg/modules/tbSpecs/vue/modules/TbSpecsModal.Style#Drawer.vue @@ -0,0 +1,84 @@ + + + + + \ No newline at end of file diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/src/main/java/org/jeecg/modules/tbSpecs/vue/modules/TbSpecsModal.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/src/main/java/org/jeecg/modules/tbSpecs/vue/modules/TbSpecsModal.vue new file mode 100644 index 0000000..892e5a7 --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/src/main/java/org/jeecg/modules/tbSpecs/vue/modules/TbSpecsModal.vue @@ -0,0 +1,60 @@ + + + \ No newline at end of file diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/tbConf/controller/TbConfController.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/tbConf/controller/TbConfController.java index 0b4e983..7557e18 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/tbConf/controller/TbConfController.java +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/tbConf/controller/TbConfController.java @@ -61,6 +61,8 @@ public class TbConfController extends JeecgController { + + @ApiOperation(value="tb_conf-分页列表查询", notes="tb_conf-分页列表查询") @GetMapping(value = "/textList") public Result> queryPageTextList(TbConf tbConf, diff --git a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/userCode/controller/IndexController.java b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/userCode/controller/IndexController.java index 1971c96..ad0c33e 100644 --- a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/userCode/controller/IndexController.java +++ b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/userCode/controller/IndexController.java @@ -69,6 +69,17 @@ public class IndexController { } + @ApiOperation(value = "获取平台隐私政策，协议等") + @RequestMapping(value = "/getSysText", method = RequestMethod.POST) + public Result getSysText() { + + Result indexInfo = indexService.getSysText(); + + return indexInfo; + } + + + @ApiOperation(value = "获取banner列表") @RequestMapping(value = "/bannerList", method = RequestMethod.POST) public Result>> bannerList() { diff --git a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/userCode/controller/UserController.java b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/userCode/controller/UserController.java index f2b7170..3963b52 100644 --- a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/userCode/controller/UserController.java +++ b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/userCode/controller/UserController.java @@ -4,8 +4,10 @@ import com.alibaba.fastjson.JSONObject; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; +import org.apache.commons.lang3.StringUtils; import org.jeecg.common.api.vo.Result; import org.jeecg.common.exception.JeecgBootException; +import org.jeecg.modules.bean.CodeBeanModel; import org.jeecg.modules.bean.LoginReq; import org.jeecg.modules.postBean.ReqUserRole; import org.jeecg.modules.postBean.ReqUserRole2; @@ -47,6 +49,23 @@ public class UserController { } + /** + * 微信用户绑定手机号 + */ + @PostMapping(value = "/bindPhone") + @ApiOperation(value = "小程序-绑定手机号") + public Result bindPhone(@RequestBody CodeBeanModel codeBeanModel) { + Result result = new Result<>(); + if(StringUtils.isEmpty(codeBeanModel.getEncryptedData())){ + result.setCode(500); + result.setMessage("请授权手机号"); + return result; + } + return appletLoginService.bindPhone(codeBeanModel); + } + + + @ApiOperation(value = "求职者填写信息") @RequestMapping(value = "/role", method = RequestMethod.POST) public Result role(@RequestBody ReqUserRole2 reqUserRole, @RequestHeader("X-Access-Token") String token) { diff --git a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/userCode/service/AppletLoginService.java b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/userCode/service/AppletLoginService.java index b1ab55e..1777614 100644 --- a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/userCode/service/AppletLoginService.java +++ b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/userCode/service/AppletLoginService.java @@ -2,6 +2,7 @@ package org.jeecg.modules.userCode.service; import com.alibaba.fastjson.JSONObject; import org.jeecg.common.api.vo.Result; +import org.jeecg.modules.bean.CodeBeanModel; import org.jeecg.modules.bean.LoginReq; import org.jeecg.modules.postBean.ReqUserRole; import org.jeecg.modules.postBean.ReqUserRole2; @@ -15,6 +16,15 @@ public interface AppletLoginService { */ Result appletLogin(LoginReq loginReq); + + /** + * 微信用户绑定手机号 + * @param codeBeanModel + * @return + */ + Result bindPhone(CodeBeanModel codeBeanModel); + + Result role(ReqUserRole reqUserRole, String token); diff --git a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/userCode/service/IndexService.java b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/userCode/service/IndexService.java index adea753..8870fd8 100644 --- a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/userCode/service/IndexService.java +++ b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/userCode/service/IndexService.java @@ -15,4 +15,8 @@ public interface IndexService { Result>> bannerList(); + + Result getSysText(); + + } diff --git a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/userCode/service/impl/AppletLoginServiceImpl.java b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/userCode/service/impl/AppletLoginServiceImpl.java index 117a9d5..b2b189f 100644 --- a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/userCode/service/impl/AppletLoginServiceImpl.java +++ b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/userCode/service/impl/AppletLoginServiceImpl.java @@ -1,15 +1,27 @@ package org.jeecg.modules.userCode.service.impl; import com.alibaba.fastjson.JSONObject; +import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import lombok.extern.slf4j.Slf4j; +import org.apache.commons.codec.binary.Base64; import org.apache.commons.lang3.StringUtils; +import org.apache.http.HttpEntity; +import org.apache.http.client.methods.CloseableHttpResponse; +import org.apache.http.client.methods.HttpGet; +import org.apache.http.impl.client.CloseableHttpClient; +import org.apache.http.impl.client.HttpClients; +import org.apache.http.util.EntityUtils; +import org.bouncycastle.jce.provider.BouncyCastleProvider; import org.jeecg.common.api.vo.Result; +import org.jeecg.common.base.BaseMap; import org.jeecg.common.constant.CommonConstant; import org.jeecg.common.exception.JeecgBootException; import org.jeecg.common.system.util.JwtUtil; import org.jeecg.common.util.RedisUtil; import org.jeecg.config.shiro.ShiroRealm; +import org.jeecg.modules.bean.CodeBeanModel; import org.jeecg.modules.bean.HttpConf; import org.jeecg.modules.bean.LoginReq; import org.jeecg.modules.hanHaiMember.entity.HanHaiMember; @@ -26,6 +38,12 @@ import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import javax.annotation.Resource; +import javax.crypto.Cipher; +import javax.crypto.spec.IvParameterSpec; +import javax.crypto.spec.SecretKeySpec; +import java.security.AlgorithmParameters; +import java.security.Security; +import java.util.Arrays; import java.util.HashMap; import java.util.Map; @@ -165,6 +183,131 @@ public class AppletLoginServiceImpl implements AppletLoginService { return result; } + /** + * 小程序注册 + * + * @param codeBeanModel + * @return + */ + @Override + @Transactional(rollbackFor = Exception.class) + public Result bindPhone(CodeBeanModel codeBeanModel) { + Result result = new Result<>(); + String loginUrl = "https://api.weixin.qq.com/sns/jscode2session?appid=" + mpAppId + "&secret=" + mpAppSecret + "&js_code=" + codeBeanModel.getCode() + "&grant_type=authorization_code"; + try { + CloseableHttpClient client = null; + CloseableHttpResponse response = null; + try { + // 创建http GET请求 + HttpGet httpGet = new HttpGet(loginUrl); + client = HttpClients.createDefault(); + // 执行请求 + response = client.execute(httpGet); + HttpEntity entity = response.getEntity();//得到返回数据 + String resultStr = EntityUtils.toString(entity); + JSONObject json_test = JSONObject.parseObject(resultStr); + String wxOpenid = json_test.getString("openid"); + if (StringUtils.isEmpty(wxOpenid)) { + return result.error500("未获取到openid"); + } + String sessionKey = json_test.getString("session_key"); + //根据id数据库数据查询 + HanHaiMember user = memberService.lambdaQuery().eq(HanHaiMember::getAppletOpenid,wxOpenid).one(); + if (user == null) { + return Result.error("用户信息查询失败，请"); + } + + // 保存sessionKey,用于解析手机号码 + codeBeanModel.setOpenid(wxOpenid); + codeBeanModel.setSession_key(sessionKey); + String userPhone = getPhoneNumber(codeBeanModel); + if (StringUtils.isNotBlank(userPhone)) { + user.setPhone(userPhone); + HanHaiMember hanHaiMember = new HanHaiMember(); + hanHaiMember.setId(user.getId()); + hanHaiMember.setPhone(userPhone); + memberService.updateById(hanHaiMember); + + result.setCode(200); + result.setMessage("手机号绑定成功"); + // 返回用户信息给前台 + BaseMap map = new BaseMap(); + map.put("userInfo", user); + result.setResult(map); + return result; + } else { + return Result.error("操作失败，请联系系统管理员！"); + } + + } finally { + if (response != null) { + response.close(); + } + if (client != null) { + client.close(); + } + + } + } catch (Exception e) { + e.printStackTrace(); + return Result.error("操作失败，请联系系统管理员！"); + } + + } + + + + + //解析电话号码 + public String getPhoneNumber(CodeBeanModel codeBeanModel) { + String encryptedData = codeBeanModel.getEncryptedData(); + String session_key = codeBeanModel.getSession_key(); + String iv = codeBeanModel.getIv(); + // 被加密的数据 + byte[] dataByte = Base64.decodeBase64(encryptedData); + // 加密秘钥 + byte[] keyByte = Base64.decodeBase64(session_key); + // 偏移量 + byte[] ivByte = Base64.decodeBase64(iv); + try { + // 如果密钥不足16位，那么就补足. 这个if 中的内容很重要 + int base = 16; + if (keyByte.length % base != 0) { + int groups = keyByte.length / base + (keyByte.length % base != 0 ? 1 : 0); + byte[] temp = new byte[groups * base]; + Arrays.fill(temp, (byte) 0); + System.arraycopy(keyByte, 0, temp, 0, keyByte.length); + keyByte = temp; + } + // 初始化 + Security.addProvider(new BouncyCastleProvider()); + Cipher cipher = Cipher.getInstance("AES/CBC/PKCS5Padding"); + SecretKeySpec spec = new SecretKeySpec(keyByte, "AES"); + AlgorithmParameters parameters = AlgorithmParameters.getInstance("AES"); + parameters.init(new IvParameterSpec(ivByte)); + cipher.init(Cipher.DECRYPT_MODE, spec, parameters);// 初始化 + byte[] resultByte = cipher.doFinal(dataByte); + if (null != resultByte && resultByte.length > 0) { + String result = new String(resultByte, "UTF-8"); + log.warn("解析前{}",resultByte); + log.warn("解析{}",result); + JSONObject userPhoneObj = JSONObject.parseObject(result); + Map userMap = new HashMap<>(); + for (Map.Entry entry : userPhoneObj.entrySet()) { + userMap.put(entry.getKey(), entry.getValue()); + } + // 获取phoneNumber 带区号 + String userPhone = (String) userMap.get("phoneNumber"); + return userPhone; + } + } catch (Exception e) { + e.printStackTrace(); + } + return null; + } + + + @Transactional(rollbackFor = Exception.class) @Override public Result role(ReqUserRole reqUserRole, String token) { diff --git a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/userCode/service/impl/IndexServiceImpl.java b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/userCode/service/impl/IndexServiceImpl.java index 82aa9d3..5221e48 100644 --- a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/userCode/service/impl/IndexServiceImpl.java +++ b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/userCode/service/impl/IndexServiceImpl.java @@ -63,6 +63,15 @@ public class IndexServiceImpl implements IndexService { } + @Override + public Result getSysText() { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.eq("dict_group", "sys_text"); + List list = tbConfService.list(queryWrapper); + return Result.ok(list); + } + + @Override public Result>> bannerList() { //获取banner diff --git a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/userCode/service/impl/OrderServiceImpl.java b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/userCode/service/impl/OrderServiceImpl.java index 785d25a..abebde1 100644 --- a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/userCode/service/impl/OrderServiceImpl.java +++ b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/userCode/service/impl/OrderServiceImpl.java @@ -61,6 +61,8 @@ public class OrderServiceImpl implements OrderService { BeanUtils.copyProperties(byId, tbOrder); tbOrder.setId(IdWorker.getIdStr()); tbOrder.setPayMoney(new BigDecimal("0.01")); + tbOrder.setWorkId(byId.getUserId()); + tbOrder.setBossId(hanHaiMember.getId()); tbOrderService.save(tbOrder); return tbOrder.getId(); }