manager/my-worker
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

代码优化 UTF-8

Browse Source
This commit is contained in:
thinkgem
2021-05-29 00:01:07 +08:00
parent 86ffdf24b8
commit 9403efc790
23 changed files with 81 additions and 69 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
modules/core/src/main/java/com/jeesite/common/shiro/realm/CasAuthorizingRealm.java
View File

@@ -77,7 +77,7 @@ public class CasAuthorizingRealm extends BaseAuthorizingRealm {
String ticket = (String) casToken.getCredentials();
if (ticketValidator == null) {
ticketValidator = new Cas20ServiceTicketValidator(casServerUrl);
((Cas20ServiceTicketValidator)ticketValidator).setEncoding("UTF-8");
((Cas20ServiceTicketValidator)ticketValidator).setEncoding(EncodeUtils.UTF_8);
}
// 进行登录身份验证

3
modules/core/src/main/java/com/jeesite/modules/msg/send/EmailSendService.java
View File

@@ -6,6 +6,7 @@ package com.jeesite.modules.msg.send;
import org.apache.commons.mail.HtmlEmail;
import org.springframework.stereotype.Service;
import com.jeesite.common.codec.EncodeUtils;
import com.jeesite.common.config.Global;
import com.jeesite.common.lang.ExceptionUtils;
import com.jeesite.common.lang.StringUtils;
@@ -33,7 +34,7 @@ public class EmailSendService extends BaseService implements MsgSendService{
String sslSmtpPort = Global.getProperty("msg.email.sslSmtpPort", "465");
HtmlEmail htmlEmail = new HtmlEmail();
htmlEmail.setCharset("utf-8");
htmlEmail.setCharset(EncodeUtils.UTF_8);
htmlEmail.setFrom(fromAddress);
htmlEmail.setAuthentication(fromAddress, fromPassword);
htmlEmail.setHostName(fromHostName);

3
modules/core/src/main/java/com/jeesite/modules/msg/send/SmsSendService.java
View File

@@ -15,7 +15,6 @@ import com.jeesite.common.msg.SmsUtils;
import com.jeesite.common.service.BaseService;
import com.jeesite.modules.msg.entity.MsgPush;
import com.jeesite.modules.msg.entity.content.SmsMsgContent;
import com.jeesite.modules.msg.send.MsgSendService;
/**
* 短信发送服务实现
@@ -33,7 +32,7 @@ public class SmsSendService extends BaseService implements MsgSendService{
// String prefix = Global.getProperty("msg.sms.prefix", "");
// String suffix = Global.getProperty("msg.sms.suffix", "");
// Connection conn = Jsoup.connect(url);
// conn.postDataCharset("UTF-8");
// conn.postDataCharset(EncodeUtils.UTF_8);
// conn.method(Method.POST);
// for (String param : StringUtils.split(data, "&")){
// String[] ss = StringUtils.split(param, "=");

2
modules/core/src/main/resources/views/modules/sys/sysDesktop.html
View File

@@ -6,7 +6,7 @@
<div class="info-box">
<span class="info-box-icon bg-aqua"><i class="fa fa-cog"></i></span>
<div class="info-box-content">
<span class="info-box-text">CPU 使用率</span>
<span class="info-box-text">使用率</span>
<span class="info-box-number">90<small>%</small></span>
</div>
</div>

16
modules/core/src/main/resources/views/modules/sys/user/empUserList.html
View File

@@ -123,18 +123,18 @@
$('#dataGrid').dataGrid({
searchForm: $("#searchForm"),
columnModel: [
{header:'${text("登录账号")}', name:'loginCode', index:'a.login_code', width:150, align:"center", frozen:true, formatter: function(val, obj, row, act){
{header:'${text("登录账号")}', name:'loginCode', index:'a.login_code', width:120, align:"center", frozen:true, formatter: function(val, obj, row, act){
return '<a href="${ctx}/sys/empUser/form?userCode='+row.userCode+'&op=edit" class="btnList" data-title="${text("编辑用户")}">'+(val||row.id)+'</a>';
}},
{header:'${text("用户昵称")}', name:'userName', index:'a.user_name', width:135, align:"center"},
{header:'${text("员工姓名")}', name:'refName', index:'a.ref_name', width:135, align:"center"},
{header:'${text("用户昵称")}', name:'userName', index:'a.user_name', width:120, align:"center"},
{header:'${text("员工姓名")}', name:'refName', index:'a.ref_name', width:120, align:"center"},
{header:'${text("归属机构")}', name:'employee.office.officeName', index:'o.office_name', width:135, align:"center"},
{header:'${text("归属公司")}', name:'employee.company.companyName', index:'c.company_name', width:135, align:"center"},
{header:'${text("电子邮箱")}', name:'email', index:'a.email', width:135, align:"center"},
{header:'${text("手机号码")}', name:'mobile', index:'a.mobile', width:135, align:"center"},
{header:'${text("办公电话")}', name:'phone', index:'a.phone', width:135, align:"center"},
{header:'${text("更新时间")}', name:'updateDate', index:'a.update_date', width:135, align:"center"},
{header:'${text("状态")}', name:'status', index:'a.status', width:80, align:"center", formatter: function(val, obj, row, act){
{header:'${text("电子邮箱")}', name:'email', index:'a.email', width:120, align:"center"},
{header:'${text("手机号码")}', name:'mobile', index:'a.mobile', width:120, align:"center"},
{header:'${text("办公电话")}', name:'phone', index:'a.phone', width:120, align:"center"},
{header:'${text("更新时间")}', name:'updateDate', index:'a.update_date', width:120, align:"center", frozen:true},
{header:'${text("状态")}', name:'status', index:'a.status', width:80, align:"center", frozen:true, formatter: function(val, obj, row, act){
return js.getDictLabel(${@DictUtils.getDictListJson('sys_status')}, val, '未知', true);
}},
{header:'${text("操作")}', name:'actions', width:120, formatter: function(val, obj, row, act){