添加权限库备份sql；更新前端代码

code/WebApp/vanilla/api/user.js

@@ -1,5 +1,5 @@
 import router from "../router/index.js";
-import { get, post } from "../request/index.js";
+import request, { get, post } from "../request/index.js";
 import jwt_decode from "../lib/jwt-decode/jwt-decode.esm.js";
 import qs from "../lib/qs/shim.js";
 import { useAppStore } from "../store/index.js";
@@ -46,7 +46,9 @@ const logout = () => {
 };
 
 const getUser = async () => {
-  const result = await get("abp/application-configuration");
+  const result = await request("abp/application-configuration", null, {
+    method: "GET",
+  });
   const data = result.data;
   const user = {};
   user.id = data.currentUser.id;

code/WebApp/vanilla/components/form/form-input.js

@@ -8,8 +8,9 @@ export default {
     <template v-if="getDisabled()">
       <template v-if="model[prop]!==null">
         <el-switch disabled v-model="model[prop]" type="checked" v-if="schema.type==='boolean'" />
-        <template v-else-if="schema.format==='datetime'">{{dayjs(model[prop]).format('YYYY-MM-DD HH:mm:ss')}}</template>
+        <template v-else-if="schema.input==='datetime'">{{dayjs(model[prop]).format('YYYY-MM-DD HH:mm:ss')}}</template>
-        <template v-else-if="schema.format==='date'">{{dayjs(model[prop]).format('YYYY-MM-DD')}}</template>
+        <template v-else-if="schema.input==='date'">{{dayjs(model[prop]).format('YYYY-MM-DD')}}</template>
+        <template v-else-if="schema.input==='password'">******</template>
         <template v-else>{{model[prop]}}</template>
       </template>
     </template>
@@ -70,7 +71,7 @@ export default {
     });
     /*start*/
     const getDisabled = () => {
-      if (props.mode==='details') {
+      if (props.mode === "details") {
         return true;
       }
       if (props.mode === "update" && props.schema.readOnly) {
@@ -92,7 +93,7 @@ export default {
       } else if (props.schema.url) {
         try {
           const url = `${props.schema.url}`;
-          const result = await request(url, null, { method: "get" });
+          const result = await request(url, null, { method: "GET" });
           options.value = result.data?.items.map((o) => ({
             value: o[props.schema.value],
             label: o[props.schema.label],

code/WebApp/vanilla/components/icon/index.js

@@ -16,27 +16,21 @@ export default {
   },
   setup(props) {
     const svg = ref(null);
+    const appStore = useAppStore();
     onMounted(async () => {
       if (!props.name.startsWith("ep-")) {
         try {
           const url = `./assets/icons/${props.name}.svg`;
-          navigator.locks.request(url, async () => {
+          if (!appStore.cache.has(url)) {
-            const appStore = useAppStore();
+            const response = await fetch(url);
-            if (appStore.cache.has(url)) {
+            const result = await response.text();
-              svg.value = appStore.cache.get(url);
+            appStore.cache.set(url, result);
-            } else {
+          }
-              const response = await fetch(url);
+          svg.value = appStore.cache.get(url);
-              if (response.ok && response.status === 200) {
-                svg.value = await response.text();
-                appStore.cache.set(url, svg.value);
-              }
-            }
-          });
         } catch (error) {
           console.log(error);
-          if (!svg.value) {
+        } finally {
-            svg.value = `<svg viewBox="0 0 1024 1024" xmlns="http://www.w3.org/2000/svg"><path fill="currentColor" d="M512 64a32 32 0 0 1 32 32v192a32 32 0 0 1-64 0V96a32 32 0 0 1 32-32zm0 640a32 32 0 0 1 32 32v192a32 32 0 1 1-64 0V736a32 32 0 0 1 32-32zm448-192a32 32 0 0 1-32 32H736a32 32 0 1 1 0-64h192a32 32 0 0 1 32 32zm-640 0a32 32 0 0 1-32 32H96a32 32 0 0 1 0-64h192a32 32 0 0 1 32 32zM195.2 195.2a32 32 0 0 1 45.248 0L376.32 331.008a32 32 0 0 1-45.248 45.248L195.2 240.448a32 32 0 0 1 0-45.248zm452.544 452.544a32 32 0 0 1 45.248 0L828.8 783.552a32 32 0 0 1-45.248 45.248L647.744 692.992a32 32 0 0 1 0-45.248zM828.8 195.264a32 32 0 0 1 0 45.184L692.992 376.32a32 32 0 0 1-45.248-45.248l135.808-135.808a32 32 0 0 1 45.248 0zm-452.544 452.48a32 32 0 0 1 0 45.248L240.448 828.8a32 32 0 0 1-45.248-45.248l135.808-135.808a32 32 0 0 1 45.248 0z"></path></svg>`;
+          svg.value ??= `<svg viewBox="0 0 1024 1024" xmlns="http://www.w3.org/2000/svg"><path fill="currentColor" d="M512 64a32 32 0 0 1 32 32v192a32 32 0 0 1-64 0V96a32 32 0 0 1 32-32zm0 640a32 32 0 0 1 32 32v192a32 32 0 1 1-64 0V736a32 32 0 0 1 32-32zm448-192a32 32 0 0 1-32 32H736a32 32 0 1 1 0-64h192a32 32 0 0 1 32 32zm-640 0a32 32 0 0 1-32 32H96a32 32 0 0 1 0-64h192a32 32 0 0 1 32 32zM195.2 195.2a32 32 0 0 1 45.248 0L376.32 331.008a32 32 0 0 1-45.248 45.248L195.2 240.448a32 32 0 0 1 0-45.248zm452.544 452.544a32 32 0 0 1 45.248 0L828.8 783.552a32 32 0 0 1-45.248 45.248L647.744 692.992a32 32 0 0 1 0-45.248zM828.8 195.264a32 32 0 0 1 0 45.184L692.992 376.32a32 32 0 0 1-45.248-45.248l135.808-135.808a32 32 0 0 1 45.248 0zm-452.544 452.48a32 32 0 0 1 0 45.248L240.448 828.8a32 32 0 0 1-45.248-45.248l135.808-135.808a32 32 0 0 1 45.248 0z"></path></svg>`;
-          }
         }
       }
     });

code/WebApp/vanilla/components/list/index.js

@@ -352,9 +352,11 @@ export default {
     const router = useRouter();
     const { t } = useI18n();
     const appStore = useAppStore();
-    const buttons = ref(props.buttons ?? route.meta.children.filter((o) => o.meta.hasPermission));
+    // 注释一下代码暂停权限验证
+    // const buttons = ref(props.buttons ?? route.meta.children.filter((o) => o.meta.hasPermission));
+    // 添加下行代码暂停权限验证
+    const buttons = ref(props.buttons ?? route.meta.children);
     const baseUrl = props.controller ?? `${route.meta.path}`;
-    const indexUrl = props.indexUrl ?? `${baseUrl}/index`;
     const queryModel = ref({});
     const sortColumns = ref(new Map());
     const querySchema = ref(props.querySchema);
@@ -476,7 +478,8 @@ export default {
           editFormModel.value = schemaToModel(config.edit.schema);
         } else {
           const url = `${config.edit.updateUrl ?? config.query.url}/${rows[0].id}`;
-          editFormModel.value = (await request(url, null, { method: "get" })).data;
+          editFormModel.value = (await request(url, null, { method: "GET" })).data;
+          editFormModel.value.id = rows[0].id;
         }
         editFormTitle.value = `${t(item.path)}${config.edit.schema.title}`;
         dialogVisible.value = true;
@@ -516,8 +519,11 @@ export default {
           const valid = await editFormRef.value.validate();
           if (valid) {
             editFormloading.value = true;
-            const url =
+            let url =
               (editFormMode.value === "create" ? config.edit.createUrl : config.edit.updateUrl) ?? config.query.url;
+            if (editFormMode.value === "update") {
+              url = `${url}/${editFormModel.value.id}`;
+            }
             const method = editFormMode.value === "create" ? config.edit.createMethod : config.edit.updateMethod;
             const result = await request(url, editFormModel.value, { method });
             if (result.errors) {
@@ -617,9 +623,11 @@ export default {
       return false;
     };
     onMounted(async () => {
-      for (const item of route.meta.children) {
+      if (route.meta.children?.length) {
-        if (item.meta.disabled?.constructor === String) {
+        for (const item of route.meta.children) {
-          item.meta.disabled = await importFunction(item.meta.disabled);
+          if (item.meta.disabled?.constructor === String) {
+            item.meta.disabled = await importFunction(item.meta.disabled);
+          }
         }
       }
       pushQueryList();

code/WebApp/vanilla/models/code-setting.js

@@ -0,0 +1,86 @@
+const schema = {
+  title: "通用代码",
+  type: "object",
+  properties: {
+    userName: {
+      title: "项目",
+      type: "string",
+      readOnly: true,
+      showForList: true,
+      rules: [
+        {
+          required: true,
+        },
+      ],
+    },
+    userName: {
+      title: "值",
+      type: "string",
+      readOnly: true,
+      showForList: true,
+      rules: [
+        {
+          required: true,
+        },
+      ],
+    },
+    name: {
+      title: "描述",
+      type: "string",
+      showForList: true,
+      rules: [
+        {
+          required: true,
+        },
+      ],
+    },
+  },
+};
+
+const url = "base/code-settings";
+const createUrl = url;
+const updateUrl = url;
+const deleteUrl = url;
+const method = "GET";
+const createMethod = "POST";
+const updateMethod = "PUT";
+const deleteMethod = "DELETE";
+
+export default function () {
+  return {
+    query: {
+      url,
+      method,
+      schema: {
+        title: "通用代码",
+        type: "object",
+        properties: {
+          filter: {
+            title: "项目",
+            type: "string",
+          },
+          skipCount: {
+            hidden: true,
+            default: 0,
+          },
+          maxResultCount: {
+            hidden: true,
+            default: 10,
+          },
+        },
+      },
+    },
+    table: {
+      schema: schema,
+    },
+    edit: {
+      createUrl,
+      updateUrl,
+      deleteUrl,
+      createMethod,
+      updateMethod,
+      deleteMethod,
+      schema: schema,
+    },
+  };
+}

code/WebApp/vanilla/models/role.js

@@ -23,7 +23,7 @@ export default function () {
   return {
     query: {
       url: "identity/roles",
-      method: "get",
+      method: "GET",
       schema: {
         title: "用户",
         type: "object",

code/WebApp/vanilla/models/user.js

@@ -5,7 +5,7 @@ const schema = {
     userName: {
       title: "用户名",
       type: "string",
-      readOnly: true, //
+      readOnly: true,
       showForList: true,
       rules: [
         {
@@ -20,6 +20,7 @@ const schema = {
     password: {
       title: "密码",
       type: "string",
+      readOnly: true,
       input: "password",
     },
     name: {
@@ -52,18 +53,18 @@ const schema = {
         },
       ],
     },
-    roleNames: {
+    // roleNames: {
-      title: "角色",
+    //   title: "角色",
-      type: "array",
+    //   type: "array",
-      input: "select",
+    //   input: "select",
-      multiple: true,
+    //   multiple: true,
-      url: "identity/roles/all",
+    //   url: "identity/roles/all",
-      value: "name",
+    //   value: "name",
-      label: "name",
+    //   label: "name",
-      items: {
+    //   items: {
-        type: "string",
+    //     type: "string",
-      },
+    //   },
-    },
+    // },
   },
 };
 
@@ -71,10 +72,10 @@ const url = "base/user";
 const createUrl = url;
 const updateUrl = url;
 const deleteUrl = "api/identity/users";
-const method = "get";
+const method = "GET";
-const createMethod = "post";
+const createMethod = "POST";
-const updateMethod = "put";
+const updateMethod = "PUT";
-const deleteMethod = "delete";
+const deleteMethod = "DELETE";
 
 export default function () {
   return {

code/WebApp/vanilla/request/index.js

@@ -113,7 +113,6 @@ async function request(url, data, options, withoutToken = false) {
     method: "POST",
     headers: {
       "Accept-Language": "zh-Hans",
-      "Content-Type": "application/json",
     },
   };
   if (options) {
@@ -121,17 +120,17 @@ async function request(url, data, options, withoutToken = false) {
   }
   if (defaultOptions.method === "GET" && data) {
     url = `${url}?${qs.stringify(data)}`;
-  }
+  } else {
-  if (defaultOptions.method === "POST") {
-    if (data instanceof FormData) {
-      delete defaultOptions.headers["Content-Type"];
-    }
     if (defaultOptions.headers["Content-Type"]?.startsWith("application/x-www-form-urlencoded")) {
       defaultOptions.body = qs.stringify(data);
     } else if (defaultOptions.headers["Content-Type"]?.startsWith("application/json")) {
       defaultOptions.body = JSON.stringify(data);
-    } else {
+    } else if (data instanceof FormData) {
+      delete defaultOptions.headers["Content-Type"];
       defaultOptions.body = data;
+    } else if (data) {
+      defaultOptions.headers["Content-Type"] = "application/json";
+      defaultOptions.body = JSON.stringify(data);
     }
   }
   if (!withoutToken) {

code/WebApp/vanilla/router/index.js

@@ -49,11 +49,14 @@ router.beforeEach(async (to, from, next) => {
       if (!(await isLogin())) {
         next({ path: "/login", query: { redirect: to.fullPath } });
       } else {
-        if (!to.meta.public && to.meta.hasPermission === false) {
+        // 注释以下代码暂停权限验证
-          next({ path: "/403", query: { redirect: to.fullPath } });
+        // if (!to.meta.public && to.meta.hasPermission === false) {
-        } else {
+        //   next({ path: "/403", query: { redirect: to.fullPath } });
-          next();
+        // } else {
-        }
+        //   next();
+        // }
+        // 添加一下代码暂停权限验证
+        next();
       }
     } else {
       next();

code/WebApp/vanilla/router/routes.js

@@ -55,50 +55,68 @@ export default [
               isTop: true,
             },
           },
-        ],
-      },
-      {
-        path: "role",
-        meta: {
-          type: "page",
-          title: "角色管理",
-          icon: "file",
-          permission: "AbpIdentity.Users",
-        },
-        children: [
-          {
-            path: "create",
-            meta: {
-              type: "button",
-              title: "新建",
-              icon: "file",
-              permission: "AbpIdentity.Users.Create",
-              isTop: true,
-            },
-          },
           {
-            path: "update",
+            path: "%s/reset-password",
             meta: {
               type: "button",
-              title: "编辑",
+              title: "重置密码",
               icon: "file",
-              htmlClass: "el-button--primary",
+              permission: "reset-password?",
-              permission: "AbpIdentity.Users.Update",
+              method: "PUT",
-              disabled: `(o) => o.isStatic`,
-            },
-          },
-          {
-            path: "delete",
-            meta: {
-              type: "button",
-              title: "删除",
-              icon: "file",
-              permission: "AbpIdentity.Users.Delete",
-              disabled: `(o) => o.isStatic`,
             },
           },
         ],
       },
+      // {
+      //   path: "role",
+      //   meta: {
+      //     type: "page",
+      //     title: "角色管理",
+      //     icon: "file",
+      //     permission: "AbpIdentity.Users",
+      //   },
+      //   children: [
+      //     {
+      //       path: "create",
+      //       meta: {
+      //         type: "button",
+      //         title: "新建",
+      //         icon: "file",
+      //         permission: "AbpIdentity.Users.Create",
+      //         isTop: true,
+      //       },
+      //     },
+      //     {
+      //       path: "update",
+      //       meta: {
+      //         type: "button",
+      //         title: "编辑",
+      //         icon: "file",
+      //         htmlClass: "el-button--primary",
+      //         permission: "AbpIdentity.Users.Update",
+      //         disabled: `(o) => o.isStatic`,
+      //       },
+      //     },
+      //     {
+      //       path: "delete",
+      //       meta: {
+      //         type: "button",
+      //         title: "删除",
+      //         icon: "file",
+      //         permission: "AbpIdentity.Users.Delete",
+      //         disabled: `(o) => o.isStatic`,
+      //       },
+      //     },
+      //   ],
+      // },
+      {
+        path: "code-setting",
+        meta: {
+          type: "page",
+          title: "通用代码",
+          icon: "file",
+        },
+      },
     ],
   },
 ];

code/WebApp/vanilla/utils/validation.js

@@ -80,10 +80,10 @@ const validators = {
     } else {
       const config = {
         url: rule.url,
-        method: rule.method ?? "get",
+        method: rule.method ?? "GET",
       };
       const data = { [rule.field]: value };
-      if (config.method === "get") {
+      if (config.method === "GET") {
         config.params = data;
       } else {
         config.data = data;

code/WebApp/vanilla/views/base-data/code-setting.js

@@ -0,0 +1,28 @@
+import AppList from "../../components/list/index.js";
+import html from "html";
+import useConfig from "../../models/code-setting.js";
+import request from "../../request/index.js";
+import { format } from "../../utils/index.js";
+import { ElMessage } from "element-plus";
+
+export default {
+  components: { AppList },
+  template: html`<app-list :config="config" @command="onCommand" />`,
+  setup() {
+    // 变量定义
+    const config = useConfig();
+    // 函数定义
+    const onCommand = async (item, rows) => {
+      console.log(item.path, item, rows);
+      if (item.path === "%s/reset-password") {
+        const url = format(item.path, rows[0].id);
+        await request(`base/user/${url}`, null, { method: item.meta.method });
+        ElMessage({
+          type: "info",
+          message: format("用户%s的密码已经成功重置为123456", rows[0].userName),
+        });
+      }
+    };
+    return { config, onCommand };
+  },
+};

code/WebApp/vanilla/views/base-data/user.js

@@ -1,6 +1,9 @@
 import AppList from "../../components/list/index.js";
 import html from "html";
 import useConfig from "../../models/user.js";
+import request from "../../request/index.js";
+import { format } from "../../utils/index.js";
+import { ElMessage } from "element-plus";
 
 export default {
   components: { AppList },
@@ -9,8 +12,16 @@ export default {
     // 变量定义
     const config = useConfig();
     // 函数定义
-    const onCommand = (item, rows) => {
+    const onCommand = async (item, rows) => {
       console.log(item.path, item, rows);
+      if (item.path === "%s/reset-password") {
+        const url = format(item.path, rows[0].id);
+        await request(`base/user/${url}`, null, { method: item.meta.method });
+        ElMessage({
+          type: "info",
+          message: format("用户%s的密码已经成功重置为123456", rows[0].userName),
+        });
+      }
     };
     return { config, onCommand };
   },

code/WebApp/vanilla/views/login.js

@@ -36,12 +36,14 @@ export default {
         const result = await request(url, model, { method: "POST" }, true);
         if (!result.errors) {
           appStore.token = result.data.accessToken;
-          setAccessToken(appStore.token);
+          if (appStore.token) {
-          //setRefreshToken(result.data.refresh_token);
+            setAccessToken(appStore.token);
-          appStore.user = await getUser();
+            //setRefreshToken(result.data.refresh_token);
-          await refreshRouter();
+            appStore.user = await getUser();
-          const redirect = router.currentRoute.value.query?.redirect ?? "/";
+            await refreshRouter();
-          router.push(redirect);
+            const redirect = router.currentRoute.value.query?.redirect ?? "/";
+            router.push(redirect);
+          }
         }
         callback(result.errors);
       } catch (error) {

code/src/AuthServer/AuthServer.Host/appsettings.json

@@ -1,6 +1,6 @@
 {
   "ConnectionStrings": {
-    "Default": "Server=dev.ccwin-in.com,13319;Database=BJABP;User ID=ccwin-in;Password=Microsoft@2022;Trusted_Connection=False;TrustServerCertificate=True"
+    "Default": "Server=localhost;Database=BJABP;User ID=sa;Password=aA123456!;Trusted_Connection=False;TrustServerCertificate=True"
   },
   "CorsOrigins": "http://localhost:9527,http://dev.ccwin-in.com:10588,http://localhost:44307",
   "ElasticSearch": {

code/src/Modules/BaseService/BaseService.Host/appsettings.json

@@ -1,8 +1,9 @@
 {
   "AuthServer": {
     "Authority": "http://dev.ccwin-in.com:10580",
+    //"Authority": "http://localhost:10130",
     "ClientId": "basic-web",
-    "ClientSecret": ""
+    "ClientSecret": "1q2w3e*"
   },
   "App": {
     "CorsOrigins": "http://localhost:9527,http://dev.ccwin-in.com:10588,http://localhost:44307"