From f450d658c6ff24a1c07a914c4551b0ebf750b9aa Mon Sep 17 00:00:00 2001 From: lzx_win <2602107437@qq.com> Date: Sat, 26 Oct 2024 17:08:24 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/org/jeecg/config/shiro/ShiroConfig.java | 4 + .../jeecg/modules/cityHome/entity/CityHome.java | 4 + .../jeecg/modules/cityHome/vue/CityHomeList.vue | 7 + .../modules/cityHome/vue/modules/CityHomeForm.vue | 5 + .../jeecg/modules/cityHome/vue3/CityHome.data.ts | 13 ++ .../controller/HanHaiMemberController.java | 32 +-- .../modules/hanHaiMember/entity/HanHaiMember.java | 17 +- .../hanHaiMember/mapper/HanHaiMemberMapper.java | 4 +- .../hanHaiMember/service/IHanHaiMemberService.java | 4 +- .../service/impl/HanHaiMemberServiceImpl.java | 4 +- .../modules/hanHaiMember/vue/HanHaiMemberList.vue | 226 +++++++++++++++++++ .../hanHaiMember/vue/modules/HanHaiMemberForm.vue | 149 +++++++++++++ .../vue/modules/HanHaiMemberModal.Style#Drawer.vue | 84 +++++++ .../hanHaiMember/vue/modules/HanHaiMemberModal.vue | 60 +++++ .../modules/hanHaiMember/vue3/HanHaiMember.api.ts | 61 ++++++ .../modules/hanHaiMember/vue3/HanHaiMember.data.ts | 116 ++++++++++ .../modules/hanHaiMember/vue3/HanHaiMemberList.vue | 162 ++++++++++++++ .../vue3/components/HanHaiMemberModal.vue | 58 +++++ .../org/jeecg/modules/service/ApiLoginService.java | 18 ++ .../jeecg/modules/service/AppletLoginService.java | 26 +++ .../modules/service/impl/ApiLoginServiceImpl.java | 160 ++++++++++++++ .../service/impl/AppletLoginServiceImpl.java | 242 +++++++++++++++++++++ .../jeecg/modules/api/service/LoginApiService.java | 17 ++ .../jeecg/modules/api/service/YaoDuApiService.java | 8 + .../api/service/impl/LoginApiServiceImpl.java | 41 ++++ .../api/service/impl/YaoDuApiServiceImpl.java | 55 ++++- .../api/yaoduapi/YaoDuApiTokenController.java | 35 ++- .../modules/api/yaoduapi/YaoDuLoginController.java | 52 +++++ .../src/main/resources/application-dev.yml | 4 +- 29 files changed, 1626 insertions(+), 42 deletions(-) create mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiMember/vue/HanHaiMemberList.vue create mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiMember/vue/modules/HanHaiMemberForm.vue create mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiMember/vue/modules/HanHaiMemberModal.Style#Drawer.vue create mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiMember/vue/modules/HanHaiMemberModal.vue create mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiMember/vue3/HanHaiMember.api.ts create mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiMember/vue3/HanHaiMember.data.ts create mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiMember/vue3/HanHaiMemberList.vue create mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiMember/vue3/components/HanHaiMemberModal.vue create mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/service/ApiLoginService.java create mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/service/AppletLoginService.java create mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/service/impl/ApiLoginServiceImpl.java create mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/service/impl/AppletLoginServiceImpl.java create mode 100644 jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/service/LoginApiService.java create mode 100644 jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/service/impl/LoginApiServiceImpl.java create mode 100644 jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/yaoduapi/YaoDuLoginController.java 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 9a9b070..cc7d138 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 @@ -73,6 +73,10 @@ public class ShiroConfig { } filterChainDefinitionMap.put("/web/**", "anon"); //官网接口开放验证 filterChainDefinitionMap.put("/city/**", "anon"); + filterChainDefinitionMap.put("/login/**", "anon"); + filterChainDefinitionMap.put("/token/**", "anon"); + + diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityHome/entity/CityHome.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityHome/entity/CityHome.java index 02bf9eb..85dbdca 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityHome/entity/CityHome.java +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityHome/entity/CityHome.java @@ -137,4 +137,8 @@ public class CityHome implements Serializable { @Excel(name = "低价", width = 15) @ApiModelProperty(value = "低价") private java.lang.String isMinPrice; + /**发布人头像*/ + @Excel(name = "发布人头像", width = 15) + @ApiModelProperty(value = "发布人头像") + private java.lang.String headImage; } diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityHome/vue/CityHomeList.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityHome/vue/CityHomeList.vue index c7e9403..85c5734 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityHome/vue/CityHomeList.vue +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityHome/vue/CityHomeList.vue @@ -259,6 +259,12 @@ align:"center", dataIndex: 'isMinPrice' }, + { + title:'发布人头像', + align:"center", + dataIndex: 'headImage', + scopedSlots: {customRender: 'fileSlot'} + }, { title: '操作', dataIndex: 'action', @@ -316,6 +322,7 @@ fieldList.push({type:'string',value:'home',text:'一室一卫',dictCode:''}) fieldList.push({type:'string',value:'isGood',text:'优选',dictCode:''}) fieldList.push({type:'string',value:'isMinPrice',text:'低价',dictCode:''}) + fieldList.push({type:'string',value:'headImage',text:'发布人头像',dictCode:''}) this.superFieldList = fieldList } } diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityHome/vue/modules/CityHomeForm.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityHome/vue/modules/CityHomeForm.vue index 860bd6a..c01d04a 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityHome/vue/modules/CityHomeForm.vue +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityHome/vue/modules/CityHomeForm.vue @@ -113,6 +113,11 @@ + + + + + diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityHome/vue3/CityHome.data.ts b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityHome/vue3/CityHome.data.ts index 12956fb..0dd041a 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityHome/vue3/CityHome.data.ts +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityHome/vue3/CityHome.data.ts @@ -121,6 +121,12 @@ export const columns: BasicColumn[] = [ align:"center", dataIndex: 'isMinPrice' }, + { + title: '发布人头像', + align:"center", + dataIndex: 'headImage', + slots: { customRender: 'fileSlot' }, + }, ]; //查询数据 export const searchFormSchema: FormSchema[] = [ @@ -263,4 +269,11 @@ export const formSchema: FormSchema[] = [ field: 'isMinPrice', component: 'Input', }, + { + label: '发布人头像', + field: 'headImage', + component: 'JUpload', + componentProps:{ + }, + }, ]; diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiMember/controller/HanHaiMemberController.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiMember/controller/HanHaiMemberController.java index 6ef5388..6126fef 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiMember/controller/HanHaiMemberController.java +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiMember/controller/HanHaiMemberController.java @@ -37,12 +37,12 @@ import io.swagger.annotations.ApiOperation; import org.jeecg.common.aspect.annotation.AutoLog; /** - * @Description: 用户表 + * @Description: 用户账户表 * @Author: jeecg-boot - * @Date: 2024-07-08 + * @Date: 2024-10-26 * @Version: V1.0 */ -@Api(tags="用户表") +@Api(tags="用户账户表") @RestController @RequestMapping("/hanHaiMember/hanHaiMember") @Slf4j @@ -59,8 +59,8 @@ public class HanHaiMemberController extends JeecgController> queryPageList(HanHaiMember hanHaiMember, @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, @@ -78,8 +78,8 @@ public class HanHaiMemberController extends JeecgController add(@RequestBody HanHaiMember hanHaiMember) { hanHaiMemberService.save(hanHaiMember); @@ -92,8 +92,8 @@ public class HanHaiMemberController extends JeecgController edit(@RequestBody HanHaiMember hanHaiMember) { hanHaiMemberService.updateById(hanHaiMember); @@ -106,8 +106,8 @@ public class HanHaiMemberController extends JeecgController delete(@RequestParam(name="id",required=true) String id) { hanHaiMemberService.removeById(id); @@ -120,8 +120,8 @@ public class HanHaiMemberController extends JeecgController deleteBatch(@RequestParam(name="ids",required=true) String ids) { this.hanHaiMemberService.removeByIds(Arrays.asList(ids.split(","))); @@ -134,8 +134,8 @@ public class HanHaiMemberController extends JeecgController queryById(@RequestParam(name="id",required=true) String id) { HanHaiMember hanHaiMember = hanHaiMemberService.getById(id); @@ -153,7 +153,7 @@ public class HanHaiMemberController extends JeecgController { diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiMember/service/IHanHaiMemberService.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiMember/service/IHanHaiMemberService.java index 2d71e42..11195af 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiMember/service/IHanHaiMemberService.java +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiMember/service/IHanHaiMemberService.java @@ -4,9 +4,9 @@ import org.jeecg.modules.hanHaiMember.entity.HanHaiMember; import com.baomidou.mybatisplus.extension.service.IService; /** - * @Description: 用户表 + * @Description: 用户账户表 * @Author: jeecg-boot - * @Date: 2024-07-08 + * @Date: 2024-10-26 * @Version: V1.0 */ public interface IHanHaiMemberService extends IService { diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiMember/service/impl/HanHaiMemberServiceImpl.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiMember/service/impl/HanHaiMemberServiceImpl.java index f03b897..3fc945d 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiMember/service/impl/HanHaiMemberServiceImpl.java +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiMember/service/impl/HanHaiMemberServiceImpl.java @@ -8,9 +8,9 @@ import org.springframework.stereotype.Service; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; /** - * @Description: 用户表 + * @Description: 用户账户表 * @Author: jeecg-boot - * @Date: 2024-07-08 + * @Date: 2024-10-26 * @Version: V1.0 */ @Service diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiMember/vue/HanHaiMemberList.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiMember/vue/HanHaiMemberList.vue new file mode 100644 index 0000000..525ab46 --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiMember/vue/HanHaiMemberList.vue @@ -0,0 +1,226 @@ + + + + \ No newline at end of file diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiMember/vue/modules/HanHaiMemberForm.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiMember/vue/modules/HanHaiMemberForm.vue new file mode 100644 index 0000000..dc02e11 --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiMember/vue/modules/HanHaiMemberForm.vue @@ -0,0 +1,149 @@ + + + \ No newline at end of file diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiMember/vue/modules/HanHaiMemberModal.Style#Drawer.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiMember/vue/modules/HanHaiMemberModal.Style#Drawer.vue new file mode 100644 index 0000000..601b489 --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiMember/vue/modules/HanHaiMemberModal.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/hanHaiMember/vue/modules/HanHaiMemberModal.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiMember/vue/modules/HanHaiMemberModal.vue new file mode 100644 index 0000000..b9706da --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiMember/vue/modules/HanHaiMemberModal.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/hanHaiMember/vue3/HanHaiMember.api.ts b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiMember/vue3/HanHaiMember.api.ts new file mode 100644 index 0000000..0a4f36d --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiMember/vue3/HanHaiMember.api.ts @@ -0,0 +1,61 @@ +import {defHttp} from '/@/utils/http/axios'; +import {Modal} from 'ant-design-vue'; + +enum Api { + list = '/hanHaiMember/hanHaiMember/list', + save='/hanHaiMember/hanHaiMember/add', + edit='/hanHaiMember/hanHaiMember/edit', + deleteOne = '/hanHaiMember/hanHaiMember/delete', + deleteBatch = '/hanHaiMember/hanHaiMember/deleteBatch', + importExcel = '/hanHaiMember/hanHaiMember/importExcel', + exportXls = '/hanHaiMember/hanHaiMember/exportXls', +} +/** + * 导出api + * @param params + */ +export const getExportUrl = Api.exportXls; +/** + * 导入api + */ +export const getImportUrl = Api.importExcel; +/** + * 列表接口 + * @param params + */ +export const list = (params) => + defHttp.get({url: Api.list, params}); + +/** + * 删除单个 + */ +export const deleteOne = (params,handleSuccess) => { + return defHttp.delete({url: Api.deleteOne, params}, {joinParamsToUrl: true}).then(() => { + handleSuccess(); + }); +} +/** + * 批量删除 + * @param params + */ +export const batchDelete = (params, handleSuccess) => { + Modal.confirm({ + title: '确认删除', + content: '是否删除选中数据', + okText: '确认', + cancelText: '取消', + onOk: () => { + return defHttp.delete({url: Api.deleteBatch, data: params}, {joinParamsToUrl: true}).then(() => { + handleSuccess(); + }); + } + }); +} +/** + * 保存或者更新 + * @param params + */ +export const saveOrUpdate = (params, isUpdate) => { + let url = isUpdate ? Api.edit : Api.save; + return defHttp.post({url: url, params}); +} diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiMember/vue3/HanHaiMember.data.ts b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiMember/vue3/HanHaiMember.data.ts new file mode 100644 index 0000000..3d1a181 --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiMember/vue3/HanHaiMember.data.ts @@ -0,0 +1,116 @@ +import {BasicColumn} from '/@/components/Table'; +import {FormSchema} from '/@/components/Table'; +import { rules} from '/@/utils/helper/validator'; +import { render } from '/@/utils/common/renderUtils'; +//列表数据 +export const columns: BasicColumn[] = [ + { + title: '昵称', + align:"center", + dataIndex: 'nickName' + }, + { + title: '用户头像', + align:"center", + dataIndex: 'headImage', + customRender:render.renderAvatar, + }, + { + title: '真实姓名', + align:"center", + dataIndex: 'name' + }, + { + title: '手机号码', + align:"center", + dataIndex: 'phone' + }, + { + title: '小程序标识', + align:"center", + dataIndex: 'appletOpenid' + }, + { + title: '身份证号码', + align:"center", + dataIndex: 'idCard' + }, + { + title: '是否实名认证', + align:"center", + dataIndex: 'idCardOpen' + }, + { + title: '邀请人', + align:"center", + dataIndex: 'vid' + }, + { + title: '邀请时间', + align:"center", + dataIndex: 'vtime' + }, + { + title: '性别', + align:"center", + dataIndex: 'sex' + }, +]; +//查询数据 +export const searchFormSchema: FormSchema[] = [ +]; +//表单数据 +export const formSchema: FormSchema[] = [ + { + label: '昵称', + field: 'nickName', + component: 'Input', + }, + { + label: '用户头像', + field: 'headImage', + component: 'JImageUpload', + componentProps:{ + }, + }, + { + label: '真实姓名', + field: 'name', + component: 'Input', + }, + { + label: '手机号码', + field: 'phone', + component: 'Input', + }, + { + label: '小程序标识', + field: 'appletOpenid', + component: 'Input', + }, + { + label: '身份证号码', + field: 'idCard', + component: 'Input', + }, + { + label: '是否实名认证', + field: 'idCardOpen', + component: 'Input', + }, + { + label: '邀请人', + field: 'vid', + component: 'Input', + }, + { + label: '邀请时间', + field: 'vtime', + component: 'Input', + }, + { + label: '性别', + field: 'sex', + component: 'Input', + }, +]; diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiMember/vue3/HanHaiMemberList.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiMember/vue3/HanHaiMemberList.vue new file mode 100644 index 0000000..40a6799 --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiMember/vue3/HanHaiMemberList.vue @@ -0,0 +1,162 @@ + + + + + \ No newline at end of file diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiMember/vue3/components/HanHaiMemberModal.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiMember/vue3/components/HanHaiMemberModal.vue new file mode 100644 index 0000000..4773019 --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiMember/vue3/components/HanHaiMemberModal.vue @@ -0,0 +1,58 @@ + + + + + \ No newline at end of file diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/service/ApiLoginService.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/service/ApiLoginService.java new file mode 100644 index 0000000..fe6ca2e --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/service/ApiLoginService.java @@ -0,0 +1,18 @@ +package org.jeecg.modules.service; + + +import org.jeecg.common.api.vo.Result; +import org.jeecg.modules.bean.LoginReq; + +public interface ApiLoginService { + + + /** + * 公众号授权登录 + * @param loginReq + * @return + */ + Result officialLogin(LoginReq loginReq); + + +} \ No newline at end of file diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/service/AppletLoginService.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/service/AppletLoginService.java new file mode 100644 index 0000000..33975fd --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/service/AppletLoginService.java @@ -0,0 +1,26 @@ +package org.jeecg.modules.service; + +import org.jeecg.common.api.vo.Result; +import org.jeecg.modules.bean.LoginReq; + +/** + * @Author lzx + * @Date 2022-05-13 15:56 + **/ +public interface AppletLoginService { + + /** + * 微信小程序登录接口 + * @param loginReq + * @return + */ + Result appletLogin(LoginReq loginReq); + + +// /** +// * 微信小程序登录绑定手机号码接口 +// * @param loginReq +// * @return +// */ +// Result bindPhone(LoginReq loginReq); +} diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/service/impl/ApiLoginServiceImpl.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/service/impl/ApiLoginServiceImpl.java new file mode 100644 index 0000000..a7aeba0 --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/service/impl/ApiLoginServiceImpl.java @@ -0,0 +1,160 @@ +package org.jeecg.modules.service.impl; + +import com.alibaba.fastjson.JSONObject; +import lombok.extern.slf4j.Slf4j; +import org.apache.commons.lang.StringUtils; +import org.jeecg.common.api.vo.Result; +import org.jeecg.common.constant.CommonConstant; +import org.jeecg.common.exception.JeecgBootException; +import org.jeecg.common.system.util.JwtUtil; +import org.jeecg.common.util.PasswordUtil; +import org.jeecg.common.util.RedisUtil; +import org.jeecg.modules.bean.ConvertUtils; +import org.jeecg.modules.bean.HttpConf; +import org.jeecg.modules.bean.LoginReq; +import org.jeecg.modules.hanHaiMember.entity.HanHaiMember; +import org.jeecg.modules.hanHaiMember.service.IHanHaiMemberService; +import org.jeecg.modules.service.ApiLoginService; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import javax.transaction.Transactional; +import java.io.UnsupportedEncodingException; +import java.util.Date; +import java.util.HashMap; +import java.util.Map; + +@Slf4j +@Service +public class ApiLoginServiceImpl implements ApiLoginService { + + //公共用户表 + @Resource + private IHanHaiMemberService hanHaiMemberService; + + //公共缓存类 + @Resource + private RedisUtil redisUtil; + @Resource + private HttpConf httpConf; + + + + /** + * 微信公众号-appid + */ + + private String mpAppId = "wx15be4225a7e41a1e"; + + /** + * 微信公众号-appSecret + */ + + private String mpAppSecret = "0fdb77429ffdf206c151af76a663041c"; + + + /** + * 公众号授权登录注册 + * @param loginReq + * @return + */ + @Override + @Transactional + public Result officialLogin(LoginReq loginReq){ + Map loginMap = new HashMap<>(); + if (StringUtils.isBlank(loginReq.getCode())) { + throw new JeecgBootException("code为空"); + } + String loginUrl = "https://api.weixin.qq.com/sns/oauth2/access_token?appid=" +mpAppId + "&secret=" + mpAppSecret + "&code=" + loginReq.getCode() + "&grant_type=authorization_code"; + //使用工具类 + JSONObject json_test = httpConf.getJSONObject(loginUrl); + log.info("{} {} -- {}", mpAppId, mpAppSecret, json_test); + String wxOpenid = json_test.getString("openid"); + String wxUnionId = json_test.getString("unionid"); + String access_token = json_test.getString("access_token"); + if (StringUtils.isBlank(wxOpenid)) { + throw new JeecgBootException("未获取到openid"); + } + HanHaiMember member = hanHaiMemberService.lambdaQuery().eq(HanHaiMember::getOfficialOpenid,wxOpenid).one(); + if(member!=null){ +// if (StringUtils.isBlank(member.getVid())){ +// member.setVid(loginReq.getVid()); +// member.setVtime(new Date()); +// hanHaiMemberService.updateById(member); +// } + //开始获取用户信息 + String memberUrl = "https://api.weixin.qq.com/sns/userinfo?access_token="+access_token+"&openid="+wxOpenid+"&lang=zh_CN"; + //使用工具类 + JSONObject json_member = httpConf.getJSONObject(memberUrl); + String nickname = json_member.getString("nickname"); + String headimgurl = json_member.getString("headimgurl"); + try { + nickname = new String(nickname.getBytes("ISO-8859-1"),"UTF-8"); + } catch (UnsupportedEncodingException e) { + e.printStackTrace(); + } + member.setNickName(nickname); + member.setHeadImage(headimgurl); + member.setWxUnionid(wxUnionId); + String token = JwtUtil.sign(member.getAccount(), member.getAccount()); + member.setToken(token); + member.setUpdateTime(new Date()); + hanHaiMemberService.updateById(member); + + + // 生成token返回 + + redisUtil.set(CommonConstant.PREFIX_USER_TOKEN + token, token); + // 设置超时时间 + redisUtil.expire(CommonConstant.PREFIX_USER_TOKEN + token, JwtUtil.EXPIRE_TIME / 100); + loginMap.put("token",token); + loginMap.put("userInfo",member); + + return Result.OK("登录成功",loginMap); + } + //开始获取用户信息 + String memberUrl = "https://api.weixin.qq.com/sns/userinfo?access_token="+access_token+"&openid="+wxOpenid+"&lang=zh_CN"; + //使用工具类 + JSONObject json_member = httpConf.getJSONObject(memberUrl); + String nickname = json_member.getString("nickname"); + String headimgurl = json_member.getString("headimgurl"); + try { + nickname = new String(nickname.getBytes("ISO-8859-1"),"UTF-8"); + } catch (UnsupportedEncodingException e) { + e.printStackTrace(); + } + HanHaiMember save = new HanHaiMember(); + save.setAccount(wxOpenid); + save.setVid(loginReq.getVid()); + save.setVtime(new Date()); + save.setNickName(nickname); + save.setHeadImage(headimgurl); + save.setWxUnionid(wxUnionId); + + //销售邀请者标识 + save.setShareId(loginReq.getShareId()); + + save.setOfficialOpenid(wxOpenid); + save.setCreateTime(new Date()); + //密码加密 + String salt = ConvertUtils.randomGen(8); + String encrypt = PasswordUtil.encrypt(wxOpenid,"123456" , salt); + save.setPassword(encrypt); + save.setPasswordSalt(salt); + save.setDeleteFlag("N"); + save.setRole("0"); + + + // 生成token返回 + String token = JwtUtil.sign(wxOpenid, wxOpenid); + save.setToken(token); + + hanHaiMemberService.save(save); + redisUtil.set(CommonConstant.PREFIX_USER_TOKEN + token, token); + // 设置超时时间 + redisUtil.expire(CommonConstant.PREFIX_USER_TOKEN + token, JwtUtil.EXPIRE_TIME / 100); + loginMap.put("token",token); + loginMap.put("userInfo",save); + return Result.OK("登录成功",loginMap); + } +} diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/service/impl/AppletLoginServiceImpl.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/service/impl/AppletLoginServiceImpl.java new file mode 100644 index 0000000..6d4bc74 --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/service/impl/AppletLoginServiceImpl.java @@ -0,0 +1,242 @@ +package org.jeecg.modules.service.impl; + +import com.alibaba.fastjson.JSONObject; +import lombok.extern.slf4j.Slf4j; +import org.apache.commons.lang3.StringUtils; +import org.jeecg.common.api.vo.Result; +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.modules.bean.HttpConf; +import org.jeecg.modules.bean.LoginReq; +import org.jeecg.modules.hanHaiMember.entity.HanHaiMember; +import org.jeecg.modules.hanHaiMember.service.IHanHaiMemberService; +import org.jeecg.modules.service.AppletLoginService; +import org.springframework.beans.factory.annotation.Value; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import javax.annotation.Resource; +import java.util.HashMap; +import java.util.Map; + +/** + * @Author lzx + * @Date 2022-05-13 15:55 + **/ +@Slf4j +@Service +@SuppressWarnings("all") +public class AppletLoginServiceImpl implements AppletLoginService { + + @Value("${wechat.mpAppId}") + private String mpAppId; + @Value("${wechat.mpAppSecret}") + private String mpAppSecret; + + @Resource + private IHanHaiMemberService memberService; + + @Resource + private RedisUtil redisUtil; + @Resource + private HttpConf httpConf; + + + + + /** + * 微信小程序登录接口 + * @param loginReq + * @return + */ + @Transactional(rollbackFor = {Exception.class}) + public Result appletLogin( LoginReq loginReq) { + Result result = new Result<>(); + Map map = new HashMap<>(); + if (StringUtils.isBlank(loginReq.getCode())) { + throw new JeecgBootException("小程序code为空"); + } + String loginUrl = "https://api.weixin.qq.com/sns/jscode2session?appid=" + mpAppId + "&secret=" + mpAppSecret+ "&js_code=" + loginReq.getCode() + "&grant_type=authorization_code"; + //使用工具类 + JSONObject json_test = httpConf.getJSONObject(loginUrl); + String wxOpenid = json_test.getString("openid"); + String sessionKey = json_test.getString("session_key"); + if (StringUtils.isBlank(wxOpenid)) { + throw new JeecgBootException("未获取到openid"); + } + + HanHaiMember member = memberService.lambdaQuery().eq(HanHaiMember::getAppletOpenid,wxOpenid).one(); + if (member == null) { + //如果user等于null说明该用户第一次登录，数据库没有该用户信息。 + loginReq.setOpenid(wxOpenid); + loginReq.setSession_key(sessionKey); + member = new HanHaiMember(); +// member.setSesssionKey(sessionKey); + member.setAppletOpenid(wxOpenid); + member.setNickName("瑶都墙友"+System.currentTimeMillis()); + member.setHeadImage(loginReq.getHeadimgurl()); + // 生成token返回给小程序端 + String token = JwtUtil.sign(member.getAppletOpenid(), wxOpenid); + memberService.save(member); + redisUtil.set(CommonConstant.PREFIX_USER_TOKEN + token, token); + // 设置超时时间 + redisUtil.expire(CommonConstant.PREFIX_USER_TOKEN + token, JwtUtil.EXPIRE_TIME / 100); + map.put("userInfo", member); + map.put("token", token); + + result.setCode(200); + result.setResult(map); + return result; + } else { +// member.setHeadImage(loginReq.getHeadimgurl()); +// member.setSessionKey(sessionKey); +// memberService.saveOrUpdate(member); + // 生成token返回给小程序端 + String token = JwtUtil.sign(member.getAppletOpenid(), wxOpenid); + redisUtil.set(CommonConstant.PREFIX_USER_TOKEN + token, token); + // 设置超时时间 + redisUtil.expire(CommonConstant.PREFIX_USER_TOKEN + token, JwtUtil.EXPIRE_TIME / 100); + map.put("userInfo", member); + map.put("token", token); + //用户id做im账号 + result.setResult(map); + result.setCode(200); +// result.setMessage(member.getNickName()+"已于"+member.getCreateTime()+"注册成功！请勿重复注册！"); +// // 未绑定手机号，跳转授权绑定手机号 +// if (StringUtils.isBlank(member.getPhone())) { +// result.setMessage("该微信用户尚未绑定手机号，请授权手机进行绑定"); +// result.setCode(905); +// result.setResult(map); +// return result; +// } + } + return result; + } + + +// /** +// * 微信小程序登录绑定手机号码接口 +// * @param loginReq +// * @return +// */ +// @Transactional(rollbackFor = Exception.class) +// @Override +// public Result bindPhone(LoginReq loginReq) { +// Result result = new Result<>(); +// if (StringUtils.isEmpty(loginReq.getEncryptedData())) { +// result.setCode(500); +// result.setMessage("请授权手机号"); +// return result; +// } +// String loginUrl = "https://api.weixin.qq.com/sns/jscode2session?appid=" + mpAppId + "&secret=" + mpAppSecret+ "&js_code=" + loginReq.getCode() + "&grant_type=authorization_code"; +// 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"); +// // 保存sessionKey,用于解析手机号码 +// loginReq.setOpenid(wxOpenid); +// loginReq.setSession_key(sessionKey); +// String userPhone = getPhoneNumber(loginReq); +// HanHaiMember one = memberService.lambdaQuery().eq(HanHaiMember::getAppletOpenid, wxOpenid).one(); +// if(one!=null){ +// return result.OK("请不要重复注册"); +// } +// HanHaiMember member = new HanHaiMember(); +// member.setSessionKey(sessionKey); +// member.setAppletOpenid(wxOpenid); +// member.setNickName(loginReq.getNickName()); +// member.setHeadImage(loginReq.getHeadimgurl()); +// member.setPhone(userPhone); +// +// +// //判断用户是否存在 +// HanHaiMember boolOne = memberService.lambdaQuery().eq(HanHaiMember::getAccount, loginReq.geta()).one(); +// boolean bool = false; +// if(one != null){ +// bool = true; +// } +// +// if(!bool){ +// member.setId(boolOne.getId()); +// memberService.updateById(member); +// }else{ +// memberService.save(member); +// } +// +// +// +// return result.OK("注册成功",member); +// }catch(Exception e) { +// e.printStackTrace(); +// return Result.error("操作失败，请联系系统管理员！"); +// } +// +// } +// +// +// +// /** +// * 解析电话号码 +// * @param loginReq +// * @return +// */ +// public String getPhoneNumber(LoginReq loginReq) { +// String encryptedData = loginReq.getEncryptedData(); +// String session_key = loginReq.getSession_key(); +// String iv = loginReq.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", "BC"); +// 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"); +// 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; +// } + +} diff --git a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/service/LoginApiService.java b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/service/LoginApiService.java new file mode 100644 index 0000000..9fedea9 --- /dev/null +++ b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/service/LoginApiService.java @@ -0,0 +1,17 @@ +package org.jeecg.modules.api.service; + +import org.jeecg.common.api.vo.Result; +import org.jeecg.modules.bean.LoginReq; + +public interface LoginApiService { + + //小程序-登录接口 + Result login(LoginReq loginReq); + + + //获取用户协议 + Result getUserAgreement(); + + //获取隐私政策 + Result getPrivacyPolicy(); +} diff --git a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/service/YaoDuApiService.java b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/service/YaoDuApiService.java index af27636..d792bd4 100644 --- a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/service/YaoDuApiService.java +++ b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/service/YaoDuApiService.java @@ -6,10 +6,18 @@ import org.jeecg.modules.api.bean.PageBean; import org.jeecg.modules.citiyShopAuthentication.entity.CitiyShopAuthentication; import org.jeecg.modules.citiyUserAuthentication.entity.CitiyUserAuthentication; import org.jeecg.modules.cityTrends.entity.CityTrends; +import org.jeecg.modules.hanHaiMember.entity.HanHaiMember; import org.springframework.web.bind.annotation.RequestMapping; public interface YaoDuApiService { + //获取个人信息接口 + Result getInfo(String token); + + //修改个人信息接口 + Result updateInfo(String token, HanHaiMember bean); + + //获取城市列表服务区域 Result getCityList(); diff --git a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/service/impl/LoginApiServiceImpl.java b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/service/impl/LoginApiServiceImpl.java new file mode 100644 index 0000000..eed5aaa --- /dev/null +++ b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/service/impl/LoginApiServiceImpl.java @@ -0,0 +1,41 @@ +package org.jeecg.modules.api.service.impl; + +import org.jeecg.common.api.vo.Result; +import org.jeecg.modules.api.service.LoginApiService; +import org.jeecg.modules.bean.LoginReq; +import org.jeecg.modules.service.AppletLoginService; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; + +@Service +public class LoginApiServiceImpl implements LoginApiService { + @Resource + private AppletLoginService appletLoginService; + + //小程序-登录接口 + @Override + public Result login(LoginReq loginReq) + { + return appletLoginService.appletLogin(loginReq); + } + + + //小程序-获取用户协议 + @Override + public Result getUserAgreement() + { + + return Result.OK("用户协议"); + } + + //获取隐私政策 + @Override + public Result getPrivacyPolicy() + { + + return Result.OK("隐私政策"); + } + + +} diff --git a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/service/impl/YaoDuApiServiceImpl.java b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/service/impl/YaoDuApiServiceImpl.java index 3d543ca..c8df4d9 100644 --- a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/service/impl/YaoDuApiServiceImpl.java +++ b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/service/impl/YaoDuApiServiceImpl.java @@ -3,6 +3,7 @@ package org.jeecg.modules.api.service.impl; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import org.jeecg.common.api.vo.Result; +import org.jeecg.config.shiro.ShiroRealm; import org.jeecg.modules.api.bean.PageBean; import org.jeecg.modules.api.service.YaoDuApiService; import org.jeecg.modules.citiyClass.entity.CitiyClass; @@ -32,10 +33,14 @@ import org.jeecg.modules.cityShop.entity.CityShop; import org.jeecg.modules.cityShop.service.ICityShopService; import org.jeecg.modules.cityTrends.entity.CityTrends; import org.jeecg.modules.cityTrends.service.ICityTrendsService; +import org.jeecg.modules.hanHaiMember.entity.HanHaiMember; +import org.jeecg.modules.hanHaiMember.service.IHanHaiMemberService; +import org.jeecg.modules.hanHaiMember.service.impl.HanHaiMemberServiceImpl; import org.jeecg.modules.webCase.entity.WebCase; import org.springframework.stereotype.Service; import javax.annotation.Resource; +import java.util.Date; import java.util.HashMap; import java.util.List; import java.util.Map; @@ -90,6 +95,30 @@ public class YaoDuApiServiceImpl implements YaoDuApiService { //发布按钮 @Resource private ICityAddService cityAddService; + //权限配置 + @Resource + private ShiroRealm shiroRealm; + //用户信息 + @Resource + private IHanHaiMemberService hanHaiMemberService; + + + //获取个人信息接口 + @Override + public Result getInfo(String token){ + HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token); + return Result.OK("查询成功", hanHaiMember); + } + + //修改个人信息接口 + @Override + public Result updateInfo(String token, HanHaiMember bean){ + HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token); + bean.setId(hanHaiMember.getId()); + hanHaiMemberService.updateById(bean); + return Result.OK("修改成功"); + } + //获取城市列表服务区域 @@ -158,6 +187,9 @@ public class YaoDuApiServiceImpl implements YaoDuApiService { @Override public Result getPostDetail(String id){ CityTrends cityTrends = cityTrendsService.getById(id); + //根据用户表示查询用信息 + HanHaiMember byId = hanHaiMemberService.getById(cityTrends.getUserId()); + cityTrends.setUserId(byId.getNickName()); return Result.OK(cityTrends); } @@ -176,6 +208,10 @@ public class YaoDuApiServiceImpl implements YaoDuApiService { @Override public Result getRentDetail(String id){ CityHome cityHome = cityHomeService.getById(id); + //根据用户表示查询用信息 + HanHaiMember byId = hanHaiMemberService.getById(cityHome.getUserId()); + cityHome.setUserId(byId.getNickName()); + return Result.OK(cityHome); } @@ -195,6 +231,11 @@ public class YaoDuApiServiceImpl implements YaoDuApiService { @Override public Result getJobDetail(String id){ CityJob cityJob = cityJobService.getById(id); + + //根据用户表示查询用信息 + HanHaiMember byId = hanHaiMemberService.getById(cityJob.getUserId()); + cityJob.setUserId(byId.getNickName()); + return Result.OK(cityJob); } @@ -230,6 +271,10 @@ public class YaoDuApiServiceImpl implements YaoDuApiService { @Override public Result getActivityDetail(String id){ CityActivity cityActivity = cityActivityService.getById(id); + //根据用户表示查询用信息 + HanHaiMember byId = hanHaiMemberService.getById(cityActivity.getUserId()); + cityActivity.setUserId(byId.getNickName()); + return Result.OK(cityActivity); } @@ -275,7 +320,15 @@ public class YaoDuApiServiceImpl implements YaoDuApiService { //发布帖子 @Override public Result publishPost(String token, CityTrends cityTrends){ - return Result.OK(); + HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token); + //设置配置 + cityTrends.setUserId(hanHaiMember.getId()); + cityTrends.setUserName(hanHaiMember.getNickName()); + cityTrends.setUserImage(hanHaiMember.getHeadImage()); + cityTrends.setCreateTime(new Date()); + + boolean save = cityTrendsService.save(cityTrends); + return Result.OK("发布成功"); } diff --git a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/yaoduapi/YaoDuApiTokenController.java b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/yaoduapi/YaoDuApiTokenController.java index 59df22f..287832b 100644 --- a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/yaoduapi/YaoDuApiTokenController.java +++ b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/yaoduapi/YaoDuApiTokenController.java @@ -7,9 +7,8 @@ import org.jeecg.common.api.vo.Result; import org.jeecg.modules.api.service.YaoDuApiService; import org.jeecg.modules.citiyUserAuthentication.entity.CitiyUserAuthentication; import org.jeecg.modules.cityTrends.entity.CityTrends; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; +import org.jeecg.modules.hanHaiMember.entity.HanHaiMember; +import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; @@ -22,11 +21,29 @@ public class YaoDuApiTokenController { @Resource private YaoDuApiService yaoDuApiService; + //获取个人信息接口 + @ApiOperation(value="小程序-获取个人信息接口", notes="小程序-获取个人信息接口") + @GetMapping("/getInfo") + public Result getInfo(@RequestHeader("X-Access-Token") String token) + { + return yaoDuApiService.getInfo(token); + } + + + //修改个人信息接口 + @ApiOperation(value="小程序-修改个人信息接口", notes="小程序-修改个人信息接口") + @PostMapping("/updateInfo") + public Result updateInfo(@RequestHeader("X-Access-Token") String token, HanHaiMember bean) + { + return yaoDuApiService.updateInfo(token,bean); + } + + //点击查看联系方式 类型 0帖子 1租房 2工作 3门店 @PostMapping(value = "/checkGivePhone") @ApiOperation(value="点击查看联系方式 类型 0帖子 1租房 2工作 3门店") - public Result checkGivePhone(String token,String type, String id) { + public Result checkGivePhone(@RequestHeader("X-Access-Token") String token,String type, String id) { return yaoDuApiService.checkGivePhone(token,type,id); } @@ -34,35 +51,35 @@ public class YaoDuApiTokenController { //点击查看地图 类型 0帖子 1租房 2工作 3门店 @PostMapping(value = "/checkMap") @ApiOperation(value="点击查看地图 类型 0帖子 1租房 2工作 3门店") - public Result checkMap(String token,String type, String id) { + public Result checkMap(@RequestHeader("X-Access-Token") String token,String type, String id) { return yaoDuApiService.checkMap(token,type,id); } //申请职位 @PostMapping(value = "/applyJob") @ApiOperation(value="申请职位") - public Result applyJob(String token,String jobId,String name,String phone) { + public Result applyJob(@RequestHeader("X-Access-Token") String token,String jobId,String name,String phone) { return yaoDuApiService.applyJob(token,jobId,name,phone); } //发布帖子 @PostMapping(value = "/publishPost") @ApiOperation(value="发布帖子") - public Result publishPost(String token, CityTrends cityTrends) { + public Result publishPost(@RequestHeader("X-Access-Token") String token, CityTrends cityTrends) { return yaoDuApiService.publishPost(token,cityTrends); } //评论 @PostMapping(value = "/comment") @ApiOperation(value="评论") - public Result comment(String token,String postId,String content) { + public Result comment(@RequestHeader("X-Access-Token") String token,String postId,String content) { return yaoDuApiService.comment(token,postId,content); } //个人认证 @PostMapping(value = "/personalAuthentication") @ApiOperation(value="个人认证") - public Result personalAuthentication(String token, CitiyUserAuthentication citiyUserAuthentication) { + public Result personalAuthentication(@RequestHeader("X-Access-Token") String token, CitiyUserAuthentication citiyUserAuthentication) { return yaoDuApiService.personalAuthentication(token,citiyUserAuthentication); } diff --git a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/yaoduapi/YaoDuLoginController.java b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/yaoduapi/YaoDuLoginController.java new file mode 100644 index 0000000..cc40659 --- /dev/null +++ b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/yaoduapi/YaoDuLoginController.java @@ -0,0 +1,52 @@ +package org.jeecg.modules.api.yaoduapi; + + +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.modules.api.service.LoginApiService; +import org.jeecg.modules.bean.LoginReq; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import javax.annotation.Resource; + +@Api(tags="瑶都万能墙接口 -登录") +@RestController +@RequestMapping("/login") +@Slf4j +public class YaoDuLoginController { + + //授权登录 + @Resource + private LoginApiService loginApiService; + + + //小程序授权登录 + @ApiOperation(value="小程序-登录接口", notes="小程序-登录接口") + @GetMapping("/login") + public Result login(LoginReq loginReq){ + return loginApiService.login(loginReq); + } + + + //获取用户协议 + @ApiOperation(value="小程序-获取用户协议", notes="小程序-获取用户协议") + @GetMapping("/getUserAgreement") + public Result getUserAgreement(){ + return loginApiService.getUserAgreement(); + } + + + //获取隐私政策 + @ApiOperation(value="小程序-获取隐私政策", notes="小程序-获取隐私政策") + @GetMapping("/getPrivacyPolicy") + public Result getPrivacyPolicy(){ + return loginApiService.getPrivacyPolicy(); + } + + + +} diff --git a/jeecg-boot-module-system/src/main/resources/application-dev.yml b/jeecg-boot-module-system/src/main/resources/application-dev.yml index 30533fb..25370e5 100644 --- a/jeecg-boot-module-system/src/main/resources/application-dev.yml +++ b/jeecg-boot-module-system/src/main/resources/application-dev.yml @@ -332,8 +332,8 @@ third-app: ##配置微信 wechat: - mpAppId: - mpAppSecret: + mpAppId: wxa4d29e67e8a58d38 + mpAppSecret: 866e4ba72bd86a4c79403b6b1341461b mchId: mchKey: keyPath: