From cd41350122ad79f50a3090b0e41e537e4b5cdb0d Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期一, 16 六月 2025 15:11:26 +0800
Subject: [PATCH] 提交一把订单
---
company/src/components/business/OperaSolutionsDescWindow.vue | 4 +-
company/src/views/business/solutions.vue | 2
server/service/src/main/java/com/doumee/config/shiro/ShiroConfig.java | 1
server/service/src/main/resources/application-dev.yml | 18 +++++++-
server/service/src/main/resources/application-pro.yml | 8 ++-
server/service/src/main/resources/application-test.yml | 12 +++++-
server/shop/src/main/java/com/doumee/api/common/PublicController.java | 16 ++++++--
company/package.json | 1
8 files changed, 47 insertions(+), 15 deletions(-)
diff --git a/company/package.json b/company/package.json
index 02d49fc..623450f 100644
--- a/company/package.json
+++ b/company/package.json
@@ -6,6 +6,7 @@
"serve": "vue-cli-service serve",
"serveshop": "vue-cli-service serve --mode developmentShop",
"servecom": "vue-cli-service serve --mode developmentCom",
+ "servecompro": "vue-cli-service serve --mode productionCom",
"test": "vue-cli-service serve --mode test",
"testshop": "vue-cli-service serve --mode testShop",
"testcom": "vue-cli-service serve --mode testCom",
diff --git a/company/src/components/business/OperaSolutionsDescWindow.vue b/company/src/components/business/OperaSolutionsDescWindow.vue
index 67a8b60..ae4565e 100644
--- a/company/src/components/business/OperaSolutionsDescWindow.vue
+++ b/company/src/components/business/OperaSolutionsDescWindow.vue
@@ -10,10 +10,10 @@
<div class="info">
<div class="info_list">
<div class="info_list_item">
- <div class="info_list_item_label">瀛愭柟妗堬細</div>
+ <div class="info_list_item_label">{{userInfo.type!=1?'瀛愭柟妗堬細':'鏂规锛�'}}</div>
<div class="info_list_item_val">{{form.name}}</div>
</div>
- <div class="info_list_item">
+ <div class="info_list_item" v-if="userInfo.type !== 1">
<div class="info_list_item_label">涓绘柟妗堬細</div>
<div class="info_list_item_val"><a @click="$refs.operaSolutionsBaseDescWindow.open('涓绘柟妗堣鎯�', { id: form.parentId })" style="cursor: pointer;color: #2E68EC;">{{form.solutionBaseName}}</a></div>
</div>
diff --git a/company/src/views/business/solutions.vue b/company/src/views/business/solutions.vue
index bccc8f6..fce885a 100644
--- a/company/src/views/business/solutions.vue
+++ b/company/src/views/business/solutions.vue
@@ -90,7 +90,7 @@
fixed="right"
>
<template slot-scope="{row}">
- <el-button type="text" @click="$refs.OperaSolutionsDescWindow.open('瀛愭柟妗堣鎯�', { id: row.id })" icon="el-icon-edit" v-permissions="['business:solutions:update']">鏌ョ湅璇︽儏</el-button>
+ <el-button type="text" @click="$refs.OperaSolutionsDescWindow.open(userInfo.type !== 1?'瀛愭柟妗堣鎯�':'鏂规璇︽儏 ', { id: row.id })" icon="el-icon-edit" v-permissions="['business:solutions:update']">鏌ョ湅璇︽儏</el-button>
<template v-if="userInfo.type !== 1">
<el-button type="text" @click="$refs.operaSolutionsWindow.open('缂栬緫瀛愭柟妗�', { id: row.id })" icon="el-icon-edit" v-permissions="['business:solutions:update']">淇敼</el-button>
</template>
diff --git a/server/service/src/main/java/com/doumee/config/shiro/ShiroConfig.java b/server/service/src/main/java/com/doumee/config/shiro/ShiroConfig.java
index 5a10b6a..3ce1fa3 100644
--- a/server/service/src/main/java/com/doumee/config/shiro/ShiroConfig.java
+++ b/server/service/src/main/java/com/doumee/config/shiro/ShiroConfig.java
@@ -89,6 +89,7 @@
Map<String, String> map = new LinkedHashMap<>();
// 璺緞鎷︽埅閰嶇疆
map.put("/system/login", "anon");
+ map.put("/public/testEmail", "anon");
map.put("/system/loginByPhone", "anon");
map.put("/system/loginByWxMini", "anon");
map.put("/system/logout", "anon");
diff --git a/server/service/src/main/resources/application-dev.yml b/server/service/src/main/resources/application-dev.yml
index 8b1dec0..7f22f07 100644
--- a/server/service/src/main/resources/application-dev.yml
+++ b/server/service/src/main/resources/application-dev.yml
@@ -18,11 +18,23 @@
password: Doumee@168&QWERT
driver-class-name: com.mysql.cj.jdbc.Driver
type: com.alibaba.druid.pool.DruidDataSource
+# mail:
+# host: smtp.exmail.qq.com
+# username: jp@doumee.com
+# password: p7iKUE8VvQQpY58S
+# default-encoding: UTF-8
+# properties:
+# mail:
+# smtp:
+# auth: true
+# starttls:
+# enable: true
+# required: true
mail:
- host: smtp.exmail.qq.com
- username: jp@doumee.com
- password: p7iKUE8VvQQpY58S
default-encoding: UTF-8
+ host: smtp.exmail.qq.com
+ username: kefu@yyb.red
+ password: 5CGaprcdshS7bHaM
properties:
mail:
smtp:
diff --git a/server/service/src/main/resources/application-pro.yml b/server/service/src/main/resources/application-pro.yml
index 5ab2444..fed6c27 100644
--- a/server/service/src/main/resources/application-pro.yml
+++ b/server/service/src/main/resources/application-pro.yml
@@ -21,13 +21,15 @@
mail:
default-encoding: UTF-8
host: smtp.exmail.qq.com
- username: service@yyb.red
- password: yyb@2025
- port: 587
+ username: kefu@yyb.red
+ password: 5CGaprcdshS7bHaM
properties:
mail:
smtp:
auth: true
+ starttls:
+ enable: true
+ required: true
redis:
# database: 0
diff --git a/server/service/src/main/resources/application-test.yml b/server/service/src/main/resources/application-test.yml
index 828e620..a9179b4 100644
--- a/server/service/src/main/resources/application-test.yml
+++ b/server/service/src/main/resources/application-test.yml
@@ -19,9 +19,17 @@
driver-class-name: com.mysql.cj.jdbc.Driver
type: com.alibaba.druid.pool.DruidDataSource
mail:
+ default-encoding: UTF-8
host: smtp.exmail.qq.com
- username: jp@doumee.com
- password: Jiangping0427
+ username: kefu@yyb.red
+ password: 5CGaprcdshS7bHaM
+ properties:
+ mail:
+ smtp:
+ auth: true
+ starttls:
+ enable: true
+ required: true
redis:
# database: 0
host: 127.0.0.1
diff --git a/server/shop/src/main/java/com/doumee/api/common/PublicController.java b/server/shop/src/main/java/com/doumee/api/common/PublicController.java
index d8754cb..3a5b382 100644
--- a/server/shop/src/main/java/com/doumee/api/common/PublicController.java
+++ b/server/shop/src/main/java/com/doumee/api/common/PublicController.java
@@ -5,9 +5,12 @@
import com.doumee.biz.system.SystemDictDataBiz;
import com.doumee.core.annotation.excel.ExcelToPdfTool;
import com.doumee.core.annotation.trace.Trace;
+import com.doumee.core.model.ApiResponse;
import com.doumee.core.utils.Constants;
import com.doumee.core.utils.DateUtil;
import com.doumee.core.utils.aliyun.ALiYunUtil;
+import com.doumee.dao.business.model.SmsEmail;
+import com.doumee.service.business.third.EmailService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
@@ -15,10 +18,7 @@
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
import org.springframework.web.multipart.MultipartHttpServletRequest;
import org.springframework.web.multipart.commons.CommonsMultipartResolver;
@@ -47,12 +47,20 @@
@Autowired
private SystemDictDataBiz systemDictDataBiz;
+ @Autowired
+ private EmailService emailService;
@ApiOperation("娴嬭瘯")
@PostMapping("/testPdf")
public String testPdf(@RequestParam Map<String,String> req, HttpServletResponse response) {
ExcelToPdfTool.excelToPdf(req.get("f1"),req.get("f2"));
return JSONObject.toJSONString(req);
}
+ @ApiOperation("娴嬭瘯閭")
+ @PostMapping("/testEmail")
+ public ApiResponse<Boolean> testEmail(@RequestBody SmsEmail smsEmail, HttpServletResponse response) {
+ boolean result= emailService.sendEmail(smsEmail.getEmail(),smsEmail.getTitle(),smsEmail.getContent(),smsEmail.getFileList());
+ return ApiResponse.success(result);
+ }
@ApiOperation(value = "涓婁紶", notes = "涓婁紶", httpMethod = "POST", position = 6)
@ApiImplicitParams({
--
Gitblit v1.9.3