Explorar el Código

Merge remote-tracking branch 'origin/develop' into develop

zouxuan hace 1 año
padre
commit
f7b3209465

+ 53 - 0
cooleshow-app/src/main/java/com/yonge/cooleshow/teacher/controller/open/OpenClient.java

@@ -0,0 +1,53 @@
+package com.yonge.cooleshow.teacher.controller.open;
+
+import com.microsvc.toolkit.middleware.oss.wrapper.OssWrapper;
+import com.yonge.cooleshow.biz.dal.service.UploadFileService;
+import com.yonge.cooleshow.common.controller.BaseController;
+import com.yonge.cooleshow.common.entity.HttpResponseResult;
+import com.yonge.toolset.thirdparty.entity.UploadSign;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+
+@RestController
+@RequestMapping("${app-config.url.teacher:}/open")
+@Api(value = "开放权限接口", tags = "开放权限接口")
+public class OpenClient extends BaseController {
+
+    @Autowired
+    private UploadFileService uploadFileService;
+
+
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "bucketName", dataType = "String", value = "为空时默认使用daya"),
+            @ApiImplicitParam(name = "fileName", dataType = "String", value = "要上传的文件名称,不包含路径信息"),
+            @ApiImplicitParam(name = "postData", dataType = "Map", value = "1.如果使用js sdk上传的时候设置了ACL请设置,例\"acl\":\"public-read\"值要与SDK中一致,没有则删除该项</br>" +
+                    "2.提供js sdk中的key值,例\"key\":\"20150115/中文/${filename}\""),
+            @ApiImplicitParam(name = "unknowValueField", dataType = "List", value = "对于用户无法确定表单值的放在unknownValueField中(比如有的上传控件会添加一些表单项,但表单项的值可能是随机的)"),
+            @ApiImplicitParam(name = "pluginName", dataType = "String", value = "插件名称,默认ks3,可选值:ks3,aliyun,tencent"),
+    })
+    @ApiOperation(value = "获取上传文件签名", notes = "{\n" +
+            "    \"bucketName\":\"\",\n" +
+            "    \"filename\":\"test.png\",\n" +
+            "    \"postData\":{\n" +
+            "        \"acl\":\"public-read\",\n" +
+            "        \"key\":\"20150115/中文/${filename}\"\n" +
+            "    },\n" +
+            "    \"unknowValueField\":[\"test\"]\n" +
+            "}")
+    @PostMapping("/getUploadSign")
+    public HttpResponseResult<OssWrapper.ResponseSign> getUploadSign(@RequestParam(defaultValue = "ks3") String pluginName,
+                                                                     @RequestBody UploadSign uploadSign) {
+        // 设置默认文件存储服务方
+        uploadSign.setPluginName(pluginName);
+        return succeed(uploadFileService.getUploadSign(uploadSign));
+    }
+}

+ 0 - 5
cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/service/impl/TeacherServiceImpl.java

@@ -602,11 +602,6 @@ public class TeacherServiceImpl extends ServiceImpl<TeacherDao, Teacher> impleme
         teacher.setSettlementFrom(teacherSubmitReq.getSettlementFrom());
         teacher.setTenantId(teacherSubmitReq.getTenantId() == null ? -1L : teacherSubmitReq.getTenantId());
         teacher.setAvatar(Optional.ofNullable(teacherSubmitReq.getAvatar()).orElse(teacher.getAvatar()));
-        if (teacher.getTenantId() == -1L) {
-            teacher.setSettlementFrom(ESettlementFrom.TEACHER);
-        } else if (teacherSubmitReq.getIsSettlement() != null) {
-            teacher.setSettlementFrom(teacherSubmitReq.getSettlementFrom());
-        }
         if (StringUtil.isEmpty(teacherSubmitReq.getTeacherType())) {
             return teacher;
         }

+ 7 - 2
cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/service/impl/TenantActivationCodeServiceImpl.java

@@ -333,14 +333,19 @@ public class TenantActivationCodeServiceImpl extends ServiceImpl<TenantActivatio
             Integer rowIndex = next.getRowIndex();
             TenantActivationCodeWrapper.ImportTemplate code = next.getClazz();
 
+            String acCode = code.getCode();
+            if (StringUtils.isEmpty(acCode)) {
+                continue;
+            }
+
             int msgRowNo = rowIndex + 1;
             code.checkIsIllegal().forEach(err -> errMsg.add(String.format(errTemplate, msgRowNo, err)));
             if (codeRowMap.containsKey(code.getCode())) {
                 errMsg.add(String.format(errTemplate, msgRowNo, "激活码重复"));
             }
-            codeRowMap.put(code.getCode().trim(), msgRowNo);
+            codeRowMap.put(acCode, msgRowNo);
             if (StringUtils.isNotEmpty(code.getPhone())) {
-                codePhoneMap.put(code.getCode().trim(), code.getPhone().trim());
+                codePhoneMap.put(acCode.trim(), code.getPhone().trim());
             }
 
             if (errMsg.size() > 100) {

+ 53 - 0
cooleshow-user/user-teacher/src/main/java/com/yonge/cooleshow/teacher/controller/open/OpenClient.java

@@ -0,0 +1,53 @@
+package com.yonge.cooleshow.teacher.controller.open;
+
+import com.microsvc.toolkit.middleware.oss.wrapper.OssWrapper;
+import com.yonge.cooleshow.biz.dal.service.UploadFileService;
+import com.yonge.cooleshow.common.controller.BaseController;
+import com.yonge.cooleshow.common.entity.HttpResponseResult;
+import com.yonge.toolset.thirdparty.entity.UploadSign;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+
+@RestController
+@RequestMapping("/open")
+@Api(value = "开放权限接口", tags = "开放权限接口")
+public class OpenClient extends BaseController {
+
+    @Autowired
+    private UploadFileService uploadFileService;
+
+
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "bucketName", dataType = "String", value = "为空时默认使用daya"),
+            @ApiImplicitParam(name = "fileName", dataType = "String", value = "要上传的文件名称,不包含路径信息"),
+            @ApiImplicitParam(name = "postData", dataType = "Map", value = "1.如果使用js sdk上传的时候设置了ACL请设置,例\"acl\":\"public-read\"值要与SDK中一致,没有则删除该项</br>" +
+                    "2.提供js sdk中的key值,例\"key\":\"20150115/中文/${filename}\""),
+            @ApiImplicitParam(name = "unknowValueField", dataType = "List", value = "对于用户无法确定表单值的放在unknownValueField中(比如有的上传控件会添加一些表单项,但表单项的值可能是随机的)"),
+            @ApiImplicitParam(name = "pluginName", dataType = "String", value = "插件名称,默认ks3,可选值:ks3,aliyun,tencent"),
+    })
+    @ApiOperation(value = "获取上传文件签名", notes = "{\n" +
+            "    \"bucketName\":\"\",\n" +
+            "    \"filename\":\"test.png\",\n" +
+            "    \"postData\":{\n" +
+            "        \"acl\":\"public-read\",\n" +
+            "        \"key\":\"20150115/中文/${filename}\"\n" +
+            "    },\n" +
+            "    \"unknowValueField\":[\"test\"]\n" +
+            "}")
+    @PostMapping("/getUploadSign")
+    public HttpResponseResult<OssWrapper.ResponseSign> getUploadSign(@RequestParam(defaultValue = "ks3") String pluginName,
+                                                                     @RequestBody UploadSign uploadSign) {
+        // 设置默认文件存储服务方
+        uploadSign.setPluginName(pluginName);
+        return succeed(uploadFileService.getUploadSign(uploadSign));
+    }
+}

+ 15 - 16
scripts/install.sh

@@ -6,7 +6,7 @@ PROJECT_NAME="cooleshow"
 PROJECT_LIBS="libs"
 
 GIT_URL="http://10.206.0.11/yonge/cooleshow.git"
-GIT_BRANCH="develop"
+GIT_BRANCH="master"
 
 # 删除旧的项目
 rm -rf ${PROJECT_NAME}
@@ -33,21 +33,20 @@ echo "create jar dir done"
 
 cp service.md \
 		cooleshow-user/user-admin/target/user-admin.jar \
-                audio-analysis/target/audio-analysis.jar \
-                cooleshow-auth/auth-server/target/auth-server.jar \
-                cooleshow-bbs/target/cooleshow-bbs.jar \
-                cooleshow-user/user-classroom/target/user-classroom.jar \
-                cooleshow-cms/target/cooleshow-cms.jar \
-                cooleshow-gateway/gateway-web/target/gateway-web.jar \
-                cooleshow-mall/mall-admin/target/mall-admin.jar \
-                cooleshow-mall/mall-portal/target/mall-portal.jar \
-                cooleshow-user/user-student/target/user-student.jar \
-                cooleshow-task/target/cooleshow-task.jar \
-                cooleshow-user/user-teacher/target/user-teacher.jar \
-                cooleshow-user/user-website/target/user-website.jar \
-                cooleshow-user/user-tenant/target/user-tenant.jar \
-                cooleshow-websocket/target/cooleshow-websocket.jar \
-                cooleshow-app/target/cooleshow-app.jar \
+    audio-analysis/target/audio-analysis.jar \
+    cooleshow-auth/auth-server/target/auth-server.jar \
+    cooleshow-bbs/target/cooleshow-bbs.jar \
+    cooleshow-user/user-classroom/target/user-classroom.jar \
+    cooleshow-cms/target/cooleshow-cms.jar \
+    cooleshow-gateway/gateway-web/target/gateway-web.jar \
+    cooleshow-mall/mall-admin/target/mall-admin.jar \
+    cooleshow-mall/mall-portal/target/mall-portal.jar \
+    cooleshow-user/user-student/target/user-student.jar \
+    cooleshow-task/target/cooleshow-task.jar \
+    cooleshow-user/user-teacher/target/user-teacher.jar \
+    cooleshow-user/user-website/target/user-website.jar \
+    cooleshow-user/user-tenant/target/user-tenant.jar \
+    cooleshow-websocket/target/cooleshow-websocket.jar \
   ${CURRENT_DIR}/${PROJECT_LIBS}/
 
 echo "copy jar done"