Browse Source

更新生产配置

huan.wang@yueguanjia.com 5 years ago
parent
commit
b55136a668

+ 62 - 62
src/main/resources/application-prod.yml

@@ -8,9 +8,9 @@ mybatis:
 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:
+    url: jdbc:mysql://47.97.74.34:3306/yuemum?useUnicode=true&characterEncoding=utf-8&noDatetimeStringSync=true
+    username: root
+    password: Yuemum10000W!
   thymeleaf:
     mode: LEGACYHTML5
     prefix: classpath:/templates
@@ -30,47 +30,47 @@ pagehelper:
   reasonable: true
   support-methods-arguments: true
   params: count=countSql
-logging:
-  level:
-    com.ygj.yuemum.dao : debug
+#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"
+#  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 : "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/"
@@ -96,29 +96,29 @@ file:
 #  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/"
+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"

+ 5 - 5
src/test/java/com/ygj/yuemum/chuanyun/CyScheduledTest.java

@@ -7,8 +7,8 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.test.context.junit4.SpringRunner;
 
-@RunWith(SpringRunner.class)
-@SpringBootTest
+//@RunWith(SpringRunner.class)
+//@SpringBootTest
 public class CyScheduledTest {
 
     private final int base = 500;
@@ -16,21 +16,21 @@ public class CyScheduledTest {
     @Autowired
     CyScheduled cyScheduled;
 
-    @Test
+//    @Test
     public void testInitCustomerInfoFeedback() {
         for (int i = 30; i >= 0; i--) {
             cyScheduled.initCustomerInfoFeedback(i * base, (i + 1) * base);
         }
     }
 
-    @Test
+//    @Test
     public void testInitCustomerInfoBasic() {
         for (int i = 9; i >= 0; i--) {
             cyScheduled.initCustomerInfoBasic(i * base, (i + 1) * base);
         }
     }
 
-    @Test
+//    @Test
     public void testInitCustomerInfoFollow() {
         for (int i = 9; i >= 0; i--) {
             cyScheduled.initCustomerInfoFollow(i * base, (i + 1) * base);

+ 1 - 1
src/test/java/com/ygj/yuemum/chuanyun/ScheduledServiceTest.java

@@ -6,7 +6,7 @@ import org.junit.Test;
 
 public class ScheduledServiceTest {
 
-    @Test
+//    @Test
     public void testListFormData() throws Exception {
         CYScheduledService scheduledService = new CYScheduledService();
         JSONObject jsonObject = scheduledService.listFormData("ae483ce1607kh089", "aDKyV5OYQa7HMv4qWvqH8bAlXxmzD3bQK2/klBFoHlu6XHRxh7Q2lg==",

+ 3 - 3
src/test/java/com/ygj/yuemum/chuanyun/ScheduledSingleServiceTest.java

@@ -13,7 +13,7 @@ import java.util.Map;
 
 public class ScheduledSingleServiceTest {
 
-    @Test
+//    @Test
     public void testLoadObjects() throws Exception {
         Map<String, String> paramMap = new HashMap();
 
@@ -46,7 +46,7 @@ public class ScheduledSingleServiceTest {
     }
 
 
-    @Test
+//    @Test
     public void testLoadObject() throws Exception {
         Map<String, String> paramMap = new HashMap();
 
@@ -76,7 +76,7 @@ public class ScheduledSingleServiceTest {
         System.out.println(strResult);
     }
 
-    @Test
+//    @Test
     public void testPhotoObject() throws Exception {
         OssService ossService = new OssService();
 

+ 3 - 3
src/test/java/com/ygj/yuemum/customers/CustomerSourceChannelTest.java

@@ -9,13 +9,13 @@ import java.util.Map;
 
 public class CustomerSourceChannelTest {
 
-    @Test
+//    @Test
     public void testCustomerSourceChannel() {
         String str = HttpClientUtil.get("/source/channel", null);
         System.out.println(str);
     }
 
-    @Test
+//    @Test
     public void testSelectByPageNumSize() {
         Map<String, String> param = new HashMap<>();
         param.put("pageNum", "1");
@@ -27,7 +27,7 @@ public class CustomerSourceChannelTest {
         System.out.println(str);
     }
 
-    @Test
+//    @Test
     public void testInsertFeedback() {
         Map<String, String> param = new HashMap<>();
         param.put("pageNum", "1");