Преглед изворни кода

Merge branch 'zrz' of alpha/ygj-yuemum into master

runze.zhao пре 5 година
родитељ
комит
8c07ff35a8
4 измењених фајлова са 343 додато и 165 уклоњено
  1. 9 0
      pom.xml
  2. 166 0
      src/main/resources/application-dev.yml
  3. 166 0
      src/main/resources/application-prod.yml
  4. 2 165
      src/main/resources/application.yml

+ 9 - 0
pom.xml

@@ -38,6 +38,7 @@
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
         <java.version>1.8</java.version>
         <swagger.version>2.9.2</swagger.version>
+        <skipTests>true</skipTests>
     </properties>
 
     <dependencies>
@@ -274,6 +275,14 @@
                     <fork>true</fork>
                 </configuration>
             </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-surefire-plugin</artifactId>
+                <version>3.0.0-M5</version>
+                <configuration>
+                    <skipTests>${skipTests}</skipTests>
+                </configuration>
+            </plugin>
         </plugins>
     </build>
 

+ 166 - 0
src/main/resources/application-dev.yml

@@ -0,0 +1,166 @@
+server:
+  port: 8888
+mybatis:
+  config-location: classpath:mybatis/mybatis-config.xml
+  mapper-locations: mybatis/mapper/*/*.xml
+  mybatis.type-aliases-package: com.ygj.yuemum.*/*
+  log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
+spring:
+  datasource:
+    driverClassName: com.mysql.jdbc.Driver
+    url: jdbc:mysql://218.78.47.145:3306/yuemum?useUnicode=true&characterEncoding=utf-8&noDatetimeStringSync=true&useSSL=false
+    username: root
+    password: Test2020@
+  thymeleaf:
+    mode: LEGACYHTML5
+    prefix: classpath:/templates
+  servlet:
+    multipart:
+      enabled: true
+      file-size-threshold: 0
+      max-file-size: 5M
+      max-request-size: 50M
+  devtools:
+    restart:
+      enabled: true  #设置开启热部署
+    freemarker:
+      cache: false    #页面不加载缓存,修改即时生效
+pagehelper:
+  helper-dialect: mysql
+  reasonable: true
+  support-methods-arguments: true
+  params: count=countSql
+logging:
+  level:
+    com.ygj.yuemum.dao : debug
+#优惠券批次号信息--------------------
+#测试
+coupon:
+  NewUserCoupon : "PVP2018051297451"
+  ConsultTaskCoupon : "PVP2018051273883"
+  DetectionTaskCoupon : "PVP2018051211608"
+  RechargeTaskCoupon : "PVP2018051263016"
+#生产
+#coupon:
+#  NewUserCoupon : "PVP2018051717019"
+#  ConsultTaskCoupon : "PVP2018051739929"
+#  DetectionTaskCoupon : "PVP2018051713733"
+#  RechargeTaskCoupon : "PVP2018051714111"
+#图片上传路径--------------------------
+#本地
+file:
+  ROOT : "D:/apache-tomcat-9.0.29/webapps/resume/img/"
+  ResumeFile : "D:/apache-tomcat-9.0.29/webapps/resume/"
+  httpRoot : "http://localhost:8080/resume/img/"
+  httphtmlRoot : "http://localhost:8080/resume/"
+  modulePath : "D:/apache-tomcat-9.0.29/webapps/resume/resume.html"
+  payvoucher : "D:/apache-tomcat-9.0.29/webapps/payvoucher"
+  httppayvoucher : "http://localhost:8080/payvoucher"
+  promotionvoucher : "D:/apache-tomcat-9.0.29/webapps/MiniProgram/promotion/offline"
+  httppromotionvoucher : "http://localhost:8080/MiniProgram/promotion/offline"
+  qrcode: "D:/apache-tomcat-9.0.29/webapps/MiniProgram/mgm"
+  httpqrcode: "http://127.0.0.1:8080/MiniProgram/mgm"
+  IMGBANKCARD: "D:/apache-tomcat-9.0.29/webapps/MiniProgram/mgm/bankCard/"
+  HTTPIMGBANKCARD: "http://127.0.0.1:8080/MiniProgram/mgm/bankCard/"
+  LOCALQRCODE: "D:/apache-tomcat-9.0.29/webapps/MiniProgram/mgm"
+  DEMOQRCODE: "D:/apache-tomcat-9.0.29/webapps/MiniProgram/mgm/pop"
+  HTTPOPPQRCODE: "http://127.0.0.1:8080/MiniProgram/mgm/pop"
+  TESTQRCODE: "D:/apache-tomcat-9.0.29/webapps/MiniProgram/promotion/test"
+  HTTTESTQRCODE: "http://127.0.0.1:8080/MiniProgram/promotion/test/dc"
+  BANNERIMGURL: "D:/apache-tomcat-9.0.29/webapps/MiniProgram/index/banner/"
+  HTTPBANNERIMGURL: "http://127.0.0.1:8080/MiniProgram/index/banner/"
+  DIANPINGIMGURL: "D:/apache-tomcat-9.0.29/webapps/MiniProgram/dianping/"
+  HTTPDIANPINGIMGURL: "http://127.0.0.1:8080/MiniProgram/dianping/"
+#测试
+#file:
+#  ROOT : "/home/tomcat/apache-tomcat-9.0.30/webapps/resume/img/"
+#  ResumeFile : "/home/tomcat/apache-tomcat-9.0.30/webapps/resume/"
+#  httpRoot : "http://218.78.47.145:3306/resume/img/"
+#  httphtmlRoot : "http://218.78.47.145:3306/resume/"
+#  modulePath : "/home/tomcat/apache-tomcat-9.0.30/webapps/resume/resume.html"
+#  payvoucher : "/home/tomcat/apache-tomcat-9.0.30/webapps/payvoucher"
+#  httppayvoucher : "http://218.78.47.145:3306/payvoucher"
+#  promotionvoucher : "/home/tomcat/apache-tomcat-9.0.30/webapps/MiniProgram/promotion/offline"
+#  httppromotionvoucher : "http://218.78.47.145:3306/MiniProgram/promotion/offline"
+#  qrcode: "/home/tomcat/apache-tomcat-9.0.30/webapps/MiniProgram/mgm"
+#  httpqrcode: "http://218.78.47.145:3306/MiniProgram/mgm"
+#  IMGBANKCARD: "/home/tomcat/apache-tomcat-9.0.30/webapps/MiniProgram/mgm/bankCard/"
+#  HTTPIMGBANKCARD: "http://218.78.47.145:3306/MiniProgram/mgm/bankCard/"
+#  LOCALQRCODE: "/home/tomcat/apache-tomcat-9.0.30/webapps/MiniProgram/mgm"
+#  DEMOQRCODE: "/home/tomcat/apache-tomcat-9.0.30/webapps/MiniProgram/mgm/pop"
+#  HTTPOPPQRCODE: "http://218.78.47.145:3306/MiniProgram/mgm/pop"
+#  TESTQRCODE: "/home/tomcat/apache-tomcat-9.0.30/webapps/MiniProgram/promotion/test"
+#  HTTTESTQRCODE: "http://218.78.47.145:3306/MiniProgram/promotion/test/dc"
+#  BANNERIMGURL: "/home/tomcat/apache-tomcat-9.0.30/webapps/MiniProgram/index/banner/"
+#  HTTPBANNERIMGURL: "http://218.78.47.145:3306/MiniProgram/index/banner/"
+#  DIANPINGIMGURL: "/home/tomcat/apache-tomcat-9.0.30/webapps/MiniProgram/dianping/"
+#  HTTPDIANPINGIMGURL: "http://218.78.47.145:3306/MiniProgram/dianping/"
+#生产
+#file:
+#  ROOT : "/usr/local/tomcat/tomcat7/webapps/resume/img/"
+#  ResumeFile : "/usr/local/tomcat/tomcat7/webapps/resume/"
+#  httpRoot : "https://yuesuo.yueguanjia.com/resume/img/"
+#  httphtmlRoot : "https://yuesuo.yueguanjia.com/resume/"
+#  modulePath : "/usr/local/tomcat/tomcat7/webapps/resume/resume.html"
+#  payvoucher : "/usr/local/tomcat/tomcat7/webapps/payvoucher"
+#  httppayvoucher : "https://yuesuo.yueguanjia.com/payvoucher"
+#  promotionvoucher : "/usr/local/tomcat/tomcat7/webapps/MiniProgram/promotion/offline"
+#  httppromotionvoucher : "https://yuesuo.yueguanjia.com/MiniProgram/promotion/offline"
+#  qrcode: "/usr/local/tomcat/tomcat7/webapps/MiniProgram/mgm"
+#  httpqrcode: "https://yuesuo.yueguanjia.com/MiniProgram/mgm"
+#  IMGBANKCARD: "/usr/local/tomcat/tomcat7/webapps/MiniProgram/mgm/bankCard/"
+#  HTTPIMGBANKCARD: "https://yuesuo.yueguanjia.com/MiniProgram/mgm/bankCard/"
+#  LOCALQRCODE: "/usr/local/tomcat/tomcat7/webapps/MiniProgram/mgm"
+#  DEMOQRCODE: "/usr/local/tomcat/tomcat7/webapps/MiniProgram/mgm/pop"
+#  HTTPOPPQRCODE: "https://yuesuo.yueguanjia.com/MiniProgram/mgm/pop"
+#  TESTQRCODE: "/usr/local/tomcat/tomcat7/webapps/MiniProgram/promotion/test"
+#  HTTTESTQRCODE: "https://yuesuo.yueguanjia.com/MiniProgram/promotion/test/dc"
+#  BANNERIMGURL: "/usr/local/tomcat/tomcat7/webapps/MiniProgram/index/banner/"
+#  HTTPBANNERIMGURL: "https://yuesuo.yueguanjia.com/MiniProgram/index/banner/"
+#  DIANPINGIMGURL: "/usr/local/tomcat/tomcat7/webapps/MiniProgram/dianping/"
+#  HTTPDIANPINGIMGURL: "https://yuesuo.yueguanjia.com/MiniProgram/dianping/"
+#微信公众号---------------------------------------------------
+wechat:
+  APPID : "wx52852a3c47540fad"
+  APPSECRET : "31e4eef58038830327eb88661e3a681f" #获取access_token
+  GRANT_TYPE : "client_credential"
+  JSAPI_TICKET_TYPE : "jsapi"
+  ACCESS_TOKEN_URL : "https://api.weixin.qq.com/cgi-bin/token"
+  JSAPI_TICKET_URL : "https://api.weixin.qq.com/cgi-bin/ticket/getticket"
+  JSCODE2SESSION : "https://api.weixin.qq.com/sns/jscode2session"
+  SENDMESSAGEURL : "https://api.weixin.qq.com/cgi-bin/message/template/send?access_token=" #公众号消息发送地址
+  OrderTemplateid : "VyMPKDDGOy85wDIJuXR7sBuiIBEg0OPaCg6C_Dt_D0g"  #公众号消息模版
+  BookingTemplateid : "Wvysqh3Ec9lXpf5tytq0T2zzs662uowNLFCPiAPBFkA" #公众号消息模版
+  ExtractTemplateid : "uAkxPS92FqovRSrg3n2P4xfNMwQ12iEcpRrnSp-D36Q" #公众号消息模版
+  WPOPENID : "oAjHTvxMhnBL4T59ZOG0jKwsFe4k" #公众号发送消息 园园
+  #测试小程序
+  #MINIAPPID : "wx1c3ef3300b74ed86"
+  #MINIAPPSECRET : "ba5624bc087921d5a5832da9193e40f1"
+  #生产小程序
+  MINIAPPID : "wx20a080f3bf83ba47"
+  MINIAPPSECRET : "61021776790449943ba5f40288efa0d6"
+baidu:
+  BAIDUAK: "2PndpvczSX3MdItrRpqVIcPS"
+  BAIDUSK: "Ik3WA4BeyphCmC0z35OZ0OlgT6W7qnRC"
+  AUTHHOST: "https://aip.baidubce.com/oauth/2.0/token?"
+  BANKCARD: "https://aip.baidubce.com/rest/2.0/ocr/v1/bankcard"
+api:
+  MDJAPIURL: "http://120.55.37.107:8763/introduce/activity"
+  BIZOBJECTSERVICE: "http://47.111.190.117:8088/edw/h3/operateObjects"
+  #  BIZOBJECTSERVICE: "http://47.111.190.117:8088/edw/h3/operateObjects"
+  BIZUSERSERVICE: "https://www.h3yun.com/OpenApi/Invoke"
+  #  BIZOBJECTSERVICE: "http://192.168.1.213:8010/h3/operateObjects"
+  CREATEQRURL: "https://test.yueguanjia.com/jielin-web/pay/third/prepay/approve"
+college:
+  LMP: 43
+  AGE: 12
+  MAXSCHOLARSHIPS: 12000
+swagger:
+  enable: false
+chuanyun:
+  EngineCode: ae483ce1607kh089
+  EngineSecret: aDKyV5OYQa7HMv4qWvqH8bAlXxmzD3bQK2/klBFoHlu6XHRxh7Q2lg==
+  OssFolder: yeusuo/follow
+
+
+

+ 166 - 0
src/main/resources/application-prod.yml

@@ -0,0 +1,166 @@
+server:
+  port: 8888
+mybatis:
+  config-location: classpath:mybatis/mybatis-config.xml
+  mapper-locations: mybatis/mapper/*/*.xml
+  mybatis.type-aliases-package: com.ygj.yuemum.*/*
+  log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
+spring:
+  datasource:
+    driverClassName: com.mysql.jdbc.Driver
+    url: jdbc:mysql://218.78.47.145:3306/yuemum?useUnicode=true&characterEncoding=utf-8&noDatetimeStringSync=true&useSSL=false
+    username:
+    password:
+  thymeleaf:
+    mode: LEGACYHTML5
+    prefix: classpath:/templates
+  servlet:
+    multipart:
+      enabled: true
+      file-size-threshold: 0
+      max-file-size: 5M
+      max-request-size: 50M
+  devtools:
+    restart:
+      enabled: true  #设置开启热部署
+    freemarker:
+      cache: false    #页面不加载缓存,修改即时生效
+pagehelper:
+  helper-dialect: mysql
+  reasonable: true
+  support-methods-arguments: true
+  params: count=countSql
+logging:
+  level:
+    com.ygj.yuemum.dao : debug
+#优惠券批次号信息--------------------
+#测试
+coupon:
+  NewUserCoupon : "PVP2018051297451"
+  ConsultTaskCoupon : "PVP2018051273883"
+  DetectionTaskCoupon : "PVP2018051211608"
+  RechargeTaskCoupon : "PVP2018051263016"
+#生产
+#coupon:
+#  NewUserCoupon : "PVP2018051717019"
+#  ConsultTaskCoupon : "PVP2018051739929"
+#  DetectionTaskCoupon : "PVP2018051713733"
+#  RechargeTaskCoupon : "PVP2018051714111"
+#图片上传路径--------------------------
+#本地
+file:
+  ROOT : "D:/apache-tomcat-9.0.29/webapps/resume/img/"
+  ResumeFile : "D:/apache-tomcat-9.0.29/webapps/resume/"
+  httpRoot : "http://localhost:8080/resume/img/"
+  httphtmlRoot : "http://localhost:8080/resume/"
+  modulePath : "D:/apache-tomcat-9.0.29/webapps/resume/resume.html"
+  payvoucher : "D:/apache-tomcat-9.0.29/webapps/payvoucher"
+  httppayvoucher : "http://localhost:8080/payvoucher"
+  promotionvoucher : "D:/apache-tomcat-9.0.29/webapps/MiniProgram/promotion/offline"
+  httppromotionvoucher : "http://localhost:8080/MiniProgram/promotion/offline"
+  qrcode: "D:/apache-tomcat-9.0.29/webapps/MiniProgram/mgm"
+  httpqrcode: "http://127.0.0.1:8080/MiniProgram/mgm"
+  IMGBANKCARD: "D:/apache-tomcat-9.0.29/webapps/MiniProgram/mgm/bankCard/"
+  HTTPIMGBANKCARD: "http://127.0.0.1:8080/MiniProgram/mgm/bankCard/"
+  LOCALQRCODE: "D:/apache-tomcat-9.0.29/webapps/MiniProgram/mgm"
+  DEMOQRCODE: "D:/apache-tomcat-9.0.29/webapps/MiniProgram/mgm/pop"
+  HTTPOPPQRCODE: "http://127.0.0.1:8080/MiniProgram/mgm/pop"
+  TESTQRCODE: "D:/apache-tomcat-9.0.29/webapps/MiniProgram/promotion/test"
+  HTTTESTQRCODE: "http://127.0.0.1:8080/MiniProgram/promotion/test/dc"
+  BANNERIMGURL: "D:/apache-tomcat-9.0.29/webapps/MiniProgram/index/banner/"
+  HTTPBANNERIMGURL: "http://127.0.0.1:8080/MiniProgram/index/banner/"
+  DIANPINGIMGURL: "D:/apache-tomcat-9.0.29/webapps/MiniProgram/dianping/"
+  HTTPDIANPINGIMGURL: "http://127.0.0.1:8080/MiniProgram/dianping/"
+#测试
+#file:
+#  ROOT : "/home/tomcat/apache-tomcat-9.0.30/webapps/resume/img/"
+#  ResumeFile : "/home/tomcat/apache-tomcat-9.0.30/webapps/resume/"
+#  httpRoot : "http://218.78.47.145:3306/resume/img/"
+#  httphtmlRoot : "http://218.78.47.145:3306/resume/"
+#  modulePath : "/home/tomcat/apache-tomcat-9.0.30/webapps/resume/resume.html"
+#  payvoucher : "/home/tomcat/apache-tomcat-9.0.30/webapps/payvoucher"
+#  httppayvoucher : "http://218.78.47.145:3306/payvoucher"
+#  promotionvoucher : "/home/tomcat/apache-tomcat-9.0.30/webapps/MiniProgram/promotion/offline"
+#  httppromotionvoucher : "http://218.78.47.145:3306/MiniProgram/promotion/offline"
+#  qrcode: "/home/tomcat/apache-tomcat-9.0.30/webapps/MiniProgram/mgm"
+#  httpqrcode: "http://218.78.47.145:3306/MiniProgram/mgm"
+#  IMGBANKCARD: "/home/tomcat/apache-tomcat-9.0.30/webapps/MiniProgram/mgm/bankCard/"
+#  HTTPIMGBANKCARD: "http://218.78.47.145:3306/MiniProgram/mgm/bankCard/"
+#  LOCALQRCODE: "/home/tomcat/apache-tomcat-9.0.30/webapps/MiniProgram/mgm"
+#  DEMOQRCODE: "/home/tomcat/apache-tomcat-9.0.30/webapps/MiniProgram/mgm/pop"
+#  HTTPOPPQRCODE: "http://218.78.47.145:3306/MiniProgram/mgm/pop"
+#  TESTQRCODE: "/home/tomcat/apache-tomcat-9.0.30/webapps/MiniProgram/promotion/test"
+#  HTTTESTQRCODE: "http://218.78.47.145:3306/MiniProgram/promotion/test/dc"
+#  BANNERIMGURL: "/home/tomcat/apache-tomcat-9.0.30/webapps/MiniProgram/index/banner/"
+#  HTTPBANNERIMGURL: "http://218.78.47.145:3306/MiniProgram/index/banner/"
+#  DIANPINGIMGURL: "/home/tomcat/apache-tomcat-9.0.30/webapps/MiniProgram/dianping/"
+#  HTTPDIANPINGIMGURL: "http://218.78.47.145:3306/MiniProgram/dianping/"
+#生产
+#file:
+#  ROOT : "/usr/local/tomcat/tomcat7/webapps/resume/img/"
+#  ResumeFile : "/usr/local/tomcat/tomcat7/webapps/resume/"
+#  httpRoot : "https://yuesuo.yueguanjia.com/resume/img/"
+#  httphtmlRoot : "https://yuesuo.yueguanjia.com/resume/"
+#  modulePath : "/usr/local/tomcat/tomcat7/webapps/resume/resume.html"
+#  payvoucher : "/usr/local/tomcat/tomcat7/webapps/payvoucher"
+#  httppayvoucher : "https://yuesuo.yueguanjia.com/payvoucher"
+#  promotionvoucher : "/usr/local/tomcat/tomcat7/webapps/MiniProgram/promotion/offline"
+#  httppromotionvoucher : "https://yuesuo.yueguanjia.com/MiniProgram/promotion/offline"
+#  qrcode: "/usr/local/tomcat/tomcat7/webapps/MiniProgram/mgm"
+#  httpqrcode: "https://yuesuo.yueguanjia.com/MiniProgram/mgm"
+#  IMGBANKCARD: "/usr/local/tomcat/tomcat7/webapps/MiniProgram/mgm/bankCard/"
+#  HTTPIMGBANKCARD: "https://yuesuo.yueguanjia.com/MiniProgram/mgm/bankCard/"
+#  LOCALQRCODE: "/usr/local/tomcat/tomcat7/webapps/MiniProgram/mgm"
+#  DEMOQRCODE: "/usr/local/tomcat/tomcat7/webapps/MiniProgram/mgm/pop"
+#  HTTPOPPQRCODE: "https://yuesuo.yueguanjia.com/MiniProgram/mgm/pop"
+#  TESTQRCODE: "/usr/local/tomcat/tomcat7/webapps/MiniProgram/promotion/test"
+#  HTTTESTQRCODE: "https://yuesuo.yueguanjia.com/MiniProgram/promotion/test/dc"
+#  BANNERIMGURL: "/usr/local/tomcat/tomcat7/webapps/MiniProgram/index/banner/"
+#  HTTPBANNERIMGURL: "https://yuesuo.yueguanjia.com/MiniProgram/index/banner/"
+#  DIANPINGIMGURL: "/usr/local/tomcat/tomcat7/webapps/MiniProgram/dianping/"
+#  HTTPDIANPINGIMGURL: "https://yuesuo.yueguanjia.com/MiniProgram/dianping/"
+#微信公众号---------------------------------------------------
+wechat:
+  APPID : "wx52852a3c47540fad"
+  APPSECRET : "31e4eef58038830327eb88661e3a681f" #获取access_token
+  GRANT_TYPE : "client_credential"
+  JSAPI_TICKET_TYPE : "jsapi"
+  ACCESS_TOKEN_URL : "https://api.weixin.qq.com/cgi-bin/token"
+  JSAPI_TICKET_URL : "https://api.weixin.qq.com/cgi-bin/ticket/getticket"
+  JSCODE2SESSION : "https://api.weixin.qq.com/sns/jscode2session"
+  SENDMESSAGEURL : "https://api.weixin.qq.com/cgi-bin/message/template/send?access_token=" #公众号消息发送地址
+  OrderTemplateid : "VyMPKDDGOy85wDIJuXR7sBuiIBEg0OPaCg6C_Dt_D0g"  #公众号消息模版
+  BookingTemplateid : "Wvysqh3Ec9lXpf5tytq0T2zzs662uowNLFCPiAPBFkA" #公众号消息模版
+  ExtractTemplateid : "uAkxPS92FqovRSrg3n2P4xfNMwQ12iEcpRrnSp-D36Q" #公众号消息模版
+  WPOPENID : "oAjHTvxMhnBL4T59ZOG0jKwsFe4k" #公众号发送消息 园园
+  #测试小程序
+  #MINIAPPID : "wx1c3ef3300b74ed86"
+  #MINIAPPSECRET : "ba5624bc087921d5a5832da9193e40f1"
+  #生产小程序
+  MINIAPPID : "wx20a080f3bf83ba47"
+  MINIAPPSECRET : "61021776790449943ba5f40288efa0d6"
+baidu:
+  BAIDUAK: "2PndpvczSX3MdItrRpqVIcPS"
+  BAIDUSK: "Ik3WA4BeyphCmC0z35OZ0OlgT6W7qnRC"
+  AUTHHOST: "https://aip.baidubce.com/oauth/2.0/token?"
+  BANKCARD: "https://aip.baidubce.com/rest/2.0/ocr/v1/bankcard"
+api:
+  MDJAPIURL: "http://120.55.37.107:8763/introduce/activity"
+  BIZOBJECTSERVICE: "http://47.111.190.117:8088/edw/h3/operateObjects"
+  #  BIZOBJECTSERVICE: "http://47.111.190.117:8088/edw/h3/operateObjects"
+  BIZUSERSERVICE: "https://www.h3yun.com/OpenApi/Invoke"
+  #  BIZOBJECTSERVICE: "http://192.168.1.213:8010/h3/operateObjects"
+  CREATEQRURL: "https://test.yueguanjia.com/jielin-web/pay/third/prepay/approve"
+college:
+  LMP: 43
+  AGE: 12
+  MAXSCHOLARSHIPS: 12000
+swagger:
+  enable: false
+chuanyun:
+  EngineCode: ae483ce1607kh089
+  EngineSecret: aDKyV5OYQa7HMv4qWvqH8bAlXxmzD3bQK2/klBFoHlu6XHRxh7Q2lg==
+  OssFolder: yeusuo/follow
+
+
+

+ 2 - 165
src/main/resources/application.yml

@@ -1,166 +1,3 @@
-server:
-  port: 8888
-mybatis:
-  config-location: classpath:mybatis/mybatis-config.xml
-  mapper-locations: mybatis/mapper/*/*.xml
-  mybatis.type-aliases-package: com.ygj.yuemum.*/*
-  log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
 spring:
-  datasource:
-    driverClassName: com.mysql.jdbc.Driver
-    url: jdbc:mysql://218.78.47.145:3306/yuemum?useUnicode=true&characterEncoding=utf-8&noDatetimeStringSync=true&useSSL=false
-    username: root
-    password: Test2020@
-  thymeleaf:
-    mode: LEGACYHTML5
-    prefix: classpath:/templates
-  servlet:
-    multipart:
-      enabled: true
-      file-size-threshold: 0
-      max-file-size: 5M
-      max-request-size: 50M
-  devtools:
-    restart:
-      enabled: true  #设置开启热部署
-    freemarker:
-      cache: false    #页面不加载缓存,修改即时生效
-pagehelper:
-  helper-dialect: mysql
-  reasonable: true
-  support-methods-arguments: true
-  params: count=countSql
-logging:
-  level:
-     com.ygj.yuemum.dao : debug
-#优惠券批次号信息--------------------
-#测试
-coupon:
-  NewUserCoupon : "PVP2018051297451"
-  ConsultTaskCoupon : "PVP2018051273883"
-  DetectionTaskCoupon : "PVP2018051211608"
-  RechargeTaskCoupon : "PVP2018051263016"
-#生产
-#coupon:
-#  NewUserCoupon : "PVP2018051717019"
-#  ConsultTaskCoupon : "PVP2018051739929"
-#  DetectionTaskCoupon : "PVP2018051713733"
-#  RechargeTaskCoupon : "PVP2018051714111"
-#图片上传路径--------------------------
-#本地
-file:
-  ROOT : "D:/apache-tomcat-9.0.29/webapps/resume/img/"
-  ResumeFile : "D:/apache-tomcat-9.0.29/webapps/resume/"
-  httpRoot : "http://localhost:8080/resume/img/"
-  httphtmlRoot : "http://localhost:8080/resume/"
-  modulePath : "D:/apache-tomcat-9.0.29/webapps/resume/resume.html"
-  payvoucher : "D:/apache-tomcat-9.0.29/webapps/payvoucher"
-  httppayvoucher : "http://localhost:8080/payvoucher"
-  promotionvoucher : "D:/apache-tomcat-9.0.29/webapps/MiniProgram/promotion/offline"
-  httppromotionvoucher : "http://localhost:8080/MiniProgram/promotion/offline"
-  qrcode: "D:/apache-tomcat-9.0.29/webapps/MiniProgram/mgm"
-  httpqrcode: "http://127.0.0.1:8080/MiniProgram/mgm"
-  IMGBANKCARD: "D:/apache-tomcat-9.0.29/webapps/MiniProgram/mgm/bankCard/"
-  HTTPIMGBANKCARD: "http://127.0.0.1:8080/MiniProgram/mgm/bankCard/"
-  LOCALQRCODE: "D:/apache-tomcat-9.0.29/webapps/MiniProgram/mgm"
-  DEMOQRCODE: "D:/apache-tomcat-9.0.29/webapps/MiniProgram/mgm/pop"
-  HTTPOPPQRCODE: "http://127.0.0.1:8080/MiniProgram/mgm/pop"
-  TESTQRCODE: "D:/apache-tomcat-9.0.29/webapps/MiniProgram/promotion/test"
-  HTTTESTQRCODE: "http://127.0.0.1:8080/MiniProgram/promotion/test/dc"
-  BANNERIMGURL: "D:/apache-tomcat-9.0.29/webapps/MiniProgram/index/banner/"
-  HTTPBANNERIMGURL: "http://127.0.0.1:8080/MiniProgram/index/banner/"
-  DIANPINGIMGURL: "D:/apache-tomcat-9.0.29/webapps/MiniProgram/dianping/"
-  HTTPDIANPINGIMGURL: "http://127.0.0.1:8080/MiniProgram/dianping/"
-#测试
-#file:
-#  ROOT : "/home/tomcat/apache-tomcat-9.0.30/webapps/resume/img/"
-#  ResumeFile : "/home/tomcat/apache-tomcat-9.0.30/webapps/resume/"
-#  httpRoot : "http://218.78.47.145:3306/resume/img/"
-#  httphtmlRoot : "http://218.78.47.145:3306/resume/"
-#  modulePath : "/home/tomcat/apache-tomcat-9.0.30/webapps/resume/resume.html"
-#  payvoucher : "/home/tomcat/apache-tomcat-9.0.30/webapps/payvoucher"
-#  httppayvoucher : "http://218.78.47.145:3306/payvoucher"
-#  promotionvoucher : "/home/tomcat/apache-tomcat-9.0.30/webapps/MiniProgram/promotion/offline"
-#  httppromotionvoucher : "http://218.78.47.145:3306/MiniProgram/promotion/offline"
-#  qrcode: "/home/tomcat/apache-tomcat-9.0.30/webapps/MiniProgram/mgm"
-#  httpqrcode: "http://218.78.47.145:3306/MiniProgram/mgm"
-#  IMGBANKCARD: "/home/tomcat/apache-tomcat-9.0.30/webapps/MiniProgram/mgm/bankCard/"
-#  HTTPIMGBANKCARD: "http://218.78.47.145:3306/MiniProgram/mgm/bankCard/"
-#  LOCALQRCODE: "/home/tomcat/apache-tomcat-9.0.30/webapps/MiniProgram/mgm"
-#  DEMOQRCODE: "/home/tomcat/apache-tomcat-9.0.30/webapps/MiniProgram/mgm/pop"
-#  HTTPOPPQRCODE: "http://218.78.47.145:3306/MiniProgram/mgm/pop"
-#  TESTQRCODE: "/home/tomcat/apache-tomcat-9.0.30/webapps/MiniProgram/promotion/test"
-#  HTTTESTQRCODE: "http://218.78.47.145:3306/MiniProgram/promotion/test/dc"
-#  BANNERIMGURL: "/home/tomcat/apache-tomcat-9.0.30/webapps/MiniProgram/index/banner/"
-#  HTTPBANNERIMGURL: "http://218.78.47.145:3306/MiniProgram/index/banner/"
-#  DIANPINGIMGURL: "/home/tomcat/apache-tomcat-9.0.30/webapps/MiniProgram/dianping/"
-#  HTTPDIANPINGIMGURL: "http://218.78.47.145:3306/MiniProgram/dianping/"
-#生产
-#file:
-#  ROOT : "/usr/local/tomcat/tomcat7/webapps/resume/img/"
-#  ResumeFile : "/usr/local/tomcat/tomcat7/webapps/resume/"
-#  httpRoot : "https://yuesuo.yueguanjia.com/resume/img/"
-#  httphtmlRoot : "https://yuesuo.yueguanjia.com/resume/"
-#  modulePath : "/usr/local/tomcat/tomcat7/webapps/resume/resume.html"
-#  payvoucher : "/usr/local/tomcat/tomcat7/webapps/payvoucher"
-#  httppayvoucher : "https://yuesuo.yueguanjia.com/payvoucher"
-#  promotionvoucher : "/usr/local/tomcat/tomcat7/webapps/MiniProgram/promotion/offline"
-#  httppromotionvoucher : "https://yuesuo.yueguanjia.com/MiniProgram/promotion/offline"
-#  qrcode: "/usr/local/tomcat/tomcat7/webapps/MiniProgram/mgm"
-#  httpqrcode: "https://yuesuo.yueguanjia.com/MiniProgram/mgm"
-#  IMGBANKCARD: "/usr/local/tomcat/tomcat7/webapps/MiniProgram/mgm/bankCard/"
-#  HTTPIMGBANKCARD: "https://yuesuo.yueguanjia.com/MiniProgram/mgm/bankCard/"
-#  LOCALQRCODE: "/usr/local/tomcat/tomcat7/webapps/MiniProgram/mgm"
-#  DEMOQRCODE: "/usr/local/tomcat/tomcat7/webapps/MiniProgram/mgm/pop"
-#  HTTPOPPQRCODE: "https://yuesuo.yueguanjia.com/MiniProgram/mgm/pop"
-#  TESTQRCODE: "/usr/local/tomcat/tomcat7/webapps/MiniProgram/promotion/test"
-#  HTTTESTQRCODE: "https://yuesuo.yueguanjia.com/MiniProgram/promotion/test/dc"
-#  BANNERIMGURL: "/usr/local/tomcat/tomcat7/webapps/MiniProgram/index/banner/"
-#  HTTPBANNERIMGURL: "https://yuesuo.yueguanjia.com/MiniProgram/index/banner/"
-#  DIANPINGIMGURL: "/usr/local/tomcat/tomcat7/webapps/MiniProgram/dianping/"
-#  HTTPDIANPINGIMGURL: "https://yuesuo.yueguanjia.com/MiniProgram/dianping/"
-#微信公众号---------------------------------------------------
-wechat:
-  APPID : "wx52852a3c47540fad"
-  APPSECRET : "31e4eef58038830327eb88661e3a681f" #获取access_token
-  GRANT_TYPE : "client_credential"
-  JSAPI_TICKET_TYPE : "jsapi"
-  ACCESS_TOKEN_URL : "https://api.weixin.qq.com/cgi-bin/token"
-  JSAPI_TICKET_URL : "https://api.weixin.qq.com/cgi-bin/ticket/getticket"
-  JSCODE2SESSION : "https://api.weixin.qq.com/sns/jscode2session"
-  SENDMESSAGEURL : "https://api.weixin.qq.com/cgi-bin/message/template/send?access_token=" #公众号消息发送地址
-  OrderTemplateid : "VyMPKDDGOy85wDIJuXR7sBuiIBEg0OPaCg6C_Dt_D0g"  #公众号消息模版
-  BookingTemplateid : "Wvysqh3Ec9lXpf5tytq0T2zzs662uowNLFCPiAPBFkA" #公众号消息模版
-  ExtractTemplateid : "uAkxPS92FqovRSrg3n2P4xfNMwQ12iEcpRrnSp-D36Q" #公众号消息模版
-  WPOPENID : "oAjHTvxMhnBL4T59ZOG0jKwsFe4k" #公众号发送消息 园园
-  #测试小程序
-  #MINIAPPID : "wx1c3ef3300b74ed86"
-  #MINIAPPSECRET : "ba5624bc087921d5a5832da9193e40f1"
-  #生产小程序
-  MINIAPPID : "wx20a080f3bf83ba47"
-  MINIAPPSECRET : "61021776790449943ba5f40288efa0d6"
-baidu:
-  BAIDUAK: "2PndpvczSX3MdItrRpqVIcPS"
-  BAIDUSK: "Ik3WA4BeyphCmC0z35OZ0OlgT6W7qnRC"
-  AUTHHOST: "https://aip.baidubce.com/oauth/2.0/token?"
-  BANKCARD: "https://aip.baidubce.com/rest/2.0/ocr/v1/bankcard"
-api:
-  MDJAPIURL: "http://120.55.37.107:8763/introduce/activity"
-  BIZOBJECTSERVICE: "http://47.111.190.117:8088/edw/h3/operateObjects"
-#  BIZOBJECTSERVICE: "http://47.111.190.117:8088/edw/h3/operateObjects"
-  BIZUSERSERVICE: "https://www.h3yun.com/OpenApi/Invoke"
-#  BIZOBJECTSERVICE: "http://192.168.1.213:8010/h3/operateObjects"
-  CREATEQRURL: "https://test.yueguanjia.com/jielin-web/pay/third/prepay/approve"
-college:
-  LMP: 43
-  AGE: 12
-  MAXSCHOLARSHIPS: 12000
-swagger:
-  enable: false
-chuanyun:
-  EngineCode: ae483ce1607kh089
-  EngineSecret: aDKyV5OYQa7HMv4qWvqH8bAlXxmzD3bQK2/klBFoHlu6XHRxh7Q2lg==
-  OssFolder: yeusuo/follow
-
-
-
+  profiles:
+    active: dev