提交

yshop-server/Dockerfile

@@ -7,7 +7,7 @@ RUN mkdir -p /yshop-server
 WORKDIR /yshop-server
 ## 将后端项目的 Jar 文件，复制到镜像中
 COPY ./target/yshop-server.jar app.jar
-
+COPY ./src/main/resources/cert/apiclient_cert.p12 apiclient_cert.p12
 ## 设置 TZ 时区
 ## 设置 JAVA_OPTS 环境变量，可通过 docker run -e "JAVA_OPTS=" 进行覆盖
 ENV TZ=Asia/Shanghai JAVA_OPTS="-Xms512m -Xmx512m"

yshop-server/pom.xml

@@ -21,11 +21,11 @@
     <url>https://github.com/guchengwuyue/yshop-pro</url>
 
     <dependencies>
-<!--        <dependency>-->
-<!--            <groupId>co.yixiang.boot</groupId>-->
-<!--            <artifactId>yshop-module-member-biz</artifactId>-->
-<!--            <version>${revision}</version>-->
-<!--        </dependency>-->
+        <!--        <dependency>-->
+        <!--            <groupId>co.yixiang.boot</groupId>-->
+        <!--            <artifactId>yshop-module-member-biz</artifactId>-->
+        <!--            <version>${revision}</version>-->
+        <!--        </dependency>-->
         <dependency>
             <groupId>co.yixiang.boot</groupId>
             <artifactId>yshop-module-system-biz</artifactId>
@@ -70,21 +70,21 @@
         </dependency>
 
         <!-- 商城相关模块。默认注释，保证编译速度 -->
-<!--        <dependency>-->
-<!--            <groupId>co.yixiang.boot</groupId>-->
-<!--            <artifactId>yshop-module-product-biz</artifactId>-->
-<!--            <version>${revision}</version>-->
-<!--        </dependency>-->
+        <!--        <dependency>-->
+        <!--            <groupId>co.yixiang.boot</groupId>-->
+        <!--            <artifactId>yshop-module-product-biz</artifactId>-->
+        <!--            <version>${revision}</version>-->
+        <!--        </dependency>-->
         <dependency>
             <groupId>co.yixiang.boot</groupId>
             <artifactId>yshop-module-shop-biz</artifactId>
             <version>${revision}</version>
         </dependency>
-<!--        <dependency>-->
-<!--            <groupId>co.yixiang.boot</groupId>-->
-<!--            <artifactId>yshop-module-cart-biz</artifactId>-->
-<!--            <version>${revision}</version>-->
-<!--        </dependency>-->
+        <!--        <dependency>-->
+        <!--            <groupId>co.yixiang.boot</groupId>-->
+        <!--            <artifactId>yshop-module-cart-biz</artifactId>-->
+        <!--            <version>${revision}</version>-->
+        <!--        </dependency>-->
         <dependency>
             <groupId>co.yixiang.boot</groupId>
             <artifactId>yshop-module-order-biz</artifactId>
@@ -130,7 +130,24 @@
                     </execution>
                 </executions>
             </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-surefire-plugin</artifactId>
+                <configuration>
+                    <!--跳过项目运行测试用例-->
+                    <skipTests>true</skipTests>
+                </configuration>
+            </plugin>
         </plugins>
+        <!--<resources>
+            <resource>
+                <directory>src/main/resources</directory>
+                &lt;!&ndash; 资源根目录排除各环境的配置，使用单独的资源目录来指定 &ndash;&gt;
+                <includes>
+                    <include>cert/**</include>
+                </includes>
+            </resource>
+        </resources>-->
     </build>
 
 </project>

yshop-server/src/main/resources/application-local.yaml

@@ -44,35 +44,36 @@ spring:
       primary: master
       datasource:
         master:
-          name: yshop-pro
-          url: jdbc:mysql://127.0.0.1:3306/${spring.datasource.dynamic.datasource.master.name}?useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true # MySQL Connector/J 8.X 连接的示例
+          name: yshop_pro_dev
+          url: jdbc:mysql://127.0.0.1:3306/${spring.datasource.dynamic.datasource.master.name}?useSSL=false&rewriteBatchedStatements=true&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true
+          #  url: jdbc:mysql://127.0.0.1:3306/${spring.datasource.dynamic.datasource.master.name}?useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true # MySQL Connector/J 8.X 连接的示例
           #          url: jdbc:mysql://127.0.0.1:3306/${spring.datasource.dynamic.datasource.master.name}?useSSL=false&allowPublicKeyRetrieval=true&useUnicode=true&characterEncoding=UTF-8&serverTimezone=CTT # MySQL Connector/J 5.X 连接的示例
           #          url: jdbc:postgresql://127.0.0.1:5432/${spring.datasource.dynamic.datasource.slave.name} # PostgreSQL 连接的示例
           #          url: jdbc:oracle:thin:@127.0.0.1:1521:xe # Oracle 连接的示例
           #          url: jdbc:sqlserver://127.0.0.1:1433;DatabaseName=${spring.datasource.dynamic.datasource.master.name} # SQLServer 连接的示例
           username: root
-          password: root
+          password: a6ID9^3%7kD
         #          username: sa
         #          password: JSm:g(*%lU4ZAkz06cd52KqT3)i1?H7W
         slave: # 模拟从库，可根据自己需要修改
-          name: yshop-pro
-          url: jdbc:mysql://127.0.0.1:3306/${spring.datasource.dynamic.datasource.slave.name}?useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true # MySQL Connector/J 8.X 连接的示例
+          name: yshop_pro_dev_slave
+          url: jdbc:mysql://127.0.0.1:3306/${spring.datasource.dynamic.datasource.master.name}?useSSL=false&rewriteBatchedStatements=true&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true
+          # url: jdbc:mysql://127.0.0.1:3306/${spring.datasource.dynamic.datasource.slave.name}?useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true # MySQL Connector/J 8.X 连接的示例
           #          url: jdbc:mysql://127.0.0.1:3306/${spring.datasource.dynamic.datasource.slave.name}?useSSL=false&allowPublicKeyRetrieval=true&useUnicode=true&characterEncoding=UTF-8&serverTimezone=CTT # MySQL Connector/J 5.X 连接的示例
           #          url: jdbc:postgresql://127.0.0.1:5432/${spring.datasource.dynamic.datasource.slave.name} # PostgreSQL 连接的示例
           #          url: jdbc:oracle:thin:@127.0.0.1:1521:xe # Oracle 连接的示例
           #          url: jdbc:sqlserver://127.0.0.1:1433;DatabaseName=${spring.datasource.dynamic.datasource.slave.name} # SQLServer 连接的示例
           username: root
-          password: root
+          password: a6ID9^3%7kD
   #          username: sa
   #          password: JSm:g(*%lU4ZAkz06cd52KqT3)i1?H7W
 
   # Redis 配置。Redisson 默认的配置足够使用，一般不需要进行调优
   redis:
     host: 127.0.0.1 # 地址
-    port: 6379 # 端口
-    database: 0 # 数据库索引
+    port: 23719 # 端口
+    database: 11 # 数据库索引
 #    password: dev # 密码，建议生产环境开启
-
 --- #################### 定时任务相关配置 ####################
 
 # Quartz 配置项，对应 QuartzProperties 配置类
@@ -180,6 +181,26 @@ wx:
       key-prefix: wa # Redis Key 的前缀 TODO yshop：解决下 Redis key 管理的配置
       http-client-type: HttpClient # 采用 HttpClient 请求微信公众号平台
 
+--- #微信支付配置
+weixin:
+  #小程序appid
+  appid:
+  #APP端的appid
+  app_appid:
+  #小程序秘钥
+  secret:
+  #商户号
+  mchid:
+  #证书路径
+  certurl:
+  #订单取消退款回调地址
+  order_refund_notifyurl:
+  #APP回调地址
+  app_notifyurl:
+  #商户秘钥
+  key:
+  #h5支付之后跳转地址
+  redirect_url: http://localhost:8080/
 --- #################### yshop相关配置 ####################
 
 # yshop配置项，设置当前项目所有自定义的配置
@@ -198,6 +219,10 @@ yshop:
   error-code: # 错误码相关配置项
     enable: false
   demo: false # 关闭演示模式
+  sms-code:
+    api-key: LTAI5tBBPdRd4f2YZt5UhVjF
+    api-secret: iVP7EsjX309epI7MqsScziGhcrEHiT
+
 
 justauth:
   enabled: true

yshop-server/src/main/resources/application.yaml

@@ -195,6 +195,8 @@ yshop:
     send-maximum-quantity-per-day: 10
     begin-code: 9999 # 这里配置 9999 的原因是，测试方便。
     end-code: 9999 # 这里配置 9999 的原因是，测试方便。
+    api-key: LTAI5tBBPdRd4f2YZt5UhVjF
+    api-secret: iVP7EsjX309epI7MqsScziGhcrEHiT
   trade:
     order:
       app-id: 1 # 商户编号