Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in
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
052f2e32
Commit
052f2e32
authored
4 years ago
by
m1991
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
sms工具类变动
parent
9096772c
Expand all
Show whitespace changes
Inline
Side-by-side
Showing
9 changed files
with
168 additions
and
33 deletions
+168
-33
wisenergy-mapper.iml
wisenergy-mapper/wisenergy-mapper.iml
+10
-0
wisenergy-model.iml
wisenergy-model/wisenergy-model.iml
+36
-2
wisenergy-parent.iml
wisenergy-parent.iml
+16
-0
UserServiceImpl.java
...n/java/cn/wisenergy/service/app/impl/UserServiceImpl.java
+8
-0
wisenergy-service.iml
wisenergy-service/wisenergy-service.iml
+26
-0
SmsController.java
.../cn/wisenergy/web/admin/controller/app/SmsController.java
+1
-0
TestController.java
...cn/wisenergy/web/admin/controller/app/TestController.java
+1
-1
application-dev.yml
wisenergy-web-admin/src/main/resources/application-dev.yml
+12
-4
wisenergy-web-admin.iml
wisenergy-web-admin/wisenergy-web-admin.iml
+58
-26
No files found.
wisenergy-mapper/wisenergy-mapper.iml
View file @
052f2e32
...
...
@@ -150,6 +150,16 @@
<orderEntry
type=
"library"
name=
"Maven: org.apache.shiro:shiro-spring:1.4.0"
level=
"project"
/>
<orderEntry
type=
"library"
name=
"Maven: org.apache.shiro:shiro-web:1.4.0"
level=
"project"
/>
<orderEntry
type=
"library"
name=
"Maven: cn.hutool:hutool-all:4.6.7"
level=
"project"
/>
<orderEntry
type=
"library"
name=
"Maven: com.aliyun:aliyun-java-sdk-core:4.5.18"
level=
"project"
/>
<orderEntry
type=
"library"
name=
"Maven: com.google.code.gson:gson:2.8.5"
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.6"
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: io.swagger:swagger-annotations:1.5.23"
level=
"project"
/>
<orderEntry
type=
"library"
name=
"Maven: org.apache.commons:commons-lang3:3.8.1"
level=
"project"
/>
<orderEntry
type=
"library"
name=
"Maven: commons-lang:commons-lang:2.6"
level=
"project"
/>
...
...
This diff is collapsed.
Click to expand it.
wisenergy-model/wisenergy-model.iml
View file @
052f2e32
<?xml version="1.0" encoding="UTF-8"?>
<module
org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule=
"true"
type=
"JAVA_MODULE"
version=
"4"
>
<component
name=
"FacetManager"
>
<facet
type=
"Spring"
name=
"Spring"
>
<configuration
/>
</facet>
<facet
type=
"web"
name=
"Web"
>
<configuration>
<webroots
/>
</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"
/>
...
...
@@ -70,8 +80,6 @@
<orderEntry
type=
"library"
name=
"Maven: org.springframework:spring-jcl:5.1.7.RELEASE"
level=
"project"
/>
<orderEntry
type=
"library"
name=
"Maven: org.springframework:spring-test:5.1.7.RELEASE"
level=
"project"
/>
<orderEntry
type=
"library"
name=
"Maven: org.xmlunit:xmlunit-core:2.6.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.mybatis.spring.boot:mybatis-spring-boot-starter:2.1.2"
level=
"project"
/>
<orderEntry
type=
"library"
name=
"Maven: org.springframework.boot:spring-boot-starter-jdbc:2.1.5.RELEASE"
level=
"project"
/>
<orderEntry
type=
"library"
name=
"Maven: com.zaxxer:HikariCP:3.2.0"
level=
"project"
/>
...
...
@@ -147,6 +155,16 @@
<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.7"
level=
"project"
/>
<orderEntry
type=
"library"
name=
"Maven: com.aliyun:aliyun-java-sdk-core:4.5.18"
level=
"project"
/>
<orderEntry
type=
"library"
name=
"Maven: com.google.code.gson:gson:2.8.5"
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.6"
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: io.swagger:swagger-annotations:1.5.23"
level=
"project"
/>
<orderEntry
type=
"library"
name=
"Maven: org.apache.commons:commons-lang3:3.8.1"
level=
"project"
/>
<orderEntry
type=
"library"
name=
"Maven: commons-lang:commons-lang:2.6"
level=
"project"
/>
...
...
@@ -168,5 +186,21 @@
<orderEntry
type=
"library"
name=
"Maven: org.ow2.asm:asm:4.2"
level=
"project"
/>
<orderEntry
type=
"library"
name=
"Maven: org.slf4j:slf4j-api:1.7.26"
level=
"project"
/>
<orderEntry
type=
"library"
name=
"Maven: org.ehcache:ehcache:3.6.3"
level=
"project"
/>
<orderEntry
type=
"library"
name=
"Maven: org.bytedeco:javacv:0.8"
level=
"project"
/>
<orderEntry
type=
"library"
name=
"Maven: org.bytedeco:javacpp:0.8"
level=
"project"
/>
<orderEntry
type=
"library"
name=
"Maven: org.bytedeco.javacpp-presets:opencv:2.4.9-0.8"
level=
"project"
/>
<orderEntry
type=
"library"
name=
"Maven: org.bytedeco.javacpp-presets:ffmpeg:2.2.1-0.8"
level=
"project"
/>
<orderEntry
type=
"library"
name=
"Maven: org.bytedeco.javacpp-presets:flycapture:1.7.17-0.8"
level=
"project"
/>
<orderEntry
type=
"library"
name=
"Maven: org.bytedeco.javacpp-presets:libdc1394:2.2.2-0.8"
level=
"project"
/>
<orderEntry
type=
"library"
name=
"Maven: org.bytedeco.javacpp-presets:libfreenect:0.4-0.8"
level=
"project"
/>
<orderEntry
type=
"library"
name=
"Maven: org.bytedeco.javacpp-presets:videoinput:0.200-0.8"
level=
"project"
/>
<orderEntry
type=
"library"
name=
"Maven: org.bytedeco.javacpp-presets:artoolkitplus:2.3.0-0.8"
level=
"project"
/>
<orderEntry
type=
"library"
name=
"Maven: org.bytedeco.javacpp-presets:opencv:windows-x86_64:2.4.9-0.8"
level=
"project"
/>
<orderEntry
type=
"library"
name=
"Maven: org.bytedeco.javacpp-presets:ffmpeg:windows-x86_64:2.2.1-0.8"
level=
"project"
/>
<orderEntry
type=
"library"
name=
"Maven: org.bytedeco.javacpp-presets:flycapture:windows-x86_64:1.7.17-0.8"
level=
"project"
/>
<orderEntry
type=
"library"
name=
"Maven: org.bytedeco.javacpp-presets:libdc1394:windows-x86_64:2.2.2-0.8"
level=
"project"
/>
<orderEntry
type=
"library"
name=
"Maven: org.bytedeco.javacpp-presets:libfreenect:windows-x86_64:0.4-0.8"
level=
"project"
/>
<orderEntry
type=
"library"
name=
"Maven: org.bytedeco.javacpp-presets:videoinput:windows-x86_64:0.200-0.8"
level=
"project"
/>
<orderEntry
type=
"library"
name=
"Maven: org.bytedeco.javacpp-presets:artoolkitplus:windows-x86_64:2.3.0-0.8"
level=
"project"
/>
</component>
</module>
\ No newline at end of file
This diff is collapsed.
Click to expand it.
wisenergy-parent.iml
View file @
052f2e32
...
...
@@ -35,5 +35,21 @@
<orderEntry
type=
"library"
name=
"Maven: org.ow2.asm:asm:4.2"
level=
"project"
/>
<orderEntry
type=
"library"
name=
"Maven: org.slf4j:slf4j-api:1.7.26"
level=
"project"
/>
<orderEntry
type=
"library"
name=
"Maven: org.ehcache:ehcache:3.6.3"
level=
"project"
/>
<orderEntry
type=
"library"
name=
"Maven: org.bytedeco:javacv:0.8"
level=
"project"
/>
<orderEntry
type=
"library"
name=
"Maven: org.bytedeco:javacpp:0.8"
level=
"project"
/>
<orderEntry
type=
"library"
name=
"Maven: org.bytedeco.javacpp-presets:opencv:2.4.9-0.8"
level=
"project"
/>
<orderEntry
type=
"library"
name=
"Maven: org.bytedeco.javacpp-presets:ffmpeg:2.2.1-0.8"
level=
"project"
/>
<orderEntry
type=
"library"
name=
"Maven: org.bytedeco.javacpp-presets:flycapture:1.7.17-0.8"
level=
"project"
/>
<orderEntry
type=
"library"
name=
"Maven: org.bytedeco.javacpp-presets:libdc1394:2.2.2-0.8"
level=
"project"
/>
<orderEntry
type=
"library"
name=
"Maven: org.bytedeco.javacpp-presets:libfreenect:0.4-0.8"
level=
"project"
/>
<orderEntry
type=
"library"
name=
"Maven: org.bytedeco.javacpp-presets:videoinput:0.200-0.8"
level=
"project"
/>
<orderEntry
type=
"library"
name=
"Maven: org.bytedeco.javacpp-presets:artoolkitplus:2.3.0-0.8"
level=
"project"
/>
<orderEntry
type=
"library"
name=
"Maven: org.bytedeco.javacpp-presets:opencv:windows-x86_64:2.4.9-0.8"
level=
"project"
/>
<orderEntry
type=
"library"
name=
"Maven: org.bytedeco.javacpp-presets:ffmpeg:windows-x86_64:2.2.1-0.8"
level=
"project"
/>
<orderEntry
type=
"library"
name=
"Maven: org.bytedeco.javacpp-presets:flycapture:windows-x86_64:1.7.17-0.8"
level=
"project"
/>
<orderEntry
type=
"library"
name=
"Maven: org.bytedeco.javacpp-presets:libdc1394:windows-x86_64:2.2.2-0.8"
level=
"project"
/>
<orderEntry
type=
"library"
name=
"Maven: org.bytedeco.javacpp-presets:libfreenect:windows-x86_64:0.4-0.8"
level=
"project"
/>
<orderEntry
type=
"library"
name=
"Maven: org.bytedeco.javacpp-presets:videoinput:windows-x86_64:0.200-0.8"
level=
"project"
/>
<orderEntry
type=
"library"
name=
"Maven: org.bytedeco.javacpp-presets:artoolkitplus:windows-x86_64:2.3.0-0.8"
level=
"project"
/>
</component>
</module>
\ No newline at end of file
This diff is collapsed.
Click to expand it.
wisenergy-service/src/main/java/cn/wisenergy/service/app/impl/UserServiceImpl.java
View file @
052f2e32
...
...
@@ -2,6 +2,7 @@ package cn.wisenergy.service.app.impl;
import
cn.wisenergy.common.utils.R
;
import
cn.wisenergy.common.utils.ShareCodeUtil
;
import
cn.wisenergy.mapper.RecommendUserMapper
;
import
cn.wisenergy.mapper.UsersMapper
;
import
cn.wisenergy.model.app.User
;
import
cn.wisenergy.service.app.UserService
;
...
...
@@ -30,6 +31,10 @@ public class UserServiceImpl extends ServiceImpl<UsersMapper, User> implements U
@Autowired
private
UsersMapper
usersMapper
;
//直推表
@Autowired
private
RecommendUserMapper
recommendUserMapper
;
@Override
public
R
<
Integer
>
getById
(
String
userId
)
{
...
...
@@ -83,7 +88,10 @@ public class UserServiceImpl extends ServiceImpl<UsersMapper, User> implements U
//插入用户团队表
//根据邀请码查询推荐人的普通用户字段+1
Integer
a
=
recommendUserMapper
.
zcByUserId
(
userId
);
if
(
null
!=
a
&&
0
!=
a
){
}
//根据邀请码递归所有团队成员普通用户+1
}
...
...
This diff is collapsed.
Click to expand it.
wisenergy-service/wisenergy-service.iml
View file @
052f2e32
<?xml version="1.0" encoding="UTF-8"?>
<module
org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule=
"true"
type=
"JAVA_MODULE"
version=
"4"
>
<component
name=
"FacetManager"
>
<facet
type=
"Spring"
name=
"Spring"
>
<configuration
/>
</facet>
<facet
type=
"web"
name=
"Web"
>
<configuration>
<webroots
/>
</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"
/>
...
...
@@ -187,5 +197,21 @@
<orderEntry
type=
"library"
name=
"Maven: cglib:cglib:3.1"
level=
"project"
/>
<orderEntry
type=
"library"
name=
"Maven: org.ow2.asm:asm:4.2"
level=
"project"
/>
<orderEntry
type=
"library"
name=
"Maven: org.ehcache:ehcache:3.6.3"
level=
"project"
/>
<orderEntry
type=
"library"
name=
"Maven: org.bytedeco:javacv:0.8"
level=
"project"
/>
<orderEntry
type=
"library"
name=
"Maven: org.bytedeco:javacpp:0.8"
level=
"project"
/>
<orderEntry
type=
"library"
name=
"Maven: org.bytedeco.javacpp-presets:opencv:2.4.9-0.8"
level=
"project"
/>
<orderEntry
type=
"library"
name=
"Maven: org.bytedeco.javacpp-presets:ffmpeg:2.2.1-0.8"
level=
"project"
/>
<orderEntry
type=
"library"
name=
"Maven: org.bytedeco.javacpp-presets:flycapture:1.7.17-0.8"
level=
"project"
/>
<orderEntry
type=
"library"
name=
"Maven: org.bytedeco.javacpp-presets:libdc1394:2.2.2-0.8"
level=
"project"
/>
<orderEntry
type=
"library"
name=
"Maven: org.bytedeco.javacpp-presets:libfreenect:0.4-0.8"
level=
"project"
/>
<orderEntry
type=
"library"
name=
"Maven: org.bytedeco.javacpp-presets:videoinput:0.200-0.8"
level=
"project"
/>
<orderEntry
type=
"library"
name=
"Maven: org.bytedeco.javacpp-presets:artoolkitplus:2.3.0-0.8"
level=
"project"
/>
<orderEntry
type=
"library"
name=
"Maven: org.bytedeco.javacpp-presets:opencv:windows-x86_64:2.4.9-0.8"
level=
"project"
/>
<orderEntry
type=
"library"
name=
"Maven: org.bytedeco.javacpp-presets:ffmpeg:windows-x86_64:2.2.1-0.8"
level=
"project"
/>
<orderEntry
type=
"library"
name=
"Maven: org.bytedeco.javacpp-presets:flycapture:windows-x86_64:1.7.17-0.8"
level=
"project"
/>
<orderEntry
type=
"library"
name=
"Maven: org.bytedeco.javacpp-presets:libdc1394:windows-x86_64:2.2.2-0.8"
level=
"project"
/>
<orderEntry
type=
"library"
name=
"Maven: org.bytedeco.javacpp-presets:libfreenect:windows-x86_64:0.4-0.8"
level=
"project"
/>
<orderEntry
type=
"library"
name=
"Maven: org.bytedeco.javacpp-presets:videoinput:windows-x86_64:0.200-0.8"
level=
"project"
/>
<orderEntry
type=
"library"
name=
"Maven: org.bytedeco.javacpp-presets:artoolkitplus:windows-x86_64:2.3.0-0.8"
level=
"project"
/>
</component>
</module>
\ No newline at end of file
This diff is collapsed.
Click to expand it.
wisenergy-web-admin/src/main/java/cn/wisenergy/web/admin/controller/app/SmsController.java
View file @
052f2e32
package
cn
.
wisenergy
.
web
.
admin
.
controller
.
app
;
import
cn.wisenergy.common.utils.RedisUtils
;
import
cn.wisenergy.common.utils.SmsUtils
;
import
cn.wisenergy.common.utils.StringUtil
;
import
cn.wisenergy.web.sms.*
;
import
io.swagger.annotations.ApiImplicitParam
;
...
...
This diff is collapsed.
Click to expand it.
wisenergy-web-admin/src/main/java/cn/wisenergy/web/admin/controller/app/TestController.java
View file @
052f2e32
...
...
@@ -54,7 +54,7 @@ public class TestController {
public
static
void
main
(
String
[]
args
){
String
b
=
ShareCodeUtil
.
idToCode
(
1
);
String
a
=
ShareCodeUtil
.
idToCode
(
1
9919990669
,
0
+
1
);
String
a
=
ShareCodeUtil
.
idToCode
(
1
,
0
+
1
);
System
.
out
.
println
(
b
);
}
...
...
This diff is collapsed.
Click to expand it.
wisenergy-web-admin/src/main/resources/application-dev.yml
View file @
052f2e32
...
...
@@ -43,12 +43,12 @@ spring:
max-file-size
:
10MB
# 总限制
max-request-size
:
20MB
# 192.168.110.165 adm4HYservice$
redis
:
database
:
0
host
:
1
92.168.110.165
host
:
1
27.0.0.1
port
:
6379
password
:
adm4HYservice$
# 密码(默认为空)
password
:
123456
# 密码(默认为空)
timeout
:
6000ms
# 连接超时时长(毫秒)
jedis
:
pool
:
...
...
@@ -70,3 +70,11 @@ jwt:
expire
:
14400
logging
:
config
:
classpath:logback-spring.xml
sms
:
accessKeyId
:
LTAI4G6xmYPhjrS18Bxz5Kqu
secret
:
l3ZuSn2XjsFZXaB3yb8O5ASRJh3DDe
regionId
:
cn-hangzhou
domain
:
dysmsapi.aliyuncs.com
version
:
2017-05-25
action
:
SendSms
signName
:
西田森生物科技
\ No newline at end of file
This diff is collapsed.
Click to expand it.
wisenergy-web-admin/wisenergy-web-admin.iml
View file @
052f2e32
This diff is collapsed.
Click to expand it.
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