Merge remote-tracking branch 'origin/dev' into dev

blade-auth/src/main/java/org/springblade/auth/service/BladeUserDetailsServiceImpl.java

@@ -80,11 +80,15 @@ public class BladeUserDetailsServiceImpl implements UserDetailsService {
 		String openId = request.getParameter(TokenUtil.OPEN_ID);
 		String unionId = request.getParameter(TokenUtil.UNION_ID);
 		String appletsId = request.getParameter(TokenUtil.APPLETS_ID);
+		String appId = request.getHeader(TokenUtil.APPId);
 
 		//判断租户号是否为空  为空查询数据库赋值
 		if (ObjectUtils.isNull(headerTenant) && ObjectUtils.isNull(paramTenant)) {
 			User user = new User();
 			R<Tenant> tenant = null;
+			if (ObjectUtils.isNull(appletsId)) {
+				appletsId = appId;
+			}
 			//判断是否是小程序登录
 			if (ObjectUtils.isNotNull(appletsId)) {
 				//通过小程序appId查到租户信息
@@ -113,11 +117,13 @@ public class BladeUserDetailsServiceImpl implements UserDetailsService {
 					saveUser.setRealName(username);
 					saveUser.setUserType(4);
 					saveUser.setPhone(username);
-					saveUser.setDeptId(parametersR.getData().getSalesCompanyId().toString());
+					saveUser.setDeptId(ObjectUtils.isNotNull(parametersR.getData().getSalesCompanyId()) ? parametersR.getData().getSalesCompanyId().toString() : "");
 					//获取注册用户类型
 					R<String> r = sysClient.getRoleIds(tenant.getData().getTenantId(), "客户");
 					if (r.isSuccess() && ObjectUtils.isNotNull(r.getData())) {
 						saveUser.setRoleId(r.getData());
+					}else{
+						saveUser.setRoleId("");
 					}
 					saveUser.setPassword("123456");
 					R<Boolean> result = userClient.saveUser(saveUser);

blade-auth/src/main/java/org/springblade/auth/utils/TokenUtil.java

@@ -86,6 +86,7 @@ public class TokenUtil {
 	public final static String OPEN_ID = "open_id";
 	public final static String UNION_ID = "union_id";
 	public final static String APPLETS_ID = "applets_id";
+	public final static String APPId = "appId";
 
 	private static BladeTenantProperties tenantProperties;
 

blade-service/blade-pay/src/main/java/org/springblade/pay/tonglianPayment/service/impl/PaymentServiceImpl.java

@@ -274,7 +274,6 @@ public class PaymentServiceImpl implements IPaymentService {
 			request.setCharacterEncoding("UTF-8");
 			response.setCharacterEncoding("UTF-8");
 			TreeMap<String, String> params = NotifyServlet.getParams(request);
-			System.out.println("回调函数数据======》" + params.toString());
 			String appKey;
 
 			WechatMark wechatMark = new WechatMark();
@@ -296,7 +295,6 @@ public class PaymentServiceImpl implements IPaymentService {
 			}
 			// 接受到推送通知,首先验签
 			boolean isSign = SybUtil.validSign(params, appKey, params.get("signtype"));
-			System.out.println("验签结果:" + isSign);
 
 			wechatMark.setCreateTime(new Date());
 			wechatMark.setType("支付");