github/cosin
1
0
Fork 0
mirror of https://github.com/chatopera/cosin.git synced 2025-08-01 16:38:02 +08:00
Code Issues Releases Wiki Activity

#126 fix save 网站渠道 error

Browse Source
This commit is contained in:
Hai Liang Wang 2018-11-05 13:53:18 +08:00
parent 87f80fdd1c
commit 468fb75358
6 changed files with 51 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
contact-center/app/src/main/java/com/chatopera/cc/app/handler/admin/channel/SNSAccountIMController.java
View File

@ -112,6 +112,8 @@ public class SNSAccountIMController extends Handler {
coultInvite.setOrgi(super.getOrgi(request)); coultInvite.setOrgi(super.getOrgi(request));
coultInvite.setName(snsAccount.getName()); coultInvite.setName(snsAccount.getName());
coultInvite.setOwner(snsAccount.getCreater()); coultInvite.setOwner(snsAccount.getCreater());
coultInvite.setAi(false);
coultInvite.setAifirst(false);
invite.save(coultInvite); invite.save(coultInvite);
} }
} }

6
contact-center/app/src/main/java/com/chatopera/cc/app/handler/admin/channel/WebIMController.java
View File

@ -89,7 +89,11 @@ public class WebIMController extends Handler {
@RequestMapping("/save") @RequestMapping("/save")
@Menu(type = "admin", subtype = "app", admin = true) @Menu(type = "admin", subtype = "app", admin = true)
public ModelAndView save(HttpServletRequest request, @Valid CousultInvite inviteData, @RequestParam(value = "webimlogo", required = false) MultipartFile webimlogo, @RequestParam(value = "agentheadimg", required = false) MultipartFile agentheadimg) throws IOException { public ModelAndView save(HttpServletRequest request,
@Valid CousultInvite inviteData,
@RequestParam(value = "webimlogo", required = false) MultipartFile webimlogo,
@RequestParam(value = "agentheadimg", required = false) MultipartFile agentheadimg) throws IOException {
if (StringUtils.isNotBlank(inviteData.getSnsaccountid())) { if (StringUtils.isNotBlank(inviteData.getSnsaccountid())) {
CousultInvite tempData = invite.findBySnsaccountidAndOrgi(inviteData.getSnsaccountid(), super.getOrgi(request)); CousultInvite tempData = invite.findBySnsaccountidAndOrgi(inviteData.getSnsaccountid(), super.getOrgi(request));
if (tempData != null) { if (tempData != null) {

8
contact-center/app/src/main/java/com/chatopera/cc/app/handler/admin/config/SystemConfigController.java
View File

@ -177,7 +177,13 @@ public class SystemConfigController extends Handler {
@RequestMapping("/save") @RequestMapping("/save")
@Menu(type = "admin", subtype = "save", admin = true) @Menu(type = "admin", subtype = "save", admin = true)
public ModelAndView save(ModelMap map, HttpServletRequest request, @Valid SystemConfig config, BindingResult result, @RequestParam(value = "keyfile", required = false) MultipartFile keyfile, @RequestParam(value = "loginlogo", required = false) MultipartFile loginlogo, @RequestParam(value = "consolelogo", required = false) MultipartFile consolelogo, @RequestParam(value = "favlogo", required = false) MultipartFile favlogo, @Valid Secret secret) throws SQLException, IOException, NoSuchAlgorithmException { public ModelAndView save(ModelMap map, HttpServletRequest request,
@Valid SystemConfig config, BindingResult result,
@RequestParam(value = "keyfile", required = false) MultipartFile keyfile,
@RequestParam(value = "loginlogo", required = false) MultipartFile loginlogo,
@RequestParam(value = "consolelogo", required = false) MultipartFile consolelogo,
@RequestParam(value = "favlogo", required = false) MultipartFile favlogo,
@Valid Secret secret) throws SQLException, IOException, NoSuchAlgorithmException {
/*SystemConfig systemConfig = systemConfigRes.findByOrgi(super.getOrgi(request)) ; /*SystemConfig systemConfig = systemConfigRes.findByOrgi(super.getOrgi(request)) ;
config.setOrgi(super.getOrgi(request));*/ config.setOrgi(super.getOrgi(request));*/
SystemConfig systemConfig = systemConfigRes.findByOrgi(MainContext.SYSTEM_ORGI); SystemConfig systemConfig = systemConfigRes.findByOrgi(MainContext.SYSTEM_ORGI);

12
contact-center/app/src/main/resources/templates/admin/webim/index.html
View File

@ -30,9 +30,17 @@
<#if inviteData??> <#if inviteData??>
<input type="hidden" name="id" value="${inviteData.id!''}"> <input type="hidden" name="id" value="${inviteData.id!''}">
<input type="hidden" name="snsaccountid" value="${inviteData.snsaccountid!''}"> <input type="hidden" name="snsaccountid" value="${inviteData.snsaccountid!''}">
<input type="hidden" name="ai" value="${inviteData.ai!''}"> <#if inviteData.ai??>
<input type="hidden" name="ai" value="${inviteData.ai?then('true','false')}">
<#else>
<input type="hidden" name="ai" value="false">
</#if>
<#if inviteData.aifirst??>
<input type="hidden" name="aifirst" value="${inviteData.aifirst?then('true','false')}">
<#else>
<input type="hidden" name="aifirst" value="false">
</#if>
<input type="hidden" name="aisuccesstip" value="${inviteData.aisuccesstip!''}"> <input type="hidden" name="aisuccesstip" value="${inviteData.aisuccesstip!''}">
<input type="hidden" name="aifirst" value="${inviteData.aifirst!''}">
<input type="hidden" name="ainame" value="${inviteData.ainame!''}"> <input type="hidden" name="ainame" value="${inviteData.ainame!''}">
<input type="hidden" name="aiid" value="${inviteData.aiid!''}"> <input type="hidden" name="aiid" value="${inviteData.aiid!''}">
</#if> </#if>

20
contact-center/app/src/main/resources/templates/admin/webim/invote.html
View File

@ -30,12 +30,20 @@
<#if inviteData??> <#if inviteData??>
<input type="hidden" name="id" value="${inviteData.id!''}"> <input type="hidden" name="id" value="${inviteData.id!''}">
<input type="hidden" name="snsaccountid" value="${inviteData.snsaccountid!''}"> <input type="hidden" name="snsaccountid" value="${inviteData.snsaccountid!''}">
<input type="hidden" name="ai" value="${inviteData.ai!''}"> <#if inviteData.ai??>
<input type="hidden" name="aisuccesstip" value="${inviteData.aisuccesstip!''}"> <input type="hidden" name="ai" value="${inviteData.ai?then('true','false')}">
<input type="hidden" name="aifirst" value="${inviteData.aifirst!''}"> <#else>
<input type="hidden" name="ainame" value="${inviteData.ainame!''}"> <input type="hidden" name="ai" value="false">
<input type="hidden" name="aiid" value="${inviteData.aiid!''}"> </#if>
</#if> <#if inviteData.aifirst??>
<input type="hidden" name="aifirst" value="${inviteData.aifirst?then('true','false')}">
<#else>
<input type="hidden" name="aifirst" value="false">
</#if>
<input type="hidden" name="aisuccesstip" value="${inviteData.aisuccesstip!''}">
<input type="hidden" name="ainame" value="${inviteData.ainame!''}">
<input type="hidden" name="aiid" value="${inviteData.aiid!''}">
</#if>
<div class="row"> <div class="row">
<div class="col-lg-12"> <div class="col-lg-12">
<div class="ukefu-customer-div setting-wrapper"> <div class="ukefu-customer-div setting-wrapper">

18
contact-center/app/src/main/resources/templates/admin/webim/profile.html
View File

@ -30,11 +30,19 @@
<#if inviteData??> <#if inviteData??>
<input type="hidden" name="id" value="${inviteData.id!''}"> <input type="hidden" name="id" value="${inviteData.id!''}">
<input type="hidden" name="snsaccountid" value="${inviteData.snsaccountid!''}"> <input type="hidden" name="snsaccountid" value="${inviteData.snsaccountid!''}">
<input type="hidden" name="ai" value="${inviteData.ai!''}"> <#if inviteData.ai??>
<input type="hidden" name="aisuccesstip" value="${inviteData.aisuccesstip!''}"> <input type="hidden" name="ai" value="${inviteData.ai?then('true','false')}">
<input type="hidden" name="aifirst" value="${inviteData.aifirst!''}"> <#else>
<input type="hidden" name="ainame" value="${inviteData.ainame!''}"> <input type="hidden" name="ai" value="false">
<input type="hidden" name="aiid" value="${inviteData.aiid!''}"> </#if>
<#if inviteData.aifirst??>
<input type="hidden" name="aifirst" value="${inviteData.aifirst?then('true','false')}">
<#else>
<input type="hidden" name="aifirst" value="false">
</#if>
<input type="hidden" name="aisuccesstip" value="${inviteData.aisuccesstip!''}">
<input type="hidden" name="ainame" value="${inviteData.ainame!''}">
<input type="hidden" name="aiid" value="${inviteData.aiid!''}">
</#if> </#if>
<div class="row"> <div class="row">
<div class="col-lg-12"> <div class="col-lg-12">