Merge remote-tracking branch 'origin/master' into master-queryLog

src/main/java/cn/quantgroup/xyqb/entity/UserQueryLog.java

@@ -33,7 +33,7 @@ public class UserQueryLog implements Serializable {
   @Column(name = "query_detail")
   private String queryDetail;
   @Column(name = "created_at")
-  private Date createdAt;
+  private Date createdAt=new Date();
 
   @Transient
   private String createDate;

src/main/resources/config/dev/xyqb.properties

@@ -90,4 +90,9 @@ motan.application=xyqbUserMotan
 #xyqb-user-域名
 xyqb.user.domain=passport.xyqb.com
 xyqb.user.query.url=http://192.168.11.40:8081
-xyqb.domain = http://192.168.4.153:7003
\ No newline at end of file
+xyqb.domain = http://192.168.4.153:7003
+
+xyqb.paycenter.url=http://payapi.xyqb.com/
+xyqb.paycenter.id=3
+#内部运营系统
+xyqb.yunying.url=http://192.168.4.50:7047
\ No newline at end of file

src/main/resources/config/release01/xyqb.properties

@@ -59,4 +59,4 @@ xyqb.domain = http://api.xyqb.com
 xyqb.paycenter.url=http://payapi.xyqb.com/
 xyqb.paycenter.id=3
 #内部运营系统
-xyqb.yunying.url=http://192.168.4.50:7047
\ No newline at end of file
+xyqb.yunying.url=https://opapi.xyqb.com
\ No newline at end of file