修复提交

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");
+
+
 
 
 

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;
 }

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
       }
     }

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityHome/vue/modules/CityHomeForm.vue

@@ -113,6 +113,11 @@
               <a-input v-model="model.isMinPrice" placeholder="请输入低价"  ></a-input>
             </a-form-model-item>
           </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="发布人头像" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="headImage">
+              <j-upload v-model="model.headImage"   ></j-upload>
+            </a-form-model-item>
+          </a-col>
         </a-row>
       </a-form-model>
     </j-form-container>

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:{
+     },
+  },
 ];

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<HanHaiMember, IHanHa
 	 * @param req
 	 * @return
 	 */
-	//@AutoLog(value = "用户表-分页列表查询")
-	@ApiOperation(value="用户表-分页列表查询", notes="用户表-分页列表查询")
+	//@AutoLog(value = "用户账户表-分页列表查询")
+	@ApiOperation(value="用户账户表-分页列表查询", notes="用户账户表-分页列表查询")
 	@GetMapping(value = "/list")
 	public Result<IPage<HanHaiMember>> queryPageList(HanHaiMember hanHaiMember,
 								   @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
@@ -78,8 +78,8 @@ public class HanHaiMemberController extends JeecgController<HanHaiMember, IHanHa
 	 * @param hanHaiMember
 	 * @return
 	 */
-	@AutoLog(value = "用户表-添加")
-	@ApiOperation(value="用户表-添加", notes="用户表-添加")
+	@AutoLog(value = "用户账户表-添加")
+	@ApiOperation(value="用户账户表-添加", notes="用户账户表-添加")
 	@PostMapping(value = "/add")
 	public Result<String> add(@RequestBody HanHaiMember hanHaiMember) {
 		hanHaiMemberService.save(hanHaiMember);
@@ -92,8 +92,8 @@ public class HanHaiMemberController extends JeecgController<HanHaiMember, IHanHa
 	 * @param hanHaiMember
 	 * @return
 	 */
-	@AutoLog(value = "用户表-编辑")
-	@ApiOperation(value="用户表-编辑", notes="用户表-编辑")
+	@AutoLog(value = "用户账户表-编辑")
+	@ApiOperation(value="用户账户表-编辑", notes="用户账户表-编辑")
 	@RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST})
 	public Result<String> edit(@RequestBody HanHaiMember hanHaiMember) {
 		hanHaiMemberService.updateById(hanHaiMember);
@@ -106,8 +106,8 @@ public class HanHaiMemberController extends JeecgController<HanHaiMember, IHanHa
 	 * @param id
 	 * @return
 	 */
-	@AutoLog(value = "用户表-通过id删除")
-	@ApiOperation(value="用户表-通过id删除", notes="用户表-通过id删除")
+	@AutoLog(value = "用户账户表-通过id删除")
+	@ApiOperation(value="用户账户表-通过id删除", notes="用户账户表-通过id删除")
 	@DeleteMapping(value = "/delete")
 	public Result<String> delete(@RequestParam(name="id",required=true) String id) {
 		hanHaiMemberService.removeById(id);
@@ -120,8 +120,8 @@ public class HanHaiMemberController extends JeecgController<HanHaiMember, IHanHa
 	 * @param ids
 	 * @return
 	 */
-	@AutoLog(value = "用户表-批量删除")
-	@ApiOperation(value="用户表-批量删除", notes="用户表-批量删除")
+	@AutoLog(value = "用户账户表-批量删除")
+	@ApiOperation(value="用户账户表-批量删除", notes="用户账户表-批量删除")
 	@DeleteMapping(value = "/deleteBatch")
 	public Result<String> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
 		this.hanHaiMemberService.removeByIds(Arrays.asList(ids.split(",")));
@@ -134,8 +134,8 @@ public class HanHaiMemberController extends JeecgController<HanHaiMember, IHanHa
 	 * @param id
 	 * @return
 	 */
-	//@AutoLog(value = "用户表-通过id查询")
-	@ApiOperation(value="用户表-通过id查询", notes="用户表-通过id查询")
+	//@AutoLog(value = "用户账户表-通过id查询")
+	@ApiOperation(value="用户账户表-通过id查询", notes="用户账户表-通过id查询")
 	@GetMapping(value = "/queryById")
 	public Result<HanHaiMember> queryById(@RequestParam(name="id",required=true) String id) {
 		HanHaiMember hanHaiMember = hanHaiMemberService.getById(id);
@@ -153,7 +153,7 @@ public class HanHaiMemberController extends JeecgController<HanHaiMember, IHanHa
     */
     @RequestMapping(value = "/exportXls")
     public ModelAndView exportXls(HttpServletRequest request, HanHaiMember hanHaiMember) {
-        return super.exportXls(request, hanHaiMember, HanHaiMember.class, "用户表");
+        return super.exportXls(request, hanHaiMember, HanHaiMember.class, "用户账户表");
     }
 
     /**

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiMember/entity/HanHaiMember.java

@@ -18,16 +18,16 @@ import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
 
 /**
- * @Description: 用户表
+ * @Description: 用户账户表
  * @Author: jeecg-boot
- * @Date:   2024-07-08
+ * @Date:   2024-10-26
  * @Version: V1.0
  */
 @Data
 @TableName("han_hai_member")
 @Accessors(chain = true)
 @EqualsAndHashCode(callSuper = false)
-@ApiModel(value="han_hai_member对象", description="用户表")
+@ApiModel(value="han_hai_member对象", description="用户账户表")
 public class HanHaiMember implements Serializable {
     private static final long serialVersionUID = 1L;
 
@@ -39,12 +39,16 @@ public class HanHaiMember implements Serializable {
     @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;
 	/**所属部门*/
@@ -155,14 +159,11 @@ public class HanHaiMember implements Serializable {
     @ApiModelProperty(value = "shareId")
     private java.lang.String shareId;
 	/**邀请人*/
-	@Excel(name = "邀请人", width = 15, dictTable = "han_hai_member", dicText = "nick_name", dicCode = "id")
-	@Dict(dictTable = "han_hai_member", dicText = "nick_name", dicCode = "id")
+	@Excel(name = "邀请人", width = 15)
     @ApiModelProperty(value = "邀请人")
     private java.lang.String vid;
 	/**邀请时间*/
-	@Excel(name = "邀请时间", width = 20, format = "yyyy-MM-dd HH:mm:ss")
-	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
-    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+	@Excel(name = "邀请时间", width = 15)
     @ApiModelProperty(value = "邀请时间")
     private java.util.Date vtime;
 	/**兼兼街会员*/

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiMember/mapper/HanHaiMemberMapper.java

@@ -7,9 +7,9 @@ import org.jeecg.modules.hanHaiMember.entity.HanHaiMember;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
 /**
- * @Description: 用户表
+ * @Description: 用户账户表
  * @Author: jeecg-boot
- * @Date:   2024-07-08
+ * @Date:   2024-10-26
  * @Version: V1.0
  */
 public interface HanHaiMemberMapper extends BaseMapper<HanHaiMember> {

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<HanHaiMember> {

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

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiMember/vue/HanHaiMemberList.vue

@@ -0,0 +1,226 @@
+<template>
+  <a-card :bordered="false">
+    <!-- 查询区域 -->
+    <div class="table-page-search-wrapper">
+      <a-form layout="inline" @keyup.enter.native="searchQuery">
+        <a-row :gutter="24">
+        </a-row>
+      </a-form>
+    </div>
+    <!-- 查询区域-END -->
+
+    <!-- 操作按钮区域 -->
+    <div class="table-operator">
+      <a-button @click="handleAdd" type="primary" icon="plus">新增</a-button>
+      <a-button type="primary" icon="download" @click="handleExportXls('用户账户表')">导出</a-button>
+      <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel">
+        <a-button type="primary" icon="import">导入</a-button>
+      </a-upload>
+      <!-- 高级查询区域 -->
+      <j-super-query :fieldList="superFieldList" ref="superQueryModal" @handleSuperQuery="handleSuperQuery"></j-super-query>
+      <a-dropdown v-if="selectedRowKeys.length > 0">
+        <a-menu slot="overlay">
+          <a-menu-item key="1" @click="batchDel"><a-icon type="delete"/>删除</a-menu-item>
+        </a-menu>
+        <a-button style="margin-left: 8px"> 批量操作 <a-icon type="down" /></a-button>
+      </a-dropdown>
+    </div>
+
+    <!-- table区域-begin -->
+    <div>
+      <div class="ant-alert ant-alert-info" style="margin-bottom: 16px;">
+        <i class="anticon anticon-info-circle ant-alert-icon"></i> 已选择 <a style="font-weight: 600">{{ selectedRowKeys.length }}</a>项
+        <a style="margin-left: 24px" @click="onClearSelected">清空</a>
+      </div>
+
+      <a-table
+        ref="table"
+        size="middle"
+        :scroll="{x:true}"
+        bordered
+        rowKey="id"
+        :columns="columns"
+        :dataSource="dataSource"
+        :pagination="ipagination"
+        :loading="loading"
+        :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
+        class="j-table-force-nowrap"
+        @change="handleTableChange">
+
+        <template slot="htmlSlot" slot-scope="text">
+          <div v-html="text"></div>
+        </template>
+        <template slot="imgSlot" slot-scope="text,record">
+          <span v-if="!text" style="font-size: 12px;font-style: italic;">无图片</span>
+          <img v-else :src="getImgView(text)" :preview="record.id" height="25px" alt="" style="max-width:80px;font-size: 12px;font-style: italic;"/>
+        </template>
+        <template slot="fileSlot" slot-scope="text">
+          <span v-if="!text" style="font-size: 12px;font-style: italic;">无文件</span>
+          <a-button
+            v-else
+            :ghost="true"
+            type="primary"
+            icon="download"
+            size="small"
+            @click="downloadFile(text)">
+            下载
+          </a-button>
+        </template>
+
+        <span slot="action" slot-scope="text, record">
+          <a @click="handleEdit(record)">编辑</a>
+
+          <a-divider type="vertical" />
+          <a-dropdown>
+            <a class="ant-dropdown-link">更多 <a-icon type="down" /></a>
+            <a-menu slot="overlay">
+              <a-menu-item>
+                <a @click="handleDetail(record)">详情</a>
+              </a-menu-item>
+              <a-menu-item>
+                <a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)">
+                  <a>删除</a>
+                </a-popconfirm>
+              </a-menu-item>
+            </a-menu>
+          </a-dropdown>
+        </span>
+
+      </a-table>
+    </div>
+
+    <han-hai-member-modal ref="modalForm" @ok="modalFormOk"></han-hai-member-modal>
+  </a-card>
+</template>
+
+<script>
+
+  import '@/assets/less/TableExpand.less'
+  import { mixinDevice } from '@/utils/mixin'
+  import { JeecgListMixin } from '@/mixins/JeecgListMixin'
+  import HanHaiMemberModal from './modules/HanHaiMemberModal'
+
+  export default {
+    name: 'HanHaiMemberList',
+    mixins:[JeecgListMixin, mixinDevice],
+    components: {
+      HanHaiMemberModal
+    },
+    data () {
+      return {
+        description: '用户账户表管理页面',
+        // 表头
+        columns: [
+          {
+            title: '#',
+            dataIndex: '',
+            key:'rowIndex',
+            width:60,
+            align:"center",
+            customRender:function (t,r,index) {
+              return parseInt(index)+1;
+            }
+          },
+          {
+            title:'昵称',
+            align:"center",
+            dataIndex: 'nickName'
+          },
+          {
+            title:'用户头像',
+            align:"center",
+            dataIndex: 'headImage',
+            scopedSlots: {customRender: 'imgSlot'}
+          },
+          {
+            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'
+          },
+          {
+            title: '操作',
+            dataIndex: 'action',
+            align:"center",
+            fixed:"right",
+            width:147,
+            scopedSlots: { customRender: 'action' }
+          }
+        ],
+        url: {
+          list: "/hanHaiMember/hanHaiMember/list",
+          delete: "/hanHaiMember/hanHaiMember/delete",
+          deleteBatch: "/hanHaiMember/hanHaiMember/deleteBatch",
+          exportXlsUrl: "/hanHaiMember/hanHaiMember/exportXls",
+          importExcelUrl: "hanHaiMember/hanHaiMember/importExcel",
+          
+        },
+        dictOptions:{},
+        superFieldList:[],
+      }
+    },
+    created() {
+    this.getSuperFieldList();
+    },
+    computed: {
+      importExcelUrl: function(){
+        return `${window._CONFIG['domianURL']}/${this.url.importExcelUrl}`;
+      },
+    },
+    methods: {
+      initDictConfig(){
+      },
+      getSuperFieldList(){
+        let fieldList=[];
+        fieldList.push({type:'string',value:'nickName',text:'昵称',dictCode:''})
+        fieldList.push({type:'string',value:'headImage',text:'用户头像',dictCode:''})
+        fieldList.push({type:'string',value:'name',text:'真实姓名',dictCode:''})
+        fieldList.push({type:'string',value:'phone',text:'手机号码',dictCode:''})
+        fieldList.push({type:'string',value:'appletOpenid',text:'小程序标识',dictCode:''})
+        fieldList.push({type:'string',value:'idCard',text:'身份证号码',dictCode:''})
+        fieldList.push({type:'string',value:'idCardOpen',text:'是否实名认证',dictCode:''})
+        fieldList.push({type:'string',value:'vid',text:'邀请人',dictCode:''})
+        fieldList.push({type:'datetime',value:'vtime',text:'邀请时间'})
+        fieldList.push({type:'string',value:'sex',text:'性别',dictCode:''})
+        this.superFieldList = fieldList
+      }
+    }
+  }
+</script>
+<style scoped>
+  @import '~@assets/less/common.less';
+</style>

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiMember/vue/modules/HanHaiMemberForm.vue

@@ -0,0 +1,149 @@
+<template>
+  <a-spin :spinning="confirmLoading">
+    <j-form-container :disabled="formDisabled">
+      <a-form-model ref="form" :model="model" :rules="validatorRules" slot="detail">
+        <a-row>
+          <a-col :span="24">
+            <a-form-model-item label="昵称" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="nickName">
+              <a-input v-model="model.nickName" placeholder="请输入昵称"  ></a-input>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="用户头像" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="headImage">
+              <j-image-upload isMultiple  v-model="model.headImage" ></j-image-upload>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="真实姓名" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="name">
+              <a-input v-model="model.name" placeholder="请输入真实姓名"  ></a-input>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="手机号码" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="phone">
+              <a-input v-model="model.phone" placeholder="请输入手机号码"  ></a-input>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="小程序标识" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="appletOpenid">
+              <a-input v-model="model.appletOpenid" placeholder="请输入小程序标识"  ></a-input>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="身份证号码" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="idCard">
+              <a-input v-model="model.idCard" placeholder="请输入身份证号码"  ></a-input>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="是否实名认证" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="idCardOpen">
+              <a-input v-model="model.idCardOpen" placeholder="请输入是否实名认证"  ></a-input>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="邀请人" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="vid">
+              <a-input v-model="model.vid" placeholder="请输入邀请人"  ></a-input>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="邀请时间" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="vtime">
+              <j-date placeholder="请选择邀请时间"  v-model="model.vtime" :show-time="true" date-format="YYYY-MM-DD HH:mm:ss" style="width: 100%" />
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="性别" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="sex">
+              <a-input v-model="model.sex" placeholder="请输入性别"  ></a-input>
+            </a-form-model-item>
+          </a-col>
+        </a-row>
+      </a-form-model>
+    </j-form-container>
+  </a-spin>
+</template>
+
+<script>
+
+  import { httpAction, getAction } from '@/api/manage'
+  import { validateDuplicateValue } from '@/utils/util'
+
+  export default {
+    name: 'HanHaiMemberForm',
+    components: {
+    },
+    props: {
+      //表单禁用
+      disabled: {
+        type: Boolean,
+        default: false,
+        required: false
+      }
+    },
+    data () {
+      return {
+        model:{
+         },
+        labelCol: {
+          xs: { span: 24 },
+          sm: { span: 5 },
+        },
+        wrapperCol: {
+          xs: { span: 24 },
+          sm: { span: 16 },
+        },
+        confirmLoading: false,
+        validatorRules: {
+        },
+        url: {
+          add: "/hanHaiMember/hanHaiMember/add",
+          edit: "/hanHaiMember/hanHaiMember/edit",
+          queryById: "/hanHaiMember/hanHaiMember/queryById"
+        }
+      }
+    },
+    computed: {
+      formDisabled(){
+        return this.disabled
+      },
+    },
+    created () {
+       //备份model原始值
+      this.modelDefault = JSON.parse(JSON.stringify(this.model));
+    },
+    methods: {
+      add () {
+        this.edit(this.modelDefault);
+      },
+      edit (record) {
+        this.model = Object.assign({}, record);
+        this.visible = true;
+      },
+      submitForm () {
+        const that = this;
+        // 触发表单验证
+        this.$refs.form.validate(valid => {
+          if (valid) {
+            that.confirmLoading = true;
+            let httpurl = '';
+            let method = '';
+            if(!this.model.id){
+              httpurl+=this.url.add;
+              method = 'post';
+            }else{
+              httpurl+=this.url.edit;
+               method = 'put';
+            }
+            httpAction(httpurl,this.model,method).then((res)=>{
+              if(res.success){
+                that.$message.success(res.message);
+                that.$emit('ok');
+              }else{
+                that.$message.warning(res.message);
+              }
+            }).finally(() => {
+              that.confirmLoading = false;
+            })
+          }
+         
+        })
+      },
+    }
+  }
+</script>

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiMember/vue/modules/HanHaiMemberModal.Style#Drawer.vue

@@ -0,0 +1,84 @@
+<template>
+  <a-drawer
+    :title="title"
+    :width="width"
+    placement="right"
+    :closable="false"
+    @close="close"
+    destroyOnClose
+    :visible="visible">
+    <han-hai-member-form ref="realForm" @ok="submitCallback" :disabled="disableSubmit" normal></han-hai-member-form>
+    <div class="drawer-footer">
+      <a-button @click="handleCancel" style="margin-bottom: 0;">关闭</a-button>
+      <a-button v-if="!disableSubmit"  @click="handleOk" type="primary" style="margin-bottom: 0;">提交</a-button>
+    </div>
+  </a-drawer>
+</template>
+
+<script>
+
+  import HanHaiMemberForm from './HanHaiMemberForm'
+
+  export default {
+    name: 'HanHaiMemberModal',
+    components: {
+      HanHaiMemberForm
+    },
+    data () {
+      return {
+        title:"操作",
+        width:800,
+        visible: false,
+        disableSubmit: false
+      }
+    },
+    methods: {
+      add () {
+        this.visible=true
+        this.$nextTick(()=>{
+          this.$refs.realForm.add();
+        })
+      },
+      edit (record) {
+        this.visible=true
+        this.$nextTick(()=>{
+          this.$refs.realForm.edit(record);
+        });
+      },
+      close () {
+        this.$emit('close');
+        this.visible = false;
+      },
+      submitCallback(){
+        this.$emit('ok');
+        this.visible = false;
+      },
+      handleOk () {
+        this.$refs.realForm.submitForm();
+      },
+      handleCancel () {
+        this.close()
+      }
+    }
+  }
+</script>
+
+<style lang="less" scoped>
+/** Button按钮间距 */
+  .ant-btn {
+    margin-left: 30px;
+    margin-bottom: 30px;
+    float: right;
+  }
+  .drawer-footer{
+    position: absolute;
+    bottom: -8px;
+    width: 100%;
+    border-top: 1px solid #e8e8e8;
+    padding: 10px 16px;
+    text-align: right;
+    left: 0;
+    background: #fff;
+    border-radius: 0 0 2px 2px;
+  }
+</style>

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiMember/vue/modules/HanHaiMemberModal.vue

@@ -0,0 +1,60 @@
+<template>
+  <j-modal
+    :title="title"
+    :width="width"
+    :visible="visible"
+    switchFullscreen
+    @ok="handleOk"
+    :okButtonProps="{ class:{'jee-hidden': disableSubmit} }"
+    @cancel="handleCancel"
+    cancelText="关闭">
+    <han-hai-member-form ref="realForm" @ok="submitCallback" :disabled="disableSubmit"></han-hai-member-form>
+  </j-modal>
+</template>
+
+<script>
+
+  import HanHaiMemberForm from './HanHaiMemberForm'
+  export default {
+    name: 'HanHaiMemberModal',
+    components: {
+      HanHaiMemberForm
+    },
+    data () {
+      return {
+        title:'',
+        width:800,
+        visible: false,
+        disableSubmit: false
+      }
+    },
+    methods: {
+      add () {
+        this.visible=true
+        this.$nextTick(()=>{
+          this.$refs.realForm.add();
+        })
+      },
+      edit (record) {
+        this.visible=true
+        this.$nextTick(()=>{
+          this.$refs.realForm.edit(record);
+        })
+      },
+      close () {
+        this.$emit('close');
+        this.visible = false;
+      },
+      handleOk () {
+        this.$refs.realForm.submitForm();
+      },
+      submitCallback(){
+        this.$emit('ok');
+        this.visible = false;
+      },
+      handleCancel () {
+        this.close()
+      }
+    }
+  }
+</script>

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});
+}

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',
+  },
+];

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiMember/vue3/HanHaiMemberList.vue

@@ -0,0 +1,162 @@
+<template>
+  <div>
+    <!--引用表格-->
+   <BasicTable @register="registerTable" :rowSelection="rowSelection">
+     <!--插槽:table标题-->
+      <template #tableTitle>
+          <a-button type="primary" @click="handleAdd" preIcon="ant-design:plus-outlined"> 新增</a-button>
+          <a-button  type="primary" preIcon="ant-design:export-outlined" @click="onExportXls"> 导出</a-button>
+          <j-upload-button  type="primary" preIcon="ant-design:import-outlined" @click="onImportXls">导入</j-upload-button>
+          <a-dropdown v-if="checkedKeys.length > 0">
+              <template #overlay>
+                <a-menu>
+                  <a-menu-item key="1" @click="batchHandleDelete">
+                    <Icon icon="ant-design:delete-outlined"></Icon>
+                    删除
+                  </a-menu-item>
+                </a-menu>
+              </template>
+              <a-button>批量操作
+                <Icon icon="mdi:chevron-down"></Icon>
+              </a-button>
+        </a-dropdown>
+      </template>
+       <!--操作栏-->
+      <template #action="{ record }">
+        <TableAction :actions="getTableAction(record)" :dropDownActions="getDropDownAction(record)"/>
+      </template>
+      <!--字段回显插槽-->
+      <template #htmlSlot="{text}">
+         <div v-html="text"></div>
+      </template>
+      <template #fileSlot="{text}">
+         <span v-if="!text" style="font-size: 12px;font-style: italic;">无文件</span>
+         <a-button v-else :ghost="true" type="primary" preIcon="ant-design:download-outlined" size="small" @click="downloadFile(text)">下载</a-button>
+      </template>
+    </BasicTable>
+    <!-- 表单区域 -->
+    <HanHaiMemberModal @register="registerModal" @success="handleSuccess"></HanHaiMemberModal>
+  </div>
+</template>
+
+<script lang="ts" name="hanHaiMember-hanHaiMember" setup>
+  import {ref, computed, unref} from 'vue';
+  import {BasicTable, useTable, TableAction} from '/@/components/Table';
+  import {useModal} from '/@/components/Modal';
+  import { useListPage } from '/@/hooks/system/useListPage'
+  import HanHaiMemberModal from './components/HanHaiMemberModal.vue'
+  import {columns, searchFormSchema} from './hanHaiMember.data';
+  import {list, deleteOne, batchDelete, getImportUrl,getExportUrl} from './hanHaiMember.api';
+  const checkedKeys = ref<Array<string | number>>([]);
+  //注册model
+  const [registerModal, {openModal}] = useModal();
+  //注册table数据
+  const { prefixCls,tableContext,onExportXls,onImportXls } = useListPage({
+      tableProps:{
+           title: '用户账户表',
+           api: list,
+           columns,
+           canResize:false,
+           formConfig: {
+              labelWidth: 120,
+              schemas: searchFormSchema,
+              autoSubmitOnEnter:true,
+              showAdvancedButton:true,
+              fieldMapToTime: [
+              ],
+            },
+           actionColumn: {
+               width: 120,
+            },
+      },
+       exportConfig: {
+            name:"用户账户表",
+            url: getExportUrl,
+          },
+          importConfig: {
+            url: getImportUrl
+          },
+  })
+
+  const [registerTable, {reload},{ rowSelection, selectedRowKeys }] = tableContext
+
+   /**
+    * 新增事件
+    */
+  function handleAdd() {
+     openModal(true, {
+       isUpdate: false,
+       showFooter: true,
+     });
+  }
+   /**
+    * 编辑事件
+    */
+  function handleEdit(record: Recordable) {
+     openModal(true, {
+       record,
+       isUpdate: true,
+       showFooter: true,
+     });
+   }
+   /**
+    * 详情
+   */
+  function handleDetail(record: Recordable) {
+     openModal(true, {
+       record,
+       isUpdate: true,
+       showFooter: false,
+     });
+   }
+   /**
+    * 删除事件
+    */
+  async function handleDelete(record) {
+     await deleteOne({id: record.id}, reload);
+   }
+   /**
+    * 批量删除事件
+    */
+  async function batchHandleDelete() {
+     await batchDelete({ids: checkedKeys.value}, reload);
+   }
+   /**
+    * 成功回调
+    */
+  function handleSuccess() {
+      reload();
+   }
+   /**
+      * 操作栏
+      */
+  function getTableAction(record){
+       return [
+         {
+           label: '编辑',
+           onClick: handleEdit.bind(null, record),
+         }
+       ]
+   }
+     /**
+        * 下拉操作栏
+        */
+  function getDropDownAction(record){
+      return [
+           {
+             label: '详情',
+             onClick: handleDetail.bind(null, record),
+           }, {
+             label: '删除',
+             popConfirm: {
+               title: '是否确认删除',
+               confirm: handleDelete.bind(null, record),
+             }
+           }
+      ]
+   }
+</script>
+
+<style scoped>
+
+</style>

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiMember/vue3/components/HanHaiMemberModal.vue

@@ -0,0 +1,58 @@
+<template>
+  <BasicModal v-bind="$attrs" @register="registerModal" :title="title" @ok="handleSubmit">
+      <BasicForm @register="registerForm"/>
+  </BasicModal>
+</template>
+
+<script lang="ts" setup>
+    import {ref, computed, unref} from 'vue';
+    import {BasicModal, useModalInner} from '/@/components/Modal';
+    import {BasicForm, useForm} from '/@/components/Form/index';
+    import {formSchema} from '../hanHaiMember.data';
+    import {saveOrUpdate} from '../hanHaiMember.api';
+    // Emits声明
+    const emit = defineEmits(['register','success']);
+    const isUpdate = ref(true);
+    //表单配置
+    const [registerForm, {setProps,resetFields, setFieldsValue, validate}] = useForm({
+        labelWidth: 150,
+        schemas: formSchema,
+        showActionButtonGroup: false,
+    });
+    //表单赋值
+    const [registerModal, {setModalProps, closeModal}] = useModalInner(async (data) => {
+        //重置表单
+        await resetFields();
+        setModalProps({confirmLoading: false,showCancelBtn:!!data?.showFooter,showOkBtn:!!data?.showFooter});
+        isUpdate.value = !!data?.isUpdate;
+        if (unref(isUpdate)) {
+            //表单赋值
+            await setFieldsValue({
+                ...data.record,
+            });
+        }
+        // 隐藏底部时禁用整个表单
+       setProps({ disabled: !data?.showFooter })
+    });
+    //设置标题
+    const title = computed(() => (!unref(isUpdate) ? '新增' : '编辑'));
+    //表单提交事件
+    async function handleSubmit(v) {
+        try {
+            let values = await validate();
+            setModalProps({confirmLoading: true});
+            //提交表单
+            await saveOrUpdate(values, isUpdate.value);
+            //关闭弹窗
+            closeModal();
+            //刷新列表
+            emit('success');
+        } finally {
+            setModalProps({confirmLoading: false});
+        }
+    }
+</script>
+
+<style lang="less" scoped>
+
+</style>

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);
+
+
+}

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<Object> appletLogin(LoginReq loginReq);
+
+
+//    /**
+//     * 微信小程序登录绑定手机号码接口
+//     * @param loginReq
+//     * @return
+//     */
+//    Result<Object> bindPhone(LoginReq loginReq);
+}

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<Object, Object> 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);
+    }
+}

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<Object> appletLogin( LoginReq loginReq) {
+        Result<Object> result = new Result<>();
+        Map<String, Object> 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<Object> bindPhone(LoginReq loginReq) {
+//        Result<Object> 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<String, Object> userMap = new HashMap<>();
+//                for (Map.Entry<String, Object> 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;
+//    }
+
+}

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();
+}

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();
 

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("隐私政策");
+    }
+
+
+}

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("发布成功");
     }
 
 

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);
     }
 

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();
+    }
+
+
+
+}

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: