Browse Source

修改无效引用代码

songyh 4 năm trước cách đây
mục cha
commit
f3af77cff6

+ 9 - 0
jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/common/api/vo/Result.java

@@ -113,6 +113,15 @@ public class Result<T> implements Serializable {
 		return r;
 	}
 
+	public static<T> Result<T> error(String msg, T data) {
+		Result<T> r = new Result<T>();
+		r.setSuccess(true);
+		r.setCode(CommonConstant.SC_OK_200);
+		r.setMessage(msg);
+		r.setResult(data);
+		return r;
+	}
+
 	public static<T> Result<T> successMsg(String msg,T t) {
 		Result<T> r = new Result<T>();
 		r.setSuccess(true);

+ 5 - 3
jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/controller/SystemAPIController.java

@@ -457,7 +457,8 @@ public class SystemAPIController {
      */
     @GetMapping("/translateDictFromTable")
     public String translateDictFromTable(@RequestParam("table") String table, @RequestParam("text") String text, @RequestParam("code") String code, @RequestParam("key") String key){
-        return sysBaseAPI.translateDictFromTable(table, text, code, key);
+//        return sysBaseAPI.translateDictFromTable(table, text, code, key);
+        return null;
     }
 
     /**
@@ -468,7 +469,8 @@ public class SystemAPIController {
      */
     @GetMapping("/translateDict")
     public String translateDict(@RequestParam("code") String code, @RequestParam("key") String key){
-        return sysBaseAPI.translateDict(code, key);
+//        return sysBaseAPI.translateDict(code, key);
+        return null;
     }
 
 
@@ -484,7 +486,7 @@ public class SystemAPIController {
 
     /**
      * 37根据多个用户id(逗号分隔),查询返回多个用户信息
-     * @param usernames
+     * @param ids
      * @return
      */
     @GetMapping("/queryUsersByIds")

+ 1 - 4
jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/controller/LoginController.java

@@ -267,7 +267,6 @@ public class LoginController {
 					baseCommonService.addLog("手机号已经注册,请直接登录!", CommonConstant.LOG_TYPE_1, null);
 					return result;
 				}
-				b = DySmsHelper.sendSms(mobile, obj, DySmsEnum.REGISTER_TEMPLATE_CODE);
 			}else {
 				//登录模式,校验用户有效性
 				SysUser sysUser = sysUserService.getUserByPhone(mobile);
@@ -285,10 +284,8 @@ public class LoginController {
 				 */
 				if (CommonConstant.SMS_TPL_TYPE_0.equals(smsmode)) {
 					//登录模板
-					b = DySmsHelper.sendSms(mobile, obj, DySmsEnum.LOGIN_TEMPLATE_CODE);
 				} else if(CommonConstant.SMS_TPL_TYPE_2.equals(smsmode)) {
 					//忘记密码模板
-					b = DySmsHelper.sendSms(mobile, obj, DySmsEnum.FORGET_PASSWORD_TEMPLATE_CODE);
 				}
 			}
 
@@ -304,7 +301,7 @@ public class LoginController {
 			//update-end--Author:scott  Date:20190812 for:issues#391
 			result.setSuccess(true);
 
-		} catch (ClientException e) {
+		} catch (Exception e) {
 			e.printStackTrace();
 			result.error500(" 短信接口未配置,请联系管理员!");
 			return result;

+ 0 - 19
jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/controller/SysUploadController.java

@@ -32,25 +32,6 @@ public class SysUploadController {
     @PostMapping(value = "/uploadMinio")
     public Result<?> uploadMinio(HttpServletRequest request) {
         Result<?> result = new Result<>();
-        String bizPath = request.getParameter("biz");
-        if(oConvertUtils.isEmpty(bizPath)){
-            bizPath = "";
-        }
-        MultipartHttpServletRequest multipartRequest = (MultipartHttpServletRequest) request;
-        MultipartFile file = multipartRequest.getFile("file");// 获取上传文件对象
-        String orgName = file.getOriginalFilename();// 获取文件名
-        orgName = CommonUtils.getFileName(orgName);
-        String file_url =  MinioUtil.upload(file,bizPath);
-        if(oConvertUtils.isEmpty(file_url)){
-            return Result.error("上传失败,请检查配置信息是否正确!");
-        }
-        //保存文件信息
-        OSSFile minioFile = new OSSFile();
-        minioFile.setFileName(orgName);
-        minioFile.setUrl(file_url);
-        ossFileService.save(minioFile);
-        result.setMessage(file_url);
-        result.setSuccess(true);
         return result;
     }
 }

+ 0 - 2
jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/controller/ThirdAppController.java

@@ -208,8 +208,6 @@ public class ThirdAppController {
         String fromUser = JwtUtil.getUserNameByToken(request);
         String title = "第三方APP消息测试";
         MessageDTO message = new MessageDTO(fromUser, receiver, title, content);
-        message.setToAll(sendAll);
-
         if (ThirdAppConfig.WECHAT_ENTERPRISE.equals(app)) {
             if (thirdAppConfig.isWechatEnterpriseEnabled()) {
                 JSONObject response = wechatEnterpriseService.sendMessageResponse(message, false);

+ 11 - 1
jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/service/impl/SysBaseApiImpl.java

@@ -113,11 +113,21 @@ public class SysBaseApiImpl implements ISysBaseAPI {
 	}
 
 	@Override
+	public String translateDictFromTable(String table, String text, String code, String key, String extendsKey, String extendsValue) {
+		return null;
+	}
+
+	@Override
+	public String translateDict(String code, String key, String extendsKey, String extendsValue) {
+		return null;
+	}
+
+
 	public String translateDictFromTable(String table, String text, String code, String key) {
 		return sysDictService.queryTableDictTextByKey(table, text, code, key);
 	}
 
-	@Override
+
 	public String translateDict(String code, String key) {
 		return sysDictService.queryDictTextByKey(code, key);
 	}

+ 5 - 5
jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/service/impl/ThirdAppDingtalkServiceImpl.java

@@ -36,6 +36,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.dao.DuplicateKeyException;
 import org.springframework.stereotype.Service;
 
+import javax.annotation.Resource;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
@@ -62,7 +63,7 @@ public class ThirdAppDingtalkServiceImpl implements IThirdAppService {
     private ISysUserDepartService sysUserDepartService;
     @Autowired
     private ISysPositionService sysPositionService;
-    @Autowired
+    @Resource
     private SysAnnouncementSendMapper sysAnnouncementSendMapper;
 
     @Override
@@ -661,6 +662,7 @@ public class ThirdAppDingtalkServiceImpl implements IThirdAppService {
      * @param verifyConfig
      * @return
      */
+    @Override
     public boolean sendMessage(MessageDTO message, boolean verifyConfig) {
         Response<String> response = this.sendMessageResponse(message, verifyConfig);
         if (response != null) {
@@ -681,15 +683,13 @@ public class ThirdAppDingtalkServiceImpl implements IThirdAppService {
         String content = message.getContent();
         int agentId = thirdAppConfig.getDingtalk().getAgentIdInt();
         Message<TextMessage> textMessage = new Message<>(agentId, new TextMessage(content));
-        if (message.isToAll()) {
-            textMessage.setTo_all_user(true);
-        } else {
+
             String[] toUsers = message.getToUser().split(",");
             // 通过第三方账号表查询出第三方userId
             List<SysThirdAccount> thirdAccountList = sysThirdAccountService.listThirdUserIdByUsername(toUsers, ThirdAppConfig.DINGTALK.toLowerCase());
             List<String> dtUserIds = thirdAccountList.stream().map(SysThirdAccount::getThirdUserId).collect(Collectors.toList());
             textMessage.setUserid_list(dtUserIds);
-        }
+
         return JdtMessageAPI.sendTextMessage(textMessage, accessToken);
     }
 

+ 3 - 2
jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/service/impl/ThirdAppWechatEnterpriseServiceImpl.java

@@ -35,6 +35,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.dao.DuplicateKeyException;
 import org.springframework.stereotype.Service;
 
+import javax.annotation.Resource;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
@@ -59,7 +60,7 @@ public class ThirdAppWechatEnterpriseServiceImpl implements IThirdAppService {
     private ISysUserDepartService sysUserDepartService;
     @Autowired
     private ISysPositionService sysPositionService;
-    @Autowired
+    @Resource
     private SysAnnouncementSendMapper sysAnnouncementSendMapper;
 
     @Override
@@ -723,7 +724,7 @@ public class ThirdAppWechatEnterpriseServiceImpl implements IThirdAppService {
         }
         Text text = new Text();
         text.setMsgtype("text");
-        text.setTouser(this.getTouser(message.getToUser(), message.isToAll()));
+//        text.setTouser(this.getTouser(message.getToUser(), message.isToAll()));
         TextEntity entity = new TextEntity();
         entity.setContent(message.getContent());
         text.setText(entity);

+ 0 - 52
jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/service/impl/desform/SysTranslateAPIImpl.java

@@ -1,52 +0,0 @@
-package org.jeecg.modules.system.service.impl.desform;
-
-import org.jeecg.common.api.desform.ISysTranslateAPI;
-import org.jeecg.common.system.vo.DictModel;
-import org.jeecg.modules.system.service.ISysCategoryService;
-import org.jeecg.modules.system.service.ISysDictService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Component;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-
-/**
- * 表单设计器翻译API接口(system实现类)
- *
- * @author sunjianlei
- */
-@Component
-public class SysTranslateAPIImpl implements ISysTranslateAPI {
-
-    @Autowired
-    ISysCategoryService sysCategoryService;
-    @Autowired
-    ISysDictService sysDictService;
-
-    @Override
-    public List<String> categoryLoadDictItem(String ids) {
-        return sysCategoryService.loadDictItem(ids, false);
-    }
-
-    @Override
-    public List<String> dictLoadDictItem(String dictCode, String keys) {
-        String[] params = dictCode.split(",");
-        return sysDictService.queryTableDictByKeys(params[0], params[1], params[2], keys, false);
-    }
-
-    @Override
-    public List<DictModel> dictGetDictItems(String dictCode) {
-        List<DictModel> ls = sysDictService.getDictItems(dictCode);
-        if (ls == null) {
-            ls = new ArrayList<>();
-        }
-        return ls;
-    }
-
-    @Override
-    public List<DictModel> dictLoadDict(String dictCode, String keyword, Integer pageSize) {
-        return sysDictService.loadDict(dictCode, keyword, pageSize);
-    }
-
-}

+ 6 - 6
jeecg-cloud-module/jeecg-cloud-gateway/src/main/resources/application.yml

@@ -18,11 +18,11 @@ spring:
       #如果启用nacos或者数据库配置请删除一下配置
       routes:
         - id: jeecg-demo
-          uri: lb://jeecg-demo
+          uri: lb:ws://jeecg-demo
           predicates:
             - Path=/mock/**,/test/**,/bigscreen/template1/**,/bigscreen/template2/**,/sys/**
         - id: jeecg-system
-          uri: lb://jeecg-system
+          uri: lb:ws://jeecg-system
           predicates:
             - Path=/sys/**,/eoa/**,/v1/**,/joa/**,/online/**,/bigscreen/**,/jmreport/**,/desform/**,/act/**,/plug-in/**,/generic/**
         - id: jeecg-system-websocket
@@ -33,10 +33,10 @@ spring:
           uri: lb:ws://jeecg-demo
           predicates:
             - Path=/vxeSocket/**
-         - id: jeecg-boot-bytedance-ad
-           uri: lb:ws://jeecg-boot-bytedance-ad
-           predicates:
-             - Path=/advertiser/**,/ctop/**,/file/imageCheck/**
+        - id: jeecg-boot-bytedance-ad
+          uri: lb:ws://jeecg-boot-bytedance-ad
+          predicates:
+            - Path=/advertiser/**,/ctop/**,/file/imageCheck/**
       # 全局熔断降级配置
       default-filters:
         - name: Hystrix