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

Dev

See merge request quanshu/mp-server!264

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

@@ -81,7 +81,7 @@ public class ChannelMgrController extends BaseApiController {
 		queryWrapper.gt("t1.level", 0);
 		queryWrapper.likeRight(null != channel && StringUtils.isNotBlank(channel.getMobile()), "t1.mobile", channel.getMobile());
 		queryWrapper.likeRight(null != channel && StringUtils.isNotBlank(channel.getName()), "t1.name", channel.getName());
-		queryWrapper.orderByDesc("t1.channel_id");
+		queryWrapper.orderByAsc("t1.level").orderByDesc("t1.channel_id");
 		queryWrapper.last("limit 50");
 		list = channelService.selectChannelVoList(queryWrapper);
 		if(null != list && list.size() > 0) {
@@ -114,7 +114,7 @@ public class ChannelMgrController extends BaseApiController {
 		List<Channel> list = new ArrayList<Channel>();
 		LambdaQueryWrapper<Channel> queryWrapper = new LambdaQueryWrapper<Channel>();
 		queryWrapper.gt(Channel::getLevel, 0);
-		queryWrapper.orderByDesc(Channel::getChannelId);
+		queryWrapper.orderByAsc(Channel::getLevel).orderByDesc(Channel::getChannelId);
 		list = channelService.list(queryWrapper);
 		return AjaxResult.success(list);
 	}
@@ -140,7 +140,7 @@ public class ChannelMgrController extends BaseApiController {
 		queryWrapper.eq(null != channel && null != channel.getProvinceId(), "t1.province_id", channel.getProvinceId());
 		queryWrapper.eq(null != channel && null != channel.getCityId(), "t1.city_id", channel.getCityId());
 		queryWrapper.eq(null != channel && null != channel.getAreaId(), "t1.area_id", channel.getAreaId());
-		queryWrapper.orderByDesc("t1.channel_id");
+		queryWrapper.orderByAsc("t1.level").orderByDesc("t1.channel_id");
 		list = channelService.selectChannelVoList(queryWrapper);
 		if(null != list && list.size() > 0) {
 			for(ChannelVO channelVO : list) {

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

@@ -96,7 +96,7 @@ server:
   # 生成唯一ID的，同一Mac地址多应用的部署方式，用这个进行区分
   datacenterId: 1
   # 环境标识
-  env: prod
+  env: test
 
 
 #API访问

mp-admin/src/test/java/com/qs/mp/service/ServiceImplTest.java

@@ -36,7 +36,7 @@ public class ServiceImplTest {
 
   @Test
   public void testGenerateQrCode() {
-    System.out.println(wxUrlLinkService.generateCode("pages/index/index", "id=1", "wx8533800e393dbd6b"));
+    System.out.println(wxUrlLinkService.generateCode("pages/index/index", "id=1", "wxc3a684f1196f6e15"));
 
   }
 

mp-common/src/main/java/com/qs/mp/common/jsms/JSMSUtils.java

@@ -87,7 +87,7 @@ public class JSMSUtils {
         try {
             if (ServerEnvEnum.PROD.getCode().equals(env)) {
                 SendSMSResult res = client.sendTemplateSMS(payload);
-                LogUtil.info(logger, "账单支付失败短信发送，mobile:{0}, res:{1}", new Object[]{mobile, JSON.toJSONString(res)});
+                LogUtil.info(logger, "短信发送，mobile:{0}, res:{1}", new Object[]{mobile, JSON.toJSONString(res)});
                 return res;
             } else {
                 logger.info("非生产环境，不发送短信！" + mobile + "," + tempId);
@@ -95,9 +95,9 @@ public class JSMSUtils {
 
             }
         } catch (APIConnectionException e) {
-            LogUtil.error(logger, e, "账单支付失败短信发送失败，mobile:{0}", mobile);
+            LogUtil.error(logger, e, "短信发送失败，mobile:{0}", mobile);
         } catch (APIRequestException e) {
-            LogUtil.error(logger, e, "账单支付失败短信发送失败，mobile:{0}", mobile);
+            LogUtil.error(logger, e, "短信发送失败，mobile:{0}", mobile);
         }
         return null;
     }

mp-service/src/main/java/com/qs/mp/framework/service/impl/WxUrlLinkServiceImpl.java

@@ -100,7 +100,7 @@ public class WxUrlLinkServiceImpl implements IWxUrlLinkService {
     param.put("path", path + "?" + scene); // 页面路径
     //param.put("scene", scene); // 参数
 //    param.put("check_path", true);// 为 true 时 page 必须是已经发布的小程序存在的页面（否则报错）；为 false 时允许小程序未发布或者 page 不存在
-    param.put("env_version", "release");
+//    param.put("env_version", "release");
     // 获取access_token
     String accessToken = appTokenService.getAccessToken(appId);
     InputStream in = HttpUtils.sendImagePost(