Merge remote-tracking branch 'origin/dev0.0.1' into dev-lingfeng

game-module/game-manage/pom.xml

@@ -26,6 +26,12 @@
             <artifactId>game-common-redis</artifactId>
             <version>${game-common-redis.vertion}</version>
         </dependency>
+
+        <!-- spring boot默认不去扫描 bootstrap.yml文件了 -->
+        <dependency>
+            <groupId>org.springframework.cloud</groupId>
+            <artifactId>spring-cloud-starter-bootstrap</artifactId>
+        </dependency>
     </dependencies>
 
 </project>

game-module/game-manage/src/main/java/com/zanxiang/manage/domain/bo/PayApplicationBO.java

@@ -2,6 +2,7 @@ package com.zanxiang.manage.domain.bo;
 
 import com.zanxiang.common.base.BasePage;
 import com.zanxiang.mybatis.entity.PayApplication;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
@@ -28,6 +29,21 @@ public class PayApplicationBO extends BasePage<PayApplication> implements Serial
      */
     private String name;
 
+    /**
+     * 应用AppSecret
+     */
+    private String appSecret;
+
+    private String version;
+
+    private String appDesc;
+
+    private String appUrl;
+
+    private String appLogo;
+
+    private String miniCode;
+
     /**
      * 类型 1 微信小程序
      */

game-module/game-manage/src/main/java/com/zanxiang/manage/domain/params/PayApplicationListParam.java

@@ -91,4 +91,16 @@ public class PayApplicationListParam extends BasePage<PayApplication> implements
     @ApiModelProperty(notes = "删除状态 1 已删除 0 正常")
     private Integer isDelete;
 
+    @ApiModelProperty(notes = "应用AppSecret")
+    private String appSecret;
+
+    @ApiModelProperty(notes = "版本")
+    private String version;
+
+    @ApiModelProperty(notes = "应用描述")
+    private String appDesc;
+
+    @ApiModelProperty(notes = "应用地址")
+    private String appUrl;
+
 }

game-module/game-manage/src/main/java/com/zanxiang/manage/domain/params/PayApplicationParam.java

@@ -22,12 +22,27 @@ public class PayApplicationParam implements Serializable {
 
     private Long id;
 
-    /**
-     * 应用名称
-     */
     @ApiModelProperty(notes = "应用名称")
     private String name;
 
+    @ApiModelProperty(notes = "应用AppSecret")
+    private String appSecret;
+
+    @ApiModelProperty(notes = "版本")
+    private String version;
+
+    @ApiModelProperty(notes = "应用描述")
+    private String appDesc;
+
+    @ApiModelProperty(notes = "应用地址")
+    private String appUrl;
+
+    @ApiModelProperty(notes = "应用头像")
+    private String appLogo;
+
+    @ApiModelProperty(notes = "小程序码")
+    private String miniCode;
+
     /**
      * 类型 1 微信小程序
      */

game-module/game-manage/src/main/java/com/zanxiang/manage/domain/vo/PayApplicationVO.java

@@ -98,4 +98,23 @@ public class PayApplicationVO implements Serializable {
      * 更新时间
      */
     private Date updateTime;
+
+
+    @ApiModelProperty(notes = "应用AppSecret")
+    private String appSecret;
+
+    @ApiModelProperty(notes = "版本")
+    private String version;
+
+    @ApiModelProperty(notes = "应用描述")
+    private String appDesc;
+
+    @ApiModelProperty(notes = "应用地址")
+    private String appUrl;
+
+    @ApiModelProperty(notes = "应用头像")
+    private String appLogo;
+    
+    @ApiModelProperty(notes = "小程序码")
+    private String miniCode;
 }

game-module/game-mybatis/src/main/java/com/zanxiang/mybatis/entity/PayApplication.java

@@ -38,6 +38,36 @@ public class PayApplication implements Serializable {
      */
     private Integer type;
 
+    /**
+     * 应用AppSecret
+     */
+    private String appSecret;
+
+    /**
+     * 版本
+     */
+    private String version;
+
+    /**
+     * 应用描述
+     */
+    private String appDesc;
+
+    /**
+     * 应用地址
+     */
+    private String appUrl;
+
+    /**
+     * 应用头像
+     */
+    private String appLogo;
+
+    /**
+     * 小程序码
+     */
+    private String miniCode;
+
     /**
      * 应用appid
      */