123

ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/rest/UserController.java

@@ -5,6 +5,7 @@ import com.github.wxiaoqi.security.admin.biz.MenuBiz;
 import com.github.wxiaoqi.security.admin.biz.UserBiz;
 import com.github.wxiaoqi.security.admin.entity.Menu;
 import com.github.wxiaoqi.security.admin.entity.User;
+import com.github.wxiaoqi.security.admin.feign.dto.AppUserDTO;
 import com.github.wxiaoqi.security.admin.rpc.service.PermissionService;
 import com.github.wxiaoqi.security.admin.vo.FrontUser;
 import com.github.wxiaoqi.security.admin.vo.GroupUsers;
@@ -124,9 +125,20 @@ public class UserController extends CommonBaseController {
         if (StringUtils.isBlank(state)){
             state="0,1";
         }
+        if (StringUtils.isBlank(token)){
+            token=userAuthConfig.getToken(request);
+        }
         return permissionService.getMenusByUsername(token,state);
     }
 
+    @RequestMapping(value = "/front/house/menus", method = RequestMethod.GET)
+    public ObjectRestResponse  getMenus(String state) throws Exception {
+        if (StringUtils.isBlank(state)){
+            state="0,2";
+        }
+        return ObjectRestResponse.succ(permissionService.getMenusByUsername(userAuthConfig.getToken(request),state));
+    }
+
     @RequestMapping(value = "/front/menu/all", method = RequestMethod.GET)
     public @ResponseBody
     List<Menu> getAllMenus() throws Exception {

xx-universal/xx-universal-server/src/main/java/com/xxfc/platform/universal/service/SmsService.java

@@ -141,6 +141,7 @@ public class SmsService {
         log.info("RequestId=" + sendSmsResponse.getRequestId());
         log.info("BizId=" + sendSmsResponse.getBizId());
         if(sendSmsResponse.getCode() != null && sendSmsResponse.getCode().equals("OK")) {
+            log.info("发送成功");
             //请求成功
             return  true;
         }
@@ -239,8 +240,8 @@ public class SmsService {
     public static void main(String[] args) throws ClientException, InterruptedException {
         SmsService smsService=new SmsService();
         //发短信
-        String[] params={"1","2","3","2019-08-29","【松山湖】"};
-        SmsService.sendTemplateToJson("13612688539,13265487972",params,"SMS_169904346");
+        String params="{\"param7\":\"\",\"param8\":\"2019-10-09 09:00:00\",\"param5\":\"\",\"param6\":\"欣新房车控股集团\",\"param9\":\"2019-10-09 18:00:00\",\"param10\":\"1\",\"param3\":\"测试依维柯后拓展房车（仅供测试使用，不提供任何服务）\",\"param4\":\"欣新房车控股集团\",\"param1\":\"肖少林\",\"param2\":\"18681032646\"}";
+        sendTemplate("13612688539",params,"SMS_173345572");
         /*System.out.println("短信接口返回的数据----------------");
         System.out.println("Code=" + response.getCode());
         System.out.println("Message=" + response.getMessage());