diff --git a/contact-center/app/src/main/java/com/chatopera/cc/util/UKTools.java b/contact-center/app/src/main/java/com/chatopera/cc/app/MainUtils.java similarity index 94% rename from contact-center/app/src/main/java/com/chatopera/cc/util/UKTools.java rename to contact-center/app/src/main/java/com/chatopera/cc/app/MainUtils.java index a1607f82..fb567d99 100644 --- a/contact-center/app/src/main/java/com/chatopera/cc/util/UKTools.java +++ b/contact-center/app/src/main/java/com/chatopera/cc/app/MainUtils.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.chatopera.cc.util; +package com.chatopera.cc.app; import java.beans.BeanInfo; import java.beans.Introspector; @@ -49,11 +49,11 @@ import java.util.regex.Pattern; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import com.chatopera.cc.app.MainContext; +import com.chatopera.cc.util.*; import com.chatopera.cc.util.asr.AsrResult; -import com.chatopera.cc.event.ChatbotEvent; -import com.chatopera.cc.event.MultiUpdateEvent; -import com.chatopera.cc.event.UserDataEvent; +import com.chatopera.cc.disruptor.chatbot.ChatbotEvent; +import com.chatopera.cc.disruptor.multiupdate.MultiUpdateEvent; +import com.chatopera.cc.disruptor.user.UserDataEvent; import com.chatopera.cc.event.UserEvent; import com.chatopera.cc.util.mail.MailSender; import com.chatopera.cc.app.service.cache.CacheHelper; @@ -118,7 +118,7 @@ import io.netty.handler.codec.http.HttpHeaders; import net.coobird.thumbnailator.Thumbnails; -public class UKTools { +public class MainUtils { private static MD5 md5 = new MD5(); public static SimpleDateFormat dateFormate = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss") ; @@ -275,10 +275,10 @@ public class UKTools { } @SuppressWarnings({ "unchecked"}) - public static void chatbot(UserEvent event){ - Disruptor disruptor = (Disruptor) MainContext.getContext().getBean("chatbot") ; + public static void chatbot(ChatbotEvent event){ + Disruptor disruptor = (Disruptor) MainContext.getContext().getBean("chatbot") ; long seq = disruptor.getRingBuffer().next(); - disruptor.getRingBuffer().get(seq).setEvent(event); ; + disruptor.getRingBuffer().get(seq).setEvent(event); disruptor.getRingBuffer().publish(seq); } @@ -881,7 +881,7 @@ public class UKTools { if(!StringUtils.isBlank(confirm)){ if(secretConfig!=null && secretConfig.size() > 0){ Secret secret = secretConfig.get( 0) ; - if(UKTools.md5(confirm).equals(secret.getPassword())){ + if(MainUtils.md5(confirm).equals(secret.getPassword())){ execute = true ; } } @@ -897,7 +897,7 @@ public class UKTools { //保存附件 for(MultipartFile file : files){ if(file.getSize() > 0){ //文件尺寸 限制 ？在 启动 配置中 设置 的最大值，其他地方不做限制 - String fileid = UKTools.md5(file.getBytes()) ; //使用 文件的 MD5作为 ID，避免重复上传大文件 + String fileid = MainUtils.md5(file.getBytes()) ; //使用 文件的 MD5作为 ID，避免重复上传大文件 if(!StringUtils.isBlank(fileid)){ AttachmentFile attachmentFile = new AttachmentFile() ; attachmentFile.setCreater(user.getId()); @@ -1040,8 +1040,7 @@ public class UKTools { /** * 16进制字符串转换为字符串 * - * @param s - * @return + * @return */ public static String string2HexString(String strPart) { StringBuffer hexString = new StringBuffer(); @@ -1055,8 +1054,7 @@ public class UKTools { /** * - * @param templetid - * @throws IOException + * @throws IOException * @throws TemplateException */ @SuppressWarnings("deprecation") @@ -1086,7 +1084,7 @@ public class UKTools { * @throws Exception */ public static void sendMail(String email , String cc , String subject , String content ,List filenames) throws Exception{ - SystemConfig config = UKTools.getSystemConfig() ; + SystemConfig config = MainUtils.getSystemConfig() ; if(config!=null && config.isEnablemail() && config.getEmailid()!=null) { SystemMessage systemMessage = MainContext.getContext().getBean(SystemMessageRepository.class).findByIdAndOrgi(config.getEmailid(),config.getOrgi()) ; MailSender sender = new MailSender(systemMessage.getSmtpserver(),systemMessage.getMailfrom(),systemMessage.getSmtpuser(), decryption(systemMessage.getSmtppassword()),systemMessage.getSeclev(),systemMessage.getSslport()); @@ -1099,7 +1097,7 @@ public class UKTools { public static String encode(Object obj) { Base64 base64 = new Base64(); try { - return base64.encodeToString(UKTools.toBytes(obj)) ; + return base64.encodeToString(MainUtils.toBytes(obj)) ; } catch (Exception e) { e.printStackTrace(); } @@ -1109,7 +1107,7 @@ public class UKTools { public static T decode(String str,Class clazz) { Base64 base64 = new Base64(); try { - return (T)UKTools.toObject(base64.decode(str)) ; + return (T) MainUtils.toObject(base64.decode(str)) ; } catch (Exception e) { e.printStackTrace(); } @@ -1167,7 +1165,6 @@ public class UKTools { /*** * 计算T+1 * @param text - * @param format * @return */ public static Object getDaysParam(String text){ @@ -1183,7 +1180,6 @@ public class UKTools { } /** * - * @param defaultParam * @param value * @return * @throws ParseException @@ -1197,7 +1193,6 @@ public class UKTools { } /** * - * @param defaultParam * @param value * @return * @throws ParseException @@ -1284,26 +1279,28 @@ public class UKTools { } return asrResult; } + /** - * 发送短信 - * @param email - * @param cc - * @param subject - * @param content - * @throws Exception - */ + * 发送短信 + * @param phone + * @param id + * @param tpId + * @param tplValuesMap + * @return + * @throws Exception + */ public static boolean sendSms(String phone,String id ,String tpId, Map tplValuesMap) throws Exception{ - SystemConfig config = UKTools.getSystemConfig() ; + SystemConfig config = MainUtils.getSystemConfig() ; if(config!=null) { SystemMessage systemMessage = MainContext.getContext().getBean(SystemMessageRepository.class).findByIdAndOrgi(id,config.getOrgi()) ; if(systemMessage==null) { return false; } - Template tp = UKTools.getTemplate(tpId) ; + Template tp = MainUtils.getTemplate(tpId) ; if(tp==null) { return false; } - String params = UKTools.getTemplet(tp.getTemplettext(),tplValuesMap) ; + String params = MainUtils.getTemplet(tp.getTemplettext(),tplValuesMap) ; SysDic sysDic= UKeFuDic.getInstance().getDicItem(systemMessage.getSmstype()); //阿里大于 @@ -1385,7 +1382,7 @@ public class UKTools { workSession.setSessionid(session); workSession.setOrgi(orgi); - workSession.setDatestr(UKTools.simpleDateFormat.format(new Date())); + workSession.setDatestr(MainUtils.simpleDateFormat.format(new Date())); return workSession ; } diff --git a/contact-center/app/src/main/java/com/chatopera/cc/util/UKView.java b/contact-center/app/src/main/java/com/chatopera/cc/app/Viewport.java similarity index 85% rename from contact-center/app/src/main/java/com/chatopera/cc/util/UKView.java rename to contact-center/app/src/main/java/com/chatopera/cc/app/Viewport.java index 3653a96a..a48cb9a4 100644 --- a/contact-center/app/src/main/java/com/chatopera/cc/util/UKView.java +++ b/contact-center/app/src/main/java/com/chatopera/cc/app/Viewport.java @@ -14,18 +14,18 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.chatopera.cc.util; +package com.chatopera.cc.app; -public class UKView { +public class Viewport { private String page ; private String templet; - public UKView(String templet , String page){ + public Viewport(String templet , String page){ this.templet = templet ; this.page = page ; } - public UKView(String page){ + public Viewport(String page){ this.page = page ; } diff --git a/contact-center/app/src/main/java/com/chatopera/cc/app/aop/SyncDatabaseExt.java b/contact-center/app/src/main/java/com/chatopera/cc/app/aop/SyncDatabaseExt.java index 7ef4f34b..b3162b14 100644 --- a/contact-center/app/src/main/java/com/chatopera/cc/app/aop/SyncDatabaseExt.java +++ b/contact-center/app/src/main/java/com/chatopera/cc/app/aop/SyncDatabaseExt.java @@ -19,8 +19,9 @@ package com.chatopera.cc.app.aop; import java.util.List; import com.chatopera.cc.app.MainContext; +import com.chatopera.cc.app.MainUtils; import com.chatopera.cc.util.UKeFuList; -import com.chatopera.cc.event.MultiUpdateEvent; +import com.chatopera.cc.disruptor.multiupdate.MultiUpdateEvent; import com.chatopera.cc.app.service.hibernate.BaseService; import org.aspectj.lang.ProceedingJoinPoint; import org.aspectj.lang.annotation.Around; @@ -29,7 +30,6 @@ import org.aspectj.lang.annotation.Pointcut; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; -import com.chatopera.cc.util.UKTools; import com.chatopera.cc.app.model.ESBean; @Aspect @@ -62,10 +62,10 @@ public class SyncDatabaseExt { }else if(data instanceof List){ List dataList = (List)data ; for(Object dbData : dataList){ - UKTools.multiupdate(new MultiUpdateEvent(dbData , dbDataRes, MainContext.MultiUpdateType.SAVE.toString())); + MainUtils.multiupdate(new MultiUpdateEvent(dbData , dbDataRes, MainContext.MultiUpdateType.SAVE.toString())); } }else{ - UKTools.multiupdate(new MultiUpdateEvent(data, dbDataRes, MainContext.MultiUpdateType.SAVE.toString())); + MainUtils.multiupdate(new MultiUpdateEvent(data, dbDataRes, MainContext.MultiUpdateType.SAVE.toString())); } } } @@ -81,13 +81,13 @@ public class SyncDatabaseExt { if(data instanceof List){ List dataList = (List)data ; for(Object dbData : dataList){ - UKTools.multiupdate(new MultiUpdateEvent(dbData , dbDataRes, MainContext.MultiUpdateType.DELETE.toString())); + MainUtils.multiupdate(new MultiUpdateEvent(dbData , dbDataRes, MainContext.MultiUpdateType.DELETE.toString())); } }else{ if(data instanceof ESBean){ - UKTools.multiupdate(new MultiUpdateEvent(data, dbDataRes, MainContext.MultiUpdateType.DELETE.toString())); + MainUtils.multiupdate(new MultiUpdateEvent(data, dbDataRes, MainContext.MultiUpdateType.DELETE.toString())); }else{ - UKTools.multiupdate(new MultiUpdateEvent(data, dbDataRes, MainContext.MultiUpdateType.DELETE.toString())); + MainUtils.multiupdate(new MultiUpdateEvent(data, dbDataRes, MainContext.MultiUpdateType.DELETE.toString())); } } } diff --git a/contact-center/app/src/main/java/com/chatopera/cc/app/config/DisruptorConfigure.java b/contact-center/app/src/main/java/com/chatopera/cc/app/config/DisruptorConfigure.java index 482613ea..7aa79916 100644 --- a/contact-center/app/src/main/java/com/chatopera/cc/app/config/DisruptorConfigure.java +++ b/contact-center/app/src/main/java/com/chatopera/cc/app/config/DisruptorConfigure.java @@ -29,9 +29,9 @@ import org.springframework.stereotype.Component; import com.lmax.disruptor.SleepingWaitStrategy; import com.lmax.disruptor.dsl.Disruptor; import com.lmax.disruptor.dsl.ProducerType; -import com.chatopera.cc.event.UserDataEvent; -import com.chatopera.cc.disruptor.UserDataEventFactory; -import com.chatopera.cc.disruptor.UserEventHandler; +import com.chatopera.cc.disruptor.user.UserDataEvent; +import com.chatopera.cc.disruptor.user.UserDataEventFactory; +import com.chatopera.cc.disruptor.user.UserEventHandler; @Component public class DisruptorConfigure { diff --git a/contact-center/app/src/main/java/com/chatopera/cc/app/config/IMServerConfiguration.java b/contact-center/app/src/main/java/com/chatopera/cc/app/config/IMServerConfiguration.java index f84a79f1..9d5829cf 100644 --- a/contact-center/app/src/main/java/com/chatopera/cc/app/config/IMServerConfiguration.java +++ b/contact-center/app/src/main/java/com/chatopera/cc/app/config/IMServerConfiguration.java @@ -35,7 +35,7 @@ import com.corundumstudio.socketio.Configuration; import com.corundumstudio.socketio.HandshakeData; import com.corundumstudio.socketio.SocketIOServer; import com.corundumstudio.socketio.annotation.SpringAnnotationScanner; -import com.chatopera.cc.util.UKTools; +import com.chatopera.cc.app.MainUtils; import com.chatopera.cc.exception.UCKeFuExceptionListener; @org.springframework.context.annotation.Configuration @@ -88,7 +88,7 @@ public class IMServerConfiguration sslProperties.load(in); in.close(); if(!StringUtils.isBlank(sslProperties.getProperty("key-store")) && !StringUtils.isBlank(sslProperties.getProperty("key-store-password"))){ - config.setKeyStorePassword(UKTools.decryption(sslProperties.getProperty("key-store-password"))); + config.setKeyStorePassword(MainUtils.decryption(sslProperties.getProperty("key-store-password"))); InputStream stream = new FileInputStream(new File(path , "ssl/"+sslProperties.getProperty("key-store"))); config.setKeyStore(stream); } diff --git a/contact-center/app/src/main/java/com/chatopera/cc/app/config/StartedEventListener.java b/contact-center/app/src/main/java/com/chatopera/cc/app/config/StartedEventListener.java index 9dfd616d..93a666c4 100644 --- a/contact-center/app/src/main/java/com/chatopera/cc/app/config/StartedEventListener.java +++ b/contact-center/app/src/main/java/com/chatopera/cc/app/config/StartedEventListener.java @@ -28,13 +28,13 @@ import com.chatopera.cc.app.service.repository.SystemConfigRepository; import com.chatopera.cc.app.service.repository.TablePropertiesRepository; import com.chatopera.cc.app.model.Generation; import com.chatopera.cc.app.model.SysDic; +import com.chatopera.cc.app.MainUtils; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Value; import org.springframework.context.ApplicationListener; import org.springframework.context.event.ContextRefreshedEvent; import org.springframework.stereotype.Component; -import com.chatopera.cc.util.UKTools; import com.chatopera.cc.app.service.repository.BlackListRepository; import com.chatopera.cc.app.model.BlackEntity; import com.chatopera.cc.app.model.SystemConfig; @@ -91,9 +91,9 @@ public class StartedEventListener implements ApplicationListener getAgent(HttpServletRequest request){ //获取当前产品or租户坐席数 @@ -142,7 +142,7 @@ public class AdminController extends Handler{ map.addAttribute("title", title) ; map.addAttribute("url", url) ; if(!StringUtils.isBlank(iconstr) && !StringUtils.isBlank(icontext)){ - map.addAttribute("iconstr", iconstr.replaceAll(icontext, "&#x"+UKTools.string2HexString(icontext)+";")) ; + map.addAttribute("iconstr", iconstr.replaceAll(icontext, "&#x"+ MainUtils.string2HexString(icontext)+";")) ; } return request(super.createRequestPageTempletResponse("/admin/system/auth/event")); } diff --git a/contact-center/app/src/main/java/com/chatopera/cc/app/handler/admin/area/AreaController.java b/contact-center/app/src/main/java/com/chatopera/cc/app/handler/admin/area/AreaController.java index 4c1ccd0f..f639c0ed 100644 --- a/contact-center/app/src/main/java/com/chatopera/cc/app/handler/admin/area/AreaController.java +++ b/contact-center/app/src/main/java/com/chatopera/cc/app/handler/admin/area/AreaController.java @@ -23,6 +23,7 @@ import java.util.Date; import javax.servlet.http.HttpServletRequest; import javax.validation.Valid; +import com.chatopera.cc.app.MainUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; import org.springframework.ui.ModelMap; @@ -31,7 +32,6 @@ import org.springframework.web.servlet.ModelAndView; import com.chatopera.cc.app.MainContext; import com.chatopera.cc.util.Menu; -import com.chatopera.cc.util.UKTools; import com.chatopera.cc.app.service.repository.AreaTypeRepository; import com.chatopera.cc.app.service.repository.SysDicRepository; import com.chatopera.cc.app.handler.Handler; @@ -84,7 +84,7 @@ public class AreaController extends Handler{ area.setCreatetime(new Date()); area.setCreater(super.getUser(request).getId()); areaRepository.save(area) ; - UKTools.initSystemArea(); + MainUtils.initSystemArea(); } return request(super.createRequestPageTempletResponse("redirect:/admin/area/index.html")); } @@ -112,7 +112,7 @@ public class AreaController extends Handler{ area.setOrgi(super.getOrgi(request)); area.setCreater(areaType.getCreater()); areaRepository.save(area) ; - UKTools.initSystemArea(); + MainUtils.initSystemArea(); } return request(super.createRequestPageTempletResponse("redirect:/admin/area/index.html")); } @@ -123,7 +123,7 @@ public class AreaController extends Handler{ AreaType areaType = areaRepository.findByIdAndOrgi(area.getId(), super.getOrgi(request)) ; if(areaType!=null){ areaRepository.delete(areaType); - UKTools.initSystemArea(); + MainUtils.initSystemArea(); } return request(super.createRequestPageTempletResponse("redirect:/admin/area/index.html")); } diff --git a/contact-center/app/src/main/java/com/chatopera/cc/app/handler/admin/callcenter/CallCenterMediaController.java b/contact-center/app/src/main/java/com/chatopera/cc/app/handler/admin/callcenter/CallCenterMediaController.java index 3d0dfbb9..496a4dc1 100644 --- a/contact-center/app/src/main/java/com/chatopera/cc/app/handler/admin/callcenter/CallCenterMediaController.java +++ b/contact-center/app/src/main/java/com/chatopera/cc/app/handler/admin/callcenter/CallCenterMediaController.java @@ -34,7 +34,7 @@ import org.springframework.web.multipart.MultipartFile; import org.springframework.web.servlet.ModelAndView; import com.chatopera.cc.util.Menu; -import com.chatopera.cc.util.UKTools; +import com.chatopera.cc.app.MainUtils; import com.chatopera.cc.app.service.repository.MediaRepository; import com.chatopera.cc.app.service.repository.PbxHostRepository; import com.chatopera.cc.app.handler.Handler; @@ -79,7 +79,7 @@ public class CallCenterMediaController extends Handler{ if(!StringUtils.isBlank(media.getName())){ int count = mediaRes.countByNameAndOrgi(media.getName(), super.getOrgi(request)) ; if(count == 0){ - String fileName = "media/"+UKTools.getUUID()+mediafile.getOriginalFilename().substring(mediafile.getOriginalFilename().lastIndexOf(".")) ; + String fileName = "media/"+ MainUtils.getUUID()+mediafile.getOriginalFilename().substring(mediafile.getOriginalFilename().lastIndexOf(".")) ; media.setOrgi(super.getOrgi(request)); media.setCreater(super.getUser(request).getId()); @@ -125,7 +125,7 @@ public class CallCenterMediaController extends Handler{ wavFile.deleteOnExit(); } - String fileName = "media/"+UKTools.getUUID()+mediafile.getOriginalFilename().substring(mediafile.getOriginalFilename().lastIndexOf(".")) ; + String fileName = "media/"+ MainUtils.getUUID()+mediafile.getOriginalFilename().substring(mediafile.getOriginalFilename().lastIndexOf(".")) ; oldMedia.setFilename(fileName); if(mediafile!=null && mediafile.getOriginalFilename().lastIndexOf(".") > 0){ diff --git a/contact-center/app/src/main/java/com/chatopera/cc/app/handler/admin/channel/CalloutChannelController.java b/contact-center/app/src/main/java/com/chatopera/cc/app/handler/admin/channel/CalloutChannelController.java index f6946f6c..8e24813d 100644 --- a/contact-center/app/src/main/java/com/chatopera/cc/app/handler/admin/channel/CalloutChannelController.java +++ b/contact-center/app/src/main/java/com/chatopera/cc/app/handler/admin/channel/CalloutChannelController.java @@ -17,7 +17,7 @@ package com.chatopera.cc.app.handler.admin.channel; import com.chatopera.cc.app.MainContext; import com.chatopera.cc.util.Menu; -import com.chatopera.cc.util.UKTools; +import com.chatopera.cc.app.MainUtils; import com.chatopera.cc.exception.CSKefuException; import com.chatopera.cc.app.service.repository.ConsultInviteRepository; import com.chatopera.cc.app.service.repository.SNSAccountRepository; @@ -107,7 +107,7 @@ public class CalloutChannelController extends Handler { @Menu(type = "callout" , subtype = "delete") public ModelAndView delete(ModelMap map , HttpServletRequest request , @Valid String id , @Valid String confirm) { boolean execute = false ; - if(execute = UKTools.secConfirm(secRes, super.getOrgi(request), confirm)){ + if(execute = MainUtils.secConfirm(secRes, super.getOrgi(request), confirm)){ SNSAccount snsAccount = snsAccountRes.findByIdAndOrgi(id , super.getOrgi(request)) ; if(snsAccountRes!=null){ snsAccountRes.delete(snsAccount); diff --git a/contact-center/app/src/main/java/com/chatopera/cc/app/handler/admin/channel/SNSAccountIMController.java b/contact-center/app/src/main/java/com/chatopera/cc/app/handler/admin/channel/SNSAccountIMController.java index d60f1cfa..442aafbd 100644 --- a/contact-center/app/src/main/java/com/chatopera/cc/app/handler/admin/channel/SNSAccountIMController.java +++ b/contact-center/app/src/main/java/com/chatopera/cc/app/handler/admin/channel/SNSAccountIMController.java @@ -19,7 +19,7 @@ package com.chatopera.cc.app.handler.admin.channel; import com.chatopera.cc.app.MainContext; import com.chatopera.cc.util.Base62; import com.chatopera.cc.util.Menu; -import com.chatopera.cc.util.UKTools; +import com.chatopera.cc.app.MainUtils; import com.chatopera.cc.app.service.repository.ConsultInviteRepository; import com.chatopera.cc.app.service.repository.OrganRepository; import com.chatopera.cc.app.service.repository.SNSAccountRepository; @@ -123,7 +123,7 @@ public class SNSAccountIMController extends Handler { @Menu(type = "weixin", subtype = "delete") public ModelAndView delete(ModelMap map, HttpServletRequest request, @Valid String id, @Valid String confirm) { boolean execute = false; - if (execute = UKTools.secConfirm(secRes, super.getOrgi(request), confirm)) { + if (execute = MainUtils.secConfirm(secRes, super.getOrgi(request), confirm)) { SNSAccount snsAccount = snsAccountRes.findByIdAndOrgi(id, super.getOrgi(request)); if (snsAccountRes != null) { snsAccountRes.delete(snsAccount); diff --git a/contact-center/app/src/main/java/com/chatopera/cc/app/handler/admin/config/SystemConfigController.java b/contact-center/app/src/main/java/com/chatopera/cc/app/handler/admin/config/SystemConfigController.java index 4ba7f9ac..cbb932df 100644 --- a/contact-center/app/src/main/java/com/chatopera/cc/app/handler/admin/config/SystemConfigController.java +++ b/contact-center/app/src/main/java/com/chatopera/cc/app/handler/admin/config/SystemConfigController.java @@ -29,6 +29,7 @@ import javax.servlet.http.HttpServletRequest; import javax.validation.Valid; import com.chatopera.cc.app.MainContext; +import com.chatopera.cc.app.MainUtils; import com.chatopera.cc.util.Menu; import com.chatopera.cc.app.service.cache.CacheHelper; import com.chatopera.cc.app.service.repository.SecretRepository; @@ -50,7 +51,6 @@ import org.springframework.web.multipart.MultipartFile; import org.springframework.web.servlet.ModelAndView; import com.corundumstudio.socketio.SocketIOServer; -import com.chatopera.cc.util.UKTools; import com.chatopera.cc.app.handler.Handler; import com.chatopera.cc.app.model.SystemConfig; import com.chatopera.cc.app.model.UKeFuDic; @@ -135,7 +135,7 @@ public class SystemConfigController extends Handler{ @Menu(type = "admin" , subtype = "stopimserver" , access = false , admin = true) public ModelAndView stopimserver(ModelMap map , HttpServletRequest request , @Valid String confirm) throws SQLException { boolean execute = false ; - if(execute = UKTools.secConfirm(secRes, super.getOrgi(request), confirm)){ + if(execute = MainUtils.secConfirm(secRes, super.getOrgi(request), confirm)){ server.stop(); MainContext.setIMServerStatus(false); } @@ -167,7 +167,7 @@ public class SystemConfigController extends Handler{ @Menu(type = "admin" , subtype = "stop" , access = false , admin = true) public ModelAndView stop(ModelMap map , HttpServletRequest request , @Valid String confirm) throws SQLException { boolean execute = false ; - if(execute = UKTools.secConfirm(secRes, super.getOrgi(request), confirm)){ + if(execute = MainUtils.secConfirm(secRes, super.getOrgi(request), confirm)){ server.stop(); MainContext.setIMServerStatus(false); System.exit(0); @@ -192,7 +192,7 @@ public class SystemConfigController extends Handler{ config.setCreatetime(new Date()); systemConfig = config ; }else{ - UKTools.copyProperties(config,systemConfig); + MainUtils.copyProperties(config,systemConfig); } if(config.isEnablessl()){ if(keyfile!=null && keyfile.getBytes()!=null && keyfile.getBytes().length > 0 && keyfile.getOriginalFilename()!=null && keyfile.getOriginalFilename().length() > 0){ @@ -204,7 +204,7 @@ public class SystemConfigController extends Handler{ } Properties prop = new Properties(); FileOutputStream oFile = new FileOutputStream(sslFilePath);//true表示追加打开 - prop.setProperty("key-store-password", UKTools.encryption(systemConfig.getJkspassword())) ; + prop.setProperty("key-store-password", MainUtils.encryption(systemConfig.getJkspassword())) ; prop.setProperty("key-store",systemConfig.getJksfile()) ; prop.store(oFile , "SSL Properties File"); oFile.close(); @@ -217,17 +217,17 @@ public class SystemConfigController extends Handler{ } if(loginlogo!=null && !StringUtils.isBlank(loginlogo.getOriginalFilename()) && loginlogo.getOriginalFilename().lastIndexOf(".") > 0) { - String logoFileName = "logo/"+UKTools.md5(loginlogo.getOriginalFilename())+loginlogo.getOriginalFilename().substring(loginlogo.getOriginalFilename().lastIndexOf(".")) ; + String logoFileName = "logo/"+ MainUtils.md5(loginlogo.getOriginalFilename())+loginlogo.getOriginalFilename().substring(loginlogo.getOriginalFilename().lastIndexOf(".")) ; FileUtils.writeByteArrayToFile(new File(path ,logoFileName), loginlogo.getBytes()); systemConfig.setLoginlogo(logoFileName); } if(consolelogo!=null && !StringUtils.isBlank(consolelogo.getOriginalFilename()) && consolelogo.getOriginalFilename().lastIndexOf(".") > 0) { - String consoleLogoFileName = "logo/"+UKTools.md5(consolelogo.getOriginalFilename())+consolelogo.getOriginalFilename().substring(consolelogo.getOriginalFilename().lastIndexOf(".")) ; + String consoleLogoFileName = "logo/"+ MainUtils.md5(consolelogo.getOriginalFilename())+consolelogo.getOriginalFilename().substring(consolelogo.getOriginalFilename().lastIndexOf(".")) ; FileUtils.writeByteArrayToFile(new File(path ,consoleLogoFileName), consolelogo.getBytes()); systemConfig.setConsolelogo(consoleLogoFileName); } if(favlogo!=null && !StringUtils.isBlank(favlogo.getOriginalFilename()) && consolelogo.getOriginalFilename().lastIndexOf(".") > 0) { - String favLogoFileName = "logo/"+UKTools.md5(favlogo.getOriginalFilename())+favlogo.getOriginalFilename().substring(favlogo.getOriginalFilename().lastIndexOf(".")) ; + String favLogoFileName = "logo/"+ MainUtils.md5(favlogo.getOriginalFilename())+favlogo.getOriginalFilename().substring(favlogo.getOriginalFilename().lastIndexOf(".")) ; FileUtils.writeByteArrayToFile(new File(path ,favLogoFileName), favlogo.getBytes()); systemConfig.setFavlogo(favLogoFileName); } @@ -239,8 +239,8 @@ public class SystemConfigController extends Handler{ if(secretConfig!=null && secretConfig.size() > 0){ Secret tempSecret = secretConfig.get(0) ; String oldpass = request.getParameter("oldpass") ; - if(!StringUtils.isBlank(oldpass) && UKTools.md5(oldpass).equals(tempSecret.getPassword())){ - tempSecret.setPassword(UKTools.md5(secret.getPassword())); + if(!StringUtils.isBlank(oldpass) && MainUtils.md5(oldpass).equals(tempSecret.getPassword())){ + tempSecret.setPassword(MainUtils.md5(secret.getPassword())); msg = "1" ; tempSecret.setEnable(true); secRes.save(tempSecret) ; @@ -251,7 +251,7 @@ public class SystemConfigController extends Handler{ secret.setOrgi(super.getOrgi(request)); secret.setCreater(super.getUser(request).getId()); secret.setCreatetime(new Date()); - secret.setPassword(UKTools.md5(secret.getPassword())); + secret.setPassword(MainUtils.md5(secret.getPassword())); secret.setEnable(true); msg = "1" ; secRes.save(secret) ; diff --git a/contact-center/app/src/main/java/com/chatopera/cc/app/handler/admin/config/SystemMessageController.java b/contact-center/app/src/main/java/com/chatopera/cc/app/handler/admin/config/SystemMessageController.java index 32218123..71b709a2 100644 --- a/contact-center/app/src/main/java/com/chatopera/cc/app/handler/admin/config/SystemMessageController.java +++ b/contact-center/app/src/main/java/com/chatopera/cc/app/handler/admin/config/SystemMessageController.java @@ -37,7 +37,7 @@ import org.springframework.ui.ModelMap; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.servlet.ModelAndView; -import com.chatopera.cc.util.UKTools; +import com.chatopera.cc.app.MainUtils; @Controller @RequestMapping("/admin") @@ -65,7 +65,7 @@ public class SystemMessageController extends Handler { email.setOrgi(super.getOrgi(request)); email.setMsgtype(MainContext.SystemMessageType.EMAIL.toString()); if(!StringUtils.isBlank(email.getSmtppassword())) { - email.setSmtppassword(UKTools.encryption(email.getSmtppassword())); + email.setSmtppassword(MainUtils.encryption(email.getSmtppassword())); } systemMessageRepository.save(email) ; return request(super.createRequestPageTempletResponse("redirect:/admin/email/index.html")); @@ -87,7 +87,7 @@ public class SystemMessageController extends Handler { email.setOrgi(temp.getOrgi()); email.setMsgtype(MainContext.SystemMessageType.EMAIL.toString()); if(!StringUtils.isBlank(email.getSmtppassword())) { - email.setSmtppassword(UKTools.encryption(email.getSmtppassword())); + email.setSmtppassword(MainUtils.encryption(email.getSmtppassword())); }else { email.setSmtppassword(temp.getSmtppassword()); } @@ -128,7 +128,7 @@ public class SystemMessageController extends Handler { sms.setOrgi(super.getOrgi(request)); sms.setMsgtype(MainContext.SystemMessageType.SMS.toString()); if(!StringUtils.isBlank(sms.getSmtppassword())) { - sms.setSmtppassword(UKTools.encryption(sms.getSmtppassword())); + sms.setSmtppassword(MainUtils.encryption(sms.getSmtppassword())); } systemMessageRepository.save(sms) ; return request(super.createRequestPageTempletResponse("redirect:/admin/sms/index.html")); @@ -151,7 +151,7 @@ public class SystemMessageController extends Handler { sms.setOrgi(temp.getOrgi()); sms.setMsgtype(MainContext.SystemMessageType.SMS.toString()); if(!StringUtils.isBlank(sms.getSmtppassword())) { - sms.setSmtppassword(UKTools.encryption(sms.getSmtppassword())); + sms.setSmtppassword(MainUtils.encryption(sms.getSmtppassword())); }else { sms.setSmtppassword(temp.getSmtppassword()); } diff --git a/contact-center/app/src/main/java/com/chatopera/cc/app/handler/admin/system/MetadataController.java b/contact-center/app/src/main/java/com/chatopera/cc/app/handler/admin/system/MetadataController.java index 9520a22c..8baabc69 100644 --- a/contact-center/app/src/main/java/com/chatopera/cc/app/handler/admin/system/MetadataController.java +++ b/contact-center/app/src/main/java/com/chatopera/cc/app/handler/admin/system/MetadataController.java @@ -51,7 +51,7 @@ import org.springframework.ui.ModelMap; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.servlet.ModelAndView; -import com.chatopera.cc.util.UKTools; +import com.chatopera.cc.app.MainUtils; import com.chatopera.cc.util.UKeFuList; import com.chatopera.cc.app.service.repository.MetadataRepository; import com.chatopera.cc.app.handler.Handler; @@ -222,7 +222,7 @@ public class MetadataController extends Handler{ //当前记录没有被添加过，进行正常添加 metaDataTable.setTablename(table); metaDataTable.setOrgi(user.getOrgi()); - metaDataTable.setId(UKTools.md5(metaDataTable.getTablename())); + metaDataTable.setId(MainUtils.md5(metaDataTable.getTablename())); metaDataTable.setTabledirid("0"); metaDataTable.setCreater(user.getId()); metaDataTable.setCreatername(user.getUsername()); diff --git a/contact-center/app/src/main/java/com/chatopera/cc/app/handler/admin/system/TemplateController.java b/contact-center/app/src/main/java/com/chatopera/cc/app/handler/admin/system/TemplateController.java index 480f6383..4af2ee34 100644 --- a/contact-center/app/src/main/java/com/chatopera/cc/app/handler/admin/system/TemplateController.java +++ b/contact-center/app/src/main/java/com/chatopera/cc/app/handler/admin/system/TemplateController.java @@ -35,7 +35,7 @@ import org.springframework.web.servlet.ModelAndView; import com.chatopera.cc.app.MainContext; import com.chatopera.cc.util.Menu; -import com.chatopera.cc.util.UKTools; +import com.chatopera.cc.app.MainUtils; import com.chatopera.cc.app.service.cache.CacheHelper; import com.chatopera.cc.app.service.repository.SysDicRepository; import com.chatopera.cc.app.service.repository.TemplateRepository; @@ -67,7 +67,7 @@ public class TemplateController extends Handler{ public void expall(ModelMap map , HttpServletRequest request , HttpServletResponse response) throws Exception { List