消息中心及文件管理器发布

Dockerfile

@@ -1,4 +1,4 @@
-FROM nginx:alpine
+FROM nginx:stable-alpine
 MAINTAINER wuyunfeng
 
 RUN mkdir -p /app/
@@ -7,7 +7,7 @@ COPY ./nginx.conf /etc/nginx/nginx.conf
 COPY ./set-envs.sh /app/set-envs.sh
 EXPOSE 443 80
 
-ENV OnlineSystemUrl=http://api.base.wdklian.com serverUrl=http://172.28.100.100:8005 DeviceUrl=http://172.28.100.100:8006 mediaUrl=http://172.28.100.100:8004 apiMode=dev uiVersion=1 enableBroadcast=false enableMobile=false enableEntraceguard=false enableNBiot=false enableCustomerDevice=false enableSosDevice=false enable485=false enableLinux=false
+ENV OnlineSystemUrl=http://api.base.wdklian.com serverUrl=http://172.28.100.100:8005 fileServer=http://172.28.100.100:5001 gateWayUrl=http://172.28.100.100:7030 DeviceUrl=http://172.28.100.100:8006 mediaUrl=http://172.28.100.100:8004 apiMode=dev uiVersion=1 enableBroadcast=false enableMobile=false enableEntraceguard=false enableNBiot=false enableCustomerDevice=false enableSosDevice=false enable485=false enableLinux=false
 RUN echo 'USERNAME=' $serverUrl ',DeviceUrl=' $DeviceUrl ',mediaUrl=' $mediaUrl',apiMode=' $apiMode ',uiVersion=' $uiVersion
 #CMD sh -c "sed -i 's/^.*8006.*$/serverUrl=$serverUrl' domain.js"
 RUN ["chmod", "777", "/app/domain.js"]

nginx.conf

@@ -29,7 +29,7 @@ http {
 
     #keepalive_timeout  0;
     keepalive_timeout  65;
-    client_max_body_size 10m;
+    client_max_body_size 20G;
     gzip on;
     gzip_min_length  5k;
     gzip_buffers     4 16k;

package.json

@@ -24,11 +24,13 @@
     "@editorjs/warning": "^1.4.0",
     "@moefe/vue-aplayer": "^2.0.0-beta.5",
     "@toast-ui/editor": "^3.1.3",
+    "@uppy/core": "^3.11.3",
     "@uppy/locales": "^3.5.2",
+    "@uppy/xhr-upload": "^3.6.6",
     "@videojs/themes": "^1.0.1",
     "@wangeditor/editor": "^5.1.23",
     "@wangeditor/editor-for-vue": "^1.0.2",
-    "ace-builds": "^1.32.7",
+    "ace-builds": "^1.33.2",
     "ag-grid-community": "^25.0.0",
     "ag-grid-vue": "^25.0.0",
     "axios": "0.18.1",

public/domain.js

@@ -1,10 +1,10 @@
 const domain = {
-  serverUrl: 'http://192.168.1.198:8005',
-  DeviceUrl: 'http://192.168.1.198:8006',
-  mediaUrl: 'http://192.168.1.198:8004',
+  serverUrl: 'http://8.129.220.143:8005',
+  DeviceUrl: 'http://8.129.220.143:8006',
+  mediaUrl: 'http://8.129.220.143:8004',
   OnlineSystemUrl: 'http://api.base.wdklian.com',
-  gateWayUrl:'http://192.168.1.198:8889',
-  fileServer: 'http://192.168.1.54:5001',
+  gateWayUrl:'http://8.129.220.143:8014',
+  fileServer: 'http://8.129.220.143:8012',
   apiMode: 'dev',
   uiVersion: 1, // 1 医院版，2 月子中心版,3养老院版
   enableBroadcast: true, //广播使能

set-envs.sh

@@ -3,6 +3,8 @@ echo "const domain = {
   DeviceUrl: '${DeviceUrl}',
   mediaUrl: '${mediaUrl}',
   OnlineSystemUrl: '${OnlineSystemUrl}',
+  gateWayUrl: '${gateWayUrl}', //网关地址
+  fileServer: '${fileServer}',//文件服务地址
   apiMode: '${apiMode}',
   uiVersion: ${uiVersion}, // 1 医院版，2 月子中心版,3养老院版
   enableBroadcast: ${enableBroadcast}, //广播使能

src/main.js

@@ -58,9 +58,9 @@ import Grid from 'vant/lib/grid'
 import GridItem from 'vant/lib/grid-item'
 import 'vant/lib/grid/style'
 import 'vant/lib/grid-item/style'
-// ace 编辑器
-import ace from 'ace-builds'
-Vue.use(ace)
+// // ace 编辑器
+// import ace from 'ace-builds'
+// Vue.use(ace)
 import VueFinder from '@/components/FileManager/index.js'
 
 Vue.prototype.$echarts = echarts

src/views/message-center/message-template/index.vue

@@ -120,7 +120,9 @@ export default {
       formshow: false,
       /** 频道订阅设置 */
       formSubscribe: false,
-      formmodel: {},
+      formmodel: {
+        part_id:this.$store.getters.partId
+      },
       frameGroups: [],
       rules: {
         template_title: [
@@ -369,7 +371,10 @@ export default {
     createMessageType() {
       this.formshow = true
       this.formmodel = {
+        part_id:Number(this.$store.getters.partId),
+        bool_shared:false
       }
+      console.log(this.formmodel)
       this.formtitle=this.$t('mc.messageTemplateModule.addMessageTemplate')
     },
     /** 分页大小发生改变 */

src/views/message-center/messages/message-edit.vue

@@ -244,7 +244,7 @@ export default {
     fileSelect(items, event) {
       this.customerFormVisible = false
       const imageBlock = this.editjs.blocks.getById(this.imageBlockId);
-      imageBlock.call('changeImageUrl', 'http://192.168.1.54:5001' + items[0].href)
+      imageBlock.call('changeImageUrl', domain.fileServer + items[0].href)
       // imageBlock.call('afterRender')
     },