Merge branch 'gva_gormv2_dev' of https://github.com/flipped-aurora/gin-vue-admin into gva_gormv2_dev

web/.env.production

@@ -1,2 +1,2 @@
 ENV = 'production'
-VUE_APP_BASE_API = '/v1'
+VUE_APP_BASE_API = '/api'

web/babel.config.js

@@ -1,5 +1,5 @@
 module.exports = {
   presets: [
-    '@vue/app'
+    '@vue/cli-plugin-babel/preset'
   ]
 }

web/package.json

@@ -10,7 +10,7 @@
   "dependencies": {
     "@moefe/vue-aplayer": "^2.0.0-beta.5",
     "axios": "^0.19.0",
-    "core-js": "^2.6.5",
+    "core-js": "^3.6.5",
     "echarts": "^4.7.0",
     "element-ui": "^2.12.0",
     "mavon-editor": "^2.7.7",
@@ -33,12 +33,12 @@
     "vuex-persist": "^2.1.0"
   },
   "devDependencies": {
-    "@vue/cli-plugin-babel": "^3.11.0",
-    "@vue/cli-plugin-eslint": "^3.11.0",
-    "@vue/cli-service": "^3.11.0",
-    "babel-eslint": "^10.0.1",
-    "eslint": "^5.16.0",
-    "eslint-plugin-vue": "^5.0.0",
+    "@vue/cli-plugin-babel": "^4.5.6",
+    "@vue/cli-plugin-eslint": "^4.5.6",
+    "@vue/cli-service": "^4.5.6",
+    "babel-eslint": "^10.1.0",
+    "eslint": "^6.7.2",
+    "eslint-plugin-vue": "^6.2.2",
     "vue-template-compiler": "^2.6.10"
   },
   "eslintConfig": {

web/src/api/email.js

@@ -0,0 +1,15 @@
+import service from '@/utils/request'
+
+// @Tags email
+// @Summary 发送测试邮件
+// @Security ApiKeyAuth
+// @Produce  application/json
+// @Success 200 {string} string "{"success":true,"data":{},"msg":"返回成功"}"
+// @Router /email/emailTest [post]
+export const emailTest = (data) => {
+    return service({
+        url: "/email/emailTest",
+        method: 'post',
+        data
+    })
+}

web/src/view/systemTools/system/system.vue

@@ -75,9 +75,6 @@
 				<el-form-item label="本地或七牛云">
 					<el-checkbox v-model="config.localUpload.local">本地</el-checkbox>
 				</el-form-item>
-				<el-form-item label="本地头像路径">
-					<el-input v-model="config.localUpload.avatarPath"></el-input>
-				</el-form-item>
 				<el-form-item label="本地文件路径">
 					<el-input v-model="config.localUpload.filePath"></el-input>
 				</el-form-item>
@@ -105,6 +102,31 @@
 			<el-form-item label="logFile">
 				<el-checkbox v-model="config.log.logFile"></el-checkbox>
 			</el-form-item>
+			<h2>邮箱配置</h2>
+			<el-form-item label="emailFrom">
+				<el-input v-model="config.email.emailFrom"></el-input>
+			</el-form-item>
+			<el-form-item label="emailNickName">
+				<el-input v-model="config.email.emailNickName"></el-input>
+			</el-form-item>
+			<el-form-item label="emailSecret">
+				<el-input v-model="config.email.emailSecret"></el-input>
+			</el-form-item>
+			<el-form-item label="emailTo">
+				<el-input v-model="config.email.emailTo" placeholder="可多个，以逗号分隔"></el-input>
+			</el-form-item>
+			<el-form-item label="emailHost">
+				<el-input v-model="config.email.emailHost"></el-input>
+			</el-form-item>
+			<el-form-item label="emailPort">
+				<el-input v-model.number="config.email.emailPort"></el-input>
+			</el-form-item>
+			<el-form-item label="emailIsSSL">
+				<el-checkbox v-model="config.email.emailIsSSL"></el-checkbox>
+			</el-form-item>
+			<el-form-item label="测试邮件">
+				<el-button @click="email">测试邮件</el-button>
+			</el-form-item>
 			<el-form-item>
 				<el-button @click="update" type="primary">立即更新</el-button>
 				<el-button @click="reload" type="primary">重启服务（开发中）</el-button>
@@ -115,6 +137,7 @@
 
 <script>
 import { getSystemConfig, setSystemConfig } from "@/api/system";
+import { emailTest } from "@/api/email";
 export default {
   name: "Config",
   data() {
@@ -129,7 +152,8 @@ export default {
         qiniu: {},
         captcha: {},
 		log: {},
-		localUpload: {}
+		localUpload: {},
+		email: {},
       }
     };
   },
@@ -153,6 +177,21 @@ export default {
         });
         await this.initForm();
       }
+    },
+    async email() {
+      const res = await emailTest();
+      if (res.code == 0) {
+        this.$message({
+          type: "success",
+          message: "邮件发送成功"
+        });
+        await this.initForm();
+      } else {
+		this.$message({
+          type: "error",
+          message: "邮件发送失败"
+        });
+	  }
     }
   }
 };

web/vue.config.js

@@ -51,10 +51,10 @@ module.exports = {
             })
             .end()
         config
-            // https://webpack.js.org/configuration/devtool/#development
+        // https://webpack.js.org/configuration/devtool/#development
             .when(process.env.NODE_ENV === 'development',
-                config => config.devtool('cheap-source-map')
-            )
+            config => config.devtool('cheap-source-map')
+        )
 
         config
             .when(process.env.NODE_ENV !== 'development',
@@ -64,7 +64,7 @@ module.exports = {
                         .after('html')
                         .use('script-ext-html-webpack-plugin', [{
                             // `runtime` must same as runtimeChunk name. default is `runtime`
-                            inline: /runtime\..*\.js$/
+                            inline: /single\..*\.js$/
                         }])
                         .end()
                     config
@@ -95,4 +95,4 @@ module.exports = {
                 }
             )
     }
-}
+}