Merge branch 'dev' into 'mp-server-test'

Dev

See merge request quanshu/mp-server!305

mp-admin/src/main/java/com/qs/mp/web/controller/api/user/UserShareController.java

@@ -40,9 +40,9 @@ public class UserShareController extends BaseApiController {
 	@PostMapping("/code/generate")
 	public AjaxResult generateInviteCode(@RequestBody  JSONObject jsonObject) {
 		String boxId = jsonObject.getString("boxId"); // 票组ID
-		String type = jsonObject.getString("type"); // 分享类型，channel/user
+		String type = jsonObject.getString("type"); // 分享类型，1/2
 		Long userId = SecurityUtils.getUserId();
-		String rst = wxUrlLinkService.generateUnlimitCode("pages/ticketBox/detail", "boxId=" + boxId + "&suid=" + userId + "&type=" + type, userAppId);
+		String rst = wxUrlLinkService.generateUnlimitCode("pages/ticketBox/detail", boxId + "&" + userId + "&" + type, userAppId);
 		return new AjaxResult(Type.SUCCESS, "", rst);
 	}
 }

mp-admin/src/main/resources/application-8100.yml

@@ -16,6 +16,7 @@ logging:
     io.lettuce.core: warn
     org.quartz.core: warn
     com.qs.mp.framework.interceptor: warn
+    ma.glasnost.orika: warn
 # 数据源配置
 spring:
     redis:

mp-admin/src/main/resources/application-8200.yml

@@ -16,6 +16,7 @@ logging:
     io.lettuce.core: warn
     org.quartz.core: warn
     com.qs.mp.framework.interceptor: warn
+    ma.glasnost.orika: warn
 # 数据源配置
 spring:
     redis:

mp-admin/src/main/resources/application-dev.yml

@@ -87,6 +87,7 @@ logging:
         org.apache: warn
         io.lettuce.core: warn
         com.qs.mp.framework.interceptor: warn
+        ma.glasnost.orika: warn
 
 # 开发环境配置
 server:

mp-admin/src/main/resources/application-test.yml

@@ -14,6 +14,7 @@ logging:
     io.lettuce.core: warn
     org.quartz.core: warn
     com.qs.mp.framework.interceptor: warn
+    ma.glasnost.orika: warn
 # 数据源配置
 spring:
     redis:

mp-service/src/main/java/com/qs/mp/user/domain/vo/UserShareVO.java

@@ -11,6 +11,6 @@ public class UserShareVO {
   private Long suid; // 分享者uid
   private String type; // 分享者类型
 
-  public static final String SHARE_TYPE_USER = "user"; // 用户分享
-  public static final String SHARE_TYPE_SITE = "site"; // 经销商分享
+  public static final String SHARE_TYPE_USER = "1"; // 用户分享
+  public static final String SHARE_TYPE_SITE = "2"; // 经销商分享
 }