Merge remote-tracking branch 'origin/master'

ibzuaa-core/src/main/java/cn/ibizlab/core/uaa/extensions/service/SysAppService.java

@@ -47,7 +47,7 @@ public class SysAppService extends SysAppServiceImpl
     @Value("${spring.cloud.nacos.discovery.server-addr:127.0.0.1:8848}")
     private String serverAddr;
 
-    //@Cacheable( value="ibzuaa_switcher",key = "'id:'+#p0+'||'+#p1")
+    @Cacheable( value="ibzuaa_switcher",key = "'id:'+#p0+'||'+#p1")
     public JSONObject getAppSwitcher(String id,String userId)
     {
         JSONObject jo=ibzConfigService.getConfig("AppSwitcher",id, userId);

ibzuaa-core/src/main/java/cn/ibizlab/core/uaa/extensions/service/UserQQRegisterService.java

@@ -119,7 +119,7 @@ public class UserQQRegisterService {
                 returnObj.put("openid", openid);
             }
         } catch (UnsupportedEncodingException e) {
-            throw new BadRequestAlertException("连接微信服务端失败!", "UserQQRegisterService", "");
+            throw new BadRequestAlertException("连接QQ服务端失败!", "UserQQRegisterService", "");
         }
 
         return returnObj;