Merge branch '1.4' of https://gitlab.aillo.cc/hewei/wecloud_im_server into upay-test

common/src/main/java/com/wecloud/im/controller/SignController.java

@@ -2,7 +2,9 @@ package com.wecloud.im.controller;
 
 
 import cn.hutool.crypto.digest.MD5;
 import cn.hutool.crypto.digest.MD5;
 import com.wecloud.im.param.GetSignParam;
 import com.wecloud.im.param.GetSignParam;
+import com.wecloud.im.param.GetSignVo;
 import com.wecloud.im.service.ImClientLoginService;
 import com.wecloud.im.service.ImClientLoginService;
+import io.geekidea.springbootplus.framework.common.api.ApiResult;
 import io.geekidea.springbootplus.framework.common.controller.BaseController;
 import io.geekidea.springbootplus.framework.common.controller.BaseController;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiOperation;
@@ -33,9 +35,12 @@ public class SignController extends BaseController {
      */
      */
     @PostMapping("/get")
     @PostMapping("/get")
     @ApiOperation(value = "获取sign(仅提供测试调试使用)", notes = "生成签名测试,在生产环境中,此步骤需要第三方应用的服务端进行生成")
     @ApiOperation(value = "获取sign(仅提供测试调试使用)", notes = "生成签名测试,在生产环境中,此步骤需要第三方应用的服务端进行生成")
-    public String get(@RequestBody GetSignParam getSignParam) throws Exception {
+    public ApiResult<GetSignVo> get(@RequestBody GetSignParam getSignParam) throws Exception {
 
 
-        return new MD5().digestHex(getSignParam.getTimestamp() + getSignParam.getClientId() + getSignParam.getAppKey() + getSignParam.getAppSecret());
+        GetSignVo getSignVo = new GetSignVo();
+        String md5Str = new MD5().digestHex(getSignParam.getTimestamp() + getSignParam.getClientId() + getSignParam.getAppKey() + getSignParam.getAppSecret());
+        getSignVo.setToken(md5Str);
+        return ApiResult.ok(getSignVo);
     }
     }
 
 
 }
 }

common/src/main/java/com/wecloud/im/param/GetSignVo.java

+package com.wecloud.im.param;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+
+/**
+ *
+ */
+@Data
+@Accessors(chain = true)
+@ApiModel(value = "GetSignVo")
+public class GetSignVo implements Serializable {
+    @ApiModelProperty("token")
+    private String token;
+}
\ No newline at end of file

config/src/main/resources/config/logback.xml

@@ -167,7 +167,7 @@
     </springProfile>
     </springProfile>
 
 
     <springProfile name="prod">
     <springProfile name="prod">
-        <root level="INFO">
+        <root level="ERROR">
             <appender-ref ref="ELASTIC"/>
             <appender-ref ref="ELASTIC"/>
             <appender-ref ref="CONSOLE"/>
             <appender-ref ref="CONSOLE"/>
             <appender-ref ref="ASYNC_FILE"/>
             <appender-ref ref="ASYNC_FILE"/>