VPN

src/main/java/com/gyee/frame/controller/AnonController.java

@@ -34,7 +34,7 @@ public class AnonController {
     GyeeversionMapper gyeeversionMapper;
 
     @DataSource(value = DataSourceType.TICKET)
-    @GetMapping("version")
+    @GetMapping("/version")
     public AjaxResult version(){
         QueryWrapper<Gyeeversion> wrapper = new QueryWrapper<>();
         wrapper.eq("TYPE", "android");

src/main/java/com/gyee/frame/controller/TestController.java

@@ -10,11 +10,13 @@ public class TestController {
 
     @GetMapping("")
     public String test(){
+        System.out.println("====success");
         return "success";
     }
 
     @GetMapping("/")
     public String test2(){
+        System.out.println("====success-OK");
         return "success-OK";
     }
 }

src/main/java/com/gyee/frame/controller/ticket/LoginController.java

@@ -7,7 +7,6 @@ import com.gyee.frame.model.ticket.Labor;
 import com.gyee.frame.service.ticket.IbsusersService;
 import com.gyee.frame.service.ticket.LaborService;
 import com.gyee.frame.service.ticket.ShiroService;
-import com.gyee.frame.util.StringUtils;
 import com.gyee.frame.util.ticket.TokenCache;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
@@ -34,6 +33,7 @@ public class LoginController {
     @DataSource(value = DataSourceType.TICKET)
     @PostMapping(value = "sys/vpnlogin")
     public AjaxResult vpnLogin(@RequestParam("vpnId") String vpnId){
+        System.out.println("=====sys/vpnlogin：" + vpnId);
         Labor labor = laborService.getLaborByVPN(vpnId);
         if (labor == null)
             return AjaxResult.error(4004, "用户名或密码错误");
@@ -53,6 +53,7 @@ public class LoginController {
     @PostMapping(value = "sys/login")
     public AjaxResult login(@RequestParam("username") String username,
                             @RequestParam("password") String password){
+        System.out.println("=====sys/login：" + username + "—" + password);
         Labor labor = laborService.getLabor(username, password);
         if (labor == null)
             return AjaxResult.error(4004, "用户名或密码错误");

src/main/resources/application-dev.yml

@@ -20,7 +20,7 @@ spring:
         driver-class-name: com.mysql.jdbc.Driver
       #两票数据源
       ticket:
-        url: jdbc:sqlserver://192.168.1.82:1433;DatabaseName=test
+        url: jdbc:sqlserver://192.168.1.82:1433;DatabaseName=fdeam
         username: sa
         password: Gyee@321#!
         driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver

src/main/resources/application.yml

@@ -32,7 +32,7 @@ gyee:
   #本地测试
   appUpdateUrl-window: D:\android\UniPlugin-Hello-AS\UniPlugin-Hello-AS\app\build\outputs\apk\debug\sisphone.apk
   #正式服务器app自动升级路径
-  appUpdateUrl-linux: /home/GYEE/sisphone/apk_download/sisphone.apk
+  appUpdateUrl-linux: /home/GYEE/sisphone/apk_download/nxxny_app.apk
   #外网第一次下载路径：http://123.60.213.70:8619/appserver/nxxny_app.apk
   # -------- app升级路径 --------
   #智能营销接口
@@ -40,10 +40,10 @@ gyee:
 
 #tomcat websocket
 server :
-  port : 8088
+  port : 9617
   ##项目名字配置
-  #servlet : 
-  #  context-path : /demo
+  servlet :
+    context-path : /sisphone
   tomcat :
     max-threads : 128
     min-spare-threads : 5

src/main/resources/logback.xml

@@ -9,7 +9,7 @@ debug：当此属性设置为true时，将打印出logback内部日志信息，
 	
 	
 	<!-- 定义日志的根目录 -->
-    <property name="LOG_HOME" value="c:\\gyee-log" />
+    <property name="LOG_HOME" value="./logs" />
 	  <!-- 定义日志文件名称 -->
     <property name="appName" value="gyee"></property>