Переглянути джерело

部分注释补充,配置文件修改。

dongbw 8 роки тому
батько
коміт
837f7bb311

+ 1 - 1
donate-console/src/main/java/com/uas/console/donate/model/Activity.java

@@ -114,7 +114,7 @@ public class Activity implements Serializable{
      * 活动参与人数
      * @return
      */
-    @Column(name = "act_joinAmount")
+    @Column(name = "act_join_amount")
     private Long joinAmount;
 
     /**

+ 4 - 0
donate-console/src/main/java/com/uas/console/donate/model/ProjectConclude.java

@@ -3,6 +3,10 @@ package com.uas.console.donate.model;
 import javax.persistence.*;
 import java.util.Date;
 
+/**
+ * 项目结项报告
+ * 2018-01-13 12:13
+ */
 @Entity
 @Table(name="donate$projectconclude")
 public class ProjectConclude {

+ 1 - 1
donate-console/src/main/java/com/uas/console/donate/model/ProjectReport.java

@@ -44,7 +44,7 @@ public class ProjectReport {
     private String description;
 
     /**
-     *表单提交状态
+     *表单提交状态 (1为已提交)
      */
     @Column(name="pr_status")
     private Integer status;

+ 1 - 1
donate-console/src/main/resources/config/application-dev.properties

@@ -27,7 +27,7 @@ security.ignored=false
 
 spring.jpa.hibernate.show-sql= true  
 spring.jpa.hibernate.ddl-auto=update
-spring.jpa.hibernate.dialect=org.hibernate.dialect.5Dialect  
+spring.jpa.hibernate.dialect=org.hibernate.dialect.MySQL5Dialect   
 spring.jackson.serialization.indent_output=false  
 
 zk.url=zookeeper://10.10.100.11:2181

+ 1 - 1
donate-console/src/main/resources/config/application-prod.properties

@@ -27,7 +27,7 @@ security.ignored=false
 
 spring.jpa.hibernate.show-sql= true  
 spring.jpa.hibernate.ddl-auto=update
-spring.jpa.hibernate.dialect=org.hibernate.dialect.5Dialect  
+spring.jpa.hibernate.dialect=org.hibernate.dialect.MySQL5Dialect   
 spring.jackson.serialization.indent_output=false  
 
 zk.url=zookeeper://10.10.100.11:2181

+ 1 - 1
donate-console/src/main/resources/config/application-test.properties

@@ -27,7 +27,7 @@ security.ignored=false
 
 spring.jpa.hibernate.show-sql= true  
 spring.jpa.hibernate.ddl-auto=update
-spring.jpa.hibernate.dialect=org.hibernate.dialect.5Dialect  
+spring.jpa.hibernate.dialect=org.hibernate.dialect.MySQL5Dialect   
 spring.jackson.serialization.indent_output=false  
 
 zk.url=zookeeper://10.10.100.11:2181

+ 1 - 1
donate-service/src/main/java/com/uas/service/donate/model/Activity.java

@@ -114,7 +114,7 @@ public class Activity implements Serializable{
      * 活动参与人数
      * @return
      */
-    @Column(name = "act_joinAmount")
+    @Column(name = "act_join_amount")
     private Long joinAmount;
 
     /**

+ 4 - 0
donate-service/src/main/java/com/uas/service/donate/model/ActivityRecode.java

@@ -4,6 +4,10 @@ package com.uas.service.donate.model;
 import javax.persistence.*;
 import java.util.Date;
 
+/**
+ * 活动参与记录
+ * 2018-01-13
+ */
 @Entity
 @Table(name = "donate$activityrecode")
 public class ActivityRecode {

+ 4 - 0
donate-service/src/main/java/com/uas/service/donate/model/Award.java

@@ -7,6 +7,10 @@ import com.fasterxml.jackson.annotation.JsonIgnore;
 import javax.persistence.*;
 import java.io.Serializable;
 
+/**
+ * 奖品表
+ * 2018-01-13
+ */
 @Entity
 @Table(name="donate$award")
 public class Award implements Serializable{

+ 4 - 0
donate-service/src/main/java/com/uas/service/donate/model/ProjectConclude.java

@@ -4,6 +4,10 @@ import javax.persistence.*;
 import java.text.SimpleDateFormat;
 import java.util.Date;
 
+/**
+ * 项目结项报告
+ * 2018-01-13 12:11:10
+ */
 @Entity
 @Table(name="donate$projectconclude")
 public class ProjectConclude {

+ 3 - 0
donate-service/src/main/java/com/uas/service/donate/model/ProjectFinance.java

@@ -3,6 +3,9 @@ package com.uas.service.donate.model;
 import javax.persistence.*;
 import java.util.Date;
 
+/**
+ * 项目财务披露
+ */
 @Entity
 @Table(name = "donate$projectfinance")
 public class ProjectFinance {

+ 6 - 2
donate-service/src/main/java/com/uas/service/donate/model/ProjectRecode.java

@@ -5,6 +5,10 @@ import java.io.Serializable;
 import java.text.SimpleDateFormat;
 import java.util.Date;
 
+/**
+ * 捐款记录
+ * 2018-01-13
+ */
 @Entity
 @Table(name="donate$projectrecode")
 public class ProjectRecode implements Serializable{
@@ -85,13 +89,13 @@ public class ProjectRecode implements Serializable{
     private short status;
 
     /**
-     * 支付异常情况时信息
+     * 微信扫码支付所生成的图片地址
      */
     @Column(name = "pr_qrcode_url")
     private String qrcodeUrl;
 
     /**
-     * 微信扫码支付所生成的图片地址
+     * 支付异常情况时信息
      */
     @Column(name = "pr_exception_msg")
     private String exceptionMsg;

+ 5 - 2
donate-service/src/main/java/com/uas/service/donate/model/ProjectReport.java

@@ -4,6 +4,10 @@ import javax.persistence.*;
 import java.text.SimpleDateFormat;
 import java.util.Date;
 
+/**
+ * 项目进度报告
+ * 2018-01-13
+ */
 @Entity
 @Table(name = "donate$projectreport")
 public class ProjectReport {
@@ -45,12 +49,11 @@ public class ProjectReport {
     private String description;
 
     /**
-     *表单提交状态
+     * 表单提交状态 (1为已提交)
      */
     @Column(name="pr_status")
     private Integer status;
 
-
     /**
      * 提交时间
      */

+ 1 - 1
donate-service/src/main/resources/config/application-dev.properties

@@ -44,7 +44,7 @@ message.msgInvitationForB2B=
 
 spring.jpa.hibernate.show-sql= true  
 spring.jpa.hibernate.ddl-auto=update
-spring.jpa.hibernate.dialect=org.hibernate.dialect.5DiGlect  
+spring.jpa.hibernate.dialect=org.hibernate.dialect.MySQL5Dialect   
 spring.jackson.serialization.indent_output=false  
 
 zk.url=zookeeper://10.10.100.11:2181

+ 1 - 1
donate-service/src/main/resources/config/application-prod.properties

@@ -44,7 +44,7 @@ message.msgInvitationForB2B=
 
 spring.jpa.hibernate.show-sql= true  
 spring.jpa.hibernate.ddl-auto=update
-spring.jpa.hibernate.dialect=org.hibernate.dialect.5DiGlect  
+spring.jpa.hibernate.dialect=org.hibernate.dialect.MySQL5Dialect   
 spring.jackson.serialization.indent_output=false  
 
 zk.url=zookeeper://10.10.100.11:2181

+ 13 - 2
donate-service/src/main/resources/config/application-test.properties

@@ -38,10 +38,21 @@ sso.cookie.domain=.ubtob.com
 sso.cookie.secure=false
 sso.login.url=https://account.ubtob.com/sso/login
 
+spring.jpa.hibernate.show-sql= true  
+spring.jpa.hibernate.ddl-auto=update
+spring.jpa.hibernate.dialect=org.hibernate.dialect.MySQL5Dialect   
+spring.jackson.serialization.indent_output=false  
+
 ## dubbo cofig
 zk.url=zookeeper://10.10.100.11:2181
-dubbo.owner=dev
-dubbo.group=dev
+dubbo.owner=test
+dubbo.group=test
+
+#设定ftl文件路径
+spring.freemarker.template-loader-path=classpath:/templates
+#设定静态文件路径,js,css等
+spring.mvc.static-path-pattern=/static/*
+spring.freemarker.cache=false
 
 # mailConfig
 mailGotPrize=