Merge remote-tracking branch 'origin/master' into feature/bpm-back

Author: cuicui

.env.development renamed to .env.dev

@@ -5,8 +5,7 @@ ENV = 'development'
 VUE_APP_TITLE = 芋道管理系统
 
 # 芋道管理系统/开发环境
-VUE_APP_BASE_API = '/dev-api'
-# VUE_APP_BASE_API = '/api'
+VUE_APP_BASE_API = 'http://192.168.225.2'
 
 # 路由懒加载
 VUE_CLI_BABEL_TRANSPILE_MODULES = true

.env.local

@@ -0,0 +1,20 @@
+# 开发环境配置
+ENV = 'development'
+
+# 页面标题
+VUE_APP_TITLE = 芋道管理系统
+
+# 芋道管理系统/本地环境
+VUE_APP_BASE_API = '/dev-api'
+
+# 路由懒加载
+VUE_CLI_BABEL_TRANSPILE_MODULES = true
+
+# 多租户的开关
+VUE_APP_TENANT_ENABLE = true
+
+# 文档的开关
+VUE_APP_DOC_ENABLE = true
+
+# 百度统计
+VUE_APP_BAIDU_CODE = fadc1bd5db1a1d6f581df60a1807f8ab

.env.production renamed to .env.prod

@@ -1,13 +1,15 @@
 {
   "name": "yudao-ui-admin",
-  "version": "1.6.1-snapshot",
+  "version": "1.6.2-snapshot",
   "description": "芋道管理系统",
   "author": "芋道",
   "license": "MIT",
   "scripts": {
-    "dev": "vue-cli-service serve",
-    "build:prod": "vue-cli-service build",
-    "build:stage": "vue-cli-service build --mode staging",
+    "local": "vue-cli-service serve --mode local",
+    "dev": "vue-cli-service serve --mode dev",
+    "build:prod": "vue-cli-service build --mode prod",
+    "build:stage": "vue-cli-service build --mode stage",
+    "build:dev": "vue-cli-service build --mode dev",
     "build:demo1024": "vue-cli-service build --mode demo1024",
     "preview": "node build/index.js --preview",
     "lint": "eslint --ext .js,.vue src"

.env.staging renamed to .env.stage

@@ -73,26 +73,11 @@ export function getSchemaTableList(query) {
 }
 
 // 基于数据库的表结构，创建代码生成器的表定义
-export function createCodegenListFromDB(tableNames) {
+export function createCodegenList(data) {
   return request({
-    url: '/infra/codegen/create-list-from-db',
+    url: '/infra/codegen/create-list',
     method: 'post',
-    headers:{
-      'Content-type': 'application/x-www-form-urlencoded'
-    },
-    data: 'tableNames=' + tableNames
-  })
-}
-
-// 基于 SQL 建表语句，创建代码生成器的表定义
-export function createCodegenListFromSQL(data) {
-  return request({
-    url: '/infra/codegen/create-list-from-sql',
-    method: 'post',
-    headers:{
-      'Content-type': 'application/x-www-form-urlencoded'
-    },
-    data: 'sql=' + data.sql,
+    data: data
   })
 }
 

package.json

@@ -0,0 +1,43 @@
+import request from '@/utils/request'
+
+// 创建数据源配置
+export function createDataSourceConfig(data) {
+  return request({
+    url: '/infra/data-source-config/create',
+    method: 'post',
+    data: data
+  })
+}
+
+// 更新数据源配置
+export function updateDataSourceConfig(data) {
+  return request({
+    url: '/infra/data-source-config/update',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除数据源配置
+export function deleteDataSourceConfig(id) {
+  return request({
+    url: '/infra/data-source-config/delete?id=' + id,
+    method: 'delete'
+  })
+}
+
+// 获得数据源配置
+export function getDataSourceConfig(id) {
+  return request({
+    url: '/infra/data-source-config/get?id=' + id,
+    method: 'get'
+  })
+}
+
+// 获得数据源配置列表
+export function getDataSourceConfigList() {
+  return request({
+    url: '/infra/data-source-config/list',
+    method: 'get',
+  })
+}

src/api/infra/codegen.js

@@ -9,7 +9,7 @@ export function login(username, password, code, uuid) {
     uuid
   }
   return request({
-    url: '/system/login',
+    url: '/system/auth/login',
     method: 'post',
     data: data
   })
@@ -18,7 +18,7 @@ export function login(username, password, code, uuid) {
 // 获取用户详细信息
 export function getInfo() {
   return request({
-    url: '/system/get-permission-info',
+    url: '/system/auth/get-permission-info',
     method: 'get'
   })
 }
@@ -43,15 +43,15 @@ export function getCodeImg() {
 // 社交授权的跳转
 export function socialAuthRedirect(type, redirectUri) {
   return request({
-    url: '/system/social-auth-redirect?type=' + type + '&redirectUri=' + redirectUri,
+    url: '/system/auth/social-auth-redirect?type=' + type + '&redirectUri=' + redirectUri,
     method: 'get'
   })
 }
 
-// 社交登录，使用 code 授权码
-export function socialLogin(type, code, state) {
+// 社交快捷登录，使用 code 授权码
+export function socialQuickLogin(type, code, state) {
   return request({
-    url: '/system/social-login',
+    url: '/system/auth/social-quick-login',
     method: 'post',
     data: {
       type,
@@ -61,10 +61,10 @@ export function socialLogin(type, code, state) {
   })
 }
 
-// 社交登录，使用 code 授权码 + + 账号密码
-export function socialLogin2(type, code, state, username, password) {
+// 社交绑定登录，使用 code 授权码 + + 账号密码
+export function socialBindLogin(type, code, state, username, password) {
   return request({
-    url: '/system/social-login2',
+    url: '/system/auth/social-bind-login',
     method: 'post',
     data: {
       type,
@@ -75,28 +75,3 @@ export function socialLogin2(type, code, state, username, password) {
     }
   })
 }
-
-// 社交绑定，使用 code 授权码
-export function socialBind(type, code, state) {
-  return request({
-    url: '/system/social-bind',
-    method: 'post',
-    data: {
-      type,
-      code,
-      state,
-    }
-  })
-}
-
-// 取消社交绑定
-export function socialUnbind(type, unionId) {
-  return request({
-    url: '/system/social-unbind',
-    method: 'delete',
-    data: {
-      type,
-      unionId
-    }
-  })
-}

src/api/infra/dataSourceConfig.js

@@ -3,7 +3,7 @@ import request from '@/utils/request'
 // 获取路由
 export const getRouters = () => {
   return request({
-    url: '/system/list-menus',
+    url: '/system/auth/list-menus',
     method: 'get'
   })
 }

src/api/login.js

@@ -0,0 +1,71 @@
+import request from '@/utils/request'
+import qs from 'qs'
+
+// 创建敏感词
+export function createSensitiveWord(data) {
+  return request({
+    url: '/system/sensitive-word/create',
+    method: 'post',
+    data: data
+  })
+}
+
+// 更新敏感词
+export function updateSensitiveWord(data) {
+  return request({
+    url: '/system/sensitive-word/update',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除敏感词
+export function deleteSensitiveWord(id) {
+  return request({
+    url: '/system/sensitive-word/delete?id=' + id,
+    method: 'delete'
+  })
+}
+
+// 获得敏感词
+export function getSensitiveWord(id) {
+  return request({
+    url: '/system/sensitive-word/get?id=' + id,
+    method: 'get'
+  })
+}
+
+// 获得敏感词分页
+export function getSensitiveWordPage(query) {
+  return request({
+    url: '/system/sensitive-word/page',
+    method: 'get',
+    params: query
+  })
+}
+
+// 导出敏感词 Excel
+export function exportSensitiveWordExcel(query) {
+  return request({
+    url: '/system/sensitive-word/export-excel',
+    method: 'get',
+    params: query,
+    responseType: 'blob'
+  })
+}
+
+// 获取所有敏感词的标签数组
+export function getSensitiveWordTags(){
+  return request({
+    url: '/system/sensitive-word/get-tags',
+    method: 'get'
+  })
+}
+
+// 获得文本所包含的不合法的敏感词数组
+export function validateText(query) {
+  return request({
+    url: '/system/sensitive-word/validate-text?' + qs.stringify(query, {arrayFormat: 'repeat'}),
+    method: 'get',
+  })
+}