diff --git a/mallplus-admin/src/main/java/com/zscat/mallplus/ums/controller/SysMessageController.java b/mallplus-admin/src/main/java/com/zscat/mallplus/ums/controller/SysMessageController.java index 951a19b..7cac749 100644 --- a/mallplus-admin/src/main/java/com/zscat/mallplus/ums/controller/SysMessageController.java +++ b/mallplus-admin/src/main/java/com/zscat/mallplus/ums/controller/SysMessageController.java @@ -1,9 +1,12 @@ package com.zscat.mallplus.ums.controller; +import com.zscat.mallplus.ums.service.ISysMessageService; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; +import javax.annotation.Resource; + /** *
* 站内信 前端控制器
@@ -16,5 +19,8 @@ import org.springframework.web.bind.annotation.RestController;
@RequestMapping("/ums/sysMessage")
public class SysMessageController {
+ @Resource
+ private ISysMessageService messageService;
+
}
diff --git a/mallplus-admin/src/main/resources/application-dev.properties b/mallplus-admin/src/main/resources/application-dev.properties
index a48891e..233c9dc 100644
--- a/mallplus-admin/src/main/resources/application-dev.properties
+++ b/mallplus-admin/src/main/resources/application-dev.properties
@@ -18,11 +18,11 @@ spring.redis.pool.min-idle=0
# \u8FDE\u63A5\u8D85\u65F6\u65F6\u95F4\uFF08\u6BEB\u79D2\uFF09
spring.redis.timeout=0
#===redis end===
-#spring.datasource.url=jdbc:mysql://localhost:3306/mallplus1?autoReconnect=true&useUnicode=true&characterEncoding=UTF-8&zeroDateTimeBehavior=convertToNull&useSSL=false&useTimezone=true&serverTimezone=GMT%2B8
-spring.datasource.url=jdbc:mysql://127.0.0.1:3306/mallplus1?autoReconnect=true&useUnicode=true&characterEncoding=UTF-8&zeroDateTimeBehavior=convertToNull&useSSL=false&useTimezone=true&serverTimezone=GMT%2B8
+spring.datasource.url=jdbc:mysql://8.130.39.13:3306/mallplus1?autoReconnect=true&useUnicode=true&characterEncoding=UTF-8&zeroDateTimeBehavior=convertToNull&useSSL=false&useTimezone=true&serverTimezone=GMT%2B8
+#spring.datasource.url=jdbc:mysql://127.0.0.1:3306/mallplus1?autoReconnect=true&useUnicode=true&characterEncoding=UTF-8&zeroDateTimeBehavior=convertToNull&useSSL=false&useTimezone=true&serverTimezone=GMT%2B8
spring.datasource.username=root
#spring.datasource.password=root
-spring.datasource.password=root
+spring.datasource.password=1LAiGz$t1*Iw
spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver
spring.datasource.type=com.alibaba.druid.pool.DruidDataSource
spring.datasource.druid.initialSize=5
diff --git a/mallplusui-web-admin/src/api/ums/sysMessage.js b/mallplusui-web-admin/src/api/ums/sysMessage.js
new file mode 100644
index 0000000..26d9f31
--- /dev/null
+++ b/mallplusui-web-admin/src/api/ums/sysMessage.js
@@ -0,0 +1,81 @@
+import request from '@/utils/request'
+export function fetchList(params) {
+ return request({
+ url:'/ums/UmsMember/list',
+ method:'get',
+ params:params
+ })
+}
+export function createMember(data) {
+ return request({
+ url:'/ums/UmsMember/create',
+ method:'post',
+ data:data
+ })
+}
+export function updateShowStatus(data) {
+ return request({
+ url:'/ums/UmsMember/update/showStatus',
+ method:'post',
+ data:data
+ })
+}
+
+export function updateFactoryStatus(data) {
+ return request({
+ url:'/ums/UmsMember/update/factoryStatus',
+ method:'post',
+ data:data
+ })
+}
+
+export function deleteMember(id) {
+ return request({
+ url:'/ums/UmsMember/delete/'+id,
+ method:'get',
+ })
+}
+
+export function getMember(id) {
+ return request({
+ url:'/ums/UmsMember/'+id,
+ method:'get',
+ })
+}
+
+export function updateMember(data) {
+ return request({
+ url:'/ums/UmsMember/update',
+ method:'post',
+ data:data
+ })
+}
+export function updateMemberOrderInfo() {
+ return request({
+ url:'/ums/UmsMember/updateMemberOrderInfo',
+ method:'post'
+ })
+}
+
+export function fetchBlanceList(id) {
+ return request({
+ url:'/ums/UmsMember/fetchBlanceList/'+id,
+ method:'get',
+ })
+}
+
+export function handleEditBlance(data) {
+ return request({
+ url:'/ums/UmsMember/handleEditBlance',
+ method:'post',
+ data:data
+ })
+}
+
+export function handleEditIntegration(data) {
+ return request({
+ url:'/ums/UmsMember/handleEditIntegration',
+ method:'post',
+ data:data
+ })
+}
diff --git a/mallplusui-web-admin/src/views/pms/product/components/ProductAttrDetail.vue b/mallplusui-web-admin/src/views/pms/product/components/ProductAttrDetail.vue
index dd0f8d1..bd5e1d4 100644
--- a/mallplusui-web-admin/src/views/pms/product/components/ProductAttrDetail.vue
+++ b/mallplusui-web-admin/src/views/pms/product/components/ProductAttrDetail.vue
@@ -141,7 +141,8 @@