增加官网的地址到配置文件里

mall-common/src/main/java/com/suisung/mall/common/modules/esign/EsignPlatformInfo.java

@@ -9,6 +9,7 @@
 package com.suisung.mall.common.modules.esign;
 
 import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import io.swagger.annotations.ApiModel;
@@ -54,12 +55,18 @@ public class EsignPlatformInfo implements Serializable {
     @ApiModelProperty(value = "平台方营业执照上的经营内容")
     private String license_content;
 
-    @ApiModelProperty(value = "代理商的省/市/区，如：广东省/深圳市/福田区")
+    @ApiModelProperty(value = "代理商执照的省/市/区，如：广东省/深圳市/福田区")
     private String license_area;
 
-    @ApiModelProperty(value = "代理商的省id/市id/区id，如：11000/11100/11101")
+    @ApiModelProperty(value = "代理商营业执照的省id/市id/区id，如：11000/11100/11101")
     private String license_district_id;
 
+    @ApiModelProperty(value = "期望代理的省/市/区，如：广东省/深圳市/福田区")
+    private String agent_area;
+
+    @ApiModelProperty(value = "期望代理的省id/市id/区id，如：11000/11100/11101")
+    private String agent_district_id;
+
     @ApiModelProperty(value = "平台方营业执照公司详细地址")
     private String license_address;
 
@@ -114,6 +121,7 @@ public class EsignPlatformInfo implements Serializable {
     @ApiModelProperty(value = "邀请码，后期跟收益有关")
     private String invite_code;
 
+    @TableField(exist = false)
     @ApiModelProperty(value = "代理商邀请链接")
     private String invite_url;
 

mall-shop/pom.xml

@@ -459,6 +459,7 @@
                     <include>application.yml</include>
                     <include>bootstrap.yml</include>
                     <include>bootstrap-${profiles.active}.yml</include>
+                    <include>**/*.yml</include>
                     <include>**/*.xml</include>
                     <include>**/*.crt</include>
                     <include>**/*.pem</include>

mall-shop/src/main/java/com/suisung/mall/shop/esign/service/impl/EsignPlatformInfoServiceImpl.java

@@ -47,7 +47,7 @@ import static com.suisung.mall.common.utils.ContextUtil.getCurrentUser;
 @Service
 public class EsignPlatformInfoServiceImpl extends BaseServiceImpl<EsignPlatformInfoMapper, EsignPlatformInfo> implements EsignPlatformInfoService {
 
-    @Value("${website.domain}")
+    @Value("${website_domain}")
     private String websiteDomain;
 
     @Lazy
@@ -531,6 +531,8 @@ public class EsignPlatformInfoServiceImpl extends BaseServiceImpl<EsignPlatformI
                 record.getLicense_image(),
                 record.getLicense_area(),
                 record.getLicense_district_id(),
+                record.getAgent_area(),
+                record.getAgent_district_id(),
                 record.getLegal_person_name(),
                 record.getLegal_person_mobile(),
                 record.getLegal_person_id_card(),
@@ -671,6 +673,8 @@ public class EsignPlatformInfoServiceImpl extends BaseServiceImpl<EsignPlatformI
                 record.getLicense_image(),
                 record.getLicense_area(),
                 record.getLicense_district_id(),
+                record.getAgent_area(),
+                record.getAgent_district_id(),
                 record.getLegal_person_name(),
                 record.getLegal_person_mobile(),
                 record.getLegal_person_id_card(),

mall-shop/src/main/resources/bootstrap-local.yml

@@ -150,7 +150,7 @@ logging:
     springfox: error
 # 项目主域名
 main_domain: @project.domain@
-website_domain: @project.website@
+website_domain: "@project.website@"
 # 个推
 getui:
   # Url前缀

mall-shop/src/main/resources/bootstrap-prod.yml

@@ -163,7 +163,7 @@ logging:
     springfox: error
 # 项目主域名
 main_domain: @project.domain@
-website_domain: @project.website@
+website_domain: "@project.website@"
 # 个推
 getui:
   # Url前缀

pom.xml

@@ -351,7 +351,7 @@
                 <!-- 图片上传配置 -->
                 <upload.filepath>D:/wwwroot/mall/public/static</upload.filepath>
                 <!--项目域名-->
-                <project.website>https://www.gpxscs.cn </project.website>
+                <project.website>https://www.gpxscs.cn</project.website>
                 <project.domain>https://mall.gpxscs.cn</project.domain>
                 <project.static_domain>https://static.gpxscs.cn</project.static_domain>
             </properties>