WH01243 1 年間 前
コミット
5c91f225e0
3 ファイル変更46 行追加36 行削除
  1. 1 1
      engine/config.go
  2. 2 2
      engine/flags.go
  3. 43 33
      user/index.lua

+ 1 - 1
engine/config.go

@@ -160,7 +160,7 @@ func New(versionString, description string) (*Config, error) {
 
 		shutdownTimeout: 10 * time.Second,
 
-		defaultWebColonPort:       ":3001",
+		defaultWebColonPort:       ":3010",
 		defaultRedisColonPort:     ":6379",
 		defaultEventColonPort:     ":5553",
 		defaultEventRefresh:       "350ms",

+ 2 - 2
engine/flags.go

@@ -51,7 +51,7 @@ func (ac *Config) handleFlags(serverTempDir string) {
 	// Commandline flag configuration
 
 	flag.StringVar(&ac.serverDirOrFilename, "dir", ".", "Server directory")
-	flag.StringVar(&ac.serverAddr, "addr", "", "Server [host][:port] (ie \":443\")")
+	flag.StringVar(&ac.serverAddr, "addr", "", "Server [host][:port] (ie \":3001\")")
 	flag.StringVar(&ac.serverCert, "cert", "cert.pem", "Server certificate")
 	flag.StringVar(&ac.serverKey, "key", "key.pem", "Server key")
 	flag.StringVar(&ac.redisAddr, "redis", "", "Redis [host][:port] (ie \""+ac.defaultRedisColonPort+"\")")
@@ -69,7 +69,7 @@ func (ac *Config) handleFlags(serverTempDir string) {
 	flag.StringVar(&ac.autoRefreshDir, "watchdir", "", "Directory to watch (also enables auto-refresh)")
 	flag.StringVar(&ac.eventAddr, "eventserver", "", "SSE [host][:port] (ie \""+ac.defaultEventColonPort+"\")")
 	flag.StringVar(&ac.eventRefresh, "eventrefresh", ac.defaultEventRefresh, "Event refresh interval (ie \""+ac.defaultEventRefresh+"\")")
-	flag.BoolVar(&ac.serverMode, "server", false, "Server mode (disable interactive mode)")
+	flag.BoolVar(&ac.serverMode, "server", true, "Server mode (disable interactive mode)")
 	flag.StringVar(&ac.mariadbDSN, "maria", "", "MariaDB/MySQL connection string (DSN)")
 	flag.StringVar(&ac.mariaDatabase, "mariadb", "", "MariaDB/MySQL database name")
 	flag.StringVar(&ac.postgresDSN, "postgres", "", "PostgreSQL connection string (DSN)")

+ 43 - 33
user/index.lua

@@ -5,59 +5,69 @@
 
 findOne = function()
     content("application/json")
-    local userId = urldata().userId
-    local query = "select  b.*  from   user_source  a INNER JOIN  user_channel_info  b on  a.user_id=b.user_id where  encryption_user_id=\"" .. userId .. "\"  LIMIT 1 "
-    local userResults = mysql(query,address())
+    local userId = formdata().userId
+    local delimiter = ","
     local resultData = {
         error_code = 1,
         error_msg = "",
     }
-    if #userResults > 0 then
-        local user = userResults[1]
-        local user_mold = user.user_mold
-        if user_mold == "1" or  user_mold == "3" then
-            resultData.error_code = 0
-            resultData.data = {
-                user_id = user.user_id,
-                registe_time = user.registe_time
-            }
-        else
-            resultData.error_code = 0
-            resultData.data = {
-                phone = user.phone,
-                registe_time = user.registe_time,
-                sales_lead_phone = user.sales_lead_phone,
-                sales_ent_name = user.sales_ent_name,
-                sales_position = user.sales_position,
-                sales_dep = user.sales_dep,
-                mailbox = user.mailbox,
-                order_type=user.order_type
-            }
+    local dataList = {}
+    for id in string.gmatch(userId, "([^" .. delimiter .. "]+)") do
+        local query = "select  b.*  from   user_source  a INNER JOIN  user_channel_info  b on  a.user_id=b.user_id where  encryption_user_id=\"" .. id .. "\"   LIMIT 1 "
+        local userResults = mysql(query, address())
+        local data = {}
+        if #userResults > 0 then
+            local user = userResults[1]
+            local user_mold = user.user_mold
+            if user_mold == "1" or user_mold == "3" then
+                data = {
+                    user_id = user.user_id,
+                    registe_time = user.registe_time
+                }
+            else
+                data = {
+                    phone = user.phone,
+                    registe_time = user.registe_time,
+                    sales_lead_phone = user.sales_lead_phone,
+                    sales_ent_name = user.sales_ent_name,
+                    sales_position = user.sales_position,
+                    sales_dep = user.sales_dep,
+                    mailbox = user.mailbox,
+                    order_type = user.order_type,
+                    source = user.source,
+                    data_request = user.data_request,
+                    last_login_time = user.last_login_time,
+                    sales_leads_source = user.sales_leads_source
+
+                }
+            end
         end
-    else
-        resultData.error_msg = "查不到此人信息"
+        data.encryption_user_id = id
+        table.insert(dataList, data)
     end
+    resultData.data = dataList
     print(json(resultData))
 end
-userList=function()
+userList = function()
     content("application/json")
-    local time = urldata().time
-    local paseInt = urldata().page
-    local pageSizeInt = urldata().pageSize
+    local time = formdata().time
+    local paseInt = formdata().page
+    local pageSizeInt = formdata().pageSize
     local query = "select count(1) as count from  user_source a   where DATE(create_time)=\"" .. time .. "\""
     local countResults = mysql(query, address())
     local resultData = {
         error_code = 1,
         error_msg = "",
     }
-    resultData.error_code=0
+    resultData.error_code = 0
     if #countResults > 0 then
         --查询数据
-        query = "select encryption_user_id,create_time,login_way,platform,ip from  user_source a   where DATE(create_time)=\"" .. time .. "\" ORDER BY create_time limit "  ..paseInt.. "," .. pageSizeInt
+        local start = (paseInt - 1) * pageSizeInt
+        query = "select encryption_user_id,create_time,login_way,platform,ip from  user_source a   where DATE(create_time)=\"" .. time .. "\" ORDER BY create_time limit " .. start .. "," .. pageSizeInt
         local results = mysql(query, address())
         resultData.data = {
             userCount = countResults[1].count,
-            userLisr =results
+            userLisr = results
         }
     else
         resultData.data = {