1. add image security check

2. package all images without networking
orangeshine · Jan 15, 2020 · f99bd9d · f99bd9d
1 parent fb0fee1
commit f99bd9d
Show file tree

Hide file tree

Showing 10 changed files with 133 additions and 45 deletions.
diff --git a/App.vue b/App.vue
@@ -9,6 +9,13 @@
 		},
 		onLaunch: function() {
 			console.log('App Launch');
+			if (!wx.cloud) {
+				console.error('请使用 2.2.3 或以上的基础库以使用云能力');
+			} else {
+				wx.cloud.init({
+					traceUser: true
+				});
+			}
 		},
 		onShow: function() {
 			console.log('App Show');

diff --git a/functions/contentCheck/config.json b/functions/contentCheck/config.json
@@ -0,0 +1,8 @@
+{
+    "permissions": {
+        "openapi": [
+            "security.msgSecCheck",
+            "security.imgSecCheck"
+        ]
+    }
+}
diff --git a/functions/contentCheck/index.js b/functions/contentCheck/index.js
@@ -0,0 +1,39 @@
+const cloud = require('wx-server-sdk');
+cloud.init();
+exports.main = async (event, context) => {
+	console.log(event.txt);
+	const {
+		value,
+		txt
+	} = event;
+	try {
+		let msgR = false;
+		let imageR = false;
+		//检查 文字内容是否违规
+		if (txt) {
+			msgR = await cloud.openapi.security.msgSecCheck({
+				content: txt
+			})
+		}
+		//检查 图片内容是否违规
+		if (value) {
+			imageR = await cloud.openapi.security.imgSecCheck({
+				media: {
+					header: {
+						'Content-Type': 'application/octet-stream'
+					},
+					contentType: 'image/png',
+					value: Buffer.from(value)
+				}
+			})
+		}
+		return {
+			msgR, //内容检查返回值
+			imageR //图片检查返回值
+		};
+	} catch (err) {
+		// 错误处理
+		// err.errCode !== 0
+		return err
+	}
+}
diff --git a/functions/wish/package.json → functions/contentCheck/package.json b/functions/wish/package.json → functions/contentCheck/package.json
@@ -1,5 +1,5 @@
 {
-  "name": "wish",
+  "name": "contentCheck",
   "version": "1.0.0",
   "description": "",
   "main": "index.js",
@@ -9,6 +9,6 @@
   "author": "",
   "license": "ISC",
   "dependencies": {
-    "wx-server-sdk": "latest"
+    "wx-server-sdk": "^1.8.0"
   }
-}
+}
diff --git a/functions/wish/index.js b/functions/wish/index.js
diff --git a/manifest.json b/manifest.json
@@ -62,13 +62,13 @@
             "urlCheck" : false
         },
         "usingComponents" : true,
-        "requiredBackgroundModes" : [ "audio" ],
         "plugins" : {
             "tucao" : {
                 "version" : "1.1.5",
                 "provider" : "wx8abaf00ee8c3202e"
             }
-        }
+        },
+        "requiredBackgroundModes" : [ "audio" ]
     },
     "mp-alipay" : {
         "usingComponents" : true

diff --git a/pages.json b/pages.json
@@ -12,6 +12,7 @@
 			"path": "pages/happiness/add-happiness",
 			"style": {
 				"navigationBarBackgroundColor": "#C12928",
+				"disableScroll": true,
 				"navigationStyle": "custom"
 			}
 		},
@@ -20,7 +21,11 @@
 		},
 		{
 			"path": "pages/about/about",
-			"style": {}
+			"style": {
+				"navigationBarBackgroundColor": "#C12928",
+				"disableScroll": true,
+				"navigationStyle": "custom"
+			}
 		}
 		// {
 		// 	"path": "pages/crop/crop",
@@ -63,8 +68,8 @@
 		// "navigationStyle": "custom"
 	},
 	"tabBar": {
-		"color": "#7A7E83",
-		"selectedColor": "#3cc51f",
+		"color": "#C12928",
+		"selectedColor": "#C12928",
 		"borderStyle": "black",
 		"backgroundColor": "#ffffff",
 		"list": [
@@ -95,12 +100,12 @@
 				"selectedIconPath": "static/tabbar/happiness.png",
 				"text": "头像添福"
 			}, 
-			{
-				"pagePath": "pages/happiness/introduction",
-				"iconPath": "static/tabbar/happiness3.png",
-				"selectedIconPath": "static/tabbar/happiness.png",
-				"text": "使用介绍"
-			}, 
+			// {
+			// 	"pagePath": "pages/happiness/introduction",
+			// 	"iconPath": "static/tabbar/happiness3.png",
+			// 	"selectedIconPath": "static/tabbar/happiness.png",
+			// 	"text": "使用介绍"
+			// }, 
 			{
 				"pagePath": "pages/about/about",
 				"iconPath": "static/tabbar/happiness3.png",

diff --git a/pages/about/about.vue b/pages/about/about.vue
@@ -1,12 +1,12 @@
 <template>
 	<view class="main" :style="{height:windowHeight+'px'}"  style="overflow: hidden">
-		<image class="page-bg" :style="{height:windowHeight+'px'}" mode="aspectFill" :src="pageBg"></image>
+		<image class="page-bg" :style="{height:windowHeight+'px'}" mode="aspectFill" src="/static/image/page-bg.png"></image>
 		<view style="margin-top: 100rpx;" class="grid justify-around" @click="showModal" data-target="Modal">
 			<view class="grid col-1">
-				<image style="width: 450rpx; height: 450rpx;" mode="aspectFill" :src="officialAccountUrl"></image>
+				<image style="width:270px; height:270px; margin-top: 75px" mode="aspectFill" src="/static/image/official-account.png"></image>
 			</view>
 			<view class="grid col-1">
-				<text class="text-grey margin-top">   更多精彩，请关注公众号【人文之窗】 </text>
+				<text class="text-grey margin-top"> 更多精彩，请关注公众号【人文之窗】 </text>
 			</view>	
 		</view>
 
@@ -102,7 +102,6 @@
 			this.windowHeight = getApp().globalData.WINDOW_HEIGHT;
 		},
 		computed: {
-			...mapGetters(["pageBg", "defaultAvatarUrl"]),
 			...mapState({userInfo:'userInfo'})
 		},
 		methods: {

diff --git a/pages/happiness/add-happiness.vue b/pages/happiness/add-happiness.vue
@@ -1,6 +1,5 @@
 <template>
 	<view class="main" :style="{height:windowHeight+'px'}" style="overflow: hidden">
-		<!-- <image class="page-bg" :style="{height:windowHeight+'px'}" mode="aspectFill" :src="pageBg"></image> -->
 		<image class="page-bg" :style="{height:windowHeight+'px'}" mode="aspectFill" src="/static/image/page-bg.png"></image>
 
 		<view>
@@ -72,7 +71,6 @@
 			}
 		},
 		computed: {
-			...mapGetters(["pageBg", "defaultAvatarUrl"]),
 			...mapState({userInfo:'userInfo'}),
 			defaultAvatarPath: function() {
 				return this.defaultAvatarList[this.defaultAvatarIndex];
@@ -299,7 +297,7 @@
 			},
 			downloadImageAndDrawWithText(imageUrl){
 				uni.showLoading({
-				    title: '加载中...'
+				    title: '添福中...'
 				});
 				let self = this;
 				uni.downloadFile({
@@ -354,13 +352,62 @@
 				let self = this;
 				uni.chooseImage({
 				    count: 1, // 默认9
-				    sizeType: ['original', 'compressed'], //可以指定是原图还是压缩图，默认二者都有
+				    sizeType: ['compressed'], //可以指定是原图还是压缩图，默认二者都有
 				    sourceType: ['album', 'camera'],
 				    success: function (res) {
 						console.log(res);
-						self.drawCansBgImg(res.tempFilePaths[0]);
-						self.drawDefaultTextBg();
-						self.drawDefaultText();
+						let tempImagePath = res.tempFilePaths[0];
+						
+						wx.getFileSystemManager().readFile({
+						    filePath: tempImagePath,  //这里做示例，所以就选取第一张图片
+						    success: buffer => {
+						        console.log(buffer.data);
+								uni.showLoading({
+								    title: '添福中...'
+								});
+						        //这里是 云函数调用方法
+						        wx.cloud.callFunction({
+						            name: 'contentCheck',
+						            data: {
+						                value: buffer.data
+						            },
+						            success(json) {
+						                console.log("checkContent result", json)
+						                if (json.result.errCode == 87014) {
+						                    // uni.showToast({
+						                    //     title: '图片含有违法违规内容'
+						                    // });
+											uni.showModal({
+												title: '请勿使用违法违规内容',
+												content: '图片含有违法违规内容',
+												showCancel: false,
+												confirmText: '知道了',
+											});
+						                    console.log("bad")
+						                } else {
+											console.log("good")
+						                    //图片正常
+											self.drawCansBgImg(tempImagePath);
+											self.drawDefaultTextBg();
+											self.drawDefaultText();
+						                }
+						            },
+									fail(e){
+										console.log(e);
+										uni.showModal({
+											title: '请重试',
+											content: '对不起，服务器开了小差',
+											showCancel: false,
+											confirmText: '好的',
+										});
+									},
+									complete(){
+										uni.hideLoading();
+									}
+						        })
+						    }
+						})
+
 						// self.downloadImageAndDrawWithText(res.tempFilePaths[0]);
 				    }
 				});
@@ -395,9 +442,9 @@
 										console.log('success');
 									}
 								});
-								uni.switchTab({
-									url: '/pages/happiness/introduction'
-								});
+								// uni.switchTab({
+								// 	url: '/pages/happiness/introduction'
+								// });
 								console.log('保存成功')
 							},
 							fail(res) {

diff --git a/static/image/official-account.png b/static/image/official-account.png