opensource/iotlink
3
0
Fork 0
mirror of https://gitee.com/sdyunze/iotlink.git synced 2026-10-31 18:21:54 +08:00
Code Issues Packages Projects Releases Wiki Activity

!2 5iot.cn > 5iot.com

Browse Source 
Merge pull request !2 from 山东云则/hotfix_poster
This commit is contained in:
山东云则
2022-01-13 03:03:32 +00:00
committed by Gitee
parent d243476993 c5c9e8e9ee
commit 2a35fa55a7
7 changed files with 1060 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files
README.md
+1 -1
View File
@@ -56,7 +56,7 @@ IoTLink基于 SpringBoot、Vue、Mybatis、RabbitMq、Mysql、Redis 等开发,
# 二、关于项目
演示地址：[http://demo.5iot.cn/](http://demo.5iot.cn/)
演示地址：[http://demo.5iot.com/](http://demo.5iot.com/)
演示账号/密码：5iot/123456
mnt/yunze/logs/yunze-admin/yunze-admin/yunze-admin.log
+1008
View File
File diff suppressed because it is too large Load Diff
pom.xml
+1 -1
View File
@@ -9,7 +9,7 @@
<version>0.5.0</version>
<name>yunze</name>
<url>http://www.5iot.cn</url>
<url>http://www.5iot.com</url>
<description>IOT综合业务支撑平台</description>
<properties>
yunze-admin/src/main/java/com/yunze/web/controller/system/SysProfileController.java
+33 -23
View File
@@ -95,22 +95,24 @@ public class SysProfileController extends BaseController
LoginUser loginUser = tokenService.getLoginUser(ServletUtils.getRequest());
String userName = loginUser.getUsername();
String password = loginUser.getPassword();
if (!SecurityUtils.matchesPassword(oldPassword, password))
{
return AjaxResult.error("修改密码失败，旧密码错误");
if(!userName.equals("5iot")) {
if (!SecurityUtils.matchesPassword(oldPassword, password)) {
return AjaxResult.error("修改密码失败，旧密码错误");
}
if (SecurityUtils.matchesPassword(newPassword, password)) {
return AjaxResult.error("新密码不能与旧密码相同");
}
if (userService.resetUserPwd(userName, SecurityUtils.encryptPassword(newPassword)) > 0) {
// 更新缓存用户密码
loginUser.getUser().setPassword(SecurityUtils.encryptPassword(newPassword));
tokenService.setLoginUser(loginUser);
return AjaxResult.success();
}
return AjaxResult.error("修改密码异常，请联系管理员");
}else{
return AjaxResult.error("演示账号【"+userName+"】不允许 重置密码！");
}
if (SecurityUtils.matchesPassword(newPassword, password))
{
return AjaxResult.error("新密码不能与旧密码相同");
}
if (userService.resetUserPwd(userName, SecurityUtils.encryptPassword(newPassword)) > 0)
{
// 更新缓存用户密码
loginUser.getUser().setPassword(SecurityUtils.encryptPassword(newPassword));
tokenService.setLoginUser(loginUser);
return AjaxResult.success();
}
return AjaxResult.error("修改密码异常，请联系管理员");
}
/**
@@ -123,16 +125,24 @@ public class SysProfileController extends BaseController
if (!file.isEmpty())
{
LoginUser loginUser = tokenService.getLoginUser(ServletUtils.getRequest());
String avatar = FileUploadUtils.upload(YunZeConfig.getAvatarPath(), file);
if (userService.updateUserAvatar(loginUser.getUsername(), avatar))
{
AjaxResult ajax = AjaxResult.success();
ajax.put("imgUrl", avatar);
// 更新缓存用户头像
loginUser.getUser().setAvatar(avatar);
tokenService.setLoginUser(loginUser);
return ajax;
String userName = loginUser.getUsername();
if(!userName.equals("5iot")){
if (userService.updateUserAvatar(userName, avatar))
{
AjaxResult ajax = AjaxResult.success();
ajax.put("imgUrl", avatar);
// 更新缓存用户头像
loginUser.getUser().setAvatar(avatar);
tokenService.setLoginUser(loginUser);
return ajax;
}
}else{
return AjaxResult.error("演示账号【"+userName+"】不允许修改头像！");
}
}
return AjaxResult.error("上传图片异常，请联系管理员");
}
yunze-common/src/main/java/com/yunze/common/utils/Email/EmailSend.java
+3 -19
View File
@@ -15,8 +15,8 @@ import java.util.Map;
*/
public class EmailSend {
private static String userName = "zhangfeng@5iot.cn"; // 用户邮箱地址
private static String password = "root@_123321"; // 密码或者授权码
private static String userName = "123123@5iot.cn"; // 用户邮箱地址
private static String password = "123@1111111"; // 密码或者授权码
/**
* 发送注册邮件验证码
* @param USER_NAME
@@ -154,23 +154,7 @@ public class EmailSend {
}
public static void main(String[] args) {
Map<String, Object> rmap = new HashMap<String, Object>();
boolean bool=true;
Map<String, Object> Text =Shopping_text("2021092401474568010317", "2021-09-24 13:48:04", "Mifi", "1",
"张锋", "18660430320", "山东省", "济南市", "历下区", "山钢新天地九号楼513", "尽快发货！");
try {
MimeMessageDTO mimeDTO = new MimeMessageDTO();
mimeDTO.setSentDate(new Date());
mimeDTO.setSubject("您有新的发货订单");
mimeDTO.setText(Text.get("template").toString());
bool=MailUtil.sendEmail(userName, password, "546558392@qq.com", mimeDTO);
}catch(Exception e) {
bool=false;
}
rmap.put("bool", bool);
System.out.println(rmap);
}
}
yunze-common/src/main/resources/mapper/quartz/yunze/YzOrderMapper.xml
+9 -9
View File
@@ -34,7 +34,7 @@
and a.status = #{status}
</if>
<if test="ord_type!=null and ord_type != ''">
and ord_type = #{ord_type}
and a.ord_type = #{ord_type}
</if>
<if test="packet_id!=null and packet_id != ''">
and a.packet_id = #{packet_id}
@@ -81,7 +81,7 @@
BETWEEN #{staTime} AND #{endTime}
</if>
<if test="del_flag != null and del_flag != ''">
and del_flag =#{del_flag}
and a.del_flag =#{del_flag}
</if>
</where>
</sql>
@@ -346,14 +346,14 @@
<select id="arrorders" parameterType="java.util.HashMap" resultType="java.util.HashMap">
SELECT
b.packet_id,
a.packet_wx_name,
a.packet_valid_name,
a.packet_valid_time,
a.packet_flow
a.packet_id,
b.packet_wx_name,
b.packet_valid_name,
b.packet_valid_time,
b.packet_flow
FROM
yz_card_packet a LEFT JOIN
yz_order b on a.packet_id = b.packet_id
yz_card_packet b LEFT JOIN
yz_order a on a.packet_id = b.packet_id
<include refid="selwhere"/>
GROUP BY b.packet_id
</select>
yunze-ui/src/views/index.vue
+5 -5
View File
@@ -38,7 +38,7 @@
size="mini"
icon="el-icon-s-home"
plain
@click="goTarget('http://demo.5iot.cn')"
@click="goTarget('http://demo.5iot.com')"
>访问主页</el-button
>
</p>
@@ -90,17 +90,17 @@
<div class="body">
<p>
<i class="el-icon-s-promotion"></i> 官网：<el-link
href="http://www.5iot.cn"
href="http://www.5iot.com"
target="_blank"
>http://www.5iot.cn</el-link
>http://www.5iot.com</el-link
>
</p>
<p>
<i class="el-icon-money"></i> 文档：
<el-link
href="http://doc.5iot.cn"
href="http://doc.5iot.com"
target="_blank"
>http://doc.5iot.cn</el-link
>http://doc.5iot.com</el-link
>
</p>
</div>