Skip to content

D
device-back
提交 a3111a6f authored 作者: 133's avatar 133
浏览文件
操作

union中添加了其他装备业务模块的引用

上级 30538cf9
隐藏空白字符变更
内嵌 并排
正在显示 包含 258 行增加 和 27 行删除
dev-device/device-user/src/main/java/com/tykj/dev/device/user/base/ret/MemberThat.java
浏览文件 @ a3111a6f
package com.tykj.dev.device.user.base.ret; package com.tykj.dev.device.user.base.ret;
import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonIgnore;
import com.tykj.dev.user.base.beabs.BeanHelper; import com.tykj.dev.device.user.base.beabs.BeanHelper;
import com.tykj.dev.user.subject.entity.User; import com.tykj.dev.device.user.subject.entity.User;
import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
......
dev-device/device-user/src/main/java/com/tykj/dev/device/user/base/ret/UserRe.java
浏览文件 @ a3111a6f
package com.tykj.dev.device.user.base.ret; package com.tykj.dev.device.user.base.ret;
import com.tykj.dev.user.subject.entity.Permissions; import com.tykj.dev.device.user.subject.entity.Permissions;
import com.tykj.dev.user.subject.entity.Units; import com.tykj.dev.device.user.subject.entity.Units;
import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
......
dev-device/device-user/src/main/java/com/tykj/dev/device/user/config/handler/MySuccessHandler.java
浏览文件 @ a3111a6f
package com.tykj.dev.device.user.config.handler; package com.tykj.dev.device.user.config.handler;
import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.ObjectMapper;
import com.tykj.dev.user.subject.dao.RoleDao; import com.tykj.dev.device.user.subject.dao.RoleDao;
import com.tykj.dev.user.subject.entity.*; import com.tykj.dev.device.user.subject.entity.*;
import com.tykj.dev.user.subject.service.PermissionsService; import com.tykj.dev.device.user.subject.service.PermissionsService;
import com.tykj.dev.user.subject.service.RolePermissionsService; import com.tykj.dev.device.user.subject.service.RolePermissionsService;
import com.tykj.dev.user.subject.service.UserRoleService; import com.tykj.dev.device.user.subject.service.UserRoleService;
import com.tykj.dev.user.subject.service.UserService; import com.tykj.dev.device.user.subject.service.UserService;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.core.Authentication; import org.springframework.security.core.Authentication;
......
dev-device/device-user/src/main/java/com/tykj/dev/device/user/subject/service/impl/UserServiceImpl.java
浏览文件 @ a3111a6f
...@@ -8,6 +8,7 @@ import com.tykj.dev.device.user.subject.entity.Units; ...@@ -8,6 +8,7 @@ import com.tykj.dev.device.user.subject.entity.Units;
import com.tykj.dev.device.user.subject.entity.User; import com.tykj.dev.device.user.subject.entity.User;
import com.tykj.dev.device.user.subject.service.UnitsService; import com.tykj.dev.device.user.subject.service.UnitsService;
import com.tykj.dev.device.user.subject.service.UserService; import com.tykj.dev.device.user.subject.service.UserService;
import com.tykj.dev.misc.utils.JacksonUtil;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder; import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
......
dev-device/device-user/src/main/java/com/tykj/dev/device/user/userApp.java 0 → 100644
浏览文件 @ a3111a6f
package com.tykj.dev.device.user;
import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication;
/**
* @author zjm
* @version 1.0.0
* @ClassName userApp.java
* @Description TODO
* @createTime 2020年09月01日 14:32:00
*/
@SpringBootApplication(scanBasePackages={
"com.tykj.dev.*",
}
)
public class userApp {
public static void main(String[] args) {
SpringApplication.run(userApp.class, args);
}
}
dev-rfid/src/test/java/com/tykj/dev/rfid/RfidApplicationTests.java
浏览文件 @ a3111a6f
package com.tykj.dev.rfid; package com.tykj.dev.rfid;
import org.junit.jupiter.api.Test; import org.junit.Test;
import org.springframework.boot.test.context.SpringBootTest; import org.springframework.boot.test.context.SpringBootTest;
@SpringBootTest @SpringBootTest
......
dev-union/pom.xml
浏览文件 @ a3111a6f
...@@ -14,8 +14,6 @@ ...@@ -14,8 +14,6 @@
</parent> </parent>
<dependencies> <dependencies>
<dependency> <dependency>
<groupId>com.tykj.dev</groupId> <groupId>com.tykj.dev</groupId>
<artifactId>misc</artifactId> <artifactId>misc</artifactId>
...@@ -40,6 +38,211 @@ ...@@ -40,6 +38,211 @@
</exclusions> </exclusions>
</dependency> </dependency>
<dependency>
<groupId>com.tykj.dev</groupId>
<artifactId>device-user</artifactId>
<version>1.0-SNAPSHOT</version>
<exclusions>
<exclusion>
<groupId>com.tykj.dev</groupId>
<artifactId>union</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>com.tykj.dev</groupId>
<artifactId>device-allot</artifactId>
<version>1.0-SNAPSHOT</version>
<exclusions>
<exclusion>
<groupId>com.tykj.dev</groupId>
<artifactId>union</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>com.tykj.dev</groupId>
<artifactId>device-apply</artifactId>
<version>1.0-SNAPSHOT</version>
<exclusions>
<exclusion>
<groupId>com.tykj.dev</groupId>
<artifactId>union</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>com.tykj.dev</groupId>
<artifactId>device-confitmcheck</artifactId>
<version>1.0-SNAPSHOT</version>
<exclusions>
<exclusion>
<groupId>com.tykj.dev</groupId>
<artifactId>union</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>com.tykj.dev</groupId>
<artifactId>device-destory</artifactId>
<version>1.0-SNAPSHOT</version>
<exclusions>
<exclusion>
<groupId>com.tykj.dev</groupId>
<artifactId>union</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>com.tykj.dev</groupId>
<artifactId>device-finalcheck</artifactId>
<version>1.0-SNAPSHOT</version>
<exclusions>
<exclusion>
<groupId>com.tykj.dev</groupId>
<artifactId>union</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>com.tykj.dev</groupId>
<artifactId>device-library</artifactId>
<version>1.0-SNAPSHOT</version>
<exclusions>
<exclusion>
<groupId>com.tykj.dev</groupId>
<artifactId>union</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>com.tykj.dev</groupId>
<artifactId>device-matching</artifactId>
<version>1.0-SNAPSHOT</version>
<exclusions>
<exclusion>
<groupId>com.tykj.dev</groupId>
<artifactId>union</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>com.tykj.dev</groupId>
<artifactId>device-packing</artifactId>
<version>1.0-SNAPSHOT</version>
<exclusions>
<exclusion>
<groupId>com.tykj.dev</groupId>
<artifactId>union</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>com.tykj.dev</groupId>
<artifactId>device-repair</artifactId>
<version>1.0-SNAPSHOT</version>
<exclusions>
<exclusion>
<groupId>com.tykj.dev</groupId>
<artifactId>union</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>com.tykj.dev</groupId>
<artifactId>device-retired</artifactId>
<version>1.0-SNAPSHOT</version>
<exclusions>
<exclusion>
<groupId>com.tykj.dev</groupId>
<artifactId>union</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>com.tykj.dev</groupId>
<artifactId>device-scrap</artifactId>
<version>1.0-SNAPSHOT</version>
<exclusions>
<exclusion>
<groupId>com.tykj.dev</groupId>
<artifactId>union</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>com.tykj.dev</groupId>
<artifactId>device-selfcheck</artifactId>
<version>1.0-SNAPSHOT</version>
<exclusions>
<exclusion>
<groupId>com.tykj.dev</groupId>
<artifactId>union</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>com.tykj.dev</groupId>
<artifactId>device-sendback</artifactId>
<version>1.0-SNAPSHOT</version>
<exclusions>
<exclusion>
<groupId>com.tykj.dev</groupId>
<artifactId>union</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>com.tykj.dev</groupId>
<artifactId>device-stotage</artifactId>
<version>1.0-SNAPSHOT</version>
<exclusions>
<exclusion>
<groupId>com.tykj.dev</groupId>
<artifactId>union</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>com.tykj.dev</groupId>
<artifactId>device-task</artifactId>
<version>1.0-SNAPSHOT</version>
<exclusions>
<exclusion>
<groupId>com.tykj.dev</groupId>
<artifactId>union</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>com.tykj.dev</groupId>
<artifactId>device-train</artifactId>
<version>1.0-SNAPSHOT</version>
<exclusions>
<exclusion>
<groupId>com.tykj.dev</groupId>
<artifactId>union</artifactId>
</exclusion>
</exclusions>
</dependency>
<!--<dependency>--> <!--<dependency>-->
<!--<groupId>com.tykj</groupId>--> <!--<groupId>com.tykj</groupId>-->
<!--<artifactId>dev-socket</artifactId>--> <!--<artifactId>dev-socket</artifactId>-->
......
dev-union/src/main/java/com/tykj/dev/union/UnionApplication.java
浏览文件 @ a3111a6f
...@@ -7,12 +7,7 @@ import org.springframework.data.jpa.repository.config.EnableJpaAuditing; ...@@ -7,12 +7,7 @@ import org.springframework.data.jpa.repository.config.EnableJpaAuditing;
import springfox.documentation.swagger2.annotations.EnableSwagger2; import springfox.documentation.swagger2.annotations.EnableSwagger2;
@SpringBootApplication(scanBasePackages={ @SpringBootApplication(scanBasePackages={
"com.tykj.dev.*",
"com.tykj.dev.rfid",
"com.tykj.dev.union",
"com.tykj.dev.socket",
"com.tykj.dev.misc",
"com.tykj.dev.config"
} }
) )
@EnableSwagger2 @EnableSwagger2
......
dev-union/src/main/resources/application.properties
浏览文件 @ a3111a6f
spring.application.name=union # port
management.endpoints.jmx.exposure.include=* server.port=8087
management.endpoints.web.exposure.include=*
management.endpoint.health.show-details=always logging.file=/opt/eqlog/equip.log
# spring cloud access&secret config spring.servlet.multipart.max-file-size=400MB
# 可以访问如下地址查看: https://usercenter.console.aliyun.com/#/manage/ak spring.servlet.multipart.max-request-size=400MB
alibaba.cloud.access-key=**** spring.jpa.hibernate.ddl-auto=none
alibaba.cloud.secret-key=**** spring.jpa.show-sql=false
spring.jpa.open-in-view=true
spring.main.allow-bean-definition-overriding=true
spring.datasource.url=jdbc:mysql://192.168.100.249:3306/equipment?serverTimezone=Asia/Shanghai&characterEncoding=UTF-8&zeroDateTimeBehavior=convertToNull&useSSL=false
spring.datasource.username=root
spring.datasource.password=root
spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver
server.servlet.session.timeout=PT1H
spring.jackson.date-format=yyyy-MM-dd HH:mm:ss
spring.jackson.time-zone=GMT+8
file.path=/Users/zjm/code/
preview.path=192.168.0.10:8087/file/
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论