Merge branch 'master' of yb/eccs into master

eccs-admin/src/main/resources/application-prod.yml

@@ -10,11 +10,11 @@ spring:
     # 地址
     host: 120.78.152.8
     # 端口，默认为6379
-    port: 6379
+    port: 7379
     # 数据库索引
     database: 0
     # 密码
-    password:
+    password: Abc-123#*.-
     # 连接超时时间
     timeout: 10s
     lettuce:
@@ -104,3 +104,5 @@ logging:
   level:
     com.emato: info
     org.springframework: warn
+  file:
+    path: /data/eccs/logs

eccs-admin/src/main/resources/application-test.yml

@@ -10,17 +10,17 @@ spring:
     # 地址
     host: 120.78.152.8
     # 端口，默认为6379
-    port: 6379
+    port: 7379
     # 数据库索引
     database: 0
     # 密码
-    password:
+    password: Abc-123#*.-
     # 连接超时时间
     timeout: 10s
     lettuce:
       pool:
         # 连接池中的最小空闲连接
-        min-idle: 0
+        min-idle: 5
         # 连接池中的最大空闲连接
         max-idle: 8
         # 连接池的最大数据库连接数
@@ -104,3 +104,5 @@ logging:
   level:
     com.emato: debug
     org.springframework: info
+  file:
+    path: /data/eccs/logs

eccs-admin/src/main/resources/application.yml

@@ -37,7 +37,7 @@ spring:
     # 国际化资源文件路径
     basename: i18n/messages
   profiles: 
-    active: dev
+    active: test
   # 文件上传
   servlet:
      multipart:

eccs-admin/src/main/resources/logback.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <configuration>
     <!-- 日志存放路径 -->
-	<property name="log.path" value="/home/cadmin/logs" />
+	<property name="log.path" value="/data/eccs/logs" />
     <!-- 日志输出格式 -->
 	<property name="log.pattern" value="%d{HH:mm:ss.SSS} [%thread] %-5level %logger{20} - [%method,%line] - %msg%n" />
 

eccs-common/src/main/java/com/emato/common/core/domain/entity/SysUser.java

@@ -33,11 +33,11 @@ public class SysUser extends BaseEntity
     private Long deptId;
 
     /** 用户账号 */
-    @Excel(name = "登录名称")
+    @Excel(name = "用户名称")
     private String userName;
 
     /** 用户昵称 */
-    @Excel(name = "用户名称")
+    @Excel(name = "用户昵称")
     private String nickName;
 
     /** 用户邮箱 */

eccs-ui/.env.development

@@ -2,7 +2,7 @@
 ENV = 'development'
 
 # ECCS/开发环境
-VUE_APP_BASE_API = '/dev-api'
+VUE_APP_BASE_API = '/eccs/dev-api'
 
 # 路由懒加载
 VUE_CLI_BABEL_TRANSPILE_MODULES = true

eccs-ui/.env.production

@@ -2,4 +2,4 @@
 ENV = 'production'
 
 # ECCS/生产环境
-VUE_APP_BASE_API = '/prod-api'
+VUE_APP_BASE_API = '/eccs/prod-api'

eccs-ui/.env.staging

@@ -4,4 +4,4 @@ NODE_ENV = production
 ENV = 'staging'
 
 # ECCS/测试环境
-VUE_APP_BASE_API = '/stage-api'
+VUE_APP_BASE_API = '/eccs/stage-api'

eccs-ui/src/utils/request.js

@@ -10,7 +10,7 @@ const service = axios.create({
   // axios中请求配置有baseURL选项，表示请求URL公共部分
   baseURL: process.env.VUE_APP_BASE_API,
   // 超时
-  timeout: 10000
+  timeout: 36000 * 1000
 })
 // request拦截器
 service.interceptors.request.use(config => {

eccs-ui/src/views/login.vue

@@ -65,8 +65,8 @@ export default {
       codeUrl: "",
       cookiePassword: "",
       loginForm: {
-        username: "admin",
-        password: "admin123",
+        username: "",
+        password: "",
         rememberMe: false,
         code: "",
         uuid: ""

eccs-ui/src/views/system/user/index.vue

@@ -424,6 +424,9 @@ export default {
         password: [
           { required: true, message: "用户密码不能为空", trigger: "blur" }
         ],
+        deptId: [
+          { required: true, message: "请选择部门", trigger: "blur" }
+        ],
         email: [
           {
             type: "email",
@@ -657,4 +660,4 @@ export default {
     }
   }
 };
-</script>
+</script>