Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in / Register
Toggle navigation
D
data-server
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
licc
data-server
Commits
23e3d363
Commit
23e3d363
authored
Mar 13, 2021
by
m1991
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
资讯模块数据——数据展示功能修复
parent
09e2841f
Show whitespace changes
Inline
Side-by-side
Showing
9 changed files
with
228 additions
and
55 deletions
+228
-55
UsersMapper.xml
wisenergy-mapper/src/main/resources/mapper/UsersMapper.xml
+2
-2
wisenergy-mapper.iml
wisenergy-mapper/wisenergy-mapper.iml
+173
-0
UsersDto.java
...-model/src/main/java/cn/wisenergy/model/app/UsersDto.java
+6
-41
wisenergy-parent.iml
wisenergy-parent.iml
+11
-1
UserService.java
...e/src/main/java/cn/wisenergy/service/app/UserService.java
+7
-0
UserServiceImpl.java
...n/java/cn/wisenergy/service/app/impl/UserServiceImpl.java
+19
-4
LoginController.java
...n/wisenergy/web/admin/controller/app/LoginController.java
+2
-2
SmsController.java
.../cn/wisenergy/web/admin/controller/app/SmsController.java
+2
-1
ShiroConfig.java
...in/src/main/java/cn/wisenergy/web/config/ShiroConfig.java
+6
-4
No files found.
wisenergy-mapper/src/main/resources/mapper/UsersMapper.xml
View file @
23e3d363
...
...
@@ -182,8 +182,8 @@
<!--用户注册-->
<insert
id=
"save"
>
insert into user(user_id,invite_code,be_invited_code,user_level) value
(#{userId},#{inviteCode},#{beInvitedCode},#{userLevel})
insert into user(user_id,invite_code,be_invited_code,user_level
,create_time,update_time
) value
(#{userId},#{inviteCode},#{beInvitedCode},#{userLevel}
#{now()},#{now()}
)
</insert>
<insert
id=
"insertbyint"
>
insert into user_info(user_id,be_invited_code) value (#{userId},#{beInvitedCode})
...
...
wisenergy-mapper/wisenergy-mapper.iml
View file @
23e3d363
...
...
@@ -10,4 +10,177 @@
</configuration>
</facet>
</component>
<component
name=
"NewModuleRootManager"
LANGUAGE_LEVEL=
"JDK_1_8"
>
<output
url=
"file://$MODULE_DIR$/target/classes"
/>
<output-test
url=
"file://$MODULE_DIR$/target/test-classes"
/>
<content
url=
"file://$MODULE_DIR$"
>
<sourceFolder
url=
"file://$MODULE_DIR$/src/main/java"
isTestSource=
"false"
/>
<sourceFolder
url=
"file://$MODULE_DIR$/src/main/resources"
type=
"java-resource"
/>
<excludeFolder
url=
"file://$MODULE_DIR$/target"
/>
</content>
<orderEntry
type=
"inheritedJdk"
/>
<orderEntry
type=
"sourceFolder"
forTests=
"false"
/>
<orderEntry
type=
"module"
module-name=
"wisenergy-model"
/>
<orderEntry
type=
"module"
module-name=
"wisenergy-common"
/>
<orderEntry
type=
"library"
name=
"Maven: org.springframework.boot:spring-boot-starter-web:2.4.3"
level=
"project"
/>
<orderEntry
type=
"library"
name=
"Maven: org.springframework.boot:spring-boot-starter:2.4.3"
level=
"project"
/>
<orderEntry
type=
"library"
name=
"Maven: org.springframework.boot:spring-boot:2.4.3"
level=
"project"
/>
<orderEntry
type=
"library"
name=
"Maven: org.springframework.boot:spring-boot-starter-logging:2.4.3"
level=
"project"
/>
<orderEntry
type=
"library"
name=
"Maven: ch.qos.logback:logback-classic:1.2.3"
level=
"project"
/>
<orderEntry
type=
"library"
name=
"Maven: ch.qos.logback:logback-core:1.2.3"
level=
"project"
/>
<orderEntry
type=
"library"
name=
"Maven: org.apache.logging.log4j:log4j-to-slf4j:2.13.3"
level=
"project"
/>
<orderEntry
type=
"library"
name=
"Maven: org.apache.logging.log4j:log4j-api:2.13.3"
level=
"project"
/>
<orderEntry
type=
"library"
name=
"Maven: org.slf4j:jul-to-slf4j:1.7.30"
level=
"project"
/>
<orderEntry
type=
"library"
name=
"Maven: jakarta.annotation:jakarta.annotation-api:1.3.5"
level=
"project"
/>
<orderEntry
type=
"library"
name=
"Maven: org.springframework:spring-core:5.3.4"
level=
"project"
/>
<orderEntry
type=
"library"
name=
"Maven: org.springframework:spring-jcl:5.3.4"
level=
"project"
/>
<orderEntry
type=
"library"
name=
"Maven: org.yaml:snakeyaml:1.27"
level=
"project"
/>
<orderEntry
type=
"library"
name=
"Maven: org.springframework.boot:spring-boot-starter-json:2.4.3"
level=
"project"
/>
<orderEntry
type=
"library"
name=
"Maven: com.fasterxml.jackson.datatype:jackson-datatype-jdk8:2.11.4"
level=
"project"
/>
<orderEntry
type=
"library"
name=
"Maven: com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.11.4"
level=
"project"
/>
<orderEntry
type=
"library"
name=
"Maven: com.fasterxml.jackson.module:jackson-module-parameter-names:2.11.4"
level=
"project"
/>
<orderEntry
type=
"library"
name=
"Maven: org.springframework.boot:spring-boot-starter-tomcat:2.4.3"
level=
"project"
/>
<orderEntry
type=
"library"
name=
"Maven: org.apache.tomcat.embed:tomcat-embed-core:9.0.43"
level=
"project"
/>
<orderEntry
type=
"library"
name=
"Maven: org.apache.tomcat.embed:tomcat-embed-websocket:9.0.43"
level=
"project"
/>
<orderEntry
type=
"library"
name=
"Maven: org.springframework:spring-web:5.3.4"
level=
"project"
/>
<orderEntry
type=
"library"
name=
"Maven: org.springframework:spring-beans:5.3.4"
level=
"project"
/>
<orderEntry
type=
"library"
name=
"Maven: org.springframework:spring-webmvc:5.3.4"
level=
"project"
/>
<orderEntry
type=
"library"
name=
"Maven: org.springframework:spring-context:5.3.4"
level=
"project"
/>
<orderEntry
type=
"library"
name=
"Maven: org.springframework:spring-expression:5.3.4"
level=
"project"
/>
<orderEntry
type=
"library"
name=
"Maven: org.springframework.boot:spring-boot-starter-undertow:2.4.3"
level=
"project"
/>
<orderEntry
type=
"library"
name=
"Maven: io.undertow:undertow-core:2.2.4.Final"
level=
"project"
/>
<orderEntry
type=
"library"
name=
"Maven: org.jboss.logging:jboss-logging:3.4.1.Final"
level=
"project"
/>
<orderEntry
type=
"library"
name=
"Maven: org.jboss.xnio:xnio-api:3.8.0.Final"
level=
"project"
/>
<orderEntry
type=
"library"
name=
"Maven: org.wildfly.common:wildfly-common:1.5.2.Final"
level=
"project"
/>
<orderEntry
type=
"library"
name=
"Maven: org.wildfly.client:wildfly-client-config:1.0.1.Final"
level=
"project"
/>
<orderEntry
type=
"library"
scope=
"RUNTIME"
name=
"Maven: org.jboss.xnio:xnio-nio:3.8.0.Final"
level=
"project"
/>
<orderEntry
type=
"library"
name=
"Maven: org.jboss.threads:jboss-threads:3.1.0.Final"
level=
"project"
/>
<orderEntry
type=
"library"
name=
"Maven: io.undertow:undertow-servlet:2.2.4.Final"
level=
"project"
/>
<orderEntry
type=
"library"
name=
"Maven: org.jboss.spec.javax.annotation:jboss-annotations-api_1.3_spec:2.0.1.Final"
level=
"project"
/>
<orderEntry
type=
"library"
name=
"Maven: io.undertow:undertow-websockets-jsr:2.2.4.Final"
level=
"project"
/>
<orderEntry
type=
"library"
name=
"Maven: org.jboss.spec.javax.websocket:jboss-websocket-api_1.1_spec:2.0.0.Final"
level=
"project"
/>
<orderEntry
type=
"library"
name=
"Maven: jakarta.servlet:jakarta.servlet-api:4.0.4"
level=
"project"
/>
<orderEntry
type=
"library"
name=
"Maven: org.glassfish:jakarta.el:3.0.3"
level=
"project"
/>
<orderEntry
type=
"library"
name=
"Maven: org.springframework.boot:spring-boot-starter-aop:2.4.3"
level=
"project"
/>
<orderEntry
type=
"library"
name=
"Maven: org.springframework:spring-aop:5.3.4"
level=
"project"
/>
<orderEntry
type=
"library"
name=
"Maven: org.aspectj:aspectjweaver:1.9.6"
level=
"project"
/>
<orderEntry
type=
"library"
name=
"Maven: org.mybatis.spring.boot:mybatis-spring-boot-starter:2.1.4"
level=
"project"
/>
<orderEntry
type=
"library"
name=
"Maven: org.springframework.boot:spring-boot-starter-jdbc:2.4.3"
level=
"project"
/>
<orderEntry
type=
"library"
name=
"Maven: com.zaxxer:HikariCP:3.4.5"
level=
"project"
/>
<orderEntry
type=
"library"
name=
"Maven: org.springframework:spring-jdbc:5.3.4"
level=
"project"
/>
<orderEntry
type=
"library"
name=
"Maven: org.mybatis.spring.boot:mybatis-spring-boot-autoconfigure:2.1.4"
level=
"project"
/>
<orderEntry
type=
"library"
name=
"Maven: org.mybatis:mybatis:3.5.6"
level=
"project"
/>
<orderEntry
type=
"library"
name=
"Maven: org.mybatis:mybatis-spring:2.0.6"
level=
"project"
/>
<orderEntry
type=
"library"
name=
"Maven: com.github.pagehelper:pagehelper-spring-boot-starter:1.3.0"
level=
"project"
/>
<orderEntry
type=
"library"
name=
"Maven: com.github.pagehelper:pagehelper-spring-boot-autoconfigure:1.3.0"
level=
"project"
/>
<orderEntry
type=
"library"
name=
"Maven: com.github.pagehelper:pagehelper:5.2.0"
level=
"project"
/>
<orderEntry
type=
"library"
name=
"Maven: com.github.jsqlparser:jsqlparser:3.2"
level=
"project"
/>
<orderEntry
type=
"library"
name=
"Maven: mysql:mysql-connector-java:8.0.23"
level=
"project"
/>
<orderEntry
type=
"library"
name=
"Maven: com.baomidou:mybatis-plus-boot-starter:3.3.2"
level=
"project"
/>
<orderEntry
type=
"library"
name=
"Maven: com.baomidou:mybatis-plus:3.3.2"
level=
"project"
/>
<orderEntry
type=
"library"
name=
"Maven: com.baomidou:mybatis-plus-extension:3.3.2"
level=
"project"
/>
<orderEntry
type=
"library"
name=
"Maven: com.baomidou:mybatis-plus-core:3.3.2"
level=
"project"
/>
<orderEntry
type=
"library"
name=
"Maven: com.baomidou:mybatis-plus-annotation:3.3.2"
level=
"project"
/>
<orderEntry
type=
"library"
name=
"Maven: org.springframework.boot:spring-boot-autoconfigure:2.4.3"
level=
"project"
/>
<orderEntry
type=
"library"
name=
"Maven: com.alibaba:druid-spring-boot-starter:1.2.5"
level=
"project"
/>
<orderEntry
type=
"library"
name=
"Maven: com.alibaba:druid:1.2.5"
level=
"project"
/>
<orderEntry
type=
"library"
name=
"Maven: org.slf4j:slf4j-api:1.7.30"
level=
"project"
/>
<orderEntry
type=
"library"
name=
"Maven: org.springframework.boot:spring-boot-starter-data-redis:2.4.3"
level=
"project"
/>
<orderEntry
type=
"library"
name=
"Maven: org.springframework.data:spring-data-redis:2.4.5"
level=
"project"
/>
<orderEntry
type=
"library"
name=
"Maven: org.springframework.data:spring-data-keyvalue:2.4.5"
level=
"project"
/>
<orderEntry
type=
"library"
name=
"Maven: org.springframework.data:spring-data-commons:2.4.5"
level=
"project"
/>
<orderEntry
type=
"library"
name=
"Maven: org.springframework:spring-tx:5.3.4"
level=
"project"
/>
<orderEntry
type=
"library"
name=
"Maven: org.springframework:spring-oxm:5.3.4"
level=
"project"
/>
<orderEntry
type=
"library"
name=
"Maven: org.springframework:spring-context-support:5.3.4"
level=
"project"
/>
<orderEntry
type=
"library"
name=
"Maven: io.lettuce:lettuce-core:6.0.2.RELEASE"
level=
"project"
/>
<orderEntry
type=
"library"
name=
"Maven: io.netty:netty-common:4.1.59.Final"
level=
"project"
/>
<orderEntry
type=
"library"
name=
"Maven: io.netty:netty-handler:4.1.59.Final"
level=
"project"
/>
<orderEntry
type=
"library"
name=
"Maven: io.netty:netty-resolver:4.1.59.Final"
level=
"project"
/>
<orderEntry
type=
"library"
name=
"Maven: io.netty:netty-buffer:4.1.59.Final"
level=
"project"
/>
<orderEntry
type=
"library"
name=
"Maven: io.netty:netty-codec:4.1.59.Final"
level=
"project"
/>
<orderEntry
type=
"library"
name=
"Maven: io.netty:netty-transport:4.1.59.Final"
level=
"project"
/>
<orderEntry
type=
"library"
name=
"Maven: io.projectreactor:reactor-core:3.4.3"
level=
"project"
/>
<orderEntry
type=
"library"
name=
"Maven: org.reactivestreams:reactive-streams:1.0.3"
level=
"project"
/>
<orderEntry
type=
"library"
name=
"Maven: org.bouncycastle:bcprov-jdk15on:1.54"
level=
"project"
/>
<orderEntry
type=
"library"
name=
"Maven: io.springfox:springfox-swagger2:2.9.2"
level=
"project"
/>
<orderEntry
type=
"library"
name=
"Maven: io.springfox:springfox-spi:2.9.2"
level=
"project"
/>
<orderEntry
type=
"library"
name=
"Maven: io.springfox:springfox-core:2.9.2"
level=
"project"
/>
<orderEntry
type=
"library"
name=
"Maven: net.bytebuddy:byte-buddy:1.10.20"
level=
"project"
/>
<orderEntry
type=
"library"
name=
"Maven: io.springfox:springfox-schema:2.9.2"
level=
"project"
/>
<orderEntry
type=
"library"
name=
"Maven: io.springfox:springfox-swagger-common:2.9.2"
level=
"project"
/>
<orderEntry
type=
"library"
name=
"Maven: io.springfox:springfox-spring-web:2.9.2"
level=
"project"
/>
<orderEntry
type=
"library"
name=
"Maven: com.fasterxml:classmate:1.5.1"
level=
"project"
/>
<orderEntry
type=
"library"
name=
"Maven: org.springframework.plugin:spring-plugin-core:1.2.0.RELEASE"
level=
"project"
/>
<orderEntry
type=
"library"
name=
"Maven: org.springframework.plugin:spring-plugin-metadata:1.2.0.RELEASE"
level=
"project"
/>
<orderEntry
type=
"library"
name=
"Maven: org.mapstruct:mapstruct:1.2.0.Final"
level=
"project"
/>
<orderEntry
type=
"library"
name=
"Maven: io.springfox:springfox-swagger-ui:2.9.2"
level=
"project"
/>
<orderEntry
type=
"library"
name=
"Maven: io.swagger:swagger-annotations:1.6.2"
level=
"project"
/>
<orderEntry
type=
"library"
name=
"Maven: io.swagger:swagger-models:1.6.2"
level=
"project"
/>
<orderEntry
type=
"library"
name=
"Maven: com.fasterxml.jackson.core:jackson-annotations:2.11.4"
level=
"project"
/>
<orderEntry
type=
"library"
name=
"Maven: io.jsonwebtoken:jjwt:0.9.1"
level=
"project"
/>
<orderEntry
type=
"library"
name=
"Maven: com.fasterxml.jackson.core:jackson-databind:2.11.4"
level=
"project"
/>
<orderEntry
type=
"library"
name=
"Maven: com.fasterxml.jackson.core:jackson-core:2.11.4"
level=
"project"
/>
<orderEntry
type=
"library"
name=
"Maven: joda-time:joda-time:2.10.8"
level=
"project"
/>
<orderEntry
type=
"library"
name=
"Maven: org.apache.shiro:shiro-core:1.7.1"
level=
"project"
/>
<orderEntry
type=
"library"
name=
"Maven: org.apache.shiro:shiro-lang:1.7.1"
level=
"project"
/>
<orderEntry
type=
"library"
name=
"Maven: org.apache.shiro:shiro-cache:1.7.1"
level=
"project"
/>
<orderEntry
type=
"library"
name=
"Maven: org.apache.shiro:shiro-crypto-hash:1.7.1"
level=
"project"
/>
<orderEntry
type=
"library"
name=
"Maven: org.apache.shiro:shiro-crypto-core:1.7.1"
level=
"project"
/>
<orderEntry
type=
"library"
name=
"Maven: org.apache.shiro:shiro-crypto-cipher:1.7.1"
level=
"project"
/>
<orderEntry
type=
"library"
name=
"Maven: org.apache.shiro:shiro-config-core:1.7.1"
level=
"project"
/>
<orderEntry
type=
"library"
name=
"Maven: org.apache.shiro:shiro-config-ogdl:1.7.1"
level=
"project"
/>
<orderEntry
type=
"library"
name=
"Maven: commons-beanutils:commons-beanutils:1.9.4"
level=
"project"
/>
<orderEntry
type=
"library"
name=
"Maven: commons-collections:commons-collections:3.2.2"
level=
"project"
/>
<orderEntry
type=
"library"
name=
"Maven: org.apache.shiro:shiro-event:1.7.1"
level=
"project"
/>
<orderEntry
type=
"library"
name=
"Maven: org.apache.shiro:shiro-spring:1.7.1"
level=
"project"
/>
<orderEntry
type=
"library"
name=
"Maven: org.apache.shiro:shiro-web:1.7.1"
level=
"project"
/>
<orderEntry
type=
"library"
name=
"Maven: org.owasp.encoder:encoder:1.2.2"
level=
"project"
/>
<orderEntry
type=
"library"
name=
"Maven: org.apache.poi:poi:3.9"
level=
"project"
/>
<orderEntry
type=
"library"
name=
"Maven: commons-codec:commons-codec:1.15"
level=
"project"
/>
<orderEntry
type=
"library"
name=
"Maven: org.apache.poi:poi-ooxml:3.9"
level=
"project"
/>
<orderEntry
type=
"library"
name=
"Maven: dom4j:dom4j:1.6.1"
level=
"project"
/>
<orderEntry
type=
"library"
name=
"Maven: xml-apis:xml-apis:1.0.b2"
level=
"project"
/>
<orderEntry
type=
"library"
name=
"Maven: org.apache.poi:poi-ooxml-schemas:3.9"
level=
"project"
/>
<orderEntry
type=
"library"
name=
"Maven: org.apache.xmlbeans:xmlbeans:2.3.0"
level=
"project"
/>
<orderEntry
type=
"library"
name=
"Maven: stax:stax-api:1.0.1"
level=
"project"
/>
<orderEntry
type=
"library"
name=
"Maven: cn.hutool:hutool-all:4.6.17"
level=
"project"
/>
<orderEntry
type=
"library"
name=
"Maven: com.alibaba:fastjson:1.2.75"
level=
"project"
/>
<orderEntry
type=
"library"
name=
"Maven: com.aliyun:aliyun-java-sdk-core:4.5.3"
level=
"project"
/>
<orderEntry
type=
"library"
name=
"Maven: com.google.code.gson:gson:2.8.6"
level=
"project"
/>
<orderEntry
type=
"library"
name=
"Maven: org.apache.httpcomponents:httpclient:4.5.12"
level=
"project"
/>
<orderEntry
type=
"library"
name=
"Maven: org.apache.httpcomponents:httpcore:4.4.13"
level=
"project"
/>
<orderEntry
type=
"library"
name=
"Maven: commons-logging:commons-logging:1.2"
level=
"project"
/>
<orderEntry
type=
"library"
name=
"Maven: javax.xml.bind:jaxb-api:2.3.1"
level=
"project"
/>
<orderEntry
type=
"library"
name=
"Maven: javax.activation:javax.activation-api:1.2.0"
level=
"project"
/>
<orderEntry
type=
"library"
name=
"Maven: org.jacoco:org.jacoco.agent:runtime:0.8.5"
level=
"project"
/>
<orderEntry
type=
"library"
name=
"Maven: org.ini4j:ini4j:0.5.4"
level=
"project"
/>
<orderEntry
type=
"library"
name=
"Maven: io.opentracing:opentracing-api:0.33.0"
level=
"project"
/>
<orderEntry
type=
"library"
name=
"Maven: io.opentracing:opentracing-util:0.33.0"
level=
"project"
/>
<orderEntry
type=
"library"
name=
"Maven: io.opentracing:opentracing-noop:0.33.0"
level=
"project"
/>
<orderEntry
type=
"library"
name=
"Maven: org.apache.commons:commons-lang3:3.11"
level=
"project"
/>
<orderEntry
type=
"library"
name=
"Maven: commons-lang:commons-lang:2.6"
level=
"project"
/>
<orderEntry
type=
"library"
name=
"Maven: commons-io:commons-io:2.8.0"
level=
"project"
/>
<orderEntry
type=
"library"
name=
"Maven: com.google.guava:guava:30.1-jre"
level=
"project"
/>
<orderEntry
type=
"library"
name=
"Maven: com.google.guava:failureaccess:1.0.1"
level=
"project"
/>
<orderEntry
type=
"library"
name=
"Maven: com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava"
level=
"project"
/>
<orderEntry
type=
"library"
name=
"Maven: com.google.code.findbugs:jsr305:3.0.2"
level=
"project"
/>
<orderEntry
type=
"library"
name=
"Maven: org.checkerframework:checker-qual:3.5.0"
level=
"project"
/>
<orderEntry
type=
"library"
name=
"Maven: com.google.errorprone:error_prone_annotations:2.3.4"
level=
"project"
/>
<orderEntry
type=
"library"
name=
"Maven: com.google.j2objc:j2objc-annotations:1.3"
level=
"project"
/>
<orderEntry
type=
"library"
name=
"Maven: org.bytedeco:javacv:1.4.3"
level=
"project"
/>
<orderEntry
type=
"library"
name=
"Maven: org.bytedeco:javacpp:1.4.3"
level=
"project"
/>
<orderEntry
type=
"library"
name=
"Maven: org.bytedeco.javacpp-presets:opencv:3.4.3-1.4.3"
level=
"project"
/>
<orderEntry
type=
"library"
name=
"Maven: org.bytedeco.javacpp-presets:ffmpeg:4.0.2-1.4.3"
level=
"project"
/>
<orderEntry
type=
"library"
name=
"Maven: org.bytedeco.javacpp-presets:flycapture:2.11.3.121-1.4.3"
level=
"project"
/>
<orderEntry
type=
"library"
name=
"Maven: org.bytedeco.javacpp-presets:libdc1394:2.2.5-1.4.3"
level=
"project"
/>
<orderEntry
type=
"library"
name=
"Maven: org.bytedeco.javacpp-presets:libfreenect:0.5.3-1.4.3"
level=
"project"
/>
<orderEntry
type=
"library"
name=
"Maven: org.bytedeco.javacpp-presets:libfreenect2:0.2.0-1.4.3"
level=
"project"
/>
<orderEntry
type=
"library"
name=
"Maven: org.bytedeco.javacpp-presets:librealsense:1.12.1-1.4.3"
level=
"project"
/>
<orderEntry
type=
"library"
name=
"Maven: org.bytedeco.javacpp-presets:videoinput:0.200-1.4.3"
level=
"project"
/>
<orderEntry
type=
"library"
name=
"Maven: org.bytedeco.javacpp-presets:artoolkitplus:2.3.1-1.4.3"
level=
"project"
/>
<orderEntry
type=
"library"
name=
"Maven: org.bytedeco.javacpp-presets:flandmark:1.07-1.4.3"
level=
"project"
/>
<orderEntry
type=
"library"
name=
"Maven: org.bytedeco.javacpp-presets:leptonica:1.76.0-1.4.3"
level=
"project"
/>
<orderEntry
type=
"library"
name=
"Maven: org.bytedeco.javacpp-presets:tesseract:4.0.0-rc2-1.4.3"
level=
"project"
/>
<orderEntry
type=
"library"
scope=
"PROVIDED"
name=
"Maven: org.projectlombok:lombok:1.18.18"
level=
"project"
/>
</component>
</module>
\ No newline at end of file
wisenergy-model/src/main/java/cn/wisenergy/model/app/UsersDto.java
View file @
23e3d363
...
...
@@ -13,7 +13,7 @@ public class UsersDto extends User implements Serializable {
/**
* 主键id
*/
private
Integer
id
;
private
Integer
id
;
// beInvitedCode":"1","id":65,"inviteCode":"GBY34L","userId":"19919990669","userLevel":0
/**
* 手机号作为用户账号
*/
...
...
@@ -21,7 +21,7 @@ public class UsersDto extends User implements Serializable {
/**
* 用户头像
*/
private
String
headImage
;
//
private String headImage;
/**
* 用户会员等级
*/
...
...
@@ -31,7 +31,7 @@ public class UsersDto extends User implements Serializable {
* 跨境额度
*/
private
BigDecimal
crossBorderLine
;
//
private BigDecimal crossBorderLine;
/**
...
...
@@ -42,17 +42,17 @@ public class UsersDto extends User implements Serializable {
/**
* 推荐人邀请码
*/
private
String
beInvitedCode
;
//
private String beInvitedCode;
/**
* 用户名称
*/
private
Integer
userName
;
//
private Integer userName;
/**
* 创建时间
*/
private
Date
createTime
;
//
private Date createTime;
//用户token
private
String
token
;
...
...
@@ -77,15 +77,7 @@ public class UsersDto extends User implements Serializable {
this
.
userId
=
userId
;
}
@Override
public
String
getHeadImage
()
{
return
headImage
;
}
@Override
public
void
setHeadImage
(
String
headImage
)
{
this
.
headImage
=
headImage
;
}
@Override
public
int
getUserLevel
()
{
...
...
@@ -97,15 +89,7 @@ public class UsersDto extends User implements Serializable {
this
.
userLevel
=
userLevel
;
}
@Override
public
BigDecimal
getCrossBorderLine
()
{
return
crossBorderLine
;
}
@Override
public
void
setCrossBorderLine
(
BigDecimal
crossBorderLine
)
{
this
.
crossBorderLine
=
crossBorderLine
;
}
@Override
public
String
getInviteCode
()
{
...
...
@@ -117,25 +101,6 @@ public class UsersDto extends User implements Serializable {
this
.
inviteCode
=
inviteCode
;
}
@Override
public
String
getBeInvitedCode
()
{
return
beInvitedCode
;
}
@Override
public
void
setBeInvitedCode
(
String
beInvitedCode
)
{
this
.
beInvitedCode
=
beInvitedCode
;
}
@Override
public
Date
getCreateTime
()
{
return
createTime
;
}
@Override
public
void
setCreateTime
(
Date
createTime
)
{
this
.
createTime
=
createTime
;
}
public
String
getToken
()
{
return
token
;
...
...
wisenergy-parent.iml
View file @
23e3d363
<?xml version="1.0" encoding="UTF-8"?>
<module
org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule=
"true"
type=
"JAVA_MODULE"
version=
"4"
/>
\ No newline at end of file
<module
org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule=
"true"
type=
"JAVA_MODULE"
version=
"4"
>
<component
name=
"NewModuleRootManager"
LANGUAGE_LEVEL=
"JDK_1_8"
>
<output
url=
"file://$MODULE_DIR$/target/classes"
/>
<output-test
url=
"file://$MODULE_DIR$/target/test-classes"
/>
<content
url=
"file://$MODULE_DIR$"
>
<excludeFolder
url=
"file://$MODULE_DIR$/target"
/>
</content>
<orderEntry
type=
"inheritedJdk"
/>
<orderEntry
type=
"sourceFolder"
forTests=
"false"
/>
</component>
</module>
\ No newline at end of file
wisenergy-service/src/main/java/cn/wisenergy/service/app/UserService.java
View file @
23e3d363
...
...
@@ -2,6 +2,7 @@ package cn.wisenergy.service.app;
import
cn.wisenergy.common.utils.R
;
import
cn.wisenergy.model.app.User
;
import
cn.wisenergy.model.app.UsersDto
;
import
cn.wisenergy.model.vo.AerialDeliveryVo
;
import
java.util.Map
;
...
...
@@ -23,6 +24,12 @@ public interface UserService {
* @return 用户信息
*/
User
getById
(
String
userId
);
/**
* 获取登录用户
* @param token
* @return
*/
UsersDto
getLoginUser
(
String
token
);
R
<
Integer
>
getById1
(
String
userId
);
...
...
wisenergy-service/src/main/java/cn/wisenergy/service/app/impl/UserServiceImpl.java
View file @
23e3d363
package
cn
.
wisenergy
.
service
.
app
.
impl
;
import
cn.wisenergy.common.utils.R
;
import
cn.wisenergy.common.utils.RedisKeyUtils
;
import
cn.wisenergy.common.utils.RedisUtils
;
import
cn.wisenergy.common.utils.ShareCodeUtil
;
import
cn.wisenergy.common.utils.*
;
import
cn.wisenergy.mapper.RecommendUserMapper
;
import
cn.wisenergy.mapper.TeamUserInfoMapper
;
import
cn.wisenergy.mapper.UsersMapper
;
import
cn.wisenergy.model.app.RecommendUser
;
import
cn.wisenergy.model.app.TeamUserInfo
;
import
cn.wisenergy.model.app.User
;
import
cn.wisenergy.model.app.UsersDto
;
import
cn.wisenergy.model.vo.AerialDeliveryVo
;
import
cn.wisenergy.model.vo.UserPoolVo
;
import
cn.wisenergy.service.app.UserService
;
import
com.alibaba.fastjson.JSONObject
;
import
com.baomidou.mybatisplus.extension.service.impl.ServiceImpl
;
import
lombok.extern.slf4j.Slf4j
;
import
org.apache.commons.lang3.StringUtils
;
...
...
@@ -49,6 +48,22 @@ public class UserServiceImpl extends ServiceImpl<UsersMapper, User> implements U
return
usersMapper
.
getByUserId
(
userId
);
}
/**
* 获取登录用户
* @param token
*/
@Override
public
UsersDto
getLoginUser
(
String
token
)
{
UsersDto
usersDto
=
null
;
String
key
=
RedisKeyUtils
.
formatKeyWithPrefix
(
Constants
.
Redis
.
PREFIX_TOKEN
,
token
);
String
value
=
redisUtils
.
getValue
(
key
);
if
(!
StringUtils
.
isBlank
(
value
)){
usersDto
=
JSONObject
.
parseObject
(
value
,
UsersDto
.
class
);
log
.
info
(
"获取到用户登录信息users:{}"
,
value
);
}
return
usersDto
;
}
@Override
public
R
<
Integer
>
getById1
(
String
userId
)
{
...
...
wisenergy-web-admin/src/main/java/cn/wisenergy/web/admin/controller/app/LoginController.java
View file @
23e3d363
...
...
@@ -113,7 +113,7 @@ public class LoginController {
}
@ApiOperation
(
value
=
"获取用户登录token信息"
,
notes
=
"获取用户登录token信息"
,
httpMethod
=
"POST"
,
produces
=
"application/json; charset=UTF-8"
)
@
Reque
stMapping
(
"/info"
)
@
Po
stMapping
(
"/info"
)
public
Map
info
(
HttpServletRequest
request
)
throws
Exception
{
String
token
=
request
.
getHeader
(
"token"
);
String
tokenKey
=
StringUtil
.
formatKeyWithPrefix
(
Constants
.
RedisKey
.
PROJECT_PRIFIX
,
Constants
.
RedisKey
.
TOKEN_PRIFIX
,
token
);
...
...
@@ -125,7 +125,7 @@ public class LoginController {
return
map
;
}
UsersDto
usersDto
=
JSONObject
.
parseObject
(
userDtoJson
,
UsersDto
.
class
);
usersDto
.
setPassword
(
null
);
return
(
Map
)
ResultUtils
.
returnDataSuccess
(
userDtoJson
);
}
...
...
wisenergy-web-admin/src/main/java/cn/wisenergy/web/admin/controller/app/SmsController.java
View file @
23e3d363
...
...
@@ -41,6 +41,7 @@ public class SmsController {
@RequestMapping
(
"/verifyCode"
)
@ResponseBody
public
Result
verifyCode
(
@RequestParam
String
phone
,
@RequestParam
Integer
codeType
)
{
Map
map
=
new
HashMap
();
//判断phone和codeType是否符合输入类型
if
(!
phone
.
matches
(
Constants
.
RegConstant
.
PHONE_REGSTR
)){
...
...
@@ -59,7 +60,7 @@ public class SmsController {
//生成随机数
String
code
=
MathUtils
.
random
();
//保存至Redis MINUTE_INT
redisUtils
.
set
(
key
,
code
,
Constants
.
Duration
.
HALF
_HOUR_INT
);
redisUtils
.
set
(
key
,
code
,
Constants
.
Duration
.
TEN_HOURS
_HOUR_INT
);
boolean
flag
=
smsUtils
.
sendMessage
(
phone
,
Constants
.
Sms
.
TemplateCode
.
LOGIN_SF_REGISTER
,
code
);
return
(
flag
?
ResultUtils
.
returnSuccess
():
ResultUtils
.
returnFail
());
...
...
wisenergy-web-admin/src/main/java/cn/wisenergy/web/config/ShiroConfig.java
View file @
23e3d363
...
...
@@ -63,20 +63,22 @@ public class ShiroConfig {
filterChainDefinitionMap
.
put
(
"/sys/registered"
,
"anon"
);
// 注册页面
filterChainDefinitionMap
.
put
(
"/swagger-ui.html"
,
"anon"
);
// swagger接口-匿名访问
filterChainDefinitionMap
.
put
(
"/swagger/**"
,
"anon"
);
filterChainDefinitionMap
.
put
(
"/swagger-resources/**"
,
"anon"
);
filterChainDefinitionMap
.
put
(
"/webjars/springfox-swagger-ui/**"
,
"anon"
);
filterChainDefinitionMap
.
put
(
"/v2/api-docs"
,
"anon"
);
filterChainDefinitionMap
.
put
(
"/user/**"
,
"anon"
);
filterChainDefinitionMap
.
put
(
"/ZX/**"
,
"anon"
);
//资讯的访问地址
filterChainDefinitionMap
.
put
(
"/api/user/**"
,
"anon"
);
//登录注册路径
filterChainDefinitionMap
.
put
(
"/webjars/springfox-swagger-ui/**"
,
"anon"
);
filterChainDefinitionMap
.
put
(
"/swagger-resources/**"
,
"anon"
);
filterChainDefinitionMap
.
put
(
"/v2/api-docs"
,
"anon"
);
filterChainDefinitionMap
.
put
(
"/api/sms/verifyCode"
,
"anon"
);
filterChainDefinitionMap
.
put
(
"/api/sms/**"
,
"anon"
);
filterChainDefinitionMap
.
put
(
"/upload_flowChart/**"
,
"anon"
);
//图片地址
filterChainDefinitionMap
.
put
(
"/webSocket/**"
,
"anon"
);
//socket
filterChainDefinitionMap
.
put
(
"/message/**"
,
"anon"
);
//消息推送接口
filterChainDefinitionMap
.
put
(
"/**"
,
"oauth2"
);
// 其他路径均需要身份认证,一般位于最下面,优先级最低
filterChainDefinitionMap
.
put
(
"/userlevel/test"
,
"anon"
);
filterChainDefinitionMap
.
put
(
"/**"
,
"oauth2"
);
// 其他路径均需要身份认证,一般位于最下面,优先级最低
// 设置拦截器
shiroFilterFactoryBean
.
setFilterChainDefinitionMap
(
filterChainDefinitionMap
);
return
shiroFilterFactoryBean
;
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment