fix è®x 修改接口

.gitignore

@@ -0,0 +1,31 @@
+/target/
+**/target/**
+!.mvn/wrapper/maven-wrapper.jar
+
+### STS ###
+.apt_generated
+.classpath
+.factorypath
+.project
+.settings
+.springBeans
+.sts4-cache
+
+### IntelliJ IDEA ###
+.idea
+.idea/**
+*.iws
+*.iml
+*.ipr
+
+### NetBeans ###
+/nbproject/private/
+/build/
+/nbbuild/
+/dist/
+/nbdist/
+/.nb-gradle/
+
+
+### rpc logs ###
+logs/

.idea/misc.xml

@@ -1,4 +1,3 @@
-<?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="ExternalStorageConfigurationManager" enabled="true" />
   <component name="MavenProjectsManager">

ywt-platform-glasses-common/src/main/java/com/ywt/glasses/core/WebAppContext.java

@@ -32,7 +32,7 @@ public class WebAppContext {
         return _requestStartTime.get() == null ? 0L : _requestStartTime.get();
     }
 
-    protected void setRequestStartTime(long time) {
+    public void setRequestStartTime(long time) {
         _requestStartTime.set(time);
     }
 
@@ -40,7 +40,7 @@ public class WebAppContext {
         return _requestID.get() == null ? "" : _requestID.get();
     }
 
-    protected void setRequestID(String id) {
+    public void setRequestID(String id) {
         _requestID.set(id);
     }
 
@@ -48,7 +48,7 @@ public class WebAppContext {
         return _ip.get() == null ? "" : _ip.get();
     }
 
-    protected void setIP(String ip) {
+    public void setIP(String ip) {
         _ip.set(ip);
     }
 
@@ -56,7 +56,7 @@ public class WebAppContext {
         return _unionId.get() == null ? "" : _unionId.get();
     }
 
-    protected void setUnionId(String unionId) {
+    public void setUnionId(String unionId) {
         _unionId.set(unionId);
     }
 
@@ -64,7 +64,7 @@ public class WebAppContext {
         return _openId.get() == null ? "" : _openId.get();
     }
 
-    protected void setOpenId(String openId) {
+    public void setOpenId(String openId) {
         _openId.set(openId);
     }
 
@@ -72,7 +72,7 @@ public class WebAppContext {
         return _userId.get() == null ? 0 : _userId.get();
     }
 
-    protected void setUserId(Integer userId) {
+    public void setUserId(Integer userId) {
         _userId.set(userId);
     }
 
@@ -88,7 +88,7 @@ public class WebAppContext {
         return _tokenid.get() == null ? "" : _tokenid.get();
     }
 
-    protected void setTokenID(String tokenID) {
+    public void setTokenID(String tokenID) {
         _tokenid.set(tokenID);
     }
 
@@ -96,7 +96,7 @@ public class WebAppContext {
         return _doctorName.get() == null ? "" : _doctorName.get();
     }
 
-    protected void setDoctorName(String doctorName) {
+    public void setDoctorName(String doctorName) {
         _doctorName.set(doctorName);
     }
 
@@ -104,7 +104,7 @@ public class WebAppContext {
         return _terminal.get() == null ? 0 : _terminal.get();
     }
 
-    protected void setTerminal(Integer terminal) {
+    public void setTerminal(Integer terminal) {
         this._terminal.set(terminal);
     }
 
@@ -112,11 +112,11 @@ public class WebAppContext {
         return _gwProtocol.get() == null ? "" : _gwProtocol.get();
     }
 
-    protected void setGWProtocol(String protocol) {
+    public void setGWProtocol(String protocol) {
         _gwProtocol.set(protocol);
     }
 
-    protected void setGWAuthAppid(String appid) {
+    public void setGWAuthAppid(String appid) {
         this._gwAuthAppid.set(appid);
     }
 
@@ -150,7 +150,7 @@ public class WebAppContext {
 
 
 
-    protected void init() {
+    public void init() {
         _requestStartTime.set(0L);
         _requestID.set("");
         _ip.set("");

ywt-platform-glasses-web/src/main/java/com/ywt/glasses/controllers/mg/core/WebAppContext.java

@@ -1,181 +0,0 @@
-package com.ywt.glasses.controllers.mg.core;
-
-/**
- * 保存当前请求与业务相关的信息上下文
- * 由拦截器层提供信息初始化
- * Created by dyh2020
- */
-public class WebAppContext {
-    private static WebAppContext _webAppContext = null;
-    private static Object _lockObj = new Object();
-
-    private ThreadLocal<Long> _requestStartTime = new ThreadLocal<>();
-    private ThreadLocal<String> _requestID = new ThreadLocal<>();
-    private ThreadLocal<String> _ip = new ThreadLocal<>();
-    private ThreadLocal<String> _tokenid = new ThreadLocal<>();
-    private ThreadLocal<String> _unionId = new ThreadLocal<>();
-    private ThreadLocal<String> _openId = new ThreadLocal<>();
-    private ThreadLocal<Integer> _userId = new ThreadLocal<>();
-    private ThreadLocal<Integer> _doctorId = new ThreadLocal<>();
-    private ThreadLocal<String> _doctorName = new ThreadLocal<>();
-    private ThreadLocal<Integer> _terminal = new ThreadLocal<>();
-    private ThreadLocal<String> _gwProtocol = new ThreadLocal<>();
-    private ThreadLocal<String> _gwAuthAppid = new ThreadLocal<>();
-    private ThreadLocal<Integer> _shopId = new ThreadLocal<>();
-    private ThreadLocal<Integer> _hospitalId = new ThreadLocal<>();
-    private ThreadLocal<Integer> _adminId = new ThreadLocal<>();
-
-    private WebAppContext() {
-    }
-
-    public long getRequestStartTime() {
-        return _requestStartTime.get() == null ? 0L : _requestStartTime.get();
-    }
-
-    public void setRequestStartTime(long time) {
-        _requestStartTime.set(time);
-    }
-
-    public String getRequestID() {
-        return _requestID.get() == null ? "" : _requestID.get();
-    }
-
-    public void setRequestID(String id) {
-        _requestID.set(id);
-    }
-
-    public String getIP() {
-        return _ip.get() == null ? "" : _ip.get();
-    }
-
-    public void setIP(String ip) {
-        _ip.set(ip);
-    }
-
-    public String getUnionId() {
-        return _unionId.get() == null ? "" : _unionId.get();
-    }
-
-    public void setUnionId(String unionId) {
-        _unionId.set(unionId);
-    }
-
-    public String getOpenId() {
-        return _openId.get() == null ? "" : _openId.get();
-    }
-
-    public void setOpenId(String openId) {
-        _openId.set(openId);
-    }
-
-    public Integer getUserId() {
-        return _userId.get() == null ? 0 : _userId.get();
-    }
-
-    public void setUserId(Integer userId) {
-        _userId.set(userId);
-    }
-
-    public Integer getDoctorId() {
-        return _doctorId.get() == null ? 0 : _doctorId.get();
-    }
-
-    public void setDoctorId(Integer doctorId) {
-        _doctorId.set(doctorId);
-    }
-
-    public String getTokenID() {
-        return _tokenid.get() == null ? "" : _tokenid.get();
-    }
-
-    public void setTokenID(String tokenID) {
-        _tokenid.set(tokenID);
-    }
-
-    public String getDoctorName() {
-        return _doctorName.get() == null ? "" : _doctorName.get();
-    }
-
-    public void setDoctorName(String doctorName) {
-        _doctorName.set(doctorName);
-    }
-
-    public Integer getTerminal() {
-        return _terminal.get() == null ? 0 : _terminal.get();
-    }
-
-    public void setTerminal(Integer terminal) {
-        this._terminal.set(terminal);
-    }
-
-    public String getGWProtocol() {
-        return _gwProtocol.get() == null ? "" : _gwProtocol.get();
-    }
-
-    public void setGWProtocol(String protocol) {
-        _gwProtocol.set(protocol);
-    }
-
-    public void setGWAuthAppid(String appid) {
-        this._gwAuthAppid.set(appid);
-    }
-
-    public String getGWAuthAppid() {
-        return this._gwAuthAppid.get();
-    }
-
-    public Integer getShopId() {
-        return this._shopId.get();
-    }
-
-    public void setShopId(Integer _shopId) {
-        this._shopId.set(_shopId);
-    }
-
-    public Integer getHospitalId() {
-        return this._hospitalId.get();
-    }
-
-    public void setHospitalId(Integer _hospitalId) {
-        this._hospitalId.set(_hospitalId);
-    }
-
-    public Integer getAdminId() {
-        return this._adminId.get();
-    }
-
-    public void setAdminId(Integer _adminId) {
-        this._adminId.set(_adminId);
-    }
-
-
-
-    public void init() {
-        _requestStartTime.set(0L);
-        _requestID.set("");
-        _ip.set("");
-        _tokenid.set("");
-        _unionId.set("");
-        _openId.set("");
-        _userId.set(0);
-        _doctorId.set(0);
-        _doctorName.set("");
-        _terminal.set(0);
-        _gwProtocol.set("");
-        _gwAuthAppid.set("");
-        _shopId.set(0);
-        _hospitalId.set(0);
-        _adminId.set(0);
-    }
-
-    public static WebAppContext current() {
-        if (_webAppContext == null) {
-            synchronized (_lockObj) {
-                if (_webAppContext == null) {
-                    _webAppContext = new WebAppContext();
-                }
-            }
-        }
-        return _webAppContext;
-    }
-}

ywt-platform-glasses-web/src/main/java/com/ywt/glasses/controllers/mg/interceptors/AccessBehaviorInterceptor.java

@@ -5,7 +5,7 @@ import com.fasterxml.jackson.databind.JsonNode;
 
 import com.ywt.biz.common.util.Checker;
 import com.ywt.biz.common.util.serializers.JsonSerializer;
-import com.ywt.glasses.controllers.mg.core.WebAppContext;
+import com.ywt.glasses.core.WebAppContext;
 import com.ywt.glasses.utils.WebHelper;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;