diff --git a/README.md b/README.md index eb6c558..72d59f8 100644 --- a/README.md +++ b/README.md @@ -1,10 +1,10 @@ # 酒店管理系统API -Demo: www.mafangui.cn:8888 +Demo: [不可用] -前端页面项目: https://github.com/FreeeBird/hotel_app +前端页面项目(vue): https://github.com/FreeeBird/hotel_app -后台管理项目:https://github.com/FreeeBird/hotel-manager +后台管理项目(vue-admin):https://github.com/FreeeBird/hotel-manager ## 1 背景说明 diff --git a/src/main/java/cn/mafangui/hotel/controller/UserController.java b/src/main/java/cn/mafangui/hotel/controller/UserController.java index fbe9618..be8440b 100644 --- a/src/main/java/cn/mafangui/hotel/controller/UserController.java +++ b/src/main/java/cn/mafangui/hotel/controller/UserController.java @@ -23,7 +23,7 @@ public class UserController { */ @RequestMapping(method = RequestMethod.POST,value = "/login") public int userLogin(String username,String password){ - int result = 0; + int result; if (username == null | username == "" | password == null | password == ""){ return -1; } diff --git a/src/main/java/cn/mafangui/hotel/service/impl/UserServiceImpl.java b/src/main/java/cn/mafangui/hotel/service/impl/UserServiceImpl.java index 36a4ba9..9e5c2d5 100644 --- a/src/main/java/cn/mafangui/hotel/service/impl/UserServiceImpl.java +++ b/src/main/java/cn/mafangui/hotel/service/impl/UserServiceImpl.java @@ -3,6 +3,7 @@ package cn.mafangui.hotel.service.impl; import cn.mafangui.hotel.entity.User; import cn.mafangui.hotel.mapper.UserMapper; import cn.mafangui.hotel.service.UserService; +import cn.mafangui.hotel.utils.MD5Utils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -20,11 +21,13 @@ public class UserServiceImpl implements UserService { @Override public int addUser(User user) { + user.setPassword(MD5Utils.MD5Encode(user.getPassword())); return userMapper.insertSelective(user); } @Override public int insertUser(User user) { + user.setPassword(MD5Utils.MD5Encode(user.getPassword())); return userMapper.insert(user); } @@ -40,7 +43,8 @@ public class UserServiceImpl implements UserService { @Override public User selectByUsernameAndPassword(String username, String password) { - return userMapper.selectByUsernameAndPassword(username,password); + String pass = MD5Utils.MD5Encode(password); + return userMapper.selectByUsernameAndPassword(username,pass); } @Override diff --git a/src/main/java/cn/mafangui/hotel/utils/MD5Utils.java b/src/main/java/cn/mafangui/hotel/utils/MD5Utils.java new file mode 100644 index 0000000..a161b3a --- /dev/null +++ b/src/main/java/cn/mafangui/hotel/utils/MD5Utils.java @@ -0,0 +1,60 @@ +package cn.mafangui.hotel.utils; + +import java.security.MessageDigest; + +public class MD5Utils { + + private static final String hexDigIts[] = {"0","1","2","3","4","5","6","7","8","9","a","b","c","d","e","f"}; + + /** + * MD5加密 + * @param origin 字符 + * @param charsetname 编码 + * @return + */ + public static String MD5Encode(String origin, String charsetname){ + String resultString = null; + try{ + resultString = new String(origin); + MessageDigest md = MessageDigest.getInstance("MD5"); + if(null == charsetname || "".equals(charsetname)){ + resultString = byteArrayToHexString(md.digest(resultString.getBytes())); + }else{ + resultString = byteArrayToHexString(md.digest(resultString.getBytes(charsetname))); + } + }catch (Exception e){ + } + return resultString; + } + + public static String MD5Encode(String origin){ + String resultString = null; + try{ + resultString = origin; + MessageDigest md = MessageDigest.getInstance("MD5"); + resultString = byteArrayToHexString(md.digest(resultString.getBytes("utf8"))); + }catch (Exception e){ + } + return resultString; + } + + + public static String byteArrayToHexString(byte b[]){ + StringBuffer resultSb = new StringBuffer(); + for(int i = 0; i < b.length; i++){ + resultSb.append(byteToHexString(b[i])); + } + return resultSb.toString(); + } + + public static String byteToHexString(byte b){ + int n = b; + if(n < 0){ + n += 256; + } + int d1 = n / 16; + int d2 = n % 16; + return hexDigIts[d1] + hexDigIts[d2]; + } + +} \ No newline at end of file diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index 4b21dc0..1324fe5 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -6,7 +6,7 @@ spring: datasource: driver-class-name: com.mysql.jdbc.Driver username: root - password: 8888 + password: root url: jdbc:mysql://localhost:3306/hotel?useUnicode=true&characterEncoding=UTF-8&zeroDateTimeBehavior=convertToNull&useSSL=true mybatis: type-aliases-package: classpath*:cn.mafangui.hotel.entity diff --git a/src/main/resources/schema.sql b/src/main/resources/schema.sql index 7fa5867..71e1c5f 100644 --- a/src/main/resources/schema.sql +++ b/src/main/resources/schema.sql @@ -81,7 +81,7 @@ CREATE TABLE IF NOT EXISTS `user_info` ( `user_id` INT NULL AUTO_INCREMENT COMMENT '用户id', `username` VARCHAR (16) NOT NULL COMMENT '用户名', - `password` VARCHAR (16) NOT NULL COMMENT '密码', + `password` VARCHAR (256) NOT NULL COMMENT '密码', `name` VARCHAR(16) not NULL COMMENT '姓名', `gender` CHAR(2) not null DEFAULT '男' COMMENT '性别', `phone` VARCHAR (16) NOT NULL COMMENT '手机号码',