Browse Source

修改相关配置

liyan 3 years ago
parent
commit
dcf2f7b5c5

+ 0 - 116
config/menu/items.json

@@ -1,116 +0,0 @@
-[
-  {
-    "id": "user",
-    "title": "用户管理",
-    "path": "/xms",
-    "icon": "account",
-    "module": "@user",
-    "children": [
-      {
-        "id":"user-info",
-        "title": "用户信息",
-        "path": "/xms/user",
-        "icon": "account"
-      },
-      {
-        "title": "机构管理",
-        "path": "/xms/org",
-        "icon": "dept"
-      },
-      {
-        "title": "群组管理",
-        "path": "/xms/group",
-        "icon": "users"
-      },
-      {
-        "title": "注册审核",
-        "path": "/xms/register",
-        "icon": "audit"
-      },
-      {
-        "title": "证书管理",
-        "path": "/xms/cert",
-        "icon": "cert"
-      },
-      {
-        "title": "黑名单管理",
-        "path": "/xms/blacklist",
-        "icon": "user1"
-      }
-    ]
-  },
-  {
-    "title": "授权管理",
-    "path": "/xms",
-    "icon": "auth",
-    "module": "@empower",
-    "children": [
-      {
-        "title": "机构授权",
-        "path": "/xms/orgEmpower",
-        "icon": "dept"
-      },
-      {
-        "title": "群组授权",
-        "path": "/xms/groupEmpower",
-        "icon": "users"
-      }
-    ]
-  },
-  {
-    "title": "应用管理",
-    "path": "/xms",
-    "icon": "column",
-    "module": "@app",
-    "children": [
-      {
-        "title": "应用信息",
-        "path": "/xms/app",
-        "icon": "bill"
-      },
-      {
-        "title": "资源管理",
-        "path": "/xms/resources",
-        "icon": "tags"
-      },
-      {
-        "title": "角色管理",
-        "path": "/xms/roles",
-        "icon": "tag"
-      }
-    ]
-  },
-  {
-    "title": "系统管理",
-    "path": "/gaf",
-    "icon": "system",
-    "module": "@gaf",
-    "children": [
-      {
-        "title": "系统用户",
-        "path": "/gaf/user",
-        "icon": "account"
-      },
-      {
-        "title": "用户部门",
-        "path": "/gaf/dept",
-        "icon": "dept"
-      },
-      {
-        "title": "数据字典",
-        "path": "/gaf/dict",
-        "icon": "dict"
-      },
-      {
-        "title": "菜单管理",
-        "path": "/gaf/menu",
-        "icon": "menu"
-      },
-      {
-        "title": "日志审计",
-        "path": "/gaf/log",
-        "icon": "log"
-      }
-    ]
-  }
-]

+ 0 - 22
config/menu/menus.json

@@ -1,22 +0,0 @@
-[
-  {
-    "title": "用户管理",
-    "path": "/xms",
-    "module": "@user"
-  },
-  {
-    "title": "授权管理",
-    "path": "/xms",
-    "module": "@empower"
-  },
-  {
-    "title": "应用管理",
-    "path": "/xms",
-    "module": "@app"
-  },
-  {
-    "title": "系统管理",
-    "path": "/gaf",
-    "module": "@gaf"
-  }
-]

+ 2 - 3
gateway/build.gradle.kts

@@ -10,19 +10,17 @@ plugins {
     id("org.springframework.boot")
     kotlin("jvm")
     kotlin("plugin.spring")
-    kotlin("plugin.jpa")
+//    kotlin("plugin.jpa")
 }
 
 dependencies {
     implementation(project(path = ":shared:cloud"))
     implementation(project(path = ":shared:util"))
-    implementation("org.springframework.cloud:spring-cloud-starter-openfeign")
     implementation("org.springframework.boot:spring-boot-starter-webflux")
     implementation("com.fasterxml.jackson.module:jackson-module-kotlin")
     implementation("org.springframework.boot:spring-boot-configuration-processor")
     implementation("org.springframework.cloud:spring-cloud-starter-gateway")
     implementation("org.springframework.cloud:spring-cloud-gateway-webflux")
-    implementation("org.springframework.boot:spring-boot-starter-data-redis")
     implementation("io.jsonwebtoken:jjwt-api")
     implementation("io.jsonwebtoken:jjwt-impl")
     implementation("io.jsonwebtoken:jjwt-jackson")
@@ -32,6 +30,7 @@ dependencies {
     implementation(kotlin("stdlib-jdk8"))
     implementation(project(path = ":services:service-verify", configuration = "lib"))
     implementation(project(path = ":services:service-token", configuration = "lib"))
+    runtimeOnly("mysql:mysql-connector-java")
 }
 
 dependencyManagement {

+ 1 - 20
gateway/src/main/kotlin/gaf3/core/gateway/GatewayController.kt

@@ -19,23 +19,4 @@ class GatewayController {
         res.statusCode = HttpStatus.UNAUTHORIZED
         return Mono.just("No Authorization!")
     }
-
-    @GetMapping(path = ["/mock/menu/items"])
-    @ResponseBody
-    fun items(res: ServerHttpResponse): Resource {
-        res.headers["content-type"] = "text/plain; charset=utf-8"
-        return ClassPathResource("/menu/items_res.json")
-    }
-    @GetMapping(path = ["/mock/menu/menus"])
-    @ResponseBody
-    fun menus(res: ServerHttpResponse): Resource {
-        res.headers["content-type"] = "application/json; charset=utf-8"
-        return ClassPathResource("/menu/menus_res.json")
-    }
-    @GetMapping(path = ["/mock/code/{type}/items"])
-    @ResponseBody
-    fun codes(@PathVariable type: String, res: ServerHttpResponse): Resource {
-        res.headers["content-type"] = "text/plain; charset=utf-8"
-        return ClassPathResource("/code/${type}.json")
-    }
-}
+}

+ 16 - 0
gateway/src/main/resources/application-services.yml

@@ -5,3 +5,19 @@ gaf:
     jwt-secret: "GafJwtSecret!@#"
     jwt-issuer: gaf
     jwt-validity: 1h
+spring:
+  datasource:
+    username: ${dbUser}
+    password: ${dbPwd}
+    url: ${dbUrl}
+    driver-class-name: ${dbDriver}
+  jpa:
+    database-platform: ${dbDialect}
+    show-sql: true
+    hibernate:
+      naming:
+        implicit-strategy: org.hibernate.boot.model.naming.ImplicitNamingStrategyJpaCompliantImpl
+        physical-strategy: org.hibernate.boot.model.naming.PhysicalNamingStrategyStandardImpl
+      ddl-auto: update
+  main:
+    allow-bean-definition-overriding: true

+ 1 - 5
gateway/src/main/resources/application.yml

@@ -1,7 +1,4 @@
 # 全局配置
-#spring:
-#  resources:
-#    static-locations: file:www/,classpath:/META-INF/resources/,classpath:/resources/,classpath:/static/,classpath:/public/
 jwt.secret: "GafJwtSecret!@#"
 api.host: 127.0.0.1
 uri:
@@ -27,7 +24,7 @@ spring:
   profiles: local
   profiles.include: routes, services
 
-api.host: 172.17.116.7 #192.168.1.170
+api.host: 172.17.116.7
 
 logging.level.gaf3.core.*: DEBUG
 
@@ -37,7 +34,6 @@ spring:
   profiles.include: routes, services, log
 
 logging.level.gaf3.core.*: DEBUG
-#debug: true
 
 ---
 spring:

BIN
libs/oscarHibernate5.jar


BIN
libs/oscarJDBC16.jar