update:合并

package.json

@@ -26,6 +26,7 @@
     "koa-views": "^7.0.1",
     "moment": "^2.29.1",
     "request": "^2.88.2",
+    "uuid": "^8.3.2",
     "vue": "^3.0.11",
     "vue-router": "^4.0.0-beta.12",
     "vuex": "^4.0.0-beta.4"

server/controllers/image.js

@@ -90,8 +90,8 @@ exports.get_ks3_config = async (ctx, next) => {
 
 
   console.log('stringToSign:::', stringToSign)
-  // const signature = Ks3Util.b64_hmac_sha1(KS3_CONFIG.AccessKeySecret, stringToSign)
-  const signature = crypto.createHmac('sha1', KS3_CONFIG.SK).update(stringToSign).digest().toString('base64');
+  const signature = Ks3Util.b64_hmac_sha1(KS3_CONFIG.SK, stringToSign)
+  // const signature = crypto.createHmac('sha1', KS3_CONFIG.SK).update(stringToSign).digest().toString('base64');
   console.log("signature::::::", signature)
 
   ctx.body = {

server/utils/ksUtil.js

@@ -12,6 +12,7 @@ Ks3.b64_hmac_sha1 = function (key, data) {
  * Convert an array of big-endian words to a base-64 string
  */
 Ks3.binb2b64 = function (binarray) {
+  console.log("binb2b64::::::", binarray)
   var tab = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";
   var str = "";
   for (var i = 0; i < binarray.length * 4; i += 3) {
@@ -23,6 +24,8 @@ Ks3.binb2b64 = function (binarray) {
       else str += tab.charAt((triplet >> 6 * (3 - j)) & 0x3F);
     }
   }
+  console.log("binb2b6422222::::::", str)
+
   return str;
 }
 

server/utils/request.js

@@ -4,10 +4,20 @@ exports.httpReq = (ctx, opts) => {
   opts.timeout = opts.timeout || 1000
   return new Promise((resolve, reject) => {
     var time_start = +new Date()
-    opts.qs = {...ctx.request.query, ...opts.qs};
+
+    const defaultQs = {
+      appid: 'merchant-op',
+      cv: '1.0.0',
+      version: '999999',
+      distribution: 'op',
+      net: 'wifi',
+      platform: '2',
+    }
+
+    opts.qs = { ...defaultQs, ...ctx.request.query, ...opts.qs};
 
     request(opts, (err, res, body) => {
-      console.info(`[Api] httpReq (${opts.url},${opts.headers && opts.headers.cookie}, user:[${opts.qs.op_cur_user}]) spent: ${+new Date() - time_start}ms`)
+      console.info(`[Api] httpReq (${ctx.request.url}, user:[${opts.qs.op_cur_user}]) spent: ${+new Date() - time_start}ms`)
 
       if (!err) {
         resolve(body)

src/components/PageHeader/index.vue

@@ -47,7 +47,6 @@ export default {
     },
 
     activeMenu: function () {
-      console.log(988888, this.$route.path)
       return this.$route.path;
     },
   },

ks3-js-sdk @ ea6ab311

-Subproject commit ea6ab311ebfa69725e824a5cc28bd53d93681d34

src/main.js

@@ -8,30 +8,32 @@ import "element-plus/lib/theme-chalk/index.css";
 import "dayjs/locale/zh-cn";
 import locale from "element-plus/lib/locale/lang/zh-cn";
 
-/* import { fetchCurrentUser } from "./service/user";
+import { fetchCurrentUser } from "./service/user";
 import { checkPathAuth } from "./utils/authUtil";
-import { redirectToLogin } from "./utils/util"; */
+import { redirectToLogin } from "./utils/util";
 
 // 处理路由权限
-/* router.beforeResolve(async (to, from, next) => {
-  if (to.meta.requireAuth && !store.state.permissions) {
+router.beforeResolve(async (to, from, next) => {
+
+  if (!to.meta.requireAuth) next();
+
+  if (!store.state.permissions) {
     const { status, user } = await fetchCurrentUser();
     if (status === 'success') {
       store.commit('updateUserInfo', user);
-      store.dispatch('updateUserPermission', { email: user.email }).then(() => {
-        if (!checkPathAuth(to.path)) {
-          router.push('/403')
-        }
-      })
-      next()
+      await store.dispatch('updateUserPermission', { email: user.email })
     } else {
       redirectToLogin();
+      return false;
     }
-    return false;
+  }
+
+  if (!checkPathAuth(to.path)) {
+    router.push('/403')
   } else {
     next()
   }
-}) */
+})
 
 createApp(App)
   .use(router)

src/pages/Catch/forbidden.vue

 <template>
   <div>
-    <layout> Forbidden! </layout>
+    <layout> 没有权限! </layout>
   </div>
 </template>
 

src/pages/Catch/notFound.vue

 <template>
   <div>
     <layout>
-      not found
+      页面不存在！
     </layout>
   </div>
 </template>

src/pages/User/userList/index.vue

@@ -31,7 +31,9 @@
         <el-form-item class="func-btn">
           <el-button type="primary" @click="getUserList">查询</el-button>
           <el-button @click="onReset">重置</el-button>
-          <el-button @click="createUser">新建用户</el-button>
+          <el-button @click="createUser" :disabled="!permission.get('create')"
+            >新建用户</el-button
+          >
         </el-form-item>
       </el-form>
       <el-table :data="renderUserList" border style="width: 100%">
@@ -50,7 +52,11 @@
             <el-button type="text" size="small" @click="checkUser(scope.row)"
               >查看</el-button
             >
-            <el-button @click="editUser(scope.row)" type="text" size="small"
+            <el-button
+              @click="editUser(scope.row)"
+              type="text"
+              size="small"
+              :disabled="!permission.get('edit')"
               >修改</el-button
             >
             <el-button
@@ -58,6 +64,7 @@
               type="text"
               size="small"
               @click="disableUser(scope.row)"
+              :disabled="!permission.get('enable')"
               >禁用</el-button
             >
             <el-button
@@ -65,6 +72,7 @@
               type="text"
               size="small"
               @click="enableUser(scope.row)"
+              :disabled="!permission.get('disable')"
               >启用</el-button
             >
           </template>
@@ -118,7 +126,7 @@ export default {
     UserInfoEditModal,
     UserInfoNewModal,
   },
-  data () {
+  data() {
     return {
       pageParams: {
         page: 1,
@@ -140,7 +148,14 @@ export default {
     };
   },
   computed: {
-    renderUserList () {
+    permission() {
+      const modulePermissions =
+        this.$store.getters.moduleSubPermissions("user") || [];
+      console.log("Current page func-permissions:", modulePermissions);
+      return new Map(modulePermissions.map((ele) => [ele.name, true]));
+    },
+
+    renderUserList() {
       const statusMap = new Map([
         [1, "启用"],
         [2, "禁用"],
@@ -152,11 +167,11 @@ export default {
       });
     },
   },
-  beforeMount () {
+  beforeMount() {
     this.getUserList();
   },
   methods: {
-    async getUserList () {
+    async getUserList() {
       const { code, result } = await reqGetUserList(this.pageParams);
 
       if (code !== 0) {
@@ -168,7 +183,7 @@ export default {
       this.userList = data;
     },
 
-    async setCurUserInfo (user_id) {
+    async setCurUserInfo(user_id) {
       const { code, result } = await reqGetUserDetail({ user_id });
       if (code === 0) {
         this.curUserInfo = {
@@ -180,13 +195,13 @@ export default {
       }
     },
 
-    async checkUser (row) {
+    async checkUser(row) {
       const { user_id } = row;
       await this.setCurUserInfo(user_id);
       this.openModal("info");
     },
 
-    async editUser (row) {
+    async editUser(row) {
       const { user_id } = row;
       await this.setCurUserInfo(user_id);
       // this.openModal('edit');
@@ -194,13 +209,13 @@ export default {
       this.curOperateMode = "edit";
     },
 
-    openModal (key) {
+    openModal(key) {
       Object.keys(this.modalVisable).forEach((ele) => {
         this.modalVisable[ele] = key === ele;
       });
     },
 
-    async confirmEditModal (userInfo) {
+    async confirmEditModal(userInfo) {
       const {
         user_id,
         user_name,
@@ -247,17 +262,17 @@ export default {
       }
     },
 
-    cancelModal (name) {
+    cancelModal(name) {
       this.modalVisable[name] = false;
     },
 
-    createUser () {
+    createUser() {
       this.curOperateMode = "new";
       this.openModal("new");
     },
 
     //重置
-    onReset () {
+    onReset() {
       this.pageParams = {
         page: 1,
         pageSize: 20,
@@ -266,15 +281,16 @@ export default {
         user_mobile: "",
         user_status: "",
       };
+      this.getUserList();
     },
 
-    updatePage ({ page, pageSize }) {
+    updatePage({ page, pageSize }) {
       page && (this.pageParams.page = page);
       pageSize && (this.pageParams.pageSize = pageSize);
       this.getUserList();
     },
 
-    async enableUser (row) {
+    async enableUser(row) {
       const { user_id } = row;
 
       const { code, reason } = await reqEditUser({ user_status: 1, user_id });
@@ -286,7 +302,7 @@ export default {
       }
     },
 
-    async disableUser (row) {
+    async disableUser(row) {
       const { user_id, reason } = row;
       const { code } = await reqEditUser({ user_status: 2, user_id });
       if (code === 0) {

src/service/ks3Image.js

@@ -13,13 +13,13 @@ import axios from '../utils/request';
 
 
 export async function ksOssUpload(file) {
-  const {bucket, objectId, policy, signature} = await getKs3Config();
+  const { bucket, objectId, policy, signature } = await getKs3Config();
 
   const protocal = window.location.protocol === 'https:' ? 'https' : 'http';
   const uploadURL = `${protocal}://${KS3_CONST.DOMAIN}/${bucket}`;
   // return new Promise((resolve, reject) => {
   //   CommonServer.getKsOssSign().then(res => {
-      // const { accessid, policy, signature } = res
+  // const { accessid, policy, signature } = res
   const formData = new FormData()
   formData.append('acl', 'public-read')
   formData.append('key', objectId)
@@ -27,23 +27,9 @@ export async function ksOssUpload(file) {
   formData.append('KSSAccessKeyId', KS3_CONST.AccessKeyID)
   formData.append('policy', policy)
   formData.append('file', file)
-  const res = await axios.post(uploadURL, formData).then(res => {
-    console.log(66666 ,res)
-    // const { status } = res
-    // if (status === 200) {
-    //   const data = {
-    //     url: `${OSS_URL}/${key}`,
-    //     type: fileType(file.name)
-    //   }
-    //   resolve(data)
-    // } else {
-    //   reject(res)
-    // }
+  console.log('ksOssUpload url::', uploadURL)
+  const res = await axios({ url: uploadURL, method: 'post', data: formData, withCredentials: false }).then(res => {
+    console.log('ksOssUpload res::', res)
   })
-  // .catch(err => {
-  //   reject(err)
-  // })
   return res;
-  //   }).catch(err => {})
-  // })
 }
\ No newline at end of file

src/utils/request.js

-/**
- * axios封装
- */
 import axios from "axios";
 import store from "@/store"
+import { v1 as uuidv1 } from 'uuid';
+
 // import { ElMessage } from "element-plus";
 // import { APP_URI } from "../config/app.config";
 /**
@@ -32,7 +31,9 @@ export const defaultConfig = {
  */
 const getDefaultParams = () => {
   return {
-    'op_cur_user': store.state.userInfo && store.state.userInfo.email
+    'op_cur_user': store.state.userInfo && store.state.userInfo.email,
+    'reqid': uuidv1().replace(/-/g, '')
+
   }
 };
 const getDefaultHeaders = () => {};