作者 钟来

模块整理

@@ -26,7 +26,7 @@ import java.net.URLEncoder; @@ -26,7 +26,7 @@ import java.net.URLEncoder;
26 "com.zhonglai.luhui.redis", 26 "com.zhonglai.luhui.redis",
27 "com.zhonglai.luhui.security", 27 "com.zhonglai.luhui.security",
28 "com.zhonglai.luhui.chatgpt", 28 "com.zhonglai.luhui.chatgpt",
29 - "com.zhonglai.luhui.login", 29 + "com.zhonglai.luhui.login.service",
30 "com.zhonglai.luhui.openai", 30 "com.zhonglai.luhui.openai",
31 } 31 }
32 ) 32 )
@@ -4,7 +4,6 @@ import com.ruoyi.common.tool.SysLogininforType; @@ -4,7 +4,6 @@ import com.ruoyi.common.tool.SysLogininforType;
4 import com.ruoyi.common.utils.spring.SpringUtils; 4 import com.ruoyi.common.utils.spring.SpringUtils;
5 import com.zhonglai.luhui.openai.service.ChatgptDetailsServiceImpl; 5 import com.zhonglai.luhui.openai.service.ChatgptDetailsServiceImpl;
6 import com.zhonglai.luhui.security.config.DefaultSecurityConfig; 6 import com.zhonglai.luhui.security.config.DefaultSecurityConfig;
7 -import com.zhonglai.luhui.security.service.AdminDetailsServiceImpl;  
8 import com.zhonglai.luhui.security.service.SecurityConfigService; 7 import com.zhonglai.luhui.security.service.SecurityConfigService;
9 import org.springframework.beans.factory.annotation.Autowired; 8 import org.springframework.beans.factory.annotation.Autowired;
10 import org.springframework.context.annotation.Configuration; 9 import org.springframework.context.annotation.Configuration;
@@ -17,7 +16,7 @@ import org.springframework.security.crypto.password.PasswordEncoder; @@ -17,7 +16,7 @@ import org.springframework.security.crypto.password.PasswordEncoder;
17 * app接口安全策略. 没有{@link Order}注解优先级比上面低 16 * app接口安全策略. 没有{@link Order}注解优先级比上面低
18 */ 17 */
19 @Configuration 18 @Configuration
20 -public class RootConfigurerAdapter extends DefaultSecurityConfig { 19 +public class ApiConfigurerAdapter extends DefaultSecurityConfig {
21 @Autowired 20 @Autowired
22 private ChatgptDetailsServiceImpl chatgptDetailsService; 21 private ChatgptDetailsServiceImpl chatgptDetailsService;
23 22
@@ -65,6 +65,9 @@ public class CompleteCallbackImpl implements CompleteCallback { @@ -65,6 +65,9 @@ public class CompleteCallbackImpl implements CompleteCallback {
65 stringBuffer.append("返回代币:"); 65 stringBuffer.append("返回代币:");
66 stringBuffer.append(gptMessage.getCompletion_tokens()); 66 stringBuffer.append(gptMessage.getCompletion_tokens());
67 stringBuffer.append(";"); 67 stringBuffer.append(";");
  68 + OpenAiUserInfo openAiUserInfo = publicService.getObjectForTableName(OpenAiUserInfo.class,"id",gptMessage.getUser_id()+"","`lk_openai`.`user_info`");
  69 + stringBuffer.append("剩余代币:");
  70 + stringBuffer.append(openAiUserInfo.getFlow_packet_remain()-upGptMessage.getTotal_tokens());
68 71
69 UserFlowPacketRemainLog userFlowPacketRemainLog = new UserFlowPacketRemainLog(); 72 UserFlowPacketRemainLog userFlowPacketRemainLog = new UserFlowPacketRemainLog();
70 userFlowPacketRemainLog.setDescribe(stringBuffer.toString()); 73 userFlowPacketRemainLog.setDescribe(stringBuffer.toString());