Commit cab99df9 authored by wujipeng's avatar wujipeng
Browse files

项目初始化

parent 315b5bf2
Pipeline #244 canceled with stages
......@@ -98,6 +98,37 @@
<artifactId>hibernate-validator</artifactId>
<version>6.2.0.Final</version>
</dependency>
<dependency>
<groupId>io.springfox</groupId>
<artifactId>springfox-swagger2</artifactId>
<version>2.6.0</version>
</dependency>
<!-- 接口API生成html文档 -->
<dependency>
<groupId>io.springfox</groupId>
<artifactId>springfox-swagger-ui</artifactId>
<version>2.6.0</version>
</dependency>
<dependency>
<groupId>io.github.swagger2markup</groupId>
<artifactId>swagger2markup</artifactId>
<version>1.3.1</version>
</dependency>
<dependency>
<groupId>io.swagger</groupId>
<artifactId>swagger-core</artifactId>
<version>1.5.16</version>
</dependency>
<dependency>
<groupId>io.swagger</groupId>
<artifactId>swagger-models</artifactId>
<version>1.5.16</version>
</dependency>
<dependency>
<groupId>org.pegdown</groupId>
<artifactId>pegdown</artifactId>
<version>1.4.2</version>
</dependency>
</dependencies>
<repositories>
......@@ -118,6 +149,28 @@
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-maven-plugin</artifactId>
</plugin>
<!--生成swagger html-->
<plugin>
<groupId>org.asciidoctor</groupId>
<artifactId>asciidoctor-maven-plugin</artifactId>
<version>1.5.6</version>
<configuration>
<!--asciidoc文件目录,请确认文件已经存在-->
<sourceDirectory>docs/asciidoc/generated</sourceDirectory>
<!---生成html的路径-->
<outputDirectory>docs/asciidoc/html</outputDirectory>
<backend>html</backend>
<sourceHighlighter>coderay</sourceHighlighter>
<attributes>
<!--导航栏在左-->
<toc>left</toc>
<!--显示层级数-->
<toclevels>3</toclevels>
<!--自动打数字序号-->
<sectnums>true</sectnums>
</attributes>
</configuration>
</plugin>
</plugins>
</build>
</project>
......@@ -2,6 +2,7 @@ package com.ruzhoukj.rx;
import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication;
import org.springframework.context.annotation.ComponentScan;
import org.springframework.scheduling.annotation.EnableScheduling;
/**
......@@ -9,6 +10,7 @@ import org.springframework.scheduling.annotation.EnableScheduling;
*/
@SpringBootApplication
@EnableScheduling
@ComponentScan(basePackages = {"com.platform"})
public class RxApplication {
public static void main(String[] args) {
......
package com.ruzhoukj.rx.common;
import java.util.HashMap;
import java.util.Map;
/**
* Created with IntelliJ IDEA.
* User: QianMo
* Date: 2020/8/26
* Time: 14:14
* 返回结果类
*/
public class R extends HashMap<String, Object> {
private static final long serialVersionUID = 1L;
public R() {
put("code", 1);
put("msg", "success");
}
public static R error() {
return error(301, "未知异常,请联系管理员");
}
public static R error(Integer code,String msg) {
return error(code, msg);
}
public static R error(int code, String msg) {
R r = new R();
r.put("code", code);
r.put("msg", msg);
return r;
}
public static R ok(int code, String msg) {
R r = new R();
r.put("code", code);
r.put("msg", msg);
return r;
}
public static R ok(Integer code,String msg,Object data,Boolean success,String extra) {
R r = new R();
r.put("code",code);
r.put("success",success);
r.put("data",data);
r.put("msg", msg);
r.put("extra",extra);
return r;
}
public static R ok(Map<String, Object> map) {
R r = new R();
r.putAll(map);
return r;
}
public static R ok() {
return new R();
}
public R put(String key, Object value) {
super.put(key, value);
return this;
}
public Integer getCode() {
return (Integer) this.get("code");
}
}
package com.ruzhoukj.rx.common.mqtt;
import lombok.extern.slf4j.Slf4j;
import org.eclipse.paho.client.mqttv3.*;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Service;
import javax.annotation.PostConstruct;
import javax.annotation.Resource;
/**
* @author 邬吉朋
*/
@Service
@Slf4j
public class MqttSubscriberClient {
@Resource
private MqttClient mqttClient;
@Value("${mqtt.topic}")
private String topic;
@PostConstruct
public void init() throws MqttException {
mqttClient.setCallback(new MqttCallback() {
@Override
public void connectionLost(Throwable cause) {
log.info("连接丢失: " + cause.getMessage());
// 这里可以添加重连逻辑
}
@Override
public void messageArrived(String topic, MqttMessage message) {
log.info("接收到消息: " + new String(message.getPayload()));
}
@Override
public void deliveryComplete(IMqttDeliveryToken token) {
// 订阅者不需要实现这个方法
}
});
mqttClient.subscribe(topic);
log.info("订阅主题: " + topic);
}
}
package com.ruzhoukj.rx.controller;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.ruzhoukj.rx.common.R;
import com.ruzhoukj.rx.pojo.User;
import com.ruzhoukj.rx.pojo.entity.UserEntity;
import com.ruzhoukj.rx.service.UserService;
import com.ruzhoukj.rx.util.JwtUtil;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;
import java.util.HashMap;
/**
* @author 邬吉朋
*/
@Slf4j
@Api(value = "/api/User", tags = "用户登录")
@RequestMapping("/api/User")
@CrossOrigin
@RestController
public class UserController {
@Resource
private UserService userService;
@Resource
private JwtUtil jwtUtil;
private static final String PW_PATTERN = "^(?![A-Za-z0-9]+$)(?![a-z0-9\\W]+$)(?![A-Za-z\\W]+$)(?![A-Z0-9\\W]+$)[a-zA-Z0-9\\W]{8,}$";
@PostMapping("/Login")
@ApiOperation(value = "用户登录", notes = "调用方法传递对象过来")
public R login(@RequestBody User user, HttpServletRequest req) {
UserEntity users = userService.login(user.getUserName(), user.getPassword());
if (users == null) {
Integer isValid = (Integer) req.getSession().getAttribute(user.getUserName());
if (isValid == null) {
req.getSession().setAttribute(user.getUserName(), 1);
return R.error(405, "用户名或密码错误,还有4次机会!");
} else {
if (isValid >= 5) {
QueryWrapper<UserEntity> queryWrapper = new QueryWrapper<>();
queryWrapper.eq("accountid", user.getUserName());
UserEntity account = userService.getOne(queryWrapper);
account.setValid(0);
userService.updateById(account);
return R.error(405, "用户已锁定!");
} else {
req.getSession().setAttribute(user.getUserName(), isValid + 1);
return R.error(405, "用户名或密码错误,还有" + (4 - isValid) + "次机会!");
}
}
}
if (users.getValid() == 0) {
return R.error(405, "用户已停用,请联系管理员!");
}
String token = jwtUtil.createJWT(users.getId(), users.getUserName(), users.getPassword());
req.getSession().setAttribute(user.getUserName(), null);
req.getSession().setAttribute("captcha", null);
HashMap<String, Object> map = new HashMap<>();
map.put("token", token);
map.put("backUrl", null);
return R.ok(1, "登录成功!", map, true, null);
}
}
......@@ -2,11 +2,14 @@ package com.ruzhoukj.rx.dao;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.ruzhoukj.rx.pojo.entity.OmAccountEntity;
import com.ruzhoukj.rx.pojo.entity.UserEntity;
import org.apache.ibatis.annotations.Mapper;
/**
* @author 邬吉朋
*/
@Mapper
public interface OmAccountDao extends BaseMapper<OmAccountEntity> {
public interface UserDao extends BaseMapper<UserEntity> {
}
......@@ -2,8 +2,8 @@ package com.ruzhoukj.rx.filter;
import com.ruzhoukj.rx.common.ContrastException;
import com.ruzhoukj.rx.common.NullTokenException;
import com.ruzhoukj.rx.pojo.entity.OmAccountEntity;
import com.ruzhoukj.rx.service.OmAccountService;
import com.ruzhoukj.rx.pojo.entity.UserEntity;
import com.ruzhoukj.rx.service.UserService;
import com.ruzhoukj.rx.util.JwtUtil;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Component;
......@@ -22,7 +22,7 @@ public class JwtInterceptor implements HandlerInterceptor {
@Resource
private JwtUtil jwtUtil;
@Resource
private OmAccountService omAccountService;
private UserService userService;
@Override
public boolean preHandle(HttpServletRequest request, HttpServletResponse response, Object handler) throws Exception {
......@@ -35,7 +35,7 @@ public class JwtInterceptor implements HandlerInterceptor {
log.debug("这是请求路径--------" + s);
String userId = (String) jwtUtil.parseJWT(token).get("jti");
request.setAttribute("userId", userId);
OmAccountEntity user = omAccountService.getUser(userId);
UserEntity user = userService.getUser(userId);
String newPass = null;
if (user != null) {
newPass = user.getPassword();
......
package com.ruzhoukj.rx.pojo;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.io.Serializable;
/**
* Created with IntelliJ IDEA.
* User: QianMo
* Date: 2020/8/26
* Time: 14:09
* 接受登录参数实体类
*/
@Data
@ApiModel(value = "用户登录对象",description ="用户登录对象" )
public class User implements Serializable {
private static final long serialVersionUID = 1L;
@ApiModelProperty(value = "用户名")
private String userName;
@ApiModelProperty(value = "密码")
private String password;
@ApiModelProperty(value = "验证码")
private String code;
}
package com.ruzhoukj.rx.pojo.entity;
import com.baomidou.mybatisplus.annotation.FieldFill;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.fasterxml.jackson.annotation.JsonInclude;
import lombok.Data;
import java.io.Serializable;
import java.math.BigDecimal;
import java.util.Date;
@Data
@TableName("om_account")
@JsonInclude(JsonInclude.Include.NON_EMPTY)
public class OmAccountEntity implements Serializable {
private static final long serialVersionUID = 1L;
@TableId
private String sysid;
private String accountid;
private String empid;
private BigDecimal expire;
private String humanId;
private Integer inact;
private BigDecimal lastchg;
private Integer max;
private Integer min;
private String password;
private Integer removed;
private Integer valid;
private Integer warn;
private String accounttype;
private String email;
private String msn;
private String wechartcode;
private String address;
private String address2;
private String postalcode;
private String postalcode2;
private String worktelphone;
private String worktelphone2;
private String mobile;
private String mobile2;
private String faxphone;
private String faxphone2;
private String pinyin;
private Integer del;
private Date logondate;
private BigDecimal logontimes;
private String enterpriseid;
private Integer mobilevalid;
private String mobileconfirmcode;
private String synchroid;
private Date createddate;
private String description;
private String name;
private String keyid;
private String sex;
private String position;
private String duty;
private String identitycard;
private String edbackground;
private String officeholder;
private String qualificationcert;
private String postcert;
private String photo;
private String file1;
private String file2;
private String file3;
private String file4;
private String filename1;
private String filename2;
private String filename3;
private String filename4;
private String file5;
private String filename5;
private Date updatecontentdate;
private String dynamicpassword;
private Date dynamicpwddate;
private String sort;
private String emailaccount;
private Integer taskcount;
private String wechartuserid;
private String fixedtelephone;
private String officeaddress;
private String officeroomno;
private Boolean conenterprise;
private String wechartmobile;
private String wechartemail;
private String recmsgtype;
private Integer mandatory;
private Integer accountstate;
@TableField(fill = FieldFill.UPDATE)
private String openid;
private String companyId;
private String unionid;
@TableField(exist = false) //此字段数据库中不存在
private Object obj;
@TableField(exist = false) //此字段数据库中不存在
private Object obj2;
}
package com.ruzhoukj.rx.pojo.entity;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.fasterxml.jackson.annotation.JsonInclude;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.io.Serializable;
/**
* @author 邬吉朋
*/
@Data
@TableName("user")
@JsonInclude(JsonInclude.Include.NON_EMPTY)
public class UserEntity implements Serializable {
private static final long serialVersionUID = 1L;
@TableId
private String id;
@TableField(value = "user_name")
private String userName;
@TableField(value = "password")
private String password;
@TableField(value = "valid")
@ApiModelProperty(value = "是否可用")
private Integer valid;
}
package com.ruzhoukj.rx.service;
import com.baomidou.mybatisplus.extension.service.IService;
import com.ruzhoukj.rx.pojo.entity.OmAccountEntity;
public interface OmAccountService extends IService<OmAccountEntity> {
OmAccountEntity getUser(String userId);
}
package com.ruzhoukj.rx.service;
import com.baomidou.mybatisplus.extension.service.IService;
import com.ruzhoukj.rx.pojo.entity.UserEntity;
/**
* @author 邬吉朋
*/
public interface UserService extends IService<UserEntity> {
UserEntity getUser(String userId);
//用户登录
UserEntity login(String username, String password);
}
package com.ruzhoukj.rx.service.impl;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruzhoukj.rx.dao.OmAccountDao;
import com.ruzhoukj.rx.pojo.entity.OmAccountEntity;
import com.ruzhoukj.rx.service.OmAccountService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;
@Slf4j
@Service("omAccountService")
public class OmAccountServiceImpl extends ServiceImpl<OmAccountDao, OmAccountEntity> implements OmAccountService {
@Override
public OmAccountEntity getUser(String userId) {
return this.getById(userId);
}
}
package com.ruzhoukj.rx.service.impl;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruzhoukj.rx.dao.UserDao;
import com.ruzhoukj.rx.pojo.entity.UserEntity;
import com.ruzhoukj.rx.service.UserService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;
/**
* @author 邬吉朋
*/
@Slf4j
@Service
public class UserServiceImpl extends ServiceImpl<UserDao, UserEntity> implements UserService {
@Override
public UserEntity getUser(String userId) {
return this.getById(userId);
}
@Override
public UserEntity login(String username, String password) {
QueryWrapper<UserEntity> queryWrapper = new QueryWrapper<>();
queryWrapper.eq("accountid",username).eq("password",password).eq("del",0);
UserEntity user = this.getOne(queryWrapper);
return user;
}
}
......@@ -10,16 +10,17 @@ spring:
mqtt:
host: tcp://116.236.205.254:5012 #MQTT-服务器连接地址,如果有多个,用逗号隔开,如:tcp://127.0.0.1:61613,tcp://192.168.2.133:61613
host: tcp://119.3.152.139:1883 #MQTT-服务器连接地址,如果有多个,用逗号隔开,如:tcp://127.0.0.1:61613,tcp://192.168.2.133:61613
clientId: ${random.int} #MQTT-连接服务器默认客户端ID
userName: sh3h #MQTT-用户名
passWord: sh3hsh3h #MQTT-密码
topic: test #MQTT-默认的消息推送主题,实际可在调用接口时指定
userName: ruzhoukj #MQTT-用户名
passWord: ruzhoukj@2024 #MQTT-密码
topic: Sensor/device/liquidLevel #MQTT-默认的消息推送主题,实际可在调用接口时指定
timeOut: 1000 #连接超时
keepAlive: 30 #设置会话心跳时间
clearSession: true #清除会话(设置为false,断开连接,重连后使用原来的会话 保留订阅的主题,能接收离线期间的消息)
jwt:
secret: test
expiration: 86400000
config:
key: test
ttl: 5400000
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment