Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
C
cloud-platform
Project
Project
Details
Activity
Releases
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
youjj
cloud-platform
Commits
66200d6e
Commit
66200d6e
authored
Jun 13, 2019
by
hezhen
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改上传
parent
2546f4d1
Changes
7
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
198 additions
and
109 deletions
+198
-109
AppUserLogin.java
...om/github/wxiaoqi/security/admin/entity/AppUserLogin.java
+2
-0
pom.xml
ace-modules/ace-admin/pom.xml
+5
-0
AdminBootstrap.java
...ava/com/github/wxiaoqi/security/admin/AdminBootstrap.java
+1
-1
AppUserRest.java
...va/com/github/wxiaoqi/security/admin/rpc/AppUserRest.java
+1
-0
AppPermissionService.java
...aoqi/security/admin/rpc/service/AppPermissionService.java
+187
-106
pom.xml
xx-im/xx-im-api/pom.xml
+1
-1
UploadController.java
.../xxfc/platform/universal/controller/UploadController.java
+1
-1
No files found.
ace-modules/ace-admin-api/src/main/java/com/github/wxiaoqi/security/admin/entity/AppUserLogin.java
View file @
66200d6e
...
...
@@ -18,6 +18,8 @@ public class AppUserLogin {
private
int
id
;
@Column
(
name
=
"im_userid"
)
private
Integer
imUserid
;
@Column
(
name
=
"im_password"
)
private
String
imPassword
;
@Column
(
name
=
"username"
)
private
String
username
;
private
String
password
;
...
...
ace-modules/ace-admin/pom.xml
View file @
66200d6e
...
...
@@ -40,6 +40,11 @@
<artifactId>
xx-universal-api
</artifactId>
<version>
2.0-SNAPSHOT
</version>
</dependency>
<dependency>
<groupId>
com.xxfc.platform
</groupId>
<artifactId>
xx-im-api
</artifactId>
<version>
2.0-SNAPSHOT
</version>
</dependency>
<dependency>
<groupId>
org.springframework.boot
</groupId>
<artifactId>
spring-boot-starter-data-redis
</artifactId>
...
...
ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/AdminBootstrap.java
View file @
66200d6e
...
...
@@ -33,7 +33,7 @@ import java.util.List;
@EnableDiscoveryClient
@EnableCircuitBreaker
@SpringBootApplication
@EnableFeignClients
({
"com.github.wxiaoqi.security.auth.client.feign"
,
"com.xxfc.platform.universal.feign
"
})
@EnableFeignClients
({
"com.github.wxiaoqi.security.auth.client.feign"
,
"com.xxfc.platform
"
})
@EnableScheduling
@EnableAceAuthClient
@EnableAceCache
...
...
ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/rpc/AppUserRest.java
View file @
66200d6e
...
...
@@ -78,6 +78,7 @@ public class AppUserRest {
mobilecode
,
null
,
null
,
0
);
}
/**
* 微信注册/微信绑定
* @param username
...
...
ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/rpc/service/AppPermissionService.java
View file @
66200d6e
This diff is collapsed.
Click to expand it.
xx-im/xx-im-api/pom.xml
View file @
66200d6e
...
...
@@ -8,7 +8,7 @@
<version>
2.0-SNAPSHOT
</version>
</parent>
<modelVersion>
4.0.0
</modelVersion>
<groupId>
com.xxfc.platform
</groupId>
<artifactId>
xx-im-api
</artifactId>
...
...
xx-universal/xx-universal-server/src/main/java/com/xxfc/platform/universal/controller/UploadController.java
View file @
66200d6e
...
...
@@ -45,7 +45,7 @@ public class UploadController{
return
JsonResultUtil
.
createSuccessResultWithObj
(
uploadService
.
uploadFile
(
file
,
prefix
));
}
@RequestMapping
(
value
=
"/admin/upload"
,
method
=
RequestMethod
.
POST
)
@RequestMapping
(
value
=
"/a
pp/unauth/a
dmin/upload"
,
method
=
RequestMethod
.
POST
)
public
JSONObject
uploads
(
@RequestParam
(
"file"
)
MultipartFile
file
,
@RequestParam
(
value
=
"prefix"
,
defaultValue
=
"admin"
)
String
prefix
...
...
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