diff --git a/src/main/java/com/example/mini_program/service/AppointmentService.java b/src/main/java/com/example/mini_program/service/AppointmentService.java index fd6dbcb..b9e9ec3 100644 --- a/src/main/java/com/example/mini_program/service/AppointmentService.java +++ b/src/main/java/com/example/mini_program/service/AppointmentService.java @@ -35,6 +35,9 @@ public class AppointmentService { @Value("${wx.corp.creator-userid:}") private String creatorUserId; + @Value("${wx.corp.approval-userid:}") + private String approvalUserId; + /** * 根据openid获取最新的一条预约记录 */ @@ -73,7 +76,7 @@ public class AppointmentService { record.setStatusText("待审核"); // 发起企业微信审批 try { - String spNo = wxApprovalService.submitApproval(creatorUserId,record); + String spNo = wxApprovalService.submitApproval(creatorUserId, approvalUserId, record); record.setSpNo(spNo); log.info("企业微信审批提交成功, spNo: {}", spNo); } catch (Exception e) { diff --git a/src/main/java/com/example/mini_program/service/WxApprovalService.java b/src/main/java/com/example/mini_program/service/WxApprovalService.java index 9a8cf89..af44538 100644 --- a/src/main/java/com/example/mini_program/service/WxApprovalService.java +++ b/src/main/java/com/example/mini_program/service/WxApprovalService.java @@ -51,7 +51,7 @@ public class WxApprovalService { /** * 提交审批申请 */ - public String submitApproval(String creatorUserId, VisitApplication record) { + public String submitApproval(String creatorUserId, String approvalUserId, VisitApplication record) { String url = String.format(SUBMIT_URL, getAccessToken()); Map body = new HashMap<>(); @@ -59,7 +59,7 @@ public class WxApprovalService { body.put("template_id", wxCorpConfig.getApprovalTemplateId()); body.put("use_template_approver", 0); body.put("approver", List.of( - Map.of("attr", 1, "userid", List.of(record.getPersonId())) + Map.of("attr", 1, "userid", List.of(approvalUserId)) )); body.put("apply_data", buildApplyData(record)); body.put("summary_list", buildSummaryList(record.getName(), record.getReason())); diff --git a/src/main/java/com/example/mini_program/service/WxSubscribeMessageService.java b/src/main/java/com/example/mini_program/service/WxSubscribeMessageService.java index 418eb7d..b6b7c20 100644 --- a/src/main/java/com/example/mini_program/service/WxSubscribeMessageService.java +++ b/src/main/java/com/example/mini_program/service/WxSubscribeMessageService.java @@ -68,7 +68,7 @@ public class WxSubscribeMessageService { body.put("page", "pages/records/records"); body.put("data", data); //跳转小程序类型:developer为开发版;trial为体验版;formal为正式版;默认为正式版 - body.put("miniprogram_state", "trial"); + body.put("miniprogram_state", "formal"); body.put("lang", "zh_CN"); try { diff --git a/src/main/resources/application_formal.yml b/src/main/resources/application_formal.yml new file mode 100644 index 0000000..a62fcbe --- /dev/null +++ b/src/main/resources/application_formal.yml @@ -0,0 +1,55 @@ +server: + port: 8091 + ssl: + enabled: true + key-store: classpath:bmser.com.pfx + key-store-type: PKCS12 + key-store-password: zl7cs0dp + protocol: TLS + enabled-protocols: TLSv1.2,TLSv1.3 + +spring: + application: + name: mini_program + datasource: + url: jdbc:mysql://127.0.0.1:3306/mini?useUnicode=true&characterEncoding=utf8&useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true + username: root + password: 271922abf + driver-class-name: com.mysql.cj.jdbc.Driver + +# 微信小程序配置 +wx: + miniapp: + # 小程序的应用id,小程序开发管理 + appid: wx4286144359eeafe5 + secret: 5abacb8a93e864dabc13b09006aefdc1 + subscribe-template-id: EF5CDtuZwrGbt8iyOoi-sY7J6hZamX0AbWPLoK-qnEw + env: develop # 环境版本: release(正式版), trial(体验版), develop(开发版) + token-type: stable # token类型: standard(标准版), stable(稳定版) + token-expire-buffer: 300 # token提前过期缓冲时间(秒) + corp: # 企业ID + corpid: wwe22ebc930200694e + # 应用Secret + corpsecret: _CgfvRdJRZ713k5lVey2_7Qdrb0JD3HkmR_mesn0144 + # 访客预约审批模板ID + approval-template-id: C4ejArCjiUifaVKyMEEwpcssEbLxKjqMtn5SrHW2t + # 审批申请人用户ID(提交审批的企微用户) + creator-userid: systemservice + # 访客预约审批人用户ID(审批的企微用户) + approval-userid: ChengLiJuan + # 访客预约应用AgentId(用于发送应用消息) + agentid: 1000084 + # 【访客预约】token + token: 3ZnkI0zGML7rL + # 【访客预约】EncodingAESKey + encodingAESKey: TLtEXX7Nfm3Tu5rx1bSAvbtNlMx9ud8qhTQQurXEfQH + +# MyBatis配置 +mybatis: + mapper-locations: classpath:mapper/*.xml + type-aliases-package: com.example.mini_program.entity + configuration: + map-underscore-to-camel-case: true + log-impl: org.apache.ibatis.logging.stdout.StdOutImpl + +# 企业微信配置 \ No newline at end of file