删除无用模块启动类，调整配置

2020-06-20 20:33:50 +08:00 · 2020-06-20 20:33:50 +08:00 · 678a4f8e6e
parent 0a369735d9
commit 678a4f8e6e
7 changed files with 66 additions and 98 deletions
--- a/dts-admin-api/src/main/java/com/qiguliuxing/dts/admin/api/Application.java
+++ b/dts-admin-api/src/main/java/com/qiguliuxing/dts/admin/api/Application.java
@ -6,8 +6,7 @@ import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.scheduling.annotation.EnableScheduling;
 import org.springframework.transaction.annotation.EnableTransactionManagement;

-@SpringBootApplication(scanBasePackages = { "com.qiguliuxing.dts.db", "com.qiguliuxing.dts.core",
-		"com.qiguliuxing.dts.admin" })
+@SpringBootApplication(scanBasePackages = { "com.qiguliuxing.dts.db", "com.qiguliuxing.dts.core","com.qiguliuxing.dts.admin" })
@MapperScan({ "com.qiguliuxing.dts.db.dao", "com.qiguliuxing.dts.db.dao.ex" })
@EnableTransactionManagement
@EnableScheduling
--- a/dts-core/src/main/java/com/qiguliuxing/dts/core/Application.java
+++ b/dts-core/src/main/java/com/qiguliuxing/dts/core/Application.java
@ -1,15 +0,0 @@
-package com.qiguliuxing.dts.core;
-
-import org.mybatis.spring.annotation.MapperScan;
-import org.springframework.boot.SpringApplication;
-import org.springframework.boot.autoconfigure.SpringBootApplication;
-
-@SpringBootApplication(scanBasePackages = { "com.qiguliuxing.dts.db", "com.qiguliuxing.dts.core" })
-@MapperScan("com.qiguliuxing.dts.db.dao")
-public class Application {
-
-	public static void main(String[] args) {
-		SpringApplication.run(Application.class, args);
-	}
-
-}
--- a/dts-core/src/main/resources/application-demo.yml
+++ b/dts-core/src/main/resources/application-demo.yml
@ -1,16 +1,16 @@
 dts:
  # 开发者应该设置成自己的wx相关信息
  wx:
-    app-id: xxxx
-    app-secret: xxx
-    mch-id: xxxx
-    mch-key: xxxx
+    app-id: wx4901b319ace4f88a
+    app-secret: 45bae4a701e7ec35bca38fdedxxxxxx
+    mch-id: 1538666666
+    mch-key: 1538xxxxxx-1538xxxxxx-1538xxxxxx
    notify-url: https://test.dtsshop.com/demo/order/dtsNotify
    # 商户证书文件路径
    # 请参考“商户证书”一节 https://pay.weixin.qq.com/wiki/doc/api/wxa/wxa_api.php?chapter=4_3
    key-path: xxxxx

- #通知相关配置
+  #通知相关配置
  notify:
    mail:
      # 邮件通知配置,邮箱一般用于接收业务通知例如收到新的订单，sendto 定义邮件接收者，通常为商城运营人员
@ -25,33 +25,33 @@ dts:
    # 短信息用于通知客户，例如发货短信通知，注意配置格式；template-name，template-templateId 请参考 NotifyType 枚举值
    sms:
      enable: true
-      appid: xxx
-      appkey: xxx
+      appid: 1400286323
+      appkey: 223123sade14c129c4ce9a30b5f90ad2c
      template:
-      - name: paySucceed
-        templateId: 112233
-      - name: captcha
-        templateId: 112233
-      - name: ship
-        templateId: 112233
-      - name: refund
-        templateId: 112233
+        - name: paySucceed
+          templateId: 112233
+        - name: captcha
+          templateId: 112233
+        - name: ship
+          templateId: 112233
+        - name: refund
+          templateId: 112233

    # 微信模版通知配置
    # 微信模版用于通知客户或者运营者，注意配置格式；template-name，template-templateId 请参考 NotifyType 枚举值
    wx:
      enable: true
      template:
-      - name: paySucceed
-        templateId: sirUcgTAIQfoIxxxxxx
-      - name: captcha
-        templateId: OfBkXh7UILpsDkcxxxxxx
-      - name: ship
-        templateId: dqTuWzrmL_wwK-SJsxxxxxx
-      - name: applyRefund
-        templateId: lzPHltMpUOiBol7i2Yxxxxxx
-      - name: refund
-        templateId: NDy6EpPuu2C9NMUxxxxxx
+        - name: paySucceed
+          templateId: sirUcgTAIQfoIxxxxxx
+        - name: captcha
+          templateId: OfBkXh7UILpsDkcxxxxxx
+        - name: ship
+          templateId: dqTuWzrmL_wwK-SJsxxxxxx
+        - name: applyRefund
+          templateId: lzPHltMpUOiBol7i2Yxxxxxx
+        - name: refund
+          templateId: NDy6EpPuu2C9NMUxxxxxx

  # 快鸟物流查询配置
  express:
@ -59,36 +59,36 @@ dts:
    appId: "xxxxxx"
    appKey: "xxxxxx"
    vendors:
-    - code: "HTKY"
-      name: "百世快递"
-    - code: "YZBK"
-      name: "邮政国内标快"
-    - code: "ZTO"
-      name: "中通快递"
-    - code: "YTO"
-      name: "圆通速递"
-    - code: "YD"
-      name: "韵达速递"
-    - code: "YZPY"
-      name: "邮政快递包裹"
-    - code: "EMS"
-      name: "EMS"
-    - code: "DBL"
-      name: "德邦快递"
-    - code: "FAST"
-      name: "快捷快递"
-    - code: "ZJS"
-      name: "宅急送"
-    - code: "TNT"
-      name: "TNT快递"
-    - code: "UPS"
-      name: "UPS"
-    - code: "DHL"
-      name: "DHL"
-    - code: "FEDEX"
-      name: "FEDEX联邦(国内件)"
-    - code: "FEDEX_GJ"
-      name: "FEDEX联邦(国际件)"
+      - code: "HTKY"
+        name: "百世快递"
+      - code: "YZBK"
+        name: "邮政国内标快"
+      - code: "ZTO"
+        name: "中通快递"
+      - code: "YTO"
+        name: "圆通速递"
+      - code: "YD"
+        name: "韵达速递"
+      - code: "YZPY"
+        name: "邮政快递包裹"
+      - code: "EMS"
+        name: "EMS"
+      - code: "DBL"
+        name: "德邦快递"
+      - code: "FAST"
+        name: "快捷快递"
+      - code: "ZJS"
+        name: "宅急送"
+      - code: "TNT"
+        name: "TNT快递"
+      - code: "UPS"
+        name: "UPS"
+      - code: "DHL"
+        name: "DHL"
+      - code: "FEDEX"
+        name: "FEDEX联邦(国内件)"
+      - code: "FEDEX_GJ"
+        name: "FEDEX联邦(国际件)"

  # 对象存储配置
  storage:
@ -118,7 +118,7 @@ dts:
      accessKey: 111111
      secretKey: xxxxxx
      bucketName: dts
-      
+
 pagehelper:
  helperDialect:  mysql
  reasonable: true
@ -128,10 +128,10 @@ pagehelper:
 spring:
  datasource:
    druid:
-      url:  jdbc:mysql://localhost:3306/demo?useUnicode=true&characterEncoding=UTF-8&serverTimezone=UTC&allowPublicKeyRetrieval=true&verifyServerCertificate=false&useSSL=false
+      url:  jdbc:mysql://localhost:3306/dts-demo?useUnicode=true&characterEncoding=UTF-8&serverTimezone=UTC&allowPublicKeyRetrieval=true&verifyServerCertificate=false&useSSL=false
      driver-class-name:  com.mysql.jdbc.Driver
      username:  root
-      password:  123456
+      password:  Ab888888
      initial-size:  10
      max-active:  50
      min-idle:  10
--- a/dts-core/src/main/resources/application-dev.yml
+++ b/dts-core/src/main/resources/application-dev.yml
@ -1,10 +1,10 @@
 dts:
  # 开发者应该设置成自己的wx相关信息
  wx:
-    app-id: xxxx
-    app-secret: xxx
-    mch-id: xxxx
-    mch-key: xxxx
+    app-id: wx4901b319ace4f88a
+    app-secret: 45bae4a701e7ec35bca38fdedxxxxxx
+    mch-id: 1538666666
+    mch-key: 1538xxxxxx-1538xxxxxx-1538xxxxxx
    notify-url: https://test.dtsshop.com/demo/order/dtsNotify
    # 商户证书文件路径
    # 请参考“商户证书”一节 https://pay.weixin.qq.com/wiki/doc/api/wxa/wxa_api.php?chapter=4_3
--- a/dts-dao/mybatis-generator/generatorConfig.xml
+++ b/dts-dao/mybatis-generator/generatorConfig.xml
@ -43,9 +43,9 @@

        <!--数据库连接信息-->
        <jdbcConnection driverClass="com.mysql.jdbc.Driver"
-                        connectionURL="jdbc:mysql://localhost:3306/demo-shop?useUnicode=true&amp;characterEncoding=UTF-8&amp;serverTimezone=UTC&amp;verifyServerCertificate=false&amp;useSSL=false"
+                        connectionURL="jdbc:mysql://localhost:3306/dts-demo?useUnicode=true&amp;characterEncoding=UTF-8&amp;serverTimezone=UTC&amp;verifyServerCertificate=false&amp;useSSL=false"
                        userId="root"
-                        password="123456"/>
+                        password="Ab888888"/>

        <javaTypeResolver>
            <property name="useJSR310Types" value="true"/>
--- a/dts-dao/src/main/java/com/qiguliuxing/dts/dao/app/Application.java
+++ b/dts-dao/src/main/java/com/qiguliuxing/dts/dao/app/Application.java
@ -1,15 +0,0 @@
-package com.qiguliuxing.dts.dao.app;
-
-import org.mybatis.spring.annotation.MapperScan;
-import org.springframework.boot.SpringApplication;
-import org.springframework.boot.autoconfigure.SpringBootApplication;
-
-@SpringBootApplication(scanBasePackages = { "com.qiguliuxing.dts.db" })
-@MapperScan("com.qiguliuxing.dts.db.dao")
-public class Application {
-
-	public static void main(String[] args) {
-		SpringApplication.run(Application.class, args);
-	}
-
-}
--- a/dts-wx-api/src/main/java/com/qiguliuxing/dts/wx/Application.java
+++ b/dts-wx-api/src/main/java/com/qiguliuxing/dts/wx/Application.java
@ -12,8 +12,7 @@ import org.springframework.transaction.annotation.EnableTransactionManagement;
 * @author CHENBO
 * @QQ:623659388
 */
-@SpringBootApplication(scanBasePackages = { "com.qiguliuxing.dts.db", "com.qiguliuxing.dts.core",
-		"com.qiguliuxing.dts.wx" })
+@SpringBootApplication(scanBasePackages = { "com.qiguliuxing.dts.db", "com.qiguliuxing.dts.core","com.qiguliuxing.dts.wx" })
@MapperScan({ "com.qiguliuxing.dts.db.dao", "com.qiguliuxing.dts.db.dao.ex" })
@EnableTransactionManagement
@EnableScheduling