Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
Y
YeeAmosFireAutoSysRoot
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
station
YeeAmosFireAutoSysRoot
Commits
af3c82a5
Commit
af3c82a5
authored
Aug 26, 2020
by
maoying
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
删除无用代码
parent
b2f48f63
Hide whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
7 additions
and
209 deletions
+7
-209
AMOSSecurityFallback.java
...yeejoin/amos/fas/business/feign/AMOSSecurityFallback.java
+0
-37
CompanyUserFeignServer.java
...ejoin/amos/fas/business/feign/CompanyUserFeignServer.java
+0
-50
DeptmentServer.java
...a/com/yeejoin/amos/fas/business/feign/DeptmentServer.java
+0
-42
IAMOSSecurityServer.java
.../yeejoin/amos/fas/business/feign/IAMOSSecurityServer.java
+0
-26
PushFeign.java
...n/java/com/yeejoin/amos/fas/business/feign/PushFeign.java
+6
-7
PushFeignServer.java
.../com/yeejoin/amos/fas/business/feign/PushFeignServer.java
+0
-1
TreeUserFeignServer.java
.../yeejoin/amos/fas/business/feign/TreeUserFeignServer.java
+0
-45
application.properties
...ireAutoSysStart/src/main/resources/application.properties
+1
-1
No files found.
YeeAmosFireAutoSysService/src/main/java/com/yeejoin/amos/fas/business/feign/AMOSSecurityFallback.java
deleted
100644 → 0
View file @
b2f48f63
/*package com.yeejoin.amos.fas.business.feign;
import com.yeejoin.amos.op.core.common.response.CommonResponse;
public class AMOSSecurityFallback implements IAMOSSecurityServer{
@Override
public CommonResponse queryAllUserByCompany(String companyId, String roleType) {
CommonResponse res = new CommonResponse();
res.setResult("FAILED");
return res;
}
@Override
public CommonResponse queryDeptUserTree(String companyId, String roleType) {
CommonResponse res = new CommonResponse();
res.setResult("FAILED");
return res;
}
@Override
public CommonResponse queryDeptUser(String deptId) {
CommonResponse res = new CommonResponse();
res.setResult("FAILED");
return res;
}
@Override
public CommonResponse queryCompanyLeavesById(String companyId) {
CommonResponse res = new CommonResponse();
res.setResult("FAILED");
return res;
}
}
*/
\ No newline at end of file
YeeAmosFireAutoSysService/src/main/java/com/yeejoin/amos/fas/business/feign/CompanyUserFeignServer.java
deleted
100644 → 0
View file @
b2f48f63
/*package com.yeejoin.amos.fas.business.feign;
import java.util.concurrent.CountDownLatch;
import org.springframework.util.ObjectUtils;
import com.yeejoin.amos.op.core.common.response.CommonResponse;
public class CompanyUserFeignServer extends Thread{
private CommonResponse response;
CountDownLatch latch = null;
String companyId;
String roleType;
IAMOSSecurityServer amosSecurityServer;
public CompanyUserFeignServer(IAMOSSecurityServer amosSecurityServer, CountDownLatch latch, String companyId, String roleType) {
this.latch = latch;
this.amosSecurityServer = amosSecurityServer;
this.companyId = companyId;
this.roleType = roleType;
}
public CommonResponse getResponse() {
return response;
}
public void setResponse(CommonResponse response) {
this.response = response;
}
@Override
public void run() {
CommonResponse res = null;
try {
res = amosSecurityServer.queryAllUserByCompany(companyId, roleType);
} catch (Exception e) {
}
if (ObjectUtils.isEmpty(res)) {
res = new CommonResponse();
res.setResult("FAILED");
}
this.setResponse(res);
latch.countDown();
}
}
*/
\ No newline at end of file
YeeAmosFireAutoSysService/src/main/java/com/yeejoin/amos/fas/business/feign/DeptmentServer.java
deleted
100644 → 0
View file @
b2f48f63
/*package com.yeejoin.amos.fas.business.feign;
import java.util.concurrent.CountDownLatch;
import org.springframework.util.ObjectUtils;
import com.yeejoin.amos.op.core.common.response.CommonResponse;
public class DeptmentServer extends Thread{
private CommonResponse response;
CountDownLatch latch = null;
String deptId;
IAMOSSecurityServer amosSecurityServer;
public DeptmentServer(IAMOSSecurityServer amosSecurityServer, CountDownLatch latch, String deptId) {
this.latch = latch;
this.amosSecurityServer = amosSecurityServer;
this.deptId = deptId;
}
public CommonResponse getResponse() {
return response;
}
public void setResponse(CommonResponse response) {
this.response = response;
}
@Override
public void run() {
CommonResponse res = amosSecurityServer.queryDeptUser(deptId);
if (ObjectUtils.isEmpty(res)) {
res = new CommonResponse();
res.setResult("FAILED");
}
this.setResponse(res);
latch.countDown();
}
}
*/
\ No newline at end of file
YeeAmosFireAutoSysService/src/main/java/com/yeejoin/amos/fas/business/feign/IAMOSSecurityServer.java
deleted
100644 → 0
View file @
b2f48f63
/*package com.yeejoin.amos.fas.business.feign;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.RequestParam;
import com.yeejoin.amos.op.core.common.response.CommonResponse;
@FeignClient(name="${security.fegin.name}", fallback=AMOSSecurityFallback.class, configuration=FeignConfiguration.class)
public interface IAMOSSecurityServer {
@RequestMapping(value = "/user/users/{companyId}", method = RequestMethod.GET)
public CommonResponse queryAllUserByCompany(@PathVariable("companyId") String companyId, @RequestParam("roleType") String roleType);
@RequestMapping(value = "/user/user-tree/{companyId}", method = RequestMethod.GET)
public CommonResponse queryDeptUserTree(@PathVariable("companyId") String companyId, @RequestParam("roleType") String roleType);
@RequestMapping(value = "/user/department-users/{deptId}", method = RequestMethod.GET)
public CommonResponse queryDeptUser(@PathVariable("deptId") String deptId);
@RequestMapping(value = "/company/specify-tree/{companyId}", method = RequestMethod.GET)
public CommonResponse queryCompanyLeavesById(@PathVariable("companyId") String companyId);
}
*/
\ No newline at end of file
YeeAmosFireAutoSysService/src/main/java/com/yeejoin/amos/fas/business/feign/PushFeign.java
View file @
af3c82a5
...
...
@@ -12,16 +12,15 @@ import org.springframework.cloud.openfeign.FeignClient;
//推送
/**
* 消息推送
* @author maoying
*
*/
@FeignClient
(
name
=
"${Push.fegin.name}"
,
configuration
={
MultipartSupportConfig
.
class
})
public
interface
PushFeign
{
//
// @RequestMapping(value = "/api/user/sendMessage", method = RequestMethod.POST)
// CommonResponse sendMessage( @RequestBody List<PushMsgParam> responses);
@RequestMapping
(
value
=
"/api/user/sendMessageone"
,
method
=
RequestMethod
.
POST
)
CommonResponse
sendMessageone
(
@RequestBody
PushMsgParam
responses
);
...
...
YeeAmosFireAutoSysService/src/main/java/com/yeejoin/amos/fas/business/feign/PushFeignServer.java
View file @
af3c82a5
...
...
@@ -2,7 +2,6 @@ package com.yeejoin.amos.fas.business.feign;
import
java.util.List
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.beans.factory.annotation.Value
;
import
org.springframework.http.HttpEntity
;
import
org.springframework.http.HttpHeaders
;
...
...
YeeAmosFireAutoSysService/src/main/java/com/yeejoin/amos/fas/business/feign/TreeUserFeignServer.java
deleted
100644 → 0
View file @
b2f48f63
/*package com.yeejoin.amos.fas.business.feign;
import java.util.concurrent.CountDownLatch;
import org.springframework.util.ObjectUtils;
import com.yeejoin.amos.op.core.common.response.CommonResponse;
public class TreeUserFeignServer extends Thread{
private CommonResponse response;
CountDownLatch latch = null;
String companyId;
String roleType;
IAMOSSecurityServer amosSecurityServer;
public TreeUserFeignServer(IAMOSSecurityServer amosSecurityServer, CountDownLatch latch, String companyId, String roleType) {
this.latch = latch;
this.amosSecurityServer = amosSecurityServer;
this.companyId = companyId;
this.roleType = roleType;
}
public CommonResponse getResponse() {
return response;
}
public void setResponse(CommonResponse response) {
this.response = response;
}
@Override
public void run() {
CommonResponse res = amosSecurityServer.queryDeptUserTree(companyId, roleType);
if (ObjectUtils.isEmpty(res)) {
res = new CommonResponse();
res.setResult("FAILED");
}
this.setResponse(res);
latch.countDown();
}
}
*/
\ No newline at end of file
YeeAmosFireAutoSysStart/src/main/resources/application.properties
View file @
af3c82a5
spring.application.name
=
A
mos-autosys-zjw
spring.application.name
=
A
MOS-AUTOSYS
server.port
=
8083
...
...
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