Merge remote-tracking branch 'origin/master'

# Conflicts:
#	kustomization/overlays/dev/kustomization.yaml

.gitlab-ci.yml

@@ -59,6 +59,7 @@ docker_build_prod:
     - docker logout
 
 
+
 kustomize_set_image_dev:
   stage: kustomize_tag_push
   variables:

cms-common/cms-common-model/src/main/java/com/mmc/iuav/user/model/dto/dronepilot/PilotCertificationDTO.java

@@ -41,7 +41,7 @@ public class PilotCertificationDTO {
     @NotBlank(message = "电子执照的编号不能为空", groups = {Create.class, Update.class})
     private String licenseNumber;
 
-    @ApiModelProperty(value = "上传执照", example = "http://pad-video-x.oss-cn-shenzhen.aliyuncs.com/file/2cbbeffb-c1d1-4b26-a9a9-9e17c85e35a9.jpg", required = true)
+    @ApiModelProperty(value = "上传执照", example = "http://share-fly.oss-cn-hangzhou.aliyuncs.com/file/2cbbeffb-c1d1-4b26-a9a9-9e17c85e35a9.jpg", required = true)
     @NotBlank(message = "上传执照的照片不能为空", groups = {Create.class, Update.class})
     private String licenseUrl;
 
@@ -61,7 +61,7 @@ public class PilotCertificationDTO {
     @NotNull(message = "能力不能为空", groups = {Create.class, Update.class})
     List<PilotAbilityVO> pilotAbility;
 
-    @ApiModelProperty(value = "能力不能为空", example = "http://pad-video-x.oss-cn-shenzhen.aliyuncs.com/file/2cbbeffb-c1d1-4b26-a9a9-9e17c85e35a9.jpg", required = true)
+    @ApiModelProperty(value = "能力不能为空", example = "http://share-fly.oss-cn-hangzhou.aliyuncs.com/file/2cbbeffb-c1d1-4b26-a9a9-9e17c85e35a9.jpg", required = true)
     @NotBlank(message = "能力图片不能为空", groups = {Create.class, Update.class})
     private String abilityUrl;
 

cms-common/cms-common-model/src/main/java/com/mmc/iuav/user/model/vo/CompanyInfoVO.java

@@ -74,7 +74,7 @@ public class CompanyInfoVO implements Serializable {
     private String content;
     @ApiModelProperty(value = "评分", example = "*****")
     private Integer score;
-    @ApiModelProperty(value = "背景图", example = "http://pad-video-x.oss-cn-shenzhen.aliyuncs.com/file/3505c402-cbf9-41a5-9d6f-bdb350625bea.jpg")
+    @ApiModelProperty(value = "背景图", example = "http://share-fly.oss-cn-hangzhou.aliyuncs.com/file/3505c402-cbf9-41a5-9d6f-bdb350625bea.jpg")
     private String backImg;
     @ApiModelProperty(value = "当前距离")
     private Double distance;

cms-common/cms-common-model/src/main/java/com/mmc/iuav/user/model/vo/dronepilot/PilotCertificationVO.java

@@ -42,7 +42,7 @@ public class PilotCertificationVO {
     @NotBlank(message = "电子执照的编号不能为空", groups = {Create.class, Update.class})
     private String licenseNumber;
 
-    @ApiModelProperty(value = "上传执照", example = "http://pad-video-x.oss-cn-shenzhen.aliyuncs.com/file/2cbbeffb-c1d1-4b26-a9a9-9e17c85e35a9.jpg", required = true)
+    @ApiModelProperty(value = "上传执照", example = "http://share-fly.oss-cn-hangzhou.aliyuncs.com/file/2cbbeffb-c1d1-4b26-a9a9-9e17c85e35a9.jpg", required = true)
     @NotBlank(message = "上传执照的照片不能为空", groups = {Create.class, Update.class})
     private String licenseUrl;
 
@@ -62,7 +62,7 @@ public class PilotCertificationVO {
     @NotNull(message = "能力不能为空", groups = {Create.class, Update.class})
     List<PilotAbilityVO> pilotAbility;
 
-    @ApiModelProperty(value = "能力不能为空", example = "http://pad-video-x.oss-cn-shenzhen.aliyuncs.com/file/2cbbeffb-c1d1-4b26-a9a9-9e17c85e35a9.jpg", required = true)
+    @ApiModelProperty(value = "能力不能为空", example = "http://share-fly.oss-cn-hangzhou.aliyuncs.com/file/2cbbeffb-c1d1-4b26-a9a9-9e17c85e35a9.jpg", required = true)
     @NotBlank(message = "能力图片不能为空", groups = {Create.class, Update.class})
     private String abilityUrl;
 

csm-service/cms-service-user/src/main/java/com/mmc/iuav/user/auth/TokenCheckHandleInterceptor.java

@@ -54,7 +54,7 @@ public class TokenCheckHandleInterceptor implements HandlerInterceptor {
 //        log.info("remoteHost: {}", remoteHost);
 //        log.info("forwardedFor: {}", forwardedFor);
 //        log.info("forwardedHost: {}", forwardedHost);
-//        if (hostName.equals("iuav.mmcuav.cn") || hostName.equals("test.iuav.mmcuav.cn") || hostName.equals("www.iuav.shop") || hostName.equals("test.iuav.shop")){
+//        if (hostName.equals("iuav.mmcuav.cn") || hostName.equals("test.iuav.mmcuav.cn") || hostName.equals("www.iuav.com") || hostName.equals("test.iuav.com")){
 //            String token = request.getHeader("token");
 //            if (StringUtils.isBlank(token)){
 //                exceptionProcess(response);

csm-service/cms-service-user/src/main/java/com/mmc/iuav/user/entity/dronepilot/PilotCertificationDO.java

@@ -46,7 +46,7 @@ public class PilotCertificationDO {
     @NotBlank(message = "电子执照的编号不能为空", groups = {Create.class, Update.class})
     private String licenseNumber;
 
-    @ApiModelProperty(value = "上传执照", example = "http://pad-video-x.oss-cn-shenzhen.aliyuncs.com/file/2cbbeffb-c1d1-4b26-a9a9-9e17c85e35a9.jpg", required = true)
+    @ApiModelProperty(value = "上传执照", example = "http://share-fly.oss-cn-hangzhou.aliyuncs.com/file/2cbbeffb-c1d1-4b26-a9a9-9e17c85e35a9.jpg", required = true)
     @NotBlank(message = "上传执照的照片不能为空", groups = {Create.class, Update.class})
     private String licenseUrl;
 
@@ -67,7 +67,7 @@ public class PilotCertificationDO {
     @NotNull(message = "能力不能为空", groups = {Create.class, Update.class})
     private List<PilotAbilityVO> pilotAbility;
 
-    @ApiModelProperty(value = "能力不能为空", example = "http://pad-video-x.oss-cn-shenzhen.aliyuncs.com/file/2cbbeffb-c1d1-4b26-a9a9-9e17c85e35a9.jpg", required = true)
+    @ApiModelProperty(value = "能力不能为空", example = "http://share-fly.oss-cn-hangzhou.aliyuncs.com/file/2cbbeffb-c1d1-4b26-a9a9-9e17c85e35a9.jpg", required = true)
     @NotBlank(message = "能力图片不能为空", groups = {Create.class, Update.class})
     private String abilityUrl;
 

csm-service/cms-service-user/src/main/java/com/mmc/iuav/user/service/xzsz/impl/XzServiceImpl.java

@@ -154,7 +154,7 @@ public class XzServiceImpl implements XzService {
                     .customParams(com.alibaba.fastjson2.JSONObject.toJSONString(userInfo))
                     .idCardNo(realNameAuthDO.getIdNumber())
                     .infoSource("1")
-                    .jumpPage("https://test.iuav.shop/network/#/pages/electronic-contracting/index")
+                    .jumpPage("https://test.iuav.com/network/#/pages/electronic-contracting/index")
                     .mobile(loginSuccessDTO.getPhoneNum())
                     .notifyUrl(userSystemConstant.getAuthNotify())
                     .position(userSystemConstant.getXzPosition())

csm-service/cms-service-user/src/main/java/com/mmc/iuav/user/util/SmsUtil.java

@@ -11,8 +11,8 @@ import com.google.gson.Gson;
  */
 public class SmsUtil {
 
-    public static String ALIYUN_OSS_ACCESS_KEY_ID = "LTAI4FzCpyrA33PegnxWS6XV";
-    public static String ALIYUN_OSS_ACCESS_KEY_SECRET = "ILuNh3zJfRjg3iARSipMWBKCjglz3u";
+    public static String ALIYUN_OSS_ACCESS_KEY_ID = "LTAI5tK6UG2LzMkf1FKZBkBU";
+    public static String ALIYUN_OSS_ACCESS_KEY_SECRET = "UrXws5uVH6JMf0jCwipjOug4nHQvAz";
 
     public static String CLOUD_JOIN_WEBSITE = "云享飞";
 

csm-service/cms-service-user/src/main/resources/application-dev.yml

@@ -3,7 +3,7 @@ spring:
   #Database
   datasource:
     driver-class-name: com.mysql.cj.jdbc.Driver
-    url: jdbc:mysql://mysql.default:3306/iuav_cms_dev?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=GMT%2B8
+    url: jdbc:mysql://rm-bp1m8kze2l399i1jyko.mysql.rds.aliyuncs.com:3306/iuav_cms_dev?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=GMT%2B8
     username: iuav_dev
     password: ${MYSQL_PASSWORD}
     #   Druid数据源配置
@@ -38,12 +38,12 @@ spring:
   #        login-password: druid
   redis:
     database: 1
-    host: redis.default
+    host: 172.24.1.207
     password: ${REDIS_PASSWORD}
     port: 6379
   #rabbitMQ
   rabbitmq:
-    host: amqp-cn-zvp2ozhnj001.cn-shenzhen.amqp-0.vpc.mq.amqp.aliyuncs.com
+    host: 172.24.1.207
     port: 5672
     username: MjphbXFwLWNuLXp2cDJvemhuajAwMTpMVEFJNEZ6Q3B5ckEzM1BlZ254V1M2WFY=
     password: ${RABBITMQ_PASSWORD}
@@ -82,15 +82,15 @@ third-party:
     domain: https://saas.xzsz.ltd
     position: 市场推广
     taxFundId: 0b0376083af4435885bd5d5cd3d63053
-    authNotify: https://test.iuav.shop/userapp/xz/xzAuthNotify
-    withdrawNotify: https://test.iuav.shop/userapp/xz/xzWithdrawNotify
+    authNotify: https://test.iuav.com/userapp/xz/xzAuthNotify
+    withdrawNotify: https://test.iuav.com/userapp/xz/xzWithdrawNotify
 
 fdd:
   appid: 407664
   appkey: q146q3Cjmi7Y6BVl8jtZK9pH
   version: 2
   host: https://testapi06.fadada.com/api/
-  mmc-url: https://test.iuav.shop/userapp/
+  mmc-url: https://test.iuav.com/userapp/
 
 iuav:
   pay:

csm-service/cms-service-user/src/main/resources/application-local.yml

@@ -3,19 +3,19 @@ spring:
   #Database
   datasource:
     driver-class-name: com.mysql.cj.jdbc.Driver
-    url: jdbc:mysql://rm-wz9dd796t4j1giz6t2o.mysql.rds.aliyuncs.com:3306/iuav_cms_dev?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=GMT%2B8
+    url: jdbc:mysql://rm-bp1m8kze2l399i1jyko.mysql.rds.aliyuncs.com:3306/iuav_cms_dev?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=GMT%2B8
     username: iuav_dev
     password: IUAV_DEV@2023&MYSQL
     #   Druid数据源配置
     type: com.alibaba.druid.pool.DruidDataSource
   redis:
     database: 1
-    host: r-wz9ke310fs684hacn1pd.redis.rds.aliyuncs.com
+    host: 172.24.1.207
     port: 6379
     password: MMC@2022&REDIS
   #rabbitMQ
   rabbitmq:
-    host: amqp-cn-zvp2ozhnj001.cn-shenzhen.amqp-0.net.mq.amqp.aliyuncs.com
+    host: 172.24.1.207
     port: 5672
     username: MjphbXFwLWNuLXp2cDJvemhuajAwMTpMVEFJNEZ6Q3B5ckEzM1BlZ254V1M2WFY=
     password: RTg3OUMxQzk4NzU0NDQ4RkQ1RDg4MkEzQjY4M0M3MkQxOTM2QkEyNDoxNjUyNDA4NDk0NDg4
@@ -46,15 +46,15 @@ third-party:
     domain: https://uat.xzsz.ltd/
     position: 销售推广
     taxFundId: 8ae605f565884a1f9a5e91d5a661ce58
-    authNotify: https://test.iuav.shop/userapp/xz/xzAuthNotify
-    withdrawNotify: https://test.iuav.shop/userapp/xz/xzWithdrawNotify
+    authNotify: https://test.iuav.com/userapp/xz/xzAuthNotify
+    withdrawNotify: https://test.iuav.com/userapp/xz/xzWithdrawNotify
 
 fdd:
   appid: 407664
   appkey: q146q3Cjmi7Y6BVl8jtZK9pH
   version: 2
   host: https://testapi06.fadada.com/api/
-  mmc-url: https://test.iuav.shop/userapp/
+  mmc-url: https://test.iuav.com/userapp/
 
 iuav:
   pay:

csm-service/cms-service-user/src/main/resources/application-prod.yml

@@ -3,7 +3,7 @@ spring:
   #Database
   datasource:
     driver-class-name: com.mysql.cj.jdbc.Driver
-    url: jdbc:mysql://mysql.default:3306/iuav_cms?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=GMT%2B8
+    url: jdbc:mysql://rm-bp1m8kze2l399i1jyko.mysql.rds.aliyuncs.com:3306/iuav_cms?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=GMT%2B8
     username: iuav
     password: ${MYSQL_PASSWORD}
     #   Druid数据源配置
@@ -38,12 +38,12 @@ spring:
   #        login-password: druid
   redis:
     database: 5
-    host: redis.default
+    host: 172.24.1.207
     password: ${REDIS_PASSWORD}
     port: 6379
   #rabbitMQ
   rabbitmq:
-    host: amqp-cn-zvp2ozhnj001.cn-shenzhen.amqp-0.vpc.mq.amqp.aliyuncs.com
+    host: 172.24.1.207
     port: 5672
     username: MjphbXFwLWNuLXp2cDJvemhuajAwMTpMVEFJNEZ6Q3B5ckEzM1BlZ254V1M2WFY=
     password: ${RABBITMQ_PASSWORD}
@@ -74,15 +74,15 @@ third-party:
     domain: https://saas.xzsz.ltd
     position: 市场推广
     taxFundId: 0b0376083af4435885bd5d5cd3d63053
-    authNotify: https://www.iuav.shop/userapp/xz/xzAuthNotify
-    withdrawNotify: https://www.iuav.shop/userapp/xz/xzWithdrawNotify
+    authNotify: https://www.iuav.com/userapp/xz/xzAuthNotify
+    withdrawNotify: https://www.iuav.com/userapp/xz/xzWithdrawNotify
 
 fdd:
   appid: 502624
   appkey: mDWdQ0jnx0iEJuJkLdKJsc0l
   version: 2
   host: https://textapi06.fadada.com/api2/
-  mmc-url: https://www.iuav.shop/userapp/
+  mmc-url: https://www.iuav.com/userapp/
 
 iuav:
   pay:

kustomization/overlays/prod/kustomization.yaml

@@ -18,4 +18,4 @@ patches:
 images:
 - name: REGISTRY/NAMESPACE/IMAGE:TAG
   newName: mmc-registry.cn-shenzhen.cr.aliyuncs.com/sharefly/cms
-  newTag: 1ab13d69651c5b403ab777b73c8ad72ec5831057
+  newTag: 1d65616deb87007a6d278ce80bd5fbfbc8993e9f