Merge branch 'dev' into test

liquidnet-bus-api/liquidnet-service-adam-api/src/main/java/com/liquidnet/service/adam/dto/AdamThirdPartParam.java

@@ -3,10 +3,8 @@ package com.liquidnet.service.adam.dto;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
-import org.springframework.validation.annotation.Validated;
 
-import javax.validation.Valid;
-import javax.validation.constraints.Pattern;
+import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.Size;
 import java.io.Serializable;
 
@@ -15,6 +13,7 @@ import java.io.Serializable;
 public class AdamThirdPartParam implements Serializable {
     private static final long serialVersionUID = 675588088506034208L;
     @ApiModelProperty(position = 11, required = true, value = "第三方OPENID[64]")
+    @NotBlank
     private String openId;
     @ApiModelProperty(position = 12, required = true, value = "昵称[64]", example = "Swagger")
 //    @Size(min = 2, max = 64)

liquidnet-bus-config/liquidnet-config/application-dev.yml

@@ -50,4 +50,13 @@ liquidnet:
       xxl:
         admin:
           addresses: 127.0.0.1:8090
+  client:
+    admin:
+      phpPayUrl: http://testpay.zhengzai.tv
+      kylinApiUrl: https://kylin.zhengzai.tv
+      phpServiceUrl: https://devservice.zhengzai.tv
+      phpoMediaApiUrl: https://devmediaapi.zhengzai.tv
+      phpMallUrl: https://devmall.zhengzai.tv
+      phpMerchantApiUrl: https://devmerchantapi.zhengzai.tv
+      phpPassportUrl: https://devpassport.zhengzai.tv
 #application-dev-end
\ No newline at end of file

liquidnet-bus-config/liquidnet-config/application-test.yml

@@ -54,3 +54,12 @@ liquidnet:
       xxl:
         admin:
           addresses: 172.17.121.166:8090
+  client:
+    admin:
+      phpPayUrl: http://testpay.zhengzai.tv
+      kylinApiUrl: https://kylin.zhengzai.tv
+      phpServiceUrl: https://devservice.zhengzai.tv
+      phpoMediaApiUrl: https://devmediaapi.zhengzai.tv
+      phpMallUrl: https://devmall.zhengzai.tv
+      phpMerchantApiUrl: https://devmerchantapi.zhengzai.tv
+      phpPassportUrl: https://devpassport.zhengzai.tv

liquidnet-bus-config/liquidnet-config/liquidnet-client-admin-web-dev.yml

@@ -9,59 +9,20 @@ liquidnet:
         name: client-admin-web
         config: classpath:logback-spring.xml
         file-max-size: 200MB
-        pattern-file: '%d{yyyy-MM-dd HH:mm:ss.SSS} [ %-5level] %thread [%logger{96}:%line] - %msg%n'
-        pattern-console: '%d{yyyy-MM-dd HH:mm:ss.SSS} [ %-5level] %thread [%logger{96}:%line] - %msg%n'
-        pattern-rolling-file-name: ${liquidnet.logfile.path}/${liquidnet.logfile.name}-%d{yyyy-MM-dd}.%i.log
-        level-root: debug
+        level: debug
     mysql:
         master:
-            urlHostAndPort: 39.106.122.201:3308
-            username: testmall
-            password: zhengzai!mYT
+            urlHostAndPort: ${liquidnet.mysql.urlHostAndPort}
+            username: ${liquidnet.mysql.username}
+            password: ${liquidnet.mysql.password}
             database-name: dev_ln_scene
         slave:
-            urlHostAndPort: 39.106.122.201:3308
-            username: testmall
-            password: zhengzai!mYT
+            urlHostAndPort: ${liquidnet.mysql.urlHostAndPort}
+            username: ${liquidnet.mysql.username}
+            password: ${liquidnet.mysql.password}
             database-name: dev_ln_scene
     mongodb:
-        host: 39.106.122.201:27017
-        port: 27017
-        user: root
-        pwd: S&y$6d*JwJ
         sslEnabled: false
         database: dev_ln_scene
-    redis:
-        host: 39.106.122.201
-        port: 6379
-        password: 3Xa%8p
-    url-refund:
-        apply: "http://testpay.zhengzai.tv/refund/single"
-        notify: "https://devkylin.zhengzai.tv/kylin/refund/callback"
-    url-banner:
-        provinces: "https://devservice.zhengzai.tv/provinces" #省份
-        url1: "https://devmediaapi.zhengzai.tv/api/video/list?per_page=50&page=1&type=1" #PGC点播
-        url2: "https://devmediaapi.zhengzai.tv/api/video/list?per_page=50&page=1&type=2" #PGC直播
-        url5: "https://devmall.zhengzai.tv/admin/fieldListForQuick?page=1&per_page=50" #场地
-        url6: "/kylin/performances/recommend/performance/status?pageNum=1&pageSize=50&status=(3,6,7,8,9,10)&title=''" #票务
-        url7: "https://devmall.zhengzai.tv/admin/goodListForQuick?page=1&per_page=50" #商品
-        url8: "https://devkylin.zhengzai.tv/kylin/performances/roadShow/list?pageNum=1&pageSize=50" #巡演
-        url13: "https://devmall.zhengzai.tv/admin/integrationListForQuick?page=1&per_page=50" #积分商城
-        url14: "https://devmall.zhengzai.tv/admin/good/collective/quick?page=1&per_page=50" #商品集合
-        url20: "https://devmerchantapi.zhengzai.tv/admin/mis/musician/quick?page=1&per_page=50" #音乐人
-        url21: "https://devmerchantapi.zhengzai.tv/admin/mis/song/quick?page=1&per_page=50" #歌曲
-        url22: "https://devmerchantapi.zhengzai.tv/admin/mis/album/quick?page=1&per_page=50" #专辑
-        url23: "https://devmediaapi.zhengzai.tv/api/play/list?page=1&per_page=50" #视频播单
-        url24: "https://devmerchantapi.zhengzai.tv/admin/mis/musician/collect?page=1&per_page=50" #音乐人合集
-        url26: "https://devpassport.zhengzai.tv/admin/vip/card/list?page=1&per_page=50&status=1" #摩登会员
-    al-oss:
-        imgUrl: "https://img.zhengzai.tv/"
-        endpoint: http://oss-cn-hangzhou.aliyuncs.com
-        accessKeyId: LTAI4FxrURzMvvu9reFgwY5o
-        accessKeySecret: Ym5tfAxOf2zX20MgjikLI3Wz3tlwVV
-    shunfeng:
-        url: "https://butler-dev-ms.sf-express.com"
-        sk: 21e9a70f677a2bf29dfa2b3bead4f018
-        appid: 557104628450889728
 
 # end-dev-这里是配置信息基本值
\ No newline at end of file

liquidnet-bus-config/liquidnet-config/liquidnet-client-admin-web.yml

@@ -13,6 +13,37 @@ ruoyi:
   # 获取ip地址开关
   addressEnabled: false
 
+#系统自定义配置
+liquidnet:
+    url-refund:
+      apply: "${liquidnet.client.admin.phpPayUrl}/refund/single"
+      notify: "${liquidnet.client.admin.kylinApiUrl}/kylin/refund/callback"
+    url-banner:
+      provinces: "${liquidnet.client.admin.phpServiceUrl}/provinces" #省份
+      url1: "${liquidnet.client.admin.phpoMediaApiUrl}/api/video/list?per_page=50&page=1&type=1" #PGC点播
+      url2: "${liquidnet.client.admin.phpoMediaApiUrl}/api/video/list?per_page=50&page=1&type=2" #PGC直播
+      url5: "${liquidnet.client.admin.phpMallUrl}/admin/fieldListForQuick?page=1&per_page=50" #场地
+      url6: "/kylin/performances/recommend/performance/status?pageNum=1&pageSize=50&status=(3,6,7,8,9,10)&title=''" #票务
+      url7: "${liquidnet.client.admin.phpMallUrl}/admin/goodListForQuick?page=1&per_page=50" #商品
+      url8: "${liquidnet.client.admin.kylinApiUrl}/kylin/performances/roadShow/list?pageNum=1&pageSize=50" #巡演
+      url13: "${liquidnet.client.admin.phpMallUrl}/admin/integrationListForQuick?page=1&per_page=50" #积分商城
+      url14: "${liquidnet.client.admin.phpMallUrl}/admin/good/collective/quick?page=1&per_page=50" #商品集合
+      url20: "${liquidnet.client.admin.phpMerchantApiUrl}/admin/mis/musician/quick?page=1&per_page=50" #音乐人
+      url21: "${liquidnet.client.admin.phpMerchantApiUrl}/admin/mis/song/quick?page=1&per_page=50" #歌曲
+      url22: "${liquidnet.client.admin.phpMerchantApiUrl}/admin/mis/album/quick?page=1&per_page=50" #专辑
+      url23: "${liquidnet.client.admin.phpoMediaApiUrl}/api/play/list?page=1&per_page=50" #视频播单
+      url24: "${liquidnet.client.admin.phpMerchantApiUrl}/admin/mis/musician/collect?page=1&per_page=50" #音乐人合集
+      url26: "${liquidnet.client.admin.phpPassportUrl}/admin/vip/card/list?page=1&per_page=50&status=1" #摩登会员
+    al-oss:
+      imgUrl: "https://img.zhengzai.tv/"
+      endpoint: http://oss-cn-hangzhou.aliyuncs.com
+      accessKeyId: LTAI4FxrURzMvvu9reFgwY5o
+      accessKeySecret: Ym5tfAxOf2zX20MgjikLI3Wz3tlwVV
+    shunfeng:
+      url: "https://butler-dev-ms.sf-express.com"
+      sk: 21e9a70f677a2bf29dfa2b3bead4f018
+      appid: 557104628450889728
+
 # 开发环境配置
 server:
   # 服务器的HTTP端口，默认为80

liquidnet-bus-service/liquidnet-service-adam/liquidnet-service-adam-impl/src/main/java/com/liquidnet/service/adam/controller/AdamLoginController.java

@@ -17,6 +17,7 @@ import com.liquidnet.service.adam.dto.vo.AdamUserInfoVo;
 import com.liquidnet.service.adam.service.*;
 import com.liquidnet.service.base.ErrorMapping;
 import com.liquidnet.service.base.ResponseDto;
+import com.liquidnet.service.base.UserPathDto;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
@@ -170,6 +171,7 @@ public class AdamLoginController {
         loginInfoVo.setUserInfo(userInfoVo);
         loginInfoVo.setToken(this.ssoProcess(userInfoVo));
         loginInfoVo.getUserInfo().setMobile(SensitizeUtil.custom(userInfoVo.getMobile(), 3, 4));
+        log.info(UserPathDto.setData(toRegister ? "注册":"登录", ServletUtils.getRequest().getParameterMap(), loginInfoVo));
         return ResponseDto.success(loginInfoVo);
     }
 
@@ -207,19 +209,16 @@ public class AdamLoginController {
         loginInfoVo.setUserInfo(userInfoVo);
         loginInfoVo.setToken(this.ssoProcess(userInfoVo));
         loginInfoVo.getUserInfo().setMobile(SensitizeUtil.custom(userInfoVo.getMobile(), 3, 4));
+        log.info(UserPathDto.setData(toRegister ? "注册":"登录", ServletUtils.getRequest().getParameterMap(), loginInfoVo));
         return ResponseDto.success(loginInfoVo);
     }
 
     @ApiOperationSupport(order = 5)
     @ApiOperation(value = "第三方账号登录")
     @PostMapping(value = {"login/tpa"})
-    public ResponseDto<AdamLoginInfoVo> loginByTpa(@RequestBody @Valid AdamThirdPartParam parameter) {
+    public ResponseDto<AdamLoginInfoVo> loginByTpa(@Valid @RequestBody AdamThirdPartParam parameter) {
         log.debug("login by tpa:{}", JsonUtils.toJson(parameter));
-
-        if (StringUtils.isBlank(parameter.getOpenId())) {
-            return ResponseDto.failure(ErrorMapping.get("10009"));
-        }
-
+        boolean toRegister = false;
         AdamLoginInfoVo loginInfoVo = AdamLoginInfoVo.getNew();
         if (StringUtils.isEmpty(parameter.getMobile())) {
             String uid = adamRdmService.getUidByPlatformOpenId(parameter.getPlatform(), parameter.getOpenId());
@@ -238,12 +237,14 @@ public class AdamLoginController {
             if (null == registerUserInfo) {
                 return ResponseDto.failure(ErrorMapping.get("10000"));
             }
+            toRegister = true;
             loginInfoVo.setUserInfo(registerUserInfo);
             loginInfoVo.setThirdPartInfo(adamRdmService.getThirdPartVoListByUid(registerUserInfo.getUid()));
 //            loginInfoVo.setMemberVo(adamRdmService.getMemberSimpleVo());
         }
         loginInfoVo.setToken(this.ssoProcess(loginInfoVo.getUserInfo()));
         loginInfoVo.getUserInfo().setMobile(SensitizeUtil.custom(loginInfoVo.getUserInfo().getMobile(), 3, 4));
+        log.info(UserPathDto.setData(toRegister ? "注册":"登录", ServletUtils.getRequest().getParameterMap(), loginInfoVo));
         return ResponseDto.success(loginInfoVo);
     }
 

liquidnet-bus-service/liquidnet-service-adam/liquidnet-service-adam-impl/src/main/resources/errors.properties

@@ -12,7 +12,7 @@
 10006=第三方账号未注册
 10007=该第三方账号已经被其他用户绑定
 10008=已经绑定过该类型的第三方账号
-10009=OPENID不能为空
+10009=
 10010=
 10011=性别标签无效
 10012=音乐风格标签无效