update

身份证校验方式

tr-modules/tr-module-smartFollowUp/src/main/java/cn/tr/module/smart/web/controller/BizWxUserController.java

@@ -1,84 +0,0 @@
-package cn.tr.module.smart.web.controller;
-
-import cn.dev33.satoken.annotation.SaCheckLogin;
-import cn.tr.module.api.sys.log.enums.LoginType;
-import cn.tr.module.sys.oauth2.LoginTypeConstant;
-import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
-import cn.dev33.satoken.annotation.SaCheckPermission;
-import cn.tr.core.validation.Insert;
-import cn.tr.core.validation.Update;
-import cn.tr.core.pojo.CommonResult;
-import lombok.AllArgsConstructor;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RestController;
-import cn.tr.module.smart.common.dto.BizWxUserDTO;
-import cn.tr.module.smart.common.service.IBizWxUserService;
-import cn.tr.module.smart.common.dto.BizWxUserQueryDTO;
-import java.util.*;
-import cn.tr.plugin.mybatis.base.BaseController;
-import org.springframework.web.bind.annotation.*;
-import cn.tr.module.api.sys.log.annotation.OperateLog;
-import cn.tr.core.pojo.TableDataInfo;
-/**
- * 微信用户控制器
- *
- * @author lf
- * @date  2025/05/23 14:03
- */
-@Api(tags = "微信用户")
-@RestController
-@RequestMapping("/web/wxUser")
-@AllArgsConstructor
-@SaCheckLogin(type = LoginTypeConstant.WEB)
-public class BizWxUserController extends BaseController{
-
-    private final IBizWxUserService bizWxUserService;
-
-    @ApiOperationSupport(author = "lf",order = 1)
-    @ApiOperation(value="根据条件查询微信用户",notes = "权限： 无")
-    @PostMapping("/query/page")
-    public TableDataInfo<BizWxUserDTO> selectList(@RequestBody BizWxUserQueryDTO query) {
-        startPage();
-        return getDataTable(bizWxUserService.selectBizWxUserList(query));
-    }
-
-    @ApiOperationSupport(author = "lf",order = 2)
-    @ApiOperation(value = "根据id查询微信用户",notes = "权限： wx:wxuser:query")
-    @GetMapping("/detail/{id}")
-    @SaCheckPermission("wx:wxuser:query")
-    public CommonResult<BizWxUserDTO> findById(@PathVariable("id") String id){
-        return CommonResult.success(bizWxUserService.selectBizWxUserById(id));
-    }
-
-    @ApiOperationSupport(author = "lf",order = 3)
-    @ApiOperation(value="添加微信用户",notes = "权限： wx:wxuser:add")
-    @PostMapping("/add")
-    @OperateLog
-    @SaCheckPermission("wx:wxuser:add")
-    public CommonResult<Boolean> add(@RequestBody@Validated(Insert.class) BizWxUserDTO source) {
-        return CommonResult.success(bizWxUserService.insertBizWxUser(source));
-    }
-
-    @ApiOperationSupport(author = "lf",order = 4)
-    @ApiOperation(value="通过主键id编辑微信用户",notes = "权限： wx:wxuser:edit")
-    @PostMapping("/edit")
-    @OperateLog
-    @SaCheckPermission("wx:wxuser:edit")
-    public CommonResult<Boolean> edit(@RequestBody@Validated(Update.class) BizWxUserDTO source) {
-        return CommonResult.success(bizWxUserService.updateBizWxUserById(source));
-    }
-
-    @ApiOperationSupport(author = "lf",order = 5)
-    @ApiOperation(value="删除微信用户",notes = "权限： wx:wxuser:remove")
-    @PostMapping("/removeByIds")
-    @OperateLog
-    @SaCheckPermission("wx:wxuser:remove")
-    public CommonResult<Integer> delete(@RequestBody Collection<String> ids) {
-        return CommonResult.success(bizWxUserService.removeBizWxUserByIds(ids));
-    }
-}

tr-modules/tr-module-system/pom.xml

@@ -114,5 +114,10 @@
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-aop</artifactId>
         </dependency>
+
+        <dependency>
+            <groupId>com.github.binarywang</groupId>
+            <artifactId>weixin-java-mp</artifactId>
+        </dependency>
     </dependencies>
 </project>

tr-modules/tr-module-system/src/main/java/cn/tr/module/sys/tenant/controller/SysTenantController.java

@@ -1,6 +1,7 @@
 package cn.tr.module.sys.tenant.controller;
 
 import cn.dev33.satoken.annotation.SaCheckPermission;
+import cn.hutool.core.util.URLUtil;
 import cn.tr.core.annotation.TenantIgnore;
 import cn.tr.core.pojo.CommonResult;
 import cn.tr.core.strategy.LoginUserStrategy;
@@ -16,6 +17,7 @@ import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.AllArgsConstructor;
+import me.chanjar.weixin.mp.api.WxMpService;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
@@ -33,6 +35,7 @@ import java.util.List;
 public class SysTenantController extends BaseController{
 
     private final ISysTenantService sysTenantService;
+    private final WxMpService wxMpService;
 
     @ApiOperationSupport(author = "lf",order = 1)
     @ApiOperation(value="根据条件查询医院列表(超管)",notes = "权限： 无")
@@ -85,9 +88,11 @@ public class SysTenantController extends BaseController{
     }
 
     @ApiOperationSupport(author = "lf",order = 4)
-    @ApiOperation(value="查询医院的小程序二维码",notes = "权限： 无")
-    @PostMapping("/queryQCode/{tenantId}")
-    public CommonResult<String> edit(@PathVariable("tenantId") String tenantId) {
-        return CommonResult.success(null);
+    @ApiOperation(value="查询当前医院的小程序二维码",notes = "权限： 无")
+    @PostMapping("/queryQCode/current")
+    public CommonResult<String> edit() {
+        String tenantId = LoginUserStrategy.tr.getTenantId();
+        String url="https://open.weixin.qq.com/sns/getexpappinfo?appid=%d&path=pages/login/login.html?tenantId=%d#wechat-redirect";
+        return CommonResult.success(URLUtil.encode(String.format(url,wxMpService.getWxMpConfigStorage().getAppId(),tenantId)));
     }
-}
+}

tr-test/src/main/resources/application-dev.yml

@@ -44,9 +44,9 @@ wx:
   mp:
     configs:
       - appid: wxf51eb892af67a9f6
-        secret: 016d9f879d40ade7a4f094f39a49f8d7  #微信小程序的Secret
-        token: smart #微信小程序消息服务器配置的token
-        aesKey: 1elyDzYtcnefWgXzhjpMWb9tm1c3ArChNLVWlIp2Oe3 #微信小程序消息服务器配置的EncodingAESKey
+        secret: 016d9f879d40ade7a4f094f39a49f8d7  #微信公众号的Secret
+        token: smart #微信公众号消息服务器配置的token
+        aesKey: 1elyDzYtcnefWgXzhjpMWb9tm1c3ArChNLVWlIp2Oe3 #微信公众号消息服务器配置的EncodingAESKey
 
 # 添加aliyun配置
 aliyun: