企业微信和第三方平台功能增强

pom.xml

@@ -1,5 +1,7 @@
 <?xml version="1.0"?>
-<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0">
+<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
+         xmlns="http://maven.apache.org/POM/4.0.0">
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.github.binarywang</groupId>
   <artifactId>wx-java</artifactId>
@@ -120,10 +122,18 @@
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <httpclient.version>4.5.13</httpclient.version>
     <jetty.version>9.4.41.v20210516</jetty.version>
+    <spring.boot.version>2.3.12.RELEASE</spring.boot.version>
   </properties>
 
   <dependencyManagement>
     <dependencies>
+      <dependency>
+        <groupId>org.springframework.boot</groupId>
+        <artifactId>spring-boot-dependencies</artifactId>
+        <version>${spring.boot.version}</version>
+        <type>pom</type>
+        <scope>import</scope>
+      </dependency>
       <dependency>
         <groupId>com.github.binarywang</groupId>
         <artifactId>qrcode-utils</artifactId>
@@ -167,11 +177,6 @@
         <artifactId>commons-lang3</artifactId>
         <version>3.10</version>
       </dependency>
-      <dependency>
-        <groupId>org.slf4j</groupId>
-        <artifactId>slf4j-api</artifactId>
-        <version>1.7.30</version>
-      </dependency>
       <dependency>
         <groupId>com.thoughtworks.xstream</groupId>
         <artifactId>xstream</artifactId>
@@ -195,12 +200,6 @@
         <version>2.10.6</version>
         <scope>test</scope>
       </dependency>
-      <dependency>
-        <groupId>ch.qos.logback</groupId>
-        <artifactId>logback-classic</artifactId>
-        <version>1.2.3</version>
-        <scope>test</scope>
-      </dependency>
       <dependency>
         <groupId>com.google.inject</groupId>
         <artifactId>guice</artifactId>
@@ -243,7 +242,6 @@
         <version>1.1.0</version>
         <scope>test</scope>
       </dependency>
-
       <dependency>
         <groupId>redis.clients</groupId>
         <artifactId>jedis</artifactId>
@@ -263,19 +261,6 @@
         <optional>true</optional>
         <scope>provided</scope>
       </dependency>
-      <dependency>
-        <groupId>org.springframework.data</groupId>
-        <artifactId>spring-data-redis</artifactId>
-        <version>2.3.3.RELEASE</version>
-        <optional>true</optional>
-        <scope>provided</scope>
-      </dependency>
-      <dependency>
-        <groupId>org.projectlombok</groupId>
-        <artifactId>lombok</artifactId>
-        <version>1.18.8</version>
-        <scope>provided</scope>
-      </dependency>
       <dependency>
         <groupId>org.bouncycastle</groupId>
         <artifactId>bcpkix-jdk15on</artifactId>
@@ -425,6 +410,19 @@
           </execution>
         </executions>
       </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-source-plugin</artifactId>
+        <version>2.2.1</version>
+        <executions>
+          <execution>
+            <id>attach-sources</id>
+            <goals>
+              <goal>jar-no-fork</goal>
+            </goals>
+          </execution>
+        </executions>
+      </plugin>
     </plugins>
   </build>
 

spring-boot-starters/pom.xml

@@ -21,19 +21,18 @@
     <module>wx-java-pay-spring-boot-starter</module>
     <module>wx-java-open-spring-boot-starter</module>
     <module>wx-java-qidian-spring-boot-starter</module>
+    <module>wx-java-cp-spring-boot-starter</module>
+    <module>wx-java-base-spring-boot-starter</module>
   </modules>
 
   <dependencies>
     <dependency>
       <groupId>org.springframework.boot</groupId>
       <artifactId>spring-boot-autoconfigure</artifactId>
-      <version>${spring.boot.version}</version>
     </dependency>
     <dependency>
       <groupId>org.springframework.boot</groupId>
       <artifactId>spring-boot-configuration-processor</artifactId>
-      <version>${spring.boot.version}</version>
-      <optional>true</optional>
     </dependency>
     <dependency>
       <groupId>org.projectlombok</groupId>

spring-boot-starters/wx-java-base-spring-boot-starter/pom.xml

@@ -0,0 +1,68 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+  <parent>
+    <artifactId>wx-java-spring-boot-starters</artifactId>
+    <groupId>com.github.binarywang</groupId>
+    <version>4.1.8.B</version>
+  </parent>
+  <modelVersion>4.0.0</modelVersion>
+
+  <name>WxJava - Spring Boot Starter for basic</name>
+  <artifactId>wx-java-base-spring-boot-starter</artifactId>
+
+  <properties>
+    <maven.compiler.source>8</maven.compiler.source>
+    <maven.compiler.target>8</maven.compiler.target>
+  </properties>
+
+  <dependencies>
+    <dependency>
+      <groupId>org.springframework.boot</groupId>
+      <artifactId>spring-boot-starter-web</artifactId>
+      <exclusions>
+        <exclusion>
+          <artifactId>spring-boot-starter-tomcat</artifactId>
+          <groupId>org.springframework.boot</groupId>
+        </exclusion>
+      </exclusions>
+    </dependency>
+
+    <dependency>
+      <groupId>com.github.binarywang</groupId>
+      <artifactId>weixin-java-common</artifactId>
+      <version>${project.version}</version>
+    </dependency>
+
+    <dependency>
+      <groupId>org.springframework.boot</groupId>
+      <artifactId>spring-boot-starter-undertow</artifactId>
+    </dependency>
+
+    <dependency>
+      <groupId>org.springframework.boot</groupId>
+      <artifactId>spring-boot-starter-aop</artifactId>
+    </dependency>
+
+  </dependencies>
+
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-source-plugin</artifactId>
+        <version>2.2.1</version>
+        <executions>
+          <execution>
+            <id>attach-sources</id>
+            <goals>
+              <goal>jar-no-fork</goal>
+            </goals>
+          </execution>
+        </executions>
+      </plugin>
+    </plugins>
+  </build>
+
+</project>

spring-boot-starters/wx-java-base-spring-boot-starter/src/main/java/com/binarywang/spring/starter/wxjava/base/annotation/WxHandler.java

@@ -0,0 +1,21 @@
+package com.binarywang.spring.starter.wxjava.base.annotation;
+
+import org.springframework.core.annotation.AliasFor;
+import org.springframework.stereotype.Component;
+import org.springframework.stereotype.Indexed;
+
+import java.lang.annotation.*;
+
+/**
+ * @author caiqy
+ */
+@Target({ElementType.TYPE})
+@Retention(RetentionPolicy.RUNTIME)
+@Documented
+@Indexed
+@Component
+public @interface WxHandler {
+
+  @AliasFor(annotation = Component.class)
+  String value() default "";
+}

spring-boot-starters/wx-java-base-spring-boot-starter/src/main/java/com/binarywang/spring/starter/wxjava/base/bean/WxCommonResult.java

@@ -0,0 +1,34 @@
+package com.binarywang.spring.starter.wxjava.base.bean;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.io.Serializable;
+
+/**
+ * @author caiqy
+ * @date 2021/9/2
+ */
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class WxCommonResult implements Serializable {
+  private static final long serialVersionUID = -1L;
+
+  /**
+   * 微信错误码
+   */
+  private int code;
+
+  /**
+   * 微信错误信息
+   */
+  private String message;
+
+  /**
+   * 是否成功
+   */
+  private boolean success;
+
+}

spring-boot-starters/wx-java-base-spring-boot-starter/src/main/java/com/binarywang/spring/starter/wxjava/base/exception/WxExceptionTranslator.java

@@ -0,0 +1,38 @@
+package com.binarywang.spring.starter.wxjava.base.exception;
+
+import com.binarywang.spring.starter.wxjava.base.bean.WxCommonResult;
+import lombok.AllArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import me.chanjar.weixin.common.error.WxErrorException;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnWebApplication;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.core.Ordered;
+import org.springframework.core.annotation.Order;
+import org.springframework.http.HttpStatus;
+import org.springframework.web.bind.annotation.ExceptionHandler;
+import org.springframework.web.bind.annotation.ResponseStatus;
+import org.springframework.web.bind.annotation.RestControllerAdvice;
+import org.springframework.web.servlet.DispatcherServlet;
+
+import javax.servlet.Servlet;
+
+/**
+ * @author caiqy
+ * @date 2021/9/2
+ */
+@Slf4j
+@Order(Ordered.HIGHEST_PRECEDENCE)
+@Configuration
+@RestControllerAdvice
+@AllArgsConstructor
+@ConditionalOnClass({Servlet.class, DispatcherServlet.class})
+@ConditionalOnWebApplication(type = ConditionalOnWebApplication.Type.SERVLET)
+public class WxExceptionTranslator {
+
+  @ExceptionHandler(WxErrorException.class)
+  @ResponseStatus(HttpStatus.OK)
+  public WxCommonResult handleCustomWxError(WxErrorException e) {
+    return new WxCommonResult(e.getError().getErrorCode(), e.getError().getErrorMsg(), false);
+  }
+}

spring-boot-starters/wx-java-base-spring-boot-starter/src/main/java/com/binarywang/spring/starter/wxjava/base/util/CheckedConsumer.java

@@ -0,0 +1,40 @@
+/*
+ * Copyright (c) 2019-2029, Dreamlu 卢春梦 (596392912@qq.com & www.dreamlu.net).
+ * <p>
+ * Licensed under the GNU LESSER GENERAL PUBLIC LICENSE 3.0;
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * <p>
+ * http://www.gnu.org/licenses/lgpl.html
+ * <p>
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.binarywang.spring.starter.wxjava.base.util;
+
+import org.springframework.lang.Nullable;
+
+import java.io.Serializable;
+
+/**
+ * 受检的 Consumer
+ *
+ * @author L.cm
+ */
+@FunctionalInterface
+public interface CheckedConsumer<T> extends Serializable {
+
+  /**
+   * Run the Consumer
+   *
+   * @param t T
+   * @throws Throwable UncheckedException
+   */
+  @Nullable
+  void accept(@Nullable T t) throws Throwable;
+
+}