Merge branch 'dev' of http://192.168.1.222:10010/zhongzheng-edu/zz_backend into dev

run-prod.sh

@@ -142,7 +142,7 @@ echo '----rm image saas----'
 # 打包编译docker镜像
 docker build -f /mydata/maven/build/Dockerfile-saas -t ${group_saas_name}/${app_saas_name}:${app_saas_version} .
 echo '----build image saas----'
-docker run -p 7077:7077 --name ${app_saas_name} \
+docker run -p 5051:7077 --name ${app_saas_name} \
 --restart=always \
 -e 'spring.profiles.active'=${profile_saas_active} \
 -e TZ="Asia/Shanghai" \

zhongzheng-api/src/main/resources/application-prod.yml

@@ -91,16 +91,17 @@ spring:
 #            prefix: oss/images/ # 上传文件夹路径前缀 `
 aliyun:
     oss:
-        endpoint: https://file-dev.xyyxt.net # oss对外服务的访问域名
+        endpoint: https://file.xyyxt.net # oss对外服务的访问域名
         accessKeyId: LTAIgC8O2WUXvXuR  # 访问身份验证中用到用户标识
         accessKeySecret: 1yyCazuT1M6MruBXzgFjP0p9gdMlwX # 用户用于加密签名字符串和oss用来验证签名字符串的密钥
-        bucketName: zhongzheng-test # oss的存储空间
+        bucketName: zhongzheng-prod # oss的存储空间
         policy:
             expire: 30 # 签名有效期(S)
         maxSize: 10 # 上传文件大小(M)
-        callback: http://120.79.166.78:7072/aliyun/oss/callback # 文件上传成功后的回调地址
+        callback: https://api.xyyxt.net/aliyun/oss/callback # 文件上传成功后的回调地址
         dir:
             prefix: oss/images/ # 上传文件夹路径前缀 `
+
 poliv:
     token:
         userid: d5f6d309fe

zhongzheng-system/src/main/java/com/zhongzheng/modules/recruit/bo/RecruitCompanyEditBo.java

@@ -94,7 +94,4 @@ public class RecruitCompanyEditBo {
     @ApiModelProperty("-1 删除  1正常")
     private Integer status;
 
-    /** 商户ID */
-    @ApiModelProperty("商户ID")
-    private Long tenantId;
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/recruit/bo/RecruitCompanyTradeEditBo.java

@@ -34,9 +34,7 @@ public class RecruitCompanyTradeEditBo {
     @ApiModelProperty("父类ID")
     private Long fatherId;
 
-    /** 商户ID */
-    @ApiModelProperty("商户ID")
-    private Long tenantId;
+
 
     /** $column.columnComment */
     @ApiModelProperty("$column.columnComment")

zhongzheng-system/src/main/java/com/zhongzheng/modules/recruit/bo/RecruitInterviewEditBo.java

@@ -60,9 +60,6 @@ public class RecruitInterviewEditBo {
     @ApiModelProperty("0已投递  1 已发邀请  2已确定 3 已谢绝 4初试通过 5初试不通过 6复试通过 7复试不通过 8已发offer 9爽约 10 淘汰  11放弃  12 转正")
     private Integer status;
 
-    /** 商户ID */
-    @ApiModelProperty("商户ID")
-    private Long tenantId;
 
     /** 面试用户id */
     @ApiModelProperty("面试用户id")

zhongzheng-system/src/main/java/com/zhongzheng/modules/recruit/bo/RecruitInterviewLogAddBo.java

@@ -36,4 +36,8 @@ public class RecruitInterviewLogAddBo {
     /** 小程序用户id */
     @ApiModelProperty("小程序用户id")
     private Long userId;
+
+    /** 商户ID */
+    @ApiModelProperty("商户ID")
+    private Long tenantId;
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/recruit/domain/RecruitInterviewLog.java

@@ -48,4 +48,7 @@ private static final long serialVersionUID=1L;
     /** 小程序用户id */
     private Long userId;
 
+    /** 商户ID */
+    private Long tenantId;
+
 }