Browse Source

修改配置文件中符号错误

tuonina 6 years ago
parent
commit
ada071d5c4

+ 26 - 0
zen-core/src/main/java/cn/gygxzc/tina/mvc/utils/HttpUtils.java

@@ -0,0 +1,26 @@
+package cn.gygxzc.tina.mvc.utils;
+
+import org.springframework.web.context.request.RequestContextHolder;
+import org.springframework.web.context.request.ServletRequestAttributes;
+
+import javax.servlet.http.HttpServletRequest;
+
+/**
+ * Created by niantuo on 2018/10/19.
+ * 工具类
+ */
+
+public class HttpUtils {
+
+    /**
+     * 获取请求体
+     * @return 请求
+     */
+    public HttpServletRequest getRequest(){
+        return ((ServletRequestAttributes)(RequestContextHolder.getRequestAttributes())).getRequest();
+    }
+
+    public static ServletRequestAttributes getRequestAttributes(){
+        return (ServletRequestAttributes)RequestContextHolder.getRequestAttributes();
+    }
+}

+ 0 - 24
zen-core/src/main/kotlin/com/gxzc/zen/common/contants/PLATFORM.kt

@@ -1,24 +0,0 @@
-package com.gxzc.zen.common.contants
-
-/**
- * 平台代码枚举
- * @author NorthLan
- * @date 2018/2/6
- * @url https://noahlan.com
- */
-enum class PLATFORM(val id: Int) {
-    COMMON(0),
-    SYSTEM(1);
-
-    companion object {
-        fun intValueOf(id: Int): PLATFORM {
-            var ret = values().find {
-                it.id == id
-            }
-            if (ret == null) {
-                ret = COMMON
-            }
-            return ret
-        }
-    }
-}

+ 0 - 51
zen-core/src/main/kotlin/com/gxzc/zen/common/contants/ZenConstants.kt

@@ -1,51 +0,0 @@
-package com.gxzc.zen.common.contants
-
-/**
- * 系统常量
- * @author NorthLan
- * @date 2018/4/28
- * @url https://noahlan.com
- */
-object ZenConstants {
-    /*-------------------------------------------
-    |                树 参 数                    |
-    ============================================*/
-    const val TREE_ROOT_PID = 0L
-    const val TREE_PATH_SEPARATOR = "-"
-
-    /*-------------------------------------------
-    |                框架所需参数                 |
-    ============================================*/
-    const val CACHE_KEY_SYS = "sys"     // 系统缓存key
-    const val TRUE = "1"
-    const val FALSE = "0"
-
-    /*-------------------------------------------
-    |              系 统 参 数 KEY               |
-    ============================================*/
-    const val PARAMKEY_SUPER_ACCOUNT = "superAccount"
-    /**
-     * 系统数据权限开关
-     */
-    const val PARAMKEY_SYS_DA_ENABLED = "sysDAEnabled"
-
-    /**
-     * 用户数据权限开关
-     */
-    const val PARAMKEY_USER_DA_ENABLED = "userDAEnabled"
-
-    /**
-     * 角色数据权限开关
-     */
-    const val PARAMKEY_ROLE_DA_ENABLED = "roleDAEnabled"
-
-    /**
-     * 部门数据权限开关
-     */
-    const val PARAMKEY_DEPT_DA_ENABLED = "deptDAEnabled"
-
-    /**
-     * 岗位数据权限开关
-     */
-    const val PARAMKEY_POST_DA_ENABLED = "postDAEnabled"
-}

+ 1 - 1
zen-web/build.gradle

@@ -25,7 +25,7 @@ task dockerBuilder(type: Docker) {
     registry='registry.cn-qingdao.aliyuncs.com/gxzc-envir'
     applicationName = 'fw'
     tagVersion = jar.version
-    addFile("./build/libs/${jar.baseName}-${jar.version}.jar","app.jar")
+    addFile("./${jar.baseName}-${jar.version}.jar","app.jar")
     entryPoint(["java","-Djava.security.egd=file:/dev/./urandom","-jar",'app.jar'])
     exposePort(11000)
     doFirst {

+ 1 - 1
zen-web/src/main/resources/bootstrap.yml

@@ -7,7 +7,7 @@ spring:
     name: framework
   profiles:
     active: dev
-    include: orm,cache.msg
+    include: orm,cache,msg
   cloud:
     config:
       profile: dev