1.调整pom中jar包，将poi移到picc-common中。

picc-admin-server/pom.xml

@@ -165,8 +165,9 @@
             <id>test</id>
             <dependencies>
                 <dependency>
-                    <groupId>org.springframework.boot</groupId>
-                    <artifactId>spring-boot-starter-tomcat</artifactId>
+                    <groupId>javax.servlet</groupId>
+                    <artifactId>javax.servlet-api</artifactId>
+                    <version>3.1.0</version>
                     <scope>provided</scope>
                 </dependency>
             </dependencies>
@@ -181,8 +182,10 @@
             </properties>
             <dependencies>
                 <dependency>
-                    <groupId>org.springframework.boot</groupId>
-                    <artifactId>spring-boot-starter-tomcat</artifactId>
+                    <groupId>javax.servlet</groupId>
+                    <artifactId>javax.servlet-api</artifactId>
+                    <version>3.1.0</version>
+                    <scope>provided</scope>
                 </dependency>
             </dependencies>
         </profile>

picc-admin-server/src/main/resources/application-production.yml

@@ -1,50 +1,38 @@
 spring:
   datasource:
-    url: jdbc:log4jdbc:mysql://10.10.0.2:3306/electricity-payment?autoReconnect=true&characterEncoding=utf8&serverTimezone=GMT%2B8
+    url: jdbc:log4jdbc:mysql://hbjpsoft.mysql.rds.aliyuncs.com:3306/picc?autoReconnect=true&characterEncoding=utf8&serverTimezone=GMT%2B8
     username: picc
-    password: picc
+    password: picc@8121234
   devtools:
     restart:
       enabled: true
   redis:
     # Redis数据库索引（默认为0）
-    database: 5
+    database: 3
     # Redis服务器地址
     host: 127.0.0.1
     # Redis服务器连接端口
     port: 6379
+    # 密码
+    password: jp123456
 
 logger:
   level: WARN
-  dir: E:\\picc\\logs
-
-netty:
-  port: 9966    #监听端口
+  dir: /opt/picc/logs/picc-admin-server
 
 springfox:
   documentation:
     swagger:
       v2:
-        host: www.wzgh.org
+        host: picc.jzrccs.com
 
-wx:
-  pay:
-    appId: wxe598c699aa68cffe
-    appSecret: ea20d2e9a36aace26b4f7654218129af
-    mchId: 1500160622
-    subMchId: 1505070291
-    mchKey: jpsoft11111111111111111111111111
-    notifyUrl: http://www.wzgh.org/picc-server/wxPay/payNotify
-    ip: 122.228.31.242
+pdf:
+  logoUrl: /opt/picc/images/logo.png
+  outputPath: /opt/picc/files
 
-alipay:
-  serviceUrl: https://openapi.alipaydev.com/gateway.do
-  appId: 2016080600180410
-  publicKey: MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAzMBfmTqqpt4dMcuz8DpyrEtruu/G7+Gvkd0j99QX4mzcRLx4Wg9IicOIiZGSdgzLMKIxBmk0eKiqqbuBjOsrS/XU+SvsTNlT1O/ZY0w30HEWrb/pvmo58HSY76cevWqLqW19+fUax7HG811mF4lq4YkHNAWArqByEjoFYbKHbtqS0ReXFJ9SE5TaqZSVOieiu3bYPkw5HEGmnYZMhWH3Gvt6tK2peLSM8mEMY5qp3zlGew3sq1KtcDkvO2UCuAmEkAnCDZ1zoYYt45cvcmwaHozGKHGOtOe0EAitpZyLZW3dP5/yBFfWk+MdaA1kZe5gNr8ePY5ht+Sd+DizMEINiQIDAQAB
-  privateKey: MIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQDMwF+ZOqqm3h0xy7PwOnKsS2u678bv4a+R3SP31BfibNxEvHhaD0iJw4iJkZJ2DMswojEGaTR4qKqpu4GM6ytL9dT5K+xM2VPU79ljTDfQcRatv+m+ajnwdJjvpx69aoupbX359RrHscbzXWYXiWrhiQc0BYCuoHISOgVhsodu2pLRF5cUn1ITlNqplJU6J6K7dtg+TDkcQaadhkyFYfca+3q0ral4tIzyYQxjmqnfOUZ7DeyrUq1wOS87ZQK4CYSQCcINnXOhhi3jly9ybBoejMYocY6057QQCK2lnItlbd0/n/IEV9aT4x1oDWRl7mA2vx49jmG35J34OLMwQg2JAgMBAAECggEBALpSXSxdPKn4+ew0iJwVNAEh6PkF9ayZXWGJMY/2y31avt81+vdJbSMgcoFtnTAb2FN7ZM2Gsx8RrawjW3LXFmFbZeERXUlZg3YEhXhdBXWDU7XtLFIA7JSqJfn/xHNuH4Wgg8EQkLwkRP11gs/sVvzB63Ilh8Jhcyyu6/LJuYDfeXu/50sgkQn0xXjjJdwiez9iX//wraYYcWsSCCbwM3QZ0MRc3TCP04QfZsF+fnPM83/g2yzun8fmvB5zDtYhlHwau52CiZpTHOxCCkZx0tubVyPG9jmLJ8eg+/hIfOKzHi2HiNsOQlOgLj8inUkM2qW3JlU7VcHduB7MWjkDIAECgYEA6HLVEDDT61xQNIUbnBWQ0FpHBQjsG/388Uy/xKfchUkOfzA0kNId+Nrd3hhLtl3i7ta6KNu2vDNS5iEbg7SCVsgqBZ0enLLIrymyJ94pHbUeFTAqgP4pnoWglx3ttMsERCKcqt55NJY3gfLtVjBTgGgY1Kfxh9SYFC6CQ4v4V4kCgYEA4X8kv8vVg4ivoXk/gEsKXPYdXG6O3sClq7pf/kaecV0caV89rARXkDP324nLUMxvGKY0sNa373VhAFav4Hv3kGqrJ0NfEd/XiXXT3Zq3njN5V5xqjZZRsySimyFoBetYMTjN2dtPxTC/65OvQPC8BdHaSZDMQQQSFznKG9y4hgECgYEAieTFXIt6zB7BPcbQ8DEi7VcA1o3Kc3ii+wqKoMDr4u3J+c3BAUCEo0JDaCOFlrPvkbw0R1S//Ll9riNpzSHiSFUKCLaCmHa+8pqLo3b5cTQmmm8uZ8NfMTkYYU1R3HSrHThjNEIyKO4ME7zm6sBUaNJYGJ9gezG03hQRFr0MH/ECgYAKAXZD/Gtw9rO0WojyzGGdVl5fJ5i3UZ0ITbDMu510Mkl8c3ltFJQ+FdA9sZOP9kJHubhE0IJA4dh4B2CueVG22sTVbSvewyvxMYVBJAhZwLb1qD8iITVm2Y1NjOHswVCcfoTD0fNsMImTjm4MV6JAL9ubwA0QJXoYBbxuGBEoAQKBgDj0LpamjOv/gRDo96C8AKqACqWoHtVWvYaOrgsFVJWRsmkcrQu2nMHNyFlyJ1DcXbVkulILrUDth8+2jmbxrkmW+9Y8aX5vaKEmrNOOWiSgau3VxeJU+VedDYJl1IVpfs4k4ymMkkAGa1ZlMYHgeP20krHMzAn/NNeVvHUEXcR4
-  zfbPublicKey: MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAlU5CIAwwMmDnDPUHQaxiqZh2y6VE11DFTYVZygLEUbZuSCATO2fGkY8hv3fhLj8Wj+QT4kRfJrK+/v1QKcZ7a5UaoaASOPOGEf8X9p+lfuA863luUPiD+k4W6QMjOXoPdY4G4JC9lFe5FT05NqVYHXGIIqXTWSIqLyWDlv7elj8D1HS06H+ArzAjbSyR47IaKJCMnpqLGHJ6ZQGM+6DEcOpdZAULjhguZ891eTtawVndDOaYToCDK4MpW9mEifpKRB8JZptqr2zQhFBm7iADyMsIM1xwko2N6mKJYyYZJ9QzhTindSQBGw0Pbt1480iqeoQOHo+z0HPmikIsuiu65QIDAQAB
-  inputCharset: UTF-8
-  mchId: 2088102170202580
-  # appAuthToken: 201906BBbc7d6558596f4bbc9f056c01b8aebX48
-  signType: RSA2
-  notifyUrl: http://www.wzgh.org/picc-server/aliPay/payNotify
+weixin:
+  appId: wxf6af207d9143d1de
+  appSecret: c86c042923e72c61c76a3a8658349312
+  tokenUrl: "http://picc.jzrccs.com/weixin-middleware/token"
+  createQrCodeUrl: "http://picc.jzrccs.com/weixin-middleware/qrcode/create"
+  sendTmplMsgUrl: "https://api.weixin.qq.com/cgi-bin/message/template/send"

picc-common/pom.xml

@@ -8,23 +8,99 @@
         <version>1.0.0</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
-
     <artifactId>picc-common</artifactId>
+    <properties>
+        <poi.version>4.1.0</poi.version>
+    </properties>
+
     <dependencies>
+        <!-- apache poi -->
+        <dependency>
+            <groupId>org.apache.poi</groupId>
+            <artifactId>poi</artifactId>
+            <version>${poi.version}</version>
+            <scope>compile</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.poi</groupId>
+            <artifactId>poi-scratchpad</artifactId>
+            <version>${poi.version}</version>
+            <scope>compile</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.poi</groupId>
+            <artifactId>poi-ooxml</artifactId>
+            <version>${poi.version}</version>
+            <scope>compile</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.poi</groupId>
+            <artifactId>poi-ooxml-schemas</artifactId>
+            <version>${poi.version}</version>
+            <scope>compile</scope>
+        </dependency>
+        <dependency>
+            <groupId>fr.opensagres.xdocreport</groupId>
+            <artifactId>xdocreport</artifactId>
+            <version>1.0.6</version>
+            <scope>compile</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.poi</groupId>
+            <artifactId>ooxml-schemas</artifactId>
+            <version>1.3</version>
+            <scope>compile</scope>
+        </dependency>
+        <!-- apache poi end -->
+
+        <!-- aliyun oss start -->
+        <dependency>
+            <groupId>com.aliyun.oss</groupId>
+            <artifactId>aliyun-sdk-oss</artifactId>
+            <version>3.1.0</version>
+        </dependency>
+        <!-- aliyun oss end -->
+
+        <!-- 阿里大鱼短信jar包 start-->
+        <dependency>
+            <groupId>com.taobao</groupId>
+            <artifactId>taobao-sdk-java</artifactId>
+            <version>1.0.0</version>
+        </dependency>
+        <!-- 阿里大鱼短信jar包 end-->
+
+        <!--html转pdf start-->
+        <dependency>
+            <groupId>com.itextpdf</groupId>
+            <artifactId>itextpdf</artifactId>
+            <version>5.5.13</version>
+        </dependency>
+        <dependency>
+            <groupId>com.itextpdf</groupId>
+            <artifactId>itext-asian</artifactId>
+            <version>5.2.0</version>
+        </dependency>
+
+        <!--mysql pagehelper-->
         <dependency>
             <groupId>com.github.pagehelper</groupId>
             <artifactId>pagehelper-spring-boot-starter</artifactId>
             <version>LATEST</version>
         </dependency>
-        <dependency>
-            <groupId>org.apache.tomcat.embed</groupId>
-            <artifactId>tomcat-embed-core</artifactId>
-        </dependency>
+
         <!-- veloctiy -->
         <dependency>
             <groupId>org.apache.velocity</groupId>
             <artifactId>velocity</artifactId>
             <version>1.7</version>
         </dependency>
+
+
+        <dependency>
+            <groupId>javax.servlet</groupId>
+            <artifactId>javax.servlet-api</artifactId>
+            <version>3.1.0</version>
+            <scope>provided</scope>
+        </dependency>
     </dependencies>
 </project>

picc-enterprise-server/pom.xml

@@ -172,8 +172,9 @@
             <id>remote</id>
             <dependencies>
                 <dependency>
-                    <groupId>org.springframework.boot</groupId>
-                    <artifactId>spring-boot-starter-tomcat</artifactId>
+                    <groupId>javax.servlet</groupId>
+                    <artifactId>javax.servlet-api</artifactId>
+                    <version>3.1.0</version>
                     <scope>provided</scope>
                 </dependency>
             </dependencies>
@@ -185,8 +186,9 @@
             <id>test</id>
             <dependencies>
                 <dependency>
-                    <groupId>org.springframework.boot</groupId>
-                    <artifactId>spring-boot-starter-tomcat</artifactId>
+                    <groupId>javax.servlet</groupId>
+                    <artifactId>javax.servlet-api</artifactId>
+                    <version>3.1.0</version>
                     <scope>provided</scope>
                 </dependency>
             </dependencies>
@@ -201,8 +203,10 @@
             </properties>
             <dependencies>
                 <dependency>
-                    <groupId>org.springframework.boot</groupId>
-                    <artifactId>spring-boot-starter-tomcat</artifactId>
+                    <groupId>javax.servlet</groupId>
+                    <artifactId>javax.servlet-api</artifactId>
+                    <version>3.1.0</version>
+                    <scope>provided</scope>
                 </dependency>
             </dependencies>
         </profile>

picc-enterprise-server/src/main/resources/application-dev.yml

@@ -9,7 +9,8 @@ spring:
       enabled: true
 
 cas:
-  server-url-prefix: http://localhost:8080/cas-server
+#  server-url-prefix: http://localhost:8080/cas-server
+  server-url-prefix: http://gyxm.jing-zhou.gov.cn/jp-cloud-cas
   server-login-url: ${cas.server-url-prefix}/login
   client-host-url: http://localhost:7070
   # 如果不设则无法获取用户扩展信息
@@ -31,7 +32,6 @@ weixin:
   appSecret: 042fe6c9c970c1d9fe585dccfca89221
 #  appId: wxf6af207d9143d1de
 #  appSecret: c86c042923e72c61c76a3a8658349312
-  tokenUrl: "http://www.jzrccs.com/weixin-middleware/token"
-  createQrCodeUrl: "http://www.jzrccs.com/weixin-middleware/qrcode/create"
-  sendTmplMsgUrl: "https://api.weixin.qq.com/cgi-bin/message/template/send"
-  sendTmplId: "6CMGIpbgZLtqdr9xOdyEAlrCWXh8nJ260jRdktnv7vE"
+  tokenUrl: "http://picc.jzrccs.com/weixin-middleware/token"
+  createQrCodeUrl: "http://picc.jzrccs.com/weixin-middleware/qrcode/create"
+  sendTmplMsgUrl: "https://api.weixin.qq.com/cgi-bin/message/template/send"

picc-enterprise-server/src/main/resources/application-production.yml

@@ -0,0 +1,48 @@
+spring:
+  datasource:
+    url: jdbc:log4jdbc:mysql://hbjpsoft.mysql.rds.aliyuncs.com:3306/picc?autoReconnect=true&characterEncoding=utf8&serverTimezone=GMT%2B8
+    username: picc
+    password: picc@8121234
+  devtools:
+    restart:
+      enabled: true
+  redis:
+    # Redis数据库索引（默认为0）
+    database: 3
+    # Redis服务器地址
+    host: 127.0.0.1
+    # Redis服务器连接端口
+    port: 6379
+    # 密码
+    password: jp123456
+
+logger:
+  level: WARN
+  dir: /opt/picc/logs/picc-enterprise-server
+
+cas:
+  server-url-prefix: http://pay.huishouyou.com.cn/jp-cloud-cas
+  server-login-url: ${cas.server-url-prefix}/login
+  client-host-url: http://picc.jzrccs.com
+  # 如果不设则无法获取用户扩展信息
+  validation-type: cas
+
+jpcloud:
+  notifyBackUrl: http://picc.jzrccs.com/enterprise/pay/orderNotifyBack
+  synchroBackUrl: http://picc.jzrccs.com/enterprise/pay/paySuccess
+  jpcloudUrl: http://pay.huishouyou.com.cn/payment/tradingOrderPayPc
+  sellerSerialNumber: '000001000020'
+  platformCode: '0008'
+
+weixin:
+  appId: wxf6af207d9143d1de
+  appSecret: c86c042923e72c61c76a3a8658349312
+  tokenUrl: "http://picc.jzrccs.com/weixin-middleware/token"
+  createQrCodeUrl: "http://picc.jzrccs.com/weixin-middleware/qrcode/create"
+  sendTmplMsgUrl: "https://api.weixin.qq.com/cgi-bin/message/template/send"
+
+springfox:
+  documentation:
+    swagger:
+      v2:
+        host: picc.jzrccs.com

pom.xml

@@ -26,7 +26,6 @@
         <lombok.version>1.16.12</lombok.version>
         <hutool.version>5.0.6</hutool.version>
         <swagger2.version>2.7.0</swagger2.version>
-        <poi.version>4.1.0</poi.version>
     </properties>
 
     <dependencies>
@@ -69,74 +68,6 @@
         </dependency>
         <!-- swagger ui end-->
 
-        <!-- apache poi -->
-        <dependency>
-            <groupId>org.apache.poi</groupId>
-            <artifactId>poi</artifactId>
-            <version>${poi.version}</version>
-            <scope>compile</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.poi</groupId>
-            <artifactId>poi-scratchpad</artifactId>
-            <version>${poi.version}</version>
-            <scope>compile</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.poi</groupId>
-            <artifactId>poi-ooxml</artifactId>
-            <version>${poi.version}</version>
-            <scope>compile</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.poi</groupId>
-            <artifactId>poi-ooxml-schemas</artifactId>
-            <version>${poi.version}</version>
-            <scope>compile</scope>
-        </dependency>
-        <dependency>
-            <groupId>fr.opensagres.xdocreport</groupId>
-            <artifactId>xdocreport</artifactId>
-            <version>1.0.6</version>
-            <scope>compile</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.poi</groupId>
-            <artifactId>ooxml-schemas</artifactId>
-            <version>1.3</version>
-            <scope>compile</scope>
-        </dependency>
-        <!-- apache poi end -->
-
-        <!-- aliyun oss start -->
-        <dependency>
-            <groupId>com.aliyun.oss</groupId>
-            <artifactId>aliyun-sdk-oss</artifactId>
-            <version>3.1.0</version>
-        </dependency>
-        <!-- aliyun oss end -->
-
-        <!-- 阿里大鱼短信jar包 start-->
-        <dependency>
-            <groupId>com.taobao</groupId>
-            <artifactId>taobao-sdk-java</artifactId>
-            <version>1.0.0</version>
-        </dependency>
-        <!-- 阿里大鱼短信jar包 end-->
-
-
-        <!--html转pdf start-->
-        <dependency>
-            <groupId>com.itextpdf</groupId>
-            <artifactId>itextpdf</artifactId>
-            <version>5.5.13</version>
-        </dependency>
-        <dependency>
-            <groupId>com.itextpdf</groupId>
-            <artifactId>itext-asian</artifactId>
-            <version>5.2.0</version>
-        </dependency>
-
         <dependency>
             <groupId>org.apache.httpcomponents</groupId>
             <artifactId>httpclient</artifactId>

weixin-middleware/pom.xml

@@ -120,8 +120,10 @@
             <id>test</id>
             <dependencies>
                 <dependency>
-                    <groupId>org.springframework.boot</groupId>
-                    <artifactId>spring-boot-starter-tomcat</artifactId>
+                    <groupId>javax.servlet</groupId>
+                    <artifactId>javax.servlet-api</artifactId>
+                    <version>3.1.0</version>
+                    <scope>provided</scope>
                 </dependency>
             </dependencies>
             <properties>
@@ -135,8 +137,10 @@
             </properties>
             <dependencies>
                 <dependency>
-                    <groupId>org.springframework.boot</groupId>
-                    <artifactId>spring-boot-starter-tomcat</artifactId>
+                    <groupId>javax.servlet</groupId>
+                    <artifactId>javax.servlet-api</artifactId>
+                    <version>3.1.0</version>
+                    <scope>provided</scope>
                 </dependency>
             </dependencies>
         </profile>

weixin-middleware/src/main/java/com/jpsoft/weixin/callback/EventCallback.java

@@ -7,12 +7,15 @@ import org.apache.commons.lang3.StringUtils;
 import org.apache.http.HttpResponse;
 import org.apache.http.HttpStatus;
 import org.apache.http.NameValuePair;
+import org.apache.http.client.HttpClient;
+import org.apache.http.client.config.RequestConfig;
 import org.apache.http.client.entity.UrlEncodedFormEntity;
 import org.apache.http.client.methods.HttpPost;
 import org.apache.http.entity.StringEntity;
 import org.apache.http.impl.client.CloseableHttpClient;
 import org.apache.http.impl.client.HttpClientBuilder;
 import org.apache.http.message.BasicNameValuePair;
+import org.apache.http.params.CoreConnectionPNames;
 import org.apache.http.util.EntityUtils;
 
 import javax.servlet.http.HttpServletResponse;
@@ -46,7 +49,15 @@ public class EventCallback {
 
             HttpPost httpPost = new HttpPost(urlBuilder.toString());
 
-            CloseableHttpClient httpClient = HttpClientBuilder.create().build();
+            RequestConfig requestConfig = RequestConfig.custom()
+                    .setSocketTimeout(5000)
+                    .setConnectTimeout(5000)
+                    .setConnectionRequestTimeout(5000)
+                    .build();
+
+            CloseableHttpClient httpClient = HttpClientBuilder.create()
+                    .setDefaultRequestConfig(requestConfig)
+                    .build();
 
             List<NameValuePair> list = new ArrayList<NameValuePair>();
             list.add(new BasicNameValuePair("eventKey", eventKey));

weixin-middleware/src/main/java/com/jpsoft/weixin/controller/WeixinController.java

@@ -1,9 +1,6 @@
 package com.jpsoft.weixin.controller;
 
-import cn.hutool.core.date.DateTime;
 import cn.hutool.json.JSONObject;
-import cn.hutool.json.JSONUtil;
-import com.itextpdf.text.io.StreamUtil;
 import com.jpsoft.weixin.callback.EventCallback;
 import com.jpsoft.weixin.callback.PromotionCallback;
 import com.jpsoft.weixin.config.PICCAdminScanConfig;

weixin-middleware/src/main/resources/application-production.yml

@@ -3,12 +3,12 @@ spring:
     add-properties: false
     restart:
       enabled: true
-
+  redis:
+    password: jp123456
 logger:
   level: WARN
   dir: /opt/logs/weixin-middleware/
 
-
 weixin:
   token: weixin
   tokenUrl: "https://api.weixin.qq.com/cgi-bin/token"
@@ -21,12 +21,12 @@ qrcode:
     enterprise:
       scan:
         loginCode: "5000"
-        loginCallbackUrl: "http://gyxm.jing-zhou.gov.cn/picc-enterprise-test/qrcode/login/scan"
+        loginCallbackUrl: "http://picc.jzrccs.com/enterprise/qrcode/login/scan"
         bindingCode: "5001"
-        bindingCallbackUrl: "http://gyxm.jing-zhou.gov.cn/picc-enterprise-test/qrcode/binding/scan"
+        bindingCallbackUrl: "http://picc.jzrcss.com/enterprise/binding/scan"
     admin:
       scan:
         loginCode: "6000"
-        loginCallbackUrl: "http://gyxm.jing-zhou.gov.cn/picc-admin-server/pub/qrcode/login/scan"
+        loginCallbackUrl: "http://picc.jzrccs.com/picc-admin-server/pub/qrcode/login/scan"
         bindingCode: "6001"
-        bindingCallbackUrl: "http://gyxm.jing-zhou.gov.cn/picc-admin-server/pub/qrcode/binding/scan"
+        bindingCallbackUrl: "http://picc.jzrccs.com/picc-admin-server/pub/qrcode/binding/scan"