Merge branch 'master' of http://git.qmth.com.cn/ExamCloud-2/examcloud-core-basic.git

examcloud-core-basic-api-provider/src/main/java/cn/com/qmth/examcloud/core/basic/api/provider/UserCloudServiceProvider.java

@@ -11,7 +11,8 @@ import cn.com.qmth.examcloud.core.basic.api.UserCloudService;
 import cn.com.qmth.examcloud.core.basic.api.bean.UserInfo;
 import cn.com.qmth.examcloud.core.basic.api.request.GetUserInfoReq;
 import cn.com.qmth.examcloud.core.basic.api.response.GetUserInfoResp;
-import cn.com.qmth.examcloud.core.basic.service.impl.UserService;
+import cn.com.qmth.examcloud.core.basic.dao.entity.User;
+import cn.com.qmth.examcloud.core.basic.service.UserService;
 import io.swagger.annotations.ApiOperation;
 
 /**
@@ -33,8 +34,14 @@ public class UserCloudServiceProvider extends ControllerSupport implements UserC
 	public GetUserInfoResp getUserInfo(@RequestBody GetUserInfoReq req) {
 
 		GetUserInfoResp resp = new GetUserInfoResp();
+		String rootOrgId = req.getRootOrgId();
+		String loginName = req.getLoginName();
+
+		User user = userService.getUser(Long.parseLong(rootOrgId), loginName);
+
 		UserInfo userInfo = new UserInfo();
-		userInfo.setLoginName("wangwei");
+		userInfo.setRootOrgId(user.getRootOrgId());
+		userInfo.setLoginName(user.getLoginName());
 		resp.setUserInfo(userInfo);
 		return resp;
 	}

examcloud-core-basic-api-provider/src/main/java/cn/com/qmth/examcloud/service/core/api/OrgApi.java

@@ -34,6 +34,7 @@ import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 import org.springframework.web.multipart.commons.CommonsMultipartFile;
 
+import cn.com.qmth.examcloud.common.support.ControllerSupport;
 import cn.com.qmth.examcloud.common.uac.entity.AccessUser;
 import cn.com.qmth.examcloud.common.util.ErrorMsg;
 import cn.com.qmth.examcloud.common.util.excel.ExcelError;
@@ -50,7 +51,7 @@ import io.swagger.annotations.ApiOperation;
  */
 @RestController
 @RequestMapping("${app.api.root}/org")
-public class OrgApi {
+public class OrgApi extends ControllerSupport{
 
     private static final Logger LOG = LoggerFactory.getLogger(OrgApi.class);
 
@@ -187,21 +188,21 @@ public class OrgApi {
 
     @ApiOperation(value = "按父ID导入子机构", notes = "导入子机构")
     @PostMapping("/import")
-    public ResponseEntity importLearnCenter(HttpServletRequest request,
+    public ResponseEntity<?> importLearnCenter(HttpServletRequest request,
                                             @RequestParam CommonsMultipartFile file) {
         AccessUser accessUser = (AccessUser) request.getAttribute("accessUser");
         Long orgId = null;
         if(accessUser != null){
             orgId = accessUser.getRootOrgId();
         }else{
-            return new ResponseEntity(new ErrorMsg("用户token不存在或已失效"),HttpStatus.NOT_FOUND);
+            return new ResponseEntity<>(new ErrorMsg("用户token不存在或已失效"),HttpStatus.NOT_FOUND);
         }
         try {
             List<ExcelError> excelErrors = orgService.importLearnCenter(orgId, file.getInputStream());
-            return new ResponseEntity(excelErrors, HttpStatus.OK);
+            return new ResponseEntity<>(excelErrors, HttpStatus.OK);
         } catch (IOException e) {
-            e.printStackTrace();
-            return new ResponseEntity(HttpStatus.INTERNAL_SERVER_ERROR);
+        	log.error(e.getMessage(), e);
+            return new ResponseEntity<>(HttpStatus.INTERNAL_SERVER_ERROR);
         }
     }
 

examcloud-core-basic-api-provider/src/main/java/cn/com/qmth/examcloud/service/core/api/OrgFunctionApi.java

@@ -16,7 +16,9 @@ import cn.com.qmth.examcloud.common.support.ControllerSupport;
 import cn.com.qmth.examcloud.common.support.tree.TreeNode;
 import cn.com.qmth.examcloud.common.support.tree.TreeUtil;
 import cn.com.qmth.examcloud.common.support.tree.ZtreeNode;
+import cn.com.qmth.examcloud.core.basic.dao.FunctionRepo;
 import cn.com.qmth.examcloud.core.basic.dao.OrgFunctionRepo;
+import cn.com.qmth.examcloud.core.basic.dao.entity.Function;
 import cn.com.qmth.examcloud.core.basic.dao.entity.OrgFunction;
 import io.swagger.annotations.ApiOperation;
 
@@ -33,10 +35,13 @@ public class OrgFunctionApi extends ControllerSupport {
 	@Autowired
 	OrgFunctionRepo orgFunctionRepo;
 
+	@Autowired
+	FunctionRepo functionRepo;
+
 	@ApiOperation(value = "查询所有功能", notes = "查询")
 	@GetMapping("/getAllFunctions")
 	public ResponseEntity<?> getAllFunctions() {
-		List<OrgFunction> allFuncs = orgFunctionRepo.findAll();
+		List<Function> allFuncs = functionRepo.findAll();
 
 		List<TreeNode> zTreeData = TreeUtil.convert(allFuncs, ZtreeNode.class);
 		return new ResponseEntity<>(zTreeData, HttpStatus.OK);

examcloud-core-basic-api-provider/src/main/java/cn/com/qmth/examcloud/service/core/api/UserApi.java

@@ -38,7 +38,7 @@ import cn.com.qmth.examcloud.core.basic.dao.UserRepo;
 import cn.com.qmth.examcloud.core.basic.dao.entity.User;
 import cn.com.qmth.examcloud.core.basic.dao.enums.UserType;
 import cn.com.qmth.examcloud.core.basic.service.bean.UserInfo;
-import cn.com.qmth.examcloud.core.basic.service.impl.UserService;
+import cn.com.qmth.examcloud.core.basic.service.impl.UserServiceImpl;
 
 /**
  * 用户服务API
@@ -49,7 +49,7 @@ import cn.com.qmth.examcloud.core.basic.service.impl.UserService;
 public class UserApi {
 
     @Autowired
-    UserService userService;
+    UserServiceImpl userService;
 
     @Autowired
     UserRepo userRepo;

examcloud-core-basic-api/src/main/java/cn/com/qmth/examcloud/core/basic/api/bean/UserInfo.java

@@ -1,128 +1,15 @@
 package cn.com.qmth.examcloud.core.basic.api.bean;
 
 import java.io.Serializable;
-import java.util.List;
 
 public class UserInfo implements Serializable {
 
 	private static final long serialVersionUID = 7939545789907406883L;
 
-	private Long userId;
-
-	private Long orgId;
-
 	private Long rootOrgId;
 
-	private String name;
-
 	private String loginName;
 
-	private String type;
-
-	private String token;
-
-	private String avatar;
-
-	private String orgName;
-
-	private String rootOrgName;
-
-	private String rootOrgLogo;
-
-	private Long studentId;
-
-	private String identityNumber;
-
-	private String studentCode;
-
-	private List<UserRole> userRoles;
-
-	private List<String> roleNames;
-
-	public static long getSerialVersionUID() {
-		return serialVersionUID;
-	}
-
-	public Long getUserId() {
-		return userId;
-	}
-
-	public void setUserId(Long userId) {
-		this.userId = userId;
-	}
-
-	public String getName() {
-		return name;
-	}
-
-	public void setName(String name) {
-		this.name = name;
-	}
-
-	public String getLoginName() {
-		return loginName;
-	}
-
-	public void setLoginName(String loginName) {
-		this.loginName = loginName;
-	}
-
-	public String getType() {
-		return type;
-	}
-
-	public void setType(String type) {
-		this.type = type;
-	}
-
-	public String getToken() {
-		return token;
-	}
-
-	public void setToken(String token) {
-		this.token = token;
-	}
-
-	public String getAvatar() {
-		return avatar;
-	}
-
-	public void setAvatar(String avatar) {
-		this.avatar = avatar;
-	}
-
-	public String getOrgName() {
-		return orgName;
-	}
-
-	public void setOrgName(String orgName) {
-		this.orgName = orgName;
-	}
-
-	public String getRootOrgName() {
-		return rootOrgName;
-	}
-
-	public void setRootOrgName(String rootOrgName) {
-		this.rootOrgName = rootOrgName;
-	}
-
-	public String getRootOrgLogo() {
-		return rootOrgLogo;
-	}
-
-	public void setRootOrgLogo(String rootOrgLogo) {
-		this.rootOrgLogo = rootOrgLogo;
-	}
-
-	public Long getOrgId() {
-		return orgId;
-	}
-
-	public void setOrgId(Long orgId) {
-		this.orgId = orgId;
-	}
-
 	public Long getRootOrgId() {
 		return rootOrgId;
 	}
@@ -131,46 +18,12 @@ public class UserInfo implements Serializable {
 		this.rootOrgId = rootOrgId;
 	}
 
-	public Long getStudentId() {
-		return studentId;
-	}
-
-	public void setStudentId(Long studentId) {
-		this.studentId = studentId;
-	}
-
-	public String getIdentityNumber() {
-		return identityNumber;
-	}
-
-	public void setIdentityNumber(String identityNumber) {
-		this.identityNumber = identityNumber;
-	}
-
-	public List<UserRole> getUserRoles() {
-		return userRoles;
-	}
-
-	public void setUserRoles(List<UserRole> userRoles) {
-		this.userRoles = userRoles;
-	}
-
-	public List<String> getRoleNames() {
-		return roleNames;
-	}
-
-	public void setRoleNames(List<String> roleNames) {
-		this.roleNames = roleNames;
-	}
-
-	public String getStudentCode() {
-		return studentCode;
+	public String getLoginName() {
+		return loginName;
 	}
 
-	public void setStudentCode(String studentCode) {
-		this.studentCode = studentCode;
+	public void setLoginName(String loginName) {
+		this.loginName = loginName;
 	}
 
-	public UserInfo() {
-	}
 }

examcloud-core-basic-api/src/main/java/cn/com/qmth/examcloud/core/basic/api/request/GetUserInfoReq.java

@@ -11,29 +11,29 @@ public class GetUserInfoReq extends BaseRequest {
 	private static final long serialVersionUID = 3858312269358420299L;
 
 	/**
-	 * 账号类型
+	 * 顶级机构ID
 	 */
-	private String accountType;
+	private String rootOrgId;
 
 	/**
-	 * 账号值
+	 * 登陆名
 	 */
-	private String accountValue;
+	private String loginName;
 
-	public String getAccountType() {
-		return accountType;
+	public String getRootOrgId() {
+		return rootOrgId;
 	}
 
-	public void setAccountType(String accountType) {
-		this.accountType = accountType;
+	public void setRootOrgId(String rootOrgId) {
+		this.rootOrgId = rootOrgId;
 	}
 
-	public String getAccountValue() {
-		return accountValue;
+	public String getLoginName() {
+		return loginName;
 	}
 
-	public void setAccountValue(String accountValue) {
-		this.accountValue = accountValue;
+	public void setLoginName(String loginName) {
+		this.loginName = loginName;
 	}
 
 }

examcloud-core-basic-dao/src/main/java/cn/com/qmth/examcloud/core/basic/dao/FunctionRepo.java

@@ -0,0 +1,10 @@
+package cn.com.qmth.examcloud.core.basic.dao;
+
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.repository.query.QueryByExampleExecutor;
+
+import cn.com.qmth.examcloud.core.basic.dao.entity.Function;
+
+public interface FunctionRepo extends JpaRepository<Function, Long>, QueryByExampleExecutor<Function> {
+
+}

examcloud-core-basic-dao/src/main/java/cn/com/qmth/examcloud/core/basic/dao/OrgFunctionRepo.java

@@ -10,8 +10,10 @@ import org.springframework.data.repository.query.QueryByExampleExecutor;
 import org.springframework.transaction.annotation.Transactional;
 
 import cn.com.qmth.examcloud.core.basic.dao.entity.OrgFunction;
+import cn.com.qmth.examcloud.core.basic.dao.entity.OrgFunctionPK;
 
-public interface OrgFunctionRepo extends JpaRepository<OrgFunction, Long>, QueryByExampleExecutor<OrgFunction> {
+public interface OrgFunctionRepo
+		extends JpaRepository<OrgFunction, OrgFunctionPK>, QueryByExampleExecutor<OrgFunction> {
 
 	@Query(nativeQuery = true, value = "SELECT * from ecs_core_function x,ecs_core_org_function y where x.id=y.function_id and y.org_id = :orgId")
 	List<OrgFunction> getOrgFunctions(@Param("orgId") long orgId);

examcloud-core-basic-dao/src/main/java/cn/com/qmth/examcloud/core/basic/dao/entity/Function.java

@@ -0,0 +1,140 @@
+package cn.com.qmth.examcloud.core.basic.dao.entity;
+
+import java.io.Serializable;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.Id;
+import javax.persistence.Table;
+import javax.validation.constraints.NotNull;
+
+import cn.com.qmth.examcloud.common.support.tree.TreeNode;
+
+/**
+ * 功能
+ * 
+ * @author wang wei
+ * @date 2018年4月9日
+ */
+@Entity
+@Table(name = "ecs_core_function")
+public class Function implements Serializable, TreeNode {
+
+	private static final long serialVersionUID = -3894524658332441373L;
+
+	@Id
+	@GeneratedValue
+	@Column(name = "id")
+	private Long funcId;
+
+	/**
+	 * 功能编码
+	 */
+	@NotNull
+	private String funcCode;
+
+	/**
+	 * 父功能id
+	 */
+	@NotNull
+	@Column(name = "parent_id")
+	private Long parentFuncId;
+
+	/**
+	 * 功能名称
+	 */
+	@NotNull
+	private String funcName;
+
+	/**
+	 * 描述
+	 */
+	@NotNull
+	private String description;
+
+	/**
+	 * 权重
+	 */
+	@NotNull
+	private int weigth;
+
+	public Long getFuncId() {
+		return funcId;
+	}
+
+	public void setFuncId(Long funcId) {
+		this.funcId = funcId;
+	}
+
+	public String getFuncCode() {
+		return funcCode;
+	}
+
+	public void setFuncCode(String funcCode) {
+		this.funcCode = funcCode;
+	}
+
+	public Long getParentFuncId() {
+		return parentFuncId;
+	}
+
+	public void setParentFuncId(Long parentFuncId) {
+		this.parentFuncId = parentFuncId;
+	}
+
+	public String getFuncName() {
+		return funcName;
+	}
+
+	public void setFuncName(String funcName) {
+		this.funcName = funcName;
+	}
+
+	public String getDescription() {
+		return description;
+	}
+
+	public void setDescription(String description) {
+		this.description = description;
+	}
+
+	public int getWeigth() {
+		return weigth;
+	}
+
+	public void setWeigth(int weigth) {
+		this.weigth = weigth;
+	}
+
+	@Override
+	public String getId() {
+		return String.valueOf(this.funcId);
+	}
+
+	@Override
+	public void setId(String id) {
+		this.funcId = Long.parseLong(id);
+	}
+
+	@Override
+	public String getName() {
+		return this.funcName;
+	}
+
+	@Override
+	public void setName(String name) {
+		this.funcName = name;
+	}
+
+	@Override
+	public String getParentId() {
+		return String.valueOf(this.parentFuncId);
+	}
+
+	@Override
+	public void setParentId(String parentId) {
+		this.parentFuncId = Long.parseLong(parentId);
+	}
+
+}

examcloud-core-basic-dao/src/main/java/cn/com/qmth/examcloud/core/basic/dao/entity/OrgFunction.java

@@ -4,60 +4,38 @@ import java.io.Serializable;
 
 import javax.persistence.Column;
 import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
 import javax.persistence.Id;
+import javax.persistence.IdClass;
 import javax.persistence.Table;
-import javax.validation.constraints.NotNull;
-
-import cn.com.qmth.examcloud.common.support.tree.TreeNode;
 
 /**
- * 机构功能
+ * 机构功能关联
  * 
  * @author wang wei
  * @date 2018年4月9日
  */
 @Entity
-@Table(name = "ecs_core_function")
-public class OrgFunction implements Serializable, TreeNode {
+@Table(name = "ecs_core_org_function")
+@IdClass(OrgFunctionPK.class)
+public class OrgFunction implements Serializable {
 
-	private static final long serialVersionUID = -3894524658332441373L;
+	private static final long serialVersionUID = 3282637192076703638L;
 
 	@Id
-	@GeneratedValue
-	@Column(name = "id")
-	private Long funcId;
-
-	/**
-	 * 功能编码
-	 */
-	@NotNull
-	private String funcCode;
+	@Column(name = "org_id")
+	private Long orgId;
 
-	/**
-	 * 父功能id
-	 */
-	@NotNull
-	@Column(name = "parent_id")
-	private Long parentFuncId;
-
-	/**
-	 * 功能名称
-	 */
-	@NotNull
-	private String funcName;
+	@Id
+	@Column(name = "function_id")
+	private Long funcId;
 
-	/**
-	 * 描述
-	 */
-	@NotNull
-	private String description;
+	public Long getOrgId() {
+		return orgId;
+	}
 
-	/**
-	 * 权重
-	 */
-	@NotNull
-	private int weigth;
+	public void setOrgId(Long orgId) {
+		this.orgId = orgId;
+	}
 
 	public Long getFuncId() {
 		return funcId;
@@ -67,74 +45,4 @@ public class OrgFunction implements Serializable, TreeNode {
 		this.funcId = funcId;
 	}
 
-	public String getFuncCode() {
-		return funcCode;
-	}
-
-	public void setFuncCode(String funcCode) {
-		this.funcCode = funcCode;
-	}
-
-	public Long getParentFuncId() {
-		return parentFuncId;
-	}
-
-	public void setParentFuncId(Long parentFuncId) {
-		this.parentFuncId = parentFuncId;
-	}
-
-	public String getFuncName() {
-		return funcName;
-	}
-
-	public void setFuncName(String funcName) {
-		this.funcName = funcName;
-	}
-
-	public String getDescription() {
-		return description;
-	}
-
-	public void setDescription(String description) {
-		this.description = description;
-	}
-
-	public int getWeigth() {
-		return weigth;
-	}
-
-	public void setWeigth(int weigth) {
-		this.weigth = weigth;
-	}
-
-	@Override
-	public String getId() {
-		return String.valueOf(this.funcId);
-	}
-
-	@Override
-	public void setId(String id) {
-		this.funcId = Long.parseLong(id);
-	}
-
-	@Override
-	public String getName() {
-		return this.funcName;
-	}
-
-	@Override
-	public void setName(String name) {
-		this.funcName = name;
-	}
-
-	@Override
-	public String getParentId() {
-		return String.valueOf(this.parentFuncId);
-	}
-
-	@Override
-	public void setParentId(String parentId) {
-		this.parentFuncId = Long.parseLong(parentId);
-	}
-
 }

examcloud-core-basic-dao/src/main/java/cn/com/qmth/examcloud/core/basic/dao/entity/OrgFunctionPK.java

@@ -0,0 +1,35 @@
+package cn.com.qmth.examcloud.core.basic.dao.entity;
+
+import java.io.Serializable;
+
+/**
+ * 机构功能关联 PK
+ * 
+ * @author wang wei
+ * @date 2018年4月9日
+ */
+public class OrgFunctionPK implements Serializable {
+
+	private static final long serialVersionUID = -4200806793260092705L;
+
+	private Long orgId;
+
+	private Long funcId;
+
+	public Long getOrgId() {
+		return orgId;
+	}
+
+	public void setOrgId(Long orgId) {
+		this.orgId = orgId;
+	}
+
+	public Long getFuncId() {
+		return funcId;
+	}
+
+	public void setFuncId(Long funcId) {
+		this.funcId = funcId;
+	}
+
+}

examcloud-core-basic-service/src/main/java/cn/com/qmth/examcloud/core/basic/service/UserService.java

@@ -0,0 +1,24 @@
+package cn.com.qmth.examcloud.core.basic.service;
+
+import cn.com.qmth.examcloud.core.basic.dao.entity.User;
+
+/**
+ * 用户服务
+ * 
+ * @author WANGWEI
+ *
+ */
+public interface UserService {
+
+	/**
+	 * 查询用户
+	 *
+	 * @author WANGWEI
+	 * @param rootOrgId
+	 * @param loginName
+	 * @return
+	 */
+	User getUser(Long rootOrgId, String loginName);
+	
+
+}

examcloud-core-basic-service/src/main/java/cn/com/qmth/examcloud/core/basic/service/impl/OrgService.java

@@ -137,6 +137,8 @@ public class OrgService {
 		org.setTelphone(orgDto.getTelphone());
 		org.setCreateTime(new Date());
 		org.setEnable(true);
+		//添加机构类型
+		org.setType(OrgType.SCHOOL);
 		return org;
 	}
 

examcloud-core-basic-service/src/main/java/cn/com/qmth/examcloud/core/basic/service/impl/StudentService.java

@@ -45,7 +45,7 @@ public class StudentService {
     UserRepo userRepo;
 
     @Autowired
-    UserService userService;
+    UserServiceImpl userService;
 
     @Autowired
     OrgRepo orgRepo;

examcloud-core-basic-service/src/main/java/cn/com/qmth/examcloud/core/basic/service/impl/UserService.java → examcloud-core-basic-service/src/main/java/cn/com/qmth/examcloud/core/basic/service/impl/UserServiceImpl.java

@@ -9,16 +9,18 @@ import java.util.Map;
 import java.util.Set;
 import java.util.stream.Collectors;
 
-import javax.persistence.criteria.*;
+import javax.persistence.criteria.Join;
+import javax.persistence.criteria.Predicate;
 
 import org.apache.commons.lang.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.data.domain.*;
+import org.springframework.data.domain.Page;
+import org.springframework.data.domain.PageImpl;
+import org.springframework.data.domain.Pageable;
 import org.springframework.data.jpa.domain.Specification;
 import org.springframework.data.redis.core.RedisTemplate;
 import org.springframework.stereotype.Service;
 
-import ch.qos.logback.core.net.LoginAuthenticator;
 import cn.com.qmth.examcloud.common.uac.AccessCtrlUtil;
 import cn.com.qmth.examcloud.common.uac.AccessUserOps;
 import cn.com.qmth.examcloud.common.uac.AccessUserOpsForRedis;
@@ -37,9 +39,9 @@ import cn.com.qmth.examcloud.core.basic.dao.entity.User;
 import cn.com.qmth.examcloud.core.basic.dao.entity.UserLogin;
 import cn.com.qmth.examcloud.core.basic.dao.entity.UserOpsLog;
 import cn.com.qmth.examcloud.core.basic.dao.entity.UserRole;
-import cn.com.qmth.examcloud.core.basic.dao.enums.OrgType;
 import cn.com.qmth.examcloud.core.basic.dao.enums.UserScope;
 import cn.com.qmth.examcloud.core.basic.dao.enums.UserType;
+import cn.com.qmth.examcloud.core.basic.service.UserService;
 import cn.com.qmth.examcloud.core.basic.service.bean.UserInfo;
 
 /**
@@ -47,7 +49,7 @@ import cn.com.qmth.examcloud.core.basic.service.bean.UserInfo;
  * Created by songyue on 17/1/13.
  */
 @Service
-public class UserService {
+public class UserServiceImpl  implements UserService{
 
     @Autowired
     UserRepo userRepo;
@@ -75,7 +77,7 @@ public class UserService {
     AccessUserOps accessUserOps;
 
     @Autowired
-    public UserService(RedisTemplate redisTemplate){
+    public UserServiceImpl(RedisTemplate redisTemplate){
         this.redisTemplate = redisTemplate;
         this.accessUserOps = new AccessUserOpsForRedis(redisTemplate);
     }
@@ -471,4 +473,10 @@ public class UserService {
 		return userRepo.save(user);
 	}
 
+	@Override
+	public User getUser(Long rootOrgId, String loginName) {
+        User user = userRepo.findByRootOrgIdAndLoginName(rootOrgId,loginName);
+        return user;
+	}
+
 }

examcloud-core-basic-starter/src/main/resources/application-dev.properties

@@ -2,15 +2,15 @@ spring.datasource.url=jdbc:mysql://localhost:3306/exam_cloud_test?useUnicode=tru
 spring.datasource.username=root
 spring.datasource.password=root
 
-
 spring.redis.host=192.168.10.30
 spring.redis.port=6379
 
-spring.jpa.hibernate.format_sql=true
 eureka.client.serviceUrl.defaultZone=http://localhost:8761/eureka/
 
 spring.rabbitmq.host=192.168.10.30
 spring.rabbitmq.port=5672
 spring.rabbitmq.username=examcloud
 spring.rabbitmq.password=examcloud
-spring.rabbitmq.listener.acknowledgeMode=MANUAL
+spring.rabbitmq.listener.acknowledgeMode=MANUAL
+
+staticResource.rootPath=/home/qmth/project/examcloud/static

examcloud-core-basic-starter/src/main/resources/application-test.properties

@@ -13,4 +13,6 @@ spring.rabbitmq.host=localhost
 spring.rabbitmq.port=5672
 spring.rabbitmq.username=examcloud
 spring.rabbitmq.password=examcloud
-spring.rabbitmq.listener.acknowledgeMode=MANUAL
+spring.rabbitmq.listener.acknowledgeMode=MANUAL
+
+staticResource.rootPath=/home/qmth/project/examcloud/static

examcloud-core-basic-starter/src/main/resources/application.properties

@@ -1,31 +1,19 @@
 spring.profiles.active=dev
-spring.datasource.validation-query=SELECT 1 FROM DUAL
-spring.datasource.test-on-borrow=true
-spring.datasource.driver-class-name=com.mysql.jdbc.Driver
-
-#redis
-#spring.redis.host=192.168.199.102
-#spring.redis.port=32768
 
-#server.port=8080
+spring.application.name=ExamCloud-service-core
+server.port=8000
 
 
-#logging.file=d:/gkwb/logs/gkwb.log
-logging.level.org.springframework=ERROR
-logging.level.org.hibernate=ERROR
+spring.datasource.validation-query=SELECT 1 FROM DUAL
+spring.datasource.test-on-borrow=true
+spring.datasource.driver-class-name=com.mysql.jdbc.Driver
 
 spring.jpa.show-sql=false
 spring.jpa.hibernate.ddl-auto=update
 
-
 spring.http.multipart.max-file-size=10Mb
 
-spring.application.name=ExamCloud-service-core
-server.port=8000
-eureka.client.serviceUrl.defaultZone=http://localhost:1111/eureka/
 hystrix.command.default.execution.timeout.enabled=false
+
 app.api.root=/api/ecs_core
 url.prefix=/api/core/basic
-
-staticResource.rootPath=/home/qmth/project/examcloud/static
-

examcloud-core-basic-starter/src/main/resources/logback-spring.xml

@@ -40,6 +40,7 @@
 
 	<logger name="INTERFACE_LOGGER" level="DEBUG" additivity="false">
 		<appender-ref ref="INTERFACE_APPENDER" />
+		<appender-ref ref="STDOUT" />
 	</logger>
 
 	<logger name="org.hibernate.type.descriptor.sql.BasicBinder" level="TRACE" />