zouxuan 5 éve
szülő
commit
0657621808

+ 1 - 1
edu-auth/edu-auth-server/src/main/resources/application.yml

@@ -50,7 +50,7 @@ spring:
     host: 47.99.212.176
     port: 6379
     password: 
-    database: 0
+    database: 1
     #连接超时时间(毫秒)
     timeout: 10000
     jedis:

+ 1 - 1
edu-im/edu-im-server/src/main/resources/application.yml

@@ -54,7 +54,7 @@ spring:
     host: 47.99.212.176
     port: 6379
     password:
-    database: 0
+    database: 1
     #连接超时时间(毫秒)
     timeout: 10000
     pool:

+ 1 - 1
edu-task/src/main/resources/application.yml

@@ -54,7 +54,7 @@ spring:
     host: 47.99.212.176
     port: 6379
     password:
-    database: 0
+    database: 1
     #连接超时时间(毫秒)
     timeout: 10000
     pool:

+ 15 - 0
edu-thirdparty/pom.xml

@@ -22,5 +22,20 @@
       <version>3.8.1</version>
       <scope>test</scope>
     </dependency>
+      <dependency>
+          <groupId>org.springframework</groupId>
+          <artifactId>spring-context</artifactId>
+          <version>5.1.8.RELEASE</version>
+          <scope>compile</scope>
+      </dependency>
+      <dependency>
+        <groupId>com.aliyun.oss</groupId>
+        <artifactId>aliyun-sdk-oss</artifactId>
+        <version>2.8.3</version>
+      </dependency>
+    <dependency>
+      <groupId>com.keao.edu</groupId>
+      <artifactId>edu-util</artifactId>
+    </dependency>
   </dependencies>
 </project>

+ 37 - 0
edu-thirdparty/src/main/java/com/keao/edu/thirdparty/exception/ThirdpartyException.java

@@ -0,0 +1,37 @@
+package com.keao.edu.thirdparty.exception;
+
+
+import com.keao.edu.util.string.MessageFormatter;
+
+public class ThirdpartyException extends RuntimeException {
+
+	/**
+	 * 
+	 */
+	private static final long serialVersionUID = -4562885563376566463L;
+
+	public ThirdpartyException() {
+		super();
+	}
+
+	public ThirdpartyException(String message) {
+		super(message);
+	}
+
+	public ThirdpartyException(Throwable cause) {
+		super(cause);
+	}
+
+	public ThirdpartyException(String message, Throwable cause) {
+		super(message, cause);
+	}
+
+	public ThirdpartyException(String message, Object... arguments) {
+		super(MessageFormatter.arrayFormat(message, arguments));
+	}
+
+	public ThirdpartyException(String message, Throwable cause, Object... args) {
+		super(MessageFormatter.arrayFormat(message, args), cause);
+	}
+
+}

+ 1 - 1
edu-thirdparty/src/main/java/com/ym/mec/thirdparty/storage/StoragePlugin.java → edu-thirdparty/src/main/java/com/keao/edu/thirdparty/storage/StoragePlugin.java

@@ -1,4 +1,4 @@
-package com.ym.mec.thirdparty.storage;
+package com.keao.edu.thirdparty.storage;
 
 import java.io.File;
 import java.io.IOException;

+ 127 - 0
edu-thirdparty/src/main/java/com/keao/edu/thirdparty/storage/provider/AliyunOssStoragePlugin.java

@@ -0,0 +1,127 @@
+package com.keao.edu.thirdparty.storage.provider;
+
+
+import com.aliyun.oss.ClientConfiguration;
+import com.aliyun.oss.OSSClient;
+import com.aliyun.oss.model.OSSObject;
+import com.keao.edu.thirdparty.exception.ThirdpartyException;
+import com.keao.edu.thirdparty.storage.StoragePlugin;
+import org.apache.poi.util.IOUtils;
+import org.springframework.beans.factory.DisposableBean;
+import org.springframework.beans.factory.InitializingBean;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.stereotype.Component;
+
+import java.io.File;
+import java.io.IOException;
+
+@Component
+public class AliyunOssStoragePlugin implements StoragePlugin, InitializingBean, DisposableBean {
+
+	@Value("${storage.oss.endpoint:oss-cn-beijing.aliyuncs.com}")
+	private String endpoint;
+
+	@Value("${storage.oss.accessKeyId:LTAI4Fdhxwfo7FsBDZKK8Wfv}")
+	private String accessKeyId;
+
+	@Value("${storage.oss.accessKeySecret:ERRma4P9VWbD98n93gspnZXmoq7rn5}")
+	private String accessKeySecret;
+
+	@Value("${storage.oss.bucketName:daya-online}")
+	private String bucketName;
+
+	private OSSClient ossClient;
+
+	public static String getName() {
+		return "Aliyun";
+	}
+
+	@Override
+	public void afterPropertiesSet() throws Exception {
+		// 创建ClientConfiguration。ClientConfiguration是OSSClient的配置类,可配置代理、连接超时、最大连接数等参数。
+		ClientConfiguration conf = new ClientConfiguration();
+
+		// 设置OSSClient允许打开的最大HTTP连接数,默认为1024个。
+		conf.setMaxConnections(200);
+		// 设置Socket层传输数据的超时时间,默认为50000毫秒。
+		conf.setSocketTimeout(10000);
+		// 设置建立连接的超时时间,默认为50000毫秒。
+		conf.setConnectionTimeout(10000);
+		// 设置从连接池中获取连接的超时时间(单位:毫秒),默认不超时。
+		conf.setConnectionRequestTimeout(1000);
+		// 设置连接空闲超时时间。超时则关闭连接,默认为60000毫秒。
+		conf.setIdleConnectionTime(10000);
+		// 设置失败请求重试次数,默认为3次。
+		conf.setMaxErrorRetry(5);
+		// 设置是否支持将自定义域名作为Endpoint,默认支持。
+		conf.setSupportCname(true);
+
+		ossClient = new OSSClient(endpoint, accessKeyId, accessKeySecret, conf);
+	}
+
+	@Override
+	public String uploadFile(String folderName, File file) {
+		if (!file.exists()) {
+			throw new ThirdpartyException("需要上传的文件[{}]不存在", file.getAbsolutePath());
+		}
+
+		if (folderName.endsWith("/")) {
+			folderName = folderName.substring(0, folderName.length() - 1);
+		}
+
+		ossClient.putObject(bucketName, folderName + "/" + file.getName(), file);
+
+		return "https://" + bucketName + "." + endpoint + "/" + folderName + "/" + file.getName();
+	}
+
+	@Override
+	public byte[] getFile(String folderName, String fileName) throws IOException {
+		OSSObject ossObject = ossClient.getObject(bucketName, folderName + "/" + fileName);
+		try {
+			return IOUtils.toByteArray(ossObject.getObjectContent());
+		} finally {
+			if (ossObject != null) {
+				ossObject.close();
+			}
+		}
+	}
+
+	@Override
+	public void destroy() throws Exception {
+		if (ossClient != null) {
+			ossClient.shutdown();
+		}
+	}
+
+	public void setEndpoint(String endpoint) {
+		this.endpoint = endpoint;
+	}
+
+	public void setAccessKeyId(String accessKeyId) {
+		this.accessKeyId = accessKeyId;
+	}
+
+	public void setAccessKeySecret(String accessKeySecret) {
+		this.accessKeySecret = accessKeySecret;
+	}
+
+	public void setBucketName(String bucketName) {
+		this.bucketName = bucketName;
+	}
+
+	public static void main(String[] args) throws Exception {
+		AliyunOssStoragePlugin aliyunOssStorageService = new AliyunOssStoragePlugin();
+		aliyunOssStorageService.setAccessKeyId("LTAIwZW9XqrfsZ4r");
+		aliyunOssStorageService.setAccessKeySecret("5uDsNZmHMxcnxav8w9byII4zcPpu5G");
+		aliyunOssStorageService.setBucketName("yooma-test");
+		aliyunOssStorageService.setEndpoint("oss-cn-beijing.aliyuncs.com");
+		aliyunOssStorageService.afterPropertiesSet();
+
+		File file = new File("e:/var/2.jpg");
+		System.out.println(aliyunOssStorageService.uploadFile("aaa", file));
+
+		System.err.println("***********" + aliyunOssStorageService.getFile("aaa", file.getName()).length);
+
+		aliyunOssStorageService.destroy();
+	}
+}

+ 18 - 1
edu-user/edu-user-server/src/main/java/com/keao/edu/user/controller/EmployeeController.java

@@ -1,10 +1,11 @@
 package com.keao.edu.user.controller;
 
 
+import com.keao.edu.auth.api.client.SysUserFeignService;
+import com.keao.edu.auth.api.entity.SysUser;
 import com.keao.edu.common.controller.BaseController;
 import com.keao.edu.common.entity.HttpResponseResult;
 import com.keao.edu.common.page.PageInfo;
-import com.keao.edu.common.page.QueryInfo;
 import com.keao.edu.user.entity.Employee;
 import com.keao.edu.user.page.EmployeeQueryInfo;
 import com.keao.edu.user.service.EmployeeService;
@@ -21,6 +22,8 @@ public class EmployeeController extends BaseController {
 
 	@Autowired
 	private EmployeeService employeeService;
+	@Autowired
+	private SysUserFeignService sysUserFeignService;
 	
 	@ApiOperation("员工服务分页查询")
 	@GetMapping(value = "/list")
@@ -49,6 +52,20 @@ public class EmployeeController extends BaseController {
 		return succeed();
 	}
 
+	@ApiOperation(value = "获取用户信息")
+	@GetMapping("/queryUserInfo")
+	public Object apiQueryUserInfo() {
+		SysUser sysUser = sysUserFeignService.queryUserInfo();
+		if(sysUser != null && sysUser.getId() != null){
+//			Employee employee = employeeService.get(sysUser.getId());
+//			sysUser.setRoles(employeeDao.queryUserRole(sysUser.getId()));
+//			sysUser.setContactAddress(employee.getContactAddress());
+//			sysUser.setPostalCode(employee.getPostalCode());
+			return succeed(sysUser);
+		}
+		return failed("获取用户信息失败");
+	}
+
 	@ApiOperation("删除")
 	@PostMapping(value = "/del/{id}")
 	public HttpResponseResult add(@PathVariable("id") Integer id) {

+ 1 - 1
edu-user/edu-user-server/src/main/java/com/keao/edu/user/service/UploadFileService.java

@@ -3,7 +3,7 @@ package com.keao.edu.user.service;
 import com.keao.edu.common.entity.UploadReturnBean;
 import com.keao.edu.common.exception.BizException;
 import com.keao.edu.util.upload.UploadUtil;
-import com.ym.mec.thirdparty.storage.StoragePlugin;
+import com.keao.edu.thirdparty.storage.StoragePlugin;
 import org.apache.commons.io.FileUtils;
 import org.apache.commons.io.IOUtils;
 import org.apache.commons.lang3.StringUtils;

+ 1 - 1
edu-user/edu-user-server/src/main/resources/application.yml

@@ -50,7 +50,7 @@ spring:
     host: 47.99.212.176
     port: 6379
     password:
-    database: 0
+    database: 1
     #连接超时时间(毫秒)
     timeout: 10000
     jedis:

+ 7 - 0
edu-zuul/src/main/resources/application.yml

@@ -47,6 +47,13 @@ zuul:
       #url: http://localhost:8001/
       ##加上下面参数,可将header信息传递至下游
       #sensitiveHeaders:
+    api-user:
+      ### 以 /api-auth/访问转发到会员服务
+      path: /api-user/**
+      serviceId: user-server
+      #url: http://localhost:8001/
+      ##加上下面参数,可将header信息传递至下游
+      #sensitiveHeaders:
     api-task:
       ### 以 /api-auth/访问转发到会员服务
       path: /api-task/**