Enford 5 лет назад
Родитель
Сommit
81c0dd458c

+ 1 - 1
src/main/java/com/jeeplus/common/utils/MobileSendMessage.java

@@ -11,7 +11,7 @@ package com.jeeplus.common.utils;
 //import com.baidu.yun.core.log.YunLogEvent;
 //import com.baidu.yun.core.log.YunLogHandler;
 //import com.jeeplus.modules.sys.entity.User;
-//import com.jeeplus.modules.sys.utils.UserUtils;
+//import com.jeeplus.modules.sys.Utils.UserUtils;
 
 public class MobileSendMessage {
 	

+ 1 - 1
src/main/java/com/jeeplus/modules/act/web/ActTaskController.java

@@ -496,7 +496,7 @@ public class ActTaskController extends BaseController {
 	 * @param act 任务ID
 	 * 		vars.keys=flag,pass
 	 * 		vars.values=1,true
-	 * 		vars.types=S,B  @see com.jeeplus.jeeplus.modules.act.utils.PropertyType
+	 * 		vars.types=S,B  @see com.jeeplus.jeeplus.modules.act.Utils.PropertyType
 	 */
 	@RequestMapping(value = "complete")
 	@ResponseBody

+ 1 - 1
src/main/java/com/jeeplus/modules/caseinfo/web/CaseInfoController.java

@@ -1045,7 +1045,7 @@ public class CaseInfoController extends BaseController {
 					a.getVars().getMap().put("applyUserId",UserUtils.get(a.getVars().getMap().get("applyUserId").toString()).getName());
 				}
 				caseInfo.setAct(a);
-				/*if (com.jeeplus.common.	utils.StringUtils.isNotBlank(caseInfo.getId())){
+				/*if (com.jeeplus.common.	Utils.StringUtils.isNotBlank(caseInfo.getId())){
 					caseInfo.setName(officeService.get(companyId).getName());
 				}*/
 				lists.add(caseInfo);

+ 1 - 1
src/main/java/com/jeeplus/modules/oaall/web/OaAllController.java

@@ -405,7 +405,7 @@ public class OaAllController extends BaseController {
 					}
 				}
 				oaAll.setAct(a);
-//				if (com.jeeplus.common.utils.StringUtils.isNotBlank(oaAll.getId())){
+//				if (com.jeeplus.common.Utils.StringUtils.isNotBlank(oaAll.getId())){
 //					oaAll.setName(officeService.get(oaAll.getCompanyId()).getName());
 //				}
 				lists.add(oaAll);

+ 1 - 1
src/main/java/com/jeeplus/modules/oabuy/web/OaBuyController.java

@@ -390,7 +390,7 @@ public class OaBuyController extends BaseController {
 					}
 				}
 				oaAll.setAct(a);
-//				if (com.jeeplus.common.utils.StringUtils.isNotBlank(oaAll.getId())){
+//				if (com.jeeplus.common.Utils.StringUtils.isNotBlank(oaAll.getId())){
 //					oaAll.setName(officeService.get(oaAll.getCompanyId()).getName());
 //				}
 				lists.add(oaAll);

+ 1 - 1
src/main/java/com/jeeplus/modules/oaperformance/web/OaPerformanceController.java

@@ -385,7 +385,7 @@ public class OaPerformanceController extends BaseController {
 					}
 				}
 				oaAll.setAct(a);
-//				if (com.jeeplus.common.utils.StringUtils.isNotBlank(oaAll.getId())){
+//				if (com.jeeplus.common.Utils.StringUtils.isNotBlank(oaAll.getId())){
 //					oaAll.setName(officeService.get(oaAll.getCompanyId()).getName());
 //				}
 				lists.add(oaAll);

+ 2 - 2
src/main/java/com/jeeplus/modules/sys/web/LoginController.java

@@ -291,8 +291,8 @@ public class LoginController extends BaseController{
 
 			//		System.out.println("==========================a");
 			//		try {
-			//			byte[] bytes = com.jeeplus.common.utils.FileUtils.readFileToByteArray(
-			//					com.jeeplus.common.utils.FileUtils.getFile("c:\\sxt.dmp"));
+			//			byte[] bytes = com.jeeplus.common.Utils.FileUtils.readFileToByteArray(
+			//					com.jeeplus.common.Utils.FileUtils.getFile("c:\\sxt.dmp"));
 			//			UserUtils.getSession().setAttribute("kkk", bytes);
 			//			UserUtils.getSession().setAttribute("kkk2", bytes);
 			//		} catch (Exception e) {

+ 4 - 4
src/main/java/com/jeeplus/modules/wexinpackage/access/util/access/WeChatParamsUtil.java

@@ -7,13 +7,13 @@ public class WeChatParamsUtil {
     //token
     public final static String token ="9ZmhR1CRrGIOSMxCcznVccQN8f3XX2w4GMoacioSkovFuJdCwMBvTHsJpGf67bUVtkHEqLzYIyaamn9dEyPJKcVxgIeERJpAwa9uNtW68EXYwOBvR2blpiQ3aM9l7ndqMJThfEWlcUz8oBzOh6XZPQqTcLwb95yHhwQO14KdIXj6Q1nko9rjp-9c-LsrzoS_SNu4TxTqTqoYj5ztp3J9Wg";
     //企业id
-    public final static String corpId ="wwb8c36b4b35675fe9";
+    public final static String corpId ="ww24ca7e7771df9148";
     //应用的凭证密钥
-    public final static String agentSecret = "kekm2UtL_82xFr6tMi4N2cWQFMHNKhLD-0bwIIaUQP0";
+    public final static String agentSecret = "alO4uidZ2hKK3p5HdrWxIKz5YgvT0vvNiMb9r_1vS7s";
     //通讯录秘钥 (获取tokenid)
-    public final static String contactsSecret ="X67oIAoM8_SR9VhW7exd4_JKaeW5st8DKxvNluTZfi4";
+    public final static String contactsSecret ="rXEUF9kGCLZKyWs4WQie_F1Ix3g5dP_e3X2Yls5tiuA";
     //企业应用的id,整型。可在应用的设置页面查看
-    public final static int agentId = 1000002;
+    public final static int agentId = 1000005;
     //通讯录token
     public final static String contacts_token = "AT84tGkhkt09pSYTxi3NoCQcn7F6o";
     // encodingAESKey

+ 1 - 1
src/main/java/com/jeeplus/modules/wexintheorder/utils/TheOrderExportExcel.java

@@ -1,4 +1,4 @@
-package com.jeeplus.modules.wexintheorder.utils;
+package com.jeeplus.modules.wexintheorder.Utils;
 
 import com.google.common.collect.Lists;
 import com.jeeplus.common.utils.Encodes;

+ 1 - 1
src/main/java/com/jeeplus/modules/wexintheorder/web/TheOrderWebController.java

@@ -7,7 +7,7 @@ import com.jeeplus.common.web.BaseController;
 import com.jeeplus.modules.wexintheorder.entity.TheOrder;
 import com.jeeplus.modules.wexintheorder.entity.TheOrderLeadership;
 import com.jeeplus.modules.wexintheorder.service.TheOrderWebService;
-import com.jeeplus.modules.wexintheorder.utils.TheOrderExportExcel;
+import com.jeeplus.modules.wexintheorder.Utils.TheOrderExportExcel;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;

+ 3 - 3
src/main/java/com/jeeplus/modules/workaskcheckprice/web/WorkAskCheckPriceController.java

@@ -438,7 +438,7 @@ public class WorkAskCheckPriceController extends BaseController {
 							}
 						}
 						workAskCheckPrice.setAct(a);
-						/*if (com.jeeplus.common.utils.StringUtils.isNotBlank(workEngineeringProject.getId())){
+						/*if (com.jeeplus.common.Utils.StringUtils.isNotBlank(workEngineeringProject.getId())){
 							workEngineeringProject.setName(officeService.get(companyId).getName());
 						}*/
 						lists.add(workAskCheckPrice);
@@ -451,7 +451,7 @@ public class WorkAskCheckPriceController extends BaseController {
 						}
 					}
 					workAskCheckPrice.setAct(a);
-					/*if (com.jeeplus.common.utils.StringUtils.isNotBlank(workEngineeringProject.getId())){
+					/*if (com.jeeplus.common.Utils.StringUtils.isNotBlank(workEngineeringProject.getId())){
 						workEngineeringProject.setName(officeService.get(companyId).getName());
 					}*/
 					lists.add(workAskCheckPrice);
@@ -490,7 +490,7 @@ public class WorkAskCheckPriceController extends BaseController {
 						a.getVars().getMap().put("applyUserId",UserUtils.get(a.getVars().getMap().get("applyUserId").toString()).getName());
 					}
 					workAskCheckPrice.setAct(a);
-					/*if (com.jeeplus.common.utils.StringUtils.isNotBlank(workEngineeringProject.getId())){
+					/*if (com.jeeplus.common.Utils.StringUtils.isNotBlank(workEngineeringProject.getId())){
 						workEngineeringProject.setName(officeService.get(companyId).getName());
 					}*/
 					lists.add(workAskCheckPrice);

+ 1 - 1
src/main/java/com/jeeplus/modules/workcontractinfo/web/WorkContractInfoController.java

@@ -1676,7 +1676,7 @@ public class WorkContractInfoController extends BaseController {
                     a.getVars().getMap().put("applyUserId",UserUtils.get(a.getVars().getMap().get("applyUserId").toString()).getName());
                 }
                 caseInfo.setAct(a);
-				*//*if (com.jeeplus.common.	utils.StringUtils.isNotBlank(caseInfo.getId())){
+				*//*if (com.jeeplus.common.	Utils.StringUtils.isNotBlank(caseInfo.getId())){
 					caseInfo.setName(officeService.get(companyId).getName());
 				}*//*
                 lists.add(caseInfo);

+ 1 - 1
src/main/java/com/jeeplus/modules/workcontractinfo/web/WorkContractInfoInvalidateController.java

@@ -303,7 +303,7 @@ public class WorkContractInfoInvalidateController extends BaseController {
                     a.getVars().getMap().put("applyUserId",UserUtils.get(a.getVars().getMap().get("applyUserId").toString()).getName());
                 }
                 caseInfo.setAct(a);
-				*//*if (com.jeeplus.common.	utils.StringUtils.isNotBlank(caseInfo.getId())){
+				*//*if (com.jeeplus.common.	Utils.StringUtils.isNotBlank(caseInfo.getId())){
 					caseInfo.setName(officeService.get(companyId).getName());
 				}*//*
                 lists.add(caseInfo);

+ 2 - 2
src/main/java/com/jeeplus/modules/workprequalification/service/WorkPrequalificationService.java

@@ -11,12 +11,12 @@
 //import org.springframework.transaction.annotation.Transactional;
 //
 //import com.jeeplus.modules.sys.entity.User;
-//import com.jeeplus.modules.sys.utils.UserUtils;
+//import com.jeeplus.modules.sys.Utils.UserUtils;
 //import com.jeeplus.modules.workclientinfo.dao.WorkClientLinkmanDao;
 //import com.jeeplus.modules.workclientinfo.entity.WorkClientInfo;
 //import com.jeeplus.common.persistence.Page;
 //import com.jeeplus.common.service.CrudService;
-//import com.jeeplus.common.utils.StringUtils;
+//import com.jeeplus.common.Utils.StringUtils;
 //import com.jeeplus.modules.workprequalification.entity.WorkPrequalification;
 //import com.jeeplus.modules.workprequalification.entity.WorkProjectLinkman;
 //import com.jeeplus.modules.workprequalification.dao.WorkPrequalificationDao;

+ 3 - 3
src/main/java/com/jeeplus/modules/workvisa/web/WorkVisaController.java

@@ -561,7 +561,7 @@ public class WorkVisaController extends BaseController {
 							}
 						}
 						workVisa.setAct(a);
-						/*if (com.jeeplus.common.utils.StringUtils.isNotBlank(workVisa.getId())){
+						/*if (com.jeeplus.common.Utils.StringUtils.isNotBlank(workVisa.getId())){
 							workVisa.setName(officeService.get(companyId).getName());
 						}*/
 						lists.add(workVisa);
@@ -574,7 +574,7 @@ public class WorkVisaController extends BaseController {
 						}
 					}
 					workVisa.setAct(a);
-					/*if (com.jeeplus.common.utils.StringUtils.isNotBlank(workVisa.getId())){
+					/*if (com.jeeplus.common.Utils.StringUtils.isNotBlank(workVisa.getId())){
 						workVisa.setName(officeService.get(companyId).getName());
 					}*/
 					lists.add(workVisa);
@@ -613,7 +613,7 @@ public class WorkVisaController extends BaseController {
 						a.getVars().getMap().put("applyUserId",UserUtils.get(a.getVars().getMap().get("applyUserId").toString()).getName());
 					}
 					workVisa.setAct(a);
-				/*	if (com.jeeplus.common.utils.StringUtils.isNotBlank(workEngineeringProject.getId())){
+				/*	if (com.jeeplus.common.Utils.StringUtils.isNotBlank(workEngineeringProject.getId())){
 						workVisa.setName(officeService.get(companyId).getName());
 					}*/
 					lists.add(workVisa);