feat: 新增微信小程序登录功能及第三方账号绑定表

src/main/resources/application-dev.yml

@@ -210,8 +210,11 @@ captcha:
   # 验证码有效期(秒)
   expire-seconds: 120
 
-# 微信小程配置
+# 微信小程序配置
 wx:
   miniapp:
-    app-id: xxxxxx
-    app-secret: xxxxxx
+    appid: your-app-id
+    secret: your-app-secret
+    token: your-token
+    aes-key: your-aes-key
+    msg-data-format: JSON

src/main/resources/codegen.yml

@@ -17,45 +17,45 @@ codegen:
   ## 模板配置
   templateConfigs:
     API:
-      templatePath: codegen/api.ts.vm
+      templatePath: codegen/frontend/ts/api.ts.vm
       subpackageName: api
       extension: .ts
     API_TYPES:
-      templatePath: codegen/api-types.ts.vm
+      templatePath: codegen/frontend/ts/api-types.ts.vm
       subpackageName: types
       extension: .ts
     VIEW:
-      templatePath: codegen/index.vue.vm
+      templatePath: codegen/frontend/ts/index.vue.vm
       subpackageName: views
       extension: .vue
     Controller:
-      templatePath: codegen/controller.java.vm
+      templatePath: codegen/backend/controller.java.vm
       subpackageName: controller
     Service:
-      templatePath: codegen/service.java.vm
+      templatePath: codegen/backend/service.java.vm
       subpackageName: service
     ServiceImpl:
-      templatePath: codegen/serviceImpl.java.vm
+      templatePath: codegen/backend/serviceImpl.java.vm
       subpackageName: service.impl
     Mapper:
-      templatePath: codegen/mapper.java.vm
+      templatePath: codegen/backend/mapper.java.vm
       subpackageName: mapper
     MapperXml:
-      templatePath: codegen/mapper.xml.vm
+      templatePath: codegen/backend/mapper.xml.vm
       subpackageName: mapper
       extension: .xml
     Converter:
-      templatePath: codegen/converter.java.vm
+      templatePath: codegen/backend/converter.java.vm
       subpackageName: converter
     Query:
-      templatePath: codegen/query.java.vm
+      templatePath: codegen/backend/query.java.vm
       subpackageName: model.query
     Form:
-      templatePath: codegen/form.java.vm
+      templatePath: codegen/backend/form.java.vm
       subpackageName: model.form
     Vo:
-      templatePath: codegen/vo.java.vm
+      templatePath: codegen/backend/vo.java.vm
       subpackageName: model.vo
     Entity:
-      templatePath: codegen/entity.java.vm
+      templatePath: codegen/backend/entity.java.vm
       subpackageName: model.entity

src/main/resources/mapper/system/UserSocialMapper.xml

@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.youlai.boot.system.mapper.UserSocialMapper">
+
+    <!-- 用户认证信息映射 -->
+    <resultMap id="AuthCredentialsMap" type="com.youlai.boot.security.model.UserAuthInfo">
+        <id property="userId" column="userId" jdbcType="BIGINT"/>
+        <result property="username" column="username" jdbcType="VARCHAR"/>
+        <result property="nickname" column="nickname" jdbcType="VARCHAR"/>
+        <result property="deptId" column="dept_id" jdbcType="BIGINT"/>
+        <result property="password" column="password" jdbcType="VARCHAR"/>
+        <result property="status" column="status" jdbcType="BOOLEAN"/>
+        <collection property="roles" ofType="string" javaType="java.util.Set">
+            <result column="code"/>
+        </collection>
+    </resultMap>
+
+    <!-- 根据用户ID获取认证信息 -->
+    <select id="getAuthInfoByUserId" resultMap="AuthCredentialsMap">
+        SELECT
+            u.id AS userId,
+            u.username,
+            u.nickname,
+            u.dept_id,
+            u.password,
+            u.status,
+            r.code
+        FROM
+            sys_user u
+            LEFT JOIN sys_user_role ur ON u.id = ur.user_id
+            LEFT JOIN sys_role r ON ur.role_id = r.id AND r.is_deleted = 0
+        WHERE
+            u.id = #{userId}
+            AND u.is_deleted = 0
+    </select>
+
+</mapper>

src/main/resources/templates/codegen/backend/converter.java.vm

@@ -17,4 +17,4 @@ public interface ${entityName}Converter{
     ${entityName}Form toForm(${entityName} entity);
 
     ${entityName} toEntity(${entityName}Form formData);
-}
+}

src/main/resources/templates/codegen/frontend/js/index.js.vue.vm

@@ -1,7 +1,7 @@
 <template>
   <div class="app-container">
-    <div class="search-container">
-      <el-form ref="queryFormRef" :model="queryParams" :inline="true">
+    <div class="filter-section">
+      <el-form ref="queryFormRef" :model="queryParams" :inline="true" label-width="auto">
         #foreach($fieldConfig in $fieldConfigs)
           #if($fieldConfig.isShowInQuery == 1)
             <el-form-item label="$fieldConfig.fieldComment" prop="$fieldConfig.fieldName">
@@ -95,29 +95,34 @@
       </el-form>
     </div>
 
-    <el-card shadow="never">
-      <div class="mb-10px">
-        <el-button
-            v-hasPerm="['${moduleName}:${entityKebab}:create']"
-            type="success"
-            icon="plus"
-            @click="handleOpenDialog()"
-        >新增</el-button>
-        <el-button
-            v-hasPerm="['${moduleName}:${entityKebab}:delete']"
-            type="danger"
-            :disabled="removeIds.length === 0"
-            icon="delete"
-            @click="handleDelete()"
-        >删除</el-button>
+    <el-card shadow="hover" class="table-section">
+      <div class="table-section__toolbar">
+        <div class="table-section__toolbar--actions">
+          <el-button
+              v-hasPerm="['${moduleName}:${entityKebab}:create']"
+              type="success"
+              icon="plus"
+              @click="handleCreateClick()"
+          >新增</el-button>
+          <el-button
+              v-hasPerm="['${moduleName}:${entityKebab}:delete']"
+              type="danger"
+              :disabled="!hasSelection"
+              icon="delete"
+              @click="handleDelete()"
+          >删除</el-button>
+        </div>
       </div>
 
       <el-table
         ref="dataTableRef"
         v-loading="loading"
         :data="pageData"
-        highlight-current-row
         border
+        stripe
+        highlight-current-row
+        class="table-section__content"
+        row-key="id"
         @selection-change="handleSelectionChange"
       >
         <el-table-column type="selection" width="55" align="center" />
@@ -148,7 +153,7 @@
                 size="small"
                 link
                 icon="edit"
-                @click="handleOpenDialog(String(scope.row.id))"
+                @click="handleEditClick(String(scope.row.id))"
             >
               编辑
             </el-button>
@@ -171,7 +176,7 @@
           v-model:total="total"
           v-model:page="queryParams.pageNum"
           v-model:limit="queryParams.pageSize"
-          @pagination="handleQuery()"
+          @pagination="fetchList"
       />
     </el-card>
 
@@ -180,7 +185,7 @@
         v-model="dialog.visible"
         :title="dialog.title"
         width="500px"
-        @close="handleCloseDialog"
+        @close="closeDialog"
     >
       <el-form ref="dataFormRef" :model="formData" :rules="rules" label-width="100px">
           #foreach($fieldConfig in $fieldConfigs)
@@ -260,7 +265,7 @@
       <template #footer>
         <div class="dialog-footer">
           <el-button type="primary" @click="handleSubmit()">确定</el-button>
-          <el-button @click="handleCloseDialog()">取消</el-button>
+          <el-button @click="closeDialog()">取消</el-button>
         </div>
       </template>
     </el-dialog>
@@ -268,18 +273,20 @@
 </template>
 
 <script setup>
+  import { onMounted, reactive, ref } from "vue";
+  import { ElMessage, ElMessageBox } from "element-plus";
+  import { useTableSelection } from "@/composables";
+  import ${entityName}API from "@/api/${moduleName}/${entityKebab}";
+
   defineOptions({
     name: "${entityName}",
     inheritAttrs: false,
   });
 
-  import ${entityName}API from "@/api/${moduleName}/${entityKebab}";
-
   const queryFormRef = ref();
   const dataFormRef = ref();
 
   const loading = ref(false);
-  const removeIds = ref([]);
   const total = ref(0);
 
   const queryParams = reactive({
@@ -290,7 +297,6 @@
   // $!{businessName}表格数据
   const pageData = ref([]);
 
-  // 弹窗
   const dialog = reactive({
     title: "",
     visible: false,
@@ -310,42 +316,57 @@
       #end
   });
 
+  const { selectedIds, hasSelection, handleSelectionChange } = useTableSelection();
+
+  async function fetchList() {
+    loading.value = true;
+    try {
+      const data = await ${entityName}API.getPage(queryParams);
+      pageData.value = data.list;
+      total.value = data.total ?? 0;
+    } finally {
+      loading.value = false;
+    }
+  }
+
   /** 查询$!{businessName} */
   function handleQuery() {
-    loading.value = true;
-          ${entityName}API.getPage(queryParams)
-        .then((data) => {
-          pageData.value = data.list;
-          total.value = data.total ?? 0;
-        })
-        .finally(() => {
-          loading.value = false;
-        });
+    queryParams.pageNum = 1;
+    fetchList();
   }
 
   /** 重置$!{businessName}查询 */
   function handleResetQuery() {
     queryFormRef.value?.resetFields();
-    queryParams.pageNum = 1;
     handleQuery();
   }
 
-  /** 行复选框选中记录选中ID集合 */
-  function handleSelectionChange(selection) {
-    removeIds.value = selection.map((item) => String(item.id));
+  function openDialog() {
+    dialog.visible = true;
   }
 
-  /** 打开$!{businessName}弹窗 */
-  function handleOpenDialog(id) {
-    dialog.visible = true;
-    if (id) {
-      dialog.title = "修改$!{businessName}";
-            ${entityName}API.getFormData(id).then((data) => {
-        Object.assign(formData, data);
-      });
-    } else {
-      dialog.title = "新增$!{businessName}";
-    }
+  function closeDialog() {
+    dialog.visible = false;
+    resetForm();
+  }
+
+  function resetForm() {
+    dataFormRef.value?.resetFields();
+    dataFormRef.value?.clearValidate();
+    formData.id = undefined;
+  }
+
+  async function handleCreateClick() {
+    dialog.title = "新增$!{businessName}";
+    openDialog();
+  }
+
+  async function handleEditClick(id) {
+    dialog.title = "修改$!{businessName}";
+          ${entityName}API.getFormData(id).then((data) => {
+      Object.assign(formData, data);
+      openDialog();
+    });
   }
 
   /** 提交$!{businessName}表单 */
@@ -358,7 +379,7 @@
                 ${entityName}API.update(id, formData)
               .then(() => {
                 ElMessage.success("修改成功");
-                handleCloseDialog();
+                closeDialog();
                 handleResetQuery();
               })
               .finally(() => (loading.value = false));
@@ -366,7 +387,7 @@
                 ${entityName}API.create(formData)
               .then(() => {
                 ElMessage.success("新增成功");
-                handleCloseDialog();
+                closeDialog();
                 handleResetQuery();
               })
               .finally(() => (loading.value = false));
@@ -375,17 +396,9 @@
     });
   }
 
-  /** 关闭$!{businessName}弹窗 */
-  function handleCloseDialog() {
-    dialog.visible = false;
-    dataFormRef.value?.resetFields();
-    dataFormRef.value?.clearValidate();
-    formData.id = undefined;
-  }
-
   /** 删除$!{businessName} */
   function handleDelete(id) {
-    const ids = [id || removeIds.value].join(",");
+    const ids = [id || selectedIds.value].join(",");
     if (!ids) {
       ElMessage.warning("请勾选删除项");
       return;

src/main/resources/templates/codegen/frontend/ts/index.vue.vm

@@ -1,7 +1,7 @@
 <template>
   <div class="app-container">
-    <div class="search-container">
-      <el-form ref="queryFormRef" :model="queryParams" :inline="true">
+    <div class="filter-section">
+      <el-form ref="queryFormRef" :model="queryParams" :inline="true" label-width="auto">
         #foreach($fieldConfig in $fieldConfigs)
           #if($fieldConfig.isShowInQuery == 1)
             <el-form-item label="$fieldConfig.fieldComment" prop="$fieldConfig.fieldName">
@@ -95,29 +95,34 @@
       </el-form>
     </div>
 
-    <el-card shadow="never">
-      <div class="mb-10px">
-        <el-button
-            v-hasPerm="['${moduleName}:${entityKebab}:create']"
-            type="success"
-            icon="plus"
-            @click="handleOpenDialog()"
-        >新增</el-button>
-        <el-button
-            v-hasPerm="['${moduleName}:${entityKebab}:delete']"
-            type="danger"
-            :disabled="removeIds.length === 0"
-            icon="delete"
-            @click="handleDelete()"
-        >删除</el-button>
+    <el-card shadow="hover" class="table-section">
+      <div class="table-section__toolbar">
+        <div class="table-section__toolbar--actions">
+          <el-button
+              v-hasPerm="['${moduleName}:${entityKebab}:create']"
+              type="success"
+              icon="plus"
+              @click="handleCreateClick()"
+          >新增</el-button>
+          <el-button
+              v-hasPerm="['${moduleName}:${entityKebab}:delete']"
+              type="danger"
+              :disabled="!hasSelection"
+              icon="delete"
+              @click="handleDelete()"
+          >删除</el-button>
+        </div>
       </div>
 
       <el-table
         ref="dataTableRef"
         v-loading="loading"
         :data="pageData"
-        highlight-current-row
         border
+        stripe
+        highlight-current-row
+        class="table-section__content"
+        row-key="id"
         @selection-change="handleSelectionChange"
       >
         <el-table-column type="selection" width="55" align="center" />
@@ -148,7 +153,7 @@
                 size="small"
                 link
                 icon="edit"
-                @click="handleOpenDialog(String(scope.row.id))"
+                @click="handleEditClick(String(scope.row.id))"
             >
               编辑
             </el-button>
@@ -171,7 +176,7 @@
           v-model:total="total"
           v-model:page="queryParams.pageNum"
           v-model:limit="queryParams.pageSize"
-          @pagination="handleQuery()"
+          @pagination="fetchList"
       />
     </el-card>
 
@@ -180,7 +185,7 @@
         v-model="dialog.visible"
         :title="dialog.title"
         width="500px"
-        @close="handleCloseDialog"
+        @close="closeDialog"
     >
       <el-form ref="dataFormRef" :model="formData" :rules="rules" label-width="100px">
           #foreach($fieldConfig in $fieldConfigs)
@@ -193,7 +198,7 @@
                       />
                     #elseif($fieldConfig.formType == "SELECT")
                         #if($fieldConfig.dictType && $fieldConfig.dictType.trim() != "")
-                          <Dict v-model="formData.$fieldConfig.fieldName" code="$fieldConfig.dictType" />
+                          <DictSelect v-model="formData.$fieldConfig.fieldName" code="$fieldConfig.dictType" />
                         #else
                           <el-select v-model="formData.$fieldConfig.fieldName" placeholder="请选择$fieldConfig.fieldComment">
                             <el-option :value="0" label="选项一"/>
@@ -202,7 +207,7 @@
                         #end
                     #elseif($fieldConfig.formType == "RADIO")
                         #if($fieldConfig.dictType && $fieldConfig.dictType.trim() != "")
-                          <Dict v-model="queryParams.$fieldConfig.fieldName" type="radio" code="$fieldConfig.dictType" />
+                          <DictSelect v-model="formData.$fieldConfig.fieldName" type="radio" code="$fieldConfig.dictType" />
                         #else
                           <el-radio-group v-model="formData.$fieldConfig.fieldName">
                             <el-radio :value="0">选项一</el-radio>
@@ -211,7 +216,7 @@
                         #end
                     #elseif($fieldConfig.formType == "CHECK_BOX")
                         #if($fieldConfig.dictType && $fieldConfig.dictType.trim() != "")
-                          <Dict v-model="queryParams.$fieldConfig.fieldName" type="checkbox" code="$fieldConfig.dictType" />
+                          <DictSelect v-model="formData.$fieldConfig.fieldName" type="checkbox" code="$fieldConfig.dictType" />
                         #else
                           <el-checkbox-group v-model="formData.$fieldConfig.fieldName">
                             <el-checkbox :value="0">选项一</el-checkbox>
@@ -260,7 +265,7 @@
       <template #footer>
         <div class="dialog-footer">
           <el-button type="primary" @click="handleSubmit()">确定</el-button>
-          <el-button @click="handleCloseDialog()">取消</el-button>
+          <el-button @click="closeDialog()">取消</el-button>
         </div>
       </template>
     </el-dialog>
@@ -268,25 +273,27 @@
 </template>
 
 <script setup lang="ts">
+  import { onMounted, reactive, ref } from "vue";
+  import { ElMessage, ElMessageBox, type FormInstance, type FormRules } from "element-plus";
+  import { useTableSelection } from "@/composables";
+  import ${entityName}API from "@/api/${moduleName}/${entityKebab}";
+  import type { ${entityName}Item, ${entityName}Form, ${entityName}QueryParams } from "@/types/api";
+
   defineOptions({
     name: "${entityName}",
     inheritAttrs: false,
   });
 
-  import ${entityName}API from "@/api/${moduleName}/${entityKebab}";
-  import type { ${entityName}Item, ${entityName}Form, ${entityName}QueryParams } from "@/types/api";
-
-  const queryFormRef = ref();
-  const dataFormRef = ref();
+  const queryFormRef = ref<FormInstance>();
+  const dataFormRef = ref<FormInstance>();
 
   const loading = ref(false);
-  const removeIds = ref<string[]>([]);
   const total = ref(0);
 
   const queryParams = reactive<${entityName}QueryParams>({
     pageNum: 1,
     pageSize: 10,
-  });
+  } as ${entityName}QueryParams);
 
   // $!{businessName}表格数据
   const pageData = ref<${entityName}Item[]>([]);
@@ -298,10 +305,10 @@
   });
 
   // $!{businessName}表单数据
-  const formData = reactive<${entityName}Form>({});
+  const formData = reactive<${entityName}Form>({} as ${entityName}Form);
 
   // $!{businessName}表单校验规则
-  const rules = reactive({
+  const rules: FormRules = {
       #if($fieldConfigs)
           #foreach($fieldConfig in ${fieldConfigs})
               #if($fieldConfig.isShowInForm && $fieldConfig.isRequired)
@@ -309,49 +316,64 @@
               #end
           #end
       #end
-  });
+  };
+
+  const { selectedIds, hasSelection, handleSelectionChange } = useTableSelection<${entityName}Item>();
+
+  async function fetchList(): Promise<void> {
+    loading.value = true;
+    try {
+      const data = await ${entityName}API.getPage(queryParams);
+      pageData.value = data.list;
+      total.value = data.total ?? 0;
+    } finally {
+      loading.value = false;
+    }
+  }
 
   /** 查询$!{businessName} */
-  function handleQuery() {
-    loading.value = true;
-          ${entityName}API.getPage(queryParams)
-        .then((data) => {
-          pageData.value = data.list;
-          total.value = data.total ?? 0;
-        })
-        .finally(() => {
-          loading.value = false;
-        });
+  function handleQuery(): void {
+    queryParams.pageNum = 1;
+    fetchList();
   }
 
   /** 重置$!{businessName}查询 */
   function handleResetQuery() {
-    queryFormRef.value!.resetFields();
-    queryParams.pageNum = 1;
+    queryFormRef.value?.resetFields();
     handleQuery();
   }
 
-  /** 行复选框选中记录选中ID集合 */
-  function handleSelectionChange(selection: any) {
-    removeIds.value = selection.map((item: any) => String(item.id));
+  function openDialog(): void {
+    dialog.visible = true;
   }
 
-  /** 打开$!{businessName}弹窗 */
-  function handleOpenDialog(id?: string) {
-    dialog.visible = true;
-    if (id) {
-      dialog.title = "修改$!{businessName}";
-            ${entityName}API.getFormData(id).then((data) => {
-        Object.assign(formData, data);
-      });
-    } else {
-      dialog.title = "新增$!{businessName}";
-    }
+  function closeDialog(): void {
+    dialog.visible = false;
+    resetForm();
+  }
+
+  function resetForm(): void {
+    dataFormRef.value?.resetFields();
+    dataFormRef.value?.clearValidate();
+    formData.id = undefined;
+  }
+
+  async function handleCreateClick(): Promise<void> {
+    dialog.title = "新增$!{businessName}";
+    openDialog();
+  }
+
+  async function handleEditClick(id: string): Promise<void> {
+    dialog.title = "修改$!{businessName}";
+          ${entityName}API.getFormData(id).then((data) => {
+      Object.assign(formData, data);
+      openDialog();
+    });
   }
 
   /** 提交$!{businessName}表单 */
   function handleSubmit() {
-    dataFormRef.value.validate((valid: any) => {
+    dataFormRef.value?.validate((valid: any) => {
       if (valid) {
         loading.value = true;
         const id = formData.id;
@@ -359,7 +381,7 @@
                 ${entityName}API.update(id, formData)
               .then(() => {
                 ElMessage.success("修改成功");
-                handleCloseDialog();
+                closeDialog();
                 handleResetQuery();
               })
               .finally(() => (loading.value = false));
@@ -367,7 +389,7 @@
                 ${entityName}API.create(formData)
               .then(() => {
                 ElMessage.success("新增成功");
-                handleCloseDialog();
+                closeDialog();
                 handleResetQuery();
               })
               .finally(() => (loading.value = false));
@@ -376,17 +398,9 @@
     });
   }
 
-  /** 关闭$!{businessName}弹窗 */
-  function handleCloseDialog() {
-    dialog.visible = false;
-    dataFormRef.value.resetFields();
-    dataFormRef.value.clearValidate();
-    formData.id = undefined;
-  }
-
   /** 删除$!{businessName} */
   function handleDelete(id?: string) {
-    const ids = [id || removeIds.value].join(",");
+    const ids = [id || selectedIds.value].join(",");
     if (!ids) {
       ElMessage.warning("请勾选删除项");
       return;